Skip to content

Commit 92ed7e2

Browse files
optimisanoptimisan
authored
[CodeGen][PM] Use errs() instead of dbgs() in printer passes (#118469)
Printing passes is not exactly a debug activity, it is used in release (and dbgs() is errs() in release)
1 parent 59bc03c commit 92ed7e2

File tree

2 files changed

+64
-64
lines changed

2 files changed

+64
-64
lines changed

‎llvm/include/llvm/Passes/MachinePassRegistry.def‎

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@ MODULE_PASS("global-merge", GlobalMergePass(TM, GlobalMergeOptions()))
2828
MODULE_PASS("jmc-instrumenter", JMCInstrumenterPass())
2929
MODULE_PASS("lower-emutls", LowerEmuTLSPass())
3030
MODULE_PASS("pre-isel-intrinsic-lowering", PreISelIntrinsicLoweringPass())
31-
MODULE_PASS("print<regusage>", PhysicalRegisterUsageInfoPrinterPass(dbgs()))
31+
MODULE_PASS("print<regusage>", PhysicalRegisterUsageInfoPrinterPass(errs()))
3232
MODULE_PASS("shadow-stack-gc-lowering", ShadowStackGCLoweringPass())
3333
MODULE_PASS("global-merge-func", GlobalMergeFuncPass())
3434
#undef MODULE_PASS
@@ -146,19 +146,19 @@ MACHINE_FUNCTION_PASS("opt-phis", OptimizePHIsPass())
146146
MACHINE_FUNCTION_PASS("peephole-opt", PeepholeOptimizerPass())
147147
MACHINE_FUNCTION_PASS("phi-node-elimination", PHIEliminationPass())
148148
MACHINE_FUNCTION_PASS("print", PrintMIRPass())
149-
MACHINE_FUNCTION_PASS("print<live-intervals>", LiveIntervalsPrinterPass(dbgs()))
150-
MACHINE_FUNCTION_PASS("print<live-vars>", LiveVariablesPrinterPass(dbgs()))
149+
MACHINE_FUNCTION_PASS("print<live-intervals>", LiveIntervalsPrinterPass(errs()))
150+
MACHINE_FUNCTION_PASS("print<live-vars>", LiveVariablesPrinterPass(errs()))
151151
MACHINE_FUNCTION_PASS("print<machine-block-freq>",
152-
MachineBlockFrequencyPrinterPass(dbgs()))
152+
MachineBlockFrequencyPrinterPass(errs()))
153153
MACHINE_FUNCTION_PASS("print<machine-branch-prob>",
154-
MachineBranchProbabilityPrinterPass(dbgs()))
154+
MachineBranchProbabilityPrinterPass(errs()))
155155
MACHINE_FUNCTION_PASS("print<machine-dom-tree>",
156-
MachineDominatorTreePrinterPass(dbgs()))
157-
MACHINE_FUNCTION_PASS("print<machine-loops>", MachineLoopPrinterPass(dbgs()))
156+
MachineDominatorTreePrinterPass(errs()))
157+
MACHINE_FUNCTION_PASS("print<machine-loops>", MachineLoopPrinterPass(errs()))
158158
MACHINE_FUNCTION_PASS("print<machine-post-dom-tree>",
159-
MachinePostDominatorTreePrinterPass(dbgs()))
160-
MACHINE_FUNCTION_PASS("print<slot-indexes>", SlotIndexesPrinterPass(dbgs()))
161-
MACHINE_FUNCTION_PASS("print<virtregmap>", VirtRegMapPrinterPass(dbgs()))
159+
MachinePostDominatorTreePrinterPass(errs()))
160+
MACHINE_FUNCTION_PASS("print<slot-indexes>", SlotIndexesPrinterPass(errs()))
161+
MACHINE_FUNCTION_PASS("print<virtregmap>", VirtRegMapPrinterPass(errs()))
162162
MACHINE_FUNCTION_PASS("reg-usage-collector", RegUsageInfoCollectorPass())
163163
MACHINE_FUNCTION_PASS("reg-usage-propagation", RegUsageInfoPropagationPass())
164164
MACHINE_FUNCTION_PASS("require-all-machine-function-properties",

‎llvm/lib/Passes/PassRegistry.def‎

Lines changed: 54 additions & 54 deletions
Original file line numberDiff line numberDiff line change
@@ -89,7 +89,7 @@ MODULE_PASS("insert-gcov-profiling", GCOVProfilerPass())
8989
MODULE_PASS("instrorderfile", InstrOrderFilePass())
9090
MODULE_PASS("instrprof", InstrProfilingLoweringPass())
9191
MODULE_PASS("ctx-instr-lower", PGOCtxProfLoweringPass())
92-
MODULE_PASS("print<ctx-prof-analysis>", CtxProfAnalysisPrinterPass(dbgs()))
92+
MODULE_PASS("print<ctx-prof-analysis>", CtxProfAnalysisPrinterPass(errs()))
9393
MODULE_PASS("invalidate<all>", InvalidateAllAnalysesPass())
9494
MODULE_PASS("iroutliner", IROutlinerPass())
9595
MODULE_PASS("jmc-instrumenter", JMCInstrumenterPass())
@@ -116,21 +116,21 @@ MODULE_PASS("pgo-instr-gen", PGOInstrumentationGen())
116116
MODULE_PASS("pgo-instr-use", PGOInstrumentationUse())
117117
MODULE_PASS("poison-checking", PoisonCheckingPass())
118118
MODULE_PASS("pre-isel-intrinsic-lowering", PreISelIntrinsicLoweringPass(TM))
119-
MODULE_PASS("print", PrintModulePass(dbgs()))
120-
MODULE_PASS("print-callgraph", CallGraphPrinterPass(dbgs()))
121-
MODULE_PASS("print-callgraph-sccs", CallGraphSCCsPrinterPass(dbgs()))
122-
MODULE_PASS("print-ir-similarity", IRSimilarityAnalysisPrinterPass(dbgs()))
123-
MODULE_PASS("print-lcg", LazyCallGraphPrinterPass(dbgs()))
124-
MODULE_PASS("print-lcg-dot", LazyCallGraphDOTPrinterPass(dbgs()))
119+
MODULE_PASS("print", PrintModulePass(errs()))
120+
MODULE_PASS("print-callgraph", CallGraphPrinterPass(errs()))
121+
MODULE_PASS("print-callgraph-sccs", CallGraphSCCsPrinterPass(errs()))
122+
MODULE_PASS("print-ir-similarity", IRSimilarityAnalysisPrinterPass(errs()))
123+
MODULE_PASS("print-lcg", LazyCallGraphPrinterPass(errs()))
124+
MODULE_PASS("print-lcg-dot", LazyCallGraphDOTPrinterPass(errs()))
125125
MODULE_PASS("print-must-be-executed-contexts",
126-
MustBeExecutedContextPrinterPass(dbgs()))
127-
MODULE_PASS("print-profile-summary", ProfileSummaryPrinterPass(dbgs()))
128-
MODULE_PASS("print-stack-safety", StackSafetyGlobalPrinterPass(dbgs()))
129-
MODULE_PASS("print<dxil-metadata>", DXILMetadataAnalysisPrinterPass(dbgs()))
130-
MODULE_PASS("print<dxil-resource>", DXILResourcePrinterPass(dbgs()))
131-
MODULE_PASS("print<inline-advisor>", InlineAdvisorAnalysisPrinterPass(dbgs()))
132-
MODULE_PASS("print<module-debuginfo>", ModuleDebugInfoPrinterPass(dbgs()))
133-
MODULE_PASS("print<reg-usage>", PhysicalRegisterUsageInfoPrinterPass(dbgs()))
126+
MustBeExecutedContextPrinterPass(errs()))
127+
MODULE_PASS("print-profile-summary", ProfileSummaryPrinterPass(errs()))
128+
MODULE_PASS("print-stack-safety", StackSafetyGlobalPrinterPass(errs()))
129+
MODULE_PASS("print<dxil-metadata>", DXILMetadataAnalysisPrinterPass(errs()))
130+
MODULE_PASS("print<dxil-resource>", DXILResourcePrinterPass(errs()))
131+
MODULE_PASS("print<inline-advisor>", InlineAdvisorAnalysisPrinterPass(errs()))
132+
MODULE_PASS("print<module-debuginfo>", ModuleDebugInfoPrinterPass(errs()))
133+
MODULE_PASS("print<reg-usage>", PhysicalRegisterUsageInfoPrinterPass(errs()))
134134
MODULE_PASS("pseudo-probe", SampleProfileProbePass(TM))
135135
MODULE_PASS("pseudo-probe-update", PseudoProbeUpdatePass())
136136
MODULE_PASS("recompute-globalsaa", RecomputeGlobalsAAPass())
@@ -225,7 +225,7 @@ MODULE_PASS_WITH_PARAMS(
225225
MODULE_PASS_WITH_PARAMS(
226226
"print<structural-hash>", "StructuralHashPrinterPass",
227227
[](StructuralHashOptions Options) {
228-
return StructuralHashPrinterPass(dbgs(), Options);
228+
return StructuralHashPrinterPass(errs(), Options);
229229
},
230230
parseStructuralHashPrinterPassOptions, "detailed;call-target-ignored")
231231

@@ -424,38 +424,38 @@ FUNCTION_PASS("pa-eval", PAEvalPass())
424424
FUNCTION_PASS("partially-inline-libcalls", PartiallyInlineLibCallsPass())
425425
FUNCTION_PASS("pgo-memop-opt", PGOMemOPSizeOpt())
426426
FUNCTION_PASS("place-safepoints", PlaceSafepointsPass())
427-
FUNCTION_PASS("print", PrintFunctionPass(dbgs()))
427+
FUNCTION_PASS("print", PrintFunctionPass(errs()))
428428
// TODO: rename to print<foo> after NPM switch
429-
FUNCTION_PASS("print-alias-sets", AliasSetsPrinterPass(dbgs()))
430-
FUNCTION_PASS("print-cfg-sccs", CFGSCCPrinterPass(dbgs()))
431-
FUNCTION_PASS("print-memderefs", MemDerefPrinterPass(dbgs()))
432-
FUNCTION_PASS("print-mustexecute", MustExecutePrinterPass(dbgs()))
433-
FUNCTION_PASS("print-predicateinfo", PredicateInfoPrinterPass(dbgs()))
434-
FUNCTION_PASS("print<access-info>", LoopAccessInfoPrinterPass(dbgs()))
435-
FUNCTION_PASS("print<assumptions>", AssumptionPrinterPass(dbgs()))
436-
FUNCTION_PASS("print<block-freq>", BlockFrequencyPrinterPass(dbgs()))
437-
FUNCTION_PASS("print<branch-prob>", BranchProbabilityPrinterPass(dbgs()))
438-
FUNCTION_PASS("print<cost-model>", CostModelPrinterPass(dbgs()))
439-
FUNCTION_PASS("print<cycles>", CycleInfoPrinterPass(dbgs()))
440-
FUNCTION_PASS("print<da>", DependenceAnalysisPrinterPass(dbgs()))
441-
FUNCTION_PASS("print<debug-ata>", DebugAssignmentTrackingPrinterPass(dbgs()))
442-
FUNCTION_PASS("print<delinearization>", DelinearizationPrinterPass(dbgs()))
443-
FUNCTION_PASS("print<demanded-bits>", DemandedBitsPrinterPass(dbgs()))
444-
FUNCTION_PASS("print<domfrontier>", DominanceFrontierPrinterPass(dbgs()))
445-
FUNCTION_PASS("print<domtree>", DominatorTreePrinterPass(dbgs()))
446-
FUNCTION_PASS("print<func-properties>", FunctionPropertiesPrinterPass(dbgs()))
447-
FUNCTION_PASS("print<inline-cost>", InlineCostAnnotationPrinterPass(dbgs()))
429+
FUNCTION_PASS("print-alias-sets", AliasSetsPrinterPass(errs()))
430+
FUNCTION_PASS("print-cfg-sccs", CFGSCCPrinterPass(errs()))
431+
FUNCTION_PASS("print-memderefs", MemDerefPrinterPass(errs()))
432+
FUNCTION_PASS("print-mustexecute", MustExecutePrinterPass(errs()))
433+
FUNCTION_PASS("print-predicateinfo", PredicateInfoPrinterPass(errs()))
434+
FUNCTION_PASS("print<access-info>", LoopAccessInfoPrinterPass(errs()))
435+
FUNCTION_PASS("print<assumptions>", AssumptionPrinterPass(errs()))
436+
FUNCTION_PASS("print<block-freq>", BlockFrequencyPrinterPass(errs()))
437+
FUNCTION_PASS("print<branch-prob>", BranchProbabilityPrinterPass(errs()))
438+
FUNCTION_PASS("print<cost-model>", CostModelPrinterPass(errs()))
439+
FUNCTION_PASS("print<cycles>", CycleInfoPrinterPass(errs()))
440+
FUNCTION_PASS("print<da>", DependenceAnalysisPrinterPass(errs()))
441+
FUNCTION_PASS("print<debug-ata>", DebugAssignmentTrackingPrinterPass(errs()))
442+
FUNCTION_PASS("print<delinearization>", DelinearizationPrinterPass(errs()))
443+
FUNCTION_PASS("print<demanded-bits>", DemandedBitsPrinterPass(errs()))
444+
FUNCTION_PASS("print<domfrontier>", DominanceFrontierPrinterPass(errs()))
445+
FUNCTION_PASS("print<domtree>", DominatorTreePrinterPass(errs()))
446+
FUNCTION_PASS("print<func-properties>", FunctionPropertiesPrinterPass(errs()))
447+
FUNCTION_PASS("print<inline-cost>", InlineCostAnnotationPrinterPass(errs()))
448448
FUNCTION_PASS("print<inliner-size-estimator>",
449-
InlineSizeEstimatorAnalysisPrinterPass(dbgs()))
450-
FUNCTION_PASS("print<lazy-value-info>", LazyValueInfoPrinterPass(dbgs()))
451-
FUNCTION_PASS("print<loops>", LoopPrinterPass(dbgs()))
452-
FUNCTION_PASS("print<memoryssa-walker>", MemorySSAWalkerPrinterPass(dbgs()))
453-
FUNCTION_PASS("print<phi-values>", PhiValuesPrinterPass(dbgs()))
454-
FUNCTION_PASS("print<postdomtree>", PostDominatorTreePrinterPass(dbgs()))
455-
FUNCTION_PASS("print<regions>", RegionInfoPrinterPass(dbgs()))
456-
FUNCTION_PASS("print<scalar-evolution>", ScalarEvolutionPrinterPass(dbgs()))
457-
FUNCTION_PASS("print<stack-safety-local>", StackSafetyPrinterPass(dbgs()))
458-
FUNCTION_PASS("print<uniformity>", UniformityInfoPrinterPass(dbgs()))
449+
InlineSizeEstimatorAnalysisPrinterPass(errs()))
450+
FUNCTION_PASS("print<lazy-value-info>", LazyValueInfoPrinterPass(errs()))
451+
FUNCTION_PASS("print<loops>", LoopPrinterPass(errs()))
452+
FUNCTION_PASS("print<memoryssa-walker>", MemorySSAWalkerPrinterPass(errs()))
453+
FUNCTION_PASS("print<phi-values>", PhiValuesPrinterPass(errs()))
454+
FUNCTION_PASS("print<postdomtree>", PostDominatorTreePrinterPass(errs()))
455+
FUNCTION_PASS("print<regions>", RegionInfoPrinterPass(errs()))
456+
FUNCTION_PASS("print<scalar-evolution>", ScalarEvolutionPrinterPass(errs()))
457+
FUNCTION_PASS("print<stack-safety-local>", StackSafetyPrinterPass(errs()))
458+
FUNCTION_PASS("print<uniformity>", UniformityInfoPrinterPass(errs()))
459459
FUNCTION_PASS("reassociate", ReassociatePass())
460460
FUNCTION_PASS("redundant-dbg-inst-elim", RedundantDbgInstEliminationPass())
461461
FUNCTION_PASS("reg2mem", RegToMemPass())
@@ -562,19 +562,19 @@ FUNCTION_PASS_WITH_PARAMS(
562562
FUNCTION_PASS_WITH_PARAMS(
563563
"print<da>", "DependenceAnalysisPrinterPass",
564564
[](bool NormalizeResults) {
565-
return DependenceAnalysisPrinterPass(dbgs(), NormalizeResults);
565+
return DependenceAnalysisPrinterPass(errs(), NormalizeResults);
566566
},
567567
parseDependenceAnalysisPrinterOptions, "normalized-results")
568568
FUNCTION_PASS_WITH_PARAMS(
569569
"print<memoryssa>", "MemorySSAPrinterPass",
570570
[](bool NoEnsureOptimizedUses) {
571-
return MemorySSAPrinterPass(dbgs(), !NoEnsureOptimizedUses);
571+
return MemorySSAPrinterPass(errs(), !NoEnsureOptimizedUses);
572572
},
573573
parseMemorySSAPrinterPassOptions, "no-ensure-optimized-uses")
574574
FUNCTION_PASS_WITH_PARAMS(
575575
"print<stack-lifetime>", "StackLifetimePrinterPass",
576576
[](StackLifetime::LivenessType Type) {
577-
return StackLifetimePrinterPass(dbgs(), Type);
577+
return StackLifetimePrinterPass(errs(), Type);
578578
},
579579
parseStackLifetimeOptions, "may;must")
580580
FUNCTION_PASS_WITH_PARAMS(
@@ -664,11 +664,11 @@ LOOP_PASS("loop-simplifycfg", LoopSimplifyCFGPass())
664664
LOOP_PASS("loop-unroll-full", LoopFullUnrollPass())
665665
LOOP_PASS("loop-versioning-licm", LoopVersioningLICMPass())
666666
LOOP_PASS("no-op-loop", NoOpLoopPass())
667-
LOOP_PASS("print", PrintLoopPass(dbgs()))
668-
LOOP_PASS("print<ddg>", DDGAnalysisPrinterPass(dbgs()))
669-
LOOP_PASS("print<iv-users>", IVUsersPrinterPass(dbgs()))
670-
LOOP_PASS("print<loop-cache-cost>", LoopCachePrinterPass(dbgs()))
671-
LOOP_PASS("print<loopnest>", LoopNestPrinterPass(dbgs()))
667+
LOOP_PASS("print", PrintLoopPass(errs()))
668+
LOOP_PASS("print<ddg>", DDGAnalysisPrinterPass(errs()))
669+
LOOP_PASS("print<iv-users>", IVUsersPrinterPass(errs()))
670+
LOOP_PASS("print<loop-cache-cost>", LoopCachePrinterPass(errs()))
671+
LOOP_PASS("print<loopnest>", LoopNestPrinterPass(errs()))
672672
#undef LOOP_PASS
673673

674674
#ifndef LOOP_PASS_WITH_PARAMS

0 commit comments

Comments
 (0)