aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--instrumentation/cmplog-instructions-pass.cc6
-rw-r--r--instrumentation/cmplog-routines-pass.cc9
-rw-r--r--instrumentation/cmplog-switches-pass.cc89
3 files changed, 72 insertions, 32 deletions
diff --git a/instrumentation/cmplog-instructions-pass.cc b/instrumentation/cmplog-instructions-pass.cc
index aa3ad560..5bd98072 100644
--- a/instrumentation/cmplog-instructions-pass.cc
+++ b/instrumentation/cmplog-instructions-pass.cc
@@ -119,18 +119,20 @@ llvmGetPassPluginInfo() {
/* lambda to insert our pass into the pass pipeline. */
[](PassBuilder &PB) {
-#if LLVM_VERSION_MAJOR <= 13
+ #if LLVM_VERSION_MAJOR <= 13
using OptimizationLevel = typename PassBuilder::OptimizationLevel;
-#endif
+ #endif
PB.registerOptimizerLastEPCallback(
[](ModulePassManager &MPM, OptimizationLevel OL) {
MPM.addPass(CmpLogInstructions());
});
+
}};
}
+
#else
char CmpLogInstructions::ID = 0;
#endif
diff --git a/instrumentation/cmplog-routines-pass.cc b/instrumentation/cmplog-routines-pass.cc
index 2c2f2fc4..d146dfa3 100644
--- a/instrumentation/cmplog-routines-pass.cc
+++ b/instrumentation/cmplog-routines-pass.cc
@@ -83,7 +83,6 @@ class CmpLogRoutines : public ModulePass {
} // namespace
-
#if LLVM_MAJOR >= 11 && 1 == 0
llvmGetPassPluginInfo() {
@@ -91,24 +90,24 @@ llvmGetPassPluginInfo() {
/* lambda to insert our pass into the pass pipeline. */
[](PassBuilder &PB) {
-#if LLVM_VERSION_MAJOR <= 13
+ #if LLVM_VERSION_MAJOR <= 13
using OptimizationLevel = typename PassBuilder::OptimizationLevel;
-#endif
+ #endif
PB.registerOptimizerLastEPCallback(
[](ModulePassManager &MPM, OptimizationLevel OL) {
MPM.addPass(SplitComparesTransform());
});
+
}};
}
+
#else
char CmpLogRoutines::ID = 0;
#endif
-
-
bool CmpLogRoutines::hookRtns(Module &M) {
std::vector<CallInst *> calls, llvmStdStd, llvmStdC, gccStdStd, gccStdC,
diff --git a/instrumentation/cmplog-switches-pass.cc b/instrumentation/cmplog-switches-pass.cc
index 7c591e13..37bf3889 100644
--- a/instrumentation/cmplog-switches-pass.cc
+++ b/instrumentation/cmplog-switches-pass.cc
@@ -28,7 +28,14 @@
#include "llvm/Config/llvm-config.h"
#include "llvm/ADT/Statistic.h"
#include "llvm/IR/IRBuilder.h"
-#include "llvm/IR/LegacyPassManager.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"
+#endif
#include "llvm/IR/Module.h"
#include "llvm/Support/Debug.h"
#include "llvm/Support/raw_ostream.h"
@@ -37,6 +44,7 @@
#include "llvm/Pass.h"
#include "llvm/Analysis/ValueTracking.h"
+#include "llvm/IR/IRBuilder.h"
#if LLVM_VERSION_MAJOR >= 4 || \
(LLVM_VERSION_MAJOR == 3 && LLVM_VERSION_MINOR > 4)
#include "llvm/IR/Verifier.h"
@@ -54,29 +62,42 @@ using namespace llvm;
namespace {
-class CmpLogInstructions : public ModulePass {
+#if LLVM_VERSION_MAJOR >= 11 /* use new pass manager */
+class CmplogSwitches : public PassInfoMixin<CmplogSwitches> {
+
+ public:
+ CmplogSwitches() {
+
+#else
+class CmplogSwitches : public ModulePass {
public:
static char ID;
- CmpLogInstructions() : ModulePass(ID) {
+ CmplogSwitches() : ModulePass(ID) {
+#endif
initInstrumentList();
}
- bool runOnModule(Module &M) override;
+#if LLVM_VERSION_MAJOR >= 11 /* use new pass manager */
+ PreservedAnalyses run(Module &M, ModuleAnalysisManager &MAM);
+#else
+ bool runOnModule(Module &M) override;
-#if LLVM_VERSION_MAJOR < 4
+ #if LLVM_VERSION_MAJOR < 4
const char *getPassName() const override {
-#else
+ #else
StringRef getPassName() const override {
-#endif
- return "cmplog instructions";
+ #endif
+ return "cmplog switch split";
}
+#endif
+
private:
bool hookInstrs(Module &M);
@@ -84,27 +105,30 @@ class CmpLogInstructions : public ModulePass {
} // namespace
-#if LLVM_MAJOR >= 11 && 1 == 0
+#if LLVM_MAJOR >= 11
+extern "C" ::llvm::PassPluginLibraryInfo LLVM_ATTRIBUTE_WEAK
llvmGetPassPluginInfo() {
return {LLVM_PLUGIN_API_VERSION, "cmplogswitches", "v0.1",
/* lambda to insert our pass into the pass pipeline. */
[](PassBuilder &PB) {
-#if LLVM_VERSION_MAJOR <= 13
+ #if LLVM_VERSION_MAJOR <= 13
using OptimizationLevel = typename PassBuilder::OptimizationLevel;
-#endif
+ #endif
PB.registerOptimizerLastEPCallback(
[](ModulePassManager &MPM, OptimizationLevel OL) {
- MPM.addPass(SplitComparesTransform());
+ MPM.addPass(CmplogSwitches());
});
+
}};
}
+
#else
-char CmpLogInstructions::ID = 0;
+char CmplogSwitches::ID = 0;
#endif
template <class Iterator>
@@ -122,7 +146,7 @@ Iterator Unique(Iterator first, Iterator last) {
}
-bool CmpLogInstructions::hookInstrs(Module &M) {
+bool CmplogSwitches::hookInstrs(Module &M) {
std::vector<SwitchInst *> switches;
LLVMContext & C = M.getContext();
@@ -404,36 +428,51 @@ bool CmpLogInstructions::hookInstrs(Module &M) {
}
-bool CmpLogInstructions::runOnModule(Module &M) {
+#if LLVM_VERSION_MAJOR >= 11 /* use new pass manager */
+PreservedAnalyses CmplogSwitches::run(Module &M, ModuleAnalysisManager &MAM) {
+
+#else
+bool CmplogSwitches::runOnModule(Module &M) {
+
+#endif
if (getenv("AFL_QUIET") == NULL)
printf("Running cmplog-switches-pass by andreafioraldi@gmail.com\n");
else
be_quiet = 1;
hookInstrs(M);
+#if LLVM_VERSION_MAJOR >= 11 /* use new pass manager */
+ auto PA = PreservedAnalyses::all();
+#endif
verifyModule(M);
+#if LLVM_VERSION_MAJOR >= 11 /* use new pass manager */
+ return PA;
+#else
return true;
+#endif
}
-static void registerCmpLogInstructionsPass(const PassManagerBuilder &,
- legacy::PassManagerBase &PM) {
+#if LLVM_VERSION_MAJOR < 11 /* use old pass manager */
+static void registerCmplogSwitchesPass(const PassManagerBuilder &,
+ legacy::PassManagerBase &PM) {
- auto p = new CmpLogInstructions();
+ auto p = new CmplogSwitches();
PM.add(p);
}
-static RegisterStandardPasses RegisterCmpLogInstructionsPass(
- PassManagerBuilder::EP_OptimizerLast, registerCmpLogInstructionsPass);
+static RegisterStandardPasses RegisterCmplogSwitchesPass(
+ PassManagerBuilder::EP_OptimizerLast, registerCmplogSwitchesPass);
-static RegisterStandardPasses RegisterCmpLogInstructionsPass0(
- PassManagerBuilder::EP_EnabledOnOptLevel0, registerCmpLogInstructionsPass);
+static RegisterStandardPasses RegisterCmplogSwitchesPass0(
+ PassManagerBuilder::EP_EnabledOnOptLevel0, registerCmplogSwitchesPass);
-#if LLVM_VERSION_MAJOR >= 11
-static RegisterStandardPasses RegisterCmpLogInstructionsPassLTO(
+ #if LLVM_VERSION_MAJOR >= 11
+static RegisterStandardPasses RegisterCmplogSwitchesPassLTO(
PassManagerBuilder::EP_FullLinkTimeOptimizationLast,
- registerCmpLogInstructionsPass);
+ registerCmplogSwitchesPass);
+ #endif
#endif
generated by cgit v1.2.3 (git 2.25.1) at 2026-01-22 22:44:39 +0000