From patchwork Tue Jan 12 22:38:24 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jeff Law X-Patchwork-Id: 566760 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 6C239140317 for ; Wed, 13 Jan 2016 09:38:36 +1100 (AEDT) Authentication-Results: ozlabs.org; dkim=pass (1024-bit key; unprotected) header.d=gcc.gnu.org header.i=@gcc.gnu.org header.b=o6tLbOPS; 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 :from:subject:message-id:date:mime-version:content-type; q=dns; s=default; b=V6ObxpLQyxvTCF7znJ/mF5WjrMZRKcDLVrTRZ+VqU1d5gYzyb0 nQrjU4naLmPsueiemTJ3Xp9taNoFbF3hif6QRislwoDifNCatT4VPNDIQiSUKzoV fPj9HqSWFJrUV10bLg8fNBm7oJBun2OeT3k5Yx9KyGnW1xiUbSFWictrM= 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 :from:subject:message-id:date:mime-version:content-type; s= default; bh=jFek4ZufUqTJqGY0M3Pm47fXik8=; b=o6tLbOPSe4l/jlOVb9e3 i4v/ztRI1VMFT+Hij3ll4n18FCm9LnS06IEZjy2QOCvfeEKmabHuNywgHCO/VE8I Rq5BHacwxIbhCIHAxyNWGrwaJIC15FzhEcaVxWjtmYwnw06TE7FYYL41qzH8WH5v f3omRqtpjfWOBZo1PIGRMIU= Received: (qmail 52592 invoked by alias); 12 Jan 2016 22:38:28 -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 52577 invoked by uid 89); 12 Jan 2016 22:38:27 -0000 Authentication-Results: sourceware.org; auth=none X-Virus-Found: No X-Spam-SWARE-Status: No, score=-1.9 required=5.0 tests=BAYES_00, RP_MATCHES_RCVD, SPF_HELO_PASS autolearn=ham version=3.3.2 spammy=ein, Son, _____, UD:tree-ssa-threadupdate.c X-HELO: mx1.redhat.com Received: from mx1.redhat.com (HELO mx1.redhat.com) (209.132.183.28) by sourceware.org (qpsmtpd/0.93/v0.84-503-g423c35a) with (AES256-GCM-SHA384 encrypted) ESMTPS; Tue, 12 Jan 2016 22:38:26 +0000 Received: from int-mx13.intmail.prod.int.phx2.redhat.com (int-mx13.intmail.prod.int.phx2.redhat.com [10.5.11.26]) by mx1.redhat.com (Postfix) with ESMTPS id 2895D7AEB4 for ; Tue, 12 Jan 2016 22:38:25 +0000 (UTC) Received: from slagheap.utah.redhat.com (ovpn-113-92.phx2.redhat.com [10.3.113.92]) by int-mx13.intmail.prod.int.phx2.redhat.com (8.14.4/8.14.4) with ESMTP id u0CMcOIL006913 for ; Tue, 12 Jan 2016 17:38:24 -0500 To: gcc-patches@gcc.gnu.org From: Jeff Law Subject: [PATCH] Fix whitespace/typos in tree-ssa-threadupdate.c Message-ID: <56958060.2000603@redhat.com> Date: Tue, 12 Jan 2016 15:38:24 -0700 User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:38.0) Gecko/20100101 Thunderbird/38.5.0 MIME-Version: 1.0 X-IsSubscribed: yes While working on 67755, I kept getting annoyed by the formatting goofs and typos. So, without further delay, whitespace & typo fixes. Bootstrapped on x86_64 for completeness & installed on the trunk. Jeff commit 5203c463e3a1c99634cb83a6ef22200ee68d0dcd Author: Jeff Law Date: Tue Jan 12 15:37:12 2016 -0700 * tree-ssa-threadupdate.c: Various whitespace and typo fixes. diff --git a/gcc/ChangeLog b/gcc/ChangeLog index 8df676c..3c2cf3f 100644 --- a/gcc/ChangeLog +++ b/gcc/ChangeLog @@ -1,3 +1,7 @@ +2016-01-12 Jeff Law + + * tree-ssa-threadupdate.c: Various whitespace and typo fixes. + 2016-01-12 Olivier Hainque * gcc.c (spec_undefvar_allowed): New global. diff --git a/gcc/tree-ssa-threadupdate.c b/gcc/tree-ssa-threadupdate.c index e118c49..1bf9ae6 100644 --- a/gcc/tree-ssa-threadupdate.c +++ b/gcc/tree-ssa-threadupdate.c @@ -353,7 +353,7 @@ lookup_redirection_data (edge e, enum insert_option insert) struct redirection_data *elt; vec *path = THREAD_PATH (e); - /* Build a hash table element so we can see if E is already + /* Build a hash table element so we can see if E is already in the table. */ elt = XNEW (struct redirection_data); elt->path = path; @@ -635,21 +635,21 @@ any_remaining_duplicated_blocks (vec *path, are not part of any jump threading path, but add profile counts along the path. - In the aboe example, after all jump threading is complete, we will + In the above example, after all jump threading is complete, we will end up with the following control flow: - A B C - | | | - Ea| |Eb |Ec - | | | - v v v - Ja J Jc - / \ / \Eon' / \ + A B C + | | | + Ea| |Eb |Ec + | | | + v v v + Ja J Jc + / \ / \Eon' / \ Eona/ \ ---/---\-------- \Eonc - / \ / / \ \ + / \ / / \ \ v v v v v Sona Soff Son Sonc - \ /\ / + \ /\ / \___________ / \ _____/ \ / \/ vv v @@ -793,19 +793,19 @@ compute_path_counts (struct redirection_data *rd, coming into the path that will contribute to the count flowing into the path successor. */ if (has_joiner && epath != elast) - { - /* Look for other incoming edges after joiner. */ - FOR_EACH_EDGE (ein, ei, epath->dest->preds) - { - if (ein != epath - /* Ignore in edges from blocks we have duplicated for a - threading path, which have duplicated edge counts until - they are redirected by an invocation of this routine. */ - && !bitmap_bit_p (local_info->duplicate_blocks, - ein->src->index)) - nonpath_count += ein->count; - } - } + { + /* Look for other incoming edges after joiner. */ + FOR_EACH_EDGE (ein, ei, epath->dest->preds) + { + if (ein != epath + /* Ignore in edges from blocks we have duplicated for a + threading path, which have duplicated edge counts until + they are redirected by an invocation of this routine. */ + && !bitmap_bit_p (local_info->duplicate_blocks, + ein->src->index)) + nonpath_count += ein->count; + } + } if (cur_count < path_out_count) path_out_count = cur_count; if (epath->count < min_path_count) @@ -827,14 +827,14 @@ compute_path_counts (struct redirection_data *rd, difference between elast->count and nonpath_count. Otherwise the edge counts after threading will not be sane. */ if (has_joiner && path_out_count < elast->count - nonpath_count) - { - path_out_count = elast->count - nonpath_count; - /* But neither can we go above the minimum count along the path - we are duplicating. This can be an issue due to profile - insanities coming in to this pass. */ - if (path_out_count > min_path_count) - path_out_count = min_path_count; - } + { + path_out_count = elast->count - nonpath_count; + /* But neither can we go above the minimum count along the path + we are duplicating. This can be an issue due to profile + insanities coming in to this pass. */ + if (path_out_count > min_path_count) + path_out_count = min_path_count; + } *path_in_count_ptr = path_in_count; *path_out_count_ptr = path_out_count; @@ -1268,17 +1268,17 @@ ssa_fix_duplicate_block_edges (struct redirection_data *rd, thread path (path_in_freq). If we had a joiner, it would have been updated at the end of that handling to the edge frequency along the duplicated joiner path edge. */ - update_profile (epath, NULL, path_out_count, path_out_count, - cur_path_freq); + update_profile (epath, NULL, path_out_count, path_out_count, + cur_path_freq); } /* Increment the index into the duplicated path when we processed a duplicated block. */ if ((*path)[i]->type == EDGE_COPY_SRC_JOINER_BLOCK || (*path)[i]->type == EDGE_COPY_SRC_BLOCK) - { + { count++; - } + } } /* Now walk orig blocks and update their probabilities, since the @@ -2383,7 +2383,7 @@ valid_jump_thread_path (vec *path) struct loop *loop = e->dest->loop_father; if (e->dest != (*path)[j+1]->e->src) - return false; + return false; /* If we're threading through the loop latch back into the same loop and the destination does not dominate the loop @@ -2705,7 +2705,7 @@ register_jump_thread (vec *path) for (unsigned int i = 0; i < path->length (); i++) { if ((*path)[i]->e == NULL) - { + { if (dump_file && (dump_flags & TDF_DETAILS)) { fprintf (dump_file, @@ -2715,7 +2715,7 @@ register_jump_thread (vec *path) delete_jump_thread_path (path); return; - } + } /* Only the FSM threader is allowed to thread across backedges in the CFG. */