From patchwork Tue Feb 27 09:54:35 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Richard Biener X-Patchwork-Id: 207114 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a05:7300:a81b:b0:108:e6aa:91d0 with SMTP id bq27csp2593588dyb; Tue, 27 Feb 2024 01:55:28 -0800 (PST) X-Forwarded-Encrypted: i=3; AJvYcCVyeS+19prmW9RC7yYkzPEV9TSSRon01lpbWkmEuj4f26oAR11t6LkpvcCe1CH0X+ATZDqd69xF8aDkYd05NJypNdcLYQ== X-Google-Smtp-Source: AGHT+IEQf/M5aF7qdm+hW9E9m8A/t9DztkpHcqwvpWkkRPLk0/BWZ1tKSpd168+VcCi5jXYxfldY X-Received: by 2002:a05:622a:1107:b0:42e:a432:3b7d with SMTP id e7-20020a05622a110700b0042ea4323b7dmr25717qty.65.1709027728272; Tue, 27 Feb 2024 01:55:28 -0800 (PST) ARC-Seal: i=2; a=rsa-sha256; t=1709027728; cv=pass; d=google.com; s=arc-20160816; b=AQW0AkIswxMaMOqTuMgSsuySr3Vg9xvfxfLyb2MqTdpiMkWgGH6CN2t7i4j5UmNROe oIBtlvGf767y768bhnYfAbHCShhEcEhy9HsuC3Z16zMrJdcXsfNQpHyjQ6fkGxY2w9Yf pb5/OB999ackoppM53jIIf+pPPrPz10u/R/e8k0kalXwQ+783pxEplBKtHMlsz/Iel14 yskRIMFsu8ca1dnM4iDF1VB4BWiJWmlxdaE5gUwRjuueLE8nMOemccN5jounCkhNgWDB 7e5nmkVCnbkFptAECjVypK4YOzwxB3mS5+e/70jhmqtZzUACFK31Ieii+8IzYfETSYTr ojNQ== ARC-Message-Signature: i=2; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=message-id:errors-to:list-subscribe:list-help:list-post :list-archive:list-unsubscribe:list-id:precedence:mime-version :subject:to:from:date:dkim-signature:dkim-signature:dkim-signature :dkim-signature:arc-filter:dmarc-filter:delivered-to; bh=hCf22zcA0PF2WkEURWi1ippYTGSZ9gSL5OHSQ2dNmRI=; fh=hPrbWPhweUx4V0GV9uXJqbyAzg2ABmTz7kczrAQqMmM=; b=JFMmd2RycoFefX3g1ZWGY0k/quqjKr/DcmPYDpuUc9jUiD1G+B+sgMLsrI4nOJ03KT mn9FBxo8q0HSltONrZ6t94sPBsJWneEcWeGI7jBFnbXA24/rM9Mhg57OpjVy6ZM2hakq pnOxrOlO/rrkfPflE+wpaustEEQ7dJiVqlhqZ4x56WRQMgaNrGXKw9T7g1iK2Lyoixmf E+glB9IBitklDq3kYMV77VpJfKlZaP2JBJeiTjngpYVvxAQwGaw7Z9YjvbjOMbe7kTFs 1AcFUE/sFo7IovItVZ+lcb3DWdhtQkABfWtYi+JSYfr3nVIEE/c4qtDhqlJvDZHXxAsp mWzA==; dara=google.com ARC-Authentication-Results: i=2; mx.google.com; dkim=pass header.i=@suse.de header.s=susede2_rsa header.b=HVmowCTc; dkim=neutral (no key) header.i=@suse.de header.s=susede2_ed25519 header.b=29ZwZ1Lt; dkim=pass header.i=@suse.de header.s=susede2_rsa header.b=CiOuK65s; dkim=neutral (no key) header.i=@suse.de header.s=susede2_ed25519; arc=pass (i=1); spf=pass (google.com: domain of gcc-patches-bounces+ouuuleilei=gmail.com@gcc.gnu.org designates 2620:52:3:1:0:246e:9693:128c as permitted sender) smtp.mailfrom="gcc-patches-bounces+ouuuleilei=gmail.com@gcc.gnu.org"; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=suse.de Received: from server2.sourceware.org (server2.sourceware.org. [2620:52:3:1:0:246e:9693:128c]) by mx.google.com with ESMTPS id p11-20020ac8460b000000b0042e79e6f79esi5721376qtn.669.2024.02.27.01.55.28 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 27 Feb 2024 01:55:28 -0800 (PST) Received-SPF: pass (google.com: domain of gcc-patches-bounces+ouuuleilei=gmail.com@gcc.gnu.org designates 2620:52:3:1:0:246e:9693:128c as permitted sender) client-ip=2620:52:3:1:0:246e:9693:128c; Authentication-Results: mx.google.com; dkim=pass header.i=@suse.de header.s=susede2_rsa header.b=HVmowCTc; dkim=neutral (no key) header.i=@suse.de header.s=susede2_ed25519 header.b=29ZwZ1Lt; dkim=pass header.i=@suse.de header.s=susede2_rsa header.b=CiOuK65s; dkim=neutral (no key) header.i=@suse.de header.s=susede2_ed25519; arc=pass (i=1); spf=pass (google.com: domain of gcc-patches-bounces+ouuuleilei=gmail.com@gcc.gnu.org designates 2620:52:3:1:0:246e:9693:128c as permitted sender) smtp.mailfrom="gcc-patches-bounces+ouuuleilei=gmail.com@gcc.gnu.org"; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=suse.de Received: from server2.sourceware.org (localhost [IPv6:::1]) by sourceware.org (Postfix) with ESMTP id EAFE23858429 for ; Tue, 27 Feb 2024 09:55:27 +0000 (GMT) X-Original-To: gcc-patches@gcc.gnu.org Delivered-To: gcc-patches@gcc.gnu.org Received: from smtp-out1.suse.de (smtp-out1.suse.de [195.135.223.130]) by sourceware.org (Postfix) with ESMTPS id 371A13858C56 for ; Tue, 27 Feb 2024 09:54:37 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.2 sourceware.org 371A13858C56 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 371A13858C56 Authentication-Results: server2.sourceware.org; arc=none smtp.remote-ip=195.135.223.130 ARC-Seal: i=1; a=rsa-sha256; d=sourceware.org; s=key; t=1709027679; cv=none; b=kGICfRIkVSH7qwoxwZTaHtrmDz1VXmtWUT7WHQDisxeQ2J0QW9r4vl4pUWEIXg3YMi8MEPSiPQ1KJB40gu77tmhZkuMvIIBG2ocXZOJl420a5KBum1lbnI7Xe5b4M0KnN2Hxj6WXYY8/hEoSgN28cacvaHntkORG0JzcPVPbeBI= ARC-Message-Signature: i=1; a=rsa-sha256; d=sourceware.org; s=key; t=1709027679; c=relaxed/simple; bh=WfaE4pxqKsRfyHS/+JkeT7GhT9DVhQJn6zF9GUtdegs=; h=DKIM-Signature:DKIM-Signature:DKIM-Signature:DKIM-Signature:Date: From:To:Subject:MIME-Version; b=BPj+ke1WTiIusRCB9oy/de7Tb4KZTV2TDerGHUqM+HPMpgtFkssZEv7j3THbmcMGl2mcIvEoqYvEkWNBTpGMchSIHdMltDJZtF/CzbNo1oqLGCX4dUs6KEJgnPtj9dya0UmGzwG4yhishIFKYCb/+oQzjDU3TGvlIzMQLLrOHok= 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-out1.suse.de (Postfix) with ESMTPS id E913D21EC2 for ; Tue, 27 Feb 2024 09:54:35 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=suse.de; s=susede2_rsa; t=1709027676; h=from:from:reply-to:date:date:to:to:cc:mime-version:mime-version: content-type:content-type; bh=hCf22zcA0PF2WkEURWi1ippYTGSZ9gSL5OHSQ2dNmRI=; b=HVmowCTcN5WFteIG5/1F/W9v6yNWw69PRtSTRP9vcWxhu9oe76+xzHEf3ACsDfOk52JrHV lre5LR6IXECYsHtDvWYOesYY59eaWL1/hpylZTCP1xG4LZDQsp8YcbrxhCO83LJGv8cWnB Ng7pqCLm2D5cg5nLfESwkOEcSHjBSqU= DKIM-Signature: v=1; a=ed25519-sha256; c=relaxed/relaxed; d=suse.de; s=susede2_ed25519; t=1709027676; h=from:from:reply-to:date:date:to:to:cc:mime-version:mime-version: content-type:content-type; bh=hCf22zcA0PF2WkEURWi1ippYTGSZ9gSL5OHSQ2dNmRI=; b=29ZwZ1LtMTrn/Q65py3rKkmGwyEeVm+ocKlUc5xClqDi3smcg//JV0/wbkk+9ZhCXUUq0s E6AxaojGb1pI7YDQ== DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=suse.de; s=susede2_rsa; t=1709027675; h=from:from:reply-to:date:date:to:to:cc:mime-version:mime-version: content-type:content-type; bh=hCf22zcA0PF2WkEURWi1ippYTGSZ9gSL5OHSQ2dNmRI=; b=CiOuK65sP03DmJxJ0kxdPqAnkqenJyoSR/0rDO/zgc9Fr7Bqv1shpT4R0gc23UeS9qqNSv l7vb5mCnzhQUvmx8TVnoscWngJHEPCvcHdkeDxZyW3goFff3bkoX+lWJPM0iMOf+0lOIyK yk2S+Vj+/7NZmw1qrDww19ALF7Xu7Jw= DKIM-Signature: v=1; a=ed25519-sha256; c=relaxed/relaxed; d=suse.de; s=susede2_ed25519; t=1709027675; h=from:from:reply-to:date:date:to:to:cc:mime-version:mime-version: content-type:content-type; bh=hCf22zcA0PF2WkEURWi1ippYTGSZ9gSL5OHSQ2dNmRI=; b=Pu5+/WJP5W4Kel1S7p/WNrZ0nBgCIBO7HYP+sCHbyQbHm+w7RbszwOHszn2JD37R7yPuv7 tYLgdiwIhHhZfsCQ== Date: Tue, 27 Feb 2024 10:54:35 +0100 (CET) From: Richard Biener To: gcc-patches@gcc.gnu.org Subject: [PATCH][v2] tree-optimization/114074 - CHREC multiplication and undefined overflow MIME-Version: 1.0 Authentication-Results: smtp-out1.suse.de; none X-Spamd-Result: default: False [-0.60 / 50.00]; ARC_NA(0.00)[]; FROM_HAS_DN(0.00)[]; TO_MATCH_ENVRCPT_ALL(0.00)[]; MIME_GOOD(-0.10)[text/plain]; TO_DN_NONE(0.00)[]; RCPT_COUNT_ONE(0.00)[1]; MISSING_MID(2.50)[]; DKIM_SIGNED(0.00)[suse.de:s=susede2_rsa,suse.de:s=susede2_ed25519]; 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%] X-Spam-Level: X-Spam-Score: -0.60 X-Spam-Status: No, score=-10.6 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 X-BeenThere: gcc-patches@gcc.gnu.org X-Mailman-Version: 2.1.30 Precedence: list List-Id: Gcc-patches mailing list List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: gcc-patches-bounces+ouuuleilei=gmail.com@gcc.gnu.org Message-Id: <20240227095527.EAFE23858429@sourceware.org> X-getmail-retrieved-from-mailbox: INBOX X-GMAIL-THRID: 1792045459114573722 X-GMAIL-MSGID: 1792045459114573722 When folding a multiply CHRECs are handled like {a, +, b} * c is {a*c, +, b*c} but that isn't generally correct when overflow invokes undefined behavior. The following uses unsigned arithmetic unless either a is zero or a and b have the same sign. I've used simple early outs for INTEGER_CSTs and otherwise use a range-query since we lack a tree_expr_nonpositive_p and get_range_pos_neg isn't a good fit. Bootstrapped and tested on x86_64-unknown-linux-gnu, pushed. Richard. PR tree-optimization/114074 * tree-chrec.h (chrec_convert_rhs): Default at_stmt arg to NULL. * tree-chrec.cc (chrec_fold_multiply): Canonicalize inputs. Handle poly vs. non-poly multiplication correctly with respect to undefined behavior on overflow. * gcc.dg/torture/pr114074.c: New testcase. * gcc.dg/pr68317.c: Adjust expected location of diagnostic. * gcc.dg/vect/vect-early-break_119-pr114068.c: Do not expect loop to be vectorized. --- gcc/testsuite/gcc.dg/pr68317.c | 4 +- gcc/testsuite/gcc.dg/torture/pr114074.c | 27 +++++++++ .../vect/vect-early-break_119-pr114068.c | 2 - gcc/tree-chrec.cc | 55 +++++++++++++++---- gcc/tree-chrec.h | 2 +- 5 files changed, 74 insertions(+), 16 deletions(-) create mode 100644 gcc/testsuite/gcc.dg/torture/pr114074.c diff --git a/gcc/testsuite/gcc.dg/pr68317.c b/gcc/testsuite/gcc.dg/pr68317.c index bd053a7522b..06cd2e1da9c 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--) // expected warning here + for (index; index <= 10; index--) /* { dg-warning "iteration \[0-9\]+ invokes undefined behavior" } */ /* Result of the following multiply will overflow when converted to signed int32_t. */ - bar ((0xcafe + index) * 0xdead); /* { dg-warning "iteration \[0-9\]+ invokes undefined behavior" } */ + bar ((0xcafe + index) * 0xdead); } diff --git a/gcc/testsuite/gcc.dg/torture/pr114074.c b/gcc/testsuite/gcc.dg/torture/pr114074.c new file mode 100644 index 00000000000..336e97673c3 --- /dev/null +++ b/gcc/testsuite/gcc.dg/torture/pr114074.c @@ -0,0 +1,27 @@ +/* { dg-do run } */ + +int a, b, d; + +__attribute__((noipa)) void +foo (void) +{ + ++d; +} + +int +main () +{ + for (a = 0; a > -3; a -= 2) + { + int c = a; + b = __INT_MAX__ - 3000; + a = ~c * b; + foo (); + if (!a) + break; + a = c; + } + if (d != 2) + __builtin_abort (); + return 0; +} diff --git a/gcc/testsuite/gcc.dg/vect/vect-early-break_119-pr114068.c b/gcc/testsuite/gcc.dg/vect/vect-early-break_119-pr114068.c index a65ef7b8c49..206397942eb 100644 --- a/gcc/testsuite/gcc.dg/vect/vect-early-break_119-pr114068.c +++ b/gcc/testsuite/gcc.dg/vect/vect-early-break_119-pr114068.c @@ -4,8 +4,6 @@ /* { dg-require-effective-target vect_int } */ /* { dg-additional-options "-O3" } */ -/* { dg-final { scan-tree-dump "LOOP VECTORIZED" "vect" } } */ - struct h { int b; int c; diff --git a/gcc/tree-chrec.cc b/gcc/tree-chrec.cc index 61456fe1141..2e6c7356d3b 100644 --- a/gcc/tree-chrec.cc +++ b/gcc/tree-chrec.cc @@ -38,6 +38,8 @@ 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. */ @@ -404,6 +406,10 @@ chrec_fold_multiply (tree type, || automatically_generated_chrec_p (op1)) return chrec_fold_automatically_generated_operands (op0, op1); + if (TREE_CODE (op0) != POLYNOMIAL_CHREC + && TREE_CODE (op1) == POLYNOMIAL_CHREC) + std::swap (op0, op1); + switch (TREE_CODE (op0)) { case POLYNOMIAL_CHREC: @@ -428,10 +434,43 @@ chrec_fold_multiply (tree type, if (integer_zerop (op1)) return build_int_cst (type, 0); - return build_polynomial_chrec - (CHREC_VARIABLE (op0), - chrec_fold_multiply (type, CHREC_LEFT (op0), op1), - chrec_fold_multiply (type, CHREC_RIGHT (op0), op1)); + /* 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 + { + 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); + } } CASE_CONVERT: @@ -449,13 +488,7 @@ chrec_fold_multiply (tree type, switch (TREE_CODE (op1)) { case POLYNOMIAL_CHREC: - gcc_checking_assert - (!chrec_contains_symbols_defined_in_loop (op1, - CHREC_VARIABLE (op1))); - return build_polynomial_chrec - (CHREC_VARIABLE (op1), - chrec_fold_multiply (type, CHREC_LEFT (op1), op0), - chrec_fold_multiply (type, CHREC_RIGHT (op1), op0)); + gcc_unreachable (); CASE_CONVERT: if (tree_contains_chrecs (op1, NULL)) diff --git a/gcc/tree-chrec.h b/gcc/tree-chrec.h index e3a5ba55885..8003eb53a39 100644 --- a/gcc/tree-chrec.h +++ b/gcc/tree-chrec.h @@ -63,7 +63,7 @@ extern tree chrec_fold_plus (tree, tree, tree); extern tree chrec_fold_minus (tree, tree, tree); extern tree chrec_fold_multiply (tree, tree, tree); extern tree chrec_convert (tree, tree, gimple *, bool = true, tree = NULL); -extern tree chrec_convert_rhs (tree, tree, gimple *); +extern tree chrec_convert_rhs (tree, tree, gimple * = NULL); extern tree chrec_convert_aggressive (tree, tree, bool *); /* Operations. */