Skip to content

Commit a6e5617

Browse files
mdtoguchimdtoguchi
authored
[NFC] Update driver tests to not require clang-driver (#6136)
The REQUIRES: clang-driver setting in the SYCL driver tests is no longer valid. Remove this check as it was causing these tests to not be supported and not run.
1 parent 0b4c123 commit a6e5617

24 files changed

+2
-29
lines changed

‎clang/test/Driver/openmp-simd-sycl-device.c

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,6 @@
11
/// Check that -fopenmp-simd is NOT passed to the device compilation when
22
/// used together with -fsycl.
33

4-
// REQUIRES: clang-driver
5-
64
// RUN: %clang -c -fsycl -fopenmp-simd -### %s 2>&1 | FileCheck %s
75
// RUN: %clang -c -fopenmp-simd -fopenmp-version=50 -### %s 2>&1 | FileCheck %s --check-prefix=UNCHANGED
86

‎clang/test/Driver/openmp-sycl-interop.c

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,10 @@
11
/// Check that OpenMP and SYCL device binaries are wrapped and linked to the host
22
/// image when program uses both OpenMP and SYCL offloading models.
33

4-
// REQUIRES: clang-driver
54
// REQUIRES: x86-registered-target
65

76
// RUN: touch %t.o
8-
// RUN: %clang --target=x86_64-host-linux-gnu -fsycl -fopenmp -fopenmp-targets=x86_64-device-linux-gnu -### %t.o 2>&1 \
7+
// RUN: %clang --target=x86_64-host-linux-gnu -fno-openmp-new-driver -fsycl -fopenmp -fopenmp-targets=x86_64-device-linux-gnu -### %t.o 2>&1 \
98
// RUN: | FileCheck %s
109
// CHECK: clang-offload-wrapper{{(.exe)?}}" {{.*}}"-o=[[SYCLBC:.+\.bc]]" {{.*}}"-target=spir64" "-kind=sycl"
1110
// CHECK: llc{{.*}}" {{.*}}"-o" "[[SYCLOBJ:.+]]" "[[SYCLBC]]"

‎clang/test/Driver/suppress-LNK4078-sycl-link.cpp

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,3 @@
1-
// REQUIRES: clang-driver
21
// RUN: %clangxx -target x86_64-pc-windows-msvc -fsycl %s -### 2>&1 \
32
// RUN: | FileCheck %s
43
// RUN: %clang_cl --target=x86_64-pc-windows-msvc -fsycl %s -### 2>&1 \

‎clang/test/Driver/sycl-MD-default.cpp

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,3 @@
1-
// REQUIRES: clang-driver
2-
31
// RUN: %clang -### -fsycl -c -target x86_64-unknown-windows-msvc %s 2>&1 \
42
// RUN: | FileCheck -check-prefix=CHK-DEFAULT %s
53
// RUN: %clangxx -### -fsycl -c -target x86_64-unknown-windows-msvc %s 2>&1 \

‎clang/test/Driver/sycl-amdgcn-sqrt.cpp

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,3 @@
1-
// REQUIRES: clang-driver
21
// REQUIRES: amdgpu-registered-target
32
// REQUIRES: !system-windows
43

‎clang/test/Driver/sycl-cxx-default.c

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,4 @@
11
/// When -fsycl is used, C++ source is the default
2-
// REQUIRES: clang-driver
32

43
// RUN: %clang -c -fsycl %s -### 2>&1 \
54
// RUN: | FileCheck -check-prefix=CXX_TYPE_CHECK %s

‎clang/test/Driver/sycl-device-lib-win.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
/// Perform several driver tests for SYCL device libraries on Windows
33
///
44

5-
// REQUIRES: clang-driver, windows
5+
// REQUIRES: windows
66

77
/// ###########################################################################
88

‎clang/test/Driver/sycl-host-compiler.cpp

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,4 @@
11
// Tests the abilities involved with using an external host compiler
2-
// REQUIRES: clang-driver
32

43
/// enabling with -fsycl-host-compiler
54
// RUN: %clangxx -fsycl -fsycl-host-compiler=/some/dir/g++ %s -### 2>&1 \

‎clang/test/Driver/sycl-intelfpga-static-lib-win.cpp

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,6 @@
11
///
22
/// tests specific to -fintelfpga -fsycl w/ static libs
33
///
4-
// REQUIRES: clang-driver
54
// REQUIRES: system-windows
65

76
// make dummy archive

‎clang/test/Driver/sycl-intelfpga-static-lib.cpp

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,6 @@
11
///
22
/// tests specific to -fintelfpga -fsycl w/ static libs
33
///
4-
// REQUIRES: clang-driver
54

65
// make dummy archive
76
// Build a fat static lib that will be used for all tests

‎clang/test/Driver/sycl-libspirv-invalid.cpp

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,4 @@
11
/// Test that `-fsycl-libspirv-path=` produces a diagnostic when the library is not found.
2-
// REQUIRES: clang-driver
32
// UNSUPPORTED: system-windows
43

54
// RUN: %clangxx -### -std=c++11 -target x86_64-unknown-linux-gnu -fsycl \

‎clang/test/Driver/sycl-libspirv.cpp

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,4 @@
11
/// Test that `-fsycl-libspirv-path=` adds `-mlink-builtin-bitcode` when the library is found.
2-
// REQUIRES: clang-driver
32
// UNSUPPORTED: system-windows
43

54
// RUN: %clangxx -### -std=c++11 -target x86_64-unknown-linux-gnu -fsycl \

‎clang/test/Driver/sycl-no-prec-sqrt.cpp

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,3 @@
1-
// REQUIRES: clang-driver
2-
31
// RUN: %clang -### -fsycl \
42
// RUN: -fsycl-fp32-prec-sqrt %s 2>&1 | FileCheck %s
53

‎clang/test/Driver/sycl-nvptx-sqrt.cpp

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,3 @@
1-
// REQUIRES: clang-driver
21
// REQUIRES: nvptx-registered-target
32

43
// RUN: %clang -### \

‎clang/test/Driver/sycl-offload-amdgcn.cpp

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,4 @@
11
/// Tests specific to `-fsycl-targets=amdgcn-amd-amdhsa`
2-
// REQUIRES: clang-driver
32

43
// UNSUPPORTED: system-windows
54

‎clang/test/Driver/sycl-offload-intelfpga-emu.cpp

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,6 @@
11
///
22
/// tests specific to -fintelfpga -fsycl for emulation
33
///
4-
// REQUIRES: clang-driver
54

65
/// -fintelfpga -fsycl-link tests
76
// RUN: touch %t.o

‎clang/test/Driver/sycl-offload-intelfpga.cpp

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,6 @@
11
///
22
/// tests specific to -fintelfpga -fsycl
33
///
4-
// REQUIRES: clang-driver
54

65
/// Check SYCL headers path
76
// RUN: %clangxx -### -target x86_64-unknown-linux-gnu -fsycl -fintelfpga %s 2>&1 \

‎clang/test/Driver/sycl-offload-nvptx.cpp

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,4 @@
11
/// Tests specific to `-fsycl-targets=nvptx64-nvidia-nvcl`
2-
// REQUIRES: clang-driver
32

43
// UNSUPPORTED: system-windows
54

‎clang/test/Driver/sycl-offload-static-lib-2.cpp

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,6 @@
11
///
22
/// Perform several driver tests for SYCL offloading involving static libs
33
///
4-
// REQUIRES: clang-driver
54
// REQUIRES: x86-registered-target
65

76
/// ###########################################################################

‎clang/test/Driver/sycl-offload-static-lib.cpp

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,6 @@
11
///
22
/// Perform several driver tests for SYCL offloading with -foffload-static-lib
33
///
4-
// REQUIRES: clang-driver
54
// REQUIRES: x86-registered-target
65

76
/// test behaviors of passing a fat static lib

‎clang/test/Driver/sycl-offload-win.c

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,6 @@
22
/// Perform several driver tests for SYCL offloading on Windows.
33
///
44

5-
// REQUIRES: clang-driver
65
// REQUIRES: x86-registered-target
76

87
/// Test behaviors of -foffload-static-lib=<lib> with single object.

‎clang/test/Driver/sycl-offload-with-split.c

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,6 @@
22
/// Device code split specific test.
33
///
44

5-
// REQUIRES: clang-driver
65
// REQUIRES: x86-registered-target
76

87
/// ###########################################################################

‎clang/test/Driver/sycl-offload.c

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,6 @@
22
/// Perform several driver tests for SYCL offloading
33
///
44

5-
// REQUIRES: clang-driver
65
// REQUIRES: x86-registered-target
76

87
/// ###########################################################################

‎clang/test/Driver/sycl-spirv-obj.cpp

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,8 +2,6 @@
22
/// Tests for SPIR-V related objects
33
///
44

5-
// REQUIRES: clang-driver
6-
75
/// -fsycl-device-obj=spirv
86
// RUN: %clangxx -target x86_64-unknown-linux-gnu -c -fsycl -fsycl-device-obj=spirv -### %s 2>&1 | \
97
// RUN: FileCheck %s -check-prefix SPIRV_DEVICE_OBJ

0 commit comments

Comments
 (0)