From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (qmail 129629 invoked by alias); 1 Dec 2017 22:36:27 -0000 Mailing-List: contact gcc-patches-help@gcc.gnu.org; run by ezmlm Precedence: bulk List-Id: List-Archive: List-Post: List-Help: Sender: gcc-patches-owner@gcc.gnu.org Received: (qmail 129619 invoked by uid 89); 1 Dec 2017 22:36:26 -0000 Authentication-Results: sourceware.org; auth=none X-Virus-Found: No X-Spam-SWARE-Status: No, score=-11.7 required=5.0 tests=BAYES_00,GIT_PATCH_2,GIT_PATCH_3,KB_WAM_FROM_NAME_SINGLEWORD,SPF_HELO_PASS,T_RP_MATCHES_RCVD autolearn=ham version=3.3.2 spammy=gd, eb, Hx-languages-length:2632, store_merge 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 ESMTP; Fri, 01 Dec 2017 22:36:25 +0000 Received: from smtp.corp.redhat.com (int-mx03.intmail.prod.int.phx2.redhat.com [10.5.11.13]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mx1.redhat.com (Postfix) with ESMTPS id 8396737E72; Fri, 1 Dec 2017 22:36:24 +0000 (UTC) Received: from tucnak.zalov.cz (ovpn-116-77.ams2.redhat.com [10.36.116.77]) by smtp.corp.redhat.com (Postfix) with ESMTPS id 269536BF60; Fri, 1 Dec 2017 22:36:23 +0000 (UTC) Received: from tucnak.zalov.cz (localhost [127.0.0.1]) by tucnak.zalov.cz (8.15.2/8.15.2) with ESMTP id vB1MaLTA027607; Fri, 1 Dec 2017 23:36:21 +0100 Received: (from jakub@localhost) by tucnak.zalov.cz (8.15.2/8.15.2/Submit) id vB1MaJQ1027586; Fri, 1 Dec 2017 23:36:19 +0100 Date: Fri, 01 Dec 2017 22:36:00 -0000 From: Jakub Jelinek To: Richard Biener Cc: gcc-patches@gcc.gnu.org Subject: [PATCH] Fix store-merging vuse handling (PR tree-optimization/83170, PR tree-optimization/83241) Message-ID: <20171201223619.GA2353@tucnak> Reply-To: Jakub Jelinek MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline User-Agent: Mutt/1.7.1 (2016-10-04) X-IsSubscribed: yes X-SW-Source: 2017-12/txt/msg00069.txt.bz2 Hi! The bswap infrastructure uses the vuse field to make sure all the loads are having the same gimple_vuse and also uses it in bswap_replace. When this infrastructure is used inside of the store-merging pass, the problem is that the old stores are being removed and new added, so gimple_vuse of the loads we record during process_stmt can change. So, this patch updates the vuse fields before we plan to use it (in try_coalesce_bswap for the checking and in output_merged_stores for the bswap_replace purposes). Bootstrapped/regtested on x86_64-linux and i686-linux, ok for trunk? 2017-12-01 Jakub Jelinek PR tree-optimization/83170 PR tree-optimization/83241 * gimple-ssa-store-merging.c (imm_store_chain_info::try_coalesce_bswap): Update vuse field from gimple_vuse (ins_stmt) in case it has changed. (imm_store_chain_info::output_merged_store): Likewise. * gcc.dg/store_merging_17.c: New test. --- gcc/gimple-ssa-store-merging.c.jj 2017-12-01 09:17:36.000000000 +0100 +++ gcc/gimple-ssa-store-merging.c 2017-12-01 16:03:40.806918965 +0100 @@ -2384,6 +2384,9 @@ imm_store_chain_info::try_coalesce_bswap this_n.type = type; if (!this_n.base_addr) this_n.range = try_size / BITS_PER_UNIT; + else + /* Update vuse in case it has changed by output_merged_stores. */ + this_n.vuse = gimple_vuse (info->ins_stmt); unsigned int bitpos = info->bitpos - infof->bitpos; if (!do_shift_rotate (LSHIFT_EXPR, &this_n, BYTES_BIG_ENDIAN @@ -3341,10 +3344,16 @@ imm_store_chain_info::output_merged_stor we've checked the aliasing already in try_coalesce_bswap and we want to sink the need load into seq. So need to use new_vuse on the load. */ - if (n->base_addr && n->vuse == NULL) + if (n->base_addr) { - n->vuse = new_vuse; - ins_stmt = NULL; + if (n->vuse == NULL) + { + n->vuse = new_vuse; + ins_stmt = NULL; + } + else + /* Update vuse in case it has changed by output_merged_stores. */ + n->vuse = gimple_vuse (ins_stmt); } bswap_res = bswap_replace (gsi_start (seq), ins_stmt, fndecl, bswap_type, load_type, n, bswap); --- gcc/testsuite/gcc.dg/store_merging_17.c.jj 2017-12-01 16:07:20.590224536 +0100 +++ gcc/testsuite/gcc.dg/store_merging_17.c 2017-12-01 16:07:01.000000000 +0100 @@ -0,0 +1,17 @@ +/* PR tree-optimization/83241 */ +/* { dg-do compile { target store_merge } } */ +/* { dg-options "-O2" } */ + +struct S { int a; short b[32]; } e; +struct T { volatile int c; int d; } f; + +void +foo () +{ + struct T g = f; + e.b[0] = 6; + e.b[1] = 6; + e.b[4] = g.d; + e.b[5] = g.d >> 16; + e.a = 1; +} Jakub