[60/77] Pass scalar_int_modes to do_jump_by_parts_*

Message ID	87y3rsd859.fsf@linaro.org
State	Accepted
Commit	d787ba568aa9bfa00c71f55b86ddb95a3d153db0
Headers	show Delivered-To: patch@linaro.org Received-SPF: pass (google.com: domain of gcc-patches-return-458051-patch=linaro.org@gcc.gnu.org designates 209.132.180.131 as permitted sender) client-ip=209.132.180.131; DomainKey-Signature: a=rsa-sha1; c=nofws; d=gcc.gnu.org; h=list-id :list-unsubscribe:list-archive:list-post:list-help:sender:from :to:subject:references:date:in-reply-to:message-id:mime-version :content-type; q=dns; s=default; b=H8dzyPuRt85fZuAiM9TqY3U65TvBD hJb8Ip6fbrDqTafdh0KzqhbzXv2hNClFzyf6dEPGszFDi2u+jwyl/c6LabIXBnXa z4uMe3shtPQAUpmqZD174nCeu+Hka1TqBqES1IZOQa1q2vF+EmQhk+tbbEFjrSjY NGUdCA2Nfbr7Xw= Mailing-List: contact gcc-patches-help@gcc.gnu.org; run by ezmlm Precedence: bulk Sender: gcc-patches-owner@gcc.gnu.org From: Richard Sandiford <richard.sandiford@linaro.org> To: gcc-patches@gcc.gnu.org Mail-Followup-To: gcc-patches@gcc.gnu.org, richard.sandiford@linaro.org Subject: [60/77] Pass scalar_int_modes to do_jump_by_parts_* References: <8760ewohsv.fsf@linaro.org> Date: Thu, 13 Jul 2017 09:59:46 +0100 In-Reply-To: <8760ewohsv.fsf@linaro.org> (Richard Sandiford's message of "Thu, 13 Jul 2017 09:35:44 +0100") Message-ID: <87y3rsd859.fsf@linaro.org> User-Agent: Gnus/5.13 (Gnus v5.13) Emacs/25.2 (gnu/linux) MIME-Version: 1.0 Content-Type: text/plain
Series	Add wrapper classes for machine_modes \| expand [00/77] Add wrapper classes for machine_modes [01/77] Add an E_ prefix to mode names [03/77] Allow machine modes to be classes [04/77] Add FOR_EACH iterators for modes [05/77] Small tweak to array_value_type [06/77] Make GET_MODE_WIDER return an opt_mode [07/77] Add scalar_float_mode [08/77] Simplify gen_trunc/extend_conv_libfunc [09/77] Add SCALAR_FLOAT_TYPE_MODE [10/77] Make assemble_real take a scalar_float_mode [11/77] Add a float_mode_for_size helper function [12/77] Use opt_scalar_float_mode when iterating over float modes [13/77] Make floatn_mode return an opt_scalar_float_mode [14/77] Make libgcc_floating_mode_supported_p take a scalar_float_mode [15/77] Add scalar_int_mode [16/77] Add scalar_int_mode_pod [17/77] Add an int_mode_for_size helper function [18/77] Make int_mode_for_mode return an opt_scalar_int_mode [19/77] Add a smallest_int_mode_for_size helper function [20/77] Replace MODE_INT checks with is_int_mode [21/77] Replace SCALAR_INT_MODE_P checks with is_a <scalar_int_mode> [22/77] Replace !VECTOR_MODE_P with is_a <scalar_int_mode> [23/77] Replace != VOIDmode checks with is_a <scalar_int_mode> [24/77] Replace a != BLKmode check with is_a <scalar_int_mode> [25/77] Use is_a <scalar_int_mode> for bitmask optimisations [26/77] Use is_a <scalar_int_mode> in subreg/extract simplifications [27/77] Use is_a <scalar_int_mode> before LOAD_EXTEND_OP [28/77] Use is_a <scalar_int_mode> for miscellaneous types of test [29/77] Make some _loc_descriptor helpers take scalar_int_mode [30/77] Use scalar_int_mode for doubleword splits [31/77] Use scalar_int_mode for move2add [32/77] Check is_a <scalar_int_mode> before calling valid_pointer_mode [33/77] Add a NARROWEST_INT_MODE macro [34/77] Add a SCALAR_INT_TYPE_MODE macro [35/77] Add uses of as_a <scalar_int_mode> [36/77] Use scalar_int_mode in the RTL iv routines [37/77] Use scalar_int_mode when emitting cstores [38/77] Move SCALAR_INT_MODE_P out of strict_volatile_bitfield_p [39/77] Two changes to the get_best_mode interface [40/77] Use scalar_int_mode for extraction_insn fields [41/77] Split scalar integer handling out of force_to_mode [42/77] Use scalar_int_mode in simplify_shift_const_1 [43/77] Use scalar_int_mode in simplify_comparison [44/77] Make simplify_and_const_int take a scalar_int_mode [45/77] Make extract_left_shift take a scalar_int_mode [46/77] Make widest_int_mode_for_size return a scalar_int_mode [47/77] Make subroutines of nonzero_bits operate on scalar_int_mode [48/77] Make subroutines of num_sign_bit_copies operate on scalar_int_mode [49/77] Simplify nonzero/num_sign_bits hooks [50/77] Add helper routines for SUBREG_PROMOTED_VAR_P subregs [51/77] Use opt_scalar_int_mode when iterating over integer modes [52/77] Use scalar_int_mode in extract/store_bit_field [53/77] Pass a mode to const_scalar_mask_from_tree [54/77] Add explicit int checks for alternative optab implementations [55/77] Use scalar_int_mode in simplify_const_unary_operation [56/77] Use the more specific type when two modes are known to be equal [57/77] Use scalar_int_mode in expand_expr_addr_expr [58/77] Use scalar_int_mode in a try_combine optimisation [59/77] Add a rtx_jump_table_data::get_data_mode helper [60/77] Pass scalar_int_modes to do_jump_by_parts_ [61/77] Use scalar_int_mode in the AArch64 port [63/77] Simplifications after type switch [64/77] Add a scalar_mode class [65/77] Add a SCALAR_TYPE_MODE macro [66/77] Use scalar_mode for constant integers [67/77] Use scalar_mode in fixed-value.* [68/77] Use scalar_mode for is_int_mode/is_float_mode pairs [69/77] Split scalar-only part out of convert_mode [70/77] Make expand_fix/float check for scalar modes [71/77] Use opt_scalar_mode for mode iterators [72/77] Pass scalar_mode to scalar_mode_supported_p [73/77] Pass scalar_mode to scalar_mode_supported_p [74/77] Various small scalar_mode changes [75/77] Use scalar_mode in the AArch64 port [76/77] Add a scalar_mode_pod class [77/77] Add a complex_mode class

Message ID

87y3rsd859.fsf@linaro.org

State

Accepted

Commit

d787ba568aa9bfa00c71f55b86ddb95a3d153db0

Headers

Received-SPF: pass (google.com: domain of
	gcc-patches-return-458051-patch=linaro.org@gcc.gnu.org
	designates 209.132.180.131 as permitted sender)
	client-ip=209.132.180.131; 
DomainKey-Signature: a=rsa-sha1; c=nofws; d=gcc.gnu.org; h=list-id
	:list-unsubscribe:list-archive:list-post:list-help:sender:from
	:to:subject:references:date:in-reply-to:message-id:mime-version
	:content-type; q=dns; s=default; b=H8dzyPuRt85fZuAiM9TqY3U65TvBD
	hJb8Ip6fbrDqTafdh0KzqhbzXv2hNClFzyf6dEPGszFDi2u+jwyl/c6LabIXBnXa
	z4uMe3shtPQAUpmqZD174nCeu+Hka1TqBqES1IZOQa1q2vF+EmQhk+tbbEFjrSjY
	NGUdCA2Nfbr7Xw=
Mailing-List: contact gcc-patches-help@gcc.gnu.org; run by ezmlm
Precedence: bulk
Sender: gcc-patches-owner@gcc.gnu.org
From: Richard Sandiford <richard.sandiford@linaro.org>
To: gcc-patches@gcc.gnu.org
Mail-Followup-To: gcc-patches@gcc.gnu.org, richard.sandiford@linaro.org
Subject: [60/77] Pass scalar_int_modes to do_jump_by_parts_*
References: <8760ewohsv.fsf@linaro.org>
Date: Thu, 13 Jul 2017 09:59:46 +0100
In-Reply-To: <8760ewohsv.fsf@linaro.org> (Richard Sandiford's message of
	"Thu, 13 Jul 2017 09:35:44 +0100")
Message-ID: <87y3rsd859.fsf@linaro.org>
User-Agent: Gnus/5.13 (Gnus v5.13) Emacs/25.2 (gnu/linux)
MIME-Version: 1.0
Content-Type: text/plain

Series

Add wrapper classes for machine_modes | expand

Commit Message

Richard Sandiford July 13, 2017, 8:59 a.m. UTC

The callers of do_jump_by_parts_* had already established
that the modes were MODE_INTs, so this patch passes the
modes down as scalar_int_modes.

2017-07-13  Richard Sandiford  <richard.sandiford@linaro.org>
	    Alan Hayward  <alan.hayward@arm.com>
	    David Sherwood  <david.sherwood@arm.com>

gcc/
	* dojump.c (do_jump_by_parts_greater_rtx): Change the type of
	the mode argument to scalar_int_mode.
	(do_jump_by_parts_zero_rtx): Likewise.
	(do_jump_by_parts_equality_rtx): Likewise.
	(do_jump_by_parts_greater): Take a mode argument.
	(do_jump_by_parts_equality): Likewise.
	(do_jump_1): Update calls accordingly.

Comments

Jeff Law Aug. 24, 2017, 9:35 p.m. UTC | #1

On 07/13/2017 02:59 AM, Richard Sandiford wrote:
> The callers of do_jump_by_parts_* had already established

> that the modes were MODE_INTs, so this patch passes the

> modes down as scalar_int_modes.

> 

> 2017-07-13  Richard Sandiford  <richard.sandiford@linaro.org>

> 	    Alan Hayward  <alan.hayward@arm.com>

> 	    David Sherwood  <david.sherwood@arm.com>

> 

> gcc/

> 	* dojump.c (do_jump_by_parts_greater_rtx): Change the type of

> 	the mode argument to scalar_int_mode.

> 	(do_jump_by_parts_zero_rtx): Likewise.

> 	(do_jump_by_parts_equality_rtx): Likewise.

> 	(do_jump_by_parts_greater): Take a mode argument.

> 	(do_jump_by_parts_equality): Likewise.

> 	(do_jump_1): Update calls accordingly.

OK.
jeff

Index: gcc/dojump.c
===================================================================
--- gcc/dojump.c	2017-07-13 09:18:38.657812970 +0100
+++ gcc/dojump.c	2017-07-13 09:18:50.326871958 +0100
@@ -38,11 +38,12 @@  Software Foundation; either version 3, o
 #include "langhooks.h"
 
 static bool prefer_and_bit_test (machine_mode, int);
-static void do_jump_by_parts_greater (tree, tree, int,
+static void do_jump_by_parts_greater (scalar_int_mode, tree, tree, int,
 				      rtx_code_label *, rtx_code_label *,
 				      profile_probability);
-static void do_jump_by_parts_equality (tree, tree, rtx_code_label *,
-				       rtx_code_label *, profile_probability);
+static void do_jump_by_parts_equality (scalar_int_mode, tree, tree,
+				       rtx_code_label *, rtx_code_label *,
+				       profile_probability);
 static void do_compare_and_jump	(tree, tree, enum rtx_code, enum rtx_code,
 				 rtx_code_label *, rtx_code_label *,
 				 profile_probability);
@@ -221,8 +222,8 @@  do_jump_1 (enum tree_code code, tree op0
 		   prob.invert ());
 	else if (is_int_mode (TYPE_MODE (inner_type), &int_mode)
 		 && !can_compare_p (EQ, int_mode, ccp_jump))
-	  do_jump_by_parts_equality (op0, op1, if_false_label, if_true_label,
-				     prob);
+	  do_jump_by_parts_equality (int_mode, op0, op1, if_false_label,
+				     if_true_label, prob);
         else
 	  do_compare_and_jump (op0, op1, EQ, EQ, if_false_label, if_true_label,
 			       prob);
@@ -242,8 +243,8 @@  do_jump_1 (enum tree_code code, tree op0
 	  do_jump (op0, if_false_label, if_true_label, prob);
 	else if (is_int_mode (TYPE_MODE (inner_type), &int_mode)
 		 && !can_compare_p (NE, int_mode, ccp_jump))
-	  do_jump_by_parts_equality (op0, op1, if_true_label, if_false_label,
-				     prob.invert ());
+	  do_jump_by_parts_equality (int_mode, op0, op1, if_true_label,
+				     if_false_label, prob.invert ());
         else
 	  do_compare_and_jump (op0, op1, NE, NE, if_false_label, if_true_label,
 			       prob);
@@ -254,7 +255,7 @@  do_jump_1 (enum tree_code code, tree op0
       mode = TYPE_MODE (TREE_TYPE (op0));
       if (is_int_mode (mode, &int_mode)
 	  && ! can_compare_p (LT, int_mode, ccp_jump))
-	do_jump_by_parts_greater (op0, op1, 1, if_false_label,
+	do_jump_by_parts_greater (int_mode, op0, op1, 1, if_false_label,
 				  if_true_label, prob);
       else
 	do_compare_and_jump (op0, op1, LT, LTU, if_false_label, if_true_label,
@@ -265,8 +266,8 @@  do_jump_1 (enum tree_code code, tree op0
       mode = TYPE_MODE (TREE_TYPE (op0));
       if (is_int_mode (mode, &int_mode)
 	  && ! can_compare_p (LE, int_mode, ccp_jump))
-	do_jump_by_parts_greater (op0, op1, 0, if_true_label, if_false_label,
-				  prob.invert ());
+	do_jump_by_parts_greater (int_mode, op0, op1, 0, if_true_label,
+				  if_false_label, prob.invert ());
       else
 	do_compare_and_jump (op0, op1, LE, LEU, if_false_label, if_true_label,
 			     prob);
@@ -276,7 +277,7 @@  do_jump_1 (enum tree_code code, tree op0
       mode = TYPE_MODE (TREE_TYPE (op0));
       if (is_int_mode (mode, &int_mode)
 	  && ! can_compare_p (GT, int_mode, ccp_jump))
-	do_jump_by_parts_greater (op0, op1, 0, if_false_label,
+	do_jump_by_parts_greater (int_mode, op0, op1, 0, if_false_label,
 				  if_true_label, prob);
       else
 	do_compare_and_jump (op0, op1, GT, GTU, if_false_label, if_true_label,
@@ -287,8 +288,8 @@  do_jump_1 (enum tree_code code, tree op0
       mode = TYPE_MODE (TREE_TYPE (op0));
       if (is_int_mode (mode, &int_mode)
 	  && ! can_compare_p (GE, int_mode, ccp_jump))
-	do_jump_by_parts_greater (op0, op1, 1, if_true_label, if_false_label,
-				  prob.invert ());
+	do_jump_by_parts_greater (int_mode, op0, op1, 1, if_true_label,
+				  if_false_label, prob.invert ());
       else
 	do_compare_and_jump (op0, op1, GE, GEU, if_false_label, if_true_label,
 			     prob);
@@ -667,7 +668,7 @@  do_jump (tree exp, rtx_code_label *if_fa
    Jump to IF_TRUE_LABEL if OP0 is greater, IF_FALSE_LABEL otherwise.  */
 
 static void
-do_jump_by_parts_greater_rtx (machine_mode mode, int unsignedp, rtx op0,
+do_jump_by_parts_greater_rtx (scalar_int_mode mode, int unsignedp, rtx op0,
 			      rtx op1, rtx_code_label *if_false_label,
 			      rtx_code_label *if_true_label,
 			      profile_probability prob)
@@ -743,17 +744,16 @@  do_jump_by_parts_greater_rtx (machine_mo
 /* Given a comparison expression EXP for values too wide to be compared
    with one insn, test the comparison and jump to the appropriate label.
    The code of EXP is ignored; we always test GT if SWAP is 0,
-   and LT if SWAP is 1.  */
+   and LT if SWAP is 1.  MODE is the mode of the two operands.  */
 
 static void
-do_jump_by_parts_greater (tree treeop0, tree treeop1, int swap,
-			  rtx_code_label *if_false_label,
+do_jump_by_parts_greater (scalar_int_mode mode, tree treeop0, tree treeop1,
+			  int swap, rtx_code_label *if_false_label,
 			  rtx_code_label *if_true_label,
 			  profile_probability prob)
 {
   rtx op0 = expand_normal (swap ? treeop1 : treeop0);
   rtx op1 = expand_normal (swap ? treeop0 : treeop1);
-  machine_mode mode = TYPE_MODE (TREE_TYPE (treeop0));
   int unsignedp = TYPE_UNSIGNED (TREE_TYPE (treeop0));
 
   do_jump_by_parts_greater_rtx (mode, unsignedp, op0, op1, if_false_label,
@@ -766,7 +766,7 @@  do_jump_by_parts_greater (tree treeop0,
    to indicate drop through.  */
 
 static void
-do_jump_by_parts_zero_rtx (machine_mode mode, rtx op0,
+do_jump_by_parts_zero_rtx (scalar_int_mode mode, rtx op0,
 			   rtx_code_label *if_false_label,
 			   rtx_code_label *if_true_label,
 			   profile_probability prob)
@@ -817,7 +817,7 @@  do_jump_by_parts_zero_rtx (machine_mode
    to indicate drop through.  */
 
 static void
-do_jump_by_parts_equality_rtx (machine_mode mode, rtx op0, rtx op1,
+do_jump_by_parts_equality_rtx (scalar_int_mode mode, rtx op0, rtx op1,
 			       rtx_code_label *if_false_label,
 			       rtx_code_label *if_true_label,
 			       profile_probability prob)
@@ -855,17 +855,17 @@  do_jump_by_parts_equality_rtx (machine_m
 }
 
 /* Given an EQ_EXPR expression EXP for values too wide to be compared
-   with one insn, test the comparison and jump to the appropriate label.  */
+   with one insn, test the comparison and jump to the appropriate label.
+   MODE is the mode of the two operands.  */
 
 static void
-do_jump_by_parts_equality (tree treeop0, tree treeop1,
+do_jump_by_parts_equality (scalar_int_mode mode, tree treeop0, tree treeop1,
 			   rtx_code_label *if_false_label,
 			   rtx_code_label *if_true_label,
 			   profile_probability prob)
 {
   rtx op0 = expand_normal (treeop0);
   rtx op1 = expand_normal (treeop1);
-  machine_mode mode = TYPE_MODE (TREE_TYPE (treeop0));
   do_jump_by_parts_equality_rtx (mode, op0, op1, if_false_label,
 				 if_true_label, prob);
 }

[60/77] Pass scalar_int_modes to do_jump_by_parts_*

Commit Message

Comments

Patch