This is an archive of the discontinued LLVM Phabricator instance.

Differential D91473

[SimplifyCFG] Respect optforfuzzing in NPM pass
ClosedPublic

Authored by aeubanks on Nov 13 2020, 6:37 PM.

Details

Reviewers
zequanwu
arsenm
lebedev.ri
morehouse
Commits
rGaeb0fdff351b: [SimplifyCFG] Respect optforfuzzing in NPM pass
Summary

Regression caused by refactoring in
cdd006eec9409923f9a56b9026ce2cb72e7b71dc.

See discussion in https://reviews.llvm.org/D89917.

Diff Detail

Event Timeline

aeubanks created this revision.Nov 13 2020, 6:37 PM
Herald added a project: Restricted Project. · View Herald TranscriptNov 13 2020, 6:37 PM
Herald added subscribers: llvm-commits, hiraditya. · View Herald Transcript
aeubanks requested review of this revision.Nov 13 2020, 6:37 PM
Herald added a subscriber: wdng. · View Herald TranscriptNov 13 2020, 6:37 PM
Harbormaster completed remote builds in B78836: Diff 305290.Nov 13 2020, 7:40 PM
arsenm accepted this revision.Nov 16 2020, 7:00 AM
This revision is now accepted and ready to land.Nov 16 2020, 7:00 AM
morehouse accepted this revision.Nov 16 2020, 8:36 AM
This revision was landed with ongoing or failed builds.Nov 16 2020, 9:57 AM
Closed by commit rGaeb0fdff351b: [SimplifyCFG] Respect optforfuzzing in NPM pass (authored by aeubanks). · Explain Why
This revision was automatically updated to reflect the committed changes.
aeubanks added a commit: rGaeb0fdff351b: [SimplifyCFG] Respect optforfuzzing in NPM pass.

Revision Contents

PathSize
llvm/
lib/
Transforms/
Scalar/
5 lines
test/
Transforms/
SimplifyCFG/
1 line

Diff 305543

llvm/lib/Transforms/Scalar/SimplifyCFGPass.cpp

Show First 20 Lines • Show All 239 Lines • ▼ Show 20 LinesSimplifyCFGPass::SimplifyCFGPass(const SimplifyCFGOptions &Opts)
: Options(Opts) { : Options(Opts) {
applyCommandLineOverridesToOptions(Options); applyCommandLineOverridesToOptions(Options);
} }
PreservedAnalyses SimplifyCFGPass::run(Function &F, PreservedAnalyses SimplifyCFGPass::run(Function &F,
FunctionAnalysisManager &AM) { FunctionAnalysisManager &AM) {
auto &TTI = AM.getResult<TargetIRAnalysis>(F); auto &TTI = AM.getResult<TargetIRAnalysis>(F);
Options.AC = &AM.getResult<AssumptionAnalysis>(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)) if (!simplifyFunctionCFG(F, TTI, Options))
return PreservedAnalyses::all(); return PreservedAnalyses::all();
PreservedAnalyses PA; PreservedAnalyses PA;
PA.preserve<GlobalsAA>(); PA.preserve<GlobalsAA>();
return PA; return PA;
} }
namespace { namespace {
▲ Show 20 Lines • Show All 53 Lines • Show Last 20 Lines

llvm/test/Transforms/SimplifyCFG/opt-for-fuzzing.ll

; RUN: opt < %s -simplifycfg -S | FileCheck %s ; RUN: opt < %s -simplifycfg -S | FileCheck %s
; RUN: opt < %s -passes=simplifycfg -S | FileCheck %s
define i32 @foo(i32 %x) optforfuzzing { define i32 @foo(i32 %x) optforfuzzing {
entry: entry:
%x.addr = alloca i32, align 4 %x.addr = alloca i32, align 4
store i32 %x, i32* %x.addr, align 4 store i32 %x, i32* %x.addr, align 4
%0 = load i32, i32* %x.addr, align 4 %0 = load i32, i32* %x.addr, align 4
%cmp = icmp sgt i32 %0, 16 %cmp = icmp sgt i32 %0, 16
br i1 %cmp, label %land.rhs, label %land.end br i1 %cmp, label %land.rhs, label %land.end
Show All 40 Lines