diff options
author | Alex Langford <alangford@apple.com> | 2023-11-08 15:58:33 -0800 |
---|---|---|
committer | Alex Langford <alangford@apple.com> | 2023-11-08 15:59:44 -0800 |
commit | d42b2ceb6c79879d6c8409426d637bfac4cdf00d (patch) | |
tree | 8053aeff3f285a148c3cc50d3ddf61d3ab6dd721 | |
parent | 71de61259a513120796c294568754b0b9e2ee085 (diff) | |
download | llvm-d42b2ceb6c79879d6c8409426d637bfac4cdf00d.zip llvm-d42b2ceb6c79879d6c8409426d637bfac4cdf00d.tar.gz llvm-d42b2ceb6c79879d6c8409426d637bfac4cdf00d.tar.bz2 |
Revert "[Pass][CodeGen] Add some necessary passes for codegen (#70903)"
This change broke building LLVM with Module support enabled, i.e.
`LLVM_ENABLE_MODULES=ON`.
This reverts commit f40da072ed51ba77bf46191b35a74208b1045042.
-rw-r--r-- | llvm/include/llvm/CodeGen/CodeGenPassBuilder.h | 13 | ||||
-rw-r--r-- | llvm/include/llvm/CodeGen/MachinePassRegistry.def | 30 | ||||
-rw-r--r-- | llvm/lib/CodeGen/CodeGenPassBuilder.cpp | 2 |
3 files changed, 4 insertions, 41 deletions
diff --git a/llvm/include/llvm/CodeGen/CodeGenPassBuilder.h b/llvm/include/llvm/CodeGen/CodeGenPassBuilder.h index aefd125..d7739e8 100644 --- a/llvm/include/llvm/CodeGen/CodeGenPassBuilder.h +++ b/llvm/include/llvm/CodeGen/CodeGenPassBuilder.h @@ -90,18 +90,7 @@ namespace llvm { } \ static AnalysisKey Key; \ }; -#define DUMMY_MACHINE_FUNCTION_ANALYSIS(NAME, PASS_NAME, CONSTRUCTOR) \ - struct PASS_NAME : public AnalysisInfoMixin<PASS_NAME> { \ - template <typename... Ts> PASS_NAME(Ts &&...) {} \ - using Result = struct {}; \ - template <typename IRUnitT, typename AnalysisManagerT, \ - typename... ExtraArgTs> \ - Result run(IRUnitT &, AnalysisManagerT &, ExtraArgTs &&...) { \ - return {}; \ - } \ - static AnalysisKey Key; \ - }; -#include "llvm/CodeGen/MachinePassRegistry.def" +#include "MachinePassRegistry.def" /// This class provides access to building LLVM's passes. /// diff --git a/llvm/include/llvm/CodeGen/MachinePassRegistry.def b/llvm/include/llvm/CodeGen/MachinePassRegistry.def index 6ddd864..a292696 100644 --- a/llvm/include/llvm/CodeGen/MachinePassRegistry.def +++ b/llvm/include/llvm/CodeGen/MachinePassRegistry.def @@ -43,8 +43,8 @@ FUNCTION_PASS("replace-with-veclib", ReplaceWithVeclib, ()) FUNCTION_PASS("partially-inline-libcalls", PartiallyInlineLibCallsPass, ()) FUNCTION_PASS("ee-instrument", EntryExitInstrumenterPass, (false)) FUNCTION_PASS("post-inline-ee-instrument", EntryExitInstrumenterPass, (true)) -FUNCTION_PASS("expand-large-div-rem", ExpandLargeDivRemPass, (TM)) -FUNCTION_PASS("expand-large-fp-convert", ExpandLargeFpConvertPass, (TM)) +FUNCTION_PASS("expand-large-div-rem", ExpandLargeDivRemPass, ()) +FUNCTION_PASS("expand-large-fp-convert", ExpandLargeFpConvertPass, ()) FUNCTION_PASS("expand-reductions", ExpandReductionsPass, ()) FUNCTION_PASS("expandvp", ExpandVectorPredicationPass, ()) FUNCTION_PASS("lowerinvoke", LowerInvokePass, ()) @@ -136,10 +136,6 @@ DUMMY_MODULE_PASS("lower-emutls", LowerEmuTLSPass, ()) #define DUMMY_MACHINE_MODULE_PASS(NAME, PASS_NAME, CONSTRUCTOR) #endif DUMMY_MACHINE_MODULE_PASS("machine-outliner", MachineOutlinerPass, ()) -DUMMY_MACHINE_MODULE_PASS("pseudo-probe-inserter", PseudoProbeInserterPass, ()) -DUMMY_MACHINE_MODULE_PASS("mir-debugify", DebugifyMachineModule, ()) -DUMMY_MACHINE_MODULE_PASS("mir-check-debugify", CheckDebugMachineModulePass, ()) -DUMMY_MACHINE_MODULE_PASS("mir-strip-debug", StripDebugMachineModulePass, (OnlyDebugified)) #undef DUMMY_MACHINE_MODULE_PASS #ifndef DUMMY_MACHINE_FUNCTION_PASS @@ -179,7 +175,6 @@ DUMMY_MACHINE_FUNCTION_PASS("machine-sink", MachineSinkingPass, ()) DUMMY_MACHINE_FUNCTION_PASS("postra-machine-sink", PostRAMachineSinkingPass, ()) DUMMY_MACHINE_FUNCTION_PASS("peephole-opt", PeepholeOptimizerPass, ()) DUMMY_MACHINE_FUNCTION_PASS("regalloc", RegAllocPass, ()) -DUMMY_MACHINE_FUNCTION_PASS("regallocscoringpass", RegAllocScoringPass, ()) DUMMY_MACHINE_FUNCTION_PASS("virtregrewriter", VirtRegRewriterPass, ()) DUMMY_MACHINE_FUNCTION_PASS("stack-slot-coloring", StackSlotColoringPass, ()) DUMMY_MACHINE_FUNCTION_PASS("phi-node-elimination", PHIEliminationPass, ()) @@ -208,28 +203,9 @@ DUMMY_MACHINE_FUNCTION_PASS("irtranslator", IRTranslatorPass, ()) DUMMY_MACHINE_FUNCTION_PASS("regbankselect", RegBankSelectPass, ()) DUMMY_MACHINE_FUNCTION_PASS("instruction-select", InstructionSelectPass, ()) DUMMY_MACHINE_FUNCTION_PASS("reset-machine-function", ResetMachineFunctionPass, ()) -DUMMY_MACHINE_FUNCTION_PASS("machineverifier", MachineVerifierPass, (Banner)) +DUMMY_MACHINE_FUNCTION_PASS("machineverifier", MachineVerifierPass, ()) DUMMY_MACHINE_FUNCTION_PASS("print-machine-cycles", MachineCycleInfoPrinterPass, ()) DUMMY_MACHINE_FUNCTION_PASS("machine-sanmd", MachineSanitizerBinaryMetadata, ()) DUMMY_MACHINE_FUNCTION_PASS("machine-uniformity", MachineUniformityInfoWrapperPass, ()) DUMMY_MACHINE_FUNCTION_PASS("print-machine-uniformity", MachineUniformityInfoPrinterPass, ()) -DUMMY_MACHINE_FUNCTION_PASS("unpack-mi-bundles", UnpackMachineBundlesPass, (Ftor)) -DUMMY_MACHINE_FUNCTION_PASS("machineinstr-printer", MachineFunctionPrinterPass, (OS, Banner)) -DUMMY_MACHINE_FUNCTION_PASS("kcfi", KCFIPass, ()) -DUMMY_MACHINE_FUNCTION_PASS("cfi-fixup", CFIFixupPass, ()) -DUMMY_MACHINE_FUNCTION_PASS("mirfs-discriminators", MIRAddFSDiscriminatorsPass, (P)) -DUMMY_MACHINE_FUNCTION_PASS("fs-profile-loader", MIRProfileLoaderPass, (File, ProfileFile, P, FS)) -DUMMY_MACHINE_FUNCTION_PASS("machine-function-splitter", MachineFunctionSplitterPass, ()) -DUMMY_MACHINE_FUNCTION_PASS("bbsections-prepare", BasicBlockSectionsPass, ()) -DUMMY_MACHINE_FUNCTION_PASS("bbsections-profile-reader", BasicBlockSectionsProfileReaderPass, (Buf)) -DUMMY_MACHINE_FUNCTION_PASS("fixup-statepoint-caller-saved", FixupStatepointCallerSavedPass, ()) -DUMMY_MACHINE_FUNCTION_PASS("gc-empty-basic-blocks", GCEmptyBasicBlocksPass, ()) -DUMMY_MACHINE_FUNCTION_PASS("stack-frame-layout", StackFrameLayoutAnalysisPass, ()) -DUMMY_MACHINE_FUNCTION_PASS("prologepilog", PrologEpilogCodeInserterPass, ()) #undef DUMMY_MACHINE_FUNCTION_PASS - -#ifndef DUMMY_MACHINE_FUNCTION_ANALYSIS -#define DUMMY_MACHINE_FUNCTION_ANALYSIS(NAME, PASS_NAME, CONSTRUCTOR) -#endif -DUMMY_MACHINE_FUNCTION_ANALYSIS("gc-analysis", GCMachineCodeAnalysisPass, ()) -#undef DUMMY_MACHINE_FUNCTION_ANALYSIS diff --git a/llvm/lib/CodeGen/CodeGenPassBuilder.cpp b/llvm/lib/CodeGen/CodeGenPassBuilder.cpp index 5919caa..7f37f20 100644 --- a/llvm/lib/CodeGen/CodeGenPassBuilder.cpp +++ b/llvm/lib/CodeGen/CodeGenPassBuilder.cpp @@ -21,7 +21,5 @@ namespace llvm { #include "llvm/CodeGen/MachinePassRegistry.def" #define DUMMY_MACHINE_FUNCTION_PASS(NAME, PASS_NAME, CONSTRUCTOR) \ AnalysisKey PASS_NAME::Key; -#define DUMMY_MACHINE_FUNCTION_ANALYSIS(NAME, PASS_NAME, CONSTRUCTOR) \ - AnalysisKey PASS_NAME::Key; #include "llvm/CodeGen/MachinePassRegistry.def" } // namespace llvm |