Skip to content

[NFC] Update driver tests to not require clang-driver #6136

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 5 commits into from
May 12, 2022
Merged

[NFC] Update driver tests to not require clang-driver #6136

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
bedbcb9
[NFC] Update driver tests to not require clang-driver
mdtoguchi May 10, 2022
b58e68d
Merge remote-tracking branch 'intel_llvm/sycl' into clang-driver-cleanup
mdtoguchi May 10, 2022
6a6c006
Disable new driver for OpenMP offload
mdtoguchi May 10, 2022
09b0422
Put default back
mdtoguchi May 10, 2022
acb8ec0
Turn off new driver for test
mdtoguchi May 10, 2022
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
2 changes: 0 additions & 2 deletions clang/test/Driver/openmp-simd-sycl-device.c
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,8 +1,6 @@
/// Check that -fopenmp-simd is NOT passed to the device compilation when
/// used together with -fsycl.

// REQUIRES: clang-driver

// RUN: %clang -c -fsycl -fopenmp-simd -### %s 2>&1 | FileCheck %s
// RUN: %clang -c -fopenmp-simd -fopenmp-version=50 -### %s 2>&1 | FileCheck %s --check-prefix=UNCHANGED

Expand Down
3 changes: 1 addition & 2 deletions clang/test/Driver/openmp-sycl-interop.c
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,11 +1,10 @@
/// Check that OpenMP and SYCL device binaries are wrapped and linked to the host
/// image when program uses both OpenMP and SYCL offloading models.

// REQUIRES: clang-driver
// REQUIRES: x86-registered-target

// RUN: touch %t.o
// RUN: %clang --target=x86_64-host-linux-gnu -fsycl -fopenmp -fopenmp-targets=x86_64-device-linux-gnu -### %t.o 2>&1 \
// 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 \
// RUN: | FileCheck %s
// CHECK: clang-offload-wrapper{{(.exe)?}}" {{.*}}"-o=[[SYCLBC:.+\.bc]]" {{.*}}"-target=spir64" "-kind=sycl"
// CHECK: llc{{.*}}" {{.*}}"-o" "[[SYCLOBJ:.+]]" "[[SYCLBC]]"
Expand Down
1 change: 0 additions & 1 deletion clang/test/Driver/suppress-LNK4078-sycl-link.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,3 @@
// REQUIRES: clang-driver
// RUN: %clangxx -target x86_64-pc-windows-msvc -fsycl %s -### 2>&1 \
// RUN: | FileCheck %s
// RUN: %clang_cl --target=x86_64-pc-windows-msvc -fsycl %s -### 2>&1 \
Expand Down
2 changes: 0 additions & 2 deletions clang/test/Driver/sycl-MD-default.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,3 @@
// REQUIRES: clang-driver

// RUN: %clang -### -fsycl -c -target x86_64-unknown-windows-msvc %s 2>&1 \
// RUN: | FileCheck -check-prefix=CHK-DEFAULT %s
// RUN: %clangxx -### -fsycl -c -target x86_64-unknown-windows-msvc %s 2>&1 \
Expand Down
1 change: 0 additions & 1 deletion clang/test/Driver/sycl-amdgcn-sqrt.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,3 @@
// REQUIRES: clang-driver
// REQUIRES: amdgpu-registered-target
// REQUIRES: !system-windows

Expand Down
1 change: 0 additions & 1 deletion clang/test/Driver/sycl-cxx-default.c
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,4 @@
/// When -fsycl is used, C++ source is the default
// REQUIRES: clang-driver

// RUN: %clang -c -fsycl %s -### 2>&1 \
// RUN: | FileCheck -check-prefix=CXX_TYPE_CHECK %s
Expand Down
2 changes: 1 addition & 1 deletion clang/test/Driver/sycl-device-lib-win.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
/// Perform several driver tests for SYCL device libraries on Windows
///

// REQUIRES: clang-driver, windows
// REQUIRES: windows

/// ###########################################################################

Expand Down
1 change: 0 additions & 1 deletion clang/test/Driver/sycl-host-compiler.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,4 @@
// Tests the abilities involved with using an external host compiler
// REQUIRES: clang-driver

/// enabling with -fsycl-host-compiler
// RUN: %clangxx -fsycl -fsycl-host-compiler=/some/dir/g++ %s -### 2>&1 \
Expand Down
1 change: 0 additions & 1 deletion clang/test/Driver/sycl-intelfpga-static-lib-win.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,6 @@
///
/// tests specific to -fintelfpga -fsycl w/ static libs
///
// REQUIRES: clang-driver
// REQUIRES: system-windows

// make dummy archive
Expand Down
1 change: 0 additions & 1 deletion clang/test/Driver/sycl-intelfpga-static-lib.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,6 @@
///
/// tests specific to -fintelfpga -fsycl w/ static libs
///
// REQUIRES: clang-driver

// make dummy archive
// Build a fat static lib that will be used for all tests
Expand Down
1 change: 0 additions & 1 deletion clang/test/Driver/sycl-libspirv-invalid.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,4 @@
/// Test that `-fsycl-libspirv-path=` produces a diagnostic when the library is not found.
// REQUIRES: clang-driver
// UNSUPPORTED: system-windows

// RUN: %clangxx -### -std=c++11 -target x86_64-unknown-linux-gnu -fsycl \
Expand Down
1 change: 0 additions & 1 deletion clang/test/Driver/sycl-libspirv.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,4 @@
/// Test that `-fsycl-libspirv-path=` adds `-mlink-builtin-bitcode` when the library is found.
// REQUIRES: clang-driver
// UNSUPPORTED: system-windows

// RUN: %clangxx -### -std=c++11 -target x86_64-unknown-linux-gnu -fsycl \
Expand Down
2 changes: 0 additions & 2 deletions clang/test/Driver/sycl-no-prec-sqrt.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,3 @@
// REQUIRES: clang-driver

// RUN: %clang -### -fsycl \
// RUN: -fsycl-fp32-prec-sqrt %s 2>&1 | FileCheck %s

Expand Down
1 change: 0 additions & 1 deletion clang/test/Driver/sycl-nvptx-sqrt.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,3 @@
// REQUIRES: clang-driver
// REQUIRES: nvptx-registered-target

// RUN: %clang -### \
Expand Down
1 change: 0 additions & 1 deletion clang/test/Driver/sycl-offload-amdgcn.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,4 @@
/// Tests specific to `-fsycl-targets=amdgcn-amd-amdhsa`
// REQUIRES: clang-driver

// UNSUPPORTED: system-windows

Expand Down
1 change: 0 additions & 1 deletion clang/test/Driver/sycl-offload-intelfpga-emu.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,6 @@
///
/// tests specific to -fintelfpga -fsycl for emulation
///
// REQUIRES: clang-driver

/// -fintelfpga -fsycl-link tests
// RUN: touch %t.o
Expand Down
1 change: 0 additions & 1 deletion clang/test/Driver/sycl-offload-intelfpga.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,6 @@
///
/// tests specific to -fintelfpga -fsycl
///
// REQUIRES: clang-driver

/// Check SYCL headers path
// RUN: %clangxx -### -target x86_64-unknown-linux-gnu -fsycl -fintelfpga %s 2>&1 \
Expand Down
1 change: 0 additions & 1 deletion clang/test/Driver/sycl-offload-nvptx.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,4 @@
/// Tests specific to `-fsycl-targets=nvptx64-nvidia-nvcl`
// REQUIRES: clang-driver

// UNSUPPORTED: system-windows

Expand Down
1 change: 0 additions & 1 deletion clang/test/Driver/sycl-offload-static-lib-2.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,6 @@
///
/// Perform several driver tests for SYCL offloading involving static libs
///
// REQUIRES: clang-driver
// REQUIRES: x86-registered-target

/// ###########################################################################
Expand Down
1 change: 0 additions & 1 deletion clang/test/Driver/sycl-offload-static-lib.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,6 @@
///
/// Perform several driver tests for SYCL offloading with -foffload-static-lib
///
// REQUIRES: clang-driver
// REQUIRES: x86-registered-target

/// test behaviors of passing a fat static lib
Expand Down
1 change: 0 additions & 1 deletion clang/test/Driver/sycl-offload-win.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,6 @@
/// Perform several driver tests for SYCL offloading on Windows.
///

// REQUIRES: clang-driver
// REQUIRES: x86-registered-target

/// Test behaviors of -foffload-static-lib=<lib> with single object.
Expand Down
1 change: 0 additions & 1 deletion clang/test/Driver/sycl-offload-with-split.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,6 @@
/// Device code split specific test.
///

// REQUIRES: clang-driver
// REQUIRES: x86-registered-target

/// ###########################################################################
Expand Down
1 change: 0 additions & 1 deletion clang/test/Driver/sycl-offload.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,6 @@
/// Perform several driver tests for SYCL offloading
///

// REQUIRES: clang-driver
// REQUIRES: x86-registered-target

/// ###########################################################################
Expand Down
2 changes: 0 additions & 2 deletions clang/test/Driver/sycl-spirv-obj.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,8 +2,6 @@
/// Tests for SPIR-V related objects
///

// REQUIRES: clang-driver

/// -fsycl-device-obj=spirv
// RUN: %clangxx -target x86_64-unknown-linux-gnu -c -fsycl -fsycl-device-obj=spirv -### %s 2>&1 | \
// RUN: FileCheck %s -check-prefix SPIRV_DEVICE_OBJ
Expand Down