From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from smtp-out2.suse.de (smtp-out2.suse.de [195.135.223.131]) by sourceware.org (Postfix) with ESMTPS id A13063858437 for ; Tue, 19 Mar 2024 12:06:51 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.2 sourceware.org A13063858437 Authentication-Results: sourceware.org; dmarc=pass (p=none dis=none) header.from=suse.de Authentication-Results: sourceware.org; spf=pass smtp.mailfrom=suse.de ARC-Filter: OpenARC Filter v1.0.0 sourceware.org A13063858437 Authentication-Results: server2.sourceware.org; arc=none smtp.remote-ip=195.135.223.131 ARC-Seal: i=1; a=rsa-sha256; d=sourceware.org; s=key; t=1710850013; cv=none; b=uXGMAA6NShMTdFV4PeQ9e23bpk/xC8q0iizVnE/qZytg50Z95Um1kjeCVmI9pR8xnh54Qiqn99dmHsqa1y8Jicp5epelPNP1UYcDBw9n25w63gi4mB3G/8Q5sNjvwQJxGkZes+cezE8N9H+rmcWbZ0ffrDcHzZEhOSMaU3B1cJQ= ARC-Message-Signature: i=1; a=rsa-sha256; d=sourceware.org; s=key; t=1710850013; c=relaxed/simple; bh=AZtcOEzw6au8OlKp8uxTeKg2WNaI8NfiB1iwUpMT8n0=; h=DKIM-Signature:DKIM-Signature:DKIM-Signature:DKIM-Signature:Date: From:To:Subject:MIME-Version; b=k76eikMKk0xOSzU/KzNxzSX/UCqB8z9CTyr9cJYR8WQPWqYykHmQAszWS2DEp3EakuvxCkROLr4bOnNUf8nnVRXIQ3EtH+TpVFJhGD8VmfjUbdbUANwDKCxnrcj/6O/Y9/S1I18dD7huS/YNK8tC6Oxfc8lKulnouCaRicptPUc= ARC-Authentication-Results: i=1; server2.sourceware.org Received: from [10.168.4.150] (unknown [10.168.4.150]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) by smtp-out2.suse.de (Postfix) with ESMTPS id 9AFC35D60E; Tue, 19 Mar 2024 12:06:50 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=suse.de; s=susede2_rsa; t=1710850010; h=from:from:reply-to:date:date:to:to:cc:cc:mime-version:mime-version: content-type:content-type; bh=9pykaBVdCc98IHGCN8wXV0f19Z/y6BumTUjGd+cTm/A=; b=By3ksAG+rrYDJ47Eu1ASwc6mDOqKVttUn7VWjhStFDp/bvvCETVxnscZ2i8VrdRkpi28Kf KXPXXB2425cjt5VHuyTulsXZBmC3laDA0aZhpZn9UgQAZaMoiUfbtsAMrZVJkKvGPGzUrk r84N88s3RDKB+7JtL+FeCCop9K9eE6E= DKIM-Signature: v=1; a=ed25519-sha256; c=relaxed/relaxed; d=suse.de; s=susede2_ed25519; t=1710850010; h=from:from:reply-to:date:date:to:to:cc:cc:mime-version:mime-version: content-type:content-type; bh=9pykaBVdCc98IHGCN8wXV0f19Z/y6BumTUjGd+cTm/A=; b=eh/0FIUvxAF4wrZVg5bLkM2JKMmxyGwZQR8NBXXXp1xS7WbE/bREp0gId59dKDtenRsRpu SYnDjiRDjxEGsHAA== DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=suse.de; s=susede2_rsa; t=1710850010; h=from:from:reply-to:date:date:to:to:cc:cc:mime-version:mime-version: content-type:content-type; bh=9pykaBVdCc98IHGCN8wXV0f19Z/y6BumTUjGd+cTm/A=; b=By3ksAG+rrYDJ47Eu1ASwc6mDOqKVttUn7VWjhStFDp/bvvCETVxnscZ2i8VrdRkpi28Kf KXPXXB2425cjt5VHuyTulsXZBmC3laDA0aZhpZn9UgQAZaMoiUfbtsAMrZVJkKvGPGzUrk r84N88s3RDKB+7JtL+FeCCop9K9eE6E= DKIM-Signature: v=1; a=ed25519-sha256; c=relaxed/relaxed; d=suse.de; s=susede2_ed25519; t=1710850010; h=from:from:reply-to:date:date:to:to:cc:cc:mime-version:mime-version: content-type:content-type; bh=9pykaBVdCc98IHGCN8wXV0f19Z/y6BumTUjGd+cTm/A=; b=eh/0FIUvxAF4wrZVg5bLkM2JKMmxyGwZQR8NBXXXp1xS7WbE/bREp0gId59dKDtenRsRpu SYnDjiRDjxEGsHAA== Date: Tue, 19 Mar 2024 13:06:50 +0100 (CET) From: Richard Biener To: gcc-patches@gcc.gnu.org cc: Jakub Jelinek Subject: [PATCH] tree-optimization/114151 - revert PR114074 fix MIME-Version: 1.0 Content-Type: text/plain; charset=US-ASCII X-Spam-Score: 1.42 X-Spamd-Result: default: False [1.42 / 50.00]; ARC_NA(0.00)[]; FROM_HAS_DN(0.00)[]; TO_DN_SOME(0.00)[]; TO_MATCH_ENVRCPT_ALL(0.00)[]; NEURAL_SPAM_SHORT(2.93)[0.975]; MIME_GOOD(-0.10)[text/plain]; NEURAL_HAM_LONG(-0.90)[-0.905]; MISSING_MID(2.50)[]; DKIM_SIGNED(0.00)[suse.de:s=susede2_rsa,suse.de:s=susede2_ed25519]; RCPT_COUNT_TWO(0.00)[2]; FUZZY_BLOCKED(0.00)[rspamd.com]; RCVD_COUNT_ZERO(0.00)[0]; FROM_EQ_ENVFROM(0.00)[]; MIME_TRACE(0.00)[0:+]; BAYES_HAM(-3.00)[100.00%] Authentication-Results: smtp-out2.suse.de; none X-Spam-Status: No, score=-10.5 required=5.0 tests=BAYES_00,DKIM_SIGNED,DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,GIT_PATCH_0,MISSING_MID,SPF_HELO_NONE,SPF_PASS,TXREP,T_SCC_BODY_TEXT_LINE autolearn=ham autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on server2.sourceware.org List-Id: Message-ID: <20240319120650.Gc0AVfaFN9b3AwWaRddc5CUMOrgXLq6ay8MF0Fb_mFY@z> The following reverts the chrec_fold_multiply fix and only keeps handling of constant overflow which keeps the original testcase fixed. A better solution might involve ranger improvements or tracking of assumptions during SCEV analysis similar to what niter analysis does. Bootstrapped and tested on x86_64-unknown-linux-gnu. OK for trunk? Or do you prefer to not fix the INTEGER_CST case either? Thanks, Richard. PR tree-optimization/114151 PR tree-optimization/114269 PR tree-optimization/114322 PR tree-optimization/114074 * tree-chrec.cc (chrec_fold_multiply): Restrict the use of unsigned arithmetic when actual overflow on constant operands is observed. * gcc.dg/pr68317.c: Revert last change. --- gcc/testsuite/gcc.dg/pr68317.c | 4 +-- gcc/tree-chrec.cc | 63 +++++++++++++++------------------- 2 files changed, 30 insertions(+), 37 deletions(-) diff --git a/gcc/testsuite/gcc.dg/pr68317.c b/gcc/testsuite/gcc.dg/pr68317.c index 06cd2e1da9c..bd053a7522b 100644 --- a/gcc/testsuite/gcc.dg/pr68317.c +++ b/gcc/testsuite/gcc.dg/pr68317.c @@ -12,8 +12,8 @@ foo () { int32_t index = 0; - for (index; index <= 10; index--) /* { dg-warning "iteration \[0-9\]+ invokes undefined behavior" } */ + for (index; index <= 10; index--) // expected warning here /* Result of the following multiply will overflow when converted to signed int32_t. */ - bar ((0xcafe + index) * 0xdead); + bar ((0xcafe + index) * 0xdead); /* { dg-warning "iteration \[0-9\]+ invokes undefined behavior" } */ } diff --git a/gcc/tree-chrec.cc b/gcc/tree-chrec.cc index 1b2ed753551..8b7982a2dbe 100644 --- a/gcc/tree-chrec.cc +++ b/gcc/tree-chrec.cc @@ -38,8 +38,6 @@ along with GCC; see the file COPYING3. If not see #include "gimple.h" #include "tree-ssa-loop.h" #include "dumpfile.h" -#include "value-range.h" -#include "value-query.h" #include "tree-scalar-evolution.h" /* Extended folder for chrecs. */ @@ -475,41 +473,36 @@ chrec_fold_multiply (tree type, /* When overflow is undefined and CHREC_LEFT/RIGHT do not have the same sign or CHREC_LEFT is zero then folding the multiply into - the addition does not have the same behavior on overflow. Use - unsigned arithmetic in that case. */ - value_range rl, rr; - if (!ANY_INTEGRAL_TYPE_P (type) - || TYPE_OVERFLOW_WRAPS (type) - || integer_zerop (CHREC_LEFT (op0)) - || (TREE_CODE (CHREC_LEFT (op0)) == INTEGER_CST - && TREE_CODE (CHREC_RIGHT (op0)) == INTEGER_CST - && (tree_int_cst_sgn (CHREC_LEFT (op0)) - == tree_int_cst_sgn (CHREC_RIGHT (op0)))) - || (get_range_query (cfun)->range_of_expr (rl, CHREC_LEFT (op0)) - && !rl.undefined_p () - && (rl.nonpositive_p () || rl.nonnegative_p ()) - && get_range_query (cfun)->range_of_expr (rr, - CHREC_RIGHT (op0)) - && !rr.undefined_p () - && ((rl.nonpositive_p () && rr.nonpositive_p ()) - || (rl.nonnegative_p () && rr.nonnegative_p ())))) - { - tree left = chrec_fold_multiply (type, CHREC_LEFT (op0), op1); - tree right = chrec_fold_multiply (type, CHREC_RIGHT (op0), op1); - return build_polynomial_chrec (CHREC_VARIABLE (op0), left, right); - } - else + the addition does not have the same behavior on overflow. + Using unsigned arithmetic in that case causes too many performance + regressions, but catch the constant case where the multiplication + of the step overflows. */ + if (INTEGRAL_TYPE_P (type) + && TYPE_OVERFLOW_UNDEFINED (type) + && !integer_zerop (CHREC_LEFT (op0)) + && TREE_CODE (op1) == INTEGER_CST + && TREE_CODE (CHREC_RIGHT (op0)) == INTEGER_CST) { - tree utype = unsigned_type_for (type); - tree uop1 = chrec_convert_rhs (utype, op1); - tree uleft0 = chrec_convert_rhs (utype, CHREC_LEFT (op0)); - tree uright0 = chrec_convert_rhs (utype, CHREC_RIGHT (op0)); - tree left = chrec_fold_multiply (utype, uleft0, uop1); - tree right = chrec_fold_multiply (utype, uright0, uop1); - tree tem = build_polynomial_chrec (CHREC_VARIABLE (op0), - left, right); - return chrec_convert_rhs (type, tem); + wi::overflow_type ovf = wi::OVF_NONE; + wide_int res + = wi::mul (wi::to_wide (CHREC_RIGHT (op0)), + wi::to_wide (op1), TYPE_SIGN (type), &ovf); + if (ovf != wi::OVF_NONE) + { + tree utype = unsigned_type_for (type); + tree uop1 = chrec_convert_rhs (utype, op1); + tree uleft0 = chrec_convert_rhs (utype, CHREC_LEFT (op0)); + tree uright0 = chrec_convert_rhs (utype, CHREC_RIGHT (op0)); + tree left = chrec_fold_multiply (utype, uleft0, uop1); + tree right = chrec_fold_multiply (utype, uright0, uop1); + tree tem = build_polynomial_chrec (CHREC_VARIABLE (op0), + left, right); + return chrec_convert_rhs (type, tem); + } } + tree left = chrec_fold_multiply (type, CHREC_LEFT (op0), op1); + tree right = chrec_fold_multiply (type, CHREC_RIGHT (op0), op1); + return build_polynomial_chrec (CHREC_VARIABLE (op0), left, right); } CASE_CONVERT: -- 2.35.3