From: mengqinggang <mengqinggang@loongson.cn>
To: Xi Ruoyao <xry111@xry111.site>, binutils@sourceware.org
Cc: changjiachen <changjiachen@stu.xupt.edu.cn>,
i.swmail@xen0n.name, Nick Clifton <nickc@redhat.com>
Subject: Re: [PATCH] LoongArch: Fix some test failures about TLS desc and TLS relaxation
Date: Mon, 22 Jan 2024 17:45:49 +0800 [thread overview]
Message-ID: <e376b258-90d6-398b-be3c-13c7095cfdc4@loongson.cn> (raw)
In-Reply-To: <20240119164017.509102-1-xry111@xry111.site>
Thank you very much, it has been applied.
在 2024/1/20 上午12:38, Xi Ruoyao 写道:
> There are two issues causing 11 test failures:
>
> 1. The TLS desc tests are matching the entire disassemble of a linked
> executable. But if ld is configured --enable-default-hash-style=gnu
> (note that most modern distros use this option), the layout of the
> linked executables will be different and the immediate operands in
> the linked executables will also be different. So we add
> "--hash-style=both" for these tests to cancel the effect of
> --enable-default-hash-style=gnu, like [x86_64 mark-plt tests].
> 2. By default objdump disassemble uses [pseudo-instructions] so "addi.w"
> is outputed as "li.w", causing mismatches in TLS relaxation tests.
> We can turn off the pseudo-instruction usage in objdump using "-M
> no-aliases" to fix them.
>
> [x86_64 mark-plt tests]: 16666ccc91295d1568c5c2cb0e7600694840dfd9
> [pseudo-instructions]: 17f9439038257b1de0c130a416a9a7645c653cb0
>
> Signed-off-by: Xi Ruoyao <xry111@xry111.site>
> ---
>
> Nick: if Qinggang approves this I'd request an approve for 2.42 branch
> as well. This is a target bug fix and it only changes tests.
>
> ld/testsuite/ld-loongarch-elf/desc-ie.d | 2 +-
> ld/testsuite/ld-loongarch-elf/desc-norelax.d | 2 +-
> ld/testsuite/ld-loongarch-elf/desc-relax.d | 2 +-
> ld/testsuite/ld-loongarch-elf/relax.exp | 14 +++++++-------
> ld/testsuite/ld-loongarch-elf/tlsdesc-dso.d | 2 +-
> 5 files changed, 11 insertions(+), 11 deletions(-)
>
> diff --git a/ld/testsuite/ld-loongarch-elf/desc-ie.d b/ld/testsuite/ld-loongarch-elf/desc-ie.d
> index d1acbfc6972..32e350507db 100644
> --- a/ld/testsuite/ld-loongarch-elf/desc-ie.d
> +++ b/ld/testsuite/ld-loongarch-elf/desc-ie.d
> @@ -1,5 +1,5 @@
> #as:
> -#ld: -shared -z norelro -e 0x0
> +#ld: -shared -z norelro -e 0x0 --hash-style=both
> #objdump: -dr
> #skip: loongarch32-*-*
>
> diff --git a/ld/testsuite/ld-loongarch-elf/desc-norelax.d b/ld/testsuite/ld-loongarch-elf/desc-norelax.d
> index 32ce3e5eb94..e4863dda36a 100644
> --- a/ld/testsuite/ld-loongarch-elf/desc-norelax.d
> +++ b/ld/testsuite/ld-loongarch-elf/desc-norelax.d
> @@ -1,5 +1,5 @@
> #as:
> -#ld: -z norelro -shared --section-start=.got=0x1ff000
> +#ld: -z norelro -shared --section-start=.got=0x1ff000 --hash-style=both
> #objdump: -dr
> #skip: loongarch32-*-*
>
> diff --git a/ld/testsuite/ld-loongarch-elf/desc-relax.d b/ld/testsuite/ld-loongarch-elf/desc-relax.d
> index ce53d317272..c885953c727 100644
> --- a/ld/testsuite/ld-loongarch-elf/desc-relax.d
> +++ b/ld/testsuite/ld-loongarch-elf/desc-relax.d
> @@ -1,5 +1,5 @@
> #as:
> -#ld: -z norelro -shared
> +#ld: -z norelro -shared --hash-style=both
> #objdump: -dr
> #skip: loongarch32-*-*
>
> diff --git a/ld/testsuite/ld-loongarch-elf/relax.exp b/ld/testsuite/ld-loongarch-elf/relax.exp
> index f3fd169dbd3..f421e8af8dd 100644
> --- a/ld/testsuite/ld-loongarch-elf/relax.exp
> +++ b/ld/testsuite/ld-loongarch-elf/relax.exp
> @@ -104,7 +104,7 @@ if [istarget loongarch64-*-*] {
> ]
>
> if [file exist "tmpdir/relax-tls-le"] {
> - set objdump_output1 [run_host_cmd "objdump" "-d tmpdir/relax-tls-le"]
> + set objdump_output1 [run_host_cmd "objdump" "-d tmpdir/relax-tls-le -M no-aliases"]
> if { [ regexp ".addi.*st.*" $objdump_output1] } {
> pass "loongarch relax success"
> } {
> @@ -125,7 +125,7 @@ if [istarget loongarch64-*-*] {
> ]
>
> if [file exist "tmpdir/no-relax-tls-le"] {
> - set objdump_output2 [run_host_cmd "objdump" "-d tmpdir/no-relax-tls-le"]
> + set objdump_output2 [run_host_cmd "objdump" "-d tmpdir/no-relax-tls-le -M no-aliases"]
> if { [ regexp ".*lu12i.*add.*addi.*st.*" $objdump_output2] } {
> pass "loongarch no-relax success"
> } {
> @@ -146,7 +146,7 @@ if [istarget loongarch64-*-*] {
> ]
>
> if [file exist "tmpdir/old-tls-le"] {
> - set objdump_output3 [run_host_cmd "objdump" "-d tmpdir/old-tls-le"]
> + set objdump_output3 [run_host_cmd "objdump" "-d tmpdir/old-tls-le -M no-aliases"]
> if { [ regexp ".*lu12i.*ori.*add.*addi.*stptr.*" $objdump_output3] } {
> pass "loongarch old tls le success"
> } {
> @@ -167,7 +167,7 @@ if [istarget loongarch64-*-*] {
> ]
>
> if [file exist "tmpdir/realx-compatible"] {
> - set objdump_output4 [run_host_cmd "objdump" "-d tmpdir/realx-compatible"]
> + set objdump_output4 [run_host_cmd "objdump" "-d tmpdir/realx-compatible -M no-aliases"]
> if { [ regexp ".addi.*st.*" $objdump_output4] && \
> [ regexp ".*lu12i.*ori.*add.*addi.*stptr.*" $objdump_output4] } {
> pass "loongarch tls le relax compatible check success"
> @@ -188,7 +188,7 @@ if [istarget loongarch64-*-*] {
> ] \
> ]
> if [file exist "tmpdir/no-realx-compatible"] {
> - set objdump_output4 [run_host_cmd "objdump" "-d tmpdir/no-realx-compatible"]
> + set objdump_output4 [run_host_cmd "objdump" "-d tmpdir/no-realx-compatible -M no-aliases"]
> if { [ regexp ".*lu12i.*add.*addi.*st.*" $objdump_output4] && \
> [ regexp ".*lu12i.*ori.*add.*addi.*stptr.*" $objdump_output4] } {
> pass "loongarch tls le no-relax compatible check success"
> @@ -210,7 +210,7 @@ if [istarget loongarch64-*-*] {
> ]
>
> if [file exist "tmpdir/relax-bound-check-tls-le"] {
> - set objdump_output5 [run_host_cmd "objdump" "-d tmpdir/relax-bound-check-tls-le"]
> + set objdump_output5 [run_host_cmd "objdump" "-d tmpdir/relax-bound-check-tls-le -M no-aliases"]
> if { [ regexp ".*lu12i.*add.*addi.*st.*" $objdump_output5] && \
> [ regexp ".addi.*st.*" $objdump_output5] } {
> pass "loongarch no-relax success"
> @@ -232,7 +232,7 @@ if [istarget loongarch64-*-*] {
> ]
>
> if [file exist "tmpdir/no-relax-bound-check-tls-le"] {
> - set objdump_output5 [run_host_cmd "objdump" "-d tmpdir/no-relax-bound-check-tls-le"]
> + set objdump_output5 [run_host_cmd "objdump" "-d tmpdir/no-relax-bound-check-tls-le -M no-aliases"]
> if { [ regexp ".*addi.*st.*" $objdump_output5] } {
> pass "loongarch no-relax success"
> } {
> diff --git a/ld/testsuite/ld-loongarch-elf/tlsdesc-dso.d b/ld/testsuite/ld-loongarch-elf/tlsdesc-dso.d
> index 667ad746f62..453902d1622 100644
> --- a/ld/testsuite/ld-loongarch-elf/tlsdesc-dso.d
> +++ b/ld/testsuite/ld-loongarch-elf/tlsdesc-dso.d
> @@ -1,5 +1,5 @@
> #as:
> -#ld: -shared -z norelro
> +#ld: -shared -z norelro --hash-style=both
> #objdump: -dr
> #skip: loongarch32-*-*
>
prev parent reply other threads:[~2024-01-22 9:45 UTC|newest]
Thread overview: 2+ messages / expand[flat|nested] mbox.gz Atom feed top
2024-01-19 16:38 Xi Ruoyao
2024-01-22 9:45 ` mengqinggang [this message]
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=e376b258-90d6-398b-be3c-13c7095cfdc4@loongson.cn \
--to=mengqinggang@loongson.cn \
--cc=binutils@sourceware.org \
--cc=changjiachen@stu.xupt.edu.cn \
--cc=i.swmail@xen0n.name \
--cc=nickc@redhat.com \
--cc=xry111@xry111.site \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).