public inbox for glibc-cvs@sourceware.org
help / color / mirror / Atom feed
From: H.J. Lu <hjl@sourceware.org>
To: glibc-cvs@sourceware.org
Subject: [glibc] Fix elf: Do not duplicate the GLIBC_TUNABLES string
Date: Tue, 19 Dec 2023 21:34:40 +0000 (GMT)	[thread overview]
Message-ID: <20231219213440.8D52E385803B@sourceware.org> (raw)

https://sourceware.org/git/gitweb.cgi?p=glibc.git;h=cad5703e4f80841b7f7e3fe57127bd0df7ddb86e

commit cad5703e4f80841b7f7e3fe57127bd0df7ddb86e
Author: H.J. Lu <hjl.tools@gmail.com>
Date:   Tue Dec 19 13:21:06 2023 -0800

    Fix elf: Do not duplicate the GLIBC_TUNABLES string
    
    Fix issues in sysdeps/x86/tst-hwcap-tunables.c added by
    
    Author: Adhemerval Zanella <adhemerval.zanella@linaro.org>
    Date:   Wed Dec 6 10:24:01 2023 -0300
    
        elf: Do not duplicate the GLIBC_TUNABLES string
    
    1. -AVX,-AVX2,-AVX512F should be used to disable AVX, AVX2 and AVX512.
    2. AVX512 IFUNC functions check AVX512VL.  -AVX512VL should be added
    to disable these functions.
    
    This fixed:
    
    FAIL: elf/tst-hwcap-tunables
    ...
    [0] Spawned test for -Prefer_ERMS,-Prefer_FSRM,-AVX,-AVX2,-AVX_Usable,-AVX2_Usable,-AVX512F_Usable,-SSE4_1,-SSE4_2,-SSSE3,-Fast_Unaligned_Load,-ERMS,-AVX_Fast_Unaligned_Load
    error: subprocess failed: tst-tunables
    error:   unexpected output from subprocess
    ../sysdeps/x86/tst-hwcap-tunables.c:91: numeric comparison failure
       left: 1 (0x1); from: impls[i].usable
      right: 0 (0x0); from: false
    ../sysdeps/x86/tst-hwcap-tunables.c:91: numeric comparison failure
       left: 1 (0x1); from: impls[i].usable
      right: 0 (0x0); from: false
    ../sysdeps/x86/tst-hwcap-tunables.c:91: numeric comparison failure
       left: 1 (0x1); from: impls[i].usable
      right: 0 (0x0); from: false
    ../sysdeps/x86/tst-hwcap-tunables.c:91: numeric comparison failure
       left: 1 (0x1); from: impls[i].usable
      right: 0 (0x0); from: false
    ../sysdeps/x86/tst-hwcap-tunables.c:91: numeric comparison failure
       left: 1 (0x1); from: impls[i].usable
      right: 0 (0x0); from: false
    
    [1] Spawned test for ,-,-Prefer_ERMS,-Prefer_FSRM,-AVX,-AVX2,-AVX_Usable,-AVX2_Usable,-AVX512F_Usable,-SSE4_1,-SSE4_2,,-SSSE3,-Fast_Unaligned_Load,,-,-ERMS,-AVX_Fast_Unaligned_Load,-,
    error: subprocess failed: tst-tunables
    error:   unexpected output from subprocess
    ../sysdeps/x86/tst-hwcap-tunables.c:91: numeric comparison failure
       left: 1 (0x1); from: impls[i].usable
      right: 0 (0x0); from: false
    ../sysdeps/x86/tst-hwcap-tunables.c:91: numeric comparison failure
       left: 1 (0x1); from: impls[i].usable
      right: 0 (0x0); from: false
    ../sysdeps/x86/tst-hwcap-tunables.c:91: numeric comparison failure
       left: 1 (0x1); from: impls[i].usable
      right: 0 (0x0); from: false
    ../sysdeps/x86/tst-hwcap-tunables.c:91: numeric comparison failure
       left: 1 (0x1); from: impls[i].usable
      right: 0 (0x0); from: false
    ../sysdeps/x86/tst-hwcap-tunables.c:91: numeric comparison failure
       left: 1 (0x1); from: impls[i].usable
      right: 0 (0x0); from: false
    
    error: 2 test failures
    
    on Intel Tiger Lake.

Diff:
---
 sysdeps/x86/tst-hwcap-tunables.c | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/sysdeps/x86/tst-hwcap-tunables.c b/sysdeps/x86/tst-hwcap-tunables.c
index 01a9377f7e..4e36aa077d 100644
--- a/sysdeps/x86/tst-hwcap-tunables.c
+++ b/sysdeps/x86/tst-hwcap-tunables.c
@@ -58,17 +58,17 @@ static const struct test_t
 {
   {
     /* Disable everything.  */
-    "-Prefer_ERMS,-Prefer_FSRM,-AVX,-AVX2,-AVX_Usable,-AVX2_Usable,"
-    "-AVX512F_Usable,-SSE4_1,-SSE4_2,-SSSE3,-Fast_Unaligned_Load,-ERMS,"
+    "-Prefer_ERMS,-Prefer_FSRM,-AVX,-AVX2,-AVX512F,-AVX512VL,"
+    "-SSE4_1,-SSE4_2,-SSSE3,-Fast_Unaligned_Load,-ERMS,"
     "-AVX_Fast_Unaligned_Load",
     test_1,
     array_length (test_1)
   },
   {
     /* Same as before, but with some empty suboptions.  */
-    ",-,-Prefer_ERMS,-Prefer_FSRM,-AVX,-AVX2,-AVX_Usable,-AVX2_Usable,"
-    "-AVX512F_Usable,-SSE4_1,-SSE4_2,,-SSSE3,-Fast_Unaligned_Load,,-,-ERMS,"
-    "-AVX_Fast_Unaligned_Load,-,",
+    ",-,-Prefer_ERMS,-Prefer_FSRM,-AVX,-AVX2,-AVX512F,-AVX512VL,"
+    "-SSE4_1,-SSE4_2,-SSSE3,-Fast_Unaligned_Load,,-,"
+    "-ERMS,-AVX_Fast_Unaligned_Load,-,",
     test_1,
     array_length (test_1)
   }

             reply	other threads:[~2023-12-19 21:34 UTC|newest]

Thread overview: 2+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2023-12-19 21:34 H.J. Lu [this message]
2023-12-20  0:32 H.J. Lu

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=20231219213440.8D52E385803B@sourceware.org \
    --to=hjl@sourceware.org \
    --cc=glibc-cvs@sourceware.org \
    /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).