From 2e9675ff5247da937b1594f06fd5b8bbab7c5bf1 Mon Sep 17 00:00:00 2001 From: Sanjay Patel Date: Wed, 3 Aug 2016 19:48:40 +0000 Subject: [PATCH] [InstCombine] use m_APInt to allow icmp eq (srem X, C1), C2 folds for splat constant vectors llvm-svn: 277638 --- llvm/lib/Transforms/InstCombine/InstCombineCompares.cpp | 7 +++---- llvm/test/Transforms/InstCombine/rem.ll | 6 ++---- 2 files changed, 5 insertions(+), 8 deletions(-) diff --git a/llvm/lib/Transforms/InstCombine/InstCombineCompares.cpp b/llvm/lib/Transforms/InstCombine/InstCombineCompares.cpp index 4b949ab..576aa2d 100644 --- a/llvm/lib/Transforms/InstCombine/InstCombineCompares.cpp +++ b/llvm/lib/Transforms/InstCombine/InstCombineCompares.cpp @@ -2218,10 +2218,9 @@ Instruction *InstCombiner::foldICmpEqualityWithConstant(ICmpInst &ICI) { switch (BO->getOpcode()) { case Instruction::SRem: // If we have a signed (X % (2^c)) == 0, turn it into an unsigned one. - // FIXME: Vectors are excluded by ConstantInt. - if (*RHSV == 0 && isa(BOp1) && BO->hasOneUse()) { - const APInt &V = cast(BOp1)->getValue(); - if (V.sgt(1) && V.isPowerOf2()) { + if (*RHSV == 0 && BO->hasOneUse()) { + const APInt *BOC; + if (match(BOp1, m_APInt(BOC)) && BOC->sgt(1) && BOC->isPowerOf2()) { Value *NewRem = Builder->CreateURem(BOp0, BOp1, BO->getName()); return new ICmpInst(ICI.getPredicate(), NewRem, Constant::getNullValue(BO->getType())); diff --git a/llvm/test/Transforms/InstCombine/rem.ll b/llvm/test/Transforms/InstCombine/rem.ll index cd3c937..74d42fa 100644 --- a/llvm/test/Transforms/InstCombine/rem.ll +++ b/llvm/test/Transforms/InstCombine/rem.ll @@ -53,12 +53,10 @@ define i1 @test3a(i32 %A) { ret i1 %C } -; FIXME: Vectors should fold the same way. - define <2 x i1> @test3a_vec(<2 x i32> %A) { ; CHECK-LABEL: @test3a_vec( -; CHECK-NEXT: [[B:%.*]] = srem <2 x i32> %A, -; CHECK-NEXT: [[C:%.*]] = icmp ne <2 x i32> [[B]], zeroinitializer +; CHECK-NEXT: [[B1:%.*]] = and <2 x i32> %A, +; CHECK-NEXT: [[C:%.*]] = icmp ne <2 x i32> [[B1]], zeroinitializer ; CHECK-NEXT: ret <2 x i1> [[C]] ; %B = srem <2 x i32> %A, -- 2.7.4