From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mx0a-001b2d01.pphosted.com (mx0a-001b2d01.pphosted.com [148.163.156.1]) by sourceware.org (Postfix) with ESMTPS id C95773858D28; Mon, 7 Aug 2023 02:45:10 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.2 sourceware.org C95773858D28 Authentication-Results: sourceware.org; dmarc=none (p=none dis=none) header.from=linux.ibm.com Authentication-Results: sourceware.org; spf=pass smtp.mailfrom=linux.ibm.com Received: from pps.filterd (m0353729.ppops.net [127.0.0.1]) by mx0a-001b2d01.pphosted.com (8.17.1.19/8.17.1.19) with ESMTP id 3772U8Kq019959; Mon, 7 Aug 2023 02:45:07 GMT DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=ibm.com; h=date : from : to : cc : subject : in-reply-to : references : message-id : content-type : content-transfer-encoding : mime-version; s=pp1; bh=JFC2PD8xSp2B0B24U2sF4wmHZi9uLs22VBzVXc9tDGM=; b=P4H+VOEsoyS0kYRfVSPpN8J3GZ58v07KfGiYnbN07jQzCZjb2BXr1LoHGbqlfvkyoYQ5 MWFP+XxaKOlWaGsmhAM7Rjx7qvVJui5oF7EScgSlFrSvF5G4mFpv3Y1XOH5z2AQ7cTa7 6OmlOEQau0f1JJ89afT6llp+YesCT/435QqKLhFm10Qi/CcAU7rCzSlz54iBu7nWikt5 gA+YiQxA2WZ4torSDog4zVTYngC72hv2NVM6xfH91NObyVtZ91kI+uJJIxoLpxANsOyw 1bzmm2q4z3JNzOTM+Eo4JmE4cP0eyctLFpdDMyNh5VxBUYa6IURIlYTRYjWwOeOg6xzB kA== Received: from pps.reinject (localhost [127.0.0.1]) by mx0a-001b2d01.pphosted.com (PPS) with ESMTPS id 3saqvu07xx-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=NOT); Mon, 07 Aug 2023 02:45:06 +0000 Received: from m0353729.ppops.net (m0353729.ppops.net [127.0.0.1]) by pps.reinject (8.17.1.5/8.17.1.5) with ESMTP id 3772j1Y4031299; Mon, 7 Aug 2023 02:45:06 GMT Received: from ppma22.wdc07v.mail.ibm.com (5c.69.3da9.ip4.static.sl-reverse.com [169.61.105.92]) by mx0a-001b2d01.pphosted.com (PPS) with ESMTPS id 3saqvu07xj-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=NOT); Mon, 07 Aug 2023 02:45:06 +0000 Received: from pps.filterd (ppma22.wdc07v.mail.ibm.com [127.0.0.1]) by ppma22.wdc07v.mail.ibm.com (8.17.1.19/8.17.1.19) with ESMTP id 3770DJPD007547; Mon, 7 Aug 2023 02:45:04 GMT Received: from smtprelay04.wdc07v.mail.ibm.com ([172.16.1.71]) by ppma22.wdc07v.mail.ibm.com (PPS) with ESMTPS id 3sa14xsned-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=NOT); Mon, 07 Aug 2023 02:45:04 +0000 Received: from smtpav04.wdc07v.mail.ibm.com (smtpav04.wdc07v.mail.ibm.com [10.39.53.231]) by smtprelay04.wdc07v.mail.ibm.com (8.14.9/8.14.9/NCO v10.0) with ESMTP id 3772j4gK32703090 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-GCM-SHA384 bits=256 verify=OK); Mon, 7 Aug 2023 02:45:04 GMT Received: from smtpav04.wdc07v.mail.ibm.com (unknown [127.0.0.1]) by IMSVA (Postfix) with ESMTP id 5A1F058050; Mon, 7 Aug 2023 02:45:04 +0000 (GMT) Received: from smtpav04.wdc07v.mail.ibm.com (unknown [127.0.0.1]) by IMSVA (Postfix) with ESMTP id 9408358045; Mon, 7 Aug 2023 02:45:03 +0000 (GMT) Received: from ltc.linux.ibm.com (unknown [9.5.196.140]) by smtpav04.wdc07v.mail.ibm.com (Postfix) with ESMTP; Mon, 7 Aug 2023 02:45:03 +0000 (GMT) Date: Mon, 07 Aug 2023 10:45:03 +0800 From: guojiufu To: gcc-patches@gcc.gnu.org, rguenther@suse.de, jeffreyalaw@gmail.com, richard.sandiford@arm.com Cc: amacleod@redhat.com, aldyh@redhat.com, segher@kernel.crashing.org, dje.gcc@gmail.com, linkw@gcc.gnu.org, bergner@linux.ibm.com Subject: Re: [PATCH V5 2/2] Optimize '(X - N * M) / N' to 'X / N - M' if valid In-Reply-To: <20230718140544.3497370-2-guojiufu@linux.ibm.com> References: <20230718140544.3497370-1-guojiufu@linux.ibm.com> <20230718140544.3497370-2-guojiufu@linux.ibm.com> Message-ID: X-Sender: guojiufu@linux.ibm.com Content-Type: text/plain; charset=US-ASCII; format=flowed X-TM-AS-GCONF: 00 X-Proofpoint-GUID: Bv58_EDQBwUiq5WfHozabEE899Ktxtyn X-Proofpoint-ORIG-GUID: TrDWM1vovTjOgcoDdUDYYmrjA_zULQjv Content-Transfer-Encoding: 7bit X-Proofpoint-UnRewURL: 0 URL was un-rewritten MIME-Version: 1.0 X-Proofpoint-Virus-Version: vendor=baseguard engine=ICAP:2.0.267,Aquarius:18.0.957,Hydra:6.0.591,FMLib:17.11.176.26 definitions=2023-08-06_24,2023-08-03_01,2023-05-22_02 X-Proofpoint-Spam-Details: rule=outbound_notspam policy=outbound score=0 mlxscore=0 clxscore=1011 suspectscore=0 mlxlogscore=976 impostorscore=0 phishscore=0 malwarescore=0 priorityscore=1501 adultscore=0 spamscore=0 lowpriorityscore=0 bulkscore=0 classifier=spam adjust=0 reason=mlx scancount=1 engine=8.12.0-2306200000 definitions=main-2308070022 X-Spam-Status: No, score=-12.0 required=5.0 tests=BAYES_00,DKIM_SIGNED,DKIM_VALID,DKIM_VALID_EF,GIT_PATCH_0,KAM_SHORT,RCVD_IN_MSPIKE_H5,RCVD_IN_MSPIKE_WL,SPF_HELO_NONE,SPF_PASS,TXREP 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: Hi, Gentle ping... On 2023-07-18 22:05, Jiufu Guo wrote: > Hi, > > Integer expression "(X - N * M) / N" can be optimized to "X / N - M" > if there is no wrap/overflow/underflow and "X - N * M" has the same > sign with "X". > > Compare the previous version: > https://gcc.gnu.org/pipermail/gcc-patches/2023-July/624067.html > - APIs: overflow, nonnegative_p and nonpositive_p are moved close > to value range. > - Use above APIs in match.pd. > > Bootstrap & regtest pass on ppc64{,le} and x86_64. > Is this patch ok for trunk? > > BR, > Jeff (Jiufu Guo) > > PR tree-optimization/108757 > > gcc/ChangeLog: > > * match.pd ((X - N * M) / N): New pattern. > ((X + N * M) / N): New pattern. > ((X + C) div_rshift N): New pattern. > > gcc/testsuite/ChangeLog: > > * gcc.dg/pr108757-1.c: New test. > * gcc.dg/pr108757-2.c: New test. > * gcc.dg/pr108757.h: New test. > > --- > gcc/match.pd | 85 +++++++++++ > gcc/testsuite/gcc.dg/pr108757-1.c | 18 +++ > gcc/testsuite/gcc.dg/pr108757-2.c | 19 +++ > gcc/testsuite/gcc.dg/pr108757.h | 233 ++++++++++++++++++++++++++++++ > 4 files changed, 355 insertions(+) > create mode 100644 gcc/testsuite/gcc.dg/pr108757-1.c > create mode 100644 gcc/testsuite/gcc.dg/pr108757-2.c > create mode 100644 gcc/testsuite/gcc.dg/pr108757.h > > diff --git a/gcc/match.pd b/gcc/match.pd > index 8543f777a28..39dbb0567dc 100644 > --- a/gcc/match.pd > +++ b/gcc/match.pd > @@ -942,6 +942,91 @@ DEFINE_INT_AND_FLOAT_ROUND_FN (RINT) > #endif > )))) > > +#if GIMPLE > +(for div (trunc_div exact_div) > + /* Simplify (t + M*N) / N -> t / N + M. */ > + (simplify > + (div (plus:c@4 @0 (mult:c@3 @1 @2)) @2) > + (with {value_range vr0, vr1, vr2, vr3, vr4;} > + (if (INTEGRAL_TYPE_P (type) > + && get_range_query (cfun)->range_of_expr (vr1, @1) > + && get_range_query (cfun)->range_of_expr (vr2, @2) > + && range_op_handler (MULT_EXPR).overflow_free_p (vr1, vr2) > + && get_range_query (cfun)->range_of_expr (vr0, @0) > + && get_range_query (cfun)->range_of_expr (vr3, @3) > + && range_op_handler (PLUS_EXPR).overflow_free_p (vr0, vr3) > + && get_range_query (cfun)->range_of_expr (vr4, @4) > + && (TYPE_UNSIGNED (type) > + || (vr0.nonnegative_p () && vr4.nonnegative_p ()) > + || (vr0.nonpositive_p () && vr4.nonpositive_p ()))) > + (plus (div @0 @2) @1)))) > + > + /* Simplify (t - M*N) / N -> t / N - M. */ > + (simplify > + (div (minus@4 @0 (mult:c@3 @1 @2)) @2) > + (with {value_range vr0, vr1, vr2, vr3, vr4;} > + (if (INTEGRAL_TYPE_P (type) > + && get_range_query (cfun)->range_of_expr (vr1, @1) > + && get_range_query (cfun)->range_of_expr (vr2, @2) > + && range_op_handler (MULT_EXPR).overflow_free_p (vr1, vr2) > + && get_range_query (cfun)->range_of_expr (vr0, @0) > + && get_range_query (cfun)->range_of_expr (vr3, @3) > + && range_op_handler (MINUS_EXPR).overflow_free_p (vr0, vr3) > + && get_range_query (cfun)->range_of_expr (vr4, @4) > + && (TYPE_UNSIGNED (type) > + || (vr0.nonnegative_p () && vr4.nonnegative_p ()) > + || (vr0.nonpositive_p () && vr4.nonpositive_p ()))) > + (minus (div @0 @2) @1))))) > + > +/* Simplify > + (t + C) / N -> t / N + C / N where C is multiple of N. > + (t + C) >> N -> t >> N + C>>N if low N bits of C is 0. */ > +(for op (trunc_div exact_div rshift) > + (simplify > + (op (plus@3 @0 INTEGER_CST@1) INTEGER_CST@2) > + (with > + { > + wide_int c = wi::to_wide (@1); > + wide_int n = wi::to_wide (@2); > + bool is_rshift = op == RSHIFT_EXPR; > + bool neg_c = false; > + bool ok = false; > + value_range vr0; > + if (INTEGRAL_TYPE_P (type) > + && get_range_query (cfun)->range_of_expr (vr0, @0)) > + { > + ok = is_rshift ? wi::ctz (c) >= n.to_shwi () > + : wi::multiple_of_p (c, n, TYPE_SIGN (type)); > + value_range vr1, vr3; > + ok = ok && get_range_query (cfun)->range_of_expr (vr1, @1) > + && range_op_handler (PLUS_EXPR).overflow_free_p (vr0, vr1) > + && get_range_query (cfun)->range_of_expr (vr3, @3) > + && (TYPE_UNSIGNED (type) > + || (vr0.nonnegative_p () && vr3.nonnegative_p ()) > + || (vr0.nonpositive_p () && vr3.nonpositive_p ())); > + > + /* Try check 'X + C' as 'X - -C' for unsigned. */ > + if (!ok && TYPE_UNSIGNED (type) && c.sign_mask () < 0) > + { > + neg_c = true; > + c = -c; > + ok = is_rshift ? wi::ctz (c) >= n.to_shwi () > + : wi::multiple_of_p (c, n, UNSIGNED); > + ok = ok && wi::geu_p (vr0.lower_bound (), c); > + } > + } > + } > + (if (ok) > + (with > + { > + wide_int m; > + m = is_rshift ? wi::rshift (c, n, TYPE_SIGN (type)) > + : wi::div_trunc (c, n, TYPE_SIGN (type)); > + m = neg_c ? -m : m; > + } > + (plus (op @0 @2) { wide_int_to_tree(type, m); })))))) > +#endif > + > (for op (negate abs) > /* Simplify cos(-x) and cos(|x|) -> cos(x). Similarly for cosh. */ > (for coss (COS COSH) > diff --git a/gcc/testsuite/gcc.dg/pr108757-1.c > b/gcc/testsuite/gcc.dg/pr108757-1.c > new file mode 100644 > index 00000000000..7908f4bdcb8 > --- /dev/null > +++ b/gcc/testsuite/gcc.dg/pr108757-1.c > @@ -0,0 +1,18 @@ > +/* PR tree-optimization/108757 */ > +/* { dg-do compile } */ > +/* { dg-options "-O2 -fdump-tree-optimized" } */ > + > +#include > +#define N 5 > +#define M 3 > +#define GAP 0 > +typedef unsigned int UINT; > +typedef int INT; > +#define UMAX UINT_MAX > +#define IMAX INT_MAX > +#define IMIN INT_MIN > +#include "pr108757.h" > + > +/* { dg-final { scan-tree-dump-not " = x_\[0-9\]+\\(D\\) \\+ " > "optimized" } } * > +/* { dg-final { scan-tree-dump-not " = x_\[0-9\]+\\(D\\) \\- " > "optimized" } } */ > +/* { dg-final { scan-tree-dump-not " = b_\[0-9\]+ \\+ " "optimized" } > } */ > diff --git a/gcc/testsuite/gcc.dg/pr108757-2.c > b/gcc/testsuite/gcc.dg/pr108757-2.c > new file mode 100644 > index 00000000000..82bebd09944 > --- /dev/null > +++ b/gcc/testsuite/gcc.dg/pr108757-2.c > @@ -0,0 +1,19 @@ > +/* PR tree-optimization/108757 */ > +/* { dg-do compile } */ > +/* { dg-options "-O2 -fdump-tree-optimized -fwrapv" } */ > + > +#include > +#define N 4 > +#define M 3 > +#define GAP 2 > +typedef unsigned int UINT; > +typedef int INT; > +#define UMAX UINT_MAX > +#define IMAX INT_MAX > +#define IMIN INT_MIN > +#include "pr108757.h" > + > +/* { dg-final { scan-tree-dump-times " = x_\[0-9\]+\\(D\\) \\+ " 16 > "optimized" } } */ > +/* { dg-final { scan-tree-dump-times " = x_\[0-9\]+\\(D\\) \\- " 3 > "optimized" } } */ > +/* { dg-final { scan-tree-dump-times " \\+ x_\[0-9\]+\\(D\\)" 3 > "optimized" } } */ > + > diff --git a/gcc/testsuite/gcc.dg/pr108757.h > b/gcc/testsuite/gcc.dg/pr108757.h > new file mode 100644 > index 00000000000..5550199c1ef > --- /dev/null > +++ b/gcc/testsuite/gcc.dg/pr108757.h > @@ -0,0 +1,233 @@ > +#define NOINLINE __attribute__ ((noinline)) > +UINT NOINLINE > +opt_u1 (UINT x) > +{ > + if (x < (M * N) - GAP) > + return 0; > + UINT a = x - (M * N); > + UINT b = a / N; > + return b + M; > +} > + > +UINT NOINLINE > +opt_u2 (UINT x) > +{ > + if (x > (UMAX - (M * N) + GAP)) > + return 0; > + UINT a = x + (M * N); > + UINT b = a / N; > + return b - M; > +} > + > +INT NOINLINE > +opt_s1 (INT x) > +{ > + if (x < (M * N) - GAP) > + return 0; > + INT a = x - (M * N); > + INT b = a / N; > + return b + M; > +} > + > +INT NOINLINE > +opt_s2 (INT x) > +{ > + if (x < IMIN + (M * N) - GAP || x > 0) > + return 0; > + INT a = x - (M * N); > + INT b = a / N; > + return b + M; > +} > + > +INT NOINLINE > +opt_s3 (INT x) > +{ > + if (x < (M * N) - GAP) > + return 0; > + INT a = x - (M * N); > + INT b = a / -N; > + return b + -M; > +} > + > +INT NOINLINE > +opt_s4 (INT x) > +{ > + if (x < IMIN + (M * N) - GAP || x > 0) > + return 0; > + INT a = x - (M * N); > + INT b = a / -N; > + return b + -M; > +} > + > +INT NOINLINE > +opt_s5 (INT x) > +{ > + if (x > (-M * N) + GAP) > + return 0; > + INT a = x - (-M * N); > + INT b = a / N; > + return b + -M; > +} > + > +INT NOINLINE > +opt_s6 (INT x) > +{ > + if (x > IMAX - (M * N) + GAP || x < 0) > + return 0; > + INT a = x - (-M * N); > + INT b = a / N; > + return b + -M; > +} > + > +INT NOINLINE > +opt_s7 (INT x) > +{ > + if (x > (M * -N) + GAP) > + return 0; > + INT a = x - (M * -N); > + INT b = a / -N; > + return b + M; > +} > + > +INT NOINLINE > +opt_s8 (INT x) > +{ > + if (x > IMAX - (M * N) + GAP || x < 0) > + return 0; > + INT a = x - (M * -N); > + INT b = a / -N; > + return b + M; > +} > + > +UINT NOINLINE > +opt_u3 (UINT x) > +{ > + if (x < (M << N) - GAP) > + return 0; > + UINT a = x - (M << N); > + UINT b = a >> N; > + return b + M; > +} > + > +UINT NOINLINE > +opt_u4 (UINT x) > +{ > + if (x > (UMAX - (M << N)) + GAP) > + return 0; > + UINT a = x + (M << N); > + UINT b = a >> N; > + return b - M; > +} > + > +INT NOINLINE > +opt_s9 (INT x) > +{ > + if (x < (M << N) - GAP) > + return 0; > + INT a = x - (M << N); > + INT b = a >> N; > + return b + M; > +} > + > +INT NOINLINE > +opt_s10 (INT x) > +{ > + if (x < IMIN + (M << N) - GAP || x > 0) > + return 0; > + INT a = x - (M << N); > + INT b = a >> N; > + return b + M; > +} > + > +INT NOINLINE > +opt_s11 (INT x) > +{ > + if (x > (-M << N) + GAP) > + return 0; > + INT a = x - (-M << N); > + INT b = a >> N; > + return b + -M; > +} > + > +INT NOINLINE > +opt_s12 (INT x) > +{ > + if (x > IMAX - (M << N) + GAP || x < 0) > + return 0; > + INT a = x - (-M << N); > + INT b = a >> N; > + return b + -M; > +} > + > +UINT NOINLINE > +opt_u5 (UINT x, UINT n, UINT m) > +{ > + if (n > N || m > M) > + return 0; > + if (x < (M*N) - GAP) > + return 0; > + UINT a = x - (m * n); > + UINT b = a / n; > + return b + m; > +} > + > +UINT NOINLINE > +opt_u6 (UINT x, UINT n, UINT m) > +{ > + if (n > N || m > M) > + return 0; > + if (x > (UMAX - M*N) + GAP) > + return 0; > + UINT a = x + (m * n); > + UINT b = a / n; > + return b - m; > +} > + > +INT NOINLINE > +opt_s13 (INT x, INT n, INT m) > +{ > + if (n > N || m > M || n < 0 || m < 0) > + return 0; > + if (x < (M*N) - GAP) > + return 0; > + INT a = x - (m * n); > + INT b = a / n; > + return b + m; > +} > + > +INT NOINLINE > +opt_s14 (INT x, INT n, INT m) > +{ > + if (n > N || m > M || n < 0 || m < 0) > + return 0; > + if (x > -M*N + GAP) > + return 0; > + INT a = x + (m * n); > + INT b = a / n; > + return b - m; > +} > + > +INT > +opt_s15 (INT x, INT n, INT m) > +{ > + if (n > 0 || m > 0 || n < -N || m < -M) > + return 0; > + if (x < (M*N) - GAP) > + return 0; > + INT a = x - (m * n); > + INT b = a / n; > + return b + m; > +} > + > +INT NOINLINE > +opt_s16 (INT x, INT n, INT m) > +{ > + if (n > 0 || m > 0 || n < -N || m < -M) > + return 0; > + if (x < 0 || x > (IMAX - M*N) + GAP) > + return 0; > + INT a = x + (m * n); > + INT b = a / n; > + return b - m; > +} > +