Skip to content

[SYCL] Fix crash on array of pointers #2413

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 4 commits into from
Sep 4, 2020
Merged

[SYCL] Fix crash on array of pointers #2413

Show file tree
Hide file tree
Changes from 2 commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
ab583e8
[SYCL] Fix crash on array of pointers
elizabethandrews Sep 2, 2020
2ea25b8
Add missing LValueToRValue cast for pointers. Also added test
elizabethandrews Sep 3, 2020
ac3e69a
Add review comment:
elizabethandrews Sep 3, 2020
20aa6f6
Remove unnecessary comments in test
elizabethandrews Sep 4, 2020
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
5 changes: 4 additions & 1 deletion clang/lib/Sema/SemaSYCL.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1843,6 +1843,9 @@ class SyclKernelBodyCreator : public SyclKernelFieldHandler {
ParamType = Pointer->getType();
}

DRE = ImplicitCastExpr::Create(SemaRef.Context, ParamType,
CK_LValueToRValue, DRE, nullptr, VK_RValue);

if (PointerTy->getPointeeType().getAddressSpace() !=
ParamType->getPointeeType().getAddressSpace())
DRE = ImplicitCastExpr::Create(SemaRef.Context, PointerTy,
Expand Down Expand Up @@ -2096,7 +2099,7 @@ class SyclKernelBodyCreator : public SyclKernelFieldHandler {

bool handlePointerType(FieldDecl *FD, QualType FieldTy) final {
Expr *PointerRef =
createPointerParamReferenceExpr(FD->getType(), StructDepth != 0);
createPointerParamReferenceExpr(FieldTy, StructDepth != 0);
addFieldInit(FD, FieldTy, PointerRef);
return true;
}
Expand Down
7 changes: 6 additions & 1 deletion clang/test/CodeGenSYCL/pointers-in-structs.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,6 +13,7 @@ struct B {
int *F1;
float *F2;
A F3;
int *F4[2];
};

int main() {
Expand All @@ -35,9 +36,13 @@ int main() {
// CHECK: %[[WRAPPER_F1:[a-zA-Z0-9_.]+]] = type { i32 addrspace(1)* }
// CHECK: %[[WRAPPER_F2:[a-zA-Z0-9_.]+]] = type { float addrspace(1)* }
// CHECK: %[[WRAPPER_F:[a-zA-Z0-9_.]+]] = type { float addrspace(1)* }
// CHECK: %[[WRAPPER_F4_1:[a-zA-Z0-9_.]+]] = type { i32 addrspace(1)* }
// CHECK: %[[WRAPPER_F4_2:[a-zA-Z0-9_.]+]] = type { i32 addrspace(1)* }
// CHECK: %[[WRAPPER_LAMBDA_PTR:[a-zA-Z0-9_.]+]] = type { float addrspace(1)* }
// CHECK: define spir_kernel void @{{.*}}structs
// CHECK-SAME: %[[WRAPPER_F1]]* byval(%[[WRAPPER_F1]]) align 8 %_arg_F1,
// CHECK-SAME: %[[WRAPPER_F2]]* byval(%[[WRAPPER_F2]]) align 8 %_arg_F2,
// CHECK-SAME: %[[WRAPPER_F]]* byval(%[[WRAPPER_F]]) align 8 %_arg_F
// CHECK-SAME: %[[WRAPPER_F]]* byval(%[[WRAPPER_F]]) align 8 %_arg_F,
// CHECK-SAME: %[[WRAPPER_F4_1]]* byval(%[[WRAPPER_F4_1]]) align 8 %_arg_F4
// CHECK-SAME: %[[WRAPPER_F4_2]]* byval(%[[WRAPPER_F4_2]]) align 8 %_arg_F41
// CHECK: define spir_kernel void @{{.*}}lambdas{{.*}}(%[[WRAPPER_LAMBDA_PTR]]* byval(%[[WRAPPER_LAMBDA_PTR]]) align 8 %_arg_)
10 changes: 10 additions & 0 deletions clang/test/CodeGenSYCL/pointers-int-header.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,8 @@
struct struct_with_pointer {
int data_in_struct;
int *ptr_in_struct;
int *ptr_array_in_struct1[2];
int *ptr_array_in_struct2[2][3];
};

int main() {
Expand All @@ -27,3 +29,11 @@ int main() {
// CHECK:{ kernel_param_kind_t::kind_pointer, 8, 0 },
// CHECK:{ kernel_param_kind_t::kind_std_layout, 4, 8 },
// CHECK:{ kernel_param_kind_t::kind_std_layout, 8, 16 },
// CHECK:{ kernel_param_kind_t::kind_std_layout, 8, 24 },
// CHECK:{ kernel_param_kind_t::kind_std_layout, 8, 32 },
// CHECK:{ kernel_param_kind_t::kind_std_layout, 8, 40 },
// CHECK:{ kernel_param_kind_t::kind_std_layout, 8, 48 },
// CHECK:{ kernel_param_kind_t::kind_std_layout, 8, 56 },
// CHECK:{ kernel_param_kind_t::kind_std_layout, 8, 64 },
// CHECK:{ kernel_param_kind_t::kind_std_layout, 8, 72 },
// CHECK:{ kernel_param_kind_t::kind_std_layout, 8, 80 },
68 changes: 64 additions & 4 deletions clang/test/SemaSYCL/built-in-type-kernel-arg.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,6 +13,8 @@ __attribute__((sycl_kernel)) void kernel(const Func &kernelFunc) {
struct test_struct {
int data;
int *ptr; // Unused pointer in struct
int *ptr_array1[2]; // Unused array of pointers in struct
int *ptr_array2[2][3]; // Unused array of pointers in struct
};

void test(const int some_const) {
Expand All @@ -26,6 +28,7 @@ int main() {
int data = 5;
int* data_addr = &data;
int* new_data_addr = nullptr;
int *ptr_array[2];
test_struct s;
s.data = data;
kernel<class kernel_int>(
Expand All @@ -40,7 +43,9 @@ int main() {
kernel<class kernel_pointer>(
[=]() {
new_data_addr[0] = data_addr[0];
int *local = ptr_array[1];
});

const int some_const = 10;
test(some_const);
return 0;
Expand All @@ -66,9 +71,18 @@ int main() {
// CHECK-NEXT: DeclRefExpr {{.*}} 'int' lvalue ParmVar {{.*}} '_arg_' 'int'

// Check kernel parameters
// CHECK: {{.*}}kernel_struct{{.*}} 'void (int, __wrapper_class)'
// CHECK: {{.*}}kernel_struct{{.*}} 'void (int, __wrapper_class, __wrapper_class, __wrapper_class
// CHECK-SAME: __wrapper_class, __wrapper_class, __wrapper_class, __wrapper_class, __wrapper_class, __wrapper_class)'
// CHECK: ParmVarDecl {{.*}} used _arg_data 'int'
// CHECK: ParmVarDecl {{.*}} used _arg_ptr '__wrapper_class'
// CHECK: ParmVarDecl {{.*}} used _arg_ptr_array1 '__wrapper_class'
// CHECK: ParmVarDecl {{.*}} used _arg_ptr_array1 '__wrapper_class'
// CHECK: ParmVarDecl {{.*}} used _arg_ptr_array2 '__wrapper_class'
// CHECK: ParmVarDecl {{.*}} used _arg_ptr_array2 '__wrapper_class'
// CHECK: ParmVarDecl {{.*}} used _arg_ptr_array2 '__wrapper_class'
// CHECK: ParmVarDecl {{.*}} used _arg_ptr_array2 '__wrapper_class'
// CHECK: ParmVarDecl {{.*}} used _arg_ptr_array2 '__wrapper_class'
// CHECK: ParmVarDecl {{.*}} used _arg_ptr_array2 '__wrapper_class'

// Check that lambda field of struct type is initialized
// CHECK: VarDecl {{.*}}'(lambda at {{.*}}built-in-type-kernel-arg.cpp{{.*}})'
Expand All @@ -77,20 +91,66 @@ int main() {
// CHECK-NEXT: ImplicitCastExpr {{.*}} 'int' <LValueToRValue>
// CHECK-NEXT: DeclRefExpr {{.*}} 'int' lvalue ParmVar {{.*}} '_arg_data' 'int'
// CHECK-NEXT: ImplicitCastExpr {{.*}} 'int *' <AddressSpaceConversion>
// CHECK-NEXT: ImplicitCastExpr {{.*}} '__global int *' <LValueToRValue>
// CHECK-NEXT: MemberExpr {{.*}} '__global int *' lvalue . {{.*}}
// CHECK-NEXT: DeclRefExpr {{.*}} '__wrapper_class' lvalue ParmVar {{.*}} '_arg_ptr' '__wrapper_class'
// CHECK-NEXT: InitListExpr {{.*}} 'int *[2]'
// CHECK-NEXT: ImplicitCastExpr {{.*}} 'int *' <AddressSpaceConversion>
// CHECK-NEXT: ImplicitCastExpr {{.*}} '__global int *' <LValueToRValue>
// CHECK-NEXT: MemberExpr {{.*}} '__global int *' lvalue . {{.*}}
// CHECK-NEXT: DeclRefExpr {{.*}} '__wrapper_class' lvalue ParmVar {{.*}} '_arg_ptr_array1' '__wrapper_class'
// CHECK-NEXT: ImplicitCastExpr {{.*}} 'int *' <AddressSpaceConversion>
// CHECK-NEXT: ImplicitCastExpr {{.*}} '__global int *' <LValueToRValue>
// CHECK-NEXT: MemberExpr {{.*}} '__global int *' lvalue . {{.*}}
// CHECK-NEXT: DeclRefExpr {{.*}} '__wrapper_class' lvalue ParmVar {{.*}} '_arg_ptr_array1' '__wrapper_class'
// CHECK-NEXT: InitListExpr {{.*}} 'int *[2][3]'
// CHECK-NEXT: InitListExpr {{.*}} 'int *[3]'
// CHECK-NEXT: ImplicitCastExpr {{.*}} 'int *' <AddressSpaceConversion>
// CHECK-NEXT: ImplicitCastExpr {{.*}} '__global int *' <LValueToRValue>
// CHECK-NEXT: MemberExpr {{.*}} '__global int *' lvalue . {{.*}}
// CHECK-NEXT: DeclRefExpr {{.*}} '__wrapper_class' lvalue ParmVar {{.*}} '_arg_ptr_array2' '__wrapper_class'
// CHECK-NEXT: ImplicitCastExpr {{.*}} 'int *' <AddressSpaceConversion>
// CHECK-NEXT: ImplicitCastExpr {{.*}} '__global int *' <LValueToRValue>
// CHECK-NEXT: MemberExpr {{.*}} '__global int *' lvalue . {{.*}}
// CHECK-NEXT: DeclRefExpr {{.*}} '__wrapper_class' lvalue ParmVar {{.*}} '_arg_ptr_array2' '__wrapper_class'
// CHECK-NEXT: ImplicitCastExpr {{.*}} 'int *' <AddressSpaceConversion>
// CHECK-NEXT: ImplicitCastExpr {{.*}} '__global int *' <LValueToRValue>
// CHECK-NEXT: MemberExpr {{.*}} '__global int *' lvalue . {{.*}}
// CHECK-NEXT: DeclRefExpr {{.*}} '__wrapper_class' lvalue ParmVar {{.*}} '_arg_ptr_array2' '__wrapper_class'
// CHECK-NEXT: InitListExpr {{.*}} 'int *[3]'
// CHECK-NEXT: ImplicitCastExpr {{.*}} 'int *' <AddressSpaceConversion>
// CHECK-NEXT: ImplicitCastExpr {{.*}} '__global int *' <LValueToRValue>
// CHECK-NEXT: MemberExpr {{.*}} '__global int *' lvalue . {{.*}}
// CHECK-NEXT: DeclRefExpr {{.*}} '__wrapper_class' lvalue ParmVar {{.*}} '_arg_ptr_array2' '__wrapper_class'
// CHECK-NEXT: ImplicitCastExpr {{.*}} 'int *' <AddressSpaceConversion>
// CHECK-NEXT: ImplicitCastExpr {{.*}} '__global int *' <LValueToRValue>
// CHECK-NEXT: MemberExpr {{.*}} '__global int *' lvalue . {{.*}}
// CHECK-NEXT: DeclRefExpr {{.*}} '__wrapper_class' lvalue ParmVar {{.*}} '_arg_ptr_array2' '__wrapper_class'
// CHECK-NEXT: ImplicitCastExpr {{.*}} 'int *' <AddressSpaceConversion>
// CHECK-NEXT: ImplicitCastExpr {{.*}} '__global int *' <LValueToRValue>
// CHECK-NEXT: MemberExpr {{.*}} '__global int *' lvalue . {{.*}}
// CHECK-NEXT: DeclRefExpr {{.*}} '__wrapper_class' lvalue ParmVar {{.*}} '_arg_ptr_array2' '__wrapper_class'

// Check kernel parameters
// CHECK: {{.*}}kernel_pointer{{.*}} 'void (__global int *, __global int *)'
// CHECK: {{.*}}kernel_pointer{{.*}} 'void (__global int *, __global int *, __global int *, __global int *)'
// CHECK: ParmVarDecl {{.*}} used _arg_ '__global int *'
// CHECK: ParmVarDecl {{.*}} used _arg_ '__global int *'
// CHECK: ParmVarDecl {{.*}} used _arg_ '__global int *'
// CHECK: ParmVarDecl {{.*}} used _arg_ '__global int *'
// CHECK: VarDecl {{.*}}'(lambda at {{.*}}built-in-type-kernel-arg.cpp{{.*}})'

// Check that lambda fields of pointer types are initialized
// CHECK: InitListExpr
// CHECK-NEXT: ImplicitCastExpr {{.*}} 'int *' <AddressSpaceConversion>
// CHECK-NEXT: ImplicitCastExpr {{.*}} '__global int *' <LValueToRValue>
// CHECK-NEXT: DeclRefExpr {{.*}} '__global int *' lvalue ParmVar {{.*}} '_arg_' '__global int *'
// CHECK-NEXT: ImplicitCastExpr {{.*}} 'int *' <AddressSpaceConversion>
// CHECK-NEXT: ImplicitCastExpr {{.*}} '__global int *' <LValueToRValue>
// CHECK-NEXT: DeclRefExpr {{.*}} '__global int *' lvalue ParmVar {{.*}} '_arg_' '__global int *'
// CHECK: InitListExpr {{.*}} 'int *[2]'
// CHECK-NEXT: ImplicitCastExpr {{.*}} 'int *' <AddressSpaceConversion>
// CHECK-NEXT: ImplicitCastExpr {{.*}} '__global int *' <LValueToRValue>
// CHECK-NEXT: DeclRefExpr {{.*}} '__global int *' lvalue ParmVar {{.*}} '_arg_' '__global int *'
// CHECK-NEXT: ImplicitCastExpr {{.*}} 'int *' <AddressSpaceConversion>
// CHECK-NEXT: ImplicitCastExpr {{.*}} '__global int *' <LValueToRValue>
// CHECK-NEXT: DeclRefExpr {{.*}} '__global int *' lvalue ParmVar {{.*}} '_arg_' '__global int *'

// Check kernel parameters
2 changes: 2 additions & 0 deletions sycl/test/basic_tests/unused_pointer.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,6 +21,8 @@ struct struct_with_pointer {
int data;
int *ptr1; // Unused pointer
float *ptr2; // Unused pointer
int *ptr_array1[2]; // Unused pointer array
int *ptr_array2[2][3]; // Unused pointer array
};

int main(int argc, char **argv) {
Expand Down