From: Aldy Hernandez <aldyh@redhat.com>
To: GCC patches <gcc-patches@gcc.gnu.org>
Cc: Andrew MacLeod <amacleod@redhat.com>, Aldy Hernandez <aldyh@redhat.com>
Subject: [PATCH] Implement ipa_vr hashing.
Date: Mon, 22 May 2023 20:56:21 +0200 [thread overview]
Message-ID: <20230522185622.537454-2-aldyh@redhat.com> (raw)
In-Reply-To: <20230522185622.537454-1-aldyh@redhat.com>
Implement hashing for ipa_vr. When all is said and done, all these
patches incurr a 7.64% slowdown for ipa-cp, with is entirely covered by
the similar 7% increase in this area last week. So we get type agnostic
ranges with "infinite" range precision close to free.
There is no change in overall compilation.
OK?
gcc/ChangeLog:
* ipa-prop.cc (struct ipa_vr_ggc_hash_traits): Adjust for use with
ipa_vr instead of value_range.
(gt_pch_nx): Same.
(gt_ggc_mx): Same.
(ipa_get_value_range): Same.
* value-range.cc (gt_pch_nx): Move to ipa-prop.cc and adjust for
ipa_vr.
(gt_ggc_mx): Same.
---
gcc/ipa-prop.cc | 76 +++++++++++++++++++++++++++-------------------
gcc/value-range.cc | 15 ---------
2 files changed, 45 insertions(+), 46 deletions(-)
diff --git a/gcc/ipa-prop.cc b/gcc/ipa-prop.cc
index c46a89f1b49..6383bc11e0a 100644
--- a/gcc/ipa-prop.cc
+++ b/gcc/ipa-prop.cc
@@ -109,53 +109,53 @@ struct ipa_bit_ggc_hash_traits : public ggc_cache_remove <ipa_bits *>
/* Hash table for avoid repeated allocations of equal ipa_bits. */
static GTY ((cache)) hash_table<ipa_bit_ggc_hash_traits> *ipa_bits_hash_table;
-/* Traits for a hash table for reusing value_ranges used for IPA. Note that
- the equiv bitmap is not hashed and is expected to be NULL. */
+/* Traits for a hash table for reusing ranges. */
-struct ipa_vr_ggc_hash_traits : public ggc_cache_remove <value_range *>
+struct ipa_vr_ggc_hash_traits : public ggc_cache_remove <ipa_vr *>
{
- typedef value_range *value_type;
- typedef value_range *compare_type;
+ typedef ipa_vr *value_type;
+ typedef const vrange *compare_type;
static hashval_t
- hash (const value_range *p)
+ hash (const ipa_vr *p)
{
- tree min, max;
- value_range_kind kind = get_legacy_range (*p, min, max);
- inchash::hash hstate (kind);
- inchash::add_expr (min, hstate);
- inchash::add_expr (max, hstate);
+ // This never get called, except in the verification code, as
+ // ipa_get_value_range() calculates the hash itself. This
+ // function is mostly here for completness' sake.
+ Value_Range vr;
+ p->get_vrange (vr);
+ inchash::hash hstate;
+ add_vrange (vr, hstate);
return hstate.end ();
}
static bool
- equal (const value_range *a, const value_range *b)
+ equal (const ipa_vr *a, const vrange *b)
{
- return (types_compatible_p (a->type (), b->type ())
- && *a == *b);
+ return a->equal_p (*b);
}
static const bool empty_zero_p = true;
static void
- mark_empty (value_range *&p)
+ mark_empty (ipa_vr *&p)
{
p = NULL;
}
static bool
- is_empty (const value_range *p)
+ is_empty (const ipa_vr *p)
{
return p == NULL;
}
static bool
- is_deleted (const value_range *p)
+ is_deleted (const ipa_vr *p)
{
- return p == reinterpret_cast<const value_range *> (1);
+ return p == reinterpret_cast<const ipa_vr *> (1);
}
static void
- mark_deleted (value_range *&p)
+ mark_deleted (ipa_vr *&p)
{
- p = reinterpret_cast<value_range *> (1);
+ p = reinterpret_cast<ipa_vr *> (1);
}
};
-/* Hash table for avoid repeated allocations of equal value_ranges. */
+/* Hash table for avoid repeated allocations of equal ranges. */
static GTY ((cache)) hash_table<ipa_vr_ggc_hash_traits> *ipa_vr_hash_table;
/* Holders of ipa cgraph hooks: */
@@ -265,6 +265,22 @@ ipa_vr::dump (FILE *out) const
fprintf (out, "NO RANGE");
}
+// ?? These stubs are because we use an ipa_vr in a hash_traits and
+// hash-traits.h defines an extern of gt_ggc_mx (T &) instead of
+// picking up the gt_ggc_mx (T *) version.
+void
+gt_pch_nx (ipa_vr *&x)
+{
+ return gt_pch_nx ((ipa_vr *) x);
+}
+
+void
+gt_ggc_mx (ipa_vr *&x)
+{
+ return gt_ggc_mx ((ipa_vr *) x);
+}
+
+
/* Return true if DECL_FUNCTION_SPECIFIC_OPTIMIZATION of the decl associated
with NODE should prevent us from analyzing it for the purposes of IPA-CP. */
@@ -2284,27 +2300,25 @@ ipa_set_jfunc_bits (ipa_jump_func *jf, const widest_int &value,
jf->bits = ipa_get_ipa_bits_for_value (value, mask);
}
-/* Return a pointer to a value_range just like *TMP, but either find it in
- ipa_vr_hash_table or allocate it in GC memory. TMP->equiv must be NULL. */
+/* Return a pointer to an ipa_vr just like TMP, but either find it in
+ ipa_vr_hash_table or allocate it in GC memory. */
static ipa_vr *
ipa_get_value_range (const vrange &tmp)
{
- /* FIXME: Add hashing support.
- value_range **slot = ipa_vr_hash_table->find_slot (tmp, INSERT);
+ inchash::hash hstate;
+ inchash::add_vrange (tmp, hstate);
+ hashval_t hash = hstate.end ();
+ ipa_vr **slot = ipa_vr_hash_table->find_slot_with_hash (&tmp, hash, INSERT);
if (*slot)
return *slot;
- value_range *vr = new (ggc_alloc<value_range> ()) value_range;
- *vr = *tmp;
- *slot = vr;
- */
ipa_vr *vr = new (ggc_alloc<ipa_vr> ()) ipa_vr (tmp);
-
+ *slot = vr;
return vr;
}
-/* Assign to JF a pointer to a value_range just like TMP but either fetch a
+/* Assign to JF a pointer to a range just like TMP but either fetch a
copy from ipa_vr_hash_table or allocate a new on in GC memory. */
static void
diff --git a/gcc/value-range.cc b/gcc/value-range.cc
index 45b1e655967..7b81025357b 100644
--- a/gcc/value-range.cc
+++ b/gcc/value-range.cc
@@ -2008,21 +2008,6 @@ gt_pch_nx (vrange *x, gt_pointer_operator op, void *cookie)
gcc_unreachable ();
}
-// ?? These stubs are for ipa-prop.cc which use a value_range in a
-// hash_traits. hash-traits.h defines an extern of gt_ggc_mx (T &)
-// instead of picking up the gt_ggc_mx (T *) version.
-void
-gt_pch_nx (int_range<2> *&x)
-{
- return gt_pch_nx ((irange *) x);
-}
-
-void
-gt_ggc_mx (int_range<2> *&x)
-{
- return gt_ggc_mx ((irange *) x);
-}
-
#define DEFINE_INT_RANGE_INSTANCE(N) \
template int_range<N>::int_range(tree_node *, \
const wide_int &, \
--
2.40.1
next prev parent reply other threads:[~2023-05-22 18:56 UTC|newest]
Thread overview: 17+ messages / expand[flat|nested] mbox.gz Atom feed top
2023-05-22 18:56 [PATCH] Convert ipa_jump_func to use ipa_vr instead of a value_range Aldy Hernandez
2023-05-22 18:56 ` Aldy Hernandez [this message]
2023-05-29 14:51 ` [PATCH] Implement ipa_vr hashing Martin Jambor
2023-06-07 10:01 ` Aldy Hernandez
2023-06-10 20:30 ` Aldy Hernandez
2023-06-14 12:11 ` Aldy Hernandez
2023-06-22 5:49 ` Aldy Hernandez
2023-06-26 9:22 ` Aldy Hernandez
2023-06-26 9:23 ` Aldy Hernandez
2023-06-26 16:40 ` Martin Jambor
2023-05-22 18:56 ` [PATCH] Convert remaining uses of value_range in ipa-*.cc to Value_Range Aldy Hernandez
2023-06-14 12:10 ` Aldy Hernandez
2023-06-22 5:49 ` Aldy Hernandez
2023-06-26 16:41 ` Martin Jambor
2023-06-14 12:09 ` [PATCH] Convert ipa_jump_func to use ipa_vr instead of a value_range Aldy Hernandez
2023-06-22 5:49 ` Aldy Hernandez
2023-06-26 16:40 ` Martin Jambor
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20230522185622.537454-2-aldyh@redhat.com \
--to=aldyh@redhat.com \
--cc=amacleod@redhat.com \
--cc=gcc-patches@gcc.gnu.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).