diff --git a/mlir/docs/AttributesAndTypes.md b/mlir/docs/AttributesAndTypes.md --- a/mlir/docs/AttributesAndTypes.md +++ b/mlir/docs/AttributesAndTypes.md @@ -14,8 +14,8 @@ 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 @@ 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 --- a/mlir/docs/DefiningDialects.md +++ b/mlir/docs/DefiningDialects.md @@ -13,7 +13,7 @@ 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 @@ 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 --- a/mlir/docs/Dialects/SPIR-V.md +++ b/mlir/docs/Dialects/SPIR-V.md @@ -1079,7 +1079,7 @@ 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 --- a/mlir/docs/Dialects/Vector.md +++ b/mlir/docs/Dialects/Vector.md @@ -95,7 +95,7 @@ ### 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 --- a/mlir/docs/LangRef.md +++ b/mlir/docs/LangRef.md @@ -744,7 +744,7 @@ 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 --- a/mlir/docs/Passes.md +++ b/mlir/docs/Passes.md @@ -26,7 +26,7 @@ ## `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 --- a/mlir/docs/Rationale/Rationale.md +++ b/mlir/docs/Rationale/Rationale.md @@ -282,7 +282,7 @@ ### 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 --- a/mlir/docs/Tools/MLIRLSP.md +++ b/mlir/docs/Tools/MLIRLSP.md @@ -158,8 +158,8 @@ ```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 @@ ```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 --- a/mlir/docs/Tutorials/Toy/Ch-5.md +++ b/mlir/docs/Tutorials/Toy/Ch-5.md @@ -51,7 +51,7 @@ ## 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 @@ // 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 --- a/mlir/docs/Tutorials/Toy/Ch-6.md +++ b/mlir/docs/Tutorials/Toy/Ch-6.md @@ -95,7 +95,7 @@ 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 --- a/mlir/examples/standalone/standalone-opt/CMakeLists.txt +++ b/mlir/examples/standalone/standalone-opt/CMakeLists.txt @@ -3,7 +3,7 @@ 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 --- 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 @@ 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 --- 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 @@ // 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 --- 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 @@ // 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 --- 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 @@ 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 --- 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 @@ // 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 --- 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 @@ 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 rename from mlir/include/mlir/Conversion/ArithmeticToLLVM/ArithmeticToLLVM.h rename to mlir/include/mlir/Conversion/ArithToLLVM/ArithToLLVM.h --- 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 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 --- /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 --- 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 --- 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 --- a/mlir/include/mlir/Conversion/Passes.td +++ b/mlir/include/mlir/Conversion/Passes.td @@ -93,13 +93,13 @@ } //===----------------------------------------------------------------------===// -// 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 @@ } //===----------------------------------------------------------------------===// -// 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 @@ }]; let constructor = "mlir::createConvertAsyncToLLVMPass()"; let dependentDialects = [ - "arith::ArithmeticDialect", + "arith::ArithDialect", "async::AsyncDialect", "LLVM::LLVMDialect", ]; @@ -190,7 +190,7 @@ }]; let constructor = "mlir::createBufferizationToMemRefPass()"; - let dependentDialects = ["arith::ArithmeticDialect", "memref::MemRefDialect"]; + let dependentDialects = ["arith::ArithDialect", "memref::MemRefDialect"]; } //===----------------------------------------------------------------------===// @@ -486,7 +486,7 @@ }]; let constructor = "mlir::createConvertMathToLibmPass()"; let dependentDialects = [ - "arith::ArithmeticDialect", + "arith::ArithDialect", "func::FuncDialect", "vector::VectorDialect", ]; @@ -528,7 +528,7 @@ }]; let constructor = "mlir::createConvertMathToFuncsPass()"; let dependentDialects = [ - "arith::ArithmeticDialect", + "arith::ArithDialect", "cf::ControlFlowDialect", "func::FuncDialect", "vector::VectorDialect", @@ -778,7 +778,7 @@ 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 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 --- 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 --- 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 --- 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 @@ 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 --- a/mlir/include/mlir/Dialect/Affine/Passes.td +++ b/mlir/include/mlir/Dialect/Affine/Passes.td @@ -388,7 +388,7 @@ 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 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 rename from mlir/include/mlir/Dialect/Arithmetic/IR/Arithmetic.h rename to mlir/include/mlir/Dialect/Arith/IR/Arith.h --- 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 @@ } // 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 rename from mlir/include/mlir/Dialect/Arithmetic/IR/ArithmeticBase.td rename to mlir/include/mlir/Dialect/Arith/IR/ArithBase.td --- 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 @@ 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 rename from mlir/include/mlir/Dialect/Arithmetic/IR/ArithmeticOps.td rename to mlir/include/mlir/Dialect/Arith/IR/ArithOps.td --- 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/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 @@ // ConstantOp //===----------------------------------------------------------------------===// -def Arith_ConstantOp : Op, AllTypesMatch<["value", "result"]>, @@ -150,7 +150,7 @@ let arguments = (ins TypedAttrInterface:$value); // TODO: Disallow arith.constant to return anything other than a signless - // integer or float like. Downstream users of Arithmetic should only be + // integer or float like. Downstream users of Arith should only be // working with signless integers, floats, or vectors/tensors thereof. // However, it is necessary to allow arith.constant to return vectors/tensors // of strings and signed/unsigned integers (for now) as an artefact of @@ -1264,4 +1264,4 @@ let hasCustomAssemblyFormat = 1; } -#endif // ARITHMETIC_OPS +#endif // ARITH_OPS diff --git a/mlir/include/mlir/Dialect/Arith/IR/CMakeLists.txt b/mlir/include/mlir/Dialect/Arith/IR/CMakeLists.txt new file mode 100644 --- /dev/null +++ b/mlir/include/mlir/Dialect/Arith/IR/CMakeLists.txt @@ -0,0 +1,5 @@ +set(LLVM_TARGET_DEFINITIONS ArithOps.td) +mlir_tablegen(ArithOpsEnums.h.inc -gen-enum-decls) +mlir_tablegen(ArithOpsEnums.cpp.inc -gen-enum-defs) +add_mlir_dialect(ArithOps arith) +add_mlir_doc(ArithOps ArithOps Dialects/ -gen-dialect-doc) diff --git a/mlir/include/mlir/Dialect/Arithmetic/Transforms/BufferizableOpInterfaceImpl.h b/mlir/include/mlir/Dialect/Arith/Transforms/BufferizableOpInterfaceImpl.h rename from mlir/include/mlir/Dialect/Arithmetic/Transforms/BufferizableOpInterfaceImpl.h rename to mlir/include/mlir/Dialect/Arith/Transforms/BufferizableOpInterfaceImpl.h --- a/mlir/include/mlir/Dialect/Arithmetic/Transforms/BufferizableOpInterfaceImpl.h +++ b/mlir/include/mlir/Dialect/Arith/Transforms/BufferizableOpInterfaceImpl.h @@ -6,8 +6,8 @@ // //===----------------------------------------------------------------------===// -#ifndef MLIR_DIALECT_ARITHMETIC_BUFFERIZABLEOPINTERFACEIMPL_H -#define MLIR_DIALECT_ARITHMETIC_BUFFERIZABLEOPINTERFACEIMPL_H +#ifndef MLIR_DIALECT_ARITH_BUFFERIZABLEOPINTERFACEIMPL_H +#define MLIR_DIALECT_ARITH_BUFFERIZABLEOPINTERFACEIMPL_H namespace mlir { @@ -18,4 +18,4 @@ } // namespace arith } // namespace mlir -#endif // MLIR_DIALECT_ARITHMETIC_BUFFERIZABLEOPINTERFACEIMPL_H +#endif // MLIR_DIALECT_ARITH_BUFFERIZABLEOPINTERFACEIMPL_H diff --git a/mlir/include/mlir/Dialect/Arith/Transforms/CMakeLists.txt b/mlir/include/mlir/Dialect/Arith/Transforms/CMakeLists.txt new file mode 100644 --- /dev/null +++ b/mlir/include/mlir/Dialect/Arith/Transforms/CMakeLists.txt @@ -0,0 +1,5 @@ +set(LLVM_TARGET_DEFINITIONS Passes.td) +mlir_tablegen(Passes.h.inc -gen-pass-decls -name Arith) +add_public_tablegen_target(MLIRArithTransformsIncGen) + +add_mlir_doc(Passes ArithPasses ./ -gen-pass-doc) diff --git a/mlir/include/mlir/Dialect/Arithmetic/Transforms/Passes.h b/mlir/include/mlir/Dialect/Arith/Transforms/Passes.h rename from mlir/include/mlir/Dialect/Arithmetic/Transforms/Passes.h rename to mlir/include/mlir/Dialect/Arith/Transforms/Passes.h --- a/mlir/include/mlir/Dialect/Arithmetic/Transforms/Passes.h +++ b/mlir/include/mlir/Dialect/Arith/Transforms/Passes.h @@ -6,8 +6,8 @@ // //===----------------------------------------------------------------------===// -#ifndef MLIR_DIALECT_ARITHMETIC_TRANSFORMS_PASSES_H_ -#define MLIR_DIALECT_ARITHMETIC_TRANSFORMS_PASSES_H_ +#ifndef MLIR_DIALECT_ARITH_TRANSFORMS_PASSES_H_ +#define MLIR_DIALECT_ARITH_TRANSFORMS_PASSES_H_ #include "mlir/Pass/Pass.h" @@ -15,31 +15,31 @@ namespace arith { #define GEN_PASS_DECL -#include "mlir/Dialect/Arithmetic/Transforms/Passes.h.inc" +#include "mlir/Dialect/Arith/Transforms/Passes.h.inc" class WideIntEmulationConverter; -/// Create a pass to bufferize Arithmetic ops. -std::unique_ptr 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 @@ /// 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 rename from mlir/include/mlir/Dialect/Arithmetic/Transforms/Passes.td rename to mlir/include/mlir/Dialect/Arith/Transforms/Passes.td --- 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 @@ 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 @@ 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 @@ 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 rename from mlir/include/mlir/Dialect/Arithmetic/Transforms/WideIntEmulationConverter.h rename to mlir/include/mlir/Dialect/Arith/Transforms/WideIntEmulationConverter.h --- 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 @@ }; } // 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 rename from mlir/include/mlir/Dialect/Arithmetic/Utils/Utils.h rename to mlir/include/mlir/Dialect/Arith/Utils/Utils.h --- 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 @@ }; } // 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 --- 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 --- 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 --- a/mlir/include/mlir/Dialect/Async/Passes.td +++ b/mlir/include/mlir/Dialect/Async/Passes.td @@ -34,7 +34,7 @@ ]; 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 --- 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 --- 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 --- a/mlir/include/mlir/Dialect/Complex/IR/ComplexBase.td +++ b/mlir/include/mlir/Dialect/Complex/IR/ComplexBase.td @@ -19,7 +19,7 @@ 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 --- a/mlir/include/mlir/Dialect/ControlFlow/IR/ControlFlowOps.td +++ b/mlir/include/mlir/Dialect/ControlFlow/IR/ControlFlowOps.td @@ -22,7 +22,7 @@ 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 --- a/mlir/include/mlir/Dialect/GPU/IR/GPUBase.td +++ b/mlir/include/mlir/Dialect/GPU/IR/GPUBase.td @@ -53,7 +53,7 @@ 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 --- a/mlir/include/mlir/Dialect/Linalg/IR/LinalgBase.td +++ b/mlir/include/mlir/Dialect/Linalg/IR/LinalgBase.td @@ -35,7 +35,7 @@ }]; 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 --- a/mlir/include/mlir/Dialect/MemRef/IR/MemRefBase.td +++ b/mlir/include/mlir/Dialect/MemRef/IR/MemRefBase.td @@ -19,7 +19,7 @@ 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 --- 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 --- a/mlir/include/mlir/Dialect/SCF/IR/SCFOps.td +++ b/mlir/include/mlir/Dialect/SCF/IR/SCFOps.td @@ -23,7 +23,7 @@ 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 --- a/mlir/include/mlir/Dialect/Shape/IR/ShapeBase.td +++ b/mlir/include/mlir/Dialect/Shape/IR/ShapeBase.td @@ -36,7 +36,7 @@ }]; 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 --- a/mlir/include/mlir/Dialect/Shape/Transforms/Passes.h +++ b/mlir/include/mlir/Dialect/Shape/Transforms/Passes.h @@ -30,9 +30,8 @@ #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 --- a/mlir/include/mlir/Dialect/Shape/Transforms/Passes.td +++ b/mlir/include/mlir/Dialect/Shape/Transforms/Passes.td @@ -17,7 +17,7 @@ } 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 --- a/mlir/include/mlir/Dialect/SparseTensor/Transforms/Passes.td +++ b/mlir/include/mlir/Dialect/SparseTensor/Transforms/Passes.td @@ -54,7 +54,7 @@ let constructor = "mlir::createSparsificationPass()"; let dependentDialects = [ "AffineDialect", - "arith::ArithmeticDialect", + "arith::ArithDialect", "bufferization::BufferizationDialect", "LLVM::LLVMDialect", "memref::MemRefDialect", @@ -134,7 +134,7 @@ }]; let constructor = "mlir::createSparseTensorConversionPass()"; let dependentDialects = [ - "arith::ArithmeticDialect", + "arith::ArithDialect", "bufferization::BufferizationDialect", "LLVM::LLVMDialect", "linalg::LinalgDialect", @@ -169,7 +169,7 @@ }]; 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 --- a/mlir/include/mlir/Dialect/Tensor/IR/TensorBase.td +++ b/mlir/include/mlir/Dialect/Tensor/IR/TensorBase.td @@ -47,7 +47,7 @@ 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 --- 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 --- a/mlir/include/mlir/Dialect/Vector/IR/VectorOps.td +++ b/mlir/include/mlir/Dialect/Vector/IR/VectorOps.td @@ -26,7 +26,7 @@ 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 --- 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 @@ // clang-format off registry.insert]; } -#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 --- a/mlir/lib/Conversion/AffineToStandard/AffineToStandard.cpp +++ b/mlir/lib/Conversion/AffineToStandard/AffineToStandard.cpp @@ -554,7 +554,7 @@ 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 --- a/mlir/lib/Conversion/AffineToStandard/CMakeLists.txt +++ b/mlir/lib/Conversion/AffineToStandard/CMakeLists.txt @@ -13,7 +13,7 @@ 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 rename from mlir/lib/Conversion/ArithmeticToLLVM/ArithmeticToLLVM.cpp rename to mlir/lib/Conversion/ArithToLLVM/ArithToLLVM.cpp --- 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 @@ //===----------------------------------------------------------------------===// namespace { -struct ArithmeticToLLVMConversionPass - : public impl::ArithmeticToLLVMConversionPassBase< - ArithmeticToLLVMConversionPass> { +struct ArithToLLVMConversionPass + : public impl::ArithToLLVMConversionPassBase { using Base::Base; void runOnOperation() override { @@ -334,8 +333,7 @@ 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 @@ // 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 rename from mlir/lib/Conversion/ArithmeticToLLVM/CMakeLists.txt rename to mlir/lib/Conversion/ArithToLLVM/CMakeLists.txt --- 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 @@ Core LINK_LIBS PUBLIC - MLIRArithmeticDialect + MLIRArithDialect MLIRLLVMCommonConversion MLIRLLVMDialect ) diff --git a/mlir/lib/Conversion/ArithmeticToSPIRV/ArithmeticToSPIRV.cpp b/mlir/lib/Conversion/ArithToSPIRV/ArithToSPIRV.cpp rename from mlir/lib/Conversion/ArithmeticToSPIRV/ArithmeticToSPIRV.cpp rename to mlir/lib/Conversion/ArithToSPIRV/ArithToSPIRV.cpp --- 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 @@ // Pattern Population //===----------------------------------------------------------------------===// -void mlir::arith::populateArithmeticToSPIRVPatterns( +void mlir::arith::populateArithToSPIRVPatterns( SPIRVTypeConverter &typeConverter, RewritePatternSet &patterns) { // clang-format off patterns.add< @@ -1022,8 +1022,8 @@ //===----------------------------------------------------------------------===// 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 @@ 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 @@ }; } // 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 rename from mlir/lib/Conversion/ArithmeticToSPIRV/CMakeLists.txt rename to mlir/lib/Conversion/ArithToSPIRV/CMakeLists.txt --- 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 @@ 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 --- a/mlir/lib/Conversion/ArmNeon2dToIntr/CMakeLists.txt +++ b/mlir/lib/Conversion/ArmNeon2dToIntr/CMakeLists.txt @@ -11,7 +11,7 @@ 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 --- 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 --- a/mlir/lib/Conversion/AsyncToLLVM/CMakeLists.txt +++ b/mlir/lib/Conversion/AsyncToLLVM/CMakeLists.txt @@ -11,7 +11,7 @@ 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 --- 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 --- 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 --- 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 --- a/mlir/lib/Conversion/ComplexToStandard/CMakeLists.txt +++ b/mlir/lib/Conversion/ComplexToStandard/CMakeLists.txt @@ -8,7 +8,7 @@ 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 --- 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 @@ 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 --- a/mlir/lib/Conversion/FuncToLLVM/CMakeLists.txt +++ b/mlir/lib/Conversion/FuncToLLVM/CMakeLists.txt @@ -13,7 +13,7 @@ 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 --- 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 @@ 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 --- a/mlir/lib/Conversion/GPUCommon/CMakeLists.txt +++ b/mlir/lib/Conversion/GPUCommon/CMakeLists.txt @@ -29,7 +29,7 @@ ${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 --- 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 @@ 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 --- a/mlir/lib/Conversion/GPUToNVVM/CMakeLists.txt +++ b/mlir/lib/Conversion/GPUToNVVM/CMakeLists.txt @@ -11,7 +11,7 @@ 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 --- 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 @@ 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 --- a/mlir/lib/Conversion/GPUToROCDL/CMakeLists.txt +++ b/mlir/lib/Conversion/GPUToROCDL/CMakeLists.txt @@ -10,7 +10,7 @@ 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 --- 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 @@ 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 --- a/mlir/lib/Conversion/GPUToSPIRV/CMakeLists.txt +++ b/mlir/lib/Conversion/GPUToSPIRV/CMakeLists.txt @@ -6,7 +6,7 @@ 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 --- 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 @@ // 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 --- a/mlir/lib/Conversion/LinalgToStandard/LinalgToStandard.cpp +++ b/mlir/lib/Conversion/LinalgToStandard/LinalgToStandard.cpp @@ -141,9 +141,8 @@ 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 --- a/mlir/lib/Conversion/MathToFuncs/CMakeLists.txt +++ b/mlir/lib/Conversion/MathToFuncs/CMakeLists.txt @@ -11,7 +11,7 @@ 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 --- 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 @@ 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 --- a/mlir/lib/Conversion/MathToLibm/CMakeLists.txt +++ b/mlir/lib/Conversion/MathToLibm/CMakeLists.txt @@ -11,7 +11,7 @@ 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 --- 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 @@ 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 --- 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 --- a/mlir/lib/Conversion/OpenACCToSCF/CMakeLists.txt +++ b/mlir/lib/Conversion/OpenACCToSCF/CMakeLists.txt @@ -8,7 +8,7 @@ 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 --- 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 --- a/mlir/lib/Conversion/OpenMPToLLVM/CMakeLists.txt +++ b/mlir/lib/Conversion/OpenMPToLLVM/CMakeLists.txt @@ -12,7 +12,7 @@ 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 --- 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 @@ // 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 --- a/mlir/lib/Conversion/SCFToControlFlow/CMakeLists.txt +++ b/mlir/lib/Conversion/SCFToControlFlow/CMakeLists.txt @@ -11,7 +11,7 @@ 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 --- 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 --- a/mlir/lib/Conversion/SCFToGPU/CMakeLists.txt +++ b/mlir/lib/Conversion/SCFToGPU/CMakeLists.txt @@ -11,7 +11,7 @@ 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 --- 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 --- 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 --- a/mlir/lib/Conversion/SCFToOpenMP/CMakeLists.txt +++ b/mlir/lib/Conversion/SCFToOpenMP/CMakeLists.txt @@ -12,7 +12,7 @@ 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 --- 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 --- a/mlir/lib/Conversion/SCFToSPIRV/CMakeLists.txt +++ b/mlir/lib/Conversion/SCFToSPIRV/CMakeLists.txt @@ -9,7 +9,7 @@ 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 --- 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 @@ // 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 --- a/mlir/lib/Conversion/SPIRVToLLVM/CMakeLists.txt +++ b/mlir/lib/Conversion/SPIRVToLLVM/CMakeLists.txt @@ -11,7 +11,7 @@ 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 --- 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 @@ 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 --- a/mlir/lib/Conversion/ShapeToStandard/CMakeLists.txt +++ b/mlir/lib/Conversion/ShapeToStandard/CMakeLists.txt @@ -17,7 +17,7 @@ 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 --- 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 @@ // 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 --- 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 @@ 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 --- a/mlir/lib/Conversion/TensorToSPIRV/CMakeLists.txt +++ b/mlir/lib/Conversion/TensorToSPIRV/CMakeLists.txt @@ -10,7 +10,7 @@ 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 --- 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 @@ 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 --- a/mlir/lib/Conversion/TosaToArith/CMakeLists.txt +++ b/mlir/lib/Conversion/TosaToArith/CMakeLists.txt @@ -10,7 +10,7 @@ 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 --- 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 --- 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 @@ 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 --- a/mlir/lib/Conversion/TosaToLinalg/CMakeLists.txt +++ b/mlir/lib/Conversion/TosaToLinalg/CMakeLists.txt @@ -12,7 +12,7 @@ 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 --- 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 --- 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 --- 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 @@ 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 --- 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 @@ 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 --- 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 --- 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 @@ 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 --- a/mlir/lib/Conversion/VectorToGPU/CMakeLists.txt +++ b/mlir/lib/Conversion/VectorToGPU/CMakeLists.txt @@ -9,7 +9,7 @@ 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 --- 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 --- 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 --- a/mlir/lib/Conversion/VectorToLLVM/CMakeLists.txt +++ b/mlir/lib/Conversion/VectorToLLVM/CMakeLists.txt @@ -13,7 +13,7 @@ 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 --- 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 --- 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 @@ // 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 @@ // 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 --- a/mlir/lib/Conversion/VectorToSCF/CMakeLists.txt +++ b/mlir/lib/Conversion/VectorToSCF/CMakeLists.txt @@ -8,7 +8,7 @@ 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 --- 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 --- 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 --- 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 --- a/mlir/lib/Dialect/Affine/IR/CMakeLists.txt +++ b/mlir/lib/Dialect/Affine/IR/CMakeLists.txt @@ -11,7 +11,7 @@ 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 --- 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 --- 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 --- a/mlir/lib/Dialect/Affine/Transforms/CMakeLists.txt +++ b/mlir/lib/Dialect/Affine/Transforms/CMakeLists.txt @@ -26,7 +26,7 @@ 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 --- 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 --- 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 --- 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 --- a/mlir/lib/Dialect/Affine/Utils/CMakeLists.txt +++ b/mlir/lib/Dialect/Affine/Utils/CMakeLists.txt @@ -11,7 +11,7 @@ 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 --- 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 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 rename from mlir/lib/Dialect/Arithmetic/IR/ArithmeticCanonicalization.td rename to mlir/lib/Dialect/Arith/IR/ArithCanonicalization.td --- 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 @@ 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 rename from mlir/lib/Dialect/Arithmetic/IR/ArithmeticDialect.cpp rename to mlir/lib/Dialect/Arith/IR/ArithDialect.cpp --- 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 @@ }; } // 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 rename from mlir/lib/Dialect/Arithmetic/IR/ArithmeticOps.cpp rename to mlir/lib/Dialect/Arith/IR/ArithOps.cpp --- 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 @@ //===----------------------------------------------------------------------===// namespace { -#include "ArithmeticCanonicalization.inc" +#include "ArithCanonicalization.inc" } // namespace //===----------------------------------------------------------------------===// @@ -2153,10 +2153,10 @@ //===----------------------------------------------------------------------===// #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 --- /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 rename from mlir/lib/Dialect/Arithmetic/IR/InferIntRangeInterfaceImpls.cpp rename to mlir/lib/Dialect/Arith/IR/InferIntRangeInterfaceImpls.cpp --- 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 rename from mlir/lib/Dialect/Arithmetic/Transforms/BufferizableOpInterfaceImpl.cpp rename to mlir/lib/Dialect/Arith/Transforms/BufferizableOpInterfaceImpl.cpp --- 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 @@ 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 rename from mlir/lib/Dialect/Arithmetic/Transforms/Bufferize.cpp rename to mlir/lib/Dialect/Arith/Transforms/Bufferize.cpp --- 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 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 @@ if (constantOpOnly) { options.opFilter.allowOperation(); } else { - options.opFilter.allowDialect(); + options.opFilter.allowDialect(); } options.bufferAlignment = alignment; @@ -49,7 +49,7 @@ void getDependentDialects(DialectRegistry ®istry) const override { registry.insert(); + arith::ArithDialect>(); arith::registerBufferizableOpInterfaceExternalModels(registry); } @@ -58,12 +58,12 @@ }; } // 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 rename from mlir/lib/Dialect/Arithmetic/Transforms/CMakeLists.txt rename to mlir/lib/Dialect/Arith/Transforms/CMakeLists.txt --- 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 @@ 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 rename from mlir/lib/Dialect/Arithmetic/Transforms/EmulateWideInt.cpp rename to mlir/lib/Dialect/Arith/Transforms/EmulateWideInt.cpp --- 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 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 @@ 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 rename from mlir/lib/Dialect/Arithmetic/Transforms/ExpandOps.cpp rename to mlir/lib/Dialect/Arith/Transforms/ExpandOps.cpp --- 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 @@ } }; -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 @@ } // namespace -void mlir::arith::populateArithmeticExpandOpsPatterns( - RewritePatternSet &patterns) { +void mlir::arith::populateArithExpandOpsPatterns(RewritePatternSet &patterns) { // clang-format off patterns.add< CeilDivSIOpConverter, @@ -242,6 +241,6 @@ // 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 rename from mlir/lib/Dialect/Arithmetic/Transforms/UnsignedWhenEquivalent.cpp rename to mlir/lib/Dialect/Arith/Transforms/UnsignedWhenEquivalent.cpp --- 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 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 @@ return signalPassFailure(); ConversionTarget target(*ctx); - target.addLegalDialect(); + target.addLegalDialect(); target .addDynamicallyLegalOp( @@ -153,7 +153,6 @@ }; } // 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 --- /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 rename from mlir/lib/Dialect/Arithmetic/Utils/Utils.cpp rename to mlir/lib/Dialect/Arith/Utils/Utils.cpp --- 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 --- 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 --- 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 --- 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 --- 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 --- a/mlir/lib/Dialect/Async/Transforms/CMakeLists.txt +++ b/mlir/lib/Dialect/Async/Transforms/CMakeLists.txt @@ -12,7 +12,7 @@ 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 --- 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 --- 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 --- 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 --- 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 --- a/mlir/lib/Dialect/Complex/IR/CMakeLists.txt +++ b/mlir/lib/Dialect/Complex/IR/CMakeLists.txt @@ -10,7 +10,7 @@ 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 --- 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 --- a/mlir/lib/Dialect/ControlFlow/IR/CMakeLists.txt +++ b/mlir/lib/Dialect/ControlFlow/IR/CMakeLists.txt @@ -8,7 +8,7 @@ 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 --- 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 --- a/mlir/lib/Dialect/GPU/CMakeLists.txt +++ b/mlir/lib/Dialect/GPU/CMakeLists.txt @@ -33,7 +33,7 @@ MLIRGPUOpInterfacesIncGen LINK_LIBS PUBLIC - MLIRArithmeticDialect + MLIRArithDialect MLIRDLTIDialect MLIRInferIntRangeInterface MLIRIR @@ -67,7 +67,7 @@ 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 --- 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 --- 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 --- 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 --- 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 --- a/mlir/lib/Dialect/Linalg/IR/CMakeLists.txt +++ b/mlir/lib/Dialect/Linalg/IR/CMakeLists.txt @@ -15,8 +15,8 @@ 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 --- 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 --- 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 --- 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 --- a/mlir/lib/Dialect/Linalg/TransformOps/CMakeLists.txt +++ b/mlir/lib/Dialect/Linalg/TransformOps/CMakeLists.txt @@ -9,7 +9,7 @@ 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 --- 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 @@ 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 --- 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 --- a/mlir/lib/Dialect/Linalg/Transforms/CMakeLists.txt +++ b/mlir/lib/Dialect/Linalg/Transforms/CMakeLists.txt @@ -40,9 +40,9 @@ 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 --- 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 --- 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 --- 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 --- 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 --- 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 --- 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 --- 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 --- 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 --- 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 --- 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 --- 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 --- 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 --- 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 --- a/mlir/lib/Dialect/Linalg/Utils/CMakeLists.txt +++ b/mlir/lib/Dialect/Linalg/Utils/CMakeLists.txt @@ -8,7 +8,7 @@ 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 --- 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 --- a/mlir/lib/Dialect/Math/IR/CMakeLists.txt +++ b/mlir/lib/Dialect/Math/IR/CMakeLists.txt @@ -9,7 +9,7 @@ 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 --- 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 --- 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 --- a/mlir/lib/Dialect/Math/Transforms/CMakeLists.txt +++ b/mlir/lib/Dialect/Math/Transforms/CMakeLists.txt @@ -7,7 +7,7 @@ ${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 --- 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 --- 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 --- a/mlir/lib/Dialect/MemRef/IR/CMakeLists.txt +++ b/mlir/lib/Dialect/MemRef/IR/CMakeLists.txt @@ -12,8 +12,8 @@ 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 --- 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 --- 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 --- a/mlir/lib/Dialect/MemRef/TransformOps/CMakeLists.txt +++ b/mlir/lib/Dialect/MemRef/TransformOps/CMakeLists.txt @@ -9,7 +9,7 @@ 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 --- 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 @@ 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 --- a/mlir/lib/Dialect/MemRef/Transforms/CMakeLists.txt +++ b/mlir/lib/Dialect/MemRef/Transforms/CMakeLists.txt @@ -16,7 +16,7 @@ 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 --- 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 @@ 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 --- 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 --- 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 --- 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 --- a/mlir/lib/Dialect/NVGPU/Transforms/CMakeLists.txt +++ b/mlir/lib/Dialect/NVGPU/Transforms/CMakeLists.txt @@ -9,7 +9,7 @@ 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 --- 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 --- 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 --- a/mlir/lib/Dialect/SCF/IR/CMakeLists.txt +++ b/mlir/lib/Dialect/SCF/IR/CMakeLists.txt @@ -8,7 +8,7 @@ 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 --- 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 --- a/mlir/lib/Dialect/SCF/Transforms/CMakeLists.txt +++ b/mlir/lib/Dialect/SCF/Transforms/CMakeLists.txt @@ -21,7 +21,7 @@ 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 --- 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 --- 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 --- 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 --- 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 --- 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 --- 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 --- a/mlir/lib/Dialect/SCF/Utils/CMakeLists.txt +++ b/mlir/lib/Dialect/SCF/Utils/CMakeLists.txt @@ -9,7 +9,7 @@ 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 --- 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 --- a/mlir/lib/Dialect/Shape/IR/CMakeLists.txt +++ b/mlir/lib/Dialect/Shape/IR/CMakeLists.txt @@ -12,7 +12,7 @@ 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 --- 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 --- a/mlir/lib/Dialect/Shape/Transforms/CMakeLists.txt +++ b/mlir/lib/Dialect/Shape/Transforms/CMakeLists.txt @@ -13,7 +13,7 @@ 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 --- 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 @@ 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 --- a/mlir/lib/Dialect/SparseTensor/IR/CMakeLists.txt +++ b/mlir/lib/Dialect/SparseTensor/IR/CMakeLists.txt @@ -9,7 +9,7 @@ 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 --- 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 --- a/mlir/lib/Dialect/SparseTensor/Pipelines/CMakeLists.txt +++ b/mlir/lib/Dialect/SparseTensor/Pipelines/CMakeLists.txt @@ -5,7 +5,7 @@ ${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 --- 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 @@ 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 --- a/mlir/lib/Dialect/SparseTensor/Transforms/CMakeLists.txt +++ b/mlir/lib/Dialect/SparseTensor/Transforms/CMakeLists.txt @@ -15,7 +15,7 @@ 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 --- 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 --- 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 @@ 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 @@ // 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 --- 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 --- 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 --- a/mlir/lib/Dialect/SparseTensor/Utils/CMakeLists.txt +++ b/mlir/lib/Dialect/SparseTensor/Utils/CMakeLists.txt @@ -5,7 +5,7 @@ ${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 --- 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 --- a/mlir/lib/Dialect/Tensor/IR/CMakeLists.txt +++ b/mlir/lib/Dialect/Tensor/IR/CMakeLists.txt @@ -19,8 +19,8 @@ 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 --- 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 --- 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 --- 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 --- 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 @@ 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 --- 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 @@ } 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 --- a/mlir/lib/Dialect/Tensor/Transforms/CMakeLists.txt +++ b/mlir/lib/Dialect/Tensor/Transforms/CMakeLists.txt @@ -15,7 +15,7 @@ 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 --- 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 --- 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 --- 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 --- a/mlir/lib/Dialect/Tensor/Utils/CMakeLists.txt +++ b/mlir/lib/Dialect/Tensor/Utils/CMakeLists.txt @@ -6,7 +6,7 @@ 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 --- 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 --- a/mlir/lib/Dialect/Utils/CMakeLists.txt +++ b/mlir/lib/Dialect/Utils/CMakeLists.txt @@ -5,6 +5,6 @@ StaticValueUtils.cpp LINK_LIBS PUBLIC - MLIRArithmeticUtils + MLIRArithUtils MLIRIR ) diff --git a/mlir/lib/Dialect/Utils/StaticValueUtils.cpp b/mlir/lib/Dialect/Utils/StaticValueUtils.cpp --- 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 --- a/mlir/lib/Dialect/Vector/IR/CMakeLists.txt +++ b/mlir/lib/Dialect/Vector/IR/CMakeLists.txt @@ -9,7 +9,7 @@ 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 --- 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 --- a/mlir/lib/Dialect/Vector/Transforms/CMakeLists.txt +++ b/mlir/lib/Dialect/Vector/Transforms/CMakeLists.txt @@ -21,7 +21,7 @@ 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 --- 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 --- 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 --- 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 --- 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 --- 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 --- 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 --- a/mlir/lib/Dialect/Vector/Utils/CMakeLists.txt +++ b/mlir/lib/Dialect/Vector/Utils/CMakeLists.txt @@ -7,7 +7,7 @@ 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 --- 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 --- 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 --- a/mlir/lib/Dialect/X86Vector/Transforms/CMakeLists.txt +++ b/mlir/lib/Dialect/X86Vector/Transforms/CMakeLists.txt @@ -6,7 +6,7 @@ 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 --- 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 --- a/mlir/lib/Target/Cpp/CMakeLists.txt +++ b/mlir/lib/Target/Cpp/CMakeLists.txt @@ -6,7 +6,7 @@ ${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 --- 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 @@ }, [](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 @@ 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 @@ } // 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 --- 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 --- 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 @@ 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 --- a/mlir/test/lib/Dialect/Linalg/CMakeLists.txt +++ b/mlir/test/lib/Dialect/Linalg/CMakeLists.txt @@ -11,8 +11,8 @@ 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 --- 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 --- 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 @@ 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 --- 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 @@ 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 --- 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 @@ } 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 --- 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 @@ } 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 --- a/mlir/test/lib/Dialect/Tensor/CMakeLists.txt +++ b/mlir/test/lib/Dialect/Tensor/CMakeLists.txt @@ -5,7 +5,7 @@ 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 --- 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 @@ 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 --- 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 --- 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 --- 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 --- a/mlir/test/lib/Interfaces/TilingInterface/CMakeLists.txt +++ b/mlir/test/lib/Interfaces/TilingInterface/CMakeLists.txt @@ -5,7 +5,7 @@ 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 --- a/mlir/tools/mlir-opt/CMakeLists.txt +++ b/mlir/tools/mlir-opt/CMakeLists.txt @@ -14,7 +14,7 @@ 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 --- a/mlir/tools/mlir-opt/mlir-opt.cpp +++ b/mlir/tools/mlir-opt/mlir-opt.cpp @@ -64,7 +64,7 @@ void registerPatternsTestPass(); void registerSimpleParametricTilingPass(); void registerTestAffineLoopParametricTilingPass(); -void registerTestArithmeticEmulateWideIntPass(); +void registerTestArithEmulateWideIntPass(); void registerTestAliasAnalysisPass(); void registerTestBuiltinAttributeInterfaces(); void registerTestCallGraphPass(); @@ -162,7 +162,7 @@ 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 --- a/mlir/tools/mlir-spirv-cpu-runner/CMakeLists.txt +++ b/mlir/tools/mlir-spirv-cpu-runner/CMakeLists.txt @@ -16,7 +16,7 @@ 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 --- 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 @@ 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 --- a/mlir/tools/mlir-vulkan-runner/CMakeLists.txt +++ b/mlir/tools/mlir-vulkan-runner/CMakeLists.txt @@ -56,7 +56,7 @@ 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 --- 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 @@ 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 --- a/mlir/unittests/Conversion/PDLToPDLInterp/CMakeLists.txt +++ b/mlir/unittests/Conversion/PDLToPDLInterp/CMakeLists.txt @@ -3,6 +3,6 @@ ) target_link_libraries(MLIRPDLToPDLInterpTests PRIVATE - MLIRArithmeticDialect + MLIRArithDialect MLIRPDLToPDLInterp ) diff --git a/mlir/unittests/Conversion/PDLToPDLInterp/RootOrderingTest.cpp b/mlir/unittests/Conversion/PDLToPDLInterp/RootOrderingTest.cpp --- 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 @@ 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 --- a/mlir/unittests/ExecutionEngine/CMakeLists.txt +++ b/mlir/unittests/ExecutionEngine/CMakeLists.txt @@ -6,7 +6,7 @@ target_link_libraries(MLIRExecutionEngineTests PRIVATE - MLIRArithmeticToLLVM + MLIRArithToLLVM MLIRExecutionEngine MLIRLinalgToLLVM MLIRMemRefToLLVM diff --git a/mlir/unittests/ExecutionEngine/Invoke.cpp b/mlir/unittests/ExecutionEngine/Invoke.cpp --- 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 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 --- 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 @@ } )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 --- a/utils/bazel/llvm-project-overlay/mlir/BUILD.bazel +++ b/utils/bazel/llvm-project-overlay/mlir/BUILD.bazel @@ -1047,7 +1047,7 @@ ], includes = ["include"], deps = [ - ":ArithmeticOpsTdFiles", + ":ArithOpsTdFiles", ":FuncTdFiles", ":LoopLikeInterfaceTdFiles", ":OpBaseTdFiles", @@ -1271,7 +1271,7 @@ ]), hdrs = glob(["include/mlir/Target/Cpp/*.h"]), deps = [ - ":ArithmeticDialect", + ":ArithDialect", ":ControlFlowDialect", ":EmitCDialect", ":FuncDialect", @@ -1485,7 +1485,7 @@ ], includes = ["include"], deps = [ - ":ArithmeticOpsTdFiles", + ":ArithOpsTdFiles", ":FuncTdFiles", ":LLVMOpsTdFiles", ":OpBaseTdFiles", @@ -1747,7 +1747,7 @@ hdrs = ["include/mlir/Dialect/X86Vector/Transforms.h"], includes = ["include"], deps = [ - ":ArithmeticDialect", + ":ArithDialect", ":FuncDialect", ":IR", ":LLVMCommonConversion", @@ -1846,8 +1846,8 @@ deps = [ ":AffineAnalysis", ":AffineDialect", - ":ArithmeticDialect", - ":ArithmeticUtils", + ":ArithDialect", + ":ArithUtils", ":BufferizationDialect", ":BufferizationTransforms", ":DialectUtils", @@ -2030,7 +2030,7 @@ hdrs = ["include/mlir/Dialect/SparseTensor/IR/SparseTensor.h"], includes = ["include"], deps = [ - ":ArithmeticDialect", + ":ArithDialect", ":IR", ":InferTypeOpInterface", ":SparseTensorAttrDefsIncGen", @@ -2045,7 +2045,7 @@ hdrs = glob(["include/mlir/Dialect/SparseTensor/Utils/*.h"]), includes = ["include"], deps = [ - ":ArithmeticDialect", + ":ArithDialect", ":ComplexDialect", ":IR", ":LinalgDialect", @@ -2069,7 +2069,7 @@ includes = ["include"], deps = [ ":AffineDialect", - ":ArithmeticDialect", + ":ArithDialect", ":BufferizationDialect", ":BufferizationTransforms", ":ComplexDialect", @@ -2102,7 +2102,7 @@ hdrs = ["include/mlir/Dialect/SparseTensor/Pipelines/Passes.h"], includes = ["include"], deps = [ - ":ArithmeticTransforms", + ":ArithTransforms", ":BufferizationTransforms", ":ConversionPasses", ":FuncDialect", @@ -2221,7 +2221,7 @@ includes = ["include"], deps = [ ":AffineDialect", - ":ArithmeticDialect", + ":ArithDialect", ":FuncDialect", ":GPUDialect", ":IR", @@ -2345,7 +2345,7 @@ ]), includes = ["include"], deps = [ - ":ArithmeticUtils", + ":ArithUtils", ":DialectUtilsIncGen", ":IR", ":Support", @@ -2366,7 +2366,7 @@ deps = [ ":AffineMemoryOpInterfacesIncGen", ":AffineOpsIncGen", - ":ArithmeticDialect", + ":ArithDialect", ":ControlFlowInterfaces", ":DialectUtils", ":IR", @@ -2428,7 +2428,7 @@ includes = ["include"], deps = [ ":Analysis", - ":ArithmeticDialect", + ":ArithDialect", ":AsyncDialect", ":AsyncPassIncGen", ":ControlFlowDialect", @@ -2457,7 +2457,7 @@ deps = [ ":AffineDialect", ":Analysis", - ":ArithmeticDialect", + ":ArithDialect", ":FuncDialect", ":IR", ":Support", @@ -2485,7 +2485,7 @@ ":AffineAnalysis", ":AffineDialect", ":Analysis", - ":ArithmeticUtils", + ":ArithUtils", ":FuncDialect", ":IR", ":MemRefDialect", @@ -2528,8 +2528,8 @@ ":AffinePassIncGen", ":AffineUtils", ":Analysis", - ":ArithmeticDialect", - ":ArithmeticUtils", + ":ArithDialect", + ":ArithUtils", ":FuncDialect", ":IR", ":MemRefDialect", @@ -2582,8 +2582,8 @@ deps = [ ":AMDGPUToROCDL", ":AffineToStandard", - ":ArithmeticToLLVM", - ":ArithmeticToSPIRV", + ":ArithToLLVM", + ":ArithToSPIRV", ":ArmNeon2dToIntr", ":AsyncToLLVM", ":BufferizationToMemRef", @@ -2643,7 +2643,7 @@ hdrs = glob(["include/mlir/Conversion/AsyncToLLVM/*.h"]), includes = ["include"], deps = [ - ":ArithmeticDialect", + ":ArithDialect", ":AsyncDialect", ":ConversionPassIncGen", ":FuncDialect", @@ -2670,7 +2670,7 @@ deps = [ ":AffineDialect", ":AffineUtils", - ":ArithmeticDialect", + ":ArithDialect", ":ConversionPassIncGen", ":FuncDialect", ":IR", @@ -2718,8 +2718,8 @@ ), includes = ["include"], deps = [ - ":ArithmeticDialect", - ":ArithmeticUtils", + ":ArithDialect", + ":ArithUtils", ":BufferizationDialect", ":ControlFlowDialect", ":ControlFlowInterfaces", @@ -2755,7 +2755,7 @@ ":AffineAnalysis", ":AffineDialect", ":Analysis", - ":ArithmeticDialect", + ":ArithDialect", ":DialectUtils", ":FuncDialect", ":IR", @@ -2911,7 +2911,7 @@ hdrs = ["include/mlir/Dialect/Shape/IR/Shape.h"], includes = ["include"], deps = [ - ":ArithmeticDialect", + ":ArithDialect", ":ControlFlowInterfaces", ":Dialect", ":FuncDialect", @@ -2948,7 +2948,7 @@ hdrs = ["include/mlir/Conversion/ShapeToStandard/ShapeToStandard.h"], includes = ["include"], deps = [ - ":ArithmeticDialect", + ":ArithDialect", ":ControlFlowDialect", ":ConversionPassIncGen", ":FuncDialect", @@ -2992,7 +2992,7 @@ ], includes = ["include"], deps = [ - ":ArithmeticDialect", + ":ArithDialect", ":BufferizationDialect", ":BufferizationTransforms", ":FuncDialect", @@ -3072,7 +3072,7 @@ ]), includes = ["include"], deps = [ - ":ArithmeticDialect", + ":ArithDialect", ":CommonFolders", ":ControlFlowInterfaces", ":ControlFlowOpsIncGen", @@ -3098,7 +3098,7 @@ ]) + ["include/mlir/Transforms/InliningUtils.h"], includes = ["include"], deps = [ - ":ArithmeticDialect", + ":ArithDialect", ":CallOpInterfaces", ":CastOpInterfaces", ":CommonFolders", @@ -3165,8 +3165,8 @@ ]), includes = ["include"], deps = [ - ":ArithmeticDialect", - ":ArithmeticUtils", + ":ArithDialect", + ":ArithUtils", ":ControlFlowInterfaces", ":DialectUtils", ":IR", @@ -3213,8 +3213,8 @@ includes = ["include"], deps = [ ":AffineDialect", - ":ArithmeticDialect", - ":ArithmeticUtils", + ":ArithDialect", + ":ArithUtils", ":BufferizationDialect", ":BufferizationTransforms", ":DialectUtils", @@ -3249,7 +3249,7 @@ deps = [ ":AffineAnalysis", ":AffineDialect", - ":ArithmeticDialect", + ":ArithDialect", ":FuncDialect", ":IR", ":MemRefDialect", @@ -3650,7 +3650,7 @@ hdrs = glob(["include/mlir/Dialect/GPU/IR/*.h"]), includes = ["include"], deps = [ - ":ArithmeticDialect", + ":ArithDialect", ":DLTIDialect", ":GPUBaseIncGen", ":GPUOpsIncGen", @@ -3707,7 +3707,7 @@ defines = if_cuda_available(["MLIR_GPU_TO_CUBIN_PASS_ENABLE"]), includes = ["include"], deps = [ - ":ArithmeticDialect", + ":ArithDialect", ":AsmParser", ":AsyncDialect", ":ControlFlowDialect", @@ -3806,8 +3806,8 @@ ]), includes = ["include"], deps = [ - ":ArithmeticDialect", - ":ArithmeticToLLVM", + ":ArithDialect", + ":ArithToLLVM", ":ControlFlowDialect", ":ControlFlowToLLVM", ":ConversionPassIncGen", @@ -3927,7 +3927,7 @@ includes = ["include"], deps = [ ":AMDGPUToROCDL", - ":ArithmeticToLLVM", + ":ArithToLLVM", ":ControlFlowToLLVM", ":ConversionPassIncGen", ":FuncDialect", @@ -3980,7 +3980,7 @@ hdrs = ["include/mlir/Conversion/GPUCommon/GPUCommonPass.h"], includes = ["include"], deps = [ - ":ArithmeticToLLVM", + ":ArithToLLVM", ":AsyncDialect", ":AsyncToLLVM", ":ControlFlowToLLVM", @@ -4014,7 +4014,7 @@ "lib/Conversions/GPUToSPIRV", ], deps = [ - ":ArithmeticToSPIRV", + ":ArithToSPIRV", ":ConversionPassIncGen", ":FuncToSPIRV", ":GPUDialect", @@ -4062,7 +4062,7 @@ ]), includes = ["include"], deps = [ - ":ArithmeticToLLVM", + ":ArithToLLVM", ":ConversionPassIncGen", ":FuncDialect", ":FuncToLLVM", @@ -4812,7 +4812,7 @@ "lib/Conversion/TensorToLinalg", ], deps = [ - ":ArithmeticDialect", + ":ArithDialect", ":ConversionPassIncGen", ":FuncDialect", ":IR", @@ -4841,7 +4841,7 @@ "lib/Conversion/TensorToSPIRV", ], deps = [ - ":ArithmeticToSPIRV", + ":ArithToSPIRV", ":ControlFlowToSPIRV", ":ConversionPassIncGen", ":FuncDialect", @@ -5011,8 +5011,8 @@ hdrs = ["include/mlir/Dialect/Tensor/IR/Tensor.h"], includes = ["include"], deps = [ - ":ArithmeticDialect", - ":ArithmeticUtils", + ":ArithDialect", + ":ArithUtils", ":CastOpInterfaces", ":ComplexDialect", ":ControlFlowInterfaces", @@ -5050,7 +5050,7 @@ includes = ["include"], deps = [ ":AffineDialect", - ":ArithmeticUtils", + ":ArithUtils", ":IR", ":LinalgDialect", ":SCFDialect", @@ -5067,7 +5067,7 @@ includes = ["include"], deps = [ ":AffineDialect", - ":ArithmeticDialect", + ":ArithDialect", ":TensorDialect", "//llvm:Support", ], @@ -5108,8 +5108,8 @@ deps = [ ":AffineDialect", ":AffineUtils", - ":ArithmeticDialect", - ":ArithmeticUtils", + ":ArithDialect", + ":ArithUtils", ":BufferizationDialect", ":BufferizationTransforms", ":DialectUtils", @@ -5436,7 +5436,7 @@ deps = [ ":AffineDialect", ":AffineToStandard", - ":ArithmeticDialect", + ":ArithDialect", ":ComplexDialect", ":ConversionPassIncGen", ":FuncDialect", @@ -5465,7 +5465,7 @@ includes = ["include"], deps = [ ":AffineDialect", - ":ArithmeticToSPIRV", + ":ArithToSPIRV", ":ConversionPassIncGen", ":FuncDialect", ":FuncToSPIRV", @@ -5492,7 +5492,7 @@ deps = [ ":AffineAnalysis", ":Analysis", - ":ArithmeticDialect", + ":ArithDialect", ":ConversionPassIncGen", ":FuncDialect", ":IR", @@ -5514,7 +5514,7 @@ hdrs = ["include/mlir/Conversion/SCFToControlFlow/SCFToControlFlow.h"], includes = ["include"], deps = [ - ":ArithmeticDialect", + ":ArithDialect", ":ControlFlowDialect", ":ConversionPassIncGen", ":FuncDialect", @@ -5569,7 +5569,7 @@ includes = ["include"], deps = [ ":Analysis", - ":ArithmeticToLLVM", + ":ArithToLLVM", ":ControlFlowToLLVM", ":ConversionPassIncGen", ":DataLayoutInterfaces", @@ -5602,7 +5602,7 @@ includes = ["include"], deps = [ ":Analysis", - ":ArithmeticToLLVM", + ":ArithToLLVM", ":ControlFlowDialect", ":ConversionPassIncGen", ":DataLayoutInterfaces", @@ -5649,7 +5649,7 @@ includes = ["include"], deps = [ ":Analysis", - ":ArithmeticDialect", + ":ArithDialect", ":ConversionPassIncGen", ":DataLayoutInterfaces", ":FuncDialect", @@ -5692,13 +5692,13 @@ ) 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( - 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 @@ hdrs = glob(["include/mlir/Conversion/MathToFuncs/*.h"]), includes = ["include"], deps = [ - ":ArithmeticDialect", + ":ArithDialect", ":ControlFlowDialect", ":ConversionPassIncGen", ":DialectUtils", @@ -5957,7 +5957,7 @@ ), includes = ["include"], deps = [ - ":ArithmeticDialect", + ":ArithDialect", ":CallOpInterfaces", ":ControlFlowInterfaces", ":DataLayoutInterfaces", @@ -6325,10 +6325,10 @@ ":AffinePassIncGen", ":AffineToStandard", ":AffineTransforms", - ":ArithmeticDialect", - ":ArithmeticToLLVM", - ":ArithmeticToSPIRV", - ":ArithmeticTransforms", + ":ArithDialect", + ":ArithToLLVM", + ":ArithToSPIRV", + ":ArithTransforms", ":ArmNeonDialect", ":ArmSVEDialect", ":ArmSVETransforms", @@ -6466,7 +6466,7 @@ "//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 @@ name = "mlir-vulkan-runner", srcs = ["tools/mlir-vulkan-runner/mlir-vulkan-runner.cpp"], deps = [ - ":ArithmeticDialect", + ":ArithDialect", ":ExecutionEngineUtils", ":FuncDialect", ":FuncToLLVM", @@ -6737,7 +6737,7 @@ 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 @@ ]), includes = ["include"], deps = [ - ":ArithmeticDialect", + ":ArithDialect", ":ConversionPassIncGen", ":FuncDialect", ":IR", @@ -7137,7 +7137,7 @@ ]), includes = ["include"], deps = [ - ":ArithmeticToLLVM", + ":ArithToLLVM", ":ControlFlowToLLVM", ":ConversionPassIncGen", ":FuncDialect", @@ -7216,7 +7216,7 @@ ], includes = ["include"], deps = [ - ":ArithmeticDialect", + ":ArithDialect", ":FuncDialect", ":IR", ":InferTypeOpInterface", @@ -7562,8 +7562,8 @@ includes = ["include"], deps = [ ":AffineDialect", - ":ArithmeticDialect", - ":ArithmeticUtils", + ":ArithDialect", + ":ArithUtils", ":AsmParser", ":BufferizationDialect", ":ComplexDialect", @@ -7603,7 +7603,7 @@ includes = ["include"], deps = [ ":AffineDialect", - ":ArithmeticDialect", + ":ArithDialect", ":AsmParser", ":ControlFlowDialect", ":GPUDialect", @@ -7685,8 +7685,8 @@ ":AffineDialect", ":AffineUtils", ":Analysis", - ":ArithmeticDialect", - ":ArithmeticUtils", + ":ArithDialect", + ":ArithUtils", ":DialectUtils", ":FuncDialect", ":IR", @@ -7718,9 +7718,9 @@ ":AffineDialect", ":AffineUtils", ":Analysis", - ":ArithmeticDialect", - ":ArithmeticTransforms", - ":ArithmeticUtils", + ":ArithDialect", + ":ArithTransforms", + ":ArithUtils", ":BufferizationDialect", ":BufferizationTransforms", ":ComplexDialect", @@ -7852,8 +7852,8 @@ deps = [ ":AMXDialect", ":AMXTransforms", - ":ArithmeticDialect", - ":ArithmeticUtils", + ":ArithDialect", + ":ArithUtils", ":ArmNeonDialect", ":ArmSVEDialect", ":ArmSVETransforms", @@ -7890,7 +7890,7 @@ deps = [ ":AffineDialect", ":Analysis", - ":ArithmeticDialect", + ":ArithDialect", ":ConversionPassIncGen", ":DialectUtils", ":FuncDialect", @@ -7925,7 +7925,7 @@ deps = [ ":AffineDialect", ":AffineUtils", - ":ArithmeticDialect", + ":ArithDialect", ":ConversionPassIncGen", ":FuncDialect", ":FuncToLLVM", @@ -8043,7 +8043,7 @@ includes = ["include"], deps = [ ":Analysis", - ":ArithmeticDialect", + ":ArithDialect", ":Dialect", ":DialectUtils", ":FuncDialect", @@ -8075,7 +8075,7 @@ "lib/Conversion/TosaToArith", ], deps = [ - ":ArithmeticDialect", + ":ArithDialect", ":ConversionPassIncGen", ":FuncDialect", ":IR", @@ -8099,7 +8099,7 @@ "lib/Conversion/TosaToLinalg", ], deps = [ - ":ArithmeticDialect", + ":ArithDialect", ":ConversionPassIncGen", ":DialectUtils", ":FuncDialect", @@ -8154,7 +8154,7 @@ "lib/Conversion/TosaToTensor", ], deps = [ - ":ArithmeticDialect", + ":ArithDialect", ":ConversionPassIncGen", ":FuncDialect", ":IR", @@ -8407,7 +8407,7 @@ hdrs = ["include/mlir/Dialect/Complex/IR/Complex.h"], includes = ["include"], deps = [ - ":ArithmeticDialect", + ":ArithDialect", ":ComplexAttributesIncGen", ":ComplexBaseIncGen", ":ComplexOpsIncGen", @@ -8429,7 +8429,7 @@ ]), includes = ["include"], deps = [ - ":ArithmeticDialect", + ":ArithDialect", ":ComplexDialect", ":ConversionPassIncGen", ":FuncDialect", @@ -8479,7 +8479,7 @@ ]), includes = ["include"], deps = [ - ":ArithmeticDialect", + ":ArithDialect", ":ComplexDialect", ":ConversionPassIncGen", ":FuncDialect", @@ -8498,10 +8498,10 @@ ]) 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 @@ ) gentbl_cc_library( - name = "ArithmeticBaseIncGen", + name = "ArithBaseIncGen", strip_include_prefix = "include", tbl_outs = [ ( @@ -8524,84 +8524,84 @@ "-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 @@ ) 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( - 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 @@ ], includes = ["include"], deps = [ - ":ArithmeticDialect", + ":ArithDialect", ":CommonFolders", ":IR", ":InferTypeOpInterface", @@ -8764,7 +8764,7 @@ hdrs = glob(["include/mlir/Dialect/Math/Transforms/*.h"]), includes = ["include"], deps = [ - ":ArithmeticDialect", + ":ArithDialect", ":DialectUtils", ":FuncDialect", ":IR", @@ -8789,7 +8789,7 @@ ]), includes = ["include"], deps = [ - ":ArithmeticDialect", + ":ArithDialect", ":ConversionPassIncGen", ":DialectUtils", ":FuncDialect", @@ -8814,7 +8814,7 @@ ], includes = ["include"], deps = [ - ":ArithmeticOpsTdFiles", + ":ArithOpsTdFiles", ":CastInterfacesTdFiles", ":ControlFlowInterfacesTdFiles", ":CopyOpInterfaceTdFiles", @@ -8881,8 +8881,8 @@ ], includes = ["include"], deps = [ - ":ArithmeticDialect", - ":ArithmeticUtils", + ":ArithDialect", + ":ArithUtils", ":ControlFlowInterfaces", ":CopyOpInterface", ":DialectUtils", @@ -8925,9 +8925,9 @@ deps = [ ":AffineDialect", ":AffineUtils", - ":ArithmeticDialect", - ":ArithmeticTransforms", - ":ArithmeticUtils", + ":ArithDialect", + ":ArithTransforms", + ":ArithUtils", ":DialectUtils", ":FuncDialect", ":IR", @@ -8982,7 +8982,7 @@ includes = ["include"], deps = [ ":AffineDialect", - ":ArithmeticDialect", + ":ArithDialect", ":IR", ":MemRefDialect", ":MemRefTransformOpsIncGen", @@ -9272,7 +9272,7 @@ deps = [ ":AffineDialect", ":AllocationOpInterface", - ":ArithmeticDialect", + ":ArithDialect", ":BufferizableOpInterfaceIncGen", ":BufferizationBaseIncGen", ":BufferizationOpsIncGen", @@ -9319,7 +9319,7 @@ deps = [ ":AllocationOpInterface", ":Analysis", - ":ArithmeticDialect", + ":ArithDialect", ":BufferizationDialect", ":BufferizationPassIncGen", ":ControlFlowInterfaces", @@ -9345,7 +9345,7 @@ ], 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 --- 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 @@ "//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 --- 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 @@ "//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 --- 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 @@ "//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 --- a/utils/bazel/llvm-project-overlay/mlir/python/BUILD.bazel +++ b/utils/bazel/llvm-project-overlay/mlir/python/BUILD.bazel @@ -197,23 +197,23 @@ ) ##---------------------------------------------------------------------------## -# 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 @@ ), ], 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 --- a/utils/bazel/llvm-project-overlay/mlir/test/BUILD.bazel +++ b/utils/bazel/llvm-project-overlay/mlir/test/BUILD.bazel @@ -304,7 +304,7 @@ ":TestOpsIncGen", ":TestTypeDefsIncGen", "//llvm:Support", - "//mlir:ArithmeticDialect", + "//mlir:ArithDialect", "//mlir:ControlFlowInterfaces", "//mlir:CopyOpInterface", "//mlir:DLTIDialect", @@ -337,7 +337,7 @@ ":TestDialect", "//llvm:Support", "//mlir:Analysis", - "//mlir:ArithmeticDialect", + "//mlir:ArithDialect", "//mlir:FuncDialect", "//mlir:IR", "//mlir:LinalgDialect", @@ -353,7 +353,7 @@ deps = [ "//llvm:Support", "//mlir:AffineDialect", - "//mlir:ArithmeticDialect", + "//mlir:ArithDialect", "//mlir:FuncDialect", "//mlir:IR", "//mlir:LinalgDialect", @@ -419,7 +419,7 @@ "//mlir:AffineAnalysis", "//mlir:AffineDialect", "//mlir:Analysis", - "//mlir:ArithmeticDialect", + "//mlir:ArithDialect", "//mlir:FuncDialect", "//mlir:IR", "//mlir:MathDialect", @@ -493,7 +493,7 @@ "//llvm:NVPTXCodeGen", "//llvm:Support", "//mlir:AffineDialect", - "//mlir:ArithmeticDialect", + "//mlir:ArithDialect", "//mlir:FuncDialect", "//mlir:GPUDialect", "//mlir:GPUTransforms", @@ -517,8 +517,8 @@ deps = [ "//llvm:Support", "//mlir:AffineDialect", - "//mlir:ArithmeticDialect", - "//mlir:ArithmeticTransforms", + "//mlir:ArithDialect", + "//mlir:ArithTransforms", "//mlir:BufferizationDialect", "//mlir:BufferizationTransforms", "//mlir:FuncDialect", @@ -550,7 +550,7 @@ defines = ["MLIR_CUDA_CONVERSIONS_ENABLED"], includes = ["lib/Dialect/Test"], deps = [ - "//mlir:ArithmeticDialect", + "//mlir:ArithDialect", "//mlir:MathDialect", "//mlir:MathTransforms", "//mlir:Pass", @@ -607,7 +607,7 @@ includes = ["lib/Dialect/Test"], deps = [ "//llvm:Support", - "//mlir:ArithmeticDialect", + "//mlir:ArithDialect", "//mlir:FuncDialect", "//mlir:IR", "//mlir:MathDialect", @@ -621,13 +621,13 @@ ) 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 @@ 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 --- a/utils/bazel/llvm-project-overlay/mlir/unittests/BUILD.bazel +++ b/utils/bazel/llvm-project-overlay/mlir/unittests/BUILD.bazel @@ -315,7 +315,7 @@ ]), deps = [ "//llvm:gtest_main", - "//mlir:ArithmeticDialect", + "//mlir:ArithDialect", "//mlir:PDLToPDLInterp", ], )