* [Patch, Fortran] Print floating-point exception status after STOP/ERROR STOP
@ 2013-06-12 13:05 Tobias Burnus
2013-06-12 14:04 ` Uros Bizjak
` (4 more replies)
0 siblings, 5 replies; 15+ messages in thread
From: Tobias Burnus @ 2013-06-12 13:05 UTC (permalink / raw)
To: gcc patches, gfortran, David Edelsohn, Uros Bizjak
[-- Attachment #1: Type: text/plain, Size: 1802 bytes --]
David: Can you have a look at libgfortran/config/fpu-aix.h - Thanks!
Uros: Can you have a look at libgfortran/config/fpu-387.h - Thanks!
The attached patch causes gfortran-compiled programs to print warnings like
Note: The following floating-point status flag is signalling:
IEEE_DIVIDE_BY_ZERO
when STOP / ERROR STOP is invoked. That's required by Fortran 2008 (8.4
STOP and ERROR STOP statements):
"If any exception (14) is signaling on that image, the processor shall
issue a warning indicating which exceptions are signaling; this warning
shall be on the unit identified by the named constant ERROR UNIT
(13.8.2.8)."
From the J3 discussion at
http://mailman.j3-fortran.org/pipermail/j3/2013-June/006452.html
* sunf77 shows this message - and user complained - even if it didn't
report inexact exceptions
* Intel: There is an option to dis-/enable this option (-assume
[no]fpe_summary; default: no warning)
* NAG: Never reports inexact. Only underflow handling has a compiler
option (as users complained; -no_underflow_warning
* PGI reports all (denorm, underflow, inexact) by default (and seemingly
no compiler option exists)
* Cray: I couldn't find a compiler option to turn the warning on.
The patch below follows NAG by always printing the warning, but the
underflow warning can be disabled. (It also always ignores denormalized
status flags.)
One surely could extend it to allow to completely disable the warning -
or to make it more fine grained like "none", "all" plus all single flags
(including underflow, denormal and inexact, where by default one leaves
out inexact).
Comments?
Test case:
real, volatile :: r
! Divide by zero:
r = 0
r = 1.0/r
! Underflow:
!r = tiny(r)
!r = r/100.
stop
end
Build and regtested on x86-64-gnu-linux.
OK for the trunk?
Tobias
[-- Attachment #2: execept-stat.diff --]
[-- Type: text/x-patch, Size: 18111 bytes --]
2013-06-12 Tobias Burnus <burnus@net-b.de>
* gfortran.h (gfc_option_t): Add flag_underflow_warning.
* gfortran.texi (_gfortran_set_options): Update.
* invoke.texi (-funderflow-warning): Add doc.
* lang.opt (fno-underflow-warning): Add flag.
* options.c (gfc_init_options, gfc_handle_option): Handle it.
* trans-decl.c (create_main_function): Update
_gfortran_set_options call.
2013-06-12 Tobias Burnus <burnus@net-b.de>
* libgfortran.h (compile_options_t) Add underflow_warning.
(get_fpu_except_flags): New prototype.
* runtime/compile_options.c (set_options, init_compile_options):
Handle underflow_warning.
* runtime/stop.c (report_exception): New function.
(stop_numeric, stop_numeric_f08, stop_string, error_stop_string,
error_stop_numeric): Call it.
* config/fpu-387.h (get_fpu_except_flags): New function.
* config/fpu-aix.h (get_fpu_except_flags): New function.
* config/fpu-generic.h (get_fpu_except_flags): New function.
* config/fpu-glibc.h (get_fpu_except_flags): New function.
* config/fpu-glibc.h (get_fpu_except_flags): New function.
* configure.ac: Check for fpxcp.h.
* configure: Regenerate.
* config.h.in: Regenerate.
diff --git a/gcc/fortran/gfortran.h b/gcc/fortran/gfortran.h
index 14da0af..28b47ac 100644
--- a/gcc/fortran/gfortran.h
+++ b/gcc/fortran/gfortran.h
@@ -2299,6 +2299,7 @@ typedef struct
int flag_align_commons;
int flag_protect_parens;
int flag_realloc_lhs;
+ int flag_underflow_warning;
int flag_aggressive_function_elimination;
int flag_frontend_optimize;
diff --git a/gcc/fortran/gfortran.texi b/gcc/fortran/gfortran.texi
index 4a31a77..d8ed562 100644
--- a/gcc/fortran/gfortran.texi
+++ b/gcc/fortran/gfortran.texi
@@ -2855,13 +2855,16 @@ Default: enabled.
are (bitwise or-ed): GFC_RTCHECK_BOUNDS (1), GFC_RTCHECK_ARRAY_TEMPS (2),
GFC_RTCHECK_RECURSION (4), GFC_RTCHECK_DO (16), GFC_RTCHECK_POINTER (32).
Default: disabled.
+@item @var{option}[7] @tab Unused.
+@item @var{option}[8] @tab Show a warning when invoking @code{STOP} and
+@code{ERROR STOP} if a floating-point underflow occurred.
@end multitable
@item @emph{Example}:
@smallexample
- /* Use gfortran 4.8 default options. */
- static int options[] = @{68, 511, 0, 0, 1, 1, 0@};
- _gfortran_set_options (7, &options);
+ /* Use gfortran 4.9 default options. */
+ static int options[] = @{68, 511, 0, 0, 1, 1, 0, 0, 1@};
+ _gfortran_set_options (9, &options);
@end smallexample
@end table
diff --git a/gcc/fortran/invoke.texi b/gcc/fortran/invoke.texi
index 12c200e..63a1ffb 100644
--- a/gcc/fortran/invoke.texi
+++ b/gcc/fortran/invoke.texi
@@ -1157,8 +1157,17 @@ negative in the @code{SIGN} intrinsic. @option{-fno-sign-zero} does not
print the negative sign of zero values (or values rounded to zero for I/O)
and regards zero as positive number in the @code{SIGN} intrinsic for
compatibility with Fortran 77. The default is @option{-fsign-zero}.
+
+@item -fno-underflow-warning
+@opindex @code{funderflow-warning}
+When @code{STOP} and @code{ERROR STOP} is invoked, a warning is printed to
+@code{ERROR_UNIT} if a floating-point status flag is set (other than inexact).
+When @option{-fno-underflow-warning} is set, no warning is shown if a
+floating-point underflow occurred. The default is
+@option{-funderflow-warning}.
@end table
+
@node Code Gen Options
@section Options for code generation conventions
@cindex code generation, conventions
diff --git a/gcc/fortran/lang.opt b/gcc/fortran/lang.opt
index dbc3f6b..e0e71b4 100644
--- a/gcc/fortran/lang.opt
+++ b/gcc/fortran/lang.opt
@@ -585,6 +585,10 @@ fshort-enums
Fortran Var(flag_short_enums)
; Documented in C
+funderflow-warning
+Fortran
+On run-time exit, show a warning if an underflow occurred
+
fsign-zero
Fortran
Apply negative sign to zero values
diff --git a/gcc/fortran/options.c b/gcc/fortran/options.c
index 3f5de03..34d066d 100644
--- a/gcc/fortran/options.c
+++ b/gcc/fortran/options.c
@@ -157,6 +157,7 @@ gfc_init_options (unsigned int decoded_options_count,
gfc_option.flag_align_commons = 1;
gfc_option.flag_protect_parens = -1;
gfc_option.flag_realloc_lhs = -1;
+ gfc_option.flag_underflow_warning = 1;
gfc_option.flag_aggressive_function_elimination = 0;
gfc_option.flag_frontend_optimize = -1;
@@ -980,6 +981,10 @@ gfc_handle_option (size_t scode, const char *arg, int value,
gfc_option.flag_sign_zero = value;
break;
+ case OPT_funderflow_warning:
+ gfc_option.flag_underflow_warning = value;
+ break;
+
case OPT_ffpe_trap_:
gfc_handle_fpe_trap_option (arg);
break;
diff --git a/gcc/fortran/trans-decl.c b/gcc/fortran/trans-decl.c
index 87652ba..06a299f 100644
--- a/gcc/fortran/trans-decl.c
+++ b/gcc/fortran/trans-decl.c
@@ -5171,14 +5239,15 @@ create_main_function (tree fndecl)
/* TODO: This is the -frange-check option, which no longer affects
library behavior; when bumping the library ABI this slot can be
reused for something else. As it is the last element in the
- array, we can instead leave it out altogether.
+ array, we can instead leave it out altogether. */
+ CONSTRUCTOR_APPEND_ELT (v, NULL_TREE,
+ build_int_cst (integer_type_node, 0));
CONSTRUCTOR_APPEND_ELT (v, NULL_TREE,
build_int_cst (integer_type_node,
- gfc_option.flag_range_check));
- */
+ gfc_option.flag_underflow_warning));
array_type = build_array_type (integer_type_node,
- build_index_type (size_int (6)));
+ build_index_type (size_int (8)));
array = build_constructor (array_type, v);
TREE_CONSTANT (array) = 1;
TREE_STATIC (array) = 1;
@@ -5193,7 +5262,7 @@ create_main_function (tree fndecl)
tmp = build_call_expr_loc (input_location,
gfor_fndecl_set_options, 2,
- build_int_cst (integer_type_node, 7), var);
+ build_int_cst (integer_type_node, 9), var);
gfc_add_expr_to_block (&body, tmp);
}
diff --git a/libgfortran/config/fpu-387.h b/libgfortran/config/fpu-387.h
index 913eb60..7492127 100644
--- a/libgfortran/config/fpu-387.h
+++ b/libgfortran/config/fpu-387.h
@@ -134,3 +134,37 @@ void set_fpu (void)
asm volatile ("%vldmxcsr %0" : : "m" (cw_sse));
}
}
+
+
+int
+get_fpu_except_flags (void)
+{
+ int result;
+ unsigned short cw;
+
+ __asm__ ("fnstsw %0" : "=a" (cw));
+
+ if (has_sse())
+ {
+ unsigned int cw_sse;
+ __asm__ ("stmxcsr %0" : "=m" (*&cw_sse));
+ cw |= cw_sse;
+ }
+
+ if (cw & _FPU_MASK_IM)
+ result |= GFC_FPE_INVALID;
+
+ if (cw & _FPU_MASK_ZM)
+ result |= GFC_FPE_ZERO;
+
+ if (cw & _FPU_MASK_OM)
+ result |= GFC_FPE_OVERFLOW;
+
+ if (cw & _FPU_MASK_UM)
+ result |= GFC_FPE_UNDERFLOW;
+
+ if (cw & _FPU_MASK_PM)
+ result |= GFC_FPE_INEXACT;
+
+ return result;
+}
diff --git a/libgfortran/config/fpu-aix.h b/libgfortran/config/fpu-aix.h
index bcb5500..1ba9d4c 100644
--- a/libgfortran/config/fpu-aix.h
+++ b/libgfortran/config/fpu-aix.h
@@ -29,6 +29,10 @@ see the files COPYING3 and COPYING.RUNTIME respectively. If not, see
#include <fptrap.h>
#endif
+#ifdef HAVE_FPXCP_H
+#include <fpxcp.h>
+#endif
+
void
set_fpu (void)
{
@@ -81,3 +85,34 @@ set_fpu (void)
fp_trap(FP_TRAP_SYNC);
fp_enable(mode);
}
+
+
+int
+get_fpu_except_flags (void)
+{
+ int result, set_excepts;
+
+ result = 0;
+
+#ifdef HAVE_FPXCP_H
+ if (!fp_any_xcp ())
+ return 0;
+
+ if (fp_invalid_op ())
+ result |= GFC_FPE_INVALID;
+
+ if (fp_divbyzero ())
+ result |= GFC_FPE_ZERO;
+
+ if (fp_overflow ())
+ result |= GFC_FPE_OVERFLOW;
+
+ if (fp_underflow ())
+ result |= GFC_FPE_UNDERFLOW;
+
+ if (fp_inexact ())
+ result |= GFC_FPE_INEXACT;
+#endif
+
+ return result;
+}
diff --git a/libgfortran/config/fpu-generic.h b/libgfortran/config/fpu-generic.h
index 23212f8..4223f2e 100644
--- a/libgfortran/config/fpu-generic.h
+++ b/libgfortran/config/fpu-generic.h
@@ -50,3 +50,9 @@ set_fpu (void)
estr_write ("Fortran runtime warning: IEEE 'inexact' "
"exception not supported.\n");
}
+
+int
+get_fpu_except_flags (void)
+{
+ return 0;
+}
diff --git a/libgfortran/config/fpu-glibc.h b/libgfortran/config/fpu-glibc.h
index 5c7ad84..b300372 100644
--- a/libgfortran/config/fpu-glibc.h
+++ b/libgfortran/config/fpu-glibc.h
@@ -85,3 +85,40 @@ void set_fpu (void)
"exception not supported.\n");
#endif
}
+
+
+int
+get_fpu_except_flags (void)
+{
+ int result, set_excepts;
+
+ result = 0;
+ set_excepts = fetestexcept (FE_ALL_EXCEPT);
+
+#ifdef FE_INVALID
+ if (set_excepts & FE_INVALID)
+ result |= GFC_FPE_INVALID;
+#endif
+
+#ifdef FE_DIVBYZERO
+ if (set_excepts & FE_DIVBYZERO)
+ result |= GFC_FPE_ZERO;
+#endif
+
+#ifdef FE_OVERFLOW
+ if (set_excepts & FE_OVERFLOW)
+ result |= GFC_FPE_OVERFLOW;
+#endif
+
+#ifdef FE_UNDERFLOW
+ if (set_excepts & FE_UNDERFLOW)
+ result |= GFC_FPE_UNDERFLOW;
+#endif
+
+#ifdef FE_INEXACT
+ if (set_excepts & FE_INEXACT)
+ result |= GFC_FPE_INEXACT;
+#endif
+
+ return result;
+}
diff --git a/libgfortran/config/fpu-sysv.h b/libgfortran/config/fpu-sysv.h
index b32702b..160c4b5 100644
--- a/libgfortran/config/fpu-sysv.h
+++ b/libgfortran/config/fpu-sysv.h
@@ -80,3 +80,40 @@ set_fpu (void)
fpsetmask(cw);
}
+
+int
+get_fpu_except_flags (void)
+{
+ int result;
+ fp_except_t set_excepts;
+
+ result = 0;
+ set_excepts = fpgetsticky ();
+
+#ifdef FP_X_INV
+ if (set_excepts & FP_X_INV)
+ result |= GFC_FPE_INVALID;
+#endif
+
+#ifdef FP_X_DZ
+ if (set_excepts & FP_X_DZ)
+ result |= GFC_FPE_ZERO;
+#endif
+
+#ifdef FP_X_OFL
+ if (set_excepts & FP_X_OFL)
+ result |= GFC_FPE_OVERFLOW;
+#endif
+
+#ifdef FP_X_UFL
+ if (set_excepts & FP_X_UFL)
+ result |= GFC_FPE_UNDERFLOW;
+#endif
+
+#ifdef FP_X_IMP
+ if (set_excepts & FP_X_IMP)
+ result |= GFC_FPE_INEXACT;
+#endif
+
+ return result;
+}
diff --git a/libgfortran/configure.ac b/libgfortran/configure.ac
index 7d97fed..ba14f1f 100644
--- a/libgfortran/configure.ac
+++ b/libgfortran/configure.ac
@@ -254,7 +254,7 @@ AC_CHECK_TYPES([ptrdiff_t])
# check header files (we assume C89 is available, so don't check for that)
AC_CHECK_HEADERS_ONCE(unistd.h sys/time.h sys/times.h sys/resource.h \
sys/types.h sys/stat.h sys/wait.h floatingpoint.h ieeefp.h fenv.h fptrap.h \
-pwd.h complex.h)
+fpxcp.h pwd.h complex.h)
GCC_HEADER_STDINT(gstdint.h)
diff --git a/libgfortran/libgfortran.h b/libgfortran/libgfortran.h
index 56c9871..cc759ac 100644
--- a/libgfortran/libgfortran.h
+++ b/libgfortran/libgfortran.h
@@ -534,6 +534,7 @@ typedef struct
size_t record_marker;
int max_subrecord_length;
int bounds_check;
+ int underflow_warning;
}
compile_options_t;
@@ -742,6 +743,8 @@ internal_proto(gf_strerror);
extern void set_fpu (void);
internal_proto(set_fpu);
+extern int get_fpu_except_flags (void);
+internal_proto(get_fpu_except_flags);
/* memory.c */
diff --git a/libgfortran/runtime/compile_options.c b/libgfortran/runtime/compile_options.c
index a49514c..8246606 100644
--- a/libgfortran/runtime/compile_options.c
+++ b/libgfortran/runtime/compile_options.c
@@ -173,6 +173,8 @@ set_options (int num, int options[])
the library behavior; range checking is now always done when
parsing integers. It's place in the options array is retained due
to ABI compatibility. Remove when bumping the library ABI. */
+ if (num >= 9)
+ compile_options.underflow_warning = options[8];
/* If backtrace is required, we set signal handlers on the POSIX
2001 signals with core action. */
@@ -225,6 +227,7 @@ init_compile_options (void)
compile_options.pedantic = 0;
compile_options.backtrace = 0;
compile_options.sign_zero = 1;
+ compile_options.underflow_warning = 1;
}
/* Function called by the front-end to tell us the
diff --git a/libgfortran/runtime/stop.c b/libgfortran/runtime/stop.c
index 4805412..00cd717 100644
--- a/libgfortran/runtime/stop.c
+++ b/libgfortran/runtime/stop.c
@@ -32,6 +32,37 @@ see the files COPYING3 and COPYING.RUNTIME respectively. If not, see
#endif
+/* Fortran 2008 demands: If any exception (14) is signaling on that image, the
+ processor shall issue a warning indicating which exceptions are signaling;
+ this warning shall be on the unit identified by the named constant
+ ERROR_UNIT (13.8.2.8). In line with other compilers, we do not report
+ inexact - and we optionally ignore underflow, cf. thread starting at
+ http://mailman.j3-fortran.org/pipermail/j3/2013-June/006452.html. */
+
+static void
+report_exception (void)
+{
+ int set_excepts = get_fpu_except_flags ();
+ if (!set_excepts)
+ return;
+
+ estr_write ("Note: The following floating-point status flag is signalling:");
+
+ if (set_excepts & GFC_FPE_INVALID)
+ estr_write (" IEEE INVALID FLAG");
+ if (set_excepts & GFC_FPE_ZERO)
+ estr_write (" IEEE_DIVIDE_BY_ZERO");
+ if (set_excepts & GFC_FPE_OVERFLOW)
+ estr_write (" IEEE_OVERFLOW_FLAG");
+ if (compile_options.underflow_warning && (set_excepts & GFC_FPE_UNDERFLOW))
+ estr_write (" IEEE_UNDERFLOW_FLAG");
+ /* if (set_excepts & GFC_FPE_INEXACT)
+ estr_write (" IEEE_INEXACT_FLAG"); */
+
+ estr_write ("\n");
+}
+
+
/* A numeric STOP statement. */
extern void stop_numeric (GFC_INTEGER_4)
@@ -41,6 +72,7 @@ export_proto(stop_numeric);
void
stop_numeric (GFC_INTEGER_4 code)
{
+ report_exception ();
if (code == -1)
code = 0;
else
@@ -59,6 +91,7 @@ export_proto(stop_numeric_f08);
void
stop_numeric_f08 (GFC_INTEGER_4 code)
{
+ report_exception ();
st_printf ("STOP %d\n", (int)code);
exit (code);
}
@@ -69,6 +102,7 @@ stop_numeric_f08 (GFC_INTEGER_4 code)
void
stop_string (const char *string, GFC_INTEGER_4 len)
{
+ report_exception ();
if (string)
{
estr_write ("STOP ");
@@ -91,6 +125,7 @@ export_proto(error_stop_string);
void
error_stop_string (const char *string, GFC_INTEGER_4 len)
{
+ report_exception ();
estr_write ("ERROR STOP ");
(void) write (STDERR_FILENO, string, len);
estr_write ("\n");
@@ -108,6 +143,7 @@ export_proto(error_stop_numeric);
void
error_stop_numeric (GFC_INTEGER_4 code)
{
+ report_exception ();
st_printf ("ERROR STOP %d\n", (int) code);
exit (code);
}
diff --git a/libgfortran/config.h.in b/libgfortran/config.h.in
index fb5026f..0d5d56c 100644
--- a/libgfortran/config.h.in
+++ b/libgfortran/config.h.in
@@ -399,6 +399,9 @@
/* Define to 1 if you have the <fptrap.h> header file. */
#undef HAVE_FPTRAP_H
+/* Define to 1 if you have the <fpxcp.h> header file. */
+#undef HAVE_FPXCP_H
+
/* fp_enable is present */
#undef HAVE_FP_ENABLE
diff --git a/libgfortran/configure b/libgfortran/configure
index 8601d84..c049cdc 100755
--- a/libgfortran/configure
+++ b/libgfortran/configure
@@ -654,7 +654,6 @@ CPP
am__fastdepCC_FALSE
am__fastdepCC_TRUE
CCDEPMODE
-am__nodep
AMDEPBACKSLASH
AMDEP_FALSE
AMDEP_TRUE
@@ -2543,6 +2542,7 @@ as_fn_append ac_header_list " floatingpoint.h"
as_fn_append ac_header_list " ieeefp.h"
as_fn_append ac_header_list " fenv.h"
as_fn_append ac_header_list " fptrap.h"
+as_fn_append ac_header_list " fpxcp.h"
as_fn_append ac_header_list " pwd.h"
as_fn_append ac_header_list " complex.h"
as_fn_append ac_func_list " getrusage"
@@ -3386,11 +3386,11 @@ MAKEINFO=${MAKEINFO-"${am_missing_run}makeinfo"}
# We need awk for the "check" target. The system "awk" is bad on
# some platforms.
-# Always define AMTAR for backward compatibility. Yes, it's still used
-# in the wild :-( We should find a proper way to deprecate it ...
-AMTAR='$${TAR-tar}'
+# Always define AMTAR for backward compatibility.
-am__tar='$${TAR-tar} chof - "$$tardir"' am__untar='$${TAR-tar} xf -'
+AMTAR=${AMTAR-"${am_missing_run}tar"}
+
+am__tar='${AMTAR} chof - "$$tardir"'; am__untar='${AMTAR} xf -'
@@ -3523,7 +3523,6 @@ fi
if test "x$enable_dependency_tracking" != xno; then
am_depcomp="$ac_aux_dir/depcomp"
AMDEPBACKSLASH='\'
- am__nodep='_no'
fi
if test "x$enable_dependency_tracking" != xno; then
AMDEP_TRUE=
@@ -4341,7 +4340,6 @@ else
# instance it was reported that on HP-UX the gcc test will end up
# making a dummy file named `D' -- because `-MD' means `put the output
# in D'.
- rm -rf conftest.dir
mkdir conftest.dir
# Copy depcomp to subdir because otherwise we won't find it if we're
# using a relative directory.
@@ -4401,7 +4399,7 @@ else
break
fi
;;
- msvc7 | msvc7msys | msvisualcpp | msvcmsys)
+ msvisualcpp | msvcmsys)
# This compiler won't grok `-c -o', but also, the minuso test has
# not run yet. These depmodes are late enough in the game, and
# so weak that their functioning should not be impacted.
@@ -5517,7 +5515,6 @@ else
# instance it was reported that on HP-UX the gcc test will end up
# making a dummy file named `D' -- because `-MD' means `put the output
# in D'.
- rm -rf conftest.dir
mkdir conftest.dir
# Copy depcomp to subdir because otherwise we won't find it if we're
# using a relative directory.
@@ -5577,7 +5574,7 @@ else
break
fi
;;
- msvc7 | msvc7msys | msvisualcpp | msvcmsys)
+ msvisualcpp | msvcmsys)
# This compiler won't grok `-c -o', but also, the minuso test has
# not run yet. These depmodes are late enough in the game, and
# so weak that their functioning should not be impacted.
@@ -12334,7 +12331,7 @@ else
lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
lt_status=$lt_dlunknown
cat > conftest.$ac_ext <<_LT_EOF
-#line 12337 "configure"
+#line 12334 "configure"
#include "confdefs.h"
#if HAVE_DLFCN_H
@@ -12440,7 +12437,7 @@ else
lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
lt_status=$lt_dlunknown
cat > conftest.$ac_ext <<_LT_EOF
-#line 12443 "configure"
+#line 12440 "configure"
#include "confdefs.h"
#if HAVE_DLFCN_H
@@ -16001,6 +15998,8 @@ done
+
+
inttype_headers=`echo inttypes.h sys/inttypes.h | sed -e 's/,/ /g'`
acx_cv_header_stdint=stddef.h
^ permalink raw reply [flat|nested] 15+ messages in thread
* Re: [Patch, Fortran] Print floating-point exception status after STOP/ERROR STOP
2013-06-12 13:05 [Patch, Fortran] Print floating-point exception status after STOP/ERROR STOP Tobias Burnus
@ 2013-06-12 14:04 ` Uros Bizjak
2013-06-12 15:47 ` David Edelsohn
` (3 subsequent siblings)
4 siblings, 0 replies; 15+ messages in thread
From: Uros Bizjak @ 2013-06-12 14:04 UTC (permalink / raw)
To: Tobias Burnus; +Cc: gcc patches, gfortran, David Edelsohn
On Wed, Jun 12, 2013 at 3:05 PM, Tobias Burnus <burnus@net-b.de> wrote:
> David: Can you have a look at libgfortran/config/fpu-aix.h - Thanks!
> Uros: Can you have a look at libgfortran/config/fpu-387.h - Thanks!
>
+ unsigned short cw;
+
+ __asm__ ("fnstsw %0" : "=a" (cw));
__asm__ __volatile__ ("fnstsw\t%0" : "=a" (cw));
fnstsw uses processor state (x87 status word) that is hidden to gcc,
so it needs to be __volatile__.
+ if (has_sse())
+ {
+ unsigned int cw_sse;
+ __asm__ ("stmxcsr %0" : "=m" (*&cw_sse));
also __asm__ __volatile__ ("%vstmxcsr\t%0" : "=m" (cw_sse));
%v will conditionally emit "v" prefix for TARGET_AVX.
+ cw |= cw_sse;
+ }
Looks OK otherwise.
Thanks,
Uros.
^ permalink raw reply [flat|nested] 15+ messages in thread
* Re: [Patch, Fortran] Print floating-point exception status after STOP/ERROR STOP
2013-06-12 13:05 [Patch, Fortran] Print floating-point exception status after STOP/ERROR STOP Tobias Burnus
2013-06-12 14:04 ` Uros Bizjak
@ 2013-06-12 15:47 ` David Edelsohn
2013-06-12 15:50 ` Tobias Burnus
` (2 subsequent siblings)
4 siblings, 0 replies; 15+ messages in thread
From: David Edelsohn @ 2013-06-12 15:47 UTC (permalink / raw)
To: Tobias Burnus; +Cc: gcc patches, gfortran, Uros Bizjak
On Wed, Jun 12, 2013 at 9:05 AM, Tobias Burnus <burnus@net-b.de> wrote:
> David: Can you have a look at libgfortran/config/fpu-aix.h - Thanks!
> Uros: Can you have a look at libgfortran/config/fpu-387.h - Thanks!
The AIX bits look correct. Thanks very much for investigating AIX support.
Thanks, David
^ permalink raw reply [flat|nested] 15+ messages in thread
* Re: [Patch, Fortran] Print floating-point exception status after STOP/ERROR STOP
2013-06-12 13:05 [Patch, Fortran] Print floating-point exception status after STOP/ERROR STOP Tobias Burnus
2013-06-12 14:04 ` Uros Bizjak
2013-06-12 15:47 ` David Edelsohn
@ 2013-06-12 15:50 ` Tobias Burnus
2013-06-16 17:33 ` Tobias Burnus
2013-06-12 15:55 ` Jakub Jelinek
2013-06-21 13:17 ` Eric Botcazou
4 siblings, 1 reply; 15+ messages in thread
From: Tobias Burnus @ 2013-06-12 15:50 UTC (permalink / raw)
To: gcc patches, gfortran
[-- Attachment #1: Type: text/plain, Size: 1562 bytes --]
Updated version:
* Uros suggestions are incorporated
* Changed from -f(no-)underflow-warning to
-ffpe-summary=[none,all,underflow,...]
Tobias Burnus wrote:
> David: Can you have a look at libgfortran/config/fpu-aix.h - Thanks!
>
> The attached patch causes gfortran-compiled programs to print warnings
> like
Note: The following floating-point exception are signalling:
IEEE_DIVIDE_BY_ZERO
> when STOP / ERROR STOP is invoked. That's required by Fortran 2008
> (8.4 STOP and ERROR STOP statements):
>
> "If any exception (14) is signaling on that image, the processor shall
> issue a warning indicating which exceptions are signaling; this
> warning shall be on the unit identified by the named constant ERROR
> UNIT (13.8.2.8)."
> One surely could extend it to allow to completely disable the warning
> - or to make it more fine grained like "none", "all" plus all single
> flags (including underflow, denormal and inexact, where by default one
> leaves out inexact).
Thinking about it, I think that's the better solution: It makes
(optionally) inexact available and also allows to fully disable the
feature. I am sure that there are users who would like to have that
choice. Hence, I update the argument handling and libgfortran's stop.c.
Additions from the J3 list:
* IBM's "XLF compiler has an option to report fp exceptions including
underflow and inexact. It is default OFF."
(which matches ifort)
> Build and regtested on x86-64-gnu-linux.
> OK for the trunk?
Tobias
PS: I filled PR 57598 to track the warning handling for coarrays.
[-- Attachment #2: execept-stat-v2.diff --]
[-- Type: text/x-patch, Size: 20942 bytes --]
2013-06-12 Tobias Burnus <burnus@net-b.de>
* gfortran.h (gfc_option_t): Add fpe_summary.
* gfortran.texi (_gfortran_set_options): Update.
* invoke.texi (-ffpe-summary): Add doc.
* lang.opt (ffpe-summary): Add flag.
* options.c (gfc_init_options, gfc_handle_option): Handle it.
(gfc_handle_fpe_option): Renamed from gfc_handle_fpe_trap_option,
also handle fpe_summary.
* trans-decl.c (create_main_function): Update
_gfortran_set_options call.
2013-06-12 Tobias Burnus <burnus@net-b.de>
* libgfortran.h (compile_options_t) Add fpe_summary.
(get_fpu_except_flags): New prototype.
* runtime/compile_options.c (set_options, init_compile_options):
Handle fpe_summary.
* runtime/stop.c (report_exception): New function.
(stop_numeric, stop_numeric_f08, stop_string, error_stop_string,
error_stop_numeric): Call it.
* config/fpu-387.h (get_fpu_except_flags): New function.
* config/fpu-aix.h (get_fpu_except_flags): New function.
* config/fpu-generic.h (get_fpu_except_flags): New function.
* config/fpu-glibc.h (get_fpu_except_flags): New function.
* config/fpu-glibc.h (get_fpu_except_flags): New function.
* configure.ac: Check for fpxcp.h.
* configure: Regenerate.
* config.h.in: Regenerate.
diff --git a/gcc/fortran/gfortran.h b/gcc/fortran/gfortran.h
index 14da0af..c11ffdd 100644
--- a/gcc/fortran/gfortran.h
+++ b/gcc/fortran/gfortran.h
@@ -2303,6 +2303,7 @@ typedef struct
int flag_frontend_optimize;
int fpe;
+ int fpe_summary;
int rtcheck;
gfc_fcoarray coarray;
diff --git a/gcc/fortran/gfortran.texi b/gcc/fortran/gfortran.texi
index 4a31a77..3f594f2 100644
--- a/gcc/fortran/gfortran.texi
+++ b/gcc/fortran/gfortran.texi
@@ -2855,13 +2855,21 @@ Default: enabled.
are (bitwise or-ed): GFC_RTCHECK_BOUNDS (1), GFC_RTCHECK_ARRAY_TEMPS (2),
GFC_RTCHECK_RECURSION (4), GFC_RTCHECK_DO (16), GFC_RTCHECK_POINTER (32).
Default: disabled.
+@item @var{option}[7] @tab Unused.
+@item @var{option}[8] @tab Show a warning when invoking @code{STOP} and
+@code{ERROR STOP} if a floating-point exception occurred. Possible values
+are (bitwise or-ed) @code{GFC_FPE_INVALID} (1), @code{GFC_FPE_DENORMAL} (2),
+@code{GFC_FPE_ZERO} (4), @code{GFC_FPE_OVERFLOW} (8),
+@code{GFC_FPE_UNDERFLOW} (16), @code{GFC_FPE_INEXACT} (32). Default:
+@code{GFC_FPE_INVALID | GFC_FPE_DENORMAL | GFC_FPE_ZERO | GFC_FPE_OVERFLOW
+| GFC_FPE_UNDERFLOW}.
@end multitable
@item @emph{Example}:
@smallexample
- /* Use gfortran 4.8 default options. */
- static int options[] = @{68, 511, 0, 0, 1, 1, 0@};
- _gfortran_set_options (7, &options);
+ /* Use gfortran 4.9 default options. */
+ static int options[] = @{68, 511, 0, 0, 1, 1, 0, 0, 31@};
+ _gfortran_set_options (9, &options);
@end smallexample
@end table
diff --git a/gcc/fortran/invoke.texi b/gcc/fortran/invoke.texi
index 12c200e..b541204 100644
--- a/gcc/fortran/invoke.texi
+++ b/gcc/fortran/invoke.texi
@@ -1021,6 +1021,17 @@ be uninteresting in practice.
By default no exception traps are enabled.
+@item -ffpe-summary=@var{list}
+@opindex @code{ffpe-summary=}@var{list}
+Specify a list of floating-point exceptions, whose flag status is printed
+to @code{ERROR_UNIT} when invoking @code{STOP} and @code{ERROR STOP}.
+@var{list} can be either @samp{none}, @samp{all} or a comma-separated list
+of the following exceptions: @samp{invalid}, @samp{zero}, @samp{overflow},
+@samp{underflow}, @samp{inexact} and @samp{denormal}. (See
+@option{-ffpe-trap} for a description of the exceptions.)
+
+By default, a summary for all exceptions but @samp{inexact} is shown.
+
@item -fno-backtrace
@opindex @code{fno-backtrace}
@cindex backtrace
diff --git a/gcc/fortran/lang.opt b/gcc/fortran/lang.opt
index dbc3f6b..61f77b4 100644
--- a/gcc/fortran/lang.opt
+++ b/gcc/fortran/lang.opt
@@ -441,6 +441,10 @@ ffpe-trap=
Fortran RejectNegative JoinedOrMissing
-ffpe-trap=[...] Stop on following floating point exceptions
+ffpe-summary=
+Fortran RejectNegative JoinedOrMissing
+-ffpe-summary=[...] Print summary of floating point exceptions
+
ffree-form
Fortran RejectNegative
Assume that the source file is free form
diff --git a/gcc/fortran/options.c b/gcc/fortran/options.c
index 3f5de03..31cab1a 100644
--- a/gcc/fortran/options.c
+++ b/gcc/fortran/options.c
@@ -161,6 +161,10 @@ gfc_init_options (unsigned int decoded_options_count,
gfc_option.flag_frontend_optimize = -1;
gfc_option.fpe = 0;
+ /* All except GFC_FPE_INEXACT. */
+ gfc_option.fpe_summary = GFC_FPE_INVALID | GFC_FPE_DENORMAL
+ | GFC_FPE_ZERO | GFC_FPE_OVERFLOW
+ | GFC_FPE_UNDERFLOW;
gfc_option.rtcheck = 0;
gfc_option.coarray = GFC_FCOARRAY_NONE;
@@ -492,8 +496,10 @@ gfc_handle_module_path_options (const char *arg)
}
+/* Handle options -ffpe-trap= and -ffpe-summary=. */
+
static void
-gfc_handle_fpe_trap_option (const char *arg)
+gfc_handle_fpe_option (const char *arg, bool trap)
{
int result, pos = 0, n;
/* precision is a backwards compatibility alias for inexact. */
@@ -505,7 +511,11 @@ gfc_handle_fpe_trap_option (const char *arg)
GFC_FPE_UNDERFLOW, GFC_FPE_INEXACT,
GFC_FPE_INEXACT,
0 };
-
+
+ /* As the default for -ffpe-summary= is nonzero, set it to 0. */
+ if (!trap)
+ gfc_option.fpe_summary = 0;
+
while (*arg)
{
while (*arg == ',')
@@ -515,17 +525,37 @@ gfc_handle_fpe_trap_option (const char *arg)
pos++;
result = 0;
- for (n = 0; exception[n] != NULL; n++)
+ if (!trap && strncmp ("none", arg, pos) == 0)
+ {
+ gfc_option.fpe_summary = 0;
+ arg += pos;
+ pos = 0;
+ continue;
+ }
+ else if (!trap && strncmp ("all", arg, pos) == 0)
{
+ gfc_option.fpe_summary = GFC_FPE_INVALID | GFC_FPE_DENORMAL
+ | GFC_FPE_ZERO | GFC_FPE_OVERFLOW
+ | GFC_FPE_UNDERFLOW | GFC_FPE_INEXACT;
+ arg += pos;
+ pos = 0;
+ continue;
+ }
+ else
+ for (n = 0; exception[n] != NULL; n++)
+ {
if (exception[n] && strncmp (exception[n], arg, pos) == 0)
{
- gfc_option.fpe |= opt_exception[n];
+ if (trap)
+ gfc_option.fpe |= opt_exception[n];
+ else
+ gfc_option.fpe_summary |= opt_exception[n];
arg += pos;
pos = 0;
result = 1;
break;
}
- }
+ }
if (!result)
gfc_fatal_error ("Argument to -ffpe-trap is not valid: %s", arg);
}
@@ -981,7 +1011,11 @@ gfc_handle_option (size_t scode, const char *arg, int value,
break;
case OPT_ffpe_trap_:
- gfc_handle_fpe_trap_option (arg);
+ gfc_handle_fpe_option (arg, true);
+ break;
+
+ case OPT_ffpe_summary_:
+ gfc_handle_fpe_option (arg, false);
break;
case OPT_std_f95:
diff --git a/gcc/fortran/trans-decl.c b/gcc/fortran/trans-decl.c
index 87652ba..f662655 100644
--- a/gcc/fortran/trans-decl.c
+++ b/gcc/fortran/trans-decl.c
@@ -5171,14 +5239,15 @@ create_main_function (tree fndecl)
/* TODO: This is the -frange-check option, which no longer affects
library behavior; when bumping the library ABI this slot can be
reused for something else. As it is the last element in the
- array, we can instead leave it out altogether.
+ array, we can instead leave it out altogether. */
+ CONSTRUCTOR_APPEND_ELT (v, NULL_TREE,
+ build_int_cst (integer_type_node, 0));
CONSTRUCTOR_APPEND_ELT (v, NULL_TREE,
build_int_cst (integer_type_node,
- gfc_option.flag_range_check));
- */
+ gfc_option.fpe_summary));
array_type = build_array_type (integer_type_node,
- build_index_type (size_int (6)));
+ build_index_type (size_int (8)));
array = build_constructor (array_type, v);
TREE_CONSTANT (array) = 1;
TREE_STATIC (array) = 1;
@@ -5193,7 +5262,7 @@ create_main_function (tree fndecl)
tmp = build_call_expr_loc (input_location,
gfor_fndecl_set_options, 2,
- build_int_cst (integer_type_node, 7), var);
+ build_int_cst (integer_type_node, 9), var);
gfc_add_expr_to_block (&body, tmp);
}
diff --git a/libgfortran/config/fpu-387.h b/libgfortran/config/fpu-387.h
index 913eb60..608354d 100644
--- a/libgfortran/config/fpu-387.h
+++ b/libgfortran/config/fpu-387.h
@@ -134,3 +134,40 @@ void set_fpu (void)
asm volatile ("%vldmxcsr %0" : : "m" (cw_sse));
}
}
+
+
+int
+get_fpu_except_flags (void)
+{
+ int result;
+ unsigned short cw;
+
+ __asm__ __volatile__ ("fnstsw\t%0" : "=a" (cw));
+
+ if (has_sse())
+ {
+ unsigned int cw_sse;
+ __asm__ __volatile__ ("%vstmxcsr\t%0" : "=m" (cw_sse));
+ cw |= cw_sse;
+ }
+
+ if (cw & _FPU_MASK_IM)
+ result |= GFC_FPE_INVALID;
+
+ if (cw & _FPU_MASK_ZM)
+ result |= GFC_FPE_ZERO;
+
+ if (cw & _FPU_MASK_OM)
+ result |= GFC_FPE_OVERFLOW;
+
+ if (cw & _FPU_MASK_UM)
+ result |= GFC_FPE_UNDERFLOW;
+
+ if (cw & _FPU_MASK_DM)
+ result |= GFC_FPE_DENORMAL;
+
+ if (cw & _FPU_MASK_PM)
+ result |= GFC_FPE_INEXACT;
+
+ return result;
+}
diff --git a/libgfortran/config/fpu-aix.h b/libgfortran/config/fpu-aix.h
index bcb5500..1ba9d4c 100644
--- a/libgfortran/config/fpu-aix.h
+++ b/libgfortran/config/fpu-aix.h
@@ -29,6 +29,10 @@ see the files COPYING3 and COPYING.RUNTIME respectively. If not, see
#include <fptrap.h>
#endif
+#ifdef HAVE_FPXCP_H
+#include <fpxcp.h>
+#endif
+
void
set_fpu (void)
{
@@ -81,3 +85,34 @@ set_fpu (void)
fp_trap(FP_TRAP_SYNC);
fp_enable(mode);
}
+
+
+int
+get_fpu_except_flags (void)
+{
+ int result, set_excepts;
+
+ result = 0;
+
+#ifdef HAVE_FPXCP_H
+ if (!fp_any_xcp ())
+ return 0;
+
+ if (fp_invalid_op ())
+ result |= GFC_FPE_INVALID;
+
+ if (fp_divbyzero ())
+ result |= GFC_FPE_ZERO;
+
+ if (fp_overflow ())
+ result |= GFC_FPE_OVERFLOW;
+
+ if (fp_underflow ())
+ result |= GFC_FPE_UNDERFLOW;
+
+ if (fp_inexact ())
+ result |= GFC_FPE_INEXACT;
+#endif
+
+ return result;
+}
diff --git a/libgfortran/config/fpu-generic.h b/libgfortran/config/fpu-generic.h
index 23212f8..4223f2e 100644
--- a/libgfortran/config/fpu-generic.h
+++ b/libgfortran/config/fpu-generic.h
@@ -50,3 +50,9 @@ set_fpu (void)
estr_write ("Fortran runtime warning: IEEE 'inexact' "
"exception not supported.\n");
}
+
+int
+get_fpu_except_flags (void)
+{
+ return 0;
+}
diff --git a/libgfortran/config/fpu-glibc.h b/libgfortran/config/fpu-glibc.h
index 5c7ad84..e0d1019 100644
--- a/libgfortran/config/fpu-glibc.h
+++ b/libgfortran/config/fpu-glibc.h
@@ -85,3 +85,45 @@ void set_fpu (void)
"exception not supported.\n");
#endif
}
+
+
+int
+get_fpu_except_flags (void)
+{
+ int result, set_excepts;
+
+ result = 0;
+ set_excepts = fetestexcept (FE_ALL_EXCEPT);
+
+#ifdef FE_INVALID
+ if (set_excepts & FE_INVALID)
+ result |= GFC_FPE_INVALID;
+#endif
+
+#ifdef FE_DIVBYZERO
+ if (set_excepts & FE_DIVBYZERO)
+ result |= GFC_FPE_ZERO;
+#endif
+
+#ifdef FE_OVERFLOW
+ if (set_excepts & FE_OVERFLOW)
+ result |= GFC_FPE_OVERFLOW;
+#endif
+
+#ifdef FE_UNDERFLOW
+ if (set_excepts & FE_UNDERFLOW)
+ result |= GFC_FPE_UNDERFLOW;
+#endif
+
+#ifdef FE_DENORMAL
+ if (set_excepts & FE_DENORMAL)
+ result |= GFC_FPE_DENORMAL;
+#endif
+
+#ifdef FE_INEXACT
+ if (set_excepts & FE_INEXACT)
+ result |= GFC_FPE_INEXACT;
+#endif
+
+ return result;
+}
diff --git a/libgfortran/config/fpu-sysv.h b/libgfortran/config/fpu-sysv.h
index b32702b..8fc52d5 100644
--- a/libgfortran/config/fpu-sysv.h
+++ b/libgfortran/config/fpu-sysv.h
@@ -80,3 +80,45 @@ set_fpu (void)
fpsetmask(cw);
}
+
+int
+get_fpu_except_flags (void)
+{
+ int result;
+ fp_except_t set_excepts;
+
+ result = 0;
+ set_excepts = fpgetsticky ();
+
+#ifdef FP_X_INV
+ if (set_excepts & FP_X_INV)
+ result |= GFC_FPE_INVALID;
+#endif
+
+#ifdef FP_X_DZ
+ if (set_excepts & FP_X_DZ)
+ result |= GFC_FPE_ZERO;
+#endif
+
+#ifdef FP_X_OFL
+ if (set_excepts & FP_X_OFL)
+ result |= GFC_FPE_OVERFLOW;
+#endif
+
+#ifdef FP_X_UFL
+ if (set_excepts & FP_X_UFL)
+ result |= GFC_FPE_UNDERFLOW;
+#endif
+
+#ifdef FP_X_DNML
+ if (set_excepts & FP_X_DNML)
+ result |= GFC_FPE_DENORMAL;
+#endif
+
+#ifdef FP_X_IMP
+ if (set_excepts & FP_X_IMP)
+ result |= GFC_FPE_INEXACT;
+#endif
+
+ return result;
+}
diff --git a/libgfortran/configure.ac b/libgfortran/configure.ac
index 7d97fed..ba14f1f 100644
--- a/libgfortran/configure.ac
+++ b/libgfortran/configure.ac
@@ -254,7 +254,7 @@ AC_CHECK_TYPES([ptrdiff_t])
# check header files (we assume C89 is available, so don't check for that)
AC_CHECK_HEADERS_ONCE(unistd.h sys/time.h sys/times.h sys/resource.h \
sys/types.h sys/stat.h sys/wait.h floatingpoint.h ieeefp.h fenv.h fptrap.h \
-pwd.h complex.h)
+fpxcp.h pwd.h complex.h)
GCC_HEADER_STDINT(gstdint.h)
diff --git a/libgfortran/libgfortran.h b/libgfortran/libgfortran.h
index 56c9871..f22da21 100644
--- a/libgfortran/libgfortran.h
+++ b/libgfortran/libgfortran.h
@@ -534,6 +534,7 @@ typedef struct
size_t record_marker;
int max_subrecord_length;
int bounds_check;
+ int fpe_summary;
}
compile_options_t;
@@ -742,6 +743,8 @@ internal_proto(gf_strerror);
extern void set_fpu (void);
internal_proto(set_fpu);
+extern int get_fpu_except_flags (void);
+internal_proto(get_fpu_except_flags);
/* memory.c */
diff --git a/libgfortran/runtime/compile_options.c b/libgfortran/runtime/compile_options.c
index a49514c..9212671 100644
--- a/libgfortran/runtime/compile_options.c
+++ b/libgfortran/runtime/compile_options.c
@@ -173,6 +173,8 @@ set_options (int num, int options[])
the library behavior; range checking is now always done when
parsing integers. It's place in the options array is retained due
to ABI compatibility. Remove when bumping the library ABI. */
+ if (num >= 9)
+ compile_options.fpe_summary = options[8];
/* If backtrace is required, we set signal handlers on the POSIX
2001 signals with core action. */
@@ -225,6 +227,7 @@ init_compile_options (void)
compile_options.pedantic = 0;
compile_options.backtrace = 0;
compile_options.sign_zero = 1;
+ compile_options.fpe_summary = 1;
}
/* Function called by the front-end to tell us the
diff --git a/libgfortran/runtime/stop.c b/libgfortran/runtime/stop.c
index 4805412..2d4fb62 100644
--- a/libgfortran/runtime/stop.c
+++ b/libgfortran/runtime/stop.c
@@ -32,6 +32,55 @@ see the files COPYING3 and COPYING.RUNTIME respectively. If not, see
#endif
+/* Fortran 2008 demands: If any exception (14) is signaling on that image, the
+ processor shall issue a warning indicating which exceptions are signaling;
+ this warning shall be on the unit identified by the named constant
+ ERROR_UNIT (13.8.2.8). In line with other compilers, we do not report
+ inexact - and we optionally ignore underflow, cf. thread starting at
+ http://mailman.j3-fortran.org/pipermail/j3/2013-June/006452.html. */
+
+static void
+report_exception (void)
+{
+ int set_excepts;
+
+ if (!compile_options.fpe_summary)
+ return;
+
+ set_excepts = get_fpu_except_flags ();
+ if ((set_excepts & compile_options.fpe_summary) == 0)
+ return;
+
+ estr_write ("Note: The following floating-point exceptions are signalling:");
+
+ if ((compile_options.fpe_summary & GFC_FPE_INVALID)
+ && (set_excepts & GFC_FPE_INVALID))
+ estr_write (" IEEE INVALID FLAG");
+
+ if ((compile_options.fpe_summary & GFC_FPE_ZERO)
+ && (set_excepts & GFC_FPE_ZERO))
+ estr_write (" IEEE_DIVIDE_BY_ZERO");
+
+ if ((compile_options.fpe_summary & GFC_FPE_OVERFLOW)
+ && (set_excepts & GFC_FPE_OVERFLOW))
+ estr_write (" IEEE_OVERFLOW_FLAG");
+
+ if ((compile_options.fpe_summary & GFC_FPE_UNDERFLOW)
+ && (set_excepts & GFC_FPE_UNDERFLOW))
+ estr_write (" IEEE_UNDERFLOW_FLAG");
+
+ if ((compile_options.fpe_summary & GFC_FPE_DENORMAL)
+ && (set_excepts & GFC_FPE_DENORMAL))
+ estr_write (" IEEE_DENORMAL");
+
+ if ((compile_options.fpe_summary & GFC_FPE_INEXACT)
+ && (set_excepts & GFC_FPE_INEXACT))
+ estr_write (" IEEE_INEXACT_FLAG");
+
+ estr_write ("\n");
+}
+
+
/* A numeric STOP statement. */
extern void stop_numeric (GFC_INTEGER_4)
@@ -41,6 +90,7 @@ export_proto(stop_numeric);
void
stop_numeric (GFC_INTEGER_4 code)
{
+ report_exception ();
if (code == -1)
code = 0;
else
@@ -59,6 +109,7 @@ export_proto(stop_numeric_f08);
void
stop_numeric_f08 (GFC_INTEGER_4 code)
{
+ report_exception ();
st_printf ("STOP %d\n", (int)code);
exit (code);
}
@@ -69,6 +120,7 @@ stop_numeric_f08 (GFC_INTEGER_4 code)
void
stop_string (const char *string, GFC_INTEGER_4 len)
{
+ report_exception ();
if (string)
{
estr_write ("STOP ");
@@ -91,6 +143,7 @@ export_proto(error_stop_string);
void
error_stop_string (const char *string, GFC_INTEGER_4 len)
{
+ report_exception ();
estr_write ("ERROR STOP ");
(void) write (STDERR_FILENO, string, len);
estr_write ("\n");
@@ -108,6 +161,7 @@ export_proto(error_stop_numeric);
void
error_stop_numeric (GFC_INTEGER_4 code)
{
+ report_exception ();
st_printf ("ERROR STOP %d\n", (int) code);
exit (code);
}
diff --git a/libgfortran/config.h.in b/libgfortran/config.h.in
index fb5026f..0d5d56c 100644
--- a/libgfortran/config.h.in
+++ b/libgfortran/config.h.in
@@ -399,6 +399,9 @@
/* Define to 1 if you have the <fptrap.h> header file. */
#undef HAVE_FPTRAP_H
+/* Define to 1 if you have the <fpxcp.h> header file. */
+#undef HAVE_FPXCP_H
+
/* fp_enable is present */
#undef HAVE_FP_ENABLE
diff --git a/libgfortran/configure b/libgfortran/configure
index 8601d84..c049cdc 100755
--- a/libgfortran/configure
+++ b/libgfortran/configure
@@ -654,7 +654,6 @@ CPP
am__fastdepCC_FALSE
am__fastdepCC_TRUE
CCDEPMODE
-am__nodep
AMDEPBACKSLASH
AMDEP_FALSE
AMDEP_TRUE
@@ -2543,6 +2542,7 @@ as_fn_append ac_header_list " floatingpoint.h"
as_fn_append ac_header_list " ieeefp.h"
as_fn_append ac_header_list " fenv.h"
as_fn_append ac_header_list " fptrap.h"
+as_fn_append ac_header_list " fpxcp.h"
as_fn_append ac_header_list " pwd.h"
as_fn_append ac_header_list " complex.h"
as_fn_append ac_func_list " getrusage"
@@ -3386,11 +3386,11 @@ MAKEINFO=${MAKEINFO-"${am_missing_run}makeinfo"}
# We need awk for the "check" target. The system "awk" is bad on
# some platforms.
-# Always define AMTAR for backward compatibility. Yes, it's still used
-# in the wild :-( We should find a proper way to deprecate it ...
-AMTAR='$${TAR-tar}'
+# Always define AMTAR for backward compatibility.
-am__tar='$${TAR-tar} chof - "$$tardir"' am__untar='$${TAR-tar} xf -'
+AMTAR=${AMTAR-"${am_missing_run}tar"}
+
+am__tar='${AMTAR} chof - "$$tardir"'; am__untar='${AMTAR} xf -'
@@ -3523,7 +3523,6 @@ fi
if test "x$enable_dependency_tracking" != xno; then
am_depcomp="$ac_aux_dir/depcomp"
AMDEPBACKSLASH='\'
- am__nodep='_no'
fi
if test "x$enable_dependency_tracking" != xno; then
AMDEP_TRUE=
@@ -4341,7 +4340,6 @@ else
# instance it was reported that on HP-UX the gcc test will end up
# making a dummy file named `D' -- because `-MD' means `put the output
# in D'.
- rm -rf conftest.dir
mkdir conftest.dir
# Copy depcomp to subdir because otherwise we won't find it if we're
# using a relative directory.
@@ -4401,7 +4399,7 @@ else
break
fi
;;
- msvc7 | msvc7msys | msvisualcpp | msvcmsys)
+ msvisualcpp | msvcmsys)
# This compiler won't grok `-c -o', but also, the minuso test has
# not run yet. These depmodes are late enough in the game, and
# so weak that their functioning should not be impacted.
@@ -5517,7 +5515,6 @@ else
# instance it was reported that on HP-UX the gcc test will end up
# making a dummy file named `D' -- because `-MD' means `put the output
# in D'.
- rm -rf conftest.dir
mkdir conftest.dir
# Copy depcomp to subdir because otherwise we won't find it if we're
# using a relative directory.
@@ -5577,7 +5574,7 @@ else
break
fi
;;
- msvc7 | msvc7msys | msvisualcpp | msvcmsys)
+ msvisualcpp | msvcmsys)
# This compiler won't grok `-c -o', but also, the minuso test has
# not run yet. These depmodes are late enough in the game, and
# so weak that their functioning should not be impacted.
@@ -12334,7 +12331,7 @@ else
lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
lt_status=$lt_dlunknown
cat > conftest.$ac_ext <<_LT_EOF
-#line 12337 "configure"
+#line 12334 "configure"
#include "confdefs.h"
#if HAVE_DLFCN_H
@@ -12440,7 +12437,7 @@ else
lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
lt_status=$lt_dlunknown
cat > conftest.$ac_ext <<_LT_EOF
-#line 12443 "configure"
+#line 12440 "configure"
#include "confdefs.h"
#if HAVE_DLFCN_H
@@ -16001,6 +15998,8 @@ done
+
+
inttype_headers=`echo inttypes.h sys/inttypes.h | sed -e 's/,/ /g'`
acx_cv_header_stdint=stddef.h
^ permalink raw reply [flat|nested] 15+ messages in thread
* Re: [Patch, Fortran] Print floating-point exception status after STOP/ERROR STOP
2013-06-12 13:05 [Patch, Fortran] Print floating-point exception status after STOP/ERROR STOP Tobias Burnus
` (2 preceding siblings ...)
2013-06-12 15:50 ` Tobias Burnus
@ 2013-06-12 15:55 ` Jakub Jelinek
2013-06-21 13:17 ` Eric Botcazou
4 siblings, 0 replies; 15+ messages in thread
From: Jakub Jelinek @ 2013-06-12 15:55 UTC (permalink / raw)
To: Tobias Burnus; +Cc: gcc patches, gfortran, David Edelsohn, Uros Bizjak
On Wed, Jun 12, 2013 at 03:05:30PM +0200, Tobias Burnus wrote:
> --- a/libgfortran/runtime/stop.c
> +++ b/libgfortran/runtime/stop.c
> @@ -32,6 +32,37 @@ see the files COPYING3 and COPYING.RUNTIME respectively. If not, see
> #endif
>
>
> +/* Fortran 2008 demands: If any exception (14) is signaling on that image, the
> + processor shall issue a warning indicating which exceptions are signaling;
> + this warning shall be on the unit identified by the named constant
> + ERROR_UNIT (13.8.2.8). In line with other compilers, we do not report
> + inexact - and we optionally ignore underflow, cf. thread starting at
> + http://mailman.j3-fortran.org/pipermail/j3/2013-June/006452.html. */
> +
> +static void
> +report_exception (void)
> +{
> + int set_excepts = get_fpu_except_flags ();
> + if (!set_excepts)
> + return;
I think if you want to mask some exceptions based on
compile_options (and yes, I think it is highly desirable to have
some compile option to disable any printout on STOP with no arguments),
then I think you want to mask them before testing if (!set_excepts),
otherwise if say undeflow is the only reported exception, you'd print
Note: The following floating-point status flag is signalling:
(and no exceptions). So
if (!compile_options.underflow_warning)
set_excepts &= ~GFC_FPE_UNDERFLOW;
if (!set_excepts)
return;
would be IMHO better.
Jakub
^ permalink raw reply [flat|nested] 15+ messages in thread
* Re: [Patch, Fortran] Print floating-point exception status after STOP/ERROR STOP
2013-06-12 15:50 ` Tobias Burnus
@ 2013-06-16 17:33 ` Tobias Burnus
2013-06-16 21:24 ` Mikael Morin
0 siblings, 1 reply; 15+ messages in thread
From: Tobias Burnus @ 2013-06-16 17:33 UTC (permalink / raw)
To: gcc patches, gfortran
[-- Attachment #1: Type: text/plain, Size: 1848 bytes --]
* PING *
Minor change: Jakub suggested to print no exception status with older
gfortran programs. Hence, the library now defaults to 0. (Older programs
do not pass this argument to the library.) - I also updated
gfortran.texi for that change.
Tobias
On June 12, 2013 17:50, Tobias Burnus wrote:
> Updated version:
> * Uros suggestions are incorporated
> * Changed from -f(no-)underflow-warning to
> -ffpe-summary=[none,all,underflow,...]
>
> Tobias Burnus wrote:
>> The attached patch causes gfortran-compiled programs to print
>> warnings like
> Note: The following floating-point exception are signalling:
> IEEE_DIVIDE_BY_ZERO
>> when STOP / ERROR STOP is invoked. That's required by Fortran 2008
>> (8.4 STOP and ERROR STOP statements):
>>
>> "If any exception (14) is signaling on that image, the processor
>> shall issue a warning indicating which exceptions are signaling; this
>> warning shall be on the unit identified by the named constant ERROR
>> UNIT (13.8.2.8)."
>
>> One surely could extend it to allow to completely disable the warning
>> - or to make it more fine grained like "none", "all" plus all single
>> flags (including underflow, denormal and inexact, where by default
>> one leaves out inexact).
>
> Thinking about it, I think that's the better solution: It makes
> (optionally) inexact available and also allows to fully disable the
> feature. I am sure that there are users who would like to have that
> choice. Hence, I update the argument handling and libgfortran's stop.c.
>
> Additions from the J3 list:
> * IBM's "XLF compiler has an option to report fp exceptions including
> underflow and inexact. It is default OFF."
> (which matches ifort)
>
>> Build and regtested on x86-64-gnu-linux.
>> OK for the trunk?
>
> Tobias
>
> PS: I filled PR 57598 to track the warning handling for coarrays.
[-- Attachment #2: except-stat-v3.diff --]
[-- Type: text/x-patch, Size: 21442 bytes --]
2013-06-16 Tobias Burnus <burnus@net-b.de>
* gfortran.h (gfc_option_t): Add fpe_summary.
* gfortran.texi (_gfortran_set_options): Update.
* invoke.texi (-ffpe-summary): Add doc.
* lang.opt (ffpe-summary): Add flag.
* options.c (gfc_init_options, gfc_handle_option): Handle it.
(gfc_handle_fpe_option): Renamed from gfc_handle_fpe_trap_option,
also handle fpe_summary.
* trans-decl.c (create_main_function): Update
_gfortran_set_options call.
2013-06-16 Tobias Burnus <burnus@net-b.de>
* libgfortran.h (compile_options_t) Add fpe_summary.
(get_fpu_except_flags): New prototype.
* runtime/compile_options.c (set_options, init_compile_options):
Handle fpe_summary.
* runtime/stop.c (report_exception): New function.
(stop_numeric, stop_numeric_f08, stop_string, error_stop_string,
error_stop_numeric): Call it.
* config/fpu-387.h (get_fpu_except_flags): New function.
* config/fpu-aix.h (get_fpu_except_flags): New function.
* config/fpu-generic.h (get_fpu_except_flags): New function.
* config/fpu-glibc.h (get_fpu_except_flags): New function.
* config/fpu-glibc.h (get_fpu_except_flags): New function.
* configure.ac: Check for fpxcp.h.
* configure: Regenerate.
* config.h.in: Regenerate.
diff --git a/gcc/fortran/gfortran.h b/gcc/fortran/gfortran.h
index 14da0af..c11ffdd 100644
--- a/gcc/fortran/gfortran.h
+++ b/gcc/fortran/gfortran.h
@@ -2303,6 +2303,7 @@ typedef struct
int flag_frontend_optimize;
int fpe;
+ int fpe_summary;
int rtcheck;
gfc_fcoarray coarray;
diff --git a/gcc/fortran/gfortran.texi b/gcc/fortran/gfortran.texi
index 4a31a77..ad8cacc 100644
--- a/gcc/fortran/gfortran.texi
+++ b/gcc/fortran/gfortran.texi
@@ -2846,7 +2846,7 @@ standard error. Default: @code{GFC_STD_F95_DEL | GFC_STD_LEGACY}.
Default: off.
@item @var{option}[3] @tab Unused.
@item @var{option}[4] @tab If non zero, enable backtracing on run-time
-errors. Default: off.
+errors. Default: off. (Default in the compiler: on.)
Note: Installs a signal handler and requires command-line
initialization using @code{_gfortran_set_args}.
@item @var{option}[5] @tab If non zero, supports signed zeros.
@@ -2855,13 +2855,21 @@ Default: enabled.
are (bitwise or-ed): GFC_RTCHECK_BOUNDS (1), GFC_RTCHECK_ARRAY_TEMPS (2),
GFC_RTCHECK_RECURSION (4), GFC_RTCHECK_DO (16), GFC_RTCHECK_POINTER (32).
Default: disabled.
+@item @var{option}[7] @tab Unused.
+@item @var{option}[8] @tab Show a warning when invoking @code{STOP} and
+@code{ERROR STOP} if a floating-point exception occurred. Possible values
+are (bitwise or-ed) @code{GFC_FPE_INVALID} (1), @code{GFC_FPE_DENORMAL} (2),
+@code{GFC_FPE_ZERO} (4), @code{GFC_FPE_OVERFLOW} (8),
+@code{GFC_FPE_UNDERFLOW} (16), @code{GFC_FPE_INEXACT} (32). Default: None (0).
+(Default in the compiler: @code{GFC_FPE_INVALID | GFC_FPE_DENORMAL |
+GFC_FPE_ZERO | GFC_FPE_OVERFLOW | GFC_FPE_UNDERFLOW}.)
@end multitable
@item @emph{Example}:
@smallexample
- /* Use gfortran 4.8 default options. */
- static int options[] = @{68, 511, 0, 0, 1, 1, 0@};
- _gfortran_set_options (7, &options);
+ /* Use gfortran 4.9 default options. */
+ static int options[] = @{68, 511, 0, 0, 1, 1, 0, 0, 31@};
+ _gfortran_set_options (9, &options);
@end smallexample
@end table
diff --git a/gcc/fortran/invoke.texi b/gcc/fortran/invoke.texi
index 12c200e..b541204 100644
--- a/gcc/fortran/invoke.texi
+++ b/gcc/fortran/invoke.texi
@@ -1021,6 +1021,17 @@ be uninteresting in practice.
By default no exception traps are enabled.
+@item -ffpe-summary=@var{list}
+@opindex @code{ffpe-summary=}@var{list}
+Specify a list of floating-point exceptions, whose flag status is printed
+to @code{ERROR_UNIT} when invoking @code{STOP} and @code{ERROR STOP}.
+@var{list} can be either @samp{none}, @samp{all} or a comma-separated list
+of the following exceptions: @samp{invalid}, @samp{zero}, @samp{overflow},
+@samp{underflow}, @samp{inexact} and @samp{denormal}. (See
+@option{-ffpe-trap} for a description of the exceptions.)
+
+By default, a summary for all exceptions but @samp{inexact} is shown.
+
@item -fno-backtrace
@opindex @code{fno-backtrace}
@cindex backtrace
diff --git a/gcc/fortran/lang.opt b/gcc/fortran/lang.opt
index dbc3f6b..61f77b4 100644
--- a/gcc/fortran/lang.opt
+++ b/gcc/fortran/lang.opt
@@ -441,6 +441,10 @@ ffpe-trap=
Fortran RejectNegative JoinedOrMissing
-ffpe-trap=[...] Stop on following floating point exceptions
+ffpe-summary=
+Fortran RejectNegative JoinedOrMissing
+-ffpe-summary=[...] Print summary of floating point exceptions
+
ffree-form
Fortran RejectNegative
Assume that the source file is free form
diff --git a/gcc/fortran/options.c b/gcc/fortran/options.c
index 3f5de03..31cab1a 100644
--- a/gcc/fortran/options.c
+++ b/gcc/fortran/options.c
@@ -161,6 +161,10 @@ gfc_init_options (unsigned int decoded_options_count,
gfc_option.flag_frontend_optimize = -1;
gfc_option.fpe = 0;
+ /* All except GFC_FPE_INEXACT. */
+ gfc_option.fpe_summary = GFC_FPE_INVALID | GFC_FPE_DENORMAL
+ | GFC_FPE_ZERO | GFC_FPE_OVERFLOW
+ | GFC_FPE_UNDERFLOW;
gfc_option.rtcheck = 0;
gfc_option.coarray = GFC_FCOARRAY_NONE;
@@ -492,8 +496,10 @@ gfc_handle_module_path_options (const char *arg)
}
+/* Handle options -ffpe-trap= and -ffpe-summary=. */
+
static void
-gfc_handle_fpe_trap_option (const char *arg)
+gfc_handle_fpe_option (const char *arg, bool trap)
{
int result, pos = 0, n;
/* precision is a backwards compatibility alias for inexact. */
@@ -505,7 +511,11 @@ gfc_handle_fpe_trap_option (const char *arg)
GFC_FPE_UNDERFLOW, GFC_FPE_INEXACT,
GFC_FPE_INEXACT,
0 };
-
+
+ /* As the default for -ffpe-summary= is nonzero, set it to 0. */
+ if (!trap)
+ gfc_option.fpe_summary = 0;
+
while (*arg)
{
while (*arg == ',')
@@ -515,17 +525,37 @@ gfc_handle_fpe_trap_option (const char *arg)
pos++;
result = 0;
- for (n = 0; exception[n] != NULL; n++)
+ if (!trap && strncmp ("none", arg, pos) == 0)
+ {
+ gfc_option.fpe_summary = 0;
+ arg += pos;
+ pos = 0;
+ continue;
+ }
+ else if (!trap && strncmp ("all", arg, pos) == 0)
{
+ gfc_option.fpe_summary = GFC_FPE_INVALID | GFC_FPE_DENORMAL
+ | GFC_FPE_ZERO | GFC_FPE_OVERFLOW
+ | GFC_FPE_UNDERFLOW | GFC_FPE_INEXACT;
+ arg += pos;
+ pos = 0;
+ continue;
+ }
+ else
+ for (n = 0; exception[n] != NULL; n++)
+ {
if (exception[n] && strncmp (exception[n], arg, pos) == 0)
{
- gfc_option.fpe |= opt_exception[n];
+ if (trap)
+ gfc_option.fpe |= opt_exception[n];
+ else
+ gfc_option.fpe_summary |= opt_exception[n];
arg += pos;
pos = 0;
result = 1;
break;
}
- }
+ }
if (!result)
gfc_fatal_error ("Argument to -ffpe-trap is not valid: %s", arg);
}
@@ -981,7 +1011,11 @@ gfc_handle_option (size_t scode, const char *arg, int value,
break;
case OPT_ffpe_trap_:
- gfc_handle_fpe_trap_option (arg);
+ gfc_handle_fpe_option (arg, true);
+ break;
+
+ case OPT_ffpe_summary_:
+ gfc_handle_fpe_option (arg, false);
break;
case OPT_std_f95:
diff --git a/gcc/fortran/trans-decl.c b/gcc/fortran/trans-decl.c
index 87652ba..f662655 100644
--- a/gcc/fortran/trans-decl.c
+++ b/gcc/fortran/trans-decl.c
@@ -5171,14 +5239,15 @@ create_main_function (tree fndecl)
/* TODO: This is the -frange-check option, which no longer affects
library behavior; when bumping the library ABI this slot can be
reused for something else. As it is the last element in the
- array, we can instead leave it out altogether.
+ array, we can instead leave it out altogether. */
+ CONSTRUCTOR_APPEND_ELT (v, NULL_TREE,
+ build_int_cst (integer_type_node, 0));
CONSTRUCTOR_APPEND_ELT (v, NULL_TREE,
build_int_cst (integer_type_node,
- gfc_option.flag_range_check));
- */
+ gfc_option.fpe_summary));
array_type = build_array_type (integer_type_node,
- build_index_type (size_int (6)));
+ build_index_type (size_int (8)));
array = build_constructor (array_type, v);
TREE_CONSTANT (array) = 1;
TREE_STATIC (array) = 1;
@@ -5193,7 +5262,7 @@ create_main_function (tree fndecl)
tmp = build_call_expr_loc (input_location,
gfor_fndecl_set_options, 2,
- build_int_cst (integer_type_node, 7), var);
+ build_int_cst (integer_type_node, 9), var);
gfc_add_expr_to_block (&body, tmp);
}
diff --git a/libgfortran/config/fpu-387.h b/libgfortran/config/fpu-387.h
index 913eb60..608354d 100644
--- a/libgfortran/config/fpu-387.h
+++ b/libgfortran/config/fpu-387.h
@@ -134,3 +134,40 @@ void set_fpu (void)
asm volatile ("%vldmxcsr %0" : : "m" (cw_sse));
}
}
+
+
+int
+get_fpu_except_flags (void)
+{
+ int result;
+ unsigned short cw;
+
+ __asm__ __volatile__ ("fnstsw\t%0" : "=a" (cw));
+
+ if (has_sse())
+ {
+ unsigned int cw_sse;
+ __asm__ __volatile__ ("%vstmxcsr\t%0" : "=m" (cw_sse));
+ cw |= cw_sse;
+ }
+
+ if (cw & _FPU_MASK_IM)
+ result |= GFC_FPE_INVALID;
+
+ if (cw & _FPU_MASK_ZM)
+ result |= GFC_FPE_ZERO;
+
+ if (cw & _FPU_MASK_OM)
+ result |= GFC_FPE_OVERFLOW;
+
+ if (cw & _FPU_MASK_UM)
+ result |= GFC_FPE_UNDERFLOW;
+
+ if (cw & _FPU_MASK_DM)
+ result |= GFC_FPE_DENORMAL;
+
+ if (cw & _FPU_MASK_PM)
+ result |= GFC_FPE_INEXACT;
+
+ return result;
+}
diff --git a/libgfortran/config/fpu-aix.h b/libgfortran/config/fpu-aix.h
index bcb5500..1ba9d4c 100644
--- a/libgfortran/config/fpu-aix.h
+++ b/libgfortran/config/fpu-aix.h
@@ -29,6 +29,10 @@ see the files COPYING3 and COPYING.RUNTIME respectively. If not, see
#include <fptrap.h>
#endif
+#ifdef HAVE_FPXCP_H
+#include <fpxcp.h>
+#endif
+
void
set_fpu (void)
{
@@ -81,3 +85,34 @@ set_fpu (void)
fp_trap(FP_TRAP_SYNC);
fp_enable(mode);
}
+
+
+int
+get_fpu_except_flags (void)
+{
+ int result, set_excepts;
+
+ result = 0;
+
+#ifdef HAVE_FPXCP_H
+ if (!fp_any_xcp ())
+ return 0;
+
+ if (fp_invalid_op ())
+ result |= GFC_FPE_INVALID;
+
+ if (fp_divbyzero ())
+ result |= GFC_FPE_ZERO;
+
+ if (fp_overflow ())
+ result |= GFC_FPE_OVERFLOW;
+
+ if (fp_underflow ())
+ result |= GFC_FPE_UNDERFLOW;
+
+ if (fp_inexact ())
+ result |= GFC_FPE_INEXACT;
+#endif
+
+ return result;
+}
diff --git a/libgfortran/config/fpu-generic.h b/libgfortran/config/fpu-generic.h
index 23212f8..4223f2e 100644
--- a/libgfortran/config/fpu-generic.h
+++ b/libgfortran/config/fpu-generic.h
@@ -50,3 +50,9 @@ set_fpu (void)
estr_write ("Fortran runtime warning: IEEE 'inexact' "
"exception not supported.\n");
}
+
+int
+get_fpu_except_flags (void)
+{
+ return 0;
+}
diff --git a/libgfortran/config/fpu-glibc.h b/libgfortran/config/fpu-glibc.h
index 5c7ad84..e0d1019 100644
--- a/libgfortran/config/fpu-glibc.h
+++ b/libgfortran/config/fpu-glibc.h
@@ -85,3 +85,45 @@ void set_fpu (void)
"exception not supported.\n");
#endif
}
+
+
+int
+get_fpu_except_flags (void)
+{
+ int result, set_excepts;
+
+ result = 0;
+ set_excepts = fetestexcept (FE_ALL_EXCEPT);
+
+#ifdef FE_INVALID
+ if (set_excepts & FE_INVALID)
+ result |= GFC_FPE_INVALID;
+#endif
+
+#ifdef FE_DIVBYZERO
+ if (set_excepts & FE_DIVBYZERO)
+ result |= GFC_FPE_ZERO;
+#endif
+
+#ifdef FE_OVERFLOW
+ if (set_excepts & FE_OVERFLOW)
+ result |= GFC_FPE_OVERFLOW;
+#endif
+
+#ifdef FE_UNDERFLOW
+ if (set_excepts & FE_UNDERFLOW)
+ result |= GFC_FPE_UNDERFLOW;
+#endif
+
+#ifdef FE_DENORMAL
+ if (set_excepts & FE_DENORMAL)
+ result |= GFC_FPE_DENORMAL;
+#endif
+
+#ifdef FE_INEXACT
+ if (set_excepts & FE_INEXACT)
+ result |= GFC_FPE_INEXACT;
+#endif
+
+ return result;
+}
diff --git a/libgfortran/config/fpu-sysv.h b/libgfortran/config/fpu-sysv.h
index b32702b..8fc52d5 100644
--- a/libgfortran/config/fpu-sysv.h
+++ b/libgfortran/config/fpu-sysv.h
@@ -80,3 +80,45 @@ set_fpu (void)
fpsetmask(cw);
}
+
+int
+get_fpu_except_flags (void)
+{
+ int result;
+ fp_except_t set_excepts;
+
+ result = 0;
+ set_excepts = fpgetsticky ();
+
+#ifdef FP_X_INV
+ if (set_excepts & FP_X_INV)
+ result |= GFC_FPE_INVALID;
+#endif
+
+#ifdef FP_X_DZ
+ if (set_excepts & FP_X_DZ)
+ result |= GFC_FPE_ZERO;
+#endif
+
+#ifdef FP_X_OFL
+ if (set_excepts & FP_X_OFL)
+ result |= GFC_FPE_OVERFLOW;
+#endif
+
+#ifdef FP_X_UFL
+ if (set_excepts & FP_X_UFL)
+ result |= GFC_FPE_UNDERFLOW;
+#endif
+
+#ifdef FP_X_DNML
+ if (set_excepts & FP_X_DNML)
+ result |= GFC_FPE_DENORMAL;
+#endif
+
+#ifdef FP_X_IMP
+ if (set_excepts & FP_X_IMP)
+ result |= GFC_FPE_INEXACT;
+#endif
+
+ return result;
+}
diff --git a/libgfortran/configure.ac b/libgfortran/configure.ac
index 7d97fed..ba14f1f 100644
--- a/libgfortran/configure.ac
+++ b/libgfortran/configure.ac
@@ -254,7 +254,7 @@ AC_CHECK_TYPES([ptrdiff_t])
# check header files (we assume C89 is available, so don't check for that)
AC_CHECK_HEADERS_ONCE(unistd.h sys/time.h sys/times.h sys/resource.h \
sys/types.h sys/stat.h sys/wait.h floatingpoint.h ieeefp.h fenv.h fptrap.h \
-pwd.h complex.h)
+fpxcp.h pwd.h complex.h)
GCC_HEADER_STDINT(gstdint.h)
diff --git a/libgfortran/libgfortran.h b/libgfortran/libgfortran.h
index 56c9871..f22da21 100644
--- a/libgfortran/libgfortran.h
+++ b/libgfortran/libgfortran.h
@@ -534,6 +534,7 @@ typedef struct
size_t record_marker;
int max_subrecord_length;
int bounds_check;
+ int fpe_summary;
}
compile_options_t;
@@ -742,6 +743,8 @@ internal_proto(gf_strerror);
extern void set_fpu (void);
internal_proto(set_fpu);
+extern int get_fpu_except_flags (void);
+internal_proto(get_fpu_except_flags);
/* memory.c */
diff --git a/libgfortran/runtime/compile_options.c b/libgfortran/runtime/compile_options.c
index a49514c..9212671 100644
--- a/libgfortran/runtime/compile_options.c
+++ b/libgfortran/runtime/compile_options.c
@@ -173,6 +173,8 @@ set_options (int num, int options[])
the library behavior; range checking is now always done when
parsing integers. It's place in the options array is retained due
to ABI compatibility. Remove when bumping the library ABI. */
+ if (num >= 9)
+ compile_options.fpe_summary = options[8];
/* If backtrace is required, we set signal handlers on the POSIX
2001 signals with core action. */
@@ -225,6 +227,7 @@ init_compile_options (void)
compile_options.pedantic = 0;
compile_options.backtrace = 0;
compile_options.sign_zero = 1;
+ compile_options.fpe_summary = 0;
}
/* Function called by the front-end to tell us the
diff --git a/libgfortran/runtime/stop.c b/libgfortran/runtime/stop.c
index 4805412..2d4fb62 100644
--- a/libgfortran/runtime/stop.c
+++ b/libgfortran/runtime/stop.c
@@ -32,6 +32,55 @@ see the files COPYING3 and COPYING.RUNTIME respectively. If not, see
#endif
+/* Fortran 2008 demands: If any exception (14) is signaling on that image, the
+ processor shall issue a warning indicating which exceptions are signaling;
+ this warning shall be on the unit identified by the named constant
+ ERROR_UNIT (13.8.2.8). In line with other compilers, we do not report
+ inexact - and we optionally ignore underflow, cf. thread starting at
+ http://mailman.j3-fortran.org/pipermail/j3/2013-June/006452.html. */
+
+static void
+report_exception (void)
+{
+ int set_excepts;
+
+ if (!compile_options.fpe_summary)
+ return;
+
+ set_excepts = get_fpu_except_flags ();
+ if ((set_excepts & compile_options.fpe_summary) == 0)
+ return;
+
+ estr_write ("Note: The following floating-point exceptions are signalling:");
+
+ if ((compile_options.fpe_summary & GFC_FPE_INVALID)
+ && (set_excepts & GFC_FPE_INVALID))
+ estr_write (" IEEE INVALID FLAG");
+
+ if ((compile_options.fpe_summary & GFC_FPE_ZERO)
+ && (set_excepts & GFC_FPE_ZERO))
+ estr_write (" IEEE_DIVIDE_BY_ZERO");
+
+ if ((compile_options.fpe_summary & GFC_FPE_OVERFLOW)
+ && (set_excepts & GFC_FPE_OVERFLOW))
+ estr_write (" IEEE_OVERFLOW_FLAG");
+
+ if ((compile_options.fpe_summary & GFC_FPE_UNDERFLOW)
+ && (set_excepts & GFC_FPE_UNDERFLOW))
+ estr_write (" IEEE_UNDERFLOW_FLAG");
+
+ if ((compile_options.fpe_summary & GFC_FPE_DENORMAL)
+ && (set_excepts & GFC_FPE_DENORMAL))
+ estr_write (" IEEE_DENORMAL");
+
+ if ((compile_options.fpe_summary & GFC_FPE_INEXACT)
+ && (set_excepts & GFC_FPE_INEXACT))
+ estr_write (" IEEE_INEXACT_FLAG");
+
+ estr_write ("\n");
+}
+
+
/* A numeric STOP statement. */
extern void stop_numeric (GFC_INTEGER_4)
@@ -41,6 +90,7 @@ export_proto(stop_numeric);
void
stop_numeric (GFC_INTEGER_4 code)
{
+ report_exception ();
if (code == -1)
code = 0;
else
@@ -59,6 +109,7 @@ export_proto(stop_numeric_f08);
void
stop_numeric_f08 (GFC_INTEGER_4 code)
{
+ report_exception ();
st_printf ("STOP %d\n", (int)code);
exit (code);
}
@@ -69,6 +120,7 @@ stop_numeric_f08 (GFC_INTEGER_4 code)
void
stop_string (const char *string, GFC_INTEGER_4 len)
{
+ report_exception ();
if (string)
{
estr_write ("STOP ");
@@ -91,6 +143,7 @@ export_proto(error_stop_string);
void
error_stop_string (const char *string, GFC_INTEGER_4 len)
{
+ report_exception ();
estr_write ("ERROR STOP ");
(void) write (STDERR_FILENO, string, len);
estr_write ("\n");
@@ -108,6 +161,7 @@ export_proto(error_stop_numeric);
void
error_stop_numeric (GFC_INTEGER_4 code)
{
+ report_exception ();
st_printf ("ERROR STOP %d\n", (int) code);
exit (code);
}
diff --git a/libgfortran/config.h.in b/libgfortran/config.h.in
index fb5026f..0d5d56c 100644
--- a/libgfortran/config.h.in
+++ b/libgfortran/config.h.in
@@ -399,6 +399,9 @@
/* Define to 1 if you have the <fptrap.h> header file. */
#undef HAVE_FPTRAP_H
+/* Define to 1 if you have the <fpxcp.h> header file. */
+#undef HAVE_FPXCP_H
+
/* fp_enable is present */
#undef HAVE_FP_ENABLE
diff --git a/libgfortran/configure b/libgfortran/configure
index 8601d84..c049cdc 100755
--- a/libgfortran/configure
+++ b/libgfortran/configure
@@ -654,7 +654,6 @@ CPP
am__fastdepCC_FALSE
am__fastdepCC_TRUE
CCDEPMODE
-am__nodep
AMDEPBACKSLASH
AMDEP_FALSE
AMDEP_TRUE
@@ -2543,6 +2542,7 @@ as_fn_append ac_header_list " floatingpoint.h"
as_fn_append ac_header_list " ieeefp.h"
as_fn_append ac_header_list " fenv.h"
as_fn_append ac_header_list " fptrap.h"
+as_fn_append ac_header_list " fpxcp.h"
as_fn_append ac_header_list " pwd.h"
as_fn_append ac_header_list " complex.h"
as_fn_append ac_func_list " getrusage"
@@ -3386,11 +3386,11 @@ MAKEINFO=${MAKEINFO-"${am_missing_run}makeinfo"}
# We need awk for the "check" target. The system "awk" is bad on
# some platforms.
-# Always define AMTAR for backward compatibility. Yes, it's still used
-# in the wild :-( We should find a proper way to deprecate it ...
-AMTAR='$${TAR-tar}'
+# Always define AMTAR for backward compatibility.
-am__tar='$${TAR-tar} chof - "$$tardir"' am__untar='$${TAR-tar} xf -'
+AMTAR=${AMTAR-"${am_missing_run}tar"}
+
+am__tar='${AMTAR} chof - "$$tardir"'; am__untar='${AMTAR} xf -'
@@ -3523,7 +3523,6 @@ fi
if test "x$enable_dependency_tracking" != xno; then
am_depcomp="$ac_aux_dir/depcomp"
AMDEPBACKSLASH='\'
- am__nodep='_no'
fi
if test "x$enable_dependency_tracking" != xno; then
AMDEP_TRUE=
@@ -4341,7 +4340,6 @@ else
# instance it was reported that on HP-UX the gcc test will end up
# making a dummy file named `D' -- because `-MD' means `put the output
# in D'.
- rm -rf conftest.dir
mkdir conftest.dir
# Copy depcomp to subdir because otherwise we won't find it if we're
# using a relative directory.
@@ -4401,7 +4399,7 @@ else
break
fi
;;
- msvc7 | msvc7msys | msvisualcpp | msvcmsys)
+ msvisualcpp | msvcmsys)
# This compiler won't grok `-c -o', but also, the minuso test has
# not run yet. These depmodes are late enough in the game, and
# so weak that their functioning should not be impacted.
@@ -5517,7 +5515,6 @@ else
# instance it was reported that on HP-UX the gcc test will end up
# making a dummy file named `D' -- because `-MD' means `put the output
# in D'.
- rm -rf conftest.dir
mkdir conftest.dir
# Copy depcomp to subdir because otherwise we won't find it if we're
# using a relative directory.
@@ -5577,7 +5574,7 @@ else
break
fi
;;
- msvc7 | msvc7msys | msvisualcpp | msvcmsys)
+ msvisualcpp | msvcmsys)
# This compiler won't grok `-c -o', but also, the minuso test has
# not run yet. These depmodes are late enough in the game, and
# so weak that their functioning should not be impacted.
@@ -12334,7 +12331,7 @@ else
lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
lt_status=$lt_dlunknown
cat > conftest.$ac_ext <<_LT_EOF
-#line 12337 "configure"
+#line 12334 "configure"
#include "confdefs.h"
#if HAVE_DLFCN_H
@@ -12440,7 +12437,7 @@ else
lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
lt_status=$lt_dlunknown
cat > conftest.$ac_ext <<_LT_EOF
-#line 12443 "configure"
+#line 12440 "configure"
#include "confdefs.h"
#if HAVE_DLFCN_H
@@ -16001,6 +15998,8 @@ done
+
+
inttype_headers=`echo inttypes.h sys/inttypes.h | sed -e 's/,/ /g'`
acx_cv_header_stdint=stddef.h
^ permalink raw reply [flat|nested] 15+ messages in thread
* Re: [Patch, Fortran] Print floating-point exception status after STOP/ERROR STOP
2013-06-16 17:33 ` Tobias Burnus
@ 2013-06-16 21:24 ` Mikael Morin
0 siblings, 0 replies; 15+ messages in thread
From: Mikael Morin @ 2013-06-16 21:24 UTC (permalink / raw)
To: Tobias Burnus; +Cc: gcc patches, gfortran
Hello,
Le 16/06/2013 19:33, Tobias Burnus a écrit :
> * PING *
>
> Minor change: Jakub suggested to print no exception status with older
> gfortran programs. Hence, the library now defaults to 0. (Older programs
> do not pass this argument to the library.) - I also updated
> gfortran.texi for that change.
>
> Tobias
>
>
> On June 12, 2013 17:50, Tobias Burnus wrote:
>> Updated version:
>> * Uros suggestions are incorporated
>> * Changed from -f(no-)underflow-warning to
>> -ffpe-summary=[none,all,underflow,...]
>>
>> Tobias Burnus wrote:
>>> The attached patch causes gfortran-compiled programs to print
>>> warnings like
>> Note: The following floating-point exception are signalling:
>> IEEE_DIVIDE_BY_ZERO
>>> when STOP / ERROR STOP is invoked. That's required by Fortran 2008
>>> (8.4 STOP and ERROR STOP statements):
>>>
>>> "If any exception (14) is signaling on that image, the processor
>>> shall issue a warning indicating which exceptions are signaling; this
>>> warning shall be on the unit identified by the named constant ERROR
>>> UNIT (13.8.2.8)."
>>
>>> One surely could extend it to allow to completely disable the warning
>>> - or to make it more fine grained like "none", "all" plus all single
>>> flags (including underflow, denormal and inexact, where by default
>>> one leaves out inexact).
>>
>> Thinking about it, I think that's the better solution: It makes
>> (optionally) inexact available and also allows to fully disable the
>> feature. I am sure that there are users who would like to have that
>> choice. Hence, I update the argument handling and libgfortran's stop.c.
>>
>> Additions from the J3 list:
>> * IBM's "XLF compiler has an option to report fp exceptions including
>> underflow and inexact. It is default OFF."
>> (which matches ifort)
>>
>>> Build and regtested on x86-64-gnu-linux.
>>> OK for the trunk?
>>
>> Tobias
>>
>> PS: I filled PR 57598 to track the warning handling for coarrays.
>
Two nits below:
> @@ -515,17 +525,37 @@ gfc_handle_fpe_trap_option (const char *arg)
> pos++;
>
> result = 0;
> - for (n = 0; exception[n] != NULL; n++)
> + if (!trap && strncmp ("none", arg, pos) == 0)
> + {
> + gfc_option.fpe_summary = 0;
> + arg += pos;
> + pos = 0;
> + continue;
> + }
> + else if (!trap && strncmp ("all", arg, pos) == 0)
> {
> + gfc_option.fpe_summary = GFC_FPE_INVALID | GFC_FPE_DENORMAL
> + | GFC_FPE_ZERO | GFC_FPE_OVERFLOW
> + | GFC_FPE_UNDERFLOW | GFC_FPE_INEXACT;
> + arg += pos;
> + pos = 0;
> + continue;
> + }
> + else
> + for (n = 0; exception[n] != NULL; n++)
> + {
> if (exception[n] && strncmp (exception[n], arg, pos) == 0)
> {
> - gfc_option.fpe |= opt_exception[n];
> + if (trap)
> + gfc_option.fpe |= opt_exception[n];
> + else
> + gfc_option.fpe_summary |= opt_exception[n];
> arg += pos;
> pos = 0;
> result = 1;
> break;
> }
> - }
> + }
> if (!result)
> gfc_fatal_error ("Argument to -ffpe-trap is not valid: %s", arg);
-ffpe-trap and -ffpe-summary should better be distinguished here.
> }
> diff --git a/libgfortran/runtime/stop.c b/libgfortran/runtime/stop.c
> index 4805412..2d4fb62 100644
> --- a/libgfortran/runtime/stop.c
> +++ b/libgfortran/runtime/stop.c
> @@ -32,6 +32,55 @@ see the files COPYING3 and COPYING.RUNTIME respectively. If not, see
> #endif
>
>
> +/* Fortran 2008 demands: If any exception (14) is signaling on that image, the
> + processor shall issue a warning indicating which exceptions are signaling;
> + this warning shall be on the unit identified by the named constant
> + ERROR_UNIT (13.8.2.8). In line with other compilers, we do not report
> + inexact - and we optionally ignore underflow, cf. thread starting at
> + http://mailman.j3-fortran.org/pipermail/j3/2013-June/006452.html. */
> +
> +static void
> +report_exception (void)
> +{
> + int set_excepts;
> +
> + if (!compile_options.fpe_summary)
> + return;
> +
> + set_excepts = get_fpu_except_flags ();
> + if ((set_excepts & compile_options.fpe_summary) == 0)
> + return;
> +
> + estr_write ("Note: The following floating-point exceptions are signalling:");
> +
> + if ((compile_options.fpe_summary & GFC_FPE_INVALID)
> + && (set_excepts & GFC_FPE_INVALID))
> + estr_write (" IEEE INVALID FLAG");
Two underscores missing.
OK once fixed.
Thanks
Mikael
^ permalink raw reply [flat|nested] 15+ messages in thread
* Re: [Patch, Fortran] Print floating-point exception status after STOP/ERROR STOP
2013-06-12 13:05 [Patch, Fortran] Print floating-point exception status after STOP/ERROR STOP Tobias Burnus
` (3 preceding siblings ...)
2013-06-12 15:55 ` Jakub Jelinek
@ 2013-06-21 13:17 ` Eric Botcazou
2013-06-22 19:09 ` Gerald Pfeifer
4 siblings, 1 reply; 15+ messages in thread
From: Eric Botcazou @ 2013-06-21 13:17 UTC (permalink / raw)
To: Tobias Burnus; +Cc: gcc-patches, gfortran, David Edelsohn, Uros Bizjak
[-- Attachment #1: Type: text/plain, Size: 1219 bytes --]
> David: Can you have a look at libgfortran/config/fpu-aix.h - Thanks!
> Uros: Can you have a look at libgfortran/config/fpu-387.h - Thanks!
The patch silently changes libgfortran/config/fpu-sysv.h as well, breaking
Solaris in the process:
In file included from /nile.build/botcazou/gcc-
head/src/libgfortran/runtime/fpu.c:29:0:
./fpu-target.h: In function 'get_fpu_except_flags':
./fpu-target.h:88:3: error: unknown type name 'fp_except_t'
fp_except_t set_excepts;
^
make[2]: *** [fpu.lo] Error 1
make[2]: Leaving directory `/nfs/nile/nile.build/botcazou/gcc-head/sparc-sun-
solaris2.10/sparc-sun-solaris2.10/libgfortran'
Excert from the man page:
NAME
fpgetround, fpsetround, fpgetmask, fpsetmask, fpgetsticky,
fpsetsticky - IEEE floating-point environment control
SYNOPSIS
#include <ieeefp.h>
fp_rnd fpgetround(void);
fp_rnd fpsetround(fp_rnd rnd_dir);
fp_except fpgetmask(void);
fp_except fpsetmask(fp_except mask);
fp_except fpgetsticky(void);
fp_except fpsetsticky(fp_except sticky);
Fixed thusly, applied as obvious.
2013-06-21 Eric Botcazou <ebotcazou@adacore.com>
* config/fpu-sysv.h (get_fpu_except_flags): Fix typo.
--
Eric Botcazou
[-- Attachment #2: p.diff --]
[-- Type: text/x-patch, Size: 343 bytes --]
Index: config/fpu-sysv.h
===================================================================
--- config/fpu-sysv.h (revision 200189)
+++ config/fpu-sysv.h (working copy)
@@ -85,7 +85,7 @@ int
get_fpu_except_flags (void)
{
int result;
- fp_except_t set_excepts;
+ fp_except set_excepts;
result = 0;
set_excepts = fpgetsticky ();
^ permalink raw reply [flat|nested] 15+ messages in thread
* Re: [Patch, Fortran] Print floating-point exception status after STOP/ERROR STOP
2013-06-21 13:17 ` Eric Botcazou
@ 2013-06-22 19:09 ` Gerald Pfeifer
2013-06-22 20:11 ` Eric Botcazou
0 siblings, 1 reply; 15+ messages in thread
From: Gerald Pfeifer @ 2013-06-22 19:09 UTC (permalink / raw)
To: Tobias Burnus, Eric Botcazou
Cc: gcc-patches, fortran, David Edelsohn, Uros Bizjak
On Fri, 21 Jun 2013, Eric Botcazou wrote:
> The patch silently changes libgfortran/config/fpu-sysv.h as well,
> breaking Solaris in the process:
>
> In file included from /nile.build/botcazou/gcc-
> head/src/libgfortran/runtime/fpu.c:29:0:
> ./fpu-target.h: In function 'get_fpu_except_flags':
> ./fpu-target.h:88:3: error: unknown type name 'fp_except_t'
> fp_except_t set_excepts;
> ^
> make[2]: *** [fpu.lo] Error 1
> make[2]: Leaving directory `/nfs/nile/nile.build/botcazou/gcc-head/sparc-sun-
> solaris2.10/sparc-sun-solaris2.10/libgfortran'
:
> Fixed thusly, applied as obvious.
>
>
> 2013-06-21 Eric Botcazou <ebotcazou@adacore.com>
>
> * config/fpu-sysv.h (get_fpu_except_flags): Fix typo.
Except that now FreeBSD 10.x is broken. :-(
In file included from /scratch2/tmp/gerald/gcc-HEAD/libgfortran/runtime/fpu.c:29:0:
./fpu-target.h: In function 'get_fpu_except_flags':
./fpu-target.h:88:3: error: unknown type name 'fp_except'
fp_except set_excepts;
^
gmake[3]: *** [fpu.lo] Error 1
Excerpt from the man page on such a system:
fp_except_t
fpgetmask(void);
fp_except_t
fpsetmask(fp_except_t mask);
fp_except_t
fpgetsticky(void);
fp_except_t
fpresetsticky(fp_except_t sticky);
My autoconf foo does not seem to be strong enough for libgfortran,
but I assume checking for both types and then using #ifdef HAVE_FP_EXCEPT_T
...#elif HAVE_FP_EXCEPT...#endif ought to work?
Gerald
^ permalink raw reply [flat|nested] 15+ messages in thread
* Re: [Patch, Fortran] Print floating-point exception status after STOP/ERROR STOP
2013-06-22 19:09 ` Gerald Pfeifer
@ 2013-06-22 20:11 ` Eric Botcazou
2013-06-22 22:30 ` Tobias Burnus
0 siblings, 1 reply; 15+ messages in thread
From: Eric Botcazou @ 2013-06-22 20:11 UTC (permalink / raw)
To: Gerald Pfeifer
Cc: gcc-patches, Tobias Burnus, fortran, David Edelsohn, Uros Bizjak
> Except that now FreeBSD 10.x is broken. :-(
Death to the guy whose thought that adding/removing _t was a good idea...
> In file included from
> /scratch2/tmp/gerald/gcc-HEAD/libgfortran/runtime/fpu.c:29:0:
> ./fpu-target.h: In function 'get_fpu_except_flags':
> ./fpu-target.h:88:3: error: unknown type name 'fp_except'
> fp_except set_excepts;
> ^
> gmake[3]: *** [fpu.lo] Error 1
>
> Excerpt from the man page on such a system:
>
> fp_except_t
> fpgetmask(void);
>
> fp_except_t
> fpsetmask(fp_except_t mask);
>
> fp_except_t
> fpgetsticky(void);
>
> fp_except_t
> fpresetsticky(fp_except_t sticky);
>
> My autoconf foo does not seem to be strong enough for libgfortran,
> but I assume checking for both types and then using #ifdef HAVE_FP_EXCEPT_T
> ...#elif HAVE_FP_EXCEPT...#endif ought to work?
Yes, I think that we just need to patch the LIBGFOR_CHECK_FPSETMASK check in
acinclude.m4 so as to also test the return type of the function.
--
Eric Botcazou
^ permalink raw reply [flat|nested] 15+ messages in thread
* Re: [Patch, Fortran] Print floating-point exception status after STOP/ERROR STOP
2013-06-22 20:11 ` Eric Botcazou
@ 2013-06-22 22:30 ` Tobias Burnus
2013-06-23 23:59 ` Gerald Pfeifer
2013-06-24 8:39 ` Tobias Burnus
0 siblings, 2 replies; 15+ messages in thread
From: Tobias Burnus @ 2013-06-22 22:30 UTC (permalink / raw)
To: Eric Botcazou
Cc: Gerald Pfeifer, gcc-patches, fortran, David Edelsohn, Uros Bizjak
Eric Botcazou wrote:
>> My autoconf foo does not seem to be strong enough for libgfortran,
>> but I assume checking for both types and then using #ifdef HAVE_FP_EXCEPT_T
>> ...#elif HAVE_FP_EXCEPT...#endif ought to work?
> Yes, I think that we just need to patch the LIBGFOR_CHECK_FPSETMASK check in
> acinclude.m4 so as to also test the return type of the function.
Eric: I have a Solaris question. In acinclude.m4, one has:
#if HAVE_FLOATINGPOINT_H
# include <floatingpoint.h>
#endif /* HAVE_FLOATINGPOINT_H */
Should one also include that file? Currently, only ieeefp.h is included
via libgfortran.h.
Gerald and Eric: Would the following work for you? (Sorry, no
config.h.in/configure patch; I haven't build in maintainer's mode, yet.)
--------------- Cut --------------------------
diff --git a/libgfortran/config/fpu-sysv.h b/libgfortran/config/fpu-sysv.h
index 1502b37..db95e9d 100644
--- a/libgfortran/config/fpu-sysv.h
+++ b/libgfortran/config/fpu-sysv.h
@@ -87,3 +87,9 @@ get_fpu_except_flags (void)
int result;
+#if HAVE_FP_EXCEPT
fp_except set_excepts;
+#elif HAVE_FP_EXCEPT_T
+ fp_except_t set_excepts;
+#else
+ choke me
+#endif
diff --git a/libgfortran/configure.ac b/libgfortran/configure.ac
index ba14f1f..a2add6d 100644
--- a/libgfortran/configure.ac
+++ b/libgfortran/configure.ac
@@ -500,2 +500,3 @@ fi
LIBGFOR_CHECK_FPSETMASK
+AC_CHECK_TYPES([fp_except fp_except_t], [], [], [[#include <ieeefp.h>]])
--------------- Cut --------------------------
Tobias
^ permalink raw reply [flat|nested] 15+ messages in thread
* Re: [Patch, Fortran] Print floating-point exception status after STOP/ERROR STOP
2013-06-22 22:30 ` Tobias Burnus
@ 2013-06-23 23:59 ` Gerald Pfeifer
2013-06-24 8:39 ` Tobias Burnus
1 sibling, 0 replies; 15+ messages in thread
From: Gerald Pfeifer @ 2013-06-23 23:59 UTC (permalink / raw)
To: Tobias Burnus
Cc: Eric Botcazou, gcc-patches, fortran, David Edelsohn, Uros Bizjak
On Sun, 23 Jun 2013, Tobias Burnus wrote:
> Gerald and Eric: Would the following work for you? (Sorry, no
> config.h.in/configure patch; I haven't build in maintainer's mode, yet.)
Yes, that looks like what I had in mind. Thanks, Tobias!
Gerald
^ permalink raw reply [flat|nested] 15+ messages in thread
* Re: [Patch, Fortran] Print floating-point exception status after STOP/ERROR STOP
2013-06-22 22:30 ` Tobias Burnus
2013-06-23 23:59 ` Gerald Pfeifer
@ 2013-06-24 8:39 ` Tobias Burnus
2013-06-24 17:41 ` Eric Botcazou
2013-06-24 20:43 ` Gerald Pfeifer
1 sibling, 2 replies; 15+ messages in thread
From: Tobias Burnus @ 2013-06-24 8:39 UTC (permalink / raw)
To: Eric Botcazou
Cc: Gerald Pfeifer, gcc-patches, fortran, David Edelsohn, Uros Bizjak
[-- Attachment #1: Type: text/plain, Size: 462 bytes --]
Eric, Gerald, all,
I have now committed (Rev. 200360) the attached patch. (Compared to the
draft patch, with a missing "," added in AC_CHECK_TYPES).
Eric, Gerald: Can you confirm that it now works on both FreeBSD and Solaris?
Eric: Should one (conditionally) include <floatingpoint.h> on Solaris? I
am asking because LIBGFOR_CHECK_FPSETMASK in acinclude.m4 uses that
include file during configure - but libgfortran.h (or config/fpu-sysv.h)
don't.
Tobias
[-- Attachment #2: patch.diff --]
[-- Type: text/x-patch, Size: 2787 bytes --]
Index: libgfortran/ChangeLog
===================================================================
--- libgfortran/ChangeLog (Revision 200359)
+++ libgfortran/ChangeLog (Arbeitskopie)
@@ -1,3 +1,10 @@
+2013-06-24 Tobias Burnus <burnus@net-b.de>
+
+ * configure.ac: Check for fp_except and fp_except_t.
+ * config/fpu-sysv.h: Conditionally use either type.
+ * configure: Regenerate.
+ * config.h.in: Regenerate.
+
2013-06-21 Eric Botcazou <ebotcazou@adacore.com>
* config/fpu-sysv.h (get_fpu_except_flags): Fix typo.
Index: libgfortran/config/fpu-sysv.h
===================================================================
--- libgfortran/config/fpu-sysv.h (Revision 200359)
+++ libgfortran/config/fpu-sysv.h (Arbeitskopie)
@@ -85,7 +85,13 @@ int
get_fpu_except_flags (void)
{
int result;
+#if HAVE_FP_EXCEPT
fp_except set_excepts;
+#elif HAVE_FP_EXCEPT_T
+ fp_except_t set_excepts;
+#else
+ choke me
+#endif
result = 0;
set_excepts = fpgetsticky ();
Index: libgfortran/config.h.in
===================================================================
--- libgfortran/config.h.in (Revision 200359)
+++ libgfortran/config.h.in (Arbeitskopie)
@@ -405,6 +405,12 @@
/* fp_enable is present */
#undef HAVE_FP_ENABLE
+/* Define to 1 if the system has the type `fp_except'. */
+#undef HAVE_FP_EXCEPT
+
+/* Define to 1 if the system has the type `fp_except_t'. */
+#undef HAVE_FP_EXCEPT_T
+
/* fp_trap is present */
#undef HAVE_FP_TRAP
Index: libgfortran/configure
===================================================================
--- libgfortran/configure (Revision 200359)
+++ libgfortran/configure (Arbeitskopie)
@@ -25977,7 +25977,28 @@ $as_echo "#define HAVE_FPSETMASK 1" >>confdefs.h
fi
+ac_fn_c_check_type "$LINENO" "fp_except" "ac_cv_type_fp_except" "#include <ieeefp.h>
+"
+if test "x$ac_cv_type_fp_except" = x""yes; then :
+cat >>confdefs.h <<_ACEOF
+#define HAVE_FP_EXCEPT 1
+_ACEOF
+
+
+fi
+ac_fn_c_check_type "$LINENO" "fp_except_t" "ac_cv_type_fp_except_t" "#include <ieeefp.h>
+"
+if test "x$ac_cv_type_fp_except_t" = x""yes; then :
+
+cat >>confdefs.h <<_ACEOF
+#define HAVE_FP_EXCEPT_T 1
+_ACEOF
+
+
+fi
+
+
# Check for AIX fp_trap and fp_enable
ac_fn_c_check_func "$LINENO" "fp_trap" "ac_cv_func_fp_trap"
if test "x$ac_cv_func_fp_trap" = x""yes; then :
Index: libgfortran/configure.ac
===================================================================
--- libgfortran/configure.ac (Revision 200359)
+++ libgfortran/configure.ac (Arbeitskopie)
@@ -498,6 +498,7 @@ fi
# Check for SysV fpsetmask
LIBGFOR_CHECK_FPSETMASK
+AC_CHECK_TYPES([fp_except,fp_except_t], [], [], [[#include <ieeefp.h>]])
# Check for AIX fp_trap and fp_enable
AC_CHECK_FUNC([fp_trap],[have_fp_trap=yes AC_DEFINE([HAVE_FP_TRAP],[1],[fp_trap is present])])
^ permalink raw reply [flat|nested] 15+ messages in thread
* Re: [Patch, Fortran] Print floating-point exception status after STOP/ERROR STOP
2013-06-24 8:39 ` Tobias Burnus
@ 2013-06-24 17:41 ` Eric Botcazou
2013-06-24 20:43 ` Gerald Pfeifer
1 sibling, 0 replies; 15+ messages in thread
From: Eric Botcazou @ 2013-06-24 17:41 UTC (permalink / raw)
To: Tobias Burnus
Cc: gcc-patches, Gerald Pfeifer, fortran, David Edelsohn, Uros Bizjak
> Eric, Gerald: Can you confirm that it now works on both FreeBSD and Solaris?
It works fine on Solaris, thanks!
> Eric: Should one (conditionally) include <floatingpoint.h> on Solaris? I
> am asking because LIBGFOR_CHECK_FPSETMASK in acinclude.m4 uses that
> include file during configure - but libgfortran.h (or config/fpu-sysv.h)
> don't.
ieeefp.h is sufficient on Solaris.
--
Eric Botcazou
^ permalink raw reply [flat|nested] 15+ messages in thread
* Re: [Patch, Fortran] Print floating-point exception status after STOP/ERROR STOP
2013-06-24 8:39 ` Tobias Burnus
2013-06-24 17:41 ` Eric Botcazou
@ 2013-06-24 20:43 ` Gerald Pfeifer
1 sibling, 0 replies; 15+ messages in thread
From: Gerald Pfeifer @ 2013-06-24 20:43 UTC (permalink / raw)
To: Tobias Burnus
Cc: Eric Botcazou, gcc-patches, fortran, David Edelsohn, Uros Bizjak
On Mon, 24 Jun 2013, Tobias Burnus wrote:
> I have now committed (Rev. 200360) the attached patch. (Compared to the
> draft patch, with a missing "," added in AC_CHECK_TYPES).
>
> Eric, Gerald: Can you confirm that it now works on both FreeBSD and Solaris?
I can confirm FreeBSD 8.x and 10.x. Thanks, Tobias!
Gerald
^ permalink raw reply [flat|nested] 15+ messages in thread
end of thread, other threads:[~2013-06-24 20:43 UTC | newest]
Thread overview: 15+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2013-06-12 13:05 [Patch, Fortran] Print floating-point exception status after STOP/ERROR STOP Tobias Burnus
2013-06-12 14:04 ` Uros Bizjak
2013-06-12 15:47 ` David Edelsohn
2013-06-12 15:50 ` Tobias Burnus
2013-06-16 17:33 ` Tobias Burnus
2013-06-16 21:24 ` Mikael Morin
2013-06-12 15:55 ` Jakub Jelinek
2013-06-21 13:17 ` Eric Botcazou
2013-06-22 19:09 ` Gerald Pfeifer
2013-06-22 20:11 ` Eric Botcazou
2013-06-22 22:30 ` Tobias Burnus
2013-06-23 23:59 ` Gerald Pfeifer
2013-06-24 8:39 ` Tobias Burnus
2013-06-24 17:41 ` Eric Botcazou
2013-06-24 20:43 ` Gerald Pfeifer
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).