From: Jan Hubicka <hubicka@ucw.cz>
To: aldyh@redhat.com, mjambor@suse.cz, gcc-patches@gcc.gnu.org,
amacleod@redhat.com, jwakely@redhat.com
Subject: Enable ranger for ipa-prop
Date: Tue, 27 Jun 2023 15:19:05 +0200 [thread overview]
Message-ID: <ZJrhyTWosoCcEs8V@kam.mff.cuni.cz> (raw)
Hi,
as shown in the testcase (which would eventually be useful for
optimizing std::vector's push_back), ipa-prop can use context dependent ranger
queries for better value range info.
Bootstrapped/regtested x86_64-linux, OK?
Honza
gcc/ChangeLog:
PR middle-end/110377
* ipa-prop.cc (ipa_compute_jump_functions_for_edge): Add ranger
parameter; use ranger instance for rnage queries.
(ipa_compute_jump_functions_for_bb): Pass around ranger.
(analysis_dom_walker::before_dom_children): Enable ranger.
gcc/testsuite/ChangeLog:
PR middle-end/110377
* gcc.dg/tree-ssa/pr110377.c: New test.
diff --git a/gcc/testsuite/gcc.dg/tree-ssa/pr110377.c b/gcc/testsuite/gcc.dg/tree-ssa/pr110377.c
new file mode 100644
index 00000000000..cbe3441caea
--- /dev/null
+++ b/gcc/testsuite/gcc.dg/tree-ssa/pr110377.c
@@ -0,0 +1,16 @@
+/* { dg-do compile */
+/* { dg-options "-O2 -fdump-ipa-fnsummary" } */
+int test3(int);
+__attribute__ ((noinline))
+void test2(int a)
+{
+ test3(a);
+}
+void
+test(int n)
+{
+ if (n > 5)
+ __builtin_unreachable ();
+ test2(n);
+}
+/* { dg-final { scan-tree-dump "-INF, 5-INF" "fnsummary" } } */
diff --git a/gcc/ipa-prop.cc b/gcc/ipa-prop.cc
index 41c812194ca..693d4805d93 100644
--- a/gcc/ipa-prop.cc
+++ b/gcc/ipa-prop.cc
@@ -2341,7 +2341,8 @@ ipa_set_jfunc_vr (ipa_jump_func *jf, const ipa_vr &vr)
static void
ipa_compute_jump_functions_for_edge (struct ipa_func_body_info *fbi,
- struct cgraph_edge *cs)
+ struct cgraph_edge *cs,
+ gimple_ranger *ranger)
{
ipa_node_params *info = ipa_node_params_sum->get (cs->caller);
ipa_edge_args *args = ipa_edge_args_sum->get_create (cs);
@@ -2386,7 +2387,7 @@ ipa_compute_jump_functions_for_edge (struct ipa_func_body_info *fbi,
if (TREE_CODE (arg) == SSA_NAME
&& param_type
- && get_range_query (cfun)->range_of_expr (vr, arg)
+ && get_range_query (cfun)->range_of_expr (vr, arg, cs->call_stmt)
&& vr.nonzero_p ())
addr_nonzero = true;
else if (tree_single_nonzero_warnv_p (arg, &strict_overflow))
@@ -2408,7 +2409,7 @@ ipa_compute_jump_functions_for_edge (struct ipa_func_body_info *fbi,
&& Value_Range::supports_type_p (param_type)
&& irange::supports_p (TREE_TYPE (arg))
&& irange::supports_p (param_type)
- && get_range_query (cfun)->range_of_expr (vr, arg)
+ && ranger->range_of_expr (vr, arg, cs->call_stmt)
&& !vr.undefined_p ())
{
Value_Range resvr (vr);
@@ -2517,7 +2518,8 @@ ipa_compute_jump_functions_for_edge (struct ipa_func_body_info *fbi,
from BB. */
static void
-ipa_compute_jump_functions_for_bb (struct ipa_func_body_info *fbi, basic_block bb)
+ipa_compute_jump_functions_for_bb (struct ipa_func_body_info *fbi, basic_block bb,
+ gimple_ranger *ranger)
{
struct ipa_bb_info *bi = ipa_get_bb_info (fbi, bb);
int i;
@@ -2536,7 +2538,7 @@ ipa_compute_jump_functions_for_bb (struct ipa_func_body_info *fbi, basic_block b
&& !gimple_call_fnspec (cs->call_stmt).known_p ())
continue;
}
- ipa_compute_jump_functions_for_edge (fbi, cs);
+ ipa_compute_jump_functions_for_edge (fbi, cs, ranger);
}
}
@@ -3110,19 +3112,27 @@ class analysis_dom_walker : public dom_walker
{
public:
analysis_dom_walker (struct ipa_func_body_info *fbi)
- : dom_walker (CDI_DOMINATORS), m_fbi (fbi) {}
+ : dom_walker (CDI_DOMINATORS), m_fbi (fbi)
+ {
+ m_ranger = enable_ranger (cfun, false);
+ }
+ ~analysis_dom_walker ()
+ {
+ disable_ranger (cfun);
+ }
edge before_dom_children (basic_block) final override;
private:
struct ipa_func_body_info *m_fbi;
+ gimple_ranger *m_ranger;
};
edge
analysis_dom_walker::before_dom_children (basic_block bb)
{
ipa_analyze_params_uses_in_bb (m_fbi, bb);
- ipa_compute_jump_functions_for_bb (m_fbi, bb);
+ ipa_compute_jump_functions_for_bb (m_fbi, bb, m_ranger);
return NULL;
}
next reply other threads:[~2023-06-27 13:19 UTC|newest]
Thread overview: 6+ messages / expand[flat|nested] mbox.gz Atom feed top
2023-06-27 13:19 Jan Hubicka [this message]
2023-06-27 14:00 ` Andrew MacLeod
2023-06-27 16:24 ` Jan Hubicka
2023-06-27 17:54 ` Andrew MacLeod
2023-06-28 7:37 ` Jan Hubicka
2023-06-27 15:14 ` 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=ZJrhyTWosoCcEs8V@kam.mff.cuni.cz \
--to=hubicka@ucw.cz \
--cc=aldyh@redhat.com \
--cc=amacleod@redhat.com \
--cc=gcc-patches@gcc.gnu.org \
--cc=jwakely@redhat.com \
--cc=mjambor@suse.cz \
/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).