From c2dc1a86ed2f5e160749fe9f99b70db6c3e4d7a6 Mon Sep 17 00:00:00 2001 From: skallweitNV <64953474+skallweitNV@users.noreply.github.com> Date: Mon, 12 Dec 2022 19:25:48 +0100 Subject: Refactor shader cache (#2558) * Fix a bug in Path::find * Fix code formatting * Fix LockFile and add LockFileGuard * Add PersistentCache and unit test * Replace file path dependency list with source file dependency list * Add note on ordering in Module/FileDependencyList * Remove old shader cache code * Refactor shader cache implementation * Temporarily skip unit tests reading/writing files * Fix warning * Reenable lock file test * Rename shader cache tests and disable crashing test * Testing * Stop using Path::getCanonical * Fix persistent cache lock and test * Fix threading issues * Move adding file dependency hashes to getEntryPointHash() * Fix handling of #include files * Allow specifying additional search paths for gfx testing device * Work on shader cache tests * Update project files * Revive shader cache graphics tests * Split graphics pipeline test * Fix compilation --- source/core/slang-persistent-cache.h | 91 ++++++++++++++++++++++++++++++++++++ 1 file changed, 91 insertions(+) create mode 100644 source/core/slang-persistent-cache.h (limited to 'source/core/slang-persistent-cache.h') diff --git a/source/core/slang-persistent-cache.h b/source/core/slang-persistent-cache.h new file mode 100644 index 000000000..db5ef0a2e --- /dev/null +++ b/source/core/slang-persistent-cache.h @@ -0,0 +1,91 @@ +#pragma once +#include "../../slang.h" +#include "../core/slang-crypto.h" +#include "../core/slang-io.h" +#include "../core/slang-string.h" + +#include + +namespace Slang +{ + +/// Implements a simple persistent cache on the filesystem for storing key/value pairs. +/// Keys are SHA1 hashes and values are arbitrary blobs of data. +/// The cache is save for concurrent access from multiple threads/processes by using +/// a lock file within the cache directory. Furthermore, the cache implements a LRU +/// eviction policy. +class PersistentCache : public RefObject +{ +public: + struct Desc + { + // The root directory for the cache. + const char* directory = nullptr; + // The maximum number of entries stored in the cache. By default, there is no limit. + Count maxEntryCount = 0; + }; + + struct Stats + { + // Number of cache hits since last resetting the stats. + Count hitCount; + // Number of cache misses since last resetting the stats. + Count missCount; + // Current number of entries in the cache. + Count entryCount; + }; + + using Key = SHA1::Digest; + + PersistentCache(const Desc& desc); + ~PersistentCache(); + + /// Clear the contents of the cache by removing the cache index and all entry files. + SlangResult clear(); + + const Stats& getStats() const { return m_stats; } + void resetStats(); + + /// Read an entry from the cache. + /// Returns SLANG_OK if successful, SLANG_E_NOT_FOUND if the entry is not in the cache. + SlangResult readEntry(const Key& key, ISlangBlob** outData); + + /// Write an entry to the cache. + /// Returns SLANG_OK if successful. + SlangResult writeEntry(const Key& key, ISlangBlob* data); + +private: + struct CacheEntry + { + Key key; + uint32_t age; + }; + + using CacheIndex = List; + + SlangResult initialize(); + + String getEntryFileName(const Key& key); + + SlangResult readIndex(const String& fileName, CacheIndex& outIndex); + SlangResult writeIndex(const String& fileName, const CacheIndex& index); + + String m_cacheDirectory; + String m_lockFileName; + String m_indexFileName; + + // For exclusive locking we need both a mutex (acquired first) + // followed by a a file lock. The mutex is needed because on Linux + // the file lock is only locking between processes, not threads. + std::mutex m_mutex; + Slang::LockFile m_lockFile; + + Count m_maxEntryCount; + + Stats m_stats; + + // Used for unit tests. + friend struct PersistentCacheTest; +}; + +} -- cgit v1.2.3