-
Notifications
You must be signed in to change notification settings - Fork 730
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
[SYCL] Fix crash due to incorrect
ReinterpretCastExpr
generation (#…
…7030) When creating `ReinterpretCastExpr` use `getTrivialTypeSourceInfo` instead of `CreateTypeSourceInfo` since `CreateTypeSourceInfo` doesn't initialize underlying memory. The crash appeared during recursive AST visitors walks if kernel argument type had a nested name specifier.
- Loading branch information
Showing
5 changed files
with
189 additions
and
1 deletion.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,71 @@ | ||
// RUN: %clang_cc1 -fno-sycl-force-inline-kernel-lambda -fsycl-is-device -internal-isystem %S/Inputs -triple spir64-unknown-unknown -disable-llvm-passes -opaque-pointers -emit-llvm %s -o - | FileCheck %s | ||
|
||
// This test checks that compiler generates correct code when kernel arguments | ||
// are structs that contain pointers but not decomposed. | ||
|
||
#include "sycl.hpp" | ||
|
||
struct A { | ||
float *F; | ||
}; | ||
|
||
struct B { | ||
int *F1; | ||
A F3; | ||
B(int *I, A AA) : F1(I), F3(AA) {}; | ||
}; | ||
|
||
struct Nested { | ||
typedef B TDA; | ||
}; | ||
|
||
int main() { | ||
sycl::queue q; | ||
B Obj{nullptr, {nullptr}}; | ||
|
||
q.submit([&](sycl::handler &h) { | ||
h.single_task<class basic>( | ||
[=]() { | ||
(void)Obj; | ||
}); | ||
}); | ||
|
||
Nested::TDA NNSObj{nullptr, {nullptr}}; | ||
q.submit([&](sycl::handler &h) { | ||
h.single_task<class nns>([=]() { | ||
(void)NNSObj; | ||
}); | ||
}); | ||
return 0; | ||
} | ||
// CHECK: define dso_local spir_kernel void @{{.*}}basic(ptr noundef byval(%struct.__generated_B) align 8 %_arg_Obj) | ||
// | ||
// Kernel object clone. | ||
// CHECK: %[[K:[a-zA-Z0-9_.]+]] = alloca %class.anon | ||
// CHECK: %[[K_as_cast:[a-zA-Z0-9_.]+]] = addrspacecast ptr %[[K]] to ptr addrspace(4) | ||
// | ||
// Argument reference. | ||
// CHECK: %[[Arg_ref:[a-zA-Z0-9_.]+]] = addrspacecast ptr %_arg_Obj to ptr addrspace(4) | ||
// | ||
// Initialization. | ||
// CHECK: %[[GEP:[a-zA-Z0-9_.]+]] = getelementptr inbounds %class.anon, ptr addrspace(4) %[[K_as_cast]], i32 0, i32 0 | ||
// CHECK: call void @llvm.memcpy.p4.p4.i64(ptr addrspace(4) align 8 %[[GEP]], ptr addrspace(4) align 8 %[[Arg_ref]], i64 16, i1 false) | ||
// | ||
// Kernel body call. | ||
// CHECK: call spir_func void @_ZZZ4mainENKUlRN4sycl3_V17handlerEE_clES2_ENKUlvE_clEv(ptr addrspace(4) noundef align 8 dereferenceable_or_null(16) %[[K_as_cast]]) | ||
|
||
// CHECK: define dso_local spir_kernel void @{{.*}}nns(ptr noundef byval(%struct.__generated_B.0) align 8 %_arg_NNSObj) | ||
// | ||
// Kernel object clone. | ||
// CHECK: %[[NNSK:[a-zA-Z0-9_.]+]] = alloca %class.anon.2 | ||
// CHECK: %[[NNSK_as_cast:[a-zA-Z0-9_.]+]] = addrspacecast ptr %[[NNSK]] to ptr addrspace(4) | ||
// | ||
// Argument reference. | ||
// CHECK: %[[NNSArg_ref:[a-zA-Z0-9_.]+]] = addrspacecast ptr %_arg_NNSObj to ptr addrspace(4) | ||
// | ||
// Initialization. | ||
// CHECK: %[[NNSGEP:[a-zA-Z0-9_.]+]] = getelementptr inbounds %class.anon.2, ptr addrspace(4) %[[NNSK_as_cast]], i32 0, i32 0 | ||
// CHECK: call void @llvm.memcpy.p4.p4.i64(ptr addrspace(4) align 8 %[[NNSGEP]], ptr addrspace(4) align 8 %[[NNSArg_ref]], i64 16, i1 false) | ||
// | ||
// Kernel body call. | ||
// CHECK: call spir_func void @_ZZZ4mainENKUlRN4sycl3_V17handlerEE0_clES2_ENKUlvE_clEv(ptr addrspace(4) noundef align 8 dereferenceable_or_null(16) %[[NNSK_as_cast]]) |
77 changes: 77 additions & 0 deletions
77
clang/test/CodeGenSYCL/no-opaque-generated-types-initialization.cpp
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,77 @@ | ||
// RUN: %clang_cc1 -fno-sycl-force-inline-kernel-lambda -fsycl-is-device -internal-isystem %S/Inputs -triple spir64-unknown-unknown -disable-llvm-passes -no-opaque-pointers -emit-llvm %s -o - | FileCheck %s | ||
|
||
// This test checks that compiler generates correct code when kernel arguments | ||
// are structs that contain pointers but not decomposed. | ||
|
||
#include "sycl.hpp" | ||
|
||
struct A { | ||
float *F; | ||
}; | ||
|
||
struct B { | ||
int *F1; | ||
A F3; | ||
B(int *I, A AA) : F1(I), F3(AA) {}; | ||
}; | ||
|
||
struct Nested { | ||
typedef B TDA; | ||
}; | ||
|
||
int main() { | ||
sycl::queue q; | ||
B Obj{nullptr, {nullptr}}; | ||
|
||
q.submit([&](sycl::handler &h) { | ||
h.single_task<class basic>( | ||
[=]() { | ||
(void)Obj; | ||
}); | ||
}); | ||
|
||
Nested::TDA NNSObj{nullptr, {nullptr}}; | ||
q.submit([&](sycl::handler &h) { | ||
h.single_task<class nns>([=]() { | ||
(void)NNSObj; | ||
}); | ||
}); | ||
return 0; | ||
} | ||
// CHECK: define dso_local spir_kernel void @{{.*}}basic(%struct.__generated_B* noundef byval(%struct.__generated_B) align 8 %_arg_Obj) | ||
// | ||
// Kernel object clone. | ||
// CHECK: %[[K:[a-zA-Z0-9_.]+]] = alloca %class.anon | ||
// CHECK: %[[K_as_cast:[a-zA-Z0-9_.]+]] = addrspacecast %class.anon* %[[K]] to %class.anon addrspace(4)* | ||
// | ||
// Argument reference. | ||
// CHECK: %[[Arg_ref:[a-zA-Z0-9_.]+]] = addrspacecast %struct.__generated_B* %_arg_Obj to %struct.__generated_B addrspace(4)* | ||
|
||
// Initialization. | ||
// CHECK: %[[GEP:[a-zA-Z0-9_.]+]] = getelementptr inbounds %class.anon, %class.anon addrspace(4)* %[[K_as_cast]], i32 0, i32 0 | ||
// CHECK: %[[ArgBC:[a-zA-Z0-9_.]+]] = bitcast %struct.__generated_B addrspace(4)* %[[Arg_ref]] to %struct.B addrspace(4)* | ||
// CHECK: %[[GEPBC:[a-zA-Z0-9_.]+]] = bitcast %struct.B addrspace(4)* %[[GEP]] to i8 addrspace(4)* | ||
// CHECK: %[[ArgBC2:[a-zA-Z0-9_.]+]] = bitcast %struct.B addrspace(4)* %[[ArgBC]] to i8 addrspace(4)* | ||
// CHECK: call void @llvm.memcpy.p4i8.p4i8.i64(i8 addrspace(4)* align 8 %[[GEPBC]], i8 addrspace(4)* align 8 %[[ArgBC2]], i64 16, i1 false) | ||
// | ||
// Kernel body call. | ||
// CHECK: call spir_func void @_ZZZ4mainENKUlRN4sycl3_V17handlerEE_clES2_ENKUlvE_clEv(%class.anon addrspace(4)* noundef align 8 dereferenceable_or_null(16) %[[K_as_cast]]) | ||
|
||
// CHECK: define dso_local spir_kernel void @{{.*}}nns(%struct.__generated_B.0* noundef byval(%struct.__generated_B.0) align 8 %_arg_NNSObj) | ||
// | ||
// Kernel object clone. | ||
// CHECK: %[[NNSK:[a-zA-Z0-9_.]+]] = alloca %class.anon.2 | ||
// CHECK: %[[NNSK_as_cast:[a-zA-Z0-9_.]+]] = addrspacecast %class.anon.2* %[[NNSK]] to %class.anon.2 addrspace(4)* | ||
// | ||
// Argument reference. | ||
// CHECK: %[[NNSArg_ref:[a-zA-Z0-9_.]+]] = addrspacecast %struct.__generated_B.0* %_arg_NNSObj to %struct.__generated_B.0 addrspace(4)* | ||
// | ||
// Initialization. | ||
// CHECK: %[[NNSGEP:[a-zA-Z0-9_.]+]] = getelementptr inbounds %class.anon.2, %class.anon.2 addrspace(4)* %[[NNSK_as_cast]], i32 0, i32 0 | ||
// CHECK: %[[NNSArgBC:[a-zA-Z0-9_.]+]] = bitcast %struct.__generated_B.0 addrspace(4)* %[[NNSArg_ref]] to %struct.B addrspace(4)* | ||
// CHECK: %[[NNSGEPBC:[a-zA-Z0-9_.]+]] = bitcast %struct.B addrspace(4)* %[[NNSGEP]] to i8 addrspace(4)* | ||
// CHECK: %[[NNSArgBC2:[a-zA-Z0-9_.]+]] = bitcast %struct.B addrspace(4)* %[[NNSArgBC]] to i8 addrspace(4)* | ||
// CHECK: call void @llvm.memcpy.p4i8.p4i8.i64(i8 addrspace(4)* align 8 %[[NNSGEPBC]], i8 addrspace(4)* align 8 %[[NNSArgBC2]], i64 16, i1 false) | ||
// | ||
// Kernel body call. | ||
// CHECK: call spir_func void @_ZZZ4mainENKUlRN4sycl3_V17handlerEE0_clES2_ENKUlvE_clEv(%class.anon.2 addrspace(4)* noundef align 8 dereferenceable_or_null(16) %[[NNSK_as_cast]]) |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters