Pattern matching for immediate offset

Change-Id: Idb07d848819a688276157af4d90b9ad91530ea63

Author: jfuentes

IGC/Compiler/CISACodeGen/EmitVISAPass.cpp

@@ -8513,9 +8513,9 @@ getMsgBlockSizes(unsigned sizeInBits, unsigned alignInBits) {
     return std::make_pair(~0U, ~0U);
 }
 
-void EmitPass::emitLoad(LoadInst* inst)
+void EmitPass::emitLoad(LoadInst* inst, Value* offset, ConstantInt* immOffset)
 {
-    emitVectorLoad(inst, inst->getPointerOperand());
+    emitVectorLoad(inst, offset, immOffset);
 }
 
 void EmitPass::EmitNoModifier(llvm::Instruction* inst)
@@ -8558,10 +8558,10 @@ void EmitPass::EmitNoModifier(llvm::Instruction* inst)
         }
         break;
     case Instruction::Store:
-        emitStore(cast<StoreInst>(inst));
+        emitStore(cast<StoreInst>(inst), nullptr, nullptr);
         break;
     case Instruction::Load:
-        emitLoad(cast<LoadInst>(inst));
+        emitLoad(cast<LoadInst>(inst), nullptr, nullptr);
         break;
     case Instruction::GetElementPtr:
         emitGEP(cast<GetElementPtrInst>(inst));
@@ -9632,9 +9632,9 @@ void EmitPass::emitStore3DInner(Value* pllValToStore, Value* pllDstPtr, Value* p
     }
 }
 
-void EmitPass::emitStore(StoreInst* inst)
+void EmitPass::emitStore(StoreInst* inst, Value* offset, ConstantInt* immOffset)
 {
-    emitVectorStore(inst);
+    emitVectorStore(inst, offset, immOffset);
 }
 
 CVariable* EmitPass::GetSymbol(llvm::Value* v)
@@ -13360,15 +13360,20 @@ unsigned int EmitPass::GetScalarTypeSizeInRegister(Type* Ty) const
 }
 
 
-void EmitPass::emitVectorLoad(LoadInst* inst, Value* offset)
+void EmitPass::emitVectorLoad(LoadInst* inst, Value* offset, ConstantInt* immOffset)
 {
+    int immOffsetInt = 0;
+    if (immOffset)
+        immOffsetInt = static_cast<int>(immOffset->getSExtValue());
+
     Value* Ptr = inst->getPointerOperand();
     PointerType* ptrType = cast<PointerType>(Ptr->getType());
     bool useA32 = !IGC::isA64Ptr(ptrType, m_currShader->GetContext());
 
     ResourceDescriptor resource = GetResourceVariable(Ptr);
     // eOffset is in bytes as 2/19/14
-    CVariable* eOffset = GetSymbol(offset);
+    // offset corresponds to Int2Ptr operand obtained during pattern matching
+    CVariable* eOffset = GetSymbol(immOffset ? offset : Ptr);
     if (useA32)
     {
         eOffset = TruncatePointer(eOffset);
@@ -13786,8 +13791,12 @@ void EmitPass::emitVectorLoad(LoadInst* inst, Value* offset)
     }
 }
 
-void EmitPass::emitVectorStore(StoreInst* inst)
+void EmitPass::emitVectorStore(StoreInst* inst, Value* offset, ConstantInt* immOffset)
 {
+    int immOffsetInt = 0;
+    if (immOffset)
+        immOffsetInt = static_cast<int>(immOffset->getSExtValue());
+
     Value* Ptr = inst->getPointerOperand();
     PointerType* ptrType = cast<PointerType>(Ptr->getType());
 
@@ -13797,7 +13806,8 @@ void EmitPass::emitVectorStore(StoreInst* inst)
         ForceDMask(false);
     }
     // As 2/19/14, eOffset is in bytes !
-    CVariable* eOffset = GetSymbol(Ptr);
+    // offset corresponds to Int2Ptr operand obtained during pattern matching
+    CVariable* eOffset = GetSymbol(immOffset ? offset : Ptr);
     bool useA32 = !isA64Ptr(ptrType, m_currShader->GetContext());
     if (useA32)
     {

IGC/Compiler/CISACodeGen/EmitVISAPass.hpp

@@ -147,11 +147,11 @@ namespace IGC
         void emitSampleOffset(llvm::GenIntrinsicInst* inst);
 
         // TODO: unify the functions below and clean up
-        void emitStore(llvm::StoreInst* inst);
+        void emitStore(llvm::StoreInst* inst, llvm::Value* offset = nullptr, llvm::ConstantInt* immOffset = nullptr);
         void emitStore3D(llvm::StoreInst* inst, llvm::Value* elemIdxV = nullptr);
         void emitStore3DInner(llvm::Value* pllValToStore, llvm::Value* pllDstPtr, llvm::Value* pllElmIdx);
 
-        void emitLoad(llvm::LoadInst* inst);        // single load, no pattern
+        void emitLoad(llvm::LoadInst* inst, llvm::Value* offset = nullptr, llvm::ConstantInt* immOffset = nullptr);   // single load, no pattern
         void emitLoad3DInner(llvm::LdRawIntrinsic* inst, ResourceDescriptor& resource, llvm::Value* elemIdxV);
 
         // when resource is dynamically indexed, load/store must use special intrinsics
@@ -377,8 +377,8 @@ namespace IGC
         // non-vector version.
         bool isUniformStoreOCL(llvm::StoreInst* SI);
         void emitVectorBitCast(llvm::BitCastInst* BCI);
-        void emitVectorLoad(llvm::LoadInst* LI, llvm::Value* offset);
-        void emitVectorStore(llvm::StoreInst* SI);
+        void emitVectorLoad(llvm::LoadInst* LI, llvm::Value* offset, llvm::ConstantInt* immOffset);
+        void emitVectorStore(llvm::StoreInst* SI, llvm::Value* offset, llvm::ConstantInt* immOffset);
         void emitGenISACopy(llvm::GenIntrinsicInst* GenCopyInst);
         void emitVectorCopy(CVariable* Dst, CVariable* Src, uint32_t nElts,
             uint32_t DstSubRegOffset = 0, uint32_t SrcSubRegOffset = 0);

IGC/Compiler/CISACodeGen/PatternMatchPass.cpp

@@ -2051,17 +2051,19 @@ namespace IGC
         return false;
     }
 
+
     bool CodeGenPatternMatch::MatchLoadStorePointer(llvm::Instruction& I, llvm::Value& ptrVal)
     {
         struct LoadStorePointerPattern : public Pattern
         {
             Instruction* inst;
             Value* offset;
+            ConstantInt* immOffset;
             virtual void Emit(EmitPass* pass, const DstModifier& modifier)
             {
                 if (isa<LoadInst>(inst))
                 {
-                    pass->emitVectorLoad(cast<LoadInst>(inst), offset);
+                    pass->emitVectorLoad(cast<LoadInst>(inst), offset, immOffset);
                 }
                 else if (isa<StoreInst>(inst))
                 {
@@ -2097,6 +2099,7 @@ namespace IGC
                 }
             }
             pattern->offset = cast<Instruction>(&ptrVal)->getOperand(0);
+            pattern->immOffset = ConstantInt::get(Type::getInt32Ty(I.getContext()), 0);
             MarkAsSource(pattern->offset);
             AddPattern(pattern);
             return true;