git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@186145
91177308-0d34-0410-b5e6-
96231b3b80d8
it != e; ++it) {
Value *Scalar = it->Scalar;
llvm::User *User = it->User;
it != e; ++it) {
Value *Scalar = it->Scalar;
llvm::User *User = it->User;
+
+ // Skip users that we already RAUW. This happens when one instruction
+ // has multiple uses of the same value.
if (std::find(Scalar->use_begin(), Scalar->use_end(), User) ==
Scalar->use_end())
continue;
if (std::find(Scalar->use_begin(), Scalar->use_end(), User) ==
Scalar->use_end())
continue;
Instruction *Loc = 0;
if (PHINode *PN = dyn_cast<PHINode>(Vec)) {
Loc = PN->getParent()->getFirstInsertionPt();
Instruction *Loc = 0;
if (PHINode *PN = dyn_cast<PHINode>(Vec)) {
Loc = PN->getParent()->getFirstInsertionPt();
- } else if (Instruction *Iv = dyn_cast<Instruction>(Vec)){
- Loc = ++((BasicBlock::iterator)*Iv);
+ } else if (isa<Instruction>(Vec)){
+ if (PHINode *PH = dyn_cast<PHINode>(User)) {
+ for (int i = 0, e = PH->getNumIncomingValues(); i != e; ++i) {
+ if (PH->getIncomingValue(i) == Scalar) {
+ Loc = PH->getIncomingBlock(i)->getTerminator();
+ break;
+ }
+ }
+ assert(Loc && "Unable to find incoming value for the PHI");
+ } else {
+ Loc = cast<Instruction>(User);
+ }
} else {
Loc = F->getEntryBlock().begin();
}
} else {
Loc = F->getEntryBlock().begin();
}
BasicBlock *BB = *I;
// For all instructions in the function:
for (BasicBlock::iterator it = BB->begin(), e = BB->end(); it != e; ++it) {
BasicBlock *BB = *I;
// For all instructions in the function:
for (BasicBlock::iterator it = BB->begin(), e = BB->end(); it != e; ++it) {
- InsertElementInst *Insert = dyn_cast<InsertElementInst>(it);
- if (!Insert || !GatherSeq.count(Insert))
+ Instruction *In = it;
+ if ((!isa<InsertElementInst>(In) && !isa<ExtractElementInst>(In)) ||
+ !GatherSeq.count(In))
continue;
// Check if we can replace this instruction with any of the
// visited instructions.
for (SmallPtrSet<Instruction*, 16>::iterator v = Visited.begin(),
ve = Visited.end(); v != ve; ++v) {
continue;
// Check if we can replace this instruction with any of the
// visited instructions.
for (SmallPtrSet<Instruction*, 16>::iterator v = Visited.begin(),
ve = Visited.end(); v != ve; ++v) {
- if (Insert->isIdenticalTo(*v) &&
- DT->dominates((*v)->getParent(), Insert->getParent())) {
- Insert->replaceAllUsesWith(*v);
- ToRemove.push_back(Insert);
- Insert = 0;
+ if (In->isIdenticalTo(*v) &&
+ DT->dominates((*v)->getParent(), In->getParent())) {
+ In->replaceAllUsesWith(*v);
+ ToRemove.push_back(In);
+ In = 0;
- if (Insert)
- Visited.insert(Insert);
+ if (In)
+ Visited.insert(In);
; CHECK: @extr_user
; CHECK: load <4 x i32>
; CHECK: @extr_user
; CHECK: load <4 x i32>
-; CHECK-NEXT: extractelement <4 x i32>
+; CHECK: extractelement <4 x i32>
; CHECK-NEXT: ret
define i32 @extr_user(i32* noalias nocapture %B, i32* noalias nocapture %A, i32 %n, i32 %m) {
entry:
; CHECK-NEXT: ret
define i32 @extr_user(i32* noalias nocapture %B, i32* noalias nocapture %A, i32 %n, i32 %m) {
entry:
; In this example we have an external user that is not the first element in the vector.
; CHECK: @extr_user1
; CHECK: load <4 x i32>
; In this example we have an external user that is not the first element in the vector.
; CHECK: @extr_user1
; CHECK: load <4 x i32>
-; CHECK-NEXT: extractelement <4 x i32>
+; CHECK: extractelement <4 x i32>
; CHECK-NEXT: ret
define i32 @extr_user1(i32* noalias nocapture %B, i32* noalias nocapture %A, i32 %n, i32 %m) {
entry:
; CHECK-NEXT: ret
define i32 @extr_user1(i32* noalias nocapture %B, i32* noalias nocapture %A, i32 %n, i32 %m) {
entry:
;CHECK: phi <2 x double>
;CHECK: fadd <2 x double>
;CHECK: fmul <2 x double>
;CHECK: phi <2 x double>
;CHECK: fadd <2 x double>
;CHECK: fmul <2 x double>
-;CHECK: extractelement <2 x double>
;CHECK: br
;CHECK: store <2 x double>
;CHECK: br
;CHECK: store <2 x double>
+;CHECK: extractelement <2 x double>
;CHECK: ret double
define double @ext_user(double* noalias nocapture %B, double* noalias nocapture %A, i32 %n, i32 %m) {
;CHECK: ret double
define double @ext_user(double* noalias nocapture %B, double* noalias nocapture %A, i32 %n, i32 %m) {
;CHECK: fmul <3 x float>
;CHECK: fadd <3 x float>
; At the moment we don't sink extractelements.
;CHECK: fmul <3 x float>
;CHECK: fadd <3 x float>
; At the moment we don't sink extractelements.
;CHECK: extractelement
;CHECK: extractelement
;CHECK: extractelement
;CHECK: extractelement
;CHECK: extractelement
;CHECK: extractelement
;CHECK: ret
define float @foo(float* nocapture readonly %A) {
;CHECK: ret
define float @foo(float* nocapture readonly %A) {