Merge "Update ShaderCache to support shared locking" into udc-qpr-dev (c57dc987) · Commits · e / os / android_frameworks_base

libs/hwui/pipeline/skia/ShaderCache.cpp

+13 −7

Original line number	Diff line number	Diff line
		@@ -79,7 +79,7 @@ bool ShaderCache::validateCache(const void* identity, ssize_t size) {

		void ShaderCache::initShaderDiskCache(const void* identity, ssize_t size) {
		ATRACE_NAME("initShaderDiskCache");
		std::lock_guard<std::mutex> lock(mMutex);
		std::lock_guard lock(mMutex);

		// Emulators can switch between different renders either as part of config
		// or snapshot migration. Also, program binaries may not work well on some
		@@ -92,7 +92,7 @@ void ShaderCache::initShaderDiskCache(const void* identity, ssize_t size) {
		}

		void ShaderCache::setFilename(const char* filename) {
		std::lock_guard<std::mutex> lock(mMutex);
		std::lock_guard lock(mMutex);
		mFilename = filename;
		}

		@@ -104,7 +104,7 @@ BlobCache* ShaderCache::getBlobCacheLocked() {
		sk_sp<SkData> ShaderCache::load(const SkData& key) {
		ATRACE_NAME("ShaderCache::load");
		size_t keySize = key.size();
		std::lock_guard<std::mutex> lock(mMutex);
		std::lock_guard lock(mMutex);
		if (!mInitialized) {
		return nullptr;
		}
		@@ -181,13 +181,18 @@ void ShaderCache::saveToDiskLocked() {
		auto key = sIDKey;
		set(mBlobCache.get(), &key, sizeof(key), mIDHash.data(), mIDHash.size());
		}
		// The most straightforward way to make ownership shared
		mMutex.unlock();
		mMutex.lock_shared();
		mBlobCache->writeToFile();
		mMutex.unlock_shared();
		mMutex.lock();
		}
		}

		void ShaderCache::store(const SkData& key, const SkData& data, const SkString& /description/) {
		ATRACE_NAME("ShaderCache::store");
		std::lock_guard<std::mutex> lock(mMutex);
		std::lock_guard lock(mMutex);
		mNumShadersCachedInRam++;
		ATRACE_FORMAT("HWUI RAM cache: %d shaders", mNumShadersCachedInRam);

		@@ -229,7 +234,7 @@ void ShaderCache::store(const SkData& key, const SkData& data, const SkString& /
		mSavePending = true;
		std::thread deferredSaveThread([this]() {
		usleep(mDeferredSaveDelayMs * 1000); // milliseconds to microseconds
		std::lock_guard<std::mutex> lock(mMutex);
		std::lock_guard lock(mMutex);
		// Store file on disk if there a new shader or Vulkan pipeline cache size changed.
		if (mCacheDirty \|\| mNewPipelineCacheSize != mOldPipelineCacheSize) {
		saveToDiskLocked();
		@@ -245,11 +250,12 @@ void ShaderCache::store(const SkData& key, const SkData& data, const SkString& /

		void ShaderCache::onVkFrameFlushed(GrDirectContext* context) {
		{
		std::lock_guard<std::mutex> lock(mMutex);

		mMutex.lock_shared();
		if (!mInitialized \|\| !mTryToStorePipelineCache) {
		mMutex.unlock_shared();
		return;
		}
		mMutex.unlock_shared();
		}
		mInStoreVkPipelineInProgress = true;
		context->storeVkPipelineCacheData();

libs/hwui/pipeline/skia/ShaderCache.h

+19 −17

Original line number	Diff line number	Diff line
		@@ -19,8 +19,10 @@
		#include <GrContextOptions.h>
		#include <SkRefCnt.h>
		#include <cutils/compiler.h>
		#include <ftl/shared_mutex.h>
		#include <utils/Mutex.h>

		#include <memory>
		#include <mutex>
		#include <string>
		#include <vector>

		@@ -99,20 +101,20 @@ private:
		* this will do so, loading the serialized cache contents from disk if
		* possible.
		*/
		BlobCache* getBlobCacheLocked();
		BlobCache* getBlobCacheLocked() REQUIRES(mMutex);

		/**
		* "validateCache" updates the cache to match the given identity. If the
		* cache currently has the wrong identity, all entries in the cache are cleared.
		*/
		bool validateCache(const void* identity, ssize_t size);
		bool validateCache(const void* identity, ssize_t size) REQUIRES(mMutex);

		/**
		* "saveToDiskLocked" attemps to save the current contents of the cache to
		* "saveToDiskLocked" attempts to save the current contents of the cache to
		* disk. If the identity hash exists, we will insert the identity hash into
		* the cache for next validation.
		*/
		void saveToDiskLocked();
		void saveToDiskLocked() REQUIRES(mMutex);

		/**
		* "mInitialized" indicates whether the ShaderCache is in the initialized
		@@ -122,7 +124,7 @@ private:
		* the load and store methods will return without performing any cache
		* operations.
		*/
		bool mInitialized = false;
		bool mInitialized GUARDED_BY(mMutex) = false;

		/**
		* "mBlobCache" is the cache in which the key/value blob pairs are stored. It
		@@ -131,7 +133,7 @@ private:
		* The blob cache contains the Android build number. We treat version mismatches as an empty
		* cache (logic implemented in BlobCache::unflatten).
		*/
		std::unique_ptr<FileBlobCache> mBlobCache;
		std::unique_ptr<FileBlobCache> mBlobCache GUARDED_BY(mMutex);

		/**
		* "mFilename" is the name of the file for storing cache contents in between
		@@ -140,7 +142,7 @@ private:
		* empty string indicates that the cache should not be saved to or restored
		* from disk.
		*/
		std::string mFilename;
		std::string mFilename GUARDED_BY(mMutex);

		/**
		* "mIDHash" is the current identity hash for the cache validation. It is
		@@ -149,7 +151,7 @@ private:
		* indicates that cache validation is not performed, and the hash should
		* not be stored on disk.
		*/
		std::vector<uint8_t> mIDHash;
		std::vector<uint8_t> mIDHash GUARDED_BY(mMutex);

		/**
		* "mSavePending" indicates whether or not a deferred save operation is
		@@ -159,7 +161,7 @@ private:
		* contents to disk, unless mDeferredSaveDelayMs is 0 in which case saving
		* is disabled.
		*/
		bool mSavePending = false;
		bool mSavePending GUARDED_BY(mMutex) = false;

		/**
		* "mObservedBlobValueSize" is the maximum value size observed by the cache reading function.
		@@ -174,16 +176,16 @@ private:
		unsigned int mDeferredSaveDelayMs = 4 * 1000;

		/**
		* "mMutex" is the mutex used to prevent concurrent access to the member
		* "mMutex" is the shared mutex used to prevent concurrent access to the member
		* variables. It must be locked whenever the member variables are accessed.
		*/
		mutable std::mutex mMutex;
		mutable ftl::SharedMutex mMutex;

		/**
		* If set to "true", the next call to onVkFrameFlushed, will invoke
		* GrCanvas::storeVkPipelineCacheData. This does not guarantee that data will be stored on disk.
		*/
		bool mTryToStorePipelineCache = true;
		bool mTryToStorePipelineCache GUARDED_BY(mMutex) = true;

		/**
		* This flag is used by "ShaderCache::store" to distinguish between shader data and
		@@ -195,16 +197,16 @@ private:
		* "mNewPipelineCacheSize" has the size of the new Vulkan pipeline cache data. It is used
		* to prevent unnecessary disk writes, if the pipeline cache size has not changed.
		*/
		size_t mNewPipelineCacheSize = -1;
		size_t mNewPipelineCacheSize GUARDED_BY(mMutex) = -1;
		/**
		* "mOldPipelineCacheSize" has the size of the Vulkan pipeline cache data stored on disk.
		*/
		size_t mOldPipelineCacheSize = -1;
		size_t mOldPipelineCacheSize GUARDED_BY(mMutex) = -1;

		/**
		* "mCacheDirty" is true when there is new shader cache data, which is not saved to disk.
		*/
		bool mCacheDirty = false;
		bool mCacheDirty GUARDED_BY(mMutex) = false;

		/**
		* "sCache" is the singleton ShaderCache object.
		@@ -221,7 +223,7 @@ private:
		* interesting to keep track of how many shaders are stored in RAM. This
		* class provides a convenient entry point for that.
		*/
		int mNumShadersCachedInRam = 0;
		int mNumShadersCachedInRam GUARDED_BY(mMutex) = 0;

		friend class ShaderCacheTestUtils; // used for unit testing
		};

libs/hwui/tests/unit/ShaderCacheTests.cpp

+6 −5

Original line number	Diff line number	Diff line
		@@ -49,7 +49,7 @@ public:
		*/
		static void reinitializeAllFields(ShaderCache& cache) {
		ShaderCache newCache = ShaderCache();
		std::lock_guard<std::mutex> lock(cache.mMutex);
		std::lock_guard lock(cache.mMutex), newLock(newCache.mMutex);
		// By order of declaration
		cache.mInitialized = newCache.mInitialized;
		cache.mBlobCache.reset(nullptr);
		@@ -72,7 +72,7 @@ public:
		* manually, as seen in the "terminate" testing helper function.
		*/
		static void setSaveDelayMs(ShaderCache& cache, unsigned int saveDelayMs) {
		std::lock_guard<std::mutex> lock(cache.mMutex);
		std::lock_guard lock(cache.mMutex);
		cache.mDeferredSaveDelayMs = saveDelayMs;
		}

		@@ -81,7 +81,7 @@ public:
		* Next call to "initShaderDiskCache" will load again the in-memory cache from disk.
		*/
		static void terminate(ShaderCache& cache, bool saveContent) {
		std::lock_guard<std::mutex> lock(cache.mMutex);
		std::lock_guard lock(cache.mMutex);
		if (saveContent) {
		cache.saveToDiskLocked();
		}
		@@ -93,6 +93,7 @@ public:
		*/
		template <typename T>
		static bool validateCache(ShaderCache& cache, std::vector<T> hash) {
		std::lock_guard lock(cache.mMutex);
		return cache.validateCache(hash.data(), hash.size() * sizeof(T));
		}

		@@ -108,7 +109,7 @@ public:
		*/
		static void waitForPendingSave(ShaderCache& cache, const int timeoutMs = 50) {
		{
		std::lock_guard<std::mutex> lock(cache.mMutex);
		std::lock_guard lock(cache.mMutex);
		ASSERT_TRUE(cache.mSavePending);
		}
		bool saving = true;
		@@ -123,7 +124,7 @@ public:
		usleep(delayMicroseconds);
		elapsedMilliseconds += (float)delayMicroseconds / 1000;

		std::lock_guard<std::mutex> lock(cache.mMutex);
		std::lock_guard lock(cache.mMutex);
		saving = cache.mSavePending;
		}
		}