Skip to content

[SYCL] Ensure the metadata type is correct for reqd_work_group_size" #19204

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

Closed
wants to merge 1 commit into from
Closed

[SYCL] Ensure the metadata type is correct for reqd_work_group_size" #19204

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
24 changes: 12 additions & 12 deletions clang/lib/CodeGen/CodeGenFunction.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -715,13 +715,13 @@ void CodeGenFunction::EmitKernelMetadata(const FunctionDecl *FD,

// On SYCL target the dimensions are reversed if present.
if (ZDimVal)
AttrMDArgs.push_back(
llvm::ConstantAsMetadata::get(Builder.getInt(*ZDimVal)));
AttrMDArgs.push_back(llvm::ConstantAsMetadata::get(
Builder.getInt32(ZDimVal->getLimitedValue())));
if (YDimVal)
AttrMDArgs.push_back(
llvm::ConstantAsMetadata::get(Builder.getInt(*YDimVal)));
AttrMDArgs.push_back(
llvm::ConstantAsMetadata::get(Builder.getInt(*XDimVal)));
AttrMDArgs.push_back(llvm::ConstantAsMetadata::get(
Builder.getInt32(YDimVal->getLimitedValue())));
AttrMDArgs.push_back(llvm::ConstantAsMetadata::get(
Builder.getInt32(XDimVal->getLimitedValue())));

for (auto i = AttrMDArgs.size(); i < 3; ++i)
AttrMDArgs.push_back(
Expand Down Expand Up @@ -752,17 +752,17 @@ void CodeGenFunction::EmitKernelMetadata(const FunctionDecl *FD,
llvm::APInt NumDims(32, 1); // X
// On SYCL target the dimensions are reversed if present.
if (ZDimVal) {
AttrMDArgs.push_back(
llvm::ConstantAsMetadata::get(Builder.getInt(*ZDimVal)));
AttrMDArgs.push_back(llvm::ConstantAsMetadata::get(
Builder.getInt32(ZDimVal->getLimitedValue())));
++NumDims;
}
if (YDimVal) {
AttrMDArgs.push_back(
llvm::ConstantAsMetadata::get(Builder.getInt(*YDimVal)));
AttrMDArgs.push_back(llvm::ConstantAsMetadata::get(
Builder.getInt32(YDimVal->getLimitedValue())));
++NumDims;
}
AttrMDArgs.push_back(
llvm::ConstantAsMetadata::get(Builder.getInt(*XDimVal)));
AttrMDArgs.push_back(llvm::ConstantAsMetadata::get(
Builder.getInt32(XDimVal->getLimitedValue())));

for (auto i = NumDims.getZExtValue(); i < 3; ++i)
AttrMDArgs.push_back(
Expand Down
5 changes: 5 additions & 0 deletions clang/test/CodeGenSYCL/reqd-work-group-size.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -102,6 +102,9 @@ int main() {

h.single_task<class kernel_name24>(
[]() [[sycl::reqd_work_group_size(1)]]{});
// Test invalid group size
h.single_task<class kernel_name26>(
[]() [[sycl::reqd_work_group_size(18446744073709551615UL)]]{});
});
return 0;
}
Expand All @@ -122,6 +125,7 @@ int main() {
// CHECK: define {{.*}} void @{{.*}}kernel_name21() #0 {{.*}} !work_group_num_dim ![[NDRWGS1D:[0-9]+]] !reqd_work_group_size ![[WGSIZE2D2_or_WGSIZE1D8]]
// CHECK: define {{.*}} void @{{.*}}kernel_name22() #0 {{.*}} !work_group_num_dim ![[NDRWGS1D:[0-9]+]] !reqd_work_group_size ![[WGSIZE1D22:[0-9]+]]
// CHECK: define {{.*}} void @{{.*}}kernel_name24() #0 {{.*}} !work_group_num_dim ![[NDRWGS1D:[0-9]+]] !reqd_work_group_size ![[WGSIZE1D2:[0-9]+]]
// CHECK: define {{.*}} void @{{.*}}kernel_name26() #0 {{.*}} !work_group_num_dim ![[NDRWGS1D:[0-9]+]] !reqd_work_group_size ![[WGSIZE1D26:[0-9]+]]

// CHECK: ![[NDRWGS3D]] = !{i32 3}
// CHECK: ![[WGSIZE3D32]] = !{i32 16, i32 16, i32 32}
Expand All @@ -137,3 +141,4 @@ int main() {
// CHECK: ![[WGSIZE1D32]] = !{i32 32, i32 1, i32 1}
// CHECK: ![[WGSIZE1D22]] = !{i32 2, i32 1, i32 1}
// CHECK: ![[WGSIZE1D2]] = !{i32 1, i32 1, i32 1}
// CHECK: ![[WGSIZE1D26]] = !{i32 -1, i32 1, i32 1}
Loading