[Mlir-commits] [mlir] b72dd6f - [mlir] Add function_entry_count to LLVMFuncOp
Tobias Gysi
llvmlistbot at llvm.org
Thu Jan 5 04:44:40 PST 2023
Author: Christian Ulmann
Date: 2023-01-05T13:40:56+01:00
New Revision: b72dd6f775a84658386a4bd1809f73ff3c038217
URL: https://github.com/llvm/llvm-project/commit/b72dd6f775a84658386a4bd1809f73ff3c038217
DIFF: https://github.com/llvm/llvm-project/commit/b72dd6f775a84658386a4bd1809f73ff3c038217.diff
LOG: [mlir] Add function_entry_count to LLVMFuncOp
This commit introduces the function_entry_count metadata field to the
LLVMFuncOp and adds both the corresponding import and export
funtionalities.
The import of the function metadata uses the same infrastructure as the
instruction metadata, i.e., it dispatches through a dialect interface.
Reviewed By: gysit
Differential Revision: https://reviews.llvm.org/D141001
Added:
Modified:
mlir/include/mlir/Dialect/LLVMIR/LLVMOps.td
mlir/lib/Dialect/LLVMIR/IR/LLVMDialect.cpp
mlir/lib/Target/LLVMIR/Dialect/LLVMIR/LLVMIRToLLVMTranslation.cpp
mlir/lib/Target/LLVMIR/ModuleImport.cpp
mlir/lib/Target/LLVMIR/ModuleTranslation.cpp
mlir/test/Target/LLVMIR/Import/function-attributes.ll
mlir/test/Target/LLVMIR/llvmir.mlir
Removed:
################################################################################
diff --git a/mlir/include/mlir/Dialect/LLVMIR/LLVMOps.td b/mlir/include/mlir/Dialect/LLVMIR/LLVMOps.td
index 714209c675ade..94e5d9b5aeb2f 100644
--- a/mlir/include/mlir/Dialect/LLVMIR/LLVMOps.td
+++ b/mlir/include/mlir/Dialect/LLVMIR/LLVMOps.td
@@ -1330,7 +1330,8 @@ def LLVM_LLVMFuncOp : LLVM_Op<"func", [
OptionalAttr<StrAttr>:$garbageCollector,
OptionalAttr<ArrayAttr>:$passthrough,
OptionalAttr<DictArrayAttr>:$arg_attrs,
- OptionalAttr<DictArrayAttr>:$res_attrs
+ OptionalAttr<DictArrayAttr>:$res_attrs,
+ OptionalAttr<I64Attr>:$function_entry_count
);
let regions = (region AnyRegion:$body);
@@ -1343,7 +1344,8 @@ def LLVM_LLVMFuncOp : LLVM_Op<"func", [
CArg<"bool", "false">:$dsoLocal,
CArg<"CConv", "CConv::C">:$cconv,
CArg<"ArrayRef<NamedAttribute>", "{}">:$attrs,
- CArg<"ArrayRef<DictionaryAttr>", "{}">:$argAttrs)>
+ CArg<"ArrayRef<DictionaryAttr>", "{}">:$argAttrs,
+ CArg<"Optional<uint64_t>", "{}">:$functionEntryCount)>
];
let extraClassDeclaration = [{
diff --git a/mlir/lib/Dialect/LLVMIR/IR/LLVMDialect.cpp b/mlir/lib/Dialect/LLVMIR/IR/LLVMDialect.cpp
index 211080e11c35e..f77251b1257e9 100644
--- a/mlir/lib/Dialect/LLVMIR/IR/LLVMDialect.cpp
+++ b/mlir/lib/Dialect/LLVMIR/IR/LLVMDialect.cpp
@@ -1992,7 +1992,8 @@ void LLVMFuncOp::build(OpBuilder &builder, OperationState &result,
StringRef name, Type type, LLVM::Linkage linkage,
bool dsoLocal, CConv cconv,
ArrayRef<NamedAttribute> attrs,
- ArrayRef<DictionaryAttr> argAttrs) {
+ ArrayRef<DictionaryAttr> argAttrs,
+ Optional<uint64_t> functionEntryCount) {
result.addRegion();
result.addAttribute(SymbolTable::getSymbolAttrName(),
builder.getStringAttr(name));
@@ -2004,7 +2005,11 @@ void LLVMFuncOp::build(OpBuilder &builder, OperationState &result,
CConvAttr::get(builder.getContext(), cconv));
result.attributes.append(attrs.begin(), attrs.end());
if (dsoLocal)
- result.addAttribute("dso_local", builder.getUnitAttr());
+ result.addAttribute(getDsoLocalAttrName(result.name),
+ builder.getUnitAttr());
+ if (functionEntryCount)
+ result.addAttribute(getFunctionEntryCountAttrName(result.name),
+ builder.getI64IntegerAttr(functionEntryCount.value()));
if (argAttrs.empty())
return;
diff --git a/mlir/lib/Target/LLVMIR/Dialect/LLVMIR/LLVMIRToLLVMTranslation.cpp b/mlir/lib/Target/LLVMIR/Dialect/LLVMIR/LLVMIRToLLVMTranslation.cpp
index 493be27bfbddc..faa580cd1122b 100644
--- a/mlir/lib/Target/LLVMIR/Dialect/LLVMIR/LLVMIRToLLVMTranslation.cpp
+++ b/mlir/lib/Target/LLVMIR/Dialect/LLVMIR/LLVMIRToLLVMTranslation.cpp
@@ -84,12 +84,29 @@ static LogicalResult setProfilingAttrs(OpBuilder &builder, llvm::MDNode *node,
if (!node->getNumOperands())
return success();
- // Return failure for non-"branch_weights" metadata.
auto *name = dyn_cast<llvm::MDString>(node->getOperand(0));
- if (!name || !name->getString().equals("branch_weights"))
+ if (!name)
return failure();
- // Copy the branch weights to an array.
+ // Handle function entry count metadata.
+ if (name->getString().equals("function_entry_count")) {
+ // TODO support function entry count metadata with GUID fields.
+ if (node->getNumOperands() != 2)
+ return failure();
+
+ llvm::ConstantInt *entryCount =
+ llvm::mdconst::extract<llvm::ConstantInt>(node->getOperand(1));
+ if (auto funcOp = dyn_cast<LLVMFuncOp>(op)) {
+ funcOp.setFunctionEntryCount(entryCount->getZExtValue());
+ return success();
+ }
+ return failure();
+ }
+
+ if (!name->getString().equals("branch_weights"))
+ return failure();
+
+ // Handle branch weights metadata.
SmallVector<int32_t> branchWeights;
branchWeights.reserve(node->getNumOperands() - 1);
for (unsigned i = 1, e = node->getNumOperands(); i != e; ++i) {
diff --git a/mlir/lib/Target/LLVMIR/ModuleImport.cpp b/mlir/lib/Target/LLVMIR/ModuleImport.cpp
index b7c3457f2328f..fb58e34962e8b 100644
--- a/mlir/lib/Target/LLVMIR/ModuleImport.cpp
+++ b/mlir/lib/Target/LLVMIR/ModuleImport.cpp
@@ -1184,6 +1184,18 @@ LogicalResult ModuleImport::processFunction(llvm::Function *func) {
// Handle Function attributes.
processFunctionAttributes(func, funcOp);
+ // Convert non-debug metadata by using the dialect interface.
+ SmallVector<std::pair<unsigned, llvm::MDNode *>> allMetadata;
+ func->getAllMetadata(allMetadata);
+ for (auto &[kind, node] : allMetadata) {
+ if (!iface.isConvertibleMetadata(kind))
+ continue;
+ if (failed(iface.setMetadataAttrs(builder, kind, node, funcOp, *this))) {
+ emitWarning(funcOp->getLoc())
+ << "unhandled function metadata (" << kind << ") " << diag(*func);
+ }
+ }
+
if (func->isDeclaration())
return success();
diff --git a/mlir/lib/Target/LLVMIR/ModuleTranslation.cpp b/mlir/lib/Target/LLVMIR/ModuleTranslation.cpp
index c5af256a0cacc..a214ee5c28c30 100644
--- a/mlir/lib/Target/LLVMIR/ModuleTranslation.cpp
+++ b/mlir/lib/Target/LLVMIR/ModuleTranslation.cpp
@@ -889,6 +889,10 @@ LogicalResult ModuleTranslation::convertFunctionSignatures() {
if (function->getAttrOfType<UnitAttr>(LLVMDialect::getReadnoneAttrName()))
llvmFunc->setDoesNotAccessMemory();
+ // Convert function_entry_count attribute to metadata.
+ if (std::optional<uint64_t> entryCount = function.getFunctionEntryCount())
+ llvmFunc->setEntryCount(entryCount.value());
+
// Convert result attributes.
if (ArrayAttr allResultAttrs = function.getAllResultAttrs()) {
llvm::AttrBuilder retAttrs(llvmFunc->getContext());
diff --git a/mlir/test/Target/LLVMIR/Import/function-attributes.ll b/mlir/test/Target/LLVMIR/Import/function-attributes.ll
index 622cc20486684..3fac482caf5b8 100644
--- a/mlir/test/Target/LLVMIR/Import/function-attributes.ll
+++ b/mlir/test/Target/LLVMIR/Import/function-attributes.ll
@@ -38,3 +38,13 @@ define void @func_arg_attrs(
ptr inalloca(i64) %arg3) {
ret void
}
+
+; // -----
+
+; CHECK-LABEL: @entry_count
+; CHECK-SAME: attributes {function_entry_count = 4242 : i64}
+define void @entry_count() !prof !1 {
+ ret void
+}
+
+!1 = !{!"function_entry_count", i64 4242}
diff --git a/mlir/test/Target/LLVMIR/llvmir.mlir b/mlir/test/Target/LLVMIR/llvmir.mlir
index fd2bd27541bd9..7e65b879323aa 100644
--- a/mlir/test/Target/LLVMIR/llvmir.mlir
+++ b/mlir/test/Target/LLVMIR/llvmir.mlir
@@ -1545,6 +1545,16 @@ llvm.func @passthrough() attributes {passthrough = ["noinline", ["alignstack", "
// -----
+// CHECK-LABEL: @functionEntryCount
+// CHECK-SAME: !prof ![[PROF_ID:[0-9]*]]
+llvm.func @functionEntryCount() attributes {function_entry_count = 4242 : i64} {
+ llvm.return
+}
+
+// CHECK: ![[PROF_ID]] = !{!"function_entry_count", i64 4242}
+
+// -----
+
// CHECK-LABEL: @constant_bf16
llvm.func @constant_bf16() -> bf16 {
%0 = llvm.mlir.constant(1.000000e+01 : bf16) : bf16
More information about the Mlir-commits
mailing list