Bootstrapped on x86_64-pc-linux-gnu with no regressions. Pushed.
Andrew
From e7f035f66aa25e0537a0e3a76d43c71fe9531724 Mon Sep 17 00:00:00 2001
From: Andrew MacLeod <amacl...@redhat.com>
Date: Tue, 20 Sep 2022 19:19:30 -0400
Subject: [PATCH 16/17] Convert CFN_BUILT_IN_GOACC_DIM_* to range-ops.
* gimple-range-fold.cc (range_of_builtin_int_call): Remove case
for CFN_GOACC_DIM_*.
* gimple-range-op.cc (class cfn_goacc_dim): New.
(gimple_range_op_handler::maybe_builtin_call): Set arguments.
---
gcc/gimple-range-fold.cc | 19 ----------------
gcc/gimple-range-op.cc | 47 ++++++++++++++++++++++++++++++++++++++++
2 files changed, 47 insertions(+), 19 deletions(-)
diff --git a/gcc/gimple-range-fold.cc b/gcc/gimple-range-fold.cc
index d22fb0e9352..5e8a13e7337 100644
--- a/gcc/gimple-range-fold.cc
+++ b/gcc/gimple-range-fold.cc
@@ -889,25 +889,6 @@ fold_using_range::range_of_builtin_int_call (irange &r, gcall *call,
r.set (build_zero_cst (type), build_one_cst (type));
return true;
- case CFN_GOACC_DIM_SIZE:
- case CFN_GOACC_DIM_POS:
- // Optimizing these two internal functions helps the loop
- // optimizer eliminate outer comparisons. Size is [1,N]
- // and pos is [0,N-1].
- {
- bool is_pos = func == CFN_GOACC_DIM_POS;
- int axis = oacc_get_ifn_dim_arg (call);
- int size = oacc_get_fn_dim_size (current_function_decl, axis);
- if (!size)
- // If it's dynamic, the backend might know a hardware limitation.
- size = targetm.goacc.dim_limit (axis);
-
- r.set (build_int_cst (type, is_pos ? 0 : 1),
- size
- ? build_int_cst (type, size - is_pos) : vrp_val_max (type));
- return true;
- }
-
default:
break;
}
diff --git a/gcc/gimple-range-op.cc b/gcc/gimple-range-op.cc
index f9161b5820f..76295466e65 100644
--- a/gcc/gimple-range-op.cc
+++ b/gcc/gimple-range-op.cc
@@ -635,6 +635,34 @@ public:
}
} op_cfn_strlen;
+
+// Implement range operator for CFN_BUILT_IN_GOACC_DIM
+class cfn_goacc_dim : public range_operator
+{
+public:
+ cfn_goacc_dim (bool is_pos) { m_is_pos = is_pos; }
+ using range_operator::fold_range;
+ virtual bool fold_range (irange &r, tree type, const irange &lh,
+ const irange &, relation_kind) const
+ {
+ tree axis_tree;
+ if (!lh.singleton_p (&axis_tree))
+ return false;
+ HOST_WIDE_INT axis = TREE_INT_CST_LOW (axis_tree);
+ int size = oacc_get_fn_dim_size (current_function_decl, axis);
+ if (!size)
+ // If it's dynamic, the backend might know a hardware limitation.
+ size = targetm.goacc.dim_limit (axis);
+
+ r.set (build_int_cst (type, m_is_pos ? 0 : 1),
+ size
+ ? build_int_cst (type, size - m_is_pos) : vrp_val_max (type));
+ return true;
+ }
+private:
+ bool m_is_pos;
+} op_cfn_goacc_dim_size (false), op_cfn_goacc_dim_pos (true);
+
// Set up a gimple_range_op_handler for any built in function which can be
// supported via range-ops.
@@ -748,6 +776,25 @@ gimple_range_op_handler::maybe_builtin_call ()
break;
}
+ // Optimizing these two internal functions helps the loop
+ // optimizer eliminate outer comparisons. Size is [1,N]
+ // and pos is [0,N-1].
+ case CFN_GOACC_DIM_SIZE:
+ // This call will ensure all the asserts are triggered.
+ oacc_get_ifn_dim_arg (call);
+ m_op1 = gimple_call_arg (call, 0);
+ m_valid = true;
+ m_int = &op_cfn_goacc_dim_size;
+ break;
+
+ case CFN_GOACC_DIM_POS:
+ // This call will ensure all the asserts are triggered.
+ oacc_get_ifn_dim_arg (call);
+ m_op1 = gimple_call_arg (call, 0);
+ m_valid = true;
+ m_int = &op_cfn_goacc_dim_pos;
+ break;
+
default:
break;
}
--
2.37.3
