Skip to content

Commit 1a0e8e6

Browse files
committed
upgrade: (llvm 14) OptimizationLevel definition moved
llvm:7a797b2902993ad9ad9a04dcf46efc64398cd7e3
1 parent fff24c7 commit 1a0e8e6

File tree

2 files changed

+18
-17
lines changed

2 files changed

+18
-17
lines changed

Dummy.cpp

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,5 @@
11
#include "llvm/IR/PassManager.h"
2+
#include "llvm/Passes/OptimizationLevel.h"
23
#include "llvm/Passes/PassBuilder.h"
34
#include "llvm/Passes/PassPlugin.h"
45

@@ -54,22 +55,21 @@ extern "C" PassPluginLibraryInfo LLVM_ATTRIBUTE_WEAK llvmGetPassPluginInfo() {
5455
// instruction combiner. These passes will be inserted after each
5556
// instance of the instruction combiner pass.
5657
PB.registerPeepholeEPCallback(
57-
[](FunctionPassManager &FPM, PassBuilder::OptimizationLevel O) {
58+
[](FunctionPassManager &FPM, OptimizationLevel O) {
5859
outs() << "dummy: registerPeepholeEPCallback callback\n";
5960
FPM.addPass(DummyFunctionPass("PeepholeEPCallback"));
6061
});
6162

6263
// Add loop passes to the end of the loop optimizer.
6364
PB.registerLateLoopOptimizationsEPCallback([](LoopPassManager &LPM,
64-
PassBuilder::
65-
OptimizationLevel O) {
65+
OptimizationLevel O) {
6666
outs() << "dummy: registerLateLoopOptimizationsEPCallback callback\n";
6767
});
6868

6969
// Add optimization passes after most of the main optimizations, but
7070
// before the last cleanup-ish optimizations.
7171
PB.registerScalarOptimizerLateEPCallback(
72-
[](FunctionPassManager &FPM, PassBuilder::OptimizationLevel O) {
72+
[](FunctionPassManager &FPM, OptimizationLevel O) {
7373
outs()
7474
<< "dummy: registerScalarOptimizerLateEPCallback callback\n";
7575
FPM.addPass(DummyFunctionPass("ScalarOptimizerLateEPCallback"));
@@ -78,15 +78,15 @@ extern "C" PassPluginLibraryInfo LLVM_ATTRIBUTE_WEAK llvmGetPassPluginInfo() {
7878
// Add CallGraphSCC passes at the end of the main CallGraphSCC passes
7979
// and before any function simplification passes run by CGPassManager
8080
PB.registerCGSCCOptimizerLateEPCallback(
81-
[](CGSCCPassManager &CGPM, PassBuilder::OptimizationLevel O) {
81+
[](CGSCCPassManager &CGPM, OptimizationLevel O) {
8282
outs()
8383
<< "dummy: registerCGSCCOptimizerLateEPCallback callback\n";
8484
});
8585

8686
// Add optimization passes before the vectorizer and other highly target
8787
// specific optimization passes are executed.
8888
PB.registerVectorizerStartEPCallback(
89-
[](FunctionPassManager &FPM, PassBuilder::OptimizationLevel O) {
89+
[](FunctionPassManager &FPM, OptimizationLevel O) {
9090
outs() << "dummy: registerVectorizerStartEPCallback callback\n";
9191
FPM.addPass(DummyFunctionPass("VectorizerStartEPCallback"));
9292
});
@@ -96,7 +96,7 @@ extern "C" PassPluginLibraryInfo LLVM_ATTRIBUTE_WEAK llvmGetPassPluginInfo() {
9696
PB.registerPipelineStartEPCallback([](ModulePassManager &MPM
9797
#if LLVM_VERSION_MAJOR >= 12
9898
,
99-
PassBuilder::OptimizationLevel O
99+
OptimizationLevel O
100100
#endif
101101
) {
102102
outs() << "dummy: registerPipelineStartEPCallback callback\n";
@@ -107,7 +107,7 @@ extern "C" PassPluginLibraryInfo LLVM_ATTRIBUTE_WEAK llvmGetPassPluginInfo() {
107107
// Add optimization right after passes that do basic simplification of
108108
// the input IR.
109109
PB.registerPipelineEarlySimplificationEPCallback(
110-
[](ModulePassManager &MPM, PassBuilder::OptimizationLevel O) {
110+
[](ModulePassManager &MPM, OptimizationLevel O) {
111111
outs() << "dummy: registerPipelineEarlySimplificationEPCallback "
112112
"callback\n";
113113
MPM.addPass(
@@ -119,7 +119,7 @@ extern "C" PassPluginLibraryInfo LLVM_ATTRIBUTE_WEAK llvmGetPassPluginInfo() {
119119
// Add optimizations at the very end of the function optimization
120120
// pipeline.
121121
PB.registerOptimizerLastEPCallback(
122-
[](ModulePassManager &MPM, PassBuilder::OptimizationLevel O) {
122+
[](ModulePassManager &MPM, OptimizationLevel O) {
123123
outs() << "dummy: registerOptimizerLastEPCallback callback\n";
124124
MPM.addPass(DummyModulePass("OptimizerLastEPCallback"));
125125
});
@@ -130,7 +130,7 @@ extern "C" PassPluginLibraryInfo LLVM_ATTRIBUTE_WEAK llvmGetPassPluginInfo() {
130130
// at O0. Extensions to the O0 pipeline should append their passes to
131131
// the end of the overall pipeline.
132132
PB.registerOptimizerLastEPCallback(
133-
[](FunctionPassManager &FPM, PassBuilder::OptimizationLevel O) {
133+
[](FunctionPassManager &FPM, OptimizationLevel O) {
134134
outs() << "dummy: registerOptimizerLastEPCallback callback\n";
135135
FPM.addPass(DummyFunctionPass("OptimizerLastEPCallback"));
136136
});

Plugin.cpp

Lines changed: 8 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
11
#include "llvm/ADT/SmallVector.h"
22
#include "llvm/IR/PassManager.h"
3+
#include "llvm/Passes/OptimizationLevel.h"
34
#include "llvm/Passes/PassBuilder.h"
45
#include "llvm/Passes/PassPlugin.h"
56
#include "llvm/Support/FormatVariadic.h"
@@ -89,22 +90,22 @@ extern "C" PassPluginLibraryInfo LLVM_ATTRIBUTE_WEAK llvmGetPassPluginInfo() {
8990
// instruction combiner. These passes will be inserted after each
9091
// instance of the instruction combiner pass.
9192
PB.registerPeepholeEPCallback(
92-
[](FunctionPassManager &FPM, PassBuilder::OptimizationLevel O) {
93+
[](FunctionPassManager &FPM, OptimizationLevel O) {
9394
addPassesFromEnvVar(FPM, EnvVarPrefix + "PEEPHOLE_PASSES");
9495
});
9596

9697
// Add optimization passes after most of the main optimizations, but
9798
// before the last cleanup-ish optimizations.
9899
PB.registerScalarOptimizerLateEPCallback(
99-
[](FunctionPassManager &FPM, PassBuilder::OptimizationLevel O) {
100+
[](FunctionPassManager &FPM, OptimizationLevel O) {
100101
addPassesFromEnvVar(FPM,
101102
EnvVarPrefix + "SCALAROPTIMIZERLATE_PASSES");
102103
});
103104

104105
// Add optimization passes before the vectorizer and other highly target
105106
// specific optimization passes are executed.
106107
PB.registerVectorizerStartEPCallback(
107-
[](FunctionPassManager &FPM, PassBuilder::OptimizationLevel O) {
108+
[](FunctionPassManager &FPM, OptimizationLevel O) {
108109
addPassesFromEnvVar(FPM, EnvVarPrefix + "VECTORIZERSTART_PASSES");
109110
});
110111

@@ -113,7 +114,7 @@ extern "C" PassPluginLibraryInfo LLVM_ATTRIBUTE_WEAK llvmGetPassPluginInfo() {
113114
PB.registerPipelineStartEPCallback([&](ModulePassManager &MPM
114115
#if LLVM_VERSION_MAJOR >= 12
115116
,
116-
PassBuilder::OptimizationLevel O
117+
OptimizationLevel O
117118
#endif
118119
) {
119120
addPassesFromEnvVar(MPM, EnvVarPrefix + "PIPELINESTART_PASSES");
@@ -123,7 +124,7 @@ extern "C" PassPluginLibraryInfo LLVM_ATTRIBUTE_WEAK llvmGetPassPluginInfo() {
123124
// Add optimization right after passes that do basic simplification of
124125
// the input IR.
125126
PB.registerPipelineEarlySimplificationEPCallback(
126-
[](ModulePassManager &MPM, PassBuilder::OptimizationLevel O) {
127+
[](ModulePassManager &MPM, OptimizationLevel O) {
127128
addPassesFromEnvVar(
128129
MPM, EnvVarPrefix + "PIPELINEEARLYSIMPLIFICATION_PASSES");
129130
});
@@ -133,7 +134,7 @@ extern "C" PassPluginLibraryInfo LLVM_ATTRIBUTE_WEAK llvmGetPassPluginInfo() {
133134
// Add optimizations at the very end of the function optimization
134135
// pipeline.
135136
PB.registerOptimizerLastEPCallback(
136-
[](ModulePassManager &MPM, PassBuilder::OptimizationLevel O) {
137+
[](ModulePassManager &MPM, OptimizationLevel O) {
137138
addPassesFromEnvVar(MPM, EnvVarPrefix + "OPTIMIZERLASTEP_PASSES");
138139
});
139140
#else
@@ -143,7 +144,7 @@ extern "C" PassPluginLibraryInfo LLVM_ATTRIBUTE_WEAK llvmGetPassPluginInfo() {
143144
// at O0. Extensions to the O0 pipeline should append their passes to
144145
// the end of the overall pipeline.
145146
PB.registerOptimizerLastEPCallback(
146-
[](FunctionPassManager &FPM, PassBuilder::OptimizationLevel O) {
147+
[](FunctionPassManager &FPM, OptimizationLevel O) {
147148
addPassesFromEnvVar(FPM, EnvVarPrefix + "OPTIMIZERLASTEP_PASSES");
148149
});
149150
#endif

0 commit comments

Comments
 (0)