Revert "[TOSA] Add Tosa_Shape type and ConstShapeOp (llvm#122547)"

This reverts commit f09db6a.

Author: nirvedhmeshram

mlir/include/mlir/Dialect/Tosa/IR/CMakeLists.txt

@@ -3,12 +3,11 @@ add_mlir_doc(TosaOps TosaOps Dialects/ -gen-op-doc)
 add_mlir_interface(TosaInterfaces)
 
 set(LLVM_TARGET_DEFINITIONS TosaOps.td)
-mlir_tablegen(TosaOpsTypesBase.h.inc -gen-typedef-decls -typedefs-dialect=tosa)
-mlir_tablegen(TosaOpsTypesBase.cpp.inc -gen-typedef-defs -typedefs-dialect=tosa)
 mlir_tablegen(TosaAttributes.h.inc -gen-attrdef-decls -attrdefs-dialect=tosa)
 mlir_tablegen(TosaAttributes.cpp.inc -gen-attrdef-defs -attrdefs-dialect=tosa)
 add_public_tablegen_target(MLIRTosaAttributesIncGen)
 
 set(LLVM_TARGET_DEFINITIONS TosaDialectBytecode.td)
 mlir_tablegen(TosaDialectBytecode.cpp.inc -gen-bytecode -bytecode-dialect="Tosa")
 add_public_tablegen_target(MLIRTosaDialectBytecodeIncGen)
+

mlir/include/mlir/Dialect/Tosa/IR/TosaOpBase.td

@@ -45,7 +45,6 @@ def Tosa_Dialect : Dialect {
   let cppNamespace = "mlir::tosa";
   let hasConstantMaterializer = 1;
   let useDefaultAttributePrinterParser = 1;
-  let useDefaultTypePrinterParser = 1;
 }
 
 //===----------------------------------------------------------------------===//
@@ -218,21 +217,12 @@ def TosaElementwiseOperator : NativeOpTrait<"TosaElementwiseOperator"> {
   let cppNamespace = "mlir::OpTrait::tosa";
 }
 
-//===----------------------------------------------------------------------===//
-// TOSA Operator Trait.
-//===----------------------------------------------------------------------===//
-// Op operands with TOSA shape types must be compile time resolvable
-def TosaResolvableShapeOperands : NativeOpTrait<"TosaResolvableShapeOperands"> {
-  let cppNamespace = "mlir::OpTrait::tosa";
-}
-
 //===----------------------------------------------------------------------===//
 // TOSA Operator Class.
 //===----------------------------------------------------------------------===//
 
 class Tosa_Op<string mnemonic, list<Trait> traits = []> :
-    Op<Tosa_Dialect, mnemonic, !listconcat(traits, [TosaOpInterface, 
-    TosaResolvableShapeOperands])> {
+    Op<Tosa_Dialect, mnemonic, !listconcat(traits, [TosaOpInterface])> {
 }
 
 class Tosa_ElementwiseOp<string mnemonic, list<Trait> traits = []> :

mlir/include/mlir/Dialect/Tosa/IR/TosaOps.h

@@ -90,55 +90,14 @@ template <typename ConcreteType>
 class TosaElementwiseOperator
     : public TraitBase<ConcreteType, TosaElementwiseOperator> {};
 
-LogicalResult verifyTosaResolvableShapeOperands(Operation *op);
-/// This class verifies that tosa shape operands are compile time resolvable
-template <typename ConcreteType>
-class TosaResolvableShapeOperands
-    : public TraitBase<ConcreteType, TosaResolvableShapeOperands> {
-public:
-  static LogicalResult verifyTrait(Operation *op) {
-    return verifyTosaResolvableShapeOperands(op);
-  }
-};
-
-LogicalResult verifyTosaShapeOperator(Operation *op);
-/// This class indicates that op operates on tosa shape types
-template <typename ConcreteType>
-class TosaShapeOperator : public TraitBase<ConcreteType, TosaShapeOperator> {
-public:
-  static LogicalResult verifyTrait(Operation *op) {
-    return verifyTosaShapeOperator(op);
-  }
-};
-
-LogicalResult verifyTosaShapeOperatorWithSameRanks(Operation *op);
-/// This class indicates that op operates on tosa shape types
-template <typename ConcreteType>
-class TosaShapeOperatorWithSameRanks
-    : public TraitBase<ConcreteType, TosaShapeOperatorWithSameRanks> {
-public:
-  static LogicalResult verifyTrait(Operation *op) {
-    return verifyTosaShapeOperatorWithSameRanks(op);
-  }
-};
-
 } // namespace tosa
 } // namespace OpTrait
 
-namespace tosa {
-
-bool isa_tosa_shape_type(mlir::Type t);
-
-} // namespace tosa
-
 } // namespace mlir
 
 #define GET_ATTRDEF_CLASSES
 #include "mlir/Dialect/Tosa/IR/TosaAttributes.h.inc"
 
-#define GET_TYPEDEF_CLASSES
-#include "mlir/Dialect/Tosa/IR/TosaOpsTypesBase.h.inc"
-
 #define GET_OP_CLASSES
 #include "mlir/Dialect/Tosa/IR/TosaOps.h.inc"
 

mlir/include/mlir/Dialect/Tosa/IR/TosaOps.td

@@ -1689,16 +1689,12 @@ def Tosa_TileOp : Tosa_InferShapedTypeOp<"tile"> {
 
   let arguments = (ins
     Tosa_Tensor:$input1,
-    Tosa_Shape:$multiples);
+    DenseI64ArrayAttr:$multiples);
 
   let results = (outs
     Tosa_Tensor:$output
   );
 
-  let extraClassDeclaration = [{
-    LogicalResult getConstantMultiples(llvm::SmallVector<int64_t> &multiples);
-  }];
-
   let hasFolder = 1;
   let hasVerifier = 1;
 }
@@ -2110,6 +2106,4 @@ def Tosa_WhileOp : Tosa_Op<"while_loop", [
 
 include "mlir/Dialect/Tosa/IR/TosaUtilOps.td"
 
-include "mlir/Dialect/Tosa/IR/TosaShapeOps.td"
-
 #endif // TOSA_OPS

mlir/include/mlir/Dialect/Tosa/IR/TosaShapeOps.td

@@ -13,11 +13,8 @@
 #ifndef TOSA_TYPES_BASE
 #define TOSA_TYPES_BASE
 
-include "mlir/IR/AttrTypeBase.td"
 include "mlir/IR/OpBase.td"
 
-include "mlir/Dialect/Tosa/IR/TosaOpBase.td"
-
 //===----------------------------------------------------------------------===//
 // Tosa Type Definitions.
 //===----------------------------------------------------------------------===//
@@ -218,66 +215,4 @@ def Tosa_Buffer : MemRefOf<[Tosa_AnyNumber]>;
 def Tosa_TupleBuffer : NestedTupleOf<[Tosa_Buffer]>;
 def Tosa_BufOrTuple : AnyTypeOf<[Tosa_Buffer, Tosa_TupleBuffer]>;
 
-//===----------------------------------------------------------------------===//
-// Tosa Type Definitions.
-//===----------------------------------------------------------------------===//
-
-// The base class for Tosa dialect types.
-class Tosa_Type<string name, string typeMnemonic, list<Trait> traits = []>
-    : TypeDef<Tosa_Dialect, name, traits> {
-  let mnemonic = typeMnemonic;
-}
-
-//===----------------------------------------------------------------------===//
-// ShapeType
-//===----------------------------------------------------------------------===//
-def Tosa_Shape : Tosa_Type<"shape", "shape"> {
-  let summary = "Shape with static rank and Index element type";
-  let description = [{
-    Syntax:
-
-    ``` shape - type :: = `shape` `<` rank `>`
-    ``` Values with shape type represents a shape with a fixed rank and a list
-                               of dimensions
-                                   .Rank must be zero or a positive integer
-                                   .Each dimension is represented by the builtin
-                                       Index type.
-
-    Examples:
-
-    ```mlir
-     // Shape with rank of four, for example, [1, 1, 8, 16]:
-     !tosa
-         .shape<4>
-
-     // Shape with rank of one, for example, [16]:
-     !tosa
-         .shape<1>
-
-     // Shape with rank zero, for example, [] (i.e., shape of scalar values):
-     !tosa.shape<0>
-    ```
-  }];
-  let parameters = (ins "int" : $rank);
-  let builders = [TypeBuilder<(ins "int" : $rank)>];
-  let assemblyFormat = "`<` $rank `>`";
-
-  let genVerifyDecl = 1;
-}
-
-def IsTosaShapeType : CPred<"mlir::tosa::isa_tosa_shape_type($_self)">;
-
-// Whether a Tosa Shape type has a rank equal to the specified rank.
-class IsTosaShapeOfRankPred<int rank> : And<[
-  IsTosaShapeType,
-  CPred<[{::llvm::cast<::mlir::tosa::shapeType>($_self).getRank() == }] # rank>
-]>;
-
-class TosaShapeOfRank<int rank>
-    : Type<IsTosaShapeOfRankPred<rank>, "Tosa shape type of rank " #rank>;
-
-def Rank1TosaShape : TosaShapeOfRank<1>;
-def Rank2TosaShape : TosaShapeOfRank<2>;
-def Rank4TosaShape : TosaShapeOfRank<4>;
-
 #endif // TOSA_TYPES_BASE

mlir/include/mlir/Dialect/Tosa/IR/TosaTypesBase.td

@@ -1892,9 +1892,7 @@ struct TileConverter : public OpConversionPattern<tosa::TileOp> {
     auto elementTy = inputTy.getElementType();
     int64_t rank = inputTy.getRank();
 
-    SmallVector<int64_t> multiples;
-    if (failed(op.getConstantMultiples(multiples)))
-      return failure();
+    ArrayRef<int64_t> multiples = op.getMultiples();
 
     // Broadcast the newly added dimensions to their appropriate multiple.
     SmallVector<int64_t, 2> genericShape;

mlir/lib/Conversion/TosaToLinalg/TosaToLinalg.cpp

@@ -55,7 +55,6 @@ struct TosaToLinalg : public impl::TosaToLinalgBase<TosaToLinalg> {
     target.addLegalOp<tosa::ApplyScaleOp>();
     target.addLegalOp<tosa::IfOp>();
     target.addLegalOp<tosa::ConstOp>();
-    target.addLegalOp<tosa::ConstShapeOp>();
     target.addLegalOp<tosa::WhileOp>();
     target.addLegalOp<tosa::ConcatOp>();
     target.addLegalOp<tosa::SliceOp>();

mlir/lib/Conversion/TosaToLinalg/TosaToLinalgPass.cpp

@@ -808,8 +808,6 @@ OpFoldResult CastOp::fold(FoldAdaptor adaptor) {
 
 OpFoldResult ConstOp::fold(FoldAdaptor adaptor) { return getValueAttr(); }
 
-OpFoldResult ConstShapeOp::fold(FoldAdaptor adaptor) { return getValueAttr(); }
-
 #define REDUCE_FOLDER(OP)                                                      \
   OpFoldResult OP::fold(FoldAdaptor adaptor) {                                 \
     ShapedType inputTy = llvm::cast<ShapedType>(getInput().getType());         \
@@ -987,20 +985,9 @@ OpFoldResult tosa::SelectOp::fold(FoldAdaptor adaptor) {
 }
 
 OpFoldResult TileOp::fold(FoldAdaptor adaptor) {
-  if (getInput1().getType() == getType()) {
-    if (auto multiples = llvm::dyn_cast_if_present<DenseElementsAttr>(
-            adaptor.getMultiples())) {
-      if (multiples.isSplat() &&
-          multiples.getSplatValue<APInt>().getSExtValue() == 1)
-        return getInput1();
-      if (auto int_array_attr =
-              llvm::dyn_cast<DenseIntElementsAttr>(multiples)) {
-        if (llvm::all_of(int_array_attr.getValues<APInt>(),
-                         [](APInt v) { return v.getSExtValue() == 1; }))
-          return getInput1();
-      }
-    }
-  }
+  bool allOnes = llvm::all_of(getMultiples(), [](int64_t v) { return v == 1; });
+  if (allOnes && getInput1().getType() == getType())
+    return getInput1();
   return {};
 }