x86: harmonize __builtin_ia32_psadbw*() types

Message ID a2ecdd37-91e6-f67b-7e47-d7ddeaa1fbf5@suse.com
State New
Headers
Series x86: harmonize __builtin_ia32_psadbw*() types |

Commit Message

Jan Beulich June 2, 2022, 3:04 p.m. UTC
  The 64-bit, 128-bit, and 512-bit variants have V<n>DI return type, in
line with instruction behavior. Make the 256-bit builtin match, thus
also making it match the insn it expands to (using VI8_AVX2_AVX512BW).

gcc/

	* config/i386/i386-builtin.def (__builtin_ia32_psadbw256):
	Change type.
	* config/i386/i386-builtin-types.def: New function type
	(V4DI, V32QI, V32QI).
	* config/i386/i386-expand.cc (ix86_expand_args_builtin): Handle
	V4DI_FTYPE_V32QI_V32QI.
  

Comments

Uros Bizjak June 5, 2022, 7:16 p.m. UTC | #1
On Thu, Jun 2, 2022 at 5:04 PM Jan Beulich <jbeulich@suse.com> wrote:
>
> The 64-bit, 128-bit, and 512-bit variants have V<n>DI return type, in
> line with instruction behavior. Make the 256-bit builtin match, thus
> also making it match the insn it expands to (using VI8_AVX2_AVX512BW).
>
> gcc/
>
>         * config/i386/i386-builtin.def (__builtin_ia32_psadbw256):
>         Change type.
>         * config/i386/i386-builtin-types.def: New function type
>         (V4DI, V32QI, V32QI).
>         * config/i386/i386-expand.cc (ix86_expand_args_builtin): Handle
>         V4DI_FTYPE_V32QI_V32QI.

LGTM, but please let HJ have the final approval.

Uros.

>
> --- a/gcc/config/i386/i386-builtin.def
> +++ b/gcc/config/i386/i386-builtin.def
> @@ -1217,7 +1217,7 @@ BDESC (OPTION_MASK_ISA_AVX2, 0, CODE_FOR
>  BDESC (OPTION_MASK_ISA_AVX2, 0, CODE_FOR_mulv8si3, "__builtin_ia32_pmulld256"  , IX86_BUILTIN_PMULLD256  , UNKNOWN, (int) V8SI_FTYPE_V8SI_V8SI)
>  BDESC (OPTION_MASK_ISA_AVX2, 0, CODE_FOR_vec_widen_umult_even_v8si, "__builtin_ia32_pmuludq256", IX86_BUILTIN_PMULUDQ256, UNKNOWN, (int) V4DI_FTYPE_V8SI_V8SI)
>  BDESC (OPTION_MASK_ISA_AVX2, 0, CODE_FOR_iorv4di3, "__builtin_ia32_por256", IX86_BUILTIN_POR256, UNKNOWN, (int) V4DI_FTYPE_V4DI_V4DI)
> -BDESC (OPTION_MASK_ISA_AVX2, 0, CODE_FOR_avx2_psadbw, "__builtin_ia32_psadbw256", IX86_BUILTIN_PSADBW256, UNKNOWN, (int) V16HI_FTYPE_V32QI_V32QI)
> +BDESC (OPTION_MASK_ISA_AVX2, 0, CODE_FOR_avx2_psadbw, "__builtin_ia32_psadbw256", IX86_BUILTIN_PSADBW256, UNKNOWN, (int) V4DI_FTYPE_V32QI_V32QI)
>  BDESC (OPTION_MASK_ISA_AVX2, 0, CODE_FOR_avx2_pshufbv32qi3, "__builtin_ia32_pshufb256", IX86_BUILTIN_PSHUFB256, UNKNOWN, (int) V32QI_FTYPE_V32QI_V32QI)
>  BDESC (OPTION_MASK_ISA_AVX2, 0, CODE_FOR_avx2_pshufdv3, "__builtin_ia32_pshufd256", IX86_BUILTIN_PSHUFD256, UNKNOWN, (int) V8SI_FTYPE_V8SI_INT)
>  BDESC (OPTION_MASK_ISA_AVX2, 0, CODE_FOR_avx2_pshufhwv3, "__builtin_ia32_pshufhw256", IX86_BUILTIN_PSHUFHW256, UNKNOWN, (int) V16HI_FTYPE_V16HI_INT)
> --- a/gcc/config/i386/i386-builtin-types.def
> +++ b/gcc/config/i386/i386-builtin-types.def
> @@ -516,6 +516,7 @@ DEF_FUNCTION_TYPE (V8DI, V8DI, V2DI, INT
>  DEF_FUNCTION_TYPE (V8DI, V8DI, V2DI, INT, V8DI, UQI)
>  DEF_FUNCTION_TYPE (V8DI, V8DI, V4DI, INT, V8DI, UQI)
>  DEF_FUNCTION_TYPE (V4DI, V8SI, V8SI)
> +DEF_FUNCTION_TYPE (V4DI, V32QI, V32QI)
>  DEF_FUNCTION_TYPE (V8DI, V64QI, V64QI)
>  DEF_FUNCTION_TYPE (V4DI, V4DI, V2DI)
>  DEF_FUNCTION_TYPE (V4DI, PCV4DI, V4DI)
> --- a/gcc/config/i386/i386-expand.cc
> +++ b/gcc/config/i386/i386-expand.cc
> @@ -10359,6 +10359,7 @@ ix86_expand_args_builtin (const struct b
>      case V8SI_FTYPE_V16HI_V16HI:
>      case V4DI_FTYPE_V4DI_V4DI:
>      case V4DI_FTYPE_V8SI_V8SI:
> +    case V4DI_FTYPE_V32QI_V32QI:
>      case V8DI_FTYPE_V64QI_V64QI:
>        if (comparison == UNKNOWN)
>         return ix86_expand_binop_builtin (icode, exp, target);
>
  
Hongtao Liu June 6, 2022, 2:26 a.m. UTC | #2
On Mon, Jun 6, 2022 at 3:17 AM Uros Bizjak via Gcc-patches
<gcc-patches@gcc.gnu.org> wrote:
>
> On Thu, Jun 2, 2022 at 5:04 PM Jan Beulich <jbeulich@suse.com> wrote:
> >
> > The 64-bit, 128-bit, and 512-bit variants have V<n>DI return type, in
> > line with instruction behavior. Make the 256-bit builtin match, thus
> > also making it match the insn it expands to (using VI8_AVX2_AVX512BW).
> >
> > gcc/
> >
> >         * config/i386/i386-builtin.def (__builtin_ia32_psadbw256):
> >         Change type.
> >         * config/i386/i386-builtin-types.def: New function type
> >         (V4DI, V32QI, V32QI).
> >         * config/i386/i386-expand.cc (ix86_expand_args_builtin): Handle
> >         V4DI_FTYPE_V32QI_V32QI.
>
> LGTM, but please let HJ have the final approval.
I think it was just a typo and not intentional, so Ok for the trunk.
>
> Uros.
>
> >
> > --- a/gcc/config/i386/i386-builtin.def
> > +++ b/gcc/config/i386/i386-builtin.def
> > @@ -1217,7 +1217,7 @@ BDESC (OPTION_MASK_ISA_AVX2, 0, CODE_FOR
> >  BDESC (OPTION_MASK_ISA_AVX2, 0, CODE_FOR_mulv8si3, "__builtin_ia32_pmulld256"  , IX86_BUILTIN_PMULLD256  , UNKNOWN, (int) V8SI_FTYPE_V8SI_V8SI)
> >  BDESC (OPTION_MASK_ISA_AVX2, 0, CODE_FOR_vec_widen_umult_even_v8si, "__builtin_ia32_pmuludq256", IX86_BUILTIN_PMULUDQ256, UNKNOWN, (int) V4DI_FTYPE_V8SI_V8SI)
> >  BDESC (OPTION_MASK_ISA_AVX2, 0, CODE_FOR_iorv4di3, "__builtin_ia32_por256", IX86_BUILTIN_POR256, UNKNOWN, (int) V4DI_FTYPE_V4DI_V4DI)
> > -BDESC (OPTION_MASK_ISA_AVX2, 0, CODE_FOR_avx2_psadbw, "__builtin_ia32_psadbw256", IX86_BUILTIN_PSADBW256, UNKNOWN, (int) V16HI_FTYPE_V32QI_V32QI)
> > +BDESC (OPTION_MASK_ISA_AVX2, 0, CODE_FOR_avx2_psadbw, "__builtin_ia32_psadbw256", IX86_BUILTIN_PSADBW256, UNKNOWN, (int) V4DI_FTYPE_V32QI_V32QI)
> >  BDESC (OPTION_MASK_ISA_AVX2, 0, CODE_FOR_avx2_pshufbv32qi3, "__builtin_ia32_pshufb256", IX86_BUILTIN_PSHUFB256, UNKNOWN, (int) V32QI_FTYPE_V32QI_V32QI)
> >  BDESC (OPTION_MASK_ISA_AVX2, 0, CODE_FOR_avx2_pshufdv3, "__builtin_ia32_pshufd256", IX86_BUILTIN_PSHUFD256, UNKNOWN, (int) V8SI_FTYPE_V8SI_INT)
> >  BDESC (OPTION_MASK_ISA_AVX2, 0, CODE_FOR_avx2_pshufhwv3, "__builtin_ia32_pshufhw256", IX86_BUILTIN_PSHUFHW256, UNKNOWN, (int) V16HI_FTYPE_V16HI_INT)
> > --- a/gcc/config/i386/i386-builtin-types.def
> > +++ b/gcc/config/i386/i386-builtin-types.def
> > @@ -516,6 +516,7 @@ DEF_FUNCTION_TYPE (V8DI, V8DI, V2DI, INT
> >  DEF_FUNCTION_TYPE (V8DI, V8DI, V2DI, INT, V8DI, UQI)
> >  DEF_FUNCTION_TYPE (V8DI, V8DI, V4DI, INT, V8DI, UQI)
> >  DEF_FUNCTION_TYPE (V4DI, V8SI, V8SI)
> > +DEF_FUNCTION_TYPE (V4DI, V32QI, V32QI)
> >  DEF_FUNCTION_TYPE (V8DI, V64QI, V64QI)
> >  DEF_FUNCTION_TYPE (V4DI, V4DI, V2DI)
> >  DEF_FUNCTION_TYPE (V4DI, PCV4DI, V4DI)
> > --- a/gcc/config/i386/i386-expand.cc
> > +++ b/gcc/config/i386/i386-expand.cc
> > @@ -10359,6 +10359,7 @@ ix86_expand_args_builtin (const struct b
> >      case V8SI_FTYPE_V16HI_V16HI:
> >      case V4DI_FTYPE_V4DI_V4DI:
> >      case V4DI_FTYPE_V8SI_V8SI:
> > +    case V4DI_FTYPE_V32QI_V32QI:
> >      case V8DI_FTYPE_V64QI_V64QI:
> >        if (comparison == UNKNOWN)
> >         return ix86_expand_binop_builtin (icode, exp, target);
> >
  
H.J. Lu June 6, 2022, 6:53 p.m. UTC | #3
On Sun, Jun 5, 2022 at 7:27 PM Hongtao Liu via Gcc-patches
<gcc-patches@gcc.gnu.org> wrote:
>
> On Mon, Jun 6, 2022 at 3:17 AM Uros Bizjak via Gcc-patches
> <gcc-patches@gcc.gnu.org> wrote:
> >
> > On Thu, Jun 2, 2022 at 5:04 PM Jan Beulich <jbeulich@suse.com> wrote:
> > >
> > > The 64-bit, 128-bit, and 512-bit variants have V<n>DI return type, in
> > > line with instruction behavior. Make the 256-bit builtin match, thus
> > > also making it match the insn it expands to (using VI8_AVX2_AVX512BW).
> > >
> > > gcc/
> > >
> > >         * config/i386/i386-builtin.def (__builtin_ia32_psadbw256):
> > >         Change type.
> > >         * config/i386/i386-builtin-types.def: New function type
> > >         (V4DI, V32QI, V32QI).
> > >         * config/i386/i386-expand.cc (ix86_expand_args_builtin): Handle
> > >         V4DI_FTYPE_V32QI_V32QI.
> >
> > LGTM, but please let HJ have the final approval.
> I think it was just a typo and not intentional, so Ok for the trunk.

LGTM too.

Thanks.

> >
> > Uros.
> >
> > >
> > > --- a/gcc/config/i386/i386-builtin.def
> > > +++ b/gcc/config/i386/i386-builtin.def
> > > @@ -1217,7 +1217,7 @@ BDESC (OPTION_MASK_ISA_AVX2, 0, CODE_FOR
> > >  BDESC (OPTION_MASK_ISA_AVX2, 0, CODE_FOR_mulv8si3, "__builtin_ia32_pmulld256"  , IX86_BUILTIN_PMULLD256  , UNKNOWN, (int) V8SI_FTYPE_V8SI_V8SI)
> > >  BDESC (OPTION_MASK_ISA_AVX2, 0, CODE_FOR_vec_widen_umult_even_v8si, "__builtin_ia32_pmuludq256", IX86_BUILTIN_PMULUDQ256, UNKNOWN, (int) V4DI_FTYPE_V8SI_V8SI)
> > >  BDESC (OPTION_MASK_ISA_AVX2, 0, CODE_FOR_iorv4di3, "__builtin_ia32_por256", IX86_BUILTIN_POR256, UNKNOWN, (int) V4DI_FTYPE_V4DI_V4DI)
> > > -BDESC (OPTION_MASK_ISA_AVX2, 0, CODE_FOR_avx2_psadbw, "__builtin_ia32_psadbw256", IX86_BUILTIN_PSADBW256, UNKNOWN, (int) V16HI_FTYPE_V32QI_V32QI)
> > > +BDESC (OPTION_MASK_ISA_AVX2, 0, CODE_FOR_avx2_psadbw, "__builtin_ia32_psadbw256", IX86_BUILTIN_PSADBW256, UNKNOWN, (int) V4DI_FTYPE_V32QI_V32QI)
> > >  BDESC (OPTION_MASK_ISA_AVX2, 0, CODE_FOR_avx2_pshufbv32qi3, "__builtin_ia32_pshufb256", IX86_BUILTIN_PSHUFB256, UNKNOWN, (int) V32QI_FTYPE_V32QI_V32QI)
> > >  BDESC (OPTION_MASK_ISA_AVX2, 0, CODE_FOR_avx2_pshufdv3, "__builtin_ia32_pshufd256", IX86_BUILTIN_PSHUFD256, UNKNOWN, (int) V8SI_FTYPE_V8SI_INT)
> > >  BDESC (OPTION_MASK_ISA_AVX2, 0, CODE_FOR_avx2_pshufhwv3, "__builtin_ia32_pshufhw256", IX86_BUILTIN_PSHUFHW256, UNKNOWN, (int) V16HI_FTYPE_V16HI_INT)
> > > --- a/gcc/config/i386/i386-builtin-types.def
> > > +++ b/gcc/config/i386/i386-builtin-types.def
> > > @@ -516,6 +516,7 @@ DEF_FUNCTION_TYPE (V8DI, V8DI, V2DI, INT
> > >  DEF_FUNCTION_TYPE (V8DI, V8DI, V2DI, INT, V8DI, UQI)
> > >  DEF_FUNCTION_TYPE (V8DI, V8DI, V4DI, INT, V8DI, UQI)
> > >  DEF_FUNCTION_TYPE (V4DI, V8SI, V8SI)
> > > +DEF_FUNCTION_TYPE (V4DI, V32QI, V32QI)
> > >  DEF_FUNCTION_TYPE (V8DI, V64QI, V64QI)
> > >  DEF_FUNCTION_TYPE (V4DI, V4DI, V2DI)
> > >  DEF_FUNCTION_TYPE (V4DI, PCV4DI, V4DI)
> > > --- a/gcc/config/i386/i386-expand.cc
> > > +++ b/gcc/config/i386/i386-expand.cc
> > > @@ -10359,6 +10359,7 @@ ix86_expand_args_builtin (const struct b
> > >      case V8SI_FTYPE_V16HI_V16HI:
> > >      case V4DI_FTYPE_V4DI_V4DI:
> > >      case V4DI_FTYPE_V8SI_V8SI:
> > > +    case V4DI_FTYPE_V32QI_V32QI:
> > >      case V8DI_FTYPE_V64QI_V64QI:
> > >        if (comparison == UNKNOWN)
> > >         return ix86_expand_binop_builtin (icode, exp, target);
> > >
>
>
>
> --
> BR,
> Hongtao
  

Patch

--- a/gcc/config/i386/i386-builtin.def
+++ b/gcc/config/i386/i386-builtin.def
@@ -1217,7 +1217,7 @@  BDESC (OPTION_MASK_ISA_AVX2, 0, CODE_FOR
 BDESC (OPTION_MASK_ISA_AVX2, 0, CODE_FOR_mulv8si3, "__builtin_ia32_pmulld256"  , IX86_BUILTIN_PMULLD256  , UNKNOWN, (int) V8SI_FTYPE_V8SI_V8SI)
 BDESC (OPTION_MASK_ISA_AVX2, 0, CODE_FOR_vec_widen_umult_even_v8si, "__builtin_ia32_pmuludq256", IX86_BUILTIN_PMULUDQ256, UNKNOWN, (int) V4DI_FTYPE_V8SI_V8SI)
 BDESC (OPTION_MASK_ISA_AVX2, 0, CODE_FOR_iorv4di3, "__builtin_ia32_por256", IX86_BUILTIN_POR256, UNKNOWN, (int) V4DI_FTYPE_V4DI_V4DI)
-BDESC (OPTION_MASK_ISA_AVX2, 0, CODE_FOR_avx2_psadbw, "__builtin_ia32_psadbw256", IX86_BUILTIN_PSADBW256, UNKNOWN, (int) V16HI_FTYPE_V32QI_V32QI)
+BDESC (OPTION_MASK_ISA_AVX2, 0, CODE_FOR_avx2_psadbw, "__builtin_ia32_psadbw256", IX86_BUILTIN_PSADBW256, UNKNOWN, (int) V4DI_FTYPE_V32QI_V32QI)
 BDESC (OPTION_MASK_ISA_AVX2, 0, CODE_FOR_avx2_pshufbv32qi3, "__builtin_ia32_pshufb256", IX86_BUILTIN_PSHUFB256, UNKNOWN, (int) V32QI_FTYPE_V32QI_V32QI)
 BDESC (OPTION_MASK_ISA_AVX2, 0, CODE_FOR_avx2_pshufdv3, "__builtin_ia32_pshufd256", IX86_BUILTIN_PSHUFD256, UNKNOWN, (int) V8SI_FTYPE_V8SI_INT)
 BDESC (OPTION_MASK_ISA_AVX2, 0, CODE_FOR_avx2_pshufhwv3, "__builtin_ia32_pshufhw256", IX86_BUILTIN_PSHUFHW256, UNKNOWN, (int) V16HI_FTYPE_V16HI_INT)
--- a/gcc/config/i386/i386-builtin-types.def
+++ b/gcc/config/i386/i386-builtin-types.def
@@ -516,6 +516,7 @@  DEF_FUNCTION_TYPE (V8DI, V8DI, V2DI, INT
 DEF_FUNCTION_TYPE (V8DI, V8DI, V2DI, INT, V8DI, UQI)
 DEF_FUNCTION_TYPE (V8DI, V8DI, V4DI, INT, V8DI, UQI)
 DEF_FUNCTION_TYPE (V4DI, V8SI, V8SI)
+DEF_FUNCTION_TYPE (V4DI, V32QI, V32QI)
 DEF_FUNCTION_TYPE (V8DI, V64QI, V64QI)
 DEF_FUNCTION_TYPE (V4DI, V4DI, V2DI)
 DEF_FUNCTION_TYPE (V4DI, PCV4DI, V4DI)
--- a/gcc/config/i386/i386-expand.cc
+++ b/gcc/config/i386/i386-expand.cc
@@ -10359,6 +10359,7 @@  ix86_expand_args_builtin (const struct b
     case V8SI_FTYPE_V16HI_V16HI:
     case V4DI_FTYPE_V4DI_V4DI:
     case V4DI_FTYPE_V8SI_V8SI:
+    case V4DI_FTYPE_V32QI_V32QI:
     case V8DI_FTYPE_V64QI_V64QI:
       if (comparison == UNKNOWN)
 	return ix86_expand_binop_builtin (icode, exp, target);