Skip to content

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

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
dm-vodopyanov merged 3 commits into from
Apr 19, 2023
Merged

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

Show file tree
Hide file tree
Changes from 2 commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
d5a2731
[OpaquePtr] Emit target extension types for sampled images for SPIR-V.
jcranmer-intel Apr 5, 2023
ae49658
Add test.
jcranmer-intel Apr 13, 2023
13a0d7a
Disable clang formatting.
jcranmer-intel Apr 18, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 6 additions & 0 deletions clang/lib/CodeGen/TargetInfo.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11252,6 +11252,12 @@ llvm::Type *CommonSPIRTargetCodeGenInfo::getOpenCLType(CodeGenModule &CGM,
#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);
#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");
Expand Down
12 changes: 8 additions & 4 deletions clang/test/CodeGenOpenCL/sampled_image.cl
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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);
}