Internal raytracing changes

Internal raytracing changes

Author: jaladreips

IGC/Compiler/CISACodeGen/CShaderProgram.cpp

@@ -47,6 +47,19 @@ CShader*& CShaderProgram::GetShaderPtr(SIMDMode simd, ShaderDispatchMode mode)
     return m_SIMDshaders[0];
 }
 
+CShader* CShaderProgram::GetShaderIfAny(ShaderDispatchMode mode)
+{
+    auto simdToAnalysis = { SIMDMode::SIMD32, SIMDMode::SIMD16, SIMDMode::SIMD8 };
+
+    for (auto simd : simdToAnalysis)
+    {
+        if (auto* shader = GetShader(simd, mode); shader && shader->ProgramOutput()->m_programSize > 0)
+            return shader;
+    }
+
+    return nullptr;
+}
+
 void CShaderProgram::ClearShaderPtr(SIMDMode simd)
 {
     switch (simd)

IGC/Compiler/CISACodeGen/CShaderProgram.hpp

@@ -32,6 +32,7 @@ namespace IGC
         CShaderProgram& operator=(const CShaderProgram&) = delete;
         CShader* GetOrCreateShader(SIMDMode simd, ShaderDispatchMode mode = ShaderDispatchMode::NOT_APPLICABLE);
         CShader* GetShader(SIMDMode simd, ShaderDispatchMode mode = ShaderDispatchMode::NOT_APPLICABLE);
+        CShader* GetShaderIfAny(ShaderDispatchMode mode = ShaderDispatchMode::NOT_APPLICABLE);
         void DeleteShader(SIMDMode simd, ShaderDispatchMode mode = ShaderDispatchMode::NOT_APPLICABLE);
         CodeGenContext* GetContext() { return m_context; }
 

IGC/Compiler/CodeGenContext.cpp

@@ -279,23 +279,8 @@ namespace IGC
         {
             auto simdToAnalysis = { SIMDMode::SIMD32, SIMDMode::SIMD16, SIMDMode::SIMD8 };
 
-            CShader* previousShader = nullptr;
-            CShader* currentShader = nullptr;
-
-            // Get shaders
-            for (auto simd : simdToAnalysis)
-            {
-                if (!previousShader && pPrevious->GetShader(simd) &&
-                    (pPrevious->GetShader(simd)->ProgramOutput()->m_programSize > 0))
-                {
-                    previousShader = pPrevious->GetShader(simd);
-                }
-                if (!currentShader && pCurrent->GetShader(simd) &&
-                    (pCurrent->GetShader(simd)->ProgramOutput()->m_programSize > 0))
-                {
-                    currentShader = pCurrent->GetShader(simd);
-                }
-            }
+            CShader* previousShader = pPrevious->GetShaderIfAny();
+            CShader* currentShader = pCurrent->GetShaderIfAny();
 
             IGC_ASSERT(currentShader);
             IGC_ASSERT(previousShader);

IGC/common/igc_flags.h

@@ -1122,11 +1122,11 @@ DECLARE_IGC_GROUP("Raytracing Options")
     DECLARE_IGC_REGKEY(bool, DisablePredicatedStackIDRelease, false, "Emit a single stack ID release at the end of the shader", true)
     DECLARE_IGC_REGKEY(bool, DisableCrossFillRemat, false, "Rematerialize values if they use already spilled values", true)
     DECLARE_IGC_REGKEY(bool, EnableSyncDispatchRays, false, "Enable sync DispatchRays implementation", false)
-    DECLARE_IGC_REGKEY(bool, ForceRTRetry, false, "Raytracing is compiled in the second retry state", false)
-    DECLARE_IGC_REGKEY(bool, DisableRTRetryPickBetter, false, "Disables raytracing retry to pick the best compilation instead of always using the retry compilation.", false)
-    DECLARE_IGC_REGKEY(DWORD, RetryRTSpillMemThreshold, 200, "Only retry if spill mem used is more than this value", false)
-    DECLARE_IGC_REGKEY(DWORD, RetryRTSpillCostThreshold, 5, "Only retry if the percentage of spills (over total instructions) is more than this value", false)
-    DECLARE_IGC_REGKEY(DWORD, RetryRTPickBetterThreshold, 10, "Only pick the retry shader if the spill cost of the 2nd compilation is at least this percentage better than the previous compilation", false)
+DECLARE_IGC_REGKEY(bool, ForceRTRetry, false, "Raytracing is compiled in the second retry state", false)
+DECLARE_IGC_REGKEY(bool, DisableRTRetryPickBetter, false, "Disables raytracing retry to pick the best compilation instead of always using the retry compilation.", false)
+DECLARE_IGC_REGKEY(DWORD, RetryRTSpillMemThreshold, 200, "Only retry if spill mem used is more than this value", false)
+DECLARE_IGC_REGKEY(DWORD, RetryRTSpillCostThreshold, 5, "Only retry if the percentage of spills (over total instructions) is more than this value", false)
+DECLARE_IGC_REGKEY(DWORD, RetryRTPickBetterThreshold, 10, "Only pick the retry shader if the spill cost of the 2nd compilation is at least this percentage better than the previous compilation", false)
     DECLARE_IGC_REGKEY(bool, EnableFillScheduling, false, "Schedule fills for reduced register pressure", false)
     DECLARE_IGC_REGKEY(bool, DisableSWStackOffsetElision, false, "Avoid loading offseting when known at compile-time", false)
     DECLARE_IGC_REGKEY(DWORD, OverrideTMax, 0, "Force TMax to the given value. When 0, do nothing.", false)