[IGC Feature][CodePatch] Maintain mapping VISA->LLVM

houjenko · sys_zuul · commit d2303439d9c4 · 2020-04-06T09:31:24.000-07:00
Change-Id: Ic742d837343dc8c0c126145e596f7ca3b262b787
diff --git a/IGC/Compiler/CISACodeGen/CISABuilder.cpp b/IGC/Compiler/CISACodeGen/CISABuilder.cpp
@@ -3729,6 +3729,7 @@ namespace IGC
         {
             params.push_back(param_uptr("-debug", literal_deleter));
         }
+
         if (context->getModuleMetaData()->compOpt.FastVISACompile)
         {
             params.push_back(param_uptr("-fasterRA", literal_deleter));
@@ -6087,6 +6088,11 @@ namespace IGC
         V(vKernel->AppendVISADebugLinePlaceholder());
     }
 
+    void CEncoder::SetCurrentInst(llvm::Instruction *inst)
+    {
+        V(vKernel->AppendVISALLVMInst(inst));
+    }
+
 
     std::string CEncoder::GetVariableName(CVariable* var)
     {
diff --git a/IGC/Compiler/CISACodeGen/CISABuilder.hpp b/IGC/Compiler/CISACodeGen/CISABuilder.hpp
@@ -233,6 +233,7 @@ namespace IGC
         void File(std::string& s);
         void PredAdd(CVariable* flag, CVariable* dst, CVariable* src0, CVariable* src1);
         void DebugLinePlaceholder();
+        void SetCurrentInst(llvm::Instruction *inst);
 
         inline void Jump(uint label);
         inline void Cast(CVariable* dst, CVariable* src);
diff --git a/IGC/Compiler/CISACodeGen/EmitVISAPass.cpp b/IGC/Compiler/CISACodeGen/EmitVISAPass.cpp
@@ -628,6 +628,9 @@ bool EmitPass::runOnFunction(llvm::Function& F)
                 IF_DEBUG_INFO_IF(m_pDebugEmitter, m_pDebugEmitter->EndInstruction(llvmInst);)
             }
         }
+
+        m_encoder->SetCurrentInst(nullptr);
+
         if (llvmtoVISADump)
         {
             if (block.bb->hasName())
@@ -9016,6 +9019,8 @@ void EmitPass::EmitNoModifier(llvm::Instruction* inst)
         return;
     }
 
+    m_encoder->SetCurrentInst(inst);
+
     switch (inst->getOpcode())
     {
     case Instruction::Ret:
diff --git a/visa/BuildIR.h b/visa/BuildIR.h
@@ -557,6 +557,8 @@ class IR_Builder {
     input_info_t * getInputArg(unsigned int index);
     unsigned int getInputCount();
     input_info_t *getRetIPArg();
+    const void* GetCurrentInst() const { return m_inst; };
+    void SetCurrentInst(const void* inst) { m_inst = inst; };
 
     const CISA_IR_Builder* getParent() const { return parentBuilder; }
     std::stringstream& criticalMsgStream();
@@ -898,6 +900,7 @@ class IR_Builder {
         use64BitFEStackVars(false), mem(m), phyregpool(m, k.getNumRegTotal()), hashtable(m), rgnpool(m), dclpool(m),
         instList(alloc), kernel(k)
     {
+        m_inst = nullptr;
         num_general_dcl = 0;
         num_temp_dcl = 0;
         kernel.setBuilder(this); // kernel needs pointer to the builder
@@ -2756,6 +2759,7 @@ class IR_Builder {
 #include "HWCaps.inc"
 
 private:
+    const void* m_inst;
     G4_SrcRegRegion* createBindlessExDesc(uint32_t exdesc);
 
     int translateVISASLMByteScaledInst(
diff --git a/visa/FlowGraph.cpp b/visa/FlowGraph.cpp
@@ -5820,6 +5820,7 @@ void G4_BB::emitBasicInstructionIga(char* instSyntax, std::ostream& output, INST
 }
 void G4_BB::emitBasicInstruction(std::ostream& output, INST_LIST_ITER &it)
 {
+    const void *llvmInst = (*it)->GetLLVMInst();
     if ((*it)->isSend())
     {
         //
diff --git a/visa/Gen4_IR.cpp b/visa/Gen4_IR.cpp
@@ -755,7 +755,8 @@ G4_INST::G4_INST(const IR_Builder& irb,
     evenlySplitInst(false),
     execSize(size),
     bin(nullptr),
-    builder(irb)
+    builder(irb),
+    llvmInst(irb.GetCurrentInst())
 {
     srcs[0] = s0;
     srcs[1] = s1;
@@ -798,7 +799,8 @@ G4_INST::G4_INST(const IR_Builder& irb,
     evenlySplitInst(false),
     execSize(size),
     bin(nullptr),
-    builder(irb)
+    builder(irb),
+    llvmInst(irb.GetCurrentInst())
 {
     srcs[0] = s0;
     srcs[1] = s1;
diff --git a/visa/Gen4_IR.hpp b/visa/Gen4_IR.hpp
@@ -547,8 +547,11 @@ class G4_INST
     uint32_t global_id = (uint32_t) -1;
 
     const IR_Builder& builder;  // link to builder to access the various compilation options
+    const void *llvmInst;
 
 public:
+    const void* GetLLVMInst() { return llvmInst; };
+    G4_INST* InheritLLVMInst(G4_INST* i) { llvmInst = i->GetLLVMInst(); return this; };
     enum SWSBTokenType {
         TOKEN_NONE,
         AFTER_READ,
diff --git a/visa/HWConformity.cpp b/visa/HWConformity.cpp
@@ -7145,7 +7145,7 @@ static void expandPlaneMacro(IR_Builder& builder, INST_LIST_ITER it, G4_BB* bb,
         builder.createDst(builder.phyregpool.getAcc0Reg(), 0, 0, 1, Type_NF) :
         builder.Create_Dst_Opnd_From_Dcl(tmpVal, 1);
     G4_INST* madInst = builder.createInternalInst(nullptr, G4_mad, nullptr, false, 8, accDst,
-        srcR, u, srcP, options | InstOpt_WriteEnable);
+        srcR, u, srcP, options | InstOpt_WriteEnable)->InheritLLVMInst(inst);
     bb->insert(it, madInst);
 
     G4_Predicate* pred = inst->getPredicate() ? builder.duplicateOperand(inst->getPredicate()) : nullptr;
@@ -7156,7 +7156,7 @@ static void expandPlaneMacro(IR_Builder& builder, INST_LIST_ITER it, G4_BB* bb,
     G4_DstRegRegion* newDst = builder.createDst(dst->getBase(),
         dst->getRegOff() + (secondHalf ? 1 : 0), dst->getSubRegOff(), dst->getHorzStride(), dst->getType());
     G4_INST* secondMadInst = builder.createInternalInst(pred, G4_mad, condMod, inst->getSaturate(), 8, newDst,
-        accSrc, v, srcQ, options);
+        accSrc, v, srcQ, options)->InheritLLVMInst(inst);
     bb->insert(it, secondMadInst);
 }
 
diff --git a/visa/Optimizer.cpp b/visa/Optimizer.cpp
@@ -442,13 +442,13 @@ void Optimizer::insertHashMovs()
                         16,
                         kernel.fg.builder->createNullDst(Type_UD),
                         kernel.fg.builder->createImm((unsigned int)(hashVal & 0xffffffff), Type_UD),
-                        InstOpt_WriteEnable, false);
+                        InstOpt_WriteEnable, false)->InheritLLVMInst(inst);
 
                     hi = kernel.fg.builder->createMov(
                         16,
                         kernel.fg.builder->createNullDst(Type_UD),
                         kernel.fg.builder->createImm((unsigned int)((hashVal >> 32) & 0xffffffff), Type_UD),
-                        InstOpt_WriteEnable, false);
+                        InstOpt_WriteEnable, false)->InheritLLVMInst(inst);
 
                     bb->push_back(lo);
                     bb->push_back(hi);
@@ -6874,7 +6874,7 @@ bool Optimizer::foldPseudoAndOr(G4_BB* bb, INST_LIST_ITER& ii)
                     // insert "(W) mov(16) acc0.0:f 0x0:f" before EOT
                     G4_INST* movInst = builder.createMov(16,
                         builder.createDst(builder.phyregpool.getAcc0Reg(),0, 0, 1, Type_F),
-                        builder.createImm(0, Type_F), InstOpt_WriteEnable, false);
+                        builder.createImm(0, Type_F), InstOpt_WriteEnable, false)->InheritLLVMInst(inst);
                     // insert mov before contiguous send, in case that there are instruction combined set on continuous
                     // two send
                     INST_LIST_ITER insert_point = ii;
diff --git a/visa/VISAKernel.h b/visa/VISAKernel.h
@@ -476,6 +476,8 @@ class VISAKernelImpl : public VISAFunction
 
     VISA_BUILDER_API int AppendVISADebugLinePlaceholder();
 
+    VISA_BUILDER_API int AppendVISALLVMInst(void *inst);
+
     VISA_BUILDER_API int AppendVISAMiscRawSend(VISA_PredOpnd *pred, VISA_EMask_Ctrl emask, VISA_Exec_Size executionSize, unsigned char modifiers,
         unsigned int exMsgDesc, unsigned char srcSize, unsigned char dstSize, VISA_VectorOpnd *desc,
         VISA_RawOpnd *src, VISA_RawOpnd *dst);
diff --git a/visa/VISAKernelImpl.cpp b/visa/VISAKernelImpl.cpp
@@ -8383,6 +8383,12 @@ void VISAKernelImpl::computeAndEmitDebugInfo(std::list<VISAKernelImpl*>& functio
 #endif
 }
 
+int VISAKernelImpl::AppendVISALLVMInst(void *inst)
+{
+    m_builder->SetCurrentInst(inst);
+    return VISA_SUCCESS;
+}
+
 extern "C" void freeBlock(void* ptr);
 
 bool VISAKernelImpl::getIntKernelAttributeValue(const char* attrName, int& value)
diff --git a/visa/include/VISABuilderAPIDefinition.h b/visa/include/VISABuilderAPIDefinition.h
@@ -494,6 +494,8 @@ class VISAKernel
 
     VISA_BUILDER_API virtual int AppendVISADebugLinePlaceholder() = 0;
 
+    VISA_BUILDER_API virtual int AppendVISALLVMInst(void *inst) = 0;
+
     /// AppendVISAMiscRawSend -- create a GEN send instruction
     /// [pred] send/sendc (esize) <dst> <src> <exMsgDesc> <desc> {emask}
     /// bit 0 of modifiers controls whether it's send (0) or sendc (1)

Original file line number	Diff line number	Diff line change
`@@ -3729,6 +3729,7 @@ namespace IGC`
`3729`	`3729`	`{`
`3730`	`3730`	`params.push_back(param_uptr("-debug", literal_deleter));`
`3731`	`3731`	`}`
	`3732`	`+`
`3732`	`3733`	`if (context->getModuleMetaData()->compOpt.FastVISACompile)`
`3733`	`3734`	`{`
`3734`	`3735`	`params.push_back(param_uptr("-fasterRA", literal_deleter));`
`@@ -6087,6 +6088,11 @@ namespace IGC`
`6087`	`6088`	`V(vKernel->AppendVISADebugLinePlaceholder());`
`6088`	`6089`	`}`
`6089`	`6090`
	`6091`	`+ void CEncoder::SetCurrentInst(llvm::Instruction *inst)`
	`6092`	`+ {`
	`6093`	`+ V(vKernel->AppendVISALLVMInst(inst));`
	`6094`	`+ }`
	`6095`	`+`
`6090`	`6096`
`6091`	`6097`	`std::string CEncoder::GetVariableName(CVariable* var)`
`6092`	`6098`	`{`
Original file line number	Diff line number	Diff line change
`@@ -628,6 +628,9 @@ bool EmitPass::runOnFunction(llvm::Function& F)`
`628`	`628`	`IF_DEBUG_INFO_IF(m_pDebugEmitter, m_pDebugEmitter->EndInstruction(llvmInst);)`
`629`	`629`	`}`
`630`	`630`	`}`
	`631`	`+`
	`632`	`+ m_encoder->SetCurrentInst(nullptr);`
	`633`	`+`
`631`	`634`	`if (llvmtoVISADump)`
`632`	`635`	`{`
`633`	`636`	`if (block.bb->hasName())`
`@@ -9016,6 +9019,8 @@ void EmitPass::EmitNoModifier(llvm::Instruction* inst)`
`9016`	`9019`	`return;`
`9017`	`9020`	`}`
`9018`	`9021`
	`9022`	`+ m_encoder->SetCurrentInst(inst);`
	`9023`	`+`
`9019`	`9024`	`switch (inst->getOpcode())`
`9020`	`9025`	`{`
`9021`	`9026`	`case Instruction::Ret:`
Original file line number	Diff line number	Diff line change
`@@ -5820,6 +5820,7 @@ void G4_BB::emitBasicInstructionIga(char* instSyntax, std::ostream& output, INST`
`5820`	`5820`	`}`
`5821`	`5821`	`void G4_BB::emitBasicInstruction(std::ostream& output, INST_LIST_ITER &it)`
`5822`	`5822`	`{`
	`5823`	`+ const void llvmInst = (it)->GetLLVMInst();`
`5823`	`5824`	`if ((*it)->isSend())`
`5824`	`5825`	`{`
`5825`	`5826`	`//`