From patchwork Fri Apr 21 08:16:31 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Richard Biener X-Patchwork-Id: 753190 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from sourceware.org (server1.sourceware.org [209.132.180.131]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 3w8T994vGlz9s65 for ; Fri, 21 Apr 2017 18:16:45 +1000 (AEST) Authentication-Results: ozlabs.org; dkim=pass (1024-bit key; unprotected) header.d=gcc.gnu.org header.i=@gcc.gnu.org header.b="Fy4d6NDJ"; dkim-atps=neutral DomainKey-Signature: a=rsa-sha1; c=nofws; d=gcc.gnu.org; h=list-id :list-unsubscribe:list-archive:list-post:list-help:sender:date :from:to:subject:message-id:mime-version:content-type; q=dns; s= default; b=VzBk4mDTjtc+J+JF9mFv/k3NZ3/vf/UK60883aDrX7qnZ8b/7Ae2k z+BmFc1IdVSeDgwvgIVovRhEKh9JJFN58YAN9F+yS7O6J5Kwav6i/GQersGZr/NP +/pKOmb4x9DUfu+6nwUFmCPbyeEMbRwIp6R18KaeQENzaU5suLSuM0= 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:date :from:to:subject:message-id:mime-version:content-type; s= default; bh=QCOIQ6qu2fn6TT7Q8anMkbe7C+0=; b=Fy4d6NDJWJOEtG7wY1T8 VYg5Vdv2HsxPcqtZ+KxxBdTubdiCIsRzFrN8ZkLGZ81X/1VjiQ1alsDqJiparm5C 4+N3jp2S57bgRhOEP7D+xp2M3OUB2gB3YDZ76g1n1qhj+Zkcd5CBpPM4fI2KMXm9 ijPm9PQnO+axhSxK2tYuTGI= Received: (qmail 63307 invoked by alias); 21 Apr 2017 08:16:34 -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 63284 invoked by uid 89); 21 Apr 2017 08:16:33 -0000 Authentication-Results: sourceware.org; auth=none X-Virus-Found: No X-Spam-SWARE-Status: No, score=-11.1 required=5.0 tests=BAYES_00, GIT_PATCH_2, GIT_PATCH_3, KAM_ASCII_DIVIDERS, RP_MATCHES_RCVD, SPF_PASS autolearn=ham version=3.3.2 spammy=leader, Hx-languages-length:3794 X-HELO: mx1.suse.de Received: from mx2.suse.de (HELO mx1.suse.de) (195.135.220.15) by sourceware.org (qpsmtpd/0.93/v0.84-503-g423c35a) with ESMTP; Fri, 21 Apr 2017 08:16:32 +0000 Received: from relay1.suse.de (charybdis-ext.suse.de [195.135.220.254]) by mx1.suse.de (Postfix) with ESMTP id 97F2DAC39 for ; Fri, 21 Apr 2017 08:16:31 +0000 (UTC) Date: Fri, 21 Apr 2017 10:16:31 +0200 (CEST) From: Richard Biener To: gcc-patches@gcc.gnu.org Subject: [PATCH] Fix PR80237 Message-ID: User-Agent: Alpine 2.20 (LSU 67 2015-01-07) MIME-Version: 1.0 This fixes a missed PRE which causes a missed tailcall. Bootstrapped and tested on x86_64-unknown-linux-gnu, applied to trunk. Richard. 2017-04-21 Richard Biener PR tree-optimization/80237 * tree-ssa-pre.c (find_leader_in_sets): Add third set argument, defaulted to NULL. (phi_translate_1): Also allow a leader in AVAIL_OUT of pred for a simplified result. * gcc.dg/tree-ssa/tailcall-9.c: New testcase. * gcc.dg/tree-ssa/ldist-pr45948.c: Remove undefined behavior, adjust expected optimizations. Index: gcc/testsuite/gcc.dg/tree-ssa/tailcall-9.c =================================================================== --- gcc/testsuite/gcc.dg/tree-ssa/tailcall-9.c (nonexistent) +++ gcc/testsuite/gcc.dg/tree-ssa/tailcall-9.c (working copy) @@ -0,0 +1,20 @@ +/* { dg-do compile } */ +/* { dg-options "-O2 -fdump-tree-tailc-details" } */ + +__attribute__((noinline)) +static float f(float x) +{ + return x*x; +} + +static double g(float x) +{ + return x>0 ? f(x) : x+1.0; +} + +float foo(float x) +{ + return g(x); +} + +/* { dg-final { scan-tree-dump "Found tail call" "tailc" } } */ Index: gcc/testsuite/gcc.dg/tree-ssa/ldist-pr45948.c =================================================================== --- gcc/testsuite/gcc.dg/tree-ssa/ldist-pr45948.c (revision 246533) +++ gcc/testsuite/gcc.dg/tree-ssa/ldist-pr45948.c (working copy) @@ -1,14 +1,16 @@ /* { dg-do compile } */ -/* { dg-options "-O2 -ftree-loop-distribution -ftree-loop-distribute-patterns -fdump-tree-ldist-details" } */ +/* { dg-options "-O2 -ftree-loop-distribution -ftree-loop-distribute-patterns -fdump-tree-ldist-details -fdump-tree-optimized" } */ extern void bar(int); void -foo (int i, int n) +foo (unsigned i, unsigned n) { int a[30]; int b[30]; - for (; i < n; i++) + if (n == 0) + return; + for (i=0; i < n; i++) a[i] = b[i] = 0; while (1) @@ -16,7 +18,9 @@ foo (int i, int n) bar (a[i - 1]); } -/* We should apply loop distribution and generate 2 memset (0). */ +/* We should apply loop distribution and generate 1 memset (0). PRE optimizes + away a[] completely. */ -/* { dg-final { scan-tree-dump "distributed: split to 0 loops and 2 library calls" "ldist" } } */ -/* { dg-final { scan-tree-dump-times "generated memset zero" 2 "ldist" } } */ +/* { dg-final { scan-tree-dump "distributed: split to 0 loops and 1 library calls" "ldist" } } */ +/* { dg-final { scan-tree-dump-times "generated memset zero" 1 "ldist" } } */ +/* { dg-final { scan-tree-dump-times "int a" 0 "optimized" } } */ Index: gcc/tree-ssa-pre.c =================================================================== --- gcc/tree-ssa-pre.c (revision 247024) +++ gcc/tree-ssa-pre.c (working copy) @@ -1313,17 +1313,20 @@ translate_vuse_through_block (vec