[v2,2/2] soft-fp: Add inplementation for 128 bit self-contained

Message ID adcb081d2f3d071b870a3f4fa653b2f6967a9d21.1540990635.git.zongbox@gmail.com
State Superseded
Headers show
Series
  • Fix up soft-fp issue
Related show

Commit Message

Zong Li Oct. 31, 2018, 1:10 p.m.
Here only add the implementation when building the RV32 port.

These macros are used when the following situations occur at the same
time: soft-fp fma, ldbl-128 and 32-bit _FP_W_TYPE_SIZE. The RISC-V
32-bit port is the first port which use all three together.

This is the building flow about the situation:
When building soft-fp/s_fmal.c, there uses the FP_FMA_Q in __fmal.
The _FP_W_TYPE_SIZE is defined to 32-bit in sysdeps/riscv/sfp-machine.h,
so the FP_FMA_Q was defined to _FP_FMA (Q, 4, 8, R, X, Y, Z) in
soft-fp/quad.h.

Something in the soft-fp/quad.h:
 #if _FP_W_TYPE_SIZE < 64
    # define FP_FMA_Q(R, X, Y, Z)    _FP_FMA (Q, 4, 8, R, X, Y, Z)
 #else
    # define FP_FMA_Q(R, X, Y, Z)    _FP_FMA (Q, 2, 4, R, X, Y, Z)
 #endif

Finally, in _FP_FMA (fs, wc, dwc, R, X, Y, Z), it will use the
_FP_FRAC_HIGHBIT_DW_##dwc macro, and it will be expanded to
_FP_FRAC_HIGHBIT_DW_8, but the _FP_FRAC_HIGHBIT_DW_8 is not be
implemented in soft-fp/op-8.h. there is only _FP_FRAC_HIGHBIT_DW_1,
_FP_FRAC_HIGHBIT_DW_2 and _FP_FRAC_HIGHBIT_DW_4 in the
soft-fp/op-*.h.

After this modification, we can pass the soft floating testing of glibc
testsuites on RV32.

	* soft-fp/op-8.h (_FP_FRAC_SET_8, _FP_FRAC_ADD_8, _FP_FRAC_SUB_8)
	(_FP_FRAC_CLZ_8, _FP_MINFRAC_8, _FP_FRAC_NEGP_8, _FP_FRAC_ZEROP_8)
	(_FP_FRAC_HIGHBIT_DW_8, _FP_FRAC_COPY_4_8, _FP_FRAC_COPY_8_4)
	(__FP_FRAC_SET_8): Add implementation for RV32 use.
---
 ChangeLog      |  4 +++
 soft-fp/op-8.h | 92 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
 2 files changed, 96 insertions(+)

-- 
2.7.4

Comments

Joseph Myers Oct. 31, 2018, 4:51 p.m. | #1
On Wed, 31 Oct 2018, Zong Li wrote:

> +          R##_f[_FP_FRAC_ADD_8_i]                                           \

> +            = X##_f[_FP_FRAC_ADD_8_i]                                       \

> +              + Y##_f[_FP_FRAC_ADD_8_i]                                     \

> +              + _FP_FRAC_ADD_8_c;                                           \


For these sorts of expressions broken over multiple lines, please see the 
GNU Coding Standards:

    Insert extra parentheses so that Emacs will indent the code properly.
    For example, the following indentation looks nice if you do it by hand,

    @example
    v = rup->ru_utime.tv_sec*1000 + rup->ru_utime.tv_usec/1000
        + rup->ru_stime.tv_sec*1000 + rup->ru_stime.tv_usec/1000;
    @end example

    @noindent
    but Emacs would alter it.  Adding a set of parentheses produces
    something that looks equally nice, and which Emacs will preserve:

    @example
    v = (rup->ru_utime.tv_sec*1000 + rup->ru_utime.tv_usec/1000
         + rup->ru_stime.tv_sec*1000 + rup->ru_stime.tv_usec/1000);
    @end example

So, you should have parentheses around the RHS of '=' here to ensure it 
stays properly indented across future edits (rather than the '+' ending up 
in the same column as '=', which is what would happen without those 
parentheses).

> +          _FP_FRAC_SUB_8_tmp[_FP_FRAC_SUB_8_i]                              \

> +            = X##_f[_FP_FRAC_SUB_8_i]                                       \

> +              - Y##_f[_FP_FRAC_SUB_8_i]                                     \

> +              - _FP_FRAC_SUB_8_c;                                           \


Likewise here.

> +          _FP_FRAC_SUB_8_c                                                  \

> +            = (_FP_FRAC_SUB_8_c                                             \

> +               ? _FP_FRAC_SUB_8_tmp[_FP_FRAC_SUB_8_i]                       \

> +                 >= X##_f[_FP_FRAC_SUB_8_i]                                 \

> +               : _FP_FRAC_SUB_8_tmp[_FP_FRAC_SUB_8_i]                       \

> +                 > X##_f[_FP_FRAC_SUB_8_i]);                                \


Likewise for the '>=' and '>' expressions as operands of ?:.

> +      for (_FP_FRAC_SUB_8_i = 0; _FP_FRAC_SUB_8_i < 8; ++_FP_FRAC_SUB_8_i)  \

> +        {                                                                   \

> +          R##_f[_FP_FRAC_SUB_8_i] = _FP_FRAC_SUB_8_tmp[_FP_FRAC_SUB_8_i];   \

> +        }                                                                   \


When there is only a single statement in a block, we don't generally use { 
} around that block.

-- 
Joseph S. Myers
joseph@codesourcery.com
Zong Li Nov. 1, 2018, 1:51 a.m. | #2
Joseph Myers <joseph@codesourcery.com> 於 2018年11月1日 週四 上午12:51寫道:
>

> On Wed, 31 Oct 2018, Zong Li wrote:

>

> > +          R##_f[_FP_FRAC_ADD_8_i]                                           \

> > +            = X##_f[_FP_FRAC_ADD_8_i]                                       \

> > +              + Y##_f[_FP_FRAC_ADD_8_i]                                     \

> > +              + _FP_FRAC_ADD_8_c;                                           \

>

> For these sorts of expressions broken over multiple lines, please see the

> GNU Coding Standards:

>

>     Insert extra parentheses so that Emacs will indent the code properly.

>     For example, the following indentation looks nice if you do it by hand,

>

>     @example

>     v = rup->ru_utime.tv_sec*1000 + rup->ru_utime.tv_usec/1000

>         + rup->ru_stime.tv_sec*1000 + rup->ru_stime.tv_usec/1000;

>     @end example

>

>     @noindent

>     but Emacs would alter it.  Adding a set of parentheses produces

>     something that looks equally nice, and which Emacs will preserve:

>

>     @example

>     v = (rup->ru_utime.tv_sec*1000 + rup->ru_utime.tv_usec/1000

>          + rup->ru_stime.tv_sec*1000 + rup->ru_stime.tv_usec/1000);

>     @end example

>

> So, you should have parentheses around the RHS of '=' here to ensure it

> stays properly indented across future edits (rather than the '+' ending up

> in the same column as '=', which is what would happen without those

> parentheses).

>

> > +          _FP_FRAC_SUB_8_tmp[_FP_FRAC_SUB_8_i]                              \

> > +            = X##_f[_FP_FRAC_SUB_8_i]                                       \

> > +              - Y##_f[_FP_FRAC_SUB_8_i]                                     \

> > +              - _FP_FRAC_SUB_8_c;                                           \

>

> Likewise here.

>

> > +          _FP_FRAC_SUB_8_c                                                  \

> > +            = (_FP_FRAC_SUB_8_c                                             \

> > +               ? _FP_FRAC_SUB_8_tmp[_FP_FRAC_SUB_8_i]                       \

> > +                 >= X##_f[_FP_FRAC_SUB_8_i]                                 \

> > +               : _FP_FRAC_SUB_8_tmp[_FP_FRAC_SUB_8_i]                       \

> > +                 > X##_f[_FP_FRAC_SUB_8_i]);                                \

>

> Likewise for the '>=' and '>' expressions as operands of ?:.


> > +      for (_FP_FRAC_SUB_8_i = 0; _FP_FRAC_SUB_8_i < 8; ++_FP_FRAC_SUB_8_i)  \

> > +        {                                                                   \

> > +          R##_f[_FP_FRAC_SUB_8_i] = _FP_FRAC_SUB_8_tmp[_FP_FRAC_SUB_8_i];   \

> > +        }                                                                   \

>

> When there is only a single statement in a block, we don't generally use {

> } around that block.

>


Thanks for the corrections, I would fix them in next version.

Patch

diff --git a/ChangeLog b/ChangeLog
index 0cced2b..5c41833 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -2,6 +2,10 @@ 
 
 	* soft-fp/op-4.h (_FP_FRAC_SUB_3, _FP_FRAC_SUB_4): Use temporary
 	variable to avoid overlap arguments.
+	* soft-fp/op-8.h (_FP_FRAC_SET_8, _FP_FRAC_ADD_8, _FP_FRAC_SUB_8)
+	(_FP_FRAC_CLZ_8, _FP_MINFRAC_8, _FP_FRAC_NEGP_8, _FP_FRAC_ZEROP_8)
+	(_FP_FRAC_HIGHBIT_DW_8, _FP_FRAC_COPY_4_8, _FP_FRAC_COPY_8_4)
+	(__FP_FRAC_SET_8): Add implementation for RV32 use.
 
 2018-10-31  Samuel Thibault  <samuel.thibault@ens-lyon.org>
 
diff --git a/soft-fp/op-8.h b/soft-fp/op-8.h
index ffed258..9693d0a 100644
--- a/soft-fp/op-8.h
+++ b/soft-fp/op-8.h
@@ -35,6 +35,7 @@ 
 /* We need just a few things from here for op-4, if we ever need some
    other macros, they can be added.  */
 #define _FP_FRAC_DECL_8(X)	_FP_W_TYPE X##_f[8]
+#define _FP_FRAC_SET_8(X, I)    __FP_FRAC_SET_8 (X, I)
 #define _FP_FRAC_HIGH_8(X)	(X##_f[7])
 #define _FP_FRAC_LOW_8(X)	(X##_f[0])
 #define _FP_FRAC_WORD_8(X, w)	(X##_f[w])
@@ -147,4 +148,95 @@ 
     }									\
   while (0)
 
+#define _FP_FRAC_ADD_8(R, X, Y)                                             \
+  do                                                                        \
+    {                                                                       \
+      _FP_W_TYPE _FP_FRAC_ADD_8_c = 0;                                      \
+      _FP_I_TYPE _FP_FRAC_ADD_8_i;                                          \
+      for (_FP_FRAC_ADD_8_i = 0; _FP_FRAC_ADD_8_i < 8; ++_FP_FRAC_ADD_8_i)  \
+        {                                                                   \
+          R##_f[_FP_FRAC_ADD_8_i]                                           \
+            = X##_f[_FP_FRAC_ADD_8_i]                                       \
+              + Y##_f[_FP_FRAC_ADD_8_i]                                     \
+              + _FP_FRAC_ADD_8_c;                                           \
+          _FP_FRAC_ADD_8_c                                                  \
+            = (_FP_FRAC_ADD_8_c                                             \
+               ? R##_f[_FP_FRAC_ADD_8_i] <= X##_f[_FP_FRAC_ADD_8_i]         \
+               : R##_f[_FP_FRAC_ADD_8_i] < X##_f[_FP_FRAC_ADD_8_i]);        \
+        }                                                                   \
+    }                                                                       \
+  while (0)
+
+#define _FP_FRAC_SUB_8(R, X, Y)                                             \
+  do                                                                        \
+    {                                                                       \
+      _FP_W_TYPE _FP_FRAC_SUB_8_tmp[8];                                     \
+      _FP_W_TYPE _FP_FRAC_SUB_8_c = 0;                                      \
+      _FP_I_TYPE _FP_FRAC_SUB_8_i;                                          \
+      for (_FP_FRAC_SUB_8_i = 0; _FP_FRAC_SUB_8_i < 8; ++_FP_FRAC_SUB_8_i)  \
+        {                                                                   \
+          _FP_FRAC_SUB_8_tmp[_FP_FRAC_SUB_8_i]                              \
+            = X##_f[_FP_FRAC_SUB_8_i]                                       \
+              - Y##_f[_FP_FRAC_SUB_8_i]                                     \
+              - _FP_FRAC_SUB_8_c;                                           \
+          _FP_FRAC_SUB_8_c                                                  \
+            = (_FP_FRAC_SUB_8_c                                             \
+               ? _FP_FRAC_SUB_8_tmp[_FP_FRAC_SUB_8_i]                       \
+                 >= X##_f[_FP_FRAC_SUB_8_i]                                 \
+               : _FP_FRAC_SUB_8_tmp[_FP_FRAC_SUB_8_i]                       \
+                 > X##_f[_FP_FRAC_SUB_8_i]);                                \
+        }                                                                   \
+      for (_FP_FRAC_SUB_8_i = 0; _FP_FRAC_SUB_8_i < 8; ++_FP_FRAC_SUB_8_i)  \
+        {                                                                   \
+          R##_f[_FP_FRAC_SUB_8_i] = _FP_FRAC_SUB_8_tmp[_FP_FRAC_SUB_8_i];   \
+        }                                                                   \
+    }                                                                       \
+  while (0)
+
+#define _FP_FRAC_CLZ_8(R, X)                                                \
+  do                                                                        \
+    {                                                                       \
+      _FP_I_TYPE _FP_FRAC_CLZ_8_i;                                          \
+      for (_FP_FRAC_CLZ_8_i = 7; _FP_FRAC_CLZ_8_i > 0; _FP_FRAC_CLZ_8_i--)  \
+        if (X##_f[_FP_FRAC_CLZ_8_i])                                        \
+          break;                                                            \
+      __FP_CLZ ((R), X##_f[_FP_FRAC_CLZ_8_i]);                              \
+      (R) += _FP_W_TYPE_SIZE * (7 - _FP_FRAC_CLZ_8_i);                      \
+    }                                                                       \
+  while (0)
+
+#define _FP_MINFRAC_8   0, 0, 0, 0, 0, 0, 0, 1
+
+#define _FP_FRAC_NEGP_8(X)      ((_FP_WS_TYPE) X##_f[7] < 0)
+#define _FP_FRAC_ZEROP_8(X)                                             \
+  ((X##_f[0] | X##_f[1] | X##_f[2] | X##_f[3]                           \
+    | X##_f[4] | X##_f[5] | X##_f[6] | X##_f[7]) == 0)
+#define _FP_FRAC_HIGHBIT_DW_8(fs, X)                                    \
+  (_FP_FRAC_HIGH_DW_##fs (X) & _FP_HIGHBIT_DW_##fs)
+
+#define _FP_FRAC_COPY_4_8(D, S)                           \
+  do                                                      \
+    {                                                     \
+      D##_f[0] = S##_f[0];                                \
+      D##_f[1] = S##_f[1];                                \
+      D##_f[2] = S##_f[2];                                \
+      D##_f[3] = S##_f[3];                                \
+    }                                                     \
+  while (0)
+
+#define _FP_FRAC_COPY_8_4(D, S)                           \
+  do                                                      \
+    {                                                     \
+      D##_f[0] = S##_f[0];                                \
+      D##_f[1] = S##_f[1];                                \
+      D##_f[2] = S##_f[2];                                \
+      D##_f[3] = S##_f[3];                                \
+      D##_f[4] = D##_f[5] = D##_f[6] = D##_f[7]= 0;       \
+    }                                                     \
+  while (0)
+
+#define __FP_FRAC_SET_8(X, I7, I6, I5, I4, I3, I2, I1, I0)             \
+  (X##_f[7] = I7, X##_f[6] = I6, X##_f[5] = I5, X##_f[4] = I4,         \
+   X##_f[3] = I3, X##_f[2] = I2, X##_f[1] = I1, X##_f[0] = I0)
+
 #endif /* !SOFT_FP_OP_8_H */