diff options
author | eopXD <yueh.ting.chen@gmail.com> | 2021-12-08 01:21:46 +0800 |
---|---|---|
committer | eopXD <yueh.ting.chen@gmail.com> | 2021-12-08 01:21:46 +0800 |
commit | 626fce2075e7907583e07f72f16187d6915ae84d (patch) | |
tree | 480491b3eb4ac727e5cebb8bc58ad9dceeba748a | |
parent | 278a7dd43477ef8d05f534c302e123eae5012fe7 (diff) | |
download | spike-626fce2075e7907583e07f72f16187d6915ae84d.zip spike-626fce2075e7907583e07f72f16187d6915ae84d.tar.gz spike-626fce2075e7907583e07f72f16187d6915ae84d.tar.bz2 |
Simplify floating point compare instructions
-rw-r--r-- | riscv/decode.h | 48 | ||||
-rw-r--r-- | riscv/insns/vmfeq_vf.h | 5 | ||||
-rw-r--r-- | riscv/insns/vmfeq_vv.h | 5 | ||||
-rw-r--r-- | riscv/insns/vmfge_vf.h | 5 | ||||
-rw-r--r-- | riscv/insns/vmfgt_vf.h | 5 | ||||
-rw-r--r-- | riscv/insns/vmfle_vf.h | 5 | ||||
-rw-r--r-- | riscv/insns/vmfle_vv.h | 5 | ||||
-rw-r--r-- | riscv/insns/vmflt_vf.h | 5 | ||||
-rw-r--r-- | riscv/insns/vmflt_vv.h | 5 | ||||
-rw-r--r-- | riscv/insns/vmfne_vf.h | 5 | ||||
-rw-r--r-- | riscv/insns/vmfne_vv.h | 5 |
11 files changed, 55 insertions, 43 deletions
diff --git a/riscv/decode.h b/riscv/decode.h index 211ab9a..d3cb558 100644 --- a/riscv/decode.h +++ b/riscv/decode.h @@ -1882,7 +1882,7 @@ reg_t index[P.VU.vlmax]; \ for (reg_t i = P.VU.vstart->read(); i < vl; ++i) { \ VI_LOOP_ELEMENT_SKIP(); \ uint64_t mmask = UINT64_C(1) << mpos; \ - uint64_t &vdi = P.VU.elt<uint64_t>(rd_num, midx, true); \ + uint64_t &vd = P.VU.elt<uint64_t>(rd_num, midx, true); \ uint64_t res = 0; #define VI_VFP_LOOP_REDUCTION_BASE(width) \ @@ -1961,7 +1961,7 @@ reg_t index[P.VU.vlmax]; \ case e16: \ case e32: \ case e64: { \ - vdi = (vdi & ~mmask) | (((res) << mpos) & mmask); \ + vd = (vd & ~mmask) | (((res) << mpos) & mmask); \ break; \ } \ default: \ @@ -2119,30 +2119,52 @@ reg_t index[P.VU.vlmax]; \ DEBUG_RVV_FP_VF; \ VI_VFP_LOOP_END -#define VI_VFP_LOOP_CMP(BODY16, BODY32, BODY64, is_vs1) \ - VI_CHECK_MSS(is_vs1); \ +#define VI_VFP_VV_LOOP_CMP(BODY16, BODY32, BODY64) \ + VI_CHECK_MSS(true); \ VI_VFP_LOOP_CMP_BASE \ switch(P.VU.vsew) { \ case e16: {\ - float16_t vs2 = P.VU.elt<float16_t>(rs2_num, i); \ - float16_t vs1 = P.VU.elt<float16_t>(rs1_num, i); \ - float16_t rs1 = f16(READ_FREG(rs1_num)); \ + VFP_VV_PARAMS(16); \ BODY16; \ set_fp_exceptions; \ break; \ }\ case e32: {\ - float32_t vs2 = P.VU.elt<float32_t>(rs2_num, i); \ - float32_t vs1 = P.VU.elt<float32_t>(rs1_num, i); \ - float32_t rs1 = f32(READ_FREG(rs1_num)); \ + VFP_VV_PARAMS(32); \ BODY32; \ set_fp_exceptions; \ break; \ }\ case e64: {\ - float64_t vs2 = P.VU.elt<float64_t>(rs2_num, i); \ - float64_t vs1 = P.VU.elt<float64_t>(rs1_num, i); \ - float64_t rs1 = f64(READ_FREG(rs1_num)); \ + VFP_VV_PARAMS(64); \ + BODY64; \ + set_fp_exceptions; \ + break; \ + }\ + default: \ + require(0); \ + break; \ + }; \ + VI_VFP_LOOP_CMP_END \ + +#define VI_VFP_VF_LOOP_CMP(BODY16, BODY32, BODY64) \ + VI_CHECK_MSS(false); \ + VI_VFP_LOOP_CMP_BASE \ + switch(P.VU.vsew) { \ + case e16: {\ + VFP_VF_PARAMS(16); \ + BODY16; \ + set_fp_exceptions; \ + break; \ + }\ + case e32: {\ + VFP_VF_PARAMS(32); \ + BODY32; \ + set_fp_exceptions; \ + break; \ + }\ + case e64: {\ + VFP_VF_PARAMS(64); \ BODY64; \ set_fp_exceptions; \ break; \ diff --git a/riscv/insns/vmfeq_vf.h b/riscv/insns/vmfeq_vf.h index 040f2b0..a4d7c50 100644 --- a/riscv/insns/vmfeq_vf.h +++ b/riscv/insns/vmfeq_vf.h @@ -1,5 +1,5 @@ // vmfeq.vf vd, vs2, fs1 -VI_VFP_LOOP_CMP +VI_VFP_VF_LOOP_CMP ({ res = f16_eq(vs2, rs1); }, @@ -8,5 +8,4 @@ VI_VFP_LOOP_CMP }, { res = f64_eq(vs2, rs1); -}, -false) +}) diff --git a/riscv/insns/vmfeq_vv.h b/riscv/insns/vmfeq_vv.h index fb24d13..b08ce98 100644 --- a/riscv/insns/vmfeq_vv.h +++ b/riscv/insns/vmfeq_vv.h @@ -1,5 +1,5 @@ // vmfeq.vv vd, vs2, vs1 -VI_VFP_LOOP_CMP +VI_VFP_VV_LOOP_CMP ({ res = f16_eq(vs2, vs1); }, @@ -8,5 +8,4 @@ VI_VFP_LOOP_CMP }, { res = f64_eq(vs2, vs1); -}, -true) +}) diff --git a/riscv/insns/vmfge_vf.h b/riscv/insns/vmfge_vf.h index 9e69855..ab4df5c 100644 --- a/riscv/insns/vmfge_vf.h +++ b/riscv/insns/vmfge_vf.h @@ -1,5 +1,5 @@ // vmfge.vf vd, vs2, rs1 -VI_VFP_LOOP_CMP +VI_VFP_VF_LOOP_CMP ({ res = f16_le(rs1, vs2); }, @@ -8,5 +8,4 @@ VI_VFP_LOOP_CMP }, { res = f64_le(rs1, vs2); -}, -false) +}) diff --git a/riscv/insns/vmfgt_vf.h b/riscv/insns/vmfgt_vf.h index bd5d99b..dcc3ea3 100644 --- a/riscv/insns/vmfgt_vf.h +++ b/riscv/insns/vmfgt_vf.h @@ -1,5 +1,5 @@ // vmfgt.vf vd, vs2, rs1 -VI_VFP_LOOP_CMP +VI_VFP_VF_LOOP_CMP ({ res = f16_lt(rs1, vs2); }, @@ -8,5 +8,4 @@ VI_VFP_LOOP_CMP }, { res = f64_lt(rs1, vs2); -}, -false) +}) diff --git a/riscv/insns/vmfle_vf.h b/riscv/insns/vmfle_vf.h index 3d2852f..a942705 100644 --- a/riscv/insns/vmfle_vf.h +++ b/riscv/insns/vmfle_vf.h @@ -1,5 +1,5 @@ // vmfle.vf vd, vs2, rs1 -VI_VFP_LOOP_CMP +VI_VFP_VF_LOOP_CMP ({ res = f16_le(vs2, rs1); }, @@ -8,5 +8,4 @@ VI_VFP_LOOP_CMP }, { res = f64_le(vs2, rs1); -}, -false) +}) diff --git a/riscv/insns/vmfle_vv.h b/riscv/insns/vmfle_vv.h index 203ef21..dd6f81d 100644 --- a/riscv/insns/vmfle_vv.h +++ b/riscv/insns/vmfle_vv.h @@ -1,5 +1,5 @@ // vmfle.vv vd, vs2, rs1 -VI_VFP_LOOP_CMP +VI_VFP_VV_LOOP_CMP ({ res = f16_le(vs2, vs1); }, @@ -8,5 +8,4 @@ VI_VFP_LOOP_CMP }, { res = f64_le(vs2, vs1); -}, -true) +}) diff --git a/riscv/insns/vmflt_vf.h b/riscv/insns/vmflt_vf.h index 4780adc..110dbd1 100644 --- a/riscv/insns/vmflt_vf.h +++ b/riscv/insns/vmflt_vf.h @@ -1,5 +1,5 @@ // vmflt.vf vd, vs2, rs1 -VI_VFP_LOOP_CMP +VI_VFP_VF_LOOP_CMP ({ res = f16_lt(vs2, rs1); }, @@ -8,5 +8,4 @@ VI_VFP_LOOP_CMP }, { res = f64_lt(vs2, rs1); -}, -false) +}) diff --git a/riscv/insns/vmflt_vv.h b/riscv/insns/vmflt_vv.h index cdfc3fa..35f8d70 100644 --- a/riscv/insns/vmflt_vv.h +++ b/riscv/insns/vmflt_vv.h @@ -1,5 +1,5 @@ // vmflt.vv vd, vs2, vs1 -VI_VFP_LOOP_CMP +VI_VFP_VV_LOOP_CMP ({ res = f16_lt(vs2, vs1); }, @@ -8,5 +8,4 @@ VI_VFP_LOOP_CMP }, { res = f64_lt(vs2, vs1); -}, -true) +}) diff --git a/riscv/insns/vmfne_vf.h b/riscv/insns/vmfne_vf.h index 8401699..1b61d57 100644 --- a/riscv/insns/vmfne_vf.h +++ b/riscv/insns/vmfne_vf.h @@ -1,5 +1,5 @@ // vmfne.vf vd, vs2, rs1 -VI_VFP_LOOP_CMP +VI_VFP_VF_LOOP_CMP ({ res = !f16_eq(vs2, rs1); }, @@ -8,5 +8,4 @@ VI_VFP_LOOP_CMP }, { res = !f64_eq(vs2, rs1); -}, -false) +}) diff --git a/riscv/insns/vmfne_vv.h b/riscv/insns/vmfne_vv.h index 50dfa9c..4447c3c 100644 --- a/riscv/insns/vmfne_vv.h +++ b/riscv/insns/vmfne_vv.h @@ -1,5 +1,5 @@ // vmfne.vv vd, vs2, rs1 -VI_VFP_LOOP_CMP +VI_VFP_VV_LOOP_CMP ({ res = !f16_eq(vs2, vs1); }, @@ -8,5 +8,4 @@ VI_VFP_LOOP_CMP }, { res = !f64_eq(vs2, vs1); -}, -true) +}) |