From patchwork Sat Jan 23 09:34:46 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Tom de Vries X-Patchwork-Id: 572073 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 E85B9140A98 for ; Sat, 23 Jan 2016 20:35:12 +1100 (AEDT) Authentication-Results: ozlabs.org; dkim=pass (1024-bit key; unprotected) header.d=gcc.gnu.org header.i=@gcc.gnu.org header.b=j5rknKH/; 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:to:cc :from:subject:message-id:date:mime-version:content-type; q=dns; s=default; b=Xqf9n8/TLoSDgQ8txUi3Ax9yutVrD6GvzyUDO223K0p/9nm4zU TMaaHysWgrcJdyNOW8aCCQYYwc+Y0PuTmJ3XnAJgtJbBT3/P/xR2Q7RF6xXSXcDr FxcB7hvEBLEpVzHAyzjuAPL0KmTBu/AEDjdM/M+gQ8WehnbdLNWXufpVk= 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:to:cc :from:subject:message-id:date:mime-version:content-type; s= default; bh=Vh84I0bmqt2mtYZoMdfJUeAkJb0=; b=j5rknKH/Cz2wRgAFlERf 0L949ttuv7ceWEFtubIWuk/UXd4PXxMIvRuQdrtMrMyrNeufzHxuFUFM5NZXM6Q1 blkK9nL0d3aOSkEBtOujr088fCovVnhRpdPWsH+KeiSDFFNDYWePG9Dbi7MXfGwN f0nVMgw99BJwt/lwIaUOnsk= Received: (qmail 5311 invoked by alias); 23 Jan 2016 09:35:03 -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 5295 invoked by uid 89); 23 Jan 2016 09:35:02 -0000 Authentication-Results: sourceware.org; auth=none X-Virus-Found: No X-Spam-SWARE-Status: No, score=-2.0 required=5.0 tests=AWL, BAYES_00, RP_MATCHES_RCVD, SPF_PASS autolearn=ham version=3.3.2 spammy=H*r:Sat, HX-detected-operating-system:Windows, 2016-01-23 X-HELO: fencepost.gnu.org Received: from fencepost.gnu.org (HELO fencepost.gnu.org) (208.118.235.10) by sourceware.org (qpsmtpd/0.93/v0.84-503-g423c35a) with (AES128-SHA encrypted) ESMTPS; Sat, 23 Jan 2016 09:35:01 +0000 Received: from eggs.gnu.org ([2001:4830:134:3::10]:55199) by fencepost.gnu.org with esmtps (TLS1.0:RSA_AES_256_CBC_SHA1:256) (Exim 4.82) (envelope-from ) id 1aMuax-0002x5-AI for gcc-patches@gnu.org; Sat, 23 Jan 2016 04:34:59 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1aMuat-00019m-RV for gcc-patches@gnu.org; Sat, 23 Jan 2016 04:34:58 -0500 Received: from relay1.mentorg.com ([192.94.38.131]:46219) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1aMuat-00018O-LZ for gcc-patches@gnu.org; Sat, 23 Jan 2016 04:34:55 -0500 Received: from nat-ies.mentorg.com ([192.94.31.2] helo=SVR-IES-FEM-01.mgc.mentorg.com) by relay1.mentorg.com with esmtp id 1aMuan-0005lD-NL from Tom_deVries@mentor.com ; Sat, 23 Jan 2016 01:34:50 -0800 Received: from [127.0.0.1] (137.202.0.76) by SVR-IES-FEM-01.mgc.mentorg.com (137.202.0.104) with Microsoft SMTP Server id 14.3.224.2; Sat, 23 Jan 2016 09:34:48 +0000 To: Richard Biener CC: "gcc-patches@gnu.org" From: Tom de Vries Subject: [PATCH, PR69426] Fix clobber removal in parloops Message-ID: <56A34936.1040004@mentor.com> Date: Sat, 23 Jan 2016 10:34:46 +0100 User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:38.0) Gecko/20100101 Thunderbird/38.5.1 MIME-Version: 1.0 X-detected-operating-system: by eggs.gnu.org: Windows NT kernel [generic] [fuzzy] X-Received-From: 192.94.38.131 Hi, this patches fixes a 5/6 regression PR69426. When compiling the test-case in the patch, the verify_ssa todo check fails after removing a clobber in eliminate_local_variables_stmt. The problem is that the clobber is removed, but the uses of the corresponding vdef are not changed, and the virtual symbol is not marked for renaming. [ The same happens in 4.9, but because omp_expand_local is called before verify_ssa, the ICE does not happen. In 5.0 and later, we use a separate expand_omp_ssa pass. ] This patch fixes the problem by replacing the uses of the vdef of the clobber by the vuse of the clobber. The patch uses replace_uses_by, but unlink_vdef_stmt also works, I'm not sure which one to use. Bootstrapped and reg-tested on x86_64. OK for trunk, gcc-5-branch? Thanks, - Tom Fix clobber removal in parloops 2016-01-23 Tom de Vries PR tree-optimization/69426 * tree-parloops.c (eliminate_local_variables_stmt): Handle vdef of removed clobber. * gcc.dg/autopar/pr69426.c: New test. --- gcc/testsuite/gcc.dg/autopar/pr69426.c | 19 +++++++++++++++++++ gcc/tree-parloops.c | 1 + 2 files changed, 20 insertions(+) diff --git a/gcc/testsuite/gcc.dg/autopar/pr69426.c b/gcc/testsuite/gcc.dg/autopar/pr69426.c new file mode 100644 index 0000000..e91421c --- /dev/null +++ b/gcc/testsuite/gcc.dg/autopar/pr69426.c @@ -0,0 +1,19 @@ +/* { dg-do compile } */ +/* { dg-options "-O2 -ftree-parallelize-loops=2" } */ + +int iq; + +void +mr(void) +{ + unsigned int i8; + + for (i8 = 0; i8 != 1; i8 += 3) { + void *f0[] = { f0 }; + int hv; + + for (; hv < 1; ++hv) + iq = 0; + } + ++iq; +} diff --git a/gcc/tree-parloops.c b/gcc/tree-parloops.c index 7749d34..f9db43b 100644 --- a/gcc/tree-parloops.c +++ b/gcc/tree-parloops.c @@ -725,6 +725,7 @@ eliminate_local_variables_stmt (edge entry, gimple_stmt_iterator *gsi, } else if (gimple_clobber_p (stmt)) { + replace_uses_by (gimple_vdef (stmt), gimple_vuse (stmt)); stmt = gimple_build_nop (); gsi_replace (gsi, stmt, false); dta.changed = true;