<div dir="ltr">Yes, good catch. 'CI' is actually performing triple duty here...it's an abbreviation of 'CompareInst', 'CastInst' or 'ConstantInt' depending on where it's used!<br></div><div class="gmail_extra"><br><div class="gmail_quote">On Sat, Jun 4, 2016 at 4:47 PM, David Majnemer <span dir="ltr"><<a href="mailto:david.majnemer@gmail.com" target="_blank">david.majnemer@gmail.com</a>></span> wrote:<br><blockquote class="gmail_quote" style="margin:0 0 0 .8ex;border-left:1px #ccc solid;padding-left:1ex"><div dir="ltr"><br><div class="gmail_extra"><br><div class="gmail_quote"><span class="">On Sat, Jun 4, 2016 at 3:04 PM, Sanjay Patel via llvm-commits <span dir="ltr"><<a href="mailto:llvm-commits@lists.llvm.org" target="_blank">llvm-commits@lists.llvm.org</a>></span> wrote:<br><blockquote class="gmail_quote" style="margin:0 0 0 .8ex;border-left:1px #ccc solid;padding-left:1ex">Author: spatel<br>
Date: Sat Jun 4 17:04:05 2016<br>
New Revision: 271810<br>
<br>
URL: <a href="http://llvm.org/viewvc/llvm-project?rev=271810&view=rev" rel="noreferrer" target="_blank">http://llvm.org/viewvc/llvm-project?rev=271810&view=rev</a><br>
Log:<br>
[InstCombine] allow vector constants for cast+icmp fold<br>
<br>
This is step 1 of unknown towards fixing PR28001:<br>
<a href="https://llvm.org/bugs/show_bug.cgi?id=28001" rel="noreferrer" target="_blank">https://llvm.org/bugs/show_bug.cgi?id=28001</a><br>
<br>
<br>
Modified:<br>
llvm/trunk/lib/Transforms/InstCombine/InstCombineCompares.cpp<br>
llvm/trunk/test/Transforms/InstCombine/cast.ll<br>
llvm/trunk/test/Transforms/InstCombine/signed-comparison.ll<br>
<br>
Modified: llvm/trunk/lib/Transforms/InstCombine/InstCombineCompares.cpp<br>
URL: <a href="http://llvm.org/viewvc/llvm-project/llvm/trunk/lib/Transforms/InstCombine/InstCombineCompares.cpp?rev=271810&r1=271809&r2=271810&view=diff" rel="noreferrer" target="_blank">http://llvm.org/viewvc/llvm-project/llvm/trunk/lib/Transforms/InstCombine/InstCombineCompares.cpp?rev=271810&r1=271809&r2=271810&view=diff</a><br>
==============================================================================<br>
--- llvm/trunk/lib/Transforms/InstCombine/InstCombineCompares.cpp (original)<br>
+++ llvm/trunk/lib/Transforms/InstCombine/InstCombineCompares.cpp Sat Jun 4 17:04:05 2016<br>
@@ -2439,7 +2439,7 @@ Instruction *InstCombiner::visitICmpInst<br>
}<br>
<br>
// If we aren't dealing with a constant on the RHS, exit early.<br>
- auto *CI = dyn_cast<ConstantInt>(ICI.getOperand(1));<br>
+ auto *CI = dyn_cast<Constant>(ICI.getOperand(1));<br>
if (!CI)<br>
return nullptr;<br></blockquote><div><br></div></span><div>In InstCombine, variables named `CI` are typically `ConstantInt`. I'd suggest renaming `CI` to `C`.</div><div><div class="h5"><div> </div><blockquote class="gmail_quote" style="margin:0 0 0 .8ex;border-left:1px #ccc solid;padding-left:1ex">
<br>
<br>
Modified: llvm/trunk/test/Transforms/InstCombine/cast.ll<br>
URL: <a href="http://llvm.org/viewvc/llvm-project/llvm/trunk/test/Transforms/InstCombine/cast.ll?rev=271810&r1=271809&r2=271810&view=diff" rel="noreferrer" target="_blank">http://llvm.org/viewvc/llvm-project/llvm/trunk/test/Transforms/InstCombine/cast.ll?rev=271810&r1=271809&r2=271810&view=diff</a><br>
==============================================================================<br>
--- llvm/trunk/test/Transforms/InstCombine/cast.ll (original)<br>
+++ llvm/trunk/test/Transforms/InstCombine/cast.ll Sat Jun 4 17:04:05 2016<br>
@@ -214,12 +214,9 @@ define i1 @test19(i32 %X) {<br>
ret i1 %Z<br>
}<br>
<br>
-; FIXME: Vector should be the same as scalar.<br>
-<br>
define <2 x i1> @test19vec(<2 x i32> %X) {<br>
; CHECK-LABEL: @test19vec(<br>
-; CHECK-NEXT: [[C:%.*]] = sext <2 x i32> %X to <2 x i64><br>
-; CHECK-NEXT: [[Z:%.*]] = icmp slt <2 x i64> [[C]], <i64 12345, i64 <a href="tel:2147483647" value="+12147483647" target="_blank">2147483647</a>><br>
+; CHECK-NEXT: [[Z:%.*]] = icmp slt <2 x i32> %X, <i32 12345, i32 <a href="tel:2147483647" value="+12147483647" target="_blank">2147483647</a>><br>
; CHECK-NEXT: ret <2 x i1> [[Z]]<br>
;<br>
%c = sext <2 x i32> %X to <2 x i64><br>
@@ -227,6 +224,16 @@ define <2 x i1> @test19vec(<2 x i32> %X)<br>
ret <2 x i1> %Z<br>
}<br>
<br>
+define <3 x i1> @test19vec2(<3 x i1> %X) {<br>
+; CHECK-LABEL: @test19vec2(<br>
+; CHECK-NEXT: [[CMPEQ:%.*]] = icmp eq <3 x i1> %X, zeroinitializer<br>
+; CHECK-NEXT: ret <3 x i1> [[CMPEQ]]<br>
+;<br>
+ %sext = sext <3 x i1> %X to <3 x i32><br>
+ %cmpeq = icmp eq <3 x i32> %sext, zeroinitializer<br>
+ ret <3 x i1> %cmpeq<br>
+}<br>
+<br>
define i1 @test20(i1 %B) {<br>
; CHECK-LABEL: @test20(<br>
; CHECK-NEXT: ret i1 false<br>
<br>
Modified: llvm/trunk/test/Transforms/InstCombine/signed-comparison.ll<br>
URL: <a href="http://llvm.org/viewvc/llvm-project/llvm/trunk/test/Transforms/InstCombine/signed-comparison.ll?rev=271810&r1=271809&r2=271810&view=diff" rel="noreferrer" target="_blank">http://llvm.org/viewvc/llvm-project/llvm/trunk/test/Transforms/InstCombine/signed-comparison.ll?rev=271810&r1=271809&r2=271810&view=diff</a><br>
==============================================================================<br>
--- llvm/trunk/test/Transforms/InstCombine/signed-comparison.ll (original)<br>
+++ llvm/trunk/test/Transforms/InstCombine/signed-comparison.ll Sat Jun 4 17:04:05 2016<br>
@@ -13,12 +13,9 @@ define i1 @scalar_zext_slt(i16 %t4) {<br>
ret i1 %t6<br>
}<br>
<br>
-; FIXME: Vector compare should work the same as scalar.<br>
-<br>
define <4 x i1> @vector_zext_slt(<4 x i16> %t4) {<br>
; CHECK-LABEL: @vector_zext_slt(<br>
-; CHECK-NEXT: [[T5:%.*]] = zext <4 x i16> %t4 to <4 x i32><br>
-; CHECK-NEXT: [[T6:%.*]] = icmp ult <4 x i32> [[T5]], <i32 500, i32 0, i32 501, i32 65535><br>
+; CHECK-NEXT: [[T6:%.*]] = icmp ult <4 x i16> %t4, <i16 500, i16 0, i16 501, i16 -1><br>
; CHECK-NEXT: ret <4 x i1> [[T6]]<br>
;<br>
%t5 = zext <4 x i16> %t4 to <4 x i32><br>
<br>
<br>
_______________________________________________<br>
llvm-commits mailing list<br>
<a href="mailto:llvm-commits@lists.llvm.org" target="_blank">llvm-commits@lists.llvm.org</a><br>
<a href="http://lists.llvm.org/cgi-bin/mailman/listinfo/llvm-commits" rel="noreferrer" target="_blank">http://lists.llvm.org/cgi-bin/mailman/listinfo/llvm-commits</a><br>
</blockquote></div></div></div><br></div></div>
</blockquote></div><br></div>