Flip the order attributes appear, add more tests for that in face of operand attrs

Author: bcardosolopes

mlir/lib/Dialect/LLVMIR/IR/LLVMDialect.cpp

@@ -3613,6 +3613,9 @@ ParseResult CallIntrinsicOp::parse(OpAsmParser &parser,
         CallIntrinsicOp::getOpBundleTagsAttrName(result.name).getValue(),
         opBundleTags);
 
+  if (parser.parseOptionalAttrDict(result.attributes))
+    return mlir::failure();
+
   SmallVector<DictionaryAttr> argAttrs;
   SmallVector<DictionaryAttr> resultAttrs;
   if (parseCallTypeAndResolveOperands(parser, result, /*isDirect=*/true,
@@ -3622,12 +3625,6 @@ ParseResult CallIntrinsicOp::parse(OpAsmParser &parser,
       parser.getBuilder(), result, argAttrs, resultAttrs,
       getArgAttrsAttrName(result.name), getResAttrsAttrName(result.name));
 
-  // TODO: In CallOp, the attr dict happens *before* the call type.
-  // CallIntrinsicOp should mimic that, allowing most of this function to be
-  // shared between the two ops.
-  if (parser.parseOptionalAttrDict(result.attributes))
-    return mlir::failure();
-
   if (resolveOpBundleOperands(parser, opBundlesLoc, result, opBundleOperands,
                               opBundleOperandTypes,
                               getOpBundleSizesAttrName(result.name)))
@@ -3658,18 +3655,19 @@ void CallIntrinsicOp::print(OpAsmPrinter &p) {
     printOpBundles(p, *this, getOpBundleOperands(),
                    getOpBundleOperands().getTypes(), getOpBundleTagsAttr());
   }
-  p << " : ";
-
-  // Reconstruct the MLIR function type from operand and result types.
-  call_interface_impl::printFunctionSignature(
-      p, args.getTypes(), getArgAttrsAttr(),
-      /*isVariadic=*/false, getResultTypes(), getResAttrsAttr());
 
   p.printOptionalAttrDict(processFMFAttr((*this)->getAttrs()),
                           {getOperandSegmentSizesAttrName(),
                            getOpBundleSizesAttrName(), getIntrinAttrName(),
                            getOpBundleTagsAttrName(), getArgAttrsAttrName(),
                            getResAttrsAttrName()});
+
+  p << " : ";
+
+  // Reconstruct the MLIR function type from operand and result types.
+  call_interface_impl::printFunctionSignature(
+      p, args.getTypes(), getArgAttrsAttr(),
+      /*isVariadic=*/false, getResultTypes(), getResAttrsAttr());
 }
 
 //===----------------------------------------------------------------------===//

mlir/test/Dialect/LLVMIR/call-intrin.mlir

@@ -7,7 +7,7 @@
 llvm.func @round_sse41() -> vector<4xf32> {
   %0 = llvm.mlir.constant(1 : i32) : i32
   %1 = llvm.mlir.constant(dense<0.2> : vector<4xf32>) : vector<4xf32>
-  %res = llvm.call_intrinsic "llvm.x86.sse41.round.ss"(%1, %1, %0) : (vector<4xf32>, vector<4xf32>, i32) -> vector<4xf32> {fastmathFlags = #llvm.fastmath<reassoc>}
+  %res = llvm.call_intrinsic "llvm.x86.sse41.round.ss"(%1, %1, %0) {fastmathFlags = #llvm.fastmath<reassoc>} : (vector<4xf32>, vector<4xf32>, i32) -> vector<4xf32>
   llvm.return %res: vector<4xf32>
 }
 
@@ -19,7 +19,7 @@ llvm.func @round_sse41() -> vector<4xf32> {
 // CHECK: }
 llvm.func @round_overloaded() -> f32 {
   %0 = llvm.mlir.constant(1.0 : f32) : f32
-  %res = llvm.call_intrinsic "llvm.round"(%0) : (f32) -> f32 {}
+  %res = llvm.call_intrinsic "llvm.round"(%0) {} : (f32) -> f32
   llvm.return %res: f32
 }
 
@@ -34,7 +34,7 @@ llvm.func @lifetime_start() {
   %0 = llvm.mlir.constant(4 : i64) : i64
   %1 = llvm.mlir.constant(1 : i8) : i8
   %2 = llvm.alloca %1 x f32 : (i8) -> !llvm.ptr
-  llvm.call_intrinsic "llvm.lifetime.start"(%0, %2) : (i64, !llvm.ptr) -> () {}
+  llvm.call_intrinsic "llvm.lifetime.start"(%0, %2) {} : (i64, !llvm.ptr) -> ()
   llvm.return
 }
 
@@ -64,7 +64,7 @@ llvm.func @bad_types() {
   %0 = llvm.mlir.constant(1 : i8) : i8
   // expected-error@below {{call intrinsic signature i8 (i8) to overloaded intrinsic "llvm.round" does not match any of the overloads}}
   // expected-error@below {{LLVM Translation failed for operation: llvm.call_intrinsic}}
-  llvm.call_intrinsic "llvm.round"(%0) : (i8) -> i8 {}
+  llvm.call_intrinsic "llvm.round"(%0) {} : (i8) -> i8
   llvm.return
 }
 
@@ -102,7 +102,7 @@ llvm.func @bad_args() {
   %1 = llvm.mlir.constant(dense<0.2> : vector<4xf32>) : vector<4xf32>
   // expected-error @below {{intrinsic call operand #2 has type i64 but "llvm.x86.sse41.round.ss" expects i32}}
   // expected-error@below {{LLVM Translation failed for operation: llvm.call_intrinsic}}
-  %res = llvm.call_intrinsic "llvm.x86.sse41.round.ss"(%1, %1, %0) : (vector<4xf32>, vector<4xf32>, i64) -> vector<4xf32> {fastmathFlags = #llvm.fastmath<reassoc>}
+  %res = llvm.call_intrinsic "llvm.x86.sse41.round.ss"(%1, %1, %0) {fastmathFlags = #llvm.fastmath<reassoc>} : (vector<4xf32>, vector<4xf32>, i64) -> vector<4xf32>
   llvm.return
 }
 

mlir/test/Dialect/LLVMIR/roundtrip.mlir

@@ -998,7 +998,7 @@ llvm.func @intrinsic_call_arg_attrs(%arg0: i32) -> i32 {
 
 // CHECK-LABEL: intrinsic_call_arg_attrs_bundles
 llvm.func @intrinsic_call_arg_attrs_bundles(%arg0: i32) -> i32 {
-  // CHECK: %{{.*}} = llvm.call_intrinsic "llvm.riscv.sha256sig0"({{.*}}) ["adazdazd"()] : (i32 {llvm.signext}) -> i32
-  %0 = llvm.call_intrinsic "llvm.riscv.sha256sig0"(%arg0) ["adazdazd"()] : (i32 {llvm.signext}) -> (i32)
+  // CHECK: %{{.*}} = llvm.call_intrinsic "llvm.riscv.sha256sig0"({{.*}}) ["adazdazd"()] {constant} : (i32 {llvm.signext}) -> i32
+  %0 = llvm.call_intrinsic "llvm.riscv.sha256sig0"(%arg0) ["adazdazd"()] {constant} : (i32 {llvm.signext}) -> (i32)
   llvm.return %0 : i32
 }