llvmbot wrote:
@llvm/pr-subscribers-bolt
Author: Amir Ayupov (aaupov)
Changes
Align BAT YAML to fdata profile.
Test Plan: updated register-fragments-bolt-symbols.s
---
Full diff: https://github.com/llvm/llvm-project/pull/91773.diff
2 Files Affected:
- (modified) bolt/lib/Profile/DataAggregator.cpp (+1-1)
- (modified) bolt/test/X86/register-fragments-bolt-symbols.s (+5)
``diff
diff --git a/bolt/lib/Profile/DataAggregator.cpp
b/bolt/lib/Profile/DataAggregator.cpp
index 4ca6ef633e7db..afbab6ffceece 100644
--- a/bolt/lib/Profile/DataAggregator.cpp
+++ b/bolt/lib/Profile/DataAggregator.cpp
@@ -2333,7 +2333,7 @@ std::error_code
DataAggregator::writeBATYAML(BinaryContext ,
continue;
BinaryFunction *BF = BC.getBinaryFunctionAtAddress(FuncAddress);
assert(BF);
- YamlBF.Name = FuncName.str();
+ YamlBF.Name = getLocationName(*BF);
YamlBF.Id = BF->getFunctionNumber();
YamlBF.Hash = BAT->getBFHash(FuncAddress);
YamlBF.ExecCount = BF->getKnownExecutionCount();
diff --git a/bolt/test/X86/register-fragments-bolt-symbols.s
b/bolt/test/X86/register-fragments-bolt-symbols.s
index fa9b70e0b2d89..6478adf19372b 100644
--- a/bolt/test/X86/register-fragments-bolt-symbols.s
+++ b/bolt/test/X86/register-fragments-bolt-symbols.s
@@ -15,6 +15,8 @@
# PREAGG: B X:0 #chain.cold.0# 1 0
# RUN: perf2bolt %t.bolt -p %t.preagg --pa -o %t.bat.fdata -w %t.bat.yaml -v=1
\
# RUN: | FileCheck %s --check-prefix=CHECK-REGISTER
+# RUN: FileCheck --input-file %t.bat.fdata --check-prefix=CHECK-FDATA %s
+# RUN: FileCheck --input-file %t.bat.yaml --check-prefix=CHECK-YAML %s
# CHECK-SYMS: l df *ABS* [[#]] chain.s
# CHECK-SYMS: l F .bolt.org.text [[#]] chain
@@ -24,6 +26,9 @@
# CHECK-REGISTER: BOLT-INFO: marking chain.cold.0/1(*2) as a fragment of
chain/2(*2)
+# CHECK-FDATA: 0 [unknown] 0 1 chain/chain.s/2 10 0 1
+# CHECK-YAML: - name: 'chain/chain.s/2'
+
.file "chain.s"
.text
.type chain, @function
``
https://github.com/llvm/llvm-project/pull/91773
___
llvm-branch-commits mailing list
llvm-branch-commits@lists.llvm.org
https://lists.llvm.org/cgi-bin/mailman/listinfo/llvm-branch-commits
