Cache eviction policy test refinement (#2456)

* Refined cache eviction test; Added check to cache file load to ensure only the maximum number of allowed entries is loaded

* Fixed logic error in entry count check

* Changed getCacheFile to not append the newline at the end of cache files

* Refined if check

1 files changed, 6 insertions, 0 deletions

diff --git a/tools/gfx/persistent-shader-cache.cpp b/tools/gfx/persistent-shader-cache.cpp
index 55a95a257..fdf91fbe8 100644
--- a/tools/gfx/persistent-shader-cache.cpp
+++ b/tools/gfx/persistent-shader-cache.cpp
@@ -68,6 +68,12 @@ void PersistentShaderCache::loadCacheFromFile()
         ShaderCacheEntry entry = { dependencyDigest, astDigest };
         auto entryNode = entries.AddLast(entry);
         keyToEntry.Add(dependencyDigest, entryNode);
+
+        // If there are more entries present in the cache file than the entry count limit allows,
+        // ignore the rest. Since we output the lines in the cache file in order of most to least
+        // recently used, the cache's behavior will still be correct.
+        if (desc.entryCountLimit > 0 && entries.Count() == desc.entryCountLimit)
+            break;
     }
 }