RPCSX/llvm
1
0
Fork 0
mirror of https://github.com/RPCSX/llvm.git synced 2024-11-28 14:10:41 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

[LoopVectorize] Use ReplaceInstWithInst() helper where appropriate.

Browse Source 
This is mostly an NFC, which increases code readability (instead of
saving old terminator, generating new one in front of old, and deleting
old, we just call a function). However, it would additionaly copy
the debug location from old instruction to replacement, which
would help PR23837.

git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@241197 91177308-0d34-0410-b5e6-96231b3b80d8
This commit is contained in:
Alexey Samsonov 2015-07-01 22:18:30 +00:00
parent f89e1bdc1a
commit 739ded16a5
2 changed files with 45 additions and 37 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

37
lib/Transforms/Vectorize/LoopVectorize.cpp
View File

@ -2415,9 +2415,8 @@ void InnerLoopVectorizer::scalarizeInstruction(Instruction *Instr, bool IfPredic
LoopVectorBody.push_back(NewIfBlock); LoopVectorBody.push_back(NewIfBlock);
VectorLp->addBasicBlockToLoop(NewIfBlock, *LI); VectorLp->addBasicBlockToLoop(NewIfBlock, *LI);
Builder.SetInsertPoint(InsertPt); Builder.SetInsertPoint(InsertPt);
Instruction *OldBr = IfBlock->getTerminator(); ReplaceInstWithInst(IfBlock->getTerminator(),
BranchInst::Create(CondBlock, NewIfBlock, Cmp, OldBr); BranchInst::Create(CondBlock, NewIfBlock, Cmp));
OldBr->eraseFromParent();
IfBlock = NewIfBlock; IfBlock = NewIfBlock;
} }
} }
@ -2660,9 +2659,9 @@ void InnerLoopVectorizer::createEmptyLoop() {
if (ParentLoop) if (ParentLoop)
ParentLoop->addBasicBlockToLoop(CheckBlock, *LI); ParentLoop->addBasicBlockToLoop(CheckBlock, *LI);
LoopBypassBlocks.push_back(CheckBlock); LoopBypassBlocks.push_back(CheckBlock);
Instruction *OldTerm = LastBypassBlock->getTerminator(); ReplaceInstWithInst(
BranchInst::Create(ScalarPH, CheckBlock, CheckBCOverflow, OldTerm); LastBypassBlock->getTerminator(),
OldTerm->eraseFromParent(); BranchInst::Create(ScalarPH, CheckBlock, CheckBCOverflow));
LastBypassBlock = CheckBlock; LastBypassBlock = CheckBlock;
} }
@ -2684,9 +2683,8 @@ void InnerLoopVectorizer::createEmptyLoop() {
// Replace the branch into the memory check block with a conditional branch // Replace the branch into the memory check block with a conditional branch
// for the "few elements case". // for the "few elements case".
Instruction *OldTerm = LastBypassBlock->getTerminator(); ReplaceInstWithInst(LastBypassBlock->getTerminator(),
BranchInst::Create(MiddleBlock, CheckBlock, Cmp, OldTerm); BranchInst::Create(MiddleBlock, CheckBlock, Cmp));
OldTerm->eraseFromParent();
Cmp = StrideCheck; Cmp = StrideCheck;
LastBypassBlock = CheckBlock; LastBypassBlock = CheckBlock;
@ -2709,17 +2707,15 @@ void InnerLoopVectorizer::createEmptyLoop() {
// Replace the branch into the memory check block with a conditional branch // Replace the branch into the memory check block with a conditional branch
// for the "few elements case". // for the "few elements case".
Instruction *OldTerm = LastBypassBlock->getTerminator(); ReplaceInstWithInst(LastBypassBlock->getTerminator(),
BranchInst::Create(MiddleBlock, CheckBlock, Cmp, OldTerm); BranchInst::Create(MiddleBlock, CheckBlock, Cmp));
OldTerm->eraseFromParent();
Cmp = MemRuntimeCheck; Cmp = MemRuntimeCheck;
LastBypassBlock = CheckBlock; LastBypassBlock = CheckBlock;
} }
LastBypassBlock->getTerminator()->eraseFromParent(); ReplaceInstWithInst(LastBypassBlock->getTerminator(),
BranchInst::Create(MiddleBlock, VectorPH, Cmp, BranchInst::Create(MiddleBlock, VectorPH, Cmp));
LastBypassBlock);
// We are going to resume the execution of the scalar loop. // We are going to resume the execution of the scalar loop.
// Go over all of the induction variables that we found and fix the // Go over all of the induction variables that we found and fix the
@ -2856,10 +2852,8 @@ void InnerLoopVectorizer::createEmptyLoop() {
Value *CmpN = CmpInst::Create(Instruction::ICmp, CmpInst::ICMP_EQ, IdxEnd, Value *CmpN = CmpInst::Create(Instruction::ICmp, CmpInst::ICMP_EQ, IdxEnd,
ResumeIndex, "cmp.n", ResumeIndex, "cmp.n",
MiddleBlock->getTerminator()); MiddleBlock->getTerminator());
ReplaceInstWithInst(MiddleBlock->getTerminator(),
BranchInst::Create(ExitBlock, ScalarPH, CmpN, MiddleBlock->getTerminator()); BranchInst::Create(ExitBlock, ScalarPH, CmpN));
// Remove the old terminator.
MiddleBlock->getTerminator()->eraseFromParent();
// Create i+1 and fill the PHINode. // Create i+1 and fill the PHINode.
Value *NextIdx = Builder.CreateAdd(Induction, Step, "index.next"); Value *NextIdx = Builder.CreateAdd(Induction, Step, "index.next");
@ -5513,9 +5507,8 @@ void InnerLoopUnroller::scalarizeInstruction(Instruction *Instr,
LoopVectorBody.push_back(NewIfBlock); LoopVectorBody.push_back(NewIfBlock);
VectorLp->addBasicBlockToLoop(NewIfBlock, *LI); VectorLp->addBasicBlockToLoop(NewIfBlock, *LI);
Builder.SetInsertPoint(InsertPt); Builder.SetInsertPoint(InsertPt);
Instruction *OldBr = IfBlock->getTerminator(); ReplaceInstWithInst(IfBlock->getTerminator(),
BranchInst::Create(CondBlock, NewIfBlock, Cmp, OldBr); BranchInst::Create(CondBlock, NewIfBlock, Cmp));
OldBr->eraseFromParent();
IfBlock = NewIfBlock; IfBlock = NewIfBlock;
} }
} }

45
test/Transforms/LoopVectorize/runtime-check.ll
View File

@ -9,30 +9,31 @@ target triple = "x86_64-apple-macosx10.9.0"
; a[i] = b[i] * 3; ; a[i] = b[i] * 3;
; } ; }
;CHECK-LABEL: define i32 @foo
;CHECK: for.body.preheader: ;CHECK: for.body.preheader:
;CHECK: br i1 %cmp.zero, label %middle.block, label %vector.memcheck ;CHECK: br i1 %cmp.zero, label %middle.block, label %vector.memcheck, !dbg [[BODY_LOC:![0-9]+]]
;CHECK: vector.memcheck: ;CHECK: vector.memcheck:
;CHECK: br i1 %memcheck.conflict, label %middle.block, label %vector.ph ;CHECK: br i1 %memcheck.conflict, label %middle.block, label %vector.ph, !dbg [[BODY_LOC]]
;CHECK: load <4 x float> ;CHECK: load <4 x float>
define i32 @foo(float* nocapture %a, float* nocapture %b, i32 %n) nounwind uwtable ssp { define i32 @foo(float* nocapture %a, float* nocapture %b, i32 %n) nounwind uwtable ssp {
entry: entry:
%cmp6 = icmp sgt i32 %n, 0 %cmp6 = icmp sgt i32 %n, 0, !dbg !6
br i1 %cmp6, label %for.body, label %for.end br i1 %cmp6, label %for.body, label %for.end, !dbg !6
for.body: ; preds = %entry, %for.body for.body: ; preds = %entry, %for.body
%indvars.iv = phi i64 [ %indvars.iv.next, %for.body ], [ 0, %entry ] %indvars.iv = phi i64 [ %indvars.iv.next, %for.body ], [ 0, %entry ], !dbg !7
%arrayidx = getelementptr inbounds float, float* %b, i64 %indvars.iv %arrayidx = getelementptr inbounds float, float* %b, i64 %indvars.iv, !dbg !7
%0 = load float, float* %arrayidx, align 4 %0 = load float, float* %arrayidx, align 4, !dbg !7
%mul = fmul float %0, 3.000000e+00 %mul = fmul float %0, 3.000000e+00, !dbg !7
%arrayidx2 = getelementptr inbounds float, float* %a, i64 %indvars.iv %arrayidx2 = getelementptr inbounds float, float* %a, i64 %indvars.iv, !dbg !7
store float %mul, float* %arrayidx2, align 4 store float %mul, float* %arrayidx2, align 4, !dbg !7
%indvars.iv.next = add i64 %indvars.iv, 1 %indvars.iv.next = add i64 %indvars.iv, 1, !dbg !7
%lftr.wideiv = trunc i64 %indvars.iv.next to i32 %lftr.wideiv = trunc i64 %indvars.iv.next to i32, !dbg !7
%exitcond = icmp eq i32 %lftr.wideiv, %n %exitcond = icmp eq i32 %lftr.wideiv, %n, !dbg !7
br i1 %exitcond, label %for.end, label %for.body br i1 %exitcond, label %for.end, label %for.body, !dbg !7
for.end: ; preds = %for.body, %entry for.end: ; preds = %for.body, %entry
ret i32 undef ret i32 undef, !dbg !8
} }
; Make sure that we try to vectorize loops with a runtime check if the ; Make sure that we try to vectorize loops with a runtime check if the
@ -62,3 +63,17 @@ for.body:
loopexit: loopexit:
ret void ret void
} }
; CHECK: [[BODY_LOC]] = !DILocation(line: 101, column: 1, scope: !{{.*}})
!llvm.module.flags = !{!0, !1}
!0 = !{i32 2, !"Dwarf Version", i32 4}
!1 = !{i32 2, !"Debug Info Version", i32 3}
!2 = !{}
!3 = !DISubroutineType(types: !2)
!4 = !DIFile(filename: "test.cpp", directory: "/tmp")
!5 = !DISubprogram(name: "foo", scope: !4, file: !4, line: 99, type: !3, isLocal: false, isDefinition: true, scopeLine: 100, flags: DIFlagPrototyped, isOptimized: false, variables: !2)
!6 = !DILocation(line: 100, column: 1, scope: !5)
!7 = !DILocation(line: 101, column: 1, scope: !5)
!8 = !DILocation(line: 102, column: 1, scope: !5)