Skip to content

[MLIR][Presburger] Fix IntegerRelation::swapVar not swapping identifiers #74407

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 1 commit into from
Dec 13, 2023
Merged

[MLIR][Presburger] Fix IntegerRelation::swapVar not swapping identifiers #74407

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
6 changes: 6 additions & 0 deletions mlir/lib/Analysis/Presburger/IntegerRelation.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -449,6 +449,12 @@ void IntegerRelation::swapVar(unsigned posA, unsigned posB) {
if (posA == posB)
return;

VarKind kindA = space.getVarKindAt(posA);
VarKind kindB = space.getVarKindAt(posB);
unsigned relativePosA = posA - getVarKindOffset(kindA);
unsigned relativePosB = posB - getVarKindOffset(kindB);
space.swapVar(kindA, kindB, relativePosA, relativePosB);

inequalities.swapColumns(posA, posB);
equalities.swapColumns(posA, posB);
}
Expand Down
40 changes: 40 additions & 0 deletions mlir/unittests/Analysis/Presburger/IntegerRelationTest.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,7 @@

#include "mlir/Analysis/Presburger/IntegerRelation.h"
#include "Parser.h"
#include "mlir/Analysis/Presburger/PresburgerSpace.h"
#include "mlir/Analysis/Presburger/Simplex.h"

#include <gmock/gmock.h>
Expand Down Expand Up @@ -167,3 +168,42 @@ TEST(IntegerRelationTest, symbolicLexmax) {
EXPECT_TRUE(lexmax3.unboundedDomain.isIntegerEmpty());
EXPECT_TRUE(lexmax3.lexopt.isEqual(expectedLexmax3));
}

TEST(IntegerRelationTest, swapVar) {
PresburgerSpace space = PresburgerSpace::getRelationSpace(2, 1, 2, 0);
space.resetIds();

int identifiers[6] = {0, 1, 2, 3, 4};

// Attach identifiers to domain identifiers.
space.getId(VarKind::Domain, 0) = Identifier(&identifiers[0]);
space.getId(VarKind::Domain, 1) = Identifier(&identifiers[1]);

// Attach identifiers to range identifiers.
space.getId(VarKind::Range, 0) = Identifier(&identifiers[2]);

// Attach identifiers to symbol identifiers.
space.getId(VarKind::Symbol, 0) = Identifier(&identifiers[3]);
space.getId(VarKind::Symbol, 1) = Identifier(&identifiers[4]);

IntegerRelation rel =
parseRelationFromSet("(x, y, z)[N, M] : (z - x - y == 0, x >= 0, N - x "
">= 0, y >= 0, M - y >= 0)",
2);
rel.setSpace(space);
// Swap (Domain 0, Range 0)
rel.swapVar(0, 2);
// Swap (Domain 1, Symbol 1)
rel.swapVar(1, 4);

PresburgerSpace swappedSpace = rel.getSpace();

EXPECT_TRUE(swappedSpace.getId(VarKind::Domain, 0)
.isEqual(space.getId(VarKind::Range, 0)));
EXPECT_TRUE(swappedSpace.getId(VarKind::Domain, 1)
.isEqual(space.getId(VarKind::Symbol, 1)));
EXPECT_TRUE(swappedSpace.getId(VarKind::Range, 0)
.isEqual(space.getId(VarKind::Domain, 0)));
EXPECT_TRUE(swappedSpace.getId(VarKind::Symbol, 1)
.isEqual(space.getId(VarKind::Domain, 1)));
}