Use consistent names for dialect op source files

This CL changes dialect op source files (.h, .cpp, .td) to follow the following convention: <full-dialect-name>/<dialect-namespace>Ops.{h|cpp|td} Builtin and standard dialects are specially treated, though. Both of them do not have dialect namespace; the former is still named as BuiltinOps.* and the latter is named as Ops.*. Purely mechanical. NFC. PiperOrigin-RevId: 236371358
2019-03-01 13:48:24 -08:00 · 2019-03-01 13:48:24 -08:00 · 85d9b6c8f7
parent 8254aabd4a
commit 85d9b6c8f7
37 changed files with 45 additions and 45 deletions
--- a/mlir/include/mlir/IR/BuiltinOps.h
+++ b/mlir/include/mlir/IR/BuiltinOps.h
@ -1,4 +1,4 @@
-//===- BuiltinOps.h - Builtin MLIR Operations -----------------*- C++ -*-===//
+//===- BuiltinOps.h - Builtin MLIR Operations -------------------*- C++ -*-===//
 //
 // Copyright 2019 The MLIR Authors.
 //
--- a/mlir/include/mlir/IR/op_base.td
+++ b/mlir/include/mlir/IR/op_base.td
@ -1,4 +1,4 @@
-//===-- op_base.td - Base op definition file ---------------*- tablegen -*-===//
+//===-- OpBase.td - Base op definition file ----------------*- tablegen -*-===//
 //
 // Copyright 2019 The MLIR Authors.
 //
--- a/mlir/include/mlir/LLVMIR/LLVMDialect.h
+++ b/mlir/include/mlir/LLVMIR/LLVMDialect.h
@ -67,7 +67,7 @@ public:

 ///// Ops /////
 #define GET_OP_CLASSES
-#include "mlir/LLVMIR/llvm_ops.inc"
+#include "mlir/LLVMIR/LLVMOps.inc"

 namespace LLVM {
 class LLVMDialect : public Dialect {
--- a/mlir/include/mlir/LLVMIR/llvm_ops.td
+++ b/mlir/include/mlir/LLVMIR/llvm_ops.td
@ -1,4 +1,4 @@
-//===-- llvm_ops.td - LLVM IR dialect op definition file ---*- tablegen -*-===//
+//===-- LLVMOps.td - LLVM IR dialect op definition file ----*- tablegen -*-===//
 //
 // Copyright 2019 The MLIR Authors.
 //
@ -25,7 +25,7 @@

 #ifdef OP_BASE
 #else
-include "mlir/IR/op_base.td"
+include "mlir/IR/OpBase.td"
 #endif // OP_BASE

 // LLVM IR type wrapped in MLIR.
--- a/mlir/include/mlir/StandardOps/StandardOps.h
+++ b/mlir/include/mlir/StandardOps/StandardOps.h
@ -1,4 +1,4 @@
-//===- StandardOps.h - Standard MLIR Operations -----------------*- C++ -*-===//
+//===- Ops.h - Standard MLIR Operations -------------------------*- C++ -*-===//
 //
 // Copyright 2019 The MLIR Authors.
 //
@ -20,8 +20,8 @@
 //
 //===----------------------------------------------------------------------===//

-#ifndef MLIR_STANDARDOPS_STANDARDOPS_H
-#define MLIR_STANDARDOPS_STANDARDOPS_H
+#ifndef MLIR_STANDARDOPS_OPS_H
+#define MLIR_STANDARDOPS_OPS_H

 #include "mlir/IR/Attributes.h"
 #include "mlir/IR/Dialect.h"
@ -38,7 +38,7 @@ public:
 };

 #define GET_OP_CLASSES
-#include "mlir/StandardOps/standard_ops.inc"
+#include "mlir/StandardOps/Ops.inc"

 /// The "alloc" operation allocates a region of memory, as specified by its
 /// memref type. For example:
@ -751,4 +751,4 @@ private:

 } // end namespace mlir

-#endif
+#endif // MLIR_STANDARDOPS_OPS_H
--- a/mlir/include/mlir/StandardOps/standard_ops.td
+++ b/mlir/include/mlir/StandardOps/standard_ops.td
@ -1,4 +1,4 @@
-//===- standard_ops.td - Standard operation definitions ----*- tablegen -*-===//
+//===- Ops.td - Standard operation definitions -------------*- tablegen -*-===//
 //
 // Copyright 2019 The MLIR Authors.
 //
@ -25,7 +25,7 @@

 #ifdef OP_BASE
 #else
-include "mlir/IR/op_base.td"
+include "mlir/IR/OpBase.td"
 #endif // OP_BASE

 def AnyType : Type<CPred<"true">, "any type">;
--- a/mlir/lib/AffineOps/AffineOps.cpp
+++ b/mlir/lib/AffineOps/AffineOps.cpp
@ -23,7 +23,7 @@
 #include "mlir/IR/Matchers.h"
 #include "mlir/IR/OpImplementation.h"
 #include "mlir/IR/PatternMatch.h"
-#include "mlir/StandardOps/StandardOps.h"
+#include "mlir/StandardOps/Ops.h"
 #include "llvm/ADT/SmallBitVector.h"
 #include "llvm/Support/Debug.h"
 using namespace mlir;
--- a/mlir/lib/Analysis/AffineAnalysis.cpp
+++ b/mlir/lib/Analysis/AffineAnalysis.cpp
@ -29,7 +29,7 @@
 #include "mlir/IR/BuiltinOps.h"
 #include "mlir/IR/Instruction.h"
 #include "mlir/IR/IntegerSet.h"
-#include "mlir/StandardOps/StandardOps.h"
+#include "mlir/StandardOps/Ops.h"
 #include "mlir/Support/MathExtras.h"
 #include "mlir/Support/STLExtras.h"
 #include "llvm/ADT/DenseMap.h"
--- a/mlir/lib/Analysis/LoopAnalysis.cpp
+++ b/mlir/lib/Analysis/LoopAnalysis.cpp
@ -29,7 +29,7 @@
 #include "mlir/IR/Builders.h"
 #include "mlir/IR/BuiltinOps.h"
 #include "mlir/IR/Instruction.h"
-#include "mlir/StandardOps/StandardOps.h"
+#include "mlir/StandardOps/Ops.h"
 #include "mlir/SuperVectorOps/SuperVectorOps.h"
 #include "mlir/Support/Functional.h"
 #include "mlir/Support/MathExtras.h"
--- a/mlir/lib/Analysis/MemRefBoundCheck.cpp
+++ b/mlir/lib/Analysis/MemRefBoundCheck.cpp
@ -27,7 +27,7 @@
 #include "mlir/IR/Builders.h"
 #include "mlir/IR/BuiltinOps.h"
 #include "mlir/Pass/Pass.h"
-#include "mlir/StandardOps/StandardOps.h"
+#include "mlir/StandardOps/Ops.h"
 #include "llvm/Support/Debug.h"

 #define DEBUG_TYPE "memref-bound-check"
--- a/mlir/lib/Analysis/MemRefDependenceCheck.cpp
+++ b/mlir/lib/Analysis/MemRefDependenceCheck.cpp
@ -26,7 +26,7 @@
 #include "mlir/IR/Builders.h"
 #include "mlir/IR/BuiltinOps.h"
 #include "mlir/Pass/Pass.h"
-#include "mlir/StandardOps/StandardOps.h"
+#include "mlir/StandardOps/Ops.h"
 #include "llvm/Support/Debug.h"

 #define DEBUG_TYPE "memref-dependence-check"
--- 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/StandardOps.h"
+#include "mlir/StandardOps/Ops.h"

 #include "llvm/ADT/ArrayRef.h"
 #include "llvm/ADT/STLExtras.h"
--- a/mlir/lib/Analysis/Utils.cpp
+++ b/mlir/lib/Analysis/Utils.cpp
@ -27,7 +27,7 @@
 #include "mlir/Analysis/AffineStructures.h"
 #include "mlir/IR/Builders.h"
 #include "mlir/IR/BuiltinOps.h"
-#include "mlir/StandardOps/StandardOps.h"
+#include "mlir/StandardOps/Ops.h"
 #include "llvm/ADT/DenseMap.h"
 #include "llvm/Support/Debug.h"
 #include "llvm/Support/raw_ostream.h"
--- a/mlir/lib/Analysis/VectorAnalysis.cpp
+++ b/mlir/lib/Analysis/VectorAnalysis.cpp
@ -22,7 +22,7 @@
 #include "mlir/IR/BuiltinOps.h"
 #include "mlir/IR/Instruction.h"
 #include "mlir/IR/IntegerSet.h"
-#include "mlir/StandardOps/StandardOps.h"
+#include "mlir/StandardOps/Ops.h"
 #include "mlir/SuperVectorOps/SuperVectorOps.h"
 #include "mlir/Support/Functional.h"
 #include "mlir/Support/STLExtras.h"
--- a/mlir/lib/EDSC/LowerEDSCTestPass.cpp
+++ b/mlir/lib/EDSC/LowerEDSCTestPass.cpp
@ -25,7 +25,7 @@
 #include "mlir/IR/StandardTypes.h"
 #include "mlir/IR/Types.h"
 #include "mlir/Pass/Pass.h"
-#include "mlir/StandardOps/StandardOps.h"
+#include "mlir/StandardOps/Ops.h"
 #include "mlir/Transforms/LoopUtils.h"
 #include "llvm/Support/raw_ostream.h"

--- a/mlir/lib/EDSC/MLIREmitter.cpp
+++ b/mlir/lib/EDSC/MLIREmitter.cpp
@ -32,7 +32,7 @@
 #include "mlir/IR/Location.h"
 #include "mlir/IR/OpDefinition.h"
 #include "mlir/IR/Value.h"
-#include "mlir/StandardOps/StandardOps.h"
+#include "mlir/StandardOps/Ops.h"
 #include "mlir/SuperVectorOps/SuperVectorOps.h"
 #include "mlir/Support/Functional.h"
 #include "mlir/Support/STLExtras.h"
--- a/mlir/lib/EDSC/Types.cpp
+++ b/mlir/lib/EDSC/Types.cpp
@ -27,7 +27,7 @@
 #include "mlir/IR/Function.h"
 #include "mlir/IR/OperationSupport.h"
 #include "mlir/IR/StandardTypes.h"
-#include "mlir/StandardOps/StandardOps.h"
+#include "mlir/StandardOps/Ops.h"
 #include "mlir/SuperVectorOps/SuperVectorOps.h"
 #include "mlir/Support/STLExtras.h"

--- a/mlir/lib/LLVMIR/IR/LLVMDialect.cpp
+++ b/mlir/lib/LLVMIR/IR/LLVMDialect.cpp
@ -68,7 +68,7 @@ LLVMDialect::LLVMDialect(MLIRContext *context)
  addTypes<LLVMType>();
 #define GET_OP_LIST
  addOperations<
-#include "mlir/LLVMIR/llvm_ops.inc"
+#include "mlir/LLVMIR/LLVMOps.inc"
      >();
 }

--- a/mlir/lib/LLVMIR/Transforms/ConvertToLLVMDialect.cpp
+++ b/mlir/lib/LLVMIR/Transforms/ConvertToLLVMDialect.cpp
@ -27,7 +27,7 @@
 #include "mlir/IR/PatternMatch.h"
 #include "mlir/LLVMIR/LLVMDialect.h"
 #include "mlir/Pass/Pass.h"
-#include "mlir/StandardOps/StandardOps.h"
+#include "mlir/StandardOps/Ops.h"
 #include "mlir/Support/Functional.h"
 #include "mlir/Transforms/DialectConversion.h"
 #include "mlir/Transforms/Passes.h"
--- a/mlir/lib/StandardOps/DialectRegistration.cpp
+++ b/mlir/lib/StandardOps/DialectRegistration.cpp
@ -15,7 +15,7 @@
 // limitations under the License.
 // =============================================================================

-#include "mlir/StandardOps/StandardOps.h"
+#include "mlir/StandardOps/Ops.h"
 using namespace mlir;

 // Static initialization for standard op dialect registration.
--- a/mlir/lib/StandardOps/StandardOps.cpp
+++ b/mlir/lib/StandardOps/StandardOps.cpp
@ -1,4 +1,4 @@
-//===- StandardOps.cpp - Standard MLIR Operations -------------------------===//
+//===- Ops.cpp - Standard MLIR Operations ---------------------------------===//
 //
 // Copyright 2019 The MLIR Authors.
 //
@ -15,7 +15,7 @@
 // limitations under the License.
 // =============================================================================

-#include "mlir/StandardOps/StandardOps.h"
+#include "mlir/StandardOps/Ops.h"
 #include "mlir/IR/AffineExpr.h"
 #include "mlir/IR/AffineMap.h"
 #include "mlir/IR/Builders.h"
@ -41,7 +41,7 @@ StandardOpsDialect::StandardOpsDialect(MLIRContext *context)
                DmaStartOp, DmaWaitOp, ExtractElementOp, LoadOp, MemRefCastOp,
                SelectOp, StoreOp, TensorCastOp,
 #define GET_OP_LIST
-#include "mlir/StandardOps/standard_ops.inc"
+#include "mlir/StandardOps/Ops.inc"
                >();
 }

--- a/mlir/lib/Target/LLVMIR/ConvertToLLVMIR.cpp
+++ b/mlir/lib/Target/LLVMIR/ConvertToLLVMIR.cpp
@ -22,7 +22,7 @@
 #include "mlir/IR/Attributes.h"
 #include "mlir/IR/Module.h"
 #include "mlir/LLVMIR/LLVMDialect.h"
-#include "mlir/StandardOps/StandardOps.h"
+#include "mlir/StandardOps/Ops.h"
 #include "mlir/Support/FileUtilities.h"
 #include "mlir/Support/LLVM.h"
 #include "mlir/Translation.h"
--- a/mlir/lib/Transforms/DmaGeneration.cpp
+++ b/mlir/lib/Transforms/DmaGeneration.cpp
@ -27,7 +27,7 @@
 #include "mlir/IR/Builders.h"
 #include "mlir/IR/BuiltinOps.h"
 #include "mlir/Pass/Pass.h"
-#include "mlir/StandardOps/StandardOps.h"
+#include "mlir/StandardOps/Ops.h"
 #include "mlir/Transforms/Passes.h"
 #include "mlir/Transforms/Utils.h"
 #include "llvm/ADT/MapVector.h"
--- a/mlir/lib/Transforms/LoopFusion.cpp
+++ b/mlir/lib/Transforms/LoopFusion.cpp
@ -29,7 +29,7 @@
 #include "mlir/IR/Builders.h"
 #include "mlir/IR/BuiltinOps.h"
 #include "mlir/Pass/Pass.h"
-#include "mlir/StandardOps/StandardOps.h"
+#include "mlir/StandardOps/Ops.h"
 #include "mlir/Transforms/LoopUtils.h"
 #include "mlir/Transforms/Passes.h"
 #include "mlir/Transforms/Utils.h"
--- a/mlir/lib/Transforms/LowerAffine.cpp
+++ b/mlir/lib/Transforms/LowerAffine.cpp
@ -27,7 +27,7 @@
 #include "mlir/IR/IntegerSet.h"
 #include "mlir/IR/MLIRContext.h"
 #include "mlir/Pass/Pass.h"
-#include "mlir/StandardOps/StandardOps.h"
+#include "mlir/StandardOps/Ops.h"
 #include "mlir/Support/Functional.h"
 #include "mlir/Transforms/Passes.h"
 using namespace mlir;
--- a/mlir/lib/Transforms/LowerVectorTransfers.cpp
+++ b/mlir/lib/Transforms/LowerVectorTransfers.cpp
@ -37,7 +37,7 @@
 #include "mlir/IR/PatternMatch.h"
 #include "mlir/IR/Types.h"
 #include "mlir/Pass/Pass.h"
-#include "mlir/StandardOps/StandardOps.h"
+#include "mlir/StandardOps/Ops.h"
 #include "mlir/SuperVectorOps/SuperVectorOps.h"
 #include "mlir/Support/Functional.h"
 #include "mlir/Transforms/MLPatternLoweringPass.h"
--- a/mlir/lib/Transforms/MaterializeVectors.cpp
+++ b/mlir/lib/Transforms/MaterializeVectors.cpp
@ -37,7 +37,7 @@
 #include "mlir/IR/OperationSupport.h"
 #include "mlir/IR/Types.h"
 #include "mlir/Pass/Pass.h"
-#include "mlir/StandardOps/StandardOps.h"
+#include "mlir/StandardOps/Ops.h"
 #include "mlir/SuperVectorOps/SuperVectorOps.h"
 #include "mlir/Support/Functional.h"
 #include "mlir/Support/LLVM.h"
--- a/mlir/lib/Transforms/MemRefDataFlowOpt.cpp
+++ b/mlir/lib/Transforms/MemRefDataFlowOpt.cpp
@ -26,7 +26,7 @@
 #include "mlir/Analysis/Dominance.h"
 #include "mlir/Analysis/Utils.h"
 #include "mlir/Pass/Pass.h"
-#include "mlir/StandardOps/StandardOps.h"
+#include "mlir/StandardOps/Ops.h"
 #include "mlir/Transforms/Passes.h"
 #include "llvm/ADT/SmallPtrSet.h"
 #include <algorithm>
--- a/mlir/lib/Transforms/PipelineDataTransfer.cpp
+++ b/mlir/lib/Transforms/PipelineDataTransfer.cpp
@ -27,7 +27,7 @@
 #include "mlir/Analysis/Utils.h"
 #include "mlir/IR/Builders.h"
 #include "mlir/Pass/Pass.h"
-#include "mlir/StandardOps/StandardOps.h"
+#include "mlir/StandardOps/Ops.h"
 #include "mlir/Transforms/LoopUtils.h"
 #include "mlir/Transforms/Utils.h"
 #include "llvm/ADT/DenseMap.h"
--- a/mlir/lib/Transforms/Utils/LoopUtils.cpp
+++ b/mlir/lib/Transforms/Utils/LoopUtils.cpp
@ -31,7 +31,7 @@
 #include "mlir/IR/Builders.h"
 #include "mlir/IR/BuiltinOps.h"
 #include "mlir/IR/Instruction.h"
-#include "mlir/StandardOps/StandardOps.h"
+#include "mlir/StandardOps/Ops.h"
 #include "llvm/ADT/DenseMap.h"
 #include "llvm/Support/Debug.h"

--- a/mlir/lib/Transforms/Utils/Utils.cpp
+++ b/mlir/lib/Transforms/Utils/Utils.cpp
@ -29,7 +29,7 @@
 #include "mlir/Analysis/Utils.h"
 #include "mlir/IR/Builders.h"
 #include "mlir/IR/Module.h"
-#include "mlir/StandardOps/StandardOps.h"
+#include "mlir/StandardOps/Ops.h"
 #include "mlir/Support/MathExtras.h"
 #include "llvm/ADT/DenseMap.h"
 using namespace mlir;
--- a/mlir/lib/Transforms/Vectorize.cpp
+++ b/mlir/lib/Transforms/Vectorize.cpp
@ -30,7 +30,7 @@
 #include "mlir/IR/Location.h"
 #include "mlir/IR/Types.h"
 #include "mlir/Pass/Pass.h"
-#include "mlir/StandardOps/StandardOps.h"
+#include "mlir/StandardOps/Ops.h"
 #include "mlir/SuperVectorOps/SuperVectorOps.h"
 #include "mlir/Support/Functional.h"
 #include "mlir/Support/LLVM.h"
--- a/mlir/test/EDSC/api-test.cpp
+++ b/mlir/test/EDSC/api-test.cpp
@ -27,7 +27,7 @@
 #include "mlir/IR/StandardTypes.h"
 #include "mlir/IR/Types.h"
 #include "mlir/Pass/Pass.h"
-#include "mlir/StandardOps/StandardOps.h"
+#include "mlir/StandardOps/Ops.h"
 #include "mlir/Transforms/LoopUtils.h"

 #include "Test.h"
--- a/mlir/test/mlir-tblgen/one-op-one-result.td
+++ b/mlir/test/mlir-tblgen/one-op-one-result.td
@ -1,6 +1,6 @@
 // RUN: mlir-tblgen -gen-rewriters -I %S/../../include %s | FileCheck %s

-include "mlir/IR/op_base.td"
+include "mlir/IR/OpBase.td"

 // Create a Type and Attribute.
 def T : BuildableType<"buildT">;
--- a/mlir/test/mlir-tblgen/op-result.td
+++ b/mlir/test/mlir-tblgen/op-result.td
@ -1,6 +1,6 @@
 // RUN: mlir-tblgen -gen-op-definitions -I %S/../../include %s | FileCheck %s

-include "mlir/IR/op_base.td"
+include "mlir/IR/OpBase.td"

 def SameTypeOp : Op<"same_type_op", [SameValueType]> {
  let arguments = (ins I32:$x);
--- a/mlir/test/mlir-tblgen/predicate.td
+++ b/mlir/test/mlir-tblgen/predicate.td
@ -1,6 +1,6 @@
 // RUN: mlir-tblgen -gen-op-definitions -I %S/../../include %s | FileCheck %s

-include "mlir/IR/op_base.td"
+include "mlir/IR/OpBase.td"

 def I32OrF32 : Type<CPred<"{0}.isInteger(32) || {0}.isF32()">,
                    "32-bit integer or floating-point type">;
--- a/mlir/test/mlir-tblgen/reference-impl.td
+++ b/mlir/test/mlir-tblgen/reference-impl.td
@ -2,7 +2,7 @@

 #ifdef OP_BASE
 #else
-include "mlir/IR/op_base.td"
+include "mlir/IR/OpBase.td"
 #endif // OP_BASE

 def X_AddOp : Op<"x.add">,