Skip to content

[GISel][Legalizer] Rework changeElementCountTo (NFC) #158617

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

Open
wants to merge 2 commits into
base: main
Choose a base branch
from
Open

[GISel][Legalizer] Rework changeElementCountTo (NFC) #158617

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
8825ce7
changeElementCount
tgymnich Feb 6, 2025
113daa9
style
DenisGZM Sep 15, 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
3 changes: 2 additions & 1 deletion llvm/include/llvm/CodeGen/GlobalISel/LegalizerInfo.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -380,7 +380,8 @@ LLVM_ABI LegalizeMutation changeElementCountTo(unsigned TypeIdx,

/// Keep the same scalar or element type as \p TypeIdx, but take the number of
/// elements from \p Ty.
LLVM_ABI LegalizeMutation changeElementCountTo(unsigned TypeIdx, LLT Ty);
LLVM_ABI LegalizeMutation changeElementCountTo(unsigned TypeIdx,
ElementCount EC);

/// Change the scalar size or element size to have the same scalar size as type
/// index \p FromIndex. Unlike changeElementTo, this discards pointer types and
Expand Down
6 changes: 2 additions & 4 deletions llvm/lib/CodeGen/GlobalISel/LegalizeMutations.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -55,12 +55,10 @@ LegalizeMutation LegalizeMutations::changeElementCountTo(unsigned TypeIdx,
}

LegalizeMutation LegalizeMutations::changeElementCountTo(unsigned TypeIdx,
LLT NewEltTy) {
ElementCount EC) {
return [=](const LegalityQuery &Query) {
const LLT OldTy = Query.Types[TypeIdx];
ElementCount NewEltCount = NewEltTy.isVector() ? NewEltTy.getElementCount()
: ElementCount::getFixed(1);
return std::make_pair(TypeIdx, OldTy.changeElementCount(NewEltCount));
return std::make_pair(TypeIdx, OldTy.changeElementCount(EC));
};
}

Expand Down
14 changes: 8 additions & 6 deletions llvm/unittests/CodeGen/GlobalISel/LegalizerInfoTest.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -420,12 +420,14 @@ TEST(LegalizerInfoTest, RuleSets) {

// Raw type form
LI.getActionDefinitionsBuilder(G_ADD)
.fewerElementsIf(typeIs(0, v4s32), changeElementCountTo(0, v2s32))
.fewerElementsIf(typeIs(0, v8s32), changeElementCountTo(0, s32))
.fewerElementsIf(typeIs(0, LLT::scalable_vector(4, 16)),
changeElementCountTo(0, LLT::scalable_vector(2, 16)))
.fewerElementsIf(typeIs(0, LLT::scalable_vector(8, 16)),
changeElementCountTo(0, s16));
.fewerElementsIf(typeIs(0, v4s32),
changeElementCountTo(0, ElementCount::getFixed(2)))
.fewerElementsIf(typeIs(0, v8s32),
changeElementCountTo(0, ElementCount::getFixed(1)))
.fewerElementsIf(typeIs(0, LLT::scalable_vector(4, s16)),
changeElementCountTo(0, ElementCount::getScalable(2)))
.fewerElementsIf(typeIs(0, LLT::scalable_vector(8, s16)),
changeElementCountTo(0, ElementCount::getFixed(1)));

LegacyInfo.computeTables();

Expand Down
Loading