<div dir="ltr">The tests fail (opt asserts) on Windows: <a href="http://lab.llvm.org:8011/builders/clang-x64-ninja-win7/builds/8079">http://lab.llvm.org:8011/builders/clang-x64-ninja-win7/builds/8079</a><div><br></div><div>I've reverted in r320421.</div></div><div class="gmail_extra"><br><div class="gmail_quote">On Mon, Dec 11, 2017 at 11:11 AM, Alexey Bataev 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: abataev<br>
Date: Mon Dec 11 11:11:16 2017<br>
New Revision: 320407<br>
<br>
URL: <a href="http://llvm.org/viewvc/llvm-project?rev=320407&view=rev" rel="noreferrer" target="_blank">http://llvm.org/viewvc/llvm-<wbr>project?rev=320407&view=rev</a><br>
Log:<br>
[InstCombine] Fix PR35618: Instcombine hangs on single minmax load bitcast.<br>
<br>
Summary:<br>
If we have pattern `store (load(bitcast(select (cmp(V1, V2), &V1,<br>
&V2)))), bitcast)`, but the load is used in other instructions, it leads<br>
to looping in InstCombiner. Patch adds additional check that all users<br>
of the load instructions are stores and then replaces all uses of load<br>
instruction by the new one with new type.<br>
<br>
Reviewers: RKSimon, spatel, majnemer<br>
<br>
Subscribers: llvm-commits<br>
<br>
Differential Revision: <a href="https://reviews.llvm.org/D41072" rel="noreferrer" target="_blank">https://reviews.llvm.org/<wbr>D41072</a><br>
<br>
Added:<br>
llvm/trunk/test/Transforms/<wbr>InstCombine/multiple-uses-<wbr>load-bitcast-select.ll<br>
Modified:<br>
llvm/trunk/lib/Transforms/<wbr>InstCombine/<wbr>InstCombineLoadStoreAlloca.cpp<br>
<br>
Modified: llvm/trunk/lib/Transforms/<wbr>InstCombine/<wbr>InstCombineLoadStoreAlloca.cpp<br>
URL: <a href="http://llvm.org/viewvc/llvm-project/llvm/trunk/lib/Transforms/InstCombine/InstCombineLoadStoreAlloca.cpp?rev=320407&r1=320406&r2=320407&view=diff" rel="noreferrer" target="_blank">http://llvm.org/viewvc/llvm-<wbr>project/llvm/trunk/lib/<wbr>Transforms/InstCombine/<wbr>InstCombineLoadStoreAlloca.<wbr>cpp?rev=320407&r1=320406&r2=<wbr>320407&view=diff</a><br>
==============================<wbr>==============================<wbr>==================<br>
--- llvm/trunk/lib/Transforms/<wbr>InstCombine/<wbr>InstCombineLoadStoreAlloca.cpp (original)<br>
+++ llvm/trunk/lib/Transforms/<wbr>InstCombine/<wbr>InstCombineLoadStoreAlloca.cpp Mon Dec 11 11:11:16 2017<br>
@@ -1344,9 +1344,24 @@ bool removeBitcastsFromLoadStoreOnM<wbr>inMax<br>
if (!isMinMaxWithLoads(LoadAddr))<br>
return false;<br>
<br>
+ if (!all_of(LI->users(), [LI](User *U) {<br>
+ auto *SI = dyn_cast<StoreInst>(U);<br>
+ return SI && SI->getPointerOperand() != LI &&<br>
+ !SI->getPointerOperand()-><wbr>isSwiftError();<br>
+ }))<br>
+ return false;<br>
+<br>
+ IC.Builder.SetInsertPoint(LI);<br>
LoadInst *NewLI = combineLoadToNewType(<br>
IC, *LI, LoadAddr->getType()-><wbr>getPointerElementType());<br>
- combineStoreToNewValue(IC, SI, NewLI);<br>
+ // Replace all the stores with stores of the newly loaded value.<br>
+ for (auto *UI : LI->users()) {<br>
+ auto *SI = cast<StoreInst>(UI);<br>
+ IC.Builder.SetInsertPoint(SI);<br>
+ combineStoreToNewValue(IC, *SI, NewLI);<br>
+ IC.eraseInstFromFunction(*SI);<br>
+ }<br>
+ IC.eraseInstFromFunction(*LI);<br>
return true;<br>
}<br>
<br>
@@ -1375,7 +1390,7 @@ Instruction *InstCombiner::visitStoreIns<br>
return eraseInstFromFunction(SI);<br>
<br>
if (<wbr>removeBitcastsFromLoadStoreOnM<wbr>inMax(*this, SI))<br>
- return eraseInstFromFunction(SI);<br>
+ return nullptr;<br>
<br>
// Replace GEP indices if possible.<br>
if (Instruction *NewGEPI = replaceGEPIdxWithZero(*this, Ptr, SI)) {<br>
<br>
Added: llvm/trunk/test/Transforms/<wbr>InstCombine/multiple-uses-<wbr>load-bitcast-select.ll<br>
URL: <a href="http://llvm.org/viewvc/llvm-project/llvm/trunk/test/Transforms/InstCombine/multiple-uses-load-bitcast-select.ll?rev=320407&view=auto" rel="noreferrer" target="_blank">http://llvm.org/viewvc/llvm-<wbr>project/llvm/trunk/test/<wbr>Transforms/InstCombine/<wbr>multiple-uses-load-bitcast-<wbr>select.ll?rev=320407&view=auto</a><br>
==============================<wbr>==============================<wbr>==================<br>
--- llvm/trunk/test/Transforms/<wbr>InstCombine/multiple-uses-<wbr>load-bitcast-select.ll (added)<br>
+++ llvm/trunk/test/Transforms/<wbr>InstCombine/multiple-uses-<wbr>load-bitcast-select.ll Mon Dec 11 11:11:16 2017<br>
@@ -0,0 +1,30 @@<br>
+; NOTE: Assertions have been autogenerated by utils/update_test_checks.py<br>
+; RUN: opt < %s -instcombine -S -data-layout="E-m:e-i1:8:16-<wbr>i8:8:16-i64:64-f128:64-v128:<wbr>64-a:8:16-n32:64" | FileCheck %s<br>
+<br>
+define void @PR35618(i64* %st1, double* %st2) {<br>
+; CHECK-LABEL: @PR35618(<br>
+; CHECK-NEXT: [[Y1:%.*]] = alloca double, align 8<br>
+; CHECK-NEXT: [[Z1:%.*]] = alloca double, align 8<br>
+; CHECK-NEXT: [[LD1:%.*]] = load double, double* [[Y1]], align 8<br>
+; CHECK-NEXT: [[LD2:%.*]] = load double, double* [[Z1]], align 8<br>
+; CHECK-NEXT: [[TMP10:%.*]] = fcmp olt double [[LD1]], [[LD2]]<br>
+; CHECK-NEXT: [[TMP121:%.*]] = select i1 [[TMP10]], double [[LD1]], double [[LD2]]<br>
+; CHECK-NEXT: [[TMP1:%.*]] = bitcast i64* [[ST1:%.*]] to double*<br>
+; CHECK-NEXT: store double [[TMP121]], double* [[TMP1]], align 8<br>
+; CHECK-NEXT: store double [[TMP121]], double* [[ST2:%.*]], align 8<br>
+; CHECK-NEXT: ret void<br>
+;<br>
+ %y1 = alloca double<br>
+ %z1 = alloca double<br>
+ %ld1 = load double, double* %y1<br>
+ %ld2 = load double, double* %z1<br>
+ %tmp10 = fcmp olt double %ld1, %ld2<br>
+ %sel = select i1 %tmp10, double* %y1, double* %z1<br>
+ %tmp11 = bitcast double* %sel to i64*<br>
+ %tmp12 = load i64, i64* %tmp11<br>
+ store i64 %tmp12, i64* %st1<br>
+ %bc = bitcast double* %st2 to i64*<br>
+ store i64 %tmp12, i64* %bc<br>
+ ret void<br>
+}<br>
+<br>
<br>
<br>
______________________________<wbr>_________________<br>
llvm-commits mailing list<br>
<a href="mailto:llvm-commits@lists.llvm.org">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/<wbr>mailman/listinfo/llvm-commits</a><br>
</blockquote></div><br></div>