Skip to content

Commit f6418b4

Browse files
authored
[SYCL][NFC] Remove workaround for SPIR-V translator issues (#2450)
Use XFAIL to work-around issues caused by enabling optimizations This way fixes will be detected automatically.
1 parent 538c4c9 commit f6418b4

File tree

10 files changed

+16
-27
lines changed

10 files changed

+16
-27
lines changed

sycl/test/basic_tests/boolean.cpp

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,8 @@
11
// TODO: Enable compilation w/o -fno-sycl-early-optimizations option.
22
// See https://github.com/intel/llvm/issues/2264 for more details.
3+
// XFAIL: gpu && (level_zero || opencl)
34

4-
// RUN: %clangxx -fsycl -fno-sycl-early-optimizations -fsycl-targets=%sycl_triple %s -o %t.out
5+
// RUN: %clangxx -fsycl -fsycl-targets=%sycl_triple %s -o %t.out
56
// RUN: env SYCL_DEVICE_TYPE=HOST %t.out
67
// RUN: %CPU_RUN_PLACEHOLDER %t.out
78
// RUN: %GPU_RUN_PLACEHOLDER %t.out

sycl/test/basic_tests/stream/stream.cpp

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
1-
// XFAIL: cpu
21
// TODO: Enable compilation w/o -fno-sycl-early-optimizations option.
32
// See https://github.com/intel/llvm/issues/2264 for more details.
3+
// XFAIL: gpu && (level_zero || opencl) && linux
44

5-
// RUN: %clangxx -fsycl -fno-sycl-early-optimizations -fsycl-targets=%sycl_triple %s -o %t.out
5+
// RUN: %clangxx -fsycl -fsycl-targets=%sycl_triple %s -o %t.out
66
// RUN: env SYCL_DEVICE_TYPE=HOST %t.out | FileCheck %s
77
// RUN: %CPU_RUN_PLACEHOLDER %t.out %CPU_CHECK_PLACEHOLDER
88
// RUN: %GPU_RUN_ON_LINUX_PLACEHOLDER %t.out %GPU_CHECK_ON_LINUX_PLACEHOLDER

sycl/test/hier_par/hier_par_wgscope.cpp

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,8 @@
11
// TODO: Enable compilation w/o -fno-sycl-early-optimizations option.
22
// See https://github.com/intel/llvm/issues/2264 for more details.
3+
// XFAIL: gpu && (level_zero || opencl)
34

4-
// RUN: %clangxx -fsycl -fno-sycl-early-optimizations -fsycl-targets=%sycl_triple %s -o %t.out
5+
// RUN: %clangxx -fsycl -fsycl-targets=%sycl_triple %s -o %t.out
56
// RUN: env SYCL_DEVICE_TYPE=HOST %t.out
67
// RUN: %CPU_RUN_PLACEHOLDER %t.out
78
// RUN: %GPU_RUN_PLACEHOLDER %t.out

sycl/test/sub_group/generic-shuffle.cpp

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,7 @@
1-
// TODO: Enable compilation w/o -fno-sycl-early-optimizations option.
2-
// See https://github.com/intel/llvm/issues/2264 for more details.
3-
41
// UNSUPPORTED: cuda
52
// CUDA compilation and runtime do not yet support sub-groups.
63
//
7-
// RUN: %clangxx -fsycl -fno-sycl-early-optimizations -fsycl-targets=%sycl_triple %s -o %t.out
4+
// RUN: %clangxx -fsycl -fsycl-targets=%sycl_triple %s -o %t.out
85
// RUN: env SYCL_DEVICE_TYPE=HOST %t.out
96
// RUN: %CPU_RUN_PLACEHOLDER %t.out
107
// RUN: %GPU_RUN_PLACEHOLDER %t.out

sycl/test/sub_group/generic_reduce.cpp

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,12 @@
11
// TODO: Enable compilation w/o -fno-sycl-early-optimizations option.
22
// See https://github.com/intel/llvm/issues/2264 for more details.
3+
// XFAIL: gpu
34

45
// UNSUPPORTED: cuda
56
// CUDA compilation and runtime do not yet support sub-groups.
67
//
7-
// RUN: %clangxx -fsycl -fno-sycl-early-optimizations -fsycl-unnamed-lambda -std=c++14 %s -o %t.out
8-
// RUN: %clangxx -fsycl -fno-sycl-early-optimizations -fsycl-unnamed-lambda -fsycl-targets=%sycl_triple -std=c++14 -D SG_GPU %s -o %t_gpu.out
8+
// RUN: %clangxx -fsycl -fsycl-unnamed-lambda -std=c++14 %s -o %t.out
9+
// RUN: %clangxx -fsycl -fsycl-unnamed-lambda -fsycl-targets=%sycl_triple -std=c++14 -D SG_GPU %s -o %t_gpu.out
910
// RUN: env SYCL_DEVICE_TYPE=HOST %t.out
1011
// RUN: %CPU_RUN_PLACEHOLDER %t.out
1112
// RUN: %GPU_RUN_PLACEHOLDER %t_gpu.out

sycl/test/sub_group/load_store.cpp

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,13 @@
11
// TODO: Enable compilation w/o -fno-sycl-early-optimizations option.
22
// See https://github.com/intel/llvm/issues/2264 for more details.
3+
// XFAIL: gpu
34

45
// UNSUPPORTED: cuda || cpu
56
// CUDA compilation and runtime do not yet support sub-groups.
67
// #2252 Disable until all variants of built-ins are available in OpenCL CPU
78
// runtime for every supported ISA
89
//
9-
// RUN: %clangxx -fsycl -fno-sycl-early-optimizations -fsycl-targets=%sycl_triple %s -o %t.out
10+
// RUN: %clangxx -fsycl -fsycl-targets=%sycl_triple %s -o %t.out
1011
// RUN: env SYCL_DEVICE_TYPE=HOST %t.out
1112
// RUN: %CPU_RUN_PLACEHOLDER %t.out
1213
// RUN: %GPU_RUN_PLACEHOLDER %t.out

sycl/test/sub_group/scan_fp16.cpp

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,7 @@
1-
// TODO: Enable compilation w/o -fno-sycl-early-optimizations option.
2-
// See https://github.com/intel/llvm/issues/2264 for more details.
3-
41
// UNSUPPORTED: cuda
52
// CUDA compilation and runtime do not yet support sub-groups.
63
//
7-
// RUN: %clangxx -fsycl -fno-sycl-early-optimizations -fsycl-targets=%sycl_triple %s -o %t.out
4+
// RUN: %clangxx -fsycl -fsycl-targets=%sycl_triple %s -o %t.out
85
// RUN: %GPU_RUN_PLACEHOLDER %t.out
96

107
//==--------------- scan_fp16.cpp - SYCL sub_group scan test --------*- C++ -*---==//

sycl/test/sub_group/shuffle.cpp

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,7 @@
1-
// TODO: Enable compilation w/o -fno-sycl-early-optimizations option.
2-
// See https://github.com/intel/llvm/issues/2264 for more details.
3-
41
// UNSUPPORTED: cuda
52
// CUDA compilation and runtime do not yet support sub-groups.
63
//
7-
// RUN: %clangxx -fsycl -fno-sycl-early-optimizations -fsycl-targets=%sycl_triple %s -o %t.out
4+
// RUN: %clangxx -fsycl -fsycl-targets=%sycl_triple %s -o %t.out
85
// RUN: env SYCL_DEVICE_TYPE=HOST %t.out
96
// RUN: %CPU_RUN_PLACEHOLDER %t.out
107
// RUN: %GPU_RUN_PLACEHOLDER %t.out

sycl/test/sub_group/shuffle_fp16.cpp

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,7 @@
1-
// TODO: Enable compilation w/o -fno-sycl-early-optimizations option.
2-
// See https://github.com/intel/llvm/issues/2264 for more details.
3-
41
// UNSUPPORTED: cuda
52
// CUDA compilation and runtime do not yet support sub-groups.
63
//
7-
// RUN: %clangxx -fsycl -fno-sycl-early-optimizations -fsycl-targets=%sycl_triple %s -o %t.out
4+
// RUN: %clangxx -fsycl -fsycl-targets=%sycl_triple %s -o %t.out
85
// RUN: %GPU_RUN_PLACEHOLDER %t.out
96
//
107
//==------------ shuffle_fp16.cpp - SYCL sub_group shuffle test -----*- C++ -*---==//

sycl/test/sub_group/shuffle_fp64.cpp

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,7 @@
1-
// TODO: Enable compilation w/o -fno-sycl-early-optimizations option.
2-
// See https://github.com/intel/llvm/issues/2264 for more details.
3-
41
// UNSUPPORTED: cuda
52
// CUDA compilation and runtime do not yet support sub-groups.
63
//
7-
// RUN: %clangxx -fsycl -fno-sycl-early-optimizations -fsycl-targets=%sycl_triple %s -o %t.out
4+
// RUN: %clangxx -fsycl -fsycl-targets=%sycl_triple %s -o %t.out
85
// RUN: env SYCL_DEVICE_TYPE=HOST %t.out
96
// RUN: %CPU_RUN_PLACEHOLDER %t.out
107
// RUN: %GPU_RUN_PLACEHOLDER %t.out

0 commit comments

Comments
 (0)