[01/26] arm: [MVE intrinsics] add binary_widen_opt_n shape

Message ID 20230512093855.79529-1-christophe.lyon@arm.com
State Accepted
Headers
Series [01/26] arm: [MVE intrinsics] add binary_widen_opt_n shape |

Checks

Context Check Description
snail/gcc-patch-check success Github commit url

Commit Message

Christophe Lyon May 12, 2023, 9:38 a.m. UTC
  This patch adds the binary_widen_opt_n shape description.

2022-12-12  Christophe Lyon  <christophe.lyon@arm.com>

	gcc/
	* config/arm/arm-mve-builtins-shapes.cc (binary_widen_opt_n): New.
	* config/arm/arm-mve-builtins-shapes.h (binary_widen_opt_n): New.
---
 gcc/config/arm/arm-mve-builtins-shapes.cc | 49 +++++++++++++++++++++++
 gcc/config/arm/arm-mve-builtins-shapes.h  |  1 +
 2 files changed, 50 insertions(+)
  

Comments

Kyrylo Tkachov May 12, 2023, 10:17 a.m. UTC | #1
> -----Original Message-----
> From: Christophe Lyon <christophe.lyon@arm.com>
> Sent: Friday, May 12, 2023 10:39 AM
> To: gcc-patches@gcc.gnu.org; Kyrylo Tkachov <Kyrylo.Tkachov@arm.com>;
> Richard Earnshaw <Richard.Earnshaw@arm.com>; Richard Sandiford
> <Richard.Sandiford@arm.com>
> Cc: Christophe Lyon <Christophe.Lyon@arm.com>
> Subject: [PATCH 01/26] arm: [MVE intrinsics] add binary_widen_opt_n shape
> 
> This patch adds the binary_widen_opt_n shape description.

This series is ok with one style nit fixed in this first patch...

> 
> 2022-12-12  Christophe Lyon  <christophe.lyon@arm.com>
> 
> 	gcc/
> 	* config/arm/arm-mve-builtins-shapes.cc (binary_widen_opt_n):
> New.
> 	* config/arm/arm-mve-builtins-shapes.h (binary_widen_opt_n): New.
> ---
>  gcc/config/arm/arm-mve-builtins-shapes.cc | 49 +++++++++++++++++++++++
>  gcc/config/arm/arm-mve-builtins-shapes.h  |  1 +
>  2 files changed, 50 insertions(+)
> 
> diff --git a/gcc/config/arm/arm-mve-builtins-shapes.cc b/gcc/config/arm/arm-
> mve-builtins-shapes.cc
> index 5a299a272f5..ee4bc3f8ea4 100644
> --- a/gcc/config/arm/arm-mve-builtins-shapes.cc
> +++ b/gcc/config/arm/arm-mve-builtins-shapes.cc
> @@ -1098,6 +1098,55 @@ struct binary_widen_n_def : public
> overloaded_base<0>
>  };
>  SHAPE (binary_widen_n)
> 
> +/* <T0:twice>_t vfoo[_t0](<T0>_t, <T0>_t)
> +   <T0:twice>_t vfoo[_n_t0](<T0>_t, <S0>_t)
> +
> +   Example: vqdmullbq.
> +   int32x4_t [__arm_]vqdmulltq[_n_s16](int16x8_t a, int16_t b)
> +   int32x4_t [__arm_]vqdmulltq_m[_n_s16](int32x4_t inactive, int16x8_t a,
> int16_t b, mve_pred16_t p)
> +   int32x4_t [__arm_]vqdmulltq[_s16](int16x8_t a, int16x8_t b)
> +   int32x4_t [__arm_]vqdmulltq_m[_s16](int32x4_t inactive, int16x8_t a,
> int16x8_t b, mve_pred16_t p)  */
> +struct binary_widen_opt_n_def : public overloaded_base<0>
> +{
> +  void
> +  build (function_builder &b, const function_group_info &group,
> +	 bool preserve_user_namespace) const override
> +  {
> +    b.add_overloaded_functions (group, MODE_none,
> preserve_user_namespace);
> +    build_all (b, "vw0,v0,v0", group, MODE_none,
> preserve_user_namespace);
> +    build_all (b, "vw0,v0,s0", group, MODE_n, preserve_user_namespace);
> +  }
> +
> +  tree
> +  resolve (function_resolver &r) const override
> +  {
> +    unsigned int i, nargs;
> +    type_suffix_index type;
> +    if (!r.check_gp_argument (2, i, nargs)
> +	|| (type = r.infer_vector_type (i - 1)) == NUM_TYPE_SUFFIXES)
> +      return error_mark_node;
> +
> +    type_suffix_index wide_suffix
> +      = find_type_suffix (type_suffixes[type].tclass,
> +			  type_suffixes[type].element_bits * 2);
> +
> +    /* Skip last argument, may be scalar, will be checked below by
> +       finish_opt_n_resolution.  */
> +    unsigned int last_arg = i--;
> +    for (; i > 0; i--)
> +      if (!r.require_matching_vector_type (i, type))
> +	return error_mark_node;
> +
> +    /* Check the inactive argument has the wide type.  */
> +    if ((r.pred == PRED_m)
> +	&& (r.infer_vector_type (0) != wide_suffix))
> +    return r.report_no_such_form (type);

Indentation is off here I think.
Thanks,
Kyrill

> +
> +    return r.finish_opt_n_resolution (last_arg, 0, type);
> +  }
> +};
> +SHAPE (binary_widen_opt_n)
> +
>  /* Shape for comparison operations that operate on
>     uniform types.
> 
> diff --git a/gcc/config/arm/arm-mve-builtins-shapes.h b/gcc/config/arm/arm-
> mve-builtins-shapes.h
> index a28cd6a1547..07b12b4af68 100644
> --- a/gcc/config/arm/arm-mve-builtins-shapes.h
> +++ b/gcc/config/arm/arm-mve-builtins-shapes.h
> @@ -53,6 +53,7 @@ namespace arm_mve
>      extern const function_shape *const binary_rshift_narrow;
>      extern const function_shape *const binary_rshift_narrow_unsigned;
>      extern const function_shape *const binary_widen_n;
> +    extern const function_shape *const binary_widen_opt_n;
>      extern const function_shape *const cmp;
>      extern const function_shape *const create;
>      extern const function_shape *const inherent;
> --
> 2.34.1
  
Christophe Lyon May 12, 2023, 10:38 a.m. UTC | #2
On 5/12/23 12:17, Kyrylo Tkachov wrote:
> 
> 
>> -----Original Message-----
>> From: Christophe Lyon <christophe.lyon@arm.com>
>> Sent: Friday, May 12, 2023 10:39 AM
>> To: gcc-patches@gcc.gnu.org; Kyrylo Tkachov <Kyrylo.Tkachov@arm.com>;
>> Richard Earnshaw <Richard.Earnshaw@arm.com>; Richard Sandiford
>> <Richard.Sandiford@arm.com>
>> Cc: Christophe Lyon <Christophe.Lyon@arm.com>
>> Subject: [PATCH 01/26] arm: [MVE intrinsics] add binary_widen_opt_n shape
>>
>> This patch adds the binary_widen_opt_n shape description.
> 
> This series is ok with one style nit fixed in this first patch...
> 
>>
>> 2022-12-12  Christophe Lyon  <christophe.lyon@arm.com>
>>
>> 	gcc/
>> 	* config/arm/arm-mve-builtins-shapes.cc (binary_widen_opt_n):
>> New.
>> 	* config/arm/arm-mve-builtins-shapes.h (binary_widen_opt_n): New.
>> ---
>>   gcc/config/arm/arm-mve-builtins-shapes.cc | 49 +++++++++++++++++++++++
>>   gcc/config/arm/arm-mve-builtins-shapes.h  |  1 +
>>   2 files changed, 50 insertions(+)
>>
>> diff --git a/gcc/config/arm/arm-mve-builtins-shapes.cc b/gcc/config/arm/arm-
>> mve-builtins-shapes.cc
>> index 5a299a272f5..ee4bc3f8ea4 100644
>> --- a/gcc/config/arm/arm-mve-builtins-shapes.cc
>> +++ b/gcc/config/arm/arm-mve-builtins-shapes.cc
>> @@ -1098,6 +1098,55 @@ struct binary_widen_n_def : public
>> overloaded_base<0>
>>   };
>>   SHAPE (binary_widen_n)
>>
>> +/* <T0:twice>_t vfoo[_t0](<T0>_t, <T0>_t)
>> +   <T0:twice>_t vfoo[_n_t0](<T0>_t, <S0>_t)
>> +
>> +   Example: vqdmullbq.
>> +   int32x4_t [__arm_]vqdmulltq[_n_s16](int16x8_t a, int16_t b)
>> +   int32x4_t [__arm_]vqdmulltq_m[_n_s16](int32x4_t inactive, int16x8_t a,
>> int16_t b, mve_pred16_t p)
>> +   int32x4_t [__arm_]vqdmulltq[_s16](int16x8_t a, int16x8_t b)
>> +   int32x4_t [__arm_]vqdmulltq_m[_s16](int32x4_t inactive, int16x8_t a,
>> int16x8_t b, mve_pred16_t p)  */
>> +struct binary_widen_opt_n_def : public overloaded_base<0>
>> +{
>> +  void
>> +  build (function_builder &b, const function_group_info &group,
>> +	 bool preserve_user_namespace) const override
>> +  {
>> +    b.add_overloaded_functions (group, MODE_none,
>> preserve_user_namespace);
>> +    build_all (b, "vw0,v0,v0", group, MODE_none,
>> preserve_user_namespace);
>> +    build_all (b, "vw0,v0,s0", group, MODE_n, preserve_user_namespace);
>> +  }
>> +
>> +  tree
>> +  resolve (function_resolver &r) const override
>> +  {
>> +    unsigned int i, nargs;
>> +    type_suffix_index type;
>> +    if (!r.check_gp_argument (2, i, nargs)
>> +	|| (type = r.infer_vector_type (i - 1)) == NUM_TYPE_SUFFIXES)
>> +      return error_mark_node;
>> +
>> +    type_suffix_index wide_suffix
>> +      = find_type_suffix (type_suffixes[type].tclass,
>> +			  type_suffixes[type].element_bits * 2);
>> +
>> +    /* Skip last argument, may be scalar, will be checked below by
>> +       finish_opt_n_resolution.  */
>> +    unsigned int last_arg = i--;
>> +    for (; i > 0; i--)
>> +      if (!r.require_matching_vector_type (i, type))
>> +	return error_mark_node;
>> +
>> +    /* Check the inactive argument has the wide type.  */
>> +    if ((r.pred == PRED_m)
>> +	&& (r.infer_vector_type (0) != wide_suffix))
>> +    return r.report_no_such_form (type);
> 
> Indentation is off here I think.

Indeed!

Thanks,

Christophe

> Thanks,
> Kyrill
> 
>> +
>> +    return r.finish_opt_n_resolution (last_arg, 0, type);
>> +  }
>> +};
>> +SHAPE (binary_widen_opt_n)
>> +
>>   /* Shape for comparison operations that operate on
>>      uniform types.
>>
>> diff --git a/gcc/config/arm/arm-mve-builtins-shapes.h b/gcc/config/arm/arm-
>> mve-builtins-shapes.h
>> index a28cd6a1547..07b12b4af68 100644
>> --- a/gcc/config/arm/arm-mve-builtins-shapes.h
>> +++ b/gcc/config/arm/arm-mve-builtins-shapes.h
>> @@ -53,6 +53,7 @@ namespace arm_mve
>>       extern const function_shape *const binary_rshift_narrow;
>>       extern const function_shape *const binary_rshift_narrow_unsigned;
>>       extern const function_shape *const binary_widen_n;
>> +    extern const function_shape *const binary_widen_opt_n;
>>       extern const function_shape *const cmp;
>>       extern const function_shape *const create;
>>       extern const function_shape *const inherent;
>> --
>> 2.34.1
>
  

Patch

diff --git a/gcc/config/arm/arm-mve-builtins-shapes.cc b/gcc/config/arm/arm-mve-builtins-shapes.cc
index 5a299a272f5..ee4bc3f8ea4 100644
--- a/gcc/config/arm/arm-mve-builtins-shapes.cc
+++ b/gcc/config/arm/arm-mve-builtins-shapes.cc
@@ -1098,6 +1098,55 @@  struct binary_widen_n_def : public overloaded_base<0>
 };
 SHAPE (binary_widen_n)
 
+/* <T0:twice>_t vfoo[_t0](<T0>_t, <T0>_t)
+   <T0:twice>_t vfoo[_n_t0](<T0>_t, <S0>_t)
+
+   Example: vqdmullbq.
+   int32x4_t [__arm_]vqdmulltq[_n_s16](int16x8_t a, int16_t b)
+   int32x4_t [__arm_]vqdmulltq_m[_n_s16](int32x4_t inactive, int16x8_t a, int16_t b, mve_pred16_t p)
+   int32x4_t [__arm_]vqdmulltq[_s16](int16x8_t a, int16x8_t b)
+   int32x4_t [__arm_]vqdmulltq_m[_s16](int32x4_t inactive, int16x8_t a, int16x8_t b, mve_pred16_t p)  */
+struct binary_widen_opt_n_def : public overloaded_base<0>
+{
+  void
+  build (function_builder &b, const function_group_info &group,
+	 bool preserve_user_namespace) const override
+  {
+    b.add_overloaded_functions (group, MODE_none, preserve_user_namespace);
+    build_all (b, "vw0,v0,v0", group, MODE_none, preserve_user_namespace);
+    build_all (b, "vw0,v0,s0", group, MODE_n, preserve_user_namespace);
+  }
+
+  tree
+  resolve (function_resolver &r) const override
+  {
+    unsigned int i, nargs;
+    type_suffix_index type;
+    if (!r.check_gp_argument (2, i, nargs)
+	|| (type = r.infer_vector_type (i - 1)) == NUM_TYPE_SUFFIXES)
+      return error_mark_node;
+
+    type_suffix_index wide_suffix
+      = find_type_suffix (type_suffixes[type].tclass,
+			  type_suffixes[type].element_bits * 2);
+
+    /* Skip last argument, may be scalar, will be checked below by
+       finish_opt_n_resolution.  */
+    unsigned int last_arg = i--;
+    for (; i > 0; i--)
+      if (!r.require_matching_vector_type (i, type))
+	return error_mark_node;
+
+    /* Check the inactive argument has the wide type.  */
+    if ((r.pred == PRED_m)
+	&& (r.infer_vector_type (0) != wide_suffix))
+    return r.report_no_such_form (type);
+
+    return r.finish_opt_n_resolution (last_arg, 0, type);
+  }
+};
+SHAPE (binary_widen_opt_n)
+
 /* Shape for comparison operations that operate on
    uniform types.
 
diff --git a/gcc/config/arm/arm-mve-builtins-shapes.h b/gcc/config/arm/arm-mve-builtins-shapes.h
index a28cd6a1547..07b12b4af68 100644
--- a/gcc/config/arm/arm-mve-builtins-shapes.h
+++ b/gcc/config/arm/arm-mve-builtins-shapes.h
@@ -53,6 +53,7 @@  namespace arm_mve
     extern const function_shape *const binary_rshift_narrow;
     extern const function_shape *const binary_rshift_narrow_unsigned;
     extern const function_shape *const binary_widen_n;
+    extern const function_shape *const binary_widen_opt_n;
     extern const function_shape *const cmp;
     extern const function_shape *const create;
     extern const function_shape *const inherent;