public inbox for gcc-patches@gcc.gnu.org
 help / color / mirror / Atom feed
* [PATCH 1/2] Implement generic expression evaluator for range_query.
@ 2021-05-27  8:55 Aldy Hernandez
  2021-05-27  8:55 ` [PATCH 2/2] Replace uses of determine_value_range with range_of_expr Aldy Hernandez
  2021-05-29  4:06 ` [PATCH 1/2] Implement generic expression evaluator for range_query Jeff Law
  0 siblings, 2 replies; 5+ messages in thread
From: Aldy Hernandez @ 2021-05-27  8:55 UTC (permalink / raw)
  To: GCC patches

Right now, range_of_expr only works with constants, SSA names, and
pointers.  Anything else gets returned as VARYING.  This patch adds the
capability to deal with arbitrary expressions, inasmuch as these
tree codes are implemented in range-ops.cc.

This will give us the ability to ask for the range of any tree expression,
not just constants and SSA names, with range_of_expr().

This is a more generic implementation of determine_value_range in VRP.
A follow-up patch will remove all uses of it in favor of the
range_query API.

Tested on x86-64 Linux.

OK?

gcc/ChangeLog:

	* function-tests.c (test_ranges): Call gimple_range_tests.
	* gimple-range-gori.cc (gori_compute::expr_range_at_stmt): Use
	get_global_range_query instead of get_tree_range.
	* gimple-range.cc (fur_source::get_operand): Add argument to
	get_tree_range.
	(get_arith_expr_range): New.
	(get_tree_range): Add gimple and range_query arguments.
	Call get_arith_expr_range.
	(gimple_ranger::range_of_expr): Add argument to get_tree_range.
	Include gimple-range-tests.cc.
	* gimple-range.h (get_tree_range): Add argument.
	* selftest.h (gimple_range_tests): New.
	* value-query.cc (global_range_query::range_of_expr): Add
	argument to get_tree_range.
	* vr-values.c (vr_values::range_of_expr): Same.
	* gimple-range-tests.cc: New file.
---
 gcc/function-tests.c      |  5 +++
 gcc/gimple-range-gori.cc  |  2 +-
 gcc/gimple-range-tests.cc | 72 +++++++++++++++++++++++++++++++++++++++
 gcc/gimple-range.cc       | 50 ++++++++++++++++++++++++---
 gcc/gimple-range.h        |  2 +-
 gcc/selftest.h            |  1 +
 gcc/value-query.cc        |  4 +--
 gcc/vr-values.c           |  2 +-
 8 files changed, 129 insertions(+), 9 deletions(-)
 create mode 100644 gcc/gimple-range-tests.cc

diff --git a/gcc/function-tests.c b/gcc/function-tests.c
index 1b8f665cde1..0ac1d37f8ff 100644
--- a/gcc/function-tests.c
+++ b/gcc/function-tests.c
@@ -581,6 +581,11 @@ test_ranges ()
   push_cfun (fun);
   range_tests ();
   range_op_tests ();
+
+  build_cfg (fndecl);
+  convert_to_ssa (fndecl);
+  gimple_range_tests ();
+
   pop_cfun ();
 }
 
diff --git a/gcc/gimple-range-gori.cc b/gcc/gimple-range-gori.cc
index c51e6ce0697..12178e2ed90 100644
--- a/gcc/gimple-range-gori.cc
+++ b/gcc/gimple-range-gori.cc
@@ -589,7 +589,7 @@ gori_compute::expr_range_at_stmt (irange &r, tree expr, gimple *s)
   if (gimple_range_ssa_p (expr))
     ssa_range_in_bb (r, expr, gimple_bb (s));
   else
-    get_tree_range (r, expr);
+    get_global_range_query ()->range_of_expr (r, expr);
 }
 
 // Calculate the range for NAME if the lhs of statement S has the
diff --git a/gcc/gimple-range-tests.cc b/gcc/gimple-range-tests.cc
new file mode 100644
index 00000000000..9ee4c5aa6cd
--- /dev/null
+++ b/gcc/gimple-range-tests.cc
@@ -0,0 +1,72 @@
+/* Unit tests for GIMPLE range related routines.
+   Copyright (C) 2021 Free Software Foundation, Inc.
+
+This file is part of GCC.
+
+GCC is free software; you can redistribute it and/or modify
+it under the terms of the GNU General Public License as published by
+the Free Software Foundation; either version 3, or (at your option)
+any later version.
+
+GCC is distributed in the hope that it will be useful,
+but WITHOUT ANY WARRANTY; without even the implied warranty of
+MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+GNU General Public License for more details.
+
+You should have received a copy of the GNU General Public License
+along with GCC; see the file COPYING3.  If not see
+<http://www.gnu.org/licenses/>.  */
+
+#if CHECKING_P
+
+#include "selftest.h"
+
+namespace selftest {
+
+// Test ranges of tree expressions.
+class test_expr_eval : public gimple_ranger
+{
+public:
+  test_expr_eval ()
+  {
+    type = integer_type_node;
+    op0 = make_ssa_name (type);
+    op1 = make_ssa_name (type);
+
+    // [5,10] + [15,20] => [20, 30]
+    tree expr = fold_build2 (PLUS_EXPR, type, op0, op1);
+    int_range<2> expect (build_int_cst (type, 20), build_int_cst (type, 30));
+    int_range_max r;
+
+    ASSERT_TRUE (range_of_expr (r, expr));
+    ASSERT_TRUE (r == expect);
+  }
+
+  virtual bool range_of_expr (irange &r, tree expr, gimple * = NULL) OVERRIDE
+  {
+    if (expr == op0)
+      {
+	r.set (build_int_cst (type, 5), build_int_cst (type, 10));
+	return true;
+      }
+    if (expr == op1)
+      {
+	r.set (build_int_cst (type, 15), build_int_cst (type, 20));
+	return true;
+      }
+    return gimple_ranger::range_of_expr (r, expr);
+  }
+
+private:
+  tree op0, op1, type;
+};
+
+void
+gimple_range_tests ()
+{
+  test_expr_eval e;
+}
+
+} // namespace selftest
+
+#endif // CHECKING_P
diff --git a/gcc/gimple-range.cc b/gcc/gimple-range.cc
index b4dfaa92168..434b82b63b6 100644
--- a/gcc/gimple-range.cc
+++ b/gcc/gimple-range.cc
@@ -55,7 +55,7 @@ bool
 fur_source::get_operand (irange &r, tree expr)
 {
   if (!gimple_range_ssa_p (expr))
-    return get_tree_range (r, expr);
+    return get_tree_range (r, expr, /*stmt=*/NULL, m_query);
 
   // If no query engine is present, simply get the global value.
   if (!m_query)
@@ -168,11 +168,49 @@ gimple_range_adjustment (irange &res, const gimple *stmt)
     }
 }
 
+// Return a range for a binary or unary expression EXPR.  Return true if
+// a range is found.
+
+static bool
+get_arith_expr_range (irange &r, tree expr, gimple *stmt, range_query *query)
+{
+  tree type = TREE_TYPE (expr);
+
+  gcc_checking_assert (irange::supports_type_p (type));
+
+  if (BINARY_CLASS_P (expr))
+    {
+      int_range_max r0, r1;
+      range_operator *op = range_op_handler (TREE_CODE (expr), type);
+      if (!op)
+	return false;
+      query->range_of_expr (r0, TREE_OPERAND (expr, 0), stmt);
+      query->range_of_expr (r1, TREE_OPERAND (expr, 1), stmt);
+      op->fold_range (r, type, r0, r1);
+    }
+  else if (UNARY_CLASS_P (expr))
+    {
+      int_range_max r0;
+      range_operator *op = range_op_handler (TREE_CODE (expr), type);
+      if (!op)
+	return false;
+      query->range_of_expr (r0, TREE_OPERAND (expr, 0), stmt);
+      op->fold_range (r, type, r0, int_range<1> (type));
+    }
+  else
+    return false;
+
+  if (r.undefined_p ())
+    r.set_varying (type);
+
+  return true;
+}
+
 // Return a range in R for the tree EXPR.  Return true if a range is
 // representable, and UNDEFINED/false if not.
 
 bool
-get_tree_range (irange &r, tree expr)
+get_tree_range (irange &r, tree expr, gimple *stmt, range_query *query)
 {
   tree type;
   if (TYPE_P (expr))
@@ -212,7 +250,9 @@ get_tree_range (irange &r, tree expr)
 	}
 
       default:
-        break;
+	if (get_arith_expr_range (r, expr, stmt, query))
+	  return true;
+	break;
     }
   r.set_varying (type);
   return true;
@@ -961,7 +1001,7 @@ bool
 gimple_ranger::range_of_expr (irange &r, tree expr, gimple *stmt)
 {
   if (!gimple_range_ssa_p (expr))
-    return get_tree_range (r, expr);
+    return get_tree_range (r, expr, stmt, this);
 
   // If there is no statement, just get the global value.
   if (!stmt)
@@ -1463,3 +1503,5 @@ disable_ranger (struct function *fun)
 
   fun->x_range_query = &global_ranges;
 }
+
+#include "gimple-range-tests.cc"
diff --git a/gcc/gimple-range.h b/gcc/gimple-range.h
index ecd332a3c54..22445f8215d 100644
--- a/gcc/gimple-range.h
+++ b/gcc/gimple-range.h
@@ -173,7 +173,7 @@ fold_range (irange &r, gimple *s, edge on_edge, range_query *q = NULL)
 }
 
 // Calculate a basic range for a tree node expression.
-extern bool get_tree_range (irange &r, tree expr);
+extern bool get_tree_range (irange &r, tree expr, gimple *s, range_query *);
 
 // These routines provide a GIMPLE interface to the range-ops code.
 extern tree gimple_range_operand1 (const gimple *s);
diff --git a/gcc/selftest.h b/gcc/selftest.h
index e609117ec2b..80459d63a39 100644
--- a/gcc/selftest.h
+++ b/gcc/selftest.h
@@ -249,6 +249,7 @@ extern void predict_c_tests ();
 extern void pretty_print_c_tests ();
 extern void range_tests ();
 extern void range_op_tests ();
+extern void gimple_range_tests ();
 extern void read_rtl_function_c_tests ();
 extern void rtl_tests_c_tests ();
 extern void sbitmap_c_tests ();
diff --git a/gcc/value-query.cc b/gcc/value-query.cc
index f8b457d362c..58938b1ce14 100644
--- a/gcc/value-query.cc
+++ b/gcc/value-query.cc
@@ -316,12 +316,12 @@ get_global_range_query ()
 }
 
 bool
-global_range_query::range_of_expr (irange &r, tree expr, gimple *)
+global_range_query::range_of_expr (irange &r, tree expr, gimple *stmt)
 {
   tree type = TREE_TYPE (expr);
 
   if (!irange::supports_type_p (type) || !gimple_range_ssa_p (expr))
-    return get_tree_range (r, expr);
+    return get_tree_range (r, expr, stmt, this);
 
   get_range_global (r, expr);
 
diff --git a/gcc/vr-values.c b/gcc/vr-values.c
index 3d0be8edb3b..5e7e51e00c3 100644
--- a/gcc/vr-values.c
+++ b/gcc/vr-values.c
@@ -180,7 +180,7 @@ bool
 vr_values::range_of_expr (irange &r, tree expr, gimple *stmt)
 {
   if (!gimple_range_ssa_p (expr))
-    return get_tree_range (r, expr);
+    return get_tree_range (r, expr, stmt, this);
 
   if (const value_range *vr = get_value_range (expr, stmt))
     {
-- 
2.31.1


^ permalink raw reply	[flat|nested] 5+ messages in thread
end of thread, other threads:[~2021-06-03 15:42 UTC | newest]

Thread overview: 5+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2021-05-27  8:55 [PATCH 1/2] Implement generic expression evaluator for range_query Aldy Hernandez
2021-05-27  8:55 ` [PATCH 2/2] Replace uses of determine_value_range with range_of_expr Aldy Hernandez
2021-05-29  4:06 ` [PATCH 1/2] Implement generic expression evaluator for range_query Jeff Law
2021-06-03 15:39   ` Aldy Hernandez
2021-06-03 15:42     ` Andrew MacLeod

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).