From patchwork Thu Nov 5 14:44:41 2015 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Tom de Vries X-Patchwork-Id: 540455 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 B3032140E6C for ; Fri, 6 Nov 2015 01:45:18 +1100 (AEDT) Authentication-Results: ozlabs.org; dkim=pass (1024-bit key; unprotected) header.d=gcc.gnu.org header.i=@gcc.gnu.org header.b=qmD11TkV; 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=rpa9bqwIndeb9RFJnv55cDkGaAI5eubm1scTWwJHVb4ievS7Fl bBPg6ybhP0/GICUPXNKRsfoe8YItRIXUHHwveIXqB+7/xUyyEAYFfY3nlCfN1Hmj wNFqqx6FsCz9o1yNuqvquFzBfNn0b0Lezl77H3PGGfw9p+8j7qaTuOVdg= 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=i3Imwh6QedK0K2VGF6f5nbFQL6M=; b=qmD11TkVsSZWnmnTtoXt tkf0UvwyrB5oItn8IPDF8uRk6EqZJ8c3xcDOqmVjDvD/I0EWvHhFIJxnRgcKQ/HP aJ8sHMP9a2bzur3VlvFaRtRSS4vhPJDcEXjLZCN4mU7OJlN/8UJ4fLDzsptQNPzK PKbhyqt/Rq9hPIR1/waz178= Received: (qmail 61849 invoked by alias); 5 Nov 2015 14:45:10 -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 61838 invoked by uid 89); 5 Nov 2015 14:45:09 -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, SPF_PASS, T_RP_MATCHES_RCVD autolearn=ham version=3.3.2 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; Thu, 05 Nov 2015 14:45:07 +0000 Received: from eggs.gnu.org ([2001:4830:134:3::10]:38681) by fencepost.gnu.org with esmtps (TLS1.0:RSA_AES_256_CBC_SHA1:256) (Exim 4.82) (envelope-from ) id 1ZuLmj-0006vB-EA for gcc-patches@gnu.org; Thu, 05 Nov 2015 09:45:05 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1ZuLmf-0004xl-PH for gcc-patches@gnu.org; Thu, 05 Nov 2015 09:45:05 -0500 Received: from relay1.mentorg.com ([192.94.38.131]:38864) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1ZuLmf-0004xW-Ie for gcc-patches@gnu.org; Thu, 05 Nov 2015 09:45:01 -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 1ZuLmc-00017p-M5 from Tom_deVries@mentor.com ; Thu, 05 Nov 2015 06:44:59 -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; Thu, 5 Nov 2015 14:44:57 +0000 To: "gcc-patches@gnu.org" CC: Jakub Jelinek From: Tom de Vries Subject: [gomp4, committed] Revert omp_data_i init handling in ccp and forwprop Message-ID: <563B6B59.8030407@mentor.com> Date: Thu, 5 Nov 2015 15:44:41 +0100 User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:38.0) Gecko/20100101 Thunderbird/38.3.0 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 patch reverts the omp_data_i init handling in ccp and forwprop. Committed to gomp-4_0-branch. Thanks, - Tom Revert omp_data_i init handling in ccp and forwprop 2015-11-05 Tom de Vries Revert: 2015-04-21 Tom de Vries * tree-ssa-ccp.c: Include omp-low.h. (surely_varying_stmt_p, ccp_visit_stmt): Handle .omp_data_i init conservatively. * tree-ssa-forwprop.c: Include omp-low.h. (pass_forwprop::execute): Handle .omp_data_i init conservatively. --- gcc/tree-ssa-ccp.c | 6 ------ gcc/tree-ssa-forwprop.c | 4 +--- 2 files changed, 1 insertion(+), 9 deletions(-) diff --git a/gcc/tree-ssa-ccp.c b/gcc/tree-ssa-ccp.c index cf93277..2831cfe 100644 --- a/gcc/tree-ssa-ccp.c +++ b/gcc/tree-ssa-ccp.c @@ -147,7 +147,6 @@ along with GCC; see the file COPYING3. If not see #include "params.h" #include "builtins.h" #include "tree-chkp.h" -#include "omp-low.h" /* Possible lattice values. */ @@ -810,9 +809,6 @@ surely_varying_stmt_p (gimple *stmt) && gimple_code (stmt) != GIMPLE_CALL) return true; - if (gimple_stmt_omp_data_i_init_p (stmt)) - return true; - return false; } @@ -2368,8 +2364,6 @@ ccp_visit_stmt (gimple *stmt, edge *taken_edge_p, tree *output_p) switch (gimple_code (stmt)) { case GIMPLE_ASSIGN: - if (gimple_stmt_omp_data_i_init_p (stmt)) - break; /* If the statement is an assignment that produces a single output value, evaluate its RHS to see if the lattice value of its output has changed. */ diff --git a/gcc/tree-ssa-forwprop.c b/gcc/tree-ssa-forwprop.c index bb08a4a..491178d 100644 --- a/gcc/tree-ssa-forwprop.c +++ b/gcc/tree-ssa-forwprop.c @@ -60,7 +60,6 @@ along with GCC; see the file COPYING3. If not see #include "tree-cfgcleanup.h" #include "tree-into-ssa.h" #include "cfganal.h" -#include "omp-low.h" /* This pass propagates the RHS of assignment statements into use sites of the LHS of the assignment. It's basically a specialized @@ -2132,8 +2131,7 @@ pass_forwprop::execute (function *fun) tree lhs, rhs; enum tree_code code; - if (!is_gimple_assign (stmt) - || gimple_stmt_omp_data_i_init_p (stmt)) + if (!is_gimple_assign (stmt)) { gsi_next (&gsi); continue; -- 1.9.1