[Mlir-commits] [mlir] f33f8a2 - Move AffineMapAttr into BaseOps.td
Benjamin Kramer
llvmlistbot at llvm.org
Wed Sep 30 07:24:12 PDT 2020
Author: Benjamin Kramer
Date: 2020-09-30T16:22:53+02:00
New Revision: f33f8a2b30325d89c4b7daef1b7d11d6da38fd56
URL: https://github.com/llvm/llvm-project/commit/f33f8a2b30325d89c4b7daef1b7d11d6da38fd56
DIFF: https://github.com/llvm/llvm-project/commit/f33f8a2b30325d89c4b7daef1b7d11d6da38fd56.diff
LOG: Move AffineMapAttr into BaseOps.td
AffineMapAttr is already part of base, it's just impossible to refer to
it from ODS without pulling in the definition from Affine dialect.
Differential Revision: https://reviews.llvm.org/D88555
Added:
Modified:
mlir/include/mlir/Dialect/Affine/IR/AffineOps.td
mlir/include/mlir/Dialect/GPU/ParallelLoopMapperAttr.td
mlir/include/mlir/Dialect/Linalg/IR/LinalgOps.td
mlir/include/mlir/Dialect/Linalg/IR/LinalgStructuredOps.td
mlir/include/mlir/Dialect/Vector/VectorOps.td
mlir/include/mlir/IR/OpBase.td
mlir/test/lib/Dialect/Test/TestOps.td
Removed:
mlir/include/mlir/Dialect/Affine/IR/AffineOpsBase.td
################################################################################
diff --git a/mlir/include/mlir/Dialect/Affine/IR/AffineOps.td b/mlir/include/mlir/Dialect/Affine/IR/AffineOps.td
index c47dcd3d5fe2..7e065cc38f69 100644
--- a/mlir/include/mlir/Dialect/Affine/IR/AffineOps.td
+++ b/mlir/include/mlir/Dialect/Affine/IR/AffineOps.td
@@ -13,7 +13,6 @@
#ifndef AFFINE_OPS
#define AFFINE_OPS
-include "mlir/Dialect/Affine/IR/AffineOpsBase.td"
include "mlir/Dialect/StandardOps/IR/StandardOpsBase.td"
include "mlir/Dialect/Affine/IR/AffineMemoryOpInterfaces.td"
include "mlir/Interfaces/ControlFlowInterfaces.td"
diff --git a/mlir/include/mlir/Dialect/Affine/IR/AffineOpsBase.td b/mlir/include/mlir/Dialect/Affine/IR/AffineOpsBase.td
deleted file mode 100644
index 2883072d4aa9..000000000000
--- a/mlir/include/mlir/Dialect/Affine/IR/AffineOpsBase.td
+++ /dev/null
@@ -1,32 +0,0 @@
-//===- AffineOpsBase.td - Affine operation definitions -----*- tablegen -*-===//
-//
-// 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
-//
-//===----------------------------------------------------------------------===//
-//
-// Defines base support for MLIR affine operations.
-//
-//===----------------------------------------------------------------------===//
-
-#ifndef AFFINE_OPS_BASE
-#define AFFINE_OPS_BASE
-
-include "mlir/IR/OpBase.td"
-
-// Attributes containing affine maps.
-def AffineMapAttr : Attr<
- CPred<"$_self.isa<AffineMapAttr>()">, "AffineMap attribute"> {
- let storageType = [{ AffineMapAttr }];
- let returnType = [{ AffineMap }];
- let valueType = Index;
- let constBuilderCall = "AffineMapAttr::get($0)";
-}
-
-def AffineMapArrayAttr : TypedArrayAttrBase<AffineMapAttr,
- "AffineMap array attribute"> {
- let constBuilderCall = "$_builder.getAffineMapArrayAttr($0)";
-}
-
-#endif // AFFINE_OPS_BASE
diff --git a/mlir/include/mlir/Dialect/GPU/ParallelLoopMapperAttr.td b/mlir/include/mlir/Dialect/GPU/ParallelLoopMapperAttr.td
index c0380739d1f8..daf2d6c6286b 100644
--- a/mlir/include/mlir/Dialect/GPU/ParallelLoopMapperAttr.td
+++ b/mlir/include/mlir/Dialect/GPU/ParallelLoopMapperAttr.td
@@ -14,7 +14,6 @@
#ifndef PARALLEL_LOOP_MAPPER_ATTR
#define PARALLEL_LOOP_MAPPER_ATTR
-include "mlir/Dialect/Affine/IR/AffineOpsBase.td"
include "mlir/Dialect/GPU/GPUBase.td"
def BlockX : I64EnumAttrCase<"BlockX", 0>;
diff --git a/mlir/include/mlir/Dialect/Linalg/IR/LinalgOps.td b/mlir/include/mlir/Dialect/Linalg/IR/LinalgOps.td
index a7855e6327b2..d74e59145705 100644
--- a/mlir/include/mlir/Dialect/Linalg/IR/LinalgOps.td
+++ b/mlir/include/mlir/Dialect/Linalg/IR/LinalgOps.td
@@ -13,7 +13,6 @@
#ifndef LINALG_OPS
#define LINALG_OPS
-include "mlir/Dialect/Affine/IR/AffineOpsBase.td"
include "mlir/Dialect/Linalg/IR/LinalgBase.td"
include "mlir/Interfaces/SideEffectInterfaces.td"
include "mlir/Interfaces/ViewLikeInterface.td"
diff --git a/mlir/include/mlir/Dialect/Linalg/IR/LinalgStructuredOps.td b/mlir/include/mlir/Dialect/Linalg/IR/LinalgStructuredOps.td
index d12322933737..9c8197c45ec8 100644
--- a/mlir/include/mlir/Dialect/Linalg/IR/LinalgStructuredOps.td
+++ b/mlir/include/mlir/Dialect/Linalg/IR/LinalgStructuredOps.td
@@ -14,7 +14,6 @@
#ifndef LINALG_STRUCTURED_OPS
#define LINALG_STRUCTURED_OPS
-include "mlir/Dialect/Affine/IR/AffineOpsBase.td"
include "mlir/Dialect/Linalg/IR/LinalgBase.td"
include "mlir/Dialect/Linalg/IR/LinalgStructuredOpsInterface.td"
include "mlir/Interfaces/CopyOpInterface.td"
diff --git a/mlir/include/mlir/Dialect/Vector/VectorOps.td b/mlir/include/mlir/Dialect/Vector/VectorOps.td
index ecac0a3d4b1f..f74c8687bf53 100644
--- a/mlir/include/mlir/Dialect/Vector/VectorOps.td
+++ b/mlir/include/mlir/Dialect/Vector/VectorOps.td
@@ -13,7 +13,6 @@
#ifndef VECTOR_OPS
#define VECTOR_OPS
-include "mlir/Dialect/Affine/IR/AffineOpsBase.td"
include "mlir/Interfaces/SideEffectInterfaces.td"
include "mlir/Interfaces/VectorInterfaces.td"
diff --git a/mlir/include/mlir/IR/OpBase.td b/mlir/include/mlir/IR/OpBase.td
index f1befa4d980b..eaaf5b75230e 100644
--- a/mlir/include/mlir/IR/OpBase.td
+++ b/mlir/include/mlir/IR/OpBase.td
@@ -1381,6 +1381,15 @@ def StringElementsAttr : ElementsAttrBase<
let convertFromStorage = "$_self";
}
+// Attributes containing affine maps.
+def AffineMapAttr : Attr<
+CPred<"$_self.isa<::mlir::AffineMapAttr>()">, "AffineMap attribute"> {
+ let storageType = [{::mlir::AffineMapAttr }];
+ let returnType = [{ ::mlir::AffineMap }];
+ let valueType = Index;
+ let constBuilderCall = "::mlir::AffineMapAttr::get($0)";
+}
+
// Base class for array attributes.
class ArrayAttrBase<Pred condition, string description> :
Attr<condition, description> {
@@ -1410,6 +1419,11 @@ class TypedArrayAttrBase<Attr element, string description>: ArrayAttrBase<
Attr elementAttr = element;
}
+def AffineMapArrayAttr : TypedArrayAttrBase<AffineMapAttr,
+ "AffineMap array attribute"> {
+ let constBuilderCall = "$_builder.getAffineMapArrayAttr($0)";
+}
+
def BoolArrayAttr : TypedArrayAttrBase<BoolAttr,
"1-bit boolean array attribute"> {
let constBuilderCall = "$_builder.getBoolArrayAttr($0)";
diff --git a/mlir/test/lib/Dialect/Test/TestOps.td b/mlir/test/lib/Dialect/Test/TestOps.td
index 6f3c8f5aee68..73610457cf7b 100644
--- a/mlir/test/lib/Dialect/Test/TestOps.td
+++ b/mlir/test/lib/Dialect/Test/TestOps.td
@@ -9,7 +9,6 @@
#ifndef TEST_OPS
#define TEST_OPS
-include "mlir/Dialect/Affine/IR/AffineOpsBase.td"
include "mlir/IR/OpBase.td"
include "mlir/IR/OpAsmInterface.td"
include "mlir/IR/RegionKindInterface.td"
More information about the Mlir-commits
mailing list