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

Revert "[InstCombine] reduce xor-of-or's bitwise logic (PR46955)" 

This reverts commit 2265d01f2a.
Seeing bot failures after this change like:
http://lab.llvm.org:8011/builders/clang-cmake-x86_64-sde-avx512-linux/builds/42586
This commit is contained in:
Sanjay Patel 2020-08-03 08:58:41 -04:00
parent fd63e46941
commit f19a9be385
2 changed files with 12 additions and 26 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
llvm/lib/Transforms/InstCombine/InstCombineAndOrXor.cpp
View File

@ -3351,20 +3351,6 @@ Instruction *InstCombinerImpl::visitXor(BinaryOperator &I) {
match(Op1, m_Not(m_Specific(A))))
return BinaryOperator::CreateNot(Builder.CreateAnd(A, B));
// (A | B) ^ (A | C) --> (B ^ C) & ~A -- There are 4 commuted variants.
// TODO: Loosen one-use restriction if common operand is a constant.
Value *D;
if (match(Op0, m_OneUse(m_Or(m_Value(A), m_Value(B)))) &&
match(Op1, m_OneUse(m_Or(m_Value(C), m_Value(D))))) {
if (B == C || B == D)
std::swap(A, B);
if (A == C)
std::swap(C, D);
if (A == D)
return BinaryOperator::CreateAnd(Builder.CreateXor(B, C),
Builder.CreateNot(A));
}
if (auto *LHS = dyn_cast<ICmpInst>(I.getOperand(0)))
if (auto *RHS = dyn_cast<ICmpInst>(I.getOperand(1)))
if (Value *V = foldXorOfICmps(LHS, RHS, I))

24
llvm/test/Transforms/InstCombine/xor.ll
View File

@ -915,9 +915,9 @@ define <2 x i32> @test51vec(<2 x i32> %x, <2 x i32> %y) {
define i4 @or_or_xor(i4 %x, i4 %y, i4 %z) {
; CHECK-LABEL: @or_or_xor(
; CHECK-NEXT: [[TMP1:%.*]] = xor i4 [[X:%.*]], [[Y:%.*]]
; CHECK-NEXT: [[TMP2:%.*]] = xor i4 [[Z:%.*]], -1
; CHECK-NEXT: [[R:%.*]] = and i4 [[TMP1]], [[TMP2]]
; CHECK-NEXT: [[O1:%.*]] = or i4 [[Z:%.*]], [[X:%.*]]
; CHECK-NEXT: [[O2:%.*]] = or i4 [[Z]], [[Y:%.*]]
; CHECK-NEXT: [[R:%.*]] = xor i4 [[O1]], [[O2]]
; CHECK-NEXT: ret i4 [[R]]
;
%o1 = or i4 %z, %x
@ -928,9 +928,9 @@ define i4 @or_or_xor(i4 %x, i4 %y, i4 %z) {
define i4 @or_or_xor_commute1(i4 %x, i4 %y, i4 %z) {
; CHECK-LABEL: @or_or_xor_commute1(
; CHECK-NEXT: [[TMP1:%.*]] = xor i4 [[X:%.*]], [[Y:%.*]]
; CHECK-NEXT: [[TMP2:%.*]] = xor i4 [[Z:%.*]], -1
; CHECK-NEXT: [[R:%.*]] = and i4 [[TMP1]], [[TMP2]]
; CHECK-NEXT: [[O1:%.*]] = or i4 [[X:%.*]], [[Z:%.*]]
; CHECK-NEXT: [[O2:%.*]] = or i4 [[Z]], [[Y:%.*]]
; CHECK-NEXT: [[R:%.*]] = xor i4 [[O1]], [[O2]]
; CHECK-NEXT: ret i4 [[R]]
;
%o1 = or i4 %x, %z
@ -941,9 +941,9 @@ define i4 @or_or_xor_commute1(i4 %x, i4 %y, i4 %z) {
define i4 @or_or_xor_commute2(i4 %x, i4 %y, i4 %z) {
; CHECK-LABEL: @or_or_xor_commute2(
; CHECK-NEXT: [[TMP1:%.*]] = xor i4 [[X:%.*]], [[Y:%.*]]
; CHECK-NEXT: [[TMP2:%.*]] = xor i4 [[Z:%.*]], -1
; CHECK-NEXT: [[R:%.*]] = and i4 [[TMP1]], [[TMP2]]
; CHECK-NEXT: [[O1:%.*]] = or i4 [[Z:%.*]], [[X:%.*]]
; CHECK-NEXT: [[O2:%.*]] = or i4 [[Y:%.*]], [[Z]]
; CHECK-NEXT: [[R:%.*]] = xor i4 [[O1]], [[O2]]
; CHECK-NEXT: ret i4 [[R]]
;
%o1 = or i4 %z, %x
@ -954,9 +954,9 @@ define i4 @or_or_xor_commute2(i4 %x, i4 %y, i4 %z) {
define <2 x i4> @or_or_xor_commute3(<2 x i4> %x, <2 x i4> %y, <2 x i4> %z) {
; CHECK-LABEL: @or_or_xor_commute3(
; CHECK-NEXT: [[TMP1:%.*]] = xor <2 x i4> [[X:%.*]], [[Y:%.*]]
; CHECK-NEXT: [[TMP2:%.*]] = xor <2 x i4> [[Z:%.*]], <i4 -1, i4 -1>
; CHECK-NEXT: [[R:%.*]] = and <2 x i4> [[TMP1]], [[TMP2]]
; CHECK-NEXT: [[O1:%.*]] = or <2 x i4> [[X:%.*]], [[Z:%.*]]
; CHECK-NEXT: [[O2:%.*]] = or <2 x i4> [[Y:%.*]], [[Z]]
; CHECK-NEXT: [[R:%.*]] = xor <2 x i4> [[O1]], [[O2]]
; CHECK-NEXT: ret <2 x i4> [[R]]
;
%o1 = or <2 x i4> %x, %z