Skip to content

Commit e2e5eb2

Browse files
fhahntstellar
authored andcommitted
[Loads] Check for overflow when adding MaxPtrDiff + Offset.
MaxPtrDiff + Offset may wrap, leading to incorrect results. Use uadd_ov to check for overflow. (cherry picked from commit cf444ac)
1 parent 661c387 commit e2e5eb2

File tree

2 files changed

+134
-1
lines changed

2 files changed

+134
-1
lines changed

llvm/lib/Analysis/Loads.cpp

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -382,7 +382,10 @@ bool llvm::isDereferenceableAndAlignedInLoop(
382382
if (Offset->getAPInt().urem(Alignment.value()) != 0)
383383
return false;
384384

385-
AccessSize = MaxPtrDiff + Offset->getAPInt();
385+
bool Overflow = false;
386+
AccessSize = MaxPtrDiff.uadd_ov(Offset->getAPInt(), Overflow);
387+
if (Overflow)
388+
return false;
386389
AccessSizeSCEV = SE.getAddExpr(PtrDiff, Offset);
387390
Base = NewBase->getValue();
388391
} else

llvm/test/Transforms/LoopVectorize/load-deref-pred-align.ll

Lines changed: 130 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -753,3 +753,133 @@ exit:
753753
call void @llvm.memcpy.p0.p0.i64(ptr %dest, ptr %local_dest, i64 1024, i1 false)
754754
ret void
755755
}
756+
757+
define void @adding_offset_overflows(i32 %n, ptr %A) {
758+
; CHECK-LABEL: @adding_offset_overflows(
759+
; CHECK-NEXT: entry:
760+
; CHECK-NEXT: [[B:%.*]] = alloca [62 x i32], align 4
761+
; CHECK-NEXT: [[C:%.*]] = alloca [144 x i32], align 4
762+
; CHECK-NEXT: call void @init(ptr [[B]])
763+
; CHECK-NEXT: call void @init(ptr [[C]])
764+
; CHECK-NEXT: [[PRE:%.*]] = icmp slt i32 [[N:%.*]], 1
765+
; CHECK-NEXT: br i1 [[PRE]], label [[EXIT:%.*]], label [[PH:%.*]]
766+
; CHECK: ph:
767+
; CHECK-NEXT: [[WIDE_TRIP_COUNT:%.*]] = zext i32 [[N]] to i64
768+
; CHECK-NEXT: [[TMP0:%.*]] = add nsw i64 [[WIDE_TRIP_COUNT]], -1
769+
; CHECK-NEXT: [[MIN_ITERS_CHECK:%.*]] = icmp ult i64 [[TMP0]], 2
770+
; CHECK-NEXT: br i1 [[MIN_ITERS_CHECK]], label [[SCALAR_PH:%.*]], label [[VECTOR_PH:%.*]]
771+
; CHECK: vector.ph:
772+
; CHECK-NEXT: [[N_MOD_VF:%.*]] = urem i64 [[TMP0]], 2
773+
; CHECK-NEXT: [[N_VEC:%.*]] = sub i64 [[TMP0]], [[N_MOD_VF]]
774+
; CHECK-NEXT: [[TMP1:%.*]] = add i64 1, [[N_VEC]]
775+
; CHECK-NEXT: br label [[VECTOR_BODY:%.*]]
776+
; CHECK: vector.body:
777+
; CHECK-NEXT: [[INDEX:%.*]] = phi i64 [ 0, [[VECTOR_PH]] ], [ [[INDEX_NEXT:%.*]], [[PRED_STORE_CONTINUE3:%.*]] ]
778+
; CHECK-NEXT: [[OFFSET_IDX:%.*]] = add i64 1, [[INDEX]]
779+
; CHECK-NEXT: [[TMP2:%.*]] = getelementptr i32, ptr [[A:%.*]], i64 [[OFFSET_IDX]]
780+
; CHECK-NEXT: [[TMP23:%.*]] = getelementptr i32, ptr [[TMP2]], i32 0
781+
; CHECK-NEXT: [[WIDE_LOAD:%.*]] = load <2 x i32>, ptr [[TMP23]], align 4
782+
; CHECK-NEXT: [[TMP3:%.*]] = icmp ne <2 x i32> [[WIDE_LOAD]], zeroinitializer
783+
; CHECK-NEXT: [[TMP4:%.*]] = extractelement <2 x i1> [[TMP3]], i32 0
784+
; CHECK-NEXT: br i1 [[TMP4]], label [[PRED_LOAD_IF:%.*]], label [[PRED_LOAD_CONTINUE:%.*]]
785+
; CHECK: pred.load.if:
786+
; CHECK-NEXT: [[TMP15:%.*]] = add i64 [[OFFSET_IDX]], 0
787+
; CHECK-NEXT: [[TMP16:%.*]] = getelementptr i32, ptr [[B]], i64 [[TMP15]]
788+
; CHECK-NEXT: [[TMP17:%.*]] = load i32, ptr [[TMP16]], align 4
789+
; CHECK-NEXT: [[TMP18:%.*]] = insertelement <2 x i32> poison, i32 [[TMP17]], i32 0
790+
; CHECK-NEXT: br label [[PRED_LOAD_CONTINUE]]
791+
; CHECK: pred.load.continue:
792+
; CHECK-NEXT: [[TMP19:%.*]] = phi <2 x i32> [ poison, [[VECTOR_BODY]] ], [ [[TMP18]], [[PRED_LOAD_IF]] ]
793+
; CHECK-NEXT: [[TMP20:%.*]] = extractelement <2 x i1> [[TMP3]], i32 1
794+
; CHECK-NEXT: br i1 [[TMP20]], label [[PRED_LOAD_IF1:%.*]], label [[PRED_LOAD_CONTINUE2:%.*]]
795+
; CHECK: pred.load.if1:
796+
; CHECK-NEXT: [[TMP21:%.*]] = add i64 [[OFFSET_IDX]], 1
797+
; CHECK-NEXT: [[TMP22:%.*]] = getelementptr i32, ptr [[B]], i64 [[TMP21]]
798+
; CHECK-NEXT: [[TMP13:%.*]] = load i32, ptr [[TMP22]], align 4
799+
; CHECK-NEXT: [[TMP14:%.*]] = insertelement <2 x i32> [[TMP19]], i32 [[TMP13]], i32 1
800+
; CHECK-NEXT: br label [[PRED_LOAD_CONTINUE2]]
801+
; CHECK: pred.load.continue2:
802+
; CHECK-NEXT: [[WIDE_LOAD1:%.*]] = phi <2 x i32> [ [[TMP19]], [[PRED_LOAD_CONTINUE]] ], [ [[TMP14]], [[PRED_LOAD_IF1]] ]
803+
; CHECK-NEXT: [[TMP5:%.*]] = sext <2 x i32> [[WIDE_LOAD1]] to <2 x i64>
804+
; CHECK-NEXT: [[TMP6:%.*]] = extractelement <2 x i1> [[TMP3]], i32 0
805+
; CHECK-NEXT: br i1 [[TMP6]], label [[PRED_STORE_IF:%.*]], label [[PRED_STORE_CONTINUE:%.*]]
806+
; CHECK: pred.store.if:
807+
; CHECK-NEXT: [[TMP7:%.*]] = extractelement <2 x i64> [[TMP5]], i32 0
808+
; CHECK-NEXT: [[TMP8:%.*]] = getelementptr i32, ptr [[C]], i64 [[TMP7]]
809+
; CHECK-NEXT: store i32 0, ptr [[TMP8]], align 4
810+
; CHECK-NEXT: br label [[PRED_STORE_CONTINUE]]
811+
; CHECK: pred.store.continue:
812+
; CHECK-NEXT: [[TMP9:%.*]] = extractelement <2 x i1> [[TMP3]], i32 1
813+
; CHECK-NEXT: br i1 [[TMP9]], label [[PRED_STORE_IF2:%.*]], label [[PRED_STORE_CONTINUE3]]
814+
; CHECK: pred.store.if3:
815+
; CHECK-NEXT: [[TMP10:%.*]] = extractelement <2 x i64> [[TMP5]], i32 1
816+
; CHECK-NEXT: [[TMP11:%.*]] = getelementptr i32, ptr [[C]], i64 [[TMP10]]
817+
; CHECK-NEXT: store i32 0, ptr [[TMP11]], align 4
818+
; CHECK-NEXT: br label [[PRED_STORE_CONTINUE3]]
819+
; CHECK: pred.store.continue4:
820+
; CHECK-NEXT: [[INDEX_NEXT]] = add nuw i64 [[INDEX]], 2
821+
; CHECK-NEXT: [[TMP12:%.*]] = icmp eq i64 [[INDEX_NEXT]], [[N_VEC]]
822+
; CHECK-NEXT: br i1 [[TMP12]], label [[MIDDLE_BLOCK:%.*]], label [[VECTOR_BODY]], !llvm.loop [[LOOP16:![0-9]+]]
823+
; CHECK: middle.block:
824+
; CHECK-NEXT: [[CMP_N:%.*]] = icmp eq i64 [[TMP0]], [[N_VEC]]
825+
; CHECK-NEXT: br i1 [[CMP_N]], label [[EXIT_LOOPEXIT:%.*]], label [[SCALAR_PH]]
826+
; CHECK: scalar.ph:
827+
; CHECK-NEXT: [[BC_RESUME_VAL:%.*]] = phi i64 [ [[TMP1]], [[MIDDLE_BLOCK]] ], [ 1, [[PH]] ]
828+
; CHECK-NEXT: br label [[LOOP_HEADER:%.*]]
829+
; CHECK: loop.header:
830+
; CHECK-NEXT: [[IV:%.*]] = phi i64 [ [[BC_RESUME_VAL]], [[SCALAR_PH]] ], [ [[IV_NEXT:%.*]], [[LOOP_LATCH:%.*]] ]
831+
; CHECK-NEXT: [[GEP_A:%.*]] = getelementptr i32, ptr [[A]], i64 [[IV]]
832+
; CHECK-NEXT: [[L_A:%.*]] = load i32, ptr [[GEP_A]], align 4
833+
; CHECK-NEXT: [[C_1:%.*]] = icmp eq i32 [[L_A]], 0
834+
; CHECK-NEXT: br i1 [[C_1]], label [[LOOP_LATCH]], label [[IF_THEN:%.*]]
835+
; CHECK: if.then:
836+
; CHECK-NEXT: [[GEP_B:%.*]] = getelementptr i32, ptr [[B]], i64 [[IV]]
837+
; CHECK-NEXT: [[L_IDX:%.*]] = load i32, ptr [[GEP_B]], align 4
838+
; CHECK-NEXT: [[IDX_EXT:%.*]] = sext i32 [[L_IDX]] to i64
839+
; CHECK-NEXT: [[GEP_C:%.*]] = getelementptr i32, ptr [[C]], i64 [[IDX_EXT]]
840+
; CHECK-NEXT: store i32 0, ptr [[GEP_C]], align 4
841+
; CHECK-NEXT: br label [[LOOP_LATCH]]
842+
; CHECK: loop.latch:
843+
; CHECK-NEXT: [[IV_NEXT]] = add i64 [[IV]], 1
844+
; CHECK-NEXT: [[EC:%.*]] = icmp eq i64 [[IV_NEXT]], [[WIDE_TRIP_COUNT]]
845+
; CHECK-NEXT: br i1 [[EC]], label [[EXIT_LOOPEXIT]], label [[LOOP_HEADER]], !llvm.loop [[LOOP17:![0-9]+]]
846+
; CHECK: exit.loopexit:
847+
; CHECK-NEXT: br label [[EXIT]]
848+
; CHECK: exit:
849+
; CHECK-NEXT: ret void
850+
;
851+
entry:
852+
%B = alloca [62 x i32], align 4
853+
%C = alloca [144 x i32], align 4
854+
call void @init(ptr %B)
855+
call void @init(ptr %C)
856+
%pre = icmp slt i32 %n, 1
857+
br i1 %pre, label %exit, label %ph
858+
859+
ph:
860+
%wide.trip.count = zext i32 %n to i64
861+
br label %loop.header
862+
863+
loop.header:
864+
%iv = phi i64 [ 1, %ph ], [ %iv.next, %loop.latch ]
865+
%gep.A = getelementptr i32, ptr %A, i64 %iv
866+
%l.A = load i32, ptr %gep.A, align 4
867+
%c.1 = icmp eq i32 %l.A, 0
868+
br i1 %c.1, label %loop.latch, label %if.then
869+
870+
if.then:
871+
%gep.B = getelementptr i32, ptr %B, i64 %iv
872+
%l.idx = load i32, ptr %gep.B, align 4
873+
%idx.ext = sext i32 %l.idx to i64
874+
%gep.C = getelementptr i32, ptr %C, i64 %idx.ext
875+
store i32 0, ptr %gep.C, align 4
876+
br label %loop.latch
877+
878+
loop.latch:
879+
%iv.next = add i64 %iv, 1
880+
%ec = icmp eq i64 %iv.next, %wide.trip.count
881+
br i1 %ec, label %exit, label %loop.header
882+
883+
exit:
884+
ret void
885+
}

0 commit comments

Comments
 (0)