Browse Source

rvv: add vrgatherei16.vv

Signed-off-by: Chih-Min Chao <chihmin.chao@sifive.com>
pull/519/head
Chih-Min Chao 6 years ago
parent
commit
cdda51cb0a
  1. 3
      riscv/encoding.h
  2. 33
      riscv/insns/vrgatherei16_vv.h
  3. 1
      riscv/riscv.mk.in
  4. 27
      spike_main/disasm.cc

3
riscv/encoding.h

@ -1442,6 +1442,8 @@
#define MASK_VXOR_VV 0xfc00707f
#define MATCH_VRGATHER_VV 0x30000057
#define MASK_VRGATHER_VV 0xfc00707f
#define MATCH_VRGATHEREI16_VV 0x38000057
#define MASK_VRGATHEREI16_VV 0xfc00707f
#define MATCH_VADC_VVM 0x40000057
#define MASK_VADC_VVM 0xfe00707f
#define MATCH_VMADC_VVM 0x44000057
@ -2722,6 +2724,7 @@ DECLARE_INSN(vand_vv, MATCH_VAND_VV, MASK_VAND_VV)
DECLARE_INSN(vor_vv, MATCH_VOR_VV, MASK_VOR_VV)
DECLARE_INSN(vxor_vv, MATCH_VXOR_VV, MASK_VXOR_VV)
DECLARE_INSN(vrgather_vv, MATCH_VRGATHER_VV, MASK_VRGATHER_VV)
DECLARE_INSN(vrgatherei16_vv, MATCH_VRGATHEREI16_VV, MASK_VRGATHEREI16_VV)
DECLARE_INSN(vadc_vvm, MATCH_VADC_VVM, MASK_VADC_VVM)
DECLARE_INSN(vmadc_vvm, MATCH_VMADC_VVM, MASK_VMADC_VVM)
DECLARE_INSN(vsbc_vvm, MATCH_VSBC_VVM, MASK_VSBC_VVM)

33
riscv/insns/vrgatherei16_vv.h

@ -0,0 +1,33 @@
// vrgatherei16.vv vd, vs2, vs1, vm # vd[i] = (vs1[i] >= VLMAX) ? 0 : vs2[vs1[i]];
float vemul = (16.0 / P.VU.vsew * P.VU.vflmul);
require(vemul >= 0.125 && vemul <= 8);
require_align(insn.rd(), P.VU.vflmul);
require_align(insn.rs2(), P.VU.vflmul);
require_align(insn.rs1(), vemul);
require(insn.rd() != insn.rs2() && insn.rd() != insn.rs1());
require_vm;
VI_LOOP_BASE
switch (sew) {
case e8: {
auto vs1 = P.VU.elt<uint16_t>(rs1_num, i);
P.VU.elt<uint8_t>(rd_num, i, true) = vs1 >= P.VU.vlmax ? 0 : P.VU.elt<uint8_t>(rs2_num, vs1);
break;
}
case e16: {
auto vs1 = P.VU.elt<uint16_t>(rs1_num, i);
P.VU.elt<uint16_t>(rd_num, i, true) = vs1 >= P.VU.vlmax ? 0 : P.VU.elt<uint16_t>(rs2_num, vs1);
break;
}
case e32: {
auto vs1 = P.VU.elt<uint16_t>(rs1_num, i);
P.VU.elt<uint32_t>(rd_num, i, true) = vs1 >= P.VU.vlmax ? 0 : P.VU.elt<uint32_t>(rs2_num, vs1);
break;
}
default: {
auto vs1 = P.VU.elt<uint16_t>(rs1_num, i);
P.VU.elt<uint64_t>(rd_num, i, true) = vs1 >= P.VU.vlmax ? 0 : P.VU.elt<uint64_t>(rs2_num, vs1);
break;
}
}
VI_LOOP_END;

1
riscv/riscv.mk.in

@ -472,6 +472,7 @@ riscv_insn_ext_v_alu_int = \
vrgather_vi \
vrgather_vv \
vrgather_vx \
vrgatherei16_vv \
vrsub_vi \
vrsub_vx \
vsadd_vi \

27
spike_main/disasm.cc

@ -892,19 +892,20 @@ disassembler_t::disassembler_t(int xlen)
//OPFVV/OPFVF
//0b00_0000
DISASM_OPIV_VXI_INSN(vadd, 1, v);
DISASM_OPIV_VX__INSN(vsub, 1);
DISASM_OPIV__XI_INSN(vrsub, 1);
DISASM_OPIV_VX__INSN(vminu, 0);
DISASM_OPIV_VX__INSN(vmin, 1);
DISASM_OPIV_VX__INSN(vmaxu, 1);
DISASM_OPIV_VX__INSN(vmax, 0);
DISASM_OPIV_VXI_INSN(vand, 1, v);
DISASM_OPIV_VXI_INSN(vor, 1, v);
DISASM_OPIV_VXI_INSN(vxor, 1, v);
DISASM_OPIV_VXI_INSN(vrgather, 0, v);
DISASM_OPIV__XI_INSN(vslideup, 0);
DISASM_OPIV__XI_INSN(vslidedown,0);
DISASM_OPIV_VXI_INSN(vadd, 1, v);
DISASM_OPIV_VX__INSN(vsub, 1);
DISASM_OPIV__XI_INSN(vrsub, 1);
DISASM_OPIV_VX__INSN(vminu, 0);
DISASM_OPIV_VX__INSN(vmin, 1);
DISASM_OPIV_VX__INSN(vmaxu, 1);
DISASM_OPIV_VX__INSN(vmax, 0);
DISASM_OPIV_VXI_INSN(vand, 1, v);
DISASM_OPIV_VXI_INSN(vor, 1, v);
DISASM_OPIV_VXI_INSN(vxor, 1, v);
DISASM_OPIV_VXI_INSN(vrgather, 0, v);
DISASM_OPIV_V___INSN(vrgatherei16, 0);
DISASM_OPIV__XI_INSN(vslideup, 0);
DISASM_OPIV__XI_INSN(vslidedown, 0);
//0b01_0000
DISASM_OPIV_VXIM_INSN(vadc, 1);

Loading…
Cancel
Save