From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from smtp-out2.suse.de (smtp-out2.suse.de [195.135.220.29]) by sourceware.org (Postfix) with ESMTPS id 9132D3858D28 for ; Mon, 31 Jan 2022 08:30:25 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.1 sourceware.org 9132D3858D28 Received: from relay2.suse.de (relay2.suse.de [149.44.160.134]) by smtp-out2.suse.de (Postfix) with ESMTP id 65B981F37B; Mon, 31 Jan 2022 08:30:24 +0000 (UTC) Received: from murzim.suse.de (murzim.suse.de [10.160.4.192]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by relay2.suse.de (Postfix) with ESMTPS id 58FCDA3B83; Mon, 31 Jan 2022 08:30:24 +0000 (UTC) Date: Mon, 31 Jan 2022 09:30:24 +0100 (CET) From: Richard Biener To: Jakub Jelinek cc: Jeff Law , Navid Rahimi , "gcc-patches@gcc.gnu.org" Subject: Re: [PATCH] testsuite: Fix up tree-ssa/pr103514.c testcase [PR103514] In-Reply-To: <20220129164609.GX2646553@tucnak> Message-ID: References: <20220129164609.GX2646553@tucnak> MIME-Version: 1.0 Content-Type: text/plain; charset=US-ASCII X-Spam-Status: No, score=-5.3 required=5.0 tests=BAYES_00, DKIM_SIGNED, DKIM_VALID, DKIM_VALID_AU, DKIM_VALID_EF, KAM_SHORT, RCVD_IN_DNSWL_LOW, SPF_HELO_NONE, SPF_PASS, TXREP, T_SCC_BODY_TEXT_LINE autolearn=ham autolearn_force=no version=3.4.4 X-Spam-Checker-Version: SpamAssassin 3.4.4 (2020-01-24) 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: Mon, 31 Jan 2022 08:30:27 -0000 On Sat, 29 Jan 2022, Jakub Jelinek wrote: > On Fri, Jan 28, 2022 at 03:14:16PM -0700, Jeff Law via Gcc-patches wrote: > > > This patch will add the missed pattern described in bug 103514 [1] to the match.pd. [1] includes proof of correctness for the patch too. > > > > > > PR tree-optimization/103514 > > > * match.pd (a & b) ^ (a == b) -> !(a | b): New optimization. > > > * match.pd (a & b) == (a ^ b) -> !(a | b): New optimization. > > > * gcc.dg/tree-ssa/pr103514.c: Testcase for this optimization. > > > > > > 1) https://gcc.gnu.org/bugzilla/show_bug.cgi?id=103514 > > Note the bug was filed an fixed during stage3, review just didn't happen in > > a reasonable timeframe. > > > > I'm going to ACK this for the trunk and go ahead and commit it for you. > > The testcase FAILs on short-circuit targets like powerpc64le-linux. > While the first 2 functions are identical, the last two look like: > : > if (a_5(D) != 0) > goto ; [INV] > else > goto ; [INV] > > : > if (b_6(D) != 0) > goto ; [INV] > else > goto ; [INV] > > : > > : > # iftmp.1_4 = PHI <1(3), 0(4)> > _1 = a_5(D) == b_6(D); > _2 = (int) _1; > _3 = _2 ^ iftmp.1_4; > _9 = _2 != iftmp.1_4; > return _9; > instead of the expected: > : > _3 = a_8(D) & b_9(D); > _4 = (int) _3; > _5 = a_8(D) == b_9(D); > _6 = (int) _5; > _1 = a_8(D) | b_9(D); > _2 = ~_1; > _7 = (int) _2; > _10 = ~_1; > return _10; > so no wonder it doesn't match. E.g. x86_64-linux will also use jumps > if it isn't just a && b but a && b && c && d (will do > a & b and c & d tests and jump based on those. > > As it is too late to implement this optimization even for the short > circuiting targets this late (not even sure which pass would be best), > this patch just forces non-short-circuiting for the test. > > Tested on x86_64-linux -m32/-m64 and powerpc64le-linux, ok for trunk? OK. > 2022-01-29 Jakub Jelinek > > PR tree-optimization/103514 > * gcc.dg/tree-ssa/pr103514.c: Add > --param logical-op-non-short-circuit=1 to dg-options. > > --- gcc/testsuite/gcc.dg/tree-ssa/pr103514.c.jj 2022-01-29 11:11:39.338627697 +0100 > +++ gcc/testsuite/gcc.dg/tree-ssa/pr103514.c 2022-01-29 17:37:18.255237211 +0100 > @@ -1,5 +1,5 @@ > /* { dg-do compile } */ > -/* { dg-options "-O -fdump-tree-optimized" } */ > +/* { dg-options "-O --param logical-op-non-short-circuit=1 -fdump-tree-optimized" } */ > #include > > bool > @@ -30,4 +30,4 @@ h (bool a, bool b) > /* Make sure we have removed "==" and "^" and "&". */ > /* { dg-final { scan-tree-dump-not "&" "optimized"} } */ > /* { dg-final { scan-tree-dump-not "\\^" "optimized"} } */ > -/* { dg-final { scan-tree-dump-not "==" "optimized"} } */ > \ No newline at end of file > +/* { dg-final { scan-tree-dump-not "==" "optimized"} } */ > > > Jakub > > -- Richard Biener SUSE Software Solutions Germany GmbH, Maxfeldstrasse 5, 90409 Nuernberg, Germany; GF: Ivo Totev; HRB 36809 (AG Nuernberg)