maxjhandsome
/
llvm-project
forked from OSchip/llvm-project
1
0
Fork 0
Code Issues Pull Requests Packages Releases Wiki Activity

[InstCombine] Make sure AddReachableCodeToWorklist sets MadeIRChange 

Summary:
Some optimizations in AddReachableCodeToWorklist did not update
the MadeIRChange state. This could happen both when removing
trivially dead instructions (DCE) and at constant folds.

It is essential that changes to the IR is reported correctly,
since for example InstCombinePass::run() will indicate that all
analyses are preserved otherwise.
And the CGPassManager determines if the CallGraph is up-to-date
based on status from InstructionCombiningPass::runOnFunction().

The new test case early_dce_clobbers_callgraph.ll is a reproducer
for some asserts that started to trigger after changes in the
inliner in r305245. With this patch the test case passes again.

Reviewers: sanjoy, craig.topper, dblaikie

Reviewed By: craig.topper

Subscribers: llvm-commits

Differential Revision: https://reviews.llvm.org/D34346

llvm-svn: 305725
This commit is contained in:
Bjorn Pettersson 2017-06-19 18:00:27 +00:00
parent ca69fc1cb7
commit 475fcd9cd8
3 changed files with 53 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
llvm/lib/Transforms/InstCombine/InstructionCombining.cpp
View File

@ -3012,6 +3012,7 @@ static bool AddReachableCodeToWorklist(BasicBlock *BB, const DataLayout &DL,
++NumDeadInst;
DEBUG(dbgs() << "IC: DCE: " << *Inst << '\n');
Inst->eraseFromParent();
MadeIRChange = true;
continue;
}
@ -3025,6 +3026,7 @@ static bool AddReachableCodeToWorklist(BasicBlock *BB, const DataLayout &DL,
++NumConstProp;
if (isInstructionTriviallyDead(Inst, TLI))
Inst->eraseFromParent();
MadeIRChange = true;
continue;
}

20
llvm/test/Transforms/InstCombine/early_constfold_changes_IR.ll Normal file
View File

@ -0,0 +1,20 @@
; This run line verifies that we get the expected constant fold.
; RUN: opt < %s -instcombine -S | FileCheck %s
; This run line verifies that InstructionCombiningPass::runOnFunction reports
; this as a modification of the IR.
; RUN: opt < %s -instcombine -disable-output -debug-pass=Details 2>&1 | FileCheck %s --check-prefix=DETAILS
define i32 @foo(i32 %arg) #0 {
; CHECK-LABEL: @foo(
; CHECK-NEXT: entry:
; CHECK-NEXT: [[AND:%.*]] = and i32 [[ARG:%.*]], 7
; CHECK-NEXT: ret i32 [[AND]]
;
entry:
%or = or i32 0, 7
%and = and i32 %arg, %or
ret i32 %and
}
; DETAILS: Made Modification 'Combine redundant instructions' on Function 'foo'

31
llvm/test/Transforms/InstCombine/early_dce_clobbers_callgraph.ll Normal file
View File

@ -0,0 +1,31 @@
; RUN: opt < %s -inline -instcombine -S | FileCheck %s
; This test case exposed a bug in instcombine where the early
; DCE of a call wasn't recognized as changing the IR.
; So when runOnFunction propagated the "made changes" upwards
; to the CallGraphSCCPass it signalled that no changes had been
; made, so CallGraphSCCPass assumed that the old CallGraph,
; as known by that pass manager, still was up-to-date.
;
; This was detected as an assert when trying to remove the
; no longer used function 'bar' (due to incorrect reference
; count in the CallGraph).
attributes #0 = { noinline norecurse nounwind readnone }
define void @foo() #0 {
; CHECK-LABEL: @foo(
; CHECK-NEXT: entry:
; CHECK-NEXT: ret void
;
entry:
%call = call i32 @bar()
ret void
}
define internal i32 @bar() #0 {
; CHECK-NOT: bar
entry:
ret i32 42
}