diff options
| -rw-r--r-- | llvm/lib/Transforms/Scalar/Reassociate.cpp | 13 | ||||
| -rw-r--r-- | llvm/test/Transforms/Reassociate/fast-ReassociateVector.ll | 18 |
2 files changed, 21 insertions, 10 deletions
diff --git a/llvm/lib/Transforms/Scalar/Reassociate.cpp b/llvm/lib/Transforms/Scalar/Reassociate.cpp index 4ce32e0eca7..313b1d12009 100644 --- a/llvm/lib/Transforms/Scalar/Reassociate.cpp +++ b/llvm/lib/Transforms/Scalar/Reassociate.cpp @@ -1276,9 +1276,15 @@ Value *ReassociatePass::OptimizeXor(Instruction *I, if (Ops.size() == 1) return nullptr; + Type *Ty = Ops[0].Op->getType(); + + // TODO: We should optimize vector Xor instructions, but they are + // currently unsupported. + if (Ty->isVectorTy()) + return nullptr; + SmallVector<XorOpnd, 8> Opnds; SmallVector<XorOpnd*, 8> OpndPtrs; - Type *Ty = Ops[0].Op->getType(); APInt ConstOpnd(Ty->getIntegerBitWidth(), 0); // Step 1: Convert ValueEntry to XorOpnd @@ -2000,11 +2006,6 @@ void ReassociatePass::OptimizeInst(Instruction *I) { if (I->isCommutative()) canonicalizeOperands(I); - // TODO: We should optimize vector Xor instructions, but they are - // currently unsupported. - if (I->getType()->isVectorTy() && I->getOpcode() == Instruction::Xor) - return; - // Don't optimize floating point instructions that don't have unsafe algebra. if (I->getType()->isFPOrFPVectorTy() && !I->hasUnsafeAlgebra()) return; diff --git a/llvm/test/Transforms/Reassociate/fast-ReassociateVector.ll b/llvm/test/Transforms/Reassociate/fast-ReassociateVector.ll index fb76b9d990b..d4c7b809f61 100644 --- a/llvm/test/Transforms/Reassociate/fast-ReassociateVector.ll +++ b/llvm/test/Transforms/Reassociate/fast-ReassociateVector.ll @@ -205,15 +205,25 @@ define <2 x i32> @test16(<2 x i32> %x, <2 x i32> %y) { ret <2 x i32> %tmp3 } -; FIXME: Optimize vector xor. Currently only commute operands. define <2 x i32> @test17(<2 x i32> %x, <2 x i32> %y) { ; CHECK-LABEL: test17 -; CHECK-NEXT: %tmp1 = xor <2 x i32> %x, %y -; CHECK-NEXT: %tmp2 = xor <2 x i32> %x, %y -; CHECK-NEXT: %tmp3 = xor <2 x i32> %tmp1, %tmp2 +; CHECK-NEXT: ret <2 x i32> zeroinitializer %tmp1 = xor <2 x i32> %x, %y %tmp2 = xor <2 x i32> %y, %x %tmp3 = xor <2 x i32> %tmp1, %tmp2 ret <2 x i32> %tmp3 } + +define <2 x i32> @test18(<2 x i32> %x, <2 x i32> %y) { +; CHECK-LABEL: test18 +; CHECK-NEXT: %tmp5 = xor <2 x i32> %y, %x +; CHECK-NEXT: ret <2 x i32> %tmp5 + + %tmp1 = xor <2 x i32> %x, %y + %tmp2 = xor <2 x i32> %y, %x + %tmp3 = xor <2 x i32> %x, %y + %tmp4 = xor <2 x i32> %tmp1, %tmp2 + %tmp5 = xor <2 x i32> %tmp4, %tmp3 + ret <2 x i32> %tmp5 +} |
