Skip to content

Commit d42b2ce

Browse files
committed
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 f40da07.
1 parent 71de612 commit d42b2ce

File tree

3 files changed

+4
-41
lines changed

3 files changed

+4
-41
lines changed

llvm/include/llvm/CodeGen/CodeGenPassBuilder.h

Lines changed: 1 addition & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -90,18 +90,7 @@ namespace llvm {
9090
} \
9191
static AnalysisKey Key; \
9292
};
93-
#define DUMMY_MACHINE_FUNCTION_ANALYSIS(NAME, PASS_NAME, CONSTRUCTOR) \
94-
struct PASS_NAME : public AnalysisInfoMixin<PASS_NAME> { \
95-
template <typename... Ts> PASS_NAME(Ts &&...) {} \
96-
using Result = struct {}; \
97-
template <typename IRUnitT, typename AnalysisManagerT, \
98-
typename... ExtraArgTs> \
99-
Result run(IRUnitT &, AnalysisManagerT &, ExtraArgTs &&...) { \
100-
return {}; \
101-
} \
102-
static AnalysisKey Key; \
103-
};
104-
#include "llvm/CodeGen/MachinePassRegistry.def"
93+
#include "MachinePassRegistry.def"
10594

10695
/// This class provides access to building LLVM's passes.
10796
///

llvm/include/llvm/CodeGen/MachinePassRegistry.def

Lines changed: 3 additions & 27 deletions
Original file line numberDiff line numberDiff line change
@@ -43,8 +43,8 @@ FUNCTION_PASS("replace-with-veclib", ReplaceWithVeclib, ())
4343
FUNCTION_PASS("partially-inline-libcalls", PartiallyInlineLibCallsPass, ())
4444
FUNCTION_PASS("ee-instrument", EntryExitInstrumenterPass, (false))
4545
FUNCTION_PASS("post-inline-ee-instrument", EntryExitInstrumenterPass, (true))
46-
FUNCTION_PASS("expand-large-div-rem", ExpandLargeDivRemPass, (TM))
47-
FUNCTION_PASS("expand-large-fp-convert", ExpandLargeFpConvertPass, (TM))
46+
FUNCTION_PASS("expand-large-div-rem", ExpandLargeDivRemPass, ())
47+
FUNCTION_PASS("expand-large-fp-convert", ExpandLargeFpConvertPass, ())
4848
FUNCTION_PASS("expand-reductions", ExpandReductionsPass, ())
4949
FUNCTION_PASS("expandvp", ExpandVectorPredicationPass, ())
5050
FUNCTION_PASS("lowerinvoke", LowerInvokePass, ())
@@ -136,10 +136,6 @@ DUMMY_MODULE_PASS("lower-emutls", LowerEmuTLSPass, ())
136136
#define DUMMY_MACHINE_MODULE_PASS(NAME, PASS_NAME, CONSTRUCTOR)
137137
#endif
138138
DUMMY_MACHINE_MODULE_PASS("machine-outliner", MachineOutlinerPass, ())
139-
DUMMY_MACHINE_MODULE_PASS("pseudo-probe-inserter", PseudoProbeInserterPass, ())
140-
DUMMY_MACHINE_MODULE_PASS("mir-debugify", DebugifyMachineModule, ())
141-
DUMMY_MACHINE_MODULE_PASS("mir-check-debugify", CheckDebugMachineModulePass, ())
142-
DUMMY_MACHINE_MODULE_PASS("mir-strip-debug", StripDebugMachineModulePass, (OnlyDebugified))
143139
#undef DUMMY_MACHINE_MODULE_PASS
144140

145141
#ifndef DUMMY_MACHINE_FUNCTION_PASS
@@ -179,7 +175,6 @@ DUMMY_MACHINE_FUNCTION_PASS("machine-sink", MachineSinkingPass, ())
179175
DUMMY_MACHINE_FUNCTION_PASS("postra-machine-sink", PostRAMachineSinkingPass, ())
180176
DUMMY_MACHINE_FUNCTION_PASS("peephole-opt", PeepholeOptimizerPass, ())
181177
DUMMY_MACHINE_FUNCTION_PASS("regalloc", RegAllocPass, ())
182-
DUMMY_MACHINE_FUNCTION_PASS("regallocscoringpass", RegAllocScoringPass, ())
183178
DUMMY_MACHINE_FUNCTION_PASS("virtregrewriter", VirtRegRewriterPass, ())
184179
DUMMY_MACHINE_FUNCTION_PASS("stack-slot-coloring", StackSlotColoringPass, ())
185180
DUMMY_MACHINE_FUNCTION_PASS("phi-node-elimination", PHIEliminationPass, ())
@@ -208,28 +203,9 @@ DUMMY_MACHINE_FUNCTION_PASS("irtranslator", IRTranslatorPass, ())
208203
DUMMY_MACHINE_FUNCTION_PASS("regbankselect", RegBankSelectPass, ())
209204
DUMMY_MACHINE_FUNCTION_PASS("instruction-select", InstructionSelectPass, ())
210205
DUMMY_MACHINE_FUNCTION_PASS("reset-machine-function", ResetMachineFunctionPass, ())
211-
DUMMY_MACHINE_FUNCTION_PASS("machineverifier", MachineVerifierPass, (Banner))
206+
DUMMY_MACHINE_FUNCTION_PASS("machineverifier", MachineVerifierPass, ())
212207
DUMMY_MACHINE_FUNCTION_PASS("print-machine-cycles", MachineCycleInfoPrinterPass, ())
213208
DUMMY_MACHINE_FUNCTION_PASS("machine-sanmd", MachineSanitizerBinaryMetadata, ())
214209
DUMMY_MACHINE_FUNCTION_PASS("machine-uniformity", MachineUniformityInfoWrapperPass, ())
215210
DUMMY_MACHINE_FUNCTION_PASS("print-machine-uniformity", MachineUniformityInfoPrinterPass, ())
216-
DUMMY_MACHINE_FUNCTION_PASS("unpack-mi-bundles", UnpackMachineBundlesPass, (Ftor))
217-
DUMMY_MACHINE_FUNCTION_PASS("machineinstr-printer", MachineFunctionPrinterPass, (OS, Banner))
218-
DUMMY_MACHINE_FUNCTION_PASS("kcfi", KCFIPass, ())
219-
DUMMY_MACHINE_FUNCTION_PASS("cfi-fixup", CFIFixupPass, ())
220-
DUMMY_MACHINE_FUNCTION_PASS("mirfs-discriminators", MIRAddFSDiscriminatorsPass, (P))
221-
DUMMY_MACHINE_FUNCTION_PASS("fs-profile-loader", MIRProfileLoaderPass, (File, ProfileFile, P, FS))
222-
DUMMY_MACHINE_FUNCTION_PASS("machine-function-splitter", MachineFunctionSplitterPass, ())
223-
DUMMY_MACHINE_FUNCTION_PASS("bbsections-prepare", BasicBlockSectionsPass, ())
224-
DUMMY_MACHINE_FUNCTION_PASS("bbsections-profile-reader", BasicBlockSectionsProfileReaderPass, (Buf))
225-
DUMMY_MACHINE_FUNCTION_PASS("fixup-statepoint-caller-saved", FixupStatepointCallerSavedPass, ())
226-
DUMMY_MACHINE_FUNCTION_PASS("gc-empty-basic-blocks", GCEmptyBasicBlocksPass, ())
227-
DUMMY_MACHINE_FUNCTION_PASS("stack-frame-layout", StackFrameLayoutAnalysisPass, ())
228-
DUMMY_MACHINE_FUNCTION_PASS("prologepilog", PrologEpilogCodeInserterPass, ())
229211
#undef DUMMY_MACHINE_FUNCTION_PASS
230-
231-
#ifndef DUMMY_MACHINE_FUNCTION_ANALYSIS
232-
#define DUMMY_MACHINE_FUNCTION_ANALYSIS(NAME, PASS_NAME, CONSTRUCTOR)
233-
#endif
234-
DUMMY_MACHINE_FUNCTION_ANALYSIS("gc-analysis", GCMachineCodeAnalysisPass, ())
235-
#undef DUMMY_MACHINE_FUNCTION_ANALYSIS

llvm/lib/CodeGen/CodeGenPassBuilder.cpp

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,5 @@ namespace llvm {
2121
#include "llvm/CodeGen/MachinePassRegistry.def"
2222
#define DUMMY_MACHINE_FUNCTION_PASS(NAME, PASS_NAME, CONSTRUCTOR) \
2323
AnalysisKey PASS_NAME::Key;
24-
#define DUMMY_MACHINE_FUNCTION_ANALYSIS(NAME, PASS_NAME, CONSTRUCTOR) \
25-
AnalysisKey PASS_NAME::Key;
2624
#include "llvm/CodeGen/MachinePassRegistry.def"
2725
} // namespace llvm

0 commit comments

Comments
 (0)