From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mail-ej1-x629.google.com (mail-ej1-x629.google.com [IPv6:2a00:1450:4864:20::629]) by sourceware.org (Postfix) with ESMTPS id 1A5F2385841D for ; Thu, 28 Jul 2022 07:03:34 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.1 sourceware.org 1A5F2385841D Received: by mail-ej1-x629.google.com with SMTP id va17so1688071ejb.0 for ; Thu, 28 Jul 2022 00:03:34 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:mime-version:references:in-reply-to:from:date :message-id:subject:to:cc:content-transfer-encoding; bh=Jd8y+DpGNTQn7UWP24E0yg4iVlMwW5VFzMvQRI7+cUQ=; b=ywQy24Wo+E237GS58lhDrRlxdBs07uFWkGjHW5ZgurwMd6lW/eNAjERVUc53RqFEfv 1zAPGwzJvf1ARCj08ZefP1jsXv5mFwfa0+Cqop/BLa0E8oHI4SOpP1b34psRP2+f4gIF OMqpleLUvAqHFv4LCdqgJxeQLHA0jEVPEUn39BpB38zQs/JdocG12RvBa41AmTcOFcyx XQa/lJrjGdOiSOU+uWHfZKM3RaKxr7/hJ7U6RYaJSbYLQ8ywTO4qOgvrm0RLYr8T/LyT HDiWBLv3E1xpWiSIO0FCAcGo65hvCULGQvHSZ32U9LuHdL+6ZczDThxPxXX0/v55U6w+ mAGQ== X-Gm-Message-State: AJIora9VKJIB3aZBjRyoYoTch4hZy8umt0FOWP9xkvWg/z4aFUeSFy8X RW3oCiAhPKR5p60YmG5MHZqbxvX0Cirbwg3ycSA= X-Google-Smtp-Source: AGRyM1t18eJZcgI2Rfa5mcShT14R0VUd70BHkIdewD+lXlaz3wnWWdsq4vugsA5xmK9qC5dZNANQBofim9uKGlAsvrM= X-Received: by 2002:a17:907:7209:b0:72b:924b:60a8 with SMTP id dr9-20020a170907720900b0072b924b60a8mr21015508ejc.442.1658991812691; Thu, 28 Jul 2022 00:03:32 -0700 (PDT) MIME-Version: 1.0 References: <20220725193425.511903-1-sfeifer@redhat.com> In-Reply-To: From: Richard Biener Date: Thu, 28 Jul 2022 09:03:20 +0200 Message-ID: Subject: Re: [PATCH] match.pd: Add new division pattern [PR104992] To: Sam Feifer Cc: Andrew Pinski , GCC Patches Content-Type: text/plain; charset="UTF-8" Content-Transfer-Encoding: quoted-printable X-Spam-Status: No, score=-8.2 required=5.0 tests=BAYES_00, DKIM_SIGNED, DKIM_VALID, DKIM_VALID_AU, DKIM_VALID_EF, FREEMAIL_FROM, GIT_PATCH_0, 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 X-BeenThere: gcc-patches@gcc.gnu.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: Gcc-patches mailing list List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 28 Jul 2022 07:03:36 -0000 On Wed, Jul 27, 2022 at 9:57 PM Sam Feifer wrote: > > >> _Complex int are strange beasts, I'd simply avoid the transform for them= . >> > > I added to the match.pd rule to not simplify if the operands are complex.= There is now a test case for complex types to make sure they do not simpli= fy. I had to move the "dg-do run" test to g++.dg to accommodate the complex= type function that is included (even though there isn't a runtime test for= complex types). > >> Can you please move the pattern next to the existing div/mod patterns, >> like after the related >> > > done :) > >> /* Simplify (A / B) * B + (A % B) -> A. */ >> (for div (trunc_div ceil_div floor_div round_div) >> mod (trunc_mod ceil_mod floor_mod round_mod) >> (simplify >> (plus:c (mult:c (div @0 @1) @1) (mod @0 @1)) >> @0)) >> >> pattern? >> >> +/* x / y * y =3D=3D x -> x % y =3D=3D 0. */ >> +(simplify >> + (eq (mult (trunc_div @0 @1) @1) @0) >> + (eq (trunc_mod @0 @1) { build_zero_cst TREE_TYPE(@0); })) >> >> there are parens missing around the TREE_TYPE (@0), how did you test >> the patch? You probably want :s on the trunc_div and as Andrew said >> :c on the eq and the mult. > > > I made those changes to the rule. The rule worked without the parentheses= , which is probably why I didn't notice they were missing. Attached is an u= pdated patch file. +/* x / y * y =3D=3D x -> x % y =3D=3D 0. */ +(simplify + (eq:c (mult:c (trunc_div:s @0 @1) @1) @0) + (if (TREE_CODE (TREE_TYPE (@0)) !=3D COMPLEX_TYPE + && TREE_CODE (TREE_TYPE (@1)) !=3D COMPLEX_TYPE) Testing this only for @0 is enough, we don't allow mixed types for trunc_div or mult. + (eq (trunc_mod @0 @1) { build_zero_cst (TREE_TYPE(@0)); }))) space before (@0) in 'TREE_TYPE(@0)' OK with those changes. Thanks, Richard. > Thanks > -Sam > >> >> Richard. >> >> > Thanks >> > -Sam >> > >> > >> > > For vector try (which works for both the C and C++ front-end): >> > > #define vector __attribute__((vector_size(4*sizeof(int)) )) >> > > vector int f(vector int x, vector int y) >> > > { >> > > return x =3D=3D x / y * y; >> > > } >> > > >> > > That is for the vector case, =3D=3D still returns a vector type. >> > > >> > > Thanks, >> > > Andrew Pinski >> > > >> > > > >> > > > Thanks >> > > > -Sam >> > > > >> > > >> Thanks, >> > > >> Andrew Pinski >> > > >> >> > > >> > diff --git a/gcc/testsuite/gcc.dg/pr104992-1.c >> > > b/gcc/testsuite/gcc.dg/pr104992-1.c >> > > >> > new file mode 100644 >> > > >> > index 00000000000..a80e5e180ce >> > > >> > --- /dev/null >> > > >> > +++ b/gcc/testsuite/gcc.dg/pr104992-1.c >> > > >> > @@ -0,0 +1,30 @@ >> > > >> > +/* PR tree-optimization/104992 */ >> > > >> > +/* { dg-do run } */ >> > > >> > +/* { dg-options "-O2"} */ >> > > >> > + >> > > >> > +#include "pr104992.c" >> > > >> > + >> > > >> > +int main () { >> > > >> > + >> > > >> > + /* Should be true. */ >> > > >> > + if (!foo(6, 3) >> > > >> > + || !bar(12, 2) >> > > >> > + || !baz(34, 17) >> > > >> > + || !qux(50, 10) >> > > >> > + || !fred(16, 8) >> > > >> > + || !baz(-9, 3) >> > > >> > + || !baz(9, -3) >> > > >> > + || !baz(-9, -3) >> > > >> > + ) { >> > > >> > + __builtin_abort(); >> > > >> > + } >> > > >> > + >> > > >> > + /* Should be false. */ >> > > >> > + if (foo(5, 30) >> > > >> > + || bar(72, 27) >> > > >> > + || baz(42, 15)) { >> > > >> > + __builtin_abort(); >> > > >> > + } >> > > >> > + >> > > >> > + return 0; >> > > >> > +} >> > > >> > diff --git a/gcc/testsuite/gcc.dg/pr104992.c >> > > b/gcc/testsuite/gcc.dg/pr104992.c >> > > >> > new file mode 100644 >> > > >> > index 00000000000..b4b0ca53118 >> > > >> > --- /dev/null >> > > >> > +++ b/gcc/testsuite/gcc.dg/pr104992.c >> > > >> > @@ -0,0 +1,35 @@ >> > > >> > +/* PR tree-optimization/104992 */ >> > > >> > +/* { dg-do compile } */ >> > > >> > +/* { dg-options "-O2 -fdump-tree-optimized" } */ >> > > >> > + >> > > >> > +/* Form from PR. */ >> > > >> > +__attribute__((noipa)) unsigned foo(unsigned x, unsigned y) >> > > >> > +{ >> > > >> > + return x / y * y =3D=3D x; >> > > >> > +} >> > > >> > + >> > > >> > +__attribute__((noipa)) unsigned bar(unsigned x, unsigned y) { >> > > >> > + return x =3D=3D x / y * y; >> > > >> > +} >> > > >> > + >> > > >> > +/* Signed test case. */ >> > > >> > +__attribute__((noipa)) unsigned baz (int x, int y) { >> > > >> > + return x / y * y =3D=3D x; >> > > >> > +} >> > > >> > + >> > > >> > +/* Changed order. */ >> > > >> > +__attribute__((noipa)) unsigned qux (unsigned x, unsigned y) { >> > > >> > + return y * (x / y) =3D=3D x; >> > > >> > +} >> > > >> > + >> > > >> > +/* Wrong order. */ >> > > >> > +__attribute__((noipa)) unsigned fred (unsigned x, unsigned y) = { >> > > >> > + return y * x / y =3D=3D x; >> > > >> > +} >> > > >> > + >> > > >> > +/* Wrong pattern. */ >> > > >> > +__attribute__((noipa)) unsigned waldo (unsigned x, unsigned y, >> > > unsigned z) { >> > > >> > + return x / y * z =3D=3D x; >> > > >> > +} >> > > >> > + >> > > >> > +/* { dg-final {scan-tree-dump-times " % " 4 "optimized" } } */ >> > > >> > >> > > >> > base-commit: 633e9920589ddfaf2d6da1c24ce99b18a2638db4 >> > > >> > -- >> > > >> > 2.31.1 >> > > >> > >> > > >> >> > > >> > > >>