From patchwork Mon Jun 18 14:52:54 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Richard Sandiford X-Patchwork-Id: 930954 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=pass (mailfrom) smtp.mailfrom=gcc.gnu.org (client-ip=209.132.180.131; helo=sourceware.org; envelope-from=gcc-patches-return-479924-incoming=patchwork.ozlabs.org@gcc.gnu.org; receiver=) Authentication-Results: ozlabs.org; dmarc=none (p=none dis=none) header.from=arm.com Authentication-Results: ozlabs.org; dkim=pass (1024-bit key; unprotected) header.d=gcc.gnu.org header.i=@gcc.gnu.org header.b="JdAnhc9x"; dkim-atps=neutral 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 418YxJ0SH2z9s19 for ; Tue, 19 Jun 2018 00:53:07 +1000 (AEST) 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:date:message-id:mime-version:content-type; q=dns; s= default; b=bIEdeQurHyMoav2qHwYo7LgS0f3Qto9iBUVyIdZDFa4RCiiylHAeA 2VVEg75xrFhRyrzrLsFPVSGEgFTO8gS2mpGlTgT8K7MRpPOfwoQJlGVgqKOvDlnh q655Z6zYUchtHPhmaOsLd8bAHMa4zStkxPzrTg+BKkjEvP1tw1M024= 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:date:message-id:mime-version:content-type; s= default; bh=3ytyodrWjqupvo/WMjrG71vxXcQ=; b=JdAnhc9xItGZGsw2VVPw TVjd7gYeKvlHnbtD+1J/iBTtPWgAmqiFHGyZ+A9ozNyzXfV0Mod7t6ci33WMOtPb 9NwFspxu0cEy0kbnAvuta7rFlE8OE9F69hpoj7rAjiItmW0xY1V4dIRwW/gEya8p e0uvd20D/jl/g1GUS5Pk4y4= Received: (qmail 10954 invoked by alias); 18 Jun 2018 14:53:00 -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 10892 invoked by uid 89); 18 Jun 2018 14:53:00 -0000 Authentication-Results: sourceware.org; auth=none X-Virus-Found: No X-Spam-SWARE-Status: No, score=-11.1 required=5.0 tests=BAYES_00, GIT_PATCH_2, GIT_PATCH_3, KAM_ASCII_DIVIDERS, SPF_PASS autolearn=ham version=3.3.2 spammy= X-HELO: foss.arm.com Received: from usa-sjc-mx-foss1.foss.arm.com (HELO foss.arm.com) (217.140.101.70) by sourceware.org (qpsmtpd/0.93/v0.84-503-g423c35a) with ESMTP; Mon, 18 Jun 2018 14:52:58 +0000 Received: from usa-sjc-imap-foss1.foss.arm.com (unknown [10.72.51.249]) by usa-sjc-mx-foss1.foss.arm.com (Postfix) with ESMTP id 0F5A31529 for ; Mon, 18 Jun 2018 07:52:57 -0700 (PDT) Received: from localhost (unknown [10.32.98.107]) by usa-sjc-imap-foss1.foss.arm.com (Postfix) with ESMTPSA id 8BDDD3F557 for ; Mon, 18 Jun 2018 07:52:56 -0700 (PDT) From: Richard Sandiford To: gcc-patches@gcc.gnu.org Mail-Followup-To: gcc-patches@gcc.gnu.org, richard.sandiford@arm.com Subject: [2/n] PR85694: Attach a DEF_SEQ only to the original statement Date: Mon, 18 Jun 2018 15:52:54 +0100 Message-ID: <87fu1kgn95.fsf@arm.com> User-Agent: Gnus/5.13 (Gnus v5.13) Emacs/26.1 (gnu/linux) MIME-Version: 1.0 A pattern's PATTERN_DEF_SEQ was attached to both the original statement and the main pattern statement, which made it harder to update later. This patch attaches it to just the original statement. In practice, anything that cared had ready access to both. Tested on aarch64-linux-gnu and x86_64-linux-gnu. OK to install? Richard 2018-06-18 Richard Sandiford gcc/ * tree-vect-loop.c (vect_determine_vf_for_stmt): Take the PATTERN_DEF_SEQ from the original statement rather than the main pattern statement. * tree-vect-stmts.c (free_stmt_vec_info): Likewise. * tree-vect-patterns.c (vect_recog_dot_prod_pattern): Likewise. (vect_mark_pattern_stmts): Don't copy the PATTERN_DEF_SEQ. Index: gcc/tree-vect-loop.c =================================================================== --- gcc/tree-vect-loop.c 2018-06-18 15:24:10.457472575 +0100 +++ gcc/tree-vect-loop.c 2018-06-18 15:24:21.001379616 +0100 @@ -224,10 +224,10 @@ vect_determine_vf_for_stmt (stmt_vec_inf if (STMT_VINFO_IN_PATTERN_P (stmt_info) && STMT_VINFO_RELATED_STMT (stmt_info)) { + gimple *pattern_def_seq = STMT_VINFO_PATTERN_DEF_SEQ (stmt_info); stmt_info = vinfo_for_stmt (STMT_VINFO_RELATED_STMT (stmt_info)); /* If a pattern statement has def stmts, analyze them too. */ - gimple *pattern_def_seq = STMT_VINFO_PATTERN_DEF_SEQ (stmt_info); for (gimple_stmt_iterator si = gsi_start (pattern_def_seq); !gsi_end_p (si); gsi_next (&si)) { @@ -2259,10 +2259,10 @@ vect_analyze_loop_2 (loop_vec_info loop_ STMT_SLP_TYPE (stmt_info) = loop_vect; if (STMT_VINFO_IN_PATTERN_P (stmt_info)) { + gimple *pattern_def_seq = STMT_VINFO_PATTERN_DEF_SEQ (stmt_info); stmt_info = vinfo_for_stmt (STMT_VINFO_RELATED_STMT (stmt_info)); STMT_SLP_TYPE (stmt_info) = loop_vect; - for (gimple_stmt_iterator pi - = gsi_start (STMT_VINFO_PATTERN_DEF_SEQ (stmt_info)); + for (gimple_stmt_iterator pi = gsi_start (pattern_def_seq); !gsi_end_p (pi); gsi_next (&pi)) { gimple *pstmt = gsi_stmt (pi); Index: gcc/tree-vect-stmts.c =================================================================== --- gcc/tree-vect-stmts.c 2018-06-18 15:24:10.461472540 +0100 +++ gcc/tree-vect-stmts.c 2018-06-18 15:24:21.005379580 +0100 @@ -9892,29 +9892,26 @@ free_stmt_vec_info (gimple *stmt) too. */ if (STMT_VINFO_IN_PATTERN_P (stmt_info)) { + if (gimple_seq seq = STMT_VINFO_PATTERN_DEF_SEQ (stmt_info)) + for (gimple_stmt_iterator si = gsi_start (seq); + !gsi_end_p (si); gsi_next (&si)) + { + gimple *seq_stmt = gsi_stmt (si); + gimple_set_bb (seq_stmt, NULL); + tree lhs = gimple_get_lhs (seq_stmt); + if (lhs && TREE_CODE (lhs) == SSA_NAME) + release_ssa_name (lhs); + free_stmt_vec_info (seq_stmt); + } stmt_vec_info patt_info = vinfo_for_stmt (STMT_VINFO_RELATED_STMT (stmt_info)); if (patt_info) { - gimple_seq seq = STMT_VINFO_PATTERN_DEF_SEQ (patt_info); gimple *patt_stmt = STMT_VINFO_STMT (patt_info); gimple_set_bb (patt_stmt, NULL); tree lhs = gimple_get_lhs (patt_stmt); if (lhs && TREE_CODE (lhs) == SSA_NAME) release_ssa_name (lhs); - if (seq) - { - gimple_stmt_iterator si; - for (si = gsi_start (seq); !gsi_end_p (si); gsi_next (&si)) - { - gimple *seq_stmt = gsi_stmt (si); - gimple_set_bb (seq_stmt, NULL); - lhs = gimple_get_lhs (seq_stmt); - if (lhs && TREE_CODE (lhs) == SSA_NAME) - release_ssa_name (lhs); - free_stmt_vec_info (seq_stmt); - } - } free_stmt_vec_info (patt_stmt); } } Index: gcc/tree-vect-patterns.c =================================================================== --- gcc/tree-vect-patterns.c 2018-06-18 15:22:36.898297310 +0100 +++ gcc/tree-vect-patterns.c 2018-06-18 15:24:21.001379616 +0100 @@ -405,13 +405,13 @@ vect_recog_dot_prod_pattern (vec