From 81001d318c87a7d97feaf53934771200d4325ddf Mon Sep 17 00:00:00 2001 From: Philippe Tillet Date: Tue, 26 Apr 2022 14:38:28 -0700 Subject: [PATCH] Putting Triton dialect in its own folder --- include/CMakeLists.txt | 2 +- include/triton/Dialect/CMakeLists.txt | 1 + include/triton/{ir => Dialect/Triton}/CMakeLists.txt | 0 include/triton/{ir => Dialect/Triton}/Dialect.h | 9 ++++----- include/triton/{ir => Dialect/Triton}/Traits.h | 0 include/triton/{ir => Dialect/Triton}/TritonDialect.td | 0 include/triton/{ir => Dialect/Triton}/TritonOps.td | 0 include/triton/{ir => Dialect/Triton}/Types.h | 2 +- lib/CMakeLists.txt | 2 +- lib/Dialect/CMakeLists.txt | 1 + lib/{ir => Dialect/Triton}/CMakeLists.txt | 0 lib/{ir => Dialect/Triton}/Dialect.cpp | 8 ++++---- lib/{ir => Dialect/Triton}/Ops.cpp | 8 ++++---- lib/{ir => Dialect/Triton}/Types.cpp | 8 ++++---- python/src/triton.cc | 4 ++-- 15 files changed, 23 insertions(+), 22 deletions(-) create mode 100644 include/triton/Dialect/CMakeLists.txt rename include/triton/{ir => Dialect/Triton}/CMakeLists.txt (100%) rename include/triton/{ir => Dialect/Triton}/Dialect.h (63%) rename include/triton/{ir => Dialect/Triton}/Traits.h (100%) rename include/triton/{ir => Dialect/Triton}/TritonDialect.td (100%) rename include/triton/{ir => Dialect/Triton}/TritonOps.td (100%) rename include/triton/{ir => Dialect/Triton}/Types.h (79%) create mode 100644 lib/Dialect/CMakeLists.txt rename lib/{ir => Dialect/Triton}/CMakeLists.txt (100%) rename lib/{ir => Dialect/Triton}/Dialect.cpp (66%) rename lib/{ir => Dialect/Triton}/Ops.cpp (94%) rename lib/{ir => Dialect/Triton}/Types.cpp (82%) diff --git a/include/CMakeLists.txt b/include/CMakeLists.txt index 589793199..9da937000 100644 --- a/include/CMakeLists.txt +++ b/include/CMakeLists.txt @@ -1 +1 @@ -add_subdirectory(triton/ir) +add_subdirectory(triton/Dialect) diff --git a/include/triton/Dialect/CMakeLists.txt b/include/triton/Dialect/CMakeLists.txt new file mode 100644 index 000000000..8eea29534 --- /dev/null +++ b/include/triton/Dialect/CMakeLists.txt @@ -0,0 +1 @@ +add_subdirectory(Triton) \ No newline at end of file diff --git a/include/triton/ir/CMakeLists.txt b/include/triton/Dialect/Triton/CMakeLists.txt similarity index 100% rename from include/triton/ir/CMakeLists.txt rename to include/triton/Dialect/Triton/CMakeLists.txt diff --git a/include/triton/ir/Dialect.h b/include/triton/Dialect/Triton/Dialect.h similarity index 63% rename from include/triton/ir/Dialect.h rename to include/triton/Dialect/Triton/Dialect.h index 4c225a7bc..0cb893e2f 100644 --- a/include/triton/ir/Dialect.h +++ b/include/triton/Dialect/Triton/Dialect.h @@ -1,7 +1,6 @@ #ifndef TRITON_IR_DIALECT_H_ #define TRITON_IR_DIALECT_H_ -#include "triton/ir/Traits.h" #include "mlir/IR/BuiltinOps.h" #include "mlir/IR/Dialect.h" @@ -9,11 +8,11 @@ #include "mlir/Dialect/StandardOps/IR/Ops.h" #include "mlir/Dialect/SCF/SCF.h" -#include "triton/ir/Dialect.h.inc" - -#include "triton/ir/OpsEnums.h.inc" +#include "triton/Dialect/Triton/Traits.h" +#include "triton/Dialect/Triton/Dialect.h.inc" +#include "triton/Dialect/Triton/OpsEnums.h.inc" #define GET_OP_CLASSES -#include "triton/ir/Ops.h.inc" +#include "triton/Dialect/Triton/Ops.h.inc" #endif // TRITON_IR_DIALECT_H_ diff --git a/include/triton/ir/Traits.h b/include/triton/Dialect/Triton/Traits.h similarity index 100% rename from include/triton/ir/Traits.h rename to include/triton/Dialect/Triton/Traits.h diff --git a/include/triton/ir/TritonDialect.td b/include/triton/Dialect/Triton/TritonDialect.td similarity index 100% rename from include/triton/ir/TritonDialect.td rename to include/triton/Dialect/Triton/TritonDialect.td diff --git a/include/triton/ir/TritonOps.td b/include/triton/Dialect/Triton/TritonOps.td similarity index 100% rename from include/triton/ir/TritonOps.td rename to include/triton/Dialect/Triton/TritonOps.td diff --git a/include/triton/ir/Types.h b/include/triton/Dialect/Triton/Types.h similarity index 79% rename from include/triton/ir/Types.h rename to include/triton/Dialect/Triton/Types.h index 2f94cf573..dad9ae091 100644 --- a/include/triton/ir/Types.h +++ b/include/triton/Dialect/Triton/Types.h @@ -5,6 +5,6 @@ #include "mlir/IR/Types.h" #define GET_TYPEDEF_CLASSES -#include "triton/ir/Types.h.inc" +#include "triton/Dialect/Triton/Types.h.inc" #endif // TRITON_IR_TYPES_H_ diff --git a/lib/CMakeLists.txt b/lib/CMakeLists.txt index f50dbb34e..44cd839e6 100644 --- a/lib/CMakeLists.txt +++ b/lib/CMakeLists.txt @@ -1,3 +1,3 @@ # add_subdirectory(codegen) add_subdirectory(driver) -add_subdirectory(ir) +add_subdirectory(Dialect) diff --git a/lib/Dialect/CMakeLists.txt b/lib/Dialect/CMakeLists.txt new file mode 100644 index 000000000..5e601271e --- /dev/null +++ b/lib/Dialect/CMakeLists.txt @@ -0,0 +1 @@ +add_subdirectory(Triton) diff --git a/lib/ir/CMakeLists.txt b/lib/Dialect/Triton/CMakeLists.txt similarity index 100% rename from lib/ir/CMakeLists.txt rename to lib/Dialect/Triton/CMakeLists.txt diff --git a/lib/ir/Dialect.cpp b/lib/Dialect/Triton/Dialect.cpp similarity index 66% rename from lib/ir/Dialect.cpp rename to lib/Dialect/Triton/Dialect.cpp index bd5dbea78..33188f157 100644 --- a/lib/ir/Dialect.cpp +++ b/lib/Dialect/Triton/Dialect.cpp @@ -1,5 +1,5 @@ -#include "triton/ir/Dialect.h" -#include "triton/ir/Types.h" +#include "triton/Dialect/Triton/Dialect.h" +#include "triton/Dialect/Triton/Types.h" #include "llvm/ADT/StringSwitch.h" #include "llvm/ADT/TypeSwitch.h" @@ -8,7 +8,7 @@ #include "mlir/IR/DialectImplementation.h" -#include "triton/ir/Dialect.cpp.inc" +#include "triton/Dialect/Triton/Dialect.cpp.inc" using namespace mlir; using namespace mlir::triton; @@ -18,7 +18,7 @@ void TritonDialect::initialize() { addOperations< #define GET_OP_LIST -#include "triton/ir/Ops.cpp.inc" +#include "triton/Dialect/Triton/Ops.cpp.inc" >(); // We can also add interface here. diff --git a/lib/ir/Ops.cpp b/lib/Dialect/Triton/Ops.cpp similarity index 94% rename from lib/ir/Ops.cpp rename to lib/Dialect/Triton/Ops.cpp index 32d9f53ee..d8d8fa07e 100644 --- a/lib/ir/Ops.cpp +++ b/lib/Dialect/Triton/Ops.cpp @@ -1,5 +1,5 @@ -#include "triton/ir/Dialect.h" -#include "triton/ir/Types.h" +#include "triton/Dialect/Triton/Dialect.h" +#include "triton/Dialect/Triton/Types.h" #include "mlir/IR/Builders.h" #include "mlir/IR/BuiltinAttributes.h" @@ -38,10 +38,10 @@ static Type getPointerTypeFromTensor(Type type) { } #define GET_OP_CLASSES -#include "triton/ir/Ops.cpp.inc" +#include "triton/Dialect/Triton/Ops.cpp.inc" // enum attribute definitions -#include "triton/ir/OpsEnums.cpp.inc" +#include "triton/Dialect/Triton/OpsEnums.cpp.inc" namespace mlir { namespace triton { diff --git a/lib/ir/Types.cpp b/lib/Dialect/Triton/Types.cpp similarity index 82% rename from lib/ir/Types.cpp rename to lib/Dialect/Triton/Types.cpp index ff2db0b1b..5aa8c8773 100644 --- a/lib/ir/Types.cpp +++ b/lib/Dialect/Triton/Types.cpp @@ -1,5 +1,5 @@ -#include "triton/ir/Dialect.h" -#include "triton/ir/Types.h" +#include "triton/Dialect/Triton/Dialect.h" +#include "triton/Dialect/Triton/Types.h" #include "mlir/IR/DialectImplementation.h" // required by `Types.cpp.inc` #include "llvm/ADT/TypeSwitch.h" // required by `Types.cpp.inc` @@ -7,7 +7,7 @@ using namespace mlir; using namespace mlir::triton; #define GET_TYPEDEF_CLASSES -#include "triton/ir/Types.cpp.inc" +#include "triton/Dialect/Triton/Types.cpp.inc" //===----------------------------------------------------------------------===// // Triton Dialect @@ -15,7 +15,7 @@ using namespace mlir::triton; void TritonDialect::registerTypes() { addTypes< #define GET_TYPEDEF_LIST -#include "triton/ir/Types.cpp.inc" +#include "triton/Dialect/Triton/Types.cpp.inc" >(); } diff --git a/python/src/triton.cc b/python/src/triton.cc index fe56340e4..9fd8eca39 100644 --- a/python/src/triton.cc +++ b/python/src/triton.cc @@ -12,8 +12,8 @@ #include "mlir/Transforms/Passes.h" -#include "triton/ir/Dialect.h" -#include "triton/ir/Types.h" +#include "triton/Dialect/Triton/Dialect.h" +#include "triton/Dialect/Triton/Types.h" #include "llvm/IR/Module.h" #include "llvm/IR/LegacyPassManager.h"