From 6749b843ccc90e18904520db3fa439a9f8ddc452 Mon Sep 17 00:00:00 2001 From: Michael Buch Date: Thu, 20 Nov 2025 15:47:39 +0000 Subject: [PATCH 1/3] [llvm][dsymutil][test] Create dedicated AArch64 directory Currently the tests for LLVM targets `AArch64` and `ARM` were in the same directory. But if you only configured LLVM for one target (e.g., just `AArch64`, which is how I ran into this), then all tests under the ARM directory are marked `UNSUPPORTED`. This patch moves all the tests that are capable of running on `AArch64`-only targets into a dedicated `AArch64` directory. The tests that expected a plain `ARM` target were kept in the `ARM` directory. Drive-by: * Rename the `dummy-debug-map-amr64.map` to `dummy-debug-map-arm64.map` (note the typo in `amr64`) --- .../accel-imported-declarations.test | 0 .../dsymutil/{ARM => AArch64}/call-pc-reloc.test | 0 .../debug-names-accel-table-types.ll | 0 .../dsymutil/{ARM => AArch64}/discriminator.test | 0 .../{ARM => AArch64}/discriminator_repeated.test | 0 .../dummy-debug-map-arm64.map} | 0 .../dsymutil/{ARM => AArch64}/dwarf5-addr-base.test | 12 ++++++------ .../{ARM => AArch64}/dwarf5-addrx-0x0-last.test | 0 .../dwarf5-dwarf4-combination-macho.test | 6 +++--- .../dsymutil/{ARM => AArch64}/dwarf5-macho.test | 6 +++--- .../dwarf5-str-offsets-base-strx.test | 12 ++++++------ .../dsymutil/{ARM => AArch64}/extern-alias.test | 0 .../dsymutil/{ARM => AArch64}/fat-arch-name.test | 0 .../dsymutil/{ARM => AArch64}/fat-threading.test | 0 .../tools/dsymutil/{ARM => AArch64}/firmware.test | 0 .../dsymutil/{ARM => AArch64}/inline-source.test | 0 .../tools/dsymutil/{ARM => AArch64}/inlined-low_pc.c | 4 ++-- llvm/test/tools/dsymutil/AArch64/lit.local.cfg | 10 ++++++++++ .../{ARM => AArch64}/missing-object-warning.test | 0 .../{ARM => AArch64}/missing-symbol-warning.test | 0 .../tools/dsymutil/{ARM => AArch64}/preload.test | 0 .../remarks-linking-bundle-empty.test | 0 .../{ARM => AArch64}/remarks-linking-bundle.test | 0 .../{ARM => AArch64}/static-archive-collision.test | 0 .../dsymutil/{ARM => AArch64}/stmt-seq-macho.test | 0 llvm/test/tools/dsymutil/AArch64/suppressions.txt | 2 ++ .../swiftmodule-include-from-interface.test | 0 .../tools/dsymutil/{ARM => AArch64}/swiftmodule.test | 0 .../{ARM => AArch64}/typedefs-with-same-name.test | 0 llvm/test/tools/dsymutil/ARM/lit.local.cfg | 2 -- 30 files changed, 32 insertions(+), 22 deletions(-) rename llvm/test/tools/dsymutil/{ARM => AArch64}/accel-imported-declarations.test (100%) rename llvm/test/tools/dsymutil/{ARM => AArch64}/call-pc-reloc.test (100%) rename llvm/test/tools/dsymutil/{ARM => AArch64}/debug-names-accel-table-types.ll (100%) rename llvm/test/tools/dsymutil/{ARM => AArch64}/discriminator.test (100%) rename llvm/test/tools/dsymutil/{ARM => AArch64}/discriminator_repeated.test (100%) rename llvm/test/tools/dsymutil/{ARM/dummy-debug-map-amr64.map => AArch64/dummy-debug-map-arm64.map} (100%) rename llvm/test/tools/dsymutil/{ARM => AArch64}/dwarf5-addr-base.test (96%) rename llvm/test/tools/dsymutil/{ARM => AArch64}/dwarf5-addrx-0x0-last.test (100%) rename llvm/test/tools/dsymutil/{ARM => AArch64}/dwarf5-dwarf4-combination-macho.test (98%) rename llvm/test/tools/dsymutil/{ARM => AArch64}/dwarf5-macho.test (97%) rename llvm/test/tools/dsymutil/{ARM => AArch64}/dwarf5-str-offsets-base-strx.test (98%) rename llvm/test/tools/dsymutil/{ARM => AArch64}/extern-alias.test (100%) rename llvm/test/tools/dsymutil/{ARM => AArch64}/fat-arch-name.test (100%) rename llvm/test/tools/dsymutil/{ARM => AArch64}/fat-threading.test (100%) rename llvm/test/tools/dsymutil/{ARM => AArch64}/firmware.test (100%) rename llvm/test/tools/dsymutil/{ARM => AArch64}/inline-source.test (100%) rename llvm/test/tools/dsymutil/{ARM => AArch64}/inlined-low_pc.c (82%) create mode 100644 llvm/test/tools/dsymutil/AArch64/lit.local.cfg rename llvm/test/tools/dsymutil/{ARM => AArch64}/missing-object-warning.test (100%) rename llvm/test/tools/dsymutil/{ARM => AArch64}/missing-symbol-warning.test (100%) rename llvm/test/tools/dsymutil/{ARM => AArch64}/preload.test (100%) rename llvm/test/tools/dsymutil/{ARM => AArch64}/remarks-linking-bundle-empty.test (100%) rename llvm/test/tools/dsymutil/{ARM => AArch64}/remarks-linking-bundle.test (100%) rename llvm/test/tools/dsymutil/{ARM => AArch64}/static-archive-collision.test (100%) rename llvm/test/tools/dsymutil/{ARM => AArch64}/stmt-seq-macho.test (100%) create mode 100644 llvm/test/tools/dsymutil/AArch64/suppressions.txt rename llvm/test/tools/dsymutil/{ARM => AArch64}/swiftmodule-include-from-interface.test (100%) rename llvm/test/tools/dsymutil/{ARM => AArch64}/swiftmodule.test (100%) rename llvm/test/tools/dsymutil/{ARM => AArch64}/typedefs-with-same-name.test (100%) diff --git a/llvm/test/tools/dsymutil/ARM/accel-imported-declarations.test b/llvm/test/tools/dsymutil/AArch64/accel-imported-declarations.test similarity index 100% rename from llvm/test/tools/dsymutil/ARM/accel-imported-declarations.test rename to llvm/test/tools/dsymutil/AArch64/accel-imported-declarations.test diff --git a/llvm/test/tools/dsymutil/ARM/call-pc-reloc.test b/llvm/test/tools/dsymutil/AArch64/call-pc-reloc.test similarity index 100% rename from llvm/test/tools/dsymutil/ARM/call-pc-reloc.test rename to llvm/test/tools/dsymutil/AArch64/call-pc-reloc.test diff --git a/llvm/test/tools/dsymutil/ARM/debug-names-accel-table-types.ll b/llvm/test/tools/dsymutil/AArch64/debug-names-accel-table-types.ll similarity index 100% rename from llvm/test/tools/dsymutil/ARM/debug-names-accel-table-types.ll rename to llvm/test/tools/dsymutil/AArch64/debug-names-accel-table-types.ll diff --git a/llvm/test/tools/dsymutil/ARM/discriminator.test b/llvm/test/tools/dsymutil/AArch64/discriminator.test similarity index 100% rename from llvm/test/tools/dsymutil/ARM/discriminator.test rename to llvm/test/tools/dsymutil/AArch64/discriminator.test diff --git a/llvm/test/tools/dsymutil/ARM/discriminator_repeated.test b/llvm/test/tools/dsymutil/AArch64/discriminator_repeated.test similarity index 100% rename from llvm/test/tools/dsymutil/ARM/discriminator_repeated.test rename to llvm/test/tools/dsymutil/AArch64/discriminator_repeated.test diff --git a/llvm/test/tools/dsymutil/ARM/dummy-debug-map-amr64.map b/llvm/test/tools/dsymutil/AArch64/dummy-debug-map-arm64.map similarity index 100% rename from llvm/test/tools/dsymutil/ARM/dummy-debug-map-amr64.map rename to llvm/test/tools/dsymutil/AArch64/dummy-debug-map-arm64.map diff --git a/llvm/test/tools/dsymutil/ARM/dwarf5-addr-base.test b/llvm/test/tools/dsymutil/AArch64/dwarf5-addr-base.test similarity index 96% rename from llvm/test/tools/dsymutil/ARM/dwarf5-addr-base.test rename to llvm/test/tools/dsymutil/AArch64/dwarf5-addr-base.test index dfcfa6723ab91..ebb2378f74705 100644 --- a/llvm/test/tools/dsymutil/ARM/dwarf5-addr-base.test +++ b/llvm/test/tools/dsymutil/AArch64/dwarf5-addr-base.test @@ -46,17 +46,17 @@ RUN: rm -rf %t.dir && mkdir -p %t.dir -RUN: dsymutil -y %p/dummy-debug-map-amr64.map -oso-prepend-path=%p/../Inputs/DWARF5-addr-base-str-off-base -o %t.dir/dwarf5-addr-base.dSYM +RUN: dsymutil -y %p/dummy-debug-map-arm64.map -oso-prepend-path=%p/../Inputs/DWARF5-addr-base-str-off-base -o %t.dir/dwarf5-addr-base.dSYM RUN: llvm-dwarfdump %t.dir/dwarf5-addr-base.dSYM -a --verbose | FileCheck %s RUN: rm -rf %t.dir && mkdir -p %t.dir -RUN: dsymutil --linker parallel --no-odr -y %p/dummy-debug-map-amr64.map \ +RUN: dsymutil --linker parallel --no-odr -y %p/dummy-debug-map-arm64.map \ RUN: -oso-prepend-path=%p/../Inputs/DWARF5-addr-base-str-off-base \ RUN: -o %t.dir/dwarf5-addr-base.dSYM RUN: llvm-dwarfdump %t.dir/dwarf5-addr-base.dSYM -a --verbose | FileCheck %s RUN: rm -rf %t.dir && mkdir -p %t.dir -RUN: dsymutil --linker parallel -y %p/dummy-debug-map-amr64.map \ +RUN: dsymutil --linker parallel -y %p/dummy-debug-map-arm64.map \ RUN: -oso-prepend-path=%p/../Inputs/DWARF5-addr-base-str-off-base \ RUN: -o %t.dir/dwarf5-addr-base.dSYM RUN: llvm-dwarfdump %t.dir/dwarf5-addr-base.dSYM -a --verbose | \ @@ -64,18 +64,18 @@ RUN: FileCheck %s --check-prefixes=CHECK,CHECK-LLVM RUN: rm -rf %t.dir && mkdir -p %t.dir -RUN: dsymutil --update -y %p/dummy-debug-map-amr64.map -oso-prepend-path=%p/../Inputs/DWARF5-addr-base-str-off-base -o %t.dir/dwarf5-addr-base.dSYM +RUN: dsymutil --update -y %p/dummy-debug-map-arm64.map -oso-prepend-path=%p/../Inputs/DWARF5-addr-base-str-off-base -o %t.dir/dwarf5-addr-base.dSYM RUN: llvm-dwarfdump %t.dir/dwarf5-addr-base.dSYM -a --verbose | FileCheck %s --check-prefix=UPD RUN: rm -rf %t.dir && mkdir -p %t.dir -RUN: dsymutil --linker parallel --no-odr --update -y %p/dummy-debug-map-amr64.map \ +RUN: dsymutil --linker parallel --no-odr --update -y %p/dummy-debug-map-arm64.map \ RUN: -oso-prepend-path=%p/../Inputs/DWARF5-addr-base-str-off-base \ RUN: -o %t.dir/dwarf5-addr-base.dSYM RUN: llvm-dwarfdump %t.dir/dwarf5-addr-base.dSYM -a --verbose | \ RUN: FileCheck %s --check-prefix=UPD RUN: rm -rf %t.dir && mkdir -p %t.dir -RUN: dsymutil --linker parallel --update -y %p/dummy-debug-map-amr64.map \ +RUN: dsymutil --linker parallel --update -y %p/dummy-debug-map-arm64.map \ RUN: -oso-prepend-path=%p/../Inputs/DWARF5-addr-base-str-off-base \ RUN: -o %t.dir/dwarf5-addr-base.dSYM RUN: llvm-dwarfdump %t.dir/dwarf5-addr-base.dSYM -a --verbose | \ diff --git a/llvm/test/tools/dsymutil/ARM/dwarf5-addrx-0x0-last.test b/llvm/test/tools/dsymutil/AArch64/dwarf5-addrx-0x0-last.test similarity index 100% rename from llvm/test/tools/dsymutil/ARM/dwarf5-addrx-0x0-last.test rename to llvm/test/tools/dsymutil/AArch64/dwarf5-addrx-0x0-last.test diff --git a/llvm/test/tools/dsymutil/ARM/dwarf5-dwarf4-combination-macho.test b/llvm/test/tools/dsymutil/AArch64/dwarf5-dwarf4-combination-macho.test similarity index 98% rename from llvm/test/tools/dsymutil/ARM/dwarf5-dwarf4-combination-macho.test rename to llvm/test/tools/dsymutil/AArch64/dwarf5-dwarf4-combination-macho.test index fb15f46ce0b24..8c42cd59f5ec4 100644 --- a/llvm/test/tools/dsymutil/ARM/dwarf5-dwarf4-combination-macho.test +++ b/llvm/test/tools/dsymutil/AArch64/dwarf5-dwarf4-combination-macho.test @@ -30,11 +30,11 @@ ; clang -g -c -O1 b.cpp -gdwarf-4 -o 2.o RUN: rm -rf %t.dir && mkdir -p %t.dir -RUN: dsymutil -y %p/dummy-debug-map-amr64.map -oso-prepend-path=%p/../Inputs/DWARF5-DWARF4-combination -o %t.dir/dwarf5-dwarf4-combination-macho.dSYM +RUN: dsymutil -y %p/dummy-debug-map-arm64.map -oso-prepend-path=%p/../Inputs/DWARF5-DWARF4-combination -o %t.dir/dwarf5-dwarf4-combination-macho.dSYM RUN: llvm-dwarfdump %t.dir/dwarf5-dwarf4-combination-macho.dSYM -a --verbose | FileCheck %s --check-prefixes=CHECK,WITH-PARENTS RUN: rm -rf %t.dir && mkdir -p %t.dir -RUN: dsymutil --no-odr --linker parallel -y %p/dummy-debug-map-amr64.map \ +RUN: dsymutil --no-odr --linker parallel -y %p/dummy-debug-map-arm64.map \ RUN: -oso-prepend-path=%p/../Inputs/DWARF5-DWARF4-combination \ RUN: -o %t.dir/dwarf5-dwarf4-combination-macho.dSYM RUN: llvm-dwarfdump %t.dir/dwarf5-dwarf4-combination-macho.dSYM \ @@ -43,7 +43,7 @@ RUN: -a --verbose | FileCheck %s --check-prefixes=CHECK,NO-PARENTS ### Uncomment following when llvm-dwarfdump will dump address ranges ### correctly for severall compile units case. COM: rm -rf %t.dir && mkdir -p %t.dir -COM: dsymutil --linker parallel -y %p/dummy-debug-map-amr64.map \ +COM: dsymutil --linker parallel -y %p/dummy-debug-map-arm64.map \ COM: -oso-prepend-path=%p/../Inputs/DWARF5-DWARF4-combination \ COM: -o %t.dir/dwarf5-dwarf4-combination-macho.dSYM COM: llvm-dwarfdump %t.dir/dwarf5-dwarf4-combination-macho.dSYM \ diff --git a/llvm/test/tools/dsymutil/ARM/dwarf5-macho.test b/llvm/test/tools/dsymutil/AArch64/dwarf5-macho.test similarity index 97% rename from llvm/test/tools/dsymutil/ARM/dwarf5-macho.test rename to llvm/test/tools/dsymutil/AArch64/dwarf5-macho.test index 08c8bba739281..f90f5975e02ed 100644 --- a/llvm/test/tools/dsymutil/ARM/dwarf5-macho.test +++ b/llvm/test/tools/dsymutil/AArch64/dwarf5-macho.test @@ -18,18 +18,18 @@ RUN: rm -rf %t.dir && mkdir -p %t.dir -RUN: dsymutil -y %p/dummy-debug-map-amr64.map -oso-prepend-path=%p/../Inputs/DWARF5 -o %t.dir/dwarf5-macho.dSYM +RUN: dsymutil -y %p/dummy-debug-map-arm64.map -oso-prepend-path=%p/../Inputs/DWARF5 -o %t.dir/dwarf5-macho.dSYM RUN: llvm-dwarfdump %t.dir/dwarf5-macho.dSYM -a --verbose | FileCheck %s RUN: rm -rf %t.dir && mkdir -p %t.dir -RUN: dsymutil --linker parallel --no-odr -y %p/dummy-debug-map-amr64.map \ +RUN: dsymutil --linker parallel --no-odr -y %p/dummy-debug-map-arm64.map \ RUN: -oso-prepend-path=%p/../Inputs/DWARF5 -o %t.dir/dwarf5-macho.dSYM RUN: llvm-dwarfdump %t.dir/dwarf5-macho.dSYM -a --verbose | FileCheck %s ### Uncomment following when llvm-dwarfdump will print resolved address ranges ### for the case mutiplue compile units. COM: rm -rf %t.dir && mkdir -p %t.dir -COM: dsymutil --linker parallel -y %p/dummy-debug-map-amr64.map \ +COM: dsymutil --linker parallel -y %p/dummy-debug-map-arm64.map \ COM: -oso-prepend-path=%p/../Inputs/DWARF5 -o %t.dir/dwarf5-macho.dSYM COM: llvm-dwarfdump %t.dir/dwarf5-macho.dSYM -a --verbose | FileCheck %s \ COM: --check-prefixes=CHECK,CHECK-LLVM diff --git a/llvm/test/tools/dsymutil/ARM/dwarf5-str-offsets-base-strx.test b/llvm/test/tools/dsymutil/AArch64/dwarf5-str-offsets-base-strx.test similarity index 98% rename from llvm/test/tools/dsymutil/ARM/dwarf5-str-offsets-base-strx.test rename to llvm/test/tools/dsymutil/AArch64/dwarf5-str-offsets-base-strx.test index 4e6c66670da65..c0c4fe835682f 100644 --- a/llvm/test/tools/dsymutil/ARM/dwarf5-str-offsets-base-strx.test +++ b/llvm/test/tools/dsymutil/AArch64/dwarf5-str-offsets-base-strx.test @@ -50,33 +50,33 @@ RUN: rm -rf %t.dir && mkdir -p %t.dir -RUN: dsymutil -y %p/dummy-debug-map-amr64.map -oso-prepend-path=%p/../Inputs/DWARF5-addr-base-str-off-base -o %t.dir/dwarf5-addr-base.dSYM +RUN: dsymutil -y %p/dummy-debug-map-arm64.map -oso-prepend-path=%p/../Inputs/DWARF5-addr-base-str-off-base -o %t.dir/dwarf5-addr-base.dSYM RUN: llvm-dwarfdump %t.dir/dwarf5-addr-base.dSYM -a --verbose | FileCheck %s --check-prefixes=CHECK,GLOBAL -RUN: dsymutil --update -y %p/dummy-debug-map-amr64.map -oso-prepend-path=%p/../Inputs/DWARF5-addr-base-str-off-base -o %t.dir/dwarf5-addr-base.dSYM +RUN: dsymutil --update -y %p/dummy-debug-map-arm64.map -oso-prepend-path=%p/../Inputs/DWARF5-addr-base-str-off-base -o %t.dir/dwarf5-addr-base.dSYM RUN: llvm-dwarfdump %t.dir/dwarf5-addr-base.dSYM -a --verbose | FileCheck %s --check-prefixes=UPD,GLOBALUPD RUN: rm -rf %t.dir && mkdir -p %t.dir -RUN: dsymutil --linker parallel --no-odr -y %p/dummy-debug-map-amr64.map \ +RUN: dsymutil --linker parallel --no-odr -y %p/dummy-debug-map-arm64.map \ RUN: -oso-prepend-path=%p/../Inputs/DWARF5-addr-base-str-off-base \ RUN: -o %t.dir/dwarf5-addr-base.dSYM RUN: llvm-dwarfdump %t.dir/dwarf5-addr-base.dSYM -a --verbose | \ RUN: FileCheck %s --check-prefixes=CHECK,LOCAL RUN: rm -rf %t.dir && mkdir -p %t.dir -RUN: dsymutil --linker parallel -y %p/dummy-debug-map-amr64.map \ +RUN: dsymutil --linker parallel -y %p/dummy-debug-map-arm64.map \ RUN: -oso-prepend-path=%p/../Inputs/DWARF5-addr-base-str-off-base \ RUN: -o %t.dir/dwarf5-addr-base.dSYM RUN: llvm-dwarfdump %t.dir/dwarf5-addr-base.dSYM -a --verbose | \ RUN: FileCheck %s --check-prefixes=CHECK,LOCAL,CHECK-LLVM -RUN: dsymutil --linker parallel --no-odr --update -y %p/dummy-debug-map-amr64.map \ +RUN: dsymutil --linker parallel --no-odr --update -y %p/dummy-debug-map-arm64.map \ RUN: -oso-prepend-path=%p/../Inputs/DWARF5-addr-base-str-off-base \ RUN: -o %t.dir/dwarf5-addr-base.dSYM RUN: llvm-dwarfdump %t.dir/dwarf5-addr-base.dSYM -a --verbose | \ RUN: FileCheck %s --check-prefixes=UPD,LOCALUPD -RUN: dsymutil --linker parallel --update -y %p/dummy-debug-map-amr64.map \ +RUN: dsymutil --linker parallel --update -y %p/dummy-debug-map-arm64.map \ RUN: -oso-prepend-path=%p/../Inputs/DWARF5-addr-base-str-off-base \ RUN: -o %t.dir/dwarf5-addr-base.dSYM RUN: llvm-dwarfdump %t.dir/dwarf5-addr-base.dSYM -a --verbose | \ diff --git a/llvm/test/tools/dsymutil/ARM/extern-alias.test b/llvm/test/tools/dsymutil/AArch64/extern-alias.test similarity index 100% rename from llvm/test/tools/dsymutil/ARM/extern-alias.test rename to llvm/test/tools/dsymutil/AArch64/extern-alias.test diff --git a/llvm/test/tools/dsymutil/ARM/fat-arch-name.test b/llvm/test/tools/dsymutil/AArch64/fat-arch-name.test similarity index 100% rename from llvm/test/tools/dsymutil/ARM/fat-arch-name.test rename to llvm/test/tools/dsymutil/AArch64/fat-arch-name.test diff --git a/llvm/test/tools/dsymutil/ARM/fat-threading.test b/llvm/test/tools/dsymutil/AArch64/fat-threading.test similarity index 100% rename from llvm/test/tools/dsymutil/ARM/fat-threading.test rename to llvm/test/tools/dsymutil/AArch64/fat-threading.test diff --git a/llvm/test/tools/dsymutil/ARM/firmware.test b/llvm/test/tools/dsymutil/AArch64/firmware.test similarity index 100% rename from llvm/test/tools/dsymutil/ARM/firmware.test rename to llvm/test/tools/dsymutil/AArch64/firmware.test diff --git a/llvm/test/tools/dsymutil/ARM/inline-source.test b/llvm/test/tools/dsymutil/AArch64/inline-source.test similarity index 100% rename from llvm/test/tools/dsymutil/ARM/inline-source.test rename to llvm/test/tools/dsymutil/AArch64/inline-source.test diff --git a/llvm/test/tools/dsymutil/ARM/inlined-low_pc.c b/llvm/test/tools/dsymutil/AArch64/inlined-low_pc.c similarity index 82% rename from llvm/test/tools/dsymutil/ARM/inlined-low_pc.c rename to llvm/test/tools/dsymutil/AArch64/inlined-low_pc.c index ad48b599b7b6e..d2d36f675e8b7 100644 --- a/llvm/test/tools/dsymutil/ARM/inlined-low_pc.c +++ b/llvm/test/tools/dsymutil/AArch64/inlined-low_pc.c @@ -3,9 +3,9 @@ static int foo(int i) { return 42 + i; } int bar(int a) { return foo(a); } -// RUN: dsymutil -f -y %p/dummy-debug-map-amr64.map -oso-prepend-path %p/../Inputs/inlined-low_pc -o - | llvm-dwarfdump - | FileCheck %s +// RUN: dsymutil -f -y %p/dummy-debug-map-arm64.map -oso-prepend-path %p/../Inputs/inlined-low_pc -o - | llvm-dwarfdump - | FileCheck %s -// RUN: dsymutil --linker parallel -f -y %p/dummy-debug-map-amr64.map \ +// RUN: dsymutil --linker parallel -f -y %p/dummy-debug-map-arm64.map \ // RUN: -oso-prepend-path %p/../Inputs/inlined-low_pc -o - | \ // RUN: llvm-dwarfdump - | FileCheck %s diff --git a/llvm/test/tools/dsymutil/AArch64/lit.local.cfg b/llvm/test/tools/dsymutil/AArch64/lit.local.cfg new file mode 100644 index 0000000000000..923d126d8707b --- /dev/null +++ b/llvm/test/tools/dsymutil/AArch64/lit.local.cfg @@ -0,0 +1,10 @@ +if not "AArch64" in config.root.targets: + config.unsupported = True + +if config.llvm_use_sanitizer: + suppr = os.path.join( + os.path.dirname(os.path.realpath(__file__)), "suppressions.txt" + ) + config.environment["LSAN_OPTIONS"] = "suppressions={}".format(suppr) + +config.suffixes = [".test", ".cpp", ".c"] diff --git a/llvm/test/tools/dsymutil/ARM/missing-object-warning.test b/llvm/test/tools/dsymutil/AArch64/missing-object-warning.test similarity index 100% rename from llvm/test/tools/dsymutil/ARM/missing-object-warning.test rename to llvm/test/tools/dsymutil/AArch64/missing-object-warning.test diff --git a/llvm/test/tools/dsymutil/ARM/missing-symbol-warning.test b/llvm/test/tools/dsymutil/AArch64/missing-symbol-warning.test similarity index 100% rename from llvm/test/tools/dsymutil/ARM/missing-symbol-warning.test rename to llvm/test/tools/dsymutil/AArch64/missing-symbol-warning.test diff --git a/llvm/test/tools/dsymutil/ARM/preload.test b/llvm/test/tools/dsymutil/AArch64/preload.test similarity index 100% rename from llvm/test/tools/dsymutil/ARM/preload.test rename to llvm/test/tools/dsymutil/AArch64/preload.test diff --git a/llvm/test/tools/dsymutil/ARM/remarks-linking-bundle-empty.test b/llvm/test/tools/dsymutil/AArch64/remarks-linking-bundle-empty.test similarity index 100% rename from llvm/test/tools/dsymutil/ARM/remarks-linking-bundle-empty.test rename to llvm/test/tools/dsymutil/AArch64/remarks-linking-bundle-empty.test diff --git a/llvm/test/tools/dsymutil/ARM/remarks-linking-bundle.test b/llvm/test/tools/dsymutil/AArch64/remarks-linking-bundle.test similarity index 100% rename from llvm/test/tools/dsymutil/ARM/remarks-linking-bundle.test rename to llvm/test/tools/dsymutil/AArch64/remarks-linking-bundle.test diff --git a/llvm/test/tools/dsymutil/ARM/static-archive-collision.test b/llvm/test/tools/dsymutil/AArch64/static-archive-collision.test similarity index 100% rename from llvm/test/tools/dsymutil/ARM/static-archive-collision.test rename to llvm/test/tools/dsymutil/AArch64/static-archive-collision.test diff --git a/llvm/test/tools/dsymutil/ARM/stmt-seq-macho.test b/llvm/test/tools/dsymutil/AArch64/stmt-seq-macho.test similarity index 100% rename from llvm/test/tools/dsymutil/ARM/stmt-seq-macho.test rename to llvm/test/tools/dsymutil/AArch64/stmt-seq-macho.test diff --git a/llvm/test/tools/dsymutil/AArch64/suppressions.txt b/llvm/test/tools/dsymutil/AArch64/suppressions.txt new file mode 100644 index 0000000000000..0a43d4493a933 --- /dev/null +++ b/llvm/test/tools/dsymutil/AArch64/suppressions.txt @@ -0,0 +1,2 @@ +# Ignore leaks in CoreFoundation. +leak:CF diff --git a/llvm/test/tools/dsymutil/ARM/swiftmodule-include-from-interface.test b/llvm/test/tools/dsymutil/AArch64/swiftmodule-include-from-interface.test similarity index 100% rename from llvm/test/tools/dsymutil/ARM/swiftmodule-include-from-interface.test rename to llvm/test/tools/dsymutil/AArch64/swiftmodule-include-from-interface.test diff --git a/llvm/test/tools/dsymutil/ARM/swiftmodule.test b/llvm/test/tools/dsymutil/AArch64/swiftmodule.test similarity index 100% rename from llvm/test/tools/dsymutil/ARM/swiftmodule.test rename to llvm/test/tools/dsymutil/AArch64/swiftmodule.test diff --git a/llvm/test/tools/dsymutil/ARM/typedefs-with-same-name.test b/llvm/test/tools/dsymutil/AArch64/typedefs-with-same-name.test similarity index 100% rename from llvm/test/tools/dsymutil/ARM/typedefs-with-same-name.test rename to llvm/test/tools/dsymutil/AArch64/typedefs-with-same-name.test diff --git a/llvm/test/tools/dsymutil/ARM/lit.local.cfg b/llvm/test/tools/dsymutil/ARM/lit.local.cfg index d951f4ff14d4e..6c4647ca90ab7 100644 --- a/llvm/test/tools/dsymutil/ARM/lit.local.cfg +++ b/llvm/test/tools/dsymutil/ARM/lit.local.cfg @@ -1,7 +1,5 @@ if not "ARM" in config.root.targets: config.unsupported = True -if not "AArch64" in config.root.targets: - config.unsupported = True if config.llvm_use_sanitizer: suppr = os.path.join( From 48d7b5a3f6e7779dfdd78898665ee90945205ccf Mon Sep 17 00:00:00 2001 From: Michael Buch Date: Thu, 20 Nov 2025 16:37:48 +0000 Subject: [PATCH 2/3] fixup! move parallel linker test directory --- .../accel-imported-declarations.test | 80 ------------------- 1 file changed, 80 deletions(-) delete mode 100644 llvm/test/tools/dsymutil/ARM/DWARFLinkerParallel/accel-imported-declarations.test diff --git a/llvm/test/tools/dsymutil/ARM/DWARFLinkerParallel/accel-imported-declarations.test b/llvm/test/tools/dsymutil/ARM/DWARFLinkerParallel/accel-imported-declarations.test deleted file mode 100644 index 29c0d4558e30d..0000000000000 --- a/llvm/test/tools/dsymutil/ARM/DWARFLinkerParallel/accel-imported-declarations.test +++ /dev/null @@ -1,80 +0,0 @@ -RUN: dsymutil --linker parallel -accelerator=Dwarf \ -RUN: -oso-prepend-path=%p/../../Inputs \ -RUN: %p/../../Inputs/accel-imported-declaration.macho-arm64 -o %t.dwarf.dSYM -RUN: dsymutil --linker parallel -accelerator=Apple \ -RUN: -oso-prepend-path=%p/../../Inputs \ -RUN: %p/../../Inputs/accel-imported-declaration.macho-arm64 -o %t.apple.dSYM - -RUN: llvm-dwarfdump -v %t.dwarf.dSYM | FileCheck %s -check-prefixes=DWARF,COMMON -RUN: llvm-dwarfdump -v %t.apple.dSYM | FileCheck %s -check-prefixes=APPLE,COMMON - -COMMON: .debug_info contents -COMMON: DW_TAG_compile_unit -COMMON: DW_AT_name{{.*}}"__artificial_type_unit" -COMMON: DW_TAG_base_type -COMMON: DW_AT_name{{.*}}"int" -COMMON: DW_TAG_namespace -COMMON: DW_AT_name{{.*}}"A" -COMMON: DW_TAG_namespace -COMMON: DW_AT_name{{.*}}"B" -COMMON: 0x[[NAMESPACE_C_1:[0-9a-f]*]]: DW_TAG_namespace -COMMON: DW_AT_name{{.*}}"C" -COMMON-NOT: DW_TAG_variable -COMMON: 0x[[NAMESPACE_C_2:[0-9a-f]*]]: DW_TAG_imported_declaration -COMMON: DW_AT_import{{.*}}[[NAMESPACE_C_1]] -COMMON: DW_AT_name{{.*}}"C" -COMMON: DW_TAG_imported_module -COMMON: DW_AT_import{{.*}}[[NAMESPACE_C_1]] - - -COMMON: DW_TAG_compile_unit -COMMON: {{.*}}DW_TAG_namespace -COMMON: DW_AT_name{{.*}}"A" -COMMON: {{.*}}DW_TAG_namespace -COMMON: DW_AT_name{{.*}}"B" -COMMON: 0x[[NAMESPACE_C_3:[0-9a-f]*]]: DW_TAG_namespace -COMMON: DW_AT_name{{.*}}"C" -COMMON: 0x[[VAR_A:[0-9a-f]*]]: DW_TAG_variable -COMMON: DW_TAG_imported_declaration -COMMON: DW_AT_import{{.*}}[[VAR_A]] - -DWARF: .debug_names contents: -DWARF: Bucket 0 [ -DWARF-NEXT: Name {{.*}} { -DWARF-NEXT: Hash: {{.*}} -DWARF-NEXT: String: {{.*}} "C" -DWARF-NEXT: Entry {{.*}} { -DWARF-NEXT: Abbrev: {{.*}} -DWARF-NEXT: Tag: DW_TAG_namespace -DWARF: DW_IDX_die_offset: 0x0000002f -DWARF-NEXT: } -DWARF-NEXT: Entry {{.*}} { -DWARF-NEXT: Abbrev: {{.*}} -DWARF: Tag: DW_TAG_imported_declaration -DWARF: DW_IDX_die_offset: 0x00000035 -DWARF-NEXT: } -DWARF-NEXT: Entry {{.*}} { -DWARF-NEXT: Abbrev: {{.*}} -DWARF-NEXT: Tag: DW_TAG_namespace -DWARF: DW_IDX_die_offset: 0x0000003c -DWARF-NEXT: } - -DWARF-NEXT: } - -APPLE: .apple_namespaces contents: -APPLE: Bucket 1 [ -APPLE-NEXT: Hash {{.*}} [ -APPLE-NEXT: Name@{{.*}} { -APPLE-NEXT: String: {{.*}} "C" -APPLE-NEXT: Data 0 [ -APPLE-NEXT: Atom[0]: 0x[[NAMESPACE_C_1]] -APPLE-NEXT: ] -APPLE-NEXT: Data 1 [ -APPLE-NEXT: Atom[0]: 0x[[NAMESPACE_C_2]] -APPLE-NEXT: ] -APPLE-NEXT: Data 2 [ -APPLE-NEXT: Atom[0]: 0x[[NAMESPACE_C_3]] -APPLE-NEXT: ] -APPLE: } -APPLE-NEXT: ] -APPLE-NEXT: ] From 6f99424cee5f594466dcdb409e50a2560bd52c82 Mon Sep 17 00:00:00 2001 From: Michael Buch Date: Thu, 20 Nov 2025 16:39:28 +0000 Subject: [PATCH 3/3] fixup! add test properly --- .../accel-imported-declarations.test | 80 +++++++++++++++++++ 1 file changed, 80 insertions(+) create mode 100644 llvm/test/tools/dsymutil/AArch64/DWARFLinkerParallel/accel-imported-declarations.test diff --git a/llvm/test/tools/dsymutil/AArch64/DWARFLinkerParallel/accel-imported-declarations.test b/llvm/test/tools/dsymutil/AArch64/DWARFLinkerParallel/accel-imported-declarations.test new file mode 100644 index 0000000000000..29c0d4558e30d --- /dev/null +++ b/llvm/test/tools/dsymutil/AArch64/DWARFLinkerParallel/accel-imported-declarations.test @@ -0,0 +1,80 @@ +RUN: dsymutil --linker parallel -accelerator=Dwarf \ +RUN: -oso-prepend-path=%p/../../Inputs \ +RUN: %p/../../Inputs/accel-imported-declaration.macho-arm64 -o %t.dwarf.dSYM +RUN: dsymutil --linker parallel -accelerator=Apple \ +RUN: -oso-prepend-path=%p/../../Inputs \ +RUN: %p/../../Inputs/accel-imported-declaration.macho-arm64 -o %t.apple.dSYM + +RUN: llvm-dwarfdump -v %t.dwarf.dSYM | FileCheck %s -check-prefixes=DWARF,COMMON +RUN: llvm-dwarfdump -v %t.apple.dSYM | FileCheck %s -check-prefixes=APPLE,COMMON + +COMMON: .debug_info contents +COMMON: DW_TAG_compile_unit +COMMON: DW_AT_name{{.*}}"__artificial_type_unit" +COMMON: DW_TAG_base_type +COMMON: DW_AT_name{{.*}}"int" +COMMON: DW_TAG_namespace +COMMON: DW_AT_name{{.*}}"A" +COMMON: DW_TAG_namespace +COMMON: DW_AT_name{{.*}}"B" +COMMON: 0x[[NAMESPACE_C_1:[0-9a-f]*]]: DW_TAG_namespace +COMMON: DW_AT_name{{.*}}"C" +COMMON-NOT: DW_TAG_variable +COMMON: 0x[[NAMESPACE_C_2:[0-9a-f]*]]: DW_TAG_imported_declaration +COMMON: DW_AT_import{{.*}}[[NAMESPACE_C_1]] +COMMON: DW_AT_name{{.*}}"C" +COMMON: DW_TAG_imported_module +COMMON: DW_AT_import{{.*}}[[NAMESPACE_C_1]] + + +COMMON: DW_TAG_compile_unit +COMMON: {{.*}}DW_TAG_namespace +COMMON: DW_AT_name{{.*}}"A" +COMMON: {{.*}}DW_TAG_namespace +COMMON: DW_AT_name{{.*}}"B" +COMMON: 0x[[NAMESPACE_C_3:[0-9a-f]*]]: DW_TAG_namespace +COMMON: DW_AT_name{{.*}}"C" +COMMON: 0x[[VAR_A:[0-9a-f]*]]: DW_TAG_variable +COMMON: DW_TAG_imported_declaration +COMMON: DW_AT_import{{.*}}[[VAR_A]] + +DWARF: .debug_names contents: +DWARF: Bucket 0 [ +DWARF-NEXT: Name {{.*}} { +DWARF-NEXT: Hash: {{.*}} +DWARF-NEXT: String: {{.*}} "C" +DWARF-NEXT: Entry {{.*}} { +DWARF-NEXT: Abbrev: {{.*}} +DWARF-NEXT: Tag: DW_TAG_namespace +DWARF: DW_IDX_die_offset: 0x0000002f +DWARF-NEXT: } +DWARF-NEXT: Entry {{.*}} { +DWARF-NEXT: Abbrev: {{.*}} +DWARF: Tag: DW_TAG_imported_declaration +DWARF: DW_IDX_die_offset: 0x00000035 +DWARF-NEXT: } +DWARF-NEXT: Entry {{.*}} { +DWARF-NEXT: Abbrev: {{.*}} +DWARF-NEXT: Tag: DW_TAG_namespace +DWARF: DW_IDX_die_offset: 0x0000003c +DWARF-NEXT: } + +DWARF-NEXT: } + +APPLE: .apple_namespaces contents: +APPLE: Bucket 1 [ +APPLE-NEXT: Hash {{.*}} [ +APPLE-NEXT: Name@{{.*}} { +APPLE-NEXT: String: {{.*}} "C" +APPLE-NEXT: Data 0 [ +APPLE-NEXT: Atom[0]: 0x[[NAMESPACE_C_1]] +APPLE-NEXT: ] +APPLE-NEXT: Data 1 [ +APPLE-NEXT: Atom[0]: 0x[[NAMESPACE_C_2]] +APPLE-NEXT: ] +APPLE-NEXT: Data 2 [ +APPLE-NEXT: Atom[0]: 0x[[NAMESPACE_C_3]] +APPLE-NEXT: ] +APPLE: } +APPLE-NEXT: ] +APPLE-NEXT: ]