[Linalgx] add bufferizable and tiling interface; reorganize file structure

include/gc/Dialect/Linalgx/CMakeLists.txt

@@ -1,9 +1 @@
-add_mlir_dialect(LinalgxOps linalgx)
-set(LLVM_TARGET_DEFINITIONS LinalgxStructuredOps.td)
-mlir_tablegen(LinalgxStructuredOps.h.inc -gen-op-decls)
-mlir_tablegen(LinalgxStructuredOps.cpp.inc -gen-op-defs)
-add_public_tablegen_target(MLIRLinalgxStructuredOpsIncGen)
-
-add_mlir_doc(LinalgxOps LinalgxOps gc/Dialect/Linalgx/ -gen-op-doc)
-add_mlir_doc(LinalgxDialect LinalgxDialect gc/Dialect/Linalgx/ -gen-dialect-doc)
-add_mlir_doc(LinalgxStructuredOps LinalgxStructuredOps gc/Dialect/Linalgx/ -gen-dialect-doc)
+add_subdirectory(IR)

include/gc/Dialect/Linalgx/IR/CMakeLists.txt

@@ -0,0 +1,9 @@
+add_mlir_dialect(LinalgxOps linalgx)
+set(LLVM_TARGET_DEFINITIONS LinalgxStructuredOps.td)
+mlir_tablegen(LinalgxStructuredOps.h.inc -gen-op-decls)
+mlir_tablegen(LinalgxStructuredOps.cpp.inc -gen-op-defs)
+add_public_tablegen_target(MLIRLinalgxStructuredOpsIncGen)
+
+add_mlir_doc(LinalgxOps LinalgxOps gc/Dialect/Linalgx/IR/ -gen-op-doc)
+add_mlir_doc(LinalgxDialect LinalgxDialect gc/Dialect/Linalgx/IR/ -gen-dialect-doc)
+add_mlir_doc(LinalgxStructuredOps LinalgxStructuredOps gc/Dialect/Linalgx/IR/ -gen-dialect-doc)

include/gc/Dialect/Linalgx/LinalgxDialect.h → include/gc/Dialect/Linalgx/IR/LinalgxDialect.h

@@ -19,6 +19,6 @@
 #include "mlir/Interfaces/InferTypeOpInterface.h"
 #include "mlir/Interfaces/SideEffectInterfaces.h"
 
-#include "gc/Dialect/Linalgx/LinalgxOpsDialect.h.inc"
+#include "gc/Dialect/Linalgx/IR/LinalgxOpsDialect.h.inc"
 
 #endif // GC_DIALECTS_LINALGXDIALECT_H

include/gc/Dialect/Linalgx/LinalgxOps.h → include/gc/Dialect/Linalgx/IR/LinalgxOps.h

@@ -20,9 +20,9 @@
 #include "mlir/Interfaces/SideEffectInterfaces.h"
 
 #define GET_OP_CLASSES
-#include "gc/Dialect/Linalgx/LinalgxOps.h.inc"
+#include "gc/Dialect/Linalgx/IR/LinalgxOps.h.inc"
 
 #define GET_OP_CLASSES
-#include "gc/Dialect/Linalgx/LinalgxStructuredOps.h.inc"
+#include "gc/Dialect/Linalgx/IR/LinalgxStructuredOps.h.inc"
 
 #endif // GC_DIALECTS_LINALGXOPS_H

include/gc/Dialect/Linalgx/Transforms/AllInterfaces.h

@@ -0,0 +1,22 @@
+
+//===-- AllInterfaces.h - linalgx dialect interfaces ------------*- C++ -*-===//
+//
+// This file is licensed 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
+//
+//===----------------------------------------------------------------------===//
+
+#ifndef DIALECT_LINALGX_TRANSFORMS_ALLINTERFACES_H
+#define DIALECT_LINALGX_TRANSFORMS_ALLINTERFACES_H
+
+namespace mlir {
+class DialectRegistry;
+
+namespace linalgx {
+void registerAllDialectInterfaceImplementations(DialectRegistry &registry);
+} // namespace linalgx
+
+} // namespace mlir
+
+#endif // DIALECT_LINALGX_TRANSFORMS_ALLINTERFACES_H

include/gc/Dialect/Linalgx/Transforms/BufferizableOpInterfaceImpl.h

@@ -0,0 +1,20 @@
+//===- BufferizableOpInterfaceImpl.h - linalgx Bufferize --------*- C++ -*-===//
+//
+// This file is licensed 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
+//
+//===----------------------------------------------------------------------===//
+
+#ifndef DIALECT_LINALGX_BUFFERIZABLEOPINTERFACEIMPL_H
+#define DIALECT_LINALGX_BUFFERIZABLEOPINTERFACEIMPL_H
+
+namespace mlir {
+class DialectRegistry;
+
+namespace linalgx {
+void registerBufferizableOpInterfaceExternalModels(DialectRegistry &registry);
+} // namespace linalgx
+} // namespace mlir
+
+#endif // DIALECT_LINALGX_BUFFERIZABLEOPINTERFACEIMPL_H

include/gc/Dialect/Linalgx/Transforms/TilingInterfaceImpl.h

@@ -0,0 +1,20 @@
+//===- TilingInterfaceImpl.h - linalgx Tiling -------------------*- C++ -*-===//
+//
+// This file is licensed 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
+//
+//===----------------------------------------------------------------------===//
+
+#ifndef DIALECT_LINALGX_TILINGINTERFACEIMPL_H
+#define DIALECT_LINALGX_TILINGINTERFACEIMPL_H
+
+namespace mlir {
+class DialectRegistry;
+
+namespace linalgx {
+void registerTilingInterfaceExternalModels(DialectRegistry &registry);
+} // namespace linalgx
+} // namespace mlir
+
+#endif // DIALECT_LINALGX_TILINGINTERFACEIMPL_H

lib/gc/Dialect/Linalgx/CMakeLists.txt

@@ -1,17 +1,2 @@
-gc_set_mlir_link_components(MLIR_LINK_COMPONENTS MLIRIR)
-
-add_mlir_dialect_library(MLIRLinalgx
-    LinalgxDialect.cpp
-    LinalgxOps.cpp
-
-    ADDITIONAL_HEADER_DIRS
-    ${PROJECT_SOURCE_DIR}/include/gc/Dialect/Linalgx
-
-    DEPENDS
-    MLIRLinalgxOpsIncGen
-    MLIRLinalgxStructuredOpsIncGen
-
-    LINK_LIBS PUBLIC
-    ${MLIR_LINK_COMPONENTS}
-)
-set_property(GLOBAL APPEND PROPERTY GC_DIALECT_LIBS MLIRLinalgx)
+add_subdirectory(IR)
+add_subdirectory(Transforms)

lib/gc/Dialect/Linalgx/IR/CMakeLists.txt

@@ -0,0 +1,17 @@
+gc_set_mlir_link_components(MLIR_LINK_COMPONENTS MLIRIR)
+
+add_mlir_dialect_library(MLIRLinalgx
+    LinalgxDialect.cpp
+    LinalgxOps.cpp
+
+    ADDITIONAL_HEADER_DIRS
+    ${PROJECT_SOURCE_DIR}/include/gc/Dialect/Linalgx/IR
+
+    DEPENDS
+    MLIRLinalgxOpsIncGen
+    MLIRLinalgxStructuredOpsIncGen
+
+    LINK_LIBS PUBLIC
+    ${MLIR_LINK_COMPONENTS}
+)
+set_property(GLOBAL APPEND PROPERTY GC_DIALECT_LIBS MLIRLinalgx)

lib/gc/Dialect/Linalgx/LinalgxDialect.cpp → lib/gc/Dialect/Linalgx/IR/LinalgxDialect.cpp

@@ -6,8 +6,8 @@
 //
 //===----------------------------------------------------------------------===//
 
-#include "gc/Dialect/Linalgx/LinalgxDialect.h"
-#include "gc/Dialect/Linalgx/LinalgxOps.h"
+#include "gc/Dialect/Linalgx/IR/LinalgxDialect.h"
+#include "gc/Dialect/Linalgx/IR/LinalgxOps.h"
 
 #include "mlir/Dialect/Affine/IR/AffineOps.h"
 #include "mlir/Dialect/Arith/IR/Arith.h"
@@ -21,15 +21,15 @@
 using namespace mlir;
 using namespace mlir::linalgx;
 
-#include "gc/Dialect/Linalgx/LinalgxOpsDialect.cpp.inc"
+#include "gc/Dialect/Linalgx/IR/LinalgxOpsDialect.cpp.inc"
 
 void LinalgxDialect::initialize() {
   addOperations<
 #define GET_OP_LIST
-#include "gc/Dialect/Linalgx/LinalgxOps.cpp.inc"
+#include "gc/Dialect/Linalgx/IR/LinalgxOps.cpp.inc"
       >();
   addOperations<
 #define GET_OP_LIST
-#include "gc/Dialect/Linalgx/LinalgxStructuredOps.cpp.inc"
+#include "gc/Dialect/Linalgx/IR/LinalgxStructuredOps.cpp.inc"
       >();
 }

lib/gc/Dialect/Linalgx/LinalgxOps.cpp → lib/gc/Dialect/Linalgx/IR/LinalgxOps.cpp

@@ -6,8 +6,8 @@
 //
 //===----------------------------------------------------------------------===//
 
-#include "gc/Dialect/Linalgx/LinalgxOps.h"
-#include "gc/Dialect/Linalgx/LinalgxDialect.h"
+#include "gc/Dialect/Linalgx/IR/LinalgxOps.h"
+#include "gc/Dialect/Linalgx/IR/LinalgxDialect.h"
 #include "mlir/IR/OpImplementation.h"
 
 //===----------------------------------------------------------------------===//
@@ -616,7 +616,7 @@ void MultiBatchMatmulOp::getEffects(
 /////// Operations corresponding to library calls defined with Tablegen ////////
 
 #define GET_OP_CLASSES
-#include "gc/Dialect/Linalgx/LinalgxOps.cpp.inc"
+#include "gc/Dialect/Linalgx/IR/LinalgxOps.cpp.inc"
 
 #define GET_OP_CLASSES
-#include "gc/Dialect/Linalgx/LinalgxStructuredOps.cpp.inc"
+#include "gc/Dialect/Linalgx/IR/LinalgxStructuredOps.cpp.inc"

lib/gc/Dialect/Linalgx/Transforms/AllInterfaces.cpp

@@ -0,0 +1,18 @@
+//===-- AllInterfaces.cpp - linalgx dialect interfaces ----------*- C++ -*-===//
+//
+// This file is licensed 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
+//
+//===----------------------------------------------------------------------===//
+
+#include "gc/Dialect/Linalgx/Transforms/AllInterfaces.h"
+
+#include "gc/Dialect/Linalgx/Transforms/BufferizableOpInterfaceImpl.h"
+#include "gc/Dialect/Linalgx/Transforms/TilingInterfaceImpl.h"
+
+void mlir::linalgx::registerAllDialectInterfaceImplementations(
+    DialectRegistry &registry) {
+  registerBufferizableOpInterfaceExternalModels(registry);
+  registerTilingInterfaceExternalModels(registry);
+}

lib/gc/Dialect/Linalgx/Transforms/BufferizableOpInterfaceImpl.cpp

@@ -0,0 +1,35 @@
+//===-- BufferizableOpInterfaceImpl.cpp - linalgx bufferize -----*- C++ -*-===//
+//
+// This file is licensed 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
+//
+//===----------------------------------------------------------------------===//
+
+#include "gc/Dialect/Linalgx/Transforms/BufferizableOpInterfaceImpl.h"
+#include "gc/Dialect/Linalgx/IR/LinalgxDialect.h"
+#include "gc/Dialect/Linalgx/IR/LinalgxOps.h"
+
+//===----------------------------------------------------------------------===//
+// Builder helper from Linalg/Transforms/BufferizableOpInterfaceImpl.cpp
+//===----------------------------------------------------------------------===//
+
+#include "BufferizableOpInterfaceImpl.cpp.inc"
+
+using namespace mlir;
+using namespace mlir::linalgx;
+
+void mlir::linalgx::registerBufferizableOpInterfaceExternalModels(
+    DialectRegistry &registry) {
+  registry.addExtension(
+      +[](MLIRContext *ctx, linalgx::LinalgxDialect *dialect) {
+        // Register all Linalg structured ops. `LinalgOp` is an interface and it
+        // is not possible to attach an external interface to an existing
+        // interface. Therefore, attach the `BufferizableOpInterface` to all ops
+        // one-by-one.
+        LinalgOpInterfaceHelper<
+#define GET_OP_LIST
+#include "gc/Dialect/Linalgx/IR/LinalgxStructuredOps.cpp.inc"
+            >::registerOpInterface(ctx);
+      });
+}