From patchwork Sat Mar 4 17:45:41 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Sachin Monga X-Patchwork-Id: 66010 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 AE6733858C33 for ; Sat, 4 Mar 2023 17:46:15 +0000 (GMT) DKIM-Filter: OpenDKIM Filter v2.11.0 sourceware.org AE6733858C33 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=sourceware.org; s=default; t=1677951975; bh=fcnd9D1/mEgY2AjWueIT7Vv2ELgIQcLKjEekA3GE8Y0=; h=To:Cc:Subject:Date:List-Id:List-Unsubscribe:List-Archive: List-Post:List-Help:List-Subscribe:From:Reply-To:From; b=LmwA8qykEHip9ZcPnVCeA/e4UTSQlPHIvXqW7fhWSVel8z+tVFirArxD3kA2pQelK D6Prjpmpdpm31ldUzhi5WndKb+yYhHHjvXykHijNfrqAE3G+YqPQCy/fJcaH8jSbZL U9/Hnlq3TRi3GDkvYtzBSVwCg+2+XZoNF+SmGWsQ= X-Original-To: libc-alpha@sourceware.org Delivered-To: libc-alpha@sourceware.org Received: from mx0b-001b2d01.pphosted.com (mx0b-001b2d01.pphosted.com [148.163.158.5]) by sourceware.org (Postfix) with ESMTPS id 8786B3858D28 for ; Sat, 4 Mar 2023 17:45:52 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.2 sourceware.org 8786B3858D28 Received: from pps.filterd (m0098417.ppops.net [127.0.0.1]) by mx0a-001b2d01.pphosted.com (8.17.1.19/8.17.1.19) with ESMTP id 324HNrSE012924 for ; Sat, 4 Mar 2023 17:45:52 GMT Received: from ppma04ams.nl.ibm.com (63.31.33a9.ip4.static.sl-reverse.com [169.51.49.99]) by mx0a-001b2d01.pphosted.com (PPS) with ESMTPS id 3p4abnr8vf-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=NOT) for ; Sat, 04 Mar 2023 17:45:51 +0000 Received: from pps.filterd (ppma04ams.nl.ibm.com [127.0.0.1]) by ppma04ams.nl.ibm.com (8.17.1.19/8.17.1.19) with ESMTP id 32479ic0005750 for ; Sat, 4 Mar 2023 17:45:50 GMT Received: from smtprelay01.fra02v.mail.ibm.com ([9.218.2.227]) by ppma04ams.nl.ibm.com (PPS) with ESMTPS id 3p41br8gtk-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=NOT) for ; Sat, 04 Mar 2023 17:45:49 +0000 Received: from smtpav03.fra02v.mail.ibm.com (smtpav03.fra02v.mail.ibm.com [10.20.54.102]) by smtprelay01.fra02v.mail.ibm.com (8.14.9/8.14.9/NCO v10.0) with ESMTP id 324HjkwU54526282 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-GCM-SHA384 bits=256 verify=OK); Sat, 4 Mar 2023 17:45:46 GMT Received: from smtpav03.fra02v.mail.ibm.com (unknown [127.0.0.1]) by IMSVA (Postfix) with ESMTP id 9065920043; Sat, 4 Mar 2023 17:45:46 +0000 (GMT) Received: from smtpav03.fra02v.mail.ibm.com (unknown [127.0.0.1]) by IMSVA (Postfix) with ESMTP id 0243A20040; Sat, 4 Mar 2023 17:45:46 +0000 (GMT) Received: from ltcd97-lp3.. (unknown [9.40.194.171]) by smtpav03.fra02v.mail.ibm.com (Postfix) with ESMTP; Sat, 4 Mar 2023 17:45:45 +0000 (GMT) To: libc-alpha@sourceware.org Cc: Sachin Monga Subject: [PATCH] Added Redirects to longdouble error functions [BZ #29033] Date: Sat, 4 Mar 2023 12:45:41 -0500 Message-Id: <20230304174541.403411-1-smonga@linux.ibm.com> X-Mailer: git-send-email 2.37.2 X-TM-AS-GCONF: 00 X-Proofpoint-GUID: cgIBQO-6QAJW0d5Nav_Dq_YarD6l08Fi X-Proofpoint-ORIG-GUID: cgIBQO-6QAJW0d5Nav_Dq_YarD6l08Fi X-Proofpoint-UnRewURL: 0 URL was un-rewritten MIME-Version: 1.0 X-Proofpoint-Virus-Version: vendor=baseguard engine=ICAP:2.0.219,Aquarius:18.0.942,Hydra:6.0.573,FMLib:17.11.170.22 definitions=2023-03-04_06,2023-03-03_01,2023-02-09_01 X-Proofpoint-Spam-Details: rule=outbound_notspam policy=outbound score=0 mlxlogscore=999 clxscore=1011 malwarescore=0 lowpriorityscore=0 adultscore=0 priorityscore=1501 bulkscore=0 phishscore=0 mlxscore=0 spamscore=0 impostorscore=0 suspectscore=0 classifier=spam adjust=0 reason=mlx scancount=1 engine=8.12.0-2212070000 definitions=main-2303040150 X-Spam-Status: No, score=-11.8 required=5.0 tests=BAYES_00, DKIM_SIGNED, DKIM_VALID, DKIM_VALID_EF, GIT_PATCH_0, KAM_SHORT, RCVD_IN_MSPIKE_H2, SPF_HELO_NONE, SPF_PASS, TXREP autolearn=ham autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) 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: Sachin Monga via Libc-alpha From: Sachin Monga Reply-To: Sachin Monga Errors-To: libc-alpha-bounces+patchwork=sourceware.org@sourceware.org Sender: "Libc-alpha" 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 | 53 ++++++++- misc/sys/cdefs.h | 3 +- misc/tst-ldbl-errorfptr.c | 114 ++++++++++++++++++++ sysdeps/ieee754/ldbl-128ibm-compat/Makefile | 3 + sysdeps/ieee754/ldbl-opt/Makefile | 5 + 6 files changed, 176 insertions(+), 4 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..638e030c96 100644 --- a/misc/bits/error-ldbl.h +++ b/misc/bits/error-ldbl.h @@ -20,5 +20,54 @@ # error "Never include directly; use instead." #endif -__LDBL_REDIR_DECL (error) -__LDBL_REDIR_DECL (error_at_line) + +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 ()); +} 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..4896694fb9 --- /dev/null +++ b/misc/tst-ldbl-errorfptr.c @@ -0,0 +1,114 @@ +/* Test for the long double conversions in error* functions + when they are returned as function pointer. + Copyright (C) 2018-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 + +struct tests +{ + void *callback; + const char *expected; +}; + +va_list args; + +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 +get_error_func(void) { + return &error; +} + +error_at_line_func_t +get_error_at_line_func(void) { + return &error_at_line; +} + +static void +callback_error (void *closure) +{ + errno = 0; + error_func_t fp; + fp = get_error_func(); + fp (0, 0, "%Lf", (long double) -1); +} + +static void +callback_error_at_line (void *closure) +{ + errno = 0; + error_at_line_func_t fpat; + fpat = get_error_at_line_func(); + fpat (0, 0, "", 0, "%Lf", (long double) -1); +} + +static void +do_one_test (void *callback, const char *expected, ...) +{ + struct support_capture_subprocess result; + + va_start (args, expected); + + /* Call 'callback', which fills in the output and error buffers. */ + result = support_capture_subprocess (callback, NULL); + + /* Filter out the name of the program (which should always end with + -errorfptr), so that the test case can be reused by ldbl-opt and + ldbl-128ibm-compat. */ + const char *needle = "-errorfptr:"; + char *message; + message = strstr (result.err.buffer, needle); + printf("\nresult.err.buffer=%s",result.err.buffer); + if (message == NULL) + FAIL_EXIT1 ("test case error"); + message += strlen (needle); + + /* Verify that the output message is as expected. */ + TEST_COMPARE_STRING (message, expected); + + va_end (args); +} + +static int +do_test (void) +{ + /* Test if error and error_at_line are returned as function pointers + * to the callback functions (BZ #29033). */ + struct tests tests[] = { + { &callback_error, " -1.000000\n" }, + { &callback_error_at_line, ":0: -1.000000\n" } + }; + + for (int i = 0; i < sizeof (tests) / sizeof (tests[0]); i++) + { + do_one_test (tests[i].callback, tests[i].expected, (long double) -1); + } + + return 0; +} + +#include diff --git a/sysdeps/ieee754/ldbl-128ibm-compat/Makefile b/sysdeps/ieee754/ldbl-128ibm-compat/Makefile index 67d476383a..6aa73d2798 100644 --- a/sysdeps/ieee754/ldbl-128ibm-compat/Makefile +++ b/sysdeps/ieee754/ldbl-128ibm-compat/Makefile @@ -252,6 +252,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-ibm128-errorfptr tst-ieee128-errorfptr $(objpfx)tst-ibm128-%.c: tst-ldbl-%.c cp $< $@ @@ -262,10 +263,12 @@ $(objpfx)tst-ieee128-%.c: tst-ldbl-%.c CFLAGS-tst-ibm128-warn.c += -mabi=ibmlongdouble -Wno-psabi CFLAGS-tst-ibm128-error.c += -mabi=ibmlongdouble -Wno-psabi CFLAGS-tst-ibm128-efgcvt.c += -mabi=ibmlongdouble -Wno-psabi +CFLAGS-tst-ibm128-errorfptr.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 1d01846476..1baf065654 100644 --- a/sysdeps/ieee754/ldbl-opt/Makefile +++ b/sysdeps/ieee754/ldbl-opt/Makefile @@ -211,6 +211,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 $< $@ @@ -218,6 +219,10 @@ $(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