Rewrite CMABI to new pass manager

.

Author: igorban-intel

IGC/VectorCompiler/include/GenXPassRegistry.def

@@ -12,9 +12,10 @@ SPDX-License-Identifier: MIT
 #define MODULE_PASS(NAME, CREATE_PASS)
 #endif
 
-MODULE_PASS("GenXPacketize", GenXPacketizePass())
+MODULE_PASS("CMABI", CMABIPass())
 MODULE_PASS("CMImpParam", CMImpParamPass())
 MODULE_PASS("CMKernelArgOffset", CMKernelArgOffsetPass())
+MODULE_PASS("GenXPacketize", GenXPacketizePass())
 MODULE_PASS("GenXBIFFlagCtrlResolution", GenXBIFFlagCtrlResolutionPass())
 MODULE_PASS("GenXBTIAssignment", GenXBTIAssignmentPass())
 MODULE_PASS("GenXImportOCLBiF", GenXImportOCLBiFPass())
@@ -24,7 +25,6 @@ MODULE_PASS("GenXPrintfPhiClonning", GenXPrintfPhiClonningPass())
 MODULE_PASS("GenXPrintfResolution", GenXPrintfResolutionPass())
 MODULE_PASS("GenXTrampolineInsertion", GenXTrampolineInsertionPass())
 MODULE_PASS("GenXTranslateSPIRVBuiltins", GenXTranslateSPIRVBuiltinsPass())
-MODULE_PASS("CMABI", CMABIPass())
 MODULE_PASS("GenXCloneIndirectFunctions", GenXCloneIndirectFunctionsPass())
 
 #undef MODULE_PASS

IGC/VectorCompiler/include/vc/GenXOpts/CMABIAnalysis.h

@@ -10,8 +10,24 @@ SPDX-License-Identifier: MIT
 
 // void initializeCMABIAnalysis(PassRegistry &);
 
-struct CMABIAnalysisPass : public llvm::PassInfoMixin<CMABIAnalysisPass> {
-  llvm::PreservedAnalyses run(llvm::Module &M, llvm::ModuleAnalysisManager &AM);
+class LocalizationInfo;
+
+struct CMABIAnalysisPassResult {
+  llvm::SmallPtrSet<llvm::Function *, 8> Kernels;
+  llvm::SmallDenseMap<llvm::Function *, LocalizationInfo *> GlobalInfo;
+
+  // TODO: Fill invalidator
+  template <class IR, class Analysis, class Invalidator>
+  bool invalidate(IR &, Analysis &, Invalidator &) {
+    return true;
+  }
 };
 
+#if LLVM_VERSION_MAJOR >= 16
+struct CMABIAnalysisPass : public llvm::AnalysisInfoMixin<CMABIAnalysisPass> {
+  using Result = CMABIAnalysisPassResult;
+  Result run(llvm::Module &M, llvm::ModuleAnalysisManager &AM);
+  static llvm::AnalysisKey Key;
+};
+#endif
 #endif // GENX_OPTS_CMABIANALYSIS

IGC/VectorCompiler/include/vc/GenXOpts/GenXOptsLegacyPM.h

@@ -38,7 +38,7 @@ Pass *createCMKernelArgOffsetPass(unsigned GrfByteSize, bool UseBindlessImages);
 //
 // CMABI - Fix ABI issues for the genx backend.
 //
-Pass *createCMABIPass();
+Pass *createCMABILegacyPass();
 
 //===----------------------------------------------------------------------===//
 //
@@ -55,7 +55,7 @@ ModulePass *createGenXPacketizePass();
 void initializeGenXPacketizePass(PassRegistry &);
 
 void initializeGenXSimplifyPass(PassRegistry &);
-void initializeCMABIPass(PassRegistry &);
+void initializeCMABILegacyPass(PassRegistry &);
 void initializeCMImpParamPass(PassRegistry &);
 void initializeCMKernelArgOffsetPass(PassRegistry &);
 

IGC/VectorCompiler/include/vc/GenXOpts/GenXOptsNewPM.h

@@ -15,9 +15,11 @@ SPDX-License-Identifier: MIT
 #ifndef VC_GENXOPTS_GENXOPTSNEWPM_H
 #define VC_GENXOPTS_GENXOPTSNEWPM_H
 
+#include "llvm/Analysis/CGSCCPassManager.h"
 #include "llvm/IR/PassManager.h"
 
 namespace llvm {
+
 class FunctionPass;
 class ModulePass;
 class Pass;

IGC/VectorCompiler/include/vc/Utils/GenX/TransformArgCopy.h

@@ -15,6 +15,8 @@ SPDX-License-Identifier: MIT
 #include <llvm/ADT/SetVector.h>
 #include <llvm/ADT/SmallVector.h>
 #include <llvm/Analysis/CallGraph.h>
+#include <llvm/Analysis/CallGraphSCCPass.h>
+#include <llvm/Analysis/LazyCallGraph.h>
 #include <llvm/IR/Argument.h>
 #include <llvm/IR/Attributes.h>
 #include <llvm/IR/Function.h>
@@ -192,6 +194,25 @@ class FuncUsersUpdater {
   llvm::CallInst *updateFuncDirectUser(llvm::CallInst &OrigCall);
 };
 
+class FuncUsersUpdaterNewPM {
+  llvm::Function &OrigFunc;
+  llvm::Function &NewFunc;
+  const TransformedFuncInfo &NewFuncInfo;
+  llvm::LazyCallGraph &CG;
+
+public:
+  FuncUsersUpdaterNewPM(llvm::Function &OrigFuncIn, llvm::Function &NewFuncIn,
+                        const TransformedFuncInfo &NewFuncInfoIn,
+                        llvm::LazyCallGraph &CGIn)
+      : OrigFunc{OrigFuncIn}, NewFunc{NewFuncIn},
+        NewFuncInfo{NewFuncInfoIn}, CG{CGIn} {}
+
+  void run();
+
+private:
+  llvm::CallInst *updateFuncDirectUser(llvm::CallInst &OrigCall);
+};
+
 class FuncBodyTransfer {
   llvm::Function &OrigFunc;
   llvm::Function &NewFunc;

IGC/VectorCompiler/lib/GenXCodeGen/GenXTargetMachine.cpp

@@ -175,7 +175,11 @@ void initializeGenXPasses(PassRegistry &registry) {
   initializeGenXImportOCLBiFPass(registry);
   initializeGenXBIFFlagCtrlResolutionPass(registry);
   initializeGenXSimplifyPass(registry);
+#if LLVM_VERSION_MAJOR < 16
+  initializeCMABILegacyPass(registry);
+#else
   initializeCMABIPass(registry);
+#endif
   initializeCMLowerVLoadVStorePass(registry);
   initializeGenXLowerJmpTableSwitchPass(registry);
   initializeGenXGlobalValueLoweringPass(registry);
@@ -990,7 +994,7 @@ void GenXTargetMachine::adjustPassManager(PassManagerBuilder &PMBuilder) {
 
   // CM ABI.
   auto AddCMABI = [](const PassManagerBuilder &Builder, PassManagerBase &PM) {
-    PM.add(createCMABIPass());
+    PM.add(createCMABILegacyPass());
   };
   PMBuilder.addExtension(PassManagerBuilder::EP_ModuleOptimizerEarly, AddCMABI);
   PMBuilder.addExtension(PassManagerBuilder::EP_EnabledOnOptLevel0, AddCMABI);