From patchwork Thu May 14 15:32:31 2015 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Uros Bizjak X-Patchwork-Id: 472377 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]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 39251140297 for ; Fri, 15 May 2015 01:32:43 +1000 (AEST) Authentication-Results: ozlabs.org; dkim=pass (1024-bit key; unprotected) header.d=gcc.gnu.org header.i=@gcc.gnu.org header.b=GLEB7pkY; dkim-atps=neutral DomainKey-Signature: a=rsa-sha1; c=nofws; d=gcc.gnu.org; h=list-id :list-unsubscribe:list-archive:list-post:list-help:sender :mime-version:in-reply-to:references:date:message-id:subject :from:to:cc:content-type; q=dns; s=default; b=A+7UZ0bZ0BrwiI4bPF J79X//LUwvdBYddoCY2jGtuYUKpHtQs1nf4PBuY79qbx145lnQprTal9xPv7jIRN B9uje52qrmRu8mbIKVVDHRXMHsw5xBCamaueRNUG296Z5aehKARoNpTiwcrJ4PXS pVkjU09ez5cN8UjPZvz+DtGk8= 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 :mime-version:in-reply-to:references:date:message-id:subject :from:to:cc:content-type; s=default; bh=4BR9t8JB1L8+Qw8KH6OxSYGE 5uE=; b=GLEB7pkYAZRuJuZCHgfiCLpJ19Z0rHk4+lgmpDhtCGDqGB5weVATvWqm lVzLPNfKqwcMMH7B4NnuU0us/AMqB87w29Bv17LHthU38JyoyYrjMrfc52cXBBSF fx9wmxLer0UX7GK8goBiy6WoL9+k6JE6FU/8Ex5TeqS1D2KxC9s= Received: (qmail 37914 invoked by alias); 14 May 2015 15:32:35 -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 37904 invoked by uid 89); 14 May 2015 15:32:34 -0000 Authentication-Results: sourceware.org; auth=none X-Virus-Found: No X-Spam-SWARE-Status: No, score=-1.4 required=5.0 tests=AWL, BAYES_00, FREEMAIL_FROM, KAM_STOCKGEN, RCVD_IN_DNSWL_LOW, SPF_PASS autolearn=no version=3.3.2 X-HELO: mail-oi0-f48.google.com Received: from mail-oi0-f48.google.com (HELO mail-oi0-f48.google.com) (209.85.218.48) by sourceware.org (qpsmtpd/0.93/v0.84-503-g423c35a) with (AES128-GCM-SHA256 encrypted) ESMTPS; Thu, 14 May 2015 15:32:33 +0000 Received: by oiko83 with SMTP id o83so58403985oik.1 for ; Thu, 14 May 2015 08:32:31 -0700 (PDT) MIME-Version: 1.0 X-Received: by 10.202.211.129 with SMTP id k123mr3751547oig.43.1431617551275; Thu, 14 May 2015 08:32:31 -0700 (PDT) Received: by 10.60.147.170 with HTTP; Thu, 14 May 2015 08:32:31 -0700 (PDT) In-Reply-To: <5553A084.6050106@redhat.com> References: <55537FE9.2060104@redhat.com> <5553A084.6050106@redhat.com> Date: Thu, 14 May 2015 17:32:31 +0200 Message-ID: Subject: Re: [PATCH, alpha]: Some further HWI == 64 improvements From: Uros Bizjak To: Richard Henderson Cc: "gcc-patches@gcc.gnu.org" On Wed, May 13, 2015 at 9:05 PM, Richard Henderson wrote: > On 05/13/2015 10:53 AM, Uros Bizjak wrote: >> The only part that actually processes CONST_WIDE_INT is >> alpha_legitimate_constant and movti expander. The latter immediately >> splits any TImode CONST_WIDE_INTs. >> > > Indeed. Also probably worth cleaning up is using CONST_SCALAR_INT_P, where > both CONST_INT and CONST_WIDE_INT are allowed. I will do this in the last patch, when all uses of CONST_WIDE_INT and CONST_DOUBLE are reviewed. For now, I have prepared following patch that cleans alpha_extract_integer and callers. Please also note that alpha_legitimate_constant_p now checks full 128 bit constant. 2015-05-14 Uros Bizjak * config/alpha/alpha.c (alpha_extract_integer): Do not handle CONST_WIDE_INT and CONST_DOUBLE. Assert CONST_INT_P (x). (alpha_legitimate_constant_p) : Check high and low part of the constant using alpha_emit_set_const_1. (alpha_expand_mov): Do not handle CONST_WIDE_INT and CONST_DOUBLE. The patch passes bootstrap on alphaev68-linux-gnu, regression test is in progress. OK if regtest passes? Uros. Index: config/alpha/alpha.c =================================================================== --- config/alpha/alpha.c (revision 223190) +++ config/alpha/alpha.c (working copy) @@ -2105,8 +2105,7 @@ alpha_emit_set_long_const (rtx target, HOST_WIDE_I return target; } -/* Given an integral CONST_INT, CONST_WIDE_INT, CONST_DOUBLE, - or CONST_VECTOR, return the low 64 bits. */ +/* Given an integral CONST_INT or CONST_VECTOR, return the low 64 bits. */ static HOST_WIDE_INT alpha_extract_integer (rtx x) @@ -2114,17 +2113,9 @@ alpha_extract_integer (rtx x) if (GET_CODE (x) == CONST_VECTOR) x = simplify_subreg (DImode, x, GET_MODE (x), 0); - switch (GET_CODE (x)) - { - case CONST_INT: - return INTVAL (x); - case CONST_WIDE_INT: - return CONST_WIDE_INT_ELT (x, 0); - case CONST_DOUBLE: - return CONST_DOUBLE_LOW (x); - default: - gcc_unreachable (); - } + gcc_assert (CONST_INT_P (x)); + + return INTVAL (x); } /* Implement TARGET_LEGITIMATE_CONSTANT_P. This is all constants for which @@ -2152,7 +2143,6 @@ alpha_legitimate_constant_p (machine_mode mode, rt if (GET_CODE (x) != SYMBOL_REF) return true; - /* FALLTHRU */ case SYMBOL_REF: @@ -2160,8 +2150,16 @@ alpha_legitimate_constant_p (machine_mode mode, rt return SYMBOL_REF_TLS_MODEL (x) == 0; case CONST_WIDE_INT: + if (TARGET_BUILD_CONSTANTS) + return true; if (x == CONST0_RTX (mode)) return true; + mode = DImode; + gcc_assert (CONST_WIDE_INT_NUNITS (x) == 2); + i0 = CONST_WIDE_INT_ELT (x, 1); + if (alpha_emit_set_const_1 (NULL_RTX, mode, i0, 3, true) == NULL) + return false; + i0 = CONST_WIDE_INT_ELT (x, 0); goto do_integer; case CONST_DOUBLE: @@ -2176,14 +2174,14 @@ alpha_legitimate_constant_p (machine_mode mode, rt return false; if (GET_MODE_SIZE (mode) != 8) return false; - goto do_integer; + /* FALLTHRU */ case CONST_INT: - do_integer: if (TARGET_BUILD_CONSTANTS) return true; i0 = alpha_extract_integer (x); - return alpha_emit_set_const_1 (x, mode, i0, 3, true) != NULL; + do_integer: + return alpha_emit_set_const_1 (NULL_RTX, mode, i0, 3, true) != NULL; default: return false; @@ -2248,8 +2246,6 @@ alpha_expand_mov (machine_mode mode, rtx *operands /* Split large integers. */ if (CONST_INT_P (operands[1]) - || GET_CODE (operands[1]) == CONST_WIDE_INT - || GET_CODE (operands[1]) == CONST_DOUBLE || GET_CODE (operands[1]) == CONST_VECTOR) { if (alpha_split_const_mov (mode, operands))