Modify tests for execute with new-pm plugin

.

Author: igorban-intel

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

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> {

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"

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)) {

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);

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}

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

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) {

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"

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"