From 883d9f7cccf1080739213282602c0dbae5fa7fe6 Mon Sep 17 00:00:00 2001
From: lucy96chen <47800040+lucy96chen@users.noreply.github.com>
Date: Sat, 29 Oct 2022 12:08:41 -0700
Subject: Shader cache bugfixes and test additions (#2467)

* Preliminary graphics shader test

* Added test checking that a graphics shader is correctly split into two different entries

* Removed testing only addition

* Changed RequirementDictionary to an OrderedDictionary and added SerialTypeInfo for OrderedDictionary; Added entry point mangled name to the dependency hash

* Added test covering failure case discovered as part of Falcor integration

* Changed DifferentiableTypeSemanticContext::m_mapTypeToIDifferentiableWitness to an OrderedDictionary

* Added serializedAST field to Module in order to save serialized ASTs to avoid reserialization as much as possible; Added classes field to Session in order to save the output of SerialClassesUtil::create to avoid recreating as much as possible

* Changed AST hashing to hash the contents of a Module's file dependencies; Renamed all references to AST hashing to contents hashing

* Further cleanup

* Moved contents hash computation up to Linkage::loadModule and added field to Module to save the computed contents digest

* Changed PreprocessorHandler::handleFileDependency to optionally take an ISlangBlob* containing file contents and changed FrontEndPreprocessorHandler::handleFileDependency to add the source code for an included file to the module's contents digest

* Removed extraneous addToDigest call

* Fixed accidental removal of source code hash for module being loaded
---
 tools/gfx/persistent-shader-cache.h | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

(limited to 'tools/gfx/persistent-shader-cache.h')

diff --git a/tools/gfx/persistent-shader-cache.h b/tools/gfx/persistent-shader-cache.h
index 49a4a53dd..8d4ded4b9 100644
--- a/tools/gfx/persistent-shader-cache.h
+++ b/tools/gfx/persistent-shader-cache.h
@@ -16,7 +16,7 @@ namespace gfx
 struct ShaderCacheEntry
 {
     slang::Digest dependencyBasedDigest;
-    slang::Digest astBasedDigest;
+    slang::Digest contentsBasedDigest;
 };
 
 class PersistentShaderCache : public RefObject
@@ -32,14 +32,14 @@ public:
     // Add an entry to the cache with the provided key and contents hashes. If
     // adding an entry causes the cache to exceed size limitations, this will also
     // delete the least recently used entry.
-    void addEntry(const slang::Digest& dependencyDigest, const slang::Digest& astDigest, ISlangBlob* compiledCode);
+    void addEntry(const slang::Digest& dependencyDigest, const slang::Digest& contentsDigest, ISlangBlob* compiledCode);
 
     // Update the contents hash for the specified entry in the cache and update the
     // corresponding file on disk.
     void updateEntry(
         LinkedNode<ShaderCacheEntry>* entryNode,
         const slang::Digest& dependencyDigest,
-        const slang::Digest& astDigest,
+        const slang::Digest& contentsDigest,
         ISlangBlob* updatedCode);
 
 private:
-- 
cgit v1.2.3