[llvm] aeb0fdf - [SimplifyCFG] Respect optforfuzzing in NPM pass
Arthur Eubanks via llvm-commits
llvm-commits at lists.llvm.org
Mon Nov 16 09:56:52 PST 2020
Author: Arthur Eubanks
Date: 2020-11-16T09:56:37-08:00
New Revision: aeb0fdff351b6142eef3db5ce5033bfcb1d093e6
URL: https://github.com/llvm/llvm-project/commit/aeb0fdff351b6142eef3db5ce5033bfcb1d093e6
DIFF: https://github.com/llvm/llvm-project/commit/aeb0fdff351b6142eef3db5ce5033bfcb1d093e6.diff
LOG: [SimplifyCFG] Respect optforfuzzing in NPM pass
Regression caused by refactoring in
cdd006eec9409923f9a56b9026ce2cb72e7b71dc.
See discussion in https://reviews.llvm.org/D89917.
Reviewed By: arsenm, morehouse
Differential Revision: https://reviews.llvm.org/D91473
Added:
Modified:
llvm/lib/Transforms/Scalar/SimplifyCFGPass.cpp
llvm/test/Transforms/SimplifyCFG/opt-for-fuzzing.ll
Removed:
################################################################################
diff --git a/llvm/lib/Transforms/Scalar/SimplifyCFGPass.cpp b/llvm/lib/Transforms/Scalar/SimplifyCFGPass.cpp
index 1798e017bfad..c36619211971 100644
--- a/llvm/lib/Transforms/Scalar/SimplifyCFGPass.cpp
+++ b/llvm/lib/Transforms/Scalar/SimplifyCFGPass.cpp
@@ -245,6 +245,11 @@ PreservedAnalyses SimplifyCFGPass::run(Function &F,
FunctionAnalysisManager &AM) {
auto &TTI = AM.getResult<TargetIRAnalysis>(F);
Options.AC = &AM.getResult<AssumptionAnalysis>(F);
+ if (F.hasFnAttribute(Attribute::OptForFuzzing)) {
+ Options.setSimplifyCondBranch(false).setFoldTwoEntryPHINode(false);
+ } else {
+ Options.setSimplifyCondBranch(true).setFoldTwoEntryPHINode(true);
+ }
if (!simplifyFunctionCFG(F, TTI, Options))
return PreservedAnalyses::all();
PreservedAnalyses PA;
diff --git a/llvm/test/Transforms/SimplifyCFG/opt-for-fuzzing.ll b/llvm/test/Transforms/SimplifyCFG/opt-for-fuzzing.ll
index 429f4a3f8544..4a0d9e884615 100644
--- a/llvm/test/Transforms/SimplifyCFG/opt-for-fuzzing.ll
+++ b/llvm/test/Transforms/SimplifyCFG/opt-for-fuzzing.ll
@@ -1,4 +1,5 @@
; RUN: opt < %s -simplifycfg -S | FileCheck %s
+; RUN: opt < %s -passes=simplifycfg -S | FileCheck %s
define i32 @foo(i32 %x) optforfuzzing {
entry:
More information about the llvm-commits
mailing list