Validate SPIR-V once per blob

Author: AnastaZIuk

examples_tests

@@ -49,6 +49,7 @@ class NBL_API2 ISPIRVEntryPointTrimmer final : public core::IReferenceCounted
 
         Result trim(const ICPUBuffer* spirvBuffer, const core::set<EntryPoint>& entryPoints, system::logger_opt_ptr logger = nullptr) const;
         bool ensureValidated(const ICPUBuffer* spirvBuffer, system::logger_opt_ptr logger = nullptr) const;
+        void markValidated(const ICPUBuffer* spirvBuffer) const;
 
         inline core::smart_refctd_ptr<const IShader> trim(const IShader* shader, const core::set<EntryPoint>& entryPoints, system::logger_opt_ptr logger = nullptr) const
         {

include/nbl/asset/utils/ISPIRVEntryPointTrimmer.h

@@ -65,11 +65,17 @@ static bool validate(const uint32_t* binary, uint32_t binarySize, nbl::system::l
     return core.Validate(binary, binarySize, validatorOptions);
 }
 
-bool ISPIRVEntryPointTrimmer::ensureValidated(const ICPUBuffer* spirvBuffer, system::logger_opt_ptr logger) const
+static nbl::core::blake3_hash_t getContentHash(const ICPUBuffer* spirvBuffer)
 {
     auto contentHash = spirvBuffer->getContentHash();
     if (contentHash == ICPUBuffer::INVALID_HASH)
         contentHash = spirvBuffer->computeContentHash();
+    return contentHash;
+}
+
+bool ISPIRVEntryPointTrimmer::ensureValidated(const ICPUBuffer* spirvBuffer, system::logger_opt_ptr logger) const
+{
+    const auto contentHash = getContentHash(spirvBuffer);
 
     {
         std::lock_guard lock(m_validationCacheMutex);
@@ -84,12 +90,18 @@ bool ISPIRVEntryPointTrimmer::ensureValidated(const ICPUBuffer* spirvBuffer, sys
 
     {
         std::lock_guard lock(m_validationCacheMutex);
-        m_validatedSpirvHashes.insert(contentHash);
+        m_validatedSpirvHashes.emplace(contentHash);
     }
 
     return true;
 }
 
+void ISPIRVEntryPointTrimmer::markValidated(const ICPUBuffer* spirvBuffer) const
+{
+    std::lock_guard lock(m_validationCacheMutex);
+    m_validatedSpirvHashes.emplace(getContentHash(spirvBuffer));
+}
+
 ISPIRVEntryPointTrimmer::Result ISPIRVEntryPointTrimmer::trim(const  ICPUBuffer* spirvBuffer, const core::set<EntryPoint>& entryPoints, system::logger_opt_ptr logger) const
 {
     const auto* spirv = static_cast<const uint32_t*>(spirvBuffer->getPointer());
@@ -143,6 +155,15 @@ ISPIRVEntryPointTrimmer::Result ISPIRVEntryPointTrimmer::trim(const  ICPUBuffer*
         return { length, opcode };
     };
 
+    if (!ensureValidated(spirvBuffer, logger))
+    {
+        logger.log("SPIR-V is not valid", system::ILogger::ELL_ERROR);
+        return Result{
+            .spirv = nullptr,
+            .isSuccess = false,
+        };
+    }
+
     {
         auto probeOffset = HEADER_SIZE;
         auto totalEntryPoints = 0u;
@@ -202,15 +223,6 @@ ISPIRVEntryPointTrimmer::Result ISPIRVEntryPointTrimmer::trim(const  ICPUBuffer*
         }
     }
 
-    if (!ensureValidated(spirvBuffer, logger))
-    {
-        logger.log("SPIR-V is not valid", system::ILogger::ELL_ERROR);
-        return Result{
-            .spirv = nullptr,
-            .isSuccess = false,
-        };
-    }
-
     auto foundEntryPoint = 0;
 
     // Keep in mind about this layout while reading all the code below: https://registry.khronos.org/SPIR-V/specs/unified1/SPIRV.html#LogicalLayout