From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: by sourceware.org (Postfix, from userid 1011) id B500D3857BBD; Thu, 22 Sep 2022 18:49:27 +0000 (GMT) DKIM-Filter: OpenDKIM Filter v2.11.0 sourceware.org B500D3857BBD DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gcc.gnu.org; s=default; t=1663872567; bh=kNZyihUhEQr2rhk6X+f8yuxuMywPdk1e9GqA17YIQnc=; h=From:To:Subject:Date:From; b=ugHcrkYfsW01JI1vl7F47CePX9hmdcKXXIF3NjiDzqm/DefNGa7iAL1ZUrstXo8dA p0JZGvfTviK/QT0CfvfwAzDiZ7a2nEnHPtMWeGaO6GQepnGDdOJvrKTwUWdFVtP/Xg EXNB/91EIFOm06ktrisaEnIICP1NHXdhcsCm+7Ic= MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Content-Type: text/plain; charset="utf-8" From: Andrew Macleod To: gcc-cvs@gcc.gnu.org Subject: [gcc r13-2789] Add range-ops support for builtin functions. X-Act-Checkin: gcc X-Git-Author: Andrew MacLeod X-Git-Refname: refs/heads/master X-Git-Oldrev: 2f92f685da2ef9e82ee6262519919180df8f2dd9 X-Git-Newrev: b40b3035879cf695b72010858b9705a344292bdb Message-Id: <20220922184927.B500D3857BBD@sourceware.org> Date: Thu, 22 Sep 2022 18:49:27 +0000 (GMT) List-Id: https://gcc.gnu.org/g:b40b3035879cf695b72010858b9705a344292bdb commit r13-2789-gb40b3035879cf695b72010858b9705a344292bdb Author: Andrew MacLeod Date: Tue Sep 20 16:53:37 2022 -0400 Add range-ops support for builtin functions. Convert CFN_BUILT_IN_CONSTANT_P as first POC. * gimple-range-fold.cc (fold_using_range::range_of_builtin_int_call): Remove case for CFN_BUILT_IN_CONSTANT_P. * gimple-range-op.cc (gimple_range_op_handler::supported_p): Check if a call also creates a range-op object. (gimple_range_op_handler): Also check builtin calls. (class cfn_constant_float_p): New. Float CFN_BUILT_IN_CONSTANT_P. (class cfn_constant_p): New. Integral CFN_BUILT_IN_CONSTANT_P. (gimple_range_op_handler::maybe_builtin_call): Set arguments and handler for supported built-in calls. * gimple-range-op.h (maybe_builtin_call): New prototype. Diff: --- gcc/gimple-range-fold.cc | 17 -------- gcc/gimple-range-op.cc | 104 +++++++++++++++++++++++++++++++++++++++++++---- gcc/gimple-range-op.h | 1 + 3 files changed, 97 insertions(+), 25 deletions(-) diff --git a/gcc/gimple-range-fold.cc b/gcc/gimple-range-fold.cc index 42408254c35..63a1f517d28 100644 --- a/gcc/gimple-range-fold.cc +++ b/gcc/gimple-range-fold.cc @@ -944,23 +944,6 @@ fold_using_range::range_of_builtin_int_call (irange &r, gcall *call, switch (func) { - case CFN_BUILT_IN_CONSTANT_P: - { - arg = gimple_call_arg (call, 0); - Value_Range tmp (TREE_TYPE (arg)); - if (src.get_operand (tmp, arg) && tmp.singleton_p ()) - { - r.set (build_one_cst (type), build_one_cst (type)); - return true; - } - if (cfun->after_inlining) - { - r.set_zero (type); - return true; - } - break; - } - case CFN_BUILT_IN_SIGNBIT: { arg = gimple_call_arg (call, 0); diff --git a/gcc/gimple-range-op.cc b/gcc/gimple-range-op.cc index ab5b389449d..bcc4c3d778c 100644 --- a/gcc/gimple-range-op.cc +++ b/gcc/gimple-range-op.cc @@ -123,7 +123,11 @@ gimple_range_op_handler::supported_p (gimple *s) { enum tree_code code; tree type = get_code_and_type (s, code); - return (type && range_op_handler (code, type)); + if (type && range_op_handler (code, type)) + return true; + if (is_a (s) && gimple_range_op_handler (s)) + return true; + return false; } // Construct a handler object for statement S. @@ -133,6 +137,8 @@ gimple_range_op_handler::gimple_range_op_handler (gimple *s) enum tree_code code; tree type = get_code_and_type (s, code); m_stmt = s; + m_op1 = NULL_TREE; + m_op2 = NULL_TREE; if (type) set_op_handler (code, type); @@ -142,7 +148,7 @@ gimple_range_op_handler::gimple_range_op_handler (gimple *s) case GIMPLE_COND: m_op1 = gimple_cond_lhs (m_stmt); m_op2 = gimple_cond_rhs (m_stmt); - break; + return; case GIMPLE_ASSIGN: m_op1 = gimple_range_base_of_assignment (m_stmt); if (m_op1 && TREE_CODE (m_op1) == MEM_REF) @@ -158,14 +164,15 @@ gimple_range_op_handler::gimple_range_op_handler (gimple *s) } if (gimple_num_ops (m_stmt) >= 3) m_op2 = gimple_assign_rhs2 (m_stmt); - else - m_op2 = NULL_TREE; - break; + return; default: - m_op1 = NULL_TREE; - m_op2 = NULL_TREE; - break; + gcc_unreachable (); + return; } + // If no range-op table entry handled this stmt, check for other supported + // statements. + if (is_a (m_stmt)) + maybe_builtin_call (); } // Calculate what we can determine of the range of this unary @@ -247,3 +254,84 @@ gimple_range_op_handler::calc_op2 (vrange &r, const vrange &lhs_range, } return op2_range (r, type, lhs_range, op1_range); } + +// -------------------------------------------------------------------- + +// Implement range operator for float CFN_BUILT_IN_CONSTANT_P. +class cfn_constant_float_p : public range_operator_float +{ +public: + using range_operator_float::fold_range; + virtual bool fold_range (irange &r, tree type, const frange &lh, + const irange &, relation_kind) const + { + if (lh.singleton_p ()) + { + r.set (build_one_cst (type), build_one_cst (type)); + return true; + } + if (cfun->after_inlining) + { + r.set_zero (type); + return true; + } + return false; + } +} op_cfn_constant_float_p; + +// Implement range operator for integral CFN_BUILT_IN_CONSTANT_P. +class cfn_constant_p : public range_operator +{ +public: + using range_operator::fold_range; + virtual bool fold_range (irange &r, tree type, const irange &lh, + const irange &, relation_kind) const + { + if (lh.singleton_p ()) + { + r.set (build_one_cst (type), build_one_cst (type)); + return true; + } + if (cfun->after_inlining) + { + r.set_zero (type); + return true; + } + return false; + } +} op_cfn_constant_p; + +// Set up a gimple_range_op_handler for any built in function which can be +// supported via range-ops. + +void +gimple_range_op_handler::maybe_builtin_call () +{ + gcc_checking_assert (is_a (m_stmt)); + + gcall *call = as_a (m_stmt); + combined_fn func = gimple_call_combined_fn (call); + if (func == CFN_LAST) + return; + tree type = gimple_range_type (call); + gcc_checking_assert (type); + if (!Value_Range::supports_type_p (type)) + return; + + switch (func) + { + case CFN_BUILT_IN_CONSTANT_P: + m_op1 = gimple_call_arg (call, 0); + m_valid = true; + if (irange::supports_p (TREE_TYPE (m_op1))) + m_int = &op_cfn_constant_p; + else if (frange::supports_p (TREE_TYPE (m_op1))) + m_float = &op_cfn_constant_float_p; + else + m_valid = false; + break; + + default: + break; + } +} diff --git a/gcc/gimple-range-op.h b/gcc/gimple-range-op.h index 8bc0a8fbe11..68764198bc0 100644 --- a/gcc/gimple-range-op.h +++ b/gcc/gimple-range-op.h @@ -38,6 +38,7 @@ public: bool calc_op1 (vrange &r, const vrange &lhs_range, const vrange &op2_range); bool calc_op2 (vrange &r, const vrange &lhs_range, const vrange &op1_range); private: + void maybe_builtin_call (); gimple *m_stmt; tree m_op1, m_op2; };