Skip to content

[AArch64][Build Attributes] Improve Parsing and Formatting #126530

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 14 commits into from
Feb 25, 2025
Merged

[AArch64][Build Attributes] Improve Parsing and Formatting #126530

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
14 commits
Select commit Hold shift + click to select a range
512784f
[AArch64][Build Attributes] Improve testing (delete previous tests fi…
sivan-shani Feb 17, 2025
506aad3
[AArch64][Build Attributes] Standardize parsing error messages
sivan-shani Feb 17, 2025
1fb501d
[AArch64][Build Attributes] Print Tags as Numbers with Comments
sivan-shani Feb 17, 2025
083bd48
[AArch64][Build Attributes] Fix Parsing of Some Tags and Values
sivan-shani Feb 17, 2025
a126df1
[AArch64][Build Attributes] Remove Assertion for Duplicate Values
sivan-shani Feb 17, 2025
e453ae0
[AArch64][Build Attributes] Add test files
sivan-shani Feb 17, 2025
c161c04
[AArch64][Build Attributes] Same Tag different Value: override
sivan-shani Feb 18, 2025
9c3f0f7
[AArch64][Build Attributes] Improve Parsing and Formatting
sivan-shani Feb 18, 2025
3ae07d1
[AArch64][Build Attributes] Remove unused 'Override' parameter
sivan-shani Feb 19, 2025
badefe8
[AArch64][Build Attributes] Remove redundant comments and unneeded case
sivan-shani Feb 19, 2025
6fdc1ee
Remove prefix aarch64 from test files residing in the AArch64 folder
sivan-shani Feb 20, 2025
c1f74f9
For llvm-mc, omit -o - (default)
sivan-shani Feb 20, 2025
d7517cd
handle unnecessary switch defaults
sivan-shani Feb 20, 2025
ae37558
Remove unnecessary condition check when tag exists.
sivan-shani Feb 24, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
15 changes: 12 additions & 3 deletions llvm/lib/Target/AArch64/AsmParser/AArch64AsmParser.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7947,7 +7947,12 @@ bool AArch64AsmParser::parseDirectiveAeabiSubSectionHeader(SMLoc L) {
}
}
Parser.Lex();
// Parsing finished, check for trailing tokens.

// Parsing finished, hereafter only accept comments; otherwise no trailing
// tokens.
if (Parser.getTok().is(llvm::AsmToken::At)) {
Parser.parseStringToEndOfStatement();
}
if (Parser.getTok().isNot(llvm::AsmToken::EndOfStatement)) {
Error(Parser.getTok().getLoc(), "unexpected token for AArch64 build "
"attributes subsection header directive");
Expand Down Expand Up @@ -8070,7 +8075,12 @@ bool AArch64AsmParser::parseDirectiveAeabiAArch64Attr(SMLoc L) {
}
}
Parser.Lex();
// Parsing finished, check for trailing tokens.

// Parsing finished, hereafter only accept comments; otherwise no trailing
// tokens.
if (Parser.getTok().is(llvm::AsmToken::At)) {
Parser.parseStringToEndOfStatement();
}
if (Parser.getTok().isNot(llvm::AsmToken::EndOfStatement)) {
Error(Parser.getTok().getLoc(),
"unexpected token for AArch64 build attributes tag and value "
Expand All @@ -8082,7 +8092,6 @@ bool AArch64AsmParser::parseDirectiveAeabiAArch64Attr(SMLoc L) {
getTargetStreamer().emitAttribute(ActiveSubsectionName, Tag, ValueInt, "",
false);
}

if ("" != ValueStr) {
getTargetStreamer().emitAttribute(ActiveSubsectionName, Tag, unsigned(-1),
ValueStr, false);
Expand Down
8 changes: 4 additions & 4 deletions llvm/lib/Target/AArch64/MCTargetDesc/AArch64ELFStreamer.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -191,8 +191,8 @@ class AArch64TargetAsmStreamer : public AArch64TargetStreamer {
case AArch64BuildAttrs::TAG_FEATURE_BTI:
case AArch64BuildAttrs::TAG_FEATURE_GCS:
case AArch64BuildAttrs::TAG_FEATURE_PAC:
OS << "\t.aeabi_attribute" << "\t"
<< AArch64BuildAttrs::getFeatureAndBitsTagsStr(Tag) << ", " << Value;
OS << "\t.aeabi_attribute" << "\t" << Tag << ", " << Value << "\t@ "
<< AArch64BuildAttrs::getFeatureAndBitsTagsStr(Tag);
AArch64TargetStreamer::emitAttribute(VendorName, Tag, Value, "",
Override);
break;
Expand All @@ -210,8 +210,8 @@ class AArch64TargetAsmStreamer : public AArch64TargetStreamer {
break;
case AArch64BuildAttrs::TAG_PAUTH_PLATFORM:
case AArch64BuildAttrs::TAG_PAUTH_SCHEMA:
OS << "\t.aeabi_attribute" << "\t"
<< AArch64BuildAttrs::getPauthABITagsStr(Tag) << ", " << Value;
OS << "\t.aeabi_attribute" << "\t" << Tag << ", " << Value << "\t@ "
<< AArch64BuildAttrs::getPauthABITagsStr(Tag);
AArch64TargetStreamer::emitAttribute(VendorName, Tag, Value, "",
Override);
break;
Expand Down
6 changes: 3 additions & 3 deletions llvm/test/CodeGen/AArch64/aarch64-build-attributes-all.ll
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,9 +2,9 @@
; RUN: llc %s -filetype=obj -o - | llvm-readelf --hex-dump=.ARM.attributes - | FileCheck %s --check-prefix=ELF

; ASM: .aeabi_subsection aeabi_feature_and_bits, optional, uleb128
; ASM-NEXT: .aeabi_attribute Tag_Feature_BTI, 1
; ASM-NEXT: .aeabi_attribute Tag_Feature_PAC, 1
; ASM-NEXT: .aeabi_attribute Tag_Feature_GCS, 1
; ASM-NEXT: .aeabi_attribute 0, 1 @ Tag_Feature_BTI
; ASM-NEXT: .aeabi_attribute 1, 1 @ Tag_Feature_PAC
; ASM-NEXT: .aeabi_attribute 2, 1 @ Tag_Feature_GCS

; ELF: Hex dump of section '.ARM.attributes':
; ELF-NEXT: 0x00000000 41230000 00616561 62695f66 65617475 A#...aeabi_featu
Expand Down
6 changes: 3 additions & 3 deletions llvm/test/CodeGen/AArch64/aarch64-build-attributes-bti.ll
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,9 +2,9 @@
; RUN: llc %s -filetype=obj -o - | llvm-readelf --hex-dump=.ARM.attributes - | FileCheck %s --check-prefix=ELF

; ASM: .aeabi_subsection aeabi_feature_and_bits, optional, uleb128
; ASM-NEXT: .aeabi_attribute Tag_Feature_BTI, 1
; ASM-NEXT: .aeabi_attribute Tag_Feature_PAC, 0
; ASM-NEXT: .aeabi_attribute Tag_Feature_GCS, 0
; ASM-NEXT: .aeabi_attribute 0, 1 @ Tag_Feature_BTI
; ASM-NEXT: .aeabi_attribute 1, 0 @ Tag_Feature_PAC
; ASM-NEXT: .aeabi_attribute 2, 0 @ Tag_Feature_GCS

; ELF: Hex dump of section '.ARM.attributes':
; ELF-NEXT: 0x00000000 41230000 00616561 62695f66 65617475 A#...aeabi_featu
Expand Down
6 changes: 3 additions & 3 deletions llvm/test/CodeGen/AArch64/aarch64-build-attributes-gcs.ll
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,9 +2,9 @@
; RUN: llc %s -filetype=obj -o - | llvm-readelf --hex-dump=.ARM.attributes - | FileCheck %s --check-prefix=ELF

; ASM: .aeabi_subsection aeabi_feature_and_bits, optional, uleb128
; ASM-NEXT: .aeabi_attribute Tag_Feature_BTI, 0
; ASM-NEXT: .aeabi_attribute Tag_Feature_PAC, 0
; ASM-NEXT: .aeabi_attribute Tag_Feature_GCS, 1
; ASM-NEXT: .aeabi_attribute 0, 0 @ Tag_Feature_BTI
; ASM-NEXT: .aeabi_attribute 1, 0 @ Tag_Feature_PAC
; ASM-NEXT: .aeabi_attribute 2, 1 @ Tag_Feature_GCS

; ELF: Hex dump of section '.ARM.attributes':
; ELF-NEXT: 0x00000000 41230000 00616561 62695f66 65617475 A#...aeabi_featu
Expand Down
6 changes: 3 additions & 3 deletions llvm/test/CodeGen/AArch64/aarch64-build-attributes-pac.ll
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,9 +2,9 @@
; RUN: llc %s -filetype=obj -o - | llvm-readelf --hex-dump=.ARM.attributes - | FileCheck %s --check-prefix=ELF

; ASM: .aeabi_subsection aeabi_feature_and_bits, optional, uleb128
; ASM-NEXT: .aeabi_attribute Tag_Feature_BTI, 0
; ASM-NEXT: .aeabi_attribute Tag_Feature_PAC, 1
; ASM-NEXT: .aeabi_attribute Tag_Feature_GCS, 0
; ASM-NEXT: .aeabi_attribute 0, 0 @ Tag_Feature_BTI
; ASM-NEXT: .aeabi_attribute 1, 1 @ Tag_Feature_PAC
; ASM-NEXT: .aeabi_attribute 2, 0 @ Tag_Feature_GCS

; ELF: Hex dump of section '.ARM.attributes':
; ELF-NEXT: 0x00000000 41230000 00616561 62695f66 65617475 A#...aeabi_featu
Expand Down
4 changes: 2 additions & 2 deletions llvm/test/CodeGen/AArch64/aarch64-build-attributes-pauthabi.ll
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,8 +2,8 @@
; RUN: llc %s -filetype=obj -o - | llvm-readelf --hex-dump=.ARM.attributes - | FileCheck %s --check-prefix=ELF

; ASM: .aeabi_subsection aeabi_pauthabi, required, uleb128
; ASM-NEXT: .aeabi_attribute Tag_PAuth_Platform, 2
; ASM-NEXT: .aeabi_attribute Tag_PAuth_Schema, 31
; ASM-NEXT: .aeabi_attribute 1, 2 @ Tag_PAuth_Platform
; ASM-NEXT: .aeabi_attribute 2, 31 @ Tag_PAuth_Schema

; ELF: Hex dump of section '.ARM.attributes':
; ELF-NEXT: 0x00000000 41190000 00616561 62695f70 61757468 A....aeabi_pauth
Expand Down