From 4156b05639ad240a82ff2fae92eede5f4e498fec Mon Sep 17 00:00:00 2001 From: Andreas Krebbel Date: Tue, 2 Apr 2019 10:57:39 +0000 Subject: [PATCH] S/390: arch13: Support 32 bit fp-int vector converts gcc/ChangeLog: 2019-04-02 Andreas Krebbel * config/s390/s390.md ("xde"): Extend mode attribute to vector types. * config/s390/vector.md (VX_VEC_CONV_BFP, VX_VEC_CONV_INT): New mode iterators. ("floatv2div2df2", "floatunsv2div2df2", "fix_truncv2dfv2di2") ("fixuns_truncv2dfv2di2"): Enhance with mode iterator to also support 32 bit fp-int conversions. Rename to ... ("float2") ("floatuns2") ("fix_trunc2") ("fixuns_trunc2"): ... to these. gcc/testsuite/ChangeLog: 2019-04-02 Andreas Krebbel * gcc.target/s390/arch13/fp-signedint-convert-1.c: New test. * gcc.target/s390/arch13/fp-unsignedint-convert-1.c: New test. From-SVN: r270081 --- gcc/ChangeLog | 15 +++++ gcc/config/s390/s390.md | 2 +- gcc/config/s390/vector.md | 56 +++++++++++-------- gcc/testsuite/ChangeLog | 5 ++ .../s390/arch13/fp-signedint-convert-1.c | 22 ++++++++ .../s390/arch13/fp-unsignedint-convert-1.c | 24 ++++++++ 6 files changed, 99 insertions(+), 25 deletions(-) create mode 100644 gcc/testsuite/gcc.target/s390/arch13/fp-signedint-convert-1.c create mode 100644 gcc/testsuite/gcc.target/s390/arch13/fp-unsignedint-convert-1.c diff --git a/gcc/ChangeLog b/gcc/ChangeLog index bc1653e1009..feb62e22e70 100644 --- a/gcc/ChangeLog +++ b/gcc/ChangeLog @@ -1,3 +1,18 @@ +2019-04-02 Andreas Krebbel + + * config/s390/s390.md ("xde"): Extend mode attribute to vector + types. + * config/s390/vector.md (VX_VEC_CONV_BFP, VX_VEC_CONV_INT): New + mode iterators. + ("floatv2div2df2", "floatunsv2div2df2", "fix_truncv2dfv2di2") + ("fixuns_truncv2dfv2di2"): Enhance with mode iterator to also + support 32 bit fp-int conversions. Rename to ... + ("float2") + ("floatuns2") + ("fix_trunc2") + ("fixuns_trunc2"): + ... to these. + 2019-04-02 Andreas Krebbel * config/s390/s390.c (s390_rtx_costs): Do not add extra costs for diff --git a/gcc/config/s390/s390.md b/gcc/config/s390/s390.md index 514bd2414c4..d227b26f061 100644 --- a/gcc/config/s390/s390.md +++ b/gcc/config/s390/s390.md @@ -700,7 +700,7 @@ ;; In FP templates, a string like "ltbr" will expand to "ltxbr" in ;; TF/TDmode, "ltdbr" in DF/DDmode, and "ltebr" in SF/SDmode. -(define_mode_attr xde [(TF "x") (DF "d") (SF "e") (TD "x") (DD "d") (SD "e")]) +(define_mode_attr xde [(TF "x") (DF "d") (SF "e") (TD "x") (DD "d") (SD "e") (V4SF "e") (V2DF "d")]) ;; In FP templates, a in "mr" will expand to "mxr" in ;; TF/TDmode, "mdr" in DF/DDmode, "meer" in SFmode and "mer in diff --git a/gcc/config/s390/vector.md b/gcc/config/s390/vector.md index 820372eca29..440af6dec97 100644 --- a/gcc/config/s390/vector.md +++ b/gcc/config/s390/vector.md @@ -68,6 +68,10 @@ (define_mode_iterator V_128_NOSINGLE [V16QI V8HI V4SI V4SF V2DI V2DF]) +; 32 bit int<->fp vector conversion instructions are available since VXE2 (arch13). +(define_mode_iterator VX_VEC_CONV_BFP [V2DF (V4SF "TARGET_VXE2")]) +(define_mode_iterator VX_VEC_CONV_INT [V2DI (V4SI "TARGET_VXE2")]) + ; Empty string for all but TImode. This is used to hide the TImode ; expander name in case it is defined already. See addti3 for an ; example. @@ -1993,48 +1997,52 @@ ; op2: inexact exception not suppressed (IEEE 754 2008) ; op3: according to current rounding mode - -(define_insn "floatv2div2df2" - [(set (match_operand:V2DF 0 "register_operand" "=v") - (float:V2DF (match_operand:V2DI 1 "register_operand" "v")))] - "TARGET_VX" - "vcdgb\t%v0,%v1,0,0" +; vcdgb, vcefb +(define_insn "float2" + [(set (match_operand:VX_VEC_CONV_BFP 0 "register_operand" "=v") + (float:VX_VEC_CONV_BFP (match_operand:VX_VEC_CONV_INT 1 "register_operand" "v")))] + "TARGET_VX + && GET_MODE_UNIT_SIZE (mode) == GET_MODE_UNIT_SIZE (mode)" + "vcb\t%v0,%v1,0,0" [(set_attr "op_type" "VRR")]) ; unsigned integer to floating point ; op2: inexact exception not suppressed (IEEE 754 2008) ; op3: according to current rounding mode - -(define_insn "floatunsv2div2df2" - [(set (match_operand:V2DF 0 "register_operand" "=v") - (unsigned_float:V2DF (match_operand:V2DI 1 "register_operand" "v")))] - "TARGET_VX" - "vcdlgb\t%v0,%v1,0,0" +; vcdlgb, vcelfb +(define_insn "floatuns2" + [(set (match_operand:VX_VEC_CONV_BFP 0 "register_operand" "=v") + (unsigned_float:VX_VEC_CONV_BFP (match_operand:VX_VEC_CONV_INT 1 "register_operand" "v")))] + "TARGET_VX + && GET_MODE_UNIT_SIZE (mode) == GET_MODE_UNIT_SIZE (mode)" + "vclb\t%v0,%v1,0,0" [(set_attr "op_type" "VRR")]) ; floating point to signed integer ; op2: inexact exception not suppressed (IEEE 754 2008) ; op3: rounding mode 5 (round towards 0 C11 6.3.1.4) - -(define_insn "fix_truncv2dfv2di2" - [(set (match_operand:V2DI 0 "register_operand" "=v") - (fix:V2DI (match_operand:V2DF 1 "register_operand" "v")))] - "TARGET_VX" - "vcgdb\t%v0,%v1,0,5" +; vcgdb, vcfeb +(define_insn "fix_trunc2" + [(set (match_operand:VX_VEC_CONV_INT 0 "register_operand" "=v") + (fix:VX_VEC_CONV_INT (match_operand:VX_VEC_CONV_BFP 1 "register_operand" "v")))] + "TARGET_VX + && GET_MODE_UNIT_SIZE (mode) == GET_MODE_UNIT_SIZE (mode)" + "vcb\t%v0,%v1,0,5" [(set_attr "op_type" "VRR")]) ; floating point to unsigned integer ; op2: inexact exception not suppressed (IEEE 754 2008) ; op3: rounding mode 5 (round towards 0 C11 6.3.1.4) - -(define_insn "fixuns_truncv2dfv2di2" - [(set (match_operand:V2DI 0 "register_operand" "=v") - (unsigned_fix:V2DI (match_operand:V2DF 1 "register_operand" "v")))] - "TARGET_VX" - "vclgdb\t%v0,%v1,0,5" +; vclgdb, vclfeb +(define_insn "fixuns_trunc2" + [(set (match_operand:VX_VEC_CONV_INT 0 "register_operand" "=v") + (unsigned_fix:VX_VEC_CONV_INT (match_operand:VX_VEC_CONV_BFP 1 "register_operand" "v")))] + "TARGET_VX + && GET_MODE_UNIT_SIZE (mode) == GET_MODE_UNIT_SIZE (mode)" + "vclb\t%v0,%v1,0,5" [(set_attr "op_type" "VRR")]) ; reduc_smin diff --git a/gcc/testsuite/ChangeLog b/gcc/testsuite/ChangeLog index 087e82bdce9..a86d26a5458 100644 --- a/gcc/testsuite/ChangeLog +++ b/gcc/testsuite/ChangeLog @@ -1,3 +1,8 @@ +2019-04-02 Andreas Krebbel + + * gcc.target/s390/arch13/fp-signedint-convert-1.c: New test. + * gcc.target/s390/arch13/fp-unsignedint-convert-1.c: New test. + 2019-04-02 Andreas Krebbel * gcc.target/s390/arch13/sel-1.c: New test. diff --git a/gcc/testsuite/gcc.target/s390/arch13/fp-signedint-convert-1.c b/gcc/testsuite/gcc.target/s390/arch13/fp-signedint-convert-1.c new file mode 100644 index 00000000000..9801da86cf3 --- /dev/null +++ b/gcc/testsuite/gcc.target/s390/arch13/fp-signedint-convert-1.c @@ -0,0 +1,22 @@ +/* { dg-compile } */ + +typedef int __attribute__((vector_size(16))) v4si; +typedef float __attribute__((vector_size(16))) v4sf; + +v4si +toint (v4sf a) +{ + v4si out = (v4si){ (int)a[0], (int)a[1], (int)a[2], (int)a[3] }; + return out; +} + +/* { dg-final { scan-assembler-times "vcfeb\t%v24,%v24,0,5" 1 } } */ + +v4sf +tofloat (v4si a) +{ + v4sf out = (v4sf){ (float)a[0], (float)a[1], (float)a[2], (float)a[3] }; + return out; +} + +/* { dg-final { scan-assembler-times "vcefb\t%v24,%v24,0,0" 1 } } */ diff --git a/gcc/testsuite/gcc.target/s390/arch13/fp-unsignedint-convert-1.c b/gcc/testsuite/gcc.target/s390/arch13/fp-unsignedint-convert-1.c new file mode 100644 index 00000000000..b93b95daf25 --- /dev/null +++ b/gcc/testsuite/gcc.target/s390/arch13/fp-unsignedint-convert-1.c @@ -0,0 +1,24 @@ +/* { dg-compile } */ + +typedef unsigned int __attribute__((vector_size(16))) v4si; +typedef float __attribute__((vector_size(16))) v4sf; + +v4si +touint (v4sf a) +{ + v4si out = (v4si){ (unsigned int)a[0], (unsigned int)a[1], + (unsigned int)a[2], (unsigned int)a[3] }; + return out; +} + +/* { dg-final { scan-assembler-times "vclfeb\t%v24,%v24,0,5" 1 } } */ + +v4sf +tofloat (v4si a) +{ + v4sf out = (v4sf){ (float)a[0], (float)a[1], + (float)a[2], (float)a[3] }; + return out; +} + +/* { dg-final { scan-assembler-times "vcelfb\t%v24,%v24,0,0" 1 } } */ -- 2.30.2