FunctionUpgrader for LinkMultiRateShaders

Change-Id: Ib3f4f4f6fdba2a2267547975f447e10a07292f7d

Author: lwesiers

IGC/Compiler/Optimizer/LinkMultiRateShaders.cpp

@@ -36,6 +36,8 @@ SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 #include "common/LLVMWarningsPop.hpp"
 #include "LLVM3DBuilder/BuiltinsFrontend.hpp"
 
+#include "common/FunctionUpgrader.h"
+
 using namespace IGC;
 using namespace IGC::IGCMD;
 using namespace llvm;
@@ -215,10 +217,14 @@ Function* LinkMultiRateShader::PatchSamplePhaseSignature(
     Module* M = samplePhase->getParent();
     CodeGenContext* ctx = getAnalysis<CodeGenContextWrapper>().getCodeGenContext();
     LLVM3DBuilder<> builder(samplePhase->getContext(), ctx->platform.getPlatformInfo());
-
+    
+    FunctionUpgrader FuncUpgrader;
+    
+    FuncUpgrader.SetFunctionToUpgrade(samplePhase);
+    
     // find all the phase inputs
     Function* phaseInput = GenISAIntrinsic::getDeclaration(M, GenISAIntrinsic::GenISA_PHASE_INPUT);
-    Value* sampleIndex = new llvm::Argument(builder.getInt32Ty(), "", samplePhase);
+    Value* sampleIndex = FuncUpgrader.AddArgument("", builder.getInt32Ty());
 
     SmallVector<Type*, 10> funcSignature;
     funcSignature.push_back(builder.getInt32Ty());
@@ -238,7 +244,7 @@ Function* LinkMultiRateShader::PatchSamplePhaseSignature(
                 }
                 else
                 {
-                    arg = new llvm::Argument(inst->getType(), "", samplePhase);
+                    arg = FuncUpgrader.AddArgument("", inst->getType());
                     funcSignature.push_back(inst->getType());
                     linkArguments[index] = arg;
                     linkSignature[index] = inputLocation++;
@@ -247,7 +253,16 @@ Function* LinkMultiRateShader::PatchSamplePhaseSignature(
             }
         }
     }
-
+    
+    Function* newSamplePhase = FuncUpgrader.RebuildFunction();
+    
+    samplePhase->eraseFromParent();
+    samplePhase = newSamplePhase;
+    samplePhase->addFnAttr(llvm::Attribute::AlwaysInline);
+    sampleIndex = FuncUpgrader.GetArgumentFromRebuild(sampleIndex);
+    
+    FuncUpgrader.Clean();
+    
     // Replace sample index intrinsic
     Function* SGV = GenISAIntrinsic::getDeclaration(
         M, 
@@ -325,7 +340,6 @@ Function* LinkMultiRateShader::PatchSamplePhaseSignature(
         }
     }
 
-
     Function* rtWrite = GenISAIntrinsic::getDeclaration(
         M,
         GenISAIntrinsic::GenISA_RTWrite,
@@ -342,7 +356,6 @@ Function* LinkMultiRateShader::PatchSamplePhaseSignature(
         }
     }
 
-
     Function* dualBlend = GenISAIntrinsic::getDeclaration(
         M,
         GenISAIntrinsic::GenISA_RTDualBlendSource,
@@ -359,22 +372,5 @@ Function* LinkMultiRateShader::PatchSamplePhaseSignature(
         }
     }
 
-    // Create new function with the right signature
-    FunctionType* signature = FunctionType::get(builder.getVoidTy(), funcSignature, false);
-    Function* newSamplePhase = Function::Create(signature, GlobalValue::PrivateLinkage, "samplePhase", M);
-    newSamplePhase->addFnAttr(llvm::Attribute::AlwaysInline);
-
-    newSamplePhase->getBasicBlockList().splice(
-        newSamplePhase->begin(),
-        samplePhase->getBasicBlockList());
-    for(auto I = samplePhase->arg_begin(), E = samplePhase->arg_end(), I2 = newSamplePhase->arg_begin(); 
-        I != E; 
-        ++I, ++I2)
-    {
-        I->replaceAllUsesWith(&(*I2));
-    }
-
-    samplePhase->eraseFromParent();
-    
-    return newSamplePhase;
+    return samplePhase;
 }