Patchwork Handle narrowing function sNaN test disabling based on argument format [committed]

login
register
mail settings
Submitter Joseph Myers
Date Feb. 9, 2018, 10:57 p.m.
Message ID <alpine.DEB.2.20.1802092256580.21892@digraph.polyomino.org.uk>
Download mbox | patch
Permalink /patch/25894/
State Committed
Headers show

Comments

Joseph Myers - Feb. 9, 2018, 10:57 p.m.
Testing narrowing functions for x86_64 with GCC 6 showed up a further
testsuite fix needed: there is no _Float128 sNaN support before GCC 7
on x86_64 / x86, and the existing tests of SNAN_TESTS only checked it
for the return type, not for the argument type.  This patch fixes the
code to check SNAN_TESTS (ARG_FLOAT) as well (in a variable set in
libm-test-driver.c, since libm-test-support.c is compiled only once
for each choice of FLOAT).

Tested for x86_64 and x86 with GCC 6 in conjunction with the main
patch adding narrowing add functions.  Committed.

2018-02-09  Joseph Myers  <joseph@codesourcery.com>

	* math/libm-test-driver.c (snan_tests_arg): New variable.
	* math/libm-test-support.h (snan_tests_arg): New declaration.
	* math/libm-test-support.c (enable_test): Check snan_tests_arg.

Patch

diff --git a/math/libm-test-driver.c b/math/libm-test-driver.c
index 3713e70..30646da 100644
--- a/math/libm-test-driver.c
+++ b/math/libm-test-driver.c
@@ -27,6 +27,12 @@  const int flag_test_finite = TEST_FINITE;
 const int flag_test_inline = TEST_INLINE;
 const int flag_test_mathvec = TEST_MATHVEC;
 
+#if TEST_NARROW
+const int snan_tests_arg = SNAN_TESTS (ARG_FLOAT);
+#else
+const int snan_tests_arg = SNAN_TESTS (FLOAT);
+#endif
+
 #define STRX(x) #x
 #define STR(x) STRX (x)
 #define STR_FLOAT STR (FLOAT)
diff --git a/math/libm-test-support.c b/math/libm-test-support.c
index e59f15b..1a12ed6 100644
--- a/math/libm-test-support.c
+++ b/math/libm-test-support.c
@@ -985,7 +985,8 @@  enable_test (int exceptions)
     return 0;
   if (flag_test_finite && (exceptions & NON_FINITE) != 0)
     return 0;
-  if (!SNAN_TESTS (FLOAT) && (exceptions & TEST_SNAN) != 0)
+  if ((!SNAN_TESTS (FLOAT) || !snan_tests_arg)
+      && (exceptions & TEST_SNAN) != 0)
     return 0;
   if (flag_test_mathvec && (exceptions & NO_TEST_MATHVEC) != 0)
     return 0;
diff --git a/math/libm-test-support.h b/math/libm-test-support.h
index 64206ab..4263774 100644
--- a/math/libm-test-support.h
+++ b/math/libm-test-support.h
@@ -37,6 +37,7 @@  extern const int flag_test_exceptions;
 extern const int flag_test_finite;
 extern const int flag_test_inline;
 extern const int flag_test_mathvec;
+extern const int snan_tests_arg;
 extern const char test_msg[];
 extern const char qtype_str[];
 extern const char doc[];