Skip to content

Commit 6416958

Browse files
authored
Revert "[CUDA] Fix a couple of driver tests that really weren't being run" (#93988)
Reverts #93960 The change to offloading-interoperability.c broke many bots.
1 parent 97c34eb commit 6416958

File tree

2 files changed

+9
-2
lines changed

2 files changed

+9
-2
lines changed

clang/test/Driver/offloading-interoperability.c

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,10 @@
1+
// REQUIRES: powerpc-registered-target
2+
// REQUIRES: nvptx-registered-target
3+
14
//
25
// Verify that CUDA device commands do not get OpenMP flags.
36
//
4-
// RUN: %clang -### -x cuda --target=powerpc64le-linux-gnu -std=c++11 --cuda-gpu-arch=sm_35 --no-cuda-version-check -fopenmp=libomp %s 2>&1 \
7+
// RUN: not %clang -### -x cuda --target=powerpc64le-linux-gnu -std=c++11 --cuda-gpu-arch=sm_35 -fopenmp=libomp %s 2>&1 \
58
// RUN: | FileCheck %s --check-prefix NO-OPENMP-FLAGS-FOR-CUDA-DEVICE
69
//
710
// NO-OPENMP-FLAGS-FOR-CUDA-DEVICE: "-cc1" "-triple" "nvptx64-nvidia-cuda"

clang/test/Driver/openmp-offload-gpu.c

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

5+
// REQUIRES: x86-registered-target
6+
// REQUIRES: powerpc-registered-target
7+
// REQUIRES: nvptx-registered-target
8+
// REQUIRES: amdgpu-registered-target
9+
510
/// ###########################################################################
611

712
/// Check -Xopenmp-target uses one of the archs provided when several archs are used.
@@ -300,7 +305,6 @@
300305
// CHECK-EMIT-LLVM-IR-BC: "-cc1"{{.*}}"-triple" "nvptx64-nvidia-cuda"{{.*}}"-emit-llvm-bc"
301306

302307
// RUN: %clang -### -fopenmp=libomp --offload-arch=sm_89 \
303-
// RUN: --no-cuda-version-check \
304308
// RUN: -nogpulib %s -o openmp-offload-gpu 2>&1 \
305309
// RUN: | FileCheck -check-prefix=DRIVER_EMBEDDING %s
306310

0 commit comments

Comments
 (0)