Switch to NPM

Author: jayfoad

llvm/include/llvm/CodeGen/MachineInstrBundle.h

@@ -15,6 +15,7 @@
 #define LLVM_CODEGEN_MACHINEINSTRBUNDLE_H
 
 #include "llvm/CodeGen/MachineBasicBlock.h"
+#include "llvm/CodeGen/MachinePassManager.h"
 #include "llvm/Support/Compiler.h"
 
 namespace llvm {
@@ -294,6 +295,12 @@ LLVM_ABI PhysRegInfo AnalyzePhysRegInBundle(const MachineInstr &MI,
                                             Register Reg,
                                             const TargetRegisterInfo *TRI);
 
+class FinalizeBundleTestPass : public PassInfoMixin<FinalizeBundleTestPass> {
+public:
+  PreservedAnalyses run(MachineFunction &MF,
+                        MachineFunctionAnalysisManager &MFAM);
+};
+
 } // End llvm namespace
 
 #endif

llvm/include/llvm/CodeGen/Passes.h

@@ -623,9 +623,6 @@ LLVM_ABI ModulePass *createWindowsSecureHotPatchingPass();
 
 /// Lowers KCFI operand bundles for indirect calls.
 LLVM_ABI FunctionPass *createKCFIPass();
-
-/// A pass for testing finalizeBundle.
-LLVM_ABI extern char &FinalizeBundleTestID;
 } // namespace llvm
 
 #endif

llvm/include/llvm/InitializePasses.h

@@ -340,7 +340,6 @@ LLVM_ABI void initializeWindowsSecureHotPatchingPass(PassRegistry &);
 LLVM_ABI void initializeWinEHPreparePass(PassRegistry &);
 LLVM_ABI void initializeWriteBitcodePassPass(PassRegistry &);
 LLVM_ABI void initializeXRayInstrumentationLegacyPass(PassRegistry &);
-LLVM_ABI void initializeFinalizeBundleTestPass(PassRegistry &);
 
 } // end namespace llvm
 

llvm/include/llvm/Passes/MachinePassRegistry.def

@@ -113,6 +113,7 @@ MACHINE_FUNCTION_PASS("early-machinelicm", EarlyMachineLICMPass())
 MACHINE_FUNCTION_PASS("early-tailduplication", EarlyTailDuplicatePass())
 MACHINE_FUNCTION_PASS("fentry-insert", FEntryInserterPass())
 MACHINE_FUNCTION_PASS("finalize-isel", FinalizeISelPass())
+MACHINE_FUNCTION_PASS("finalizebundle-test", FinalizeBundleTestPass())
 MACHINE_FUNCTION_PASS("fixup-statepoint-caller-saved", FixupStatepointCallerSavedPass())
 MACHINE_FUNCTION_PASS("init-undef", InitUndefPass())
 MACHINE_FUNCTION_PASS("localstackalloc", LocalStackSlotAllocationPass())

llvm/lib/CodeGen/CodeGen.cpp

@@ -146,5 +146,4 @@ void llvm::initializeCodeGen(PassRegistry &Registry) {
   initializeWasmEHPreparePass(Registry);
   initializeWinEHPreparePass(Registry);
   initializeXRayInstrumentationLegacyPass(Registry);
-  initializeFinalizeBundleTestPass(Registry);
 }

llvm/lib/CodeGen/MachineInstrBundle.cpp

@@ -360,25 +360,12 @@ PhysRegInfo llvm::AnalyzePhysRegInBundle(const MachineInstr &MI, Register Reg,
   return PRI;
 }
 
-namespace {
-class FinalizeBundleTest : public MachineFunctionPass {
-public:
-  static char ID;
-
-  FinalizeBundleTest() : MachineFunctionPass(ID) {
-    initializeFinalizeBundleTestPass(*PassRegistry::getPassRegistry());
-  }
-
-  bool runOnMachineFunction(MachineFunction &MF) override {
-    // For testing purposes, bundle the entire contents of each basic block
-    // except for terminators.
-    for (MachineBasicBlock &MBB : MF)
-      finalizeBundle(MBB, MBB.instr_begin(), MBB.getFirstInstrTerminator());
-    return true;
-  }
-};
-} // namespace
-
-char FinalizeBundleTest::ID = 0;
-INITIALIZE_PASS(FinalizeBundleTest, "finalizebundle-test",
-                "finalizeBundle test", false, false)
+PreservedAnalyses
+llvm::FinalizeBundleTestPass::run(MachineFunction &MF,
+                                  MachineFunctionAnalysisManager &) {
+  // For testing purposes, bundle the entire contents of each basic block
+  // except for terminators.
+  for (MachineBasicBlock &MBB : MF)
+    finalizeBundle(MBB, MBB.instr_begin(), MBB.getFirstInstrTerminator());
+  return PreservedAnalyses::none();
+}

llvm/lib/Passes/PassBuilder.cpp

@@ -124,6 +124,7 @@
 #include "llvm/CodeGen/MachineCopyPropagation.h"
 #include "llvm/CodeGen/MachineDominators.h"
 #include "llvm/CodeGen/MachineFunctionAnalysis.h"
+#include "llvm/CodeGen/MachineInstrBundle.h"
 #include "llvm/CodeGen/MachineLICM.h"
 #include "llvm/CodeGen/MachineLateInstrsCleanup.h"
 #include "llvm/CodeGen/MachinePassManager.h"

…/test/CodeGen/AMDGPU/finalize-bundle.mir …m/test/CodeGen/AMDGPU/finalizebundle.mirllvm/test/CodeGen/AMDGPU/finalize-bundle.mir renamed to llvm/test/CodeGen/AMDGPU/finalizebundle.mir llvm/test/CodeGen/AMDGPU/finalize-bundle.mir renamed to llvm/test/CodeGen/AMDGPU/finalizebundle.mir

@@ -1,5 +1,5 @@
 # NOTE: Assertions have been autogenerated by utils/update_mir_test_checks.py UTC_ARGS: --version 5
-# RUN: llc -mtriple=amdgcn -mcpu=gfx1200 -run-pass finalizebundle-test %s -o - | FileCheck %s
+# RUN: llc -mtriple=amdgcn -mcpu=gfx1200 -passes=finalizebundle-test %s -o - | FileCheck %s
 
 ---
 name: test_overlap