Remove ScorePerformanceCache

This class was only used in two places, both on the results screen, but
was holding references to `OsuPlayfield` game-wide (due to unrelated
issues, but still).

Because I can't really think of future use cases for this, and running
the calculation twice at results screen isn't a huge overhead, let's
just do that for now to keep things simple.

osu.Game/OsuGameBase.cs

@@ -340,10 +340,6 @@ namespace osu.Game
             dependencies.Cache(beatmapCache = new BeatmapLookupCache());
             base.Content.Add(beatmapCache);
 
-            var scorePerformanceManager = new ScorePerformanceCache();
-            dependencies.Cache(scorePerformanceManager);
-            base.Content.Add(scorePerformanceManager);
-
             dependencies.CacheAs<IRulesetConfigCache>(rulesetConfigCache = new RulesetConfigCache(realm, RulesetStore));
 
             var powerStatus = CreateBatteryInfo();

osu.Game/Rulesets/Difficulty/PerformanceBreakdownCalculator.cs

@@ -21,21 +21,29 @@ namespace osu.Game.Rulesets.Difficulty
     {
         private readonly IBeatmap playableBeatmap;
         private readonly BeatmapDifficultyCache difficultyCache;
-        private readonly ScorePerformanceCache performanceCache;
 
-        public PerformanceBreakdownCalculator(IBeatmap playableBeatmap, BeatmapDifficultyCache difficultyCache, ScorePerformanceCache performanceCache)
+        public PerformanceBreakdownCalculator(IBeatmap playableBeatmap, BeatmapDifficultyCache difficultyCache)
         {
             this.playableBeatmap = playableBeatmap;
             this.difficultyCache = difficultyCache;
-            this.performanceCache = performanceCache;
         }
 
         [ItemCanBeNull]
         public async Task<PerformanceBreakdown> CalculateAsync(ScoreInfo score, CancellationToken cancellationToken = default)
         {
+            var attributes = await difficultyCache.GetDifficultyAsync(score.BeatmapInfo!, score.Ruleset, score.Mods, cancellationToken).ConfigureAwait(false);
+
+            var performanceCalculator = score.Ruleset.CreateInstance().CreatePerformanceCalculator();
+
+            // Performance calculation requires the beatmap and ruleset to be locally available. If not, return a default value.
+            if (attributes?.Attributes == null || performanceCalculator == null)
+                return null;
+
+            cancellationToken.ThrowIfCancellationRequested();
+
             PerformanceAttributes[] performanceArray = await Task.WhenAll(
                 // compute actual performance
-                performanceCache.CalculatePerformanceAsync(score, cancellationToken),
+                performanceCalculator.CalculateAsync(score, attributes.Value.Attributes, cancellationToken),
                 // compute performance for perfect play
                 getPerfectPerformance(score, cancellationToken)
             ).ConfigureAwait(false);
@@ -88,8 +96,12 @@ namespace osu.Game.Rulesets.Difficulty
                     cancellationToken
                 ).ConfigureAwait(false);
 
-                // ScorePerformanceCache is not used to avoid caching multiple copies of essentially identical perfect performance attributes
+                var performanceCalculator = ruleset.CreatePerformanceCalculator();
-                return difficulty == null ? null : ruleset.CreatePerformanceCalculator()?.Calculate(perfectPlay, difficulty.Value.Attributes.AsNonNull());
+
+                if (performanceCalculator == null || difficulty == null)
+                    return null;
+
+                return await performanceCalculator.CalculateAsync(perfectPlay, difficulty.Value.Attributes.AsNonNull(), cancellationToken).ConfigureAwait(false);
             }, cancellationToken);
         }
 

osu.Game/Rulesets/Difficulty/PerformanceCalculator.cs

@@ -1,6 +1,8 @@
 // Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
 // See the LICENCE file in the repository root for full licence text.
 
+using System.Threading;
+using System.Threading.Tasks;
 using osu.Game.Beatmaps;
 using osu.Game.Scoring;
 
@@ -15,6 +17,9 @@ namespace osu.Game.Rulesets.Difficulty
             Ruleset = ruleset;
         }
 
+        public Task<PerformanceAttributes> CalculateAsync(ScoreInfo score, DifficultyAttributes attributes, CancellationToken cancellationToken)
+            => Task.Run(() => CreatePerformanceAttributes(score, attributes), cancellationToken);
+
         public PerformanceAttributes Calculate(ScoreInfo score, DifficultyAttributes attributes)
             => CreatePerformanceAttributes(score, attributes);
 

osu.Game/Scoring/ScorePerformanceCache.cs

@@ -1,68 +0,0 @@
-// Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
-// See the LICENCE file in the repository root for full licence text.
-
-using System;
-using System.Threading;
-using System.Threading.Tasks;
-using osu.Framework.Allocation;
-using osu.Game.Beatmaps;
-using osu.Game.Database;
-using osu.Game.Rulesets.Difficulty;
-
-namespace osu.Game.Scoring
-{
-    /// <summary>
-    /// A component which performs and acts as a central cache for performance calculations of locally databased scores.
-    /// Currently not persisted between game sessions.
-    /// </summary>
-    public partial class ScorePerformanceCache : MemoryCachingComponent<ScorePerformanceCache.PerformanceCacheLookup, PerformanceAttributes>
-    {
-        [Resolved]
-        private BeatmapDifficultyCache difficultyCache { get; set; } = null!;
-
-        protected override bool CacheNullValues => false;
-
-        /// <summary>
-        /// Calculates performance for the given <see cref="ScoreInfo"/>.
-        /// </summary>
-        /// <param name="score">The score to do the calculation on. </param>
-        /// <param name="token">An optional <see cref="CancellationToken"/> to cancel the operation.</param>
-        public Task<PerformanceAttributes?> CalculatePerformanceAsync(ScoreInfo score, CancellationToken token = default) =>
-            GetAsync(new PerformanceCacheLookup(score), token);
-
-        protected override async Task<PerformanceAttributes?> ComputeValueAsync(PerformanceCacheLookup lookup, CancellationToken token = default)
-        {
-            var score = lookup.ScoreInfo;
-
-            var attributes = await difficultyCache.GetDifficultyAsync(score.BeatmapInfo!, score.Ruleset, score.Mods, token).ConfigureAwait(false);
-
-            // Performance calculation requires the beatmap and ruleset to be locally available. If not, return a default value.
-            if (attributes?.Attributes == null)
-                return null;
-
-            token.ThrowIfCancellationRequested();
-
-            return score.Ruleset.CreateInstance().CreatePerformanceCalculator()?.Calculate(score, attributes.Value.Attributes);
-        }
-
-        public readonly struct PerformanceCacheLookup
-        {
-            public readonly ScoreInfo ScoreInfo;
-
-            public PerformanceCacheLookup(ScoreInfo info)
-            {
-                ScoreInfo = info;
-            }
-
-            public override int GetHashCode()
-            {
-                var hash = new HashCode();
-
-                hash.Add(ScoreInfo.Hash);
-                hash.Add(ScoreInfo.ID);
-
-                return hash.ToHashCode();
-            }
-        }
-    }
-}

osu.Game/Screens/Ranking/Expanded/Statistics/PerformanceStatistic.cs

@@ -5,10 +5,11 @@
 
 using System;
 using System.Threading;
+using System.Threading.Tasks;
 using osu.Framework.Allocation;
 using osu.Framework.Bindables;
-using osu.Framework.Extensions;
 using osu.Framework.Graphics;
+using osu.Game.Beatmaps;
 using osu.Game.Graphics.UserInterface;
 using osu.Game.Resources.Localisation.Web;
 using osu.Game.Scoring;
@@ -32,7 +33,7 @@ namespace osu.Game.Screens.Ranking.Expanded.Statistics
         }
 
         [BackgroundDependencyLoader]
-        private void load(ScorePerformanceCache performanceCache)
+        private void load(BeatmapDifficultyCache difficultyCache, CancellationToken? cancellationToken)
         {
             if (score.PP.HasValue)
             {
@@ -40,8 +41,19 @@ namespace osu.Game.Screens.Ranking.Expanded.Statistics
             }
             else
             {
-                performanceCache.CalculatePerformanceAsync(score, cancellationTokenSource.Token)
+                Task.Run(async () =>
-                                .ContinueWith(t => Schedule(() => setPerformanceValue(t.GetResultSafely()?.Total)), cancellationTokenSource.Token);
+                {
+                    var attributes = await difficultyCache.GetDifficultyAsync(score.BeatmapInfo!, score.Ruleset, score.Mods, cancellationToken ?? default).ConfigureAwait(false);
+                    var performanceCalculator = score.Ruleset.CreateInstance().CreatePerformanceCalculator();
+
+                    // Performance calculation requires the beatmap and ruleset to be locally available. If not, return a default value.
+                    if (attributes?.Attributes == null || performanceCalculator == null)
+                        return;
+
+                    var result = await performanceCalculator.CalculateAsync(score, attributes.Value.Attributes, cancellationToken ?? default).ConfigureAwait(false);
+
+                    Schedule(() => setPerformanceValue(result.Total));
+                }, cancellationToken ?? default);
             }
         }
 

osu.Game/Screens/Ranking/Statistics/PerformanceBreakdownChart.cs

@@ -39,9 +39,6 @@ namespace osu.Game.Screens.Ranking.Statistics
 
         private readonly CancellationTokenSource cancellationTokenSource = new CancellationTokenSource();
 
-        [Resolved]
-        private ScorePerformanceCache performanceCache { get; set; }
-
         [Resolved]
         private BeatmapDifficultyCache difficultyCache { get; set; }
 
@@ -148,7 +145,7 @@ namespace osu.Game.Screens.Ranking.Statistics
 
             spinner.Show();
 
-            new PerformanceBreakdownCalculator(playableBeatmap, difficultyCache, performanceCache)
+            new PerformanceBreakdownCalculator(playableBeatmap, difficultyCache)
                 .CalculateAsync(score, cancellationTokenSource.Token)
                 .ContinueWith(t => Schedule(() => setPerformanceValue(t.GetResultSafely())));
         }