On Tue, Aug 16, 2022 at 1:32 PM Richard Biener <rguent...@suse.de> wrote:
>
> On Tue, 16 Aug 2022, Aldy Hernandez wrote:
>
> > On Tue, Aug 16, 2022 at 11:18 AM Richard Biener <rguent...@suse.de> wrote:
> > >
> > > On Mon, 15 Aug 2022, Aldy Hernandez wrote:
> > >
> > > > On Mon, Aug 15, 2022 at 9:24 PM Andrew MacLeod <amacl...@redhat.com>
> > > > wrote:
> > > > >
> > > > > heh. or just
> > > > >
> > > > >
> > > > > + int_range<2> r;
> > > > > + if (!fold_range (r, const_cast <gcond *> (cond_stmt))
> > > > > + || !r.singleton_p (&val))
> > > > >
> > > > >
> > > > > if you do not provide a range_query to any of the fold_using_range
> > > > > code,
> > > > > it defaults to:
> > > > >
> > > > > fur_source::fur_source (range_query *q)
> > > > > {
> > > > > if (q)
> > > > > m_query = q;
> > > > > else if (cfun)
> > > > > m_query = get_range_query (cfun);
> > > > > else
> > > > > m_query = get_global_range_query ();
> > > > > m_gori = NULL;
> > > > > }
> > > > >
> > > >
> > > > Sweet. Even better!
> > >
> > > So when I do the following incremental change ontop of the posted
> > > patch then I see that the path query is able to simplify more
> > > "single BB paths" than the global range folding.
> > >
> > > diff --git a/gcc/tree-ssa-threadbackward.cc
> > > b/gcc/tree-ssa-threadbackward.cc
> > > index 669098e4ec3..777e778037f 100644
> > > --- a/gcc/tree-ssa-threadbackward.cc
> > > +++ b/gcc/tree-ssa-threadbackward.cc
> > > @@ -314,6 +314,12 @@ back_threader::find_taken_edge_cond (const
> > > vec<basic_block> &path,
> > > {
> > > int_range_max r;
> > >
> > > + int_range<2> rf;
> > > + if (path.length () == 1)
> > > + {
> > > + fold_range (rf, cond);
> > > + }
> > > +
> > > m_solver->compute_ranges (path, m_imports);
> > > m_solver->range_of_stmt (r, cond);
> > >
> > > @@ -325,6 +331,8 @@ back_threader::find_taken_edge_cond (const
> > > vec<basic_block> &path,
> > >
> > > if (r == true_range || r == false_range)
> > > {
> > > + if (path.length () == 1)
> > > + gcc_assert (r == rf);
> > > edge e_true, e_false;
> > > basic_block bb = gimple_bb (cond);
> > > extract_true_false_edges_from_block (bb, &e_true, &e_false);
> > >
> > > Even doing the following (not sure what's the difference and in
> > > particular expense over the path range query) results in missed
> > > simplifications (checking my set of cc1files).
> > >
> > > diff --git a/gcc/tree-ssa-threadbackward.cc
> > > b/gcc/tree-ssa-threadbackward.cc
> > > index 669098e4ec3..1d43a179d08 100644
> > > --- a/gcc/tree-ssa-threadbackward.cc
> > > +++ b/gcc/tree-ssa-threadbackward.cc
> > > @@ -99,6 +99,7 @@ private:
> > >
> > > back_threader_registry m_registry;
> > > back_threader_profitability m_profit;
> > > + gimple_ranger *m_ranger;
> > > path_range_query *m_solver;
> > >
> > > // Current path being analyzed.
> > > @@ -146,12 +147,14 @@ back_threader::back_threader (function *fun,
> > > unsigned flags, bool first)
> > > // The path solver needs EDGE_DFS_BACK in resolving mode.
> > > if (flags & BT_RESOLVE)
> > > mark_dfs_back_edges ();
> > > - m_solver = new path_range_query (flags & BT_RESOLVE);
> > > + m_ranger = new gimple_ranger;
> > > + m_solver = new path_range_query (flags & BT_RESOLVE, m_ranger);
> > > }
> >
> > Passing an allocated ranger here results in less simplifications over
> > letting path_range_query allocate its own? That's not right. Or do
> > you mean that using fold_range() with the m_ranger causes ICEs with
> > your patch (due to the non-null processing described below)?
>
> Yes, I've needed a ranger to use fold_range (..., m_ranger) which
> I thought might do more than not passing one.
Yeah. If you don't pass it a ranger, it'll use global ranges (i.e.
SSA_NAME_RANGE_INFO).
More specifically, it will first try to get the ranger you have
enabled in your pass with enable_ranger(). If that's not available,
then it will use global ranges.
So you could also do:
m_ranger = enable_ranger (fun);
and then in the destructor:
disable_ranger (m_fun);
m_ranger = NULL; // for good measure.
Then you could use fold_range() without any parameters and it will
DTRT. This is what I had in mind when I shared my proof of concept
for tree-cfg's version of find_taken_edge(bb). If you have enabled a
ranger, it'll use that, otherwise it'll use global SSA_NAME_RANGE_INFO
ranges.
>
> > >
> > > back_threader::~back_threader ()
> > > {
> > > delete m_solver;
> > > + delete m_ranger;
> > >
> > > loop_optimizer_finalize ();
> > > }
> > > @@ -314,6 +317,12 @@ back_threader::find_taken_edge_cond (const
> > > vec<basic_block> &path,
> > > {
> > > int_range_max r;
> > >
> > > + int_range<2> rf;
> > > + if (path.length () == 1)
> > > + {
> > > + fold_range (rf, cond, m_ranger);
> > > + }
> > > +
> > > m_solver->compute_ranges (path, m_imports);
> > > m_solver->range_of_stmt (r, cond);
> > >
> > > @@ -325,6 +334,8 @@ back_threader::find_taken_edge_cond (const
> > > vec<basic_block> &path,
> > >
> > > if (r == true_range || r == false_range)
> > > {
> > > + if (path.length () == 1)
> > > + gcc_assert (r == rf);
> > > edge e_true, e_false;
> > > basic_block bb = gimple_bb (cond);
> > > extract_true_false_edges_from_block (bb, &e_true, &e_false);
> > >
> > > one example is
> > >
> > > <bb 176> [local count: 14414059]:
> > > _128 = node_177(D)->typed.type;
> > > pretmp_413 = MEM[(const union tree_node *)_128].base.code;
> > > _431 = pretmp_413 + 65519;
> > > if (_128 == 0B)
> > > goto <bb 199>; [18.09%]
> > > else
> > > goto <bb 177>; [81.91%]
> > >
> > > where m_imports for the path is just _128 and the range computed is
> > > false while the ranger query returns VARYING. But
> > > path_range_query::range_defined_in_block does
> > >
> > > if (bb && POINTER_TYPE_P (TREE_TYPE (name)))
> > > m_ranger->m_cache.m_exit.maybe_adjust_range (r, name, bb);
> > >
> > > which adjusts the range to ~[0, 0], probably because of the
> > > dereference in the following stmt.
> > >
> > > Why does fold_range not do this when folding the exit test? Is there
> > > a way to make it do so? It looks like the only routine using this
> > > in gimple-range.cc is range_on_edge and there it's used for e->src
> > > after calling range_on_exit for e->src (why's it not done in
> > > range_on_exit?). A testcase for this is
> >
> > Andrew's gonna have to answer this one, because I'm just a user of the
> > infer_range infrastructure. But yes, you're right... fold_range
> > doesn't seem to take into account side-effects such as non-null.
>
> OK, let's see. I can probably use the path query as well - I'll
> see to produce a prototype of doing those simplifications early,
> avoiding threadings there and through unreachable parts of the CFG.
Let's see if Andrew has any bright ideas on having fold_range work
right with non-null, etc. Otherwise, the path_query idea would be
fine, although it'd be nice to have a global entry point for this,
like what you suggested with find_taken_edge(bb).
Aldy
