[Autobackout][FunctionalRegression]Revert of change: 4cecfb3: Remove tracking of bindless offset for images - PART 3

In case of bindless images, NEO runtime passes bindless offset in image
    arg of kernel. This bindless offset doesn't need to be tracked because
    arg tracking in OCLBIConverter pass is only needed to find image's BTI,
    which isn't used with bindless as it's the bindless offset that is used
    to find the image's surface state instead of values stored in the
    Binding Table.

    This commit is the third part of the tracking removal.

    It implements handling of inline samplers for bindless mode in two new
    passes. First, PrepareInlineSamplerForBindless visits instructions
    calling __bindless_sampler_initializer(int32) and maps the callee's
    argument for AddImplicitArgs pass and then creates inline sampler
    metadata. Second, ResolveInlineSamplerForBindless replaces calls to
    __bindless_sampler_initializer(int32) with corresponding inline sampler
    implicit args created by AddImplicitArgs.

    This commit also edits builtin __translate_sampler_initializer(int32) to
    return __bindless_sampler_initializer(int32) for bindless.

Author: sys-igc

IGC/AdaptorOCL/UnifyIROCL.cpp

@@ -60,8 +60,6 @@ SPDX-License-Identifier: MIT
 #include "Compiler/Optimizer/OpenCLPasses/ImageFuncs/ImageFuncsAnalysis.hpp"
 #include "Compiler/Optimizer/OpenCLPasses/ImageFuncs/ImageFuncResolution.hpp"
 #include "Compiler/Optimizer/OpenCLPasses/ImageFuncs/ResolveSampledImageBuiltins.hpp"
-#include "Compiler/Optimizer/OpenCLPasses/PrepareInlineSamplerForBindless/PrepareInlineSamplerForBindless.hpp"
-#include "Compiler/Optimizer/OpenCLPasses/ResolveInlineSamplerForBindless/ResolveInlineSamplerForBindless.hpp"
 #include "Compiler/Optimizer/OpenCLPasses/PrivateMemory/PrivateMemoryUsageAnalysis.hpp"
 #include "Compiler/Optimizer/OpenCLPasses/PrivateMemory/PrivateMemoryResolution.hpp"
 #include "Compiler/Optimizer/OpenCLPasses/ProgramScopeConstants/ProgramScopeConstantAnalysis.hpp"
@@ -556,12 +554,9 @@ static void CommonOCLBasedPasses(OpenCLProgramContext* pContext)
 
     mpm.add(new ResolveOCLRaytracingBuiltins());
     mpm.add(createRayTracingIntrinsicAnalysisPass());
-    mpm.add(new PrepareInlineSamplerForBindless());
-
     // Adding implicit args based on Analysis passes
     mpm.add(new AddImplicitArgs());
 
-    mpm.add(new ResolveInlineSamplerForBindless());
     if (IGC_IS_FLAG_ENABLED(BufferBoundsChecking) || pContext->isBufferBoundsChecking())
     {
         mpm.add(new BufferBoundsCheckingPatcher());

IGC/BiFModule/Headers/bif_flag_controls.h

@@ -38,5 +38,4 @@ BIF_FLAG_CONTROL(int, MaxHWThreadIDPerSubDevice)
 BIF_FLAG_CONTROL(bool, UseAssumeInGetGlobalId)
 BIF_FLAG_CONTROL(int, JointMatrixLoadStoreOpt)
 BIF_FLAG_CONTROL(bool, UseOOBChecks)
-BIF_FLAG_CONTROL(bool, UseBindlessImage)
 #endif // __BIF_FLAG_CONTROL_H__

IGC/BiFModule/Implementation/images.cl

@@ -22,14 +22,8 @@ SPDX-License-Identifier: MIT
 
 #include "../Headers/spirv.h"
 
-__spirv_Sampler __bindless_sampler_initializer(uint sampler);
-
 __spirv_Sampler __translate_sampler_initializer(uint sampler)
 {
-    if(BIF_FLAG_CTRL_GET(UseBindlessImage))
-    {
-        return __bindless_sampler_initializer(sampler);
-    }
     return __builtin_astype((ulong)sampler, __spirv_Sampler);
 }
 

IGC/Compiler/Builtins/BIFFlagCtrl/BIFFlagCtrlResolution.cpp

@@ -117,10 +117,6 @@ void BIFFlagCtrlResolution::FillFlagCtrl() {
   }
 
   BIF_FLAG_CTRL_SET(UseOOBChecks, PtrCGC->platform.needsOutOfBoundsBuiltinChecks());
-
-  // NOTE: No need to check for UseLegacyBindlessMode,
-  //       as it's unrelated to images.
-  BIF_FLAG_CTRL_SET(UseBindlessImage, PtrCGC->getModuleMetaData()->compOpt.UseBindlessMode);
 }
 
 #undef BIF_FLAG_CTRL_SET

IGC/Compiler/InitializePasses.h

@@ -118,7 +118,6 @@ void initializeOpenCLPrintfAnalysisPass(llvm::PassRegistry&);
 void initializeOpenCLPrintfResolutionPass(llvm::PassRegistry&);
 void initializePeepholeTypeLegalizerPass(llvm::PassRegistry&);
 void initializePositionDepAnalysisPass(llvm::PassRegistry&);
-void initializePrepareInlineSamplerForBindlessPass(llvm::PassRegistry&);
 void initializePrivateMemoryResolutionPass(llvm::PassRegistry&);
 void initializePrivateMemoryToSLMPass(llvm::PassRegistry&);
 void initializePrivateMemoryUsageAnalysisPass(llvm::PassRegistry&);
@@ -134,7 +133,6 @@ void initializePullConstantHeuristicsPass(llvm::PassRegistry&);
 void initializeScalarizerCodeGenPass(llvm::PassRegistry&);
 void initializeReduceLocalPointersPass(llvm::PassRegistry&);
 void initializeReplaceUnsupportedIntrinsicsPass(llvm::PassRegistry&);
-void initializeResolveInlineSamplerForBindlessPass(llvm::PassRegistry&);
 void initializePreCompiledFuncImportPass(llvm::PassRegistry&);
 void initializePurgeMetaDataUtilsPass(llvm::PassRegistry&);
 void initializeRemoveNonPositionOutputPass(llvm::PassRegistry&);

IGC/Compiler/Optimizer/OCLBIUtils.cpp

@@ -233,10 +233,6 @@ namespace IGC
         /// @brief  push the sampler value into the function argument list
         void prepareSamplerValue(void);
 
-        /// @brief  create annotations for inline sampler based on the value used for initialization
-        /// @brief  this method doesn't fill out the 'index' field of InlineSamplersMD.
-        static void CreateInlineSamplerAnnotations(llvm::Module* M, InlineSamplersMD& inlineSamplerMD, int samplerValue);
-
         /// @brief  create a call to the GetBufferPtr intrinsic pseudo-instruction
         /// @brief  push the image index into the function argument list
         void createGetBufferPtr(void);

IGC/Compiler/Optimizer/OCLBIUtils.h

@@ -40,12 +40,10 @@ add_subdirectory(NamedBarriers)
 add_subdirectory(NontemporalLoadsAndStoresInAssert)
 add_subdirectory(OpenCLPrintf)
 add_subdirectory(PoisonFP64KernelsPass)
-add_subdirectory(PrepareInlineSamplerForBindless)
 add_subdirectory(PrivateMemory)
 add_subdirectory(ProgramScopeConstants)
 add_subdirectory(RayTracing)
 add_subdirectory(ReplaceUnsupportedIntrinsics)
-add_subdirectory(ResolveInlineSamplerForBindless)
 add_subdirectory(ResourceAllocator)
 add_subdirectory(RewriteLocalSize)
 add_subdirectory(ScalarArgAsPointer)
@@ -95,12 +93,10 @@ set(IGC_BUILD__SRC__Optimizer_OpenCLPasses_All
     ${IGC_BUILD__SRC__OpenCLPasses_NontemporalLoadsAndStoresInAssert}
     ${IGC_BUILD__SRC__OpenCLPasses_OpenCLPrintf}
     ${IGC_BUILD__SRC__OpenCLPasses_PoisonFP64KernelsPass}
-    ${IGC_BUILD__SRC__OpenCLPasses_PrepareInlineSamplerForBindless}
     ${IGC_BUILD__SRC__OpenCLPasses_PrivateMemory}
     ${IGC_BUILD__SRC__OpenCLPasses_ProgramScopeConstants}
     ${IGC_BUILD__SRC__OpenCLPasses_Raytracing}
     ${IGC_BUILD__SRC__OpenCLPasses_ReplaceUnsupportedIntrinsics}
-    ${IGC_BUILD__SRC__OpenCLPasses_ResolveInlineSamplerForBindless}
     ${IGC_BUILD__SRC__OpenCLPasses_ResourceAllocator}
     ${IGC_BUILD__SRC__OpenCLPasses_RewriteLocalSize}
     ${IGC_BUILD__SRC__OpenCLPasses_ScalarArgAsPointer}
@@ -155,12 +151,10 @@ set(IGC_BUILD__HDR__Optimizer_OpenCLPasses_All
     ${IGC_BUILD__HDR__OpenCLPasses_NamedBarriers}
     ${IGC_BUILD__HDR__OpenCLPasses_NontemporalLoadsAndStoresInAssert}
     ${IGC_BUILD__HDR__OpenCLPasses_OpenCLPrintf}
-    ${IGC_BUILD__HDR__OpenCLPasses_PrepareInlineSamplerForBindless}
     ${IGC_BUILD__HDR__OpenCLPasses_PrivateMemory}
     ${IGC_BUILD__HDR__OpenCLPasses_ProgramScopeConstants}
     ${IGC_BUILD__HDR__OpenCLPasses_Raytracing}
     ${IGC_BUILD__HDR__OpenCLPasses_ReplaceUnsupportedIntrinsics}
-    ${IGC_BUILD__HDR__OpenCLPasses_ResolveInlineSamplerForBindless}
     ${IGC_BUILD__HDR__OpenCLPasses_ResourceAllocator}
     ${IGC_BUILD__HDR__OpenCLPasses_RewriteLocalSize}
     ${IGC_BUILD__HDR__OpenCLPasses_ScalarArgAsPointer}
@@ -217,12 +211,10 @@ set(IGC_BUILD_Compiler_OpenCLPasses_Groups
     Compiler__OpenCLPasses_NontemporalLoadsAndStoresInAssert
     Compiler__OpenCLPasses_OpenCLPrintf
     Compiler__OpenCLPasses_PoisonFP64KernelsPass
-    Compiler__OpenCLPasses_PrepareInlineSamplerForBindless
     Compiler__OpenCLPasses_PrivateMemory
     Compiler__OpenCLPasses_ProgramScopeConstants
     Compiler__OpenCLPasses_Raytracing
     Compiler__OpenCLPasses_ReplaceUnsupportedIntrinsics
-    Compiler__OpenCLPasses_ResolveInlineSamplerForBindless
     Compiler__OpenCLPasses_RewriteLocalSize
     Compiler__OpenCLPasses_ScalarArgAsPointer
     Compiler__OpenCLPasses_SetFastMathFlags

IGC/Compiler/Optimizer/OpenCLPasses/CMakeLists.txt

@@ -209,6 +209,15 @@ void ImageFuncsAnalysis::visitCallInst(CallInst& CI)
                 return;
             }
         }
+        else if (m_useAdvancedBindlessMode)
+        {
+            IGC_ASSERT_MESSAGE(isa<ConstantInt>(callArg), "Expect inline sampler");
+            auto *inlineSampler = 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.
+            m_argMap[ImplicitArg::INLINE_SAMPLER].insert(int_cast<int>(inlineSampler->getZExtValue()));
+            return;
+        }
     }
 
     // Only these args should be hit by the indirect case

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

@@ -190,18 +190,13 @@ Value* ResolveSampledImageBuiltins::lowerGetSampler(CallInst& CI)
     //   %queried_sampler = zext i32 16 to i64
     if (CallInst* samplerInitializer = dyn_cast<CallInst>(samplerArg))
     {
-        // The __bindless_sampler_initializer calls are handled by PrepareInlineSamplerForBindless
-        // and ResolveInlineSamplerForBindless. They are meant to be replaced with inline sampler implicit arg.
-        if (!(samplerInitializer->getCalledFunction()->getName() == "__bindless_sampler_initializer"))
-        {
-            IGC_ASSERT(samplerInitializer->getCalledFunction()->getName() == "__translate_sampler_initializer");
-            return ZExtInst::Create(
-                Instruction::ZExt,
-                samplerInitializer->getArgOperand(0),
-                Int64Ty,
-                "",
-                &CI);
-        }
+        IGC_ASSERT(samplerInitializer->getCalledFunction()->getName() == "__translate_sampler_initializer");
+        return ZExtInst::Create(
+            Instruction::ZExt,
+            samplerInitializer->getArgOperand(0),
+            Int64Ty,
+            "",
+            &CI);
     }
 
     // In the case of sampler as kernel argument, transform the following sequence: