[MLIR][Presburger] Fix ParamPoint to be column-wise instead of row-wise #77232
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
|
@llvm/pr-subscribers-mlir Author: None (Abhinav271828) ChangesThe ParamPoint datatype has each column representing an affine function. The code for generating functions is modified to reflect this. Full diff: https://github.com/llvm/llvm-project/pull/77232.diff 2 Files Affected:
diff --git a/mlir/include/mlir/Analysis/Presburger/GeneratingFunction.h b/mlir/include/mlir/Analysis/Presburger/GeneratingFunction.h
index 4dd692c251563b..35f237d345b824 100644
--- a/mlir/include/mlir/Analysis/Presburger/GeneratingFunction.h
+++ b/mlir/include/mlir/Analysis/Presburger/GeneratingFunction.h
@@ -56,7 +56,7 @@ class GeneratingFunction {
: numParam(numParam), signs(signs), numerators(nums), denominators(dens) {
#ifndef NDEBUG
for (const ParamPoint &term : numerators)
- assert(term.getNumColumns() == numParam + 1 &&
+ assert(term.getNumRows() == numParam + 1 &&
"dimensionality of numerator exponents does not match number of "
"parameters!");
#endif // NDEBUG
diff --git a/mlir/unittests/Analysis/Presburger/GeneratingFunctionTest.cpp b/mlir/unittests/Analysis/Presburger/GeneratingFunctionTest.cpp
index 5df1a5a0f64c05..3fc68cddaad007 100644
--- a/mlir/unittests/Analysis/Presburger/GeneratingFunctionTest.cpp
+++ b/mlir/unittests/Analysis/Presburger/GeneratingFunctionTest.cpp
@@ -17,21 +17,21 @@ using namespace mlir::presburger::detail;
TEST(GeneratingFunctionTest, sum) {
GeneratingFunction gf1(2, {1, -1},
- {makeFracMatrix(2, 3, {{1, 2, 5}, {7, 2, 6}}),
- makeFracMatrix(2, 3, {{5, 2, 5}, {3, 7, 2}})},
+ {makeFracMatrix(3, 2, {{1, 2}, {5, 7}, {2, 6}}),
+ makeFracMatrix(3, 2, {{5, 2}, {5, 3}, {7, 2}})},
{{{3, 6}, {7, 2}}, {{2, 8}, {6, 3}}});
GeneratingFunction gf2(2, {1, 1},
- {makeFracMatrix(2, 3, {{6, 2, 1}, {4, 2, 6}}),
- makeFracMatrix(2, 3, {{3, 2, 6}, {9, 2, 5}})},
+ {makeFracMatrix(3, 2, {{6, 2}, {1, 4}, {2, 6}}),
+ makeFracMatrix(3, 2, {{3, 2}, {6, 9}, {2, 5}})},
{{{3, 7}, {5, 1}}, {{5, 2}, {6, 2}}});
GeneratingFunction sum = gf1 + gf2;
EXPECT_EQ_REPR_GENERATINGFUNCTION(
sum, GeneratingFunction(2, {1, -1, 1, 1},
- {makeFracMatrix(2, 3, {{1, 2, 5}, {7, 2, 6}}),
- makeFracMatrix(2, 3, {{5, 2, 5}, {3, 7, 2}}),
- makeFracMatrix(2, 3, {{6, 2, 1}, {4, 2, 6}}),
- makeFracMatrix(2, 3, {{3, 2, 6}, {9, 2, 5}})},
+ {makeFracMatrix(3, 2, {{1, 2}, {5, 7}, {2, 6}}),
+ makeFracMatrix(3, 2, {{5, 2}, {5, 3}, {7, 2}}),
+ makeFracMatrix(3, 2, {{6, 2}, {1, 4}, {2, 6}}),
+ makeFracMatrix(3, 2, {{3, 2}, {6, 9}, {2, 5}})},
{{{3, 6}, {7, 2}},
{{2, 8}, {6, 3}},
{{3, 7}, {5, 1}},
|
|
@llvm/pr-subscribers-mlir-presburger Author: None (Abhinav271828) ChangesThe ParamPoint datatype has each column representing an affine function. The code for generating functions is modified to reflect this. Full diff: https://github.com/llvm/llvm-project/pull/77232.diff 2 Files Affected:
diff --git a/mlir/include/mlir/Analysis/Presburger/GeneratingFunction.h b/mlir/include/mlir/Analysis/Presburger/GeneratingFunction.h
index 4dd692c251563b..35f237d345b824 100644
--- a/mlir/include/mlir/Analysis/Presburger/GeneratingFunction.h
+++ b/mlir/include/mlir/Analysis/Presburger/GeneratingFunction.h
@@ -56,7 +56,7 @@ class GeneratingFunction {
: numParam(numParam), signs(signs), numerators(nums), denominators(dens) {
#ifndef NDEBUG
for (const ParamPoint &term : numerators)
- assert(term.getNumColumns() == numParam + 1 &&
+ assert(term.getNumRows() == numParam + 1 &&
"dimensionality of numerator exponents does not match number of "
"parameters!");
#endif // NDEBUG
diff --git a/mlir/unittests/Analysis/Presburger/GeneratingFunctionTest.cpp b/mlir/unittests/Analysis/Presburger/GeneratingFunctionTest.cpp
index 5df1a5a0f64c05..3fc68cddaad007 100644
--- a/mlir/unittests/Analysis/Presburger/GeneratingFunctionTest.cpp
+++ b/mlir/unittests/Analysis/Presburger/GeneratingFunctionTest.cpp
@@ -17,21 +17,21 @@ using namespace mlir::presburger::detail;
TEST(GeneratingFunctionTest, sum) {
GeneratingFunction gf1(2, {1, -1},
- {makeFracMatrix(2, 3, {{1, 2, 5}, {7, 2, 6}}),
- makeFracMatrix(2, 3, {{5, 2, 5}, {3, 7, 2}})},
+ {makeFracMatrix(3, 2, {{1, 2}, {5, 7}, {2, 6}}),
+ makeFracMatrix(3, 2, {{5, 2}, {5, 3}, {7, 2}})},
{{{3, 6}, {7, 2}}, {{2, 8}, {6, 3}}});
GeneratingFunction gf2(2, {1, 1},
- {makeFracMatrix(2, 3, {{6, 2, 1}, {4, 2, 6}}),
- makeFracMatrix(2, 3, {{3, 2, 6}, {9, 2, 5}})},
+ {makeFracMatrix(3, 2, {{6, 2}, {1, 4}, {2, 6}}),
+ makeFracMatrix(3, 2, {{3, 2}, {6, 9}, {2, 5}})},
{{{3, 7}, {5, 1}}, {{5, 2}, {6, 2}}});
GeneratingFunction sum = gf1 + gf2;
EXPECT_EQ_REPR_GENERATINGFUNCTION(
sum, GeneratingFunction(2, {1, -1, 1, 1},
- {makeFracMatrix(2, 3, {{1, 2, 5}, {7, 2, 6}}),
- makeFracMatrix(2, 3, {{5, 2, 5}, {3, 7, 2}}),
- makeFracMatrix(2, 3, {{6, 2, 1}, {4, 2, 6}}),
- makeFracMatrix(2, 3, {{3, 2, 6}, {9, 2, 5}})},
+ {makeFracMatrix(3, 2, {{1, 2}, {5, 7}, {2, 6}}),
+ makeFracMatrix(3, 2, {{5, 2}, {5, 3}, {7, 2}}),
+ makeFracMatrix(3, 2, {{6, 2}, {1, 4}, {2, 6}}),
+ makeFracMatrix(3, 2, {{3, 2}, {6, 9}, {2, 5}})},
{{{3, 6}, {7, 2}},
{{2, 8}, {6, 3}},
{{3, 7}, {5, 1}},
|
|
LGTM |
justinfargnoli
pushed a commit
to justinfargnoli/llvm-project
that referenced
this pull request
Jan 28, 2024
…se (llvm#77232) The ParamPoint datatype has each column representing an affine function. The code for generating functions is modified to reflect this.
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
The ParamPoint datatype has each column representing an affine function. The code for generating functions is modified to reflect this.