From: Jakub Kuderski Date: Thu, 29 Sep 2022 15:14:47 +0000 (-0400) Subject: [mlir][arith] Change dialect name from Arithmetic to Arith X-Git-Tag: upstream/17.0.6~32105 X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=abc362a1077b9cb4186e3e53a616589c7fed4387;p=platform%2Fupstream%2Fllvm.git [mlir][arith] Change dialect name from Arithmetic to Arith Suggested by @lattner in https://discourse.llvm.org/t/rfc-define-precise-arith-semantics/65507/22. Tested with: `ninja check-mlir check-mlir-integration check-mlir-mlir-spirv-cpu-runner check-mlir-mlir-vulkan-runner check-mlir-examples` and `bazel build --config=generic_clang @llvm-project//mlir:all`. Reviewed By: lattner, Mogball, rriddle, jpienaar, mehdi_amini Differential Revision: https://reviews.llvm.org/D134762 --- diff --git a/mlir/docs/AttributesAndTypes.md b/mlir/docs/AttributesAndTypes.md index ec168df..8d1307f 100644 --- a/mlir/docs/AttributesAndTypes.md +++ b/mlir/docs/AttributesAndTypes.md @@ -14,8 +14,8 @@ from the [MLIR LangRef](LangRef.md). Attributes are the mechanism for specifying constant data on operations in places where a variable is never allowed - e.g. the comparison predicate of a -[`arith.cmpi` operation](Dialects/ArithmeticOps.md#arithcmpi-mlirarithcmpiop), or -the underlying value of a [`arith.constant` operation](Dialects/ArithmeticOps.md#arithconstant-mlirarithconstantop). +[`arith.cmpi` operation](Dialects/ArithOps.md#arithcmpi-mlirarithcmpiop), or +the underlying value of a [`arith.constant` operation](Dialects/ArithOps.md#arithconstant-mlirarithconstantop). Each operation has an attribute dictionary, which associates a set of attribute names to attribute values. @@ -24,7 +24,7 @@ names to attribute values. Every SSA value, such as operation results or block arguments, in MLIR has a type defined by the type system. MLIR has an open type system with no fixed list of types, and there are no restrictions on the abstractions they represent. For example, take -the following [Arithmetic AddI operation](Dialects/ArithmeticOps.md#arithaddi-mlirarithaddiop): +the following [Arithmetic AddI operation](Dialects/ArithOps.md#arithaddi-mlirarithaddiop): ```mlir %result = arith.addi %lhs, %rhs : i64 diff --git a/mlir/docs/DefiningDialects.md b/mlir/docs/DefiningDialects.md index 7ef6ae0..245f3f0 100644 --- a/mlir/docs/DefiningDialects.md +++ b/mlir/docs/DefiningDialects.md @@ -13,7 +13,7 @@ Dialects are the mechanism by which to engage with and extend the MLIR ecosystem. They allow for defining new [attributes](LangRef.md#attributes), [operations](LangRef.md#operations), and [types](LangRef.md#type-system). Dialects are used to model a variety of different abstractions; from traditional -[arithmetic](Dialects/ArithmeticOps.md) to +[arithmetic](Dialects/ArithOps.md) to [pattern rewrites](Dialects/PDLOps.md); and is one of the most fundamental aspects of MLIR. @@ -122,7 +122,7 @@ dialect. Dialect dependencies can be recorded using the `dependentDialects` dial def MyDialect : Dialect { // Here we register the Arithmetic and Func dialect as dependencies of our `MyDialect`. let dependentDialects = [ - "arith::ArithmeticDialect", + "arith::ArithDialect", "func::FuncDialect" ]; } diff --git a/mlir/docs/Dialects/SPIR-V.md b/mlir/docs/Dialects/SPIR-V.md index c5f9a6f..2cdce18 100644 --- a/mlir/docs/Dialects/SPIR-V.md +++ b/mlir/docs/Dialects/SPIR-V.md @@ -1079,7 +1079,7 @@ returns an SSA value generated from an `spirv.mlir.addressof` operation. Using the above infrastructure, conversions are implemented from -* [Arithmetic Dialect][MlirArithmeticDialect] +* [Arith Dialect][MlirArithDialect] * [GPU Dialect][MlirGpuDialect] : A gpu.module is converted to a `spirv.module`. A gpu.function within this module is lowered as an entry function. diff --git a/mlir/docs/Dialects/Vector.md b/mlir/docs/Dialects/Vector.md index 348210f..2ebdc22 100644 --- a/mlir/docs/Dialects/Vector.md +++ b/mlir/docs/Dialects/Vector.md @@ -95,7 +95,7 @@ Vectors) are welcome future extensions. ### Virtual Vector Ops -Some existing Arithmetic and Vector Dialect on `n-D` `vector` types comprise: +Some existing Arith and Vector Dialect on `n-D` `vector` types comprise: ```mlir // Produces a vector<3x7x8xf32> diff --git a/mlir/docs/LangRef.md b/mlir/docs/LangRef.md index aacc617..861eb13e 100644 --- a/mlir/docs/LangRef.md +++ b/mlir/docs/LangRef.md @@ -744,7 +744,7 @@ attribute-value ::= attribute-alias | dialect-attribute | builtin-attribute Attributes are the mechanism for specifying constant data on operations in places where a variable is never allowed - e.g. the comparison predicate of a -[`cmpi` operation](Dialects/ArithmeticOps.md#arithcmpi-mlirarithcmpiop). Each operation has an +[`cmpi` operation](Dialects/ArithOps.md#arithcmpi-mlirarithcmpiop). Each operation has an attribute dictionary, which associates a set of attribute names to attribute values. MLIR's builtin dialect provides a rich set of [builtin attribute values](#builtin-attribute-values) out of the box (such as diff --git a/mlir/docs/Passes.md b/mlir/docs/Passes.md index 8553bc0..9b859f8 100644 --- a/mlir/docs/Passes.md +++ b/mlir/docs/Passes.md @@ -26,7 +26,7 @@ This document describes the available MLIR passes and their contracts. ## `arith` Dialect Passes -[include "ArithmeticPasses.md"] +[include "ArithPasses.md"] ## `func` Dialect Passes diff --git a/mlir/docs/Rationale/Rationale.md b/mlir/docs/Rationale/Rationale.md index a8e23ea..a3f378d 100644 --- a/mlir/docs/Rationale/Rationale.md +++ b/mlir/docs/Rationale/Rationale.md @@ -282,7 +282,7 @@ an external system, and should aim to reflect its design as closely as possible. ### Splitting floating point vs integer operations -The MLIR "Arithmetic" dialect splits many integer and floating point operations +The MLIR "Arith" dialect splits many integer and floating point operations into different categories, for example `arith.addf` vs `arith.addi` and `arith.cmpf` vs `arith.cmpi` ([following the design of LLVM](http://llvm.org/docs/LangRef.html#binary-operations)). diff --git a/mlir/docs/Tools/MLIRLSP.md b/mlir/docs/Tools/MLIRLSP.md index cdbf712..733b2ce 100644 --- a/mlir/docs/Tools/MLIRLSP.md +++ b/mlir/docs/Tools/MLIRLSP.md @@ -158,8 +158,8 @@ Example: ```yaml --- !FileInfo: - filepath: "/home/user/llvm/mlir/lib/Dialect/Arithmetic/IR/ArithmeticCanonicalization.pdll" - includes: "/home/user/llvm/mlir/lib/Dialect/Arithmetic/IR;/home/user/llvm/mlir/include" + filepath: "/home/user/llvm/mlir/lib/Dialect/Arith/IR/ArithCanonicalization.pdll" + includes: "/home/user/llvm/mlir/lib/Dialect/Arith/IR;/home/user/llvm/mlir/include" ``` - filepath: - Absolute file path of the file. @@ -284,8 +284,8 @@ Example: ```yaml --- !FileInfo: - filepath: "/home/user/llvm/mlir/lib/Dialect/Arithmetic/IR/ArithmeticCanonicalization.td" - includes: "/home/user/llvm/mlir/lib/Dialect/Arithmetic/IR;/home/user/llvm/mlir/include" + filepath: "/home/user/llvm/mlir/lib/Dialect/Arith/IR/ArithCanonicalization.td" + includes: "/home/user/llvm/mlir/lib/Dialect/Arith/IR;/home/user/llvm/mlir/include" ``` - filepath: - Absolute file path of the file. diff --git a/mlir/docs/Tutorials/Toy/Ch-5.md b/mlir/docs/Tutorials/Toy/Ch-5.md index a81af2a..8db5920 100644 --- a/mlir/docs/Tutorials/Toy/Ch-5.md +++ b/mlir/docs/Tutorials/Toy/Ch-5.md @@ -51,7 +51,7 @@ To use this framework, we need to provide two things (and an optional third): ## Conversion Target For our purposes, we want to convert the compute-intensive `Toy` operations into -a combination of operations from the `Affine`, `Arithmetic`, `Func`, and `MemRef` dialects +a combination of operations from the `Affine`, `Arith`, `Func`, and `MemRef` dialects for further optimization. To start off the lowering, we first define our conversion target: @@ -63,8 +63,8 @@ void ToyToAffineLoweringPass::runOnOperation() { // We define the specific operations, or dialects, that are legal targets for // this lowering. In our case, we are lowering to a combination of the - // `Affine`, `Arithmetic`, `Func`, and `MemRef` dialects. - target.addLegalDialect(); // We also define the Toy dialect as Illegal so that the conversion will fail diff --git a/mlir/docs/Tutorials/Toy/Ch-6.md b/mlir/docs/Tutorials/Toy/Ch-6.md index d6c7b8f..7fa9db0 100644 --- a/mlir/docs/Tutorials/Toy/Ch-6.md +++ b/mlir/docs/Tutorials/Toy/Ch-6.md @@ -95,7 +95,7 @@ multiple stages by relying on mlir::RewritePatternSet patterns(&getContext()); mlir::populateAffineToStdConversionPatterns(patterns, &getContext()); mlir::cf::populateSCFToControlFlowConversionPatterns(patterns, &getContext()); - mlir::arith::populateArithmeticToLLVMConversionPatterns(typeConverter, + mlir::arith::populateArithToLLVMConversionPatterns(typeConverter, patterns); mlir::populateFuncToLLVMConversionPatterns(typeConverter, patterns); mlir::cf::populateControlFlowToLLVMConversionPatterns(patterns, &getContext()); diff --git a/mlir/examples/standalone/standalone-opt/CMakeLists.txt b/mlir/examples/standalone/standalone-opt/CMakeLists.txt index ae459aa..27f8128 100644 --- a/mlir/examples/standalone/standalone-opt/CMakeLists.txt +++ b/mlir/examples/standalone/standalone-opt/CMakeLists.txt @@ -3,7 +3,7 @@ get_property(conversion_libs GLOBAL PROPERTY MLIR_CONVERSION_LIBS) set(LIBS ${dialect_libs} ${conversion_libs} - MLIRArithmeticDialect + MLIRArithDialect MLIROptLib MLIRStandalone ) diff --git a/mlir/examples/standalone/standalone-opt/standalone-opt.cpp b/mlir/examples/standalone/standalone-opt/standalone-opt.cpp index e84628f..4cf7e15 100644 --- a/mlir/examples/standalone/standalone-opt/standalone-opt.cpp +++ b/mlir/examples/standalone/standalone-opt/standalone-opt.cpp @@ -6,7 +6,7 @@ // //===----------------------------------------------------------------------===// -#include "mlir/Dialect/Arithmetic/IR/Arithmetic.h" +#include "mlir/Dialect/Arith/IR/Arith.h" #include "mlir/IR/Dialect.h" #include "mlir/IR/MLIRContext.h" #include "mlir/InitAllDialects.h" @@ -28,7 +28,7 @@ int main(int argc, char **argv) { mlir::DialectRegistry registry; registry.insert(); + mlir::arith::ArithDialect, mlir::func::FuncDialect>(); // Add the following to include *all* MLIR Core dialects, or selectively // include what you need like above. You only need to register dialects that // will be *parsed* by the tool, not the one generated diff --git a/mlir/examples/toy/Ch5/mlir/LowerToAffineLoops.cpp b/mlir/examples/toy/Ch5/mlir/LowerToAffineLoops.cpp index 5c8b1bc..4c0abc0 100644 --- a/mlir/examples/toy/Ch5/mlir/LowerToAffineLoops.cpp +++ b/mlir/examples/toy/Ch5/mlir/LowerToAffineLoops.cpp @@ -17,7 +17,7 @@ #include "toy/Passes.h" #include "mlir/Dialect/Affine/IR/AffineOps.h" -#include "mlir/Dialect/Arithmetic/IR/Arithmetic.h" +#include "mlir/Dialect/Arith/IR/Arith.h" #include "mlir/Dialect/Func/IR/FuncOps.h" #include "mlir/Dialect/MemRef/IR/MemRef.h" #include "mlir/Pass/Pass.h" @@ -327,10 +327,9 @@ void ToyToAffineLoweringPass::runOnOperation() { // We define the specific operations, or dialects, that are legal targets for // this lowering. In our case, we are lowering to a combination of the - // `Affine`, `Arithmetic`, `Func`, and `MemRef` dialects. - target - .addLegalDialect(); + // `Affine`, `Arith`, `Func`, and `MemRef` dialects. + target.addLegalDialect(); // We also define the Toy dialect as Illegal so that the conversion will fail // if any of these operations are *not* converted. Given that we actually want diff --git a/mlir/examples/toy/Ch6/mlir/LowerToAffineLoops.cpp b/mlir/examples/toy/Ch6/mlir/LowerToAffineLoops.cpp index 5c8b1bc..4c0abc0 100644 --- a/mlir/examples/toy/Ch6/mlir/LowerToAffineLoops.cpp +++ b/mlir/examples/toy/Ch6/mlir/LowerToAffineLoops.cpp @@ -17,7 +17,7 @@ #include "toy/Passes.h" #include "mlir/Dialect/Affine/IR/AffineOps.h" -#include "mlir/Dialect/Arithmetic/IR/Arithmetic.h" +#include "mlir/Dialect/Arith/IR/Arith.h" #include "mlir/Dialect/Func/IR/FuncOps.h" #include "mlir/Dialect/MemRef/IR/MemRef.h" #include "mlir/Pass/Pass.h" @@ -327,10 +327,9 @@ void ToyToAffineLoweringPass::runOnOperation() { // We define the specific operations, or dialects, that are legal targets for // this lowering. In our case, we are lowering to a combination of the - // `Affine`, `Arithmetic`, `Func`, and `MemRef` dialects. - target - .addLegalDialect(); + // `Affine`, `Arith`, `Func`, and `MemRef` dialects. + target.addLegalDialect(); // We also define the Toy dialect as Illegal so that the conversion will fail // if any of these operations are *not* converted. Given that we actually want diff --git a/mlir/examples/toy/Ch6/mlir/LowerToLLVM.cpp b/mlir/examples/toy/Ch6/mlir/LowerToLLVM.cpp index 6dfcb9f..9b5d1a7 100644 --- a/mlir/examples/toy/Ch6/mlir/LowerToLLVM.cpp +++ b/mlir/examples/toy/Ch6/mlir/LowerToLLVM.cpp @@ -26,7 +26,7 @@ #include "toy/Passes.h" #include "mlir/Conversion/AffineToStandard/AffineToStandard.h" -#include "mlir/Conversion/ArithmeticToLLVM/ArithmeticToLLVM.h" +#include "mlir/Conversion/ArithToLLVM/ArithToLLVM.h" #include "mlir/Conversion/ControlFlowToLLVM/ControlFlowToLLVM.h" #include "mlir/Conversion/FuncToLLVM/ConvertFuncToLLVM.h" #include "mlir/Conversion/FuncToLLVM/ConvertFuncToLLVMPass.h" @@ -35,7 +35,7 @@ #include "mlir/Conversion/MemRefToLLVM/MemRefToLLVM.h" #include "mlir/Conversion/SCFToControlFlow/SCFToControlFlow.h" #include "mlir/Dialect/Affine/IR/AffineOps.h" -#include "mlir/Dialect/Arithmetic/IR/Arithmetic.h" +#include "mlir/Dialect/Arith/IR/Arith.h" #include "mlir/Dialect/Func/IR/FuncOps.h" #include "mlir/Dialect/LLVMIR/LLVMDialect.h" #include "mlir/Dialect/MemRef/IR/MemRef.h" @@ -205,8 +205,7 @@ void ToyToLLVMLoweringPass::runOnOperation() { RewritePatternSet patterns(&getContext()); populateAffineToStdConversionPatterns(patterns); populateSCFToControlFlowConversionPatterns(patterns); - mlir::arith::populateArithmeticToLLVMConversionPatterns(typeConverter, - patterns); + mlir::arith::populateArithToLLVMConversionPatterns(typeConverter, patterns); populateMemRefToLLVMConversionPatterns(typeConverter, patterns); cf::populateControlFlowToLLVMConversionPatterns(typeConverter, patterns); populateFuncToLLVMConversionPatterns(typeConverter, patterns); diff --git a/mlir/examples/toy/Ch7/mlir/LowerToAffineLoops.cpp b/mlir/examples/toy/Ch7/mlir/LowerToAffineLoops.cpp index 5c8b1bc..4c0abc0 100644 --- a/mlir/examples/toy/Ch7/mlir/LowerToAffineLoops.cpp +++ b/mlir/examples/toy/Ch7/mlir/LowerToAffineLoops.cpp @@ -17,7 +17,7 @@ #include "toy/Passes.h" #include "mlir/Dialect/Affine/IR/AffineOps.h" -#include "mlir/Dialect/Arithmetic/IR/Arithmetic.h" +#include "mlir/Dialect/Arith/IR/Arith.h" #include "mlir/Dialect/Func/IR/FuncOps.h" #include "mlir/Dialect/MemRef/IR/MemRef.h" #include "mlir/Pass/Pass.h" @@ -327,10 +327,9 @@ void ToyToAffineLoweringPass::runOnOperation() { // We define the specific operations, or dialects, that are legal targets for // this lowering. In our case, we are lowering to a combination of the - // `Affine`, `Arithmetic`, `Func`, and `MemRef` dialects. - target - .addLegalDialect(); + // `Affine`, `Arith`, `Func`, and `MemRef` dialects. + target.addLegalDialect(); // We also define the Toy dialect as Illegal so that the conversion will fail // if any of these operations are *not* converted. Given that we actually want diff --git a/mlir/examples/toy/Ch7/mlir/LowerToLLVM.cpp b/mlir/examples/toy/Ch7/mlir/LowerToLLVM.cpp index 6dfcb9f..9b5d1a7 100644 --- a/mlir/examples/toy/Ch7/mlir/LowerToLLVM.cpp +++ b/mlir/examples/toy/Ch7/mlir/LowerToLLVM.cpp @@ -26,7 +26,7 @@ #include "toy/Passes.h" #include "mlir/Conversion/AffineToStandard/AffineToStandard.h" -#include "mlir/Conversion/ArithmeticToLLVM/ArithmeticToLLVM.h" +#include "mlir/Conversion/ArithToLLVM/ArithToLLVM.h" #include "mlir/Conversion/ControlFlowToLLVM/ControlFlowToLLVM.h" #include "mlir/Conversion/FuncToLLVM/ConvertFuncToLLVM.h" #include "mlir/Conversion/FuncToLLVM/ConvertFuncToLLVMPass.h" @@ -35,7 +35,7 @@ #include "mlir/Conversion/MemRefToLLVM/MemRefToLLVM.h" #include "mlir/Conversion/SCFToControlFlow/SCFToControlFlow.h" #include "mlir/Dialect/Affine/IR/AffineOps.h" -#include "mlir/Dialect/Arithmetic/IR/Arithmetic.h" +#include "mlir/Dialect/Arith/IR/Arith.h" #include "mlir/Dialect/Func/IR/FuncOps.h" #include "mlir/Dialect/LLVMIR/LLVMDialect.h" #include "mlir/Dialect/MemRef/IR/MemRef.h" @@ -205,8 +205,7 @@ void ToyToLLVMLoweringPass::runOnOperation() { RewritePatternSet patterns(&getContext()); populateAffineToStdConversionPatterns(patterns); populateSCFToControlFlowConversionPatterns(patterns); - mlir::arith::populateArithmeticToLLVMConversionPatterns(typeConverter, - patterns); + mlir::arith::populateArithToLLVMConversionPatterns(typeConverter, patterns); populateMemRefToLLVMConversionPatterns(typeConverter, patterns); cf::populateControlFlowToLLVMConversionPatterns(typeConverter, patterns); populateFuncToLLVMConversionPatterns(typeConverter, patterns); diff --git a/mlir/include/mlir/Conversion/ArithmeticToLLVM/ArithmeticToLLVM.h b/mlir/include/mlir/Conversion/ArithToLLVM/ArithToLLVM.h similarity index 50% rename from mlir/include/mlir/Conversion/ArithmeticToLLVM/ArithmeticToLLVM.h rename to mlir/include/mlir/Conversion/ArithToLLVM/ArithToLLVM.h index 09c72b8..b9f57cc 100644 --- a/mlir/include/mlir/Conversion/ArithmeticToLLVM/ArithmeticToLLVM.h +++ b/mlir/include/mlir/Conversion/ArithToLLVM/ArithToLLVM.h @@ -1,4 +1,4 @@ -//===- ArithmeticToLLVM.h - Arith to LLVM dialect conversion ----*- C++ -*-===// +//===- ArithToLLVM.h - Arith to LLVM dialect conversion ----*- C++ -*-===// // // Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions. // See https://llvm.org/LICENSE.txt for license information. @@ -6,8 +6,8 @@ // //===----------------------------------------------------------------------===// -#ifndef MLIR_CONVERSION_ARITHMETICTOLLVM_ARITHMETICTOLLVM_H -#define MLIR_CONVERSION_ARITHMETICTOLLVM_ARITHMETICTOLLVM_H +#ifndef MLIR_CONVERSION_ARITHTOLLVM_ARITHTOLLVM_H +#define MLIR_CONVERSION_ARITHTOLLVM_ARITHTOLLVM_H #include @@ -17,13 +17,13 @@ class LLVMTypeConverter; class RewritePatternSet; class Pass; -#define GEN_PASS_DECL_ARITHMETICTOLLVMCONVERSIONPASS +#define GEN_PASS_DECL_ARITHTOLLVMCONVERSIONPASS #include "mlir/Conversion/Passes.h.inc" namespace arith { -void populateArithmeticToLLVMConversionPatterns(LLVMTypeConverter &converter, - RewritePatternSet &patterns); +void populateArithToLLVMConversionPatterns(LLVMTypeConverter &converter, + RewritePatternSet &patterns); } // namespace arith } // namespace mlir -#endif // MLIR_CONVERSION_ARITHMETICTOLLVM_ARITHMETICTOLLVM_H +#endif // MLIR_CONVERSION_ARITHTOLLVM_ARITHTOLLVM_H diff --git a/mlir/include/mlir/Conversion/ArithToSPIRV/ArithToSPIRV.h b/mlir/include/mlir/Conversion/ArithToSPIRV/ArithToSPIRV.h new file mode 100644 index 0000000..bb30deb --- /dev/null +++ b/mlir/include/mlir/Conversion/ArithToSPIRV/ArithToSPIRV.h @@ -0,0 +1,32 @@ +//===- ArithToSPIRV.h - Convert Arith to SPIRV dialect -----*- C++ -*-===// +// +// Part of the LLVM Project, 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 MLIR_CONVERSION_ARITHTOSPIRV_ARITHTOSPIRV_H +#define MLIR_CONVERSION_ARITHTOSPIRV_ARITHTOSPIRV_H + +#include "mlir/Pass/Pass.h" +#include + +namespace mlir { + +class SPIRVTypeConverter; +class RewritePatternSet; +class Pass; + +#define GEN_PASS_DECL_CONVERTARITHTOSPIRV +#include "mlir/Conversion/Passes.h.inc" + +namespace arith { +void populateArithToSPIRVPatterns(SPIRVTypeConverter &typeConverter, + RewritePatternSet &patterns); + +std::unique_ptr> createConvertArithToSPIRVPass(); +} // namespace arith +} // namespace mlir + +#endif // MLIR_CONVERSION_ARITHTOSPIRV_ARITHTOSPIRV_H diff --git a/mlir/include/mlir/Conversion/ArithmeticToSPIRV/ArithmeticToSPIRV.h b/mlir/include/mlir/Conversion/ArithmeticToSPIRV/ArithmeticToSPIRV.h deleted file mode 100644 index 085b553..0000000 --- a/mlir/include/mlir/Conversion/ArithmeticToSPIRV/ArithmeticToSPIRV.h +++ /dev/null @@ -1,32 +0,0 @@ -//===- ArithmeticToSPIRV.h - Convert Arith to SPIRV dialect -----*- C++ -*-===// -// -// Part of the LLVM Project, 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 MLIR_CONVERSION_ARITHMETICTOSPIRV_ARITHMETICTOSPIRV_H -#define MLIR_CONVERSION_ARITHMETICTOSPIRV_ARITHMETICTOSPIRV_H - -#include "mlir/Pass/Pass.h" -#include - -namespace mlir { - -class SPIRVTypeConverter; -class RewritePatternSet; -class Pass; - -#define GEN_PASS_DECL_CONVERTARITHMETICTOSPIRV -#include "mlir/Conversion/Passes.h.inc" - -namespace arith { -void populateArithmeticToSPIRVPatterns(SPIRVTypeConverter &typeConverter, - RewritePatternSet &patterns); - -std::unique_ptr> createConvertArithmeticToSPIRVPass(); -} // namespace arith -} // namespace mlir - -#endif // MLIR_CONVERSION_ARITHMETICTOSPIRV_ARITHMETICTOSPIRV_H diff --git a/mlir/include/mlir/Conversion/Passes.h b/mlir/include/mlir/Conversion/Passes.h index 5163214..0eed459 100644 --- a/mlir/include/mlir/Conversion/Passes.h +++ b/mlir/include/mlir/Conversion/Passes.h @@ -11,8 +11,8 @@ #include "mlir/Conversion/AMDGPUToROCDL/AMDGPUToROCDL.h" #include "mlir/Conversion/AffineToStandard/AffineToStandard.h" -#include "mlir/Conversion/ArithmeticToLLVM/ArithmeticToLLVM.h" -#include "mlir/Conversion/ArithmeticToSPIRV/ArithmeticToSPIRV.h" +#include "mlir/Conversion/ArithToLLVM/ArithToLLVM.h" +#include "mlir/Conversion/ArithToSPIRV/ArithToSPIRV.h" #include "mlir/Conversion/ArmNeon2dToIntr/ArmNeon2dToIntr.h" #include "mlir/Conversion/AsyncToLLVM/AsyncToLLVM.h" #include "mlir/Conversion/BufferizationToMemRef/BufferizationToMemRef.h" diff --git a/mlir/include/mlir/Conversion/Passes.td b/mlir/include/mlir/Conversion/Passes.td index 7aa8fc0..8dc48cd 100644 --- a/mlir/include/mlir/Conversion/Passes.td +++ b/mlir/include/mlir/Conversion/Passes.td @@ -93,13 +93,13 @@ def ConvertAMDGPUToROCDL : Pass<"convert-amdgpu-to-rocdl"> { } //===----------------------------------------------------------------------===// -// ArithmeticToLLVM +// ArithToLLVM //===----------------------------------------------------------------------===// -def ArithmeticToLLVMConversionPass : Pass<"convert-arith-to-llvm"> { - let summary = "Convert Arithmetic dialect to LLVM dialect"; +def ArithToLLVMConversionPass : Pass<"convert-arith-to-llvm"> { + let summary = "Convert Arith dialect to LLVM dialect"; let description = [{ - This pass converts supported Arithmetic ops to LLVM dialect instructions. + This pass converts supported Arith ops to LLVM dialect instructions. }]; let dependentDialects = ["LLVM::LLVMDialect"]; let options = [ @@ -110,12 +110,12 @@ def ArithmeticToLLVMConversionPass : Pass<"convert-arith-to-llvm"> { } //===----------------------------------------------------------------------===// -// ArithmeticToSPIRV +// ArithToSPIRV //===----------------------------------------------------------------------===// -def ConvertArithmeticToSPIRV : Pass<"convert-arith-to-spirv"> { - let summary = "Convert Arithmetic dialect to SPIR-V dialect"; - let constructor = "mlir::arith::createConvertArithmeticToSPIRVPass()"; +def ConvertArithToSPIRV : Pass<"convert-arith-to-spirv"> { + let summary = "Convert Arith dialect to SPIR-V dialect"; + let constructor = "mlir::arith::createConvertArithToSPIRVPass()"; let dependentDialects = ["spirv::SPIRVDialect"]; let options = [ Option<"emulateNon32BitScalarTypes", "emulate-non-32-bit-scalar-types", @@ -152,7 +152,7 @@ def ConvertAsyncToLLVM : Pass<"convert-async-to-llvm", "ModuleOp"> { }]; let constructor = "mlir::createConvertAsyncToLLVMPass()"; let dependentDialects = [ - "arith::ArithmeticDialect", + "arith::ArithDialect", "async::AsyncDialect", "LLVM::LLVMDialect", ]; @@ -190,7 +190,7 @@ def ConvertBufferizationToMemRef : Pass<"convert-bufferization-to-memref"> { }]; let constructor = "mlir::createBufferizationToMemRefPass()"; - let dependentDialects = ["arith::ArithmeticDialect", "memref::MemRefDialect"]; + let dependentDialects = ["arith::ArithDialect", "memref::MemRefDialect"]; } //===----------------------------------------------------------------------===// @@ -486,7 +486,7 @@ def ConvertMathToLibm : Pass<"convert-math-to-libm", "ModuleOp"> { }]; let constructor = "mlir::createConvertMathToLibmPass()"; let dependentDialects = [ - "arith::ArithmeticDialect", + "arith::ArithDialect", "func::FuncDialect", "vector::VectorDialect", ]; @@ -528,7 +528,7 @@ def ConvertMathToFuncs : Pass<"convert-math-to-funcs", "ModuleOp"> { }]; let constructor = "mlir::createConvertMathToFuncsPass()"; let dependentDialects = [ - "arith::ArithmeticDialect", + "arith::ArithDialect", "cf::ControlFlowDialect", "func::FuncDialect", "vector::VectorDialect", @@ -778,7 +778,7 @@ def ConvertTensorToLinalg : Pass<"convert-tensor-to-linalg", "ModuleOp"> { let summary = "Convert some Tensor dialect ops to Linalg dialect"; let constructor = "mlir::createConvertTensorToLinalgPass()"; let dependentDialects = [ - "arith::ArithmeticDialect", + "arith::ArithDialect", "linalg::LinalgDialect", ]; } @@ -806,7 +806,7 @@ def ConvertTensorToSPIRV : Pass<"convert-tensor-to-spirv"> { def TosaToArith : Pass<"tosa-to-arith"> { let summary = "Lower TOSA to the Arith dialect"; let dependentDialects = [ - "arith::ArithmeticDialect", + "arith::ArithDialect", ]; let description = [{ Pass that converts TOSA operations to the equivalent operations using the diff --git a/mlir/include/mlir/Dialect/Affine/Analysis/AffineAnalysis.h b/mlir/include/mlir/Dialect/Affine/Analysis/AffineAnalysis.h index 3f4ac7d..fec0272 100644 --- a/mlir/include/mlir/Dialect/Affine/Analysis/AffineAnalysis.h +++ b/mlir/include/mlir/Dialect/Affine/Analysis/AffineAnalysis.h @@ -15,7 +15,7 @@ #ifndef MLIR_DIALECT_AFFINE_ANALYSIS_AFFINEANALYSIS_H #define MLIR_DIALECT_AFFINE_ANALYSIS_AFFINEANALYSIS_H -#include "mlir/Dialect/Arithmetic/IR/Arithmetic.h" +#include "mlir/Dialect/Arith/IR/Arith.h" #include "mlir/IR/Value.h" #include "llvm/ADT/Optional.h" #include "llvm/ADT/SmallVector.h" diff --git a/mlir/include/mlir/Dialect/Affine/IR/AffineOps.h b/mlir/include/mlir/Dialect/Affine/IR/AffineOps.h index 16902ba..686a51a 100644 --- a/mlir/include/mlir/Dialect/Affine/IR/AffineOps.h +++ b/mlir/include/mlir/Dialect/Affine/IR/AffineOps.h @@ -15,7 +15,7 @@ #define MLIR_DIALECT_AFFINE_IR_AFFINEOPS_H #include "mlir/Dialect/Affine/IR/AffineMemoryOpInterfaces.h" -#include "mlir/Dialect/Arithmetic/IR/Arithmetic.h" +#include "mlir/Dialect/Arith/IR/Arith.h" #include "mlir/IR/AffineMap.h" #include "mlir/IR/Builders.h" #include "mlir/Interfaces/ControlFlowInterfaces.h" diff --git a/mlir/include/mlir/Dialect/Affine/IR/AffineOps.td b/mlir/include/mlir/Dialect/Affine/IR/AffineOps.td index 8e04628..5015046 100644 --- a/mlir/include/mlir/Dialect/Affine/IR/AffineOps.td +++ b/mlir/include/mlir/Dialect/Affine/IR/AffineOps.td @@ -13,7 +13,7 @@ #ifndef AFFINE_OPS #define AFFINE_OPS -include "mlir/Dialect/Arithmetic/IR/ArithmeticBase.td" +include "mlir/Dialect/Arith/IR/ArithBase.td" include "mlir/Dialect/Affine/IR/AffineMemoryOpInterfaces.td" include "mlir/Interfaces/ControlFlowInterfaces.td" include "mlir/Interfaces/LoopLikeInterface.td" @@ -23,7 +23,7 @@ def Affine_Dialect : Dialect { let name = "affine"; let cppNamespace = "mlir"; let hasConstantMaterializer = 1; - let dependentDialects = ["arith::ArithmeticDialect"]; + let dependentDialects = ["arith::ArithDialect"]; } // Base class for Affine dialect ops. diff --git a/mlir/include/mlir/Dialect/Affine/Passes.td b/mlir/include/mlir/Dialect/Affine/Passes.td index 1f31bcc..63dc795 100644 --- a/mlir/include/mlir/Dialect/Affine/Passes.td +++ b/mlir/include/mlir/Dialect/Affine/Passes.td @@ -388,7 +388,7 @@ def LoopCoalescing : Pass<"affine-loop-coalescing", "func::FuncOp"> { let summary = "Coalesce nested loops with independent bounds into a single " "loop"; let constructor = "mlir::createLoopCoalescingPass()"; - let dependentDialects = ["arith::ArithmeticDialect"]; + let dependentDialects = ["arith::ArithDialect"]; } def SimplifyAffineStructures : Pass<"affine-simplify-structures", "func::FuncOp"> { diff --git a/mlir/include/mlir/Dialect/Arithmetic/CMakeLists.txt b/mlir/include/mlir/Dialect/Arith/CMakeLists.txt similarity index 100% rename from mlir/include/mlir/Dialect/Arithmetic/CMakeLists.txt rename to mlir/include/mlir/Dialect/Arith/CMakeLists.txt diff --git a/mlir/include/mlir/Dialect/Arithmetic/IR/Arithmetic.h b/mlir/include/mlir/Dialect/Arith/IR/Arith.h similarity index 89% rename from mlir/include/mlir/Dialect/Arithmetic/IR/Arithmetic.h rename to mlir/include/mlir/Dialect/Arith/IR/Arith.h index e6dd5f6..296ade9 100644 --- a/mlir/include/mlir/Dialect/Arithmetic/IR/Arithmetic.h +++ b/mlir/include/mlir/Dialect/Arith/IR/Arith.h @@ -1,12 +1,12 @@ -//===- Arithmetic.h - Arithmetic dialect --------------------------*- C++-*-==// +//===- Arith.h - Arith dialect ----0000000000----------------------*- C++-*-==// // // Part of the LLVM Project, 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 MLIR_DIALECT_ARITHMETIC_IR_ARITHMETIC_H_ -#define MLIR_DIALECT_ARITHMETIC_IR_ARITHMETIC_H_ +#ifndef MLIR_DIALECT_ARITH_IR_ARITH_H_ +#define MLIR_DIALECT_ARITH_IR_ARITH_H_ #include "mlir/IR/Dialect.h" #include "mlir/IR/OpDefinition.h" @@ -18,23 +18,23 @@ #include "mlir/Interfaces/VectorInterfaces.h" //===----------------------------------------------------------------------===// -// ArithmeticDialect +// ArithDialect //===----------------------------------------------------------------------===// -#include "mlir/Dialect/Arithmetic/IR/ArithmeticOpsDialect.h.inc" +#include "mlir/Dialect/Arith/IR/ArithOpsDialect.h.inc" //===----------------------------------------------------------------------===// -// Arithmetic Dialect Enum Attributes +// Arith Dialect Enum Attributes //===----------------------------------------------------------------------===// -#include "mlir/Dialect/Arithmetic/IR/ArithmeticOpsEnums.h.inc" +#include "mlir/Dialect/Arith/IR/ArithOpsEnums.h.inc" //===----------------------------------------------------------------------===// -// Arithmetic Dialect Operations +// Arith Dialect Operations //===----------------------------------------------------------------------===// #define GET_OP_CLASSES -#include "mlir/Dialect/Arithmetic/IR/ArithmeticOps.h.inc" +#include "mlir/Dialect/Arith/IR/ArithOps.h.inc" namespace mlir { namespace arith { @@ -128,4 +128,4 @@ arith::CmpIPredicate invertPredicate(arith::CmpIPredicate pred); } // namespace arith } // namespace mlir -#endif // MLIR_DIALECT_ARITHMETIC_IR_ARITHMETIC_H_ +#endif // MLIR_DIALECT_ARITH_IR_ARITH_H_ diff --git a/mlir/include/mlir/Dialect/Arithmetic/IR/ArithmeticBase.td b/mlir/include/mlir/Dialect/Arith/IR/ArithBase.td similarity index 92% rename from mlir/include/mlir/Dialect/Arithmetic/IR/ArithmeticBase.td rename to mlir/include/mlir/Dialect/Arith/IR/ArithBase.td index 30f47cf..aaaa3b0 100644 --- a/mlir/include/mlir/Dialect/Arithmetic/IR/ArithmeticBase.td +++ b/mlir/include/mlir/Dialect/Arith/IR/ArithBase.td @@ -1,4 +1,4 @@ -//===- ArithmeticBase.td - Base defs for arith dialect ------*- tablegen -*-==// +//===- ArithBase.td - Base defs for arith dialect -----------*- tablegen -*-==// // // Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions. // See https://llvm.org/LICENSE.txt for license information. @@ -6,17 +6,17 @@ // //===----------------------------------------------------------------------===// -#ifndef ARITHMETIC_BASE -#define ARITHMETIC_BASE +#ifndef ARITH_BASE +#define ARITH_BASE include "mlir/IR/EnumAttr.td" include "mlir/IR/OpBase.td" -def Arithmetic_Dialect : Dialect { +def Arith_Dialect : Dialect { let name = "arith"; let cppNamespace = "::mlir::arith"; let description = [{ - The arithmetic dialect is intended to hold basic integer and floating point + The arith dialect is intended to hold basic integer and floating point mathematical operations. This includes unary, binary, and ternary arithmetic ops, bitwise and shift ops, cast ops, and compare ops. Operations in this dialect also accept vectors and tensors of integers or floats. @@ -92,4 +92,4 @@ def AtomicRMWKindAttr : I64EnumAttr< let cppNamespace = "::mlir::arith"; } -#endif // ARITHMETIC_BASE +#endif // ARITH_BASE diff --git a/mlir/include/mlir/Dialect/Arithmetic/IR/ArithmeticOps.td b/mlir/include/mlir/Dialect/Arith/IR/ArithOps.td similarity index 98% rename from mlir/include/mlir/Dialect/Arithmetic/IR/ArithmeticOps.td rename to mlir/include/mlir/Dialect/Arith/IR/ArithOps.td index 7df5e77..c143f9a 100644 --- a/mlir/include/mlir/Dialect/Arithmetic/IR/ArithmeticOps.td +++ b/mlir/include/mlir/Dialect/Arith/IR/ArithOps.td @@ -1,4 +1,4 @@ -//===- ArithmeticOps.td - Arithmetic op definitions --------*- tablegen -*-===// +//===- ArithOps.td - Arith op definitions -------------*- tablegen -*-===// // // Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions. // See https://llvm.org/LICENSE.txt for license information. @@ -6,10 +6,10 @@ // //===----------------------------------------------------------------------===// -#ifndef ARITHMETIC_OPS -#define ARITHMETIC_OPS +#ifndef ARITH_OPS +#define ARITH_OPS -include "mlir/Dialect/Arithmetic/IR/ArithmeticBase.td" +include "mlir/Dialect/Arith/IR/ArithBase.td" include "mlir/Interfaces/CastInterfaces.td" include "mlir/Interfaces/InferIntRangeInterface.td" include "mlir/Interfaces/InferTypeOpInterface.td" @@ -18,34 +18,34 @@ include "mlir/Interfaces/VectorInterfaces.td" include "mlir/IR/BuiltinAttributeInterfaces.td" include "mlir/IR/OpAsmInterface.td" -// Base class for Arithmetic dialect ops. Ops in this dialect have no side +// Base class for Arith dialect ops. Ops in this dialect have no side // effects and can be applied element-wise to vectors and tensors. class Arith_Op traits = []> : - Op] # ElementwiseMappable.traits>; // Base class for integer and floating point arithmetic ops. All ops have one // result, require operands and results to be of the same type, and can accept // tensors or vectors of integers or floats. -class Arith_ArithmeticOp traits = []> : +class Arith_ArithOp traits = []> : Arith_Op; // Base class for unary arithmetic operations. class Arith_UnaryOp traits = []> : - Arith_ArithmeticOp { + Arith_ArithOp { let assemblyFormat = "$operand attr-dict `:` type($result)"; } // Base class for binary arithmetic operations. class Arith_BinaryOp traits = []> : - Arith_ArithmeticOp { + Arith_ArithOp { let assemblyFormat = "$lhs `,` $rhs attr-dict `:` type($result)"; } // Base class for ternary arithmetic operations. class Arith_TernaryOp traits = []> : - Arith_ArithmeticOp { + Arith_ArithOp { let assemblyFormat = "$a `,` $b `,` $c attr-dict `:` type($result)"; } @@ -126,7 +126,7 @@ class Arith_CompareOpOfAnyRank traits = []> : // ConstantOp //===----------------------------------------------------------------------===// -def Arith_ConstantOp : Op, AllTypesMatch<["value", "result"]>, @@ -150,7 +150,7 @@ def Arith_ConstantOp : Op createArithmeticBufferizePass(); +/// Create a pass to bufferize Arith ops. +std::unique_ptr createArithBufferizePass(); /// Create a pass to bufferize arith.constant ops. std::unique_ptr createConstantBufferizePass(uint64_t alignment = 0); -/// Adds patterns to emulate wide Arithmetic and Function ops over integer +/// Adds patterns to emulate wide Arith and Function ops over integer /// types into supported ones. This is done by splitting original power-of-two /// i2N integer types into two iN halves. void populateWideIntEmulationPatterns(WideIntEmulationConverter &typeConverter, RewritePatternSet &patterns); -/// Add patterns to expand Arithmetic ops for LLVM lowering. -void populateArithmeticExpandOpsPatterns(RewritePatternSet &patterns); +/// Add patterns to expand Arith ops for LLVM lowering. +void populateArithExpandOpsPatterns(RewritePatternSet &patterns); -/// Create a pass to legalize Arithmetic ops for LLVM lowering. -std::unique_ptr createArithmeticExpandOpsPass(); +/// Create a pass to legalize Arith ops for LLVM lowering. +std::unique_ptr createArithExpandOpsPass(); /// Create a pass to replace signed ops with unsigned ones where they are proven /// equivalent. -std::unique_ptr createArithmeticUnsignedWhenEquivalentPass(); +std::unique_ptr createArithUnsignedWhenEquivalentPass(); //===----------------------------------------------------------------------===// // Registration @@ -47,9 +47,9 @@ std::unique_ptr createArithmeticUnsignedWhenEquivalentPass(); /// Generate the code for registering passes. #define GEN_PASS_REGISTRATION -#include "mlir/Dialect/Arithmetic/Transforms/Passes.h.inc" +#include "mlir/Dialect/Arith/Transforms/Passes.h.inc" } // namespace arith } // namespace mlir -#endif // MLIR_DIALECT_ARITHMETIC_TRANSFORMS_PASSES_H_ +#endif // MLIR_DIALECT_ARITH_TRANSFORMS_PASSES_H_ diff --git a/mlir/include/mlir/Dialect/Arithmetic/Transforms/Passes.td b/mlir/include/mlir/Dialect/Arith/Transforms/Passes.td similarity index 72% rename from mlir/include/mlir/Dialect/Arithmetic/Transforms/Passes.td rename to mlir/include/mlir/Dialect/Arith/Transforms/Passes.td index 3895562..e642dc5 100644 --- a/mlir/include/mlir/Dialect/Arithmetic/Transforms/Passes.td +++ b/mlir/include/mlir/Dialect/Arith/Transforms/Passes.td @@ -1,4 +1,4 @@ -//===-- Passes.td - Arithmetic pass definition file --------*- tablegen -*-===// +//===-- Passes.td - Arith pass definition file --------*- tablegen -*-===// // // Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions. // See https://llvm.org/LICENSE.txt for license information. @@ -6,13 +6,13 @@ // //===----------------------------------------------------------------------===// -#ifndef MLIR_DIALECT_ARITHMETIC_TRANSFORMS_PASSES -#define MLIR_DIALECT_ARITHMETIC_TRANSFORMS_PASSES +#ifndef MLIR_DIALECT_ARITH_TRANSFORMS_PASSES +#define MLIR_DIALECT_ARITH_TRANSFORMS_PASSES include "mlir/Pass/PassBase.td" -def ArithmeticBufferize : Pass<"arith-bufferize", "ModuleOp"> { - let summary = "Bufferize Arithmetic dialect ops."; +def ArithBufferize : Pass<"arith-bufferize", "ModuleOp"> { + let summary = "Bufferize Arith dialect ops."; let description = [{ This pass bufferizes arith dialect ops. @@ -21,19 +21,19 @@ def ArithmeticBufferize : Pass<"arith-bufferize", "ModuleOp"> { multi-threading. Most other bufferization passes can run in parallel at function granularity. }]; - let constructor = "mlir::arith::createArithmeticBufferizePass()"; + let constructor = "mlir::arith::createArithBufferizePass()"; let options = [ Option<"alignment", "alignment", "unsigned", /*default=*/"0", "Create global memrefs with a specified alignment">, ]; } -def ArithmeticExpandOps : Pass<"arith-expand"> { - let summary = "Legalize Arithmetic ops to be convertible to LLVM."; - let constructor = "mlir::arith::createArithmeticExpandOpsPass()"; +def ArithExpandOps : Pass<"arith-expand"> { + let summary = "Legalize Arith ops to be convertible to LLVM."; + let constructor = "mlir::arith::createArithExpandOpsPass()"; } -def ArithmeticUnsignedWhenEquivalent : Pass<"arith-unsigned-when-equivalent"> { +def ArithUnsignedWhenEquivalent : Pass<"arith-unsigned-when-equivalent"> { let summary = "Replace signed ops with unsigned ones where they are proven equivalent"; let description = [{ Replace signed ops with their unsigned equivalents when integer range analysis @@ -46,10 +46,10 @@ def ArithmeticUnsignedWhenEquivalent : Pass<"arith-unsigned-when-equivalent"> { The affect ops include division, remainder, shifts, min, max, and integer comparisons. }]; - let constructor = "mlir::arith::createArithmeticUnsignedWhenEquivalentPass()"; + let constructor = "mlir::arith::createArithUnsignedWhenEquivalentPass()"; } -def ArithmeticEmulateWideInt : Pass<"arith-emulate-wide-int"> { +def ArithEmulateWideInt : Pass<"arith-emulate-wide-int"> { let summary = "Emulate 2*N-bit integer operations using N-bit operations"; let description = [{ Emulate integer operations that use too wide integer types with equivalent @@ -69,4 +69,4 @@ def ArithmeticEmulateWideInt : Pass<"arith-emulate-wide-int"> { let dependentDialects = ["vector::VectorDialect"]; } -#endif // MLIR_DIALECT_ARITHMETIC_TRANSFORMS_PASSES +#endif // MLIR_DIALECT_ARITH_TRANSFORMS_PASSES diff --git a/mlir/include/mlir/Dialect/Arithmetic/Transforms/WideIntEmulationConverter.h b/mlir/include/mlir/Dialect/Arith/Transforms/WideIntEmulationConverter.h similarity index 86% rename from mlir/include/mlir/Dialect/Arithmetic/Transforms/WideIntEmulationConverter.h rename to mlir/include/mlir/Dialect/Arith/Transforms/WideIntEmulationConverter.h index 814db23..ea0ab14 100644 --- a/mlir/include/mlir/Dialect/Arithmetic/Transforms/WideIntEmulationConverter.h +++ b/mlir/include/mlir/Dialect/Arith/Transforms/WideIntEmulationConverter.h @@ -6,8 +6,8 @@ // //===----------------------------------------------------------------------===// -#ifndef MLIR_DIALECT_ARITHMETIC_WIDE_INT_EMULATION_CONVERTER_H_ -#define MLIR_DIALECT_ARITHMETIC_WIDE_INT_EMULATION_CONVERTER_H_ +#ifndef MLIR_DIALECT_ARITH_WIDE_INT_EMULATION_CONVERTER_H_ +#define MLIR_DIALECT_ARITH_WIDE_INT_EMULATION_CONVERTER_H_ #include "mlir/Transforms/DialectConversion.h" @@ -31,4 +31,4 @@ private: }; } // namespace mlir::arith -#endif // MLIR_DIALECT_ARITHMETIC_WIDE_INT_EMULATION_CONVERTER_H_ +#endif // MLIR_DIALECT_ARITH_WIDE_INT_EMULATION_CONVERTER_H_ diff --git a/mlir/include/mlir/Dialect/Arithmetic/Utils/Utils.h b/mlir/include/mlir/Dialect/Arith/Utils/Utils.h similarity index 92% rename from mlir/include/mlir/Dialect/Arithmetic/Utils/Utils.h rename to mlir/include/mlir/Dialect/Arith/Utils/Utils.h index fd11bd3..d307330 100644 --- a/mlir/include/mlir/Dialect/Arithmetic/Utils/Utils.h +++ b/mlir/include/mlir/Dialect/Arith/Utils/Utils.h @@ -1,4 +1,4 @@ -//===- Utils.h - General Arithmetic transformation utilities ----*- C++ -*-===// +//===- Utils.h - General Arith transformation utilities ----*- C++ -*-===// // // Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions. // See https://llvm.org/LICENSE.txt for license information. @@ -7,16 +7,16 @@ //===----------------------------------------------------------------------===// // // This header file defines prototypes for various transformation utilities for -// the Arithmetic dialect. These are not passes by themselves but are used +// the Arith dialect. These are not passes by themselves but are used // either by passes, optimization sequences, or in turn by other transformation // utilities. // //===----------------------------------------------------------------------===// -#ifndef MLIR_DIALECT_ARITHMETIC_UTILS_UTILS_H -#define MLIR_DIALECT_ARITHMETIC_UTILS_UTILS_H +#ifndef MLIR_DIALECT_ARITH_UTILS_UTILS_H +#define MLIR_DIALECT_ARITH_UTILS_UTILS_H -#include "mlir/Dialect/Arithmetic/IR/Arithmetic.h" +#include "mlir/Dialect/Arith/IR/Arith.h" #include "mlir/IR/Matchers.h" #include "mlir/IR/PatternMatch.h" #include "mlir/IR/Value.h" @@ -111,4 +111,4 @@ private: }; } // namespace mlir -#endif // MLIR_DIALECT_ARITHMETIC_UTILS_UTILS_H +#endif // MLIR_DIALECT_ARITH_UTILS_UTILS_H diff --git a/mlir/include/mlir/Dialect/Arithmetic/IR/CMakeLists.txt b/mlir/include/mlir/Dialect/Arithmetic/IR/CMakeLists.txt deleted file mode 100644 index c34d9cc..0000000 --- a/mlir/include/mlir/Dialect/Arithmetic/IR/CMakeLists.txt +++ /dev/null @@ -1,5 +0,0 @@ -set(LLVM_TARGET_DEFINITIONS ArithmeticOps.td) -mlir_tablegen(ArithmeticOpsEnums.h.inc -gen-enum-decls) -mlir_tablegen(ArithmeticOpsEnums.cpp.inc -gen-enum-defs) -add_mlir_dialect(ArithmeticOps arith) -add_mlir_doc(ArithmeticOps ArithmeticOps Dialects/ -gen-dialect-doc) diff --git a/mlir/include/mlir/Dialect/Arithmetic/Transforms/CMakeLists.txt b/mlir/include/mlir/Dialect/Arithmetic/Transforms/CMakeLists.txt deleted file mode 100644 index 0d6f025..0000000 --- a/mlir/include/mlir/Dialect/Arithmetic/Transforms/CMakeLists.txt +++ /dev/null @@ -1,5 +0,0 @@ -set(LLVM_TARGET_DEFINITIONS Passes.td) -mlir_tablegen(Passes.h.inc -gen-pass-decls -name Arithmetic) -add_public_tablegen_target(MLIRArithmeticTransformsIncGen) - -add_mlir_doc(Passes ArithmeticPasses ./ -gen-pass-doc) diff --git a/mlir/include/mlir/Dialect/Async/Passes.td b/mlir/include/mlir/Dialect/Async/Passes.td index 8eb1eef..76311b5 100644 --- a/mlir/include/mlir/Dialect/Async/Passes.td +++ b/mlir/include/mlir/Dialect/Async/Passes.td @@ -34,7 +34,7 @@ def AsyncParallelFor : Pass<"async-parallel-for", "ModuleOp"> { ]; let dependentDialects = [ - "arith::ArithmeticDialect", + "arith::ArithDialect", "async::AsyncDialect", "scf::SCFDialect" ]; diff --git a/mlir/include/mlir/Dialect/Bufferization/Transforms/BufferUtils.h b/mlir/include/mlir/Dialect/Bufferization/Transforms/BufferUtils.h index 130295f..6c521ac 100644 --- a/mlir/include/mlir/Dialect/Bufferization/Transforms/BufferUtils.h +++ b/mlir/include/mlir/Dialect/Bufferization/Transforms/BufferUtils.h @@ -15,7 +15,7 @@ #define MLIR_DIALECT_BUFFERIZATION_TRANSFORMS_BUFFERUTILS_H #include "mlir/Analysis/Liveness.h" -#include "mlir/Dialect/Arithmetic/IR/Arithmetic.h" +#include "mlir/Dialect/Arith/IR/Arith.h" #include "mlir/Dialect/Bufferization/Transforms/BufferViewFlowAnalysis.h" #include "mlir/IR/Builders.h" #include "mlir/IR/BuiltinOps.h" diff --git a/mlir/include/mlir/Dialect/CMakeLists.txt b/mlir/include/mlir/Dialect/CMakeLists.txt index 22505ba..4ebdb54 100644 --- a/mlir/include/mlir/Dialect/CMakeLists.txt +++ b/mlir/include/mlir/Dialect/CMakeLists.txt @@ -1,7 +1,7 @@ add_subdirectory(AMDGPU) add_subdirectory(AMX) add_subdirectory(Affine) -add_subdirectory(Arithmetic) +add_subdirectory(Arith) add_subdirectory(ArmNeon) add_subdirectory(ArmSVE) add_subdirectory(Async) diff --git a/mlir/include/mlir/Dialect/Complex/IR/ComplexBase.td b/mlir/include/mlir/Dialect/Complex/IR/ComplexBase.td index e346190..31135fc 100644 --- a/mlir/include/mlir/Dialect/Complex/IR/ComplexBase.td +++ b/mlir/include/mlir/Dialect/Complex/IR/ComplexBase.td @@ -19,7 +19,7 @@ def Complex_Dialect : Dialect { arithmetic ops. }]; - let dependentDialects = ["arith::ArithmeticDialect"]; + let dependentDialects = ["arith::ArithDialect"]; let hasConstantMaterializer = 1; let useDefaultAttributePrinterParser = 1; } diff --git a/mlir/include/mlir/Dialect/ControlFlow/IR/ControlFlowOps.td b/mlir/include/mlir/Dialect/ControlFlow/IR/ControlFlowOps.td index 7cb22d8..5497455 100644 --- a/mlir/include/mlir/Dialect/ControlFlow/IR/ControlFlowOps.td +++ b/mlir/include/mlir/Dialect/ControlFlow/IR/ControlFlowOps.td @@ -22,7 +22,7 @@ include "mlir/Interfaces/SideEffectInterfaces.td" def ControlFlow_Dialect : Dialect { let name = "cf"; let cppNamespace = "::mlir::cf"; - let dependentDialects = ["arith::ArithmeticDialect"]; + let dependentDialects = ["arith::ArithDialect"]; let description = [{ This dialect contains low-level, i.e. non-region based, control flow constructs. These constructs generally represent control flow directly diff --git a/mlir/include/mlir/Dialect/GPU/IR/GPUBase.td b/mlir/include/mlir/Dialect/GPU/IR/GPUBase.td index 0258a9b..263e51c 100644 --- a/mlir/include/mlir/Dialect/GPU/IR/GPUBase.td +++ b/mlir/include/mlir/Dialect/GPU/IR/GPUBase.td @@ -53,7 +53,7 @@ def GPU_Dialect : Dialect { static unsigned getPrivateAddressSpace() { return 5; } }]; - let dependentDialects = ["arith::ArithmeticDialect"]; + let dependentDialects = ["arith::ArithDialect"]; let useDefaultAttributePrinterParser = 1; let useDefaultTypePrinterParser = 1; diff --git a/mlir/include/mlir/Dialect/Linalg/IR/LinalgBase.td b/mlir/include/mlir/Dialect/Linalg/IR/LinalgBase.td index f55f093..e60b597 100644 --- a/mlir/include/mlir/Dialect/Linalg/IR/LinalgBase.td +++ b/mlir/include/mlir/Dialect/Linalg/IR/LinalgBase.td @@ -35,7 +35,7 @@ def Linalg_Dialect : Dialect { }]; let cppNamespace = "::mlir::linalg"; let dependentDialects = [ - "arith::ArithmeticDialect", + "arith::ArithDialect", "AffineDialect", "math::MathDialect", "memref::MemRefDialect", diff --git a/mlir/include/mlir/Dialect/MemRef/IR/MemRefBase.td b/mlir/include/mlir/Dialect/MemRef/IR/MemRefBase.td index 00e7614..a62af7c 100644 --- a/mlir/include/mlir/Dialect/MemRef/IR/MemRefBase.td +++ b/mlir/include/mlir/Dialect/MemRef/IR/MemRefBase.td @@ -19,7 +19,7 @@ def MemRef_Dialect : Dialect { manipulation ops, which are not strongly associated with any particular other dialect or domain abstraction. }]; - let dependentDialects = ["arith::ArithmeticDialect"]; + let dependentDialects = ["arith::ArithDialect"]; let hasConstantMaterializer = 1; let emitAccessorPrefix = kEmitAccessorPrefix_Both; diff --git a/mlir/include/mlir/Dialect/MemRef/IR/MemRefOps.td b/mlir/include/mlir/Dialect/MemRef/IR/MemRefOps.td index 7445451..6b0a5e2 100644 --- a/mlir/include/mlir/Dialect/MemRef/IR/MemRefOps.td +++ b/mlir/include/mlir/Dialect/MemRef/IR/MemRefOps.td @@ -9,7 +9,7 @@ #ifndef MEMREF_OPS #define MEMREF_OPS -include "mlir/Dialect/Arithmetic/IR/ArithmeticBase.td" +include "mlir/Dialect/Arith/IR/ArithBase.td" include "mlir/Dialect/MemRef/IR/MemRefBase.td" include "mlir/Interfaces/CastInterfaces.td" include "mlir/Interfaces/ControlFlowInterfaces.td" diff --git a/mlir/include/mlir/Dialect/SCF/IR/SCFOps.td b/mlir/include/mlir/Dialect/SCF/IR/SCFOps.td index 0fa0645..b7bd4fd 100644 --- a/mlir/include/mlir/Dialect/SCF/IR/SCFOps.td +++ b/mlir/include/mlir/Dialect/SCF/IR/SCFOps.td @@ -23,7 +23,7 @@ include "mlir/Interfaces/ViewLikeInterface.td" def SCF_Dialect : Dialect { let name = "scf"; let cppNamespace = "::mlir::scf"; - let dependentDialects = ["arith::ArithmeticDialect"]; + let dependentDialects = ["arith::ArithDialect"]; } // Base class for SCF dialect ops. diff --git a/mlir/include/mlir/Dialect/Shape/IR/ShapeBase.td b/mlir/include/mlir/Dialect/Shape/IR/ShapeBase.td index aca9215..993092d 100644 --- a/mlir/include/mlir/Dialect/Shape/IR/ShapeBase.td +++ b/mlir/include/mlir/Dialect/Shape/IR/ShapeBase.td @@ -36,7 +36,7 @@ def ShapeDialect : Dialect { }]; let cppNamespace = "::mlir::shape"; - let dependentDialects = ["arith::ArithmeticDialect", "tensor::TensorDialect"]; + let dependentDialects = ["arith::ArithDialect", "tensor::TensorDialect"]; let useDefaultTypePrinterParser = 1; let hasConstantMaterializer = 1; diff --git a/mlir/include/mlir/Dialect/Shape/Transforms/Passes.h b/mlir/include/mlir/Dialect/Shape/Transforms/Passes.h index a29cf7a..be3c741 100644 --- a/mlir/include/mlir/Dialect/Shape/Transforms/Passes.h +++ b/mlir/include/mlir/Dialect/Shape/Transforms/Passes.h @@ -30,9 +30,8 @@ namespace mlir { #include "mlir/Dialect/Shape/Transforms/Passes.h.inc" /// Creates an instance of the ShapeToShapeLowering pass that legalizes Shape -/// dialect to be convertible to Arithmetic. For example, `shape.num_elements` -/// get transformed to `shape.reduce`, which can be lowered to SCF and -/// Arithmetic. +/// dialect to be convertible to Arith. For example, `shape.num_elements` get +/// transformed to `shape.reduce`, which can be lowered to SCF and Arith. std::unique_ptr createShapeToShapeLowering(); /// Collects a set of patterns to rewrite ops within the Shape dialect. diff --git a/mlir/include/mlir/Dialect/Shape/Transforms/Passes.td b/mlir/include/mlir/Dialect/Shape/Transforms/Passes.td index 47d16ce..503780f 100644 --- a/mlir/include/mlir/Dialect/Shape/Transforms/Passes.td +++ b/mlir/include/mlir/Dialect/Shape/Transforms/Passes.td @@ -17,7 +17,7 @@ def RemoveShapeConstraints : Pass<"remove-shape-constraints", "func::FuncOp"> { } def ShapeToShapeLowering : Pass<"shape-to-shape-lowering", "func::FuncOp"> { - let summary = "Legalize Shape dialect to be convertible to Arithmetic"; + let summary = "Legalize Shape dialect to be convertible to Arith"; let constructor = "mlir::createShapeToShapeLowering()"; } diff --git a/mlir/include/mlir/Dialect/SparseTensor/Transforms/Passes.td b/mlir/include/mlir/Dialect/SparseTensor/Transforms/Passes.td index a55fc49..04b6641 100644 --- a/mlir/include/mlir/Dialect/SparseTensor/Transforms/Passes.td +++ b/mlir/include/mlir/Dialect/SparseTensor/Transforms/Passes.td @@ -54,7 +54,7 @@ def SparsificationPass : Pass<"sparsification", "ModuleOp"> { let constructor = "mlir::createSparsificationPass()"; let dependentDialects = [ "AffineDialect", - "arith::ArithmeticDialect", + "arith::ArithDialect", "bufferization::BufferizationDialect", "LLVM::LLVMDialect", "memref::MemRefDialect", @@ -134,7 +134,7 @@ def SparseTensorConversionPass : Pass<"sparse-tensor-conversion", "ModuleOp"> { }]; let constructor = "mlir::createSparseTensorConversionPass()"; let dependentDialects = [ - "arith::ArithmeticDialect", + "arith::ArithDialect", "bufferization::BufferizationDialect", "LLVM::LLVMDialect", "linalg::LinalgDialect", @@ -169,7 +169,7 @@ def SparseTensorCodegen : Pass<"sparse-tensor-codegen", "ModuleOp"> { }]; let constructor = "mlir::createSparseTensorCodegenPass()"; let dependentDialects = [ - "arith::ArithmeticDialect", + "arith::ArithDialect", "bufferization::BufferizationDialect", "linalg::LinalgDialect", "memref::MemRefDialect", diff --git a/mlir/include/mlir/Dialect/Tensor/IR/TensorBase.td b/mlir/include/mlir/Dialect/Tensor/IR/TensorBase.td index 9bf174d..a000fa0 100644 --- a/mlir/include/mlir/Dialect/Tensor/IR/TensorBase.td +++ b/mlir/include/mlir/Dialect/Tensor/IR/TensorBase.td @@ -47,7 +47,7 @@ def Tensor_Dialect : Dialect { let hasConstantMaterializer = 1; let dependentDialects = [ - "arith::ArithmeticDialect", + "arith::ArithDialect", "complex::ComplexDialect", ]; } diff --git a/mlir/include/mlir/Dialect/Tosa/Utils/CoversionUtils.h b/mlir/include/mlir/Dialect/Tosa/Utils/CoversionUtils.h index 11509c8..b2b7b24 100644 --- a/mlir/include/mlir/Dialect/Tosa/Utils/CoversionUtils.h +++ b/mlir/include/mlir/Dialect/Tosa/Utils/CoversionUtils.h @@ -13,7 +13,7 @@ #ifndef DIALECT_TOSA_UTILS_COVERSION_UTILS_H_ #define DIALECT_TOSA_UTILS_COVERSION_UTILS_H_ -#include "mlir/Dialect/Arithmetic/IR/Arithmetic.h" +#include "mlir/Dialect/Arith/IR/Arith.h" #include "mlir/Dialect/Tensor/IR/Tensor.h" #include "mlir/Dialect/Utils/StructuredOpsUtils.h" #include "mlir/IR/PatternMatch.h" diff --git a/mlir/include/mlir/Dialect/Vector/IR/VectorOps.td b/mlir/include/mlir/Dialect/Vector/IR/VectorOps.td index e2f5ebb..94d0ea9 100644 --- a/mlir/include/mlir/Dialect/Vector/IR/VectorOps.td +++ b/mlir/include/mlir/Dialect/Vector/IR/VectorOps.td @@ -26,7 +26,7 @@ def Vector_Dialect : Dialect { let useDefaultAttributePrinterParser = 1; let hasConstantMaterializer = 1; - let dependentDialects = ["arith::ArithmeticDialect"]; + let dependentDialects = ["arith::ArithDialect"]; } // Base class for Vector dialect ops. diff --git a/mlir/include/mlir/InitAllDialects.h b/mlir/include/mlir/InitAllDialects.h index 2cd15a6..bdb8e02 100644 --- a/mlir/include/mlir/InitAllDialects.h +++ b/mlir/include/mlir/InitAllDialects.h @@ -17,8 +17,8 @@ #include "mlir/Dialect/AMDGPU/AMDGPUDialect.h" #include "mlir/Dialect/AMX/AMXDialect.h" #include "mlir/Dialect/Affine/IR/AffineOps.h" -#include "mlir/Dialect/Arithmetic/IR/Arithmetic.h" -#include "mlir/Dialect/Arithmetic/Transforms/BufferizableOpInterfaceImpl.h" +#include "mlir/Dialect/Arith/IR/Arith.h" +#include "mlir/Dialect/Arith/Transforms/BufferizableOpInterfaceImpl.h" #include "mlir/Dialect/ArmNeon/ArmNeonDialect.h" #include "mlir/Dialect/ArmSVE/ArmSVEDialect.h" #include "mlir/Dialect/Async/IR/Async.h" @@ -74,7 +74,7 @@ inline void registerAllDialects(DialectRegistry ®istry) { // clang-format off registry.insert { "::mlir::SetIntRangeFn":$setResultRanges) >]; } -#endif // MLIR_DIALECT_ARITHMETIC_IR_INFERINTRANGEINTERFACE +#endif // MLIR_INTERFACES_INFERINTRANGEINTERFACE diff --git a/mlir/lib/Conversion/AffineToStandard/AffineToStandard.cpp b/mlir/lib/Conversion/AffineToStandard/AffineToStandard.cpp index 731e0e6..e64ea2f 100644 --- a/mlir/lib/Conversion/AffineToStandard/AffineToStandard.cpp +++ b/mlir/lib/Conversion/AffineToStandard/AffineToStandard.cpp @@ -554,7 +554,7 @@ class LowerAffinePass populateAffineToStdConversionPatterns(patterns); populateAffineToVectorConversionPatterns(patterns); ConversionTarget target(getContext()); - target.addLegalDialect(); if (failed(applyPartialConversion(getOperation(), target, std::move(patterns)))) diff --git a/mlir/lib/Conversion/AffineToStandard/CMakeLists.txt b/mlir/lib/Conversion/AffineToStandard/CMakeLists.txt index 05d1608..2ba0f30 100644 --- a/mlir/lib/Conversion/AffineToStandard/CMakeLists.txt +++ b/mlir/lib/Conversion/AffineToStandard/CMakeLists.txt @@ -13,7 +13,7 @@ add_mlir_conversion_library(MLIRAffineToStandard LINK_LIBS PUBLIC MLIRAffineDialect MLIRAffineUtils - MLIRArithmeticDialect + MLIRArithDialect MLIRIR MLIRMemRefDialect MLIRSCFDialect diff --git a/mlir/lib/Conversion/ArithmeticToLLVM/ArithmeticToLLVM.cpp b/mlir/lib/Conversion/ArithToLLVM/ArithToLLVM.cpp similarity index 96% rename from mlir/lib/Conversion/ArithmeticToLLVM/ArithmeticToLLVM.cpp rename to mlir/lib/Conversion/ArithToLLVM/ArithToLLVM.cpp index 287ef8b..c77edd8 100644 --- a/mlir/lib/Conversion/ArithmeticToLLVM/ArithmeticToLLVM.cpp +++ b/mlir/lib/Conversion/ArithToLLVM/ArithToLLVM.cpp @@ -1,4 +1,4 @@ -//===- ArithmeticToLLVM.cpp - Arithmetic to LLVM dialect conversion -------===// +//===- ArithToLLVM.cpp - Arithmetic to LLVM dialect conversion -------===// // // Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions. // See https://llvm.org/LICENSE.txt for license information. @@ -6,17 +6,17 @@ // //===----------------------------------------------------------------------===// -#include "mlir/Conversion/ArithmeticToLLVM/ArithmeticToLLVM.h" +#include "mlir/Conversion/ArithToLLVM/ArithToLLVM.h" #include "mlir/Conversion/LLVMCommon/ConversionTarget.h" #include "mlir/Conversion/LLVMCommon/VectorPattern.h" -#include "mlir/Dialect/Arithmetic/IR/Arithmetic.h" +#include "mlir/Dialect/Arith/IR/Arith.h" #include "mlir/Dialect/LLVMIR/LLVMDialect.h" #include "mlir/IR/TypeUtilities.h" #include "mlir/Pass/Pass.h" namespace mlir { -#define GEN_PASS_DEF_ARITHMETICTOLLVMCONVERSIONPASS +#define GEN_PASS_DEF_ARITHTOLLVMCONVERSIONPASS #include "mlir/Conversion/Passes.h.inc" } // namespace mlir @@ -320,9 +320,8 @@ CmpFOpLowering::matchAndRewrite(arith::CmpFOp op, OpAdaptor adaptor, //===----------------------------------------------------------------------===// namespace { -struct ArithmeticToLLVMConversionPass - : public impl::ArithmeticToLLVMConversionPassBase< - ArithmeticToLLVMConversionPass> { +struct ArithToLLVMConversionPass + : public impl::ArithToLLVMConversionPassBase { using Base::Base; void runOnOperation() override { @@ -334,8 +333,7 @@ struct ArithmeticToLLVMConversionPass options.overrideIndexBitwidth(indexBitwidth); LLVMTypeConverter converter(&getContext(), options); - mlir::arith::populateArithmeticToLLVMConversionPatterns(converter, - patterns); + mlir::arith::populateArithToLLVMConversionPatterns(converter, patterns); if (failed(applyPartialConversion(getOperation(), target, std::move(patterns)))) @@ -348,7 +346,7 @@ struct ArithmeticToLLVMConversionPass // Pattern Population //===----------------------------------------------------------------------===// -void mlir::arith::populateArithmeticToLLVMConversionPatterns( +void mlir::arith::populateArithToLLVMConversionPatterns( LLVMTypeConverter &converter, RewritePatternSet &patterns) { // clang-format off patterns.add< diff --git a/mlir/lib/Conversion/ArithmeticToLLVM/CMakeLists.txt b/mlir/lib/Conversion/ArithToLLVM/CMakeLists.txt similarity index 50% rename from mlir/lib/Conversion/ArithmeticToLLVM/CMakeLists.txt rename to mlir/lib/Conversion/ArithToLLVM/CMakeLists.txt index 7359774..45ee870 100644 --- a/mlir/lib/Conversion/ArithmeticToLLVM/CMakeLists.txt +++ b/mlir/lib/Conversion/ArithToLLVM/CMakeLists.txt @@ -1,8 +1,8 @@ -add_mlir_conversion_library(MLIRArithmeticToLLVM - ArithmeticToLLVM.cpp +add_mlir_conversion_library(MLIRArithToLLVM + ArithToLLVM.cpp ADDITIONAL_HEADER_DIRS - ${MLIR_MAIN_INCLUDE_DIR}/mlir/Conversion/ArithmeticToLLVM + ${MLIR_MAIN_INCLUDE_DIR}/mlir/Conversion/ArithToLLVM DEPENDS MLIRConversionPassIncGen @@ -11,7 +11,7 @@ add_mlir_conversion_library(MLIRArithmeticToLLVM Core LINK_LIBS PUBLIC - MLIRArithmeticDialect + MLIRArithDialect MLIRLLVMCommonConversion MLIRLLVMDialect ) diff --git a/mlir/lib/Conversion/ArithmeticToSPIRV/ArithmeticToSPIRV.cpp b/mlir/lib/Conversion/ArithToSPIRV/ArithToSPIRV.cpp similarity index 98% rename from mlir/lib/Conversion/ArithmeticToSPIRV/ArithmeticToSPIRV.cpp rename to mlir/lib/Conversion/ArithToSPIRV/ArithToSPIRV.cpp index 1d15122..034abcc 100644 --- a/mlir/lib/Conversion/ArithmeticToSPIRV/ArithmeticToSPIRV.cpp +++ b/mlir/lib/Conversion/ArithToSPIRV/ArithToSPIRV.cpp @@ -1,4 +1,4 @@ -//===- ArithmeticToSPIRV.cpp - Arithmetic to SPIRV dialect conversion -----===// +//===- ArithToSPIRV.cpp - Arithmetic to SPIRV dialect conversion -----===// // // Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions. // See https://llvm.org/LICENSE.txt for license information. @@ -6,11 +6,11 @@ // //===----------------------------------------------------------------------===// -#include "mlir/Conversion/ArithmeticToSPIRV/ArithmeticToSPIRV.h" +#include "mlir/Conversion/ArithToSPIRV/ArithToSPIRV.h" #include "../SPIRVCommon/Pattern.h" #include "mlir/Conversion/FuncToSPIRV/FuncToSPIRV.h" -#include "mlir/Dialect/Arithmetic/IR/Arithmetic.h" +#include "mlir/Dialect/Arith/IR/Arith.h" #include "mlir/Dialect/SPIRV/IR/SPIRVDialect.h" #include "mlir/Dialect/SPIRV/IR/SPIRVOps.h" #include "mlir/Dialect/SPIRV/IR/SPIRVTypes.h" @@ -21,7 +21,7 @@ #include "llvm/Support/Debug.h" namespace mlir { -#define GEN_PASS_DEF_CONVERTARITHMETICTOSPIRV +#define GEN_PASS_DEF_CONVERTARITHTOSPIRV #include "mlir/Conversion/Passes.h.inc" } // namespace mlir @@ -956,7 +956,7 @@ LogicalResult MinMaxFOpPattern::matchAndRewrite( // Pattern Population //===----------------------------------------------------------------------===// -void mlir::arith::populateArithmeticToSPIRVPatterns( +void mlir::arith::populateArithToSPIRVPatterns( SPIRVTypeConverter &typeConverter, RewritePatternSet &patterns) { // clang-format off patterns.add< @@ -1022,8 +1022,8 @@ void mlir::arith::populateArithmeticToSPIRVPatterns( //===----------------------------------------------------------------------===// namespace { -struct ConvertArithmeticToSPIRVPass - : public impl::ConvertArithmeticToSPIRVBase { +struct ConvertArithToSPIRVPass + : public impl::ConvertArithToSPIRVBase { void runOnOperation() override { Operation *op = getOperation(); auto targetAttr = spirv::lookupTargetEnvOrDefault(op); @@ -1046,7 +1046,7 @@ struct ConvertArithmeticToSPIRVPass target->addLegalOp(); RewritePatternSet patterns(&getContext()); - arith::populateArithmeticToSPIRVPatterns(typeConverter, patterns); + arith::populateArithToSPIRVPatterns(typeConverter, patterns); if (failed(applyPartialConversion(op, *target, std::move(patterns)))) signalPassFailure(); @@ -1054,7 +1054,6 @@ struct ConvertArithmeticToSPIRVPass }; } // namespace -std::unique_ptr> -mlir::arith::createConvertArithmeticToSPIRVPass() { - return std::make_unique(); +std::unique_ptr> mlir::arith::createConvertArithToSPIRVPass() { + return std::make_unique(); } diff --git a/mlir/lib/Conversion/ArithmeticToSPIRV/CMakeLists.txt b/mlir/lib/Conversion/ArithToSPIRV/CMakeLists.txt similarity index 52% rename from mlir/lib/Conversion/ArithmeticToSPIRV/CMakeLists.txt rename to mlir/lib/Conversion/ArithToSPIRV/CMakeLists.txt index 6e7a609..a5385d9 100644 --- a/mlir/lib/Conversion/ArithmeticToSPIRV/CMakeLists.txt +++ b/mlir/lib/Conversion/ArithToSPIRV/CMakeLists.txt @@ -1,8 +1,8 @@ -add_mlir_conversion_library(MLIRArithmeticToSPIRV - ArithmeticToSPIRV.cpp +add_mlir_conversion_library(MLIRArithToSPIRV + ArithToSPIRV.cpp ADDITIONAL_HEADER_DIRS - ${MLIR_MAIN_INCLUDE_DIR}/mlir/Conversion/ArithmeticToSPIRV + ${MLIR_MAIN_INCLUDE_DIR}/mlir/Conversion/ArithToSPIRV DEPENDS MLIRConversionPassIncGen @@ -11,7 +11,7 @@ add_mlir_conversion_library(MLIRArithmeticToSPIRV Core LINK_LIBS PUBLIC - MLIRArithmeticDialect + MLIRArithDialect MLIRFuncToSPIRV MLIRSPIRVConversion MLIRSPIRVDialect diff --git a/mlir/lib/Conversion/ArmNeon2dToIntr/CMakeLists.txt b/mlir/lib/Conversion/ArmNeon2dToIntr/CMakeLists.txt index ee24f6d..bab9d6e 100644 --- a/mlir/lib/Conversion/ArmNeon2dToIntr/CMakeLists.txt +++ b/mlir/lib/Conversion/ArmNeon2dToIntr/CMakeLists.txt @@ -11,7 +11,7 @@ add_mlir_conversion_library(MLIRArmNeon2dToIntr Core LINK_LIBS PUBLIC - MLIRArithmeticDialect + MLIRArithDialect MLIRArmNeonDialect MLIRPass MLIRTransforms diff --git a/mlir/lib/Conversion/AsyncToLLVM/AsyncToLLVM.cpp b/mlir/lib/Conversion/AsyncToLLVM/AsyncToLLVM.cpp index 8733459..238f558 100644 --- a/mlir/lib/Conversion/AsyncToLLVM/AsyncToLLVM.cpp +++ b/mlir/lib/Conversion/AsyncToLLVM/AsyncToLLVM.cpp @@ -11,7 +11,7 @@ #include "mlir/Conversion/FuncToLLVM/ConvertFuncToLLVM.h" #include "mlir/Conversion/LLVMCommon/ConversionTarget.h" #include "mlir/Conversion/LLVMCommon/TypeConverter.h" -#include "mlir/Dialect/Arithmetic/IR/Arithmetic.h" +#include "mlir/Dialect/Arith/IR/Arith.h" #include "mlir/Dialect/Async/IR/Async.h" #include "mlir/Dialect/Func/IR/FuncOps.h" #include "mlir/Dialect/Func/Transforms/FuncConversions.h" diff --git a/mlir/lib/Conversion/AsyncToLLVM/CMakeLists.txt b/mlir/lib/Conversion/AsyncToLLVM/CMakeLists.txt index 18c3ffb..ca692bb 100644 --- a/mlir/lib/Conversion/AsyncToLLVM/CMakeLists.txt +++ b/mlir/lib/Conversion/AsyncToLLVM/CMakeLists.txt @@ -11,7 +11,7 @@ add_mlir_conversion_library(MLIRAsyncToLLVM Core LINK_LIBS PUBLIC - MLIRArithmeticDialect + MLIRArithDialect MLIRAsyncDialect MLIRFuncToLLVM MLIRFuncTransforms diff --git a/mlir/lib/Conversion/BufferizationToMemRef/BufferizationToMemRef.cpp b/mlir/lib/Conversion/BufferizationToMemRef/BufferizationToMemRef.cpp index fcbd27f..5f64981 100644 --- a/mlir/lib/Conversion/BufferizationToMemRef/BufferizationToMemRef.cpp +++ b/mlir/lib/Conversion/BufferizationToMemRef/BufferizationToMemRef.cpp @@ -13,7 +13,7 @@ #include "mlir/Conversion/BufferizationToMemRef/BufferizationToMemRef.h" -#include "mlir/Dialect/Arithmetic/IR/Arithmetic.h" +#include "mlir/Dialect/Arith/IR/Arith.h" #include "mlir/Dialect/Bufferization/IR/Bufferization.h" #include "mlir/Dialect/MemRef/IR/MemRef.h" #include "mlir/IR/BuiltinTypes.h" diff --git a/mlir/lib/Conversion/CMakeLists.txt b/mlir/lib/Conversion/CMakeLists.txt index d87d0ec..33f917d 100644 --- a/mlir/lib/Conversion/CMakeLists.txt +++ b/mlir/lib/Conversion/CMakeLists.txt @@ -1,7 +1,7 @@ add_subdirectory(AffineToStandard) add_subdirectory(AMDGPUToROCDL) -add_subdirectory(ArithmeticToLLVM) -add_subdirectory(ArithmeticToSPIRV) +add_subdirectory(ArithToLLVM) +add_subdirectory(ArithToSPIRV) add_subdirectory(ArmNeon2dToIntr) add_subdirectory(AsyncToLLVM) add_subdirectory(BufferizationToMemRef) diff --git a/mlir/lib/Conversion/ComplexToLLVM/ComplexToLLVM.cpp b/mlir/lib/Conversion/ComplexToLLVM/ComplexToLLVM.cpp index 64e64c7..a07c434 100644 --- a/mlir/lib/Conversion/ComplexToLLVM/ComplexToLLVM.cpp +++ b/mlir/lib/Conversion/ComplexToLLVM/ComplexToLLVM.cpp @@ -10,7 +10,7 @@ #include "mlir/Conversion/LLVMCommon/ConversionTarget.h" #include "mlir/Conversion/LLVMCommon/Pattern.h" -#include "mlir/Dialect/Arithmetic/IR/Arithmetic.h" +#include "mlir/Dialect/Arith/IR/Arith.h" #include "mlir/Dialect/Complex/IR/Complex.h" #include "mlir/Dialect/LLVMIR/LLVMDialect.h" #include "mlir/Pass/Pass.h" diff --git a/mlir/lib/Conversion/ComplexToStandard/CMakeLists.txt b/mlir/lib/Conversion/ComplexToStandard/CMakeLists.txt index afe010f..e74c212 100644 --- a/mlir/lib/Conversion/ComplexToStandard/CMakeLists.txt +++ b/mlir/lib/Conversion/ComplexToStandard/CMakeLists.txt @@ -8,7 +8,7 @@ add_mlir_conversion_library(MLIRComplexToStandard MLIRConversionPassIncGen LINK_LIBS PUBLIC - MLIRArithmeticDialect + MLIRArithDialect MLIRComplexDialect MLIRIR MLIRMathDialect diff --git a/mlir/lib/Conversion/ComplexToStandard/ComplexToStandard.cpp b/mlir/lib/Conversion/ComplexToStandard/ComplexToStandard.cpp index d1af84c..5364976 100644 --- a/mlir/lib/Conversion/ComplexToStandard/ComplexToStandard.cpp +++ b/mlir/lib/Conversion/ComplexToStandard/ComplexToStandard.cpp @@ -8,7 +8,7 @@ #include "mlir/Conversion/ComplexToStandard/ComplexToStandard.h" -#include "mlir/Dialect/Arithmetic/IR/Arithmetic.h" +#include "mlir/Dialect/Arith/IR/Arith.h" #include "mlir/Dialect/Complex/IR/Complex.h" #include "mlir/Dialect/Math/IR/Math.h" #include "mlir/IR/ImplicitLocOpBuilder.h" @@ -1095,7 +1095,7 @@ void ConvertComplexToStandardPass::runOnOperation() { populateComplexToStandardConversionPatterns(patterns); ConversionTarget target(getContext()); - target.addLegalDialect(); + target.addLegalDialect(); target.addLegalOp(); if (failed( applyPartialConversion(getOperation(), target, std::move(patterns)))) diff --git a/mlir/lib/Conversion/FuncToLLVM/CMakeLists.txt b/mlir/lib/Conversion/FuncToLLVM/CMakeLists.txt index 3c36c7a..17d8dad 100644 --- a/mlir/lib/Conversion/FuncToLLVM/CMakeLists.txt +++ b/mlir/lib/Conversion/FuncToLLVM/CMakeLists.txt @@ -13,7 +13,7 @@ add_mlir_conversion_library(MLIRFuncToLLVM LINK_LIBS PUBLIC MLIRAnalysis - MLIRArithmeticToLLVM + MLIRArithToLLVM MLIRControlFlowToLLVM MLIRDataLayoutInterfaces MLIRFuncDialect diff --git a/mlir/lib/Conversion/FuncToLLVM/FuncToLLVM.cpp b/mlir/lib/Conversion/FuncToLLVM/FuncToLLVM.cpp index 1a77a16..d0e82de 100644 --- a/mlir/lib/Conversion/FuncToLLVM/FuncToLLVM.cpp +++ b/mlir/lib/Conversion/FuncToLLVM/FuncToLLVM.cpp @@ -14,7 +14,7 @@ #include "mlir/Conversion/FuncToLLVM/ConvertFuncToLLVMPass.h" #include "mlir/Analysis/DataLayoutAnalysis.h" -#include "mlir/Conversion/ArithmeticToLLVM/ArithmeticToLLVM.h" +#include "mlir/Conversion/ArithToLLVM/ArithToLLVM.h" #include "mlir/Conversion/ControlFlowToLLVM/ControlFlowToLLVM.h" #include "mlir/Conversion/FuncToLLVM/ConvertFuncToLLVM.h" #include "mlir/Conversion/LLVMCommon/ConversionTarget.h" @@ -741,7 +741,7 @@ struct ConvertFuncToLLVMPass populateFuncToLLVMConversionPatterns(typeConverter, patterns); // TODO: Remove these in favor of their dedicated conversion passes. - arith::populateArithmeticToLLVMConversionPatterns(typeConverter, patterns); + arith::populateArithToLLVMConversionPatterns(typeConverter, patterns); cf::populateControlFlowToLLVMConversionPatterns(typeConverter, patterns); LLVMConversionTarget target(getContext()); diff --git a/mlir/lib/Conversion/GPUCommon/CMakeLists.txt b/mlir/lib/Conversion/GPUCommon/CMakeLists.txt index 0a856af..255b9ef 100644 --- a/mlir/lib/Conversion/GPUCommon/CMakeLists.txt +++ b/mlir/lib/Conversion/GPUCommon/CMakeLists.txt @@ -29,7 +29,7 @@ add_mlir_conversion_library(MLIRGPUToGPURuntimeTransforms ${NVPTX_LIBS} LINK_LIBS PUBLIC - MLIRArithmeticToLLVM + MLIRArithToLLVM MLIRAsyncToLLVM MLIRControlFlowToLLVM MLIRFuncToLLVM diff --git a/mlir/lib/Conversion/GPUCommon/GPUToLLVMConversion.cpp b/mlir/lib/Conversion/GPUCommon/GPUToLLVMConversion.cpp index 378ee53..9193649 100644 --- a/mlir/lib/Conversion/GPUCommon/GPUToLLVMConversion.cpp +++ b/mlir/lib/Conversion/GPUCommon/GPUToLLVMConversion.cpp @@ -15,7 +15,7 @@ #include "mlir/Conversion/GPUCommon/GPUCommonPass.h" -#include "mlir/Conversion/ArithmeticToLLVM/ArithmeticToLLVM.h" +#include "mlir/Conversion/ArithToLLVM/ArithToLLVM.h" #include "mlir/Conversion/AsyncToLLVM/AsyncToLLVM.h" #include "mlir/Conversion/ControlFlowToLLVM/ControlFlowToLLVM.h" #include "mlir/Conversion/FuncToLLVM/ConvertFuncToLLVM.h" @@ -388,7 +388,7 @@ void GpuToLLVMConversionPass::runOnOperation() { target.addIllegalDialect(); - mlir::arith::populateArithmeticToLLVMConversionPatterns(converter, patterns); + mlir::arith::populateArithToLLVMConversionPatterns(converter, patterns); mlir::cf::populateControlFlowToLLVMConversionPatterns(converter, patterns); populateVectorToLLVMConversionPatterns(converter, patterns); populateMemRefToLLVMConversionPatterns(converter, patterns); diff --git a/mlir/lib/Conversion/GPUToNVVM/CMakeLists.txt b/mlir/lib/Conversion/GPUToNVVM/CMakeLists.txt index b9392f2..ab8a2d2 100644 --- a/mlir/lib/Conversion/GPUToNVVM/CMakeLists.txt +++ b/mlir/lib/Conversion/GPUToNVVM/CMakeLists.txt @@ -11,7 +11,7 @@ add_mlir_conversion_library(MLIRGPUToNVVMTransforms MLIRGPUToNVVMIncGen LINK_LIBS PUBLIC - MLIRArithmeticToLLVM + MLIRArithToLLVM MLIRFuncToLLVM MLIRGPUOps MLIRGPUToGPURuntimeTransforms diff --git a/mlir/lib/Conversion/GPUToNVVM/LowerGpuOpsToNVVMOps.cpp b/mlir/lib/Conversion/GPUToNVVM/LowerGpuOpsToNVVMOps.cpp index f75cb85..496d84e 100644 --- a/mlir/lib/Conversion/GPUToNVVM/LowerGpuOpsToNVVMOps.cpp +++ b/mlir/lib/Conversion/GPUToNVVM/LowerGpuOpsToNVVMOps.cpp @@ -13,14 +13,14 @@ #include "mlir/Conversion/GPUToNVVM/GPUToNVVMPass.h" -#include "mlir/Conversion/ArithmeticToLLVM/ArithmeticToLLVM.h" +#include "mlir/Conversion/ArithToLLVM/ArithToLLVM.h" #include "mlir/Conversion/ControlFlowToLLVM/ControlFlowToLLVM.h" #include "mlir/Conversion/FuncToLLVM/ConvertFuncToLLVM.h" #include "mlir/Conversion/LLVMCommon/ConversionTarget.h" #include "mlir/Conversion/LLVMCommon/LoweringOptions.h" #include "mlir/Conversion/LLVMCommon/TypeConverter.h" #include "mlir/Conversion/MemRefToLLVM/MemRefToLLVM.h" -#include "mlir/Dialect/Arithmetic/IR/Arithmetic.h" +#include "mlir/Dialect/Arith/IR/Arith.h" #include "mlir/Dialect/ControlFlow/IR/ControlFlow.h" #include "mlir/Dialect/Func/IR/FuncOps.h" #include "mlir/Dialect/GPU/IR/GPUDialect.h" @@ -203,7 +203,7 @@ struct LowerGpuOpsToNVVMOpsPass populateGpuRewritePatterns(patterns); (void)applyPatternsAndFoldGreedily(m, std::move(patterns)); - arith::populateArithmeticToLLVMConversionPatterns(converter, llvmPatterns); + arith::populateArithToLLVMConversionPatterns(converter, llvmPatterns); cf::populateControlFlowToLLVMConversionPatterns(converter, llvmPatterns); populateFuncToLLVMConversionPatterns(converter, llvmPatterns); populateMemRefToLLVMConversionPatterns(converter, llvmPatterns); diff --git a/mlir/lib/Conversion/GPUToROCDL/CMakeLists.txt b/mlir/lib/Conversion/GPUToROCDL/CMakeLists.txt index f78a747..c9fc198 100644 --- a/mlir/lib/Conversion/GPUToROCDL/CMakeLists.txt +++ b/mlir/lib/Conversion/GPUToROCDL/CMakeLists.txt @@ -10,7 +10,7 @@ add_mlir_conversion_library(MLIRGPUToROCDLTransforms MLIRGPUToROCDLIncGen LINK_LIBS PUBLIC - MLIRArithmeticToLLVM + MLIRArithToLLVM MLIRAMDGPUToROCDL MLIRFuncToLLVM MLIRGPUOps diff --git a/mlir/lib/Conversion/GPUToROCDL/LowerGpuOpsToROCDLOps.cpp b/mlir/lib/Conversion/GPUToROCDL/LowerGpuOpsToROCDLOps.cpp index 43213e8..3a9c816 100644 --- a/mlir/lib/Conversion/GPUToROCDL/LowerGpuOpsToROCDLOps.cpp +++ b/mlir/lib/Conversion/GPUToROCDL/LowerGpuOpsToROCDLOps.cpp @@ -15,7 +15,7 @@ #include "mlir/Conversion/GPUToROCDL/GPUToROCDLPass.h" #include "mlir/Conversion/AMDGPUToROCDL/AMDGPUToROCDL.h" -#include "mlir/Conversion/ArithmeticToLLVM/ArithmeticToLLVM.h" +#include "mlir/Conversion/ArithToLLVM/ArithToLLVM.h" #include "mlir/Conversion/FuncToLLVM/ConvertFuncToLLVM.h" #include "mlir/Conversion/LLVMCommon/ConversionTarget.h" #include "mlir/Conversion/LLVMCommon/LoweringOptions.h" @@ -127,8 +127,7 @@ struct LowerGpuOpsToROCDLOpsPass populateGpuRewritePatterns(patterns); (void)applyPatternsAndFoldGreedily(m, std::move(patterns)); - mlir::arith::populateArithmeticToLLVMConversionPatterns(converter, - llvmPatterns); + mlir::arith::populateArithToLLVMConversionPatterns(converter, llvmPatterns); populateAMDGPUToROCDLConversionPatterns(converter, llvmPatterns, *maybeChipset); populateVectorToLLVMConversionPatterns(converter, llvmPatterns); diff --git a/mlir/lib/Conversion/GPUToSPIRV/CMakeLists.txt b/mlir/lib/Conversion/GPUToSPIRV/CMakeLists.txt index c6547dd..7ee339a 100644 --- a/mlir/lib/Conversion/GPUToSPIRV/CMakeLists.txt +++ b/mlir/lib/Conversion/GPUToSPIRV/CMakeLists.txt @@ -6,7 +6,7 @@ add_mlir_conversion_library(MLIRGPUToSPIRV MLIRConversionPassIncGen LINK_LIBS PUBLIC - MLIRArithmeticToSPIRV + MLIRArithToSPIRV MLIRGPUOps MLIRFuncToSPIRV MLIRIR diff --git a/mlir/lib/Conversion/GPUToSPIRV/GPUToSPIRVPass.cpp b/mlir/lib/Conversion/GPUToSPIRV/GPUToSPIRVPass.cpp index c38a71b..690c92f 100644 --- a/mlir/lib/Conversion/GPUToSPIRV/GPUToSPIRVPass.cpp +++ b/mlir/lib/Conversion/GPUToSPIRV/GPUToSPIRVPass.cpp @@ -13,7 +13,7 @@ #include "mlir/Conversion/GPUToSPIRV/GPUToSPIRVPass.h" -#include "mlir/Conversion/ArithmeticToSPIRV/ArithmeticToSPIRV.h" +#include "mlir/Conversion/ArithToSPIRV/ArithToSPIRV.h" #include "mlir/Conversion/FuncToSPIRV/FuncToSPIRV.h" #include "mlir/Conversion/GPUToSPIRV/GPUToSPIRV.h" #include "mlir/Conversion/MemRefToSPIRV/MemRefToSPIRV.h" @@ -88,7 +88,7 @@ void GPUToSPIRVPass::runOnOperation() { // TODO: Change SPIR-V conversion to be progressive and remove the following // patterns. - mlir::arith::populateArithmeticToSPIRVPatterns(typeConverter, patterns); + mlir::arith::populateArithToSPIRVPatterns(typeConverter, patterns); populateMemRefToSPIRVPatterns(typeConverter, patterns); populateFuncToSPIRVPatterns(typeConverter, patterns); diff --git a/mlir/lib/Conversion/LinalgToStandard/LinalgToStandard.cpp b/mlir/lib/Conversion/LinalgToStandard/LinalgToStandard.cpp index 88b88ab..ea586ff 100644 --- a/mlir/lib/Conversion/LinalgToStandard/LinalgToStandard.cpp +++ b/mlir/lib/Conversion/LinalgToStandard/LinalgToStandard.cpp @@ -141,9 +141,8 @@ struct ConvertLinalgToStandardPass void ConvertLinalgToStandardPass::runOnOperation() { auto module = getOperation(); ConversionTarget target(getContext()); - target.addLegalDialect(); + target.addLegalDialect(); target.addLegalOp(); RewritePatternSet patterns(&getContext()); populateLinalgToStandardConversionPatterns(patterns); diff --git a/mlir/lib/Conversion/MathToFuncs/CMakeLists.txt b/mlir/lib/Conversion/MathToFuncs/CMakeLists.txt index 72d828a..d33df7b 100644 --- a/mlir/lib/Conversion/MathToFuncs/CMakeLists.txt +++ b/mlir/lib/Conversion/MathToFuncs/CMakeLists.txt @@ -11,7 +11,7 @@ add_mlir_conversion_library(MLIRMathToFuncs Core LINK_LIBS PUBLIC - MLIRArithmeticDialect + MLIRArithDialect MLIRControlFlowDialect MLIRFuncDialect MLIRLLVMDialect diff --git a/mlir/lib/Conversion/MathToFuncs/MathToFuncs.cpp b/mlir/lib/Conversion/MathToFuncs/MathToFuncs.cpp index e64611b..a0eee71 100644 --- a/mlir/lib/Conversion/MathToFuncs/MathToFuncs.cpp +++ b/mlir/lib/Conversion/MathToFuncs/MathToFuncs.cpp @@ -8,7 +8,7 @@ #include "mlir/Conversion/MathToFuncs/MathToFuncs.h" -#include "mlir/Dialect/Arithmetic/IR/Arithmetic.h" +#include "mlir/Dialect/Arith/IR/Arith.h" #include "mlir/Dialect/ControlFlow/IR/ControlFlowOps.h" #include "mlir/Dialect/Func/IR/FuncOps.h" #include "mlir/Dialect/LLVMIR/LLVMDialect.h" @@ -377,7 +377,7 @@ void ConvertMathToFuncsPass::runOnOperation() { patterns.add(patterns.getContext(), getPowerFuncOpByType); ConversionTarget target(getContext()); - target.addLegalDialect(); target.addIllegalOp(); if (failed(applyPartialConversion(module, target, std::move(patterns)))) diff --git a/mlir/lib/Conversion/MathToLibm/CMakeLists.txt b/mlir/lib/Conversion/MathToLibm/CMakeLists.txt index 4596a8f..0e7c6f0 100644 --- a/mlir/lib/Conversion/MathToLibm/CMakeLists.txt +++ b/mlir/lib/Conversion/MathToLibm/CMakeLists.txt @@ -11,7 +11,7 @@ add_mlir_conversion_library(MLIRMathToLibm Core LINK_LIBS PUBLIC - MLIRArithmeticDialect + MLIRArithDialect MLIRDialectUtils MLIRFuncDialect MLIRMathDialect diff --git a/mlir/lib/Conversion/MathToLibm/MathToLibm.cpp b/mlir/lib/Conversion/MathToLibm/MathToLibm.cpp index 0e90def..a412dbd 100644 --- a/mlir/lib/Conversion/MathToLibm/MathToLibm.cpp +++ b/mlir/lib/Conversion/MathToLibm/MathToLibm.cpp @@ -8,7 +8,7 @@ #include "mlir/Conversion/MathToLibm/MathToLibm.h" -#include "mlir/Dialect/Arithmetic/IR/Arithmetic.h" +#include "mlir/Dialect/Arith/IR/Arith.h" #include "mlir/Dialect/Func/IR/FuncOps.h" #include "mlir/Dialect/LLVMIR/LLVMDialect.h" #include "mlir/Dialect/Math/IR/Math.h" @@ -212,8 +212,8 @@ void ConvertMathToLibmPass::runOnOperation() { populateMathToLibmConversionPatterns(patterns, /*benefit=*/1); ConversionTarget target(getContext()); - target.addLegalDialect(); + target.addLegalDialect(); target.addIllegalDialect(); if (failed(applyPartialConversion(module, target, std::move(patterns)))) signalPassFailure(); diff --git a/mlir/lib/Conversion/MemRefToLLVM/MemRefToLLVM.cpp b/mlir/lib/Conversion/MemRefToLLVM/MemRefToLLVM.cpp index efeb255..6ff0af9 100644 --- a/mlir/lib/Conversion/MemRefToLLVM/MemRefToLLVM.cpp +++ b/mlir/lib/Conversion/MemRefToLLVM/MemRefToLLVM.cpp @@ -13,7 +13,7 @@ #include "mlir/Conversion/LLVMCommon/Pattern.h" #include "mlir/Conversion/LLVMCommon/TypeConverter.h" #include "mlir/Conversion/MemRefToLLVM/AllocLikeConversion.h" -#include "mlir/Dialect/Arithmetic/IR/Arithmetic.h" +#include "mlir/Dialect/Arith/IR/Arith.h" #include "mlir/Dialect/Func/IR/FuncOps.h" #include "mlir/Dialect/LLVMIR/FunctionCallUtils.h" #include "mlir/Dialect/LLVMIR/LLVMDialect.h" diff --git a/mlir/lib/Conversion/OpenACCToSCF/CMakeLists.txt b/mlir/lib/Conversion/OpenACCToSCF/CMakeLists.txt index 9549113..aa90db9 100644 --- a/mlir/lib/Conversion/OpenACCToSCF/CMakeLists.txt +++ b/mlir/lib/Conversion/OpenACCToSCF/CMakeLists.txt @@ -8,7 +8,7 @@ add_mlir_conversion_library(MLIROpenACCToSCF MLIRConversionPassIncGen LINK_LIBS PUBLIC - MLIRArithmeticDialect + MLIRArithDialect MLIRIR MLIROpenACCDialect MLIRSCFDialect diff --git a/mlir/lib/Conversion/OpenACCToSCF/OpenACCToSCF.cpp b/mlir/lib/Conversion/OpenACCToSCF/OpenACCToSCF.cpp index 96ed682..dea9384 100644 --- a/mlir/lib/Conversion/OpenACCToSCF/OpenACCToSCF.cpp +++ b/mlir/lib/Conversion/OpenACCToSCF/OpenACCToSCF.cpp @@ -8,7 +8,7 @@ #include "mlir/Conversion/OpenACCToSCF/ConvertOpenACCToSCF.h" -#include "mlir/Dialect/Arithmetic/IR/Arithmetic.h" +#include "mlir/Dialect/Arith/IR/Arith.h" #include "mlir/Dialect/OpenACC/OpenACC.h" #include "mlir/Dialect/SCF/IR/SCF.h" #include "mlir/Pass/Pass.h" diff --git a/mlir/lib/Conversion/OpenMPToLLVM/CMakeLists.txt b/mlir/lib/Conversion/OpenMPToLLVM/CMakeLists.txt index ca22c71..c5f84aa 100644 --- a/mlir/lib/Conversion/OpenMPToLLVM/CMakeLists.txt +++ b/mlir/lib/Conversion/OpenMPToLLVM/CMakeLists.txt @@ -12,7 +12,7 @@ add_mlir_conversion_library(MLIROpenMPToLLVM Core LINK_LIBS PUBLIC - MLIRArithmeticToLLVM + MLIRArithToLLVM MLIRFuncToLLVM MLIRIR MLIRLLVMCommonConversion diff --git a/mlir/lib/Conversion/OpenMPToLLVM/OpenMPToLLVM.cpp b/mlir/lib/Conversion/OpenMPToLLVM/OpenMPToLLVM.cpp index 7194fa6..9d521bd 100644 --- a/mlir/lib/Conversion/OpenMPToLLVM/OpenMPToLLVM.cpp +++ b/mlir/lib/Conversion/OpenMPToLLVM/OpenMPToLLVM.cpp @@ -8,7 +8,7 @@ #include "mlir/Conversion/OpenMPToLLVM/ConvertOpenMPToLLVM.h" -#include "mlir/Conversion/ArithmeticToLLVM/ArithmeticToLLVM.h" +#include "mlir/Conversion/ArithToLLVM/ArithToLLVM.h" #include "mlir/Conversion/ControlFlowToLLVM/ControlFlowToLLVM.h" #include "mlir/Conversion/FuncToLLVM/ConvertFuncToLLVM.h" #include "mlir/Conversion/FuncToLLVM/ConvertFuncToLLVMPass.h" @@ -148,7 +148,7 @@ void ConvertOpenMPToLLVMPass::runOnOperation() { // Convert to OpenMP operations with LLVM IR dialect RewritePatternSet patterns(&getContext()); LLVMTypeConverter converter(&getContext()); - arith::populateArithmeticToLLVMConversionPatterns(converter, patterns); + arith::populateArithToLLVMConversionPatterns(converter, patterns); cf::populateControlFlowToLLVMConversionPatterns(converter, patterns); populateMemRefToLLVMConversionPatterns(converter, patterns); populateFuncToLLVMConversionPatterns(converter, patterns); diff --git a/mlir/lib/Conversion/SCFToControlFlow/CMakeLists.txt b/mlir/lib/Conversion/SCFToControlFlow/CMakeLists.txt index abb060c..6217976 100644 --- a/mlir/lib/Conversion/SCFToControlFlow/CMakeLists.txt +++ b/mlir/lib/Conversion/SCFToControlFlow/CMakeLists.txt @@ -11,7 +11,7 @@ add_mlir_conversion_library(MLIRSCFToControlFlow Core LINK_LIBS PUBLIC - MLIRArithmeticDialect + MLIRArithDialect MLIRControlFlowDialect MLIRSCFDialect MLIRTransforms diff --git a/mlir/lib/Conversion/SCFToControlFlow/SCFToControlFlow.cpp b/mlir/lib/Conversion/SCFToControlFlow/SCFToControlFlow.cpp index 489db87..72f483c 100644 --- a/mlir/lib/Conversion/SCFToControlFlow/SCFToControlFlow.cpp +++ b/mlir/lib/Conversion/SCFToControlFlow/SCFToControlFlow.cpp @@ -13,7 +13,7 @@ #include "mlir/Conversion/SCFToControlFlow/SCFToControlFlow.h" -#include "mlir/Dialect/Arithmetic/IR/Arithmetic.h" +#include "mlir/Dialect/Arith/IR/Arith.h" #include "mlir/Dialect/ControlFlow/IR/ControlFlowOps.h" #include "mlir/Dialect/SCF/IR/SCF.h" #include "mlir/IR/BlockAndValueMapping.h" diff --git a/mlir/lib/Conversion/SCFToGPU/CMakeLists.txt b/mlir/lib/Conversion/SCFToGPU/CMakeLists.txt index 5f1e782..253b196 100644 --- a/mlir/lib/Conversion/SCFToGPU/CMakeLists.txt +++ b/mlir/lib/Conversion/SCFToGPU/CMakeLists.txt @@ -11,7 +11,7 @@ add_mlir_conversion_library(MLIRSCFToGPU LINK_LIBS PUBLIC MLIRAffineDialect MLIRAffineToStandard - MLIRArithmeticDialect + MLIRArithDialect MLIRComplexDialect MLIRGPUTransforms MLIRIR diff --git a/mlir/lib/Conversion/SCFToGPU/SCFToGPU.cpp b/mlir/lib/Conversion/SCFToGPU/SCFToGPU.cpp index f8ad965..bc5c354 100644 --- a/mlir/lib/Conversion/SCFToGPU/SCFToGPU.cpp +++ b/mlir/lib/Conversion/SCFToGPU/SCFToGPU.cpp @@ -16,7 +16,7 @@ #include "mlir/Conversion/AffineToStandard/AffineToStandard.h" #include "mlir/Dialect/Affine/IR/AffineOps.h" -#include "mlir/Dialect/Arithmetic/IR/Arithmetic.h" +#include "mlir/Dialect/Arith/IR/Arith.h" #include "mlir/Dialect/GPU/IR/GPUDialect.h" #include "mlir/Dialect/GPU/Transforms/ParallelLoopMapper.h" #include "mlir/Dialect/MemRef/IR/MemRef.h" diff --git a/mlir/lib/Conversion/SCFToGPU/SCFToGPUPass.cpp b/mlir/lib/Conversion/SCFToGPU/SCFToGPUPass.cpp index 47c266c..61f7f9f 100644 --- a/mlir/lib/Conversion/SCFToGPU/SCFToGPUPass.cpp +++ b/mlir/lib/Conversion/SCFToGPU/SCFToGPUPass.cpp @@ -10,7 +10,7 @@ #include "mlir/Conversion/SCFToGPU/SCFToGPU.h" #include "mlir/Dialect/Affine/IR/AffineOps.h" -#include "mlir/Dialect/Arithmetic/IR/Arithmetic.h" +#include "mlir/Dialect/Arith/IR/Arith.h" #include "mlir/Dialect/Complex/IR/Complex.h" #include "mlir/Dialect/GPU/IR/GPUDialect.h" #include "mlir/Dialect/SCF/IR/SCF.h" diff --git a/mlir/lib/Conversion/SCFToOpenMP/CMakeLists.txt b/mlir/lib/Conversion/SCFToOpenMP/CMakeLists.txt index d65f494..1ad175d 100644 --- a/mlir/lib/Conversion/SCFToOpenMP/CMakeLists.txt +++ b/mlir/lib/Conversion/SCFToOpenMP/CMakeLists.txt @@ -12,7 +12,7 @@ add_mlir_conversion_library(MLIRSCFToOpenMP LINK_LIBS PUBLIC MLIRAnalysis - MLIRArithmeticDialect + MLIRArithDialect MLIRLLVMDialect MLIROpenMPDialect MLIRSCFDialect diff --git a/mlir/lib/Conversion/SCFToOpenMP/SCFToOpenMP.cpp b/mlir/lib/Conversion/SCFToOpenMP/SCFToOpenMP.cpp index b534c27..c7fdd66 100644 --- a/mlir/lib/Conversion/SCFToOpenMP/SCFToOpenMP.cpp +++ b/mlir/lib/Conversion/SCFToOpenMP/SCFToOpenMP.cpp @@ -15,7 +15,7 @@ #include "mlir/Analysis/SliceAnalysis.h" #include "mlir/Dialect/Affine/Analysis/LoopAnalysis.h" -#include "mlir/Dialect/Arithmetic/IR/Arithmetic.h" +#include "mlir/Dialect/Arith/IR/Arith.h" #include "mlir/Dialect/LLVMIR/LLVMDialect.h" #include "mlir/Dialect/MemRef/IR/MemRef.h" #include "mlir/Dialect/OpenMP/OpenMPDialect.h" diff --git a/mlir/lib/Conversion/SCFToSPIRV/CMakeLists.txt b/mlir/lib/Conversion/SCFToSPIRV/CMakeLists.txt index f37cf3b..987a1e8 100644 --- a/mlir/lib/Conversion/SCFToSPIRV/CMakeLists.txt +++ b/mlir/lib/Conversion/SCFToSPIRV/CMakeLists.txt @@ -9,7 +9,7 @@ add_mlir_conversion_library(MLIRSCFToSPIRV MLIRConversionPassIncGen LINK_LIBS PUBLIC - MLIRArithmeticToSPIRV + MLIRArithToSPIRV MLIRFuncToSPIRV MLIRMemRefToSPIRV MLIRSPIRVDialect diff --git a/mlir/lib/Conversion/SCFToSPIRV/SCFToSPIRVPass.cpp b/mlir/lib/Conversion/SCFToSPIRV/SCFToSPIRVPass.cpp index 86a8f23..a6ce992 100644 --- a/mlir/lib/Conversion/SCFToSPIRV/SCFToSPIRVPass.cpp +++ b/mlir/lib/Conversion/SCFToSPIRV/SCFToSPIRVPass.cpp @@ -12,7 +12,7 @@ #include "mlir/Conversion/SCFToSPIRV/SCFToSPIRVPass.h" -#include "mlir/Conversion/ArithmeticToSPIRV/ArithmeticToSPIRV.h" +#include "mlir/Conversion/ArithToSPIRV/ArithToSPIRV.h" #include "mlir/Conversion/FuncToSPIRV/FuncToSPIRV.h" #include "mlir/Conversion/MemRefToSPIRV/MemRefToSPIRV.h" #include "mlir/Conversion/SCFToSPIRV/SCFToSPIRV.h" @@ -48,7 +48,7 @@ void SCFToSPIRVPass::runOnOperation() { // TODO: Change SPIR-V conversion to be progressive and remove the following // patterns. - mlir::arith::populateArithmeticToSPIRVPatterns(typeConverter, patterns); + mlir::arith::populateArithToSPIRVPatterns(typeConverter, patterns); populateFuncToSPIRVPatterns(typeConverter, patterns); populateMemRefToSPIRVPatterns(typeConverter, patterns); populateBuiltinFuncToSPIRVPatterns(typeConverter, patterns); diff --git a/mlir/lib/Conversion/SPIRVToLLVM/CMakeLists.txt b/mlir/lib/Conversion/SPIRVToLLVM/CMakeLists.txt index a89877e..37bb729 100644 --- a/mlir/lib/Conversion/SPIRVToLLVM/CMakeLists.txt +++ b/mlir/lib/Conversion/SPIRVToLLVM/CMakeLists.txt @@ -11,7 +11,7 @@ add_mlir_conversion_library(MLIRSPIRVToLLVM intrinsics_gen LINK_LIBS PUBLIC - MLIRArithmeticToLLVM + MLIRArithToLLVM MLIRFuncToLLVM MLIRGPUOps MLIRIR diff --git a/mlir/lib/Conversion/SPIRVToLLVM/ConvertLaunchFuncToLLVMCalls.cpp b/mlir/lib/Conversion/SPIRVToLLVM/ConvertLaunchFuncToLLVMCalls.cpp index 3957ff4..a58072c 100644 --- a/mlir/lib/Conversion/SPIRVToLLVM/ConvertLaunchFuncToLLVMCalls.cpp +++ b/mlir/lib/Conversion/SPIRVToLLVM/ConvertLaunchFuncToLLVMCalls.cpp @@ -13,7 +13,7 @@ #include "mlir/Conversion/SPIRVToLLVM/SPIRVToLLVMPass.h" -#include "mlir/Conversion/ArithmeticToLLVM/ArithmeticToLLVM.h" +#include "mlir/Conversion/ArithToLLVM/ArithToLLVM.h" #include "mlir/Conversion/FuncToLLVM/ConvertFuncToLLVM.h" #include "mlir/Conversion/LLVMCommon/LoweringOptions.h" #include "mlir/Conversion/LLVMCommon/Pattern.h" @@ -297,8 +297,7 @@ public: auto *context = module.getContext(); RewritePatternSet patterns(context); LLVMTypeConverter typeConverter(context, options); - mlir::arith::populateArithmeticToLLVMConversionPatterns(typeConverter, - patterns); + mlir::arith::populateArithToLLVMConversionPatterns(typeConverter, patterns); populateMemRefToLLVMConversionPatterns(typeConverter, patterns); populateFuncToLLVMConversionPatterns(typeConverter, patterns); patterns.add(typeConverter); diff --git a/mlir/lib/Conversion/ShapeToStandard/CMakeLists.txt b/mlir/lib/Conversion/ShapeToStandard/CMakeLists.txt index 5796d55..246f10b 100644 --- a/mlir/lib/Conversion/ShapeToStandard/CMakeLists.txt +++ b/mlir/lib/Conversion/ShapeToStandard/CMakeLists.txt @@ -17,7 +17,7 @@ add_mlir_conversion_library(MLIRShapeToStandard Core LINK_LIBS PUBLIC - MLIRArithmeticDialect + MLIRArithDialect MLIRIR MLIRShapeDialect MLIRTensorDialect diff --git a/mlir/lib/Conversion/ShapeToStandard/ShapeToStandard.cpp b/mlir/lib/Conversion/ShapeToStandard/ShapeToStandard.cpp index dea878b..e641bb4 100644 --- a/mlir/lib/Conversion/ShapeToStandard/ShapeToStandard.cpp +++ b/mlir/lib/Conversion/ShapeToStandard/ShapeToStandard.cpp @@ -8,7 +8,7 @@ #include "mlir/Conversion/ShapeToStandard/ShapeToStandard.h" -#include "mlir/Dialect/Arithmetic/IR/Arithmetic.h" +#include "mlir/Dialect/Arith/IR/Arith.h" #include "mlir/Dialect/Func/IR/FuncOps.h" #include "mlir/Dialect/SCF/IR/SCF.h" #include "mlir/Dialect/Shape/IR/Shape.h" @@ -695,7 +695,7 @@ void ConvertShapeToStandardPass::runOnOperation() { // Setup target legality. MLIRContext &ctx = getContext(); ConversionTarget target(ctx); - target.addLegalDialect(); target.addLegalOp(); diff --git a/mlir/lib/Conversion/TensorToLinalg/TensorToLinalgPass.cpp b/mlir/lib/Conversion/TensorToLinalg/TensorToLinalgPass.cpp index 3db90d7..c83434cc 100644 --- a/mlir/lib/Conversion/TensorToLinalg/TensorToLinalgPass.cpp +++ b/mlir/lib/Conversion/TensorToLinalg/TensorToLinalgPass.cpp @@ -13,7 +13,7 @@ #include "mlir/Conversion/TensorToLinalg/TensorToLinalgPass.h" #include "mlir/Conversion/TensorToLinalg/TensorToLinalg.h" -#include "mlir/Dialect/Arithmetic/IR/Arithmetic.h" +#include "mlir/Dialect/Arith/IR/Arith.h" #include "mlir/Dialect/Linalg/IR/Linalg.h" #include "mlir/Dialect/Tensor/IR/Tensor.h" @@ -31,9 +31,9 @@ class ConvertTensorToLinalgPass void runOnOperation() override { auto &context = getContext(); ConversionTarget target(context); - target.addLegalDialect(); + target + .addLegalDialect(); target.addIllegalOp(); RewritePatternSet patterns(&context); diff --git a/mlir/lib/Conversion/TensorToSPIRV/CMakeLists.txt b/mlir/lib/Conversion/TensorToSPIRV/CMakeLists.txt index 22ac11f..3126622 100644 --- a/mlir/lib/Conversion/TensorToSPIRV/CMakeLists.txt +++ b/mlir/lib/Conversion/TensorToSPIRV/CMakeLists.txt @@ -10,7 +10,7 @@ add_mlir_conversion_library(MLIRTensorToSPIRV MLIRConversionPassIncGen LINK_LIBS PUBLIC - MLIRArithmeticToSPIRV + MLIRArithToSPIRV MLIRFuncToSPIRV MLIRIR MLIRPass diff --git a/mlir/lib/Conversion/TensorToSPIRV/TensorToSPIRVPass.cpp b/mlir/lib/Conversion/TensorToSPIRV/TensorToSPIRVPass.cpp index b14ce1c..6b1145c 100644 --- a/mlir/lib/Conversion/TensorToSPIRV/TensorToSPIRVPass.cpp +++ b/mlir/lib/Conversion/TensorToSPIRV/TensorToSPIRVPass.cpp @@ -12,7 +12,7 @@ #include "mlir/Conversion/TensorToSPIRV/TensorToSPIRVPass.h" -#include "mlir/Conversion/ArithmeticToSPIRV/ArithmeticToSPIRV.h" +#include "mlir/Conversion/ArithToSPIRV/ArithToSPIRV.h" #include "mlir/Conversion/FuncToSPIRV/FuncToSPIRV.h" #include "mlir/Conversion/TensorToSPIRV/TensorToSPIRV.h" #include "mlir/Dialect/SPIRV/IR/SPIRVDialect.h" @@ -42,7 +42,7 @@ class ConvertTensorToSPIRVPass SPIRVTypeConverter typeConverter(targetAttr, options); RewritePatternSet patterns(context); - arith::populateArithmeticToSPIRVPatterns(typeConverter, patterns); + arith::populateArithToSPIRVPatterns(typeConverter, patterns); populateFuncToSPIRVPatterns(typeConverter, patterns); populateTensorToSPIRVPatterns(typeConverter, /*byteCountThreshold=*/64, patterns); diff --git a/mlir/lib/Conversion/TosaToArith/CMakeLists.txt b/mlir/lib/Conversion/TosaToArith/CMakeLists.txt index 0468f99..8f1640c 100644 --- a/mlir/lib/Conversion/TosaToArith/CMakeLists.txt +++ b/mlir/lib/Conversion/TosaToArith/CMakeLists.txt @@ -10,7 +10,7 @@ add_mlir_conversion_library(MLIRTosaToArith MLIRConversionPassIncGen LINK_LIBS PUBLIC - MLIRArithmeticDialect + MLIRArithDialect MLIRIR MLIRPass MLIRTosaDialect diff --git a/mlir/lib/Conversion/TosaToArith/TosaToArith.cpp b/mlir/lib/Conversion/TosaToArith/TosaToArith.cpp index f33e086..f188b1b 100644 --- a/mlir/lib/Conversion/TosaToArith/TosaToArith.cpp +++ b/mlir/lib/Conversion/TosaToArith/TosaToArith.cpp @@ -11,7 +11,7 @@ //===----------------------------------------------------------------------===// #include "mlir/Conversion/TosaToArith/TosaToArith.h" -#include "mlir/Dialect/Arithmetic/IR/Arithmetic.h" +#include "mlir/Dialect/Arith/IR/Arith.h" #include "mlir/Dialect/Tosa/IR/TosaOps.h" #include "mlir/IR/PatternMatch.h" #include "mlir/IR/TypeUtilities.h" diff --git a/mlir/lib/Conversion/TosaToArith/TosaToArithPass.cpp b/mlir/lib/Conversion/TosaToArith/TosaToArithPass.cpp index 85f7c8d..de82c03 100644 --- a/mlir/lib/Conversion/TosaToArith/TosaToArithPass.cpp +++ b/mlir/lib/Conversion/TosaToArith/TosaToArithPass.cpp @@ -12,7 +12,7 @@ #include "mlir/Conversion/TosaToArith/TosaToArith.h" -#include "mlir/Dialect/Arithmetic/IR/Arithmetic.h" +#include "mlir/Dialect/Arith/IR/Arith.h" #include "mlir/Dialect/Tosa/IR/TosaOps.h" #include "mlir/Dialect/Tosa/Transforms/Passes.h" #include "mlir/IR/PatternMatch.h" @@ -37,7 +37,7 @@ public: RewritePatternSet patterns(&getContext()); ConversionTarget target(getContext()); target.addIllegalOp(); - target.addLegalDialect(); + target.addLegalDialect(); mlir::tosa::populateTosaToArithConversionPatterns(&patterns); diff --git a/mlir/lib/Conversion/TosaToLinalg/CMakeLists.txt b/mlir/lib/Conversion/TosaToLinalg/CMakeLists.txt index 6d6d9c8..4b79bf8 100644 --- a/mlir/lib/Conversion/TosaToLinalg/CMakeLists.txt +++ b/mlir/lib/Conversion/TosaToLinalg/CMakeLists.txt @@ -12,7 +12,7 @@ add_mlir_conversion_library(MLIRTosaToLinalg MLIRConversionPassIncGen LINK_LIBS PUBLIC - MLIRArithmeticDialect + MLIRArithDialect MLIRDialectUtils MLIRIR MLIRLinalgDialect diff --git a/mlir/lib/Conversion/TosaToLinalg/TosaToLinalg.cpp b/mlir/lib/Conversion/TosaToLinalg/TosaToLinalg.cpp index f930a2b..11c7d06 100644 --- a/mlir/lib/Conversion/TosaToLinalg/TosaToLinalg.cpp +++ b/mlir/lib/Conversion/TosaToLinalg/TosaToLinalg.cpp @@ -11,7 +11,7 @@ //===----------------------------------------------------------------------===// #include "mlir/Conversion/TosaToLinalg/TosaToLinalg.h" -#include "mlir/Dialect/Arithmetic/IR/Arithmetic.h" +#include "mlir/Dialect/Arith/IR/Arith.h" #include "mlir/Dialect/Linalg/IR/Linalg.h" #include "mlir/Dialect/Math/IR/Math.h" #include "mlir/Dialect/SCF/IR/SCF.h" diff --git a/mlir/lib/Conversion/TosaToLinalg/TosaToLinalgNamed.cpp b/mlir/lib/Conversion/TosaToLinalg/TosaToLinalgNamed.cpp index 4a31bd6..513ade4 100644 --- a/mlir/lib/Conversion/TosaToLinalg/TosaToLinalgNamed.cpp +++ b/mlir/lib/Conversion/TosaToLinalg/TosaToLinalgNamed.cpp @@ -11,7 +11,7 @@ //===----------------------------------------------------------------------===// #include "mlir/Conversion/TosaToLinalg/TosaToLinalg.h" -#include "mlir/Dialect/Arithmetic/IR/Arithmetic.h" +#include "mlir/Dialect/Arith/IR/Arith.h" #include "mlir/Dialect/Linalg/IR/Linalg.h" #include "mlir/Dialect/Math/IR/Math.h" #include "mlir/Dialect/SCF/IR/SCF.h" diff --git a/mlir/lib/Conversion/TosaToLinalg/TosaToLinalgNamedPass.cpp b/mlir/lib/Conversion/TosaToLinalg/TosaToLinalgNamedPass.cpp index 51f2ebc..ac67faa 100644 --- a/mlir/lib/Conversion/TosaToLinalg/TosaToLinalgNamedPass.cpp +++ b/mlir/lib/Conversion/TosaToLinalg/TosaToLinalgNamedPass.cpp @@ -12,7 +12,7 @@ #include "mlir/Conversion/TosaToLinalg/TosaToLinalg.h" -#include "mlir/Dialect/Arithmetic/IR/Arithmetic.h" +#include "mlir/Dialect/Arith/IR/Arith.h" #include "mlir/Dialect/Func/IR/FuncOps.h" #include "mlir/Dialect/Linalg/IR/Linalg.h" #include "mlir/Dialect/Math/IR/Math.h" @@ -39,8 +39,8 @@ struct TosaToLinalgNamed public: void getDependentDialects(DialectRegistry ®istry) const override { registry - .insert(); + .insert(); } void runOnOperation() override { diff --git a/mlir/lib/Conversion/TosaToLinalg/TosaToLinalgPass.cpp b/mlir/lib/Conversion/TosaToLinalg/TosaToLinalgPass.cpp index bcaad55..1cb6e20 100644 --- a/mlir/lib/Conversion/TosaToLinalg/TosaToLinalgPass.cpp +++ b/mlir/lib/Conversion/TosaToLinalg/TosaToLinalgPass.cpp @@ -12,7 +12,7 @@ #include "mlir/Conversion/TosaToLinalg/TosaToLinalg.h" -#include "mlir/Dialect/Arithmetic/IR/Arithmetic.h" +#include "mlir/Dialect/Arith/IR/Arith.h" #include "mlir/Dialect/Func/IR/FuncOps.h" #include "mlir/Dialect/Linalg/IR/Linalg.h" #include "mlir/Dialect/Math/IR/Math.h" @@ -39,8 +39,8 @@ struct TosaToLinalg : public impl::TosaToLinalgBase { public: void getDependentDialects(DialectRegistry ®istry) const override { registry - .insert(); + .insert(); } void runOnOperation() override { diff --git a/mlir/lib/Conversion/TosaToTensor/TosaToTensor.cpp b/mlir/lib/Conversion/TosaToTensor/TosaToTensor.cpp index 438e6fe..9f2714d 100644 --- a/mlir/lib/Conversion/TosaToTensor/TosaToTensor.cpp +++ b/mlir/lib/Conversion/TosaToTensor/TosaToTensor.cpp @@ -11,7 +11,7 @@ //===----------------------------------------------------------------------===// #include "mlir/Conversion/TosaToTensor/TosaToTensor.h" -#include "mlir/Dialect/Arithmetic/IR/Arithmetic.h" +#include "mlir/Dialect/Arith/IR/Arith.h" #include "mlir/Dialect/Tensor/IR/Tensor.h" #include "mlir/Dialect/Tosa/IR/TosaOps.h" #include "mlir/IR/PatternMatch.h" diff --git a/mlir/lib/Conversion/TosaToTensor/TosaToTensorPass.cpp b/mlir/lib/Conversion/TosaToTensor/TosaToTensorPass.cpp index cc129f9..bf8d709 100644 --- a/mlir/lib/Conversion/TosaToTensor/TosaToTensorPass.cpp +++ b/mlir/lib/Conversion/TosaToTensor/TosaToTensorPass.cpp @@ -12,7 +12,7 @@ #include "mlir/Conversion/TosaToTensor/TosaToTensor.h" -#include "mlir/Dialect/Arithmetic/IR/Arithmetic.h" +#include "mlir/Dialect/Arith/IR/Arith.h" #include "mlir/Dialect/Tensor/IR/Tensor.h" #include "mlir/Dialect/Tosa/IR/TosaOps.h" #include "mlir/Dialect/Tosa/Transforms/Passes.h" @@ -36,7 +36,7 @@ public: RewritePatternSet patterns(&getContext()); ConversionTarget target(getContext()); target.addIllegalOp(); - target.addLegalDialect(); + target.addLegalDialect(); target.addLegalDialect(); mlir::tosa::populateTosaToTensorConversionPatterns(&patterns); diff --git a/mlir/lib/Conversion/VectorToGPU/CMakeLists.txt b/mlir/lib/Conversion/VectorToGPU/CMakeLists.txt index 1f67a96..b29551a 100644 --- a/mlir/lib/Conversion/VectorToGPU/CMakeLists.txt +++ b/mlir/lib/Conversion/VectorToGPU/CMakeLists.txt @@ -9,7 +9,7 @@ add_mlir_conversion_library(MLIRVectorToGPU Core LINK_LIBS PUBLIC - MLIRArithmeticDialect + MLIRArithDialect MLIRGPUOps MLIRLLVMDialect MLIRMemRefDialect diff --git a/mlir/lib/Conversion/VectorToGPU/NvGpuSupport.cpp b/mlir/lib/Conversion/VectorToGPU/NvGpuSupport.cpp index 9df576c..5bd1757 100644 --- a/mlir/lib/Conversion/VectorToGPU/NvGpuSupport.cpp +++ b/mlir/lib/Conversion/VectorToGPU/NvGpuSupport.cpp @@ -12,7 +12,7 @@ //===----------------------------------------------------------------------===// #include "NvGpuSupport.h" -#include "mlir/Dialect/Arithmetic/IR/Arithmetic.h" +#include "mlir/Dialect/Arith/IR/Arith.h" #include "mlir/Dialect/NVGPU/IR/NVGPUDialect.h" #include "mlir/Dialect/Vector/IR/VectorOps.h" diff --git a/mlir/lib/Conversion/VectorToGPU/VectorToGPU.cpp b/mlir/lib/Conversion/VectorToGPU/VectorToGPU.cpp index 7a847c7..9574035 100644 --- a/mlir/lib/Conversion/VectorToGPU/VectorToGPU.cpp +++ b/mlir/lib/Conversion/VectorToGPU/VectorToGPU.cpp @@ -16,7 +16,7 @@ #include "mlir/Conversion/VectorToGPU/VectorToGPU.h" #include "mlir/Analysis/SliceAnalysis.h" -#include "mlir/Dialect/Arithmetic/IR/Arithmetic.h" +#include "mlir/Dialect/Arith/IR/Arith.h" #include "mlir/Dialect/GPU/IR/GPUDialect.h" #include "mlir/Dialect/MemRef/IR/MemRef.h" #include "mlir/Dialect/NVGPU/IR/NVGPUDialect.h" diff --git a/mlir/lib/Conversion/VectorToLLVM/CMakeLists.txt b/mlir/lib/Conversion/VectorToLLVM/CMakeLists.txt index dee915e..b7fadea 100644 --- a/mlir/lib/Conversion/VectorToLLVM/CMakeLists.txt +++ b/mlir/lib/Conversion/VectorToLLVM/CMakeLists.txt @@ -13,7 +13,7 @@ add_mlir_conversion_library(MLIRVectorToLLVM Core LINK_LIBS PUBLIC - MLIRArithmeticDialect + MLIRArithDialect MLIRArmNeonDialect MLIRArmSVEDialect MLIRArmSVETransforms diff --git a/mlir/lib/Conversion/VectorToLLVM/ConvertVectorToLLVM.cpp b/mlir/lib/Conversion/VectorToLLVM/ConvertVectorToLLVM.cpp index 26ea7f3..f4191e2 100644 --- a/mlir/lib/Conversion/VectorToLLVM/ConvertVectorToLLVM.cpp +++ b/mlir/lib/Conversion/VectorToLLVM/ConvertVectorToLLVM.cpp @@ -9,8 +9,8 @@ #include "mlir/Conversion/VectorToLLVM/ConvertVectorToLLVM.h" #include "mlir/Conversion/LLVMCommon/VectorPattern.h" -#include "mlir/Dialect/Arithmetic/IR/Arithmetic.h" -#include "mlir/Dialect/Arithmetic/Utils/Utils.h" +#include "mlir/Dialect/Arith/IR/Arith.h" +#include "mlir/Dialect/Arith/Utils/Utils.h" #include "mlir/Dialect/LLVMIR/FunctionCallUtils.h" #include "mlir/Dialect/LLVMIR/LLVMDialect.h" #include "mlir/Dialect/MemRef/IR/MemRef.h" diff --git a/mlir/lib/Conversion/VectorToLLVM/ConvertVectorToLLVMPass.cpp b/mlir/lib/Conversion/VectorToLLVM/ConvertVectorToLLVMPass.cpp index d74a3cf..a1667ff 100644 --- a/mlir/lib/Conversion/VectorToLLVM/ConvertVectorToLLVMPass.cpp +++ b/mlir/lib/Conversion/VectorToLLVM/ConvertVectorToLLVMPass.cpp @@ -12,7 +12,7 @@ #include "mlir/Conversion/LLVMCommon/TypeConverter.h" #include "mlir/Dialect/AMX/AMXDialect.h" #include "mlir/Dialect/AMX/Transforms.h" -#include "mlir/Dialect/Arithmetic/IR/Arithmetic.h" +#include "mlir/Dialect/Arith/IR/Arith.h" #include "mlir/Dialect/ArmNeon/ArmNeonDialect.h" #include "mlir/Dialect/ArmSVE/ArmSVEDialect.h" #include "mlir/Dialect/ArmSVE/Transforms.h" @@ -47,7 +47,7 @@ struct LowerVectorToLLVMPass // Override explicitly to allow conditional dialect dependence. void getDependentDialects(DialectRegistry ®istry) const override { registry.insert(); - registry.insert(); + registry.insert(); registry.insert(); if (armNeon) registry.insert(); @@ -90,7 +90,7 @@ void LowerVectorToLLVMPass::runOnOperation() { // Architecture specific augmentations. LLVMConversionTarget target(getContext()); - target.addLegalDialect(); + target.addLegalDialect(); target.addLegalDialect(); target.addLegalOp(); if (armNeon) { diff --git a/mlir/lib/Conversion/VectorToSCF/CMakeLists.txt b/mlir/lib/Conversion/VectorToSCF/CMakeLists.txt index 2d8614c..83bbc4a 100644 --- a/mlir/lib/Conversion/VectorToSCF/CMakeLists.txt +++ b/mlir/lib/Conversion/VectorToSCF/CMakeLists.txt @@ -8,7 +8,7 @@ add_mlir_conversion_library(MLIRVectorToSCF Core LINK_LIBS PUBLIC - MLIRArithmeticDialect + MLIRArithDialect MLIRLLVMDialect MLIRMemRefDialect MLIRTransforms diff --git a/mlir/lib/Conversion/VectorToSCF/VectorToSCF.cpp b/mlir/lib/Conversion/VectorToSCF/VectorToSCF.cpp index 15b0cd6..8186a2b 100644 --- a/mlir/lib/Conversion/VectorToSCF/VectorToSCF.cpp +++ b/mlir/lib/Conversion/VectorToSCF/VectorToSCF.cpp @@ -15,7 +15,7 @@ #include "mlir/Conversion/VectorToSCF/VectorToSCF.h" #include "mlir/Dialect/Affine/IR/AffineOps.h" -#include "mlir/Dialect/Arithmetic/IR/Arithmetic.h" +#include "mlir/Dialect/Arith/IR/Arith.h" #include "mlir/Dialect/MemRef/IR/MemRef.h" #include "mlir/Dialect/SCF/IR/SCF.h" #include "mlir/Dialect/Vector/Transforms/VectorTransforms.h" diff --git a/mlir/lib/Dialect/Affine/Analysis/AffineStructures.cpp b/mlir/lib/Dialect/Affine/Analysis/AffineStructures.cpp index 76e9625..c14c960 100644 --- a/mlir/lib/Dialect/Affine/Analysis/AffineStructures.cpp +++ b/mlir/lib/Dialect/Affine/Analysis/AffineStructures.cpp @@ -16,7 +16,7 @@ #include "mlir/Analysis/Presburger/Utils.h" #include "mlir/Dialect/Affine/IR/AffineOps.h" #include "mlir/Dialect/Affine/IR/AffineValueMap.h" -#include "mlir/Dialect/Arithmetic/IR/Arithmetic.h" +#include "mlir/Dialect/Arith/IR/Arith.h" #include "mlir/IR/AffineExprVisitor.h" #include "mlir/IR/IntegerSet.h" #include "mlir/Support/LLVM.h" diff --git a/mlir/lib/Dialect/Affine/Analysis/Utils.cpp b/mlir/lib/Dialect/Affine/Analysis/Utils.cpp index 0621cf3..6f6d988 100644 --- a/mlir/lib/Dialect/Affine/Analysis/Utils.cpp +++ b/mlir/lib/Dialect/Affine/Analysis/Utils.cpp @@ -17,7 +17,7 @@ #include "mlir/Dialect/Affine/Analysis/LoopAnalysis.h" #include "mlir/Dialect/Affine/IR/AffineOps.h" #include "mlir/Dialect/Affine/IR/AffineValueMap.h" -#include "mlir/Dialect/Arithmetic/IR/Arithmetic.h" +#include "mlir/Dialect/Arith/IR/Arith.h" #include "mlir/IR/IntegerSet.h" #include "llvm/ADT/SmallPtrSet.h" #include "llvm/Support/Debug.h" diff --git a/mlir/lib/Dialect/Affine/IR/CMakeLists.txt b/mlir/lib/Dialect/Affine/IR/CMakeLists.txt index e98c935..9d35cb1 100644 --- a/mlir/lib/Dialect/Affine/IR/CMakeLists.txt +++ b/mlir/lib/Dialect/Affine/IR/CMakeLists.txt @@ -11,7 +11,7 @@ add_mlir_dialect_library(MLIRAffineDialect MLIRAffineOpsIncGen LINK_LIBS PUBLIC - MLIRArithmeticDialect + MLIRArithDialect MLIRDialectUtils MLIRIR MLIRLoopLikeInterface diff --git a/mlir/lib/Dialect/Affine/Transforms/AffineDataCopyGeneration.cpp b/mlir/lib/Dialect/Affine/Transforms/AffineDataCopyGeneration.cpp index 815f002..027ebc3 100644 --- a/mlir/lib/Dialect/Affine/Transforms/AffineDataCopyGeneration.cpp +++ b/mlir/lib/Dialect/Affine/Transforms/AffineDataCopyGeneration.cpp @@ -24,7 +24,7 @@ #include "mlir/Dialect/Affine/Analysis/Utils.h" #include "mlir/Dialect/Affine/IR/AffineOps.h" #include "mlir/Dialect/Affine/LoopUtils.h" -#include "mlir/Dialect/Arithmetic/IR/Arithmetic.h" +#include "mlir/Dialect/Arith/IR/Arith.h" #include "mlir/Dialect/Func/IR/FuncOps.h" #include "mlir/Dialect/MemRef/IR/MemRef.h" #include "mlir/Transforms/GreedyPatternRewriteDriver.h" diff --git a/mlir/lib/Dialect/Affine/Transforms/AffineLoopInvariantCodeMotion.cpp b/mlir/lib/Dialect/Affine/Transforms/AffineLoopInvariantCodeMotion.cpp index 9794ad6..92fb4a6 100644 --- a/mlir/lib/Dialect/Affine/Transforms/AffineLoopInvariantCodeMotion.cpp +++ b/mlir/lib/Dialect/Affine/Transforms/AffineLoopInvariantCodeMotion.cpp @@ -20,7 +20,7 @@ #include "mlir/Dialect/Affine/IR/AffineOps.h" #include "mlir/Dialect/Affine/LoopUtils.h" #include "mlir/Dialect/Affine/Utils.h" -#include "mlir/Dialect/Arithmetic/IR/Arithmetic.h" +#include "mlir/Dialect/Arith/IR/Arith.h" #include "mlir/Dialect/Func/IR/FuncOps.h" #include "mlir/IR/AffineExpr.h" #include "mlir/IR/AffineMap.h" diff --git a/mlir/lib/Dialect/Affine/Transforms/CMakeLists.txt b/mlir/lib/Dialect/Affine/Transforms/CMakeLists.txt index 4601a11..02f4a51 100644 --- a/mlir/lib/Dialect/Affine/Transforms/CMakeLists.txt +++ b/mlir/lib/Dialect/Affine/Transforms/CMakeLists.txt @@ -26,7 +26,7 @@ add_mlir_dialect_library(MLIRAffineTransforms MLIRAffineDialect MLIRAffineAnalysis MLIRAffineUtils - MLIRArithmeticDialect + MLIRArithDialect MLIRIR MLIRMemRefDialect MLIRPass diff --git a/mlir/lib/Dialect/Affine/Transforms/LoopCoalescing.cpp b/mlir/lib/Dialect/Affine/Transforms/LoopCoalescing.cpp index a451840..3b0d690 100644 --- a/mlir/lib/Dialect/Affine/Transforms/LoopCoalescing.cpp +++ b/mlir/lib/Dialect/Affine/Transforms/LoopCoalescing.cpp @@ -10,7 +10,7 @@ #include "mlir/Dialect/Affine/IR/AffineOps.h" #include "mlir/Dialect/Affine/LoopUtils.h" -#include "mlir/Dialect/Arithmetic/IR/Arithmetic.h" +#include "mlir/Dialect/Arith/IR/Arith.h" #include "mlir/Dialect/Func/IR/FuncOps.h" #include "mlir/Dialect/SCF/IR/SCF.h" #include "mlir/Dialect/SCF/Utils/Utils.h" diff --git a/mlir/lib/Dialect/Affine/Transforms/PipelineDataTransfer.cpp b/mlir/lib/Dialect/Affine/Transforms/PipelineDataTransfer.cpp index 5c2046a..1329d9d 100644 --- a/mlir/lib/Dialect/Affine/Transforms/PipelineDataTransfer.cpp +++ b/mlir/lib/Dialect/Affine/Transforms/PipelineDataTransfer.cpp @@ -18,7 +18,7 @@ #include "mlir/Dialect/Affine/IR/AffineOps.h" #include "mlir/Dialect/Affine/LoopUtils.h" #include "mlir/Dialect/Affine/Utils.h" -#include "mlir/Dialect/Arithmetic/Utils/Utils.h" +#include "mlir/Dialect/Arith/Utils/Utils.h" #include "mlir/Dialect/Func/IR/FuncOps.h" #include "mlir/Dialect/MemRef/IR/MemRef.h" #include "mlir/IR/Builders.h" diff --git a/mlir/lib/Dialect/Affine/Transforms/SuperVectorize.cpp b/mlir/lib/Dialect/Affine/Transforms/SuperVectorize.cpp index e59d554..e490b8c 100644 --- a/mlir/lib/Dialect/Affine/Transforms/SuperVectorize.cpp +++ b/mlir/lib/Dialect/Affine/Transforms/SuperVectorize.cpp @@ -19,7 +19,7 @@ #include "mlir/Dialect/Affine/Analysis/NestedMatcher.h" #include "mlir/Dialect/Affine/IR/AffineOps.h" #include "mlir/Dialect/Affine/Utils.h" -#include "mlir/Dialect/Arithmetic/IR/Arithmetic.h" +#include "mlir/Dialect/Arith/IR/Arith.h" #include "mlir/Dialect/Func/IR/FuncOps.h" #include "mlir/Dialect/Vector/IR/VectorOps.h" #include "mlir/Dialect/Vector/Utils/VectorUtils.h" diff --git a/mlir/lib/Dialect/Affine/Utils/CMakeLists.txt b/mlir/lib/Dialect/Affine/Utils/CMakeLists.txt index 0c5aa5c..c2ce43f 100644 --- a/mlir/lib/Dialect/Affine/Utils/CMakeLists.txt +++ b/mlir/lib/Dialect/Affine/Utils/CMakeLists.txt @@ -11,7 +11,7 @@ add_mlir_dialect_library(MLIRAffineUtils MLIRAffineDialect MLIRAffineAnalysis MLIRAnalysis - MLIRArithmeticUtils + MLIRArithUtils MLIRMemRefDialect MLIRTransformUtils MLIRViewLikeInterface diff --git a/mlir/lib/Dialect/Affine/Utils/Utils.cpp b/mlir/lib/Dialect/Affine/Utils/Utils.cpp index 9546cb3..0161325 100644 --- a/mlir/lib/Dialect/Affine/Utils/Utils.cpp +++ b/mlir/lib/Dialect/Affine/Utils/Utils.cpp @@ -17,7 +17,7 @@ #include "mlir/Dialect/Affine/IR/AffineOps.h" #include "mlir/Dialect/Affine/IR/AffineValueMap.h" #include "mlir/Dialect/Affine/LoopUtils.h" -#include "mlir/Dialect/Arithmetic/Utils/Utils.h" +#include "mlir/Dialect/Arith/Utils/Utils.h" #include "mlir/Dialect/Func/IR/FuncOps.h" #include "mlir/Dialect/MemRef/IR/MemRef.h" #include "mlir/IR/AffineExprVisitor.h" diff --git a/mlir/lib/Dialect/Arithmetic/CMakeLists.txt b/mlir/lib/Dialect/Arith/CMakeLists.txt similarity index 100% rename from mlir/lib/Dialect/Arithmetic/CMakeLists.txt rename to mlir/lib/Dialect/Arith/CMakeLists.txt diff --git a/mlir/lib/Dialect/Arithmetic/IR/ArithmeticCanonicalization.td b/mlir/lib/Dialect/Arith/IR/ArithCanonicalization.td similarity index 97% rename from mlir/lib/Dialect/Arithmetic/IR/ArithmeticCanonicalization.td rename to mlir/lib/Dialect/Arith/IR/ArithCanonicalization.td index 0dd8039..f57c4d8 100644 --- a/mlir/lib/Dialect/Arithmetic/IR/ArithmeticCanonicalization.td +++ b/mlir/lib/Dialect/Arith/IR/ArithCanonicalization.td @@ -1,4 +1,4 @@ -//===- ArithmeticPatterns.td - Arithmetic dialect patterns -*- tablegen -*-===// +//===- ArithPatterns.td - Arith dialect patterns -*- tablegen -*-===// // // Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions. // See https://llvm.org/LICENSE.txt for license information. @@ -6,11 +6,11 @@ // //===----------------------------------------------------------------------===// -#ifndef ARITHMETIC_PATTERNS -#define ARITHMETIC_PATTERNS +#ifndef ARITH_PATTERNS +#define ARITH_PATTERNS include "mlir/IR/PatternBase.td" -include "mlir/Dialect/Arithmetic/IR/ArithmeticOps.td" +include "mlir/Dialect/Arith/IR/ArithOps.td" // Create zero attribute of type matching the argument's type. def GetZeroAttr : NativeCodeCall<"$_builder.getZeroAttr($0.getType())">; @@ -213,4 +213,4 @@ def DivFOfNegF : Pat<(Arith_DivFOp (Arith_NegFOp $x), (Arith_NegFOp $y)), (Arith_DivFOp $x, $y), [(Constraint> $x, $y)]>; -#endif // ARITHMETIC_PATTERNS +#endif // ARITH_PATTERNS diff --git a/mlir/lib/Dialect/Arithmetic/IR/ArithmeticDialect.cpp b/mlir/lib/Dialect/Arith/IR/ArithDialect.cpp similarity index 57% rename from mlir/lib/Dialect/Arithmetic/IR/ArithmeticDialect.cpp rename to mlir/lib/Dialect/Arith/IR/ArithDialect.cpp index ea4acbc..35cb7da 100644 --- a/mlir/lib/Dialect/Arithmetic/IR/ArithmeticDialect.cpp +++ b/mlir/lib/Dialect/Arith/IR/ArithDialect.cpp @@ -1,4 +1,4 @@ -//===- ArithmeticDialect.cpp - MLIR Arithmetic dialect implementation -----===// +//===- ArithDialect.cpp - MLIR Arith dialect implementation -----===// // // Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions. // See https://llvm.org/LICENSE.txt for license information. @@ -6,19 +6,19 @@ // //===----------------------------------------------------------------------===// -#include "mlir/Dialect/Arithmetic/IR/Arithmetic.h" +#include "mlir/Dialect/Arith/IR/Arith.h" #include "mlir/IR/Builders.h" #include "mlir/Transforms/InliningUtils.h" using namespace mlir; using namespace mlir::arith; -#include "mlir/Dialect/Arithmetic/IR/ArithmeticOpsDialect.cpp.inc" +#include "mlir/Dialect/Arith/IR/ArithOpsDialect.cpp.inc" namespace { /// This class defines the interface for handling inlining for arithmetic /// dialect operations. -struct ArithmeticInlinerInterface : public DialectInlinerInterface { +struct ArithInlinerInterface : public DialectInlinerInterface { using DialectInlinerInterface::DialectInlinerInterface; /// All arithmetic dialect ops can be inlined. @@ -29,18 +29,17 @@ struct ArithmeticInlinerInterface : public DialectInlinerInterface { }; } // namespace -void arith::ArithmeticDialect::initialize() { +void arith::ArithDialect::initialize() { addOperations< #define GET_OP_LIST -#include "mlir/Dialect/Arithmetic/IR/ArithmeticOps.cpp.inc" +#include "mlir/Dialect/Arith/IR/ArithOps.cpp.inc" >(); - addInterfaces(); + addInterfaces(); } /// Materialize an integer or floating point constant. -Operation *arith::ArithmeticDialect::materializeConstant(OpBuilder &builder, - Attribute value, - Type type, - Location loc) { +Operation *arith::ArithDialect::materializeConstant(OpBuilder &builder, + Attribute value, Type type, + Location loc) { return builder.create(loc, value, type); } diff --git a/mlir/lib/Dialect/Arithmetic/IR/ArithmeticOps.cpp b/mlir/lib/Dialect/Arith/IR/ArithOps.cpp similarity index 99% rename from mlir/lib/Dialect/Arithmetic/IR/ArithmeticOps.cpp rename to mlir/lib/Dialect/Arith/IR/ArithOps.cpp index 1891ce8..d62e3f3 100644 --- a/mlir/lib/Dialect/Arithmetic/IR/ArithmeticOps.cpp +++ b/mlir/lib/Dialect/Arith/IR/ArithOps.cpp @@ -1,4 +1,4 @@ -//===- ArithmeticOps.cpp - MLIR Arithmetic dialect ops implementation -----===// +//===- ArithOps.cpp - MLIR Arith dialect ops implementation -----===// // // Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions. // See https://llvm.org/LICENSE.txt for license information. @@ -9,7 +9,7 @@ #include #include -#include "mlir/Dialect/Arithmetic/IR/Arithmetic.h" +#include "mlir/Dialect/Arith/IR/Arith.h" #include "mlir/Dialect/CommonFolders.h" #include "mlir/IR/Builders.h" #include "mlir/IR/Matchers.h" @@ -78,7 +78,7 @@ static arith::CmpIPredicateAttr invertPredicate(arith::CmpIPredicateAttr pred) { //===----------------------------------------------------------------------===// namespace { -#include "ArithmeticCanonicalization.inc" +#include "ArithCanonicalization.inc" } // namespace //===----------------------------------------------------------------------===// @@ -2153,10 +2153,10 @@ Value mlir::arith::getReductionOp(AtomicRMWKind op, OpBuilder &builder, //===----------------------------------------------------------------------===// #define GET_OP_CLASSES -#include "mlir/Dialect/Arithmetic/IR/ArithmeticOps.cpp.inc" +#include "mlir/Dialect/Arith/IR/ArithOps.cpp.inc" //===----------------------------------------------------------------------===// // TableGen'd enum attribute definitions //===----------------------------------------------------------------------===// -#include "mlir/Dialect/Arithmetic/IR/ArithmeticOpsEnums.cpp.inc" +#include "mlir/Dialect/Arith/IR/ArithOpsEnums.cpp.inc" diff --git a/mlir/lib/Dialect/Arith/IR/CMakeLists.txt b/mlir/lib/Dialect/Arith/IR/CMakeLists.txt new file mode 100644 index 0000000..ffd7ee3 --- /dev/null +++ b/mlir/lib/Dialect/Arith/IR/CMakeLists.txt @@ -0,0 +1,21 @@ +set(LLVM_TARGET_DEFINITIONS ArithCanonicalization.td) +mlir_tablegen(ArithCanonicalization.inc -gen-rewriters) +add_public_tablegen_target(MLIRArithCanonicalizationIncGen) + +add_mlir_dialect_library(MLIRArithDialect + ArithOps.cpp + ArithDialect.cpp + InferIntRangeInterfaceImpls.cpp + + ADDITIONAL_HEADER_DIRS + ${MLIR_MAIN_INCLUDE_DIR}/mlir/Dialect/Arith + + DEPENDS + MLIRArithOpsIncGen + + LINK_LIBS PUBLIC + MLIRDialect + MLIRInferIntRangeInterface + MLIRInferTypeOpInterface + MLIRIR + ) diff --git a/mlir/lib/Dialect/Arithmetic/IR/InferIntRangeInterfaceImpls.cpp b/mlir/lib/Dialect/Arith/IR/InferIntRangeInterfaceImpls.cpp similarity index 99% rename from mlir/lib/Dialect/Arithmetic/IR/InferIntRangeInterfaceImpls.cpp rename to mlir/lib/Dialect/Arith/IR/InferIntRangeInterfaceImpls.cpp index 0c887e8..e59469c 100644 --- a/mlir/lib/Dialect/Arithmetic/IR/InferIntRangeInterfaceImpls.cpp +++ b/mlir/lib/Dialect/Arith/IR/InferIntRangeInterfaceImpls.cpp @@ -6,7 +6,7 @@ // //===----------------------------------------------------------------------===// -#include "mlir/Dialect/Arithmetic/IR/Arithmetic.h" +#include "mlir/Dialect/Arith/IR/Arith.h" #include "mlir/Interfaces/InferIntRangeInterface.h" #include "llvm/Support/Debug.h" diff --git a/mlir/lib/Dialect/Arithmetic/Transforms/BufferizableOpInterfaceImpl.cpp b/mlir/lib/Dialect/Arith/Transforms/BufferizableOpInterfaceImpl.cpp similarity index 97% rename from mlir/lib/Dialect/Arithmetic/Transforms/BufferizableOpInterfaceImpl.cpp rename to mlir/lib/Dialect/Arith/Transforms/BufferizableOpInterfaceImpl.cpp index 8398740a..2606cb6 100644 --- a/mlir/lib/Dialect/Arithmetic/Transforms/BufferizableOpInterfaceImpl.cpp +++ b/mlir/lib/Dialect/Arith/Transforms/BufferizableOpInterfaceImpl.cpp @@ -6,8 +6,8 @@ // //===----------------------------------------------------------------------===// -#include "mlir/Dialect/Arithmetic/Transforms/BufferizableOpInterfaceImpl.h" -#include "mlir/Dialect/Arithmetic/IR/Arithmetic.h" +#include "mlir/Dialect/Arith/Transforms/BufferizableOpInterfaceImpl.h" +#include "mlir/Dialect/Arith/IR/Arith.h" #include "mlir/Dialect/Bufferization/IR/BufferizableOpInterface.h" #include "mlir/Dialect/Bufferization/Transforms/BufferUtils.h" #include "mlir/Dialect/MemRef/IR/MemRef.h" @@ -210,7 +210,7 @@ struct SelectOpInterface void mlir::arith::registerBufferizableOpInterfaceExternalModels( DialectRegistry ®istry) { - registry.addExtension(+[](MLIRContext *ctx, ArithmeticDialect *dialect) { + registry.addExtension(+[](MLIRContext *ctx, ArithDialect *dialect) { ConstantOp::attachInterface(*ctx); IndexCastOp::attachInterface(*ctx); SelectOp::attachInterface(*ctx); diff --git a/mlir/lib/Dialect/Arithmetic/Transforms/Bufferize.cpp b/mlir/lib/Dialect/Arith/Transforms/Bufferize.cpp similarity index 59% rename from mlir/lib/Dialect/Arithmetic/Transforms/Bufferize.cpp rename to mlir/lib/Dialect/Arith/Transforms/Bufferize.cpp index 72bf79f..f2a0f45 100644 --- a/mlir/lib/Dialect/Arithmetic/Transforms/Bufferize.cpp +++ b/mlir/lib/Dialect/Arith/Transforms/Bufferize.cpp @@ -1,4 +1,4 @@ -//===- Bufferize.cpp - Bufferization for Arithmetic ops ---------*- C++ -*-===// +//===- Bufferize.cpp - Bufferization for Arith ops ---------*- C++ -*-===// // // Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions. // See https://llvm.org/LICENSE.txt for license information. @@ -6,10 +6,10 @@ // //===----------------------------------------------------------------------===// -#include "mlir/Dialect/Arithmetic/Transforms/Passes.h" +#include "mlir/Dialect/Arith/Transforms/Passes.h" -#include "mlir/Dialect/Arithmetic/IR/Arithmetic.h" -#include "mlir/Dialect/Arithmetic/Transforms/BufferizableOpInterfaceImpl.h" +#include "mlir/Dialect/Arith/IR/Arith.h" +#include "mlir/Dialect/Arith/Transforms/BufferizableOpInterfaceImpl.h" #include "mlir/Dialect/Bufferization/IR/BufferizableOpInterface.h" #include "mlir/Dialect/Bufferization/IR/Bufferization.h" #include "mlir/Dialect/Bufferization/Transforms/Bufferize.h" @@ -17,8 +17,8 @@ namespace mlir { namespace arith { -#define GEN_PASS_DEF_ARITHMETICBUFFERIZE -#include "mlir/Dialect/Arithmetic/Transforms/Passes.h.inc" +#define GEN_PASS_DEF_ARITHBUFFERIZE +#include "mlir/Dialect/Arith/Transforms/Passes.h.inc" } // namespace arith } // namespace mlir @@ -26,10 +26,10 @@ using namespace mlir; using namespace bufferization; namespace { -/// Pass to bufferize Arithmetic ops. -struct ArithmeticBufferizePass - : public arith::impl::ArithmeticBufferizeBase { - ArithmeticBufferizePass(uint64_t alignment = 0, bool constantOpOnly = false) +/// Pass to bufferize Arith ops. +struct ArithBufferizePass + : public arith::impl::ArithBufferizeBase { + ArithBufferizePass(uint64_t alignment = 0, bool constantOpOnly = false) : constantOpOnly(constantOpOnly) { this->alignment = alignment; } @@ -39,7 +39,7 @@ struct ArithmeticBufferizePass if (constantOpOnly) { options.opFilter.allowOperation(); } else { - options.opFilter.allowDialect(); + options.opFilter.allowDialect(); } options.bufferAlignment = alignment; @@ -49,7 +49,7 @@ struct ArithmeticBufferizePass void getDependentDialects(DialectRegistry ®istry) const override { registry.insert(); + arith::ArithDialect>(); arith::registerBufferizableOpInterfaceExternalModels(registry); } @@ -58,12 +58,12 @@ private: }; } // namespace -std::unique_ptr mlir::arith::createArithmeticBufferizePass() { - return std::make_unique(); +std::unique_ptr mlir::arith::createArithBufferizePass() { + return std::make_unique(); } std::unique_ptr mlir::arith::createConstantBufferizePass(uint64_t alignment) { - return std::make_unique(alignment, - /*constantOpOnly=*/true); + return std::make_unique(alignment, + /*constantOpOnly=*/true); } diff --git a/mlir/lib/Dialect/Arithmetic/Transforms/CMakeLists.txt b/mlir/lib/Dialect/Arith/Transforms/CMakeLists.txt similarity index 71% rename from mlir/lib/Dialect/Arithmetic/Transforms/CMakeLists.txt rename to mlir/lib/Dialect/Arith/Transforms/CMakeLists.txt index ba68d36..b45ae48 100644 --- a/mlir/lib/Dialect/Arithmetic/Transforms/CMakeLists.txt +++ b/mlir/lib/Dialect/Arith/Transforms/CMakeLists.txt @@ -1,4 +1,4 @@ -add_mlir_dialect_library(MLIRArithmeticTransforms +add_mlir_dialect_library(MLIRArithTransforms BufferizableOpInterfaceImpl.cpp Bufferize.cpp EmulateWideInt.cpp @@ -6,14 +6,14 @@ add_mlir_dialect_library(MLIRArithmeticTransforms UnsignedWhenEquivalent.cpp ADDITIONAL_HEADER_DIRS - {$MLIR_MAIN_INCLUDE_DIR}/mlir/Dialect/Arithmetic/Transforms + {$MLIR_MAIN_INCLUDE_DIR}/mlir/Dialect/Arith/Transforms DEPENDS - MLIRArithmeticTransformsIncGen + MLIRArithTransformsIncGen LINK_LIBS PUBLIC MLIRAnalysis - MLIRArithmeticDialect + MLIRArithDialect MLIRBufferizationDialect MLIRBufferizationTransforms MLIRFuncDialect diff --git a/mlir/lib/Dialect/Arithmetic/Transforms/EmulateWideInt.cpp b/mlir/lib/Dialect/Arith/Transforms/EmulateWideInt.cpp similarity index 98% rename from mlir/lib/Dialect/Arithmetic/Transforms/EmulateWideInt.cpp rename to mlir/lib/Dialect/Arith/Transforms/EmulateWideInt.cpp index 0fb593a..dae5864 100644 --- a/mlir/lib/Dialect/Arithmetic/Transforms/EmulateWideInt.cpp +++ b/mlir/lib/Dialect/Arith/Transforms/EmulateWideInt.cpp @@ -6,10 +6,10 @@ // //===----------------------------------------------------------------------===// -#include "mlir/Dialect/Arithmetic/Transforms/Passes.h" +#include "mlir/Dialect/Arith/Transforms/Passes.h" -#include "mlir/Dialect/Arithmetic/IR/Arithmetic.h" -#include "mlir/Dialect/Arithmetic/Transforms/WideIntEmulationConverter.h" +#include "mlir/Dialect/Arith/IR/Arith.h" +#include "mlir/Dialect/Arith/Transforms/WideIntEmulationConverter.h" #include "mlir/Dialect/Func/IR/FuncOps.h" #include "mlir/Dialect/Func/Transforms/FuncConversions.h" #include "mlir/Dialect/Vector/IR/VectorOps.h" @@ -18,8 +18,8 @@ #include namespace mlir::arith { -#define GEN_PASS_DEF_ARITHMETICEMULATEWIDEINT -#include "mlir/Dialect/Arithmetic/Transforms/Passes.h.inc" +#define GEN_PASS_DEF_ARITHEMULATEWIDEINT +#include "mlir/Dialect/Arith/Transforms/Passes.h.inc" } // namespace mlir::arith using namespace mlir; @@ -582,8 +582,8 @@ struct ConvertVectorPrint final : OpConversionPattern { //===----------------------------------------------------------------------===// struct EmulateWideIntPass final - : arith::impl::ArithmeticEmulateWideIntBase { - using ArithmeticEmulateWideIntBase::ArithmeticEmulateWideIntBase; + : arith::impl::ArithEmulateWideIntBase { + using ArithEmulateWideIntBase::ArithEmulateWideIntBase; void runOnOperation() override { if (!llvm::isPowerOf2_32(widestIntSupported) || widestIntSupported < 2) { @@ -603,8 +603,9 @@ struct EmulateWideIntPass final return typeConverter.isLegal(op); }; target.addDynamicallyLegalOp(opLegalCallback); - target.addDynamicallyLegalDialect(opLegalCallback); + target + .addDynamicallyLegalDialect( + opLegalCallback); RewritePatternSet patterns(ctx); arith::populateWideIntEmulationPatterns(typeConverter, patterns); diff --git a/mlir/lib/Dialect/Arithmetic/Transforms/ExpandOps.cpp b/mlir/lib/Dialect/Arith/Transforms/ExpandOps.cpp similarity index 93% rename from mlir/lib/Dialect/Arithmetic/Transforms/ExpandOps.cpp rename to mlir/lib/Dialect/Arith/Transforms/ExpandOps.cpp index e7e6be9..5a1793a 100644 --- a/mlir/lib/Dialect/Arithmetic/Transforms/ExpandOps.cpp +++ b/mlir/lib/Dialect/Arith/Transforms/ExpandOps.cpp @@ -1,4 +1,4 @@ -//===- ExpandOps.cpp - Pass to legalize Arithmetic ops for LLVM lowering --===// +//===- ExpandOps.cpp - Pass to legalize Arith ops for LLVM lowering --===// // // Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions. // See https://llvm.org/LICENSE.txt for license information. @@ -6,16 +6,16 @@ // //===----------------------------------------------------------------------===// -#include "mlir/Dialect/Arithmetic/Transforms/Passes.h" +#include "mlir/Dialect/Arith/Transforms/Passes.h" -#include "mlir/Dialect/Arithmetic/IR/Arithmetic.h" +#include "mlir/Dialect/Arith/IR/Arith.h" #include "mlir/IR/TypeUtilities.h" #include "mlir/Transforms/DialectConversion.h" namespace mlir { namespace arith { -#define GEN_PASS_DEF_ARITHMETICEXPANDOPS -#include "mlir/Dialect/Arithmetic/Transforms/Passes.h.inc" +#define GEN_PASS_DEF_ARITHEXPANDOPS +#include "mlir/Dialect/Arith/Transforms/Passes.h.inc" } // namespace arith } // namespace mlir @@ -195,15 +195,15 @@ public: } }; -struct ArithmeticExpandOpsPass - : public arith::impl::ArithmeticExpandOpsBase { +struct ArithExpandOpsPass + : public arith::impl::ArithExpandOpsBase { void runOnOperation() override { RewritePatternSet patterns(&getContext()); ConversionTarget target(getContext()); - arith::populateArithmeticExpandOpsPatterns(patterns); + arith::populateArithExpandOpsPatterns(patterns); - target.addLegalDialect(); + target.addLegalDialect(); // clang-format off target.addIllegalOp< arith::CeilDivSIOp, @@ -225,8 +225,7 @@ struct ArithmeticExpandOpsPass } // namespace -void mlir::arith::populateArithmeticExpandOpsPatterns( - RewritePatternSet &patterns) { +void mlir::arith::populateArithExpandOpsPatterns(RewritePatternSet &patterns) { // clang-format off patterns.add< CeilDivSIOpConverter, @@ -242,6 +241,6 @@ void mlir::arith::populateArithmeticExpandOpsPatterns( // clang-format on } -std::unique_ptr mlir::arith::createArithmeticExpandOpsPass() { - return std::make_unique(); +std::unique_ptr mlir::arith::createArithExpandOpsPass() { + return std::make_unique(); } diff --git a/mlir/lib/Dialect/Arithmetic/Transforms/UnsignedWhenEquivalent.cpp b/mlir/lib/Dialect/Arith/Transforms/UnsignedWhenEquivalent.cpp similarity index 90% rename from mlir/lib/Dialect/Arithmetic/Transforms/UnsignedWhenEquivalent.cpp rename to mlir/lib/Dialect/Arith/Transforms/UnsignedWhenEquivalent.cpp index 14a028e..b5752bd 100644 --- a/mlir/lib/Dialect/Arithmetic/Transforms/UnsignedWhenEquivalent.cpp +++ b/mlir/lib/Dialect/Arith/Transforms/UnsignedWhenEquivalent.cpp @@ -8,17 +8,17 @@ // //===----------------------------------------------------------------------===// -#include "mlir/Dialect/Arithmetic/Transforms/Passes.h" +#include "mlir/Dialect/Arith/Transforms/Passes.h" #include "mlir/Analysis/DataFlow/DeadCodeAnalysis.h" #include "mlir/Analysis/DataFlow/IntegerRangeAnalysis.h" -#include "mlir/Dialect/Arithmetic/IR/Arithmetic.h" +#include "mlir/Dialect/Arith/IR/Arith.h" #include "mlir/Transforms/DialectConversion.h" namespace mlir { namespace arith { -#define GEN_PASS_DEF_ARITHMETICUNSIGNEDWHENEQUIVALENT -#include "mlir/Dialect/Arithmetic/Transforms/Passes.h.inc" +#define GEN_PASS_DEF_ARITHUNSIGNEDWHENEQUIVALENT +#include "mlir/Dialect/Arith/Transforms/Passes.h.inc" } // namespace arith } // namespace mlir @@ -108,9 +108,9 @@ struct ConvertCmpIToUnsigned : OpConversionPattern { } }; -struct ArithmeticUnsignedWhenEquivalentPass - : public arith::impl::ArithmeticUnsignedWhenEquivalentBase< - ArithmeticUnsignedWhenEquivalentPass> { +struct ArithUnsignedWhenEquivalentPass + : public arith::impl::ArithUnsignedWhenEquivalentBase< + ArithUnsignedWhenEquivalentPass> { /// Implementation structure: first find all equivalent ops and collect them, /// then perform all the rewrites in a second pass over the target op. This /// ensures that analysis results are not invalidated during rewriting. @@ -124,7 +124,7 @@ struct ArithmeticUnsignedWhenEquivalentPass return signalPassFailure(); ConversionTarget target(*ctx); - target.addLegalDialect(); + target.addLegalDialect(); target .addDynamicallyLegalOp( @@ -153,7 +153,6 @@ struct ArithmeticUnsignedWhenEquivalentPass }; } // end anonymous namespace -std::unique_ptr -mlir::arith::createArithmeticUnsignedWhenEquivalentPass() { - return std::make_unique(); +std::unique_ptr mlir::arith::createArithUnsignedWhenEquivalentPass() { + return std::make_unique(); } diff --git a/mlir/lib/Dialect/Arith/Utils/CMakeLists.txt b/mlir/lib/Dialect/Arith/Utils/CMakeLists.txt new file mode 100644 index 0000000..6767050 --- /dev/null +++ b/mlir/lib/Dialect/Arith/Utils/CMakeLists.txt @@ -0,0 +1,11 @@ +add_mlir_dialect_library(MLIRArithUtils + Utils.cpp + + ADDITIONAL_HEADER_DIRS + ${MLIR_MAIN_INCLUDE_DIR}/mlir/Dialect/Arith/Utils + + LINK_LIBS PUBLIC + MLIRArithDialect + MLIRDialect + MLIRIR + ) diff --git a/mlir/lib/Dialect/Arithmetic/Utils/Utils.cpp b/mlir/lib/Dialect/Arith/Utils/Utils.cpp similarity index 97% rename from mlir/lib/Dialect/Arithmetic/Utils/Utils.cpp rename to mlir/lib/Dialect/Arith/Utils/Utils.cpp index ca61669..210c580 100644 --- a/mlir/lib/Dialect/Arithmetic/Utils/Utils.cpp +++ b/mlir/lib/Dialect/Arith/Utils/Utils.cpp @@ -10,8 +10,8 @@ // //===----------------------------------------------------------------------===// -#include "mlir/Dialect/Arithmetic/Utils/Utils.h" -#include "mlir/Dialect/Arithmetic/IR/Arithmetic.h" +#include "mlir/Dialect/Arith/Utils/Utils.h" +#include "mlir/Dialect/Arith/IR/Arith.h" #include "llvm/ADT/SmallBitVector.h" using namespace mlir; diff --git a/mlir/lib/Dialect/Arithmetic/IR/CMakeLists.txt b/mlir/lib/Dialect/Arithmetic/IR/CMakeLists.txt deleted file mode 100644 index e23504b..0000000 --- a/mlir/lib/Dialect/Arithmetic/IR/CMakeLists.txt +++ /dev/null @@ -1,21 +0,0 @@ -set(LLVM_TARGET_DEFINITIONS ArithmeticCanonicalization.td) -mlir_tablegen(ArithmeticCanonicalization.inc -gen-rewriters) -add_public_tablegen_target(MLIRArithmeticCanonicalizationIncGen) - -add_mlir_dialect_library(MLIRArithmeticDialect - ArithmeticOps.cpp - ArithmeticDialect.cpp - InferIntRangeInterfaceImpls.cpp - - ADDITIONAL_HEADER_DIRS - ${MLIR_MAIN_INCLUDE_DIR}/mlir/Dialect/Arithmetic - - DEPENDS - MLIRArithmeticOpsIncGen - - LINK_LIBS PUBLIC - MLIRDialect - MLIRInferIntRangeInterface - MLIRInferTypeOpInterface - MLIRIR - ) diff --git a/mlir/lib/Dialect/Arithmetic/Utils/CMakeLists.txt b/mlir/lib/Dialect/Arithmetic/Utils/CMakeLists.txt deleted file mode 100644 index 71fcda4..0000000 --- a/mlir/lib/Dialect/Arithmetic/Utils/CMakeLists.txt +++ /dev/null @@ -1,11 +0,0 @@ -add_mlir_dialect_library(MLIRArithmeticUtils - Utils.cpp - - ADDITIONAL_HEADER_DIRS - ${MLIR_MAIN_INCLUDE_DIR}/mlir/Dialect/Arithmetic/Utils - - LINK_LIBS PUBLIC - MLIRArithmeticDialect - MLIRDialect - MLIRIR - ) diff --git a/mlir/lib/Dialect/Async/Transforms/AsyncParallelFor.cpp b/mlir/lib/Dialect/Async/Transforms/AsyncParallelFor.cpp index 99314c2..be9eff4 100644 --- a/mlir/lib/Dialect/Async/Transforms/AsyncParallelFor.cpp +++ b/mlir/lib/Dialect/Async/Transforms/AsyncParallelFor.cpp @@ -13,7 +13,7 @@ #include "mlir/Dialect/Async/Passes.h" #include "PassDetail.h" -#include "mlir/Dialect/Arithmetic/IR/Arithmetic.h" +#include "mlir/Dialect/Arith/IR/Arith.h" #include "mlir/Dialect/Async/IR/Async.h" #include "mlir/Dialect/Async/Transforms.h" #include "mlir/Dialect/Func/IR/FuncOps.h" diff --git a/mlir/lib/Dialect/Async/Transforms/AsyncToAsyncRuntime.cpp b/mlir/lib/Dialect/Async/Transforms/AsyncToAsyncRuntime.cpp index 258400d..1df7325 100644 --- a/mlir/lib/Dialect/Async/Transforms/AsyncToAsyncRuntime.cpp +++ b/mlir/lib/Dialect/Async/Transforms/AsyncToAsyncRuntime.cpp @@ -15,7 +15,7 @@ #include "PassDetail.h" #include "mlir/Conversion/SCFToControlFlow/SCFToControlFlow.h" -#include "mlir/Dialect/Arithmetic/IR/Arithmetic.h" +#include "mlir/Dialect/Arith/IR/Arith.h" #include "mlir/Dialect/Async/IR/Async.h" #include "mlir/Dialect/ControlFlow/IR/ControlFlowOps.h" #include "mlir/Dialect/Func/IR/FuncOps.h" diff --git a/mlir/lib/Dialect/Async/Transforms/CMakeLists.txt b/mlir/lib/Dialect/Async/Transforms/CMakeLists.txt index 430a647..808ae07 100644 --- a/mlir/lib/Dialect/Async/Transforms/CMakeLists.txt +++ b/mlir/lib/Dialect/Async/Transforms/CMakeLists.txt @@ -12,7 +12,7 @@ add_mlir_dialect_library(MLIRAsyncTransforms MLIRAsyncPassIncGen LINK_LIBS PUBLIC - MLIRArithmeticDialect + MLIRArithDialect MLIRAsyncDialect MLIRFuncDialect MLIRIR diff --git a/mlir/lib/Dialect/Async/Transforms/PassDetail.h b/mlir/lib/Dialect/Async/Transforms/PassDetail.h index 40e3c58..310e638 100644 --- a/mlir/lib/Dialect/Async/Transforms/PassDetail.h +++ b/mlir/lib/Dialect/Async/Transforms/PassDetail.h @@ -16,7 +16,7 @@ namespace mlir { namespace arith { -class ArithmeticDialect; +class ArithDialect; } // namespace arith namespace async { diff --git a/mlir/lib/Dialect/Bufferization/IR/BufferizationOps.cpp b/mlir/lib/Dialect/Bufferization/IR/BufferizationOps.cpp index cf29d72..56cbda5 100644 --- a/mlir/lib/Dialect/Bufferization/IR/BufferizationOps.cpp +++ b/mlir/lib/Dialect/Bufferization/IR/BufferizationOps.cpp @@ -6,7 +6,7 @@ // //===----------------------------------------------------------------------===// -#include "mlir/Dialect/Arithmetic/IR/Arithmetic.h" +#include "mlir/Dialect/Arith/IR/Arith.h" #include "mlir/Dialect/Bufferization/IR/BufferizableOpInterface.h" #include "mlir/Dialect/Bufferization/IR/Bufferization.h" #include "mlir/Dialect/Func/IR/FuncOps.h" diff --git a/mlir/lib/Dialect/Bufferization/Transforms/BufferViewFlowAnalysis.cpp b/mlir/lib/Dialect/Bufferization/Transforms/BufferViewFlowAnalysis.cpp index 4c64581..c75e0fa 100644 --- a/mlir/lib/Dialect/Bufferization/Transforms/BufferViewFlowAnalysis.cpp +++ b/mlir/lib/Dialect/Bufferization/Transforms/BufferViewFlowAnalysis.cpp @@ -8,7 +8,7 @@ #include "mlir/Dialect/Bufferization/Transforms/BufferViewFlowAnalysis.h" -#include "mlir/Dialect/Arithmetic/IR/Arithmetic.h" +#include "mlir/Dialect/Arith/IR/Arith.h" #include "mlir/Interfaces/ControlFlowInterfaces.h" #include "mlir/Interfaces/ViewLikeInterface.h" #include "llvm/ADT/SetOperations.h" diff --git a/mlir/lib/Dialect/CMakeLists.txt b/mlir/lib/Dialect/CMakeLists.txt index 9f84b62..9c8dccd 100644 --- a/mlir/lib/Dialect/CMakeLists.txt +++ b/mlir/lib/Dialect/CMakeLists.txt @@ -1,6 +1,6 @@ add_subdirectory(Affine) add_subdirectory(AMDGPU) -add_subdirectory(Arithmetic) +add_subdirectory(Arith) add_subdirectory(ArmNeon) add_subdirectory(ArmSVE) add_subdirectory(Async) diff --git a/mlir/lib/Dialect/Complex/IR/CMakeLists.txt b/mlir/lib/Dialect/Complex/IR/CMakeLists.txt index 3142ec9..a90f34e 100644 --- a/mlir/lib/Dialect/Complex/IR/CMakeLists.txt +++ b/mlir/lib/Dialect/Complex/IR/CMakeLists.txt @@ -10,7 +10,7 @@ add_mlir_dialect_library(MLIRComplexDialect MLIRComplexAttributesIncGen LINK_LIBS PUBLIC - MLIRArithmeticDialect + MLIRArithDialect MLIRDialect MLIRInferTypeOpInterface MLIRIR diff --git a/mlir/lib/Dialect/Complex/IR/ComplexDialect.cpp b/mlir/lib/Dialect/Complex/IR/ComplexDialect.cpp index c93d881..ec56d93 100644 --- a/mlir/lib/Dialect/Complex/IR/ComplexDialect.cpp +++ b/mlir/lib/Dialect/Complex/IR/ComplexDialect.cpp @@ -6,7 +6,7 @@ // //===----------------------------------------------------------------------===// -#include "mlir/Dialect/Arithmetic/IR/Arithmetic.h" +#include "mlir/Dialect/Arith/IR/Arith.h" #include "mlir/Dialect/Complex/IR/Complex.h" #include "mlir/IR/Builders.h" #include "mlir/IR/DialectImplementation.h" diff --git a/mlir/lib/Dialect/ControlFlow/IR/CMakeLists.txt b/mlir/lib/Dialect/ControlFlow/IR/CMakeLists.txt index fad2914..58551bb 100644 --- a/mlir/lib/Dialect/ControlFlow/IR/CMakeLists.txt +++ b/mlir/lib/Dialect/ControlFlow/IR/CMakeLists.txt @@ -8,7 +8,7 @@ add_mlir_dialect_library(MLIRControlFlowDialect MLIRControlFlowOpsIncGen LINK_LIBS PUBLIC - MLIRArithmeticDialect + MLIRArithDialect MLIRControlFlowInterfaces MLIRIR MLIRSideEffectInterfaces diff --git a/mlir/lib/Dialect/ControlFlow/IR/ControlFlowOps.cpp b/mlir/lib/Dialect/ControlFlow/IR/ControlFlowOps.cpp index 306db83..5ca2281 100644 --- a/mlir/lib/Dialect/ControlFlow/IR/ControlFlowOps.cpp +++ b/mlir/lib/Dialect/ControlFlow/IR/ControlFlowOps.cpp @@ -8,7 +8,7 @@ #include "mlir/Dialect/ControlFlow/IR/ControlFlowOps.h" -#include "mlir/Dialect/Arithmetic/IR/Arithmetic.h" +#include "mlir/Dialect/Arith/IR/Arith.h" #include "mlir/Dialect/CommonFolders.h" #include "mlir/IR/AffineExpr.h" #include "mlir/IR/AffineMap.h" diff --git a/mlir/lib/Dialect/GPU/CMakeLists.txt b/mlir/lib/Dialect/GPU/CMakeLists.txt index 7a6bcb3..b82fd1b 100644 --- a/mlir/lib/Dialect/GPU/CMakeLists.txt +++ b/mlir/lib/Dialect/GPU/CMakeLists.txt @@ -33,7 +33,7 @@ add_mlir_dialect_library(MLIRGPUOps MLIRGPUOpInterfacesIncGen LINK_LIBS PUBLIC - MLIRArithmeticDialect + MLIRArithDialect MLIRDLTIDialect MLIRInferIntRangeInterface MLIRIR @@ -67,7 +67,7 @@ add_mlir_dialect_library(MLIRGPUTransforms LINK_LIBS PUBLIC MLIRAffineUtils - MLIRArithmeticDialect + MLIRArithDialect MLIRAsyncDialect MLIRDataLayoutInterfaces MLIRExecutionEngineUtils diff --git a/mlir/lib/Dialect/GPU/IR/GPUDialect.cpp b/mlir/lib/Dialect/GPU/IR/GPUDialect.cpp index e4c3552..12b6ee5 100644 --- a/mlir/lib/Dialect/GPU/IR/GPUDialect.cpp +++ b/mlir/lib/Dialect/GPU/IR/GPUDialect.cpp @@ -12,7 +12,7 @@ #include "mlir/Dialect/GPU/IR/GPUDialect.h" -#include "mlir/Dialect/Arithmetic/IR/Arithmetic.h" +#include "mlir/Dialect/Arith/IR/Arith.h" #include "mlir/Dialect/MemRef/IR/MemRef.h" #include "mlir/IR/Attributes.h" #include "mlir/IR/Builders.h" diff --git a/mlir/lib/Dialect/GPU/Transforms/AllReduceLowering.cpp b/mlir/lib/Dialect/GPU/Transforms/AllReduceLowering.cpp index 85adf00..8933466 100644 --- a/mlir/lib/Dialect/GPU/Transforms/AllReduceLowering.cpp +++ b/mlir/lib/Dialect/GPU/Transforms/AllReduceLowering.cpp @@ -11,7 +11,7 @@ // //===----------------------------------------------------------------------===// -#include "mlir/Dialect/Arithmetic/IR/Arithmetic.h" +#include "mlir/Dialect/Arith/IR/Arith.h" #include "mlir/Dialect/ControlFlow/IR/ControlFlowOps.h" #include "mlir/Dialect/GPU/IR/GPUDialect.h" #include "mlir/Dialect/GPU/Transforms/Passes.h" diff --git a/mlir/lib/Dialect/GPU/Transforms/KernelOutlining.cpp b/mlir/lib/Dialect/GPU/Transforms/KernelOutlining.cpp index dd5e9ba..03fe4be 100644 --- a/mlir/lib/Dialect/GPU/Transforms/KernelOutlining.cpp +++ b/mlir/lib/Dialect/GPU/Transforms/KernelOutlining.cpp @@ -13,7 +13,7 @@ #include "mlir/Dialect/GPU/Transforms/Passes.h" #include "mlir/AsmParser/AsmParser.h" -#include "mlir/Dialect/Arithmetic/IR/Arithmetic.h" +#include "mlir/Dialect/Arith/IR/Arith.h" #include "mlir/Dialect/ControlFlow/IR/ControlFlowOps.h" #include "mlir/Dialect/DLTI/DLTI.h" #include "mlir/Dialect/Func/IR/FuncOps.h" diff --git a/mlir/lib/Dialect/GPU/Transforms/MemoryPromotion.cpp b/mlir/lib/Dialect/GPU/Transforms/MemoryPromotion.cpp index a8ec8df..52dc8ffb 100644 --- a/mlir/lib/Dialect/GPU/Transforms/MemoryPromotion.cpp +++ b/mlir/lib/Dialect/GPU/Transforms/MemoryPromotion.cpp @@ -14,7 +14,7 @@ #include "mlir/Dialect/GPU/Transforms/MemoryPromotion.h" #include "mlir/Dialect/Affine/LoopUtils.h" -#include "mlir/Dialect/Arithmetic/IR/Arithmetic.h" +#include "mlir/Dialect/Arith/IR/Arith.h" #include "mlir/Dialect/GPU/IR/GPUDialect.h" #include "mlir/Dialect/MemRef/IR/MemRef.h" #include "mlir/Dialect/SCF/IR/SCF.h" diff --git a/mlir/lib/Dialect/Linalg/IR/CMakeLists.txt b/mlir/lib/Dialect/Linalg/IR/CMakeLists.txt index 4f925a2..247eceb 100644 --- a/mlir/lib/Dialect/Linalg/IR/CMakeLists.txt +++ b/mlir/lib/Dialect/Linalg/IR/CMakeLists.txt @@ -15,8 +15,8 @@ add_mlir_dialect_library(MLIRLinalgDialect LINK_LIBS PUBLIC MLIRAffineDialect - MLIRArithmeticDialect - MLIRArithmeticUtils + MLIRArithDialect + MLIRArithUtils MLIRBufferizationDialect MLIRDialectUtils MLIRInferTypeOpInterface diff --git a/mlir/lib/Dialect/Linalg/IR/LinalgDialect.cpp b/mlir/lib/Dialect/Linalg/IR/LinalgDialect.cpp index 6865b68..0c27575 100644 --- a/mlir/lib/Dialect/Linalg/IR/LinalgDialect.cpp +++ b/mlir/lib/Dialect/Linalg/IR/LinalgDialect.cpp @@ -11,7 +11,7 @@ //===----------------------------------------------------------------------===// #include "mlir/Dialect/Affine/IR/AffineOps.h" -#include "mlir/Dialect/Arithmetic/IR/Arithmetic.h" +#include "mlir/Dialect/Arith/IR/Arith.h" #include "mlir/Dialect/Bufferization/IR/BufferizableOpInterface.h" #include "mlir/Dialect/Linalg/IR/Linalg.h" #include "mlir/Dialect/Math/IR/Math.h" diff --git a/mlir/lib/Dialect/Linalg/IR/LinalgInterfaces.cpp b/mlir/lib/Dialect/Linalg/IR/LinalgInterfaces.cpp index 032578f..b8a93c0 100644 --- a/mlir/lib/Dialect/Linalg/IR/LinalgInterfaces.cpp +++ b/mlir/lib/Dialect/Linalg/IR/LinalgInterfaces.cpp @@ -9,8 +9,8 @@ #include "mlir/Dialect/Linalg/IR/LinalgInterfaces.h" #include "mlir/Dialect/Affine/IR/AffineOps.h" -#include "mlir/Dialect/Arithmetic/IR/Arithmetic.h" -#include "mlir/Dialect/Arithmetic/Utils/Utils.h" +#include "mlir/Dialect/Arith/IR/Arith.h" +#include "mlir/Dialect/Arith/Utils/Utils.h" #include "mlir/Dialect/Complex/IR/Complex.h" #include "mlir/Dialect/MemRef/IR/MemRef.h" #include "mlir/Dialect/Tensor/IR/Tensor.h" diff --git a/mlir/lib/Dialect/Linalg/IR/LinalgOps.cpp b/mlir/lib/Dialect/Linalg/IR/LinalgOps.cpp index 6fe0593..b9bf824 100644 --- a/mlir/lib/Dialect/Linalg/IR/LinalgOps.cpp +++ b/mlir/lib/Dialect/Linalg/IR/LinalgOps.cpp @@ -14,8 +14,8 @@ #include "mlir/AsmParser/AsmParser.h" #include "mlir/Dialect/Affine/IR/AffineOps.h" -#include "mlir/Dialect/Arithmetic/IR/Arithmetic.h" -#include "mlir/Dialect/Arithmetic/Utils/Utils.h" +#include "mlir/Dialect/Arith/IR/Arith.h" +#include "mlir/Dialect/Arith/Utils/Utils.h" #include "mlir/Dialect/Complex/IR/Complex.h" #include "mlir/Dialect/Math/IR/Math.h" #include "mlir/Dialect/MemRef/IR/MemRef.h" diff --git a/mlir/lib/Dialect/Linalg/TransformOps/CMakeLists.txt b/mlir/lib/Dialect/Linalg/TransformOps/CMakeLists.txt index 7d10433..fd15ac8 100644 --- a/mlir/lib/Dialect/Linalg/TransformOps/CMakeLists.txt +++ b/mlir/lib/Dialect/Linalg/TransformOps/CMakeLists.txt @@ -9,7 +9,7 @@ add_mlir_dialect_library(MLIRLinalgTransformOps LINK_LIBS PUBLIC MLIRAffineDialect - MLIRArithmeticDialect + MLIRArithDialect MLIRIR MLIRLinalgDialect MLIRLinalgTransforms diff --git a/mlir/lib/Dialect/Linalg/TransformOps/LinalgTransformOps.cpp b/mlir/lib/Dialect/Linalg/TransformOps/LinalgTransformOps.cpp index 48b044d..2993d9c 100644 --- a/mlir/lib/Dialect/Linalg/TransformOps/LinalgTransformOps.cpp +++ b/mlir/lib/Dialect/Linalg/TransformOps/LinalgTransformOps.cpp @@ -10,7 +10,7 @@ #include "mlir/AsmParser/AsmParser.h" #include "mlir/Dialect/Affine/IR/AffineOps.h" -#include "mlir/Dialect/Arithmetic/IR/Arithmetic.h" +#include "mlir/Dialect/Arith/IR/Arith.h" #include "mlir/Dialect/GPU/IR/GPUDialect.h" #include "mlir/Dialect/Linalg/IR/Linalg.h" #include "mlir/Dialect/Linalg/Transforms/Transforms.h" @@ -1774,7 +1774,7 @@ public: declareDependentDialect(); declareDependentDialect(); declareGeneratedDialect(); - declareGeneratedDialect(); + declareGeneratedDialect(); declareGeneratedDialect(); declareGeneratedDialect(); declareGeneratedDialect(); diff --git a/mlir/lib/Dialect/Linalg/Transforms/BubbleUpExtractSlice.cpp b/mlir/lib/Dialect/Linalg/Transforms/BubbleUpExtractSlice.cpp index c14f910..60156d9 100644 --- a/mlir/lib/Dialect/Linalg/Transforms/BubbleUpExtractSlice.cpp +++ b/mlir/lib/Dialect/Linalg/Transforms/BubbleUpExtractSlice.cpp @@ -13,7 +13,7 @@ //===----------------------------------------------------------------------===// #include "mlir/Dialect/Affine/IR/AffineOps.h" -#include "mlir/Dialect/Arithmetic/Utils/Utils.h" +#include "mlir/Dialect/Arith/Utils/Utils.h" #include "mlir/Dialect/Linalg/IR/Linalg.h" #include "mlir/Dialect/Linalg/Passes.h" #include "mlir/Dialect/Linalg/Transforms/Transforms.h" diff --git a/mlir/lib/Dialect/Linalg/Transforms/CMakeLists.txt b/mlir/lib/Dialect/Linalg/Transforms/CMakeLists.txt index 90f31fd..bf5164a 100644 --- a/mlir/lib/Dialect/Linalg/Transforms/CMakeLists.txt +++ b/mlir/lib/Dialect/Linalg/Transforms/CMakeLists.txt @@ -40,9 +40,9 @@ add_mlir_dialect_library(MLIRLinalgTransforms MLIRAffineDialect MLIRAffineUtils MLIRAnalysis - MLIRArithmeticDialect - MLIRArithmeticTransforms - MLIRArithmeticUtils + MLIRArithDialect + MLIRArithTransforms + MLIRArithUtils MLIRBufferizationDialect MLIRBufferizationTransforms MLIRComplexDialect diff --git a/mlir/lib/Dialect/Linalg/Transforms/DropUnitDims.cpp b/mlir/lib/Dialect/Linalg/Transforms/DropUnitDims.cpp index 15ba43c..f09286d 100644 --- a/mlir/lib/Dialect/Linalg/Transforms/DropUnitDims.cpp +++ b/mlir/lib/Dialect/Linalg/Transforms/DropUnitDims.cpp @@ -15,7 +15,7 @@ #include "mlir/Dialect/Linalg/Passes.h" #include "mlir/Dialect/Affine/IR/AffineOps.h" -#include "mlir/Dialect/Arithmetic/IR/Arithmetic.h" +#include "mlir/Dialect/Arith/IR/Arith.h" #include "mlir/Dialect/Linalg/IR/Linalg.h" #include "mlir/Dialect/Linalg/Transforms/Transforms.h" #include "mlir/Dialect/Linalg/Utils/Utils.h" diff --git a/mlir/lib/Dialect/Linalg/Transforms/ElementwiseOpFusion.cpp b/mlir/lib/Dialect/Linalg/Transforms/ElementwiseOpFusion.cpp index 94526e1..f114b73 100644 --- a/mlir/lib/Dialect/Linalg/Transforms/ElementwiseOpFusion.cpp +++ b/mlir/lib/Dialect/Linalg/Transforms/ElementwiseOpFusion.cpp @@ -13,7 +13,7 @@ #include "mlir/Dialect/Linalg/Passes.h" #include "mlir/Dialect/Affine/IR/AffineOps.h" -#include "mlir/Dialect/Arithmetic/Utils/Utils.h" +#include "mlir/Dialect/Arith/Utils/Utils.h" #include "mlir/Dialect/Linalg/IR/Linalg.h" #include "mlir/Dialect/Linalg/Transforms/Transforms.h" #include "mlir/Dialect/SparseTensor/IR/SparseTensor.h" diff --git a/mlir/lib/Dialect/Linalg/Transforms/ElementwiseToLinalg.cpp b/mlir/lib/Dialect/Linalg/Transforms/ElementwiseToLinalg.cpp index 0e115a8..b9eb930 100644 --- a/mlir/lib/Dialect/Linalg/Transforms/ElementwiseToLinalg.cpp +++ b/mlir/lib/Dialect/Linalg/Transforms/ElementwiseToLinalg.cpp @@ -8,7 +8,7 @@ #include "mlir/Dialect/Linalg/Passes.h" -#include "mlir/Dialect/Arithmetic/Utils/Utils.h" +#include "mlir/Dialect/Arith/Utils/Utils.h" #include "mlir/Dialect/Linalg/IR/Linalg.h" #include "mlir/Dialect/Linalg/Transforms/Transforms.h" #include "mlir/Dialect/Linalg/Utils/Utils.h" diff --git a/mlir/lib/Dialect/Linalg/Transforms/Fusion.cpp b/mlir/lib/Dialect/Linalg/Transforms/Fusion.cpp index ebef656..685ad1e 100644 --- a/mlir/lib/Dialect/Linalg/Transforms/Fusion.cpp +++ b/mlir/lib/Dialect/Linalg/Transforms/Fusion.cpp @@ -11,7 +11,7 @@ //===----------------------------------------------------------------------===// #include "mlir/Dialect/Affine/IR/AffineOps.h" -#include "mlir/Dialect/Arithmetic/IR/Arithmetic.h" +#include "mlir/Dialect/Arith/IR/Arith.h" #include "mlir/Dialect/Linalg/Analysis/DependenceAnalysis.h" #include "mlir/Dialect/Linalg/IR/Linalg.h" #include "mlir/Dialect/Linalg/Passes.h" diff --git a/mlir/lib/Dialect/Linalg/Transforms/Hoisting.cpp b/mlir/lib/Dialect/Linalg/Transforms/Hoisting.cpp index 29fe94ea..1676500 100644 --- a/mlir/lib/Dialect/Linalg/Transforms/Hoisting.cpp +++ b/mlir/lib/Dialect/Linalg/Transforms/Hoisting.cpp @@ -15,7 +15,7 @@ #include "mlir/Analysis/SliceAnalysis.h" #include "mlir/Dialect/Affine/Analysis/AffineStructures.h" #include "mlir/Dialect/Affine/IR/AffineValueMap.h" -#include "mlir/Dialect/Arithmetic/IR/Arithmetic.h" +#include "mlir/Dialect/Arith/IR/Arith.h" #include "mlir/Dialect/Func/IR/FuncOps.h" #include "mlir/Dialect/Linalg/IR/Linalg.h" #include "mlir/Dialect/Linalg/Transforms/Transforms.h" diff --git a/mlir/lib/Dialect/Linalg/Transforms/InlineScalarOperands.cpp b/mlir/lib/Dialect/Linalg/Transforms/InlineScalarOperands.cpp index a53e7c5..54c92e9 100644 --- a/mlir/lib/Dialect/Linalg/Transforms/InlineScalarOperands.cpp +++ b/mlir/lib/Dialect/Linalg/Transforms/InlineScalarOperands.cpp @@ -14,7 +14,7 @@ #include "mlir/Dialect/Linalg/Passes.h" -#include "mlir/Dialect/Arithmetic/IR/Arithmetic.h" +#include "mlir/Dialect/Arith/IR/Arith.h" #include "mlir/Dialect/Func/IR/FuncOps.h" #include "mlir/Dialect/Linalg/IR/Linalg.h" #include "mlir/Dialect/Linalg/Transforms/Transforms.h" diff --git a/mlir/lib/Dialect/Linalg/Transforms/Loops.cpp b/mlir/lib/Dialect/Linalg/Transforms/Loops.cpp index 0f0fd78..6384b1f 100644 --- a/mlir/lib/Dialect/Linalg/Transforms/Loops.cpp +++ b/mlir/lib/Dialect/Linalg/Transforms/Loops.cpp @@ -9,8 +9,8 @@ #include "mlir/Dialect/Linalg/Passes.h" #include "mlir/Dialect/Affine/IR/AffineOps.h" -#include "mlir/Dialect/Arithmetic/IR/Arithmetic.h" -#include "mlir/Dialect/Arithmetic/Utils/Utils.h" +#include "mlir/Dialect/Arith/IR/Arith.h" +#include "mlir/Dialect/Arith/Utils/Utils.h" #include "mlir/Dialect/Func/IR/FuncOps.h" #include "mlir/Dialect/Linalg/IR/Linalg.h" #include "mlir/Dialect/Linalg/Transforms/Transforms.h" diff --git a/mlir/lib/Dialect/Linalg/Transforms/Promotion.cpp b/mlir/lib/Dialect/Linalg/Transforms/Promotion.cpp index 4eb4eea..17d74fa 100644 --- a/mlir/lib/Dialect/Linalg/Transforms/Promotion.cpp +++ b/mlir/lib/Dialect/Linalg/Transforms/Promotion.cpp @@ -10,8 +10,8 @@ // //===----------------------------------------------------------------------===// -#include "mlir/Dialect/Arithmetic/IR/Arithmetic.h" -#include "mlir/Dialect/Arithmetic/Utils/Utils.h" +#include "mlir/Dialect/Arith/IR/Arith.h" +#include "mlir/Dialect/Arith/Utils/Utils.h" #include "mlir/Dialect/Complex/IR/Complex.h" #include "mlir/Dialect/Linalg/IR/Linalg.h" #include "mlir/Dialect/Linalg/Passes.h" diff --git a/mlir/lib/Dialect/Linalg/Transforms/SplitReduction.cpp b/mlir/lib/Dialect/Linalg/Transforms/SplitReduction.cpp index c1b43ef..61eb384 100644 --- a/mlir/lib/Dialect/Linalg/Transforms/SplitReduction.cpp +++ b/mlir/lib/Dialect/Linalg/Transforms/SplitReduction.cpp @@ -14,7 +14,7 @@ #include #include "mlir/Analysis/SliceAnalysis.h" -#include "mlir/Dialect/Arithmetic/IR/Arithmetic.h" +#include "mlir/Dialect/Arith/IR/Arith.h" #include "mlir/Dialect/Bufferization/IR/Bufferization.h" #include "mlir/Dialect/Linalg/IR/Linalg.h" #include "mlir/Dialect/Linalg/Transforms/Transforms.h" diff --git a/mlir/lib/Dialect/Linalg/Transforms/Tiling.cpp b/mlir/lib/Dialect/Linalg/Transforms/Tiling.cpp index a81eaed..b0aa41e 100644 --- a/mlir/lib/Dialect/Linalg/Transforms/Tiling.cpp +++ b/mlir/lib/Dialect/Linalg/Transforms/Tiling.cpp @@ -13,7 +13,7 @@ #include "mlir/Dialect/Linalg/Passes.h" #include "mlir/Dialect/Affine/IR/AffineOps.h" -#include "mlir/Dialect/Arithmetic/Utils/Utils.h" +#include "mlir/Dialect/Arith/Utils/Utils.h" #include "mlir/Dialect/ControlFlow/IR/ControlFlowOps.h" #include "mlir/Dialect/Func/IR/FuncOps.h" #include "mlir/Dialect/Linalg/IR/Linalg.h" diff --git a/mlir/lib/Dialect/Linalg/Transforms/TilingInterfaceImpl.cpp b/mlir/lib/Dialect/Linalg/Transforms/TilingInterfaceImpl.cpp index e5c95f9..177db80 100644 --- a/mlir/lib/Dialect/Linalg/Transforms/TilingInterfaceImpl.cpp +++ b/mlir/lib/Dialect/Linalg/Transforms/TilingInterfaceImpl.cpp @@ -9,8 +9,8 @@ #include "mlir/Dialect/Linalg/Transforms/TilingInterfaceImpl.h" #include "mlir/Dialect/Affine/IR/AffineOps.h" -#include "mlir/Dialect/Arithmetic/IR/Arithmetic.h" -#include "mlir/Dialect/Arithmetic/Utils/Utils.h" +#include "mlir/Dialect/Arith/IR/Arith.h" +#include "mlir/Dialect/Arith/Utils/Utils.h" #include "mlir/Dialect/Linalg/IR/Linalg.h" #include "mlir/Dialect/Linalg/Utils/Utils.h" #include "mlir/Dialect/MemRef/IR/MemRef.h" diff --git a/mlir/lib/Dialect/Linalg/Transforms/Transforms.cpp b/mlir/lib/Dialect/Linalg/Transforms/Transforms.cpp index b00d923..0cbc975 100644 --- a/mlir/lib/Dialect/Linalg/Transforms/Transforms.cpp +++ b/mlir/lib/Dialect/Linalg/Transforms/Transforms.cpp @@ -13,7 +13,7 @@ #include "mlir/Dialect/Linalg/Transforms/Transforms.h" #include "mlir/Dialect/Affine/IR/AffineOps.h" -#include "mlir/Dialect/Arithmetic/IR/Arithmetic.h" +#include "mlir/Dialect/Arith/IR/Arith.h" #include "mlir/Dialect/Func/IR/FuncOps.h" #include "mlir/Dialect/Linalg/Analysis/DependenceAnalysis.h" #include "mlir/Dialect/Linalg/IR/Linalg.h" diff --git a/mlir/lib/Dialect/Linalg/Transforms/Vectorization.cpp b/mlir/lib/Dialect/Linalg/Transforms/Vectorization.cpp index 10c9dd2..eaea7da 100644 --- a/mlir/lib/Dialect/Linalg/Transforms/Vectorization.cpp +++ b/mlir/lib/Dialect/Linalg/Transforms/Vectorization.cpp @@ -13,7 +13,7 @@ #include "mlir/Analysis/SliceAnalysis.h" #include "mlir/Dialect/Affine/Analysis/LoopAnalysis.h" #include "mlir/Dialect/Affine/IR/AffineOps.h" -#include "mlir/Dialect/Arithmetic/IR/Arithmetic.h" +#include "mlir/Dialect/Arith/IR/Arith.h" #include "mlir/Dialect/Func/IR/FuncOps.h" #include "mlir/Dialect/Linalg/Analysis/DependenceAnalysis.h" #include "mlir/Dialect/Linalg/IR/Linalg.h" diff --git a/mlir/lib/Dialect/Linalg/Utils/CMakeLists.txt b/mlir/lib/Dialect/Linalg/Utils/CMakeLists.txt index 91d661c..da0a3c2 100644 --- a/mlir/lib/Dialect/Linalg/Utils/CMakeLists.txt +++ b/mlir/lib/Dialect/Linalg/Utils/CMakeLists.txt @@ -8,7 +8,7 @@ add_mlir_dialect_library(MLIRLinalgUtils MLIRAffineDialect MLIRAffineAnalysis MLIRAffineUtils - MLIRArithmeticDialect + MLIRArithDialect MLIRFuncDialect MLIRIR MLIRLinalgDialect diff --git a/mlir/lib/Dialect/Linalg/Utils/Utils.cpp b/mlir/lib/Dialect/Linalg/Utils/Utils.cpp index c6cf052..c82cacd 100644 --- a/mlir/lib/Dialect/Linalg/Utils/Utils.cpp +++ b/mlir/lib/Dialect/Linalg/Utils/Utils.cpp @@ -17,8 +17,8 @@ #include "mlir/Dialect/Affine/IR/AffineOps.h" #include "mlir/Dialect/Affine/IR/AffineValueMap.h" #include "mlir/Dialect/Affine/LoopUtils.h" -#include "mlir/Dialect/Arithmetic/IR/Arithmetic.h" -#include "mlir/Dialect/Arithmetic/Utils/Utils.h" +#include "mlir/Dialect/Arith/IR/Arith.h" +#include "mlir/Dialect/Arith/Utils/Utils.h" #include "mlir/Dialect/Func/IR/FuncOps.h" #include "mlir/Dialect/Linalg/IR/Linalg.h" #include "mlir/Dialect/MemRef/IR/MemRef.h" diff --git a/mlir/lib/Dialect/Math/IR/CMakeLists.txt b/mlir/lib/Dialect/Math/IR/CMakeLists.txt index 40e8fa6..3b7b65e 100644 --- a/mlir/lib/Dialect/Math/IR/CMakeLists.txt +++ b/mlir/lib/Dialect/Math/IR/CMakeLists.txt @@ -9,7 +9,7 @@ add_mlir_dialect_library(MLIRMathDialect MLIRMathOpsIncGen LINK_LIBS PUBLIC - MLIRArithmeticDialect + MLIRArithDialect MLIRDialect MLIRIR ) diff --git a/mlir/lib/Dialect/Math/IR/MathOps.cpp b/mlir/lib/Dialect/Math/IR/MathOps.cpp index 55f97bc..621bfa5 100644 --- a/mlir/lib/Dialect/Math/IR/MathOps.cpp +++ b/mlir/lib/Dialect/Math/IR/MathOps.cpp @@ -6,7 +6,7 @@ // //===----------------------------------------------------------------------===// -#include "mlir/Dialect/Arithmetic/IR/Arithmetic.h" +#include "mlir/Dialect/Arith/IR/Arith.h" #include "mlir/Dialect/CommonFolders.h" #include "mlir/Dialect/Math/IR/Math.h" #include "mlir/IR/Builders.h" diff --git a/mlir/lib/Dialect/Math/Transforms/AlgebraicSimplification.cpp b/mlir/lib/Dialect/Math/Transforms/AlgebraicSimplification.cpp index 2c28215..bea939a 100644 --- a/mlir/lib/Dialect/Math/Transforms/AlgebraicSimplification.cpp +++ b/mlir/lib/Dialect/Math/Transforms/AlgebraicSimplification.cpp @@ -12,7 +12,7 @@ // //===----------------------------------------------------------------------===// -#include "mlir/Dialect/Arithmetic/IR/Arithmetic.h" +#include "mlir/Dialect/Arith/IR/Arith.h" #include "mlir/Dialect/Math/IR/Math.h" #include "mlir/Dialect/Math/Transforms/Passes.h" #include "mlir/Dialect/Vector/IR/VectorOps.h" diff --git a/mlir/lib/Dialect/Math/Transforms/CMakeLists.txt b/mlir/lib/Dialect/Math/Transforms/CMakeLists.txt index 4b7512c..f0c5715 100644 --- a/mlir/lib/Dialect/Math/Transforms/CMakeLists.txt +++ b/mlir/lib/Dialect/Math/Transforms/CMakeLists.txt @@ -7,7 +7,7 @@ add_mlir_dialect_library(MLIRMathTransforms ${MLIR_MAIN_INCLUDE_DIR}/mlir/Dialect/Math/Transforms LINK_LIBS PUBLIC - MLIRArithmeticDialect + MLIRArithDialect MLIRDialectUtils MLIRIR MLIRMathDialect diff --git a/mlir/lib/Dialect/Math/Transforms/ExpandPatterns.cpp b/mlir/lib/Dialect/Math/Transforms/ExpandPatterns.cpp index 21fefe0..ac055a7 100644 --- a/mlir/lib/Dialect/Math/Transforms/ExpandPatterns.cpp +++ b/mlir/lib/Dialect/Math/Transforms/ExpandPatterns.cpp @@ -10,7 +10,7 @@ // //===----------------------------------------------------------------------===// -#include "mlir/Dialect/Arithmetic/IR/Arithmetic.h" +#include "mlir/Dialect/Arith/IR/Arith.h" #include "mlir/Dialect/Math/IR/Math.h" #include "mlir/Dialect/Math/Transforms/Passes.h" #include "mlir/Dialect/SCF/IR/SCF.h" diff --git a/mlir/lib/Dialect/Math/Transforms/PolynomialApproximation.cpp b/mlir/lib/Dialect/Math/Transforms/PolynomialApproximation.cpp index dcb7154..ec55464 100644 --- a/mlir/lib/Dialect/Math/Transforms/PolynomialApproximation.cpp +++ b/mlir/lib/Dialect/Math/Transforms/PolynomialApproximation.cpp @@ -14,7 +14,7 @@ #include #include -#include "mlir/Dialect/Arithmetic/IR/Arithmetic.h" +#include "mlir/Dialect/Arith/IR/Arith.h" #include "mlir/Dialect/Math/IR/Math.h" #include "mlir/Dialect/Math/Transforms/Approximation.h" #include "mlir/Dialect/Math/Transforms/Passes.h" diff --git a/mlir/lib/Dialect/MemRef/IR/CMakeLists.txt b/mlir/lib/Dialect/MemRef/IR/CMakeLists.txt index cf969f8..d74a4fb 100644 --- a/mlir/lib/Dialect/MemRef/IR/CMakeLists.txt +++ b/mlir/lib/Dialect/MemRef/IR/CMakeLists.txt @@ -12,8 +12,8 @@ add_mlir_dialect_library(MLIRMemRefDialect Core LINK_LIBS PUBLIC - MLIRArithmeticDialect - MLIRArithmeticUtils + MLIRArithDialect + MLIRArithUtils MLIRControlFlowInterfaces MLIRDialect MLIRDialectUtils diff --git a/mlir/lib/Dialect/MemRef/IR/MemRefDialect.cpp b/mlir/lib/Dialect/MemRef/IR/MemRefDialect.cpp index 955871b..c833449 100644 --- a/mlir/lib/Dialect/MemRef/IR/MemRefDialect.cpp +++ b/mlir/lib/Dialect/MemRef/IR/MemRefDialect.cpp @@ -6,7 +6,7 @@ // //===----------------------------------------------------------------------===// -#include "mlir/Dialect/Arithmetic/IR/Arithmetic.h" +#include "mlir/Dialect/Arith/IR/Arith.h" #include "mlir/Dialect/MemRef/IR/MemRef.h" #include "mlir/Interfaces/SideEffectInterfaces.h" #include "mlir/Transforms/InliningUtils.h" diff --git a/mlir/lib/Dialect/MemRef/IR/MemRefOps.cpp b/mlir/lib/Dialect/MemRef/IR/MemRefOps.cpp index aa302bd..99d115a 100644 --- a/mlir/lib/Dialect/MemRef/IR/MemRefOps.cpp +++ b/mlir/lib/Dialect/MemRef/IR/MemRefOps.cpp @@ -6,8 +6,8 @@ // //===----------------------------------------------------------------------===// -#include "mlir/Dialect/Arithmetic/IR/Arithmetic.h" -#include "mlir/Dialect/Arithmetic/Utils/Utils.h" +#include "mlir/Dialect/Arith/IR/Arith.h" +#include "mlir/Dialect/Arith/Utils/Utils.h" #include "mlir/Dialect/MemRef/IR/MemRef.h" #include "mlir/Dialect/MemRef/Utils/MemRefUtils.h" #include "mlir/Dialect/Utils/StaticValueUtils.h" diff --git a/mlir/lib/Dialect/MemRef/TransformOps/CMakeLists.txt b/mlir/lib/Dialect/MemRef/TransformOps/CMakeLists.txt index 03de3af..11e8d25 100644 --- a/mlir/lib/Dialect/MemRef/TransformOps/CMakeLists.txt +++ b/mlir/lib/Dialect/MemRef/TransformOps/CMakeLists.txt @@ -9,7 +9,7 @@ add_mlir_dialect_library(MLIRMemRefTransformOps LINK_LIBS PUBLIC MLIRAffineDialect - MLIRArithmeticDialect + MLIRArithDialect MLIRIR MLIRPDLDialect MLIRMemRefDialect diff --git a/mlir/lib/Dialect/MemRef/TransformOps/MemRefTransformOps.cpp b/mlir/lib/Dialect/MemRef/TransformOps/MemRefTransformOps.cpp index c91a3b9..1d7a8b7 100644 --- a/mlir/lib/Dialect/MemRef/TransformOps/MemRefTransformOps.cpp +++ b/mlir/lib/Dialect/MemRef/TransformOps/MemRefTransformOps.cpp @@ -8,7 +8,7 @@ #include "mlir/Dialect/MemRef/TransformOps/MemRefTransformOps.h" #include "mlir/Dialect/Affine/IR/AffineOps.h" -#include "mlir/Dialect/Arithmetic/IR/Arithmetic.h" +#include "mlir/Dialect/Arith/IR/Arith.h" #include "mlir/Dialect/MemRef/IR/MemRef.h" #include "mlir/Dialect/MemRef/Transforms/Passes.h" #include "mlir/Dialect/PDL/IR/PDL.h" @@ -50,7 +50,7 @@ public: void init() { declareDependentDialect(); declareGeneratedDialect(); - declareGeneratedDialect(); + declareGeneratedDialect(); registerTransformOps< #define GET_OP_LIST diff --git a/mlir/lib/Dialect/MemRef/Transforms/CMakeLists.txt b/mlir/lib/Dialect/MemRef/Transforms/CMakeLists.txt index d64bbef..967a85d 100644 --- a/mlir/lib/Dialect/MemRef/Transforms/CMakeLists.txt +++ b/mlir/lib/Dialect/MemRef/Transforms/CMakeLists.txt @@ -16,7 +16,7 @@ add_mlir_dialect_library(MLIRMemRefTransforms LINK_LIBS PUBLIC MLIRAffineDialect MLIRAffineUtils - MLIRArithmeticDialect + MLIRArithDialect MLIRFuncDialect MLIRInferTypeOpInterface MLIRLoopLikeInterface diff --git a/mlir/lib/Dialect/MemRef/Transforms/ExpandOps.cpp b/mlir/lib/Dialect/MemRef/Transforms/ExpandOps.cpp index 0eca196..d093653 100644 --- a/mlir/lib/Dialect/MemRef/Transforms/ExpandOps.cpp +++ b/mlir/lib/Dialect/MemRef/Transforms/ExpandOps.cpp @@ -14,8 +14,8 @@ #include "mlir/Dialect/MemRef/Transforms/Passes.h" -#include "mlir/Dialect/Arithmetic/IR/Arithmetic.h" -#include "mlir/Dialect/Arithmetic/Transforms/Passes.h" +#include "mlir/Dialect/Arith/IR/Arith.h" +#include "mlir/Dialect/Arith/Transforms/Passes.h" #include "mlir/Dialect/MemRef/IR/MemRef.h" #include "mlir/IR/TypeUtilities.h" #include "mlir/Transforms/DialectConversion.h" @@ -133,7 +133,7 @@ struct ExpandOpsPass : public memref::impl::ExpandOpsBase { memref::populateExpandOpsPatterns(patterns); ConversionTarget target(ctx); - target.addLegalDialect(); + target.addLegalDialect(); target.addDynamicallyLegalOp( [](memref::AtomicRMWOp op) { return op.getKind() != arith::AtomicRMWKind::maxf && diff --git a/mlir/lib/Dialect/MemRef/Transforms/FoldMemRefAliasOps.cpp b/mlir/lib/Dialect/MemRef/Transforms/FoldMemRefAliasOps.cpp index 549c8d0..bbf0818 100644 --- a/mlir/lib/Dialect/MemRef/Transforms/FoldMemRefAliasOps.cpp +++ b/mlir/lib/Dialect/MemRef/Transforms/FoldMemRefAliasOps.cpp @@ -14,7 +14,7 @@ #include "mlir/Dialect/MemRef/Transforms/Passes.h" #include "mlir/Dialect/Affine/IR/AffineOps.h" -#include "mlir/Dialect/Arithmetic/IR/Arithmetic.h" +#include "mlir/Dialect/Arith/IR/Arith.h" #include "mlir/Dialect/MemRef/IR/MemRef.h" #include "mlir/Dialect/Utils/IndexingUtils.h" #include "mlir/Dialect/Vector/IR/VectorOps.h" diff --git a/mlir/lib/Dialect/MemRef/Transforms/ResolveShapedTypeResultDims.cpp b/mlir/lib/Dialect/MemRef/Transforms/ResolveShapedTypeResultDims.cpp index 3f3687a..5ce1ce5 100644 --- a/mlir/lib/Dialect/MemRef/Transforms/ResolveShapedTypeResultDims.cpp +++ b/mlir/lib/Dialect/MemRef/Transforms/ResolveShapedTypeResultDims.cpp @@ -14,7 +14,7 @@ #include "mlir/Dialect/MemRef/Transforms/Passes.h" #include "mlir/Dialect/Affine/IR/AffineOps.h" -#include "mlir/Dialect/Arithmetic/IR/Arithmetic.h" +#include "mlir/Dialect/Arith/IR/Arith.h" #include "mlir/Dialect/MemRef/IR/MemRef.h" #include "mlir/Dialect/Tensor/IR/Tensor.h" #include "mlir/Interfaces/InferTypeOpInterface.h" diff --git a/mlir/lib/Dialect/MemRef/Transforms/SimplifyExtractStridedMetadata.cpp b/mlir/lib/Dialect/MemRef/Transforms/SimplifyExtractStridedMetadata.cpp index 5a6f72e..462950f 100644 --- a/mlir/lib/Dialect/MemRef/Transforms/SimplifyExtractStridedMetadata.cpp +++ b/mlir/lib/Dialect/MemRef/Transforms/SimplifyExtractStridedMetadata.cpp @@ -13,7 +13,7 @@ //===----------------------------------------------------------------------===// #include "mlir/Dialect/Affine/IR/AffineOps.h" -#include "mlir/Dialect/Arithmetic/Utils/Utils.h" +#include "mlir/Dialect/Arith/Utils/Utils.h" #include "mlir/Dialect/MemRef/IR/MemRef.h" #include "mlir/Dialect/MemRef/Transforms/Passes.h" #include "mlir/IR/BuiltinTypes.h" diff --git a/mlir/lib/Dialect/NVGPU/Transforms/CMakeLists.txt b/mlir/lib/Dialect/NVGPU/Transforms/CMakeLists.txt index afe7d16..ad50ca9 100644 --- a/mlir/lib/Dialect/NVGPU/Transforms/CMakeLists.txt +++ b/mlir/lib/Dialect/NVGPU/Transforms/CMakeLists.txt @@ -9,7 +9,7 @@ add_mlir_dialect_library(MLIRNVGPUTransforms MLIRNVGPUPassIncGen LINK_LIBS PUBLIC - MLIRArithmeticDialect + MLIRArithDialect MLIRGPUOps MLIRIR MLIRMemRefDialect diff --git a/mlir/lib/Dialect/NVGPU/Transforms/MmaSyncTF32Transform.cpp b/mlir/lib/Dialect/NVGPU/Transforms/MmaSyncTF32Transform.cpp index 4d38319..7430daf 100644 --- a/mlir/lib/Dialect/NVGPU/Transforms/MmaSyncTF32Transform.cpp +++ b/mlir/lib/Dialect/NVGPU/Transforms/MmaSyncTF32Transform.cpp @@ -11,7 +11,7 @@ // //===----------------------------------------------------------------------===// -#include "mlir/Dialect/Arithmetic/IR/Arithmetic.h" +#include "mlir/Dialect/Arith/IR/Arith.h" #include "mlir/Dialect/GPU/IR/GPUDialect.h" #include "mlir/Dialect/MemRef/IR/MemRef.h" #include "mlir/Dialect/NVGPU/IR/NVGPUDialect.h" diff --git a/mlir/lib/Dialect/NVGPU/Transforms/OptimizeSharedMemory.cpp b/mlir/lib/Dialect/NVGPU/Transforms/OptimizeSharedMemory.cpp index 158e469..468684c 100644 --- a/mlir/lib/Dialect/NVGPU/Transforms/OptimizeSharedMemory.cpp +++ b/mlir/lib/Dialect/NVGPU/Transforms/OptimizeSharedMemory.cpp @@ -12,7 +12,7 @@ #include "mlir/Dialect/NVGPU/Passes.h" -#include "mlir/Dialect/Arithmetic/IR/Arithmetic.h" +#include "mlir/Dialect/Arith/IR/Arith.h" #include "mlir/Dialect/GPU/IR/GPUDialect.h" #include "mlir/Dialect/MemRef/IR/MemRef.h" #include "mlir/Dialect/NVGPU/IR/NVGPUDialect.h" diff --git a/mlir/lib/Dialect/SCF/IR/CMakeLists.txt b/mlir/lib/Dialect/SCF/IR/CMakeLists.txt index 9dad732..6255d9e 100644 --- a/mlir/lib/Dialect/SCF/IR/CMakeLists.txt +++ b/mlir/lib/Dialect/SCF/IR/CMakeLists.txt @@ -8,7 +8,7 @@ add_mlir_dialect_library(MLIRSCFDialect MLIRSCFOpsIncGen LINK_LIBS PUBLIC - MLIRArithmeticDialect + MLIRArithDialect MLIRBufferizationDialect MLIRControlFlowDialect MLIRIR diff --git a/mlir/lib/Dialect/SCF/IR/SCF.cpp b/mlir/lib/Dialect/SCF/IR/SCF.cpp index 73b6dac..071814f 100644 --- a/mlir/lib/Dialect/SCF/IR/SCF.cpp +++ b/mlir/lib/Dialect/SCF/IR/SCF.cpp @@ -7,8 +7,8 @@ //===----------------------------------------------------------------------===// #include "mlir/Dialect/SCF/IR/SCF.h" -#include "mlir/Dialect/Arithmetic/IR/Arithmetic.h" -#include "mlir/Dialect/Arithmetic/Utils/Utils.h" +#include "mlir/Dialect/Arith/IR/Arith.h" +#include "mlir/Dialect/Arith/Utils/Utils.h" #include "mlir/Dialect/Bufferization/IR/Bufferization.h" #include "mlir/Dialect/ControlFlow/IR/ControlFlowOps.h" #include "mlir/Dialect/MemRef/IR/MemRef.h" diff --git a/mlir/lib/Dialect/SCF/Transforms/CMakeLists.txt b/mlir/lib/Dialect/SCF/Transforms/CMakeLists.txt index e525a01..adbeeb1 100644 --- a/mlir/lib/Dialect/SCF/Transforms/CMakeLists.txt +++ b/mlir/lib/Dialect/SCF/Transforms/CMakeLists.txt @@ -21,7 +21,7 @@ add_mlir_dialect_library(MLIRSCFTransforms LINK_LIBS PUBLIC MLIRAffineDialect MLIRAffineAnalysis - MLIRArithmeticDialect + MLIRArithDialect MLIRBufferizationDialect MLIRBufferizationTransforms MLIRDialectUtils diff --git a/mlir/lib/Dialect/SCF/Transforms/ForToWhile.cpp b/mlir/lib/Dialect/SCF/Transforms/ForToWhile.cpp index e7a6003..5a9e021 100644 --- a/mlir/lib/Dialect/SCF/Transforms/ForToWhile.cpp +++ b/mlir/lib/Dialect/SCF/Transforms/ForToWhile.cpp @@ -12,7 +12,7 @@ #include "mlir/Dialect/SCF/Transforms/Passes.h" -#include "mlir/Dialect/Arithmetic/IR/Arithmetic.h" +#include "mlir/Dialect/Arith/IR/Arith.h" #include "mlir/Dialect/SCF/IR/SCF.h" #include "mlir/Dialect/SCF/Transforms/Transforms.h" #include "mlir/IR/PatternMatch.h" diff --git a/mlir/lib/Dialect/SCF/Transforms/LoopPipelining.cpp b/mlir/lib/Dialect/SCF/Transforms/LoopPipelining.cpp index fc3725d..6d5cd3b 100644 --- a/mlir/lib/Dialect/SCF/Transforms/LoopPipelining.cpp +++ b/mlir/lib/Dialect/SCF/Transforms/LoopPipelining.cpp @@ -10,7 +10,7 @@ // //===----------------------------------------------------------------------===// -#include "mlir/Dialect/Arithmetic/IR/Arithmetic.h" +#include "mlir/Dialect/Arith/IR/Arith.h" #include "mlir/Dialect/SCF/IR/SCF.h" #include "mlir/Dialect/SCF/Transforms/Patterns.h" #include "mlir/Dialect/SCF/Transforms/Transforms.h" diff --git a/mlir/lib/Dialect/SCF/Transforms/LoopRangeFolding.cpp b/mlir/lib/Dialect/SCF/Transforms/LoopRangeFolding.cpp index 24e4c4f..a2fe36e 100644 --- a/mlir/lib/Dialect/SCF/Transforms/LoopRangeFolding.cpp +++ b/mlir/lib/Dialect/SCF/Transforms/LoopRangeFolding.cpp @@ -12,7 +12,7 @@ #include "mlir/Dialect/SCF/Transforms/Passes.h" -#include "mlir/Dialect/Arithmetic/IR/Arithmetic.h" +#include "mlir/Dialect/Arith/IR/Arith.h" #include "mlir/Dialect/SCF/IR/SCF.h" #include "mlir/Dialect/SCF/Transforms/Transforms.h" #include "mlir/Dialect/SCF/Utils/Utils.h" diff --git a/mlir/lib/Dialect/SCF/Transforms/LoopSpecialization.cpp b/mlir/lib/Dialect/SCF/Transforms/LoopSpecialization.cpp index 7e9fd4f..5eac076 100644 --- a/mlir/lib/Dialect/SCF/Transforms/LoopSpecialization.cpp +++ b/mlir/lib/Dialect/SCF/Transforms/LoopSpecialization.cpp @@ -15,7 +15,7 @@ #include "mlir/Dialect/Affine/Analysis/AffineStructures.h" #include "mlir/Dialect/Affine/IR/AffineOps.h" -#include "mlir/Dialect/Arithmetic/IR/Arithmetic.h" +#include "mlir/Dialect/Arith/IR/Arith.h" #include "mlir/Dialect/SCF/IR/SCF.h" #include "mlir/Dialect/SCF/Transforms/Transforms.h" #include "mlir/Dialect/SCF/Utils/AffineCanonicalizationUtils.h" diff --git a/mlir/lib/Dialect/SCF/Transforms/ParallelLoopTiling.cpp b/mlir/lib/Dialect/SCF/Transforms/ParallelLoopTiling.cpp index afcb2c2..785b068 100644 --- a/mlir/lib/Dialect/SCF/Transforms/ParallelLoopTiling.cpp +++ b/mlir/lib/Dialect/SCF/Transforms/ParallelLoopTiling.cpp @@ -13,7 +13,7 @@ #include "mlir/Dialect/SCF/Transforms/Passes.h" #include "mlir/Dialect/Affine/IR/AffineOps.h" -#include "mlir/Dialect/Arithmetic/IR/Arithmetic.h" +#include "mlir/Dialect/Arith/IR/Arith.h" #include "mlir/Dialect/SCF/IR/SCF.h" #include "mlir/Dialect/SCF/Transforms/Transforms.h" #include "mlir/Dialect/SCF/Utils/Utils.h" diff --git a/mlir/lib/Dialect/SCF/Transforms/TileUsingInterface.cpp b/mlir/lib/Dialect/SCF/Transforms/TileUsingInterface.cpp index 5342be5..fb219df 100644 --- a/mlir/lib/Dialect/SCF/Transforms/TileUsingInterface.cpp +++ b/mlir/lib/Dialect/SCF/Transforms/TileUsingInterface.cpp @@ -13,8 +13,8 @@ #include "mlir/Dialect/SCF/Transforms/TileUsingInterface.h" #include "mlir/Dialect/Affine/IR/AffineOps.h" -#include "mlir/Dialect/Arithmetic/IR/Arithmetic.h" -#include "mlir/Dialect/Arithmetic/Utils/Utils.h" +#include "mlir/Dialect/Arith/IR/Arith.h" +#include "mlir/Dialect/Arith/Utils/Utils.h" #include "mlir/Dialect/Func/IR/FuncOps.h" #include "mlir/Dialect/SCF/Utils/Utils.h" #include "mlir/Dialect/Tensor/IR/Tensor.h" diff --git a/mlir/lib/Dialect/SCF/Utils/CMakeLists.txt b/mlir/lib/Dialect/SCF/Utils/CMakeLists.txt index 3fe1483..15802da 100644 --- a/mlir/lib/Dialect/SCF/Utils/CMakeLists.txt +++ b/mlir/lib/Dialect/SCF/Utils/CMakeLists.txt @@ -9,7 +9,7 @@ add_mlir_dialect_library(MLIRSCFUtils MLIRAffineDialect MLIRAffineAnalysis MLIRAnalysis - MLIRArithmeticDialect + MLIRArithDialect MLIRDialectUtils MLIRFuncDialect MLIRIR diff --git a/mlir/lib/Dialect/SCF/Utils/Utils.cpp b/mlir/lib/Dialect/SCF/Utils/Utils.cpp index 7771873..c6e416b 100644 --- a/mlir/lib/Dialect/SCF/Utils/Utils.cpp +++ b/mlir/lib/Dialect/SCF/Utils/Utils.cpp @@ -12,7 +12,7 @@ #include "mlir/Dialect/SCF/Utils/Utils.h" #include "mlir/Analysis/SliceAnalysis.h" -#include "mlir/Dialect/Arithmetic/IR/Arithmetic.h" +#include "mlir/Dialect/Arith/IR/Arith.h" #include "mlir/Dialect/Func/IR/FuncOps.h" #include "mlir/Dialect/SCF/IR/SCF.h" #include "mlir/IR/BlockAndValueMapping.h" diff --git a/mlir/lib/Dialect/Shape/IR/CMakeLists.txt b/mlir/lib/Dialect/Shape/IR/CMakeLists.txt index 6db6815..88cd9fe 100644 --- a/mlir/lib/Dialect/Shape/IR/CMakeLists.txt +++ b/mlir/lib/Dialect/Shape/IR/CMakeLists.txt @@ -12,7 +12,7 @@ add_mlir_dialect_library(MLIRShapeDialect MLIRShapeOpsIncGen LINK_LIBS PUBLIC - MLIRArithmeticDialect + MLIRArithDialect MLIRCallInterfaces MLIRCastInterfaces MLIRControlFlowInterfaces diff --git a/mlir/lib/Dialect/Shape/IR/Shape.cpp b/mlir/lib/Dialect/Shape/IR/Shape.cpp index 2227064..0fd8d2d 100644 --- a/mlir/lib/Dialect/Shape/IR/Shape.cpp +++ b/mlir/lib/Dialect/Shape/IR/Shape.cpp @@ -10,7 +10,7 @@ #include "mlir/Dialect/Shape/IR/Shape.h" -#include "mlir/Dialect/Arithmetic/IR/Arithmetic.h" +#include "mlir/Dialect/Arith/IR/Arith.h" #include "mlir/Dialect/CommonFolders.h" #include "mlir/Dialect/Tensor/IR/Tensor.h" #include "mlir/Dialect/Traits.h" diff --git a/mlir/lib/Dialect/Shape/Transforms/CMakeLists.txt b/mlir/lib/Dialect/Shape/Transforms/CMakeLists.txt index ad8df55..40f1bd1 100644 --- a/mlir/lib/Dialect/Shape/Transforms/CMakeLists.txt +++ b/mlir/lib/Dialect/Shape/Transforms/CMakeLists.txt @@ -13,7 +13,7 @@ add_mlir_dialect_library(MLIRShapeOpsTransforms target_link_libraries(MLIRShapeOpsTransforms PUBLIC - MLIRArithmeticDialect + MLIRArithDialect MLIRBufferizationDialect MLIRBufferizationTransforms MLIRIR diff --git a/mlir/lib/Dialect/Shape/Transforms/ShapeToShapeLowering.cpp b/mlir/lib/Dialect/Shape/Transforms/ShapeToShapeLowering.cpp index c73512c..e870664 100644 --- a/mlir/lib/Dialect/Shape/Transforms/ShapeToShapeLowering.cpp +++ b/mlir/lib/Dialect/Shape/Transforms/ShapeToShapeLowering.cpp @@ -8,7 +8,7 @@ #include "mlir/Dialect/Shape/Transforms/Passes.h" -#include "mlir/Dialect/Arithmetic/IR/Arithmetic.h" +#include "mlir/Dialect/Arith/IR/Arith.h" #include "mlir/Dialect/Func/IR/FuncOps.h" #include "mlir/Dialect/Shape/IR/Shape.h" #include "mlir/IR/Builders.h" @@ -71,7 +71,7 @@ void ShapeToShapeLowering::runOnOperation() { populateShapeRewritePatterns(patterns); ConversionTarget target(getContext()); - target.addLegalDialect(); + target.addLegalDialect(); target.addIllegalOp(); if (failed(mlir::applyPartialConversion(getOperation(), target, std::move(patterns)))) diff --git a/mlir/lib/Dialect/SparseTensor/IR/CMakeLists.txt b/mlir/lib/Dialect/SparseTensor/IR/CMakeLists.txt index 9dba530..9a7fe46 100644 --- a/mlir/lib/Dialect/SparseTensor/IR/CMakeLists.txt +++ b/mlir/lib/Dialect/SparseTensor/IR/CMakeLists.txt @@ -9,7 +9,7 @@ add_mlir_dialect_library(MLIRSparseTensorDialect MLIRSparseTensorOpsIncGen LINK_LIBS PUBLIC - MLIRArithmeticDialect + MLIRArithDialect MLIRDialect MLIRIR MLIRInferTypeOpInterface diff --git a/mlir/lib/Dialect/SparseTensor/IR/SparseTensorDialect.cpp b/mlir/lib/Dialect/SparseTensor/IR/SparseTensorDialect.cpp index 8ed65d0..48bb558 100644 --- a/mlir/lib/Dialect/SparseTensor/IR/SparseTensorDialect.cpp +++ b/mlir/lib/Dialect/SparseTensor/IR/SparseTensorDialect.cpp @@ -8,7 +8,7 @@ #include "mlir/Dialect/SparseTensor/IR/SparseTensor.h" -#include "mlir/Dialect/Arithmetic/IR/Arithmetic.h" +#include "mlir/Dialect/Arith/IR/Arith.h" #include "mlir/IR/Builders.h" #include "mlir/IR/DialectImplementation.h" #include "mlir/IR/Matchers.h" diff --git a/mlir/lib/Dialect/SparseTensor/Pipelines/CMakeLists.txt b/mlir/lib/Dialect/SparseTensor/Pipelines/CMakeLists.txt index 08e7592..87daf76 100644 --- a/mlir/lib/Dialect/SparseTensor/Pipelines/CMakeLists.txt +++ b/mlir/lib/Dialect/SparseTensor/Pipelines/CMakeLists.txt @@ -5,7 +5,7 @@ add_mlir_dialect_library(MLIRSparseTensorPipelines ${MLIR_MAIN_INCLUDE_DIR}/mlir/Dialect/SparseTensor LINK_LIBS PUBLIC - MLIRArithmeticTransforms + MLIRArithTransforms MLIRAffineToStandard MLIRBufferizationTransforms MLIRComplexToLLVM diff --git a/mlir/lib/Dialect/SparseTensor/Pipelines/SparseTensorPipelines.cpp b/mlir/lib/Dialect/SparseTensor/Pipelines/SparseTensorPipelines.cpp index 4b961a7..51ea50d 100644 --- a/mlir/lib/Dialect/SparseTensor/Pipelines/SparseTensorPipelines.cpp +++ b/mlir/lib/Dialect/SparseTensor/Pipelines/SparseTensorPipelines.cpp @@ -9,7 +9,7 @@ #include "mlir/Dialect/SparseTensor/Pipelines/Passes.h" #include "mlir/Conversion/Passes.h" -#include "mlir/Dialect/Arithmetic/Transforms/Passes.h" +#include "mlir/Dialect/Arith/Transforms/Passes.h" #include "mlir/Dialect/Bufferization/Transforms/Bufferize.h" #include "mlir/Dialect/Bufferization/Transforms/OneShotAnalysis.h" #include "mlir/Dialect/Bufferization/Transforms/Passes.h" @@ -78,8 +78,7 @@ void mlir::sparse_tensor::buildSparseCompiler( pm.addPass(createConvertVectorToLLVMPass(options.lowerVectorToLLVMOptions())); pm.addPass(createMemRefToLLVMConversionPass()); pm.addNestedPass(createConvertComplexToStandardPass()); - pm.addNestedPass( - mlir::arith::createArithmeticExpandOpsPass()); + pm.addNestedPass(mlir::arith::createArithExpandOpsPass()); pm.addNestedPass(createConvertMathToLLVMPass()); pm.addPass(createConvertMathToLibmPass()); pm.addPass(createConvertComplexToLibmPass()); diff --git a/mlir/lib/Dialect/SparseTensor/Transforms/CMakeLists.txt b/mlir/lib/Dialect/SparseTensor/Transforms/CMakeLists.txt index 640ee67..a1d93f3 100644 --- a/mlir/lib/Dialect/SparseTensor/Transforms/CMakeLists.txt +++ b/mlir/lib/Dialect/SparseTensor/Transforms/CMakeLists.txt @@ -15,7 +15,7 @@ add_mlir_dialect_library(MLIRSparseTensorTransforms MLIRSparseTensorPassIncGen LINK_LIBS PUBLIC - MLIRArithmeticDialect + MLIRArithDialect MLIRBufferizationDialect MLIRBufferizationTransforms MLIRComplexDialect diff --git a/mlir/lib/Dialect/SparseTensor/Transforms/CodegenUtils.h b/mlir/lib/Dialect/SparseTensor/Transforms/CodegenUtils.h index ba897f7..cc9c279 100644 --- a/mlir/lib/Dialect/SparseTensor/Transforms/CodegenUtils.h +++ b/mlir/lib/Dialect/SparseTensor/Transforms/CodegenUtils.h @@ -13,7 +13,7 @@ #ifndef MLIR_DIALECT_SPARSETENSOR_TRANSFORMS_CODEGENUTILS_H_ #define MLIR_DIALECT_SPARSETENSOR_TRANSFORMS_CODEGENUTILS_H_ -#include "mlir/Dialect/Arithmetic/IR/Arithmetic.h" +#include "mlir/Dialect/Arith/IR/Arith.h" #include "mlir/Dialect/Complex/IR/Complex.h" #include "mlir/Dialect/SparseTensor/IR/SparseTensor.h" #include "mlir/ExecutionEngine/SparseTensorUtils.h" diff --git a/mlir/lib/Dialect/SparseTensor/Transforms/SparseTensorPasses.cpp b/mlir/lib/Dialect/SparseTensor/Transforms/SparseTensorPasses.cpp index a008b38..5af4e11 100644 --- a/mlir/lib/Dialect/SparseTensor/Transforms/SparseTensorPasses.cpp +++ b/mlir/lib/Dialect/SparseTensor/Transforms/SparseTensorPasses.cpp @@ -7,7 +7,7 @@ //===----------------------------------------------------------------------===// #include "mlir/Dialect/Affine/IR/AffineOps.h" -#include "mlir/Dialect/Arithmetic/IR/Arithmetic.h" +#include "mlir/Dialect/Arith/IR/Arith.h" #include "mlir/Dialect/Bufferization/IR/Bufferization.h" #include "mlir/Dialect/Complex/IR/Complex.h" #include "mlir/Dialect/Func/IR/FuncOps.h" @@ -127,7 +127,7 @@ struct SparseTensorConversionPass target.addLegalOp(); target.addLegalDialect< - arith::ArithmeticDialect, bufferization::BufferizationDialect, + arith::ArithDialect, bufferization::BufferizationDialect, LLVM::LLVMDialect, memref::MemRefDialect, scf::SCFDialect>(); // Translate strategy flags to strategy options. SparseTensorConversionOptions options( @@ -182,7 +182,7 @@ struct SparseTensorCodegenPass // The following operations and dialects may be introduced by the // codegen rules, and are therefore marked as legal. target.addLegalOp(); - target.addLegalDialect(); target.addLegalOp(); diff --git a/mlir/lib/Dialect/SparseTensor/Transforms/SparseTensorRewriting.cpp b/mlir/lib/Dialect/SparseTensor/Transforms/SparseTensorRewriting.cpp index b5a08fa..f451934 100644 --- a/mlir/lib/Dialect/SparseTensor/Transforms/SparseTensorRewriting.cpp +++ b/mlir/lib/Dialect/SparseTensor/Transforms/SparseTensorRewriting.cpp @@ -12,7 +12,7 @@ #include "CodegenUtils.h" -#include "mlir/Dialect/Arithmetic/IR/Arithmetic.h" +#include "mlir/Dialect/Arith/IR/Arith.h" #include "mlir/Dialect/Bufferization/IR/Bufferization.h" #include "mlir/Dialect/Linalg/IR/Linalg.h" #include "mlir/Dialect/SparseTensor/IR/SparseTensor.h" diff --git a/mlir/lib/Dialect/SparseTensor/Transforms/Sparsification.cpp b/mlir/lib/Dialect/SparseTensor/Transforms/Sparsification.cpp index ea54c7b..7019058 100644 --- a/mlir/lib/Dialect/SparseTensor/Transforms/Sparsification.cpp +++ b/mlir/lib/Dialect/SparseTensor/Transforms/Sparsification.cpp @@ -13,7 +13,7 @@ #include "CodegenUtils.h" #include "mlir/Dialect/Affine/IR/AffineOps.h" -#include "mlir/Dialect/Arithmetic/IR/Arithmetic.h" +#include "mlir/Dialect/Arith/IR/Arith.h" #include "mlir/Dialect/Bufferization/IR/BufferizableOpInterface.h" #include "mlir/Dialect/Bufferization/IR/Bufferization.h" #include "mlir/Dialect/Func/IR/FuncOps.h" diff --git a/mlir/lib/Dialect/SparseTensor/Utils/CMakeLists.txt b/mlir/lib/Dialect/SparseTensor/Utils/CMakeLists.txt index 0e2d8ef..8d614ed 100644 --- a/mlir/lib/Dialect/SparseTensor/Utils/CMakeLists.txt +++ b/mlir/lib/Dialect/SparseTensor/Utils/CMakeLists.txt @@ -5,7 +5,7 @@ add_mlir_dialect_library(MLIRSparseTensorUtils ${MLIR_MAIN_INCLUDE_DIR}/mlir/Dialect/SparseTensor LINK_LIBS PUBLIC - MLIRArithmeticDialect + MLIRArithDialect MLIRComplexDialect MLIRIR MLIRLinalgDialect diff --git a/mlir/lib/Dialect/SparseTensor/Utils/Merger.cpp b/mlir/lib/Dialect/SparseTensor/Utils/Merger.cpp index 35d11c4..7f132f9 100644 --- a/mlir/lib/Dialect/SparseTensor/Utils/Merger.cpp +++ b/mlir/lib/Dialect/SparseTensor/Utils/Merger.cpp @@ -7,7 +7,7 @@ //===----------------------------------------------------------------------===// #include "mlir/Dialect/SparseTensor/Utils/Merger.h" -#include "mlir/Dialect/Arithmetic/IR/Arithmetic.h" +#include "mlir/Dialect/Arith/IR/Arith.h" #include "mlir/Dialect/Complex/IR/Complex.h" #include "mlir/Dialect/Math/IR/Math.h" #include "mlir/Dialect/SparseTensor/IR/SparseTensor.h" diff --git a/mlir/lib/Dialect/Tensor/IR/CMakeLists.txt b/mlir/lib/Dialect/Tensor/IR/CMakeLists.txt index 1c8dd2d..d175954 100644 --- a/mlir/lib/Dialect/Tensor/IR/CMakeLists.txt +++ b/mlir/lib/Dialect/Tensor/IR/CMakeLists.txt @@ -19,8 +19,8 @@ add_mlir_dialect_library(MLIRTensorDialect Core LINK_LIBS PUBLIC - MLIRArithmeticDialect - MLIRArithmeticUtils + MLIRArithDialect + MLIRArithUtils MLIRCastInterfaces MLIRComplexDialect MLIRDialectUtils diff --git a/mlir/lib/Dialect/Tensor/IR/TensorDialect.cpp b/mlir/lib/Dialect/Tensor/IR/TensorDialect.cpp index 6ef3ba1..801ebd7 100644 --- a/mlir/lib/Dialect/Tensor/IR/TensorDialect.cpp +++ b/mlir/lib/Dialect/Tensor/IR/TensorDialect.cpp @@ -6,7 +6,7 @@ // //===----------------------------------------------------------------------===// -#include "mlir/Dialect/Arithmetic/IR/Arithmetic.h" +#include "mlir/Dialect/Arith/IR/Arith.h" #include "mlir/Dialect/Complex/IR/Complex.h" #include "mlir/Dialect/Tensor/IR/Tensor.h" #include "mlir/Transforms/InliningUtils.h" diff --git a/mlir/lib/Dialect/Tensor/IR/TensorOps.cpp b/mlir/lib/Dialect/Tensor/IR/TensorOps.cpp index dca5487..4fc2782 100644 --- a/mlir/lib/Dialect/Tensor/IR/TensorOps.cpp +++ b/mlir/lib/Dialect/Tensor/IR/TensorOps.cpp @@ -6,8 +6,8 @@ // //===----------------------------------------------------------------------===// -#include "mlir/Dialect/Arithmetic/IR/Arithmetic.h" -#include "mlir/Dialect/Arithmetic/Utils/Utils.h" +#include "mlir/Dialect/Arith/IR/Arith.h" +#include "mlir/Dialect/Arith/Utils/Utils.h" #include "mlir/Dialect/Complex/IR/Complex.h" #include "mlir/Dialect/Tensor/IR/Tensor.h" #include "mlir/Dialect/Utils/ReshapeOpsUtils.h" diff --git a/mlir/lib/Dialect/Tensor/IR/TensorTilingInterfaceImpl.cpp b/mlir/lib/Dialect/Tensor/IR/TensorTilingInterfaceImpl.cpp index fab2adc..2c306fa 100644 --- a/mlir/lib/Dialect/Tensor/IR/TensorTilingInterfaceImpl.cpp +++ b/mlir/lib/Dialect/Tensor/IR/TensorTilingInterfaceImpl.cpp @@ -8,7 +8,7 @@ #include "mlir/Dialect/Tensor/IR/TensorTilingInterfaceImpl.h" #include "mlir/Dialect/Affine/IR/AffineOps.h" -#include "mlir/Dialect/Arithmetic/Utils/Utils.h" +#include "mlir/Dialect/Arith/Utils/Utils.h" #include "mlir/Dialect/Linalg/IR/Linalg.h" #include "mlir/Dialect/SCF/IR/SCF.h" #include "mlir/Dialect/Tensor/IR/Tensor.h" diff --git a/mlir/lib/Dialect/Tensor/Transforms/BufferizableOpInterfaceImpl.cpp b/mlir/lib/Dialect/Tensor/Transforms/BufferizableOpInterfaceImpl.cpp index 737e642..8a92129 100644 --- a/mlir/lib/Dialect/Tensor/Transforms/BufferizableOpInterfaceImpl.cpp +++ b/mlir/lib/Dialect/Tensor/Transforms/BufferizableOpInterfaceImpl.cpp @@ -8,7 +8,7 @@ #include "mlir/Dialect/Tensor/Transforms/BufferizableOpInterfaceImpl.h" #include "mlir/Dialect/Affine/IR/AffineOps.h" -#include "mlir/Dialect/Arithmetic/IR/Arithmetic.h" +#include "mlir/Dialect/Arith/IR/Arith.h" #include "mlir/Dialect/Bufferization/IR/BufferizableOpInterface.h" #include "mlir/Dialect/Bufferization/IR/Bufferization.h" #include "mlir/Dialect/MemRef/IR/MemRef.h" @@ -1051,6 +1051,6 @@ void mlir::tensor::registerBufferizableOpInterfaceExternalModels( ReshapeOp::attachInterface(*ctx); // Load additional dialects of which ops may get created. - ctx->loadDialect(); + ctx->loadDialect(); }); } diff --git a/mlir/lib/Dialect/Tensor/Transforms/Bufferize.cpp b/mlir/lib/Dialect/Tensor/Transforms/Bufferize.cpp index 11dad0f..426b136 100644 --- a/mlir/lib/Dialect/Tensor/Transforms/Bufferize.cpp +++ b/mlir/lib/Dialect/Tensor/Transforms/Bufferize.cpp @@ -11,7 +11,7 @@ //===----------------------------------------------------------------------===// #include "mlir/Dialect/Bufferization/Transforms/Bufferize.h" -#include "mlir/Dialect/Arithmetic/IR/Arithmetic.h" +#include "mlir/Dialect/Arith/IR/Arith.h" #include "mlir/Dialect/Bufferization/IR/BufferizableOpInterface.h" #include "mlir/Dialect/Bufferization/IR/Bufferization.h" #include "mlir/Dialect/Func/IR/FuncOps.h" @@ -45,9 +45,9 @@ struct TensorBufferizePass } void getDependentDialects(DialectRegistry ®istry) const override { - registry.insert(); + registry + .insert(); tensor::registerBufferizableOpInterfaceExternalModels(registry); } }; diff --git a/mlir/lib/Dialect/Tensor/Transforms/CMakeLists.txt b/mlir/lib/Dialect/Tensor/Transforms/CMakeLists.txt index 6c1fa08..a18d1de 100644 --- a/mlir/lib/Dialect/Tensor/Transforms/CMakeLists.txt +++ b/mlir/lib/Dialect/Tensor/Transforms/CMakeLists.txt @@ -15,7 +15,7 @@ add_mlir_dialect_library(MLIRTensorTransforms LINK_LIBS PUBLIC MLIRAffineDialect MLIRAffineUtils - MLIRArithmeticDialect + MLIRArithDialect MLIRBufferizationDialect MLIRBufferizationTransforms MLIRIR diff --git a/mlir/lib/Dialect/Tensor/Transforms/ExtractSliceFromReshapeUtils.cpp b/mlir/lib/Dialect/Tensor/Transforms/ExtractSliceFromReshapeUtils.cpp index 5ef833b..98430da 100644 --- a/mlir/lib/Dialect/Tensor/Transforms/ExtractSliceFromReshapeUtils.cpp +++ b/mlir/lib/Dialect/Tensor/Transforms/ExtractSliceFromReshapeUtils.cpp @@ -11,8 +11,8 @@ // //===----------------------------------------------------------------------===// #include "mlir/Dialect/Affine/IR/AffineOps.h" -#include "mlir/Dialect/Arithmetic/IR/Arithmetic.h" -#include "mlir/Dialect/Arithmetic/Utils/Utils.h" +#include "mlir/Dialect/Arith/IR/Arith.h" +#include "mlir/Dialect/Arith/Utils/Utils.h" #include "mlir/Dialect/Tensor/IR/Tensor.h" #include "mlir/Dialect/Tensor/Transforms/TransformUtils.h" #include "mlir/Dialect/Tensor/Transforms/Transforms.h" diff --git a/mlir/lib/Dialect/Tensor/Transforms/SplitPaddingPatterns.cpp b/mlir/lib/Dialect/Tensor/Transforms/SplitPaddingPatterns.cpp index e358b8b..5fbd06c 100644 --- a/mlir/lib/Dialect/Tensor/Transforms/SplitPaddingPatterns.cpp +++ b/mlir/lib/Dialect/Tensor/Transforms/SplitPaddingPatterns.cpp @@ -12,7 +12,7 @@ // //===----------------------------------------------------------------------===// -#include "mlir/Dialect/Arithmetic/IR/Arithmetic.h" +#include "mlir/Dialect/Arith/IR/Arith.h" #include "mlir/Dialect/SCF/IR/SCF.h" #include "mlir/Dialect/Tensor/IR/Tensor.h" #include "mlir/Dialect/Tensor/Transforms/Transforms.h" diff --git a/mlir/lib/Dialect/Tensor/Transforms/SwapExtractSliceWithProducerPatterns.cpp b/mlir/lib/Dialect/Tensor/Transforms/SwapExtractSliceWithProducerPatterns.cpp index 00590e3..43c0cdc 100644 --- a/mlir/lib/Dialect/Tensor/Transforms/SwapExtractSliceWithProducerPatterns.cpp +++ b/mlir/lib/Dialect/Tensor/Transforms/SwapExtractSliceWithProducerPatterns.cpp @@ -12,7 +12,7 @@ // //===----------------------------------------------------------------------===// -#include "mlir/Dialect/Arithmetic/IR/Arithmetic.h" +#include "mlir/Dialect/Arith/IR/Arith.h" #include "mlir/Dialect/Tensor/IR/Tensor.h" #include "mlir/Dialect/Tensor/Transforms/Transforms.h" #include "mlir/Dialect/Utils/StaticValueUtils.h" diff --git a/mlir/lib/Dialect/Tensor/Utils/CMakeLists.txt b/mlir/lib/Dialect/Tensor/Utils/CMakeLists.txt index a8c0197..efc7842 100644 --- a/mlir/lib/Dialect/Tensor/Utils/CMakeLists.txt +++ b/mlir/lib/Dialect/Tensor/Utils/CMakeLists.txt @@ -6,7 +6,7 @@ add_mlir_dialect_library(MLIRTensorUtils LINK_LIBS PUBLIC MLIRAffineDialect - MLIRArithmeticDialect + MLIRArithDialect MLIRIR MLIRTensorDialect ) diff --git a/mlir/lib/Dialect/Tensor/Utils/Utils.cpp b/mlir/lib/Dialect/Tensor/Utils/Utils.cpp index e3d008b..c7d04b2 100644 --- a/mlir/lib/Dialect/Tensor/Utils/Utils.cpp +++ b/mlir/lib/Dialect/Tensor/Utils/Utils.cpp @@ -13,7 +13,7 @@ #include "mlir/Dialect/Tensor/Utils/Utils.h" #include "mlir/Dialect/Affine/IR/AffineOps.h" -#include "mlir/Dialect/Arithmetic/IR/Arithmetic.h" +#include "mlir/Dialect/Arith/IR/Arith.h" using namespace mlir; using namespace mlir::tensor; diff --git a/mlir/lib/Dialect/Utils/CMakeLists.txt b/mlir/lib/Dialect/Utils/CMakeLists.txt index b93a30d..7d40cae 100644 --- a/mlir/lib/Dialect/Utils/CMakeLists.txt +++ b/mlir/lib/Dialect/Utils/CMakeLists.txt @@ -5,6 +5,6 @@ add_mlir_library(MLIRDialectUtils StaticValueUtils.cpp LINK_LIBS PUBLIC - MLIRArithmeticUtils + MLIRArithUtils MLIRIR ) diff --git a/mlir/lib/Dialect/Utils/StaticValueUtils.cpp b/mlir/lib/Dialect/Utils/StaticValueUtils.cpp index 2392b1d..5694cfe 100644 --- a/mlir/lib/Dialect/Utils/StaticValueUtils.cpp +++ b/mlir/lib/Dialect/Utils/StaticValueUtils.cpp @@ -7,7 +7,7 @@ //===----------------------------------------------------------------------===// #include "mlir/Dialect/Utils/StaticValueUtils.h" -#include "mlir/Dialect/Arithmetic/Utils/Utils.h" +#include "mlir/Dialect/Arith/Utils/Utils.h" #include "mlir/IR/Matchers.h" #include "mlir/Support/LLVM.h" #include "llvm/ADT/APSInt.h" diff --git a/mlir/lib/Dialect/Vector/IR/CMakeLists.txt b/mlir/lib/Dialect/Vector/IR/CMakeLists.txt index 79899eb..17a0e1d 100644 --- a/mlir/lib/Dialect/Vector/IR/CMakeLists.txt +++ b/mlir/lib/Dialect/Vector/IR/CMakeLists.txt @@ -9,7 +9,7 @@ add_mlir_dialect_library(MLIRVectorDialect MLIRVectorOpsEnumsIncGen LINK_LIBS PUBLIC - MLIRArithmeticDialect + MLIRArithDialect MLIRControlFlowInterfaces MLIRDataLayoutInterfaces MLIRDialectUtils diff --git a/mlir/lib/Dialect/Vector/IR/VectorOps.cpp b/mlir/lib/Dialect/Vector/IR/VectorOps.cpp index fad69e6..112ead7 100644 --- a/mlir/lib/Dialect/Vector/IR/VectorOps.cpp +++ b/mlir/lib/Dialect/Vector/IR/VectorOps.cpp @@ -13,8 +13,8 @@ #include "mlir/Dialect/Vector/IR/VectorOps.h" -#include "mlir/Dialect/Arithmetic/IR/Arithmetic.h" -#include "mlir/Dialect/Arithmetic/Utils/Utils.h" +#include "mlir/Dialect/Arith/IR/Arith.h" +#include "mlir/Dialect/Arith/Utils/Utils.h" #include "mlir/Dialect/MemRef/IR/MemRef.h" #include "mlir/Dialect/Tensor/IR/Tensor.h" #include "mlir/Dialect/Utils/IndexingUtils.h" diff --git a/mlir/lib/Dialect/Vector/Transforms/CMakeLists.txt b/mlir/lib/Dialect/Vector/Transforms/CMakeLists.txt index de9ec99..768bafd 100644 --- a/mlir/lib/Dialect/Vector/Transforms/CMakeLists.txt +++ b/mlir/lib/Dialect/Vector/Transforms/CMakeLists.txt @@ -21,7 +21,7 @@ add_mlir_dialect_library(MLIRVectorTransforms MLIRAffineDialect MLIRAffineAnalysis MLIRAffineUtils - MLIRArithmeticDialect + MLIRArithDialect MLIRBufferizationDialect MLIRBufferizationTransforms MLIRDialectUtils diff --git a/mlir/lib/Dialect/Vector/Transforms/VectorDistribute.cpp b/mlir/lib/Dialect/Vector/Transforms/VectorDistribute.cpp index 7bc1799..3d916d0 100644 --- a/mlir/lib/Dialect/Vector/Transforms/VectorDistribute.cpp +++ b/mlir/lib/Dialect/Vector/Transforms/VectorDistribute.cpp @@ -7,7 +7,7 @@ //===----------------------------------------------------------------------===// #include "mlir/Dialect/Affine/IR/AffineOps.h" -#include "mlir/Dialect/Arithmetic/IR/Arithmetic.h" +#include "mlir/Dialect/Arith/IR/Arith.h" #include "mlir/Dialect/MemRef/IR/MemRef.h" #include "mlir/Dialect/SCF/IR/SCF.h" #include "mlir/Dialect/Vector/IR/VectorOps.h" diff --git a/mlir/lib/Dialect/Vector/Transforms/VectorInsertExtractStridedSliceRewritePatterns.cpp b/mlir/lib/Dialect/Vector/Transforms/VectorInsertExtractStridedSliceRewritePatterns.cpp index 9582a9d..ad6cf85 100644 --- a/mlir/lib/Dialect/Vector/Transforms/VectorInsertExtractStridedSliceRewritePatterns.cpp +++ b/mlir/lib/Dialect/Vector/Transforms/VectorInsertExtractStridedSliceRewritePatterns.cpp @@ -6,7 +6,7 @@ // //===----------------------------------------------------------------------===// -#include "mlir/Dialect/Arithmetic/IR/Arithmetic.h" +#include "mlir/Dialect/Arith/IR/Arith.h" #include "mlir/Dialect/MemRef/IR/MemRef.h" #include "mlir/Dialect/Utils/IndexingUtils.h" #include "mlir/Dialect/Vector/IR/VectorOps.h" diff --git a/mlir/lib/Dialect/Vector/Transforms/VectorMultiDimReductionTransforms.cpp b/mlir/lib/Dialect/Vector/Transforms/VectorMultiDimReductionTransforms.cpp index f8c8f9e..31a2452 100644 --- a/mlir/lib/Dialect/Vector/Transforms/VectorMultiDimReductionTransforms.cpp +++ b/mlir/lib/Dialect/Vector/Transforms/VectorMultiDimReductionTransforms.cpp @@ -10,7 +10,7 @@ // //===----------------------------------------------------------------------===// -#include "mlir/Dialect/Arithmetic/IR/Arithmetic.h" +#include "mlir/Dialect/Arith/IR/Arith.h" #include "mlir/Dialect/Vector/Transforms/VectorRewritePatterns.h" #include "mlir/Dialect/Vector/Utils/VectorUtils.h" #include "mlir/IR/Builders.h" diff --git a/mlir/lib/Dialect/Vector/Transforms/VectorTransferOpTransforms.cpp b/mlir/lib/Dialect/Vector/Transforms/VectorTransferOpTransforms.cpp index 85c3616..893ca29 100644 --- a/mlir/lib/Dialect/Vector/Transforms/VectorTransferOpTransforms.cpp +++ b/mlir/lib/Dialect/Vector/Transforms/VectorTransferOpTransforms.cpp @@ -11,7 +11,7 @@ // //===----------------------------------------------------------------------===// -#include "mlir/Dialect/Arithmetic/IR/Arithmetic.h" +#include "mlir/Dialect/Arith/IR/Arith.h" #include "mlir/Dialect/MemRef/IR/MemRef.h" #include "mlir/Dialect/Vector/IR/VectorOps.h" #include "mlir/Dialect/Vector/Transforms/VectorTransforms.h" diff --git a/mlir/lib/Dialect/Vector/Transforms/VectorTransferSplitRewritePatterns.cpp b/mlir/lib/Dialect/Vector/Transforms/VectorTransferSplitRewritePatterns.cpp index 768fa31..386f296 100644 --- a/mlir/lib/Dialect/Vector/Transforms/VectorTransferSplitRewritePatterns.cpp +++ b/mlir/lib/Dialect/Vector/Transforms/VectorTransferSplitRewritePatterns.cpp @@ -14,7 +14,7 @@ #include #include "mlir/Dialect/Affine/IR/AffineOps.h" -#include "mlir/Dialect/Arithmetic/IR/Arithmetic.h" +#include "mlir/Dialect/Arith/IR/Arith.h" #include "mlir/Dialect/Linalg/IR/Linalg.h" #include "mlir/Dialect/MemRef/IR/MemRef.h" #include "mlir/Dialect/SCF/IR/SCF.h" diff --git a/mlir/lib/Dialect/Vector/Transforms/VectorTransforms.cpp b/mlir/lib/Dialect/Vector/Transforms/VectorTransforms.cpp index 5c3c94d..f1644d0 100644 --- a/mlir/lib/Dialect/Vector/Transforms/VectorTransforms.cpp +++ b/mlir/lib/Dialect/Vector/Transforms/VectorTransforms.cpp @@ -15,8 +15,8 @@ #include #include "mlir/Dialect/Affine/IR/AffineOps.h" -#include "mlir/Dialect/Arithmetic/IR/Arithmetic.h" -#include "mlir/Dialect/Arithmetic/Utils/Utils.h" +#include "mlir/Dialect/Arith/IR/Arith.h" +#include "mlir/Dialect/Arith/Utils/Utils.h" #include "mlir/Dialect/Linalg/IR/Linalg.h" #include "mlir/Dialect/MemRef/IR/MemRef.h" #include "mlir/Dialect/SCF/IR/SCF.h" diff --git a/mlir/lib/Dialect/Vector/Utils/CMakeLists.txt b/mlir/lib/Dialect/Vector/Utils/CMakeLists.txt index 2ead2a6..fa39716 100644 --- a/mlir/lib/Dialect/Vector/Utils/CMakeLists.txt +++ b/mlir/lib/Dialect/Vector/Utils/CMakeLists.txt @@ -7,7 +7,7 @@ add_mlir_dialect_library(MLIRVectorUtils LINK_LIBS PUBLIC MLIRAffineDialect MLIRAffineAnalysis - MLIRArithmeticDialect + MLIRArithDialect MLIRDialectUtils MLIRFuncDialect MLIRIR diff --git a/mlir/lib/Dialect/Vector/Utils/VectorUtils.cpp b/mlir/lib/Dialect/Vector/Utils/VectorUtils.cpp index 112a6517..f6b4cd0 100644 --- a/mlir/lib/Dialect/Vector/Utils/VectorUtils.cpp +++ b/mlir/lib/Dialect/Vector/Utils/VectorUtils.cpp @@ -14,7 +14,7 @@ #include "mlir/Dialect/Affine/Analysis/LoopAnalysis.h" #include "mlir/Dialect/Affine/IR/AffineOps.h" -#include "mlir/Dialect/Arithmetic/IR/Arithmetic.h" +#include "mlir/Dialect/Arith/IR/Arith.h" #include "mlir/Dialect/Func/IR/FuncOps.h" #include "mlir/Dialect/MemRef/IR/MemRef.h" #include "mlir/Dialect/Tensor/IR/Tensor.h" diff --git a/mlir/lib/Dialect/X86Vector/Transforms/AVXTranspose.cpp b/mlir/lib/Dialect/X86Vector/Transforms/AVXTranspose.cpp index 9ba3842..8705329 100644 --- a/mlir/lib/Dialect/X86Vector/Transforms/AVXTranspose.cpp +++ b/mlir/lib/Dialect/X86Vector/Transforms/AVXTranspose.cpp @@ -11,7 +11,7 @@ // //===----------------------------------------------------------------------===// -#include "mlir/Dialect/Arithmetic/IR/Arithmetic.h" +#include "mlir/Dialect/Arith/IR/Arith.h" #include "mlir/Dialect/LLVMIR/LLVMDialect.h" #include "mlir/Dialect/Vector/IR/VectorOps.h" #include "mlir/Dialect/X86Vector/Transforms.h" diff --git a/mlir/lib/Dialect/X86Vector/Transforms/CMakeLists.txt b/mlir/lib/Dialect/X86Vector/Transforms/CMakeLists.txt index 7824ecf..44f0880 100644 --- a/mlir/lib/Dialect/X86Vector/Transforms/CMakeLists.txt +++ b/mlir/lib/Dialect/X86Vector/Transforms/CMakeLists.txt @@ -6,7 +6,7 @@ add_mlir_dialect_library(MLIRX86VectorTransforms MLIRX86VectorConversionsIncGen LINK_LIBS PUBLIC - MLIRArithmeticDialect + MLIRArithDialect MLIRX86VectorDialect MLIRIR MLIRLLVMCommonConversion diff --git a/mlir/lib/Dialect/X86Vector/Transforms/LegalizeForLLVMExport.cpp b/mlir/lib/Dialect/X86Vector/Transforms/LegalizeForLLVMExport.cpp index 4df05b6..ea86819 100644 --- a/mlir/lib/Dialect/X86Vector/Transforms/LegalizeForLLVMExport.cpp +++ b/mlir/lib/Dialect/X86Vector/Transforms/LegalizeForLLVMExport.cpp @@ -10,7 +10,7 @@ #include "mlir/Conversion/LLVMCommon/ConversionTarget.h" #include "mlir/Conversion/LLVMCommon/Pattern.h" -#include "mlir/Dialect/Arithmetic/IR/Arithmetic.h" +#include "mlir/Dialect/Arith/IR/Arith.h" #include "mlir/Dialect/LLVMIR/LLVMDialect.h" #include "mlir/Dialect/X86Vector/X86VectorDialect.h" #include "mlir/IR/BuiltinOps.h" diff --git a/mlir/lib/Target/Cpp/CMakeLists.txt b/mlir/lib/Target/Cpp/CMakeLists.txt index babe403..5521e790 100644 --- a/mlir/lib/Target/Cpp/CMakeLists.txt +++ b/mlir/lib/Target/Cpp/CMakeLists.txt @@ -6,7 +6,7 @@ add_mlir_translation_library(MLIRTargetCpp ${EMITC_MAIN_INCLUDE_DIR}/emitc/Target/Cpp LINK_LIBS PUBLIC - MLIRArithmeticDialect + MLIRArithDialect MLIRControlFlowDialect MLIREmitCDialect MLIRFuncDialect diff --git a/mlir/lib/Target/Cpp/TranslateRegistration.cpp b/mlir/lib/Target/Cpp/TranslateRegistration.cpp index c4d26ea..501535c 100644 --- a/mlir/lib/Target/Cpp/TranslateRegistration.cpp +++ b/mlir/lib/Target/Cpp/TranslateRegistration.cpp @@ -6,7 +6,7 @@ // //===----------------------------------------------------------------------===// -#include "mlir/Dialect/Arithmetic/IR/Arithmetic.h" +#include "mlir/Dialect/Arith/IR/Arith.h" #include "mlir/Dialect/ControlFlow/IR/ControlFlow.h" #include "mlir/Dialect/EmitC/IR/EmitC.h" #include "mlir/Dialect/Func/IR/FuncOps.h" @@ -41,7 +41,7 @@ void registerToCppTranslation() { }, [](DialectRegistry ®istry) { // clang-format off - registry.insert(); + registry.insert(); } StringRef getArgument() const final { return "test-arith-emulate-wide-int"; } StringRef getDescription() const final { @@ -67,9 +67,11 @@ struct TestEmulateWideIntPass typeConverter.addTargetMaterialization(addBitcast); ConversionTarget target(*ctx); - target.addDynamicallyLegalDialect( - [&typeConverter](Operation *op) { return typeConverter.isLegal(op); }); + target + .addDynamicallyLegalDialect( + [&typeConverter](Operation *op) { + return typeConverter.isLegal(op); + }); RewritePatternSet patterns(ctx); arith::populateWideIntEmulationPatterns(typeConverter, patterns); @@ -89,7 +91,7 @@ struct TestEmulateWideIntPass } // namespace namespace mlir::test { -void registerTestArithmeticEmulateWideIntPass() { +void registerTestArithEmulateWideIntPass() { PassRegistration(); } } // namespace mlir::test diff --git a/mlir/test/lib/Dialect/CMakeLists.txt b/mlir/test/lib/Dialect/CMakeLists.txt index 002e484..0677e0c 100644 --- a/mlir/test/lib/Dialect/CMakeLists.txt +++ b/mlir/test/lib/Dialect/CMakeLists.txt @@ -1,5 +1,5 @@ add_subdirectory(Affine) -add_subdirectory(Arithmetic) +add_subdirectory(Arith) add_subdirectory(DLTI) add_subdirectory(Func) add_subdirectory(GPU) diff --git a/mlir/test/lib/Dialect/GPU/TestGpuRewrite.cpp b/mlir/test/lib/Dialect/GPU/TestGpuRewrite.cpp index 896488b..909b62d 100644 --- a/mlir/test/lib/Dialect/GPU/TestGpuRewrite.cpp +++ b/mlir/test/lib/Dialect/GPU/TestGpuRewrite.cpp @@ -10,7 +10,7 @@ // //===----------------------------------------------------------------------===// -#include "mlir/Dialect/Arithmetic/IR/Arithmetic.h" +#include "mlir/Dialect/Arith/IR/Arith.h" #include "mlir/Dialect/Func/IR/FuncOps.h" #include "mlir/Dialect/GPU/Transforms/Passes.h" #include "mlir/Dialect/MemRef/IR/MemRef.h" @@ -25,7 +25,7 @@ struct TestGpuRewritePass MLIR_DEFINE_EXPLICIT_INTERNAL_INLINE_TYPE_ID(TestGpuRewritePass) void getDependentDialects(DialectRegistry ®istry) const override { - registry.insert(); } StringRef getArgument() const final { return "test-gpu-rewrite"; } diff --git a/mlir/test/lib/Dialect/Linalg/CMakeLists.txt b/mlir/test/lib/Dialect/Linalg/CMakeLists.txt index 2086289..9a62e8a 100644 --- a/mlir/test/lib/Dialect/Linalg/CMakeLists.txt +++ b/mlir/test/lib/Dialect/Linalg/CMakeLists.txt @@ -11,8 +11,8 @@ add_mlir_library(MLIRLinalgTestPasses LINK_LIBS PUBLIC MLIRAffineDialect - MLIRArithmeticDialect - MLIRArithmeticTransforms + MLIRArithDialect + MLIRArithTransforms MLIRBufferizationDialect MLIRBufferizationTransforms MLIRGPUTransforms diff --git a/mlir/test/lib/Dialect/Linalg/TestLinalgTransforms.cpp b/mlir/test/lib/Dialect/Linalg/TestLinalgTransforms.cpp index 61a5c83..01ea7e1 100644 --- a/mlir/test/lib/Dialect/Linalg/TestLinalgTransforms.cpp +++ b/mlir/test/lib/Dialect/Linalg/TestLinalgTransforms.cpp @@ -11,7 +11,7 @@ //===----------------------------------------------------------------------===// #include "mlir/Dialect/Affine/IR/AffineOps.h" -#include "mlir/Dialect/Arithmetic/IR/Arithmetic.h" +#include "mlir/Dialect/Arith/IR/Arith.h" #include "mlir/Dialect/Bufferization/IR/Bufferization.h" #include "mlir/Dialect/Func/IR/FuncOps.h" #include "mlir/Dialect/GPU/IR/GPUDialect.h" diff --git a/mlir/test/lib/Dialect/Math/TestExpandMath.cpp b/mlir/test/lib/Dialect/Math/TestExpandMath.cpp index 8b17bf3..4b13aa3 100644 --- a/mlir/test/lib/Dialect/Math/TestExpandMath.cpp +++ b/mlir/test/lib/Dialect/Math/TestExpandMath.cpp @@ -10,7 +10,7 @@ // //===----------------------------------------------------------------------===// -#include "mlir/Dialect/Arithmetic/IR/Arithmetic.h" +#include "mlir/Dialect/Arith/IR/Arith.h" #include "mlir/Dialect/Math/Transforms/Passes.h" #include "mlir/Dialect/SCF/IR/SCF.h" #include "mlir/Pass/Pass.h" @@ -26,7 +26,7 @@ struct TestExpandMathPass void runOnOperation() override; StringRef getArgument() const final { return "test-expand-math"; } void getDependentDialects(DialectRegistry ®istry) const override { - registry.insert(); + registry.insert(); } StringRef getDescription() const final { return "Test expanding math"; } }; diff --git a/mlir/test/lib/Dialect/Math/TestPolynomialApproximation.cpp b/mlir/test/lib/Dialect/Math/TestPolynomialApproximation.cpp index 97d2d03..8a01ac5 100644 --- a/mlir/test/lib/Dialect/Math/TestPolynomialApproximation.cpp +++ b/mlir/test/lib/Dialect/Math/TestPolynomialApproximation.cpp @@ -11,7 +11,7 @@ // //===----------------------------------------------------------------------===// -#include "mlir/Dialect/Arithmetic/IR/Arithmetic.h" +#include "mlir/Dialect/Arith/IR/Arith.h" #include "mlir/Dialect/Math/IR/Math.h" #include "mlir/Dialect/Math/Transforms/Passes.h" #include "mlir/Dialect/Vector/IR/VectorOps.h" @@ -34,7 +34,7 @@ struct TestMathPolynomialApproximationPass void runOnOperation() override; void getDependentDialects(DialectRegistry ®istry) const override { - registry.insert(); if (enableAvx2) registry.insert(); diff --git a/mlir/test/lib/Dialect/SCF/TestLoopUnrolling.cpp b/mlir/test/lib/Dialect/SCF/TestLoopUnrolling.cpp index 411dfe6..8694a7f 100644 --- a/mlir/test/lib/Dialect/SCF/TestLoopUnrolling.cpp +++ b/mlir/test/lib/Dialect/SCF/TestLoopUnrolling.cpp @@ -10,7 +10,7 @@ // //===----------------------------------------------------------------------===// -#include "mlir/Dialect/Arithmetic/IR/Arithmetic.h" +#include "mlir/Dialect/Arith/IR/Arith.h" #include "mlir/Dialect/SCF/IR/SCF.h" #include "mlir/Dialect/SCF/Utils/Utils.h" #include "mlir/IR/Builders.h" @@ -49,7 +49,7 @@ struct TestLoopUnrollingPass } void getDependentDialects(DialectRegistry ®istry) const override { - registry.insert(); + registry.insert(); } void runOnOperation() override { diff --git a/mlir/test/lib/Dialect/SCF/TestSCFUtils.cpp b/mlir/test/lib/Dialect/SCF/TestSCFUtils.cpp index 9018f8e..4beccf9 100644 --- a/mlir/test/lib/Dialect/SCF/TestSCFUtils.cpp +++ b/mlir/test/lib/Dialect/SCF/TestSCFUtils.cpp @@ -10,7 +10,7 @@ // //===----------------------------------------------------------------------===// -#include "mlir/Dialect/Arithmetic/IR/Arithmetic.h" +#include "mlir/Dialect/Arith/IR/Arith.h" #include "mlir/Dialect/Func/IR/FuncOps.h" #include "mlir/Dialect/MemRef/IR/MemRef.h" #include "mlir/Dialect/SCF/IR/SCF.h" @@ -202,7 +202,7 @@ struct TestSCFPipeliningPass } void getDependentDialects(DialectRegistry ®istry) const override { - registry.insert(); + registry.insert(); } void runOnOperation() override { diff --git a/mlir/test/lib/Dialect/Tensor/CMakeLists.txt b/mlir/test/lib/Dialect/Tensor/CMakeLists.txt index 56e5982..f66a85f 100644 --- a/mlir/test/lib/Dialect/Tensor/CMakeLists.txt +++ b/mlir/test/lib/Dialect/Tensor/CMakeLists.txt @@ -5,7 +5,7 @@ add_mlir_library(MLIRTensorTestPasses EXCLUDE_FROM_LIBMLIR LINK_LIBS PUBLIC - MLIRArithmeticDialect + MLIRArithDialect MLIRLinalgDialect MLIRPass MLIRSCFDialect diff --git a/mlir/test/lib/Dialect/Tensor/TestTensorTransforms.cpp b/mlir/test/lib/Dialect/Tensor/TestTensorTransforms.cpp index e06607c..53ce2c8 100644 --- a/mlir/test/lib/Dialect/Tensor/TestTensorTransforms.cpp +++ b/mlir/test/lib/Dialect/Tensor/TestTensorTransforms.cpp @@ -10,7 +10,7 @@ // //===----------------------------------------------------------------------===// -#include "mlir/Dialect/Arithmetic/IR/Arithmetic.h" +#include "mlir/Dialect/Arith/IR/Arith.h" #include "mlir/Dialect/Linalg/IR/Linalg.h" #include "mlir/Dialect/SCF/IR/SCF.h" #include "mlir/Dialect/Tensor/IR/Tensor.h" @@ -30,8 +30,8 @@ struct TestTensorTransforms TestTensorTransforms(const TestTensorTransforms &pass) : PassWrapper(pass) {} void getDependentDialects(DialectRegistry ®istry) const override { - registry.insert(); + registry + .insert(); } StringRef getArgument() const final { diff --git a/mlir/test/lib/Dialect/Test/TestDialect.cpp b/mlir/test/lib/Dialect/Test/TestDialect.cpp index ad15ebf..bf78f80 100644 --- a/mlir/test/lib/Dialect/Test/TestDialect.cpp +++ b/mlir/test/lib/Dialect/Test/TestDialect.cpp @@ -10,7 +10,7 @@ #include "TestAttributes.h" #include "TestInterfaces.h" #include "TestTypes.h" -#include "mlir/Dialect/Arithmetic/IR/Arithmetic.h" +#include "mlir/Dialect/Arith/IR/Arith.h" #include "mlir/Dialect/DLTI/DLTI.h" #include "mlir/Dialect/Func/IR/FuncOps.h" #include "mlir/Dialect/Tensor/IR/Tensor.h" diff --git a/mlir/test/lib/Dialect/Test/TestPatterns.cpp b/mlir/test/lib/Dialect/Test/TestPatterns.cpp index d3fe515..17c8c1f 100644 --- a/mlir/test/lib/Dialect/Test/TestPatterns.cpp +++ b/mlir/test/lib/Dialect/Test/TestPatterns.cpp @@ -8,7 +8,7 @@ #include "TestDialect.h" #include "TestTypes.h" -#include "mlir/Dialect/Arithmetic/IR/Arithmetic.h" +#include "mlir/Dialect/Arith/IR/Arith.h" #include "mlir/Dialect/Func/IR/FuncOps.h" #include "mlir/Dialect/Func/Transforms/FuncConversions.h" #include "mlir/Dialect/Tensor/IR/Tensor.h" diff --git a/mlir/test/lib/IR/TestMatchers.cpp b/mlir/test/lib/IR/TestMatchers.cpp index 03aa4f8..99eab3a 100644 --- a/mlir/test/lib/IR/TestMatchers.cpp +++ b/mlir/test/lib/IR/TestMatchers.cpp @@ -6,7 +6,7 @@ // //===----------------------------------------------------------------------===// -#include "mlir/Dialect/Arithmetic/IR/Arithmetic.h" +#include "mlir/Dialect/Arith/IR/Arith.h" #include "mlir/IR/BuiltinOps.h" #include "mlir/IR/FunctionInterfaces.h" #include "mlir/IR/Matchers.h" diff --git a/mlir/test/lib/Interfaces/TilingInterface/CMakeLists.txt b/mlir/test/lib/Interfaces/TilingInterface/CMakeLists.txt index b562718..5f974b6 100644 --- a/mlir/test/lib/Interfaces/TilingInterface/CMakeLists.txt +++ b/mlir/test/lib/Interfaces/TilingInterface/CMakeLists.txt @@ -5,7 +5,7 @@ add_mlir_library(MLIRTilingInterfaceTestPasses LINK_LIBS PUBLIC MLIRAffineDialect - MLIRArithmeticDialect + MLIRArithDialect MLIRLinalgDialect MLIRLinalgTransforms MLIRMemRefDialect diff --git a/mlir/tools/mlir-opt/CMakeLists.txt b/mlir/tools/mlir-opt/CMakeLists.txt index 3b27cfd..451f44d 100644 --- a/mlir/tools/mlir-opt/CMakeLists.txt +++ b/mlir/tools/mlir-opt/CMakeLists.txt @@ -14,7 +14,7 @@ if(MLIR_INCLUDE_TESTS) set(test_libs MLIRTestFuncToLLVM MLIRAffineTransformsTestPasses - MLIRArithmeticTestPasses + MLIRArithTestPasses MLIRDLTITestPasses MLIRFuncTestPasses MLIRGPUTestPasses diff --git a/mlir/tools/mlir-opt/mlir-opt.cpp b/mlir/tools/mlir-opt/mlir-opt.cpp index 58e6598..373a048 100644 --- a/mlir/tools/mlir-opt/mlir-opt.cpp +++ b/mlir/tools/mlir-opt/mlir-opt.cpp @@ -64,7 +64,7 @@ void registerMemRefBoundCheck(); void registerPatternsTestPass(); void registerSimpleParametricTilingPass(); void registerTestAffineLoopParametricTilingPass(); -void registerTestArithmeticEmulateWideIntPass(); +void registerTestArithEmulateWideIntPass(); void registerTestAliasAnalysisPass(); void registerTestBuiltinAttributeInterfaces(); void registerTestCallGraphPass(); @@ -162,7 +162,7 @@ void registerTestPasses() { mlir::test::registerSimpleParametricTilingPass(); mlir::test::registerTestAffineLoopParametricTilingPass(); mlir::test::registerTestAliasAnalysisPass(); - mlir::test::registerTestArithmeticEmulateWideIntPass(); + mlir::test::registerTestArithEmulateWideIntPass(); mlir::test::registerTestBuiltinAttributeInterfaces(); mlir::test::registerTestCallGraphPass(); mlir::test::registerTestConstantFold(); diff --git a/mlir/tools/mlir-spirv-cpu-runner/CMakeLists.txt b/mlir/tools/mlir-spirv-cpu-runner/CMakeLists.txt index 7da9e2f..60951ad 100644 --- a/mlir/tools/mlir-spirv-cpu-runner/CMakeLists.txt +++ b/mlir/tools/mlir-spirv-cpu-runner/CMakeLists.txt @@ -16,7 +16,7 @@ if (MLIR_ENABLE_SPIRV_CPU_RUNNER) target_link_libraries(mlir-spirv-cpu-runner PRIVATE ${conversion_libs} MLIRAnalysis - MLIRArithmeticDialect + MLIRArithDialect MLIRExecutionEngine MLIRFuncDialect MLIRGPUOps diff --git a/mlir/tools/mlir-spirv-cpu-runner/mlir-spirv-cpu-runner.cpp b/mlir/tools/mlir-spirv-cpu-runner/mlir-spirv-cpu-runner.cpp index b553d1a..87305a7 100644 --- a/mlir/tools/mlir-spirv-cpu-runner/mlir-spirv-cpu-runner.cpp +++ b/mlir/tools/mlir-spirv-cpu-runner/mlir-spirv-cpu-runner.cpp @@ -15,7 +15,7 @@ #include "mlir/Conversion/FuncToLLVM/ConvertFuncToLLVMPass.h" #include "mlir/Conversion/GPUToSPIRV/GPUToSPIRVPass.h" #include "mlir/Conversion/SPIRVToLLVM/SPIRVToLLVMPass.h" -#include "mlir/Dialect/Arithmetic/IR/Arithmetic.h" +#include "mlir/Dialect/Arith/IR/Arith.h" #include "mlir/Dialect/Func/IR/FuncOps.h" #include "mlir/Dialect/GPU/IR/GPUDialect.h" #include "mlir/Dialect/GPU/Transforms/Passes.h" @@ -96,7 +96,7 @@ int main(int argc, char **argv) { jitRunnerConfig.llvmModuleBuilder = convertMLIRModule; mlir::DialectRegistry registry; - registry.insert(); mlir::registerLLVMDialectTranslation(registry); diff --git a/mlir/tools/mlir-vulkan-runner/CMakeLists.txt b/mlir/tools/mlir-vulkan-runner/CMakeLists.txt index bf1d8eb..cfb443a 100644 --- a/mlir/tools/mlir-vulkan-runner/CMakeLists.txt +++ b/mlir/tools/mlir-vulkan-runner/CMakeLists.txt @@ -56,7 +56,7 @@ if (MLIR_ENABLE_VULKAN_RUNNER) set(LIBS ${conversion_libs} MLIRAnalysis - MLIRArithmeticDialect + MLIRArithDialect MLIRExecutionEngine MLIRFuncDialect MLIRGPUOps diff --git a/mlir/tools/mlir-vulkan-runner/mlir-vulkan-runner.cpp b/mlir/tools/mlir-vulkan-runner/mlir-vulkan-runner.cpp index 69d77fc..d04cb57 100644 --- a/mlir/tools/mlir-vulkan-runner/mlir-vulkan-runner.cpp +++ b/mlir/tools/mlir-vulkan-runner/mlir-vulkan-runner.cpp @@ -19,7 +19,7 @@ #include "mlir/Conversion/LLVMCommon/LoweringOptions.h" #include "mlir/Conversion/MemRefToLLVM/MemRefToLLVM.h" #include "mlir/Conversion/ReconcileUnrealizedCasts/ReconcileUnrealizedCasts.h" -#include "mlir/Dialect/Arithmetic/IR/Arithmetic.h" +#include "mlir/Dialect/Arith/IR/Arith.h" #include "mlir/Dialect/Func/IR/FuncOps.h" #include "mlir/Dialect/GPU/IR/GPUDialect.h" #include "mlir/Dialect/GPU/Transforms/Passes.h" @@ -76,7 +76,7 @@ int main(int argc, char **argv) { jitRunnerConfig.mlirTransformer = runMLIRPasses; mlir::DialectRegistry registry; - registry.insert(); mlir::registerLLVMDialectTranslation(registry); diff --git a/mlir/unittests/Conversion/PDLToPDLInterp/CMakeLists.txt b/mlir/unittests/Conversion/PDLToPDLInterp/CMakeLists.txt index dc58ae9..02b3835 100644 --- a/mlir/unittests/Conversion/PDLToPDLInterp/CMakeLists.txt +++ b/mlir/unittests/Conversion/PDLToPDLInterp/CMakeLists.txt @@ -3,6 +3,6 @@ add_mlir_unittest(MLIRPDLToPDLInterpTests ) target_link_libraries(MLIRPDLToPDLInterpTests PRIVATE - MLIRArithmeticDialect + MLIRArithDialect MLIRPDLToPDLInterp ) diff --git a/mlir/unittests/Conversion/PDLToPDLInterp/RootOrderingTest.cpp b/mlir/unittests/Conversion/PDLToPDLInterp/RootOrderingTest.cpp index 5f209fb..f82ece0 100644 --- a/mlir/unittests/Conversion/PDLToPDLInterp/RootOrderingTest.cpp +++ b/mlir/unittests/Conversion/PDLToPDLInterp/RootOrderingTest.cpp @@ -7,7 +7,7 @@ //===----------------------------------------------------------------------===// #include "../lib/Conversion/PDLToPDLInterp/RootOrdering.h" -#include "mlir/Dialect/Arithmetic/IR/Arithmetic.h" +#include "mlir/Dialect/Arith/IR/Arith.h" #include "mlir/IR/Builders.h" #include "mlir/IR/MLIRContext.h" #include "gtest/gtest.h" @@ -30,7 +30,7 @@ namespace { class RootOrderingTest : public ::testing::Test { protected: RootOrderingTest() { - context.loadDialect(); + context.loadDialect(); createValues(); } diff --git a/mlir/unittests/ExecutionEngine/CMakeLists.txt b/mlir/unittests/ExecutionEngine/CMakeLists.txt index 32722d0..0209c43 100644 --- a/mlir/unittests/ExecutionEngine/CMakeLists.txt +++ b/mlir/unittests/ExecutionEngine/CMakeLists.txt @@ -6,7 +6,7 @@ get_property(dialect_libs GLOBAL PROPERTY MLIR_DIALECT_LIBS) target_link_libraries(MLIRExecutionEngineTests PRIVATE - MLIRArithmeticToLLVM + MLIRArithToLLVM MLIRExecutionEngine MLIRLinalgToLLVM MLIRMemRefToLLVM diff --git a/mlir/unittests/ExecutionEngine/Invoke.cpp b/mlir/unittests/ExecutionEngine/Invoke.cpp index fda0558..57a260bfc 100644 --- a/mlir/unittests/ExecutionEngine/Invoke.cpp +++ b/mlir/unittests/ExecutionEngine/Invoke.cpp @@ -6,7 +6,7 @@ // //===----------------------------------------------------------------------===// -#include "mlir/Conversion/ArithmeticToLLVM/ArithmeticToLLVM.h" +#include "mlir/Conversion/ArithToLLVM/ArithToLLVM.h" #include "mlir/Conversion/FuncToLLVM/ConvertFuncToLLVMPass.h" #include "mlir/Conversion/LinalgToLLVM/LinalgToLLVM.h" #include "mlir/Conversion/MemRefToLLVM/MemRefToLLVM.h" @@ -54,7 +54,7 @@ static struct LLVMInitializer { static LogicalResult lowerToLLVMDialect(ModuleOp module) { PassManager pm(module.getContext()); pm.addPass(mlir::createMemRefToLLVMConversionPass()); - pm.addNestedPass(mlir::createArithmeticToLLVMConversionPass()); + pm.addNestedPass(mlir::createArithToLLVMConversionPass()); pm.addPass(mlir::createConvertFuncToLLVMPass()); pm.addPass(mlir::createReconcileUnrealizedCastsPass()); return pm.run(module); diff --git a/mlir/unittests/Interfaces/InferTypeOpInterfaceTest.cpp b/mlir/unittests/Interfaces/InferTypeOpInterfaceTest.cpp index eb3a9eb..27b0978 100644 --- a/mlir/unittests/Interfaces/InferTypeOpInterfaceTest.cpp +++ b/mlir/unittests/Interfaces/InferTypeOpInterfaceTest.cpp @@ -7,7 +7,7 @@ //===----------------------------------------------------------------------===// #include "mlir/Interfaces/InferTypeOpInterface.h" -#include "mlir/Dialect/Arithmetic/IR/Arithmetic.h" +#include "mlir/Dialect/Arith/IR/Arith.h" #include "mlir/Dialect/Func/IR/FuncOps.h" #include "mlir/IR/Builders.h" #include "mlir/IR/BuiltinOps.h" @@ -33,7 +33,7 @@ protected: } )MLIR"; - registry.insert(); + registry.insert(); ctx.appendDialectRegistry(registry); module = parseSourceString(ir, &ctx); mapFn = cast(module->front()); diff --git a/utils/bazel/llvm-project-overlay/mlir/BUILD.bazel b/utils/bazel/llvm-project-overlay/mlir/BUILD.bazel index 22b6958..82628d5 100644 --- a/utils/bazel/llvm-project-overlay/mlir/BUILD.bazel +++ b/utils/bazel/llvm-project-overlay/mlir/BUILD.bazel @@ -1047,7 +1047,7 @@ td_library( ], includes = ["include"], deps = [ - ":ArithmeticOpsTdFiles", + ":ArithOpsTdFiles", ":FuncTdFiles", ":LoopLikeInterfaceTdFiles", ":OpBaseTdFiles", @@ -1271,7 +1271,7 @@ cc_library( ]), hdrs = glob(["include/mlir/Target/Cpp/*.h"]), deps = [ - ":ArithmeticDialect", + ":ArithDialect", ":ControlFlowDialect", ":EmitCDialect", ":FuncDialect", @@ -1485,7 +1485,7 @@ td_library( ], includes = ["include"], deps = [ - ":ArithmeticOpsTdFiles", + ":ArithOpsTdFiles", ":FuncTdFiles", ":LLVMOpsTdFiles", ":OpBaseTdFiles", @@ -1747,7 +1747,7 @@ cc_library( hdrs = ["include/mlir/Dialect/X86Vector/Transforms.h"], includes = ["include"], deps = [ - ":ArithmeticDialect", + ":ArithDialect", ":FuncDialect", ":IR", ":LLVMCommonConversion", @@ -1846,8 +1846,8 @@ cc_library( deps = [ ":AffineAnalysis", ":AffineDialect", - ":ArithmeticDialect", - ":ArithmeticUtils", + ":ArithDialect", + ":ArithUtils", ":BufferizationDialect", ":BufferizationTransforms", ":DialectUtils", @@ -2030,7 +2030,7 @@ cc_library( hdrs = ["include/mlir/Dialect/SparseTensor/IR/SparseTensor.h"], includes = ["include"], deps = [ - ":ArithmeticDialect", + ":ArithDialect", ":IR", ":InferTypeOpInterface", ":SparseTensorAttrDefsIncGen", @@ -2045,7 +2045,7 @@ cc_library( hdrs = glob(["include/mlir/Dialect/SparseTensor/Utils/*.h"]), includes = ["include"], deps = [ - ":ArithmeticDialect", + ":ArithDialect", ":ComplexDialect", ":IR", ":LinalgDialect", @@ -2069,7 +2069,7 @@ cc_library( includes = ["include"], deps = [ ":AffineDialect", - ":ArithmeticDialect", + ":ArithDialect", ":BufferizationDialect", ":BufferizationTransforms", ":ComplexDialect", @@ -2102,7 +2102,7 @@ cc_library( hdrs = ["include/mlir/Dialect/SparseTensor/Pipelines/Passes.h"], includes = ["include"], deps = [ - ":ArithmeticTransforms", + ":ArithTransforms", ":BufferizationTransforms", ":ConversionPasses", ":FuncDialect", @@ -2221,7 +2221,7 @@ cc_library( includes = ["include"], deps = [ ":AffineDialect", - ":ArithmeticDialect", + ":ArithDialect", ":FuncDialect", ":GPUDialect", ":IR", @@ -2345,7 +2345,7 @@ cc_library( ]), includes = ["include"], deps = [ - ":ArithmeticUtils", + ":ArithUtils", ":DialectUtilsIncGen", ":IR", ":Support", @@ -2366,7 +2366,7 @@ cc_library( deps = [ ":AffineMemoryOpInterfacesIncGen", ":AffineOpsIncGen", - ":ArithmeticDialect", + ":ArithDialect", ":ControlFlowInterfaces", ":DialectUtils", ":IR", @@ -2428,7 +2428,7 @@ cc_library( includes = ["include"], deps = [ ":Analysis", - ":ArithmeticDialect", + ":ArithDialect", ":AsyncDialect", ":AsyncPassIncGen", ":ControlFlowDialect", @@ -2457,7 +2457,7 @@ cc_library( deps = [ ":AffineDialect", ":Analysis", - ":ArithmeticDialect", + ":ArithDialect", ":FuncDialect", ":IR", ":Support", @@ -2485,7 +2485,7 @@ cc_library( ":AffineAnalysis", ":AffineDialect", ":Analysis", - ":ArithmeticUtils", + ":ArithUtils", ":FuncDialect", ":IR", ":MemRefDialect", @@ -2528,8 +2528,8 @@ cc_library( ":AffinePassIncGen", ":AffineUtils", ":Analysis", - ":ArithmeticDialect", - ":ArithmeticUtils", + ":ArithDialect", + ":ArithUtils", ":FuncDialect", ":IR", ":MemRefDialect", @@ -2582,8 +2582,8 @@ cc_library( deps = [ ":AMDGPUToROCDL", ":AffineToStandard", - ":ArithmeticToLLVM", - ":ArithmeticToSPIRV", + ":ArithToLLVM", + ":ArithToSPIRV", ":ArmNeon2dToIntr", ":AsyncToLLVM", ":BufferizationToMemRef", @@ -2643,7 +2643,7 @@ cc_library( hdrs = glob(["include/mlir/Conversion/AsyncToLLVM/*.h"]), includes = ["include"], deps = [ - ":ArithmeticDialect", + ":ArithDialect", ":AsyncDialect", ":ConversionPassIncGen", ":FuncDialect", @@ -2670,7 +2670,7 @@ cc_library( deps = [ ":AffineDialect", ":AffineUtils", - ":ArithmeticDialect", + ":ArithDialect", ":ConversionPassIncGen", ":FuncDialect", ":IR", @@ -2718,8 +2718,8 @@ cc_library( ), includes = ["include"], deps = [ - ":ArithmeticDialect", - ":ArithmeticUtils", + ":ArithDialect", + ":ArithUtils", ":BufferizationDialect", ":ControlFlowDialect", ":ControlFlowInterfaces", @@ -2755,7 +2755,7 @@ cc_library( ":AffineAnalysis", ":AffineDialect", ":Analysis", - ":ArithmeticDialect", + ":ArithDialect", ":DialectUtils", ":FuncDialect", ":IR", @@ -2911,7 +2911,7 @@ cc_library( hdrs = ["include/mlir/Dialect/Shape/IR/Shape.h"], includes = ["include"], deps = [ - ":ArithmeticDialect", + ":ArithDialect", ":ControlFlowInterfaces", ":Dialect", ":FuncDialect", @@ -2948,7 +2948,7 @@ cc_library( hdrs = ["include/mlir/Conversion/ShapeToStandard/ShapeToStandard.h"], includes = ["include"], deps = [ - ":ArithmeticDialect", + ":ArithDialect", ":ControlFlowDialect", ":ConversionPassIncGen", ":FuncDialect", @@ -2992,7 +2992,7 @@ cc_library( ], includes = ["include"], deps = [ - ":ArithmeticDialect", + ":ArithDialect", ":BufferizationDialect", ":BufferizationTransforms", ":FuncDialect", @@ -3072,7 +3072,7 @@ cc_library( ]), includes = ["include"], deps = [ - ":ArithmeticDialect", + ":ArithDialect", ":CommonFolders", ":ControlFlowInterfaces", ":ControlFlowOpsIncGen", @@ -3098,7 +3098,7 @@ cc_library( ]) + ["include/mlir/Transforms/InliningUtils.h"], includes = ["include"], deps = [ - ":ArithmeticDialect", + ":ArithDialect", ":CallOpInterfaces", ":CastOpInterfaces", ":CommonFolders", @@ -3165,8 +3165,8 @@ cc_library( ]), includes = ["include"], deps = [ - ":ArithmeticDialect", - ":ArithmeticUtils", + ":ArithDialect", + ":ArithUtils", ":ControlFlowInterfaces", ":DialectUtils", ":IR", @@ -3213,8 +3213,8 @@ cc_library( includes = ["include"], deps = [ ":AffineDialect", - ":ArithmeticDialect", - ":ArithmeticUtils", + ":ArithDialect", + ":ArithUtils", ":BufferizationDialect", ":BufferizationTransforms", ":DialectUtils", @@ -3249,7 +3249,7 @@ cc_library( deps = [ ":AffineAnalysis", ":AffineDialect", - ":ArithmeticDialect", + ":ArithDialect", ":FuncDialect", ":IR", ":MemRefDialect", @@ -3650,7 +3650,7 @@ cc_library( hdrs = glob(["include/mlir/Dialect/GPU/IR/*.h"]), includes = ["include"], deps = [ - ":ArithmeticDialect", + ":ArithDialect", ":DLTIDialect", ":GPUBaseIncGen", ":GPUOpsIncGen", @@ -3707,7 +3707,7 @@ cc_library( defines = if_cuda_available(["MLIR_GPU_TO_CUBIN_PASS_ENABLE"]), includes = ["include"], deps = [ - ":ArithmeticDialect", + ":ArithDialect", ":AsmParser", ":AsyncDialect", ":ControlFlowDialect", @@ -3806,8 +3806,8 @@ cc_library( ]), includes = ["include"], deps = [ - ":ArithmeticDialect", - ":ArithmeticToLLVM", + ":ArithDialect", + ":ArithToLLVM", ":ControlFlowDialect", ":ControlFlowToLLVM", ":ConversionPassIncGen", @@ -3927,7 +3927,7 @@ cc_library( includes = ["include"], deps = [ ":AMDGPUToROCDL", - ":ArithmeticToLLVM", + ":ArithToLLVM", ":ControlFlowToLLVM", ":ConversionPassIncGen", ":FuncDialect", @@ -3980,7 +3980,7 @@ cc_library( hdrs = ["include/mlir/Conversion/GPUCommon/GPUCommonPass.h"], includes = ["include"], deps = [ - ":ArithmeticToLLVM", + ":ArithToLLVM", ":AsyncDialect", ":AsyncToLLVM", ":ControlFlowToLLVM", @@ -4014,7 +4014,7 @@ cc_library( "lib/Conversions/GPUToSPIRV", ], deps = [ - ":ArithmeticToSPIRV", + ":ArithToSPIRV", ":ConversionPassIncGen", ":FuncToSPIRV", ":GPUDialect", @@ -4062,7 +4062,7 @@ cc_library( ]), includes = ["include"], deps = [ - ":ArithmeticToLLVM", + ":ArithToLLVM", ":ConversionPassIncGen", ":FuncDialect", ":FuncToLLVM", @@ -4812,7 +4812,7 @@ cc_library( "lib/Conversion/TensorToLinalg", ], deps = [ - ":ArithmeticDialect", + ":ArithDialect", ":ConversionPassIncGen", ":FuncDialect", ":IR", @@ -4841,7 +4841,7 @@ cc_library( "lib/Conversion/TensorToSPIRV", ], deps = [ - ":ArithmeticToSPIRV", + ":ArithToSPIRV", ":ControlFlowToSPIRV", ":ConversionPassIncGen", ":FuncDialect", @@ -5011,8 +5011,8 @@ cc_library( hdrs = ["include/mlir/Dialect/Tensor/IR/Tensor.h"], includes = ["include"], deps = [ - ":ArithmeticDialect", - ":ArithmeticUtils", + ":ArithDialect", + ":ArithUtils", ":CastOpInterfaces", ":ComplexDialect", ":ControlFlowInterfaces", @@ -5050,7 +5050,7 @@ cc_library( includes = ["include"], deps = [ ":AffineDialect", - ":ArithmeticUtils", + ":ArithUtils", ":IR", ":LinalgDialect", ":SCFDialect", @@ -5067,7 +5067,7 @@ cc_library( includes = ["include"], deps = [ ":AffineDialect", - ":ArithmeticDialect", + ":ArithDialect", ":TensorDialect", "//llvm:Support", ], @@ -5108,8 +5108,8 @@ cc_library( deps = [ ":AffineDialect", ":AffineUtils", - ":ArithmeticDialect", - ":ArithmeticUtils", + ":ArithDialect", + ":ArithUtils", ":BufferizationDialect", ":BufferizationTransforms", ":DialectUtils", @@ -5436,7 +5436,7 @@ cc_library( deps = [ ":AffineDialect", ":AffineToStandard", - ":ArithmeticDialect", + ":ArithDialect", ":ComplexDialect", ":ConversionPassIncGen", ":FuncDialect", @@ -5465,7 +5465,7 @@ cc_library( includes = ["include"], deps = [ ":AffineDialect", - ":ArithmeticToSPIRV", + ":ArithToSPIRV", ":ConversionPassIncGen", ":FuncDialect", ":FuncToSPIRV", @@ -5492,7 +5492,7 @@ cc_library( deps = [ ":AffineAnalysis", ":Analysis", - ":ArithmeticDialect", + ":ArithDialect", ":ConversionPassIncGen", ":FuncDialect", ":IR", @@ -5514,7 +5514,7 @@ cc_library( hdrs = ["include/mlir/Conversion/SCFToControlFlow/SCFToControlFlow.h"], includes = ["include"], deps = [ - ":ArithmeticDialect", + ":ArithDialect", ":ControlFlowDialect", ":ConversionPassIncGen", ":FuncDialect", @@ -5569,7 +5569,7 @@ cc_library( includes = ["include"], deps = [ ":Analysis", - ":ArithmeticToLLVM", + ":ArithToLLVM", ":ControlFlowToLLVM", ":ConversionPassIncGen", ":DataLayoutInterfaces", @@ -5602,7 +5602,7 @@ cc_library( includes = ["include"], deps = [ ":Analysis", - ":ArithmeticToLLVM", + ":ArithToLLVM", ":ControlFlowDialect", ":ConversionPassIncGen", ":DataLayoutInterfaces", @@ -5649,7 +5649,7 @@ cc_library( includes = ["include"], deps = [ ":Analysis", - ":ArithmeticDialect", + ":ArithDialect", ":ConversionPassIncGen", ":DataLayoutInterfaces", ":FuncDialect", @@ -5692,13 +5692,13 @@ cc_library( ) cc_library( - name = "ArithmeticToLLVM", - srcs = glob(["lib/Conversion/ArithmeticToLLVM/*.cpp"]), - hdrs = glob(["include/mlir/Conversion/ArithmeticToLLVM/*.h"]), + name = "ArithToLLVM", + srcs = glob(["lib/Conversion/ArithToLLVM/*.cpp"]), + hdrs = glob(["include/mlir/Conversion/ArithToLLVM/*.h"]), includes = ["include"], deps = [ ":Analysis", - ":ArithmeticDialect", + ":ArithDialect", ":ConversionPassIncGen", ":IR", ":LLVMCommonConversion", @@ -5710,12 +5710,12 @@ cc_library( ) cc_library( - name = "ArithmeticToSPIRV", - srcs = glob(["lib/Conversion/ArithmeticToSPIRV/*.cpp"]), - hdrs = glob(["include/mlir/Conversion/ArithmeticToSPIRV/*.h"]), + name = "ArithToSPIRV", + srcs = glob(["lib/Conversion/ArithToSPIRV/*.cpp"]), + hdrs = glob(["include/mlir/Conversion/ArithToSPIRV/*.h"]), includes = ["include"], deps = [ - ":ArithmeticDialect", + ":ArithDialect", ":ConversionPassIncGen", ":FuncToSPIRV", ":IR", @@ -5754,7 +5754,7 @@ cc_library( hdrs = glob(["include/mlir/Conversion/MathToFuncs/*.h"]), includes = ["include"], deps = [ - ":ArithmeticDialect", + ":ArithDialect", ":ControlFlowDialect", ":ConversionPassIncGen", ":DialectUtils", @@ -5957,7 +5957,7 @@ cc_library( ), includes = ["include"], deps = [ - ":ArithmeticDialect", + ":ArithDialect", ":CallOpInterfaces", ":ControlFlowInterfaces", ":DataLayoutInterfaces", @@ -6325,10 +6325,10 @@ cc_library( ":AffinePassIncGen", ":AffineToStandard", ":AffineTransforms", - ":ArithmeticDialect", - ":ArithmeticToLLVM", - ":ArithmeticToSPIRV", - ":ArithmeticTransforms", + ":ArithDialect", + ":ArithToLLVM", + ":ArithToSPIRV", + ":ArithTransforms", ":ArmNeonDialect", ":ArmSVEDialect", ":ArmSVETransforms", @@ -6466,7 +6466,7 @@ cc_binary( "//llvm:Support", "//mlir/test:TestAffine", "//mlir/test:TestAnalysis", - "//mlir/test:TestArithmetic", + "//mlir/test:TestArith", "//mlir/test:TestDLTI", "//mlir/test:TestDialect", "//mlir/test:TestFunc", @@ -6707,7 +6707,7 @@ cc_binary( name = "mlir-vulkan-runner", srcs = ["tools/mlir-vulkan-runner/mlir-vulkan-runner.cpp"], deps = [ - ":ArithmeticDialect", + ":ArithDialect", ":ExecutionEngineUtils", ":FuncDialect", ":FuncToLLVM", @@ -6737,7 +6737,7 @@ cc_binary( name = "mlir-spirv-cpu-runner", srcs = ["tools/mlir-spirv-cpu-runner/mlir-spirv-cpu-runner.cpp"], deps = [ - ":ArithmeticDialect", + ":ArithDialect", ":ExecutionEngineUtils", ":FuncDialect", ":FuncToLLVM", @@ -7091,7 +7091,7 @@ cc_library( ]), includes = ["include"], deps = [ - ":ArithmeticDialect", + ":ArithDialect", ":ConversionPassIncGen", ":FuncDialect", ":IR", @@ -7137,7 +7137,7 @@ cc_library( ]), includes = ["include"], deps = [ - ":ArithmeticToLLVM", + ":ArithToLLVM", ":ControlFlowToLLVM", ":ConversionPassIncGen", ":FuncDialect", @@ -7216,7 +7216,7 @@ cc_library( ], includes = ["include"], deps = [ - ":ArithmeticDialect", + ":ArithDialect", ":FuncDialect", ":IR", ":InferTypeOpInterface", @@ -7562,8 +7562,8 @@ cc_library( includes = ["include"], deps = [ ":AffineDialect", - ":ArithmeticDialect", - ":ArithmeticUtils", + ":ArithDialect", + ":ArithUtils", ":AsmParser", ":BufferizationDialect", ":ComplexDialect", @@ -7603,7 +7603,7 @@ cc_library( includes = ["include"], deps = [ ":AffineDialect", - ":ArithmeticDialect", + ":ArithDialect", ":AsmParser", ":ControlFlowDialect", ":GPUDialect", @@ -7685,8 +7685,8 @@ cc_library( ":AffineDialect", ":AffineUtils", ":Analysis", - ":ArithmeticDialect", - ":ArithmeticUtils", + ":ArithDialect", + ":ArithUtils", ":DialectUtils", ":FuncDialect", ":IR", @@ -7718,9 +7718,9 @@ cc_library( ":AffineDialect", ":AffineUtils", ":Analysis", - ":ArithmeticDialect", - ":ArithmeticTransforms", - ":ArithmeticUtils", + ":ArithDialect", + ":ArithTransforms", + ":ArithUtils", ":BufferizationDialect", ":BufferizationTransforms", ":ComplexDialect", @@ -7852,8 +7852,8 @@ cc_library( deps = [ ":AMXDialect", ":AMXTransforms", - ":ArithmeticDialect", - ":ArithmeticUtils", + ":ArithDialect", + ":ArithUtils", ":ArmNeonDialect", ":ArmSVEDialect", ":ArmSVETransforms", @@ -7890,7 +7890,7 @@ cc_library( deps = [ ":AffineDialect", ":Analysis", - ":ArithmeticDialect", + ":ArithDialect", ":ConversionPassIncGen", ":DialectUtils", ":FuncDialect", @@ -7925,7 +7925,7 @@ cc_library( deps = [ ":AffineDialect", ":AffineUtils", - ":ArithmeticDialect", + ":ArithDialect", ":ConversionPassIncGen", ":FuncDialect", ":FuncToLLVM", @@ -8043,7 +8043,7 @@ cc_library( includes = ["include"], deps = [ ":Analysis", - ":ArithmeticDialect", + ":ArithDialect", ":Dialect", ":DialectUtils", ":FuncDialect", @@ -8075,7 +8075,7 @@ cc_library( "lib/Conversion/TosaToArith", ], deps = [ - ":ArithmeticDialect", + ":ArithDialect", ":ConversionPassIncGen", ":FuncDialect", ":IR", @@ -8099,7 +8099,7 @@ cc_library( "lib/Conversion/TosaToLinalg", ], deps = [ - ":ArithmeticDialect", + ":ArithDialect", ":ConversionPassIncGen", ":DialectUtils", ":FuncDialect", @@ -8154,7 +8154,7 @@ cc_library( "lib/Conversion/TosaToTensor", ], deps = [ - ":ArithmeticDialect", + ":ArithDialect", ":ConversionPassIncGen", ":FuncDialect", ":IR", @@ -8407,7 +8407,7 @@ cc_library( hdrs = ["include/mlir/Dialect/Complex/IR/Complex.h"], includes = ["include"], deps = [ - ":ArithmeticDialect", + ":ArithDialect", ":ComplexAttributesIncGen", ":ComplexBaseIncGen", ":ComplexOpsIncGen", @@ -8429,7 +8429,7 @@ cc_library( ]), includes = ["include"], deps = [ - ":ArithmeticDialect", + ":ArithDialect", ":ComplexDialect", ":ConversionPassIncGen", ":FuncDialect", @@ -8479,7 +8479,7 @@ cc_library( ]), includes = ["include"], deps = [ - ":ArithmeticDialect", + ":ArithDialect", ":ComplexDialect", ":ConversionPassIncGen", ":FuncDialect", @@ -8498,10 +8498,10 @@ exports_files([ ]) td_library( - name = "ArithmeticOpsTdFiles", + name = "ArithOpsTdFiles", srcs = [ - "include/mlir/Dialect/Arithmetic/IR/ArithmeticBase.td", - "include/mlir/Dialect/Arithmetic/IR/ArithmeticOps.td", + "include/mlir/Dialect/Arith/IR/ArithBase.td", + "include/mlir/Dialect/Arith/IR/ArithOps.td", ], includes = ["include"], deps = [ @@ -8516,7 +8516,7 @@ td_library( ) gentbl_cc_library( - name = "ArithmeticBaseIncGen", + name = "ArithBaseIncGen", strip_include_prefix = "include", tbl_outs = [ ( @@ -8524,84 +8524,84 @@ gentbl_cc_library( "-gen-dialect-decls", "-dialect=arith", ], - "include/mlir/Dialect/Arithmetic/IR/ArithmeticOpsDialect.h.inc", + "include/mlir/Dialect/Arith/IR/ArithOpsDialect.h.inc", ), ( [ "-gen-dialect-defs", "-dialect=arith", ], - "include/mlir/Dialect/Arithmetic/IR/ArithmeticOpsDialect.cpp.inc", + "include/mlir/Dialect/Arith/IR/ArithOpsDialect.cpp.inc", ), ( ["-gen-enum-decls"], - "include/mlir/Dialect/Arithmetic/IR/ArithmeticOpsEnums.h.inc", + "include/mlir/Dialect/Arith/IR/ArithOpsEnums.h.inc", ), ( ["-gen-enum-defs"], - "include/mlir/Dialect/Arithmetic/IR/ArithmeticOpsEnums.cpp.inc", + "include/mlir/Dialect/Arith/IR/ArithOpsEnums.cpp.inc", ), ], tblgen = ":mlir-tblgen", - td_file = "include/mlir/Dialect/Arithmetic/IR/ArithmeticBase.td", - deps = [":ArithmeticOpsTdFiles"], + td_file = "include/mlir/Dialect/Arith/IR/ArithBase.td", + deps = [":ArithOpsTdFiles"], ) gentbl_cc_library( - name = "ArithmeticOpsIncGen", + name = "ArithOpsIncGen", strip_include_prefix = "include", tbl_outs = [ ( ["-gen-op-decls"], - "include/mlir/Dialect/Arithmetic/IR/ArithmeticOps.h.inc", + "include/mlir/Dialect/Arith/IR/ArithOps.h.inc", ), ( ["-gen-op-defs"], - "include/mlir/Dialect/Arithmetic/IR/ArithmeticOps.cpp.inc", + "include/mlir/Dialect/Arith/IR/ArithOps.cpp.inc", ), ], tblgen = ":mlir-tblgen", - td_file = "include/mlir/Dialect/Arithmetic/IR/ArithmeticOps.td", + td_file = "include/mlir/Dialect/Arith/IR/ArithOps.td", deps = [ - ":ArithmeticOpsTdFiles", + ":ArithOpsTdFiles", ], ) gentbl_cc_library( - name = "ArithmeticCanonicalizationIncGen", - strip_include_prefix = "include/mlir/Dialect/Arithmetic/IR", + name = "ArithCanonicalizationIncGen", + strip_include_prefix = "include/mlir/Dialect/Arith/IR", tbl_outs = [ ( ["-gen-rewriters"], - "include/mlir/Dialect/Arithmetic/IR/ArithmeticCanonicalization.inc", + "include/mlir/Dialect/Arith/IR/ArithCanonicalization.inc", ), ], tblgen = ":mlir-tblgen", - td_file = "lib/Dialect/Arithmetic/IR/ArithmeticCanonicalization.td", + td_file = "lib/Dialect/Arith/IR/ArithCanonicalization.td", deps = [ - ":ArithmeticOpsTdFiles", + ":ArithOpsTdFiles", ":CastInterfacesTdFiles", ":FuncTdFiles", ], ) cc_library( - name = "ArithmeticDialect", + name = "ArithDialect", srcs = glob( [ - "lib/Dialect/Arithmetic/IR/*.cpp", - "lib/Dialect/Arithmetic/IR/*.h", + "lib/Dialect/Arith/IR/*.cpp", + "lib/Dialect/Arith/IR/*.h", ], ), hdrs = [ - "include/mlir/Dialect/Arithmetic/IR/Arithmetic.h", + "include/mlir/Dialect/Arith/IR/Arith.h", "include/mlir/Transforms/InliningUtils.h", ], includes = ["include"], deps = [ - ":ArithmeticBaseIncGen", - ":ArithmeticCanonicalizationIncGen", - ":ArithmeticOpsIncGen", + ":ArithBaseIncGen", + ":ArithCanonicalizationIncGen", + ":ArithOpsIncGen", ":CommonFolders", ":IR", ":InferIntRangeInterface", @@ -8613,37 +8613,37 @@ cc_library( ) gentbl_cc_library( - name = "ArithmeticPassIncGen", + name = "ArithPassIncGen", strip_include_prefix = "include", tbl_outs = [ ( [ "-gen-pass-decls", - "-name=Arithmetic", + "-name=Arith", ], - "include/mlir/Dialect/Arithmetic/Transforms/Passes.h.inc", + "include/mlir/Dialect/Arith/Transforms/Passes.h.inc", ), ], tblgen = ":mlir-tblgen", - td_file = "include/mlir/Dialect/Arithmetic/Transforms/Passes.td", + td_file = "include/mlir/Dialect/Arith/Transforms/Passes.td", deps = [":PassBaseTdFiles"], ) cc_library( - name = "ArithmeticTransforms", + name = "ArithTransforms", srcs = glob([ - "lib/Dialect/Arithmetic/Transforms/*.cpp", - "lib/Dialect/Arithmetic/Transforms/*.h", + "lib/Dialect/Arith/Transforms/*.cpp", + "lib/Dialect/Arith/Transforms/*.h", ]), hdrs = glob([ - "include/mlir/Dialect/Arithmetic/Transforms/*.h", + "include/mlir/Dialect/Arith/Transforms/*.h", ]), includes = ["include"], deps = [ ":Analysis", - ":ArithmeticDialect", - ":ArithmeticPassIncGen", - ":ArithmeticUtils", + ":ArithDialect", + ":ArithPassIncGen", + ":ArithUtils", ":BufferizationDialect", ":BufferizationTransforms", ":FuncDialect", @@ -8660,14 +8660,14 @@ cc_library( ) cc_library( - name = "ArithmeticUtils", + name = "ArithUtils", srcs = glob([ - "lib/Dialect/Arithmetic/Utils/*.cpp", + "lib/Dialect/Arith/Utils/*.cpp", ]), - hdrs = ["include/mlir/Dialect/Arithmetic/Utils/Utils.h"], + hdrs = ["include/mlir/Dialect/Arith/Utils/Utils.h"], includes = ["include"], deps = [ - ":ArithmeticDialect", + ":ArithDialect", ":IR", "//llvm:Support", ], @@ -8743,7 +8743,7 @@ cc_library( ], includes = ["include"], deps = [ - ":ArithmeticDialect", + ":ArithDialect", ":CommonFolders", ":IR", ":InferTypeOpInterface", @@ -8764,7 +8764,7 @@ cc_library( hdrs = glob(["include/mlir/Dialect/Math/Transforms/*.h"]), includes = ["include"], deps = [ - ":ArithmeticDialect", + ":ArithDialect", ":DialectUtils", ":FuncDialect", ":IR", @@ -8789,7 +8789,7 @@ cc_library( ]), includes = ["include"], deps = [ - ":ArithmeticDialect", + ":ArithDialect", ":ConversionPassIncGen", ":DialectUtils", ":FuncDialect", @@ -8814,7 +8814,7 @@ td_library( ], includes = ["include"], deps = [ - ":ArithmeticOpsTdFiles", + ":ArithOpsTdFiles", ":CastInterfacesTdFiles", ":ControlFlowInterfacesTdFiles", ":CopyOpInterfaceTdFiles", @@ -8881,8 +8881,8 @@ cc_library( ], includes = ["include"], deps = [ - ":ArithmeticDialect", - ":ArithmeticUtils", + ":ArithDialect", + ":ArithUtils", ":ControlFlowInterfaces", ":CopyOpInterface", ":DialectUtils", @@ -8925,9 +8925,9 @@ cc_library( deps = [ ":AffineDialect", ":AffineUtils", - ":ArithmeticDialect", - ":ArithmeticTransforms", - ":ArithmeticUtils", + ":ArithDialect", + ":ArithTransforms", + ":ArithUtils", ":DialectUtils", ":FuncDialect", ":IR", @@ -8982,7 +8982,7 @@ cc_library( includes = ["include"], deps = [ ":AffineDialect", - ":ArithmeticDialect", + ":ArithDialect", ":IR", ":MemRefDialect", ":MemRefTransformOpsIncGen", @@ -9272,7 +9272,7 @@ cc_library( deps = [ ":AffineDialect", ":AllocationOpInterface", - ":ArithmeticDialect", + ":ArithDialect", ":BufferizableOpInterfaceIncGen", ":BufferizationBaseIncGen", ":BufferizationOpsIncGen", @@ -9319,7 +9319,7 @@ cc_library( deps = [ ":AllocationOpInterface", ":Analysis", - ":ArithmeticDialect", + ":ArithDialect", ":BufferizationDialect", ":BufferizationPassIncGen", ":ControlFlowInterfaces", @@ -9345,7 +9345,7 @@ cc_library( ], includes = ["include"], deps = [ - ":ArithmeticDialect", + ":ArithDialect", ":BufferizationDialect", ":ConversionPassIncGen", ":FuncDialect", diff --git a/utils/bazel/llvm-project-overlay/mlir/examples/toy/Ch5/BUILD.bazel b/utils/bazel/llvm-project-overlay/mlir/examples/toy/Ch5/BUILD.bazel index c86d62d..12b4a31 100644 --- a/utils/bazel/llvm-project-overlay/mlir/examples/toy/Ch5/BUILD.bazel +++ b/utils/bazel/llvm-project-overlay/mlir/examples/toy/Ch5/BUILD.bazel @@ -100,7 +100,7 @@ cc_binary( "//mlir:AffineTransforms", "//mlir:AllPassesAndDialects", "//mlir:Analysis", - "//mlir:ArithmeticDialect", + "//mlir:ArithDialect", "//mlir:CastOpInterfaces", "//mlir:FuncDialect", "//mlir:IR", diff --git a/utils/bazel/llvm-project-overlay/mlir/examples/toy/Ch6/BUILD.bazel b/utils/bazel/llvm-project-overlay/mlir/examples/toy/Ch6/BUILD.bazel index a930bd1..7e8d738 100644 --- a/utils/bazel/llvm-project-overlay/mlir/examples/toy/Ch6/BUILD.bazel +++ b/utils/bazel/llvm-project-overlay/mlir/examples/toy/Ch6/BUILD.bazel @@ -103,8 +103,8 @@ cc_binary( "//mlir:AffineTransforms", "//mlir:AllPassesAndDialects", "//mlir:Analysis", - "//mlir:ArithmeticDialect", - "//mlir:ArithmeticToLLVM", + "//mlir:ArithDialect", + "//mlir:ArithToLLVM", "//mlir:CastOpInterfaces", "//mlir:ControlFlowToLLVM", "//mlir:ExecutionEngine", diff --git a/utils/bazel/llvm-project-overlay/mlir/examples/toy/Ch7/BUILD.bazel b/utils/bazel/llvm-project-overlay/mlir/examples/toy/Ch7/BUILD.bazel index 5d3139f..ecdb702 100644 --- a/utils/bazel/llvm-project-overlay/mlir/examples/toy/Ch7/BUILD.bazel +++ b/utils/bazel/llvm-project-overlay/mlir/examples/toy/Ch7/BUILD.bazel @@ -103,8 +103,8 @@ cc_binary( "//mlir:AffineTransforms", "//mlir:AllPassesAndDialects", "//mlir:Analysis", - "//mlir:ArithmeticDialect", - "//mlir:ArithmeticToLLVM", + "//mlir:ArithDialect", + "//mlir:ArithToLLVM", "//mlir:CastOpInterfaces", "//mlir:ControlFlowToLLVM", "//mlir:ExecutionEngine", diff --git a/utils/bazel/llvm-project-overlay/mlir/python/BUILD.bazel b/utils/bazel/llvm-project-overlay/mlir/python/BUILD.bazel index a3739f5..f010d77 100644 --- a/utils/bazel/llvm-project-overlay/mlir/python/BUILD.bazel +++ b/utils/bazel/llvm-project-overlay/mlir/python/BUILD.bazel @@ -197,23 +197,23 @@ filegroup( ) ##---------------------------------------------------------------------------## -# Arithmetic dialect. +# Arith dialect. ##---------------------------------------------------------------------------## td_library( - name = "ArithmeticOpsPyTdFiles", + name = "ArithOpsPyTdFiles", srcs = [ "//mlir:include/mlir/Bindings/Python/Attributes.td", ], includes = ["../include"], deps = [ - "//mlir:ArithmeticOpsTdFiles", + "//mlir:ArithOpsTdFiles", "//mlir:OpBaseTdFiles", ], ) gentbl_filegroup( - name = "ArithmeticOpsPyGen", + name = "ArithOpsPyGen", tbl_outs = [ ( [ @@ -224,18 +224,18 @@ gentbl_filegroup( ), ], tblgen = "//mlir:mlir-tblgen", - td_file = "mlir/dialects/ArithmeticOps.td", + td_file = "mlir/dialects/ArithOps.td", deps = [ - ":ArithmeticOpsPyTdFiles", + ":ArithOpsPyTdFiles", ], ) filegroup( - name = "ArithmeticOpsPyFiles", + name = "ArithOpsPyFiles", srcs = [ "mlir/dialects/_arith_ops_ext.py", "mlir/dialects/arith.py", - ":ArithmeticOpsPyGen", + ":ArithOpsPyGen", ], ) diff --git a/utils/bazel/llvm-project-overlay/mlir/test/BUILD.bazel b/utils/bazel/llvm-project-overlay/mlir/test/BUILD.bazel index 72ec63d..96bf3d1 100644 --- a/utils/bazel/llvm-project-overlay/mlir/test/BUILD.bazel +++ b/utils/bazel/llvm-project-overlay/mlir/test/BUILD.bazel @@ -304,7 +304,7 @@ cc_library( ":TestOpsIncGen", ":TestTypeDefsIncGen", "//llvm:Support", - "//mlir:ArithmeticDialect", + "//mlir:ArithDialect", "//mlir:ControlFlowInterfaces", "//mlir:CopyOpInterface", "//mlir:DLTIDialect", @@ -337,7 +337,7 @@ cc_library( ":TestDialect", "//llvm:Support", "//mlir:Analysis", - "//mlir:ArithmeticDialect", + "//mlir:ArithDialect", "//mlir:FuncDialect", "//mlir:IR", "//mlir:LinalgDialect", @@ -353,7 +353,7 @@ cc_library( deps = [ "//llvm:Support", "//mlir:AffineDialect", - "//mlir:ArithmeticDialect", + "//mlir:ArithDialect", "//mlir:FuncDialect", "//mlir:IR", "//mlir:LinalgDialect", @@ -419,7 +419,7 @@ cc_library( "//mlir:AffineAnalysis", "//mlir:AffineDialect", "//mlir:Analysis", - "//mlir:ArithmeticDialect", + "//mlir:ArithDialect", "//mlir:FuncDialect", "//mlir:IR", "//mlir:MathDialect", @@ -493,7 +493,7 @@ cc_library( "//llvm:NVPTXCodeGen", "//llvm:Support", "//mlir:AffineDialect", - "//mlir:ArithmeticDialect", + "//mlir:ArithDialect", "//mlir:FuncDialect", "//mlir:GPUDialect", "//mlir:GPUTransforms", @@ -517,8 +517,8 @@ cc_library( deps = [ "//llvm:Support", "//mlir:AffineDialect", - "//mlir:ArithmeticDialect", - "//mlir:ArithmeticTransforms", + "//mlir:ArithDialect", + "//mlir:ArithTransforms", "//mlir:BufferizationDialect", "//mlir:BufferizationTransforms", "//mlir:FuncDialect", @@ -550,7 +550,7 @@ cc_library( defines = ["MLIR_CUDA_CONVERSIONS_ENABLED"], includes = ["lib/Dialect/Test"], deps = [ - "//mlir:ArithmeticDialect", + "//mlir:ArithDialect", "//mlir:MathDialect", "//mlir:MathTransforms", "//mlir:Pass", @@ -607,7 +607,7 @@ cc_library( includes = ["lib/Dialect/Test"], deps = [ "//llvm:Support", - "//mlir:ArithmeticDialect", + "//mlir:ArithDialect", "//mlir:FuncDialect", "//mlir:IR", "//mlir:MathDialect", @@ -621,13 +621,13 @@ cc_library( ) cc_library( - name = "TestArithmetic", - srcs = glob(["lib/Dialect/Arithmetic/*.cpp"]), + name = "TestArith", + srcs = glob(["lib/Dialect/Arith/*.cpp"]), defines = ["MLIR_CUDA_CONVERSIONS_ENABLED"], includes = ["lib/Dialect/Test"], deps = [ - "//mlir:ArithmeticDialect", - "//mlir:ArithmeticTransforms", + "//mlir:ArithDialect", + "//mlir:ArithTransforms", "//mlir:FuncDialect", "//mlir:LLVMDialect", "//mlir:MathDialect", @@ -691,7 +691,7 @@ cc_library( defines = ["MLIR_CUDA_CONVERSIONS_ENABLED"], includes = ["lib/Dialect/Test"], deps = [ - "//mlir:ArithmeticDialect", + "//mlir:ArithDialect", "//mlir:LinalgDialect", "//mlir:Pass", "//mlir:SCFDialect", diff --git a/utils/bazel/llvm-project-overlay/mlir/unittests/BUILD.bazel b/utils/bazel/llvm-project-overlay/mlir/unittests/BUILD.bazel index 4ca2496..32e0a14 100644 --- a/utils/bazel/llvm-project-overlay/mlir/unittests/BUILD.bazel +++ b/utils/bazel/llvm-project-overlay/mlir/unittests/BUILD.bazel @@ -315,7 +315,7 @@ cc_test( ]), deps = [ "//llvm:gtest_main", - "//mlir:ArithmeticDialect", + "//mlir:ArithDialect", "//mlir:PDLToPDLInterp", ], )