[Autobackout][FunctionalRegression]Revert of change: ce9c6e7: Remove tracking of bindlessOffset for images

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 partially removes the tracking.

Author: sys-igc

IGC/Compiler/Optimizer/OCLBIUtils.cpp

@@ -20,7 +20,6 @@ SPDX-License-Identifier: MIT
 #include "Probe/Assertion.h"
 #include "IGC/common/StringMacros.hpp"
 #include <llvm/Support/Casting.h>
-#include "IGC/Compiler/CISACodeGen/messageEncoding.hpp"
 
 using namespace llvm;
 using namespace IGC;
@@ -294,27 +293,26 @@ BufferType CImagesBI::CImagesUtils::getImageType(ParamMap* pParamMap, CallInst*
 
 void CImagesBI::createGetBufferPtr()
 {
-    if (m_pCodeGenContext->getModuleMetaData()->UseBindlessImage)
-    {
-        // If bindless image is preferred, don't create GetBufferPtr, instead just map the bindless pointer
-        Value* pImg = m_pCallInst->getOperand(0);
-        ConstantInt* bindlessIndex = ConstantInt::get(m_pIntType, BINDLESS_BTI);
-        uint32_t addrSpace = EncodeAS4GFXResource(*bindlessIndex, BINDLESS);
-        Type* ptrTy = llvm::PointerType::get(m_pFloatType, addrSpace);
-
-        Value* basePointer = isa<IntegerType>(pImg->getType()) ?
-            BitCastInst::CreateBitOrPointerCast(pImg, ptrTy, "bindless_img", m_pCallInst) :
-            BitCastInst::CreatePointerCast(pImg, ptrTy, "bindless_img", m_pCallInst);
-        m_args.push_back(basePointer);
-        return;
-    }
-
     Value* pImg = nullptr;
     ConstantInt* imageIndex = CImagesUtils::getImageIndex(m_pParamMap, m_pCallInst, 0, pImg);
     BufferType bufType = CImagesUtils::getImageType(m_pParamMap, m_pCallInst, 0);
     unsigned int addressSpace = IGC::EncodeAS4GFXResource(*imageIndex, bufType);
     Type* ptrTy = llvm::PointerType::get(m_pFloatType, addressSpace);
 
+    if (bufType == BufferType::BINDLESS)
+    {
+        // If bindless image is preferred, don't create GetBufferPtr, instead just map the bindless pointer
+        auto modMD = m_pCodeGenContext->getModuleMetaData();
+        if (modMD->UseBindlessImage)
+        {
+            Value* basePointer = isa<IntegerType>(pImg->getType()) ?
+                BitCastInst::CreateBitOrPointerCast(pImg, ptrTy, "bindless_img", m_pCallInst) :
+                BitCastInst::CreatePointerCast(pImg, ptrTy, "bindless_img", m_pCallInst);
+            m_args.push_back(basePointer);
+            return;
+        }
+    }
+
     Function* pFuncGetBufferPtr = getFunctionDeclaration(GenISAIntrinsic::GenISA_GetBufferPtr, ptrTy);
 
     //%base_ptr = call float* @llvm.GenISA.GetBufferPtr(i32 %bufIdx, i32 %type)

IGC/Compiler/tests/OCLBIConverter/get_image_prop-typed-pointers.ll

@@ -18,8 +18,8 @@
 define spir_kernel void @kernel_1d_array(%spirv.Image._void_0_0_1_0_0_0_0 addrspace(1)* %img) {
 ; CHECK-LABEL: define spir_kernel void @kernel_1d_array(
 ; CHECK-NOT:   __builtin_IB_get_image1d_array_size
-; CHECK:       [[BINDLESS_IMG_1D:%.*]] = inttoptr i32 %1 to float addrspace(393468)*
-; CHECK-NEXT:  [[TMP_1D:%.*]] = call <4 x i32> @llvm.genx.GenISA.resinfoptr.p393468f32(float addrspace(393468)* [[BINDLESS_IMG_1D]], i32 0)
+; CHECK:       [[BINDLESS_IMG_1D:%.*]] = addrspacecast %spirv.Image._void_0_0_1_0_0_0_0 addrspace(1)* %img to float addrspace(393216)*
+; CHECK-NEXT:  [[TMP_1D:%.*]] = call <4 x i32> @llvm.genx.GenISA.resinfoptr.p393216f32(float addrspace(393216)* [[BINDLESS_IMG_1D]], i32 0)
 ; CHECK-NEXT:  extractelement <4 x i32> [[TMP_1D]], i32 1
   %data = ptrtoint %spirv.Image._void_0_0_1_0_0_0_0 addrspace(1)* %img to i64
   %1 = trunc i64 %data to i32
@@ -30,8 +30,8 @@ define spir_kernel void @kernel_1d_array(%spirv.Image._void_0_0_1_0_0_0_0 addrsp
 define spir_kernel void @kernel_2d_array(%spirv.Image._void_1_0_1_0_0_0_0 addrspace(1)* %img) {
 ; CHECK-LABEL: define spir_kernel void @kernel_2d_array(
 ; CHECK-NOT:   __builtin_IB_get_image1d_array_size
-; CHECK:       [[BINDLESS_IMG_1D:%.*]] = inttoptr i32 %1 to float addrspace(393468)*
-; CHECK-NEXT:  [[TMP_1D:%.*]] = call <4 x i32> @llvm.genx.GenISA.resinfoptr.p393468f32(float addrspace(393468)* [[BINDLESS_IMG_1D]], i32 0)
+; CHECK:       [[BINDLESS_IMG_1D:%.*]] = addrspacecast %spirv.Image._void_1_0_1_0_0_0_0 addrspace(1)* %img to float addrspace(393216)*
+; CHECK-NEXT:  [[TMP_1D:%.*]] = call <4 x i32> @llvm.genx.GenISA.resinfoptr.p393216f32(float addrspace(393216)* [[BINDLESS_IMG_1D]], i32 0)
 ; CHECK-NEXT:  extractelement <4 x i32> [[TMP_1D]], i32 2
   %data = ptrtoint %spirv.Image._void_1_0_1_0_0_0_0 addrspace(1)* %img to i64
   %1 = trunc i64 %data to i32
@@ -41,19 +41,20 @@ define spir_kernel void @kernel_2d_array(%spirv.Image._void_1_0_1_0_0_0_0 addrsp
 
 define spir_kernel void @kernel_3d(%spirv.Image._void_2_0_0_0_0_0_0 addrspace(1)* %img) {
 ; CHECK-LABEL: define spir_kernel void @kernel_3d(
+; CHECK-SAME: [[SPIRV_IMAGE__VOID_2_0_0_0_0_0_0:%.*]] addrspace(1)* [[IMG:%.*]]) {
   %data = ptrtoint %spirv.Image._void_2_0_0_0_0_0_0 addrspace(1)* %img to i64
   %1 = trunc i64 %data to i32
 ; CHECK-NOT: __builtin_IB_get_image_width
 ; CHECK-NOT: __builtin_IB_get_image_height
 ; CHECK-NOT: __builtin_IB_get_image_height
-; CHECK:    [[BINDLESS_IMG:%.*]] = inttoptr i32 %1 to float addrspace(393468)*
-; CHECK-NEXT:    [[TMP1:%.*]] = call <4 x i32> @llvm.genx.GenISA.resinfoptr.p393468f32(float addrspace(393468)* [[BINDLESS_IMG]], i32 0)
+; CHECK:    [[BINDLESS_IMG:%.*]] = addrspacecast [[SPIRV_IMAGE__VOID_2_0_0_0_0_0_0]] addrspace(1)* [[IMG]] to float addrspace(393216)*
+; CHECK-NEXT:    [[TMP1:%.*]] = call <4 x i32> @llvm.genx.GenISA.resinfoptr.p393216f32(float addrspace(393216)* [[BINDLESS_IMG]], i32 0)
 ; CHECK-NEXT:    extractelement <4 x i32> [[TMP1]], i32 0
-; CHECK-NEXT:    [[BINDLESS_IMG1:%.*]] = inttoptr i32 %1 to float addrspace(393468)*
-; CHECK-NEXT:    [[TMP2:%.*]] = call <4 x i32> @llvm.genx.GenISA.resinfoptr.p393468f32(float addrspace(393468)* [[BINDLESS_IMG1]], i32 0)
+; CHECK-NEXT:    [[BINDLESS_IMG1:%.*]] = addrspacecast [[SPIRV_IMAGE__VOID_2_0_0_0_0_0_0]] addrspace(1)* [[IMG]] to float addrspace(393216)*
+; CHECK-NEXT:    [[TMP2:%.*]] = call <4 x i32> @llvm.genx.GenISA.resinfoptr.p393216f32(float addrspace(393216)* [[BINDLESS_IMG1]], i32 0)
 ; CHECK-NEXT:    extractelement <4 x i32> [[TMP2]], i32 1
-; CHECK-NEXT:    [[BINDLESS_IMG2:%.*]] = inttoptr i32 %1 to float addrspace(393468)*
-; CHECK-NEXT:    [[TMP3:%.*]] = call <4 x i32> @llvm.genx.GenISA.resinfoptr.p393468f32(float addrspace(393468)* [[BINDLESS_IMG2]], i32 0)
+; CHECK-NEXT:    [[BINDLESS_IMG2:%.*]] = addrspacecast [[SPIRV_IMAGE__VOID_2_0_0_0_0_0_0]] addrspace(1)* [[IMG]] to float addrspace(393216)*
+; CHECK-NEXT:    [[TMP3:%.*]] = call <4 x i32> @llvm.genx.GenISA.resinfoptr.p393216f32(float addrspace(393216)* [[BINDLESS_IMG2]], i32 0)
 ; CHECK-NEXT:    extractelement <4 x i32> [[TMP3]], i32 2
   %call = call spir_func i32 @__builtin_IB_get_image_width(i32 %1)
   %call1 = call spir_func i32 @__builtin_IB_get_image_height(i32 %1)

IGC/Compiler/tests/OCLBIConverter/get_image_prop.ll

@@ -19,8 +19,8 @@
 define spir_kernel void @kernel_1d_array(ptr addrspace(1) %img) {
 ; CHECK-LABEL: define spir_kernel void @kernel_1d_array(
 ; CHECK-NOT:   __builtin_IB_get_image1d_array_size
-; CHECK:       [[BINDLESS_IMG_1D:%.*]] = inttoptr i32 %1 to ptr addrspace(393468)
-; CHECK-NEXT:  [[TMP_1D:%.*]] = call <4 x i32> @llvm.genx.GenISA.resinfoptr.p393468(ptr addrspace(393468) [[BINDLESS_IMG_1D]], i32 0)
+; CHECK:       [[BINDLESS_IMG_1D:%.*]] = addrspacecast ptr addrspace(1) %img to ptr addrspace(393216)
+; CHECK-NEXT:  [[TMP_1D:%.*]] = call <4 x i32> @llvm.genx.GenISA.resinfoptr.p393216(ptr addrspace(393216) [[BINDLESS_IMG_1D]], i32 0)
 ; CHECK-NEXT:  extractelement <4 x i32> [[TMP_1D]], i32 1
   %data = ptrtoint ptr addrspace(1) %img to i64
   %1 = trunc i64 %data to i32
@@ -31,8 +31,8 @@ define spir_kernel void @kernel_1d_array(ptr addrspace(1) %img) {
 define spir_kernel void @kernel_2d_array(ptr addrspace(1) %img) {
 ; CHECK-LABEL: define spir_kernel void @kernel_2d_array(
 ; CHECK-NOT:   __builtin_IB_get_image1d_array_size
-; CHECK:       [[BINDLESS_IMG_1D:%.*]] = inttoptr i32 %1 to ptr addrspace(393468)
-; CHECK-NEXT:  [[TMP_1D:%.*]] = call <4 x i32> @llvm.genx.GenISA.resinfoptr.p393468(ptr addrspace(393468) [[BINDLESS_IMG_1D]], i32 0)
+; CHECK:       [[BINDLESS_IMG_1D:%.*]] = addrspacecast ptr addrspace(1) %img to ptr addrspace(393216)
+; CHECK-NEXT:  [[TMP_1D:%.*]] = call <4 x i32> @llvm.genx.GenISA.resinfoptr.p393216(ptr addrspace(393216) [[BINDLESS_IMG_1D]], i32 0)
 ; CHECK-NEXT:  extractelement <4 x i32> [[TMP_1D]], i32 2
   %data = ptrtoint ptr addrspace(1) %img to i64
   %1 = trunc i64 %data to i32
@@ -42,19 +42,20 @@ define spir_kernel void @kernel_2d_array(ptr addrspace(1) %img) {
 
 define spir_kernel void @kernel_3d(ptr addrspace(1) %img) {
 ; CHECK-LABEL: define spir_kernel void @kernel_3d(
+; CHECK-SAME: ptr addrspace(1) [[IMG:%.*]]) {
   %data = ptrtoint ptr addrspace(1) %img to i64
   %1 = trunc i64 %data to i32
 ; CHECK-NOT: __builtin_IB_get_image_width
 ; CHECK-NOT: __builtin_IB_get_image_height
 ; CHECK-NOT: __builtin_IB_get_image_height
-; CHECK:    [[BINDLESS_IMG:%.*]] = inttoptr i32 %1 to ptr addrspace(393468)
-; CHECK-NEXT:    [[TMP1:%.*]] = call <4 x i32> @llvm.genx.GenISA.resinfoptr.p393468(ptr addrspace(393468) [[BINDLESS_IMG]], i32 0)
+; CHECK:    [[BINDLESS_IMG:%.*]] = addrspacecast ptr addrspace(1) [[IMG]] to ptr addrspace(393216)
+; CHECK-NEXT:    [[TMP1:%.*]] = call <4 x i32> @llvm.genx.GenISA.resinfoptr.p393216(ptr addrspace(393216) [[BINDLESS_IMG]], i32 0)
 ; CHECK-NEXT:    extractelement <4 x i32> [[TMP1]], i32 0
-; CHECK-NEXT:    [[BINDLESS_IMG1:%.*]] = inttoptr i32 %1 to ptr addrspace(393468)
-; CHECK-NEXT:    [[TMP2:%.*]] = call <4 x i32> @llvm.genx.GenISA.resinfoptr.p393468(ptr addrspace(393468) [[BINDLESS_IMG1]], i32 0)
+; CHECK-NEXT:    [[BINDLESS_IMG1:%.*]] = addrspacecast ptr addrspace(1) [[IMG]] to ptr addrspace(393216)
+; CHECK-NEXT:    [[TMP2:%.*]] = call <4 x i32> @llvm.genx.GenISA.resinfoptr.p393216(ptr addrspace(393216) [[BINDLESS_IMG1]], i32 0)
 ; CHECK-NEXT:    extractelement <4 x i32> [[TMP2]], i32 1
-; CHECK-NEXT:    [[BINDLESS_IMG2:%.*]] = inttoptr i32 %1 to ptr addrspace(393468)
-; CHECK-NEXT:    [[TMP3:%.*]] = call <4 x i32> @llvm.genx.GenISA.resinfoptr.p393468(ptr addrspace(393468) [[BINDLESS_IMG2]], i32 0)
+; CHECK-NEXT:    [[BINDLESS_IMG2:%.*]] = addrspacecast ptr addrspace(1) [[IMG]] to ptr addrspace(393216)
+; CHECK-NEXT:    [[TMP3:%.*]] = call <4 x i32> @llvm.genx.GenISA.resinfoptr.p393216(ptr addrspace(393216) [[BINDLESS_IMG2]], i32 0)
 ; CHECK-NEXT:    extractelement <4 x i32> [[TMP3]], i32 2
   %call = call spir_func i32 @__builtin_IB_get_image_width(i32 %1)
   %call1 = call spir_func i32 @__builtin_IB_get_image_height(i32 %1)

IGC/Compiler/tests/OCLBIConverter/inline_sampler_bindless-typed-pointers.ll

@@ -21,10 +21,9 @@ entry:
 ; CHECK: [[ZEXT:%[0-9]+]] = zext i32 %inlineSampler to i64
 ; CHECK: [[OR:%[0-9]+]] = or i64 [[ZEXT]], 1
 ; CHECK: [[TRUNC:%[0-9]+]] = trunc i64 [[OR]] to i32
-; CHECK: [[TRUNC_IMG:%[0-9]+]] = trunc i64 %1 to i32
-; CHECK: %bindless_img = inttoptr i32 [[TRUNC_IMG]] to float addrspace(393468)*
+; CHECK: %bindless_img = addrspacecast %spirv.Image._void_1_0_0_0_0_0_0 addrspace(1)* %srcImg to float addrspace(393218)*
 ; CHECK: %bindless_sampler = inttoptr i32 [[TRUNC]] to float addrspace(655360)*
-; CHECK: = call <4 x float> @llvm.genx.GenISA.sampleLptr.v4f32.f32.p196610f32.p393468f32.p655360f32(float 0.000000e+00, float %CoordX, float %CoordY, float 0.000000e+00, float 0.000000e+00, float addrspace(196610)* undef, float addrspace(393468)* %bindless_img, float addrspace(655360)* %bindless_sampler, i32 0, i32 0, i32 0)
+; CHECK: = call <4 x float> @llvm.genx.GenISA.sampleLptr.v4f32.f32.p196610f32.p393218f32.p655360f32(float 0.000000e+00, float %CoordX, float %CoordY, float 0.000000e+00, float 0.000000e+00, float addrspace(196610)* undef, float addrspace(393218)* %bindless_img, float addrspace(655360)* %bindless_sampler, i32 0, i32 0, i32 0)
 
   %0 = inttoptr i64 16 to %spirv.Sampler addrspace(2)*
   %1 = ptrtoint %spirv.Image._void_1_0_0_0_0_0_0 addrspace(1)* %srcImg to i64

IGC/Compiler/tests/OCLBIConverter/inline_sampler_bindless.ll

@@ -22,10 +22,9 @@ entry:
 ; CHECK: [[ZEXT:%[0-9]+]] = zext i32 %inlineSampler to i64
 ; CHECK: [[OR:%[0-9]+]] = or i64 [[ZEXT]], 1
 ; CHECK: [[TRUNC:%[0-9]+]] = trunc i64 [[OR]] to i32
-; CHECK: [[TRUNC_IMG:%[0-9]+]] = trunc i64 %1 to i32
-; CHECK: %bindless_img = inttoptr i32 [[TRUNC_IMG]] to ptr addrspace(393468)
+; CHECK: %bindless_img = addrspacecast ptr addrspace(1) %srcImg to ptr addrspace(393218)
 ; CHECK: %bindless_sampler = inttoptr i32 [[TRUNC]] to ptr addrspace(655360)
-; CHECK: = call <4 x float> @llvm.genx.GenISA.sampleLptr.v4f32.f32.p196610.p393468.p655360(float 0.000000e+00, float %CoordX, float %CoordY, float 0.000000e+00, float 0.000000e+00, ptr addrspace(196610) undef, ptr addrspace(393468) %bindless_img, ptr addrspace(655360) %bindless_sampler, i32 0, i32 0, i32 0)
+; CHECK: = call <4 x float> @llvm.genx.GenISA.sampleLptr.v4f32.f32.p196610.p393218.p655360(float 0.000000e+00, float %CoordX, float %CoordY, float 0.000000e+00, float 0.000000e+00, ptr addrspace(196610) undef, ptr addrspace(393218) %bindless_img, ptr addrspace(655360) %bindless_sampler, i32 0, i32 0, i32 0)
 
   %0 = inttoptr i64 16 to ptr addrspace(2)
   %1 = ptrtoint ptr addrspace(1) %srcImg to i64

IGC/Compiler/tests/OCLBIConverter/ocl_bindless_sampler_2d-typed-pointers.ll

@@ -20,9 +20,9 @@ entry:
   %conv = trunc i64 %0 to i32
   %conv2 = trunc i64 %1 to i32
 
-; CHECK: %bindless_img = inttoptr i32 %conv to float addrspace(393468)*
+; CHECK: %bindless_img = addrspacecast %spirv.Image._void_1_0_0_0_0_0_0 addrspace(1)* %img to float addrspace(393218)*
 ; CHECK-NEXT: %bindless_sampler = addrspacecast %spirv.Sampler addrspace(2)* %sampler to float addrspace(655360)*
-; CHECK-NEXT: call <4 x float> @llvm.genx.GenISA.sampleLptr.v4f32.f32.p196610f32.p393468f32.p655360f32(float 0.000000e+00, float %CoordX, float %CoordY, float 0.000000e+00, float 0.000000e+00, float addrspace(196610)* undef, float addrspace(393468)* %bindless_img, float addrspace(655360)* %bindless_sampler, i32 0, i32 0, i32 0)
+; CHECK-NEXT: call <4 x float> @llvm.genx.GenISA.sampleLptr.v4f32.f32.p196610f32.p393218f32.p655360f32(float 0.000000e+00, float %CoordX, float %CoordY, float 0.000000e+00, float 0.000000e+00, float addrspace(196610)* undef, float addrspace(393218)* %bindless_img, float addrspace(655360)* %bindless_sampler, i32 0, i32 0, i32 0)
 
   %call = call spir_func <4 x float> @__builtin_IB_OCL_2d_sample_l(i32 %conv, i32 %conv2, <2 x float> zeroinitializer, float 0.000000e+00)
   ret void

IGC/Compiler/tests/OCLBIConverter/ocl_bindless_sampler_2d.ll

@@ -21,9 +21,9 @@ entry:
   %conv = trunc i64 %0 to i32
   %conv2 = trunc i64 %1 to i32
 
-; CHECK: %bindless_img = inttoptr i32 %conv to ptr addrspace(393468)
+; CHECK: %bindless_img = addrspacecast ptr addrspace(1) %img to ptr addrspace(393218)
 ; CHECK-NEXT: %bindless_sampler = addrspacecast ptr addrspace(2) %sampler to ptr addrspace(655360)
-; CHECK-NEXT: call <4 x float> @llvm.genx.GenISA.sampleLptr.v4f32.f32.p196610.p393468.p655360(float 0.000000e+00, float %CoordX, float %CoordY, float 0.000000e+00, float 0.000000e+00, ptr addrspace(196610) undef, ptr addrspace(393468) %bindless_img, ptr addrspace(655360) %bindless_sampler, i32 0, i32 0, i32 0)
+; CHECK-NEXT: call <4 x float> @llvm.genx.GenISA.sampleLptr.v4f32.f32.p196610.p393218.p655360(float 0.000000e+00, float %CoordX, float %CoordY, float 0.000000e+00, float 0.000000e+00, ptr addrspace(196610) undef, ptr addrspace(393218) %bindless_img, ptr addrspace(655360) %bindless_sampler, i32 0, i32 0, i32 0)
 
   %call = call spir_func <4 x float> @__builtin_IB_OCL_2d_sample_l(i32 %conv, i32 %conv2, <2 x float> zeroinitializer, float 0.000000e+00)
   ret void

IGC/Compiler/tests/OCLBIConverter/sampled_image_handle_2d-typed-pointers.ll

@@ -33,9 +33,9 @@ entry:
   %conv2 = trunc i64 %7 to i32
 
 ; CHECK: [[OR:%.*]] = or i64 %sampler_offset, 1
-; CHECK: %bindless_img = inttoptr i32 %conv to float addrspace(393468)*
+; CHECK: %bindless_img = inttoptr i64 %__SYCLKernel.1.copyload to float addrspace(393216)*
 ; CHECK-NEXT: %bindless_sampler = inttoptr i64 [[OR]] to float addrspace(655360)*
-; CHECK-NEXT: %call1 = call <4 x float> @llvm.genx.GenISA.sampleLptr.v4f32.f32.p196608f32.p393468f32.p655360f32(float 0.000000e+00, float %CoordX, float %CoordY, float 0.000000e+00, float 0.000000e+00, float addrspace(196608)* undef, float addrspace(393468)* %bindless_img, float addrspace(655360)* %bindless_sampler, i32 0, i32 0, i32 0)
+; CHECK-NEXT: %call1 = call <4 x float> @llvm.genx.GenISA.sampleLptr.v4f32.f32.p196608f32.p393216f32.p655360f32(float 0.000000e+00, float %CoordX, float %CoordY, float 0.000000e+00, float 0.000000e+00, float addrspace(196608)* undef, float addrspace(393216)* %bindless_img, float addrspace(655360)* %bindless_sampler, i32 0, i32 0, i32 0)
 
   %call = call spir_func <4 x float> @__builtin_IB_OCL_2d_sample_l(i32 %conv, i32 %conv2, <2 x float> zeroinitializer, float 0.000000e+00)
   %astype3 = inttoptr i64 %__SYCLKernel.3.copyload to %spirv.Image._void_1_0_0_0_0_0_0 addrspace(1)*
@@ -47,9 +47,9 @@ entry:
   %conv4 = trunc i64 %10 to i32
 
 ; CHECK: [[OR2:%.*]] = or i64 %sampler_offset{{.*}}, 1
-; CHECK: [[IMG2:%bindless_img[0-9]+]] = inttoptr i32 %conv3 to float addrspace(393468)*
+; CHECK: [[IMG2:%bindless_img[0-9]+]] = inttoptr i64 %__SYCLKernel.3.copyload to float addrspace(393216)*
 ; CHECK-NEXT: [[SAMPLER2:%bindless_sampler[0-9]+]] = inttoptr i64 [[OR2]] to float addrspace(655360)*
-; CHECK-NEXT: %call26 = call <4 x float> @llvm.genx.GenISA.sampleLptr.v4f32.f32.p196608f32.p393468f32.p655360f32(float 0.000000e+00, float %CoordX2, float %CoordY3, float 0.000000e+00, float 0.000000e+00, float addrspace(196608)* undef, float addrspace(393468)* [[IMG2]], float addrspace(655360)* [[SAMPLER2]], i32 0, i32 0, i32 0)
+; CHECK-NEXT: %call26 = call <4 x float> @llvm.genx.GenISA.sampleLptr.v4f32.f32.p196608f32.p393216f32.p655360f32(float 0.000000e+00, float %CoordX2, float %CoordY3, float 0.000000e+00, float 0.000000e+00, float addrspace(196608)* undef, float addrspace(393216)* [[IMG2]], float addrspace(655360)* [[SAMPLER2]], i32 0, i32 0, i32 0)
 
   %call2 = call spir_func <4 x float> @__builtin_IB_OCL_2d_sample_l(i32 %conv3, i32 %conv4, <2 x float> zeroinitializer, float 0.000000e+00)
   ret void

IGC/Compiler/tests/OCLBIConverter/sampled_image_handle_2d.ll

@@ -34,9 +34,9 @@ entry:
   %conv2 = trunc i64 %2 to i32
 
 ; CHECK: [[OR:%.*]] = or i64 %sampler_offset, 1
-; CHECK: %bindless_img = inttoptr i32 %conv to ptr addrspace(393468)
+; CHECK: %bindless_img = inttoptr i64 %__SYCLKernel.1.copyload to ptr addrspace(393216)
 ; CHECK-NEXT: %bindless_sampler = inttoptr i64 [[OR]] to ptr addrspace(655360)
-; CHECK-NEXT: %call1 = call <4 x float> @llvm.genx.GenISA.sampleLptr.v4f32.f32.p196608.p393468.p655360(float 0.000000e+00, float %CoordX, float %CoordY, float 0.000000e+00, float 0.000000e+00, ptr addrspace(196608) undef, ptr addrspace(393468) %bindless_img, ptr addrspace(655360) %bindless_sampler, i32 0, i32 0, i32 0)
+; CHECK-NEXT: %call1 = call <4 x float> @llvm.genx.GenISA.sampleLptr.v4f32.f32.p196608.p393216.p655360(float 0.000000e+00, float %CoordX, float %CoordY, float 0.000000e+00, float 0.000000e+00, ptr addrspace(196608) undef, ptr addrspace(393216) %bindless_img, ptr addrspace(655360) %bindless_sampler, i32 0, i32 0, i32 0)
 
   %call = call spir_func <4 x float> @__builtin_IB_OCL_2d_sample_l(i32 %conv, i32 %conv2, <2 x float> zeroinitializer, float 0.000000e+00)
   %astype3 = inttoptr i64 %__SYCLKernel.3.copyload to ptr addrspace(1)
@@ -48,9 +48,9 @@ entry:
   %conv4 = trunc i64 %5 to i32
 
 ; CHECK: [[OR2:%.*]] = or i64 %sampler_offset{{.*}}, 1
-; CHECK: [[IMG2:%bindless_img[0-9]+]] = inttoptr i32 %conv3 to ptr addrspace(393468)
+; CHECK: [[IMG2:%bindless_img[0-9]+]] = inttoptr i64 %__SYCLKernel.3.copyload to ptr addrspace(393216)
 ; CHECK-NEXT: [[SAMPLER2:%bindless_sampler[0-9]+]] = inttoptr i64 [[OR2]] to ptr addrspace(655360)
-; CHECK-NEXT: %call26 = call <4 x float> @llvm.genx.GenISA.sampleLptr.v4f32.f32.p196608.p393468.p655360(float 0.000000e+00, float %CoordX2, float %CoordY3, float 0.000000e+00, float 0.000000e+00, ptr addrspace(196608) undef, ptr addrspace(393468) [[IMG2]], ptr addrspace(655360) [[SAMPLER2]], i32 0, i32 0, i32 0)
+; CHECK-NEXT: %call26 = call <4 x float> @llvm.genx.GenISA.sampleLptr.v4f32.f32.p196608.p393216.p655360(float 0.000000e+00, float %CoordX2, float %CoordY3, float 0.000000e+00, float 0.000000e+00, ptr addrspace(196608) undef, ptr addrspace(393216) [[IMG2]], ptr addrspace(655360) [[SAMPLER2]], i32 0, i32 0, i32 0)
 
   %call2 = call spir_func <4 x float> @__builtin_IB_OCL_2d_sample_l(i32 %conv3, i32 %conv4, <2 x float> zeroinitializer, float 0.000000e+00)
   ret void