Skip to content

Commit 3b81d9d

Browse files
authored
Reapply "[CUDA] Fix a couple of driver tests that really weren't bein… (#94000)
…g run" (#93988)" This reverts commit 6416958. Fix bots by using different options.
1 parent f46d146 commit 3b81d9d

File tree

2 files changed

+2
-9
lines changed

2 files changed

+2
-9
lines changed

clang/test/Driver/offloading-interoperability.c

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,7 @@
1-
// REQUIRES: powerpc-registered-target
2-
// REQUIRES: nvptx-registered-target
3-
41
//
52
// Verify that CUDA device commands do not get OpenMP flags.
63
//
7-
// RUN: not %clang -### -x cuda --target=powerpc64le-linux-gnu -std=c++11 --cuda-gpu-arch=sm_35 -fopenmp=libomp %s 2>&1 \
4+
// RUN: %clang -### -x cuda --target=powerpc64le-linux-gnu -std=c++11 --cuda-gpu-arch=sm_35 -nocudainc -nocudalib -fopenmp=libomp %s 2>&1 \
85
// RUN: | FileCheck %s --check-prefix NO-OPENMP-FLAGS-FOR-CUDA-DEVICE
96
//
107
// NO-OPENMP-FLAGS-FOR-CUDA-DEVICE: "-cc1" "-triple" "nvptx64-nvidia-cuda"

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

Lines changed: 1 addition & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -2,11 +2,6 @@
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-
105
/// ###########################################################################
116

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

307302
// RUN: %clang -### -fopenmp=libomp --offload-arch=sm_89 \
303+
// RUN: --no-cuda-version-check \
308304
// RUN: -nogpulib %s -o openmp-offload-gpu 2>&1 \
309305
// RUN: | FileCheck -check-prefix=DRIVER_EMBEDDING %s
310306

0 commit comments

Comments
 (0)