On 4/18/23 12:32, Jakub Jelinek wrote:
On Tue, Apr 18, 2023 at 11:33:05AM +0200, Jakub Jelinek wrote:
On Tue, Apr 18, 2023 at 11:06:38AM +0200, Aldy Hernandez via Gcc-patches wrote:
This patch provides inchash support for vrange. It is along the lines
of the streaming support I just posted and will be used for IPA
hashing of ranges.
Thoughts?
gcc/ChangeLog:
* inchash.cc (hash::add_real_value): New.
* inchash.h (class hash): Add add_real_value.
* value-range.cc (add_vrange): New.
* value-range.h (inchash::add_vrange): New.
---
gcc/inchash.cc | 20 +++++++++++++++++++
gcc/inchash.h | 2 ++
gcc/value-range.cc | 48 ++++++++++++++++++++++++++++++++++++++++++++++
gcc/value-range.h | 6 ++++++
4 files changed, 76 insertions(+)
diff --git a/gcc/inchash.cc b/gcc/inchash.cc
index a30662b97fe..914e3cc92cd 100644
--- a/gcc/inchash.cc
+++ b/gcc/inchash.cc
@@ -24,3 +24,23 @@ along with GCC; see the file COPYING3. If not see
#endif
#include "system.h"
#include "coretypes.h"
+#include "real.h"
+#include "inchash.h"
+
+namespace inchash
+{
+
+/* This is here instead of inchash.h to keep us from having to put
+ real.h in coretypes.h. */
+void
+hash::add_real_value (const real_value &v)
+{
+ add_int (v.sign);
+ add_int (v.uexp);
+ for (unsigned i = 0; i < SIGSZ; ++i)
+ add_hwi (v.sig[i]);
+ /* Ignore the rest of the flags, as sign, exponent, and
+ significant bits should be enough. */
I don't think that's the case.
At least cl, decimal and signalling are essential flags as well.
Dunno about canonical.
How do you otherwise differentiate between Inf and +0.0 or (canonical)
qNaN or (canonical) sNaN?
They have the same sign, uexp and sig.
I'd say it is best to follow real_identical that is used for the
comparisons, that one always compares cl and sign and then differentiates
based on cl:
1) for rvc_zero/rvc_inf, everything else is ignored
2) for rvc_normal, decimal, uexp and sig are compared
3) for rvc_nan, signalling and canonical are compared and if !canonical,
sig is also compared
So, perhaps:
add_int (v.cl);
add_int (v.sign);
switch (v.cl)
{
case rvc_zero:
case rvc_inf:
return;
case rvc_normal:
add_int (v.decimal);
add_int (REAL_EXP (&v));
break;
case rvc_nan:
add_int (v.signalling);
add_int (v.canonical);
if (v.canonical)
return;
break;
default:
gcc_unreachable ();
}
for (unsigned i = 0; i < SIGSZ; ++i)
add_hwi (v.sig[i]);
Jakub
Sounds good. Thanks for the patch.
OK pending tests?
p.s. Cleaned up the need for declaring add_vrange() a friend of frange
now that we have a way of getting the nan_state elegantly.From b02b48a46a6b1a2f37e00f42a8e374298e745c0c Mon Sep 17 00:00:00 2001
From: Aldy Hernandez <al...@redhat.com>
Date: Thu, 23 Feb 2023 08:48:28 +0100
Subject: [PATCH] Add inchash support for vrange.
This patch provides inchash support for vrange. It is along the lines
of the streaming support I just posted and will be used for IPA
hashing of ranges.
gcc/ChangeLog:
* inchash.cc (hash::add_real_value): New.
* inchash.h (class hash): Add add_real_value.
* value-range.cc (add_vrange): New.
* value-range.h (inchash::add_vrange): New.
---
gcc/inchash.cc | 36 ++++++++++++++++++++++++++++++++
gcc/inchash.h | 2 ++
gcc/value-range.cc | 52 ++++++++++++++++++++++++++++++++++++++++++++++
gcc/value-range.h | 5 +++++
4 files changed, 95 insertions(+)
diff --git a/gcc/inchash.cc b/gcc/inchash.cc
index a30662b97fe..7890db04202 100644
--- a/gcc/inchash.cc
+++ b/gcc/inchash.cc
@@ -24,3 +24,39 @@ along with GCC; see the file COPYING3. If not see
#endif
#include "system.h"
#include "coretypes.h"
+#include "real.h"
+#include "inchash.h"
+
+namespace inchash
+{
+
+/* This is here instead of inchash.h to keep us from having to put
+ real.h in coretypes.h. */
+void
+hash::add_real_value (const real_value &v)
+{
+ add_int (v.cl);
+ add_int (v.sign);
+ switch (v.cl)
+ {
+ case rvc_zero:
+ case rvc_inf:
+ return;
+ case rvc_normal:
+ add_int (v.decimal);
+ add_int (REAL_EXP (&v));
+ break;
+ case rvc_nan:
+ add_int (v.signalling);
+ add_int (v.canonical);
+ if (v.canonical)
+ return;
+ break;
+ default:
+ gcc_unreachable ();
+ }
+ for (unsigned i = 0; i < SIGSZ; ++i)
+ add_hwi (v.sig[i]);
+}
+
+} // namespace inchash
diff --git a/gcc/inchash.h b/gcc/inchash.h
index bf76308431d..41ae153d1c5 100644
--- a/gcc/inchash.h
+++ b/gcc/inchash.h
@@ -88,6 +88,8 @@ class hash
add_hwi (x.sext_elt (i));
}
+ void add_real_value (const class real_value &v);
+
/* Hash in pointer PTR. */
void add_ptr (const void *ptr)
{
diff --git a/gcc/value-range.cc b/gcc/value-range.cc
index ec826c2fe1b..c14a27e23af 100644
--- a/gcc/value-range.cc
+++ b/gcc/value-range.cc
@@ -232,6 +232,58 @@ vrange::dump (FILE *file) const
pp_flush (&buffer);
}
+namespace inchash
+{
+
+void
+add_vrange (const vrange &v, inchash::hash &hstate,
+ unsigned int)
+{
+ if (v.undefined_p ())
+ {
+ hstate.add_int (VR_UNDEFINED);
+ return;
+ }
+ // Types are ignored throughout to inhibit two ranges being equal
+ // but having different hash values. This can happen when two
+ // ranges are equal and their types are different (but
+ // types_compatible_p is true).
+ if (is_a <irange> (v))
+ {
+ const irange &r = as_a <irange> (v);
+ if (r.varying_p ())
+ hstate.add_int (VR_VARYING);
+ else
+ hstate.add_int (VR_RANGE);
+ for (unsigned i = 0; i < r.num_pairs (); ++i)
+ {
+ hstate.add_wide_int (r.lower_bound (i));
+ hstate.add_wide_int (r.upper_bound (i));
+ }
+ hstate.add_wide_int (r.get_nonzero_bits ());
+ return;
+ }
+ if (is_a <frange> (v))
+ {
+ const frange &r = as_a <frange> (v);
+ if (r.varying_p ())
+ hstate.add_int (VR_VARYING);
+ else
+ hstate.add_int (VR_RANGE);
+
+ hstate.add_real_value (r.lower_bound ());
+ hstate.add_real_value (r.upper_bound ());
+
+ nan_state nan = r.get_nan_state ();
+ hstate.add_int (nan.pos_p ());
+ hstate.add_int (nan.neg_p ());
+ return;
+ }
+ gcc_unreachable ();
+}
+
+} //namespace inchash
+
bool
irange::supports_type_p (const_tree type) const
{
diff --git a/gcc/value-range.h b/gcc/value-range.h
index 969b2b68418..fb90f66d9de 100644
--- a/gcc/value-range.h
+++ b/gcc/value-range.h
@@ -108,6 +108,11 @@ protected:
ENUM_BITFIELD(value_range_discriminator) m_discriminator : 4;
};
+namespace inchash
+{
+ extern void add_vrange (const vrange &, hash &, unsigned flags = 0);
+}
+
// An integer range without any storage.
class GTY((user)) irange : public vrange
--
2.39.2
