From patchwork Wed Jul 4 12:05:00 2012 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Richard Biener X-Patchwork-Id: 168964 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]) by ozlabs.org (Postfix) with SMTP id 6DD132C0082 for ; Wed, 4 Jul 2012 22:05:23 +1000 (EST) Comment: DKIM? See http://www.dkim.org DKIM-Signature: v=1; a=rsa-sha1; c=relaxed/relaxed; d=gcc.gnu.org; s=default; x=1342008323; h=Comment: DomainKey-Signature:Received:Received:Received:Received:Date: From:To:Subject:Message-ID:User-Agent:MIME-Version:Content-Type: Mailing-List:Precedence:List-Id:List-Unsubscribe:List-Archive: List-Post:List-Help:Sender:Delivered-To; bh=Vusuc/rAMS0lMmuWaYN1 n4RWlCc=; b=KcFgYyFGWu0e5exM1K5lJ01E5CUP39GIYd5vWeGOzu04anjdn1uO BIPjjVntGThEUD840F8SVvDk+qPY1KxcHz7td/fb6Oo7MO+SBmJxSt59A/Q7MXF0 JFmrABepsV/FqXnRlKJdsdGHg346rVe3CqsxQSjnde8U9TiBAHk8Ugo= Comment: DomainKeys? See http://antispam.yahoo.com/domainkeys DomainKey-Signature: a=rsa-sha1; q=dns; c=nofws; s=default; d=gcc.gnu.org; h=Received:Received:X-SWARE-Spam-Status:X-Spam-Check-By:Received:Received:Date:From:To:Subject:Message-ID:User-Agent:MIME-Version:Content-Type:Mailing-List:Precedence:List-Id:List-Unsubscribe:List-Archive:List-Post:List-Help:Sender:Delivered-To; b=qv0JAV8DciUhCdOqEiX85yGw1fva5D79Jm+RO8uj9E/KJvmcJYKuGfmc5AmYV0 xTlyHQQqwePgAku2fqj2o2E2OztrZ/VQN4u94rhwH9r6zio+EA4NFcYcOnRNrtB3 IiHi5HnCgaD1p3Yks6SxrmFEdaqoS+yi1UHSfYYSRNKD4=; Received: (qmail 363 invoked by alias); 4 Jul 2012 12:05:17 -0000 Received: (qmail 346 invoked by uid 22791); 4 Jul 2012 12:05:14 -0000 X-SWARE-Spam-Status: No, hits=-5.3 required=5.0 tests=AWL, BAYES_00, KHOP_RCVD_UNTRUST, RCVD_IN_DNSWL_HI, TW_TM, T_RP_MATCHES_RCVD X-Spam-Check-By: sourceware.org Received: from cantor2.suse.de (HELO mx2.suse.de) (195.135.220.15) by sourceware.org (qpsmtpd/0.43rc1) with ESMTP; Wed, 04 Jul 2012 12:05:01 +0000 Received: from relay1.suse.de (unknown [195.135.220.254]) (using TLSv1 with cipher DHE-RSA-AES256-SHA (256/256 bits)) (No client certificate requested) by mx2.suse.de (Postfix) with ESMTP id A7257A0FED for ; Wed, 4 Jul 2012 14:05:00 +0200 (CEST) Date: Wed, 4 Jul 2012 14:05:00 +0200 (CEST) From: Richard Guenther To: gcc-patches@gcc.gnu.org Subject: [PATCH] Fix PR53844 Message-ID: User-Agent: Alpine 2.00 (LNX 1167 2008-08-23) MIME-Version: 1.0 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 This fixes a missed dead store elimination case. We were not properly disregarding a loop PHI use we have already visited. Bootstrapped and tested on x86_64-unknown-linux-gnu, applied. Richard. 2012-07-04 Richard Guenther PR tree-optimization/53844 * tree-ssa-dse.c (dse_possible_dead_store_p): Properly handle the loop virtual PHI. * g++.dg/tree-ssa/pr53844.C: New testcase. Index: gcc/tree-ssa-dse.c =================================================================== --- gcc/tree-ssa-dse.c (revision 189248) +++ gcc/tree-ssa-dse.c (working copy) @@ -94,7 +94,7 @@ dse_possible_dead_store_p (gimple stmt, temp = stmt; do { - gimple use_stmt; + gimple use_stmt, defvar_def; imm_use_iterator ui; bool fail = false; tree defvar; @@ -108,6 +108,7 @@ dse_possible_dead_store_p (gimple stmt, defvar = PHI_RESULT (temp); else defvar = gimple_vdef (temp); + defvar_def = temp; temp = NULL; FOR_EACH_IMM_USE_STMT (use_stmt, ui, defvar) { @@ -139,7 +140,14 @@ dse_possible_dead_store_p (gimple stmt, fail = true; BREAK_FROM_IMM_USE_STMT (ui); } - temp = use_stmt; + /* Do not consider the PHI as use if it dominates the + stmt defining the virtual operand we are processing, + we have processed it already in this case. */ + if (gimple_bb (defvar_def) != gimple_bb (use_stmt) + && !dominated_by_p (CDI_DOMINATORS, + gimple_bb (defvar_def), + gimple_bb (use_stmt))) + temp = use_stmt; } /* If the statement is a use the store is not dead. */ else if (ref_maybe_used_by_stmt_p (use_stmt, Index: gcc/testsuite/g++.dg/tree-ssa/pr53844.C =================================================================== --- gcc/testsuite/g++.dg/tree-ssa/pr53844.C (revision 0) +++ gcc/testsuite/g++.dg/tree-ssa/pr53844.C (working copy) @@ -0,0 +1,78 @@ +// { dg-do compile } +// { dg-options "-O2 -fdump-tree-optimized-vops" } + +struct VBase; + +//Very minimal numeric vector class where Base provides the policy +template +struct Vector : public Base{ + + inline Vector(const Base& b) + :Base(b) + { + } + + //Assignment from any other sort of Vector + template + void operator= (const Vector& from) + { + for(int i=0; i<100; i++){ + (*this)[i]=from[i]; + } + } +}; + + +//Base class to represent pointer as a Vector +struct VBase{ + double * const my_data; + + double& operator[](int i) { + return my_data[i]; + } + + const double& operator[](int i) const { + return my_data[i]; + } +}; + +//Base class providing very minimalistic expression template +template struct ScalarMulExpr +{ + const int& mul; + const Vector& vec; + + int size() const + { + return vec.size(); + } + + double operator[](int i) const + { + return vec[i]*mul; + } + + ScalarMulExpr(const Vector& vec_, const int& m) + :mul(m),vec(vec_) + { + } +}; + +//Allow vector to be multiplied by a scalar +template +Vector > operator*(const Vector& lhs, const int& rhs) +{ + return ScalarMulExpr(lhs, rhs); +} + +//Test function producing suboptimal asm code +void test(const Vector<>& in, Vector<>& out, int i) +{ + out=in*1*1*1*1*1*1*1*1*1*1*1; +} + +// There should be a single store remaining, inside the loops. All +// dead stores to unused temporaries should have been removed. + +// { dg-final { scan-tree-dump-times "VDEF" 1 "optimized" } } +// { dg-final { cleanup-tree-dump "optimized" } }