Skip to content

Commit 80c4d75

Browse files
simpal01simpal01
authored
Update to the new naming scheme for AArch64 little endian variants. (#32)
Now all the base variants are with strict alignement. Aligned variants should not indicate their alignment status in their names, while unaligned variants must include 'unaligned' in their names. Currently, for AArch64 little endian, the naming scheme is reversed. And that need to update to the new naming scheme.
1 parent 27a40b8 commit 80c4d75

File tree

6 files changed

+79
-54
lines changed

6 files changed

+79
-54
lines changed

‎arm-software/embedded/arm-multilib/json/multilib.json‎

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,13 @@
11
{
22
"libs": [
33
{
4-
"variant": "aarch64a_exn_rtti",
5-
"json": "aarch64a_exn_rtti.json",
4+
"variant": "aarch64a_exn_rtti_unaligned",
5+
"json": "aarch64a_exn_rtti_unaligned.json",
66
"flags": "--target=aarch64-unknown-none-elf"
77
},
88
{
9-
"variant": "aarch64a",
10-
"json": "aarch64a.json",
9+
"variant": "aarch64a_unaligned",
10+
"json": "aarch64a_unaligned.json",
1111
"flags": "--target=aarch64-unknown-none-elf -fno-exceptions -fno-rtti"
1212
},
1313
{
@@ -21,13 +21,13 @@
2121
"flags": "--target=aarch64_be-unknown-none-elf -fno-exceptions -fno-rtti"
2222
},
2323
{
24-
"variant": "aarch64a_strictalign_exn_rtti",
25-
"json": "aarch64a_strictalign_exn_rtti.json",
24+
"variant": "aarch64a_exn_rtti",
25+
"json": "aarch64a_exn_rtti.json",
2626
"flags": "--target=aarch64-unknown-none-elf -mno-unaligned-access"
2727
},
2828
{
29-
"variant": "aarch64a_strictalign",
30-
"json": "aarch64a_strictalign.json",
29+
"variant": "aarch64a",
30+
"json": "aarch64a.json",
3131
"flags": "--target=aarch64-unknown-none-elf -mno-unaligned-access -fno-exceptions -fno-rtti"
3232
},
3333
{

‎arm-software/embedded/arm-multilib/json/variants/aarch64a.json‎

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -3,17 +3,17 @@
33
"common": {
44
"TARGET_ARCH": "aarch64a",
55
"VARIANT": "aarch64a",
6-
"COMPILE_FLAGS": "-march=armv8-a",
6+
"COMPILE_FLAGS": "-march=armv8-a -mno-unaligned-access",
77
"ENABLE_EXCEPTIONS": "OFF",
88
"ENABLE_RTTI": "OFF",
9-
"TEST_EXECUTOR": "qemu",
10-
"QEMU_MACHINE": "virt",
11-
"QEMU_CPU": "cortex-a57",
12-
"BOOT_FLASH_ADDRESS": "0x40000000",
9+
"TEST_EXECUTOR": "fvp",
10+
"FVP_MODEL": "aem-a",
11+
"FVP_CONFIG": "v8a-aarch64",
12+
"BOOT_FLASH_ADDRESS": "0x80000000",
1313
"BOOT_FLASH_SIZE": "0x1000",
14-
"FLASH_ADDRESS": "0x40001000",
14+
"FLASH_ADDRESS": "0x80001000",
1515
"FLASH_SIZE": "0xfff000",
16-
"RAM_ADDRESS": "0x41000000",
16+
"RAM_ADDRESS": "0x81000000",
1717
"RAM_SIZE": "0x1000000",
1818
"STACK_SIZE": "8K"
1919
},
@@ -37,4 +37,4 @@
3737
"ENABLE_LIBCXX_TESTS": "OFF"
3838
}
3939
}
40-
}
40+
}

‎arm-software/embedded/arm-multilib/json/variants/aarch64a_exn_rtti.json‎

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -3,17 +3,17 @@
33
"common": {
44
"TARGET_ARCH": "aarch64a",
55
"VARIANT": "aarch64a_exn_rtti",
6-
"COMPILE_FLAGS": "-march=armv8-a",
6+
"COMPILE_FLAGS": "-march=armv8-a -mno-unaligned-access",
77
"ENABLE_EXCEPTIONS": "ON",
88
"ENABLE_RTTI": "ON",
9-
"TEST_EXECUTOR": "qemu",
10-
"QEMU_MACHINE": "virt",
11-
"QEMU_CPU": "cortex-a57",
12-
"BOOT_FLASH_ADDRESS": "0x40000000",
9+
"TEST_EXECUTOR": "fvp",
10+
"FVP_MODEL": "aem-a",
11+
"FVP_CONFIG": "v8a-aarch64",
12+
"BOOT_FLASH_ADDRESS": "0x80000000",
1313
"BOOT_FLASH_SIZE": "0x1000",
14-
"FLASH_ADDRESS": "0x40001000",
14+
"FLASH_ADDRESS": "0x80001000",
1515
"FLASH_SIZE": "0xfff000",
16-
"RAM_ADDRESS": "0x41000000",
16+
"RAM_ADDRESS": "0x81000000",
1717
"RAM_SIZE": "0x1000000",
1818
"STACK_SIZE": "8K"
1919
},
@@ -37,4 +37,4 @@
3737
"ENABLE_LIBCXX_TESTS": "OFF"
3838
}
3939
}
40-
}
40+
}

‎arm-software/embedded/arm-multilib/json/variants/aarch64a_strictalign_exn_rtti.json‎ renamed to ‎arm-software/embedded/arm-multilib/json/variants/aarch64a_exn_rtti_unaligned.json‎

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -2,18 +2,18 @@
22
"args": {
33
"common": {
44
"TARGET_ARCH": "aarch64a",
5-
"VARIANT": "aarch64a_strictalign_exn_rtti",
6-
"COMPILE_FLAGS": "-march=armv8-a -mno-unaligned-access",
5+
"VARIANT": "aarch64a_exn_rtti_unaligned",
6+
"COMPILE_FLAGS": "-march=armv8-a",
77
"ENABLE_EXCEPTIONS": "ON",
88
"ENABLE_RTTI": "ON",
9-
"TEST_EXECUTOR": "fvp",
10-
"FVP_MODEL": "aem-a",
11-
"FVP_CONFIG": "v8a-aarch64",
12-
"BOOT_FLASH_ADDRESS": "0x80000000",
9+
"TEST_EXECUTOR": "qemu",
10+
"QEMU_MACHINE": "virt",
11+
"QEMU_CPU": "cortex-a57",
12+
"BOOT_FLASH_ADDRESS": "0x40000000",
1313
"BOOT_FLASH_SIZE": "0x1000",
14-
"FLASH_ADDRESS": "0x80001000",
14+
"FLASH_ADDRESS": "0x40001000",
1515
"FLASH_SIZE": "0xfff000",
16-
"RAM_ADDRESS": "0x81000000",
16+
"RAM_ADDRESS": "0x41000000",
1717
"RAM_SIZE": "0x1000000",
1818
"STACK_SIZE": "8K"
1919
},

‎arm-software/embedded/arm-multilib/json/variants/aarch64a_strictalign.json‎ renamed to ‎arm-software/embedded/arm-multilib/json/variants/aarch64a_unaligned.json‎

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -2,18 +2,18 @@
22
"args": {
33
"common": {
44
"TARGET_ARCH": "aarch64a",
5-
"VARIANT": "aarch64a_strictalign",
6-
"COMPILE_FLAGS": "-march=armv8-a -mno-unaligned-access",
5+
"VARIANT": "aarch64a_unaligned",
6+
"COMPILE_FLAGS": "-march=armv8-a",
77
"ENABLE_EXCEPTIONS": "OFF",
88
"ENABLE_RTTI": "OFF",
9-
"TEST_EXECUTOR": "fvp",
10-
"FVP_MODEL": "aem-a",
11-
"FVP_CONFIG": "v8a-aarch64",
12-
"BOOT_FLASH_ADDRESS": "0x80000000",
9+
"TEST_EXECUTOR": "qemu",
10+
"QEMU_MACHINE": "virt",
11+
"QEMU_CPU": "cortex-a57",
12+
"BOOT_FLASH_ADDRESS": "0x40000000",
1313
"BOOT_FLASH_SIZE": "0x1000",
14-
"FLASH_ADDRESS": "0x80001000",
14+
"FLASH_ADDRESS": "0x40001000",
1515
"FLASH_SIZE": "0xfff000",
16-
"RAM_ADDRESS": "0x81000000",
16+
"RAM_ADDRESS": "0x41000000",
1717
"RAM_SIZE": "0x1000000",
1818
"STACK_SIZE": "8K"
1919
},

‎arm-software/embedded/test/multilib/aarch64.test‎

Lines changed: 39 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -1,21 +1,46 @@
1-
# RUN: %clang -print-multi-directory --target=aarch64-none-elf | FileCheck %s --check-prefix=AARCH64-EXNRTTI
2-
# RUN: %clang -print-multi-directory --target=aarch64-none-elf -march=armv8-a | FileCheck %s --check-prefix=AARCH64-EXNRTTI
3-
# RUN: %clang -print-multi-directory --target=aarch64-none-elf -march=armv8-a+fp16 | FileCheck %s --check-prefix=AARCH64-EXNRTTI
4-
# RUN: %clang -print-multi-directory --target=aarch64-none-elf -march=armv8.1-a | FileCheck %s --check-prefix=AARCH64-EXNRTTI
5-
# RUN: %clang -print-multi-directory --target=aarch64-none-elf -march=armv8.5-a+nodotprod | FileCheck %s --check-prefix=AARCH64-EXNRTTI
6-
# RUN: %clang -print-multi-directory --target=aarch64-none-elf -march=armv8.9-a | FileCheck %s --check-prefix=AARCH64-EXNRTTI
7-
# RUN: %clang -print-multi-directory --target=aarch64-none-elf -march=armv9.5-a | FileCheck %s --check-prefix=AARCH64-EXNRTTI
8-
# RUN: %clang -print-multi-directory --target=aarch64-none-elf -march=armv9.5-a+sve2+sme2 | FileCheck %s --check-prefix=AARCH64-EXNRTTI
9-
# RUN: %clang -print-multi-directory --target=aarch64-none-elf -mcpu=cortex-a57 | FileCheck %s --check-prefix=AARCH64-EXNRTTI
10-
# RUN: %clang -print-multi-directory --target=aarch64-none-elf -mcpu=cortex-a57+fp16 | FileCheck %s --check-prefix=AARCH64-EXNRTTI
1+
# RUN: %clang -print-multi-directory --target=aarch64-none-elf | FileCheck %s --check-prefix=AARCH64-EXNRTTI-UNALIGNED
2+
# RUN: %clang -print-multi-directory --target=aarch64-none-elf -march=armv8-a | FileCheck %s --check-prefix=AARCH64-EXNRTTI-UNALIGNED
3+
# RUN: %clang -print-multi-directory --target=aarch64-none-elf -march=armv8-a+fp16 | FileCheck %s --check-prefix=AARCH64-EXNRTTI-UNALIGNED
4+
# RUN: %clang -print-multi-directory --target=aarch64-none-elf -march=armv8.1-a | FileCheck %s --check-prefix=AARCH64-EXNRTTI-UNALIGNED
5+
# RUN: %clang -print-multi-directory --target=aarch64-none-elf -march=armv8.5-a+nodotprod | FileCheck %s --check-prefix=AARCH64-EXNRTTI-UNALIGNED
6+
# RUN: %clang -print-multi-directory --target=aarch64-none-elf -march=armv8.9-a | FileCheck %s --check-prefix=AARCH64-EXNRTTI-UNALIGNED
7+
# RUN: %clang -print-multi-directory --target=aarch64-none-elf -march=armv9.5-a | FileCheck %s --check-prefix=AARCH64-EXNRTTI-UNALIGNED
8+
# RUN: %clang -print-multi-directory --target=aarch64-none-elf -march=armv9.5-a+sve2+sme2 | FileCheck %s --check-prefix=AARCH64-EXNRTTI-UNALIGNED
9+
# RUN: %clang -print-multi-directory --target=aarch64-none-elf -mcpu=cortex-a57 | FileCheck %s --check-prefix=AARCH64-EXNRTTI-UNALIGNED
10+
# RUN: %clang -print-multi-directory --target=aarch64-none-elf -mcpu=cortex-a57+fp16 | FileCheck %s --check-prefix=AARCH64-EXNRTTI-UNALIGNED
11+
12+
# AARCH64-EXNRTTI-UNALIGNED: aarch64-none-elf/aarch64a_exn_rtti_unaligned{{$}}
13+
# AARCH64-EXNRTTI-UNALIGNED-EMPTY:
14+
15+
# RUN: %clang -print-multi-directory --target=aarch64-none-elf -fno-exceptions -fno-rtti | FileCheck %s --check-prefix=AARCH64-UNALIGNED
16+
# RUN: %clang -print-multi-directory --target=aarch64-none-elf -march=armv8.5-a+nodotprod -fno-exceptions -fno-rtti | FileCheck %s --check-prefix=AARCH64-UNALIGNED
17+
# RUN: %clang -print-multi-directory --target=aarch64-none-elf -march=armv9.5-a+sve2+sme2 -fno-exceptions -fno-rtti | FileCheck %s --check-prefix=AARCH64-UNALIGNED
18+
# RUN: %clang -print-multi-directory --target=aarch64-none-elf -mcpu=cortex-a57+fp16 -fno-exceptions -fno-rtti | FileCheck %s --check-prefix=AARCH64-UNALIGNED
19+
20+
# AARCH64-UNALIGNED: aarch64-none-elf/aarch64a_unaligned{{$}}
21+
# AARCH64-UNALIGNED-EMPTY:
22+
23+
24+
# Strictalign
25+
26+
# RUN: %clang -print-multi-directory --target=aarch64-none-elf -mno-unaligned-access | FileCheck %s --check-prefix=AARCH64-EXNRTTI
27+
# RUN: %clang -print-multi-directory --target=aarch64-none-elf -march=armv8-a -mno-unaligned-access | FileCheck %s --check-prefix=AARCH64-EXNRTTI
28+
# RUN: %clang -print-multi-directory --target=aarch64-none-elf -march=armv8-a+fp16 -mno-unaligned-access | FileCheck %s --check-prefix=AARCH64-EXNRTTI
29+
# RUN: %clang -print-multi-directory --target=aarch64-none-elf -march=armv8.1-a -mno-unaligned-access | FileCheck %s --check-prefix=AARCH64-EXNRTTI
30+
# RUN: %clang -print-multi-directory --target=aarch64-none-elf -march=armv8.5-a+nodotprod -mno-unaligned-access | FileCheck %s --check-prefix=AARCH64-EXNRTTI
31+
# RUN: %clang -print-multi-directory --target=aarch64-none-elf -march=armv8.9-a -mno-unaligned-access | FileCheck %s --check-prefix=AARCH64-EXNRTTI
32+
# RUN: %clang -print-multi-directory --target=aarch64-none-elf -march=armv9.5-a -mno-unaligned-access | FileCheck %s --check-prefix=AARCH64-EXNRTTI
33+
# RUN: %clang -print-multi-directory --target=aarch64-none-elf -march=armv9.5-a+sve2+sme2 -mno-unaligned-access | FileCheck %s --check-prefix=AARCH64-EXNRTTI
34+
# RUN: %clang -print-multi-directory --target=aarch64-none-elf -mcpu=cortex-a57 -mno-unaligned-access | FileCheck %s --check-prefix=AARCH64-EXNRTTI
35+
# RUN: %clang -print-multi-directory --target=aarch64-none-elf -mcpu=cortex-a57+fp16 -mno-unaligned-access | FileCheck %s --check-prefix=AARCH64-EXNRTTI
1136

1237
# AARCH64-EXNRTTI: aarch64-none-elf/aarch64a_exn_rtti{{$}}
1338
# AARCH64-EXNRTTI-EMPTY:
1439

15-
# RUN: %clang -print-multi-directory --target=aarch64-none-elf -fno-exceptions -fno-rtti | FileCheck %s --check-prefix=AARCH64
16-
# RUN: %clang -print-multi-directory --target=aarch64-none-elf -march=armv8.5-a+nodotprod -fno-exceptions -fno-rtti | FileCheck %s --check-prefix=AARCH64
17-
# RUN: %clang -print-multi-directory --target=aarch64-none-elf -march=armv9.5-a+sve2+sme2 -fno-exceptions -fno-rtti | FileCheck %s --check-prefix=AARCH64
18-
# RUN: %clang -print-multi-directory --target=aarch64-none-elf -mcpu=cortex-a57+fp16 -fno-exceptions -fno-rtti | FileCheck %s --check-prefix=AARCH64
40+
# RUN: %clang -print-multi-directory --target=aarch64-none-elf -fno-exceptions -fno-rtti -mno-unaligned-access | FileCheck %s --check-prefix=AARCH64
41+
# RUN: %clang -print-multi-directory --target=aarch64-none-elf -march=armv8.5-a+nodotprod -fno-exceptions -fno-rtti -mno-unaligned-access | FileCheck %s --check-prefix=AARCH64
42+
# RUN: %clang -print-multi-directory --target=aarch64-none-elf -march=armv9.5-a+sve2+sme2 -fno-exceptions -fno-rtti -mno-unaligned-access | FileCheck %s --check-prefix=AARCH64
43+
# RUN: %clang -print-multi-directory --target=aarch64-none-elf -mcpu=cortex-a57+fp16 -fno-exceptions -fno-rtti -mno-unaligned-access | FileCheck %s --check-prefix=AARCH64
1944

2045
# AARCH64: aarch64-none-elf/aarch64a{{$}}
2146
# AARCH64-EMPTY:

0 commit comments

Comments
 (0)