NFC: Move LLVMIR, SDBM, and StandardOps to the Dialect/ directory.

PiperOrigin-RevId: 264193915
hehaoqian · Aug 19, 2019 · 893e184 · 893e184
1 parent 636c414
commit 893e184
Show file tree

Hide file tree

Showing 96 changed files with 128 additions and 128 deletions.
diff --git a/examples/Linalg/Linalg1/include/linalg1/Common.h b/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/examples/Linalg/Linalg1/include/linalg1/LLVMIntrinsics.h b/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/examples/Linalg/Linalg1/lib/Common.cpp b/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/examples/Linalg/Linalg1/lib/ConvertToLLVMDialect.cpp b/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/examples/Linalg/Linalg3/lib/ConvertToLLVMDialect.cpp b/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/examples/toy/Ch2/mlir/MLIRGen.cpp b/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/examples/toy/Ch3/mlir/MLIRGen.cpp b/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/examples/toy/Ch4/mlir/MLIRGen.cpp b/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/examples/toy/Ch4/mlir/ShapeInferencePass.cpp b/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/examples/toy/Ch5/mlir/EarlyLowering.cpp b/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/examples/toy/Ch5/mlir/LateLowering.cpp b/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/examples/toy/Ch5/mlir/MLIRGen.cpp b/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/examples/toy/Ch5/mlir/ShapeInferencePass.cpp b/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/include/mlir/CMakeLists.txt b/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/include/mlir/Dialect/CMakeLists.txt b/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/include/mlir/LLVMIR/CMakeLists.txt → include/mlir/Dialect/LLVMIR/CMakeLists.txt b/include/mlir/LLVMIR/CMakeLists.txt → include/mlir/Dialect/LLVMIR/CMakeLists.txt
diff --git a/include/mlir/LLVMIR/LLVMDialect.h → include/mlir/Dialect/LLVMIR/LLVMDialect.h b/include/mlir/LLVMIR/LLVMDialect.h → 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 @@ class LLVMType : public mlir::Type::TypeBase<LLVMType, mlir::Type,
 
 ///// 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 @@ class LLVMDialect : public Dialect {
 } // end namespace LLVM
 } // end namespace mlir
 
-#endif // MLIR_TARGET_LLVMDIALECT_H_
+#endif // MLIR_DIALECT_LLVMIR_LLVMDIALECT_H_
diff --git a/include/mlir/LLVMIR/LLVMOpBase.td → include/mlir/Dialect/LLVMIR/LLVMOpBase.td b/include/mlir/LLVMIR/LLVMOpBase.td → include/mlir/Dialect/LLVMIR/LLVMOpBase.td
diff --git a/include/mlir/LLVMIR/LLVMOps.td → include/mlir/Dialect/LLVMIR/LLVMOps.td b/include/mlir/LLVMIR/LLVMOps.td → 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/include/mlir/LLVMIR/NVVMDialect.h → include/mlir/Dialect/LLVMIR/NVVMDialect.h b/include/mlir/LLVMIR/NVVMDialect.h → 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 @@ class NVVMDialect : public Dialect {
 } // namespace NVVM
 } // namespace mlir
 
-#endif /* MLIR_LLVMIR_NVVMDIALECT_H_ */
+#endif /* MLIR_DIALECT_LLVMIR_NVVMDIALECT_H_ */
diff --git a/include/mlir/LLVMIR/NVVMOps.td → include/mlir/Dialect/LLVMIR/NVVMOps.td b/include/mlir/LLVMIR/NVVMOps.td → 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/include/mlir/SDBM/SDBM.h → include/mlir/Dialect/SDBM/SDBM.h b/include/mlir/SDBM/SDBM.h → 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 @@ class SDBM {
 
 } // namespace mlir
 
-#endif // INCLUDE_MLIR_IR_SDBM_H
+#endif // MLIR_DIALECT_SDBM_SDBM_H
diff --git a/include/mlir/SDBM/SDBMDialect.h → include/mlir/Dialect/SDBM/SDBMDialect.h b/include/mlir/SDBM/SDBMDialect.h → 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 @@ class SDBMDialect : public Dialect {
 };
 } // namespace mlir
 
-#endif // MLIR_SDBM_SDBMDIALECT_H
+#endif // MLIR_DIALECT_SDBM_SDBMDIALECT_H
diff --git a/include/mlir/SDBM/SDBMExpr.h → include/mlir/Dialect/SDBM/SDBMExpr.h b/include/mlir/SDBM/SDBMExpr.h → 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/include/mlir/StandardOps/CMakeLists.txt → ...e/mlir/Dialect/StandardOps/CMakeLists.txt b/include/mlir/StandardOps/CMakeLists.txt → ...e/mlir/Dialect/StandardOps/CMakeLists.txt
diff --git a/include/mlir/StandardOps/Ops.h → include/mlir/Dialect/StandardOps/Ops.h b/include/mlir/StandardOps/Ops.h → 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/include/mlir/StandardOps/Ops.td → include/mlir/Dialect/StandardOps/Ops.td b/include/mlir/StandardOps/Ops.td → include/mlir/Dialect/StandardOps/Ops.td
diff --git a/include/mlir/EDSC/Builders.h b/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/include/mlir/Transforms/Utils.h b/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/lib/AffineOps/AffineOps.cpp b/lib/AffineOps/AffineOps.cpp
@@ -16,14 +16,14 @@
 // =============================================================================
 
 #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"
 #include "mlir/IR/IntegerSet.h"
 #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"