Skip to content

Commit caa7301

Browse files
svenvhsvenvh
authored
[OpenCL] Restore addrspacecast for pipe builtins (#112514)
Commit 84ee629 ("clang: Remove some pointer bitcasts (#112324)", 2024-10-15) triggered some "Call parameter type does not match function signature!" errors when using the OpenCL pipe builtin functions under the spir triple, due to a missing addrspacecast. This would have been caught by the pipe_builtin.cl test if that had used the `spir-unknown-unknown` triple, so extend the test to use that triple too.
1 parent f113a66 commit caa7301

File tree

2 files changed

+23
-1
lines changed

2 files changed

+23
-1
lines changed

‎clang/lib/CodeGen/CGBuiltin.cpp

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5657,13 +5657,14 @@ RValue CodeGenFunction::EmitBuiltinExpr(const GlobalDecl GD, unsigned BuiltinID,
56575657
*Arg3 = EmitScalarExpr(E->getArg(3));
56585658
llvm::FunctionType *FTy = llvm::FunctionType::get(
56595659
Int32Ty, llvm::ArrayRef<llvm::Type *>(ArgTys), false);
5660+
Value *ACast = Builder.CreateAddrSpaceCast(Arg3, I8PTy);
56605661
// We know the third argument is an integer type, but we may need to cast
56615662
// it to i32.
56625663
if (Arg2->getType() != Int32Ty)
56635664
Arg2 = Builder.CreateZExtOrTrunc(Arg2, Int32Ty);
56645665
return RValue::get(
56655666
EmitRuntimeCall(CGM.CreateRuntimeFunction(FTy, Name),
5666-
{Arg0, Arg1, Arg2, Arg3, PacketSize, PacketAlign}));
5667+
{Arg0, Arg1, Arg2, ACast, PacketSize, PacketAlign}));
56675668
}
56685669
}
56695670
// OpenCL v2.0 s6.13.16 ,s9.17.3.5 - Built-in pipe reserve read and write

‎clang/test/CodeGenOpenCL/pipe_builtin.cl

Lines changed: 21 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,69 +1,90 @@
1+
// RUN: %clang_cc1 -triple spir-unknown-unknown -emit-llvm -cl-ext=+cl_khr_subgroups -O0 -cl-std=clc++ -o - %s | FileCheck --check-prefix=CHECK-SPIR %s
12
// RUN: %clang_cc1 -triple %itanium_abi_triple -emit-llvm -cl-ext=+cl_khr_subgroups -O0 -cl-std=clc++ -o - %s | FileCheck %s
23
// FIXME: Add MS ABI manglings of OpenCL things and remove %itanium_abi_triple
34
// above to support OpenCL in the MS C++ ABI.
45

56
#pragma OPENCL EXTENSION cl_khr_subgroups : enable
67

78
void test1(read_only pipe int p, global int *ptr) {
9+
// CHECK-SPIR: call spir_func i32 @__read_pipe_2(target("spirv.Pipe", 0) %{{.*}}, ptr addrspace(4) %{{.*}}, i32 4, i32 4)
810
// CHECK: call i32 @__read_pipe_2(ptr %{{.*}}, ptr %{{.*}}, i32 4, i32 4)
911
read_pipe(p, ptr);
12+
// CHECK-SPIR: call spir_func target("spirv.ReserveId") @__reserve_read_pipe(target("spirv.Pipe", 0) %{{.*}}, i32 {{.*}}, i32 4, i32 4)
1013
// CHECK: call ptr @__reserve_read_pipe(ptr %{{.*}}, i32 {{.*}}, i32 4, i32 4)
1114
reserve_id_t rid = reserve_read_pipe(p, 2);
15+
// CHECK-SPIR: call spir_func i32 @__read_pipe_4(target("spirv.Pipe", 0) %{{.*}}, ptr addrspace(4) %{{.*}}, i32 4, i32 4)
1216
// CHECK: call i32 @__read_pipe_4(ptr %{{.*}}, ptr %{{.*}}, i32 {{.*}}, ptr %{{.*}}, i32 4, i32 4)
1317
read_pipe(p, rid, 2, ptr);
18+
// CHECK-SPIR: call spir_func void @__commit_read_pipe(target("spirv.Pipe", 0) %{{.*}}, target("spirv.ReserveId") %{{.*}}, i32 4, i32 4)
1419
// CHECK: call void @__commit_read_pipe(ptr %{{.*}}, ptr %{{.*}}, i32 4, i32 4)
1520
commit_read_pipe(p, rid);
1621
}
1722

1823
void test2(write_only pipe int p, global int *ptr) {
24+
// CHECK-SPIR: call spir_func i32 @__write_pipe_2(target("spirv.Pipe", 1) %{{.*}}, ptr addrspace(4) %{{.*}}, i32 4, i32 4)
1925
// CHECK: call i32 @__write_pipe_2(ptr %{{.*}}, ptr %{{.*}}, i32 4, i32 4)
2026
write_pipe(p, ptr);
27+
// CHECK-SPIR: call spir_func target("spirv.ReserveId") @__reserve_write_pipe(target("spirv.Pipe", 1) %{{.*}}, i32 {{.*}}, i32 4, i32 4)
2128
// CHECK: call ptr @__reserve_write_pipe(ptr %{{.*}}, i32 {{.*}}, i32 4, i32 4)
2229
reserve_id_t rid = reserve_write_pipe(p, 2);
30+
// CHECK-SPIR: call spir_func i32 @__write_pipe_4(target("spirv.Pipe", 1) %{{.*}}, ptr addrspace(4) %{{.*}}, i32 4, i32 4)
2331
// CHECK: call i32 @__write_pipe_4(ptr %{{.*}}, ptr %{{.*}}, i32 {{.*}}, ptr %{{.*}}, i32 4, i32 4)
2432
write_pipe(p, rid, 2, ptr);
33+
// CHECK-SPIR: call spir_func void @__commit_write_pipe(target("spirv.Pipe", 1) %{{.*}}, target("spirv.ReserveId") %{{.*}}, i32 4, i32 4)
2534
// CHECK: call void @__commit_write_pipe(ptr %{{.*}}, ptr %{{.*}}, i32 4, i32 4)
2635
commit_write_pipe(p, rid);
2736
}
2837

2938
void test3(read_only pipe int p, global int *ptr) {
39+
// CHECK-SPIR: call spir_func target("spirv.ReserveId") @__work_group_reserve_read_pipe(target("spirv.Pipe", 0) %{{.*}}, i32 {{.*}}, i32 4, i32 4)
3040
// CHECK: call ptr @__work_group_reserve_read_pipe(ptr %{{.*}}, i32 {{.*}}, i32 4, i32 4)
3141
reserve_id_t rid = work_group_reserve_read_pipe(p, 2);
42+
// CHECK-SPIR: call spir_func void @__work_group_commit_read_pipe(target("spirv.Pipe", 0) %{{.*}}, target("spirv.ReserveId") %{{.*}}, i32 4, i32 4)
3243
// CHECK: call void @__work_group_commit_read_pipe(ptr %{{.*}}, ptr %{{.*}}, i32 4, i32 4)
3344
work_group_commit_read_pipe(p, rid);
3445
}
3546

3647
void test4(write_only pipe int p, global int *ptr) {
48+
// CHECK-SPIR: call spir_func target("spirv.ReserveId") @__work_group_reserve_write_pipe(target("spirv.Pipe", 1) %{{.*}}, i32 {{.*}}, i32 4, i32 4)
3749
// CHECK: call ptr @__work_group_reserve_write_pipe(ptr %{{.*}}, i32 {{.*}}, i32 4, i32 4)
3850
reserve_id_t rid = work_group_reserve_write_pipe(p, 2);
51+
// CHECK-SPIR: call spir_func void @__work_group_commit_write_pipe(target("spirv.Pipe", 1) %{{.*}}, target("spirv.ReserveId") %{{.*}}, i32 4, i32 4)
3952
// CHECK: call void @__work_group_commit_write_pipe(ptr %{{.*}}, ptr %{{.*}}, i32 4, i32 4)
4053
work_group_commit_write_pipe(p, rid);
4154
}
4255

4356
void test5(read_only pipe int p, global int *ptr) {
57+
// CHECK-SPIR: call spir_func target("spirv.ReserveId") @__sub_group_reserve_read_pipe(target("spirv.Pipe", 0) %{{.*}}, i32 {{.*}}, i32 4, i32 4)
4458
// CHECK: call ptr @__sub_group_reserve_read_pipe(ptr %{{.*}}, i32 {{.*}}, i32 4, i32 4)
4559
reserve_id_t rid = sub_group_reserve_read_pipe(p, 2);
60+
// CHECK-SPIR: call spir_func void @__sub_group_commit_read_pipe(target("spirv.Pipe", 0) %{{.*}}, target("spirv.ReserveId") %{{.*}}, i32 4, i32 4)
4661
// CHECK: call void @__sub_group_commit_read_pipe(ptr %{{.*}}, ptr %{{.*}}, i32 4, i32 4)
4762
sub_group_commit_read_pipe(p, rid);
4863
}
4964

5065
void test6(write_only pipe int p, global int *ptr) {
66+
// CHECK-SPIR: call spir_func target("spirv.ReserveId") @__sub_group_reserve_write_pipe(target("spirv.Pipe", 1) %{{.*}}, i32 {{.*}}, i32 4, i32 4)
5167
// CHECK: call ptr @__sub_group_reserve_write_pipe(ptr %{{.*}}, i32 {{.*}}, i32 4, i32 4)
5268
reserve_id_t rid = sub_group_reserve_write_pipe(p, 2);
69+
// CHECK-SPIR: call spir_func void @__sub_group_commit_write_pipe(target("spirv.Pipe", 1) %{{.*}}, target("spirv.ReserveId") %{{.*}}, i32 4, i32 4)
5370
// CHECK: call void @__sub_group_commit_write_pipe(ptr %{{.*}}, ptr %{{.*}}, i32 4, i32 4)
5471
sub_group_commit_write_pipe(p, rid);
5572
}
5673

5774
void test7(read_only pipe int p, global int *ptr) {
75+
// CHECK-SPIR: call spir_func i32 @__get_pipe_num_packets_ro(target("spirv.Pipe", 0) %{{.*}}, i32 4, i32 4)
5876
// CHECK: call i32 @__get_pipe_num_packets_ro(ptr %{{.*}}, i32 4, i32 4)
5977
*ptr = get_pipe_num_packets(p);
78+
// CHECK-SPIR: call spir_func i32 @__get_pipe_max_packets_ro(target("spirv.Pipe", 0) %{{.*}}, i32 4, i32 4)
6079
// CHECK: call i32 @__get_pipe_max_packets_ro(ptr %{{.*}}, i32 4, i32 4)
6180
*ptr = get_pipe_max_packets(p);
6281
}
6382

6483
void test8(write_only pipe int p, global int *ptr) {
84+
// CHECK-SPIR: call spir_func i32 @__get_pipe_num_packets_wo(target("spirv.Pipe", 1) %{{.*}}, i32 4, i32 4)
6585
// CHECK: call i32 @__get_pipe_num_packets_wo(ptr %{{.*}}, i32 4, i32 4)
6686
*ptr = get_pipe_num_packets(p);
87+
// CHECK-SPIR: call spir_func i32 @__get_pipe_max_packets_wo(target("spirv.Pipe", 1) %{{.*}}, i32 4, i32 4)
6788
// CHECK: call i32 @__get_pipe_max_packets_wo(ptr %{{.*}}, i32 4, i32 4)
6889
*ptr = get_pipe_max_packets(p);
6990
}

0 commit comments

Comments
 (0)