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.129.124]) by sourceware.org (Postfix) with ESMTPS id 85FEA3858439 for ; Tue, 19 Jul 2022 13:48:49 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.1 sourceware.org 85FEA3858439 Received: from mail-pg1-f199.google.com (mail-pg1-f199.google.com [209.85.215.199]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id us-mta-59-3pIPtrsUPBeEII95T8XtBQ-1; Tue, 19 Jul 2022 09:48:45 -0400 X-MC-Unique: 3pIPtrsUPBeEII95T8XtBQ-1 Received: by mail-pg1-f199.google.com with SMTP id o10-20020a655bca000000b00412787983b3so7233151pgr.12 for ; Tue, 19 Jul 2022 06:48:44 -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=KUgXdPj/dyzvuJ3nIR5xTw8IDTyo9eEE5cBgRwGHno8=; b=j2veorf6fB8kkRT/RWX8NnpqwdwBEwysFuszGjXb7la1wuwutvJ96biwjME8r59Cfb UjbEfpMDRlVmCjjcwJCKD/MKPyNZVWEsstfL2KpOBPP8H91dzd7zdGZmHeD/0Ifdl8uk J0It7kLw29E9NY4ANDmmWl1bmctDoD5d1m1jogxUwI6aBSyJcVQ+EOnUQnYS7pQM/Ojm +ZQQinKmuJnPmsvxxlVpIV3y4R6oM+1gCYsTCn+FjNjDt9FmqXkRYvNaUuLM7SNr2d7B hA8KXwZ1leMsgR1jn4IE3bgTUgGRcTJxktTWjPdRmZSAuxt4NzKYSJCVFs1dyDPmLT9f BHIg== X-Gm-Message-State: AJIora859BvPxyBOiBxGr4BYz7lkqMuq6feyEkJsnl4EOby3LMHXMEvZ Jcaz6eq+Y03jORm5T+st9GeZaMmQt/o0UcOPeyIishE7fJACLhIXggX5kxRWixnF1dsKXe9CehC 5qSeBR/CU5XxRQb1dcjW9ZpQ8BeS9bhDtow== X-Received: by 2002:a63:8542:0:b0:415:3194:cc76 with SMTP id u63-20020a638542000000b004153194cc76mr29228228pgd.431.1658238523928; Tue, 19 Jul 2022 06:48:43 -0700 (PDT) X-Google-Smtp-Source: AGRyM1tSqKPQ6giIeFpE3h/rG0kVE/5k2FtQzZF+7i1uUtNQW2LaNUIP7tQ3/vrR8zxLWkCJMbDTSLPdVPY/iSnXbJ8= X-Received: by 2002:a63:8542:0:b0:415:3194:cc76 with SMTP id u63-20020a638542000000b004153194cc76mr29228199pgd.431.1658238523576; Tue, 19 Jul 2022 06:48:43 -0700 (PDT) MIME-Version: 1.0 References: <20220713192420.3126654-1-sfeifer@redhat.com> In-Reply-To: From: Sam Feifer Date: Tue, 19 Jul 2022 09:48:32 -0400 Message-ID: Subject: Re: [PATCH] match.pd: Add new abs pattern [PR94290] To: Richard Biener Cc: Andrew Pinski , GCC Patches X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com Content-Type: multipart/mixed; boundary="00000000000026f2a105e428be31" X-Spam-Status: No, score=-13.8 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_LOW, 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: Tue, 19 Jul 2022 13:48:53 -0000 --00000000000026f2a105e428be31 Content-Type: text/plain; charset="UTF-8" Attached is a patch file with those changes. Thanks -Sam On Tue, Jul 19, 2022 at 2:36 AM Richard Biener wrote: > On Mon, Jul 18, 2022 at 7:31 PM Sam Feifer via Gcc-patches > wrote: > > > > Just realized I had mixed up the 9 and the 2 when labelling the patch. > This > > patch is referring to pr94920 not pr94290. Attached is a fixed patch > file. > > Sorry for any confusion. > > Can you put the patterns somewhere related? The abs producing one > seems to fit around line 323, the max producing before line 3415? > > +/* (x <= 0 ? -x : 0) -> max(-x, 0). */ > +(simplify > + (cond (le @0 integer_zerop@1) (negate @0) integer_zerop@1) > + (max (negate @0) @1)) > > you can re-use the existing (negate @0) in the result by doing > > +/* (x <= 0 ? -x : 0) -> max(-x, 0). */ > +(simplify > + (cond (le @0 integer_zerop@1) (negate@2 @0) integer_zerop@1) > + (max @2 @1)) > > OK with those changes. > > Thanks, > Richard. > > > On Mon, Jul 18, 2022 at 9:07 AM Sam Feifer wrote: > > > > > Here's an updated version of the patch. > > > > > > Thanks > > > -Sam > > > > > > On Thu, Jul 14, 2022 at 3:54 PM Andrew Pinski > wrote: > > > > > >> On Thu, Jul 14, 2022 at 12:38 PM Sam Feifer > wrote: > > >> > > > >> > > > >> > > > >> > On Thu, Jul 14, 2022 at 1:24 PM Andrew Pinski > > >> wrote: > > >> >> > > >> >> On Thu, Jul 14, 2022 at 7:09 AM Sam Feifer > wrote: > > >> >> > > > >> >> > > > >> >> > On Wed, Jul 13, 2022 at 3:36 PM Andrew Pinski > > > >> wrote: > > >> >> >> > > >> >> >> On Wed, Jul 13, 2022 at 12:26 PM Sam Feifer via Gcc-patches > > >> >> >> wrote: > > >> >> >> > > > >> >> >> > This patch is intended to fix a missed optimization in > match.pd. > > >> It optimizes (x >= 0 ? x : 0) + (x <= 0 ? -x : 0) to just abs(x). I > had to > > >> write a second simplification in match.pd to handle the commutative > > >> property as the match was not ocurring otherwise. Additionally, the > pattern > > >> (x <= 0 ? -x : 0) now gets optimized to max(-x, 0), which helps with > the > > >> other simplification rule. > > >> >> >> > > >> >> >> You could use :c for the commutative property instead and that > > >> should > > >> >> >> simplify things. > > >> >> >> That is: > > >> >> >> > > >> >> >> (simplify > > >> >> >> (plus:c (max @0 integer_zerop) (max (negate @0) > integer_zerop)) > > >> >> >> (abs @0)) > > >> >> >> > > >> >> >> Also since integer_zerop works on vectors, it seems like you > should > > >> >> >> add a testcase or two for the vector case. > > >> >> >> Also would be useful if you write a testcase that uses different > > >> >> >> statements rather than one big one so it gets exercised in the > > >> >> >> forwprop case. > > >> >> >> Note also if either of the max are used more than just in this > > >> >> >> simplification, it could increase the lifetime of @0, maybe you > need > > >> >> >> to add :s to the max expressions. > > >> >> >> > > >> >> > > > >> >> > Thanks for the feedback. I'm not quite sure what a vector test > case > > >> would look like for this. Could I get some guidance on that? > > >> >> > > >> >> Yes this should produce the pattern at forwprop1 time (with the C++ > > >> >> front-end, the C front-end does not support vector selects): > > >> >> typedef int __attribute__((vector_size(4*sizeof(int)))) vint; > > >> >> > > >> >> vint foo(vint x) { > > >> >> vint t = (x >= 0 ? x : 0) ; > > >> >> vint xx = -x; > > >> >> vint t1 = (xx >= 0 ? xx : 0); > > >> >> return t + t1; > > >> >> } > > >> >> > > >> >> int foo(int x) { > > >> >> int t = (x >= 0 ? x : 0) ; > > >> >> int xx = -x; > > >> >> int t1 = (xx >= 0 ? xx : 0); > > >> >> return t + t1; > > >> >> } > > >> >> > > >> >> Thanks, > > >> >> Andrew Pinski > > >> >> > > >> > > > >> > Thanks for the help. I'm still having trouble with the vector test, > > >> though. When I try to compile, I get an error saying "used vector type > > >> where scalar is required", referring to the max expressions. How do I > use > > >> the max expression with two vectors as the inputs? > > >> > > >> As I mentioned it only works with the C++ front-end :). The C > > >> front-end does not support ?: with vectors types. > > >> > > >> Thanks, > > >> Andrew Pinski > > >> > > >> > > > >> > Thanks > > >> > -Sam > > >> >> > > >> >> > > >> >> > > > >> >> > Thanks > > >> >> > -Sam > > >> >> > > > >> >> >> > > >> >> >> Thanks, > > >> >> >> Andrew > > >> >> >> > > >> >> >> > > > >> >> >> > Tests are also included to be added to the testsuite. > > >> >> >> > > > >> >> >> > Bootstrapped/regtested on x86_64-pc-linux-gnu, ok for trunk? > > >> >> >> > > > >> >> >> > PR tree-optimization/94290 > > >> >> >> > > > >> >> >> > gcc/ChangeLog: > > >> >> >> > > > >> >> >> > * match.pd (x >= 0 ? x : 0) + (x <= 0 ? -x : 0): New > > >> simplification. > > >> >> >> > * match.pd (x <= 0 ? -x : 0): New Simplification. > > >> >> >> > > > >> >> >> > gcc/testsuite/ChangeLog: > > >> >> >> > > > >> >> >> > * gcc.c-torture/execute/pr94290-1.c: New test. > > >> >> >> > * gcc.dg/pr94290-2.c: New test. > > >> >> >> > * gcc.dg/pr94290.c: New test. > > >> >> >> > --- > > >> >> >> > gcc/match.pd | 15 ++++++ > > >> >> >> > .../gcc.c-torture/execute/pr94290-1.c | 16 +++++++ > > >> >> >> > gcc/testsuite/gcc.dg/pr94290-2.c | 15 ++++++ > > >> >> >> > gcc/testsuite/gcc.dg/pr94290.c | 46 > > >> +++++++++++++++++++ > > >> >> >> > 4 files changed, 92 insertions(+) > > >> >> >> > create mode 100644 > > >> gcc/testsuite/gcc.c-torture/execute/pr94290-1.c > > >> >> >> > create mode 100644 gcc/testsuite/gcc.dg/pr94290-2.c > > >> >> >> > create mode 100644 gcc/testsuite/gcc.dg/pr94290.c > > >> >> >> > > > >> >> >> > diff --git a/gcc/match.pd b/gcc/match.pd > > >> >> >> > index 45aefd96688..55ca79d7ac9 100644 > > >> >> >> > --- a/gcc/match.pd > > >> >> >> > +++ b/gcc/match.pd > > >> >> >> > @@ -7848,3 +7848,18 @@ and, > > >> >> >> > (if (TYPE_UNSIGNED (TREE_TYPE (@0))) > > >> >> >> > (bit_and @0 @1) > > >> >> >> > (cond (le @0 @1) @0 (bit_and @0 @1)))))) > > >> >> >> > + > > >> >> >> > +/* (x >= 0 ? x : 0) + (x <= 0 ? -x : 0) -> abs x. */ > > >> >> >> > +(simplify > > >> >> >> > + (plus (max @0 integer_zerop) (max (negate @0) > integer_zerop)) > > >> >> >> > + (abs @0)) > > >> >> >> > + > > >> >> >> > +/* (x <= 0 ? -x : 0) + (x >= 0 ? x : 0) -> abs x. */ > > >> >> >> > +(simplify > > >> >> >> > + (plus (max (negate @0) integer_zerop) (max @0 > integer_zerop) ) > > >> >> >> > + (abs @0)) > > >> >> >> > + > > >> >> >> > +/* (x <= 0 ? -x : 0) -> max(-x, 0). */ > > >> >> >> > +(simplify > > >> >> >> > + (cond (le @0 integer_zerop@1) (negate @0) integer_zerop@1) > > >> >> >> > + (max (negate @0) @1)) > > >> >> >> > diff --git a/gcc/testsuite/gcc.c-torture/execute/pr94290-1.c > > >> b/gcc/testsuite/gcc.c-torture/execute/pr94290-1.c > > >> >> >> > new file mode 100644 > > >> >> >> > index 00000000000..93b80d569aa > > >> >> >> > --- /dev/null > > >> >> >> > +++ b/gcc/testsuite/gcc.c-torture/execute/pr94290-1.c > > >> >> >> > @@ -0,0 +1,16 @@ > > >> >> >> > +/* PR tree-optimization/94290 */ > > >> >> >> > + > > >> >> >> > +#include "../../gcc.dg/pr94290.c" > > >> >> >> > + > > >> >> >> > +int main() { > > >> >> >> > + > > >> >> >> > + if (foo(0) != 0 > > >> >> >> > + || foo(-42) != 42 > > >> >> >> > + || foo(42) != 42 > > >> >> >> > + || baz(-10) != 10 > > >> >> >> > + || baz(-10) != 10) { > > >> >> >> > + __builtin_abort(); > > >> >> >> > + } > > >> >> >> > + > > >> >> >> > + return 0; > > >> >> >> > +} > > >> >> >> > diff --git a/gcc/testsuite/gcc.dg/pr94290-2.c > > >> b/gcc/testsuite/gcc.dg/pr94290-2.c > > >> >> >> > new file mode 100644 > > >> >> >> > index 00000000000..ea6e55755f5 > > >> >> >> > --- /dev/null > > >> >> >> > +++ b/gcc/testsuite/gcc.dg/pr94290-2.c > > >> >> >> > @@ -0,0 +1,15 @@ > > >> >> >> > +/* PR tree-optimization/94290 */ > > >> >> >> > +/* { dg-do compile } */ > > >> >> >> > +/* { dg-options "-O2 -fdump-tree-optimized" } */ > > >> >> >> > + > > >> >> >> > +/* Form from PR. */ > > >> >> >> > +__attribute__((noipa)) unsigned int foo(int x) { > > >> >> >> > + return x <= 0 ? -x : 0; > > >> >> >> > +} > > >> >> >> > + > > >> >> >> > +/* Changed order. */ > > >> >> >> > +__attribute__((noipa)) unsigned int bar(int x) { > > >> >> >> > + return 0 >= x ? -x : 0; > > >> >> >> > +} > > >> >> >> > + > > >> >> >> > +/* { dg-final {scan-tree-dump-times " MAX_EXPR " 2 > "optimized" } > > >> } */ > > >> >> >> > diff --git a/gcc/testsuite/gcc.dg/pr94290.c > > >> b/gcc/testsuite/gcc.dg/pr94290.c > > >> >> >> > new file mode 100644 > > >> >> >> > index 00000000000..47617c36c02 > > >> >> >> > --- /dev/null > > >> >> >> > +++ b/gcc/testsuite/gcc.dg/pr94290.c > > >> >> >> > @@ -0,0 +1,46 @@ > > >> >> >> > +/* PR tree-optimization/94290 */ > > >> >> >> > +/* { dg-do compile } */ > > >> >> >> > +/* { dg-options "-O2 -fdump-tree-optimized" } */ > > >> >> >> > + > > >> >> >> > + > > >> >> >> > +/* Same form as PR. */ > > >> >> >> > +__attribute__((noipa)) unsigned int foo(int x) { > > >> >> >> > + return (x >= 0 ? x : 0) + (x <= 0 ? -x : 0); > > >> >> >> > +} > > >> >> >> > + > > >> >> >> > +/* Signed function. */ > > >> >> >> > +__attribute__((noipa)) int bar(int x) { > > >> >> >> > + return (x >= 0 ? x : 0) + (x <= 0 ? -x : 0); > > >> >> >> > +} > > >> >> >> > + > > >> >> >> > +/* Commutative property. */ > > >> >> >> > +__attribute__((noipa)) unsigned int baz(int x) { > > >> >> >> > + return (x <= 0 ? -x : 0) + (x >= 0 ? x : 0); > > >> >> >> > +} > > >> >> >> > + > > >> >> >> > +/* Flipped order for max expressions. */ > > >> >> >> > +__attribute__((noipa)) unsigned int quux(int x) { > > >> >> >> > + return (0 <= x ? x : 0) + (0 >= x ? -x : 0); > > >> >> >> > +} > > >> >> >> > + > > >> >> >> > +/* Not zero so should not optimize. */ > > >> >> >> > +__attribute__((noipa)) unsigned int waldo(int x) { > > >> >> >> > + return (x >= 4 ? x : 4) + (x <= 4 ? -x : 4); > > >> >> >> > +} > > >> >> >> > + > > >> >> >> > +/* Not zero so should not optimize. */ > > >> >> >> > +__attribute__((noipa)) unsigned int fred(int x) { > > >> >> >> > + return (x >= -4 ? x : -4) + (x <= -4 ? -x : -4); > > >> >> >> > +} > > >> >> >> > + > > >> >> >> > +/* Incorrect pattern. */ > > >> >> >> > +__attribute__((noipa)) unsigned int goo(int x) { > > >> >> >> > + return (x <= 0 ? x : 0) + (x >= 0 ? -x : 0); > > >> >> >> > +} > > >> >> >> > + > > >> >> >> > +/* Incorrect pattern. */ > > >> >> >> > +__attribute__((noipa)) int qux(int x) { > > >> >> >> > + return (x >= 0 ? x : 0) + (x >= 0 ? x : 0); > > >> >> >> > +} > > >> >> >> > + > > >> >> >> > +/* { dg-final {scan-tree-dump-times " ABS_EXPR " 4 > "optimized" } > > >> } */ > > >> >> >> > > > >> >> >> > base-commit: 6af530f914801f5e561057da55c41480f28751f7 > > >> >> >> > -- > > >> >> >> > 2.31.1 > > >> >> >> > > > >> >> >> > > >> >> > > >> > > >> > > --00000000000026f2a105e428be31 Content-Type: text/x-patch; charset="US-ASCII"; name="0001-match.pd-Add-new-abs-pattern-PR94920.patch" Content-Disposition: attachment; filename="0001-match.pd-Add-new-abs-pattern-PR94920.patch" Content-Transfer-Encoding: base64 Content-ID: X-Attachment-Id: f_l5s8d6cf0 RnJvbSA5NmUyZGFiZWRmYTAyMDNiY2Q3NWFhZTVmNTQ0ZjNlNTdlZTU3YTFjIE1vbiBTZXAgMTcg MDA6MDA6MDAgMjAwMQpGcm9tOiBTYW0gRmVpZmVyIDxzZmVpZmVyQHJlZGhhdC5jb20+CkRhdGU6 IE1vbiwgMTggSnVsIDIwMjIgMTM6MTg6MzkgLTA0MDAKU3ViamVjdDogW1BBVENIXSBtYXRjaC5w ZDogQWRkIG5ldyBhYnMgcGF0dGVybiBbUFI5NDkyMF0KClRoaXMgcGF0Y2ggaXMgaW50ZW5kZWQg dG8gZml4IGEgbWlzc2VkIG9wdGltaXphdGlvbiBpbiBtYXRjaC5wZC4gSXQgb3B0aW1pemVzICh4 ID49IDAgPyB4IDogMCkgKyAoeCA8PSAwID8gLXggOiAwKSB0byBqdXN0IGFicyh4KS4gQWRkaXRp b25hbGx5LCB0aGUgcGF0dGVybiAoeCA8PSAwID8gLXggOiAwKSBub3cgZ2V0cyBvcHRpbWl6ZWQg dG8gbWF4KC14LCAwKSwgd2hpY2ggaGVscHMgd2l0aCB0aGUgb3RoZXIgc2ltcGxpZmljYXRpb24g cnVsZS4KClRlc3RzIGFyZSBhbHNvIGluY2x1ZGVkIHRvIGJlIGFkZGVkIHRvIHRoZSB0ZXN0c3Vp dGUuCgpCb290c3RyYXBwZWQvcmVndGVzdGVkIG9uIHg4Nl82NC1wYy1saW51eC1nbnUsIG9rIGZv ciB0cnVuaz8KCglQUiB0cmVlLW9wdGltaXphdGlvbi85NDkyMAoKZ2NjL0NoYW5nZUxvZzoKCgkq IG1hdGNoLnBkICh4ID49IDAgPyB4IDogMCkgKyAoeCA8PSAwID8gLXggOiAwKTogTmV3IHNpbXBs aWZpY2F0aW9uLgoJKiBtYXRjaC5wZCAoeCA8PSAwID8gLXggOiAwKTogTmV3IHNpbXBsaWZpY2F0 aW9uLgoKZ2NjL3Rlc3RzdWl0ZS9DaGFuZ2VMb2c6CgoJKiBnKysuZGcvcHI5NDkyMC0xLkM6IE5l dyB0ZXN0LgoJKiBnKysuZGcvcHI5NDkyMC5DOiBOZXcgdGVzdC4KCSogZ2NjLmRnL3ByOTQ5MjAt Mi5jOiBOZXcgdGVzdC4KLS0tCiBnY2MvbWF0Y2gucGQgICAgICAgICAgICAgICAgICAgICB8IDEw ICsrKysrCiBnY2MvdGVzdHN1aXRlL2crKy5kZy9wcjk0OTIwLTEuQyB8IDE3ICsrKysrKysrKwog Z2NjL3Rlc3RzdWl0ZS9nKysuZGcvcHI5NDkyMC5DICAgfCA2MyArKysrKysrKysrKysrKysrKysr KysrKysrKysrKysrKwogZ2NjL3Rlc3RzdWl0ZS9nY2MuZGcvcHI5NDkyMC0yLmMgfCAxNSArKysr KysrKwogNCBmaWxlcyBjaGFuZ2VkLCAxMDUgaW5zZXJ0aW9ucygrKQogY3JlYXRlIG1vZGUgMTAw NjQ0IGdjYy90ZXN0c3VpdGUvZysrLmRnL3ByOTQ5MjAtMS5DCiBjcmVhdGUgbW9kZSAxMDA2NDQg Z2NjL3Rlc3RzdWl0ZS9nKysuZGcvcHI5NDkyMC5DCiBjcmVhdGUgbW9kZSAxMDA2NDQgZ2NjL3Rl c3RzdWl0ZS9nY2MuZGcvcHI5NDkyMC0yLmMKCmRpZmYgLS1naXQgYS9nY2MvbWF0Y2gucGQgYi9n Y2MvbWF0Y2gucGQKaW5kZXggNDVhZWZkOTY2ODguLjcxNGM4MTMzY2NmIDEwMDY0NAotLS0gYS9n Y2MvbWF0Y2gucGQKKysrIGIvZ2NjL21hdGNoLnBkCkBAIC0zMzksNiArMzM5LDExIEBAIERFRklO RV9JTlRfQU5EX0ZMT0FUX1JPVU5EX0ZOIChSSU5UKQogIChpZiAoUkVBTF9WQUxVRV9ORUdBVElW RSAoVFJFRV9SRUFMX0NTVCAoQDApKSkKICAgKENPUFlTSUdOX0FMTCAobmVnYXRlIEAwKSBAMSkp KQogCisvKiAoeCA+PSAwID8geCA6IDApICsgKHggPD0gMCA/IC14IDogMCkgLT4gYWJzIHguICAq LworKHNpbXBsaWZ5CisgIChwbHVzOmMgKG1heCBAMCBpbnRlZ2VyX3plcm9wKSAobWF4IChuZWdh dGUgQDApIGludGVnZXJfemVyb3ApKQorICAoYWJzIEAwKSkKKwogLyogWCAqIDEsIFggLyAxIC0+ IFguICAqLwogKGZvciBvcCAobXVsdCB0cnVuY19kaXYgY2VpbF9kaXYgZmxvb3JfZGl2IHJvdW5k X2RpdiBleGFjdF9kaXYpCiAgIChzaW1wbGlmeQpAQCAtMzMxNiw2ICszMzIxLDExIEBAIERFRklO RV9JTlRfQU5EX0ZMT0FUX1JPVU5EX0ZOIChSSU5UKQogICAgICAgJiYgKEdJTVBMRSB8fCAhVFJF RV9TSURFX0VGRkVDVFMgKEAxKSkpCiAgIChjb25kIChjb252ZXJ0OmJvb2xlYW5fdHlwZV9ub2Rl IEAyKSBAMSBAMCkpKQogCisvKiAoeCA8PSAwID8gLXggOiAwKSAtPiBtYXgoLXgsIDApLiAgKi8K KyhzaW1wbGlmeQorICAoY29uZCAobGUgQDAgaW50ZWdlcl96ZXJvcEAxKSAobmVnYXRlQDIgQDAp IGludGVnZXJfemVyb3BAMSkKKyAgKG1heCBAMiBAMSkpCisKIC8qIFNpbXBsaWZpY2F0aW9ucyBv ZiBzaGlmdCBhbmQgcm90YXRlcy4gICovCiAKIChmb3Igcm90YXRlIChscm90YXRlIHJyb3RhdGUp CmRpZmYgLS1naXQgYS9nY2MvdGVzdHN1aXRlL2crKy5kZy9wcjk0OTIwLTEuQyBiL2djYy90ZXN0 c3VpdGUvZysrLmRnL3ByOTQ5MjAtMS5DCm5ldyBmaWxlIG1vZGUgMTAwNjQ0CmluZGV4IDAwMDAw MDAwMDAwLi42YzY0ODNlYWIyZAotLS0gL2Rldi9udWxsCisrKyBiL2djYy90ZXN0c3VpdGUvZysr LmRnL3ByOTQ5MjAtMS5DCkBAIC0wLDAgKzEsMTcgQEAKKy8qIFBSIHRyZWUtb3B0aW1pemF0aW9u Lzk0OTIwICovCisvKiB7IGRnLWRvIHJ1biB9ICovCisKKyNpbmNsdWRlICJwcjk0OTIwLkMiCisK K2ludCBtYWluKCkgeworCisgICAgaWYgKGZvbygwKSAhPSAwCisgICAgICAgIHx8IGZvbygtNDIp ICE9IDQyCisgICAgICAgIHx8IGZvbyg0MikgIT0gNDIKKyAgICAgICAgfHwgYmF6KC0xMCkgIT0g MTAKKyAgICAgICAgfHwgYmF6KC0xMCkgIT0gMTApIHsKKyAgICAgICAgICAgIF9fYnVpbHRpbl9h Ym9ydCgpOworICAgICAgICB9CisgICAgCisgICAgcmV0dXJuIDA7Cit9CmRpZmYgLS1naXQgYS9n Y2MvdGVzdHN1aXRlL2crKy5kZy9wcjk0OTIwLkMgYi9nY2MvdGVzdHN1aXRlL2crKy5kZy9wcjk0 OTIwLkMKbmV3IGZpbGUgbW9kZSAxMDA2NDQKaW5kZXggMDAwMDAwMDAwMDAuLjkyNWVjNGY0MmYx Ci0tLSAvZGV2L251bGwKKysrIGIvZ2NjL3Rlc3RzdWl0ZS9nKysuZGcvcHI5NDkyMC5DCkBAIC0w LDAgKzEsNjMgQEAKKy8qIFBSIHRyZWUtb3B0aW1pemF0aW9uLzk0OTIwICovCisvKiB7IGRnLWRv IGNvbXBpbGUgfSAqLworLyogeyBkZy1vcHRpb25zICItTzIgLWZkdW1wLXRyZWUtb3B0aW1pemVk IiB9ICovCisKK3R5cGVkZWYgaW50IF9fYXR0cmlidXRlX18oKHZlY3Rvcl9zaXplKDQqc2l6ZW9m KGludCkpKSkgdmludDsKKworLyogU2FtZSBmb3JtIGFzIFBSLiAgKi8KK19fYXR0cmlidXRlX18o KG5vaXBhKSkgdW5zaWduZWQgaW50IGZvbyhpbnQgeCkgeworICAgIHJldHVybiAoeCA+PSAwID8g eCA6IDApICsgKHggPD0gMCA/IC14IDogMCk7Cit9CisKKy8qIFRlc3QgZm9yIGZvcndhcmQgcHJv cG9nYXRpb24uICAqLworX19hdHRyaWJ1dGVfXygobm9pcGEpKSB1bnNpZ25lZCBpbnQgY29yZ2Uo aW50IHgpIHsKKyAgICBpbnQgdyA9ICh4ID49IDAgPyB4IDogMCk7CisgICAgaW50IHkgPSAteDsK KyAgICBpbnQgeiA9ICh5ID49IDAgPyB5IDogMCk7CisgICAgcmV0dXJuIHcgKyB6OworfQorCisv KiBWZWN0b3IgY2FzZS4gICovCitfX2F0dHJpYnV0ZV9fKChub2lwYSkpIHZpbnQgdGh1ZCh2aW50 IHgpIHsKKyAgICB2aW50IHQgPSAoeCA+PSAwID8geCA6IDApIDsKKyAgICB2aW50IHh4ID0gLXg7 CisgICAgdmludCB0MSA9ICAoeHggPj0gMCA/IHh4IDogMCk7CisgICAgcmV0dXJuIHQgKyB0MTsK K30KKworLyogU2lnbmVkIGZ1bmN0aW9uLiAgKi8KK19fYXR0cmlidXRlX18oKG5vaXBhKSkgaW50 IGJhcihpbnQgeCkgeworICAgIHJldHVybiAoeCA+PSAwID8geCA6IDApICsgKHggPD0gMCA/IC14 IDogMCk7Cit9CisKKy8qIENvbW11dGF0aXZlIHByb3BlcnR5LiAgKi8KK19fYXR0cmlidXRlX18o KG5vaXBhKSkgdW5zaWduZWQgaW50IGJheihpbnQgeCkgeworICAgIHJldHVybiAoeCA8PSAwID8g LXggOiAwKSArICh4ID49IDAgPyB4IDogMCk7Cit9CisKKy8qIEZsaXBwZWQgb3JkZXIgZm9yIG1h eCBleHByZXNzaW9ucy4gICovCitfX2F0dHJpYnV0ZV9fKChub2lwYSkpIHVuc2lnbmVkIGludCBx dXV4KGludCB4KSB7CisgICAgcmV0dXJuICgwIDw9IHggPyB4IDogMCkgKyAoMCA+PSB4ID8gLXgg OiAwKTsKK30KKworLyogTm90IHplcm8gc28gc2hvdWxkIG5vdCBvcHRpbWl6ZS4gICovCitfX2F0 dHJpYnV0ZV9fKChub2lwYSkpIHVuc2lnbmVkIGludCB3YWxkbyhpbnQgeCkgeworICAgIHJldHVy biAoeCA+PSA0ID8geCA6IDQpICsgKHggPD0gNCA/IC14IDogNCk7Cit9CisKKy8qIE5vdCB6ZXJv IHNvIHNob3VsZCBub3Qgb3B0aW1pemUuICAqLworX19hdHRyaWJ1dGVfXygobm9pcGEpKSB1bnNp Z25lZCBpbnQgZnJlZChpbnQgeCkgeworICAgIHJldHVybiAoeCA+PSAtNCA/IHggOiAtNCkgKyAo eCA8PSAtNCA/IC14IDogLTQpOworfQorCisvKiBJbmNvcnJlY3QgcGF0dGVybi4gICovCitfX2F0 dHJpYnV0ZV9fKChub2lwYSkpIHVuc2lnbmVkIGludCBnb28oaW50IHgpIHsKKyAgICByZXR1cm4g KHggPD0gMCA/IHggOiAwKSArICh4ID49IDAgPyAteCA6IDApOworfQorCisvKiBJbmNvcnJlY3Qg cGF0dGVybi4gICovCitfX2F0dHJpYnV0ZV9fKChub2lwYSkpIGludCBxdXgoaW50IHgpIHsKKyAg ICByZXR1cm4gKHggPj0gMCA/IHggOiAwKSArICh4ID49IDAgPyB4IDogMCk7Cit9CisKKy8qIHsg ZGctZmluYWwge3NjYW4tdHJlZS1kdW1wLXRpbWVzICIgQUJTX0VYUFIgIiA2ICJvcHRpbWl6ZWQi IH0gfSAqLwpkaWZmIC0tZ2l0IGEvZ2NjL3Rlc3RzdWl0ZS9nY2MuZGcvcHI5NDkyMC0yLmMgYi9n Y2MvdGVzdHN1aXRlL2djYy5kZy9wcjk0OTIwLTIuYwpuZXcgZmlsZSBtb2RlIDEwMDY0NAppbmRl eCAwMDAwMDAwMDAwMC4uYTJkMjMzMjRjZmEKLS0tIC9kZXYvbnVsbAorKysgYi9nY2MvdGVzdHN1 aXRlL2djYy5kZy9wcjk0OTIwLTIuYwpAQCAtMCwwICsxLDE1IEBACisvKiBQUiB0cmVlLW9wdGlt aXphdGlvbi85NDkyMCAqLworLyogeyBkZy1kbyBjb21waWxlIH0gKi8KKy8qIHsgZGctb3B0aW9u cyAiLU8yIC1mZHVtcC10cmVlLW9wdGltaXplZCIgfSAqLworCisvKiBGb3JtIGZyb20gUFIuICAq LworX19hdHRyaWJ1dGVfXygobm9pcGEpKSB1bnNpZ25lZCBpbnQgZm9vKGludCB4KSB7CisgICAg cmV0dXJuIHggPD0gMCA/IC14IDogMDsKK30KKworLyogQ2hhbmdlZCBvcmRlci4gICovCitfX2F0 dHJpYnV0ZV9fKChub2lwYSkpIHVuc2lnbmVkIGludCBiYXIoaW50IHgpIHsKKyAgICByZXR1cm4g MCA+PSB4ID8gLXggOiAwOworfQorCisvKiB7IGRnLWZpbmFsIHtzY2FuLXRyZWUtZHVtcC10aW1l cyAiIE1BWF9FWFBSICIgMiAib3B0aW1pemVkIiB9IH0gKi8KCmJhc2UtY29tbWl0OiA2YWY1MzBm OTE0ODAxZjVlNTYxMDU3ZGE1NWM0MTQ4MGYyODc1MWY3Ci0tIAoyLjMxLjEKCg== --00000000000026f2a105e428be31--