[Mlir-commits] [mlir] d573064 - Revert "[mlir] FlatAffineConstraint parsing for unit tests"
Mehdi Amini
llvmlistbot at llvm.org
Sun Nov 14 23:24:31 PST 2021
Author: Mehdi Amini
Date: 2021-11-15T07:22:38Z
New Revision: d5730647accf0986fa994f5b930b87de1c99eb24
URL: https://github.com/llvm/llvm-project/commit/d5730647accf0986fa994f5b930b87de1c99eb24
DIFF: https://github.com/llvm/llvm-project/commit/d5730647accf0986fa994f5b930b87de1c99eb24.diff
LOG: Revert "[mlir] FlatAffineConstraint parsing for unit tests"
This reverts commit bec488b8183c06c409ddbdd49bbfe2709e407b32.
This commit introduced a layering violation between MLIR libraries.
Reverting for now while discussing on the original review thread.
Added:
Modified:
mlir/include/mlir/Analysis/AffineStructures.h
mlir/include/mlir/Parser.h
mlir/lib/Analysis/AffineStructures.cpp
mlir/lib/Analysis/CMakeLists.txt
mlir/lib/Parser/AffineParser.cpp
mlir/unittests/Analysis/AffineStructuresTest.cpp
mlir/unittests/Analysis/CMakeLists.txt
Removed:
mlir/unittests/Analysis/AffineStructuresParserTest.cpp
################################################################################
diff --git a/mlir/include/mlir/Analysis/AffineStructures.h b/mlir/include/mlir/Analysis/AffineStructures.h
index 8d0c9158bd30a..0c351c7a2959c 100644
--- a/mlir/include/mlir/Analysis/AffineStructures.h
+++ b/mlir/include/mlir/Analysis/AffineStructures.h
@@ -1071,13 +1071,6 @@ LogicalResult getRelationFromMap(AffineMap &map, FlatAffineRelation &rel);
LogicalResult getRelationFromMap(const AffineValueMap &map,
FlatAffineRelation &rel);
-/// This parses a single IntegerSet to an MLIR context and transforms it to
-/// FlatAffineConstraints if it was valid. If not, a failure is returned. If the
-/// passed `str` has additional tokens that were not part of the IntegerSet, a
-/// failure is returned.
-FailureOr<FlatAffineConstraints> parseIntegerSetToFAC(llvm::StringRef,
- MLIRContext *context);
-
} // end namespace mlir.
#endif // MLIR_ANALYSIS_AFFINESTRUCTURES_H
diff --git a/mlir/include/mlir/Parser.h b/mlir/include/mlir/Parser.h
index 4236a403d61bc..a534dfcbe2771 100644
--- a/mlir/include/mlir/Parser.h
+++ b/mlir/include/mlir/Parser.h
@@ -256,14 +256,6 @@ Type parseType(llvm::StringRef typeStr, MLIRContext *context);
/// `typeStr`. The number of characters of `typeStr` parsed in the process is
/// returned in `numRead`.
Type parseType(llvm::StringRef typeStr, MLIRContext *context, size_t &numRead);
-
-/// This parses a single IntegerSet to an MLIR context if it was valid. If not,
-/// an error message is emitted through a new SourceMgrDiagnosticHandler
-/// constructed from a new SourceMgr with a single MemoryBuffer wrapping
-/// `str`. If the passed `str` has additional tokens that were not part of the
-/// IntegerSet, a failure is returned.
-IntegerSet parseIntegerSet(llvm::StringRef str, MLIRContext *context);
-
} // end namespace mlir
#endif // MLIR_PARSER_H
diff --git a/mlir/lib/Analysis/AffineStructures.cpp b/mlir/lib/Analysis/AffineStructures.cpp
index e942a384f7170..4e23b24fb558a 100644
--- a/mlir/lib/Analysis/AffineStructures.cpp
+++ b/mlir/lib/Analysis/AffineStructures.cpp
@@ -19,7 +19,6 @@
#include "mlir/Dialect/StandardOps/IR/Ops.h"
#include "mlir/IR/AffineExprVisitor.h"
#include "mlir/IR/IntegerSet.h"
-#include "mlir/Parser.h"
#include "mlir/Support/LLVM.h"
#include "mlir/Support/MathExtras.h"
#include "llvm/ADT/STLExtras.h"
@@ -3866,13 +3865,3 @@ LogicalResult mlir::getRelationFromMap(const AffineValueMap &map,
return success();
}
-
-FailureOr<FlatAffineConstraints>
-mlir::parseIntegerSetToFAC(llvm::StringRef str, MLIRContext *context) {
- IntegerSet set = parseIntegerSet(str, context);
-
- if (!set)
- return failure();
-
- return FlatAffineConstraints(set);
-}
diff --git a/mlir/lib/Analysis/CMakeLists.txt b/mlir/lib/Analysis/CMakeLists.txt
index e4f67ac863986..9128ef9474ace 100644
--- a/mlir/lib/Analysis/CMakeLists.txt
+++ b/mlir/lib/Analysis/CMakeLists.txt
@@ -66,7 +66,6 @@ add_mlir_library(MLIRLoopAnalysis
MLIRCallInterfaces
MLIRControlFlowInterfaces
MLIRInferTypeOpInterface
- MLIRParser
MLIRPresburger
MLIRSCF
)
diff --git a/mlir/lib/Parser/AffineParser.cpp b/mlir/lib/Parser/AffineParser.cpp
index 86f2c808ec6de..708983709f6cc 100644
--- a/mlir/lib/Parser/AffineParser.cpp
+++ b/mlir/lib/Parser/AffineParser.cpp
@@ -13,13 +13,10 @@
#include "Parser.h"
#include "mlir/IR/AffineMap.h"
#include "mlir/IR/IntegerSet.h"
-#include "llvm/Support/SourceMgr.h"
using namespace mlir;
using namespace mlir::detail;
-using llvm::MemoryBuffer;
using llvm::SMLoc;
-using llvm::SourceMgr;
namespace {
@@ -720,26 +717,3 @@ Parser::parseAffineExprOfSSAIds(AffineExpr &expr,
return AffineParser(state, /*allowParsingSSAIds=*/true, parseElement)
.parseAffineExprOfSSAIds(expr);
}
-
-IntegerSet mlir::parseIntegerSet(StringRef inputStr, MLIRContext *context) {
- llvm::SourceMgr sourceMgr;
- auto memBuffer = llvm::MemoryBuffer::getMemBuffer(
- inputStr, /*BufferName=*/"<mlir_parser_buffer>",
- /*RequiresNullTerminator=*/false);
- sourceMgr.AddNewSourceBuffer(std::move(memBuffer), SMLoc());
- SymbolState symbolState;
- ParserState state(sourceMgr, context, symbolState, /*asmState=*/nullptr);
- Parser parser(state);
- SourceMgrDiagnosticHandler handler(sourceMgr, context);
- IntegerSet set;
- if (parser.parseIntegerSetReference(set))
- return IntegerSet();
-
- Token endTok = parser.getToken();
- if (endTok.isNot(Token::eof)) {
- parser.emitError(endTok.getLoc(), "encountered unexpected token");
- return IntegerSet();
- }
-
- return set;
-}
diff --git a/mlir/unittests/Analysis/AffineStructuresParserTest.cpp b/mlir/unittests/Analysis/AffineStructuresParserTest.cpp
deleted file mode 100644
index 4cdba7fd9bec1..0000000000000
--- a/mlir/unittests/Analysis/AffineStructuresParserTest.cpp
+++ /dev/null
@@ -1,137 +0,0 @@
-//===- AffineStructuresParserTest.cpp - FAC parsing unit tests --*- C++ -*-===//
-//
-// Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.
-// See https://llvm.org/LICENSE.txt for license information.
-// SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
-//
-//===----------------------------------------------------------------------===//
-//
-// This file contains tests for parsing IntegerSets to FlatAffineConstraints.
-// The tests with invalid input check that the parser only accepts well-formed
-// IntegerSets. The tests with well-formed input compare the returned FACs to
-// manually constructed FACs with a PresburgerSet equality check.
-//
-//===----------------------------------------------------------------------===//
-
-#include "mlir/Analysis/AffineStructures.h"
-#include "mlir/Analysis/PresburgerSet.h"
-
-#include <gtest/gtest.h>
-
-namespace mlir {
-
-/// Construct a FlatAffineConstraints from a set of inequality, equality, and
-/// division onstraints.
-static FlatAffineConstraints makeFACFromConstraints(
- unsigned dims, unsigned syms, ArrayRef<SmallVector<int64_t, 4>> ineqs,
- ArrayRef<SmallVector<int64_t, 4>> eqs = {},
- ArrayRef<std::pair<SmallVector<int64_t, 4>, int64_t>> divs = {}) {
- FlatAffineConstraints fac(ineqs.size(), eqs.size(), dims + syms + 1, dims,
- syms, 0);
- for (const auto &div : divs)
- fac.addLocalFloorDiv(div.first, div.second);
- for (const auto &eq : eqs)
- fac.addEquality(eq);
- for (const auto &ineq : ineqs)
- fac.addInequality(ineq);
- return fac;
-}
-
-TEST(ParseFACTest, InvalidInputTest) {
- MLIRContext context;
- FailureOr<FlatAffineConstraints> fac;
-
- fac = parseIntegerSetToFAC("(x)", &context);
- EXPECT_TRUE(failed(fac))
- << "should not accept strings with no constraint list";
-
- fac = parseIntegerSetToFAC("(x)[] : ())", &context);
- EXPECT_TRUE(failed(fac))
- << "should not accept strings that contain remaining characters";
-
- fac = parseIntegerSetToFAC("(x)[] : (x - >= 0)", &context);
- EXPECT_TRUE(failed(fac))
- << "should not accept strings that contain incomplete constraints";
-
- fac = parseIntegerSetToFAC("(x)[] : (y == 0)", &context);
- EXPECT_TRUE(failed(fac))
- << "should not accept strings that contain unkown identifiers";
-
- fac = parseIntegerSetToFAC("(x, x) : (2 * x >= 0)", &context);
- EXPECT_TRUE(failed(fac))
- << "should not accept strings that contain repeated identifier names";
-
- fac = parseIntegerSetToFAC("(x)[x] : (2 * x >= 0)", &context);
- EXPECT_TRUE(failed(fac))
- << "should not accept strings that contain repeated identifier names";
-
- fac = parseIntegerSetToFAC("(x) : (2 * x + 9223372036854775808 >= 0)",
- &context);
- EXPECT_TRUE(failed(fac)) << "should not accept strings with integer literals "
- "that do not fit into int64_t";
-}
-
-/// Parses and compares the `str` to the `ex`. The equality check is performed
-/// by using PresburgerSet::isEqual
-static bool parseAndCompare(StringRef str, FlatAffineConstraints ex,
- MLIRContext *context) {
- FailureOr<FlatAffineConstraints> fac = parseIntegerSetToFAC(str, context);
-
- EXPECT_TRUE(succeeded(fac));
-
- return PresburgerSet(*fac).isEqual(PresburgerSet(ex));
-}
-
-TEST(ParseFACTest, ParseAndCompareTest) {
- MLIRContext context;
- // simple ineq
- EXPECT_TRUE(parseAndCompare(
- "(x)[] : (x >= 0)", makeFACFromConstraints(1, 0, {{1, 0}}), &context));
-
- // simple eq
- EXPECT_TRUE(parseAndCompare("(x)[] : (x == 0)",
- makeFACFromConstraints(1, 0, {}, {{1, 0}}),
- &context));
-
- // multiple constraints
- EXPECT_TRUE(parseAndCompare("(x)[] : (7 * x >= 0, -7 * x + 5 >= 0)",
- makeFACFromConstraints(1, 0, {{7, 0}, {-7, 5}}),
- &context));
-
- // multiple dimensions
- EXPECT_TRUE(parseAndCompare("(x,y,z)[] : (x + y - z >= 0)",
- makeFACFromConstraints(3, 0, {{1, 1, -1, 0}}),
- &context));
-
- // dimensions and symbols
- EXPECT_TRUE(parseAndCompare(
- "(x,y,z)[a,b] : (x + y - z + 2 * a - 15 * b >= 0)",
- makeFACFromConstraints(3, 2, {{1, 1, -1, 2, -15, 0}}), &context));
-
- // only symbols
- EXPECT_TRUE(parseAndCompare("()[a] : (2 * a - 4 == 0)",
- makeFACFromConstraints(0, 1, {}, {{2, -4}}),
- &context));
-
- // simple floordiv
- EXPECT_TRUE(parseAndCompare(
- "(x, y) : (y - 3 * ((x + y - 13) floordiv 3) - 42 == 0)",
- makeFACFromConstraints(2, 0, {}, {{0, 1, -3, -42}}, {{{1, 1, -13}, 3}}),
- &context));
-
- // multiple floordiv
- EXPECT_TRUE(parseAndCompare(
- "(x, y) : (y - x floordiv 3 - y floordiv 2 == 0)",
- makeFACFromConstraints(2, 0, {}, {{0, 1, -1, -1, 0}},
- {{{1, 0, 0}, 3}, {{0, 1, 0, 0}, 2}}),
- &context));
-
- // nested floordiv
- EXPECT_TRUE(parseAndCompare(
- "(x, y) : (y - (x + y floordiv 2) floordiv 3 == 0)",
- makeFACFromConstraints(2, 0, {}, {{0, 1, 0, -1, 0}},
- {{{0, 1, 0}, 2}, {{1, 0, 1, 0}, 3}}),
- &context));
-}
-
-} // namespace mlir
diff --git a/mlir/unittests/Analysis/AffineStructuresTest.cpp b/mlir/unittests/Analysis/AffineStructuresTest.cpp
index b43e2672db386..ef83b7c657514 100644
--- a/mlir/unittests/Analysis/AffineStructuresTest.cpp
+++ b/mlir/unittests/Analysis/AffineStructuresTest.cpp
@@ -98,24 +98,11 @@ static void checkPermutationsSample(bool hasSample, unsigned nDim,
} while (std::next_permutation(perm.begin(), perm.end()));
}
-/// Parses a FlatAffineConstraints from a StringRef. It is expected that the
-/// string represents a valid IntegerSet, otherwise it will violate a gtest
-/// assertion.
-static FlatAffineConstraints parseFAC(StringRef str, MLIRContext *context) {
- FailureOr<FlatAffineConstraints> fac = parseIntegerSetToFAC(str, context);
-
- EXPECT_TRUE(succeeded(fac));
-
- return *fac;
-}
-
TEST(FlatAffineConstraintsTest, FindSampleTest) {
// Bounded sets with only inequalities.
- MLIRContext context;
-
// 0 <= 7x <= 5
- checkSample(true, parseFAC("(x) : (7 * x >= 0, -7 * x + 5 >= 0)", &context));
+ checkSample(true, makeFACFromConstraints(1, {{7, 0}, {-7, 5}}, {}));
// 1 <= 5x and 5x <= 4 (no solution).
checkSample(false, makeFACFromConstraints(1, {{5, -1}, {-5, 4}}, {}));
diff --git a/mlir/unittests/Analysis/CMakeLists.txt b/mlir/unittests/Analysis/CMakeLists.txt
index 05a492d0bf554..0df0af866d662 100644
--- a/mlir/unittests/Analysis/CMakeLists.txt
+++ b/mlir/unittests/Analysis/CMakeLists.txt
@@ -1,5 +1,4 @@
add_mlir_unittest(MLIRAnalysisTests
- AffineStructuresParserTest.cpp
AffineStructuresTest.cpp
LinearTransformTest.cpp
PresburgerSetTest.cpp
More information about the Mlir-commits
mailing list