From 2eb0bcc9e6186fb95fcffc81f034923f954df9b9 Mon Sep 17 00:00:00 2001 From: Pekka Jaaskelainen Date: Thu, 1 Jun 2017 08:19:43 +0000 Subject: [PATCH] [OpenCL] spir_kern by defaul: fix old test cases llvm-svn: 304396 --- clang/test/CodeGenOpenCL/bool_cast.cl | 2 +- clang/test/CodeGenOpenCL/kernel-attributes.cl | 6 +++--- clang/test/CodeGenOpenCL/kernel-metadata.cl | 2 +- clang/test/CodeGenOpenCL/pipe_types.cl | 2 +- clang/test/CodeGenOpenCL/ptx-calls.cl | 2 +- clang/test/CodeGenOpenCL/ptx-kernels.cl | 2 +- 6 files changed, 8 insertions(+), 8 deletions(-) diff --git a/clang/test/CodeGenOpenCL/bool_cast.cl b/clang/test/CodeGenOpenCL/bool_cast.cl index ab40eccf571f..72926eb141ab 100644 --- a/clang/test/CodeGenOpenCL/bool_cast.cl +++ b/clang/test/CodeGenOpenCL/bool_cast.cl @@ -4,7 +4,7 @@ typedef unsigned char uchar4 __attribute((ext_vector_type(4))); typedef unsigned int int4 __attribute((ext_vector_type(4))); typedef float float4 __attribute((ext_vector_type(4))); -// CHECK-LABEL: define void @ker() +// CHECK-LABEL: define spir_kernel void @ker() void kernel ker() { bool t = true; int4 vec4 = (int4)t; diff --git a/clang/test/CodeGenOpenCL/kernel-attributes.cl b/clang/test/CodeGenOpenCL/kernel-attributes.cl index e61a75f7b537..eff2e57d8c9b 100644 --- a/clang/test/CodeGenOpenCL/kernel-attributes.cl +++ b/clang/test/CodeGenOpenCL/kernel-attributes.cl @@ -3,13 +3,13 @@ typedef unsigned int uint4 __attribute__((ext_vector_type(4))); kernel __attribute__((vec_type_hint(int))) __attribute__((reqd_work_group_size(1,2,4))) void kernel1(int a) {} -// CHECK: define void @kernel1(i32 {{[^%]*}}%a) {{[^{]+}} !vec_type_hint ![[MD1:[0-9]+]] !reqd_work_group_size ![[MD2:[0-9]+]] +// CHECK: define spir_kernel void @kernel1(i32 {{[^%]*}}%a) {{[^{]+}} !vec_type_hint ![[MD1:[0-9]+]] !reqd_work_group_size ![[MD2:[0-9]+]] kernel __attribute__((vec_type_hint(uint4))) __attribute__((work_group_size_hint(8,16,32))) void kernel2(int a) {} -// CHECK: define void @kernel2(i32 {{[^%]*}}%a) {{[^{]+}} !vec_type_hint ![[MD3:[0-9]+]] !work_group_size_hint ![[MD4:[0-9]+]] +// CHECK: define spir_kernel void @kernel2(i32 {{[^%]*}}%a) {{[^{]+}} !vec_type_hint ![[MD3:[0-9]+]] !work_group_size_hint ![[MD4:[0-9]+]] kernel __attribute__((intel_reqd_sub_group_size(8))) void kernel3(int a) {} -// CHECK: define void @kernel3(i32 {{[^%]*}}%a) {{[^{]+}} !intel_reqd_sub_group_size ![[MD5:[0-9]+]] +// CHECK: define spir_kernel void @kernel3(i32 {{[^%]*}}%a) {{[^{]+}} !intel_reqd_sub_group_size ![[MD5:[0-9]+]] // CHECK: [[MD1]] = !{i32 undef, i32 1} // CHECK: [[MD2]] = !{i32 1, i32 2, i32 4} diff --git a/clang/test/CodeGenOpenCL/kernel-metadata.cl b/clang/test/CodeGenOpenCL/kernel-metadata.cl index 4165f1fa0ce5..95be43015aa9 100644 --- a/clang/test/CodeGenOpenCL/kernel-metadata.cl +++ b/clang/test/CodeGenOpenCL/kernel-metadata.cl @@ -6,5 +6,5 @@ void normal_function() { __kernel void kernel_function() { } -// CHECK: define void @kernel_function() {{[^{]+}} !kernel_arg_addr_space ![[MD:[0-9]+]] !kernel_arg_access_qual ![[MD]] !kernel_arg_type ![[MD]] !kernel_arg_base_type ![[MD]] !kernel_arg_type_qual ![[MD]] { +// CHECK: define spir_kernel void @kernel_function() {{[^{]+}} !kernel_arg_addr_space ![[MD:[0-9]+]] !kernel_arg_access_qual ![[MD]] !kernel_arg_type ![[MD]] !kernel_arg_base_type ![[MD]] !kernel_arg_type_qual ![[MD]] { // CHECK: ![[MD]] = !{} diff --git a/clang/test/CodeGenOpenCL/pipe_types.cl b/clang/test/CodeGenOpenCL/pipe_types.cl index f5b42e2a490f..7c11f74ad7b9 100644 --- a/clang/test/CodeGenOpenCL/pipe_types.cl +++ b/clang/test/CodeGenOpenCL/pipe_types.cl @@ -28,7 +28,7 @@ void test5(read_only pipe int4 p) { typedef read_only pipe int MyPipe; kernel void test6(MyPipe p) { -// CHECK: define void @test6(%opencl.pipe_t* %p) +// CHECK: define spir_kernel void @test6(%opencl.pipe_t* %p) } struct Person { diff --git a/clang/test/CodeGenOpenCL/ptx-calls.cl b/clang/test/CodeGenOpenCL/ptx-calls.cl index bde00bc3d73a..2a3400371edf 100644 --- a/clang/test/CodeGenOpenCL/ptx-calls.cl +++ b/clang/test/CodeGenOpenCL/ptx-calls.cl @@ -7,7 +7,7 @@ void device_function() { __kernel void kernel_function() { device_function(); } -// CHECK-LABEL: define void @kernel_function() +// CHECK-LABEL: define spir_kernel void @kernel_function() // CHECK: call void @device_function() // CHECK: !{{[0-9]+}} = !{void ()* @kernel_function, !"kernel", i32 1} diff --git a/clang/test/CodeGenOpenCL/ptx-kernels.cl b/clang/test/CodeGenOpenCL/ptx-kernels.cl index fc6de4f3d517..b9e1c224c7ce 100644 --- a/clang/test/CodeGenOpenCL/ptx-kernels.cl +++ b/clang/test/CodeGenOpenCL/ptx-kernels.cl @@ -6,6 +6,6 @@ void device_function() { __kernel void kernel_function() { } -// CHECK-LABEL: define void @kernel_function() +// CHECK-LABEL: define spir_kernel void @kernel_function() // CHECK: !{{[0-9]+}} = !{void ()* @kernel_function, !"kernel", i32 1}