[19/23] arm: [MVE intrinsics] factorize vqrshrunb vqrshrunt vqshrunb vqshrunt

Message ID 20230505083930.101210-19-christophe.lyon@arm.com
State Accepted
Headers
Series [01/23] arm: [MVE intrinsics] add binary_round_lshift shape |

Checks

Context Check Description
snail/gcc-patch-check success Github commit url

Commit Message

Christophe Lyon May 5, 2023, 8:39 a.m. UTC
  Factorize vqrshrunb, vqrshrunt, vqshrunb, vqshrunt so that they use
existing patterns.

2022-09-08  Christophe Lyon  <christophe.lyon@arm.com>

	gcc/
	* config/arm/iterators.md (MVE_SHRN_N): Add VQRSHRUNBQ,
	VQRSHRUNTQ, VQSHRUNBQ, VQSHRUNTQ.
	(MVE_SHRN_M_N): Likewise.
	(mve_insn): Add vqrshrunb, vqrshrunt, vqshrunb, vqshrunt.
	(isu): Add VQRSHRUNBQ, VQRSHRUNTQ, VQSHRUNBQ, VQSHRUNTQ.
	(supf): Likewise.
	* config/arm/mve.md (mve_vqrshrunbq_n_s<mode>): Remove.
	(mve_vqrshruntq_n_s<mode>): Remove.
	(mve_vqshrunbq_n_s<mode>): Remove.
	(mve_vqshruntq_n_s<mode>): Remove.
	(mve_vqrshrunbq_m_n_s<mode>): Remove.
	(mve_vqrshruntq_m_n_s<mode>): Remove.
	(mve_vqshrunbq_m_n_s<mode>): Remove.
	(mve_vqshruntq_m_n_s<mode>): Remove.
---
 gcc/config/arm/iterators.md |  32 +++++++++
 gcc/config/arm/mve.md       | 140 +++---------------------------------
 2 files changed, 40 insertions(+), 132 deletions(-)
  

Comments

Kyrylo Tkachov May 5, 2023, 11:04 a.m. UTC | #1
> -----Original Message-----
> From: Christophe Lyon <christophe.lyon@arm.com>
> Sent: Friday, May 5, 2023 9:39 AM
> To: gcc-patches@gcc.gnu.org; Kyrylo Tkachov <Kyrylo.Tkachov@arm.com>;
> Richard Earnshaw <Richard.Earnshaw@arm.com>; Richard Sandiford
> <Richard.Sandiford@arm.com>
> Cc: Christophe Lyon <Christophe.Lyon@arm.com>
> Subject: [PATCH 19/23] arm: [MVE intrinsics] factorize vqrshrunb vqrshrunt
> vqshrunb vqshrunt
> 
> Factorize vqrshrunb, vqrshrunt, vqshrunb, vqshrunt so that they use
> existing patterns.

Ok.
Thanks,
Kyrill

> 
> 2022-09-08  Christophe Lyon  <christophe.lyon@arm.com>
> 
> 	gcc/
> 	* config/arm/iterators.md (MVE_SHRN_N): Add VQRSHRUNBQ,
> 	VQRSHRUNTQ, VQSHRUNBQ, VQSHRUNTQ.
> 	(MVE_SHRN_M_N): Likewise.
> 	(mve_insn): Add vqrshrunb, vqrshrunt, vqshrunb, vqshrunt.
> 	(isu): Add VQRSHRUNBQ, VQRSHRUNTQ, VQSHRUNBQ, VQSHRUNTQ.
> 	(supf): Likewise.
> 	* config/arm/mve.md (mve_vqrshrunbq_n_s<mode>): Remove.
> 	(mve_vqrshruntq_n_s<mode>): Remove.
> 	(mve_vqshrunbq_n_s<mode>): Remove.
> 	(mve_vqshruntq_n_s<mode>): Remove.
> 	(mve_vqrshrunbq_m_n_s<mode>): Remove.
> 	(mve_vqrshruntq_m_n_s<mode>): Remove.
> 	(mve_vqshrunbq_m_n_s<mode>): Remove.
> 	(mve_vqshruntq_m_n_s<mode>): Remove.
> ---
>  gcc/config/arm/iterators.md |  32 +++++++++
>  gcc/config/arm/mve.md       | 140 +++---------------------------------
>  2 files changed, 40 insertions(+), 132 deletions(-)
> 
> diff --git a/gcc/config/arm/iterators.md b/gcc/config/arm/iterators.md
> index d64c924a513..583206dac9e 100644
> --- a/gcc/config/arm/iterators.md
> +++ b/gcc/config/arm/iterators.md
> @@ -471,8 +471,12 @@ (define_int_iterator MVE_RSHIFT_N   [
>  (define_int_iterator MVE_SHRN_N [
>  		     VQRSHRNBQ_N_S VQRSHRNBQ_N_U
>  		     VQRSHRNTQ_N_S VQRSHRNTQ_N_U
> +		     VQRSHRUNBQ_N_S
> +		     VQRSHRUNTQ_N_S
>  		     VQSHRNBQ_N_S VQSHRNBQ_N_U
>  		     VQSHRNTQ_N_S VQSHRNTQ_N_U
> +		     VQSHRUNBQ_N_S
> +		     VQSHRUNTQ_N_S
>  		     VRSHRNBQ_N_S VRSHRNBQ_N_U
>  		     VRSHRNTQ_N_S VRSHRNTQ_N_U
>  		     VSHRNBQ_N_S VSHRNBQ_N_U
> @@ -482,8 +486,12 @@ (define_int_iterator MVE_SHRN_N [
>  (define_int_iterator MVE_SHRN_M_N [
>  		     VQRSHRNBQ_M_N_S VQRSHRNBQ_M_N_U
>  		     VQRSHRNTQ_M_N_S VQRSHRNTQ_M_N_U
> +		     VQRSHRUNBQ_M_N_S
> +		     VQRSHRUNTQ_M_N_S
>  		     VQSHRNBQ_M_N_S VQSHRNBQ_M_N_U
>  		     VQSHRNTQ_M_N_S VQSHRNTQ_M_N_U
> +		     VQSHRUNBQ_M_N_S
> +		     VQSHRUNTQ_M_N_S
>  		     VRSHRNBQ_M_N_S VRSHRNBQ_M_N_U
>  		     VRSHRNTQ_M_N_S VRSHRNTQ_M_N_U
>  		     VSHRNBQ_M_N_S VSHRNBQ_M_N_U
> @@ -594,6 +602,10 @@ (define_int_attr mve_insn [
>  		 (VQRSHRNBQ_N_S "vqrshrnb") (VQRSHRNBQ_N_U
> "vqrshrnb")
>  		 (VQRSHRNTQ_M_N_S "vqrshrnt") (VQRSHRNTQ_M_N_U
> "vqrshrnt")
>  		 (VQRSHRNTQ_N_S "vqrshrnt") (VQRSHRNTQ_N_U "vqrshrnt")
> +		 (VQRSHRUNBQ_M_N_S "vqrshrunb")
> +		 (VQRSHRUNBQ_N_S "vqrshrunb")
> +		 (VQRSHRUNTQ_M_N_S "vqrshrunt")
> +		 (VQRSHRUNTQ_N_S "vqrshrunt")
>  		 (VQSHLQ_M_N_S "vqshl") (VQSHLQ_M_N_U "vqshl")
>  		 (VQSHLQ_M_R_S "vqshl") (VQSHLQ_M_R_U "vqshl")
>  		 (VQSHLQ_M_S "vqshl") (VQSHLQ_M_U "vqshl")
> @@ -604,6 +616,10 @@ (define_int_attr mve_insn [
>  		 (VQSHRNBQ_N_S "vqshrnb") (VQSHRNBQ_N_U "vqshrnb")
>  		 (VQSHRNTQ_M_N_S "vqshrnt") (VQSHRNTQ_M_N_U
> "vqshrnt")
>  		 (VQSHRNTQ_N_S "vqshrnt") (VQSHRNTQ_N_U "vqshrnt")
> +		 (VQSHRUNBQ_M_N_S "vqshrunb")
> +		 (VQSHRUNBQ_N_S "vqshrunb")
> +		 (VQSHRUNTQ_M_N_S "vqshrunt")
> +		 (VQSHRUNTQ_N_S "vqshrunt")
>  		 (VQSUBQ_M_N_S "vqsub") (VQSUBQ_M_N_U "vqsub")
>  		 (VQSUBQ_M_S "vqsub") (VQSUBQ_M_U "vqsub")
>  		 (VQSUBQ_N_S "vqsub") (VQSUBQ_N_U "vqsub")
> @@ -640,10 +656,18 @@ (define_int_attr isu    [
>  		 (VQRSHRNBQ_N_S "s") (VQRSHRNBQ_N_U "u")
>  		 (VQRSHRNTQ_M_N_S "s") (VQRSHRNTQ_M_N_U "u")
>  		 (VQRSHRNTQ_N_S "s") (VQRSHRNTQ_N_U "u")
> +		 (VQRSHRUNBQ_M_N_S "s")
> +		 (VQRSHRUNBQ_N_S "s")
> +		 (VQRSHRUNTQ_M_N_S "s")
> +		 (VQRSHRUNTQ_N_S "s")
>  		 (VQSHRNBQ_M_N_S "s") (VQSHRNBQ_M_N_U "u")
>  		 (VQSHRNBQ_N_S "s") (VQSHRNBQ_N_U "u")
>  		 (VQSHRNTQ_M_N_S "s") (VQSHRNTQ_M_N_U "u")
>  		 (VQSHRNTQ_N_S "s") (VQSHRNTQ_N_U "u")
> +		 (VQSHRUNBQ_M_N_S "s")
> +		 (VQSHRUNBQ_N_S "s")
> +		 (VQSHRUNTQ_M_N_S "s")
> +		 (VQSHRUNTQ_N_S "s")
>  		 (VRSHRNBQ_M_N_S "i") (VRSHRNBQ_M_N_U "i")
>  		 (VRSHRNBQ_N_S "i") (VRSHRNBQ_N_U "i")
>  		 (VRSHRNTQ_M_N_S "i") (VRSHRNTQ_M_N_U "i")
> @@ -1816,6 +1840,14 @@ (define_int_attr supf [(VCVTQ_TO_F_S "s")
> (VCVTQ_TO_F_U "u") (VREV16Q_S "s")
>  		       (VQRDMULHQ_M_N_S "s")
>  		       (VQDMULHQ_S "s")
>  		       (VQRDMULHQ_S "s")
> +		       (VQRSHRUNBQ_M_N_S "s")
> +		       (VQRSHRUNBQ_N_S "s")
> +		       (VQRSHRUNTQ_M_N_S "s")
> +		       (VQRSHRUNTQ_N_S "s")
> +		       (VQSHRUNBQ_M_N_S "s")
> +		       (VQSHRUNBQ_N_S "s")
> +		       (VQSHRUNTQ_M_N_S "s")
> +		       (VQSHRUNTQ_N_S "s")
>  		       ])
> 
>  ;; Both kinds of return insn.
> diff --git a/gcc/config/arm/mve.md b/gcc/config/arm/mve.md
> index d64a075c7bb..20ce7ecb3d6 100644
> --- a/gcc/config/arm/mve.md
> +++ b/gcc/config/arm/mve.md
> @@ -2166,8 +2166,12 @@ (define_insn
> "mve_vcvtq_m_to_f_<supf><mode>"
>  ;;
>  ;; [vqrshrnbq_n_u, vqrshrnbq_n_s]
>  ;; [vqrshrntq_n_u, vqrshrntq_n_s]
> +;; [vqrshrunbq_n_s]
> +;; [vqrshruntq_n_s]
>  ;; [vqshrnbq_n_u, vqshrnbq_n_s]
>  ;; [vqshrntq_n_u, vqshrntq_n_s]
> +;; [vqshrunbq_n_s]
> +;; [vqshruntq_n_s]
>  ;; [vrshrnbq_n_s, vrshrnbq_n_u]
>  ;; [vrshrntq_n_u, vrshrntq_n_s]
>  ;; [vshrnbq_n_u, vshrnbq_n_s]
> @@ -2186,22 +2190,6 @@ (define_insn
> "@mve_<mve_insn>q_n_<supf><mode>"
>    [(set_attr "type" "mve_move")
>  ])
> 
> -;;
> -;; [vqrshrunbq_n_s])
> -;;
> -(define_insn "mve_vqrshrunbq_n_s<mode>"
> -  [
> -   (set (match_operand:<V_narrow_pack> 0 "s_register_operand" "=w")
> -	(unspec:<V_narrow_pack> [(match_operand:<V_narrow_pack> 1
> "s_register_operand" "0")
> -				 (match_operand:MVE_5 2
> "s_register_operand" "w")
> -				 (match_operand:SI 3 "<MVE_pred3>"
> "<MVE_constraint3>")]
> -	 VQRSHRUNBQ_N_S))
> -  ]
> -  "TARGET_HAVE_MVE"
> -  "vqrshrunb.s%#<V_sz_elem>\t%q0, %q2, %3"
> -  [(set_attr "type" "mve_move")
> -])
> -
>  ;;
>  ;; [vrmlaldavhaq_s vrmlaldavhaq_u])
>  ;;
> @@ -4002,54 +3990,6 @@ (define_insn "mve_vqmovuntq_m_s<mode>"
>    [(set_attr "type" "mve_move")
>     (set_attr "length""8")])
> 
> -;;
> -;; [vqrshruntq_n_s])
> -;;
> -(define_insn "mve_vqrshruntq_n_s<mode>"
> -  [
> -   (set (match_operand:<V_narrow_pack> 0 "s_register_operand" "=w")
> -	(unspec:<V_narrow_pack> [(match_operand:<V_narrow_pack> 1
> "s_register_operand" "0")
> -		       (match_operand:MVE_5 2 "s_register_operand" "w")
> -		       (match_operand:SI 3 "<MVE_pred3>"
> "<MVE_constraint3>")]
> -	 VQRSHRUNTQ_N_S))
> -  ]
> -  "TARGET_HAVE_MVE"
> -  "vqrshrunt.s%#<V_sz_elem>	%q0, %q2, %3"
> -  [(set_attr "type" "mve_move")
> -])
> -
> -;;
> -;; [vqshrunbq_n_s])
> -;;
> -(define_insn "mve_vqshrunbq_n_s<mode>"
> -  [
> -   (set (match_operand:<V_narrow_pack> 0 "s_register_operand" "=w")
> -	(unspec:<V_narrow_pack> [(match_operand:<V_narrow_pack> 1
> "s_register_operand" "0")
> -		       (match_operand:MVE_5 2 "s_register_operand" "w")
> -		       (match_operand:SI 3 "<MVE_pred3>"
> "<MVE_constraint3>")]
> -	 VQSHRUNBQ_N_S))
> -  ]
> -  "TARGET_HAVE_MVE"
> -  "vqshrunb.s%#<V_sz_elem>	%q0, %q2, %3"
> -  [(set_attr "type" "mve_move")
> -])
> -
> -;;
> -;; [vqshruntq_n_s])
> -;;
> -(define_insn "mve_vqshruntq_n_s<mode>"
> -  [
> -   (set (match_operand:<V_narrow_pack> 0 "s_register_operand" "=w")
> -	(unspec:<V_narrow_pack> [(match_operand:<V_narrow_pack> 1
> "s_register_operand" "0")
> -		       (match_operand:MVE_5 2 "s_register_operand" "w")
> -		       (match_operand:SI 3 "<MVE_pred3>"
> "<MVE_constraint3>")]
> -	 VQSHRUNTQ_N_S))
> -  ]
> -  "TARGET_HAVE_MVE"
> -  "vqshrunt.s%#<V_sz_elem>	%q0, %q2, %3"
> -  [(set_attr "type" "mve_move")
> -])
> -
>  ;;
>  ;; [vrev32q_m_f])
>  ;;
> @@ -4892,8 +4832,12 @@ (define_insn
> "mve_vmlaldavaxq_p_<supf><mode>"
>  ;;
>  ;; [vqrshrnbq_m_n_u, vqrshrnbq_m_n_s]
>  ;; [vqrshrntq_m_n_s, vqrshrntq_m_n_u]
> +;; [vqrshrunbq_m_n_s]
> +;; [vqrshruntq_m_n_s]
>  ;; [vqshrnbq_m_n_u, vqshrnbq_m_n_s]
>  ;; [vqshrntq_m_n_s, vqshrntq_m_n_u]
> +;; [vqshrunbq_m_n_s]
> +;; [vqshruntq_m_n_s]
>  ;; [vrshrnbq_m_n_u, vrshrnbq_m_n_s]
>  ;; [vrshrntq_m_n_u, vrshrntq_m_n_s]
>  ;; [vshrnbq_m_n_s, vshrnbq_m_n_u]
> @@ -5100,74 +5044,6 @@ (define_insn "mve_vqdmulltq_m_s<mode>"
>    [(set_attr "type" "mve_move")
>     (set_attr "length""8")])
> 
> -;;
> -;; [vqrshrunbq_m_n_s])
> -;;
> -(define_insn "mve_vqrshrunbq_m_n_s<mode>"
> -  [
> -   (set (match_operand:<V_narrow_pack> 0 "s_register_operand" "=w")
> -	(unspec:<V_narrow_pack> [(match_operand:<V_narrow_pack> 1
> "s_register_operand" "0")
> -		       (match_operand:MVE_5 2 "s_register_operand" "w")
> -		       (match_operand:SI 3 "<MVE_pred3>"
> "<MVE_constraint3>")
> -		       (match_operand:<MVE_VPRED> 4
> "vpr_register_operand" "Up")]
> -	 VQRSHRUNBQ_M_N_S))
> -  ]
> -  "TARGET_HAVE_MVE"
> -  "vpst\;vqrshrunbt.s%#<V_sz_elem>\t%q0, %q2, %3"
> -  [(set_attr "type" "mve_move")
> -   (set_attr "length""8")])
> -
> -;;
> -;; [vqrshruntq_m_n_s])
> -;;
> -(define_insn "mve_vqrshruntq_m_n_s<mode>"
> -  [
> -   (set (match_operand:<V_narrow_pack> 0 "s_register_operand" "=w")
> -	(unspec:<V_narrow_pack> [(match_operand:<V_narrow_pack> 1
> "s_register_operand" "0")
> -		       (match_operand:MVE_5 2 "s_register_operand" "w")
> -		       (match_operand:SI 3 "<MVE_pred3>"
> "<MVE_constraint3>")
> -		       (match_operand:<MVE_VPRED> 4
> "vpr_register_operand" "Up")]
> -	 VQRSHRUNTQ_M_N_S))
> -  ]
> -  "TARGET_HAVE_MVE"
> -  "vpst\;vqrshruntt.s%#<V_sz_elem>\t%q0, %q2, %3"
> -  [(set_attr "type" "mve_move")
> -   (set_attr "length""8")])
> -
> -;;
> -;; [vqshrunbq_m_n_s])
> -;;
> -(define_insn "mve_vqshrunbq_m_n_s<mode>"
> -  [
> -   (set (match_operand:<V_narrow_pack> 0 "s_register_operand" "=w")
> -	(unspec:<V_narrow_pack> [(match_operand:<V_narrow_pack> 1
> "s_register_operand" "0")
> -		       (match_operand:MVE_5 2 "s_register_operand" "w")
> -		       (match_operand:SI 3 "<MVE_pred3>"
> "<MVE_constraint3>")
> -		       (match_operand:<MVE_VPRED> 4
> "vpr_register_operand" "Up")]
> -	 VQSHRUNBQ_M_N_S))
> -  ]
> -  "TARGET_HAVE_MVE"
> -  "vpst\;vqshrunbt.s%#<V_sz_elem>\t%q0, %q2, %3"
> -  [(set_attr "type" "mve_move")
> -   (set_attr "length""8")])
> -
> -;;
> -;; [vqshruntq_m_n_s])
> -;;
> -(define_insn "mve_vqshruntq_m_n_s<mode>"
> -  [
> -   (set (match_operand:<V_narrow_pack> 0 "s_register_operand" "=w")
> -	(unspec:<V_narrow_pack> [(match_operand:<V_narrow_pack> 1
> "s_register_operand" "0")
> -		       (match_operand:MVE_5 2 "s_register_operand" "w")
> -		       (match_operand:SI 3 "<MVE_pred3>"
> "<MVE_constraint3>")
> -		       (match_operand:<MVE_VPRED> 4
> "vpr_register_operand" "Up")]
> -	 VQSHRUNTQ_M_N_S))
> -  ]
> -  "TARGET_HAVE_MVE"
> -  "vpst\;vqshruntt.s%#<V_sz_elem>\t%q0, %q2, %3"
> -  [(set_attr "type" "mve_move")
> -   (set_attr "length""8")])
> -
>  ;;
>  ;; [vrmlaldavhaq_p_u])
>  ;;
> --
> 2.34.1
  

Patch

diff --git a/gcc/config/arm/iterators.md b/gcc/config/arm/iterators.md
index d64c924a513..583206dac9e 100644
--- a/gcc/config/arm/iterators.md
+++ b/gcc/config/arm/iterators.md
@@ -471,8 +471,12 @@  (define_int_iterator MVE_RSHIFT_N   [
 (define_int_iterator MVE_SHRN_N [
 		     VQRSHRNBQ_N_S VQRSHRNBQ_N_U
 		     VQRSHRNTQ_N_S VQRSHRNTQ_N_U
+		     VQRSHRUNBQ_N_S
+		     VQRSHRUNTQ_N_S
 		     VQSHRNBQ_N_S VQSHRNBQ_N_U
 		     VQSHRNTQ_N_S VQSHRNTQ_N_U
+		     VQSHRUNBQ_N_S
+		     VQSHRUNTQ_N_S
 		     VRSHRNBQ_N_S VRSHRNBQ_N_U
 		     VRSHRNTQ_N_S VRSHRNTQ_N_U
 		     VSHRNBQ_N_S VSHRNBQ_N_U
@@ -482,8 +486,12 @@  (define_int_iterator MVE_SHRN_N [
 (define_int_iterator MVE_SHRN_M_N [
 		     VQRSHRNBQ_M_N_S VQRSHRNBQ_M_N_U
 		     VQRSHRNTQ_M_N_S VQRSHRNTQ_M_N_U
+		     VQRSHRUNBQ_M_N_S
+		     VQRSHRUNTQ_M_N_S
 		     VQSHRNBQ_M_N_S VQSHRNBQ_M_N_U
 		     VQSHRNTQ_M_N_S VQSHRNTQ_M_N_U
+		     VQSHRUNBQ_M_N_S
+		     VQSHRUNTQ_M_N_S
 		     VRSHRNBQ_M_N_S VRSHRNBQ_M_N_U
 		     VRSHRNTQ_M_N_S VRSHRNTQ_M_N_U
 		     VSHRNBQ_M_N_S VSHRNBQ_M_N_U
@@ -594,6 +602,10 @@  (define_int_attr mve_insn [
 		 (VQRSHRNBQ_N_S "vqrshrnb") (VQRSHRNBQ_N_U "vqrshrnb")
 		 (VQRSHRNTQ_M_N_S "vqrshrnt") (VQRSHRNTQ_M_N_U "vqrshrnt")
 		 (VQRSHRNTQ_N_S "vqrshrnt") (VQRSHRNTQ_N_U "vqrshrnt")
+		 (VQRSHRUNBQ_M_N_S "vqrshrunb")
+		 (VQRSHRUNBQ_N_S "vqrshrunb")
+		 (VQRSHRUNTQ_M_N_S "vqrshrunt")
+		 (VQRSHRUNTQ_N_S "vqrshrunt")
 		 (VQSHLQ_M_N_S "vqshl") (VQSHLQ_M_N_U "vqshl")
 		 (VQSHLQ_M_R_S "vqshl") (VQSHLQ_M_R_U "vqshl")
 		 (VQSHLQ_M_S "vqshl") (VQSHLQ_M_U "vqshl")
@@ -604,6 +616,10 @@  (define_int_attr mve_insn [
 		 (VQSHRNBQ_N_S "vqshrnb") (VQSHRNBQ_N_U "vqshrnb")
 		 (VQSHRNTQ_M_N_S "vqshrnt") (VQSHRNTQ_M_N_U "vqshrnt")
 		 (VQSHRNTQ_N_S "vqshrnt") (VQSHRNTQ_N_U "vqshrnt")
+		 (VQSHRUNBQ_M_N_S "vqshrunb")
+		 (VQSHRUNBQ_N_S "vqshrunb")
+		 (VQSHRUNTQ_M_N_S "vqshrunt")
+		 (VQSHRUNTQ_N_S "vqshrunt")
 		 (VQSUBQ_M_N_S "vqsub") (VQSUBQ_M_N_U "vqsub")
 		 (VQSUBQ_M_S "vqsub") (VQSUBQ_M_U "vqsub")
 		 (VQSUBQ_N_S "vqsub") (VQSUBQ_N_U "vqsub")
@@ -640,10 +656,18 @@  (define_int_attr isu    [
 		 (VQRSHRNBQ_N_S "s") (VQRSHRNBQ_N_U "u")
 		 (VQRSHRNTQ_M_N_S "s") (VQRSHRNTQ_M_N_U "u")
 		 (VQRSHRNTQ_N_S "s") (VQRSHRNTQ_N_U "u")
+		 (VQRSHRUNBQ_M_N_S "s")
+		 (VQRSHRUNBQ_N_S "s")
+		 (VQRSHRUNTQ_M_N_S "s")
+		 (VQRSHRUNTQ_N_S "s")
 		 (VQSHRNBQ_M_N_S "s") (VQSHRNBQ_M_N_U "u")
 		 (VQSHRNBQ_N_S "s") (VQSHRNBQ_N_U "u")
 		 (VQSHRNTQ_M_N_S "s") (VQSHRNTQ_M_N_U "u")
 		 (VQSHRNTQ_N_S "s") (VQSHRNTQ_N_U "u")
+		 (VQSHRUNBQ_M_N_S "s")
+		 (VQSHRUNBQ_N_S "s")
+		 (VQSHRUNTQ_M_N_S "s")
+		 (VQSHRUNTQ_N_S "s")
 		 (VRSHRNBQ_M_N_S "i") (VRSHRNBQ_M_N_U "i")
 		 (VRSHRNBQ_N_S "i") (VRSHRNBQ_N_U "i")
 		 (VRSHRNTQ_M_N_S "i") (VRSHRNTQ_M_N_U "i")
@@ -1816,6 +1840,14 @@  (define_int_attr supf [(VCVTQ_TO_F_S "s") (VCVTQ_TO_F_U "u") (VREV16Q_S "s")
 		       (VQRDMULHQ_M_N_S "s")
 		       (VQDMULHQ_S "s")
 		       (VQRDMULHQ_S "s")
+		       (VQRSHRUNBQ_M_N_S "s")
+		       (VQRSHRUNBQ_N_S "s")
+		       (VQRSHRUNTQ_M_N_S "s")
+		       (VQRSHRUNTQ_N_S "s")
+		       (VQSHRUNBQ_M_N_S "s")
+		       (VQSHRUNBQ_N_S "s")
+		       (VQSHRUNTQ_M_N_S "s")
+		       (VQSHRUNTQ_N_S "s")
 		       ])
 
 ;; Both kinds of return insn.
diff --git a/gcc/config/arm/mve.md b/gcc/config/arm/mve.md
index d64a075c7bb..20ce7ecb3d6 100644
--- a/gcc/config/arm/mve.md
+++ b/gcc/config/arm/mve.md
@@ -2166,8 +2166,12 @@  (define_insn "mve_vcvtq_m_to_f_<supf><mode>"
 ;;
 ;; [vqrshrnbq_n_u, vqrshrnbq_n_s]
 ;; [vqrshrntq_n_u, vqrshrntq_n_s]
+;; [vqrshrunbq_n_s]
+;; [vqrshruntq_n_s]
 ;; [vqshrnbq_n_u, vqshrnbq_n_s]
 ;; [vqshrntq_n_u, vqshrntq_n_s]
+;; [vqshrunbq_n_s]
+;; [vqshruntq_n_s]
 ;; [vrshrnbq_n_s, vrshrnbq_n_u]
 ;; [vrshrntq_n_u, vrshrntq_n_s]
 ;; [vshrnbq_n_u, vshrnbq_n_s]
@@ -2186,22 +2190,6 @@  (define_insn "@mve_<mve_insn>q_n_<supf><mode>"
   [(set_attr "type" "mve_move")
 ])
 
-;;
-;; [vqrshrunbq_n_s])
-;;
-(define_insn "mve_vqrshrunbq_n_s<mode>"
-  [
-   (set (match_operand:<V_narrow_pack> 0 "s_register_operand" "=w")
-	(unspec:<V_narrow_pack> [(match_operand:<V_narrow_pack> 1 "s_register_operand" "0")
-				 (match_operand:MVE_5 2 "s_register_operand" "w")
-				 (match_operand:SI 3 "<MVE_pred3>" "<MVE_constraint3>")]
-	 VQRSHRUNBQ_N_S))
-  ]
-  "TARGET_HAVE_MVE"
-  "vqrshrunb.s%#<V_sz_elem>\t%q0, %q2, %3"
-  [(set_attr "type" "mve_move")
-])
-
 ;;
 ;; [vrmlaldavhaq_s vrmlaldavhaq_u])
 ;;
@@ -4002,54 +3990,6 @@  (define_insn "mve_vqmovuntq_m_s<mode>"
   [(set_attr "type" "mve_move")
    (set_attr "length""8")])
 
-;;
-;; [vqrshruntq_n_s])
-;;
-(define_insn "mve_vqrshruntq_n_s<mode>"
-  [
-   (set (match_operand:<V_narrow_pack> 0 "s_register_operand" "=w")
-	(unspec:<V_narrow_pack> [(match_operand:<V_narrow_pack> 1 "s_register_operand" "0")
-		       (match_operand:MVE_5 2 "s_register_operand" "w")
-		       (match_operand:SI 3 "<MVE_pred3>" "<MVE_constraint3>")]
-	 VQRSHRUNTQ_N_S))
-  ]
-  "TARGET_HAVE_MVE"
-  "vqrshrunt.s%#<V_sz_elem>	%q0, %q2, %3"
-  [(set_attr "type" "mve_move")
-])
-
-;;
-;; [vqshrunbq_n_s])
-;;
-(define_insn "mve_vqshrunbq_n_s<mode>"
-  [
-   (set (match_operand:<V_narrow_pack> 0 "s_register_operand" "=w")
-	(unspec:<V_narrow_pack> [(match_operand:<V_narrow_pack> 1 "s_register_operand" "0")
-		       (match_operand:MVE_5 2 "s_register_operand" "w")
-		       (match_operand:SI 3 "<MVE_pred3>" "<MVE_constraint3>")]
-	 VQSHRUNBQ_N_S))
-  ]
-  "TARGET_HAVE_MVE"
-  "vqshrunb.s%#<V_sz_elem>	%q0, %q2, %3"
-  [(set_attr "type" "mve_move")
-])
-
-;;
-;; [vqshruntq_n_s])
-;;
-(define_insn "mve_vqshruntq_n_s<mode>"
-  [
-   (set (match_operand:<V_narrow_pack> 0 "s_register_operand" "=w")
-	(unspec:<V_narrow_pack> [(match_operand:<V_narrow_pack> 1 "s_register_operand" "0")
-		       (match_operand:MVE_5 2 "s_register_operand" "w")
-		       (match_operand:SI 3 "<MVE_pred3>" "<MVE_constraint3>")]
-	 VQSHRUNTQ_N_S))
-  ]
-  "TARGET_HAVE_MVE"
-  "vqshrunt.s%#<V_sz_elem>	%q0, %q2, %3"
-  [(set_attr "type" "mve_move")
-])
-
 ;;
 ;; [vrev32q_m_f])
 ;;
@@ -4892,8 +4832,12 @@  (define_insn "mve_vmlaldavaxq_p_<supf><mode>"
 ;;
 ;; [vqrshrnbq_m_n_u, vqrshrnbq_m_n_s]
 ;; [vqrshrntq_m_n_s, vqrshrntq_m_n_u]
+;; [vqrshrunbq_m_n_s]
+;; [vqrshruntq_m_n_s]
 ;; [vqshrnbq_m_n_u, vqshrnbq_m_n_s]
 ;; [vqshrntq_m_n_s, vqshrntq_m_n_u]
+;; [vqshrunbq_m_n_s]
+;; [vqshruntq_m_n_s]
 ;; [vrshrnbq_m_n_u, vrshrnbq_m_n_s]
 ;; [vrshrntq_m_n_u, vrshrntq_m_n_s]
 ;; [vshrnbq_m_n_s, vshrnbq_m_n_u]
@@ -5100,74 +5044,6 @@  (define_insn "mve_vqdmulltq_m_s<mode>"
   [(set_attr "type" "mve_move")
    (set_attr "length""8")])
 
-;;
-;; [vqrshrunbq_m_n_s])
-;;
-(define_insn "mve_vqrshrunbq_m_n_s<mode>"
-  [
-   (set (match_operand:<V_narrow_pack> 0 "s_register_operand" "=w")
-	(unspec:<V_narrow_pack> [(match_operand:<V_narrow_pack> 1 "s_register_operand" "0")
-		       (match_operand:MVE_5 2 "s_register_operand" "w")
-		       (match_operand:SI 3 "<MVE_pred3>" "<MVE_constraint3>")
-		       (match_operand:<MVE_VPRED> 4 "vpr_register_operand" "Up")]
-	 VQRSHRUNBQ_M_N_S))
-  ]
-  "TARGET_HAVE_MVE"
-  "vpst\;vqrshrunbt.s%#<V_sz_elem>\t%q0, %q2, %3"
-  [(set_attr "type" "mve_move")
-   (set_attr "length""8")])
-
-;;
-;; [vqrshruntq_m_n_s])
-;;
-(define_insn "mve_vqrshruntq_m_n_s<mode>"
-  [
-   (set (match_operand:<V_narrow_pack> 0 "s_register_operand" "=w")
-	(unspec:<V_narrow_pack> [(match_operand:<V_narrow_pack> 1 "s_register_operand" "0")
-		       (match_operand:MVE_5 2 "s_register_operand" "w")
-		       (match_operand:SI 3 "<MVE_pred3>" "<MVE_constraint3>")
-		       (match_operand:<MVE_VPRED> 4 "vpr_register_operand" "Up")]
-	 VQRSHRUNTQ_M_N_S))
-  ]
-  "TARGET_HAVE_MVE"
-  "vpst\;vqrshruntt.s%#<V_sz_elem>\t%q0, %q2, %3"
-  [(set_attr "type" "mve_move")
-   (set_attr "length""8")])
-
-;;
-;; [vqshrunbq_m_n_s])
-;;
-(define_insn "mve_vqshrunbq_m_n_s<mode>"
-  [
-   (set (match_operand:<V_narrow_pack> 0 "s_register_operand" "=w")
-	(unspec:<V_narrow_pack> [(match_operand:<V_narrow_pack> 1 "s_register_operand" "0")
-		       (match_operand:MVE_5 2 "s_register_operand" "w")
-		       (match_operand:SI 3 "<MVE_pred3>" "<MVE_constraint3>")
-		       (match_operand:<MVE_VPRED> 4 "vpr_register_operand" "Up")]
-	 VQSHRUNBQ_M_N_S))
-  ]
-  "TARGET_HAVE_MVE"
-  "vpst\;vqshrunbt.s%#<V_sz_elem>\t%q0, %q2, %3"
-  [(set_attr "type" "mve_move")
-   (set_attr "length""8")])
-
-;;
-;; [vqshruntq_m_n_s])
-;;
-(define_insn "mve_vqshruntq_m_n_s<mode>"
-  [
-   (set (match_operand:<V_narrow_pack> 0 "s_register_operand" "=w")
-	(unspec:<V_narrow_pack> [(match_operand:<V_narrow_pack> 1 "s_register_operand" "0")
-		       (match_operand:MVE_5 2 "s_register_operand" "w")
-		       (match_operand:SI 3 "<MVE_pred3>" "<MVE_constraint3>")
-		       (match_operand:<MVE_VPRED> 4 "vpr_register_operand" "Up")]
-	 VQSHRUNTQ_M_N_S))
-  ]
-  "TARGET_HAVE_MVE"
-  "vpst\;vqshruntt.s%#<V_sz_elem>\t%q0, %q2, %3"
-  [(set_attr "type" "mve_move")
-   (set_attr "length""8")])
-
 ;;
 ;; [vrmlaldavhaq_p_u])
 ;;