[clang] 63fbc77 - [Driver][test] Remove unused/obsoleted REQUIRES: clang-driver

Fangrui Song via cfe-commits cfe-commits at lists.llvm.org
Tue Apr 12 13:29:52 PDT 2022


Author: Fangrui Song
Date: 2022-04-12T13:29:46-07:00
New Revision: 63fbc771218f6ec6700c607ed257a536bb016e12

URL: https://github.com/llvm/llvm-project/commit/63fbc771218f6ec6700c607ed257a536bb016e12
DIFF: https://github.com/llvm/llvm-project/commit/63fbc771218f6ec6700c607ed257a536bb016e12.diff

LOG: [Driver][test] Remove unused/obsoleted REQUIRES: clang-driver

It (introduced by 556d713c70bfaf58ac18d089883f9c34c581633a) appears to be
related to the removed dragonegg project. In addition, the feature was a bit
misnamed and may lur users to unnecessarily use it.

Added: 
    

Modified: 
    clang/test/CodeGenCUDA/amdgpu-alias-undef-symbols.cu
    clang/test/CodeGenCUDASPIRV/kernel-argument.cu
    clang/test/Driver/amdgpu-invalid-target-id.s
    clang/test/Driver/as-warnings.c
    clang/test/Driver/cl-options.cu
    clang/test/Driver/clang_f_opts.c
    clang/test/Driver/cuda-arch-translation.cu
    clang/test/Driver/cuda-bad-arch.cu
    clang/test/Driver/cuda-bail-out.cu
    clang/test/Driver/cuda-bindings.cu
    clang/test/Driver/cuda-constructor-alias.cu
    clang/test/Driver/cuda-detect-path.cu
    clang/test/Driver/cuda-detect.cu
    clang/test/Driver/cuda-device-triple.cu
    clang/test/Driver/cuda-dwarf-2.cu
    clang/test/Driver/cuda-external-tools.cu
    clang/test/Driver/cuda-macosx.cu
    clang/test/Driver/cuda-march.cu
    clang/test/Driver/cuda-no-pgo-or-coverage.cu
    clang/test/Driver/cuda-no-sanitizers.cu
    clang/test/Driver/cuda-no-stack-protector.cu
    clang/test/Driver/cuda-not-found.cu
    clang/test/Driver/cuda-omp-unsupported-debug-options.cu
    clang/test/Driver/cuda-options.cu
    clang/test/Driver/cuda-output-asm.cu
    clang/test/Driver/cuda-phases.cu
    clang/test/Driver/cuda-ptxas-path.cu
    clang/test/Driver/cuda-unused-arg-warning.cu
    clang/test/Driver/cuda-version-check.cu
    clang/test/Driver/cuda-windows.cu
    clang/test/Driver/dwarf-target-version-clamp.cu
    clang/test/Driver/fast-math.c
    clang/test/Driver/fat_archive_amdgpu.cpp
    clang/test/Driver/fat_archive_nvptx.cpp
    clang/test/Driver/fp-model.c
    clang/test/Driver/fsanitize-ignorelist.c
    clang/test/Driver/hip-autolink.hip
    clang/test/Driver/hip-binding.hip
    clang/test/Driver/hip-code-object-version.hip
    clang/test/Driver/hip-cuid-hash.hip
    clang/test/Driver/hip-cuid.hip
    clang/test/Driver/hip-default-gpu-arch.hip
    clang/test/Driver/hip-device-compile.hip
    clang/test/Driver/hip-device-libs.hip
    clang/test/Driver/hip-fpie-option.hip
    clang/test/Driver/hip-gsplit-dwarf-options.hip
    clang/test/Driver/hip-gz-options.hip
    clang/test/Driver/hip-host-cpu-features.hip
    clang/test/Driver/hip-include-path.hip
    clang/test/Driver/hip-inputs.hip
    clang/test/Driver/hip-invalid-target-id.hip
    clang/test/Driver/hip-launch-api.hip
    clang/test/Driver/hip-link-bundle-archive.hip
    clang/test/Driver/hip-link-save-temps.hip
    clang/test/Driver/hip-link-static-library.hip
    clang/test/Driver/hip-macros.hip
    clang/test/Driver/hip-no-device-libs.hip
    clang/test/Driver/hip-offload-arch.hip
    clang/test/Driver/hip-options.hip
    clang/test/Driver/hip-output-file-name.hip
    clang/test/Driver/hip-phases.hip
    clang/test/Driver/hip-printf.hip
    clang/test/Driver/hip-rdc-device-only.hip
    clang/test/Driver/hip-sanitize-options.hip
    clang/test/Driver/hip-save-temps.hip
    clang/test/Driver/hip-std.hip
    clang/test/Driver/hip-syntax-only.hip
    clang/test/Driver/hip-target-id.hip
    clang/test/Driver/hip-toolchain-device-only.hip
    clang/test/Driver/hip-toolchain-dwarf.hip
    clang/test/Driver/hip-toolchain-features.hip
    clang/test/Driver/hip-toolchain-mllvm.hip
    clang/test/Driver/hip-toolchain-no-rdc.hip
    clang/test/Driver/hip-toolchain-opt.hip
    clang/test/Driver/hip-toolchain-rdc-separate.hip
    clang/test/Driver/hip-toolchain-rdc-static-lib.hip
    clang/test/Driver/hip-toolchain-rdc.hip
    clang/test/Driver/hip-unbundle-preproc.hip
    clang/test/Driver/hip-version.hip
    clang/test/Driver/hip-windows-filename.hip
    clang/test/Driver/hipspv-device-libs.hip
    clang/test/Driver/hipspv-pass-plugin.hip
    clang/test/Driver/hipspv-toolchain-rdc.hip
    clang/test/Driver/hipspv-toolchain.hip
    clang/test/Driver/indirect-tls-seg-refs.c
    clang/test/Driver/invalid-offload-options.cpp
    clang/test/Driver/invalid-target-id.cl
    clang/test/Driver/linker-opts.c
    clang/test/Driver/lto.cu
    clang/test/Driver/miamcu-opt.c
    clang/test/Driver/ms-bitfields.c
    clang/test/Driver/offloading-interoperability.c
    clang/test/Driver/openmp-offload-gpu.c
    clang/test/Driver/openmp-offload.c
    clang/test/Driver/rocm-detect.cl
    clang/test/Driver/rocm-detect.hip
    clang/test/Driver/rocm-device-libs.cl
    clang/test/Driver/rocm-not-found.cl
    clang/test/Driver/stack-arg-probe.c
    clang/test/Driver/stackrealign.c
    clang/test/Driver/target-id-macros.cl
    clang/test/Driver/target-id-macros.hip
    clang/test/Driver/target-id.cl
    clang/test/Driver/thinlto.cu
    clang/test/Driver/warning-options_pedantic.cpp
    clang/test/Driver/zos-driver-defaults.c
    clang/test/Preprocessor/cuda-preprocess.cu
    clang/test/Preprocessor/hip-host-cpu-macros.cu

Removed: 
    


################################################################################
diff  --git a/clang/test/CodeGenCUDA/amdgpu-alias-undef-symbols.cu b/clang/test/CodeGenCUDA/amdgpu-alias-undef-symbols.cu
index 826ac1806f0a1..9cb25730cbf89 100644
--- a/clang/test/CodeGenCUDA/amdgpu-alias-undef-symbols.cu
+++ b/clang/test/CodeGenCUDA/amdgpu-alias-undef-symbols.cu
@@ -1,4 +1,4 @@
-// REQUIRES: amdgpu-registered-target, clang-driver
+// REQUIRES: amdgpu-registered-target
 
 // RUN: %clang -Xclang -no-opaque-pointers -target x86_64-unknown-linux-gnu --offload-arch=gfx906 --cuda-device-only -nogpulib -nogpuinc -x hip -emit-llvm -S -o - %s \
 // RUN:   -fgpu-rdc -O3 -mllvm -amdgpu-early-inline-all=true -mllvm -amdgpu-function-calls=false | \

diff  --git a/clang/test/CodeGenCUDASPIRV/kernel-argument.cu b/clang/test/CodeGenCUDASPIRV/kernel-argument.cu
index 9b8443e89dcce..cfc41ad7a535f 100644
--- a/clang/test/CodeGenCUDASPIRV/kernel-argument.cu
+++ b/clang/test/CodeGenCUDASPIRV/kernel-argument.cu
@@ -1,6 +1,5 @@
 // Tests CUDA kernel arguments get global address space when targetting SPIR-V.
 
-// REQUIRES: clang-driver
 
 // RUN: %clang -Xclang -no-opaque-pointers -emit-llvm --cuda-device-only --offload=spirv32 \
 // RUN:   -nocudalib -nocudainc %s -o %t.bc -c 2>&1

diff  --git a/clang/test/Driver/amdgpu-invalid-target-id.s b/clang/test/Driver/amdgpu-invalid-target-id.s
index 8c938c7f4bf17..5d4b188f9ef1d 100644
--- a/clang/test/Driver/amdgpu-invalid-target-id.s
+++ b/clang/test/Driver/amdgpu-invalid-target-id.s
@@ -1,4 +1,3 @@
-// REQUIRES: clang-driver
 // REQUIRES: x86-registered-target
 // REQUIRES: amdgpu-registered-target
 

diff  --git a/clang/test/Driver/as-warnings.c b/clang/test/Driver/as-warnings.c
index 2e863637589ce..1f785f0495092 100644
--- a/clang/test/Driver/as-warnings.c
+++ b/clang/test/Driver/as-warnings.c
@@ -13,7 +13,6 @@
 // RUN: %clang %s -c -o %t.o -integrated-as -Wa,--no-warn 2>&1 | FileCheck -allow-empty --check-prefix=CHECK-AS-NOWARN %s
 // RUN: not %clang %s -c -o %t.o -integrated-as -Wa,--fatal-warnings 2>&1 | FileCheck --check-prefix=CHECK-AS-FATAL %s
 
-// REQUIRES: clang-driver
 // REQUIRES: x86-registered-target
 // REQUIRES: system-linux
 

diff  --git a/clang/test/Driver/cl-options.cu b/clang/test/Driver/cl-options.cu
index e29d7cc1b8f8d..71d1d03c5367b 100644
--- a/clang/test/Driver/cl-options.cu
+++ b/clang/test/Driver/cl-options.cu
@@ -3,7 +3,6 @@
 // Note: %s must be preceded by --, otherwise it may be interpreted as a
 // command-line option, e.g. on Mac where %s is commonly under /Users.
 
-// REQUIRES: clang-driver
 // REQUIRES: x86-registered-target
 // REQUIRES: nvptx-registered-target
 

diff  --git a/clang/test/Driver/clang_f_opts.c b/clang/test/Driver/clang_f_opts.c
index 10fc93a1eaa21..1b2a71e811baf 100644
--- a/clang/test/Driver/clang_f_opts.c
+++ b/clang/test/Driver/clang_f_opts.c
@@ -1,4 +1,3 @@
-// REQUIRES: clang-driver
 
 // RUN: %clang -### -S -fasm -fblocks -fbuiltin -fno-math-errno -fcommon -fpascal-strings -fno-blocks -fno-builtin -fmath-errno -fno-common -fno-pascal-strings -fblocks -fbuiltin -fmath-errno -fcommon -fpascal-strings -fsplit-stack %s 2>&1 | FileCheck -check-prefix=CHECK-OPTIONS1 %s
 // RUN: %clang -### -S -fasm -fblocks -fbuiltin -fno-math-errno -fcommon -fpascal-strings -fno-asm -fno-blocks -fno-builtin -fmath-errno -fno-common -fno-pascal-strings -fno-show-source-location -fshort-enums -fprotect-parens %s 2>&1 | FileCheck -check-prefix=CHECK-OPTIONS2 %s

diff  --git a/clang/test/Driver/cuda-arch-translation.cu b/clang/test/Driver/cuda-arch-translation.cu
index 683add5338795..97efcf4e7fbca 100644
--- a/clang/test/Driver/cuda-arch-translation.cu
+++ b/clang/test/Driver/cuda-arch-translation.cu
@@ -1,7 +1,6 @@
 // Tests that "sm_XX" gets correctly converted to "compute_YY" when we invoke
 // fatbinary.
 //
-// REQUIRES: clang-driver
 // REQUIRES: x86-registered-target
 // REQUIRES: nvptx-registered-target
 

diff  --git a/clang/test/Driver/cuda-bad-arch.cu b/clang/test/Driver/cuda-bad-arch.cu
index d376df8ab7ae0..1bca535c6e8b7 100644
--- a/clang/test/Driver/cuda-bad-arch.cu
+++ b/clang/test/Driver/cuda-bad-arch.cu
@@ -1,5 +1,4 @@
 // Checks errors generated by passing a bad value for --cuda-gpu-arch.
-// REQUIRES: clang-driver
 // REQUIRES: x86-registered-target
 // REQUIRES: nvptx-registered-target
 // REQUIRES: amdgpu-registered-target

diff  --git a/clang/test/Driver/cuda-bail-out.cu b/clang/test/Driver/cuda-bail-out.cu
index aaf771474315d..ec34711e51ae8 100644
--- a/clang/test/Driver/cuda-bail-out.cu
+++ b/clang/test/Driver/cuda-bail-out.cu
@@ -1,6 +1,5 @@
 // Test clang driver bails out after one error during CUDA compilation.
 
-// REQUIRES: clang-driver
 // REQUIRES: powerpc-registered-target
 // REQUIRES: nvptx-registered-target
 

diff  --git a/clang/test/Driver/cuda-bindings.cu b/clang/test/Driver/cuda-bindings.cu
index ae9053ed159f9..178db31a29058 100644
--- a/clang/test/Driver/cuda-bindings.cu
+++ b/clang/test/Driver/cuda-bindings.cu
@@ -9,7 +9,6 @@
 // way. Instead we check whether we've generated a permanent name on
 // device side, which appends '-device-cuda-<triple>' suffix.
 
-// REQUIRES: clang-driver
 // REQUIRES: powerpc-registered-target
 // REQUIRES: nvptx-registered-target
 

diff  --git a/clang/test/Driver/cuda-constructor-alias.cu b/clang/test/Driver/cuda-constructor-alias.cu
index e0fd329abf627..e2c1ea6bae808 100644
--- a/clang/test/Driver/cuda-constructor-alias.cu
+++ b/clang/test/Driver/cuda-constructor-alias.cu
@@ -1,4 +1,3 @@
-// REQUIRES: clang-driver
 // REQUIRES: x86-registered-target
 // REQUIRES: nvptx-registered-target
 

diff  --git a/clang/test/Driver/cuda-detect-path.cu b/clang/test/Driver/cuda-detect-path.cu
index 61b9400760c29..95b9b288a8d7c 100644
--- a/clang/test/Driver/cuda-detect-path.cu
+++ b/clang/test/Driver/cuda-detect-path.cu
@@ -1,4 +1,3 @@
-// REQUIRES: clang-driver
 // REQUIRES: x86-registered-target
 // REQUIRES: nvptx-registered-target
 // This tests uses the PATH environment variable.

diff  --git a/clang/test/Driver/cuda-detect.cu b/clang/test/Driver/cuda-detect.cu
index 948b4d732832f..c11bc2823f1f9 100644
--- a/clang/test/Driver/cuda-detect.cu
+++ b/clang/test/Driver/cuda-detect.cu
@@ -1,4 +1,3 @@
-// REQUIRES: clang-driver
 // REQUIRES: x86-registered-target
 // REQUIRES: nvptx-registered-target
 //

diff  --git a/clang/test/Driver/cuda-device-triple.cu b/clang/test/Driver/cuda-device-triple.cu
index 02574dcf91d9e..3f3ccb2b155da 100644
--- a/clang/test/Driver/cuda-device-triple.cu
+++ b/clang/test/Driver/cuda-device-triple.cu
@@ -1,4 +1,3 @@
-// REQUIRES: clang-driver
 
 // RUN: %clang -### -emit-llvm --cuda-device-only \
 // RUN:   -nocudalib -nocudainc --offload=spirv32-unknown-unknown -c %s 2>&1 | FileCheck %s

diff  --git a/clang/test/Driver/cuda-dwarf-2.cu b/clang/test/Driver/cuda-dwarf-2.cu
index 92b8919729fc4..eda9599fe79d4 100644
--- a/clang/test/Driver/cuda-dwarf-2.cu
+++ b/clang/test/Driver/cuda-dwarf-2.cu
@@ -1,4 +1,3 @@
-// REQUIRES: clang-driver
 //
 // RUN: %clang -### -target x86_64-linux-gnu -c --cuda-gpu-arch=sm_20 %s -g -O1 --no-cuda-noopt-device-debug 2>&1 | \
 // RUN:   FileCheck %s -check-prefix DEBUG_DIRECTIVES

diff  --git a/clang/test/Driver/cuda-external-tools.cu b/clang/test/Driver/cuda-external-tools.cu
index 4af5a3ce60163..f8e2edd691753 100644
--- a/clang/test/Driver/cuda-external-tools.cu
+++ b/clang/test/Driver/cuda-external-tools.cu
@@ -1,7 +1,6 @@
 // Tests that ptxas and fatbinary are invoked correctly during CUDA
 // compilation.
 //
-// REQUIRES: clang-driver
 // REQUIRES: x86-registered-target
 // REQUIRES: nvptx-registered-target
 

diff  --git a/clang/test/Driver/cuda-macosx.cu b/clang/test/Driver/cuda-macosx.cu
index a4700a3b81d82..d01299f9f7d27 100644
--- a/clang/test/Driver/cuda-macosx.cu
+++ b/clang/test/Driver/cuda-macosx.cu
@@ -1,4 +1,3 @@
-// REQUIRES: clang-driver
 // REQUIRES: x86-registered-target
 // REQUIRES: nvptx-registered-target
 //

diff  --git a/clang/test/Driver/cuda-march.cu b/clang/test/Driver/cuda-march.cu
index a5ae7869743e3..449eb12384651 100644
--- a/clang/test/Driver/cuda-march.cu
+++ b/clang/test/Driver/cuda-march.cu
@@ -2,7 +2,6 @@
 // (Specifically, we want to pass it to host compilation, but not to device
 // compilation or ptxas!)
 //
-// REQUIRES: clang-driver
 // REQUIRES: x86-registered-target
 // REQUIRES: nvptx-registered-target
 

diff  --git a/clang/test/Driver/cuda-no-pgo-or-coverage.cu b/clang/test/Driver/cuda-no-pgo-or-coverage.cu
index 0c98d587c00cb..7045a2b18d09e 100644
--- a/clang/test/Driver/cuda-no-pgo-or-coverage.cu
+++ b/clang/test/Driver/cuda-no-pgo-or-coverage.cu
@@ -1,7 +1,6 @@
 // Check that profiling/coverage arguments doen't get passed down to device-side
 // compilation.
 //
-// REQUIRES: clang-driver
 //
 // XRUN: %clang -### -target x86_64-linux-gnu -c --cuda-gpu-arch=sm_20 \
 // XRUN:   -fprofile-generate %s 2>&1 | \

diff  --git a/clang/test/Driver/cuda-no-sanitizers.cu b/clang/test/Driver/cuda-no-sanitizers.cu
index 0573c483cd03c..fdd338755fc98 100644
--- a/clang/test/Driver/cuda-no-sanitizers.cu
+++ b/clang/test/Driver/cuda-no-sanitizers.cu
@@ -1,7 +1,6 @@
 // Check that -fsanitize=foo doesn't get passed down to device-side
 // compilation.
 //
-// REQUIRES: clang-driver
 //
 // RUN: %clang -### -target x86_64-linux-gnu -c --cuda-gpu-arch=sm_20 -fsanitize=address %s 2>&1 | \
 // RUN:   FileCheck %s

diff  --git a/clang/test/Driver/cuda-no-stack-protector.cu b/clang/test/Driver/cuda-no-stack-protector.cu
index 890a6d6b9d8b4..2bcf481855175 100644
--- a/clang/test/Driver/cuda-no-stack-protector.cu
+++ b/clang/test/Driver/cuda-no-stack-protector.cu
@@ -1,7 +1,6 @@
 // Check that -stack-protector doesn't get passed down to device-side
 // compilation.
 //
-// REQUIRES: clang-driver
 //
 // RUN: %clang -### -target x86_64-linux-gnu -c --cuda-gpu-arch=sm_20 \
 // RUN:   -fstack-protector-all %s 2>&1 | \

diff  --git a/clang/test/Driver/cuda-not-found.cu b/clang/test/Driver/cuda-not-found.cu
index 48cf19a424ccb..e12a4a3355716 100644
--- a/clang/test/Driver/cuda-not-found.cu
+++ b/clang/test/Driver/cuda-not-found.cu
@@ -1,4 +1,3 @@
-// REQUIRES: clang-driver
 
 // Check that we raise an error if we're trying to compile CUDA code but can't
 // find a CUDA install, unless -nocudainc was passed.

diff  --git a/clang/test/Driver/cuda-omp-unsupported-debug-options.cu b/clang/test/Driver/cuda-omp-unsupported-debug-options.cu
index b75e79c2249bf..36781cb0f3399 100644
--- a/clang/test/Driver/cuda-omp-unsupported-debug-options.cu
+++ b/clang/test/Driver/cuda-omp-unsupported-debug-options.cu
@@ -1,4 +1,3 @@
-// REQUIRES: clang-driver
 // REQUIRES: x86-registered-target
 // REQUIRES: nvptx-registered-target
 // REQUIRES: zlib

diff  --git a/clang/test/Driver/cuda-options.cu b/clang/test/Driver/cuda-options.cu
index ad1a0bc8cbb09..3fdc329300805 100644
--- a/clang/test/Driver/cuda-options.cu
+++ b/clang/test/Driver/cuda-options.cu
@@ -1,5 +1,4 @@
 // Tests CUDA compilation pipeline construction in Driver.
-// REQUIRES: clang-driver
 // REQUIRES: x86-registered-target
 // REQUIRES: nvptx-registered-target
 

diff  --git a/clang/test/Driver/cuda-output-asm.cu b/clang/test/Driver/cuda-output-asm.cu
index ac94354891824..c6b4e03f82392 100644
--- a/clang/test/Driver/cuda-output-asm.cu
+++ b/clang/test/Driver/cuda-output-asm.cu
@@ -1,6 +1,5 @@
 // Tests CUDA compilation with -S and -emit-llvm.
 
-// REQUIRES: clang-driver
 // REQUIRES: x86-registered-target
 // REQUIRES: nvptx-registered-target
 

diff  --git a/clang/test/Driver/cuda-phases.cu b/clang/test/Driver/cuda-phases.cu
index 8d5c54729c23c..945e9b4347c50 100644
--- a/clang/test/Driver/cuda-phases.cu
+++ b/clang/test/Driver/cuda-phases.cu
@@ -4,7 +4,6 @@
 // - Host/device-only compilation;
 // - User-requested final phase - binary or assembly.
 
-// REQUIRES: clang-driver
 // REQUIRES: powerpc-registered-target
 // REQUIRES: nvptx-registered-target
 //

diff  --git a/clang/test/Driver/cuda-ptxas-path.cu b/clang/test/Driver/cuda-ptxas-path.cu
index 2836babcb9808..09c6014a91a2e 100644
--- a/clang/test/Driver/cuda-ptxas-path.cu
+++ b/clang/test/Driver/cuda-ptxas-path.cu
@@ -1,4 +1,3 @@
-// REQUIRES: clang-driver
 // REQUIRES: x86-registered-target
 // REQUIRES: nvptx-registered-target
 

diff  --git a/clang/test/Driver/cuda-unused-arg-warning.cu b/clang/test/Driver/cuda-unused-arg-warning.cu
index cbbb893129b6f..4e541c66def89 100644
--- a/clang/test/Driver/cuda-unused-arg-warning.cu
+++ b/clang/test/Driver/cuda-unused-arg-warning.cu
@@ -1,6 +1,5 @@
 // Tests that we trigger unused-arg warnings on CUDA flags appropriately.
 
-// REQUIRES: clang-driver
 // REQUIRES: x86-registered-target
 // REQUIRES: nvptx-registered-target
 

diff  --git a/clang/test/Driver/cuda-version-check.cu b/clang/test/Driver/cuda-version-check.cu
index d6924c883c5bf..82f144cf67638 100644
--- a/clang/test/Driver/cuda-version-check.cu
+++ b/clang/test/Driver/cuda-version-check.cu
@@ -1,4 +1,3 @@
-// REQUIRES: clang-driver
 // REQUIRES: x86-registered-target
 // REQUIRES: nvptx-registered-target
 

diff  --git a/clang/test/Driver/cuda-windows.cu b/clang/test/Driver/cuda-windows.cu
index 1d67710647c05..02d6a55808d1c 100644
--- a/clang/test/Driver/cuda-windows.cu
+++ b/clang/test/Driver/cuda-windows.cu
@@ -1,4 +1,3 @@
-// REQUIRES: clang-driver
 // REQUIRES: x86-registered-target
 // REQUIRES: nvptx-registered-target
 //

diff  --git a/clang/test/Driver/dwarf-target-version-clamp.cu b/clang/test/Driver/dwarf-target-version-clamp.cu
index 215f00a72d773..702bafc5ebb0c 100644
--- a/clang/test/Driver/dwarf-target-version-clamp.cu
+++ b/clang/test/Driver/dwarf-target-version-clamp.cu
@@ -1,4 +1,3 @@
-// REQUIRES: clang-driver
 // REQUIRES: x86-registered-target
 // REQUIRES: nvptx-registered-target
 

diff  --git a/clang/test/Driver/fast-math.c b/clang/test/Driver/fast-math.c
index 36ea8ecb52985..03099bbc011e8 100644
--- a/clang/test/Driver/fast-math.c
+++ b/clang/test/Driver/fast-math.c
@@ -5,7 +5,6 @@
 // support.
 //
 // Both of them use gcc driver for as.
-// REQUIRES: clang-driver
 //
 // RUN: %clang -### -fno-honor-infinities -c %s 2>&1 \
 // RUN:   | FileCheck --check-prefix=CHECK-NO-INFS %s

diff  --git a/clang/test/Driver/fat_archive_amdgpu.cpp b/clang/test/Driver/fat_archive_amdgpu.cpp
index 8ab9498fe6007..0a8fa6f38f908 100644
--- a/clang/test/Driver/fat_archive_amdgpu.cpp
+++ b/clang/test/Driver/fat_archive_amdgpu.cpp
@@ -1,4 +1,3 @@
-// REQUIRES: clang-driver
 // REQUIRES: x86-registered-target
 // REQUIRES: amdgpu-registered-target
 // UNSUPPORTED: -aix

diff  --git a/clang/test/Driver/fat_archive_nvptx.cpp b/clang/test/Driver/fat_archive_nvptx.cpp
index 094af3a6bdf9b..4985ca5a3a8ed 100644
--- a/clang/test/Driver/fat_archive_nvptx.cpp
+++ b/clang/test/Driver/fat_archive_nvptx.cpp
@@ -1,4 +1,3 @@
-// REQUIRES: clang-driver
 // REQUIRES: x86-registered-target
 // REQUIRES: nvptx-registered-target
 

diff  --git a/clang/test/Driver/fp-model.c b/clang/test/Driver/fp-model.c
index 0824b3e2c596d..af809712a5680 100644
--- a/clang/test/Driver/fp-model.c
+++ b/clang/test/Driver/fp-model.c
@@ -1,7 +1,6 @@
 // Test that incompatible combinations of -ffp-model= options
 // and other floating point options get a warning diagnostic.
 //
-// REQUIRES: clang-driver
 
 // RUN: %clang -### -ffp-model=fast -ffp-contract=off -c %s 2>&1 \
 // RUN:   | FileCheck --check-prefix=WARN %s

diff  --git a/clang/test/Driver/fsanitize-ignorelist.c b/clang/test/Driver/fsanitize-ignorelist.c
index 9c9d143bf536e..17c4f5abcedc0 100644
--- a/clang/test/Driver/fsanitize-ignorelist.c
+++ b/clang/test/Driver/fsanitize-ignorelist.c
@@ -1,7 +1,6 @@
 // General ignorelist usage.
 
 // PR12920
-// REQUIRES: clang-driver
 
 // Make sure we don't match the -NOT lines with the linker invocation.
 // Delimiters match the start of the cc1 and the start of the linker lines

diff  --git a/clang/test/Driver/hip-autolink.hip b/clang/test/Driver/hip-autolink.hip
index c06f0f9d8b715..12bc900189117 100644
--- a/clang/test/Driver/hip-autolink.hip
+++ b/clang/test/Driver/hip-autolink.hip
@@ -1,4 +1,3 @@
-// REQUIRES: clang-driver
 // REQUIRES: x86-registered-target
 // REQUIRES: amdgpu-registered-target
 //

diff  --git a/clang/test/Driver/hip-binding.hip b/clang/test/Driver/hip-binding.hip
index 3d83930223462..94612954dfe60 100644
--- a/clang/test/Driver/hip-binding.hip
+++ b/clang/test/Driver/hip-binding.hip
@@ -1,4 +1,3 @@
-// REQUIRES: clang-driver
 // REQUIRES: x86-registered-target
 // REQUIRES: amdgpu-registered-target
 

diff  --git a/clang/test/Driver/hip-code-object-version.hip b/clang/test/Driver/hip-code-object-version.hip
index 3263bf47431dc..cc5bafe2f0723 100644
--- a/clang/test/Driver/hip-code-object-version.hip
+++ b/clang/test/Driver/hip-code-object-version.hip
@@ -1,4 +1,4 @@
-// REQUIRES: clang-driver, amdgpu-registered-target
+// REQUIRES: amdgpu-registered-target
 
 // Check bundle ID for code object v2.
 

diff  --git a/clang/test/Driver/hip-cuid-hash.hip b/clang/test/Driver/hip-cuid-hash.hip
index 4ee4a0ddc68fc..25a746bcc1e75 100644
--- a/clang/test/Driver/hip-cuid-hash.hip
+++ b/clang/test/Driver/hip-cuid-hash.hip
@@ -1,4 +1,3 @@
-// REQUIRES: clang-driver
 // REQUIRES: x86-registered-target
 // REQUIRES: amdgpu-registered-target
 

diff  --git a/clang/test/Driver/hip-cuid.hip b/clang/test/Driver/hip-cuid.hip
index 16657057f86b9..e1f2d16291592 100644
--- a/clang/test/Driver/hip-cuid.hip
+++ b/clang/test/Driver/hip-cuid.hip
@@ -1,4 +1,3 @@
-// REQUIRES: clang-driver
 // REQUIRES: x86-registered-target
 // REQUIRES: amdgpu-registered-target
 

diff  --git a/clang/test/Driver/hip-default-gpu-arch.hip b/clang/test/Driver/hip-default-gpu-arch.hip
index bce9a67b4b1c9..69d98d0f35695 100644
--- a/clang/test/Driver/hip-default-gpu-arch.hip
+++ b/clang/test/Driver/hip-default-gpu-arch.hip
@@ -1,4 +1,3 @@
-// REQUIRES: clang-driver
 // REQUIRES: x86-registered-target
 // REQUIRES: amdgpu-registered-target
 

diff  --git a/clang/test/Driver/hip-device-compile.hip b/clang/test/Driver/hip-device-compile.hip
index ced2f37e7a2f9..38ce42aaecd6f 100644
--- a/clang/test/Driver/hip-device-compile.hip
+++ b/clang/test/Driver/hip-device-compile.hip
@@ -1,4 +1,3 @@
-// REQUIRES: clang-driver
 // REQUIRES: x86-registered-target
 // REQUIRES: amdgpu-registered-target
 

diff  --git a/clang/test/Driver/hip-device-libs.hip b/clang/test/Driver/hip-device-libs.hip
index 29077ee1ecf25..286bf935f06c6 100644
--- a/clang/test/Driver/hip-device-libs.hip
+++ b/clang/test/Driver/hip-device-libs.hip
@@ -1,4 +1,3 @@
-// REQUIRES: clang-driver
 // REQUIRES: x86-registered-target
 // REQUIRES: amdgpu-registered-target
 

diff  --git a/clang/test/Driver/hip-fpie-option.hip b/clang/test/Driver/hip-fpie-option.hip
index ffd639dd5a6de..396be4f78197e 100644
--- a/clang/test/Driver/hip-fpie-option.hip
+++ b/clang/test/Driver/hip-fpie-option.hip
@@ -1,4 +1,4 @@
-// REQUIRES: clang-driver, amdgpu-registered-target, default-pie-on-linux
+// REQUIRES: amdgpu-registered-target, default-pie-on-linux
 
 // -fPIC and -fPIE only affects host relocation model.
 // device compilation always uses PIC. 

diff  --git a/clang/test/Driver/hip-gsplit-dwarf-options.hip b/clang/test/Driver/hip-gsplit-dwarf-options.hip
index 9f735c048cee2..74891e1c7cc8d 100644
--- a/clang/test/Driver/hip-gsplit-dwarf-options.hip
+++ b/clang/test/Driver/hip-gsplit-dwarf-options.hip
@@ -1,4 +1,4 @@
-// REQUIRES: zlib, clang-driver, amdgpu-registered-target
+// REQUIRES: zlib, amdgpu-registered-target
 
 // RUN: %clang -### -target x86_64-unknown-linux-gnu -c \
 // RUN:   --offload-arch=gfx906:xnack+ %s -nogpulib -nogpuinc \

diff  --git a/clang/test/Driver/hip-gz-options.hip b/clang/test/Driver/hip-gz-options.hip
index 705c1be7b94ef..48275ceeda999 100644
--- a/clang/test/Driver/hip-gz-options.hip
+++ b/clang/test/Driver/hip-gz-options.hip
@@ -1,4 +1,4 @@
-// REQUIRES: zlib, clang-driver, amdgpu-registered-target
+// REQUIRES: zlib, amdgpu-registered-target
 
 // RUN: %clang -### -target x86_64-unknown-linux-gnu \
 // RUN:    --offload-arch=gfx906 %s -nogpulib -nogpuinc \

diff  --git a/clang/test/Driver/hip-host-cpu-features.hip b/clang/test/Driver/hip-host-cpu-features.hip
index 67a5004556916..165b2f2d54f8e 100644
--- a/clang/test/Driver/hip-host-cpu-features.hip
+++ b/clang/test/Driver/hip-host-cpu-features.hip
@@ -1,4 +1,3 @@
-// REQUIRES: clang-driver
 // REQUIRES: x86-registered-target
 // REQUIRES: amdgpu-registered-target
 

diff  --git a/clang/test/Driver/hip-include-path.hip b/clang/test/Driver/hip-include-path.hip
index 92f2fab6c24cf..8aa21e7f18753 100644
--- a/clang/test/Driver/hip-include-path.hip
+++ b/clang/test/Driver/hip-include-path.hip
@@ -1,4 +1,3 @@
-// REQUIRES: clang-driver
 // REQUIRES: x86-registered-target
 // REQUIRES: amdgpu-registered-target
 // REQUIRES: libgcc

diff  --git a/clang/test/Driver/hip-inputs.hip b/clang/test/Driver/hip-inputs.hip
index 57f3f88623d24..6bff2dec9d774 100644
--- a/clang/test/Driver/hip-inputs.hip
+++ b/clang/test/Driver/hip-inputs.hip
@@ -1,4 +1,3 @@
-// REQUIRES: clang-driver
 // REQUIRES: x86-registered-target
 // REQUIRES: amdgpu-registered-target
 

diff  --git a/clang/test/Driver/hip-invalid-target-id.hip b/clang/test/Driver/hip-invalid-target-id.hip
index 335dc342ba8ea..dea8068c393b2 100644
--- a/clang/test/Driver/hip-invalid-target-id.hip
+++ b/clang/test/Driver/hip-invalid-target-id.hip
@@ -1,4 +1,3 @@
-// REQUIRES: clang-driver
 // REQUIRES: x86-registered-target
 // REQUIRES: amdgpu-registered-target
 

diff  --git a/clang/test/Driver/hip-launch-api.hip b/clang/test/Driver/hip-launch-api.hip
index a7d7d15c9b5ae..fbfa4123a64ea 100644
--- a/clang/test/Driver/hip-launch-api.hip
+++ b/clang/test/Driver/hip-launch-api.hip
@@ -1,4 +1,3 @@
-// REQUIRES: clang-driver
 // REQUIRES: x86-registered-target
 // REQUIRES: amdgpu-registered-target
 

diff  --git a/clang/test/Driver/hip-link-bundle-archive.hip b/clang/test/Driver/hip-link-bundle-archive.hip
index 29fa9d959628c..641bf59b63461 100644
--- a/clang/test/Driver/hip-link-bundle-archive.hip
+++ b/clang/test/Driver/hip-link-bundle-archive.hip
@@ -1,4 +1,4 @@
-// REQUIRES: clang-driver, x86-registered-target, amdgpu-registered-target
+// REQUIRES: x86-registered-target, amdgpu-registered-target
 
 // RUN: touch %T/libhipBundled.a
 

diff  --git a/clang/test/Driver/hip-link-save-temps.hip b/clang/test/Driver/hip-link-save-temps.hip
index 65275211ebea3..e780e564e96e0 100644
--- a/clang/test/Driver/hip-link-save-temps.hip
+++ b/clang/test/Driver/hip-link-save-temps.hip
@@ -1,4 +1,3 @@
-// REQUIRES: clang-driver
 // REQUIRES: x86-registered-target
 // REQUIRES: amdgpu-registered-target
 

diff  --git a/clang/test/Driver/hip-link-static-library.hip b/clang/test/Driver/hip-link-static-library.hip
index e670980fa486d..4890d807b7c4b 100644
--- a/clang/test/Driver/hip-link-static-library.hip
+++ b/clang/test/Driver/hip-link-static-library.hip
@@ -1,4 +1,3 @@
-// REQUIRES: clang-driver
 // REQUIRES: x86-registered-target
 // REQUIRES: amdgpu-registered-target
 

diff  --git a/clang/test/Driver/hip-macros.hip b/clang/test/Driver/hip-macros.hip
index 3105c25b8b9d5..49a83b1414342 100644
--- a/clang/test/Driver/hip-macros.hip
+++ b/clang/test/Driver/hip-macros.hip
@@ -1,4 +1,4 @@
-// REQUIRES: clang-driver, amdgpu-registered-target
+// REQUIRES: amdgpu-registered-target
 // RUN: %clang -E -dM --offload-arch=gfx906 -mwavefrontsize64 \
 // RUN:   --cuda-device-only -nogpuinc -nogpulib \
 // RUN:   %s 2>&1 | FileCheck --check-prefixes=WAVE64 %s

diff  --git a/clang/test/Driver/hip-no-device-libs.hip b/clang/test/Driver/hip-no-device-libs.hip
index d19382698bb13..13935643ef82a 100644
--- a/clang/test/Driver/hip-no-device-libs.hip
+++ b/clang/test/Driver/hip-no-device-libs.hip
@@ -1,4 +1,3 @@
-// REQUIRES: clang-driver
 // REQUIRES: x86-registered-target
 // REQUIRES: amdgpu-registered-target
 

diff  --git a/clang/test/Driver/hip-offload-arch.hip b/clang/test/Driver/hip-offload-arch.hip
index 4cd37b5815f73..770f3986baf38 100644
--- a/clang/test/Driver/hip-offload-arch.hip
+++ b/clang/test/Driver/hip-offload-arch.hip
@@ -1,4 +1,4 @@
-// REQUIRES: clang-driver, x86-registered-target, amdgpu-registered-target
+// REQUIRES: x86-registered-target, amdgpu-registered-target
 
 // RUN: %clang -### -target x86_64-linux-gnu \
 // RUN:   --offload-arch=gfx1030 \

diff  --git a/clang/test/Driver/hip-options.hip b/clang/test/Driver/hip-options.hip
index 1169444a0dd7c..4083cf4eda7c5 100644
--- a/clang/test/Driver/hip-options.hip
+++ b/clang/test/Driver/hip-options.hip
@@ -1,4 +1,3 @@
-// REQUIRES: clang-driver
 // REQUIRES: x86-registered-target
 // REQUIRES: amdgpu-registered-target
 

diff  --git a/clang/test/Driver/hip-output-file-name.hip b/clang/test/Driver/hip-output-file-name.hip
index 5b888c30d6b10..fa34197df5a8b 100644
--- a/clang/test/Driver/hip-output-file-name.hip
+++ b/clang/test/Driver/hip-output-file-name.hip
@@ -1,4 +1,3 @@
-// REQUIRES: clang-driver
 // REQUIRES: x86-registered-target
 // REQUIRES: amdgpu-registered-target
 

diff  --git a/clang/test/Driver/hip-phases.hip b/clang/test/Driver/hip-phases.hip
index 1952f64bf4c22..047322b963d27 100644
--- a/clang/test/Driver/hip-phases.hip
+++ b/clang/test/Driver/hip-phases.hip
@@ -4,7 +4,6 @@
 // - Host/device-only compilation;
 // - User-requested final phase - binary or assembly.
 
-// REQUIRES: clang-driver
 // REQUIRES: x86-registered-target
 // REQUIRES: amdgpu-registered-target
 //

diff  --git a/clang/test/Driver/hip-printf.hip b/clang/test/Driver/hip-printf.hip
index 065398a214f1d..7098540f2aa1f 100644
--- a/clang/test/Driver/hip-printf.hip
+++ b/clang/test/Driver/hip-printf.hip
@@ -1,4 +1,3 @@
-// REQUIRES: clang-driver
 // REQUIRES: x86-registered-target
 // REQUIRES: amdgpu-registered-target
 

diff  --git a/clang/test/Driver/hip-rdc-device-only.hip b/clang/test/Driver/hip-rdc-device-only.hip
index 24a586d09d145..97e93970afc54 100644
--- a/clang/test/Driver/hip-rdc-device-only.hip
+++ b/clang/test/Driver/hip-rdc-device-only.hip
@@ -1,4 +1,3 @@
-// REQUIRES: clang-driver
 // REQUIRES: x86-registered-target
 // REQUIRES: amdgpu-registered-target
 

diff  --git a/clang/test/Driver/hip-sanitize-options.hip b/clang/test/Driver/hip-sanitize-options.hip
index 51111d2b2e91e..ad7ae72fd2b8a 100644
--- a/clang/test/Driver/hip-sanitize-options.hip
+++ b/clang/test/Driver/hip-sanitize-options.hip
@@ -1,4 +1,4 @@
-// REQUIRES: clang-driver, x86-registered-target, amdgpu-registered-target
+// REQUIRES: x86-registered-target, amdgpu-registered-target
 
 // RUN: %clang -### -target x86_64-unknown-linux-gnu --offload-arch=gfx900:xnack+ \
 // RUN:   -fsanitize=address \

diff  --git a/clang/test/Driver/hip-save-temps.hip b/clang/test/Driver/hip-save-temps.hip
index 0dcdcfaf0d9a6..6319498e6166a 100644
--- a/clang/test/Driver/hip-save-temps.hip
+++ b/clang/test/Driver/hip-save-temps.hip
@@ -1,4 +1,3 @@
-// REQUIRES: clang-driver
 // REQUIRES: x86-registered-target
 // REQUIRES: amdgpu-registered-target
 

diff  --git a/clang/test/Driver/hip-std.hip b/clang/test/Driver/hip-std.hip
index 4bdf05ab495d5..1d52b911df86f 100644
--- a/clang/test/Driver/hip-std.hip
+++ b/clang/test/Driver/hip-std.hip
@@ -1,4 +1,3 @@
-// REQUIRES: clang-driver
 // REQUIRES: x86-registered-target
 // REQUIRES: amdgpu-registered-target
 

diff  --git a/clang/test/Driver/hip-syntax-only.hip b/clang/test/Driver/hip-syntax-only.hip
index e52acb0344ef9..dbaef70284487 100644
--- a/clang/test/Driver/hip-syntax-only.hip
+++ b/clang/test/Driver/hip-syntax-only.hip
@@ -1,4 +1,3 @@
-// REQUIRES: clang-driver
 // REQUIRES: x86-registered-target
 // REQUIRES: amdgpu-registered-target
 

diff  --git a/clang/test/Driver/hip-target-id.hip b/clang/test/Driver/hip-target-id.hip
index e91403a8335c0..3274e703acd8a 100644
--- a/clang/test/Driver/hip-target-id.hip
+++ b/clang/test/Driver/hip-target-id.hip
@@ -1,4 +1,3 @@
-// REQUIRES: clang-driver
 // REQUIRES: x86-registered-target
 // REQUIRES: amdgpu-registered-target
 

diff  --git a/clang/test/Driver/hip-toolchain-device-only.hip b/clang/test/Driver/hip-toolchain-device-only.hip
index 91adcdbc527ee..21fc865c3e7c0 100644
--- a/clang/test/Driver/hip-toolchain-device-only.hip
+++ b/clang/test/Driver/hip-toolchain-device-only.hip
@@ -1,4 +1,4 @@
-// REQUIRES: clang-driver, amdgpu-registered-target
+// REQUIRES: amdgpu-registered-target
 
 // RUN: %clang -### -target x86_64-linux-gnu \
 // RUN:   --offload-arch=gfx803 --offload-arch=gfx900 \

diff  --git a/clang/test/Driver/hip-toolchain-dwarf.hip b/clang/test/Driver/hip-toolchain-dwarf.hip
index c853d5cf07cf5..2a190c1b8d5ec 100644
--- a/clang/test/Driver/hip-toolchain-dwarf.hip
+++ b/clang/test/Driver/hip-toolchain-dwarf.hip
@@ -1,4 +1,3 @@
-// REQUIRES: clang-driver
 // REQUIRES: x86-registered-target
 // REQUIRES: amdgpu-registered-target
 

diff  --git a/clang/test/Driver/hip-toolchain-features.hip b/clang/test/Driver/hip-toolchain-features.hip
index bdece1a76d1e9..31057cd8eeba7 100644
--- a/clang/test/Driver/hip-toolchain-features.hip
+++ b/clang/test/Driver/hip-toolchain-features.hip
@@ -1,4 +1,3 @@
-// REQUIRES: clang-driver
 // REQUIRES: x86-registered-target
 // REQUIRES: amdgpu-registered-target
 

diff  --git a/clang/test/Driver/hip-toolchain-mllvm.hip b/clang/test/Driver/hip-toolchain-mllvm.hip
index 5b47e1e0b5d86..8cc32598af948 100644
--- a/clang/test/Driver/hip-toolchain-mllvm.hip
+++ b/clang/test/Driver/hip-toolchain-mllvm.hip
@@ -1,4 +1,3 @@
-// REQUIRES: clang-driver
 // REQUIRES: x86-registered-target
 // REQUIRES: amdgpu-registered-target
 

diff  --git a/clang/test/Driver/hip-toolchain-no-rdc.hip b/clang/test/Driver/hip-toolchain-no-rdc.hip
index 7300add408b9c..0d8756d8f3a81 100644
--- a/clang/test/Driver/hip-toolchain-no-rdc.hip
+++ b/clang/test/Driver/hip-toolchain-no-rdc.hip
@@ -1,4 +1,3 @@
-// REQUIRES: clang-driver
 // REQUIRES: x86-registered-target
 // REQUIRES: amdgpu-registered-target
 

diff  --git a/clang/test/Driver/hip-toolchain-opt.hip b/clang/test/Driver/hip-toolchain-opt.hip
index d58471aec5f51..bf4f4620c9c69 100644
--- a/clang/test/Driver/hip-toolchain-opt.hip
+++ b/clang/test/Driver/hip-toolchain-opt.hip
@@ -1,4 +1,3 @@
-// REQUIRES: clang-driver
 // REQUIRES: x86-registered-target
 // REQUIRES: amdgpu-registered-target
 

diff  --git a/clang/test/Driver/hip-toolchain-rdc-separate.hip b/clang/test/Driver/hip-toolchain-rdc-separate.hip
index 2d733df53324d..a59f7b7f833fa 100644
--- a/clang/test/Driver/hip-toolchain-rdc-separate.hip
+++ b/clang/test/Driver/hip-toolchain-rdc-separate.hip
@@ -1,4 +1,3 @@
-// REQUIRES: clang-driver
 // REQUIRES: x86-registered-target
 // REQUIRES: amdgpu-registered-target
 

diff  --git a/clang/test/Driver/hip-toolchain-rdc-static-lib.hip b/clang/test/Driver/hip-toolchain-rdc-static-lib.hip
index e8b118a67e5c8..55cd3bd592084 100644
--- a/clang/test/Driver/hip-toolchain-rdc-static-lib.hip
+++ b/clang/test/Driver/hip-toolchain-rdc-static-lib.hip
@@ -1,4 +1,3 @@
-// REQUIRES: clang-driver
 // REQUIRES: x86-registered-target
 // REQUIRES: amdgpu-registered-target
 

diff  --git a/clang/test/Driver/hip-toolchain-rdc.hip b/clang/test/Driver/hip-toolchain-rdc.hip
index 8dc87b8350ff9..794202a3a1f2b 100644
--- a/clang/test/Driver/hip-toolchain-rdc.hip
+++ b/clang/test/Driver/hip-toolchain-rdc.hip
@@ -1,4 +1,3 @@
-// REQUIRES: clang-driver
 // REQUIRES: x86-registered-target
 // REQUIRES: amdgpu-registered-target
 

diff  --git a/clang/test/Driver/hip-unbundle-preproc.hip b/clang/test/Driver/hip-unbundle-preproc.hip
index 4a389062b63ed..d57d31e07c6ed 100644
--- a/clang/test/Driver/hip-unbundle-preproc.hip
+++ b/clang/test/Driver/hip-unbundle-preproc.hip
@@ -1,4 +1,4 @@
-// REQUIRES: clang-driver, amdgpu-registered-target
+// REQUIRES: amdgpu-registered-target
 
 // RUN: %clang -### -target x86_64-unknown-linux-gnu \
 // RUN:   --offload-arch=gfx803 -nogpulib \

diff  --git a/clang/test/Driver/hip-version.hip b/clang/test/Driver/hip-version.hip
index af98e025cccca..69995899fb2ac 100644
--- a/clang/test/Driver/hip-version.hip
+++ b/clang/test/Driver/hip-version.hip
@@ -1,4 +1,3 @@
-// REQUIRES: clang-driver
 // REQUIRES: x86-registered-target
 // REQUIRES: amdgpu-registered-target
 // UNSUPPORTED: aix

diff  --git a/clang/test/Driver/hip-windows-filename.hip b/clang/test/Driver/hip-windows-filename.hip
index 9244f16c378f9..7fe3866506079 100644
--- a/clang/test/Driver/hip-windows-filename.hip
+++ b/clang/test/Driver/hip-windows-filename.hip
@@ -1,4 +1,4 @@
-// REQUIRES: system-windows, clang-driver, amdgpu-registered-target
+// REQUIRES: system-windows, amdgpu-registered-target
 
 // RUN: %clang -### -target x86_64-pc-windows-msvc \
 // RUN:   -x hip \

diff  --git a/clang/test/Driver/hipspv-device-libs.hip b/clang/test/Driver/hipspv-device-libs.hip
index cf3f01ac57d15..3a0fc1070a92c 100644
--- a/clang/test/Driver/hipspv-device-libs.hip
+++ b/clang/test/Driver/hipspv-device-libs.hip
@@ -1,4 +1,3 @@
-// REQUIRES: clang-driver
 // REQUIRES: x86-registered-target
 // UNSUPPORTED: system-windows
 

diff  --git a/clang/test/Driver/hipspv-pass-plugin.hip b/clang/test/Driver/hipspv-pass-plugin.hip
index eaa8154df8b0a..10add8bab8af1 100644
--- a/clang/test/Driver/hipspv-pass-plugin.hip
+++ b/clang/test/Driver/hipspv-pass-plugin.hip
@@ -1,4 +1,3 @@
-// REQUIRES: clang-driver
 // REQUIRES: x86-registered-target
 // UNSUPPORTED: system-windows
 

diff  --git a/clang/test/Driver/hipspv-toolchain-rdc.hip b/clang/test/Driver/hipspv-toolchain-rdc.hip
index 2938007bae28c..98f7debac2ce5 100644
--- a/clang/test/Driver/hipspv-toolchain-rdc.hip
+++ b/clang/test/Driver/hipspv-toolchain-rdc.hip
@@ -1,4 +1,3 @@
-// REQUIRES: clang-driver
 // REQUIRES: x86-registered-target
 // UNSUPPORTED: system-windows
 

diff  --git a/clang/test/Driver/hipspv-toolchain.hip b/clang/test/Driver/hipspv-toolchain.hip
index 6d0b11aee07ba..bfae41049ba4d 100644
--- a/clang/test/Driver/hipspv-toolchain.hip
+++ b/clang/test/Driver/hipspv-toolchain.hip
@@ -1,4 +1,3 @@
-// REQUIRES: clang-driver
 // REQUIRES: x86-registered-target
 // UNSUPPORTED: system-windows
 

diff  --git a/clang/test/Driver/indirect-tls-seg-refs.c b/clang/test/Driver/indirect-tls-seg-refs.c
index b3f69329854e7..c3628e7beab4f 100644
--- a/clang/test/Driver/indirect-tls-seg-refs.c
+++ b/clang/test/Driver/indirect-tls-seg-refs.c
@@ -1,4 +1,4 @@
-// REQUIRES: clang-driver, x86-registered-target
+// REQUIRES: x86-registered-target
 
 // RUN: %clang -### -target x86_64-unknown-linux %s 2>&1 | FileCheck %s -check-prefix=TLSDIRECT
 // RUN: %clang -### -target x86_64-unknown-linux -mno-tls-direct-seg-refs -mtls-direct-seg-refs %s 2>&1 | FileCheck %s -check-prefix=TLSDIRECT

diff  --git a/clang/test/Driver/invalid-offload-options.cpp b/clang/test/Driver/invalid-offload-options.cpp
index dc01dcf122a70..54ee6a0801362 100644
--- a/clang/test/Driver/invalid-offload-options.cpp
+++ b/clang/test/Driver/invalid-offload-options.cpp
@@ -1,4 +1,3 @@
-// REQUIRES: clang-driver
 // REQUIRES: x86-registered-target
 // UNSUPPORTED: system-windows
 

diff  --git a/clang/test/Driver/invalid-target-id.cl b/clang/test/Driver/invalid-target-id.cl
index daeed9b15da5f..eca00f4ba5307 100644
--- a/clang/test/Driver/invalid-target-id.cl
+++ b/clang/test/Driver/invalid-target-id.cl
@@ -1,4 +1,3 @@
-// REQUIRES: clang-driver
 // REQUIRES: x86-registered-target
 // REQUIRES: amdgpu-registered-target
 

diff  --git a/clang/test/Driver/linker-opts.c b/clang/test/Driver/linker-opts.c
index e1673f7b08d46..e3c4e00ea0c75 100644
--- a/clang/test/Driver/linker-opts.c
+++ b/clang/test/Driver/linker-opts.c
@@ -7,7 +7,6 @@
 // CHECK: "-la"
 
 // GCC driver is used as linker on cygming. It should be aware of LIBRARY_PATH.
-// REQUIRES: clang-driver
 // REQUIRES: native
 
 // Make sure that LIBRARY_PATH works for both i386 and x86_64 on Darwin.

diff  --git a/clang/test/Driver/lto.cu b/clang/test/Driver/lto.cu
index 1fd48fd4405ce..cc96f12d4029e 100644
--- a/clang/test/Driver/lto.cu
+++ b/clang/test/Driver/lto.cu
@@ -1,4 +1,3 @@
-// REQUIRES: clang-driver
 // REQUIRES: x86-registered-target
 // REQUIRES: nvptx-registered-target
 

diff  --git a/clang/test/Driver/miamcu-opt.c b/clang/test/Driver/miamcu-opt.c
index d89c2c3b1758b..6fcee57a64643 100644
--- a/clang/test/Driver/miamcu-opt.c
+++ b/clang/test/Driver/miamcu-opt.c
@@ -1,4 +1,3 @@
-// REQUIRES: clang-driver
 // REQUIRES: x86-registered-target
 //
 // RUN: %clang -miamcu -rtlib=platform -no-canonical-prefixes %s -### -o %t.o 2>&1 | FileCheck %s

diff  --git a/clang/test/Driver/ms-bitfields.c b/clang/test/Driver/ms-bitfields.c
index 51faa05f58552..031ed41e2aad6 100644
--- a/clang/test/Driver/ms-bitfields.c
+++ b/clang/test/Driver/ms-bitfields.c
@@ -6,4 +6,3 @@
 // MSBITFIELDS: -mms-bitfields
 // NO-MSBITFIELDS-NOT: -mms-bitfields
 
-// REQUIRES: clang-driver

diff  --git a/clang/test/Driver/offloading-interoperability.c b/clang/test/Driver/offloading-interoperability.c
index c3a72f0dfe2a1..ce4cde45d38af 100644
--- a/clang/test/Driver/offloading-interoperability.c
+++ b/clang/test/Driver/offloading-interoperability.c
@@ -1,4 +1,3 @@
-// REQUIRES: clang-driver
 // REQUIRES: powerpc-registered-target
 // REQUIRES: nvptx-registered-target
 

diff  --git a/clang/test/Driver/openmp-offload-gpu.c b/clang/test/Driver/openmp-offload-gpu.c
index a417f84f854a3..d276879f4f14e 100644
--- a/clang/test/Driver/openmp-offload-gpu.c
+++ b/clang/test/Driver/openmp-offload-gpu.c
@@ -2,7 +2,6 @@
 /// Perform several driver tests for OpenMP offloading
 ///
 
-// REQUIRES: clang-driver
 // REQUIRES: x86-registered-target
 // REQUIRES: powerpc-registered-target
 // REQUIRES: nvptx-registered-target

diff  --git a/clang/test/Driver/openmp-offload.c b/clang/test/Driver/openmp-offload.c
index 9f1be6105a7e3..7599007f2b178 100644
--- a/clang/test/Driver/openmp-offload.c
+++ b/clang/test/Driver/openmp-offload.c
@@ -2,7 +2,6 @@
 /// Perform several driver tests for OpenMP offloading
 ///
 
-// REQUIRES: clang-driver
 // REQUIRES: x86-registered-target
 // REQUIRES: powerpc-registered-target
 // REQUIRES: nvptx-registered-target

diff  --git a/clang/test/Driver/rocm-detect.cl b/clang/test/Driver/rocm-detect.cl
index e53e69ac40f61..d2fe8de9bf346 100644
--- a/clang/test/Driver/rocm-detect.cl
+++ b/clang/test/Driver/rocm-detect.cl
@@ -1,4 +1,3 @@
-// REQUIRES: clang-driver
 // REQUIRES: amdgpu-registered-target
 
 // Make sure the appropriate device specific library is available.

diff  --git a/clang/test/Driver/rocm-detect.hip b/clang/test/Driver/rocm-detect.hip
index 7166c42e9691e..c3ffd21a75b9b 100644
--- a/clang/test/Driver/rocm-detect.hip
+++ b/clang/test/Driver/rocm-detect.hip
@@ -1,4 +1,3 @@
-// REQUIRES: clang-driver
 // REQUIRES: x86-registered-target
 // REQUIRES: amdgpu-registered-target
 // UNSUPPORTED: system-windows

diff  --git a/clang/test/Driver/rocm-device-libs.cl b/clang/test/Driver/rocm-device-libs.cl
index 0f6e6a07acf9f..c536661f04153 100644
--- a/clang/test/Driver/rocm-device-libs.cl
+++ b/clang/test/Driver/rocm-device-libs.cl
@@ -1,4 +1,3 @@
-// REQUIRES: clang-driver
 // REQUIRES: amdgpu-registered-target
 // REQUIRES: !system-windows
 

diff  --git a/clang/test/Driver/rocm-not-found.cl b/clang/test/Driver/rocm-not-found.cl
index 2a2a2de37675d..afb7b1ba1aa00 100644
--- a/clang/test/Driver/rocm-not-found.cl
+++ b/clang/test/Driver/rocm-not-found.cl
@@ -1,4 +1,3 @@
-// REQUIRES: clang-driver
 
 // Check that we raise an error if we're trying to compile OpenCL for amdhsa code but can't
 // find a ROCm install, unless -nogpulib was passed.

diff  --git a/clang/test/Driver/stack-arg-probe.c b/clang/test/Driver/stack-arg-probe.c
index 97d2396dbebeb..232d29bc49595 100644
--- a/clang/test/Driver/stack-arg-probe.c
+++ b/clang/test/Driver/stack-arg-probe.c
@@ -1,7 +1,6 @@
 // RUN: %clang -### %s 2>&1 | FileCheck %s -check-prefix=STACKPROBE
 // RUN: %clang -### -mno-stack-arg-probe -mstack-arg-probe %s 2>&1 | FileCheck %s -check-prefix=STACKPROBE
 // RUN: %clang -### -mstack-arg-probe -mno-stack-arg-probe %s 2>&1 | FileCheck %s -check-prefix=NO-STACKPROBE
-// REQUIRES: clang-driver
 
 // NO-STACKPROBE: -mno-stack-arg-probe
 // STACKPROBE-NOT: -mno-stack-arg-probe

diff  --git a/clang/test/Driver/stackrealign.c b/clang/test/Driver/stackrealign.c
index 217be7a91fc67..70de40f13ed00 100644
--- a/clang/test/Driver/stackrealign.c
+++ b/clang/test/Driver/stackrealign.c
@@ -1,7 +1,6 @@
 // RUN: %clang -### %s 2>&1 | FileCheck %s -check-prefix=NO-REALIGN
 // RUN: %clang -### -mno-stackrealign -mstackrealign %s 2>&1 | FileCheck %s -check-prefix=REALIGN
 // RUN: %clang -### -mstackrealign -mno-stackrealign %s 2>&1 | FileCheck %s -check-prefix=NO-REALIGN
-// REQUIRES: clang-driver
 
 // REALIGN: -mstackrealign
 // NO-REALIGN-NOT: -mstackrealign

diff  --git a/clang/test/Driver/target-id-macros.cl b/clang/test/Driver/target-id-macros.cl
index 9b00b72101d63..71c33a5ebff1c 100644
--- a/clang/test/Driver/target-id-macros.cl
+++ b/clang/test/Driver/target-id-macros.cl
@@ -1,4 +1,3 @@
-// REQUIRES: clang-driver
 // REQUIRES: x86-registered-target
 // REQUIRES: amdgpu-registered-target
 

diff  --git a/clang/test/Driver/target-id-macros.hip b/clang/test/Driver/target-id-macros.hip
index c34545078908c..14b584181a067 100644
--- a/clang/test/Driver/target-id-macros.hip
+++ b/clang/test/Driver/target-id-macros.hip
@@ -1,4 +1,3 @@
-// REQUIRES: clang-driver
 // REQUIRES: x86-registered-target
 // REQUIRES: amdgpu-registered-target
 

diff  --git a/clang/test/Driver/target-id.cl b/clang/test/Driver/target-id.cl
index b9b5aab94a867..955f32f017056 100644
--- a/clang/test/Driver/target-id.cl
+++ b/clang/test/Driver/target-id.cl
@@ -1,4 +1,3 @@
-// REQUIRES: clang-driver
 // REQUIRES: x86-registered-target
 // REQUIRES: amdgpu-registered-target
 

diff  --git a/clang/test/Driver/thinlto.cu b/clang/test/Driver/thinlto.cu
index 1f82115d76b4d..d4f265baf3708 100644
--- a/clang/test/Driver/thinlto.cu
+++ b/clang/test/Driver/thinlto.cu
@@ -1,4 +1,3 @@
-// REQUIRES: clang-driver
 // REQUIRES: x86-registered-target
 // REQUIRES: nvptx-registered-target
 

diff  --git a/clang/test/Driver/warning-options_pedantic.cpp b/clang/test/Driver/warning-options_pedantic.cpp
index f3c9969c6c515..21d90fc2b5c45 100644
--- a/clang/test/Driver/warning-options_pedantic.cpp
+++ b/clang/test/Driver/warning-options_pedantic.cpp
@@ -8,6 +8,5 @@
 // RUN: %clang -### -pedantic -pedantic -no-pedantic -pedantic %s 2>&1 | FileCheck -check-prefix=PEDANTIC -check-prefix=DELIMITERS %s
 // RUN: %clang -### -pedantic -pedantic -no-pedantic -Wpedantic %s 2>&1 | FileCheck -check-prefix=NO_PEDANTIC -check-prefix=DELIMITERS %s
 // PEDANTIC: -pedantic
-// REQUIRES: clang-driver
 
 // DELIMITERS: {{^ *"}}

diff  --git a/clang/test/Driver/zos-driver-defaults.c b/clang/test/Driver/zos-driver-defaults.c
index 0afabbf5324c9..9ab9d09d54cab 100644
--- a/clang/test/Driver/zos-driver-defaults.c
+++ b/clang/test/Driver/zos-driver-defaults.c
@@ -1,6 +1,5 @@
 // RUN: %clang -### --target=s390x-none-zos -fsyntax-only %s 2>&1 | FileCheck --check-prefix=CHECK-SHORT-ENUMS %s
 // RUN: %clang -### --target=s390x-none-zos -fno-short-enums -fsyntax-only %s 2>&1 | FileCheck %s
-// REQUIRES: clang-driver
 
 //CHECK-SHORT-ENUMS: -fshort-enums
 //CHECK-SHORT-ENUMS: -fno-signed-char

diff  --git a/clang/test/Preprocessor/cuda-preprocess.cu b/clang/test/Preprocessor/cuda-preprocess.cu
index 84a7bcf2a12f9..da40c4c69fb34 100644
--- a/clang/test/Preprocessor/cuda-preprocess.cu
+++ b/clang/test/Preprocessor/cuda-preprocess.cu
@@ -1,6 +1,5 @@
 // Tests CUDA compilation with -E.
 
-// REQUIRES: clang-driver
 // REQUIRES: x86-registered-target
 // REQUIRES: nvptx-registered-target
 

diff  --git a/clang/test/Preprocessor/hip-host-cpu-macros.cu b/clang/test/Preprocessor/hip-host-cpu-macros.cu
index a15a10f8153fa..7c255103db02e 100644
--- a/clang/test/Preprocessor/hip-host-cpu-macros.cu
+++ b/clang/test/Preprocessor/hip-host-cpu-macros.cu
@@ -1,4 +1,3 @@
-// REQUIRES: clang-driver
 // REQUIRES: x86-registered-target
 // REQUIRES: amdgpu-registered-target
 


        


More information about the cfe-commits mailing list