Index: llvm/lib/Target/AArch64/AArch64SVEInstrInfo.td =================================================================== --- llvm/lib/Target/AArch64/AArch64SVEInstrInfo.td +++ llvm/lib/Target/AArch64/AArch64SVEInstrInfo.td @@ -3748,3 +3748,15 @@ def BFCLAMP_ZZZ : sve2p1_fclamp<"bfclamp", 0b00, ZPR16>; } // End HasSVE2p1_or_HasSME2p1, HasB16B16 + + +//===----------------------------------------------------------------------===// +// SME2.1 or SVE2.1 instructions +//===----------------------------------------------------------------------===// + +let Predicates = [HasSVE2p1_or_HasSME2p1] in { +def PMOV_PZ_B : sve2p1_vector_to_pred_byte<"pmov">; +defm PMOV_PZI : sve2p1_vector_to_pred<"pmov">; +def PMOV_ZP_B : sve2p1_pred_to_vector_byte<"pmov">; +defm PMOV_ZIP : sve2p1_pred_to_vector<"pmov">; +} Index: llvm/lib/Target/AArch64/SVEInstrFormats.td =================================================================== --- llvm/lib/Target/AArch64/SVEInstrFormats.td +++ llvm/lib/Target/AArch64/SVEInstrFormats.td @@ -9283,3 +9283,101 @@ def : InstAlias(NAME) ZPR128:$Zt, PPR3bAny:$Pg, GPR64sp:$Rn, gprsh_ty:$Rm), 0>; } + + +// SVE move predicate from vector +class sve2p1_vector_to_pred opc, bits<2> opc2, string mnemonic, + PPRRegOp ppr_ty, Operand itype> + : I<(outs ppr_ty:$Pd), (ins ZPRAny:$Zn, itype:$index), + mnemonic, "\t$Pd, $Zn$index", + "", []>, Sched<[]> { + bits<4> Pd; + bits<5> Zn; + let Inst{31-24} = 0b00000101; + let Inst{23-22} = opc; + let Inst{21-19} = 0b101; + let Inst{18-17} = opc2; + let Inst{16-10} = 0b0001110; + let Inst{9-5} = Zn; + let Inst{4} = 0b0; + let Inst{3-0} = Pd; +} + +class sve2p1_vector_to_pred_byte + : I<(outs PPR8:$Pd), (ins ZPRAny:$Zn), + mnemonic, "\t$Pd, $Zn", + "", []>, Sched<[]> { + bits<4> Pd; + bits<5> Zn; + let Inst{31-10} = 0b0000010100101010001110; + let Inst{9-5} = Zn; + let Inst{4} = 0b0; + let Inst{3-0} = Pd; +} + +multiclass sve2p1_vector_to_pred { + def _H : sve2p1_vector_to_pred<0b00, {1, ?}, mnemonic, PPR16, VectorIndexD32b> { + bits<1> index; + let Inst{17} = index; + } + def _S : sve2p1_vector_to_pred<0b01, {?, ?}, mnemonic, PPR32, VectorIndexS32b> { + bits<2> index; + let Inst{18-17} = index; + } + def _D : sve2p1_vector_to_pred<{1, ?}, {?, ?}, mnemonic, PPR64, VectorIndexH32b> { + bits<3> index; + let Inst{22} = index{2}; + let Inst{18-17} = index{1-0}; + } +} + + +// SVE move predicate into vector +class sve2p1_pred_to_vector opc, bits<2> opc2, string mnemonic, + PPRRegOp ppr_ty, Operand itype> + : I<(outs ZPRAny:$Zd), (ins ZPRAny:$_Zd, itype:$index, ppr_ty:$Pn), + mnemonic, "\t$Zd$index, $Pn", + "", []>, Sched<[]> { + bits<5> Zd; + bits<4> Pn; + let Inst{31-24} = 0b00000101; + let Inst{23-22} = opc; + let Inst{21-19} = 0b101; + let Inst{18-17} = opc2; + let Inst{16-10} = 0b1001110; + let Inst{9} = 0b0; + let Inst{8-5} = Pn; + let Inst{4-0} = Zd; + + let Constraints = "$Zd = $_Zd"; +} + +class sve2p1_pred_to_vector_byte + : I<(outs ZPRAny:$Zd), (ins ZPRAny:$_Zd, PPR8:$Pn), + mnemonic, "\t$Zd, $Pn", + "", []>, Sched<[]> { + bits<5> Zd; + bits<4> Pn; + let Inst{31-9} = 0b00000101001010110011100; + let Inst{8-5} = Pn; + let Inst{4-0} = Zd; + + let Constraints = "$Zd = $_Zd"; +} + +multiclass sve2p1_pred_to_vector { + def _H : sve2p1_pred_to_vector<0b00, {1, ?}, mnemonic, PPR16, VectorIndexD32b> { + bits<1> index; + let Inst{17} = index; + } + def _S : sve2p1_pred_to_vector<0b01, {?, ?}, mnemonic, PPR32, VectorIndexS32b> { + bits<2> index; + let Inst{18-17} = index; + } + def _D : sve2p1_pred_to_vector<{1, ?}, {?, ?}, mnemonic, PPR64, VectorIndexH32b> { + bits<3> index; + let Inst{22} = index{2}; + let Inst{18-17} = index{1-0}; + } +} + Index: llvm/test/MC/AArch64/SVE2p1/pmov-diagnostics.s =================================================================== --- /dev/null +++ llvm/test/MC/AArch64/SVE2p1/pmov-diagnostics.s @@ -0,0 +1,67 @@ +// RUN: not llvm-mc -triple=aarch64 -show-encoding -mattr=+sve2p1 2>&1 < %s | FileCheck %s + +// --------------------------------------------------------------------------// +// Invalid vector lane indices + +pmov p0.h, z0[2] +// CHECK: [[@LINE-1]]:{{[0-9]+}}: error: vector lane must be an integer in range [0, 1]. +// CHECK-NEXT: pmov p0.h, z0[2] +// CHECK-NOT: [[@LINE-1]]:{{[0-9]+}}: + +pmov p0.h, z0[-1] +// CHECK: [[@LINE-1]]:{{[0-9]+}}: error: vector lane must be an integer in range [0, 1]. +// CHECK-NEXT: pmov p0.h, z0[-1] +// CHECK-NOT: [[@LINE-1]]:{{[0-9]+}}: + +pmov p0.s, z0[4] +// CHECK: [[@LINE-1]]:{{[0-9]+}}: error: vector lane must be an integer in range [0, 3]. +// CHECK-NEXT: pmov p0.s, z0[4] +// CHECK-NOT: [[@LINE-1]]:{{[0-9]+}}: + +pmov p0.s, z0[-1] +// CHECK: [[@LINE-1]]:{{[0-9]+}}: error: vector lane must be an integer in range [0, 3]. +// CHECK-NEXT: pmov p0.s, z0[-1] +// CHECK-NOT: [[@LINE-1]]:{{[0-9]+}}: + +pmov p0.d, z0[8] +// CHECK: [[@LINE-1]]:{{[0-9]+}}: error: vector lane must be an integer in range [0, 7]. +// CHECK-NEXT: pmov p0.d, z0[8] +// CHECK-NOT: [[@LINE-1]]:{{[0-9]+}}: + +pmov p0.d, z0[-1] +// CHECK: [[@LINE-1]]:{{[0-9]+}}: error: vector lane must be an integer in range [0, 7]. +// CHECK-NEXT: pmov p0.d, z0[-1] +// CHECK-NOT: [[@LINE-1]]:{{[0-9]+}}: + + + +pmov z0[2], p0.h +// CHECK: [[@LINE-1]]:{{[0-9]+}}: error: invalid predicate register. +// CHECK-NEXT: pmov z0[2], p0.h +// CHECK-NOT: [[@LINE-1]]:{{[0-9]+}}: + +pmov z0[-1], p0.h +// CHECK: [[@LINE-1]]:{{[0-9]+}}: error: vector lane must be an integer in range [0, 3]. +// CHECK-NEXT: pmov z0[-1], p0.h +// CHECK-NOT: [[@LINE-1]]:{{[0-9]+}}: + +pmov z0[4], p0.s +// CHECK: [[@LINE-1]]:{{[0-9]+}}: error: invalid predicate register. +// CHECK-NEXT: pmov z0[4], p0.s +// CHECK-NOT: [[@LINE-1]]:{{[0-9]+}}: + +pmov z0[-1], p0.s +// CHECK: [[@LINE-1]]:{{[0-9]+}}: error: vector lane must be an integer in range [0, 3]. +// CHECK-NEXT: pmov z0[-1], p0.s +// CHECK-NOT: [[@LINE-1]]:{{[0-9]+}}: + +pmov z0[8], p0.d +// CHECK: [[@LINE-1]]:{{[0-9]+}}: error: vector lane must be an integer in range [0, 3]. +// CHECK-NEXT: pmov z0[8], p0.d +// CHECK-NOT: [[@LINE-1]]:{{[0-9]+}}: + +pmov z0[-1], p0.d +// CHECK: [[@LINE-1]]:{{[0-9]+}}: error: vector lane must be an integer in range [0, 3]. +// CHECK-NEXT: pmov z0[-1], p0.d +// CHECK-NOT: [[@LINE-1]]:{{[0-9]+}}: + Index: llvm/test/MC/AArch64/SVE2p1/pmov.s =================================================================== --- /dev/null +++ llvm/test/MC/AArch64/SVE2p1/pmov.s @@ -0,0 +1,215 @@ +// RUN: llvm-mc -triple=aarch64 -show-encoding -mattr=+sme2p1 < %s \ +// RUN: | FileCheck %s --check-prefixes=CHECK-ENCODING,CHECK-INST +// RUN: llvm-mc -triple=aarch64 -show-encoding -mattr=+sve2p1 < %s \ +// RUN: | FileCheck %s --check-prefixes=CHECK-ENCODING,CHECK-INST +// RUN: not llvm-mc -triple=aarch64 -show-encoding < %s 2>&1 \ +// RUN: | FileCheck %s --check-prefix=CHECK-ERROR +// RUN: llvm-mc -triple=aarch64 -filetype=obj -mattr=+sme2p1 < %s \ +// RUN: | llvm-objdump -d --no-print-imm-hex --mattr=+sme2p1 - | FileCheck %s --check-prefix=CHECK-INST +// RUN: llvm-mc -triple=aarch64 -filetype=obj -mattr=+sme2p1 < %s \ +// RUN: | llvm-objdump -d --mattr=-sme2p1,-sve2p1 - | FileCheck %s --check-prefix=CHECK-UNKNOWN +// RUN: llvm-mc -triple=aarch64 -show-encoding -mattr=+sme2p1 < %s \ +// RUN: | sed '/.text/d' | sed 's/.*encoding: //g' \ +// RUN: | llvm-mc -triple=aarch64 -mattr=+sme2p1 -disassemble -show-encoding \ +// RUN: | FileCheck %s --check-prefixes=CHECK-ENCODING,CHECK-INST + + +pmov p0.h, z0[0] // 00000101-00101100-00111000-00000000 +// CHECK-INST: pmov p0.h, z0[0] +// CHECK-ENCODING: [0x00,0x38,0x2c,0x05] +// CHECK-ERROR: instruction requires: sme2p1 or sve2p1 +// CHECK-UNKNOWN: 052c3800 + +pmov p5.h, z10[0] // 00000101-00101100-00111001-01000101 +// CHECK-INST: pmov p5.h, z10[0] +// CHECK-ENCODING: [0x45,0x39,0x2c,0x05] +// CHECK-ERROR: instruction requires: sme2p1 or sve2p1 +// CHECK-UNKNOWN: 052c3945 + +pmov p7.h, z13[0] // 00000101-00101100-00111001-10100111 +// CHECK-INST: pmov p7.h, z13[0] +// CHECK-ENCODING: [0xa7,0x39,0x2c,0x05] +// CHECK-ERROR: instruction requires: sme2p1 or sve2p1 +// CHECK-UNKNOWN: 052c39a7 + +pmov p15.h, z31[1] // 00000101-00101110-00111011-11101111 +// CHECK-INST: pmov p15.h, z31[1] +// CHECK-ENCODING: [0xef,0x3b,0x2e,0x05] +// CHECK-ERROR: instruction requires: sme2p1 or sve2p1 +// CHECK-UNKNOWN: 052e3bef + + +pmov p0.s, z0[0] // 00000101-01101000-00111000-00000000 +// CHECK-INST: pmov p0.s, z0[0] +// CHECK-ENCODING: [0x00,0x38,0x68,0x05] +// CHECK-ERROR: instruction requires: sme2p1 or sve2p1 +// CHECK-UNKNOWN: 05683800 + +pmov p5.s, z10[2] // 00000101-01101100-00111001-01000101 +// CHECK-INST: pmov p5.s, z10[2] +// CHECK-ENCODING: [0x45,0x39,0x6c,0x05] +// CHECK-ERROR: instruction requires: sme2p1 or sve2p1 +// CHECK-UNKNOWN: 056c3945 + +pmov p7.s, z13[0] // 00000101-01101000-00111001-10100111 +// CHECK-INST: pmov p7.s, z13[0] +// CHECK-ENCODING: [0xa7,0x39,0x68,0x05] +// CHECK-ERROR: instruction requires: sme2p1 or sve2p1 +// CHECK-UNKNOWN: 056839a7 + +pmov p15.s, z31[3] // 00000101-01101110-00111011-11101111 +// CHECK-INST: pmov p15.s, z31[3] +// CHECK-ENCODING: [0xef,0x3b,0x6e,0x05] +// CHECK-ERROR: instruction requires: sme2p1 or sve2p1 +// CHECK-UNKNOWN: 056e3bef + + +pmov p0.d, z0[0] // 00000101-10101000-00111000-00000000 +// CHECK-INST: pmov p0.d, z0[0] +// CHECK-ENCODING: [0x00,0x38,0xa8,0x05] +// CHECK-ERROR: instruction requires: sme2p1 or sve2p1 +// CHECK-UNKNOWN: 05a83800 + +pmov p5.d, z10[6] // 00000101-11101100-00111001-01000101 +// CHECK-INST: pmov p5.d, z10[6] +// CHECK-ENCODING: [0x45,0x39,0xec,0x05] +// CHECK-ERROR: instruction requires: sme2p1 or sve2p1 +// CHECK-UNKNOWN: 05ec3945 + +pmov p7.d, z13[4] // 00000101-11101000-00111001-10100111 +// CHECK-INST: pmov p7.d, z13[4] +// CHECK-ENCODING: [0xa7,0x39,0xe8,0x05] +// CHECK-ERROR: instruction requires: sme2p1 or sve2p1 +// CHECK-UNKNOWN: 05e839a7 + +pmov p15.d, z31[7] // 00000101-11101110-00111011-11101111 +// CHECK-INST: pmov p15.d, z31[7] +// CHECK-ENCODING: [0xef,0x3b,0xee,0x05] +// CHECK-ERROR: instruction requires: sme2p1 or sve2p1 +// CHECK-UNKNOWN: 05ee3bef + + +pmov p0.b, z0 // 00000101-00101010-00111000-00000000 +// CHECK-INST: pmov p0.b, z0 +// CHECK-ENCODING: [0x00,0x38,0x2a,0x05] +// CHECK-ERROR: instruction requires: sme2p1 or sve2p1 +// CHECK-UNKNOWN: 052a3800 + +pmov p5.b, z10 // 00000101-00101010-00111001-01000101 +// CHECK-INST: pmov p5.b, z10 +// CHECK-ENCODING: [0x45,0x39,0x2a,0x05] +// CHECK-ERROR: instruction requires: sme2p1 or sve2p1 +// CHECK-UNKNOWN: 052a3945 + +pmov p7.b, z13 // 00000101-00101010-00111001-10100111 +// CHECK-INST: pmov p7.b, z13 +// CHECK-ENCODING: [0xa7,0x39,0x2a,0x05] +// CHECK-ERROR: instruction requires: sme2p1 or sve2p1 +// CHECK-UNKNOWN: 052a39a7 + +pmov p15.b, z31 // 00000101-00101010-00111011-11101111 +// CHECK-INST: pmov p15.b, z31 +// CHECK-ENCODING: [0xef,0x3b,0x2a,0x05] +// CHECK-ERROR: instruction requires: sme2p1 or sve2p1 +// CHECK-UNKNOWN: 052a3bef + + +pmov z0[0], p0.h // 00000101-00101101-00111000-00000000 +// CHECK-INST: pmov z0[0], p0.h +// CHECK-ENCODING: [0x00,0x38,0x2d,0x05] +// CHECK-ERROR: instruction requires: sme2p1 or sve2p1 +// CHECK-UNKNOWN: 052d3800 + +pmov z21[0], p10.h // 00000101-00101101-00111001-01010101 +// CHECK-INST: pmov z21[0], p10.h +// CHECK-ENCODING: [0x55,0x39,0x2d,0x05] +// CHECK-ERROR: instruction requires: sme2p1 or sve2p1 +// CHECK-UNKNOWN: 052d3955 + +pmov z23[0], p13.h // 00000101-00101101-00111001-10110111 +// CHECK-INST: pmov z23[0], p13.h +// CHECK-ENCODING: [0xb7,0x39,0x2d,0x05] +// CHECK-ERROR: instruction requires: sme2p1 or sve2p1 +// CHECK-UNKNOWN: 052d39b7 + +pmov z31[1], p15.h // 00000101-00101111-00111001-11111111 +// CHECK-INST: pmov z31[1], p15.h +// CHECK-ENCODING: [0xff,0x39,0x2f,0x05] +// CHECK-ERROR: instruction requires: sme2p1 or sve2p1 +// CHECK-UNKNOWN: 052f39ff + + +pmov z0[0], p0.s // 00000101-01101001-00111000-00000000 +// CHECK-INST: pmov z0[0], p0.s +// CHECK-ENCODING: [0x00,0x38,0x69,0x05] +// CHECK-ERROR: instruction requires: sme2p1 or sve2p1 +// CHECK-UNKNOWN: 05693800 + +pmov z21[2], p10.s // 00000101-01101101-00111001-01010101 +// CHECK-INST: pmov z21[2], p10.s +// CHECK-ENCODING: [0x55,0x39,0x6d,0x05] +// CHECK-ERROR: instruction requires: sme2p1 or sve2p1 +// CHECK-UNKNOWN: 056d3955 + +pmov z23[0], p13.s // 00000101-01101001-00111001-10110111 +// CHECK-INST: pmov z23[0], p13.s +// CHECK-ENCODING: [0xb7,0x39,0x69,0x05] +// CHECK-ERROR: instruction requires: sme2p1 or sve2p1 +// CHECK-UNKNOWN: 056939b7 + +pmov z31[3], p15.s // 00000101-01101111-00111001-11111111 +// CHECK-INST: pmov z31[3], p15.s +// CHECK-ENCODING: [0xff,0x39,0x6f,0x05] +// CHECK-ERROR: instruction requires: sme2p1 or sve2p1 +// CHECK-UNKNOWN: 056f39ff + + +pmov z0[0], p0.d // 00000101-10101001-00111000-00000000 +// CHECK-INST: pmov z0[0], p0.d +// CHECK-ENCODING: [0x00,0x38,0xa9,0x05] +// CHECK-ERROR: instruction requires: sme2p1 or sve2p1 +// CHECK-UNKNOWN: 05a93800 + +pmov z21[6], p10.d // 00000101-11101101-00111001-01010101 +// CHECK-INST: pmov z21[6], p10.d +// CHECK-ENCODING: [0x55,0x39,0xed,0x05] +// CHECK-ERROR: instruction requires: sme2p1 or sve2p1 +// CHECK-UNKNOWN: 05ed3955 + +pmov z23[4], p13.d // 00000101-11101001-00111001-10110111 +// CHECK-INST: pmov z23[4], p13.d +// CHECK-ENCODING: [0xb7,0x39,0xe9,0x05] +// CHECK-ERROR: instruction requires: sme2p1 or sve2p1 +// CHECK-UNKNOWN: 05e939b7 + +pmov z31[7], p15.d // 00000101-11101111-00111001-11111111 +// CHECK-INST: pmov z31[7], p15.d +// CHECK-ENCODING: [0xff,0x39,0xef,0x05] +// CHECK-ERROR: instruction requires: sme2p1 or sve2p1 +// CHECK-UNKNOWN: 05ef39ff + + +pmov z0, p0.b // 00000101-00101011-00111000-00000000 +// CHECK-INST: pmov z0, p0.b +// CHECK-ENCODING: [0x00,0x38,0x2b,0x05] +// CHECK-ERROR: instruction requires: sme2p1 or sve2p1 +// CHECK-UNKNOWN: 052b3800 + +pmov z21, p10.b // 00000101-00101011-00111001-01010101 +// CHECK-INST: pmov z21, p10.b +// CHECK-ENCODING: [0x55,0x39,0x2b,0x05] +// CHECK-ERROR: instruction requires: sme2p1 or sve2p1 +// CHECK-UNKNOWN: 052b3955 + +pmov z23, p13.b // 00000101-00101011-00111001-10110111 +// CHECK-INST: pmov z23, p13.b +// CHECK-ENCODING: [0xb7,0x39,0x2b,0x05] +// CHECK-ERROR: instruction requires: sme2p1 or sve2p1 +// CHECK-UNKNOWN: 052b39b7 + +pmov z31, p15.b // 00000101-00101011-00111001-11111111 +// CHECK-INST: pmov z31, p15.b +// CHECK-ENCODING: [0xff,0x39,0x2b,0x05] +// CHECK-ERROR: instruction requires: sme2p1 or sve2p1 +// CHECK-UNKNOWN: 052b39ff +