Skip to content

Commit 6e4a9c1

Browse files
committed
LoopVectorize: Make Value pointers that could be RAUW'ed a VH
The Value pointers we store in the induction variable list can be RAUW'ed by a call to SCEVExpander::expandCodeFor, use a TrackingVH instead. Do the same thing in some other places where we store pointers that could potentially be RAUW'ed. Fixes PR16073. git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@182485 91177308-0d34-0410-b5e6-96231b3b80d8
1 parent 812789d commit 6e4a9c1

File tree

2 files changed

+54
-3
lines changed

2 files changed

+54
-3
lines changed

lib/Transforms/Vectorize/LoopVectorize.cpp

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -80,6 +80,7 @@
8080
#include "llvm/Support/Debug.h"
8181
#include "llvm/Support/PatternMatch.h"
8282
#include "llvm/Support/raw_ostream.h"
83+
#include "llvm/Support/ValueHandle.h"
8384
#include "llvm/Target/TargetLibraryInfo.h"
8485
#include "llvm/Transforms/Scalar.h"
8586
#include "llvm/Transforms/Utils/BasicBlockUtils.h"
@@ -458,7 +459,7 @@ class LoopVectorizationLegality {
458459

459460
// The starting value of the reduction.
460461
// It does not have to be zero!
461-
Value *StartValue;
462+
TrackingVH<Value> StartValue;
462463
// The instruction who's value is used outside the loop.
463464
Instruction *LoopExitInstr;
464465
// The kind of the reduction.
@@ -503,7 +504,7 @@ class LoopVectorizationLegality {
503504
/// This flag indicates if we need to add the runtime check.
504505
bool Need;
505506
/// Holds the pointers that we need to check.
506-
SmallVector<Value*, 2> Pointers;
507+
SmallVector<TrackingVH<Value>, 2> Pointers;
507508
/// Holds the pointer value at the beginning of the loop.
508509
SmallVector<const SCEV*, 2> Starts;
509510
/// Holds the pointer value at the end of the loop.
@@ -517,7 +518,7 @@ class LoopVectorizationLegality {
517518
InductionInfo(Value *Start, InductionKind K) : StartValue(Start), IK(K) {}
518519
InductionInfo() : StartValue(0), IK(IK_NoInduction) {}
519520
/// Start value.
520-
Value *StartValue;
521+
TrackingVH<Value> StartValue;
521522
/// Induction kind.
522523
InductionKind IK;
523524
};
Lines changed: 50 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,50 @@
1+
; RUN: opt -S -loop-vectorize -force-vector-width=4 -force-vector-unroll=1 -dce -instcombine < %s | FileCheck %s
2+
3+
target datalayout = "e-p:64:64:64-i1:8:8-i8:8:8-i16:16:16-i32:32:32-i64:64:64-f32:32:32-f64:64:64-v64:64:64-v128:128:128-a0:0:64-s0:64:64-f80:128:128-n8:16:32:64-S128"
4+
5+
; PR16073
6+
7+
; Because we were caching value pointers accross a function call that could RAUW
8+
; we would generate an undefined value store below:
9+
; SCEVExpander::expandCodeFor would change a value (the start value of an
10+
; induction) that we cached in the induction variable list.
11+
12+
; CHECK: test_vh
13+
; CHECK-NOT: store <4 x i8> undef
14+
15+
define void @test_vh(i32* %ptr265, i32* %ptr266, i32 %sub267) {
16+
entry:
17+
br label %loop
18+
19+
loop:
20+
%inc = phi i32 [ %sub267, %entry ], [ %add, %loop]
21+
%ext.inc = sext i32 %inc to i64
22+
%add.ptr265 = getelementptr inbounds i32* %ptr265, i64 %ext.inc
23+
%add.ptr266 = getelementptr inbounds i32* %ptr266, i64 %ext.inc
24+
%add = add i32 %inc, 9
25+
%cmp = icmp slt i32 %add, 140
26+
br i1 %cmp, label %block1, label %loop
27+
28+
block1:
29+
%sub267.lcssa = phi i32 [ %add, %loop ]
30+
%add.ptr266.lcssa = phi i32* [ %add.ptr266, %loop ]
31+
%add.ptr265.lcssa = phi i32* [ %add.ptr265, %loop ]
32+
%tmp29 = bitcast i32* %add.ptr265.lcssa to i8*
33+
%tmp30 = bitcast i32* %add.ptr266.lcssa to i8*
34+
br label %do.body272
35+
36+
do.body272:
37+
%row_width.5 = phi i32 [ %sub267.lcssa, %block1 ], [ %dec, %do.body272 ]
38+
%sp.4 = phi i8* [ %tmp30, %block1 ], [ %incdec.ptr273, %do.body272 ]
39+
%dp.addr.4 = phi i8* [ %tmp29, %block1 ], [ %incdec.ptr274, %do.body272 ]
40+
%incdec.ptr273 = getelementptr inbounds i8* %sp.4, i64 1
41+
%tmp31 = load i8* %sp.4, align 1
42+
%incdec.ptr274 = getelementptr inbounds i8* %dp.addr.4, i64 1
43+
store i8 %tmp31, i8* %dp.addr.4, align 1
44+
%dec = add i32 %row_width.5, -1
45+
%cmp276 = icmp eq i32 %dec, 0
46+
br i1 %cmp276, label %loop.exit, label %do.body272
47+
48+
loop.exit:
49+
ret void
50+
}

0 commit comments

Comments
 (0)