From patchwork Tue Dec 1 09:07:44 2015 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Thomas Schwinge X-Patchwork-Id: 550747 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 798EE1401E7 for ; Tue, 1 Dec 2015 20:08:06 +1100 (AEDT) Authentication-Results: ozlabs.org; dkim=pass (1024-bit key; unprotected) header.d=gcc.gnu.org header.i=@gcc.gnu.org header.b=D8dgQkwc; 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:from :to:subject:in-reply-to:references:date:message-id:mime-version :content-type; q=dns; s=default; b=qqMW7TViHWZ589/HuunpY9t300+FN T3l//P4FQ6AU4jf7j7KcxW7n/jgoXWuCohYju7qYruDwCcjxiFK/IaFKr1sRqXKN /q2sA9t3DEHpTdhsV9auWfE0725VzTaX8JAPq/Eralihd9XvikEPizo9Z3owDF08 IvGoMcTZwxlEJ0= 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:from :to:subject:in-reply-to:references:date:message-id:mime-version :content-type; s=default; bh=/xVAqvVtTD2HMInCNiX3aMotV5s=; b=D8d gQkwcdBTxtMTAlDFu+nJmUZt1CccjCxYRQDyc6JS7QPHWyO/RASw/698/BX7JKl7 KIXNzF3dHjkAsnWAtdT8sPqjOL4WxWVZ45bwiYvVh5XeznVwMj0pn5zl2NpLtgVQ 7et4R6jiV+RlCC5u6o8na0oxw4gI4O2wp2+9PCLg= Received: (qmail 72867 invoked by alias); 1 Dec 2015 09:07:59 -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 72836 invoked by uid 89); 1 Dec 2015 09:07:58 -0000 Authentication-Results: sourceware.org; auth=none X-Virus-Found: No X-Spam-SWARE-Status: No, score=-2.1 required=5.0 tests=AWL, BAYES_00, RCVD_IN_DNSWL_LOW, SPF_PASS autolearn=ham version=3.3.2 X-HELO: relay1.mentorg.com Received: from relay1.mentorg.com (HELO relay1.mentorg.com) (192.94.38.131) by sourceware.org (qpsmtpd/0.93/v0.84-503-g423c35a) with ESMTP; Tue, 01 Dec 2015 09:07:57 +0000 Received: from svr-orw-fem-03.mgc.mentorg.com ([147.34.97.39]) by relay1.mentorg.com with esmtp id 1a3guf-0006s7-MC from Thomas_Schwinge@mentor.com for gcc-patches@gcc.gnu.org; Tue, 01 Dec 2015 01:07:53 -0800 Received: from tftp-cs (147.34.91.1) by svr-orw-fem-03.mgc.mentorg.com (147.34.97.39) with Microsoft SMTP Server id 14.3.224.2; Tue, 1 Dec 2015 01:07:53 -0800 Received: by tftp-cs (Postfix, from userid 49978) id BC1EAC240A; Tue, 1 Dec 2015 01:07:52 -0800 (PST) From: Thomas Schwinge To: Nathan Sidwell , GCC Patches Subject: Re: [gomp] Move openacc vector& worker single handling to RTL In-Reply-To: <559F10F2.9050102@acm.org> References: <5597120D.2080308@acm.org> <20150703231159.GP10247@tucnak.redhat.com> <559844EF.6010208@acm.org> <559AD85B.2050102@acm.org> <20150707095408.GD10247@tucnak.redhat.com> <559BDE68.9010302@acm.org> <20150707142229.GG10247@tucnak.redhat.com> <559D381C.7020804@acm.org> <20150708145822.GB10247@tucnak.redhat.com> <559D9A29.2020409@acm.org> <559F10F2.9050102@acm.org> User-Agent: Notmuch/0.9-125-g4686d11 (http://notmuchmail.org) Emacs/24.5.1 (i586-pc-linux-gnu) Date: Tue, 1 Dec 2015 10:07:44 +0100 Message-ID: <87d1uqo7tr.fsf@kepler.schwinge.homeip.net> MIME-Version: 1.0 Hi! On Thu, 09 Jul 2015 20:25:22 -0400, Nathan Sidwell wrote: > This is the patch I committed. [...] > 2015-07-09 Nathan Sidwell > * omp-low.c (omp_region): [...] > (enclosing_target_region, required_predication_mask, > generate_vector_broadcast, generate_oacc_broadcast, > make_predication_test, predicate_bb, find_predicatable_bbs, > predicate_omp_regions): Delete. > [...] This removed all usage of bb_region_map. Now cleaned up in gomp-4_0-branch r231102: commit ff7e1eb4e855aa16d14ae047172269bc7192a069 Author: tschwinge Date: Tue Dec 1 09:04:33 2015 +0000 gcc/omp-low.c: Remove bb_region_map gcc/ * omp-low.c (bb_region_map): Remove. Adjust all users. git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/branches/gomp-4_0-branch@231102 138bc75d-0d04-0410-961f-82ee72b054a4 --- gcc/ChangeLog.gomp | 4 ++++ gcc/omp-low.c | 42 +++++++++++++++++------------------------- 2 files changed, 21 insertions(+), 25 deletions(-) Grüße Thomas diff --git gcc/ChangeLog.gomp gcc/ChangeLog.gomp index 0e4f371..4842164 100644 --- gcc/ChangeLog.gomp +++ gcc/ChangeLog.gomp @@ -1,3 +1,7 @@ +2015-12-01 Thomas Schwinge + + * omp-low.c (bb_region_map): Remove. Adjust all users. + 2015-11-30 Cesar Philippidis * tree-nested.c (convert_nonlocal_omp_clauses): Handle optional diff --git gcc/omp-low.c gcc/omp-low.c index 1b52f6b..a1e7a14 100644 --- gcc/omp-low.c +++ gcc/omp-low.c @@ -13356,9 +13356,6 @@ expand_omp (struct omp_region *region) } } -/* Map each basic block to an omp_region. */ -static hash_map *bb_region_map; - static void find_omp_for_region_data (struct omp_region *region, gomp_for *stmt) { @@ -13394,8 +13391,6 @@ build_omp_regions_1 (basic_block bb, struct omp_region *parent, gimple *stmt; basic_block son; - bb_region_map->put (bb, parent); - gsi = gsi_last_bb (bb); if (!gsi_end_p (gsi) && is_gimple_omp (gsi_stmt (gsi))) { @@ -13536,31 +13531,28 @@ build_omp_regions (void) static unsigned int execute_expand_omp (void) { - bb_region_map = new hash_map; - build_omp_regions (); - if (root_omp_region) + if (!root_omp_region) + return 0; + + if (dump_file) { - if (dump_file) - { - fprintf (dump_file, "\nOMP region tree\n\n"); - dump_omp_region (dump_file, root_omp_region, 0); - fprintf (dump_file, "\n"); - } - - remove_exit_barriers (root_omp_region); - - expand_omp (root_omp_region); - - if (flag_checking && !loops_state_satisfies_p (LOOPS_NEED_FIXUP)) - verify_loop_structure (); - cleanup_tree_cfg (); - - free_omp_regions (); + fprintf (dump_file, "\nOMP region tree\n\n"); + dump_omp_region (dump_file, root_omp_region, 0); + fprintf (dump_file, "\n"); } - delete bb_region_map; + remove_exit_barriers (root_omp_region); + + expand_omp (root_omp_region); + + if (flag_checking && !loops_state_satisfies_p (LOOPS_NEED_FIXUP)) + verify_loop_structure (); + cleanup_tree_cfg (); + + free_omp_regions (); + return 0; }