diff --git a/llvm/lib/Passes/PassBuilder.cpp b/llvm/lib/Passes/PassBuilder.cpp index d8f08df29ab1b..5495016184376 100644 --- a/llvm/lib/Passes/PassBuilder.cpp +++ b/llvm/lib/Passes/PassBuilder.cpp @@ -135,6 +135,7 @@ #include "llvm/Transforms/Instrumentation/MemorySanitizer.h" #include "llvm/Transforms/Instrumentation/PGOInstrumentation.h" #include "llvm/Transforms/Instrumentation/PoisonChecking.h" +#include "llvm/Transforms/Instrumentation/SPIRITTAnnotations.h" #include "llvm/Transforms/Instrumentation/SanitizerCoverage.h" #include "llvm/Transforms/Instrumentation/ThreadSanitizer.h" #include "llvm/Transforms/ObjCARC.h" diff --git a/llvm/lib/Passes/PassRegistry.def b/llvm/lib/Passes/PassRegistry.def index 74f2a3f4cff2d..68edab288bfa6 100644 --- a/llvm/lib/Passes/PassRegistry.def +++ b/llvm/lib/Passes/PassRegistry.def @@ -123,6 +123,7 @@ MODULE_PASS("poison-checking", PoisonCheckingPass()) MODULE_PASS("pseudo-probe-update", PseudoProbeUpdatePass()) MODULE_PASS("LowerESIMD", SYCLLowerESIMDPass()) MODULE_PASS("ESIMDLowerVecArg", ESIMDLowerVecArgPass()) +MODULE_PASS("SPIRITTAnnotations", SPIRITTAnnotationsPass()) MODULE_PASS("deadargelim-sycl", DeadArgumentEliminationSYCLPass()) #undef MODULE_PASS diff --git a/llvm/test/Transforms/SPIRITTAnnotations/itt_atomic_load.ll b/llvm/test/Transforms/SPIRITTAnnotations/itt_atomic_load.ll index 1c4821d705f79..409b7c1f7c1d1 100644 --- a/llvm/test/Transforms/SPIRITTAnnotations/itt_atomic_load.ll +++ b/llvm/test/Transforms/SPIRITTAnnotations/itt_atomic_load.ll @@ -6,6 +6,7 @@ ;; clang++ -fsycl -fsycl-device-only load.cpp -o load.bc ; RUN: opt < %s --SPIRITTAnnotations -S | FileCheck %s +; RUN: opt < %s --SPIRITTAnnotations -enable-new-pm=1 -S | FileCheck %s ; ModuleID = 'load.bc' source_filename = "llvm-test-suite/SYCL/AtomicRef/load.cpp" diff --git a/llvm/test/Transforms/SPIRITTAnnotations/itt_atomic_store.ll b/llvm/test/Transforms/SPIRITTAnnotations/itt_atomic_store.ll index db36a9470e3e6..a469be93d7a24 100644 --- a/llvm/test/Transforms/SPIRITTAnnotations/itt_atomic_store.ll +++ b/llvm/test/Transforms/SPIRITTAnnotations/itt_atomic_store.ll @@ -6,6 +6,7 @@ ;; clang++ -fsycl -fsycl-device-only load.cpp -o load.bc ; RUN: opt < %s --SPIRITTAnnotations -S | FileCheck %s +; RUN: opt < %s --SPIRITTAnnotations -enable-new-pm=1 -S | FileCheck %s ; ModuleID = 'store.bc' source_filename = "llvm-test-suite/SYCL/AtomicRef/store.cpp" diff --git a/llvm/test/Transforms/SPIRITTAnnotations/itt_barrier.ll b/llvm/test/Transforms/SPIRITTAnnotations/itt_barrier.ll index 127af4562082a..09fe9c392dfa1 100644 --- a/llvm/test/Transforms/SPIRITTAnnotations/itt_barrier.ll +++ b/llvm/test/Transforms/SPIRITTAnnotations/itt_barrier.ll @@ -6,6 +6,7 @@ ;; clang++ -fsycl -fsycl-device-only kernel-and-program.cpp -o kernel_and_program_optimized.bc ; RUN: opt < %s --SPIRITTAnnotations -S | FileCheck %s +; RUN: opt < %s --SPIRITTAnnotations -enable-new-pm=1 -S | FileCheck %s ; ModuleID = 'kernel_and_program_optimized.bc' source_filename = "llvm-link" diff --git a/llvm/test/Transforms/SPIRITTAnnotations/itt_start_finish.ll b/llvm/test/Transforms/SPIRITTAnnotations/itt_start_finish.ll index 0999a31042207..7051ec96322cd 100644 --- a/llvm/test/Transforms/SPIRITTAnnotations/itt_start_finish.ll +++ b/llvm/test/Transforms/SPIRITTAnnotations/itt_start_finish.ll @@ -2,6 +2,7 @@ ;; are being added by SPIRITTAnnotations pass ; RUN: opt < %s --SPIRITTAnnotations -S | FileCheck %s +; RUN: opt < %s --SPIRITTAnnotations -enable-new-pm=1 -S | FileCheck %s ; ModuleID = 'synthetic.bc' source_filename = "synthetic.cpp"