Skip to content

[SYCL-Upstreaming] Fix a crash when an argument of skep function is not trivially-copyable #53

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
merged 1 commit into from
Oct 1, 2025
Merged

[SYCL-Upstreaming] Fix a crash when an argument of skep function is not trivially-copyable #53

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
2 changes: 1 addition & 1 deletion clang/lib/Sema/SemaSYCL.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -511,7 +511,7 @@ StmtResult BuildSYCLKernelLaunchStmt(Sema &SemaRef,
if (LaunchResult.isInvalid())
return StmtError();

Stmts.push_back(LaunchResult.get());
Stmts.push_back(SemaRef.MaybeCreateExprWithCleanups(LaunchResult).get());
}

return CompoundStmt::Create(SemaRef.getASTContext(), Stmts,
Expand Down
47 changes: 47 additions & 0 deletions clang/test/CodeGenSYCL/kernel-caller-entry-point.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -63,6 +63,23 @@ void skep(KT k, int a, int b) {
}
};

struct auto_name;

template <typename KernelName, typename KernelType>
[[clang::sycl_kernel_entry_point(KernelName)]]
void __kernel_single_task(const KernelType KernelFunc) {
KernelFunc();
}

template <typename KernelType, typename KernelName = auto_name>
void pf(KernelType K) {
__kernel_single_task<KernelName>(K);
}
struct DCopyable {
int i;
~DCopyable();
};

int main() {
single_purpose_kernel obj;
single_purpose_kernel_task(obj);
Expand All @@ -72,6 +89,9 @@ int main() {
kernel_single_task<\u03b4\u03c4\u03c7>([](int){});
Handler H;
H.skep<class notaverygoodkernelname>([=](int a, int b){return a+b;}, 1, 2);

DCopyable b;
pf([b](){});
}

// Verify that SYCL kernel caller functions are not emitted during host
Expand Down Expand Up @@ -140,6 +160,17 @@ int main() {
// CHECK-HOST-LINUX-NEXT: ret void
// CHECK-HOST-LINUX-NEXT: }

// CHECK-HOST-LINUX: define internal void @_Z20__kernel_single_taskI9auto_nameZ4mainEUlvE_EvT0_(ptr noundef %KernelFunc)
// CHECK-HOST-LINUX-NEXT: entry:
// CHECK-HOST-LINUX-NEXT: %KernelFunc.indirect_addr = alloca ptr, align 8
// CHECK-HOST-LINUX-NEXT: %agg.tmp = alloca %class.anon.3, align 4
// CHECK-HOST-LINUX-NEXT: store ptr %KernelFunc, ptr %KernelFunc.indirect_addr, align 8
// CHECK-HOST-LINUX-NEXT: call void @llvm.memcpy.p0.p0.i64(ptr align 4 %agg.tmp, ptr align 4 %KernelFunc, i64 4, i1 false)
// CHECK-HOST-LINUX-NEXT: call void @_Z18sycl_kernel_launchI9auto_nameZ4mainEUlvE_EvPKcT0_(ptr noundef @.str.4, ptr noundef %agg.tmp)
// CHECK-HOST-LINUX-NEXT: call void @_ZZ4mainENUlvE_D1Ev(ptr noundef nonnull align 4 dereferenceable(4) %agg.tmp) #4
// CHECK-HOST-LINUX-NEXT: ret void
// CHECK-HOST-LINUX-NEXT: }

// CHECK-HOST-WINDOWS: define dso_local void @"?single_purpose_kernel_task@@YAXUsingle_purpose_kernel@@@Z"(i8 %kernelFunc.coerce) #{{[0-9]+}} {
// CHECK-HOST-WINDOWS-NEXT: entry:
// CHECK-HOST-WINDOWS-NEXT: %kernelFunc = alloca %struct.single_purpose_kernel, align 1
Expand Down Expand Up @@ -199,6 +230,22 @@ int main() {
// CHECK-HOST-WINDOWS-NEXT: ret void
// CHECK-HOST-WINDOWS-NEXT: }

// CHECK-HOST-WINDOWS: define internal void @"??$__kernel_single_task@Uauto_name@@V<lambda_4>@?0??main@@9@@@YAXV<lambda_4>@?0??main@@9@@Z"(i32 %KernelFunc.coerce)
// CHECK-HOST-WINDOWS-NEXT: entry:
// CHECK-HOST-WINDOWS-NEXT: %KernelFunc = alloca %class.anon.3, align 4
// CHECK-HOST-WINDOWS-NEXT: %agg.tmp = alloca %class.anon.3, align 4
// CHECK-HOST-WINDOWS-NEXT: %coerce.dive = getelementptr inbounds nuw %class.anon.3, ptr %KernelFunc, i32 0, i32 0
// CHECK-HOST-WINDOWS-NEXT: %coerce.dive1 = getelementptr inbounds nuw %struct.DCopyable, ptr %coerce.dive, i32 0, i32 0
// CHECK-HOST-WINDOWS-NEXT: store i32 %KernelFunc.coerce, ptr %coerce.dive1, align 4
// CHECK-HOST-WINDOWS-NEXT: call void @llvm.memcpy.p0.p0.i64(ptr align 4 %agg.tmp, ptr align 4 %KernelFunc, i64 4, i1 false)
// CHECK-HOST-WINDOWS-NEXT: %coerce.dive2 = getelementptr inbounds nuw %class.anon.3, ptr %agg.tmp, i32 0, i32 0
// CHECK-HOST-WINDOWS-NEXT: %coerce.dive3 = getelementptr inbounds nuw %struct.DCopyable, ptr %coerce.dive2, i32 0, i32 0
// CHECK-HOST-WINDOWS-NEXT: %0 = load i32, ptr %coerce.dive3, align 4
// CHECK-HOST-WINDOWS-NEXT: call void @"??$sycl_kernel_launch@Uauto_name@@V<lambda_4>@?0??main@@9@@@YAXPEBDV<lambda_4>@?0??main@@9@@Z"(ptr noundef @"??_C@_0P@HMAAEHI@_ZTS9auto_name?$AA@", i32 %0)
// CHECK-HOST-WINDOWS-NEXT: call void @"??1<lambda_4>@?0??main@@9@QEAA@XZ"(ptr noundef nonnull align 4 dereferenceable(4) %KernelFunc)
// CHECK-HOST-WINDOWS-NEXT: ret void
// CHECK-HOST-WINDOWS-NEXT: }

// Verify that SYCL kernel caller functions are emitted for each device target.
//
// main() shouldn't be emitted in device code.
Expand Down