[llvm] [XCOFF][OBJECT] get symbol size by calling XCOFF interfaces (PR #67304)
Chen Zheng via llvm-commits
llvm-commits at lists.llvm.org
Tue Sep 26 00:41:07 PDT 2023
https://github.com/chenzheng1030 updated https://github.com/llvm/llvm-project/pull/67304
>From f15216616a3153a5028a813d1ec557943fe26b9e Mon Sep 17 00:00:00 2001
From: Chen Zheng <czhengsz at cn.ibm.com>
Date: Mon, 25 Sep 2023 01:06:28 -0400
Subject: [PATCH 1/3] base case, nfc
---
.../Symbolize/XCOFF/Inputs/xcoff-dwarf.o | Bin 0 -> 2256 bytes
.../test/DebugInfo/Symbolize/XCOFF/xcoff.test | 63 ++++++++++++++++++
2 files changed, 63 insertions(+)
create mode 100644 llvm/test/DebugInfo/Symbolize/XCOFF/Inputs/xcoff-dwarf.o
create mode 100644 llvm/test/DebugInfo/Symbolize/XCOFF/xcoff.test
diff --git a/llvm/test/DebugInfo/Symbolize/XCOFF/Inputs/xcoff-dwarf.o b/llvm/test/DebugInfo/Symbolize/XCOFF/Inputs/xcoff-dwarf.o
new file mode 100644
index 0000000000000000000000000000000000000000..04326b6ccedd0462394ebaafb3fe4d6eda50e0c1
GIT binary patch
literal 2256
zcmah~&u<$=6n?YzChK2KTnj;4AX`LAXp at cCWbLGtLQ0fFsz6JVLz|1UYp-L2V_S}s
z=FmeVklI5JIpmNN2gI=l4oKYi6SyEw94c|>-+)8}eDCer-b9Uf(#(AG%{TAO?@_O4
zgv9h;P<+JD>iGvf;Re|jk%|+=e-tJrxoK71o*PKePMq at 4RiXP8n8=WP$?|r01rZ&g
z<dhEU(c;jmK5 at OSzaJrA!rw`xP8jVtbd6T69ig=xk at kp4e_zNk<VtkSM$3=rsEDy0
zK=+f73b{t(haS-vhhz$uFqcqri$QvM)2{6k+T(}clX3VB(G*tUX=UoWvwFpPws(R)
z9@&LY=A2?_KA<JnkZ*+bZ^P0=*~h#t$4D|?l~t2QPLCPmBiD?qx{LtY9L0>)+^6Z=
zsXHkxNfi4K#9}Iy!ldSCHP`2LrB<;ZBiF%|&^USn0P|saDzykEF(ypXLYT{HDfw*4
zh#B0S-4msPNPU0lXcbbTj1E_U9s_=}X=5bkB(7FJ``o<W at muDjHFJ4(`PMD7*6x~X
zjn>|Q*>0H++E4thX_qY9DwtDFso=~kmkQISQz|+$_X_!sr_Fu8yW4;?5Lx+Yv(j{1
z+fhDm<;|(>MsEqJzUNsDZ^x>%cWxtf8cn}D+idRd%yhc#ul!2Sg2-I39ebhZS4(zf
z&iCB;nqP8C^TmR<;1)`bQ}q43U2_p1%iFUmosP_Nwm;i-4ad5?-E4bqletr+l+H8W
ziZxn2(&HLmkFx?z1XY|NbyMk5+0aob;ts0i1dXD&6RXtSE*Z)wm+wA&c=vI6eRXrC
zyz%(KO1VtNsJ7edB8qA%6&DZn1be`F5Svh62B)@03hp#rrD}VvN)O9-W-NyEJ)*Sd
z2bcI%WrR8|Z?4S=nRc6<y31ZqRa)9k(B=dz$1{=EgLobx-X)2b at dA`242(`=Uc22S
zt$#y6g;tRB at orrGeJMj&JXRnn8ZLH{biOroHTg_SLnA$zd25VU`U9l51>FF;BB%~D
zI)RLMS7L&A=W>E at _emG@bincbyC&Rop!Wp50GbfQuj6$=zXMGQ`U6M_dNn|Q0VSAI
zSCFLy at u*}hibs_ZPWDa^zjNY6{Qx8*P(K672-I&tG6MDIK=-<j=w^V1D at FA0KZ)2j
z=!jvxzUDPs4>%lTF)KJAK?UuyH^JKCIgDsL!6xs at n>3*mry1`WG!l#V9F`6J1vR>g
za*LgdAMOFm;^;?g5x9DhCOGt>u3w~yObZ7tjD_cnEgRks)&$d{gNrm9_m_iC{5Hdn
z%qwKF{I?8k5^$*L&x_9{Y;ci?o)7$-(*#Pohw{b$XgJmp-x(QC=qDGhcO=&FMVd&g
zlZ!NG{$RxD at IJl_dxpiC{}+468vcQ!2F>vA#T^nq_<hgWhShEJGihOeZOdM>EJhT0
VS<9RJ2d~)9`ByCZx(=VE{{R!!2KN8}
literal 0
HcmV?d00001
diff --git a/llvm/test/DebugInfo/Symbolize/XCOFF/xcoff.test b/llvm/test/DebugInfo/Symbolize/XCOFF/xcoff.test
new file mode 100644
index 000000000000000..c6b65ac9b789361
--- /dev/null
+++ b/llvm/test/DebugInfo/Symbolize/XCOFF/xcoff.test
@@ -0,0 +1,63 @@
+
+RUN: llvm-symbolizer --obj=%p/Inputs/xcoff-dwarf.o 'DATA 0x60' \
+RUN: 'DATA 0x61' 'DATA 0x64' 'DATA 0X68' 'DATA 0x90' 'DATA 0x94' \
+RUN: 'DATA 0X98' | FileCheck %s
+
+CHECK: bss_global
+CHECK-NEXT: 96 4
+CHECK-NEXT: ??:?
+CHECK-EMPTY:
+
+CHECK: bss_global
+CHECK-NEXT: 96 4
+CHECK-NEXT: ??:?
+CHECK-EMPTY:
+
+CHECK: data_global
+CHECK-NEXT: 100 4
+CHECK-NEXT: ??:?
+CHECK-EMPTY:
+
+CHECK: str
+CHECK-NEXT: 104 4
+CHECK-NEXT: ??:?
+CHECK-EMPTY:
+
+FIXME: fix the wrong size 152
+CHECK: f()::function_global
+CHECK-NEXT: 144 152
+CHECK-NEXT: ??:?
+CHECK-EMPTY:
+
+FIXME: fix the wrong size 152
+CHECK: beta
+CHECK-NEXT: 148 152
+CHECK-NEXT: ??:?
+CHECK-EMPTY:
+
+FIXME: fix the wrong size 152
+CHECK: alpha
+CHECK-NEXT: 152 152
+CHECK-NEXT: ??:?
+CHECK-EMPTY:
+
+The case is from `test/tools/llvm-symbolizer/data-location.yaml`, compiled with:
+ clang++ -g -gdwarf-3 -O3 t.cpp -nostdlib -target powerpc-aix-ibm-xcoff \
+ -mllvm -ppc-global-merge=false
+
+ cat t.cpp
+ 1 int bss_global;
+ 2 int data_global = 2;
+ 3
+ 4 const char* str =
+ 5 "12345678";
+ 6
+ 7 int* f() {
+ 8 static int function_global;
+ 9 return &function_global;
+ 10 }
+ 11
+ 12 static int alpha;
+ 13 static int beta;
+ 14 int *f(bool b) { return beta ? &alpha : β }
+ 15
>From 23b0ed80b788ca74307244c03d4837067ecff991 Mon Sep 17 00:00:00 2001
From: Chen Zheng <czhengsz at cn.ibm.com>
Date: Mon, 25 Sep 2023 05:24:25 -0400
Subject: [PATCH 2/3] get symbol size by calling xcoff interfaces.
---
llvm/include/llvm/Object/XCOFFObjectFile.h | 32 ++++++++++++++++++-
llvm/lib/Object/SymbolSize.cpp | 7 ++++
llvm/lib/Object/XCOFFObjectFile.cpp | 4 +++
.../test/DebugInfo/Symbolize/XCOFF/xcoff.test | 9 ++----
4 files changed, 45 insertions(+), 7 deletions(-)
diff --git a/llvm/include/llvm/Object/XCOFFObjectFile.h b/llvm/include/llvm/Object/XCOFFObjectFile.h
index 5f51aacfabc0851..9d7db05090c56dd 100644
--- a/llvm/include/llvm/Object/XCOFFObjectFile.h
+++ b/llvm/include/llvm/Object/XCOFFObjectFile.h
@@ -15,6 +15,7 @@
#include "llvm/ADT/SmallString.h"
#include "llvm/ADT/SmallVector.h"
+#include "llvm/ADT/iterator_range.h"
#include "llvm/BinaryFormat/XCOFF.h"
#include "llvm/Object/ObjectFile.h"
#include "llvm/Support/Endian.h"
@@ -23,6 +24,8 @@
namespace llvm {
namespace object {
+class xcoff_symbol_iterator;
+
struct XCOFFFileHeader32 {
support::ubig16_t Magic;
support::ubig16_t NumberOfSections;
@@ -576,6 +579,10 @@ class XCOFFObjectFile : public ObjectFile {
Expected<uint32_t> getSymbolFlags(DataRefImpl Symb) const override;
basic_symbol_iterator symbol_begin() const override;
basic_symbol_iterator symbol_end() const override;
+
+ using xcoff_symbol_iterator_range = iterator_range<xcoff_symbol_iterator>;
+ xcoff_symbol_iterator_range symbols() const;
+
bool is64Bit() const override;
Expected<StringRef> getSymbolName(DataRefImpl Symb) const override;
Expected<uint64_t> getSymbolAddress(DataRefImpl Symb) const override;
@@ -761,7 +768,7 @@ struct XCOFFSymbolEntry64 {
uint8_t NumberOfAuxEntries;
};
-class XCOFFSymbolRef {
+class XCOFFSymbolRef : public SymbolRef {
public:
enum { NAME_IN_STR_TBL_MAGIC = 0x0 };
@@ -787,6 +794,14 @@ class XCOFFSymbolRef {
uint64_t getValue64() const { return Entry64->Value; }
+ const XCOFFObjectFile *getObject() const {
+ return cast<XCOFFObjectFile>(BasicSymbolRef::getObject());
+ }
+
+ uint64_t getSize() const {
+ return getObject()->getSymbolSize(getRawDataRefImpl());
+ }
+
#define GETVALUE(X) Entry32 ? Entry32->X : Entry64->X
int16_t getSectionNumber() const { return GETVALUE(SectionNumber); }
@@ -827,6 +842,21 @@ class XCOFFSymbolRef {
const XCOFFSymbolEntry64 *Entry64 = nullptr;
};
+class xcoff_symbol_iterator : public symbol_iterator {
+public:
+ xcoff_symbol_iterator(const basic_symbol_iterator &B)
+ : symbol_iterator(SymbolRef(B->getRawDataRefImpl(),
+ cast<XCOFFObjectFile>(B->getObject()))) {}
+
+ const XCOFFSymbolRef *operator->() const {
+ return static_cast<const XCOFFSymbolRef *>(symbol_iterator::operator->());
+ }
+
+ const XCOFFSymbolRef &operator*() const {
+ return static_cast<const XCOFFSymbolRef &>(symbol_iterator::operator*());
+ }
+};
+
class TBVectorExt {
uint16_t Data;
SmallString<32> VecParmsInfo;
diff --git a/llvm/lib/Object/SymbolSize.cpp b/llvm/lib/Object/SymbolSize.cpp
index f93a5f7d9bd5442..c4f30b1072d52da 100644
--- a/llvm/lib/Object/SymbolSize.cpp
+++ b/llvm/lib/Object/SymbolSize.cpp
@@ -59,6 +59,13 @@ llvm::object::computeSymbolSizes(const ObjectFile &O) {
return Ret;
}
+ if (const auto *E = dyn_cast<XCOFFObjectFile>(&O)) {
+ auto Syms = E->symbols();
+ for (XCOFFSymbolRef Sym : Syms)
+ Ret.push_back({Sym, Sym.getSize()});
+ return Ret;
+ }
+
// Collect sorted symbol addresses. Include dummy addresses for the end
// of each section.
std::vector<SymEntry> Addresses;
diff --git a/llvm/lib/Object/XCOFFObjectFile.cpp b/llvm/lib/Object/XCOFFObjectFile.cpp
index fa4917e354e92b1..7dcf344282e14fd 100644
--- a/llvm/lib/Object/XCOFFObjectFile.cpp
+++ b/llvm/lib/Object/XCOFFObjectFile.cpp
@@ -689,6 +689,10 @@ basic_symbol_iterator XCOFFObjectFile::symbol_end() const {
return basic_symbol_iterator(SymbolRef(SymDRI, this));
}
+XCOFFObjectFile::xcoff_symbol_iterator_range XCOFFObjectFile::symbols() const {
+ return xcoff_symbol_iterator_range(symbol_begin(), symbol_end());
+}
+
section_iterator XCOFFObjectFile::section_begin() const {
DataRefImpl DRI;
DRI.p = getSectionHeaderTableAddress();
diff --git a/llvm/test/DebugInfo/Symbolize/XCOFF/xcoff.test b/llvm/test/DebugInfo/Symbolize/XCOFF/xcoff.test
index c6b65ac9b789361..e7955d6da15ed7a 100644
--- a/llvm/test/DebugInfo/Symbolize/XCOFF/xcoff.test
+++ b/llvm/test/DebugInfo/Symbolize/XCOFF/xcoff.test
@@ -23,21 +23,18 @@ CHECK-NEXT: 104 4
CHECK-NEXT: ??:?
CHECK-EMPTY:
-FIXME: fix the wrong size 152
CHECK: f()::function_global
-CHECK-NEXT: 144 152
+CHECK-NEXT: 144 4
CHECK-NEXT: ??:?
CHECK-EMPTY:
-FIXME: fix the wrong size 152
CHECK: beta
-CHECK-NEXT: 148 152
+CHECK-NEXT: 148 4
CHECK-NEXT: ??:?
CHECK-EMPTY:
-FIXME: fix the wrong size 152
CHECK: alpha
-CHECK-NEXT: 152 152
+CHECK-NEXT: 152 4
CHECK-NEXT: ??:?
CHECK-EMPTY:
>From 7d736eff148def42de7a6af4bf58e09025923cb9 Mon Sep 17 00:00:00 2001
From: Chen Zheng <czhengsz at cn.ibm.com>
Date: Tue, 26 Sep 2023 03:40:47 -0400
Subject: [PATCH 3/3] rename the test file
---
.../Symbolize/XCOFF/{xcoff.test => xcoff-symbolize-data.test} | 0
1 file changed, 0 insertions(+), 0 deletions(-)
rename llvm/test/DebugInfo/Symbolize/XCOFF/{xcoff.test => xcoff-symbolize-data.test} (100%)
diff --git a/llvm/test/DebugInfo/Symbolize/XCOFF/xcoff.test b/llvm/test/DebugInfo/Symbolize/XCOFF/xcoff-symbolize-data.test
similarity index 100%
rename from llvm/test/DebugInfo/Symbolize/XCOFF/xcoff.test
rename to llvm/test/DebugInfo/Symbolize/XCOFF/xcoff-symbolize-data.test
More information about the llvm-commits
mailing list