From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mout.gmx.net (mout.gmx.net [212.227.15.15]) by sourceware.org (Postfix) with ESMTPS id 3B92F3858D20; Fri, 14 Apr 2023 18:59:25 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.2 sourceware.org 3B92F3858D20 Authentication-Results: sourceware.org; dmarc=pass (p=none dis=none) header.from=gmx.de Authentication-Results: sourceware.org; spf=pass smtp.mailfrom=gmx.de DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=gmx.de; s=s31663417; t=1681498764; i=anlauf@gmx.de; bh=YabMqqfFVLjiRwP0AUxnyRTOEMov/GKsCpeaSe8yr+o=; h=X-UI-Sender-Class:From:To:Subject:Date; b=mgElKrCQ2qh9r8txO97UYR2Be79nE37bFWn5SdQk8TGOFGrNh06sHWoCAegNaeaKR TOTVDQ4SZzT2ui4esXnSYeN2MsEzzAdpuNe2ICDp3tyk4eO358+wqTYwn4cixSWGNN Cuz1vsL++NrQT7JZa2pLvwyaIG6mG7JkyKzXw+IImQMrFRUk1nti8h5HbHD3CgySwq qnzOucaQr6cg/a9RRSBP8ecL+Ybqe/hHtuKwR71bXuHDvmXl1QPBF7ppL29pL09Ox3 ns7FZAQK56JO5ZkLdbSmqz8HinfkPytTQEGaHY0C59gyVR9R6qQGIOtOZJIHCNQ1Lv X0j127OM2stgw== X-UI-Sender-Class: 724b4f7f-cbec-4199-ad4e-598c01a50d3a Received: from [79.251.14.165] ([79.251.14.165]) by web-mail.gmx.net (3c-app-gmx-bs43.server.lan [172.19.170.95]) (via HTTP); Fri, 14 Apr 2023 20:59:24 +0200 MIME-Version: 1.0 Message-ID: From: Harald Anlauf To: fortran , gcc-patches Subject: [PATCH] Fortran: fix compile-time simplification of SET_EXPONENT [PR109511] Content-Type: multipart/mixed; boundary=trekuen-32fcfa18-f4ea-4e59-9296-7eaefdc01b07 Date: Fri, 14 Apr 2023 20:59:24 +0200 Importance: normal Sensitivity: Normal X-Priority: 3 X-Provags-ID: V03:K1:36XYOPDnHrQdWsyra3/JWefDbrkEegGTLRMr/ePgzWpgr9lBCrAPIjTFFRMHK0+3eGcXk gaReeHwsQsQ5iPFDN4+u6RYYQ2gwhuNZp8TAmiijCd6LLqEd8Nc5JZX75lksLdGyoHb0wgDcRTxd elqy1HfX6KDcmDj4E10LMrh6wdskRMoxfF+JpcB7dgWm++3ytYXpDEW9KGMnlFHH45uJ5cHcaMUv OcK2Ze6swuukVrZtI5vBw4V5fdWFw/g4ljOC8ahF1Z4CVoZktqSP3ygs6/KL6VpI4v3CQp7sGIKq 8Q= UI-OutboundReport: notjunk:1;M01:P0:SQSAOQDzBus=;m4gMDfUDyQ0Szq1LtK7SA88WMoR HAcPGGsIk/I0dnD86jfETai3/6Lj0ryEkK9bdyoiJ5RTN28ZdosjImgxkUDVGASGgiCdigAx+ QS4WpVIjFyv9yRRNVbABLHy0X6gn5f3IDo9Z9uSdHPhnXsqcRsHBegN51bZXBtWOzLrC6xCA5 Gsgb9eYFN+K3m63IG6NAyyoekCm4wZbmSz1x8S/oE/C3z96A39x6cB9UMYE2BI3BFZO6PFfHl aANTo3umd1yS+tsSd9O+aOEO9PspS4LSAtv3DkTvjiKv1iH1RMOOVBvZYs40bh3YJby4GN4KO /SFXWSG40prKl6yxQ0skDLn754Z84JMpxVviuBo8ImdLCk7gFuKzcki+K6GhzooKYBoelxVvL 9rsxomL2sp+/g5jNbMJQaqbk/p9QRrh30OC4sLZ+TvGUjrosjL5vxeC/eyaGvqcc49BUzuDed Eg8PgBaEptysJiIYSZuOmnyJGPdashfne+VWR47asQfggdvzLhYy/OSvlgK15If31elSc8yoZ /qYeONrSt+VUBd5sMaGuSK5K5EHq/n947SSdtykQ3/iGVnuuvLUCsfKF+oyCfHCGgelZDpNiK 4nGsSc3a1im9hiyCqaUyWUvnyS0Dw2jkM4kkACXxqGarMturGg7wkGBTQQd+uTZUmAUsW8sIj PBRCdefH+m8sYxVbVrvrJLKmONc7FLcJTZXuruemXjRappj19tXNcpDynC8pgrxZrzB3B2gcx IdlU+unu20yECdlen9D8idGVW6IH+wYD4H2O6AuUQ3IXqQtTfwLy5L3zKzKCXJwoB8jSI4fep V6bG8YzAzc8keBgBPK3AWj/Q== X-Spam-Status: No, score=-12.4 required=5.0 tests=BAYES_00,DKIM_SIGNED,DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,FREEMAIL_FROM,GIT_PATCH_0,RCVD_IN_DNSWL_LOW,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: --trekuen-32fcfa18-f4ea-4e59-9296-7eaefdc01b07 Content-Type: text/plain; charset=UTF-8 [Now with subject added...] Dear all, the compile-time simplification of intrinsic SET_EXPONENT was broken since the early days of gfortran for argument X < 1 (including negative X) and for I < 0. I identified and fixed several issues in the implementation. The testcase explores argument space comparing compile-time and runtime results and is checked against Intel. Regtested on x86_64-pc-linux-gnu. OK for mainline? This is not a regression, but can lead to wrong code. Would it be OK to backport to open branches? Thanks, Harald --trekuen-32fcfa18-f4ea-4e59-9296-7eaefdc01b07 Content-Type: text/x-patch Content-Disposition: attachment; filename=pr109511.diff Content-Transfer-Encoding: quoted-printable =46rom fa4cb42870df60deb8888dbd51e2ddc6d6ab9e6a Mon Sep 17 00:00:00 2001 From: Harald Anlauf Date: Fri, 14 Apr 2023 20:45:19 +0200 Subject: [PATCH] Fortran: fix compile-time simplification of SET_EXPONENT [PR109511] gcc/fortran/ChangeLog: PR fortran/109511 * simplify.cc (gfc_simplify_set_exponent): Fix implementation of compile-time simplification of intrinsic SET_EXPONENT for argument X < 1 and for I < 0. gcc/testsuite/ChangeLog: PR fortran/109511 * gfortran.dg/set_exponent_1.f90: New test. =2D-- gcc/fortran/simplify.cc | 12 +++---- gcc/testsuite/gfortran.dg/set_exponent_1.f90 | 36 ++++++++++++++++++++ 2 files changed, 42 insertions(+), 6 deletions(-) create mode 100644 gcc/testsuite/gfortran.dg/set_exponent_1.f90 diff --git a/gcc/fortran/simplify.cc b/gcc/fortran/simplify.cc index ecf0e3558df..b65854c1021 100644 =2D-- a/gcc/fortran/simplify.cc +++ b/gcc/fortran/simplify.cc @@ -7364,7 +7364,7 @@ gfc_simplify_set_exponent (gfc_expr *x, gfc_expr *i) { gfc_expr *result; mpfr_t exp, absv, log2, pow2, frac; - unsigned long exp2; + long exp2; if (x->expr_type !=3D EXPR_CONSTANT || i->expr_type !=3D EXPR_CONSTANT) return NULL; @@ -7396,19 +7396,19 @@ gfc_simplify_set_exponent (gfc_expr *x, gfc_expr *= i) mpfr_abs (absv, x->value.real, GFC_RND_MODE); mpfr_log2 (log2, absv, GFC_RND_MODE); - mpfr_trunc (log2, log2); + mpfr_floor (log2, log2); mpfr_add_ui (exp, log2, 1, GFC_RND_MODE); /* Old exponent value, and fraction. */ mpfr_ui_pow (pow2, 2, exp, GFC_RND_MODE); - mpfr_div (frac, absv, pow2, GFC_RND_MODE); + mpfr_div (frac, x->value.real, pow2, GFC_RND_MODE); /* New exponent. */ - exp2 =3D (unsigned long) mpz_get_d (i->value.integer); - mpfr_mul_2exp (result->value.real, frac, exp2, GFC_RND_MODE); + exp2 =3D mpz_get_si (i->value.integer); + mpfr_mul_2si (result->value.real, frac, exp2, GFC_RND_MODE); - mpfr_clears (absv, log2, pow2, frac, NULL); + mpfr_clears (absv, log2, exp, pow2, frac, NULL); return range_check (result, "SET_EXPONENT"); } diff --git a/gcc/testsuite/gfortran.dg/set_exponent_1.f90 b/gcc/testsuite/= gfortran.dg/set_exponent_1.f90 new file mode 100644 index 00000000000..4c063e8330b =2D-- /dev/null +++ b/gcc/testsuite/gfortran.dg/set_exponent_1.f90 @@ -0,0 +1,36 @@ +! { dg-do run } +! PR fortran/109511 +! Check compile-time simplification of SET_EXPONENT against runtime + +program exponent + implicit none + integer :: i + i =3D 0 + print *, i, set_exponent(1., 0), set_exponent(1., i) + if (set_exponent(1., 0) /=3D set_exponent(1., i)) stop 1 + i =3D 1 + print *, i, set_exponent(1., 1), set_exponent(1., i) + if (set_exponent(1., 1) /=3D set_exponent(1., i)) stop 2 + i =3D 2 + print *, i, set_exponent(-1.75, 2), set_exponent(-1.75, i) + if (set_exponent(-1.75, 2) /=3D set_exponent(-1.75, i)) stop 3 + print *, i, set_exponent(0.1875, 2), set_exponent(0.1875, i) + if (set_exponent(0.1875, 2) /=3D set_exponent(0.1875, i)) stop 4 + i =3D 3 + print *, i, set_exponent(0.75, 3), set_exponent(0.75, i) + if (set_exponent(0.75, 3) /=3D set_exponent(0.75, i)) stop 5 + i =3D 4 + print *, i, set_exponent(-2.5, 4), set_exponent(-2.5, i) + if (set_exponent(-2.5, 4) /=3D set_exponent(-2.5, i)) stop 6 + i =3D -1 + print *, i, set_exponent(1., -1), set_exponent(1., i) + if (set_exponent(1., -1) /=3D set_exponent(1., i)) stop 7 + i =3D -2 + print *, i, set_exponent(1.125, -2), set_exponent(1.125, i) + if (set_exponent(1.125, -2) /=3D set_exponent(1.125, i)) stop 8 + print *, i, set_exponent(-0.25, -2), set_exponent(-0.25, i) + if (set_exponent(-0.25, -2) /=3D set_exponent(-0.25, i)) stop 9 + i =3D -3 + print *, i, set_exponent(0.75, -3), set_exponent(0.75, i) + if (set_exponent(0.75, -3) /=3D set_exponent(0.75, i)) stop 10 +end program exponent =2D- 2.35.3 --trekuen-32fcfa18-f4ea-4e59-9296-7eaefdc01b07--