From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: by sourceware.org (Postfix, from userid 1888) id 02F0F384EF4A; Fri, 16 Dec 2022 21:11:33 +0000 (GMT) DKIM-Filter: OpenDKIM Filter v2.11.0 sourceware.org 02F0F384EF4A DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gcc.gnu.org; s=default; t=1671225094; bh=vYjVQX6aaesdY6kFUx8IMwZNhm/1shKIrx5G3aZBBwY=; h=From:To:Subject:Date:From; b=nnqnwQdw//+2e/XUr1/6QF7pTcoB2jPDX/CQ0Fq9i667fmYtIzN8fjhYcw9hPA9yY QTpM2JiONTgwwcOidI3TZZ9K/XEAvHazBeCfmDWT5t2pApB/MqPWObSr1WBcyljVMe eGMSxKyrreqTreQDVEscBOk+KBHdp1mHhcQfYkXY= MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Content-Type: text/plain; charset="utf-8" From: Patrick Palka To: gcc-cvs@gcc.gnu.org Subject: [gcc r11-10424] c++: quadratic constexpr behavior for left-assoc logical exprs [PR102780] X-Act-Checkin: gcc X-Git-Author: Patrick Palka X-Git-Refname: refs/heads/releases/gcc-11 X-Git-Oldrev: dd83fe934958f2f229eb3a2107864232f00123c4 X-Git-Newrev: 71d2567a678b01a3a59064d22e0f9165be9e93c3 Message-Id: <20221216211134.02F0F384EF4A@sourceware.org> Date: Fri, 16 Dec 2022 21:11:33 +0000 (GMT) List-Id: https://gcc.gnu.org/g:71d2567a678b01a3a59064d22e0f9165be9e93c3 commit r11-10424-g71d2567a678b01a3a59064d22e0f9165be9e93c3 Author: Patrick Palka Date: Thu Oct 28 10:05:14 2021 -0400 c++: quadratic constexpr behavior for left-assoc logical exprs [PR102780] In the testcase below the two left fold expressions each expand into a constant logical expression with 1024 terms, for which potential_const_expr takes more than a minute to return true. This happens because p_c_e_1 performs trial evaluation of the first operand of a &&/|| in order to determine whether to consider the potentiality of the second operand. And because the expanded expression is left-associated, this trial evaluation causes p_c_e_1 to be quadratic in the number of terms of the expression. This patch fixes this quadratic behavior by making p_c_e_1 preemptively compute potentiality of the second operand of a &&/||, and perform trial evaluation of the first operand only if the second operand isn't potentially constant. We must be careful to avoid emitting bogus diagnostics during the preemptive computation; to that end, we perform this shortcut only when tf_error is cleared, and when tf_error is set we now first check potentiality of the whole expression quietly and replay the check noisily for diagnostics. Apart from fixing the quadraticness for left-associated logical exprs, this change also reduces compile time for the libstdc++ testcase 20_util/variant/87619.cc by about 15% even though our uses right folds instead of left folds. Likewise for the testcase in the PR, for which compile time is reduced by 30%. The reason for these speedups is that p_c_e_1 no longer performs expensive trial evaluation of each term of large constant logical expressions when determining their potentiality. PR c++/102780 PR c++/108138 gcc/cp/ChangeLog: * constexpr.c (potential_constant_expression_1) : When tf_error isn't set, preemptively check potentiality of the second operand before performing trial evaluation of the first operand. (potential_constant_expression_1): When tf_error is set, first check potentiality quietly and return true if successful, otherwise proceed noisily to give errors. gcc/testsuite/ChangeLog: * g++.dg/cpp1z/fold13.C: New test. (cherry picked from commit 9927ecbb42d5be48fa933adc26f8601fab5007ca) Diff: --- gcc/cp/constexpr.c | 26 +++++++++++++++++++++----- gcc/testsuite/g++.dg/cpp1z/fold13.C | 29 +++++++++++++++++++++++++++++ 2 files changed, 50 insertions(+), 5 deletions(-) diff --git a/gcc/cp/constexpr.c b/gcc/cp/constexpr.c index d7bea558bfb..8bd41166dd9 100644 --- a/gcc/cp/constexpr.c +++ b/gcc/cp/constexpr.c @@ -8882,13 +8882,18 @@ potential_constant_expression_1 (tree t, bool want_rval, bool strict, bool now, tmp = boolean_false_node; truth: { - tree op = TREE_OPERAND (t, 0); - if (!RECUR (op, rval)) + tree op0 = TREE_OPERAND (t, 0); + tree op1 = TREE_OPERAND (t, 1); + if (!RECUR (op0, rval)) return false; + if (!(flags & tf_error) && RECUR (op1, rval)) + /* When quiet, try to avoid expensive trial evaluation by first + checking potentiality of the second operand. */ + return true; if (!processing_template_decl) - op = cxx_eval_outermost_constant_expr (op, true); - if (tree_int_cst_equal (op, tmp)) - return RECUR (TREE_OPERAND (t, 1), rval); + op0 = cxx_eval_outermost_constant_expr (op0, true); + if (tree_int_cst_equal (op0, tmp)) + return (flags & tf_error) ? RECUR (op1, rval) : false; else return true; } @@ -9089,6 +9094,17 @@ bool potential_constant_expression_1 (tree t, bool want_rval, bool strict, bool now, tsubst_flags_t flags) { + if (flags & tf_error) + { + /* Check potentiality quietly first, as that could be performed more + efficiently in some cases (currently only for TRUTH_*_EXPR). If + that fails, replay the check noisily to give errors. */ + flags &= ~tf_error; + if (potential_constant_expression_1 (t, want_rval, strict, now, flags)) + return true; + flags |= tf_error; + } + tree target = NULL_TREE; return potential_constant_expression_1 (t, want_rval, strict, now, flags, &target); diff --git a/gcc/testsuite/g++.dg/cpp1z/fold13.C b/gcc/testsuite/g++.dg/cpp1z/fold13.C new file mode 100644 index 00000000000..9d7554f8999 --- /dev/null +++ b/gcc/testsuite/g++.dg/cpp1z/fold13.C @@ -0,0 +1,29 @@ +// { dg-do compile { target c++17 } } +// Verify constexpr evaluation of a large left fold logical expression +// isn't quadratic in the size of the expanded expression. + +template struct S { static constexpr bool value = true; }; + +template struct integer_sequence { }; + +template +using make_integer_sequence +#if __has_builtin(__make_integer_seq) + = __make_integer_seq; +#else + = integer_sequence; +#endif + +template +constexpr bool f_impl(integer_sequence) { + return (... && S::value); +} + +static_assert(f_impl(make_integer_sequence())); + +template +constexpr bool g_impl(integer_sequence) { + return (... || !S::value); +} + +static_assert(!g_impl(make_integer_sequence()));