From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [170.10.133.124]) by sourceware.org (Postfix) with ESMTPS id 189603856DDD for ; Wed, 27 Jul 2022 19:57:33 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.1 sourceware.org 189603856DDD Received: from mail-pj1-f71.google.com (mail-pj1-f71.google.com [209.85.216.71]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id us-mta-436-MYSdYR1QOO6FqDUqX0-Vpw-1; Wed, 27 Jul 2022 15:57:30 -0400 X-MC-Unique: MYSdYR1QOO6FqDUqX0-Vpw-1 Received: by mail-pj1-f71.google.com with SMTP id i12-20020a17090a4b8c00b001f20db22239so12078pjh.3 for ; Wed, 27 Jul 2022 12:57:30 -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; bh=RgJUSucUD/oiu9sqYRO95ztdJWXynAegBJgjptDgTkY=; b=GnbNon/bQLMeZ50eVihuwjYHaAWB3JdP3+EKm4Wm9J7ryeeMenJ+27FP1A8LnlmkXe ixiQEqADRL6zjOvk4laUL9pqB/XbKAt0t72sASy6s/ErTd4Fp+oO4/1tU9ow9ei1u8R0 9QoP6O/8XcpI5XT0DX5AmR5hMtXRXAYZ0cA0P2KSPWme/ZQ8C+YwYic3uVcZpjnoRuSe cCtWwxn7rd/1d1XZaeQF4Uyr6ruPyw4mdFVczbRVkl+yT1TRQNX22v30o4kD9Gml0BZP kmQuoiX7JSZDKW6kRZoUPTJzE0w7ux0ExUaU/NuWBIesUdW/SFiog4kRYvb5iVv3CYg+ 3kmQ== X-Gm-Message-State: AJIora8seEmrDEE6AXfeZNgNDin9i9zTQlT7rhxnoeY6NPZ3ZaMk5xOC OSVMzMZUHRAlIYI3QzxYqR3s+R5Tfbg2gHCO6Qv8eqdgltnRgVcPa9eZfotHL2qljqqP4vKCwyc 4Vd6H7YpCPIxTzle6HKRQMujgOGkGZzYadQ== X-Received: by 2002:a17:902:b20d:b0:16d:aefa:8ef6 with SMTP id t13-20020a170902b20d00b0016daefa8ef6mr5712718plr.90.1658951849781; Wed, 27 Jul 2022 12:57:29 -0700 (PDT) X-Google-Smtp-Source: AGRyM1vU+kem5eAUR3sCK/gPRhPvg7qMpFmOv4kIbHnvVlQF8IT7OZ/nXOeob1b9loJfwcxJeosAt217pdbgyMVfZf4= X-Received: by 2002:a17:902:b20d:b0:16d:aefa:8ef6 with SMTP id t13-20020a170902b20d00b0016daefa8ef6mr5712699plr.90.1658951849444; Wed, 27 Jul 2022 12:57:29 -0700 (PDT) MIME-Version: 1.0 References: <20220725193425.511903-1-sfeifer@redhat.com> In-Reply-To: From: Sam Feifer Date: Wed, 27 Jul 2022 15:57:18 -0400 Message-ID: Subject: Re: [PATCH] match.pd: Add new division pattern [PR104992] To: Richard Biener Cc: Andrew Pinski , GCC Patches X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com Content-Type: multipart/mixed; boundary="000000000000afca7005e4ced341" X-Spam-Status: No, score=-13.4 required=5.0 tests=BAYES_00, DKIMWL_WL_HIGH, DKIM_SIGNED, DKIM_VALID, DKIM_VALID_AU, DKIM_VALID_EF, GIT_PATCH_0, HTML_MESSAGE, RCVD_IN_DNSWL_NONE, SPF_HELO_NONE, SPF_NONE, 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-Content-Filtered-By: Mailman/MimeDel 2.1.29 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: Wed, 27 Jul 2022 19:57:35 -0000 --000000000000afca7005e4ced341 Content-Type: text/plain; charset="UTF-8" > _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 simplify. 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 == x -> x % y == 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 updated patch file. 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 == x / y * y; > > > } > > > > > > That is for the vector case, == 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 == x; > > > >> > +} > > > >> > + > > > >> > +__attribute__((noipa)) unsigned bar(unsigned x, unsigned y) { > > > >> > + return x == x / y * y; > > > >> > +} > > > >> > + > > > >> > +/* Signed test case. */ > > > >> > +__attribute__((noipa)) unsigned baz (int x, int y) { > > > >> > + return x / y * y == x; > > > >> > +} > > > >> > + > > > >> > +/* Changed order. */ > > > >> > +__attribute__((noipa)) unsigned qux (unsigned x, unsigned y) { > > > >> > + return y * (x / y) == x; > > > >> > +} > > > >> > + > > > >> > +/* Wrong order. */ > > > >> > +__attribute__((noipa)) unsigned fred (unsigned x, unsigned y) { > > > >> > + return y * x / y == x; > > > >> > +} > > > >> > + > > > >> > +/* Wrong pattern. */ > > > >> > +__attribute__((noipa)) unsigned waldo (unsigned x, unsigned y, > > > unsigned z) { > > > >> > + return x / y * z == x; > > > >> > +} > > > >> > + > > > >> > +/* { dg-final {scan-tree-dump-times " % " 4 "optimized" } } */ > > > >> > > > > >> > base-commit: 633e9920589ddfaf2d6da1c24ce99b18a2638db4 > > > >> > -- > > > >> > 2.31.1 > > > >> > > > > >> > > > > > > > > --000000000000afca7005e4ced341 Content-Type: text/x-patch; charset="US-ASCII"; name="0001-match.pd-Add-new-division-pattern-PR104992.patch" Content-Disposition: attachment; filename="0001-match.pd-Add-new-division-pattern-PR104992.patch" Content-Transfer-Encoding: base64 Content-ID: X-Attachment-Id: f_l640kne60 RnJvbSBiZGNmZDdiODVlOTVlYzlhNjQ5YzgwODNjNGZiYzFiZmI4OGNlYTg4IE1vbiBTZXAgMTcg MDA6MDA6MDAgMjAwMQpGcm9tOiBTYW0gRmVpZmVyIDxzZmVpZmVyQHJlZGhhdC5jb20+CkRhdGU6 IFdlZCwgMjcgSnVsIDIwMjIgMTU6Mzc6MzkgLTA0MDAKU3ViamVjdDogW1BBVENIXSBtYXRjaC5w ZDogQWRkIG5ldyBkaXZpc2lvbiBwYXR0ZXJuIFtQUjEwNDk5Ml0KClRoaXMgcGF0Y2ggZml4ZXMg YSBtaXNzZWQgb3B0aW1pemF0aW9uIGluIG1hdGNoLnBkLiBJdCB0YWtlcyB0aGUgcGF0dGVybiwg eCAvIHkgKiB5ID09IHgsIGFuZCBvcHRpbWl6ZXMgaXQgdG8geCAlIHkgPT0gMC4gVGhpcyBwcm9k dWNlcyBmZXdlciBpbnN0cnVjdGlvbnMuIFRoaXMgc2ltcGxpZmljYXRpb24gZG9lcyBub3QgaGFw cGVuIGZvciBjb21wbGV4IHR5cGVzLgoKVGhlcmUgYXJlIGFsc28gdGVzdHMgZm9yIHRoZSBvcHRp bWl6YXRpb25zIHRvIGJlIGFkZGVkIHRvIHRoZSB0ZXN0IHN1aXRlLgoKQm9vdHN0cmFwcGVkL3Jl Z3Rlc3RlZCBvbiB4ODZfNjQtcGMtbGludXgtZ251LCBvayBmb3IgdHJ1bms/CgoJUFIgdHJlZS1v cHRpbWl6YXRpb24vMTA0OTkyCgpnY2MvQ2hhbmdlTG9nOgoKCSogbWF0Y2gucGQgeCAvIHkgKiB5 ID09IHg6IE5ldyBzaW1wbGlmaWNhdGlvbi4KCmdjYy90ZXN0c3VpdGUvQ2hhbmdlTG9nOgoKCSog ZysrLmRnL3ByMTA0OTkyLTEuQzogTmV3IHRlc3QuCgkqIGdjYy5kZy9wcjEwNDk5Mi5jOiBOZXcg dGVzdC4KLS0tCiBnY2MvbWF0Y2gucGQgICAgICAgICAgICAgICAgICAgICAgfCAgNyArKysrCiBn Y2MvdGVzdHN1aXRlL2crKy5kZy9wcjEwNDk5Mi0xLkMgfCAzMCArKysrKysrKysrKysrKysrCiBn Y2MvdGVzdHN1aXRlL2djYy5kZy9wcjEwNDk5Mi5jICAgfCA1NyArKysrKysrKysrKysrKysrKysr KysrKysrKysrKysrCiAzIGZpbGVzIGNoYW5nZWQsIDk0IGluc2VydGlvbnMoKykKIGNyZWF0ZSBt b2RlIDEwMDY0NCBnY2MvdGVzdHN1aXRlL2crKy5kZy9wcjEwNDk5Mi0xLkMKIGNyZWF0ZSBtb2Rl IDEwMDY0NCBnY2MvdGVzdHN1aXRlL2djYy5kZy9wcjEwNDk5Mi5jCgpkaWZmIC0tZ2l0IGEvZ2Nj L21hdGNoLnBkIGIvZ2NjL21hdGNoLnBkCmluZGV4IDk3MzYzOTMwNjFhLi4xNDQyZTRjZjhkYyAx MDA2NDQKLS0tIGEvZ2NjL21hdGNoLnBkCisrKyBiL2djYy9tYXRjaC5wZApAQCAtMzk4MSw2ICsz OTgxLDEzIEBAIERFRklORV9JTlRfQU5EX0ZMT0FUX1JPVU5EX0ZOIChSSU5UKQogICAgKHBsdXM6 YyAobXVsdDpjIChkaXYgQDAgQDEpIEAxKSAobW9kIEAwIEAxKSkKICAgIEAwKSkKIAorLyogeCAv IHkgKiB5ID09IHggLT4geCAlIHkgPT0gMC4gICovCisoc2ltcGxpZnkKKyAgKGVxOmMgKG11bHQ6 YyAodHJ1bmNfZGl2OnMgQDAgQDEpIEAxKSBAMCkKKyAgKGlmIChUUkVFX0NPREUgKFRSRUVfVFlQ RSAoQDApKSAhPSBDT01QTEVYX1RZUEUKKyAgICAgICAmJiBUUkVFX0NPREUgKFRSRUVfVFlQRSAo QDEpKSAhPSBDT01QTEVYX1RZUEUpCisgICAgKGVxICh0cnVuY19tb2QgQDAgQDEpIHsgYnVpbGRf emVyb19jc3QgKFRSRUVfVFlQRShAMCkpOyB9KSkpCisKIC8qICgoWCAvW2V4XSBBKSArLSBCKSAq IEEgIC0tPiAgWCArLSBBICogQi4gICovCiAoZm9yIG9wIChwbHVzIG1pbnVzKQogIChzaW1wbGlm eQpkaWZmIC0tZ2l0IGEvZ2NjL3Rlc3RzdWl0ZS9nKysuZGcvcHIxMDQ5OTItMS5DIGIvZ2NjL3Rl c3RzdWl0ZS9nKysuZGcvcHIxMDQ5OTItMS5DCm5ldyBmaWxlIG1vZGUgMTAwNjQ0CmluZGV4IDAw MDAwMDAwMDAwLi5mNTY5NmIyNDVhYwotLS0gL2Rldi9udWxsCisrKyBiL2djYy90ZXN0c3VpdGUv ZysrLmRnL3ByMTA0OTkyLTEuQwpAQCAtMCwwICsxLDMwIEBACisvKiBQUiB0cmVlLW9wdGltaXph dGlvbi8xMDQ5OTIgKi8KKy8qIHsgZGctZG8gcnVuIH0gKi8KKy8qIHsgZGctb3B0aW9ucyAiLU8y In0gKi8KKworI2luY2x1ZGUgIi4uL2djYy5kZy9wcjEwNDk5Mi5jIgorCitpbnQgbWFpbiAoKSB7 CisKKyAgICAvKiBTaG91bGQgYmUgdHJ1ZS4gICovCisgICAgaWYgKCFmb28oNiwgMykKKyAgICAg ICAgfHwgIWJhcigxMiwgMikKKyAgICAgICAgfHwgIWJheigzNCwgMTcpCisgICAgICAgIHx8ICFx dXgoNTAsIDEwKQorICAgICAgICB8fCAhZnJlZCgxNiwgOCkKKyAgICAgICAgfHwgIWJheigtOSwg MykKKyAgICAgICAgfHwgIWJheig5LCAtMykKKyAgICAgICAgfHwgIWJheigtOSwgLTMpCisgICAg ICAgICkgeworICAgICAgICAgICAgX19idWlsdGluX2Fib3J0KCk7CisgICAgICAgICB9CisgICAg CisgICAgLyogU2hvdWxkIGJlIGZhbHNlLiAgKi8KKyAgICBpZiAoZm9vKDUsIDMwKQorICAgICAg ICB8fCBiYXIoNzIsIDI3KQorICAgICAgICB8fCBiYXooNDIsIDE1KSkgeworICAgICAgICAgICAg X19idWlsdGluX2Fib3J0KCk7CisgICAgICAgIH0KKyAgICAKKyAgICByZXR1cm4gMDsKK30KZGlm ZiAtLWdpdCBhL2djYy90ZXN0c3VpdGUvZ2NjLmRnL3ByMTA0OTkyLmMgYi9nY2MvdGVzdHN1aXRl L2djYy5kZy9wcjEwNDk5Mi5jCm5ldyBmaWxlIG1vZGUgMTAwNjQ0CmluZGV4IDAwMDAwMDAwMDAw Li5iOWQ5MWExM2FkOAotLS0gL2Rldi9udWxsCisrKyBiL2djYy90ZXN0c3VpdGUvZ2NjLmRnL3By MTA0OTkyLmMKQEAgLTAsMCArMSw1NyBAQAorLyogUFIgdHJlZS1vcHRpbWl6YXRpb24vMTA0OTky ICovCisvKiB7IGRnLWRvIGNvbXBpbGUgfSAqLworLyogeyBkZy1vcHRpb25zICItTzIgLWZkdW1w LXRyZWUtb3B0aW1pemVkIiB9ICovCisKKyNkZWZpbmUgdmVjdG9yIF9fYXR0cmlidXRlX18oKHZl Y3Rvcl9zaXplKDQqc2l6ZW9mKGludCkpKSkKKworLyogRm9ybSBmcm9tIFBSLiAgKi8KK19fYXR0 cmlidXRlX18oKG5vaXBhKSkgdW5zaWduZWQgZm9vKHVuc2lnbmVkIHgsIHVuc2lnbmVkIHkpCit7 CisgICAgcmV0dXJuIHggLyB5ICogeSA9PSB4OworfQorCitfX2F0dHJpYnV0ZV9fKChub2lwYSkp IHVuc2lnbmVkIGJhcih1bnNpZ25lZCB4LCB1bnNpZ25lZCB5KSB7CisgICAgcmV0dXJuIHggPT0g eCAvIHkgKiB5OworfQorCisvKiBTaWduZWQgdGVzdCBjYXNlLiAgKi8KK19fYXR0cmlidXRlX18o KG5vaXBhKSkgdW5zaWduZWQgYmF6IChpbnQgeCwgaW50IHkpIHsKKyAgICByZXR1cm4geCAvIHkg KiB5ID09IHg7Cit9CisKKy8qIENoYW5nZWQgb3JkZXIuICAqLworX19hdHRyaWJ1dGVfXygobm9p cGEpKSB1bnNpZ25lZCBxdXggKHVuc2lnbmVkIHgsIHVuc2lnbmVkIHkpIHsKKyAgICByZXR1cm4g eSAqICh4IC8geSkgPT0geDsKK30KKworLyogVGVzdCBmb3IgZm9yd2FyZCBwcm9wb2dhdGlvbi4g ICovCitfX2F0dHJpYnV0ZV9fKChub2lwYSkpIHVuc2lnbmVkIGNvcmdlKHVuc2lnbmVkIHgsIHVu c2lnbmVkIHkpIHsKKyAgICBpbnQgeiA9IHggLyB5OworICAgIGludCBxID0geiAqIHk7CisgICAg cmV0dXJuIHEgPT0geDsgCit9CisKKy8qIFRlc3QgdmVjdG9yIGNhc2UuICAqLworX19hdHRyaWJ1 dGVfXygobm9pcGEpKSB2ZWN0b3IgaW50IHRodWQodmVjdG9yIGludCB4LCB2ZWN0b3IgaW50IHkp IHsKKyAgICByZXR1cm4geCAvIHkgKiB5ID09IHg7Cit9CisKKy8qIENvbXBsZXggdHlwZSBzaG91 bGQgbm90IHNpbXBsaWZ5IGJlY2F1c2UgbW9kIGlzIGRpZmZlcmVudC4gICovCitfX2F0dHJpYnV0 ZV9fKChub2lwYSkpIGludCBnb28oX0NvbXBsZXggaW50IHgsIF9Db21wbGV4IGludCB5KQorewor ICAgIF9Db21wbGV4IGludCB6ID0geCAvIHk7CisgICAgX0NvbXBsZXggaW50IHEgPSB6ICogeTsK KyAgICByZXR1cm4gcSA9PSB4OyAKK30KKworLyogV3Jvbmcgb3JkZXIuICAqLworX19hdHRyaWJ1 dGVfXygobm9pcGEpKSB1bnNpZ25lZCBmcmVkICh1bnNpZ25lZCB4LCB1bnNpZ25lZCB5KSB7Cisg ICAgcmV0dXJuIHkgKiB4IC8geSA9PSB4OworfQorCisvKiBXcm9uZyBwYXR0ZXJuLiAgKi8KK19f YXR0cmlidXRlX18oKG5vaXBhKSkgdW5zaWduZWQgd2FsZG8gKHVuc2lnbmVkIHgsIHVuc2lnbmVk IHksIHVuc2lnbmVkIHopIHsKKyAgICByZXR1cm4geCAvIHkgKiB6ID09IHg7Cit9CisKKy8qIHsg ZGctZmluYWwge3NjYW4tdHJlZS1kdW1wLXRpbWVzICIgJSAiIDkgIm9wdGltaXplZCIgfSB9ICov CgpiYXNlLWNvbW1pdDogNjMzZTk5MjA1ODlkZGZhZjJkNmRhMWMyNGNlOTliMThhMjYzOGRiNAot LSAKMi4zMS4xCgo= --000000000000afca7005e4ced341--