| Message ID | e44f97d4-c7c8-4995-aae2-2ebaf0d0f148@linux.ibm.com |
|---|---|
| State | New |
| Headers | show |
| Series | [01/11] rs6000, Fix __builtin_vsx_cmple* args and documentation, builtins | expand |
on 2024/2/21 01:56, Carl Love wrote: > GCC maintainers: > > There are a number of undocumented built-ins that are duplicates of other documented built-ins. This patch removes the duplicates so users will only use the documented built-in. > > The patch has been tested on Power 10 with no regressions. Can you also test this on at least one BE machine? The behaviors of some built-ins may also depend on endianness. > > Please let me know if this patch is acceptable for mainline. Thanks. > > Carl > > ----------------------------------------------------- > > rs6000, remove duplicated built-ins > > The following undocumented built-ins are same as existing documented > overloaded builtins. > > const vf __builtin_vsx_xxmrghw (vf, vf); > same as vf __builtin_vec_mergeh (vf, vf); (overloaded vec_mergeh) > > const vsi __builtin_vsx_xxmrghw_4si (vsi, vsi); > same as vsi __builtin_vec_mergeh (vsi, vsi); (overloaded vec_mergeh) > > const vf __builtin_vsx_xxmrglw (vf, vf); > same as vf __builtin_vec_mergel (vf, vf); (overloaded vec_mergel) > > const vsi __builtin_vsx_xxmrglw_4si (vsi, vsi); > same as vsi __builtin_vec_mergel (vsi, vsi); (overloaded vec_mergel) > With these builtin definitions removed, the according expanders vsx_xxmrg{h,l}w_v4s{f,i} look useless then, please have a check, if so, they should be removed together, and put this part of changes into a separated patch (mainly vec merge) ... > const vsc __builtin_vsx_xxsel_16qi (vsc, vsc, vsc); > same as vsc __builtin_vec_sel (vsc, vsc, vuc); (overloaded vec_sel) > > const vuc __builtin_vsx_xxsel_16qi_uns (vuc, vuc, vuc); > same as vuc __builtin_vec_sel (vuc, vuc, vuc); (overloaded vec_sel) > > const vd __builtin_vsx_xxsel_2df (vd, vd, vd); > same as vd __builtin_vec_sel (vd, vd, vull); (overloaded vec_sel) > > const vsll __builtin_vsx_xxsel_2di (vsll, vsll, vsll); > same as vsll __builtin_vec_sel (vsll, vsll, vsll); (overloaded vec_sel) > > const vull __builtin_vsx_xxsel_2di_uns (vull, vull, vull); > same as vull __builtin_vec_sel (vull, vull, vsll); (overloaded vec_sel) > > const vf __builtin_vsx_xxsel_4sf (vf, vf, vf); > same as vf __builtin_vec_sel (vf, vf, vsi) (overloaded vec_sel) > > const vsi __builtin_vsx_xxsel_4si (vsi, vsi, vsi); > same as vsi __builtin_vec_sel (vsi, vsi, vbi); (overloaded vec_sel) > > const vui __builtin_vsx_xxsel_4si_uns (vui, vui, vui); > same as vui __builtin_vec_sel (vui, vui, vui); (overloaded vec_sel) > > const vss __builtin_vsx_xxsel_8hi (vss, vss, vss); > same as vss __builtin_vec_sel (vss, vss, vbs); (overloaded vec_sel) > > const vus __builtin_vsx_xxsel_8hi_uns (vus, vus, vus); > same as vus __builtin_vec_sel (vus, vus, vus); (overloaded vec_sel) ... and adopt another one for this part (vec_sel). > > This patch removed the duplicate built-in definitions so only the > documented built-ins will be available for use. The case statements in > rs6000_gimple_fold_builtin that ar no longer needed are also removed. > > gcc/ChangeLog: > * config/rs6000/rs6000-builtins.def (__builtin_vsx_xxmrghw, > __builtin_vsx_xxmrghw_4si, __builtin_vsx_xxmrglw, > __builtin_vsx_xxmrglw_4si, __builtin_vsx_xxsel_16qi, > __builtin_vsx_xxsel_16qi_uns, __builtin_vsx_xxsel_2df, > __builtin_vsx_xxsel_2di, __builtin_vsx_xxsel_2di_uns, > __builtin_vsx_xxsel_4sf, __builtin_vsx_xxsel_4si, > __builtin_vsx_xxsel_4si_uns, __builtin_vsx_xxsel_8hi, > __builtin_vsx_xxsel_8hi_uns): Removed built-in definition. Nit: s/Removed/Remove/ > * config/rs6000/rs6000-builtin.cc (rs6000_gimple_fold_builtin): > remove case entries RS6000_BIF_XXMRGLW_4SI, > RS6000_BIF_XXMRGLW_4SF, RS6000_BIF_XXMRGHW_4SI, > RS6000_BIF_XXMRGHW_4SF. Nit: s/remove/Remove/ > > gcc/testsuite/ChangeLog: > * gcc.target/powerpc/vsx-builtin-3.c (__builtin_vsx_xxsel_4si, > __builtin_vsx_xxsel_8hi, __builtin_vsx_xxsel_16qi, > __builtin_vsx_xxsel_4sf, __builtin_vsx_xxsel_2df): Remove test > cases for removed built-ins. > --- > gcc/config/rs6000/rs6000-builtin.cc | 4 -- > gcc/config/rs6000/rs6000-builtins.def | 42 ------------------- > .../gcc.target/powerpc/vsx-builtin-3.c | 6 --- > 3 files changed, 52 deletions(-) > > diff --git a/gcc/config/rs6000/rs6000-builtin.cc b/gcc/config/rs6000/rs6000-builtin.cc > index 6698274031b..e436cbe4935 100644 > --- a/gcc/config/rs6000/rs6000-builtin.cc > +++ b/gcc/config/rs6000/rs6000-builtin.cc > @@ -2110,20 +2110,16 @@ rs6000_gimple_fold_builtin (gimple_stmt_iterator *gsi) > /* vec_mergel (integrals). */ > case RS6000_BIF_VMRGLH: > case RS6000_BIF_VMRGLW: > - case RS6000_BIF_XXMRGLW_4SI: > case RS6000_BIF_VMRGLB: > case RS6000_BIF_VEC_MERGEL_V2DI: > - case RS6000_BIF_XXMRGLW_4SF: > case RS6000_BIF_VEC_MERGEL_V2DF: > fold_mergehl_helper (gsi, stmt, 1); > return true; > /* vec_mergeh (integrals). */ > case RS6000_BIF_VMRGHH: > case RS6000_BIF_VMRGHW: > - case RS6000_BIF_XXMRGHW_4SI: > case RS6000_BIF_VMRGHB: > case RS6000_BIF_VEC_MERGEH_V2DI: > - case RS6000_BIF_XXMRGHW_4SF: > case RS6000_BIF_VEC_MERGEH_V2DF: > fold_mergehl_helper (gsi, stmt, 0); > return true; > diff --git a/gcc/config/rs6000/rs6000-builtins.def b/gcc/config/rs6000/rs6000-builtins.def > index fd316f629e5..96d095da2cb 100644 > --- a/gcc/config/rs6000/rs6000-builtins.def > +++ b/gcc/config/rs6000/rs6000-builtins.def > @@ -1925,18 +1925,6 @@ > const signed int __builtin_vsx_xvtsqrtsp_fg (vf); > XVTSQRTSP_FG vsx_tsqrtv4sf2_fg {} > > - const vf __builtin_vsx_xxmrghw (vf, vf); > - XXMRGHW_4SF vsx_xxmrghw_v4sf {} > - > - const vsi __builtin_vsx_xxmrghw_4si (vsi, vsi); > - XXMRGHW_4SI vsx_xxmrghw_v4si {} > - > - const vf __builtin_vsx_xxmrglw (vf, vf); > - XXMRGLW_4SF vsx_xxmrglw_v4sf {} > - > - const vsi __builtin_vsx_xxmrglw_4si (vsi, vsi); > - XXMRGLW_4SI vsx_xxmrglw_v4si {} > - > const vsc __builtin_vsx_xxpermdi_16qi (vsc, vsc, const int<2>); > XXPERMDI_16QI vsx_xxpermdi_v16qi {} > > @@ -1958,42 +1946,12 @@ > const vss __builtin_vsx_xxpermdi_8hi (vss, vss, const int<2>); > XXPERMDI_8HI vsx_xxpermdi_v8hi {} > > - const vsc __builtin_vsx_xxsel_16qi (vsc, vsc, vsc); > - XXSEL_16QI vector_select_v16qi {} > - > - const vuc __builtin_vsx_xxsel_16qi_uns (vuc, vuc, vuc); > - XXSEL_16QI_UNS vector_select_v16qi_uns {} > - > const vsq __builtin_vsx_xxsel_1ti (vsq, vsq, vsq); > XXSEL_1TI vector_select_v1ti {} > > const vsq __builtin_vsx_xxsel_1ti_uns (vsq, vsq, vsq); > XXSEL_1TI_UNS vector_select_v1ti_uns {} > > - const vd __builtin_vsx_xxsel_2df (vd, vd, vd); > - XXSEL_2DF vector_select_v2df {} > - > - const vsll __builtin_vsx_xxsel_2di (vsll, vsll, vsll); > - XXSEL_2DI vector_select_v2di {} > - > - const vull __builtin_vsx_xxsel_2di_uns (vull, vull, vull); > - XXSEL_2DI_UNS vector_select_v2di_uns {} > - > - const vf __builtin_vsx_xxsel_4sf (vf, vf, vf); > - XXSEL_4SF vector_select_v4sf {} > - > - const vsi __builtin_vsx_xxsel_4si (vsi, vsi, vsi); > - XXSEL_4SI vector_select_v4si {} > - > - const vui __builtin_vsx_xxsel_4si_uns (vui, vui, vui); > - XXSEL_4SI_UNS vector_select_v4si_uns {} > - > - const vss __builtin_vsx_xxsel_8hi (vss, vss, vss); > - XXSEL_8HI vector_select_v8hi {} > - > - const vus __builtin_vsx_xxsel_8hi_uns (vus, vus, vus); > - XXSEL_8HI_UNS vector_select_v8hi_uns {} > - > const vsc __builtin_vsx_xxsldwi_16qi (vsc, vsc, const int<2>); > XXSLDWI_16QI vsx_xxsldwi_v16qi {} > > diff --git a/gcc/testsuite/gcc.target/powerpc/vsx-builtin-3.c b/gcc/testsuite/gcc.target/powerpc/vsx-builtin-3.c > index ff875c55304..10bf39b89ed 100644 > --- a/gcc/testsuite/gcc.target/powerpc/vsx-builtin-3.c > +++ b/gcc/testsuite/gcc.target/powerpc/vsx-builtin-3.c > @@ -61,12 +61,6 @@ int do_sel(void) > { > int i = 0; > > - si[i][0] = __builtin_vsx_xxsel_4si (si[i][1], si[i][2], si[i][3]); i++; > - ss[i][0] = __builtin_vsx_xxsel_8hi (ss[i][1], ss[i][2], ss[i][3]); i++; > - sc[i][0] = __builtin_vsx_xxsel_16qi (sc[i][1], sc[i][2], sc[i][3]); i++; > - f[i][0] = __builtin_vsx_xxsel_4sf (f[i][1], f[i][2], f[i][3]); i++; > - d[i][0] = __builtin_vsx_xxsel_2df (d[i][1], d[i][2], d[i][3]); i++; > - > si[i][0] = __builtin_vsx_xxsel (si[i][1], si[i][2], bi[i][3]); i++; > ss[i][0] = __builtin_vsx_xxsel (ss[i][1], ss[i][2], bs[i][3]); i++; > sc[i][0] = __builtin_vsx_xxsel (sc[i][1], sc[i][2], bc[i][3]); i++; BR, Kewen
diff --git a/gcc/config/rs6000/rs6000-builtin.cc b/gcc/config/rs6000/rs6000-builtin.cc index 6698274031b..e436cbe4935 100644 --- a/gcc/config/rs6000/rs6000-builtin.cc +++ b/gcc/config/rs6000/rs6000-builtin.cc @@ -2110,20 +2110,16 @@ rs6000_gimple_fold_builtin (gimple_stmt_iterator *gsi) /* vec_mergel (integrals). */ case RS6000_BIF_VMRGLH: case RS6000_BIF_VMRGLW: - case RS6000_BIF_XXMRGLW_4SI: case RS6000_BIF_VMRGLB: case RS6000_BIF_VEC_MERGEL_V2DI: - case RS6000_BIF_XXMRGLW_4SF: case RS6000_BIF_VEC_MERGEL_V2DF: fold_mergehl_helper (gsi, stmt, 1); return true; /* vec_mergeh (integrals). */ case RS6000_BIF_VMRGHH: case RS6000_BIF_VMRGHW: - case RS6000_BIF_XXMRGHW_4SI: case RS6000_BIF_VMRGHB: case RS6000_BIF_VEC_MERGEH_V2DI: - case RS6000_BIF_XXMRGHW_4SF: case RS6000_BIF_VEC_MERGEH_V2DF: fold_mergehl_helper (gsi, stmt, 0); return true; diff --git a/gcc/config/rs6000/rs6000-builtins.def b/gcc/config/rs6000/rs6000-builtins.def index fd316f629e5..96d095da2cb 100644 --- a/gcc/config/rs6000/rs6000-builtins.def +++ b/gcc/config/rs6000/rs6000-builtins.def @@ -1925,18 +1925,6 @@ const signed int __builtin_vsx_xvtsqrtsp_fg (vf); XVTSQRTSP_FG vsx_tsqrtv4sf2_fg {} - const vf __builtin_vsx_xxmrghw (vf, vf); - XXMRGHW_4SF vsx_xxmrghw_v4sf {} - - const vsi __builtin_vsx_xxmrghw_4si (vsi, vsi); - XXMRGHW_4SI vsx_xxmrghw_v4si {} - - const vf __builtin_vsx_xxmrglw (vf, vf); - XXMRGLW_4SF vsx_xxmrglw_v4sf {} - - const vsi __builtin_vsx_xxmrglw_4si (vsi, vsi); - XXMRGLW_4SI vsx_xxmrglw_v4si {} - const vsc __builtin_vsx_xxpermdi_16qi (vsc, vsc, const int<2>); XXPERMDI_16QI vsx_xxpermdi_v16qi {} @@ -1958,42 +1946,12 @@ const vss __builtin_vsx_xxpermdi_8hi (vss, vss, const int<2>); XXPERMDI_8HI vsx_xxpermdi_v8hi {} - const vsc __builtin_vsx_xxsel_16qi (vsc, vsc, vsc); - XXSEL_16QI vector_select_v16qi {} - - const vuc __builtin_vsx_xxsel_16qi_uns (vuc, vuc, vuc); - XXSEL_16QI_UNS vector_select_v16qi_uns {} - const vsq __builtin_vsx_xxsel_1ti (vsq, vsq, vsq); XXSEL_1TI vector_select_v1ti {} const vsq __builtin_vsx_xxsel_1ti_uns (vsq, vsq, vsq); XXSEL_1TI_UNS vector_select_v1ti_uns {} - const vd __builtin_vsx_xxsel_2df (vd, vd, vd); - XXSEL_2DF vector_select_v2df {} - - const vsll __builtin_vsx_xxsel_2di (vsll, vsll, vsll); - XXSEL_2DI vector_select_v2di {} - - const vull __builtin_vsx_xxsel_2di_uns (vull, vull, vull); - XXSEL_2DI_UNS vector_select_v2di_uns {} - - const vf __builtin_vsx_xxsel_4sf (vf, vf, vf); - XXSEL_4SF vector_select_v4sf {} - - const vsi __builtin_vsx_xxsel_4si (vsi, vsi, vsi); - XXSEL_4SI vector_select_v4si {} - - const vui __builtin_vsx_xxsel_4si_uns (vui, vui, vui); - XXSEL_4SI_UNS vector_select_v4si_uns {} - - const vss __builtin_vsx_xxsel_8hi (vss, vss, vss); - XXSEL_8HI vector_select_v8hi {} - - const vus __builtin_vsx_xxsel_8hi_uns (vus, vus, vus); - XXSEL_8HI_UNS vector_select_v8hi_uns {} - const vsc __builtin_vsx_xxsldwi_16qi (vsc, vsc, const int<2>); XXSLDWI_16QI vsx_xxsldwi_v16qi {} diff --git a/gcc/testsuite/gcc.target/powerpc/vsx-builtin-3.c b/gcc/testsuite/gcc.target/powerpc/vsx-builtin-3.c index ff875c55304..10bf39b89ed 100644 --- a/gcc/testsuite/gcc.target/powerpc/vsx-builtin-3.c +++ b/gcc/testsuite/gcc.target/powerpc/vsx-builtin-3.c @@ -61,12 +61,6 @@ int do_sel(void) { int i = 0; - si[i][0] = __builtin_vsx_xxsel_4si (si[i][1], si[i][2], si[i][3]); i++; - ss[i][0] = __builtin_vsx_xxsel_8hi (ss[i][1], ss[i][2], ss[i][3]); i++; - sc[i][0] = __builtin_vsx_xxsel_16qi (sc[i][1], sc[i][2], sc[i][3]); i++; - f[i][0] = __builtin_vsx_xxsel_4sf (f[i][1], f[i][2], f[i][3]); i++; - d[i][0] = __builtin_vsx_xxsel_2df (d[i][1], d[i][2], d[i][3]); i++; - si[i][0] = __builtin_vsx_xxsel (si[i][1], si[i][2], bi[i][3]); i++; ss[i][0] = __builtin_vsx_xxsel (ss[i][1], ss[i][2], bs[i][3]); i++; sc[i][0] = __builtin_vsx_xxsel (sc[i][1], sc[i][2], bc[i][3]); i++;
GCC maintainers: There are a number of undocumented built-ins that are duplicates of other documented built-ins. This patch removes the duplicates so users will only use the documented built-in. The patch has been tested on Power 10 with no regressions. Please let me know if this patch is acceptable for mainline. Thanks. Carl ----------------------------------------------------- rs6000, remove duplicated built-ins The following undocumented built-ins are same as existing documented overloaded builtins. const vf __builtin_vsx_xxmrghw (vf, vf); same as vf __builtin_vec_mergeh (vf, vf); (overloaded vec_mergeh) const vsi __builtin_vsx_xxmrghw_4si (vsi, vsi); same as vsi __builtin_vec_mergeh (vsi, vsi); (overloaded vec_mergeh) const vf __builtin_vsx_xxmrglw (vf, vf); same as vf __builtin_vec_mergel (vf, vf); (overloaded vec_mergel) const vsi __builtin_vsx_xxmrglw_4si (vsi, vsi); same as vsi __builtin_vec_mergel (vsi, vsi); (overloaded vec_mergel) const vsc __builtin_vsx_xxsel_16qi (vsc, vsc, vsc); same as vsc __builtin_vec_sel (vsc, vsc, vuc); (overloaded vec_sel) const vuc __builtin_vsx_xxsel_16qi_uns (vuc, vuc, vuc); same as vuc __builtin_vec_sel (vuc, vuc, vuc); (overloaded vec_sel) const vd __builtin_vsx_xxsel_2df (vd, vd, vd); same as vd __builtin_vec_sel (vd, vd, vull); (overloaded vec_sel) const vsll __builtin_vsx_xxsel_2di (vsll, vsll, vsll); same as vsll __builtin_vec_sel (vsll, vsll, vsll); (overloaded vec_sel) const vull __builtin_vsx_xxsel_2di_uns (vull, vull, vull); same as vull __builtin_vec_sel (vull, vull, vsll); (overloaded vec_sel) const vf __builtin_vsx_xxsel_4sf (vf, vf, vf); same as vf __builtin_vec_sel (vf, vf, vsi) (overloaded vec_sel) const vsi __builtin_vsx_xxsel_4si (vsi, vsi, vsi); same as vsi __builtin_vec_sel (vsi, vsi, vbi); (overloaded vec_sel) const vui __builtin_vsx_xxsel_4si_uns (vui, vui, vui); same as vui __builtin_vec_sel (vui, vui, vui); (overloaded vec_sel) const vss __builtin_vsx_xxsel_8hi (vss, vss, vss); same as vss __builtin_vec_sel (vss, vss, vbs); (overloaded vec_sel) const vus __builtin_vsx_xxsel_8hi_uns (vus, vus, vus); same as vus __builtin_vec_sel (vus, vus, vus); (overloaded vec_sel) This patch removed the duplicate built-in definitions so only the documented built-ins will be available for use. The case statements in rs6000_gimple_fold_builtin that ar no longer needed are also removed. gcc/ChangeLog: * config/rs6000/rs6000-builtins.def (__builtin_vsx_xxmrghw, __builtin_vsx_xxmrghw_4si, __builtin_vsx_xxmrglw, __builtin_vsx_xxmrglw_4si, __builtin_vsx_xxsel_16qi, __builtin_vsx_xxsel_16qi_uns, __builtin_vsx_xxsel_2df, __builtin_vsx_xxsel_2di, __builtin_vsx_xxsel_2di_uns, __builtin_vsx_xxsel_4sf, __builtin_vsx_xxsel_4si, __builtin_vsx_xxsel_4si_uns, __builtin_vsx_xxsel_8hi, __builtin_vsx_xxsel_8hi_uns): Removed built-in definition. * config/rs6000/rs6000-builtin.cc (rs6000_gimple_fold_builtin): remove case entries RS6000_BIF_XXMRGLW_4SI, RS6000_BIF_XXMRGLW_4SF, RS6000_BIF_XXMRGHW_4SI, RS6000_BIF_XXMRGHW_4SF. gcc/testsuite/ChangeLog: * gcc.target/powerpc/vsx-builtin-3.c (__builtin_vsx_xxsel_4si, __builtin_vsx_xxsel_8hi, __builtin_vsx_xxsel_16qi, __builtin_vsx_xxsel_4sf, __builtin_vsx_xxsel_2df): Remove test cases for removed built-ins. --- gcc/config/rs6000/rs6000-builtin.cc | 4 -- gcc/config/rs6000/rs6000-builtins.def | 42 ------------------- .../gcc.target/powerpc/vsx-builtin-3.c | 6 --- 3 files changed, 52 deletions(-)