llvm new passmanager fixes
diff --git a/instrumentation/afl-llvm-pass.so.cc b/instrumentation/afl-llvm-pass.so.cc
index 41a3e17..9430644 100644
--- a/instrumentation/afl-llvm-pass.so.cc
+++ b/instrumentation/afl-llvm-pass.so.cc
@@ -45,18 +45,21 @@
#endif
#include "llvm/IR/IRBuilder.h"
-#if LLVM_VERSION_MAJOR >= 7 /* use new pass manager */
-#include "llvm/Passes/PassPlugin.h"
-#include "llvm/Passes/PassBuilder.h"
-#include "llvm/IR/PassManager.h"
+#if LLVM_VERSION_MAJOR >= 11 /* use new pass manager */
+ #include "llvm/Passes/PassPlugin.h"
+ #include "llvm/Passes/PassBuilder.h"
+ #include "llvm/IR/PassManager.h"
#else
-#include "llvm/IR/LegacyPassManager.h"
-#include "llvm/Transforms/IPO/PassManagerBuilder.h"
+ #include "llvm/IR/LegacyPassManager.h"
+ #include "llvm/Transforms/IPO/PassManagerBuilder.h"
#endif
#include "llvm/IR/BasicBlock.h"
#include "llvm/IR/Module.h"
#include "llvm/Support/Debug.h"
#include "llvm/Support/MathExtras.h"
+#if LLVM_VERSION_MAJOR >= 14 /* how about stable interfaces? */
+ #include "llvm/Passes/OptimizationLevel.h"
+#endif
#if LLVM_VERSION_MAJOR > 3 || \
(LLVM_VERSION_MAJOR == 3 && LLVM_VERSION_MINOR > 4)
@@ -74,22 +77,26 @@
namespace {
-#if LLVM_VERSION_MAJOR >= 7 /* use new pass manager */
+#if LLVM_VERSION_MAJOR >= 11 /* use new pass manager */
class AFLCoverage : public PassInfoMixin<AFLCoverage> {
+
public:
AFLCoverage() {
+
#else
class AFLCoverage : public ModulePass {
+
public:
static char ID;
AFLCoverage() : ModulePass(ID) {
+
#endif
initInstrumentList();
}
-#if LLVM_VERSION_MAJOR >= 7 /* use new pass manager */
+#if LLVM_VERSION_MAJOR >= 11 /* use new pass manager */
PreservedAnalyses run(Module &M, ModuleAnalysisManager &MAM);
#else
bool runOnModule(Module &M) override;
@@ -107,37 +114,51 @@
} // namespace
-#if LLVM_VERSION_MAJOR >= 7 /* use new pass manager */
+#if LLVM_VERSION_MAJOR >= 11 /* use new pass manager */
extern "C" ::llvm::PassPluginLibraryInfo LLVM_ATTRIBUTE_WEAK
llvmGetPassPluginInfo() {
- return {
- LLVM_PLUGIN_API_VERSION, "AFLCoverage", "v0.1",
- /* lambda to insert our pass into the pass pipeline. */
- [](PassBuilder &PB) {
-#if 1
- using OptimizationLevel = typename PassBuilder::OptimizationLevel;
- PB.registerOptimizerLastEPCallback(
- [](ModulePassManager &MPM, OptimizationLevel OL) {
- MPM.addPass(AFLCoverage());
- }
- );
-/* TODO LTO registration */
-#else
- using PipelineElement = typename PassBuilder::PipelineElement;
- PB.registerPipelineParsingCallback(
- [](StringRef Name, ModulePassManager &MPM, ArrayRef<PipelineElement>) {
- if ( Name == "AFLCoverage" ) {
- MPM.addPass(AFLCoverage());
- return true;
- } else {
- return false;
- }
- }
- );
-#endif
- }
- };
+
+ return {LLVM_PLUGIN_API_VERSION, "AFLCoverage", "v0.1",
+ /* lambda to insert our pass into the pass pipeline. */
+ [](PassBuilder &PB) {
+
+ #if 1
+ #if LLVM_VERSION_MAJOR <= 13
+ using OptimizationLevel = typename PassBuilder::OptimizationLevel;
+ #endif
+ PB.registerOptimizerLastEPCallback(
+ [](ModulePassManager &MPM, OptimizationLevel OL) {
+
+ MPM.addPass(AFLCoverage());
+
+ });
+
+ /* TODO LTO registration */
+ #else
+ using PipelineElement = typename PassBuilder::PipelineElement;
+ PB.registerPipelineParsingCallback([](StringRef Name,
+ ModulePassManager &MPM,
+ ArrayRef<PipelineElement>) {
+
+ if (Name == "AFLCoverage") {
+
+ MPM.addPass(AFLCoverage());
+ return true;
+
+ } else {
+
+ return false;
+
+ }
+
+ });
+
+ #endif
+
+ }};
+
}
+
#else
char AFLCoverage::ID = 0;
@@ -168,11 +189,12 @@
#define AFL_HAVE_VECTOR_INTRINSICS 1
#endif
-
-#if LLVM_VERSION_MAJOR >= 7 /* use new pass manager */
+#if LLVM_VERSION_MAJOR >= 11 /* use new pass manager */
PreservedAnalyses AFLCoverage::run(Module &M, ModuleAnalysisManager &MAM) {
+
#else
bool AFLCoverage::runOnModule(Module &M) {
+
#endif
LLVMContext &C = M.getContext();
@@ -188,7 +210,7 @@
u32 rand_seed;
unsigned int cur_loc = 0;
-#if LLVM_VERSION_MAJOR >= 7 /* use new pass manager */
+#if LLVM_VERSION_MAJOR >= 11 /* use new pass manager */
auto PA = PreservedAnalyses::all();
#endif
@@ -1029,7 +1051,7 @@
}
-#if LLVM_VERSION_MAJOR >= 7 /* use new pass manager */
+#if LLVM_VERSION_MAJOR >= 11 /* use new pass manager */
return PA;
#else
return true;
@@ -1037,7 +1059,7 @@
}
-#if LLVM_VERSION_MAJOR < 7 /* use old pass manager */
+#if LLVM_VERSION_MAJOR < 11 /* use old pass manager */
static void registerAFLPass(const PassManagerBuilder &,
legacy::PassManagerBase &PM) {
@@ -1051,3 +1073,4 @@
static RegisterStandardPasses RegisterAFLPass0(
PassManagerBuilder::EP_EnabledOnOptLevel0, registerAFLPass);
#endif
+
diff --git a/instrumentation/compare-transform-pass.so.cc b/instrumentation/compare-transform-pass.so.cc
index 3972fed..b05da71 100644
--- a/instrumentation/compare-transform-pass.so.cc
+++ b/instrumentation/compare-transform-pass.so.cc
@@ -26,7 +26,7 @@
#include "llvm/ADT/Statistic.h"
#include "llvm/IR/IRBuilder.h"
-#if LLVM_MAJOR >= 7 /* use new pass manager */
+#if LLVM_MAJOR >= 11 /* use new pass manager */
#include "llvm/Passes/PassPlugin.h"
#include "llvm/Passes/PassBuilder.h"
#include "llvm/IR/PassManager.h"
@@ -40,6 +40,9 @@
#include "llvm/Transforms/Utils/BasicBlockUtils.h"
#include "llvm/Pass.h"
#include "llvm/Analysis/ValueTracking.h"
+#if LLVM_VERSION_MAJOR >= 14 /* how about stable interfaces? */
+ #include "llvm/Passes/OptimizationLevel.h"
+#endif
#if LLVM_VERSION_MAJOR > 3 || \
(LLVM_VERSION_MAJOR == 3 && LLVM_VERSION_MINOR > 4)
@@ -58,7 +61,7 @@
namespace {
-#if LLVM_MAJOR >= 7 /* use new pass manager */
+#if LLVM_MAJOR >= 11 /* use new pass manager */
class CompareTransform : public PassInfoMixin<CompareTransform> {
public:
@@ -77,7 +80,7 @@
}
-#if LLVM_MAJOR >= 7 /* use new pass manager */
+#if LLVM_MAJOR >= 11 /* use new pass manager */
PreservedAnalyses run(Module &M, ModuleAnalysisManager &MAM);
#else
bool runOnModule(Module &M) override;
@@ -93,7 +96,7 @@
} // namespace
-#if LLVM_MAJOR >= 7 /* use new pass manager */
+#if LLVM_MAJOR >= 11 /* use new pass manager */
extern "C" ::llvm::PassPluginLibraryInfo LLVM_ATTRIBUTE_WEAK
llvmGetPassPluginInfo() {
@@ -102,7 +105,9 @@
[](PassBuilder &PB) {
#if 1
+ #if LLVM_VERSION_MAJOR <= 13
using OptimizationLevel = typename PassBuilder::OptimizationLevel;
+ #endif
PB.registerOptimizerLastEPCallback(
[](ModulePassManager &MPM, OptimizationLevel OL) {
@@ -650,7 +655,7 @@
}
-#if LLVM_MAJOR >= 7 /* use new pass manager */
+#if LLVM_MAJOR >= 11 /* use new pass manager */
PreservedAnalyses CompareTransform::run(Module &M, ModuleAnalysisManager &MAM) {
#else
@@ -665,19 +670,19 @@
else
be_quiet = 1;
-#if LLVM_MAJOR >= 7 /* use new pass manager */
+#if LLVM_MAJOR >= 11 /* use new pass manager */
auto PA = PreservedAnalyses::all();
#endif
transformCmps(M, true, true, true, true, true);
verifyModule(M);
-#if LLVM_MAJOR >= 7 /* use new pass manager */
- /* if (modified) {
-
- PA.abandon<XX_Manager>();
-
- }*/
+#if LLVM_MAJOR >= 11 /* use new pass manager */
+ /* if (modified) {
+
+ PA.abandon<XX_Manager>();
+
+ }*/
return PA;
#else
@@ -686,7 +691,7 @@
}
-#if LLVM_MAJOR < 7 /* use old pass manager */
+#if LLVM_MAJOR < 11 /* use old pass manager */
static void registerCompTransPass(const PassManagerBuilder &,
legacy::PassManagerBase &PM) {
diff --git a/instrumentation/split-compares-pass.so.cc b/instrumentation/split-compares-pass.so.cc
index 8ea67a2..8637398 100644
--- a/instrumentation/split-compares-pass.so.cc
+++ b/instrumentation/split-compares-pass.so.cc
@@ -30,16 +30,19 @@
#include "llvm/Pass.h"
#include "llvm/Support/raw_ostream.h"
-#if LLVM_MAJOR >= 7
-#include "llvm/Passes/PassPlugin.h"
-#include "llvm/Passes/PassBuilder.h"
-#include "llvm/IR/PassManager.h"
+#if LLVM_MAJOR >= 11
+ #include "llvm/Passes/PassPlugin.h"
+ #include "llvm/Passes/PassBuilder.h"
+ #include "llvm/IR/PassManager.h"
#else
-#include "llvm/IR/LegacyPassManager.h"
-#include "llvm/Transforms/IPO/PassManagerBuilder.h"
+ #include "llvm/IR/LegacyPassManager.h"
+ #include "llvm/Transforms/IPO/PassManagerBuilder.h"
#endif
#include "llvm/Transforms/Utils/BasicBlockUtils.h"
#include "llvm/IR/Module.h"
+#if LLVM_VERSION_MAJOR >= 14 /* how about stable interfaces? */
+ #include "llvm/Passes/OptimizationLevel.h"
+#endif
#include "llvm/IR/IRBuilder.h"
#if LLVM_VERSION_MAJOR > 3 || \
@@ -61,22 +64,27 @@
namespace {
-#if LLVM_MAJOR >= 7
+#if LLVM_MAJOR >= 11
class SplitComparesTransform : public PassInfoMixin<SplitComparesTransform> {
+
public:
-// static char ID;
+ // static char ID;
SplitComparesTransform() : enableFPSplit(0) {
+
#else
class SplitComparesTransform : public ModulePass {
+
public:
static char ID;
SplitComparesTransform() : ModulePass(ID), enableFPSplit(0) {
+
#endif
initInstrumentList();
+
}
-#if LLVM_MAJOR >= 7
+#if LLVM_MAJOR >= 11
PreservedAnalyses run(Module &M, ModuleAnalysisManager &MAM);
#else
bool runOnModule(Module &M) override;
@@ -169,37 +177,51 @@
} // namespace
-#if LLVM_MAJOR >= 7
+#if LLVM_MAJOR >= 11
extern "C" ::llvm::PassPluginLibraryInfo LLVM_ATTRIBUTE_WEAK
llvmGetPassPluginInfo() {
- return {
- LLVM_PLUGIN_API_VERSION, "splitcompares", "v0.1",
- /* lambda to insert our pass into the pass pipeline. */
- [](PassBuilder &PB) {
-#if 1
- using OptimizationLevel = typename PassBuilder::OptimizationLevel;
- PB.registerOptimizerLastEPCallback(
- [](ModulePassManager &MPM, OptimizationLevel OL) {
- MPM.addPass(SplitComparesTransform());
- }
- );
-/* TODO LTO registration */
-#else
- using PipelineElement = typename PassBuilder::PipelineElement;
- PB.registerPipelineParsingCallback(
- [](StringRef Name, ModulePassManager &MPM, ArrayRef<PipelineElement>) {
- if ( Name == "splitcompares" ) {
- MPM.addPass(SplitComparesTransform());
- return true;
- } else {
- return false;
- }
- }
- );
-#endif
- }
- };
+
+ return {LLVM_PLUGIN_API_VERSION, "splitcompares", "v0.1",
+ /* lambda to insert our pass into the pass pipeline. */
+ [](PassBuilder &PB) {
+
+ #if 1
+ #if LLVM_VERSION_MAJOR <= 13
+ using OptimizationLevel = typename PassBuilder::OptimizationLevel;
+ #endif
+ PB.registerOptimizerLastEPCallback(
+ [](ModulePassManager &MPM, OptimizationLevel OL) {
+
+ MPM.addPass(SplitComparesTransform());
+
+ });
+
+ /* TODO LTO registration */
+ #else
+ using PipelineElement = typename PassBuilder::PipelineElement;
+ PB.registerPipelineParsingCallback([](StringRef Name,
+ ModulePassManager &MPM,
+ ArrayRef<PipelineElement>) {
+
+ if (Name == "splitcompares") {
+
+ MPM.addPass(SplitComparesTransform());
+ return true;
+
+ } else {
+
+ return false;
+
+ }
+
+ });
+
+ #endif
+
+ }};
+
}
+
#else
char SplitComparesTransform::ID = 0;
#endif
@@ -1356,10 +1378,13 @@
}
-#if LLVM_MAJOR >= 7
-PreservedAnalyses SplitComparesTransform::run(Module &M, ModuleAnalysisManager &MAM) {
+#if LLVM_MAJOR >= 11
+PreservedAnalyses SplitComparesTransform::run(Module & M,
+ ModuleAnalysisManager &MAM) {
+
#else
bool SplitComparesTransform::runOnModule(Module &M) {
+
#endif
char *bitw_env = getenv("AFL_LLVM_LAF_SPLIT_COMPARES_BITW");
@@ -1383,7 +1408,7 @@
}
-#if LLVM_MAJOR >= 7
+#if LLVM_MAJOR >= 11
auto PA = PreservedAnalyses::all();
#endif
@@ -1420,12 +1445,15 @@
auto op0 = CI->getOperand(0);
auto op1 = CI->getOperand(1);
if (!op0 || !op1) {
-#if LLVM_MAJOR >= 7
+
+#if LLVM_MAJOR >= 11
return PA;
#else
return false;
#endif
+
}
+
auto iTy1 = dyn_cast<IntegerType>(op0->getType());
if (iTy1 && isa<IntegerType>(op1->getType())) {
@@ -1476,13 +1504,17 @@
if ((isatty(2) && getenv("AFL_QUIET") == NULL) ||
getenv("AFL_DEBUG") != NULL) {
+
errs() << count << " comparisons found\n";
+
}
-#if LLVM_MAJOR >= 7
-/* if (modified) {
- PA.abandon<XX_Manager>();
- }*/
+#if LLVM_MAJOR >= 11
+ /* if (modified) {
+
+ PA.abandon<XX_Manager>();
+
+ }*/
return PA;
#else
@@ -1491,7 +1523,7 @@
}
-#if LLVM_MAJOR < 7 /* use old pass manager */
+#if LLVM_MAJOR < 11 /* use old pass manager */
static void registerSplitComparesPass(const PassManagerBuilder &,
legacy::PassManagerBase &PM) {
@@ -1506,14 +1538,15 @@
static RegisterStandardPasses RegisterSplitComparesTransPass0(
PassManagerBuilder::EP_EnabledOnOptLevel0, registerSplitComparesPass);
-#if LLVM_VERSION_MAJOR >= 11
+ #if LLVM_VERSION_MAJOR >= 11
static RegisterStandardPasses RegisterSplitComparesTransPassLTO(
PassManagerBuilder::EP_FullLinkTimeOptimizationLast,
registerSplitComparesPass);
-#endif
+ #endif
static RegisterPass<SplitComparesTransform> X("splitcompares",
"AFL++ split compares",
true /* Only looks at CFG */,
true /* Analysis Pass */);
#endif
+
diff --git a/instrumentation/split-switches-pass.so.cc b/instrumentation/split-switches-pass.so.cc
index ca8cdc9..7bff278 100644
--- a/instrumentation/split-switches-pass.so.cc
+++ b/instrumentation/split-switches-pass.so.cc
@@ -27,13 +27,13 @@
#include "llvm/ADT/Statistic.h"
#include "llvm/IR/IRBuilder.h"
-#if LLVM_VERSION_MAJOR >= 7 /* use new pass manager */
-#include "llvm/Passes/PassPlugin.h"
-#include "llvm/Passes/PassBuilder.h"
-#include "llvm/IR/PassManager.h"
+#if LLVM_VERSION_MAJOR >= 11 /* use new pass manager */
+ #include "llvm/Passes/PassPlugin.h"
+ #include "llvm/Passes/PassBuilder.h"
+ #include "llvm/IR/PassManager.h"
#else
-#include "llvm/IR/LegacyPassManager.h"
-#include "llvm/Transforms/IPO/PassManagerBuilder.h"
+ #include "llvm/IR/LegacyPassManager.h"
+ #include "llvm/Transforms/IPO/PassManagerBuilder.h"
#endif
#include "llvm/IR/Module.h"
#include "llvm/Support/Debug.h"
@@ -41,6 +41,9 @@
#include "llvm/Transforms/Utils/BasicBlockUtils.h"
#include "llvm/Pass.h"
#include "llvm/Analysis/ValueTracking.h"
+#if LLVM_VERSION_MAJOR >= 14 /* how about stable interfaces? */
+ #include "llvm/Passes/OptimizationLevel.h"
+#endif
#include "llvm/IR/IRBuilder.h"
#if LLVM_VERSION_MAJOR > 3 || \
@@ -60,37 +63,40 @@
namespace {
-#if LLVM_VERSION_MAJOR >= 7 /* use new pass manager */
+#if LLVM_VERSION_MAJOR >= 11 /* use new pass manager */
class SplitSwitchesTransform : public PassInfoMixin<SplitSwitchesTransform> {
public:
SplitSwitchesTransform() {
+
#else
class SplitSwitchesTransform : public ModulePass {
public:
static char ID;
SplitSwitchesTransform() : ModulePass(ID) {
+
#endif
initInstrumentList();
}
-#if LLVM_VERSION_MAJOR >= 7 /* use new pass manager */
+#if LLVM_VERSION_MAJOR >= 11 /* use new pass manager */
PreservedAnalyses run(Module &M, ModuleAnalysisManager &MAM);
#else
- bool runOnModule(Module &M) override;
+ bool runOnModule(Module &M) override;
-#if LLVM_VERSION_MAJOR >= 4
+ #if LLVM_VERSION_MAJOR >= 4
StringRef getPassName() const override {
-#else
+ #else
const char *getPassName() const override {
-#endif
+ #endif
return "splits switch constructs";
}
+
#endif
struct CaseExpr {
@@ -119,37 +125,51 @@
} // namespace
-#if LLVM_VERSION_MAJOR >= 7 /* use new pass manager */
+#if LLVM_VERSION_MAJOR >= 11 /* use new pass manager */
extern "C" ::llvm::PassPluginLibraryInfo LLVM_ATTRIBUTE_WEAK
llvmGetPassPluginInfo() {
- return {
- LLVM_PLUGIN_API_VERSION, "splitswitches", "v0.1",
- /* lambda to insert our pass into the pass pipeline. */
- [](PassBuilder &PB) {
-#if 1
- using OptimizationLevel = typename PassBuilder::OptimizationLevel;
- PB.registerOptimizerLastEPCallback(
- [](ModulePassManager &MPM, OptimizationLevel OL) {
- MPM.addPass(SplitSwitchesTransform());
- }
- );
-/* TODO LTO registration */
-#else
- using PipelineElement = typename PassBuilder::PipelineElement;
- PB.registerPipelineParsingCallback(
- [](StringRef Name, ModulePassManager &MPM, ArrayRef<PipelineElement>) {
- if ( Name == "splitswitches" ) {
- MPM.addPass(SplitSwitchesTransform());
- return true;
- } else {
- return false;
- }
- }
- );
-#endif
- }
- };
+
+ return {LLVM_PLUGIN_API_VERSION, "splitswitches", "v0.1",
+ /* lambda to insert our pass into the pass pipeline. */
+ [](PassBuilder &PB) {
+
+ #if 1
+ #if LLVM_VERSION_MAJOR <= 13
+ using OptimizationLevel = typename PassBuilder::OptimizationLevel;
+ #endif
+ PB.registerOptimizerLastEPCallback(
+ [](ModulePassManager &MPM, OptimizationLevel OL) {
+
+ MPM.addPass(SplitSwitchesTransform());
+
+ });
+
+ /* TODO LTO registration */
+ #else
+ using PipelineElement = typename PassBuilder::PipelineElement;
+ PB.registerPipelineParsingCallback([](StringRef Name,
+ ModulePassManager &MPM,
+ ArrayRef<PipelineElement>) {
+
+ if (Name == "splitswitches") {
+
+ MPM.addPass(SplitSwitchesTransform());
+ return true;
+
+ } else {
+
+ return false;
+
+ }
+
+ });
+
+ #endif
+
+ }};
+
}
+
#else
char SplitSwitchesTransform::ID = 0;
#endif
@@ -464,10 +484,13 @@
}
-#if LLVM_VERSION_MAJOR >= 7 /* use new pass manager */
-PreservedAnalyses SplitSwitchesTransform::run(Module &M, ModuleAnalysisManager &MAM) {
+#if LLVM_VERSION_MAJOR >= 11 /* use new pass manager */
+PreservedAnalyses SplitSwitchesTransform::run(Module & M,
+ ModuleAnalysisManager &MAM) {
+
#else
bool SplitSwitchesTransform::runOnModule(Module &M) {
+
#endif
if ((isatty(2) && getenv("AFL_QUIET") == NULL) || getenv("AFL_DEBUG") != NULL)
@@ -475,17 +498,19 @@
else
be_quiet = 1;
-#if LLVM_VERSION_MAJOR >= 7 /* use new pass manager */
+#if LLVM_VERSION_MAJOR >= 11 /* use new pass manager */
auto PA = PreservedAnalyses::all();
#endif
splitSwitches(M);
verifyModule(M);
-#if LLVM_VERSION_MAJOR >= 7 /* use new pass manager */
-/* if (modified) {
- PA.abandon<XX_Manager>();
- }*/
+#if LLVM_VERSION_MAJOR >= 11 /* use new pass manager */
+ /* if (modified) {
+
+ PA.abandon<XX_Manager>();
+
+ }*/
return PA;
#else
@@ -494,7 +519,7 @@
}
-#if LLVM_VERSION_MAJOR < 7 /* use old pass manager */
+#if LLVM_VERSION_MAJOR < 11 /* use old pass manager */
static void registerSplitSwitchesTransPass(const PassManagerBuilder &,
legacy::PassManagerBase &PM) {
@@ -509,9 +534,10 @@
static RegisterStandardPasses RegisterSplitSwitchesTransPass0(
PassManagerBuilder::EP_EnabledOnOptLevel0, registerSplitSwitchesTransPass);
-#if LLVM_VERSION_MAJOR >= 11
+ #if LLVM_VERSION_MAJOR >= 11
static RegisterStandardPasses RegisterSplitSwitchesTransPassLTO(
PassManagerBuilder::EP_FullLinkTimeOptimizationLast,
registerSplitSwitchesTransPass);
+ #endif
#endif
-#endif
+
