Skip to content

Commit

Permalink
Unify set_static_rounding_mode() and set_dynamic_rounding_mode()
Browse files Browse the repository at this point in the history 
Following the removal of rounding mode checks and settings for the
feqs, flts, and fles instructions, unify the set_static_rounding_mode()
and set_dynamic_rounding_mode() functions into a single function. This
consolidation improves code clarity and reduces redundancy in the
rounding mode handling code.
  • Loading branch information
@visitorckw
visitorckw committed Apr 8, 2024
1 parent f7ec3a2 commit 079ac67
Show file tree
Hide file tree
Showing 2 changed files with 18 additions and 77 deletions.
65 changes: 13 additions & 52 deletions src/rv32_template.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -1533,10 +1533,7 @@ RVOP(
RVOP(
fmadds,
{
if (likely(ir->rm == 0b111))
set_dynamic_rounding_mode(rv);
else
set_static_rounding_mode(ir->rm);
set_rounding_mode(rv, ir->rm);
rv->F[ir->rd] =
f32_mulAdd(rv->F[ir->rs1], rv->F[ir->rs2], rv->F[ir->rs3]);
set_fflag(rv);
Expand All @@ -1549,10 +1546,7 @@ RVOP(
RVOP(
fmsubs,
{
if (likely(ir->rm == 0b111))
set_dynamic_rounding_mode(rv);
else
set_static_rounding_mode(ir->rm);
set_rounding_mode(rv, ir->rm);
riscv_float_t tmp = rv->F[ir->rs3];
tmp.v ^= FMASK_SIGN;
rv->F[ir->rd] = f32_mulAdd(rv->F[ir->rs1], rv->F[ir->rs2], tmp);
Expand All @@ -1566,10 +1560,7 @@ RVOP(
RVOP(
fnmsubs,
{
if (likely(ir->rm == 0b111))
set_dynamic_rounding_mode(rv);
else
set_static_rounding_mode(ir->rm);
set_rounding_mode(rv, ir->rm);
riscv_float_t tmp = rv->F[ir->rs1];
tmp.v ^= FMASK_SIGN;
rv->F[ir->rd] = f32_mulAdd(tmp, rv->F[ir->rs2], rv->F[ir->rs3]);
Expand All @@ -1583,10 +1574,7 @@ RVOP(
RVOP(
fnmadds,
{
if (likely(ir->rm == 0b111))
set_dynamic_rounding_mode(rv);
else
set_static_rounding_mode(ir->rm);
set_rounding_mode(rv, ir->rm);
riscv_float_t tmp1 = rv->F[ir->rs1];
riscv_float_t tmp2 = rv->F[ir->rs3];
tmp1.v ^= FMASK_SIGN;
Expand All @@ -1602,10 +1590,7 @@ RVOP(
RVOP(
fadds,
{
if (likely(ir->rm == 0b111))
set_dynamic_rounding_mode(rv);
else
set_static_rounding_mode(ir->rm);
set_rounding_mode(rv, ir->rm);
rv->F[ir->rd] = f32_add(rv->F[ir->rs1], rv->F[ir->rs2]);
set_fflag(rv);
},
Expand All @@ -1617,10 +1602,7 @@ RVOP(
RVOP(
fsubs,
{
if (likely(ir->rm == 0b111))
set_dynamic_rounding_mode(rv);
else
set_static_rounding_mode(ir->rm);
set_rounding_mode(rv, ir->rm);
rv->F[ir->rd] = f32_sub(rv->F[ir->rs1], rv->F[ir->rs2]);
set_fflag(rv);
},
Expand All @@ -1632,10 +1614,7 @@ RVOP(
RVOP(
fmuls,
{
if (likely(ir->rm == 0b111))
set_dynamic_rounding_mode(rv);
else
set_static_rounding_mode(ir->rm);
set_rounding_mode(rv, ir->rm);
rv->F[ir->rd] = f32_mul(rv->F[ir->rs1], rv->F[ir->rs2]);
set_fflag(rv);
},
Expand All @@ -1647,10 +1626,7 @@ RVOP(
RVOP(
fdivs,
{
if (likely(ir->rm == 0b111))
set_dynamic_rounding_mode(rv);
else
set_static_rounding_mode(ir->rm);
set_rounding_mode(rv, ir->rm);
rv->F[ir->rd] = f32_div(rv->F[ir->rs1], rv->F[ir->rs2]);
set_fflag(rv);
},
Expand All @@ -1662,10 +1638,7 @@ RVOP(
RVOP(
fsqrts,
{
if (likely(ir->rm == 0b111))
set_dynamic_rounding_mode(rv);
else
set_static_rounding_mode(ir->rm);
set_rounding_mode(rv, ir->rm);
rv->F[ir->rd] = f32_sqrt(rv->F[ir->rs1]);
set_fflag(rv);
},
Expand Down Expand Up @@ -1758,10 +1731,7 @@ RVOP(
RVOP(
fcvtws,
{
if (likely(ir->rm == 0b111))
set_dynamic_rounding_mode(rv);
else
set_static_rounding_mode(ir->rm);
set_rounding_mode(rv, ir->rm);
uint32_t ret = f32_to_i32(rv->F[ir->rs1], softfloat_roundingMode, true);
if (ir->rd)
rv->X[ir->rd] = ret;
Expand All @@ -1775,10 +1745,7 @@ RVOP(
RVOP(
fcvtwus,
{
if (likely(ir->rm == 0b111))
set_dynamic_rounding_mode(rv);
else
set_static_rounding_mode(ir->rm);
set_rounding_mode(rv, ir->rm);
uint32_t ret =
f32_to_ui32(rv->F[ir->rs1], softfloat_roundingMode, true);
if (ir->rd)
Expand Down Expand Up @@ -1858,10 +1825,7 @@ RVOP(
RVOP(
fcvtsw,
{
if (likely(ir->rm == 0b111))
set_dynamic_rounding_mode(rv);
else
set_static_rounding_mode(ir->rm);
set_rounding_mode(rv, ir->rm);
rv->F[ir->rd] = i32_to_f32(rv->X[ir->rs1]);
set_fflag(rv);
},
Expand All @@ -1873,10 +1837,7 @@ RVOP(
RVOP(
fcvtswu,
{
if (likely(ir->rm == 0b111))
set_dynamic_rounding_mode(rv);
else
set_static_rounding_mode(ir->rm);
set_rounding_mode(rv, ir->rm);
rv->F[ir->rd] = ui32_to_f32(rv->X[ir->rs1]);
set_fflag(rv);
},
Expand Down
30 changes: 5 additions & 25 deletions src/softfloat.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -101,33 +101,13 @@ static inline void set_fflag(riscv_t *rv)
softfloat_exceptionFlags = 0;
}

static inline void set_dynamic_rounding_mode(riscv_t *rv)
static inline void set_rounding_mode(riscv_t *rv, uint8_t rm)
{
uint32_t frm = (rv->csr_fcsr >> 5) & (~(1 << 3));
switch (frm) {
case 0b000:
softfloat_roundingMode = softfloat_round_near_even;
break;
case 0b001:
softfloat_roundingMode = softfloat_round_minMag;
break;
case 0b010:
softfloat_roundingMode = softfloat_round_min;
break;
case 0b011:
softfloat_roundingMode = softfloat_round_max;
break;
case 0b100:
softfloat_roundingMode = softfloat_round_near_maxMag;
break;
default:
__UNREACHABLE;
break;
}
}
const uint32_t frm = (rv->csr_fcsr >> 5) & (~(1 << 3));

if (rm == 0b111)
rm = frm;

static inline void set_static_rounding_mode(uint8_t rm)
{
switch (rm) {
case 0b000:
softfloat_roundingMode = softfloat_round_near_even;
Expand Down

0 comments on commit 079ac67

Please sign in to comment.