From 4670cab00860b3e9a12a0ea5784445cdedaa34a5 Mon Sep 17 00:00:00 2001 From: Sambhav Jain Date: Mon, 23 Oct 2023 20:32:04 -0700 Subject: [PATCH] [NFC] Create `include/mlir-tcp` and move headers over (#12) This makes it idiomatic to upstream mlir/torch-mlir structure, and makes downstream integrations less ambiguous in cases like these: ``` - #include "Conversion/Passes.h" + #include "mlir-tcp/Conversion/Passes.h" ``` --- .clang-format | 5 ++ BUILD | 66 +++++++++---------- include/{ => mlir-tcp}/Conversion/Passes.h | 0 include/{ => mlir-tcp}/Conversion/Passes.td | 4 ++ .../StablehloToTcp/StablehloToTcp.h | 2 +- .../Conversion/TcpToArith/TcpToArith.h | 2 +- .../Conversion/TcpToLinalg/TcpToLinalg.h | 2 +- .../Conversion/TorchToTcp/TorchToTcp.h | 4 ++ include/{ => mlir-tcp}/Dialect/IR/TcpBase.td | 0 .../{ => mlir-tcp}/Dialect/IR/TcpDialect.h | 2 +- include/{ => mlir-tcp}/Dialect/IR/TcpEnums.td | 0 include/{ => mlir-tcp}/Dialect/IR/TcpOps.h | 6 +- include/{ => mlir-tcp}/Dialect/IR/TcpOps.td | 4 +- .../Dialect/Transforms/FuseTcpOpsPass.h | 0 .../Dialect/Transforms/IsolateGroupOpsPass.h | 0 .../Dialect/Transforms/Passes.h | 0 .../Dialect/Transforms/Passes.td | 0 .../Transforms/VerifyTcpBackendContractPass.h | 0 include/{ => mlir-tcp}/InitAll.h | 0 include/{ => mlir-tcp}/Pipeline/Pipeline.h | 0 lib/Conversion/PassDetail.h | 5 +- lib/Conversion/Passes.cpp | 25 ++----- .../StablehloToTcp/StablehloToTcp.cpp | 8 +-- lib/Conversion/TcpToArith/TcpToArith.cpp | 8 +-- lib/Conversion/TcpToLinalg/Elementwise.cpp | 7 +- lib/Conversion/TcpToLinalg/Misc.cpp | 7 +- lib/Conversion/TcpToLinalg/TcpToLinalg.cpp | 8 +-- lib/Conversion/TorchToTcp/DataMovement.cpp | 7 +- lib/Conversion/TorchToTcp/Elementwise.cpp | 7 +- lib/Conversion/TorchToTcp/Misc.cpp | 7 +- lib/Conversion/TorchToTcp/TorchToTcp.cpp | 18 ++++- lib/Conversion/TorchToTcp/Utils.cpp | 5 +- lib/Dialect/IR/TcpDialect.cpp | 14 ++-- lib/Dialect/IR/TcpOps.cpp | 4 +- lib/Dialect/Transforms/FuseTcpOpsPass.cpp | 9 +-- .../Transforms/IsolateGroupOpsPass.cpp | 10 +-- lib/Dialect/Transforms/PassDetail.h | 4 +- lib/Dialect/Transforms/Passes.cpp | 10 +-- .../VerifyTcpBackendContractPass.cpp | 8 ++- lib/InitAll.cpp | 9 +-- lib/Pipeline/Pipeline.cpp | 10 +-- third_party/.clang-format | 7 ++ tools/tcp-opt/tcp-opt.cpp | 5 +- 43 files changed, 166 insertions(+), 133 deletions(-) rename include/{ => mlir-tcp}/Conversion/Passes.h (100%) rename include/{ => mlir-tcp}/Conversion/Passes.td (93%) rename include/{ => mlir-tcp}/Conversion/StablehloToTcp/StablehloToTcp.h (93%) rename include/{ => mlir-tcp}/Conversion/TcpToArith/TcpToArith.h (93%) rename include/{ => mlir-tcp}/Conversion/TcpToLinalg/TcpToLinalg.h (93%) rename include/{ => mlir-tcp}/Conversion/TorchToTcp/TorchToTcp.h (88%) rename include/{ => mlir-tcp}/Dialect/IR/TcpBase.td (100%) rename include/{ => mlir-tcp}/Dialect/IR/TcpDialect.h (91%) rename include/{ => mlir-tcp}/Dialect/IR/TcpEnums.td (100%) rename include/{ => mlir-tcp}/Dialect/IR/TcpOps.h (85%) rename include/{ => mlir-tcp}/Dialect/IR/TcpOps.td (99%) rename include/{ => mlir-tcp}/Dialect/Transforms/FuseTcpOpsPass.h (100%) rename include/{ => mlir-tcp}/Dialect/Transforms/IsolateGroupOpsPass.h (100%) rename include/{ => mlir-tcp}/Dialect/Transforms/Passes.h (100%) rename include/{ => mlir-tcp}/Dialect/Transforms/Passes.td (100%) rename include/{ => mlir-tcp}/Dialect/Transforms/VerifyTcpBackendContractPass.h (100%) rename include/{ => mlir-tcp}/InitAll.h (100%) rename include/{ => mlir-tcp}/Pipeline/Pipeline.h (100%) create mode 100644 third_party/.clang-format diff --git a/.clang-format b/.clang-format index 9b3aa8b..f2a6543 100644 --- a/.clang-format +++ b/.clang-format @@ -1 +1,6 @@ +# 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 +# Also available under a BSD-style license. See LICENSE. + BasedOnStyle: LLVM diff --git a/BUILD b/BUILD index eaf6eda..beb114b 100644 --- a/BUILD +++ b/BUILD @@ -14,9 +14,9 @@ package( td_library( name = "TcpTdFiles", srcs = [ - "include/Dialect/IR/TcpBase.td", - "include/Dialect/IR/TcpEnums.td", - "include/Dialect/IR/TcpOps.td", + "include/mlir-tcp/Dialect/IR/TcpBase.td", + "include/mlir-tcp/Dialect/IR/TcpEnums.td", + "include/mlir-tcp/Dialect/IR/TcpOps.td", ], includes = ["include"], deps = [ @@ -31,15 +31,15 @@ gentbl_cc_library( tbl_outs = [ ( ["-gen-enum-decls"], - "include/Dialect/IR/TcpEnums.h.inc", + "include/mlir-tcp/Dialect/IR/TcpEnums.h.inc", ), ( ["-gen-enum-defs"], - "include/Dialect/IR/TcpEnums.cpp.inc", + "include/mlir-tcp/Dialect/IR/TcpEnums.cpp.inc", ), ], tblgen = "@llvm-project//mlir:mlir-tblgen", - td_file = "include/Dialect/IR/TcpOps.td", + td_file = "include/mlir-tcp/Dialect/IR/TcpOps.td", deps = [ ":TcpTdFiles", ], @@ -51,15 +51,15 @@ gentbl_cc_library( tbl_outs = [ ( ["-gen-attrdef-decls"], - "include/Dialect/IR/TcpAttrs.h.inc", + "include/mlir-tcp/Dialect/IR/TcpAttrs.h.inc", ), ( ["-gen-attrdef-defs"], - "include/Dialect/IR/TcpAttrs.cpp.inc", + "include/mlir-tcp/Dialect/IR/TcpAttrs.cpp.inc", ), ], tblgen = "@llvm-project//mlir:mlir-tblgen", - td_file = "include/Dialect/IR/TcpOps.td", + td_file = "include/mlir-tcp/Dialect/IR/TcpOps.td", deps = [ ":TcpTdFiles", ], @@ -71,29 +71,29 @@ gentbl_cc_library( tbl_outs = [ ( ["-gen-op-decls"], - "include/Dialect/IR/TcpOps.h.inc", + "include/mlir-tcp/Dialect/IR/TcpOps.h.inc", ), ( ["-gen-op-defs"], - "include/Dialect/IR/TcpOps.cpp.inc", + "include/mlir-tcp/Dialect/IR/TcpOps.cpp.inc", ), ( [ "-gen-dialect-decls", "-dialect=tcp", ], - "include/Dialect/IR/TcpDialect.h.inc", + "include/mlir-tcp/Dialect/IR/TcpDialect.h.inc", ), ( [ "-gen-dialect-defs", "-dialect=tcp", ], - "include/Dialect/IR/TcpDialect.cpp.inc", + "include/mlir-tcp/Dialect/IR/TcpDialect.cpp.inc", ), ], tblgen = "@llvm-project//mlir:mlir-tblgen", - td_file = "include/Dialect/IR/TcpOps.td", + td_file = "include/mlir-tcp/Dialect/IR/TcpOps.td", deps = [ ":TcpTdFiles", ], @@ -106,8 +106,8 @@ cc_library( "lib/Dialect/IR/TcpOps.cpp", ], hdrs = [ - "include/Dialect/IR/TcpDialect.h", - "include/Dialect/IR/TcpOps.h", + "include/mlir-tcp/Dialect/IR/TcpDialect.h", + "include/mlir-tcp/Dialect/IR/TcpOps.h", ], strip_include_prefix = "include", deps = [ @@ -124,7 +124,7 @@ cc_library( td_library( name = "TcpTransformsPassesTdFiles", srcs = [ - "include/Dialect/Transforms/Passes.td", + "include/mlir-tcp/Dialect/Transforms/Passes.td", ], deps = [ "@llvm-project//mlir:OpBaseTdFiles", @@ -138,11 +138,11 @@ gentbl_cc_library( tbl_outs = [ ( ["-gen-pass-decls"], - "include/Dialect/Transforms/Passes.h.inc", + "include/mlir-tcp/Dialect/Transforms/Passes.h.inc", ), ], tblgen = "@llvm-project//mlir:mlir-tblgen", - td_file = "include/Dialect/Transforms/Passes.td", + td_file = "include/mlir-tcp/Dialect/Transforms/Passes.td", deps = [ ":TcpTransformsPassesTdFiles", ], @@ -158,10 +158,10 @@ cc_library( "lib/Dialect/Transforms/VerifyTcpBackendContractPass.cpp", ], hdrs = [ - "include/Dialect/Transforms/FuseTcpOpsPass.h", - "include/Dialect/Transforms/IsolateGroupOpsPass.h", - "include/Dialect/Transforms/Passes.h", - "include/Dialect/Transforms/VerifyTcpBackendContractPass.h", + "include/mlir-tcp/Dialect/Transforms/FuseTcpOpsPass.h", + "include/mlir-tcp/Dialect/Transforms/IsolateGroupOpsPass.h", + "include/mlir-tcp/Dialect/Transforms/Passes.h", + "include/mlir-tcp/Dialect/Transforms/VerifyTcpBackendContractPass.h", ], strip_include_prefix = "include", deps = [ @@ -176,7 +176,7 @@ cc_library( td_library( name = "TcpConversionPassesTdFiles", srcs = [ - "include/Conversion/Passes.td", + "include/mlir-tcp/Conversion/Passes.td", ], includes = ["include"], ) @@ -189,11 +189,11 @@ gentbl_cc_library( [ "-gen-pass-decls", ], - "include/Conversion/Passes.h.inc", + "include/mlir-tcp/Conversion/Passes.h.inc", ), ], tblgen = "@llvm-project//mlir:mlir-tblgen", - td_file = "include/Conversion/Passes.td", + td_file = "include/mlir-tcp/Conversion/Passes.td", deps = [ ":TcpConversionPassesTdFiles", "@llvm-project//mlir:PassBaseTdFiles", @@ -206,7 +206,7 @@ cc_library( "lib/Conversion/Passes.cpp", ], hdrs = [ - "include/Conversion/Passes.h", + "include/mlir-tcp/Conversion/Passes.h", ], strip_include_prefix = "include", deps = [ @@ -224,7 +224,7 @@ cc_library( "lib/Conversion/TorchToTcp/*.h", "lib/Conversion/TorchToTcp/*.cpp", ]), - hdrs = glob(["include/Conversion/TorchToTcp/*.h"]), + hdrs = glob(["include/mlir-tcp/Conversion/TorchToTcp/*.h"]), strip_include_prefix = "include", deps = [ ":TcpConversionPassesIncGen", @@ -243,7 +243,7 @@ cc_library( "lib/Conversion/StablehloToTcp/StablehloToTcp.cpp", ], hdrs = [ - "include/Conversion/StablehloToTcp/StablehloToTcp.h", + "include/mlir-tcp/Conversion/StablehloToTcp/StablehloToTcp.h", ], strip_include_prefix = "include", deps = [ @@ -267,7 +267,7 @@ cc_library( "lib/Conversion/TcpToLinalg/TcpToLinalg.cpp", ], hdrs = [ - "include/Conversion/TcpToLinalg/TcpToLinalg.h", + "include/mlir-tcp/Conversion/TcpToLinalg/TcpToLinalg.h", ], strip_include_prefix = "include", deps = [ @@ -290,7 +290,7 @@ cc_library( "lib/Conversion/TcpToArith/TcpToArith.cpp", ], hdrs = [ - "include/Conversion/TcpToArith/TcpToArith.h", + "include/mlir-tcp/Conversion/TcpToArith/TcpToArith.h", ], strip_include_prefix = "include", deps = [ @@ -311,7 +311,7 @@ cc_library( "lib/InitAll.cpp", ], hdrs = [ - "include/InitAll.h", + "include/mlir-tcp/InitAll.h", ], strip_include_prefix = "include", deps = [ @@ -331,7 +331,7 @@ cc_library( "lib/Pipeline/Pipeline.cpp", ], hdrs = [ - "include/Pipeline/Pipeline.h", + "include/mlir-tcp/Pipeline/Pipeline.h", ], strip_include_prefix = "include", deps = [ diff --git a/include/Conversion/Passes.h b/include/mlir-tcp/Conversion/Passes.h similarity index 100% rename from include/Conversion/Passes.h rename to include/mlir-tcp/Conversion/Passes.h diff --git a/include/Conversion/Passes.td b/include/mlir-tcp/Conversion/Passes.td similarity index 93% rename from include/Conversion/Passes.td rename to include/mlir-tcp/Conversion/Passes.td index 798d789..73450d2 100644 --- a/include/Conversion/Passes.td +++ b/include/mlir-tcp/Conversion/Passes.td @@ -12,6 +12,10 @@ include "mlir/Pass/PassBase.td" +//===----------------------------------------------------------------------===// +// TorchToTcp +//===----------------------------------------------------------------------===// + def ConvertTorchToTcp : Pass<"convert-torch-to-tcp", "func::FuncOp"> { let summary = "Convert Torch ops to Tcp ops"; let description = [{ diff --git a/include/Conversion/StablehloToTcp/StablehloToTcp.h b/include/mlir-tcp/Conversion/StablehloToTcp/StablehloToTcp.h similarity index 93% rename from include/Conversion/StablehloToTcp/StablehloToTcp.h rename to include/mlir-tcp/Conversion/StablehloToTcp/StablehloToTcp.h index 8436673..bf4da2f 100644 --- a/include/Conversion/StablehloToTcp/StablehloToTcp.h +++ b/include/mlir-tcp/Conversion/StablehloToTcp/StablehloToTcp.h @@ -14,7 +14,7 @@ namespace mlir { #define GEN_PASS_DECL_CONVERTSTABLEHLOTOTCP -#include "Conversion/Passes.h.inc" +#include "mlir-tcp/Conversion/Passes.h.inc" namespace tcp { diff --git a/include/Conversion/TcpToArith/TcpToArith.h b/include/mlir-tcp/Conversion/TcpToArith/TcpToArith.h similarity index 93% rename from include/Conversion/TcpToArith/TcpToArith.h rename to include/mlir-tcp/Conversion/TcpToArith/TcpToArith.h index 56fb47f..a7e9036 100644 --- a/include/Conversion/TcpToArith/TcpToArith.h +++ b/include/mlir-tcp/Conversion/TcpToArith/TcpToArith.h @@ -14,7 +14,7 @@ namespace mlir { #define GEN_PASS_DECL_CONVERTTCPTOARITH -#include "Conversion/Passes.h.inc" +#include "mlir-tcp/Conversion/Passes.h.inc" namespace tcp { diff --git a/include/Conversion/TcpToLinalg/TcpToLinalg.h b/include/mlir-tcp/Conversion/TcpToLinalg/TcpToLinalg.h similarity index 93% rename from include/Conversion/TcpToLinalg/TcpToLinalg.h rename to include/mlir-tcp/Conversion/TcpToLinalg/TcpToLinalg.h index 4d11ab4..82475a9 100644 --- a/include/Conversion/TcpToLinalg/TcpToLinalg.h +++ b/include/mlir-tcp/Conversion/TcpToLinalg/TcpToLinalg.h @@ -14,7 +14,7 @@ namespace mlir { #define GEN_PASS_DECL_CONVERTTCPTOLINALG -#include "Conversion/Passes.h.inc" +#include "mlir-tcp/Conversion/Passes.h.inc" namespace tcp { diff --git a/include/Conversion/TorchToTcp/TorchToTcp.h b/include/mlir-tcp/Conversion/TorchToTcp/TorchToTcp.h similarity index 88% rename from include/Conversion/TorchToTcp/TorchToTcp.h rename to include/mlir-tcp/Conversion/TorchToTcp/TorchToTcp.h index dcf58a8..856d0f7 100644 --- a/include/Conversion/TorchToTcp/TorchToTcp.h +++ b/include/mlir-tcp/Conversion/TorchToTcp/TorchToTcp.h @@ -13,6 +13,10 @@ #include "mlir/Pass/Pass.h" namespace mlir { + +#define GEN_PASS_DECL_CONVERTTORCHTOTCP +#include "mlir-tcp/Conversion/Passes.h.inc" + namespace tcp { std::unique_ptr> createConvertTorchToTcpPass(); diff --git a/include/Dialect/IR/TcpBase.td b/include/mlir-tcp/Dialect/IR/TcpBase.td similarity index 100% rename from include/Dialect/IR/TcpBase.td rename to include/mlir-tcp/Dialect/IR/TcpBase.td diff --git a/include/Dialect/IR/TcpDialect.h b/include/mlir-tcp/Dialect/IR/TcpDialect.h similarity index 91% rename from include/Dialect/IR/TcpDialect.h rename to include/mlir-tcp/Dialect/IR/TcpDialect.h index f2826ce..255c17f 100644 --- a/include/Dialect/IR/TcpDialect.h +++ b/include/mlir-tcp/Dialect/IR/TcpDialect.h @@ -12,4 +12,4 @@ #include "mlir/IR/Dialect.h" #include "mlir/IR/OpDefinition.h" -#include "Dialect/IR/TcpDialect.h.inc" +#include "mlir-tcp/Dialect/IR/TcpDialect.h.inc" diff --git a/include/Dialect/IR/TcpEnums.td b/include/mlir-tcp/Dialect/IR/TcpEnums.td similarity index 100% rename from include/Dialect/IR/TcpEnums.td rename to include/mlir-tcp/Dialect/IR/TcpEnums.td diff --git a/include/Dialect/IR/TcpOps.h b/include/mlir-tcp/Dialect/IR/TcpOps.h similarity index 85% rename from include/Dialect/IR/TcpOps.h rename to include/mlir-tcp/Dialect/IR/TcpOps.h index 19fb5ec..c0ae2f9 100644 --- a/include/Dialect/IR/TcpOps.h +++ b/include/mlir-tcp/Dialect/IR/TcpOps.h @@ -19,8 +19,8 @@ #include "llvm/ADT/DenseMap.h" #include "llvm/ADT/TypeSwitch.h" -#include "Dialect/IR/TcpEnums.h.inc" +#include "mlir-tcp/Dialect/IR/TcpEnums.h.inc" #define GET_ATTRDEF_CLASSES -#include "Dialect/IR/TcpAttrs.h.inc" +#include "mlir-tcp/Dialect/IR/TcpAttrs.h.inc" #define GET_OP_CLASSES -#include "Dialect/IR/TcpOps.h.inc" +#include "mlir-tcp/Dialect/IR/TcpOps.h.inc" diff --git a/include/Dialect/IR/TcpOps.td b/include/mlir-tcp/Dialect/IR/TcpOps.td similarity index 99% rename from include/Dialect/IR/TcpOps.td rename to include/mlir-tcp/Dialect/IR/TcpOps.td index 0b5ffba..b9346b9 100644 --- a/include/Dialect/IR/TcpOps.td +++ b/include/mlir-tcp/Dialect/IR/TcpOps.td @@ -10,8 +10,8 @@ #ifndef TCP_OPS #define TCP_OPS -include "Dialect/IR/TcpBase.td" -include "Dialect/IR/TcpEnums.td" +include "mlir-tcp/Dialect/IR/TcpBase.td" +include "mlir-tcp/Dialect/IR/TcpEnums.td" include "mlir/IR/OpBase.td" diff --git a/include/Dialect/Transforms/FuseTcpOpsPass.h b/include/mlir-tcp/Dialect/Transforms/FuseTcpOpsPass.h similarity index 100% rename from include/Dialect/Transforms/FuseTcpOpsPass.h rename to include/mlir-tcp/Dialect/Transforms/FuseTcpOpsPass.h diff --git a/include/Dialect/Transforms/IsolateGroupOpsPass.h b/include/mlir-tcp/Dialect/Transforms/IsolateGroupOpsPass.h similarity index 100% rename from include/Dialect/Transforms/IsolateGroupOpsPass.h rename to include/mlir-tcp/Dialect/Transforms/IsolateGroupOpsPass.h diff --git a/include/Dialect/Transforms/Passes.h b/include/mlir-tcp/Dialect/Transforms/Passes.h similarity index 100% rename from include/Dialect/Transforms/Passes.h rename to include/mlir-tcp/Dialect/Transforms/Passes.h diff --git a/include/Dialect/Transforms/Passes.td b/include/mlir-tcp/Dialect/Transforms/Passes.td similarity index 100% rename from include/Dialect/Transforms/Passes.td rename to include/mlir-tcp/Dialect/Transforms/Passes.td diff --git a/include/Dialect/Transforms/VerifyTcpBackendContractPass.h b/include/mlir-tcp/Dialect/Transforms/VerifyTcpBackendContractPass.h similarity index 100% rename from include/Dialect/Transforms/VerifyTcpBackendContractPass.h rename to include/mlir-tcp/Dialect/Transforms/VerifyTcpBackendContractPass.h diff --git a/include/InitAll.h b/include/mlir-tcp/InitAll.h similarity index 100% rename from include/InitAll.h rename to include/mlir-tcp/InitAll.h diff --git a/include/Pipeline/Pipeline.h b/include/mlir-tcp/Pipeline/Pipeline.h similarity index 100% rename from include/Pipeline/Pipeline.h rename to include/mlir-tcp/Pipeline/Pipeline.h diff --git a/lib/Conversion/PassDetail.h b/lib/Conversion/PassDetail.h index 85a4149..05a1f4d 100644 --- a/lib/Conversion/PassDetail.h +++ b/lib/Conversion/PassDetail.h @@ -9,7 +9,8 @@ #pragma once -#include "Dialect/IR/TcpDialect.h" +#include "mlir-tcp/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" @@ -18,6 +19,6 @@ namespace mlir { #define GEN_PASS_CLASSES -#include "Conversion/Passes.h.inc" +#include "mlir-tcp/Conversion/Passes.h.inc" } // end namespace mlir diff --git a/lib/Conversion/Passes.cpp b/lib/Conversion/Passes.cpp index 1525249..dc8d508 100644 --- a/lib/Conversion/Passes.cpp +++ b/lib/Conversion/Passes.cpp @@ -7,12 +7,12 @@ // //===----------------------------------------------------------------------===// -#include "Conversion/Passes.h" +#include "mlir-tcp/Conversion/Passes.h" -#include "Conversion/StablehloToTcp/StablehloToTcp.h" -#include "Conversion/TcpToArith/TcpToArith.h" -#include "Conversion/TcpToLinalg/TcpToLinalg.h" -#include "Conversion/TorchToTcp/TorchToTcp.h" +#include "mlir-tcp/Conversion/StablehloToTcp/StablehloToTcp.h" +#include "mlir-tcp/Conversion/TcpToArith/TcpToArith.h" +#include "mlir-tcp/Conversion/TcpToLinalg/TcpToLinalg.h" +#include "mlir-tcp/Conversion/TorchToTcp/TorchToTcp.h" //===----------------------------------------------------------------------===// // Pass registration @@ -20,18 +20,7 @@ namespace { #define GEN_PASS_REGISTRATION -#include "Conversion/Passes.h.inc" +#include "mlir-tcp/Conversion/Passes.h.inc" } // end namespace -void mlir::tcp::registerConversionPasses() { - ::registerPasses(); - ::mlir::registerPass([]() -> std::unique_ptr<::mlir::Pass> { - return mlir::tcp::createConvertStablehloToTcpPass(); - }); - ::mlir::registerPass([]() -> std::unique_ptr<::mlir::Pass> { - return mlir::tcp::createConvertTcpToLinalgPass(); - }); - ::mlir::registerPass([]() -> std::unique_ptr<::mlir::Pass> { - return mlir::tcp::createConvertTcpToArithPass(); - }); -} +void mlir::tcp::registerConversionPasses() { ::registerPasses(); } diff --git a/lib/Conversion/StablehloToTcp/StablehloToTcp.cpp b/lib/Conversion/StablehloToTcp/StablehloToTcp.cpp index ad3dc74..5ad5171 100644 --- a/lib/Conversion/StablehloToTcp/StablehloToTcp.cpp +++ b/lib/Conversion/StablehloToTcp/StablehloToTcp.cpp @@ -7,10 +7,10 @@ // //===----------------------------------------------------------------------===// -#include "Conversion/StablehloToTcp/StablehloToTcp.h" +#include "mlir-tcp/Conversion/StablehloToTcp/StablehloToTcp.h" -#include "Dialect/IR/TcpDialect.h" -#include "Dialect/IR/TcpOps.h" +#include "mlir-tcp/Dialect/IR/TcpDialect.h" +#include "mlir-tcp/Dialect/IR/TcpOps.h" #include "../PassDetail.h" #include "mlir/IR/PatternMatch.h" @@ -23,7 +23,7 @@ namespace mlir { #define GEN_PASS_DEF_CONVERTTCPTOLINALG -#include "Conversion/Passes.h.inc" +#include "mlir-tcp/Conversion/Passes.h.inc" namespace tcp { diff --git a/lib/Conversion/TcpToArith/TcpToArith.cpp b/lib/Conversion/TcpToArith/TcpToArith.cpp index c0aff54..7cefdca 100644 --- a/lib/Conversion/TcpToArith/TcpToArith.cpp +++ b/lib/Conversion/TcpToArith/TcpToArith.cpp @@ -7,10 +7,10 @@ // //===----------------------------------------------------------------------===// -#include "Conversion/TcpToArith/TcpToArith.h" +#include "mlir-tcp/Conversion/TcpToArith/TcpToArith.h" -#include "Dialect/IR/TcpDialect.h" -#include "Dialect/IR/TcpOps.h" +#include "mlir-tcp/Dialect/IR/TcpDialect.h" +#include "mlir-tcp/Dialect/IR/TcpOps.h" #include "../PassDetail.h" #include "mlir/Dialect/Arith/IR/Arith.h" @@ -23,7 +23,7 @@ namespace mlir { #define GEN_PASS_DEF_CONVERTTCPTOLINALG -#include "Conversion/Passes.h.inc" +#include "mlir-tcp/Conversion/Passes.h.inc" namespace tcp { diff --git a/lib/Conversion/TcpToLinalg/Elementwise.cpp b/lib/Conversion/TcpToLinalg/Elementwise.cpp index 02871e4..7a32b1c 100644 --- a/lib/Conversion/TcpToLinalg/Elementwise.cpp +++ b/lib/Conversion/TcpToLinalg/Elementwise.cpp @@ -7,11 +7,12 @@ // //===----------------------------------------------------------------------===// -#include "Conversion/TcpToLinalg/TcpToLinalg.h" +#include "mlir-tcp/Conversion/TcpToLinalg/TcpToLinalg.h" + +#include "mlir-tcp/Dialect/IR/TcpDialect.h" +#include "mlir-tcp/Dialect/IR/TcpOps.h" #include "../PassDetail.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 f1bb891..27c08b0 100644 --- a/lib/Conversion/TcpToLinalg/Misc.cpp +++ b/lib/Conversion/TcpToLinalg/Misc.cpp @@ -7,11 +7,12 @@ // //===----------------------------------------------------------------------===// -#include "Conversion/TcpToLinalg/TcpToLinalg.h" +#include "mlir-tcp/Conversion/TcpToLinalg/TcpToLinalg.h" + +#include "mlir-tcp/Dialect/IR/TcpDialect.h" +#include "mlir-tcp/Dialect/IR/TcpOps.h" #include "../PassDetail.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 d82ceda..d94d602 100644 --- a/lib/Conversion/TcpToLinalg/TcpToLinalg.cpp +++ b/lib/Conversion/TcpToLinalg/TcpToLinalg.cpp @@ -7,10 +7,10 @@ // //===----------------------------------------------------------------------===// -#include "Conversion/TcpToLinalg/TcpToLinalg.h" +#include "mlir-tcp/Conversion/TcpToLinalg/TcpToLinalg.h" -#include "Dialect/IR/TcpDialect.h" -#include "Dialect/IR/TcpOps.h" +#include "mlir-tcp/Dialect/IR/TcpDialect.h" +#include "mlir-tcp/Dialect/IR/TcpOps.h" #include "../PassDetail.h" #include "PopulatePatterns.h" @@ -27,7 +27,7 @@ namespace mlir { #define GEN_PASS_DEF_CONVERTTCPTOLINALG -#include "Conversion/Passes.h.inc" +#include "mlir-tcp/Conversion/Passes.h.inc" namespace tcp { diff --git a/lib/Conversion/TorchToTcp/DataMovement.cpp b/lib/Conversion/TorchToTcp/DataMovement.cpp index 4d2cbca..d6868dd 100644 --- a/lib/Conversion/TorchToTcp/DataMovement.cpp +++ b/lib/Conversion/TorchToTcp/DataMovement.cpp @@ -7,10 +7,11 @@ // //===----------------------------------------------------------------------===// -#include "Conversion/TorchToTcp/TorchToTcp.h" +#include "mlir-tcp/Conversion/TorchToTcp/TorchToTcp.h" + +#include "mlir-tcp/Dialect/IR/TcpDialect.h" +#include "mlir-tcp/Dialect/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 c833378..9139163 100644 --- a/lib/Conversion/TorchToTcp/Elementwise.cpp +++ b/lib/Conversion/TorchToTcp/Elementwise.cpp @@ -7,10 +7,11 @@ // //===----------------------------------------------------------------------===// -#include "Conversion/TorchToTcp/TorchToTcp.h" +#include "mlir-tcp/Conversion/TorchToTcp/TorchToTcp.h" + +#include "mlir-tcp/Dialect/IR/TcpDialect.h" +#include "mlir-tcp/Dialect/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 d028c15..9ad168c 100644 --- a/lib/Conversion/TorchToTcp/Misc.cpp +++ b/lib/Conversion/TorchToTcp/Misc.cpp @@ -7,10 +7,11 @@ // //===----------------------------------------------------------------------===// -#include "Conversion/TorchToTcp/TorchToTcp.h" +#include "mlir-tcp/Conversion/TorchToTcp/TorchToTcp.h" + +#include "mlir-tcp/Dialect/IR/TcpDialect.h" +#include "mlir-tcp/Dialect/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 4bf1d4e..29eb4af 100644 --- a/lib/Conversion/TorchToTcp/TorchToTcp.cpp +++ b/lib/Conversion/TorchToTcp/TorchToTcp.cpp @@ -7,11 +7,12 @@ // //===----------------------------------------------------------------------===// -#include "Conversion/TorchToTcp/TorchToTcp.h" +#include "mlir-tcp/Conversion/TorchToTcp/TorchToTcp.h" + +#include "mlir-tcp/Dialect/IR/TcpDialect.h" +#include "mlir-tcp/Dialect/IR/TcpOps.h" #include "../PassDetail.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" @@ -29,7 +30,15 @@ using namespace mlir; using namespace mlir::torch; using namespace mlir::torch::Torch; +namespace mlir { + +#define GEN_PASS_DEF_CONVERTTORCHTOTCP +#include "mlir-tcp/Conversion/Passes.h.inc" + +namespace tcp { + namespace { + class ConvertTorchToTcp : public ConvertTorchToTcpBase { public: void getDependentDialects(DialectRegistry ®istry) const override { @@ -70,3 +79,6 @@ std::unique_ptr> mlir::tcp::createConvertTorchToTcpPass() { return std::make_unique(); } + +} // namespace tcp +} // namespace mlir diff --git a/lib/Conversion/TorchToTcp/Utils.cpp b/lib/Conversion/TorchToTcp/Utils.cpp index 05721c5..659b91b 100644 --- a/lib/Conversion/TorchToTcp/Utils.cpp +++ b/lib/Conversion/TorchToTcp/Utils.cpp @@ -9,8 +9,9 @@ #include "Utils.h" -#include "Dialect/IR/TcpDialect.h" -#include "Dialect/IR/TcpOps.h" +#include "mlir-tcp/Dialect/IR/TcpDialect.h" +#include "mlir-tcp/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/Dialect/IR/TcpDialect.cpp b/lib/Dialect/IR/TcpDialect.cpp index 548a5da..1fea643 100644 --- a/lib/Dialect/IR/TcpDialect.cpp +++ b/lib/Dialect/IR/TcpDialect.cpp @@ -7,8 +7,8 @@ // //===----------------------------------------------------------------------===// -#include "Dialect/IR/TcpDialect.h" -#include "Dialect/IR/TcpOps.h" +#include "mlir-tcp/Dialect/IR/TcpDialect.h" +#include "mlir-tcp/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 "Dialect/IR/TcpOps.cpp.inc" +#include "mlir-tcp/Dialect/IR/TcpOps.cpp.inc" >(); #define GET_ATTRDEF_LIST addAttributes< -#include "Dialect/IR/TcpAttrs.cpp.inc" +#include "mlir-tcp/Dialect/IR/TcpAttrs.cpp.inc" >(); } -#include "Dialect/IR/TcpEnums.cpp.inc" +#include "mlir-tcp/Dialect/IR/TcpEnums.cpp.inc" #define GET_ATTRDEF_CLASSES -#include "Dialect/IR/TcpAttrs.cpp.inc" +#include "mlir-tcp/Dialect/IR/TcpAttrs.cpp.inc" -#include "Dialect/IR/TcpDialect.cpp.inc" +#include "mlir-tcp/Dialect/IR/TcpDialect.cpp.inc" Attribute TcpDialect::parseAttribute(DialectAsmParser &parser, Type type) const { diff --git a/lib/Dialect/IR/TcpOps.cpp b/lib/Dialect/IR/TcpOps.cpp index 45b3a0b..37df55e 100644 --- a/lib/Dialect/IR/TcpOps.cpp +++ b/lib/Dialect/IR/TcpOps.cpp @@ -7,7 +7,7 @@ // //===----------------------------------------------------------------------===// -#include "Dialect/IR/TcpOps.h" +#include "mlir-tcp/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 "Dialect/IR/TcpOps.cpp.inc" +#include "mlir-tcp/Dialect/IR/TcpOps.cpp.inc" namespace mlir::tcp { diff --git a/lib/Dialect/Transforms/FuseTcpOpsPass.cpp b/lib/Dialect/Transforms/FuseTcpOpsPass.cpp index 40e49ba..9d6d452 100644 --- a/lib/Dialect/Transforms/FuseTcpOpsPass.cpp +++ b/lib/Dialect/Transforms/FuseTcpOpsPass.cpp @@ -7,12 +7,13 @@ // //===----------------------------------------------------------------------===// -#include "Dialect/Transforms/FuseTcpOpsPass.h" +#include "mlir-tcp/Dialect/Transforms/FuseTcpOpsPass.h" +#include "mlir-tcp/Dialect/IR/TcpDialect.h" +#include "mlir-tcp/Dialect/IR/TcpOps.h" +#include "mlir-tcp/Dialect/Transforms/Passes.h" + #include "./PassDetail.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/Dialect/Transforms/IsolateGroupOpsPass.cpp b/lib/Dialect/Transforms/IsolateGroupOpsPass.cpp index a9f4446..3951629 100644 --- a/lib/Dialect/Transforms/IsolateGroupOpsPass.cpp +++ b/lib/Dialect/Transforms/IsolateGroupOpsPass.cpp @@ -7,12 +7,14 @@ // //===----------------------------------------------------------------------===// -#include "Dialect/Transforms/IsolateGroupOpsPass.h" +#include "mlir-tcp/Dialect/Transforms/IsolateGroupOpsPass.h" + +#include "mlir-tcp/Dialect/IR/TcpDialect.h" +#include "mlir-tcp/Dialect/IR/TcpOps.h" +#include "mlir-tcp/Dialect/Transforms/Passes.h" + #include "./PassDetail.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/Dialect/Transforms/PassDetail.h b/lib/Dialect/Transforms/PassDetail.h index b9add88..05c0ca5 100644 --- a/lib/Dialect/Transforms/PassDetail.h +++ b/lib/Dialect/Transforms/PassDetail.h @@ -11,12 +11,12 @@ #include "mlir/Pass/Pass.h" -#include "Dialect/IR/TcpOps.h" +#include "mlir-tcp/Dialect/IR/TcpOps.h" namespace mlir::tcp { using namespace mlir; #define GEN_PASS_CLASSES -#include "Dialect/Transforms/Passes.h.inc" +#include "mlir-tcp/Dialect/Transforms/Passes.h.inc" } // end namespace mlir::tcp diff --git a/lib/Dialect/Transforms/Passes.cpp b/lib/Dialect/Transforms/Passes.cpp index 423b5e1..3bc92da 100644 --- a/lib/Dialect/Transforms/Passes.cpp +++ b/lib/Dialect/Transforms/Passes.cpp @@ -7,16 +7,16 @@ // //===----------------------------------------------------------------------===// -#include "Dialect/Transforms/Passes.h" -#include "Dialect/Transforms/FuseTcpOpsPass.h" -#include "Dialect/Transforms/IsolateGroupOpsPass.h" -#include "Dialect/Transforms/VerifyTcpBackendContractPass.h" +#include "mlir-tcp/Dialect/Transforms/Passes.h" +#include "mlir-tcp/Dialect/Transforms/FuseTcpOpsPass.h" +#include "mlir-tcp/Dialect/Transforms/IsolateGroupOpsPass.h" +#include "mlir-tcp/Dialect/Transforms/VerifyTcpBackendContractPass.h" #include "mlir/Pass/Pass.h" #include namespace { #define GEN_PASS_REGISTRATION -#include "Dialect/Transforms/Passes.h.inc" +#include "mlir-tcp/Dialect/Transforms/Passes.h.inc" } // end namespace void mlir::tcp::registerTcpPasses() { ::registerPasses(); } diff --git a/lib/Dialect/Transforms/VerifyTcpBackendContractPass.cpp b/lib/Dialect/Transforms/VerifyTcpBackendContractPass.cpp index 550a4fe..1f8898e 100644 --- a/lib/Dialect/Transforms/VerifyTcpBackendContractPass.cpp +++ b/lib/Dialect/Transforms/VerifyTcpBackendContractPass.cpp @@ -7,11 +7,13 @@ // //===----------------------------------------------------------------------===// -#include "Dialect/Transforms/VerifyTcpBackendContractPass.h" +#include "mlir-tcp/Dialect/Transforms/VerifyTcpBackendContractPass.h" + +#include "mlir-tcp/Dialect/IR/TcpDialect.h" +#include "mlir-tcp/Dialect/IR/TcpOps.h" + #include "./PassDetail.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/lib/InitAll.cpp b/lib/InitAll.cpp index df03085..34bd387 100644 --- a/lib/InitAll.cpp +++ b/lib/InitAll.cpp @@ -7,11 +7,12 @@ // //===----------------------------------------------------------------------===// -#include "InitAll.h" +#include "mlir-tcp/InitAll.h" + +#include "mlir-tcp/Conversion/Passes.h" +#include "mlir-tcp/Dialect/IR/TcpDialect.h" +#include "mlir-tcp/Dialect/Transforms/Passes.h" -#include "Conversion/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/Pipeline/Pipeline.cpp b/lib/Pipeline/Pipeline.cpp index cc28bd5..b174a72 100644 --- a/lib/Pipeline/Pipeline.cpp +++ b/lib/Pipeline/Pipeline.cpp @@ -7,13 +7,13 @@ // //===----------------------------------------------------------------------===// -#include "Pipeline/Pipeline.h" +#include "mlir-tcp/Pipeline/Pipeline.h" -#include "Dialect/Transforms/VerifyTcpBackendContractPass.h" +#include "mlir-tcp/Dialect/Transforms/VerifyTcpBackendContractPass.h" -#include "Conversion/TcpToArith/TcpToArith.h" -#include "Conversion/TcpToLinalg/TcpToLinalg.h" -#include "Conversion/TorchToTcp/TorchToTcp.h" +#include "mlir-tcp/Conversion/TcpToArith/TcpToArith.h" +#include "mlir-tcp/Conversion/TcpToLinalg/TcpToLinalg.h" +#include "mlir-tcp/Conversion/TorchToTcp/TorchToTcp.h" #include "mlir/Conversion/FuncToLLVM/ConvertFuncToLLVMPass.h" #include "mlir/Conversion/MathToLLVM/MathToLLVM.h" diff --git a/third_party/.clang-format b/third_party/.clang-format new file mode 100644 index 0000000..e9177be --- /dev/null +++ b/third_party/.clang-format @@ -0,0 +1,7 @@ +# 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 +# Also available under a BSD-style license. See LICENSE. + +DisableFormat: true +SortIncludes: false diff --git a/tools/tcp-opt/tcp-opt.cpp b/tools/tcp-opt/tcp-opt.cpp index 08bbd6e..9a21e76 100644 --- a/tools/tcp-opt/tcp-opt.cpp +++ b/tools/tcp-opt/tcp-opt.cpp @@ -12,9 +12,8 @@ #include "mlir/InitAllPasses.h" #include "mlir/Tools/mlir-opt/MlirOptMain.h" -#include "InitAll.h" - -#include "Pipeline/Pipeline.h" +#include "mlir-tcp/InitAll.h" +#include "mlir-tcp/Pipeline/Pipeline.h" #include "stablehlo/dialect/Register.h"