This is an archive of the discontinued LLVM Phabricator instance.

Differential D82294

[SVE] Fix scalable vector bug in DataLayout::getIntPtrType
ClosedPublic

Authored by david-arm on Jun 22 2020, 6:24 AM.

Details

Reviewers
efriedma
sdesmalen
c-rhodes
Commits
rG7a834a0a4ee3: [SVE] Fix scalable vector bug in DataLayout::getIntPtrType
Summary

Fixed an issue in DataLayout::getIntPtrType where we were assuming
the input type was always a fixed vector type, which isn't true.

Added a test that exposed the problem to:

Transforms/InstCombine/vector_gep1.ll

Diff Detail

Event Timeline

david-arm created this revision.Jun 22 2020, 6:24 AM
Herald added a reviewer: efriedma. · View Herald TranscriptJun 22 2020, 6:24 AM
Herald added a project: Restricted Project. · View Herald Transcript
Herald added subscribers: llvm-commits, psnobl, rkruppe and 2 others. · View Herald Transcript
Harbormaster completed remote builds in B61217: Diff 272402.Jun 22 2020, 7:30 AM
david-arm added reviewers: sdesmalen, c-rhodes.Jun 22 2020, 7:59 AM
efriedma added inline comments.Jun 22 2020, 1:59 PM
llvm/lib/IR/DataLayout.cpp
795

Can you just use VectorType::get(IntTy, VecTy)?

david-arm updated this revision to Diff 272633.Jun 23 2020, 12:49 AM
ctetreau added a child revision: D81500: [SVE] Remove calls to VectorType::getNumElements from IR.Jun 23 2020, 1:06 PM
ctetreau mentioned this in D81500: [SVE] Remove calls to VectorType::getNumElements from IR.Jun 23 2020, 1:07 PM
david-arm marked an inline comment as done.Jun 24 2020, 11:23 PM
efriedma accepted this revision.Jun 25 2020, 9:47 AM

LGTM

This revision is now accepted and ready to land.Jun 25 2020, 9:47 AM
Closed by commit rG7a834a0a4ee3: [SVE] Fix scalable vector bug in DataLayout::getIntPtrType (authored by david-arm). · Explain WhyJun 25 2020, 11:59 PM
This revision was automatically updated to reflect the committed changes.
ctetreau removed a child revision: D81500: [SVE] Remove calls to VectorType::getNumElements from IR.Aug 26 2020, 12:54 PM

Revision Contents

PathSize
llvm/
lib/
IR/
2 lines
test/
Transforms/
InstCombine/
10 lines

Diff 273602

llvm/lib/IR/DataLayout.cpp

Show First 20 Lines • Show All 786 Lines • ▼ Show 20 Lines
} }
Type *DataLayout::getIntPtrType(Type *Ty) const { Type *DataLayout::getIntPtrType(Type *Ty) const {
assert(Ty->isPtrOrPtrVectorTy() && assert(Ty->isPtrOrPtrVectorTy() &&
"Expected a pointer or pointer vector type."); "Expected a pointer or pointer vector type.");
unsigned NumBits = getPointerTypeSizeInBits(Ty); unsigned NumBits = getPointerTypeSizeInBits(Ty);
IntegerType *IntTy = IntegerType::get(Ty->getContext(), NumBits); IntegerType *IntTy = IntegerType::get(Ty->getContext(), NumBits);
if (VectorType *VecTy = dyn_cast<VectorType>(Ty)) if (VectorType *VecTy = dyn_cast<VectorType>(Ty))
return FixedVectorType::get(IntTy, VecTy->getNumElements()); return VectorType::get(IntTy, VecTy);
efriedmaUnsubmitted
Done
ReplyInline Actions

Can you just use VectorType::get(IntTy, VecTy)?

efriedma: Can you just use `VectorType::get(IntTy, VecTy)`?
return IntTy; return IntTy;
} }
Type *DataLayout::getSmallestLegalIntType(LLVMContext &C, unsigned Width) const { Type *DataLayout::getSmallestLegalIntType(LLVMContext &C, unsigned Width) const {
for (unsigned LegalIntWidth : LegalIntWidths) for (unsigned LegalIntWidth : LegalIntWidths)
if (Width <= LegalIntWidth) if (Width <= LegalIntWidth)
return Type::getIntNTy(C, LegalIntWidth); return Type::getIntNTy(C, LegalIntWidth);
return nullptr; return nullptr;
▲ Show 20 Lines • Show All 89 Lines • Show Last 20 Lines

llvm/test/Transforms/InstCombine/vector_gep1.ll

Show First 20 Lines • Show All 56 Lines • ▼ Show 20 Lines
; CHECK-LABEL: @test7( ; CHECK-LABEL: @test7(
; CHECK-NEXT: [[W:%.*]] = getelementptr { i32, i32 }, <2 x { i32, i32 }*> [[A:%.*]], <2 x i64> <i64 5, i64 9>, <2 x i32> zeroinitializer ; CHECK-NEXT: [[W:%.*]] = getelementptr { i32, i32 }, <2 x { i32, i32 }*> [[A:%.*]], <2 x i64> <i64 5, i64 9>, <2 x i32> zeroinitializer
; CHECK-NEXT: ret <2 x i32*> [[W]] ; CHECK-NEXT: ret <2 x i32*> [[W]]
; ;
%w = getelementptr {i32, i32}, <2 x {i32, i32}*> %a, <2 x i32> <i32 5, i32 9>, <2 x i32> zeroinitializer %w = getelementptr {i32, i32}, <2 x {i32, i32}*> %a, <2 x i32> <i32 5, i32 9>, <2 x i32> zeroinitializer
ret <2 x i32*> %w ret <2 x i32*> %w
} }
define <vscale x 2 x i1> @test8() {
; CHECK-LABEL: @test8(
; CHECK-NEXT: ret <vscale x 2 x i1> icmp ult (<vscale x 2 x i64> zext (<vscale x 2 x i32> shufflevector (<vscale x 2 x i32> insertelement (<vscale x 2 x i32> undef, i32 1, i32 0), <vscale x 2 x i32> undef, <vscale x 2 x i32> zeroinitializer) to <vscale x 2 x i64>), <vscale x 2 x i64> zeroinitializer)
;
%ins = insertelement <vscale x 2 x i32> undef, i32 1, i32 0
%b = shufflevector <vscale x 2 x i32> %ins, <vscale x 2 x i32> undef, <vscale x 2 x i32> zeroinitializer
%c = inttoptr <vscale x 2 x i32> %b to <vscale x 2 x i8*>
%d = icmp ult <vscale x 2 x i8*> %c, zeroinitializer
ret <vscale x 2 x i1> %d
}