From patchwork Tue Dec 19 21:27:03 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "H.J. Lu" X-Patchwork-Id: 82530 Return-Path: X-Original-To: patchwork@sourceware.org Delivered-To: patchwork@sourceware.org Received: from server2.sourceware.org (localhost [IPv6:::1]) by sourceware.org (Postfix) with ESMTP id A25A13858282 for ; Tue, 19 Dec 2023 21:27:21 +0000 (GMT) X-Original-To: libc-alpha@sourceware.org Delivered-To: libc-alpha@sourceware.org Received: from mail-pj1-x102f.google.com (mail-pj1-x102f.google.com [IPv6:2607:f8b0:4864:20::102f]) by sourceware.org (Postfix) with ESMTPS id 8BF40385840D; Tue, 19 Dec 2023 21:27:07 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.2 sourceware.org 8BF40385840D Authentication-Results: sourceware.org; dmarc=pass (p=none dis=none) header.from=gmail.com Authentication-Results: sourceware.org; spf=pass smtp.mailfrom=gmail.com ARC-Filter: OpenARC Filter v1.0.0 sourceware.org 8BF40385840D Authentication-Results: server2.sourceware.org; arc=none smtp.remote-ip=2607:f8b0:4864:20::102f ARC-Seal: i=1; a=rsa-sha256; d=sourceware.org; s=key; t=1703021229; cv=none; b=T7zvWjjXq+QdwnQ743kF+FRrGfH9Dbf4OcLS1YbSZHkQX8JFfrL1RUdKcnE8yJFc0LKT5bLD0gWsE/JnLHshtrJOWgXOYVmLjC8zOr4z8D/HofWrh7p0LgwEIdWeTeaasSMglaFSdC9cS8niS1xpXL47h+PKLRey5nQa/fVLLKE= ARC-Message-Signature: i=1; a=rsa-sha256; d=sourceware.org; s=key; t=1703021229; c=relaxed/simple; bh=I8GRhSYIlbaq95vINCUGr+idkWiw8pRAg+Lu996s3Zo=; h=DKIM-Signature:Date:From:To:Subject:Message-ID:MIME-Version; b=P9gmdXY0avETlOjrs6srXMGTBpUkcgKuxIoS/VlcXHfdGyPLN5i3enkuEZj5/LDVCip2bFWvM+taSVfqBSc+eZXLdKilPRhfMJgew1cJP7tFzTdmgX1X1PDQQr0kz0RwGo/t+LI3hMdivYJrXL/zmc2u1QO9US4xAWojhYTxZjU= ARC-Authentication-Results: i=1; server2.sourceware.org Received: by mail-pj1-x102f.google.com with SMTP id 98e67ed59e1d1-28bc5282a79so480837a91.3; Tue, 19 Dec 2023 13:27:07 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1703021226; x=1703626026; darn=sourceware.org; h=content-disposition:mime-version:message-id:subject:cc:to:from:date :from:to:cc:subject:date:message-id:reply-to; bh=BtstKrnStmd1+r8mf0VRdJtnGBrSUG0eeH61v6AsUaU=; b=E+np5CqKJx5udWxeqYRESRCmfqC0Jb3OwlSSiYZLLlxe9m+1NRenRn4p8tCe313Vnf 2qGwgWmWJBoyXCqLSNOMkjxOCMsb6fORUPBxvLVZKph2DpFuE1yZIQa15UD6SUs9SkkQ nPxinVk1oQRWQ7Uay0LJcY5ty2IE++RuCpEUPUVyTYAaWJIZH7kjqbmHwSOTVsqQUPyP K38TC+hvLf1mPj+txerIH6MMbf2ZhHSUEHyG7+20Obrtlt/oc94a+D1QPswCgO7o3zpF uHIHeYLGkbX3VQX5SQSY0HcOl7UJPEgfotmdMwfnZKP9GNbm6uykkEpW5y3I31gA5tTs nkwQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1703021226; x=1703626026; h=content-disposition:mime-version:message-id:subject:cc:to:from:date :x-gm-message-state:from:to:cc:subject:date:message-id:reply-to; bh=BtstKrnStmd1+r8mf0VRdJtnGBrSUG0eeH61v6AsUaU=; b=FP4EdpZymhjdoVXSj1Q/4ELnD6pqUc7vxS3MI2cCilnUWl+E695ikQ8vW/8nNZdl59 YErA12lUn+pqB1qam7KNy0Itr4ZVxhamwvznD5NiPfW026cXV6DG48h0FRvxnC2XJnqv NlPRRRLKbkG1ckNBj6KWdUIvi8dzyPuCgx+Zz2X1v/XQ2s0K0gJq4oz3ri5gmYkowjtx wix3Bp+fmFwY5wa1Tx8ElaIiGQXhKr76oe+wvI/R1eZqtj3uX/KRwBrs8Yp+N0gQa3pO gxfccn+AdpI+keEzraZqq/kSIWhdENSekrwE6iHeZzhhaDdsyL4yLOopI/f4FGqtO9yl scEw== X-Gm-Message-State: AOJu0YyrJImJ+VTm0JXV+Qr7sRBJY9K2gpuLps5pIdZeHYw1mduF0nSS ed+pSaENuqipB0i1e1vYZEoHAqXg9h4= X-Google-Smtp-Source: AGHT+IHJxzIzZqkEjzN2F1Xwa1CHqcrtSaC8/eMcdbvyh08gzzlAtRC8EFWCrB5g/R93IK3U9cwTjA== X-Received: by 2002:a17:90a:dd43:b0:28b:9811:c298 with SMTP id u3-20020a17090add4300b0028b9811c298mr1758718pjv.55.1703021226373; Tue, 19 Dec 2023 13:27:06 -0800 (PST) Received: from gnu-tgl-3.localdomain ([172.59.129.147]) by smtp.gmail.com with ESMTPSA id y31-20020a17090a53a200b0028649b84907sm2268174pjh.16.2023.12.19.13.27.04 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 19 Dec 2023 13:27:05 -0800 (PST) Received: by gnu-tgl-3.localdomain (Postfix, from userid 1000) id A6727C02A6; Tue, 19 Dec 2023 13:27:03 -0800 (PST) Date: Tue, 19 Dec 2023 13:27:03 -0800 From: "H.J. Lu" To: GNU C Library Cc: Adhemerval Zanella , Siddhesh Poyarekar Subject: [PATCH] Fix elf: Do not duplicate the GLIBC_TUNABLES string Message-ID: MIME-Version: 1.0 Content-Disposition: inline X-Spam-Status: No, score=-3024.7 required=5.0 tests=BAYES_00, DKIM_SIGNED, DKIM_VALID, DKIM_VALID_AU, DKIM_VALID_EF, FREEMAIL_FROM, GIT_PATCH_0, RCVD_IN_DNSWL_NONE, SPF_HELO_NONE, SPF_PASS, TXREP, T_SCC_BODY_TEXT_LINE autolearn=ham autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on server2.sourceware.org X-BeenThere: libc-alpha@sourceware.org X-Mailman-Version: 2.1.30 Precedence: list List-Id: Libc-alpha mailing list List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: libc-alpha-bounces+patchwork=sourceware.org@sourceware.org Fix issues in sysdeps/x86/tst-hwcap-tunables.c added by Author: Adhemerval Zanella 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. I am checking it in as an obvious fix. H.J. Reviewed-by: Adhemerval Zanella --- 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) }