From f0cd62b37c5dfbbdb3fb205f1be2b8beba0dfed4 Mon Sep 17 00:00:00 2001 From: lucy96chen <47800040+lucy96chen@users.noreply.github.com> Date: Wed, 12 Oct 2022 09:55:09 -0700 Subject: Shader caching (#2432) * Changed all getEntryPointCode calls to use RendererBase::getEntryPointCodeFromShaderCache * Hashing hooked up, tests pass but need to add more to fully test functionality * checkpoint * Checkpoint: File system creation seems functional, saving is broken * checkpoint: Fixed filename generation from MD5 hash, shader blob might be going missing ahead of pipeline state creation * Fixed a lot of bugs related to hash code generation, shader cache is likely working but needs further testing * Added workaround for module loading by re-creating the test device, shader cache test functional * Vulkan shader caching bug fixed, checkpoint commit before more refinement * pre-ToT merge checkpoint * checkpoint commit, improving cache keys * Significantly expanded items included in the dependency hash for Module; Added dependency hash functions to SpecializedComponentType and RenamedEntryPointComponentType * Temporarily disable shader cache test * Mid cleanup changes, solution successfully builds * Added several helper update functions to slang-md5 to help simplify usage; Added a function under ISession to compute a hash for all linkage-related items; Function renames and cleaned up some comments * Ran premake.bat; Renamed getASTBasedHashCode to computeASTBasedHash * Added slang unit tests for Checksum and MD5; Extended gfx shader cache test to test with multiple shader files and one shader file with multiple entry points * Solution builds and shader cache tests pass, but at least a couple other tests now failing * ran premake.bat * More cleanup changes * Added shaderCachePath field to IDevice desc in gfx.slang, gfx-smoke.slang should be functional * ran premake * cleanup changes; Adding test printf to getEntryPointCodeFromShaderCache to see if output can be seen in CI * Removed debugging printfs; Added handling for getEntryPointCode() failing * Cleanup changes; Jonathan's fixes to SerialWriter to zero initialize otherwise uninitialized memory; Change to SwizzleExpr creation to zero initialize elementCount * Changed enable_if_t to enable_if * Fixed enable_if * Added test for import vs include and changes to included and imported files; Fixed build errors in CUDA; Renamed shader cache statistics fields * cleanup changes * Readd removed file * Restructured computeDependencyBasedHash calls, added computeDependencyBasedHashImpl to all classes dervied from ComponentType * Applied same restructuring to the AST hash functions * Cleanup changes; Moved HashBuilder out to slang-digest.h and added some helper functions to streamline the process of adding items to a hash * Cleanup; Fixed incorrect expected results for shader import and include test --- source/slang/slang-serialize.cpp | 17 +++++++++++++---- 1 file changed, 13 insertions(+), 4 deletions(-) (limited to 'source/slang/slang-serialize.cpp') diff --git a/source/slang/slang-serialize.cpp b/source/slang/slang-serialize.cpp index 71ef303b7..9b63d47c5 100644 --- a/source/slang/slang-serialize.cpp +++ b/source/slang/slang-serialize.cpp @@ -210,10 +210,11 @@ SerialClasses::SerialClasses(): // !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! SerialWriter !!!!!!!!!!!!!!!!!!!!!!!!!!!! -SerialWriter::SerialWriter(SerialClasses* classes, SerialFilter* filter) : - m_arena(2048), - m_classes(classes), - m_filter(filter) +SerialWriter::SerialWriter(SerialClasses* classes, SerialFilter* filter, Flags flags) + : m_arena(2048) + , m_classes(classes) + , m_filter(filter) + , m_flags(flags) { // 0 is always the null pointer m_entries.add(nullptr); @@ -236,6 +237,7 @@ SerialIndex SerialWriter::writeObject(const SerialClass* serialCls, const void* nodeEntry->typeKind = serialCls->typeKind; nodeEntry->subType = serialCls->subType; + nodeEntry->_pad0 = 0; nodeEntry->info = SerialInfo::makeEntryInfo(serialCls->alignment); @@ -244,6 +246,12 @@ SerialIndex SerialWriter::writeObject(const SerialClass* serialCls, const void* // Point to start of payload uint8_t* serialPayload = (uint8_t*)(nodeEntry + 1); + + if (m_flags & Flag::ZeroInitialize) + { + ::memset(serialPayload, 0, serialCls->size); + } + while (serialCls) { for (Index i = 0; i < serialCls->fieldsCount; ++i) @@ -483,6 +491,7 @@ SlangResult SerialWriter::write(Stream* stream) for (Index i = 1; i < entriesCount; ++i) { SerialInfo::Entry* next = entries[i + 1]; + // Before writing we need to store the next alignment const size_t nextAlignment = SerialInfo::getAlignment(next->info); -- cgit v1.2.3