Author: Erich Keane Date: 2025-12-01T06:44:42-08:00 New Revision: 97e0573f9e16fb6b7970130ff24e5c9eba98e164
URL: https://github.com/llvm/llvm-project/commit/97e0573f9e16fb6b7970130ff24e5c9eba98e164 DIFF: https://github.com/llvm/llvm-project/commit/97e0573f9e16fb6b7970130ff24e5c9eba98e164.diff LOG: [CIR] Start printing/parsing func 'attributes' (#169674) This patch adds a print and parse ability for the func to have MLIR-standard 'attributes' printed along side the standard function. This patch also seeds the initial "disallowed" list so that we don't print things that we have custom printing for, AND will disallow them from being parsed. I believe this list to be complete, and it passes all tests. This printing of attributes is necessary for testing some OpenACC things that putting into the normal func-printing seems unnecessary. Added: clang/test/CIR/IR/invalid-func-attr.cir Modified: clang/lib/CIR/Dialect/IR/CIRDialect.cpp clang/test/CIR/IR/func.cir Removed: ################################################################################ diff --git a/clang/lib/CIR/Dialect/IR/CIRDialect.cpp b/clang/lib/CIR/Dialect/IR/CIRDialect.cpp index d505ca141d383..9fada0b2ed052 100644 --- a/clang/lib/CIR/Dialect/IR/CIRDialect.cpp +++ b/clang/lib/CIR/Dialect/IR/CIRDialect.cpp @@ -1920,6 +1920,20 @@ ParseResult cir::FuncOp::parse(OpAsmParser &parser, OperationState &state) { return failure(); } + // Parse the rest of the attributes. + NamedAttrList parsedAttrs; + if (parser.parseOptionalAttrDictWithKeyword(parsedAttrs)) + return failure(); + + for (StringRef disallowed : cir::FuncOp::getAttributeNames()) { + if (parsedAttrs.get(disallowed)) + return parser.emitError(loc, "attribute '") + << disallowed + << "' should not be specified in the explicit attribute list"; + } + + state.attributes.append(parsedAttrs); + // Parse the optional function body. auto *body = state.addRegion(); OptionalParseResult parseResult = parser.parseOptionalRegion( @@ -2073,6 +2087,9 @@ void cir::FuncOp::print(OpAsmPrinter &p) { p << " inline(" << cir::stringifyInlineKind(inlineAttr.getValue()) << ")"; } + function_interface_impl::printFunctionAttributes( + p, *this, cir::FuncOp::getAttributeNames()); + // Print the body if this is not an external function. Region &body = getOperation()->getRegion(0); if (!body.empty()) { diff --git a/clang/test/CIR/IR/func.cir b/clang/test/CIR/IR/func.cir index 10df27b7e168f..d8906ab3e1301 100644 --- a/clang/test/CIR/IR/func.cir +++ b/clang/test/CIR/IR/func.cir @@ -186,3 +186,11 @@ cir.func @Foo_move_assign() special_member<#cir.cxx_assign<!rec_Foo, move>> { // CHECK: cir.func @Foo_move_assign() special_member<#cir.cxx_assign<!rec_Foo, move>> { // CHECK: cir.return // CHECK: } + +cir.func @has_attrs() attributes {foo, baz = 5, floof = "flop"} { + cir.return +} + +// CHECK: cir.func @has_attrs() attributes {baz = 5 : i64{{.*}}, floof = "flop", foo} { +// CHECK: cir.return +// CHECK: } diff --git a/clang/test/CIR/IR/invalid-func-attr.cir b/clang/test/CIR/IR/invalid-func-attr.cir new file mode 100644 index 0000000000000..aaaaba7a7bf6f --- /dev/null +++ b/clang/test/CIR/IR/invalid-func-attr.cir @@ -0,0 +1,11 @@ +// RUN: cir-opt %s -verify-diagnostics + +module { + cir.func @l0() { + cir.return + } + + cir.func @disallowedAttr() attributes {comdat} { // expected-error{{custom op 'cir.func' attribute 'comdat' should not be specified in the explicit attribute list}} + cir.return + } +} _______________________________________________ cfe-commits mailing list [email protected] https://lists.llvm.org/cgi-bin/mailman/listinfo/cfe-commits
