Skip to content

[SROA] Add Stored Value Size Check for Tree-Structured Merge #162921

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 5 commits into from
Oct 11, 2025
Merged

[SROA] Add Stored Value Size Check for Tree-Structured Merge #162921

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
db3efa1
Fix SROA issue
Chengjunp Oct 10, 2025
3c2410e
Format
Chengjunp Oct 10, 2025
cb2a28a
Merge branch 'main' into chengjunp/fix_sroa_bug
Chengjunp Oct 10, 2025
01510ed
Update comments
Chengjunp Oct 10, 2025
f0d90fc
Merge branch 'chengjunp/fix_sroa_bug' of https://github.com/Chengjunp…
Chengjunp Oct 10, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 8 additions & 0 deletions llvm/lib/Transforms/Scalar/SROA.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2961,6 +2961,7 @@ class AllocaSliceRewriter : public InstVisitor<AllocaSliceRewriter, bool> {
isa<FixedVectorType>(NewAI.getAllocatedType())
? cast<FixedVectorType>(NewAI.getAllocatedType())->getElementType()
: Type::getInt8Ty(NewAI.getContext());
unsigned AllocatedEltTySize = DL.getTypeSizeInBits(AllocatedEltTy);

// Helper to check if a type is
// 1. A fixed vector type
Expand Down Expand Up @@ -2991,10 +2992,17 @@ class AllocaSliceRewriter : public InstVisitor<AllocaSliceRewriter, bool> {
// Do not handle the case if
// 1. The store does not meet the conditions in the helper function
// 2. The store is volatile
// 3. The total store size is not a multiple of the allocated element
// type size
if (!IsTypeValidForTreeStructuredMerge(
SI->getValueOperand()->getType()) ||
SI->isVolatile())
return std::nullopt;
auto *VecTy = cast<FixedVectorType>(SI->getValueOperand()->getType());
unsigned NumElts = VecTy->getNumElements();
unsigned EltSize = DL.getTypeSizeInBits(VecTy->getElementType());
if (NumElts * EltSize % AllocatedEltTySize != 0)
return std::nullopt;
StoreInfos.emplace_back(SI, S.beginOffset(), S.endOffset(),
SI->getValueOperand());
} else {
Expand Down
14 changes: 14 additions & 0 deletions llvm/test/Transforms/SROA/vector-promotion-cannot-tree-structure-merge.ll
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -219,4 +219,18 @@ entry:

}

define <1 x i32> @test_store_value_size_not_multiple_of_allocated_element_type_size(<1 x i16> %a, <1 x i16> %b) {
entry:
%alloca = alloca [2 x i16]

%ptr0 = getelementptr inbounds [2 x i16], ptr %alloca, i32 0, i32 0
store <1 x i16> %a, ptr %ptr0

%ptr1 = getelementptr inbounds [2 x i16], ptr %alloca, i32 0, i32 1
store <1 x i16> %b, ptr %ptr1

%result = load <1 x i32>, ptr %alloca
ret <1 x i32> %result
}

declare void @llvm.memset.p0.i64(ptr nocapture writeonly, i8, i64, i1 immarg)
Loading