From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mail-lj1-x231.google.com (mail-lj1-x231.google.com [IPv6:2a00:1450:4864:20::231]) by sourceware.org (Postfix) with ESMTPS id 61B373858D20 for ; Fri, 11 Aug 2023 07:36:26 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.2 sourceware.org 61B373858D20 Authentication-Results: sourceware.org; dmarc=pass (p=none dis=none) header.from=gmail.com Authentication-Results: sourceware.org; spf=pass smtp.mailfrom=gmail.com Received: by mail-lj1-x231.google.com with SMTP id 38308e7fff4ca-2b9bf52cd08so25239451fa.2 for ; Fri, 11 Aug 2023 00:36:26 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20221208; t=1691739385; x=1692344185; h=content-transfer-encoding:cc:to:subject:message-id:date:from :in-reply-to:references:mime-version:from:to:cc:subject:date :message-id:reply-to; bh=Osikw8h7O3SsZf4VbZMeXUmrXbqyTfLvLiuISSlI2CM=; b=CMXUsdZ+hJqabMT7E5Dhczx714lSxuad0VqQ7Fih6GdsJydEchTaN6YuJqLPZIpmcG VuzhPirzBiILfqaEYuOhHngc+O+BKeCfs7n8enUG0L0JPA4FUAUUsUNS2VJUVnJCtPo1 AGG9aRJEbuICh7Uz8V+RpxGwVwKh59SQSTLzbN41FbarQk8TC913WvyeTXOQLCVrjygr ennY0h2RRNjHas+NVZ45ZXAgQIVNYmeQ3uIkYo1Fn0L4oW6dn9WzHvg43Kx4FX/L12N7 dUi7nU64bBPsEcBrdxYqodaELezJHbWL6Nhil8iRXGpEeueDz0KHsXNHt5a3XZ9tNS6d x2OA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20221208; t=1691739385; x=1692344185; h=content-transfer-encoding:cc:to:subject:message-id:date:from :in-reply-to:references:mime-version:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=Osikw8h7O3SsZf4VbZMeXUmrXbqyTfLvLiuISSlI2CM=; b=NpM7eYALqR6j3hBGJ0P9DqRMx4rr3v6kx4OpxIZSs2nLKEEOrPVgrUmnq9kP2wBSa5 fezwJBqrbgehMaWHsV+dY3CJKmRR0+rbjOEGTMgXDeXo5zoI+k+Ho2I9Pxhr8zWDNwu/ MAALJBRc9e8CjkaOCfLbtRZvgOBlB85MvgpeBo76KKmFldDutQZiOlve4tmlRChcM7oa pR2FTjl52hiw+gc5ni8KVelaEHbsv1w0VZ9rGFBXOXfI8VIRtwJYWhWcM5OHSBGbeI1R zS34QxVJ++B/mBoy0tIGMC773U7e3XYnbx4tNWShatujyLx4kh0k4hGbBQLGjwyhDSes YW0w== X-Gm-Message-State: AOJu0YxtMlpiECK7iy5fd3M8R/deyz0n1Yq7sDQJYG2vothPe2tjGMup riO9ABWd6k8ZYF+3ytMC5bd8wDLt7stT9+Xhx+s= X-Google-Smtp-Source: AGHT+IELbYAwKoW/n+0df8JoRblTkpc8/2c10NB4e5c57RGEnbMHEYPzmbfPlY4SJ5kRUnUyzZEMgZ1dlLIlpRJzo6k= X-Received: by 2002:a05:651c:10aa:b0:2b6:a763:5d13 with SMTP id k10-20020a05651c10aa00b002b6a7635d13mr961451ljn.27.1691739384551; Fri, 11 Aug 2023 00:36:24 -0700 (PDT) MIME-Version: 1.0 References: <20230804214817.1256642-1-drross@redhat.com> In-Reply-To: From: Richard Biener Date: Fri, 11 Aug 2023 09:36:11 +0200 Message-ID: Subject: Re: [PATCH] match.pd, v2: Implement missed optimization ((x ^ y) & z) | x -> (z & y) | x [PR109938] To: Jakub Jelinek Cc: Drew Ross , gcc-patches@gcc.gnu.org Content-Type: text/plain; charset="UTF-8" Content-Transfer-Encoding: quoted-printable X-Spam-Status: No, score=-1.5 required=5.0 tests=BAYES_00,DKIM_SIGNED,DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,FREEMAIL_FROM,RCVD_IN_DNSWL_NONE,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: On Thu, Aug 10, 2023 at 5:43=E2=80=AFPM Jakub Jelinek wr= ote: > > Hi! > > On Thu, Aug 10, 2023 at 12:28:24PM +0200, Jakub Jelinek via Gcc-patches w= rote: > > On Tue, Aug 08, 2023 at 03:18:51PM +0200, Richard Biener via Gcc-patche= s wrote: > > > On Fri, Aug 4, 2023 at 11:49=E2=80=AFPM Drew Ross via Gcc-patches > > > wrote: > > > > > > > > Adds a simplification for ((x ^ y) & z) | x to be folded into > > > > (z & y) | x. Merges this simplification with ((x | y) & z) | x -> (= z & y) | x > > > > to prevent duplicate pattern. Tested successfully on x86_64 and x86= targets. > > > > > > OK. > > > > Shouldn't > > (bit_ior:c (bit_and:cs (bit_ior:cs @0 @1) @2) @0) > > be changed to > > (bit_ior:c (nop_convert1?:s > > (bit_and:cs (nop_convert2?:s (op:cs @0 @1)) @2)) @3) > > rather than > > (bit_ior:c (nop_convert1? (bit_and:c (nop_convert2? (op:c @0 @1)) @2)= ) @3) > > in the patch? > > I mean the :s modifiers were there for a reason, if some of the > > intermediates aren't a single use, then the simplification doesn't simp= lify > > anything and can even make things larger. > > Here it is in patch form. Bootstrapped/regtested on x86_64-linux and > i686-linux, ok for trunk? OK. > 2023-08-10 Drew Ross > Jakub Jelinek > > PR tree-optimization/109938 > * match.pd (((x ^ y) & z) | x -> (z & y) | x): New simplification= . > > * gcc.c-torture/execute/pr109938.c: New test. > * gcc.dg/tree-ssa/pr109938.c: New test. > > --- gcc/match.pd.jj 2023-08-10 09:26:19.390805079 +0200 > +++ gcc/match.pd 2023-08-10 13:33:17.959654775 +0200 > @@ -1972,10 +1972,14 @@ (define_operator_list SYNC_FETCH_AND_AND > (if (bitwise_inverted_equal_p (@0, @2)) > (bitop @0 @1)))) > > -/* ((x | y) & z) | x -> (z & y) | x */ > -(simplify > - (bit_ior:c (bit_and:cs (bit_ior:cs @0 @1) @2) @0) > - (bit_ior (bit_and @2 @1) @0)) > +/* ((x | y) & z) | x -> (z & y) | x > + ((x ^ y) & z) | x -> (z & y) | x */ > +(for op (bit_ior bit_xor) > + (simplify > + (bit_ior:c (nop_convert1?:s > + (bit_and:cs (nop_convert2?:s (op:cs @0 @1)) @2)) @3) > + (if (bitwise_equal_p (@0, @3)) > + (convert (bit_ior (bit_and @1 (convert @2)) (convert @0)))))) > > /* (x | CST1) & CST2 -> (x & CST2) | (CST1 & CST2) */ > (simplify > --- gcc/testsuite/gcc.dg/tree-ssa/pr109938.c.jj 2023-08-10 13:22:19.51309= 5403 +0200 > +++ gcc/testsuite/gcc.dg/tree-ssa/pr109938.c 2023-08-10 13:35:24.42884= 1774 +0200 > @@ -0,0 +1,125 @@ > +/* { dg-do compile } */ > +/* { dg-options "-O2 -fdump-tree-dse2 -Wno-psabi" } */ > + > +typedef int v4si __attribute__((vector_size(4 * sizeof(int)))); > + > +/* Generic */ > +__attribute__((noipa)) int > +t1 (int a, int b, int c) > +{ > + return ((a ^ c) & b) | a; > +} > + > +__attribute__((noipa)) unsigned int > +t2 (int a, unsigned int b, int c) > +{ > + return ((a ^ c) & b) | a; > +} > + > +__attribute__((noipa)) unsigned long > +t3 (unsigned long a, long b, unsigned long c) > +{ > + return ((a ^ c) & b) | a; > +} > + > +__attribute__((noipa)) unsigned short > +t4 (short a, unsigned short b, unsigned short c) > +{ > + return (unsigned short) ((a ^ c) & b) | a; > +} > + > +__attribute__((noipa)) unsigned char > +t5 (unsigned char a, signed char b, signed char c) > +{ > + return ((a ^ c) & b) | a; > +} > + > +__attribute__((noipa)) long long > +t6 (long long a, long long b, long long c) > +{ > + return ((a ^ c) & (unsigned long long) b) | a; > +} > + > +/* Gimple */ > +__attribute__((noipa)) int > +t7 (int a, int b, int c) > +{ > + int t1 =3D a ^ c; > + int t2 =3D t1 & b; > + int t3 =3D t2 | a; > + return t3; > +} > + > +__attribute__((noipa)) int > +t8 (int a, unsigned int b, unsigned int c) > +{ > + unsigned int t1 =3D a ^ c; > + int t2 =3D t1 & b; > + int t3 =3D t2 | a; > + return t3; > +} > + > +__attribute__((noipa)) unsigned int > +t9 (unsigned int a, unsigned int b, int c) > +{ > + unsigned int t1 =3D a ^ c; > + unsigned int t2 =3D t1 & b; > + unsigned int t3 =3D t2 | a; > + return t3; > +} > + > +__attribute__((noipa)) unsigned long > +t10 (unsigned long a, long b, unsigned long c) > +{ > + unsigned long t1 =3D a ^ c; > + unsigned long t2 =3D t1 & b; > + unsigned long t3 =3D t2 | a; > + return t3; > +} > + > +__attribute__((noipa)) unsigned short > +t11 (short a, unsigned short b, short c) > +{ > + short t1 =3D a ^ c; > + unsigned short t2 =3D t1 & b; > + unsigned short t3 =3D t2 | a; > + return t3; > +} > + > +__attribute__((noipa)) unsigned char > +t12 (signed char a, unsigned char b, signed char c) > +{ > + unsigned char t1 =3D a ^ c; > + unsigned char t2 =3D t1 & b; > + unsigned char t3 =3D t2 | a; > + return t3; > +} > + > +__attribute__((noipa)) unsigned long long > +t13 (unsigned long long a, long long b, unsigned long long c) > +{ > + long long t1 =3D a ^ c; > + long long t2 =3D t1 & b; > + unsigned long long t3 =3D t2 | a; > + return t3; > +} > + > +/* Vectors */ > +__attribute__((noipa)) v4si > +t14 (v4si a, v4si b, v4si c) > +{ > + return ((a ^ c) & b) | a; > +} > + > +__attribute__((noipa)) v4si > +t15 (v4si a, v4si b, v4si c) > +{ > + v4si t1 =3D a ^ c; > + v4si t2 =3D t1 & b; > + v4si t3 =3D t2 | a; > + return t3; > +} > + > +/* { dg-final { scan-tree-dump-not " \\\^ " "dse2" } } */ > +/* { dg-final { scan-tree-dump-times " \\\| " 15 "dse2" } } */ > +/* { dg-final { scan-tree-dump-times " & " 15 "dse2" } } */ > --- gcc/testsuite/gcc.c-torture/execute/pr109938.c.jj 2023-08-10 13:22:= 19.513095403 +0200 > +++ gcc/testsuite/gcc.c-torture/execute/pr109938.c 2023-08-10 13:22:= 19.513095403 +0200 > @@ -0,0 +1,33 @@ > +/* PR tree-opt/109938 */ > + > +#include "../../gcc.dg/tree-ssa/pr109938.c" > + > +int > +main () > +{ > + if (t1 (29789, 29477, 23942) !=3D 30045) __builtin_abort (); > + if (t2 (-20196, 18743, -32901) !=3D -1729) __builtin_abort (); > + if (t3 (2136614690L, 1136698390L, 2123767997L) !=3D 2145003318UL) __bu= iltin_abort (); > + if (t4 (-4878, 9977, 23313) !=3D 61171) __builtin_abort (); > + if (t5 (127, 99, 43) !=3D 127) __builtin_abort (); > + if (t6 (9176690219839792930LL, 3176690219839721234LL, 5671738468274920= 831LL) > + !=3D 9177833729112616754LL) __builtin_abort (); > + if (t7 (29789, 29477, 23942) !=3D 30045) __builtin_abort (); > + if (t8 (23489, 99477, 87942) !=3D 90053) __builtin_abort (); > + if (t9 (10489, 66477, -73313) !=3D 10749) __builtin_abort (); > + if (t10 (2136614690L, -1136614690L, 4136614690UL) !=3D 4284131106UL) > + __builtin_abort (); > + if (t11 (29789, 29477, 12345) !=3D 29821) __builtin_abort (); > + if (t12 (-120, 98, -73) !=3D 170) __builtin_abort (); > + if (t13 (9176690219839792930ULL, -3176690219839721234LL, 5671738468274= 920831ULL) > + !=3D 9221726284835125102ULL) __builtin_abort (); > + v4si a1 =3D {29789, -20196, 23489, 10489}; > + v4si a2 =3D {29477, 18743, 99477, 66477}; > + v4si a3 =3D {23942, -32901, 87942, -73313}; > + v4si r1 =3D {30045, 63807, 90053, 10749}; > + v4si b1 =3D t14 (a1, a2, a3); > + v4si b2 =3D t15 (a1, a2, a3); > + if (__builtin_memcmp (&b1, &r1, sizeof (b1) !=3D 0)) __builtin_abort= (); > + if (__builtin_memcmp (&b2, &r1, sizeof (b2) !=3D 0)) __builtin_abort= (); > + return 0; > +} > > Jakub >