Skip to content

re-struct the directories #51

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 2 commits into from
May 10, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion include/CMakeLists.txt
Original file line number Diff line number Diff line change
@@ -1 +1 @@
add_subdirectory(gc-dialects)
add_subdirectory(gc)
3 changes: 0 additions & 3 deletions include/gc-dialects/Linalgx/CMakeLists.txt

This file was deleted.

3 changes: 0 additions & 3 deletions include/gc-dialects/Microkernel/CMakeLists.txt

This file was deleted.

3 changes: 0 additions & 3 deletions include/gc-dialects/OnednnGraph/CMakeLists.txt

This file was deleted.

2 changes: 2 additions & 0 deletions include/gc/CMakeLists.txt
Original file line number Diff line number Diff line change
@@ -0,0 +1,2 @@
add_subdirectory(Dialect)
add_subdirectory(Transforms)
3 changes: 3 additions & 0 deletions include/gc/Dialect/CMakeLists.txt
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
add_subdirectory(OnednnGraph)
add_subdirectory(Microkernel)
add_subdirectory(Linalgx)
3 changes: 3 additions & 0 deletions include/gc/Dialect/Linalgx/CMakeLists.txt
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
add_mlir_dialect(LinalgxOps linalgx)
add_mlir_doc(LinalgxOps LinalgxOps gc/Dialect/Linalgx/ -gen-op-doc)
add_mlir_doc(LinalgxDialect LinalgxDialect gc/Dialect/Linalgx/ -gen-dialect-doc)
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,6 @@

#include "mlir/IR/Dialect.h"

#include "gc-dialects/Linalgx/LinalgxOpsDialect.h.inc"
#include "gc/Dialect/Linalgx/LinalgxOpsDialect.h.inc"

#endif // GC_DIALECTS_LINALGXDIALECT_H
Original file line number Diff line number Diff line change
Expand Up @@ -12,6 +12,6 @@
#include "mlir/IR/OpDefinition.h"

#define GET_OP_CLASSES
#include "gc-dialects/Linalgx/LinalgxOps.h.inc"
#include "gc/Dialect/Linalgx/LinalgxOps.h.inc"

#endif // GC_DIALECTS_LINALGXOPS_H
3 changes: 3 additions & 0 deletions include/gc/Dialect/Microkernel/CMakeLists.txt
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
add_mlir_dialect(MicrokernelOps microkernel)
add_mlir_doc(MicrokernelOps MicrokernelOps gc/Dialect/Microkernel/ -gen-op-doc)
add_mlir_doc(MicrokernelDialect MicrokernelDialect gc/Dialect/Microkernel/ -gen-dialect-doc)
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,6 @@

#include "mlir/IR/Dialect.h"

#include "gc-dialects/Microkernel/MicrokernelOpsDialect.h.inc"
#include "gc/Dialect/Microkernel/MicrokernelOpsDialect.h.inc"

#endif // GC_DIALECTS_MICROKERNELDIALECT_H
Original file line number Diff line number Diff line change
Expand Up @@ -12,6 +12,6 @@
#include "mlir/IR/OpDefinition.h"

#define GET_OP_CLASSES
#include "gc-dialects/Microkernel/MicrokernelOps.h.inc"
#include "gc/Dialect/Microkernel/MicrokernelOps.h.inc"

#endif // GC_DIALECTS_MICROKERNELOPS_H
3 changes: 3 additions & 0 deletions include/gc/Dialect/OnednnGraph/CMakeLists.txt
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
add_mlir_dialect(OnednnGraphOps onednn_graph)
add_mlir_doc(OnednnGraphOps OnednnGraphOps gc/Dialect/OnednnGraph/ -gen-op-doc)
add_mlir_doc(OnednnGraphDialect OnednnGraphDialect gc/Dialect/OnednnGraph/ -gen-dialect-doc)
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,6 @@

#include "mlir/IR/Dialect.h"

#include "gc-dialects/OnednnGraph/OnednnGraphOpsDialect.h.inc"
#include "gc/Dialect/OnednnGraph/OnednnGraphOpsDialect.h.inc"

#endif // GC_DIALECTS_ONEDNNGRAPHDIALECT_H
Original file line number Diff line number Diff line change
Expand Up @@ -12,6 +12,6 @@
#include "mlir/IR/OpDefinition.h"

#define GET_OP_CLASSES
#include "gc-dialects/OnednnGraph/OnednnGraphOps.h.inc"
#include "gc/Dialect/OnednnGraph/OnednnGraphOps.h.inc"

#endif // GC_DIALECTS_ONEDNNGRAPHOPS_H
Original file line number Diff line number Diff line change
@@ -1,7 +1,3 @@
add_subdirectory(OnednnGraph)
add_subdirectory(Microkernel)
add_subdirectory(Linalgx)

set(LLVM_TARGET_DEFINITIONS Passes.td)
mlir_tablegen(Passes.h.inc -gen-pass-decls -name GraphCompiler)
add_public_tablegen_target(GraphCompilerPassIncGen)
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -15,10 +15,10 @@ namespace mlir {
namespace gc {

#define GEN_PASS_DECL
#include "gc-dialects/Passes.h.inc"
#include "gc/Transforms/Passes.h.inc"

#define GEN_PASS_REGISTRATION
#include "gc-dialects/Passes.h.inc"
#include "gc/Transforms/Passes.h.inc"
} // namespace gc
} // namespace mlir

Expand Down
File renamed without changes.
2 changes: 1 addition & 1 deletion lib/CMakeLists.txt
Original file line number Diff line number Diff line change
@@ -1 +1 @@
add_subdirectory(gc-dialects)
add_subdirectory(gc)
2 changes: 2 additions & 0 deletions lib/gc/CMakeLists.txt
Original file line number Diff line number Diff line change
@@ -0,0 +1,2 @@
add_subdirectory(Dialect)
add_subdirectory(Transforms)
Original file line number Diff line number Diff line change
@@ -1,5 +1,3 @@
add_subdirectory(Linalgx)
add_subdirectory(Microkernel)
add_subdirectory(OnednnGraph)

add_subdirectory(Transforms)
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ add_mlir_dialect_library(MLIRLinalgx
LinalgxOps.cpp

ADDITIONAL_HEADER_DIRS
${PROJECT_SOURCE_DIR}/include/gc-dialects/Linalgx
${PROJECT_SOURCE_DIR}/include/gc/Dialect/Linalgx

DEPENDS
MLIRLinalgxOpsIncGen
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -6,15 +6,15 @@
//
//===----------------------------------------------------------------------===//

#include "gc-dialects/Linalgx/LinalgxDialect.h"
#include "gc-dialects/Linalgx/LinalgxOps.h"
#include "gc/Dialect/Linalgx/LinalgxDialect.h"
#include "gc/Dialect/Linalgx/LinalgxOps.h"

using namespace mlir;
using namespace mlir::linalgx;

void LinalgxDialect::initialize() {
addOperations<
#define GET_OP_LIST
#include "gc-dialects/Linalgx/LinalgxOps.cpp.inc"
#include "gc/Dialect/Linalgx/LinalgxOps.cpp.inc"
>();
}
Original file line number Diff line number Diff line change
Expand Up @@ -6,9 +6,9 @@
//
//===----------------------------------------------------------------------===//

#include "gc-dialects/Linalgx/LinalgxOps.h"
#include "gc-dialects/Linalgx/LinalgxDialect.h"
#include "gc/Dialect/Linalgx/LinalgxOps.h"
#include "gc/Dialect/Linalgx/LinalgxDialect.h"
#include "mlir/IR/OpImplementation.h"

#define GET_OP_CLASSES
#include "gc-dialects/Linalgx/LinalgxOps.cpp.inc"
#include "gc/Dialect/Linalgx/LinalgxOps.cpp.inc"
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ add_mlir_dialect_library(MLIRMicrokernel
MicrokernelOps.cpp

ADDITIONAL_HEADER_DIRS
${PROJECT_SOURCE_DIR}/include/gc-dialects/Microkernel
${PROJECT_SOURCE_DIR}/include/gc/Dialect/Microkernel

DEPENDS
MLIRMicrokernelOpsIncGen
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -6,15 +6,15 @@
//
//===----------------------------------------------------------------------===//

#include "gc-dialects/Microkernel/MicrokernelDialect.h"
#include "gc-dialects/Microkernel/MicrokernelOps.h"
#include "gc/Dialect/Microkernel/MicrokernelDialect.h"
#include "gc/Dialect/Microkernel/MicrokernelOps.h"

using namespace mlir;
using namespace mlir::microkernel;

void MicrokernelDialect::initialize() {
addOperations<
#define GET_OP_LIST
#include "gc-dialects/Microkernel/MicrokernelOps.cpp.inc"
#include "gc/Dialect/Microkernel/MicrokernelOps.cpp.inc"
>();
}
Original file line number Diff line number Diff line change
Expand Up @@ -6,9 +6,9 @@
//
//===----------------------------------------------------------------------===//

#include "gc-dialects/Microkernel/MicrokernelOps.h"
#include "gc-dialects/Microkernel/MicrokernelDialect.h"
#include "gc/Dialect/Microkernel/MicrokernelOps.h"
#include "gc/Dialect/Microkernel/MicrokernelDialect.h"
#include "mlir/IR/OpImplementation.h"

#define GET_OP_CLASSES
#include "gc-dialects/Microkernel/MicrokernelOps.cpp.inc"
#include "gc/Dialect/Microkernel/MicrokernelOps.cpp.inc"
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ add_mlir_dialect_library(MLIROnednnGraph
OnednnGraphOps.cpp

ADDITIONAL_HEADER_DIRS
${PROJECT_SOURCE_DIR}/include/gc-dialects/OnednnGraph
${PROJECT_SOURCE_DIR}/include/gc/Dialect/OnednnGraph

DEPENDS
MLIROnednnGraphOpsIncGen
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -6,15 +6,15 @@
//
//===----------------------------------------------------------------------===//

#include "gc-dialects/OnednnGraph/OnednnGraphDialect.h"
#include "gc-dialects/OnednnGraph/OnednnGraphOps.h"
#include "gc/Dialect/OnednnGraph/OnednnGraphDialect.h"
#include "gc/Dialect/OnednnGraph/OnednnGraphOps.h"

using namespace mlir;
using namespace mlir::onednn_graph;

void OnednnGraphDialect::initialize() {
addOperations<
#define GET_OP_LIST
#include "gc-dialects/OnednnGraph/OnednnGraphOps.cpp.inc"
#include "gc/Dialect/OnednnGraph/OnednnGraphOps.cpp.inc"
>();
}
Original file line number Diff line number Diff line change
Expand Up @@ -6,9 +6,9 @@
//
//===----------------------------------------------------------------------===//

#include "gc-dialects/OnednnGraph/OnednnGraphOps.h"
#include "gc-dialects/OnednnGraph/OnednnGraphDialect.h"
#include "gc/Dialect/OnednnGraph/OnednnGraphOps.h"
#include "gc/Dialect/OnednnGraph/OnednnGraphDialect.h"
#include "mlir/IR/OpImplementation.h"

#define GET_OP_CLASSES
#include "gc-dialects/OnednnGraph/OnednnGraphOps.cpp.inc"
#include "gc/Dialect/OnednnGraph/OnednnGraphOps.cpp.inc"
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ add_mlir_library(GCPasses
TileNamed.cpp

ADDITIONAL_HEADER_DIRS
${PROJECT_SOURCE_DIR}/include/gc-dialects
${PROJECT_SOURCE_DIR}/include

DEPENDS
GraphCompilerPassIncGen
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
//
//===----------------------------------------------------------------------===//

#include "gc-dialects/Passes.h"
#include "gc/Transforms/Passes.h"
#include "mlir/Dialect/Affine/IR/AffineOps.h"
#include "mlir/Dialect/Func/IR/FuncOps.h"
#include "mlir/Dialect/Linalg/IR/Linalg.h"
Expand All @@ -22,7 +22,7 @@ using namespace mlir;
namespace mlir {
namespace gc {
#define GEN_PASS_DEF_TILELINALGNAMED
#include "gc-dialects/Passes.h.inc"
#include "gc/Transforms/Passes.h.inc"
} // namespace gc
} // namespace mlir

Expand Down
2 changes: 1 addition & 1 deletion src/gc-opt.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@
* SPDX-License-Identifier: Apache-2.0
*/

#include "gc-dialects/Passes.h"
#include "gc/Transforms/Passes.h"
#include "mlir/InitAllDialects.h"
#include "mlir/InitAllPasses.h"
#include "mlir/Tools/mlir-opt/MlirOptMain.h"
Expand Down