From patchwork Fri Dec 4 13:07:29 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: 41304 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 EFC1A3973019; Fri, 4 Dec 2020 13:08:07 +0000 (GMT) DKIM-Filter: OpenDKIM Filter v2.11.0 sourceware.org EFC1A3973019 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=sourceware.org; s=default; t=1607087288; bh=XZSuKrU2IzY5ws05G1byuluVHrYIQ40pFomJPt+3Ttw=; h=References:In-Reply-To:Date:Subject:To:List-Id:List-Unsubscribe: List-Archive:List-Post:List-Help:List-Subscribe:From:Reply-To:Cc: From; b=xxoNcVLLADad+J6eaxaEt/fu4fBdODNJEaEFUMNs2HMSI2erj8QR6srSua3jKkRgk qqFw151bxbl5J5rdgClEP359P+0kp2AULBawLgQSjGnvy9w/ZDwemVuT+Fu4Jph1NI uHioIFLD39PDNoYPaJToHG9oS6N7HQe5VBJkrxMc= X-Original-To: libc-alpha@sourceware.org Delivered-To: libc-alpha@sourceware.org Received: from mail-oi1-x243.google.com (mail-oi1-x243.google.com [IPv6:2607:f8b0:4864:20::243]) by sourceware.org (Postfix) with ESMTPS id AA5FF385480F for ; Fri, 4 Dec 2020 13:08:05 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.3.2 sourceware.org AA5FF385480F Received: by mail-oi1-x243.google.com with SMTP id y74so6019266oia.11 for ; Fri, 04 Dec 2020 05:08:05 -0800 (PST) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:mime-version:references:in-reply-to:from:date :message-id:subject:to:cc; bh=XZSuKrU2IzY5ws05G1byuluVHrYIQ40pFomJPt+3Ttw=; b=to1Dro1Rap95vaK8QQWeVYPvCoW8RREyMHHeFvKiuuzR853W6M2F0Ci6Jp1P+k5fWW Ph2WM55tgdYpdo3q5gN1ewl4CyqqsxJ/mPyqjrIsZtnKrpDZtxPSxPmzNm5/VyZpASKY Wg36OOwZ00oL2sFkhEa90xOQi6Q5kTSbO/RhWk+Ynle4MCTcVolhPj1nwoMbQ3VeHuFb +68t/xG1iObpqbikp3osgT/A+hVpky2Vexi2gpzNOJphW4AqiyM3d0emI0ssPuLXfpdc cyFbfMYXBdeu6oAQSJDOtihVcXwu1JBKMGFnk/fcNh36StfqzywOQutXv2RpNhu6kBzp jAEQ== X-Gm-Message-State: AOAM530vkxD1cNCRjclWn3mnnA+u+DqQk0Y6F89bQ4yJca/7hdo1pxBg AD5aVBHqYR9bu0gZrirxxOUyNxcoLfwEzMk1ZMQ= X-Google-Smtp-Source: ABdhPJzmouOU9Mq28u4qQZRERCDeelJOhHQFgpktm8MOfVbNIyxlI+lls0bCZNNhTdXiHpCcdKNN/qVxzwd9gLgDUq0= X-Received: by 2002:aca:f5d3:: with SMTP id t202mr1614773oih.25.1607087285132; Fri, 04 Dec 2020 05:08:05 -0800 (PST) MIME-Version: 1.0 References: <20201204002135.1609087-1-hjl.tools@gmail.com> <87blfarnw4.fsf@oldenburg2.str.redhat.com> In-Reply-To: <87blfarnw4.fsf@oldenburg2.str.redhat.com> Date: Fri, 4 Dec 2020 05:07:29 -0800 Message-ID: Subject: V2 [PATCH] x86: Adjust tst-cpu-features-supports.c for GCC 11 To: Florian Weimer X-Spam-Status: No, score=-3035.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" Cc: "H.J. Lu via Libc-alpha" Errors-To: libc-alpha-bounces@sourceware.org Sender: "Libc-alpha" On Fri, Dec 4, 2020 at 12:12 AM Florian Weimer wrote: > > * H. J. Lu via 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. > > I think the commit subject is misleading because the RDRAND part is a > glibc bug fix. Rest looks okay to me. > Here is the V2 patch. It changed IBT and SHSTK to check HAS_CPU_FEATURE since they need OS support. From e7f391efefb919a9c5ad856b504874150b82fc01 Mon Sep 17 00:00:00 2001 From: "H.J. Lu" Date: Thu, 3 Dec 2020 15:02:44 -0800 Subject: [PATCH] x86: Adjust tst-cpu-features-supports.c for GCC 11 Check HAS_CPU_FEATURE instead of CPU_FEATURE_USABLE for FSGSBASE, IBT, LM, SHSTK and XSAVES since FSGSBASE/IBT/SHSTK/LM require kernel support and XSAVES is supervisor-mode only. --- sysdeps/x86/tst-cpu-features-supports.c | 15 ++++++++++----- 1 file changed, 10 insertions(+), 5 deletions(-) diff --git a/sysdeps/x86/tst-cpu-features-supports.c b/sysdeps/x86/tst-cpu-features-supports.c index bf881b531f..287cf01fbd 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) @@ -126,9 +131,9 @@ do_test (int argc, char **argv) #endif #if __GNUC_PREREQ (11, 0) fails += CHECK_SUPPORTS (hle, HLE); - fails += CHECK_SUPPORTS (ibt, IBT); + fails += CHECK_CPU_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 @@ -150,7 +155,7 @@ do_test (int argc, char **argv) fails += CHECK_SUPPORTS (rtm, RTM); fails += CHECK_SUPPORTS (serialize, SERIALIZE); fails += CHECK_SUPPORTS (sha, SHA); - fails += CHECK_SUPPORTS (shstk, SHSTK); + fails += CHECK_CPU_SUPPORTS (shstk, SHSTK); #endif fails += CHECK_SUPPORTS (sse, SSE); fails += CHECK_SUPPORTS (sse2, SSE2); @@ -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", -- 2.28.0