[mlir][Analysis][NFC] Disambiguate FlatAffineConstraints constructor

[springerm]

Summary

The following constructor call (and others) used to be ambiguous:

FlatAffineConstraints constraints(0, 0, 0);

Depends On D107724

[bondhugula]

I think this revision doesn't need to depend on anything and can go in right away?

[bondhugula]

Thanks for fixing this.

mlir/include/mlir/Analysis/AffineStructures.h

 class FlatAffineConstraints {
 public:
   enum IdKind { Dimension, Symbol, Local };
 
   /// Constructs a constraint system reserving memory for the specified number
   /// of constraints and identifiers..
   FlatAffineConstraints(unsigned numReservedInequalities,
                         unsigned numReservedEqualities,
-                        unsigned numReservedCols, unsigned numDims = 0,
-                        unsigned numSymbols = 0, unsigned numLocals = 0,
+                        unsigned numReservedCols, unsigned numDims,
+                        unsigned numSymbols, unsigned numLocals,
                         ArrayRef<Optional<Value>> idArgs = {})
       : numIds(numDims + numSymbols + numLocals), numDims(numDims),
         numSymbols(numSymbols),
         equalities(0, numIds + 1, numReservedEqualities, numReservedCols),
         inequalities(0, numIds + 1, numReservedInequalities, numReservedCols) {
     assert(numReservedCols >= numIds + 1);
     assert(idArgs.empty() || idArgs.size() == numIds);
     ids.reserve(numReservedCols);

mlir/unittests/Analysis/AffineStructuresTest.cpp

 }
 
 /// Construct a FlatAffineConstraints from a set of inequality and
 /// equality constraints.
 static FlatAffineConstraints
 makeFACFromConstraints(unsigned ids, ArrayRef<SmallVector<int64_t, 4>> ineqs,
                        ArrayRef<SmallVector<int64_t, 4>> eqs,
                        unsigned syms = 0) {
-  FlatAffineConstraints fac(ineqs.size(), eqs.size(), ids + 1, ids - syms,
-                            syms);
+  FlatAffineConstraints fac(ineqs.size(), eqs.size(), ids + 1, ids - syms, syms,
+                            /*numLocals=*/0);
   for (const auto &eq : eqs)
     fac.addEquality(eq);
   for (const auto &ineq : ineqs)
     fac.addInequality(ineq);
   return fac;
 }
 
 /// Check sampling for all the permutations of the dimensions for the given

mlir/unittests/Analysis/PresburgerSetTest.cpp

static void testComplementAtPoints(PresburgerSet s,
   }
 }
 
 /// Construct a FlatAffineConstraints from a set of inequality and
 /// equality constraints.
 static FlatAffineConstraints
 makeFACFromConstraints(unsigned dims, ArrayRef<SmallVector<int64_t, 4>> ineqs,
                        ArrayRef<SmallVector<int64_t, 4>> eqs) {
-  FlatAffineConstraints fac(ineqs.size(), eqs.size(), dims + 1, dims);
+  FlatAffineConstraints fac(ineqs.size(), eqs.size(), dims + 1, dims,
+                            /*numSymbols=*/0, /*numLocals=*/0);
   for (const SmallVector<int64_t, 4> &eq : eqs)
     fac.addEquality(eq);
   for (const SmallVector<int64_t, 4> &ineq : ineqs)
     fac.addInequality(ineq);
   return fac;
 }
 
 static FlatAffineConstraints