Revert "Clean-up sampler spir related workarounds in IGC codebase."

This reverts "Clean-up sampler spir related workarounds in IGC codebase."

Author: smilczek

IGC/Compiler/Optimizer/BuiltInFuncImport.cpp

@@ -652,7 +652,18 @@ bool BIImport::runOnModule(Module &M) {
           IRBuilder<> builder(CI);
           Value *newV;
           if (IGCLLVM::starts_with(funcName, "__builtin_IB_convert_sampler_to_int")) {
-            newV = builder.CreatePtrToInt(CI->getOperand(0), CI->getType());
+            Type *CIOpTy = CI->getOperand(0)->getType();
+            if (isa<PointerType>(CIOpTy)) {
+              newV = builder.CreatePtrToInt(CI->getOperand(0), CI->getType());
+            }
+            else {
+              CodeGenContext *ctx = getAnalysis<CodeGenContextWrapper>().getCodeGenContext();
+
+              bool UseBindlessImage = ctx->getModuleMetaData()->UseBindlessImage;
+              ctx->getModuleMetaData()->UseBindlessImageWithSamplerTracking = UseBindlessImage;
+              // i32 to i64
+              newV = builder.CreateZExt(CI->getOperand(0), CI->getType());
+            }
           } else
             newV = builder.CreateBitOrPointerCast(CI->getOperand(0), CI->getType());
           CI->replaceAllUsesWith(newV);

IGC/Compiler/Optimizer/OCLBIUtils.cpp

@@ -577,7 +577,17 @@ class COCL_sample : public CImagesBI {
     //@TODO: Remove the part related to bindless once bindless
     //       is fully implemented outside this pass.
     if (modMD->UseBindlessImage) {
-      auto *sampler = m_pCallInst->getArgOperand(1);
+      Value *sampler;
+      if (modMD->UseBindlessImageWithSamplerTracking) {
+        Value *samplerValue = ValueTracker::track(m_pCallInst, 1, m_pMdUtils, m_modMD);
+        int samplerConstantVal = int_cast<int>(cast<ConstantInt>(samplerValue)->getZExtValue());
+
+        // Bindless inline sampler is passed via implicit kernel argument.
+        ImplicitArgs implicitArgs(*m_pFunc, m_pMdUtils);
+        sampler = implicitArgs.getNumberedImplicitArg(*m_pFunc, ImplicitArg::INLINE_SAMPLER, samplerConstantVal);
+      } else {
+        sampler = m_pCallInst->getArgOperand(1);
+      }
 
       // Map the bindless pointer.
       ConstantInt *bindlessIndex = ConstantInt::get(m_pIntType, BINDLESS_BTI);

IGC/Compiler/Optimizer/OpenCLPasses/ImageFuncs/ImageFuncsAnalysis.cpp

@@ -52,6 +52,8 @@ bool ImageFuncsAnalysis::runOnModule(Module &M) {
 
   m_useAdvancedBindlessMode = ctx->getModuleMetaData()->UseBindlessImage;
 
+  m_useBindlessImageWithSamplerTracking = ctx->getModuleMetaData()->UseBindlessImageWithSamplerTracking;
+
   m_useSPVINTELBindlessImages = ctx->getModuleMetaData()->extensions.spvINTELBindlessImages;
 
   // Run on all functions defined in this module
@@ -119,6 +121,35 @@ void ImageFuncsAnalysis::visitCallInst(CallInst &CI) {
   else if (funcName == GET_SAMPLER_SNAP_WA_REQUIRED && !m_useSPVINTELBindlessImages) {
     imageFunc = &m_argMap[ImplicitArg::SAMPLER_SNAP_WA];
   } else {
+    if (funcName.endswith("sample_l") && m_useBindlessImageWithSamplerTracking) {
+      Value *callArg = ValueTracker::track(&CI, 1, getAnalysis<MetaDataUtilsWrapper>().getMetaDataUtils(),
+                                           getAnalysis<MetaDataUtilsWrapper>().getModuleMetaData());
+      if (!callArg)
+        return;
+      if (ConstantInt *ConstInt = dyn_cast<ConstantInt>(callArg)) {
+        // Inline sampler doesn't associate with an explicit argument.
+        // To avoid adding a new metadata entry, inline sampler value is stored as
+        // explicit argument number.
+        uint64_t InlineSamplerInitValue = ConstInt->getZExtValue();
+        auto [_, IsNew] = m_argMap[ImplicitArg::INLINE_SAMPLER].insert(int_cast<int>(InlineSamplerInitValue));
+        if (!IsNew) {
+          // Sampler initialized by this specific value was already processed.
+          // No new sampler will be created. Skip creating inline sampler metadata.
+          return;
+        }
+
+        // Add metadata for the inline sampler.
+        ModuleMetaData *ModMD = getAnalysis<MetaDataUtilsWrapper>().getModuleMetaData();
+        FunctionMetaData &FuncMD = ModMD->FuncMD[CI.getFunction()];
+        ResourceAllocMD &ResAllocMD = FuncMD.resAllocMD;
+        InlineSamplersMD InlineSamplerMD;
+
+        CImagesBI::CreateInlineSamplerAnnotations(CI.getFunction()->getParent(), InlineSamplerMD,
+                                                  InlineSamplerInitValue);
+        InlineSamplerMD.index = m_inlineSamplerIndex++;
+        ResAllocMD.inlineSamplersMD.push_back(InlineSamplerMD);
+      }
+    }
     // Non image function, do nothing
     return;
   }

IGC/Compiler/Optimizer/OpenCLPasses/ImageFuncs/ImageFuncsAnalysis.hpp

@@ -107,6 +107,7 @@ class ImageFuncsAnalysis : public llvm::ModulePass, public llvm::InstVisitor<Ima
   //        by being lowered to a ConstantInt value of 0.
   bool m_useSPVINTELBindlessImages{};
 
+  bool m_useBindlessImageWithSamplerTracking{};
   int m_inlineSamplerIndex = 0;
 };
 

IGC/common/MDFrameWork.h

@@ -814,10 +814,10 @@ enum class ShaderTypeMD
         ShaderData shaderData;
         URBLayoutInfo URBInfo;
         bool UseBindlessImage = false;
-
         // This is used to set has_bindless_image_read zeinfo flag.
         bool HasBindlessImageRead = false;
 
+        bool UseBindlessImageWithSamplerTracking = false;
         bool enableRangeReduce = false;
         //when true, compiler enables MatchMad optimization for VS
         bool allowMatchMadOptimizationforVS = false;