Re: [PATCH] Remove path_range_query constructor that takes an edge.
On Thu, Aug 18, 2022 at 6:13 PM Aldy Hernandez wrote:
>
> The path_range_query constructor that takes an edge is really a
> convenience function for the loop-ch pass. It feels wrong to pollute
> the API with such a specialized function that could be done with
> a small inline function closer to its user.
>
> As an added benefit, we remove one use of reset_path. The last
> remaining one is the forward threader one.
>
> OK?
OK.
> gcc/ChangeLog:
>
> * gimple-range-path.cc (path_range_query::path_range_query):
> Remove constructor that takes edge.
> * gimple-range-path.h (class path_range_query): Same.
> * tree-ssa-loop-ch.cc (edge_range_query): New.
> (entry_loop_condition_is_static): Call edge_range_query.
> ---
> gcc/gimple-range-path.cc | 15 ---
> gcc/gimple-range-path.h | 1 -
> gcc/tree-ssa-loop-ch.cc | 17 +++--
> 3 files changed, 15 insertions(+), 18 deletions(-)
>
> diff --git a/gcc/gimple-range-path.cc b/gcc/gimple-range-path.cc
> index ba7c2ed9b47..bc2879c0c57 100644
> --- a/gcc/gimple-range-path.cc
> +++ b/gcc/gimple-range-path.cc
> @@ -59,21 +59,6 @@ path_range_query::path_range_query (gimple_ranger ,
> bool resolve)
>m_oracle = new path_oracle (m_ranger.oracle ());
> }
>
> -path_range_query::path_range_query (gimple_ranger ,
> - edge e,
> - bool resolve)
> - : m_cache (new ssa_global_cache),
> -m_has_cache_entry (BITMAP_ALLOC (NULL)),
> -m_ranger (ranger),
> -m_resolve (resolve)
> -{
> - m_oracle = new path_oracle (m_ranger.oracle ());
> - auto_vec bbs (2);
> - bbs.quick_push (e->dest);
> - bbs.quick_push (e->src);
> - reset_path (bbs, NULL);
> -}
> -
> path_range_query::~path_range_query ()
> {
>delete m_oracle;
> diff --git a/gcc/gimple-range-path.h b/gcc/gimple-range-path.h
> index 483fde0d431..9f2d6d92dab 100644
> --- a/gcc/gimple-range-path.h
> +++ b/gcc/gimple-range-path.h
> @@ -37,7 +37,6 @@ public:
> const bitmap_head *dependencies = NULL,
> bool resolve = true);
>path_range_query (gimple_ranger , bool resolve = true);
> - path_range_query (gimple_ranger , edge e, bool resolve = true);
>virtual ~path_range_query ();
>void reset_path (const vec &, const bitmap_head
> *dependencies);
>bool range_of_expr (vrange , tree name, gimple * = NULL) override;
> diff --git a/gcc/tree-ssa-loop-ch.cc b/gcc/tree-ssa-loop-ch.cc
> index 96816b89287..9c316887d5b 100644
> --- a/gcc/tree-ssa-loop-ch.cc
> +++ b/gcc/tree-ssa-loop-ch.cc
> @@ -45,6 +45,20 @@ along with GCC; see the file COPYING3. If not see
> increases effectiveness of code motion optimizations, and reduces the need
> for loop preconditioning. */
>
> +/* Given a path through edge E, whose last statement is COND, return
> + the range of the solved conditional in R. */
> +
> +static void
> +edge_range_query (irange , edge e, gcond *cond, gimple_ranger )
> +{
> + auto_vec path (2);
> + path.safe_push (e->dest);
> + path.safe_push (e->src);
> + path_range_query query (ranger, path);
> + if (!query.range_of_stmt (r, cond))
> +r.set_varying (boolean_type_node);
> +}
> +
> /* Return true if the condition on the first iteration of the loop can
> be statically determined. */
>
> @@ -72,8 +86,7 @@ entry_loop_condition_is_static (class loop *l,
> gimple_ranger *ranger)
> desired_static_value = boolean_true_node;
>
>int_range<2> r;
> - path_range_query query (*ranger, e);
> - query.range_of_stmt (r, last);
> + edge_range_query (r, e, last, *ranger);
>return r == int_range<2> (desired_static_value, desired_static_value);
> }
>
> --
> 2.37.1
>
[PATCH] Remove path_range_query constructor that takes an edge.
The path_range_query constructor that takes an edge is really a
convenience function for the loop-ch pass. It feels wrong to pollute
the API with such a specialized function that could be done with
a small inline function closer to its user.
As an added benefit, we remove one use of reset_path. The last
remaining one is the forward threader one.
OK?
gcc/ChangeLog:
* gimple-range-path.cc (path_range_query::path_range_query):
Remove constructor that takes edge.
* gimple-range-path.h (class path_range_query): Same.
* tree-ssa-loop-ch.cc (edge_range_query): New.
(entry_loop_condition_is_static): Call edge_range_query.
---
gcc/gimple-range-path.cc | 15 ---
gcc/gimple-range-path.h | 1 -
gcc/tree-ssa-loop-ch.cc | 17 +++--
3 files changed, 15 insertions(+), 18 deletions(-)
diff --git a/gcc/gimple-range-path.cc b/gcc/gimple-range-path.cc
index ba7c2ed9b47..bc2879c0c57 100644
--- a/gcc/gimple-range-path.cc
+++ b/gcc/gimple-range-path.cc
@@ -59,21 +59,6 @@ path_range_query::path_range_query (gimple_ranger ,
bool resolve)
m_oracle = new path_oracle (m_ranger.oracle ());
}
-path_range_query::path_range_query (gimple_ranger ,
- edge e,
- bool resolve)
- : m_cache (new ssa_global_cache),
-m_has_cache_entry (BITMAP_ALLOC (NULL)),
-m_ranger (ranger),
-m_resolve (resolve)
-{
- m_oracle = new path_oracle (m_ranger.oracle ());
- auto_vec bbs (2);
- bbs.quick_push (e->dest);
- bbs.quick_push (e->src);
- reset_path (bbs, NULL);
-}
-
path_range_query::~path_range_query ()
{
delete m_oracle;
diff --git a/gcc/gimple-range-path.h b/gcc/gimple-range-path.h
index 483fde0d431..9f2d6d92dab 100644
--- a/gcc/gimple-range-path.h
+++ b/gcc/gimple-range-path.h
@@ -37,7 +37,6 @@ public:
const bitmap_head *dependencies = NULL,
bool resolve = true);
path_range_query (gimple_ranger , bool resolve = true);
- path_range_query (gimple_ranger , edge e, bool resolve = true);
virtual ~path_range_query ();
void reset_path (const vec &, const bitmap_head *dependencies);
bool range_of_expr (vrange , tree name, gimple * = NULL) override;
diff --git a/gcc/tree-ssa-loop-ch.cc b/gcc/tree-ssa-loop-ch.cc
index 96816b89287..9c316887d5b 100644
--- a/gcc/tree-ssa-loop-ch.cc
+++ b/gcc/tree-ssa-loop-ch.cc
@@ -45,6 +45,20 @@ along with GCC; see the file COPYING3. If not see
increases effectiveness of code motion optimizations, and reduces the need
for loop preconditioning. */
+/* Given a path through edge E, whose last statement is COND, return
+ the range of the solved conditional in R. */
+
+static void
+edge_range_query (irange , edge e, gcond *cond, gimple_ranger )
+{
+ auto_vec path (2);
+ path.safe_push (e->dest);
+ path.safe_push (e->src);
+ path_range_query query (ranger, path);
+ if (!query.range_of_stmt (r, cond))
+r.set_varying (boolean_type_node);
+}
+
/* Return true if the condition on the first iteration of the loop can
be statically determined. */
@@ -72,8 +86,7 @@ entry_loop_condition_is_static (class loop *l, gimple_ranger
*ranger)
desired_static_value = boolean_true_node;
int_range<2> r;
- path_range_query query (*ranger, e);
- query.range_of_stmt (r, last);
+ edge_range_query (r, e, last, *ranger);
return r == int_range<2> (desired_static_value, desired_static_value);
}
--
2.37.1
