maxjhandsome
/
llvm-project
forked from OSchip/llvm-project
1
0
Fork 0
Code Issues Pull Requests Packages Releases Wiki Activity

Revert "[InstCombine] Fix PR35618: Instcombine hangs on single minmax load bitcast." 

This reverts commit r320488 because of the failed asan buildbots..

llvm-svn: 320490
This commit is contained in:
Alexey Bataev 2017-12-12 16:05:52 +00:00
parent bd2197c0c1
commit c9f1d2e4a0
2 changed files with 4 additions and 50 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
llvm/lib/Transforms/InstCombine/InstCombineLoadStoreAlloca.cpp
View File

@ -1341,7 +1341,8 @@ static bool equivalentAddressValues(Value *A, Value *B) {
/// select ((cmp load V1, load V2), V1, V2).
bool removeBitcastsFromLoadStoreOnMinMax(InstCombiner &IC, StoreInst &SI) {
// bitcast?
if (!match(SI.getPointerOperand(), m_BitCast(m_Value())))
Value *StoreAddr;
if (!match(SI.getPointerOperand(), m_BitCast(m_Value(StoreAddr))))
return false;
// load? integer?
Value *LoadAddr;
@ -1353,26 +1354,9 @@ bool removeBitcastsFromLoadStoreOnMinMax(InstCombiner &IC, StoreInst &SI) {
if (!isMinMaxWithLoads(LoadAddr))
return false;
if (!all_of(LI->users(), [LI, LoadAddr](User *U) {
auto *SI = dyn_cast<StoreInst>(U);
return SI && SI->getPointerOperand() != LI &&
peekThroughBitcast(SI->getPointerOperand()) != LoadAddr &&
!SI->getPointerOperand()->isSwiftError();
}))
return false;
IC.Builder.SetInsertPoint(LI);
LoadInst *NewLI = combineLoadToNewType(
IC, *LI, LoadAddr->getType()->getPointerElementType());
// Replace all the stores with stores of the newly loaded value.
for (auto *UI : LI->users()) {
auto *SI = cast<StoreInst>(UI);
IC.Builder.SetInsertPoint(SI);
combineStoreToNewValue(IC, *SI, NewLI);
IC.eraseInstFromFunction(*SI);
}
IC.replaceInstUsesWith(*LI, UndefValue::get(LI->getType()));
IC.eraseInstFromFunction(*LI);
combineStoreToNewValue(IC, SI, NewLI);
return true;
}
@ -1401,7 +1385,7 @@ Instruction *InstCombiner::visitStoreInst(StoreInst &SI) {
return eraseInstFromFunction(SI);
if (removeBitcastsFromLoadStoreOnMinMax(*this, SI))
return nullptr;
return eraseInstFromFunction(SI);
// Replace GEP indices if possible.
if (Instruction *NewGEPI = replaceGEPIdxWithZero(*this, Ptr, SI)) {

30
llvm/test/Transforms/InstCombine/multiple-uses-load-bitcast-select.ll
View File

@ -1,30 +0,0 @@
; NOTE: Assertions have been autogenerated by utils/update_test_checks.py
; RUN: opt < %s -instcombine -S -data-layout="E-m:e-i1:8:16-i8:8:16-i64:64-f128:64-v128:64-a:8:16-n32:64" | FileCheck %s
define void @PR35618(i64* %st1, double* %st2) {
; CHECK-LABEL: @PR35618(
; CHECK-NEXT: [[Y1:%.*]] = alloca double, align 8
; CHECK-NEXT: [[Z1:%.*]] = alloca double, align 8
; CHECK-NEXT: [[LD1:%.*]] = load double, double* [[Y1]], align 8
; CHECK-NEXT: [[LD2:%.*]] = load double, double* [[Z1]], align 8
; CHECK-NEXT: [[TMP10:%.*]] = fcmp olt double [[LD1]], [[LD2]]
; CHECK-NEXT: [[TMP121:%.*]] = select i1 [[TMP10]], double [[LD1]], double [[LD2]]
; CHECK-NEXT: [[TMP1:%.*]] = bitcast i64* [[ST1:%.*]] to double*
; CHECK-NEXT: store double [[TMP121]], double* [[TMP1]], align 8
; CHECK-NEXT: store double [[TMP121]], double* [[ST2:%.*]], align 8
; CHECK-NEXT: ret void
;
%y1 = alloca double
%z1 = alloca double
%ld1 = load double, double* %y1
%ld2 = load double, double* %z1
%tmp10 = fcmp olt double %ld1, %ld2
%sel = select i1 %tmp10, double* %y1, double* %z1
%tmp11 = bitcast double* %sel to i64*
%tmp12 = load i64, i64* %tmp11
store i64 %tmp12, i64* %st1
%bc = bitcast double* %st2 to i64*
store i64 %tmp12, i64* %bc
ret void
}