Author: Paul T Robinson Date: 2024-05-31T13:14:20-04:00 New Revision: 6416958067179c2987af0ef4568cd57f98b7e347
URL: https://github.com/llvm/llvm-project/commit/6416958067179c2987af0ef4568cd57f98b7e347 DIFF: https://github.com/llvm/llvm-project/commit/6416958067179c2987af0ef4568cd57f98b7e347.diff LOG: Revert "[CUDA] Fix a couple of driver tests that really weren't being run" (#93988) Reverts llvm/llvm-project#93960 The change to offloading-interoperability.c broke many bots. 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 _______________________________________________ cfe-commits mailing list cfe-commits@lists.llvm.org https://lists.llvm.org/cgi-bin/mailman/listinfo/cfe-commits
