public inbox for gcc-patches@gcc.gnu.org
 help / color / mirror / Atom feed
From: Andreas Krebbel <krebbel@linux.ibm.com>
To: Ilya Leoshkevich <iii@linux.ibm.com>
Cc: gcc-patches@gcc.gnu.org
Subject: Re: [PATCH v3 7/9] S/390: Remove code duplication in vec_* comparison expanders
Date: Mon, 30 Sep 2019 14:50:00 -0000	[thread overview]
Message-ID: <d8f731a8-8788-f1e8-efa3-d41362fc23f1@linux.ibm.com> (raw)
In-Reply-To: <20190905111019.8951-8-iii@linux.ibm.com>

On 05.09.19 13:10, Ilya Leoshkevich wrote:
> s390.md uses a lot of near-identical expanders that perform dispatching
> to other expanders based on operand types. Since the following patch
> would require even more of these, avoid copy-pasting the code by
> generating these expanders using an iterator.
> 
> gcc/ChangeLog:
> 
> 2019-08-09  Ilya Leoshkevich  <iii@linux.ibm.com>
> 
> 	PR target/77918
> 	* config/s390/s390.c (s390_expand_vec_compare): Use
> 	gen_vec_cmpordered and gen_vec_cmpunordered.
> 	* config/s390/vector.md (vec_cmpuneq, vec_cmpltgt, vec_ordered,
> 	vec_unordered): Delete.
> 	(vec_ordered<mode>): Rename to vec_cmpordered<mode>.
> 	(vec_unordered<mode>): Rename to vec_cmpunordered<mode>.
> 	(vec_cmp<code>): Generic dispatcher.

VEC_CODE_WITH_COMPLEX_EXPAND is pretty long and doesn't mention that it is about compare operators.
Perhaps VEC_CMP_EXPAND or something like this? Btw. could you please mention the new iterator in the
changelog.

Ok.

Andreas

> ---
>  gcc/config/s390/s390.c    |  4 +--
>  gcc/config/s390/vector.md | 67 +++++++--------------------------------
>  2 files changed, 13 insertions(+), 58 deletions(-)
> 
> diff --git a/gcc/config/s390/s390.c b/gcc/config/s390/s390.c
> index 24784266848..f36e12affd2 100644
> --- a/gcc/config/s390/s390.c
> +++ b/gcc/config/s390/s390.c
> @@ -6523,10 +6523,10 @@ s390_expand_vec_compare (rtx target, enum rtx_code cond,
>  	  emit_insn (gen_vec_cmpltgt (target, cmp_op1, cmp_op2));
>  	  return;
>  	case ORDERED:
> -	  emit_insn (gen_vec_ordered (target, cmp_op1, cmp_op2));
> +	  emit_insn (gen_vec_cmpordered (target, cmp_op1, cmp_op2));
>  	  return;
>  	case UNORDERED:
> -	  emit_insn (gen_vec_unordered (target, cmp_op1, cmp_op2));
> +	  emit_insn (gen_vec_cmpunordered (target, cmp_op1, cmp_op2));
>  	  return;
>  	default: break;
>  	}
> diff --git a/gcc/config/s390/vector.md b/gcc/config/s390/vector.md
> index 1b66b8be61f..a093ae5c565 100644
> --- a/gcc/config/s390/vector.md
> +++ b/gcc/config/s390/vector.md
> @@ -1507,22 +1507,6 @@
>    operands[3] = gen_reg_rtx (<tointvec>mode);
>  })
>  
> -(define_expand "vec_cmpuneq"
> -  [(match_operand 0 "register_operand" "")
> -   (match_operand 1 "register_operand" "")
> -   (match_operand 2 "register_operand" "")]
> -  "TARGET_VX"
> -{
> -  if (GET_MODE (operands[1]) == V4SFmode)
> -    emit_insn (gen_vec_cmpuneqv4sf (operands[0], operands[1], operands[2]));
> -  else if (GET_MODE (operands[1]) == V2DFmode)
> -    emit_insn (gen_vec_cmpuneqv2df (operands[0], operands[1], operands[2]));
> -  else
> -    gcc_unreachable ();
> -
> -  DONE;
> -})
> -
>  ; LTGT a <> b -> a > b | b > a
>  (define_expand "vec_cmpltgt<mode>"
>    [(set (match_operand:<tointvec>         0 "register_operand" "=v")
> @@ -1535,24 +1519,8 @@
>    operands[3] = gen_reg_rtx (<tointvec>mode);
>  })
>  
> -(define_expand "vec_cmpltgt"
> -  [(match_operand 0 "register_operand" "")
> -   (match_operand 1 "register_operand" "")
> -   (match_operand 2 "register_operand" "")]
> -  "TARGET_VX"
> -{
> -  if (GET_MODE (operands[1]) == V4SFmode)
> -    emit_insn (gen_vec_cmpltgtv4sf (operands[0], operands[1], operands[2]));
> -  else if (GET_MODE (operands[1]) == V2DFmode)
> -    emit_insn (gen_vec_cmpltgtv2df (operands[0], operands[1], operands[2]));
> -  else
> -    gcc_unreachable ();
> -
> -  DONE;
> -})
> -
>  ; ORDERED (a, b): a >= b | b > a
> -(define_expand "vec_ordered<mode>"
> +(define_expand "vec_cmpordered<mode>"
>    [(set (match_operand:<tointvec>          0 "register_operand" "=v")
>  	(ge:<tointvec> (match_operand:VFT 1 "register_operand"  "v")
>  		 (match_operand:VFT 2 "register_operand"  "v")))
> @@ -1563,45 +1531,32 @@
>    operands[3] = gen_reg_rtx (<tointvec>mode);
>  })
>  
> -(define_expand "vec_ordered"
> -  [(match_operand 0 "register_operand" "")
> -   (match_operand 1 "register_operand" "")
> -   (match_operand 2 "register_operand" "")]
> -  "TARGET_VX"
> -{
> -  if (GET_MODE (operands[1]) == V4SFmode)
> -    emit_insn (gen_vec_orderedv4sf (operands[0], operands[1], operands[2]));
> -  else if (GET_MODE (operands[1]) == V2DFmode)
> -    emit_insn (gen_vec_orderedv2df (operands[0], operands[1], operands[2]));
> -  else
> -    gcc_unreachable ();
> -
> -  DONE;
> -})
> -
>  ; UNORDERED (a, b): !ORDERED (a, b)
> -(define_expand "vec_unordered<mode>"
> +(define_expand "vec_cmpunordered<mode>"
>    [(match_operand:<tointvec> 0 "register_operand" "=v")
>     (match_operand:VFT        1 "register_operand" "v")
>     (match_operand:VFT        2 "register_operand" "v")]
>    "TARGET_VX"
>  {
> -  emit_insn (gen_vec_ordered<mode> (operands[0], operands[1], operands[2]));
> +  emit_insn (gen_vec_cmpordered<mode> (operands[0], operands[1], operands[2]));
>    emit_insn (gen_rtx_SET (operands[0],
>  	     gen_rtx_NOT (<tointvec>mode, operands[0])));
>    DONE;
>  })
>  
> -(define_expand "vec_unordered"
> +(define_code_iterator VEC_CODE_WITH_COMPLEX_EXPAND
> +  [uneq ltgt ordered unordered])
> +
> +(define_expand "vec_cmp<code>"
>    [(match_operand 0 "register_operand" "")
> -   (match_operand 1 "register_operand" "")
> -   (match_operand 2 "register_operand" "")]
> +   (VEC_CODE_WITH_COMPLEX_EXPAND (match_operand 1 "register_operand" "")
> +				 (match_operand 2 "register_operand" ""))]
>    "TARGET_VX"
>  {
>    if (GET_MODE (operands[1]) == V4SFmode)
> -    emit_insn (gen_vec_unorderedv4sf (operands[0], operands[1], operands[2]));
> +    emit_insn (gen_vec_cmp<code>v4sf (operands[0], operands[1], operands[2]));
>    else if (GET_MODE (operands[1]) == V2DFmode)
> -    emit_insn (gen_vec_unorderedv2df (operands[0], operands[1], operands[2]));
> +    emit_insn (gen_vec_cmp<code>v2df (operands[0], operands[1], operands[2]));
>    else
>      gcc_unreachable ();
>  
> 

      reply	other threads:[~2019-09-30 14:50 UTC|newest]

Thread overview: 23+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2019-09-05 11:10 [PATCH v3 0/9] S/390: Use signaling FP comparison instructions Ilya Leoshkevich
2019-09-05 11:10 ` [PATCH v3 1/9] Allow COND_EXPR and VEC_COND_EXPR condtions to trap Ilya Leoshkevich
2019-09-06 11:07   ` Richard Biener
2019-09-06 15:45     ` Ilya Leoshkevich
2019-09-09  8:43       ` Richard Biener
2019-09-05 11:11 ` [PATCH v3 4/9] S/390: Do not use signaling vector comparisons on z13 Ilya Leoshkevich
2019-09-06 10:34   ` Segher Boessenkool
2019-09-30 13:36     ` Ilya Leoshkevich
2019-10-01  0:24       ` Segher Boessenkool
2019-09-05 11:11 ` [PATCH v3 3/9] Introduce can_vector_compare_p function Ilya Leoshkevich
2019-09-06 12:58   ` Richard Sandiford
2019-09-05 11:11 ` [PATCH v3 2/9] Introduce rtx_alloca, alloca_raw_REG and alloca_rtx_fmt_* Ilya Leoshkevich
2019-09-06 11:09   ` Richard Biener
2019-09-06 12:40   ` Richard Sandiford
2019-09-30 15:00     ` Ilya Leoshkevich
2019-09-05 11:11 ` [PATCH v3 5/9] S/390: Implement vcond expander for V1TI,V1TF Ilya Leoshkevich
2019-09-30 14:51   ` Andreas Krebbel
2019-09-05 11:11 ` [PATCH v3 6/9] S/390: Remove code duplication in vec_unordered<mode> Ilya Leoshkevich
2019-09-30 14:41   ` Andreas Krebbel
2019-09-05 11:12 ` [PATCH v3 8/9] S/390: Use signaling FP comparison instructions Ilya Leoshkevich
2019-09-05 11:12 ` [PATCH v3 9/9] S/390: Test " Ilya Leoshkevich
2019-09-05 11:12 ` [PATCH v3 7/9] S/390: Remove code duplication in vec_* comparison expanders Ilya Leoshkevich
2019-09-30 14:50   ` Andreas Krebbel [this message]

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=d8f731a8-8788-f1e8-efa3-d41362fc23f1@linux.ibm.com \
    --to=krebbel@linux.ibm.com \
    --cc=gcc-patches@gcc.gnu.org \
    --cc=iii@linux.ibm.com \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).