NFC: Remove unnecessarily guarded tablegen includes.

River707 · tensorflower-gardener · commit 71da5c29c008 · 2019-11-22T18:01:57.000-08:00
Support for including a file multiple times was added in tablegen, removing the need for these extra guards. This is because we already insert c/c++ style header guards within each of the specific .td files.

PiperOrigin-RevId: 282076728
diff --git a/examples/toy/Ch2/include/toy/Ops.td b/examples/toy/Ch2/include/toy/Ops.td
@@ -22,9 +22,7 @@
 #ifndef TOY_OPS
 #define TOY_OPS
 
-#ifndef OP_BASE
 include "mlir/IR/OpBase.td"
-#endif // OP_BASE
 
 // Provide a definition of the 'toy' dialect in the ODS framework so that we
 // can define our operations.
diff --git a/examples/toy/Ch3/include/toy/Ops.td b/examples/toy/Ch3/include/toy/Ops.td
@@ -22,9 +22,7 @@
 #ifndef TOY_OPS
 #define TOY_OPS
 
-#ifndef OP_BASE
 include "mlir/IR/OpBase.td"
-#endif // OP_BASE
 
 // Provide a definition of the 'toy' dialect in the ODS framework so that we
 // can define our operations.
diff --git a/examples/toy/Ch3/mlir/ToyCombine.td b/examples/toy/Ch3/mlir/ToyCombine.td
@@ -23,9 +23,7 @@
 #ifndef TOY_COMBINE
 #define TOY_COMBINE
 
-#ifndef OP_BASE
 include "toy/Ops.td"
-#endif // OP_BASE
 
 /// Note: The DRR definition used for defining patterns is shown below:
 ///
diff --git a/examples/toy/Ch4/include/toy/Ops.td b/examples/toy/Ch4/include/toy/Ops.td
@@ -22,13 +22,8 @@
 #ifndef TOY_OPS
 #define TOY_OPS
 
-#ifndef MLIR_CALLINTERFACES
 include "mlir/Analysis/CallInterfaces.td"
-#endif // MLIR_CALLINTERFACES
-
-#ifndef SHAPE_INFERENCE_INTERFACE
 include "toy/ShapeInferenceInterface.td"
-#endif // SHAPE_INFERENCE_INTERFACE
 
 // Provide a definition of the 'toy' dialect in the ODS framework so that we
 // can define our operations.
diff --git a/examples/toy/Ch4/include/toy/ShapeInferenceInterface.td b/examples/toy/Ch4/include/toy/ShapeInferenceInterface.td
@@ -22,9 +22,7 @@
 #ifndef SHAPE_INFERENCE_INTERFACE
 #define SHAPE_INFERENCE_INTERFACE
 
-#ifndef OP_BASE
 include "mlir/IR/OpBase.td"
-#endif // OP_BASE
 
 def ShapeInferenceOpInterface : OpInterface<"ShapeInference"> {
   let description = [{
diff --git a/examples/toy/Ch4/mlir/ToyCombine.td b/examples/toy/Ch4/mlir/ToyCombine.td
@@ -23,9 +23,7 @@
 #ifndef TOY_COMBINE
 #define TOY_COMBINE
 
-#ifndef OP_BASE
 include "toy/Ops.td"
-#endif // OP_BASE
 
 /// Note: The DRR definition used for defining patterns is shown below:
 ///
diff --git a/examples/toy/Ch5/include/toy/Ops.td b/examples/toy/Ch5/include/toy/Ops.td
@@ -22,13 +22,8 @@
 #ifndef TOY_OPS
 #define TOY_OPS
 
-#ifndef MLIR_CALLINTERFACES
 include "mlir/Analysis/CallInterfaces.td"
-#endif // MLIR_CALLINTERFACES
-
-#ifndef SHAPE_INFERENCE_INTERFACE
 include "toy/ShapeInferenceInterface.td"
-#endif // SHAPE_INFERENCE_INTERFACE
 
 // Provide a definition of the 'toy' dialect in the ODS framework so that we
 // can define our operations.
diff --git a/examples/toy/Ch5/include/toy/ShapeInferenceInterface.td b/examples/toy/Ch5/include/toy/ShapeInferenceInterface.td
@@ -22,9 +22,7 @@
 #ifndef SHAPE_INFERENCE_INTERFACE
 #define SHAPE_INFERENCE_INTERFACE
 
-#ifndef OP_BASE
 include "mlir/IR/OpBase.td"
-#endif // OP_BASE
 
 def ShapeInferenceOpInterface : OpInterface<"ShapeInference"> {
   let description = [{
diff --git a/examples/toy/Ch5/mlir/ToyCombine.td b/examples/toy/Ch5/mlir/ToyCombine.td
@@ -23,9 +23,7 @@
 #ifndef TOY_COMBINE
 #define TOY_COMBINE
 
-#ifndef OP_BASE
 include "toy/Ops.td"
-#endif // OP_BASE
 
 /// Note: The DRR definition used for defining patterns is shown below:
 ///
diff --git a/examples/toy/Ch6/include/toy/Ops.td b/examples/toy/Ch6/include/toy/Ops.td
@@ -22,13 +22,8 @@
 #ifndef TOY_OPS
 #define TOY_OPS
 
-#ifndef MLIR_CALLINTERFACES
 include "mlir/Analysis/CallInterfaces.td"
-#endif // MLIR_CALLINTERFACES
-
-#ifndef SHAPE_INFERENCE_INTERFACE
 include "toy/ShapeInferenceInterface.td"
-#endif // SHAPE_INFERENCE_INTERFACE
 
 // Provide a definition of the 'toy' dialect in the ODS framework so that we
 // can define our operations.
diff --git a/examples/toy/Ch6/include/toy/ShapeInferenceInterface.td b/examples/toy/Ch6/include/toy/ShapeInferenceInterface.td
@@ -22,9 +22,7 @@
 #ifndef SHAPE_INFERENCE_INTERFACE
 #define SHAPE_INFERENCE_INTERFACE
 
-#ifndef OP_BASE
 include "mlir/IR/OpBase.td"
-#endif // OP_BASE
 
 def ShapeInferenceOpInterface : OpInterface<"ShapeInference"> {
   let description = [{
diff --git a/examples/toy/Ch6/mlir/ToyCombine.td b/examples/toy/Ch6/mlir/ToyCombine.td
@@ -23,9 +23,7 @@
 #ifndef TOY_COMBINE
 #define TOY_COMBINE
 
-#ifndef OP_BASE
 include "toy/Ops.td"
-#endif // OP_BASE
 
 /// Note: The DRR definition used for defining patterns is shown below:
 ///
diff --git a/examples/toy/Ch7/include/toy/Ops.td b/examples/toy/Ch7/include/toy/Ops.td
@@ -22,13 +22,8 @@
 #ifndef TOY_OPS
 #define TOY_OPS
 
-#ifndef MLIR_CALLINTERFACES
 include "mlir/Analysis/CallInterfaces.td"
-#endif // MLIR_CALLINTERFACES
-
-#ifndef SHAPE_INFERENCE_INTERFACE
 include "toy/ShapeInferenceInterface.td"
-#endif // SHAPE_INFERENCE_INTERFACE
 
 // Provide a definition of the 'toy' dialect in the ODS framework so that we
 // can define our operations.
diff --git a/examples/toy/Ch7/include/toy/ShapeInferenceInterface.td b/examples/toy/Ch7/include/toy/ShapeInferenceInterface.td
@@ -22,9 +22,7 @@
 #ifndef SHAPE_INFERENCE_INTERFACE
 #define SHAPE_INFERENCE_INTERFACE
 
-#ifndef OP_BASE
 include "mlir/IR/OpBase.td"
-#endif // OP_BASE
 
 def ShapeInferenceOpInterface : OpInterface<"ShapeInference"> {
   let description = [{
diff --git a/examples/toy/Ch7/mlir/ToyCombine.td b/examples/toy/Ch7/mlir/ToyCombine.td
@@ -23,9 +23,7 @@
 #ifndef TOY_COMBINE
 #define TOY_COMBINE
 
-#ifndef OP_BASE
 include "toy/Ops.td"
-#endif // OP_BASE
 
 /// Note: The DRR definition used for defining patterns is shown below:
 ///
diff --git a/include/mlir/Analysis/CallInterfaces.td b/include/mlir/Analysis/CallInterfaces.td
@@ -24,9 +24,7 @@
 #ifndef MLIR_CALLINTERFACES
 #define MLIR_CALLINTERFACES
 
-#ifndef OP_BASE
 include "mlir/IR/OpBase.td"
-#endif // OP_BASE
 
 // `CallInterfaceCallable`: This is a type used to represent a single callable
 // region. A callable is either a symbol, or an SSA value, that is referenced by
diff --git a/include/mlir/Analysis/InferTypeOpInterface.td b/include/mlir/Analysis/InferTypeOpInterface.td
@@ -23,9 +23,7 @@
 #ifndef MLIR_INFERTYPEOPINTERFACE
 #define MLIR_INFERTYPEOPINTERFACE
 
-#ifndef OP_BASE
 include "mlir/IR/OpBase.td"
-#endif // OP_BASE
 
 // OpInterface to compute the return type of an operation. The arguments match
 // those in Operation::create with the exception that the location is optional
diff --git a/include/mlir/Dialect/AffineOps/AffineOps.td b/include/mlir/Dialect/AffineOps/AffineOps.td
@@ -22,15 +22,9 @@
 #ifndef AFFINE_OPS
 #define AFFINE_OPS
 
-#ifndef OP_BASE
+include "mlir/Dialect/AffineOps/AffineOpsBase.td"
 include "mlir/IR/OpBase.td"
-#endif // OP_BASE
-
-#ifndef MLIR_LOOPLIKEINTERFACE
 include "mlir/Transforms/LoopLikeInterface.td"
-#endif
-
-include "mlir/Dialect/AffineOps/AffineOpsBase.td"
 
 def Affine_Dialect : Dialect {
   let name = "affine";
diff --git a/include/mlir/Dialect/AffineOps/AffineOpsBase.td b/include/mlir/Dialect/AffineOps/AffineOpsBase.td
@@ -22,9 +22,7 @@
 #ifndef AFFINE_OPS_BASE
 #define AFFINE_OPS_BASE
 
-#ifndef OP_BASE
 include "mlir/IR/OpBase.td"
-#endif // OP_BASE
 
 // Attributes containing affine maps.
 def AffineMapAttr : Attr<
diff --git a/include/mlir/Dialect/FxpMathOps/FxpMathOps.td b/include/mlir/Dialect/FxpMathOps/FxpMathOps.td
@@ -22,10 +22,8 @@
 
 #ifndef DIALECT_FXPMATHOPS_FXPMATH_OPS_
 #define DIALECT_FXPMATHOPS_FXPMATH_OPS_
-#ifndef OP_BASE
-include "mlir/IR/OpBase.td"
-#endif // OP_BASE
 
+include "mlir/IR/OpBase.td"
 include "mlir/Dialect/QuantOps/QuantPredicates.td"
 
 def fxpmath_Dialect : Dialect {
diff --git a/include/mlir/Dialect/GPU/GPUOps.td b/include/mlir/Dialect/GPU/GPUOps.td
@@ -22,9 +22,7 @@
 #ifndef GPU_OPS
 #define GPU_OPS
 
-#ifndef OP_BASE
 include "mlir/IR/OpBase.td"
-#endif // OP_BASE
 
 def GPU_Dialect : Dialect {
   let name = "gpu";
diff --git a/include/mlir/Dialect/LLVMIR/LLVMOpBase.td b/include/mlir/Dialect/LLVMIR/LLVMOpBase.td
@@ -23,9 +23,7 @@
 #ifndef LLVMIR_OP_BASE
 #define LLVMIR_OP_BASE
 
-#ifndef OP_BASE
 include "mlir/IR/OpBase.td"
-#endif // OP_BASE
 
 def LLVM_Dialect : Dialect {
   let name = "llvm";
diff --git a/include/mlir/Dialect/Linalg/IR/LinalgBase.td b/include/mlir/Dialect/Linalg/IR/LinalgBase.td
@@ -19,13 +19,11 @@
 //
 //===----------------------------------------------------------------------===//
 
-#ifndef OP_BASE
-include "mlir/IR/OpBase.td"
-#endif // OP_BASE
-
 #ifndef LINALG_BASE
 #define LINALG_BASE
 
+include "mlir/IR/OpBase.td"
+
 def Linalg_Dialect : Dialect {
   let name = "linalg";
   let description = [{
diff --git a/include/mlir/Dialect/Linalg/IR/LinalgLibraryOps.td b/include/mlir/Dialect/Linalg/IR/LinalgLibraryOps.td
@@ -23,13 +23,8 @@
 #ifndef LINALG_LIBRARY_OPS
 #define LINALG_LIBRARY_OPS
 
-#ifndef AFFINE_OPS_BASE
 include "mlir/Dialect/AffineOps/AffineOpsBase.td"
-#endif // AFFINE_OPS_BASE
-
-#ifndef LINALG_BASE
 include "mlir/Dialect/Linalg/IR/LinalgBase.td"
-#endif // LINALG_BASE
 
 class LinalgParametricNativeOpTrait<string prop, string parameters> :
   NativeOpTrait<"linalg::" # prop # parameters>
diff --git a/include/mlir/Dialect/Linalg/IR/LinalgOps.td b/include/mlir/Dialect/Linalg/IR/LinalgOps.td
@@ -22,13 +22,8 @@
 #ifndef LINALG_OPS
 #define LINALG_OPS
 
-#ifndef AFFINE_OPS_BASE
 include "mlir/Dialect/AffineOps/AffineOpsBase.td"
-#endif // AFFINE_OPS_BASE
-
-#ifndef LINALG_BASE
 include "mlir/Dialect/Linalg/IR/LinalgBase.td"
-#endif // LINALG_BASE
 
 // Base class for Linalg dialect ops that do not correspond to library calls.
 class Linalg_Op<string mnemonic, list<OpTrait> traits = []> :
diff --git a/include/mlir/Dialect/Linalg/Transforms/LinalgTransformPatterns.td b/include/mlir/Dialect/Linalg/Transforms/LinalgTransformPatterns.td
@@ -22,12 +22,8 @@
 #ifndef LINALG_TRANSFORMS
 #define LINALG_TRANSFORMS
 
-#ifndef LINALG_OPS
 include "mlir/Dialect/Linalg/IR/LinalgOps.td"
-#endif // LINALG_OPS
-#ifndef LINALG_LIBRARY_OPS
 include "mlir/Dialect/Linalg/IR/LinalgLibraryOps.td"
-#endif // LINALG_LIBRARY_OPS
 
 def HasNoLinalgTransformMarker : CPred<[{
   !$0.getAttrOfType<StringAttr>(LinalgTransforms::kLinalgTransformMarker)
diff --git a/include/mlir/Dialect/LoopOps/LoopOps.td b/include/mlir/Dialect/LoopOps/LoopOps.td
@@ -22,13 +22,8 @@
 #ifndef LOOP_OPS
 #define LOOP_OPS
 
-#ifndef OP_BASE
 include "mlir/IR/OpBase.td"
-#endif // OP_BASE
-
-#ifndef MLIR_LOOPLIKEINTERFACE
 include "mlir/Transforms/LoopLikeInterface.td"
-#endif
 
 def Loop_Dialect : Dialect {
   let name = "loop";
diff --git a/include/mlir/Dialect/QuantOps/QuantOps.td b/include/mlir/Dialect/QuantOps/QuantOps.td
@@ -21,10 +21,9 @@
 
 #ifndef DIALECT_QUANTOPS_QUANT_OPS_
 #define DIALECT_QUANTOPS_QUANT_OPS_
-#ifndef OP_BASE
+
 include "mlir/IR/OpBase.td"
 include "mlir/Dialect/QuantOps/QuantPredicates.td"
-#endif // OP_BASE
 
 def quant_Dialect : Dialect {
   let name = "quant";
diff --git a/include/mlir/Dialect/SPIRV/SPIRVArithmeticOps.td b/include/mlir/Dialect/SPIRV/SPIRVArithmeticOps.td
@@ -23,9 +23,7 @@
 #ifndef SPIRV_ARITHMETIC_OPS
 #define SPIRV_ARITHMETIC_OPS
 
-#ifndef SPIRV_BASE
-include "mlir/SPIRV/SPIRVBase.td"
-#endif // SPIRV_BASE
+include "mlir/Dialect/SPIRV/SPIRVBase.td"
 
 class SPV_ArithmeticBinaryOp<string mnemonic, Type type,
                        list<OpTrait> traits = []> :
diff --git a/include/mlir/Dialect/SPIRV/SPIRVBase.td b/include/mlir/Dialect/SPIRV/SPIRVBase.td
@@ -24,9 +24,7 @@
 #ifndef SPIRV_BASE
 #define SPIRV_BASE
 
-#ifndef OP_BASE
 include "mlir/IR/OpBase.td"
-#endif // OP_BASE
 
 //===----------------------------------------------------------------------===//
 // SPIR-V dialect definitions
diff --git a/include/mlir/Dialect/SPIRV/SPIRVBitOps.td b/include/mlir/Dialect/SPIRV/SPIRVBitOps.td
@@ -23,9 +23,7 @@
 #ifndef SPIRV_BIT_OPS
 #define SPIRV_BIT_OPS
 
-#ifndef SPIRV_BASE
-include "mlir/SPIRV/SPIRVBase.td"
-#endif // SPIRV_BASE
+include "mlir/Dialect/SPIRV/SPIRVBase.td"
 
 class SPV_BitBinaryOp<string mnemonic, list<OpTrait> traits = []> :
       // All the operands type used in bit instructions are SPV_Integer.
diff --git a/include/mlir/Dialect/SPIRV/SPIRVCastOps.td b/include/mlir/Dialect/SPIRV/SPIRVCastOps.td
@@ -23,9 +23,7 @@
 #ifndef SPIRV_CAST_OPS
 #define SPIRV_CAST_OPS
 
-#ifndef SPIRV_BASE
-include "mlir/SPIRV/SPIRVBase.td"
-#endif // SPIRV_BASE
+include "mlir/Dialect/SPIRV/SPIRVBase.td"
 
 class SPV_CastOp<string mnemonic, Type resultType, Type operandType,
                  list<OpTrait> traits = []> :
diff --git a/include/mlir/Dialect/SPIRV/SPIRVControlFlowOps.td b/include/mlir/Dialect/SPIRV/SPIRVControlFlowOps.td
@@ -23,13 +23,8 @@
 #ifndef SPIRV_CONTROLFLOW_OPS
 #define SPIRV_CONTROLFLOW_OPS
 
-#ifndef SPIRV_BASE
-include "mlir/SPIRV/SPIRVBase.td"
-#endif // SPIRV_BASE
-
-#ifndef MLIR_CALLINTERFACES
+include "mlir/Dialect/SPIRV/SPIRVBase.td"
 include "mlir/Analysis/CallInterfaces.td"
-#endif // MLIR_CALLINTERFACES
 
 // -----
 
diff --git a/include/mlir/Dialect/SPIRV/SPIRVGLSLOps.td b/include/mlir/Dialect/SPIRV/SPIRVGLSLOps.td
@@ -22,9 +22,7 @@
 #ifndef SPIRV_GLSL_OPS
 #define SPIRV_GLSL_OPS
 
-#ifndef SPIRV_BASE
 include "mlir/Dialect/SPIRV/SPIRVBase.td"
-#endif // SPIRV_BASE
 
 //===----------------------------------------------------------------------===//
 // SPIR-V GLSL 4.50 opcode specification.
diff --git a/include/mlir/Dialect/SPIRV/SPIRVLogicalOps.td b/include/mlir/Dialect/SPIRV/SPIRVLogicalOps.td
diff --git a/include/mlir/Dialect/SPIRV/SPIRVOps.td b/include/mlir/Dialect/SPIRV/SPIRVOps.td
diff --git a/include/mlir/Dialect/SPIRV/SPIRVStructureOps.td b/include/mlir/Dialect/SPIRV/SPIRVStructureOps.td
diff --git a/include/mlir/Dialect/StandardOps/Ops.td b/include/mlir/Dialect/StandardOps/Ops.td
diff --git a/include/mlir/Dialect/VectorOps/VectorOps.td b/include/mlir/Dialect/VectorOps/VectorOps.td
diff --git a/include/mlir/IR/OpAsmInterface.td b/include/mlir/IR/OpAsmInterface.td
diff --git a/include/mlir/Transforms/LoopLikeInterface.td b/include/mlir/Transforms/LoopLikeInterface.td
diff --git a/lib/Conversion/GPUToNVVM/GPUToNVVM.td b/lib/Conversion/GPUToNVVM/GPUToNVVM.td
diff --git a/lib/Conversion/StandardToSPIRV/StandardToSPIRV.td b/lib/Conversion/StandardToSPIRV/StandardToSPIRV.td
diff --git a/test/lib/DeclarativeTransforms/TestLinalgTransformPatterns.td b/test/lib/DeclarativeTransforms/TestLinalgTransformPatterns.td
diff --git a/test/mlir-tblgen/reference-impl.td b/test/mlir-tblgen/reference-impl.td
