Revert "[MLIR][Linalg] Remove matmul_transpose variants (llvm#147961)"

This reverts commit d152808.

Author: kuhar

mlir/include/mlir/Dialect/Linalg/IR/Linalg.h

@@ -145,7 +145,8 @@ std::pair<int64_t, int64_t> getFmrFromWinogradConv2DFmr(WinogradConv2DFmr fmr);
 #define GET_OP_CLASSES
 #include "mlir/Dialect/Linalg/IR/LinalgRelayoutOps.h.inc"
 
-namespace mlir::linalg {
+namespace mlir {
+namespace linalg {
 
 /// Returns the outer shape in the packed domain before applying the
 /// transposition.
@@ -154,194 +155,7 @@ template <typename OpTy,
                                       std::is_same_v<OpTy, linalg::UnPackOp>>>
 SmallVector<int64_t> getPackedOuterShapeWithoutTransposition(OpTy packOrUnPack);
 
-/// Specialization of `linalg.matmul` op that has a transpose map on A
-class MatmulTransposeAOp : public MatmulOp {
-  /// Create an affine map for a transpose-A matmul. Used only in the builders.
-  static SmallVector<AffineMap> getDefaultIndexingMaps(OpBuilder &builder);
-
-public:
-  using MatmulOp::MatmulOp;
-  static ::mlir::TypeID resolveTypeID() { return TypeID::get<MatmulOp>(); }
-
-  /// Build a transpose A matmul.
-  static void build(OpBuilder &builder, OperationState &result,
-                    ValueRange inputs, ValueRange outputs,
-                    ArrayRef<NamedAttribute> attributes = {});
-
-  static MatmulTransposeAOp create(OpBuilder &builder, Location location,
-                                   ValueRange inputs, ValueRange outputs,
-                                   ArrayRef<NamedAttribute> attributes = {});
-
-  /// Build a transpose A matmul with a specific result type.
-  static void build(OpBuilder &builder, OperationState &result,
-                    TypeRange resultTensorTypes, ValueRange inputs,
-                    ValueRange outputs,
-                    ArrayRef<NamedAttribute> attributes = {});
-
-  static MatmulTransposeAOp create(OpBuilder &builder, Location location,
-                                   TypeRange resultTensorTypes,
-                                   ValueRange inputs, ValueRange outputs,
-                                   ArrayRef<NamedAttribute> attributes = {});
-
-  /// Build a transpose A matmul with a specific result type and a cast type.
-  static void build(OpBuilder &builder, OperationState &result,
-                    TypeRange resultTensorTypes, ValueRange inputs,
-                    ValueRange outputs, Attribute cast,
-                    ArrayRef<NamedAttribute> attributes = {});
-
-  static MatmulTransposeAOp create(OpBuilder &builder, Location location,
-                                   TypeRange resultTensorTypes,
-                                   ValueRange inputs, ValueRange outputs,
-                                   Attribute cast,
-                                   ArrayRef<NamedAttribute> attributes = {});
-
-  /// Checks if the affine map is the expected one for this operation
-  static bool isDefaultIndexingMaps(Attribute attr);
-
-  static bool classof(Operation *op);
-};
-
-/// Specialization of `linalg.matmul` op that has a transpose map on B
-class MatmulTransposeBOp : public MatmulOp {
-  /// Create an affine map for a transpose-B matmul. Used only in the builders.
-  static SmallVector<AffineMap> getDefaultIndexingMaps(OpBuilder &builder);
-
-public:
-  using MatmulOp::MatmulOp;
-  static ::mlir::TypeID resolveTypeID() { return TypeID::get<MatmulOp>(); }
-
-  /// Build a transpose B matmul.
-  static void build(OpBuilder &builder, OperationState &result,
-                    ValueRange inputs, ValueRange outputs,
-                    ArrayRef<NamedAttribute> attributes = {});
-
-  static MatmulTransposeBOp create(OpBuilder &builder, Location location,
-                                   ValueRange inputs, ValueRange outputs,
-                                   ArrayRef<NamedAttribute> attributes = {});
-
-  /// Build a transpose B matmul with a specific result type.
-  static void build(OpBuilder &builder, OperationState &result,
-                    TypeRange resultTensorTypes, ValueRange inputs,
-                    ValueRange outputs,
-                    ArrayRef<NamedAttribute> attributes = {});
-
-  static MatmulTransposeBOp create(OpBuilder &builder, Location location,
-                                   TypeRange resultTensorTypes,
-                                   ValueRange inputs, ValueRange outputs,
-                                   ArrayRef<NamedAttribute> attributes = {});
-
-  /// Build a transpose B matmul with a specific result type and a cast type.
-  static void build(OpBuilder &builder, OperationState &result,
-                    TypeRange resultTensorTypes, ValueRange inputs,
-                    ValueRange outputs, Attribute cast,
-                    ArrayRef<NamedAttribute> attributes = {});
-
-  static MatmulTransposeBOp create(OpBuilder &builder, Location location,
-                                   TypeRange resultTensorTypes,
-                                   ValueRange inputs, ValueRange outputs,
-                                   Attribute cast,
-                                   ArrayRef<NamedAttribute> attributes = {});
-
-  /// Checks if the affine map is the expected one for this operation
-  static bool isDefaultIndexingMaps(Attribute attr);
-
-  static bool classof(Operation *op);
-};
-
-/// Specialization of `linalg.batch_matmul` op that has a transpose map on A
-class BatchMatmulTransposeAOp : public BatchMatmulOp {
-  /// Create an affine map for a transpose-A batch_matmul. Used only in the
-  /// builders.
-  static SmallVector<AffineMap> getDefaultIndexingMaps(OpBuilder &builder);
-
-public:
-  using BatchMatmulOp::BatchMatmulOp;
-  static ::mlir::TypeID resolveTypeID() { return TypeID::get<BatchMatmulOp>(); }
-
-  /// Build a transpose A matmul.
-  static void build(OpBuilder &builder, OperationState &result,
-                    ValueRange inputs, ValueRange outputs,
-                    ArrayRef<NamedAttribute> attributes = {});
-
-  static BatchMatmulTransposeAOp
-  create(OpBuilder &builder, Location location, ValueRange inputs,
-         ValueRange outputs, ArrayRef<NamedAttribute> attributes = {});
-
-  /// Build a transpose A matmul with a specific result type.
-  static void build(OpBuilder &builder, OperationState &result,
-                    TypeRange resultTensorTypes, ValueRange inputs,
-                    ValueRange outputs,
-                    ArrayRef<NamedAttribute> attributes = {});
-
-  static BatchMatmulTransposeAOp
-  create(OpBuilder &builder, Location location, TypeRange resultTensorTypes,
-         ValueRange inputs, ValueRange outputs,
-         ArrayRef<NamedAttribute> attributes = {});
-
-  /// Build a transpose A matmul with a specific result type and a cast type.
-  static void build(OpBuilder &builder, OperationState &result,
-                    TypeRange resultTensorTypes, ValueRange inputs,
-                    ValueRange outputs, Attribute cast,
-                    ArrayRef<NamedAttribute> attributes = {});
-
-  static BatchMatmulTransposeAOp
-  create(OpBuilder &builder, Location location, TypeRange resultTensorTypes,
-         ValueRange inputs, ValueRange outputs, Attribute cast,
-         ArrayRef<NamedAttribute> attributes = {});
-
-  /// Checks if the affine map is the expected one for this operation
-  static bool isDefaultIndexingMaps(Attribute attr);
-
-  static bool classof(Operation *op);
-};
-
-/// Specialization of `linalg.batch_matmul` op that has a transpose map on B
-class BatchMatmulTransposeBOp : public BatchMatmulOp {
-  /// Create an affine map for a transpose-B batch_matmul. Used only in the
-  /// builders.
-  static SmallVector<AffineMap> getDefaultIndexingMaps(OpBuilder &builder);
-
-public:
-  using BatchMatmulOp::BatchMatmulOp;
-  static ::mlir::TypeID resolveTypeID() { return TypeID::get<BatchMatmulOp>(); }
-
-  /// Build a transpose B matmul.
-  static void build(OpBuilder &builder, OperationState &result,
-                    ValueRange inputs, ValueRange outputs,
-                    ArrayRef<NamedAttribute> attributes = {});
-
-  static BatchMatmulTransposeBOp
-  create(OpBuilder &builder, Location location, ValueRange inputs,
-         ValueRange outputs, ArrayRef<NamedAttribute> attributes = {});
-
-  /// Build a transpose B matmul with a specific result type.
-  static void build(OpBuilder &builder, OperationState &result,
-                    TypeRange resultTensorTypes, ValueRange inputs,
-                    ValueRange outputs,
-                    ArrayRef<NamedAttribute> attributes = {});
-
-  static BatchMatmulTransposeBOp
-  create(OpBuilder &builder, Location location, TypeRange resultTensorTypes,
-         ValueRange inputs, ValueRange outputs,
-         ArrayRef<NamedAttribute> attributes = {});
-
-  /// Build a transpose B matmul with a specific result type and a cast type.
-  static void build(OpBuilder &builder, OperationState &result,
-                    TypeRange resultTensorTypes, ValueRange inputs,
-                    ValueRange outputs, Attribute cast,
-                    ArrayRef<NamedAttribute> attributes = {});
-
-  static BatchMatmulTransposeBOp
-  create(OpBuilder &builder, Location location, TypeRange resultTensorTypes,
-         ValueRange inputs, ValueRange outputs, Attribute cast,
-         ArrayRef<NamedAttribute> attributes = {});
-
-  /// Checks if the affine map is the expected one for this operation
-  static bool isDefaultIndexingMaps(Attribute attr);
-
-  static bool classof(Operation *op);
-};
-
-} // namespace mlir::linalg
+} // namespace linalg
+} // namespace mlir
 
 #endif // MLIR_DIALECT_LINALG_IR_LINALG_H