From patchwork Fri Dec 4 00:21:35 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "H.J. Lu" X-Patchwork-Id: 41297 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 5C9073857C5B; Fri, 4 Dec 2020 00:21:42 +0000 (GMT) DKIM-Filter: OpenDKIM Filter v2.11.0 sourceware.org 5C9073857C5B DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=sourceware.org; s=default; t=1607041302; bh=8vZGISjFmu7gov7AFa6NnZtgPRmITrkoSj7NcgjPQpY=; h=To:Subject:Date:List-Id:List-Unsubscribe:List-Archive:List-Post: List-Help:List-Subscribe:From:Reply-To:From; b=hMTPPPc7yIghQVHI0QeMCkR+DdGiuonNyipI7fPq7zoOrD4jDRglO6+FI5qjjiXpd LvJruhIDo3Dq8A4dUdehYi5RK5eRj8AmfvOI7i5T4PWHBYo2Pe3vHFWEZ9iFSZoEKc caiPjQZI8iMi5ngiNVb9gUTFZKLuhsDT+ZJvihuA= X-Original-To: libc-alpha@sourceware.org Delivered-To: libc-alpha@sourceware.org Received: from mail-pj1-x102b.google.com (mail-pj1-x102b.google.com [IPv6:2607:f8b0:4864:20::102b]) by sourceware.org (Postfix) with ESMTPS id 38EF13857C5B for ; Fri, 4 Dec 2020 00:21:40 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.3.2 sourceware.org 38EF13857C5B Received: by mail-pj1-x102b.google.com with SMTP id o7so2129824pjj.2 for ; Thu, 03 Dec 2020 16:21:40 -0800 (PST) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:subject:date:message-id:mime-version :content-transfer-encoding; bh=8vZGISjFmu7gov7AFa6NnZtgPRmITrkoSj7NcgjPQpY=; b=YwNAQjy11MElr3w6Htpj8rI6+F1Gm+XwC6C1g15LYUKKeNeXcq8Vrse+12V1cPfRWd KmwJl4heScALhQtgj49bAg0IMWNUZivrS8DyDMd0pLdL/UxjmDOZ0QcSiUQsBNMMdEKr SAT3dPM0Upj/5vZeBGbjQ9HCbC/n7cc31Gv2tR3Ro1e7BBJzzsBjl0buPMfjqh8h0s1s GdYK+zWvNJ36TL1KNSi7jyFl+9nxY2Qp690dSXaeD9hAt1DIV/vX426eUBG5iv+G5CZs 4x+qMS03MFlYyrMUdJfNjSCu0P1IGzABZkQkBPQLsBt3pzyNVx5nXIAEzLH5Fy78XfH1 EJYw== X-Gm-Message-State: AOAM5328p/xg1wUolHwVLpDAfi8lvBLVX17Dregj8tfcYhqXQhDXTxi4 0/hZjHMm+lreMxmZZDQzKCsDsCYT6Vc= X-Google-Smtp-Source: ABdhPJxvLgdcfMP0tFTqHEdM4TPIwy3yj1zfDh9EvzDR0r1oxD14kUqF/IKSoS7ExAeyXWt6K3DOjQ== X-Received: by 2002:a17:90b:ec2:: with SMTP id gz2mr1562334pjb.143.1607041298873; Thu, 03 Dec 2020 16:21:38 -0800 (PST) Received: from gnu-cfl-2.localdomain (c-69-181-90-243.hsd1.ca.comcast.net. [69.181.90.243]) by smtp.gmail.com with ESMTPSA id h31sm2182994pgh.42.2020.12.03.16.21.38 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 03 Dec 2020 16:21:38 -0800 (PST) Received: from gnu-cfl-2.localdomain (localhost [IPv6:::1]) by gnu-cfl-2.localdomain (Postfix) with ESMTP id 304F41A021E for ; Thu, 3 Dec 2020 16:21:37 -0800 (PST) To: libc-alpha@sourceware.org Subject: [PATCH] x86: Adjust tst-cpu-features-supports.c for GCC 11 Date: Thu, 3 Dec 2020 16:21:35 -0800 Message-Id: <20201204002135.1609087-1-hjl.tools@gmail.com> X-Mailer: git-send-email 2.28.0 MIME-Version: 1.0 X-Spam-Status: No, score=-3040.2 required=5.0 tests=BAYES_00, DKIM_SIGNED, DKIM_VALID, DKIM_VALID_AU, DKIM_VALID_EF, FREEMAIL_FROM, GIT_PATCH_0, KAM_NUMSUBJECT, RCVD_IN_DNSWL_NONE, SPF_HELO_NONE, SPF_PASS, TXREP autolearn=ham autolearn_force=no version=3.4.2 X-Spam-Checker-Version: SpamAssassin 3.4.2 (2018-09-13) on server2.sourceware.org X-BeenThere: libc-alpha@sourceware.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: Libc-alpha mailing list List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-Patchwork-Original-From: "H.J. Lu via Libc-alpha" From: "H.J. Lu" Reply-To: "H.J. Lu" Errors-To: libc-alpha-bounces@sourceware.org Sender: "Libc-alpha" Set RDRAND usable if CPU supports RDRAND. Also check HAS_CPU_FEATURE instead of CPU_FEATURE_USABLE for FSGSBASE, LM and XSAVES since FSGSBASE/LM require kernel support and XSAVES is supervisor-mode only. --- sysdeps/x86/cpu-features.c | 1 + sysdeps/x86/tst-cpu-features-supports.c | 11 ++++++++--- 2 files changed, 9 insertions(+), 3 deletions(-) diff --git a/sysdeps/x86/cpu-features.c b/sysdeps/x86/cpu-features.c index f26deba38d..fe080b63b2 100644 --- a/sysdeps/x86/cpu-features.c +++ b/sysdeps/x86/cpu-features.c @@ -85,6 +85,7 @@ update_usable (struct cpu_features *cpu_features) CPU_FEATURE_SET_USABLE (cpu_features, WAITPKG); CPU_FEATURE_SET_USABLE (cpu_features, GFNI); CPU_FEATURE_SET_USABLE (cpu_features, RDPID); + CPU_FEATURE_SET_USABLE (cpu_features, RDRAND); CPU_FEATURE_SET_USABLE (cpu_features, CLDEMOTE); CPU_FEATURE_SET_USABLE (cpu_features, MOVDIRI); CPU_FEATURE_SET_USABLE (cpu_features, MOVDIR64B); diff --git a/sysdeps/x86/tst-cpu-features-supports.c b/sysdeps/x86/tst-cpu-features-supports.c index bf881b531f..7c7a953458 100644 --- a/sysdeps/x86/tst-cpu-features-supports.c +++ b/sysdeps/x86/tst-cpu-features-supports.c @@ -40,6 +40,11 @@ check_supports (int supports, int usable, const char *supports_name, #define CHECK_SUPPORTS(str, name) \ check_supports (__builtin_cpu_supports (#str), \ CPU_FEATURE_USABLE (name), \ + #str, "CPU_FEATURE_USABLE (" #name ")"); + +#define CHECK_CPU_SUPPORTS(str, name) \ + check_supports (__builtin_cpu_supports (#str), \ + HAS_CPU_FEATURE (name), \ #str, "HAS_CPU_FEATURE (" #name ")"); static int @@ -118,7 +123,7 @@ do_test (int argc, char **argv) fails += CHECK_SUPPORTS (fma4, FMA4); #endif #if __GNUC_PREREQ (11, 0) - fails += CHECK_SUPPORTS (fsgsbase, FSGSBASE); + fails += CHECK_CPU_SUPPORTS (fsgsbase, FSGSBASE); fails += CHECK_SUPPORTS (fxsave, FXSR); #endif #if __GNUC_PREREQ (8, 0) @@ -128,7 +133,7 @@ do_test (int argc, char **argv) fails += CHECK_SUPPORTS (hle, HLE); fails += CHECK_SUPPORTS (ibt, IBT); fails += CHECK_SUPPORTS (lahf_lm, LAHF64_SAHF64); - fails += CHECK_SUPPORTS (lm, LM); + fails += CHECK_CPU_SUPPORTS (lm, LM); fails += CHECK_SUPPORTS (lwp, LWP); fails += CHECK_SUPPORTS (lzcnt, LZCNT); #endif @@ -180,7 +185,7 @@ do_test (int argc, char **argv) fails += CHECK_SUPPORTS (xsave, XSAVE); fails += CHECK_SUPPORTS (xsavec, XSAVEC); fails += CHECK_SUPPORTS (xsaveopt, XSAVEOPT); - fails += CHECK_SUPPORTS (xsaves, XSAVES); + fails += CHECK_CPU_SUPPORTS (xsaves, XSAVES); #endif printf ("%d differences between __builtin_cpu_supports and glibc code.\n",