[MLIR][Presburger] Fix ParamPoint to be column-wise instead of row-wise (#77232)

The ParamPoint datatype has each column representing an affine function.
The code for generating functions is modified to reflect this.
This commit is contained in:
Abhinav271828 2024-01-07 16:27:10 +05:30 committed by GitHub
parent 4c8dbb6813
commit 2835be82db
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 10 additions and 10 deletions

View File

@ -22,7 +22,7 @@ namespace presburger {
namespace detail {
// A parametric point is a vector, each of whose elements
// is an affine function of n parameters. Each row
// is an affine function of n parameters. Each column
// in the matrix represents the affine function and
// has n+1 elements.
using ParamPoint = FracMatrix;
@ -56,7 +56,7 @@ public:
: 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

View File

@ -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}},