diff mbox series

arm: Remove add_stmt_cost hook

Message ID mptzgrbeuwd.fsf@arm.com
State Committed
Commit 1975395021e34088865e6566e281622a218be70e
Headers show
Series arm: Remove add_stmt_cost hook | expand

Commit Message

Richard Sandiford Oct. 14, 2021, 10:57 a.m. UTC
The arm implementation of add_stmt_cost was added alongside
arm_builtin_vectorization_cost.  At that time it was necessary
to override the latter when overriding the former, since
default_add_stmt_cost didn't indirect through the
builtin_vectorization_cost target hook:

      int stmt_cost = default_builtin_vectorization_cost (kind, vectype,
                                                          misalign);

That was fixed by:

2014-06-06  Bingfeng Mei  <bmei@broadcom.com>

       * targhooks.c (default_add_stmt_cost): Call target specific
       hook instead of default one.

so the arm definition of add_stmt_cost is now equivalent
to the default.

Bootrapped & regression-tested on arm-linux-gnueabihf.  OK to install?

Richard


gcc/
	* config/arm/arm.c (arm_add_stmt_cost): Delete.
	(TARGET_VECTORIZE_ADD_STMT_COST): Delete.
---
 gcc/config/arm/arm.c | 40 ----------------------------------------
 1 file changed, 40 deletions(-)

Comments

Kyrylo Tkachov Oct. 14, 2021, 1:58 p.m. UTC | #1
> -----Original Message-----
> From: Richard Sandiford <richard.sandiford@arm.com>
> Sent: Thursday, October 14, 2021 11:57 AM
> To: gcc-patches@gcc.gnu.org
> Cc: nickc@redhat.com; Richard Earnshaw <Richard.Earnshaw@arm.com>;
> Ramana Radhakrishnan <Ramana.Radhakrishnan@arm.com>; Kyrylo
> Tkachov <Kyrylo.Tkachov@arm.com>
> Subject: [PATCH] arm: Remove add_stmt_cost hook
> 
> The arm implementation of add_stmt_cost was added alongside
> arm_builtin_vectorization_cost.  At that time it was necessary
> to override the latter when overriding the former, since
> default_add_stmt_cost didn't indirect through the
> builtin_vectorization_cost target hook:
> 
>       int stmt_cost = default_builtin_vectorization_cost (kind, vectype,
>                                                           misalign);
> 
> That was fixed by:
> 
> 2014-06-06  Bingfeng Mei  <bmei@broadcom.com>
> 
>        * targhooks.c (default_add_stmt_cost): Call target specific
>        hook instead of default one.
> 
> so the arm definition of add_stmt_cost is now equivalent
> to the default.
> 
> Bootrapped & regression-tested on arm-linux-gnueabihf.  OK to install?
> 

Ok.
Thanks,
Kyrill

> Richard
> 
> 
> gcc/
> 	* config/arm/arm.c (arm_add_stmt_cost): Delete.
> 	(TARGET_VECTORIZE_ADD_STMT_COST): Delete.
> ---
>  gcc/config/arm/arm.c | 40 ----------------------------------------
>  1 file changed, 40 deletions(-)
> 
> diff --git a/gcc/config/arm/arm.c b/gcc/config/arm/arm.c
> index d8c5d2bc7db..e51f60a1841 100644
> --- a/gcc/config/arm/arm.c
> +++ b/gcc/config/arm/arm.c
> @@ -304,11 +304,6 @@ static bool aarch_macro_fusion_pair_p (rtx_insn*,
> rtx_insn*);
>  static int arm_builtin_vectorization_cost (enum vect_cost_for_stmt
> type_of_cost,
>  					   tree vectype,
>  					   int misalign ATTRIBUTE_UNUSED);
> -static unsigned arm_add_stmt_cost (vec_info *vinfo, void *data, int count,
> -				   enum vect_cost_for_stmt kind,
> -				   struct _stmt_vec_info *stmt_info,
> -				   tree vectype, int misalign,
> -				   enum vect_cost_model_location where);
> 
>  static void arm_canonicalize_comparison (int *code, rtx *op0, rtx *op1,
>  					 bool op0_preserve_value);
> @@ -769,8 +764,6 @@ static const struct attribute_spec
> arm_attribute_table[] =
>  #undef TARGET_VECTORIZE_BUILTIN_VECTORIZATION_COST
>  #define TARGET_VECTORIZE_BUILTIN_VECTORIZATION_COST \
>    arm_builtin_vectorization_cost
> -#undef TARGET_VECTORIZE_ADD_STMT_COST
> -#define TARGET_VECTORIZE_ADD_STMT_COST arm_add_stmt_cost
> 
>  #undef TARGET_CANONICALIZE_COMPARISON
>  #define TARGET_CANONICALIZE_COMPARISON \
> @@ -12242,39 +12235,6 @@ arm_builtin_vectorization_cost (enum
> vect_cost_for_stmt type_of_cost,
>      }
>  }
> 
> -/* Implement targetm.vectorize.add_stmt_cost.  */
> -
> -static unsigned
> -arm_add_stmt_cost (vec_info *vinfo, void *data, int count,
> -		   enum vect_cost_for_stmt kind,
> -		   struct _stmt_vec_info *stmt_info, tree vectype,
> -		   int misalign, enum vect_cost_model_location where)
> -{
> -  unsigned *cost = (unsigned *) data;
> -  unsigned retval = 0;
> -
> -  if (flag_vect_cost_model)
> -    {
> -      int stmt_cost = arm_builtin_vectorization_cost (kind, vectype, misalign);
> -
> -      /* Statements in an inner loop relative to the loop being
> -	 vectorized are weighted more heavily.  The value here is
> -	 arbitrary and could potentially be improved with analysis.  */
> -      if (where == vect_body && stmt_info
> -	  && stmt_in_inner_loop_p (vinfo, stmt_info))
> -	{
> -	  loop_vec_info loop_vinfo = dyn_cast<loop_vec_info> (vinfo);
> -	  gcc_assert (loop_vinfo);
> -	  count *= LOOP_VINFO_INNER_LOOP_COST_FACTOR (loop_vinfo); /*
> FIXME.  */
> -	}
> -
> -      retval = (unsigned) (count * stmt_cost);
> -      cost[where] += retval;
> -    }
> -
> -  return retval;
> -}
> -
>  /* Return true if and only if this insn can dual-issue only as older.  */
>  static bool
>  cortexa7_older_only (rtx_insn *insn)
diff mbox series

Patch

diff --git a/gcc/config/arm/arm.c b/gcc/config/arm/arm.c
index d8c5d2bc7db..e51f60a1841 100644
--- a/gcc/config/arm/arm.c
+++ b/gcc/config/arm/arm.c
@@ -304,11 +304,6 @@  static bool aarch_macro_fusion_pair_p (rtx_insn*, rtx_insn*);
 static int arm_builtin_vectorization_cost (enum vect_cost_for_stmt type_of_cost,
 					   tree vectype,
 					   int misalign ATTRIBUTE_UNUSED);
-static unsigned arm_add_stmt_cost (vec_info *vinfo, void *data, int count,
-				   enum vect_cost_for_stmt kind,
-				   struct _stmt_vec_info *stmt_info,
-				   tree vectype, int misalign,
-				   enum vect_cost_model_location where);
 
 static void arm_canonicalize_comparison (int *code, rtx *op0, rtx *op1,
 					 bool op0_preserve_value);
@@ -769,8 +764,6 @@  static const struct attribute_spec arm_attribute_table[] =
 #undef TARGET_VECTORIZE_BUILTIN_VECTORIZATION_COST
 #define TARGET_VECTORIZE_BUILTIN_VECTORIZATION_COST \
   arm_builtin_vectorization_cost
-#undef TARGET_VECTORIZE_ADD_STMT_COST
-#define TARGET_VECTORIZE_ADD_STMT_COST arm_add_stmt_cost
 
 #undef TARGET_CANONICALIZE_COMPARISON
 #define TARGET_CANONICALIZE_COMPARISON \
@@ -12242,39 +12235,6 @@  arm_builtin_vectorization_cost (enum vect_cost_for_stmt type_of_cost,
     }
 }
 
-/* Implement targetm.vectorize.add_stmt_cost.  */
-
-static unsigned
-arm_add_stmt_cost (vec_info *vinfo, void *data, int count,
-		   enum vect_cost_for_stmt kind,
-		   struct _stmt_vec_info *stmt_info, tree vectype,
-		   int misalign, enum vect_cost_model_location where)
-{
-  unsigned *cost = (unsigned *) data;
-  unsigned retval = 0;
-
-  if (flag_vect_cost_model)
-    {
-      int stmt_cost = arm_builtin_vectorization_cost (kind, vectype, misalign);
-
-      /* Statements in an inner loop relative to the loop being
-	 vectorized are weighted more heavily.  The value here is
-	 arbitrary and could potentially be improved with analysis.  */
-      if (where == vect_body && stmt_info
-	  && stmt_in_inner_loop_p (vinfo, stmt_info))
-	{
-	  loop_vec_info loop_vinfo = dyn_cast<loop_vec_info> (vinfo);
-	  gcc_assert (loop_vinfo);
-	  count *= LOOP_VINFO_INNER_LOOP_COST_FACTOR (loop_vinfo); /* FIXME.  */
-	}
-
-      retval = (unsigned) (count * stmt_cost);
-      cost[where] += retval;
-    }
-
-  return retval;
-}
-
 /* Return true if and only if this insn can dual-issue only as older.  */
 static bool
 cortexa7_older_only (rtx_insn *insn)