From ceb741a2d314ed54d75efac5fc974fc4251a7cb7 Mon Sep 17 00:00:00 2001 From: Artur Gainullin Date: Tue, 25 Feb 2020 15:52:50 -0800 Subject: [PATCH] [SYCL] Fix hier_par test after pulldown from llvm Signed-off-by: Artur Gainullin --- clang/test/CodeGenSYCL/hier_par.cpp | 14 ++++++-------- 1 file changed, 6 insertions(+), 8 deletions(-) diff --git a/clang/test/CodeGenSYCL/hier_par.cpp b/clang/test/CodeGenSYCL/hier_par.cpp index 6967600c2761..3b27db15236e 100644 --- a/clang/test/CodeGenSYCL/hier_par.cpp +++ b/clang/test/CodeGenSYCL/hier_par.cpp @@ -15,8 +15,7 @@ // argument // // This is compile-only test for now. -// -// XFAIL:* + #include "sycl.hpp" using namespace cl::sycl; @@ -32,12 +31,11 @@ void foo() { cgh.parallel_for_work_group( range<1>(1), range<1>(1), [=](group<1> g) { -// CHECK: @[[SHADOW:[a-zA-Z0-9]+]] = internal unnamed_addr addrspace(3) global %[[GROUP_CLASS:"[^"]+"]] undef, align [[ALIGN:[0-9]+]] -// CHECK: define {{.*}} spir_func void @{{"[^"]+"}}({{[^,]+}}, %[[GROUP_CLASS]]* byval(%[[GROUP_CLASS]]) align {{[0-9]+}} %[[GROUP_OBJ:[A-Za-z_0-9]+]]) {{.*}}!work_group_scope{{.*}} { -// CHECK-NOT: {{^[ \t]*define}} -// CHECK: %[[TMP:[A-Za-z_0-9]+]] = bitcast %[[GROUP_CLASS]] addrspace(3)* @[[SHADOW]] to i8 addrspace(3)* -// CHECK: %[[OBJ:[A-Za-z_0-9]+]] = bitcast %[[GROUP_CLASS]]* %[[GROUP_OBJ]] to i8* -// CHECK: call void @llvm.memcpy.p3i8.p0i8.i64(i8 addrspace(3)* align [[ALIGN]] %[[TMP]], {{[^,]+}} %[[OBJ]], {{[^)]+}}) + // CHECK: @[[SHADOW:[a-zA-Z0-9]+]] = internal unnamed_addr addrspace(3) global %[[GROUP_CLASS:"[^"]+"]] undef, align [[ALIGN:[0-9]+]] + // CHECK: define {{.*}} spir_func void @{{"[^"]+"}}({{[^,]+}}, %[[GROUP_CLASS]]* byval(%[[GROUP_CLASS]]) align {{[0-9]+}} %[[GROUP_OBJ:[A-Za-z_0-9]+]]) {{.*}}!work_group_scope{{.*}} { + // CHECK-NOT: {{^[ \t]*define}} + // CHECK: %[[OBJ:[A-Za-z_0-9]+]] = bitcast %[[GROUP_CLASS]]* %[[GROUP_OBJ]] to i8* + // CHECK: call void @llvm.memcpy.p3i8.p0i8.i64(i8 addrspace(3)* align [[ALIGN]] getelementptr inbounds (%[[GROUP_CLASS]], %[[GROUP_CLASS]] addrspace(3)* @[[SHADOW]], i32 0, i32 0), {{[^,]+}} %[[OBJ]], {{[^)]+}}) }); }); }