-
Notifications
You must be signed in to change notification settings - Fork 15k
[InstCombine] Preserve profile data with select instructions and binary operators #158375
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
base: main
Are you sure you want to change the base?
Changes from 1 commit
5ac86b7
cad50aa
938a4d4
5d7169e
701bf31
fe929d4
d2979b4
52d9c46
d8731d3
dfbd3f3
File filter
Filter by extension
Conversations
Jump to
Diff view
Diff view
…ry operators Tracking issue: #147390
- Loading branch information
There are no files selected for viewing
Original file line number | Diff line number | Diff line change |
---|---|---|
|
@@ -144,6 +144,8 @@ static cl::opt<unsigned> | |
MaxArraySize("instcombine-maxarray-size", cl::init(1024), | ||
cl::desc("Maximum array size considered when doing a combine")); | ||
|
||
extern cl::opt<bool> ProfcheckDisableMetadataFixes; | ||
|
||
// FIXME: Remove this flag when it is no longer necessary to convert | ||
// llvm.dbg.declare to avoid inaccurate debug info. Setting this to false | ||
// increases variable availability at the cost of accuracy. Variables that | ||
|
@@ -1372,6 +1374,7 @@ Value *InstCombinerImpl::SimplifySelectsFeedingBinaryOp(BinaryOperator &I, | |
SimplifyQuery Q = SQ.getWithInstruction(&I); | ||
|
||
Value *Cond, *True = nullptr, *False = nullptr; | ||
MDNode *ProfileData; | ||
|
||
// Special-case for add/negate combination. Replace the zero in the negation | ||
// with the trailing add operand: | ||
|
@@ -1381,24 +1384,28 @@ Value *InstCombinerImpl::SimplifySelectsFeedingBinaryOp(BinaryOperator &I, | |
// We need an 'add' and exactly 1 arm of the select to have been simplified. | ||
if (Opcode != Instruction::Add || (!True && !False) || (True && False)) | ||
return nullptr; | ||
|
||
Value *N; | ||
Value *N, *SI = nullptr; | ||
if (True && match(FVal, m_Neg(m_Value(N)))) { | ||
Value *Sub = Builder.CreateSub(Z, N); | ||
return Builder.CreateSelect(Cond, True, Sub, I.getName()); | ||
SI = Builder.CreateSelect(Cond, True, Sub, I.getName()); | ||
} | ||
if (False && match(TVal, m_Neg(m_Value(N)))) { | ||
Value *Sub = Builder.CreateSub(Z, N); | ||
return Builder.CreateSelect(Cond, Sub, False, I.getName()); | ||
SI = Builder.CreateSelect(Cond, Sub, False, I.getName()); | ||
} | ||
return nullptr; | ||
if (!ProfcheckDisableMetadataFixes && !SI) | ||
cast<SelectInst>(SI)->setMetadata(LLVMContext::MD_prof, ProfileData); | ||
return SI; | ||
}; | ||
|
||
if (LHSIsSelect && RHSIsSelect && A == D) { | ||
// (A ? B : C) op (A ? E : F) -> A ? (B op E) : (C op F) | ||
Cond = A; | ||
True = simplifyBinOp(Opcode, B, E, FMF, Q); | ||
False = simplifyBinOp(Opcode, C, F, FMF, Q); | ||
// Profile weights for both LHS and RHS should be the same because they have | ||
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. is there something we could assert? like maybe that the fraction is the same... albeit that's float point comparison, ugh... ok, how about a ORE message about what the 2 were, or LLVM_DEBUG, just so we can easily introspect if we ever need to. There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. Added an assertion that left and right profiles should be equal. There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. there are 2 cases where the pointers won't be the same:
IDK, may be safer to LLVM_DEBUG. The assert may get someone on a wild goose chase in the cases above. Or add a comment above it that we don't expect those cases to happen, but if they do, safe to replace the assert w a LLVM_DEBUG or something of the sort. There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. There is no IR validity constraint that branch weight metadata has to "make sense", so you also can't assert that here. |
||
// the same idempotent conditional. | ||
ProfileData = cast<SelectInst>(LHS)->getMetadata(LLVMContext::MD_prof); | ||
|
||
if (LHS->hasOneUse() && RHS->hasOneUse()) { | ||
if (False && !True) | ||
|
@@ -1408,13 +1415,15 @@ Value *InstCombinerImpl::SimplifySelectsFeedingBinaryOp(BinaryOperator &I, | |
} | ||
} else if (LHSIsSelect && LHS->hasOneUse()) { | ||
// (A ? B : C) op Y -> A ? (B op Y) : (C op Y) | ||
ProfileData = cast<SelectInst>(LHS)->getMetadata(LLVMContext::MD_prof); | ||
Cond = A; | ||
True = simplifyBinOp(Opcode, B, RHS, FMF, Q); | ||
False = simplifyBinOp(Opcode, C, RHS, FMF, Q); | ||
if (Value *NewSel = foldAddNegate(B, C, RHS)) | ||
return NewSel; | ||
} else if (RHSIsSelect && RHS->hasOneUse()) { | ||
// X op (D ? E : F) -> D ? (X op E) : (X op F) | ||
ProfileData = cast<SelectInst>(RHS)->getMetadata(LLVMContext::MD_prof); | ||
Cond = D; | ||
True = simplifyBinOp(Opcode, LHS, E, FMF, Q); | ||
False = simplifyBinOp(Opcode, LHS, F, FMF, Q); | ||
|
@@ -1427,6 +1436,8 @@ Value *InstCombinerImpl::SimplifySelectsFeedingBinaryOp(BinaryOperator &I, | |
|
||
Value *SI = Builder.CreateSelect(Cond, True, False); | ||
SI->takeName(&I); | ||
if (!ProfcheckDisableMetadataFixes) | ||
cast<SelectInst>(SI)->setMetadata(LLVMContext::MD_prof, ProfileData); | ||
alanzhao1 marked this conversation as resolved.
Show resolved
Hide resolved
|
||
return SI; | ||
} | ||
|
||
|
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,40 @@ | ||
; RUN: opt < %s -passes=instcombine -S | FileCheck %s | ||
alanzhao1 marked this conversation as resolved.
Show resolved
Hide resolved
|
||
|
||
; CHECK: define i32 @LHSBin(i1 %C) !prof ![[PROF0:[0-9]]] | ||
; CHECK: %V = select i1 %C, i32 1010, i32 20, !prof ![[PROF1:[0-9]]] | ||
define i32 @LHSBin(i1 %C) !prof !0 { | ||
%A = select i1 %C, i32 1000, i32 10, !prof !1 | ||
%V = add i32 %A, 10 | ||
ret i32 %V | ||
} | ||
|
||
; CHECK: define i32 @RHSBin(i1 %C) !prof ![[PROF0]] | ||
; CHECK: %V = select i1 %C, i32 1010, i32 20, !prof ![[PROF1]] | ||
define i32 @RHSBin(i1 %C) !prof !0 { | ||
%A = select i1 %C, i32 1000, i32 10, !prof !1 | ||
%V = add i32 10, %A | ||
ret i32 %V; | ||
} | ||
|
||
; CHECK: define i32 @BothBin(i1 %C) !prof ![[PROF0]] | ||
; CHECK: %V = select i1 %C, i32 2000, i32 20, !prof ![[PROF1]] | ||
define i32 @BothBin(i1 %C) !prof !0 { | ||
%A = select i1 %C, i32 1000, i32 10, !prof !1 | ||
%B = select i1 %C, i32 1000, i32 10, !prof !1 | ||
%V = add i32 %A, %B | ||
ret i32 %V; | ||
} | ||
|
||
; CHECK: define i32 @NegBin(i1 %C) !prof ![[PROF0:[0-9]]] | ||
; CHECK: %V = select i1 %C, i32 1010, i32 0, !prof ![[PROF1:[0-9]]] | ||
define i32 @NegBin(i1 %C) !prof !0 { | ||
%A = select i1 %C, i32 1000, i32 -10, !prof !1 | ||
%V = add i32 %A, 10 | ||
ret i32 %V | ||
} | ||
|
||
|
||
; CHECK: ![[PROF0]] = !{!"function_entry_count", i64 1000} | ||
; CHECK: ![[PROF1]] = !{!"branch_weights", i32 2, i32 3} | ||
!0 = !{!"function_entry_count", i64 1000} | ||
!1 = !{!"branch_weights", i32 2, i32 3} |
Uh oh!
There was an error while loading. Please reload this page.