[llvm-branch-commits] [clang] 8ce0932 - Revert "[CUDA] Fix a couple of driver tests that really weren't being run (#9…"

[via llvm-branch-commits]

Author: Paul T Robinson
Date: 2024-05-31T13:13:21-04:00
New Revision: 8ce093226b730338a8faacb4ef09f97bcbc17515

URL: https://github.com/llvm/llvm-project/commit/8ce093226b730338a8faacb4ef09f97bcbc17515
DIFF: https://github.com/llvm/llvm-project/commit/8ce093226b730338a8faacb4ef09f97bcbc17515.diff

LOG: Revert "[CUDA] Fix a couple of driver tests that really weren't being run (#9…"

This reverts commit 97c34eb8df47543299500ee4cd0b877d184ed790.

Added: 
    

Modified: 
    clang/test/Driver/offloading-interoperability.c
    clang/test/Driver/openmp-offload-gpu.c

Removed: 
    


################################################################################
diff  --git a/clang/test/Driver/offloading-interoperability.c b/clang/test/Driver/offloading-interoperability.c
index 9193e12355024..6f6daf31a392e 100644
--- a/clang/test/Driver/offloading-interoperability.c
+++ b/clang/test/Driver/offloading-interoperability.c
@@ -1,7 +1,10 @@
+// REQUIRES: powerpc-registered-target
+// REQUIRES: nvptx-registered-target
+
 //
 // Verify that CUDA device commands do not get OpenMP flags.
 //
-// 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 \
+// RUN: not %clang -### -x cuda --target=powerpc64le-linux-gnu -std=c++11 --cuda-gpu-arch=sm_35 -fopenmp=libomp %s 2>&1 \
 // RUN:   | FileCheck %s --check-prefix NO-OPENMP-FLAGS-FOR-CUDA-DEVICE
 //
 // NO-OPENMP-FLAGS-FOR-CUDA-DEVICE:      "-cc1" "-triple" "nvptx64-nvidia-cuda"

diff  --git a/clang/test/Driver/openmp-offload-gpu.c b/clang/test/Driver/openmp-offload-gpu.c
index 0b98aaf6ba53c..d21db7019a1aa 100644
--- a/clang/test/Driver/openmp-offload-gpu.c
+++ b/clang/test/Driver/openmp-offload-gpu.c
@@ -2,6 +2,11 @@
 /// Perform several driver tests for OpenMP offloading
 ///
 
+// REQUIRES: x86-registered-target
+// REQUIRES: powerpc-registered-target
+// REQUIRES: nvptx-registered-target
+// REQUIRES: amdgpu-registered-target
+
 /// ###########################################################################
 
 /// Check -Xopenmp-target uses one of the archs provided when several archs are used.
@@ -300,7 +305,6 @@
 // CHECK-EMIT-LLVM-IR-BC: "-cc1"{{.*}}"-triple" "nvptx64-nvidia-cuda"{{.*}}"-emit-llvm-bc"
 
 // RUN:   %clang -### -fopenmp=libomp --offload-arch=sm_89 \
-// RUN:          --no-cuda-version-check \
 // RUN:          -nogpulib %s -o openmp-offload-gpu 2>&1 \
 // RUN:   | FileCheck -check-prefix=DRIVER_EMBEDDING %s