Re: [PATCH v1 15/20] s390x/tcg: Implement 32/128 bit for VECTOR FP TEST DATA CLASS IMMEDIATE

[Richard Henderson]

On 9/30/20 9:55 AM, David Hildenbrand wrote:
> Signed-off-by: David Hildenbrand <david@redhat.com>
> ---
>  target/s390x/helper.h           |  3 ++
>  target/s390x/translate_vx.c.inc | 26 ++++++++---
>  target/s390x/vec_fpu_helper.c   | 76 +++++++++++++++++++--------------
>  3 files changed, 69 insertions(+), 36 deletions(-)
> 
> diff --git a/target/s390x/helper.h b/target/s390x/helper.h
> index bee283e3d4..c2ded83669 100644
> --- a/target/s390x/helper.h
> +++ b/target/s390x/helper.h
> @@ -331,8 +331,11 @@ DEF_HELPER_FLAGS_5(gvec_vfs32s, TCG_CALL_NO_WG, void, 
> ptr, cptr, cptr, env, i32)
>  DEF_HELPER_FLAGS_5(gvec_vfs64, TCG_CALL_NO_WG, void, ptr, cptr, cptr, env, 
> i32)
>  DEF_HELPER_FLAGS_5(gvec_vfs64s, TCG_CALL_NO_WG, void, ptr, cptr, cptr, env, 
> i32)
>  DEF_HELPER_FLAGS_5(gvec_vfs128, TCG_CALL_NO_WG, void, ptr, cptr, cptr, env, 
> i32)
> +DEF_HELPER_4(gvec_vftci32, void, ptr, cptr, env, i32)
> +DEF_HELPER_4(gvec_vftci32s, void, ptr, cptr, env, i32)
>  DEF_HELPER_4(gvec_vftci64, void, ptr, cptr, env, i32)
>  DEF_HELPER_4(gvec_vftci64s, void, ptr, cptr, env, i32)
> +DEF_HELPER_4(gvec_vftci128, void, ptr, cptr, env, i32)
>  
>  #ifndef CONFIG_USER_ONLY
>  DEF_HELPER_3(servc, i32, env, i64, i64)
> diff --git a/target/s390x/translate_vx.c.inc b/target/s390x/translate_vx.c.inc
> index 7d4811ccf7..6bd599b319 100644
> --- a/target/s390x/translate_vx.c.inc
> +++ b/target/s390x/translate_vx.c.inc
> @@ -2991,16 +2991,32 @@ static DisasJumpType op_vftci(DisasContext *s, 
> DisasOps *o)
>      const uint16_t i3 = get_field(s, i3);
>      const uint8_t fpf = get_field(s, m4);
>      const uint8_t m5 = get_field(s, m5);
> -    gen_helper_gvec_2_ptr *fn = gen_helper_gvec_vftci64;
> +    const bool se = extract32(m5, 3, 1);
> +    gen_helper_gvec_2_ptr *fn = NULL;
>  
> -    if (fpf != FPF_LONG || extract32(m5, 0, 3)) {
> +    switch (fpf) {
> +    case FPF_SHORT:
> +        if (s390_has_feat(S390_FEAT_VECTOR_ENH)) {
> +            fn = se ? gen_helper_gvec_vftci32s : gen_helper_gvec_vftci32;
> +        }
> +        break;
> +    case FPF_LONG:
> +        fn = se ? gen_helper_gvec_vftci64s : gen_helper_gvec_vftci64;
> +        break;
> +    case FPF_EXT:
> +        if (s390_has_feat(S390_FEAT_VECTOR_ENH)) {
> +            fn = gen_helper_gvec_vftci128;
> +        }
> +        break;
> +    default:
> +        break;
> +    }
> +
> +    if (!fn || extract32(m5, 0, 3)) {
>          gen_program_exception(s, PGM_SPECIFICATION);
>          return DISAS_NORETURN;
>      }
>  
> -    if (extract32(m5, 3, 1)) {
> -        fn = gen_helper_gvec_vftci64s;
> -    }
>      gen_gvec_2_ptr(get_field(s, v1), get_field(s, v2), cpu_env, i3, fn);
>      set_cc_static(s);
>      return DISAS_NEXT;
> diff --git a/target/s390x/vec_fpu_helper.c b/target/s390x/vec_fpu_helper.c
> index b7045e85d6..f18f0ae8e2 100644
> --- a/target/s390x/vec_fpu_helper.c
> +++ b/target/s390x/vec_fpu_helper.c
> @@ -23,6 +23,9 @@
>  const float32 float32_ones = make_float32(-1u);
>  const float64 float64_ones = make_float64(-1ull);
>  const float128 float128_ones = make_float128(-1ull, -1ull);
> +const float32 float32_zeroes = make_float32(0);
> +const float64 float64_zeroes = make_float64(0);
> +const float128 float128_zeroes = make_float128(0, 0);

These already exist as "zero" not "zeroes".

Otherwise looks ok, modulo the same comments as for all the other macros in
this series.


r~