Changes in code.

Author: houjenko

IGC/Compiler/CISACodeGen/EmitVISAPass.cpp

@@ -1024,12 +1024,6 @@ bool EmitPass::runOnFunction(llvm::Function& F)
         }
         if (m_encoder->IsCodePatchCandidate())
         {
-            if (m_currShader->GetShaderType() == ShaderType::PIXEL_SHADER)
-            {
-                CPixelShader* psProgram = static_cast<CPixelShader*>(m_currShader);
-                bool needToPreserveR1Lo = (psProgram->GetR1Lo().size() != 0);
-                m_encoder->GetVISAKernel()->AddKernelAttribute("NeedToPreserveR1Lo", sizeof(uint32_t), &needToPreserveR1Lo);
-            }
             if (IGC_GET_FLAG_VALUE(CodePatchLimit) >= 2)
             {
                 IGC_SET_FLAG_VALUE(CodePatchLimit, IGC_GET_FLAG_VALUE(CodePatchLimit) - 1);

IGC/Compiler/CISACodeGen/PixelShaderCodeGen.cpp

@@ -145,6 +145,10 @@ void CPixelShader::AllocatePSPayload()
         for (uint i = 0; i < GetR1()->GetNumberInstance(); i++)
         {
             AllocateInput(GetR1(), offset, i, forceLiveOut);
+            for (auto R1Lo: GetR1Lo()) {
+                AllocateInput(R1Lo, offset, i, forceLiveOut);
+            }
+
             offset += getGRFSize();
         }
     }

visa/BuildCISAIRImpl.cpp

@@ -1167,10 +1167,7 @@ int CISA_IR_Builder::Compile(const char* nameInput, std::ostream* os, bool emit_
             {
                 // Copy main kernel's declarations (shader body) into payload section
                 kernel->CopyVars(mainKernel);
-                kernel->getKernel()->Declares.insert(
-                        kernel->getKernel()->Declares.end(),
-                        mainKernel->getKernel()->Declares.begin(),
-                        mainKernel->getKernel()->Declares.end());
+                kernel->getKernel()->Declares = mainKernel->getKernel()->Declares;
 
                 // Set payload LiveOuts to be output
                 uint32_t inputCount = mainKernel->getIRBuilder()->getInputCount();
@@ -1191,8 +1188,7 @@ int CISA_IR_Builder::Compile(const char* nameInput, std::ostream* os, bool emit_
                 mainKernel->getIRBuilder()->getRealR0()->setLiveOut();
             }
 
-            if ((kernel->getIsKernel() && isInPatchingMode) ||
-                kernel->getvIsaInstCount() == 0)
+            if (kernel->getIsKernel() && isInPatchingMode)
             {
                 continue;
             }

visa/BuildIR.h

@@ -369,9 +369,6 @@ class IR_Builder
 
     unsigned int sampler8x8_group_id;
 
-    // input declare of R1.
-    G4_Declare* inputR1 = nullptr;
-
     // Populate this data structure so after compiling all kernels
     // in file, we can emit out patch file using this up-levelled
     // information.
@@ -570,10 +567,6 @@ class IR_Builder
         return kernel.getInt32KernelAttr(Attributes::ATTR_CrossThreadInputSize);
     }
 
-    bool getNeedToPreserveR1Lo() const {
-        return kernel.getBoolKernelAttr(Attributes::ATTR_NeedToPreserveR1Lo);
-    }
-
     //
     // Check if opnd is or can be made "alignByte"-byte aligned.
     // These functions will change the underlying variable's alignment
@@ -678,9 +671,6 @@ class IR_Builder
     G4_Declare* getBuiltinSamplerHeader() const { return builtinSamplerHeader; }
     G4_Declare* getOldA0Dot2Temp() const { return oldA0Dot2Temp; }
 
-    G4_Declare* getInputR1() { return inputR1; }
-    void setInputR1(G4_Declare* r1) { inputR1 = r1; }
-
     bool isBindlessSampler(const G4_Operand* sampler) const {
         return sampler->isSrcRegRegion() && sampler->getTopDcl() == getBuiltinBindlessSampler();
     }

visa/LocalRA.cpp

@@ -1018,10 +1018,7 @@ void GlobalRA::removeUnreferencedDcls()
             getNumRefs(dcl) == 0 &&
             dcl->getRegVar()->isPhyRegAssigned() == false &&
             dcl != kernel.fg.builder->getBuiltinR0()
-            && dcl != kernel.fg.builder->getSpillSurfaceOffset() &&
-            (!kernel.fg.builder->getOptions()->getuInt32Option(vISA_CodePatch) ||
-             !kernel.fg.builder->getNeedToPreserveR1Lo() ||
-             dcl->getAliasDeclare() != kernel.fg.builder->getInputR1());
+            && dcl != kernel.fg.builder->getSpillSurfaceOffset();
     };
 
     kernel.Declares.erase(

visa/VISAKernelImpl.cpp

@@ -613,10 +613,7 @@ int VISAKernelImpl::InitializeFastPath()
 
 void VISAKernelImpl::CopyVars(VISAKernelImpl* from)
 {
-    m_builder->dclpool.getDeclareList().insert(
-            m_builder->dclpool.getDeclareList().end(),
-            from->m_builder->dclpool.getDeclareList().begin(),
-            from->m_builder->dclpool.getDeclareList().end());
+    m_builder->dclpool.getDeclareList() = from->m_builder->dclpool.getDeclareList();
 }
 
 int VISAKernelImpl::InitializeKernel(const char *kernel_name)
@@ -1768,12 +1765,6 @@ int VISAKernelImpl::CreateVISAInputVar(
         }
     }
 
-    // save the G4_declare of "R1" input in builder
-    if (offset == getGRFSize() && size == getGRFSize() && m_builder)
-    {
-        m_builder->setInputR1(input->dcl);
-    }
-
     return status;
 }
 

visa/include/VISAAttributes.h

@@ -53,7 +53,6 @@ DEF_ATTR_INT32(ATTR_SimdSize,              "SimdSize",      AK_KERNEL, 0, "Dispa
 DEF_ATTR_INT32(ATTR_Scope,                 "Scope",         AK_VAR,    0, "")
 DEF_ATTR_INT32(ATTR_SurfaceUsage,          "SurfaceUsage",  AK_VAR,    0, "")
 DEF_ATTR_INT32(ATTR_CrossThreadInputSize,  "CrossThreadInputSize",AK_KERNEL, -1, "cross-thread payload size in bytes")
-DEF_ATTR_BOOL(ATTR_NeedToPreserveR1Lo,    "NeedToPreserveR1Lo",   AK_KERNEL, 0, "")
 
 
 // C String Attributes