[llvm] [AArch64][Build Attributes] Improve functionality and fix bugs (PR #126530)
via llvm-commits
llvm-commits at lists.llvm.org
Thu Feb 13 03:14:22 PST 2025
https://github.com/sivan-shani updated https://github.com/llvm/llvm-project/pull/126530
>From 292c34d949a432c04460d10e72b1c809e3c2fdaf Mon Sep 17 00:00:00 2001
From: Sivan Shani <sivan.shani at arm.com>
Date: Mon, 10 Feb 2025 15:04:50 +0000
Subject: [PATCH] [AArch64][Build Attributes] Improve functionality and fix
bugs
- Improve testing
- Do not allow unknown tags to be strings
- Remove assertion when value exists
---
.../AArch64/AsmParser/AArch64AsmParser.cpp | 27 +++++-----
.../MCTargetDesc/AArch64TargetStreamer.cpp | 8 +--
...-build-attributes-asm-aeabi-aeabi-known.s} | 18 ++++---
... aarch64-build-attributes-asm-aeabi-bti.s} | 0
...64-build-attributes-asm-aeabi-err-attrs.s} | 7 ++-
...-build-attributes-asm-aeabi-err-headers.s} | 49 +++++++++---------
... aarch64-build-attributes-asm-aeabi-gcs.s} | 0
...aarch64-build-attributes-asm-aeabi-mixed.s | 48 +++++++++++++++++
...aarch64-build-attributes-asm-aeabi-none.s} | 0
...ild-attributes-asm-aeabi-numerical-tags.s} | 0
...build-attributes-asm-aeabi-out-of-order.s} | 0
... aarch64-build-attributes-asm-aeabi-pac.s} | 0
...ch64-build-attributes-asm-non_aeabi-err.s} | 5 ++
.../aarch64-build-attributes-asm-non_aeabi.s | 49 ++++++++++++++++++
...build-attributes-asm-private-subsections.s | 51 -------------------
15 files changed, 158 insertions(+), 104 deletions(-)
rename llvm/test/MC/AArch64/{aarch64-build-attributes-asm-all.s => aarch64-build-attributes-asm-aeabi-aeabi-known.s} (57%)
rename llvm/test/MC/AArch64/{aarch64-build-attributes-asm-bti.s => aarch64-build-attributes-asm-aeabi-bti.s} (100%)
rename llvm/test/MC/AArch64/{aarch64-build-attributes-asm-err-attrs.s => aarch64-build-attributes-asm-aeabi-err-attrs.s} (93%)
rename llvm/test/MC/AArch64/{aarch64-build-attributes-asm-err-headers.s => aarch64-build-attributes-asm-aeabi-err-headers.s} (89%)
rename llvm/test/MC/AArch64/{aarch64-build-attributes-asm-gcs.s => aarch64-build-attributes-asm-aeabi-gcs.s} (100%)
create mode 100644 llvm/test/MC/AArch64/aarch64-build-attributes-asm-aeabi-mixed.s
rename llvm/test/MC/AArch64/{aarch64-build-attributes-asm-none.s => aarch64-build-attributes-asm-aeabi-none.s} (100%)
rename llvm/test/MC/AArch64/{aarch64-build-attributes-asm-numerical-tags.s => aarch64-build-attributes-asm-aeabi-numerical-tags.s} (100%)
rename llvm/test/MC/AArch64/{aarch64-build-attributes-asm-out-of-order.s => aarch64-build-attributes-asm-aeabi-out-of-order.s} (100%)
rename llvm/test/MC/AArch64/{aarch64-build-attributes-asm-pac.s => aarch64-build-attributes-asm-aeabi-pac.s} (100%)
rename llvm/test/MC/AArch64/{aarch64-build-attributes-asm-private-subsections-err.s => aarch64-build-attributes-asm-non_aeabi-err.s} (87%)
create mode 100644 llvm/test/MC/AArch64/aarch64-build-attributes-asm-non_aeabi.s
delete mode 100644 llvm/test/MC/AArch64/aarch64-build-attributes-asm-private-subsections.s
diff --git a/llvm/lib/Target/AArch64/AsmParser/AArch64AsmParser.cpp b/llvm/lib/Target/AArch64/AsmParser/AArch64AsmParser.cpp
index 335b46b76688f..d1c72a0d0f66f 100644
--- a/llvm/lib/Target/AArch64/AsmParser/AArch64AsmParser.cpp
+++ b/llvm/lib/Target/AArch64/AsmParser/AArch64AsmParser.cpp
@@ -7870,8 +7870,7 @@ bool AArch64AsmParser::parseDirectiveAeabiSubSectionHeader(SMLoc L) {
IsOptional = AArch64BuildAttrs::getOptionalID(Optionality);
if (AArch64BuildAttrs::OPTIONAL_NOT_FOUND == IsOptional) {
Error(Parser.getTok().getLoc(),
- AArch64BuildAttrs::getSubsectionOptionalUnknownError() + ": " +
- Optionality);
+ AArch64BuildAttrs::getSubsectionOptionalUnknownError());
return true;
}
if (SubsectionExists) {
@@ -7919,7 +7918,7 @@ bool AArch64AsmParser::parseDirectiveAeabiSubSectionHeader(SMLoc L) {
Type = AArch64BuildAttrs::getTypeID(Name);
if (AArch64BuildAttrs::TYPE_NOT_FOUND == Type) {
Error(Parser.getTok().getLoc(),
- AArch64BuildAttrs::getSubsectionTypeUnknownError() + ": " + Name);
+ AArch64BuildAttrs::getSubsectionTypeUnknownError());
return true;
}
if (SubsectionExists) {
@@ -7986,14 +7985,22 @@ bool AArch64AsmParser::parseDirectiveAeabiAArch64Attr(SMLoc L) {
StringRef TagStr = "";
unsigned Tag;
- if (Parser.getTok().is(AsmToken::Identifier)) {
+ if (Parser.getTok().is(AsmToken::Integer)) {
+ Tag = getTok().getIntVal();
+ } else if (Parser.getTok().is(AsmToken::Identifier)) {
TagStr = Parser.getTok().getIdentifier();
switch (ActiveSubsectionID) {
default:
+ // Should not happen
assert(0 && "Subsection name error");
break;
case AArch64BuildAttrs::VENDOR_UNKNOWN:
- // Private subsection, accept any tag.
+ // Tag was provided as an unrecognized string instead of an unsigned
+ // integer
+ Error(Parser.getTok().getLoc(), "unrecognized Tag: '" + TagStr +
+ "' \nExcept for public subsections, "
+ "tags have to be an unsigned int.");
+ return true;
break;
case AArch64BuildAttrs::AEABI_PAUTHABI:
Tag = AArch64BuildAttrs::getPauthABITagsID(TagStr);
@@ -8014,8 +8021,6 @@ bool AArch64AsmParser::parseDirectiveAeabiAArch64Attr(SMLoc L) {
}
break;
}
- } else if (Parser.getTok().is(AsmToken::Integer)) {
- Tag = getTok().getIntVal();
} else {
Error(Parser.getTok().getLoc(), "AArch64 build attributes tag not found");
return true;
@@ -8059,10 +8064,9 @@ bool AArch64AsmParser::parseDirectiveAeabiAArch64Attr(SMLoc L) {
Error(Parser.getTok().getLoc(), "AArch64 build attributes value not found");
return true;
}
- // Check for possible unaccepted values for known tags (AEABI_PAUTHABI,
- // AEABI_FEATURE_AND_BITS)
- if (!(ActiveSubsectionID == AArch64BuildAttrs::VENDOR_UNKNOWN) &&
- TagStr != "") { // TagStr was a recognized string
+ // Check for possible unaccepted values for known tags
+ // (AEABI_FEATURE_AND_BITS)
+ if (ActiveSubsectionID == AArch64BuildAttrs::AEABI_FEATURE_AND_BITS) {
if (0 != ValueInt && 1 != ValueInt) {
Error(Parser.getTok().getLoc(),
"unknown AArch64 build attributes Value for Tag '" + TagStr +
@@ -8083,7 +8087,6 @@ bool AArch64AsmParser::parseDirectiveAeabiAArch64Attr(SMLoc L) {
getTargetStreamer().emitAttribute(ActiveSubsectionName, Tag, ValueInt, "",
false);
}
-
if ("" != ValueStr) {
getTargetStreamer().emitAttribute(ActiveSubsectionName, Tag, unsigned(-1),
ValueStr, false);
diff --git a/llvm/lib/Target/AArch64/MCTargetDesc/AArch64TargetStreamer.cpp b/llvm/lib/Target/AArch64/MCTargetDesc/AArch64TargetStreamer.cpp
index 1ed4a81a97673..d4081e606448b 100644
--- a/llvm/lib/Target/AArch64/MCTargetDesc/AArch64TargetStreamer.cpp
+++ b/llvm/lib/Target/AArch64/MCTargetDesc/AArch64TargetStreamer.cpp
@@ -222,13 +222,9 @@ void AArch64TargetStreamer::emitAttribute(StringRef VendorName, unsigned Tag,
"Can not add AArch64 build attribute: An attribute with "
"the same tag and a different value already exists");
return;
- } else {
- // Case Item.IntValue == Value, no need to emit twice
- assert(0 &&
- "AArch64 build attribute: An attribute with the same tag "
- "and a same value already exists");
- return;
}
+ // Case Item.IntValue == Value, no need to emit twice
+ return;
}
}
}
diff --git a/llvm/test/MC/AArch64/aarch64-build-attributes-asm-all.s b/llvm/test/MC/AArch64/aarch64-build-attributes-asm-aeabi-aeabi-known.s
similarity index 57%
rename from llvm/test/MC/AArch64/aarch64-build-attributes-asm-all.s
rename to llvm/test/MC/AArch64/aarch64-build-attributes-asm-aeabi-aeabi-known.s
index acbd0101e13fa..25a398c87659d 100644
--- a/llvm/test/MC/AArch64/aarch64-build-attributes-asm-all.s
+++ b/llvm/test/MC/AArch64/aarch64-build-attributes-asm-aeabi-aeabi-known.s
@@ -2,23 +2,25 @@
// RUN: llvm-mc -triple=aarch64 -filetype=obj %s -o - | llvm-readelf --hex-dump=.ARM.attributes - | FileCheck %s --check-prefix=ELF
// ASM: .aeabi_subsection aeabi_pauthabi, required, uleb128
-// ASM: .aeabi_attribute Tag_PAuth_Platform, 1
-// ASM: .aeabi_attribute Tag_PAuth_Schema, 1
+// ASM: .aeabi_attribute Tag_PAuth_Platform, 7
+// ASM: .aeabi_attribute Tag_PAuth_Schema, 777
+// ASM: .aeabi_attribute Tag_PAuth_Schema, 777
// ASM: .aeabi_subsection aeabi_feature_and_bits, optional, uleb128
// ASM: .aeabi_attribute Tag_Feature_BTI, 1
// ASM: .aeabi_attribute Tag_Feature_PAC, 1
// ASM: .aeabi_attribute Tag_Feature_GCS, 1
// ELF: Hex dump of section '.ARM.attributes':
-// ELF-NEXT: 0x00000000 41190000 00616561 62695f70 61757468 A....aeabi_pauth
-// ELF-NEXT: 0x00000010 61626900 00000101 02012300 00006165 abi.......#...ae
-// ELF-NEXT: 0x00000020 6162695f 66656174 7572655f 616e645f abi_feature_and_
-// ELF-NEXT: 0x00000030 62697473 00010000 01010102 01
+// ELF: 0x00000000 411a0000 00616561 62695f70 61757468 A....aeabi_pauth
+// ELF: 0x00000010 61626900 00000107 02890623 00000061 abi........#...a
+// ELF: 0x00000020 65616269 5f666561 74757265 5f616e64 eabi_feature_and
+// ELF: 0x00000030 5f626974 73000100 00010101 0201 _bits.........
.aeabi_subsection aeabi_pauthabi, required, uleb128
-.aeabi_attribute Tag_PAuth_Platform, 1
-.aeabi_attribute Tag_PAuth_Schema, 1
+.aeabi_attribute Tag_PAuth_Platform, 7
+.aeabi_attribute Tag_PAuth_Schema, 777
+.aeabi_attribute Tag_PAuth_Schema, 777
.aeabi_subsection aeabi_feature_and_bits, optional, uleb128
.aeabi_attribute Tag_Feature_BTI, 1
.aeabi_attribute Tag_Feature_PAC, 1
diff --git a/llvm/test/MC/AArch64/aarch64-build-attributes-asm-bti.s b/llvm/test/MC/AArch64/aarch64-build-attributes-asm-aeabi-bti.s
similarity index 100%
rename from llvm/test/MC/AArch64/aarch64-build-attributes-asm-bti.s
rename to llvm/test/MC/AArch64/aarch64-build-attributes-asm-aeabi-bti.s
diff --git a/llvm/test/MC/AArch64/aarch64-build-attributes-asm-err-attrs.s b/llvm/test/MC/AArch64/aarch64-build-attributes-asm-aeabi-err-attrs.s
similarity index 93%
rename from llvm/test/MC/AArch64/aarch64-build-attributes-asm-err-attrs.s
rename to llvm/test/MC/AArch64/aarch64-build-attributes-asm-aeabi-err-attrs.s
index ddf8feb9428d2..d509974f508d0 100644
--- a/llvm/test/MC/AArch64/aarch64-build-attributes-asm-err-attrs.s
+++ b/llvm/test/MC/AArch64/aarch64-build-attributes-asm-aeabi-err-attrs.s
@@ -1,5 +1,6 @@
// RUN: not llvm-mc -triple=aarch64 %s 2>&1 | FileCheck --check-prefix=ERR %s
+// Test logic and type mismatch
.aeabi_attribute Tag_Feature_BTI, 1
// ERR: error: no active subsection, build attribute can not be added
// ERR-NEXT: .aeabi_attribute Tag_Feature_BTI, 1
@@ -9,10 +10,6 @@
// ERR: error: unknown AArch64 build attribute 'Tag_Feature_BTI' for subsection 'aeabi_pauthabi'
// ERR-NEXT: .aeabi_attribute Tag_Feature_BTI, 1
-.aeabi_attribute Tag_PAuth_Platform, 4
-// ERR: error: unknown AArch64 build attributes Value for Tag 'Tag_PAuth_Platform' options are 0|1
-// ERR-NEXT: .aeabi_attribute Tag_PAuth_Platform, 4
-
.aeabi_attribute a, 1
// ERR: error: unknown AArch64 build attribute 'a' for subsection 'aeabi_pauthabi'
// ERR-NEXT: .aeabi_attribute a, 1
@@ -25,6 +22,8 @@
// ERR: error: active subsection type is ULEB128 (unsigned), found NTBS (string)
// ERR-NEXT: .aeabi_attribute Tag_PAuth_Platform, a
+
+// Test syntax errors
.aeabi_attribute Tag_PAuth_Platform,
// ERR: error: AArch64 build attributes value not found
// ERR-NEXT: .aeabi_attribute Tag_PAuth_Platform,
diff --git a/llvm/test/MC/AArch64/aarch64-build-attributes-asm-err-headers.s b/llvm/test/MC/AArch64/aarch64-build-attributes-asm-aeabi-err-headers.s
similarity index 89%
rename from llvm/test/MC/AArch64/aarch64-build-attributes-asm-err-headers.s
rename to llvm/test/MC/AArch64/aarch64-build-attributes-asm-aeabi-err-headers.s
index 9e6dca341e9f8..501958a17bed3 100644
--- a/llvm/test/MC/AArch64/aarch64-build-attributes-asm-err-headers.s
+++ b/llvm/test/MC/AArch64/aarch64-build-attributes-asm-aeabi-err-headers.s
@@ -1,21 +1,6 @@
// RUN: not llvm-mc -triple=aarch64 %s 2>&1 | FileCheck --check-prefix=ERR %s
-.aeabi_subsection aeabi_pauthabi, optional, uleb128
-// ERR: error: aeabi_pauthabi must be marked as required
-// ERR-NEXT: .aeabi_subsection aeabi_pauthabi, optional, uleb128
-
-.aeabi_subsection aeabi_pauthabi, required, ntbs
-// ERR: error: aeabi_pauthabi must be marked as ULEB128
-// ERR-NEXT: .aeabi_subsection aeabi_pauthabi, required, ntbs
-
-.aeabi_subsection aeabi_feature_and_bits, required, uleb128
-// ERR: error: aeabi_feature_and_bits must be marked as optional
-// ERR-NEXT: .aeabi_subsection aeabi_feature_and_bits, required, uleb128
-
-.aeabi_subsection aeabi_feature_and_bits, optional, ntbs
-// ERR: error: aeabi_feature_and_bits must be marked as ULEB128
-// ERR-NEXT: .aeabi_subsection aeabi_feature_and_bits, optional, ntbs
-
+// Test syntax errors
.aeabi_subsection 1, required, uleb128
// ERR: error: subsection name not found
// ERR-NEXT: .aeabi_subsection 1, required, uleb128
@@ -25,11 +10,7 @@
// ERR-NEXT: .aeabi_subsection , required, uleb128
.aeabi_subsection aeabi_pauthabi, a, uleb128
-// ERR: error: unknown AArch64 build attributes optionality, expected required|optional: a
-// ERR-NEXT: .aeabi_subsection aeabi_pauthabi, a, uleb128
-
-.aeabi_subsection aeabi_pauthabi, a, uleb128
-// ERR: error: unknown AArch64 build attributes optionality, expected required|optional: a
+// ERR: error: unknown AArch64 build attributes optionality, expected required|optional
// ERR-NEXT: .aeabi_subsection aeabi_pauthabi, a, uleb128
.aeabi_subsection aeabi_pauthabi, 1, uleb128
@@ -41,7 +22,7 @@
// ERR-NEXT: .aeabi_subsection aeabi_pauthabi, ,uleb128
.aeabi_subsection aeabi_pauthabi,uleb128
-// ERR: error: unknown AArch64 build attributes optionality, expected required|optional: uleb128
+// ERR: error: unknown AArch64 build attributes optionality, expected required|optional
// ERR-NEXT: .aeabi_subsection aeabi_pauthabi,uleb128
.aeabi_subsection aeabi_pauthabi uleb128
@@ -57,5 +38,27 @@
// ERR-NEXT: .aeabi_subsection aeabi_pauthabi, required,
.aeabi_subsection aeabi_pauthabi, required, a
-// ERR: error: unknown AArch64 build attributes type, expected uleb128|ntbs: a
+// ERR: error: unknown AArch64 build attributes type, expected uleb128|ntbs
// ERR-NEXT: .aeabi_subsection aeabi_pauthabi, required, a
+
+.aeabi_subsection aeabi_pauthabi, optional, uleb128
+// ERR: error: aeabi_pauthabi must be marked as required
+// ERR-NEXT: .aeabi_subsection aeabi_pauthabi, optional, uleb128
+
+
+// Test types mismatch
+.aeabi_subsection aeabi_pauthabi, optional, uleb128
+// ERR: error: aeabi_pauthabi must be marked as required
+// ERR-NEXT: .aeabi_subsection aeabi_pauthabi, optional, uleb128
+
+.aeabi_subsection aeabi_pauthabi, required, ntbs
+// ERR: error: aeabi_pauthabi must be marked as ULEB128
+// ERR-NEXT: .aeabi_subsection aeabi_pauthabi, required, ntbs
+
+.aeabi_subsection aeabi_feature_and_bits, required, uleb128
+// ERR: error: aeabi_feature_and_bits must be marked as optional
+// ERR-NEXT: .aeabi_subsection aeabi_feature_and_bits, required, uleb128
+
+.aeabi_subsection aeabi_feature_and_bits, optional, ntbs
+// ERR: error: aeabi_feature_and_bits must be marked as ULEB128
+// ERR-NEXT: .aeabi_subsection aeabi_feature_and_bits, optional, ntbs
diff --git a/llvm/test/MC/AArch64/aarch64-build-attributes-asm-gcs.s b/llvm/test/MC/AArch64/aarch64-build-attributes-asm-aeabi-gcs.s
similarity index 100%
rename from llvm/test/MC/AArch64/aarch64-build-attributes-asm-gcs.s
rename to llvm/test/MC/AArch64/aarch64-build-attributes-asm-aeabi-gcs.s
diff --git a/llvm/test/MC/AArch64/aarch64-build-attributes-asm-aeabi-mixed.s b/llvm/test/MC/AArch64/aarch64-build-attributes-asm-aeabi-mixed.s
new file mode 100644
index 0000000000000..13be5e8efd4ff
--- /dev/null
+++ b/llvm/test/MC/AArch64/aarch64-build-attributes-asm-aeabi-mixed.s
@@ -0,0 +1,48 @@
+// RUN: llvm-mc -triple=aarch64 %s -o - | FileCheck %s --check-prefix=ASM
+// RUN: llvm-mc -triple=aarch64 -filetype=obj %s -o - | llvm-readelf --hex-dump=.ARM.attributes - | FileCheck %s --check-prefix=ELF
+
+// ASM: .aeabi_subsection subsection_a, optional, uleb128
+// ASM: .aeabi_subsection aeabi_subsection, optional, ntbs
+// ASM: .aeabi_subsection subsection_b, required, uleb128
+// ASM: .aeabi_subsection aeabi_pauthabi, required, uleb128
+// ASM: .aeabi_attribute Tag_PAuth_Platform, 7
+// ASM: .aeabi_attribute Tag_PAuth_Schema, 777
+// ASM: .aeabi_subsection aeabi_feature_and_bits, optional, uleb128
+// ASM: .aeabi_attribute Tag_Feature_BTI, 1
+// ASM: .aeabi_attribute Tag_Feature_PAC, 1
+// ASM: .aeabi_attribute Tag_Feature_GCS, 1
+// ASM: .aeabi_subsection aeabi_subsection, optional, ntbs
+// ASM: .aeabi_attribute 5, "Value"
+// ASM: .aeabi_subsection subsection_b, required, uleb128
+// ASM: .aeabi_attribute 6, 536
+// ASM: .aeabi_subsection subsection_a, optional, uleb128
+// ASM: .aeabi_attribute 7, 11
+
+// ELF: Hex dump of section '.ARM.attributes':
+// ELF: 0x00000000 41150000 00737562 73656374 696f6e5f A....subsection_
+// ELF: 0x00000010 61000100 070b2000 00006165 6162695f a..... ...aeabi_
+// ELF: 0x00000020 73756273 65637469 6f6e0001 01052256 subsection...."V
+// ELF: 0x00000030 616c7565 22001600 00007375 62736563 alue".....subsec
+// ELF: 0x00000040 74696f6e 5f620000 00069804 1a000000 tion_b..........
+// ELF: 0x00000050 61656162 695f7061 75746861 62690000 aeabi_pauthabi..
+// ELF: 0x00000060 00010702 89062300 00006165 6162695f ......#...aeabi_
+// ELF: 0x00000070 66656174 7572655f 616e645f 62697473 feature_and_bits
+// ELF: 0x00000080 00010000 01010102 01 .........
+
+
+.aeabi_subsection subsection_a, optional, uleb128
+.aeabi_subsection aeabi_subsection, optional, ntbs
+.aeabi_subsection subsection_b, required, uleb128
+.aeabi_subsection aeabi_pauthabi, required, uleb128
+.aeabi_attribute Tag_PAuth_Platform, 7
+.aeabi_attribute Tag_PAuth_Schema, 777
+.aeabi_subsection aeabi_feature_and_bits, optional, uleb128
+.aeabi_attribute Tag_Feature_BTI, 1
+.aeabi_attribute Tag_Feature_PAC, 1
+.aeabi_attribute Tag_Feature_GCS, 1
+.aeabi_subsection aeabi_subsection, optional, ntbs
+.aeabi_attribute 5, "Value"
+.aeabi_subsection subsection_b, required, uleb128
+.aeabi_attribute 6, 536
+.aeabi_subsection subsection_a, optional, uleb128
+.aeabi_attribute 7, 11
diff --git a/llvm/test/MC/AArch64/aarch64-build-attributes-asm-none.s b/llvm/test/MC/AArch64/aarch64-build-attributes-asm-aeabi-none.s
similarity index 100%
rename from llvm/test/MC/AArch64/aarch64-build-attributes-asm-none.s
rename to llvm/test/MC/AArch64/aarch64-build-attributes-asm-aeabi-none.s
diff --git a/llvm/test/MC/AArch64/aarch64-build-attributes-asm-numerical-tags.s b/llvm/test/MC/AArch64/aarch64-build-attributes-asm-aeabi-numerical-tags.s
similarity index 100%
rename from llvm/test/MC/AArch64/aarch64-build-attributes-asm-numerical-tags.s
rename to llvm/test/MC/AArch64/aarch64-build-attributes-asm-aeabi-numerical-tags.s
diff --git a/llvm/test/MC/AArch64/aarch64-build-attributes-asm-out-of-order.s b/llvm/test/MC/AArch64/aarch64-build-attributes-asm-aeabi-out-of-order.s
similarity index 100%
rename from llvm/test/MC/AArch64/aarch64-build-attributes-asm-out-of-order.s
rename to llvm/test/MC/AArch64/aarch64-build-attributes-asm-aeabi-out-of-order.s
diff --git a/llvm/test/MC/AArch64/aarch64-build-attributes-asm-pac.s b/llvm/test/MC/AArch64/aarch64-build-attributes-asm-aeabi-pac.s
similarity index 100%
rename from llvm/test/MC/AArch64/aarch64-build-attributes-asm-pac.s
rename to llvm/test/MC/AArch64/aarch64-build-attributes-asm-aeabi-pac.s
diff --git a/llvm/test/MC/AArch64/aarch64-build-attributes-asm-private-subsections-err.s b/llvm/test/MC/AArch64/aarch64-build-attributes-asm-non_aeabi-err.s
similarity index 87%
rename from llvm/test/MC/AArch64/aarch64-build-attributes-asm-private-subsections-err.s
rename to llvm/test/MC/AArch64/aarch64-build-attributes-asm-non_aeabi-err.s
index 5884a74f989cc..6e28481aeb97b 100644
--- a/llvm/test/MC/AArch64/aarch64-build-attributes-asm-private-subsections-err.s
+++ b/llvm/test/MC/AArch64/aarch64-build-attributes-asm-non_aeabi-err.s
@@ -15,6 +15,11 @@
// ERR: error: active subsection type is NTBS (string), found ULEB128 (unsigned)
// ERR-NEXT: .aeabi_attribute 324, 1
+.aeabi_attribute str_not_int, "1"
+// ERR: error: unrecognized Tag: 'str_not_int'
+// ERR-NEXT: Except for public subsections, tags have to be an unsigned int.
+// ERR-NEXT: .aeabi_attribute str_not_int, "1"
+
.aeabi_subsection foo, optional, uleb128
.aeabi_subsection bar, optional, uleb128
.aeabi_subsection foo, required, uleb128
diff --git a/llvm/test/MC/AArch64/aarch64-build-attributes-asm-non_aeabi.s b/llvm/test/MC/AArch64/aarch64-build-attributes-asm-non_aeabi.s
new file mode 100644
index 0000000000000..ef55a3cfc89de
--- /dev/null
+++ b/llvm/test/MC/AArch64/aarch64-build-attributes-asm-non_aeabi.s
@@ -0,0 +1,49 @@
+// RUN: llvm-mc -triple=aarch64 %s -o - | FileCheck %s --check-prefix=ASM
+// RUN: llvm-mc -triple=aarch64 -filetype=obj %s -o - | llvm-readelf --hex-dump=.ARM.attributes - | FileCheck %s --check-prefix=ELF
+
+// ASM: .aeabi_subsection private_subsection_1, optional, uleb128
+// ASM: .aeabi_attribute 12, 257
+// ASM: .aeabi_subsection aeabi_2, required, uleb128
+// ASM: .aeabi_attribute 76, 257
+// ASM: .aeabi_subsection aeabi_3, optional, ntbs
+// ASM: .aeabi_attribute 34, hello_llvm
+// ASM: .aeabi_subsection private_subsection_4, required, ntbs
+// ASM: .aeabi_attribute 777, "hello_llvm"
+// ASM: .aeabi_subsection private_subsection_1, optional, uleb128
+// ASM: .aeabi_attribute 876, 257
+// ASM: .aeabi_subsection aeabi_2, required, uleb128
+// ASM: .aeabi_attribute 876, 257
+// ASM: .aeabi_subsection aeabi_3, optional, ntbs
+// ASM: .aeabi_attribute 876, "hello_llvm"
+// ASM: .aeabi_subsection private_subsection_4, required, ntbs
+// ASM: .aeabi_attribute 876, hello_llvm
+
+// ELF: Hex dump of section '.ARM.attributes':
+// ELF: 0x00000000 41220000 00707269 76617465 5f737562 A"...private_sub
+// ELF: 0x00000010 73656374 696f6e5f 31000100 0c8102ec section_1.......
+// ELF: 0x00000020 06810215 00000061 65616269 5f320000 .......aeabi_2..
+// ELF: 0x00000030 004c8102 ec068102 29000000 61656162 .L......)...aeab
+// ELF: 0x00000040 695f3300 01012268 656c6c6f 5f6c6c76 i_3..."hello_llv
+// ELF: 0x00000050 6d00ec06 2268656c 6c6f5f6c 6c766d22 m..."hello_llvm"
+// ELF: 0x00000060 00370000 00707269 76617465 5f737562 .7...private_sub
+// ELF: 0x00000070 73656374 696f6e5f 34000001 89062268 section_4....."h
+// ELF: 0x00000080 656c6c6f 5f6c6c76 6d2200ec 0668656c ello_llvm"...hel
+// ELF: 0x00000090 6c6f5f6c 6c766d00 lo_llvm.
+
+
+.aeabi_subsection private_subsection_1, optional, uleb128
+.aeabi_attribute 12, 257
+.aeabi_subsection aeabi_2, required, uleb128
+.aeabi_attribute 76, 257
+.aeabi_subsection aeabi_3, optional, ntbs
+.aeabi_attribute 34, hello_llvm
+.aeabi_subsection private_subsection_4, required, ntbs
+.aeabi_attribute 777, "hello_llvm"
+.aeabi_subsection private_subsection_1, optional, uleb128
+.aeabi_attribute 876, 257
+.aeabi_subsection aeabi_2, required, uleb128
+.aeabi_attribute 876, 257
+.aeabi_subsection aeabi_3, optional, ntbs
+.aeabi_attribute 876, "hello_llvm"
+.aeabi_subsection private_subsection_4, required, ntbs
+.aeabi_attribute 876, hello_llvm
diff --git a/llvm/test/MC/AArch64/aarch64-build-attributes-asm-private-subsections.s b/llvm/test/MC/AArch64/aarch64-build-attributes-asm-private-subsections.s
deleted file mode 100644
index 229033a9f6b70..0000000000000
--- a/llvm/test/MC/AArch64/aarch64-build-attributes-asm-private-subsections.s
+++ /dev/null
@@ -1,51 +0,0 @@
-// RUN: llvm-mc -triple=aarch64 %s -o - | FileCheck %s --check-prefix=ASM
-// RUN: llvm-mc -triple=aarch64 -filetype=obj %s -o - | llvm-readelf --hex-dump=.ARM.attributes - | FileCheck %s --check-prefix=ELF
-
-// ASM: .aeabi_subsection private_subsection_1, optional, uleb128
-// ASM: .aeabi_attribute 12, 257
-// ASM: .aeabi_subsection private_subsection_2, required, uleb128
-// ASM: .aeabi_attribute 76, 257
-// ASM: .aeabi_subsection private_subsection_3, optional, ntbs
-// ASM: .aeabi_attribute 34, hello_llvm
-// ASM: .aeabi_subsection private_subsection_4, required, ntbs
-// ASM: .aeabi_attribute 777, "hello_llvm"
-// ASM: .aeabi_subsection private_subsection_1, optional, uleb128
-// ASM: .aeabi_attribute 876, 257
-// ASM: .aeabi_subsection private_subsection_2, required, uleb128
-// ASM: .aeabi_attribute 876, 257
-// ASM: .aeabi_subsection private_subsection_3, optional, ntbs
-// ASM: .aeabi_attribute 876, "hello_llvm"
-// ASM: .aeabi_subsection private_subsection_4, required, ntbs
-// ASM: .aeabi_attribute 876, hello_llvm
-
-// ELF: Hex dump of section '.ARM.attributes':
-// ELF-NEXT: 0x00000000 41220000 00707269 76617465 5f737562 A"...private_sub
-// ELF-NEXT: 0x00000010 73656374 696f6e5f 31000100 0c8102ec section_1.......
-// ELF-NEXT: 0x00000020 06810222 00000070 72697661 74655f73 ..."...private_s
-// ELF-NEXT: 0x00000030 75627365 6374696f 6e5f3200 00004c81 ubsection_2...L.
-// ELF-NEXT: 0x00000040 02ec0681 02360000 00707269 76617465 .....6...private
-// ELF-NEXT: 0x00000050 5f737562 73656374 696f6e5f 33000101 _subsection_3...
-// ELF-NEXT: 0x00000060 2268656c 6c6f5f6c 6c766d00 ec062268 "hello_llvm..."h
-// ELF-NEXT: 0x00000070 656c6c6f 5f6c6c76 6d220037 00000070 ello_llvm".7...p
-// ELF-NEXT: 0x00000080 72697661 74655f73 75627365 6374696f rivate_subsectio
-// ELF-NEXT: 0x00000090 6e5f3400 00018906 2268656c 6c6f5f6c n_4....."hello_l
-// ELF-NEXT: 0x000000a0 6c766d22 00ec0668 656c6c6f 5f6c6c76 lvm"...hello_llv
-// ELF-NEXT: 0x000000b0 6d00 m.
-
-
-.aeabi_subsection private_subsection_1, optional, uleb128
-.aeabi_attribute 12, 257
-.aeabi_subsection private_subsection_2, required, uleb128
-.aeabi_attribute 76, 257
-.aeabi_subsection private_subsection_3, optional, ntbs
-.aeabi_attribute 34, hello_llvm
-.aeabi_subsection private_subsection_4, required, ntbs
-.aeabi_attribute 777, "hello_llvm"
-.aeabi_subsection private_subsection_1, optional, uleb128
-.aeabi_attribute 876, 257
-.aeabi_subsection private_subsection_2, required, uleb128
-.aeabi_attribute 876, 257
-.aeabi_subsection private_subsection_3, optional, ntbs
-.aeabi_attribute 876, "hello_llvm"
-.aeabi_subsection private_subsection_4, required, ntbs
-.aeabi_attribute 876, hello_llvm
More information about the llvm-commits
mailing list