From 260f2c36b1f1ecc910b2e60a9d0d125fd76792ac Mon Sep 17 00:00:00 2001 From: Sambhav Jain Date: Sat, 14 Oct 2023 10:54:05 -0700 Subject: [PATCH] move IR and Transforms within Dialect to match with LLVM / Torch-MLIR convention --- BUILD | 56 +++++++++---------- include/{ => Dialect}/IR/TcpBase.td | 0 include/{ => Dialect}/IR/TcpDialect.h | 2 +- include/{ => Dialect}/IR/TcpEnums.td | 0 include/{ => Dialect}/IR/TcpOps.h | 6 +- include/{ => Dialect}/IR/TcpOps.td | 4 +- .../{ => Dialect}/Transforms/FuseTcpOpsPass.h | 0 .../Transforms/IsolateGroupOpsPass.h | 0 include/{ => Dialect}/Transforms/Passes.h | 0 include/{ => Dialect}/Transforms/Passes.td | 0 lib/Conversion/PassDetail.h | 2 +- .../StablehloToTcp/StablehloToTcp.cpp | 4 +- lib/Conversion/TcpToArith/TcpToArith.cpp | 4 +- lib/Conversion/TcpToLinalg/Elementwise.cpp | 4 +- lib/Conversion/TcpToLinalg/Misc.cpp | 4 +- lib/Conversion/TcpToLinalg/TcpToLinalg.cpp | 4 +- lib/Conversion/TorchToTcp/DataMovement.cpp | 4 +- lib/Conversion/TorchToTcp/Elementwise.cpp | 4 +- lib/Conversion/TorchToTcp/Misc.cpp | 4 +- lib/Conversion/TorchToTcp/TorchToTcp.cpp | 4 +- lib/Conversion/TorchToTcp/Utils.cpp | 4 +- lib/{ => Dialect}/IR/TcpDialect.cpp | 14 ++--- lib/{ => Dialect}/IR/TcpOps.cpp | 4 +- .../Transforms/FuseTcpOpsPass.cpp | 8 +-- .../Transforms/IsolateGroupOpsPass.cpp | 8 +-- lib/{ => Dialect}/Transforms/PassDetail.h | 4 +- lib/{ => Dialect}/Transforms/Passes.cpp | 8 +-- lib/InitAll.cpp | 4 +- .../Transforms/VerifyTcpBackendContract.cpp | 6 +- test/BUILD | 1 + 30 files changed, 84 insertions(+), 83 deletions(-) rename include/{ => Dialect}/IR/TcpBase.td (100%) rename include/{ => Dialect}/IR/TcpDialect.h (92%) rename include/{ => Dialect}/IR/TcpEnums.td (100%) rename include/{ => Dialect}/IR/TcpOps.h (88%) rename include/{ => Dialect}/IR/TcpOps.td (99%) rename include/{ => Dialect}/Transforms/FuseTcpOpsPass.h (100%) rename include/{ => Dialect}/Transforms/IsolateGroupOpsPass.h (100%) rename include/{ => Dialect}/Transforms/Passes.h (100%) rename include/{ => Dialect}/Transforms/Passes.td (100%) rename lib/{ => Dialect}/IR/TcpDialect.cpp (84%) rename lib/{ => Dialect}/IR/TcpOps.cpp (99%) rename lib/{ => Dialect}/Transforms/FuseTcpOpsPass.cpp (96%) rename lib/{ => Dialect}/Transforms/IsolateGroupOpsPass.cpp (96%) rename lib/{ => Dialect}/Transforms/PassDetail.h (88%) rename lib/{ => Dialect}/Transforms/Passes.cpp (76%) diff --git a/BUILD b/BUILD index 4333452a..abc7a428 100644 --- a/BUILD +++ b/BUILD @@ -14,9 +14,9 @@ package( td_library( name = "TcpTdFiles", srcs = [ - "include/IR/TcpBase.td", - "include/IR/TcpEnums.td", - "include/IR/TcpOps.td", + "include/Dialect/IR/TcpBase.td", + "include/Dialect/IR/TcpEnums.td", + "include/Dialect/IR/TcpOps.td", ], includes = ["include"], deps = [ @@ -31,15 +31,15 @@ gentbl_cc_library( tbl_outs = [ ( ["-gen-enum-decls"], - "include/IR/TcpEnums.h.inc", + "include/Dialect/IR/TcpEnums.h.inc", ), ( ["-gen-enum-defs"], - "include/IR/TcpEnums.cpp.inc", + "include/Dialect/IR/TcpEnums.cpp.inc", ), ], tblgen = "@llvm-project//mlir:mlir-tblgen", - td_file = "include/IR/TcpOps.td", + td_file = "include/Dialect/IR/TcpOps.td", deps = [ ":TcpTdFiles", ], @@ -51,15 +51,15 @@ gentbl_cc_library( tbl_outs = [ ( ["-gen-attrdef-decls"], - "include/IR/TcpAttrs.h.inc", + "include/Dialect/IR/TcpAttrs.h.inc", ), ( ["-gen-attrdef-defs"], - "include/IR/TcpAttrs.cpp.inc", + "include/Dialect/IR/TcpAttrs.cpp.inc", ), ], tblgen = "@llvm-project//mlir:mlir-tblgen", - td_file = "include/IR/TcpOps.td", + td_file = "include/Dialect/IR/TcpOps.td", deps = [ ":TcpTdFiles", ], @@ -71,29 +71,29 @@ gentbl_cc_library( tbl_outs = [ ( ["-gen-op-decls"], - "include/IR/TcpOps.h.inc", + "include/Dialect/IR/TcpOps.h.inc", ), ( ["-gen-op-defs"], - "include/IR/TcpOps.cpp.inc", + "include/Dialect/IR/TcpOps.cpp.inc", ), ( [ "-gen-dialect-decls", "-dialect=tcp", ], - "include/IR/TcpDialect.h.inc", + "include/Dialect/IR/TcpDialect.h.inc", ), ( [ "-gen-dialect-defs", "-dialect=tcp", ], - "include/IR/TcpDialect.cpp.inc", + "include/Dialect/IR/TcpDialect.cpp.inc", ), ], tblgen = "@llvm-project//mlir:mlir-tblgen", - td_file = "include/IR/TcpOps.td", + td_file = "include/Dialect/IR/TcpOps.td", deps = [ ":TcpTdFiles", ], @@ -102,12 +102,12 @@ gentbl_cc_library( cc_library( name = "TcpDialect", srcs = [ - "lib/IR/TcpDialect.cpp", - "lib/IR/TcpOps.cpp", + "lib/Dialect/IR/TcpDialect.cpp", + "lib/Dialect/IR/TcpOps.cpp", ], hdrs = [ - "include/IR/TcpDialect.h", - "include/IR/TcpOps.h", + "include/Dialect/IR/TcpDialect.h", + "include/Dialect/IR/TcpOps.h", ], strip_include_prefix = "include", deps = [ @@ -124,7 +124,7 @@ cc_library( td_library( name = "TcpTransformsPassesTdFiles", srcs = [ - "include/Transforms/Passes.td", + "include/Dialect/Transforms/Passes.td", ], deps = [ "@llvm-project//mlir:OpBaseTdFiles", @@ -138,11 +138,11 @@ gentbl_cc_library( tbl_outs = [ ( ["-gen-pass-decls"], - "include/Transforms/Passes.h.inc", + "include/Dialect/Transforms/Passes.h.inc", ), ], tblgen = "@llvm-project//mlir:mlir-tblgen", - td_file = "include/Transforms/Passes.td", + td_file = "include/Dialect/Transforms/Passes.td", deps = [ ":TcpTransformsPassesTdFiles", ], @@ -151,15 +151,15 @@ gentbl_cc_library( cc_library( name = "TcpPasses", srcs = [ - "lib/Transforms/FuseTcpOpsPass.cpp", - "lib/Transforms/IsolateGroupOpsPass.cpp", - "lib/Transforms/PassDetail.h", - "lib/Transforms/Passes.cpp", + "lib/Dialect/Transforms/FuseTcpOpsPass.cpp", + "lib/Dialect/Transforms/IsolateGroupOpsPass.cpp", + "lib/Dialect/Transforms/PassDetail.h", + "lib/Dialect/Transforms/Passes.cpp", ], hdrs = [ - "include/Transforms/FuseTcpOpsPass.h", - "include/Transforms/IsolateGroupOpsPass.h", - "include/Transforms/Passes.h", + "include/Dialect/Transforms/FuseTcpOpsPass.h", + "include/Dialect/Transforms/IsolateGroupOpsPass.h", + "include/Dialect/Transforms/Passes.h", ], strip_include_prefix = "include", deps = [ diff --git a/include/IR/TcpBase.td b/include/Dialect/IR/TcpBase.td similarity index 100% rename from include/IR/TcpBase.td rename to include/Dialect/IR/TcpBase.td diff --git a/include/IR/TcpDialect.h b/include/Dialect/IR/TcpDialect.h similarity index 92% rename from include/IR/TcpDialect.h rename to include/Dialect/IR/TcpDialect.h index d85335ec..f2826cee 100644 --- a/include/IR/TcpDialect.h +++ b/include/Dialect/IR/TcpDialect.h @@ -12,4 +12,4 @@ #include "mlir/IR/Dialect.h" #include "mlir/IR/OpDefinition.h" -#include "IR/TcpDialect.h.inc" +#include "Dialect/IR/TcpDialect.h.inc" diff --git a/include/IR/TcpEnums.td b/include/Dialect/IR/TcpEnums.td similarity index 100% rename from include/IR/TcpEnums.td rename to include/Dialect/IR/TcpEnums.td diff --git a/include/IR/TcpOps.h b/include/Dialect/IR/TcpOps.h similarity index 88% rename from include/IR/TcpOps.h rename to include/Dialect/IR/TcpOps.h index be8fcd6f..19fb5ec5 100644 --- a/include/IR/TcpOps.h +++ b/include/Dialect/IR/TcpOps.h @@ -19,8 +19,8 @@ #include "llvm/ADT/DenseMap.h" #include "llvm/ADT/TypeSwitch.h" -#include "IR/TcpEnums.h.inc" +#include "Dialect/IR/TcpEnums.h.inc" #define GET_ATTRDEF_CLASSES -#include "IR/TcpAttrs.h.inc" +#include "Dialect/IR/TcpAttrs.h.inc" #define GET_OP_CLASSES -#include "IR/TcpOps.h.inc" +#include "Dialect/IR/TcpOps.h.inc" diff --git a/include/IR/TcpOps.td b/include/Dialect/IR/TcpOps.td similarity index 99% rename from include/IR/TcpOps.td rename to include/Dialect/IR/TcpOps.td index bde08a2f..0b5ffba8 100644 --- a/include/IR/TcpOps.td +++ b/include/Dialect/IR/TcpOps.td @@ -10,8 +10,8 @@ #ifndef TCP_OPS #define TCP_OPS -include "IR/TcpBase.td" -include "IR/TcpEnums.td" +include "Dialect/IR/TcpBase.td" +include "Dialect/IR/TcpEnums.td" include "mlir/IR/OpBase.td" diff --git a/include/Transforms/FuseTcpOpsPass.h b/include/Dialect/Transforms/FuseTcpOpsPass.h similarity index 100% rename from include/Transforms/FuseTcpOpsPass.h rename to include/Dialect/Transforms/FuseTcpOpsPass.h diff --git a/include/Transforms/IsolateGroupOpsPass.h b/include/Dialect/Transforms/IsolateGroupOpsPass.h similarity index 100% rename from include/Transforms/IsolateGroupOpsPass.h rename to include/Dialect/Transforms/IsolateGroupOpsPass.h diff --git a/include/Transforms/Passes.h b/include/Dialect/Transforms/Passes.h similarity index 100% rename from include/Transforms/Passes.h rename to include/Dialect/Transforms/Passes.h diff --git a/include/Transforms/Passes.td b/include/Dialect/Transforms/Passes.td similarity index 100% rename from include/Transforms/Passes.td rename to include/Dialect/Transforms/Passes.td diff --git a/lib/Conversion/PassDetail.h b/lib/Conversion/PassDetail.h index 69b11e25..85a4149b 100644 --- a/lib/Conversion/PassDetail.h +++ b/lib/Conversion/PassDetail.h @@ -9,7 +9,7 @@ #pragma once -#include "IR/TcpDialect.h" +#include "Dialect/IR/TcpDialect.h" #include "mlir/Dialect/Arith/IR/Arith.h" #include "mlir/Dialect/Func/IR/FuncOps.h" #include "mlir/Dialect/Linalg/IR/Linalg.h" diff --git a/lib/Conversion/StablehloToTcp/StablehloToTcp.cpp b/lib/Conversion/StablehloToTcp/StablehloToTcp.cpp index c7b85ab6..ad3dc74e 100644 --- a/lib/Conversion/StablehloToTcp/StablehloToTcp.cpp +++ b/lib/Conversion/StablehloToTcp/StablehloToTcp.cpp @@ -9,8 +9,8 @@ #include "Conversion/StablehloToTcp/StablehloToTcp.h" -#include "IR/TcpDialect.h" -#include "IR/TcpOps.h" +#include "Dialect/IR/TcpDialect.h" +#include "Dialect/IR/TcpOps.h" #include "../PassDetail.h" #include "mlir/IR/PatternMatch.h" diff --git a/lib/Conversion/TcpToArith/TcpToArith.cpp b/lib/Conversion/TcpToArith/TcpToArith.cpp index 019abf0c..c0aff54f 100644 --- a/lib/Conversion/TcpToArith/TcpToArith.cpp +++ b/lib/Conversion/TcpToArith/TcpToArith.cpp @@ -9,8 +9,8 @@ #include "Conversion/TcpToArith/TcpToArith.h" -#include "IR/TcpDialect.h" -#include "IR/TcpOps.h" +#include "Dialect/IR/TcpDialect.h" +#include "Dialect/IR/TcpOps.h" #include "../PassDetail.h" #include "mlir/Dialect/Arith/IR/Arith.h" diff --git a/lib/Conversion/TcpToLinalg/Elementwise.cpp b/lib/Conversion/TcpToLinalg/Elementwise.cpp index b6ab2d16..fc8f4cf5 100644 --- a/lib/Conversion/TcpToLinalg/Elementwise.cpp +++ b/lib/Conversion/TcpToLinalg/Elementwise.cpp @@ -10,8 +10,8 @@ #include "Conversion/TcpToLinalg/TcpToLinalg.h" #include "../PassDetail.h" -#include "IR/TcpDialect.h" -#include "IR/TcpOps.h" +#include "Dialect/IR/TcpDialect.h" +#include "Dialect/IR/TcpOps.h" #include "PopulatePatterns.h" #include "mlir/Dialect/Arith/IR/Arith.h" #include "mlir/Dialect/Linalg/IR/Linalg.h" diff --git a/lib/Conversion/TcpToLinalg/Misc.cpp b/lib/Conversion/TcpToLinalg/Misc.cpp index 43d141ae..f1bb891c 100644 --- a/lib/Conversion/TcpToLinalg/Misc.cpp +++ b/lib/Conversion/TcpToLinalg/Misc.cpp @@ -10,8 +10,8 @@ #include "Conversion/TcpToLinalg/TcpToLinalg.h" #include "../PassDetail.h" -#include "IR/TcpDialect.h" -#include "IR/TcpOps.h" +#include "Dialect/IR/TcpDialect.h" +#include "Dialect/IR/TcpOps.h" #include "PopulatePatterns.h" #include "mlir/Dialect/Arith/IR/Arith.h" #include "mlir/Dialect/Linalg/IR/Linalg.h" diff --git a/lib/Conversion/TcpToLinalg/TcpToLinalg.cpp b/lib/Conversion/TcpToLinalg/TcpToLinalg.cpp index 4a17814d..d82cedaa 100644 --- a/lib/Conversion/TcpToLinalg/TcpToLinalg.cpp +++ b/lib/Conversion/TcpToLinalg/TcpToLinalg.cpp @@ -9,8 +9,8 @@ #include "Conversion/TcpToLinalg/TcpToLinalg.h" -#include "IR/TcpDialect.h" -#include "IR/TcpOps.h" +#include "Dialect/IR/TcpDialect.h" +#include "Dialect/IR/TcpOps.h" #include "../PassDetail.h" #include "PopulatePatterns.h" diff --git a/lib/Conversion/TorchToTcp/DataMovement.cpp b/lib/Conversion/TorchToTcp/DataMovement.cpp index dbf1f7a7..4d2cbca2 100644 --- a/lib/Conversion/TorchToTcp/DataMovement.cpp +++ b/lib/Conversion/TorchToTcp/DataMovement.cpp @@ -9,8 +9,8 @@ #include "Conversion/TorchToTcp/TorchToTcp.h" -#include "IR/TcpDialect.h" -#include "IR/TcpOps.h" +#include "Dialect/IR/TcpDialect.h" +#include "Dialect/IR/TcpOps.h" #include "PopulatePatterns.h" #include "Utils.h" #include "torch-mlir/Conversion/Utils/Utils.h" diff --git a/lib/Conversion/TorchToTcp/Elementwise.cpp b/lib/Conversion/TorchToTcp/Elementwise.cpp index 142e0ec5..c833378a 100644 --- a/lib/Conversion/TorchToTcp/Elementwise.cpp +++ b/lib/Conversion/TorchToTcp/Elementwise.cpp @@ -9,8 +9,8 @@ #include "Conversion/TorchToTcp/TorchToTcp.h" -#include "IR/TcpDialect.h" -#include "IR/TcpOps.h" +#include "Dialect/IR/TcpDialect.h" +#include "Dialect/IR/TcpOps.h" #include "PopulatePatterns.h" #include "Utils.h" #include "mlir/Dialect/Arith/IR/Arith.h" diff --git a/lib/Conversion/TorchToTcp/Misc.cpp b/lib/Conversion/TorchToTcp/Misc.cpp index 89b6e546..d028c15c 100644 --- a/lib/Conversion/TorchToTcp/Misc.cpp +++ b/lib/Conversion/TorchToTcp/Misc.cpp @@ -9,8 +9,8 @@ #include "Conversion/TorchToTcp/TorchToTcp.h" -#include "IR/TcpDialect.h" -#include "IR/TcpOps.h" +#include "Dialect/IR/TcpDialect.h" +#include "Dialect/IR/TcpOps.h" #include "PopulatePatterns.h" #include "Utils.h" #include "mlir/Dialect/Arith/IR/Arith.h" diff --git a/lib/Conversion/TorchToTcp/TorchToTcp.cpp b/lib/Conversion/TorchToTcp/TorchToTcp.cpp index 599f7fc8..4bf1d4e1 100644 --- a/lib/Conversion/TorchToTcp/TorchToTcp.cpp +++ b/lib/Conversion/TorchToTcp/TorchToTcp.cpp @@ -10,8 +10,8 @@ #include "Conversion/TorchToTcp/TorchToTcp.h" #include "../PassDetail.h" -#include "IR/TcpDialect.h" -#include "IR/TcpOps.h" +#include "Dialect/IR/TcpDialect.h" +#include "Dialect/IR/TcpOps.h" #include "PopulatePatterns.h" #include "mlir/Dialect/Arith/IR/Arith.h" #include "mlir/Dialect/Tensor/IR/Tensor.h" diff --git a/lib/Conversion/TorchToTcp/Utils.cpp b/lib/Conversion/TorchToTcp/Utils.cpp index 432b28e1..05721c5c 100644 --- a/lib/Conversion/TorchToTcp/Utils.cpp +++ b/lib/Conversion/TorchToTcp/Utils.cpp @@ -9,8 +9,8 @@ #include "Utils.h" -#include "IR/TcpDialect.h" -#include "IR/TcpOps.h" +#include "Dialect/IR/TcpDialect.h" +#include "Dialect/IR/TcpOps.h" #include "mlir/Dialect/Arith/IR/Arith.h" #include "mlir/Dialect/Tensor/IR/Tensor.h" #include "torch-mlir/Dialect/Torch/IR/TorchDialect.h" diff --git a/lib/IR/TcpDialect.cpp b/lib/Dialect/IR/TcpDialect.cpp similarity index 84% rename from lib/IR/TcpDialect.cpp rename to lib/Dialect/IR/TcpDialect.cpp index 04265965..548a5da7 100644 --- a/lib/IR/TcpDialect.cpp +++ b/lib/Dialect/IR/TcpDialect.cpp @@ -7,8 +7,8 @@ // //===----------------------------------------------------------------------===// -#include "IR/TcpDialect.h" -#include "IR/TcpOps.h" +#include "Dialect/IR/TcpDialect.h" +#include "Dialect/IR/TcpOps.h" #include "mlir/IR/Attributes.h" #include "mlir/IR/DialectImplementation.h" @@ -23,19 +23,19 @@ using namespace mlir::tcp; void TcpDialect::initialize() { #define GET_OP_LIST addOperations< -#include "IR/TcpOps.cpp.inc" +#include "Dialect/IR/TcpOps.cpp.inc" >(); #define GET_ATTRDEF_LIST addAttributes< -#include "IR/TcpAttrs.cpp.inc" +#include "Dialect/IR/TcpAttrs.cpp.inc" >(); } -#include "IR/TcpEnums.cpp.inc" +#include "Dialect/IR/TcpEnums.cpp.inc" #define GET_ATTRDEF_CLASSES -#include "IR/TcpAttrs.cpp.inc" +#include "Dialect/IR/TcpAttrs.cpp.inc" -#include "IR/TcpDialect.cpp.inc" +#include "Dialect/IR/TcpDialect.cpp.inc" Attribute TcpDialect::parseAttribute(DialectAsmParser &parser, Type type) const { diff --git a/lib/IR/TcpOps.cpp b/lib/Dialect/IR/TcpOps.cpp similarity index 99% rename from lib/IR/TcpOps.cpp rename to lib/Dialect/IR/TcpOps.cpp index 4a949eec..45b3a0b1 100644 --- a/lib/IR/TcpOps.cpp +++ b/lib/Dialect/IR/TcpOps.cpp @@ -7,7 +7,7 @@ // //===----------------------------------------------------------------------===// -#include "IR/TcpOps.h" +#include "Dialect/IR/TcpOps.h" #include "mlir/IR/Builders.h" #include "mlir/IR/OpImplementation.h" @@ -16,7 +16,7 @@ #include "mlir/IR/Value.h" #define GET_OP_CLASSES -#include "IR/TcpOps.cpp.inc" +#include "Dialect/IR/TcpOps.cpp.inc" namespace mlir::tcp { diff --git a/lib/Transforms/FuseTcpOpsPass.cpp b/lib/Dialect/Transforms/FuseTcpOpsPass.cpp similarity index 96% rename from lib/Transforms/FuseTcpOpsPass.cpp rename to lib/Dialect/Transforms/FuseTcpOpsPass.cpp index 4e95aca8..40e49bae 100644 --- a/lib/Transforms/FuseTcpOpsPass.cpp +++ b/lib/Dialect/Transforms/FuseTcpOpsPass.cpp @@ -7,12 +7,12 @@ // //===----------------------------------------------------------------------===// -#include "Transforms/FuseTcpOpsPass.h" +#include "Dialect/Transforms/FuseTcpOpsPass.h" #include "./PassDetail.h" -#include "IR/TcpDialect.h" -#include "IR/TcpOps.h" -#include "Transforms/Passes.h" +#include "Dialect/IR/TcpDialect.h" +#include "Dialect/IR/TcpOps.h" +#include "Dialect/Transforms/Passes.h" #include "mlir/Dialect/Func/IR/FuncOps.h" #include "mlir/IR/BuiltinOps.h" #include "mlir/IR/OpDefinition.h" diff --git a/lib/Transforms/IsolateGroupOpsPass.cpp b/lib/Dialect/Transforms/IsolateGroupOpsPass.cpp similarity index 96% rename from lib/Transforms/IsolateGroupOpsPass.cpp rename to lib/Dialect/Transforms/IsolateGroupOpsPass.cpp index db04e1c1..a9f44464 100644 --- a/lib/Transforms/IsolateGroupOpsPass.cpp +++ b/lib/Dialect/Transforms/IsolateGroupOpsPass.cpp @@ -7,12 +7,12 @@ // //===----------------------------------------------------------------------===// -#include "Transforms/IsolateGroupOpsPass.h" +#include "Dialect/Transforms/IsolateGroupOpsPass.h" #include "./PassDetail.h" -#include "IR/TcpDialect.h" -#include "IR/TcpOps.h" -#include "Transforms/Passes.h" +#include "Dialect/IR/TcpDialect.h" +#include "Dialect/IR/TcpOps.h" +#include "Dialect/Transforms/Passes.h" #include "mlir/Dialect/Func/IR/FuncOps.h" #include "mlir/IR/BuiltinOps.h" #include "mlir/IR/OpDefinition.h" diff --git a/lib/Transforms/PassDetail.h b/lib/Dialect/Transforms/PassDetail.h similarity index 88% rename from lib/Transforms/PassDetail.h rename to lib/Dialect/Transforms/PassDetail.h index 1a41a744..b9add888 100644 --- a/lib/Transforms/PassDetail.h +++ b/lib/Dialect/Transforms/PassDetail.h @@ -11,12 +11,12 @@ #include "mlir/Pass/Pass.h" -#include "IR/TcpOps.h" +#include "Dialect/IR/TcpOps.h" namespace mlir::tcp { using namespace mlir; #define GEN_PASS_CLASSES -#include "Transforms/Passes.h.inc" +#include "Dialect/Transforms/Passes.h.inc" } // end namespace mlir::tcp diff --git a/lib/Transforms/Passes.cpp b/lib/Dialect/Transforms/Passes.cpp similarity index 76% rename from lib/Transforms/Passes.cpp rename to lib/Dialect/Transforms/Passes.cpp index 5218761e..336fbfe9 100644 --- a/lib/Transforms/Passes.cpp +++ b/lib/Dialect/Transforms/Passes.cpp @@ -7,15 +7,15 @@ // //===----------------------------------------------------------------------===// -#include "Transforms/Passes.h" -#include "Transforms/FuseTcpOpsPass.h" -#include "Transforms/IsolateGroupOpsPass.h" +#include "Dialect/Transforms/Passes.h" +#include "Dialect/Transforms/FuseTcpOpsPass.h" +#include "Dialect/Transforms/IsolateGroupOpsPass.h" #include "mlir/Pass/Pass.h" #include namespace { #define GEN_PASS_REGISTRATION -#include "Transforms/Passes.h.inc" +#include "Dialect/Transforms/Passes.h.inc" } // end namespace void mlir::tcp::registerTcpPasses() { ::registerPasses(); } diff --git a/lib/InitAll.cpp b/lib/InitAll.cpp index 92deb0fc..df030856 100644 --- a/lib/InitAll.cpp +++ b/lib/InitAll.cpp @@ -10,8 +10,8 @@ #include "InitAll.h" #include "Conversion/Passes.h" -#include "IR/TcpDialect.h" -#include "Transforms/Passes.h" +#include "Dialect/IR/TcpDialect.h" +#include "Dialect/Transforms/Passes.h" #include "mlir/Dialect/Func/Extensions/InlinerExtension.h" #include "mlir/Dialect/Func/IR/FuncOps.h" #include "mlir/IR/Dialect.h" diff --git a/lib/TorchConversion/Transforms/VerifyTcpBackendContract.cpp b/lib/TorchConversion/Transforms/VerifyTcpBackendContract.cpp index 8f293f89..6497cf1e 100644 --- a/lib/TorchConversion/Transforms/VerifyTcpBackendContract.cpp +++ b/lib/TorchConversion/Transforms/VerifyTcpBackendContract.cpp @@ -7,10 +7,10 @@ // //===----------------------------------------------------------------------===// -#include "PassDetail.h" +#include "../PassDetail.h" -#include "IR/TcpDialect.h" -#include "IR/TcpOps.h" +#include "Dialect/IR/TcpDialect.h" +#include "Dialect/IR/TcpOps.h" #include "mlir/Dialect/Arith/IR/Arith.h" #include "mlir/Dialect/Func/IR/FuncOps.h" #include "mlir/Dialect/Tensor/IR/Tensor.h" diff --git a/test/BUILD b/test/BUILD index cca7a19c..b09ccf99 100644 --- a/test/BUILD +++ b/test/BUILD @@ -6,6 +6,7 @@ load("@bazel_skylib//rules:expand_template.bzl", "expand_template") load("@llvm-project//llvm:lit_test.bzl", "lit_test") load("@//tools/aot:aot_compile.bzl", "aot_compile") +load("@rules_cc//cc:defs.bzl", "cc_test") expand_template( name = "lit_site_cfg_py",