[Mlir-commits] [mlir] 5e80931 - [MLIR] Add method to drop duplicate result exprs from AffineMap
Uday Bondhugula
llvmlistbot at llvm.org
Wed Apr 1 14:31:13 PDT 2020
Author: Uday Bondhugula
Date: 2020-04-02T03:00:19+05:30
New Revision: 5e8093134af282765989be7ad213a105fe0ca3b4
URL: https://github.com/llvm/llvm-project/commit/5e8093134af282765989be7ad213a105fe0ca3b4
DIFF: https://github.com/llvm/llvm-project/commit/5e8093134af282765989be7ad213a105fe0ca3b4.diff
LOG: [MLIR] Add method to drop duplicate result exprs from AffineMap
Add a method that given an affine map returns another with just its unique
results. Use this to drop redundant bounds in max/min for affine.for. Update
affine.for's canonicalization pattern and createCanonicalizedForOp to use
this.
Differential Revision: https://reviews.llvm.org/D77237
Added:
Modified:
mlir/include/mlir/IR/AffineMap.h
mlir/include/mlir/Transforms/LoopUtils.h
mlir/lib/Dialect/Affine/IR/AffineOps.cpp
mlir/lib/IR/AffineMap.cpp
mlir/lib/Transforms/Utils/LoopUtils.cpp
mlir/test/Conversion/AffineToStandard/lower-affine.mlir
mlir/test/Dialect/Affine/canonicalize.mlir
Removed:
################################################################################
diff --git a/mlir/include/mlir/IR/AffineMap.h b/mlir/include/mlir/IR/AffineMap.h
index 1553427d19aa..ff65da62a115 100644
--- a/mlir/include/mlir/IR/AffineMap.h
+++ b/mlir/include/mlir/IR/AffineMap.h
@@ -215,9 +215,13 @@ struct MutableAffineMap {
MLIRContext *context;
};
-/// Simplify an affine map by simplifying its underlying AffineExpr results.
+/// Simplifies an affine map by simplifying its underlying AffineExpr results.
AffineMap simplifyAffineMap(AffineMap map);
+/// Returns a map with the same dimension and symbol count as `map`, but whose
+/// results are the unique affine expressions of `map`.
+AffineMap removeDuplicateExprs(AffineMap map);
+
/// Returns a map of codomain to domain dimensions such that the first codomain
/// dimension for a particular domain dimension is selected.
/// Returns an empty map if the input map is empty or if `map` is not invertible
diff --git a/mlir/include/mlir/Transforms/LoopUtils.h b/mlir/include/mlir/Transforms/LoopUtils.h
index 3a5a6e52c54f..3bc34f1444e0 100644
--- a/mlir/include/mlir/Transforms/LoopUtils.h
+++ b/mlir/include/mlir/Transforms/LoopUtils.h
@@ -265,8 +265,8 @@ void gatherLoops(FuncOp func,
std::vector<SmallVector<AffineForOp, 2>> &depthToLoops);
/// Creates an AffineForOp while ensuring that the lower and upper bounds are
-/// canonicalized, i.e., unused and duplicate operands are removed, and any
-/// constant operands propagated/folded in.
+/// canonicalized, i.e., unused and duplicate operands are removed, any constant
+/// operands propagated/folded in, and duplicate bound maps dropped.
AffineForOp createCanonicalizedAffineForOp(OpBuilder b, Location loc,
ValueRange lbOperands,
AffineMap lbMap,
diff --git a/mlir/lib/Dialect/Affine/IR/AffineOps.cpp b/mlir/lib/Dialect/Affine/IR/AffineOps.cpp
index 996efe04066b..a92c621fa96e 100644
--- a/mlir/lib/Dialect/Affine/IR/AffineOps.cpp
+++ b/mlir/lib/Dialect/Affine/IR/AffineOps.cpp
@@ -1383,7 +1383,10 @@ static LogicalResult canonicalizeLoopBounds(AffineForOp forOp) {
auto prevUbMap = ubMap;
canonicalizeMapAndOperands(&lbMap, &lbOperands);
+ lbMap = removeDuplicateExprs(lbMap);
+
canonicalizeMapAndOperands(&ubMap, &ubOperands);
+ ubMap = removeDuplicateExprs(ubMap);
// Any canonicalization change always leads to updated map(s).
if (lbMap == prevLbMap && ubMap == prevUbMap)
diff --git a/mlir/lib/IR/AffineMap.cpp b/mlir/lib/IR/AffineMap.cpp
index 22bedb77f10e..7e5036e37bab 100644
--- a/mlir/lib/IR/AffineMap.cpp
+++ b/mlir/lib/IR/AffineMap.cpp
@@ -325,6 +325,15 @@ AffineMap mlir::simplifyAffineMap(AffineMap map) {
return AffineMap::get(map.getNumDims(), map.getNumSymbols(), exprs);
}
+AffineMap mlir::removeDuplicateExprs(AffineMap map) {
+ auto results = map.getResults();
+ SmallVector<AffineExpr, 4> uniqueExprs(results.begin(), results.end());
+ uniqueExprs.erase(std::unique(uniqueExprs.begin(), uniqueExprs.end()),
+ uniqueExprs.end());
+ return AffineMap::get(map.getNumDims(), map.getNumSymbols(), uniqueExprs,
+ map.getContext());
+}
+
AffineMap mlir::inversePermutation(AffineMap map) {
if (map.isEmpty())
return map;
diff --git a/mlir/lib/Transforms/Utils/LoopUtils.cpp b/mlir/lib/Transforms/Utils/LoopUtils.cpp
index 86d0ff49c0ae..42649ae336c0 100644
--- a/mlir/lib/Transforms/Utils/LoopUtils.cpp
+++ b/mlir/lib/Transforms/Utils/LoopUtils.cpp
@@ -2132,8 +2132,10 @@ AffineForOp mlir::createCanonicalizedAffineForOp(
fullyComposeAffineMapAndOperands(&lbMap, &lowerOperands);
canonicalizeMapAndOperands(&lbMap, &lowerOperands);
+ lbMap = removeDuplicateExprs(lbMap);
fullyComposeAffineMapAndOperands(&ubMap, &upperOperands);
canonicalizeMapAndOperands(&ubMap, &upperOperands);
+ ubMap = removeDuplicateExprs(ubMap);
return b.create<AffineForOp>(loc, lowerOperands, lbMap, upperOperands, ubMap,
step);
diff --git a/mlir/test/Conversion/AffineToStandard/lower-affine.mlir b/mlir/test/Conversion/AffineToStandard/lower-affine.mlir
index 18b410ae7f58..18ef4e201c8d 100644
--- a/mlir/test/Conversion/AffineToStandard/lower-affine.mlir
+++ b/mlir/test/Conversion/AffineToStandard/lower-affine.mlir
@@ -344,7 +344,7 @@ func @loop_min_max(%N : index) {
return
}
-#map_7_values = affine_map<(i) -> (i, i, i, i, i, i, i)>
+#map_7_values = affine_map<(d0, d1, d2, d3, d4, d5, d6) -> (d0, d1, d2, d3, d4, d5, d6)>
// Check that the "min" (cmpi "slt" + select) reduction sequence is emitted
// correctly for a an affine map with 7 results.
@@ -369,8 +369,8 @@ func @loop_min_max(%N : index) {
// CHECK-NEXT: }
// CHECK-NEXT: return
// CHECK-NEXT: }
-func @min_reduction_tree(%v : index) {
- affine.for %i = 0 to min #map_7_values(%v)[] {
+func @min_reduction_tree(%v1 : index, %v2 : index, %v3 : index, %v4 : index, %v5 : index, %v6 : index, %v7 : index) {
+ affine.for %i = 0 to min #map_7_values(%v1, %v2, %v3, %v4, %v5, %v6, %v7)[] {
call @body(%i) : (index) -> ()
}
return
@@ -619,4 +619,4 @@ func @affine_max(%arg0: index, %arg1: index) -> index{
// CHECK: select %[[cmp]], %[[first]], %[[second]]
%0 = affine.max affine_map<(d0,d1) -> (d0 - d1, d1 - d0)>(%arg0, %arg1)
return %0 : index
-}
\ No newline at end of file
+}
diff --git a/mlir/test/Dialect/Affine/canonicalize.mlir b/mlir/test/Dialect/Affine/canonicalize.mlir
index 9e9787e8537d..90437ac7ce5f 100644
--- a/mlir/test/Dialect/Affine/canonicalize.mlir
+++ b/mlir/test/Dialect/Affine/canonicalize.mlir
@@ -594,3 +594,15 @@ func @rep(%arg0 : index, %arg1 : index) -> index {
%1 = affine.min #map2(%0)[%arg1]
return %1 : index
}
+
+// -----
+// CHECK-DAG: #[[lb:.*]] = affine_map<()[s0] -> (s0)>
+// CHECK-DAG: #[[ub:.*]] = affine_map<()[s0] -> (s0 + 2)>
+
+func @drop_duplicate_bounds(%N : index) {
+ // affine.for %i = max #lb(%arg0) to min #ub(%arg0)
+ affine.for %i = max affine_map<(d0) -> (d0, d0)>(%N) to min affine_map<(d0) -> (d0 + 2, d0 + 2)>(%N) {
+ "foo"() : () -> ()
+ }
+ return
+}
More information about the Mlir-commits
mailing list