[Autobackout][FuncReg]Revert of change: 75a2018

 Cleanup unnecessary R1Lo

Remove workaround from the code patching

Author: houjenko

IGC/Compiler/CISACodeGen/EmitVISAPass.cpp

@@ -7852,12 +7852,18 @@ void EmitPass::getCoarsePixelSize(CVariable* destination, const uint component,
 
     CPixelShader* const psProgram = static_cast<CPixelShader*>(m_currShader);
     CVariable* r;
+    bool isR1Lo = false;
     // Coarse pixel sizes are in R1 for both simd32 halves.
     {
         r = psProgram->GetPhase() == PSPHASE_PIXEL ? psProgram->GetCoarseR1() : psProgram->GetR1();
+        isR1Lo = true;
     }
     r = m_currShader->GetVarHalf(r, 0);
     CVariable* const coarsePixelSize = m_currShader->BitCast(r, ISA_TYPE_UB);
+    if (isR1Lo && isCodePatchCandidate)
+    {
+        psProgram->AppendR1Lo(coarsePixelSize);
+    }
     m_encoder->SetSrcRegion(0, 0, 1, 0);
     uint subReg;
     {
@@ -7908,6 +7914,10 @@ void EmitPass::emitPSSGV(GenIntrinsicInst* inst)
             CVariable* floatR1 = nullptr;
             {
                 floatR1 = psProgram->BitCast(psProgram->GetR1(), ISA_TYPE_F);
+                if (m_encoder->IsCodePatchCandidate())
+                {
+                    psProgram->AppendR1Lo(floatR1);
+                }
             }
 
             // Returns (x - xstart) or (y - ystart) in float.
@@ -8117,6 +8127,10 @@ void EmitPass::emitPSSGV(GenIntrinsicInst* inst)
                     m_encoder->SetSimdSize(simdSize);
                     m_encoder->SetMask(i == 0 ? EMASK_Q1 : EMASK_Q2);
                     m_encoder->SetDstSubVar(i);
+                    if (m_encoder->IsCodePatchCandidate())
+                    {
+                        psProgram->AppendR1Lo(src);
+                    }
                     m_encoder->Cast(dst, src);
                     m_encoder->Push();
                 }
@@ -8287,10 +8301,16 @@ void EmitPass::getPixelPosition(CVariable* destination, const uint component, bo
     {
         // Coarse pixel sizes are in R1 for both simd32 halves.
         CVariable* r;
+        bool isR1Lo = false;
         {
             r = m_currShader->GetVarHalf(psProgram->GetR1(), 0);
+            isR1Lo = true;
         }
         CVariable* CPSize = m_currShader->BitCast(r, ISA_TYPE_UB);
+        if (isR1Lo && isCodePatchCandidate)
+        {
+            psProgram->AppendR1Lo(CPSize);
+        }
         pixelSize =
             m_currShader->GetNewVariable(
                 numLanes(m_currShader->m_SIMDSize), ISA_TYPE_UW, EALIGN_GRF, CName::NONE);
@@ -8325,6 +8345,7 @@ void EmitPass::getPixelPosition(CVariable* destination, const uint component, bo
         if (isCodePatchCandidate)
         {
             m_encoder->SetPayloadSectionAsPrimary();
+            psProgram->AppendR1Lo(position);
             m_currShader->AddPatchTempSetup(destination);
         }
         m_encoder->Add(destination, position, pixelSize);

IGC/Compiler/CISACodeGen/PixelShaderCodeGen.cpp

@@ -33,6 +33,16 @@ CVariable* CPixelShader::GetR1()
     return m_R1;
 }
 
+std::vector<CVariable*>& CPixelShader::GetR1Lo()
+{
+    return m_R1Lo;
+}
+
+void CPixelShader::AppendR1Lo(CVariable* var)
+{
+    m_R1Lo.push_back(var);
+}
+
 CVariable* CPixelShader::GetCoarseR1()
 {
     IGC_ASSERT(m_phase == PSPHASE_PIXEL);
@@ -135,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();
         }
     }

IGC/Compiler/CISACodeGen/PixelShaderCodeGen.hpp

@@ -36,6 +36,8 @@ class CPixelShader : public CShader
     CPixelShader(llvm::Function* pFunc, CShaderProgram* pProgram);
     ~CPixelShader();
     CVariable* GetR1();
+    std::vector<CVariable*>& GetR1Lo();
+    void AppendR1Lo(CVariable* var);
     CVariable* GetCoarseR1();
     CVariable* GetBaryReg(e_interpolation mode);
     CVariable* GetBaryRegLoweredHalf(e_interpolation mode);
@@ -128,6 +130,7 @@ class CPixelShader : public CShader
     USC::GFX3DSTATE_SF_ATTRIBUTE_ACTIVE_COMPONENT GetActiveComponents(uint attribute) const;
 
     CVariable* m_R1;
+    std::vector<CVariable*> m_R1Lo;
     CVariable* m_PerspectiveBaryPlanes;
     CVariable* m_NonPerspectiveBaryPlanes;
     CVariable* m_CoarseR1;