From 344e425340e3c8e4539b43bf8f661e02c5a5b9a0 Mon Sep 17 00:00:00 2001 From: Haochen Gui Date: Mon, 9 May 2022 17:34:23 +0800 Subject: [PATCH] =?utf8?q?This=20patch=20skips=20constant=20folding=20for?= =?utf8?q?=20fmin/max=20when=20either=20argument=20is=20sNaN.=20According?= =?utf8?q?=20to=20C=20standard,=20fmin(sNaN,=20sNaN=EF=BC=89=3D=20qNaN,=20?= =?utf8?q?fmin(sNaN,=20NaN)=20=3D=20qNaN.?= MIME-Version: 1.0 Content-Type: text/plain; charset=utf8 Content-Transfer-Encoding: 8bit gcc/ PR target/105414 * match.pd (minmax): Skip constant folding for fmin/fmax when both arguments are sNaN or one is sNaN and another is NaN. gcc/testsuite/ PR target/105414 * gcc.dg/pr105414.c: New. --- gcc/match.pd | 17 ++++++++++++----- gcc/testsuite/gcc.dg/pr105414.c | 30 ++++++++++++++++++++++++++++++ 2 files changed, 42 insertions(+), 5 deletions(-) create mode 100644 gcc/testsuite/gcc.dg/pr105414.c diff --git a/gcc/match.pd b/gcc/match.pd index 1fdd98b..632243e 100644 --- a/gcc/match.pd +++ b/gcc/match.pd @@ -3089,10 +3089,16 @@ DEFINE_INT_AND_FLOAT_ROUND_FN (RINT) /* Simplifications of MIN_EXPR, MAX_EXPR, fmin() and fmax(). */ -(for minmax (min max FMIN_ALL FMAX_ALL) +(for minmax (min max) (simplify (minmax @0 @0) @0)) +/* For fmin() and fmax(), skip folding when both are sNaN. */ +(for minmax (FMIN_ALL FMAX_ALL) + (simplify + (minmax @0 @0) + (if (!tree_expr_maybe_signaling_nan_p (@0)) + @0))) /* min(max(x,y),y) -> y. */ (simplify (min:c (max:c @0 @1) @1) @@ -3192,12 +3198,13 @@ DEFINE_INT_AND_FLOAT_ROUND_FN (RINT) (minmax @1 (convert @2))))) (for minmax (FMIN_ALL FMAX_ALL) - /* If either argument is NaN, return the other one. Avoid the - transformation if we get (and honor) a signalling NaN. */ + /* If either argument is NaN and other one is not sNaN, return the other + one. Avoid the transformation if we get (and honor) a signalling NaN. */ (simplify (minmax:c @0 REAL_CST@1) - (if (real_isnan (TREE_REAL_CST_PTR (@1)) - && (!HONOR_SNANS (@1) || !TREE_REAL_CST (@1).signalling)) + (if (real_isnan (TREE_REAL_CST_PTR (@1)) + && (!HONOR_SNANS (@1) || !TREE_REAL_CST (@1).signalling) + && !tree_expr_maybe_signaling_nan_p (@0)) @0))) /* Convert fmin/fmax to MIN_EXPR/MAX_EXPR. C99 requires these functions to return the numeric arg if the other one is NaN. diff --git a/gcc/testsuite/gcc.dg/pr105414.c b/gcc/testsuite/gcc.dg/pr105414.c new file mode 100644 index 0000000..7877270 --- /dev/null +++ b/gcc/testsuite/gcc.dg/pr105414.c @@ -0,0 +1,30 @@ +/* { dg-do run { target { *-*-linux* *-*-gnu* } } } */ +/* { dg-options "-O1 -fsignaling-nans -lm" } */ +/* { dg-add-options ieee } */ +/* { dg-require-effective-target issignaling } */ + + +#define _GNU_SOURCE +#include +#include + +int main() +{ + double a = __builtin_nans (""); + + if (issignaling (fmin (a, a))) + __builtin_abort (); + + if (issignaling (fmax (a, a))) + __builtin_abort (); + + double b = __builtin_nan (""); + + if (issignaling (fmin (a, b))) + __builtin_abort (); + + if (issignaling (fmax (a, b))) + __builtin_abort (); + + return 0; +} -- 2.7.4