[Autobackout][FuncReg]Revert of change: 7f04dc9

 Cleanup unnecessary R1Lo

Remove workaround from the code patching

Author: houjenko

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

@@ -1025,10 +1025,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();
@@ -1049,8 +1046,7 @@ int CISA_IR_Builder::Compile(const char* nameInput, std::ostream* os, bool emit_
                 mainKernel->getIRBuilder()->getRealR0()->setLiveOut();
             }
 
-            if ((kernel->getIsKernel() && isInPatchingMode) ||
-                kernel->getCisaInstCount() == 1)
+            if (kernel->getIsKernel() && isInPatchingMode)
             {
                 continue;
             }

visa/LocalRA.cpp

@@ -159,10 +159,7 @@ void LocalRA::preLocalRAAnalysis()
     unsigned int numRowsReserved = numRowsEOT;
 
     // Remove unreferenced dcls
-    if (!builder.getOptions()->getuInt32Option(vISA_CodePatch))
-    {
-        gra.removeUnreferencedDcls();
-    }
+    gra.removeUnreferencedDcls();
 
     if (builder.getOption(vISA_HybridRAWithSpill) || builder.getOption(vISA_FastCompileRA))
     {

visa/RegAlloc.cpp

@@ -3547,10 +3547,7 @@ int regAlloc(IR_Builder& builder, PhyRegPool& regPool, G4_Kernel& kernel)
     gra.markGraphBlockLocalVars();
 
     //Remove the un-referenced declares
-    if (!builder.getOptions()->getuInt32Option(vISA_CodePatch))
-    {
-        gra.removeUnreferencedDcls();
-    }
+    gra.removeUnreferencedDcls();
 
     if (kernel.getInt32KernelAttr(Attributes::ATTR_Target) == VISA_CM)
     {

visa/VISAKernel.h

@@ -166,8 +166,6 @@ class VISAKernelImpl : public VISAFunction
     std::list<CisaFramework::CisaInst *>::iterator getInstructionListBegin() { return m_instruction_list.begin(); }
     std::list<CisaFramework::CisaInst *>::iterator getInstructionListEnd() { return m_instruction_list.end(); }
 
-    int getCisaInstCount() { return m_instruction_list.size(); }
-
     unsigned long getGenxBinarySize() { return m_genx_binary_size; }
 
     char * getGenxBinaryBuffer() { return m_genx_binary_buffer; }

visa/VISAKernelImpl.cpp

@@ -570,10 +570,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)