diff options
96 files changed, 128 insertions, 128 deletions
diff --git a/mlir/examples/Linalg/Linalg1/include/linalg1/Common.h b/mlir/examples/Linalg/Linalg1/include/linalg1/Common.h index 5501158eaab..29ff9bd2d3e 100644 --- a/mlir/examples/Linalg/Linalg1/include/linalg1/Common.h +++ b/mlir/examples/Linalg/Linalg1/include/linalg1/Common.h @@ -21,6 +21,7 @@ #include "mlir/AffineOps/AffineOps.h" #include "mlir/Analysis/SliceAnalysis.h" #include "mlir/Analysis/Verifier.h" +#include "mlir/Dialect/StandardOps/Ops.h" #include "mlir/EDSC/Builders.h" #include "mlir/EDSC/Helpers.h" #include "mlir/EDSC/Intrinsics.h" @@ -35,7 +36,6 @@ #include "mlir/IR/Types.h" #include "mlir/Pass/Pass.h" #include "mlir/Pass/PassManager.h" -#include "mlir/StandardOps/Ops.h" #include "mlir/Support/LogicalResult.h" #include "mlir/Transforms/LoopUtils.h" #include "mlir/Transforms/Passes.h" diff --git a/mlir/examples/Linalg/Linalg1/include/linalg1/LLVMIntrinsics.h b/mlir/examples/Linalg/Linalg1/include/linalg1/LLVMIntrinsics.h index 577981b85ed..fbab091f51b 100644 --- a/mlir/examples/Linalg/Linalg1/include/linalg1/LLVMIntrinsics.h +++ b/mlir/examples/Linalg/Linalg1/include/linalg1/LLVMIntrinsics.h @@ -18,9 +18,9 @@ #ifndef LINALG1_LLVMINTRINSICS_H_ #define LINALG1_LLVMINTRINSICS_H_ +#include "mlir/Dialect/LLVMIR/LLVMDialect.h" #include "mlir/EDSC/Builders.h" #include "mlir/EDSC/Intrinsics.h" -#include "mlir/LLVMIR/LLVMDialect.h" // Expose some LLVM IR instructions to declarative builders. namespace intrinsics { diff --git a/mlir/examples/Linalg/Linalg1/lib/Common.cpp b/mlir/examples/Linalg/Linalg1/lib/Common.cpp index 9ce661364d3..da96a57063b 100644 --- a/mlir/examples/Linalg/Linalg1/lib/Common.cpp +++ b/mlir/examples/Linalg/Linalg1/lib/Common.cpp @@ -23,8 +23,8 @@ #include "linalg1/Common.h" #include "linalg1/Ops.h" #include "linalg1/Types.h" +#include "mlir/Dialect/StandardOps/Ops.h" #include "mlir/EDSC/Intrinsics.h" -#include "mlir/StandardOps/Ops.h" using llvm::ArrayRef; using mlir::ConstantIndexOp; diff --git a/mlir/examples/Linalg/Linalg1/lib/ConvertToLLVMDialect.cpp b/mlir/examples/Linalg/Linalg1/lib/ConvertToLLVMDialect.cpp index ec7e0fe99a7..9073169b260 100644 --- a/mlir/examples/Linalg/Linalg1/lib/ConvertToLLVMDialect.cpp +++ b/mlir/examples/Linalg/Linalg1/lib/ConvertToLLVMDialect.cpp @@ -18,6 +18,7 @@ #include "mlir/Conversion/ControlFlowToCFG/ConvertControlFlowToCFG.h" #include "mlir/Conversion/StandardToLLVM/ConvertStandardToLLVM.h" #include "mlir/Conversion/StandardToLLVM/ConvertStandardToLLVMPass.h" +#include "mlir/Dialect/LLVMIR/LLVMDialect.h" #include "mlir/EDSC/Builders.h" #include "mlir/EDSC/Intrinsics.h" #include "mlir/IR/Attributes.h" @@ -28,7 +29,6 @@ #include "mlir/IR/PatternMatch.h" #include "mlir/IR/StandardTypes.h" #include "mlir/IR/Types.h" -#include "mlir/LLVMIR/LLVMDialect.h" #include "mlir/Pass/Pass.h" #include "mlir/Pass/PassManager.h" #include "mlir/Support/LogicalResult.h" diff --git a/mlir/examples/Linalg/Linalg3/lib/ConvertToLLVMDialect.cpp b/mlir/examples/Linalg/Linalg3/lib/ConvertToLLVMDialect.cpp index 8de1ad6386c..ea3f700e733 100644 --- a/mlir/examples/Linalg/Linalg3/lib/ConvertToLLVMDialect.cpp +++ b/mlir/examples/Linalg/Linalg3/lib/ConvertToLLVMDialect.cpp @@ -18,6 +18,7 @@ #include "mlir/Conversion/ControlFlowToCFG/ConvertControlFlowToCFG.h" #include "mlir/Conversion/StandardToLLVM/ConvertStandardToLLVM.h" #include "mlir/Conversion/StandardToLLVM/ConvertStandardToLLVMPass.h" +#include "mlir/Dialect/LLVMIR/LLVMDialect.h" #include "mlir/EDSC/Builders.h" #include "mlir/EDSC/Intrinsics.h" #include "mlir/IR/Attributes.h" @@ -28,7 +29,6 @@ #include "mlir/IR/PatternMatch.h" #include "mlir/IR/StandardTypes.h" #include "mlir/IR/Types.h" -#include "mlir/LLVMIR/LLVMDialect.h" #include "mlir/Transforms/DialectConversion.h" #include "mlir/Transforms/LowerAffine.h" diff --git a/mlir/examples/toy/Ch2/mlir/MLIRGen.cpp b/mlir/examples/toy/Ch2/mlir/MLIRGen.cpp index c09c4ad679c..82e2bfa4c68 100644 --- a/mlir/examples/toy/Ch2/mlir/MLIRGen.cpp +++ b/mlir/examples/toy/Ch2/mlir/MLIRGen.cpp @@ -24,6 +24,7 @@ #include "toy/AST.h" #include "mlir/Analysis/Verifier.h" +#include "mlir/Dialect/StandardOps/Ops.h" #include "mlir/IR/Attributes.h" #include "mlir/IR/Builders.h" #include "mlir/IR/Function.h" @@ -32,7 +33,6 @@ #include "mlir/IR/Module.h" #include "mlir/IR/StandardTypes.h" #include "mlir/IR/Types.h" -#include "mlir/StandardOps/Ops.h" #include "llvm/ADT/STLExtras.h" #include "llvm/ADT/ScopedHashTable.h" diff --git a/mlir/examples/toy/Ch3/mlir/MLIRGen.cpp b/mlir/examples/toy/Ch3/mlir/MLIRGen.cpp index b3ba2f9281c..572f0eeb2ae 100644 --- a/mlir/examples/toy/Ch3/mlir/MLIRGen.cpp +++ b/mlir/examples/toy/Ch3/mlir/MLIRGen.cpp @@ -25,6 +25,7 @@ #include "toy/Dialect.h" #include "mlir/Analysis/Verifier.h" +#include "mlir/Dialect/StandardOps/Ops.h" #include "mlir/IR/Attributes.h" #include "mlir/IR/Builders.h" #include "mlir/IR/Function.h" @@ -33,7 +34,6 @@ #include "mlir/IR/Module.h" #include "mlir/IR/StandardTypes.h" #include "mlir/IR/Types.h" -#include "mlir/StandardOps/Ops.h" #include "llvm/ADT/STLExtras.h" #include "llvm/ADT/ScopedHashTable.h" diff --git a/mlir/examples/toy/Ch4/mlir/MLIRGen.cpp b/mlir/examples/toy/Ch4/mlir/MLIRGen.cpp index fd385a47004..bd0ad01e7e3 100644 --- a/mlir/examples/toy/Ch4/mlir/MLIRGen.cpp +++ b/mlir/examples/toy/Ch4/mlir/MLIRGen.cpp @@ -25,6 +25,7 @@ #include "toy/Dialect.h" #include "mlir/Analysis/Verifier.h" +#include "mlir/Dialect/StandardOps/Ops.h" #include "mlir/IR/Attributes.h" #include "mlir/IR/Builders.h" #include "mlir/IR/Function.h" @@ -33,7 +34,6 @@ #include "mlir/IR/Module.h" #include "mlir/IR/StandardTypes.h" #include "mlir/IR/Types.h" -#include "mlir/StandardOps/Ops.h" #include "llvm/ADT/STLExtras.h" #include "llvm/ADT/ScopedHashTable.h" diff --git a/mlir/examples/toy/Ch4/mlir/ShapeInferencePass.cpp b/mlir/examples/toy/Ch4/mlir/ShapeInferencePass.cpp index 793f153291e..6c0d8dfb1df 100644 --- a/mlir/examples/toy/Ch4/mlir/ShapeInferencePass.cpp +++ b/mlir/examples/toy/Ch4/mlir/ShapeInferencePass.cpp @@ -23,11 +23,11 @@ #include "toy/Dialect.h" #include "mlir/Analysis/Verifier.h" +#include "mlir/Dialect/StandardOps/Ops.h" #include "mlir/IR/BlockAndValueMapping.h" #include "mlir/IR/Builders.h" #include "mlir/IR/StandardTypes.h" #include "mlir/Pass/Pass.h" -#include "mlir/StandardOps/Ops.h" #include "mlir/Support/LogicalResult.h" #include "mlir/Support/STLExtras.h" #include "llvm/ADT/DenseSet.h" diff --git a/mlir/examples/toy/Ch5/mlir/EarlyLowering.cpp b/mlir/examples/toy/Ch5/mlir/EarlyLowering.cpp index c55a0dbd949..13832f0dae0 100644 --- a/mlir/examples/toy/Ch5/mlir/EarlyLowering.cpp +++ b/mlir/examples/toy/Ch5/mlir/EarlyLowering.cpp @@ -31,13 +31,13 @@ #include "linalg1/Intrinsics.h" #include "linalg1/ViewOp.h" #include "linalg3/TensorOps.h" +#include "mlir/Dialect/LLVMIR/LLVMDialect.h" #include "mlir/EDSC/Builders.h" #include "mlir/EDSC/Helpers.h" #include "mlir/EDSC/Intrinsics.h" #include "mlir/IR/Builders.h" #include "mlir/IR/OperationSupport.h" #include "mlir/IR/StandardTypes.h" -#include "mlir/LLVMIR/LLVMDialect.h" #include "mlir/Parser.h" #include "mlir/Pass/Pass.h" #include "mlir/Transforms/DialectConversion.h" diff --git a/mlir/examples/toy/Ch5/mlir/LateLowering.cpp b/mlir/examples/toy/Ch5/mlir/LateLowering.cpp index 8146e763303..cbcf1491c19 100644 --- a/mlir/examples/toy/Ch5/mlir/LateLowering.cpp +++ b/mlir/examples/toy/Ch5/mlir/LateLowering.cpp @@ -30,13 +30,13 @@ #include "linalg3/ConvertToLLVMDialect.h" #include "linalg3/TensorOps.h" #include "linalg3/Transforms.h" +#include "mlir/Dialect/LLVMIR/LLVMDialect.h" #include "mlir/EDSC/Builders.h" #include "mlir/EDSC/Helpers.h" #include "mlir/EDSC/Intrinsics.h" #include "mlir/IR/Builders.h" #include "mlir/IR/OperationSupport.h" #include "mlir/IR/StandardTypes.h" -#include "mlir/LLVMIR/LLVMDialect.h" #include "mlir/Parser.h" #include "mlir/Pass/Pass.h" #include "mlir/Transforms/DialectConversion.h" diff --git a/mlir/examples/toy/Ch5/mlir/MLIRGen.cpp b/mlir/examples/toy/Ch5/mlir/MLIRGen.cpp index 88fb95048da..eba2933bd0b 100644 --- a/mlir/examples/toy/Ch5/mlir/MLIRGen.cpp +++ b/mlir/examples/toy/Ch5/mlir/MLIRGen.cpp @@ -25,6 +25,7 @@ #include "toy/Dialect.h" #include "mlir/Analysis/Verifier.h" +#include "mlir/Dialect/StandardOps/Ops.h" #include "mlir/IR/Attributes.h" #include "mlir/IR/Builders.h" #include "mlir/IR/Function.h" @@ -33,7 +34,6 @@ #include "mlir/IR/Module.h" #include "mlir/IR/StandardTypes.h" #include "mlir/IR/Types.h" -#include "mlir/StandardOps/Ops.h" #include "llvm/ADT/STLExtras.h" #include "llvm/ADT/ScopedHashTable.h" diff --git a/mlir/examples/toy/Ch5/mlir/ShapeInferencePass.cpp b/mlir/examples/toy/Ch5/mlir/ShapeInferencePass.cpp index b6808d713eb..057c7ec1a27 100644 --- a/mlir/examples/toy/Ch5/mlir/ShapeInferencePass.cpp +++ b/mlir/examples/toy/Ch5/mlir/ShapeInferencePass.cpp @@ -23,11 +23,11 @@ #include "toy/Dialect.h" #include "mlir/Analysis/Verifier.h" +#include "mlir/Dialect/StandardOps/Ops.h" #include "mlir/IR/BlockAndValueMapping.h" #include "mlir/IR/Builders.h" #include "mlir/IR/StandardTypes.h" #include "mlir/Pass/Pass.h" -#include "mlir/StandardOps/Ops.h" #include "mlir/Support/LogicalResult.h" #include "llvm/ADT/DenseSet.h" #include "llvm/ADT/STLExtras.h" diff --git a/mlir/include/mlir/CMakeLists.txt b/mlir/include/mlir/CMakeLists.txt index 202b40b7b2c..fc690a05910 100644 --- a/mlir/include/mlir/CMakeLists.txt +++ b/mlir/include/mlir/CMakeLists.txt @@ -2,6 +2,4 @@ add_subdirectory(AffineOps) add_subdirectory(Dialect) add_subdirectory(EDSC) add_subdirectory(Linalg) -add_subdirectory(LLVMIR) -add_subdirectory(StandardOps) add_subdirectory(VectorOps) diff --git a/mlir/include/mlir/Dialect/CMakeLists.txt b/mlir/include/mlir/Dialect/CMakeLists.txt index 5ae314a9984..128c04d867a 100644 --- a/mlir/include/mlir/Dialect/CMakeLists.txt +++ b/mlir/include/mlir/Dialect/CMakeLists.txt @@ -1,5 +1,7 @@ add_subdirectory(FxpMathOps) add_subdirectory(GPU) +add_subdirectory(LLVMIR) add_subdirectory(LoopOps) add_subdirectory(QuantOps) add_subdirectory(SPIRV) +add_subdirectory(StandardOps) diff --git a/mlir/include/mlir/LLVMIR/CMakeLists.txt b/mlir/include/mlir/Dialect/LLVMIR/CMakeLists.txt index 1d7d06bc25c..1d7d06bc25c 100644 --- a/mlir/include/mlir/LLVMIR/CMakeLists.txt +++ b/mlir/include/mlir/Dialect/LLVMIR/CMakeLists.txt diff --git a/mlir/include/mlir/LLVMIR/LLVMDialect.h b/mlir/include/mlir/Dialect/LLVMIR/LLVMDialect.h index 00f5be4d8d6..7318c006692 100644 --- a/mlir/include/mlir/LLVMIR/LLVMDialect.h +++ b/mlir/include/mlir/Dialect/LLVMIR/LLVMDialect.h @@ -20,8 +20,8 @@ // //===----------------------------------------------------------------------===// -#ifndef MLIR_TARGET_LLVMDIALECT_H_ -#define MLIR_TARGET_LLVMDIALECT_H_ +#ifndef MLIR_DIALECT_LLVMIR_LLVMDIALECT_H_ +#define MLIR_DIALECT_LLVMIR_LLVMDIALECT_H_ #include "mlir/IR/Dialect.h" #include "mlir/IR/Function.h" @@ -34,7 +34,7 @@ #include "llvm/IR/Module.h" #include "llvm/IR/Type.h" -#include "mlir/LLVMIR/LLVMOpsEnums.h.inc" +#include "mlir/Dialect/LLVMIR/LLVMOpsEnums.h.inc" namespace llvm { class Type; @@ -145,7 +145,7 @@ private: ///// Ops ///// #define GET_OP_CLASSES -#include "mlir/LLVMIR/LLVMOps.h.inc" +#include "mlir/Dialect/LLVMIR/LLVMOps.h.inc" class LLVMDialect : public Dialect { public: @@ -177,4 +177,4 @@ private: } // end namespace LLVM } // end namespace mlir -#endif // MLIR_TARGET_LLVMDIALECT_H_ +#endif // MLIR_DIALECT_LLVMIR_LLVMDIALECT_H_ diff --git a/mlir/include/mlir/LLVMIR/LLVMOpBase.td b/mlir/include/mlir/Dialect/LLVMIR/LLVMOpBase.td index a68cdbf3da0..a68cdbf3da0 100644 --- a/mlir/include/mlir/LLVMIR/LLVMOpBase.td +++ b/mlir/include/mlir/Dialect/LLVMIR/LLVMOpBase.td diff --git a/mlir/include/mlir/LLVMIR/LLVMOps.td b/mlir/include/mlir/Dialect/LLVMIR/LLVMOps.td index cf456614442..be96d855174 100644 --- a/mlir/include/mlir/LLVMIR/LLVMOps.td +++ b/mlir/include/mlir/Dialect/LLVMIR/LLVMOps.td @@ -23,7 +23,7 @@ #else #define LLVMIR_OPS -include "mlir/LLVMIR/LLVMOpBase.td" +include "mlir/Dialect/LLVMIR/LLVMOpBase.td" // Base class for LLVM operations. All operations get an "llvm." prefix in // their name automatically. LLVM operations have either zero or one result, diff --git a/mlir/include/mlir/LLVMIR/NVVMDialect.h b/mlir/include/mlir/Dialect/LLVMIR/NVVMDialect.h index 206f86871c7..4c39794557b 100644 --- a/mlir/include/mlir/LLVMIR/NVVMDialect.h +++ b/mlir/include/mlir/Dialect/LLVMIR/NVVMDialect.h @@ -20,8 +20,8 @@ // //===----------------------------------------------------------------------===// -#ifndef MLIR_LLVMIR_NVVMDIALECT_H_ -#define MLIR_LLVMIR_NVVMDIALECT_H_ +#ifndef MLIR_DIALECT_LLVMIR_NVVMDIALECT_H_ +#define MLIR_DIALECT_LLVMIR_NVVMDIALECT_H_ #include "mlir/IR/Dialect.h" #include "mlir/IR/OpDefinition.h" @@ -30,7 +30,7 @@ namespace NVVM { ///// Ops ///// #define GET_OP_CLASSES -#include "mlir/LLVMIR/NVVMOps.h.inc" +#include "mlir/Dialect/LLVMIR/NVVMOps.h.inc" class NVVMDialect : public Dialect { public: @@ -40,4 +40,4 @@ public: } // namespace NVVM } // namespace mlir -#endif /* MLIR_LLVMIR_NVVMDIALECT_H_ */ +#endif /* MLIR_DIALECT_LLVMIR_NVVMDIALECT_H_ */ diff --git a/mlir/include/mlir/LLVMIR/NVVMOps.td b/mlir/include/mlir/Dialect/LLVMIR/NVVMOps.td index 18be59988da..72bbb13570a 100644 --- a/mlir/include/mlir/LLVMIR/NVVMOps.td +++ b/mlir/include/mlir/Dialect/LLVMIR/NVVMOps.td @@ -23,7 +23,7 @@ #else #define NVVMIR_OPS -include "mlir/LLVMIR/LLVMOpBase.td" +include "mlir/Dialect/LLVMIR/LLVMOpBase.td" def NVVM_Dialect : Dialect { let name = "nvvm"; diff --git a/mlir/include/mlir/SDBM/SDBM.h b/mlir/include/mlir/Dialect/SDBM/SDBM.h index b1c272372b3..3115805bb5f 100644 --- a/mlir/include/mlir/SDBM/SDBM.h +++ b/mlir/include/mlir/Dialect/SDBM/SDBM.h @@ -20,8 +20,8 @@ // //===----------------------------------------------------------------------===// -#ifndef INCLUDE_MLIR_IR_SDBM_H -#define INCLUDE_MLIR_IR_SDBM_H +#ifndef MLIR_DIALECT_SDBM_SDBM_H +#define MLIR_DIALECT_SDBM_SDBM_H #include "mlir/Support/LLVM.h" #include "llvm/ADT/DenseMap.h" @@ -203,4 +203,4 @@ private: } // namespace mlir -#endif // INCLUDE_MLIR_IR_SDBM_H +#endif // MLIR_DIALECT_SDBM_SDBM_H diff --git a/mlir/include/mlir/SDBM/SDBMDialect.h b/mlir/include/mlir/Dialect/SDBM/SDBMDialect.h index 12086dcd3b4..e3573ba604d 100644 --- a/mlir/include/mlir/SDBM/SDBMDialect.h +++ b/mlir/include/mlir/Dialect/SDBM/SDBMDialect.h @@ -15,8 +15,8 @@ // limitations under the License. // ============================================================================= -#ifndef MLIR_SDBM_SDBMDIALECT_H -#define MLIR_SDBM_SDBMDIALECT_H +#ifndef MLIR_DIALECT_SDBM_SDBMDIALECT_H +#define MLIR_DIALECT_SDBM_SDBMDIALECT_H #include "mlir/IR/Dialect.h" #include "mlir/Support/StorageUniquer.h" @@ -38,4 +38,4 @@ private: }; } // namespace mlir -#endif // MLIR_SDBM_SDBMDIALECT_H +#endif // MLIR_DIALECT_SDBM_SDBMDIALECT_H diff --git a/mlir/include/mlir/SDBM/SDBMExpr.h b/mlir/include/mlir/Dialect/SDBM/SDBMExpr.h index afbeda15fe6..1e695b68f97 100644 --- a/mlir/include/mlir/SDBM/SDBMExpr.h +++ b/mlir/include/mlir/Dialect/SDBM/SDBMExpr.h @@ -21,8 +21,8 @@ // //===----------------------------------------------------------------------===// -#ifndef MLIR_IR_SDBMEXPR_H -#define MLIR_IR_SDBMEXPR_H +#ifndef MLIR_DIALECT_SDBM_SDBMEXPR_H +#define MLIR_DIALECT_SDBM_SDBMEXPR_H #include "mlir/Support/LLVM.h" #include "llvm/ADT/DenseMapInfo.h" @@ -527,4 +527,4 @@ template <> struct DenseMapInfo<mlir::SDBMConstantExpr> { }; } // namespace llvm -#endif // MLIR_IR_SDBMEXPR_H +#endif // MLIR_DIALECT_SDBM_SDBMEXPR_H diff --git a/mlir/include/mlir/StandardOps/CMakeLists.txt b/mlir/include/mlir/Dialect/StandardOps/CMakeLists.txt index 670676f24db..670676f24db 100644 --- a/mlir/include/mlir/StandardOps/CMakeLists.txt +++ b/mlir/include/mlir/Dialect/StandardOps/CMakeLists.txt diff --git a/mlir/include/mlir/StandardOps/Ops.h b/mlir/include/mlir/Dialect/StandardOps/Ops.h index fbd6462938b..3d2f34c40da 100644 --- a/mlir/include/mlir/StandardOps/Ops.h +++ b/mlir/include/mlir/Dialect/StandardOps/Ops.h @@ -20,8 +20,8 @@ // //===----------------------------------------------------------------------===// -#ifndef MLIR_STANDARDOPS_OPS_H -#define MLIR_STANDARDOPS_OPS_H +#ifndef MLIR_DIALECT_STANDARDOPS_OPS_H +#define MLIR_DIALECT_STANDARDOPS_OPS_H #include "mlir/IR/Attributes.h" #include "mlir/IR/Builders.h" @@ -94,7 +94,7 @@ enum class CmpFPredicate { }; #define GET_OP_CLASSES -#include "mlir/StandardOps/Ops.h.inc" +#include "mlir/Dialect/StandardOps/Ops.h.inc" /// This is a refinement of the "constant" op for the case where it is /// returning a float value of FloatType. @@ -360,4 +360,4 @@ ParseResult parseDimAndSymbolList(OpAsmParser *parser, } // end namespace mlir -#endif // MLIR_STANDARDOPS_OPS_H +#endif // MLIR_DIALECT_STANDARDOPS_OPS_H diff --git a/mlir/include/mlir/StandardOps/Ops.td b/mlir/include/mlir/Dialect/StandardOps/Ops.td index b6bf2cfb40b..b6bf2cfb40b 100644 --- a/mlir/include/mlir/StandardOps/Ops.td +++ b/mlir/include/mlir/Dialect/StandardOps/Ops.td diff --git a/mlir/include/mlir/EDSC/Builders.h b/mlir/include/mlir/EDSC/Builders.h index c1df3cfa42e..c4728743f31 100644 --- a/mlir/include/mlir/EDSC/Builders.h +++ b/mlir/include/mlir/EDSC/Builders.h @@ -24,8 +24,8 @@ #define MLIR_EDSC_BUILDERS_H_ #include "mlir/AffineOps/AffineOps.h" +#include "mlir/Dialect/StandardOps/Ops.h" #include "mlir/IR/Builders.h" -#include "mlir/StandardOps/Ops.h" #include "mlir/Transforms/FoldUtils.h" #include "mlir/VectorOps/VectorOps.h" diff --git a/mlir/include/mlir/Transforms/Utils.h b/mlir/include/mlir/Transforms/Utils.h index ff48a902134..c59d76ae047 100644 --- a/mlir/include/mlir/Transforms/Utils.h +++ b/mlir/include/mlir/Transforms/Utils.h @@ -25,8 +25,8 @@ #ifndef MLIR_TRANSFORMS_UTILS_H #define MLIR_TRANSFORMS_UTILS_H +#include "mlir/Dialect/StandardOps/Ops.h" #include "mlir/IR/AffineMap.h" -#include "mlir/StandardOps/Ops.h" #include "llvm/ADT/ArrayRef.h" #include "llvm/ADT/DenseMap.h" diff --git a/mlir/lib/AffineOps/AffineOps.cpp b/mlir/lib/AffineOps/AffineOps.cpp index 51a6ec2aecf..f3af9599b59 100644 --- a/mlir/lib/AffineOps/AffineOps.cpp +++ b/mlir/lib/AffineOps/AffineOps.cpp @@ -16,6 +16,7 @@ // ============================================================================= #include "mlir/AffineOps/AffineOps.h" +#include "mlir/Dialect/StandardOps/Ops.h" #include "mlir/IR/Block.h" #include "mlir/IR/Builders.h" #include "mlir/IR/Function.h" @@ -23,7 +24,6 @@ #include "mlir/IR/Matchers.h" #include "mlir/IR/OpImplementation.h" #include "mlir/IR/PatternMatch.h" -#include "mlir/StandardOps/Ops.h" #include "llvm/ADT/SetVector.h" #include "llvm/ADT/SmallBitVector.h" #include "llvm/Support/Debug.h" diff --git a/mlir/lib/Analysis/AffineAnalysis.cpp b/mlir/lib/Analysis/AffineAnalysis.cpp index 28c4eae941e..e074e5d4405 100644 --- a/mlir/lib/Analysis/AffineAnalysis.cpp +++ b/mlir/lib/Analysis/AffineAnalysis.cpp @@ -24,12 +24,12 @@ #include "mlir/AffineOps/AffineOps.h" #include "mlir/Analysis/AffineStructures.h" #include "mlir/Analysis/Utils.h" +#include "mlir/Dialect/StandardOps/Ops.h" #include "mlir/IR/AffineExprVisitor.h" #include "mlir/IR/Builders.h" #include "mlir/IR/Function.h" #include "mlir/IR/IntegerSet.h" #include "mlir/IR/Operation.h" -#include "mlir/StandardOps/Ops.h" #include "mlir/Support/MathExtras.h" #include "mlir/Support/STLExtras.h" #include "llvm/ADT/DenseMap.h" diff --git a/mlir/lib/Analysis/AffineStructures.cpp b/mlir/lib/Analysis/AffineStructures.cpp index b2b2c6970b9..b1e818ac02c 100644 --- a/mlir/lib/Analysis/AffineStructures.cpp +++ b/mlir/lib/Analysis/AffineStructures.cpp @@ -21,11 +21,11 @@ #include "mlir/Analysis/AffineStructures.h" #include "mlir/AffineOps/AffineOps.h" +#include "mlir/Dialect/StandardOps/Ops.h" #include "mlir/IR/AffineExprVisitor.h" #include "mlir/IR/AffineMap.h" #include "mlir/IR/IntegerSet.h" #include "mlir/IR/Operation.h" -#include "mlir/StandardOps/Ops.h" #include "mlir/Support/MathExtras.h" #include "llvm/ADT/DenseSet.h" #include "llvm/ADT/SmallPtrSet.h" diff --git a/mlir/lib/Analysis/LoopAnalysis.cpp b/mlir/lib/Analysis/LoopAnalysis.cpp index 743907ba39c..79620f95373 100644 --- a/mlir/lib/Analysis/LoopAnalysis.cpp +++ b/mlir/lib/Analysis/LoopAnalysis.cpp @@ -26,10 +26,10 @@ #include "mlir/Analysis/AffineStructures.h" #include "mlir/Analysis/NestedMatcher.h" #include "mlir/Analysis/VectorAnalysis.h" +#include "mlir/Dialect/StandardOps/Ops.h" #include "mlir/IR/AffineMap.h" #include "mlir/IR/Builders.h" #include "mlir/IR/Operation.h" -#include "mlir/StandardOps/Ops.h" #include "mlir/Support/Functional.h" #include "mlir/Support/MathExtras.h" #include "mlir/VectorOps/VectorOps.h" diff --git a/mlir/lib/Analysis/MemRefBoundCheck.cpp b/mlir/lib/Analysis/MemRefBoundCheck.cpp index b043d4734fd..85fe3109f6a 100644 --- a/mlir/lib/Analysis/MemRefBoundCheck.cpp +++ b/mlir/lib/Analysis/MemRefBoundCheck.cpp @@ -25,9 +25,9 @@ #include "mlir/Analysis/AffineStructures.h" #include "mlir/Analysis/Passes.h" #include "mlir/Analysis/Utils.h" +#include "mlir/Dialect/StandardOps/Ops.h" #include "mlir/IR/Builders.h" #include "mlir/Pass/Pass.h" -#include "mlir/StandardOps/Ops.h" #include "llvm/Support/Debug.h" #define DEBUG_TYPE "memref-bound-check" diff --git a/mlir/lib/Analysis/NestedMatcher.cpp b/mlir/lib/Analysis/NestedMatcher.cpp index 18be6cf3bc9..c7c0db90a7b 100644 --- a/mlir/lib/Analysis/NestedMatcher.cpp +++ b/mlir/lib/Analysis/NestedMatcher.cpp @@ -17,7 +17,7 @@ #include "mlir/Analysis/NestedMatcher.h" #include "mlir/AffineOps/AffineOps.h" -#include "mlir/StandardOps/Ops.h" +#include "mlir/Dialect/StandardOps/Ops.h" #include "llvm/ADT/ArrayRef.h" #include "llvm/ADT/STLExtras.h" diff --git a/mlir/lib/Analysis/TestMemRefDependenceCheck.cpp b/mlir/lib/Analysis/TestMemRefDependenceCheck.cpp index 1802b736fad..9ecdcf7c2fe 100644 --- a/mlir/lib/Analysis/TestMemRefDependenceCheck.cpp +++ b/mlir/lib/Analysis/TestMemRefDependenceCheck.cpp @@ -24,9 +24,9 @@ #include "mlir/Analysis/AffineStructures.h" #include "mlir/Analysis/Passes.h" #include "mlir/Analysis/Utils.h" +#include "mlir/Dialect/StandardOps/Ops.h" #include "mlir/IR/Builders.h" #include "mlir/Pass/Pass.h" -#include "mlir/StandardOps/Ops.h" #include "llvm/Support/Debug.h" #define DEBUG_TYPE "test-memref-dependence-check" diff --git a/mlir/lib/Analysis/Utils.cpp b/mlir/lib/Analysis/Utils.cpp index 85e39e37f65..d4fc42ceff7 100644 --- a/mlir/lib/Analysis/Utils.cpp +++ b/mlir/lib/Analysis/Utils.cpp @@ -25,8 +25,8 @@ #include "mlir/AffineOps/AffineOps.h" #include "mlir/Analysis/AffineAnalysis.h" #include "mlir/Analysis/AffineStructures.h" +#include "mlir/Dialect/StandardOps/Ops.h" #include "mlir/IR/Builders.h" -#include "mlir/StandardOps/Ops.h" #include "llvm/ADT/DenseMap.h" #include "llvm/ADT/SmallPtrSet.h" #include "llvm/Support/Debug.h" diff --git a/mlir/lib/Analysis/VectorAnalysis.cpp b/mlir/lib/Analysis/VectorAnalysis.cpp index 23061561dfb..2e85b168a37 100644 --- a/mlir/lib/Analysis/VectorAnalysis.cpp +++ b/mlir/lib/Analysis/VectorAnalysis.cpp @@ -19,10 +19,10 @@ #include "mlir/AffineOps/AffineOps.h" #include "mlir/Analysis/AffineAnalysis.h" #include "mlir/Analysis/LoopAnalysis.h" +#include "mlir/Dialect/StandardOps/Ops.h" #include "mlir/IR/Builders.h" #include "mlir/IR/IntegerSet.h" #include "mlir/IR/Operation.h" -#include "mlir/StandardOps/Ops.h" #include "mlir/Support/Functional.h" #include "mlir/Support/STLExtras.h" #include "mlir/VectorOps/VectorOps.h" diff --git a/mlir/lib/CMakeLists.txt b/mlir/lib/CMakeLists.txt index fece5cbb063..a0a1bdad2f3 100644 --- a/mlir/lib/CMakeLists.txt +++ b/mlir/lib/CMakeLists.txt @@ -5,13 +5,10 @@ add_subdirectory(Dialect) add_subdirectory(EDSC) add_subdirectory(ExecutionEngine) add_subdirectory(IR) -add_subdirectory(LLVMIR) add_subdirectory(Linalg) add_subdirectory(Parser) add_subdirectory(Pass) add_subdirectory(Quantizer) -add_subdirectory(SDBM) -add_subdirectory(StandardOps) add_subdirectory(Support) add_subdirectory(TableGen) add_subdirectory(Target) diff --git a/mlir/lib/Conversion/ControlFlowToCFG/ConvertControlFlowToCFG.cpp b/mlir/lib/Conversion/ControlFlowToCFG/ConvertControlFlowToCFG.cpp index 9535dc7d903..d68c2658f6e 100644 --- a/mlir/lib/Conversion/ControlFlowToCFG/ConvertControlFlowToCFG.cpp +++ b/mlir/lib/Conversion/ControlFlowToCFG/ConvertControlFlowToCFG.cpp @@ -22,12 +22,12 @@ #include "mlir/Conversion/ControlFlowToCFG/ConvertControlFlowToCFG.h" #include "mlir/Dialect/LoopOps/LoopOps.h" +#include "mlir/Dialect/StandardOps/Ops.h" #include "mlir/IR/Builders.h" #include "mlir/IR/MLIRContext.h" #include "mlir/IR/Module.h" #include "mlir/IR/PatternMatch.h" #include "mlir/Pass/Pass.h" -#include "mlir/StandardOps/Ops.h" #include "mlir/Support/Functional.h" #include "mlir/Transforms/DialectConversion.h" #include "mlir/Transforms/Passes.h" diff --git a/mlir/lib/Conversion/GPUToCUDA/ConvertLaunchFuncToCudaCalls.cpp b/mlir/lib/Conversion/GPUToCUDA/ConvertLaunchFuncToCudaCalls.cpp index a3b80b1e9e0..7073e5e46ee 100644 --- a/mlir/lib/Conversion/GPUToCUDA/ConvertLaunchFuncToCudaCalls.cpp +++ b/mlir/lib/Conversion/GPUToCUDA/ConvertLaunchFuncToCudaCalls.cpp @@ -25,12 +25,12 @@ #include "mlir/Conversion/GPUToCUDA/GPUToCUDAPass.h" #include "mlir/Dialect/GPU/GPUDialect.h" +#include "mlir/Dialect/LLVMIR/LLVMDialect.h" #include "mlir/IR/Attributes.h" #include "mlir/IR/Builders.h" #include "mlir/IR/Function.h" #include "mlir/IR/Module.h" #include "mlir/IR/StandardTypes.h" -#include "mlir/LLVMIR/LLVMDialect.h" #include "mlir/Pass/Pass.h" #include "llvm/ADT/STLExtras.h" diff --git a/mlir/lib/Conversion/GPUToCUDA/GenerateCubinAccessors.cpp b/mlir/lib/Conversion/GPUToCUDA/GenerateCubinAccessors.cpp index b819de2471e..12f65c76ad5 100644 --- a/mlir/lib/Conversion/GPUToCUDA/GenerateCubinAccessors.cpp +++ b/mlir/lib/Conversion/GPUToCUDA/GenerateCubinAccessors.cpp @@ -21,13 +21,13 @@ //===----------------------------------------------------------------------===// #include "mlir/Dialect/GPU/GPUDialect.h" +#include "mlir/Dialect/LLVMIR/LLVMDialect.h" #include "mlir/IR/Attributes.h" #include "mlir/IR/Builders.h" #include "mlir/IR/Function.h" #include "mlir/IR/Identifier.h" #include "mlir/IR/Module.h" #include "mlir/IR/StandardTypes.h" -#include "mlir/LLVMIR/LLVMDialect.h" #include "mlir/Pass/Pass.h" #include "mlir/Pass/PassRegistry.h" diff --git a/mlir/lib/Conversion/GPUToNVVM/LowerGpuOpsToNVVMOps.cpp b/mlir/lib/Conversion/GPUToNVVM/LowerGpuOpsToNVVMOps.cpp index 32b0caf180a..3ba3e430853 100644 --- a/mlir/lib/Conversion/GPUToNVVM/LowerGpuOpsToNVVMOps.cpp +++ b/mlir/lib/Conversion/GPUToNVVM/LowerGpuOpsToNVVMOps.cpp @@ -21,10 +21,10 @@ //===----------------------------------------------------------------------===// #include "mlir/Dialect/GPU/GPUDialect.h" +#include "mlir/Dialect/LLVMIR/LLVMDialect.h" +#include "mlir/Dialect/LLVMIR/NVVMDialect.h" #include "mlir/IR/Builders.h" #include "mlir/IR/StandardTypes.h" -#include "mlir/LLVMIR/LLVMDialect.h" -#include "mlir/LLVMIR/NVVMDialect.h" #include "mlir/Pass/Pass.h" #include "mlir/Pass/PassRegistry.h" diff --git a/mlir/lib/Conversion/LoopsToGPU/LoopsToGPU.cpp b/mlir/lib/Conversion/LoopsToGPU/LoopsToGPU.cpp index 6ca4cb39f83..13ba898dc44 100644 --- a/mlir/lib/Conversion/LoopsToGPU/LoopsToGPU.cpp +++ b/mlir/lib/Conversion/LoopsToGPU/LoopsToGPU.cpp @@ -25,9 +25,9 @@ #include "mlir/AffineOps/AffineOps.h" #include "mlir/Dialect/GPU/GPUDialect.h" #include "mlir/Dialect/LoopOps/LoopOps.h" +#include "mlir/Dialect/StandardOps/Ops.h" #include "mlir/IR/AffineExpr.h" #include "mlir/IR/Builders.h" -#include "mlir/StandardOps/Ops.h" #include "mlir/Transforms/LowerAffine.h" #include "mlir/Transforms/RegionUtils.h" diff --git a/mlir/lib/Conversion/StandardToLLVM/ConvertStandardToLLVM.cpp b/mlir/lib/Conversion/StandardToLLVM/ConvertStandardToLLVM.cpp index 4240e3e7ae7..e33da63f6b7 100644 --- a/mlir/lib/Conversion/StandardToLLVM/ConvertStandardToLLVM.cpp +++ b/mlir/lib/Conversion/StandardToLLVM/ConvertStandardToLLVM.cpp @@ -23,13 +23,13 @@ #include "mlir/Conversion/StandardToLLVM/ConvertStandardToLLVM.h" #include "mlir/Conversion/ControlFlowToCFG/ConvertControlFlowToCFG.h" #include "mlir/Conversion/StandardToLLVM/ConvertStandardToLLVMPass.h" +#include "mlir/Dialect/LLVMIR/LLVMDialect.h" +#include "mlir/Dialect/StandardOps/Ops.h" #include "mlir/IR/Builders.h" #include "mlir/IR/MLIRContext.h" #include "mlir/IR/Module.h" #include "mlir/IR/PatternMatch.h" -#include "mlir/LLVMIR/LLVMDialect.h" #include "mlir/Pass/Pass.h" -#include "mlir/StandardOps/Ops.h" #include "mlir/Support/Functional.h" #include "mlir/Transforms/DialectConversion.h" #include "mlir/Transforms/Passes.h" diff --git a/mlir/lib/Conversion/StandardToSPIRV/ConvertStandardToSPIRV.cpp b/mlir/lib/Conversion/StandardToSPIRV/ConvertStandardToSPIRV.cpp index 035de4f815d..b7dfff4cef3 100644 --- a/mlir/lib/Conversion/StandardToSPIRV/ConvertStandardToSPIRV.cpp +++ b/mlir/lib/Conversion/StandardToSPIRV/ConvertStandardToSPIRV.cpp @@ -22,7 +22,7 @@ #include "mlir/Conversion/StandardToSPIRV/ConvertStandardToSPIRV.h" #include "mlir/Dialect/SPIRV/SPIRVDialect.h" #include "mlir/Dialect/SPIRV/SPIRVOps.h" -#include "mlir/StandardOps/Ops.h" +#include "mlir/Dialect/StandardOps/Ops.h" using namespace mlir; diff --git a/mlir/lib/Conversion/StandardToSPIRV/StandardToSPIRV.td b/mlir/lib/Conversion/StandardToSPIRV/StandardToSPIRV.td index 9198e8538a1..4cfd5596db3 100644 --- a/mlir/lib/Conversion/StandardToSPIRV/StandardToSPIRV.td +++ b/mlir/lib/Conversion/StandardToSPIRV/StandardToSPIRV.td @@ -16,7 +16,7 @@ #ifdef STANDARD_OPS #else -include "mlir/StandardOps/Ops.td" +include "mlir/Dialect/StandardOps/Ops.td" #endif // STANDARD_OPS #ifdef SPIRV_OPS diff --git a/mlir/lib/Conversion/VectorToLLVM/VectorToLLVM.cpp b/mlir/lib/Conversion/VectorToLLVM/VectorToLLVM.cpp index 1e4b8ca6419..238bd920341 100644 --- a/mlir/lib/Conversion/VectorToLLVM/VectorToLLVM.cpp +++ b/mlir/lib/Conversion/VectorToLLVM/VectorToLLVM.cpp @@ -18,6 +18,7 @@ #include "mlir/Conversion/VectorToLLVM/VectorToLLVM.h" #include "mlir/Conversion/StandardToLLVM/ConvertStandardToLLVM.h" #include "mlir/Conversion/StandardToLLVM/ConvertStandardToLLVMPass.h" +#include "mlir/Dialect/LLVMIR/LLVMDialect.h" #include "mlir/IR/Attributes.h" #include "mlir/IR/Builders.h" #include "mlir/IR/MLIRContext.h" @@ -26,7 +27,6 @@ #include "mlir/IR/PatternMatch.h" #include "mlir/IR/StandardTypes.h" #include "mlir/IR/Types.h" -#include "mlir/LLVMIR/LLVMDialect.h" #include "mlir/Pass/Pass.h" #include "mlir/Pass/PassManager.h" #include "mlir/Transforms/DialectConversion.h" diff --git a/mlir/lib/Dialect/CMakeLists.txt b/mlir/lib/Dialect/CMakeLists.txt index 8898c43fc1d..7c6a4fafc4d 100644 --- a/mlir/lib/Dialect/CMakeLists.txt +++ b/mlir/lib/Dialect/CMakeLists.txt @@ -1,8 +1,11 @@ add_subdirectory(FxpMathOps) add_subdirectory(GPU) +add_subdirectory(LLVMIR) add_subdirectory(LoopOps) add_subdirectory(QuantOps) +add_subdirectory(SDBM) add_subdirectory(SPIRV) +add_subdirectory(StandardOps) add_llvm_library(MLIRDialect Traits.cpp diff --git a/mlir/lib/Dialect/FxpMathOps/Transforms/LowerUniformRealMath.cpp b/mlir/lib/Dialect/FxpMathOps/Transforms/LowerUniformRealMath.cpp index e6c351bd105..83307da957b 100644 --- a/mlir/lib/Dialect/FxpMathOps/Transforms/LowerUniformRealMath.cpp +++ b/mlir/lib/Dialect/FxpMathOps/Transforms/LowerUniformRealMath.cpp @@ -19,10 +19,10 @@ #include "mlir/Dialect/FxpMathOps/FxpMathOps.h" #include "mlir/Dialect/FxpMathOps/Passes.h" +#include "mlir/Dialect/StandardOps/Ops.h" #include "mlir/IR/Diagnostics.h" #include "mlir/IR/PatternMatch.h" #include "mlir/Pass/Pass.h" -#include "mlir/StandardOps/Ops.h" using namespace mlir; using namespace mlir::fxpmath; diff --git a/mlir/lib/Dialect/GPU/IR/GPUDialect.cpp b/mlir/lib/Dialect/GPU/IR/GPUDialect.cpp index 2fbaa49f56e..22d433a74fc 100644 --- a/mlir/lib/Dialect/GPU/IR/GPUDialect.cpp +++ b/mlir/lib/Dialect/GPU/IR/GPUDialect.cpp @@ -20,13 +20,13 @@ //===----------------------------------------------------------------------===// #include "mlir/Dialect/GPU/GPUDialect.h" +#include "mlir/Dialect/StandardOps/Ops.h" #include "mlir/IR/Builders.h" #include "mlir/IR/Function.h" #include "mlir/IR/Module.h" #include "mlir/IR/OpImplementation.h" #include "mlir/IR/PatternMatch.h" #include "mlir/IR/StandardTypes.h" -#include "mlir/StandardOps/Ops.h" using namespace mlir; using namespace mlir::gpu; diff --git a/mlir/lib/Dialect/GPU/Transforms/KernelOutlining.cpp b/mlir/lib/Dialect/GPU/Transforms/KernelOutlining.cpp index ea64ea8058b..481ed247e81 100644 --- a/mlir/lib/Dialect/GPU/Transforms/KernelOutlining.cpp +++ b/mlir/lib/Dialect/GPU/Transforms/KernelOutlining.cpp @@ -21,10 +21,10 @@ #include "mlir/Dialect/GPU/GPUDialect.h" #include "mlir/Dialect/GPU/Passes.h" +#include "mlir/Dialect/StandardOps/Ops.h" #include "mlir/IR/BlockAndValueMapping.h" #include "mlir/IR/Builders.h" #include "mlir/Pass/Pass.h" -#include "mlir/StandardOps/Ops.h" using namespace mlir; diff --git a/mlir/lib/LLVMIR/CMakeLists.txt b/mlir/lib/Dialect/LLVMIR/CMakeLists.txt index 5e21850dbac..4469e7606d3 100644 --- a/mlir/lib/LLVMIR/CMakeLists.txt +++ b/mlir/lib/Dialect/LLVMIR/CMakeLists.txt @@ -2,7 +2,7 @@ add_llvm_library(MLIRLLVMIR IR/LLVMDialect.cpp ADDITIONAL_HEADER_DIRS - ${MLIR_MAIN_INCLUDE_DIR}/mlir/LLVMIR + ${MLIR_MAIN_INCLUDE_DIR}/mlir/Dialect/LLVMIR ) add_dependencies(MLIRLLVMIR MLIRLLVMOpsIncGen MLIRLLVMConversionsIncGen LLVMAsmParser LLVMCore LLVMSupport) target_link_libraries(MLIRLLVMIR LLVMAsmParser LLVMCore LLVMSupport) @@ -11,7 +11,7 @@ add_llvm_library(MLIRNVVMIR IR/NVVMDialect.cpp ADDITIONAL_HEADER_DIRS - ${MLIR_MAIN_INCLUDE_DIR}/mlir/LLVMIR + ${MLIR_MAIN_INCLUDE_DIR}/mlir/Dialect/LLVMIR ) add_dependencies(MLIRNVVMIR MLIRNVVMOpsIncGen MLIRNVVMConversionsIncGen LLVMAsmParser LLVMCore LLVMSupport) target_link_libraries(MLIRNVVMIR LLVMAsmParser LLVMCore LLVMSupport) diff --git a/mlir/lib/LLVMIR/IR/LLVMDialect.cpp b/mlir/lib/Dialect/LLVMIR/IR/LLVMDialect.cpp index d051cc94d5b..906cf344347 100644 --- a/mlir/lib/LLVMIR/IR/LLVMDialect.cpp +++ b/mlir/lib/Dialect/LLVMIR/IR/LLVMDialect.cpp @@ -19,7 +19,7 @@ // MLIR, and the LLVM IR dialect. It also registers the dialect. // //===----------------------------------------------------------------------===// -#include "mlir/LLVMIR/LLVMDialect.h" +#include "mlir/Dialect/LLVMIR/LLVMDialect.h" #include "mlir/IR/Builders.h" #include "mlir/IR/MLIRContext.h" #include "mlir/IR/Module.h" @@ -35,7 +35,7 @@ using namespace mlir; using namespace mlir::LLVM; -#include "mlir/LLVMIR/LLVMOpsEnums.cpp.inc" +#include "mlir/Dialect/LLVMIR/LLVMOpsEnums.cpp.inc" //===----------------------------------------------------------------------===// // Printing/parsing for LLVM::CmpOp. @@ -1163,7 +1163,7 @@ LLVMDialect::LLVMDialect(MLIRContext *context) addTypes<LLVMType>(); addOperations< #define GET_OP_LIST -#include "mlir/LLVMIR/LLVMOps.cpp.inc" +#include "mlir/Dialect/LLVMIR/LLVMOps.cpp.inc" >(); // Support unknown operations because not all LLVM operations are registered. @@ -1189,7 +1189,7 @@ LLVMDialect::LLVMDialect(MLIRContext *context) LLVMDialect::~LLVMDialect() {} #define GET_OP_CLASSES -#include "mlir/LLVMIR/LLVMOps.cpp.inc" +#include "mlir/Dialect/LLVMIR/LLVMOps.cpp.inc" llvm::LLVMContext &LLVMDialect::getLLVMContext() { return impl->llvmContext; } llvm::Module &LLVMDialect::getLLVMModule() { return impl->module; } diff --git a/mlir/lib/LLVMIR/IR/NVVMDialect.cpp b/mlir/lib/Dialect/LLVMIR/IR/NVVMDialect.cpp index f586f0e5c7c..8d6f308e5b3 100644 --- a/mlir/lib/LLVMIR/IR/NVVMDialect.cpp +++ b/mlir/lib/Dialect/LLVMIR/IR/NVVMDialect.cpp @@ -23,13 +23,13 @@ // //===----------------------------------------------------------------------===// -#include "mlir/LLVMIR/NVVMDialect.h" +#include "mlir/Dialect/LLVMIR/NVVMDialect.h" +#include "mlir/Dialect/LLVMIR/LLVMDialect.h" #include "mlir/IR/Builders.h" #include "mlir/IR/MLIRContext.h" #include "mlir/IR/Operation.h" #include "mlir/IR/StandardTypes.h" -#include "mlir/LLVMIR/LLVMDialect.h" #include "llvm/AsmParser/Parser.h" #include "llvm/IR/Attributes.h" #include "llvm/IR/Function.h" @@ -72,7 +72,7 @@ static ParseResult parseNVVMSpecialRegisterOp(OpAsmParser *parser, NVVMDialect::NVVMDialect(MLIRContext *context) : Dialect("nvvm", context) { addOperations< #define GET_OP_LIST -#include "mlir/LLVMIR/NVVMOps.cpp.inc" +#include "mlir/Dialect/LLVMIR/NVVMOps.cpp.inc" >(); // Support unknown operations because not all NVVM operations are registered. @@ -80,7 +80,7 @@ NVVMDialect::NVVMDialect(MLIRContext *context) : Dialect("nvvm", context) { } #define GET_OP_CLASSES -#include "mlir/LLVMIR/NVVMOps.cpp.inc" +#include "mlir/Dialect/LLVMIR/NVVMOps.cpp.inc" static DialectRegistration<NVVMDialect> nvvmDialect; diff --git a/mlir/lib/Dialect/LoopOps/LoopOps.cpp b/mlir/lib/Dialect/LoopOps/LoopOps.cpp index 13dc35ec7ce..4d99cac3a04 100644 --- a/mlir/lib/Dialect/LoopOps/LoopOps.cpp +++ b/mlir/lib/Dialect/LoopOps/LoopOps.cpp @@ -16,6 +16,7 @@ // ============================================================================= #include "mlir/Dialect/LoopOps/LoopOps.h" +#include "mlir/Dialect/StandardOps/Ops.h" #include "mlir/IR/AffineExpr.h" #include "mlir/IR/AffineMap.h" #include "mlir/IR/Builders.h" @@ -26,7 +27,6 @@ #include "mlir/IR/PatternMatch.h" #include "mlir/IR/StandardTypes.h" #include "mlir/IR/Value.h" -#include "mlir/StandardOps/Ops.h" #include "mlir/Support/MathExtras.h" #include "mlir/Support/STLExtras.h" diff --git a/mlir/lib/Dialect/QuantOps/Transforms/ConvertConst.cpp b/mlir/lib/Dialect/QuantOps/Transforms/ConvertConst.cpp index efb202b7491..e3a17b057d4 100644 --- a/mlir/lib/Dialect/QuantOps/Transforms/ConvertConst.cpp +++ b/mlir/lib/Dialect/QuantOps/Transforms/ConvertConst.cpp @@ -19,12 +19,12 @@ #include "mlir/Dialect/QuantOps/QuantOps.h" #include "mlir/Dialect/QuantOps/QuantizeUtils.h" #include "mlir/Dialect/QuantOps/UniformSupport.h" +#include "mlir/Dialect/StandardOps/Ops.h" #include "mlir/IR/Attributes.h" #include "mlir/IR/Matchers.h" #include "mlir/IR/PatternMatch.h" #include "mlir/IR/StandardTypes.h" #include "mlir/Pass/Pass.h" -#include "mlir/StandardOps/Ops.h" using namespace mlir; using namespace mlir::quant; diff --git a/mlir/lib/SDBM/CMakeLists.txt b/mlir/lib/Dialect/SDBM/CMakeLists.txt index 30b2f641a7b..e36308e0eda 100644 --- a/mlir/lib/SDBM/CMakeLists.txt +++ b/mlir/lib/Dialect/SDBM/CMakeLists.txt @@ -4,7 +4,7 @@ add_llvm_library(MLIRSDBM SDBMDialect.cpp ADDITIONAL_HEADER_DIRS - ${MLIR_MAIN_INCLUDE_DIR}/mlir/SDBM + ${MLIR_MAIN_INCLUDE_DIR}/mlir/Dialect/SDBM ) add_dependencies(MLIRSDBM MLIRIR) target_link_libraries(MLIRSDBM MLIRIR) diff --git a/mlir/lib/SDBM/SDBM.cpp b/mlir/lib/Dialect/SDBM/SDBM.cpp index 13932c649b0..5450a61b17b 100644 --- a/mlir/lib/SDBM/SDBM.cpp +++ b/mlir/lib/Dialect/SDBM/SDBM.cpp @@ -20,8 +20,8 @@ // //===----------------------------------------------------------------------===// -#include "mlir/SDBM/SDBM.h" -#include "mlir/SDBM/SDBMExpr.h" +#include "mlir/Dialect/SDBM/SDBM.h" +#include "mlir/Dialect/SDBM/SDBMExpr.h" #include "llvm/ADT/DenseMap.h" #include "llvm/ADT/SetVector.h" diff --git a/mlir/lib/SDBM/SDBMDialect.cpp b/mlir/lib/Dialect/SDBM/SDBMDialect.cpp index e000209e165..d3d895fec88 100644 --- a/mlir/lib/SDBM/SDBMDialect.cpp +++ b/mlir/lib/Dialect/SDBM/SDBMDialect.cpp @@ -15,6 +15,6 @@ // limitations under the License. // ============================================================================= -#include "mlir/SDBM/SDBMDialect.h" +#include "mlir/Dialect/SDBM/SDBMDialect.h" static mlir::DialectRegistration<mlir::SDBMDialect> SDBMDialect; diff --git a/mlir/lib/SDBM/SDBMExpr.cpp b/mlir/lib/Dialect/SDBM/SDBMExpr.cpp index 5757ebefe52..a174c8c84f2 100644 --- a/mlir/lib/SDBM/SDBMExpr.cpp +++ b/mlir/lib/Dialect/SDBM/SDBMExpr.cpp @@ -21,11 +21,11 @@ // //===----------------------------------------------------------------------===// -#include "mlir/SDBM/SDBMExpr.h" +#include "mlir/Dialect/SDBM/SDBMExpr.h" #include "SDBMExprDetail.h" +#include "mlir/Dialect/SDBM/SDBMDialect.h" #include "mlir/IR/AffineExpr.h" #include "mlir/IR/AffineExprVisitor.h" -#include "mlir/SDBM/SDBMDialect.h" #include "llvm/Support/raw_ostream.h" diff --git a/mlir/lib/SDBM/SDBMExprDetail.h b/mlir/lib/Dialect/SDBM/SDBMExprDetail.h index d2c241e744b..1721b02dae7 100644 --- a/mlir/lib/SDBM/SDBMExprDetail.h +++ b/mlir/lib/Dialect/SDBM/SDBMExprDetail.h @@ -23,7 +23,7 @@ #ifndef MLIR_IR_SDBMEXPRDETAIL_H #define MLIR_IR_SDBMEXPRDETAIL_H -#include "mlir/SDBM/SDBMExpr.h" +#include "mlir/Dialect/SDBM/SDBMExpr.h" #include "mlir/Support/StorageUniquer.h" namespace mlir { diff --git a/mlir/lib/Dialect/SPIRV/Serialization/ConvertFromBinary.cpp b/mlir/lib/Dialect/SPIRV/Serialization/ConvertFromBinary.cpp index 38e8d93752e..cda56e27b1a 100644 --- a/mlir/lib/Dialect/SPIRV/Serialization/ConvertFromBinary.cpp +++ b/mlir/lib/Dialect/SPIRV/Serialization/ConvertFromBinary.cpp @@ -22,10 +22,10 @@ #include "mlir/Dialect/SPIRV/SPIRVOps.h" #include "mlir/Dialect/SPIRV/Serialization.h" +#include "mlir/Dialect/StandardOps/Ops.h" #include "mlir/IR/Builders.h" #include "mlir/IR/Function.h" #include "mlir/IR/Module.h" -#include "mlir/StandardOps/Ops.h" #include "mlir/Support/FileUtilities.h" #include "mlir/Translation.h" #include "llvm/ADT/StringRef.h" diff --git a/mlir/lib/StandardOps/CMakeLists.txt b/mlir/lib/Dialect/StandardOps/CMakeLists.txt index e9fce2b0baf..f10c173af8a 100644 --- a/mlir/lib/StandardOps/CMakeLists.txt +++ b/mlir/lib/Dialect/StandardOps/CMakeLists.txt @@ -3,7 +3,7 @@ add_llvm_library(MLIRStandardOps ${globbed} ADDITIONAL_HEADER_DIRS - ${MLIR_MAIN_INCLUDE_DIR}/mlir/StandardOps + ${MLIR_MAIN_INCLUDE_DIR}/mlir/Dialect/StandardOps ) add_dependencies(MLIRStandardOps MLIRStandardOpsIncGen LLVMSupport) target_link_libraries(MLIRStandardOps LLVMSupport) diff --git a/mlir/lib/StandardOps/DialectRegistration.cpp b/mlir/lib/Dialect/StandardOps/DialectRegistration.cpp index 1f71a3d014e..6b5578f93cf 100644 --- a/mlir/lib/StandardOps/DialectRegistration.cpp +++ b/mlir/lib/Dialect/StandardOps/DialectRegistration.cpp @@ -15,7 +15,7 @@ // limitations under the License. // ============================================================================= -#include "mlir/StandardOps/Ops.h" +#include "mlir/Dialect/StandardOps/Ops.h" using namespace mlir; // Static initialization for standard op dialect registration. diff --git a/mlir/lib/StandardOps/Ops.cpp b/mlir/lib/Dialect/StandardOps/Ops.cpp index 22148eeadc3..4e484e6b50b 100644 --- a/mlir/lib/StandardOps/Ops.cpp +++ b/mlir/lib/Dialect/StandardOps/Ops.cpp @@ -15,7 +15,7 @@ // limitations under the License. // ============================================================================= -#include "mlir/StandardOps/Ops.h" +#include "mlir/Dialect/StandardOps/Ops.h" #include "mlir/IR/AffineExpr.h" #include "mlir/IR/AffineMap.h" @@ -84,7 +84,7 @@ StandardOpsDialect::StandardOpsDialect(MLIRContext *context) : Dialect(getDialectNamespace(), context) { addOperations<DmaStartOp, DmaWaitOp, #define GET_OP_LIST -#include "mlir/StandardOps/Ops.cpp.inc" +#include "mlir/Dialect/StandardOps/Ops.cpp.inc" >(); } @@ -2099,4 +2099,4 @@ OpFoldResult TensorCastOp::fold(ArrayRef<Attribute> operands) { //===----------------------------------------------------------------------===// #define GET_OP_CLASSES -#include "mlir/StandardOps/Ops.cpp.inc" +#include "mlir/Dialect/StandardOps/Ops.cpp.inc" diff --git a/mlir/lib/EDSC/Builders.cpp b/mlir/lib/EDSC/Builders.cpp index d52490055e4..c620ac555f5 100644 --- a/mlir/lib/EDSC/Builders.cpp +++ b/mlir/lib/EDSC/Builders.cpp @@ -16,8 +16,8 @@ // ============================================================================= #include "mlir/EDSC/Builders.h" +#include "mlir/Dialect/StandardOps/Ops.h" #include "mlir/IR/AffineExpr.h" -#include "mlir/StandardOps/Ops.h" #include "llvm/ADT/Optional.h" diff --git a/mlir/lib/EDSC/Helpers.cpp b/mlir/lib/EDSC/Helpers.cpp index e6266d373e6..b4455c43c1e 100644 --- a/mlir/lib/EDSC/Helpers.cpp +++ b/mlir/lib/EDSC/Helpers.cpp @@ -16,8 +16,8 @@ // ============================================================================= #include "mlir/EDSC/Helpers.h" +#include "mlir/Dialect/StandardOps/Ops.h" #include "mlir/IR/AffineExpr.h" -#include "mlir/StandardOps/Ops.h" using namespace mlir; using namespace mlir::edsc; diff --git a/mlir/lib/Linalg/Transforms/LowerToLLVMDialect.cpp b/mlir/lib/Linalg/Transforms/LowerToLLVMDialect.cpp index 05bdf24a975..6fa075fa6d9 100644 --- a/mlir/lib/Linalg/Transforms/LowerToLLVMDialect.cpp +++ b/mlir/lib/Linalg/Transforms/LowerToLLVMDialect.cpp @@ -18,6 +18,7 @@ #include "mlir/Conversion/ControlFlowToCFG/ConvertControlFlowToCFG.h" #include "mlir/Conversion/StandardToLLVM/ConvertStandardToLLVM.h" #include "mlir/Conversion/StandardToLLVM/ConvertStandardToLLVMPass.h" +#include "mlir/Dialect/LLVMIR/LLVMDialect.h" #include "mlir/EDSC/Builders.h" #include "mlir/EDSC/Intrinsics.h" #include "mlir/IR/Attributes.h" @@ -28,7 +29,6 @@ #include "mlir/IR/PatternMatch.h" #include "mlir/IR/StandardTypes.h" #include "mlir/IR/Types.h" -#include "mlir/LLVMIR/LLVMDialect.h" #include "mlir/Linalg/IR/LinalgOps.h" #include "mlir/Linalg/IR/LinalgTypes.h" #include "mlir/Linalg/Passes.h" diff --git a/mlir/lib/Linalg/Transforms/LowerToLoops.cpp b/mlir/lib/Linalg/Transforms/LowerToLoops.cpp index faef51f5c8c..1fd50666f00 100644 --- a/mlir/lib/Linalg/Transforms/LowerToLoops.cpp +++ b/mlir/lib/Linalg/Transforms/LowerToLoops.cpp @@ -17,6 +17,7 @@ #include "mlir/AffineOps/AffineOps.h" #include "mlir/Dialect/LoopOps/LoopOps.h" +#include "mlir/Dialect/StandardOps/Ops.h" #include "mlir/EDSC/Helpers.h" #include "mlir/IR/AffineExpr.h" #include "mlir/IR/AffineMap.h" @@ -28,7 +29,6 @@ #include "mlir/Linalg/Utils/Intrinsics.h" #include "mlir/Linalg/Utils/Utils.h" #include "mlir/Pass/Pass.h" -#include "mlir/StandardOps/Ops.h" #include "mlir/Support/LLVM.h" #include "mlir/Support/STLExtras.h" #include "mlir/Transforms/DialectConversion.h" diff --git a/mlir/lib/Linalg/Utils/Utils.cpp b/mlir/lib/Linalg/Utils/Utils.cpp index d31fe0d3006..9472b80f58e 100644 --- a/mlir/lib/Linalg/Utils/Utils.cpp +++ b/mlir/lib/Linalg/Utils/Utils.cpp @@ -21,6 +21,7 @@ #include "mlir/Linalg/Utils/Utils.h" #include "mlir/Dialect/LoopOps/LoopOps.h" +#include "mlir/Dialect/StandardOps/Ops.h" #include "mlir/EDSC/Helpers.h" #include "mlir/IR/AffineExpr.h" #include "mlir/IR/AffineMap.h" @@ -30,7 +31,6 @@ #include "mlir/Linalg/Passes.h" #include "mlir/Linalg/Utils/Intrinsics.h" #include "mlir/Pass/Pass.h" -#include "mlir/StandardOps/Ops.h" #include "mlir/Support/STLExtras.h" #include "mlir/Transforms/FoldUtils.h" diff --git a/mlir/lib/Quantizer/Configurations/FxpMathConfig.cpp b/mlir/lib/Quantizer/Configurations/FxpMathConfig.cpp index 4119bde5ac1..94e364238c5 100644 --- a/mlir/lib/Quantizer/Configurations/FxpMathConfig.cpp +++ b/mlir/lib/Quantizer/Configurations/FxpMathConfig.cpp @@ -26,13 +26,13 @@ #include "mlir/Dialect/FxpMathOps/FxpMathOps.h" #include "mlir/Dialect/QuantOps/QuantOps.h" #include "mlir/Dialect/QuantOps/QuantTypes.h" +#include "mlir/Dialect/StandardOps/Ops.h" #include "mlir/IR/Matchers.h" #include "mlir/IR/StandardTypes.h" #include "mlir/Quantizer/Support/ConstraintAnalysisGraph.h" #include "mlir/Quantizer/Support/Metadata.h" #include "mlir/Quantizer/Support/Statistics.h" #include "mlir/Quantizer/Support/UniformConstraints.h" -#include "mlir/StandardOps/Ops.h" using namespace mlir; using namespace mlir::quantizer; diff --git a/mlir/lib/Support/JitRunner.cpp b/mlir/lib/Support/JitRunner.cpp index 26a5fc12cce..afa356ea69f 100644 --- a/mlir/lib/Support/JitRunner.cpp +++ b/mlir/lib/Support/JitRunner.cpp @@ -26,13 +26,13 @@ #include "mlir/Support/JitRunner.h" #include "mlir/Conversion/StandardToLLVM/ConvertStandardToLLVMPass.h" +#include "mlir/Dialect/LLVMIR/LLVMDialect.h" #include "mlir/ExecutionEngine/ExecutionEngine.h" #include "mlir/ExecutionEngine/MemRefUtils.h" #include "mlir/ExecutionEngine/OptUtils.h" #include "mlir/IR/MLIRContext.h" #include "mlir/IR/Module.h" #include "mlir/IR/StandardTypes.h" -#include "mlir/LLVMIR/LLVMDialect.h" #include "mlir/Parser.h" #include "mlir/Pass/Pass.h" #include "mlir/Pass/PassManager.h" diff --git a/mlir/lib/Target/LLVMIR/ConvertToNVVMIR.cpp b/mlir/lib/Target/LLVMIR/ConvertToNVVMIR.cpp index a1e09fda84d..98dc43c7105 100644 --- a/mlir/lib/Target/LLVMIR/ConvertToNVVMIR.cpp +++ b/mlir/lib/Target/LLVMIR/ConvertToNVVMIR.cpp @@ -23,9 +23,9 @@ #include "mlir/Target/NVVMIR.h" #include "mlir/Dialect/GPU/GPUDialect.h" +#include "mlir/Dialect/LLVMIR/NVVMDialect.h" #include "mlir/IR/Function.h" #include "mlir/IR/Module.h" -#include "mlir/LLVMIR/NVVMDialect.h" #include "mlir/Support/FileUtilities.h" #include "mlir/Target/LLVMIR/ModuleTranslation.h" #include "mlir/Translation.h" @@ -55,7 +55,7 @@ protected: LogicalResult convertOperation(Operation &opInst, llvm::IRBuilder<> &builder) override { -#include "mlir/LLVMIR/NVVMConversions.inc" +#include "mlir/Dialect/LLVMIR/NVVMConversions.inc" return LLVM::ModuleTranslation::convertOperation(opInst, builder); } diff --git a/mlir/lib/Target/LLVMIR/ModuleTranslation.cpp b/mlir/lib/Target/LLVMIR/ModuleTranslation.cpp index 19ff0961497..bea22c9753c 100644 --- a/mlir/lib/Target/LLVMIR/ModuleTranslation.cpp +++ b/mlir/lib/Target/LLVMIR/ModuleTranslation.cpp @@ -22,9 +22,9 @@ #include "mlir/Target/LLVMIR/ModuleTranslation.h" +#include "mlir/Dialect/LLVMIR/LLVMDialect.h" #include "mlir/IR/Attributes.h" #include "mlir/IR/Module.h" -#include "mlir/LLVMIR/LLVMDialect.h" #include "mlir/Support/LLVM.h" #include "llvm/ADT/SetVector.h" @@ -202,7 +202,7 @@ LogicalResult ModuleTranslation::convertOperation(Operation &opInst, return position; }; -#include "mlir/LLVMIR/LLVMConversions.inc" +#include "mlir/Dialect/LLVMIR/LLVMConversions.inc" // Emit function calls. If the "callee" attribute is present, this is a // direct function call and we also need to look up the remapped function diff --git a/mlir/lib/Transforms/AffineDataCopyGeneration.cpp b/mlir/lib/Transforms/AffineDataCopyGeneration.cpp index 5030f722519..33b73336ff7 100644 --- a/mlir/lib/Transforms/AffineDataCopyGeneration.cpp +++ b/mlir/lib/Transforms/AffineDataCopyGeneration.cpp @@ -31,9 +31,9 @@ #include "mlir/AffineOps/AffineOps.h" #include "mlir/Analysis/AffineStructures.h" #include "mlir/Analysis/Utils.h" +#include "mlir/Dialect/StandardOps/Ops.h" #include "mlir/IR/Builders.h" #include "mlir/Pass/Pass.h" -#include "mlir/StandardOps/Ops.h" #include "mlir/Transforms/Passes.h" #include "mlir/Transforms/Utils.h" #include "llvm/ADT/MapVector.h" diff --git a/mlir/lib/Transforms/LoopCoalescing.cpp b/mlir/lib/Transforms/LoopCoalescing.cpp index 2ce0fbd011b..c4024fe303f 100644 --- a/mlir/lib/Transforms/LoopCoalescing.cpp +++ b/mlir/lib/Transforms/LoopCoalescing.cpp @@ -16,8 +16,8 @@ // ============================================================================= #include "mlir/Dialect/LoopOps/LoopOps.h" +#include "mlir/Dialect/StandardOps/Ops.h" #include "mlir/Pass/Pass.h" -#include "mlir/StandardOps/Ops.h" #include "mlir/Transforms/LoopUtils.h" #include "mlir/Transforms/Passes.h" #include "mlir/Transforms/RegionUtils.h" diff --git a/mlir/lib/Transforms/LoopFusion.cpp b/mlir/lib/Transforms/LoopFusion.cpp index 98d01b24be0..98798938077 100644 --- a/mlir/lib/Transforms/LoopFusion.cpp +++ b/mlir/lib/Transforms/LoopFusion.cpp @@ -24,11 +24,11 @@ #include "mlir/Analysis/AffineStructures.h" #include "mlir/Analysis/LoopAnalysis.h" #include "mlir/Analysis/Utils.h" +#include "mlir/Dialect/StandardOps/Ops.h" #include "mlir/IR/AffineExpr.h" #include "mlir/IR/AffineMap.h" #include "mlir/IR/Builders.h" #include "mlir/Pass/Pass.h" -#include "mlir/StandardOps/Ops.h" #include "mlir/Transforms/LoopFusionUtils.h" #include "mlir/Transforms/LoopUtils.h" #include "mlir/Transforms/Passes.h" diff --git a/mlir/lib/Transforms/LoopInvariantCodeMotion.cpp b/mlir/lib/Transforms/LoopInvariantCodeMotion.cpp index fddc890edcf..094f8fc421d 100644 --- a/mlir/lib/Transforms/LoopInvariantCodeMotion.cpp +++ b/mlir/lib/Transforms/LoopInvariantCodeMotion.cpp @@ -25,11 +25,11 @@ #include "mlir/Analysis/LoopAnalysis.h" #include "mlir/Analysis/SliceAnalysis.h" #include "mlir/Analysis/Utils.h" +#include "mlir/Dialect/StandardOps/Ops.h" #include "mlir/IR/AffineExpr.h" #include "mlir/IR/AffineMap.h" #include "mlir/IR/Builders.h" #include "mlir/Pass/Pass.h" -#include "mlir/StandardOps/Ops.h" #include "mlir/Transforms/LoopUtils.h" #include "mlir/Transforms/Passes.h" #include "mlir/Transforms/Utils.h" diff --git a/mlir/lib/Transforms/LowerAffine.cpp b/mlir/lib/Transforms/LowerAffine.cpp index 1879ff63af2..5a7d926d4f9 100644 --- a/mlir/lib/Transforms/LowerAffine.cpp +++ b/mlir/lib/Transforms/LowerAffine.cpp @@ -23,13 +23,13 @@ #include "mlir/Transforms/LowerAffine.h" #include "mlir/AffineOps/AffineOps.h" #include "mlir/Dialect/LoopOps/LoopOps.h" +#include "mlir/Dialect/StandardOps/Ops.h" #include "mlir/IR/AffineExprVisitor.h" #include "mlir/IR/BlockAndValueMapping.h" #include "mlir/IR/Builders.h" #include "mlir/IR/IntegerSet.h" #include "mlir/IR/MLIRContext.h" #include "mlir/Pass/Pass.h" -#include "mlir/StandardOps/Ops.h" #include "mlir/Support/Functional.h" #include "mlir/Transforms/DialectConversion.h" #include "mlir/Transforms/Passes.h" diff --git a/mlir/lib/Transforms/LowerVectorTransfers.cpp b/mlir/lib/Transforms/LowerVectorTransfers.cpp index 8cb50e805f8..ab98340f0af 100644 --- a/mlir/lib/Transforms/LowerVectorTransfers.cpp +++ b/mlir/lib/Transforms/LowerVectorTransfers.cpp @@ -25,6 +25,7 @@ #include "mlir/Analysis/NestedMatcher.h" #include "mlir/Analysis/Utils.h" #include "mlir/Analysis/VectorAnalysis.h" +#include "mlir/Dialect/StandardOps/Ops.h" #include "mlir/EDSC/Builders.h" #include "mlir/EDSC/Helpers.h" #include "mlir/IR/AffineExpr.h" @@ -37,7 +38,6 @@ #include "mlir/IR/PatternMatch.h" #include "mlir/IR/Types.h" #include "mlir/Pass/Pass.h" -#include "mlir/StandardOps/Ops.h" #include "mlir/Support/Functional.h" #include "mlir/Transforms/Passes.h" #include "mlir/VectorOps/VectorOps.h" diff --git a/mlir/lib/Transforms/MaterializeVectors.cpp b/mlir/lib/Transforms/MaterializeVectors.cpp index 811c6fc7ad5..eaa4d002969 100644 --- a/mlir/lib/Transforms/MaterializeVectors.cpp +++ b/mlir/lib/Transforms/MaterializeVectors.cpp @@ -28,6 +28,7 @@ #include "mlir/Analysis/SliceAnalysis.h" #include "mlir/Analysis/Utils.h" #include "mlir/Analysis/VectorAnalysis.h" +#include "mlir/Dialect/StandardOps/Ops.h" #include "mlir/IR/AffineExpr.h" #include "mlir/IR/AffineMap.h" #include "mlir/IR/Attributes.h" @@ -36,7 +37,6 @@ #include "mlir/IR/OperationSupport.h" #include "mlir/IR/Types.h" #include "mlir/Pass/Pass.h" -#include "mlir/StandardOps/Ops.h" #include "mlir/Support/Functional.h" #include "mlir/Support/LLVM.h" #include "mlir/Transforms/Passes.h" diff --git a/mlir/lib/Transforms/MemRefDataFlowOpt.cpp b/mlir/lib/Transforms/MemRefDataFlowOpt.cpp index 59a4fbe93ab..33433e50d0f 100644 --- a/mlir/lib/Transforms/MemRefDataFlowOpt.cpp +++ b/mlir/lib/Transforms/MemRefDataFlowOpt.cpp @@ -26,8 +26,8 @@ #include "mlir/Analysis/AffineAnalysis.h" #include "mlir/Analysis/Dominance.h" #include "mlir/Analysis/Utils.h" +#include "mlir/Dialect/StandardOps/Ops.h" #include "mlir/Pass/Pass.h" -#include "mlir/StandardOps/Ops.h" #include "mlir/Transforms/Passes.h" #include "llvm/ADT/SmallPtrSet.h" #include <algorithm> diff --git a/mlir/lib/Transforms/PipelineDataTransfer.cpp b/mlir/lib/Transforms/PipelineDataTransfer.cpp index db78f500867..b58b6debc05 100644 --- a/mlir/lib/Transforms/PipelineDataTransfer.cpp +++ b/mlir/lib/Transforms/PipelineDataTransfer.cpp @@ -25,9 +25,9 @@ #include "mlir/Analysis/AffineAnalysis.h" #include "mlir/Analysis/LoopAnalysis.h" #include "mlir/Analysis/Utils.h" +#include "mlir/Dialect/StandardOps/Ops.h" #include "mlir/IR/Builders.h" #include "mlir/Pass/Pass.h" -#include "mlir/StandardOps/Ops.h" #include "mlir/Transforms/LoopUtils.h" #include "mlir/Transforms/Utils.h" #include "llvm/ADT/DenseMap.h" diff --git a/mlir/lib/Transforms/Utils/FoldUtils.cpp b/mlir/lib/Transforms/Utils/FoldUtils.cpp index 435ea85ea98..6c313e20932 100644 --- a/mlir/lib/Transforms/Utils/FoldUtils.cpp +++ b/mlir/lib/Transforms/Utils/FoldUtils.cpp @@ -22,10 +22,10 @@ #include "mlir/Transforms/FoldUtils.h" +#include "mlir/Dialect/StandardOps/Ops.h" #include "mlir/IR/Builders.h" #include "mlir/IR/Matchers.h" #include "mlir/IR/Operation.h" -#include "mlir/StandardOps/Ops.h" using namespace mlir; diff --git a/mlir/lib/Transforms/Utils/GreedyPatternRewriteDriver.cpp b/mlir/lib/Transforms/Utils/GreedyPatternRewriteDriver.cpp index fe15fb49865..361580811e6 100644 --- a/mlir/lib/Transforms/Utils/GreedyPatternRewriteDriver.cpp +++ b/mlir/lib/Transforms/Utils/GreedyPatternRewriteDriver.cpp @@ -19,9 +19,9 @@ // //===----------------------------------------------------------------------===// +#include "mlir/Dialect/StandardOps/Ops.h" #include "mlir/IR/Builders.h" #include "mlir/IR/PatternMatch.h" -#include "mlir/StandardOps/Ops.h" #include "mlir/Transforms/FoldUtils.h" #include "llvm/ADT/DenseMap.h" #include "llvm/Support/CommandLine.h" diff --git a/mlir/lib/Transforms/Utils/LoopFusionUtils.cpp b/mlir/lib/Transforms/Utils/LoopFusionUtils.cpp index 4c079bd88aa..63150c14742 100644 --- a/mlir/lib/Transforms/Utils/LoopFusionUtils.cpp +++ b/mlir/lib/Transforms/Utils/LoopFusionUtils.cpp @@ -26,13 +26,13 @@ #include "mlir/Analysis/AffineStructures.h" #include "mlir/Analysis/LoopAnalysis.h" #include "mlir/Analysis/Utils.h" +#include "mlir/Dialect/StandardOps/Ops.h" #include "mlir/IR/AffineExpr.h" #include "mlir/IR/AffineMap.h" #include "mlir/IR/BlockAndValueMapping.h" #include "mlir/IR/Builders.h" #include "mlir/IR/Function.h" #include "mlir/IR/Operation.h" -#include "mlir/StandardOps/Ops.h" #include "llvm/ADT/DenseMap.h" #include "llvm/ADT/SmallVector.h" #include "llvm/Support/Debug.h" diff --git a/mlir/lib/Transforms/Utils/LoopUtils.cpp b/mlir/lib/Transforms/Utils/LoopUtils.cpp index a4717ad507b..8b62d007f47 100644 --- a/mlir/lib/Transforms/Utils/LoopUtils.cpp +++ b/mlir/lib/Transforms/Utils/LoopUtils.cpp @@ -27,6 +27,7 @@ #include "mlir/Analysis/LoopAnalysis.h" #include "mlir/Analysis/SliceAnalysis.h" #include "mlir/Dialect/LoopOps/LoopOps.h" +#include "mlir/Dialect/StandardOps/Ops.h" #include "mlir/IR/AffineExpr.h" #include "mlir/IR/AffineMap.h" #include "mlir/IR/BlockAndValueMapping.h" @@ -34,7 +35,6 @@ #include "mlir/IR/Function.h" #include "mlir/IR/Module.h" #include "mlir/IR/Operation.h" -#include "mlir/StandardOps/Ops.h" #include "mlir/Transforms/RegionUtils.h" #include "llvm/ADT/DenseMap.h" #include "llvm/ADT/SetVector.h" diff --git a/mlir/lib/Transforms/Utils/Utils.cpp b/mlir/lib/Transforms/Utils/Utils.cpp index ffc19d1a1d3..e2253c77f67 100644 --- a/mlir/lib/Transforms/Utils/Utils.cpp +++ b/mlir/lib/Transforms/Utils/Utils.cpp @@ -27,10 +27,10 @@ #include "mlir/Analysis/AffineStructures.h" #include "mlir/Analysis/Dominance.h" #include "mlir/Analysis/Utils.h" +#include "mlir/Dialect/StandardOps/Ops.h" #include "mlir/IR/Builders.h" #include "mlir/IR/Function.h" #include "mlir/IR/Module.h" -#include "mlir/StandardOps/Ops.h" #include "mlir/Support/MathExtras.h" #include "llvm/ADT/DenseMap.h" using namespace mlir; diff --git a/mlir/lib/Transforms/Vectorize.cpp b/mlir/lib/Transforms/Vectorize.cpp index d00174ba2fa..6b3c4449667 100644 --- a/mlir/lib/Transforms/Vectorize.cpp +++ b/mlir/lib/Transforms/Vectorize.cpp @@ -26,12 +26,12 @@ #include "mlir/Analysis/SliceAnalysis.h" #include "mlir/Analysis/Utils.h" #include "mlir/Analysis/VectorAnalysis.h" +#include "mlir/Dialect/StandardOps/Ops.h" #include "mlir/IR/AffineExpr.h" #include "mlir/IR/Builders.h" #include "mlir/IR/Location.h" #include "mlir/IR/Types.h" #include "mlir/Pass/Pass.h" -#include "mlir/StandardOps/Ops.h" #include "mlir/Support/Functional.h" #include "mlir/Support/LLVM.h" #include "mlir/Transforms/Passes.h" diff --git a/mlir/test/EDSC/builder-api-test.cpp b/mlir/test/EDSC/builder-api-test.cpp index a39388e2fd6..386d744ef32 100644 --- a/mlir/test/EDSC/builder-api-test.cpp +++ b/mlir/test/EDSC/builder-api-test.cpp @@ -18,6 +18,7 @@ // RUN: mlir-edsc-builder-api-test | FileCheck %s #include "mlir/AffineOps/AffineOps.h" +#include "mlir/Dialect/StandardOps/Ops.h" #include "mlir/EDSC/Builders.h" #include "mlir/EDSC/Helpers.h" #include "mlir/EDSC/Intrinsics.h" @@ -28,7 +29,6 @@ #include "mlir/IR/Types.h" #include "mlir/Pass/Pass.h" #include "mlir/Pass/PassManager.h" -#include "mlir/StandardOps/Ops.h" #include "mlir/Transforms/LoopUtils.h" #include "mlir/Transforms/Passes.h" diff --git a/mlir/test/SDBM/sdbm-api-test.cpp b/mlir/test/SDBM/sdbm-api-test.cpp index 39a4a0d3189..b8cbaef5c35 100644 --- a/mlir/test/SDBM/sdbm-api-test.cpp +++ b/mlir/test/SDBM/sdbm-api-test.cpp @@ -17,10 +17,10 @@ // RUN: mlir-sdbm-api-test | FileCheck %s +#include "mlir/Dialect/SDBM/SDBM.h" +#include "mlir/Dialect/SDBM/SDBMDialect.h" +#include "mlir/Dialect/SDBM/SDBMExpr.h" #include "mlir/IR/MLIRContext.h" -#include "mlir/SDBM/SDBM.h" -#include "mlir/SDBM/SDBMDialect.h" -#include "mlir/SDBM/SDBMExpr.h" #include "llvm/Support/raw_ostream.h" diff --git a/mlir/test/lib/Transforms/TestConstantFold.cpp b/mlir/test/lib/Transforms/TestConstantFold.cpp index 34480f09f57..35a7eba5478 100644 --- a/mlir/test/lib/Transforms/TestConstantFold.cpp +++ b/mlir/test/lib/Transforms/TestConstantFold.cpp @@ -16,10 +16,10 @@ // ============================================================================= #include "mlir/AffineOps/AffineOps.h" +#include "mlir/Dialect/StandardOps/Ops.h" #include "mlir/IR/Builders.h" #include "mlir/IR/Function.h" #include "mlir/Pass/Pass.h" -#include "mlir/StandardOps/Ops.h" #include "mlir/Transforms/FoldUtils.h" #include "mlir/Transforms/Passes.h" #include "mlir/Transforms/Utils.h" diff --git a/mlir/test/lib/Transforms/TestLoopFusion.cpp b/mlir/test/lib/Transforms/TestLoopFusion.cpp index 8b55d351bdc..4dd06a58904 100644 --- a/mlir/test/lib/Transforms/TestLoopFusion.cpp +++ b/mlir/test/lib/Transforms/TestLoopFusion.cpp @@ -24,9 +24,9 @@ #include "mlir/Analysis/AffineStructures.h" #include "mlir/Analysis/Passes.h" #include "mlir/Analysis/Utils.h" +#include "mlir/Dialect/StandardOps/Ops.h" #include "mlir/IR/Builders.h" #include "mlir/Pass/Pass.h" -#include "mlir/StandardOps/Ops.h" #include "mlir/Transforms/LoopFusionUtils.h" #include "mlir/Transforms/Passes.h" diff --git a/mlir/tools/mlir-cuda-runner/mlir-cuda-runner.cpp b/mlir/tools/mlir-cuda-runner/mlir-cuda-runner.cpp index 1d174eb8395..9bd9222bbef 100644 --- a/mlir/tools/mlir-cuda-runner/mlir-cuda-runner.cpp +++ b/mlir/tools/mlir-cuda-runner/mlir-cuda-runner.cpp @@ -29,9 +29,9 @@ #include "mlir/Conversion/StandardToLLVM/ConvertStandardToLLVMPass.h" #include "mlir/Dialect/GPU/GPUDialect.h" #include "mlir/Dialect/GPU/Passes.h" +#include "mlir/Dialect/LLVMIR/LLVMDialect.h" #include "mlir/IR/Function.h" #include "mlir/IR/Module.h" -#include "mlir/LLVMIR/LLVMDialect.h" #include "mlir/Pass/Pass.h" #include "mlir/Pass/PassManager.h" #include "mlir/Support/JitRunner.h" diff --git a/mlir/unittests/SDBM/SDBMTest.cpp b/mlir/unittests/SDBM/SDBMTest.cpp index c4c1c56f51f..850d1480320 100644 --- a/mlir/unittests/SDBM/SDBMTest.cpp +++ b/mlir/unittests/SDBM/SDBMTest.cpp @@ -15,11 +15,11 @@ // limitations under the License. // ============================================================================= -#include "mlir/SDBM/SDBM.h" +#include "mlir/Dialect/SDBM/SDBM.h" +#include "mlir/Dialect/SDBM/SDBMDialect.h" +#include "mlir/Dialect/SDBM/SDBMExpr.h" #include "mlir/IR/AffineExpr.h" #include "mlir/IR/MLIRContext.h" -#include "mlir/SDBM/SDBMDialect.h" -#include "mlir/SDBM/SDBMExpr.h" #include "gtest/gtest.h" #include "llvm/ADT/DenseSet.h" |
