From patchwork Mon Jul 25 16:46:41 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Prathamesh Kulkarni X-Patchwork-Id: 72745 Delivered-To: patch@linaro.org Received: by 10.140.29.52 with SMTP id a49csp1242395qga; Mon, 25 Jul 2016 09:47:08 -0700 (PDT) X-Received: by 10.66.89.104 with SMTP id bn8mr30878727pab.33.1469465228059; Mon, 25 Jul 2016 09:47:08 -0700 (PDT) Return-Path: Received: from sourceware.org (server1.sourceware.org. [209.132.180.131]) by mx.google.com with ESMTPS id x70si34436494pff.4.2016.07.25.09.47.07 for (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Mon, 25 Jul 2016 09:47:08 -0700 (PDT) Received-SPF: pass (google.com: domain of gcc-patches-return-432469-patch=linaro.org@gcc.gnu.org designates 209.132.180.131 as permitted sender) client-ip=209.132.180.131; Authentication-Results: mx.google.com; dkim=pass header.i=@gcc.gnu.org; spf=pass (google.com: domain of gcc-patches-return-432469-patch=linaro.org@gcc.gnu.org designates 209.132.180.131 as permitted sender) smtp.mailfrom=gcc-patches-return-432469-patch=linaro.org@gcc.gnu.org; dmarc=fail (p=NONE dis=NONE) header.from=linaro.org DomainKey-Signature: a=rsa-sha1; c=nofws; d=gcc.gnu.org; h=list-id :list-unsubscribe:list-archive:list-post:list-help:sender :mime-version:in-reply-to:references:from:date:message-id :subject:to:cc:content-type; q=dns; s=default; b=mGSaePNt5Yy4TAt lBJ50C3oHf/9gXxR6fK3KjmPMQXQZvI0PCNYSyTVQLTfRPIqbD0aKNVVj2k0l8I/ WZVmm98CXXTA+2dUBSUr45MyobTdy+Kfsl8mjsIeP0vp8yoRdit8weyYmaHYmUx7 +fxHTSMgvLWGzq3J6T4DldF+gQ/w= DKIM-Signature: v=1; a=rsa-sha1; c=relaxed; d=gcc.gnu.org; h=list-id :list-unsubscribe:list-archive:list-post:list-help:sender :mime-version:in-reply-to:references:from:date:message-id :subject:to:cc:content-type; s=default; bh=bqPFRqIi/xYYj7LKNNMn2 57qMls=; b=oO1TQgku8Vhm5pxbRxwmrdJyUg+JWLIqEKuw+dSO0vky4QGcapbpK xQCOarp78Uwe48gDzeoCFhOJdYXNc8cgzsy44mXSSn4sOMzeJtkM1sMHmDc9BQo8 jMGfWtfIzpj+KVAa28jMe3Ng/UBWVu5uX0g6XIEs0KJpOOg2s5O2Hw= Received: (qmail 34011 invoked by alias); 25 Jul 2016 16:46:55 -0000 Mailing-List: contact gcc-patches-help@gcc.gnu.org; run by ezmlm Precedence: bulk List-Id: List-Unsubscribe: List-Archive: List-Post: List-Help: Sender: gcc-patches-owner@gcc.gnu.org Delivered-To: mailing list gcc-patches@gcc.gnu.org Received: (qmail 33996 invoked by uid 89); 25 Jul 2016 16:46:54 -0000 Authentication-Results: sourceware.org; auth=none X-Virus-Found: No X-Spam-SWARE-Status: No, score=-2.5 required=5.0 tests=AWL, BAYES_00, RCVD_IN_DNSWL_LOW, SPF_PASS autolearn=ham version=3.3.2 spammy=nonequality, non-equality X-HELO: mail-io0-f173.google.com Received: from mail-io0-f173.google.com (HELO mail-io0-f173.google.com) (209.85.223.173) by sourceware.org (qpsmtpd/0.93/v0.84-503-g423c35a) with (AES128-GCM-SHA256 encrypted) ESMTPS; Mon, 25 Jul 2016 16:46:44 +0000 Received: by mail-io0-f173.google.com with SMTP id 38so166727760iol.0 for ; Mon, 25 Jul 2016 09:46:43 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20130820; h=x-gm-message-state:mime-version:in-reply-to:references:from:date :message-id:subject:to:cc; bh=GU7lrg0SegKBNo7DYhYHEXlTPGX4+FpfkqVKYZ0t5Mk=; b=l40Nb4xDzF3UJP46ZPmP5eBpFuHafoJP6SqGkP06J3MDpRBbssZhy+9GcArYHLXX7w HOXTFS1zZb8CDbT/wqfe6+5Q20UDux6rDJeF3tKJdJ52L4+yOPv9Dq/bYQU4D80hEkeL vzKHyp7jpwrOr9oPKhBHMxjWZIx+pHXKa0bCO1A4S4XHs/XdQLAbw1WcLpoMjQxfrmDO TztCoTHy0ZNpC8ZWpl3wy3hXTSQLwN+EIn94KpICVO1MA5fjUgtHMRBs7MoTYoT4RvMK narZ2kF/j1R4mIhAoSHVbUDLvvo15zigM4ABU8n6agD740I2RwhjVRI1GoZdodILbyFL AVqA== X-Gm-Message-State: AEkoout/U1ch7WkjyAhhG7yp39nfedqhxdhKa3pexxOFPRkpBnToAMFOTNHsF4eXYHU2HyAhaIJyTzyE5rKyckb0 X-Received: by 10.107.14.2 with SMTP id 2mr20127874ioo.181.1469465201793; Mon, 25 Jul 2016 09:46:41 -0700 (PDT) MIME-Version: 1.0 Received: by 10.36.48.197 with HTTP; Mon, 25 Jul 2016 09:46:41 -0700 (PDT) In-Reply-To: References: From: Prathamesh Kulkarni Date: Mon, 25 Jul 2016 22:16:41 +0530 Message-ID: Subject: Re: [PR70920] transform (intptr_t) x eq/ne CST to x eq/ne (typeof x) cst To: Richard Biener Cc: gcc Patches X-IsSubscribed: yes On 25 July 2016 at 14:32, Richard Biener wrote: > On Mon, 25 Jul 2016, Prathamesh Kulkarni wrote: > >> Hi Richard, >> The attached patch tries to fix PR70920. >> It adds your pattern from comment 1 in the PR >> (with additional gating on INTEGRAL_TYPE_P to avoid regressing finalize_18.f90) >> and second pattern, which is reverse of the first transform. >> I needed to update ssa-dom-branch-1.c because with patch applied, >> jump threading removed the second if (i != 0B) block. >> The dumps with and without patch for ssa-dom-branch-1.c start >> to differ with forwprop1: >> >> before: >> : >> _1 = temp_16(D)->code; >> _2 = _1 == 42; >> _3 = (int) _2; >> _4 = (long int) _3; >> temp_17 = (struct rtx_def *) _4; >> if (temp_17 != 0B) >> goto ; >> else >> goto ; >> >> after: >> : >> _1 = temp_16(D)->code; >> _2 = _1 == 42; >> _3 = (int) _2; >> _4 = (long int) _2; >> temp_17 = (struct rtx_def *) _4; >> if (_1 == 42) >> goto ; >> else >> goto ; >> >> I suppose the transform is correct for above test-case ? >> >> Then vrp dump shows: >> Threaded jump 5 --> 9 to 13 >> Threaded jump 8 --> 9 to 13 >> Threaded jump 3 --> 9 to 13 >> Threaded jump 12 --> 9 to 14 >> Removing basic block 9 >> basic block 9, loop depth 0 >> pred: >> if (i1_10(D) != 0B) >> goto ; >> else >> goto ; >> succ: 10 >> 11 >> >> So there remained two instances of if (i1_10 (D) != 0B) in dom2 dump file, >> and hence needed to update the test-case. >> >> Bootstrapped and tested on x86_64-unknown-linux-gnu. >> OK to commit ? > > --- a/gcc/match.pd > +++ b/gcc/match.pd > @@ -3408,3 +3408,23 @@ DEFINE_INT_AND_FLOAT_ROUND_FN (RINT) > { CONSTRUCTOR_ELT (ctor, idx / k)->value; }) > (BIT_FIELD_REF { CONSTRUCTOR_ELT (ctor, idx / k)->value; } > @1 { bitsize_int ((idx % k) * width); }))))))))) > + > +/* PR70920: Transform (intptr_t)x eq/ne CST to x eq/ne (typeof x) CST. > */ > + > +(for cmp (ne eq) > + (simplify > + (cmp (convert@2 @0) INTEGER_CST@1) > + (if (POINTER_TYPE_P (TREE_TYPE (@0)) > + && INTEGRAL_TYPE_P (TREE_TYPE (@2))) > > you can use @1 here and omit @2. > > + (cmp @0 (convert @1))))) > + > +/* Reverse of the above case: > + x has integral_type, CST is a pointer constant. > + Transform (typeof CST)x eq/ne CST to x eq/ne (typeof x) CST. */ > + > +(for cmp (ne eq) > + (simplify > + (cmp (convert @0) @1) > + (if (POINTER_TYPE_P (TREE_TYPE (@1)) > + && INTEGRAL_TYPE_P (TREE_TYPE (@0))) > + (cmp @0 (convert @1))))) > > The second pattern lacks the INTEGER_CST on @1 so it doesn't match > its comment. Please do not add vertical space between pattern > comment and pattern. > > Please place patterns not at the end of match.pd but where similar > transforms are done. Like after > > /* Simplify pointer equality compares using PTA. */ > (for neeq (ne eq) > (simplify > (neeq @0 @1) > (if (POINTER_TYPE_P (TREE_TYPE (@0)) > && ptrs_compare_unequal (@0, @1)) > { neeq == EQ_EXPR ? boolean_false_node : boolean_true_node; }))) > > please also share the (for ...) for both patterns or merge them > by changing the condition to > > (if ((POINTER_TYPE_P (TREE_TYPE (@0)) > && INTEGRAL_TYPE_P (TREE_TYPE (@1))) > || (INTEGRAL_TYPE_P (TREE_TYPE (@0)) > && POINTER_TYPE_P (TREE_TYPE (@1)))) > Hi, Done suggested changes in this version. pr70920-4.c (test-case in patch) is now folded during ccp instead of forwprop after merging the two patterns. Passes bootstrap+test on x86_64-unknown-linux-gnu. OK for trunk ? Thanks, Prathamesh > Richard. > >> PS: Writing changelog entries for match.pd is a bit tedious. >> Should we add optional names for pattern so we can refer to them by names >> in the ChangeLog for the more complicated ones ? >> Or maybe just use comments: >> (simplify /* name */ ... ) -;) > > That will add the fun of inventing names ;) > >> Thanks, >> Prathamesh >> > > -- > Richard Biener > SUSE LINUX GmbH, GF: Felix Imendoerffer, Jane Smithard, Graham Norton, HRB 21284 (AG Nuernberg) diff --git a/gcc/match.pd b/gcc/match.pd index 21bf617..6c2ec82 100644 --- a/gcc/match.pd +++ b/gcc/match.pd @@ -2513,6 +2513,15 @@ DEFINE_INT_AND_FLOAT_ROUND_FN (RINT) && ptrs_compare_unequal (@0, @1)) { neeq == EQ_EXPR ? boolean_false_node : boolean_true_node; }))) +/* PR70920: Transform (intptr_t)x eq/ne CST to x eq/ne (typeof x) CST. + and (typeof ptr_cst) x eq/ne ptr_cst to x eq/ne (typeof x) CST */ +(for cmp (ne eq) + (simplify + (cmp (convert @0) INTEGER_CST@1) + (if ((POINTER_TYPE_P (TREE_TYPE (@0)) && INTEGRAL_TYPE_P (TREE_TYPE (@1))) + || (INTEGRAL_TYPE_P (TREE_TYPE (@0)) && POINTER_TYPE_P (TREE_TYPE (@1)))) + (cmp @0 (convert @1))))) + /* Non-equality compare simplifications from fold_binary */ (for cmp (lt gt le ge) /* Comparisons with the highest or lowest possible integer of diff --git a/gcc/testsuite/gcc.dg/pr70920-1.c b/gcc/testsuite/gcc.dg/pr70920-1.c new file mode 100644 index 0000000..9b7e2d0 --- /dev/null +++ b/gcc/testsuite/gcc.dg/pr70920-1.c @@ -0,0 +1,20 @@ +/* { dg-do compile } */ +/* { dg-options "-fdump-tree-gimple" } */ + +#include + +void f1(); +void f2(); + +void +foo (int *a) +{ + if ((intptr_t) a == 0) + { + f1 (); + if (a) + f2 (); + } +} + +/* { dg-final { scan-tree-dump "if \\(a == 0B\\)" "gimple" } } */ diff --git a/gcc/testsuite/gcc.dg/pr70920-2.c b/gcc/testsuite/gcc.dg/pr70920-2.c new file mode 100644 index 0000000..2db9897 --- /dev/null +++ b/gcc/testsuite/gcc.dg/pr70920-2.c @@ -0,0 +1,21 @@ +/* { dg-do compile } */ +/* { dg-options "-O2 -fdump-tree-forwprop-details" } */ + +#include + +void f1(); +void f2(); + +void +foo (int *a) +{ + int cst = 0; + if ((intptr_t) a == cst) + { + f1 (); + if (a) + f2 (); + } +} + +/* { dg-final { scan-tree-dump "gimple_simplified to if \\(a_\[0-9\]*\\(D\\) == 0B\\)" "forwprop1" } } */ diff --git a/gcc/testsuite/gcc.dg/pr70920-3.c b/gcc/testsuite/gcc.dg/pr70920-3.c new file mode 100644 index 0000000..8b24cbc --- /dev/null +++ b/gcc/testsuite/gcc.dg/pr70920-3.c @@ -0,0 +1,20 @@ +/* { dg-do compile } */ +/* { dg-options "-fdump-tree-gimple -Wno-int-to-pointer-cast" } */ + +#include + +void f1(); +void f2(); + +void +foo (int a) +{ + if ((int *) a == 0) + { + f1 (); + if (a) + f2 (); + } +} + +/* { dg-final { scan-tree-dump "if \\(a == 0\\)" "gimple" } } */ diff --git a/gcc/testsuite/gcc.dg/pr70920-4.c b/gcc/testsuite/gcc.dg/pr70920-4.c new file mode 100644 index 0000000..dedb895 --- /dev/null +++ b/gcc/testsuite/gcc.dg/pr70920-4.c @@ -0,0 +1,21 @@ +/* { dg-do compile } */ +/* { dg-options "-O2 -fdump-tree-ccp-details -Wno-int-to-pointer-cast" } */ + +#include + +void f1(); +void f2(); + +void +foo (int a) +{ + void *cst = 0; + if ((int *) a == cst) + { + f1 (); + if (a) + f2 (); + } +} + +/* { dg-final { scan-tree-dump "gimple_simplified to if \\(_\[0-9\]* == 0\\)" "ccp1" } } */ diff --git a/gcc/testsuite/gcc.dg/tree-ssa/ssa-dom-branch-1.c b/gcc/testsuite/gcc.dg/tree-ssa/ssa-dom-branch-1.c index 18f9041..d38e3a8 100644 --- a/gcc/testsuite/gcc.dg/tree-ssa/ssa-dom-branch-1.c +++ b/gcc/testsuite/gcc.dg/tree-ssa/ssa-dom-branch-1.c @@ -21,7 +21,7 @@ try_combine (rtx i1, rtx newpat) /* There should be three tests against i1. Two from the hash table dumps, one in the code itself. */ -/* { dg-final { scan-tree-dump-times "if .i1_" 3 "dom2"} } */ +/* { dg-final { scan-tree-dump-times "if .i1_" 2 "dom2"} } */ /* There should be no actual jump threads realized by DOM. The legitimize jump threads are handled in VRP and those discovered