[OpaquePtr] Emit target extension types for sampled images for SPIR-V. (#8957)

Author: jcranmer-intel

clang/lib/CodeGen/TargetInfo.cpp

@@ -11249,9 +11249,17 @@ llvm::Type *CommonSPIRTargetCodeGenInfo::getOpenCLType(CodeGenModule &CGM,
   if (auto *BuiltinTy = dyn_cast<BuiltinType>(Ty)) {
     enum AccessQualifier : unsigned { AQ_ro = 0, AQ_wo = 1, AQ_rw = 2 };
     switch (BuiltinTy->getKind()) {
+// clang-format off
 #define IMAGE_TYPE(ImgType, Id, SingletonId, Access, Suffix)                   \
     case BuiltinType::Id:                                                      \
       return getSPIRVImageType(Ctx, "spirv.Image", #ImgType, AQ_##Suffix);
+#include "clang/Basic/OpenCLImageTypes.def"
+#define IMAGE_TYPE(ImgType, Id, SingletonId, Access, Suffix)                   \
+    case BuiltinType::Sampled##Id:                                             \
+      return getSPIRVImageType(Ctx, "spirv.SampledImage", #ImgType, AQ_##Suffix);
+// clang-format on
+#define IMAGE_WRITE_TYPE(Type, Id, Ext)
+#define IMAGE_READ_WRITE_TYPE(Type, Id, Ext)
 #include "clang/Basic/OpenCLImageTypes.def"
     case BuiltinType::OCLSampler:
       return llvm::TargetExtType::get(Ctx, "spirv.Sampler");

clang/test/CodeGenOpenCL/sampled_image.cl

@@ -1,12 +1,16 @@
-// RUN: %clang_cc1 %s -triple x86_64-unknown-linux-gnu -O0 -emit-llvm -o - | FileCheck %s
-// RUN: %clang_cc1 %s -triple x86_64-unknown-linux-gnu -O0 -emit-llvm -o - -cl-std=clc++ | FileCheck %s
+// RUN: %clang_cc1 %s -triple x86_64-unknown-linux-gnu -O0 -emit-llvm -o - | FileCheck %s --check-prefix=CHECK-X86
+// RUN: %clang_cc1 %s -triple x86_64-unknown-linux-gnu -O0 -emit-llvm -o - -cl-std=clc++ | FileCheck %s --check-prefix=CHECK-X86
+// RUN: %clang_cc1 %s -triple spir64-unknown-unknown -O0 -emit-llvm -o - | FileCheck %s --check-prefix=CHECK-SPIR
+// RUN: %clang_cc1 %s -triple spir64-unknown-unknown -O0 -emit-llvm -o - -cl-std=clc++ | FileCheck %s --check-prefix=CHECK-SPIR
 
 __attribute__((overloadable)) void my_read_image(__ocl_sampled_image1d_ro_t img);
 __attribute__((overloadable)) void my_read_image(__ocl_sampled_image2d_ro_t img);
 
 void test_read_image(__ocl_sampled_image1d_ro_t img_ro, __ocl_sampled_image2d_ro_t img_2d) {
-  // CHECK: call void @_Z13my_read_image32__spirv_SampledImage__image1d_ro(ptr %{{[0-9]+}})
+  // CHECK-X86: call void @_Z13my_read_image32__spirv_SampledImage__image1d_ro(ptr %{{[0-9]+}})
+  // CHECK-SPIR: call spir_func void @_Z13my_read_image32__spirv_SampledImage__image1d_ro(target("spirv.SampledImage", void, 0, 0, 0, 0, 0, 0, 0) %{{[0-9]+}})
   my_read_image(img_ro);
-  // CHECK: call void @_Z13my_read_image32__spirv_SampledImage__image2d_ro(ptr %{{[0-9]+}})
+  // CHECK-X86: call void @_Z13my_read_image32__spirv_SampledImage__image2d_ro(ptr %{{[0-9]+}})
+  // CHECK-SPIR: call spir_func void @_Z13my_read_image32__spirv_SampledImage__image2d_ro(target("spirv.SampledImage", void, 1, 0, 0, 0, 0, 0, 0) %{{[0-9]+}})
   my_read_image(img_2d);
 }