From patchwork Fri Nov 5 15:09:05 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Aldy Hernandez X-Patchwork-Id: 47117 Return-Path: X-Original-To: patchwork@sourceware.org Delivered-To: patchwork@sourceware.org Received: from server2.sourceware.org (localhost [IPv6:::1]) by sourceware.org (Postfix) with ESMTP id 83446385841D for ; Fri, 5 Nov 2021 15:09:48 +0000 (GMT) DKIM-Filter: OpenDKIM Filter v2.11.0 sourceware.org 83446385841D DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gcc.gnu.org; s=default; t=1636124988; bh=83kuiV1NsMhcva3Dw4NMjN7Apw88S4JjSApXtcx82vw=; h=To:Subject:Date:List-Id:List-Unsubscribe:List-Archive:List-Post: List-Help:List-Subscribe:From:Reply-To:From; b=MvgJcN7KP4dKxCPqWiSZ1DedREpS3mtNR+mRaA6bQwOI7HNYBRWyvRz8SJ82NnjRp eDilxtcVoveJes6bKXkJEEEnXJDxbsOQKp3Z4mf5MpIjY4Y0ya2P10to9G52ek+50a oK8DJ7rOXRfgs6q3Gt2xvXahbLapr0YoE6RJGCf4= X-Original-To: gcc-patches@gcc.gnu.org Delivered-To: gcc-patches@gcc.gnu.org Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [216.205.24.124]) by sourceware.org (Postfix) with ESMTPS id 7BE2A3858D35 for ; Fri, 5 Nov 2021 15:09:18 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.1 sourceware.org 7BE2A3858D35 Received: from mimecast-mx01.redhat.com (mimecast-mx01.redhat.com [209.132.183.4]) (Using TLS) by relay.mimecast.com with ESMTP id us-mta-593-pMo66DoMNUO9YnxUg5mEFg-1; Fri, 05 Nov 2021 11:09:15 -0400 X-MC-Unique: pMo66DoMNUO9YnxUg5mEFg-1 Received: from smtp.corp.redhat.com (int-mx01.intmail.prod.int.phx2.redhat.com [10.5.11.11]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id 1BB14104ECE6; Fri, 5 Nov 2021 15:09:14 +0000 (UTC) Received: from abulafia.quesejoda.com (unknown [10.39.193.108]) by smtp.corp.redhat.com (Postfix) with ESMTPS id 9E38467841; Fri, 5 Nov 2021 15:09:13 +0000 (UTC) Received: from abulafia.quesejoda.com (localhost [127.0.0.1]) by abulafia.quesejoda.com (8.16.1/8.15.2) with ESMTPS id 1A5F9Akw037260 (version=TLSv1.3 cipher=TLS_AES_256_GCM_SHA384 bits=256 verify=NOT); Fri, 5 Nov 2021 16:09:11 +0100 Received: (from aldyh@localhost) by abulafia.quesejoda.com (8.16.1/8.16.1/Submit) id 1A5F9Ac1037259; Fri, 5 Nov 2021 16:09:10 +0100 To: GCC patches Subject: [PATCH] Cleanup back_threader::find_path_to_names. Date: Fri, 5 Nov 2021 16:09:05 +0100 Message-Id: <20211105150905.37199-1-aldyh@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.79 on 10.5.11.11 X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com X-Spam-Status: No, score=-13.3 required=5.0 tests=BAYES_00, DKIMWL_WL_HIGH, DKIM_SIGNED, DKIM_VALID, DKIM_VALID_AU, DKIM_VALID_EF, GIT_PATCH_0, RCVD_IN_DNSWL_LOW, RCVD_IN_MSPIKE_H2, SPF_HELO_NONE, SPF_NONE, TXREP autolearn=ham autolearn_force=no version=3.4.4 X-Spam-Checker-Version: SpamAssassin 3.4.4 (2020-01-24) on server2.sourceware.org X-BeenThere: gcc-patches@gcc.gnu.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: Gcc-patches mailing list List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-Patchwork-Original-From: Aldy Hernandez via Gcc-patches From: Aldy Hernandez Reply-To: Aldy Hernandez Errors-To: gcc-patches-bounces+patchwork=sourceware.org@gcc.gnu.org Sender: "Gcc-patches" The main path discovery function was due for a cleanup. First, there's a nagging goto and second, my bitmap use was sloppy. Hopefully this makes the code easier for others to read. Regstrapped on x86-64 Linux. I also made sure there were no difference in the number of threads with this patch. No functional changes. OK? gcc/ChangeLog: * tree-ssa-threadbackward.c (back_threader::find_paths_to_names): Remove gotos and other cleanups. --- gcc/tree-ssa-threadbackward.c | 52 ++++++++++++++--------------------- 1 file changed, 20 insertions(+), 32 deletions(-) diff --git a/gcc/tree-ssa-threadbackward.c b/gcc/tree-ssa-threadbackward.c index b7eaff94567..d6a5b0b8da2 100644 --- a/gcc/tree-ssa-threadbackward.c +++ b/gcc/tree-ssa-threadbackward.c @@ -402,26 +402,18 @@ back_threader::find_paths_to_names (basic_block bb, bitmap interesting) m_path.safe_push (bb); + // Try to resolve the path without looking back. if (m_path.length () > 1 - && !m_profit.profitable_path_p (m_path, m_name, NULL)) + && (!m_profit.profitable_path_p (m_path, m_name, NULL) + || maybe_register_path ())) { m_path.pop (); m_visited_bbs.remove (bb); return false; } - // Try to resolve the path without looking back. - if (m_path.length () > 1 && maybe_register_path ()) - { - m_path.pop (); - m_visited_bbs.remove (bb); - return true; - } - auto_bitmap processed; - unsigned i; bool done = false; - // We use a worklist instead of iterating through the bitmap, // because we may add new items in-flight. auto_vec worklist (bitmap_count_bits (interesting)); @@ -433,34 +425,30 @@ back_threader::find_paths_to_names (basic_block bb, bitmap interesting) basic_block def_bb = gimple_bb (SSA_NAME_DEF_STMT (name)); // Process any names defined in this block. - if (def_bb == bb) + if (def_bb == bb + && bitmap_set_bit (processed, i) + && resolve_def (name, interesting, worklist)) { - bitmap_set_bit (processed, i); - - if (resolve_def (name, interesting, worklist)) - { - done = true; - goto leave_bb; - } + done = true; + break; } } - // If there are interesting names not yet processed, keep looking. - bitmap_and_compl_into (interesting, processed); - if (!bitmap_empty_p (interesting)) + if (!done) { - edge_iterator iter; - edge e; - FOR_EACH_EDGE (e, iter, bb->preds) - if ((e->flags & EDGE_ABNORMAL) == 0) - done |= find_paths_to_names (e->src, interesting); + bitmap_and_compl_into (interesting, processed); + if (!bitmap_empty_p (interesting)) + { + edge_iterator iter; + edge e; + FOR_EACH_EDGE (e, iter, bb->preds) + if ((e->flags & EDGE_ABNORMAL) == 0) + done |= find_paths_to_names (e->src, interesting); + } } - leave_bb: - bitmap_iterator bi; - EXECUTE_IF_SET_IN_BITMAP (processed, 0, i, bi) - bitmap_set_bit (interesting, i); - + // Reset things to their original state. + bitmap_ior_into (interesting, processed); m_path.pop (); m_visited_bbs.remove (bb); return done;