@@ -1,3 +1,3 @@
-#name: Test of illegal SVE2.1 TBLQ instruction.
+#name: Test of illegal SVE2.1 tblq, uzpq1 and uzpq2 instruction.
#as: -march=armv9.4-a
#error_output: sve2p1-6-invalid.l
@@ -16,3 +16,27 @@
.*: Info: tblq z0.h, {z31.h}, z0.h
.*: Info: tblq z0.d, {z31.d}, z0.d
.*: Error: expected an SVE vector register at operand 3 -- `tblq z0.b,{z0.b},{z31.b}'
+.*: Error: expected an SVE vector register at operand 2 -- `uzpq1 z0.s,{z0.b},z0.b'
+.*: Error: operand mismatch -- `uzpq1 z31.s,z0.b,z0.h'
+.*: Info: did you mean this\?
+.*: Info: uzpq1 z31.b, z0.b, z0.b
+.*: Info: other valid variant\(s\):
+.*: Info: uzpq1 z31.h, z0.h, z0.h
+.*: Info: uzpq1 z31.s, z0.s, z0.s
+.*: Info: uzpq1 z31.d, z0.d, z0.d
+.*: Error: expected an SVE vector register at operand 2 -- `uzpq1 z0.s,{z0.s,z1.s},z0.s'
+.*: Error: expected an SVE vector register at operand 2 -- `uzpq1 z0.h,{z0.h-z1.h},z0.h'
+.*: Error: expected an SVE vector register at operand 1 -- `uzpq1 {z0.s},z31.s,z0.b'
+.*: Error: expected an SVE vector register at operand 2 -- `uzpq1 z0.b,{z0.b},{z31.b}'
+.*: Error: expected an SVE vector register at operand 2 -- `uzpq2 z0.s,{z0.b},z0.b'
+.*: Error: operand mismatch -- `uzpq2 z31.s,z0.b,z0.h'
+.*: Info: did you mean this\?
+.*: Info: uzpq2 z31.b, z0.b, z0.b
+.*: Info: other valid variant\(s\):
+.*: Info: uzpq2 z31.h, z0.h, z0.h
+.*: Info: uzpq2 z31.s, z0.s, z0.s
+.*: Info: uzpq2 z31.d, z0.d, z0.d
+.*: Error: expected an SVE vector register at operand 2 -- `uzpq2 z0.s,{z0.s,z1.s},z0.s'
+.*: Error: expected an SVE vector register at operand 2 -- `uzpq2 z0.h,{z0.h-z1.h},z0.h'
+.*: Error: expected an SVE vector register at operand 1 -- `uzpq2 {z0.s},z31.s,z0.b'
+.*: Error: expected an SVE vector register at operand 2 -- `uzpq2 z0.b,{z0.b},{z31.b}'
@@ -4,3 +4,15 @@ tblq z0.s, {z0.s, z1.s}, z0.s
tblq z0.s, {z0.s - z1.s}, z0.s
tblq z0.s, {z31.s}, z0.b
tblq z0.b, {z0.b}, {z31.b}
+uzpq1 z0.s, {z0.b}, z0.b
+uzpq1 z31.s, z0.b, z0.h
+uzpq1 z0.s, {z0.s, z1.s}, z0.s
+uzpq1 z0.h, {z0.h - z1.h}, z0.h
+uzpq1 {z0.s}, z31.s, z0.b
+uzpq1 z0.b, {z0.b}, {z31.b}
+uzpq2 z0.s, {z0.b}, z0.b
+uzpq2 z31.s, z0.b, z0.h
+uzpq2 z0.s, {z0.s, z1.s}, z0.s
+uzpq2 z0.h, {z0.h - z1.h}, z0.h
+uzpq2 {z0.s}, z31.s, z0.b
+uzpq2 z0.b, {z0.b}, {z31.b}
@@ -1,4 +1,4 @@
-#name: Test of SVE2.1 TBLQ instruction.
+#name: Test of SVE2.1 tblq, uzpq1 and uzpq2 instruction.
#as: -march=armv9.4-a
#objdump: -dr
@@ -16,3 +16,19 @@
.*: 44dffbff tblq z31.d, {z31.d}, z31.d
.*: 444ff945 tblq z5.h, {z10.h}, z15.h
.*: 4487f861 tblq z1.s, {z3.s}, z7.s
+.*: 4400e800 uzpq1 z0.b, z0.b, z0.b
+.*: 4400e81f uzpq1 z31.b, z0.b, z0.b
+.*: 44c0e800 uzpq1 z0.d, z0.d, z0.d
+.*: 4400ebe0 uzpq1 z0.b, z31.b, z0.b
+.*: 441fe800 uzpq1 z0.b, z0.b, z31.b
+.*: 44dfebff uzpq1 z31.d, z31.d, z31.d
+.*: 448fe945 uzpq1 z5.s, z10.s, z15.s
+.*: 4454e9ea uzpq1 z10.h, z15.h, z20.h
+.*: 4400ec00 uzpq2 z0.b, z0.b, z0.b
+.*: 4400ec1f uzpq2 z31.b, z0.b, z0.b
+.*: 44c0ec00 uzpq2 z0.d, z0.d, z0.d
+.*: 4400efe0 uzpq2 z0.b, z31.b, z0.b
+.*: 441fec00 uzpq2 z0.b, z0.b, z31.b
+.*: 44dfefff uzpq2 z31.d, z31.d, z31.d
+.*: 448fed45 uzpq2 z5.s, z10.s, z15.s
+.*: 4454edea uzpq2 z10.h, z15.h, z20.h
@@ -6,3 +6,21 @@ tblq z0.b, {z0.b}, z31.b
tblq z31.d, {z31.d}, z31.d
tblq z5.h, {z10.h}, z15.h
tblq z1.s, {z3.s}, z7.s
+
+uzpq1 z0.b, z0.b, z0.b
+uzpq1 z31.b, z0.b, z0.b
+uzpq1 z0.d, z0.d, z0.d
+uzpq1 z0.b, z31.b, z0.b
+uzpq1 z0.b, z0.b, z31.b
+uzpq1 z31.d, z31.d, z31.d
+uzpq1 z5.s, z10.s, z15.s
+uzpq1 z10.h, z15.h, z20.h
+
+uzpq2 z0.b, z0.b, z0.b
+uzpq2 z31.b, z0.b, z0.b
+uzpq2 z0.d, z0.d, z0.d
+uzpq2 z0.b, z31.b, z0.b
+uzpq2 z0.b, z0.b, z31.b
+uzpq2 z31.d, z31.d, z31.d
+uzpq2 z5.s, z10.s, z15.s
+uzpq2 z10.h, z15.h, z20.h
@@ -6643,6 +6643,8 @@ const struct aarch64_opcode aarch64_opcode_table[] =
SVE2p1_INSN("orqv",0x041c2000, 0xff3fe000, sve2_urqvs, 0, OP3 (Vd, SVE_Pg3, SVE_Zn), OP_SVE_vUS_BHSD_BHSD, F_OPD_SIZE, 0),
SVE2p1_INSN("tblq",0x4400f800, 0xff20fc00, sve_size_bhsd, 0, OP3 (SVE_Zd, SVE_ZnxN, SVE_Zm_16), OP_SVE_VVV_BHSD, F_OD(1), 0),
SVE2p1_INSNC("extq",0x05602400, 0xfff0fc00, sve_misc, 0, OP4 (SVE_Zd, SVE_Zd, SVE_Zm_5, SVE_UIMM4), OP_SVE_BBBU, 0, C_SCAN_MOVPRFX, 1),
+ SVE2p1_INSN("uzpq1",0x4400e800, 0xff20fc00, sve_size_bhsd, 0, OP3 (SVE_Zd, SVE_Zn, SVE_Zm_16), OP_SVE_VVV_BHSD, 0, 0),
+ SVE2p1_INSN("uzpq2",0x4400ec00, 0xff20fc00, sve_size_bhsd, 0, OP3 (SVE_Zd, SVE_Zn, SVE_Zm_16), OP_SVE_VVV_BHSD, 0, 0),
SVE2p1_INSN("ld1q",0xc400a000, 0xffe0e000, sve_misc, 0, OP3 (SVE_ZtxN, SVE_Pg3, SVE_ADDR_ZX), OP_SVE_QZD, F_OD (1), 0),
SVE2p1_INSN("ld2q",0xa490e000, 0xfff0e000, sve_misc, 0, OP3 (SVE_ZtxN, SVE_Pg3, SVE_ADDR_RI_S4x2xVL), OP_SVE_QZU, F_OD (2), 0),