Cleanup unnecessary R1Lo

Remove workaround from the code patching

Author: houjenko

IGC/Compiler/CISACodeGen/PixelShaderCodeGen.cpp

@@ -145,10 +145,6 @@ 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,7 +1025,10 @@ 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 = mainKernel->getKernel()->Declares;
+                kernel->getKernel()->Declares.insert(
+                        kernel->getKernel()->Declares.end(),
+                        mainKernel->getKernel()->Declares.begin(),
+                        mainKernel->getKernel()->Declares.end());
 
                 // Set payload LiveOuts to be output
                 uint32_t inputCount = mainKernel->getIRBuilder()->getInputCount();
@@ -1046,7 +1049,8 @@ int CISA_IR_Builder::Compile(const char* nameInput, std::ostream* os, bool emit_
                 mainKernel->getIRBuilder()->getRealR0()->setLiveOut();
             }
 
-            if (kernel->getIsKernel() && isInPatchingMode)
+            if ((kernel->getIsKernel() && isInPatchingMode) ||
+                kernel->getvIsaInstCount() == 0)
             {
                 continue;
             }

visa/LocalRA.cpp

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

visa/RegAlloc.cpp

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

visa/VISAKernelImpl.cpp

@@ -570,7 +570,10 @@ int VISAKernelImpl::InitializeFastPath()
 
 void VISAKernelImpl::CopyVars(VISAKernelImpl* from)
 {
-    m_builder->dclpool.getDeclareList() = from->m_builder->dclpool.getDeclareList();
+    m_builder->dclpool.getDeclareList().insert(
+            m_builder->dclpool.getDeclareList().end(),
+            from->m_builder->dclpool.getDeclareList().begin(),
+            from->m_builder->dclpool.getDeclareList().end());
 }
 
 int VISAKernelImpl::InitializeKernel(const char *kernel_name)