From patchwork Fri Sep 17 11:50:43 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Richard Biener X-Patchwork-Id: 45123 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 00DCA385800C for ; Fri, 17 Sep 2021 11:51:14 +0000 (GMT) DKIM-Filter: OpenDKIM Filter v2.11.0 sourceware.org 00DCA385800C DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gcc.gnu.org; s=default; t=1631879474; bh=RyyLJ/hGs8eIdAV40mFtWC3KA7u0LnsRECLxfO483ac=; h=Date:To:Subject:List-Id:List-Unsubscribe:List-Archive:List-Post: List-Help:List-Subscribe:From:Reply-To:From; b=udzUiuEh/0202E/uqGMVu3YciIfOUp7cWJMPqkKNntDttQqz7/MJUE4Huaik4r9TE NHV4K5b/elfRjYN8BT7NZlMZ8Eus6owvIs9bz25j116TcaWd/vxoVNZHd4vwSe8Evj U8vY+FdV5Nbdh6WVw2F6DvyRgSBRhCXCwmBeXzso= X-Original-To: gcc-patches@gcc.gnu.org Delivered-To: gcc-patches@gcc.gnu.org Received: from smtp-out1.suse.de (smtp-out1.suse.de [195.135.220.28]) by sourceware.org (Postfix) with ESMTPS id BDB803858D29 for ; Fri, 17 Sep 2021 11:50:44 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.1 sourceware.org BDB803858D29 Received: from imap2.suse-dmz.suse.de (imap2.suse-dmz.suse.de [192.168.254.74]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature ECDSA (P-521) server-digest SHA512) (No client certificate requested) by smtp-out1.suse.de (Postfix) with ESMTPS id 8165F22104 for ; Fri, 17 Sep 2021 11:50:43 +0000 (UTC) Received: from imap2.suse-dmz.suse.de (imap2.suse-dmz.suse.de [192.168.254.74]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature ECDSA (P-521) server-digest SHA512) (No client certificate requested) by imap2.suse-dmz.suse.de (Postfix) with ESMTPS id 6E2B514063 for ; Fri, 17 Sep 2021 11:50:43 +0000 (UTC) Received: from dovecot-director2.suse.de ([192.168.254.65]) by imap2.suse-dmz.suse.de with ESMTPSA id u0O3GROBRGEYMwAAMHmgww (envelope-from ) for ; Fri, 17 Sep 2021 11:50:43 +0000 Date: Fri, 17 Sep 2021 13:50:43 +0200 (CEST) To: gcc-patches@gcc.gnu.org Subject: [PATCH] Revert no longer needed fix for PR95539 Message-ID: MIME-Version: 1.0 X-Spam-Status: No, score=-11.4 required=5.0 tests=BAYES_00, DKIM_SIGNED, DKIM_VALID, DKIM_VALID_AU, DKIM_VALID_EF, GIT_PATCH_0, KAM_NUMSUBJECT, SPF_HELO_NONE, SPF_PASS, 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: Richard Biener via Gcc-patches From: Richard Biener Reply-To: Richard Biener Errors-To: gcc-patches-bounces+patchwork=sourceware.org@gcc.gnu.org Sender: "Gcc-patches" The workaround is no longer necessary since we maintain alignment info on the DR group leader only. Bootstrapped and tested on x86_64-unknown-linux-gnu, pushed. 2021-09-17 Richard Biener * tree-vect-stmts.c (vectorizable_load): Do not frob stmt_info for SLP. --- gcc/tree-vect-stmts.c | 13 +------------ 1 file changed, 1 insertion(+), 12 deletions(-) diff --git a/gcc/tree-vect-stmts.c b/gcc/tree-vect-stmts.c index 4e0b2adf1dc..ce79d883dbf 100644 --- a/gcc/tree-vect-stmts.c +++ b/gcc/tree-vect-stmts.c @@ -8515,17 +8515,6 @@ vectorizable_load (vec_info *vinfo, if (!STMT_VINFO_DATA_REF (stmt_info)) return false; - /* ??? Alignment analysis for SLP looks at SLP_TREE_SCALAR_STMTS[0] - for unpermuted loads but we get passed SLP_TREE_REPRESENTATIVE - which can be different when reduction chains were re-ordered. - Now that we figured we're a dataref reset stmt_info back to - SLP_TREE_SCALAR_STMTS[0]. When we're SLP only things should be - refactored in a way to maintain the dr_vec_info pointer for the - relevant access explicitely. */ - stmt_vec_info orig_stmt_info = stmt_info; - if (slp_node) - stmt_info = SLP_TREE_SCALAR_STMTS (slp_node)[0]; - tree mask = NULL_TREE, mask_vectype = NULL_TREE; if (gassign *assign = dyn_cast (stmt_info->stmt)) { @@ -8768,7 +8757,7 @@ vectorizable_load (vec_info *vinfo, dump_printf_loc (MSG_NOTE, vect_location, "Vectorizing an unaligned access.\n"); - STMT_VINFO_TYPE (orig_stmt_info) = load_vec_info_type; + STMT_VINFO_TYPE (stmt_info) = load_vec_info_type; vect_model_load_cost (vinfo, stmt_info, ncopies, vf, memory_access_type, &gs_info, slp_node, cost_vec); return true;