From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mx0b-001b2d01.pphosted.com (mx0b-001b2d01.pphosted.com [148.163.158.5]) by sourceware.org (Postfix) with ESMTPS id 189433858413 for ; Fri, 14 Apr 2023 13:25:41 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.2 sourceware.org 189433858413 Authentication-Results: sourceware.org; dmarc=none (p=none dis=none) header.from=linux.ibm.com Authentication-Results: sourceware.org; spf=pass smtp.mailfrom=linux.ibm.com Received: from pps.filterd (m0098421.ppops.net [127.0.0.1]) by mx0a-001b2d01.pphosted.com (8.17.1.19/8.17.1.19) with ESMTP id 33ECnKV9017510 for ; Fri, 14 Apr 2023 13:25:40 GMT DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=ibm.com; h=message-id : date : subject : to : references : from : in-reply-to : content-type : content-transfer-encoding : mime-version; s=pp1; bh=qJNgxpWLYA0sG/KB5I/GtTNxkSZUuitb0WxLWHwcrsg=; b=OGFgklX32dwNUIU3C2bACBDZq4iLqnRiQpqnqORvXC4+bPswNK+STedprHIwFXU6razq +6xXunxNs8VVI+MBOJUUuZSvl1ADExVenOUyT9zjCOQXBPyPiRPUBvhLW5BQzEtPYRwr SR7G8Q3V2AiPulojNmWqHH15AFXrvUtd7oTdSGfDfNp2qaBfUZLbMZUCPXzBOwFq8ysr XJgExf4NEO/JtM5SGgfk11Ioyl4N4gRxgn1ELQ+1XdZgYUA6LLn77bmx0uLwW3RDpMqS xZkBFj3QW0V3cNVP2wfJYZFojL6bzW7T0afS46w92HAtCb/OXxHt0IoWQfaMuwuCZ2hN Jw== Received: from ppma01dal.us.ibm.com (83.d6.3fa9.ip4.static.sl-reverse.com [169.63.214.131]) by mx0a-001b2d01.pphosted.com (PPS) with ESMTPS id 3py761sbyy-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=NOT) for ; Fri, 14 Apr 2023 13:25:40 +0000 Received: from pps.filterd (ppma01dal.us.ibm.com [127.0.0.1]) by ppma01dal.us.ibm.com (8.17.1.19/8.17.1.19) with ESMTP id 33EAFGkK027951 for ; Fri, 14 Apr 2023 13:25:39 GMT Received: from smtprelay02.dal12v.mail.ibm.com ([9.208.130.97]) by ppma01dal.us.ibm.com (PPS) with ESMTPS id 3pu0jjs2au-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=NOT) for ; Fri, 14 Apr 2023 13:25:39 +0000 Received: from smtpav03.dal12v.mail.ibm.com (smtpav03.dal12v.mail.ibm.com [10.241.53.102]) by smtprelay02.dal12v.mail.ibm.com (8.14.9/8.14.9/NCO v10.0) with ESMTP id 33EDPcUG11469328 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-GCM-SHA384 bits=256 verify=OK) for ; Fri, 14 Apr 2023 13:25:38 GMT Received: from smtpav03.dal12v.mail.ibm.com (unknown [127.0.0.1]) by IMSVA (Postfix) with ESMTP id A0B7358061 for ; Fri, 14 Apr 2023 13:25:38 +0000 (GMT) Received: from smtpav03.dal12v.mail.ibm.com (unknown [127.0.0.1]) by IMSVA (Postfix) with ESMTP id F1DF75803F for ; Fri, 14 Apr 2023 13:25:37 +0000 (GMT) Received: from [9.43.4.220] (unknown [9.43.4.220]) by smtpav03.dal12v.mail.ibm.com (Postfix) with ESMTP for ; Fri, 14 Apr 2023 13:25:37 +0000 (GMT) Message-ID: <28851b2e-b581-22c4-b87d-29361d786017@linux.ibm.com> Date: Fri, 14 Apr 2023 18:55:36 +0530 User-Agent: Mozilla/5.0 (Macintosh; Intel Mac OS X 10.15; rv:102.0) Gecko/20100101 Thunderbird/102.7.2 Subject: Re: [PATCH] Added Redirects to longdouble error functions [BZ #29033] To: libc-alpha@sourceware.org References: <20230413174838.2096002-1-smonga@linux.ibm.com> From: Sachin Monga In-Reply-To: <20230413174838.2096002-1-smonga@linux.ibm.com> Content-Type: text/plain; charset=UTF-8; format=flowed X-TM-AS-GCONF: 00 X-Proofpoint-ORIG-GUID: j8vKa-UfYKrn8_5eqra2Ie1RQILZ2ZMN X-Proofpoint-GUID: j8vKa-UfYKrn8_5eqra2Ie1RQILZ2ZMN Content-Transfer-Encoding: 7bit X-Proofpoint-UnRewURL: 0 URL was un-rewritten MIME-Version: 1.0 X-Proofpoint-Virus-Version: vendor=baseguard engine=ICAP:2.0.254,Aquarius:18.0.942,Hydra:6.0.573,FMLib:17.11.170.22 definitions=2023-04-14_06,2023-04-14_01,2023-02-09_01 X-Proofpoint-Spam-Details: rule=outbound_notspam policy=outbound score=0 bulkscore=0 impostorscore=0 mlxscore=0 mlxlogscore=999 suspectscore=0 adultscore=0 clxscore=1015 priorityscore=1501 malwarescore=0 spamscore=0 phishscore=0 lowpriorityscore=0 classifier=spam adjust=0 reason=mlx scancount=1 engine=8.12.0-2303200000 definitions=main-2304140118 X-Spam-Status: No, score=-14.9 required=5.0 tests=BAYES_00,DKIM_SIGNED,DKIM_VALID,DKIM_VALID_EF,GIT_PATCH_0,KAM_SHORT,NICE_REPLY_A,RCVD_IN_MSPIKE_H2,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 List-Id: I am working on the updated patch as I can see that CI is failing with this patch. On 13/04/23 11:18 pm, Sachin Monga wrote: > This patch redirects the error functions to the appropriate > longdouble variants which enables the compiler to optimize > for the abi ieeelongdouble. > > Signed-off-by: Sachin Monga > --- > misc/Makefile | 2 +- > misc/bits/error-ldbl.h | 45 ++++++++++ > misc/sys/cdefs.h | 3 +- > misc/tst-ldbl-errorfptr.c | 91 +++++++++++++++++++++ > sysdeps/ieee754/ldbl-128ibm-compat/Makefile | 2 + > sysdeps/ieee754/ldbl-opt/Makefile | 4 + > 6 files changed, 145 insertions(+), 2 deletions(-) > create mode 100644 misc/tst-ldbl-errorfptr.c > > diff --git a/misc/Makefile b/misc/Makefile > index 1a09f777fa..9f42321206 100644 > --- a/misc/Makefile > +++ b/misc/Makefile > @@ -90,7 +90,7 @@ tests := tst-dirname tst-tsearch tst-fdset tst-mntent tst-hsearch \ > tst-preadvwritev2 tst-preadvwritev64v2 tst-warn-wide \ > tst-ldbl-warn tst-ldbl-error tst-dbl-efgcvt tst-ldbl-efgcvt \ > tst-mntent-autofs tst-syscalls tst-mntent-escape tst-select \ > - tst-ioctl > + tst-ioctl tst-ldbl-errorfptr > > tests-time64 := \ > tst-select-time64 \ > diff --git a/misc/bits/error-ldbl.h b/misc/bits/error-ldbl.h > index 599a7d6e06..bbc4956f68 100644 > --- a/misc/bits/error-ldbl.h > +++ b/misc/bits/error-ldbl.h > @@ -20,5 +20,50 @@ > # error "Never include directly; use instead." > #endif > > +#if defined __extern_always_inline && defined __va_arg_pack > +extern void __REDIRECT_LDBL (__error_alias, (int __status, int __errnum, > + const char *__format, ...), error) > + __attribute__ ((__format__ (__printf__, 3, 4))); > +extern void __REDIRECT_LDBL (__error_noreturn, (int __status, int __errnum, > + const char *__format, ...), error) > + __attribute__ ((__noreturn__, __format__ (__printf__, 3, 4))); > + > + > +/* If we know the function will never return make sure the compiler > + realizes that, too. */ > +__extern_always_inline void > +error (int __status, int __errnum, const char *__format, ...) > +{ > + if (__builtin_constant_p (__status) && __status != 0) > + __error_noreturn (__status, __errnum, __format, __va_arg_pack ()); > + else > + __error_alias (__status, __errnum, __format, __va_arg_pack ()); > +} > + > + > +extern void __REDIRECT_LDBL (__error_at_line_alias, (int __status, int __errnum, > + const char *__fname, unsigned int __line, > + const char *__format, ...), error_at_line) > + __attribute__ ((__format__ (__printf__, 5, 6))); > +extern void __REDIRECT_LDBL (__error_at_line_noreturn, (int __status, int __errnum, > + const char *__fname, unsigned int __line, > + const char *__format, ...), error_at_line) > + __attribute__ ((__noreturn__, __format__ (__printf__, 5, 6))); > + > + > +/* If we know the function will never return make sure the compiler > + realizes that, too. */ > +__extern_always_inline void > +error_at_line (int __status, int __errnum, const char *__fname, > + unsigned int __line, const char *__format, ...) > +{ > + if (__builtin_constant_p (__status) && __status != 0) > + __error_at_line_noreturn (__status, __errnum, __fname, __line, __format, > + __va_arg_pack ()); > + else > + __error_at_line_alias (__status, __errnum, __fname, __line, > + __format, __va_arg_pack ()); > +} > +#endif > __LDBL_REDIR_DECL (error) > __LDBL_REDIR_DECL (error_at_line) > diff --git a/misc/sys/cdefs.h b/misc/sys/cdefs.h > index 23ec0ebd2a..285191482a 100644 > --- a/misc/sys/cdefs.h > +++ b/misc/sys/cdefs.h > @@ -569,6 +569,8 @@ > # define __LDBL_REDIR(name, proto) ... unused__ldbl_redir > # define __LDBL_REDIR_DECL(name) \ > extern __typeof (name) name __asm (__ASMNAME ("__" #name "ieee128")); > +# define __REDIRECT_LDBL(name, proto, alias) \ > + name proto __asm (__ASMNAME ("__" #alias "ieee128")) > > /* Alias name defined automatically, with leading underscores. */ > # define __LDBL_REDIR2_DECL(name) \ > @@ -586,7 +588,6 @@ > __LDBL_REDIR1_NTH (name, proto, __##alias##ieee128) > > /* Unused. */ > -# define __REDIRECT_LDBL(name, proto, alias) ... unused__redirect_ldbl > # define __LDBL_REDIR_NTH(name, proto) ... unused__ldbl_redir_nth > > # else > diff --git a/misc/tst-ldbl-errorfptr.c b/misc/tst-ldbl-errorfptr.c > new file mode 100644 > index 0000000000..67b50c687f > --- /dev/null > +++ b/misc/tst-ldbl-errorfptr.c > @@ -0,0 +1,91 @@ > +/* Test for the long double redirections in error* functions > + when they are returned as function pointer BZ #29033. > + Copyright (C) 2023 Free Software Foundation, Inc. > + This file is part of the GNU C Library. > + > + The GNU C Library is free software; you can redistribute it and/or > + modify it under the terms of the GNU Lesser General Public > + License as published by the Free Software Foundation; either > + version 2.1 of the License, or (at your option) any later version. > + > + The GNU C Library is distributed in the hope that it will be useful, > + but WITHOUT ANY WARRANTY; without even the implied warranty of > + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU > + Lesser General Public License for more details. > + > + You should have received a copy of the GNU Lesser General Public > + License along with the GNU C Library; if not, see > + . */ > + > +#include > +#include > +#include > +#include > +#include > +#include > +#include > +#include > + > +#include > +#include > +#include > + > +#define NLDBL_SYMBOL2(alias) __ASMNAME (#alias) > +#define NLDBL_SYMBOL(alias) NLDBL_SYMBOL2 (__nldbl_##alias) > +#define IEEE_LONG_DOUBLE(alias) __ASMNAME ("__" #alias "ieee128") > +#define NO_LONG_DOUBLE(alias) NLDBL_SYMBOL (alias) > + > +typedef void (*error_func_t) (int, int, const char*, ...); > +typedef void (*error_at_line_func_t) (int, int, const char*, > + unsigned int, const char*, ...); > + > +error_func_t > +__attribute__ ((noinline)) > +get_error_func (void) { > + return &error; > +} > + > +error_at_line_func_t > +__attribute__ ((noinline)) > +get_error_at_line_func (void) { > + return &error_at_line; > +} > + > +static int > +do_test (void) > +{ > + /* Prepare the symbol names as per long double standards */ > + char *error_sym = NULL; > + char *error_sym_at_line = NULL; > +#if __LDOUBLE_REDIRECTS_TO_FLOAT128_ABI == 1 > + error_sym = (char *) IEEE_LONG_DOUBLE(error); > + error_sym_at_line = (char *) IEEE_LONG_DOUBLE(error_at_line); > +#elif defined __LONG_DOUBLE_MATH_OPTIONAL && defined __NO_LONG_DOUBLE_MATH > + error_sym = (char *) NO_LONG_DOUBLE(error); > + error_sym_at_line = (char *) NO_LONG_DOUBLE(error_at_line); > +#else > + FAIL_EXIT1 ("test case error"); > +#endif > + TEST_VERIFY (error_sym != NULL && error_sym_at_line != NULL); > + /* Map the function pointers to appropriate redirected error symbols */ > + error_func_t fp; > + fp = get_error_func (); > + if (fp != xdlsym (RTLD_DEFAULT, error_sym)) > + { > + printf ("FAIL: fp=%p error_sym=%p\n", fp, error_sym); > + return 1; > + } > + > + error_at_line_func_t fpat; > + fpat = get_error_at_line_func (); > + if (fpat != xdlsym (RTLD_DEFAULT, error_sym_at_line)) > + { > + printf ("FAIL: fpat=%p error_sym_at_line=%p\n", > + fpat, error_sym_at_line); > + return 1; > + } > + > + return 0; > +} > + > +#include > diff --git a/sysdeps/ieee754/ldbl-128ibm-compat/Makefile b/sysdeps/ieee754/ldbl-128ibm-compat/Makefile > index d4ec41bf99..42cca25a09 100644 > --- a/sysdeps/ieee754/ldbl-128ibm-compat/Makefile > +++ b/sysdeps/ieee754/ldbl-128ibm-compat/Makefile > @@ -264,6 +264,7 @@ CFLAGS-ieee128-qefgcvt_r.c += -mabi=ieeelongdouble -Wno-psabi -mno-gnu-attribute > tests-internal += tst-ibm128-warn tst-ieee128-warn > tests-internal += tst-ibm128-error tst-ieee128-error > tests-internal += tst-ibm128-efgcvt tst-ieee128-efgcvt > +tests-internal += tst-ieee128-errorfptr > > $(objpfx)tst-ibm128-%.c: tst-ldbl-%.c > cp $< $@ > @@ -278,6 +279,7 @@ CFLAGS-tst-ibm128-efgcvt.c += -mabi=ibmlongdouble -Wno-psabi > CFLAGS-tst-ieee128-warn.c += -mfloat128 -mabi=ieeelongdouble -Wno-psabi > CFLAGS-tst-ieee128-error.c += -mfloat128 -mabi=ieeelongdouble -Wno-psabi > CFLAGS-tst-ieee128-efgcvt.c += -mfloat128 -mabi=ieeelongdouble -Wno-psabi > +CFLAGS-tst-ieee128-errorfptr.c += -mfloat128 -mabi=ieeelongdouble -Wno-psabi > > tests-container += test-syslog-ieee128 test-syslog-ibm128 > CFLAGS-test-syslog-ieee128.c += -mfloat128 -mabi=ieeelongdouble -Wno-psabi > diff --git a/sysdeps/ieee754/ldbl-opt/Makefile b/sysdeps/ieee754/ldbl-opt/Makefile > index 5b72474aa4..22e778ad0e 100644 > --- a/sysdeps/ieee754/ldbl-opt/Makefile > +++ b/sysdeps/ieee754/ldbl-opt/Makefile > @@ -215,6 +215,7 @@ endif > ifeq ($(subdir), misc) > tests-internal += tst-nldbl-warn > tests-internal += tst-nldbl-error > +tests-internal += tst-nldbl-errorfptr > > $(objpfx)tst-nldbl-warn.c: tst-ldbl-warn.c > cp $< $@ > @@ -222,8 +223,11 @@ $(objpfx)tst-nldbl-warn.c: tst-ldbl-warn.c > $(objpfx)tst-nldbl-error.c: tst-ldbl-error.c > cp $< $@ > > +$(objpfx)tst-nldbl-errorfptr.c: tst-ldbl-errorfptr.c > + cp $< $@ > CFLAGS-tst-nldbl-warn.c += -mlong-double-64 > CFLAGS-tst-nldbl-error.c += -mlong-double-64 > +CFLAGS-tst-nldbl-errorfptr.c += -mlong-double-64 > endif > > ifeq ($(subdir), stdio-common)