re PR libfortran/35862 ([F2003] Implement new rounding modes for run time)

2013-07-21  Tobias Burnus  <burnus@net-b.de>

        PR fortran/35862
        * libgfortran.h (GFC_FPE_DOWNWARD, GFC_FPE_TONEAREST,
        GFC_FPE_TOWARDZERO, GFC_FPE_UPWARD): New defines.

2013-07-21  Tobias Burnus  <burnus@net-b.de>

        PR fortran/35862
        * libgfortran.h (set_fpu_rounding_mode,
        get_fpu_rounding_mode): New prototypes.
        * config/fpu-387.h (set_fpu_rounding_mode,
        get_fpu_rounding_mode): New functions.
        * config/fpu-aix.h (set_fpu_rounding_mode,
        get_fpu_rounding_mode): Ditto.
        * config/fpu-generic.h (set_fpu_rounding_mode,
        get_fpu_rounding_mode): Ditto.
        * config/fpu-glibc.h (set_fpu_rounding_mode,
        get_fpu_rounding_mode): Ditto.
        * config/fpu-sysv.h (set_fpu_rounding_mode,
        get_fpu_rounding_mode): Ditto.
        * configure.ac: Check for fp_rnd and fp_rnd_t.
        * io/io.h (enum unit_round): Use GFC_FPE_* for the value.
        * io/read.c (convert_real): Set FP ronding mode.
        * Makefile.in: Regenerate.
        * aclocal.m4: Regenerate.
        * config.h.in: Regenerate.
        * configure: Regenerate.

2013-07-21  Tobias Burnus  <burnus@net-b.de>

        PR fortran/35862
        * gfortran.dg/round_4.f90: New.


Co-Authored-By: Uros Bizjak <ubizjak@gmail.com>

From-SVN: r201093

4 files changed, 119 insertions, 0 deletions

diff --git a/gcc/fortran/ChangeLog b/gcc/fortran/ChangeLog
index 3e4ecb8..785cf42 100644
--- a/gcc/fortran/ChangeLog
+++ b/gcc/fortran/ChangeLog
@@ -1,5 +1,11 @@
 2013-07-21  Tobias Burnus  <burnus@net-b.de>
 
+	PR fortran/35862
+	* libgfortran.h (GFC_FPE_DOWNWARD, GFC_FPE_TONEAREST,
+	GFC_FPE_TOWARDZERO, GFC_FPE_UPWARD): New defines.
+
+2013-07-21  Tobias Burnus  <burnus@net-b.de>
+
 	PR fortran/57894
 	* check.c (min_max_args): Add keyword= check.
 
diff --git a/gcc/fortran/libgfortran.h b/gcc/fortran/libgfortran.h
index 30b3b7b..fce5294 100644
--- a/gcc/fortran/libgfortran.h
+++ b/gcc/fortran/libgfortran.h
@@ -43,6 +43,12 @@ along with GCC; see the file COPYING3.  If not see
 #define GFC_FPE_UNDERFLOW  (1<<4)
 #define GFC_FPE_INEXACT    (1<<5)
 
+/* Defines for floating-point rounding modes.  */
+#define GFC_FPE_DOWNWARD   1
+#define GFC_FPE_TONEAREST  2
+#define GFC_FPE_TOWARDZERO 3
+#define GFC_FPE_UPWARD     4
+
 
 /* Bitmasks for the various runtime checks that can be enabled.  */
 #define GFC_RTCHECK_BOUNDS      (1<<0)
diff --git a/gcc/testsuite/ChangeLog b/gcc/testsuite/ChangeLog
index ad1d274..cf6cef6 100644
--- a/gcc/testsuite/ChangeLog
+++ b/gcc/testsuite/ChangeLog
@@ -1,5 +1,10 @@
 2013-07-21  Tobias Burnus  <burnus@net-b.de>
 
+	PR fortran/35862
+	* gfortran.dg/round_4.f90: New.
+
+2013-07-21  Tobias Burnus  <burnus@net-b.de>
+
 	PR fortran/57894
 	* gfortran.dg/min_max_conformance_2.f90: New.
 
diff --git a/gcc/testsuite/gfortran.dg/round_4.f90 b/gcc/testsuite/gfortran.dg/round_4.f90
new file mode 100644
index 0000000..8a7d95b
--- /dev/null
+++ b/gcc/testsuite/gfortran.dg/round_4.f90
@@ -0,0 +1,102 @@
+! { dg-do run }
+! { dg-add-options ieee }
+!
+! PR fortran/35862
+!
+! Test whether I/O rounding works. Uses internally (libgfortran) strtod
+! for the conversion - and sets the CPU rounding mode accordingly.
+!
+! If it doesn't work on your system, please check whether strtod handles
+! rounding and whether your system is supported in libgfortran/config/fpu*.c
+!
+! Please only add ... run { target { ! { triplets } } } if it is unfixable
+! on your target - and a note why (strtod doesn't handle it, no rounding
+! support, etc.)
+!
+program main
+  use iso_fortran_env
+  implicit none
+
+  ! The following uses kinds=10 and 16 if available or
+  ! 8 and 10 - or 8 and 16 - or 4 and 8.
+  integer, parameter :: xp = real_kinds(ubound(real_kinds,dim=1)-1)
+  integer, parameter :: qp = real_kinds(ubound(real_kinds,dim=1))
+
+  real(4) :: r4p, r4m, ref4u, ref4d
+  real(8) :: r8p, r8m, ref8u, ref8d
+  real(xp) :: r10p, r10m, ref10u, ref10d
+  real(qp) :: r16p, r16m, ref16u, ref16d
+  character(len=20) :: str, round
+
+  ref4u = 0.100000001_4
+  ref8u = 0.10000000000000001_8
+
+  if (xp == 4) then
+    ref10u = 0.100000001_xp
+  elseif (xp == 8) then
+    ref10u = 0.10000000000000001_xp
+  else ! xp == 10
+    ref10u = 0.1000000000000000000014_xp
+  end if
+
+  if (qp == 8) then
+    ref16u = 0.10000000000000001_qp
+  elseif (qp == 10) then
+    ref16u = 0.1000000000000000000014_qp
+  else ! qp == 16
+    ref16u = 0.10000000000000000000000000000000000481_qp
+  end if
+
+ ! ref*d = 9.999999...
+ ref4d = nearest (ref4u, -1.0_4)
+ ref8d = nearest (ref8u, -1.0_8)
+ ref10d = nearest (ref10u, -1.0_xp)
+ ref16d = nearest (ref16u, -1.0_qp)
+
+  round = 'up'
+  call t()
+  if (r4p  /= ref4u  .or. r4m  /= -ref4d)  call abort()
+  if (r8p  /= ref8u  .or. r8m  /= -ref8d)  call abort()
+  if (r10p /= ref10u .or. r10m /= -ref10d) call abort()
+  if (r16p /= ref16u .or. r16m /= -ref16d) call abort()
+
+  round = 'down'
+  call t()
+  if (r4p  /= ref4d  .or. r4m  /= -ref4u)  call abort()
+  if (r8p  /= ref8d  .or. r8m  /= -ref8u)  call abort()
+  if (r10p /= ref10d .or. r10m /= -ref10u) call abort()
+  if (r16p /= ref16d .or. r16m /= -ref16u) call abort()
+
+  round = 'zero'
+  call t()
+  if (r4p  /= ref4d  .or. r4m  /= -ref4d)  call abort()
+  if (r8p  /= ref8d  .or. r8m  /= -ref8d)  call abort()
+  if (r10p /= ref10d .or. r10m /= -ref10d) call abort()
+  if (r16p /= ref16d .or. r16m /= -ref16d) call abort()
+
+  round = 'nearest'
+  call t()
+  if (r4p  /= ref4u  .or. r4m  /= -ref4u)  call abort()
+  if (r8p  /= ref8u  .or. r8m  /= -ref8u)  call abort()
+  if (r10p /= ref10u .or. r10m /= -ref10u) call abort()
+  if (r16p /= ref16u .or. r16m /= -ref16u) call abort()
+
+! Same as nearest (but rounding towards zero if there is a tie
+! [does not apply here])
+  round = 'compatible'
+  call t()
+  if (r4p  /= ref4u  .or. r4m  /= -ref4u)  call abort()
+  if (r8p  /= ref8u  .or. r8m  /= -ref8u)  call abort()
+  if (r10p /= ref10u .or. r10m /= -ref10u) call abort()
+  if (r16p /= ref16u .or. r16m /= -ref16u) call abort()
+contains
+  subroutine t()
+!    print *, round
+    str = "0.1 0.1 0.1 0.1"
+    read (str, *,round=round) r4p, r8p, r10p, r16p
+!    write (*, '(*(g0:"  "))') r4p, r8p, r10p, r16p
+    str = "-0.1 -0.1 -0.1 -0.1"
+    read (str, *,round=round) r4m, r8m, r10m, r16m
+!    write (*, *) r4m, r8m, r10m, r16m
+  end subroutine t
+end program main