Add check-clad-exec-only target

This commit adds a new verification target, 'check-clad-exec-only'. This target only verifies the 'CHECK-EXEC' filecheck checks. It is helpful during the development phase when derivative code is expected to change frequently. Fixes #874
vgvassilev · Apr 28, 2024 · 8a967cb · 8a967cb
1 parent d879f1b
commit 8a967cb
Show file tree

Hide file tree

Showing 112 changed files with 263 additions and 237 deletions.
diff --git a/test/Analyses/TBR.cpp b/test/Analyses/TBR.cpp
@@ -1,4 +1,4 @@
-// RUN: %cladclang -mllvm -debug-only=clad-tbr %s -I%S/../../include -oReverseLoops.out 2>&1 | FileCheck %s
+// RUN: %cladclang -mllvm -debug-only=clad-tbr %s -I%S/../../include -oReverseLoops.out 2>&1 | %filecheck %s
 // REQUIRES: asserts
 //CHECK-NOT: {{.*error|warning|note:.*}}
 

diff --git a/test/Arrays/ArrayInputsForwardMode.C b/test/Arrays/ArrayInputsForwardMode.C
@@ -1,5 +1,5 @@
-// RUN: %cladclang %s -I%S/../../include -oArrayInputsForwardMode.out 2>&1 | FileCheck %s
-// RUN: ./ArrayInputsForwardMode.out | FileCheck -check-prefix=CHECK-EXEC %s
+// RUN: %cladclang %s -I%S/../../include -oArrayInputsForwardMode.out 2>&1 | %filecheck %s
+// RUN: ./ArrayInputsForwardMode.out | %filecheck_exec %s
 
 //CHECK-NOT: {{.*error|warning|note:.*}}
 

diff --git a/test/Arrays/ArrayInputsReverseMode.C b/test/Arrays/ArrayInputsReverseMode.C
@@ -1,7 +1,7 @@
-// RUN: %cladclang %s -I%S/../../include -Wno-unused-value -oArrayInputsReverseMode.out 2>&1 | FileCheck %s
-// RUN: ./ArrayInputsReverseMode.out | FileCheck -check-prefix=CHECK-EXEC %s
+// RUN: %cladclang %s -I%S/../../include -Wno-unused-value -oArrayInputsReverseMode.out 2>&1 | %filecheck %s
+// RUN: ./ArrayInputsReverseMode.out | %filecheck_exec %s
 // RUN: %cladclang -Xclang -plugin-arg-clad -Xclang -enable-tbr %s -I%S/../../include -Wno-unused-value -oArrayInputsReverseMode.out
-// RUN: ./ArrayInputsReverseMode.out | FileCheck -check-prefix=CHECK-EXEC %s
+// RUN: ./ArrayInputsReverseMode.out | %filecheck_exec %s
 
 //CHECK-NOT: {{.*error|warning|note:.*}}
 

diff --git a/test/Arrays/ArrayInputsVectorForwardMode.C b/test/Arrays/ArrayInputsVectorForwardMode.C
@@ -1,5 +1,5 @@
-// RUN: %cladclang %s -I%S/../../include -oArrayInputsVectorForwardMode.out 2>&1 | FileCheck %s
-// RUN: ./ArrayInputsVectorForwardMode.out | FileCheck -check-prefix=CHECK-EXEC %s
+// RUN: %cladclang %s -I%S/../../include -oArrayInputsVectorForwardMode.out 2>&1 | %filecheck %s
+// RUN: ./ArrayInputsVectorForwardMode.out | %filecheck_exec %s
 
 // XFAIL: asserts
 

diff --git a/test/Arrays/Arrays.C b/test/Arrays/Arrays.C
@@ -1,7 +1,7 @@
-// RUN: %cladclang %s -I%S/../../include -oArrays.out 2>&1 | FileCheck %s
-// RUN: ./Arrays.out | FileCheck -check-prefix=CHECK-EXEC %s
+// RUN: %cladclang %s -I%S/../../include -oArrays.out 2>&1 | %filecheck %s
+// RUN: ./Arrays.out | %filecheck_exec %s
 // RUN: %cladclang -Xclang -plugin-arg-clad -Xclang -enable-tbr %s -I%S/../../include -oArrays.out
-// RUN: ./Arrays.out | FileCheck -check-prefix=CHECK-EXEC %s
+// RUN: ./Arrays.out | %filecheck_exec %s
 
 //CHECK-NOT: {{.*error|warning|note:.*}}
 

diff --git a/test/CMakeLists.txt b/test/CMakeLists.txt
@@ -24,6 +24,8 @@ if(CLAD_BUILT_STANDALONE)
   set(LLVM_LIBS_DIR ${LLVM_INSTALL_PREFIX}/lib/)
 endif()
 
+set(CLAD_FILECHECK_CHECK_EXEC_ONLY False)
+
 configure_lit_site_cfg(
   ${CMAKE_CURRENT_SOURCE_DIR}/lit.site.cfg.in
   ${CMAKE_CURRENT_BINARY_DIR}/lit.site.cfg
@@ -36,6 +38,12 @@ configure_lit_site_cfg(
   ${CMAKE_CURRENT_SOURCE_DIR}/Unit/lit.cfg.py
   )
 
+set(CLAD_FILECHECK_CHECK_EXEC_ONLY True)
+configure_lit_site_cfg(
+  ${CMAKE_CURRENT_SOURCE_DIR}/lit.site.cfg.in
+  ${CMAKE_CURRENT_BINARY_DIR}/CheckExecOnly/lit.site.cfg
+  )
+
 option(CLANG_TEST_USE_VG "Run Clang tests under Valgrind" OFF)
 if(CLANG_TEST_USE_VG)
   set(CLANG_TEST_EXTRA_ARGS ${CLANG_TEST_EXTRA_ARGS} "--vg")
@@ -74,6 +82,14 @@ add_lit_testsuite(check-clad "Running the Clad regression tests"
   )
 set_target_properties(check-clad PROPERTIES FOLDER "Clad tests")
 
+add_lit_testsuite(check-clad-exec-only "Running the Clad regression tests"
+  ${CMAKE_CURRENT_BINARY_DIR}/CheckExecOnly
+  LIT ${LIT_COMMAND}
+  PARAMS ${CLAD_TEST_PARAMS}
+  DEPENDS ${CLAD_TEST_DEPS}
+  ARGS ${CLAD_TEST_EXTRA_ARGS} --verbose --succinct
+  )
+
 add_lit_testsuites(CLAD ${CMAKE_CURRENT_SOURCE_DIR}
   PARAMS ${CLAD_TEST_PARAMS}
   DEPENDS ${CLAD_TEST_DEPS}

diff --git a/test/CUDA/ForwardMode.cu b/test/CUDA/ForwardMode.cu
@@ -1,6 +1,6 @@
 // RUN: %cladclang_cuda -I%S/../../include %s -xc++ %cudasmlevel \
 // RUN: --cuda-path=%cudapath -L/usr/local/cuda/lib64 -lcudart_static \
-// RUN: -ldl -lrt -pthread -lm -lstdc++ -oForwardMode.out 2>&1 | FileCheck %s
+// RUN: -ldl -lrt -pthread -lm -lstdc++ -oForwardMode.out 2>&1 | %filecheck %s
 
 // RUN: ./ForwardMode.out
 

diff --git a/test/CUDA/GradientCuda.cu b/test/CUDA/GradientCuda.cu
@@ -2,7 +2,7 @@
 // the device having all the dependencies also as device functions.
 
 // RUN: %cladclang_cuda -I%S/../../include  %s -fsyntax-only \
-// RUN: %cudasmlevel --cuda-path=%cudapath  -Xclang -verify 2>&1 | FileCheck %s
+// RUN: %cudasmlevel --cuda-path=%cudapath  -Xclang -verify 2>&1 | %filecheck %s
 
 // RUN: %cladclang_cuda -I%S/../../include %s -xc++ %cudasmlevel \
 // RUN: --cuda-path=%cudapath -L/usr/local/cuda/lib64 -lcudart_static \

diff --git a/test/Enzyme/DifferentCladEnzymeDerivatives.C b/test/Enzyme/DifferentCladEnzymeDerivatives.C
@@ -1,4 +1,4 @@
-// RUN: %cladclang %s -I%S/../../include -oDifferentCladEnzymeDerivatives.out | FileCheck %s
+// RUN: %cladclang %s -I%S/../../include -oDifferentCladEnzymeDerivatives.out | %filecheck %s
 // RUN: ./DifferentCladEnzymeDerivatives.out
 // CHECK-NOT: {{.*error|warning|note:.*}}
 // REQUIRES: Enzyme

diff --git a/test/Enzyme/ForwardMode.C b/test/Enzyme/ForwardMode.C
@@ -1,4 +1,4 @@
-// RUN: %cladclang %s -I%S/../../include -oEnzyme.out 2>&1 | FileCheck %s
+// RUN: %cladclang %s -I%S/../../include -oEnzyme.out 2>&1 | %filecheck %s
 // RUN: ./Enzyme.out
 // CHECK-NOT: {{.*error|warning|note:.*}}
 // REQUIRES: Enzyme

diff --git a/test/Enzyme/FunctionPrototypesReverseMode.C b/test/Enzyme/FunctionPrototypesReverseMode.C
@@ -1,5 +1,5 @@
-// RUN: %cladclang %s -I%S/../../include -oReverseMode.out | FileCheck %s
-// RUN: ./ReverseMode.out | FileCheck -check-prefix=CHECK-EXEC %s
+// RUN: %cladclang %s -I%S/../../include -oReverseMode.out | %filecheck %s
+// RUN: ./ReverseMode.out | %filecheck_exec %s
 // CHECK-NOT: {{.*error|warning|note:.*}}
 // REQUIRES: Enzyme
 

diff --git a/test/Enzyme/GradientsComparisonWithClad.C b/test/Enzyme/GradientsComparisonWithClad.C
@@ -1,5 +1,5 @@
-// RUN: %cladclang %s  -I%S/../../include -oEnzymeGradients.out 2>&1 | FileCheck %s
-// RUN: ./EnzymeGradients.out | FileCheck -check-prefix=CHECK-EXEC %s
+// RUN: %cladclang %s  -I%S/../../include -oEnzymeGradients.out 2>&1 | %filecheck %s
+// RUN: ./EnzymeGradients.out | %filecheck_exec %s
 // REQUIRES: Enzyme
 // CHECK-NOT: {{.*error|warning|note:.*}}
 

diff --git a/test/Enzyme/LoopsReverseModeComparisonWithClad.C b/test/Enzyme/LoopsReverseModeComparisonWithClad.C
@@ -1,5 +1,5 @@
-// RUN: %cladclang %s -I%S/../../include -oEnzymeLoops.out 2>&1 | FileCheck %s
-// RUN: ./EnzymeLoops.out | FileCheck -check-prefix=CHECK-EXEC %s
+// RUN: %cladclang %s -I%S/../../include -oEnzymeLoops.out 2>&1 | %filecheck %s
+// RUN: ./EnzymeLoops.out | %filecheck_exec %s
 // REQUIRES: Enzyme
 // CHECK-NOT: {{.*error|warning|note:.*}}
 

diff --git a/test/ErrorEstimation/Assignments.C b/test/ErrorEstimation/Assignments.C
@@ -1,4 +1,4 @@
-// RUN: %cladclang -I%S/../../include -oAssignments.out %s 2>&1 | FileCheck %s
+// RUN: %cladclang -I%S/../../include -oAssignments.out %s 2>&1 | %filecheck %s
 // RUN: ./Assignments.out
 // CHECK-NOT: {{.*error|warning|note:.*}}
 

diff --git a/test/ErrorEstimation/BasicOps.C b/test/ErrorEstimation/BasicOps.C
@@ -1,4 +1,4 @@
-// RUN: %cladclang %s -I%S/../../include -fsyntax-only -Xclang -verify 2>&1 | FileCheck %s
+// RUN: %cladclang %s -I%S/../../include -fsyntax-only -Xclang -verify 2>&1 | %filecheck %s
 //CHECK-NOT: {{.*error|warning|note:.*}}
 
 #include "clad/Differentiator/Differentiator.h"

diff --git a/test/ErrorEstimation/ConditonalStatements.C b/test/ErrorEstimation/ConditonalStatements.C
@@ -1,4 +1,4 @@
-// RUN: %cladclang -I%S/../../include -oCondStmts.out %s 2>&1 | FileCheck %s
+// RUN: %cladclang -I%S/../../include -oCondStmts.out %s 2>&1 | %filecheck %s
 // CHECK-NOT: {{.*error|warning|note:.*}}
 
 #include "clad/Differentiator/Differentiator.h"

diff --git a/test/ErrorEstimation/LoopsAndArrays.C b/test/ErrorEstimation/LoopsAndArrays.C
@@ -1,4 +1,4 @@
-// RUN: %cladclang -I%S/../../include -oLoopsAndArrays.out %s 2>&1 | FileCheck %s
+// RUN: %cladclang -I%S/../../include -oLoopsAndArrays.out %s 2>&1 | %filecheck %s
 // CHECK-NOT: {{.*error|warning|note:.*}}
 
 #include "clad/Differentiator/Differentiator.h"

diff --git a/test/ErrorEstimation/LoopsAndArraysExec.C b/test/ErrorEstimation/LoopsAndArraysExec.C
@@ -1,5 +1,5 @@
-// RUN: %cladclang %s -I%S/../../include -oLoopsAndArraysExec.out 2>&1 | FileCheck %s
-// RUN: ./LoopsAndArraysExec.out | FileCheck -check-prefix=CHECK-EXEC %s
+// RUN: %cladclang %s -I%S/../../include -oLoopsAndArraysExec.out 2>&1 | %filecheck %s
+// RUN: ./LoopsAndArraysExec.out | %filecheck_exec %s
 
 // CHECK-NOT: {{.*error|warning|note:.*}}
 

diff --git a/test/FirstDerivative/Assignments.C b/test/FirstDerivative/Assignments.C
@@ -1,4 +1,4 @@
-// RUN: %cladclang %s -I%S/../../include -oAssignments.out 2>&1 | FileCheck %s
+// RUN: %cladclang %s -I%S/../../include -oAssignments.out 2>&1 | %filecheck %s
 // RUN: ./Assignments.out
 //CHECK-NOT: {{.*error|warning|note:.*}}
 

diff --git a/test/FirstDerivative/BasicArithmeticAddSub.C b/test/FirstDerivative/BasicArithmeticAddSub.C
@@ -1,5 +1,5 @@
-// RUN: %cladclang %s -I%S/../../include -oBasicArithmeticAddSub.out 2>&1 | FileCheck %s
-// RUN: ./BasicArithmeticAddSub.out | FileCheck -check-prefix=CHECK-EXEC %s
+// RUN: %cladclang %s -I%S/../../include -oBasicArithmeticAddSub.out 2>&1 | %filecheck %s
+// RUN: ./BasicArithmeticAddSub.out | %filecheck_exec %s
 
 //CHECK-NOT: {{.*error|warning|note:.*}}
 

diff --git a/test/FirstDerivative/BasicArithmeticAll.C b/test/FirstDerivative/BasicArithmeticAll.C
@@ -1,5 +1,5 @@
-// RUN: %cladclang %s -I%S/../../include -oBasicArithmeticAll.out 2>&1 | FileCheck %s
-// RUN: ./BasicArithmeticAll.out | FileCheck -check-prefix=CHECK-EXEC %s
+// RUN: %cladclang %s -I%S/../../include -oBasicArithmeticAll.out 2>&1 | %filecheck %s
+// RUN: ./BasicArithmeticAll.out | %filecheck_exec %s
 
 //CHECK-NOT: {{.*error|warning|note:.*}}
 

diff --git a/test/FirstDerivative/BasicArithmeticMulDiv.C b/test/FirstDerivative/BasicArithmeticMulDiv.C
@@ -1,5 +1,5 @@
 // RUN: %cladclang %s -I%S/../../include -oBasicArithmeticMulDiv.out 2>&1 | FileCheck  %s
-// RUN: ./BasicArithmeticMulDiv.out | FileCheck -check-prefix=CHECK-EXEC %s
+// RUN: ./BasicArithmeticMulDiv.out | %filecheck_exec %s
 
 //CHECK-NOT: {{.*error|warning|note:.*}}
 

diff --git a/test/FirstDerivative/BuiltinDerivatives.C b/test/FirstDerivative/BuiltinDerivatives.C
@@ -1,7 +1,7 @@
-// RUN: %cladclang %s -I%S/../../include -Xclang -verify -oBuiltinDerivatives.out 2>&1 | FileCheck %s
-// RUN: ./BuiltinDerivatives.out | FileCheck -check-prefix=CHECK-EXEC %s
+// RUN: %cladclang %s -I%S/../../include -Xclang -verify -oBuiltinDerivatives.out 2>&1 | %filecheck %s
+// RUN: ./BuiltinDerivatives.out | %filecheck_exec %s
 // RUN: %cladclang -Xclang -plugin-arg-clad -Xclang -enable-tbr %s -I%S/../../include -Xclang -verify -oBuiltinDerivatives.out
-// RUN: ./BuiltinDerivatives.out | FileCheck -check-prefix=CHECK-EXEC %s
+// RUN: ./BuiltinDerivatives.out | %filecheck_exec %s
 
 //CHECK-NOT: {{.*error|warning|note:.*}}
 

diff --git a/test/FirstDerivative/CallArguments.C b/test/FirstDerivative/CallArguments.C
@@ -1,5 +1,5 @@
-// RUN: %cladclang %s -I%S/../../include -Xclang -verify -oCallArguments.out 2>&1 | FileCheck %s
-// RUN: ./CallArguments.out | FileCheck -check-prefix=CHECK-EXEC %s
+// RUN: %cladclang %s -I%S/../../include -Xclang -verify -oCallArguments.out 2>&1 | %filecheck %s
+// RUN: ./CallArguments.out | %filecheck_exec %s
 
 //CHECK-NOT: {{.*error|warning|note:.*}}
 

diff --git a/test/FirstDerivative/ClassMethodCall.C b/test/FirstDerivative/ClassMethodCall.C
@@ -1,5 +1,5 @@
-// RUN: %cladclang %s -I%S/../../include -oClassMethods.out 2>&1 | FileCheck %s
-// RUN: ./ClassMethods.out | FileCheck -check-prefix=CHECK-EXEC %s
+// RUN: %cladclang %s -I%S/../../include -oClassMethods.out 2>&1 | %filecheck %s
+// RUN: ./ClassMethods.out | %filecheck_exec %s
 // Fails on clang-18 due to https://github.com/llvm/llvm-project/issues/87151
 // XFAIL: clang-18
 //CHECK-NOT: {{.*error|warning|note:.*}}

diff --git a/test/FirstDerivative/CodeGenSimple.C b/test/FirstDerivative/CodeGenSimple.C
@@ -1,5 +1,5 @@
-// RUN: %cladclang %s -I%S/../../include -oCodeGenSimple.out 2>&1 | FileCheck %s
-// RUN: ./CodeGenSimple.out | FileCheck -check-prefix=CHECK-EXEC %s
+// RUN: %cladclang %s -I%S/../../include -oCodeGenSimple.out 2>&1 | %filecheck %s
+// RUN: ./CodeGenSimple.out | %filecheck_exec %s
 
 //CHECK-NOT: {{.*error|warning|note:.*}}
 

diff --git a/test/FirstDerivative/CompoundAssignments.C b/test/FirstDerivative/CompoundAssignments.C
@@ -1,4 +1,4 @@
-// RUN: %cladclang %s -I%S/../../include -oCompoundAssignments.out 2>&1 | FileCheck %s
+// RUN: %cladclang %s -I%S/../../include -oCompoundAssignments.out 2>&1 | %filecheck %s
 // RUN: ./CompoundAssignments.out
 //CHECK-NOT: {{.*error|warning|note:.*}}
 

diff --git a/test/FirstDerivative/DependencyTracking.C b/test/FirstDerivative/DependencyTracking.C
@@ -1,4 +1,4 @@
-// RUN: %cladclang %s -I%S/../../include 2>&1 -fsyntax-only | FileCheck %s
+// RUN: %cladclang %s -I%S/../../include 2>&1 -fsyntax-only | %filecheck %s
 
 //CHECK-NOT: {{.*error|warning|note:.*}}
 #include "clad/Differentiator/Differentiator.h"

diff --git a/test/FirstDerivative/DiffInterface.C b/test/FirstDerivative/DiffInterface.C
@@ -1,4 +1,4 @@
-// RUN: %cladclang %s -I%S/../../include -fsyntax-only -Xclang -verify 2>&1 | FileCheck %s
+// RUN: %cladclang %s -I%S/../../include -fsyntax-only -Xclang -verify 2>&1 | %filecheck %s
 
 #include "clad/Differentiator/Differentiator.h"
 

diff --git a/test/FirstDerivative/FunctionCalls.C b/test/FirstDerivative/FunctionCalls.C
@@ -1,4 +1,4 @@
-// RUN: %cladnumdiffclang %s -I%S/../../include -fsyntax-only -Xclang -verify 2>&1 | FileCheck %s
+// RUN: %cladnumdiffclang %s -I%S/../../include -fsyntax-only -Xclang -verify 2>&1 | %filecheck %s
 
 //CHECK-NOT: {{.*error|warning|note:.*}}
 

diff --git a/test/FirstDerivative/FunctionCallsWithResults.C b/test/FirstDerivative/FunctionCallsWithResults.C
@@ -1,5 +1,5 @@
-// RUN: %cladclang %s -I%S/../../include -oFunctionCallsWithResults.out 2>&1 | FileCheck %s
-// RUN: ./FunctionCallsWithResults.out | FileCheck -check-prefix=CHECK-EXEC %s
+// RUN: %cladclang %s -I%S/../../include -oFunctionCallsWithResults.out 2>&1 | %filecheck %s
+// RUN: ./FunctionCallsWithResults.out | %filecheck_exec %s
 
 #include "clad/Differentiator/Differentiator.h"
 #include <random>

diff --git a/test/FirstDerivative/FunctionsInNamespaces.C b/test/FirstDerivative/FunctionsInNamespaces.C
@@ -1,5 +1,5 @@
-// RUN: %cladclang %s -I%S/../../include -oFunctionsInNamespaces.out 2>&1 | FileCheck %s
-// RUN: ./FunctionsInNamespaces.out | FileCheck -check-prefix=CHECK-EXEC %s
+// RUN: %cladclang %s -I%S/../../include -oFunctionsInNamespaces.out 2>&1 | %filecheck %s
+// RUN: ./FunctionsInNamespaces.out | %filecheck_exec %s
 
 // CHECK-NOT: {{.*error|warning|note:.*}}
 #include "clad/Differentiator/Differentiator.h"

diff --git a/test/FirstDerivative/FunctionsOneVariable.C b/test/FirstDerivative/FunctionsOneVariable.C
@@ -1,4 +1,4 @@
-// RUN: %cladclang %s -I%S/../../include -fsyntax-only -Xclang -verify 2>&1 | FileCheck %s
+// RUN: %cladclang %s -I%S/../../include -fsyntax-only -Xclang -verify 2>&1 | %filecheck %s
 
 #include "clad/Differentiator/Differentiator.h"
 

diff --git a/test/FirstDerivative/Loops.C b/test/FirstDerivative/Loops.C
@@ -1,5 +1,5 @@
-// RUN: %cladclang %s -std=c++17 -I%S/../../include -oLoops.out 2>&1 | FileCheck %s
-// RUN: ./Loops.out | FileCheck -check-prefix=CHECK-EXEC %s
+// RUN: %cladclang %s -std=c++17 -I%S/../../include -oLoops.out 2>&1 | %filecheck %s
+// RUN: ./Loops.out | %filecheck_exec %s
 // CHECK-NOT: {{.*error|warning|note:.*}}
 
 #include "clad/Differentiator/Differentiator.h"

diff --git a/test/FirstDerivative/Namespaces.C b/test/FirstDerivative/Namespaces.C
@@ -1,4 +1,4 @@
-// RUN: %cladclang %s -I%S/../../include -oNamespaces.out 2>&1 | FileCheck %s
+// RUN: %cladclang %s -I%S/../../include -oNamespaces.out 2>&1 | %filecheck %s
 // RUN: ./Namespaces.out
 //CHECK-NOT: {{.*error|warning|note:.*}}
 

diff --git a/test/FirstDerivative/NonContinuous.C b/test/FirstDerivative/NonContinuous.C
@@ -1,5 +1,5 @@
-// RUN: %cladclang %s -I%S/../../include -oNonContinuous.out 2>&1 | FileCheck %s
-// RUN: ./NonContinuous.out | FileCheck -check-prefix=CHECK-EXEC %s
+// RUN: %cladclang %s -I%S/../../include -oNonContinuous.out 2>&1 | %filecheck %s
+// RUN: ./NonContinuous.out | %filecheck_exec %s
 
 //CHECK-NOT: {{.*error|warning|note:.*}}
 

diff --git a/test/FirstDerivative/Overloads.C b/test/FirstDerivative/Overloads.C
@@ -1,5 +1,5 @@
-// RUN: %cladclang %s -I%S/../../include -oOverloads.out 2>&1 | FileCheck %s
-// RUN: ./Overloads.out | FileCheck -check-prefix=CHECK-EXEC %s
+// RUN: %cladclang %s -I%S/../../include -oOverloads.out 2>&1 | %filecheck %s
+// RUN: ./Overloads.out | %filecheck_exec %s
 // XFAIL: asserts
 //CHECK-NOT: {{.*error|warning|note:.*}}
 // XFAIL: target={{i586.*}}

diff --git a/test/FirstDerivative/Recursive.C b/test/FirstDerivative/Recursive.C
@@ -1,5 +1,5 @@
-// RUN: %cladclang %s -I%S/../../include -oRecursive.out 2>&1 | FileCheck %s
-// RUN: ./Recursive.out | FileCheck -check-prefix=CHECK-EXEC %s
+// RUN: %cladclang %s -I%S/../../include -oRecursive.out 2>&1 | %filecheck %s
+// RUN: ./Recursive.out | %filecheck_exec %s
 
 //CHECK-NOT: {{.*error|warning|note:.*}}
 

diff --git a/test/FirstDerivative/StructGlobalObjects.C b/test/FirstDerivative/StructGlobalObjects.C
@@ -1,4 +1,4 @@
-// RUN: %cladclang %s -I%S/../../include 2>&1 | FileCheck %s
+// RUN: %cladclang %s -I%S/../../include 2>&1 | %filecheck %s
 //CHECK-NOT: {{.*error|warning|note:.*}}
 
 #include "clad/Differentiator/Differentiator.h"

diff --git a/test/FirstDerivative/StructMethodCall.C b/test/FirstDerivative/StructMethodCall.C
@@ -1,5 +1,5 @@
-// RUN: %cladclang %s -I%S/../../include -oStructMethodCall.out 2>&1 | FileCheck %s
-// RUN: ./StructMethodCall.out | FileCheck -check-prefix=CHECK-EXEC %s
+// RUN: %cladclang %s -I%S/../../include -oStructMethodCall.out 2>&1 | %filecheck %s
+// RUN: ./StructMethodCall.out | %filecheck_exec %s
 //CHECK-NOT: {{.*error|warning|note:.*}}
 
 #include "clad/Differentiator/Differentiator.h"

diff --git a/test/FirstDerivative/Switch.C b/test/FirstDerivative/Switch.C
@@ -1,5 +1,5 @@
-// RUN: %cladclang %s -I%S/../../include -oSwitch.out 2>&1 | FileCheck %s
-// RUN: ./Switch.out | FileCheck -check-prefix=CHECK-EXEC %s
+// RUN: %cladclang %s -I%S/../../include -oSwitch.out 2>&1 | %filecheck %s
+// RUN: ./Switch.out | %filecheck_exec %s
 //CHECK-NOT: {{.*error|warning|note:.*}}
 
 #include "clad/Differentiator/Differentiator.h"

diff --git a/test/FirstDerivative/SwitchInit.C b/test/FirstDerivative/SwitchInit.C
@@ -1,5 +1,5 @@
-// RUN: %cladclang %s -I%S/../../include -std=c++17 -oSwitchInit.out 2>&1 | FileCheck %s
-// RUN: ./SwitchInit.out | FileCheck -check-prefix=CHECK-EXEC %s
+// RUN: %cladclang %s -I%S/../../include -std=c++17 -oSwitchInit.out 2>&1 | %filecheck %s
+// RUN: ./SwitchInit.out | %filecheck_exec %s
 //CHECK-NOT: {{.*error|warning|note:.*}}
 
 #include "clad/Differentiator/Differentiator.h"

diff --git a/test/FirstDerivative/TemplateFunction.C b/test/FirstDerivative/TemplateFunction.C
@@ -1,4 +1,4 @@
-// RUN: %cladclang %s -I%S/../../include 2>&1 | FileCheck %s
+// RUN: %cladclang %s -I%S/../../include 2>&1 | %filecheck %s
 //CHECK-NOT: {{.*error|warning|note:.*}}
 
 #include "clad/Differentiator/Differentiator.h"

diff --git a/test/FirstDerivative/UnsupportedOpsWarn.C b/test/FirstDerivative/UnsupportedOpsWarn.C
@@ -1,4 +1,4 @@
-// RUN: %cladclang %s -I%S/../../include -fsyntax-only -Xclang -verify 2>&1 | FileCheck %s
+// RUN: %cladclang %s -I%S/../../include -fsyntax-only -Xclang -verify 2>&1 | %filecheck %s
 // RUN: %cladclang -Xclang -plugin-arg-clad -Xclang -enable-tbr %s -I%S/../../include -fsyntax-only -Xclang -verify
 
 #include "clad/Differentiator/Differentiator.h"

diff --git a/test/FirstDerivative/Variables.C b/test/FirstDerivative/Variables.C
@@ -1,4 +1,4 @@
-// RUN: %cladclang %s -I%S/../../include -oVariables.out 2>&1 | FileCheck %s
+// RUN: %cladclang %s -I%S/../../include -oVariables.out 2>&1 | %filecheck %s
 // RUN: ./Variables.out
 //CHECK-NOT: {{.*error|warning|note:.*}}
 

diff --git a/test/FirstDerivative/VirtualMethodsCall.C b/test/FirstDerivative/VirtualMethodsCall.C
@@ -1,5 +1,5 @@
-// RUN: %cladclang %s -I%S/../../include -oVirtualMethodsCall.out 2>&1 | FileCheck %s
-// RUN: ./VirtualMethodsCall.out | FileCheck -check-prefix=CHECK-EXEC %s
+// RUN: %cladclang %s -I%S/../../include -oVirtualMethodsCall.out 2>&1 | %filecheck %s
+// RUN: ./VirtualMethodsCall.out | %filecheck_exec %s
 // XFAIL: asserts
 // Fails on clang-18 due to https://github.com/llvm/llvm-project/issues/87151
 // XFAIL: clang-18

diff --git a/test/ForwardMode/Casts.C b/test/ForwardMode/Casts.C
@@ -1,5 +1,5 @@
-// RUN: %cladclang %s -I%S/../../include -oCasts.out 2>&1 | FileCheck %s
-// RUN: ./Casts.out | FileCheck -check-prefix=CHECK-EXEC %s
+// RUN: %cladclang %s -I%S/../../include -oCasts.out 2>&1 | %filecheck %s
+// RUN: ./Casts.out | %filecheck_exec %s
 // CHECK-NOT: {{.*error|warning|note:.*}}
 
 #include "clad/Differentiator/Differentiator.h"

diff --git a/test/ForwardMode/Functors.C b/test/ForwardMode/Functors.C
@@ -1,5 +1,5 @@
-// RUN: %cladclang %s -I%S/../../include -oFunctors.out 2>&1 | FileCheck %s
-// RUN: ./Functors.out | FileCheck -check-prefix=CHECK-EXEC %s
+// RUN: %cladclang %s -I%S/../../include -oFunctors.out 2>&1 | %filecheck %s
+// RUN: ./Functors.out | %filecheck_exec %s
 // CHECK-NOT: {{.*error|warning|note:.*}}
 
 #include "clad/Differentiator/Differentiator.h"