re PR target/66326 (Floating point exception with -mfpmath=387 and -fcilkplus.)

libcilkrts/

2015-11-09  Igor Zamyatin  <igor.zamyatin@intel.com>

	PR target/66326
	* runtime/config/x86/os-unix-sysdep.c (sysdep_save_fp_ctrl_state):
	Use fnstcw instead fnstsw.

gcc/testsuite

2015-11-09  Igor Zamyatin  <igor.zamyatin@intel.com>

	PR target/66326
	* g++.dg/cilk-plus/CK/pr66326.cc: New test.

From-SVN: r230008

diff --git a/gcc/testsuite/ChangeLog b/gcc/testsuite/ChangeLog
index c6fe2972e2db817d8d4d8acb88921741437b766d..bcca4791eeb7522c8b246ca32551bfa4c7251fe6 100644 (file)
--- a/gcc/testsuite/ChangeLog
+++ b/gcc/testsuite/ChangeLog
@@ -1,3 +1,8 @@
+2015-11-09  Igor Zamyatin  <igor.zamyatin@intel.com>
+
+       PR target/66326
+       * g++.dg/cilk-plus/CK/pr66326.cc: New test.
+
 2015-11-09  Richard Henderson  <rth@redhat.com>
 
        * gcc.target/i386/addr-space-1.c: New test.

diff --git a/gcc/testsuite/g++.dg/cilk-plus/CK/pr66326.cc b/gcc/testsuite/g++.dg/cilk-plus/CK/pr66326.cc
new file mode 100644 (file)
index 0000000..1114ebd
--- /dev/null
+++ b/gcc/testsuite/g++.dg/cilk-plus/CK/pr66326.cc
@@ -0,0 +1,33 @@
+/* { dg-options "-fcilkplus" } */
+/* { dg-do run { target i?86-*-* x86_64-*-* } } */
+/* { dg-options "-fcilkplus -lcilkrts" { target { i?86-*-* x86_64-*-* } } } */
+
+#include <cilk/cilk.h>
+#include <vector>
+#include <random>
+
+template <class T>
+void do_not_optimize_away(T&& x) {
+  asm volatile("" : "+r"(x));
+}
+
+const int N = 1'000'000;
+
+auto compute() {
+  std::vector<double> v(N);
+  auto rng = std::mt19937{std::random_device{}()};
+  std::uniform_real_distribution<double> dist(0, 1);
+  for (int i = 0; i < N; ++i) v[i] = std::log(std::sqrt(dist(rng)));
+  return v;
+}
+
+int main() {
+  std::vector<double> v1, v2, v3;
+  cilk_spawn [&] { v1 = compute(); }();
+  cilk_spawn [&] { v2 = compute(); }();
+  v3 = compute();
+  do_not_optimize_away(v1.data());
+  do_not_optimize_away(v2.data());
+  do_not_optimize_away(v3.data());
+  return 0;
+}

diff --git a/libcilkrts/ChangeLog b/libcilkrts/ChangeLog
index 903f7a5a6183e111cacf27126d02953872fc1d20..ed26a3a1e1b41552d02ca296b65f92b20ee7ab87 100644 (file)
--- a/libcilkrts/ChangeLog
+++ b/libcilkrts/ChangeLog
@@ -1,3 +1,9 @@
+2015-11-09  Igor Zamyatin  <igor.zamyatin@intel.com>
+
+       PR target/66326
+       * runtime/config/x86/os-unix-sysdep.c (sysdep_save_fp_ctrl_state):
+       Use fnstcw instead fnstsw.
+
 2015-05-13  Michael Haubenwallner  <michael.haubenwallner@ssi-schaefer.com>
 
        * Makefile.in: Regenerated with automake-1.11.6.

diff --git a/libcilkrts/runtime/config/x86/os-unix-sysdep.c b/libcilkrts/runtime/config/x86/os-unix-sysdep.c
index b505ddfb96f74a1b84f07d7367c71613757a851f..cbc773432158363396680a951634859c4cb9bd02 100644 (file)
--- a/libcilkrts/runtime/config/x86/os-unix-sysdep.c
+++ b/libcilkrts/runtime/config/x86/os-unix-sysdep.c
@@ -135,7 +135,7 @@ void sysdep_save_fp_ctrl_state(__cilkrts_stack_frame *sf)
         {
             __asm__ ("stmxcsr %0" : "=m" (sf->mxcsr));
         }
-        __asm__ ("fnstsw %0" : "=m" (sf->fpcsr));
+       __asm__ ("fnstcw %0" : "=m" (sf->fpcsr));
     }
 #endif
 }