diff --git a/llvm/lib/Target/Mips/MipsMSAInstrInfo.td b/llvm/lib/Target/Mips/MipsMSAInstrInfo.td index 881335fa19f0..08b1afbd5f82 100644 --- a/llvm/lib/Target/Mips/MipsMSAInstrInfo.td +++ b/llvm/lib/Target/Mips/MipsMSAInstrInfo.td @@ -1128,13 +1128,8 @@ class MSA_2R_FILL_DESC_BASE : - MSA_2R_DESC_BASE; - -class MSA_2RF_RO_DESC_BASE { + RegisterOperand ROWD, RegisterOperand ROWS = ROWD, + InstrItinClass itin = NoItinerary> { dag OutOperandList = (outs ROWD:$wd); dag InOperandList = (ins ROWS:$ws); string AsmString = !strconcat(instr_asm, "\t$wd, $ws"); @@ -1621,10 +1616,10 @@ class FCEQ_W_DESC : MSA_3RF_DESC_BASE<"fceq.w", vfsetoeq_v4f32, MSA128W>, class FCEQ_D_DESC : MSA_3RF_DESC_BASE<"fceq.d", vfsetoeq_v2f64, MSA128D>, IsCommutable; -class FCLASS_W_DESC : MSA_2RF_RO_DESC_BASE<"fclass.w", int_mips_fclass_w, - MSA128WOpnd>; -class FCLASS_D_DESC : MSA_2RF_RO_DESC_BASE<"fclass.d", int_mips_fclass_d, - MSA128DOpnd>; +class FCLASS_W_DESC : MSA_2RF_DESC_BASE<"fclass.w", int_mips_fclass_w, + MSA128WOpnd>; +class FCLASS_D_DESC : MSA_2RF_DESC_BASE<"fclass.d", int_mips_fclass_d, + MSA128DOpnd>; class FCLE_W_DESC : MSA_3RF_DESC_BASE<"fcle.w", vfsetole_v4f32, MSA128W>; class FCLE_D_DESC : MSA_3RF_DESC_BASE<"fcle.d", vfsetole_v2f64, MSA128D>; @@ -1679,34 +1674,34 @@ class FEXP2_W_DESC : MSA_3RF_DESC_BASE<"fexp2.w", int_mips_fexp2_w, MSA128W>; class FEXP2_D_DESC : MSA_3RF_DESC_BASE<"fexp2.d", int_mips_fexp2_d, MSA128D>; class FEXUPL_W_DESC : MSA_2RF_DESC_BASE<"fexupl.w", int_mips_fexupl_w, - MSA128W, MSA128H>; + MSA128WOpnd, MSA128HOpnd>; class FEXUPL_D_DESC : MSA_2RF_DESC_BASE<"fexupl.d", int_mips_fexupl_d, - MSA128D, MSA128W>; + MSA128DOpnd, MSA128WOpnd>; class FEXUPR_W_DESC : MSA_2RF_DESC_BASE<"fexupr.w", int_mips_fexupr_w, - MSA128W, MSA128H>; + MSA128WOpnd, MSA128HOpnd>; class FEXUPR_D_DESC : MSA_2RF_DESC_BASE<"fexupr.d", int_mips_fexupr_d, - MSA128D, MSA128W>; + MSA128DOpnd, MSA128WOpnd>; class FFINT_S_W_DESC : MSA_2RF_DESC_BASE<"ffint_s.w", int_mips_ffint_s_w, - MSA128W>; + MSA128WOpnd>; class FFINT_S_D_DESC : MSA_2RF_DESC_BASE<"ffint_s.d", int_mips_ffint_s_d, - MSA128D>; + MSA128DOpnd>; class FFINT_U_W_DESC : MSA_2RF_DESC_BASE<"ffint_u.w", int_mips_ffint_u_w, - MSA128W>; + MSA128WOpnd>; class FFINT_U_D_DESC : MSA_2RF_DESC_BASE<"ffint_u.d", int_mips_ffint_u_d, - MSA128D>; + MSA128DOpnd>; class FFQL_W_DESC : MSA_2RF_DESC_BASE<"ffql.w", int_mips_ffql_w, - MSA128W, MSA128H>; + MSA128WOpnd, MSA128HOpnd>; class FFQL_D_DESC : MSA_2RF_DESC_BASE<"ffql.d", int_mips_ffql_d, - MSA128D, MSA128W>; + MSA128DOpnd, MSA128WOpnd>; class FFQR_W_DESC : MSA_2RF_DESC_BASE<"ffqr.w", int_mips_ffqr_w, - MSA128W, MSA128H>; + MSA128WOpnd, MSA128HOpnd>; class FFQR_D_DESC : MSA_2RF_DESC_BASE<"ffqr.d", int_mips_ffqr_d, - MSA128D, MSA128W>; + MSA128DOpnd, MSA128WOpnd>; class FILL_B_DESC : MSA_2R_FILL_DESC_BASE<"fill.b", v16i8, vsplati8, MSA128B, GPR32>; @@ -1715,8 +1710,8 @@ class FILL_H_DESC : MSA_2R_FILL_DESC_BASE<"fill.h", v8i16, vsplati16, MSA128H, class FILL_W_DESC : MSA_2R_FILL_DESC_BASE<"fill.w", v4i32, vsplati32, MSA128W, GPR32>; -class FLOG2_W_DESC : MSA_2RF_DESC_BASE<"flog2.w", flog2, MSA128W>; -class FLOG2_D_DESC : MSA_2RF_DESC_BASE<"flog2.d", flog2, MSA128D>; +class FLOG2_W_DESC : MSA_2RF_DESC_BASE<"flog2.w", flog2, MSA128WOpnd>; +class FLOG2_D_DESC : MSA_2RF_DESC_BASE<"flog2.d", flog2, MSA128DOpnd>; class FMADD_W_DESC : MSA_3RF_4RF_DESC_BASE<"fmadd.w", int_mips_fmadd_w, MSA128W>; @@ -1747,16 +1742,16 @@ class FMSUB_D_DESC : MSA_3RF_4RF_DESC_BASE<"fmsub.d", int_mips_fmsub_d, class FMUL_W_DESC : MSA_3RF_DESC_BASE<"fmul.w", fmul, MSA128W>; class FMUL_D_DESC : MSA_3RF_DESC_BASE<"fmul.d", fmul, MSA128D>; -class FRINT_W_DESC : MSA_2RF_DESC_BASE<"frint.w", frint, MSA128W>; -class FRINT_D_DESC : MSA_2RF_DESC_BASE<"frint.d", frint, MSA128D>; +class FRINT_W_DESC : MSA_2RF_DESC_BASE<"frint.w", frint, MSA128WOpnd>; +class FRINT_D_DESC : MSA_2RF_DESC_BASE<"frint.d", frint, MSA128DOpnd>; -class FRCP_W_DESC : MSA_2RF_DESC_BASE<"frcp.w", int_mips_frcp_w, MSA128W>; -class FRCP_D_DESC : MSA_2RF_DESC_BASE<"frcp.d", int_mips_frcp_d, MSA128D>; +class FRCP_W_DESC : MSA_2RF_DESC_BASE<"frcp.w", int_mips_frcp_w, MSA128WOpnd>; +class FRCP_D_DESC : MSA_2RF_DESC_BASE<"frcp.d", int_mips_frcp_d, MSA128DOpnd>; class FRSQRT_W_DESC : MSA_2RF_DESC_BASE<"frsqrt.w", int_mips_frsqrt_w, - MSA128W>; + MSA128WOpnd>; class FRSQRT_D_DESC : MSA_2RF_DESC_BASE<"frsqrt.d", int_mips_frsqrt_d, - MSA128D>; + MSA128DOpnd>; class FSAF_W_DESC : MSA_3RF_DESC_BASE<"fsaf.w", int_mips_fsaf_w, MSA128W>; class FSAF_D_DESC : MSA_3RF_DESC_BASE<"fsaf.d", int_mips_fsaf_d, MSA128D>; @@ -1776,8 +1771,8 @@ class FSNE_D_DESC : MSA_3RF_DESC_BASE<"fsne.d", int_mips_fsne_d, MSA128D>; class FSOR_W_DESC : MSA_3RF_DESC_BASE<"fsor.w", int_mips_fsor_w, MSA128W>; class FSOR_D_DESC : MSA_3RF_DESC_BASE<"fsor.d", int_mips_fsor_d, MSA128D>; -class FSQRT_W_DESC : MSA_2RF_DESC_BASE<"fsqrt.w", fsqrt, MSA128W>; -class FSQRT_D_DESC : MSA_2RF_DESC_BASE<"fsqrt.d", fsqrt, MSA128D>; +class FSQRT_W_DESC : MSA_2RF_DESC_BASE<"fsqrt.w", fsqrt, MSA128WOpnd>; +class FSQRT_D_DESC : MSA_2RF_DESC_BASE<"fsqrt.d", fsqrt, MSA128DOpnd>; class FSUB_W_DESC : MSA_3RF_DESC_BASE<"fsub.w", fsub, MSA128W>; class FSUB_D_DESC : MSA_3RF_DESC_BASE<"fsub.d", fsub, MSA128D>; @@ -1798,24 +1793,24 @@ class FSUNE_W_DESC : MSA_3RF_DESC_BASE<"fsune.w", int_mips_fsune_w, MSA128W>; class FSUNE_D_DESC : MSA_3RF_DESC_BASE<"fsune.d", int_mips_fsune_d, MSA128D>; class FTRUNC_S_W_DESC : MSA_2RF_DESC_BASE<"ftrunc_s.w", int_mips_ftrunc_s_w, - MSA128W>; + MSA128WOpnd>; class FTRUNC_S_D_DESC : MSA_2RF_DESC_BASE<"ftrunc_s.d", int_mips_ftrunc_s_d, - MSA128D>; + MSA128DOpnd>; class FTRUNC_U_W_DESC : MSA_2RF_DESC_BASE<"ftrunc_u.w", int_mips_ftrunc_u_w, - MSA128W>; + MSA128WOpnd>; class FTRUNC_U_D_DESC : MSA_2RF_DESC_BASE<"ftrunc_u.d", int_mips_ftrunc_u_d, - MSA128D>; + MSA128DOpnd>; class FTINT_S_W_DESC : MSA_2RF_DESC_BASE<"ftint_s.w", int_mips_ftint_s_w, - MSA128W>; + MSA128WOpnd>; class FTINT_S_D_DESC : MSA_2RF_DESC_BASE<"ftint_s.d", int_mips_ftint_s_d, - MSA128D>; + MSA128DOpnd>; class FTINT_U_W_DESC : MSA_2RF_DESC_BASE<"ftint_u.w", int_mips_ftint_u_w, - MSA128W>; + MSA128WOpnd>; class FTINT_U_D_DESC : MSA_2RF_DESC_BASE<"ftint_u.d", int_mips_ftint_u_d, - MSA128D>; + MSA128DOpnd>; class FTQ_H_DESC : MSA_3RF_DESC_BASE<"ftq.h", int_mips_ftq_h, MSA128H, MSA128W, MSA128W>; diff --git a/llvm/test/MC/Mips/msa/test_2rf.s b/llvm/test/MC/Mips/msa/test_2rf.s index 7f80db7cae19..64025a41e1bf 100644 --- a/llvm/test/MC/Mips/msa/test_2rf.s +++ b/llvm/test/MC/Mips/msa/test_2rf.s @@ -4,9 +4,99 @@ # # CHECK: fclass.w $w26, $w12 # encoding: [0x7b,0x20,0x66,0x9e] # CHECK: fclass.d $w24, $w17 # encoding: [0x7b,0x21,0x8e,0x1e] +# CHECK: fexupl.w $w8, $w0 # encoding: [0x7b,0x30,0x02,0x1e] +# CHECK: fexupl.d $w17, $w29 # encoding: [0x7b,0x31,0xec,0x5e] +# CHECK: fexupr.w $w13, $w4 # encoding: [0x7b,0x32,0x23,0x5e] +# CHECK: fexupr.d $w5, $w2 # encoding: [0x7b,0x33,0x11,0x5e] +# CHECK: ffint_s.w $w20, $w29 # encoding: [0x7b,0x3c,0xed,0x1e] +# CHECK: ffint_s.d $w12, $w15 # encoding: [0x7b,0x3d,0x7b,0x1e] +# CHECK: ffint_u.w $w7, $w27 # encoding: [0x7b,0x3e,0xd9,0xde] +# CHECK: ffint_u.d $w19, $w16 # encoding: [0x7b,0x3f,0x84,0xde] +# CHECK: ffql.w $w31, $w13 # encoding: [0x7b,0x34,0x6f,0xde] +# CHECK: ffql.d $w12, $w13 # encoding: [0x7b,0x35,0x6b,0x1e] +# CHECK: ffqr.w $w27, $w30 # encoding: [0x7b,0x36,0xf6,0xde] +# CHECK: ffqr.d $w30, $w15 # encoding: [0x7b,0x37,0x7f,0x9e] +# CHECK: flog2.w $w25, $w31 # encoding: [0x7b,0x2e,0xfe,0x5e] +# CHECK: flog2.d $w18, $w10 # encoding: [0x7b,0x2f,0x54,0x9e] +# CHECK: frint.w $w7, $w15 # encoding: [0x7b,0x2c,0x79,0xde] +# CHECK: frint.d $w21, $w22 # encoding: [0x7b,0x2d,0xb5,0x5e] +# CHECK: frcp.w $w19, $w0 # encoding: [0x7b,0x2a,0x04,0xde] +# CHECK: frcp.d $w4, $w14 # encoding: [0x7b,0x2b,0x71,0x1e] +# CHECK: frsqrt.w $w12, $w17 # encoding: [0x7b,0x28,0x8b,0x1e] +# CHECK: frsqrt.d $w23, $w11 # encoding: [0x7b,0x29,0x5d,0xde] +# CHECK: fsqrt.w $w0, $w11 # encoding: [0x7b,0x26,0x58,0x1e] +# CHECK: fsqrt.d $w15, $w12 # encoding: [0x7b,0x27,0x63,0xde] +# CHECK: ftint_s.w $w30, $w5 # encoding: [0x7b,0x38,0x2f,0x9e] +# CHECK: ftint_s.d $w5, $w23 # encoding: [0x7b,0x39,0xb9,0x5e] +# CHECK: ftint_u.w $w20, $w14 # encoding: [0x7b,0x3a,0x75,0x1e] +# CHECK: ftint_u.d $w23, $w21 # encoding: [0x7b,0x3b,0xad,0xde] +# CHECK: ftrunc_s.w $w29, $w17 # encoding: [0x7b,0x22,0x8f,0x5e] +# CHECK: ftrunc_s.d $w12, $w27 # encoding: [0x7b,0x23,0xdb,0x1e] +# CHECK: ftrunc_u.w $w17, $w15 # encoding: [0x7b,0x24,0x7c,0x5e] +# CHECK: ftrunc_u.d $w5, $w27 # encoding: [0x7b,0x25,0xd9,0x5e] # CHECKOBJDUMP: fclass.w $w26, $w12 # CHECKOBJDUMP: fclass.d $w24, $w17 +# CHECKOBJDUMP: fexupl.w $w8, $w0 +# CHECKOBJDUMP: fexupl.d $w17, $w29 +# CHECKOBJDUMP: fexupr.w $w13, $w4 +# CHECKOBJDUMP: fexupr.d $w5, $w2 +# CHECKOBJDUMP: ffint_s.w $w20, $w29 +# CHECKOBJDUMP: ffint_s.d $w12, $w15 +# CHECKOBJDUMP: ffint_u.w $w7, $w27 +# CHECKOBJDUMP: ffint_u.d $w19, $w16 +# CHECKOBJDUMP: ffql.w $w31, $w13 +# CHECKOBJDUMP: ffql.d $w12, $w13 +# CHECKOBJDUMP: ffqr.w $w27, $w30 +# CHECKOBJDUMP: ffqr.d $w30, $w15 +# CHECKOBJDUMP: flog2.w $w25, $w31 +# CHECKOBJDUMP: flog2.d $w18, $w10 +# CHECKOBJDUMP: frint.w $w7, $w15 +# CHECKOBJDUMP: frint.d $w21, $w22 +# CHECKOBJDUMP: frcp.w $w19, $w0 +# CHECKOBJDUMP: frcp.d $w4, $w14 +# CHECKOBJDUMP: frsqrt.w $w12, $w17 +# CHECKOBJDUMP: frsqrt.d $w23, $w11 +# CHECKOBJDUMP: fsqrt.w $w0, $w11 +# CHECKOBJDUMP: fsqrt.d $w15, $w12 +# CHECKOBJDUMP: ftint_s.w $w30, $w5 +# CHECKOBJDUMP: ftint_s.d $w5, $w23 +# CHECKOBJDUMP: ftint_u.w $w20, $w14 +# CHECKOBJDUMP: ftint_u.d $w23, $w21 +# CHECKOBJDUMP: ftrunc_s.w $w29, $w17 +# CHECKOBJDUMP: ftrunc_s.d $w12, $w27 +# CHECKOBJDUMP: ftrunc_u.w $w17, $w15 +# CHECKOBJDUMP: ftrunc_u.d $w5, $w27 fclass.w $w26, $w12 fclass.d $w24, $w17 + fexupl.w $w8, $w0 + fexupl.d $w17, $w29 + fexupr.w $w13, $w4 + fexupr.d $w5, $w2 + ffint_s.w $w20, $w29 + ffint_s.d $w12, $w15 + ffint_u.w $w7, $w27 + ffint_u.d $w19, $w16 + ffql.w $w31, $w13 + ffql.d $w12, $w13 + ffqr.w $w27, $w30 + ffqr.d $w30, $w15 + flog2.w $w25, $w31 + flog2.d $w18, $w10 + frint.w $w7, $w15 + frint.d $w21, $w22 + frcp.w $w19, $w0 + frcp.d $w4, $w14 + frsqrt.w $w12, $w17 + frsqrt.d $w23, $w11 + fsqrt.w $w0, $w11 + fsqrt.d $w15, $w12 + ftint_s.w $w30, $w5 + ftint_s.d $w5, $w23 + ftint_u.w $w20, $w14 + ftint_u.d $w23, $w21 + ftrunc_s.w $w29, $w17 + ftrunc_s.d $w12, $w27 + ftrunc_u.w $w17, $w15 + ftrunc_u.d $w5, $w27