Modify tests for execute with new-pm plugin

.
intel · Dec 18, 2024 · ac5bbd1 · ac5bbd1
1 parent 4a967b4
commit ac5bbd1
Show file tree

Hide file tree

Showing 160 changed files with 816 additions and 334 deletions.
diff --git a/IGC/VectorCompiler/include/GenXPassRegistry.def b/IGC/VectorCompiler/include/GenXPassRegistry.def
@@ -40,5 +40,6 @@ FUNCTION_PASS("GenXStatePointerFence", GenXStatePointerFencePass())
 FUNCTION_PASS("CMLowerVLoadVStore", CMLowerVLoadVStorePass())
 FUNCTION_PASS("GenXTypeLegalization", GenXTypeLegalizationPass())
 FUNCTION_PASS("GenXTranslateIntrinsics", GenXTranslateIntrinsicsPass())
+FUNCTION_PASS("GenXLowerAggrCopies", GenXLowerAggrCopiesPass())
 
 #undef FUNCTION_PASS
diff --git a/IGC/VectorCompiler/include/vc/GenXOpts/CMABI.h b/IGC/VectorCompiler/include/vc/GenXOpts/CMABI.h
@@ -10,6 +10,7 @@ SPDX-License-Identifier: MIT
 
 namespace llvm {
 void initializeCMABIPass(PassRegistry &);
+void initializeCMABILegacyPass(PassRegistry &);
 }
 
 struct CMABIPass : public llvm::PassInfoMixin<CMABIPass> {

diff --git a/IGC/VectorCompiler/include/vc/GenXOpts/GenXOptsNewPM.h b/IGC/VectorCompiler/include/vc/GenXOpts/GenXOptsNewPM.h
@@ -45,7 +45,6 @@ class PassRegistry;
 #include "GenXPrintfPhiClonning.h"
 #include "GenXPrintfResolution.h"
 #include "GenXSimplify.h"
-#include "GenXStatePointerFence.h"
 #include "GenXTrampolineInsertion.h"
 #include "GenXTranslateIntrinsics.h"
 #include "GenXTranslateSPIRVBuiltins.h"

diff --git a/IGC/VectorCompiler/lib/GenXCodeGen/GenXLowerAggrCopies.cpp b/IGC/VectorCompiler/lib/GenXCodeGen/GenXLowerAggrCopies.cpp
@@ -223,10 +223,14 @@ bool GenXLowerAggrCopies::runOnFunction(Function &F) {
       if (doLinearExpand) {
         expandMemMov2VecLoadStore(Memcpy);
       } else {
-#if LLVM_VERSION_MAJOR < 16
+#if LLVM_VERSION_MAJOR >= 16
+        if (!TTIp) {
+            const TargetTransformInfo &TTI = getAnalysis<TargetTransformInfoWrapperPass>().getTTI(F);
+#endif
         expandMemCpyAsLoop(Memcpy, TTI);
-#else
-        expandMemCpyAsLoop(Memcpy, *TTIp);
+#if LLVM_VERSION_MAJOR >= 16
+        }
+        else expandMemCpyAsLoop(Memcpy, *TTIp);
 #endif
       }
     } else if (MemMoveInst *Memmove = dyn_cast<MemMoveInst>(MemCall)) {

diff --git a/IGC/VectorCompiler/lib/GenXCodeGen/GenXTargetMachine.cpp b/IGC/VectorCompiler/lib/GenXCodeGen/GenXTargetMachine.cpp
@@ -199,6 +199,7 @@ void initializeGenXPasses(PassRegistry &registry) {
 #if LLVM_VERSION_MAJOR < 16
   initializeCMABILegacyPass(registry);
 #else  // LLVM_VERSION_MAJOR < 16
+  initializeCMABILegacyPass(registry);
   initializeCMABIPass(registry);
 #endif // LLVM_VERSION_MAJOR < 16
   initializeCMLowerVLoadVStorePass(registry);

diff --git a/IGC/VectorCompiler/lib/GenXCodeGen/Utils/CMakeLists.txt b/IGC/VectorCompiler/lib/GenXCodeGen/Utils/CMakeLists.txt
@@ -12,9 +12,6 @@ set(CISA_JSON_FILE "${CMAKE_CURRENT_SOURCE_DIR}/cisa_gen_intrinsics.json")
 set(CISA_OUT_PATH "${CMAKE_CURRENT_BINARY_DIR}/../")
 set(CISA_OUT_FILES "${CISA_OUT_PATH}/GenXIntrinsicInfoTable.inc"
                    "${CISA_OUT_PATH}/GenXIntrinsicsBuildMap.inc")
-message(" >>${CISA_OUT_PATH}<<  ->  ${CMAKE_CURRENT_BINARY_DIR}")
-message(" COMMAND ->  ${PYTHON_EXECUTABLE} ${CISA_GEN_INTRINSICS} ${CISA_JSON_FILE} ${CISA_OUT_PATH} <-")
-message(" ${CMAKE_CURRENT_SOURCE_DIR}")
 add_custom_command(
     OUTPUT ${CISA_OUT_FILES}
     COMMAND ${PYTHON_EXECUTABLE} ${CISA_GEN_INTRINSICS} ${CISA_JSON_FILE} ${CISA_OUT_PATH}

diff --git a/IGC/VectorCompiler/lib/GenXOpts/CMTrans/CMABI.cpp b/IGC/VectorCompiler/lib/GenXOpts/CMTrans/CMABI.cpp
@@ -1065,11 +1065,11 @@ void CMABIBase<CallGraphImpl>::diagnoseOverlappingArgs(CallInst *CI) {
 
 char CMABILegacy::ID = 0;
 // Can't template CMABILegacy here
-INITIALIZE_PASS_BEGIN(CMABILegacy, "CMABI",
+INITIALIZE_PASS_BEGIN(CMABILegacy, "CMABILegacy",
                       "Fix ABI issues for the genx backend", false, false)
 INITIALIZE_PASS_DEPENDENCY(CallGraphWrapperPass)
 INITIALIZE_PASS_DEPENDENCY(CMABIAnalysis)
-INITIALIZE_PASS_END(CMABILegacy, "CMABI", "Fix ABI issues for the genx backend",
+INITIALIZE_PASS_END(CMABILegacy, "CMABILegacy", "Fix ABI issues for the genx backend",
                     false, false)
 
 #if LLVM_VERSION_MAJOR >= 16

diff --git a/IGC/VectorCompiler/lib/GenXOpts/CMTrans/GenXBTIAssignment.cpp b/IGC/VectorCompiler/lib/GenXOpts/CMTrans/GenXBTIAssignment.cpp
@@ -128,9 +128,7 @@ ModulePass *createGenXBTIAssignmentPass() {
   return new GenXBTIAssignment();
 }
 } // namespace llvm
-#endif
-
-#if LLVM_VERSION_MAJOR >= 16
+#else // LLVM_VERSION_MAJOR < 16
 PreservedAnalyses
 GenXBTIAssignmentPass::run(llvm::Module &M,
                            llvm::AnalysisManager<llvm::Module> &AM) {

diff --git a/IGC/VectorCompiler/lib/PassPluginLibrary/Plugin.cpp b/IGC/VectorCompiler/lib/PassPluginLibrary/Plugin.cpp
@@ -9,6 +9,7 @@ SPDX-License-Identifier: MIT
 #include "llvm/Passes/PassBuilder.h"
 #include "llvm/Passes/PassPlugin.h"
 
+#include "vc/GenXCodeGen/GenXLowerAggrCopies.h"
 #include "vc/GenXCodeGen/GenXVerify.h"
 #include "vc/GenXOpts/GenXOptsNewPM.h"
 #include "vc/Support/BackendConfig.h"

diff --git a/IGC/VectorCompiler/test/BTIAssignment/debug_shift.ll b/IGC/VectorCompiler/test/BTIAssignment/debug_shift.ll
@@ -8,10 +8,16 @@
 
 ; Check that bti assignment starts from 1 if debuggable kernels needed.
 
-; RUN: %opt_typed_ptrs %use_old_pass_manager% %pass_pref%GenXBTIAssignment -vc-reserve-bti-zero -march=genx64 -mcpu=Gen9 -S < %s | FileCheck %s --check-prefix=CHECK_RESERVE
-; RUN: %opt_opaque_ptrs %use_old_pass_manager% %pass_pref%GenXBTIAssignment -vc-reserve-bti-zero -march=genx64 -mcpu=Gen9 -S < %s | FileCheck %s --check-prefix=CHECK_RESERVE
-; RUN: %opt_typed_ptrs %use_old_pass_manager% %pass_pref%GenXBTIAssignment  -march=genx64 -mcpu=Gen9 -S < %s | FileCheck %s --check-prefix=CHECK_NO_RESERVE
-; RUN: %opt_opaque_ptrs %use_old_pass_manager% %pass_pref%GenXBTIAssignment  -march=genx64 -mcpu=Gen9 -S < %s | FileCheck %s --check-prefix=CHECK_NO_RESERVE
+; RUN: %opt_legacy_typed %use_old_pass_manager% -GenXBTIAssignment -vc-reserve-bti-zero -march=genx64 -mcpu=Gen9 -S < %s | FileCheck %s --check-prefix=CHECK_RESERVE
+; RUN: %opt_legacy_opaque %use_old_pass_manager% -GenXBTIAssignment -vc-reserve-bti-zero -march=genx64 -mcpu=Gen9 -S < %s | FileCheck %s --check-prefix=CHECK_RESERVE
+; RUN: %opt_legacy_typed %use_old_pass_manager% -GenXBTIAssignment  -march=genx64 -mcpu=Gen9 -S < %s | FileCheck %s --check-prefix=CHECK_NO_RESERVE
+; RUN: %opt_legacy_opaque %use_old_pass_manager% -GenXBTIAssignment  -march=genx64 -mcpu=Gen9 -S < %s | FileCheck %s --check-prefix=CHECK_NO_RESERVE
+
+; RUN: %opt_new_pm_typed -passes=GenXBTIAssignment -vc-reserve-bti-zero -march=genx64 -mcpu=Gen9 -S < %s | FileCheck %s --check-prefix=CHECK_RESERVE
+; RUN: %opt_new_pm_opaque -passes=GenXBTIAssignment -vc-reserve-bti-zero -march=genx64 -mcpu=Gen9 -S < %s | FileCheck %s --check-prefix=CHECK_RESERVE
+; RUN: %opt_new_pm_typed -passes=GenXBTIAssignment -march=genx64 -mcpu=Gen9 -S < %s | FileCheck %s --check-prefix=CHECK_NO_RESERVE
+; RUN: %opt_new_pm_opaque -passes=GenXBTIAssignment -march=genx64 -mcpu=Gen9 -S < %s | FileCheck %s --check-prefix=CHECK_NO_RESERVE
+
 
 target datalayout = "e-p:64:64-i64:64-n8:16:32:64"
 target triple = "spir64-unknown-unknown"

diff --git a/IGC/VectorCompiler/test/BTIAssignment/i32_arg_bindless.ll b/IGC/VectorCompiler/test/BTIAssignment/i32_arg_bindless.ll
@@ -9,10 +9,15 @@
 ; Check that bti is assigned to i32 state arguments and
 ; bindless buffers are still passed as kernel arguments.
 
-; RUN: %opt_typed_ptrs %use_old_pass_manager% %pass_pref%GenXBTIAssignment -vc-use-bindless-buffers -march=genx64 -mcpu=Gen9 -S < %s | FileCheck %s --check-prefixes=BUF,CHECK-TYPED-PTRS
-; RUN: %opt_opaque_ptrs %use_old_pass_manager% %pass_pref%GenXBTIAssignment -vc-use-bindless-buffers -march=genx64 -mcpu=Gen9 -S < %s | FileCheck %s --check-prefixes=BUF,CHECK-OPAQUE-PTRS
-; RUN: %opt_typed_ptrs %use_old_pass_manager% %pass_pref%GenXBTIAssignment -vc-use-bindless-images -march=genx64 -mcpu=Gen9 -S < %s | FileCheck %s --check-prefixes=IMG,CHECK-TYPED-PTRS
-; RUN: %opt_opaque_ptrs %use_old_pass_manager% %pass_pref%GenXBTIAssignment -vc-use-bindless-images -march=genx64 -mcpu=Gen9 -S < %s | FileCheck %s --check-prefixes=IMG,CHECK-OPAQUE-PTRS
+; RUN: %opt_legacy_typed %use_old_pass_manager% -GenXBTIAssignment -vc-use-bindless-buffers -march=genx64 -mcpu=Gen9 -S < %s | FileCheck %s --check-prefixes=BUF,CHECK-TYPED-PTRS
+; RUN: %opt_legacy_opaque %use_old_pass_manager% -GenXBTIAssignment -vc-use-bindless-buffers -march=genx64 -mcpu=Gen9 -S < %s | FileCheck %s --check-prefixes=BUF,CHECK-OPAQUE-PTRS
+; RUN: %opt_legacy_typed %use_old_pass_manager% -GenXBTIAssignment -vc-use-bindless-images -march=genx64 -mcpu=Gen9 -S < %s | FileCheck %s --check-prefixes=IMG,CHECK-TYPED-PTRS
+; RUN: %opt_legacy_opaque %use_old_pass_manager% -GenXBTIAssignment -vc-use-bindless-images -march=genx64 -mcpu=Gen9 -S < %s | FileCheck %s --check-prefixes=IMG,CHECK-OPAQUE-PTRS
+
+; RUN: %opt_new_pm_typed -passes=GenXBTIAssignment -vc-use-bindless-buffers -march=genx64 -mcpu=Gen9 -S < %s | FileCheck %s --check-prefixes=BUF,CHECK-TYPED-PTRS
+; RUN: %opt_new_pm_opaque -passes=GenXBTIAssignment -vc-use-bindless-buffers -march=genx64 -mcpu=Gen9 -S < %s | FileCheck %s --check-prefixes=BUF,CHECK-OPAQUE-PTRS
+; RUN: %opt_new_pm_typed -passes=GenXBTIAssignment -vc-use-bindless-images -march=genx64 -mcpu=Gen9 -S < %s | FileCheck %s --check-prefixes=IMG,CHECK-TYPED-PTRS
+; RUN: %opt_new_pm_opaque -passes=GenXBTIAssignment -vc-use-bindless-images -march=genx64 -mcpu=Gen9 -S < %s | FileCheck %s --check-prefixes=IMG,CHECK-OPAQUE-PTRS
 
 target datalayout = "e-p:64:64-i64:64-n8:16:32:64"
 target triple = "spir64-unknown-unknown"

diff --git a/IGC/VectorCompiler/test/BTIAssignment/i32_args.ll b/IGC/VectorCompiler/test/BTIAssignment/i32_args.ll
@@ -8,8 +8,11 @@
 
 ; Check that bti is assigned to i32 state arguments.
 
-; RUN: %opt_typed_ptrs %use_old_pass_manager% %pass_pref%GenXBTIAssignment -march=genx64 -mcpu=Gen9 -S < %s | FileCheck %s --check-prefixes=CHECK,CHECK-TYPED-PTRS
-; RUN: %opt_opaque_ptrs %use_old_pass_manager% %pass_pref%GenXBTIAssignment -march=genx64 -mcpu=Gen9 -S < %s | FileCheck %s --check-prefixes=CHECK,CHECK-OPAQUE-PTRS
+; RUN: %opt_legacy_typed %use_old_pass_manager% -GenXBTIAssignment -march=genx64 -mcpu=Gen9 -S < %s | FileCheck %s --check-prefixes=CHECK,CHECK-TYPED-PTRS
+; RUN: %opt_legacy_opaque %use_old_pass_manager% -GenXBTIAssignment -march=genx64 -mcpu=Gen9 -S < %s | FileCheck %s --check-prefixes=CHECK,CHECK-OPAQUE-PTRS
+
+; RUN: %opt_new_pm_typed -passes=GenXBTIAssignment -march=genx64 -mcpu=Gen9 -S < %s | FileCheck %s --check-prefixes=CHECK,CHECK-TYPED-PTRS
+; RUN: %opt_new_pm_opaque -passes=GenXBTIAssignment -march=genx64 -mcpu=Gen9 -S < %s | FileCheck %s --check-prefixes=CHECK,CHECK-OPAQUE-PTRS
 
 target datalayout = "e-p:64:64-i64:64-n8:16:32:64"
 target triple = "spir64-unknown-unknown"

diff --git a/IGC/VectorCompiler/test/BTIAssignment/pointer_args.ll b/IGC/VectorCompiler/test/BTIAssignment/pointer_args.ll
@@ -8,11 +8,15 @@
 
 ; Check that bti is assigned to opaque pointer state arguments.
 
-; RUN: %opt_typed_ptrs %use_old_pass_manager% -GenXBTIAssignment -march=genx64 -mcpu=Gen9 -S < %s | FileCheck %s --check-prefixes=CHECK,CHECK-TYPED-PTRS,RAW,RAW-TYPED-PTRS
-; RUN: %opt_typed_ptrs %use_old_pass_manager% -GenXBTIAssignment -instcombine -march=genx64 -mcpu=Gen9 -S < %s | FileCheck %s --check-prefixes=CHECK,CHECK-TYPED-PTRS,CLEAN
-; RUN: %opt_opaque_ptrs %use_old_pass_manager% %pass_pref%GenXBTIAssignment -march=genx64 -mcpu=Gen9 -S < %s | FileCheck %s --check-prefixes=CHECK,CHECK-OPAQUE-PTRS,RAW,RAW-OPAQUE-PTRS
-; RUN: %opt_llvm-15 %use_old_pass_manager% -GenXBTIAssignment -instcombine -march=genx64 -mcpu=Gen9 -S < %s | FileCheck %s --check-prefixes=CHECK,CHECK-OPAQUE-PTRS,CLEAN
-; RUN: %opt_llvm-16 %use_old_pass_manager% --passes=GenXBTIAssignment,instcombine -march=genx64 -mcpu=Gen9 -S < %s | FileCheck %s --check-prefixes=CHECK,CHECK-OPAQUE-PTRS,CLEAN
+; RUN: %opt_legacy_typed %use_old_pass_manager% -GenXBTIAssignment -march=genx64 -mcpu=Gen9 -S < %s | FileCheck %s --check-prefixes=CHECK,CHECK-TYPED-PTRS,RAW,RAW-TYPED-PTRS
+; RUN: %opt_legacy_typed %use_old_pass_manager% -GenXBTIAssignment -instcombine -march=genx64 -mcpu=Gen9 -S < %s | FileCheck %s --check-prefixes=CHECK,CHECK-TYPED-PTRS,CLEAN
+; RUN: %opt_legacy_opaque %use_old_pass_manager% -GenXBTIAssignment -march=genx64 -mcpu=Gen9 -S < %s | FileCheck %s --check-prefixes=CHECK,CHECK-OPAQUE-PTRS,RAW,RAW-OPAQUE-PTRS
+; RUN: %opt_legacy_opaque %use_old_pass_manager% -GenXBTIAssignment -instcombine -march=genx64 -mcpu=Gen9 -S < %s | FileCheck %s --check-prefixes=CHECK,CHECK-OPAQUE-PTRS,CLEAN
+
+; RUN: %opt_new_pm_typed -passes=GenXBTIAssignment -march=genx64 -mcpu=Gen9 -S < %s | FileCheck %s --check-prefixes=CHECK,CHECK-TYPED-PTRS,RAW,RAW-TYPED-PTRS
+; RUN: %opt_new_pm_typed -passes=GenXBTIAssignment,instcombine -march=genx64 -mcpu=Gen9 -S < %s | FileCheck %s --check-prefixes=CHECK,CHECK-TYPED-PTRS,CLEAN
+; RUN: %opt_new_pm_opaque -passes=GenXBTIAssignment -march=genx64 -mcpu=Gen9 -S < %s | FileCheck %s --check-prefixes=CHECK,CHECK-OPAQUE-PTRS,RAW,RAW-OPAQUE-PTRS
+; RUN: %opt_new_pm_opaque -passes=GenXBTIAssignment,instcombine -march=genx64 -mcpu=Gen9 -S < %s | FileCheck %s --check-prefixes=CHECK,CHECK-OPAQUE-PTRS,CLEAN
 
 target datalayout = "e-p:64:64-i64:64-n8:16:32:64"
 target triple = "spir64-unknown-unknown"

diff --git a/IGC/VectorCompiler/test/Baling/mem-ordering.ll b/IGC/VectorCompiler/test/Baling/mem-ordering.ll
@@ -9,9 +9,9 @@
 ; RUN: %opt %use_old_pass_manager% -GenXFuncBaling -print-baling-info -disable-output \
 ; RUN: -march=genx64 -mcpu=Xe2 -mtriple=spir64-unknown-unknown -S < %s | FileCheck %s
 
-declare <1 x i32> @llvm.genx.lsc.load.slm.v1i32.i1.i32(i1, i8, i8, i8, i16, i32, i8, i8, i8, i8, i32, i32) nounwind readonly
-declare void @llvm.genx.lsc.fence.v32i1(<32 x i1>) nounwind
-declare <16 x i32> @llvm.genx.wrregioni.v16i32.v1i32.i16.i1(<16 x i32>, <1 x i32>, i32, i32, i32, i16, i32, i1) nounwind readnone
+declare <1 x i32> @llvm.genx.lsc.load.slm.v1i32.i1.i32(i1, i8, i8, i8, i16, i32, i8, i8, i8, i8, i32, i32) nounwind readonly willreturn
+declare void @llvm.genx.lsc.fence.v32i1(<32 x i1>) nounwind willreturn
+declare <16 x i32> @llvm.genx.wrregioni.v16i32.v1i32.i16.i1(<16 x i32>, <1 x i32>, i32, i32, i32, i16, i32, i1) nounwind readnone willreturn
 
 ; CHECK-LABEL: test
 define <16 x i32> @test(<16 x i32> %val) {

diff --git a/IGC/VectorCompiler/test/CMABI/byval_sret.ll b/IGC/VectorCompiler/test/CMABI/byval_sret.ll
@@ -9,16 +9,24 @@
 ; UNSUPPORTED: llvm_11_or_less
 ; COM: default behavior: structure is passed by value if possible + size is less then threshold (see vc-max-cmabi-byval-size option).
 ; COM: all structures of the test are supposed to be less then this threshold.
-; RUN: %opt_typed_ptrs %use_old_pass_manager% %pass_pref%CMABI -march=genx64 -mcpu=Gen9 -S < %s | FileCheck %s --check-prefixes=SMALL-ON,SMALL-ON-TYPED-PTRS,BIG-ON,BIG-ON-TYPED-PTRS,COMMON,COMMON-TYPED-PTRS
-; RUN: %opt_opaque_ptrs %use_old_pass_manager% %pass_pref%CMABI -march=genx64 -mcpu=Gen9 -S < %s | FileCheck %s --check-prefixes=SMALL-ON,SMALL-ON-OPAQUE-PTRS,BIG-ON,BIG-ON-OPAQUE-PTRS,COMMON,COMMON-OPAQUE-PTRS
+; RUN: %opt_typed_ptrs %use_old_pass_manager% -CMABILegacy -march=genx64 -mcpu=Gen9 -S < %s | FileCheck %s --check-prefixes=SMALL-ON,SMALL-ON-TYPED-PTRS,BIG-ON,BIG-ON-TYPED-PTRS,COMMON,COMMON-TYPED-PTRS
+; RUN: %opt_opaque_ptrs %use_old_pass_manager% -CMABILegacy -march=genx64 -mcpu=Gen9 -S < %s | FileCheck %s --check-prefixes=SMALL-ON,SMALL-ON-OPAQUE-PTRS,BIG-ON,BIG-ON-OPAQUE-PTRS,COMMON,COMMON-OPAQUE-PTRS
+; RUN: %opt_new_pm_typed -passes=CMABI -march=genx64 -mcpu=Gen9 -S < %s | FileCheck %s --check-prefixes=SMALL-ON,SMALL-ON-TYPED-PTRS,BIG-ON,BIG-ON-TYPED-PTRS,COMMON,COMMON-TYPED-PTRS
+; RUN: %opt_new_pm_opaque -passes=CMABI -march=genx64 -mcpu=Gen9 -S < %s | FileCheck %s --check-prefixes=SMALL-ON,SMALL-ON-OPAQUE-PTRS,BIG-ON,BIG-ON-OPAQUE-PTRS,COMMON,COMMON-OPAQUE-PTRS
+
 
 ; COM: vc-max-cmabi-byval-size=0: turn off byval generation for CM ABI.
-; RUN: %opt_typed_ptrs %use_old_pass_manager% %pass_pref%CMABI -vc-max-cmabi-byval-size=0 -march=genx64 -mcpu=Gen9 -S < %s | FileCheck %s --check-prefixes=SMALL-OFF,SMALL-OFF-TYPED-PTRS,BIG-OFF-TYPED-PTRS,COMMON,COMMON-TYPED-PTRS
-; RUN: %opt_opaque_ptrs %use_old_pass_manager% %pass_pref%CMABI -vc-max-cmabi-byval-size=0 -march=genx64 -mcpu=Gen9 -S < %s | FileCheck %s --check-prefixes=SMALL-OFF,SMALL-OFF-OPAQUE-PTRS,BIG-OFF-OPAQUE-PTRS,COMMON,COMMON-OPAQUE-PTRS
+; RUN: %opt_typed_ptrs %use_old_pass_manager% -CMABILegacy -vc-max-cmabi-byval-size=0 -march=genx64 -mcpu=Gen9 -S < %s | FileCheck %s --check-prefixes=SMALL-OFF,SMALL-OFF-TYPED-PTRS,BIG-OFF-TYPED-PTRS,COMMON,COMMON-TYPED-PTRS
+; RUN: %opt_opaque_ptrs %use_old_pass_manager% -CMABILegacy -vc-max-cmabi-byval-size=0 -march=genx64 -mcpu=Gen9 -S < %s | FileCheck %s --check-prefixes=SMALL-OFF,SMALL-OFF-OPAQUE-PTRS,BIG-OFF-OPAQUE-PTRS,COMMON,COMMON-OPAQUE-PTRS
+; RUN: %opt_new_pm_typed -passes=CMABI -vc-max-cmabi-byval-size=0 -march=genx64 -mcpu=Gen9 -S < %s | FileCheck %s --check-prefixes=SMALL-OFF,SMALL-OFF-TYPED-PTRS,BIG-OFF-TYPED-PTRS,COMMON,COMMON-TYPED-PTRS
+; RUN: %opt_new_pm_opaque -passes=CMABI -vc-max-cmabi-byval-size=0 -march=genx64 -mcpu=Gen9 -S < %s | FileCheck %s --check-prefixes=SMALL-OFF,SMALL-OFF-OPAQUE-PTRS,BIG-OFF-OPAQUE-PTRS,COMMON,COMMON-OPAQUE-PTRS
+
 
 ; COM: vc-max-cmabi-byval-size=8: very small threshold for byval generation for CM ABI.
-; RUN: %opt_typed_ptrs %use_old_pass_manager% %pass_pref%CMABI -vc-max-cmabi-byval-size=8 -march=genx64 -mcpu=Gen9 -S < %s | FileCheck %s --check-prefixes=SMALL-ON,SMALL-ON-TYPED-PTRS,BIG-OFF-TYPED-PTRS,COMMON,COMMON-TYPED-PTRS
-; RUN: %opt_opaque_ptrs %use_old_pass_manager% %pass_pref%CMABI -vc-max-cmabi-byval-size=8 -march=genx64 -mcpu=Gen9 -S < %s | FileCheck %s --check-prefixes=SMALL-ON,SMALL-ON-OPAQUE-PTRS,BIG-OFF-OPAQUE-PTRS,COMMON,COMMON-OPAQUE-PTRS
+; RUN: %opt_typed_ptrs %use_old_pass_manager% -CMABILegacy -vc-max-cmabi-byval-size=8 -march=genx64 -mcpu=Gen9 -S < %s | FileCheck %s --check-prefixes=SMALL-ON,SMALL-ON-TYPED-PTRS,BIG-OFF-TYPED-PTRS,COMMON,COMMON-TYPED-PTRS
+; RUN: %opt_opaque_ptrs %use_old_pass_manager% -CMABILegacy -vc-max-cmabi-byval-size=8 -march=genx64 -mcpu=Gen9 -S < %s | FileCheck %s --check-prefixes=SMALL-ON,SMALL-ON-OPAQUE-PTRS,BIG-OFF-OPAQUE-PTRS,COMMON,COMMON-OPAQUE-PTRS
+; RUN: %opt_new_pm_typed -passes=CMABI -vc-max-cmabi-byval-size=8 -march=genx64 -mcpu=Gen9 -S < %s | FileCheck %s --check-prefixes=SMALL-ON,SMALL-ON-TYPED-PTRS,BIG-OFF-TYPED-PTRS,COMMON,COMMON-TYPED-PTRS
+; RUN: %opt_new_pm_opaque -passes=CMABI -vc-max-cmabi-byval-size=8 -march=genx64 -mcpu=Gen9 -S < %s | FileCheck %s --check-prefixes=SMALL-ON,SMALL-ON-OPAQUE-PTRS,BIG-OFF-OPAQUE-PTRS,COMMON,COMMON-OPAQUE-PTRS
 
 target datalayout = "e-p:64:64-i64:64-n8:16:32:64"
 target triple = "spir64-unknown-unknown"

diff --git a/IGC/VectorCompiler/test/CMABI/copy_in_out_simple.ll b/IGC/VectorCompiler/test/CMABI/copy_in_out_simple.ll
@@ -6,8 +6,11 @@
 ;
 ;============================ end_copyright_notice =============================
 
-; RUN: %opt_typed_ptrs %use_old_pass_manager% %pass_pref%CMABI -march=genx64 -mcpu=Gen9 -S < %s | FileCheck %s --check-prefixes=CHECK,CHECK-TYPED-PTRS
-; RUN: %opt_opaque_ptrs %use_old_pass_manager% %pass_pref%CMABI -march=genx64 -mcpu=Gen9 -S < %s | FileCheck %s --check-prefixes=CHECK,CHECK-OPAQUE-PTRS
+; RUN: %opt_typed_ptrs %use_old_pass_manager% -CMABILegacy -march=genx64 -mcpu=Gen9 -S < %s | FileCheck %s --check-prefixes=CHECK,CHECK-TYPED-PTRS
+; RUN: %opt_opaque_ptrs %use_old_pass_manager% -CMABILegacy -march=genx64 -mcpu=Gen9 -S < %s | FileCheck %s --check-prefixes=CHECK,CHECK-OPAQUE-PTRS
+
+; RUN: %opt_new_pm_typed -passes=CMABI -march=genx64 -mcpu=Gen9 -S < %s | FileCheck %s --check-prefixes=CHECK,CHECK-TYPED-PTRS
+; RUN: %opt_new_pm_opaque -passes=CMABI -march=genx64 -mcpu=Gen9 -S < %s | FileCheck %s --check-prefixes=CHECK,CHECK-OPAQUE-PTRS
 
 target datalayout = "e-p:64:64-i64:64-n8:16:32"
 

diff --git a/IGC/VectorCompiler/test/CMABI/debug-bool.ll b/IGC/VectorCompiler/test/CMABI/debug-bool.ll
@@ -6,8 +6,12 @@
 ;
 ;============================ end_copyright_notice =============================
 ;
-; RUN: %opt_typed_ptrs %use_old_pass_manager% %pass_pref%CMABI -march=genx64 -mtriple=spir64-unknown-unknown  -mcpu=Gen9 -S < %s | FileCheck %s --check-prefixes=CHECK,CHECK-TYPED-PTRS
-; RUN: %opt_opaque_ptrs %use_old_pass_manager% %pass_pref%CMABI -march=genx64 -mtriple=spir64-unknown-unknown  -mcpu=Gen9 -S < %s | FileCheck %s --check-prefixes=CHECK,CHECK-OPAQUE-PTRS
+; RUN: %opt_typed_ptrs %use_old_pass_manager% -CMABILegacy -march=genx64 -mtriple=spir64-unknown-unknown  -mcpu=Gen9 -S < %s | FileCheck %s --check-prefixes=CHECK,CHECK-TYPED-PTRS
+; RUN: %opt_opaque_ptrs %use_old_pass_manager% -CMABILegacy -march=genx64 -mtriple=spir64-unknown-unknown  -mcpu=Gen9 -S < %s | FileCheck %s --check-prefixes=CHECK,CHECK-OPAQUE-PTRS
+;
+; RUN: %opt_new_pm_typed -passes=CMABI -march=genx64 -mtriple=spir64-unknown-unknown  -mcpu=Gen9 -S < %s | FileCheck %s --check-prefixes=CHECK,CHECK-TYPED-PTRS
+; RUN: %opt_new_pm_opaque -passes=CMABI -march=genx64 -mtriple=spir64-unknown-unknown  -mcpu=Gen9 -S < %s | FileCheck %s --check-prefixes=CHECK,CHECK-OPAQUE-PTRS
+;
 ; ------------------------------------------------
 ; CMABI
 ; ------------------------------------------------

diff --git a/IGC/VectorCompiler/test/CMABI/debug-contexpr.ll b/IGC/VectorCompiler/test/CMABI/debug-contexpr.ll
@@ -6,8 +6,12 @@
 ;
 ;============================ end_copyright_notice =============================
 ;
-; RUN: %opt_typed_ptrs %use_old_pass_manager% %pass_pref%CMABI -march=genx64 -mtriple=spir64-unknown-unknown  -mcpu=Gen9 -S < %s | FileCheck %s
-; RUN: %opt_opaque_ptrs %use_old_pass_manager% %pass_pref%CMABI -march=genx64 -mtriple=spir64-unknown-unknown  -mcpu=Gen9 -S < %s | FileCheck %s
+; RUN: %opt_typed_ptrs %use_old_pass_manager% -CMABILegacy -march=genx64 -mtriple=spir64-unknown-unknown  -mcpu=Gen9 -S < %s | FileCheck %s
+; RUN: %opt_opaque_ptrs %use_old_pass_manager% -CMABILegacy -march=genx64 -mtriple=spir64-unknown-unknown  -mcpu=Gen9 -S < %s | FileCheck %s
+;
+; RUN: %opt_new_pm_typed -passes=CMABI -march=genx64 -mtriple=spir64-unknown-unknown  -mcpu=Gen9 -S < %s | FileCheck %s
+; RUN: %opt_new_pm_opaque -passes=CMABI -march=genx64 -mtriple=spir64-unknown-unknown  -mcpu=Gen9 -S < %s | FileCheck %s
+;
 ; ------------------------------------------------
 ; CMABI
 ; ------------------------------------------------