[flang-commits] [flang] bb6d12b - [mlir] Flip default value of emitAccessorPrefix to kEmitAccessorPrefix_Prefixed
River Riddle via flang-commits
flang-commits at lists.llvm.org
Tue Sep 6 15:59:38 PDT 2022
Author: River Riddle
Date: 2022-09-06T15:56:57-07:00
New Revision: bb6d12b5ceb9386cce9021e7b6fa04696f3d294a
URL: https://github.com/llvm/llvm-project/commit/bb6d12b5ceb9386cce9021e7b6fa04696f3d294a
DIFF: https://github.com/llvm/llvm-project/commit/bb6d12b5ceb9386cce9021e7b6fa04696f3d294a.diff
LOG: [mlir] Flip default value of emitAccessorPrefix to kEmitAccessorPrefix_Prefixed
Most dialects have already flipped to prefixed, and the intention to switch
has been telegraphed for a while.
Differential Revision: https://reviews.llvm.org/D133179
Added:
Modified:
flang/include/flang/Optimizer/CodeGen/CGOps.td
flang/include/flang/Optimizer/Dialect/FIRDialect.td
mlir/docs/DefiningDialects.md
mlir/examples/standalone/include/Standalone/StandaloneDialect.td
mlir/examples/toy/Ch2/include/toy/Ops.td
mlir/examples/toy/Ch3/include/toy/Ops.td
mlir/examples/toy/Ch4/include/toy/Ops.td
mlir/examples/toy/Ch5/include/toy/Ops.td
mlir/examples/toy/Ch6/include/toy/Ops.td
mlir/examples/toy/Ch7/include/toy/Ops.td
mlir/include/mlir/Dialect/AMDGPU/AMDGPU.td
mlir/include/mlir/Dialect/AMX/AMX.td
mlir/include/mlir/Dialect/Affine/IR/AffineOps.td
mlir/include/mlir/Dialect/Arithmetic/IR/ArithmeticBase.td
mlir/include/mlir/Dialect/ArmNeon/ArmNeon.td
mlir/include/mlir/Dialect/ArmSVE/ArmSVE.td
mlir/include/mlir/Dialect/Bufferization/IR/BufferizationBase.td
mlir/include/mlir/Dialect/Complex/IR/ComplexBase.td
mlir/include/mlir/Dialect/ControlFlow/IR/ControlFlowOps.td
mlir/include/mlir/Dialect/DLTI/DLTIBase.td
mlir/include/mlir/Dialect/EmitC/IR/EmitCBase.td
mlir/include/mlir/Dialect/Func/IR/FuncOps.td
mlir/include/mlir/Dialect/LLVMIR/LLVMOpBase.td
mlir/include/mlir/Dialect/LLVMIR/NVVMOps.td
mlir/include/mlir/Dialect/LLVMIR/ROCDLOps.td
mlir/include/mlir/Dialect/MLProgram/IR/MLProgramBase.td
mlir/include/mlir/Dialect/Math/IR/MathBase.td
mlir/include/mlir/Dialect/NVGPU/IR/NVGPU.td
mlir/include/mlir/Dialect/PDLInterp/IR/PDLInterpOps.td
mlir/include/mlir/Dialect/Quant/QuantOpsBase.td
mlir/include/mlir/Dialect/SCF/IR/SCFOps.td
mlir/include/mlir/Dialect/Shape/IR/ShapeBase.td
mlir/include/mlir/Dialect/SparseTensor/IR/SparseTensorBase.td
mlir/include/mlir/Dialect/Tensor/IR/TensorBase.td
mlir/include/mlir/Dialect/Tosa/IR/TosaOpBase.td
mlir/include/mlir/Dialect/Transform/IR/TransformDialect.td
mlir/include/mlir/Dialect/Vector/IR/VectorOps.td
mlir/include/mlir/Dialect/X86Vector/X86Vector.td
mlir/include/mlir/IR/BuiltinDialect.td
mlir/include/mlir/IR/DialectBase.td
mlir/lib/TableGen/Operator.cpp
mlir/test/lib/Dialect/Test/TestDialect.td
mlir/test/mlir-tblgen/op-attribute.td
mlir/test/mlir-tblgen/op-decl-and-defs.td
Removed:
################################################################################
diff --git a/flang/include/flang/Optimizer/CodeGen/CGOps.td b/flang/include/flang/Optimizer/CodeGen/CGOps.td
index 52966dce963a1..936f5ad210d9a 100644
--- a/flang/include/flang/Optimizer/CodeGen/CGOps.td
+++ b/flang/include/flang/Optimizer/CodeGen/CGOps.td
@@ -20,6 +20,7 @@ include "flang/Optimizer/Dialect/FIRTypes.td"
def fircg_Dialect : Dialect {
let name = "fircg";
let cppNamespace = "::fir::cg";
+ let emitAccessorPrefix = kEmitAccessorPrefix_Raw;
}
// Base class for FIR CG operations.
diff --git a/flang/include/flang/Optimizer/Dialect/FIRDialect.td b/flang/include/flang/Optimizer/Dialect/FIRDialect.td
index 77d34c1d301d1..2be44368bfe92 100644
--- a/flang/include/flang/Optimizer/Dialect/FIRDialect.td
+++ b/flang/include/flang/Optimizer/Dialect/FIRDialect.td
@@ -24,7 +24,6 @@ include "mlir/Interfaces/SideEffectInterfaces.td"
def fir_Dialect : Dialect {
let name = "fir";
let cppNamespace = "::fir";
- let emitAccessorPrefix = kEmitAccessorPrefix_Prefixed;
let useDefaultTypePrinterParser = 0;
let useDefaultAttributePrinterParser = 0;
}
diff --git a/mlir/docs/DefiningDialects.md b/mlir/docs/DefiningDialects.md
index c043eabeacc8c..1b5a6fb48a150 100644
--- a/mlir/docs/DefiningDialects.md
+++ b/mlir/docs/DefiningDialects.md
@@ -327,8 +327,8 @@ This field may any of the following values:
* `kEmitAccessorPrefix_Both`
- Emit with **and** without prefix.
-All new dialects are strongly encouraged to use the `kEmitAccessorPrefix_Prefixed` value, as
-the `Raw` form is deprecated and in the process of being removed.
+All new dialects are strongly encouraged to use the default `kEmitAccessorPrefix_Prefixed`
+value, as the `Raw` form is deprecated and in the process of being removed.
Note: Remove this section when all dialects have been switched to the new accessor form.
diff --git a/mlir/examples/standalone/include/Standalone/StandaloneDialect.td b/mlir/examples/standalone/include/Standalone/StandaloneDialect.td
index f0d10ec42ea5f..158860134ea47 100644
--- a/mlir/examples/standalone/include/Standalone/StandaloneDialect.td
+++ b/mlir/examples/standalone/include/Standalone/StandaloneDialect.td
@@ -24,8 +24,6 @@ def Standalone_Dialect : Dialect {
working inside of the LLVM source tree.
}];
let cppNamespace = "::mlir::standalone";
-
- let emitAccessorPrefix = kEmitAccessorPrefix_Prefixed;
}
//===----------------------------------------------------------------------===//
diff --git a/mlir/examples/toy/Ch2/include/toy/Ops.td b/mlir/examples/toy/Ch2/include/toy/Ops.td
index e3e920ef6b79f..6462787381680 100644
--- a/mlir/examples/toy/Ch2/include/toy/Ops.td
+++ b/mlir/examples/toy/Ch2/include/toy/Ops.td
@@ -23,7 +23,6 @@ include "mlir/Interfaces/SideEffectInterfaces.td"
def Toy_Dialect : Dialect {
let name = "toy";
let cppNamespace = "::mlir::toy";
- let emitAccessorPrefix = kEmitAccessorPrefix_Prefixed;
}
// Base class for toy dialect operations. This operation inherits from the base
diff --git a/mlir/examples/toy/Ch3/include/toy/Ops.td b/mlir/examples/toy/Ch3/include/toy/Ops.td
index 1646bb846441c..580826bb4cb65 100644
--- a/mlir/examples/toy/Ch3/include/toy/Ops.td
+++ b/mlir/examples/toy/Ch3/include/toy/Ops.td
@@ -22,7 +22,6 @@ include "mlir/Interfaces/SideEffectInterfaces.td"
def Toy_Dialect : Dialect {
let name = "toy";
let cppNamespace = "::mlir::toy";
- let emitAccessorPrefix = kEmitAccessorPrefix_Prefixed;
}
// Base class for toy dialect operations. This operation inherits from the base
diff --git a/mlir/examples/toy/Ch4/include/toy/Ops.td b/mlir/examples/toy/Ch4/include/toy/Ops.td
index 672876eea5d1d..2bdae97bdd4db 100644
--- a/mlir/examples/toy/Ch4/include/toy/Ops.td
+++ b/mlir/examples/toy/Ch4/include/toy/Ops.td
@@ -25,7 +25,6 @@ include "toy/ShapeInferenceInterface.td"
def Toy_Dialect : Dialect {
let name = "toy";
let cppNamespace = "::mlir::toy";
- let emitAccessorPrefix = kEmitAccessorPrefix_Prefixed;
}
// Base class for toy dialect operations. This operation inherits from the base
diff --git a/mlir/examples/toy/Ch5/include/toy/Ops.td b/mlir/examples/toy/Ch5/include/toy/Ops.td
index 714ddef18ebf1..cd51e53c2c897 100644
--- a/mlir/examples/toy/Ch5/include/toy/Ops.td
+++ b/mlir/examples/toy/Ch5/include/toy/Ops.td
@@ -25,7 +25,6 @@ include "toy/ShapeInferenceInterface.td"
def Toy_Dialect : Dialect {
let name = "toy";
let cppNamespace = "::mlir::toy";
- let emitAccessorPrefix = kEmitAccessorPrefix_Prefixed;
}
// Base class for toy dialect operations. This operation inherits from the base
diff --git a/mlir/examples/toy/Ch6/include/toy/Ops.td b/mlir/examples/toy/Ch6/include/toy/Ops.td
index 2e1945e5e64c0..be432bf1d25de 100644
--- a/mlir/examples/toy/Ch6/include/toy/Ops.td
+++ b/mlir/examples/toy/Ch6/include/toy/Ops.td
@@ -25,7 +25,6 @@ include "toy/ShapeInferenceInterface.td"
def Toy_Dialect : Dialect {
let name = "toy";
let cppNamespace = "::mlir::toy";
- let emitAccessorPrefix = kEmitAccessorPrefix_Prefixed;
}
// Base class for toy dialect operations. This operation inherits from the base
diff --git a/mlir/examples/toy/Ch7/include/toy/Ops.td b/mlir/examples/toy/Ch7/include/toy/Ops.td
index 6b462c56c1b7b..3ec211ac72579 100644
--- a/mlir/examples/toy/Ch7/include/toy/Ops.td
+++ b/mlir/examples/toy/Ch7/include/toy/Ops.td
@@ -25,7 +25,6 @@ include "toy/ShapeInferenceInterface.td"
def Toy_Dialect : Dialect {
let name = "toy";
let cppNamespace = "::mlir::toy";
- let emitAccessorPrefix = kEmitAccessorPrefix_Prefixed;
// We set this bit to generate a declaration of the `materializeConstant`
// method so that we can materialize constants for our toy operations.
diff --git a/mlir/include/mlir/Dialect/AMDGPU/AMDGPU.td b/mlir/include/mlir/Dialect/AMDGPU/AMDGPU.td
index 040af3b9b27c3..c5d776b1f7837 100644
--- a/mlir/include/mlir/Dialect/AMDGPU/AMDGPU.td
+++ b/mlir/include/mlir/Dialect/AMDGPU/AMDGPU.td
@@ -23,7 +23,6 @@ def AMDGPU_Dialect : Dialect {
that will eventually be executed on AMD hardware.
}];
- let emitAccessorPrefix = kEmitAccessorPrefix_Prefixed;
let useDefaultAttributePrinterParser = 1;
}
diff --git a/mlir/include/mlir/Dialect/AMX/AMX.td b/mlir/include/mlir/Dialect/AMX/AMX.td
index eda90d4bf084c..f665672d143d1 100644
--- a/mlir/include/mlir/Dialect/AMX/AMX.td
+++ b/mlir/include/mlir/Dialect/AMX/AMX.td
@@ -55,8 +55,6 @@ def AMX_Dialect : Dialect {
For details, see the Intel documentation:
https://software.intel.com/content/www/us/en/develop/articles/intel-sdm.html
}];
-
- let emitAccessorPrefix = kEmitAccessorPrefix_Prefixed;
}
//===----------------------------------------------------------------------===//
diff --git a/mlir/include/mlir/Dialect/Affine/IR/AffineOps.td b/mlir/include/mlir/Dialect/Affine/IR/AffineOps.td
index 0c7a832414074..8e046286f8f72 100644
--- a/mlir/include/mlir/Dialect/Affine/IR/AffineOps.td
+++ b/mlir/include/mlir/Dialect/Affine/IR/AffineOps.td
@@ -24,8 +24,6 @@ def Affine_Dialect : Dialect {
let cppNamespace = "mlir";
let hasConstantMaterializer = 1;
let dependentDialects = ["arith::ArithmeticDialect"];
-
- let emitAccessorPrefix = kEmitAccessorPrefix_Prefixed;
}
// Base class for Affine dialect ops.
diff --git a/mlir/include/mlir/Dialect/Arithmetic/IR/ArithmeticBase.td b/mlir/include/mlir/Dialect/Arithmetic/IR/ArithmeticBase.td
index 38bcbf0ad2206..30f47cf24831b 100644
--- a/mlir/include/mlir/Dialect/Arithmetic/IR/ArithmeticBase.td
+++ b/mlir/include/mlir/Dialect/Arithmetic/IR/ArithmeticBase.td
@@ -23,7 +23,6 @@ def Arithmetic_Dialect : Dialect {
}];
let hasConstantMaterializer = 1;
- let emitAccessorPrefix = kEmitAccessorPrefix_Prefixed;
}
// The predicate indicates the type of the comparison to perform:
diff --git a/mlir/include/mlir/Dialect/ArmNeon/ArmNeon.td b/mlir/include/mlir/Dialect/ArmNeon/ArmNeon.td
index e0f3358c4817a..f3ce22d3c6570 100644
--- a/mlir/include/mlir/Dialect/ArmNeon/ArmNeon.td
+++ b/mlir/include/mlir/Dialect/ArmNeon/ArmNeon.td
@@ -28,8 +28,6 @@ def ArmNeon_Dialect : Dialect {
// Note: this does not need to depend on LLVMDialect as long as functions in
// this dialect (such as canonicalization) do not produce entities belonging
// to the LLVMDialect (ops or types).
-
- let emitAccessorPrefix = kEmitAccessorPrefix_Prefixed;
}
//===----------------------------------------------------------------------===//
diff --git a/mlir/include/mlir/Dialect/ArmSVE/ArmSVE.td b/mlir/include/mlir/Dialect/ArmSVE/ArmSVE.td
index da9d165e3d6f5..d3ff0584f4b19 100644
--- a/mlir/include/mlir/Dialect/ArmSVE/ArmSVE.td
+++ b/mlir/include/mlir/Dialect/ArmSVE/ArmSVE.td
@@ -28,8 +28,6 @@ def ArmSVE_Dialect : Dialect {
This dialect contains the definitions necessary to target specific Arm SVE
scalable vector operations.
}];
-
- let emitAccessorPrefix = kEmitAccessorPrefix_Prefixed;
}
//===----------------------------------------------------------------------===//
diff --git a/mlir/include/mlir/Dialect/Bufferization/IR/BufferizationBase.td b/mlir/include/mlir/Dialect/Bufferization/IR/BufferizationBase.td
index 8ed8d763f640e..09f3e73ffb2b1 100644
--- a/mlir/include/mlir/Dialect/Bufferization/IR/BufferizationBase.td
+++ b/mlir/include/mlir/Dialect/Bufferization/IR/BufferizationBase.td
@@ -51,7 +51,6 @@ def Bufferization_Dialect : Dialect {
kEscapeAttrName = "bufferization.escape";
}];
let hasOperationAttrVerify = 1;
- let emitAccessorPrefix = kEmitAccessorPrefix_Prefixed;
}
#endif // BUFFERIZATION_BASE
diff --git a/mlir/include/mlir/Dialect/Complex/IR/ComplexBase.td b/mlir/include/mlir/Dialect/Complex/IR/ComplexBase.td
index 15f131c278fdd..e3461902d9471 100644
--- a/mlir/include/mlir/Dialect/Complex/IR/ComplexBase.td
+++ b/mlir/include/mlir/Dialect/Complex/IR/ComplexBase.td
@@ -21,7 +21,6 @@ def Complex_Dialect : Dialect {
let dependentDialects = ["arith::ArithmeticDialect"];
let hasConstantMaterializer = 1;
- let emitAccessorPrefix = kEmitAccessorPrefix_Prefixed;
let useDefaultAttributePrinterParser = 1;
}
diff --git a/mlir/include/mlir/Dialect/ControlFlow/IR/ControlFlowOps.td b/mlir/include/mlir/Dialect/ControlFlow/IR/ControlFlowOps.td
index baba706061495..7cb22d821713a 100644
--- a/mlir/include/mlir/Dialect/ControlFlow/IR/ControlFlowOps.td
+++ b/mlir/include/mlir/Dialect/ControlFlow/IR/ControlFlowOps.td
@@ -23,7 +23,6 @@ def ControlFlow_Dialect : Dialect {
let name = "cf";
let cppNamespace = "::mlir::cf";
let dependentDialects = ["arith::ArithmeticDialect"];
- let emitAccessorPrefix = kEmitAccessorPrefix_Prefixed;
let description = [{
This dialect contains low-level, i.e. non-region based, control flow
constructs. These constructs generally represent control flow directly
diff --git a/mlir/include/mlir/Dialect/DLTI/DLTIBase.td b/mlir/include/mlir/Dialect/DLTI/DLTIBase.td
index 98fc68f4406c5..866cc934e05cb 100644
--- a/mlir/include/mlir/Dialect/DLTI/DLTIBase.td
+++ b/mlir/include/mlir/Dialect/DLTI/DLTIBase.td
@@ -37,8 +37,6 @@ def DLTI_Dialect : Dialect {
}];
let useDefaultAttributePrinterParser = 1;
-
- let emitAccessorPrefix = kEmitAccessorPrefix_Prefixed;
}
def DLTI_DataLayoutEntryAttr : DialectAttr<
diff --git a/mlir/include/mlir/Dialect/EmitC/IR/EmitCBase.td b/mlir/include/mlir/Dialect/EmitC/IR/EmitCBase.td
index 3050da070d42b..375dbcbce1d03 100644
--- a/mlir/include/mlir/Dialect/EmitC/IR/EmitCBase.td
+++ b/mlir/include/mlir/Dialect/EmitC/IR/EmitCBase.td
@@ -31,8 +31,6 @@ def EmitC_Dialect : Dialect {
let hasConstantMaterializer = 1;
let useDefaultTypePrinterParser = 1;
let useDefaultAttributePrinterParser = 1;
-
- let emitAccessorPrefix = kEmitAccessorPrefix_Prefixed;
}
#endif // MLIR_DIALECT_EMITC_IR_EMITCBASE
diff --git a/mlir/include/mlir/Dialect/Func/IR/FuncOps.td b/mlir/include/mlir/Dialect/Func/IR/FuncOps.td
index 925d52838c4b4..fbae2449258fd 100644
--- a/mlir/include/mlir/Dialect/Func/IR/FuncOps.td
+++ b/mlir/include/mlir/Dialect/Func/IR/FuncOps.td
@@ -23,7 +23,6 @@ def Func_Dialect : Dialect {
let cppNamespace = "::mlir::func";
let dependentDialects = ["cf::ControlFlowDialect"];
let hasConstantMaterializer = 1;
- let emitAccessorPrefix = kEmitAccessorPrefix_Prefixed;
}
// Base class for Func dialect ops.
diff --git a/mlir/include/mlir/Dialect/LLVMIR/LLVMOpBase.td b/mlir/include/mlir/Dialect/LLVMIR/LLVMOpBase.td
index 0933ad41f3530..683dc8221c03f 100644
--- a/mlir/include/mlir/Dialect/LLVMIR/LLVMOpBase.td
+++ b/mlir/include/mlir/Dialect/LLVMIR/LLVMOpBase.td
@@ -82,8 +82,6 @@ def LLVM_Dialect : Dialect {
/// of some deeply-nested aggregate types in the program.
ThreadLocalCache<DenseSet<Type>> compatibleTypes;
}];
-
- let emitAccessorPrefix = kEmitAccessorPrefix_Prefixed;
}
//===----------------------------------------------------------------------===//
diff --git a/mlir/include/mlir/Dialect/LLVMIR/NVVMOps.td b/mlir/include/mlir/Dialect/LLVMIR/NVVMOps.td
index fffa67ba88ec8..861ae0cc62622 100644
--- a/mlir/include/mlir/Dialect/LLVMIR/NVVMOps.td
+++ b/mlir/include/mlir/Dialect/LLVMIR/NVVMOps.td
@@ -37,8 +37,6 @@ def NVVM_Dialect : Dialect {
}];
let useDefaultAttributePrinterParser = 1;
-
- let emitAccessorPrefix = kEmitAccessorPrefix_Prefixed;
}
//===----------------------------------------------------------------------===//
diff --git a/mlir/include/mlir/Dialect/LLVMIR/ROCDLOps.td b/mlir/include/mlir/Dialect/LLVMIR/ROCDLOps.td
index 5cd634133f05c..b99d514f15b72 100644
--- a/mlir/include/mlir/Dialect/LLVMIR/ROCDLOps.td
+++ b/mlir/include/mlir/Dialect/LLVMIR/ROCDLOps.td
@@ -31,8 +31,6 @@ def ROCDL_Dialect : Dialect {
/// functions.
static StringRef getKernelFuncAttrName() { return "rocdl.kernel"; }
}];
-
- let emitAccessorPrefix = kEmitAccessorPrefix_Prefixed;
}
//===----------------------------------------------------------------------===//
diff --git a/mlir/include/mlir/Dialect/MLProgram/IR/MLProgramBase.td b/mlir/include/mlir/Dialect/MLProgram/IR/MLProgramBase.td
index dbce6b8aad624..a585059020eaf 100644
--- a/mlir/include/mlir/Dialect/MLProgram/IR/MLProgramBase.td
+++ b/mlir/include/mlir/Dialect/MLProgram/IR/MLProgramBase.td
@@ -29,7 +29,6 @@ def MLProgram_Dialect : Dialect {
let useDefaultAttributePrinterParser = 1;
let useDefaultTypePrinterParser = 1;
- let emitAccessorPrefix = kEmitAccessorPrefix_Prefixed;
}
#endif // MLPROGRAM_BASE
diff --git a/mlir/include/mlir/Dialect/Math/IR/MathBase.td b/mlir/include/mlir/Dialect/Math/IR/MathBase.td
index 0e1d19439612c..0189fd538b496 100644
--- a/mlir/include/mlir/Dialect/Math/IR/MathBase.td
+++ b/mlir/include/mlir/Dialect/Math/IR/MathBase.td
@@ -30,6 +30,5 @@ def Math_Dialect : Dialect {
```
}];
let hasConstantMaterializer = 1;
- let emitAccessorPrefix = kEmitAccessorPrefix_Prefixed;
}
#endif // MATH_BASE
diff --git a/mlir/include/mlir/Dialect/NVGPU/IR/NVGPU.td b/mlir/include/mlir/Dialect/NVGPU/IR/NVGPU.td
index 3b92f5461eca0..8858b6cfbf7a9 100644
--- a/mlir/include/mlir/Dialect/NVGPU/IR/NVGPU.td
+++ b/mlir/include/mlir/Dialect/NVGPU/IR/NVGPU.td
@@ -34,8 +34,6 @@ def NVGPU_Dialect : Dialect {
}];
let useDefaultTypePrinterParser = 1;
-
- let emitAccessorPrefix = kEmitAccessorPrefix_Prefixed;
}
/// Device-side synchronization token.
diff --git a/mlir/include/mlir/Dialect/PDLInterp/IR/PDLInterpOps.td b/mlir/include/mlir/Dialect/PDLInterp/IR/PDLInterpOps.td
index d38db3dc38440..f6a7c9a81c62c 100644
--- a/mlir/include/mlir/Dialect/PDLInterp/IR/PDLInterpOps.td
+++ b/mlir/include/mlir/Dialect/PDLInterp/IR/PDLInterpOps.td
@@ -48,7 +48,6 @@ def PDLInterp_Dialect : Dialect {
/// to rewrite the IR after a successful match.
static StringRef getRewriterModuleName() { return "rewriters"; }
}];
- let emitAccessorPrefix = kEmitAccessorPrefix_Prefixed;
}
//===----------------------------------------------------------------------===//
diff --git a/mlir/include/mlir/Dialect/Quant/QuantOpsBase.td b/mlir/include/mlir/Dialect/Quant/QuantOpsBase.td
index d0f1a9570b0f4..74d69c046f06b 100644
--- a/mlir/include/mlir/Dialect/Quant/QuantOpsBase.td
+++ b/mlir/include/mlir/Dialect/Quant/QuantOpsBase.td
@@ -20,8 +20,6 @@ def Quantization_Dialect : Dialect {
let cppNamespace = "::mlir::quant";
let useDefaultTypePrinterParser = 1;
-
- let emitAccessorPrefix = kEmitAccessorPrefix_Prefixed;
}
//===----------------------------------------------------------------------===//
diff --git a/mlir/include/mlir/Dialect/SCF/IR/SCFOps.td b/mlir/include/mlir/Dialect/SCF/IR/SCFOps.td
index 1cd1cb59e0965..d542093325a14 100644
--- a/mlir/include/mlir/Dialect/SCF/IR/SCFOps.td
+++ b/mlir/include/mlir/Dialect/SCF/IR/SCFOps.td
@@ -24,7 +24,6 @@ def SCF_Dialect : Dialect {
let name = "scf";
let cppNamespace = "::mlir::scf";
let dependentDialects = ["arith::ArithmeticDialect"];
- let emitAccessorPrefix = kEmitAccessorPrefix_Prefixed;
}
// Base class for SCF dialect ops.
diff --git a/mlir/include/mlir/Dialect/Shape/IR/ShapeBase.td b/mlir/include/mlir/Dialect/Shape/IR/ShapeBase.td
index d5a8a65b419d7..aca92150a1ba5 100644
--- a/mlir/include/mlir/Dialect/Shape/IR/ShapeBase.td
+++ b/mlir/include/mlir/Dialect/Shape/IR/ShapeBase.td
@@ -41,7 +41,6 @@ def ShapeDialect : Dialect {
let useDefaultTypePrinterParser = 1;
let hasConstantMaterializer = 1;
let hasOperationAttrVerify = 1;
- let emitAccessorPrefix = kEmitAccessorPrefix_Prefixed;
}
class Shape_Type<string name, string typeMnemonic> : TypeDef<ShapeDialect, name> {
diff --git a/mlir/include/mlir/Dialect/SparseTensor/IR/SparseTensorBase.td b/mlir/include/mlir/Dialect/SparseTensor/IR/SparseTensorBase.td
index 2534bf1eb4e2a..eebbef3e3215b 100644
--- a/mlir/include/mlir/Dialect/SparseTensor/IR/SparseTensorBase.td
+++ b/mlir/include/mlir/Dialect/SparseTensor/IR/SparseTensorBase.td
@@ -78,8 +78,6 @@ def SparseTensor_Dialect : Dialect {
}];
let useDefaultAttributePrinterParser = 1;
-
- let emitAccessorPrefix = kEmitAccessorPrefix_Prefixed;
}
#endif // SPARSETENSOR_BASE
diff --git a/mlir/include/mlir/Dialect/Tensor/IR/TensorBase.td b/mlir/include/mlir/Dialect/Tensor/IR/TensorBase.td
index b90ad98dc0559..9bf174d4e15fd 100644
--- a/mlir/include/mlir/Dialect/Tensor/IR/TensorBase.td
+++ b/mlir/include/mlir/Dialect/Tensor/IR/TensorBase.td
@@ -50,8 +50,6 @@ def Tensor_Dialect : Dialect {
"arith::ArithmeticDialect",
"complex::ComplexDialect",
];
-
- let emitAccessorPrefix = kEmitAccessorPrefix_Prefixed;
}
#endif // TENSOR_BASE
diff --git a/mlir/include/mlir/Dialect/Tosa/IR/TosaOpBase.td b/mlir/include/mlir/Dialect/Tosa/IR/TosaOpBase.td
index baf55968c0411..0f0898321a321 100644
--- a/mlir/include/mlir/Dialect/Tosa/IR/TosaOpBase.td
+++ b/mlir/include/mlir/Dialect/Tosa/IR/TosaOpBase.td
@@ -45,8 +45,6 @@ def Tosa_Dialect : Dialect {
let cppNamespace = "mlir::tosa";
let hasConstantMaterializer = 1;
let useDefaultAttributePrinterParser = 1;
-
- let emitAccessorPrefix = kEmitAccessorPrefix_Prefixed;
}
//===----------------------------------------------------------------------===//
diff --git a/mlir/include/mlir/Dialect/Transform/IR/TransformDialect.td b/mlir/include/mlir/Dialect/Transform/IR/TransformDialect.td
index bf1a5224a0400..54ff0f064f077 100644
--- a/mlir/include/mlir/Dialect/Transform/IR/TransformDialect.td
+++ b/mlir/include/mlir/Dialect/Transform/IR/TransformDialect.td
@@ -299,7 +299,6 @@ def Transform_Dialect : Dialect {
let name = "transform";
let cppNamespace = "::mlir::transform";
- let emitAccessorPrefix = kEmitAccessorPrefix_Prefixed;
let dependentDialects = [
"::mlir::pdl::PDLDialect",
diff --git a/mlir/include/mlir/Dialect/Vector/IR/VectorOps.td b/mlir/include/mlir/Dialect/Vector/IR/VectorOps.td
index d2fe879dcd2b8..9a41bdaf0eb1d 100644
--- a/mlir/include/mlir/Dialect/Vector/IR/VectorOps.td
+++ b/mlir/include/mlir/Dialect/Vector/IR/VectorOps.td
@@ -27,7 +27,6 @@ def Vector_Dialect : Dialect {
let useDefaultAttributePrinterParser = 1;
let hasConstantMaterializer = 1;
let dependentDialects = ["arith::ArithmeticDialect"];
- let emitAccessorPrefix = kEmitAccessorPrefix_Prefixed;
}
// Base class for Vector dialect ops.
diff --git a/mlir/include/mlir/Dialect/X86Vector/X86Vector.td b/mlir/include/mlir/Dialect/X86Vector/X86Vector.td
index c67704517d95a..03fa89ef899a6 100644
--- a/mlir/include/mlir/Dialect/X86Vector/X86Vector.td
+++ b/mlir/include/mlir/Dialect/X86Vector/X86Vector.td
@@ -24,8 +24,6 @@ include "mlir/Dialect/LLVMIR/LLVMOpBase.td"
def X86Vector_Dialect : Dialect {
let name = "x86vector";
let cppNamespace = "::mlir::x86vector";
-
- let emitAccessorPrefix = kEmitAccessorPrefix_Prefixed;
}
//===----------------------------------------------------------------------===//
diff --git a/mlir/include/mlir/IR/BuiltinDialect.td b/mlir/include/mlir/IR/BuiltinDialect.td
index 69cb01ddd5d50..a3d0f0cbfd9a4 100644
--- a/mlir/include/mlir/IR/BuiltinDialect.td
+++ b/mlir/include/mlir/IR/BuiltinDialect.td
@@ -34,7 +34,6 @@ def Builtin_Dialect : Dialect {
public:
}];
- let emitAccessorPrefix = kEmitAccessorPrefix_Prefixed;
}
#endif // BUILTIN_BASE
diff --git a/mlir/include/mlir/IR/DialectBase.td b/mlir/include/mlir/IR/DialectBase.td
index df0a164d0f5de..f2f0790b1c6b5 100644
--- a/mlir/include/mlir/IR/DialectBase.td
+++ b/mlir/include/mlir/IR/DialectBase.td
@@ -97,7 +97,7 @@ class Dialect {
// leaving UpperCamel unchanged while also converting lowerCamel to
// UpperCamel) and prefixed with `get` or `set` depending on if it is a getter
// or setter.
- int emitAccessorPrefix = kEmitAccessorPrefix_Raw;
+ int emitAccessorPrefix = kEmitAccessorPrefix_Prefixed;
// If this dialect can be extended at runtime with new operations or types.
bit isExtensible = 0;
diff --git a/mlir/lib/TableGen/Operator.cpp b/mlir/lib/TableGen/Operator.cpp
index dbfc315afae6b..94046675c8ebe 100644
--- a/mlir/lib/TableGen/Operator.cpp
+++ b/mlir/lib/TableGen/Operator.cpp
@@ -727,7 +727,7 @@ getGetterOrSetterNames(bool isGetter, const Operator &op, StringRef name) {
shouldSkip = true;
}
if (newName == "getType") {
- if (op.getNumResults() == 0)
+ if (op.getNumResults() != 1)
return false;
shouldSkip = true;
}
diff --git a/mlir/test/lib/Dialect/Test/TestDialect.td b/mlir/test/lib/Dialect/Test/TestDialect.td
index d13d6abc77554..0bc789fa8b16e 100644
--- a/mlir/test/lib/Dialect/Test/TestDialect.td
+++ b/mlir/test/lib/Dialect/Test/TestDialect.td
@@ -14,7 +14,6 @@ include "mlir/IR/OpBase.td"
def Test_Dialect : Dialect {
let name = "test";
let cppNamespace = "::test";
- let emitAccessorPrefix = kEmitAccessorPrefix_Prefixed;
let hasCanonicalizer = 1;
let hasConstantMaterializer = 1;
let hasOperationAttrVerify = 1;
diff --git a/mlir/test/mlir-tblgen/op-attribute.td b/mlir/test/mlir-tblgen/op-attribute.td
index 3e632d7502179..ac18dedec337c 100644
--- a/mlir/test/mlir-tblgen/op-attribute.td
+++ b/mlir/test/mlir-tblgen/op-attribute.td
@@ -171,7 +171,6 @@ def AOp : NS_Op<"a_op", []> {
def Test2_Dialect : Dialect {
let name = "test2";
let cppNamespace = "foobar2";
- let emitAccessorPrefix = kEmitAccessorPrefix_Prefixed;
}
def AgetOp : Op<Test2_Dialect, "a_get_op", []> {
let arguments = (ins
diff --git a/mlir/test/mlir-tblgen/op-decl-and-defs.td b/mlir/test/mlir-tblgen/op-decl-and-defs.td
index 76d76c974a733..c644a1755802b 100644
--- a/mlir/test/mlir-tblgen/op-decl-and-defs.td
+++ b/mlir/test/mlir-tblgen/op-decl-and-defs.td
@@ -12,7 +12,6 @@ include "mlir/Interfaces/SideEffectInterfaces.td"
def Test_Dialect : Dialect {
let name = "test";
let cppNamespace = "NS";
- let emitAccessorPrefix = kEmitAccessorPrefix_Prefixed;
}
class NS_Op<string mnemonic, list<Trait> traits> :
Op<Test_Dialect, mnemonic, traits>;
More information about the flang-commits
mailing list