From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [170.10.129.124]) by sourceware.org (Postfix) with ESMTPS id B0B9B387741E for ; Fri, 14 Jan 2022 18:52:03 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.1 sourceware.org B0B9B387741E Received: from mail-qk1-f197.google.com (mail-qk1-f197.google.com [209.85.222.197]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id us-mta-57-vDb9hLmWMLmaHRBIanfZOg-1; Fri, 14 Jan 2022 13:52:02 -0500 X-MC-Unique: vDb9hLmWMLmaHRBIanfZOg-1 Received: by mail-qk1-f197.google.com with SMTP id 22-20020a05620a06d600b0047a27f4b358so1428790qky.3 for ; Fri, 14 Jan 2022 10:52:02 -0800 (PST) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:message-id:date:mime-version:user-agent:subject :content-language:to:references:from:organization:in-reply-to :content-transfer-encoding; bh=EKun411WjJJjCAZre2K5yFdN7ZUI/Ju9/q2/NM4Y6Hk=; b=ZD5z+wihAF/TS4ajVBesJ2cwyekJ5g1XG+dxsTnIC4/UFcQ/1XRADISZs76sVEDfD3 FjUuGMPxtgOH8BeWwqJ34Mb/uCk5u5OFaju6TG6n47DkSvsym5ZRP2iwbt7+1SITMdqL qj6yXZ4VlYpdgIPdY0FZzhzXhw34L4vSMTbON+T6GvM0AUGMv5zZXOhAP7o9RWEJOuU/ /BjehOHyb8q8ta2hlDVxFM+4WJ6W0e1r+uwydy6atHJfzE+mJnSo2wEcwdRbTbPy9rlH oWtgiluKJsPzJfpc5ozJJ4igyOT8aZoapd2h/+dGFSptYapSfUUrLHz4RqwSpRmI1VoJ FlfQ== X-Gm-Message-State: AOAM530y8OtR+WYxzMJLdBOUOWfk0PSMnUvnTSXzVIFbA7kk5pPlw2VI nxRNUs6Gy0ZzdjvELjKBHeWiEQx2MLfOoKqLK5ARTaT/qf1pIK2qkahVlfJtp9CAPKXmEYxO7eR ue9pWMf1vu8VCRHpZOojv X-Received: by 2002:a05:620a:124b:: with SMTP id a11mr1912475qkl.594.1642186321316; Fri, 14 Jan 2022 10:52:01 -0800 (PST) X-Google-Smtp-Source: ABdhPJyfmDqDhuDu1ttpFBMYu/hVzZkTBLEM5Cy/mp0c6ilNP2QHVtp01Yc7uF96uQXA3zPgnNlmaQ== X-Received: by 2002:a05:620a:124b:: with SMTP id a11mr1912467qkl.594.1642186321135; Fri, 14 Jan 2022 10:52:01 -0800 (PST) Received: from [192.168.0.241] (135-23-175-80.cpe.pppoe.ca. [135.23.175.80]) by smtp.gmail.com with ESMTPSA id n8sm1169212qtk.73.2022.01.14.10.52.00 (version=TLS1_3 cipher=TLS_AES_128_GCM_SHA256 bits=128/128); Fri, 14 Jan 2022 10:52:00 -0800 (PST) Message-ID: <9a13121d-f33c-49c3-b7f8-84cebef635a7@redhat.com> Date: Fri, 14 Jan 2022 13:51:59 -0500 MIME-Version: 1.0 User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:91.0) Gecko/20100101 Thunderbird/91.4.0 Subject: Re: [PATCH v2 4/6] powerpc64le: Use in early HWCAP check To: Florian Weimer , libc-alpha@sourceware.org References: <7540e03f5d1e4f301d53f755307d12f67eb17b0b.1642179009.git.fweimer@redhat.com> From: Carlos O'Donell Organization: Red Hat In-Reply-To: <7540e03f5d1e4f301d53f755307d12f67eb17b0b.1642179009.git.fweimer@redhat.com> X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com Content-Language: en-US Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 7bit X-Spam-Status: No, score=-12.2 required=5.0 tests=BAYES_00, DKIMWL_WL_HIGH, DKIM_SIGNED, DKIM_VALID, DKIM_VALID_AU, DKIM_VALID_EF, GIT_PATCH_0, NICE_REPLY_A, RCVD_IN_DNSWL_LOW, RCVD_IN_MSPIKE_H3, RCVD_IN_MSPIKE_WL, SPF_HELO_NONE, SPF_NONE, TXREP autolearn=ham autolearn_force=no version=3.4.4 X-Spam-Checker-Version: SpamAssassin 3.4.4 (2020-01-24) 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-List-Received-Date: Fri, 14 Jan 2022 18:52:05 -0000 On 1/14/22 11:53, Florian Weimer via Libc-alpha wrote: > This is required so that the checks still work if $(early-cflags) > selects a different ISA level. LGTM. No regressions on x86_64 and i686 builders. No CI/CD regressions. Reviewed-by: Carlos O'Donell Tested-by: Carlos O'Donell > --- > sysdeps/powerpc/powerpc64/le/dl-hwcap-check.h | 9 +++++---- > 1 file changed, 5 insertions(+), 4 deletions(-) > There are a number of files we *might* have to wrap... [carlos@athas glibc-pristine]$ grep -rl '_ARCH_PWR9' * ChangeLog.old/ChangeLog.23 sysdeps/powerpc/fpu/fenv_libc.h sysdeps/powerpc/fpu/math_private.h sysdeps/powerpc/powerpc64/le/fpu/multiarch/float128-ifunc-redirect-macros.h sysdeps/powerpc/powerpc64/le/fpu/e_sqrtf128.c sysdeps/powerpc/powerpc64/le/dl-hwcap-check.h sysdeps/powerpc/fpu_control.h [carlos@athas glibc-pristine]$ vi sysdeps/powerpc/powerpc64/le/dl-hwcap-check.h [carlos@athas glibc-pristine]$ grep -rl '_ARCH_PWR10' * sysdeps/powerpc/powerpc64/le/dl-hwcap-check.h [carlos@athas glibc-pristine]$ grep -rl '__FLOAT128_HARDWARE__' * sysdeps/powerpc/powerpc64/le/dl-hwcap-check.h [carlos@athas glibc-pristine]$ grep -rl '__PCREL__' * sysdeps/powerpc/powerpc64/le/dl-hwcap-check.h [carlos@athas glibc-pristine]$ grep -rl '__MMA__' * sysdeps/powerpc/powerpc64/le/dl-hwcaps-subdirs.c sysdeps/powerpc/powerpc64/le/dl-hwcap-check.h But the only one matters for early startup: dl-hwcap-check.h. > diff --git a/sysdeps/powerpc/powerpc64/le/dl-hwcap-check.h b/sysdeps/powerpc/powerpc64/le/dl-hwcap-check.h > index 713a7f0313..b43c182683 100644 > --- a/sysdeps/powerpc/powerpc64/le/dl-hwcap-check.h > +++ b/sysdeps/powerpc/powerpc64/le/dl-hwcap-check.h > @@ -19,17 +19,18 @@ > #ifndef _DL_HWCAP_CHECK_H > #define _DL_HWCAP_CHECK_H > > +#include OK. 5 macros need wrapping. > #include > > static inline void > dl_hwcap_check (void) > { > -#ifdef _ARCH_PWR9 > +#ifdef GCCMACRO_ARCH_PWR9 OK. 1/5. > if ((GLRO (dl_hwcap2) & PPC_FEATURE2_ARCH_3_00) == 0) > _dl_fatal_printf ("\ > Fatal glibc error: CPU lacks ISA 3.00 support (POWER9 or later required)\n"); > #endif > -#ifdef __FLOAT128_HARDWARE__ > +#ifdef GCCMACRO__FLOAT128_HARDWARE__ OK. 2/5. > if ((GLRO (dl_hwcap2) & PPC_FEATURE2_HAS_IEEE128) == 0) > _dl_fatal_printf ("\ > Fatal glibc error: CPU lacks float128 support (POWER 9 or later required)\n"); > @@ -37,12 +38,12 @@ Fatal glibc error: CPU lacks float128 support (POWER 9 or later required)\n"); > /* This check is not actually reached when building for POWER10 and > running on POWER9 because there are faulting PCREL instructions > before this point. */ > -#if defined _ARCH_PWR10 || defined __PCREL__ > +#if defined GCCMACRO_ARCH_PWR10 || defined GCCMACRO__PCREL__ OK. 3/5, 4/5. > if ((GLRO (dl_hwcap2) & PPC_FEATURE2_ARCH_3_1) == 0) > _dl_fatal_printf ("\ > Fatal glibc error: CPU lacks ISA 3.10 support (POWER10 or later required)\n"); > #endif > -#ifdef __MMA__ > +#ifdef GCCMACRO__MMA__ OK. 5/5. > if ((GLRO (dl_hwcap2) & PPC_FEATURE2_MMA) == 0) > _dl_fatal_printf ("\ > Fatal glibc error: CPU lacks MMA support (POWER10 or later required)\n"); -- Cheers, Carlos.