Set the namespace of the StandardOps dialect to "std", but add a special case to the parser to allow parsing standard operations without the "std" prefix. This will now allow for the standard dialect to be looked up dynamically by name.

PiperOrigin-RevId: 236493865

Author: River707

mlir/bindings/python/test/test_py2and3.py

@@ -34,10 +34,10 @@ def testCustomOp(self):
     with E.ContextManager():
       a, b = (E.Expr(E.Bindable(self.i32Type)) for _ in range(2))
       c1 = self.module.op(
-          "constant",
+          "std.constant",
           self.i32Type, [],
           value=self.module.integerAttr(self.i32Type, 42))
-      expr = self.module.op("addi", self.i32Type, [c1, b])
+      expr = self.module.op("std.addi", self.i32Type, [c1, b])
       str = expr.__str__()
       self.assertIn("addi(42, $2)", str)
 
@@ -99,7 +99,7 @@ def testIndexed(self):
       A, B, C = list(map(E.Indexed, [E.Bindable(memrefType) for _ in range(3)]))
       stmt = C.store([i, j], A.load([i, k]) * B.load([k, j]))
       str = stmt.__str__()
-      self.assertIn(" = store(", str)
+      self.assertIn(" = std.store(", str)
 
   def testMatmul(self):
     with E.ContextManager():
@@ -118,7 +118,7 @@ def testMatmul(self):
       self.assertIn("for($1 = $4 to $7 step $10) {", str)
       self.assertIn("for($2 = $5 to $8 step $11) {", str)
       self.assertIn("for($3 = $6 to $9 step $12) {", str)
-      self.assertIn(" = store", str)
+      self.assertIn(" = std.store", str)
 
   def testArithmetic(self):
     with E.ContextManager():
@@ -353,10 +353,10 @@ def testCustomOpCompilation(self):
       emitter = E.MLIRFunctionEmitter(f)
       funcArg, = emitter.bind_function_arguments()
       c1 = self.module.op(
-          "constant",
+          "std.constant",
           self.i32Type, [],
           value=self.module.integerAttr(self.i32Type, 42))
-      expr = self.module.op("addi", self.i32Type, [c1, funcArg])
+      expr = self.module.op("std.addi", self.i32Type, [c1, funcArg])
       block = E.Block([E.Stmt(expr), E.Return()])
       emitter.emit_inplace(block)
       self.module.compile()

mlir/g3doc/LangRef.md

@@ -1391,8 +1391,8 @@ Examples:
 %y = dim %A, 1 : tensor<4 x ? x f32>
 
 // Equivalent generic form:
-%x = "dim"(%A){index: 0} : (tensor<4 x ? x f32>) -> index
-%y = "dim"(%A){index: 1} : (tensor<4 x ? x f32>) -> index
+%x = "std.dim"(%A){index: 0} : (tensor<4 x ? x f32>) -> index
+%y = "std.dim"(%A){index: 1} : (tensor<4 x ? x f32>) -> index
 ```
 
 #### 'reshape' operation {#'reshape'-operation}
@@ -1461,7 +1461,7 @@ Example:
 // sized base memref with the slice size being half the base memref's
 // dynamic size and with an offset of %0
 #map_c = (i, j)[s0, s1]->(i + s0, j) size(4, s1)
-%s1 = "divi"(%n1, 2) : (i32, i32) -> i32
+%s1 = "std.divi"(%n1, 2) : (i32, i32) -> i32
 %C = view memref<16x?xf32, #map_a, hbm> -> memref<4x?xf32, #map_c, hbm>
           (%s1) [%0, %n1] %A : memref<16x?xf32, #map_a, hbm>
 ```
@@ -1807,13 +1807,13 @@ Examples:
 %x = cmpi "slt", %lhs, %rhs : i32
 
 // Generic form of the same operation.
-%x = "cmpi"(%lhs, %rhs){predicate: 2} : (i32, i32) -> i1
+%x = "std.cmpi"(%lhs, %rhs){predicate: 2} : (i32, i32) -> i1
 
 // Custom form of vector equality comparison.
 %x = cmpi "eq", %lhs, %rhs : vector<4xi64>
 
 // Generic form of the same operation.
-%x = "cmpi"(%lhs, %rhs){predicate: 0}
+%x = "std.cmpi"(%lhs, %rhs){predicate: 0}
     : (vector<4xi64>, vector<4xi64> -> vector<4xi1>
 ```
 
@@ -1885,8 +1885,8 @@ Examples:
 %3 = constant @myfn : (tensor<16xf32>, f32) -> tensor<16xf32>
 
 // Equivalent generic forms
-%1 = "constant"(){value: 42} : i32
-%3 = "constant"(){value: @myfn}
+%1 = "std.constant"(){value: 42} : i32
+%3 = "std.constant"(){value: @myfn}
    : () -> (tensor<16xf32>, f32) -> tensor<16xf32>
 
 ```
@@ -2089,10 +2089,10 @@ Examples:
 %x = select %cond, %true, %false : i32
 
 // Generic form of the same operation.
-%x = "select"(%cond, %true, %false) : (i1, i32, i32) -> i32
+%x = "std.select"(%cond, %true, %false) : (i1, i32, i32) -> i32
 
 // Vector selection is element-wise
-%vx = "select"(%vcond, %vtrue, %vfalse)
+%vx = "std.select"(%vcond, %vtrue, %vfalse)
     : (vector<42xi1>, vector<42xf32>, vector<42xf32>) -> vector<42xf32>
 ```
 
@@ -2120,15 +2120,15 @@ Examples:
 
 ```mlir {.mlir}
 // Convert from unknown rank to rank 2 with unknown dimension sizes.
-%2 = "tensor_cast"(%1) : (tensor<*xf32>) -> tensor<?x?xf32>
+%2 = "std.tensor_cast"(%1) : (tensor<*xf32>) -> tensor<?x?xf32>
 %2 = tensor_cast %1 : tensor<*xf32> to tensor<?x?xf32>
 
 // Convert to a type with more known dimensions.
-%3 = "tensor_cast"(%2) : (tensor<?x?xf32>) -> tensor<4x?xf32>
+%3 = "std.tensor_cast"(%2) : (tensor<?x?xf32>) -> tensor<4x?xf32>
 
 // Discard static dimension and rank information.
-%4 = "tensor_cast"(%3) : (tensor<4x?xf32>) -> tensor<?x?xf32>
-%5 = "tensor_cast"(%4) : (tensor<?x?xf32>) -> tensor<*xf32>
+%4 = "std.tensor_cast"(%3) : (tensor<4x?xf32>) -> tensor<?x?xf32>
+%5 = "std.tensor_cast"(%4) : (tensor<?x?xf32>) -> tensor<*xf32>
 ```
 
 Convert a tensor from one type to an equivalent type without changing any data

mlir/include/mlir/StandardOps/Ops.h

@@ -32,6 +32,12 @@ namespace mlir {
 class AffineMap;
 class Builder;
 
+namespace detail {
+/// A custom binary operation printer that omits the "std." prefix from the
+/// operation names.
+void printStandardBinaryOp(const Instruction *op, OpAsmPrinter *p);
+} // namespace detail
+
 class StandardOpsDialect : public Dialect {
 public:
   StandardOpsDialect(MLIRContext *context);
@@ -67,7 +73,7 @@ class AllocOp
     return getResult()->getType().cast<MemRefType>();
   }
 
-  static StringRef getOperationName() { return "alloc"; }
+  static StringRef getOperationName() { return "std.alloc"; }
 
   // Hooks to customize behavior of this op.
   static void build(Builder *builder, OperationState *result,
@@ -96,7 +102,7 @@ class AllocOp
 class BranchOp : public Op<BranchOp, OpTrait::VariadicOperands,
                            OpTrait::ZeroResult, OpTrait::IsTerminator> {
 public:
-  static StringRef getOperationName() { return "br"; }
+  static StringRef getOperationName() { return "std.br"; }
 
   static void build(Builder *builder, OperationState *result, Block *dest,
                     ArrayRef<Value *> operands = {});
@@ -129,7 +135,7 @@ class BranchOp : public Op<BranchOp, OpTrait::VariadicOperands,
 class CallOp
     : public Op<CallOp, OpTrait::VariadicOperands, OpTrait::VariadicResults> {
 public:
-  static StringRef getOperationName() { return "call"; }
+  static StringRef getOperationName() { return "std.call"; }
 
   static void build(Builder *builder, OperationState *result, Function *callee,
                     ArrayRef<Value *> operands);
@@ -173,7 +179,7 @@ class CallOp
 class CallIndirectOp : public Op<CallIndirectOp, OpTrait::VariadicOperands,
                                  OpTrait::VariadicResults> {
 public:
-  static StringRef getOperationName() { return "call_indirect"; }
+  static StringRef getOperationName() { return "std.call_indirect"; }
 
   static void build(Builder *builder, OperationState *result, Value *callee,
                     ArrayRef<Value *> operands);
@@ -245,7 +251,7 @@ enum class CmpIPredicate {
 ///
 ///   %r1 = cmpi "eq" %0, %1 : i32
 ///   %r2 = cmpi "slt" %0, %1 : tensor<42x42xi64>
-///   %r3 = "cmpi"(%0, %1){predicate: 0} : (i8, i8) -> i1
+///   %r3 = "std.cmpi"(%0, %1){predicate: 0} : (i8, i8) -> i1
 class CmpIOp
     : public Op<CmpIOp, OpTrait::OperandsAreIntegerLike,
                 OpTrait::SameTypeOperands, OpTrait::NOperands<2>::Impl,
@@ -257,7 +263,7 @@ class CmpIOp
         .getInt();
   }
 
-  static StringRef getOperationName() { return "cmpi"; }
+  static StringRef getOperationName() { return "std.cmpi"; }
   static StringRef getPredicateAttrName() { return "predicate"; }
   static CmpIPredicate getPredicateByName(StringRef name);
 
@@ -296,7 +302,7 @@ class CondBranchOp : public Op<CondBranchOp, OpTrait::AtLeastNOperands<1>::Impl,
   /// follows:
   /// { condition, [true_operands], [false_operands] }
 public:
-  static StringRef getOperationName() { return "cond_br"; }
+  static StringRef getOperationName() { return "std.cond_br"; }
 
   static void build(Builder *builder, OperationState *result, Value *condition,
                     Block *trueDest, ArrayRef<Value *> trueOperands,
@@ -416,8 +422,8 @@ class CondBranchOp : public Op<CondBranchOp, OpTrait::AtLeastNOperands<1>::Impl,
 /// The "constant" operation requires a single attribute named "value".
 /// It returns its value as an SSA value.  For example:
 ///
-///   %1 = "constant"(){value: 42} : i32
-///   %2 = "constant"(){value: @foo} : (f32)->f32
+///   %1 = "std.constant"(){value: 42} : i32
+///   %2 = "std.constant"(){value: @foo} : (f32)->f32
 ///
 class ConstantOp : public Op<ConstantOp, OpTrait::ZeroOperands,
                              OpTrait::OneResult, OpTrait::HasNoSideEffect> {
@@ -432,7 +438,7 @@ class ConstantOp : public Op<ConstantOp, OpTrait::ZeroOperands,
 
   Attribute getValue() const { return getAttr("value"); }
 
-  static StringRef getOperationName() { return "constant"; }
+  static StringRef getOperationName() { return "std.constant"; }
 
   // Hooks to customize behavior of this op.
   static bool parse(OpAsmParser *parser, OperationState *result);
@@ -449,7 +455,7 @@ class ConstantOp : public Op<ConstantOp, OpTrait::ZeroOperands,
 /// This is a refinement of the "constant" op for the case where it is
 /// returning a float value of FloatType.
 ///
-///   %1 = "constant"(){value: 42.0} : bf16
+///   %1 = "std.constant"(){value: 42.0} : bf16
 ///
 class ConstantFloatOp : public ConstantOp {
 public:
@@ -471,7 +477,7 @@ class ConstantFloatOp : public ConstantOp {
 /// This is a refinement of the "constant" op for the case where it is
 /// returning an integer value of IntegerType.
 ///
-///   %1 = "constant"(){value: 42} : i32
+///   %1 = "std.constant"(){value: 42} : i32
 ///
 class ConstantIntOp : public ConstantOp {
 public:
@@ -498,7 +504,7 @@ class ConstantIntOp : public ConstantOp {
 /// This is a refinement of the "constant" op for the case where it is
 /// returning an integer value of Index type.
 ///
-///   %1 = "constant"(){value: 99} : () -> index
+///   %1 = "std.constant"(){value: 99} : () -> index
 ///
 class ConstantIndexOp : public ConstantOp {
 public:
@@ -533,7 +539,7 @@ class DeallocOp
   const Value *getMemRef() const { return getOperand(); }
   void setMemRef(Value *value) { setOperand(value); }
 
-  static StringRef getOperationName() { return "dealloc"; }
+  static StringRef getOperationName() { return "std.dealloc"; }
 
   // Hooks to customize behavior of this op.
   static void build(Builder *builder, OperationState *result, Value *memref);
@@ -568,7 +574,7 @@ class DimOp : public Op<DimOp, OpTrait::OneOperand, OpTrait::OneResult,
     return getAttrOfType<IntegerAttr>("index").getValue().getZExtValue();
   }
 
-  static StringRef getOperationName() { return "dim"; }
+  static StringRef getOperationName() { return "std.dim"; }
 
   // Hooks to customize behavior of this op.
   bool verify() const;
@@ -706,7 +712,7 @@ class DmaStartOp
     return isSrcMemorySpaceFaster() ? 0 : getSrcMemRefRank() + 1;
   }
 
-  static StringRef getOperationName() { return "dma_start"; }
+  static StringRef getOperationName() { return "std.dma_start"; }
   static bool parse(OpAsmParser *parser, OperationState *result);
   void print(OpAsmPrinter *p) const;
   bool verify() const;
@@ -761,7 +767,7 @@ class DmaWaitOp
   static void build(Builder *builder, OperationState *result, Value *tagMemRef,
                     ArrayRef<Value *> tagIndices, Value *numElements);
 
-  static StringRef getOperationName() { return "dma_wait"; }
+  static StringRef getOperationName() { return "std.dma_wait"; }
 
   // Returns the Tag MemRef associated with the DMA operation being waited on.
   const Value *getTagMemRef() const { return getOperand(0); }
@@ -825,7 +831,7 @@ class ExtractElementOp
             getInstruction()->operand_end()};
   }
 
-  static StringRef getOperationName() { return "extract_element"; }
+  static StringRef getOperationName() { return "std.extract_element"; }
 
   // Hooks to customize behavior of this op.
   bool verify() const;
@@ -871,7 +877,7 @@ class LoadOp
             getInstruction()->operand_end()};
   }
 
-  static StringRef getOperationName() { return "load"; }
+  static StringRef getOperationName() { return "std.load"; }
 
   bool verify() const;
   static bool parse(OpAsmParser *parser, OperationState *result);
@@ -901,13 +907,15 @@ class LoadOp
 ///
 class MemRefCastOp : public CastOp<MemRefCastOp> {
 public:
-  static StringRef getOperationName() { return "memref_cast"; }
+  static StringRef getOperationName() { return "std.memref_cast"; }
 
   /// The result of a memref_cast is always a memref.
   MemRefType getType() const {
     return getResult()->getType().cast<MemRefType>();
   }
 
+  void print(OpAsmPrinter *p) const;
+
   bool verify() const;
 
 private:
@@ -920,14 +928,14 @@ class MemRefCastOp : public CastOp<MemRefCastOp> {
 /// The operand number and types must match the signature of the function
 /// that contains the operation. For example:
 ///
-///   mlfunc @foo() : (i32, f8) {
+///   func @foo() : (i32, f8) {
 ///   ...
 ///   return %0, %1 : i32, f8
 ///
 class ReturnOp : public Op<ReturnOp, OpTrait::VariadicOperands,
                            OpTrait::ZeroResult, OpTrait::IsTerminator> {
 public:
-  static StringRef getOperationName() { return "return"; }
+  static StringRef getOperationName() { return "std.return"; }
 
   static void build(Builder *builder, OperationState *result,
                     ArrayRef<Value *> results = {});
@@ -956,7 +964,7 @@ class ReturnOp : public Op<ReturnOp, OpTrait::VariadicOperands,
 class SelectOp : public Op<SelectOp, OpTrait::NOperands<3>::Impl,
                            OpTrait::OneResult, OpTrait::HasNoSideEffect> {
 public:
-  static StringRef getOperationName() { return "select"; }
+  static StringRef getOperationName() { return "std.select"; }
   static void build(Builder *builder, OperationState *result, Value *condition,
                     Value *trueValue, Value *falseValue);
   static bool parse(OpAsmParser *parser, OperationState *result);
@@ -1015,7 +1023,7 @@ class StoreOp
             getInstruction()->operand_end()};
   }
 
-  static StringRef getOperationName() { return "store"; }
+  static StringRef getOperationName() { return "std.store"; }
 
   bool verify() const;
   static bool parse(OpAsmParser *parser, OperationState *result);
@@ -1041,13 +1049,15 @@ class StoreOp
 ///
 class TensorCastOp : public CastOp<TensorCastOp> {
 public:
-  static StringRef getOperationName() { return "tensor_cast"; }
+  static StringRef getOperationName() { return "std.tensor_cast"; }
 
   /// The result of a tensor_cast is always a tensor.
   TensorType getType() const {
     return getResult()->getType().cast<TensorType>();
   }
 
+  void print(OpAsmPrinter *p) const;
+
   bool verify() const;
 
 private: