[IGC feature][CodePatch] Passing context for code patching

houjenko · igcbot · commit 0dd6d9b6609e · 2020-12-23T19:53:04.000+01:00
diff --git a/IGC/Compiler/CISACodeGen/CISABuilder.cpp b/IGC/Compiler/CISACodeGen/CISABuilder.cpp
@@ -4392,7 +4392,7 @@ namespace IGC
         }
     }
 
-    void CEncoder::InitEncoder(bool canAbortOnSpill, bool hasStackCall)
+    void CEncoder::InitEncoder(bool canAbortOnSpill, bool hasStackCall, VISAKernel* prevKernel)
     {
         m_aliasesMap.clear();
         m_encoderState.m_SubSpanDestination = false;
@@ -4431,6 +4431,10 @@ namespace IGC
         V(CreateVISABuilder(vbuilder, builderMode, builderOpt, VISAPlatform, params.size(), params.data(),
             &m_vISAWaTable));
 
+        if (IsCodePatchCandidate())
+        {
+            SetHasPrevKernel(prevKernel != nullptr);
+        }
         InitVISABuilderOptions(VISAPlatform, canAbortOnSpill, hasStackCall, builderOpt == VISA_BUILDER_BOTH);
 
         // Pass all build options to builder
@@ -4486,6 +4490,7 @@ namespace IGC
         }
 
         V(vbuilder->AddKernel(vKernel, kernelName.c_str()));
+        V(vbuilder->SetPrevKernel(prevKernel));
         V(vKernel->AddKernelAttribute("OutputAsmPath", asmName.length(), asmName.c_str()));
 
         SetDispatchSimdSize();
diff --git a/IGC/Compiler/CISACodeGen/CISABuilder.hpp b/IGC/Compiler/CISACodeGen/CISABuilder.hpp
@@ -131,7 +131,7 @@ namespace IGC
     class CEncoder
     {
     public:
-        void InitEncoder(bool canAbortOnSpill, bool hasStackCall);
+        void InitEncoder(bool canAbortOnSpill, bool hasStackCall, VISAKernel* prevKernel);
         void InitBuildParams(llvm::SmallVector<std::unique_ptr< char, std::function<void(char*)>>, 10> & params);
         void InitVISABuilderOptions(TARGET_PLATFORM VISAPlatform, bool canAbortOnSpill, bool hasStackCall, bool enableVISA_IR);
         SEncoderState CopyEncoderState();
@@ -360,6 +360,10 @@ namespace IGC
 
         inline void SetIsCodePatchCandidate(bool v);
         inline bool IsCodePatchCandidate();
+        inline unsigned int GetPayloadEnd();
+        inline void SetPayloadEnd(unsigned int payloadEnd);
+        inline void SetHasPrevKernel(bool v);
+        inline bool HasPrevKernel();
         inline void BeginForcedNoMaskRegion();
         inline void EndForcedNoMaskRegion();
 
@@ -601,6 +605,8 @@ namespace IGC
         // This is for CodePatch to split payload interpolation from a shader
         VISAKernel* vPayloadSection;
         VISAKernel* vKernelTmp;
+        bool m_hasPrevKernel = false;
+        unsigned int m_payloadEnd = 0;
 
         bool m_isCodePatchCandidate = false;
 
@@ -929,6 +935,26 @@ namespace IGC
         return m_isCodePatchCandidate;
     }
 
+    inline void CEncoder::SetPayloadEnd(unsigned int payloadEnd)
+    {
+        m_payloadEnd = payloadEnd;
+    }
+
+    inline unsigned int CEncoder::GetPayloadEnd()
+    {
+        return m_payloadEnd;
+    }
+
+    inline void CEncoder::SetHasPrevKernel(bool v)
+    {
+        m_hasPrevKernel = v;
+    }
+
+    inline bool CEncoder::HasPrevKernel()
+    {
+        return m_hasPrevKernel;
+    }
+
     inline void CEncoder::BeginForcedNoMaskRegion()
     {
         m_insideForcedNoMaskRegion = true;
diff --git a/IGC/Compiler/CISACodeGen/EmitVISAPass.cpp b/IGC/Compiler/CISACodeGen/EmitVISAPass.cpp
@@ -562,6 +562,7 @@ bool EmitPass::runOnFunction(llvm::Function& F)
         m_currShader->SetCoalescingEngineHelper(m_CE);
     }
 
+    CShader* prevShader = m_pCtx->m_prevShader;
     bool hasStackCall = m_FGA && m_FGA->getGroup(&F)->hasStackCall();
     if (!m_FGA || m_FGA->isGroupHead(&F))
     {
@@ -573,11 +574,24 @@ bool EmitPass::runOnFunction(llvm::Function& F)
             return false;
         }
 
+        VISAKernel* prevKernel = nullptr;
+
+        if (prevShader &&
+            m_currShader->IsPatchablePS() &&
+            m_encoder->GetSimdSize() == prevShader->GetEncoder().GetSimdSize() &&
+            prevShader->GetEncoder().IsCodePatchCandidate() &&
+            prevShader->ProgramOutput()->m_programBin &&
+            prevShader->ProgramOutput()->m_scratchSpaceUsedBySpills == 0)
+        {
+            prevKernel = prevShader->GetEncoder().GetVISAKernel();
+            m_encoder->SetPayloadEnd(prevShader->GetEncoder().GetPayloadEnd());
+        }
+
         if (IGC_GET_FLAG_VALUE(CodePatch) &&
             ((!m_pCtx->hash.nosHash) || IGC_GET_FLAG_VALUE(CodePatch) > CodePatch_Enable_NoLTO) &&
             m_currShader->IsPatchablePS() &&
             m_SimdMode == SIMDMode::SIMD16 &&
-            (m_ShaderDispatchMode != ShaderDispatchMode::NOT_APPLICABLE) &&
+            (m_ShaderDispatchMode != ShaderDispatchMode::NOT_APPLICABLE || prevKernel) &&
             (IGC_GET_FLAG_VALUE(CodePatchLimit) == 0 || 2 <= IGC_GET_FLAG_VALUE(CodePatchLimit)))
         {
             m_encoder->SetIsCodePatchCandidate(true);
@@ -616,7 +630,7 @@ bool EmitPass::runOnFunction(llvm::Function& F)
         }
 
         // call builder after pre-analysis pass where scratchspace offset to VISA is calculated
-        m_encoder->InitEncoder(m_canAbortOnSpill, hasStackCall);
+        m_encoder->InitEncoder(m_canAbortOnSpill, hasStackCall, prevKernel);
         initDefaultRoundingMode();
         m_currShader->PreCompile();
 
@@ -900,6 +914,13 @@ bool EmitPass::runOnFunction(llvm::Function& F)
                 errs() << IGC_GET_FLAG_VALUE(CodePatchLimit) << " Prologue/CodePatch : " << m_encoder->GetShaderName() << "\n";
             }
         }
+        else
+        {
+            if (IGC_GET_FLAG_VALUE(CodePatchExperiments))
+            {
+                errs() << IGC_GET_FLAG_VALUE(CodePatchLimit) << " not : " << m_encoder->GetShaderName() << "\n";
+            }
+        }
     }
 
     if (m_currShader->GetDebugInfoData())
@@ -925,6 +946,7 @@ bool EmitPass::runOnFunction(llvm::Function& F)
             compileWithSymbolTable = true;
         }
         m_encoder->Compile(compileWithSymbolTable);
+        m_pCtx->m_prevShader = m_currShader;
         // if we are doing stack-call, do the following:
         // - Hard-code a large scratch-space for visa
         if (hasStackCall)
@@ -945,9 +967,17 @@ bool EmitPass::runOnFunction(llvm::Function& F)
         {
             IF_DEBUG_INFO(IDebugEmitter::Release(m_pDebugEmitter);)
 
+            if(!m_encoder->IsCodePatchCandidate() || m_encoder->HasPrevKernel())
+            {
+                m_pCtx->m_prevShader = nullptr;
                 // Postpone destroying VISA builder to
-                // after emitting debug info
+                // after emitting debug info and passing context for code patching
                 m_encoder->DestroyVISABuilder();
+            }
+            if (m_encoder->IsCodePatchCandidate() && m_encoder->HasPrevKernel())
+            {
+                prevShader->GetEncoder().DestroyVISABuilder();
+            }
         }
     }
 
diff --git a/IGC/Compiler/CISACodeGen/PixelShaderCodeGen.cpp b/IGC/Compiler/CISACodeGen/PixelShaderCodeGen.cpp
@@ -306,6 +306,15 @@ void CPixelShader::AllocatePSPayload()
     if (encoder.IsCodePatchCandidate())
     {
         encoder.SetPayloadSectionAsSecondary();
+        if (encoder.HasPrevKernel())
+        {
+            // Get previous context's PayloadEnd to ensure it is patchable
+            offset = encoder.GetPayloadEnd();
+        }
+        else
+        {
+            encoder.SetPayloadEnd(payloadEnd);
+        }
     }
     if (offset % getGRFSize() != 0)
     {
diff --git a/IGC/Compiler/CodeGenPublic.h b/IGC/Compiler/CodeGenPublic.h
@@ -843,6 +843,9 @@ namespace IGC
         std::vector<unsigned> m_indexableTempSize;
         bool         m_highPsRegisterPressure = 0;
 
+        // Record previous simd for code patching
+        CShader* m_prevShader = nullptr;
+
         // For IR dump after pass
         unsigned     m_numPasses = 0;
         bool m_threadCombiningOptDone = false;
diff --git a/visa/BuildCISAIR.h b/visa/BuildCISAIR.h
@@ -60,6 +60,7 @@ class CISA_IR_Builder : public VISABuilder
         mBuildOption = buildOption;
         m_kernel_count = 0;
         m_function_count = 0;
+        m_prevKernel = nullptr;
 
         m_header.major_version = majorVersion;
         m_header.minor_version = minorVersion;
@@ -82,6 +83,7 @@ class CISA_IR_Builder : public VISABuilder
         const PWA_TABLE pWaTable = nullptr);
     static int DestroyBuilder(CISA_IR_Builder *builder);
     VISA_BUILDER_API virtual int AddKernel(VISAKernel *& kernel, const char* kernelName);
+    VISA_BUILDER_API virtual int SetPrevKernel(VISAKernel *& prevKernel);
     VISA_BUILDER_API virtual int AddFunction(VISAFunction *& function, const char* functionName);
     VISA_BUILDER_API virtual int AddPayloadSection(VISAFunction *& function, const char* functionName);
     VISA_BUILDER_API virtual int Compile(const char * isaFileNameint, std::ostream * os = nullptr, bool emit_visa_only = false);
@@ -106,6 +108,7 @@ class CISA_IR_Builder : public VISABuilder
 
     // the current vISA kernel/function being processed
     VISAKernelImpl *m_kernel;
+    VISAKernelImpl *m_prevKernel;
     CisaFramework::CisaBinary *m_cisaBinary;
     VISAKernelImpl * get_kernel() { return m_kernel; }
 
diff --git a/visa/BuildCISAIRImpl.cpp b/visa/BuildCISAIRImpl.cpp
@@ -356,6 +356,15 @@ int CISA_IR_Builder::AddKernel(VISAKernel *& kernel, const char* kernelName)
     return VISA_SUCCESS;
 }
 
+int CISA_IR_Builder::SetPrevKernel(VISAKernel *& prevKernel)
+{
+    if (prevKernel)
+    {
+        m_prevKernel = (VISAKernelImpl*)prevKernel;
+    }
+    return VISA_SUCCESS;
+}
+
 int CISA_IR_Builder::AddFunction(VISAFunction *& function, const char* functionName)
 {
     if (function)
diff --git a/visa/VISAKernelImpl.cpp b/visa/VISAKernelImpl.cpp
@@ -619,7 +619,6 @@ void VISAKernelImpl::CopyVars(VISAKernelImpl* from)
 
 int VISAKernelImpl::InitializeKernel(const char *kernel_name)
 {
-
     int status = VISA_SUCCESS;
     m_num_pred_vars = Get_CISA_PreDefined_Var_Count();
     setName(kernel_name);
diff --git a/visa/include/VISABuilderAPIDefinition.h b/visa/include/VISABuilderAPIDefinition.h
@@ -846,6 +846,7 @@ class VISABuilder
 {
 public:
     VISA_BUILDER_API virtual int AddKernel(VISAKernel *& kernel, const char* kernelName) = 0;
+    VISA_BUILDER_API virtual int SetPrevKernel(VISAKernel*& prevKernel) = 0;
     VISA_BUILDER_API virtual int AddFunction(VISAFunction *& function, const char* functionName) = 0;
     VISA_BUILDER_API virtual int AddPayloadSection(VISAFunction *& function, const char* functionName) = 0;
     VISA_BUILDER_API virtual int Compile(const char * isaFileNameint, std::ostream* os = nullptr, bool emit_visa_only = false) = 0;

Original file line number	Diff line number	Diff line change
`@@ -4392,7 +4392,7 @@ namespace IGC`
`4392`	`4392`	`}`
`4393`	`4393`	`}`
`4394`	`4394`
`4395`		`- void CEncoder::InitEncoder(bool canAbortOnSpill, bool hasStackCall)`
	`4395`	`+ void CEncoder::InitEncoder(bool canAbortOnSpill, bool hasStackCall, VISAKernel* prevKernel)`
`4396`	`4396`	`{`
`4397`	`4397`	`m_aliasesMap.clear();`
`4398`	`4398`	`m_encoderState.m_SubSpanDestination = false;`
`@@ -4431,6 +4431,10 @@ namespace IGC`
`4431`	`4431`	`V(CreateVISABuilder(vbuilder, builderMode, builderOpt, VISAPlatform, params.size(), params.data(),`
`4432`	`4432`	`&m_vISAWaTable));`
`4433`	`4433`
	`4434`	`+ if (IsCodePatchCandidate())`
	`4435`	`+ {`
	`4436`	`+ SetHasPrevKernel(prevKernel != nullptr);`
	`4437`	`+ }`
`4434`	`4438`	`InitVISABuilderOptions(VISAPlatform, canAbortOnSpill, hasStackCall, builderOpt == VISA_BUILDER_BOTH);`
`4435`	`4439`
`4436`	`4440`	`// Pass all build options to builder`
`@@ -4486,6 +4490,7 @@ namespace IGC`
`4486`	`4490`	`}`
`4487`	`4491`
`4488`	`4492`	`V(vbuilder->AddKernel(vKernel, kernelName.c_str()));`
	`4493`	`+ V(vbuilder->SetPrevKernel(prevKernel));`
`4489`	`4494`	`V(vKernel->AddKernelAttribute("OutputAsmPath", asmName.length(), asmName.c_str()));`
`4490`	`4495`
`4491`	`4496`	`SetDispatchSimdSize();`
Original file line number	Diff line number	Diff line change
`@@ -306,6 +306,15 @@ void CPixelShader::AllocatePSPayload()`
`306`	`306`	`if (encoder.IsCodePatchCandidate())`
`307`	`307`	`{`
`308`	`308`	`encoder.SetPayloadSectionAsSecondary();`
	`309`	`+ if (encoder.HasPrevKernel())`
	`310`	`+ {`
	`311`	`+ // Get previous context's PayloadEnd to ensure it is patchable`
	`312`	`+ offset = encoder.GetPayloadEnd();`
	`313`	`+ }`
	`314`	`+ else`
	`315`	`+ {`
	`316`	`+ encoder.SetPayloadEnd(payloadEnd);`
	`317`	`+ }`
`309`	`318`	`}`
`310`	`319`	`if (offset % getGRFSize() != 0)`
`311`	`320`	`{`
Original file line number	Diff line number	Diff line change
`@@ -619,7 +619,6 @@ void VISAKernelImpl::CopyVars(VISAKernelImpl* from)`
`619`	`619`
`620`	`620`	`int VISAKernelImpl::InitializeKernel(const char *kernel_name)`
`621`	`621`	`{`
`622`		`-`
`623`	`622`	`int status = VISA_SUCCESS;`
`624`	`623`	`m_num_pred_vars = Get_CISA_PreDefined_Var_Count();`
`625`	`624`	`setName(kernel_name);`
Original file line number	Diff line number	Diff line change
`@@ -846,6 +846,7 @@ class VISABuilder`
`846`	`846`	`{`
`847`	`847`	`public:`
`848`	`848`	`VISA_BUILDER_API virtual int AddKernel(VISAKernel & kernel, const char kernelName) = 0;`
	`849`	`+ VISA_BUILDER_API virtual int SetPrevKernel(VISAKernel*& prevKernel) = 0;`
`849`	`850`	`VISA_BUILDER_API virtual int AddFunction(VISAFunction & function, const char functionName) = 0;`
`850`	`851`	`VISA_BUILDER_API virtual int AddPayloadSection(VISAFunction & function, const char functionName) = 0;`
`851`	`852`	`VISA_BUILDER_API virtual int Compile(const char * isaFileNameint, std::ostream* os = nullptr, bool emit_visa_only = false) = 0;`