This is an archive of the discontinued LLVM Phabricator instance.

Differential D29071

Allow InstrCombine to remove one of adjacent guards if they are equivalent
ClosedPublic

Authored by mkazantsev on Jan 23 2017, 8:17 PM.

Details

Reviewers
reames
igor-laevsky
mkazantsev
majnemer
sanjoy
apilipenko
Commits
rGe812ca00bbd5: [InstCombine] Allow InstrCombine to remove one of adjacent guards if they are…
rL293056: [InstCombine] Allow InstrCombine to remove one of adjacent guards if they are…

Diff Detail

Event Timeline

mkazantsev created this revision.Jan 23 2017, 8:17 PM
mkazantsev added reviewers: igor-laevsky, reames.Jan 23 2017, 8:20 PM
mkazantsev accepted this revision.Jan 23 2017, 9:16 PM
This revision is now accepted and ready to land.Jan 23 2017, 9:16 PM
mkazantsev resigned from this revision.Jan 23 2017, 9:21 PM
This revision now requires review to proceed.Jan 23 2017, 9:21 PM
mkazantsev accepted this revision.Jan 23 2017, 9:21 PM
This revision is now accepted and ready to land.Jan 23 2017, 9:21 PM
mkazantsev requested review of this revision.Jan 23 2017, 9:21 PM
mkazantsev edited edge metadata.
mkazantsev added a comment.Jan 23 2017, 9:53 PM

LGTM

mkazantsev added a subscriber: llvm-commits.Jan 23 2017, 9:57 PM
mkazantsev added a comment.Jan 23 2017, 10:05 PM

ping

majnemer accepted this revision.Jan 23 2017, 10:13 PM
majnemer added a subscriber: majnemer.

LGTM

This revision is now accepted and ready to land.Jan 23 2017, 10:13 PM
mkazantsev set the repository for this revision to rL LLVM.Jan 23 2017, 11:26 PM
mkazantsev removed rL LLVM as the repository for this revision.Jan 23 2017, 11:47 PM
mkazantsev added a child revision: D29074: Canonicalize guards for AND condition.Jan 24 2017, 2:52 AM
apilipenko added a subscriber: apilipenko.Jan 24 2017, 9:33 AM
apilipenko added inline comments.
test/Transforms/InstCombine/call-guard.ll
6

It makes sense to add a negative test with different conditions.

mkazantsev updated this revision to Diff 85690.Jan 24 2017, 8:44 PM
mkazantsev added a reviewer: apilipenko.
mkazantsev marked an inline comment as done.

Added negative test.

apilipenko accepted this revision.Jan 25 2017, 12:31 AM
Closed by commit rL293056: [InstCombine] Allow InstrCombine to remove one of adjacent guards if they are… (authored by apilipenko). · Explain WhyJan 25 2017, 6:23 AM
This revision was automatically updated to reflect the committed changes.

Revision Contents

PathSize
lib/
Transforms/
InstCombine/
10 lines
test/
Transforms/
InstCombine/
30 lines

Diff 85690

lib/Transforms/InstCombine/InstCombineCalls.cpp

Show First 20 Lines • Show All 2,864 Lines • ▼ Show 20 Lines case Intrinsic::experimental_gc_relocate: {
} }
// TODO: bitcast(relocate(p)) -> relocate(bitcast(p)) // TODO: bitcast(relocate(p)) -> relocate(bitcast(p))
// Canonicalize on the type from the uses to the defs // Canonicalize on the type from the uses to the defs
// TODO: relocate((gep p, C, C2, ...)) -> gep(relocate(p), C, C2, ...) // TODO: relocate((gep p, C, C2, ...)) -> gep(relocate(p), C, C2, ...)
break; break;
} }
case Intrinsic::experimental_guard: {
Value *IIOperand = II->getArgOperand(0);
// Remove a guard if it is immediately followed by an identical guard.
if (match(II->getNextNode(),
m_Intrinsic<Intrinsic::experimental_guard>(m_Specific(IIOperand))))
return eraseInstFromFunction(*II);
break;
}
} }
return visitCallSite(II); return visitCallSite(II);
} }
// InvokeInst simplification // InvokeInst simplification
// //
Instruction *InstCombiner::visitInvokeInst(InvokeInst &II) { Instruction *InstCombiner::visitInvokeInst(InvokeInst &II) {
▲ Show 20 Lines • Show All 698 Lines • Show Last 20 Lines

test/Transforms/InstCombine/call-guard.ll

; RUN: opt < %s -instcombine -S | FileCheck %s
declare void @llvm.experimental.guard(i1, ...)
define void @test_guard_adjacent(i1 %A) {
; CHECK-LABEL: @test_guard_adjacent(
apilipenkoUnsubmitted
Done
ReplyInline Actions

It makes sense to add a negative test with different conditions.

apilipenko: It makes sense to add a negative test with different conditions.
; CHECK-NEXT: call void (i1, ...) @llvm.experimental.guard(i1 %A) [ "deopt"() ]
; CHECK-NEXT: ret void
call void(i1, ...) @llvm.experimental.guard( i1 %A )[ "deopt"() ]
call void(i1, ...) @llvm.experimental.guard( i1 %A )[ "deopt"() ]
call void(i1, ...) @llvm.experimental.guard( i1 %A )[ "deopt"() ]
call void(i1, ...) @llvm.experimental.guard( i1 %A )[ "deopt"() ]
call void(i1, ...) @llvm.experimental.guard( i1 %A )[ "deopt"() ]
call void(i1, ...) @llvm.experimental.guard( i1 %A )[ "deopt"() ]
call void(i1, ...) @llvm.experimental.guard( i1 %A )[ "deopt"() ]
call void(i1, ...) @llvm.experimental.guard( i1 %A )[ "deopt"() ]
call void(i1, ...) @llvm.experimental.guard( i1 %A )[ "deopt"() ]
call void(i1, ...) @llvm.experimental.guard( i1 %A )[ "deopt"() ]
ret void
}
define void @test_guard_adjacent_neg(i1 %A, i1 %B) {
; CHECK-LABEL: @test_guard_adjacent_neg(
; CHECK-NEXT: call void (i1, ...) @llvm.experimental.guard(i1 %A) [ "deopt"() ]
; CHECK-NEXT: call void (i1, ...) @llvm.experimental.guard(i1 %B) [ "deopt"() ]
; CHECK-NEXT: ret void
call void(i1, ...) @llvm.experimental.guard( i1 %A )[ "deopt"() ]
call void(i1, ...) @llvm.experimental.guard( i1 %B )[ "deopt"() ]
ret void
}