From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mx0a-001b2d01.pphosted.com (mx0a-001b2d01.pphosted.com [148.163.156.1]) by sourceware.org (Postfix) with ESMTPS id 428D2396902B for ; Tue, 4 May 2021 17:48:11 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.3.2 sourceware.org 428D2396902B Received: from pps.filterd (m0098410.ppops.net [127.0.0.1]) by mx0a-001b2d01.pphosted.com (8.16.0.43/8.16.0.43) with SMTP id 144HYPPg099927 for ; Tue, 4 May 2021 13:48:10 -0400 Received: from ppma01dal.us.ibm.com (83.d6.3fa9.ip4.static.sl-reverse.com [169.63.214.131]) by mx0a-001b2d01.pphosted.com with ESMTP id 38bag2gyh1-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=NOT) for ; Tue, 04 May 2021 13:48:10 -0400 Received: from pps.filterd (ppma01dal.us.ibm.com [127.0.0.1]) by ppma01dal.us.ibm.com (8.16.0.43/8.16.0.43) with SMTP id 144HgDeO004219 for ; Tue, 4 May 2021 17:48:09 GMT Received: from b01cxnp22034.gho.pok.ibm.com (b01cxnp22034.gho.pok.ibm.com [9.57.198.24]) by ppma01dal.us.ibm.com with ESMTP id 388xm9msrv-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=NOT) for ; Tue, 04 May 2021 17:48:09 +0000 Received: from b01ledav005.gho.pok.ibm.com (b01ledav005.gho.pok.ibm.com [9.57.199.110]) by b01cxnp22034.gho.pok.ibm.com (8.14.9/8.14.9/NCO v10.0) with ESMTP id 144Hm8NU9240940 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-GCM-SHA384 bits=256 verify=OK); Tue, 4 May 2021 17:48:08 GMT Received: from b01ledav005.gho.pok.ibm.com (unknown [127.0.0.1]) by IMSVA (Postfix) with ESMTP id 8E4A8AE05F; Tue, 4 May 2021 17:48:08 +0000 (GMT) Received: from b01ledav005.gho.pok.ibm.com (unknown [127.0.0.1]) by IMSVA (Postfix) with ESMTP id C133DAE05C; Tue, 4 May 2021 17:48:07 +0000 (GMT) Received: from [9.65.221.78] (unknown [9.65.221.78]) by b01ledav005.gho.pok.ibm.com (Postfix) with ESMTP; Tue, 4 May 2021 17:48:07 +0000 (GMT) Subject: Re: [PATCH] powerpc64le: Fix ifunc selection for memset, memmove, bzero and bcopy To: libc-alpha@sourceware.org, Raoni Fassina Firmino References: <20210503195935.je5jbi6hjbiiaovs@work-tp> From: Raphael M Zinsly Message-ID: <08714fd3-695c-5c54-6d57-5747a1ac3a9c@linux.ibm.com> Date: Tue, 4 May 2021 14:48:06 -0300 User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:78.0) Gecko/20100101 Thunderbird/78.5.0 MIME-Version: 1.0 In-Reply-To: <20210503195935.je5jbi6hjbiiaovs@work-tp> Content-Type: text/plain; charset=utf-8; format=flowed Content-Language: en-US Content-Transfer-Encoding: 7bit X-TM-AS-GCONF: 00 X-Proofpoint-ORIG-GUID: 2sn37FBahvfiEH7uRF4HqGyfHXFQ-1fB X-Proofpoint-GUID: 2sn37FBahvfiEH7uRF4HqGyfHXFQ-1fB X-Proofpoint-Virus-Version: vendor=fsecure engine=2.50.10434:6.0.391, 18.0.761 definitions=2021-05-04_12:2021-05-04, 2021-05-04 signatures=0 X-Proofpoint-Spam-Details: rule=outbound_notspam policy=outbound score=0 mlxscore=0 clxscore=1015 bulkscore=0 phishscore=0 priorityscore=1501 malwarescore=0 impostorscore=0 lowpriorityscore=0 suspectscore=0 mlxlogscore=999 adultscore=0 spamscore=0 classifier=spam adjust=0 reason=mlx scancount=1 engine=8.12.0-2104060000 definitions=main-2105040118 X-Spam-Status: No, score=-12.9 required=5.0 tests=BAYES_00, DKIM_SIGNED, DKIM_VALID, DKIM_VALID_EF, GIT_PATCH_0, NICE_REPLY_A, RCVD_IN_DNSWL_LOW, RCVD_IN_MSPIKE_H2, 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-List-Received-Date: Tue, 04 May 2021 17:48:13 -0000 The patch LGTM but I think it would improve readbility if you use more parentheses in the multiarch files e.g.: (hwcap2 & PPC_FEATURE2_ARCH_3_1) && (hwcap2 & PPC_FEATURE2_HAS_ISEL) && (hwcap & PPC_FEATURE_HAS_VSX) ? __bcopy_power10 : On 03/05/2021 16:59, Raoni Fassina Firmino via Libc-alpha wrote: > The hwcap2 check for the aforementioned functions should check for > both PPC_FEATURE2_ARCH_3_1 and PPC_FEATURE2_HAS_ISEL but was > mistakenly checking for any one of them, enabling isa 3.1 version of > the functions in incompatible processors, like POWER8. > --- > sysdeps/powerpc/powerpc64/multiarch/bcopy.c | 8 ++++---- > sysdeps/powerpc/powerpc64/multiarch/bzero.c | 3 ++- > .../powerpc64/multiarch/ifunc-impl-list.c | 20 +++++++++---------- > sysdeps/powerpc/powerpc64/multiarch/memmove.c | 8 ++++---- > sysdeps/powerpc/powerpc64/multiarch/memset.c | 3 ++- > 5 files changed, 22 insertions(+), 20 deletions(-) > > diff --git a/sysdeps/powerpc/powerpc64/multiarch/bcopy.c b/sysdeps/powerpc/powerpc64/multiarch/bcopy.c > index 2840b17fdfd3..02eb1e6a9f66 100644 > --- a/sysdeps/powerpc/powerpc64/multiarch/bcopy.c > +++ b/sysdeps/powerpc/powerpc64/multiarch/bcopy.c > @@ -28,10 +28,10 @@ extern __typeof (bcopy) __bcopy_power10 attribute_hidden; > > libc_ifunc (bcopy, > #ifdef __LITTLE_ENDIAN__ > - hwcap2 & (PPC_FEATURE2_ARCH_3_1 | > - PPC_FEATURE2_HAS_ISEL) > - && (hwcap & PPC_FEATURE_HAS_VSX) > - ? __bcopy_power10 : > + (hwcap2 & PPC_FEATURE2_ARCH_3_1 > + && hwcap2 & PPC_FEATURE2_HAS_ISEL > + && hwcap & PPC_FEATURE_HAS_VSX) > + ? __bcopy_power10 : > #endif > (hwcap & PPC_FEATURE_HAS_VSX) > ? __bcopy_power7 > diff --git a/sysdeps/powerpc/powerpc64/multiarch/bzero.c b/sysdeps/powerpc/powerpc64/multiarch/bzero.c > index 50a5320c6650..660d7dc686ec 100644 > --- a/sysdeps/powerpc/powerpc64/multiarch/bzero.c > +++ b/sysdeps/powerpc/powerpc64/multiarch/bzero.c > @@ -33,7 +33,8 @@ extern __typeof (bzero) __bzero_power10 attribute_hidden; > > libc_ifunc (__bzero, > # ifdef __LITTLE_ENDIAN__ > - (hwcap2 & (PPC_FEATURE2_ARCH_3_1 | PPC_FEATURE2_HAS_ISEL) > + (hwcap2 & PPC_FEATURE2_ARCH_3_1 > + && hwcap2 & PPC_FEATURE2_HAS_ISEL > && hwcap & PPC_FEATURE_HAS_VSX) > ? __bzero_power10 : > # endif > diff --git a/sysdeps/powerpc/powerpc64/multiarch/ifunc-impl-list.c b/sysdeps/powerpc/powerpc64/multiarch/ifunc-impl-list.c > index 49d9a33e65fe..b123c6a3d328 100644 > --- a/sysdeps/powerpc/powerpc64/multiarch/ifunc-impl-list.c > +++ b/sysdeps/powerpc/powerpc64/multiarch/ifunc-impl-list.c > @@ -75,9 +75,9 @@ __libc_ifunc_impl_list (const char *name, struct libc_ifunc_impl *array, > IFUNC_IMPL (i, name, memmove, > #ifdef __LITTLE_ENDIAN__ > IFUNC_IMPL_ADD (array, i, memmove, > - hwcap2 & (PPC_FEATURE2_ARCH_3_1 | > - PPC_FEATURE2_HAS_ISEL) > - && (hwcap & PPC_FEATURE_HAS_VSX), > + hwcap2 & PPC_FEATURE2_ARCH_3_1 > + && hwcap2 & PPC_FEATURE2_HAS_ISEL > + && hwcap & PPC_FEATURE_HAS_VSX, > __memmove_power10) > #endif > IFUNC_IMPL_ADD (array, i, memmove, hwcap & PPC_FEATURE_HAS_VSX, > @@ -88,8 +88,8 @@ __libc_ifunc_impl_list (const char *name, struct libc_ifunc_impl *array, > IFUNC_IMPL (i, name, memset, > #ifdef __LITTLE_ENDIAN__ > IFUNC_IMPL_ADD (array, i, memset, > - hwcap2 & (PPC_FEATURE2_ARCH_3_1 | > - PPC_FEATURE2_HAS_ISEL) > + hwcap2 & PPC_FEATURE2_ARCH_3_1 > + && hwcap2 & PPC_FEATURE2_HAS_ISEL > && hwcap & PPC_FEATURE_HAS_VSX, > __memset_power10) > #endif > @@ -196,8 +196,8 @@ __libc_ifunc_impl_list (const char *name, struct libc_ifunc_impl *array, > IFUNC_IMPL (i, name, bzero, > #ifdef __LITTLE_ENDIAN__ > IFUNC_IMPL_ADD (array, i, bzero, > - hwcap2 & (PPC_FEATURE2_ARCH_3_1 | > - PPC_FEATURE2_HAS_ISEL) > + hwcap2 & PPC_FEATURE2_ARCH_3_1 > + && hwcap2 & PPC_FEATURE2_HAS_ISEL > && hwcap & PPC_FEATURE_HAS_VSX, > __bzero_power10) > #endif > @@ -215,9 +215,9 @@ __libc_ifunc_impl_list (const char *name, struct libc_ifunc_impl *array, > IFUNC_IMPL (i, name, bcopy, > #ifdef __LITTLE_ENDIAN__ > IFUNC_IMPL_ADD (array, i, bcopy, > - hwcap2 & (PPC_FEATURE2_ARCH_3_1 | > - PPC_FEATURE2_HAS_ISEL) > - && (hwcap & PPC_FEATURE_HAS_VSX), > + hwcap2 & PPC_FEATURE2_ARCH_3_1 > + && hwcap2 & PPC_FEATURE2_HAS_ISEL > + && hwcap & PPC_FEATURE_HAS_VSX, > __bcopy_power10) > #endif > IFUNC_IMPL_ADD (array, i, bcopy, hwcap & PPC_FEATURE_HAS_VSX, > diff --git a/sysdeps/powerpc/powerpc64/multiarch/memmove.c b/sysdeps/powerpc/powerpc64/multiarch/memmove.c > index 420c2f279af3..637b2cbf7f35 100644 > --- a/sysdeps/powerpc/powerpc64/multiarch/memmove.c > +++ b/sysdeps/powerpc/powerpc64/multiarch/memmove.c > @@ -36,10 +36,10 @@ extern __typeof (__redirect_memmove) __memmove_power10 attribute_hidden; > > libc_ifunc (__libc_memmove, > #ifdef __LITTLE_ENDIAN__ > - hwcap2 & (PPC_FEATURE2_ARCH_3_1 | > - PPC_FEATURE2_HAS_ISEL) > - && (hwcap & PPC_FEATURE_HAS_VSX) > - ? __memmove_power10 : > + (hwcap2 & PPC_FEATURE2_ARCH_3_1 > + && hwcap2 & PPC_FEATURE2_HAS_ISEL > + && hwcap & PPC_FEATURE_HAS_VSX) > + ? __memmove_power10 : > #endif > (hwcap & PPC_FEATURE_HAS_VSX) > ? __memmove_power7 > diff --git a/sysdeps/powerpc/powerpc64/multiarch/memset.c b/sysdeps/powerpc/powerpc64/multiarch/memset.c > index 6562646dffcf..5994bf02e622 100644 > --- a/sysdeps/powerpc/powerpc64/multiarch/memset.c > +++ b/sysdeps/powerpc/powerpc64/multiarch/memset.c > @@ -41,7 +41,8 @@ extern __typeof (__redirect_memset) __memset_power10 attribute_hidden; > ifunc symbol properly. */ > libc_ifunc (__libc_memset, > # ifdef __LITTLE_ENDIAN__ > - (hwcap2 & (PPC_FEATURE2_ARCH_3_1 | PPC_FEATURE2_HAS_ISEL) > + (hwcap2 & PPC_FEATURE2_ARCH_3_1 > + && hwcap2 & PPC_FEATURE2_HAS_ISEL > && hwcap & PPC_FEATURE_HAS_VSX) > ? __memset_power10 : > # endif > -- Raphael Moreira Zinsly