Skip to content

Commit 97f1db2

Browse files
committed
[LoopIdimo] Use tryZExtValue() instead of getZExtValue()
To avoid an assertion for large BECounts. I also suspect that this code is missing an overflow check. Fixes #70008.
1 parent 1e3a344 commit 97f1db2

File tree

2 files changed

+46
-3
lines changed

2 files changed

+46
-3
lines changed

llvm/lib/Transforms/Scalar/LoopIdiomRecognize.cpp

Lines changed: 7 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -948,9 +948,13 @@ mayLoopAccessLocation(Value *Ptr, ModRefInfo Access, Loop *L,
948948
// to be exactly the size of the memset, which is (BECount+1)*StoreSize
949949
const SCEVConstant *BECst = dyn_cast<SCEVConstant>(BECount);
950950
const SCEVConstant *ConstSize = dyn_cast<SCEVConstant>(StoreSizeSCEV);
951-
if (BECst && ConstSize)
952-
AccessSize = LocationSize::precise((BECst->getValue()->getZExtValue() + 1) *
953-
ConstSize->getValue()->getZExtValue());
951+
if (BECst && ConstSize) {
952+
std::optional<uint64_t> BEInt = BECst->getAPInt().tryZExtValue();
953+
std::optional<uint64_t> SizeInt = ConstSize->getAPInt().tryZExtValue();
954+
// FIXME: Should this check for overflow?
955+
if (BEInt && SizeInt)
956+
AccessSize = LocationSize::precise((*BEInt + 1) * *SizeInt);
957+
}
954958

955959
// TODO: For this to be really effective, we have to dive into the pointer
956960
// operand in the store. Store to &A[i] of 100 will always return may alias
Lines changed: 39 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,39 @@
1+
; NOTE: Assertions have been autogenerated by utils/update_test_checks.py UTC_ARGS: --version 3
2+
; RUN: opt -S -passes=loop-idiom < %s | FileCheck %s
3+
4+
; Make sure we don't assert if the BECount is larger than 64 bits.
5+
6+
define void @test(ptr %p) {
7+
; CHECK-LABEL: define void @test(
8+
; CHECK-SAME: ptr [[P:%.*]]) {
9+
; CHECK-NEXT: entry:
10+
; CHECK-NEXT: call void @llvm.memset.p0.i64(ptr align 4 [[P]], i8 0, i64 0, i1 false)
11+
; CHECK-NEXT: br label [[FOR_BODY:%.*]]
12+
; CHECK: for.body:
13+
; CHECK-NEXT: [[IV:%.*]] = phi i128 [ 0, [[ENTRY:%.*]] ], [ [[INC:%.*]], [[FOR_BODY]] ]
14+
; CHECK-NEXT: [[IV_TRUNC:%.*]] = trunc i128 [[IV]] to i64
15+
; CHECK-NEXT: [[GEP1:%.*]] = getelementptr { i64, i64 }, ptr [[P]], i64 [[IV_TRUNC]]
16+
; CHECK-NEXT: [[GEP2:%.*]] = getelementptr { i64, i64 }, ptr [[P]], i64 [[IV_TRUNC]], i32 1
17+
; CHECK-NEXT: [[INC]] = add i128 [[IV]], 1
18+
; CHECK-NEXT: [[TOBOOL_NOT:%.*]] = icmp eq i128 [[INC]], 0
19+
; CHECK-NEXT: br i1 [[TOBOOL_NOT]], label [[EXIT:%.*]], label [[FOR_BODY]]
20+
; CHECK: exit:
21+
; CHECK-NEXT: ret void
22+
;
23+
entry:
24+
br label %for.body
25+
26+
for.body:
27+
%iv = phi i128 [ 0, %entry ], [ %inc, %for.body ]
28+
%iv.trunc = trunc i128 %iv to i64
29+
%gep1 = getelementptr { i64, i64 }, ptr %p, i64 %iv.trunc
30+
%gep2 = getelementptr { i64, i64 }, ptr %p, i64 %iv.trunc, i32 1
31+
store i64 0, ptr %gep1
32+
store i64 0, ptr %gep2
33+
%inc = add i128 %iv, 1
34+
%tobool.not = icmp eq i128 %inc, 0
35+
br i1 %tobool.not, label %exit, label %for.body
36+
37+
exit:
38+
ret void
39+
}

0 commit comments

Comments
 (0)