Conversation
Member
|
@llvm/pr-subscribers-llvm-mc @llvm/pr-subscribers-backend-systemz Author: Amy Kwan (amy-kwan) ChangesThis is the first of three patches aimed to support indirect symbol handling for the SystemZ backend. This PR introduces a Full diff: https://github.com/llvm/llvm-project/pull/183441.diff 5 Files Affected:
diff --git a/llvm/include/llvm/MC/MCGOFFAttributes.h b/llvm/include/llvm/MC/MCGOFFAttributes.h
index b1c6d73e41f9f..9787ef4c916a9 100644
--- a/llvm/include/llvm/MC/MCGOFFAttributes.h
+++ b/llvm/include/llvm/MC/MCGOFFAttributes.h
@@ -82,6 +82,7 @@ struct PRAttr {
// Attributes for ER symbols.
struct ERAttr {
+ bool IsIndirectReference = false;
GOFF::ESDExecutable Executable = GOFF::ESD_EXE_Unspecified;
GOFF::ESDBindingStrength BindingStrength = GOFF::ESD_BST_Strong;
GOFF::ESDLinkageType Linkage = GOFF::ESD_LT_XPLink;
diff --git a/llvm/include/llvm/MC/MCSymbolGOFF.h b/llvm/include/llvm/MC/MCSymbolGOFF.h
index 310cc4db9a7e2..15193c8379d14 100644
--- a/llvm/include/llvm/MC/MCSymbolGOFF.h
+++ b/llvm/include/llvm/MC/MCSymbolGOFF.h
@@ -32,6 +32,7 @@ class MCSymbolGOFF : public MCSymbol {
enum SymbolFlags : uint16_t {
SF_Hidden = 0x01, // Symbol is hidden, aka not exported.
SF_Weak = 0x02, // Symbol is weak.
+ SF_Indirect = 0x4, // Symbol referenced indirectly.
};
public:
@@ -53,6 +54,11 @@ class MCSymbolGOFF : public MCSymbol {
bool isHidden() const { return getFlags() & SF_Hidden; }
bool isExported() const { return !isHidden(); }
+ void setIndirect(bool Value = true) {
+ modifyFlags(Value ? SF_Indirect : 0, SF_Indirect);
+ }
+ bool isIndirect() const { return getFlags() & SF_Indirect; }
+
void setWeak(bool Value = true) { modifyFlags(Value ? SF_Weak : 0, SF_Weak); }
bool isWeak() const { return getFlags() & SF_Weak; }
diff --git a/llvm/lib/MC/GOFFObjectWriter.cpp b/llvm/lib/MC/GOFFObjectWriter.cpp
index cbe9c7eb2fac1..a619328c09fa3 100644
--- a/llvm/lib/MC/GOFFObjectWriter.cpp
+++ b/llvm/lib/MC/GOFFObjectWriter.cpp
@@ -278,6 +278,7 @@ class GOFFSymbol {
BehavAttrs.setLinkageType(Attr.Linkage);
BehavAttrs.setAmode(Attr.Amode);
BehavAttrs.setBindingScope(Attr.BindingScope);
+ BehavAttrs.setIndirectReference(Attr.IsIndirectReference);
}
};
@@ -359,9 +360,9 @@ void GOFFWriter::defineLabel(const MCSymbolGOFF &Symbol) {
void GOFFWriter::defineExtern(const MCSymbolGOFF &Symbol) {
GOFFSymbol ER(Symbol.getName(), Symbol.getIndex(), RootSD->getOrdinal(),
- GOFF::ERAttr{Symbol.getCodeData(), Symbol.getBindingStrength(),
- Symbol.getLinkage(), GOFF::ESD_AMODE_64,
- Symbol.getBindingScope()});
+ GOFF::ERAttr{Symbol.isIndirect(), Symbol.getCodeData(),
+ Symbol.getBindingStrength(), Symbol.getLinkage(),
+ GOFF::ESD_AMODE_64, Symbol.getBindingScope()});
writeSymbol(ER);
}
diff --git a/llvm/lib/MC/MCSymbolGOFF.cpp b/llvm/lib/MC/MCSymbolGOFF.cpp
index 00479d22232ff..b6a25c3a24d94 100644
--- a/llvm/lib/MC/MCSymbolGOFF.cpp
+++ b/llvm/lib/MC/MCSymbolGOFF.cpp
@@ -24,7 +24,6 @@ bool MCSymbolGOFF::setSymbolAttribute(MCSymbolAttr Attribute) {
case MCSA_LGlobal:
case MCSA_Extern:
case MCSA_Exported:
- case MCSA_IndirectSymbol:
case MCSA_Internal:
case MCSA_LazyReference:
case MCSA_Local:
@@ -40,6 +39,9 @@ bool MCSymbolGOFF::setSymbolAttribute(MCSymbolAttr Attribute) {
case MCSA_Memtag:
return false;
+ case MCSA_IndirectSymbol:
+ setIndirect(true);
+ break;
case MCSA_ELF_TypeFunction:
setCodeData(GOFF::ESDExecutable::ESD_EXE_CODE);
break;
diff --git a/llvm/lib/Target/SystemZ/MCTargetDesc/SystemZHLASMAsmStreamer.cpp b/llvm/lib/Target/SystemZ/MCTargetDesc/SystemZHLASMAsmStreamer.cpp
index 8a559e1ab261b..bb49ab85ad126 100644
--- a/llvm/lib/Target/SystemZ/MCTargetDesc/SystemZHLASMAsmStreamer.cpp
+++ b/llvm/lib/Target/SystemZ/MCTargetDesc/SystemZHLASMAsmStreamer.cpp
@@ -193,7 +193,7 @@ void SystemZHLASMAsmStreamer::emitInstruction(const MCInst &Inst,
EmitEOL();
}
-static void emitXATTR(raw_ostream &OS, StringRef Name,
+static void emitXATTR(raw_ostream &OS, StringRef Name, bool IsIndirectReference,
GOFF::ESDLinkageType Linkage,
GOFF::ESDExecutable Executable,
GOFF::ESDBindingScope BindingScope) {
@@ -201,9 +201,25 @@ static void emitXATTR(raw_ostream &OS, StringRef Name,
OS << Name << " XATTR ";
OS << Sep << "LINKAGE(" << (Linkage == GOFF::ESD_LT_OS ? "OS" : "XPLINK")
<< ")";
- if (Executable != GOFF::ESD_EXE_Unspecified)
- OS << Sep << "REFERENCE("
- << (Executable == GOFF::ESD_EXE_CODE ? "CODE" : "DATA") << ")";
+
+ const bool NotUnspecified = (Executable != GOFF::ESD_EXE_Unspecified);
+ if (NotUnspecified || IsIndirectReference) {
+ OS << Sep << "REFERENCE(";
+ bool RequiresComma = false;
+
+ if (NotUnspecified) {
+ OS << (Executable == GOFF::ESD_EXE_CODE ? "CODE" : "DATA");
+ RequiresComma = true;
+ }
+
+ if (IsIndirectReference) {
+ if (RequiresComma)
+ OS << ",";
+ OS << "INDIRECT";
+ }
+
+ OS << ")";
+ }
if (BindingScope != GOFF::ESD_BSC_Unspecified) {
OS << Sep << "SCOPE(";
switch (BindingScope) {
@@ -224,7 +240,6 @@ static void emitXATTR(raw_ostream &OS, StringRef Name,
}
OS << ')';
}
- OS << '\n';
}
void SystemZHLASMAsmStreamer::emitLabel(MCSymbol *Symbol, SMLoc Loc) {
@@ -245,8 +260,8 @@ void SystemZHLASMAsmStreamer::emitLabel(MCSymbol *Symbol, SMLoc Loc) {
EmitEOL();
}
- emitXATTR(OS, Sym->getName(), Sym->getLinkage(), Sym->getCodeData(),
- Sym->getBindingScope());
+ emitXATTR(OS, Sym->getName(), Sym->isIndirect(), Sym->getLinkage(),
+ Sym->getCodeData(), Sym->getBindingScope());
EmitEOL();
}
@@ -355,8 +370,8 @@ void SystemZHLASMAsmStreamer::finishImpl() {
auto &Sym = static_cast<MCSymbolGOFF &>(const_cast<MCSymbol &>(Symbol));
OS << " " << (Sym.isWeak() ? "WXTRN" : "EXTRN") << " " << Sym.getName();
EmitEOL();
- emitXATTR(OS, Sym.getName(), Sym.getLinkage(), Sym.getCodeData(),
- Sym.getBindingScope());
+ emitXATTR(OS, Sym.getName(), Sym.isIndirect(), Sym.getLinkage(),
+ Sym.getCodeData(), Sym.getBindingScope());
EmitEOL();
}
|
|
✅ With the latest revision this PR passed the C/C++ code formatter. |
amy-kwan
changed the title
…direct symbol handling support This is the first of three patches aimed to support indirect symbol handling for the SystemZ backend. This PR introduces a `GOFF:ERAttr` to represent indirect references, handles indirect symbols within `setSymbolAttribute()` by setting the indirect reference bit, and also updates the HLASM streamer to emit `XATTR REFERENCE(INDIRECT)` and various other combinations.
amy-kwan
force-pushed
the
users/amy-kwan/indirectsymbols-1
branch
from
69e9313 to
ad410c6
Compare
redstar
reviewed
Feb 26, 2026
Member
redstar
left a comment
redstar
left a comment
There was a problem hiding this comment.
Please use the ListSeparator, otherwise LGTM.
| const bool NotUnspecified = (Executable != GOFF::ESD_EXE_Unspecified); | ||
| if (NotUnspecified || IsIndirectReference) { | ||
| OS << Sep << "REFERENCE("; | ||
| bool RequiresComma = false; |
Member
There was a problem hiding this comment.
Please use
llvm::ListSeparator SepRef(",");
instead. This encapsulates the boolean logic.
Comment on lines
+210
to
+213
| if (NotUnspecified) { | ||
| OS << (Executable == GOFF::ESD_EXE_CODE ? "CODE" : "DATA"); | ||
| RequiresComma = true; | ||
| } |
Member
There was a problem hiding this comment.
With SepRef, this becomes
Suggested change
| if (NotUnspecified) { | |
| OS << (Executable == GOFF::ESD_EXE_CODE ? "CODE" : "DATA"); | |
| RequiresComma = true; | |
| } | |
| if (NotUnspecified) | |
| OS << SepRef << (Executable == GOFF::ESD_EXE_CODE ? "CODE" : "DATA"); |
redstar
approved these changes
Feb 26, 2026
|
LLVM Buildbot has detected a new failure on builder Full details are available at: https://lab.llvm.org/buildbot/#/builders/162/builds/42032 Here is the relevant piece of the build log for the reference |
amy-kwan
added a commit
that referenced
this pull request
Feb 27, 2026
… support (#183442) This is the second of three patches aimed to support indirect symbol handling for the SystemZ backend. An external name is added for both MC sections and symbols and makes the relevant printers and writers utilize the external name when present. Furthermore, the ALIAS HLASM instruction is emitted after every XATTR instruction. Depends on #183441.
llvm-sync bot
pushed a commit
to arm/arm-toolchain
that referenced
this pull request
Feb 27, 2026
…ol handling support (#183442) This is the second of three patches aimed to support indirect symbol handling for the SystemZ backend. An external name is added for both MC sections and symbols and makes the relevant printers and writers utilize the external name when present. Furthermore, the ALIAS HLASM instruction is emitted after every XATTR instruction. Depends on llvm/llvm-project#183441.
sujianIBM
pushed a commit
to sujianIBM/llvm-project
that referenced
this pull request
Mar 5, 2026
…direct symbol handling support (llvm#183441) This is the first of three patches aimed to support indirect symbol handling for the SystemZ backend. This PR introduces a `GOFF:ERAttr` to represent indirect references, handles indirect symbols within `setSymbolAttribute()` by setting the indirect reference bit, and also updates the HLASM streamer to emit `XATTR REFERENCE(INDIRECT)` and various other combinations.
sujianIBM
pushed a commit
to sujianIBM/llvm-project
that referenced
this pull request
Mar 5, 2026
… support (llvm#183442) This is the second of three patches aimed to support indirect symbol handling for the SystemZ backend. An external name is added for both MC sections and symbols and makes the relevant printers and writers utilize the external name when present. Furthermore, the ALIAS HLASM instruction is emitted after every XATTR instruction. Depends on llvm#183441.
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
5 participants
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
This is the first of three patches aimed to support indirect symbol handling for the SystemZ backend. This PR introduces a
GOFF:ERAttrto represent indirect references, handles indirect symbols withinsetSymbolAttribute()by setting the indirect reference bit, and also updates the HLASM streamer to emitXATTR REFERENCE(INDIRECT)and various other combinations.