Re: [PATCH] Implement known/maybe fpclassify like API for frange.
Hi Aldy! On Mon, 2022-09-12 15:12:46 +0200, Aldy Hernandez wrote: > On Mon, Sep 12, 2022 at 10:48 AM Jan-Benedict Glaw wrote: > > > > On Thu, 2022-09-08 12:56:24 +0200, Aldy Hernandez via Gcc-patches > > wrote: > > > > > From 795baa0b044953e9f198f49e379374d633f43b47 Mon Sep 17 00:00:00 2001 > > > From: Aldy Hernandez > > > Date: Thu, 8 Sep 2022 08:11:43 +0200 > > > Subject: [PATCH] Implement known/maybe fpclassify like API for frange. > > > > > > gcc/ChangeLog: [...] > > > --- > > > gcc/gimple-range-fold.cc | 19 +++--- > > > gcc/range-op-float.cc| 26 > > > gcc/value-range.cc | 126 +++ > > > gcc/value-range.h| 78 +++- > > > 4 files changed, 170 insertions(+), 79 deletions(-) > > > > This triggers a selftest failure for pdp11: > > > > .../gcc/configure --prefix=... --enable-werror-always > > --enable-languages=all --disable-gcov --disable-shared --disable-threads > > --target=pdp11-aout --without-headers > > I have just pushed a patch to fix this. > > I have also added -ffinite-math-only selftests to my list of testing > requirements for all future frange work. > > Thanks for reporting this. Thanks for the very quick fix, already confirmed here! MfG, JBG -- signature.asc Description: PGP signature
Re: [PATCH] Implement known/maybe fpclassify like API for frange.
On Mon, Sep 12, 2022 at 10:48 AM Jan-Benedict Glaw wrote: > > Hi Aldy! > > On Thu, 2022-09-08 12:56:24 +0200, Aldy Hernandez via Gcc-patches > wrote: > > > From 795baa0b044953e9f198f49e379374d633f43b47 Mon Sep 17 00:00:00 2001 > > From: Aldy Hernandez > > Date: Thu, 8 Sep 2022 08:11:43 +0200 > > Subject: [PATCH] Implement known/maybe fpclassify like API for frange. > > > > gcc/ChangeLog: > > > > * gimple-range-fold.cc > > (fold_using_range::range_of_builtin_int_call): Use fpclassify like > > API. > > * range-op-float.cc (finite_operand_p): Same. > > (finite_operands_p): Same. > > (foperator_lt::fold_range): Same. > > (foperator_le::fold_range): Same. > > (foperator_gt::fold_range): Same. > > (foperator_ge::fold_range): Same. > > (foperator_unordered::fold_range): Same. > > (foperator_unordered::op1_range): Same. > > (foperator_ordered::fold_range): Same. > > * value-range.cc (frange::set_nan): Same. > > (frange::set_signbit): Same. > > (frange::union_): Same. > > (frange::intersect): Same. > > (frange::operator==): Same. > > (frange::singleton_p): Same. > > (frange::verify_range): Same. > > (range_tests_nan): Same. > > (range_tests_floats): Same. > > * value-range.h(frange::known_finite): New. > > (frange::maybe_inf): New. > > (frange::known_inf): New. > > (frange::maybe_nan): New. > > (frange::known_nan): New. > > (frange::known_signbit): New. > > --- > > gcc/gimple-range-fold.cc | 19 +++--- > > gcc/range-op-float.cc| 26 > > gcc/value-range.cc | 126 +++ > > gcc/value-range.h| 78 +++- > > 4 files changed, 170 insertions(+), 79 deletions(-) > > This triggers a selftest failure for pdp11: > > .../gcc/configure --prefix=... --enable-werror-always --enable-languages=all > --disable-gcov --disable-shared --disable-threads --target=pdp11-aout > --without-headers I have just pushed a patch to fix this. I have also added -ffinite-math-only selftests to my list of testing requirements for all future frange work. Thanks for reporting this. Aldy
Re: [PATCH] Implement known/maybe fpclassify like API for frange.
Hi Aldy! On Thu, 2022-09-08 12:56:24 +0200, Aldy Hernandez via Gcc-patches wrote: > From 795baa0b044953e9f198f49e379374d633f43b47 Mon Sep 17 00:00:00 2001 > From: Aldy Hernandez > Date: Thu, 8 Sep 2022 08:11:43 +0200 > Subject: [PATCH] Implement known/maybe fpclassify like API for frange. > > gcc/ChangeLog: > > * gimple-range-fold.cc > (fold_using_range::range_of_builtin_int_call): Use fpclassify like API. > * range-op-float.cc (finite_operand_p): Same. > (finite_operands_p): Same. > (foperator_lt::fold_range): Same. > (foperator_le::fold_range): Same. > (foperator_gt::fold_range): Same. > (foperator_ge::fold_range): Same. > (foperator_unordered::fold_range): Same. > (foperator_unordered::op1_range): Same. > (foperator_ordered::fold_range): Same. > * value-range.cc (frange::set_nan): Same. > (frange::set_signbit): Same. > (frange::union_): Same. > (frange::intersect): Same. > (frange::operator==): Same. > (frange::singleton_p): Same. > (frange::verify_range): Same. > (range_tests_nan): Same. > (range_tests_floats): Same. > * value-range.h(frange::known_finite): New. > (frange::maybe_inf): New. > (frange::known_inf): New. > (frange::maybe_nan): New. > (frange::known_nan): New. > (frange::known_signbit): New. > --- > gcc/gimple-range-fold.cc | 19 +++--- > gcc/range-op-float.cc| 26 > gcc/value-range.cc | 126 +++ > gcc/value-range.h| 78 +++- > 4 files changed, 170 insertions(+), 79 deletions(-) This triggers a selftest failure for pdp11: .../gcc/configure --prefix=... --enable-werror-always --enable-languages=all --disable-gcov --disable-shared --disable-threads --target=pdp11-aout --without-headers [...] make V=1 all-gcc [...] /var/lib/laminar/run/gcc-pdp11-aout/13/toolchain-build/./gcc/xgcc -B/var/lib/laminar/run/gcc-pdp11-aout/13/toolchain-build/./gcc/ -xc -nostdinc /dev/null -S -o /dev/null -fself-test=../../gcc/gcc/testsuite/selftests ../../gcc/gcc/value-range.cc:3801: range_tests_signbit: FAIL: ASSERT_TRUE ((r0.undefined_p ())) In function 'test_fn': cc1: internal compiler error: in fail, at selftest.cc:47 0x1757e97 selftest::fail(selftest::location const&, char const*) ../../gcc/gcc/selftest.cc:47 0x109ab62 range_tests_signbit ../../gcc/gcc/value-range.cc:3801 0x109ab62 range_tests_floats ../../gcc/gcc/value-range.cc:3810 0x10a9cf1 selftest::range_tests() ../../gcc/gcc/value-range.cc:3914 0x156e6d7 test_ranges ../../gcc/gcc/function-tests.cc:584 0x156e6d7 selftest::function_tests_cc_tests() ../../gcc/gcc/function-tests.cc:680 0x168d60b selftest::run_tests() ../../gcc/gcc/selftest-run-tests.cc:107 0xd968c9 toplev::run_self_tests() ../../gcc/gcc/toplev.cc:2184 Please submit a full bug report, with preprocessed source (by using -freport-bug). Please include the complete backtrace with any bug report. See <https://gcc.gnu.org/bugs/> for instructions. make[1]: *** [../../gcc/gcc/c/Make-lang.in:128: s-selftest-c] Error 1 Thanks, Jan-Benedict -- signature.asc Description: PGP signature
Re: [PATCH] Implement known/maybe fpclassify like API for frange.
t; > r0 = frange_float ("-Inf", "+Inf");
> > - if (r0.get_nan ().varying_p ())
> > + if (r0.maybe_nan ())
> > ASSERT_TRUE (r0.varying_p ());
> > // ...unless it has some special property...
> > r0.set_nan (fp_prop::NO);
> > diff --git a/gcc/value-range.h b/gcc/value-range.h
> > index 645dc76c33a..e426225eabf 100644
> > --- a/gcc/value-range.h
> > +++ b/gcc/value-range.h
> > @@ -330,6 +330,7 @@ private:
> > class frange : public vrange
> > {
> > friend class frange_storage_slot;
> > + friend class vrange_printer;
> > public:
> > frange ();
> > frange (const frange &);
> > @@ -366,12 +367,19 @@ public:
> > const REAL_VALUE_TYPE _bound () const;
> > const REAL_VALUE_TYPE _bound () const;
> >
> > + // fpclassify like API
> > + bool known_finite () const;
> > + bool maybe_inf () const;
> > + bool known_inf () const;
> > + bool maybe_nan () const;
> > + bool known_nan () const;
> > +
> > // Accessors for FP properties.
> > - fp_prop get_nan () const { return m_props.get_nan (); }
> > void set_nan (fp_prop::kind f);
> > fp_prop get_signbit () const { return m_props.get_signbit (); }
> > void set_signbit (fp_prop::kind);
> > private:
> > + fp_prop get_nan () const { return m_props.get_nan (); }
> > void verify_range ();
> > bool normalize_kind ();
> >
> > @@ -1187,4 +1195,48 @@ frange_nan (tree type)
> > return frange (type, r, r);
> > }
> >
> > +// Return TRUE if range is known to be finite.
> > +
> > +inline bool
> > +frange::known_finite () const
> > +{
> > + if (undefined_p () || varying_p () || m_kind == VR_ANTI_RANGE)
> > +return false;
> > + return (!real_isnan (_min)
> > + && !real_isinf (_min)
> > + && !real_isinf (_max));
> > +}
> > +
> > +// Return TRUE if range may be infinite.
> > +
> > +inline bool
> > +frange::maybe_inf () const
> > +{
> > + if (undefined_p () || m_kind == VR_ANTI_RANGE)
> > +return false;
> > + if (varying_p ())
> > +return true;
> > + return real_isinf (_min) || real_isinf (_max);
> > +}
> > +
> > +inline bool
> > +frange::known_inf () const
> > +{
> > + return (m_kind == VR_RANGE
> > + && real_identical (_min, _max)
> > + && real_isinf (_min));
> > +}
> > +
> > +inline bool
> > +frange::maybe_nan () const
> > +{
> > + return !get_nan ().no_p ();
> > +}
> > +
> > +inline bool
> > +frange::known_nan () const
> > +{
> > + return get_nan ().yes_p ();
> > +}
> > +
> > #endif // GCC_VALUE_RANGE_H
> > --
> > 2.37.1
> >
>
From 795baa0b044953e9f198f49e379374d633f43b47 Mon Sep 17 00:00:00 2001
From: Aldy Hernandez
Date: Thu, 8 Sep 2022 08:11:43 +0200
Subject: [PATCH] Implement known/maybe fpclassify like API for frange.
gcc/ChangeLog:
* gimple-range-fold.cc
(fold_using_range::range_of_builtin_int_call): Use fpclassify like API.
* range-op-float.cc (finite_operand_p): Same.
(finite_operands_p): Same.
(foperator_lt::fold_range): Same.
(foperator_le::fold_range): Same.
(foperator_gt::fold_range): Same.
(foperator_ge::fold_range): Same.
(foperator_unordered::fold_range): Same.
(foperator_unordered::op1_range): Same.
(foperator_ordered::fold_range): Same.
* value-range.cc (frange::set_nan): Same.
(frange::set_signbit): Same.
(frange::union_): Same.
(frange::intersect): Same.
(frange::operator==): Same.
(frange::singleton_p): Same.
(frange::verify_range): Same.
(range_tests_nan): Same.
(range_tests_floats): Same.
* value-range.h(frange::known_finite): New.
(frange::maybe_inf): New.
(frange::known_inf): New.
(frange::maybe_nan): New.
(frange::known_nan): New.
(frange::known_signbit): New.
---
gcc/gimple-range-fold.cc | 19 +++---
gcc/range-op-float.cc| 26
gcc/value-range.cc | 126 +++
gcc/value-range.h| 78 +++-
4 files changed, 170 insertions(+), 79 deletions(-)
diff --git a/gcc/gimple-range-fold.cc b/gcc/gimple-range-fold.cc
index c9c7a2ccc70..85ed6f9d47e 100644
--- a/gcc/gimple-range-fold.cc
+++ b/gcc/gimple-range-fold.cc
@@ -1029,15 +1029,16 @@ fold_using_range::range_of_builtin_int_call (irange , gcall *call,
frange tmp;
if (src.get_operand (tmp, arg))
{
- if (tmp.get_signbit ().varying_p ()
- // FIXME: We don't support signed NANs yet.
- || !tmp.get_nan ().no_p ())
- return false;
- if (tmp.get_signbit ().yes_p ())
- r.set_nonzero (type);
- else
- r.set_zero (type);
-
Re: [PATCH] Implement known/maybe fpclassify like API for frange.
> Am 08.09.2022 um 08:28 schrieb Aldy Hernandez :
>
> This is what I have in mind for the fpclassify-like methods on the
> current implementation. I'll get to the removal of the tristates after
> Cauldron.
>
> As you mentioned, isnormal is kinda tricky, and likely to be confusing
> for the user. We can revisit it if it's important.
Yeah.
> ?? I assume maybe_inf() does not return true for NAN ??
Only maybe_nan and known_nan return true for NaN.
>
> Also, what are your thoughts on signbit? Perhaps a method returning
> true if we're sure, and the actual signbit result as a reference?
>
>bool known_signbit (const frange , int );
That works for me. You could look at
Tree_expr_nonnegative_p to see if that’s good enough to be used there. Not
sure if -0. is negative or if only x for which x < 0. counts as such.. But
yes, access to the sign bit is useful.
> How does this look? I must say, the uses look much cleaner.
Yes, I like it.
Richard
> Aldy
>
> gcc/ChangeLog:
>
>* gimple-range-fold.cc
>(fold_using_range::range_of_builtin_int_call): Use fpclassify like API.
>* range-op-float.cc (finite_operand_p): Same.
>(finite_operands_p): Same.
>(foperator_lt::fold_range): Same.
>(foperator_le::fold_range): Same.
>(foperator_gt::fold_range): Same.
>(foperator_ge::fold_range): Same.
>(foperator_unordered::fold_range): Same.
>(foperator_unordered::op1_range): Same.
>(foperator_ordered::fold_range): Same.
>* value-range.cc (frange::set_nan): Same.
>(frange::set_signbit): Same.
>(frange::union_): Same.
>(frange::intersect): Same.
>(frange::operator==): Same.
>(frange::singleton_p): Same.
>(frange::verify_range): Same.
>(range_tests_nan): Same.
>(range_tests_floats): Same.
>* value-range.h(frange::known_finite): New.
>(frange::maybe_inf): New.
>(frange::known_inf): New.
>(frange::maybe_nan): New.
>(frange::known_nan): New.
> ---
> gcc/gimple-range-fold.cc | 2 +-
> gcc/range-op-float.cc| 26 ---
> gcc/value-range.cc | 37 ++-
> gcc/value-range.h| 54 +++-
> 4 files changed, 83 insertions(+), 36 deletions(-)
>
> diff --git a/gcc/gimple-range-fold.cc b/gcc/gimple-range-fold.cc
> index c9c7a2ccc70..47a1f49eb36 100644
> --- a/gcc/gimple-range-fold.cc
> +++ b/gcc/gimple-range-fold.cc
> @@ -1031,7 +1031,7 @@ fold_using_range::range_of_builtin_int_call (irange ,
> gcall *call,
> {
>if (tmp.get_signbit ().varying_p ()
>// FIXME: We don't support signed NANs yet.
> -|| !tmp.get_nan ().no_p ())
> +|| tmp.maybe_nan ())
> return false;
>if (tmp.get_signbit ().yes_p ())
> r.set_nonzero (type);
> diff --git a/gcc/range-op-float.cc b/gcc/range-op-float.cc
> index 5fbbaa1fb36..0f928b6c098 100644
> --- a/gcc/range-op-float.cc
> +++ b/gcc/range-op-float.cc
> @@ -167,7 +167,7 @@ frange_set_nan (frange , tree type)
> static inline bool
> finite_operand_p (const frange )
> {
> - return flag_finite_math_only || op1.get_nan ().no_p ();
> + return flag_finite_math_only || !op1.maybe_nan ();
> }
>
> // Return TRUE if OP1 and OP2 are known to be free of NANs.
> @@ -175,9 +175,7 @@ finite_operand_p (const frange )
> static inline bool
> finite_operands_p (const frange , const frange )
> {
> - return (flag_finite_math_only
> - || (op1.get_nan ().no_p ()
> - && op2.get_nan ().no_p ()));
> + return flag_finite_math_only || (!op1.maybe_nan () && !op2.maybe_nan ());
> }
>
> // Floating version of relop_early_resolve that takes into account NAN
> @@ -546,7 +544,7 @@ foperator_lt::fold_range (irange , tree type,
> else
>r = range_true_and_false (type);
> }
> - else if (op1.get_nan ().yes_p () || op2.get_nan ().yes_p ())
> + else if (op1.known_nan () || op2.known_nan ())
> r = range_false (type);
> else
> r = range_true_and_false (type);
> @@ -648,7 +646,7 @@ foperator_le::fold_range (irange , tree type,
> else
>r = range_true_and_false (type);
> }
> - else if (op1.get_nan ().yes_p () || op2.get_nan ().yes_p ())
> + else if (op1.known_nan () || op2.known_nan ())
> r = range_false (type);
> else
> r = range_true_and_false (type);
> @@ -742,7 +740,7 @@ foperator_gt::fold_range (irange , tree type,
> else
>r = range_true_and_false (type);
> }
> - else if (op1.get_nan ().yes_p () || op2.get_nan ().yes_p ())
> + else if (op1.known_nan () || op2.known_nan ())
> r = range_false (type);
> else
> r = range_true_and_false (type);
> @@ -844,7 +842,7 @@ foperator_ge::fold_range (irange , tree type,
> else
>r = range_true_and_false (type);
> }
> - else if (op1.get_nan ().yes_p () || op2.get_nan ().yes_p ())
> + else if (op1.known_nan () || op2.known_nan ())
> r = range_false (type);
> else
> r = range_true_and_false (type);
> @@ -927,10 +925,10 @@
[PATCH] Implement known/maybe fpclassify like API for frange.
This is what I have in mind for the fpclassify-like methods on the
current implementation. I'll get to the removal of the tristates after
Cauldron.
As you mentioned, isnormal is kinda tricky, and likely to be confusing
for the user. We can revisit it if it's important.
?? I assume maybe_inf() does not return true for NAN ??
Also, what are your thoughts on signbit? Perhaps a method returning
true if we're sure, and the actual signbit result as a reference?
bool known_signbit (const frange , int );
How does this look? I must say, the uses look much cleaner.
Aldy
gcc/ChangeLog:
* gimple-range-fold.cc
(fold_using_range::range_of_builtin_int_call): Use fpclassify like API.
* range-op-float.cc (finite_operand_p): Same.
(finite_operands_p): Same.
(foperator_lt::fold_range): Same.
(foperator_le::fold_range): Same.
(foperator_gt::fold_range): Same.
(foperator_ge::fold_range): Same.
(foperator_unordered::fold_range): Same.
(foperator_unordered::op1_range): Same.
(foperator_ordered::fold_range): Same.
* value-range.cc (frange::set_nan): Same.
(frange::set_signbit): Same.
(frange::union_): Same.
(frange::intersect): Same.
(frange::operator==): Same.
(frange::singleton_p): Same.
(frange::verify_range): Same.
(range_tests_nan): Same.
(range_tests_floats): Same.
* value-range.h(frange::known_finite): New.
(frange::maybe_inf): New.
(frange::known_inf): New.
(frange::maybe_nan): New.
(frange::known_nan): New.
---
gcc/gimple-range-fold.cc | 2 +-
gcc/range-op-float.cc| 26 ---
gcc/value-range.cc | 37 ++-
gcc/value-range.h| 54 +++-
4 files changed, 83 insertions(+), 36 deletions(-)
diff --git a/gcc/gimple-range-fold.cc b/gcc/gimple-range-fold.cc
index c9c7a2ccc70..47a1f49eb36 100644
--- a/gcc/gimple-range-fold.cc
+++ b/gcc/gimple-range-fold.cc
@@ -1031,7 +1031,7 @@ fold_using_range::range_of_builtin_int_call (irange ,
gcall *call,
{
if (tmp.get_signbit ().varying_p ()
// FIXME: We don't support signed NANs yet.
- || !tmp.get_nan ().no_p ())
+ || tmp.maybe_nan ())
return false;
if (tmp.get_signbit ().yes_p ())
r.set_nonzero (type);
diff --git a/gcc/range-op-float.cc b/gcc/range-op-float.cc
index 5fbbaa1fb36..0f928b6c098 100644
--- a/gcc/range-op-float.cc
+++ b/gcc/range-op-float.cc
@@ -167,7 +167,7 @@ frange_set_nan (frange , tree type)
static inline bool
finite_operand_p (const frange )
{
- return flag_finite_math_only || op1.get_nan ().no_p ();
+ return flag_finite_math_only || !op1.maybe_nan ();
}
// Return TRUE if OP1 and OP2 are known to be free of NANs.
@@ -175,9 +175,7 @@ finite_operand_p (const frange )
static inline bool
finite_operands_p (const frange , const frange )
{
- return (flag_finite_math_only
- || (op1.get_nan ().no_p ()
- && op2.get_nan ().no_p ()));
+ return flag_finite_math_only || (!op1.maybe_nan () && !op2.maybe_nan ());
}
// Floating version of relop_early_resolve that takes into account NAN
@@ -546,7 +544,7 @@ foperator_lt::fold_range (irange , tree type,
else
r = range_true_and_false (type);
}
- else if (op1.get_nan ().yes_p () || op2.get_nan ().yes_p ())
+ else if (op1.known_nan () || op2.known_nan ())
r = range_false (type);
else
r = range_true_and_false (type);
@@ -648,7 +646,7 @@ foperator_le::fold_range (irange , tree type,
else
r = range_true_and_false (type);
}
- else if (op1.get_nan ().yes_p () || op2.get_nan ().yes_p ())
+ else if (op1.known_nan () || op2.known_nan ())
r = range_false (type);
else
r = range_true_and_false (type);
@@ -742,7 +740,7 @@ foperator_gt::fold_range (irange , tree type,
else
r = range_true_and_false (type);
}
- else if (op1.get_nan ().yes_p () || op2.get_nan ().yes_p ())
+ else if (op1.known_nan () || op2.known_nan ())
r = range_false (type);
else
r = range_true_and_false (type);
@@ -844,7 +842,7 @@ foperator_ge::fold_range (irange , tree type,
else
r = range_true_and_false (type);
}
- else if (op1.get_nan ().yes_p () || op2.get_nan ().yes_p ())
+ else if (op1.known_nan () || op2.known_nan ())
r = range_false (type);
else
r = range_true_and_false (type);
@@ -927,10 +925,10 @@ foperator_unordered::fold_range (irange , tree type,
relation_kind) const
{
// UNORDERED is TRUE if either operand is a NAN.
- if (op1.get_nan ().yes_p () || op2.get_nan ().yes_p ())
+ if (op1.known_nan () || op2.known_nan ())
r = range_true (type);
// UNORDERED is FALSE if neither operand is a NAN.
- else if (op1.get_nan ().no_p () && op2.get_nan ().no_p
