<div dir="ltr">I was trying to avoid a bug and caused one instead with this commit by including some unintended test changes. And then further botched it by not amending the revert message with this explanation.<br></div><br><div class="gmail_quote"><div dir="ltr" class="gmail_attr">On Wed, Jun 26, 2019 at 12:06 PM Sanjay Patel via llvm-commits <<a href="mailto:llvm-commits@lists.llvm.org">llvm-commits@lists.llvm.org</a>> wrote:<br></div><blockquote class="gmail_quote" style="margin:0px 0px 0px 0.8ex;border-left:1px solid rgb(204,204,204);padding-left:1ex">Author: spatel<br>
Date: Wed Jun 26 11:06:51 2019<br>
New Revision: 364455<br>
<br>
URL: <a href="http://llvm.org/viewvc/llvm-project?rev=364455&view=rev" rel="noreferrer" target="_blank">http://llvm.org/viewvc/llvm-project?rev=364455&view=rev</a><br>
Log:<br>
Revert [InstCombine] change 'tmp' variable names; NFC<br>
<br>
This reverts r364452 (git commit 6083ae0b4a250c69f6d5b13b3742ee1fe5b878d5)<br>
<br>
Modified:<br>
llvm/trunk/test/Transforms/InstCombine/broadcast.ll<br>
<br>
Modified: llvm/trunk/test/Transforms/InstCombine/broadcast.ll<br>
URL: <a href="http://llvm.org/viewvc/llvm-project/llvm/trunk/test/Transforms/InstCombine/broadcast.ll?rev=364455&r1=364454&r2=364455&view=diff" rel="noreferrer" target="_blank">http://llvm.org/viewvc/llvm-project/llvm/trunk/test/Transforms/InstCombine/broadcast.ll?rev=364455&r1=364454&r2=364455&view=diff</a><br>
==============================================================================<br>
--- llvm/trunk/test/Transforms/InstCombine/broadcast.ll (original)<br>
+++ llvm/trunk/test/Transforms/InstCombine/broadcast.ll Wed Jun 26 11:06:51 2019<br>
@@ -3,56 +3,56 @@<br>
<br>
define <4 x float> @good1(float %arg) {<br>
; CHECK-LABEL: @good1(<br>
-; CHECK-NEXT: [[T:%.*]] = insertelement <4 x float> undef, float [[ARG:%.*]], i32 0<br>
-; CHECK-NEXT: [[T6:%.*]] = shufflevector <4 x float> [[T]], <4 x float> undef, <4 x i32> zeroinitializer<br>
-; CHECK-NEXT: ret <4 x float> [[T6]]<br>
-;<br>
- %t = insertelement <4 x float> undef, float %arg, i32 0<br>
- %t4 = insertelement <4 x float> %t, float %arg, i32 1<br>
- %t5 = insertelement <4 x float> %t4, float %arg, i32 2<br>
- %t6 = insertelement <4 x float> %t5, float %arg, i32 3<br>
- ret <4 x float> %t6<br>
+; CHECK-NEXT: [[TMP:%.*]] = insertelement <4 x float> undef, float [[ARG:%.*]], i32 0<br>
+; CHECK-NEXT: [[TMP6:%.*]] = shufflevector <4 x float> [[TMP]], <4 x float> undef, <4 x i32> zeroinitializer<br>
+; CHECK-NEXT: ret <4 x float> [[TMP6]]<br>
+;<br>
+ %tmp = insertelement <4 x float> undef, float %arg, i32 0<br>
+ %tmp4 = insertelement <4 x float> %tmp, float %arg, i32 1<br>
+ %tmp5 = insertelement <4 x float> %tmp4, float %arg, i32 2<br>
+ %tmp6 = insertelement <4 x float> %tmp5, float %arg, i32 3<br>
+ ret <4 x float> %tmp6<br>
}<br>
<br>
define <4 x float> @good2(float %arg) {<br>
; CHECK-LABEL: @good2(<br>
; CHECK-NEXT: [[TMP1:%.*]] = insertelement <4 x float> undef, float [[ARG:%.*]], i32 0<br>
-; CHECK-NEXT: [[T6:%.*]] = shufflevector <4 x float> [[TMP1]], <4 x float> undef, <4 x i32> zeroinitializer<br>
-; CHECK-NEXT: ret <4 x float> [[T6]]<br>
+; CHECK-NEXT: [[TMP6:%.*]] = shufflevector <4 x float> [[TMP1]], <4 x float> undef, <4 x i32> zeroinitializer<br>
+; CHECK-NEXT: ret <4 x float> [[TMP6]]<br>
;<br>
- %t = insertelement <4 x float> undef, float %arg, i32 1<br>
- %t4 = insertelement <4 x float> %t, float %arg, i32 2<br>
- %t5 = insertelement <4 x float> %t4, float %arg, i32 0<br>
- %t6 = insertelement <4 x float> %t5, float %arg, i32 3<br>
- ret <4 x float> %t6<br>
+ %tmp = insertelement <4 x float> undef, float %arg, i32 1<br>
+ %tmp4 = insertelement <4 x float> %tmp, float %arg, i32 2<br>
+ %tmp5 = insertelement <4 x float> %tmp4, float %arg, i32 0<br>
+ %tmp6 = insertelement <4 x float> %tmp5, float %arg, i32 3<br>
+ ret <4 x float> %tmp6<br>
}<br>
<br>
define <4 x float> @good3(float %arg) {<br>
; CHECK-LABEL: @good3(<br>
-; CHECK-NEXT: [[T:%.*]] = insertelement <4 x float> undef, float [[ARG:%.*]], i32 0<br>
-; CHECK-NEXT: [[T6:%.*]] = shufflevector <4 x float> [[T]], <4 x float> undef, <4 x i32> zeroinitializer<br>
-; CHECK-NEXT: ret <4 x float> [[T6]]<br>
-;<br>
- %t = insertelement <4 x float> zeroinitializer, float %arg, i32 0<br>
- %t4 = insertelement <4 x float> %t, float %arg, i32 1<br>
- %t5 = insertelement <4 x float> %t4, float %arg, i32 2<br>
- %t6 = insertelement <4 x float> %t5, float %arg, i32 3<br>
- ret <4 x float> %t6<br>
+; CHECK-NEXT: [[TMP:%.*]] = insertelement <4 x float> undef, float [[ARG:%.*]], i32 0<br>
+; CHECK-NEXT: [[TMP6:%.*]] = shufflevector <4 x float> [[TMP]], <4 x float> undef, <4 x i32> zeroinitializer<br>
+; CHECK-NEXT: ret <4 x float> [[TMP6]]<br>
+;<br>
+ %tmp = insertelement <4 x float> zeroinitializer, float %arg, i32 0<br>
+ %tmp4 = insertelement <4 x float> %tmp, float %arg, i32 1<br>
+ %tmp5 = insertelement <4 x float> %tmp4, float %arg, i32 2<br>
+ %tmp6 = insertelement <4 x float> %tmp5, float %arg, i32 3<br>
+ ret <4 x float> %tmp6<br>
}<br>
<br>
define <4 x float> @good4(float %arg) {<br>
; CHECK-LABEL: @good4(<br>
-; CHECK-NEXT: [[T:%.*]] = insertelement <4 x float> undef, float [[ARG:%.*]], i32 0<br>
-; CHECK-NEXT: [[TMP1:%.*]] = fadd <4 x float> [[T]], [[T]]<br>
-; CHECK-NEXT: [[T7:%.*]] = shufflevector <4 x float> [[TMP1]], <4 x float> undef, <4 x i32> zeroinitializer<br>
-; CHECK-NEXT: ret <4 x float> [[T7]]<br>
-;<br>
- %t = insertelement <4 x float> zeroinitializer, float %arg, i32 0<br>
- %t4 = insertelement <4 x float> %t, float %arg, i32 1<br>
- %t5 = insertelement <4 x float> %t4, float %arg, i32 2<br>
- %t6 = insertelement <4 x float> %t5, float %arg, i32 3<br>
- %t7 = fadd <4 x float> %t6, %t6<br>
- ret <4 x float> %t7<br>
+; CHECK-NEXT: [[TMP:%.*]] = insertelement <4 x float> undef, float [[ARG:%.*]], i32 0<br>
+; CHECK-NEXT: [[TMP1:%.*]] = fadd <4 x float> [[TMP]], [[TMP]]<br>
+; CHECK-NEXT: [[TMP7:%.*]] = shufflevector <4 x float> [[TMP1]], <4 x float> undef, <4 x i32> zeroinitializer<br>
+; CHECK-NEXT: ret <4 x float> [[TMP7]]<br>
+;<br>
+ %tmp = insertelement <4 x float> zeroinitializer, float %arg, i32 0<br>
+ %tmp4 = insertelement <4 x float> %tmp, float %arg, i32 1<br>
+ %tmp5 = insertelement <4 x float> %tmp4, float %arg, i32 2<br>
+ %tmp6 = insertelement <4 x float> %tmp5, float %arg, i32 3<br>
+ %tmp7 = fadd <4 x float> %tmp6, %tmp6<br>
+ ret <4 x float> %tmp7<br>
}<br>
<br>
define <4 x float> @good5(float %v) {<br>
@@ -74,83 +74,85 @@ define <4 x float> @good5(float %v) {<br>
<br>
define <4 x float> @bad1(float %arg) {<br>
; CHECK-LABEL: @bad1(<br>
-; CHECK-NEXT: [[TMP1:%.*]] = insertelement <4 x float> undef, float [[ARG:%.*]], i32 0<br>
-; CHECK-NEXT: [[T6:%.*]] = shufflevector <4 x float> [[TMP1]], <4 x float> undef, <4 x i32> <i32 undef, i32 0, i32 0, i32 0><br>
-; CHECK-NEXT: ret <4 x float> [[T6]]<br>
-;<br>
- %t = insertelement <4 x float> undef, float %arg, i32 1<br>
- %t4 = insertelement <4 x float> %t, float %arg, i32 1<br>
- %t5 = insertelement <4 x float> %t4, float %arg, i32 2<br>
- %t6 = insertelement <4 x float> %t5, float %arg, i32 3<br>
- ret <4 x float> %t6<br>
+; CHECK-NEXT: [[TMP4:%.*]] = insertelement <4 x float> undef, float [[ARG:%.*]], i32 1<br>
+; CHECK-NEXT: [[TMP5:%.*]] = insertelement <4 x float> [[TMP4]], float [[ARG]], i32 2<br>
+; CHECK-NEXT: [[TMP6:%.*]] = insertelement <4 x float> [[TMP5]], float [[ARG]], i32 3<br>
+; CHECK-NEXT: ret <4 x float> [[TMP6]]<br>
+;<br>
+ %tmp = insertelement <4 x float> undef, float %arg, i32 1<br>
+ %tmp4 = insertelement <4 x float> %tmp, float %arg, i32 1<br>
+ %tmp5 = insertelement <4 x float> %tmp4, float %arg, i32 2<br>
+ %tmp6 = insertelement <4 x float> %tmp5, float %arg, i32 3<br>
+ ret <4 x float> %tmp6<br>
}<br>
<br>
define <4 x float> @bad2(float %arg) {<br>
; CHECK-LABEL: @bad2(<br>
-; CHECK-NEXT: [[T:%.*]] = insertelement <4 x float> undef, float [[ARG:%.*]], i32 0<br>
-; CHECK-NEXT: [[T6:%.*]] = shufflevector <4 x float> [[T]], <4 x float> undef, <4 x i32> <i32 0, i32 undef, i32 0, i32 0><br>
-; CHECK-NEXT: ret <4 x float> [[T6]]<br>
-;<br>
- %t = insertelement <4 x float> undef, float %arg, i32 0<br>
- %t5 = insertelement <4 x float> %t, float %arg, i32 2<br>
- %t6 = insertelement <4 x float> %t5, float %arg, i32 3<br>
- ret <4 x float> %t6<br>
+; CHECK-NEXT: [[TMP:%.*]] = insertelement <4 x float> undef, float [[ARG:%.*]], i32 0<br>
+; CHECK-NEXT: [[TMP5:%.*]] = insertelement <4 x float> [[TMP]], float [[ARG]], i32 2<br>
+; CHECK-NEXT: [[TMP6:%.*]] = insertelement <4 x float> [[TMP5]], float [[ARG]], i32 3<br>
+; CHECK-NEXT: ret <4 x float> [[TMP6]]<br>
+;<br>
+ %tmp = insertelement <4 x float> undef, float %arg, i32 0<br>
+ %tmp5 = insertelement <4 x float> %tmp, float %arg, i32 2<br>
+ %tmp6 = insertelement <4 x float> %tmp5, float %arg, i32 3<br>
+ ret <4 x float> %tmp6<br>
}<br>
<br>
define <4 x float> @bad3(float %arg, float %arg2) {<br>
; CHECK-LABEL: @bad3(<br>
-; CHECK-NEXT: [[T:%.*]] = insertelement <4 x float> undef, float [[ARG:%.*]], i32 0<br>
-; CHECK-NEXT: [[T4:%.*]] = insertelement <4 x float> [[T]], float [[ARG2:%.*]], i32 1<br>
-; CHECK-NEXT: [[T5:%.*]] = insertelement <4 x float> [[T4]], float [[ARG]], i32 2<br>
-; CHECK-NEXT: [[T6:%.*]] = insertelement <4 x float> [[T5]], float [[ARG]], i32 3<br>
-; CHECK-NEXT: ret <4 x float> [[T6]]<br>
-;<br>
- %t = insertelement <4 x float> undef, float %arg, i32 0<br>
- %t4 = insertelement <4 x float> %t, float %arg2, i32 1<br>
- %t5 = insertelement <4 x float> %t4, float %arg, i32 2<br>
- %t6 = insertelement <4 x float> %t5, float %arg, i32 3<br>
- ret <4 x float> %t6<br>
+; CHECK-NEXT: [[TMP:%.*]] = insertelement <4 x float> undef, float [[ARG:%.*]], i32 0<br>
+; CHECK-NEXT: [[TMP4:%.*]] = insertelement <4 x float> [[TMP]], float [[ARG2:%.*]], i32 1<br>
+; CHECK-NEXT: [[TMP5:%.*]] = insertelement <4 x float> [[TMP4]], float [[ARG]], i32 2<br>
+; CHECK-NEXT: [[TMP6:%.*]] = insertelement <4 x float> [[TMP5]], float [[ARG]], i32 3<br>
+; CHECK-NEXT: ret <4 x float> [[TMP6]]<br>
+;<br>
+ %tmp = insertelement <4 x float> undef, float %arg, i32 0<br>
+ %tmp4 = insertelement <4 x float> %tmp, float %arg2, i32 1<br>
+ %tmp5 = insertelement <4 x float> %tmp4, float %arg, i32 2<br>
+ %tmp6 = insertelement <4 x float> %tmp5, float %arg, i32 3<br>
+ ret <4 x float> %tmp6<br>
}<br>
<br>
define <1 x float> @bad4(float %arg) {<br>
; CHECK-LABEL: @bad4(<br>
-; CHECK-NEXT: [[T:%.*]] = insertelement <1 x float> undef, float [[ARG:%.*]], i32 0<br>
-; CHECK-NEXT: ret <1 x float> [[T]]<br>
+; CHECK-NEXT: [[TMP:%.*]] = insertelement <1 x float> undef, float [[ARG:%.*]], i32 0<br>
+; CHECK-NEXT: ret <1 x float> [[TMP]]<br>
;<br>
- %t = insertelement <1 x float> undef, float %arg, i32 0<br>
- ret <1 x float> %t<br>
+ %tmp = insertelement <1 x float> undef, float %arg, i32 0<br>
+ ret <1 x float> %tmp<br>
}<br>
<br>
define <4 x float> @bad5(float %arg) {<br>
; CHECK-LABEL: @bad5(<br>
-; CHECK-NEXT: [[T:%.*]] = insertelement <4 x float> undef, float [[ARG:%.*]], i32 0<br>
-; CHECK-NEXT: [[T4:%.*]] = shufflevector <4 x float> [[T]], <4 x float> undef, <4 x i32> <i32 0, i32 0, i32 undef, i32 undef><br>
-; CHECK-NEXT: [[T5:%.*]] = insertelement <4 x float> [[T4]], float [[ARG]], i32 2<br>
-; CHECK-NEXT: [[T6:%.*]] = insertelement <4 x float> [[T5]], float [[ARG]], i32 3<br>
-; CHECK-NEXT: [[T7:%.*]] = fadd <4 x float> [[T6]], [[T4]]<br>
-; CHECK-NEXT: ret <4 x float> [[T7]]<br>
-;<br>
- %t = insertelement <4 x float> undef, float %arg, i32 0<br>
- %t4 = insertelement <4 x float> %t, float %arg, i32 1<br>
- %t5 = insertelement <4 x float> %t4, float %arg, i32 2<br>
- %t6 = insertelement <4 x float> %t5, float %arg, i32 3<br>
- %t7 = fadd <4 x float> %t6, %t4<br>
- ret <4 x float> %t7<br>
+; CHECK-NEXT: [[TMP:%.*]] = insertelement <4 x float> undef, float [[ARG:%.*]], i32 0<br>
+; CHECK-NEXT: [[TMP4:%.*]] = insertelement <4 x float> [[TMP]], float [[ARG]], i32 1<br>
+; CHECK-NEXT: [[TMP5:%.*]] = insertelement <4 x float> [[TMP4]], float [[ARG]], i32 2<br>
+; CHECK-NEXT: [[TMP6:%.*]] = insertelement <4 x float> [[TMP5]], float [[ARG]], i32 3<br>
+; CHECK-NEXT: [[TMP7:%.*]] = fadd <4 x float> [[TMP6]], [[TMP4]]<br>
+; CHECK-NEXT: ret <4 x float> [[TMP7]]<br>
+;<br>
+ %tmp = insertelement <4 x float> undef, float %arg, i32 0<br>
+ %tmp4 = insertelement <4 x float> %tmp, float %arg, i32 1<br>
+ %tmp5 = insertelement <4 x float> %tmp4, float %arg, i32 2<br>
+ %tmp6 = insertelement <4 x float> %tmp5, float %arg, i32 3<br>
+ %tmp7 = fadd <4 x float> %tmp6, %tmp4<br>
+ ret <4 x float> %tmp7<br>
}<br>
<br>
define <4 x float> @bad6(float %arg, i32 %k) {<br>
; CHECK-LABEL: @bad6(<br>
-; CHECK-NEXT: [[T:%.*]] = insertelement <4 x float> undef, float [[ARG:%.*]], i32 0<br>
-; CHECK-NEXT: [[T4:%.*]] = insertelement <4 x float> [[T]], float [[ARG]], i32 1<br>
-; CHECK-NEXT: [[T5:%.*]] = insertelement <4 x float> [[T4]], float [[ARG]], i32 [[K:%.*]]<br>
-; CHECK-NEXT: [[T6:%.*]] = insertelement <4 x float> [[T5]], float [[ARG]], i32 3<br>
-; CHECK-NEXT: ret <4 x float> [[T6]]<br>
-;<br>
- %t = insertelement <4 x float> undef, float %arg, i32 0<br>
- %t4 = insertelement <4 x float> %t, float %arg, i32 1<br>
- %t5 = insertelement <4 x float> %t4, float %arg, i32 %k<br>
- %t6 = insertelement <4 x float> %t5, float %arg, i32 3<br>
- ret <4 x float> %t6<br>
+; CHECK-NEXT: [[TMP:%.*]] = insertelement <4 x float> undef, float [[ARG:%.*]], i32 0<br>
+; CHECK-NEXT: [[TMP4:%.*]] = insertelement <4 x float> [[TMP]], float [[ARG]], i32 1<br>
+; CHECK-NEXT: [[TMP5:%.*]] = insertelement <4 x float> [[TMP4]], float [[ARG]], i32 [[K:%.*]]<br>
+; CHECK-NEXT: [[TMP6:%.*]] = insertelement <4 x float> [[TMP5]], float [[ARG]], i32 3<br>
+; CHECK-NEXT: ret <4 x float> [[TMP6]]<br>
+;<br>
+ %tmp = insertelement <4 x float> undef, float %arg, i32 0<br>
+ %tmp4 = insertelement <4 x float> %tmp, float %arg, i32 1<br>
+ %tmp5 = insertelement <4 x float> %tmp4, float %arg, i32 %k<br>
+ %tmp6 = insertelement <4 x float> %tmp5, float %arg, i32 3<br>
+ ret <4 x float> %tmp6<br>
}<br>
<br>
define <4 x float> @bad7(float %v) {<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="https://lists.llvm.org/cgi-bin/mailman/listinfo/llvm-commits" rel="noreferrer" target="_blank">https://lists.llvm.org/cgi-bin/mailman/listinfo/llvm-commits</a><br>
</blockquote></div>