[Mlir-commits] [mlir] [MLIR][LLVM] Fix CallOp asm parser for attr-dict (PR #74372)
llvmlistbot at llvm.org
llvmlistbot at llvm.org
Mon Dec 4 13:39:07 PST 2023
llvmbot wrote:
<!--LLVM PR SUMMARY COMMENT-->
@llvm/pr-subscribers-mlir-llvm
Author: Billy Zhu (zyx-billy)
<details>
<summary>Changes</summary>
Currently the parser & printer of `CallOp` do not match when both varargs and attr-dict are present. This fixes the parser so that it conforms to the written asm format in the comments.
---
Full diff: https://github.com/llvm/llvm-project/pull/74372.diff
2 Files Affected:
- (modified) mlir/lib/Dialect/LLVMIR/IR/LLVMDialect.cpp (+4-2)
- (modified) mlir/test/Target/LLVMIR/llvmir.mlir (+4)
``````````diff
diff --git a/mlir/lib/Dialect/LLVMIR/IR/LLVMDialect.cpp b/mlir/lib/Dialect/LLVMIR/IR/LLVMDialect.cpp
index 28445945f07d6..4c3367336fa79 100644
--- a/mlir/lib/Dialect/LLVMIR/IR/LLVMDialect.cpp
+++ b/mlir/lib/Dialect/LLVMIR/IR/LLVMDialect.cpp
@@ -1219,8 +1219,7 @@ ParseResult CallOp::parse(OpAsmParser &parser, OperationState &result) {
return failure();
// Parse the function arguments.
- if (parser.parseOperandList(operands, OpAsmParser::Delimiter::Paren) ||
- parser.parseOptionalAttrDict(result.attributes))
+ if (parser.parseOperandList(operands, OpAsmParser::Delimiter::Paren))
return failure();
bool isVarArg = parser.parseOptionalKeyword("vararg").succeeded();
@@ -1232,6 +1231,9 @@ ParseResult CallOp::parse(OpAsmParser &parser, OperationState &result) {
return failure();
}
+ if (parser.parseOptionalAttrDict(result.attributes))
+ return failure();
+
// Parse the trailing type list and resolve the operands.
return parseCallTypeAndResolveOperands(parser, result, isDirect, operands);
}
diff --git a/mlir/test/Target/LLVMIR/llvmir.mlir b/mlir/test/Target/LLVMIR/llvmir.mlir
index 3f84f9dc5a9b8..3ec8aa0e8bb12 100644
--- a/mlir/test/Target/LLVMIR/llvmir.mlir
+++ b/mlir/test/Target/LLVMIR/llvmir.mlir
@@ -1227,15 +1227,19 @@ llvm.func @varargs(...)
// CHECK-LABEL: define void @varargs_call
llvm.func @varargs_call(%arg0 : i32) {
+// CHECK: call void (...) @varargs(i32 %{{.*}})
// CHECK: call void (...) @varargs(i32 %{{.*}})
llvm.call @varargs(%arg0) vararg(!llvm.func<void (...)>) : (i32) -> ()
+ llvm.call @varargs(%arg0) vararg(!llvm.func<void (...)>) {fastmathFlags = #llvm.fastmath<none>} : (i32) -> ()
llvm.return
}
// CHECK-LABEL: define void @indirect_varargs_call(ptr %0, i32 %1)
llvm.func @indirect_varargs_call(%arg0 : !llvm.ptr, %arg1 : i32) {
+// CHECK: call void (...) %0(i32 %1)
// CHECK: call void (...) %0(i32 %1)
llvm.call %arg0(%arg1) vararg(!llvm.func<void (...)>) : !llvm.ptr, (i32) -> ()
+ llvm.call %arg0(%arg1) vararg(!llvm.func<void (...)>) {fastmathFlags = #llvm.fastmath<none>} : !llvm.ptr, (i32) -> ()
llvm.return
}
``````````
</details>
https://github.com/llvm/llvm-project/pull/74372
More information about the Mlir-commits
mailing list