Skip to content
Merged
Show file tree
Hide file tree
Changes from 1 commit
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
18 changes: 18 additions & 0 deletions llvm/lib/Transforms/InstCombine/InstCombineAndOrXor.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -3997,6 +3997,20 @@ static Value *foldOrUnsignedUMulOverflowICmp(BinaryOperator &I,
return nullptr;
}

// Fold select(X >s 0, 0, -X) | smax(X, 0) --> abs(X)
static Value *FoldOrOfSelectSmaxToAbs(BinaryOperator &I,
InstCombiner::BuilderTy &Builder) {
CmpPredicate Pred;
Value *X;
if (match(&I, m_c_Or(m_Select(m_ICmp(Pred, m_Value(X), m_ZeroInt()),
m_ZeroInt(), m_Sub(m_ZeroInt(), m_Deferred(X))),
m_OneUse(m_Intrinsic<Intrinsic::smax>(m_Deferred(X),
m_ZeroInt())))) &&
Pred == ICmpInst::ICMP_SGT)
return Builder.CreateBinaryIntrinsic(Intrinsic::abs, X, Builder.getFalse());
return nullptr;
}

// FIXME: We use commutative matchers (m_c_*) for some, but not all, matches
// here. We should standardize that construct where it is needed or choose some
// other way to ensure that commutated variants of patterns are not missed.
Expand Down Expand Up @@ -4545,6 +4559,10 @@ Instruction *InstCombinerImpl::visitOr(BinaryOperator &I) {
if (Value *V = SimplifyAddWithRemainder(I))
return replaceInstUsesWith(I, V);

// select(X >s 0, 0, -X) | smax(X, 0) -> abs(X)
if (Value *Res = FoldOrOfSelectSmaxToAbs(I, Builder))
return replaceInstUsesWith(I, Res);

return nullptr;
}

Expand Down
28 changes: 28 additions & 0 deletions llvm/test/Transforms/InstCombine/or.ll
Original file line number Diff line number Diff line change
Expand Up @@ -2113,3 +2113,31 @@ define <4 x i32> @or_zext_nneg_minus_constant_splat(<4 x i8> %a) {
%or = or <4 x i32> %zext, splat (i32 -9)
ret <4 x i32> %or
}

define i8 @or_positive_minus_non_positive_to_abs(i8 noundef %0){
; CHECK-LABEL: @or_positive_minus_non_positive_to_abs(
; CHECK-NEXT: [[TMP2:%.*]] = call i8 @llvm.abs.i8(i8 [[TMP0:%.*]], i1 false)
; CHECK-NEXT: ret i8 [[TMP2]]
;
%2 = icmp sgt i8 %0, zeroinitializer
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Use named values in tests

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Use named values in tests

done

%3 = sext i1 %2 to i8
%4 = sub i8 zeroinitializer, %0
%5 = xor i8 %3, -1
%6 = and i8 %4, %5
%7 = and i8 %0, %3
%8 = or i8 %6, %7
ret i8 %8
}

define <2 x i8> @or_select_smax_to_abs(<2 x i8> %0){
; CHECK-LABEL: @or_select_smax_to_abs(
; CHECK-NEXT: [[TMP2:%.*]] = call <2 x i8> @llvm.abs.v2i8(<2 x i8> [[TMP0:%.*]], i1 false)
; CHECK-NEXT: ret <2 x i8> [[TMP2]]
;
%2 = icmp sgt <2 x i8> %0, zeroinitializer
%3 = sub <2 x i8> zeroinitializer, %0
%4 = select <2 x i1> %2, <2 x i8> zeroinitializer, <2 x i8> %3
%5 = tail call <2 x i8> @llvm.smax.v2i8(<2 x i8> %0, <2 x i8> zeroinitializer)
%6 = or <2 x i8> %4, %5
ret <2 x i8> %6
}
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Missing negative test for the multiple use case

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Missing negative test for the multiple use case

done