From patchwork Thu Jul 29 16:09:16 2010 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "H.J. Lu" X-Patchwork-Id: 60277 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 ACA92B70C2 for ; Fri, 30 Jul 2010 02:09:55 +1000 (EST) Received: (qmail 25925 invoked by alias); 29 Jul 2010 16:09:51 -0000 Received: (qmail 25910 invoked by uid 22791); 29 Jul 2010 16:09:48 -0000 X-SWARE-Spam-Status: No, hits=-1.8 required=5.0 tests=AWL, BAYES_00, DKIM_SIGNED, DKIM_VALID, DKIM_VALID_AU, FREEMAIL_FROM X-Spam-Check-By: sourceware.org Received: from mail-ey0-f175.google.com (HELO mail-ey0-f175.google.com) (209.85.215.175) by sourceware.org (qpsmtpd/0.43rc1) with ESMTP; Thu, 29 Jul 2010 16:09:39 +0000 Received: by eyf5 with SMTP id 5so252905eyf.20 for ; Thu, 29 Jul 2010 09:09:37 -0700 (PDT) MIME-Version: 1.0 Received: by 10.14.119.71 with SMTP id m47mr201827eeh.46.1280419766072; Thu, 29 Jul 2010 09:09:26 -0700 (PDT) Received: by 10.220.182.135 with HTTP; Thu, 29 Jul 2010 09:09:16 -0700 (PDT) In-Reply-To: References: <20100525235926.GA3326@kam.mff.cuni.cz> <20100527075632.GA12991@kam.mff.cuni.cz> <20100528085052.GA3423@kam.mff.cuni.cz> <20100529152243.GA18706@kam.mff.cuni.cz> <20100529191446.GA3996@kam.mff.cuni.cz> <20100604105451.GB5105@kam.mff.cuni.cz> Date: Thu, 29 Jul 2010 09:09:16 -0700 Message-ID: Subject: Re: IVOPT improvement patch From: "H.J. Lu" To: Xinliang David Li Cc: Pat Haugen , GCC Patches , Zdenek Dvorak X-IsSubscribed: yes 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 On Thu, Jul 29, 2010 at 8:22 AM, H.J. Lu wrote: > On Wed, Jul 28, 2010 at 9:32 PM, Xinliang David Li wrote: >> The attached patch should fix the problem -- it reverts a small part >> of the last patch that is needed for fixing sixtrack performance >> regression caused by wrong iv-use costs because address offset range >> is conservatively computed. I will revert the change first and >> investigate better fix (Suggestions are welcome). >> > > Since "gcc -m32" works on Linux/x86-64 and goes into an infinite loop, > it sounds like a HOST_WIDE_INT issue. > Here is the patch. OK for trunk? Thanks. diff --git a/gcc/tree-ssa-loop-ivopts.c b/gcc/tree-ssa-loop-ivopts.c index 1d65b4a..92e19d1 100644 --- a/gcc/tree-ssa-loop-ivopts.c +++ b/gcc/tree-ssa-loop-ivopts.c @@ -3207,7 +3207,7 @@ multiplier_allowed_in_address_p (HOST_WIDE_INT ratio, enum machine_mode mode, typedef struct { - HOST_WIDE_INT min_offset, max_offset; + HOST_WIDEST_INT min_offset, max_offset; unsigned costs[2][2][2][2]; } *address_cost_data; @@ -3240,10 +3240,10 @@ get_address_cost (bool symbol_present, bool var_present, data = VEC_index (address_cost_data, address_cost_data_list, data_index); if (!data) { - HOST_WIDE_INT i; - HOST_WIDE_INT start = BIGGEST_ALIGNMENT / BITS_PER_UNIT; - HOST_WIDE_INT rat, off; - int old_cse_not_expected; + HOST_WIDEST_INT i; + HOST_WIDEST_INT start = BIGGEST_ALIGNMENT / BITS_PER_UNIT; + HOST_WIDEST_INT rat, off; + int old_cse_not_expected, width; unsigned sym_p, var_p, off_p, rat_p, add_c; rtx seq, addr, base; rtx reg0, reg1; @@ -3252,8 +3252,10 @@ get_address_cost (bool symbol_present, bool var_present, reg1 = gen_raw_REG (address_mode, LAST_VIRTUAL_REGISTER + 1); + width = (GET_MODE_BITSIZE (address_mode) < HOST_BITS_PER_WIDE_INT - 2) + ? GET_MODE_BITSIZE (address_mode) : HOST_BITS_PER_WIDE_INT - 2; addr = gen_rtx_fmt_ee (PLUS, address_mode, reg1, NULL_RTX); - for (i = start; i <= 1 << 20; i <<= 1) + for (i = start; i <= 1ll << width; i <<= 1) { XEXP (addr, 1) = gen_int_mode (i, address_mode); if (!memory_address_addr_space_p (mem_mode, addr, as)) @@ -3262,7 +3264,7 @@ get_address_cost (bool symbol_present, bool var_present, data->max_offset = i == start ? 0 : i >> 1; off = data->max_offset; - for (i = start; i <= 1 << 20; i <<= 1) + for (i = start; i <= 1ll << width; i <<= 1) { XEXP (addr, 1) = gen_int_mode (-i, address_mode); if (!memory_address_addr_space_p (mem_mode, addr, as)) @@ -3273,12 +3275,14 @@ get_address_cost (bool symbol_present, bool var_present, if (dump_file && (dump_flags & TDF_DETAILS)) { fprintf (dump_file, "get_address_cost:\n"); - fprintf (dump_file, " min offset %s %d\n", + fprintf (dump_file, " min offset %s " + HOST_WIDEST_INT_PRINT_DEC "\n", GET_MODE_NAME (mem_mode), - (int) data->min_offset); - fprintf (dump_file, " max offset %s %d\n", + data->min_offset); + fprintf (dump_file, " max offset %s " + HOST_WIDEST_INT_PRINT_DEC "\n", GET_MODE_NAME (mem_mode), - (int) data->max_offset); + data->max_offset); } rat = 1;