[PATCH] RISC-V: Add vwadd.w C++ API tests

[PATCH] RISC-V: Add vwadd.w C++ API tests

[juzhe.zhong]

From: Ju-Zhe Zhong <juzhe.zhong@rivai.ai>

gcc/testsuite/ChangeLog:

        * g++.target/riscv/rvv/base/vwadd_wv-1.C: New test.
        * g++.target/riscv/rvv/base/vwadd_wv-2.C: New test.
        * g++.target/riscv/rvv/base/vwadd_wv-3.C: New test.
        * g++.target/riscv/rvv/base/vwadd_wv_mu-1.C: New test.
        * g++.target/riscv/rvv/base/vwadd_wv_mu-2.C: New test.
        * g++.target/riscv/rvv/base/vwadd_wv_mu-3.C: New test.
        * g++.target/riscv/rvv/base/vwadd_wv_tu-1.C: New test.
        * g++.target/riscv/rvv/base/vwadd_wv_tu-2.C: New test.
        * g++.target/riscv/rvv/base/vwadd_wv_tu-3.C: New test.
        * g++.target/riscv/rvv/base/vwadd_wv_tum-1.C: New test.
        * g++.target/riscv/rvv/base/vwadd_wv_tum-2.C: New test.
        * g++.target/riscv/rvv/base/vwadd_wv_tum-3.C: New test.
        * g++.target/riscv/rvv/base/vwadd_wv_tumu-1.C: New test.
        * g++.target/riscv/rvv/base/vwadd_wv_tumu-2.C: New test.
        * g++.target/riscv/rvv/base/vwadd_wv_tumu-3.C: New test.
        * g++.target/riscv/rvv/base/vwadd_wx-1.C: New test.
        * g++.target/riscv/rvv/base/vwadd_wx-2.C: New test.
        * g++.target/riscv/rvv/base/vwadd_wx-3.C: New test.
        * g++.target/riscv/rvv/base/vwadd_wx_mu-1.C: New test.
        * g++.target/riscv/rvv/base/vwadd_wx_mu-2.C: New test.
        * g++.target/riscv/rvv/base/vwadd_wx_mu-3.C: New test.
        * g++.target/riscv/rvv/base/vwadd_wx_tu-1.C: New test.
        * g++.target/riscv/rvv/base/vwadd_wx_tu-2.C: New test.
        * g++.target/riscv/rvv/base/vwadd_wx_tu-3.C: New test.
        * g++.target/riscv/rvv/base/vwadd_wx_tum-1.C: New test.
        * g++.target/riscv/rvv/base/vwadd_wx_tum-2.C: New test.
        * g++.target/riscv/rvv/base/vwadd_wx_tum-3.C: New test.
        * g++.target/riscv/rvv/base/vwadd_wx_tumu-1.C: New test.
        * g++.target/riscv/rvv/base/vwadd_wx_tumu-2.C: New test.
        * g++.target/riscv/rvv/base/vwadd_wx_tumu-3.C: New test.

---
 .../g++.target/riscv/rvv/base/vwadd_wv-1.C    | 216 ++++++++++++++++++
 .../g++.target/riscv/rvv/base/vwadd_wv-2.C    | 216 ++++++++++++++++++
 .../g++.target/riscv/rvv/base/vwadd_wv-3.C    | 216 ++++++++++++++++++
 .../g++.target/riscv/rvv/base/vwadd_wv_mu-1.C | 111 +++++++++
 .../g++.target/riscv/rvv/base/vwadd_wv_mu-2.C | 111 +++++++++
 .../g++.target/riscv/rvv/base/vwadd_wv_mu-3.C | 111 +++++++++
 .../g++.target/riscv/rvv/base/vwadd_wv_tu-1.C | 111 +++++++++
 .../g++.target/riscv/rvv/base/vwadd_wv_tu-2.C | 111 +++++++++
 .../g++.target/riscv/rvv/base/vwadd_wv_tu-3.C | 111 +++++++++
 .../riscv/rvv/base/vwadd_wv_tum-1.C           | 111 +++++++++
 .../riscv/rvv/base/vwadd_wv_tum-2.C           | 111 +++++++++
 .../riscv/rvv/base/vwadd_wv_tum-3.C           | 111 +++++++++
 .../riscv/rvv/base/vwadd_wv_tumu-1.C          | 111 +++++++++
 .../riscv/rvv/base/vwadd_wv_tumu-2.C          | 111 +++++++++
 .../riscv/rvv/base/vwadd_wv_tumu-3.C          | 111 +++++++++
 .../g++.target/riscv/rvv/base/vwadd_wx-1.C    | 216 ++++++++++++++++++
 .../g++.target/riscv/rvv/base/vwadd_wx-2.C    | 216 ++++++++++++++++++
 .../g++.target/riscv/rvv/base/vwadd_wx-3.C    | 216 ++++++++++++++++++
 .../g++.target/riscv/rvv/base/vwadd_wx_mu-1.C | 111 +++++++++
 .../g++.target/riscv/rvv/base/vwadd_wx_mu-2.C | 111 +++++++++
 .../g++.target/riscv/rvv/base/vwadd_wx_mu-3.C | 111 +++++++++
 .../g++.target/riscv/rvv/base/vwadd_wx_tu-1.C | 111 +++++++++
 .../g++.target/riscv/rvv/base/vwadd_wx_tu-2.C | 111 +++++++++
 .../g++.target/riscv/rvv/base/vwadd_wx_tu-3.C | 111 +++++++++
 .../riscv/rvv/base/vwadd_wx_tum-1.C           | 111 +++++++++
 .../riscv/rvv/base/vwadd_wx_tum-2.C           | 111 +++++++++
 .../riscv/rvv/base/vwadd_wx_tum-3.C           | 111 +++++++++
 .../riscv/rvv/base/vwadd_wx_tumu-1.C          | 111 +++++++++
 .../riscv/rvv/base/vwadd_wx_tumu-2.C          | 111 +++++++++
 .../riscv/rvv/base/vwadd_wx_tumu-3.C          | 111 +++++++++
 30 files changed, 3960 insertions(+)
 create mode 100644 gcc/testsuite/g++.target/riscv/rvv/base/vwadd_wv-1.C
 create mode 100644 gcc/testsuite/g++.target/riscv/rvv/base/vwadd_wv-2.C
 create mode 100644 gcc/testsuite/g++.target/riscv/rvv/base/vwadd_wv-3.C
 create mode 100644 gcc/testsuite/g++.target/riscv/rvv/base/vwadd_wv_mu-1.C
 create mode 100644 gcc/testsuite/g++.target/riscv/rvv/base/vwadd_wv_mu-2.C
 create mode 100644 gcc/testsuite/g++.target/riscv/rvv/base/vwadd_wv_mu-3.C
 create mode 100644 gcc/testsuite/g++.target/riscv/rvv/base/vwadd_wv_tu-1.C
 create mode 100644 gcc/testsuite/g++.target/riscv/rvv/base/vwadd_wv_tu-2.C
 create mode 100644 gcc/testsuite/g++.target/riscv/rvv/base/vwadd_wv_tu-3.C
 create mode 100644 gcc/testsuite/g++.target/riscv/rvv/base/vwadd_wv_tum-1.C
 create mode 100644 gcc/testsuite/g++.target/riscv/rvv/base/vwadd_wv_tum-2.C
 create mode 100644 gcc/testsuite/g++.target/riscv/rvv/base/vwadd_wv_tum-3.C
 create mode 100644 gcc/testsuite/g++.target/riscv/rvv/base/vwadd_wv_tumu-1.C
 create mode 100644 gcc/testsuite/g++.target/riscv/rvv/base/vwadd_wv_tumu-2.C
 create mode 100644 gcc/testsuite/g++.target/riscv/rvv/base/vwadd_wv_tumu-3.C
 create mode 100644 gcc/testsuite/g++.target/riscv/rvv/base/vwadd_wx-1.C
 create mode 100644 gcc/testsuite/g++.target/riscv/rvv/base/vwadd_wx-2.C
 create mode 100644 gcc/testsuite/g++.target/riscv/rvv/base/vwadd_wx-3.C
 create mode 100644 gcc/testsuite/g++.target/riscv/rvv/base/vwadd_wx_mu-1.C
 create mode 100644 gcc/testsuite/g++.target/riscv/rvv/base/vwadd_wx_mu-2.C
 create mode 100644 gcc/testsuite/g++.target/riscv/rvv/base/vwadd_wx_mu-3.C
 create mode 100644 gcc/testsuite/g++.target/riscv/rvv/base/vwadd_wx_tu-1.C
 create mode 100644 gcc/testsuite/g++.target/riscv/rvv/base/vwadd_wx_tu-2.C
 create mode 100644 gcc/testsuite/g++.target/riscv/rvv/base/vwadd_wx_tu-3.C
 create mode 100644 gcc/testsuite/g++.target/riscv/rvv/base/vwadd_wx_tum-1.C
 create mode 100644 gcc/testsuite/g++.target/riscv/rvv/base/vwadd_wx_tum-2.C
 create mode 100644 gcc/testsuite/g++.target/riscv/rvv/base/vwadd_wx_tum-3.C
 create mode 100644 gcc/testsuite/g++.target/riscv/rvv/base/vwadd_wx_tumu-1.C
 create mode 100644 gcc/testsuite/g++.target/riscv/rvv/base/vwadd_wx_tumu-2.C
 create mode 100644 gcc/testsuite/g++.target/riscv/rvv/base/vwadd_wx_tumu-3.C

diff --git a/gcc/testsuite/g++.target/riscv/rvv/base/vwadd_wv-1.C b/gcc/testsuite/g++.target/riscv/rvv/base/vwadd_wv-1.C
new file mode 100644
index 00000000000..d4789dc4c70
--- /dev/null
+++ b/gcc/testsuite/g++.target/riscv/rvv/base/vwadd_wv-1.C
@@ -0,0 +1,216 @@
+/* { dg-do compile } */
+/* { dg-options "-march=rv64gcv -mabi=lp64d -O3 -fno-schedule-insns -fno-schedule-insns2" } */
+
+#include "riscv_vector.h"
+
+vint16mf4_t test___riscv_vwadd_wv(vint16mf4_t op1,vint8mf8_t op2,size_t vl)
+{
+    return __riscv_vwadd_wv(op1,op2,vl);
+}
+
+
+vint16mf2_t test___riscv_vwadd_wv(vint16mf2_t op1,vint8mf4_t op2,size_t vl)
+{
+    return __riscv_vwadd_wv(op1,op2,vl);
+}
+
+
+vint16m1_t test___riscv_vwadd_wv(vint16m1_t op1,vint8mf2_t op2,size_t vl)
+{
+    return __riscv_vwadd_wv(op1,op2,vl);
+}
+
+
+vint16m2_t test___riscv_vwadd_wv(vint16m2_t op1,vint8m1_t op2,size_t vl)
+{
+    return __riscv_vwadd_wv(op1,op2,vl);
+}
+
+
+vint16m4_t test___riscv_vwadd_wv(vint16m4_t op1,vint8m2_t op2,size_t vl)
+{
+    return __riscv_vwadd_wv(op1,op2,vl);
+}
+
+
+vint16m8_t test___riscv_vwadd_wv(vint16m8_t op1,vint8m4_t op2,size_t vl)
+{
+    return __riscv_vwadd_wv(op1,op2,vl);
+}
+
+
+vint32mf2_t test___riscv_vwadd_wv(vint32mf2_t op1,vint16mf4_t op2,size_t vl)
+{
+    return __riscv_vwadd_wv(op1,op2,vl);
+}
+
+
+vint32m1_t test___riscv_vwadd_wv(vint32m1_t op1,vint16mf2_t op2,size_t vl)
+{
+    return __riscv_vwadd_wv(op1,op2,vl);
+}
+
+
+vint32m2_t test___riscv_vwadd_wv(vint32m2_t op1,vint16m1_t op2,size_t vl)
+{
+    return __riscv_vwadd_wv(op1,op2,vl);
+}
+
+
+vint32m4_t test___riscv_vwadd_wv(vint32m4_t op1,vint16m2_t op2,size_t vl)
+{
+    return __riscv_vwadd_wv(op1,op2,vl);
+}
+
+
+vint32m8_t test___riscv_vwadd_wv(vint32m8_t op1,vint16m4_t op2,size_t vl)
+{
+    return __riscv_vwadd_wv(op1,op2,vl);
+}
+
+
+vint64m1_t test___riscv_vwadd_wv(vint64m1_t op1,vint32mf2_t op2,size_t vl)
+{
+    return __riscv_vwadd_wv(op1,op2,vl);
+}
+
+
+vint64m2_t test___riscv_vwadd_wv(vint64m2_t op1,vint32m1_t op2,size_t vl)
+{
+    return __riscv_vwadd_wv(op1,op2,vl);
+}
+
+
+vint64m4_t test___riscv_vwadd_wv(vint64m4_t op1,vint32m2_t op2,size_t vl)
+{
+    return __riscv_vwadd_wv(op1,op2,vl);
+}
+
+
+vint64m8_t test___riscv_vwadd_wv(vint64m8_t op1,vint32m4_t op2,size_t vl)
+{
+    return __riscv_vwadd_wv(op1,op2,vl);
+}
+
+
+vint16mf4_t test___riscv_vwadd_wv(vbool64_t mask,vint16mf4_t op1,vint8mf8_t op2,size_t vl)
+{
+    return __riscv_vwadd_wv(mask,op1,op2,vl);
+}
+
+
+vint16mf2_t test___riscv_vwadd_wv(vbool32_t mask,vint16mf2_t op1,vint8mf4_t op2,size_t vl)
+{
+    return __riscv_vwadd_wv(mask,op1,op2,vl);
+}
+
+
+vint16m1_t test___riscv_vwadd_wv(vbool16_t mask,vint16m1_t op1,vint8mf2_t op2,size_t vl)
+{
+    return __riscv_vwadd_wv(mask,op1,op2,vl);
+}
+
+
+vint16m2_t test___riscv_vwadd_wv(vbool8_t mask,vint16m2_t op1,vint8m1_t op2,size_t vl)
+{
+    return __riscv_vwadd_wv(mask,op1,op2,vl);
+}
+
+
+vint16m4_t test___riscv_vwadd_wv(vbool4_t mask,vint16m4_t op1,vint8m2_t op2,size_t vl)
+{
+    return __riscv_vwadd_wv(mask,op1,op2,vl);
+}
+
+
+vint16m8_t test___riscv_vwadd_wv(vbool2_t mask,vint16m8_t op1,vint8m4_t op2,size_t vl)
+{
+    return __riscv_vwadd_wv(mask,op1,op2,vl);
+}
+
+
+vint32mf2_t test___riscv_vwadd_wv(vbool64_t mask,vint32mf2_t op1,vint16mf4_t op2,size_t vl)
+{
+    return __riscv_vwadd_wv(mask,op1,op2,vl);
+}
+
+
+vint32m1_t test___riscv_vwadd_wv(vbool32_t mask,vint32m1_t op1,vint16mf2_t op2,size_t vl)
+{
+    return __riscv_vwadd_wv(mask,op1,op2,vl);
+}
+
+
+vint32m2_t test___riscv_vwadd_wv(vbool16_t mask,vint32m2_t op1,vint16m1_t op2,size_t vl)
+{
+    return __riscv_vwadd_wv(mask,op1,op2,vl);
+}
+
+
+vint32m4_t test___riscv_vwadd_wv(vbool8_t mask,vint32m4_t op1,vint16m2_t op2,size_t vl)
+{
+    return __riscv_vwadd_wv(mask,op1,op2,vl);
+}
+
+
+vint32m8_t test___riscv_vwadd_wv(vbool4_t mask,vint32m8_t op1,vint16m4_t op2,size_t vl)
+{
+    return __riscv_vwadd_wv(mask,op1,op2,vl);
+}
+
+
+vint64m1_t test___riscv_vwadd_wv(vbool64_t mask,vint64m1_t op1,vint32mf2_t op2,size_t vl)
+{
+    return __riscv_vwadd_wv(mask,op1,op2,vl);
+}
+
+
+vint64m2_t test___riscv_vwadd_wv(vbool32_t mask,vint64m2_t op1,vint32m1_t op2,size_t vl)
+{
+    return __riscv_vwadd_wv(mask,op1,op2,vl);
+}
+
+
+vint64m4_t test___riscv_vwadd_wv(vbool16_t mask,vint64m4_t op1,vint32m2_t op2,size_t vl)
+{
+    return __riscv_vwadd_wv(mask,op1,op2,vl);
+}
+
+
+vint64m8_t test___riscv_vwadd_wv(vbool8_t mask,vint64m8_t op1,vint32m4_t op2,size_t vl)
+{
+    return __riscv_vwadd_wv(mask,op1,op2,vl);
+}
+
+
+
+/* { dg-final { scan-assembler-times {vsetvli\s+zero,\s*[a-x0-9]+,\s*e8,\s*mf8,\s*t[au],\s*m[au]\s+vwadd\.wv\s+v[0-9]+,\s*v[0-9]+,\s*v[0-9]+\s+} 1 } } */
+/* { dg-final { scan-assembler-times {vsetvli\s+zero,\s*[a-x0-9]+,\s*e8,\s*mf4,\s*t[au],\s*m[au]\s+vwadd\.wv\s+v[0-9]+,\s*v[0-9]+,\s*v[0-9]+\s+} 1 } } */
+/* { dg-final { scan-assembler-times {vsetvli\s+zero,\s*[a-x0-9]+,\s*e8,\s*mf2,\s*t[au],\s*m[au]\s+vwadd\.wv\s+v[0-9]+,\s*v[0-9]+,\s*v[0-9]+\s+} 1 } } */
+/* { dg-final { scan-assembler-times {vsetvli\s+zero,\s*[a-x0-9]+,\s*e8,\s*m1,\s*t[au],\s*m[au]\s+vwadd\.wv\s+v[0-9]+,\s*v[0-9]+,\s*v[0-9]+\s+} 1 } } */
+/* { dg-final { scan-assembler-times {vsetvli\s+zero,\s*[a-x0-9]+,\s*e8,\s*m2,\s*t[au],\s*m[au]\s+vwadd\.wv\s+v[0-9]+,\s*v[0-9]+,\s*v[0-9]+\s+} 1 } } */
+/* { dg-final { scan-assembler-times {vsetvli\s+zero,\s*[a-x0-9]+,\s*e8,\s*m4,\s*t[au],\s*m[au]\s+vwadd\.wv\s+v[0-9]+,\s*v[0-9]+,\s*v[0-9]+\s+} 1 } } */
+/* { dg-final { scan-assembler-times {vsetvli\s+zero,\s*[a-x0-9]+,\s*e16,\s*mf4,\s*t[au],\s*m[au]\s+vwadd\.wv\s+v[0-9]+,\s*v[0-9]+,\s*v[0-9]+\s+} 1 } } */
+/* { dg-final { scan-assembler-times {vsetvli\s+zero,\s*[a-x0-9]+,\s*e16,\s*mf2,\s*t[au],\s*m[au]\s+vwadd\.wv\s+v[0-9]+,\s*v[0-9]+,\s*v[0-9]+\s+} 1 } } */
+/* { dg-final { scan-assembler-times {vsetvli\s+zero,\s*[a-x0-9]+,\s*e16,\s*m1,\s*t[au],\s*m[au]\s+vwadd\.wv\s+v[0-9]+,\s*v[0-9]+,\s*v[0-9]+\s+} 1 } } */
+/* { dg-final { scan-assembler-times {vsetvli\s+zero,\s*[a-x0-9]+,\s*e16,\s*m2,\s*t[au],\s*m[au]\s+vwadd\.wv\s+v[0-9]+,\s*v[0-9]+,\s*v[0-9]+\s+} 1 } } */
+/* { dg-final { scan-assembler-times {vsetvli\s+zero,\s*[a-x0-9]+,\s*e16,\s*m4,\s*t[au],\s*m[au]\s+vwadd\.wv\s+v[0-9]+,\s*v[0-9]+,\s*v[0-9]+\s+} 1 } } */
+/* { dg-final { scan-assembler-times {vsetvli\s+zero,\s*[a-x0-9]+,\s*e32,\s*mf2,\s*t[au],\s*m[au]\s+vwadd\.wv\s+v[0-9]+,\s*v[0-9]+,\s*v[0-9]+\s+} 1 } } */
+/* { dg-final { scan-assembler-times {vsetvli\s+zero,\s*[a-x0-9]+,\s*e32,\s*m1,\s*t[au],\s*m[au]\s+vwadd\.wv\s+v[0-9]+,\s*v[0-9]+,\s*v[0-9]+\s+} 1 } } */
+/* { dg-final { scan-assembler-times {vsetvli\s+zero,\s*[a-x0-9]+,\s*e32,\s*m2,\s*t[au],\s*m[au]\s+vwadd\.wv\s+v[0-9]+,\s*v[0-9]+,\s*v[0-9]+\s+} 1 } } */
+/* { dg-final { scan-assembler-times {vsetvli\s+zero,\s*[a-x0-9]+,\s*e32,\s*m4,\s*t[au],\s*m[au]\s+vwadd\.wv\s+v[0-9]+,\s*v[0-9]+,\s*v[0-9]+\s+} 1 } } */
+/* { dg-final { scan-assembler-times {vsetvli\s+zero,\s*[a-x0-9]+,\s*e8,\s*mf8,\s*t[au],\s*m[au]\s+vwadd\.wv\s+v[0-9]+,\s*v[0-9]+,\s*v[0-9]+,\s*v0.t\s+} 1 } } */
+/* { dg-final { scan-assembler-times {vsetvli\s+zero,\s*[a-x0-9]+,\s*e8,\s*mf4,\s*t[au],\s*m[au]\s+vwadd\.wv\s+v[0-9]+,\s*v[0-9]+,\s*v[0-9]+,\s*v0.t\s+} 1 } } */
+/* { dg-final { scan-assembler-times {vsetvli\s+zero,\s*[a-x0-9]+,\s*e8,\s*mf2,\s*t[au],\s*m[au]\s+vwadd\.wv\s+v[0-9]+,\s*v[0-9]+,\s*v[0-9]+,\s*v0.t\s+} 1 } } */
+/* { dg-final { scan-assembler-times {vsetvli\s+zero,\s*[a-x0-9]+,\s*e8,\s*m1,\s*t[au],\s*m[au]\s+vwadd\.wv\s+v[0-9]+,\s*v[0-9]+,\s*v[0-9]+,\s*v0.t\s+} 1 } } */
+/* { dg-final { scan-assembler-times {vsetvli\s+zero,\s*[a-x0-9]+,\s*e8,\s*m2,\s*t[au],\s*m[au]\s+vwadd\.wv\s+v[0-9]+,\s*v[0-9]+,\s*v[0-9]+,\s*v0.t\s+} 1 } } */
+/* { dg-final { scan-assembler-times {vsetvli\s+zero,\s*[a-x0-9]+,\s*e8,\s*m4,\s*t[au],\s*m[au]\s+vwadd\.wv\s+v[0-9]+,\s*v[0-9]+,\s*v[0-9]+,\s*v0.t\s+} 1 } } */
+/* { dg-final { scan-assembler-times {vsetvli\s+zero,\s*[a-x0-9]+,\s*e16,\s*mf4,\s*t[au],\s*m[au]\s+vwadd\.wv\s+v[0-9]+,\s*v[0-9]+,\s*v[0-9]+,\s*v0.t\s+} 1 } } */
+/* { dg-final { scan-assembler-times {vsetvli\s+zero,\s*[a-x0-9]+,\s*e16,\s*mf2,\s*t[au],\s*m[au]\s+vwadd\.wv\s+v[0-9]+,\s*v[0-9]+,\s*v[0-9]+,\s*v0.t\s+} 1 } } */
+/* { dg-final { scan-assembler-times {vsetvli\s+zero,\s*[a-x0-9]+,\s*e16,\s*m1,\s*t[au],\s*m[au]\s+vwadd\.wv\s+v[0-9]+,\s*v[0-9]+,\s*v[0-9]+,\s*v0.t\s+} 1 } } */
+/* { dg-final { scan-assembler-times {vsetvli\s+zero,\s*[a-x0-9]+,\s*e16,\s*m2,\s*t[au],\s*m[au]\s+vwadd\.wv\s+v[0-9]+,\s*v[0-9]+,\s*v[0-9]+,\s*v0.t\s+} 1 } } */
+/* { dg-final { scan-assembler-times {vsetvli\s+zero,\s*[a-x0-9]+,\s*e16,\s*m4,\s*t[au],\s*m[au]\s+vwadd\.wv\s+v[0-9]+,\s*v[0-9]+,\s*v[0-9]+,\s*v0.t\s+} 1 } } */
+/* { dg-final { scan-assembler-times {vsetvli\s+zero,\s*[a-x0-9]+,\s*e32,\s*mf2,\s*t[au],\s*m[au]\s+vwadd\.wv\s+v[0-9]+,\s*v[0-9]+,\s*v[0-9]+,\s*v0.t\s+} 1 } } */
+/* { dg-final { scan-assembler-times {vsetvli\s+zero,\s*[a-x0-9]+,\s*e32,\s*m1,\s*t[au],\s*m[au]\s+vwadd\.wv\s+v[0-9]+,\s*v[0-9]+,\s*v[0-9]+,\s*v0.t\s+} 1 } } */
+/* { dg-final { scan-assembler-times {vsetvli\s+zero,\s*[a-x0-9]+,\s*e32,\s*m2,\s*t[au],\s*m[au]\s+vwadd\.wv\s+v[0-9]+,\s*v[0-9]+,\s*v[0-9]+,\s*v0.t\s+} 1 } } */
+/* { dg-final { scan-assembler-times {vsetvli\s+zero,\s*[a-x0-9]+,\s*e32,\s*m4,\s*t[au],\s*m[au]\s+vwadd\.wv\s+v[0-9]+,\s*v[0-9]+,\s*v[0-9]+,\s*v0.t\s+} 1 } } */
diff --git a/gcc/testsuite/g++.target/riscv/rvv/base/vwadd_wv-2.C b/gcc/testsuite/g++.target/riscv/rvv/base/vwadd_wv-2.C
new file mode 100644
index 00000000000..b900041e174
--- /dev/null
+++ b/gcc/testsuite/g++.target/riscv/rvv/base/vwadd_wv-2.C
@@ -0,0 +1,216 @@
+/* { dg-do compile } */
+/* { dg-options "-march=rv64gcv -mabi=lp64d -O3 -fno-schedule-insns -fno-schedule-insns2" } */
+
+#include "riscv_vector.h"
+
+vint16mf4_t test___riscv_vwadd_wv(vint16mf4_t op1,vint8mf8_t op2,size_t vl)
+{
+    return __riscv_vwadd_wv(op1,op2,31);
+}
+
+
+vint16mf2_t test___riscv_vwadd_wv(vint16mf2_t op1,vint8mf4_t op2,size_t vl)
+{
+    return __riscv_vwadd_wv(op1,op2,31);
+}
+
+
+vint16m1_t test___riscv_vwadd_wv(vint16m1_t op1,vint8mf2_t op2,size_t vl)
+{
+    return __riscv_vwadd_wv(op1,op2,31);
+}
+
+
+vint16m2_t test___riscv_vwadd_wv(vint16m2_t op1,vint8m1_t op2,size_t vl)
+{
+    return __riscv_vwadd_wv(op1,op2,31);
+}
+
+
+vint16m4_t test___riscv_vwadd_wv(vint16m4_t op1,vint8m2_t op2,size_t vl)
+{
+    return __riscv_vwadd_wv(op1,op2,31);
+}
+
+
+vint16m8_t test___riscv_vwadd_wv(vint16m8_t op1,vint8m4_t op2,size_t vl)
+{
+    return __riscv_vwadd_wv(op1,op2,31);
+}
+
+
+vint32mf2_t test___riscv_vwadd_wv(vint32mf2_t op1,vint16mf4_t op2,size_t vl)
+{
+    return __riscv_vwadd_wv(op1,op2,31);
+}
+
+
+vint32m1_t test___riscv_vwadd_wv(vint32m1_t op1,vint16mf2_t op2,size_t vl)
+{
+    return __riscv_vwadd_wv(op1,op2,31);
+}
+
+
+vint32m2_t test___riscv_vwadd_wv(vint32m2_t op1,vint16m1_t op2,size_t vl)
+{
+    return __riscv_vwadd_wv(op1,op2,31);
+}
+
+
+vint32m4_t test___riscv_vwadd_wv(vint32m4_t op1,vint16m2_t op2,size_t vl)
+{
+    return __riscv_vwadd_wv(op1,op2,31);
+}
+
+
+vint32m8_t test___riscv_vwadd_wv(vint32m8_t op1,vint16m4_t op2,size_t vl)
+{
+    return __riscv_vwadd_wv(op1,op2,31);
+}
+
+
+vint64m1_t test___riscv_vwadd_wv(vint64m1_t op1,vint32mf2_t op2,size_t vl)
+{
+    return __riscv_vwadd_wv(op1,op2,31);
+}
+
+
+vint64m2_t test___riscv_vwadd_wv(vint64m2_t op1,vint32m1_t op2,size_t vl)
+{
+    return __riscv_vwadd_wv(op1,op2,31);
+}
+
+
+vint64m4_t test___riscv_vwadd_wv(vint64m4_t op1,vint32m2_t op2,size_t vl)
+{
+    return __riscv_vwadd_wv(op1,op2,31);
+}
+
+
+vint64m8_t test___riscv_vwadd_wv(vint64m8_t op1,vint32m4_t op2,size_t vl)
+{
+    return __riscv_vwadd_wv(op1,op2,31);
+}
+
+
+vint16mf4_t test___riscv_vwadd_wv(vbool64_t mask,vint16mf4_t op1,vint8mf8_t op2,size_t vl)
+{
+    return __riscv_vwadd_wv(mask,op1,op2,31);
+}
+
+
+vint16mf2_t test___riscv_vwadd_wv(vbool32_t mask,vint16mf2_t op1,vint8mf4_t op2,size_t vl)
+{
+    return __riscv_vwadd_wv(mask,op1,op2,31);
+}
+
+
+vint16m1_t test___riscv_vwadd_wv(vbool16_t mask,vint16m1_t op1,vint8mf2_t op2,size_t vl)
+{
+    return __riscv_vwadd_wv(mask,op1,op2,31);
+}
+
+
+vint16m2_t test___riscv_vwadd_wv(vbool8_t mask,vint16m2_t op1,vint8m1_t op2,size_t vl)
+{
+    return __riscv_vwadd_wv(mask,op1,op2,31);
+}
+
+
+vint16m4_t test___riscv_vwadd_wv(vbool4_t mask,vint16m4_t op1,vint8m2_t op2,size_t vl)
+{
+    return __riscv_vwadd_wv(mask,op1,op2,31);
+}
+
+
+vint16m8_t test___riscv_vwadd_wv(vbool2_t mask,vint16m8_t op1,vint8m4_t op2,size_t vl)
+{
+    return __riscv_vwadd_wv(mask,op1,op2,31);
+}
+
+
+vint32mf2_t test___riscv_vwadd_wv(vbool64_t mask,vint32mf2_t op1,vint16mf4_t op2,size_t vl)
+{
+    return __riscv_vwadd_wv(mask,op1,op2,31);
+}
+
+
+vint32m1_t test___riscv_vwadd_wv(vbool32_t mask,vint32m1_t op1,vint16mf2_t op2,size_t vl)
+{
+    return __riscv_vwadd_wv(mask,op1,op2,31);
+}
+
+
+vint32m2_t test___riscv_vwadd_wv(vbool16_t mask,vint32m2_t op1,vint16m1_t op2,size_t vl)
+{
+    return __riscv_vwadd_wv(mask,op1,op2,31);
+}
+
+
+vint32m4_t test___riscv_vwadd_wv(vbool8_t mask,vint32m4_t op1,vint16m2_t op2,size_t vl)
+{
+    return __riscv_vwadd_wv(mask,op1,op2,31);
+}
+
+
+vint32m8_t test___riscv_vwadd_wv(vbool4_t mask,vint32m8_t op1,vint16m4_t op2,size_t vl)
+{
+    return __riscv_vwadd_wv(mask,op1,op2,31);
+}
+
+
+vint64m1_t test___riscv_vwadd_wv(vbool64_t mask,vint64m1_t op1,vint32mf2_t op2,size_t vl)
+{
+    return __riscv_vwadd_wv(mask,op1,op2,31);
+}
+
+
+vint64m2_t test___riscv_vwadd_wv(vbool32_t mask,vint64m2_t op1,vint32m1_t op2,size_t vl)
+{
+    return __riscv_vwadd_wv(mask,op1,op2,31);
+}
+
+
+vint64m4_t test___riscv_vwadd_wv(vbool16_t mask,vint64m4_t op1,vint32m2_t op2,size_t vl)
+{
+    return __riscv_vwadd_wv(mask,op1,op2,31);
+}
+
+
+vint64m8_t test___riscv_vwadd_wv(vbool8_t mask,vint64m8_t op1,vint32m4_t op2,size_t vl)
+{
+    return __riscv_vwadd_wv(mask,op1,op2,31);
+}
+
+
+
+/* { dg-final { scan-assembler-times {vsetivli\s+zero,\s*31,\s*e8,\s*mf8,\s*t[au],\s*m[au]\s+vwadd\.wv\s+v[0-9]+,\s*v[0-9]+,\s*v[0-9]+\s+} 1 } } */
+/* { dg-final { scan-assembler-times {vsetivli\s+zero,\s*31,\s*e8,\s*mf4,\s*t[au],\s*m[au]\s+vwadd\.wv\s+v[0-9]+,\s*v[0-9]+,\s*v[0-9]+\s+} 1 } } */
+/* { dg-final { scan-assembler-times {vsetivli\s+zero,\s*31,\s*e8,\s*mf2,\s*t[au],\s*m[au]\s+vwadd\.wv\s+v[0-9]+,\s*v[0-9]+,\s*v[0-9]+\s+} 1 } } */
+/* { dg-final { scan-assembler-times {vsetivli\s+zero,\s*31,\s*e8,\s*m1,\s*t[au],\s*m[au]\s+vwadd\.wv\s+v[0-9]+,\s*v[0-9]+,\s*v[0-9]+\s+} 1 } } */
+/* { dg-final { scan-assembler-times {vsetivli\s+zero,\s*31,\s*e8,\s*m2,\s*t[au],\s*m[au]\s+vwadd\.wv\s+v[0-9]+,\s*v[0-9]+,\s*v[0-9]+\s+} 1 } } */
+/* { dg-final { scan-assembler-times {vsetivli\s+zero,\s*31,\s*e8,\s*m4,\s*t[au],\s*m[au]\s+vwadd\.wv\s+v[0-9]+,\s*v[0-9]+,\s*v[0-9]+\s+} 1 } } */
+/* { dg-final { scan-assembler-times {vsetivli\s+zero,\s*31,\s*e16,\s*mf4,\s*t[au],\s*m[au]\s+vwadd\.wv\s+v[0-9]+,\s*v[0-9]+,\s*v[0-9]+\s+} 1 } } */
+/* { dg-final { scan-assembler-times {vsetivli\s+zero,\s*31,\s*e16,\s*mf2,\s*t[au],\s*m[au]\s+vwadd\.wv\s+v[0-9]+,\s*v[0-9]+,\s*v[0-9]+\s+} 1 } } */
+/* { dg-final { scan-assembler-times {vsetivli\s+zero,\s*31,\s*e16,\s*m1,\s*t[au],\s*m[au]\s+vwadd\.wv\s+v[0-9]+,\s*v[0-9]+,\s*v[0-9]+\s+} 1 } } */
+/* { dg-final { scan-assembler-times {vsetivli\s+zero,\s*31,\s*e16,\s*m2,\s*t[au],\s*m[au]\s+vwadd\.wv\s+v[0-9]+,\s*v[0-9]+,\s*v[0-9]+\s+} 1 } } */
+/* { dg-final { scan-assembler-times {vsetivli\s+zero,\s*31,\s*e16,\s*m4,\s*t[au],\s*m[au]\s+vwadd\.wv\s+v[0-9]+,\s*v[0-9]+,\s*v[0-9]+\s+} 1 } } */
+/* { dg-final { scan-assembler-times {vsetivli\s+zero,\s*31,\s*e32,\s*mf2,\s*t[au],\s*m[au]\s+vwadd\.wv\s+v[0-9]+,\s*v[0-9]+,\s*v[0-9]+\s+} 1 } } */
+/* { dg-final { scan-assembler-times {vsetivli\s+zero,\s*31,\s*e32,\s*m1,\s*t[au],\s*m[au]\s+vwadd\.wv\s+v[0-9]+,\s*v[0-9]+,\s*v[0-9]+\s+} 1 } } */
+/* { dg-final { scan-assembler-times {vsetivli\s+zero,\s*31,\s*e32,\s*m2,\s*t[au],\s*m[au]\s+vwadd\.wv\s+v[0-9]+,\s*v[0-9]+,\s*v[0-9]+\s+} 1 } } */
+/* { dg-final { scan-assembler-times {vsetivli\s+zero,\s*31,\s*e32,\s*m4,\s*t[au],\s*m[au]\s+vwadd\.wv\s+v[0-9]+,\s*v[0-9]+,\s*v[0-9]+\s+} 1 } } */
+/* { dg-final { scan-assembler-times {vsetivli\s+zero,\s*31,\s*e8,\s*mf8,\s*t[au],\s*m[au]\s+vwadd\.wv\s+v[0-9]+,\s*v[0-9]+,\s*v[0-9]+,\s*v0.t\s+} 1 } } */
+/* { dg-final { scan-assembler-times {vsetivli\s+zero,\s*31,\s*e8,\s*mf4,\s*t[au],\s*m[au]\s+vwadd\.wv\s+v[0-9]+,\s*v[0-9]+,\s*v[0-9]+,\s*v0.t\s+} 1 } } */
+/* { dg-final { scan-assembler-times {vsetivli\s+zero,\s*31,\s*e8,\s*mf2,\s*t[au],\s*m[au]\s+vwadd\.wv\s+v[0-9]+,\s*v[0-9]+,\s*v[0-9]+,\s*v0.t\s+} 1 } } */
+/* { dg-final { scan-assembler-times {vsetivli\s+zero,\s*31,\s*e8,\s*m1,\s*t[au],\s*m[au]\s+vwadd\.wv\s+v[0-9]+,\s*v[0-9]+,\s*v[0-9]+,\s*v0.t\s+} 1 } } */
+/* { dg-final { scan-assembler-times {vsetivli\s+zero,\s*31,\s*e8,\s*m2,\s*t[au],\s*m[au]\s+vwadd\.wv\s+v[0-9]+,\s*v[0-9]+,\s*v[0-9]+,\s*v0.t\s+} 1 } } */
+/* { dg-final { scan-assembler-times {vsetivli\s+zero,\s*31,\s*e8,\s*m4,\s*t[au],\s*m[au]\s+vwadd\.wv\s+v[0-9]+,\s*v[0-9]+,\s*v[0-9]+,\s*v0.t\s+} 1 } } */
+/* { dg-final { scan-assembler-times {vsetivli\s+zero,\s*31,\s*e16,\s*mf4,\s*t[au],\s*m[au]\s+vwadd\.wv\s+v[0-9]+,\s*v[0-9]+,\s*v[0-9]+,\s*v0.t\s+} 1 } } */
+/* { dg-final { scan-assembler-times {vsetivli\s+zero,\s*31,\s*e16,\s*mf2,\s*t[au],\s*m[au]\s+vwadd\.wv\s+v[0-9]+,\s*v[0-9]+,\s*v[0-9]+,\s*v0.t\s+} 1 } } */
+/* { dg-final { scan-assembler-times {vsetivli\s+zero,\s*31,\s*e16,\s*m1,\s*t[au],\s*m[au]\s+vwadd\.wv\s+v[0-9]+,\s*v[0-9]+,\s*v[0-9]+,\s*v0.t\s+} 1 } } */
+/* { dg-final { scan-assembler-times {vsetivli\s+zero,\s*31,\s*e16,\s*m2,\s*t[au],\s*m[au]\s+vwadd\.wv\s+v[0-9]+,\s*v[0-9]+,\s*v[0-9]+,\s*v0.t\s+} 1 } } */
+/* { dg-final { scan-assembler-times {vsetivli\s+zero,\s*31,\s*e16,\s*m4,\s*t[au],\s*m[au]\s+vwadd\.wv\s+v[0-9]+,\s*v[0-9]+,\s*v[0-9]+,\s*v0.t\s+} 1 } } */
+/* { dg-final { scan-assembler-times {vsetivli\s+zero,\s*31,\s*e32,\s*mf2,\s*t[au],\s*m[au]\s+vwadd\.wv\s+v[0-9]+,\s*v[0-9]+,\s*v[0-9]+,\s*v0.t\s+} 1 } } */
+/* { dg-final { scan-assembler-times {vsetivli\s+zero,\s*31,\s*e32,\s*m1,\s*t[au],\s*m[au]\s+vwadd\.wv\s+v[0-9]+,\s*v[0-9]+,\s*v[0-9]+,\s*v0.t\s+} 1 } } */
+/* { dg-final { scan-assembler-times {vsetivli\s+zero,\s*31,\s*e32,\s*m2,\s*t[au],\s*m[au]\s+vwadd\.wv\s+v[0-9]+,\s*v[0-9]+,\s*v[0-9]+,\s*v0.t\s+} 1 } } */
+/* { dg-final { scan-assembler-times {vsetivli\s+zero,\s*31,\s*e32,\s*m4,\s*t[au],\s*m[au]\s+vwadd\.wv\s+v[0-9]+,\s*v[0-9]+,\s*v[0-9]+,\s*v0.t\s+} 1 } } */
diff --git a/gcc/testsuite/g++.target/riscv/rvv/base/vwadd_wv-3.C b/gcc/testsuite/g++.target/riscv/rvv/base/vwadd_wv-3.C
new file mode 100644
index 00000000000..75eed0bd3fe
--- /dev/null
+++ b/gcc/testsuite/g++.target/riscv/rvv/base/vwadd_wv-3.C
@@ -0,0 +1,216 @@
+/* { dg-do compile } */
+/* { dg-options "-march=rv64gcv -mabi=lp64d -O3 -fno-schedule-insns -fno-schedule-insns2" } */
+
+#include "riscv_vector.h"
+
+vint16mf4_t test___riscv_vwadd_wv(vint16mf4_t op1,vint8mf8_t op2,size_t vl)
+{
+    return __riscv_vwadd_wv(op1,op2,32);
+}
+
+
+vint16mf2_t test___riscv_vwadd_wv(vint16mf2_t op1,vint8mf4_t op2,size_t vl)
+{
+    return __riscv_vwadd_wv(op1,op2,32);
+}
+
+
+vint16m1_t test___riscv_vwadd_wv(vint16m1_t op1,vint8mf2_t op2,size_t vl)
+{
+    return __riscv_vwadd_wv(op1,op2,32);
+}
+
+
+vint16m2_t test___riscv_vwadd_wv(vint16m2_t op1,vint8m1_t op2,size_t vl)
+{
+    return __riscv_vwadd_wv(op1,op2,32);
+}
+
+
+vint16m4_t test___riscv_vwadd_wv(vint16m4_t op1,vint8m2_t op2,size_t vl)
+{
+    return __riscv_vwadd_wv(op1,op2,32);
+}
+
+
+vint16m8_t test___riscv_vwadd_wv(vint16m8_t op1,vint8m4_t op2,size_t vl)
+{
+    return __riscv_vwadd_wv(op1,op2,32);
+}
+
+
+vint32mf2_t test___riscv_vwadd_wv(vint32mf2_t op1,vint16mf4_t op2,size_t vl)
+{
+    return __riscv_vwadd_wv(op1,op2,32);
+}
+
+
+vint32m1_t test___riscv_vwadd_wv(vint32m1_t op1,vint16mf2_t op2,size_t vl)
+{
+    return __riscv_vwadd_wv(op1,op2,32);
+}
+
+
+vint32m2_t test___riscv_vwadd_wv(vint32m2_t op1,vint16m1_t op2,size_t vl)
+{
+    return __riscv_vwadd_wv(op1,op2,32);
+}
+
+
+vint32m4_t test___riscv_vwadd_wv(vint32m4_t op1,vint16m2_t op2,size_t vl)
+{
+    return __riscv_vwadd_wv(op1,op2,32);
+}
+
+
+vint32m8_t test___riscv_vwadd_wv(vint32m8_t op1,vint16m4_t op2,size_t vl)
+{
+    return __riscv_vwadd_wv(op1,op2,32);
+}
+
+
+vint64m1_t test___riscv_vwadd_wv(vint64m1_t op1,vint32mf2_t op2,size_t vl)
+{
+    return __riscv_vwadd_wv(op1,op2,32);
+}
+
+
+vint64m2_t test___riscv_vwadd_wv(vint64m2_t op1,vint32m1_t op2,size_t vl)
+{
+    return __riscv_vwadd_wv(op1,op2,32);
+}
+
+
+vint64m4_t test___riscv_vwadd_wv(vint64m4_t op1,vint32m2_t op2,size_t vl)
+{
+    return __riscv_vwadd_wv(op1,op2,32);
+}
+
+
+vint64m8_t test___riscv_vwadd_wv(vint64m8_t op1,vint32m4_t op2,size_t vl)
+{
+    return __riscv_vwadd_wv(op1,op2,32);
+}
+
+
+vint16mf4_t test___riscv_vwadd_wv(vbool64_t mask,vint16mf4_t op1,vint8mf8_t op2,size_t vl)
+{
+    return __riscv_vwadd_wv(mask,op1,op2,32);
+}
+
+
+vint16mf2_t test___riscv_vwadd_wv(vbool32_t mask,vint16mf2_t op1,vint8mf4_t op2,size_t vl)
+{
+    return __riscv_vwadd_wv(mask,op1,op2,32);
+}
+
+
+vint16m1_t test___riscv_vwadd_wv(vbool16_t mask,vint16m1_t op1,vint8mf2_t op2,size_t vl)
+{
+    return __riscv_vwadd_wv(mask,op1,op2,32);
+}
+
+
+vint16m2_t test___riscv_vwadd_wv(vbool8_t mask,vint16m2_t op1,vint8m1_t op2,size_t vl)
+{
+    return __riscv_vwadd_wv(mask,op1,op2,32);
+}
+
+
+vint16m4_t test___riscv_vwadd_wv(vbool4_t mask,vint16m4_t op1,vint8m2_t op2,size_t vl)
+{
+    return __riscv_vwadd_wv(mask,op1,op2,32);
+}
+
+
+vint16m8_t test___riscv_vwadd_wv(vbool2_t mask,vint16m8_t op1,vint8m4_t op2,size_t vl)
+{
+    return __riscv_vwadd_wv(mask,op1,op2,32);
+}
+
+
+vint32mf2_t test___riscv_vwadd_wv(vbool64_t mask,vint32mf2_t op1,vint16mf4_t op2,size_t vl)
+{
+    return __riscv_vwadd_wv(mask,op1,op2,32);
+}
+
+
+vint32m1_t test___riscv_vwadd_wv(vbool32_t mask,vint32m1_t op1,vint16mf2_t op2,size_t vl)
+{
+    return __riscv_vwadd_wv(mask,op1,op2,32);
+}
+
+
+vint32m2_t test___riscv_vwadd_wv(vbool16_t mask,vint32m2_t op1,vint16m1_t op2,size_t vl)
+{
+    return __riscv_vwadd_wv(mask,op1,op2,32);
+}
+
+
+vint32m4_t test___riscv_vwadd_wv(vbool8_t mask,vint32m4_t op1,vint16m2_t op2,size_t vl)
+{
+    return __riscv_vwadd_wv(mask,op1,op2,32);
+}
+
+
+vint32m8_t test___riscv_vwadd_wv(vbool4_t mask,vint32m8_t op1,vint16m4_t op2,size_t vl)
+{
+    return __riscv_vwadd_wv(mask,op1,op2,32);
+}
+
+
+vint64m1_t test___riscv_vwadd_wv(vbool64_t mask,vint64m1_t op1,vint32mf2_t op2,size_t vl)
+{
+    return __riscv_vwadd_wv(mask,op1,op2,32);
+}
+
+
+vint64m2_t test___riscv_vwadd_wv(vbool32_t mask,vint64m2_t op1,vint32m1_t op2,size_t vl)
+{
+    return __riscv_vwadd_wv(mask,op1,op2,32);
+}
+
+
+vint64m4_t test___riscv_vwadd_wv(vbool16_t mask,vint64m4_t op1,vint32m2_t op2,size_t vl)
+{
+    return __riscv_vwadd_wv(mask,op1,op2,32);
+}
+
+
+vint64m8_t test___riscv_vwadd_wv(vbool8_t mask,vint64m8_t op1,vint32m4_t op2,size_t vl)
+{
+    return __riscv_vwadd_wv(mask,op1,op2,32);
+}
+
+
+
+/* { dg-final { scan-assembler-times {vsetvli\s+zero,\s*[a-x0-9]+,\s*e8,\s*mf8,\s*t[au],\s*m[au]\s+vwadd\.wv\s+v[0-9]+,\s*v[0-9]+,\s*v[0-9]+\s+} 1 } } */
+/* { dg-final { scan-assembler-times {vsetvli\s+zero,\s*[a-x0-9]+,\s*e8,\s*mf4,\s*t[au],\s*m[au]\s+vwadd\.wv\s+v[0-9]+,\s*v[0-9]+,\s*v[0-9]+\s+} 1 } } */
+/* { dg-final { scan-assembler-times {vsetvli\s+zero,\s*[a-x0-9]+,\s*e8,\s*mf2,\s*t[au],\s*m[au]\s+vwadd\.wv\s+v[0-9]+,\s*v[0-9]+,\s*v[0-9]+\s+} 1 } } */
+/* { dg-final { scan-assembler-times {vsetvli\s+zero,\s*[a-x0-9]+,\s*e8,\s*m1,\s*t[au],\s*m[au]\s+vwadd\.wv\s+v[0-9]+,\s*v[0-9]+,\s*v[0-9]+\s+} 1 } } */
+/* { dg-final { scan-assembler-times {vsetvli\s+zero,\s*[a-x0-9]+,\s*e8,\s*m2,\s*t[au],\s*m[au]\s+vwadd\.wv\s+v[0-9]+,\s*v[0-9]+,\s*v[0-9]+\s+} 1 } } */
+/* { dg-final { scan-assembler-times {vsetvli\s+zero,\s*[a-x0-9]+,\s*e8,\s*m4,\s*t[au],\s*m[au]\s+vwadd\.wv\s+v[0-9]+,\s*v[0-9]+,\s*v[0-9]+\s+} 1 } } */
+/* { dg-final { scan-assembler-times {vsetvli\s+zero,\s*[a-x0-9]+,\s*e16,\s*mf4,\s*t[au],\s*m[au]\s+vwadd\.wv\s+v[0-9]+,\s*v[0-9]+,\s*v[0-9]+\s+} 1 } } */
+/* { dg-final { scan-assembler-times {vsetvli\s+zero,\s*[a-x0-9]+,\s*e16,\s*mf2,\s*t[au],\s*m[au]\s+vwadd\.wv\s+v[0-9]+,\s*v[0-9]+,\s*v[0-9]+\s+} 1 } } */
+/* { dg-final { scan-assembler-times {vsetvli\s+zero,\s*[a-x0-9]+,\s*e16,\s*m1,\s*t[au],\s*m[au]\s+vwadd\.wv\s+v[0-9]+,\s*v[0-9]+,\s*v[0-9]+\s+} 1 } } */
+/* { dg-final { scan-assembler-times {vsetvli\s+zero,\s*[a-x0-9]+,\s*e16,\s*m2,\s*t[au],\s*m[au]\s+vwadd\.wv\s+v[0-9]+,\s*v[0-9]+,\s*v[0-9]+\s+} 1 } } */
+/* { dg-final { scan-assembler-times {vsetvli\s+zero,\s*[a-x0-9]+,\s*e16,\s*m4,\s*t[au],\s*m[au]\s+vwadd\.wv\s+v[0-9]+,\s*v[0-9]+,\s*v[0-9]+\s+} 1 } } */
+/* { dg-final { scan-assembler-times {vsetvli\s+zero,\s*[a-x0-9]+,\s*e32,\s*mf2,\s*t[au],\s*m[au]\s+vwadd\.wv\s+v[0-9]+,\s*v[0-9]+,\s*v[0-9]+\s+} 1 } } */
+/* { dg-final { scan-assembler-times {vsetvli\s+zero,\s*[a-x0-9]+,\s*e32,\s*m1,\s*t[au],\s*m[au]\s+vwadd\.wv\s+v[0-9]+,\s*v[0-9]+,\s*v[0-9]+\s+} 1 } } */
+/* { dg-final { scan-assembler-times {vsetvli\s+zero,\s*[a-x0-9]+,\s*e32,\s*m2,\s*t[au],\s*m[au]\s+vwadd\.wv\s+v[0-9]+,\s*v[0-9]+,\s*v[0-9]+\s+} 1 } } */
+/* { dg-final { scan-assembler-times {vsetvli\s+zero,\s*[a-x0-9]+,\s*e32,\s*m4,\s*t[au],\s*m[au]\s+vwadd\.wv\s+v[0-9]+,\s*v[0-9]+,\s*v[0-9]+\s+} 1 } } */
+/* { dg-final { scan-assembler-times {vsetvli\s+zero,\s*[a-x0-9]+,\s*e8,\s*mf8,\s*t[au],\s*m[au]\s+vwadd\.wv\s+v[0-9]+,\s*v[0-9]+,\s*v[0-9]+,\s*v0.t\s+} 1 } } */
+/* { dg-final { scan-assembler-times {vsetvli\s+zero,\s*[a-x0-9]+,\s*e8,\s*mf4,\s*t[au],\s*m[au]\s+vwadd\.wv\s+v[0-9]+,\s*v[0-9]+,\s*v[0-9]+,\s*v0.t\s+} 1 } } */
+/* { dg-final { scan-assembler-times {vsetvli\s+zero,\s*[a-x0-9]+,\s*e8,\s*mf2,\s*t[au],\s*m[au]\s+vwadd\.wv\s+v[0-9]+,\s*v[0-9]+,\s*v[0-9]+,\s*v0.t\s+} 1 } } */
+/* { dg-final { scan-assembler-times {vsetvli\s+zero,\s*[a-x0-9]+,\s*e8,\s*m1,\s*t[au],\s*m[au]\s+vwadd\.wv\s+v[0-9]+,\s*v[0-9]+,\s*v[0-9]+,\s*v0.t\s+} 1 } } */
+/* { dg-final { scan-assembler-times {vsetvli\s+zero,\s*[a-x0-9]+,\s*e8,\s*m2,\s*t[au],\s*m[au]\s+vwadd\.wv\s+v[0-9]+,\s*v[0-9]+,\s*v[0-9]+,\s*v0.t\s+} 1 } } */
+/* { dg-final { scan-assembler-times {vsetvli\s+zero,\s*[a-x0-9]+,\s*e8,\s*m4,\s*t[au],\s*m[au]\s+vwadd\.wv\s+v[0-9]+,\s*v[0-9]+,\s*v[0-9]+,\s*v0.t\s+} 1 } } */
+/* { dg-final { scan-assembler-times {vsetvli\s+zero,\s*[a-x0-9]+,\s*e16,\s*mf4,\s*t[au],\s*m[au]\s+vwadd\.wv\s+v[0-9]+,\s*v[0-9]+,\s*v[0-9]+,\s*v0.t\s+} 1 } } */
+/* { dg-final { scan-assembler-times {vsetvli\s+zero,\s*[a-x0-9]+,\s*e16,\s*mf2,\s*t[au],\s*m[au]\s+vwadd\.wv\s+v[0-9]+,\s*v[0-9]+,\s*v[0-9]+,\s*v0.t\s+} 1 } } */
+/* { dg-final { scan-assembler-times {vsetvli\s+zero,\s*[a-x0-9]+,\s*e16,\s*m1,\s*t[au],\s*m[au]\s+vwadd\.wv\s+v[0-9]+,\s*v[0-9]+,\s*v[0-9]+,\s*v0.t\s+} 1 } } */
+/* { dg-final { scan-assembler-times {vsetvli\s+zero,\s*[a-x0-9]+,\s*e16,\s*m2,\s*t[au],\s*m[au]\s+vwadd\.wv\s+v[0-9]+,\s*v[0-9]+,\s*v[0-9]+,\s*v0.t\s+} 1 } } */
+/* { dg-final { scan-assembler-times {vsetvli\s+zero,\s*[a-x0-9]+,\s*e16,\s*m4,\s*t[au],\s*m[au]\s+vwadd\.wv\s+v[0-9]+,\s*v[0-9]+,\s*v[0-9]+,\s*v0.t\s+} 1 } } */
+/* { dg-final { scan-assembler-times {vsetvli\s+zero,\s*[a-x0-9]+,\s*e32,\s*mf2,\s*t[au],\s*m[au]\s+vwadd\.wv\s+v[0-9]+,\s*v[0-9]+,\s*v[0-9]+,\s*v0.t\s+} 1 } } */
+/* { dg-final { scan-assembler-times {vsetvli\s+zero,\s*[a-x0-9]+,\s*e32,\s*m1,\s*t[au],\s*m[au]\s+vwadd\.wv\s+v[0-9]+,\s*v[0-9]+,\s*v[0-9]+,\s*v0.t\s+} 1 } } */
+/* { dg-final { scan-assembler-times {vsetvli\s+zero,\s*[a-x0-9]+,\s*e32,\s*m2,\s*t[au],\s*m[au]\s+vwadd\.wv\s+v[0-9]+,\s*v[0-9]+,\s*v[0-9]+,\s*v0.t\s+} 1 } } */
+/* { dg-final { scan-assembler-times {vsetvli\s+zero,\s*[a-x0-9]+,\s*e32,\s*m4,\s*t[au],\s*m[au]\s+vwadd\.wv\s+v[0-9]+,\s*v[0-9]+,\s*v[0-9]+,\s*v0.t\s+} 1 } } */
diff --git a/gcc/testsuite/g++.target/riscv/rvv/base/vwadd_wv_mu-1.C b/gcc/testsuite/g++.target/riscv/rvv/base/vwadd_wv_mu-1.C
new file mode 100644
index 00000000000..8b85281bf9c
--- /dev/null
+++ b/gcc/testsuite/g++.target/riscv/rvv/base/vwadd_wv_mu-1.C
@@ -0,0 +1,111 @@
+/* { dg-do compile } */
+/* { dg-options "-march=rv64gcv -mabi=lp64d -O3 -fno-schedule-insns -fno-schedule-insns2" } */
+
+#include "riscv_vector.h"
+
+vint16mf4_t test___riscv_vwadd_wv_mu(vbool64_t mask,vint16mf4_t merge,vint16mf4_t op1,vint8mf8_t op2,size_t vl)
+{
+    return __riscv_vwadd_wv_mu(mask,merge,op1,op2,vl);
+}
+
+
+vint16mf2_t test___riscv_vwadd_wv_mu(vbool32_t mask,vint16mf2_t merge,vint16mf2_t op1,vint8mf4_t op2,size_t vl)
+{
+    return __riscv_vwadd_wv_mu(mask,merge,op1,op2,vl);
+}
+
+
+vint16m1_t test___riscv_vwadd_wv_mu(vbool16_t mask,vint16m1_t merge,vint16m1_t op1,vint8mf2_t op2,size_t vl)
+{
+    return __riscv_vwadd_wv_mu(mask,merge,op1,op2,vl);
+}
+
+
+vint16m2_t test___riscv_vwadd_wv_mu(vbool8_t mask,vint16m2_t merge,vint16m2_t op1,vint8m1_t op2,size_t vl)
+{
+    return __riscv_vwadd_wv_mu(mask,merge,op1,op2,vl);
+}
+
+
+vint16m4_t test___riscv_vwadd_wv_mu(vbool4_t mask,vint16m4_t merge,vint16m4_t op1,vint8m2_t op2,size_t vl)
+{
+    return __riscv_vwadd_wv_mu(mask,merge,op1,op2,vl);
+}
+
+
+vint16m8_t test___riscv_vwadd_wv_mu(vbool2_t mask,vint16m8_t merge,vint16m8_t op1,vint8m4_t op2,size_t vl)
+{
+    return __riscv_vwadd_wv_mu(mask,merge,op1,op2,vl);
+}
+
+
+vint32mf2_t test___riscv_vwadd_wv_mu(vbool64_t mask,vint32mf2_t merge,vint32mf2_t op1,vint16mf4_t op2,size_t vl)
+{
+    return __riscv_vwadd_wv_mu(mask,merge,op1,op2,vl);
+}
+
+
+vint32m1_t test___riscv_vwadd_wv_mu(vbool32_t mask,vint32m1_t merge,vint32m1_t op1,vint16mf2_t op2,size_t vl)
+{
+    return __riscv_vwadd_wv_mu(mask,merge,op1,op2,vl);
+}
+
+
+vint32m2_t test___riscv_vwadd_wv_mu(vbool16_t mask,vint32m2_t merge,vint32m2_t op1,vint16m1_t op2,size_t vl)
+{
+    return __riscv_vwadd_wv_mu(mask,merge,op1,op2,vl);
+}
+
+
+vint32m4_t test___riscv_vwadd_wv_mu(vbool8_t mask,vint32m4_t merge,vint32m4_t op1,vint16m2_t op2,size_t vl)
+{
+    return __riscv_vwadd_wv_mu(mask,merge,op1,op2,vl);
+}
+
+
+vint32m8_t test___riscv_vwadd_wv_mu(vbool4_t mask,vint32m8_t merge,vint32m8_t op1,vint16m4_t op2,size_t vl)
+{
+    return __riscv_vwadd_wv_mu(mask,merge,op1,op2,vl);
+}
+
+
+vint64m1_t test___riscv_vwadd_wv_mu(vbool64_t mask,vint64m1_t merge,vint64m1_t op1,vint32mf2_t op2,size_t vl)
+{
+    return __riscv_vwadd_wv_mu(mask,merge,op1,op2,vl);
+}
+
+
+vint64m2_t test___riscv_vwadd_wv_mu(vbool32_t mask,vint64m2_t merge,vint64m2_t op1,vint32m1_t op2,size_t vl)
+{
+    return __riscv_vwadd_wv_mu(mask,merge,op1,op2,vl);
+}
+
+
+vint64m4_t test___riscv_vwadd_wv_mu(vbool16_t mask,vint64m4_t merge,vint64m4_t op1,vint32m2_t op2,size_t vl)
+{
+    return __riscv_vwadd_wv_mu(mask,merge,op1,op2,vl);
+}
+
+
+vint64m8_t test___riscv_vwadd_wv_mu(vbool8_t mask,vint64m8_t merge,vint64m8_t op1,vint32m4_t op2,size_t vl)
+{
+    return __riscv_vwadd_wv_mu(mask,merge,op1,op2,vl);
+}
+
+
+
+/* { dg-final { scan-assembler-times {vsetvli\s+zero,\s*[a-x0-9]+,\s*e8,\s*mf8,\s*t[au],\s*mu\s+vwadd\.wv\s+v[0-9]+,\s*v[0-9]+,\s*v[0-9]+,\s*v0.t\s+} 1 } } */
+/* { dg-final { scan-assembler-times {vsetvli\s+zero,\s*[a-x0-9]+,\s*e8,\s*mf4,\s*t[au],\s*mu\s+vwadd\.wv\s+v[0-9]+,\s*v[0-9]+,\s*v[0-9]+,\s*v0.t\s+} 1 } } */
+/* { dg-final { scan-assembler-times {vsetvli\s+zero,\s*[a-x0-9]+,\s*e8,\s*mf2,\s*t[au],\s*mu\s+vwadd\.wv\s+v[0-9]+,\s*v[0-9]+,\s*v[0-9]+,\s*v0.t\s+} 1 } } */
+/* { dg-final { scan-assembler-times {vsetvli\s+zero,\s*[a-x0-9]+,\s*e8,\s*m1,\s*t[au],\s*mu\s+vwadd\.wv\s+v[0-9]+,\s*v[0-9]+,\s*v[0-9]+,\s*v0.t\s+} 1 } } */
+/* { dg-final { scan-assembler-times {vsetvli\s+zero,\s*[a-x0-9]+,\s*e8,\s*m2,\s*t[au],\s*mu\s+vwadd\.wv\s+v[0-9]+,\s*v[0-9]+,\s*v[0-9]+,\s*v0.t\s+} 1 } } */
+/* { dg-final { scan-assembler-times {vsetvli\s+zero,\s*[a-x0-9]+,\s*e8,\s*m4,\s*t[au],\s*mu\s+vwadd\.wv\s+v[0-9]+,\s*v[0-9]+,\s*v[0-9]+,\s*v0.t\s+} 1 } } */
+/* { dg-final { scan-assembler-times {vsetvli\s+zero,\s*[a-x0-9]+,\s*e16,\s*mf4,\s*t[au],\s*mu\s+vwadd\.wv\s+v[0-9]+,\s*v[0-9]+,\s*v[0-9]+,\s*v0.t\s+} 1 } } */
+/* { dg-final { scan-assembler-times {vsetvli\s+zero,\s*[a-x0-9]+,\s*e16,\s*mf2,\s*t[au],\s*mu\s+vwadd\.wv\s+v[0-9]+,\s*v[0-9]+,\s*v[0-9]+,\s*v0.t\s+} 1 } } */
+/* { dg-final { scan-assembler-times {vsetvli\s+zero,\s*[a-x0-9]+,\s*e16,\s*m1,\s*t[au],\s*mu\s+vwadd\.wv\s+v[0-9]+,\s*v[0-9]+,\s*v[0-9]+,\s*v0.t\s+} 1 } } */
+/* { dg-final { scan-assembler-times {vsetvli\s+zero,\s*[a-x0-9]+,\s*e16,\s*m2,\s*t[au],\s*mu\s+vwadd\.wv\s+v[0-9]+,\s*v[0-9]+,\s*v[0-9]+,\s*v0.t\s+} 1 } } */
+/* { dg-final { scan-assembler-times {vsetvli\s+zero,\s*[a-x0-9]+,\s*e16,\s*m4,\s*t[au],\s*mu\s+vwadd\.wv\s+v[0-9]+,\s*v[0-9]+,\s*v[0-9]+,\s*v0.t\s+} 1 } } */
+/* { dg-final { scan-assembler-times {vsetvli\s+zero,\s*[a-x0-9]+,\s*e32,\s*mf2,\s*t[au],\s*mu\s+vwadd\.wv\s+v[0-9]+,\s*v[0-9]+,\s*v[0-9]+,\s*v0.t\s+} 1 } } */
+/* { dg-final { scan-assembler-times {vsetvli\s+zero,\s*[a-x0-9]+,\s*e32,\s*m1,\s*t[au],\s*mu\s+vwadd\.wv\s+v[0-9]+,\s*v[0-9]+,\s*v[0-9]+,\s*v0.t\s+} 1 } } */
+/* { dg-final { scan-assembler-times {vsetvli\s+zero,\s*[a-x0-9]+,\s*e32,\s*m2,\s*t[au],\s*mu\s+vwadd\.wv\s+v[0-9]+,\s*v[0-9]+,\s*v[0-9]+,\s*v0.t\s+} 1 } } */
+/* { dg-final { scan-assembler-times {vsetvli\s+zero,\s*[a-x0-9]+,\s*e32,\s*m4,\s*t[au],\s*mu\s+vwadd\.wv\s+v[0-9]+,\s*v[0-9]+,\s*v[0-9]+,\s*v0.t\s+} 1 } } */
diff --git a/gcc/testsuite/g++.target/riscv/rvv/base/vwadd_wv_mu-2.C b/gcc/testsuite/g++.target/riscv/rvv/base/vwadd_wv_mu-2.C
new file mode 100644
index 00000000000..8fe88aaacf3
--- /dev/null
+++ b/gcc/testsuite/g++.target/riscv/rvv/base/vwadd_wv_mu-2.C
@@ -0,0 +1,111 @@
+/* { dg-do compile } */
+/* { dg-options "-march=rv64gcv -mabi=lp64d -O3 -fno-schedule-insns -fno-schedule-insns2" } */
+
+#include "riscv_vector.h"
+
+vint16mf4_t test___riscv_vwadd_wv_mu(vbool64_t mask,vint16mf4_t merge,vint16mf4_t op1,vint8mf8_t op2,size_t vl)
+{
+    return __riscv_vwadd_wv_mu(mask,merge,op1,op2,31);
+}
+
+
+vint16mf2_t test___riscv_vwadd_wv_mu(vbool32_t mask,vint16mf2_t merge,vint16mf2_t op1,vint8mf4_t op2,size_t vl)
+{
+    return __riscv_vwadd_wv_mu(mask,merge,op1,op2,31);
+}
+
+
+vint16m1_t test___riscv_vwadd_wv_mu(vbool16_t mask,vint16m1_t merge,vint16m1_t op1,vint8mf2_t op2,size_t vl)
+{
+    return __riscv_vwadd_wv_mu(mask,merge,op1,op2,31);
+}
+
+
+vint16m2_t test___riscv_vwadd_wv_mu(vbool8_t mask,vint16m2_t merge,vint16m2_t op1,vint8m1_t op2,size_t vl)
+{
+    return __riscv_vwadd_wv_mu(mask,merge,op1,op2,31);
+}
+
+
+vint16m4_t test___riscv_vwadd_wv_mu(vbool4_t mask,vint16m4_t merge,vint16m4_t op1,vint8m2_t op2,size_t vl)
+{
+    return __riscv_vwadd_wv_mu(mask,merge,op1,op2,31);
+}
+
+
+vint16m8_t test___riscv_vwadd_wv_mu(vbool2_t mask,vint16m8_t merge,vint16m8_t op1,vint8m4_t op2,size_t vl)
+{
+    return __riscv_vwadd_wv_mu(mask,merge,op1,op2,31);
+}
+
+
+vint32mf2_t test___riscv_vwadd_wv_mu(vbool64_t mask,vint32mf2_t merge,vint32mf2_t op1,vint16mf4_t op2,size_t vl)
+{
+    return __riscv_vwadd_wv_mu(mask,merge,op1,op2,31);
+}
+
+
+vint32m1_t test___riscv_vwadd_wv_mu(vbool32_t mask,vint32m1_t merge,vint32m1_t op1,vint16mf2_t op2,size_t vl)
+{
+    return __riscv_vwadd_wv_mu(mask,merge,op1,op2,31);
+}
+
+
+vint32m2_t test___riscv_vwadd_wv_mu(vbool16_t mask,vint32m2_t merge,vint32m2_t op1,vint16m1_t op2,size_t vl)
+{
+    return __riscv_vwadd_wv_mu(mask,merge,op1,op2,31);
+}
+
+
+vint32m4_t test___riscv_vwadd_wv_mu(vbool8_t mask,vint32m4_t merge,vint32m4_t op1,vint16m2_t op2,size_t vl)
+{
+    return __riscv_vwadd_wv_mu(mask,merge,op1,op2,31);
+}
+
+
+vint32m8_t test___riscv_vwadd_wv_mu(vbool4_t mask,vint32m8_t merge,vint32m8_t op1,vint16m4_t op2,size_t vl)
+{
+    return __riscv_vwadd_wv_mu(mask,merge,op1,op2,31);
+}
+
+
+vint64m1_t test___riscv_vwadd_wv_mu(vbool64_t mask,vint64m1_t merge,vint64m1_t op1,vint32mf2_t op2,size_t vl)
+{
+    return __riscv_vwadd_wv_mu(mask,merge,op1,op2,31);
+}
+
+
+vint64m2_t test___riscv_vwadd_wv_mu(vbool32_t mask,vint64m2_t merge,vint64m2_t op1,vint32m1_t op2,size_t vl)
+{
+    return __riscv_vwadd_wv_mu(mask,merge,op1,op2,31);
+}
+
+
+vint64m4_t test___riscv_vwadd_wv_mu(vbool16_t mask,vint64m4_t merge,vint64m4_t op1,vint32m2_t op2,size_t vl)
+{
+    return __riscv_vwadd_wv_mu(mask,merge,op1,op2,31);
+}
+
+
+vint64m8_t test___riscv_vwadd_wv_mu(vbool8_t mask,vint64m8_t merge,vint64m8_t op1,vint32m4_t op2,size_t vl)
+{
+    return __riscv_vwadd_wv_mu(mask,merge,op1,op2,31);
+}
+
+
+
+/* { dg-final { scan-assembler-times {vsetivli\s+zero,\s*31,\s*e8,\s*mf8,\s*t[au],\s*mu\s+vwadd\.wv\s+v[0-9]+,\s*v[0-9]+,\s*v[0-9]+,\s*v0.t\s+} 1 } } */
+/* { dg-final { scan-assembler-times {vsetivli\s+zero,\s*31,\s*e8,\s*mf4,\s*t[au],\s*mu\s+vwadd\.wv\s+v[0-9]+,\s*v[0-9]+,\s*v[0-9]+,\s*v0.t\s+} 1 } } */
+/* { dg-final { scan-assembler-times {vsetivli\s+zero,\s*31,\s*e8,\s*mf2,\s*t[au],\s*mu\s+vwadd\.wv\s+v[0-9]+,\s*v[0-9]+,\s*v[0-9]+,\s*v0.t\s+} 1 } } */
+/* { dg-final { scan-assembler-times {vsetivli\s+zero,\s*31,\s*e8,\s*m1,\s*t[au],\s*mu\s+vwadd\.wv\s+v[0-9]+,\s*v[0-9]+,\s*v[0-9]+,\s*v0.t\s+} 1 } } */
+/* { dg-final { scan-assembler-times {vsetivli\s+zero,\s*31,\s*e8,\s*m2,\s*t[au],\s*mu\s+vwadd\.wv\s+v[0-9]+,\s*v[0-9]+,\s*v[0-9]+,\s*v0.t\s+} 1 } } */
+/* { dg-final { scan-assembler-times {vsetivli\s+zero,\s*31,\s*e8,\s*m4,\s*t[au],\s*mu\s+vwadd\.wv\s+v[0-9]+,\s*v[0-9]+,\s*v[0-9]+,\s*v0.t\s+} 1 } } */
+/* { dg-final { scan-assembler-times {vsetivli\s+zero,\s*31,\s*e16,\s*mf4,\s*t[au],\s*mu\s+vwadd\.wv\s+v[0-9]+,\s*v[0-9]+,\s*v[0-9]+,\s*v0.t\s+} 1 } } */
+/* { dg-final { scan-assembler-times {vsetivli\s+zero,\s*31,\s*e16,\s*mf2,\s*t[au],\s*mu\s+vwadd\.wv\s+v[0-9]+,\s*v[0-9]+,\s*v[0-9]+,\s*v0.t\s+} 1 } } */
+/* { dg-final { scan-assembler-times {vsetivli\s+zero,\s*31,\s*e16,\s*m1,\s*t[au],\s*mu\s+vwadd\.wv\s+v[0-9]+,\s*v[0-9]+,\s*v[0-9]+,\s*v0.t\s+} 1 } } */
+/* { dg-final { scan-assembler-times {vsetivli\s+zero,\s*31,\s*e16,\s*m2,\s*t[au],\s*mu\s+vwadd\.wv\s+v[0-9]+,\s*v[0-9]+,\s*v[0-9]+,\s*v0.t\s+} 1 } } */
+/* { dg-final { scan-assembler-times {vsetivli\s+zero,\s*31,\s*e16,\s*m4,\s*t[au],\s*mu\s+vwadd\.wv\s+v[0-9]+,\s*v[0-9]+,\s*v[0-9]+,\s*v0.t\s+} 1 } } */
+/* { dg-final { scan-assembler-times {vsetivli\s+zero,\s*31,\s*e32,\s*mf2,\s*t[au],\s*mu\s+vwadd\.wv\s+v[0-9]+,\s*v[0-9]+,\s*v[0-9]+,\s*v0.t\s+} 1 } } */
+/* { dg-final { scan-assembler-times {vsetivli\s+zero,\s*31,\s*e32,\s*m1,\s*t[au],\s*mu\s+vwadd\.wv\s+v[0-9]+,\s*v[0-9]+,\s*v[0-9]+,\s*v0.t\s+} 1 } } */
+/* { dg-final { scan-assembler-times {vsetivli\s+zero,\s*31,\s*e32,\s*m2,\s*t[au],\s*mu\s+vwadd\.wv\s+v[0-9]+,\s*v[0-9]+,\s*v[0-9]+,\s*v0.t\s+} 1 } } */
+/* { dg-final { scan-assembler-times {vsetivli\s+zero,\s*31,\s*e32,\s*m4,\s*t[au],\s*mu\s+vwadd\.wv\s+v[0-9]+,\s*v[0-9]+,\s*v[0-9]+,\s*v0.t\s+} 1 } } */
diff --git a/gcc/testsuite/g++.target/riscv/rvv/base/vwadd_wv_mu-3.C b/gcc/testsuite/g++.target/riscv/rvv/base/vwadd_wv_mu-3.C
new file mode 100644
index 00000000000..41e6fde26cb
--- /dev/null
+++ b/gcc/testsuite/g++.target/riscv/rvv/base/vwadd_wv_mu-3.C
@@ -0,0 +1,111 @@
+/* { dg-do compile } */
+/* { dg-options "-march=rv64gcv -mabi=lp64d -O3 -fno-schedule-insns -fno-schedule-insns2" } */
+
+#include "riscv_vector.h"
+
+vint16mf4_t test___riscv_vwadd_wv_mu(vbool64_t mask,vint16mf4_t merge,vint16mf4_t op1,vint8mf8_t op2,size_t vl)
+{
+    return __riscv_vwadd_wv_mu(mask,merge,op1,op2,32);
+}
+
+
+vint16mf2_t test___riscv_vwadd_wv_mu(vbool32_t mask,vint16mf2_t merge,vint16mf2_t op1,vint8mf4_t op2,size_t vl)
+{
+    return __riscv_vwadd_wv_mu(mask,merge,op1,op2,32);
+}
+
+
+vint16m1_t test___riscv_vwadd_wv_mu(vbool16_t mask,vint16m1_t merge,vint16m1_t op1,vint8mf2_t op2,size_t vl)
+{
+    return __riscv_vwadd_wv_mu(mask,merge,op1,op2,32);
+}
+
+
+vint16m2_t test___riscv_vwadd_wv_mu(vbool8_t mask,vint16m2_t merge,vint16m2_t op1,vint8m1_t op2,size_t vl)
+{
+    return __riscv_vwadd_wv_mu(mask,merge,op1,op2,32);
+}
+
+
+vint16m4_t test___riscv_vwadd_wv_mu(vbool4_t mask,vint16m4_t merge,vint16m4_t op1,vint8m2_t op2,size_t vl)
+{
+    return __riscv_vwadd_wv_mu(mask,merge,op1,op2,32);
+}
+
+
+vint16m8_t test___riscv_vwadd_wv_mu(vbool2_t mask,vint16m8_t merge,vint16m8_t op1,vint8m4_t op2,size_t vl)
+{
+    return __riscv_vwadd_wv_mu(mask,merge,op1,op2,32);
+}
+
+
+vint32mf2_t test___riscv_vwadd_wv_mu(vbool64_t mask,vint32mf2_t merge,vint32mf2_t op1,vint16mf4_t op2,size_t vl)
+{
+    return __riscv_vwadd_wv_mu(mask,merge,op1,op2,32);
+}
+
+
+vint32m1_t test___riscv_vwadd_wv_mu(vbool32_t mask,vint32m1_t merge,vint32m1_t op1,vint16mf2_t op2,size_t vl)
+{
+    return __riscv_vwadd_wv_mu(mask,merge,op1,op2,32);
+}
+
+
+vint32m2_t test___riscv_vwadd_wv_mu(vbool16_t mask,vint32m2_t merge,vint32m2_t op1,vint16m1_t op2,size_t vl)
+{
+    return __riscv_vwadd_wv_mu(mask,merge,op1,op2,32);
+}
+
+
+vint32m4_t test___riscv_vwadd_wv_mu(vbool8_t mask,vint32m4_t merge,vint32m4_t op1,vint16m2_t op2,size_t vl)
+{
+    return __riscv_vwadd_wv_mu(mask,merge,op1,op2,32);
+}
+
+
+vint32m8_t test___riscv_vwadd_wv_mu(vbool4_t mask,vint32m8_t merge,vint32m8_t op1,vint16m4_t op2,size_t vl)
+{
+    return __riscv_vwadd_wv_mu(mask,merge,op1,op2,32);
+}
+
+
+vint64m1_t test___riscv_vwadd_wv_mu(vbool64_t mask,vint64m1_t merge,vint64m1_t op1,vint32mf2_t op2,size_t vl)
+{
+    return __riscv_vwadd_wv_mu(mask,merge,op1,op2,32);
+}
+
+
+vint64m2_t test___riscv_vwadd_wv_mu(vbool32_t mask,vint64m2_t merge,vint64m2_t op1,vint32m1_t op2,size_t vl)
+{
+    return __riscv_vwadd_wv_mu(mask,merge,op1,op2,32);
+}
+
+
+vint64m4_t test___riscv_vwadd_wv_mu(vbool16_t mask,vint64m4_t merge,vint64m4_t op1,vint32m2_t op2,size_t vl)
+{
+    return __riscv_vwadd_wv_mu(mask,merge,op1,op2,32);
+}
+
+
+vint64m8_t test___riscv_vwadd_wv_mu(vbool8_t mask,vint64m8_t merge,vint64m8_t op1,vint32m4_t op2,size_t vl)
+{
+    return __riscv_vwadd_wv_mu(mask,merge,op1,op2,32);
+}
+
+
+
+/* { dg-final { scan-assembler-times {vsetvli\s+zero,\s*[a-x0-9]+,\s*e8,\s*mf8,\s*t[au],\s*mu\s+vwadd\.wv\s+v[0-9]+,\s*v[0-9]+,\s*v[0-9]+,\s*v0.t\s+} 1 } } */
+/* { dg-final { scan-assembler-times {vsetvli\s+zero,\s*[a-x0-9]+,\s*e8,\s*mf4,\s*t[au],\s*mu\s+vwadd\.wv\s+v[0-9]+,\s*v[0-9]+,\s*v[0-9]+,\s*v0.t\s+} 1 } } */
+/* { dg-final { scan-assembler-times {vsetvli\s+zero,\s*[a-x0-9]+,\s*e8,\s*mf2,\s*t[au],\s*mu\s+vwadd\.wv\s+v[0-9]+,\s*v[0-9]+,\s*v[0-9]+,\s*v0.t\s+} 1 } } */
+/* { dg-final { scan-assembler-times {vsetvli\s+zero,\s*[a-x0-9]+,\s*e8,\s*m1,\s*t[au],\s*mu\s+vwadd\.wv\s+v[0-9]+,\s*v[0-9]+,\s*v[0-9]+,\s*v0.t\s+} 1 } } */
+/* { dg-final { scan-assembler-times {vsetvli\s+zero,\s*[a-x0-9]+,\s*e8,\s*m2,\s*t[au],\s*mu\s+vwadd\.wv\s+v[0-9]+,\s*v[0-9]+,\s*v[0-9]+,\s*v0.t\s+} 1 } } */
+/* { dg-final { scan-assembler-times {vsetvli\s+zero,\s*[a-x0-9]+,\s*e8,\s*m4,\s*t[au],\s*mu\s+vwadd\.wv\s+v[0-9]+,\s*v[0-9]+,\s*v[0-9]+,\s*v0.t\s+} 1 } } */
+/* { dg-final { scan-assembler-times {vsetvli\s+zero,\s*[a-x0-9]+,\s*e16,\s*mf4,\s*t[au],\s*mu\s+vwadd\.wv\s+v[0-9]+,\s*v[0-9]+,\s*v[0-9]+,\s*v0.t\s+} 1 } } */
+/* { dg-final { scan-assembler-times {vsetvli\s+zero,\s*[a-x0-9]+,\s*e16,\s*mf2,\s*t[au],\s*mu\s+vwadd\.wv\s+v[0-9]+,\s*v[0-9]+,\s*v[0-9]+,\s*v0.t\s+} 1 } } */
+/* { dg-final { scan-assembler-times {vsetvli\s+zero,\s*[a-x0-9]+,\s*e16,\s*m1,\s*t[au],\s*mu\s+vwadd\.wv\s+v[0-9]+,\s*v[0-9]+,\s*v[0-9]+,\s*v0.t\s+} 1 } } */
+/* { dg-final { scan-assembler-times {vsetvli\s+zero,\s*[a-x0-9]+,\s*e16,\s*m2,\s*t[au],\s*mu\s+vwadd\.wv\s+v[0-9]+,\s*v[0-9]+,\s*v[0-9]+,\s*v0.t\s+} 1 } } */
+/* { dg-final { scan-assembler-times {vsetvli\s+zero,\s*[a-x0-9]+,\s*e16,\s*m4,\s*t[au],\s*mu\s+vwadd\.wv\s+v[0-9]+,\s*v[0-9]+,\s*v[0-9]+,\s*v0.t\s+} 1 } } */
+/* { dg-final { scan-assembler-times {vsetvli\s+zero,\s*[a-x0-9]+,\s*e32,\s*mf2,\s*t[au],\s*mu\s+vwadd\.wv\s+v[0-9]+,\s*v[0-9]+,\s*v[0-9]+,\s*v0.t\s+} 1 } } */
+/* { dg-final { scan-assembler-times {vsetvli\s+zero,\s*[a-x0-9]+,\s*e32,\s*m1,\s*t[au],\s*mu\s+vwadd\.wv\s+v[0-9]+,\s*v[0-9]+,\s*v[0-9]+,\s*v0.t\s+} 1 } } */
+/* { dg-final { scan-assembler-times {vsetvli\s+zero,\s*[a-x0-9]+,\s*e32,\s*m2,\s*t[au],\s*mu\s+vwadd\.wv\s+v[0-9]+,\s*v[0-9]+,\s*v[0-9]+,\s*v0.t\s+} 1 } } */
+/* { dg-final { scan-assembler-times {vsetvli\s+zero,\s*[a-x0-9]+,\s*e32,\s*m4,\s*t[au],\s*mu\s+vwadd\.wv\s+v[0-9]+,\s*v[0-9]+,\s*v[0-9]+,\s*v0.t\s+} 1 } } */
diff --git a/gcc/testsuite/g++.target/riscv/rvv/base/vwadd_wv_tu-1.C b/gcc/testsuite/g++.target/riscv/rvv/base/vwadd_wv_tu-1.C
new file mode 100644
index 00000000000..aaeef67f864
--- /dev/null
+++ b/gcc/testsuite/g++.target/riscv/rvv/base/vwadd_wv_tu-1.C
@@ -0,0 +1,111 @@
+/* { dg-do compile } */
+/* { dg-options "-march=rv64gcv -mabi=lp64d -O3 -fno-schedule-insns -fno-schedule-insns2" } */
+
+#include "riscv_vector.h"
+
+vint16mf4_t test___riscv_vwadd_wv_tu(vint16mf4_t merge,vint16mf4_t op1,vint8mf8_t op2,size_t vl)
+{
+    return __riscv_vwadd_wv_tu(merge,op1,op2,vl);
+}
+
+
+vint16mf2_t test___riscv_vwadd_wv_tu(vint16mf2_t merge,vint16mf2_t op1,vint8mf4_t op2,size_t vl)
+{
+    return __riscv_vwadd_wv_tu(merge,op1,op2,vl);
+}
+
+
+vint16m1_t test___riscv_vwadd_wv_tu(vint16m1_t merge,vint16m1_t op1,vint8mf2_t op2,size_t vl)
+{
+    return __riscv_vwadd_wv_tu(merge,op1,op2,vl);
+}
+
+
+vint16m2_t test___riscv_vwadd_wv_tu(vint16m2_t merge,vint16m2_t op1,vint8m1_t op2,size_t vl)
+{
+    return __riscv_vwadd_wv_tu(merge,op1,op2,vl);
+}
+
+
+vint16m4_t test___riscv_vwadd_wv_tu(vint16m4_t merge,vint16m4_t op1,vint8m2_t op2,size_t vl)
+{
+    return __riscv_vwadd_wv_tu(merge,op1,op2,vl);
+}
+
+
+vint16m8_t test___riscv_vwadd_wv_tu(vint16m8_t merge,vint16m8_t op1,vint8m4_t op2,size_t vl)
+{
+    return __riscv_vwadd_wv_tu(merge,op1,op2,vl);
+}
+
+
+vint32mf2_t test___riscv_vwadd_wv_tu(vint32mf2_t merge,vint32mf2_t op1,vint16mf4_t op2,size_t vl)
+{
+    return __riscv_vwadd_wv_tu(merge,op1,op2,vl);
+}
+
+
+vint32m1_t test___riscv_vwadd_wv_tu(vint32m1_t merge,vint32m1_t op1,vint16mf2_t op2,size_t vl)
+{
+    return __riscv_vwadd_wv_tu(merge,op1,op2,vl);
+}
+
+
+vint32m2_t test___riscv_vwadd_wv_tu(vint32m2_t merge,vint32m2_t op1,vint16m1_t op2,size_t vl)
+{
+    return __riscv_vwadd_wv_tu(merge,op1,op2,vl);
+}
+
+
+vint32m4_t test___riscv_vwadd_wv_tu(vint32m4_t merge,vint32m4_t op1,vint16m2_t op2,size_t vl)
+{
+    return __riscv_vwadd_wv_tu(merge,op1,op2,vl);
+}
+
+
+vint32m8_t test___riscv_vwadd_wv_tu(vint32m8_t merge,vint32m8_t op1,vint16m4_t op2,size_t vl)
+{
+    return __riscv_vwadd_wv_tu(merge,op1,op2,vl);
+}
+
+
+vint64m1_t test___riscv_vwadd_wv_tu(vint64m1_t merge,vint64m1_t op1,vint32mf2_t op2,size_t vl)
+{
+    return __riscv_vwadd_wv_tu(merge,op1,op2,vl);
+}
+
+
+vint64m2_t test___riscv_vwadd_wv_tu(vint64m2_t merge,vint64m2_t op1,vint32m1_t op2,size_t vl)
+{
+    return __riscv_vwadd_wv_tu(merge,op1,op2,vl);
+}
+
+
+vint64m4_t test___riscv_vwadd_wv_tu(vint64m4_t merge,vint64m4_t op1,vint32m2_t op2,size_t vl)
+{
+    return __riscv_vwadd_wv_tu(merge,op1,op2,vl);
+}
+
+
+vint64m8_t test___riscv_vwadd_wv_tu(vint64m8_t merge,vint64m8_t op1,vint32m4_t op2,size_t vl)
+{
+    return __riscv_vwadd_wv_tu(merge,op1,op2,vl);
+}
+
+
+
+/* { dg-final { scan-assembler-times {vsetvli\s+zero,\s*[a-x0-9]+,\s*e8,\s*mf8,\s*tu,\s*m[au]\s+vwadd\.wv\s+v[0-9]+,\s*v[0-9]+,\s*v[0-9]+\s+} 1 } } */
+/* { dg-final { scan-assembler-times {vsetvli\s+zero,\s*[a-x0-9]+,\s*e8,\s*mf4,\s*tu,\s*m[au]\s+vwadd\.wv\s+v[0-9]+,\s*v[0-9]+,\s*v[0-9]+\s+} 1 } } */
+/* { dg-final { scan-assembler-times {vsetvli\s+zero,\s*[a-x0-9]+,\s*e8,\s*mf2,\s*tu,\s*m[au]\s+vwadd\.wv\s+v[0-9]+,\s*v[0-9]+,\s*v[0-9]+\s+} 1 } } */
+/* { dg-final { scan-assembler-times {vsetvli\s+zero,\s*[a-x0-9]+,\s*e8,\s*m1,\s*tu,\s*m[au]\s+vwadd\.wv\s+v[0-9]+,\s*v[0-9]+,\s*v[0-9]+\s+} 1 } } */
+/* { dg-final { scan-assembler-times {vsetvli\s+zero,\s*[a-x0-9]+,\s*e8,\s*m2,\s*tu,\s*m[au]\s+vwadd\.wv\s+v[0-9]+,\s*v[0-9]+,\s*v[0-9]+\s+} 1 } } */
+/* { dg-final { scan-assembler-times {vsetvli\s+zero,\s*[a-x0-9]+,\s*e8,\s*m4,\s*tu,\s*m[au]\s+vwadd\.wv\s+v[0-9]+,\s*v[0-9]+,\s*v[0-9]+\s+} 1 } } */
+/* { dg-final { scan-assembler-times {vsetvli\s+zero,\s*[a-x0-9]+,\s*e16,\s*mf4,\s*tu,\s*m[au]\s+vwadd\.wv\s+v[0-9]+,\s*v[0-9]+,\s*v[0-9]+\s+} 1 } } */
+/* { dg-final { scan-assembler-times {vsetvli\s+zero,\s*[a-x0-9]+,\s*e16,\s*mf2,\s*tu,\s*m[au]\s+vwadd\.wv\s+v[0-9]+,\s*v[0-9]+,\s*v[0-9]+\s+} 1 } } */
+/* { dg-final { scan-assembler-times {vsetvli\s+zero,\s*[a-x0-9]+,\s*e16,\s*m1,\s*tu,\s*m[au]\s+vwadd\.wv\s+v[0-9]+,\s*v[0-9]+,\s*v[0-9]+\s+} 1 } } */
+/* { dg-final { scan-assembler-times {vsetvli\s+zero,\s*[a-x0-9]+,\s*e16,\s*m2,\s*tu,\s*m[au]\s+vwadd\.wv\s+v[0-9]+,\s*v[0-9]+,\s*v[0-9]+\s+} 1 } } */
+/* { dg-final { scan-assembler-times {vsetvli\s+zero,\s*[a-x0-9]+,\s*e16,\s*m4,\s*tu,\s*m[au]\s+vwadd\.wv\s+v[0-9]+,\s*v[0-9]+,\s*v[0-9]+\s+} 1 } } */
+/* { dg-final { scan-assembler-times {vsetvli\s+zero,\s*[a-x0-9]+,\s*e32,\s*mf2,\s*tu,\s*m[au]\s+vwadd\.wv\s+v[0-9]+,\s*v[0-9]+,\s*v[0-9]+\s+} 1 } } */
+/* { dg-final { scan-assembler-times {vsetvli\s+zero,\s*[a-x0-9]+,\s*e32,\s*m1,\s*tu,\s*m[au]\s+vwadd\.wv\s+v[0-9]+,\s*v[0-9]+,\s*v[0-9]+\s+} 1 } } */
+/* { dg-final { scan-assembler-times {vsetvli\s+zero,\s*[a-x0-9]+,\s*e32,\s*m2,\s*tu,\s*m[au]\s+vwadd\.wv\s+v[0-9]+,\s*v[0-9]+,\s*v[0-9]+\s+} 1 } } */
+/* { dg-final { scan-assembler-times {vsetvli\s+zero,\s*[a-x0-9]+,\s*e32,\s*m4,\s*tu,\s*m[au]\s+vwadd\.wv\s+v[0-9]+,\s*v[0-9]+,\s*v[0-9]+\s+} 1 } } */
diff --git a/gcc/testsuite/g++.target/riscv/rvv/base/vwadd_wv_tu-2.C b/gcc/testsuite/g++.target/riscv/rvv/base/vwadd_wv_tu-2.C
new file mode 100644
index 00000000000..adc01a0a2dd
--- /dev/null
+++ b/gcc/testsuite/g++.target/riscv/rvv/base/vwadd_wv_tu-2.C
@@ -0,0 +1,111 @@
+/* { dg-do compile } */
+/* { dg-options "-march=rv64gcv -mabi=lp64d -O3 -fno-schedule-insns -fno-schedule-insns2" } */
+
+#include "riscv_vector.h"
+
+vint16mf4_t test___riscv_vwadd_wv_tu(vint16mf4_t merge,vint16mf4_t op1,vint8mf8_t op2,size_t vl)
+{
+    return __riscv_vwadd_wv_tu(merge,op1,op2,31);
+}
+
+
+vint16mf2_t test___riscv_vwadd_wv_tu(vint16mf2_t merge,vint16mf2_t op1,vint8mf4_t op2,size_t vl)
+{
+    return __riscv_vwadd_wv_tu(merge,op1,op2,31);
+}
+
+
+vint16m1_t test___riscv_vwadd_wv_tu(vint16m1_t merge,vint16m1_t op1,vint8mf2_t op2,size_t vl)
+{
+    return __riscv_vwadd_wv_tu(merge,op1,op2,31);
+}
+
+
+vint16m2_t test___riscv_vwadd_wv_tu(vint16m2_t merge,vint16m2_t op1,vint8m1_t op2,size_t vl)
+{
+    return __riscv_vwadd_wv_tu(merge,op1,op2,31);
+}
+
+
+vint16m4_t test___riscv_vwadd_wv_tu(vint16m4_t merge,vint16m4_t op1,vint8m2_t op2,size_t vl)
+{
+    return __riscv_vwadd_wv_tu(merge,op1,op2,31);
+}
+
+
+vint16m8_t test___riscv_vwadd_wv_tu(vint16m8_t merge,vint16m8_t op1,vint8m4_t op2,size_t vl)
+{
+    return __riscv_vwadd_wv_tu(merge,op1,op2,31);
+}
+
+
+vint32mf2_t test___riscv_vwadd_wv_tu(vint32mf2_t merge,vint32mf2_t op1,vint16mf4_t op2,size_t vl)
+{
+    return __riscv_vwadd_wv_tu(merge,op1,op2,31);
+}
+
+
+vint32m1_t test___riscv_vwadd_wv_tu(vint32m1_t merge,vint32m1_t op1,vint16mf2_t op2,size_t vl)
+{
+    return __riscv_vwadd_wv_tu(merge,op1,op2,31);
+}
+
+
+vint32m2_t test___riscv_vwadd_wv_tu(vint32m2_t merge,vint32m2_t op1,vint16m1_t op2,size_t vl)
+{
+    return __riscv_vwadd_wv_tu(merge,op1,op2,31);
+}
+
+
+vint32m4_t test___riscv_vwadd_wv_tu(vint32m4_t merge,vint32m4_t op1,vint16m2_t op2,size_t vl)
+{
+    return __riscv_vwadd_wv_tu(merge,op1,op2,31);
+}
+
+
+vint32m8_t test___riscv_vwadd_wv_tu(vint32m8_t merge,vint32m8_t op1,vint16m4_t op2,size_t vl)
+{
+    return __riscv_vwadd_wv_tu(merge,op1,op2,31);
+}
+
+
+vint64m1_t test___riscv_vwadd_wv_tu(vint64m1_t merge,vint64m1_t op1,vint32mf2_t op2,size_t vl)
+{
+    return __riscv_vwadd_wv_tu(merge,op1,op2,31);
+}
+
+
+vint64m2_t test___riscv_vwadd_wv_tu(vint64m2_t merge,vint64m2_t op1,vint32m1_t op2,size_t vl)
+{
+    return __riscv_vwadd_wv_tu(merge,op1,op2,31);
+}
+
+
+vint64m4_t test___riscv_vwadd_wv_tu(vint64m4_t merge,vint64m4_t op1,vint32m2_t op2,size_t vl)
+{
+    return __riscv_vwadd_wv_tu(merge,op1,op2,31);
+}
+
+
+vint64m8_t test___riscv_vwadd_wv_tu(vint64m8_t merge,vint64m8_t op1,vint32m4_t op2,size_t vl)
+{
+    return __riscv_vwadd_wv_tu(merge,op1,op2,31);
+}
+
+
+
+/* { dg-final { scan-assembler-times {vsetivli\s+zero,\s*31,\s*e8,\s*mf8,\s*tu,\s*m[au]\s+vwadd\.wv\s+v[0-9]+,\s*v[0-9]+,\s*v[0-9]+\s+} 1 } } */
+/* { dg-final { scan-assembler-times {vsetivli\s+zero,\s*31,\s*e8,\s*mf4,\s*tu,\s*m[au]\s+vwadd\.wv\s+v[0-9]+,\s*v[0-9]+,\s*v[0-9]+\s+} 1 } } */
+/* { dg-final { scan-assembler-times {vsetivli\s+zero,\s*31,\s*e8,\s*mf2,\s*tu,\s*m[au]\s+vwadd\.wv\s+v[0-9]+,\s*v[0-9]+,\s*v[0-9]+\s+} 1 } } */
+/* { dg-final { scan-assembler-times {vsetivli\s+zero,\s*31,\s*e8,\s*m1,\s*tu,\s*m[au]\s+vwadd\.wv\s+v[0-9]+,\s*v[0-9]+,\s*v[0-9]+\s+} 1 } } */
+/* { dg-final { scan-assembler-times {vsetivli\s+zero,\s*31,\s*e8,\s*m2,\s*tu,\s*m[au]\s+vwadd\.wv\s+v[0-9]+,\s*v[0-9]+,\s*v[0-9]+\s+} 1 } } */
+/* { dg-final { scan-assembler-times {vsetivli\s+zero,\s*31,\s*e8,\s*m4,\s*tu,\s*m[au]\s+vwadd\.wv\s+v[0-9]+,\s*v[0-9]+,\s*v[0-9]+\s+} 1 } } */
+/* { dg-final { scan-assembler-times {vsetivli\s+zero,\s*31,\s*e16,\s*mf4,\s*tu,\s*m[au]\s+vwadd\.wv\s+v[0-9]+,\s*v[0-9]+,\s*v[0-9]+\s+} 1 } } */
+/* { dg-final { scan-assembler-times {vsetivli\s+zero,\s*31,\s*e16,\s*mf2,\s*tu,\s*m[au]\s+vwadd\.wv\s+v[0-9]+,\s*v[0-9]+,\s*v[0-9]+\s+} 1 } } */
+/* { dg-final { scan-assembler-times {vsetivli\s+zero,\s*31,\s*e16,\s*m1,\s*tu,\s*m[au]\s+vwadd\.wv\s+v[0-9]+,\s*v[0-9]+,\s*v[0-9]+\s+} 1 } } */
+/* { dg-final { scan-assembler-times {vsetivli\s+zero,\s*31,\s*e16,\s*m2,\s*tu,\s*m[au]\s+vwadd\.wv\s+v[0-9]+,\s*v[0-9]+,\s*v[0-9]+\s+} 1 } } */
+/* { dg-final { scan-assembler-times {vsetivli\s+zero,\s*31,\s*e16,\s*m4,\s*tu,\s*m[au]\s+vwadd\.wv\s+v[0-9]+,\s*v[0-9]+,\s*v[0-9]+\s+} 1 } } */
+/* { dg-final { scan-assembler-times {vsetivli\s+zero,\s*31,\s*e32,\s*mf2,\s*tu,\s*m[au]\s+vwadd\.wv\s+v[0-9]+,\s*v[0-9]+,\s*v[0-9]+\s+} 1 } } */
+/* { dg-final { scan-assembler-times {vsetivli\s+zero,\s*31,\s*e32,\s*m1,\s*tu,\s*m[au]\s+vwadd\.wv\s+v[0-9]+,\s*v[0-9]+,\s*v[0-9]+\s+} 1 } } */
+/* { dg-final { scan-assembler-times {vsetivli\s+zero,\s*31,\s*e32,\s*m2,\s*tu,\s*m[au]\s+vwadd\.wv\s+v[0-9]+,\s*v[0-9]+,\s*v[0-9]+\s+} 1 } } */
+/* { dg-final { scan-assembler-times {vsetivli\s+zero,\s*31,\s*e32,\s*m4,\s*tu,\s*m[au]\s+vwadd\.wv\s+v[0-9]+,\s*v[0-9]+,\s*v[0-9]+\s+} 1 } } */
diff --git a/gcc/testsuite/g++.target/riscv/rvv/base/vwadd_wv_tu-3.C b/gcc/testsuite/g++.target/riscv/rvv/base/vwadd_wv_tu-3.C
new file mode 100644
index 00000000000..9152b96ba4e
--- /dev/null
+++ b/gcc/testsuite/g++.target/riscv/rvv/base/vwadd_wv_tu-3.C
@@ -0,0 +1,111 @@
+/* { dg-do compile } */
+/* { dg-options "-march=rv64gcv -mabi=lp64d -O3 -fno-schedule-insns -fno-schedule-insns2" } */
+
+#include "riscv_vector.h"
+
+vint16mf4_t test___riscv_vwadd_wv_tu(vint16mf4_t merge,vint16mf4_t op1,vint8mf8_t op2,size_t vl)
+{
+    return __riscv_vwadd_wv_tu(merge,op1,op2,32);
+}
+
+
+vint16mf2_t test___riscv_vwadd_wv_tu(vint16mf2_t merge,vint16mf2_t op1,vint8mf4_t op2,size_t vl)
+{
+    return __riscv_vwadd_wv_tu(merge,op1,op2,32);
+}
+
+
+vint16m1_t test___riscv_vwadd_wv_tu(vint16m1_t merge,vint16m1_t op1,vint8mf2_t op2,size_t vl)
+{
+    return __riscv_vwadd_wv_tu(merge,op1,op2,32);
+}
+
+
+vint16m2_t test___riscv_vwadd_wv_tu(vint16m2_t merge,vint16m2_t op1,vint8m1_t op2,size_t vl)
+{
+    return __riscv_vwadd_wv_tu(merge,op1,op2,32);
+}
+
+
+vint16m4_t test___riscv_vwadd_wv_tu(vint16m4_t merge,vint16m4_t op1,vint8m2_t op2,size_t vl)
+{
+    return __riscv_vwadd_wv_tu(merge,op1,op2,32);
+}
+
+
+vint16m8_t test___riscv_vwadd_wv_tu(vint16m8_t merge,vint16m8_t op1,vint8m4_t op2,size_t vl)
+{
+    return __riscv_vwadd_wv_tu(merge,op1,op2,32);
+}
+
+
+vint32mf2_t test___riscv_vwadd_wv_tu(vint32mf2_t merge,vint32mf2_t op1,vint16mf4_t op2,size_t vl)
+{
+    return __riscv_vwadd_wv_tu(merge,op1,op2,32);
+}
+
+
+vint32m1_t test___riscv_vwadd_wv_tu(vint32m1_t merge,vint32m1_t op1,vint16mf2_t op2,size_t vl)
+{
+    return __riscv_vwadd_wv_tu(merge,op1,op2,32);
+}
+
+
+vint32m2_t test___riscv_vwadd_wv_tu(vint32m2_t merge,vint32m2_t op1,vint16m1_t op2,size_t vl)
+{
+    return __riscv_vwadd_wv_tu(merge,op1,op2,32);
+}
+
+
+vint32m4_t test___riscv_vwadd_wv_tu(vint32m4_t merge,vint32m4_t op1,vint16m2_t op2,size_t vl)
+{
+    return __riscv_vwadd_wv_tu(merge,op1,op2,32);
+}
+
+
+vint32m8_t test___riscv_vwadd_wv_tu(vint32m8_t merge,vint32m8_t op1,vint16m4_t op2,size_t vl)
+{
+    return __riscv_vwadd_wv_tu(merge,op1,op2,32);
+}
+
+
+vint64m1_t test___riscv_vwadd_wv_tu(vint64m1_t merge,vint64m1_t op1,vint32mf2_t op2,size_t vl)
+{
+    return __riscv_vwadd_wv_tu(merge,op1,op2,32);
+}
+
+
+vint64m2_t test___riscv_vwadd_wv_tu(vint64m2_t merge,vint64m2_t op1,vint32m1_t op2,size_t vl)
+{
+    return __riscv_vwadd_wv_tu(merge,op1,op2,32);
+}
+
+
+vint64m4_t test___riscv_vwadd_wv_tu(vint64m4_t merge,vint64m4_t op1,vint32m2_t op2,size_t vl)
+{
+    return __riscv_vwadd_wv_tu(merge,op1,op2,32);
+}
+
+
+vint64m8_t test___riscv_vwadd_wv_tu(vint64m8_t merge,vint64m8_t op1,vint32m4_t op2,size_t vl)
+{
+    return __riscv_vwadd_wv_tu(merge,op1,op2,32);
+}
+
+
+
+/* { dg-final { scan-assembler-times {vsetvli\s+zero,\s*[a-x0-9]+,\s*e8,\s*mf8,\s*tu,\s*m[au]\s+vwadd\.wv\s+v[0-9]+,\s*v[0-9]+,\s*v[0-9]+\s+} 1 } } */
+/* { dg-final { scan-assembler-times {vsetvli\s+zero,\s*[a-x0-9]+,\s*e8,\s*mf4,\s*tu,\s*m[au]\s+vwadd\.wv\s+v[0-9]+,\s*v[0-9]+,\s*v[0-9]+\s+} 1 } } */
+/* { dg-final { scan-assembler-times {vsetvli\s+zero,\s*[a-x0-9]+,\s*e8,\s*mf2,\s*tu,\s*m[au]\s+vwadd\.wv\s+v[0-9]+,\s*v[0-9]+,\s*v[0-9]+\s+} 1 } } */
+/* { dg-final { scan-assembler-times {vsetvli\s+zero,\s*[a-x0-9]+,\s*e8,\s*m1,\s*tu,\s*m[au]\s+vwadd\.wv\s+v[0-9]+,\s*v[0-9]+,\s*v[0-9]+\s+} 1 } } */
+/* { dg-final { scan-assembler-times {vsetvli\s+zero,\s*[a-x0-9]+,\s*e8,\s*m2,\s*tu,\s*m[au]\s+vwadd\.wv\s+v[0-9]+,\s*v[0-9]+,\s*v[0-9]+\s+} 1 } } */
+/* { dg-final { scan-assembler-times {vsetvli\s+zero,\s*[a-x0-9]+,\s*e8,\s*m4,\s*tu,\s*m[au]\s+vwadd\.wv\s+v[0-9]+,\s*v[0-9]+,\s*v[0-9]+\s+} 1 } } */
+/* { dg-final { scan-assembler-times {vsetvli\s+zero,\s*[a-x0-9]+,\s*e16,\s*mf4,\s*tu,\s*m[au]\s+vwadd\.wv\s+v[0-9]+,\s*v[0-9]+,\s*v[0-9]+\s+} 1 } } */
+/* { dg-final { scan-assembler-times {vsetvli\s+zero,\s*[a-x0-9]+,\s*e16,\s*mf2,\s*tu,\s*m[au]\s+vwadd\.wv\s+v[0-9]+,\s*v[0-9]+,\s*v[0-9]+\s+} 1 } } */
+/* { dg-final { scan-assembler-times {vsetvli\s+zero,\s*[a-x0-9]+,\s*e16,\s*m1,\s*tu,\s*m[au]\s+vwadd\.wv\s+v[0-9]+,\s*v[0-9]+,\s*v[0-9]+\s+} 1 } } */
+/* { dg-final { scan-assembler-times {vsetvli\s+zero,\s*[a-x0-9]+,\s*e16,\s*m2,\s*tu,\s*m[au]\s+vwadd\.wv\s+v[0-9]+,\s*v[0-9]+,\s*v[0-9]+\s+} 1 } } */
+/* { dg-final { scan-assembler-times {vsetvli\s+zero,\s*[a-x0-9]+,\s*e16,\s*m4,\s*tu,\s*m[au]\s+vwadd\.wv\s+v[0-9]+,\s*v[0-9]+,\s*v[0-9]+\s+} 1 } } */
+/* { dg-final { scan-assembler-times {vsetvli\s+zero,\s*[a-x0-9]+,\s*e32,\s*mf2,\s*tu,\s*m[au]\s+vwadd\.wv\s+v[0-9]+,\s*v[0-9]+,\s*v[0-9]+\s+} 1 } } */
+/* { dg-final { scan-assembler-times {vsetvli\s+zero,\s*[a-x0-9]+,\s*e32,\s*m1,\s*tu,\s*m[au]\s+vwadd\.wv\s+v[0-9]+,\s*v[0-9]+,\s*v[0-9]+\s+} 1 } } */
+/* { dg-final { scan-assembler-times {vsetvli\s+zero,\s*[a-x0-9]+,\s*e32,\s*m2,\s*tu,\s*m[au]\s+vwadd\.wv\s+v[0-9]+,\s*v[0-9]+,\s*v[0-9]+\s+} 1 } } */
+/* { dg-final { scan-assembler-times {vsetvli\s+zero,\s*[a-x0-9]+,\s*e32,\s*m4,\s*tu,\s*m[au]\s+vwadd\.wv\s+v[0-9]+,\s*v[0-9]+,\s*v[0-9]+\s+} 1 } } */
diff --git a/gcc/testsuite/g++.target/riscv/rvv/base/vwadd_wv_tum-1.C b/gcc/testsuite/g++.target/riscv/rvv/base/vwadd_wv_tum-1.C
new file mode 100644
index 00000000000..db2fe034939
--- /dev/null
+++ b/gcc/testsuite/g++.target/riscv/rvv/base/vwadd_wv_tum-1.C
@@ -0,0 +1,111 @@
+/* { dg-do compile } */
+/* { dg-options "-march=rv64gcv -mabi=lp64d -O3 -fno-schedule-insns -fno-schedule-insns2" } */
+
+#include "riscv_vector.h"
+
+vint16mf4_t test___riscv_vwadd_wv_tum(vbool64_t mask,vint16mf4_t merge,vint16mf4_t op1,vint8mf8_t op2,size_t vl)
+{
+    return __riscv_vwadd_wv_tum(mask,merge,op1,op2,vl);
+}
+
+
+vint16mf2_t test___riscv_vwadd_wv_tum(vbool32_t mask,vint16mf2_t merge,vint16mf2_t op1,vint8mf4_t op2,size_t vl)
+{
+    return __riscv_vwadd_wv_tum(mask,merge,op1,op2,vl);
+}
+
+
+vint16m1_t test___riscv_vwadd_wv_tum(vbool16_t mask,vint16m1_t merge,vint16m1_t op1,vint8mf2_t op2,size_t vl)
+{
+    return __riscv_vwadd_wv_tum(mask,merge,op1,op2,vl);
+}
+
+
+vint16m2_t test___riscv_vwadd_wv_tum(vbool8_t mask,vint16m2_t merge,vint16m2_t op1,vint8m1_t op2,size_t vl)
+{
+    return __riscv_vwadd_wv_tum(mask,merge,op1,op2,vl);
+}
+
+
+vint16m4_t test___riscv_vwadd_wv_tum(vbool4_t mask,vint16m4_t merge,vint16m4_t op1,vint8m2_t op2,size_t vl)
+{
+    return __riscv_vwadd_wv_tum(mask,merge,op1,op2,vl);
+}
+
+
+vint16m8_t test___riscv_vwadd_wv_tum(vbool2_t mask,vint16m8_t merge,vint16m8_t op1,vint8m4_t op2,size_t vl)
+{
+    return __riscv_vwadd_wv_tum(mask,merge,op1,op2,vl);
+}
+
+
+vint32mf2_t test___riscv_vwadd_wv_tum(vbool64_t mask,vint32mf2_t merge,vint32mf2_t op1,vint16mf4_t op2,size_t vl)
+{
+    return __riscv_vwadd_wv_tum(mask,merge,op1,op2,vl);
+}
+
+
+vint32m1_t test___riscv_vwadd_wv_tum(vbool32_t mask,vint32m1_t merge,vint32m1_t op1,vint16mf2_t op2,size_t vl)
+{
+    return __riscv_vwadd_wv_tum(mask,merge,op1,op2,vl);
+}
+
+
+vint32m2_t test___riscv_vwadd_wv_tum(vbool16_t mask,vint32m2_t merge,vint32m2_t op1,vint16m1_t op2,size_t vl)
+{
+    return __riscv_vwadd_wv_tum(mask,merge,op1,op2,vl);
+}
+
+
+vint32m4_t test___riscv_vwadd_wv_tum(vbool8_t mask,vint32m4_t merge,vint32m4_t op1,vint16m2_t op2,size_t vl)
+{
+    return __riscv_vwadd_wv_tum(mask,merge,op1,op2,vl);
+}
+
+
+vint32m8_t test___riscv_vwadd_wv_tum(vbool4_t mask,vint32m8_t merge,vint32m8_t op1,vint16m4_t op2,size_t vl)
+{
+    return __riscv_vwadd_wv_tum(mask,merge,op1,op2,vl);
+}
+
+
+vint64m1_t test___riscv_vwadd_wv_tum(vbool64_t mask,vint64m1_t merge,vint64m1_t op1,vint32mf2_t op2,size_t vl)
+{
+    return __riscv_vwadd_wv_tum(mask,merge,op1,op2,vl);
+}
+
+
+vint64m2_t test___riscv_vwadd_wv_tum(vbool32_t mask,vint64m2_t merge,vint64m2_t op1,vint32m1_t op2,size_t vl)
+{
+    return __riscv_vwadd_wv_tum(mask,merge,op1,op2,vl);
+}
+
+
+vint64m4_t test___riscv_vwadd_wv_tum(vbool16_t mask,vint64m4_t merge,vint64m4_t op1,vint32m2_t op2,size_t vl)
+{
+    return __riscv_vwadd_wv_tum(mask,merge,op1,op2,vl);
+}
+
+
+vint64m8_t test___riscv_vwadd_wv_tum(vbool8_t mask,vint64m8_t merge,vint64m8_t op1,vint32m4_t op2,size_t vl)
+{
+    return __riscv_vwadd_wv_tum(mask,merge,op1,op2,vl);
+}
+
+
+
+/* { dg-final { scan-assembler-times {vsetvli\s+zero,\s*[a-x0-9]+,\s*e8,\s*mf8,\s*tu,\s*m[au]\s+vwadd\.wv\s+v[0-9]+,\s*v[0-9]+,\s*v[0-9]+,\s*v0.t\s+} 1 } } */
+/* { dg-final { scan-assembler-times {vsetvli\s+zero,\s*[a-x0-9]+,\s*e8,\s*mf4,\s*tu,\s*m[au]\s+vwadd\.wv\s+v[0-9]+,\s*v[0-9]+,\s*v[0-9]+,\s*v0.t\s+} 1 } } */
+/* { dg-final { scan-assembler-times {vsetvli\s+zero,\s*[a-x0-9]+,\s*e8,\s*mf2,\s*tu,\s*m[au]\s+vwadd\.wv\s+v[0-9]+,\s*v[0-9]+,\s*v[0-9]+,\s*v0.t\s+} 1 } } */
+/* { dg-final { scan-assembler-times {vsetvli\s+zero,\s*[a-x0-9]+,\s*e8,\s*m1,\s*tu,\s*m[au]\s+vwadd\.wv\s+v[0-9]+,\s*v[0-9]+,\s*v[0-9]+,\s*v0.t\s+} 1 } } */
+/* { dg-final { scan-assembler-times {vsetvli\s+zero,\s*[a-x0-9]+,\s*e8,\s*m2,\s*tu,\s*m[au]\s+vwadd\.wv\s+v[0-9]+,\s*v[0-9]+,\s*v[0-9]+,\s*v0.t\s+} 1 } } */
+/* { dg-final { scan-assembler-times {vsetvli\s+zero,\s*[a-x0-9]+,\s*e8,\s*m4,\s*tu,\s*m[au]\s+vwadd\.wv\s+v[0-9]+,\s*v[0-9]+,\s*v[0-9]+,\s*v0.t\s+} 1 } } */
+/* { dg-final { scan-assembler-times {vsetvli\s+zero,\s*[a-x0-9]+,\s*e16,\s*mf4,\s*tu,\s*m[au]\s+vwadd\.wv\s+v[0-9]+,\s*v[0-9]+,\s*v[0-9]+,\s*v0.t\s+} 1 } } */
+/* { dg-final { scan-assembler-times {vsetvli\s+zero,\s*[a-x0-9]+,\s*e16,\s*mf2,\s*tu,\s*m[au]\s+vwadd\.wv\s+v[0-9]+,\s*v[0-9]+,\s*v[0-9]+,\s*v0.t\s+} 1 } } */
+/* { dg-final { scan-assembler-times {vsetvli\s+zero,\s*[a-x0-9]+,\s*e16,\s*m1,\s*tu,\s*m[au]\s+vwadd\.wv\s+v[0-9]+,\s*v[0-9]+,\s*v[0-9]+,\s*v0.t\s+} 1 } } */
+/* { dg-final { scan-assembler-times {vsetvli\s+zero,\s*[a-x0-9]+,\s*e16,\s*m2,\s*tu,\s*m[au]\s+vwadd\.wv\s+v[0-9]+,\s*v[0-9]+,\s*v[0-9]+,\s*v0.t\s+} 1 } } */
+/* { dg-final { scan-assembler-times {vsetvli\s+zero,\s*[a-x0-9]+,\s*e16,\s*m4,\s*tu,\s*m[au]\s+vwadd\.wv\s+v[0-9]+,\s*v[0-9]+,\s*v[0-9]+,\s*v0.t\s+} 1 } } */
+/* { dg-final { scan-assembler-times {vsetvli\s+zero,\s*[a-x0-9]+,\s*e32,\s*mf2,\s*tu,\s*m[au]\s+vwadd\.wv\s+v[0-9]+,\s*v[0-9]+,\s*v[0-9]+,\s*v0.t\s+} 1 } } */
+/* { dg-final { scan-assembler-times {vsetvli\s+zero,\s*[a-x0-9]+,\s*e32,\s*m1,\s*tu,\s*m[au]\s+vwadd\.wv\s+v[0-9]+,\s*v[0-9]+,\s*v[0-9]+,\s*v0.t\s+} 1 } } */
+/* { dg-final { scan-assembler-times {vsetvli\s+zero,\s*[a-x0-9]+,\s*e32,\s*m2,\s*tu,\s*m[au]\s+vwadd\.wv\s+v[0-9]+,\s*v[0-9]+,\s*v[0-9]+,\s*v0.t\s+} 1 } } */
+/* { dg-final { scan-assembler-times {vsetvli\s+zero,\s*[a-x0-9]+,\s*e32,\s*m4,\s*tu,\s*m[au]\s+vwadd\.wv\s+v[0-9]+,\s*v[0-9]+,\s*v[0-9]+,\s*v0.t\s+} 1 } } */
diff --git a/gcc/testsuite/g++.target/riscv/rvv/base/vwadd_wv_tum-2.C b/gcc/testsuite/g++.target/riscv/rvv/base/vwadd_wv_tum-2.C
new file mode 100644
index 00000000000..ed7ad4ee17c
--- /dev/null
+++ b/gcc/testsuite/g++.target/riscv/rvv/base/vwadd_wv_tum-2.C
@@ -0,0 +1,111 @@
+/* { dg-do compile } */
+/* { dg-options "-march=rv64gcv -mabi=lp64d -O3 -fno-schedule-insns -fno-schedule-insns2" } */
+
+#include "riscv_vector.h"
+
+vint16mf4_t test___riscv_vwadd_wv_tum(vbool64_t mask,vint16mf4_t merge,vint16mf4_t op1,vint8mf8_t op2,size_t vl)
+{
+    return __riscv_vwadd_wv_tum(mask,merge,op1,op2,31);
+}
+
+
+vint16mf2_t test___riscv_vwadd_wv_tum(vbool32_t mask,vint16mf2_t merge,vint16mf2_t op1,vint8mf4_t op2,size_t vl)
+{
+    return __riscv_vwadd_wv_tum(mask,merge,op1,op2,31);
+}
+
+
+vint16m1_t test___riscv_vwadd_wv_tum(vbool16_t mask,vint16m1_t merge,vint16m1_t op1,vint8mf2_t op2,size_t vl)
+{
+    return __riscv_vwadd_wv_tum(mask,merge,op1,op2,31);
+}
+
+
+vint16m2_t test___riscv_vwadd_wv_tum(vbool8_t mask,vint16m2_t merge,vint16m2_t op1,vint8m1_t op2,size_t vl)
+{
+    return __riscv_vwadd_wv_tum(mask,merge,op1,op2,31);
+}
+
+
+vint16m4_t test___riscv_vwadd_wv_tum(vbool4_t mask,vint16m4_t merge,vint16m4_t op1,vint8m2_t op2,size_t vl)
+{
+    return __riscv_vwadd_wv_tum(mask,merge,op1,op2,31);
+}
+
+
+vint16m8_t test___riscv_vwadd_wv_tum(vbool2_t mask,vint16m8_t merge,vint16m8_t op1,vint8m4_t op2,size_t vl)
+{
+    return __riscv_vwadd_wv_tum(mask,merge,op1,op2,31);
+}
+
+
+vint32mf2_t test___riscv_vwadd_wv_tum(vbool64_t mask,vint32mf2_t merge,vint32mf2_t op1,vint16mf4_t op2,size_t vl)
+{
+    return __riscv_vwadd_wv_tum(mask,merge,op1,op2,31);
+}
+
+
+vint32m1_t test___riscv_vwadd_wv_tum(vbool32_t mask,vint32m1_t merge,vint32m1_t op1,vint16mf2_t op2,size_t vl)
+{
+    return __riscv_vwadd_wv_tum(mask,merge,op1,op2,31);
+}
+
+
+vint32m2_t test___riscv_vwadd_wv_tum(vbool16_t mask,vint32m2_t merge,vint32m2_t op1,vint16m1_t op2,size_t vl)
+{
+    return __riscv_vwadd_wv_tum(mask,merge,op1,op2,31);
+}
+
+
+vint32m4_t test___riscv_vwadd_wv_tum(vbool8_t mask,vint32m4_t merge,vint32m4_t op1,vint16m2_t op2,size_t vl)
+{
+    return __riscv_vwadd_wv_tum(mask,merge,op1,op2,31);
+}
+
+
+vint32m8_t test___riscv_vwadd_wv_tum(vbool4_t mask,vint32m8_t merge,vint32m8_t op1,vint16m4_t op2,size_t vl)
+{
+    return __riscv_vwadd_wv_tum(mask,merge,op1,op2,31);
+}
+
+
+vint64m1_t test___riscv_vwadd_wv_tum(vbool64_t mask,vint64m1_t merge,vint64m1_t op1,vint32mf2_t op2,size_t vl)
+{
+    return __riscv_vwadd_wv_tum(mask,merge,op1,op2,31);
+}
+
+
+vint64m2_t test___riscv_vwadd_wv_tum(vbool32_t mask,vint64m2_t merge,vint64m2_t op1,vint32m1_t op2,size_t vl)
+{
+    return __riscv_vwadd_wv_tum(mask,merge,op1,op2,31);
+}
+
+
+vint64m4_t test___riscv_vwadd_wv_tum(vbool16_t mask,vint64m4_t merge,vint64m4_t op1,vint32m2_t op2,size_t vl)
+{
+    return __riscv_vwadd_wv_tum(mask,merge,op1,op2,31);
+}
+
+
+vint64m8_t test___riscv_vwadd_wv_tum(vbool8_t mask,vint64m8_t merge,vint64m8_t op1,vint32m4_t op2,size_t vl)
+{
+    return __riscv_vwadd_wv_tum(mask,merge,op1,op2,31);
+}
+
+
+
+/* { dg-final { scan-assembler-times {vsetivli\s+zero,\s*31,\s*e8,\s*mf8,\s*tu,\s*m[au]\s+vwadd\.wv\s+v[0-9]+,\s*v[0-9]+,\s*v[0-9]+,\s*v0.t\s+} 1 } } */
+/* { dg-final { scan-assembler-times {vsetivli\s+zero,\s*31,\s*e8,\s*mf4,\s*tu,\s*m[au]\s+vwadd\.wv\s+v[0-9]+,\s*v[0-9]+,\s*v[0-9]+,\s*v0.t\s+} 1 } } */
+/* { dg-final { scan-assembler-times {vsetivli\s+zero,\s*31,\s*e8,\s*mf2,\s*tu,\s*m[au]\s+vwadd\.wv\s+v[0-9]+,\s*v[0-9]+,\s*v[0-9]+,\s*v0.t\s+} 1 } } */
+/* { dg-final { scan-assembler-times {vsetivli\s+zero,\s*31,\s*e8,\s*m1,\s*tu,\s*m[au]\s+vwadd\.wv\s+v[0-9]+,\s*v[0-9]+,\s*v[0-9]+,\s*v0.t\s+} 1 } } */
+/* { dg-final { scan-assembler-times {vsetivli\s+zero,\s*31,\s*e8,\s*m2,\s*tu,\s*m[au]\s+vwadd\.wv\s+v[0-9]+,\s*v[0-9]+,\s*v[0-9]+,\s*v0.t\s+} 1 } } */
+/* { dg-final { scan-assembler-times {vsetivli\s+zero,\s*31,\s*e8,\s*m4,\s*tu,\s*m[au]\s+vwadd\.wv\s+v[0-9]+,\s*v[0-9]+,\s*v[0-9]+,\s*v0.t\s+} 1 } } */
+/* { dg-final { scan-assembler-times {vsetivli\s+zero,\s*31,\s*e16,\s*mf4,\s*tu,\s*m[au]\s+vwadd\.wv\s+v[0-9]+,\s*v[0-9]+,\s*v[0-9]+,\s*v0.t\s+} 1 } } */
+/* { dg-final { scan-assembler-times {vsetivli\s+zero,\s*31,\s*e16,\s*mf2,\s*tu,\s*m[au]\s+vwadd\.wv\s+v[0-9]+,\s*v[0-9]+,\s*v[0-9]+,\s*v0.t\s+} 1 } } */
+/* { dg-final { scan-assembler-times {vsetivli\s+zero,\s*31,\s*e16,\s*m1,\s*tu,\s*m[au]\s+vwadd\.wv\s+v[0-9]+,\s*v[0-9]+,\s*v[0-9]+,\s*v0.t\s+} 1 } } */
+/* { dg-final { scan-assembler-times {vsetivli\s+zero,\s*31,\s*e16,\s*m2,\s*tu,\s*m[au]\s+vwadd\.wv\s+v[0-9]+,\s*v[0-9]+,\s*v[0-9]+,\s*v0.t\s+} 1 } } */
+/* { dg-final { scan-assembler-times {vsetivli\s+zero,\s*31,\s*e16,\s*m4,\s*tu,\s*m[au]\s+vwadd\.wv\s+v[0-9]+,\s*v[0-9]+,\s*v[0-9]+,\s*v0.t\s+} 1 } } */
+/* { dg-final { scan-assembler-times {vsetivli\s+zero,\s*31,\s*e32,\s*mf2,\s*tu,\s*m[au]\s+vwadd\.wv\s+v[0-9]+,\s*v[0-9]+,\s*v[0-9]+,\s*v0.t\s+} 1 } } */
+/* { dg-final { scan-assembler-times {vsetivli\s+zero,\s*31,\s*e32,\s*m1,\s*tu,\s*m[au]\s+vwadd\.wv\s+v[0-9]+,\s*v[0-9]+,\s*v[0-9]+,\s*v0.t\s+} 1 } } */
+/* { dg-final { scan-assembler-times {vsetivli\s+zero,\s*31,\s*e32,\s*m2,\s*tu,\s*m[au]\s+vwadd\.wv\s+v[0-9]+,\s*v[0-9]+,\s*v[0-9]+,\s*v0.t\s+} 1 } } */
+/* { dg-final { scan-assembler-times {vsetivli\s+zero,\s*31,\s*e32,\s*m4,\s*tu,\s*m[au]\s+vwadd\.wv\s+v[0-9]+,\s*v[0-9]+,\s*v[0-9]+,\s*v0.t\s+} 1 } } */
diff --git a/gcc/testsuite/g++.target/riscv/rvv/base/vwadd_wv_tum-3.C b/gcc/testsuite/g++.target/riscv/rvv/base/vwadd_wv_tum-3.C
new file mode 100644
index 00000000000..d4e7dd3923c
--- /dev/null
+++ b/gcc/testsuite/g++.target/riscv/rvv/base/vwadd_wv_tum-3.C
@@ -0,0 +1,111 @@
+/* { dg-do compile } */
+/* { dg-options "-march=rv64gcv -mabi=lp64d -O3 -fno-schedule-insns -fno-schedule-insns2" } */
+
+#include "riscv_vector.h"
+
+vint16mf4_t test___riscv_vwadd_wv_tum(vbool64_t mask,vint16mf4_t merge,vint16mf4_t op1,vint8mf8_t op2,size_t vl)
+{
+    return __riscv_vwadd_wv_tum(mask,merge,op1,op2,32);
+}
+
+
+vint16mf2_t test___riscv_vwadd_wv_tum(vbool32_t mask,vint16mf2_t merge,vint16mf2_t op1,vint8mf4_t op2,size_t vl)
+{
+    return __riscv_vwadd_wv_tum(mask,merge,op1,op2,32);
+}
+
+
+vint16m1_t test___riscv_vwadd_wv_tum(vbool16_t mask,vint16m1_t merge,vint16m1_t op1,vint8mf2_t op2,size_t vl)
+{
+    return __riscv_vwadd_wv_tum(mask,merge,op1,op2,32);
+}
+
+
+vint16m2_t test___riscv_vwadd_wv_tum(vbool8_t mask,vint16m2_t merge,vint16m2_t op1,vint8m1_t op2,size_t vl)
+{
+    return __riscv_vwadd_wv_tum(mask,merge,op1,op2,32);
+}
+
+
+vint16m4_t test___riscv_vwadd_wv_tum(vbool4_t mask,vint16m4_t merge,vint16m4_t op1,vint8m2_t op2,size_t vl)
+{
+    return __riscv_vwadd_wv_tum(mask,merge,op1,op2,32);
+}
+
+
+vint16m8_t test___riscv_vwadd_wv_tum(vbool2_t mask,vint16m8_t merge,vint16m8_t op1,vint8m4_t op2,size_t vl)
+{
+    return __riscv_vwadd_wv_tum(mask,merge,op1,op2,32);
+}
+
+
+vint32mf2_t test___riscv_vwadd_wv_tum(vbool64_t mask,vint32mf2_t merge,vint32mf2_t op1,vint16mf4_t op2,size_t vl)
+{
+    return __riscv_vwadd_wv_tum(mask,merge,op1,op2,32);
+}
+
+
+vint32m1_t test___riscv_vwadd_wv_tum(vbool32_t mask,vint32m1_t merge,vint32m1_t op1,vint16mf2_t op2,size_t vl)
+{
+    return __riscv_vwadd_wv_tum(mask,merge,op1,op2,32);
+}
+
+
+vint32m2_t test___riscv_vwadd_wv_tum(vbool16_t mask,vint32m2_t merge,vint32m2_t op1,vint16m1_t op2,size_t vl)
+{
+    return __riscv_vwadd_wv_tum(mask,merge,op1,op2,32);
+}
+
+
+vint32m4_t test___riscv_vwadd_wv_tum(vbool8_t mask,vint32m4_t merge,vint32m4_t op1,vint16m2_t op2,size_t vl)
+{
+    return __riscv_vwadd_wv_tum(mask,merge,op1,op2,32);
+}
+
+
+vint32m8_t test___riscv_vwadd_wv_tum(vbool4_t mask,vint32m8_t merge,vint32m8_t op1,vint16m4_t op2,size_t vl)
+{
+    return __riscv_vwadd_wv_tum(mask,merge,op1,op2,32);
+}
+
+
+vint64m1_t test___riscv_vwadd_wv_tum(vbool64_t mask,vint64m1_t merge,vint64m1_t op1,vint32mf2_t op2,size_t vl)
+{
+    return __riscv_vwadd_wv_tum(mask,merge,op1,op2,32);
+}
+
+
+vint64m2_t test___riscv_vwadd_wv_tum(vbool32_t mask,vint64m2_t merge,vint64m2_t op1,vint32m1_t op2,size_t vl)
+{
+    return __riscv_vwadd_wv_tum(mask,merge,op1,op2,32);
+}
+
+
+vint64m4_t test___riscv_vwadd_wv_tum(vbool16_t mask,vint64m4_t merge,vint64m4_t op1,vint32m2_t op2,size_t vl)
+{
+    return __riscv_vwadd_wv_tum(mask,merge,op1,op2,32);
+}
+
+
+vint64m8_t test___riscv_vwadd_wv_tum(vbool8_t mask,vint64m8_t merge,vint64m8_t op1,vint32m4_t op2,size_t vl)
+{
+    return __riscv_vwadd_wv_tum(mask,merge,op1,op2,32);
+}
+
+
+
+/* { dg-final { scan-assembler-times {vsetvli\s+zero,\s*[a-x0-9]+,\s*e8,\s*mf8,\s*tu,\s*m[au]\s+vwadd\.wv\s+v[0-9]+,\s*v[0-9]+,\s*v[0-9]+,\s*v0.t\s+} 1 } } */
+/* { dg-final { scan-assembler-times {vsetvli\s+zero,\s*[a-x0-9]+,\s*e8,\s*mf4,\s*tu,\s*m[au]\s+vwadd\.wv\s+v[0-9]+,\s*v[0-9]+,\s*v[0-9]+,\s*v0.t\s+} 1 } } */
+/* { dg-final { scan-assembler-times {vsetvli\s+zero,\s*[a-x0-9]+,\s*e8,\s*mf2,\s*tu,\s*m[au]\s+vwadd\.wv\s+v[0-9]+,\s*v[0-9]+,\s*v[0-9]+,\s*v0.t\s+} 1 } } */
+/* { dg-final { scan-assembler-times {vsetvli\s+zero,\s*[a-x0-9]+,\s*e8,\s*m1,\s*tu,\s*m[au]\s+vwadd\.wv\s+v[0-9]+,\s*v[0-9]+,\s*v[0-9]+,\s*v0.t\s+} 1 } } */
+/* { dg-final { scan-assembler-times {vsetvli\s+zero,\s*[a-x0-9]+,\s*e8,\s*m2,\s*tu,\s*m[au]\s+vwadd\.wv\s+v[0-9]+,\s*v[0-9]+,\s*v[0-9]+,\s*v0.t\s+} 1 } } */
+/* { dg-final { scan-assembler-times {vsetvli\s+zero,\s*[a-x0-9]+,\s*e8,\s*m4,\s*tu,\s*m[au]\s+vwadd\.wv\s+v[0-9]+,\s*v[0-9]+,\s*v[0-9]+,\s*v0.t\s+} 1 } } */
+/* { dg-final { scan-assembler-times {vsetvli\s+zero,\s*[a-x0-9]+,\s*e16,\s*mf4,\s*tu,\s*m[au]\s+vwadd\.wv\s+v[0-9]+,\s*v[0-9]+,\s*v[0-9]+,\s*v0.t\s+} 1 } } */
+/* { dg-final { scan-assembler-times {vsetvli\s+zero,\s*[a-x0-9]+,\s*e16,\s*mf2,\s*tu,\s*m[au]\s+vwadd\.wv\s+v[0-9]+,\s*v[0-9]+,\s*v[0-9]+,\s*v0.t\s+} 1 } } */
+/* { dg-final { scan-assembler-times {vsetvli\s+zero,\s*[a-x0-9]+,\s*e16,\s*m1,\s*tu,\s*m[au]\s+vwadd\.wv\s+v[0-9]+,\s*v[0-9]+,\s*v[0-9]+,\s*v0.t\s+} 1 } } */
+/* { dg-final { scan-assembler-times {vsetvli\s+zero,\s*[a-x0-9]+,\s*e16,\s*m2,\s*tu,\s*m[au]\s+vwadd\.wv\s+v[0-9]+,\s*v[0-9]+,\s*v[0-9]+,\s*v0.t\s+} 1 } } */
+/* { dg-final { scan-assembler-times {vsetvli\s+zero,\s*[a-x0-9]+,\s*e16,\s*m4,\s*tu,\s*m[au]\s+vwadd\.wv\s+v[0-9]+,\s*v[0-9]+,\s*v[0-9]+,\s*v0.t\s+} 1 } } */
+/* { dg-final { scan-assembler-times {vsetvli\s+zero,\s*[a-x0-9]+,\s*e32,\s*mf2,\s*tu,\s*m[au]\s+vwadd\.wv\s+v[0-9]+,\s*v[0-9]+,\s*v[0-9]+,\s*v0.t\s+} 1 } } */
+/* { dg-final { scan-assembler-times {vsetvli\s+zero,\s*[a-x0-9]+,\s*e32,\s*m1,\s*tu,\s*m[au]\s+vwadd\.wv\s+v[0-9]+,\s*v[0-9]+,\s*v[0-9]+,\s*v0.t\s+} 1 } } */
+/* { dg-final { scan-assembler-times {vsetvli\s+zero,\s*[a-x0-9]+,\s*e32,\s*m2,\s*tu,\s*m[au]\s+vwadd\.wv\s+v[0-9]+,\s*v[0-9]+,\s*v[0-9]+,\s*v0.t\s+} 1 } } */
+/* { dg-final { scan-assembler-times {vsetvli\s+zero,\s*[a-x0-9]+,\s*e32,\s*m4,\s*tu,\s*m[au]\s+vwadd\.wv\s+v[0-9]+,\s*v[0-9]+,\s*v[0-9]+,\s*v0.t\s+} 1 } } */
diff --git a/gcc/testsuite/g++.target/riscv/rvv/base/vwadd_wv_tumu-1.C b/gcc/testsuite/g++.target/riscv/rvv/base/vwadd_wv_tumu-1.C
new file mode 100644
index 00000000000..3d68e06e4ac
--- /dev/null
+++ b/gcc/testsuite/g++.target/riscv/rvv/base/vwadd_wv_tumu-1.C
@@ -0,0 +1,111 @@
+/* { dg-do compile } */
+/* { dg-options "-march=rv64gcv -mabi=lp64d -O3 -fno-schedule-insns -fno-schedule-insns2" } */
+
+#include "riscv_vector.h"
+
+vint16mf4_t test___riscv_vwadd_wv_tumu(vbool64_t mask,vint16mf4_t merge,vint16mf4_t op1,vint8mf8_t op2,size_t vl)
+{
+    return __riscv_vwadd_wv_tumu(mask,merge,op1,op2,vl);
+}
+
+
+vint16mf2_t test___riscv_vwadd_wv_tumu(vbool32_t mask,vint16mf2_t merge,vint16mf2_t op1,vint8mf4_t op2,size_t vl)
+{
+    return __riscv_vwadd_wv_tumu(mask,merge,op1,op2,vl);
+}
+
+
+vint16m1_t test___riscv_vwadd_wv_tumu(vbool16_t mask,vint16m1_t merge,vint16m1_t op1,vint8mf2_t op2,size_t vl)
+{
+    return __riscv_vwadd_wv_tumu(mask,merge,op1,op2,vl);
+}
+
+
+vint16m2_t test___riscv_vwadd_wv_tumu(vbool8_t mask,vint16m2_t merge,vint16m2_t op1,vint8m1_t op2,size_t vl)
+{
+    return __riscv_vwadd_wv_tumu(mask,merge,op1,op2,vl);
+}
+
+
+vint16m4_t test___riscv_vwadd_wv_tumu(vbool4_t mask,vint16m4_t merge,vint16m4_t op1,vint8m2_t op2,size_t vl)
+{
+    return __riscv_vwadd_wv_tumu(mask,merge,op1,op2,vl);
+}
+
+
+vint16m8_t test___riscv_vwadd_wv_tumu(vbool2_t mask,vint16m8_t merge,vint16m8_t op1,vint8m4_t op2,size_t vl)
+{
+    return __riscv_vwadd_wv_tumu(mask,merge,op1,op2,vl);
+}
+
+
+vint32mf2_t test___riscv_vwadd_wv_tumu(vbool64_t mask,vint32mf2_t merge,vint32mf2_t op1,vint16mf4_t op2,size_t vl)
+{
+    return __riscv_vwadd_wv_tumu(mask,merge,op1,op2,vl);
+}
+
+
+vint32m1_t test___riscv_vwadd_wv_tumu(vbool32_t mask,vint32m1_t merge,vint32m1_t op1,vint16mf2_t op2,size_t vl)
+{
+    return __riscv_vwadd_wv_tumu(mask,merge,op1,op2,vl);
+}
+
+
+vint32m2_t test___riscv_vwadd_wv_tumu(vbool16_t mask,vint32m2_t merge,vint32m2_t op1,vint16m1_t op2,size_t vl)
+{
+    return __riscv_vwadd_wv_tumu(mask,merge,op1,op2,vl);
+}
+
+
+vint32m4_t test___riscv_vwadd_wv_tumu(vbool8_t mask,vint32m4_t merge,vint32m4_t op1,vint16m2_t op2,size_t vl)
+{
+    return __riscv_vwadd_wv_tumu(mask,merge,op1,op2,vl);
+}
+
+
+vint32m8_t test___riscv_vwadd_wv_tumu(vbool4_t mask,vint32m8_t merge,vint32m8_t op1,vint16m4_t op2,size_t vl)
+{
+    return __riscv_vwadd_wv_tumu(mask,merge,op1,op2,vl);
+}
+
+
+vint64m1_t test___riscv_vwadd_wv_tumu(vbool64_t mask,vint64m1_t merge,vint64m1_t op1,vint32mf2_t op2,size_t vl)
+{
+    return __riscv_vwadd_wv_tumu(mask,merge,op1,op2,vl);
+}
+
+
+vint64m2_t test___riscv_vwadd_wv_tumu(vbool32_t mask,vint64m2_t merge,vint64m2_t op1,vint32m1_t op2,size_t vl)
+{
+    return __riscv_vwadd_wv_tumu(mask,merge,op1,op2,vl);
+}
+
+
+vint64m4_t test___riscv_vwadd_wv_tumu(vbool16_t mask,vint64m4_t merge,vint64m4_t op1,vint32m2_t op2,size_t vl)
+{
+    return __riscv_vwadd_wv_tumu(mask,merge,op1,op2,vl);
+}
+
+
+vint64m8_t test___riscv_vwadd_wv_tumu(vbool8_t mask,vint64m8_t merge,vint64m8_t op1,vint32m4_t op2,size_t vl)
+{
+    return __riscv_vwadd_wv_tumu(mask,merge,op1,op2,vl);
+}
+
+
+
+/* { dg-final { scan-assembler-times {vsetvli\s+zero,\s*[a-x0-9]+,\s*e8,\s*mf8,\s*tu,\s*mu\s+vwadd\.wv\s+v[0-9]+,\s*v[0-9]+,\s*v[0-9]+,\s*v0.t\s+} 1 } } */
+/* { dg-final { scan-assembler-times {vsetvli\s+zero,\s*[a-x0-9]+,\s*e8,\s*mf4,\s*tu,\s*mu\s+vwadd\.wv\s+v[0-9]+,\s*v[0-9]+,\s*v[0-9]+,\s*v0.t\s+} 1 } } */
+/* { dg-final { scan-assembler-times {vsetvli\s+zero,\s*[a-x0-9]+,\s*e8,\s*mf2,\s*tu,\s*mu\s+vwadd\.wv\s+v[0-9]+,\s*v[0-9]+,\s*v[0-9]+,\s*v0.t\s+} 1 } } */
+/* { dg-final { scan-assembler-times {vsetvli\s+zero,\s*[a-x0-9]+,\s*e8,\s*m1,\s*tu,\s*mu\s+vwadd\.wv\s+v[0-9]+,\s*v[0-9]+,\s*v[0-9]+,\s*v0.t\s+} 1 } } */
+/* { dg-final { scan-assembler-times {vsetvli\s+zero,\s*[a-x0-9]+,\s*e8,\s*m2,\s*tu,\s*mu\s+vwadd\.wv\s+v[0-9]+,\s*v[0-9]+,\s*v[0-9]+,\s*v0.t\s+} 1 } } */
+/* { dg-final { scan-assembler-times {vsetvli\s+zero,\s*[a-x0-9]+,\s*e8,\s*m4,\s*tu,\s*mu\s+vwadd\.wv\s+v[0-9]+,\s*v[0-9]+,\s*v[0-9]+,\s*v0.t\s+} 1 } } */
+/* { dg-final { scan-assembler-times {vsetvli\s+zero,\s*[a-x0-9]+,\s*e16,\s*mf4,\s*tu,\s*mu\s+vwadd\.wv\s+v[0-9]+,\s*v[0-9]+,\s*v[0-9]+,\s*v0.t\s+} 1 } } */
+/* { dg-final { scan-assembler-times {vsetvli\s+zero,\s*[a-x0-9]+,\s*e16,\s*mf2,\s*tu,\s*mu\s+vwadd\.wv\s+v[0-9]+,\s*v[0-9]+,\s*v[0-9]+,\s*v0.t\s+} 1 } } */
+/* { dg-final { scan-assembler-times {vsetvli\s+zero,\s*[a-x0-9]+,\s*e16,\s*m1,\s*tu,\s*mu\s+vwadd\.wv\s+v[0-9]+,\s*v[0-9]+,\s*v[0-9]+,\s*v0.t\s+} 1 } } */
+/* { dg-final { scan-assembler-times {vsetvli\s+zero,\s*[a-x0-9]+,\s*e16,\s*m2,\s*tu,\s*mu\s+vwadd\.wv\s+v[0-9]+,\s*v[0-9]+,\s*v[0-9]+,\s*v0.t\s+} 1 } } */
+/* { dg-final { scan-assembler-times {vsetvli\s+zero,\s*[a-x0-9]+,\s*e16,\s*m4,\s*tu,\s*mu\s+vwadd\.wv\s+v[0-9]+,\s*v[0-9]+,\s*v[0-9]+,\s*v0.t\s+} 1 } } */
+/* { dg-final { scan-assembler-times {vsetvli\s+zero,\s*[a-x0-9]+,\s*e32,\s*mf2,\s*tu,\s*mu\s+vwadd\.wv\s+v[0-9]+,\s*v[0-9]+,\s*v[0-9]+,\s*v0.t\s+} 1 } } */
+/* { dg-final { scan-assembler-times {vsetvli\s+zero,\s*[a-x0-9]+,\s*e32,\s*m1,\s*tu,\s*mu\s+vwadd\.wv\s+v[0-9]+,\s*v[0-9]+,\s*v[0-9]+,\s*v0.t\s+} 1 } } */
+/* { dg-final { scan-assembler-times {vsetvli\s+zero,\s*[a-x0-9]+,\s*e32,\s*m2,\s*tu,\s*mu\s+vwadd\.wv\s+v[0-9]+,\s*v[0-9]+,\s*v[0-9]+,\s*v0.t\s+} 1 } } */
+/* { dg-final { scan-assembler-times {vsetvli\s+zero,\s*[a-x0-9]+,\s*e32,\s*m4,\s*tu,\s*mu\s+vwadd\.wv\s+v[0-9]+,\s*v[0-9]+,\s*v[0-9]+,\s*v0.t\s+} 1 } } */
diff --git a/gcc/testsuite/g++.target/riscv/rvv/base/vwadd_wv_tumu-2.C b/gcc/testsuite/g++.target/riscv/rvv/base/vwadd_wv_tumu-2.C
new file mode 100644
index 00000000000..494beffb6c4
--- /dev/null
+++ b/gcc/testsuite/g++.target/riscv/rvv/base/vwadd_wv_tumu-2.C
@@ -0,0 +1,111 @@
+/* { dg-do compile } */
+/* { dg-options "-march=rv64gcv -mabi=lp64d -O3 -fno-schedule-insns -fno-schedule-insns2" } */
+
+#include "riscv_vector.h"
+
+vint16mf4_t test___riscv_vwadd_wv_tumu(vbool64_t mask,vint16mf4_t merge,vint16mf4_t op1,vint8mf8_t op2,size_t vl)
+{
+    return __riscv_vwadd_wv_tumu(mask,merge,op1,op2,31);
+}
+
+
+vint16mf2_t test___riscv_vwadd_wv_tumu(vbool32_t mask,vint16mf2_t merge,vint16mf2_t op1,vint8mf4_t op2,size_t vl)
+{
+    return __riscv_vwadd_wv_tumu(mask,merge,op1,op2,31);
+}
+
+
+vint16m1_t test___riscv_vwadd_wv_tumu(vbool16_t mask,vint16m1_t merge,vint16m1_t op1,vint8mf2_t op2,size_t vl)
+{
+    return __riscv_vwadd_wv_tumu(mask,merge,op1,op2,31);
+}
+
+
+vint16m2_t test___riscv_vwadd_wv_tumu(vbool8_t mask,vint16m2_t merge,vint16m2_t op1,vint8m1_t op2,size_t vl)
+{
+    return __riscv_vwadd_wv_tumu(mask,merge,op1,op2,31);
+}
+
+
+vint16m4_t test___riscv_vwadd_wv_tumu(vbool4_t mask,vint16m4_t merge,vint16m4_t op1,vint8m2_t op2,size_t vl)
+{
+    return __riscv_vwadd_wv_tumu(mask,merge,op1,op2,31);
+}
+
+
+vint16m8_t test___riscv_vwadd_wv_tumu(vbool2_t mask,vint16m8_t merge,vint16m8_t op1,vint8m4_t op2,size_t vl)
+{
+    return __riscv_vwadd_wv_tumu(mask,merge,op1,op2,31);
+}
+
+
+vint32mf2_t test___riscv_vwadd_wv_tumu(vbool64_t mask,vint32mf2_t merge,vint32mf2_t op1,vint16mf4_t op2,size_t vl)
+{
+    return __riscv_vwadd_wv_tumu(mask,merge,op1,op2,31);
+}
+
+
+vint32m1_t test___riscv_vwadd_wv_tumu(vbool32_t mask,vint32m1_t merge,vint32m1_t op1,vint16mf2_t op2,size_t vl)
+{
+    return __riscv_vwadd_wv_tumu(mask,merge,op1,op2,31);
+}
+
+
+vint32m2_t test___riscv_vwadd_wv_tumu(vbool16_t mask,vint32m2_t merge,vint32m2_t op1,vint16m1_t op2,size_t vl)
+{
+    return __riscv_vwadd_wv_tumu(mask,merge,op1,op2,31);
+}
+
+
+vint32m4_t test___riscv_vwadd_wv_tumu(vbool8_t mask,vint32m4_t merge,vint32m4_t op1,vint16m2_t op2,size_t vl)
+{
+    return __riscv_vwadd_wv_tumu(mask,merge,op1,op2,31);
+}
+
+
+vint32m8_t test___riscv_vwadd_wv_tumu(vbool4_t mask,vint32m8_t merge,vint32m8_t op1,vint16m4_t op2,size_t vl)
+{
+    return __riscv_vwadd_wv_tumu(mask,merge,op1,op2,31);
+}
+
+
+vint64m1_t test___riscv_vwadd_wv_tumu(vbool64_t mask,vint64m1_t merge,vint64m1_t op1,vint32mf2_t op2,size_t vl)
+{
+    return __riscv_vwadd_wv_tumu(mask,merge,op1,op2,31);
+}
+
+
+vint64m2_t test___riscv_vwadd_wv_tumu(vbool32_t mask,vint64m2_t merge,vint64m2_t op1,vint32m1_t op2,size_t vl)
+{
+    return __riscv_vwadd_wv_tumu(mask,merge,op1,op2,31);
+}
+
+
+vint64m4_t test___riscv_vwadd_wv_tumu(vbool16_t mask,vint64m4_t merge,vint64m4_t op1,vint32m2_t op2,size_t vl)
+{
+    return __riscv_vwadd_wv_tumu(mask,merge,op1,op2,31);
+}
+
+
+vint64m8_t test___riscv_vwadd_wv_tumu(vbool8_t mask,vint64m8_t merge,vint64m8_t op1,vint32m4_t op2,size_t vl)
+{
+    return __riscv_vwadd_wv_tumu(mask,merge,op1,op2,31);
+}
+
+
+
+/* { dg-final { scan-assembler-times {vsetivli\s+zero,\s*31,\s*e8,\s*mf8,\s*tu,\s*mu\s+vwadd\.wv\s+v[0-9]+,\s*v[0-9]+,\s*v[0-9]+,\s*v0.t\s+} 1 } } */
+/* { dg-final { scan-assembler-times {vsetivli\s+zero,\s*31,\s*e8,\s*mf4,\s*tu,\s*mu\s+vwadd\.wv\s+v[0-9]+,\s*v[0-9]+,\s*v[0-9]+,\s*v0.t\s+} 1 } } */
+/* { dg-final { scan-assembler-times {vsetivli\s+zero,\s*31,\s*e8,\s*mf2,\s*tu,\s*mu\s+vwadd\.wv\s+v[0-9]+,\s*v[0-9]+,\s*v[0-9]+,\s*v0.t\s+} 1 } } */
+/* { dg-final { scan-assembler-times {vsetivli\s+zero,\s*31,\s*e8,\s*m1,\s*tu,\s*mu\s+vwadd\.wv\s+v[0-9]+,\s*v[0-9]+,\s*v[0-9]+,\s*v0.t\s+} 1 } } */
+/* { dg-final { scan-assembler-times {vsetivli\s+zero,\s*31,\s*e8,\s*m2,\s*tu,\s*mu\s+vwadd\.wv\s+v[0-9]+,\s*v[0-9]+,\s*v[0-9]+,\s*v0.t\s+} 1 } } */
+/* { dg-final { scan-assembler-times {vsetivli\s+zero,\s*31,\s*e8,\s*m4,\s*tu,\s*mu\s+vwadd\.wv\s+v[0-9]+,\s*v[0-9]+,\s*v[0-9]+,\s*v0.t\s+} 1 } } */
+/* { dg-final { scan-assembler-times {vsetivli\s+zero,\s*31,\s*e16,\s*mf4,\s*tu,\s*mu\s+vwadd\.wv\s+v[0-9]+,\s*v[0-9]+,\s*v[0-9]+,\s*v0.t\s+} 1 } } */
+/* { dg-final { scan-assembler-times {vsetivli\s+zero,\s*31,\s*e16,\s*mf2,\s*tu,\s*mu\s+vwadd\.wv\s+v[0-9]+,\s*v[0-9]+,\s*v[0-9]+,\s*v0.t\s+} 1 } } */
+/* { dg-final { scan-assembler-times {vsetivli\s+zero,\s*31,\s*e16,\s*m1,\s*tu,\s*mu\s+vwadd\.wv\s+v[0-9]+,\s*v[0-9]+,\s*v[0-9]+,\s*v0.t\s+} 1 } } */
+/* { dg-final { scan-assembler-times {vsetivli\s+zero,\s*31,\s*e16,\s*m2,\s*tu,\s*mu\s+vwadd\.wv\s+v[0-9]+,\s*v[0-9]+,\s*v[0-9]+,\s*v0.t\s+} 1 } } */
+/* { dg-final { scan-assembler-times {vsetivli\s+zero,\s*31,\s*e16,\s*m4,\s*tu,\s*mu\s+vwadd\.wv\s+v[0-9]+,\s*v[0-9]+,\s*v[0-9]+,\s*v0.t\s+} 1 } } */
+/* { dg-final { scan-assembler-times {vsetivli\s+zero,\s*31,\s*e32,\s*mf2,\s*tu,\s*mu\s+vwadd\.wv\s+v[0-9]+,\s*v[0-9]+,\s*v[0-9]+,\s*v0.t\s+} 1 } } */
+/* { dg-final { scan-assembler-times {vsetivli\s+zero,\s*31,\s*e32,\s*m1,\s*tu,\s*mu\s+vwadd\.wv\s+v[0-9]+,\s*v[0-9]+,\s*v[0-9]+,\s*v0.t\s+} 1 } } */
+/* { dg-final { scan-assembler-times {vsetivli\s+zero,\s*31,\s*e32,\s*m2,\s*tu,\s*mu\s+vwadd\.wv\s+v[0-9]+,\s*v[0-9]+,\s*v[0-9]+,\s*v0.t\s+} 1 } } */
+/* { dg-final { scan-assembler-times {vsetivli\s+zero,\s*31,\s*e32,\s*m4,\s*tu,\s*mu\s+vwadd\.wv\s+v[0-9]+,\s*v[0-9]+,\s*v[0-9]+,\s*v0.t\s+} 1 } } */
diff --git a/gcc/testsuite/g++.target/riscv/rvv/base/vwadd_wv_tumu-3.C b/gcc/testsuite/g++.target/riscv/rvv/base/vwadd_wv_tumu-3.C
new file mode 100644
index 00000000000..3b6d36ba5f4
--- /dev/null
+++ b/gcc/testsuite/g++.target/riscv/rvv/base/vwadd_wv_tumu-3.C
@@ -0,0 +1,111 @@
+/* { dg-do compile } */
+/* { dg-options "-march=rv64gcv -mabi=lp64d -O3 -fno-schedule-insns -fno-schedule-insns2" } */
+
+#include "riscv_vector.h"
+
+vint16mf4_t test___riscv_vwadd_wv_tumu(vbool64_t mask,vint16mf4_t merge,vint16mf4_t op1,vint8mf8_t op2,size_t vl)
+{
+    return __riscv_vwadd_wv_tumu(mask,merge,op1,op2,32);
+}
+
+
+vint16mf2_t test___riscv_vwadd_wv_tumu(vbool32_t mask,vint16mf2_t merge,vint16mf2_t op1,vint8mf4_t op2,size_t vl)
+{
+    return __riscv_vwadd_wv_tumu(mask,merge,op1,op2,32);
+}
+
+
+vint16m1_t test___riscv_vwadd_wv_tumu(vbool16_t mask,vint16m1_t merge,vint16m1_t op1,vint8mf2_t op2,size_t vl)
+{
+    return __riscv_vwadd_wv_tumu(mask,merge,op1,op2,32);
+}
+
+
+vint16m2_t test___riscv_vwadd_wv_tumu(vbool8_t mask,vint16m2_t merge,vint16m2_t op1,vint8m1_t op2,size_t vl)
+{
+    return __riscv_vwadd_wv_tumu(mask,merge,op1,op2,32);
+}
+
+
+vint16m4_t test___riscv_vwadd_wv_tumu(vbool4_t mask,vint16m4_t merge,vint16m4_t op1,vint8m2_t op2,size_t vl)
+{
+    return __riscv_vwadd_wv_tumu(mask,merge,op1,op2,32);
+}
+
+
+vint16m8_t test___riscv_vwadd_wv_tumu(vbool2_t mask,vint16m8_t merge,vint16m8_t op1,vint8m4_t op2,size_t vl)
+{
+    return __riscv_vwadd_wv_tumu(mask,merge,op1,op2,32);
+}
+
+
+vint32mf2_t test___riscv_vwadd_wv_tumu(vbool64_t mask,vint32mf2_t merge,vint32mf2_t op1,vint16mf4_t op2,size_t vl)
+{
+    return __riscv_vwadd_wv_tumu(mask,merge,op1,op2,32);
+}
+
+
+vint32m1_t test___riscv_vwadd_wv_tumu(vbool32_t mask,vint32m1_t merge,vint32m1_t op1,vint16mf2_t op2,size_t vl)
+{
+    return __riscv_vwadd_wv_tumu(mask,merge,op1,op2,32);
+}
+
+
+vint32m2_t test___riscv_vwadd_wv_tumu(vbool16_t mask,vint32m2_t merge,vint32m2_t op1,vint16m1_t op2,size_t vl)
+{
+    return __riscv_vwadd_wv_tumu(mask,merge,op1,op2,32);
+}
+
+
+vint32m4_t test___riscv_vwadd_wv_tumu(vbool8_t mask,vint32m4_t merge,vint32m4_t op1,vint16m2_t op2,size_t vl)
+{
+    return __riscv_vwadd_wv_tumu(mask,merge,op1,op2,32);
+}
+
+
+vint32m8_t test___riscv_vwadd_wv_tumu(vbool4_t mask,vint32m8_t merge,vint32m8_t op1,vint16m4_t op2,size_t vl)
+{
+    return __riscv_vwadd_wv_tumu(mask,merge,op1,op2,32);
+}
+
+
+vint64m1_t test___riscv_vwadd_wv_tumu(vbool64_t mask,vint64m1_t merge,vint64m1_t op1,vint32mf2_t op2,size_t vl)
+{
+    return __riscv_vwadd_wv_tumu(mask,merge,op1,op2,32);
+}
+
+
+vint64m2_t test___riscv_vwadd_wv_tumu(vbool32_t mask,vint64m2_t merge,vint64m2_t op1,vint32m1_t op2,size_t vl)
+{
+    return __riscv_vwadd_wv_tumu(mask,merge,op1,op2,32);
+}
+
+
+vint64m4_t test___riscv_vwadd_wv_tumu(vbool16_t mask,vint64m4_t merge,vint64m4_t op1,vint32m2_t op2,size_t vl)
+{
+    return __riscv_vwadd_wv_tumu(mask,merge,op1,op2,32);
+}
+
+
+vint64m8_t test___riscv_vwadd_wv_tumu(vbool8_t mask,vint64m8_t merge,vint64m8_t op1,vint32m4_t op2,size_t vl)
+{
+    return __riscv_vwadd_wv_tumu(mask,merge,op1,op2,32);
+}
+
+
+
+/* { dg-final { scan-assembler-times {vsetvli\s+zero,\s*[a-x0-9]+,\s*e8,\s*mf8,\s*tu,\s*mu\s+vwadd\.wv\s+v[0-9]+,\s*v[0-9]+,\s*v[0-9]+,\s*v0.t\s+} 1 } } */
+/* { dg-final { scan-assembler-times {vsetvli\s+zero,\s*[a-x0-9]+,\s*e8,\s*mf4,\s*tu,\s*mu\s+vwadd\.wv\s+v[0-9]+,\s*v[0-9]+,\s*v[0-9]+,\s*v0.t\s+} 1 } } */
+/* { dg-final { scan-assembler-times {vsetvli\s+zero,\s*[a-x0-9]+,\s*e8,\s*mf2,\s*tu,\s*mu\s+vwadd\.wv\s+v[0-9]+,\s*v[0-9]+,\s*v[0-9]+,\s*v0.t\s+} 1 } } */
+/* { dg-final { scan-assembler-times {vsetvli\s+zero,\s*[a-x0-9]+,\s*e8,\s*m1,\s*tu,\s*mu\s+vwadd\.wv\s+v[0-9]+,\s*v[0-9]+,\s*v[0-9]+,\s*v0.t\s+} 1 } } */
+/* { dg-final { scan-assembler-times {vsetvli\s+zero,\s*[a-x0-9]+,\s*e8,\s*m2,\s*tu,\s*mu\s+vwadd\.wv\s+v[0-9]+,\s*v[0-9]+,\s*v[0-9]+,\s*v0.t\s+} 1 } } */
+/* { dg-final { scan-assembler-times {vsetvli\s+zero,\s*[a-x0-9]+,\s*e8,\s*m4,\s*tu,\s*mu\s+vwadd\.wv\s+v[0-9]+,\s*v[0-9]+,\s*v[0-9]+,\s*v0.t\s+} 1 } } */
+/* { dg-final { scan-assembler-times {vsetvli\s+zero,\s*[a-x0-9]+,\s*e16,\s*mf4,\s*tu,\s*mu\s+vwadd\.wv\s+v[0-9]+,\s*v[0-9]+,\s*v[0-9]+,\s*v0.t\s+} 1 } } */
+/* { dg-final { scan-assembler-times {vsetvli\s+zero,\s*[a-x0-9]+,\s*e16,\s*mf2,\s*tu,\s*mu\s+vwadd\.wv\s+v[0-9]+,\s*v[0-9]+,\s*v[0-9]+,\s*v0.t\s+} 1 } } */
+/* { dg-final { scan-assembler-times {vsetvli\s+zero,\s*[a-x0-9]+,\s*e16,\s*m1,\s*tu,\s*mu\s+vwadd\.wv\s+v[0-9]+,\s*v[0-9]+,\s*v[0-9]+,\s*v0.t\s+} 1 } } */
+/* { dg-final { scan-assembler-times {vsetvli\s+zero,\s*[a-x0-9]+,\s*e16,\s*m2,\s*tu,\s*mu\s+vwadd\.wv\s+v[0-9]+,\s*v[0-9]+,\s*v[0-9]+,\s*v0.t\s+} 1 } } */
+/* { dg-final { scan-assembler-times {vsetvli\s+zero,\s*[a-x0-9]+,\s*e16,\s*m4,\s*tu,\s*mu\s+vwadd\.wv\s+v[0-9]+,\s*v[0-9]+,\s*v[0-9]+,\s*v0.t\s+} 1 } } */
+/* { dg-final { scan-assembler-times {vsetvli\s+zero,\s*[a-x0-9]+,\s*e32,\s*mf2,\s*tu,\s*mu\s+vwadd\.wv\s+v[0-9]+,\s*v[0-9]+,\s*v[0-9]+,\s*v0.t\s+} 1 } } */
+/* { dg-final { scan-assembler-times {vsetvli\s+zero,\s*[a-x0-9]+,\s*e32,\s*m1,\s*tu,\s*mu\s+vwadd\.wv\s+v[0-9]+,\s*v[0-9]+,\s*v[0-9]+,\s*v0.t\s+} 1 } } */
+/* { dg-final { scan-assembler-times {vsetvli\s+zero,\s*[a-x0-9]+,\s*e32,\s*m2,\s*tu,\s*mu\s+vwadd\.wv\s+v[0-9]+,\s*v[0-9]+,\s*v[0-9]+,\s*v0.t\s+} 1 } } */
+/* { dg-final { scan-assembler-times {vsetvli\s+zero,\s*[a-x0-9]+,\s*e32,\s*m4,\s*tu,\s*mu\s+vwadd\.wv\s+v[0-9]+,\s*v[0-9]+,\s*v[0-9]+,\s*v0.t\s+} 1 } } */
diff --git a/gcc/testsuite/g++.target/riscv/rvv/base/vwadd_wx-1.C b/gcc/testsuite/g++.target/riscv/rvv/base/vwadd_wx-1.C
new file mode 100644
index 00000000000..1351b7abe67
--- /dev/null
+++ b/gcc/testsuite/g++.target/riscv/rvv/base/vwadd_wx-1.C
@@ -0,0 +1,216 @@
+/* { dg-do compile } */
+/* { dg-options "-march=rv32gcv -mabi=ilp32 -O3 -fno-schedule-insns -fno-schedule-insns2" } */
+
+#include "riscv_vector.h"
+
+vint16mf4_t test___riscv_vwadd_wx(vint16mf4_t op1,int8_t op2,size_t vl)
+{
+    return __riscv_vwadd_wx(op1,0xAA,vl);
+}
+
+
+vint16mf2_t test___riscv_vwadd_wx(vint16mf2_t op1,int8_t op2,size_t vl)
+{
+    return __riscv_vwadd_wx(op1,0xAA,vl);
+}
+
+
+vint16m1_t test___riscv_vwadd_wx(vint16m1_t op1,int8_t op2,size_t vl)
+{
+    return __riscv_vwadd_wx(op1,0xAA,vl);
+}
+
+
+vint16m2_t test___riscv_vwadd_wx(vint16m2_t op1,int8_t op2,size_t vl)
+{
+    return __riscv_vwadd_wx(op1,0xAA,vl);
+}
+
+
+vint16m4_t test___riscv_vwadd_wx(vint16m4_t op1,int8_t op2,size_t vl)
+{
+    return __riscv_vwadd_wx(op1,0xAA,vl);
+}
+
+
+vint16m8_t test___riscv_vwadd_wx(vint16m8_t op1,int8_t op2,size_t vl)
+{
+    return __riscv_vwadd_wx(op1,0xAA,vl);
+}
+
+
+vint32mf2_t test___riscv_vwadd_wx(vint32mf2_t op1,int16_t op2,size_t vl)
+{
+    return __riscv_vwadd_wx(op1,0xAA,vl);
+}
+
+
+vint32m1_t test___riscv_vwadd_wx(vint32m1_t op1,int16_t op2,size_t vl)
+{
+    return __riscv_vwadd_wx(op1,0xAA,vl);
+}
+
+
+vint32m2_t test___riscv_vwadd_wx(vint32m2_t op1,int16_t op2,size_t vl)
+{
+    return __riscv_vwadd_wx(op1,0xAA,vl);
+}
+
+
+vint32m4_t test___riscv_vwadd_wx(vint32m4_t op1,int16_t op2,size_t vl)
+{
+    return __riscv_vwadd_wx(op1,0xAA,vl);
+}
+
+
+vint32m8_t test___riscv_vwadd_wx(vint32m8_t op1,int16_t op2,size_t vl)
+{
+    return __riscv_vwadd_wx(op1,0xAA,vl);
+}
+
+
+vint64m1_t test___riscv_vwadd_wx(vint64m1_t op1,int32_t op2,size_t vl)
+{
+    return __riscv_vwadd_wx(op1,0xAA,vl);
+}
+
+
+vint64m2_t test___riscv_vwadd_wx(vint64m2_t op1,int32_t op2,size_t vl)
+{
+    return __riscv_vwadd_wx(op1,0xAA,vl);
+}
+
+
+vint64m4_t test___riscv_vwadd_wx(vint64m4_t op1,int32_t op2,size_t vl)
+{
+    return __riscv_vwadd_wx(op1,0xAA,vl);
+}
+
+
+vint64m8_t test___riscv_vwadd_wx(vint64m8_t op1,int32_t op2,size_t vl)
+{
+    return __riscv_vwadd_wx(op1,0xAA,vl);
+}
+
+
+vint16mf4_t test___riscv_vwadd_wx(vbool64_t mask,vint16mf4_t op1,int8_t op2,size_t vl)
+{
+    return __riscv_vwadd_wx(mask,op1,0xAA,vl);
+}
+
+
+vint16mf2_t test___riscv_vwadd_wx(vbool32_t mask,vint16mf2_t op1,int8_t op2,size_t vl)
+{
+    return __riscv_vwadd_wx(mask,op1,0xAA,vl);
+}
+
+
+vint16m1_t test___riscv_vwadd_wx(vbool16_t mask,vint16m1_t op1,int8_t op2,size_t vl)
+{
+    return __riscv_vwadd_wx(mask,op1,0xAA,vl);
+}
+
+
+vint16m2_t test___riscv_vwadd_wx(vbool8_t mask,vint16m2_t op1,int8_t op2,size_t vl)
+{
+    return __riscv_vwadd_wx(mask,op1,0xAA,vl);
+}
+
+
+vint16m4_t test___riscv_vwadd_wx(vbool4_t mask,vint16m4_t op1,int8_t op2,size_t vl)
+{
+    return __riscv_vwadd_wx(mask,op1,0xAA,vl);
+}
+
+
+vint16m8_t test___riscv_vwadd_wx(vbool2_t mask,vint16m8_t op1,int8_t op2,size_t vl)
+{
+    return __riscv_vwadd_wx(mask,op1,0xAA,vl);
+}
+
+
+vint32mf2_t test___riscv_vwadd_wx(vbool64_t mask,vint32mf2_t op1,int16_t op2,size_t vl)
+{
+    return __riscv_vwadd_wx(mask,op1,0xAA,vl);
+}
+
+
+vint32m1_t test___riscv_vwadd_wx(vbool32_t mask,vint32m1_t op1,int16_t op2,size_t vl)
+{
+    return __riscv_vwadd_wx(mask,op1,0xAA,vl);
+}
+
+
+vint32m2_t test___riscv_vwadd_wx(vbool16_t mask,vint32m2_t op1,int16_t op2,size_t vl)
+{
+    return __riscv_vwadd_wx(mask,op1,0xAA,vl);
+}
+
+
+vint32m4_t test___riscv_vwadd_wx(vbool8_t mask,vint32m4_t op1,int16_t op2,size_t vl)
+{
+    return __riscv_vwadd_wx(mask,op1,0xAA,vl);
+}
+
+
+vint32m8_t test___riscv_vwadd_wx(vbool4_t mask,vint32m8_t op1,int16_t op2,size_t vl)
+{
+    return __riscv_vwadd_wx(mask,op1,0xAA,vl);
+}
+
+
+vint64m1_t test___riscv_vwadd_wx(vbool64_t mask,vint64m1_t op1,int32_t op2,size_t vl)
+{
+    return __riscv_vwadd_wx(mask,op1,0xAA,vl);
+}
+
+
+vint64m2_t test___riscv_vwadd_wx(vbool32_t mask,vint64m2_t op1,int32_t op2,size_t vl)
+{
+    return __riscv_vwadd_wx(mask,op1,0xAA,vl);
+}
+
+
+vint64m4_t test___riscv_vwadd_wx(vbool16_t mask,vint64m4_t op1,int32_t op2,size_t vl)
+{
+    return __riscv_vwadd_wx(mask,op1,0xAA,vl);
+}
+
+
+vint64m8_t test___riscv_vwadd_wx(vbool8_t mask,vint64m8_t op1,int32_t op2,size_t vl)
+{
+    return __riscv_vwadd_wx(mask,op1,0xAA,vl);
+}
+
+
+
+/* { dg-final { scan-assembler-times {vsetvli\s+zero,\s*[a-x0-9]+,\s*e8,\s*mf8,\s*t[au],\s*m[au]\s+vwadd\.wx\s+v[0-9]+,\s*v[0-9]+,\s*[a-x0-9]+\s+} 1 } } */
+/* { dg-final { scan-assembler-times {vsetvli\s+zero,\s*[a-x0-9]+,\s*e8,\s*mf4,\s*t[au],\s*m[au]\s+vwadd\.wx\s+v[0-9]+,\s*v[0-9]+,\s*[a-x0-9]+\s+} 1 } } */
+/* { dg-final { scan-assembler-times {vsetvli\s+zero,\s*[a-x0-9]+,\s*e8,\s*mf2,\s*t[au],\s*m[au]\s+vwadd\.wx\s+v[0-9]+,\s*v[0-9]+,\s*[a-x0-9]+\s+} 1 } } */
+/* { dg-final { scan-assembler-times {vsetvli\s+zero,\s*[a-x0-9]+,\s*e8,\s*m1,\s*t[au],\s*m[au]\s+vwadd\.wx\s+v[0-9]+,\s*v[0-9]+,\s*[a-x0-9]+\s+} 1 } } */
+/* { dg-final { scan-assembler-times {vsetvli\s+zero,\s*[a-x0-9]+,\s*e8,\s*m2,\s*t[au],\s*m[au]\s+vwadd\.wx\s+v[0-9]+,\s*v[0-9]+,\s*[a-x0-9]+\s+} 1 } } */
+/* { dg-final { scan-assembler-times {vsetvli\s+zero,\s*[a-x0-9]+,\s*e8,\s*m4,\s*t[au],\s*m[au]\s+vwadd\.wx\s+v[0-9]+,\s*v[0-9]+,\s*[a-x0-9]+\s+} 1 } } */
+/* { dg-final { scan-assembler-times {vsetvli\s+zero,\s*[a-x0-9]+,\s*e16,\s*mf4,\s*t[au],\s*m[au]\s+vwadd\.wx\s+v[0-9]+,\s*v[0-9]+,\s*[a-x0-9]+\s+} 1 } } */
+/* { dg-final { scan-assembler-times {vsetvli\s+zero,\s*[a-x0-9]+,\s*e16,\s*mf2,\s*t[au],\s*m[au]\s+vwadd\.wx\s+v[0-9]+,\s*v[0-9]+,\s*[a-x0-9]+\s+} 1 } } */
+/* { dg-final { scan-assembler-times {vsetvli\s+zero,\s*[a-x0-9]+,\s*e16,\s*m1,\s*t[au],\s*m[au]\s+vwadd\.wx\s+v[0-9]+,\s*v[0-9]+,\s*[a-x0-9]+\s+} 1 } } */
+/* { dg-final { scan-assembler-times {vsetvli\s+zero,\s*[a-x0-9]+,\s*e16,\s*m2,\s*t[au],\s*m[au]\s+vwadd\.wx\s+v[0-9]+,\s*v[0-9]+,\s*[a-x0-9]+\s+} 1 } } */
+/* { dg-final { scan-assembler-times {vsetvli\s+zero,\s*[a-x0-9]+,\s*e16,\s*m4,\s*t[au],\s*m[au]\s+vwadd\.wx\s+v[0-9]+,\s*v[0-9]+,\s*[a-x0-9]+\s+} 1 } } */
+/* { dg-final { scan-assembler-times {vsetvli\s+zero,\s*[a-x0-9]+,\s*e32,\s*mf2,\s*t[au],\s*m[au]\s+vwadd\.wx\s+v[0-9]+,\s*v[0-9]+,\s*[a-x0-9]+\s+} 1 } } */
+/* { dg-final { scan-assembler-times {vsetvli\s+zero,\s*[a-x0-9]+,\s*e32,\s*m1,\s*t[au],\s*m[au]\s+vwadd\.wx\s+v[0-9]+,\s*v[0-9]+,\s*[a-x0-9]+\s+} 1 } } */
+/* { dg-final { scan-assembler-times {vsetvli\s+zero,\s*[a-x0-9]+,\s*e32,\s*m2,\s*t[au],\s*m[au]\s+vwadd\.wx\s+v[0-9]+,\s*v[0-9]+,\s*[a-x0-9]+\s+} 1 } } */
+/* { dg-final { scan-assembler-times {vsetvli\s+zero,\s*[a-x0-9]+,\s*e32,\s*m4,\s*t[au],\s*m[au]\s+vwadd\.wx\s+v[0-9]+,\s*v[0-9]+,\s*[a-x0-9]+\s+} 1 } } */
+/* { dg-final { scan-assembler-times {vsetvli\s+zero,\s*[a-x0-9]+,\s*e8,\s*mf8,\s*t[au],\s*m[au]\s+vwadd\.wx\s+v[0-9]+,\s*v[0-9]+,\s*[a-x0-9]+,\s*v0.t\s+} 1 } } */
+/* { dg-final { scan-assembler-times {vsetvli\s+zero,\s*[a-x0-9]+,\s*e8,\s*mf4,\s*t[au],\s*m[au]\s+vwadd\.wx\s+v[0-9]+,\s*v[0-9]+,\s*[a-x0-9]+,\s*v0.t\s+} 1 } } */
+/* { dg-final { scan-assembler-times {vsetvli\s+zero,\s*[a-x0-9]+,\s*e8,\s*mf2,\s*t[au],\s*m[au]\s+vwadd\.wx\s+v[0-9]+,\s*v[0-9]+,\s*[a-x0-9]+,\s*v0.t\s+} 1 } } */
+/* { dg-final { scan-assembler-times {vsetvli\s+zero,\s*[a-x0-9]+,\s*e8,\s*m1,\s*t[au],\s*m[au]\s+vwadd\.wx\s+v[0-9]+,\s*v[0-9]+,\s*[a-x0-9]+,\s*v0.t\s+} 1 } } */
+/* { dg-final { scan-assembler-times {vsetvli\s+zero,\s*[a-x0-9]+,\s*e8,\s*m2,\s*t[au],\s*m[au]\s+vwadd\.wx\s+v[0-9]+,\s*v[0-9]+,\s*[a-x0-9]+,\s*v0.t\s+} 1 } } */
+/* { dg-final { scan-assembler-times {vsetvli\s+zero,\s*[a-x0-9]+,\s*e8,\s*m4,\s*t[au],\s*m[au]\s+vwadd\.wx\s+v[0-9]+,\s*v[0-9]+,\s*[a-x0-9]+,\s*v0.t\s+} 1 } } */
+/* { dg-final { scan-assembler-times {vsetvli\s+zero,\s*[a-x0-9]+,\s*e16,\s*mf4,\s*t[au],\s*m[au]\s+vwadd\.wx\s+v[0-9]+,\s*v[0-9]+,\s*[a-x0-9]+,\s*v0.t\s+} 1 } } */
+/* { dg-final { scan-assembler-times {vsetvli\s+zero,\s*[a-x0-9]+,\s*e16,\s*mf2,\s*t[au],\s*m[au]\s+vwadd\.wx\s+v[0-9]+,\s*v[0-9]+,\s*[a-x0-9]+,\s*v0.t\s+} 1 } } */
+/* { dg-final { scan-assembler-times {vsetvli\s+zero,\s*[a-x0-9]+,\s*e16,\s*m1,\s*t[au],\s*m[au]\s+vwadd\.wx\s+v[0-9]+,\s*v[0-9]+,\s*[a-x0-9]+,\s*v0.t\s+} 1 } } */
+/* { dg-final { scan-assembler-times {vsetvli\s+zero,\s*[a-x0-9]+,\s*e16,\s*m2,\s*t[au],\s*m[au]\s+vwadd\.wx\s+v[0-9]+,\s*v[0-9]+,\s*[a-x0-9]+,\s*v0.t\s+} 1 } } */
+/* { dg-final { scan-assembler-times {vsetvli\s+zero,\s*[a-x0-9]+,\s*e16,\s*m4,\s*t[au],\s*m[au]\s+vwadd\.wx\s+v[0-9]+,\s*v[0-9]+,\s*[a-x0-9]+,\s*v0.t\s+} 1 } } */
+/* { dg-final { scan-assembler-times {vsetvli\s+zero,\s*[a-x0-9]+,\s*e32,\s*mf2,\s*t[au],\s*m[au]\s+vwadd\.wx\s+v[0-9]+,\s*v[0-9]+,\s*[a-x0-9]+,\s*v0.t\s+} 1 } } */
+/* { dg-final { scan-assembler-times {vsetvli\s+zero,\s*[a-x0-9]+,\s*e32,\s*m1,\s*t[au],\s*m[au]\s+vwadd\.wx\s+v[0-9]+,\s*v[0-9]+,\s*[a-x0-9]+,\s*v0.t\s+} 1 } } */
+/* { dg-final { scan-assembler-times {vsetvli\s+zero,\s*[a-x0-9]+,\s*e32,\s*m2,\s*t[au],\s*m[au]\s+vwadd\.wx\s+v[0-9]+,\s*v[0-9]+,\s*[a-x0-9]+,\s*v0.t\s+} 1 } } */
+/* { dg-final { scan-assembler-times {vsetvli\s+zero,\s*[a-x0-9]+,\s*e32,\s*m4,\s*t[au],\s*m[au]\s+vwadd\.wx\s+v[0-9]+,\s*v[0-9]+,\s*[a-x0-9]+,\s*v0.t\s+} 1 } } */
diff --git a/gcc/testsuite/g++.target/riscv/rvv/base/vwadd_wx-2.C b/gcc/testsuite/g++.target/riscv/rvv/base/vwadd_wx-2.C
new file mode 100644
index 00000000000..fc7de281544
--- /dev/null
+++ b/gcc/testsuite/g++.target/riscv/rvv/base/vwadd_wx-2.C
@@ -0,0 +1,216 @@
+/* { dg-do compile } */
+/* { dg-options "-march=rv32gcv -mabi=ilp32 -O3 -fno-schedule-insns -fno-schedule-insns2" } */
+
+#include "riscv_vector.h"
+
+vint16mf4_t test___riscv_vwadd_wx(vint16mf4_t op1,int8_t op2,size_t vl)
+{
+    return __riscv_vwadd_wx(op1,0xAA,31);
+}
+
+
+vint16mf2_t test___riscv_vwadd_wx(vint16mf2_t op1,int8_t op2,size_t vl)
+{
+    return __riscv_vwadd_wx(op1,0xAA,31);
+}
+
+
+vint16m1_t test___riscv_vwadd_wx(vint16m1_t op1,int8_t op2,size_t vl)
+{
+    return __riscv_vwadd_wx(op1,0xAA,31);
+}
+
+
+vint16m2_t test___riscv_vwadd_wx(vint16m2_t op1,int8_t op2,size_t vl)
+{
+    return __riscv_vwadd_wx(op1,0xAA,31);
+}
+
+
+vint16m4_t test___riscv_vwadd_wx(vint16m4_t op1,int8_t op2,size_t vl)
+{
+    return __riscv_vwadd_wx(op1,0xAA,31);
+}
+
+
+vint16m8_t test___riscv_vwadd_wx(vint16m8_t op1,int8_t op2,size_t vl)
+{
+    return __riscv_vwadd_wx(op1,0xAA,31);
+}
+
+
+vint32mf2_t test___riscv_vwadd_wx(vint32mf2_t op1,int16_t op2,size_t vl)
+{
+    return __riscv_vwadd_wx(op1,0xAA,31);
+}
+
+
+vint32m1_t test___riscv_vwadd_wx(vint32m1_t op1,int16_t op2,size_t vl)
+{
+    return __riscv_vwadd_wx(op1,0xAA,31);
+}
+
+
+vint32m2_t test___riscv_vwadd_wx(vint32m2_t op1,int16_t op2,size_t vl)
+{
+    return __riscv_vwadd_wx(op1,0xAA,31);
+}
+
+
+vint32m4_t test___riscv_vwadd_wx(vint32m4_t op1,int16_t op2,size_t vl)
+{
+    return __riscv_vwadd_wx(op1,0xAA,31);
+}
+
+
+vint32m8_t test___riscv_vwadd_wx(vint32m8_t op1,int16_t op2,size_t vl)
+{
+    return __riscv_vwadd_wx(op1,0xAA,31);
+}
+
+
+vint64m1_t test___riscv_vwadd_wx(vint64m1_t op1,int32_t op2,size_t vl)
+{
+    return __riscv_vwadd_wx(op1,0xAA,31);
+}
+
+
+vint64m2_t test___riscv_vwadd_wx(vint64m2_t op1,int32_t op2,size_t vl)
+{
+    return __riscv_vwadd_wx(op1,0xAA,31);
+}
+
+
+vint64m4_t test___riscv_vwadd_wx(vint64m4_t op1,int32_t op2,size_t vl)
+{
+    return __riscv_vwadd_wx(op1,0xAA,31);
+}
+
+
+vint64m8_t test___riscv_vwadd_wx(vint64m8_t op1,int32_t op2,size_t vl)
+{
+    return __riscv_vwadd_wx(op1,0xAA,31);
+}
+
+
+vint16mf4_t test___riscv_vwadd_wx(vbool64_t mask,vint16mf4_t op1,int8_t op2,size_t vl)
+{
+    return __riscv_vwadd_wx(mask,op1,0xAA,31);
+}
+
+
+vint16mf2_t test___riscv_vwadd_wx(vbool32_t mask,vint16mf2_t op1,int8_t op2,size_t vl)
+{
+    return __riscv_vwadd_wx(mask,op1,0xAA,31);
+}
+
+
+vint16m1_t test___riscv_vwadd_wx(vbool16_t mask,vint16m1_t op1,int8_t op2,size_t vl)
+{
+    return __riscv_vwadd_wx(mask,op1,0xAA,31);
+}
+
+
+vint16m2_t test___riscv_vwadd_wx(vbool8_t mask,vint16m2_t op1,int8_t op2,size_t vl)
+{
+    return __riscv_vwadd_wx(mask,op1,0xAA,31);
+}
+
+
+vint16m4_t test___riscv_vwadd_wx(vbool4_t mask,vint16m4_t op1,int8_t op2,size_t vl)
+{
+    return __riscv_vwadd_wx(mask,op1,0xAA,31);
+}
+
+
+vint16m8_t test___riscv_vwadd_wx(vbool2_t mask,vint16m8_t op1,int8_t op2,size_t vl)
+{
+    return __riscv_vwadd_wx(mask,op1,0xAA,31);
+}
+
+
+vint32mf2_t test___riscv_vwadd_wx(vbool64_t mask,vint32mf2_t op1,int16_t op2,size_t vl)
+{
+    return __riscv_vwadd_wx(mask,op1,0xAA,31);
+}
+
+
+vint32m1_t test___riscv_vwadd_wx(vbool32_t mask,vint32m1_t op1,int16_t op2,size_t vl)
+{
+    return __riscv_vwadd_wx(mask,op1,0xAA,31);
+}
+
+
+vint32m2_t test___riscv_vwadd_wx(vbool16_t mask,vint32m2_t op1,int16_t op2,size_t vl)
+{
+    return __riscv_vwadd_wx(mask,op1,0xAA,31);
+}
+
+
+vint32m4_t test___riscv_vwadd_wx(vbool8_t mask,vint32m4_t op1,int16_t op2,size_t vl)
+{
+    return __riscv_vwadd_wx(mask,op1,0xAA,31);
+}
+
+
+vint32m8_t test___riscv_vwadd_wx(vbool4_t mask,vint32m8_t op1,int16_t op2,size_t vl)
+{
+    return __riscv_vwadd_wx(mask,op1,0xAA,31);
+}
+
+
+vint64m1_t test___riscv_vwadd_wx(vbool64_t mask,vint64m1_t op1,int32_t op2,size_t vl)
+{
+    return __riscv_vwadd_wx(mask,op1,0xAA,31);
+}
+
+
+vint64m2_t test___riscv_vwadd_wx(vbool32_t mask,vint64m2_t op1,int32_t op2,size_t vl)
+{
+    return __riscv_vwadd_wx(mask,op1,0xAA,31);
+}
+
+
+vint64m4_t test___riscv_vwadd_wx(vbool16_t mask,vint64m4_t op1,int32_t op2,size_t vl)
+{
+    return __riscv_vwadd_wx(mask,op1,0xAA,31);
+}
+
+
+vint64m8_t test___riscv_vwadd_wx(vbool8_t mask,vint64m8_t op1,int32_t op2,size_t vl)
+{
+    return __riscv_vwadd_wx(mask,op1,0xAA,31);
+}
+
+
+
+/* { dg-final { scan-assembler-times {vsetivli\s+zero,\s*31,\s*e8,\s*mf8,\s*t[au],\s*m[au]\s+vwadd\.wx\s+v[0-9]+,\s*v[0-9]+,\s*[a-x0-9]+\s+} 1 } } */
+/* { dg-final { scan-assembler-times {vsetivli\s+zero,\s*31,\s*e8,\s*mf4,\s*t[au],\s*m[au]\s+vwadd\.wx\s+v[0-9]+,\s*v[0-9]+,\s*[a-x0-9]+\s+} 1 } } */
+/* { dg-final { scan-assembler-times {vsetivli\s+zero,\s*31,\s*e8,\s*mf2,\s*t[au],\s*m[au]\s+vwadd\.wx\s+v[0-9]+,\s*v[0-9]+,\s*[a-x0-9]+\s+} 1 } } */
+/* { dg-final { scan-assembler-times {vsetivli\s+zero,\s*31,\s*e8,\s*m1,\s*t[au],\s*m[au]\s+vwadd\.wx\s+v[0-9]+,\s*v[0-9]+,\s*[a-x0-9]+\s+} 1 } } */
+/* { dg-final { scan-assembler-times {vsetivli\s+zero,\s*31,\s*e8,\s*m2,\s*t[au],\s*m[au]\s+vwadd\.wx\s+v[0-9]+,\s*v[0-9]+,\s*[a-x0-9]+\s+} 1 } } */
+/* { dg-final { scan-assembler-times {vsetivli\s+zero,\s*31,\s*e8,\s*m4,\s*t[au],\s*m[au]\s+vwadd\.wx\s+v[0-9]+,\s*v[0-9]+,\s*[a-x0-9]+\s+} 1 } } */
+/* { dg-final { scan-assembler-times {vsetivli\s+zero,\s*31,\s*e16,\s*mf4,\s*t[au],\s*m[au]\s+vwadd\.wx\s+v[0-9]+,\s*v[0-9]+,\s*[a-x0-9]+\s+} 1 } } */
+/* { dg-final { scan-assembler-times {vsetivli\s+zero,\s*31,\s*e16,\s*mf2,\s*t[au],\s*m[au]\s+vwadd\.wx\s+v[0-9]+,\s*v[0-9]+,\s*[a-x0-9]+\s+} 1 } } */
+/* { dg-final { scan-assembler-times {vsetivli\s+zero,\s*31,\s*e16,\s*m1,\s*t[au],\s*m[au]\s+vwadd\.wx\s+v[0-9]+,\s*v[0-9]+,\s*[a-x0-9]+\s+} 1 } } */
+/* { dg-final { scan-assembler-times {vsetivli\s+zero,\s*31,\s*e16,\s*m2,\s*t[au],\s*m[au]\s+vwadd\.wx\s+v[0-9]+,\s*v[0-9]+,\s*[a-x0-9]+\s+} 1 } } */
+/* { dg-final { scan-assembler-times {vsetivli\s+zero,\s*31,\s*e16,\s*m4,\s*t[au],\s*m[au]\s+vwadd\.wx\s+v[0-9]+,\s*v[0-9]+,\s*[a-x0-9]+\s+} 1 } } */
+/* { dg-final { scan-assembler-times {vsetivli\s+zero,\s*31,\s*e32,\s*mf2,\s*t[au],\s*m[au]\s+vwadd\.wx\s+v[0-9]+,\s*v[0-9]+,\s*[a-x0-9]+\s+} 1 } } */
+/* { dg-final { scan-assembler-times {vsetivli\s+zero,\s*31,\s*e32,\s*m1,\s*t[au],\s*m[au]\s+vwadd\.wx\s+v[0-9]+,\s*v[0-9]+,\s*[a-x0-9]+\s+} 1 } } */
+/* { dg-final { scan-assembler-times {vsetivli\s+zero,\s*31,\s*e32,\s*m2,\s*t[au],\s*m[au]\s+vwadd\.wx\s+v[0-9]+,\s*v[0-9]+,\s*[a-x0-9]+\s+} 1 } } */
+/* { dg-final { scan-assembler-times {vsetivli\s+zero,\s*31,\s*e32,\s*m4,\s*t[au],\s*m[au]\s+vwadd\.wx\s+v[0-9]+,\s*v[0-9]+,\s*[a-x0-9]+\s+} 1 } } */
+/* { dg-final { scan-assembler-times {vsetivli\s+zero,\s*31,\s*e8,\s*mf8,\s*t[au],\s*m[au]\s+vwadd\.wx\s+v[0-9]+,\s*v[0-9]+,\s*[a-x0-9]+,\s*v0.t\s+} 1 } } */
+/* { dg-final { scan-assembler-times {vsetivli\s+zero,\s*31,\s*e8,\s*mf4,\s*t[au],\s*m[au]\s+vwadd\.wx\s+v[0-9]+,\s*v[0-9]+,\s*[a-x0-9]+,\s*v0.t\s+} 1 } } */
+/* { dg-final { scan-assembler-times {vsetivli\s+zero,\s*31,\s*e8,\s*mf2,\s*t[au],\s*m[au]\s+vwadd\.wx\s+v[0-9]+,\s*v[0-9]+,\s*[a-x0-9]+,\s*v0.t\s+} 1 } } */
+/* { dg-final { scan-assembler-times {vsetivli\s+zero,\s*31,\s*e8,\s*m1,\s*t[au],\s*m[au]\s+vwadd\.wx\s+v[0-9]+,\s*v[0-9]+,\s*[a-x0-9]+,\s*v0.t\s+} 1 } } */
+/* { dg-final { scan-assembler-times {vsetivli\s+zero,\s*31,\s*e8,\s*m2,\s*t[au],\s*m[au]\s+vwadd\.wx\s+v[0-9]+,\s*v[0-9]+,\s*[a-x0-9]+,\s*v0.t\s+} 1 } } */
+/* { dg-final { scan-assembler-times {vsetivli\s+zero,\s*31,\s*e8,\s*m4,\s*t[au],\s*m[au]\s+vwadd\.wx\s+v[0-9]+,\s*v[0-9]+,\s*[a-x0-9]+,\s*v0.t\s+} 1 } } */
+/* { dg-final { scan-assembler-times {vsetivli\s+zero,\s*31,\s*e16,\s*mf4,\s*t[au],\s*m[au]\s+vwadd\.wx\s+v[0-9]+,\s*v[0-9]+,\s*[a-x0-9]+,\s*v0.t\s+} 1 } } */
+/* { dg-final { scan-assembler-times {vsetivli\s+zero,\s*31,\s*e16,\s*mf2,\s*t[au],\s*m[au]\s+vwadd\.wx\s+v[0-9]+,\s*v[0-9]+,\s*[a-x0-9]+,\s*v0.t\s+} 1 } } */
+/* { dg-final { scan-assembler-times {vsetivli\s+zero,\s*31,\s*e16,\s*m1,\s*t[au],\s*m[au]\s+vwadd\.wx\s+v[0-9]+,\s*v[0-9]+,\s*[a-x0-9]+,\s*v0.t\s+} 1 } } */
+/* { dg-final { scan-assembler-times {vsetivli\s+zero,\s*31,\s*e16,\s*m2,\s*t[au],\s*m[au]\s+vwadd\.wx\s+v[0-9]+,\s*v[0-9]+,\s*[a-x0-9]+,\s*v0.t\s+} 1 } } */
+/* { dg-final { scan-assembler-times {vsetivli\s+zero,\s*31,\s*e16,\s*m4,\s*t[au],\s*m[au]\s+vwadd\.wx\s+v[0-9]+,\s*v[0-9]+,\s*[a-x0-9]+,\s*v0.t\s+} 1 } } */
+/* { dg-final { scan-assembler-times {vsetivli\s+zero,\s*31,\s*e32,\s*mf2,\s*t[au],\s*m[au]\s+vwadd\.wx\s+v[0-9]+,\s*v[0-9]+,\s*[a-x0-9]+,\s*v0.t\s+} 1 } } */
+/* { dg-final { scan-assembler-times {vsetivli\s+zero,\s*31,\s*e32,\s*m1,\s*t[au],\s*m[au]\s+vwadd\.wx\s+v[0-9]+,\s*v[0-9]+,\s*[a-x0-9]+,\s*v0.t\s+} 1 } } */
+/* { dg-final { scan-assembler-times {vsetivli\s+zero,\s*31,\s*e32,\s*m2,\s*t[au],\s*m[au]\s+vwadd\.wx\s+v[0-9]+,\s*v[0-9]+,\s*[a-x0-9]+,\s*v0.t\s+} 1 } } */
+/* { dg-final { scan-assembler-times {vsetivli\s+zero,\s*31,\s*e32,\s*m4,\s*t[au],\s*m[au]\s+vwadd\.wx\s+v[0-9]+,\s*v[0-9]+,\s*[a-x0-9]+,\s*v0.t\s+} 1 } } */
diff --git a/gcc/testsuite/g++.target/riscv/rvv/base/vwadd_wx-3.C b/gcc/testsuite/g++.target/riscv/rvv/base/vwadd_wx-3.C
new file mode 100644
index 00000000000..fffa55e93a1
--- /dev/null
+++ b/gcc/testsuite/g++.target/riscv/rvv/base/vwadd_wx-3.C
@@ -0,0 +1,216 @@
+/* { dg-do compile } */
+/* { dg-options "-march=rv32gcv -mabi=ilp32 -O3 -fno-schedule-insns -fno-schedule-insns2" } */
+
+#include "riscv_vector.h"
+
+vint16mf4_t test___riscv_vwadd_wx(vint16mf4_t op1,int8_t op2,size_t vl)
+{
+    return __riscv_vwadd_wx(op1,0xAA,32);
+}
+
+
+vint16mf2_t test___riscv_vwadd_wx(vint16mf2_t op1,int8_t op2,size_t vl)
+{
+    return __riscv_vwadd_wx(op1,0xAA,32);
+}
+
+
+vint16m1_t test___riscv_vwadd_wx(vint16m1_t op1,int8_t op2,size_t vl)
+{
+    return __riscv_vwadd_wx(op1,0xAA,32);
+}
+
+
+vint16m2_t test___riscv_vwadd_wx(vint16m2_t op1,int8_t op2,size_t vl)
+{
+    return __riscv_vwadd_wx(op1,0xAA,32);
+}
+
+
+vint16m4_t test___riscv_vwadd_wx(vint16m4_t op1,int8_t op2,size_t vl)
+{
+    return __riscv_vwadd_wx(op1,0xAA,32);
+}
+
+
+vint16m8_t test___riscv_vwadd_wx(vint16m8_t op1,int8_t op2,size_t vl)
+{
+    return __riscv_vwadd_wx(op1,0xAA,32);
+}
+
+
+vint32mf2_t test___riscv_vwadd_wx(vint32mf2_t op1,int16_t op2,size_t vl)
+{
+    return __riscv_vwadd_wx(op1,0xAA,32);
+}
+
+
+vint32m1_t test___riscv_vwadd_wx(vint32m1_t op1,int16_t op2,size_t vl)
+{
+    return __riscv_vwadd_wx(op1,0xAA,32);
+}
+
+
+vint32m2_t test___riscv_vwadd_wx(vint32m2_t op1,int16_t op2,size_t vl)
+{
+    return __riscv_vwadd_wx(op1,0xAA,32);
+}
+
+
+vint32m4_t test___riscv_vwadd_wx(vint32m4_t op1,int16_t op2,size_t vl)
+{
+    return __riscv_vwadd_wx(op1,0xAA,32);
+}
+
+
+vint32m8_t test___riscv_vwadd_wx(vint32m8_t op1,int16_t op2,size_t vl)
+{
+    return __riscv_vwadd_wx(op1,0xAA,32);
+}
+
+
+vint64m1_t test___riscv_vwadd_wx(vint64m1_t op1,int32_t op2,size_t vl)
+{
+    return __riscv_vwadd_wx(op1,0xAA,32);
+}
+
+
+vint64m2_t test___riscv_vwadd_wx(vint64m2_t op1,int32_t op2,size_t vl)
+{
+    return __riscv_vwadd_wx(op1,0xAA,32);
+}
+
+
+vint64m4_t test___riscv_vwadd_wx(vint64m4_t op1,int32_t op2,size_t vl)
+{
+    return __riscv_vwadd_wx(op1,0xAA,32);
+}
+
+
+vint64m8_t test___riscv_vwadd_wx(vint64m8_t op1,int32_t op2,size_t vl)
+{
+    return __riscv_vwadd_wx(op1,0xAA,32);
+}
+
+
+vint16mf4_t test___riscv_vwadd_wx(vbool64_t mask,vint16mf4_t op1,int8_t op2,size_t vl)
+{
+    return __riscv_vwadd_wx(mask,op1,0xAA,32);
+}
+
+
+vint16mf2_t test___riscv_vwadd_wx(vbool32_t mask,vint16mf2_t op1,int8_t op2,size_t vl)
+{
+    return __riscv_vwadd_wx(mask,op1,0xAA,32);
+}
+
+
+vint16m1_t test___riscv_vwadd_wx(vbool16_t mask,vint16m1_t op1,int8_t op2,size_t vl)
+{
+    return __riscv_vwadd_wx(mask,op1,0xAA,32);
+}
+
+
+vint16m2_t test___riscv_vwadd_wx(vbool8_t mask,vint16m2_t op1,int8_t op2,size_t vl)
+{
+    return __riscv_vwadd_wx(mask,op1,0xAA,32);
+}
+
+
+vint16m4_t test___riscv_vwadd_wx(vbool4_t mask,vint16m4_t op1,int8_t op2,size_t vl)
+{
+    return __riscv_vwadd_wx(mask,op1,0xAA,32);
+}
+
+
+vint16m8_t test___riscv_vwadd_wx(vbool2_t mask,vint16m8_t op1,int8_t op2,size_t vl)
+{
+    return __riscv_vwadd_wx(mask,op1,0xAA,32);
+}
+
+
+vint32mf2_t test___riscv_vwadd_wx(vbool64_t mask,vint32mf2_t op1,int16_t op2,size_t vl)
+{
+    return __riscv_vwadd_wx(mask,op1,0xAA,32);
+}
+
+
+vint32m1_t test___riscv_vwadd_wx(vbool32_t mask,vint32m1_t op1,int16_t op2,size_t vl)
+{
+    return __riscv_vwadd_wx(mask,op1,0xAA,32);
+}
+
+
+vint32m2_t test___riscv_vwadd_wx(vbool16_t mask,vint32m2_t op1,int16_t op2,size_t vl)
+{
+    return __riscv_vwadd_wx(mask,op1,0xAA,32);
+}
+
+
+vint32m4_t test___riscv_vwadd_wx(vbool8_t mask,vint32m4_t op1,int16_t op2,size_t vl)
+{
+    return __riscv_vwadd_wx(mask,op1,0xAA,32);
+}
+
+
+vint32m8_t test___riscv_vwadd_wx(vbool4_t mask,vint32m8_t op1,int16_t op2,size_t vl)
+{
+    return __riscv_vwadd_wx(mask,op1,0xAA,32);
+}
+
+
+vint64m1_t test___riscv_vwadd_wx(vbool64_t mask,vint64m1_t op1,int32_t op2,size_t vl)
+{
+    return __riscv_vwadd_wx(mask,op1,0xAA,32);
+}
+
+
+vint64m2_t test___riscv_vwadd_wx(vbool32_t mask,vint64m2_t op1,int32_t op2,size_t vl)
+{
+    return __riscv_vwadd_wx(mask,op1,0xAA,32);
+}
+
+
+vint64m4_t test___riscv_vwadd_wx(vbool16_t mask,vint64m4_t op1,int32_t op2,size_t vl)
+{
+    return __riscv_vwadd_wx(mask,op1,0xAA,32);
+}
+
+
+vint64m8_t test___riscv_vwadd_wx(vbool8_t mask,vint64m8_t op1,int32_t op2,size_t vl)
+{
+    return __riscv_vwadd_wx(mask,op1,0xAA,32);
+}
+
+
+
+/* { dg-final { scan-assembler-times {vsetvli\s+zero,\s*[a-x0-9]+,\s*e8,\s*mf8,\s*t[au],\s*m[au]\s+vwadd\.wx\s+v[0-9]+,\s*v[0-9]+,\s*[a-x0-9]+\s+} 1 } } */
+/* { dg-final { scan-assembler-times {vsetvli\s+zero,\s*[a-x0-9]+,\s*e8,\s*mf4,\s*t[au],\s*m[au]\s+vwadd\.wx\s+v[0-9]+,\s*v[0-9]+,\s*[a-x0-9]+\s+} 1 } } */
+/* { dg-final { scan-assembler-times {vsetvli\s+zero,\s*[a-x0-9]+,\s*e8,\s*mf2,\s*t[au],\s*m[au]\s+vwadd\.wx\s+v[0-9]+,\s*v[0-9]+,\s*[a-x0-9]+\s+} 1 } } */
+/* { dg-final { scan-assembler-times {vsetvli\s+zero,\s*[a-x0-9]+,\s*e8,\s*m1,\s*t[au],\s*m[au]\s+vwadd\.wx\s+v[0-9]+,\s*v[0-9]+,\s*[a-x0-9]+\s+} 1 } } */
+/* { dg-final { scan-assembler-times {vsetvli\s+zero,\s*[a-x0-9]+,\s*e8,\s*m2,\s*t[au],\s*m[au]\s+vwadd\.wx\s+v[0-9]+,\s*v[0-9]+,\s*[a-x0-9]+\s+} 1 } } */
+/* { dg-final { scan-assembler-times {vsetvli\s+zero,\s*[a-x0-9]+,\s*e8,\s*m4,\s*t[au],\s*m[au]\s+vwadd\.wx\s+v[0-9]+,\s*v[0-9]+,\s*[a-x0-9]+\s+} 1 } } */
+/* { dg-final { scan-assembler-times {vsetvli\s+zero,\s*[a-x0-9]+,\s*e16,\s*mf4,\s*t[au],\s*m[au]\s+vwadd\.wx\s+v[0-9]+,\s*v[0-9]+,\s*[a-x0-9]+\s+} 1 } } */
+/* { dg-final { scan-assembler-times {vsetvli\s+zero,\s*[a-x0-9]+,\s*e16,\s*mf2,\s*t[au],\s*m[au]\s+vwadd\.wx\s+v[0-9]+,\s*v[0-9]+,\s*[a-x0-9]+\s+} 1 } } */
+/* { dg-final { scan-assembler-times {vsetvli\s+zero,\s*[a-x0-9]+,\s*e16,\s*m1,\s*t[au],\s*m[au]\s+vwadd\.wx\s+v[0-9]+,\s*v[0-9]+,\s*[a-x0-9]+\s+} 1 } } */
+/* { dg-final { scan-assembler-times {vsetvli\s+zero,\s*[a-x0-9]+,\s*e16,\s*m2,\s*t[au],\s*m[au]\s+vwadd\.wx\s+v[0-9]+,\s*v[0-9]+,\s*[a-x0-9]+\s+} 1 } } */
+/* { dg-final { scan-assembler-times {vsetvli\s+zero,\s*[a-x0-9]+,\s*e16,\s*m4,\s*t[au],\s*m[au]\s+vwadd\.wx\s+v[0-9]+,\s*v[0-9]+,\s*[a-x0-9]+\s+} 1 } } */
+/* { dg-final { scan-assembler-times {vsetvli\s+zero,\s*[a-x0-9]+,\s*e32,\s*mf2,\s*t[au],\s*m[au]\s+vwadd\.wx\s+v[0-9]+,\s*v[0-9]+,\s*[a-x0-9]+\s+} 1 } } */
+/* { dg-final { scan-assembler-times {vsetvli\s+zero,\s*[a-x0-9]+,\s*e32,\s*m1,\s*t[au],\s*m[au]\s+vwadd\.wx\s+v[0-9]+,\s*v[0-9]+,\s*[a-x0-9]+\s+} 1 } } */
+/* { dg-final { scan-assembler-times {vsetvli\s+zero,\s*[a-x0-9]+,\s*e32,\s*m2,\s*t[au],\s*m[au]\s+vwadd\.wx\s+v[0-9]+,\s*v[0-9]+,\s*[a-x0-9]+\s+} 1 } } */
+/* { dg-final { scan-assembler-times {vsetvli\s+zero,\s*[a-x0-9]+,\s*e32,\s*m4,\s*t[au],\s*m[au]\s+vwadd\.wx\s+v[0-9]+,\s*v[0-9]+,\s*[a-x0-9]+\s+} 1 } } */
+/* { dg-final { scan-assembler-times {vsetvli\s+zero,\s*[a-x0-9]+,\s*e8,\s*mf8,\s*t[au],\s*m[au]\s+vwadd\.wx\s+v[0-9]+,\s*v[0-9]+,\s*[a-x0-9]+,\s*v0.t\s+} 1 } } */
+/* { dg-final { scan-assembler-times {vsetvli\s+zero,\s*[a-x0-9]+,\s*e8,\s*mf4,\s*t[au],\s*m[au]\s+vwadd\.wx\s+v[0-9]+,\s*v[0-9]+,\s*[a-x0-9]+,\s*v0.t\s+} 1 } } */
+/* { dg-final { scan-assembler-times {vsetvli\s+zero,\s*[a-x0-9]+,\s*e8,\s*mf2,\s*t[au],\s*m[au]\s+vwadd\.wx\s+v[0-9]+,\s*v[0-9]+,\s*[a-x0-9]+,\s*v0.t\s+} 1 } } */
+/* { dg-final { scan-assembler-times {vsetvli\s+zero,\s*[a-x0-9]+,\s*e8,\s*m1,\s*t[au],\s*m[au]\s+vwadd\.wx\s+v[0-9]+,\s*v[0-9]+,\s*[a-x0-9]+,\s*v0.t\s+} 1 } } */
+/* { dg-final { scan-assembler-times {vsetvli\s+zero,\s*[a-x0-9]+,\s*e8,\s*m2,\s*t[au],\s*m[au]\s+vwadd\.wx\s+v[0-9]+,\s*v[0-9]+,\s*[a-x0-9]+,\s*v0.t\s+} 1 } } */
+/* { dg-final { scan-assembler-times {vsetvli\s+zero,\s*[a-x0-9]+,\s*e8,\s*m4,\s*t[au],\s*m[au]\s+vwadd\.wx\s+v[0-9]+,\s*v[0-9]+,\s*[a-x0-9]+,\s*v0.t\s+} 1 } } */
+/* { dg-final { scan-assembler-times {vsetvli\s+zero,\s*[a-x0-9]+,\s*e16,\s*mf4,\s*t[au],\s*m[au]\s+vwadd\.wx\s+v[0-9]+,\s*v[0-9]+,\s*[a-x0-9]+,\s*v0.t\s+} 1 } } */
+/* { dg-final { scan-assembler-times {vsetvli\s+zero,\s*[a-x0-9]+,\s*e16,\s*mf2,\s*t[au],\s*m[au]\s+vwadd\.wx\s+v[0-9]+,\s*v[0-9]+,\s*[a-x0-9]+,\s*v0.t\s+} 1 } } */
+/* { dg-final { scan-assembler-times {vsetvli\s+zero,\s*[a-x0-9]+,\s*e16,\s*m1,\s*t[au],\s*m[au]\s+vwadd\.wx\s+v[0-9]+,\s*v[0-9]+,\s*[a-x0-9]+,\s*v0.t\s+} 1 } } */
+/* { dg-final { scan-assembler-times {vsetvli\s+zero,\s*[a-x0-9]+,\s*e16,\s*m2,\s*t[au],\s*m[au]\s+vwadd\.wx\s+v[0-9]+,\s*v[0-9]+,\s*[a-x0-9]+,\s*v0.t\s+} 1 } } */
+/* { dg-final { scan-assembler-times {vsetvli\s+zero,\s*[a-x0-9]+,\s*e16,\s*m4,\s*t[au],\s*m[au]\s+vwadd\.wx\s+v[0-9]+,\s*v[0-9]+,\s*[a-x0-9]+,\s*v0.t\s+} 1 } } */
+/* { dg-final { scan-assembler-times {vsetvli\s+zero,\s*[a-x0-9]+,\s*e32,\s*mf2,\s*t[au],\s*m[au]\s+vwadd\.wx\s+v[0-9]+,\s*v[0-9]+,\s*[a-x0-9]+,\s*v0.t\s+} 1 } } */
+/* { dg-final { scan-assembler-times {vsetvli\s+zero,\s*[a-x0-9]+,\s*e32,\s*m1,\s*t[au],\s*m[au]\s+vwadd\.wx\s+v[0-9]+,\s*v[0-9]+,\s*[a-x0-9]+,\s*v0.t\s+} 1 } } */
+/* { dg-final { scan-assembler-times {vsetvli\s+zero,\s*[a-x0-9]+,\s*e32,\s*m2,\s*t[au],\s*m[au]\s+vwadd\.wx\s+v[0-9]+,\s*v[0-9]+,\s*[a-x0-9]+,\s*v0.t\s+} 1 } } */
+/* { dg-final { scan-assembler-times {vsetvli\s+zero,\s*[a-x0-9]+,\s*e32,\s*m4,\s*t[au],\s*m[au]\s+vwadd\.wx\s+v[0-9]+,\s*v[0-9]+,\s*[a-x0-9]+,\s*v0.t\s+} 1 } } */
diff --git a/gcc/testsuite/g++.target/riscv/rvv/base/vwadd_wx_mu-1.C b/gcc/testsuite/g++.target/riscv/rvv/base/vwadd_wx_mu-1.C
new file mode 100644
index 00000000000..71d9f8cce9c
--- /dev/null
+++ b/gcc/testsuite/g++.target/riscv/rvv/base/vwadd_wx_mu-1.C
@@ -0,0 +1,111 @@
+/* { dg-do compile } */
+/* { dg-options "-march=rv32gcv -mabi=ilp32 -O3 -fno-schedule-insns -fno-schedule-insns2" } */
+
+#include "riscv_vector.h"
+
+vint16mf4_t test___riscv_vwadd_wx_mu(vbool64_t mask,vint16mf4_t merge,vint16mf4_t op1,int8_t op2,size_t vl)
+{
+    return __riscv_vwadd_wx_mu(mask,merge,op1,0xAA,vl);
+}
+
+
+vint16mf2_t test___riscv_vwadd_wx_mu(vbool32_t mask,vint16mf2_t merge,vint16mf2_t op1,int8_t op2,size_t vl)
+{
+    return __riscv_vwadd_wx_mu(mask,merge,op1,0xAA,vl);
+}
+
+
+vint16m1_t test___riscv_vwadd_wx_mu(vbool16_t mask,vint16m1_t merge,vint16m1_t op1,int8_t op2,size_t vl)
+{
+    return __riscv_vwadd_wx_mu(mask,merge,op1,0xAA,vl);
+}
+
+
+vint16m2_t test___riscv_vwadd_wx_mu(vbool8_t mask,vint16m2_t merge,vint16m2_t op1,int8_t op2,size_t vl)
+{
+    return __riscv_vwadd_wx_mu(mask,merge,op1,0xAA,vl);
+}
+
+
+vint16m4_t test___riscv_vwadd_wx_mu(vbool4_t mask,vint16m4_t merge,vint16m4_t op1,int8_t op2,size_t vl)
+{
+    return __riscv_vwadd_wx_mu(mask,merge,op1,0xAA,vl);
+}
+
+
+vint16m8_t test___riscv_vwadd_wx_mu(vbool2_t mask,vint16m8_t merge,vint16m8_t op1,int8_t op2,size_t vl)
+{
+    return __riscv_vwadd_wx_mu(mask,merge,op1,0xAA,vl);
+}
+
+
+vint32mf2_t test___riscv_vwadd_wx_mu(vbool64_t mask,vint32mf2_t merge,vint32mf2_t op1,int16_t op2,size_t vl)
+{
+    return __riscv_vwadd_wx_mu(mask,merge,op1,0xAA,vl);
+}
+
+
+vint32m1_t test___riscv_vwadd_wx_mu(vbool32_t mask,vint32m1_t merge,vint32m1_t op1,int16_t op2,size_t vl)
+{
+    return __riscv_vwadd_wx_mu(mask,merge,op1,0xAA,vl);
+}
+
+
+vint32m2_t test___riscv_vwadd_wx_mu(vbool16_t mask,vint32m2_t merge,vint32m2_t op1,int16_t op2,size_t vl)
+{
+    return __riscv_vwadd_wx_mu(mask,merge,op1,0xAA,vl);
+}
+
+
+vint32m4_t test___riscv_vwadd_wx_mu(vbool8_t mask,vint32m4_t merge,vint32m4_t op1,int16_t op2,size_t vl)
+{
+    return __riscv_vwadd_wx_mu(mask,merge,op1,0xAA,vl);
+}
+
+
+vint32m8_t test___riscv_vwadd_wx_mu(vbool4_t mask,vint32m8_t merge,vint32m8_t op1,int16_t op2,size_t vl)
+{
+    return __riscv_vwadd_wx_mu(mask,merge,op1,0xAA,vl);
+}
+
+
+vint64m1_t test___riscv_vwadd_wx_mu(vbool64_t mask,vint64m1_t merge,vint64m1_t op1,int32_t op2,size_t vl)
+{
+    return __riscv_vwadd_wx_mu(mask,merge,op1,0xAA,vl);
+}
+
+
+vint64m2_t test___riscv_vwadd_wx_mu(vbool32_t mask,vint64m2_t merge,vint64m2_t op1,int32_t op2,size_t vl)
+{
+    return __riscv_vwadd_wx_mu(mask,merge,op1,0xAA,vl);
+}
+
+
+vint64m4_t test___riscv_vwadd_wx_mu(vbool16_t mask,vint64m4_t merge,vint64m4_t op1,int32_t op2,size_t vl)
+{
+    return __riscv_vwadd_wx_mu(mask,merge,op1,0xAA,vl);
+}
+
+
+vint64m8_t test___riscv_vwadd_wx_mu(vbool8_t mask,vint64m8_t merge,vint64m8_t op1,int32_t op2,size_t vl)
+{
+    return __riscv_vwadd_wx_mu(mask,merge,op1,0xAA,vl);
+}
+
+
+
+/* { dg-final { scan-assembler-times {vsetvli\s+zero,\s*[a-x0-9]+,\s*e8,\s*mf8,\s*t[au],\s*mu\s+vwadd\.wx\s+v[0-9]+,\s*v[0-9]+,\s*[a-x0-9]+,\s*v0.t\s+} 1 } } */
+/* { dg-final { scan-assembler-times {vsetvli\s+zero,\s*[a-x0-9]+,\s*e8,\s*mf4,\s*t[au],\s*mu\s+vwadd\.wx\s+v[0-9]+,\s*v[0-9]+,\s*[a-x0-9]+,\s*v0.t\s+} 1 } } */
+/* { dg-final { scan-assembler-times {vsetvli\s+zero,\s*[a-x0-9]+,\s*e8,\s*mf2,\s*t[au],\s*mu\s+vwadd\.wx\s+v[0-9]+,\s*v[0-9]+,\s*[a-x0-9]+,\s*v0.t\s+} 1 } } */
+/* { dg-final { scan-assembler-times {vsetvli\s+zero,\s*[a-x0-9]+,\s*e8,\s*m1,\s*t[au],\s*mu\s+vwadd\.wx\s+v[0-9]+,\s*v[0-9]+,\s*[a-x0-9]+,\s*v0.t\s+} 1 } } */
+/* { dg-final { scan-assembler-times {vsetvli\s+zero,\s*[a-x0-9]+,\s*e8,\s*m2,\s*t[au],\s*mu\s+vwadd\.wx\s+v[0-9]+,\s*v[0-9]+,\s*[a-x0-9]+,\s*v0.t\s+} 1 } } */
+/* { dg-final { scan-assembler-times {vsetvli\s+zero,\s*[a-x0-9]+,\s*e8,\s*m4,\s*t[au],\s*mu\s+vwadd\.wx\s+v[0-9]+,\s*v[0-9]+,\s*[a-x0-9]+,\s*v0.t\s+} 1 } } */
+/* { dg-final { scan-assembler-times {vsetvli\s+zero,\s*[a-x0-9]+,\s*e16,\s*mf4,\s*t[au],\s*mu\s+vwadd\.wx\s+v[0-9]+,\s*v[0-9]+,\s*[a-x0-9]+,\s*v0.t\s+} 1 } } */
+/* { dg-final { scan-assembler-times {vsetvli\s+zero,\s*[a-x0-9]+,\s*e16,\s*mf2,\s*t[au],\s*mu\s+vwadd\.wx\s+v[0-9]+,\s*v[0-9]+,\s*[a-x0-9]+,\s*v0.t\s+} 1 } } */
+/* { dg-final { scan-assembler-times {vsetvli\s+zero,\s*[a-x0-9]+,\s*e16,\s*m1,\s*t[au],\s*mu\s+vwadd\.wx\s+v[0-9]+,\s*v[0-9]+,\s*[a-x0-9]+,\s*v0.t\s+} 1 } } */
+/* { dg-final { scan-assembler-times {vsetvli\s+zero,\s*[a-x0-9]+,\s*e16,\s*m2,\s*t[au],\s*mu\s+vwadd\.wx\s+v[0-9]+,\s*v[0-9]+,\s*[a-x0-9]+,\s*v0.t\s+} 1 } } */
+/* { dg-final { scan-assembler-times {vsetvli\s+zero,\s*[a-x0-9]+,\s*e16,\s*m4,\s*t[au],\s*mu\s+vwadd\.wx\s+v[0-9]+,\s*v[0-9]+,\s*[a-x0-9]+,\s*v0.t\s+} 1 } } */
+/* { dg-final { scan-assembler-times {vsetvli\s+zero,\s*[a-x0-9]+,\s*e32,\s*mf2,\s*t[au],\s*mu\s+vwadd\.wx\s+v[0-9]+,\s*v[0-9]+,\s*[a-x0-9]+,\s*v0.t\s+} 1 } } */
+/* { dg-final { scan-assembler-times {vsetvli\s+zero,\s*[a-x0-9]+,\s*e32,\s*m1,\s*t[au],\s*mu\s+vwadd\.wx\s+v[0-9]+,\s*v[0-9]+,\s*[a-x0-9]+,\s*v0.t\s+} 1 } } */
+/* { dg-final { scan-assembler-times {vsetvli\s+zero,\s*[a-x0-9]+,\s*e32,\s*m2,\s*t[au],\s*mu\s+vwadd\.wx\s+v[0-9]+,\s*v[0-9]+,\s*[a-x0-9]+,\s*v0.t\s+} 1 } } */
+/* { dg-final { scan-assembler-times {vsetvli\s+zero,\s*[a-x0-9]+,\s*e32,\s*m4,\s*t[au],\s*mu\s+vwadd\.wx\s+v[0-9]+,\s*v[0-9]+,\s*[a-x0-9]+,\s*v0.t\s+} 1 } } */
diff --git a/gcc/testsuite/g++.target/riscv/rvv/base/vwadd_wx_mu-2.C b/gcc/testsuite/g++.target/riscv/rvv/base/vwadd_wx_mu-2.C
new file mode 100644
index 00000000000..256270a1761
--- /dev/null
+++ b/gcc/testsuite/g++.target/riscv/rvv/base/vwadd_wx_mu-2.C
@@ -0,0 +1,111 @@
+/* { dg-do compile } */
+/* { dg-options "-march=rv32gcv -mabi=ilp32 -O3 -fno-schedule-insns -fno-schedule-insns2" } */
+
+#include "riscv_vector.h"
+
+vint16mf4_t test___riscv_vwadd_wx_mu(vbool64_t mask,vint16mf4_t merge,vint16mf4_t op1,int8_t op2,size_t vl)
+{
+    return __riscv_vwadd_wx_mu(mask,merge,op1,0xAA,31);
+}
+
+
+vint16mf2_t test___riscv_vwadd_wx_mu(vbool32_t mask,vint16mf2_t merge,vint16mf2_t op1,int8_t op2,size_t vl)
+{
+    return __riscv_vwadd_wx_mu(mask,merge,op1,0xAA,31);
+}
+
+
+vint16m1_t test___riscv_vwadd_wx_mu(vbool16_t mask,vint16m1_t merge,vint16m1_t op1,int8_t op2,size_t vl)
+{
+    return __riscv_vwadd_wx_mu(mask,merge,op1,0xAA,31);
+}
+
+
+vint16m2_t test___riscv_vwadd_wx_mu(vbool8_t mask,vint16m2_t merge,vint16m2_t op1,int8_t op2,size_t vl)
+{
+    return __riscv_vwadd_wx_mu(mask,merge,op1,0xAA,31);
+}
+
+
+vint16m4_t test___riscv_vwadd_wx_mu(vbool4_t mask,vint16m4_t merge,vint16m4_t op1,int8_t op2,size_t vl)
+{
+    return __riscv_vwadd_wx_mu(mask,merge,op1,0xAA,31);
+}
+
+
+vint16m8_t test___riscv_vwadd_wx_mu(vbool2_t mask,vint16m8_t merge,vint16m8_t op1,int8_t op2,size_t vl)
+{
+    return __riscv_vwadd_wx_mu(mask,merge,op1,0xAA,31);
+}
+
+
+vint32mf2_t test___riscv_vwadd_wx_mu(vbool64_t mask,vint32mf2_t merge,vint32mf2_t op1,int16_t op2,size_t vl)
+{
+    return __riscv_vwadd_wx_mu(mask,merge,op1,0xAA,31);
+}
+
+
+vint32m1_t test___riscv_vwadd_wx_mu(vbool32_t mask,vint32m1_t merge,vint32m1_t op1,int16_t op2,size_t vl)
+{
+    return __riscv_vwadd_wx_mu(mask,merge,op1,0xAA,31);
+}
+
+
+vint32m2_t test___riscv_vwadd_wx_mu(vbool16_t mask,vint32m2_t merge,vint32m2_t op1,int16_t op2,size_t vl)
+{
+    return __riscv_vwadd_wx_mu(mask,merge,op1,0xAA,31);
+}
+
+
+vint32m4_t test___riscv_vwadd_wx_mu(vbool8_t mask,vint32m4_t merge,vint32m4_t op1,int16_t op2,size_t vl)
+{
+    return __riscv_vwadd_wx_mu(mask,merge,op1,0xAA,31);
+}
+
+
+vint32m8_t test___riscv_vwadd_wx_mu(vbool4_t mask,vint32m8_t merge,vint32m8_t op1,int16_t op2,size_t vl)
+{
+    return __riscv_vwadd_wx_mu(mask,merge,op1,0xAA,31);
+}
+
+
+vint64m1_t test___riscv_vwadd_wx_mu(vbool64_t mask,vint64m1_t merge,vint64m1_t op1,int32_t op2,size_t vl)
+{
+    return __riscv_vwadd_wx_mu(mask,merge,op1,0xAA,31);
+}
+
+
+vint64m2_t test___riscv_vwadd_wx_mu(vbool32_t mask,vint64m2_t merge,vint64m2_t op1,int32_t op2,size_t vl)
+{
+    return __riscv_vwadd_wx_mu(mask,merge,op1,0xAA,31);
+}
+
+
+vint64m4_t test___riscv_vwadd_wx_mu(vbool16_t mask,vint64m4_t merge,vint64m4_t op1,int32_t op2,size_t vl)
+{
+    return __riscv_vwadd_wx_mu(mask,merge,op1,0xAA,31);
+}
+
+
+vint64m8_t test___riscv_vwadd_wx_mu(vbool8_t mask,vint64m8_t merge,vint64m8_t op1,int32_t op2,size_t vl)
+{
+    return __riscv_vwadd_wx_mu(mask,merge,op1,0xAA,31);
+}
+
+
+
+/* { dg-final { scan-assembler-times {vsetivli\s+zero,\s*31,\s*e8,\s*mf8,\s*t[au],\s*mu\s+vwadd\.wx\s+v[0-9]+,\s*v[0-9]+,\s*[a-x0-9]+,\s*v0.t\s+} 1 } } */
+/* { dg-final { scan-assembler-times {vsetivli\s+zero,\s*31,\s*e8,\s*mf4,\s*t[au],\s*mu\s+vwadd\.wx\s+v[0-9]+,\s*v[0-9]+,\s*[a-x0-9]+,\s*v0.t\s+} 1 } } */
+/* { dg-final { scan-assembler-times {vsetivli\s+zero,\s*31,\s*e8,\s*mf2,\s*t[au],\s*mu\s+vwadd\.wx\s+v[0-9]+,\s*v[0-9]+,\s*[a-x0-9]+,\s*v0.t\s+} 1 } } */
+/* { dg-final { scan-assembler-times {vsetivli\s+zero,\s*31,\s*e8,\s*m1,\s*t[au],\s*mu\s+vwadd\.wx\s+v[0-9]+,\s*v[0-9]+,\s*[a-x0-9]+,\s*v0.t\s+} 1 } } */
+/* { dg-final { scan-assembler-times {vsetivli\s+zero,\s*31,\s*e8,\s*m2,\s*t[au],\s*mu\s+vwadd\.wx\s+v[0-9]+,\s*v[0-9]+,\s*[a-x0-9]+,\s*v0.t\s+} 1 } } */
+/* { dg-final { scan-assembler-times {vsetivli\s+zero,\s*31,\s*e8,\s*m4,\s*t[au],\s*mu\s+vwadd\.wx\s+v[0-9]+,\s*v[0-9]+,\s*[a-x0-9]+,\s*v0.t\s+} 1 } } */
+/* { dg-final { scan-assembler-times {vsetivli\s+zero,\s*31,\s*e16,\s*mf4,\s*t[au],\s*mu\s+vwadd\.wx\s+v[0-9]+,\s*v[0-9]+,\s*[a-x0-9]+,\s*v0.t\s+} 1 } } */
+/* { dg-final { scan-assembler-times {vsetivli\s+zero,\s*31,\s*e16,\s*mf2,\s*t[au],\s*mu\s+vwadd\.wx\s+v[0-9]+,\s*v[0-9]+,\s*[a-x0-9]+,\s*v0.t\s+} 1 } } */
+/* { dg-final { scan-assembler-times {vsetivli\s+zero,\s*31,\s*e16,\s*m1,\s*t[au],\s*mu\s+vwadd\.wx\s+v[0-9]+,\s*v[0-9]+,\s*[a-x0-9]+,\s*v0.t\s+} 1 } } */
+/* { dg-final { scan-assembler-times {vsetivli\s+zero,\s*31,\s*e16,\s*m2,\s*t[au],\s*mu\s+vwadd\.wx\s+v[0-9]+,\s*v[0-9]+,\s*[a-x0-9]+,\s*v0.t\s+} 1 } } */
+/* { dg-final { scan-assembler-times {vsetivli\s+zero,\s*31,\s*e16,\s*m4,\s*t[au],\s*mu\s+vwadd\.wx\s+v[0-9]+,\s*v[0-9]+,\s*[a-x0-9]+,\s*v0.t\s+} 1 } } */
+/* { dg-final { scan-assembler-times {vsetivli\s+zero,\s*31,\s*e32,\s*mf2,\s*t[au],\s*mu\s+vwadd\.wx\s+v[0-9]+,\s*v[0-9]+,\s*[a-x0-9]+,\s*v0.t\s+} 1 } } */
+/* { dg-final { scan-assembler-times {vsetivli\s+zero,\s*31,\s*e32,\s*m1,\s*t[au],\s*mu\s+vwadd\.wx\s+v[0-9]+,\s*v[0-9]+,\s*[a-x0-9]+,\s*v0.t\s+} 1 } } */
+/* { dg-final { scan-assembler-times {vsetivli\s+zero,\s*31,\s*e32,\s*m2,\s*t[au],\s*mu\s+vwadd\.wx\s+v[0-9]+,\s*v[0-9]+,\s*[a-x0-9]+,\s*v0.t\s+} 1 } } */
+/* { dg-final { scan-assembler-times {vsetivli\s+zero,\s*31,\s*e32,\s*m4,\s*t[au],\s*mu\s+vwadd\.wx\s+v[0-9]+,\s*v[0-9]+,\s*[a-x0-9]+,\s*v0.t\s+} 1 } } */
diff --git a/gcc/testsuite/g++.target/riscv/rvv/base/vwadd_wx_mu-3.C b/gcc/testsuite/g++.target/riscv/rvv/base/vwadd_wx_mu-3.C
new file mode 100644
index 00000000000..2c72c250707
--- /dev/null
+++ b/gcc/testsuite/g++.target/riscv/rvv/base/vwadd_wx_mu-3.C
@@ -0,0 +1,111 @@
+/* { dg-do compile } */
+/* { dg-options "-march=rv32gcv -mabi=ilp32 -O3 -fno-schedule-insns -fno-schedule-insns2" } */
+
+#include "riscv_vector.h"
+
+vint16mf4_t test___riscv_vwadd_wx_mu(vbool64_t mask,vint16mf4_t merge,vint16mf4_t op1,int8_t op2,size_t vl)
+{
+    return __riscv_vwadd_wx_mu(mask,merge,op1,0xAA,32);
+}
+
+
+vint16mf2_t test___riscv_vwadd_wx_mu(vbool32_t mask,vint16mf2_t merge,vint16mf2_t op1,int8_t op2,size_t vl)
+{
+    return __riscv_vwadd_wx_mu(mask,merge,op1,0xAA,32);
+}
+
+
+vint16m1_t test___riscv_vwadd_wx_mu(vbool16_t mask,vint16m1_t merge,vint16m1_t op1,int8_t op2,size_t vl)
+{
+    return __riscv_vwadd_wx_mu(mask,merge,op1,0xAA,32);
+}
+
+
+vint16m2_t test___riscv_vwadd_wx_mu(vbool8_t mask,vint16m2_t merge,vint16m2_t op1,int8_t op2,size_t vl)
+{
+    return __riscv_vwadd_wx_mu(mask,merge,op1,0xAA,32);
+}
+
+
+vint16m4_t test___riscv_vwadd_wx_mu(vbool4_t mask,vint16m4_t merge,vint16m4_t op1,int8_t op2,size_t vl)
+{
+    return __riscv_vwadd_wx_mu(mask,merge,op1,0xAA,32);
+}
+
+
+vint16m8_t test___riscv_vwadd_wx_mu(vbool2_t mask,vint16m8_t merge,vint16m8_t op1,int8_t op2,size_t vl)
+{
+    return __riscv_vwadd_wx_mu(mask,merge,op1,0xAA,32);
+}
+
+
+vint32mf2_t test___riscv_vwadd_wx_mu(vbool64_t mask,vint32mf2_t merge,vint32mf2_t op1,int16_t op2,size_t vl)
+{
+    return __riscv_vwadd_wx_mu(mask,merge,op1,0xAA,32);
+}
+
+
+vint32m1_t test___riscv_vwadd_wx_mu(vbool32_t mask,vint32m1_t merge,vint32m1_t op1,int16_t op2,size_t vl)
+{
+    return __riscv_vwadd_wx_mu(mask,merge,op1,0xAA,32);
+}
+
+
+vint32m2_t test___riscv_vwadd_wx_mu(vbool16_t mask,vint32m2_t merge,vint32m2_t op1,int16_t op2,size_t vl)
+{
+    return __riscv_vwadd_wx_mu(mask,merge,op1,0xAA,32);
+}
+
+
+vint32m4_t test___riscv_vwadd_wx_mu(vbool8_t mask,vint32m4_t merge,vint32m4_t op1,int16_t op2,size_t vl)
+{
+    return __riscv_vwadd_wx_mu(mask,merge,op1,0xAA,32);
+}
+
+
+vint32m8_t test___riscv_vwadd_wx_mu(vbool4_t mask,vint32m8_t merge,vint32m8_t op1,int16_t op2,size_t vl)
+{
+    return __riscv_vwadd_wx_mu(mask,merge,op1,0xAA,32);
+}
+
+
+vint64m1_t test___riscv_vwadd_wx_mu(vbool64_t mask,vint64m1_t merge,vint64m1_t op1,int32_t op2,size_t vl)
+{
+    return __riscv_vwadd_wx_mu(mask,merge,op1,0xAA,32);
+}
+
+
+vint64m2_t test___riscv_vwadd_wx_mu(vbool32_t mask,vint64m2_t merge,vint64m2_t op1,int32_t op2,size_t vl)
+{
+    return __riscv_vwadd_wx_mu(mask,merge,op1,0xAA,32);
+}
+
+
+vint64m4_t test___riscv_vwadd_wx_mu(vbool16_t mask,vint64m4_t merge,vint64m4_t op1,int32_t op2,size_t vl)
+{
+    return __riscv_vwadd_wx_mu(mask,merge,op1,0xAA,32);
+}
+
+
+vint64m8_t test___riscv_vwadd_wx_mu(vbool8_t mask,vint64m8_t merge,vint64m8_t op1,int32_t op2,size_t vl)
+{
+    return __riscv_vwadd_wx_mu(mask,merge,op1,0xAA,32);
+}
+
+
+
+/* { dg-final { scan-assembler-times {vsetvli\s+zero,\s*[a-x0-9]+,\s*e8,\s*mf8,\s*t[au],\s*mu\s+vwadd\.wx\s+v[0-9]+,\s*v[0-9]+,\s*[a-x0-9]+,\s*v0.t\s+} 1 } } */
+/* { dg-final { scan-assembler-times {vsetvli\s+zero,\s*[a-x0-9]+,\s*e8,\s*mf4,\s*t[au],\s*mu\s+vwadd\.wx\s+v[0-9]+,\s*v[0-9]+,\s*[a-x0-9]+,\s*v0.t\s+} 1 } } */
+/* { dg-final { scan-assembler-times {vsetvli\s+zero,\s*[a-x0-9]+,\s*e8,\s*mf2,\s*t[au],\s*mu\s+vwadd\.wx\s+v[0-9]+,\s*v[0-9]+,\s*[a-x0-9]+,\s*v0.t\s+} 1 } } */
+/* { dg-final { scan-assembler-times {vsetvli\s+zero,\s*[a-x0-9]+,\s*e8,\s*m1,\s*t[au],\s*mu\s+vwadd\.wx\s+v[0-9]+,\s*v[0-9]+,\s*[a-x0-9]+,\s*v0.t\s+} 1 } } */
+/* { dg-final { scan-assembler-times {vsetvli\s+zero,\s*[a-x0-9]+,\s*e8,\s*m2,\s*t[au],\s*mu\s+vwadd\.wx\s+v[0-9]+,\s*v[0-9]+,\s*[a-x0-9]+,\s*v0.t\s+} 1 } } */
+/* { dg-final { scan-assembler-times {vsetvli\s+zero,\s*[a-x0-9]+,\s*e8,\s*m4,\s*t[au],\s*mu\s+vwadd\.wx\s+v[0-9]+,\s*v[0-9]+,\s*[a-x0-9]+,\s*v0.t\s+} 1 } } */
+/* { dg-final { scan-assembler-times {vsetvli\s+zero,\s*[a-x0-9]+,\s*e16,\s*mf4,\s*t[au],\s*mu\s+vwadd\.wx\s+v[0-9]+,\s*v[0-9]+,\s*[a-x0-9]+,\s*v0.t\s+} 1 } } */
+/* { dg-final { scan-assembler-times {vsetvli\s+zero,\s*[a-x0-9]+,\s*e16,\s*mf2,\s*t[au],\s*mu\s+vwadd\.wx\s+v[0-9]+,\s*v[0-9]+,\s*[a-x0-9]+,\s*v0.t\s+} 1 } } */
+/* { dg-final { scan-assembler-times {vsetvli\s+zero,\s*[a-x0-9]+,\s*e16,\s*m1,\s*t[au],\s*mu\s+vwadd\.wx\s+v[0-9]+,\s*v[0-9]+,\s*[a-x0-9]+,\s*v0.t\s+} 1 } } */
+/* { dg-final { scan-assembler-times {vsetvli\s+zero,\s*[a-x0-9]+,\s*e16,\s*m2,\s*t[au],\s*mu\s+vwadd\.wx\s+v[0-9]+,\s*v[0-9]+,\s*[a-x0-9]+,\s*v0.t\s+} 1 } } */
+/* { dg-final { scan-assembler-times {vsetvli\s+zero,\s*[a-x0-9]+,\s*e16,\s*m4,\s*t[au],\s*mu\s+vwadd\.wx\s+v[0-9]+,\s*v[0-9]+,\s*[a-x0-9]+,\s*v0.t\s+} 1 } } */
+/* { dg-final { scan-assembler-times {vsetvli\s+zero,\s*[a-x0-9]+,\s*e32,\s*mf2,\s*t[au],\s*mu\s+vwadd\.wx\s+v[0-9]+,\s*v[0-9]+,\s*[a-x0-9]+,\s*v0.t\s+} 1 } } */
+/* { dg-final { scan-assembler-times {vsetvli\s+zero,\s*[a-x0-9]+,\s*e32,\s*m1,\s*t[au],\s*mu\s+vwadd\.wx\s+v[0-9]+,\s*v[0-9]+,\s*[a-x0-9]+,\s*v0.t\s+} 1 } } */
+/* { dg-final { scan-assembler-times {vsetvli\s+zero,\s*[a-x0-9]+,\s*e32,\s*m2,\s*t[au],\s*mu\s+vwadd\.wx\s+v[0-9]+,\s*v[0-9]+,\s*[a-x0-9]+,\s*v0.t\s+} 1 } } */
+/* { dg-final { scan-assembler-times {vsetvli\s+zero,\s*[a-x0-9]+,\s*e32,\s*m4,\s*t[au],\s*mu\s+vwadd\.wx\s+v[0-9]+,\s*v[0-9]+,\s*[a-x0-9]+,\s*v0.t\s+} 1 } } */
diff --git a/gcc/testsuite/g++.target/riscv/rvv/base/vwadd_wx_tu-1.C b/gcc/testsuite/g++.target/riscv/rvv/base/vwadd_wx_tu-1.C
new file mode 100644
index 00000000000..8ee81865291
--- /dev/null
+++ b/gcc/testsuite/g++.target/riscv/rvv/base/vwadd_wx_tu-1.C
@@ -0,0 +1,111 @@
+/* { dg-do compile } */
+/* { dg-options "-march=rv32gcv -mabi=ilp32 -O3 -fno-schedule-insns -fno-schedule-insns2" } */
+
+#include "riscv_vector.h"
+
+vint16mf4_t test___riscv_vwadd_wx_tu(vint16mf4_t merge,vint16mf4_t op1,int8_t op2,size_t vl)
+{
+    return __riscv_vwadd_wx_tu(merge,op1,0xAA,vl);
+}
+
+
+vint16mf2_t test___riscv_vwadd_wx_tu(vint16mf2_t merge,vint16mf2_t op1,int8_t op2,size_t vl)
+{
+    return __riscv_vwadd_wx_tu(merge,op1,0xAA,vl);
+}
+
+
+vint16m1_t test___riscv_vwadd_wx_tu(vint16m1_t merge,vint16m1_t op1,int8_t op2,size_t vl)
+{
+    return __riscv_vwadd_wx_tu(merge,op1,0xAA,vl);
+}
+
+
+vint16m2_t test___riscv_vwadd_wx_tu(vint16m2_t merge,vint16m2_t op1,int8_t op2,size_t vl)
+{
+    return __riscv_vwadd_wx_tu(merge,op1,0xAA,vl);
+}
+
+
+vint16m4_t test___riscv_vwadd_wx_tu(vint16m4_t merge,vint16m4_t op1,int8_t op2,size_t vl)
+{
+    return __riscv_vwadd_wx_tu(merge,op1,0xAA,vl);
+}
+
+
+vint16m8_t test___riscv_vwadd_wx_tu(vint16m8_t merge,vint16m8_t op1,int8_t op2,size_t vl)
+{
+    return __riscv_vwadd_wx_tu(merge,op1,0xAA,vl);
+}
+
+
+vint32mf2_t test___riscv_vwadd_wx_tu(vint32mf2_t merge,vint32mf2_t op1,int16_t op2,size_t vl)
+{
+    return __riscv_vwadd_wx_tu(merge,op1,0xAA,vl);
+}
+
+
+vint32m1_t test___riscv_vwadd_wx_tu(vint32m1_t merge,vint32m1_t op1,int16_t op2,size_t vl)
+{
+    return __riscv_vwadd_wx_tu(merge,op1,0xAA,vl);
+}
+
+
+vint32m2_t test___riscv_vwadd_wx_tu(vint32m2_t merge,vint32m2_t op1,int16_t op2,size_t vl)
+{
+    return __riscv_vwadd_wx_tu(merge,op1,0xAA,vl);
+}
+
+
+vint32m4_t test___riscv_vwadd_wx_tu(vint32m4_t merge,vint32m4_t op1,int16_t op2,size_t vl)
+{
+    return __riscv_vwadd_wx_tu(merge,op1,0xAA,vl);
+}
+
+
+vint32m8_t test___riscv_vwadd_wx_tu(vint32m8_t merge,vint32m8_t op1,int16_t op2,size_t vl)
+{
+    return __riscv_vwadd_wx_tu(merge,op1,0xAA,vl);
+}
+
+
+vint64m1_t test___riscv_vwadd_wx_tu(vint64m1_t merge,vint64m1_t op1,int32_t op2,size_t vl)
+{
+    return __riscv_vwadd_wx_tu(merge,op1,0xAA,vl);
+}
+
+
+vint64m2_t test___riscv_vwadd_wx_tu(vint64m2_t merge,vint64m2_t op1,int32_t op2,size_t vl)
+{
+    return __riscv_vwadd_wx_tu(merge,op1,0xAA,vl);
+}
+
+
+vint64m4_t test___riscv_vwadd_wx_tu(vint64m4_t merge,vint64m4_t op1,int32_t op2,size_t vl)
+{
+    return __riscv_vwadd_wx_tu(merge,op1,0xAA,vl);
+}
+
+
+vint64m8_t test___riscv_vwadd_wx_tu(vint64m8_t merge,vint64m8_t op1,int32_t op2,size_t vl)
+{
+    return __riscv_vwadd_wx_tu(merge,op1,0xAA,vl);
+}
+
+
+
+/* { dg-final { scan-assembler-times {vsetvli\s+zero,\s*[a-x0-9]+,\s*e8,\s*mf8,\s*tu,\s*m[au]\s+vwadd\.wx\s+v[0-9]+,\s*v[0-9]+,\s*[a-x0-9]+\s+} 1 } } */
+/* { dg-final { scan-assembler-times {vsetvli\s+zero,\s*[a-x0-9]+,\s*e8,\s*mf4,\s*tu,\s*m[au]\s+vwadd\.wx\s+v[0-9]+,\s*v[0-9]+,\s*[a-x0-9]+\s+} 1 } } */
+/* { dg-final { scan-assembler-times {vsetvli\s+zero,\s*[a-x0-9]+,\s*e8,\s*mf2,\s*tu,\s*m[au]\s+vwadd\.wx\s+v[0-9]+,\s*v[0-9]+,\s*[a-x0-9]+\s+} 1 } } */
+/* { dg-final { scan-assembler-times {vsetvli\s+zero,\s*[a-x0-9]+,\s*e8,\s*m1,\s*tu,\s*m[au]\s+vwadd\.wx\s+v[0-9]+,\s*v[0-9]+,\s*[a-x0-9]+\s+} 1 } } */
+/* { dg-final { scan-assembler-times {vsetvli\s+zero,\s*[a-x0-9]+,\s*e8,\s*m2,\s*tu,\s*m[au]\s+vwadd\.wx\s+v[0-9]+,\s*v[0-9]+,\s*[a-x0-9]+\s+} 1 } } */
+/* { dg-final { scan-assembler-times {vsetvli\s+zero,\s*[a-x0-9]+,\s*e8,\s*m4,\s*tu,\s*m[au]\s+vwadd\.wx\s+v[0-9]+,\s*v[0-9]+,\s*[a-x0-9]+\s+} 1 } } */
+/* { dg-final { scan-assembler-times {vsetvli\s+zero,\s*[a-x0-9]+,\s*e16,\s*mf4,\s*tu,\s*m[au]\s+vwadd\.wx\s+v[0-9]+,\s*v[0-9]+,\s*[a-x0-9]+\s+} 1 } } */
+/* { dg-final { scan-assembler-times {vsetvli\s+zero,\s*[a-x0-9]+,\s*e16,\s*mf2,\s*tu,\s*m[au]\s+vwadd\.wx\s+v[0-9]+,\s*v[0-9]+,\s*[a-x0-9]+\s+} 1 } } */
+/* { dg-final { scan-assembler-times {vsetvli\s+zero,\s*[a-x0-9]+,\s*e16,\s*m1,\s*tu,\s*m[au]\s+vwadd\.wx\s+v[0-9]+,\s*v[0-9]+,\s*[a-x0-9]+\s+} 1 } } */
+/* { dg-final { scan-assembler-times {vsetvli\s+zero,\s*[a-x0-9]+,\s*e16,\s*m2,\s*tu,\s*m[au]\s+vwadd\.wx\s+v[0-9]+,\s*v[0-9]+,\s*[a-x0-9]+\s+} 1 } } */
+/* { dg-final { scan-assembler-times {vsetvli\s+zero,\s*[a-x0-9]+,\s*e16,\s*m4,\s*tu,\s*m[au]\s+vwadd\.wx\s+v[0-9]+,\s*v[0-9]+,\s*[a-x0-9]+\s+} 1 } } */
+/* { dg-final { scan-assembler-times {vsetvli\s+zero,\s*[a-x0-9]+,\s*e32,\s*mf2,\s*tu,\s*m[au]\s+vwadd\.wx\s+v[0-9]+,\s*v[0-9]+,\s*[a-x0-9]+\s+} 1 } } */
+/* { dg-final { scan-assembler-times {vsetvli\s+zero,\s*[a-x0-9]+,\s*e32,\s*m1,\s*tu,\s*m[au]\s+vwadd\.wx\s+v[0-9]+,\s*v[0-9]+,\s*[a-x0-9]+\s+} 1 } } */
+/* { dg-final { scan-assembler-times {vsetvli\s+zero,\s*[a-x0-9]+,\s*e32,\s*m2,\s*tu,\s*m[au]\s+vwadd\.wx\s+v[0-9]+,\s*v[0-9]+,\s*[a-x0-9]+\s+} 1 } } */
+/* { dg-final { scan-assembler-times {vsetvli\s+zero,\s*[a-x0-9]+,\s*e32,\s*m4,\s*tu,\s*m[au]\s+vwadd\.wx\s+v[0-9]+,\s*v[0-9]+,\s*[a-x0-9]+\s+} 1 } } */
diff --git a/gcc/testsuite/g++.target/riscv/rvv/base/vwadd_wx_tu-2.C b/gcc/testsuite/g++.target/riscv/rvv/base/vwadd_wx_tu-2.C
new file mode 100644
index 00000000000..284f4b07320
--- /dev/null
+++ b/gcc/testsuite/g++.target/riscv/rvv/base/vwadd_wx_tu-2.C
@@ -0,0 +1,111 @@
+/* { dg-do compile } */
+/* { dg-options "-march=rv32gcv -mabi=ilp32 -O3 -fno-schedule-insns -fno-schedule-insns2" } */
+
+#include "riscv_vector.h"
+
+vint16mf4_t test___riscv_vwadd_wx_tu(vint16mf4_t merge,vint16mf4_t op1,int8_t op2,size_t vl)
+{
+    return __riscv_vwadd_wx_tu(merge,op1,0xAA,31);
+}
+
+
+vint16mf2_t test___riscv_vwadd_wx_tu(vint16mf2_t merge,vint16mf2_t op1,int8_t op2,size_t vl)
+{
+    return __riscv_vwadd_wx_tu(merge,op1,0xAA,31);
+}
+
+
+vint16m1_t test___riscv_vwadd_wx_tu(vint16m1_t merge,vint16m1_t op1,int8_t op2,size_t vl)
+{
+    return __riscv_vwadd_wx_tu(merge,op1,0xAA,31);
+}
+
+
+vint16m2_t test___riscv_vwadd_wx_tu(vint16m2_t merge,vint16m2_t op1,int8_t op2,size_t vl)
+{
+    return __riscv_vwadd_wx_tu(merge,op1,0xAA,31);
+}
+
+
+vint16m4_t test___riscv_vwadd_wx_tu(vint16m4_t merge,vint16m4_t op1,int8_t op2,size_t vl)
+{
+    return __riscv_vwadd_wx_tu(merge,op1,0xAA,31);
+}
+
+
+vint16m8_t test___riscv_vwadd_wx_tu(vint16m8_t merge,vint16m8_t op1,int8_t op2,size_t vl)
+{
+    return __riscv_vwadd_wx_tu(merge,op1,0xAA,31);
+}
+
+
+vint32mf2_t test___riscv_vwadd_wx_tu(vint32mf2_t merge,vint32mf2_t op1,int16_t op2,size_t vl)
+{
+    return __riscv_vwadd_wx_tu(merge,op1,0xAA,31);
+}
+
+
+vint32m1_t test___riscv_vwadd_wx_tu(vint32m1_t merge,vint32m1_t op1,int16_t op2,size_t vl)
+{
+    return __riscv_vwadd_wx_tu(merge,op1,0xAA,31);
+}
+
+
+vint32m2_t test___riscv_vwadd_wx_tu(vint32m2_t merge,vint32m2_t op1,int16_t op2,size_t vl)
+{
+    return __riscv_vwadd_wx_tu(merge,op1,0xAA,31);
+}
+
+
+vint32m4_t test___riscv_vwadd_wx_tu(vint32m4_t merge,vint32m4_t op1,int16_t op2,size_t vl)
+{
+    return __riscv_vwadd_wx_tu(merge,op1,0xAA,31);
+}
+
+
+vint32m8_t test___riscv_vwadd_wx_tu(vint32m8_t merge,vint32m8_t op1,int16_t op2,size_t vl)
+{
+    return __riscv_vwadd_wx_tu(merge,op1,0xAA,31);
+}
+
+
+vint64m1_t test___riscv_vwadd_wx_tu(vint64m1_t merge,vint64m1_t op1,int32_t op2,size_t vl)
+{
+    return __riscv_vwadd_wx_tu(merge,op1,0xAA,31);
+}
+
+
+vint64m2_t test___riscv_vwadd_wx_tu(vint64m2_t merge,vint64m2_t op1,int32_t op2,size_t vl)
+{
+    return __riscv_vwadd_wx_tu(merge,op1,0xAA,31);
+}
+
+
+vint64m4_t test___riscv_vwadd_wx_tu(vint64m4_t merge,vint64m4_t op1,int32_t op2,size_t vl)
+{
+    return __riscv_vwadd_wx_tu(merge,op1,0xAA,31);
+}
+
+
+vint64m8_t test___riscv_vwadd_wx_tu(vint64m8_t merge,vint64m8_t op1,int32_t op2,size_t vl)
+{
+    return __riscv_vwadd_wx_tu(merge,op1,0xAA,31);
+}
+
+
+
+/* { dg-final { scan-assembler-times {vsetivli\s+zero,\s*31,\s*e8,\s*mf8,\s*tu,\s*m[au]\s+vwadd\.wx\s+v[0-9]+,\s*v[0-9]+,\s*[a-x0-9]+\s+} 1 } } */
+/* { dg-final { scan-assembler-times {vsetivli\s+zero,\s*31,\s*e8,\s*mf4,\s*tu,\s*m[au]\s+vwadd\.wx\s+v[0-9]+,\s*v[0-9]+,\s*[a-x0-9]+\s+} 1 } } */
+/* { dg-final { scan-assembler-times {vsetivli\s+zero,\s*31,\s*e8,\s*mf2,\s*tu,\s*m[au]\s+vwadd\.wx\s+v[0-9]+,\s*v[0-9]+,\s*[a-x0-9]+\s+} 1 } } */
+/* { dg-final { scan-assembler-times {vsetivli\s+zero,\s*31,\s*e8,\s*m1,\s*tu,\s*m[au]\s+vwadd\.wx\s+v[0-9]+,\s*v[0-9]+,\s*[a-x0-9]+\s+} 1 } } */
+/* { dg-final { scan-assembler-times {vsetivli\s+zero,\s*31,\s*e8,\s*m2,\s*tu,\s*m[au]\s+vwadd\.wx\s+v[0-9]+,\s*v[0-9]+,\s*[a-x0-9]+\s+} 1 } } */
+/* { dg-final { scan-assembler-times {vsetivli\s+zero,\s*31,\s*e8,\s*m4,\s*tu,\s*m[au]\s+vwadd\.wx\s+v[0-9]+,\s*v[0-9]+,\s*[a-x0-9]+\s+} 1 } } */
+/* { dg-final { scan-assembler-times {vsetivli\s+zero,\s*31,\s*e16,\s*mf4,\s*tu,\s*m[au]\s+vwadd\.wx\s+v[0-9]+,\s*v[0-9]+,\s*[a-x0-9]+\s+} 1 } } */
+/* { dg-final { scan-assembler-times {vsetivli\s+zero,\s*31,\s*e16,\s*mf2,\s*tu,\s*m[au]\s+vwadd\.wx\s+v[0-9]+,\s*v[0-9]+,\s*[a-x0-9]+\s+} 1 } } */
+/* { dg-final { scan-assembler-times {vsetivli\s+zero,\s*31,\s*e16,\s*m1,\s*tu,\s*m[au]\s+vwadd\.wx\s+v[0-9]+,\s*v[0-9]+,\s*[a-x0-9]+\s+} 1 } } */
+/* { dg-final { scan-assembler-times {vsetivli\s+zero,\s*31,\s*e16,\s*m2,\s*tu,\s*m[au]\s+vwadd\.wx\s+v[0-9]+,\s*v[0-9]+,\s*[a-x0-9]+\s+} 1 } } */
+/* { dg-final { scan-assembler-times {vsetivli\s+zero,\s*31,\s*e16,\s*m4,\s*tu,\s*m[au]\s+vwadd\.wx\s+v[0-9]+,\s*v[0-9]+,\s*[a-x0-9]+\s+} 1 } } */
+/* { dg-final { scan-assembler-times {vsetivli\s+zero,\s*31,\s*e32,\s*mf2,\s*tu,\s*m[au]\s+vwadd\.wx\s+v[0-9]+,\s*v[0-9]+,\s*[a-x0-9]+\s+} 1 } } */
+/* { dg-final { scan-assembler-times {vsetivli\s+zero,\s*31,\s*e32,\s*m1,\s*tu,\s*m[au]\s+vwadd\.wx\s+v[0-9]+,\s*v[0-9]+,\s*[a-x0-9]+\s+} 1 } } */
+/* { dg-final { scan-assembler-times {vsetivli\s+zero,\s*31,\s*e32,\s*m2,\s*tu,\s*m[au]\s+vwadd\.wx\s+v[0-9]+,\s*v[0-9]+,\s*[a-x0-9]+\s+} 1 } } */
+/* { dg-final { scan-assembler-times {vsetivli\s+zero,\s*31,\s*e32,\s*m4,\s*tu,\s*m[au]\s+vwadd\.wx\s+v[0-9]+,\s*v[0-9]+,\s*[a-x0-9]+\s+} 1 } } */
diff --git a/gcc/testsuite/g++.target/riscv/rvv/base/vwadd_wx_tu-3.C b/gcc/testsuite/g++.target/riscv/rvv/base/vwadd_wx_tu-3.C
new file mode 100644
index 00000000000..27ba74833c9
--- /dev/null
+++ b/gcc/testsuite/g++.target/riscv/rvv/base/vwadd_wx_tu-3.C
@@ -0,0 +1,111 @@
+/* { dg-do compile } */
+/* { dg-options "-march=rv32gcv -mabi=ilp32 -O3 -fno-schedule-insns -fno-schedule-insns2" } */
+
+#include "riscv_vector.h"
+
+vint16mf4_t test___riscv_vwadd_wx_tu(vint16mf4_t merge,vint16mf4_t op1,int8_t op2,size_t vl)
+{
+    return __riscv_vwadd_wx_tu(merge,op1,0xAA,32);
+}
+
+
+vint16mf2_t test___riscv_vwadd_wx_tu(vint16mf2_t merge,vint16mf2_t op1,int8_t op2,size_t vl)
+{
+    return __riscv_vwadd_wx_tu(merge,op1,0xAA,32);
+}
+
+
+vint16m1_t test___riscv_vwadd_wx_tu(vint16m1_t merge,vint16m1_t op1,int8_t op2,size_t vl)
+{
+    return __riscv_vwadd_wx_tu(merge,op1,0xAA,32);
+}
+
+
+vint16m2_t test___riscv_vwadd_wx_tu(vint16m2_t merge,vint16m2_t op1,int8_t op2,size_t vl)
+{
+    return __riscv_vwadd_wx_tu(merge,op1,0xAA,32);
+}
+
+
+vint16m4_t test___riscv_vwadd_wx_tu(vint16m4_t merge,vint16m4_t op1,int8_t op2,size_t vl)
+{
+    return __riscv_vwadd_wx_tu(merge,op1,0xAA,32);
+}
+
+
+vint16m8_t test___riscv_vwadd_wx_tu(vint16m8_t merge,vint16m8_t op1,int8_t op2,size_t vl)
+{
+    return __riscv_vwadd_wx_tu(merge,op1,0xAA,32);
+}
+
+
+vint32mf2_t test___riscv_vwadd_wx_tu(vint32mf2_t merge,vint32mf2_t op1,int16_t op2,size_t vl)
+{
+    return __riscv_vwadd_wx_tu(merge,op1,0xAA,32);
+}
+
+
+vint32m1_t test___riscv_vwadd_wx_tu(vint32m1_t merge,vint32m1_t op1,int16_t op2,size_t vl)
+{
+    return __riscv_vwadd_wx_tu(merge,op1,0xAA,32);
+}
+
+
+vint32m2_t test___riscv_vwadd_wx_tu(vint32m2_t merge,vint32m2_t op1,int16_t op2,size_t vl)
+{
+    return __riscv_vwadd_wx_tu(merge,op1,0xAA,32);
+}
+
+
+vint32m4_t test___riscv_vwadd_wx_tu(vint32m4_t merge,vint32m4_t op1,int16_t op2,size_t vl)
+{
+    return __riscv_vwadd_wx_tu(merge,op1,0xAA,32);
+}
+
+
+vint32m8_t test___riscv_vwadd_wx_tu(vint32m8_t merge,vint32m8_t op1,int16_t op2,size_t vl)
+{
+    return __riscv_vwadd_wx_tu(merge,op1,0xAA,32);
+}
+
+
+vint64m1_t test___riscv_vwadd_wx_tu(vint64m1_t merge,vint64m1_t op1,int32_t op2,size_t vl)
+{
+    return __riscv_vwadd_wx_tu(merge,op1,0xAA,32);
+}
+
+
+vint64m2_t test___riscv_vwadd_wx_tu(vint64m2_t merge,vint64m2_t op1,int32_t op2,size_t vl)
+{
+    return __riscv_vwadd_wx_tu(merge,op1,0xAA,32);
+}
+
+
+vint64m4_t test___riscv_vwadd_wx_tu(vint64m4_t merge,vint64m4_t op1,int32_t op2,size_t vl)
+{
+    return __riscv_vwadd_wx_tu(merge,op1,0xAA,32);
+}
+
+
+vint64m8_t test___riscv_vwadd_wx_tu(vint64m8_t merge,vint64m8_t op1,int32_t op2,size_t vl)
+{
+    return __riscv_vwadd_wx_tu(merge,op1,0xAA,32);
+}
+
+
+
+/* { dg-final { scan-assembler-times {vsetvli\s+zero,\s*[a-x0-9]+,\s*e8,\s*mf8,\s*tu,\s*m[au]\s+vwadd\.wx\s+v[0-9]+,\s*v[0-9]+,\s*[a-x0-9]+\s+} 1 } } */
+/* { dg-final { scan-assembler-times {vsetvli\s+zero,\s*[a-x0-9]+,\s*e8,\s*mf4,\s*tu,\s*m[au]\s+vwadd\.wx\s+v[0-9]+,\s*v[0-9]+,\s*[a-x0-9]+\s+} 1 } } */
+/* { dg-final { scan-assembler-times {vsetvli\s+zero,\s*[a-x0-9]+,\s*e8,\s*mf2,\s*tu,\s*m[au]\s+vwadd\.wx\s+v[0-9]+,\s*v[0-9]+,\s*[a-x0-9]+\s+} 1 } } */
+/* { dg-final { scan-assembler-times {vsetvli\s+zero,\s*[a-x0-9]+,\s*e8,\s*m1,\s*tu,\s*m[au]\s+vwadd\.wx\s+v[0-9]+,\s*v[0-9]+,\s*[a-x0-9]+\s+} 1 } } */
+/* { dg-final { scan-assembler-times {vsetvli\s+zero,\s*[a-x0-9]+,\s*e8,\s*m2,\s*tu,\s*m[au]\s+vwadd\.wx\s+v[0-9]+,\s*v[0-9]+,\s*[a-x0-9]+\s+} 1 } } */
+/* { dg-final { scan-assembler-times {vsetvli\s+zero,\s*[a-x0-9]+,\s*e8,\s*m4,\s*tu,\s*m[au]\s+vwadd\.wx\s+v[0-9]+,\s*v[0-9]+,\s*[a-x0-9]+\s+} 1 } } */
+/* { dg-final { scan-assembler-times {vsetvli\s+zero,\s*[a-x0-9]+,\s*e16,\s*mf4,\s*tu,\s*m[au]\s+vwadd\.wx\s+v[0-9]+,\s*v[0-9]+,\s*[a-x0-9]+\s+} 1 } } */
+/* { dg-final { scan-assembler-times {vsetvli\s+zero,\s*[a-x0-9]+,\s*e16,\s*mf2,\s*tu,\s*m[au]\s+vwadd\.wx\s+v[0-9]+,\s*v[0-9]+,\s*[a-x0-9]+\s+} 1 } } */
+/* { dg-final { scan-assembler-times {vsetvli\s+zero,\s*[a-x0-9]+,\s*e16,\s*m1,\s*tu,\s*m[au]\s+vwadd\.wx\s+v[0-9]+,\s*v[0-9]+,\s*[a-x0-9]+\s+} 1 } } */
+/* { dg-final { scan-assembler-times {vsetvli\s+zero,\s*[a-x0-9]+,\s*e16,\s*m2,\s*tu,\s*m[au]\s+vwadd\.wx\s+v[0-9]+,\s*v[0-9]+,\s*[a-x0-9]+\s+} 1 } } */
+/* { dg-final { scan-assembler-times {vsetvli\s+zero,\s*[a-x0-9]+,\s*e16,\s*m4,\s*tu,\s*m[au]\s+vwadd\.wx\s+v[0-9]+,\s*v[0-9]+,\s*[a-x0-9]+\s+} 1 } } */
+/* { dg-final { scan-assembler-times {vsetvli\s+zero,\s*[a-x0-9]+,\s*e32,\s*mf2,\s*tu,\s*m[au]\s+vwadd\.wx\s+v[0-9]+,\s*v[0-9]+,\s*[a-x0-9]+\s+} 1 } } */
+/* { dg-final { scan-assembler-times {vsetvli\s+zero,\s*[a-x0-9]+,\s*e32,\s*m1,\s*tu,\s*m[au]\s+vwadd\.wx\s+v[0-9]+,\s*v[0-9]+,\s*[a-x0-9]+\s+} 1 } } */
+/* { dg-final { scan-assembler-times {vsetvli\s+zero,\s*[a-x0-9]+,\s*e32,\s*m2,\s*tu,\s*m[au]\s+vwadd\.wx\s+v[0-9]+,\s*v[0-9]+,\s*[a-x0-9]+\s+} 1 } } */
+/* { dg-final { scan-assembler-times {vsetvli\s+zero,\s*[a-x0-9]+,\s*e32,\s*m4,\s*tu,\s*m[au]\s+vwadd\.wx\s+v[0-9]+,\s*v[0-9]+,\s*[a-x0-9]+\s+} 1 } } */
diff --git a/gcc/testsuite/g++.target/riscv/rvv/base/vwadd_wx_tum-1.C b/gcc/testsuite/g++.target/riscv/rvv/base/vwadd_wx_tum-1.C
new file mode 100644
index 00000000000..22d4d0eb508
--- /dev/null
+++ b/gcc/testsuite/g++.target/riscv/rvv/base/vwadd_wx_tum-1.C
@@ -0,0 +1,111 @@
+/* { dg-do compile } */
+/* { dg-options "-march=rv32gcv -mabi=ilp32 -O3 -fno-schedule-insns -fno-schedule-insns2" } */
+
+#include "riscv_vector.h"
+
+vint16mf4_t test___riscv_vwadd_wx_tum(vbool64_t mask,vint16mf4_t merge,vint16mf4_t op1,int8_t op2,size_t vl)
+{
+    return __riscv_vwadd_wx_tum(mask,merge,op1,0xAA,vl);
+}
+
+
+vint16mf2_t test___riscv_vwadd_wx_tum(vbool32_t mask,vint16mf2_t merge,vint16mf2_t op1,int8_t op2,size_t vl)
+{
+    return __riscv_vwadd_wx_tum(mask,merge,op1,0xAA,vl);
+}
+
+
+vint16m1_t test___riscv_vwadd_wx_tum(vbool16_t mask,vint16m1_t merge,vint16m1_t op1,int8_t op2,size_t vl)
+{
+    return __riscv_vwadd_wx_tum(mask,merge,op1,0xAA,vl);
+}
+
+
+vint16m2_t test___riscv_vwadd_wx_tum(vbool8_t mask,vint16m2_t merge,vint16m2_t op1,int8_t op2,size_t vl)
+{
+    return __riscv_vwadd_wx_tum(mask,merge,op1,0xAA,vl);
+}
+
+
+vint16m4_t test___riscv_vwadd_wx_tum(vbool4_t mask,vint16m4_t merge,vint16m4_t op1,int8_t op2,size_t vl)
+{
+    return __riscv_vwadd_wx_tum(mask,merge,op1,0xAA,vl);
+}
+
+
+vint16m8_t test___riscv_vwadd_wx_tum(vbool2_t mask,vint16m8_t merge,vint16m8_t op1,int8_t op2,size_t vl)
+{
+    return __riscv_vwadd_wx_tum(mask,merge,op1,0xAA,vl);
+}
+
+
+vint32mf2_t test___riscv_vwadd_wx_tum(vbool64_t mask,vint32mf2_t merge,vint32mf2_t op1,int16_t op2,size_t vl)
+{
+    return __riscv_vwadd_wx_tum(mask,merge,op1,0xAA,vl);
+}
+
+
+vint32m1_t test___riscv_vwadd_wx_tum(vbool32_t mask,vint32m1_t merge,vint32m1_t op1,int16_t op2,size_t vl)
+{
+    return __riscv_vwadd_wx_tum(mask,merge,op1,0xAA,vl);
+}
+
+
+vint32m2_t test___riscv_vwadd_wx_tum(vbool16_t mask,vint32m2_t merge,vint32m2_t op1,int16_t op2,size_t vl)
+{
+    return __riscv_vwadd_wx_tum(mask,merge,op1,0xAA,vl);
+}
+
+
+vint32m4_t test___riscv_vwadd_wx_tum(vbool8_t mask,vint32m4_t merge,vint32m4_t op1,int16_t op2,size_t vl)
+{
+    return __riscv_vwadd_wx_tum(mask,merge,op1,0xAA,vl);
+}
+
+
+vint32m8_t test___riscv_vwadd_wx_tum(vbool4_t mask,vint32m8_t merge,vint32m8_t op1,int16_t op2,size_t vl)
+{
+    return __riscv_vwadd_wx_tum(mask,merge,op1,0xAA,vl);
+}
+
+
+vint64m1_t test___riscv_vwadd_wx_tum(vbool64_t mask,vint64m1_t merge,vint64m1_t op1,int32_t op2,size_t vl)
+{
+    return __riscv_vwadd_wx_tum(mask,merge,op1,0xAA,vl);
+}
+
+
+vint64m2_t test___riscv_vwadd_wx_tum(vbool32_t mask,vint64m2_t merge,vint64m2_t op1,int32_t op2,size_t vl)
+{
+    return __riscv_vwadd_wx_tum(mask,merge,op1,0xAA,vl);
+}
+
+
+vint64m4_t test___riscv_vwadd_wx_tum(vbool16_t mask,vint64m4_t merge,vint64m4_t op1,int32_t op2,size_t vl)
+{
+    return __riscv_vwadd_wx_tum(mask,merge,op1,0xAA,vl);
+}
+
+
+vint64m8_t test___riscv_vwadd_wx_tum(vbool8_t mask,vint64m8_t merge,vint64m8_t op1,int32_t op2,size_t vl)
+{
+    return __riscv_vwadd_wx_tum(mask,merge,op1,0xAA,vl);
+}
+
+
+
+/* { dg-final { scan-assembler-times {vsetvli\s+zero,\s*[a-x0-9]+,\s*e8,\s*mf8,\s*tu,\s*m[au]\s+vwadd\.wx\s+v[0-9]+,\s*v[0-9]+,\s*[a-x0-9]+,\s*v0.t\s+} 1 } } */
+/* { dg-final { scan-assembler-times {vsetvli\s+zero,\s*[a-x0-9]+,\s*e8,\s*mf4,\s*tu,\s*m[au]\s+vwadd\.wx\s+v[0-9]+,\s*v[0-9]+,\s*[a-x0-9]+,\s*v0.t\s+} 1 } } */
+/* { dg-final { scan-assembler-times {vsetvli\s+zero,\s*[a-x0-9]+,\s*e8,\s*mf2,\s*tu,\s*m[au]\s+vwadd\.wx\s+v[0-9]+,\s*v[0-9]+,\s*[a-x0-9]+,\s*v0.t\s+} 1 } } */
+/* { dg-final { scan-assembler-times {vsetvli\s+zero,\s*[a-x0-9]+,\s*e8,\s*m1,\s*tu,\s*m[au]\s+vwadd\.wx\s+v[0-9]+,\s*v[0-9]+,\s*[a-x0-9]+,\s*v0.t\s+} 1 } } */
+/* { dg-final { scan-assembler-times {vsetvli\s+zero,\s*[a-x0-9]+,\s*e8,\s*m2,\s*tu,\s*m[au]\s+vwadd\.wx\s+v[0-9]+,\s*v[0-9]+,\s*[a-x0-9]+,\s*v0.t\s+} 1 } } */
+/* { dg-final { scan-assembler-times {vsetvli\s+zero,\s*[a-x0-9]+,\s*e8,\s*m4,\s*tu,\s*m[au]\s+vwadd\.wx\s+v[0-9]+,\s*v[0-9]+,\s*[a-x0-9]+,\s*v0.t\s+} 1 } } */
+/* { dg-final { scan-assembler-times {vsetvli\s+zero,\s*[a-x0-9]+,\s*e16,\s*mf4,\s*tu,\s*m[au]\s+vwadd\.wx\s+v[0-9]+,\s*v[0-9]+,\s*[a-x0-9]+,\s*v0.t\s+} 1 } } */
+/* { dg-final { scan-assembler-times {vsetvli\s+zero,\s*[a-x0-9]+,\s*e16,\s*mf2,\s*tu,\s*m[au]\s+vwadd\.wx\s+v[0-9]+,\s*v[0-9]+,\s*[a-x0-9]+,\s*v0.t\s+} 1 } } */
+/* { dg-final { scan-assembler-times {vsetvli\s+zero,\s*[a-x0-9]+,\s*e16,\s*m1,\s*tu,\s*m[au]\s+vwadd\.wx\s+v[0-9]+,\s*v[0-9]+,\s*[a-x0-9]+,\s*v0.t\s+} 1 } } */
+/* { dg-final { scan-assembler-times {vsetvli\s+zero,\s*[a-x0-9]+,\s*e16,\s*m2,\s*tu,\s*m[au]\s+vwadd\.wx\s+v[0-9]+,\s*v[0-9]+,\s*[a-x0-9]+,\s*v0.t\s+} 1 } } */
+/* { dg-final { scan-assembler-times {vsetvli\s+zero,\s*[a-x0-9]+,\s*e16,\s*m4,\s*tu,\s*m[au]\s+vwadd\.wx\s+v[0-9]+,\s*v[0-9]+,\s*[a-x0-9]+,\s*v0.t\s+} 1 } } */
+/* { dg-final { scan-assembler-times {vsetvli\s+zero,\s*[a-x0-9]+,\s*e32,\s*mf2,\s*tu,\s*m[au]\s+vwadd\.wx\s+v[0-9]+,\s*v[0-9]+,\s*[a-x0-9]+,\s*v0.t\s+} 1 } } */
+/* { dg-final { scan-assembler-times {vsetvli\s+zero,\s*[a-x0-9]+,\s*e32,\s*m1,\s*tu,\s*m[au]\s+vwadd\.wx\s+v[0-9]+,\s*v[0-9]+,\s*[a-x0-9]+,\s*v0.t\s+} 1 } } */
+/* { dg-final { scan-assembler-times {vsetvli\s+zero,\s*[a-x0-9]+,\s*e32,\s*m2,\s*tu,\s*m[au]\s+vwadd\.wx\s+v[0-9]+,\s*v[0-9]+,\s*[a-x0-9]+,\s*v0.t\s+} 1 } } */
+/* { dg-final { scan-assembler-times {vsetvli\s+zero,\s*[a-x0-9]+,\s*e32,\s*m4,\s*tu,\s*m[au]\s+vwadd\.wx\s+v[0-9]+,\s*v[0-9]+,\s*[a-x0-9]+,\s*v0.t\s+} 1 } } */
diff --git a/gcc/testsuite/g++.target/riscv/rvv/base/vwadd_wx_tum-2.C b/gcc/testsuite/g++.target/riscv/rvv/base/vwadd_wx_tum-2.C
new file mode 100644
index 00000000000..db285a583a6
--- /dev/null
+++ b/gcc/testsuite/g++.target/riscv/rvv/base/vwadd_wx_tum-2.C
@@ -0,0 +1,111 @@
+/* { dg-do compile } */
+/* { dg-options "-march=rv32gcv -mabi=ilp32 -O3 -fno-schedule-insns -fno-schedule-insns2" } */
+
+#include "riscv_vector.h"
+
+vint16mf4_t test___riscv_vwadd_wx_tum(vbool64_t mask,vint16mf4_t merge,vint16mf4_t op1,int8_t op2,size_t vl)
+{
+    return __riscv_vwadd_wx_tum(mask,merge,op1,0xAA,31);
+}
+
+
+vint16mf2_t test___riscv_vwadd_wx_tum(vbool32_t mask,vint16mf2_t merge,vint16mf2_t op1,int8_t op2,size_t vl)
+{
+    return __riscv_vwadd_wx_tum(mask,merge,op1,0xAA,31);
+}
+
+
+vint16m1_t test___riscv_vwadd_wx_tum(vbool16_t mask,vint16m1_t merge,vint16m1_t op1,int8_t op2,size_t vl)
+{
+    return __riscv_vwadd_wx_tum(mask,merge,op1,0xAA,31);
+}
+
+
+vint16m2_t test___riscv_vwadd_wx_tum(vbool8_t mask,vint16m2_t merge,vint16m2_t op1,int8_t op2,size_t vl)
+{
+    return __riscv_vwadd_wx_tum(mask,merge,op1,0xAA,31);
+}
+
+
+vint16m4_t test___riscv_vwadd_wx_tum(vbool4_t mask,vint16m4_t merge,vint16m4_t op1,int8_t op2,size_t vl)
+{
+    return __riscv_vwadd_wx_tum(mask,merge,op1,0xAA,31);
+}
+
+
+vint16m8_t test___riscv_vwadd_wx_tum(vbool2_t mask,vint16m8_t merge,vint16m8_t op1,int8_t op2,size_t vl)
+{
+    return __riscv_vwadd_wx_tum(mask,merge,op1,0xAA,31);
+}
+
+
+vint32mf2_t test___riscv_vwadd_wx_tum(vbool64_t mask,vint32mf2_t merge,vint32mf2_t op1,int16_t op2,size_t vl)
+{
+    return __riscv_vwadd_wx_tum(mask,merge,op1,0xAA,31);
+}
+
+
+vint32m1_t test___riscv_vwadd_wx_tum(vbool32_t mask,vint32m1_t merge,vint32m1_t op1,int16_t op2,size_t vl)
+{
+    return __riscv_vwadd_wx_tum(mask,merge,op1,0xAA,31);
+}
+
+
+vint32m2_t test___riscv_vwadd_wx_tum(vbool16_t mask,vint32m2_t merge,vint32m2_t op1,int16_t op2,size_t vl)
+{
+    return __riscv_vwadd_wx_tum(mask,merge,op1,0xAA,31);
+}
+
+
+vint32m4_t test___riscv_vwadd_wx_tum(vbool8_t mask,vint32m4_t merge,vint32m4_t op1,int16_t op2,size_t vl)
+{
+    return __riscv_vwadd_wx_tum(mask,merge,op1,0xAA,31);
+}
+
+
+vint32m8_t test___riscv_vwadd_wx_tum(vbool4_t mask,vint32m8_t merge,vint32m8_t op1,int16_t op2,size_t vl)
+{
+    return __riscv_vwadd_wx_tum(mask,merge,op1,0xAA,31);
+}
+
+
+vint64m1_t test___riscv_vwadd_wx_tum(vbool64_t mask,vint64m1_t merge,vint64m1_t op1,int32_t op2,size_t vl)
+{
+    return __riscv_vwadd_wx_tum(mask,merge,op1,0xAA,31);
+}
+
+
+vint64m2_t test___riscv_vwadd_wx_tum(vbool32_t mask,vint64m2_t merge,vint64m2_t op1,int32_t op2,size_t vl)
+{
+    return __riscv_vwadd_wx_tum(mask,merge,op1,0xAA,31);
+}
+
+
+vint64m4_t test___riscv_vwadd_wx_tum(vbool16_t mask,vint64m4_t merge,vint64m4_t op1,int32_t op2,size_t vl)
+{
+    return __riscv_vwadd_wx_tum(mask,merge,op1,0xAA,31);
+}
+
+
+vint64m8_t test___riscv_vwadd_wx_tum(vbool8_t mask,vint64m8_t merge,vint64m8_t op1,int32_t op2,size_t vl)
+{
+    return __riscv_vwadd_wx_tum(mask,merge,op1,0xAA,31);
+}
+
+
+
+/* { dg-final { scan-assembler-times {vsetivli\s+zero,\s*31,\s*e8,\s*mf8,\s*tu,\s*m[au]\s+vwadd\.wx\s+v[0-9]+,\s*v[0-9]+,\s*[a-x0-9]+,\s*v0.t\s+} 1 } } */
+/* { dg-final { scan-assembler-times {vsetivli\s+zero,\s*31,\s*e8,\s*mf4,\s*tu,\s*m[au]\s+vwadd\.wx\s+v[0-9]+,\s*v[0-9]+,\s*[a-x0-9]+,\s*v0.t\s+} 1 } } */
+/* { dg-final { scan-assembler-times {vsetivli\s+zero,\s*31,\s*e8,\s*mf2,\s*tu,\s*m[au]\s+vwadd\.wx\s+v[0-9]+,\s*v[0-9]+,\s*[a-x0-9]+,\s*v0.t\s+} 1 } } */
+/* { dg-final { scan-assembler-times {vsetivli\s+zero,\s*31,\s*e8,\s*m1,\s*tu,\s*m[au]\s+vwadd\.wx\s+v[0-9]+,\s*v[0-9]+,\s*[a-x0-9]+,\s*v0.t\s+} 1 } } */
+/* { dg-final { scan-assembler-times {vsetivli\s+zero,\s*31,\s*e8,\s*m2,\s*tu,\s*m[au]\s+vwadd\.wx\s+v[0-9]+,\s*v[0-9]+,\s*[a-x0-9]+,\s*v0.t\s+} 1 } } */
+/* { dg-final { scan-assembler-times {vsetivli\s+zero,\s*31,\s*e8,\s*m4,\s*tu,\s*m[au]\s+vwadd\.wx\s+v[0-9]+,\s*v[0-9]+,\s*[a-x0-9]+,\s*v0.t\s+} 1 } } */
+/* { dg-final { scan-assembler-times {vsetivli\s+zero,\s*31,\s*e16,\s*mf4,\s*tu,\s*m[au]\s+vwadd\.wx\s+v[0-9]+,\s*v[0-9]+,\s*[a-x0-9]+,\s*v0.t\s+} 1 } } */
+/* { dg-final { scan-assembler-times {vsetivli\s+zero,\s*31,\s*e16,\s*mf2,\s*tu,\s*m[au]\s+vwadd\.wx\s+v[0-9]+,\s*v[0-9]+,\s*[a-x0-9]+,\s*v0.t\s+} 1 } } */
+/* { dg-final { scan-assembler-times {vsetivli\s+zero,\s*31,\s*e16,\s*m1,\s*tu,\s*m[au]\s+vwadd\.wx\s+v[0-9]+,\s*v[0-9]+,\s*[a-x0-9]+,\s*v0.t\s+} 1 } } */
+/* { dg-final { scan-assembler-times {vsetivli\s+zero,\s*31,\s*e16,\s*m2,\s*tu,\s*m[au]\s+vwadd\.wx\s+v[0-9]+,\s*v[0-9]+,\s*[a-x0-9]+,\s*v0.t\s+} 1 } } */
+/* { dg-final { scan-assembler-times {vsetivli\s+zero,\s*31,\s*e16,\s*m4,\s*tu,\s*m[au]\s+vwadd\.wx\s+v[0-9]+,\s*v[0-9]+,\s*[a-x0-9]+,\s*v0.t\s+} 1 } } */
+/* { dg-final { scan-assembler-times {vsetivli\s+zero,\s*31,\s*e32,\s*mf2,\s*tu,\s*m[au]\s+vwadd\.wx\s+v[0-9]+,\s*v[0-9]+,\s*[a-x0-9]+,\s*v0.t\s+} 1 } } */
+/* { dg-final { scan-assembler-times {vsetivli\s+zero,\s*31,\s*e32,\s*m1,\s*tu,\s*m[au]\s+vwadd\.wx\s+v[0-9]+,\s*v[0-9]+,\s*[a-x0-9]+,\s*v0.t\s+} 1 } } */
+/* { dg-final { scan-assembler-times {vsetivli\s+zero,\s*31,\s*e32,\s*m2,\s*tu,\s*m[au]\s+vwadd\.wx\s+v[0-9]+,\s*v[0-9]+,\s*[a-x0-9]+,\s*v0.t\s+} 1 } } */
+/* { dg-final { scan-assembler-times {vsetivli\s+zero,\s*31,\s*e32,\s*m4,\s*tu,\s*m[au]\s+vwadd\.wx\s+v[0-9]+,\s*v[0-9]+,\s*[a-x0-9]+,\s*v0.t\s+} 1 } } */
diff --git a/gcc/testsuite/g++.target/riscv/rvv/base/vwadd_wx_tum-3.C b/gcc/testsuite/g++.target/riscv/rvv/base/vwadd_wx_tum-3.C
new file mode 100644
index 00000000000..9c1cad1b83d
--- /dev/null
+++ b/gcc/testsuite/g++.target/riscv/rvv/base/vwadd_wx_tum-3.C
@@ -0,0 +1,111 @@
+/* { dg-do compile } */
+/* { dg-options "-march=rv32gcv -mabi=ilp32 -O3 -fno-schedule-insns -fno-schedule-insns2" } */
+
+#include "riscv_vector.h"
+
+vint16mf4_t test___riscv_vwadd_wx_tum(vbool64_t mask,vint16mf4_t merge,vint16mf4_t op1,int8_t op2,size_t vl)
+{
+    return __riscv_vwadd_wx_tum(mask,merge,op1,0xAA,32);
+}
+
+
+vint16mf2_t test___riscv_vwadd_wx_tum(vbool32_t mask,vint16mf2_t merge,vint16mf2_t op1,int8_t op2,size_t vl)
+{
+    return __riscv_vwadd_wx_tum(mask,merge,op1,0xAA,32);
+}
+
+
+vint16m1_t test___riscv_vwadd_wx_tum(vbool16_t mask,vint16m1_t merge,vint16m1_t op1,int8_t op2,size_t vl)
+{
+    return __riscv_vwadd_wx_tum(mask,merge,op1,0xAA,32);
+}
+
+
+vint16m2_t test___riscv_vwadd_wx_tum(vbool8_t mask,vint16m2_t merge,vint16m2_t op1,int8_t op2,size_t vl)
+{
+    return __riscv_vwadd_wx_tum(mask,merge,op1,0xAA,32);
+}
+
+
+vint16m4_t test___riscv_vwadd_wx_tum(vbool4_t mask,vint16m4_t merge,vint16m4_t op1,int8_t op2,size_t vl)
+{
+    return __riscv_vwadd_wx_tum(mask,merge,op1,0xAA,32);
+}
+
+
+vint16m8_t test___riscv_vwadd_wx_tum(vbool2_t mask,vint16m8_t merge,vint16m8_t op1,int8_t op2,size_t vl)
+{
+    return __riscv_vwadd_wx_tum(mask,merge,op1,0xAA,32);
+}
+
+
+vint32mf2_t test___riscv_vwadd_wx_tum(vbool64_t mask,vint32mf2_t merge,vint32mf2_t op1,int16_t op2,size_t vl)
+{
+    return __riscv_vwadd_wx_tum(mask,merge,op1,0xAA,32);
+}
+
+
+vint32m1_t test___riscv_vwadd_wx_tum(vbool32_t mask,vint32m1_t merge,vint32m1_t op1,int16_t op2,size_t vl)
+{
+    return __riscv_vwadd_wx_tum(mask,merge,op1,0xAA,32);
+}
+
+
+vint32m2_t test___riscv_vwadd_wx_tum(vbool16_t mask,vint32m2_t merge,vint32m2_t op1,int16_t op2,size_t vl)
+{
+    return __riscv_vwadd_wx_tum(mask,merge,op1,0xAA,32);
+}
+
+
+vint32m4_t test___riscv_vwadd_wx_tum(vbool8_t mask,vint32m4_t merge,vint32m4_t op1,int16_t op2,size_t vl)
+{
+    return __riscv_vwadd_wx_tum(mask,merge,op1,0xAA,32);
+}
+
+
+vint32m8_t test___riscv_vwadd_wx_tum(vbool4_t mask,vint32m8_t merge,vint32m8_t op1,int16_t op2,size_t vl)
+{
+    return __riscv_vwadd_wx_tum(mask,merge,op1,0xAA,32);
+}
+
+
+vint64m1_t test___riscv_vwadd_wx_tum(vbool64_t mask,vint64m1_t merge,vint64m1_t op1,int32_t op2,size_t vl)
+{
+    return __riscv_vwadd_wx_tum(mask,merge,op1,0xAA,32);
+}
+
+
+vint64m2_t test___riscv_vwadd_wx_tum(vbool32_t mask,vint64m2_t merge,vint64m2_t op1,int32_t op2,size_t vl)
+{
+    return __riscv_vwadd_wx_tum(mask,merge,op1,0xAA,32);
+}
+
+
+vint64m4_t test___riscv_vwadd_wx_tum(vbool16_t mask,vint64m4_t merge,vint64m4_t op1,int32_t op2,size_t vl)
+{
+    return __riscv_vwadd_wx_tum(mask,merge,op1,0xAA,32);
+}
+
+
+vint64m8_t test___riscv_vwadd_wx_tum(vbool8_t mask,vint64m8_t merge,vint64m8_t op1,int32_t op2,size_t vl)
+{
+    return __riscv_vwadd_wx_tum(mask,merge,op1,0xAA,32);
+}
+
+
+
+/* { dg-final { scan-assembler-times {vsetvli\s+zero,\s*[a-x0-9]+,\s*e8,\s*mf8,\s*tu,\s*m[au]\s+vwadd\.wx\s+v[0-9]+,\s*v[0-9]+,\s*[a-x0-9]+,\s*v0.t\s+} 1 } } */
+/* { dg-final { scan-assembler-times {vsetvli\s+zero,\s*[a-x0-9]+,\s*e8,\s*mf4,\s*tu,\s*m[au]\s+vwadd\.wx\s+v[0-9]+,\s*v[0-9]+,\s*[a-x0-9]+,\s*v0.t\s+} 1 } } */
+/* { dg-final { scan-assembler-times {vsetvli\s+zero,\s*[a-x0-9]+,\s*e8,\s*mf2,\s*tu,\s*m[au]\s+vwadd\.wx\s+v[0-9]+,\s*v[0-9]+,\s*[a-x0-9]+,\s*v0.t\s+} 1 } } */
+/* { dg-final { scan-assembler-times {vsetvli\s+zero,\s*[a-x0-9]+,\s*e8,\s*m1,\s*tu,\s*m[au]\s+vwadd\.wx\s+v[0-9]+,\s*v[0-9]+,\s*[a-x0-9]+,\s*v0.t\s+} 1 } } */
+/* { dg-final { scan-assembler-times {vsetvli\s+zero,\s*[a-x0-9]+,\s*e8,\s*m2,\s*tu,\s*m[au]\s+vwadd\.wx\s+v[0-9]+,\s*v[0-9]+,\s*[a-x0-9]+,\s*v0.t\s+} 1 } } */
+/* { dg-final { scan-assembler-times {vsetvli\s+zero,\s*[a-x0-9]+,\s*e8,\s*m4,\s*tu,\s*m[au]\s+vwadd\.wx\s+v[0-9]+,\s*v[0-9]+,\s*[a-x0-9]+,\s*v0.t\s+} 1 } } */
+/* { dg-final { scan-assembler-times {vsetvli\s+zero,\s*[a-x0-9]+,\s*e16,\s*mf4,\s*tu,\s*m[au]\s+vwadd\.wx\s+v[0-9]+,\s*v[0-9]+,\s*[a-x0-9]+,\s*v0.t\s+} 1 } } */
+/* { dg-final { scan-assembler-times {vsetvli\s+zero,\s*[a-x0-9]+,\s*e16,\s*mf2,\s*tu,\s*m[au]\s+vwadd\.wx\s+v[0-9]+,\s*v[0-9]+,\s*[a-x0-9]+,\s*v0.t\s+} 1 } } */
+/* { dg-final { scan-assembler-times {vsetvli\s+zero,\s*[a-x0-9]+,\s*e16,\s*m1,\s*tu,\s*m[au]\s+vwadd\.wx\s+v[0-9]+,\s*v[0-9]+,\s*[a-x0-9]+,\s*v0.t\s+} 1 } } */
+/* { dg-final { scan-assembler-times {vsetvli\s+zero,\s*[a-x0-9]+,\s*e16,\s*m2,\s*tu,\s*m[au]\s+vwadd\.wx\s+v[0-9]+,\s*v[0-9]+,\s*[a-x0-9]+,\s*v0.t\s+} 1 } } */
+/* { dg-final { scan-assembler-times {vsetvli\s+zero,\s*[a-x0-9]+,\s*e16,\s*m4,\s*tu,\s*m[au]\s+vwadd\.wx\s+v[0-9]+,\s*v[0-9]+,\s*[a-x0-9]+,\s*v0.t\s+} 1 } } */
+/* { dg-final { scan-assembler-times {vsetvli\s+zero,\s*[a-x0-9]+,\s*e32,\s*mf2,\s*tu,\s*m[au]\s+vwadd\.wx\s+v[0-9]+,\s*v[0-9]+,\s*[a-x0-9]+,\s*v0.t\s+} 1 } } */
+/* { dg-final { scan-assembler-times {vsetvli\s+zero,\s*[a-x0-9]+,\s*e32,\s*m1,\s*tu,\s*m[au]\s+vwadd\.wx\s+v[0-9]+,\s*v[0-9]+,\s*[a-x0-9]+,\s*v0.t\s+} 1 } } */
+/* { dg-final { scan-assembler-times {vsetvli\s+zero,\s*[a-x0-9]+,\s*e32,\s*m2,\s*tu,\s*m[au]\s+vwadd\.wx\s+v[0-9]+,\s*v[0-9]+,\s*[a-x0-9]+,\s*v0.t\s+} 1 } } */
+/* { dg-final { scan-assembler-times {vsetvli\s+zero,\s*[a-x0-9]+,\s*e32,\s*m4,\s*tu,\s*m[au]\s+vwadd\.wx\s+v[0-9]+,\s*v[0-9]+,\s*[a-x0-9]+,\s*v0.t\s+} 1 } } */
diff --git a/gcc/testsuite/g++.target/riscv/rvv/base/vwadd_wx_tumu-1.C b/gcc/testsuite/g++.target/riscv/rvv/base/vwadd_wx_tumu-1.C
new file mode 100644
index 00000000000..15842274ac0
--- /dev/null
+++ b/gcc/testsuite/g++.target/riscv/rvv/base/vwadd_wx_tumu-1.C
@@ -0,0 +1,111 @@
+/* { dg-do compile } */
+/* { dg-options "-march=rv32gcv -mabi=ilp32 -O3 -fno-schedule-insns -fno-schedule-insns2" } */
+
+#include "riscv_vector.h"
+
+vint16mf4_t test___riscv_vwadd_wx_tumu(vbool64_t mask,vint16mf4_t merge,vint16mf4_t op1,int8_t op2,size_t vl)
+{
+    return __riscv_vwadd_wx_tumu(mask,merge,op1,0xAA,vl);
+}
+
+
+vint16mf2_t test___riscv_vwadd_wx_tumu(vbool32_t mask,vint16mf2_t merge,vint16mf2_t op1,int8_t op2,size_t vl)
+{
+    return __riscv_vwadd_wx_tumu(mask,merge,op1,0xAA,vl);
+}
+
+
+vint16m1_t test___riscv_vwadd_wx_tumu(vbool16_t mask,vint16m1_t merge,vint16m1_t op1,int8_t op2,size_t vl)
+{
+    return __riscv_vwadd_wx_tumu(mask,merge,op1,0xAA,vl);
+}
+
+
+vint16m2_t test___riscv_vwadd_wx_tumu(vbool8_t mask,vint16m2_t merge,vint16m2_t op1,int8_t op2,size_t vl)
+{
+    return __riscv_vwadd_wx_tumu(mask,merge,op1,0xAA,vl);
+}
+
+
+vint16m4_t test___riscv_vwadd_wx_tumu(vbool4_t mask,vint16m4_t merge,vint16m4_t op1,int8_t op2,size_t vl)
+{
+    return __riscv_vwadd_wx_tumu(mask,merge,op1,0xAA,vl);
+}
+
+
+vint16m8_t test___riscv_vwadd_wx_tumu(vbool2_t mask,vint16m8_t merge,vint16m8_t op1,int8_t op2,size_t vl)
+{
+    return __riscv_vwadd_wx_tumu(mask,merge,op1,0xAA,vl);
+}
+
+
+vint32mf2_t test___riscv_vwadd_wx_tumu(vbool64_t mask,vint32mf2_t merge,vint32mf2_t op1,int16_t op2,size_t vl)
+{
+    return __riscv_vwadd_wx_tumu(mask,merge,op1,0xAA,vl);
+}
+
+
+vint32m1_t test___riscv_vwadd_wx_tumu(vbool32_t mask,vint32m1_t merge,vint32m1_t op1,int16_t op2,size_t vl)
+{
+    return __riscv_vwadd_wx_tumu(mask,merge,op1,0xAA,vl);
+}
+
+
+vint32m2_t test___riscv_vwadd_wx_tumu(vbool16_t mask,vint32m2_t merge,vint32m2_t op1,int16_t op2,size_t vl)
+{
+    return __riscv_vwadd_wx_tumu(mask,merge,op1,0xAA,vl);
+}
+
+
+vint32m4_t test___riscv_vwadd_wx_tumu(vbool8_t mask,vint32m4_t merge,vint32m4_t op1,int16_t op2,size_t vl)
+{
+    return __riscv_vwadd_wx_tumu(mask,merge,op1,0xAA,vl);
+}
+
+
+vint32m8_t test___riscv_vwadd_wx_tumu(vbool4_t mask,vint32m8_t merge,vint32m8_t op1,int16_t op2,size_t vl)
+{
+    return __riscv_vwadd_wx_tumu(mask,merge,op1,0xAA,vl);
+}
+
+
+vint64m1_t test___riscv_vwadd_wx_tumu(vbool64_t mask,vint64m1_t merge,vint64m1_t op1,int32_t op2,size_t vl)
+{
+    return __riscv_vwadd_wx_tumu(mask,merge,op1,0xAA,vl);
+}
+
+
+vint64m2_t test___riscv_vwadd_wx_tumu(vbool32_t mask,vint64m2_t merge,vint64m2_t op1,int32_t op2,size_t vl)
+{
+    return __riscv_vwadd_wx_tumu(mask,merge,op1,0xAA,vl);
+}
+
+
+vint64m4_t test___riscv_vwadd_wx_tumu(vbool16_t mask,vint64m4_t merge,vint64m4_t op1,int32_t op2,size_t vl)
+{
+    return __riscv_vwadd_wx_tumu(mask,merge,op1,0xAA,vl);
+}
+
+
+vint64m8_t test___riscv_vwadd_wx_tumu(vbool8_t mask,vint64m8_t merge,vint64m8_t op1,int32_t op2,size_t vl)
+{
+    return __riscv_vwadd_wx_tumu(mask,merge,op1,0xAA,vl);
+}
+
+
+
+/* { dg-final { scan-assembler-times {vsetvli\s+zero,\s*[a-x0-9]+,\s*e8,\s*mf8,\s*tu,\s*mu\s+vwadd\.wx\s+v[0-9]+,\s*v[0-9]+,\s*[a-x0-9]+,\s*v0.t\s+} 1 } } */
+/* { dg-final { scan-assembler-times {vsetvli\s+zero,\s*[a-x0-9]+,\s*e8,\s*mf4,\s*tu,\s*mu\s+vwadd\.wx\s+v[0-9]+,\s*v[0-9]+,\s*[a-x0-9]+,\s*v0.t\s+} 1 } } */
+/* { dg-final { scan-assembler-times {vsetvli\s+zero,\s*[a-x0-9]+,\s*e8,\s*mf2,\s*tu,\s*mu\s+vwadd\.wx\s+v[0-9]+,\s*v[0-9]+,\s*[a-x0-9]+,\s*v0.t\s+} 1 } } */
+/* { dg-final { scan-assembler-times {vsetvli\s+zero,\s*[a-x0-9]+,\s*e8,\s*m1,\s*tu,\s*mu\s+vwadd\.wx\s+v[0-9]+,\s*v[0-9]+,\s*[a-x0-9]+,\s*v0.t\s+} 1 } } */
+/* { dg-final { scan-assembler-times {vsetvli\s+zero,\s*[a-x0-9]+,\s*e8,\s*m2,\s*tu,\s*mu\s+vwadd\.wx\s+v[0-9]+,\s*v[0-9]+,\s*[a-x0-9]+,\s*v0.t\s+} 1 } } */
+/* { dg-final { scan-assembler-times {vsetvli\s+zero,\s*[a-x0-9]+,\s*e8,\s*m4,\s*tu,\s*mu\s+vwadd\.wx\s+v[0-9]+,\s*v[0-9]+,\s*[a-x0-9]+,\s*v0.t\s+} 1 } } */
+/* { dg-final { scan-assembler-times {vsetvli\s+zero,\s*[a-x0-9]+,\s*e16,\s*mf4,\s*tu,\s*mu\s+vwadd\.wx\s+v[0-9]+,\s*v[0-9]+,\s*[a-x0-9]+,\s*v0.t\s+} 1 } } */
+/* { dg-final { scan-assembler-times {vsetvli\s+zero,\s*[a-x0-9]+,\s*e16,\s*mf2,\s*tu,\s*mu\s+vwadd\.wx\s+v[0-9]+,\s*v[0-9]+,\s*[a-x0-9]+,\s*v0.t\s+} 1 } } */
+/* { dg-final { scan-assembler-times {vsetvli\s+zero,\s*[a-x0-9]+,\s*e16,\s*m1,\s*tu,\s*mu\s+vwadd\.wx\s+v[0-9]+,\s*v[0-9]+,\s*[a-x0-9]+,\s*v0.t\s+} 1 } } */
+/* { dg-final { scan-assembler-times {vsetvli\s+zero,\s*[a-x0-9]+,\s*e16,\s*m2,\s*tu,\s*mu\s+vwadd\.wx\s+v[0-9]+,\s*v[0-9]+,\s*[a-x0-9]+,\s*v0.t\s+} 1 } } */
+/* { dg-final { scan-assembler-times {vsetvli\s+zero,\s*[a-x0-9]+,\s*e16,\s*m4,\s*tu,\s*mu\s+vwadd\.wx\s+v[0-9]+,\s*v[0-9]+,\s*[a-x0-9]+,\s*v0.t\s+} 1 } } */
+/* { dg-final { scan-assembler-times {vsetvli\s+zero,\s*[a-x0-9]+,\s*e32,\s*mf2,\s*tu,\s*mu\s+vwadd\.wx\s+v[0-9]+,\s*v[0-9]+,\s*[a-x0-9]+,\s*v0.t\s+} 1 } } */
+/* { dg-final { scan-assembler-times {vsetvli\s+zero,\s*[a-x0-9]+,\s*e32,\s*m1,\s*tu,\s*mu\s+vwadd\.wx\s+v[0-9]+,\s*v[0-9]+,\s*[a-x0-9]+,\s*v0.t\s+} 1 } } */
+/* { dg-final { scan-assembler-times {vsetvli\s+zero,\s*[a-x0-9]+,\s*e32,\s*m2,\s*tu,\s*mu\s+vwadd\.wx\s+v[0-9]+,\s*v[0-9]+,\s*[a-x0-9]+,\s*v0.t\s+} 1 } } */
+/* { dg-final { scan-assembler-times {vsetvli\s+zero,\s*[a-x0-9]+,\s*e32,\s*m4,\s*tu,\s*mu\s+vwadd\.wx\s+v[0-9]+,\s*v[0-9]+,\s*[a-x0-9]+,\s*v0.t\s+} 1 } } */
diff --git a/gcc/testsuite/g++.target/riscv/rvv/base/vwadd_wx_tumu-2.C b/gcc/testsuite/g++.target/riscv/rvv/base/vwadd_wx_tumu-2.C
new file mode 100644
index 00000000000..d818bbf1776
--- /dev/null
+++ b/gcc/testsuite/g++.target/riscv/rvv/base/vwadd_wx_tumu-2.C
@@ -0,0 +1,111 @@
+/* { dg-do compile } */
+/* { dg-options "-march=rv32gcv -mabi=ilp32 -O3 -fno-schedule-insns -fno-schedule-insns2" } */
+
+#include "riscv_vector.h"
+
+vint16mf4_t test___riscv_vwadd_wx_tumu(vbool64_t mask,vint16mf4_t merge,vint16mf4_t op1,int8_t op2,size_t vl)
+{
+    return __riscv_vwadd_wx_tumu(mask,merge,op1,0xAA,31);
+}
+
+
+vint16mf2_t test___riscv_vwadd_wx_tumu(vbool32_t mask,vint16mf2_t merge,vint16mf2_t op1,int8_t op2,size_t vl)
+{
+    return __riscv_vwadd_wx_tumu(mask,merge,op1,0xAA,31);
+}
+
+
+vint16m1_t test___riscv_vwadd_wx_tumu(vbool16_t mask,vint16m1_t merge,vint16m1_t op1,int8_t op2,size_t vl)
+{
+    return __riscv_vwadd_wx_tumu(mask,merge,op1,0xAA,31);
+}
+
+
+vint16m2_t test___riscv_vwadd_wx_tumu(vbool8_t mask,vint16m2_t merge,vint16m2_t op1,int8_t op2,size_t vl)
+{
+    return __riscv_vwadd_wx_tumu(mask,merge,op1,0xAA,31);
+}
+
+
+vint16m4_t test___riscv_vwadd_wx_tumu(vbool4_t mask,vint16m4_t merge,vint16m4_t op1,int8_t op2,size_t vl)
+{
+    return __riscv_vwadd_wx_tumu(mask,merge,op1,0xAA,31);
+}
+
+
+vint16m8_t test___riscv_vwadd_wx_tumu(vbool2_t mask,vint16m8_t merge,vint16m8_t op1,int8_t op2,size_t vl)
+{
+    return __riscv_vwadd_wx_tumu(mask,merge,op1,0xAA,31);
+}
+
+
+vint32mf2_t test___riscv_vwadd_wx_tumu(vbool64_t mask,vint32mf2_t merge,vint32mf2_t op1,int16_t op2,size_t vl)
+{
+    return __riscv_vwadd_wx_tumu(mask,merge,op1,0xAA,31);
+}
+
+
+vint32m1_t test___riscv_vwadd_wx_tumu(vbool32_t mask,vint32m1_t merge,vint32m1_t op1,int16_t op2,size_t vl)
+{
+    return __riscv_vwadd_wx_tumu(mask,merge,op1,0xAA,31);
+}
+
+
+vint32m2_t test___riscv_vwadd_wx_tumu(vbool16_t mask,vint32m2_t merge,vint32m2_t op1,int16_t op2,size_t vl)
+{
+    return __riscv_vwadd_wx_tumu(mask,merge,op1,0xAA,31);
+}
+
+
+vint32m4_t test___riscv_vwadd_wx_tumu(vbool8_t mask,vint32m4_t merge,vint32m4_t op1,int16_t op2,size_t vl)
+{
+    return __riscv_vwadd_wx_tumu(mask,merge,op1,0xAA,31);
+}
+
+
+vint32m8_t test___riscv_vwadd_wx_tumu(vbool4_t mask,vint32m8_t merge,vint32m8_t op1,int16_t op2,size_t vl)
+{
+    return __riscv_vwadd_wx_tumu(mask,merge,op1,0xAA,31);
+}
+
+
+vint64m1_t test___riscv_vwadd_wx_tumu(vbool64_t mask,vint64m1_t merge,vint64m1_t op1,int32_t op2,size_t vl)
+{
+    return __riscv_vwadd_wx_tumu(mask,merge,op1,0xAA,31);
+}
+
+
+vint64m2_t test___riscv_vwadd_wx_tumu(vbool32_t mask,vint64m2_t merge,vint64m2_t op1,int32_t op2,size_t vl)
+{
+    return __riscv_vwadd_wx_tumu(mask,merge,op1,0xAA,31);
+}
+
+
+vint64m4_t test___riscv_vwadd_wx_tumu(vbool16_t mask,vint64m4_t merge,vint64m4_t op1,int32_t op2,size_t vl)
+{
+    return __riscv_vwadd_wx_tumu(mask,merge,op1,0xAA,31);
+}
+
+
+vint64m8_t test___riscv_vwadd_wx_tumu(vbool8_t mask,vint64m8_t merge,vint64m8_t op1,int32_t op2,size_t vl)
+{
+    return __riscv_vwadd_wx_tumu(mask,merge,op1,0xAA,31);
+}
+
+
+
+/* { dg-final { scan-assembler-times {vsetivli\s+zero,\s*31,\s*e8,\s*mf8,\s*tu,\s*mu\s+vwadd\.wx\s+v[0-9]+,\s*v[0-9]+,\s*[a-x0-9]+,\s*v0.t\s+} 1 } } */
+/* { dg-final { scan-assembler-times {vsetivli\s+zero,\s*31,\s*e8,\s*mf4,\s*tu,\s*mu\s+vwadd\.wx\s+v[0-9]+,\s*v[0-9]+,\s*[a-x0-9]+,\s*v0.t\s+} 1 } } */
+/* { dg-final { scan-assembler-times {vsetivli\s+zero,\s*31,\s*e8,\s*mf2,\s*tu,\s*mu\s+vwadd\.wx\s+v[0-9]+,\s*v[0-9]+,\s*[a-x0-9]+,\s*v0.t\s+} 1 } } */
+/* { dg-final { scan-assembler-times {vsetivli\s+zero,\s*31,\s*e8,\s*m1,\s*tu,\s*mu\s+vwadd\.wx\s+v[0-9]+,\s*v[0-9]+,\s*[a-x0-9]+,\s*v0.t\s+} 1 } } */
+/* { dg-final { scan-assembler-times {vsetivli\s+zero,\s*31,\s*e8,\s*m2,\s*tu,\s*mu\s+vwadd\.wx\s+v[0-9]+,\s*v[0-9]+,\s*[a-x0-9]+,\s*v0.t\s+} 1 } } */
+/* { dg-final { scan-assembler-times {vsetivli\s+zero,\s*31,\s*e8,\s*m4,\s*tu,\s*mu\s+vwadd\.wx\s+v[0-9]+,\s*v[0-9]+,\s*[a-x0-9]+,\s*v0.t\s+} 1 } } */
+/* { dg-final { scan-assembler-times {vsetivli\s+zero,\s*31,\s*e16,\s*mf4,\s*tu,\s*mu\s+vwadd\.wx\s+v[0-9]+,\s*v[0-9]+,\s*[a-x0-9]+,\s*v0.t\s+} 1 } } */
+/* { dg-final { scan-assembler-times {vsetivli\s+zero,\s*31,\s*e16,\s*mf2,\s*tu,\s*mu\s+vwadd\.wx\s+v[0-9]+,\s*v[0-9]+,\s*[a-x0-9]+,\s*v0.t\s+} 1 } } */
+/* { dg-final { scan-assembler-times {vsetivli\s+zero,\s*31,\s*e16,\s*m1,\s*tu,\s*mu\s+vwadd\.wx\s+v[0-9]+,\s*v[0-9]+,\s*[a-x0-9]+,\s*v0.t\s+} 1 } } */
+/* { dg-final { scan-assembler-times {vsetivli\s+zero,\s*31,\s*e16,\s*m2,\s*tu,\s*mu\s+vwadd\.wx\s+v[0-9]+,\s*v[0-9]+,\s*[a-x0-9]+,\s*v0.t\s+} 1 } } */
+/* { dg-final { scan-assembler-times {vsetivli\s+zero,\s*31,\s*e16,\s*m4,\s*tu,\s*mu\s+vwadd\.wx\s+v[0-9]+,\s*v[0-9]+,\s*[a-x0-9]+,\s*v0.t\s+} 1 } } */
+/* { dg-final { scan-assembler-times {vsetivli\s+zero,\s*31,\s*e32,\s*mf2,\s*tu,\s*mu\s+vwadd\.wx\s+v[0-9]+,\s*v[0-9]+,\s*[a-x0-9]+,\s*v0.t\s+} 1 } } */
+/* { dg-final { scan-assembler-times {vsetivli\s+zero,\s*31,\s*e32,\s*m1,\s*tu,\s*mu\s+vwadd\.wx\s+v[0-9]+,\s*v[0-9]+,\s*[a-x0-9]+,\s*v0.t\s+} 1 } } */
+/* { dg-final { scan-assembler-times {vsetivli\s+zero,\s*31,\s*e32,\s*m2,\s*tu,\s*mu\s+vwadd\.wx\s+v[0-9]+,\s*v[0-9]+,\s*[a-x0-9]+,\s*v0.t\s+} 1 } } */
+/* { dg-final { scan-assembler-times {vsetivli\s+zero,\s*31,\s*e32,\s*m4,\s*tu,\s*mu\s+vwadd\.wx\s+v[0-9]+,\s*v[0-9]+,\s*[a-x0-9]+,\s*v0.t\s+} 1 } } */
diff --git a/gcc/testsuite/g++.target/riscv/rvv/base/vwadd_wx_tumu-3.C b/gcc/testsuite/g++.target/riscv/rvv/base/vwadd_wx_tumu-3.C
new file mode 100644
index 00000000000..195d1643085
--- /dev/null
+++ b/gcc/testsuite/g++.target/riscv/rvv/base/vwadd_wx_tumu-3.C
@@ -0,0 +1,111 @@
+/* { dg-do compile } */
+/* { dg-options "-march=rv32gcv -mabi=ilp32 -O3 -fno-schedule-insns -fno-schedule-insns2" } */
+
+#include "riscv_vector.h"
+
+vint16mf4_t test___riscv_vwadd_wx_tumu(vbool64_t mask,vint16mf4_t merge,vint16mf4_t op1,int8_t op2,size_t vl)
+{
+    return __riscv_vwadd_wx_tumu(mask,merge,op1,0xAA,32);
+}
+
+
+vint16mf2_t test___riscv_vwadd_wx_tumu(vbool32_t mask,vint16mf2_t merge,vint16mf2_t op1,int8_t op2,size_t vl)
+{
+    return __riscv_vwadd_wx_tumu(mask,merge,op1,0xAA,32);
+}
+
+
+vint16m1_t test___riscv_vwadd_wx_tumu(vbool16_t mask,vint16m1_t merge,vint16m1_t op1,int8_t op2,size_t vl)
+{
+    return __riscv_vwadd_wx_tumu(mask,merge,op1,0xAA,32);
+}
+
+
+vint16m2_t test___riscv_vwadd_wx_tumu(vbool8_t mask,vint16m2_t merge,vint16m2_t op1,int8_t op2,size_t vl)
+{
+    return __riscv_vwadd_wx_tumu(mask,merge,op1,0xAA,32);
+}
+
+
+vint16m4_t test___riscv_vwadd_wx_tumu(vbool4_t mask,vint16m4_t merge,vint16m4_t op1,int8_t op2,size_t vl)
+{
+    return __riscv_vwadd_wx_tumu(mask,merge,op1,0xAA,32);
+}
+
+
+vint16m8_t test___riscv_vwadd_wx_tumu(vbool2_t mask,vint16m8_t merge,vint16m8_t op1,int8_t op2,size_t vl)
+{
+    return __riscv_vwadd_wx_tumu(mask,merge,op1,0xAA,32);
+}
+
+
+vint32mf2_t test___riscv_vwadd_wx_tumu(vbool64_t mask,vint32mf2_t merge,vint32mf2_t op1,int16_t op2,size_t vl)
+{
+    return __riscv_vwadd_wx_tumu(mask,merge,op1,0xAA,32);
+}
+
+
+vint32m1_t test___riscv_vwadd_wx_tumu(vbool32_t mask,vint32m1_t merge,vint32m1_t op1,int16_t op2,size_t vl)
+{
+    return __riscv_vwadd_wx_tumu(mask,merge,op1,0xAA,32);
+}
+
+
+vint32m2_t test___riscv_vwadd_wx_tumu(vbool16_t mask,vint32m2_t merge,vint32m2_t op1,int16_t op2,size_t vl)
+{
+    return __riscv_vwadd_wx_tumu(mask,merge,op1,0xAA,32);
+}
+
+
+vint32m4_t test___riscv_vwadd_wx_tumu(vbool8_t mask,vint32m4_t merge,vint32m4_t op1,int16_t op2,size_t vl)
+{
+    return __riscv_vwadd_wx_tumu(mask,merge,op1,0xAA,32);
+}
+
+
+vint32m8_t test___riscv_vwadd_wx_tumu(vbool4_t mask,vint32m8_t merge,vint32m8_t op1,int16_t op2,size_t vl)
+{
+    return __riscv_vwadd_wx_tumu(mask,merge,op1,0xAA,32);
+}
+
+
+vint64m1_t test___riscv_vwadd_wx_tumu(vbool64_t mask,vint64m1_t merge,vint64m1_t op1,int32_t op2,size_t vl)
+{
+    return __riscv_vwadd_wx_tumu(mask,merge,op1,0xAA,32);
+}
+
+
+vint64m2_t test___riscv_vwadd_wx_tumu(vbool32_t mask,vint64m2_t merge,vint64m2_t op1,int32_t op2,size_t vl)
+{
+    return __riscv_vwadd_wx_tumu(mask,merge,op1,0xAA,32);
+}
+
+
+vint64m4_t test___riscv_vwadd_wx_tumu(vbool16_t mask,vint64m4_t merge,vint64m4_t op1,int32_t op2,size_t vl)
+{
+    return __riscv_vwadd_wx_tumu(mask,merge,op1,0xAA,32);
+}
+
+
+vint64m8_t test___riscv_vwadd_wx_tumu(vbool8_t mask,vint64m8_t merge,vint64m8_t op1,int32_t op2,size_t vl)
+{
+    return __riscv_vwadd_wx_tumu(mask,merge,op1,0xAA,32);
+}
+
+
+
+/* { dg-final { scan-assembler-times {vsetvli\s+zero,\s*[a-x0-9]+,\s*e8,\s*mf8,\s*tu,\s*mu\s+vwadd\.wx\s+v[0-9]+,\s*v[0-9]+,\s*[a-x0-9]+,\s*v0.t\s+} 1 } } */
+/* { dg-final { scan-assembler-times {vsetvli\s+zero,\s*[a-x0-9]+,\s*e8,\s*mf4,\s*tu,\s*mu\s+vwadd\.wx\s+v[0-9]+,\s*v[0-9]+,\s*[a-x0-9]+,\s*v0.t\s+} 1 } } */
+/* { dg-final { scan-assembler-times {vsetvli\s+zero,\s*[a-x0-9]+,\s*e8,\s*mf2,\s*tu,\s*mu\s+vwadd\.wx\s+v[0-9]+,\s*v[0-9]+,\s*[a-x0-9]+,\s*v0.t\s+} 1 } } */
+/* { dg-final { scan-assembler-times {vsetvli\s+zero,\s*[a-x0-9]+,\s*e8,\s*m1,\s*tu,\s*mu\s+vwadd\.wx\s+v[0-9]+,\s*v[0-9]+,\s*[a-x0-9]+,\s*v0.t\s+} 1 } } */
+/* { dg-final { scan-assembler-times {vsetvli\s+zero,\s*[a-x0-9]+,\s*e8,\s*m2,\s*tu,\s*mu\s+vwadd\.wx\s+v[0-9]+,\s*v[0-9]+,\s*[a-x0-9]+,\s*v0.t\s+} 1 } } */
+/* { dg-final { scan-assembler-times {vsetvli\s+zero,\s*[a-x0-9]+,\s*e8,\s*m4,\s*tu,\s*mu\s+vwadd\.wx\s+v[0-9]+,\s*v[0-9]+,\s*[a-x0-9]+,\s*v0.t\s+} 1 } } */
+/* { dg-final { scan-assembler-times {vsetvli\s+zero,\s*[a-x0-9]+,\s*e16,\s*mf4,\s*tu,\s*mu\s+vwadd\.wx\s+v[0-9]+,\s*v[0-9]+,\s*[a-x0-9]+,\s*v0.t\s+} 1 } } */
+/* { dg-final { scan-assembler-times {vsetvli\s+zero,\s*[a-x0-9]+,\s*e16,\s*mf2,\s*tu,\s*mu\s+vwadd\.wx\s+v[0-9]+,\s*v[0-9]+,\s*[a-x0-9]+,\s*v0.t\s+} 1 } } */
+/* { dg-final { scan-assembler-times {vsetvli\s+zero,\s*[a-x0-9]+,\s*e16,\s*m1,\s*tu,\s*mu\s+vwadd\.wx\s+v[0-9]+,\s*v[0-9]+,\s*[a-x0-9]+,\s*v0.t\s+} 1 } } */
+/* { dg-final { scan-assembler-times {vsetvli\s+zero,\s*[a-x0-9]+,\s*e16,\s*m2,\s*tu,\s*mu\s+vwadd\.wx\s+v[0-9]+,\s*v[0-9]+,\s*[a-x0-9]+,\s*v0.t\s+} 1 } } */
+/* { dg-final { scan-assembler-times {vsetvli\s+zero,\s*[a-x0-9]+,\s*e16,\s*m4,\s*tu,\s*mu\s+vwadd\.wx\s+v[0-9]+,\s*v[0-9]+,\s*[a-x0-9]+,\s*v0.t\s+} 1 } } */
+/* { dg-final { scan-assembler-times {vsetvli\s+zero,\s*[a-x0-9]+,\s*e32,\s*mf2,\s*tu,\s*mu\s+vwadd\.wx\s+v[0-9]+,\s*v[0-9]+,\s*[a-x0-9]+,\s*v0.t\s+} 1 } } */
+/* { dg-final { scan-assembler-times {vsetvli\s+zero,\s*[a-x0-9]+,\s*e32,\s*m1,\s*tu,\s*mu\s+vwadd\.wx\s+v[0-9]+,\s*v[0-9]+,\s*[a-x0-9]+,\s*v0.t\s+} 1 } } */
+/* { dg-final { scan-assembler-times {vsetvli\s+zero,\s*[a-x0-9]+,\s*e32,\s*m2,\s*tu,\s*mu\s+vwadd\.wx\s+v[0-9]+,\s*v[0-9]+,\s*[a-x0-9]+,\s*v0.t\s+} 1 } } */
+/* { dg-final { scan-assembler-times {vsetvli\s+zero,\s*[a-x0-9]+,\s*e32,\s*m4,\s*tu,\s*mu\s+vwadd\.wx\s+v[0-9]+,\s*v[0-9]+,\s*[a-x0-9]+,\s*v0.t\s+} 1 } } */
-- 
2.36.1

[PATCH] RISC-V: Add vwadd.w C API tests

[juzhe.zhong]

From: Ju-Zhe Zhong <juzhe.zhong@rivai.ai>

gcc/testsuite/ChangeLog:

        * gcc.target/riscv/rvv/base/vwadd_wv-1.c: New test.
        * gcc.target/riscv/rvv/base/vwadd_wv-2.c: New test.
        * gcc.target/riscv/rvv/base/vwadd_wv-3.c: New test.
        * gcc.target/riscv/rvv/base/vwadd_wv_m-1.c: New test.
        * gcc.target/riscv/rvv/base/vwadd_wv_m-2.c: New test.
        * gcc.target/riscv/rvv/base/vwadd_wv_m-3.c: New test.
        * gcc.target/riscv/rvv/base/vwadd_wv_mu-1.c: New test.
        * gcc.target/riscv/rvv/base/vwadd_wv_mu-2.c: New test.
        * gcc.target/riscv/rvv/base/vwadd_wv_mu-3.c: New test.
        * gcc.target/riscv/rvv/base/vwadd_wv_tu-1.c: New test.
        * gcc.target/riscv/rvv/base/vwadd_wv_tu-2.c: New test.
        * gcc.target/riscv/rvv/base/vwadd_wv_tu-3.c: New test.
        * gcc.target/riscv/rvv/base/vwadd_wv_tum-1.c: New test.
        * gcc.target/riscv/rvv/base/vwadd_wv_tum-2.c: New test.
        * gcc.target/riscv/rvv/base/vwadd_wv_tum-3.c: New test.
        * gcc.target/riscv/rvv/base/vwadd_wv_tumu-1.c: New test.
        * gcc.target/riscv/rvv/base/vwadd_wv_tumu-2.c: New test.
        * gcc.target/riscv/rvv/base/vwadd_wv_tumu-3.c: New test.
        * gcc.target/riscv/rvv/base/vwadd_wx-1.c: New test.
        * gcc.target/riscv/rvv/base/vwadd_wx-2.c: New test.
        * gcc.target/riscv/rvv/base/vwadd_wx-3.c: New test.
        * gcc.target/riscv/rvv/base/vwadd_wx_m-1.c: New test.
        * gcc.target/riscv/rvv/base/vwadd_wx_m-2.c: New test.
        * gcc.target/riscv/rvv/base/vwadd_wx_m-3.c: New test.
        * gcc.target/riscv/rvv/base/vwadd_wx_mu-1.c: New test.
        * gcc.target/riscv/rvv/base/vwadd_wx_mu-2.c: New test.
        * gcc.target/riscv/rvv/base/vwadd_wx_mu-3.c: New test.
        * gcc.target/riscv/rvv/base/vwadd_wx_tu-1.c: New test.
        * gcc.target/riscv/rvv/base/vwadd_wx_tu-2.c: New test.
        * gcc.target/riscv/rvv/base/vwadd_wx_tu-3.c: New test.
        * gcc.target/riscv/rvv/base/vwadd_wx_tum-1.c: New test.
        * gcc.target/riscv/rvv/base/vwadd_wx_tum-2.c: New test.
        * gcc.target/riscv/rvv/base/vwadd_wx_tum-3.c: New test.
        * gcc.target/riscv/rvv/base/vwadd_wx_tumu-1.c: New test.
        * gcc.target/riscv/rvv/base/vwadd_wx_tumu-2.c: New test.
        * gcc.target/riscv/rvv/base/vwadd_wx_tumu-3.c: New test.

---
 .../gcc.target/riscv/rvv/base/vwadd_wv-1.c    | 111 ++++++++++++++++++
 .../gcc.target/riscv/rvv/base/vwadd_wv-2.c    | 111 ++++++++++++++++++
 .../gcc.target/riscv/rvv/base/vwadd_wv-3.c    | 111 ++++++++++++++++++
 .../gcc.target/riscv/rvv/base/vwadd_wv_m-1.c  | 111 ++++++++++++++++++
 .../gcc.target/riscv/rvv/base/vwadd_wv_m-2.c  | 111 ++++++++++++++++++
 .../gcc.target/riscv/rvv/base/vwadd_wv_m-3.c  | 111 ++++++++++++++++++
 .../gcc.target/riscv/rvv/base/vwadd_wv_mu-1.c | 111 ++++++++++++++++++
 .../gcc.target/riscv/rvv/base/vwadd_wv_mu-2.c | 111 ++++++++++++++++++
 .../gcc.target/riscv/rvv/base/vwadd_wv_mu-3.c | 111 ++++++++++++++++++
 .../gcc.target/riscv/rvv/base/vwadd_wv_tu-1.c | 111 ++++++++++++++++++
 .../gcc.target/riscv/rvv/base/vwadd_wv_tu-2.c | 111 ++++++++++++++++++
 .../gcc.target/riscv/rvv/base/vwadd_wv_tu-3.c | 111 ++++++++++++++++++
 .../riscv/rvv/base/vwadd_wv_tum-1.c           | 111 ++++++++++++++++++
 .../riscv/rvv/base/vwadd_wv_tum-2.c           | 111 ++++++++++++++++++
 .../riscv/rvv/base/vwadd_wv_tum-3.c           | 111 ++++++++++++++++++
 .../riscv/rvv/base/vwadd_wv_tumu-1.c          | 111 ++++++++++++++++++
 .../riscv/rvv/base/vwadd_wv_tumu-2.c          | 111 ++++++++++++++++++
 .../riscv/rvv/base/vwadd_wv_tumu-3.c          | 111 ++++++++++++++++++
 .../gcc.target/riscv/rvv/base/vwadd_wx-1.c    | 111 ++++++++++++++++++
 .../gcc.target/riscv/rvv/base/vwadd_wx-2.c    | 111 ++++++++++++++++++
 .../gcc.target/riscv/rvv/base/vwadd_wx-3.c    | 111 ++++++++++++++++++
 .../gcc.target/riscv/rvv/base/vwadd_wx_m-1.c  | 111 ++++++++++++++++++
 .../gcc.target/riscv/rvv/base/vwadd_wx_m-2.c  | 111 ++++++++++++++++++
 .../gcc.target/riscv/rvv/base/vwadd_wx_m-3.c  | 111 ++++++++++++++++++
 .../gcc.target/riscv/rvv/base/vwadd_wx_mu-1.c | 111 ++++++++++++++++++
 .../gcc.target/riscv/rvv/base/vwadd_wx_mu-2.c | 111 ++++++++++++++++++
 .../gcc.target/riscv/rvv/base/vwadd_wx_mu-3.c | 111 ++++++++++++++++++
 .../gcc.target/riscv/rvv/base/vwadd_wx_tu-1.c | 111 ++++++++++++++++++
 .../gcc.target/riscv/rvv/base/vwadd_wx_tu-2.c | 111 ++++++++++++++++++
 .../gcc.target/riscv/rvv/base/vwadd_wx_tu-3.c | 111 ++++++++++++++++++
 .../riscv/rvv/base/vwadd_wx_tum-1.c           | 111 ++++++++++++++++++
 .../riscv/rvv/base/vwadd_wx_tum-2.c           | 111 ++++++++++++++++++
 .../riscv/rvv/base/vwadd_wx_tum-3.c           | 111 ++++++++++++++++++
 .../riscv/rvv/base/vwadd_wx_tumu-1.c          | 111 ++++++++++++++++++
 .../riscv/rvv/base/vwadd_wx_tumu-2.c          | 111 ++++++++++++++++++
 .../riscv/rvv/base/vwadd_wx_tumu-3.c          | 111 ++++++++++++++++++
 36 files changed, 3996 insertions(+)
 create mode 100644 gcc/testsuite/gcc.target/riscv/rvv/base/vwadd_wv-1.c
 create mode 100644 gcc/testsuite/gcc.target/riscv/rvv/base/vwadd_wv-2.c
 create mode 100644 gcc/testsuite/gcc.target/riscv/rvv/base/vwadd_wv-3.c
 create mode 100644 gcc/testsuite/gcc.target/riscv/rvv/base/vwadd_wv_m-1.c
 create mode 100644 gcc/testsuite/gcc.target/riscv/rvv/base/vwadd_wv_m-2.c
 create mode 100644 gcc/testsuite/gcc.target/riscv/rvv/base/vwadd_wv_m-3.c
 create mode 100644 gcc/testsuite/gcc.target/riscv/rvv/base/vwadd_wv_mu-1.c
 create mode 100644 gcc/testsuite/gcc.target/riscv/rvv/base/vwadd_wv_mu-2.c
 create mode 100644 gcc/testsuite/gcc.target/riscv/rvv/base/vwadd_wv_mu-3.c
 create mode 100644 gcc/testsuite/gcc.target/riscv/rvv/base/vwadd_wv_tu-1.c
 create mode 100644 gcc/testsuite/gcc.target/riscv/rvv/base/vwadd_wv_tu-2.c
 create mode 100644 gcc/testsuite/gcc.target/riscv/rvv/base/vwadd_wv_tu-3.c
 create mode 100644 gcc/testsuite/gcc.target/riscv/rvv/base/vwadd_wv_tum-1.c
 create mode 100644 gcc/testsuite/gcc.target/riscv/rvv/base/vwadd_wv_tum-2.c
 create mode 100644 gcc/testsuite/gcc.target/riscv/rvv/base/vwadd_wv_tum-3.c
 create mode 100644 gcc/testsuite/gcc.target/riscv/rvv/base/vwadd_wv_tumu-1.c
 create mode 100644 gcc/testsuite/gcc.target/riscv/rvv/base/vwadd_wv_tumu-2.c
 create mode 100644 gcc/testsuite/gcc.target/riscv/rvv/base/vwadd_wv_tumu-3.c
 create mode 100644 gcc/testsuite/gcc.target/riscv/rvv/base/vwadd_wx-1.c
 create mode 100644 gcc/testsuite/gcc.target/riscv/rvv/base/vwadd_wx-2.c
 create mode 100644 gcc/testsuite/gcc.target/riscv/rvv/base/vwadd_wx-3.c
 create mode 100644 gcc/testsuite/gcc.target/riscv/rvv/base/vwadd_wx_m-1.c
 create mode 100644 gcc/testsuite/gcc.target/riscv/rvv/base/vwadd_wx_m-2.c
 create mode 100644 gcc/testsuite/gcc.target/riscv/rvv/base/vwadd_wx_m-3.c
 create mode 100644 gcc/testsuite/gcc.target/riscv/rvv/base/vwadd_wx_mu-1.c
 create mode 100644 gcc/testsuite/gcc.target/riscv/rvv/base/vwadd_wx_mu-2.c
 create mode 100644 gcc/testsuite/gcc.target/riscv/rvv/base/vwadd_wx_mu-3.c
 create mode 100644 gcc/testsuite/gcc.target/riscv/rvv/base/vwadd_wx_tu-1.c
 create mode 100644 gcc/testsuite/gcc.target/riscv/rvv/base/vwadd_wx_tu-2.c
 create mode 100644 gcc/testsuite/gcc.target/riscv/rvv/base/vwadd_wx_tu-3.c
 create mode 100644 gcc/testsuite/gcc.target/riscv/rvv/base/vwadd_wx_tum-1.c
 create mode 100644 gcc/testsuite/gcc.target/riscv/rvv/base/vwadd_wx_tum-2.c
 create mode 100644 gcc/testsuite/gcc.target/riscv/rvv/base/vwadd_wx_tum-3.c
 create mode 100644 gcc/testsuite/gcc.target/riscv/rvv/base/vwadd_wx_tumu-1.c
 create mode 100644 gcc/testsuite/gcc.target/riscv/rvv/base/vwadd_wx_tumu-2.c
 create mode 100644 gcc/testsuite/gcc.target/riscv/rvv/base/vwadd_wx_tumu-3.c

diff --git a/gcc/testsuite/gcc.target/riscv/rvv/base/vwadd_wv-1.c b/gcc/testsuite/gcc.target/riscv/rvv/base/vwadd_wv-1.c
new file mode 100644
index 00000000000..4558fff96e7
--- /dev/null
+++ b/gcc/testsuite/gcc.target/riscv/rvv/base/vwadd_wv-1.c
@@ -0,0 +1,111 @@
+/* { dg-do compile } */
+/* { dg-options "-march=rv64gcv -mabi=lp64d -O3 -fno-schedule-insns -fno-schedule-insns2" } */
+
+#include "riscv_vector.h"
+
+vint16mf4_t test___riscv_vwadd_wv_i16mf4(vint16mf4_t op1,vint8mf8_t op2,size_t vl)
+{
+    return __riscv_vwadd_wv_i16mf4(op1,op2,vl);
+}
+
+
+vint16mf2_t test___riscv_vwadd_wv_i16mf2(vint16mf2_t op1,vint8mf4_t op2,size_t vl)
+{
+    return __riscv_vwadd_wv_i16mf2(op1,op2,vl);
+}
+
+
+vint16m1_t test___riscv_vwadd_wv_i16m1(vint16m1_t op1,vint8mf2_t op2,size_t vl)
+{
+    return __riscv_vwadd_wv_i16m1(op1,op2,vl);
+}
+
+
+vint16m2_t test___riscv_vwadd_wv_i16m2(vint16m2_t op1,vint8m1_t op2,size_t vl)
+{
+    return __riscv_vwadd_wv_i16m2(op1,op2,vl);
+}
+
+
+vint16m4_t test___riscv_vwadd_wv_i16m4(vint16m4_t op1,vint8m2_t op2,size_t vl)
+{
+    return __riscv_vwadd_wv_i16m4(op1,op2,vl);
+}
+
+
+vint16m8_t test___riscv_vwadd_wv_i16m8(vint16m8_t op1,vint8m4_t op2,size_t vl)
+{
+    return __riscv_vwadd_wv_i16m8(op1,op2,vl);
+}
+
+
+vint32mf2_t test___riscv_vwadd_wv_i32mf2(vint32mf2_t op1,vint16mf4_t op2,size_t vl)
+{
+    return __riscv_vwadd_wv_i32mf2(op1,op2,vl);
+}
+
+
+vint32m1_t test___riscv_vwadd_wv_i32m1(vint32m1_t op1,vint16mf2_t op2,size_t vl)
+{
+    return __riscv_vwadd_wv_i32m1(op1,op2,vl);
+}
+
+
+vint32m2_t test___riscv_vwadd_wv_i32m2(vint32m2_t op1,vint16m1_t op2,size_t vl)
+{
+    return __riscv_vwadd_wv_i32m2(op1,op2,vl);
+}
+
+
+vint32m4_t test___riscv_vwadd_wv_i32m4(vint32m4_t op1,vint16m2_t op2,size_t vl)
+{
+    return __riscv_vwadd_wv_i32m4(op1,op2,vl);
+}
+
+
+vint32m8_t test___riscv_vwadd_wv_i32m8(vint32m8_t op1,vint16m4_t op2,size_t vl)
+{
+    return __riscv_vwadd_wv_i32m8(op1,op2,vl);
+}
+
+
+vint64m1_t test___riscv_vwadd_wv_i64m1(vint64m1_t op1,vint32mf2_t op2,size_t vl)
+{
+    return __riscv_vwadd_wv_i64m1(op1,op2,vl);
+}
+
+
+vint64m2_t test___riscv_vwadd_wv_i64m2(vint64m2_t op1,vint32m1_t op2,size_t vl)
+{
+    return __riscv_vwadd_wv_i64m2(op1,op2,vl);
+}
+
+
+vint64m4_t test___riscv_vwadd_wv_i64m4(vint64m4_t op1,vint32m2_t op2,size_t vl)
+{
+    return __riscv_vwadd_wv_i64m4(op1,op2,vl);
+}
+
+
+vint64m8_t test___riscv_vwadd_wv_i64m8(vint64m8_t op1,vint32m4_t op2,size_t vl)
+{
+    return __riscv_vwadd_wv_i64m8(op1,op2,vl);
+}
+
+
+
+/* { dg-final { scan-assembler-times {vsetvli\s+zero,\s*[a-x0-9]+,\s*e8,\s*mf8,\s*t[au],\s*m[au]\s+vwadd\.wv\s+v[0-9]+,\s*v[0-9]+,\s*v[0-9]+} 1 } } */
+/* { dg-final { scan-assembler-times {vsetvli\s+zero,\s*[a-x0-9]+,\s*e8,\s*mf4,\s*t[au],\s*m[au]\s+vwadd\.wv\s+v[0-9]+,\s*v[0-9]+,\s*v[0-9]+} 1 } } */
+/* { dg-final { scan-assembler-times {vsetvli\s+zero,\s*[a-x0-9]+,\s*e8,\s*mf2,\s*t[au],\s*m[au]\s+vwadd\.wv\s+v[0-9]+,\s*v[0-9]+,\s*v[0-9]+} 1 } } */
+/* { dg-final { scan-assembler-times {vsetvli\s+zero,\s*[a-x0-9]+,\s*e8,\s*m1,\s*t[au],\s*m[au]\s+vwadd\.wv\s+v[0-9]+,\s*v[0-9]+,\s*v[0-9]+} 1 } } */
+/* { dg-final { scan-assembler-times {vsetvli\s+zero,\s*[a-x0-9]+,\s*e8,\s*m2,\s*t[au],\s*m[au]\s+vwadd\.wv\s+v[0-9]+,\s*v[0-9]+,\s*v[0-9]+} 1 } } */
+/* { dg-final { scan-assembler-times {vsetvli\s+zero,\s*[a-x0-9]+,\s*e8,\s*m4,\s*t[au],\s*m[au]\s+vwadd\.wv\s+v[0-9]+,\s*v[0-9]+,\s*v[0-9]+} 1 } } */
+/* { dg-final { scan-assembler-times {vsetvli\s+zero,\s*[a-x0-9]+,\s*e16,\s*mf4,\s*t[au],\s*m[au]\s+vwadd\.wv\s+v[0-9]+,\s*v[0-9]+,\s*v[0-9]+} 1 } } */
+/* { dg-final { scan-assembler-times {vsetvli\s+zero,\s*[a-x0-9]+,\s*e16,\s*mf2,\s*t[au],\s*m[au]\s+vwadd\.wv\s+v[0-9]+,\s*v[0-9]+,\s*v[0-9]+} 1 } } */
+/* { dg-final { scan-assembler-times {vsetvli\s+zero,\s*[a-x0-9]+,\s*e16,\s*m1,\s*t[au],\s*m[au]\s+vwadd\.wv\s+v[0-9]+,\s*v[0-9]+,\s*v[0-9]+} 1 } } */
+/* { dg-final { scan-assembler-times {vsetvli\s+zero,\s*[a-x0-9]+,\s*e16,\s*m2,\s*t[au],\s*m[au]\s+vwadd\.wv\s+v[0-9]+,\s*v[0-9]+,\s*v[0-9]+} 1 } } */
+/* { dg-final { scan-assembler-times {vsetvli\s+zero,\s*[a-x0-9]+,\s*e16,\s*m4,\s*t[au],\s*m[au]\s+vwadd\.wv\s+v[0-9]+,\s*v[0-9]+,\s*v[0-9]+} 1 } } */
+/* { dg-final { scan-assembler-times {vsetvli\s+zero,\s*[a-x0-9]+,\s*e32,\s*mf2,\s*t[au],\s*m[au]\s+vwadd\.wv\s+v[0-9]+,\s*v[0-9]+,\s*v[0-9]+} 1 } } */
+/* { dg-final { scan-assembler-times {vsetvli\s+zero,\s*[a-x0-9]+,\s*e32,\s*m1,\s*t[au],\s*m[au]\s+vwadd\.wv\s+v[0-9]+,\s*v[0-9]+,\s*v[0-9]+} 1 } } */
+/* { dg-final { scan-assembler-times {vsetvli\s+zero,\s*[a-x0-9]+,\s*e32,\s*m2,\s*t[au],\s*m[au]\s+vwadd\.wv\s+v[0-9]+,\s*v[0-9]+,\s*v[0-9]+} 1 } } */
+/* { dg-final { scan-assembler-times {vsetvli\s+zero,\s*[a-x0-9]+,\s*e32,\s*m4,\s*t[au],\s*m[au]\s+vwadd\.wv\s+v[0-9]+,\s*v[0-9]+,\s*v[0-9]+} 1 } } */
diff --git a/gcc/testsuite/gcc.target/riscv/rvv/base/vwadd_wv-2.c b/gcc/testsuite/gcc.target/riscv/rvv/base/vwadd_wv-2.c
new file mode 100644
index 00000000000..b96d7796153
--- /dev/null
+++ b/gcc/testsuite/gcc.target/riscv/rvv/base/vwadd_wv-2.c
@@ -0,0 +1,111 @@
+/* { dg-do compile } */
+/* { dg-options "-march=rv64gcv -mabi=lp64d -O3 -fno-schedule-insns -fno-schedule-insns2" } */
+
+#include "riscv_vector.h"
+
+vint16mf4_t test___riscv_vwadd_wv_i16mf4(vint16mf4_t op1,vint8mf8_t op2,size_t vl)
+{
+    return __riscv_vwadd_wv_i16mf4(op1,op2,31);
+}
+
+
+vint16mf2_t test___riscv_vwadd_wv_i16mf2(vint16mf2_t op1,vint8mf4_t op2,size_t vl)
+{
+    return __riscv_vwadd_wv_i16mf2(op1,op2,31);
+}
+
+
+vint16m1_t test___riscv_vwadd_wv_i16m1(vint16m1_t op1,vint8mf2_t op2,size_t vl)
+{
+    return __riscv_vwadd_wv_i16m1(op1,op2,31);
+}
+
+
+vint16m2_t test___riscv_vwadd_wv_i16m2(vint16m2_t op1,vint8m1_t op2,size_t vl)
+{
+    return __riscv_vwadd_wv_i16m2(op1,op2,31);
+}
+
+
+vint16m4_t test___riscv_vwadd_wv_i16m4(vint16m4_t op1,vint8m2_t op2,size_t vl)
+{
+    return __riscv_vwadd_wv_i16m4(op1,op2,31);
+}
+
+
+vint16m8_t test___riscv_vwadd_wv_i16m8(vint16m8_t op1,vint8m4_t op2,size_t vl)
+{
+    return __riscv_vwadd_wv_i16m8(op1,op2,31);
+}
+
+
+vint32mf2_t test___riscv_vwadd_wv_i32mf2(vint32mf2_t op1,vint16mf4_t op2,size_t vl)
+{
+    return __riscv_vwadd_wv_i32mf2(op1,op2,31);
+}
+
+
+vint32m1_t test___riscv_vwadd_wv_i32m1(vint32m1_t op1,vint16mf2_t op2,size_t vl)
+{
+    return __riscv_vwadd_wv_i32m1(op1,op2,31);
+}
+
+
+vint32m2_t test___riscv_vwadd_wv_i32m2(vint32m2_t op1,vint16m1_t op2,size_t vl)
+{
+    return __riscv_vwadd_wv_i32m2(op1,op2,31);
+}
+
+
+vint32m4_t test___riscv_vwadd_wv_i32m4(vint32m4_t op1,vint16m2_t op2,size_t vl)
+{
+    return __riscv_vwadd_wv_i32m4(op1,op2,31);
+}
+
+
+vint32m8_t test___riscv_vwadd_wv_i32m8(vint32m8_t op1,vint16m4_t op2,size_t vl)
+{
+    return __riscv_vwadd_wv_i32m8(op1,op2,31);
+}
+
+
+vint64m1_t test___riscv_vwadd_wv_i64m1(vint64m1_t op1,vint32mf2_t op2,size_t vl)
+{
+    return __riscv_vwadd_wv_i64m1(op1,op2,31);
+}
+
+
+vint64m2_t test___riscv_vwadd_wv_i64m2(vint64m2_t op1,vint32m1_t op2,size_t vl)
+{
+    return __riscv_vwadd_wv_i64m2(op1,op2,31);
+}
+
+
+vint64m4_t test___riscv_vwadd_wv_i64m4(vint64m4_t op1,vint32m2_t op2,size_t vl)
+{
+    return __riscv_vwadd_wv_i64m4(op1,op2,31);
+}
+
+
+vint64m8_t test___riscv_vwadd_wv_i64m8(vint64m8_t op1,vint32m4_t op2,size_t vl)
+{
+    return __riscv_vwadd_wv_i64m8(op1,op2,31);
+}
+
+
+
+/* { dg-final { scan-assembler-times {vsetivli\s+zero,\s*31,\s*e8,\s*mf8,\s*t[au],\s*m[au]\s+vwadd\.wv\s+v[0-9]+,\s*v[0-9]+,\s*v[0-9]+} 1 } } */
+/* { dg-final { scan-assembler-times {vsetivli\s+zero,\s*31,\s*e8,\s*mf4,\s*t[au],\s*m[au]\s+vwadd\.wv\s+v[0-9]+,\s*v[0-9]+,\s*v[0-9]+} 1 } } */
+/* { dg-final { scan-assembler-times {vsetivli\s+zero,\s*31,\s*e8,\s*mf2,\s*t[au],\s*m[au]\s+vwadd\.wv\s+v[0-9]+,\s*v[0-9]+,\s*v[0-9]+} 1 } } */
+/* { dg-final { scan-assembler-times {vsetivli\s+zero,\s*31,\s*e8,\s*m1,\s*t[au],\s*m[au]\s+vwadd\.wv\s+v[0-9]+,\s*v[0-9]+,\s*v[0-9]+} 1 } } */
+/* { dg-final { scan-assembler-times {vsetivli\s+zero,\s*31,\s*e8,\s*m2,\s*t[au],\s*m[au]\s+vwadd\.wv\s+v[0-9]+,\s*v[0-9]+,\s*v[0-9]+} 1 } } */
+/* { dg-final { scan-assembler-times {vsetivli\s+zero,\s*31,\s*e8,\s*m4,\s*t[au],\s*m[au]\s+vwadd\.wv\s+v[0-9]+,\s*v[0-9]+,\s*v[0-9]+} 1 } } */
+/* { dg-final { scan-assembler-times {vsetivli\s+zero,\s*31,\s*e16,\s*mf4,\s*t[au],\s*m[au]\s+vwadd\.wv\s+v[0-9]+,\s*v[0-9]+,\s*v[0-9]+} 1 } } */
+/* { dg-final { scan-assembler-times {vsetivli\s+zero,\s*31,\s*e16,\s*mf2,\s*t[au],\s*m[au]\s+vwadd\.wv\s+v[0-9]+,\s*v[0-9]+,\s*v[0-9]+} 1 } } */
+/* { dg-final { scan-assembler-times {vsetivli\s+zero,\s*31,\s*e16,\s*m1,\s*t[au],\s*m[au]\s+vwadd\.wv\s+v[0-9]+,\s*v[0-9]+,\s*v[0-9]+} 1 } } */
+/* { dg-final { scan-assembler-times {vsetivli\s+zero,\s*31,\s*e16,\s*m2,\s*t[au],\s*m[au]\s+vwadd\.wv\s+v[0-9]+,\s*v[0-9]+,\s*v[0-9]+} 1 } } */
+/* { dg-final { scan-assembler-times {vsetivli\s+zero,\s*31,\s*e16,\s*m4,\s*t[au],\s*m[au]\s+vwadd\.wv\s+v[0-9]+,\s*v[0-9]+,\s*v[0-9]+} 1 } } */
+/* { dg-final { scan-assembler-times {vsetivli\s+zero,\s*31,\s*e32,\s*mf2,\s*t[au],\s*m[au]\s+vwadd\.wv\s+v[0-9]+,\s*v[0-9]+,\s*v[0-9]+} 1 } } */
+/* { dg-final { scan-assembler-times {vsetivli\s+zero,\s*31,\s*e32,\s*m1,\s*t[au],\s*m[au]\s+vwadd\.wv\s+v[0-9]+,\s*v[0-9]+,\s*v[0-9]+} 1 } } */
+/* { dg-final { scan-assembler-times {vsetivli\s+zero,\s*31,\s*e32,\s*m2,\s*t[au],\s*m[au]\s+vwadd\.wv\s+v[0-9]+,\s*v[0-9]+,\s*v[0-9]+} 1 } } */
+/* { dg-final { scan-assembler-times {vsetivli\s+zero,\s*31,\s*e32,\s*m4,\s*t[au],\s*m[au]\s+vwadd\.wv\s+v[0-9]+,\s*v[0-9]+,\s*v[0-9]+} 1 } } */
diff --git a/gcc/testsuite/gcc.target/riscv/rvv/base/vwadd_wv-3.c b/gcc/testsuite/gcc.target/riscv/rvv/base/vwadd_wv-3.c
new file mode 100644
index 00000000000..d85197f199e
--- /dev/null
+++ b/gcc/testsuite/gcc.target/riscv/rvv/base/vwadd_wv-3.c
@@ -0,0 +1,111 @@
+/* { dg-do compile } */
+/* { dg-options "-march=rv64gcv -mabi=lp64d -O3 -fno-schedule-insns -fno-schedule-insns2" } */
+
+#include "riscv_vector.h"
+
+vint16mf4_t test___riscv_vwadd_wv_i16mf4(vint16mf4_t op1,vint8mf8_t op2,size_t vl)
+{
+    return __riscv_vwadd_wv_i16mf4(op1,op2,32);
+}
+
+
+vint16mf2_t test___riscv_vwadd_wv_i16mf2(vint16mf2_t op1,vint8mf4_t op2,size_t vl)
+{
+    return __riscv_vwadd_wv_i16mf2(op1,op2,32);
+}
+
+
+vint16m1_t test___riscv_vwadd_wv_i16m1(vint16m1_t op1,vint8mf2_t op2,size_t vl)
+{
+    return __riscv_vwadd_wv_i16m1(op1,op2,32);
+}
+
+
+vint16m2_t test___riscv_vwadd_wv_i16m2(vint16m2_t op1,vint8m1_t op2,size_t vl)
+{
+    return __riscv_vwadd_wv_i16m2(op1,op2,32);
+}
+
+
+vint16m4_t test___riscv_vwadd_wv_i16m4(vint16m4_t op1,vint8m2_t op2,size_t vl)
+{
+    return __riscv_vwadd_wv_i16m4(op1,op2,32);
+}
+
+
+vint16m8_t test___riscv_vwadd_wv_i16m8(vint16m8_t op1,vint8m4_t op2,size_t vl)
+{
+    return __riscv_vwadd_wv_i16m8(op1,op2,32);
+}
+
+
+vint32mf2_t test___riscv_vwadd_wv_i32mf2(vint32mf2_t op1,vint16mf4_t op2,size_t vl)
+{
+    return __riscv_vwadd_wv_i32mf2(op1,op2,32);
+}
+
+
+vint32m1_t test___riscv_vwadd_wv_i32m1(vint32m1_t op1,vint16mf2_t op2,size_t vl)
+{
+    return __riscv_vwadd_wv_i32m1(op1,op2,32);
+}
+
+
+vint32m2_t test___riscv_vwadd_wv_i32m2(vint32m2_t op1,vint16m1_t op2,size_t vl)
+{
+    return __riscv_vwadd_wv_i32m2(op1,op2,32);
+}
+
+
+vint32m4_t test___riscv_vwadd_wv_i32m4(vint32m4_t op1,vint16m2_t op2,size_t vl)
+{
+    return __riscv_vwadd_wv_i32m4(op1,op2,32);
+}
+
+
+vint32m8_t test___riscv_vwadd_wv_i32m8(vint32m8_t op1,vint16m4_t op2,size_t vl)
+{
+    return __riscv_vwadd_wv_i32m8(op1,op2,32);
+}
+
+
+vint64m1_t test___riscv_vwadd_wv_i64m1(vint64m1_t op1,vint32mf2_t op2,size_t vl)
+{
+    return __riscv_vwadd_wv_i64m1(op1,op2,32);
+}
+
+
+vint64m2_t test___riscv_vwadd_wv_i64m2(vint64m2_t op1,vint32m1_t op2,size_t vl)
+{
+    return __riscv_vwadd_wv_i64m2(op1,op2,32);
+}
+
+
+vint64m4_t test___riscv_vwadd_wv_i64m4(vint64m4_t op1,vint32m2_t op2,size_t vl)
+{
+    return __riscv_vwadd_wv_i64m4(op1,op2,32);
+}
+
+
+vint64m8_t test___riscv_vwadd_wv_i64m8(vint64m8_t op1,vint32m4_t op2,size_t vl)
+{
+    return __riscv_vwadd_wv_i64m8(op1,op2,32);
+}
+
+
+
+/* { dg-final { scan-assembler-times {vsetvli\s+zero,\s*[a-x0-9]+,\s*e8,\s*mf8,\s*t[au],\s*m[au]\s+vwadd\.wv\s+v[0-9]+,\s*v[0-9]+,\s*v[0-9]+} 1 } } */
+/* { dg-final { scan-assembler-times {vsetvli\s+zero,\s*[a-x0-9]+,\s*e8,\s*mf4,\s*t[au],\s*m[au]\s+vwadd\.wv\s+v[0-9]+,\s*v[0-9]+,\s*v[0-9]+} 1 } } */
+/* { dg-final { scan-assembler-times {vsetvli\s+zero,\s*[a-x0-9]+,\s*e8,\s*mf2,\s*t[au],\s*m[au]\s+vwadd\.wv\s+v[0-9]+,\s*v[0-9]+,\s*v[0-9]+} 1 } } */
+/* { dg-final { scan-assembler-times {vsetvli\s+zero,\s*[a-x0-9]+,\s*e8,\s*m1,\s*t[au],\s*m[au]\s+vwadd\.wv\s+v[0-9]+,\s*v[0-9]+,\s*v[0-9]+} 1 } } */
+/* { dg-final { scan-assembler-times {vsetvli\s+zero,\s*[a-x0-9]+,\s*e8,\s*m2,\s*t[au],\s*m[au]\s+vwadd\.wv\s+v[0-9]+,\s*v[0-9]+,\s*v[0-9]+} 1 } } */
+/* { dg-final { scan-assembler-times {vsetvli\s+zero,\s*[a-x0-9]+,\s*e8,\s*m4,\s*t[au],\s*m[au]\s+vwadd\.wv\s+v[0-9]+,\s*v[0-9]+,\s*v[0-9]+} 1 } } */
+/* { dg-final { scan-assembler-times {vsetvli\s+zero,\s*[a-x0-9]+,\s*e16,\s*mf4,\s*t[au],\s*m[au]\s+vwadd\.wv\s+v[0-9]+,\s*v[0-9]+,\s*v[0-9]+} 1 } } */
+/* { dg-final { scan-assembler-times {vsetvli\s+zero,\s*[a-x0-9]+,\s*e16,\s*mf2,\s*t[au],\s*m[au]\s+vwadd\.wv\s+v[0-9]+,\s*v[0-9]+,\s*v[0-9]+} 1 } } */
+/* { dg-final { scan-assembler-times {vsetvli\s+zero,\s*[a-x0-9]+,\s*e16,\s*m1,\s*t[au],\s*m[au]\s+vwadd\.wv\s+v[0-9]+,\s*v[0-9]+,\s*v[0-9]+} 1 } } */
+/* { dg-final { scan-assembler-times {vsetvli\s+zero,\s*[a-x0-9]+,\s*e16,\s*m2,\s*t[au],\s*m[au]\s+vwadd\.wv\s+v[0-9]+,\s*v[0-9]+,\s*v[0-9]+} 1 } } */
+/* { dg-final { scan-assembler-times {vsetvli\s+zero,\s*[a-x0-9]+,\s*e16,\s*m4,\s*t[au],\s*m[au]\s+vwadd\.wv\s+v[0-9]+,\s*v[0-9]+,\s*v[0-9]+} 1 } } */
+/* { dg-final { scan-assembler-times {vsetvli\s+zero,\s*[a-x0-9]+,\s*e32,\s*mf2,\s*t[au],\s*m[au]\s+vwadd\.wv\s+v[0-9]+,\s*v[0-9]+,\s*v[0-9]+} 1 } } */
+/* { dg-final { scan-assembler-times {vsetvli\s+zero,\s*[a-x0-9]+,\s*e32,\s*m1,\s*t[au],\s*m[au]\s+vwadd\.wv\s+v[0-9]+,\s*v[0-9]+,\s*v[0-9]+} 1 } } */
+/* { dg-final { scan-assembler-times {vsetvli\s+zero,\s*[a-x0-9]+,\s*e32,\s*m2,\s*t[au],\s*m[au]\s+vwadd\.wv\s+v[0-9]+,\s*v[0-9]+,\s*v[0-9]+} 1 } } */
+/* { dg-final { scan-assembler-times {vsetvli\s+zero,\s*[a-x0-9]+,\s*e32,\s*m4,\s*t[au],\s*m[au]\s+vwadd\.wv\s+v[0-9]+,\s*v[0-9]+,\s*v[0-9]+} 1 } } */
diff --git a/gcc/testsuite/gcc.target/riscv/rvv/base/vwadd_wv_m-1.c b/gcc/testsuite/gcc.target/riscv/rvv/base/vwadd_wv_m-1.c
new file mode 100644
index 00000000000..c403cc722ed
--- /dev/null
+++ b/gcc/testsuite/gcc.target/riscv/rvv/base/vwadd_wv_m-1.c
@@ -0,0 +1,111 @@
+/* { dg-do compile } */
+/* { dg-options "-march=rv64gcv -mabi=lp64d -O3 -fno-schedule-insns -fno-schedule-insns2" } */
+
+#include "riscv_vector.h"
+
+vint16mf4_t test___riscv_vwadd_wv_i16mf4_m(vbool64_t mask,vint16mf4_t op1,vint8mf8_t op2,size_t vl)
+{
+    return __riscv_vwadd_wv_i16mf4_m(mask,op1,op2,vl);
+}
+
+
+vint16mf2_t test___riscv_vwadd_wv_i16mf2_m(vbool32_t mask,vint16mf2_t op1,vint8mf4_t op2,size_t vl)
+{
+    return __riscv_vwadd_wv_i16mf2_m(mask,op1,op2,vl);
+}
+
+
+vint16m1_t test___riscv_vwadd_wv_i16m1_m(vbool16_t mask,vint16m1_t op1,vint8mf2_t op2,size_t vl)
+{
+    return __riscv_vwadd_wv_i16m1_m(mask,op1,op2,vl);
+}
+
+
+vint16m2_t test___riscv_vwadd_wv_i16m2_m(vbool8_t mask,vint16m2_t op1,vint8m1_t op2,size_t vl)
+{
+    return __riscv_vwadd_wv_i16m2_m(mask,op1,op2,vl);
+}
+
+
+vint16m4_t test___riscv_vwadd_wv_i16m4_m(vbool4_t mask,vint16m4_t op1,vint8m2_t op2,size_t vl)
+{
+    return __riscv_vwadd_wv_i16m4_m(mask,op1,op2,vl);
+}
+
+
+vint16m8_t test___riscv_vwadd_wv_i16m8_m(vbool2_t mask,vint16m8_t op1,vint8m4_t op2,size_t vl)
+{
+    return __riscv_vwadd_wv_i16m8_m(mask,op1,op2,vl);
+}
+
+
+vint32mf2_t test___riscv_vwadd_wv_i32mf2_m(vbool64_t mask,vint32mf2_t op1,vint16mf4_t op2,size_t vl)
+{
+    return __riscv_vwadd_wv_i32mf2_m(mask,op1,op2,vl);
+}
+
+
+vint32m1_t test___riscv_vwadd_wv_i32m1_m(vbool32_t mask,vint32m1_t op1,vint16mf2_t op2,size_t vl)
+{
+    return __riscv_vwadd_wv_i32m1_m(mask,op1,op2,vl);
+}
+
+
+vint32m2_t test___riscv_vwadd_wv_i32m2_m(vbool16_t mask,vint32m2_t op1,vint16m1_t op2,size_t vl)
+{
+    return __riscv_vwadd_wv_i32m2_m(mask,op1,op2,vl);
+}
+
+
+vint32m4_t test___riscv_vwadd_wv_i32m4_m(vbool8_t mask,vint32m4_t op1,vint16m2_t op2,size_t vl)
+{
+    return __riscv_vwadd_wv_i32m4_m(mask,op1,op2,vl);
+}
+
+
+vint32m8_t test___riscv_vwadd_wv_i32m8_m(vbool4_t mask,vint32m8_t op1,vint16m4_t op2,size_t vl)
+{
+    return __riscv_vwadd_wv_i32m8_m(mask,op1,op2,vl);
+}
+
+
+vint64m1_t test___riscv_vwadd_wv_i64m1_m(vbool64_t mask,vint64m1_t op1,vint32mf2_t op2,size_t vl)
+{
+    return __riscv_vwadd_wv_i64m1_m(mask,op1,op2,vl);
+}
+
+
+vint64m2_t test___riscv_vwadd_wv_i64m2_m(vbool32_t mask,vint64m2_t op1,vint32m1_t op2,size_t vl)
+{
+    return __riscv_vwadd_wv_i64m2_m(mask,op1,op2,vl);
+}
+
+
+vint64m4_t test___riscv_vwadd_wv_i64m4_m(vbool16_t mask,vint64m4_t op1,vint32m2_t op2,size_t vl)
+{
+    return __riscv_vwadd_wv_i64m4_m(mask,op1,op2,vl);
+}
+
+
+vint64m8_t test___riscv_vwadd_wv_i64m8_m(vbool8_t mask,vint64m8_t op1,vint32m4_t op2,size_t vl)
+{
+    return __riscv_vwadd_wv_i64m8_m(mask,op1,op2,vl);
+}
+
+
+
+/* { dg-final { scan-assembler-times {vsetvli\s+zero,\s*[a-x0-9]+,\s*e8,\s*mf8,\s*t[au],\s*m[au]\s+vwadd\.wv\s+v[0-9]+,\s*v[0-9]+,\s*v[0-9]+,\s*v0.t} 1 } } */
+/* { dg-final { scan-assembler-times {vsetvli\s+zero,\s*[a-x0-9]+,\s*e8,\s*mf4,\s*t[au],\s*m[au]\s+vwadd\.wv\s+v[0-9]+,\s*v[0-9]+,\s*v[0-9]+,\s*v0.t} 1 } } */
+/* { dg-final { scan-assembler-times {vsetvli\s+zero,\s*[a-x0-9]+,\s*e8,\s*mf2,\s*t[au],\s*m[au]\s+vwadd\.wv\s+v[0-9]+,\s*v[0-9]+,\s*v[0-9]+,\s*v0.t} 1 } } */
+/* { dg-final { scan-assembler-times {vsetvli\s+zero,\s*[a-x0-9]+,\s*e8,\s*m1,\s*t[au],\s*m[au]\s+vwadd\.wv\s+v[0-9]+,\s*v[0-9]+,\s*v[0-9]+,\s*v0.t} 1 } } */
+/* { dg-final { scan-assembler-times {vsetvli\s+zero,\s*[a-x0-9]+,\s*e8,\s*m2,\s*t[au],\s*m[au]\s+vwadd\.wv\s+v[0-9]+,\s*v[0-9]+,\s*v[0-9]+,\s*v0.t} 1 } } */
+/* { dg-final { scan-assembler-times {vsetvli\s+zero,\s*[a-x0-9]+,\s*e8,\s*m4,\s*t[au],\s*m[au]\s+vwadd\.wv\s+v[0-9]+,\s*v[0-9]+,\s*v[0-9]+,\s*v0.t} 1 } } */
+/* { dg-final { scan-assembler-times {vsetvli\s+zero,\s*[a-x0-9]+,\s*e16,\s*mf4,\s*t[au],\s*m[au]\s+vwadd\.wv\s+v[0-9]+,\s*v[0-9]+,\s*v[0-9]+,\s*v0.t} 1 } } */
+/* { dg-final { scan-assembler-times {vsetvli\s+zero,\s*[a-x0-9]+,\s*e16,\s*mf2,\s*t[au],\s*m[au]\s+vwadd\.wv\s+v[0-9]+,\s*v[0-9]+,\s*v[0-9]+,\s*v0.t} 1 } } */
+/* { dg-final { scan-assembler-times {vsetvli\s+zero,\s*[a-x0-9]+,\s*e16,\s*m1,\s*t[au],\s*m[au]\s+vwadd\.wv\s+v[0-9]+,\s*v[0-9]+,\s*v[0-9]+,\s*v0.t} 1 } } */
+/* { dg-final { scan-assembler-times {vsetvli\s+zero,\s*[a-x0-9]+,\s*e16,\s*m2,\s*t[au],\s*m[au]\s+vwadd\.wv\s+v[0-9]+,\s*v[0-9]+,\s*v[0-9]+,\s*v0.t} 1 } } */
+/* { dg-final { scan-assembler-times {vsetvli\s+zero,\s*[a-x0-9]+,\s*e16,\s*m4,\s*t[au],\s*m[au]\s+vwadd\.wv\s+v[0-9]+,\s*v[0-9]+,\s*v[0-9]+,\s*v0.t} 1 } } */
+/* { dg-final { scan-assembler-times {vsetvli\s+zero,\s*[a-x0-9]+,\s*e32,\s*mf2,\s*t[au],\s*m[au]\s+vwadd\.wv\s+v[0-9]+,\s*v[0-9]+,\s*v[0-9]+,\s*v0.t} 1 } } */
+/* { dg-final { scan-assembler-times {vsetvli\s+zero,\s*[a-x0-9]+,\s*e32,\s*m1,\s*t[au],\s*m[au]\s+vwadd\.wv\s+v[0-9]+,\s*v[0-9]+,\s*v[0-9]+,\s*v0.t} 1 } } */
+/* { dg-final { scan-assembler-times {vsetvli\s+zero,\s*[a-x0-9]+,\s*e32,\s*m2,\s*t[au],\s*m[au]\s+vwadd\.wv\s+v[0-9]+,\s*v[0-9]+,\s*v[0-9]+,\s*v0.t} 1 } } */
+/* { dg-final { scan-assembler-times {vsetvli\s+zero,\s*[a-x0-9]+,\s*e32,\s*m4,\s*t[au],\s*m[au]\s+vwadd\.wv\s+v[0-9]+,\s*v[0-9]+,\s*v[0-9]+,\s*v0.t} 1 } } */
diff --git a/gcc/testsuite/gcc.target/riscv/rvv/base/vwadd_wv_m-2.c b/gcc/testsuite/gcc.target/riscv/rvv/base/vwadd_wv_m-2.c
new file mode 100644
index 00000000000..495ae566ea9
--- /dev/null
+++ b/gcc/testsuite/gcc.target/riscv/rvv/base/vwadd_wv_m-2.c
@@ -0,0 +1,111 @@
+/* { dg-do compile } */
+/* { dg-options "-march=rv64gcv -mabi=lp64d -O3 -fno-schedule-insns -fno-schedule-insns2" } */
+
+#include "riscv_vector.h"
+
+vint16mf4_t test___riscv_vwadd_wv_i16mf4_m(vbool64_t mask,vint16mf4_t op1,vint8mf8_t op2,size_t vl)
+{
+    return __riscv_vwadd_wv_i16mf4_m(mask,op1,op2,31);
+}
+
+
+vint16mf2_t test___riscv_vwadd_wv_i16mf2_m(vbool32_t mask,vint16mf2_t op1,vint8mf4_t op2,size_t vl)
+{
+    return __riscv_vwadd_wv_i16mf2_m(mask,op1,op2,31);
+}
+
+
+vint16m1_t test___riscv_vwadd_wv_i16m1_m(vbool16_t mask,vint16m1_t op1,vint8mf2_t op2,size_t vl)
+{
+    return __riscv_vwadd_wv_i16m1_m(mask,op1,op2,31);
+}
+
+
+vint16m2_t test___riscv_vwadd_wv_i16m2_m(vbool8_t mask,vint16m2_t op1,vint8m1_t op2,size_t vl)
+{
+    return __riscv_vwadd_wv_i16m2_m(mask,op1,op2,31);
+}
+
+
+vint16m4_t test___riscv_vwadd_wv_i16m4_m(vbool4_t mask,vint16m4_t op1,vint8m2_t op2,size_t vl)
+{
+    return __riscv_vwadd_wv_i16m4_m(mask,op1,op2,31);
+}
+
+
+vint16m8_t test___riscv_vwadd_wv_i16m8_m(vbool2_t mask,vint16m8_t op1,vint8m4_t op2,size_t vl)
+{
+    return __riscv_vwadd_wv_i16m8_m(mask,op1,op2,31);
+}
+
+
+vint32mf2_t test___riscv_vwadd_wv_i32mf2_m(vbool64_t mask,vint32mf2_t op1,vint16mf4_t op2,size_t vl)
+{
+    return __riscv_vwadd_wv_i32mf2_m(mask,op1,op2,31);
+}
+
+
+vint32m1_t test___riscv_vwadd_wv_i32m1_m(vbool32_t mask,vint32m1_t op1,vint16mf2_t op2,size_t vl)
+{
+    return __riscv_vwadd_wv_i32m1_m(mask,op1,op2,31);
+}
+
+
+vint32m2_t test___riscv_vwadd_wv_i32m2_m(vbool16_t mask,vint32m2_t op1,vint16m1_t op2,size_t vl)
+{
+    return __riscv_vwadd_wv_i32m2_m(mask,op1,op2,31);
+}
+
+
+vint32m4_t test___riscv_vwadd_wv_i32m4_m(vbool8_t mask,vint32m4_t op1,vint16m2_t op2,size_t vl)
+{
+    return __riscv_vwadd_wv_i32m4_m(mask,op1,op2,31);
+}
+
+
+vint32m8_t test___riscv_vwadd_wv_i32m8_m(vbool4_t mask,vint32m8_t op1,vint16m4_t op2,size_t vl)
+{
+    return __riscv_vwadd_wv_i32m8_m(mask,op1,op2,31);
+}
+
+
+vint64m1_t test___riscv_vwadd_wv_i64m1_m(vbool64_t mask,vint64m1_t op1,vint32mf2_t op2,size_t vl)
+{
+    return __riscv_vwadd_wv_i64m1_m(mask,op1,op2,31);
+}
+
+
+vint64m2_t test___riscv_vwadd_wv_i64m2_m(vbool32_t mask,vint64m2_t op1,vint32m1_t op2,size_t vl)
+{
+    return __riscv_vwadd_wv_i64m2_m(mask,op1,op2,31);
+}
+
+
+vint64m4_t test___riscv_vwadd_wv_i64m4_m(vbool16_t mask,vint64m4_t op1,vint32m2_t op2,size_t vl)
+{
+    return __riscv_vwadd_wv_i64m4_m(mask,op1,op2,31);
+}
+
+
+vint64m8_t test___riscv_vwadd_wv_i64m8_m(vbool8_t mask,vint64m8_t op1,vint32m4_t op2,size_t vl)
+{
+    return __riscv_vwadd_wv_i64m8_m(mask,op1,op2,31);
+}
+
+
+
+/* { dg-final { scan-assembler-times {vsetivli\s+zero,\s*31,\s*e8,\s*mf8,\s*t[au],\s*m[au]\s+vwadd\.wv\s+v[0-9]+,\s*v[0-9]+,\s*v[0-9]+,\s*v0.t} 1 } } */
+/* { dg-final { scan-assembler-times {vsetivli\s+zero,\s*31,\s*e8,\s*mf4,\s*t[au],\s*m[au]\s+vwadd\.wv\s+v[0-9]+,\s*v[0-9]+,\s*v[0-9]+,\s*v0.t} 1 } } */
+/* { dg-final { scan-assembler-times {vsetivli\s+zero,\s*31,\s*e8,\s*mf2,\s*t[au],\s*m[au]\s+vwadd\.wv\s+v[0-9]+,\s*v[0-9]+,\s*v[0-9]+,\s*v0.t} 1 } } */
+/* { dg-final { scan-assembler-times {vsetivli\s+zero,\s*31,\s*e8,\s*m1,\s*t[au],\s*m[au]\s+vwadd\.wv\s+v[0-9]+,\s*v[0-9]+,\s*v[0-9]+,\s*v0.t} 1 } } */
+/* { dg-final { scan-assembler-times {vsetivli\s+zero,\s*31,\s*e8,\s*m2,\s*t[au],\s*m[au]\s+vwadd\.wv\s+v[0-9]+,\s*v[0-9]+,\s*v[0-9]+,\s*v0.t} 1 } } */
+/* { dg-final { scan-assembler-times {vsetivli\s+zero,\s*31,\s*e8,\s*m4,\s*t[au],\s*m[au]\s+vwadd\.wv\s+v[0-9]+,\s*v[0-9]+,\s*v[0-9]+,\s*v0.t} 1 } } */
+/* { dg-final { scan-assembler-times {vsetivli\s+zero,\s*31,\s*e16,\s*mf4,\s*t[au],\s*m[au]\s+vwadd\.wv\s+v[0-9]+,\s*v[0-9]+,\s*v[0-9]+,\s*v0.t} 1 } } */
+/* { dg-final { scan-assembler-times {vsetivli\s+zero,\s*31,\s*e16,\s*mf2,\s*t[au],\s*m[au]\s+vwadd\.wv\s+v[0-9]+,\s*v[0-9]+,\s*v[0-9]+,\s*v0.t} 1 } } */
+/* { dg-final { scan-assembler-times {vsetivli\s+zero,\s*31,\s*e16,\s*m1,\s*t[au],\s*m[au]\s+vwadd\.wv\s+v[0-9]+,\s*v[0-9]+,\s*v[0-9]+,\s*v0.t} 1 } } */
+/* { dg-final { scan-assembler-times {vsetivli\s+zero,\s*31,\s*e16,\s*m2,\s*t[au],\s*m[au]\s+vwadd\.wv\s+v[0-9]+,\s*v[0-9]+,\s*v[0-9]+,\s*v0.t} 1 } } */
+/* { dg-final { scan-assembler-times {vsetivli\s+zero,\s*31,\s*e16,\s*m4,\s*t[au],\s*m[au]\s+vwadd\.wv\s+v[0-9]+,\s*v[0-9]+,\s*v[0-9]+,\s*v0.t} 1 } } */
+/* { dg-final { scan-assembler-times {vsetivli\s+zero,\s*31,\s*e32,\s*mf2,\s*t[au],\s*m[au]\s+vwadd\.wv\s+v[0-9]+,\s*v[0-9]+,\s*v[0-9]+,\s*v0.t} 1 } } */
+/* { dg-final { scan-assembler-times {vsetivli\s+zero,\s*31,\s*e32,\s*m1,\s*t[au],\s*m[au]\s+vwadd\.wv\s+v[0-9]+,\s*v[0-9]+,\s*v[0-9]+,\s*v0.t} 1 } } */
+/* { dg-final { scan-assembler-times {vsetivli\s+zero,\s*31,\s*e32,\s*m2,\s*t[au],\s*m[au]\s+vwadd\.wv\s+v[0-9]+,\s*v[0-9]+,\s*v[0-9]+,\s*v0.t} 1 } } */
+/* { dg-final { scan-assembler-times {vsetivli\s+zero,\s*31,\s*e32,\s*m4,\s*t[au],\s*m[au]\s+vwadd\.wv\s+v[0-9]+,\s*v[0-9]+,\s*v[0-9]+,\s*v0.t} 1 } } */
diff --git a/gcc/testsuite/gcc.target/riscv/rvv/base/vwadd_wv_m-3.c b/gcc/testsuite/gcc.target/riscv/rvv/base/vwadd_wv_m-3.c
new file mode 100644
index 00000000000..184ddedb6b4
--- /dev/null
+++ b/gcc/testsuite/gcc.target/riscv/rvv/base/vwadd_wv_m-3.c
@@ -0,0 +1,111 @@
+/* { dg-do compile } */
+/* { dg-options "-march=rv64gcv -mabi=lp64d -O3 -fno-schedule-insns -fno-schedule-insns2" } */
+
+#include "riscv_vector.h"
+
+vint16mf4_t test___riscv_vwadd_wv_i16mf4_m(vbool64_t mask,vint16mf4_t op1,vint8mf8_t op2,size_t vl)
+{
+    return __riscv_vwadd_wv_i16mf4_m(mask,op1,op2,32);
+}
+
+
+vint16mf2_t test___riscv_vwadd_wv_i16mf2_m(vbool32_t mask,vint16mf2_t op1,vint8mf4_t op2,size_t vl)
+{
+    return __riscv_vwadd_wv_i16mf2_m(mask,op1,op2,32);
+}
+
+
+vint16m1_t test___riscv_vwadd_wv_i16m1_m(vbool16_t mask,vint16m1_t op1,vint8mf2_t op2,size_t vl)
+{
+    return __riscv_vwadd_wv_i16m1_m(mask,op1,op2,32);
+}
+
+
+vint16m2_t test___riscv_vwadd_wv_i16m2_m(vbool8_t mask,vint16m2_t op1,vint8m1_t op2,size_t vl)
+{
+    return __riscv_vwadd_wv_i16m2_m(mask,op1,op2,32);
+}
+
+
+vint16m4_t test___riscv_vwadd_wv_i16m4_m(vbool4_t mask,vint16m4_t op1,vint8m2_t op2,size_t vl)
+{
+    return __riscv_vwadd_wv_i16m4_m(mask,op1,op2,32);
+}
+
+
+vint16m8_t test___riscv_vwadd_wv_i16m8_m(vbool2_t mask,vint16m8_t op1,vint8m4_t op2,size_t vl)
+{
+    return __riscv_vwadd_wv_i16m8_m(mask,op1,op2,32);
+}
+
+
+vint32mf2_t test___riscv_vwadd_wv_i32mf2_m(vbool64_t mask,vint32mf2_t op1,vint16mf4_t op2,size_t vl)
+{
+    return __riscv_vwadd_wv_i32mf2_m(mask,op1,op2,32);
+}
+
+
+vint32m1_t test___riscv_vwadd_wv_i32m1_m(vbool32_t mask,vint32m1_t op1,vint16mf2_t op2,size_t vl)
+{
+    return __riscv_vwadd_wv_i32m1_m(mask,op1,op2,32);
+}
+
+
+vint32m2_t test___riscv_vwadd_wv_i32m2_m(vbool16_t mask,vint32m2_t op1,vint16m1_t op2,size_t vl)
+{
+    return __riscv_vwadd_wv_i32m2_m(mask,op1,op2,32);
+}
+
+
+vint32m4_t test___riscv_vwadd_wv_i32m4_m(vbool8_t mask,vint32m4_t op1,vint16m2_t op2,size_t vl)
+{
+    return __riscv_vwadd_wv_i32m4_m(mask,op1,op2,32);
+}
+
+
+vint32m8_t test___riscv_vwadd_wv_i32m8_m(vbool4_t mask,vint32m8_t op1,vint16m4_t op2,size_t vl)
+{
+    return __riscv_vwadd_wv_i32m8_m(mask,op1,op2,32);
+}
+
+
+vint64m1_t test___riscv_vwadd_wv_i64m1_m(vbool64_t mask,vint64m1_t op1,vint32mf2_t op2,size_t vl)
+{
+    return __riscv_vwadd_wv_i64m1_m(mask,op1,op2,32);
+}
+
+
+vint64m2_t test___riscv_vwadd_wv_i64m2_m(vbool32_t mask,vint64m2_t op1,vint32m1_t op2,size_t vl)
+{
+    return __riscv_vwadd_wv_i64m2_m(mask,op1,op2,32);
+}
+
+
+vint64m4_t test___riscv_vwadd_wv_i64m4_m(vbool16_t mask,vint64m4_t op1,vint32m2_t op2,size_t vl)
+{
+    return __riscv_vwadd_wv_i64m4_m(mask,op1,op2,32);
+}
+
+
+vint64m8_t test___riscv_vwadd_wv_i64m8_m(vbool8_t mask,vint64m8_t op1,vint32m4_t op2,size_t vl)
+{
+    return __riscv_vwadd_wv_i64m8_m(mask,op1,op2,32);
+}
+
+
+
+/* { dg-final { scan-assembler-times {vsetvli\s+zero,\s*[a-x0-9]+,\s*e8,\s*mf8,\s*t[au],\s*m[au]\s+vwadd\.wv\s+v[0-9]+,\s*v[0-9]+,\s*v[0-9]+,\s*v0.t} 1 } } */
+/* { dg-final { scan-assembler-times {vsetvli\s+zero,\s*[a-x0-9]+,\s*e8,\s*mf4,\s*t[au],\s*m[au]\s+vwadd\.wv\s+v[0-9]+,\s*v[0-9]+,\s*v[0-9]+,\s*v0.t} 1 } } */
+/* { dg-final { scan-assembler-times {vsetvli\s+zero,\s*[a-x0-9]+,\s*e8,\s*mf2,\s*t[au],\s*m[au]\s+vwadd\.wv\s+v[0-9]+,\s*v[0-9]+,\s*v[0-9]+,\s*v0.t} 1 } } */
+/* { dg-final { scan-assembler-times {vsetvli\s+zero,\s*[a-x0-9]+,\s*e8,\s*m1,\s*t[au],\s*m[au]\s+vwadd\.wv\s+v[0-9]+,\s*v[0-9]+,\s*v[0-9]+,\s*v0.t} 1 } } */
+/* { dg-final { scan-assembler-times {vsetvli\s+zero,\s*[a-x0-9]+,\s*e8,\s*m2,\s*t[au],\s*m[au]\s+vwadd\.wv\s+v[0-9]+,\s*v[0-9]+,\s*v[0-9]+,\s*v0.t} 1 } } */
+/* { dg-final { scan-assembler-times {vsetvli\s+zero,\s*[a-x0-9]+,\s*e8,\s*m4,\s*t[au],\s*m[au]\s+vwadd\.wv\s+v[0-9]+,\s*v[0-9]+,\s*v[0-9]+,\s*v0.t} 1 } } */
+/* { dg-final { scan-assembler-times {vsetvli\s+zero,\s*[a-x0-9]+,\s*e16,\s*mf4,\s*t[au],\s*m[au]\s+vwadd\.wv\s+v[0-9]+,\s*v[0-9]+,\s*v[0-9]+,\s*v0.t} 1 } } */
+/* { dg-final { scan-assembler-times {vsetvli\s+zero,\s*[a-x0-9]+,\s*e16,\s*mf2,\s*t[au],\s*m[au]\s+vwadd\.wv\s+v[0-9]+,\s*v[0-9]+,\s*v[0-9]+,\s*v0.t} 1 } } */
+/* { dg-final { scan-assembler-times {vsetvli\s+zero,\s*[a-x0-9]+,\s*e16,\s*m1,\s*t[au],\s*m[au]\s+vwadd\.wv\s+v[0-9]+,\s*v[0-9]+,\s*v[0-9]+,\s*v0.t} 1 } } */
+/* { dg-final { scan-assembler-times {vsetvli\s+zero,\s*[a-x0-9]+,\s*e16,\s*m2,\s*t[au],\s*m[au]\s+vwadd\.wv\s+v[0-9]+,\s*v[0-9]+,\s*v[0-9]+,\s*v0.t} 1 } } */
+/* { dg-final { scan-assembler-times {vsetvli\s+zero,\s*[a-x0-9]+,\s*e16,\s*m4,\s*t[au],\s*m[au]\s+vwadd\.wv\s+v[0-9]+,\s*v[0-9]+,\s*v[0-9]+,\s*v0.t} 1 } } */
+/* { dg-final { scan-assembler-times {vsetvli\s+zero,\s*[a-x0-9]+,\s*e32,\s*mf2,\s*t[au],\s*m[au]\s+vwadd\.wv\s+v[0-9]+,\s*v[0-9]+,\s*v[0-9]+,\s*v0.t} 1 } } */
+/* { dg-final { scan-assembler-times {vsetvli\s+zero,\s*[a-x0-9]+,\s*e32,\s*m1,\s*t[au],\s*m[au]\s+vwadd\.wv\s+v[0-9]+,\s*v[0-9]+,\s*v[0-9]+,\s*v0.t} 1 } } */
+/* { dg-final { scan-assembler-times {vsetvli\s+zero,\s*[a-x0-9]+,\s*e32,\s*m2,\s*t[au],\s*m[au]\s+vwadd\.wv\s+v[0-9]+,\s*v[0-9]+,\s*v[0-9]+,\s*v0.t} 1 } } */
+/* { dg-final { scan-assembler-times {vsetvli\s+zero,\s*[a-x0-9]+,\s*e32,\s*m4,\s*t[au],\s*m[au]\s+vwadd\.wv\s+v[0-9]+,\s*v[0-9]+,\s*v[0-9]+,\s*v0.t} 1 } } */
diff --git a/gcc/testsuite/gcc.target/riscv/rvv/base/vwadd_wv_mu-1.c b/gcc/testsuite/gcc.target/riscv/rvv/base/vwadd_wv_mu-1.c
new file mode 100644
index 00000000000..69b9f06a92a
--- /dev/null
+++ b/gcc/testsuite/gcc.target/riscv/rvv/base/vwadd_wv_mu-1.c
@@ -0,0 +1,111 @@
+/* { dg-do compile } */
+/* { dg-options "-march=rv64gcv -mabi=lp64d -O3 -fno-schedule-insns -fno-schedule-insns2" } */
+
+#include "riscv_vector.h"
+
+vint16mf4_t test___riscv_vwadd_wv_i16mf4_mu(vbool64_t mask,vint16mf4_t merge,vint16mf4_t op1,vint8mf8_t op2,size_t vl)
+{
+    return __riscv_vwadd_wv_i16mf4_mu(mask,merge,op1,op2,vl);
+}
+
+
+vint16mf2_t test___riscv_vwadd_wv_i16mf2_mu(vbool32_t mask,vint16mf2_t merge,vint16mf2_t op1,vint8mf4_t op2,size_t vl)
+{
+    return __riscv_vwadd_wv_i16mf2_mu(mask,merge,op1,op2,vl);
+}
+
+
+vint16m1_t test___riscv_vwadd_wv_i16m1_mu(vbool16_t mask,vint16m1_t merge,vint16m1_t op1,vint8mf2_t op2,size_t vl)
+{
+    return __riscv_vwadd_wv_i16m1_mu(mask,merge,op1,op2,vl);
+}
+
+
+vint16m2_t test___riscv_vwadd_wv_i16m2_mu(vbool8_t mask,vint16m2_t merge,vint16m2_t op1,vint8m1_t op2,size_t vl)
+{
+    return __riscv_vwadd_wv_i16m2_mu(mask,merge,op1,op2,vl);
+}
+
+
+vint16m4_t test___riscv_vwadd_wv_i16m4_mu(vbool4_t mask,vint16m4_t merge,vint16m4_t op1,vint8m2_t op2,size_t vl)
+{
+    return __riscv_vwadd_wv_i16m4_mu(mask,merge,op1,op2,vl);
+}
+
+
+vint16m8_t test___riscv_vwadd_wv_i16m8_mu(vbool2_t mask,vint16m8_t merge,vint16m8_t op1,vint8m4_t op2,size_t vl)
+{
+    return __riscv_vwadd_wv_i16m8_mu(mask,merge,op1,op2,vl);
+}
+
+
+vint32mf2_t test___riscv_vwadd_wv_i32mf2_mu(vbool64_t mask,vint32mf2_t merge,vint32mf2_t op1,vint16mf4_t op2,size_t vl)
+{
+    return __riscv_vwadd_wv_i32mf2_mu(mask,merge,op1,op2,vl);
+}
+
+
+vint32m1_t test___riscv_vwadd_wv_i32m1_mu(vbool32_t mask,vint32m1_t merge,vint32m1_t op1,vint16mf2_t op2,size_t vl)
+{
+    return __riscv_vwadd_wv_i32m1_mu(mask,merge,op1,op2,vl);
+}
+
+
+vint32m2_t test___riscv_vwadd_wv_i32m2_mu(vbool16_t mask,vint32m2_t merge,vint32m2_t op1,vint16m1_t op2,size_t vl)
+{
+    return __riscv_vwadd_wv_i32m2_mu(mask,merge,op1,op2,vl);
+}
+
+
+vint32m4_t test___riscv_vwadd_wv_i32m4_mu(vbool8_t mask,vint32m4_t merge,vint32m4_t op1,vint16m2_t op2,size_t vl)
+{
+    return __riscv_vwadd_wv_i32m4_mu(mask,merge,op1,op2,vl);
+}
+
+
+vint32m8_t test___riscv_vwadd_wv_i32m8_mu(vbool4_t mask,vint32m8_t merge,vint32m8_t op1,vint16m4_t op2,size_t vl)
+{
+    return __riscv_vwadd_wv_i32m8_mu(mask,merge,op1,op2,vl);
+}
+
+
+vint64m1_t test___riscv_vwadd_wv_i64m1_mu(vbool64_t mask,vint64m1_t merge,vint64m1_t op1,vint32mf2_t op2,size_t vl)
+{
+    return __riscv_vwadd_wv_i64m1_mu(mask,merge,op1,op2,vl);
+}
+
+
+vint64m2_t test___riscv_vwadd_wv_i64m2_mu(vbool32_t mask,vint64m2_t merge,vint64m2_t op1,vint32m1_t op2,size_t vl)
+{
+    return __riscv_vwadd_wv_i64m2_mu(mask,merge,op1,op2,vl);
+}
+
+
+vint64m4_t test___riscv_vwadd_wv_i64m4_mu(vbool16_t mask,vint64m4_t merge,vint64m4_t op1,vint32m2_t op2,size_t vl)
+{
+    return __riscv_vwadd_wv_i64m4_mu(mask,merge,op1,op2,vl);
+}
+
+
+vint64m8_t test___riscv_vwadd_wv_i64m8_mu(vbool8_t mask,vint64m8_t merge,vint64m8_t op1,vint32m4_t op2,size_t vl)
+{
+    return __riscv_vwadd_wv_i64m8_mu(mask,merge,op1,op2,vl);
+}
+
+
+
+/* { dg-final { scan-assembler-times {vsetvli\s+zero,\s*[a-x0-9]+,\s*e8,\s*mf8,\s*t[au],\s*mu\s+vwadd\.wv\s+v[0-9]+,\s*v[0-9]+,\s*v[0-9]+,\s*v0.t} 1 } } */
+/* { dg-final { scan-assembler-times {vsetvli\s+zero,\s*[a-x0-9]+,\s*e8,\s*mf4,\s*t[au],\s*mu\s+vwadd\.wv\s+v[0-9]+,\s*v[0-9]+,\s*v[0-9]+,\s*v0.t} 1 } } */
+/* { dg-final { scan-assembler-times {vsetvli\s+zero,\s*[a-x0-9]+,\s*e8,\s*mf2,\s*t[au],\s*mu\s+vwadd\.wv\s+v[0-9]+,\s*v[0-9]+,\s*v[0-9]+,\s*v0.t} 1 } } */
+/* { dg-final { scan-assembler-times {vsetvli\s+zero,\s*[a-x0-9]+,\s*e8,\s*m1,\s*t[au],\s*mu\s+vwadd\.wv\s+v[0-9]+,\s*v[0-9]+,\s*v[0-9]+,\s*v0.t} 1 } } */
+/* { dg-final { scan-assembler-times {vsetvli\s+zero,\s*[a-x0-9]+,\s*e8,\s*m2,\s*t[au],\s*mu\s+vwadd\.wv\s+v[0-9]+,\s*v[0-9]+,\s*v[0-9]+,\s*v0.t} 1 } } */
+/* { dg-final { scan-assembler-times {vsetvli\s+zero,\s*[a-x0-9]+,\s*e8,\s*m4,\s*t[au],\s*mu\s+vwadd\.wv\s+v[0-9]+,\s*v[0-9]+,\s*v[0-9]+,\s*v0.t} 1 } } */
+/* { dg-final { scan-assembler-times {vsetvli\s+zero,\s*[a-x0-9]+,\s*e16,\s*mf4,\s*t[au],\s*mu\s+vwadd\.wv\s+v[0-9]+,\s*v[0-9]+,\s*v[0-9]+,\s*v0.t} 1 } } */
+/* { dg-final { scan-assembler-times {vsetvli\s+zero,\s*[a-x0-9]+,\s*e16,\s*mf2,\s*t[au],\s*mu\s+vwadd\.wv\s+v[0-9]+,\s*v[0-9]+,\s*v[0-9]+,\s*v0.t} 1 } } */
+/* { dg-final { scan-assembler-times {vsetvli\s+zero,\s*[a-x0-9]+,\s*e16,\s*m1,\s*t[au],\s*mu\s+vwadd\.wv\s+v[0-9]+,\s*v[0-9]+,\s*v[0-9]+,\s*v0.t} 1 } } */
+/* { dg-final { scan-assembler-times {vsetvli\s+zero,\s*[a-x0-9]+,\s*e16,\s*m2,\s*t[au],\s*mu\s+vwadd\.wv\s+v[0-9]+,\s*v[0-9]+,\s*v[0-9]+,\s*v0.t} 1 } } */
+/* { dg-final { scan-assembler-times {vsetvli\s+zero,\s*[a-x0-9]+,\s*e16,\s*m4,\s*t[au],\s*mu\s+vwadd\.wv\s+v[0-9]+,\s*v[0-9]+,\s*v[0-9]+,\s*v0.t} 1 } } */
+/* { dg-final { scan-assembler-times {vsetvli\s+zero,\s*[a-x0-9]+,\s*e32,\s*mf2,\s*t[au],\s*mu\s+vwadd\.wv\s+v[0-9]+,\s*v[0-9]+,\s*v[0-9]+,\s*v0.t} 1 } } */
+/* { dg-final { scan-assembler-times {vsetvli\s+zero,\s*[a-x0-9]+,\s*e32,\s*m1,\s*t[au],\s*mu\s+vwadd\.wv\s+v[0-9]+,\s*v[0-9]+,\s*v[0-9]+,\s*v0.t} 1 } } */
+/* { dg-final { scan-assembler-times {vsetvli\s+zero,\s*[a-x0-9]+,\s*e32,\s*m2,\s*t[au],\s*mu\s+vwadd\.wv\s+v[0-9]+,\s*v[0-9]+,\s*v[0-9]+,\s*v0.t} 1 } } */
+/* { dg-final { scan-assembler-times {vsetvli\s+zero,\s*[a-x0-9]+,\s*e32,\s*m4,\s*t[au],\s*mu\s+vwadd\.wv\s+v[0-9]+,\s*v[0-9]+,\s*v[0-9]+,\s*v0.t} 1 } } */
diff --git a/gcc/testsuite/gcc.target/riscv/rvv/base/vwadd_wv_mu-2.c b/gcc/testsuite/gcc.target/riscv/rvv/base/vwadd_wv_mu-2.c
new file mode 100644
index 00000000000..58ba2f9db1b
--- /dev/null
+++ b/gcc/testsuite/gcc.target/riscv/rvv/base/vwadd_wv_mu-2.c
@@ -0,0 +1,111 @@
+/* { dg-do compile } */
+/* { dg-options "-march=rv64gcv -mabi=lp64d -O3 -fno-schedule-insns -fno-schedule-insns2" } */
+
+#include "riscv_vector.h"
+
+vint16mf4_t test___riscv_vwadd_wv_i16mf4_mu(vbool64_t mask,vint16mf4_t merge,vint16mf4_t op1,vint8mf8_t op2,size_t vl)
+{
+    return __riscv_vwadd_wv_i16mf4_mu(mask,merge,op1,op2,31);
+}
+
+
+vint16mf2_t test___riscv_vwadd_wv_i16mf2_mu(vbool32_t mask,vint16mf2_t merge,vint16mf2_t op1,vint8mf4_t op2,size_t vl)
+{
+    return __riscv_vwadd_wv_i16mf2_mu(mask,merge,op1,op2,31);
+}
+
+
+vint16m1_t test___riscv_vwadd_wv_i16m1_mu(vbool16_t mask,vint16m1_t merge,vint16m1_t op1,vint8mf2_t op2,size_t vl)
+{
+    return __riscv_vwadd_wv_i16m1_mu(mask,merge,op1,op2,31);
+}
+
+
+vint16m2_t test___riscv_vwadd_wv_i16m2_mu(vbool8_t mask,vint16m2_t merge,vint16m2_t op1,vint8m1_t op2,size_t vl)
+{
+    return __riscv_vwadd_wv_i16m2_mu(mask,merge,op1,op2,31);
+}
+
+
+vint16m4_t test___riscv_vwadd_wv_i16m4_mu(vbool4_t mask,vint16m4_t merge,vint16m4_t op1,vint8m2_t op2,size_t vl)
+{
+    return __riscv_vwadd_wv_i16m4_mu(mask,merge,op1,op2,31);
+}
+
+
+vint16m8_t test___riscv_vwadd_wv_i16m8_mu(vbool2_t mask,vint16m8_t merge,vint16m8_t op1,vint8m4_t op2,size_t vl)
+{
+    return __riscv_vwadd_wv_i16m8_mu(mask,merge,op1,op2,31);
+}
+
+
+vint32mf2_t test___riscv_vwadd_wv_i32mf2_mu(vbool64_t mask,vint32mf2_t merge,vint32mf2_t op1,vint16mf4_t op2,size_t vl)
+{
+    return __riscv_vwadd_wv_i32mf2_mu(mask,merge,op1,op2,31);
+}
+
+
+vint32m1_t test___riscv_vwadd_wv_i32m1_mu(vbool32_t mask,vint32m1_t merge,vint32m1_t op1,vint16mf2_t op2,size_t vl)
+{
+    return __riscv_vwadd_wv_i32m1_mu(mask,merge,op1,op2,31);
+}
+
+
+vint32m2_t test___riscv_vwadd_wv_i32m2_mu(vbool16_t mask,vint32m2_t merge,vint32m2_t op1,vint16m1_t op2,size_t vl)
+{
+    return __riscv_vwadd_wv_i32m2_mu(mask,merge,op1,op2,31);
+}
+
+
+vint32m4_t test___riscv_vwadd_wv_i32m4_mu(vbool8_t mask,vint32m4_t merge,vint32m4_t op1,vint16m2_t op2,size_t vl)
+{
+    return __riscv_vwadd_wv_i32m4_mu(mask,merge,op1,op2,31);
+}
+
+
+vint32m8_t test___riscv_vwadd_wv_i32m8_mu(vbool4_t mask,vint32m8_t merge,vint32m8_t op1,vint16m4_t op2,size_t vl)
+{
+    return __riscv_vwadd_wv_i32m8_mu(mask,merge,op1,op2,31);
+}
+
+
+vint64m1_t test___riscv_vwadd_wv_i64m1_mu(vbool64_t mask,vint64m1_t merge,vint64m1_t op1,vint32mf2_t op2,size_t vl)
+{
+    return __riscv_vwadd_wv_i64m1_mu(mask,merge,op1,op2,31);
+}
+
+
+vint64m2_t test___riscv_vwadd_wv_i64m2_mu(vbool32_t mask,vint64m2_t merge,vint64m2_t op1,vint32m1_t op2,size_t vl)
+{
+    return __riscv_vwadd_wv_i64m2_mu(mask,merge,op1,op2,31);
+}
+
+
+vint64m4_t test___riscv_vwadd_wv_i64m4_mu(vbool16_t mask,vint64m4_t merge,vint64m4_t op1,vint32m2_t op2,size_t vl)
+{
+    return __riscv_vwadd_wv_i64m4_mu(mask,merge,op1,op2,31);
+}
+
+
+vint64m8_t test___riscv_vwadd_wv_i64m8_mu(vbool8_t mask,vint64m8_t merge,vint64m8_t op1,vint32m4_t op2,size_t vl)
+{
+    return __riscv_vwadd_wv_i64m8_mu(mask,merge,op1,op2,31);
+}
+
+
+
+/* { dg-final { scan-assembler-times {vsetivli\s+zero,\s*31,\s*e8,\s*mf8,\s*t[au],\s*mu\s+vwadd\.wv\s+v[0-9]+,\s*v[0-9]+,\s*v[0-9]+,\s*v0.t} 1 } } */
+/* { dg-final { scan-assembler-times {vsetivli\s+zero,\s*31,\s*e8,\s*mf4,\s*t[au],\s*mu\s+vwadd\.wv\s+v[0-9]+,\s*v[0-9]+,\s*v[0-9]+,\s*v0.t} 1 } } */
+/* { dg-final { scan-assembler-times {vsetivli\s+zero,\s*31,\s*e8,\s*mf2,\s*t[au],\s*mu\s+vwadd\.wv\s+v[0-9]+,\s*v[0-9]+,\s*v[0-9]+,\s*v0.t} 1 } } */
+/* { dg-final { scan-assembler-times {vsetivli\s+zero,\s*31,\s*e8,\s*m1,\s*t[au],\s*mu\s+vwadd\.wv\s+v[0-9]+,\s*v[0-9]+,\s*v[0-9]+,\s*v0.t} 1 } } */
+/* { dg-final { scan-assembler-times {vsetivli\s+zero,\s*31,\s*e8,\s*m2,\s*t[au],\s*mu\s+vwadd\.wv\s+v[0-9]+,\s*v[0-9]+,\s*v[0-9]+,\s*v0.t} 1 } } */
+/* { dg-final { scan-assembler-times {vsetivli\s+zero,\s*31,\s*e8,\s*m4,\s*t[au],\s*mu\s+vwadd\.wv\s+v[0-9]+,\s*v[0-9]+,\s*v[0-9]+,\s*v0.t} 1 } } */
+/* { dg-final { scan-assembler-times {vsetivli\s+zero,\s*31,\s*e16,\s*mf4,\s*t[au],\s*mu\s+vwadd\.wv\s+v[0-9]+,\s*v[0-9]+,\s*v[0-9]+,\s*v0.t} 1 } } */
+/* { dg-final { scan-assembler-times {vsetivli\s+zero,\s*31,\s*e16,\s*mf2,\s*t[au],\s*mu\s+vwadd\.wv\s+v[0-9]+,\s*v[0-9]+,\s*v[0-9]+,\s*v0.t} 1 } } */
+/* { dg-final { scan-assembler-times {vsetivli\s+zero,\s*31,\s*e16,\s*m1,\s*t[au],\s*mu\s+vwadd\.wv\s+v[0-9]+,\s*v[0-9]+,\s*v[0-9]+,\s*v0.t} 1 } } */
+/* { dg-final { scan-assembler-times {vsetivli\s+zero,\s*31,\s*e16,\s*m2,\s*t[au],\s*mu\s+vwadd\.wv\s+v[0-9]+,\s*v[0-9]+,\s*v[0-9]+,\s*v0.t} 1 } } */
+/* { dg-final { scan-assembler-times {vsetivli\s+zero,\s*31,\s*e16,\s*m4,\s*t[au],\s*mu\s+vwadd\.wv\s+v[0-9]+,\s*v[0-9]+,\s*v[0-9]+,\s*v0.t} 1 } } */
+/* { dg-final { scan-assembler-times {vsetivli\s+zero,\s*31,\s*e32,\s*mf2,\s*t[au],\s*mu\s+vwadd\.wv\s+v[0-9]+,\s*v[0-9]+,\s*v[0-9]+,\s*v0.t} 1 } } */
+/* { dg-final { scan-assembler-times {vsetivli\s+zero,\s*31,\s*e32,\s*m1,\s*t[au],\s*mu\s+vwadd\.wv\s+v[0-9]+,\s*v[0-9]+,\s*v[0-9]+,\s*v0.t} 1 } } */
+/* { dg-final { scan-assembler-times {vsetivli\s+zero,\s*31,\s*e32,\s*m2,\s*t[au],\s*mu\s+vwadd\.wv\s+v[0-9]+,\s*v[0-9]+,\s*v[0-9]+,\s*v0.t} 1 } } */
+/* { dg-final { scan-assembler-times {vsetivli\s+zero,\s*31,\s*e32,\s*m4,\s*t[au],\s*mu\s+vwadd\.wv\s+v[0-9]+,\s*v[0-9]+,\s*v[0-9]+,\s*v0.t} 1 } } */
diff --git a/gcc/testsuite/gcc.target/riscv/rvv/base/vwadd_wv_mu-3.c b/gcc/testsuite/gcc.target/riscv/rvv/base/vwadd_wv_mu-3.c
new file mode 100644
index 00000000000..59d559c438e
--- /dev/null
+++ b/gcc/testsuite/gcc.target/riscv/rvv/base/vwadd_wv_mu-3.c
@@ -0,0 +1,111 @@
+/* { dg-do compile } */
+/* { dg-options "-march=rv64gcv -mabi=lp64d -O3 -fno-schedule-insns -fno-schedule-insns2" } */
+
+#include "riscv_vector.h"
+
+vint16mf4_t test___riscv_vwadd_wv_i16mf4_mu(vbool64_t mask,vint16mf4_t merge,vint16mf4_t op1,vint8mf8_t op2,size_t vl)
+{
+    return __riscv_vwadd_wv_i16mf4_mu(mask,merge,op1,op2,32);
+}
+
+
+vint16mf2_t test___riscv_vwadd_wv_i16mf2_mu(vbool32_t mask,vint16mf2_t merge,vint16mf2_t op1,vint8mf4_t op2,size_t vl)
+{
+    return __riscv_vwadd_wv_i16mf2_mu(mask,merge,op1,op2,32);
+}
+
+
+vint16m1_t test___riscv_vwadd_wv_i16m1_mu(vbool16_t mask,vint16m1_t merge,vint16m1_t op1,vint8mf2_t op2,size_t vl)
+{
+    return __riscv_vwadd_wv_i16m1_mu(mask,merge,op1,op2,32);
+}
+
+
+vint16m2_t test___riscv_vwadd_wv_i16m2_mu(vbool8_t mask,vint16m2_t merge,vint16m2_t op1,vint8m1_t op2,size_t vl)
+{
+    return __riscv_vwadd_wv_i16m2_mu(mask,merge,op1,op2,32);
+}
+
+
+vint16m4_t test___riscv_vwadd_wv_i16m4_mu(vbool4_t mask,vint16m4_t merge,vint16m4_t op1,vint8m2_t op2,size_t vl)
+{
+    return __riscv_vwadd_wv_i16m4_mu(mask,merge,op1,op2,32);
+}
+
+
+vint16m8_t test___riscv_vwadd_wv_i16m8_mu(vbool2_t mask,vint16m8_t merge,vint16m8_t op1,vint8m4_t op2,size_t vl)
+{
+    return __riscv_vwadd_wv_i16m8_mu(mask,merge,op1,op2,32);
+}
+
+
+vint32mf2_t test___riscv_vwadd_wv_i32mf2_mu(vbool64_t mask,vint32mf2_t merge,vint32mf2_t op1,vint16mf4_t op2,size_t vl)
+{
+    return __riscv_vwadd_wv_i32mf2_mu(mask,merge,op1,op2,32);
+}
+
+
+vint32m1_t test___riscv_vwadd_wv_i32m1_mu(vbool32_t mask,vint32m1_t merge,vint32m1_t op1,vint16mf2_t op2,size_t vl)
+{
+    return __riscv_vwadd_wv_i32m1_mu(mask,merge,op1,op2,32);
+}
+
+
+vint32m2_t test___riscv_vwadd_wv_i32m2_mu(vbool16_t mask,vint32m2_t merge,vint32m2_t op1,vint16m1_t op2,size_t vl)
+{
+    return __riscv_vwadd_wv_i32m2_mu(mask,merge,op1,op2,32);
+}
+
+
+vint32m4_t test___riscv_vwadd_wv_i32m4_mu(vbool8_t mask,vint32m4_t merge,vint32m4_t op1,vint16m2_t op2,size_t vl)
+{
+    return __riscv_vwadd_wv_i32m4_mu(mask,merge,op1,op2,32);
+}
+
+
+vint32m8_t test___riscv_vwadd_wv_i32m8_mu(vbool4_t mask,vint32m8_t merge,vint32m8_t op1,vint16m4_t op2,size_t vl)
+{
+    return __riscv_vwadd_wv_i32m8_mu(mask,merge,op1,op2,32);
+}
+
+
+vint64m1_t test___riscv_vwadd_wv_i64m1_mu(vbool64_t mask,vint64m1_t merge,vint64m1_t op1,vint32mf2_t op2,size_t vl)
+{
+    return __riscv_vwadd_wv_i64m1_mu(mask,merge,op1,op2,32);
+}
+
+
+vint64m2_t test___riscv_vwadd_wv_i64m2_mu(vbool32_t mask,vint64m2_t merge,vint64m2_t op1,vint32m1_t op2,size_t vl)
+{
+    return __riscv_vwadd_wv_i64m2_mu(mask,merge,op1,op2,32);
+}
+
+
+vint64m4_t test___riscv_vwadd_wv_i64m4_mu(vbool16_t mask,vint64m4_t merge,vint64m4_t op1,vint32m2_t op2,size_t vl)
+{
+    return __riscv_vwadd_wv_i64m4_mu(mask,merge,op1,op2,32);
+}
+
+
+vint64m8_t test___riscv_vwadd_wv_i64m8_mu(vbool8_t mask,vint64m8_t merge,vint64m8_t op1,vint32m4_t op2,size_t vl)
+{
+    return __riscv_vwadd_wv_i64m8_mu(mask,merge,op1,op2,32);
+}
+
+
+
+/* { dg-final { scan-assembler-times {vsetvli\s+zero,\s*[a-x0-9]+,\s*e8,\s*mf8,\s*t[au],\s*mu\s+vwadd\.wv\s+v[0-9]+,\s*v[0-9]+,\s*v[0-9]+,\s*v0.t} 1 } } */
+/* { dg-final { scan-assembler-times {vsetvli\s+zero,\s*[a-x0-9]+,\s*e8,\s*mf4,\s*t[au],\s*mu\s+vwadd\.wv\s+v[0-9]+,\s*v[0-9]+,\s*v[0-9]+,\s*v0.t} 1 } } */
+/* { dg-final { scan-assembler-times {vsetvli\s+zero,\s*[a-x0-9]+,\s*e8,\s*mf2,\s*t[au],\s*mu\s+vwadd\.wv\s+v[0-9]+,\s*v[0-9]+,\s*v[0-9]+,\s*v0.t} 1 } } */
+/* { dg-final { scan-assembler-times {vsetvli\s+zero,\s*[a-x0-9]+,\s*e8,\s*m1,\s*t[au],\s*mu\s+vwadd\.wv\s+v[0-9]+,\s*v[0-9]+,\s*v[0-9]+,\s*v0.t} 1 } } */
+/* { dg-final { scan-assembler-times {vsetvli\s+zero,\s*[a-x0-9]+,\s*e8,\s*m2,\s*t[au],\s*mu\s+vwadd\.wv\s+v[0-9]+,\s*v[0-9]+,\s*v[0-9]+,\s*v0.t} 1 } } */
+/* { dg-final { scan-assembler-times {vsetvli\s+zero,\s*[a-x0-9]+,\s*e8,\s*m4,\s*t[au],\s*mu\s+vwadd\.wv\s+v[0-9]+,\s*v[0-9]+,\s*v[0-9]+,\s*v0.t} 1 } } */
+/* { dg-final { scan-assembler-times {vsetvli\s+zero,\s*[a-x0-9]+,\s*e16,\s*mf4,\s*t[au],\s*mu\s+vwadd\.wv\s+v[0-9]+,\s*v[0-9]+,\s*v[0-9]+,\s*v0.t} 1 } } */
+/* { dg-final { scan-assembler-times {vsetvli\s+zero,\s*[a-x0-9]+,\s*e16,\s*mf2,\s*t[au],\s*mu\s+vwadd\.wv\s+v[0-9]+,\s*v[0-9]+,\s*v[0-9]+,\s*v0.t} 1 } } */
+/* { dg-final { scan-assembler-times {vsetvli\s+zero,\s*[a-x0-9]+,\s*e16,\s*m1,\s*t[au],\s*mu\s+vwadd\.wv\s+v[0-9]+,\s*v[0-9]+,\s*v[0-9]+,\s*v0.t} 1 } } */
+/* { dg-final { scan-assembler-times {vsetvli\s+zero,\s*[a-x0-9]+,\s*e16,\s*m2,\s*t[au],\s*mu\s+vwadd\.wv\s+v[0-9]+,\s*v[0-9]+,\s*v[0-9]+,\s*v0.t} 1 } } */
+/* { dg-final { scan-assembler-times {vsetvli\s+zero,\s*[a-x0-9]+,\s*e16,\s*m4,\s*t[au],\s*mu\s+vwadd\.wv\s+v[0-9]+,\s*v[0-9]+,\s*v[0-9]+,\s*v0.t} 1 } } */
+/* { dg-final { scan-assembler-times {vsetvli\s+zero,\s*[a-x0-9]+,\s*e32,\s*mf2,\s*t[au],\s*mu\s+vwadd\.wv\s+v[0-9]+,\s*v[0-9]+,\s*v[0-9]+,\s*v0.t} 1 } } */
+/* { dg-final { scan-assembler-times {vsetvli\s+zero,\s*[a-x0-9]+,\s*e32,\s*m1,\s*t[au],\s*mu\s+vwadd\.wv\s+v[0-9]+,\s*v[0-9]+,\s*v[0-9]+,\s*v0.t} 1 } } */
+/* { dg-final { scan-assembler-times {vsetvli\s+zero,\s*[a-x0-9]+,\s*e32,\s*m2,\s*t[au],\s*mu\s+vwadd\.wv\s+v[0-9]+,\s*v[0-9]+,\s*v[0-9]+,\s*v0.t} 1 } } */
+/* { dg-final { scan-assembler-times {vsetvli\s+zero,\s*[a-x0-9]+,\s*e32,\s*m4,\s*t[au],\s*mu\s+vwadd\.wv\s+v[0-9]+,\s*v[0-9]+,\s*v[0-9]+,\s*v0.t} 1 } } */
diff --git a/gcc/testsuite/gcc.target/riscv/rvv/base/vwadd_wv_tu-1.c b/gcc/testsuite/gcc.target/riscv/rvv/base/vwadd_wv_tu-1.c
new file mode 100644
index 00000000000..f178d78a0bc
--- /dev/null
+++ b/gcc/testsuite/gcc.target/riscv/rvv/base/vwadd_wv_tu-1.c
@@ -0,0 +1,111 @@
+/* { dg-do compile } */
+/* { dg-options "-march=rv64gcv -mabi=lp64d -O3 -fno-schedule-insns -fno-schedule-insns2" } */
+
+#include "riscv_vector.h"
+
+vint16mf4_t test___riscv_vwadd_wv_i16mf4_tu(vint16mf4_t merge,vint16mf4_t op1,vint8mf8_t op2,size_t vl)
+{
+    return __riscv_vwadd_wv_i16mf4_tu(merge,op1,op2,vl);
+}
+
+
+vint16mf2_t test___riscv_vwadd_wv_i16mf2_tu(vint16mf2_t merge,vint16mf2_t op1,vint8mf4_t op2,size_t vl)
+{
+    return __riscv_vwadd_wv_i16mf2_tu(merge,op1,op2,vl);
+}
+
+
+vint16m1_t test___riscv_vwadd_wv_i16m1_tu(vint16m1_t merge,vint16m1_t op1,vint8mf2_t op2,size_t vl)
+{
+    return __riscv_vwadd_wv_i16m1_tu(merge,op1,op2,vl);
+}
+
+
+vint16m2_t test___riscv_vwadd_wv_i16m2_tu(vint16m2_t merge,vint16m2_t op1,vint8m1_t op2,size_t vl)
+{
+    return __riscv_vwadd_wv_i16m2_tu(merge,op1,op2,vl);
+}
+
+
+vint16m4_t test___riscv_vwadd_wv_i16m4_tu(vint16m4_t merge,vint16m4_t op1,vint8m2_t op2,size_t vl)
+{
+    return __riscv_vwadd_wv_i16m4_tu(merge,op1,op2,vl);
+}
+
+
+vint16m8_t test___riscv_vwadd_wv_i16m8_tu(vint16m8_t merge,vint16m8_t op1,vint8m4_t op2,size_t vl)
+{
+    return __riscv_vwadd_wv_i16m8_tu(merge,op1,op2,vl);
+}
+
+
+vint32mf2_t test___riscv_vwadd_wv_i32mf2_tu(vint32mf2_t merge,vint32mf2_t op1,vint16mf4_t op2,size_t vl)
+{
+    return __riscv_vwadd_wv_i32mf2_tu(merge,op1,op2,vl);
+}
+
+
+vint32m1_t test___riscv_vwadd_wv_i32m1_tu(vint32m1_t merge,vint32m1_t op1,vint16mf2_t op2,size_t vl)
+{
+    return __riscv_vwadd_wv_i32m1_tu(merge,op1,op2,vl);
+}
+
+
+vint32m2_t test___riscv_vwadd_wv_i32m2_tu(vint32m2_t merge,vint32m2_t op1,vint16m1_t op2,size_t vl)
+{
+    return __riscv_vwadd_wv_i32m2_tu(merge,op1,op2,vl);
+}
+
+
+vint32m4_t test___riscv_vwadd_wv_i32m4_tu(vint32m4_t merge,vint32m4_t op1,vint16m2_t op2,size_t vl)
+{
+    return __riscv_vwadd_wv_i32m4_tu(merge,op1,op2,vl);
+}
+
+
+vint32m8_t test___riscv_vwadd_wv_i32m8_tu(vint32m8_t merge,vint32m8_t op1,vint16m4_t op2,size_t vl)
+{
+    return __riscv_vwadd_wv_i32m8_tu(merge,op1,op2,vl);
+}
+
+
+vint64m1_t test___riscv_vwadd_wv_i64m1_tu(vint64m1_t merge,vint64m1_t op1,vint32mf2_t op2,size_t vl)
+{
+    return __riscv_vwadd_wv_i64m1_tu(merge,op1,op2,vl);
+}
+
+
+vint64m2_t test___riscv_vwadd_wv_i64m2_tu(vint64m2_t merge,vint64m2_t op1,vint32m1_t op2,size_t vl)
+{
+    return __riscv_vwadd_wv_i64m2_tu(merge,op1,op2,vl);
+}
+
+
+vint64m4_t test___riscv_vwadd_wv_i64m4_tu(vint64m4_t merge,vint64m4_t op1,vint32m2_t op2,size_t vl)
+{
+    return __riscv_vwadd_wv_i64m4_tu(merge,op1,op2,vl);
+}
+
+
+vint64m8_t test___riscv_vwadd_wv_i64m8_tu(vint64m8_t merge,vint64m8_t op1,vint32m4_t op2,size_t vl)
+{
+    return __riscv_vwadd_wv_i64m8_tu(merge,op1,op2,vl);
+}
+
+
+
+/* { dg-final { scan-assembler-times {vsetvli\s+zero,\s*[a-x0-9]+,\s*e8,\s*mf8,\s*tu,\s*m[au]\s+vwadd\.wv\s+v[0-9]+,\s*v[0-9]+,\s*v[0-9]+} 1 } } */
+/* { dg-final { scan-assembler-times {vsetvli\s+zero,\s*[a-x0-9]+,\s*e8,\s*mf4,\s*tu,\s*m[au]\s+vwadd\.wv\s+v[0-9]+,\s*v[0-9]+,\s*v[0-9]+} 1 } } */
+/* { dg-final { scan-assembler-times {vsetvli\s+zero,\s*[a-x0-9]+,\s*e8,\s*mf2,\s*tu,\s*m[au]\s+vwadd\.wv\s+v[0-9]+,\s*v[0-9]+,\s*v[0-9]+} 1 } } */
+/* { dg-final { scan-assembler-times {vsetvli\s+zero,\s*[a-x0-9]+,\s*e8,\s*m1,\s*tu,\s*m[au]\s+vwadd\.wv\s+v[0-9]+,\s*v[0-9]+,\s*v[0-9]+} 1 } } */
+/* { dg-final { scan-assembler-times {vsetvli\s+zero,\s*[a-x0-9]+,\s*e8,\s*m2,\s*tu,\s*m[au]\s+vwadd\.wv\s+v[0-9]+,\s*v[0-9]+,\s*v[0-9]+} 1 } } */
+/* { dg-final { scan-assembler-times {vsetvli\s+zero,\s*[a-x0-9]+,\s*e8,\s*m4,\s*tu,\s*m[au]\s+vwadd\.wv\s+v[0-9]+,\s*v[0-9]+,\s*v[0-9]+} 1 } } */
+/* { dg-final { scan-assembler-times {vsetvli\s+zero,\s*[a-x0-9]+,\s*e16,\s*mf4,\s*tu,\s*m[au]\s+vwadd\.wv\s+v[0-9]+,\s*v[0-9]+,\s*v[0-9]+} 1 } } */
+/* { dg-final { scan-assembler-times {vsetvli\s+zero,\s*[a-x0-9]+,\s*e16,\s*mf2,\s*tu,\s*m[au]\s+vwadd\.wv\s+v[0-9]+,\s*v[0-9]+,\s*v[0-9]+} 1 } } */
+/* { dg-final { scan-assembler-times {vsetvli\s+zero,\s*[a-x0-9]+,\s*e16,\s*m1,\s*tu,\s*m[au]\s+vwadd\.wv\s+v[0-9]+,\s*v[0-9]+,\s*v[0-9]+} 1 } } */
+/* { dg-final { scan-assembler-times {vsetvli\s+zero,\s*[a-x0-9]+,\s*e16,\s*m2,\s*tu,\s*m[au]\s+vwadd\.wv\s+v[0-9]+,\s*v[0-9]+,\s*v[0-9]+} 1 } } */
+/* { dg-final { scan-assembler-times {vsetvli\s+zero,\s*[a-x0-9]+,\s*e16,\s*m4,\s*tu,\s*m[au]\s+vwadd\.wv\s+v[0-9]+,\s*v[0-9]+,\s*v[0-9]+} 1 } } */
+/* { dg-final { scan-assembler-times {vsetvli\s+zero,\s*[a-x0-9]+,\s*e32,\s*mf2,\s*tu,\s*m[au]\s+vwadd\.wv\s+v[0-9]+,\s*v[0-9]+,\s*v[0-9]+} 1 } } */
+/* { dg-final { scan-assembler-times {vsetvli\s+zero,\s*[a-x0-9]+,\s*e32,\s*m1,\s*tu,\s*m[au]\s+vwadd\.wv\s+v[0-9]+,\s*v[0-9]+,\s*v[0-9]+} 1 } } */
+/* { dg-final { scan-assembler-times {vsetvli\s+zero,\s*[a-x0-9]+,\s*e32,\s*m2,\s*tu,\s*m[au]\s+vwadd\.wv\s+v[0-9]+,\s*v[0-9]+,\s*v[0-9]+} 1 } } */
+/* { dg-final { scan-assembler-times {vsetvli\s+zero,\s*[a-x0-9]+,\s*e32,\s*m4,\s*tu,\s*m[au]\s+vwadd\.wv\s+v[0-9]+,\s*v[0-9]+,\s*v[0-9]+} 1 } } */
diff --git a/gcc/testsuite/gcc.target/riscv/rvv/base/vwadd_wv_tu-2.c b/gcc/testsuite/gcc.target/riscv/rvv/base/vwadd_wv_tu-2.c
new file mode 100644
index 00000000000..ad7928afe2b
--- /dev/null
+++ b/gcc/testsuite/gcc.target/riscv/rvv/base/vwadd_wv_tu-2.c
@@ -0,0 +1,111 @@
+/* { dg-do compile } */
+/* { dg-options "-march=rv64gcv -mabi=lp64d -O3 -fno-schedule-insns -fno-schedule-insns2" } */
+
+#include "riscv_vector.h"
+
+vint16mf4_t test___riscv_vwadd_wv_i16mf4_tu(vint16mf4_t merge,vint16mf4_t op1,vint8mf8_t op2,size_t vl)
+{
+    return __riscv_vwadd_wv_i16mf4_tu(merge,op1,op2,31);
+}
+
+
+vint16mf2_t test___riscv_vwadd_wv_i16mf2_tu(vint16mf2_t merge,vint16mf2_t op1,vint8mf4_t op2,size_t vl)
+{
+    return __riscv_vwadd_wv_i16mf2_tu(merge,op1,op2,31);
+}
+
+
+vint16m1_t test___riscv_vwadd_wv_i16m1_tu(vint16m1_t merge,vint16m1_t op1,vint8mf2_t op2,size_t vl)
+{
+    return __riscv_vwadd_wv_i16m1_tu(merge,op1,op2,31);
+}
+
+
+vint16m2_t test___riscv_vwadd_wv_i16m2_tu(vint16m2_t merge,vint16m2_t op1,vint8m1_t op2,size_t vl)
+{
+    return __riscv_vwadd_wv_i16m2_tu(merge,op1,op2,31);
+}
+
+
+vint16m4_t test___riscv_vwadd_wv_i16m4_tu(vint16m4_t merge,vint16m4_t op1,vint8m2_t op2,size_t vl)
+{
+    return __riscv_vwadd_wv_i16m4_tu(merge,op1,op2,31);
+}
+
+
+vint16m8_t test___riscv_vwadd_wv_i16m8_tu(vint16m8_t merge,vint16m8_t op1,vint8m4_t op2,size_t vl)
+{
+    return __riscv_vwadd_wv_i16m8_tu(merge,op1,op2,31);
+}
+
+
+vint32mf2_t test___riscv_vwadd_wv_i32mf2_tu(vint32mf2_t merge,vint32mf2_t op1,vint16mf4_t op2,size_t vl)
+{
+    return __riscv_vwadd_wv_i32mf2_tu(merge,op1,op2,31);
+}
+
+
+vint32m1_t test___riscv_vwadd_wv_i32m1_tu(vint32m1_t merge,vint32m1_t op1,vint16mf2_t op2,size_t vl)
+{
+    return __riscv_vwadd_wv_i32m1_tu(merge,op1,op2,31);
+}
+
+
+vint32m2_t test___riscv_vwadd_wv_i32m2_tu(vint32m2_t merge,vint32m2_t op1,vint16m1_t op2,size_t vl)
+{
+    return __riscv_vwadd_wv_i32m2_tu(merge,op1,op2,31);
+}
+
+
+vint32m4_t test___riscv_vwadd_wv_i32m4_tu(vint32m4_t merge,vint32m4_t op1,vint16m2_t op2,size_t vl)
+{
+    return __riscv_vwadd_wv_i32m4_tu(merge,op1,op2,31);
+}
+
+
+vint32m8_t test___riscv_vwadd_wv_i32m8_tu(vint32m8_t merge,vint32m8_t op1,vint16m4_t op2,size_t vl)
+{
+    return __riscv_vwadd_wv_i32m8_tu(merge,op1,op2,31);
+}
+
+
+vint64m1_t test___riscv_vwadd_wv_i64m1_tu(vint64m1_t merge,vint64m1_t op1,vint32mf2_t op2,size_t vl)
+{
+    return __riscv_vwadd_wv_i64m1_tu(merge,op1,op2,31);
+}
+
+
+vint64m2_t test___riscv_vwadd_wv_i64m2_tu(vint64m2_t merge,vint64m2_t op1,vint32m1_t op2,size_t vl)
+{
+    return __riscv_vwadd_wv_i64m2_tu(merge,op1,op2,31);
+}
+
+
+vint64m4_t test___riscv_vwadd_wv_i64m4_tu(vint64m4_t merge,vint64m4_t op1,vint32m2_t op2,size_t vl)
+{
+    return __riscv_vwadd_wv_i64m4_tu(merge,op1,op2,31);
+}
+
+
+vint64m8_t test___riscv_vwadd_wv_i64m8_tu(vint64m8_t merge,vint64m8_t op1,vint32m4_t op2,size_t vl)
+{
+    return __riscv_vwadd_wv_i64m8_tu(merge,op1,op2,31);
+}
+
+
+
+/* { dg-final { scan-assembler-times {vsetivli\s+zero,\s*31,\s*e8,\s*mf8,\s*tu,\s*m[au]\s+vwadd\.wv\s+v[0-9]+,\s*v[0-9]+,\s*v[0-9]+} 1 } } */
+/* { dg-final { scan-assembler-times {vsetivli\s+zero,\s*31,\s*e8,\s*mf4,\s*tu,\s*m[au]\s+vwadd\.wv\s+v[0-9]+,\s*v[0-9]+,\s*v[0-9]+} 1 } } */
+/* { dg-final { scan-assembler-times {vsetivli\s+zero,\s*31,\s*e8,\s*mf2,\s*tu,\s*m[au]\s+vwadd\.wv\s+v[0-9]+,\s*v[0-9]+,\s*v[0-9]+} 1 } } */
+/* { dg-final { scan-assembler-times {vsetivli\s+zero,\s*31,\s*e8,\s*m1,\s*tu,\s*m[au]\s+vwadd\.wv\s+v[0-9]+,\s*v[0-9]+,\s*v[0-9]+} 1 } } */
+/* { dg-final { scan-assembler-times {vsetivli\s+zero,\s*31,\s*e8,\s*m2,\s*tu,\s*m[au]\s+vwadd\.wv\s+v[0-9]+,\s*v[0-9]+,\s*v[0-9]+} 1 } } */
+/* { dg-final { scan-assembler-times {vsetivli\s+zero,\s*31,\s*e8,\s*m4,\s*tu,\s*m[au]\s+vwadd\.wv\s+v[0-9]+,\s*v[0-9]+,\s*v[0-9]+} 1 } } */
+/* { dg-final { scan-assembler-times {vsetivli\s+zero,\s*31,\s*e16,\s*mf4,\s*tu,\s*m[au]\s+vwadd\.wv\s+v[0-9]+,\s*v[0-9]+,\s*v[0-9]+} 1 } } */
+/* { dg-final { scan-assembler-times {vsetivli\s+zero,\s*31,\s*e16,\s*mf2,\s*tu,\s*m[au]\s+vwadd\.wv\s+v[0-9]+,\s*v[0-9]+,\s*v[0-9]+} 1 } } */
+/* { dg-final { scan-assembler-times {vsetivli\s+zero,\s*31,\s*e16,\s*m1,\s*tu,\s*m[au]\s+vwadd\.wv\s+v[0-9]+,\s*v[0-9]+,\s*v[0-9]+} 1 } } */
+/* { dg-final { scan-assembler-times {vsetivli\s+zero,\s*31,\s*e16,\s*m2,\s*tu,\s*m[au]\s+vwadd\.wv\s+v[0-9]+,\s*v[0-9]+,\s*v[0-9]+} 1 } } */
+/* { dg-final { scan-assembler-times {vsetivli\s+zero,\s*31,\s*e16,\s*m4,\s*tu,\s*m[au]\s+vwadd\.wv\s+v[0-9]+,\s*v[0-9]+,\s*v[0-9]+} 1 } } */
+/* { dg-final { scan-assembler-times {vsetivli\s+zero,\s*31,\s*e32,\s*mf2,\s*tu,\s*m[au]\s+vwadd\.wv\s+v[0-9]+,\s*v[0-9]+,\s*v[0-9]+} 1 } } */
+/* { dg-final { scan-assembler-times {vsetivli\s+zero,\s*31,\s*e32,\s*m1,\s*tu,\s*m[au]\s+vwadd\.wv\s+v[0-9]+,\s*v[0-9]+,\s*v[0-9]+} 1 } } */
+/* { dg-final { scan-assembler-times {vsetivli\s+zero,\s*31,\s*e32,\s*m2,\s*tu,\s*m[au]\s+vwadd\.wv\s+v[0-9]+,\s*v[0-9]+,\s*v[0-9]+} 1 } } */
+/* { dg-final { scan-assembler-times {vsetivli\s+zero,\s*31,\s*e32,\s*m4,\s*tu,\s*m[au]\s+vwadd\.wv\s+v[0-9]+,\s*v[0-9]+,\s*v[0-9]+} 1 } } */
diff --git a/gcc/testsuite/gcc.target/riscv/rvv/base/vwadd_wv_tu-3.c b/gcc/testsuite/gcc.target/riscv/rvv/base/vwadd_wv_tu-3.c
new file mode 100644
index 00000000000..0ad0a377932
--- /dev/null
+++ b/gcc/testsuite/gcc.target/riscv/rvv/base/vwadd_wv_tu-3.c
@@ -0,0 +1,111 @@
+/* { dg-do compile } */
+/* { dg-options "-march=rv64gcv -mabi=lp64d -O3 -fno-schedule-insns -fno-schedule-insns2" } */
+
+#include "riscv_vector.h"
+
+vint16mf4_t test___riscv_vwadd_wv_i16mf4_tu(vint16mf4_t merge,vint16mf4_t op1,vint8mf8_t op2,size_t vl)
+{
+    return __riscv_vwadd_wv_i16mf4_tu(merge,op1,op2,32);
+}
+
+
+vint16mf2_t test___riscv_vwadd_wv_i16mf2_tu(vint16mf2_t merge,vint16mf2_t op1,vint8mf4_t op2,size_t vl)
+{
+    return __riscv_vwadd_wv_i16mf2_tu(merge,op1,op2,32);
+}
+
+
+vint16m1_t test___riscv_vwadd_wv_i16m1_tu(vint16m1_t merge,vint16m1_t op1,vint8mf2_t op2,size_t vl)
+{
+    return __riscv_vwadd_wv_i16m1_tu(merge,op1,op2,32);
+}
+
+
+vint16m2_t test___riscv_vwadd_wv_i16m2_tu(vint16m2_t merge,vint16m2_t op1,vint8m1_t op2,size_t vl)
+{
+    return __riscv_vwadd_wv_i16m2_tu(merge,op1,op2,32);
+}
+
+
+vint16m4_t test___riscv_vwadd_wv_i16m4_tu(vint16m4_t merge,vint16m4_t op1,vint8m2_t op2,size_t vl)
+{
+    return __riscv_vwadd_wv_i16m4_tu(merge,op1,op2,32);
+}
+
+
+vint16m8_t test___riscv_vwadd_wv_i16m8_tu(vint16m8_t merge,vint16m8_t op1,vint8m4_t op2,size_t vl)
+{
+    return __riscv_vwadd_wv_i16m8_tu(merge,op1,op2,32);
+}
+
+
+vint32mf2_t test___riscv_vwadd_wv_i32mf2_tu(vint32mf2_t merge,vint32mf2_t op1,vint16mf4_t op2,size_t vl)
+{
+    return __riscv_vwadd_wv_i32mf2_tu(merge,op1,op2,32);
+}
+
+
+vint32m1_t test___riscv_vwadd_wv_i32m1_tu(vint32m1_t merge,vint32m1_t op1,vint16mf2_t op2,size_t vl)
+{
+    return __riscv_vwadd_wv_i32m1_tu(merge,op1,op2,32);
+}
+
+
+vint32m2_t test___riscv_vwadd_wv_i32m2_tu(vint32m2_t merge,vint32m2_t op1,vint16m1_t op2,size_t vl)
+{
+    return __riscv_vwadd_wv_i32m2_tu(merge,op1,op2,32);
+}
+
+
+vint32m4_t test___riscv_vwadd_wv_i32m4_tu(vint32m4_t merge,vint32m4_t op1,vint16m2_t op2,size_t vl)
+{
+    return __riscv_vwadd_wv_i32m4_tu(merge,op1,op2,32);
+}
+
+
+vint32m8_t test___riscv_vwadd_wv_i32m8_tu(vint32m8_t merge,vint32m8_t op1,vint16m4_t op2,size_t vl)
+{
+    return __riscv_vwadd_wv_i32m8_tu(merge,op1,op2,32);
+}
+
+
+vint64m1_t test___riscv_vwadd_wv_i64m1_tu(vint64m1_t merge,vint64m1_t op1,vint32mf2_t op2,size_t vl)
+{
+    return __riscv_vwadd_wv_i64m1_tu(merge,op1,op2,32);
+}
+
+
+vint64m2_t test___riscv_vwadd_wv_i64m2_tu(vint64m2_t merge,vint64m2_t op1,vint32m1_t op2,size_t vl)
+{
+    return __riscv_vwadd_wv_i64m2_tu(merge,op1,op2,32);
+}
+
+
+vint64m4_t test___riscv_vwadd_wv_i64m4_tu(vint64m4_t merge,vint64m4_t op1,vint32m2_t op2,size_t vl)
+{
+    return __riscv_vwadd_wv_i64m4_tu(merge,op1,op2,32);
+}
+
+
+vint64m8_t test___riscv_vwadd_wv_i64m8_tu(vint64m8_t merge,vint64m8_t op1,vint32m4_t op2,size_t vl)
+{
+    return __riscv_vwadd_wv_i64m8_tu(merge,op1,op2,32);
+}
+
+
+
+/* { dg-final { scan-assembler-times {vsetvli\s+zero,\s*[a-x0-9]+,\s*e8,\s*mf8,\s*tu,\s*m[au]\s+vwadd\.wv\s+v[0-9]+,\s*v[0-9]+,\s*v[0-9]+} 1 } } */
+/* { dg-final { scan-assembler-times {vsetvli\s+zero,\s*[a-x0-9]+,\s*e8,\s*mf4,\s*tu,\s*m[au]\s+vwadd\.wv\s+v[0-9]+,\s*v[0-9]+,\s*v[0-9]+} 1 } } */
+/* { dg-final { scan-assembler-times {vsetvli\s+zero,\s*[a-x0-9]+,\s*e8,\s*mf2,\s*tu,\s*m[au]\s+vwadd\.wv\s+v[0-9]+,\s*v[0-9]+,\s*v[0-9]+} 1 } } */
+/* { dg-final { scan-assembler-times {vsetvli\s+zero,\s*[a-x0-9]+,\s*e8,\s*m1,\s*tu,\s*m[au]\s+vwadd\.wv\s+v[0-9]+,\s*v[0-9]+,\s*v[0-9]+} 1 } } */
+/* { dg-final { scan-assembler-times {vsetvli\s+zero,\s*[a-x0-9]+,\s*e8,\s*m2,\s*tu,\s*m[au]\s+vwadd\.wv\s+v[0-9]+,\s*v[0-9]+,\s*v[0-9]+} 1 } } */
+/* { dg-final { scan-assembler-times {vsetvli\s+zero,\s*[a-x0-9]+,\s*e8,\s*m4,\s*tu,\s*m[au]\s+vwadd\.wv\s+v[0-9]+,\s*v[0-9]+,\s*v[0-9]+} 1 } } */
+/* { dg-final { scan-assembler-times {vsetvli\s+zero,\s*[a-x0-9]+,\s*e16,\s*mf4,\s*tu,\s*m[au]\s+vwadd\.wv\s+v[0-9]+,\s*v[0-9]+,\s*v[0-9]+} 1 } } */
+/* { dg-final { scan-assembler-times {vsetvli\s+zero,\s*[a-x0-9]+,\s*e16,\s*mf2,\s*tu,\s*m[au]\s+vwadd\.wv\s+v[0-9]+,\s*v[0-9]+,\s*v[0-9]+} 1 } } */
+/* { dg-final { scan-assembler-times {vsetvli\s+zero,\s*[a-x0-9]+,\s*e16,\s*m1,\s*tu,\s*m[au]\s+vwadd\.wv\s+v[0-9]+,\s*v[0-9]+,\s*v[0-9]+} 1 } } */
+/* { dg-final { scan-assembler-times {vsetvli\s+zero,\s*[a-x0-9]+,\s*e16,\s*m2,\s*tu,\s*m[au]\s+vwadd\.wv\s+v[0-9]+,\s*v[0-9]+,\s*v[0-9]+} 1 } } */
+/* { dg-final { scan-assembler-times {vsetvli\s+zero,\s*[a-x0-9]+,\s*e16,\s*m4,\s*tu,\s*m[au]\s+vwadd\.wv\s+v[0-9]+,\s*v[0-9]+,\s*v[0-9]+} 1 } } */
+/* { dg-final { scan-assembler-times {vsetvli\s+zero,\s*[a-x0-9]+,\s*e32,\s*mf2,\s*tu,\s*m[au]\s+vwadd\.wv\s+v[0-9]+,\s*v[0-9]+,\s*v[0-9]+} 1 } } */
+/* { dg-final { scan-assembler-times {vsetvli\s+zero,\s*[a-x0-9]+,\s*e32,\s*m1,\s*tu,\s*m[au]\s+vwadd\.wv\s+v[0-9]+,\s*v[0-9]+,\s*v[0-9]+} 1 } } */
+/* { dg-final { scan-assembler-times {vsetvli\s+zero,\s*[a-x0-9]+,\s*e32,\s*m2,\s*tu,\s*m[au]\s+vwadd\.wv\s+v[0-9]+,\s*v[0-9]+,\s*v[0-9]+} 1 } } */
+/* { dg-final { scan-assembler-times {vsetvli\s+zero,\s*[a-x0-9]+,\s*e32,\s*m4,\s*tu,\s*m[au]\s+vwadd\.wv\s+v[0-9]+,\s*v[0-9]+,\s*v[0-9]+} 1 } } */
diff --git a/gcc/testsuite/gcc.target/riscv/rvv/base/vwadd_wv_tum-1.c b/gcc/testsuite/gcc.target/riscv/rvv/base/vwadd_wv_tum-1.c
new file mode 100644
index 00000000000..125a216cde6
--- /dev/null
+++ b/gcc/testsuite/gcc.target/riscv/rvv/base/vwadd_wv_tum-1.c
@@ -0,0 +1,111 @@
+/* { dg-do compile } */
+/* { dg-options "-march=rv64gcv -mabi=lp64d -O3 -fno-schedule-insns -fno-schedule-insns2" } */
+
+#include "riscv_vector.h"
+
+vint16mf4_t test___riscv_vwadd_wv_i16mf4_tum(vbool64_t mask,vint16mf4_t merge,vint16mf4_t op1,vint8mf8_t op2,size_t vl)
+{
+    return __riscv_vwadd_wv_i16mf4_tum(mask,merge,op1,op2,vl);
+}
+
+
+vint16mf2_t test___riscv_vwadd_wv_i16mf2_tum(vbool32_t mask,vint16mf2_t merge,vint16mf2_t op1,vint8mf4_t op2,size_t vl)
+{
+    return __riscv_vwadd_wv_i16mf2_tum(mask,merge,op1,op2,vl);
+}
+
+
+vint16m1_t test___riscv_vwadd_wv_i16m1_tum(vbool16_t mask,vint16m1_t merge,vint16m1_t op1,vint8mf2_t op2,size_t vl)
+{
+    return __riscv_vwadd_wv_i16m1_tum(mask,merge,op1,op2,vl);
+}
+
+
+vint16m2_t test___riscv_vwadd_wv_i16m2_tum(vbool8_t mask,vint16m2_t merge,vint16m2_t op1,vint8m1_t op2,size_t vl)
+{
+    return __riscv_vwadd_wv_i16m2_tum(mask,merge,op1,op2,vl);
+}
+
+
+vint16m4_t test___riscv_vwadd_wv_i16m4_tum(vbool4_t mask,vint16m4_t merge,vint16m4_t op1,vint8m2_t op2,size_t vl)
+{
+    return __riscv_vwadd_wv_i16m4_tum(mask,merge,op1,op2,vl);
+}
+
+
+vint16m8_t test___riscv_vwadd_wv_i16m8_tum(vbool2_t mask,vint16m8_t merge,vint16m8_t op1,vint8m4_t op2,size_t vl)
+{
+    return __riscv_vwadd_wv_i16m8_tum(mask,merge,op1,op2,vl);
+}
+
+
+vint32mf2_t test___riscv_vwadd_wv_i32mf2_tum(vbool64_t mask,vint32mf2_t merge,vint32mf2_t op1,vint16mf4_t op2,size_t vl)
+{
+    return __riscv_vwadd_wv_i32mf2_tum(mask,merge,op1,op2,vl);
+}
+
+
+vint32m1_t test___riscv_vwadd_wv_i32m1_tum(vbool32_t mask,vint32m1_t merge,vint32m1_t op1,vint16mf2_t op2,size_t vl)
+{
+    return __riscv_vwadd_wv_i32m1_tum(mask,merge,op1,op2,vl);
+}
+
+
+vint32m2_t test___riscv_vwadd_wv_i32m2_tum(vbool16_t mask,vint32m2_t merge,vint32m2_t op1,vint16m1_t op2,size_t vl)
+{
+    return __riscv_vwadd_wv_i32m2_tum(mask,merge,op1,op2,vl);
+}
+
+
+vint32m4_t test___riscv_vwadd_wv_i32m4_tum(vbool8_t mask,vint32m4_t merge,vint32m4_t op1,vint16m2_t op2,size_t vl)
+{
+    return __riscv_vwadd_wv_i32m4_tum(mask,merge,op1,op2,vl);
+}
+
+
+vint32m8_t test___riscv_vwadd_wv_i32m8_tum(vbool4_t mask,vint32m8_t merge,vint32m8_t op1,vint16m4_t op2,size_t vl)
+{
+    return __riscv_vwadd_wv_i32m8_tum(mask,merge,op1,op2,vl);
+}
+
+
+vint64m1_t test___riscv_vwadd_wv_i64m1_tum(vbool64_t mask,vint64m1_t merge,vint64m1_t op1,vint32mf2_t op2,size_t vl)
+{
+    return __riscv_vwadd_wv_i64m1_tum(mask,merge,op1,op2,vl);
+}
+
+
+vint64m2_t test___riscv_vwadd_wv_i64m2_tum(vbool32_t mask,vint64m2_t merge,vint64m2_t op1,vint32m1_t op2,size_t vl)
+{
+    return __riscv_vwadd_wv_i64m2_tum(mask,merge,op1,op2,vl);
+}
+
+
+vint64m4_t test___riscv_vwadd_wv_i64m4_tum(vbool16_t mask,vint64m4_t merge,vint64m4_t op1,vint32m2_t op2,size_t vl)
+{
+    return __riscv_vwadd_wv_i64m4_tum(mask,merge,op1,op2,vl);
+}
+
+
+vint64m8_t test___riscv_vwadd_wv_i64m8_tum(vbool8_t mask,vint64m8_t merge,vint64m8_t op1,vint32m4_t op2,size_t vl)
+{
+    return __riscv_vwadd_wv_i64m8_tum(mask,merge,op1,op2,vl);
+}
+
+
+
+/* { dg-final { scan-assembler-times {vsetvli\s+zero,\s*[a-x0-9]+,\s*e8,\s*mf8,\s*tu,\s*m[au]\s+vwadd\.wv\s+v[0-9]+,\s*v[0-9]+,\s*v[0-9]+,\s*v0.t} 1 } } */
+/* { dg-final { scan-assembler-times {vsetvli\s+zero,\s*[a-x0-9]+,\s*e8,\s*mf4,\s*tu,\s*m[au]\s+vwadd\.wv\s+v[0-9]+,\s*v[0-9]+,\s*v[0-9]+,\s*v0.t} 1 } } */
+/* { dg-final { scan-assembler-times {vsetvli\s+zero,\s*[a-x0-9]+,\s*e8,\s*mf2,\s*tu,\s*m[au]\s+vwadd\.wv\s+v[0-9]+,\s*v[0-9]+,\s*v[0-9]+,\s*v0.t} 1 } } */
+/* { dg-final { scan-assembler-times {vsetvli\s+zero,\s*[a-x0-9]+,\s*e8,\s*m1,\s*tu,\s*m[au]\s+vwadd\.wv\s+v[0-9]+,\s*v[0-9]+,\s*v[0-9]+,\s*v0.t} 1 } } */
+/* { dg-final { scan-assembler-times {vsetvli\s+zero,\s*[a-x0-9]+,\s*e8,\s*m2,\s*tu,\s*m[au]\s+vwadd\.wv\s+v[0-9]+,\s*v[0-9]+,\s*v[0-9]+,\s*v0.t} 1 } } */
+/* { dg-final { scan-assembler-times {vsetvli\s+zero,\s*[a-x0-9]+,\s*e8,\s*m4,\s*tu,\s*m[au]\s+vwadd\.wv\s+v[0-9]+,\s*v[0-9]+,\s*v[0-9]+,\s*v0.t} 1 } } */
+/* { dg-final { scan-assembler-times {vsetvli\s+zero,\s*[a-x0-9]+,\s*e16,\s*mf4,\s*tu,\s*m[au]\s+vwadd\.wv\s+v[0-9]+,\s*v[0-9]+,\s*v[0-9]+,\s*v0.t} 1 } } */
+/* { dg-final { scan-assembler-times {vsetvli\s+zero,\s*[a-x0-9]+,\s*e16,\s*mf2,\s*tu,\s*m[au]\s+vwadd\.wv\s+v[0-9]+,\s*v[0-9]+,\s*v[0-9]+,\s*v0.t} 1 } } */
+/* { dg-final { scan-assembler-times {vsetvli\s+zero,\s*[a-x0-9]+,\s*e16,\s*m1,\s*tu,\s*m[au]\s+vwadd\.wv\s+v[0-9]+,\s*v[0-9]+,\s*v[0-9]+,\s*v0.t} 1 } } */
+/* { dg-final { scan-assembler-times {vsetvli\s+zero,\s*[a-x0-9]+,\s*e16,\s*m2,\s*tu,\s*m[au]\s+vwadd\.wv\s+v[0-9]+,\s*v[0-9]+,\s*v[0-9]+,\s*v0.t} 1 } } */
+/* { dg-final { scan-assembler-times {vsetvli\s+zero,\s*[a-x0-9]+,\s*e16,\s*m4,\s*tu,\s*m[au]\s+vwadd\.wv\s+v[0-9]+,\s*v[0-9]+,\s*v[0-9]+,\s*v0.t} 1 } } */
+/* { dg-final { scan-assembler-times {vsetvli\s+zero,\s*[a-x0-9]+,\s*e32,\s*mf2,\s*tu,\s*m[au]\s+vwadd\.wv\s+v[0-9]+,\s*v[0-9]+,\s*v[0-9]+,\s*v0.t} 1 } } */
+/* { dg-final { scan-assembler-times {vsetvli\s+zero,\s*[a-x0-9]+,\s*e32,\s*m1,\s*tu,\s*m[au]\s+vwadd\.wv\s+v[0-9]+,\s*v[0-9]+,\s*v[0-9]+,\s*v0.t} 1 } } */
+/* { dg-final { scan-assembler-times {vsetvli\s+zero,\s*[a-x0-9]+,\s*e32,\s*m2,\s*tu,\s*m[au]\s+vwadd\.wv\s+v[0-9]+,\s*v[0-9]+,\s*v[0-9]+,\s*v0.t} 1 } } */
+/* { dg-final { scan-assembler-times {vsetvli\s+zero,\s*[a-x0-9]+,\s*e32,\s*m4,\s*tu,\s*m[au]\s+vwadd\.wv\s+v[0-9]+,\s*v[0-9]+,\s*v[0-9]+,\s*v0.t} 1 } } */
diff --git a/gcc/testsuite/gcc.target/riscv/rvv/base/vwadd_wv_tum-2.c b/gcc/testsuite/gcc.target/riscv/rvv/base/vwadd_wv_tum-2.c
new file mode 100644
index 00000000000..d983a7540e9
--- /dev/null
+++ b/gcc/testsuite/gcc.target/riscv/rvv/base/vwadd_wv_tum-2.c
@@ -0,0 +1,111 @@
+/* { dg-do compile } */
+/* { dg-options "-march=rv64gcv -mabi=lp64d -O3 -fno-schedule-insns -fno-schedule-insns2" } */
+
+#include "riscv_vector.h"
+
+vint16mf4_t test___riscv_vwadd_wv_i16mf4_tum(vbool64_t mask,vint16mf4_t merge,vint16mf4_t op1,vint8mf8_t op2,size_t vl)
+{
+    return __riscv_vwadd_wv_i16mf4_tum(mask,merge,op1,op2,31);
+}
+
+
+vint16mf2_t test___riscv_vwadd_wv_i16mf2_tum(vbool32_t mask,vint16mf2_t merge,vint16mf2_t op1,vint8mf4_t op2,size_t vl)
+{
+    return __riscv_vwadd_wv_i16mf2_tum(mask,merge,op1,op2,31);
+}
+
+
+vint16m1_t test___riscv_vwadd_wv_i16m1_tum(vbool16_t mask,vint16m1_t merge,vint16m1_t op1,vint8mf2_t op2,size_t vl)
+{
+    return __riscv_vwadd_wv_i16m1_tum(mask,merge,op1,op2,31);
+}
+
+
+vint16m2_t test___riscv_vwadd_wv_i16m2_tum(vbool8_t mask,vint16m2_t merge,vint16m2_t op1,vint8m1_t op2,size_t vl)
+{
+    return __riscv_vwadd_wv_i16m2_tum(mask,merge,op1,op2,31);
+}
+
+
+vint16m4_t test___riscv_vwadd_wv_i16m4_tum(vbool4_t mask,vint16m4_t merge,vint16m4_t op1,vint8m2_t op2,size_t vl)
+{
+    return __riscv_vwadd_wv_i16m4_tum(mask,merge,op1,op2,31);
+}
+
+
+vint16m8_t test___riscv_vwadd_wv_i16m8_tum(vbool2_t mask,vint16m8_t merge,vint16m8_t op1,vint8m4_t op2,size_t vl)
+{
+    return __riscv_vwadd_wv_i16m8_tum(mask,merge,op1,op2,31);
+}
+
+
+vint32mf2_t test___riscv_vwadd_wv_i32mf2_tum(vbool64_t mask,vint32mf2_t merge,vint32mf2_t op1,vint16mf4_t op2,size_t vl)
+{
+    return __riscv_vwadd_wv_i32mf2_tum(mask,merge,op1,op2,31);
+}
+
+
+vint32m1_t test___riscv_vwadd_wv_i32m1_tum(vbool32_t mask,vint32m1_t merge,vint32m1_t op1,vint16mf2_t op2,size_t vl)
+{
+    return __riscv_vwadd_wv_i32m1_tum(mask,merge,op1,op2,31);
+}
+
+
+vint32m2_t test___riscv_vwadd_wv_i32m2_tum(vbool16_t mask,vint32m2_t merge,vint32m2_t op1,vint16m1_t op2,size_t vl)
+{
+    return __riscv_vwadd_wv_i32m2_tum(mask,merge,op1,op2,31);
+}
+
+
+vint32m4_t test___riscv_vwadd_wv_i32m4_tum(vbool8_t mask,vint32m4_t merge,vint32m4_t op1,vint16m2_t op2,size_t vl)
+{
+    return __riscv_vwadd_wv_i32m4_tum(mask,merge,op1,op2,31);
+}
+
+
+vint32m8_t test___riscv_vwadd_wv_i32m8_tum(vbool4_t mask,vint32m8_t merge,vint32m8_t op1,vint16m4_t op2,size_t vl)
+{
+    return __riscv_vwadd_wv_i32m8_tum(mask,merge,op1,op2,31);
+}
+
+
+vint64m1_t test___riscv_vwadd_wv_i64m1_tum(vbool64_t mask,vint64m1_t merge,vint64m1_t op1,vint32mf2_t op2,size_t vl)
+{
+    return __riscv_vwadd_wv_i64m1_tum(mask,merge,op1,op2,31);
+}
+
+
+vint64m2_t test___riscv_vwadd_wv_i64m2_tum(vbool32_t mask,vint64m2_t merge,vint64m2_t op1,vint32m1_t op2,size_t vl)
+{
+    return __riscv_vwadd_wv_i64m2_tum(mask,merge,op1,op2,31);
+}
+
+
+vint64m4_t test___riscv_vwadd_wv_i64m4_tum(vbool16_t mask,vint64m4_t merge,vint64m4_t op1,vint32m2_t op2,size_t vl)
+{
+    return __riscv_vwadd_wv_i64m4_tum(mask,merge,op1,op2,31);
+}
+
+
+vint64m8_t test___riscv_vwadd_wv_i64m8_tum(vbool8_t mask,vint64m8_t merge,vint64m8_t op1,vint32m4_t op2,size_t vl)
+{
+    return __riscv_vwadd_wv_i64m8_tum(mask,merge,op1,op2,31);
+}
+
+
+
+/* { dg-final { scan-assembler-times {vsetivli\s+zero,\s*31,\s*e8,\s*mf8,\s*tu,\s*m[au]\s+vwadd\.wv\s+v[0-9]+,\s*v[0-9]+,\s*v[0-9]+,\s*v0.t} 1 } } */
+/* { dg-final { scan-assembler-times {vsetivli\s+zero,\s*31,\s*e8,\s*mf4,\s*tu,\s*m[au]\s+vwadd\.wv\s+v[0-9]+,\s*v[0-9]+,\s*v[0-9]+,\s*v0.t} 1 } } */
+/* { dg-final { scan-assembler-times {vsetivli\s+zero,\s*31,\s*e8,\s*mf2,\s*tu,\s*m[au]\s+vwadd\.wv\s+v[0-9]+,\s*v[0-9]+,\s*v[0-9]+,\s*v0.t} 1 } } */
+/* { dg-final { scan-assembler-times {vsetivli\s+zero,\s*31,\s*e8,\s*m1,\s*tu,\s*m[au]\s+vwadd\.wv\s+v[0-9]+,\s*v[0-9]+,\s*v[0-9]+,\s*v0.t} 1 } } */
+/* { dg-final { scan-assembler-times {vsetivli\s+zero,\s*31,\s*e8,\s*m2,\s*tu,\s*m[au]\s+vwadd\.wv\s+v[0-9]+,\s*v[0-9]+,\s*v[0-9]+,\s*v0.t} 1 } } */
+/* { dg-final { scan-assembler-times {vsetivli\s+zero,\s*31,\s*e8,\s*m4,\s*tu,\s*m[au]\s+vwadd\.wv\s+v[0-9]+,\s*v[0-9]+,\s*v[0-9]+,\s*v0.t} 1 } } */
+/* { dg-final { scan-assembler-times {vsetivli\s+zero,\s*31,\s*e16,\s*mf4,\s*tu,\s*m[au]\s+vwadd\.wv\s+v[0-9]+,\s*v[0-9]+,\s*v[0-9]+,\s*v0.t} 1 } } */
+/* { dg-final { scan-assembler-times {vsetivli\s+zero,\s*31,\s*e16,\s*mf2,\s*tu,\s*m[au]\s+vwadd\.wv\s+v[0-9]+,\s*v[0-9]+,\s*v[0-9]+,\s*v0.t} 1 } } */
+/* { dg-final { scan-assembler-times {vsetivli\s+zero,\s*31,\s*e16,\s*m1,\s*tu,\s*m[au]\s+vwadd\.wv\s+v[0-9]+,\s*v[0-9]+,\s*v[0-9]+,\s*v0.t} 1 } } */
+/* { dg-final { scan-assembler-times {vsetivli\s+zero,\s*31,\s*e16,\s*m2,\s*tu,\s*m[au]\s+vwadd\.wv\s+v[0-9]+,\s*v[0-9]+,\s*v[0-9]+,\s*v0.t} 1 } } */
+/* { dg-final { scan-assembler-times {vsetivli\s+zero,\s*31,\s*e16,\s*m4,\s*tu,\s*m[au]\s+vwadd\.wv\s+v[0-9]+,\s*v[0-9]+,\s*v[0-9]+,\s*v0.t} 1 } } */
+/* { dg-final { scan-assembler-times {vsetivli\s+zero,\s*31,\s*e32,\s*mf2,\s*tu,\s*m[au]\s+vwadd\.wv\s+v[0-9]+,\s*v[0-9]+,\s*v[0-9]+,\s*v0.t} 1 } } */
+/* { dg-final { scan-assembler-times {vsetivli\s+zero,\s*31,\s*e32,\s*m1,\s*tu,\s*m[au]\s+vwadd\.wv\s+v[0-9]+,\s*v[0-9]+,\s*v[0-9]+,\s*v0.t} 1 } } */
+/* { dg-final { scan-assembler-times {vsetivli\s+zero,\s*31,\s*e32,\s*m2,\s*tu,\s*m[au]\s+vwadd\.wv\s+v[0-9]+,\s*v[0-9]+,\s*v[0-9]+,\s*v0.t} 1 } } */
+/* { dg-final { scan-assembler-times {vsetivli\s+zero,\s*31,\s*e32,\s*m4,\s*tu,\s*m[au]\s+vwadd\.wv\s+v[0-9]+,\s*v[0-9]+,\s*v[0-9]+,\s*v0.t} 1 } } */
diff --git a/gcc/testsuite/gcc.target/riscv/rvv/base/vwadd_wv_tum-3.c b/gcc/testsuite/gcc.target/riscv/rvv/base/vwadd_wv_tum-3.c
new file mode 100644
index 00000000000..df5c2022e08
--- /dev/null
+++ b/gcc/testsuite/gcc.target/riscv/rvv/base/vwadd_wv_tum-3.c
@@ -0,0 +1,111 @@
+/* { dg-do compile } */
+/* { dg-options "-march=rv64gcv -mabi=lp64d -O3 -fno-schedule-insns -fno-schedule-insns2" } */
+
+#include "riscv_vector.h"
+
+vint16mf4_t test___riscv_vwadd_wv_i16mf4_tum(vbool64_t mask,vint16mf4_t merge,vint16mf4_t op1,vint8mf8_t op2,size_t vl)
+{
+    return __riscv_vwadd_wv_i16mf4_tum(mask,merge,op1,op2,32);
+}
+
+
+vint16mf2_t test___riscv_vwadd_wv_i16mf2_tum(vbool32_t mask,vint16mf2_t merge,vint16mf2_t op1,vint8mf4_t op2,size_t vl)
+{
+    return __riscv_vwadd_wv_i16mf2_tum(mask,merge,op1,op2,32);
+}
+
+
+vint16m1_t test___riscv_vwadd_wv_i16m1_tum(vbool16_t mask,vint16m1_t merge,vint16m1_t op1,vint8mf2_t op2,size_t vl)
+{
+    return __riscv_vwadd_wv_i16m1_tum(mask,merge,op1,op2,32);
+}
+
+
+vint16m2_t test___riscv_vwadd_wv_i16m2_tum(vbool8_t mask,vint16m2_t merge,vint16m2_t op1,vint8m1_t op2,size_t vl)
+{
+    return __riscv_vwadd_wv_i16m2_tum(mask,merge,op1,op2,32);
+}
+
+
+vint16m4_t test___riscv_vwadd_wv_i16m4_tum(vbool4_t mask,vint16m4_t merge,vint16m4_t op1,vint8m2_t op2,size_t vl)
+{
+    return __riscv_vwadd_wv_i16m4_tum(mask,merge,op1,op2,32);
+}
+
+
+vint16m8_t test___riscv_vwadd_wv_i16m8_tum(vbool2_t mask,vint16m8_t merge,vint16m8_t op1,vint8m4_t op2,size_t vl)
+{
+    return __riscv_vwadd_wv_i16m8_tum(mask,merge,op1,op2,32);
+}
+
+
+vint32mf2_t test___riscv_vwadd_wv_i32mf2_tum(vbool64_t mask,vint32mf2_t merge,vint32mf2_t op1,vint16mf4_t op2,size_t vl)
+{
+    return __riscv_vwadd_wv_i32mf2_tum(mask,merge,op1,op2,32);
+}
+
+
+vint32m1_t test___riscv_vwadd_wv_i32m1_tum(vbool32_t mask,vint32m1_t merge,vint32m1_t op1,vint16mf2_t op2,size_t vl)
+{
+    return __riscv_vwadd_wv_i32m1_tum(mask,merge,op1,op2,32);
+}
+
+
+vint32m2_t test___riscv_vwadd_wv_i32m2_tum(vbool16_t mask,vint32m2_t merge,vint32m2_t op1,vint16m1_t op2,size_t vl)
+{
+    return __riscv_vwadd_wv_i32m2_tum(mask,merge,op1,op2,32);
+}
+
+
+vint32m4_t test___riscv_vwadd_wv_i32m4_tum(vbool8_t mask,vint32m4_t merge,vint32m4_t op1,vint16m2_t op2,size_t vl)
+{
+    return __riscv_vwadd_wv_i32m4_tum(mask,merge,op1,op2,32);
+}
+
+
+vint32m8_t test___riscv_vwadd_wv_i32m8_tum(vbool4_t mask,vint32m8_t merge,vint32m8_t op1,vint16m4_t op2,size_t vl)
+{
+    return __riscv_vwadd_wv_i32m8_tum(mask,merge,op1,op2,32);
+}
+
+
+vint64m1_t test___riscv_vwadd_wv_i64m1_tum(vbool64_t mask,vint64m1_t merge,vint64m1_t op1,vint32mf2_t op2,size_t vl)
+{
+    return __riscv_vwadd_wv_i64m1_tum(mask,merge,op1,op2,32);
+}
+
+
+vint64m2_t test___riscv_vwadd_wv_i64m2_tum(vbool32_t mask,vint64m2_t merge,vint64m2_t op1,vint32m1_t op2,size_t vl)
+{
+    return __riscv_vwadd_wv_i64m2_tum(mask,merge,op1,op2,32);
+}
+
+
+vint64m4_t test___riscv_vwadd_wv_i64m4_tum(vbool16_t mask,vint64m4_t merge,vint64m4_t op1,vint32m2_t op2,size_t vl)
+{
+    return __riscv_vwadd_wv_i64m4_tum(mask,merge,op1,op2,32);
+}
+
+
+vint64m8_t test___riscv_vwadd_wv_i64m8_tum(vbool8_t mask,vint64m8_t merge,vint64m8_t op1,vint32m4_t op2,size_t vl)
+{
+    return __riscv_vwadd_wv_i64m8_tum(mask,merge,op1,op2,32);
+}
+
+
+
+/* { dg-final { scan-assembler-times {vsetvli\s+zero,\s*[a-x0-9]+,\s*e8,\s*mf8,\s*tu,\s*m[au]\s+vwadd\.wv\s+v[0-9]+,\s*v[0-9]+,\s*v[0-9]+,\s*v0.t} 1 } } */
+/* { dg-final { scan-assembler-times {vsetvli\s+zero,\s*[a-x0-9]+,\s*e8,\s*mf4,\s*tu,\s*m[au]\s+vwadd\.wv\s+v[0-9]+,\s*v[0-9]+,\s*v[0-9]+,\s*v0.t} 1 } } */
+/* { dg-final { scan-assembler-times {vsetvli\s+zero,\s*[a-x0-9]+,\s*e8,\s*mf2,\s*tu,\s*m[au]\s+vwadd\.wv\s+v[0-9]+,\s*v[0-9]+,\s*v[0-9]+,\s*v0.t} 1 } } */
+/* { dg-final { scan-assembler-times {vsetvli\s+zero,\s*[a-x0-9]+,\s*e8,\s*m1,\s*tu,\s*m[au]\s+vwadd\.wv\s+v[0-9]+,\s*v[0-9]+,\s*v[0-9]+,\s*v0.t} 1 } } */
+/* { dg-final { scan-assembler-times {vsetvli\s+zero,\s*[a-x0-9]+,\s*e8,\s*m2,\s*tu,\s*m[au]\s+vwadd\.wv\s+v[0-9]+,\s*v[0-9]+,\s*v[0-9]+,\s*v0.t} 1 } } */
+/* { dg-final { scan-assembler-times {vsetvli\s+zero,\s*[a-x0-9]+,\s*e8,\s*m4,\s*tu,\s*m[au]\s+vwadd\.wv\s+v[0-9]+,\s*v[0-9]+,\s*v[0-9]+,\s*v0.t} 1 } } */
+/* { dg-final { scan-assembler-times {vsetvli\s+zero,\s*[a-x0-9]+,\s*e16,\s*mf4,\s*tu,\s*m[au]\s+vwadd\.wv\s+v[0-9]+,\s*v[0-9]+,\s*v[0-9]+,\s*v0.t} 1 } } */
+/* { dg-final { scan-assembler-times {vsetvli\s+zero,\s*[a-x0-9]+,\s*e16,\s*mf2,\s*tu,\s*m[au]\s+vwadd\.wv\s+v[0-9]+,\s*v[0-9]+,\s*v[0-9]+,\s*v0.t} 1 } } */
+/* { dg-final { scan-assembler-times {vsetvli\s+zero,\s*[a-x0-9]+,\s*e16,\s*m1,\s*tu,\s*m[au]\s+vwadd\.wv\s+v[0-9]+,\s*v[0-9]+,\s*v[0-9]+,\s*v0.t} 1 } } */
+/* { dg-final { scan-assembler-times {vsetvli\s+zero,\s*[a-x0-9]+,\s*e16,\s*m2,\s*tu,\s*m[au]\s+vwadd\.wv\s+v[0-9]+,\s*v[0-9]+,\s*v[0-9]+,\s*v0.t} 1 } } */
+/* { dg-final { scan-assembler-times {vsetvli\s+zero,\s*[a-x0-9]+,\s*e16,\s*m4,\s*tu,\s*m[au]\s+vwadd\.wv\s+v[0-9]+,\s*v[0-9]+,\s*v[0-9]+,\s*v0.t} 1 } } */
+/* { dg-final { scan-assembler-times {vsetvli\s+zero,\s*[a-x0-9]+,\s*e32,\s*mf2,\s*tu,\s*m[au]\s+vwadd\.wv\s+v[0-9]+,\s*v[0-9]+,\s*v[0-9]+,\s*v0.t} 1 } } */
+/* { dg-final { scan-assembler-times {vsetvli\s+zero,\s*[a-x0-9]+,\s*e32,\s*m1,\s*tu,\s*m[au]\s+vwadd\.wv\s+v[0-9]+,\s*v[0-9]+,\s*v[0-9]+,\s*v0.t} 1 } } */
+/* { dg-final { scan-assembler-times {vsetvli\s+zero,\s*[a-x0-9]+,\s*e32,\s*m2,\s*tu,\s*m[au]\s+vwadd\.wv\s+v[0-9]+,\s*v[0-9]+,\s*v[0-9]+,\s*v0.t} 1 } } */
+/* { dg-final { scan-assembler-times {vsetvli\s+zero,\s*[a-x0-9]+,\s*e32,\s*m4,\s*tu,\s*m[au]\s+vwadd\.wv\s+v[0-9]+,\s*v[0-9]+,\s*v[0-9]+,\s*v0.t} 1 } } */
diff --git a/gcc/testsuite/gcc.target/riscv/rvv/base/vwadd_wv_tumu-1.c b/gcc/testsuite/gcc.target/riscv/rvv/base/vwadd_wv_tumu-1.c
new file mode 100644
index 00000000000..8cd2ee7d34a
--- /dev/null
+++ b/gcc/testsuite/gcc.target/riscv/rvv/base/vwadd_wv_tumu-1.c
@@ -0,0 +1,111 @@
+/* { dg-do compile } */
+/* { dg-options "-march=rv64gcv -mabi=lp64d -O3 -fno-schedule-insns -fno-schedule-insns2" } */
+
+#include "riscv_vector.h"
+
+vint16mf4_t test___riscv_vwadd_wv_i16mf4_tumu(vbool64_t mask,vint16mf4_t merge,vint16mf4_t op1,vint8mf8_t op2,size_t vl)
+{
+    return __riscv_vwadd_wv_i16mf4_tumu(mask,merge,op1,op2,vl);
+}
+
+
+vint16mf2_t test___riscv_vwadd_wv_i16mf2_tumu(vbool32_t mask,vint16mf2_t merge,vint16mf2_t op1,vint8mf4_t op2,size_t vl)
+{
+    return __riscv_vwadd_wv_i16mf2_tumu(mask,merge,op1,op2,vl);
+}
+
+
+vint16m1_t test___riscv_vwadd_wv_i16m1_tumu(vbool16_t mask,vint16m1_t merge,vint16m1_t op1,vint8mf2_t op2,size_t vl)
+{
+    return __riscv_vwadd_wv_i16m1_tumu(mask,merge,op1,op2,vl);
+}
+
+
+vint16m2_t test___riscv_vwadd_wv_i16m2_tumu(vbool8_t mask,vint16m2_t merge,vint16m2_t op1,vint8m1_t op2,size_t vl)
+{
+    return __riscv_vwadd_wv_i16m2_tumu(mask,merge,op1,op2,vl);
+}
+
+
+vint16m4_t test___riscv_vwadd_wv_i16m4_tumu(vbool4_t mask,vint16m4_t merge,vint16m4_t op1,vint8m2_t op2,size_t vl)
+{
+    return __riscv_vwadd_wv_i16m4_tumu(mask,merge,op1,op2,vl);
+}
+
+
+vint16m8_t test___riscv_vwadd_wv_i16m8_tumu(vbool2_t mask,vint16m8_t merge,vint16m8_t op1,vint8m4_t op2,size_t vl)
+{
+    return __riscv_vwadd_wv_i16m8_tumu(mask,merge,op1,op2,vl);
+}
+
+
+vint32mf2_t test___riscv_vwadd_wv_i32mf2_tumu(vbool64_t mask,vint32mf2_t merge,vint32mf2_t op1,vint16mf4_t op2,size_t vl)
+{
+    return __riscv_vwadd_wv_i32mf2_tumu(mask,merge,op1,op2,vl);
+}
+
+
+vint32m1_t test___riscv_vwadd_wv_i32m1_tumu(vbool32_t mask,vint32m1_t merge,vint32m1_t op1,vint16mf2_t op2,size_t vl)
+{
+    return __riscv_vwadd_wv_i32m1_tumu(mask,merge,op1,op2,vl);
+}
+
+
+vint32m2_t test___riscv_vwadd_wv_i32m2_tumu(vbool16_t mask,vint32m2_t merge,vint32m2_t op1,vint16m1_t op2,size_t vl)
+{
+    return __riscv_vwadd_wv_i32m2_tumu(mask,merge,op1,op2,vl);
+}
+
+
+vint32m4_t test___riscv_vwadd_wv_i32m4_tumu(vbool8_t mask,vint32m4_t merge,vint32m4_t op1,vint16m2_t op2,size_t vl)
+{
+    return __riscv_vwadd_wv_i32m4_tumu(mask,merge,op1,op2,vl);
+}
+
+
+vint32m8_t test___riscv_vwadd_wv_i32m8_tumu(vbool4_t mask,vint32m8_t merge,vint32m8_t op1,vint16m4_t op2,size_t vl)
+{
+    return __riscv_vwadd_wv_i32m8_tumu(mask,merge,op1,op2,vl);
+}
+
+
+vint64m1_t test___riscv_vwadd_wv_i64m1_tumu(vbool64_t mask,vint64m1_t merge,vint64m1_t op1,vint32mf2_t op2,size_t vl)
+{
+    return __riscv_vwadd_wv_i64m1_tumu(mask,merge,op1,op2,vl);
+}
+
+
+vint64m2_t test___riscv_vwadd_wv_i64m2_tumu(vbool32_t mask,vint64m2_t merge,vint64m2_t op1,vint32m1_t op2,size_t vl)
+{
+    return __riscv_vwadd_wv_i64m2_tumu(mask,merge,op1,op2,vl);
+}
+
+
+vint64m4_t test___riscv_vwadd_wv_i64m4_tumu(vbool16_t mask,vint64m4_t merge,vint64m4_t op1,vint32m2_t op2,size_t vl)
+{
+    return __riscv_vwadd_wv_i64m4_tumu(mask,merge,op1,op2,vl);
+}
+
+
+vint64m8_t test___riscv_vwadd_wv_i64m8_tumu(vbool8_t mask,vint64m8_t merge,vint64m8_t op1,vint32m4_t op2,size_t vl)
+{
+    return __riscv_vwadd_wv_i64m8_tumu(mask,merge,op1,op2,vl);
+}
+
+
+
+/* { dg-final { scan-assembler-times {vsetvli\s+zero,\s*[a-x0-9]+,\s*e8,\s*mf8,\s*tu,\s*mu\s+vwadd\.wv\s+v[0-9]+,\s*v[0-9]+,\s*v[0-9]+,\s*v0.t} 1 } } */
+/* { dg-final { scan-assembler-times {vsetvli\s+zero,\s*[a-x0-9]+,\s*e8,\s*mf4,\s*tu,\s*mu\s+vwadd\.wv\s+v[0-9]+,\s*v[0-9]+,\s*v[0-9]+,\s*v0.t} 1 } } */
+/* { dg-final { scan-assembler-times {vsetvli\s+zero,\s*[a-x0-9]+,\s*e8,\s*mf2,\s*tu,\s*mu\s+vwadd\.wv\s+v[0-9]+,\s*v[0-9]+,\s*v[0-9]+,\s*v0.t} 1 } } */
+/* { dg-final { scan-assembler-times {vsetvli\s+zero,\s*[a-x0-9]+,\s*e8,\s*m1,\s*tu,\s*mu\s+vwadd\.wv\s+v[0-9]+,\s*v[0-9]+,\s*v[0-9]+,\s*v0.t} 1 } } */
+/* { dg-final { scan-assembler-times {vsetvli\s+zero,\s*[a-x0-9]+,\s*e8,\s*m2,\s*tu,\s*mu\s+vwadd\.wv\s+v[0-9]+,\s*v[0-9]+,\s*v[0-9]+,\s*v0.t} 1 } } */
+/* { dg-final { scan-assembler-times {vsetvli\s+zero,\s*[a-x0-9]+,\s*e8,\s*m4,\s*tu,\s*mu\s+vwadd\.wv\s+v[0-9]+,\s*v[0-9]+,\s*v[0-9]+,\s*v0.t} 1 } } */
+/* { dg-final { scan-assembler-times {vsetvli\s+zero,\s*[a-x0-9]+,\s*e16,\s*mf4,\s*tu,\s*mu\s+vwadd\.wv\s+v[0-9]+,\s*v[0-9]+,\s*v[0-9]+,\s*v0.t} 1 } } */
+/* { dg-final { scan-assembler-times {vsetvli\s+zero,\s*[a-x0-9]+,\s*e16,\s*mf2,\s*tu,\s*mu\s+vwadd\.wv\s+v[0-9]+,\s*v[0-9]+,\s*v[0-9]+,\s*v0.t} 1 } } */
+/* { dg-final { scan-assembler-times {vsetvli\s+zero,\s*[a-x0-9]+,\s*e16,\s*m1,\s*tu,\s*mu\s+vwadd\.wv\s+v[0-9]+,\s*v[0-9]+,\s*v[0-9]+,\s*v0.t} 1 } } */
+/* { dg-final { scan-assembler-times {vsetvli\s+zero,\s*[a-x0-9]+,\s*e16,\s*m2,\s*tu,\s*mu\s+vwadd\.wv\s+v[0-9]+,\s*v[0-9]+,\s*v[0-9]+,\s*v0.t} 1 } } */
+/* { dg-final { scan-assembler-times {vsetvli\s+zero,\s*[a-x0-9]+,\s*e16,\s*m4,\s*tu,\s*mu\s+vwadd\.wv\s+v[0-9]+,\s*v[0-9]+,\s*v[0-9]+,\s*v0.t} 1 } } */
+/* { dg-final { scan-assembler-times {vsetvli\s+zero,\s*[a-x0-9]+,\s*e32,\s*mf2,\s*tu,\s*mu\s+vwadd\.wv\s+v[0-9]+,\s*v[0-9]+,\s*v[0-9]+,\s*v0.t} 1 } } */
+/* { dg-final { scan-assembler-times {vsetvli\s+zero,\s*[a-x0-9]+,\s*e32,\s*m1,\s*tu,\s*mu\s+vwadd\.wv\s+v[0-9]+,\s*v[0-9]+,\s*v[0-9]+,\s*v0.t} 1 } } */
+/* { dg-final { scan-assembler-times {vsetvli\s+zero,\s*[a-x0-9]+,\s*e32,\s*m2,\s*tu,\s*mu\s+vwadd\.wv\s+v[0-9]+,\s*v[0-9]+,\s*v[0-9]+,\s*v0.t} 1 } } */
+/* { dg-final { scan-assembler-times {vsetvli\s+zero,\s*[a-x0-9]+,\s*e32,\s*m4,\s*tu,\s*mu\s+vwadd\.wv\s+v[0-9]+,\s*v[0-9]+,\s*v[0-9]+,\s*v0.t} 1 } } */
diff --git a/gcc/testsuite/gcc.target/riscv/rvv/base/vwadd_wv_tumu-2.c b/gcc/testsuite/gcc.target/riscv/rvv/base/vwadd_wv_tumu-2.c
new file mode 100644
index 00000000000..047d149198d
--- /dev/null
+++ b/gcc/testsuite/gcc.target/riscv/rvv/base/vwadd_wv_tumu-2.c
@@ -0,0 +1,111 @@
+/* { dg-do compile } */
+/* { dg-options "-march=rv64gcv -mabi=lp64d -O3 -fno-schedule-insns -fno-schedule-insns2" } */
+
+#include "riscv_vector.h"
+
+vint16mf4_t test___riscv_vwadd_wv_i16mf4_tumu(vbool64_t mask,vint16mf4_t merge,vint16mf4_t op1,vint8mf8_t op2,size_t vl)
+{
+    return __riscv_vwadd_wv_i16mf4_tumu(mask,merge,op1,op2,31);
+}
+
+
+vint16mf2_t test___riscv_vwadd_wv_i16mf2_tumu(vbool32_t mask,vint16mf2_t merge,vint16mf2_t op1,vint8mf4_t op2,size_t vl)
+{
+    return __riscv_vwadd_wv_i16mf2_tumu(mask,merge,op1,op2,31);
+}
+
+
+vint16m1_t test___riscv_vwadd_wv_i16m1_tumu(vbool16_t mask,vint16m1_t merge,vint16m1_t op1,vint8mf2_t op2,size_t vl)
+{
+    return __riscv_vwadd_wv_i16m1_tumu(mask,merge,op1,op2,31);
+}
+
+
+vint16m2_t test___riscv_vwadd_wv_i16m2_tumu(vbool8_t mask,vint16m2_t merge,vint16m2_t op1,vint8m1_t op2,size_t vl)
+{
+    return __riscv_vwadd_wv_i16m2_tumu(mask,merge,op1,op2,31);
+}
+
+
+vint16m4_t test___riscv_vwadd_wv_i16m4_tumu(vbool4_t mask,vint16m4_t merge,vint16m4_t op1,vint8m2_t op2,size_t vl)
+{
+    return __riscv_vwadd_wv_i16m4_tumu(mask,merge,op1,op2,31);
+}
+
+
+vint16m8_t test___riscv_vwadd_wv_i16m8_tumu(vbool2_t mask,vint16m8_t merge,vint16m8_t op1,vint8m4_t op2,size_t vl)
+{
+    return __riscv_vwadd_wv_i16m8_tumu(mask,merge,op1,op2,31);
+}
+
+
+vint32mf2_t test___riscv_vwadd_wv_i32mf2_tumu(vbool64_t mask,vint32mf2_t merge,vint32mf2_t op1,vint16mf4_t op2,size_t vl)
+{
+    return __riscv_vwadd_wv_i32mf2_tumu(mask,merge,op1,op2,31);
+}
+
+
+vint32m1_t test___riscv_vwadd_wv_i32m1_tumu(vbool32_t mask,vint32m1_t merge,vint32m1_t op1,vint16mf2_t op2,size_t vl)
+{
+    return __riscv_vwadd_wv_i32m1_tumu(mask,merge,op1,op2,31);
+}
+
+
+vint32m2_t test___riscv_vwadd_wv_i32m2_tumu(vbool16_t mask,vint32m2_t merge,vint32m2_t op1,vint16m1_t op2,size_t vl)
+{
+    return __riscv_vwadd_wv_i32m2_tumu(mask,merge,op1,op2,31);
+}
+
+
+vint32m4_t test___riscv_vwadd_wv_i32m4_tumu(vbool8_t mask,vint32m4_t merge,vint32m4_t op1,vint16m2_t op2,size_t vl)
+{
+    return __riscv_vwadd_wv_i32m4_tumu(mask,merge,op1,op2,31);
+}
+
+
+vint32m8_t test___riscv_vwadd_wv_i32m8_tumu(vbool4_t mask,vint32m8_t merge,vint32m8_t op1,vint16m4_t op2,size_t vl)
+{
+    return __riscv_vwadd_wv_i32m8_tumu(mask,merge,op1,op2,31);
+}
+
+
+vint64m1_t test___riscv_vwadd_wv_i64m1_tumu(vbool64_t mask,vint64m1_t merge,vint64m1_t op1,vint32mf2_t op2,size_t vl)
+{
+    return __riscv_vwadd_wv_i64m1_tumu(mask,merge,op1,op2,31);
+}
+
+
+vint64m2_t test___riscv_vwadd_wv_i64m2_tumu(vbool32_t mask,vint64m2_t merge,vint64m2_t op1,vint32m1_t op2,size_t vl)
+{
+    return __riscv_vwadd_wv_i64m2_tumu(mask,merge,op1,op2,31);
+}
+
+
+vint64m4_t test___riscv_vwadd_wv_i64m4_tumu(vbool16_t mask,vint64m4_t merge,vint64m4_t op1,vint32m2_t op2,size_t vl)
+{
+    return __riscv_vwadd_wv_i64m4_tumu(mask,merge,op1,op2,31);
+}
+
+
+vint64m8_t test___riscv_vwadd_wv_i64m8_tumu(vbool8_t mask,vint64m8_t merge,vint64m8_t op1,vint32m4_t op2,size_t vl)
+{
+    return __riscv_vwadd_wv_i64m8_tumu(mask,merge,op1,op2,31);
+}
+
+
+
+/* { dg-final { scan-assembler-times {vsetivli\s+zero,\s*31,\s*e8,\s*mf8,\s*tu,\s*mu\s+vwadd\.wv\s+v[0-9]+,\s*v[0-9]+,\s*v[0-9]+,\s*v0.t} 1 } } */
+/* { dg-final { scan-assembler-times {vsetivli\s+zero,\s*31,\s*e8,\s*mf4,\s*tu,\s*mu\s+vwadd\.wv\s+v[0-9]+,\s*v[0-9]+,\s*v[0-9]+,\s*v0.t} 1 } } */
+/* { dg-final { scan-assembler-times {vsetivli\s+zero,\s*31,\s*e8,\s*mf2,\s*tu,\s*mu\s+vwadd\.wv\s+v[0-9]+,\s*v[0-9]+,\s*v[0-9]+,\s*v0.t} 1 } } */
+/* { dg-final { scan-assembler-times {vsetivli\s+zero,\s*31,\s*e8,\s*m1,\s*tu,\s*mu\s+vwadd\.wv\s+v[0-9]+,\s*v[0-9]+,\s*v[0-9]+,\s*v0.t} 1 } } */
+/* { dg-final { scan-assembler-times {vsetivli\s+zero,\s*31,\s*e8,\s*m2,\s*tu,\s*mu\s+vwadd\.wv\s+v[0-9]+,\s*v[0-9]+,\s*v[0-9]+,\s*v0.t} 1 } } */
+/* { dg-final { scan-assembler-times {vsetivli\s+zero,\s*31,\s*e8,\s*m4,\s*tu,\s*mu\s+vwadd\.wv\s+v[0-9]+,\s*v[0-9]+,\s*v[0-9]+,\s*v0.t} 1 } } */
+/* { dg-final { scan-assembler-times {vsetivli\s+zero,\s*31,\s*e16,\s*mf4,\s*tu,\s*mu\s+vwadd\.wv\s+v[0-9]+,\s*v[0-9]+,\s*v[0-9]+,\s*v0.t} 1 } } */
+/* { dg-final { scan-assembler-times {vsetivli\s+zero,\s*31,\s*e16,\s*mf2,\s*tu,\s*mu\s+vwadd\.wv\s+v[0-9]+,\s*v[0-9]+,\s*v[0-9]+,\s*v0.t} 1 } } */
+/* { dg-final { scan-assembler-times {vsetivli\s+zero,\s*31,\s*e16,\s*m1,\s*tu,\s*mu\s+vwadd\.wv\s+v[0-9]+,\s*v[0-9]+,\s*v[0-9]+,\s*v0.t} 1 } } */
+/* { dg-final { scan-assembler-times {vsetivli\s+zero,\s*31,\s*e16,\s*m2,\s*tu,\s*mu\s+vwadd\.wv\s+v[0-9]+,\s*v[0-9]+,\s*v[0-9]+,\s*v0.t} 1 } } */
+/* { dg-final { scan-assembler-times {vsetivli\s+zero,\s*31,\s*e16,\s*m4,\s*tu,\s*mu\s+vwadd\.wv\s+v[0-9]+,\s*v[0-9]+,\s*v[0-9]+,\s*v0.t} 1 } } */
+/* { dg-final { scan-assembler-times {vsetivli\s+zero,\s*31,\s*e32,\s*mf2,\s*tu,\s*mu\s+vwadd\.wv\s+v[0-9]+,\s*v[0-9]+,\s*v[0-9]+,\s*v0.t} 1 } } */
+/* { dg-final { scan-assembler-times {vsetivli\s+zero,\s*31,\s*e32,\s*m1,\s*tu,\s*mu\s+vwadd\.wv\s+v[0-9]+,\s*v[0-9]+,\s*v[0-9]+,\s*v0.t} 1 } } */
+/* { dg-final { scan-assembler-times {vsetivli\s+zero,\s*31,\s*e32,\s*m2,\s*tu,\s*mu\s+vwadd\.wv\s+v[0-9]+,\s*v[0-9]+,\s*v[0-9]+,\s*v0.t} 1 } } */
+/* { dg-final { scan-assembler-times {vsetivli\s+zero,\s*31,\s*e32,\s*m4,\s*tu,\s*mu\s+vwadd\.wv\s+v[0-9]+,\s*v[0-9]+,\s*v[0-9]+,\s*v0.t} 1 } } */
diff --git a/gcc/testsuite/gcc.target/riscv/rvv/base/vwadd_wv_tumu-3.c b/gcc/testsuite/gcc.target/riscv/rvv/base/vwadd_wv_tumu-3.c
new file mode 100644
index 00000000000..a586d47a7b2
--- /dev/null
+++ b/gcc/testsuite/gcc.target/riscv/rvv/base/vwadd_wv_tumu-3.c
@@ -0,0 +1,111 @@
+/* { dg-do compile } */
+/* { dg-options "-march=rv64gcv -mabi=lp64d -O3 -fno-schedule-insns -fno-schedule-insns2" } */
+
+#include "riscv_vector.h"
+
+vint16mf4_t test___riscv_vwadd_wv_i16mf4_tumu(vbool64_t mask,vint16mf4_t merge,vint16mf4_t op1,vint8mf8_t op2,size_t vl)
+{
+    return __riscv_vwadd_wv_i16mf4_tumu(mask,merge,op1,op2,32);
+}
+
+
+vint16mf2_t test___riscv_vwadd_wv_i16mf2_tumu(vbool32_t mask,vint16mf2_t merge,vint16mf2_t op1,vint8mf4_t op2,size_t vl)
+{
+    return __riscv_vwadd_wv_i16mf2_tumu(mask,merge,op1,op2,32);
+}
+
+
+vint16m1_t test___riscv_vwadd_wv_i16m1_tumu(vbool16_t mask,vint16m1_t merge,vint16m1_t op1,vint8mf2_t op2,size_t vl)
+{
+    return __riscv_vwadd_wv_i16m1_tumu(mask,merge,op1,op2,32);
+}
+
+
+vint16m2_t test___riscv_vwadd_wv_i16m2_tumu(vbool8_t mask,vint16m2_t merge,vint16m2_t op1,vint8m1_t op2,size_t vl)
+{
+    return __riscv_vwadd_wv_i16m2_tumu(mask,merge,op1,op2,32);
+}
+
+
+vint16m4_t test___riscv_vwadd_wv_i16m4_tumu(vbool4_t mask,vint16m4_t merge,vint16m4_t op1,vint8m2_t op2,size_t vl)
+{
+    return __riscv_vwadd_wv_i16m4_tumu(mask,merge,op1,op2,32);
+}
+
+
+vint16m8_t test___riscv_vwadd_wv_i16m8_tumu(vbool2_t mask,vint16m8_t merge,vint16m8_t op1,vint8m4_t op2,size_t vl)
+{
+    return __riscv_vwadd_wv_i16m8_tumu(mask,merge,op1,op2,32);
+}
+
+
+vint32mf2_t test___riscv_vwadd_wv_i32mf2_tumu(vbool64_t mask,vint32mf2_t merge,vint32mf2_t op1,vint16mf4_t op2,size_t vl)
+{
+    return __riscv_vwadd_wv_i32mf2_tumu(mask,merge,op1,op2,32);
+}
+
+
+vint32m1_t test___riscv_vwadd_wv_i32m1_tumu(vbool32_t mask,vint32m1_t merge,vint32m1_t op1,vint16mf2_t op2,size_t vl)
+{
+    return __riscv_vwadd_wv_i32m1_tumu(mask,merge,op1,op2,32);
+}
+
+
+vint32m2_t test___riscv_vwadd_wv_i32m2_tumu(vbool16_t mask,vint32m2_t merge,vint32m2_t op1,vint16m1_t op2,size_t vl)
+{
+    return __riscv_vwadd_wv_i32m2_tumu(mask,merge,op1,op2,32);
+}
+
+
+vint32m4_t test___riscv_vwadd_wv_i32m4_tumu(vbool8_t mask,vint32m4_t merge,vint32m4_t op1,vint16m2_t op2,size_t vl)
+{
+    return __riscv_vwadd_wv_i32m4_tumu(mask,merge,op1,op2,32);
+}
+
+
+vint32m8_t test___riscv_vwadd_wv_i32m8_tumu(vbool4_t mask,vint32m8_t merge,vint32m8_t op1,vint16m4_t op2,size_t vl)
+{
+    return __riscv_vwadd_wv_i32m8_tumu(mask,merge,op1,op2,32);
+}
+
+
+vint64m1_t test___riscv_vwadd_wv_i64m1_tumu(vbool64_t mask,vint64m1_t merge,vint64m1_t op1,vint32mf2_t op2,size_t vl)
+{
+    return __riscv_vwadd_wv_i64m1_tumu(mask,merge,op1,op2,32);
+}
+
+
+vint64m2_t test___riscv_vwadd_wv_i64m2_tumu(vbool32_t mask,vint64m2_t merge,vint64m2_t op1,vint32m1_t op2,size_t vl)
+{
+    return __riscv_vwadd_wv_i64m2_tumu(mask,merge,op1,op2,32);
+}
+
+
+vint64m4_t test___riscv_vwadd_wv_i64m4_tumu(vbool16_t mask,vint64m4_t merge,vint64m4_t op1,vint32m2_t op2,size_t vl)
+{
+    return __riscv_vwadd_wv_i64m4_tumu(mask,merge,op1,op2,32);
+}
+
+
+vint64m8_t test___riscv_vwadd_wv_i64m8_tumu(vbool8_t mask,vint64m8_t merge,vint64m8_t op1,vint32m4_t op2,size_t vl)
+{
+    return __riscv_vwadd_wv_i64m8_tumu(mask,merge,op1,op2,32);
+}
+
+
+
+/* { dg-final { scan-assembler-times {vsetvli\s+zero,\s*[a-x0-9]+,\s*e8,\s*mf8,\s*tu,\s*mu\s+vwadd\.wv\s+v[0-9]+,\s*v[0-9]+,\s*v[0-9]+,\s*v0.t} 1 } } */
+/* { dg-final { scan-assembler-times {vsetvli\s+zero,\s*[a-x0-9]+,\s*e8,\s*mf4,\s*tu,\s*mu\s+vwadd\.wv\s+v[0-9]+,\s*v[0-9]+,\s*v[0-9]+,\s*v0.t} 1 } } */
+/* { dg-final { scan-assembler-times {vsetvli\s+zero,\s*[a-x0-9]+,\s*e8,\s*mf2,\s*tu,\s*mu\s+vwadd\.wv\s+v[0-9]+,\s*v[0-9]+,\s*v[0-9]+,\s*v0.t} 1 } } */
+/* { dg-final { scan-assembler-times {vsetvli\s+zero,\s*[a-x0-9]+,\s*e8,\s*m1,\s*tu,\s*mu\s+vwadd\.wv\s+v[0-9]+,\s*v[0-9]+,\s*v[0-9]+,\s*v0.t} 1 } } */
+/* { dg-final { scan-assembler-times {vsetvli\s+zero,\s*[a-x0-9]+,\s*e8,\s*m2,\s*tu,\s*mu\s+vwadd\.wv\s+v[0-9]+,\s*v[0-9]+,\s*v[0-9]+,\s*v0.t} 1 } } */
+/* { dg-final { scan-assembler-times {vsetvli\s+zero,\s*[a-x0-9]+,\s*e8,\s*m4,\s*tu,\s*mu\s+vwadd\.wv\s+v[0-9]+,\s*v[0-9]+,\s*v[0-9]+,\s*v0.t} 1 } } */
+/* { dg-final { scan-assembler-times {vsetvli\s+zero,\s*[a-x0-9]+,\s*e16,\s*mf4,\s*tu,\s*mu\s+vwadd\.wv\s+v[0-9]+,\s*v[0-9]+,\s*v[0-9]+,\s*v0.t} 1 } } */
+/* { dg-final { scan-assembler-times {vsetvli\s+zero,\s*[a-x0-9]+,\s*e16,\s*mf2,\s*tu,\s*mu\s+vwadd\.wv\s+v[0-9]+,\s*v[0-9]+,\s*v[0-9]+,\s*v0.t} 1 } } */
+/* { dg-final { scan-assembler-times {vsetvli\s+zero,\s*[a-x0-9]+,\s*e16,\s*m1,\s*tu,\s*mu\s+vwadd\.wv\s+v[0-9]+,\s*v[0-9]+,\s*v[0-9]+,\s*v0.t} 1 } } */
+/* { dg-final { scan-assembler-times {vsetvli\s+zero,\s*[a-x0-9]+,\s*e16,\s*m2,\s*tu,\s*mu\s+vwadd\.wv\s+v[0-9]+,\s*v[0-9]+,\s*v[0-9]+,\s*v0.t} 1 } } */
+/* { dg-final { scan-assembler-times {vsetvli\s+zero,\s*[a-x0-9]+,\s*e16,\s*m4,\s*tu,\s*mu\s+vwadd\.wv\s+v[0-9]+,\s*v[0-9]+,\s*v[0-9]+,\s*v0.t} 1 } } */
+/* { dg-final { scan-assembler-times {vsetvli\s+zero,\s*[a-x0-9]+,\s*e32,\s*mf2,\s*tu,\s*mu\s+vwadd\.wv\s+v[0-9]+,\s*v[0-9]+,\s*v[0-9]+,\s*v0.t} 1 } } */
+/* { dg-final { scan-assembler-times {vsetvli\s+zero,\s*[a-x0-9]+,\s*e32,\s*m1,\s*tu,\s*mu\s+vwadd\.wv\s+v[0-9]+,\s*v[0-9]+,\s*v[0-9]+,\s*v0.t} 1 } } */
+/* { dg-final { scan-assembler-times {vsetvli\s+zero,\s*[a-x0-9]+,\s*e32,\s*m2,\s*tu,\s*mu\s+vwadd\.wv\s+v[0-9]+,\s*v[0-9]+,\s*v[0-9]+,\s*v0.t} 1 } } */
+/* { dg-final { scan-assembler-times {vsetvli\s+zero,\s*[a-x0-9]+,\s*e32,\s*m4,\s*tu,\s*mu\s+vwadd\.wv\s+v[0-9]+,\s*v[0-9]+,\s*v[0-9]+,\s*v0.t} 1 } } */
diff --git a/gcc/testsuite/gcc.target/riscv/rvv/base/vwadd_wx-1.c b/gcc/testsuite/gcc.target/riscv/rvv/base/vwadd_wx-1.c
new file mode 100644
index 00000000000..71f255366f4
--- /dev/null
+++ b/gcc/testsuite/gcc.target/riscv/rvv/base/vwadd_wx-1.c
@@ -0,0 +1,111 @@
+/* { dg-do compile } */
+/* { dg-options "-march=rv32gcv -mabi=ilp32 -O3 -fno-schedule-insns -fno-schedule-insns2" } */
+
+#include "riscv_vector.h"
+
+vint16mf4_t test___riscv_vwadd_wx_i16mf4(vint16mf4_t op1,int8_t op2,size_t vl)
+{
+    return __riscv_vwadd_wx_i16mf4(op1,0xAA,vl);
+}
+
+
+vint16mf2_t test___riscv_vwadd_wx_i16mf2(vint16mf2_t op1,int8_t op2,size_t vl)
+{
+    return __riscv_vwadd_wx_i16mf2(op1,0xAA,vl);
+}
+
+
+vint16m1_t test___riscv_vwadd_wx_i16m1(vint16m1_t op1,int8_t op2,size_t vl)
+{
+    return __riscv_vwadd_wx_i16m1(op1,0xAA,vl);
+}
+
+
+vint16m2_t test___riscv_vwadd_wx_i16m2(vint16m2_t op1,int8_t op2,size_t vl)
+{
+    return __riscv_vwadd_wx_i16m2(op1,0xAA,vl);
+}
+
+
+vint16m4_t test___riscv_vwadd_wx_i16m4(vint16m4_t op1,int8_t op2,size_t vl)
+{
+    return __riscv_vwadd_wx_i16m4(op1,0xAA,vl);
+}
+
+
+vint16m8_t test___riscv_vwadd_wx_i16m8(vint16m8_t op1,int8_t op2,size_t vl)
+{
+    return __riscv_vwadd_wx_i16m8(op1,0xAA,vl);
+}
+
+
+vint32mf2_t test___riscv_vwadd_wx_i32mf2(vint32mf2_t op1,int16_t op2,size_t vl)
+{
+    return __riscv_vwadd_wx_i32mf2(op1,0xAA,vl);
+}
+
+
+vint32m1_t test___riscv_vwadd_wx_i32m1(vint32m1_t op1,int16_t op2,size_t vl)
+{
+    return __riscv_vwadd_wx_i32m1(op1,0xAA,vl);
+}
+
+
+vint32m2_t test___riscv_vwadd_wx_i32m2(vint32m2_t op1,int16_t op2,size_t vl)
+{
+    return __riscv_vwadd_wx_i32m2(op1,0xAA,vl);
+}
+
+
+vint32m4_t test___riscv_vwadd_wx_i32m4(vint32m4_t op1,int16_t op2,size_t vl)
+{
+    return __riscv_vwadd_wx_i32m4(op1,0xAA,vl);
+}
+
+
+vint32m8_t test___riscv_vwadd_wx_i32m8(vint32m8_t op1,int16_t op2,size_t vl)
+{
+    return __riscv_vwadd_wx_i32m8(op1,0xAA,vl);
+}
+
+
+vint64m1_t test___riscv_vwadd_wx_i64m1(vint64m1_t op1,int32_t op2,size_t vl)
+{
+    return __riscv_vwadd_wx_i64m1(op1,0xAA,vl);
+}
+
+
+vint64m2_t test___riscv_vwadd_wx_i64m2(vint64m2_t op1,int32_t op2,size_t vl)
+{
+    return __riscv_vwadd_wx_i64m2(op1,0xAA,vl);
+}
+
+
+vint64m4_t test___riscv_vwadd_wx_i64m4(vint64m4_t op1,int32_t op2,size_t vl)
+{
+    return __riscv_vwadd_wx_i64m4(op1,0xAA,vl);
+}
+
+
+vint64m8_t test___riscv_vwadd_wx_i64m8(vint64m8_t op1,int32_t op2,size_t vl)
+{
+    return __riscv_vwadd_wx_i64m8(op1,0xAA,vl);
+}
+
+
+
+/* { dg-final { scan-assembler-times {vsetvli\s+zero,\s*[a-x0-9]+,\s*e8,\s*mf8,\s*t[au],\s*m[au]\s+vwadd\.wx\s+v[0-9]+,\s*v[0-9]+,\s*[a-x0-9]+} 1 } } */
+/* { dg-final { scan-assembler-times {vsetvli\s+zero,\s*[a-x0-9]+,\s*e8,\s*mf4,\s*t[au],\s*m[au]\s+vwadd\.wx\s+v[0-9]+,\s*v[0-9]+,\s*[a-x0-9]+} 1 } } */
+/* { dg-final { scan-assembler-times {vsetvli\s+zero,\s*[a-x0-9]+,\s*e8,\s*mf2,\s*t[au],\s*m[au]\s+vwadd\.wx\s+v[0-9]+,\s*v[0-9]+,\s*[a-x0-9]+} 1 } } */
+/* { dg-final { scan-assembler-times {vsetvli\s+zero,\s*[a-x0-9]+,\s*e8,\s*m1,\s*t[au],\s*m[au]\s+vwadd\.wx\s+v[0-9]+,\s*v[0-9]+,\s*[a-x0-9]+} 1 } } */
+/* { dg-final { scan-assembler-times {vsetvli\s+zero,\s*[a-x0-9]+,\s*e8,\s*m2,\s*t[au],\s*m[au]\s+vwadd\.wx\s+v[0-9]+,\s*v[0-9]+,\s*[a-x0-9]+} 1 } } */
+/* { dg-final { scan-assembler-times {vsetvli\s+zero,\s*[a-x0-9]+,\s*e8,\s*m4,\s*t[au],\s*m[au]\s+vwadd\.wx\s+v[0-9]+,\s*v[0-9]+,\s*[a-x0-9]+} 1 } } */
+/* { dg-final { scan-assembler-times {vsetvli\s+zero,\s*[a-x0-9]+,\s*e16,\s*mf4,\s*t[au],\s*m[au]\s+vwadd\.wx\s+v[0-9]+,\s*v[0-9]+,\s*[a-x0-9]+} 1 } } */
+/* { dg-final { scan-assembler-times {vsetvli\s+zero,\s*[a-x0-9]+,\s*e16,\s*mf2,\s*t[au],\s*m[au]\s+vwadd\.wx\s+v[0-9]+,\s*v[0-9]+,\s*[a-x0-9]+} 1 } } */
+/* { dg-final { scan-assembler-times {vsetvli\s+zero,\s*[a-x0-9]+,\s*e16,\s*m1,\s*t[au],\s*m[au]\s+vwadd\.wx\s+v[0-9]+,\s*v[0-9]+,\s*[a-x0-9]+} 1 } } */
+/* { dg-final { scan-assembler-times {vsetvli\s+zero,\s*[a-x0-9]+,\s*e16,\s*m2,\s*t[au],\s*m[au]\s+vwadd\.wx\s+v[0-9]+,\s*v[0-9]+,\s*[a-x0-9]+} 1 } } */
+/* { dg-final { scan-assembler-times {vsetvli\s+zero,\s*[a-x0-9]+,\s*e16,\s*m4,\s*t[au],\s*m[au]\s+vwadd\.wx\s+v[0-9]+,\s*v[0-9]+,\s*[a-x0-9]+} 1 } } */
+/* { dg-final { scan-assembler-times {vsetvli\s+zero,\s*[a-x0-9]+,\s*e32,\s*mf2,\s*t[au],\s*m[au]\s+vwadd\.wx\s+v[0-9]+,\s*v[0-9]+,\s*[a-x0-9]+} 1 } } */
+/* { dg-final { scan-assembler-times {vsetvli\s+zero,\s*[a-x0-9]+,\s*e32,\s*m1,\s*t[au],\s*m[au]\s+vwadd\.wx\s+v[0-9]+,\s*v[0-9]+,\s*[a-x0-9]+} 1 } } */
+/* { dg-final { scan-assembler-times {vsetvli\s+zero,\s*[a-x0-9]+,\s*e32,\s*m2,\s*t[au],\s*m[au]\s+vwadd\.wx\s+v[0-9]+,\s*v[0-9]+,\s*[a-x0-9]+} 1 } } */
+/* { dg-final { scan-assembler-times {vsetvli\s+zero,\s*[a-x0-9]+,\s*e32,\s*m4,\s*t[au],\s*m[au]\s+vwadd\.wx\s+v[0-9]+,\s*v[0-9]+,\s*[a-x0-9]+} 1 } } */
diff --git a/gcc/testsuite/gcc.target/riscv/rvv/base/vwadd_wx-2.c b/gcc/testsuite/gcc.target/riscv/rvv/base/vwadd_wx-2.c
new file mode 100644
index 00000000000..18ea948a309
--- /dev/null
+++ b/gcc/testsuite/gcc.target/riscv/rvv/base/vwadd_wx-2.c
@@ -0,0 +1,111 @@
+/* { dg-do compile } */
+/* { dg-options "-march=rv32gcv -mabi=ilp32 -O3 -fno-schedule-insns -fno-schedule-insns2" } */
+
+#include "riscv_vector.h"
+
+vint16mf4_t test___riscv_vwadd_wx_i16mf4(vint16mf4_t op1,int8_t op2,size_t vl)
+{
+    return __riscv_vwadd_wx_i16mf4(op1,0xAA,31);
+}
+
+
+vint16mf2_t test___riscv_vwadd_wx_i16mf2(vint16mf2_t op1,int8_t op2,size_t vl)
+{
+    return __riscv_vwadd_wx_i16mf2(op1,0xAA,31);
+}
+
+
+vint16m1_t test___riscv_vwadd_wx_i16m1(vint16m1_t op1,int8_t op2,size_t vl)
+{
+    return __riscv_vwadd_wx_i16m1(op1,0xAA,31);
+}
+
+
+vint16m2_t test___riscv_vwadd_wx_i16m2(vint16m2_t op1,int8_t op2,size_t vl)
+{
+    return __riscv_vwadd_wx_i16m2(op1,0xAA,31);
+}
+
+
+vint16m4_t test___riscv_vwadd_wx_i16m4(vint16m4_t op1,int8_t op2,size_t vl)
+{
+    return __riscv_vwadd_wx_i16m4(op1,0xAA,31);
+}
+
+
+vint16m8_t test___riscv_vwadd_wx_i16m8(vint16m8_t op1,int8_t op2,size_t vl)
+{
+    return __riscv_vwadd_wx_i16m8(op1,0xAA,31);
+}
+
+
+vint32mf2_t test___riscv_vwadd_wx_i32mf2(vint32mf2_t op1,int16_t op2,size_t vl)
+{
+    return __riscv_vwadd_wx_i32mf2(op1,0xAA,31);
+}
+
+
+vint32m1_t test___riscv_vwadd_wx_i32m1(vint32m1_t op1,int16_t op2,size_t vl)
+{
+    return __riscv_vwadd_wx_i32m1(op1,0xAA,31);
+}
+
+
+vint32m2_t test___riscv_vwadd_wx_i32m2(vint32m2_t op1,int16_t op2,size_t vl)
+{
+    return __riscv_vwadd_wx_i32m2(op1,0xAA,31);
+}
+
+
+vint32m4_t test___riscv_vwadd_wx_i32m4(vint32m4_t op1,int16_t op2,size_t vl)
+{
+    return __riscv_vwadd_wx_i32m4(op1,0xAA,31);
+}
+
+
+vint32m8_t test___riscv_vwadd_wx_i32m8(vint32m8_t op1,int16_t op2,size_t vl)
+{
+    return __riscv_vwadd_wx_i32m8(op1,0xAA,31);
+}
+
+
+vint64m1_t test___riscv_vwadd_wx_i64m1(vint64m1_t op1,int32_t op2,size_t vl)
+{
+    return __riscv_vwadd_wx_i64m1(op1,0xAA,31);
+}
+
+
+vint64m2_t test___riscv_vwadd_wx_i64m2(vint64m2_t op1,int32_t op2,size_t vl)
+{
+    return __riscv_vwadd_wx_i64m2(op1,0xAA,31);
+}
+
+
+vint64m4_t test___riscv_vwadd_wx_i64m4(vint64m4_t op1,int32_t op2,size_t vl)
+{
+    return __riscv_vwadd_wx_i64m4(op1,0xAA,31);
+}
+
+
+vint64m8_t test___riscv_vwadd_wx_i64m8(vint64m8_t op1,int32_t op2,size_t vl)
+{
+    return __riscv_vwadd_wx_i64m8(op1,0xAA,31);
+}
+
+
+
+/* { dg-final { scan-assembler-times {vsetivli\s+zero,\s*31,\s*e8,\s*mf8,\s*t[au],\s*m[au]\s+vwadd\.wx\s+v[0-9]+,\s*v[0-9]+,\s*[a-x0-9]+} 1 } } */
+/* { dg-final { scan-assembler-times {vsetivli\s+zero,\s*31,\s*e8,\s*mf4,\s*t[au],\s*m[au]\s+vwadd\.wx\s+v[0-9]+,\s*v[0-9]+,\s*[a-x0-9]+} 1 } } */
+/* { dg-final { scan-assembler-times {vsetivli\s+zero,\s*31,\s*e8,\s*mf2,\s*t[au],\s*m[au]\s+vwadd\.wx\s+v[0-9]+,\s*v[0-9]+,\s*[a-x0-9]+} 1 } } */
+/* { dg-final { scan-assembler-times {vsetivli\s+zero,\s*31,\s*e8,\s*m1,\s*t[au],\s*m[au]\s+vwadd\.wx\s+v[0-9]+,\s*v[0-9]+,\s*[a-x0-9]+} 1 } } */
+/* { dg-final { scan-assembler-times {vsetivli\s+zero,\s*31,\s*e8,\s*m2,\s*t[au],\s*m[au]\s+vwadd\.wx\s+v[0-9]+,\s*v[0-9]+,\s*[a-x0-9]+} 1 } } */
+/* { dg-final { scan-assembler-times {vsetivli\s+zero,\s*31,\s*e8,\s*m4,\s*t[au],\s*m[au]\s+vwadd\.wx\s+v[0-9]+,\s*v[0-9]+,\s*[a-x0-9]+} 1 } } */
+/* { dg-final { scan-assembler-times {vsetivli\s+zero,\s*31,\s*e16,\s*mf4,\s*t[au],\s*m[au]\s+vwadd\.wx\s+v[0-9]+,\s*v[0-9]+,\s*[a-x0-9]+} 1 } } */
+/* { dg-final { scan-assembler-times {vsetivli\s+zero,\s*31,\s*e16,\s*mf2,\s*t[au],\s*m[au]\s+vwadd\.wx\s+v[0-9]+,\s*v[0-9]+,\s*[a-x0-9]+} 1 } } */
+/* { dg-final { scan-assembler-times {vsetivli\s+zero,\s*31,\s*e16,\s*m1,\s*t[au],\s*m[au]\s+vwadd\.wx\s+v[0-9]+,\s*v[0-9]+,\s*[a-x0-9]+} 1 } } */
+/* { dg-final { scan-assembler-times {vsetivli\s+zero,\s*31,\s*e16,\s*m2,\s*t[au],\s*m[au]\s+vwadd\.wx\s+v[0-9]+,\s*v[0-9]+,\s*[a-x0-9]+} 1 } } */
+/* { dg-final { scan-assembler-times {vsetivli\s+zero,\s*31,\s*e16,\s*m4,\s*t[au],\s*m[au]\s+vwadd\.wx\s+v[0-9]+,\s*v[0-9]+,\s*[a-x0-9]+} 1 } } */
+/* { dg-final { scan-assembler-times {vsetivli\s+zero,\s*31,\s*e32,\s*mf2,\s*t[au],\s*m[au]\s+vwadd\.wx\s+v[0-9]+,\s*v[0-9]+,\s*[a-x0-9]+} 1 } } */
+/* { dg-final { scan-assembler-times {vsetivli\s+zero,\s*31,\s*e32,\s*m1,\s*t[au],\s*m[au]\s+vwadd\.wx\s+v[0-9]+,\s*v[0-9]+,\s*[a-x0-9]+} 1 } } */
+/* { dg-final { scan-assembler-times {vsetivli\s+zero,\s*31,\s*e32,\s*m2,\s*t[au],\s*m[au]\s+vwadd\.wx\s+v[0-9]+,\s*v[0-9]+,\s*[a-x0-9]+} 1 } } */
+/* { dg-final { scan-assembler-times {vsetivli\s+zero,\s*31,\s*e32,\s*m4,\s*t[au],\s*m[au]\s+vwadd\.wx\s+v[0-9]+,\s*v[0-9]+,\s*[a-x0-9]+} 1 } } */
diff --git a/gcc/testsuite/gcc.target/riscv/rvv/base/vwadd_wx-3.c b/gcc/testsuite/gcc.target/riscv/rvv/base/vwadd_wx-3.c
new file mode 100644
index 00000000000..cb893556580
--- /dev/null
+++ b/gcc/testsuite/gcc.target/riscv/rvv/base/vwadd_wx-3.c
@@ -0,0 +1,111 @@
+/* { dg-do compile } */
+/* { dg-options "-march=rv32gcv -mabi=ilp32 -O3 -fno-schedule-insns -fno-schedule-insns2" } */
+
+#include "riscv_vector.h"
+
+vint16mf4_t test___riscv_vwadd_wx_i16mf4(vint16mf4_t op1,int8_t op2,size_t vl)
+{
+    return __riscv_vwadd_wx_i16mf4(op1,0xAA,32);
+}
+
+
+vint16mf2_t test___riscv_vwadd_wx_i16mf2(vint16mf2_t op1,int8_t op2,size_t vl)
+{
+    return __riscv_vwadd_wx_i16mf2(op1,0xAA,32);
+}
+
+
+vint16m1_t test___riscv_vwadd_wx_i16m1(vint16m1_t op1,int8_t op2,size_t vl)
+{
+    return __riscv_vwadd_wx_i16m1(op1,0xAA,32);
+}
+
+
+vint16m2_t test___riscv_vwadd_wx_i16m2(vint16m2_t op1,int8_t op2,size_t vl)
+{
+    return __riscv_vwadd_wx_i16m2(op1,0xAA,32);
+}
+
+
+vint16m4_t test___riscv_vwadd_wx_i16m4(vint16m4_t op1,int8_t op2,size_t vl)
+{
+    return __riscv_vwadd_wx_i16m4(op1,0xAA,32);
+}
+
+
+vint16m8_t test___riscv_vwadd_wx_i16m8(vint16m8_t op1,int8_t op2,size_t vl)
+{
+    return __riscv_vwadd_wx_i16m8(op1,0xAA,32);
+}
+
+
+vint32mf2_t test___riscv_vwadd_wx_i32mf2(vint32mf2_t op1,int16_t op2,size_t vl)
+{
+    return __riscv_vwadd_wx_i32mf2(op1,0xAA,32);
+}
+
+
+vint32m1_t test___riscv_vwadd_wx_i32m1(vint32m1_t op1,int16_t op2,size_t vl)
+{
+    return __riscv_vwadd_wx_i32m1(op1,0xAA,32);
+}
+
+
+vint32m2_t test___riscv_vwadd_wx_i32m2(vint32m2_t op1,int16_t op2,size_t vl)
+{
+    return __riscv_vwadd_wx_i32m2(op1,0xAA,32);
+}
+
+
+vint32m4_t test___riscv_vwadd_wx_i32m4(vint32m4_t op1,int16_t op2,size_t vl)
+{
+    return __riscv_vwadd_wx_i32m4(op1,0xAA,32);
+}
+
+
+vint32m8_t test___riscv_vwadd_wx_i32m8(vint32m8_t op1,int16_t op2,size_t vl)
+{
+    return __riscv_vwadd_wx_i32m8(op1,0xAA,32);
+}
+
+
+vint64m1_t test___riscv_vwadd_wx_i64m1(vint64m1_t op1,int32_t op2,size_t vl)
+{
+    return __riscv_vwadd_wx_i64m1(op1,0xAA,32);
+}
+
+
+vint64m2_t test___riscv_vwadd_wx_i64m2(vint64m2_t op1,int32_t op2,size_t vl)
+{
+    return __riscv_vwadd_wx_i64m2(op1,0xAA,32);
+}
+
+
+vint64m4_t test___riscv_vwadd_wx_i64m4(vint64m4_t op1,int32_t op2,size_t vl)
+{
+    return __riscv_vwadd_wx_i64m4(op1,0xAA,32);
+}
+
+
+vint64m8_t test___riscv_vwadd_wx_i64m8(vint64m8_t op1,int32_t op2,size_t vl)
+{
+    return __riscv_vwadd_wx_i64m8(op1,0xAA,32);
+}
+
+
+
+/* { dg-final { scan-assembler-times {vsetvli\s+zero,\s*[a-x0-9]+,\s*e8,\s*mf8,\s*t[au],\s*m[au]\s+vwadd\.wx\s+v[0-9]+,\s*v[0-9]+,\s*[a-x0-9]+} 1 } } */
+/* { dg-final { scan-assembler-times {vsetvli\s+zero,\s*[a-x0-9]+,\s*e8,\s*mf4,\s*t[au],\s*m[au]\s+vwadd\.wx\s+v[0-9]+,\s*v[0-9]+,\s*[a-x0-9]+} 1 } } */
+/* { dg-final { scan-assembler-times {vsetvli\s+zero,\s*[a-x0-9]+,\s*e8,\s*mf2,\s*t[au],\s*m[au]\s+vwadd\.wx\s+v[0-9]+,\s*v[0-9]+,\s*[a-x0-9]+} 1 } } */
+/* { dg-final { scan-assembler-times {vsetvli\s+zero,\s*[a-x0-9]+,\s*e8,\s*m1,\s*t[au],\s*m[au]\s+vwadd\.wx\s+v[0-9]+,\s*v[0-9]+,\s*[a-x0-9]+} 1 } } */
+/* { dg-final { scan-assembler-times {vsetvli\s+zero,\s*[a-x0-9]+,\s*e8,\s*m2,\s*t[au],\s*m[au]\s+vwadd\.wx\s+v[0-9]+,\s*v[0-9]+,\s*[a-x0-9]+} 1 } } */
+/* { dg-final { scan-assembler-times {vsetvli\s+zero,\s*[a-x0-9]+,\s*e8,\s*m4,\s*t[au],\s*m[au]\s+vwadd\.wx\s+v[0-9]+,\s*v[0-9]+,\s*[a-x0-9]+} 1 } } */
+/* { dg-final { scan-assembler-times {vsetvli\s+zero,\s*[a-x0-9]+,\s*e16,\s*mf4,\s*t[au],\s*m[au]\s+vwadd\.wx\s+v[0-9]+,\s*v[0-9]+,\s*[a-x0-9]+} 1 } } */
+/* { dg-final { scan-assembler-times {vsetvli\s+zero,\s*[a-x0-9]+,\s*e16,\s*mf2,\s*t[au],\s*m[au]\s+vwadd\.wx\s+v[0-9]+,\s*v[0-9]+,\s*[a-x0-9]+} 1 } } */
+/* { dg-final { scan-assembler-times {vsetvli\s+zero,\s*[a-x0-9]+,\s*e16,\s*m1,\s*t[au],\s*m[au]\s+vwadd\.wx\s+v[0-9]+,\s*v[0-9]+,\s*[a-x0-9]+} 1 } } */
+/* { dg-final { scan-assembler-times {vsetvli\s+zero,\s*[a-x0-9]+,\s*e16,\s*m2,\s*t[au],\s*m[au]\s+vwadd\.wx\s+v[0-9]+,\s*v[0-9]+,\s*[a-x0-9]+} 1 } } */
+/* { dg-final { scan-assembler-times {vsetvli\s+zero,\s*[a-x0-9]+,\s*e16,\s*m4,\s*t[au],\s*m[au]\s+vwadd\.wx\s+v[0-9]+,\s*v[0-9]+,\s*[a-x0-9]+} 1 } } */
+/* { dg-final { scan-assembler-times {vsetvli\s+zero,\s*[a-x0-9]+,\s*e32,\s*mf2,\s*t[au],\s*m[au]\s+vwadd\.wx\s+v[0-9]+,\s*v[0-9]+,\s*[a-x0-9]+} 1 } } */
+/* { dg-final { scan-assembler-times {vsetvli\s+zero,\s*[a-x0-9]+,\s*e32,\s*m1,\s*t[au],\s*m[au]\s+vwadd\.wx\s+v[0-9]+,\s*v[0-9]+,\s*[a-x0-9]+} 1 } } */
+/* { dg-final { scan-assembler-times {vsetvli\s+zero,\s*[a-x0-9]+,\s*e32,\s*m2,\s*t[au],\s*m[au]\s+vwadd\.wx\s+v[0-9]+,\s*v[0-9]+,\s*[a-x0-9]+} 1 } } */
+/* { dg-final { scan-assembler-times {vsetvli\s+zero,\s*[a-x0-9]+,\s*e32,\s*m4,\s*t[au],\s*m[au]\s+vwadd\.wx\s+v[0-9]+,\s*v[0-9]+,\s*[a-x0-9]+} 1 } } */
diff --git a/gcc/testsuite/gcc.target/riscv/rvv/base/vwadd_wx_m-1.c b/gcc/testsuite/gcc.target/riscv/rvv/base/vwadd_wx_m-1.c
new file mode 100644
index 00000000000..7eed8b94724
--- /dev/null
+++ b/gcc/testsuite/gcc.target/riscv/rvv/base/vwadd_wx_m-1.c
@@ -0,0 +1,111 @@
+/* { dg-do compile } */
+/* { dg-options "-march=rv32gcv -mabi=ilp32 -O3 -fno-schedule-insns -fno-schedule-insns2" } */
+
+#include "riscv_vector.h"
+
+vint16mf4_t test___riscv_vwadd_wx_i16mf4_m(vbool64_t mask,vint16mf4_t op1,int8_t op2,size_t vl)
+{
+    return __riscv_vwadd_wx_i16mf4_m(mask,op1,0xAA,vl);
+}
+
+
+vint16mf2_t test___riscv_vwadd_wx_i16mf2_m(vbool32_t mask,vint16mf2_t op1,int8_t op2,size_t vl)
+{
+    return __riscv_vwadd_wx_i16mf2_m(mask,op1,0xAA,vl);
+}
+
+
+vint16m1_t test___riscv_vwadd_wx_i16m1_m(vbool16_t mask,vint16m1_t op1,int8_t op2,size_t vl)
+{
+    return __riscv_vwadd_wx_i16m1_m(mask,op1,0xAA,vl);
+}
+
+
+vint16m2_t test___riscv_vwadd_wx_i16m2_m(vbool8_t mask,vint16m2_t op1,int8_t op2,size_t vl)
+{
+    return __riscv_vwadd_wx_i16m2_m(mask,op1,0xAA,vl);
+}
+
+
+vint16m4_t test___riscv_vwadd_wx_i16m4_m(vbool4_t mask,vint16m4_t op1,int8_t op2,size_t vl)
+{
+    return __riscv_vwadd_wx_i16m4_m(mask,op1,0xAA,vl);
+}
+
+
+vint16m8_t test___riscv_vwadd_wx_i16m8_m(vbool2_t mask,vint16m8_t op1,int8_t op2,size_t vl)
+{
+    return __riscv_vwadd_wx_i16m8_m(mask,op1,0xAA,vl);
+}
+
+
+vint32mf2_t test___riscv_vwadd_wx_i32mf2_m(vbool64_t mask,vint32mf2_t op1,int16_t op2,size_t vl)
+{
+    return __riscv_vwadd_wx_i32mf2_m(mask,op1,0xAA,vl);
+}
+
+
+vint32m1_t test___riscv_vwadd_wx_i32m1_m(vbool32_t mask,vint32m1_t op1,int16_t op2,size_t vl)
+{
+    return __riscv_vwadd_wx_i32m1_m(mask,op1,0xAA,vl);
+}
+
+
+vint32m2_t test___riscv_vwadd_wx_i32m2_m(vbool16_t mask,vint32m2_t op1,int16_t op2,size_t vl)
+{
+    return __riscv_vwadd_wx_i32m2_m(mask,op1,0xAA,vl);
+}
+
+
+vint32m4_t test___riscv_vwadd_wx_i32m4_m(vbool8_t mask,vint32m4_t op1,int16_t op2,size_t vl)
+{
+    return __riscv_vwadd_wx_i32m4_m(mask,op1,0xAA,vl);
+}
+
+
+vint32m8_t test___riscv_vwadd_wx_i32m8_m(vbool4_t mask,vint32m8_t op1,int16_t op2,size_t vl)
+{
+    return __riscv_vwadd_wx_i32m8_m(mask,op1,0xAA,vl);
+}
+
+
+vint64m1_t test___riscv_vwadd_wx_i64m1_m(vbool64_t mask,vint64m1_t op1,int32_t op2,size_t vl)
+{
+    return __riscv_vwadd_wx_i64m1_m(mask,op1,0xAA,vl);
+}
+
+
+vint64m2_t test___riscv_vwadd_wx_i64m2_m(vbool32_t mask,vint64m2_t op1,int32_t op2,size_t vl)
+{
+    return __riscv_vwadd_wx_i64m2_m(mask,op1,0xAA,vl);
+}
+
+
+vint64m4_t test___riscv_vwadd_wx_i64m4_m(vbool16_t mask,vint64m4_t op1,int32_t op2,size_t vl)
+{
+    return __riscv_vwadd_wx_i64m4_m(mask,op1,0xAA,vl);
+}
+
+
+vint64m8_t test___riscv_vwadd_wx_i64m8_m(vbool8_t mask,vint64m8_t op1,int32_t op2,size_t vl)
+{
+    return __riscv_vwadd_wx_i64m8_m(mask,op1,0xAA,vl);
+}
+
+
+
+/* { dg-final { scan-assembler-times {vsetvli\s+zero,\s*[a-x0-9]+,\s*e8,\s*mf8,\s*t[au],\s*m[au]\s+vwadd\.wx\s+v[0-9]+,\s*v[0-9]+,\s*[a-x0-9]+,\s*v0.t} 1 } } */
+/* { dg-final { scan-assembler-times {vsetvli\s+zero,\s*[a-x0-9]+,\s*e8,\s*mf4,\s*t[au],\s*m[au]\s+vwadd\.wx\s+v[0-9]+,\s*v[0-9]+,\s*[a-x0-9]+,\s*v0.t} 1 } } */
+/* { dg-final { scan-assembler-times {vsetvli\s+zero,\s*[a-x0-9]+,\s*e8,\s*mf2,\s*t[au],\s*m[au]\s+vwadd\.wx\s+v[0-9]+,\s*v[0-9]+,\s*[a-x0-9]+,\s*v0.t} 1 } } */
+/* { dg-final { scan-assembler-times {vsetvli\s+zero,\s*[a-x0-9]+,\s*e8,\s*m1,\s*t[au],\s*m[au]\s+vwadd\.wx\s+v[0-9]+,\s*v[0-9]+,\s*[a-x0-9]+,\s*v0.t} 1 } } */
+/* { dg-final { scan-assembler-times {vsetvli\s+zero,\s*[a-x0-9]+,\s*e8,\s*m2,\s*t[au],\s*m[au]\s+vwadd\.wx\s+v[0-9]+,\s*v[0-9]+,\s*[a-x0-9]+,\s*v0.t} 1 } } */
+/* { dg-final { scan-assembler-times {vsetvli\s+zero,\s*[a-x0-9]+,\s*e8,\s*m4,\s*t[au],\s*m[au]\s+vwadd\.wx\s+v[0-9]+,\s*v[0-9]+,\s*[a-x0-9]+,\s*v0.t} 1 } } */
+/* { dg-final { scan-assembler-times {vsetvli\s+zero,\s*[a-x0-9]+,\s*e16,\s*mf4,\s*t[au],\s*m[au]\s+vwadd\.wx\s+v[0-9]+,\s*v[0-9]+,\s*[a-x0-9]+,\s*v0.t} 1 } } */
+/* { dg-final { scan-assembler-times {vsetvli\s+zero,\s*[a-x0-9]+,\s*e16,\s*mf2,\s*t[au],\s*m[au]\s+vwadd\.wx\s+v[0-9]+,\s*v[0-9]+,\s*[a-x0-9]+,\s*v0.t} 1 } } */
+/* { dg-final { scan-assembler-times {vsetvli\s+zero,\s*[a-x0-9]+,\s*e16,\s*m1,\s*t[au],\s*m[au]\s+vwadd\.wx\s+v[0-9]+,\s*v[0-9]+,\s*[a-x0-9]+,\s*v0.t} 1 } } */
+/* { dg-final { scan-assembler-times {vsetvli\s+zero,\s*[a-x0-9]+,\s*e16,\s*m2,\s*t[au],\s*m[au]\s+vwadd\.wx\s+v[0-9]+,\s*v[0-9]+,\s*[a-x0-9]+,\s*v0.t} 1 } } */
+/* { dg-final { scan-assembler-times {vsetvli\s+zero,\s*[a-x0-9]+,\s*e16,\s*m4,\s*t[au],\s*m[au]\s+vwadd\.wx\s+v[0-9]+,\s*v[0-9]+,\s*[a-x0-9]+,\s*v0.t} 1 } } */
+/* { dg-final { scan-assembler-times {vsetvli\s+zero,\s*[a-x0-9]+,\s*e32,\s*mf2,\s*t[au],\s*m[au]\s+vwadd\.wx\s+v[0-9]+,\s*v[0-9]+,\s*[a-x0-9]+,\s*v0.t} 1 } } */
+/* { dg-final { scan-assembler-times {vsetvli\s+zero,\s*[a-x0-9]+,\s*e32,\s*m1,\s*t[au],\s*m[au]\s+vwadd\.wx\s+v[0-9]+,\s*v[0-9]+,\s*[a-x0-9]+,\s*v0.t} 1 } } */
+/* { dg-final { scan-assembler-times {vsetvli\s+zero,\s*[a-x0-9]+,\s*e32,\s*m2,\s*t[au],\s*m[au]\s+vwadd\.wx\s+v[0-9]+,\s*v[0-9]+,\s*[a-x0-9]+,\s*v0.t} 1 } } */
+/* { dg-final { scan-assembler-times {vsetvli\s+zero,\s*[a-x0-9]+,\s*e32,\s*m4,\s*t[au],\s*m[au]\s+vwadd\.wx\s+v[0-9]+,\s*v[0-9]+,\s*[a-x0-9]+,\s*v0.t} 1 } } */
diff --git a/gcc/testsuite/gcc.target/riscv/rvv/base/vwadd_wx_m-2.c b/gcc/testsuite/gcc.target/riscv/rvv/base/vwadd_wx_m-2.c
new file mode 100644
index 00000000000..1c1517c9f09
--- /dev/null
+++ b/gcc/testsuite/gcc.target/riscv/rvv/base/vwadd_wx_m-2.c
@@ -0,0 +1,111 @@
+/* { dg-do compile } */
+/* { dg-options "-march=rv32gcv -mabi=ilp32 -O3 -fno-schedule-insns -fno-schedule-insns2" } */
+
+#include "riscv_vector.h"
+
+vint16mf4_t test___riscv_vwadd_wx_i16mf4_m(vbool64_t mask,vint16mf4_t op1,int8_t op2,size_t vl)
+{
+    return __riscv_vwadd_wx_i16mf4_m(mask,op1,0xAA,31);
+}
+
+
+vint16mf2_t test___riscv_vwadd_wx_i16mf2_m(vbool32_t mask,vint16mf2_t op1,int8_t op2,size_t vl)
+{
+    return __riscv_vwadd_wx_i16mf2_m(mask,op1,0xAA,31);
+}
+
+
+vint16m1_t test___riscv_vwadd_wx_i16m1_m(vbool16_t mask,vint16m1_t op1,int8_t op2,size_t vl)
+{
+    return __riscv_vwadd_wx_i16m1_m(mask,op1,0xAA,31);
+}
+
+
+vint16m2_t test___riscv_vwadd_wx_i16m2_m(vbool8_t mask,vint16m2_t op1,int8_t op2,size_t vl)
+{
+    return __riscv_vwadd_wx_i16m2_m(mask,op1,0xAA,31);
+}
+
+
+vint16m4_t test___riscv_vwadd_wx_i16m4_m(vbool4_t mask,vint16m4_t op1,int8_t op2,size_t vl)
+{
+    return __riscv_vwadd_wx_i16m4_m(mask,op1,0xAA,31);
+}
+
+
+vint16m8_t test___riscv_vwadd_wx_i16m8_m(vbool2_t mask,vint16m8_t op1,int8_t op2,size_t vl)
+{
+    return __riscv_vwadd_wx_i16m8_m(mask,op1,0xAA,31);
+}
+
+
+vint32mf2_t test___riscv_vwadd_wx_i32mf2_m(vbool64_t mask,vint32mf2_t op1,int16_t op2,size_t vl)
+{
+    return __riscv_vwadd_wx_i32mf2_m(mask,op1,0xAA,31);
+}
+
+
+vint32m1_t test___riscv_vwadd_wx_i32m1_m(vbool32_t mask,vint32m1_t op1,int16_t op2,size_t vl)
+{
+    return __riscv_vwadd_wx_i32m1_m(mask,op1,0xAA,31);
+}
+
+
+vint32m2_t test___riscv_vwadd_wx_i32m2_m(vbool16_t mask,vint32m2_t op1,int16_t op2,size_t vl)
+{
+    return __riscv_vwadd_wx_i32m2_m(mask,op1,0xAA,31);
+}
+
+
+vint32m4_t test___riscv_vwadd_wx_i32m4_m(vbool8_t mask,vint32m4_t op1,int16_t op2,size_t vl)
+{
+    return __riscv_vwadd_wx_i32m4_m(mask,op1,0xAA,31);
+}
+
+
+vint32m8_t test___riscv_vwadd_wx_i32m8_m(vbool4_t mask,vint32m8_t op1,int16_t op2,size_t vl)
+{
+    return __riscv_vwadd_wx_i32m8_m(mask,op1,0xAA,31);
+}
+
+
+vint64m1_t test___riscv_vwadd_wx_i64m1_m(vbool64_t mask,vint64m1_t op1,int32_t op2,size_t vl)
+{
+    return __riscv_vwadd_wx_i64m1_m(mask,op1,0xAA,31);
+}
+
+
+vint64m2_t test___riscv_vwadd_wx_i64m2_m(vbool32_t mask,vint64m2_t op1,int32_t op2,size_t vl)
+{
+    return __riscv_vwadd_wx_i64m2_m(mask,op1,0xAA,31);
+}
+
+
+vint64m4_t test___riscv_vwadd_wx_i64m4_m(vbool16_t mask,vint64m4_t op1,int32_t op2,size_t vl)
+{
+    return __riscv_vwadd_wx_i64m4_m(mask,op1,0xAA,31);
+}
+
+
+vint64m8_t test___riscv_vwadd_wx_i64m8_m(vbool8_t mask,vint64m8_t op1,int32_t op2,size_t vl)
+{
+    return __riscv_vwadd_wx_i64m8_m(mask,op1,0xAA,31);
+}
+
+
+
+/* { dg-final { scan-assembler-times {vsetivli\s+zero,\s*31,\s*e8,\s*mf8,\s*t[au],\s*m[au]\s+vwadd\.wx\s+v[0-9]+,\s*v[0-9]+,\s*[a-x0-9]+,\s*v0.t} 1 } } */
+/* { dg-final { scan-assembler-times {vsetivli\s+zero,\s*31,\s*e8,\s*mf4,\s*t[au],\s*m[au]\s+vwadd\.wx\s+v[0-9]+,\s*v[0-9]+,\s*[a-x0-9]+,\s*v0.t} 1 } } */
+/* { dg-final { scan-assembler-times {vsetivli\s+zero,\s*31,\s*e8,\s*mf2,\s*t[au],\s*m[au]\s+vwadd\.wx\s+v[0-9]+,\s*v[0-9]+,\s*[a-x0-9]+,\s*v0.t} 1 } } */
+/* { dg-final { scan-assembler-times {vsetivli\s+zero,\s*31,\s*e8,\s*m1,\s*t[au],\s*m[au]\s+vwadd\.wx\s+v[0-9]+,\s*v[0-9]+,\s*[a-x0-9]+,\s*v0.t} 1 } } */
+/* { dg-final { scan-assembler-times {vsetivli\s+zero,\s*31,\s*e8,\s*m2,\s*t[au],\s*m[au]\s+vwadd\.wx\s+v[0-9]+,\s*v[0-9]+,\s*[a-x0-9]+,\s*v0.t} 1 } } */
+/* { dg-final { scan-assembler-times {vsetivli\s+zero,\s*31,\s*e8,\s*m4,\s*t[au],\s*m[au]\s+vwadd\.wx\s+v[0-9]+,\s*v[0-9]+,\s*[a-x0-9]+,\s*v0.t} 1 } } */
+/* { dg-final { scan-assembler-times {vsetivli\s+zero,\s*31,\s*e16,\s*mf4,\s*t[au],\s*m[au]\s+vwadd\.wx\s+v[0-9]+,\s*v[0-9]+,\s*[a-x0-9]+,\s*v0.t} 1 } } */
+/* { dg-final { scan-assembler-times {vsetivli\s+zero,\s*31,\s*e16,\s*mf2,\s*t[au],\s*m[au]\s+vwadd\.wx\s+v[0-9]+,\s*v[0-9]+,\s*[a-x0-9]+,\s*v0.t} 1 } } */
+/* { dg-final { scan-assembler-times {vsetivli\s+zero,\s*31,\s*e16,\s*m1,\s*t[au],\s*m[au]\s+vwadd\.wx\s+v[0-9]+,\s*v[0-9]+,\s*[a-x0-9]+,\s*v0.t} 1 } } */
+/* { dg-final { scan-assembler-times {vsetivli\s+zero,\s*31,\s*e16,\s*m2,\s*t[au],\s*m[au]\s+vwadd\.wx\s+v[0-9]+,\s*v[0-9]+,\s*[a-x0-9]+,\s*v0.t} 1 } } */
+/* { dg-final { scan-assembler-times {vsetivli\s+zero,\s*31,\s*e16,\s*m4,\s*t[au],\s*m[au]\s+vwadd\.wx\s+v[0-9]+,\s*v[0-9]+,\s*[a-x0-9]+,\s*v0.t} 1 } } */
+/* { dg-final { scan-assembler-times {vsetivli\s+zero,\s*31,\s*e32,\s*mf2,\s*t[au],\s*m[au]\s+vwadd\.wx\s+v[0-9]+,\s*v[0-9]+,\s*[a-x0-9]+,\s*v0.t} 1 } } */
+/* { dg-final { scan-assembler-times {vsetivli\s+zero,\s*31,\s*e32,\s*m1,\s*t[au],\s*m[au]\s+vwadd\.wx\s+v[0-9]+,\s*v[0-9]+,\s*[a-x0-9]+,\s*v0.t} 1 } } */
+/* { dg-final { scan-assembler-times {vsetivli\s+zero,\s*31,\s*e32,\s*m2,\s*t[au],\s*m[au]\s+vwadd\.wx\s+v[0-9]+,\s*v[0-9]+,\s*[a-x0-9]+,\s*v0.t} 1 } } */
+/* { dg-final { scan-assembler-times {vsetivli\s+zero,\s*31,\s*e32,\s*m4,\s*t[au],\s*m[au]\s+vwadd\.wx\s+v[0-9]+,\s*v[0-9]+,\s*[a-x0-9]+,\s*v0.t} 1 } } */
diff --git a/gcc/testsuite/gcc.target/riscv/rvv/base/vwadd_wx_m-3.c b/gcc/testsuite/gcc.target/riscv/rvv/base/vwadd_wx_m-3.c
new file mode 100644
index 00000000000..677454726e0
--- /dev/null
+++ b/gcc/testsuite/gcc.target/riscv/rvv/base/vwadd_wx_m-3.c
@@ -0,0 +1,111 @@
+/* { dg-do compile } */
+/* { dg-options "-march=rv32gcv -mabi=ilp32 -O3 -fno-schedule-insns -fno-schedule-insns2" } */
+
+#include "riscv_vector.h"
+
+vint16mf4_t test___riscv_vwadd_wx_i16mf4_m(vbool64_t mask,vint16mf4_t op1,int8_t op2,size_t vl)
+{
+    return __riscv_vwadd_wx_i16mf4_m(mask,op1,0xAA,32);
+}
+
+
+vint16mf2_t test___riscv_vwadd_wx_i16mf2_m(vbool32_t mask,vint16mf2_t op1,int8_t op2,size_t vl)
+{
+    return __riscv_vwadd_wx_i16mf2_m(mask,op1,0xAA,32);
+}
+
+
+vint16m1_t test___riscv_vwadd_wx_i16m1_m(vbool16_t mask,vint16m1_t op1,int8_t op2,size_t vl)
+{
+    return __riscv_vwadd_wx_i16m1_m(mask,op1,0xAA,32);
+}
+
+
+vint16m2_t test___riscv_vwadd_wx_i16m2_m(vbool8_t mask,vint16m2_t op1,int8_t op2,size_t vl)
+{
+    return __riscv_vwadd_wx_i16m2_m(mask,op1,0xAA,32);
+}
+
+
+vint16m4_t test___riscv_vwadd_wx_i16m4_m(vbool4_t mask,vint16m4_t op1,int8_t op2,size_t vl)
+{
+    return __riscv_vwadd_wx_i16m4_m(mask,op1,0xAA,32);
+}
+
+
+vint16m8_t test___riscv_vwadd_wx_i16m8_m(vbool2_t mask,vint16m8_t op1,int8_t op2,size_t vl)
+{
+    return __riscv_vwadd_wx_i16m8_m(mask,op1,0xAA,32);
+}
+
+
+vint32mf2_t test___riscv_vwadd_wx_i32mf2_m(vbool64_t mask,vint32mf2_t op1,int16_t op2,size_t vl)
+{
+    return __riscv_vwadd_wx_i32mf2_m(mask,op1,0xAA,32);
+}
+
+
+vint32m1_t test___riscv_vwadd_wx_i32m1_m(vbool32_t mask,vint32m1_t op1,int16_t op2,size_t vl)
+{
+    return __riscv_vwadd_wx_i32m1_m(mask,op1,0xAA,32);
+}
+
+
+vint32m2_t test___riscv_vwadd_wx_i32m2_m(vbool16_t mask,vint32m2_t op1,int16_t op2,size_t vl)
+{
+    return __riscv_vwadd_wx_i32m2_m(mask,op1,0xAA,32);
+}
+
+
+vint32m4_t test___riscv_vwadd_wx_i32m4_m(vbool8_t mask,vint32m4_t op1,int16_t op2,size_t vl)
+{
+    return __riscv_vwadd_wx_i32m4_m(mask,op1,0xAA,32);
+}
+
+
+vint32m8_t test___riscv_vwadd_wx_i32m8_m(vbool4_t mask,vint32m8_t op1,int16_t op2,size_t vl)
+{
+    return __riscv_vwadd_wx_i32m8_m(mask,op1,0xAA,32);
+}
+
+
+vint64m1_t test___riscv_vwadd_wx_i64m1_m(vbool64_t mask,vint64m1_t op1,int32_t op2,size_t vl)
+{
+    return __riscv_vwadd_wx_i64m1_m(mask,op1,0xAA,32);
+}
+
+
+vint64m2_t test___riscv_vwadd_wx_i64m2_m(vbool32_t mask,vint64m2_t op1,int32_t op2,size_t vl)
+{
+    return __riscv_vwadd_wx_i64m2_m(mask,op1,0xAA,32);
+}
+
+
+vint64m4_t test___riscv_vwadd_wx_i64m4_m(vbool16_t mask,vint64m4_t op1,int32_t op2,size_t vl)
+{
+    return __riscv_vwadd_wx_i64m4_m(mask,op1,0xAA,32);
+}
+
+
+vint64m8_t test___riscv_vwadd_wx_i64m8_m(vbool8_t mask,vint64m8_t op1,int32_t op2,size_t vl)
+{
+    return __riscv_vwadd_wx_i64m8_m(mask,op1,0xAA,32);
+}
+
+
+
+/* { dg-final { scan-assembler-times {vsetvli\s+zero,\s*[a-x0-9]+,\s*e8,\s*mf8,\s*t[au],\s*m[au]\s+vwadd\.wx\s+v[0-9]+,\s*v[0-9]+,\s*[a-x0-9]+,\s*v0.t} 1 } } */
+/* { dg-final { scan-assembler-times {vsetvli\s+zero,\s*[a-x0-9]+,\s*e8,\s*mf4,\s*t[au],\s*m[au]\s+vwadd\.wx\s+v[0-9]+,\s*v[0-9]+,\s*[a-x0-9]+,\s*v0.t} 1 } } */
+/* { dg-final { scan-assembler-times {vsetvli\s+zero,\s*[a-x0-9]+,\s*e8,\s*mf2,\s*t[au],\s*m[au]\s+vwadd\.wx\s+v[0-9]+,\s*v[0-9]+,\s*[a-x0-9]+,\s*v0.t} 1 } } */
+/* { dg-final { scan-assembler-times {vsetvli\s+zero,\s*[a-x0-9]+,\s*e8,\s*m1,\s*t[au],\s*m[au]\s+vwadd\.wx\s+v[0-9]+,\s*v[0-9]+,\s*[a-x0-9]+,\s*v0.t} 1 } } */
+/* { dg-final { scan-assembler-times {vsetvli\s+zero,\s*[a-x0-9]+,\s*e8,\s*m2,\s*t[au],\s*m[au]\s+vwadd\.wx\s+v[0-9]+,\s*v[0-9]+,\s*[a-x0-9]+,\s*v0.t} 1 } } */
+/* { dg-final { scan-assembler-times {vsetvli\s+zero,\s*[a-x0-9]+,\s*e8,\s*m4,\s*t[au],\s*m[au]\s+vwadd\.wx\s+v[0-9]+,\s*v[0-9]+,\s*[a-x0-9]+,\s*v0.t} 1 } } */
+/* { dg-final { scan-assembler-times {vsetvli\s+zero,\s*[a-x0-9]+,\s*e16,\s*mf4,\s*t[au],\s*m[au]\s+vwadd\.wx\s+v[0-9]+,\s*v[0-9]+,\s*[a-x0-9]+,\s*v0.t} 1 } } */
+/* { dg-final { scan-assembler-times {vsetvli\s+zero,\s*[a-x0-9]+,\s*e16,\s*mf2,\s*t[au],\s*m[au]\s+vwadd\.wx\s+v[0-9]+,\s*v[0-9]+,\s*[a-x0-9]+,\s*v0.t} 1 } } */
+/* { dg-final { scan-assembler-times {vsetvli\s+zero,\s*[a-x0-9]+,\s*e16,\s*m1,\s*t[au],\s*m[au]\s+vwadd\.wx\s+v[0-9]+,\s*v[0-9]+,\s*[a-x0-9]+,\s*v0.t} 1 } } */
+/* { dg-final { scan-assembler-times {vsetvli\s+zero,\s*[a-x0-9]+,\s*e16,\s*m2,\s*t[au],\s*m[au]\s+vwadd\.wx\s+v[0-9]+,\s*v[0-9]+,\s*[a-x0-9]+,\s*v0.t} 1 } } */
+/* { dg-final { scan-assembler-times {vsetvli\s+zero,\s*[a-x0-9]+,\s*e16,\s*m4,\s*t[au],\s*m[au]\s+vwadd\.wx\s+v[0-9]+,\s*v[0-9]+,\s*[a-x0-9]+,\s*v0.t} 1 } } */
+/* { dg-final { scan-assembler-times {vsetvli\s+zero,\s*[a-x0-9]+,\s*e32,\s*mf2,\s*t[au],\s*m[au]\s+vwadd\.wx\s+v[0-9]+,\s*v[0-9]+,\s*[a-x0-9]+,\s*v0.t} 1 } } */
+/* { dg-final { scan-assembler-times {vsetvli\s+zero,\s*[a-x0-9]+,\s*e32,\s*m1,\s*t[au],\s*m[au]\s+vwadd\.wx\s+v[0-9]+,\s*v[0-9]+,\s*[a-x0-9]+,\s*v0.t} 1 } } */
+/* { dg-final { scan-assembler-times {vsetvli\s+zero,\s*[a-x0-9]+,\s*e32,\s*m2,\s*t[au],\s*m[au]\s+vwadd\.wx\s+v[0-9]+,\s*v[0-9]+,\s*[a-x0-9]+,\s*v0.t} 1 } } */
+/* { dg-final { scan-assembler-times {vsetvli\s+zero,\s*[a-x0-9]+,\s*e32,\s*m4,\s*t[au],\s*m[au]\s+vwadd\.wx\s+v[0-9]+,\s*v[0-9]+,\s*[a-x0-9]+,\s*v0.t} 1 } } */
diff --git a/gcc/testsuite/gcc.target/riscv/rvv/base/vwadd_wx_mu-1.c b/gcc/testsuite/gcc.target/riscv/rvv/base/vwadd_wx_mu-1.c
new file mode 100644
index 00000000000..9ba87c4ae75
--- /dev/null
+++ b/gcc/testsuite/gcc.target/riscv/rvv/base/vwadd_wx_mu-1.c
@@ -0,0 +1,111 @@
+/* { dg-do compile } */
+/* { dg-options "-march=rv32gcv -mabi=ilp32 -O3 -fno-schedule-insns -fno-schedule-insns2" } */
+
+#include "riscv_vector.h"
+
+vint16mf4_t test___riscv_vwadd_wx_i16mf4_mu(vbool64_t mask,vint16mf4_t merge,vint16mf4_t op1,int8_t op2,size_t vl)
+{
+    return __riscv_vwadd_wx_i16mf4_mu(mask,merge,op1,0xAA,vl);
+}
+
+
+vint16mf2_t test___riscv_vwadd_wx_i16mf2_mu(vbool32_t mask,vint16mf2_t merge,vint16mf2_t op1,int8_t op2,size_t vl)
+{
+    return __riscv_vwadd_wx_i16mf2_mu(mask,merge,op1,0xAA,vl);
+}
+
+
+vint16m1_t test___riscv_vwadd_wx_i16m1_mu(vbool16_t mask,vint16m1_t merge,vint16m1_t op1,int8_t op2,size_t vl)
+{
+    return __riscv_vwadd_wx_i16m1_mu(mask,merge,op1,0xAA,vl);
+}
+
+
+vint16m2_t test___riscv_vwadd_wx_i16m2_mu(vbool8_t mask,vint16m2_t merge,vint16m2_t op1,int8_t op2,size_t vl)
+{
+    return __riscv_vwadd_wx_i16m2_mu(mask,merge,op1,0xAA,vl);
+}
+
+
+vint16m4_t test___riscv_vwadd_wx_i16m4_mu(vbool4_t mask,vint16m4_t merge,vint16m4_t op1,int8_t op2,size_t vl)
+{
+    return __riscv_vwadd_wx_i16m4_mu(mask,merge,op1,0xAA,vl);
+}
+
+
+vint16m8_t test___riscv_vwadd_wx_i16m8_mu(vbool2_t mask,vint16m8_t merge,vint16m8_t op1,int8_t op2,size_t vl)
+{
+    return __riscv_vwadd_wx_i16m8_mu(mask,merge,op1,0xAA,vl);
+}
+
+
+vint32mf2_t test___riscv_vwadd_wx_i32mf2_mu(vbool64_t mask,vint32mf2_t merge,vint32mf2_t op1,int16_t op2,size_t vl)
+{
+    return __riscv_vwadd_wx_i32mf2_mu(mask,merge,op1,0xAA,vl);
+}
+
+
+vint32m1_t test___riscv_vwadd_wx_i32m1_mu(vbool32_t mask,vint32m1_t merge,vint32m1_t op1,int16_t op2,size_t vl)
+{
+    return __riscv_vwadd_wx_i32m1_mu(mask,merge,op1,0xAA,vl);
+}
+
+
+vint32m2_t test___riscv_vwadd_wx_i32m2_mu(vbool16_t mask,vint32m2_t merge,vint32m2_t op1,int16_t op2,size_t vl)
+{
+    return __riscv_vwadd_wx_i32m2_mu(mask,merge,op1,0xAA,vl);
+}
+
+
+vint32m4_t test___riscv_vwadd_wx_i32m4_mu(vbool8_t mask,vint32m4_t merge,vint32m4_t op1,int16_t op2,size_t vl)
+{
+    return __riscv_vwadd_wx_i32m4_mu(mask,merge,op1,0xAA,vl);
+}
+
+
+vint32m8_t test___riscv_vwadd_wx_i32m8_mu(vbool4_t mask,vint32m8_t merge,vint32m8_t op1,int16_t op2,size_t vl)
+{
+    return __riscv_vwadd_wx_i32m8_mu(mask,merge,op1,0xAA,vl);
+}
+
+
+vint64m1_t test___riscv_vwadd_wx_i64m1_mu(vbool64_t mask,vint64m1_t merge,vint64m1_t op1,int32_t op2,size_t vl)
+{
+    return __riscv_vwadd_wx_i64m1_mu(mask,merge,op1,0xAA,vl);
+}
+
+
+vint64m2_t test___riscv_vwadd_wx_i64m2_mu(vbool32_t mask,vint64m2_t merge,vint64m2_t op1,int32_t op2,size_t vl)
+{
+    return __riscv_vwadd_wx_i64m2_mu(mask,merge,op1,0xAA,vl);
+}
+
+
+vint64m4_t test___riscv_vwadd_wx_i64m4_mu(vbool16_t mask,vint64m4_t merge,vint64m4_t op1,int32_t op2,size_t vl)
+{
+    return __riscv_vwadd_wx_i64m4_mu(mask,merge,op1,0xAA,vl);
+}
+
+
+vint64m8_t test___riscv_vwadd_wx_i64m8_mu(vbool8_t mask,vint64m8_t merge,vint64m8_t op1,int32_t op2,size_t vl)
+{
+    return __riscv_vwadd_wx_i64m8_mu(mask,merge,op1,0xAA,vl);
+}
+
+
+
+/* { dg-final { scan-assembler-times {vsetvli\s+zero,\s*[a-x0-9]+,\s*e8,\s*mf8,\s*t[au],\s*mu\s+vwadd\.wx\s+v[0-9]+,\s*v[0-9]+,\s*[a-x0-9]+,\s*v0.t} 1 } } */
+/* { dg-final { scan-assembler-times {vsetvli\s+zero,\s*[a-x0-9]+,\s*e8,\s*mf4,\s*t[au],\s*mu\s+vwadd\.wx\s+v[0-9]+,\s*v[0-9]+,\s*[a-x0-9]+,\s*v0.t} 1 } } */
+/* { dg-final { scan-assembler-times {vsetvli\s+zero,\s*[a-x0-9]+,\s*e8,\s*mf2,\s*t[au],\s*mu\s+vwadd\.wx\s+v[0-9]+,\s*v[0-9]+,\s*[a-x0-9]+,\s*v0.t} 1 } } */
+/* { dg-final { scan-assembler-times {vsetvli\s+zero,\s*[a-x0-9]+,\s*e8,\s*m1,\s*t[au],\s*mu\s+vwadd\.wx\s+v[0-9]+,\s*v[0-9]+,\s*[a-x0-9]+,\s*v0.t} 1 } } */
+/* { dg-final { scan-assembler-times {vsetvli\s+zero,\s*[a-x0-9]+,\s*e8,\s*m2,\s*t[au],\s*mu\s+vwadd\.wx\s+v[0-9]+,\s*v[0-9]+,\s*[a-x0-9]+,\s*v0.t} 1 } } */
+/* { dg-final { scan-assembler-times {vsetvli\s+zero,\s*[a-x0-9]+,\s*e8,\s*m4,\s*t[au],\s*mu\s+vwadd\.wx\s+v[0-9]+,\s*v[0-9]+,\s*[a-x0-9]+,\s*v0.t} 1 } } */
+/* { dg-final { scan-assembler-times {vsetvli\s+zero,\s*[a-x0-9]+,\s*e16,\s*mf4,\s*t[au],\s*mu\s+vwadd\.wx\s+v[0-9]+,\s*v[0-9]+,\s*[a-x0-9]+,\s*v0.t} 1 } } */
+/* { dg-final { scan-assembler-times {vsetvli\s+zero,\s*[a-x0-9]+,\s*e16,\s*mf2,\s*t[au],\s*mu\s+vwadd\.wx\s+v[0-9]+,\s*v[0-9]+,\s*[a-x0-9]+,\s*v0.t} 1 } } */
+/* { dg-final { scan-assembler-times {vsetvli\s+zero,\s*[a-x0-9]+,\s*e16,\s*m1,\s*t[au],\s*mu\s+vwadd\.wx\s+v[0-9]+,\s*v[0-9]+,\s*[a-x0-9]+,\s*v0.t} 1 } } */
+/* { dg-final { scan-assembler-times {vsetvli\s+zero,\s*[a-x0-9]+,\s*e16,\s*m2,\s*t[au],\s*mu\s+vwadd\.wx\s+v[0-9]+,\s*v[0-9]+,\s*[a-x0-9]+,\s*v0.t} 1 } } */
+/* { dg-final { scan-assembler-times {vsetvli\s+zero,\s*[a-x0-9]+,\s*e16,\s*m4,\s*t[au],\s*mu\s+vwadd\.wx\s+v[0-9]+,\s*v[0-9]+,\s*[a-x0-9]+,\s*v0.t} 1 } } */
+/* { dg-final { scan-assembler-times {vsetvli\s+zero,\s*[a-x0-9]+,\s*e32,\s*mf2,\s*t[au],\s*mu\s+vwadd\.wx\s+v[0-9]+,\s*v[0-9]+,\s*[a-x0-9]+,\s*v0.t} 1 } } */
+/* { dg-final { scan-assembler-times {vsetvli\s+zero,\s*[a-x0-9]+,\s*e32,\s*m1,\s*t[au],\s*mu\s+vwadd\.wx\s+v[0-9]+,\s*v[0-9]+,\s*[a-x0-9]+,\s*v0.t} 1 } } */
+/* { dg-final { scan-assembler-times {vsetvli\s+zero,\s*[a-x0-9]+,\s*e32,\s*m2,\s*t[au],\s*mu\s+vwadd\.wx\s+v[0-9]+,\s*v[0-9]+,\s*[a-x0-9]+,\s*v0.t} 1 } } */
+/* { dg-final { scan-assembler-times {vsetvli\s+zero,\s*[a-x0-9]+,\s*e32,\s*m4,\s*t[au],\s*mu\s+vwadd\.wx\s+v[0-9]+,\s*v[0-9]+,\s*[a-x0-9]+,\s*v0.t} 1 } } */
diff --git a/gcc/testsuite/gcc.target/riscv/rvv/base/vwadd_wx_mu-2.c b/gcc/testsuite/gcc.target/riscv/rvv/base/vwadd_wx_mu-2.c
new file mode 100644
index 00000000000..c2c2b1e8b4d
--- /dev/null
+++ b/gcc/testsuite/gcc.target/riscv/rvv/base/vwadd_wx_mu-2.c
@@ -0,0 +1,111 @@
+/* { dg-do compile } */
+/* { dg-options "-march=rv32gcv -mabi=ilp32 -O3 -fno-schedule-insns -fno-schedule-insns2" } */
+
+#include "riscv_vector.h"
+
+vint16mf4_t test___riscv_vwadd_wx_i16mf4_mu(vbool64_t mask,vint16mf4_t merge,vint16mf4_t op1,int8_t op2,size_t vl)
+{
+    return __riscv_vwadd_wx_i16mf4_mu(mask,merge,op1,0xAA,31);
+}
+
+
+vint16mf2_t test___riscv_vwadd_wx_i16mf2_mu(vbool32_t mask,vint16mf2_t merge,vint16mf2_t op1,int8_t op2,size_t vl)
+{
+    return __riscv_vwadd_wx_i16mf2_mu(mask,merge,op1,0xAA,31);
+}
+
+
+vint16m1_t test___riscv_vwadd_wx_i16m1_mu(vbool16_t mask,vint16m1_t merge,vint16m1_t op1,int8_t op2,size_t vl)
+{
+    return __riscv_vwadd_wx_i16m1_mu(mask,merge,op1,0xAA,31);
+}
+
+
+vint16m2_t test___riscv_vwadd_wx_i16m2_mu(vbool8_t mask,vint16m2_t merge,vint16m2_t op1,int8_t op2,size_t vl)
+{
+    return __riscv_vwadd_wx_i16m2_mu(mask,merge,op1,0xAA,31);
+}
+
+
+vint16m4_t test___riscv_vwadd_wx_i16m4_mu(vbool4_t mask,vint16m4_t merge,vint16m4_t op1,int8_t op2,size_t vl)
+{
+    return __riscv_vwadd_wx_i16m4_mu(mask,merge,op1,0xAA,31);
+}
+
+
+vint16m8_t test___riscv_vwadd_wx_i16m8_mu(vbool2_t mask,vint16m8_t merge,vint16m8_t op1,int8_t op2,size_t vl)
+{
+    return __riscv_vwadd_wx_i16m8_mu(mask,merge,op1,0xAA,31);
+}
+
+
+vint32mf2_t test___riscv_vwadd_wx_i32mf2_mu(vbool64_t mask,vint32mf2_t merge,vint32mf2_t op1,int16_t op2,size_t vl)
+{
+    return __riscv_vwadd_wx_i32mf2_mu(mask,merge,op1,0xAA,31);
+}
+
+
+vint32m1_t test___riscv_vwadd_wx_i32m1_mu(vbool32_t mask,vint32m1_t merge,vint32m1_t op1,int16_t op2,size_t vl)
+{
+    return __riscv_vwadd_wx_i32m1_mu(mask,merge,op1,0xAA,31);
+}
+
+
+vint32m2_t test___riscv_vwadd_wx_i32m2_mu(vbool16_t mask,vint32m2_t merge,vint32m2_t op1,int16_t op2,size_t vl)
+{
+    return __riscv_vwadd_wx_i32m2_mu(mask,merge,op1,0xAA,31);
+}
+
+
+vint32m4_t test___riscv_vwadd_wx_i32m4_mu(vbool8_t mask,vint32m4_t merge,vint32m4_t op1,int16_t op2,size_t vl)
+{
+    return __riscv_vwadd_wx_i32m4_mu(mask,merge,op1,0xAA,31);
+}
+
+
+vint32m8_t test___riscv_vwadd_wx_i32m8_mu(vbool4_t mask,vint32m8_t merge,vint32m8_t op1,int16_t op2,size_t vl)
+{
+    return __riscv_vwadd_wx_i32m8_mu(mask,merge,op1,0xAA,31);
+}
+
+
+vint64m1_t test___riscv_vwadd_wx_i64m1_mu(vbool64_t mask,vint64m1_t merge,vint64m1_t op1,int32_t op2,size_t vl)
+{
+    return __riscv_vwadd_wx_i64m1_mu(mask,merge,op1,0xAA,31);
+}
+
+
+vint64m2_t test___riscv_vwadd_wx_i64m2_mu(vbool32_t mask,vint64m2_t merge,vint64m2_t op1,int32_t op2,size_t vl)
+{
+    return __riscv_vwadd_wx_i64m2_mu(mask,merge,op1,0xAA,31);
+}
+
+
+vint64m4_t test___riscv_vwadd_wx_i64m4_mu(vbool16_t mask,vint64m4_t merge,vint64m4_t op1,int32_t op2,size_t vl)
+{
+    return __riscv_vwadd_wx_i64m4_mu(mask,merge,op1,0xAA,31);
+}
+
+
+vint64m8_t test___riscv_vwadd_wx_i64m8_mu(vbool8_t mask,vint64m8_t merge,vint64m8_t op1,int32_t op2,size_t vl)
+{
+    return __riscv_vwadd_wx_i64m8_mu(mask,merge,op1,0xAA,31);
+}
+
+
+
+/* { dg-final { scan-assembler-times {vsetivli\s+zero,\s*31,\s*e8,\s*mf8,\s*t[au],\s*mu\s+vwadd\.wx\s+v[0-9]+,\s*v[0-9]+,\s*[a-x0-9]+,\s*v0.t} 1 } } */
+/* { dg-final { scan-assembler-times {vsetivli\s+zero,\s*31,\s*e8,\s*mf4,\s*t[au],\s*mu\s+vwadd\.wx\s+v[0-9]+,\s*v[0-9]+,\s*[a-x0-9]+,\s*v0.t} 1 } } */
+/* { dg-final { scan-assembler-times {vsetivli\s+zero,\s*31,\s*e8,\s*mf2,\s*t[au],\s*mu\s+vwadd\.wx\s+v[0-9]+,\s*v[0-9]+,\s*[a-x0-9]+,\s*v0.t} 1 } } */
+/* { dg-final { scan-assembler-times {vsetivli\s+zero,\s*31,\s*e8,\s*m1,\s*t[au],\s*mu\s+vwadd\.wx\s+v[0-9]+,\s*v[0-9]+,\s*[a-x0-9]+,\s*v0.t} 1 } } */
+/* { dg-final { scan-assembler-times {vsetivli\s+zero,\s*31,\s*e8,\s*m2,\s*t[au],\s*mu\s+vwadd\.wx\s+v[0-9]+,\s*v[0-9]+,\s*[a-x0-9]+,\s*v0.t} 1 } } */
+/* { dg-final { scan-assembler-times {vsetivli\s+zero,\s*31,\s*e8,\s*m4,\s*t[au],\s*mu\s+vwadd\.wx\s+v[0-9]+,\s*v[0-9]+,\s*[a-x0-9]+,\s*v0.t} 1 } } */
+/* { dg-final { scan-assembler-times {vsetivli\s+zero,\s*31,\s*e16,\s*mf4,\s*t[au],\s*mu\s+vwadd\.wx\s+v[0-9]+,\s*v[0-9]+,\s*[a-x0-9]+,\s*v0.t} 1 } } */
+/* { dg-final { scan-assembler-times {vsetivli\s+zero,\s*31,\s*e16,\s*mf2,\s*t[au],\s*mu\s+vwadd\.wx\s+v[0-9]+,\s*v[0-9]+,\s*[a-x0-9]+,\s*v0.t} 1 } } */
+/* { dg-final { scan-assembler-times {vsetivli\s+zero,\s*31,\s*e16,\s*m1,\s*t[au],\s*mu\s+vwadd\.wx\s+v[0-9]+,\s*v[0-9]+,\s*[a-x0-9]+,\s*v0.t} 1 } } */
+/* { dg-final { scan-assembler-times {vsetivli\s+zero,\s*31,\s*e16,\s*m2,\s*t[au],\s*mu\s+vwadd\.wx\s+v[0-9]+,\s*v[0-9]+,\s*[a-x0-9]+,\s*v0.t} 1 } } */
+/* { dg-final { scan-assembler-times {vsetivli\s+zero,\s*31,\s*e16,\s*m4,\s*t[au],\s*mu\s+vwadd\.wx\s+v[0-9]+,\s*v[0-9]+,\s*[a-x0-9]+,\s*v0.t} 1 } } */
+/* { dg-final { scan-assembler-times {vsetivli\s+zero,\s*31,\s*e32,\s*mf2,\s*t[au],\s*mu\s+vwadd\.wx\s+v[0-9]+,\s*v[0-9]+,\s*[a-x0-9]+,\s*v0.t} 1 } } */
+/* { dg-final { scan-assembler-times {vsetivli\s+zero,\s*31,\s*e32,\s*m1,\s*t[au],\s*mu\s+vwadd\.wx\s+v[0-9]+,\s*v[0-9]+,\s*[a-x0-9]+,\s*v0.t} 1 } } */
+/* { dg-final { scan-assembler-times {vsetivli\s+zero,\s*31,\s*e32,\s*m2,\s*t[au],\s*mu\s+vwadd\.wx\s+v[0-9]+,\s*v[0-9]+,\s*[a-x0-9]+,\s*v0.t} 1 } } */
+/* { dg-final { scan-assembler-times {vsetivli\s+zero,\s*31,\s*e32,\s*m4,\s*t[au],\s*mu\s+vwadd\.wx\s+v[0-9]+,\s*v[0-9]+,\s*[a-x0-9]+,\s*v0.t} 1 } } */
diff --git a/gcc/testsuite/gcc.target/riscv/rvv/base/vwadd_wx_mu-3.c b/gcc/testsuite/gcc.target/riscv/rvv/base/vwadd_wx_mu-3.c
new file mode 100644
index 00000000000..190eaf7dec6
--- /dev/null
+++ b/gcc/testsuite/gcc.target/riscv/rvv/base/vwadd_wx_mu-3.c
@@ -0,0 +1,111 @@
+/* { dg-do compile } */
+/* { dg-options "-march=rv32gcv -mabi=ilp32 -O3 -fno-schedule-insns -fno-schedule-insns2" } */
+
+#include "riscv_vector.h"
+
+vint16mf4_t test___riscv_vwadd_wx_i16mf4_mu(vbool64_t mask,vint16mf4_t merge,vint16mf4_t op1,int8_t op2,size_t vl)
+{
+    return __riscv_vwadd_wx_i16mf4_mu(mask,merge,op1,0xAA,32);
+}
+
+
+vint16mf2_t test___riscv_vwadd_wx_i16mf2_mu(vbool32_t mask,vint16mf2_t merge,vint16mf2_t op1,int8_t op2,size_t vl)
+{
+    return __riscv_vwadd_wx_i16mf2_mu(mask,merge,op1,0xAA,32);
+}
+
+
+vint16m1_t test___riscv_vwadd_wx_i16m1_mu(vbool16_t mask,vint16m1_t merge,vint16m1_t op1,int8_t op2,size_t vl)
+{
+    return __riscv_vwadd_wx_i16m1_mu(mask,merge,op1,0xAA,32);
+}
+
+
+vint16m2_t test___riscv_vwadd_wx_i16m2_mu(vbool8_t mask,vint16m2_t merge,vint16m2_t op1,int8_t op2,size_t vl)
+{
+    return __riscv_vwadd_wx_i16m2_mu(mask,merge,op1,0xAA,32);
+}
+
+
+vint16m4_t test___riscv_vwadd_wx_i16m4_mu(vbool4_t mask,vint16m4_t merge,vint16m4_t op1,int8_t op2,size_t vl)
+{
+    return __riscv_vwadd_wx_i16m4_mu(mask,merge,op1,0xAA,32);
+}
+
+
+vint16m8_t test___riscv_vwadd_wx_i16m8_mu(vbool2_t mask,vint16m8_t merge,vint16m8_t op1,int8_t op2,size_t vl)
+{
+    return __riscv_vwadd_wx_i16m8_mu(mask,merge,op1,0xAA,32);
+}
+
+
+vint32mf2_t test___riscv_vwadd_wx_i32mf2_mu(vbool64_t mask,vint32mf2_t merge,vint32mf2_t op1,int16_t op2,size_t vl)
+{
+    return __riscv_vwadd_wx_i32mf2_mu(mask,merge,op1,0xAA,32);
+}
+
+
+vint32m1_t test___riscv_vwadd_wx_i32m1_mu(vbool32_t mask,vint32m1_t merge,vint32m1_t op1,int16_t op2,size_t vl)
+{
+    return __riscv_vwadd_wx_i32m1_mu(mask,merge,op1,0xAA,32);
+}
+
+
+vint32m2_t test___riscv_vwadd_wx_i32m2_mu(vbool16_t mask,vint32m2_t merge,vint32m2_t op1,int16_t op2,size_t vl)
+{
+    return __riscv_vwadd_wx_i32m2_mu(mask,merge,op1,0xAA,32);
+}
+
+
+vint32m4_t test___riscv_vwadd_wx_i32m4_mu(vbool8_t mask,vint32m4_t merge,vint32m4_t op1,int16_t op2,size_t vl)
+{
+    return __riscv_vwadd_wx_i32m4_mu(mask,merge,op1,0xAA,32);
+}
+
+
+vint32m8_t test___riscv_vwadd_wx_i32m8_mu(vbool4_t mask,vint32m8_t merge,vint32m8_t op1,int16_t op2,size_t vl)
+{
+    return __riscv_vwadd_wx_i32m8_mu(mask,merge,op1,0xAA,32);
+}
+
+
+vint64m1_t test___riscv_vwadd_wx_i64m1_mu(vbool64_t mask,vint64m1_t merge,vint64m1_t op1,int32_t op2,size_t vl)
+{
+    return __riscv_vwadd_wx_i64m1_mu(mask,merge,op1,0xAA,32);
+}
+
+
+vint64m2_t test___riscv_vwadd_wx_i64m2_mu(vbool32_t mask,vint64m2_t merge,vint64m2_t op1,int32_t op2,size_t vl)
+{
+    return __riscv_vwadd_wx_i64m2_mu(mask,merge,op1,0xAA,32);
+}
+
+
+vint64m4_t test___riscv_vwadd_wx_i64m4_mu(vbool16_t mask,vint64m4_t merge,vint64m4_t op1,int32_t op2,size_t vl)
+{
+    return __riscv_vwadd_wx_i64m4_mu(mask,merge,op1,0xAA,32);
+}
+
+
+vint64m8_t test___riscv_vwadd_wx_i64m8_mu(vbool8_t mask,vint64m8_t merge,vint64m8_t op1,int32_t op2,size_t vl)
+{
+    return __riscv_vwadd_wx_i64m8_mu(mask,merge,op1,0xAA,32);
+}
+
+
+
+/* { dg-final { scan-assembler-times {vsetvli\s+zero,\s*[a-x0-9]+,\s*e8,\s*mf8,\s*t[au],\s*mu\s+vwadd\.wx\s+v[0-9]+,\s*v[0-9]+,\s*[a-x0-9]+,\s*v0.t} 1 } } */
+/* { dg-final { scan-assembler-times {vsetvli\s+zero,\s*[a-x0-9]+,\s*e8,\s*mf4,\s*t[au],\s*mu\s+vwadd\.wx\s+v[0-9]+,\s*v[0-9]+,\s*[a-x0-9]+,\s*v0.t} 1 } } */
+/* { dg-final { scan-assembler-times {vsetvli\s+zero,\s*[a-x0-9]+,\s*e8,\s*mf2,\s*t[au],\s*mu\s+vwadd\.wx\s+v[0-9]+,\s*v[0-9]+,\s*[a-x0-9]+,\s*v0.t} 1 } } */
+/* { dg-final { scan-assembler-times {vsetvli\s+zero,\s*[a-x0-9]+,\s*e8,\s*m1,\s*t[au],\s*mu\s+vwadd\.wx\s+v[0-9]+,\s*v[0-9]+,\s*[a-x0-9]+,\s*v0.t} 1 } } */
+/* { dg-final { scan-assembler-times {vsetvli\s+zero,\s*[a-x0-9]+,\s*e8,\s*m2,\s*t[au],\s*mu\s+vwadd\.wx\s+v[0-9]+,\s*v[0-9]+,\s*[a-x0-9]+,\s*v0.t} 1 } } */
+/* { dg-final { scan-assembler-times {vsetvli\s+zero,\s*[a-x0-9]+,\s*e8,\s*m4,\s*t[au],\s*mu\s+vwadd\.wx\s+v[0-9]+,\s*v[0-9]+,\s*[a-x0-9]+,\s*v0.t} 1 } } */
+/* { dg-final { scan-assembler-times {vsetvli\s+zero,\s*[a-x0-9]+,\s*e16,\s*mf4,\s*t[au],\s*mu\s+vwadd\.wx\s+v[0-9]+,\s*v[0-9]+,\s*[a-x0-9]+,\s*v0.t} 1 } } */
+/* { dg-final { scan-assembler-times {vsetvli\s+zero,\s*[a-x0-9]+,\s*e16,\s*mf2,\s*t[au],\s*mu\s+vwadd\.wx\s+v[0-9]+,\s*v[0-9]+,\s*[a-x0-9]+,\s*v0.t} 1 } } */
+/* { dg-final { scan-assembler-times {vsetvli\s+zero,\s*[a-x0-9]+,\s*e16,\s*m1,\s*t[au],\s*mu\s+vwadd\.wx\s+v[0-9]+,\s*v[0-9]+,\s*[a-x0-9]+,\s*v0.t} 1 } } */
+/* { dg-final { scan-assembler-times {vsetvli\s+zero,\s*[a-x0-9]+,\s*e16,\s*m2,\s*t[au],\s*mu\s+vwadd\.wx\s+v[0-9]+,\s*v[0-9]+,\s*[a-x0-9]+,\s*v0.t} 1 } } */
+/* { dg-final { scan-assembler-times {vsetvli\s+zero,\s*[a-x0-9]+,\s*e16,\s*m4,\s*t[au],\s*mu\s+vwadd\.wx\s+v[0-9]+,\s*v[0-9]+,\s*[a-x0-9]+,\s*v0.t} 1 } } */
+/* { dg-final { scan-assembler-times {vsetvli\s+zero,\s*[a-x0-9]+,\s*e32,\s*mf2,\s*t[au],\s*mu\s+vwadd\.wx\s+v[0-9]+,\s*v[0-9]+,\s*[a-x0-9]+,\s*v0.t} 1 } } */
+/* { dg-final { scan-assembler-times {vsetvli\s+zero,\s*[a-x0-9]+,\s*e32,\s*m1,\s*t[au],\s*mu\s+vwadd\.wx\s+v[0-9]+,\s*v[0-9]+,\s*[a-x0-9]+,\s*v0.t} 1 } } */
+/* { dg-final { scan-assembler-times {vsetvli\s+zero,\s*[a-x0-9]+,\s*e32,\s*m2,\s*t[au],\s*mu\s+vwadd\.wx\s+v[0-9]+,\s*v[0-9]+,\s*[a-x0-9]+,\s*v0.t} 1 } } */
+/* { dg-final { scan-assembler-times {vsetvli\s+zero,\s*[a-x0-9]+,\s*e32,\s*m4,\s*t[au],\s*mu\s+vwadd\.wx\s+v[0-9]+,\s*v[0-9]+,\s*[a-x0-9]+,\s*v0.t} 1 } } */
diff --git a/gcc/testsuite/gcc.target/riscv/rvv/base/vwadd_wx_tu-1.c b/gcc/testsuite/gcc.target/riscv/rvv/base/vwadd_wx_tu-1.c
new file mode 100644
index 00000000000..10e09616b87
--- /dev/null
+++ b/gcc/testsuite/gcc.target/riscv/rvv/base/vwadd_wx_tu-1.c
@@ -0,0 +1,111 @@
+/* { dg-do compile } */
+/* { dg-options "-march=rv32gcv -mabi=ilp32 -O3 -fno-schedule-insns -fno-schedule-insns2" } */
+
+#include "riscv_vector.h"
+
+vint16mf4_t test___riscv_vwadd_wx_i16mf4_tu(vint16mf4_t merge,vint16mf4_t op1,int8_t op2,size_t vl)
+{
+    return __riscv_vwadd_wx_i16mf4_tu(merge,op1,0xAA,vl);
+}
+
+
+vint16mf2_t test___riscv_vwadd_wx_i16mf2_tu(vint16mf2_t merge,vint16mf2_t op1,int8_t op2,size_t vl)
+{
+    return __riscv_vwadd_wx_i16mf2_tu(merge,op1,0xAA,vl);
+}
+
+
+vint16m1_t test___riscv_vwadd_wx_i16m1_tu(vint16m1_t merge,vint16m1_t op1,int8_t op2,size_t vl)
+{
+    return __riscv_vwadd_wx_i16m1_tu(merge,op1,0xAA,vl);
+}
+
+
+vint16m2_t test___riscv_vwadd_wx_i16m2_tu(vint16m2_t merge,vint16m2_t op1,int8_t op2,size_t vl)
+{
+    return __riscv_vwadd_wx_i16m2_tu(merge,op1,0xAA,vl);
+}
+
+
+vint16m4_t test___riscv_vwadd_wx_i16m4_tu(vint16m4_t merge,vint16m4_t op1,int8_t op2,size_t vl)
+{
+    return __riscv_vwadd_wx_i16m4_tu(merge,op1,0xAA,vl);
+}
+
+
+vint16m8_t test___riscv_vwadd_wx_i16m8_tu(vint16m8_t merge,vint16m8_t op1,int8_t op2,size_t vl)
+{
+    return __riscv_vwadd_wx_i16m8_tu(merge,op1,0xAA,vl);
+}
+
+
+vint32mf2_t test___riscv_vwadd_wx_i32mf2_tu(vint32mf2_t merge,vint32mf2_t op1,int16_t op2,size_t vl)
+{
+    return __riscv_vwadd_wx_i32mf2_tu(merge,op1,0xAA,vl);
+}
+
+
+vint32m1_t test___riscv_vwadd_wx_i32m1_tu(vint32m1_t merge,vint32m1_t op1,int16_t op2,size_t vl)
+{
+    return __riscv_vwadd_wx_i32m1_tu(merge,op1,0xAA,vl);
+}
+
+
+vint32m2_t test___riscv_vwadd_wx_i32m2_tu(vint32m2_t merge,vint32m2_t op1,int16_t op2,size_t vl)
+{
+    return __riscv_vwadd_wx_i32m2_tu(merge,op1,0xAA,vl);
+}
+
+
+vint32m4_t test___riscv_vwadd_wx_i32m4_tu(vint32m4_t merge,vint32m4_t op1,int16_t op2,size_t vl)
+{
+    return __riscv_vwadd_wx_i32m4_tu(merge,op1,0xAA,vl);
+}
+
+
+vint32m8_t test___riscv_vwadd_wx_i32m8_tu(vint32m8_t merge,vint32m8_t op1,int16_t op2,size_t vl)
+{
+    return __riscv_vwadd_wx_i32m8_tu(merge,op1,0xAA,vl);
+}
+
+
+vint64m1_t test___riscv_vwadd_wx_i64m1_tu(vint64m1_t merge,vint64m1_t op1,int32_t op2,size_t vl)
+{
+    return __riscv_vwadd_wx_i64m1_tu(merge,op1,0xAA,vl);
+}
+
+
+vint64m2_t test___riscv_vwadd_wx_i64m2_tu(vint64m2_t merge,vint64m2_t op1,int32_t op2,size_t vl)
+{
+    return __riscv_vwadd_wx_i64m2_tu(merge,op1,0xAA,vl);
+}
+
+
+vint64m4_t test___riscv_vwadd_wx_i64m4_tu(vint64m4_t merge,vint64m4_t op1,int32_t op2,size_t vl)
+{
+    return __riscv_vwadd_wx_i64m4_tu(merge,op1,0xAA,vl);
+}
+
+
+vint64m8_t test___riscv_vwadd_wx_i64m8_tu(vint64m8_t merge,vint64m8_t op1,int32_t op2,size_t vl)
+{
+    return __riscv_vwadd_wx_i64m8_tu(merge,op1,0xAA,vl);
+}
+
+
+
+/* { dg-final { scan-assembler-times {vsetvli\s+zero,\s*[a-x0-9]+,\s*e8,\s*mf8,\s*tu,\s*m[au]\s+vwadd\.wx\s+v[0-9]+,\s*v[0-9]+,\s*[a-x0-9]+} 1 } } */
+/* { dg-final { scan-assembler-times {vsetvli\s+zero,\s*[a-x0-9]+,\s*e8,\s*mf4,\s*tu,\s*m[au]\s+vwadd\.wx\s+v[0-9]+,\s*v[0-9]+,\s*[a-x0-9]+} 1 } } */
+/* { dg-final { scan-assembler-times {vsetvli\s+zero,\s*[a-x0-9]+,\s*e8,\s*mf2,\s*tu,\s*m[au]\s+vwadd\.wx\s+v[0-9]+,\s*v[0-9]+,\s*[a-x0-9]+} 1 } } */
+/* { dg-final { scan-assembler-times {vsetvli\s+zero,\s*[a-x0-9]+,\s*e8,\s*m1,\s*tu,\s*m[au]\s+vwadd\.wx\s+v[0-9]+,\s*v[0-9]+,\s*[a-x0-9]+} 1 } } */
+/* { dg-final { scan-assembler-times {vsetvli\s+zero,\s*[a-x0-9]+,\s*e8,\s*m2,\s*tu,\s*m[au]\s+vwadd\.wx\s+v[0-9]+,\s*v[0-9]+,\s*[a-x0-9]+} 1 } } */
+/* { dg-final { scan-assembler-times {vsetvli\s+zero,\s*[a-x0-9]+,\s*e8,\s*m4,\s*tu,\s*m[au]\s+vwadd\.wx\s+v[0-9]+,\s*v[0-9]+,\s*[a-x0-9]+} 1 } } */
+/* { dg-final { scan-assembler-times {vsetvli\s+zero,\s*[a-x0-9]+,\s*e16,\s*mf4,\s*tu,\s*m[au]\s+vwadd\.wx\s+v[0-9]+,\s*v[0-9]+,\s*[a-x0-9]+} 1 } } */
+/* { dg-final { scan-assembler-times {vsetvli\s+zero,\s*[a-x0-9]+,\s*e16,\s*mf2,\s*tu,\s*m[au]\s+vwadd\.wx\s+v[0-9]+,\s*v[0-9]+,\s*[a-x0-9]+} 1 } } */
+/* { dg-final { scan-assembler-times {vsetvli\s+zero,\s*[a-x0-9]+,\s*e16,\s*m1,\s*tu,\s*m[au]\s+vwadd\.wx\s+v[0-9]+,\s*v[0-9]+,\s*[a-x0-9]+} 1 } } */
+/* { dg-final { scan-assembler-times {vsetvli\s+zero,\s*[a-x0-9]+,\s*e16,\s*m2,\s*tu,\s*m[au]\s+vwadd\.wx\s+v[0-9]+,\s*v[0-9]+,\s*[a-x0-9]+} 1 } } */
+/* { dg-final { scan-assembler-times {vsetvli\s+zero,\s*[a-x0-9]+,\s*e16,\s*m4,\s*tu,\s*m[au]\s+vwadd\.wx\s+v[0-9]+,\s*v[0-9]+,\s*[a-x0-9]+} 1 } } */
+/* { dg-final { scan-assembler-times {vsetvli\s+zero,\s*[a-x0-9]+,\s*e32,\s*mf2,\s*tu,\s*m[au]\s+vwadd\.wx\s+v[0-9]+,\s*v[0-9]+,\s*[a-x0-9]+} 1 } } */
+/* { dg-final { scan-assembler-times {vsetvli\s+zero,\s*[a-x0-9]+,\s*e32,\s*m1,\s*tu,\s*m[au]\s+vwadd\.wx\s+v[0-9]+,\s*v[0-9]+,\s*[a-x0-9]+} 1 } } */
+/* { dg-final { scan-assembler-times {vsetvli\s+zero,\s*[a-x0-9]+,\s*e32,\s*m2,\s*tu,\s*m[au]\s+vwadd\.wx\s+v[0-9]+,\s*v[0-9]+,\s*[a-x0-9]+} 1 } } */
+/* { dg-final { scan-assembler-times {vsetvli\s+zero,\s*[a-x0-9]+,\s*e32,\s*m4,\s*tu,\s*m[au]\s+vwadd\.wx\s+v[0-9]+,\s*v[0-9]+,\s*[a-x0-9]+} 1 } } */
diff --git a/gcc/testsuite/gcc.target/riscv/rvv/base/vwadd_wx_tu-2.c b/gcc/testsuite/gcc.target/riscv/rvv/base/vwadd_wx_tu-2.c
new file mode 100644
index 00000000000..7ae651a0920
--- /dev/null
+++ b/gcc/testsuite/gcc.target/riscv/rvv/base/vwadd_wx_tu-2.c
@@ -0,0 +1,111 @@
+/* { dg-do compile } */
+/* { dg-options "-march=rv32gcv -mabi=ilp32 -O3 -fno-schedule-insns -fno-schedule-insns2" } */
+
+#include "riscv_vector.h"
+
+vint16mf4_t test___riscv_vwadd_wx_i16mf4_tu(vint16mf4_t merge,vint16mf4_t op1,int8_t op2,size_t vl)
+{
+    return __riscv_vwadd_wx_i16mf4_tu(merge,op1,0xAA,31);
+}
+
+
+vint16mf2_t test___riscv_vwadd_wx_i16mf2_tu(vint16mf2_t merge,vint16mf2_t op1,int8_t op2,size_t vl)
+{
+    return __riscv_vwadd_wx_i16mf2_tu(merge,op1,0xAA,31);
+}
+
+
+vint16m1_t test___riscv_vwadd_wx_i16m1_tu(vint16m1_t merge,vint16m1_t op1,int8_t op2,size_t vl)
+{
+    return __riscv_vwadd_wx_i16m1_tu(merge,op1,0xAA,31);
+}
+
+
+vint16m2_t test___riscv_vwadd_wx_i16m2_tu(vint16m2_t merge,vint16m2_t op1,int8_t op2,size_t vl)
+{
+    return __riscv_vwadd_wx_i16m2_tu(merge,op1,0xAA,31);
+}
+
+
+vint16m4_t test___riscv_vwadd_wx_i16m4_tu(vint16m4_t merge,vint16m4_t op1,int8_t op2,size_t vl)
+{
+    return __riscv_vwadd_wx_i16m4_tu(merge,op1,0xAA,31);
+}
+
+
+vint16m8_t test___riscv_vwadd_wx_i16m8_tu(vint16m8_t merge,vint16m8_t op1,int8_t op2,size_t vl)
+{
+    return __riscv_vwadd_wx_i16m8_tu(merge,op1,0xAA,31);
+}
+
+
+vint32mf2_t test___riscv_vwadd_wx_i32mf2_tu(vint32mf2_t merge,vint32mf2_t op1,int16_t op2,size_t vl)
+{
+    return __riscv_vwadd_wx_i32mf2_tu(merge,op1,0xAA,31);
+}
+
+
+vint32m1_t test___riscv_vwadd_wx_i32m1_tu(vint32m1_t merge,vint32m1_t op1,int16_t op2,size_t vl)
+{
+    return __riscv_vwadd_wx_i32m1_tu(merge,op1,0xAA,31);
+}
+
+
+vint32m2_t test___riscv_vwadd_wx_i32m2_tu(vint32m2_t merge,vint32m2_t op1,int16_t op2,size_t vl)
+{
+    return __riscv_vwadd_wx_i32m2_tu(merge,op1,0xAA,31);
+}
+
+
+vint32m4_t test___riscv_vwadd_wx_i32m4_tu(vint32m4_t merge,vint32m4_t op1,int16_t op2,size_t vl)
+{
+    return __riscv_vwadd_wx_i32m4_tu(merge,op1,0xAA,31);
+}
+
+
+vint32m8_t test___riscv_vwadd_wx_i32m8_tu(vint32m8_t merge,vint32m8_t op1,int16_t op2,size_t vl)
+{
+    return __riscv_vwadd_wx_i32m8_tu(merge,op1,0xAA,31);
+}
+
+
+vint64m1_t test___riscv_vwadd_wx_i64m1_tu(vint64m1_t merge,vint64m1_t op1,int32_t op2,size_t vl)
+{
+    return __riscv_vwadd_wx_i64m1_tu(merge,op1,0xAA,31);
+}
+
+
+vint64m2_t test___riscv_vwadd_wx_i64m2_tu(vint64m2_t merge,vint64m2_t op1,int32_t op2,size_t vl)
+{
+    return __riscv_vwadd_wx_i64m2_tu(merge,op1,0xAA,31);
+}
+
+
+vint64m4_t test___riscv_vwadd_wx_i64m4_tu(vint64m4_t merge,vint64m4_t op1,int32_t op2,size_t vl)
+{
+    return __riscv_vwadd_wx_i64m4_tu(merge,op1,0xAA,31);
+}
+
+
+vint64m8_t test___riscv_vwadd_wx_i64m8_tu(vint64m8_t merge,vint64m8_t op1,int32_t op2,size_t vl)
+{
+    return __riscv_vwadd_wx_i64m8_tu(merge,op1,0xAA,31);
+}
+
+
+
+/* { dg-final { scan-assembler-times {vsetivli\s+zero,\s*31,\s*e8,\s*mf8,\s*tu,\s*m[au]\s+vwadd\.wx\s+v[0-9]+,\s*v[0-9]+,\s*[a-x0-9]+} 1 } } */
+/* { dg-final { scan-assembler-times {vsetivli\s+zero,\s*31,\s*e8,\s*mf4,\s*tu,\s*m[au]\s+vwadd\.wx\s+v[0-9]+,\s*v[0-9]+,\s*[a-x0-9]+} 1 } } */
+/* { dg-final { scan-assembler-times {vsetivli\s+zero,\s*31,\s*e8,\s*mf2,\s*tu,\s*m[au]\s+vwadd\.wx\s+v[0-9]+,\s*v[0-9]+,\s*[a-x0-9]+} 1 } } */
+/* { dg-final { scan-assembler-times {vsetivli\s+zero,\s*31,\s*e8,\s*m1,\s*tu,\s*m[au]\s+vwadd\.wx\s+v[0-9]+,\s*v[0-9]+,\s*[a-x0-9]+} 1 } } */
+/* { dg-final { scan-assembler-times {vsetivli\s+zero,\s*31,\s*e8,\s*m2,\s*tu,\s*m[au]\s+vwadd\.wx\s+v[0-9]+,\s*v[0-9]+,\s*[a-x0-9]+} 1 } } */
+/* { dg-final { scan-assembler-times {vsetivli\s+zero,\s*31,\s*e8,\s*m4,\s*tu,\s*m[au]\s+vwadd\.wx\s+v[0-9]+,\s*v[0-9]+,\s*[a-x0-9]+} 1 } } */
+/* { dg-final { scan-assembler-times {vsetivli\s+zero,\s*31,\s*e16,\s*mf4,\s*tu,\s*m[au]\s+vwadd\.wx\s+v[0-9]+,\s*v[0-9]+,\s*[a-x0-9]+} 1 } } */
+/* { dg-final { scan-assembler-times {vsetivli\s+zero,\s*31,\s*e16,\s*mf2,\s*tu,\s*m[au]\s+vwadd\.wx\s+v[0-9]+,\s*v[0-9]+,\s*[a-x0-9]+} 1 } } */
+/* { dg-final { scan-assembler-times {vsetivli\s+zero,\s*31,\s*e16,\s*m1,\s*tu,\s*m[au]\s+vwadd\.wx\s+v[0-9]+,\s*v[0-9]+,\s*[a-x0-9]+} 1 } } */
+/* { dg-final { scan-assembler-times {vsetivli\s+zero,\s*31,\s*e16,\s*m2,\s*tu,\s*m[au]\s+vwadd\.wx\s+v[0-9]+,\s*v[0-9]+,\s*[a-x0-9]+} 1 } } */
+/* { dg-final { scan-assembler-times {vsetivli\s+zero,\s*31,\s*e16,\s*m4,\s*tu,\s*m[au]\s+vwadd\.wx\s+v[0-9]+,\s*v[0-9]+,\s*[a-x0-9]+} 1 } } */
+/* { dg-final { scan-assembler-times {vsetivli\s+zero,\s*31,\s*e32,\s*mf2,\s*tu,\s*m[au]\s+vwadd\.wx\s+v[0-9]+,\s*v[0-9]+,\s*[a-x0-9]+} 1 } } */
+/* { dg-final { scan-assembler-times {vsetivli\s+zero,\s*31,\s*e32,\s*m1,\s*tu,\s*m[au]\s+vwadd\.wx\s+v[0-9]+,\s*v[0-9]+,\s*[a-x0-9]+} 1 } } */
+/* { dg-final { scan-assembler-times {vsetivli\s+zero,\s*31,\s*e32,\s*m2,\s*tu,\s*m[au]\s+vwadd\.wx\s+v[0-9]+,\s*v[0-9]+,\s*[a-x0-9]+} 1 } } */
+/* { dg-final { scan-assembler-times {vsetivli\s+zero,\s*31,\s*e32,\s*m4,\s*tu,\s*m[au]\s+vwadd\.wx\s+v[0-9]+,\s*v[0-9]+,\s*[a-x0-9]+} 1 } } */
diff --git a/gcc/testsuite/gcc.target/riscv/rvv/base/vwadd_wx_tu-3.c b/gcc/testsuite/gcc.target/riscv/rvv/base/vwadd_wx_tu-3.c
new file mode 100644
index 00000000000..39348df8221
--- /dev/null
+++ b/gcc/testsuite/gcc.target/riscv/rvv/base/vwadd_wx_tu-3.c
@@ -0,0 +1,111 @@
+/* { dg-do compile } */
+/* { dg-options "-march=rv32gcv -mabi=ilp32 -O3 -fno-schedule-insns -fno-schedule-insns2" } */
+
+#include "riscv_vector.h"
+
+vint16mf4_t test___riscv_vwadd_wx_i16mf4_tu(vint16mf4_t merge,vint16mf4_t op1,int8_t op2,size_t vl)
+{
+    return __riscv_vwadd_wx_i16mf4_tu(merge,op1,0xAA,32);
+}
+
+
+vint16mf2_t test___riscv_vwadd_wx_i16mf2_tu(vint16mf2_t merge,vint16mf2_t op1,int8_t op2,size_t vl)
+{
+    return __riscv_vwadd_wx_i16mf2_tu(merge,op1,0xAA,32);
+}
+
+
+vint16m1_t test___riscv_vwadd_wx_i16m1_tu(vint16m1_t merge,vint16m1_t op1,int8_t op2,size_t vl)
+{
+    return __riscv_vwadd_wx_i16m1_tu(merge,op1,0xAA,32);
+}
+
+
+vint16m2_t test___riscv_vwadd_wx_i16m2_tu(vint16m2_t merge,vint16m2_t op1,int8_t op2,size_t vl)
+{
+    return __riscv_vwadd_wx_i16m2_tu(merge,op1,0xAA,32);
+}
+
+
+vint16m4_t test___riscv_vwadd_wx_i16m4_tu(vint16m4_t merge,vint16m4_t op1,int8_t op2,size_t vl)
+{
+    return __riscv_vwadd_wx_i16m4_tu(merge,op1,0xAA,32);
+}
+
+
+vint16m8_t test___riscv_vwadd_wx_i16m8_tu(vint16m8_t merge,vint16m8_t op1,int8_t op2,size_t vl)
+{
+    return __riscv_vwadd_wx_i16m8_tu(merge,op1,0xAA,32);
+}
+
+
+vint32mf2_t test___riscv_vwadd_wx_i32mf2_tu(vint32mf2_t merge,vint32mf2_t op1,int16_t op2,size_t vl)
+{
+    return __riscv_vwadd_wx_i32mf2_tu(merge,op1,0xAA,32);
+}
+
+
+vint32m1_t test___riscv_vwadd_wx_i32m1_tu(vint32m1_t merge,vint32m1_t op1,int16_t op2,size_t vl)
+{
+    return __riscv_vwadd_wx_i32m1_tu(merge,op1,0xAA,32);
+}
+
+
+vint32m2_t test___riscv_vwadd_wx_i32m2_tu(vint32m2_t merge,vint32m2_t op1,int16_t op2,size_t vl)
+{
+    return __riscv_vwadd_wx_i32m2_tu(merge,op1,0xAA,32);
+}
+
+
+vint32m4_t test___riscv_vwadd_wx_i32m4_tu(vint32m4_t merge,vint32m4_t op1,int16_t op2,size_t vl)
+{
+    return __riscv_vwadd_wx_i32m4_tu(merge,op1,0xAA,32);
+}
+
+
+vint32m8_t test___riscv_vwadd_wx_i32m8_tu(vint32m8_t merge,vint32m8_t op1,int16_t op2,size_t vl)
+{
+    return __riscv_vwadd_wx_i32m8_tu(merge,op1,0xAA,32);
+}
+
+
+vint64m1_t test___riscv_vwadd_wx_i64m1_tu(vint64m1_t merge,vint64m1_t op1,int32_t op2,size_t vl)
+{
+    return __riscv_vwadd_wx_i64m1_tu(merge,op1,0xAA,32);
+}
+
+
+vint64m2_t test___riscv_vwadd_wx_i64m2_tu(vint64m2_t merge,vint64m2_t op1,int32_t op2,size_t vl)
+{
+    return __riscv_vwadd_wx_i64m2_tu(merge,op1,0xAA,32);
+}
+
+
+vint64m4_t test___riscv_vwadd_wx_i64m4_tu(vint64m4_t merge,vint64m4_t op1,int32_t op2,size_t vl)
+{
+    return __riscv_vwadd_wx_i64m4_tu(merge,op1,0xAA,32);
+}
+
+
+vint64m8_t test___riscv_vwadd_wx_i64m8_tu(vint64m8_t merge,vint64m8_t op1,int32_t op2,size_t vl)
+{
+    return __riscv_vwadd_wx_i64m8_tu(merge,op1,0xAA,32);
+}
+
+
+
+/* { dg-final { scan-assembler-times {vsetvli\s+zero,\s*[a-x0-9]+,\s*e8,\s*mf8,\s*tu,\s*m[au]\s+vwadd\.wx\s+v[0-9]+,\s*v[0-9]+,\s*[a-x0-9]+} 1 } } */
+/* { dg-final { scan-assembler-times {vsetvli\s+zero,\s*[a-x0-9]+,\s*e8,\s*mf4,\s*tu,\s*m[au]\s+vwadd\.wx\s+v[0-9]+,\s*v[0-9]+,\s*[a-x0-9]+} 1 } } */
+/* { dg-final { scan-assembler-times {vsetvli\s+zero,\s*[a-x0-9]+,\s*e8,\s*mf2,\s*tu,\s*m[au]\s+vwadd\.wx\s+v[0-9]+,\s*v[0-9]+,\s*[a-x0-9]+} 1 } } */
+/* { dg-final { scan-assembler-times {vsetvli\s+zero,\s*[a-x0-9]+,\s*e8,\s*m1,\s*tu,\s*m[au]\s+vwadd\.wx\s+v[0-9]+,\s*v[0-9]+,\s*[a-x0-9]+} 1 } } */
+/* { dg-final { scan-assembler-times {vsetvli\s+zero,\s*[a-x0-9]+,\s*e8,\s*m2,\s*tu,\s*m[au]\s+vwadd\.wx\s+v[0-9]+,\s*v[0-9]+,\s*[a-x0-9]+} 1 } } */
+/* { dg-final { scan-assembler-times {vsetvli\s+zero,\s*[a-x0-9]+,\s*e8,\s*m4,\s*tu,\s*m[au]\s+vwadd\.wx\s+v[0-9]+,\s*v[0-9]+,\s*[a-x0-9]+} 1 } } */
+/* { dg-final { scan-assembler-times {vsetvli\s+zero,\s*[a-x0-9]+,\s*e16,\s*mf4,\s*tu,\s*m[au]\s+vwadd\.wx\s+v[0-9]+,\s*v[0-9]+,\s*[a-x0-9]+} 1 } } */
+/* { dg-final { scan-assembler-times {vsetvli\s+zero,\s*[a-x0-9]+,\s*e16,\s*mf2,\s*tu,\s*m[au]\s+vwadd\.wx\s+v[0-9]+,\s*v[0-9]+,\s*[a-x0-9]+} 1 } } */
+/* { dg-final { scan-assembler-times {vsetvli\s+zero,\s*[a-x0-9]+,\s*e16,\s*m1,\s*tu,\s*m[au]\s+vwadd\.wx\s+v[0-9]+,\s*v[0-9]+,\s*[a-x0-9]+} 1 } } */
+/* { dg-final { scan-assembler-times {vsetvli\s+zero,\s*[a-x0-9]+,\s*e16,\s*m2,\s*tu,\s*m[au]\s+vwadd\.wx\s+v[0-9]+,\s*v[0-9]+,\s*[a-x0-9]+} 1 } } */
+/* { dg-final { scan-assembler-times {vsetvli\s+zero,\s*[a-x0-9]+,\s*e16,\s*m4,\s*tu,\s*m[au]\s+vwadd\.wx\s+v[0-9]+,\s*v[0-9]+,\s*[a-x0-9]+} 1 } } */
+/* { dg-final { scan-assembler-times {vsetvli\s+zero,\s*[a-x0-9]+,\s*e32,\s*mf2,\s*tu,\s*m[au]\s+vwadd\.wx\s+v[0-9]+,\s*v[0-9]+,\s*[a-x0-9]+} 1 } } */
+/* { dg-final { scan-assembler-times {vsetvli\s+zero,\s*[a-x0-9]+,\s*e32,\s*m1,\s*tu,\s*m[au]\s+vwadd\.wx\s+v[0-9]+,\s*v[0-9]+,\s*[a-x0-9]+} 1 } } */
+/* { dg-final { scan-assembler-times {vsetvli\s+zero,\s*[a-x0-9]+,\s*e32,\s*m2,\s*tu,\s*m[au]\s+vwadd\.wx\s+v[0-9]+,\s*v[0-9]+,\s*[a-x0-9]+} 1 } } */
+/* { dg-final { scan-assembler-times {vsetvli\s+zero,\s*[a-x0-9]+,\s*e32,\s*m4,\s*tu,\s*m[au]\s+vwadd\.wx\s+v[0-9]+,\s*v[0-9]+,\s*[a-x0-9]+} 1 } } */
diff --git a/gcc/testsuite/gcc.target/riscv/rvv/base/vwadd_wx_tum-1.c b/gcc/testsuite/gcc.target/riscv/rvv/base/vwadd_wx_tum-1.c
new file mode 100644
index 00000000000..23d969a8d34
--- /dev/null
+++ b/gcc/testsuite/gcc.target/riscv/rvv/base/vwadd_wx_tum-1.c
@@ -0,0 +1,111 @@
+/* { dg-do compile } */
+/* { dg-options "-march=rv32gcv -mabi=ilp32 -O3 -fno-schedule-insns -fno-schedule-insns2" } */
+
+#include "riscv_vector.h"
+
+vint16mf4_t test___riscv_vwadd_wx_i16mf4_tum(vbool64_t mask,vint16mf4_t merge,vint16mf4_t op1,int8_t op2,size_t vl)
+{
+    return __riscv_vwadd_wx_i16mf4_tum(mask,merge,op1,0xAA,vl);
+}
+
+
+vint16mf2_t test___riscv_vwadd_wx_i16mf2_tum(vbool32_t mask,vint16mf2_t merge,vint16mf2_t op1,int8_t op2,size_t vl)
+{
+    return __riscv_vwadd_wx_i16mf2_tum(mask,merge,op1,0xAA,vl);
+}
+
+
+vint16m1_t test___riscv_vwadd_wx_i16m1_tum(vbool16_t mask,vint16m1_t merge,vint16m1_t op1,int8_t op2,size_t vl)
+{
+    return __riscv_vwadd_wx_i16m1_tum(mask,merge,op1,0xAA,vl);
+}
+
+
+vint16m2_t test___riscv_vwadd_wx_i16m2_tum(vbool8_t mask,vint16m2_t merge,vint16m2_t op1,int8_t op2,size_t vl)
+{
+    return __riscv_vwadd_wx_i16m2_tum(mask,merge,op1,0xAA,vl);
+}
+
+
+vint16m4_t test___riscv_vwadd_wx_i16m4_tum(vbool4_t mask,vint16m4_t merge,vint16m4_t op1,int8_t op2,size_t vl)
+{
+    return __riscv_vwadd_wx_i16m4_tum(mask,merge,op1,0xAA,vl);
+}
+
+
+vint16m8_t test___riscv_vwadd_wx_i16m8_tum(vbool2_t mask,vint16m8_t merge,vint16m8_t op1,int8_t op2,size_t vl)
+{
+    return __riscv_vwadd_wx_i16m8_tum(mask,merge,op1,0xAA,vl);
+}
+
+
+vint32mf2_t test___riscv_vwadd_wx_i32mf2_tum(vbool64_t mask,vint32mf2_t merge,vint32mf2_t op1,int16_t op2,size_t vl)
+{
+    return __riscv_vwadd_wx_i32mf2_tum(mask,merge,op1,0xAA,vl);
+}
+
+
+vint32m1_t test___riscv_vwadd_wx_i32m1_tum(vbool32_t mask,vint32m1_t merge,vint32m1_t op1,int16_t op2,size_t vl)
+{
+    return __riscv_vwadd_wx_i32m1_tum(mask,merge,op1,0xAA,vl);
+}
+
+
+vint32m2_t test___riscv_vwadd_wx_i32m2_tum(vbool16_t mask,vint32m2_t merge,vint32m2_t op1,int16_t op2,size_t vl)
+{
+    return __riscv_vwadd_wx_i32m2_tum(mask,merge,op1,0xAA,vl);
+}
+
+
+vint32m4_t test___riscv_vwadd_wx_i32m4_tum(vbool8_t mask,vint32m4_t merge,vint32m4_t op1,int16_t op2,size_t vl)
+{
+    return __riscv_vwadd_wx_i32m4_tum(mask,merge,op1,0xAA,vl);
+}
+
+
+vint32m8_t test___riscv_vwadd_wx_i32m8_tum(vbool4_t mask,vint32m8_t merge,vint32m8_t op1,int16_t op2,size_t vl)
+{
+    return __riscv_vwadd_wx_i32m8_tum(mask,merge,op1,0xAA,vl);
+}
+
+
+vint64m1_t test___riscv_vwadd_wx_i64m1_tum(vbool64_t mask,vint64m1_t merge,vint64m1_t op1,int32_t op2,size_t vl)
+{
+    return __riscv_vwadd_wx_i64m1_tum(mask,merge,op1,0xAA,vl);
+}
+
+
+vint64m2_t test___riscv_vwadd_wx_i64m2_tum(vbool32_t mask,vint64m2_t merge,vint64m2_t op1,int32_t op2,size_t vl)
+{
+    return __riscv_vwadd_wx_i64m2_tum(mask,merge,op1,0xAA,vl);
+}
+
+
+vint64m4_t test___riscv_vwadd_wx_i64m4_tum(vbool16_t mask,vint64m4_t merge,vint64m4_t op1,int32_t op2,size_t vl)
+{
+    return __riscv_vwadd_wx_i64m4_tum(mask,merge,op1,0xAA,vl);
+}
+
+
+vint64m8_t test___riscv_vwadd_wx_i64m8_tum(vbool8_t mask,vint64m8_t merge,vint64m8_t op1,int32_t op2,size_t vl)
+{
+    return __riscv_vwadd_wx_i64m8_tum(mask,merge,op1,0xAA,vl);
+}
+
+
+
+/* { dg-final { scan-assembler-times {vsetvli\s+zero,\s*[a-x0-9]+,\s*e8,\s*mf8,\s*tu,\s*m[au]\s+vwadd\.wx\s+v[0-9]+,\s*v[0-9]+,\s*[a-x0-9]+,\s*v0.t} 1 } } */
+/* { dg-final { scan-assembler-times {vsetvli\s+zero,\s*[a-x0-9]+,\s*e8,\s*mf4,\s*tu,\s*m[au]\s+vwadd\.wx\s+v[0-9]+,\s*v[0-9]+,\s*[a-x0-9]+,\s*v0.t} 1 } } */
+/* { dg-final { scan-assembler-times {vsetvli\s+zero,\s*[a-x0-9]+,\s*e8,\s*mf2,\s*tu,\s*m[au]\s+vwadd\.wx\s+v[0-9]+,\s*v[0-9]+,\s*[a-x0-9]+,\s*v0.t} 1 } } */
+/* { dg-final { scan-assembler-times {vsetvli\s+zero,\s*[a-x0-9]+,\s*e8,\s*m1,\s*tu,\s*m[au]\s+vwadd\.wx\s+v[0-9]+,\s*v[0-9]+,\s*[a-x0-9]+,\s*v0.t} 1 } } */
+/* { dg-final { scan-assembler-times {vsetvli\s+zero,\s*[a-x0-9]+,\s*e8,\s*m2,\s*tu,\s*m[au]\s+vwadd\.wx\s+v[0-9]+,\s*v[0-9]+,\s*[a-x0-9]+,\s*v0.t} 1 } } */
+/* { dg-final { scan-assembler-times {vsetvli\s+zero,\s*[a-x0-9]+,\s*e8,\s*m4,\s*tu,\s*m[au]\s+vwadd\.wx\s+v[0-9]+,\s*v[0-9]+,\s*[a-x0-9]+,\s*v0.t} 1 } } */
+/* { dg-final { scan-assembler-times {vsetvli\s+zero,\s*[a-x0-9]+,\s*e16,\s*mf4,\s*tu,\s*m[au]\s+vwadd\.wx\s+v[0-9]+,\s*v[0-9]+,\s*[a-x0-9]+,\s*v0.t} 1 } } */
+/* { dg-final { scan-assembler-times {vsetvli\s+zero,\s*[a-x0-9]+,\s*e16,\s*mf2,\s*tu,\s*m[au]\s+vwadd\.wx\s+v[0-9]+,\s*v[0-9]+,\s*[a-x0-9]+,\s*v0.t} 1 } } */
+/* { dg-final { scan-assembler-times {vsetvli\s+zero,\s*[a-x0-9]+,\s*e16,\s*m1,\s*tu,\s*m[au]\s+vwadd\.wx\s+v[0-9]+,\s*v[0-9]+,\s*[a-x0-9]+,\s*v0.t} 1 } } */
+/* { dg-final { scan-assembler-times {vsetvli\s+zero,\s*[a-x0-9]+,\s*e16,\s*m2,\s*tu,\s*m[au]\s+vwadd\.wx\s+v[0-9]+,\s*v[0-9]+,\s*[a-x0-9]+,\s*v0.t} 1 } } */
+/* { dg-final { scan-assembler-times {vsetvli\s+zero,\s*[a-x0-9]+,\s*e16,\s*m4,\s*tu,\s*m[au]\s+vwadd\.wx\s+v[0-9]+,\s*v[0-9]+,\s*[a-x0-9]+,\s*v0.t} 1 } } */
+/* { dg-final { scan-assembler-times {vsetvli\s+zero,\s*[a-x0-9]+,\s*e32,\s*mf2,\s*tu,\s*m[au]\s+vwadd\.wx\s+v[0-9]+,\s*v[0-9]+,\s*[a-x0-9]+,\s*v0.t} 1 } } */
+/* { dg-final { scan-assembler-times {vsetvli\s+zero,\s*[a-x0-9]+,\s*e32,\s*m1,\s*tu,\s*m[au]\s+vwadd\.wx\s+v[0-9]+,\s*v[0-9]+,\s*[a-x0-9]+,\s*v0.t} 1 } } */
+/* { dg-final { scan-assembler-times {vsetvli\s+zero,\s*[a-x0-9]+,\s*e32,\s*m2,\s*tu,\s*m[au]\s+vwadd\.wx\s+v[0-9]+,\s*v[0-9]+,\s*[a-x0-9]+,\s*v0.t} 1 } } */
+/* { dg-final { scan-assembler-times {vsetvli\s+zero,\s*[a-x0-9]+,\s*e32,\s*m4,\s*tu,\s*m[au]\s+vwadd\.wx\s+v[0-9]+,\s*v[0-9]+,\s*[a-x0-9]+,\s*v0.t} 1 } } */
diff --git a/gcc/testsuite/gcc.target/riscv/rvv/base/vwadd_wx_tum-2.c b/gcc/testsuite/gcc.target/riscv/rvv/base/vwadd_wx_tum-2.c
new file mode 100644
index 00000000000..3f5378cea8c
--- /dev/null
+++ b/gcc/testsuite/gcc.target/riscv/rvv/base/vwadd_wx_tum-2.c
@@ -0,0 +1,111 @@
+/* { dg-do compile } */
+/* { dg-options "-march=rv32gcv -mabi=ilp32 -O3 -fno-schedule-insns -fno-schedule-insns2" } */
+
+#include "riscv_vector.h"
+
+vint16mf4_t test___riscv_vwadd_wx_i16mf4_tum(vbool64_t mask,vint16mf4_t merge,vint16mf4_t op1,int8_t op2,size_t vl)
+{
+    return __riscv_vwadd_wx_i16mf4_tum(mask,merge,op1,0xAA,31);
+}
+
+
+vint16mf2_t test___riscv_vwadd_wx_i16mf2_tum(vbool32_t mask,vint16mf2_t merge,vint16mf2_t op1,int8_t op2,size_t vl)
+{
+    return __riscv_vwadd_wx_i16mf2_tum(mask,merge,op1,0xAA,31);
+}
+
+
+vint16m1_t test___riscv_vwadd_wx_i16m1_tum(vbool16_t mask,vint16m1_t merge,vint16m1_t op1,int8_t op2,size_t vl)
+{
+    return __riscv_vwadd_wx_i16m1_tum(mask,merge,op1,0xAA,31);
+}
+
+
+vint16m2_t test___riscv_vwadd_wx_i16m2_tum(vbool8_t mask,vint16m2_t merge,vint16m2_t op1,int8_t op2,size_t vl)
+{
+    return __riscv_vwadd_wx_i16m2_tum(mask,merge,op1,0xAA,31);
+}
+
+
+vint16m4_t test___riscv_vwadd_wx_i16m4_tum(vbool4_t mask,vint16m4_t merge,vint16m4_t op1,int8_t op2,size_t vl)
+{
+    return __riscv_vwadd_wx_i16m4_tum(mask,merge,op1,0xAA,31);
+}
+
+
+vint16m8_t test___riscv_vwadd_wx_i16m8_tum(vbool2_t mask,vint16m8_t merge,vint16m8_t op1,int8_t op2,size_t vl)
+{
+    return __riscv_vwadd_wx_i16m8_tum(mask,merge,op1,0xAA,31);
+}
+
+
+vint32mf2_t test___riscv_vwadd_wx_i32mf2_tum(vbool64_t mask,vint32mf2_t merge,vint32mf2_t op1,int16_t op2,size_t vl)
+{
+    return __riscv_vwadd_wx_i32mf2_tum(mask,merge,op1,0xAA,31);
+}
+
+
+vint32m1_t test___riscv_vwadd_wx_i32m1_tum(vbool32_t mask,vint32m1_t merge,vint32m1_t op1,int16_t op2,size_t vl)
+{
+    return __riscv_vwadd_wx_i32m1_tum(mask,merge,op1,0xAA,31);
+}
+
+
+vint32m2_t test___riscv_vwadd_wx_i32m2_tum(vbool16_t mask,vint32m2_t merge,vint32m2_t op1,int16_t op2,size_t vl)
+{
+    return __riscv_vwadd_wx_i32m2_tum(mask,merge,op1,0xAA,31);
+}
+
+
+vint32m4_t test___riscv_vwadd_wx_i32m4_tum(vbool8_t mask,vint32m4_t merge,vint32m4_t op1,int16_t op2,size_t vl)
+{
+    return __riscv_vwadd_wx_i32m4_tum(mask,merge,op1,0xAA,31);
+}
+
+
+vint32m8_t test___riscv_vwadd_wx_i32m8_tum(vbool4_t mask,vint32m8_t merge,vint32m8_t op1,int16_t op2,size_t vl)
+{
+    return __riscv_vwadd_wx_i32m8_tum(mask,merge,op1,0xAA,31);
+}
+
+
+vint64m1_t test___riscv_vwadd_wx_i64m1_tum(vbool64_t mask,vint64m1_t merge,vint64m1_t op1,int32_t op2,size_t vl)
+{
+    return __riscv_vwadd_wx_i64m1_tum(mask,merge,op1,0xAA,31);
+}
+
+
+vint64m2_t test___riscv_vwadd_wx_i64m2_tum(vbool32_t mask,vint64m2_t merge,vint64m2_t op1,int32_t op2,size_t vl)
+{
+    return __riscv_vwadd_wx_i64m2_tum(mask,merge,op1,0xAA,31);
+}
+
+
+vint64m4_t test___riscv_vwadd_wx_i64m4_tum(vbool16_t mask,vint64m4_t merge,vint64m4_t op1,int32_t op2,size_t vl)
+{
+    return __riscv_vwadd_wx_i64m4_tum(mask,merge,op1,0xAA,31);
+}
+
+
+vint64m8_t test___riscv_vwadd_wx_i64m8_tum(vbool8_t mask,vint64m8_t merge,vint64m8_t op1,int32_t op2,size_t vl)
+{
+    return __riscv_vwadd_wx_i64m8_tum(mask,merge,op1,0xAA,31);
+}
+
+
+
+/* { dg-final { scan-assembler-times {vsetivli\s+zero,\s*31,\s*e8,\s*mf8,\s*tu,\s*m[au]\s+vwadd\.wx\s+v[0-9]+,\s*v[0-9]+,\s*[a-x0-9]+,\s*v0.t} 1 } } */
+/* { dg-final { scan-assembler-times {vsetivli\s+zero,\s*31,\s*e8,\s*mf4,\s*tu,\s*m[au]\s+vwadd\.wx\s+v[0-9]+,\s*v[0-9]+,\s*[a-x0-9]+,\s*v0.t} 1 } } */
+/* { dg-final { scan-assembler-times {vsetivli\s+zero,\s*31,\s*e8,\s*mf2,\s*tu,\s*m[au]\s+vwadd\.wx\s+v[0-9]+,\s*v[0-9]+,\s*[a-x0-9]+,\s*v0.t} 1 } } */
+/* { dg-final { scan-assembler-times {vsetivli\s+zero,\s*31,\s*e8,\s*m1,\s*tu,\s*m[au]\s+vwadd\.wx\s+v[0-9]+,\s*v[0-9]+,\s*[a-x0-9]+,\s*v0.t} 1 } } */
+/* { dg-final { scan-assembler-times {vsetivli\s+zero,\s*31,\s*e8,\s*m2,\s*tu,\s*m[au]\s+vwadd\.wx\s+v[0-9]+,\s*v[0-9]+,\s*[a-x0-9]+,\s*v0.t} 1 } } */
+/* { dg-final { scan-assembler-times {vsetivli\s+zero,\s*31,\s*e8,\s*m4,\s*tu,\s*m[au]\s+vwadd\.wx\s+v[0-9]+,\s*v[0-9]+,\s*[a-x0-9]+,\s*v0.t} 1 } } */
+/* { dg-final { scan-assembler-times {vsetivli\s+zero,\s*31,\s*e16,\s*mf4,\s*tu,\s*m[au]\s+vwadd\.wx\s+v[0-9]+,\s*v[0-9]+,\s*[a-x0-9]+,\s*v0.t} 1 } } */
+/* { dg-final { scan-assembler-times {vsetivli\s+zero,\s*31,\s*e16,\s*mf2,\s*tu,\s*m[au]\s+vwadd\.wx\s+v[0-9]+,\s*v[0-9]+,\s*[a-x0-9]+,\s*v0.t} 1 } } */
+/* { dg-final { scan-assembler-times {vsetivli\s+zero,\s*31,\s*e16,\s*m1,\s*tu,\s*m[au]\s+vwadd\.wx\s+v[0-9]+,\s*v[0-9]+,\s*[a-x0-9]+,\s*v0.t} 1 } } */
+/* { dg-final { scan-assembler-times {vsetivli\s+zero,\s*31,\s*e16,\s*m2,\s*tu,\s*m[au]\s+vwadd\.wx\s+v[0-9]+,\s*v[0-9]+,\s*[a-x0-9]+,\s*v0.t} 1 } } */
+/* { dg-final { scan-assembler-times {vsetivli\s+zero,\s*31,\s*e16,\s*m4,\s*tu,\s*m[au]\s+vwadd\.wx\s+v[0-9]+,\s*v[0-9]+,\s*[a-x0-9]+,\s*v0.t} 1 } } */
+/* { dg-final { scan-assembler-times {vsetivli\s+zero,\s*31,\s*e32,\s*mf2,\s*tu,\s*m[au]\s+vwadd\.wx\s+v[0-9]+,\s*v[0-9]+,\s*[a-x0-9]+,\s*v0.t} 1 } } */
+/* { dg-final { scan-assembler-times {vsetivli\s+zero,\s*31,\s*e32,\s*m1,\s*tu,\s*m[au]\s+vwadd\.wx\s+v[0-9]+,\s*v[0-9]+,\s*[a-x0-9]+,\s*v0.t} 1 } } */
+/* { dg-final { scan-assembler-times {vsetivli\s+zero,\s*31,\s*e32,\s*m2,\s*tu,\s*m[au]\s+vwadd\.wx\s+v[0-9]+,\s*v[0-9]+,\s*[a-x0-9]+,\s*v0.t} 1 } } */
+/* { dg-final { scan-assembler-times {vsetivli\s+zero,\s*31,\s*e32,\s*m4,\s*tu,\s*m[au]\s+vwadd\.wx\s+v[0-9]+,\s*v[0-9]+,\s*[a-x0-9]+,\s*v0.t} 1 } } */
diff --git a/gcc/testsuite/gcc.target/riscv/rvv/base/vwadd_wx_tum-3.c b/gcc/testsuite/gcc.target/riscv/rvv/base/vwadd_wx_tum-3.c
new file mode 100644
index 00000000000..6998b8179b9
--- /dev/null
+++ b/gcc/testsuite/gcc.target/riscv/rvv/base/vwadd_wx_tum-3.c
@@ -0,0 +1,111 @@
+/* { dg-do compile } */
+/* { dg-options "-march=rv32gcv -mabi=ilp32 -O3 -fno-schedule-insns -fno-schedule-insns2" } */
+
+#include "riscv_vector.h"
+
+vint16mf4_t test___riscv_vwadd_wx_i16mf4_tum(vbool64_t mask,vint16mf4_t merge,vint16mf4_t op1,int8_t op2,size_t vl)
+{
+    return __riscv_vwadd_wx_i16mf4_tum(mask,merge,op1,0xAA,32);
+}
+
+
+vint16mf2_t test___riscv_vwadd_wx_i16mf2_tum(vbool32_t mask,vint16mf2_t merge,vint16mf2_t op1,int8_t op2,size_t vl)
+{
+    return __riscv_vwadd_wx_i16mf2_tum(mask,merge,op1,0xAA,32);
+}
+
+
+vint16m1_t test___riscv_vwadd_wx_i16m1_tum(vbool16_t mask,vint16m1_t merge,vint16m1_t op1,int8_t op2,size_t vl)
+{
+    return __riscv_vwadd_wx_i16m1_tum(mask,merge,op1,0xAA,32);
+}
+
+
+vint16m2_t test___riscv_vwadd_wx_i16m2_tum(vbool8_t mask,vint16m2_t merge,vint16m2_t op1,int8_t op2,size_t vl)
+{
+    return __riscv_vwadd_wx_i16m2_tum(mask,merge,op1,0xAA,32);
+}
+
+
+vint16m4_t test___riscv_vwadd_wx_i16m4_tum(vbool4_t mask,vint16m4_t merge,vint16m4_t op1,int8_t op2,size_t vl)
+{
+    return __riscv_vwadd_wx_i16m4_tum(mask,merge,op1,0xAA,32);
+}
+
+
+vint16m8_t test___riscv_vwadd_wx_i16m8_tum(vbool2_t mask,vint16m8_t merge,vint16m8_t op1,int8_t op2,size_t vl)
+{
+    return __riscv_vwadd_wx_i16m8_tum(mask,merge,op1,0xAA,32);
+}
+
+
+vint32mf2_t test___riscv_vwadd_wx_i32mf2_tum(vbool64_t mask,vint32mf2_t merge,vint32mf2_t op1,int16_t op2,size_t vl)
+{
+    return __riscv_vwadd_wx_i32mf2_tum(mask,merge,op1,0xAA,32);
+}
+
+
+vint32m1_t test___riscv_vwadd_wx_i32m1_tum(vbool32_t mask,vint32m1_t merge,vint32m1_t op1,int16_t op2,size_t vl)
+{
+    return __riscv_vwadd_wx_i32m1_tum(mask,merge,op1,0xAA,32);
+}
+
+
+vint32m2_t test___riscv_vwadd_wx_i32m2_tum(vbool16_t mask,vint32m2_t merge,vint32m2_t op1,int16_t op2,size_t vl)
+{
+    return __riscv_vwadd_wx_i32m2_tum(mask,merge,op1,0xAA,32);
+}
+
+
+vint32m4_t test___riscv_vwadd_wx_i32m4_tum(vbool8_t mask,vint32m4_t merge,vint32m4_t op1,int16_t op2,size_t vl)
+{
+    return __riscv_vwadd_wx_i32m4_tum(mask,merge,op1,0xAA,32);
+}
+
+
+vint32m8_t test___riscv_vwadd_wx_i32m8_tum(vbool4_t mask,vint32m8_t merge,vint32m8_t op1,int16_t op2,size_t vl)
+{
+    return __riscv_vwadd_wx_i32m8_tum(mask,merge,op1,0xAA,32);
+}
+
+
+vint64m1_t test___riscv_vwadd_wx_i64m1_tum(vbool64_t mask,vint64m1_t merge,vint64m1_t op1,int32_t op2,size_t vl)
+{
+    return __riscv_vwadd_wx_i64m1_tum(mask,merge,op1,0xAA,32);
+}
+
+
+vint64m2_t test___riscv_vwadd_wx_i64m2_tum(vbool32_t mask,vint64m2_t merge,vint64m2_t op1,int32_t op2,size_t vl)
+{
+    return __riscv_vwadd_wx_i64m2_tum(mask,merge,op1,0xAA,32);
+}
+
+
+vint64m4_t test___riscv_vwadd_wx_i64m4_tum(vbool16_t mask,vint64m4_t merge,vint64m4_t op1,int32_t op2,size_t vl)
+{
+    return __riscv_vwadd_wx_i64m4_tum(mask,merge,op1,0xAA,32);
+}
+
+
+vint64m8_t test___riscv_vwadd_wx_i64m8_tum(vbool8_t mask,vint64m8_t merge,vint64m8_t op1,int32_t op2,size_t vl)
+{
+    return __riscv_vwadd_wx_i64m8_tum(mask,merge,op1,0xAA,32);
+}
+
+
+
+/* { dg-final { scan-assembler-times {vsetvli\s+zero,\s*[a-x0-9]+,\s*e8,\s*mf8,\s*tu,\s*m[au]\s+vwadd\.wx\s+v[0-9]+,\s*v[0-9]+,\s*[a-x0-9]+,\s*v0.t} 1 } } */
+/* { dg-final { scan-assembler-times {vsetvli\s+zero,\s*[a-x0-9]+,\s*e8,\s*mf4,\s*tu,\s*m[au]\s+vwadd\.wx\s+v[0-9]+,\s*v[0-9]+,\s*[a-x0-9]+,\s*v0.t} 1 } } */
+/* { dg-final { scan-assembler-times {vsetvli\s+zero,\s*[a-x0-9]+,\s*e8,\s*mf2,\s*tu,\s*m[au]\s+vwadd\.wx\s+v[0-9]+,\s*v[0-9]+,\s*[a-x0-9]+,\s*v0.t} 1 } } */
+/* { dg-final { scan-assembler-times {vsetvli\s+zero,\s*[a-x0-9]+,\s*e8,\s*m1,\s*tu,\s*m[au]\s+vwadd\.wx\s+v[0-9]+,\s*v[0-9]+,\s*[a-x0-9]+,\s*v0.t} 1 } } */
+/* { dg-final { scan-assembler-times {vsetvli\s+zero,\s*[a-x0-9]+,\s*e8,\s*m2,\s*tu,\s*m[au]\s+vwadd\.wx\s+v[0-9]+,\s*v[0-9]+,\s*[a-x0-9]+,\s*v0.t} 1 } } */
+/* { dg-final { scan-assembler-times {vsetvli\s+zero,\s*[a-x0-9]+,\s*e8,\s*m4,\s*tu,\s*m[au]\s+vwadd\.wx\s+v[0-9]+,\s*v[0-9]+,\s*[a-x0-9]+,\s*v0.t} 1 } } */
+/* { dg-final { scan-assembler-times {vsetvli\s+zero,\s*[a-x0-9]+,\s*e16,\s*mf4,\s*tu,\s*m[au]\s+vwadd\.wx\s+v[0-9]+,\s*v[0-9]+,\s*[a-x0-9]+,\s*v0.t} 1 } } */
+/* { dg-final { scan-assembler-times {vsetvli\s+zero,\s*[a-x0-9]+,\s*e16,\s*mf2,\s*tu,\s*m[au]\s+vwadd\.wx\s+v[0-9]+,\s*v[0-9]+,\s*[a-x0-9]+,\s*v0.t} 1 } } */
+/* { dg-final { scan-assembler-times {vsetvli\s+zero,\s*[a-x0-9]+,\s*e16,\s*m1,\s*tu,\s*m[au]\s+vwadd\.wx\s+v[0-9]+,\s*v[0-9]+,\s*[a-x0-9]+,\s*v0.t} 1 } } */
+/* { dg-final { scan-assembler-times {vsetvli\s+zero,\s*[a-x0-9]+,\s*e16,\s*m2,\s*tu,\s*m[au]\s+vwadd\.wx\s+v[0-9]+,\s*v[0-9]+,\s*[a-x0-9]+,\s*v0.t} 1 } } */
+/* { dg-final { scan-assembler-times {vsetvli\s+zero,\s*[a-x0-9]+,\s*e16,\s*m4,\s*tu,\s*m[au]\s+vwadd\.wx\s+v[0-9]+,\s*v[0-9]+,\s*[a-x0-9]+,\s*v0.t} 1 } } */
+/* { dg-final { scan-assembler-times {vsetvli\s+zero,\s*[a-x0-9]+,\s*e32,\s*mf2,\s*tu,\s*m[au]\s+vwadd\.wx\s+v[0-9]+,\s*v[0-9]+,\s*[a-x0-9]+,\s*v0.t} 1 } } */
+/* { dg-final { scan-assembler-times {vsetvli\s+zero,\s*[a-x0-9]+,\s*e32,\s*m1,\s*tu,\s*m[au]\s+vwadd\.wx\s+v[0-9]+,\s*v[0-9]+,\s*[a-x0-9]+,\s*v0.t} 1 } } */
+/* { dg-final { scan-assembler-times {vsetvli\s+zero,\s*[a-x0-9]+,\s*e32,\s*m2,\s*tu,\s*m[au]\s+vwadd\.wx\s+v[0-9]+,\s*v[0-9]+,\s*[a-x0-9]+,\s*v0.t} 1 } } */
+/* { dg-final { scan-assembler-times {vsetvli\s+zero,\s*[a-x0-9]+,\s*e32,\s*m4,\s*tu,\s*m[au]\s+vwadd\.wx\s+v[0-9]+,\s*v[0-9]+,\s*[a-x0-9]+,\s*v0.t} 1 } } */
diff --git a/gcc/testsuite/gcc.target/riscv/rvv/base/vwadd_wx_tumu-1.c b/gcc/testsuite/gcc.target/riscv/rvv/base/vwadd_wx_tumu-1.c
new file mode 100644
index 00000000000..d7993a490fd
--- /dev/null
+++ b/gcc/testsuite/gcc.target/riscv/rvv/base/vwadd_wx_tumu-1.c
@@ -0,0 +1,111 @@
+/* { dg-do compile } */
+/* { dg-options "-march=rv32gcv -mabi=ilp32 -O3 -fno-schedule-insns -fno-schedule-insns2" } */
+
+#include "riscv_vector.h"
+
+vint16mf4_t test___riscv_vwadd_wx_i16mf4_tumu(vbool64_t mask,vint16mf4_t merge,vint16mf4_t op1,int8_t op2,size_t vl)
+{
+    return __riscv_vwadd_wx_i16mf4_tumu(mask,merge,op1,0xAA,vl);
+}
+
+
+vint16mf2_t test___riscv_vwadd_wx_i16mf2_tumu(vbool32_t mask,vint16mf2_t merge,vint16mf2_t op1,int8_t op2,size_t vl)
+{
+    return __riscv_vwadd_wx_i16mf2_tumu(mask,merge,op1,0xAA,vl);
+}
+
+
+vint16m1_t test___riscv_vwadd_wx_i16m1_tumu(vbool16_t mask,vint16m1_t merge,vint16m1_t op1,int8_t op2,size_t vl)
+{
+    return __riscv_vwadd_wx_i16m1_tumu(mask,merge,op1,0xAA,vl);
+}
+
+
+vint16m2_t test___riscv_vwadd_wx_i16m2_tumu(vbool8_t mask,vint16m2_t merge,vint16m2_t op1,int8_t op2,size_t vl)
+{
+    return __riscv_vwadd_wx_i16m2_tumu(mask,merge,op1,0xAA,vl);
+}
+
+
+vint16m4_t test___riscv_vwadd_wx_i16m4_tumu(vbool4_t mask,vint16m4_t merge,vint16m4_t op1,int8_t op2,size_t vl)
+{
+    return __riscv_vwadd_wx_i16m4_tumu(mask,merge,op1,0xAA,vl);
+}
+
+
+vint16m8_t test___riscv_vwadd_wx_i16m8_tumu(vbool2_t mask,vint16m8_t merge,vint16m8_t op1,int8_t op2,size_t vl)
+{
+    return __riscv_vwadd_wx_i16m8_tumu(mask,merge,op1,0xAA,vl);
+}
+
+
+vint32mf2_t test___riscv_vwadd_wx_i32mf2_tumu(vbool64_t mask,vint32mf2_t merge,vint32mf2_t op1,int16_t op2,size_t vl)
+{
+    return __riscv_vwadd_wx_i32mf2_tumu(mask,merge,op1,0xAA,vl);
+}
+
+
+vint32m1_t test___riscv_vwadd_wx_i32m1_tumu(vbool32_t mask,vint32m1_t merge,vint32m1_t op1,int16_t op2,size_t vl)
+{
+    return __riscv_vwadd_wx_i32m1_tumu(mask,merge,op1,0xAA,vl);
+}
+
+
+vint32m2_t test___riscv_vwadd_wx_i32m2_tumu(vbool16_t mask,vint32m2_t merge,vint32m2_t op1,int16_t op2,size_t vl)
+{
+    return __riscv_vwadd_wx_i32m2_tumu(mask,merge,op1,0xAA,vl);
+}
+
+
+vint32m4_t test___riscv_vwadd_wx_i32m4_tumu(vbool8_t mask,vint32m4_t merge,vint32m4_t op1,int16_t op2,size_t vl)
+{
+    return __riscv_vwadd_wx_i32m4_tumu(mask,merge,op1,0xAA,vl);
+}
+
+
+vint32m8_t test___riscv_vwadd_wx_i32m8_tumu(vbool4_t mask,vint32m8_t merge,vint32m8_t op1,int16_t op2,size_t vl)
+{
+    return __riscv_vwadd_wx_i32m8_tumu(mask,merge,op1,0xAA,vl);
+}
+
+
+vint64m1_t test___riscv_vwadd_wx_i64m1_tumu(vbool64_t mask,vint64m1_t merge,vint64m1_t op1,int32_t op2,size_t vl)
+{
+    return __riscv_vwadd_wx_i64m1_tumu(mask,merge,op1,0xAA,vl);
+}
+
+
+vint64m2_t test___riscv_vwadd_wx_i64m2_tumu(vbool32_t mask,vint64m2_t merge,vint64m2_t op1,int32_t op2,size_t vl)
+{
+    return __riscv_vwadd_wx_i64m2_tumu(mask,merge,op1,0xAA,vl);
+}
+
+
+vint64m4_t test___riscv_vwadd_wx_i64m4_tumu(vbool16_t mask,vint64m4_t merge,vint64m4_t op1,int32_t op2,size_t vl)
+{
+    return __riscv_vwadd_wx_i64m4_tumu(mask,merge,op1,0xAA,vl);
+}
+
+
+vint64m8_t test___riscv_vwadd_wx_i64m8_tumu(vbool8_t mask,vint64m8_t merge,vint64m8_t op1,int32_t op2,size_t vl)
+{
+    return __riscv_vwadd_wx_i64m8_tumu(mask,merge,op1,0xAA,vl);
+}
+
+
+
+/* { dg-final { scan-assembler-times {vsetvli\s+zero,\s*[a-x0-9]+,\s*e8,\s*mf8,\s*tu,\s*mu\s+vwadd\.wx\s+v[0-9]+,\s*v[0-9]+,\s*[a-x0-9]+,\s*v0.t} 1 } } */
+/* { dg-final { scan-assembler-times {vsetvli\s+zero,\s*[a-x0-9]+,\s*e8,\s*mf4,\s*tu,\s*mu\s+vwadd\.wx\s+v[0-9]+,\s*v[0-9]+,\s*[a-x0-9]+,\s*v0.t} 1 } } */
+/* { dg-final { scan-assembler-times {vsetvli\s+zero,\s*[a-x0-9]+,\s*e8,\s*mf2,\s*tu,\s*mu\s+vwadd\.wx\s+v[0-9]+,\s*v[0-9]+,\s*[a-x0-9]+,\s*v0.t} 1 } } */
+/* { dg-final { scan-assembler-times {vsetvli\s+zero,\s*[a-x0-9]+,\s*e8,\s*m1,\s*tu,\s*mu\s+vwadd\.wx\s+v[0-9]+,\s*v[0-9]+,\s*[a-x0-9]+,\s*v0.t} 1 } } */
+/* { dg-final { scan-assembler-times {vsetvli\s+zero,\s*[a-x0-9]+,\s*e8,\s*m2,\s*tu,\s*mu\s+vwadd\.wx\s+v[0-9]+,\s*v[0-9]+,\s*[a-x0-9]+,\s*v0.t} 1 } } */
+/* { dg-final { scan-assembler-times {vsetvli\s+zero,\s*[a-x0-9]+,\s*e8,\s*m4,\s*tu,\s*mu\s+vwadd\.wx\s+v[0-9]+,\s*v[0-9]+,\s*[a-x0-9]+,\s*v0.t} 1 } } */
+/* { dg-final { scan-assembler-times {vsetvli\s+zero,\s*[a-x0-9]+,\s*e16,\s*mf4,\s*tu,\s*mu\s+vwadd\.wx\s+v[0-9]+,\s*v[0-9]+,\s*[a-x0-9]+,\s*v0.t} 1 } } */
+/* { dg-final { scan-assembler-times {vsetvli\s+zero,\s*[a-x0-9]+,\s*e16,\s*mf2,\s*tu,\s*mu\s+vwadd\.wx\s+v[0-9]+,\s*v[0-9]+,\s*[a-x0-9]+,\s*v0.t} 1 } } */
+/* { dg-final { scan-assembler-times {vsetvli\s+zero,\s*[a-x0-9]+,\s*e16,\s*m1,\s*tu,\s*mu\s+vwadd\.wx\s+v[0-9]+,\s*v[0-9]+,\s*[a-x0-9]+,\s*v0.t} 1 } } */
+/* { dg-final { scan-assembler-times {vsetvli\s+zero,\s*[a-x0-9]+,\s*e16,\s*m2,\s*tu,\s*mu\s+vwadd\.wx\s+v[0-9]+,\s*v[0-9]+,\s*[a-x0-9]+,\s*v0.t} 1 } } */
+/* { dg-final { scan-assembler-times {vsetvli\s+zero,\s*[a-x0-9]+,\s*e16,\s*m4,\s*tu,\s*mu\s+vwadd\.wx\s+v[0-9]+,\s*v[0-9]+,\s*[a-x0-9]+,\s*v0.t} 1 } } */
+/* { dg-final { scan-assembler-times {vsetvli\s+zero,\s*[a-x0-9]+,\s*e32,\s*mf2,\s*tu,\s*mu\s+vwadd\.wx\s+v[0-9]+,\s*v[0-9]+,\s*[a-x0-9]+,\s*v0.t} 1 } } */
+/* { dg-final { scan-assembler-times {vsetvli\s+zero,\s*[a-x0-9]+,\s*e32,\s*m1,\s*tu,\s*mu\s+vwadd\.wx\s+v[0-9]+,\s*v[0-9]+,\s*[a-x0-9]+,\s*v0.t} 1 } } */
+/* { dg-final { scan-assembler-times {vsetvli\s+zero,\s*[a-x0-9]+,\s*e32,\s*m2,\s*tu,\s*mu\s+vwadd\.wx\s+v[0-9]+,\s*v[0-9]+,\s*[a-x0-9]+,\s*v0.t} 1 } } */
+/* { dg-final { scan-assembler-times {vsetvli\s+zero,\s*[a-x0-9]+,\s*e32,\s*m4,\s*tu,\s*mu\s+vwadd\.wx\s+v[0-9]+,\s*v[0-9]+,\s*[a-x0-9]+,\s*v0.t} 1 } } */
diff --git a/gcc/testsuite/gcc.target/riscv/rvv/base/vwadd_wx_tumu-2.c b/gcc/testsuite/gcc.target/riscv/rvv/base/vwadd_wx_tumu-2.c
new file mode 100644
index 00000000000..46867b39f1e
--- /dev/null
+++ b/gcc/testsuite/gcc.target/riscv/rvv/base/vwadd_wx_tumu-2.c
@@ -0,0 +1,111 @@
+/* { dg-do compile } */
+/* { dg-options "-march=rv32gcv -mabi=ilp32 -O3 -fno-schedule-insns -fno-schedule-insns2" } */
+
+#include "riscv_vector.h"
+
+vint16mf4_t test___riscv_vwadd_wx_i16mf4_tumu(vbool64_t mask,vint16mf4_t merge,vint16mf4_t op1,int8_t op2,size_t vl)
+{
+    return __riscv_vwadd_wx_i16mf4_tumu(mask,merge,op1,0xAA,31);
+}
+
+
+vint16mf2_t test___riscv_vwadd_wx_i16mf2_tumu(vbool32_t mask,vint16mf2_t merge,vint16mf2_t op1,int8_t op2,size_t vl)
+{
+    return __riscv_vwadd_wx_i16mf2_tumu(mask,merge,op1,0xAA,31);
+}
+
+
+vint16m1_t test___riscv_vwadd_wx_i16m1_tumu(vbool16_t mask,vint16m1_t merge,vint16m1_t op1,int8_t op2,size_t vl)
+{
+    return __riscv_vwadd_wx_i16m1_tumu(mask,merge,op1,0xAA,31);
+}
+
+
+vint16m2_t test___riscv_vwadd_wx_i16m2_tumu(vbool8_t mask,vint16m2_t merge,vint16m2_t op1,int8_t op2,size_t vl)
+{
+    return __riscv_vwadd_wx_i16m2_tumu(mask,merge,op1,0xAA,31);
+}
+
+
+vint16m4_t test___riscv_vwadd_wx_i16m4_tumu(vbool4_t mask,vint16m4_t merge,vint16m4_t op1,int8_t op2,size_t vl)
+{
+    return __riscv_vwadd_wx_i16m4_tumu(mask,merge,op1,0xAA,31);
+}
+
+
+vint16m8_t test___riscv_vwadd_wx_i16m8_tumu(vbool2_t mask,vint16m8_t merge,vint16m8_t op1,int8_t op2,size_t vl)
+{
+    return __riscv_vwadd_wx_i16m8_tumu(mask,merge,op1,0xAA,31);
+}
+
+
+vint32mf2_t test___riscv_vwadd_wx_i32mf2_tumu(vbool64_t mask,vint32mf2_t merge,vint32mf2_t op1,int16_t op2,size_t vl)
+{
+    return __riscv_vwadd_wx_i32mf2_tumu(mask,merge,op1,0xAA,31);
+}
+
+
+vint32m1_t test___riscv_vwadd_wx_i32m1_tumu(vbool32_t mask,vint32m1_t merge,vint32m1_t op1,int16_t op2,size_t vl)
+{
+    return __riscv_vwadd_wx_i32m1_tumu(mask,merge,op1,0xAA,31);
+}
+
+
+vint32m2_t test___riscv_vwadd_wx_i32m2_tumu(vbool16_t mask,vint32m2_t merge,vint32m2_t op1,int16_t op2,size_t vl)
+{
+    return __riscv_vwadd_wx_i32m2_tumu(mask,merge,op1,0xAA,31);
+}
+
+
+vint32m4_t test___riscv_vwadd_wx_i32m4_tumu(vbool8_t mask,vint32m4_t merge,vint32m4_t op1,int16_t op2,size_t vl)
+{
+    return __riscv_vwadd_wx_i32m4_tumu(mask,merge,op1,0xAA,31);
+}
+
+
+vint32m8_t test___riscv_vwadd_wx_i32m8_tumu(vbool4_t mask,vint32m8_t merge,vint32m8_t op1,int16_t op2,size_t vl)
+{
+    return __riscv_vwadd_wx_i32m8_tumu(mask,merge,op1,0xAA,31);
+}
+
+
+vint64m1_t test___riscv_vwadd_wx_i64m1_tumu(vbool64_t mask,vint64m1_t merge,vint64m1_t op1,int32_t op2,size_t vl)
+{
+    return __riscv_vwadd_wx_i64m1_tumu(mask,merge,op1,0xAA,31);
+}
+
+
+vint64m2_t test___riscv_vwadd_wx_i64m2_tumu(vbool32_t mask,vint64m2_t merge,vint64m2_t op1,int32_t op2,size_t vl)
+{
+    return __riscv_vwadd_wx_i64m2_tumu(mask,merge,op1,0xAA,31);
+}
+
+
+vint64m4_t test___riscv_vwadd_wx_i64m4_tumu(vbool16_t mask,vint64m4_t merge,vint64m4_t op1,int32_t op2,size_t vl)
+{
+    return __riscv_vwadd_wx_i64m4_tumu(mask,merge,op1,0xAA,31);
+}
+
+
+vint64m8_t test___riscv_vwadd_wx_i64m8_tumu(vbool8_t mask,vint64m8_t merge,vint64m8_t op1,int32_t op2,size_t vl)
+{
+    return __riscv_vwadd_wx_i64m8_tumu(mask,merge,op1,0xAA,31);
+}
+
+
+
+/* { dg-final { scan-assembler-times {vsetivli\s+zero,\s*31,\s*e8,\s*mf8,\s*tu,\s*mu\s+vwadd\.wx\s+v[0-9]+,\s*v[0-9]+,\s*[a-x0-9]+,\s*v0.t} 1 } } */
+/* { dg-final { scan-assembler-times {vsetivli\s+zero,\s*31,\s*e8,\s*mf4,\s*tu,\s*mu\s+vwadd\.wx\s+v[0-9]+,\s*v[0-9]+,\s*[a-x0-9]+,\s*v0.t} 1 } } */
+/* { dg-final { scan-assembler-times {vsetivli\s+zero,\s*31,\s*e8,\s*mf2,\s*tu,\s*mu\s+vwadd\.wx\s+v[0-9]+,\s*v[0-9]+,\s*[a-x0-9]+,\s*v0.t} 1 } } */
+/* { dg-final { scan-assembler-times {vsetivli\s+zero,\s*31,\s*e8,\s*m1,\s*tu,\s*mu\s+vwadd\.wx\s+v[0-9]+,\s*v[0-9]+,\s*[a-x0-9]+,\s*v0.t} 1 } } */
+/* { dg-final { scan-assembler-times {vsetivli\s+zero,\s*31,\s*e8,\s*m2,\s*tu,\s*mu\s+vwadd\.wx\s+v[0-9]+,\s*v[0-9]+,\s*[a-x0-9]+,\s*v0.t} 1 } } */
+/* { dg-final { scan-assembler-times {vsetivli\s+zero,\s*31,\s*e8,\s*m4,\s*tu,\s*mu\s+vwadd\.wx\s+v[0-9]+,\s*v[0-9]+,\s*[a-x0-9]+,\s*v0.t} 1 } } */
+/* { dg-final { scan-assembler-times {vsetivli\s+zero,\s*31,\s*e16,\s*mf4,\s*tu,\s*mu\s+vwadd\.wx\s+v[0-9]+,\s*v[0-9]+,\s*[a-x0-9]+,\s*v0.t} 1 } } */
+/* { dg-final { scan-assembler-times {vsetivli\s+zero,\s*31,\s*e16,\s*mf2,\s*tu,\s*mu\s+vwadd\.wx\s+v[0-9]+,\s*v[0-9]+,\s*[a-x0-9]+,\s*v0.t} 1 } } */
+/* { dg-final { scan-assembler-times {vsetivli\s+zero,\s*31,\s*e16,\s*m1,\s*tu,\s*mu\s+vwadd\.wx\s+v[0-9]+,\s*v[0-9]+,\s*[a-x0-9]+,\s*v0.t} 1 } } */
+/* { dg-final { scan-assembler-times {vsetivli\s+zero,\s*31,\s*e16,\s*m2,\s*tu,\s*mu\s+vwadd\.wx\s+v[0-9]+,\s*v[0-9]+,\s*[a-x0-9]+,\s*v0.t} 1 } } */
+/* { dg-final { scan-assembler-times {vsetivli\s+zero,\s*31,\s*e16,\s*m4,\s*tu,\s*mu\s+vwadd\.wx\s+v[0-9]+,\s*v[0-9]+,\s*[a-x0-9]+,\s*v0.t} 1 } } */
+/* { dg-final { scan-assembler-times {vsetivli\s+zero,\s*31,\s*e32,\s*mf2,\s*tu,\s*mu\s+vwadd\.wx\s+v[0-9]+,\s*v[0-9]+,\s*[a-x0-9]+,\s*v0.t} 1 } } */
+/* { dg-final { scan-assembler-times {vsetivli\s+zero,\s*31,\s*e32,\s*m1,\s*tu,\s*mu\s+vwadd\.wx\s+v[0-9]+,\s*v[0-9]+,\s*[a-x0-9]+,\s*v0.t} 1 } } */
+/* { dg-final { scan-assembler-times {vsetivli\s+zero,\s*31,\s*e32,\s*m2,\s*tu,\s*mu\s+vwadd\.wx\s+v[0-9]+,\s*v[0-9]+,\s*[a-x0-9]+,\s*v0.t} 1 } } */
+/* { dg-final { scan-assembler-times {vsetivli\s+zero,\s*31,\s*e32,\s*m4,\s*tu,\s*mu\s+vwadd\.wx\s+v[0-9]+,\s*v[0-9]+,\s*[a-x0-9]+,\s*v0.t} 1 } } */
diff --git a/gcc/testsuite/gcc.target/riscv/rvv/base/vwadd_wx_tumu-3.c b/gcc/testsuite/gcc.target/riscv/rvv/base/vwadd_wx_tumu-3.c
new file mode 100644
index 00000000000..57b6945772c
--- /dev/null
+++ b/gcc/testsuite/gcc.target/riscv/rvv/base/vwadd_wx_tumu-3.c
@@ -0,0 +1,111 @@
+/* { dg-do compile } */
+/* { dg-options "-march=rv32gcv -mabi=ilp32 -O3 -fno-schedule-insns -fno-schedule-insns2" } */
+
+#include "riscv_vector.h"
+
+vint16mf4_t test___riscv_vwadd_wx_i16mf4_tumu(vbool64_t mask,vint16mf4_t merge,vint16mf4_t op1,int8_t op2,size_t vl)
+{
+    return __riscv_vwadd_wx_i16mf4_tumu(mask,merge,op1,0xAA,32);
+}
+
+
+vint16mf2_t test___riscv_vwadd_wx_i16mf2_tumu(vbool32_t mask,vint16mf2_t merge,vint16mf2_t op1,int8_t op2,size_t vl)
+{
+    return __riscv_vwadd_wx_i16mf2_tumu(mask,merge,op1,0xAA,32);
+}
+
+
+vint16m1_t test___riscv_vwadd_wx_i16m1_tumu(vbool16_t mask,vint16m1_t merge,vint16m1_t op1,int8_t op2,size_t vl)
+{
+    return __riscv_vwadd_wx_i16m1_tumu(mask,merge,op1,0xAA,32);
+}
+
+
+vint16m2_t test___riscv_vwadd_wx_i16m2_tumu(vbool8_t mask,vint16m2_t merge,vint16m2_t op1,int8_t op2,size_t vl)
+{
+    return __riscv_vwadd_wx_i16m2_tumu(mask,merge,op1,0xAA,32);
+}
+
+
+vint16m4_t test___riscv_vwadd_wx_i16m4_tumu(vbool4_t mask,vint16m4_t merge,vint16m4_t op1,int8_t op2,size_t vl)
+{
+    return __riscv_vwadd_wx_i16m4_tumu(mask,merge,op1,0xAA,32);
+}
+
+
+vint16m8_t test___riscv_vwadd_wx_i16m8_tumu(vbool2_t mask,vint16m8_t merge,vint16m8_t op1,int8_t op2,size_t vl)
+{
+    return __riscv_vwadd_wx_i16m8_tumu(mask,merge,op1,0xAA,32);
+}
+
+
+vint32mf2_t test___riscv_vwadd_wx_i32mf2_tumu(vbool64_t mask,vint32mf2_t merge,vint32mf2_t op1,int16_t op2,size_t vl)
+{
+    return __riscv_vwadd_wx_i32mf2_tumu(mask,merge,op1,0xAA,32);
+}
+
+
+vint32m1_t test___riscv_vwadd_wx_i32m1_tumu(vbool32_t mask,vint32m1_t merge,vint32m1_t op1,int16_t op2,size_t vl)
+{
+    return __riscv_vwadd_wx_i32m1_tumu(mask,merge,op1,0xAA,32);
+}
+
+
+vint32m2_t test___riscv_vwadd_wx_i32m2_tumu(vbool16_t mask,vint32m2_t merge,vint32m2_t op1,int16_t op2,size_t vl)
+{
+    return __riscv_vwadd_wx_i32m2_tumu(mask,merge,op1,0xAA,32);
+}
+
+
+vint32m4_t test___riscv_vwadd_wx_i32m4_tumu(vbool8_t mask,vint32m4_t merge,vint32m4_t op1,int16_t op2,size_t vl)
+{
+    return __riscv_vwadd_wx_i32m4_tumu(mask,merge,op1,0xAA,32);
+}
+
+
+vint32m8_t test___riscv_vwadd_wx_i32m8_tumu(vbool4_t mask,vint32m8_t merge,vint32m8_t op1,int16_t op2,size_t vl)
+{
+    return __riscv_vwadd_wx_i32m8_tumu(mask,merge,op1,0xAA,32);
+}
+
+
+vint64m1_t test___riscv_vwadd_wx_i64m1_tumu(vbool64_t mask,vint64m1_t merge,vint64m1_t op1,int32_t op2,size_t vl)
+{
+    return __riscv_vwadd_wx_i64m1_tumu(mask,merge,op1,0xAA,32);
+}
+
+
+vint64m2_t test___riscv_vwadd_wx_i64m2_tumu(vbool32_t mask,vint64m2_t merge,vint64m2_t op1,int32_t op2,size_t vl)
+{
+    return __riscv_vwadd_wx_i64m2_tumu(mask,merge,op1,0xAA,32);
+}
+
+
+vint64m4_t test___riscv_vwadd_wx_i64m4_tumu(vbool16_t mask,vint64m4_t merge,vint64m4_t op1,int32_t op2,size_t vl)
+{
+    return __riscv_vwadd_wx_i64m4_tumu(mask,merge,op1,0xAA,32);
+}
+
+
+vint64m8_t test___riscv_vwadd_wx_i64m8_tumu(vbool8_t mask,vint64m8_t merge,vint64m8_t op1,int32_t op2,size_t vl)
+{
+    return __riscv_vwadd_wx_i64m8_tumu(mask,merge,op1,0xAA,32);
+}
+
+
+
+/* { dg-final { scan-assembler-times {vsetvli\s+zero,\s*[a-x0-9]+,\s*e8,\s*mf8,\s*tu,\s*mu\s+vwadd\.wx\s+v[0-9]+,\s*v[0-9]+,\s*[a-x0-9]+,\s*v0.t} 1 } } */
+/* { dg-final { scan-assembler-times {vsetvli\s+zero,\s*[a-x0-9]+,\s*e8,\s*mf4,\s*tu,\s*mu\s+vwadd\.wx\s+v[0-9]+,\s*v[0-9]+,\s*[a-x0-9]+,\s*v0.t} 1 } } */
+/* { dg-final { scan-assembler-times {vsetvli\s+zero,\s*[a-x0-9]+,\s*e8,\s*mf2,\s*tu,\s*mu\s+vwadd\.wx\s+v[0-9]+,\s*v[0-9]+,\s*[a-x0-9]+,\s*v0.t} 1 } } */
+/* { dg-final { scan-assembler-times {vsetvli\s+zero,\s*[a-x0-9]+,\s*e8,\s*m1,\s*tu,\s*mu\s+vwadd\.wx\s+v[0-9]+,\s*v[0-9]+,\s*[a-x0-9]+,\s*v0.t} 1 } } */
+/* { dg-final { scan-assembler-times {vsetvli\s+zero,\s*[a-x0-9]+,\s*e8,\s*m2,\s*tu,\s*mu\s+vwadd\.wx\s+v[0-9]+,\s*v[0-9]+,\s*[a-x0-9]+,\s*v0.t} 1 } } */
+/* { dg-final { scan-assembler-times {vsetvli\s+zero,\s*[a-x0-9]+,\s*e8,\s*m4,\s*tu,\s*mu\s+vwadd\.wx\s+v[0-9]+,\s*v[0-9]+,\s*[a-x0-9]+,\s*v0.t} 1 } } */
+/* { dg-final { scan-assembler-times {vsetvli\s+zero,\s*[a-x0-9]+,\s*e16,\s*mf4,\s*tu,\s*mu\s+vwadd\.wx\s+v[0-9]+,\s*v[0-9]+,\s*[a-x0-9]+,\s*v0.t} 1 } } */
+/* { dg-final { scan-assembler-times {vsetvli\s+zero,\s*[a-x0-9]+,\s*e16,\s*mf2,\s*tu,\s*mu\s+vwadd\.wx\s+v[0-9]+,\s*v[0-9]+,\s*[a-x0-9]+,\s*v0.t} 1 } } */
+/* { dg-final { scan-assembler-times {vsetvli\s+zero,\s*[a-x0-9]+,\s*e16,\s*m1,\s*tu,\s*mu\s+vwadd\.wx\s+v[0-9]+,\s*v[0-9]+,\s*[a-x0-9]+,\s*v0.t} 1 } } */
+/* { dg-final { scan-assembler-times {vsetvli\s+zero,\s*[a-x0-9]+,\s*e16,\s*m2,\s*tu,\s*mu\s+vwadd\.wx\s+v[0-9]+,\s*v[0-9]+,\s*[a-x0-9]+,\s*v0.t} 1 } } */
+/* { dg-final { scan-assembler-times {vsetvli\s+zero,\s*[a-x0-9]+,\s*e16,\s*m4,\s*tu,\s*mu\s+vwadd\.wx\s+v[0-9]+,\s*v[0-9]+,\s*[a-x0-9]+,\s*v0.t} 1 } } */
+/* { dg-final { scan-assembler-times {vsetvli\s+zero,\s*[a-x0-9]+,\s*e32,\s*mf2,\s*tu,\s*mu\s+vwadd\.wx\s+v[0-9]+,\s*v[0-9]+,\s*[a-x0-9]+,\s*v0.t} 1 } } */
+/* { dg-final { scan-assembler-times {vsetvli\s+zero,\s*[a-x0-9]+,\s*e32,\s*m1,\s*tu,\s*mu\s+vwadd\.wx\s+v[0-9]+,\s*v[0-9]+,\s*[a-x0-9]+,\s*v0.t} 1 } } */
+/* { dg-final { scan-assembler-times {vsetvli\s+zero,\s*[a-x0-9]+,\s*e32,\s*m2,\s*tu,\s*mu\s+vwadd\.wx\s+v[0-9]+,\s*v[0-9]+,\s*[a-x0-9]+,\s*v0.t} 1 } } */
+/* { dg-final { scan-assembler-times {vsetvli\s+zero,\s*[a-x0-9]+,\s*e32,\s*m4,\s*tu,\s*mu\s+vwadd\.wx\s+v[0-9]+,\s*v[0-9]+,\s*[a-x0-9]+,\s*v0.t} 1 } } */
-- 
2.36.1