From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (qmail 90533 invoked by alias); 9 Dec 2016 13:12:43 -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 90512 invoked by uid 89); 9 Dec 2016 13:12:42 -0000 Authentication-Results: sourceware.org; auth=none X-Virus-Found: No X-Spam-SWARE-Status: No, score=-4.9 required=5.0 tests=BAYES_00,RP_MATCHES_RCVD,SPF_PASS autolearn=ham version=3.3.2 spammy=offset1, offset2, 12256, tear X-HELO: foss.arm.com Received: from foss.arm.com (HELO foss.arm.com) (217.140.101.70) by sourceware.org (qpsmtpd/0.93/v0.84-503-g423c35a) with ESMTP; Fri, 09 Dec 2016 13:12:32 +0000 Received: from usa-sjc-imap-foss1.foss.arm.com (unknown [10.72.51.249]) by usa-sjc-mx-foss1.foss.arm.com (Postfix) with ESMTP id E102EC14; Fri, 9 Dec 2016 05:12:30 -0800 (PST) Received: from localhost (e105548-lin.manchester.arm.com [10.45.32.67]) by usa-sjc-imap-foss1.foss.arm.com (Postfix) with ESMTPSA id 8CC143F477 for ; Fri, 9 Dec 2016 05:12:30 -0800 (PST) From: Richard Sandiford To: gcc-patches@gcc.gnu.org Mail-Followup-To: gcc-patches@gcc.gnu.org, richard.sandiford@arm.com Subject: [30/67] Use scalar_int_mode for doubleword splits References: <87h96dp8u6.fsf@e105548-lin.cambridge.arm.com> Date: Fri, 09 Dec 2016 13:12:00 -0000 In-Reply-To: <87h96dp8u6.fsf@e105548-lin.cambridge.arm.com> (Richard Sandiford's message of "Fri, 09 Dec 2016 12:48:01 +0000") Message-ID: <87vautjlfn.fsf@e105548-lin.cambridge.arm.com> User-Agent: Gnus/5.130012 (Ma Gnus v0.12) Emacs/24.3 (gnu/linux) MIME-Version: 1.0 Content-Type: text/plain X-SW-Source: 2016-12/txt/msg00802.txt.bz2 Add is_a tests to a couple of places that were splitting doubleword integer operations into word_mode operations. Also use scalar_int_mode in the expand_expr_real_2 handling of doubleword shifts. gcc/ 2016-11-24 Richard Sandiford Alan Hayward David Sherwood * expr.c (expand_expr_real_2): Use scalar_int_mode for the double-word mode. * lower-subreg.c (resolve_shift_zext): Use is_a . * optabs.c (expand_unop): Likewise. diff --git a/gcc/expr.c b/gcc/expr.c index 843c402..0d88e41 100644 --- a/gcc/expr.c +++ b/gcc/expr.c @@ -8197,6 +8197,7 @@ expand_expr_real_2 (sepops ops, rtx target, machine_mode tmode, tree type; int unsignedp; machine_mode mode; + scalar_int_mode int_mode; enum tree_code code = ops->code; optab this_optab; rtx subtarget, original_target; @@ -9102,8 +9103,8 @@ expand_expr_real_2 (sepops ops, rtx target, machine_mode tmode, && target && REG_P (target) && ! unsignedp - && mode == GET_MODE_WIDER_MODE (word_mode).else_void () - && GET_MODE_SIZE (mode) == 2 * GET_MODE_SIZE (word_mode) + && GET_MODE_2XWIDER_MODE (word_mode).exists (&int_mode) + && mode == int_mode && TREE_CONSTANT (treeop1) && TREE_CODE (treeop0) == SSA_NAME) { @@ -9114,18 +9115,18 @@ expand_expr_real_2 (sepops ops, rtx target, machine_mode tmode, machine_mode rmode = TYPE_MODE (TREE_TYPE (gimple_assign_rhs1 (def))); - if (GET_MODE_SIZE (rmode) < GET_MODE_SIZE (mode) + if (GET_MODE_SIZE (rmode) < GET_MODE_SIZE (int_mode) && TREE_INT_CST_LOW (treeop1) < GET_MODE_BITSIZE (word_mode) && ((TREE_INT_CST_LOW (treeop1) + GET_MODE_BITSIZE (rmode)) >= GET_MODE_BITSIZE (word_mode))) { rtx_insn *seq, *seq_old; unsigned int high_off = subreg_highpart_offset (word_mode, - mode); - rtx low = lowpart_subreg (word_mode, op0, mode); - rtx dest_low = lowpart_subreg (word_mode, target, mode); + int_mode); + rtx low = lowpart_subreg (word_mode, op0, int_mode); + rtx dest_low = lowpart_subreg (word_mode, target, int_mode); rtx dest_high = simplify_gen_subreg (word_mode, target, - mode, high_off); + int_mode, high_off); HOST_WIDE_INT ramount = (BITS_PER_WORD - TREE_INT_CST_LOW (treeop1)); tree rshift = build_int_cst (TREE_TYPE (treeop1), ramount); @@ -9147,12 +9148,13 @@ expand_expr_real_2 (sepops ops, rtx target, machine_mode tmode, end_sequence (); temp = target ; - if (have_insn_for (ASHIFT, mode)) + if (have_insn_for (ASHIFT, int_mode)) { bool speed_p = optimize_insn_for_speed_p (); start_sequence (); - rtx ret_old = expand_variable_shift (code, mode, op0, - treeop1, target, + rtx ret_old = expand_variable_shift (code, int_mode, + op0, treeop1, + target, unsignedp); seq_old = get_insns (); diff --git a/gcc/lower-subreg.c b/gcc/lower-subreg.c index 520eed1..f82bb87 100644 --- a/gcc/lower-subreg.c +++ b/gcc/lower-subreg.c @@ -1225,6 +1225,7 @@ resolve_shift_zext (rtx_insn *insn) rtx_insn *insns; rtx src_reg, dest_reg, dest_upper, upper_src = NULL_RTX; int src_reg_num, dest_reg_num, offset1, offset2, src_offset; + scalar_int_mode inner_mode; set = single_set (insn); if (!set) @@ -1238,6 +1239,8 @@ resolve_shift_zext (rtx_insn *insn) return NULL; op_operand = XEXP (op, 0); + if (!is_a (GET_MODE (op_operand), &inner_mode)) + return NULL; /* We can tear this operation apart only if the regs were already torn apart. */ @@ -1250,8 +1253,7 @@ resolve_shift_zext (rtx_insn *insn) src_reg_num = (GET_CODE (op) == LSHIFTRT || GET_CODE (op) == ASHIFTRT) ? 1 : 0; - if (WORDS_BIG_ENDIAN - && GET_MODE_SIZE (GET_MODE (op_operand)) > UNITS_PER_WORD) + if (WORDS_BIG_ENDIAN && GET_MODE_SIZE (inner_mode) > UNITS_PER_WORD) src_reg_num = 1 - src_reg_num; if (GET_CODE (op) == ZERO_EXTEND) diff --git a/gcc/optabs.c b/gcc/optabs.c index acf89bd..77ca419 100644 --- a/gcc/optabs.c +++ b/gcc/optabs.c @@ -2735,22 +2735,24 @@ expand_unop (machine_mode mode, optab unoptab, rtx op0, rtx target, } if (unoptab == popcount_optab - && GET_MODE_SIZE (mode) == 2 * UNITS_PER_WORD + && is_a (mode, &int_mode) + && GET_MODE_SIZE (int_mode) == 2 * UNITS_PER_WORD && optab_handler (unoptab, word_mode) != CODE_FOR_nothing && optimize_insn_for_speed_p ()) { - temp = expand_doubleword_popcount (mode, op0, target); + temp = expand_doubleword_popcount (int_mode, op0, target); if (temp) return temp; } if (unoptab == parity_optab - && GET_MODE_SIZE (mode) == 2 * UNITS_PER_WORD + && is_a (mode, &int_mode) + && GET_MODE_SIZE (int_mode) == 2 * UNITS_PER_WORD && (optab_handler (unoptab, word_mode) != CODE_FOR_nothing || optab_handler (popcount_optab, word_mode) != CODE_FOR_nothing) && optimize_insn_for_speed_p ()) { - temp = expand_doubleword_parity (mode, op0, target); + temp = expand_doubleword_parity (int_mode, op0, target); if (temp) return temp; }