Refactor state programming

Refactor state programming

Author: scottp101

IGC/Compiler/CISACodeGen/CShader.cpp

@@ -37,16 +37,7 @@ CShader::CShader(Function *pFunc, CShaderProgram *pProgram, GenericShaderState &
     , encoder()
 {
     m_ctx = m_parent->GetContext();
-
-    bool SepSpillPvtSS = SeparateSpillAndScratch(m_ctx);
-    bool SeparateScratchWA =
-        IGC_IS_FLAG_ENABLED(EnableSeparateScratchWA) &&
-        !m_ctx->getModuleMetaData()->disableSeparateScratchWA;
-    m_simdProgram.init(!m_ctx->platform.hasScratchSurface(),
-        m_ctx->platform.maxPerThreadScratchSpace(
-        ),
-        GetContext()->getModuleMetaData()->compOpt.UseScratchSpacePrivateMemory,
-        SepSpillPvtSS, SeparateScratchWA);
+    GenericShaderState::setScratchUsage(*m_ctx, m_simdProgram);
 }
 
 bool CShader::IsRecompilationRequestForced()

IGC/Compiler/CISACodeGen/GenericShaderState.cpp

@@ -124,6 +124,24 @@ namespace IGC
         }
     }
 
+    void GenericShaderState::setScratchUsage(CodeGenContext& Ctx, SProgramOutput& Prog)
+    {
+        bool SepSpillPvtSS = SeparateSpillAndScratch(&Ctx);
+        bool SeparateScratchWA =
+            IGC_IS_FLAG_ENABLED(EnableSeparateScratchWA) &&
+            !Ctx.getModuleMetaData()->disableSeparateScratchWA;
+        Prog.init(!Ctx.platform.hasScratchSurface(),
+            Ctx.platform.maxPerThreadScratchSpace(
+            ),
+            Ctx.getModuleMetaData()->compOpt.UseScratchSpacePrivateMemory,
+            SepSpillPvtSS, SeparateScratchWA);
+    }
+
+    void GenericShaderState::setScratchUsage(SProgramOutput& Prog)
+    {
+        setScratchUsage(Ctx, Prog);
+    }
+
     uint32_t GenericShaderState::GetShaderThreadUsageRate()
     {
         uint32_t grfNum = GetContext().getNumGRFPerThread();

IGC/Compiler/CISACodeGen/GenericShaderState.hpp

@@ -102,6 +102,8 @@ namespace IGC
         void SetHasEval() { m_HasEval = true; }
         void CreateGatherMap();
         void CreateConstantBufferOutput(SKernelProgram* pKernelProgram);
+        static void setScratchUsage(CodeGenContext &Ctx, SProgramOutput& Prog);
+        void setScratchUsage(SProgramOutput& Prog);
         uint32_t GetShaderThreadUsageRate();
 
         const llvm::Function& Entry;