Skip to content

Commit 24975b0

Browse files
japaricjonathanpallant
authored andcommitted
fix tidy errors
- line wrapping - extend the mapping of target_arch to llvm_component in tidy itself so it can handle target tuples that start with an aarch64v8r component - fix needs-llvm-component directive in `aarch64v8r` UI assembly test - extend `tests/assembly-llvm/targets/targets-elf.rs` as per target policy check
1 parent 56ba5af commit 24975b0

3 files changed

Lines changed: 17 additions & 6 deletions

File tree

src/tools/tidy/src/target_specific_tests.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -98,7 +98,7 @@ fn arch_to_llvm_component(arch: &str) -> String {
9898
// enough for the purpose of this tidy check.
9999
match arch {
100100
"amdgcn" => "amdgpu".into(),
101-
"aarch64_be" | "arm64_32" | "arm64e" | "arm64ec" => "aarch64".into(),
101+
"aarch64v8r" | "aarch64_be" | "arm64_32" | "arm64e" | "arm64ec" => "aarch64".into(),
102102
"i386" | "i586" | "i686" | "x86" | "x86_64" | "x86_64h" => "x86".into(),
103103
"loongarch32" | "loongarch64" => "loongarch".into(),
104104
"nvptx64" => "nvptx".into(),

tests/assembly-llvm/targets/targets-elf.rs

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -67,6 +67,12 @@
6767
//@ revisions: aarch64_unknown_none_softfloat
6868
//@ [aarch64_unknown_none_softfloat] compile-flags: --target aarch64-unknown-none-softfloat
6969
//@ [aarch64_unknown_none_softfloat] needs-llvm-components: aarch64
70+
//@ revisions: aarch64v8r_unknown_none
71+
//@ [aarch64_unknown_none] compile-flags: --target aarch64v8r-unknown-none
72+
//@ [aarch64_unknown_none] needs-llvm-components: aarch64
73+
//@ revisions: aarch64v8r_unknown_none_softfloat
74+
//@ [aarch64_unknown_none_softfloat] compile-flags: --target aarch64v8r-unknown-none-softfloat
75+
//@ [aarch64_unknown_none_softfloat] needs-llvm-components: aarch64
7076
//@ revisions: aarch64_unknown_nto_qnx700
7177
//@ [aarch64_unknown_nto_qnx700] compile-flags: --target aarch64-unknown-nto-qnx700
7278
//@ [aarch64_unknown_nto_qnx700] needs-llvm-components: aarch64

tests/ui/asm/aarch64v8r.rs

Lines changed: 10 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -3,8 +3,9 @@
33
//@ add-minicore
44
//@ revisions: hf sf
55
//@ [hf] compile-flags: --target aarch64v8r-unknown-none
6+
//@ [hf] needs-llvm-components: aarch64
67
//@ [sf] compile-flags: --target aarch64v8r-unknown-none-softfloat
7-
//@ needs-llvm-components: arm
8+
//@ [sf] needs-llvm-components: aarch64
89
//@ build-pass
910
//@ ignore-backends: gcc
1011

@@ -19,13 +20,17 @@ use minicore::*;
1920

2021
/* # Mandatory extensions
2122
*
22-
* A comment indicates that the extension has no associated assembly instruction and cannot be codegen tested
23+
* A comment indicates that the extension has no associated assembly instruction and cannot be
24+
* codegen tested
2325
*
2426
* ## References:
2527
*
26-
* - Arm Architecture Reference Manual for R-profile AArch64 architecture (DDI 0628) -- has the list of mandatory extensions
27-
* - Arm Architecture Reference Manual for A-profile architecture (ARM DDI 0487) -- has the mapping from features to instructions
28-
* - Feature names in A-profile architecture (109697_0100_02_en Version 1.0) -- overview of what each extension mean
28+
* - Arm Architecture Reference Manual for R-profile AArch64 architecture (DDI 0628) -- has the
29+
* list of mandatory extensions
30+
* - Arm Architecture Reference Manual for A-profile architecture (ARM DDI 0487) -- has the
31+
* mapping from features to instructions
32+
* - Feature names in A-profile architecture (109697_0100_02_en Version 1.0) -- overview of
33+
* what each extension mean
2934
* */
3035
pub fn mandatory_extensions() {
3136
/* ## ARMv8.0 */

0 commit comments

Comments
 (0)