From patchwork Fri Feb 9 22:57:15 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Joseph Myers X-Patchwork-Id: 25894 Received: (qmail 57115 invoked by alias); 9 Feb 2018 22:57:22 -0000 Mailing-List: contact libc-alpha-help@sourceware.org; run by ezmlm Precedence: bulk List-Id: List-Unsubscribe: List-Subscribe: List-Archive: List-Post: List-Help: , Sender: libc-alpha-owner@sourceware.org Delivered-To: mailing list libc-alpha@sourceware.org Received: (qmail 57100 invoked by uid 89); 9 Feb 2018 22:57:22 -0000 Authentication-Results: sourceware.org; auth=none X-Virus-Found: No X-Spam-SWARE-Status: No, score=-24.5 required=5.0 tests=AWL, BAYES_00, GIT_PATCH_0, GIT_PATCH_1, GIT_PATCH_2, GIT_PATCH_3, RCVD_IN_DNSWL_NONE, SPF_PASS, URIBL_RED autolearn=ham version=3.3.2 spammy= X-HELO: relay1.mentorg.com Date: Fri, 9 Feb 2018 22:57:15 +0000 From: Joseph Myers To: Subject: Handle narrowing function sNaN test disabling based on argument format [committed] Message-ID: User-Agent: Alpine 2.20 (DEB 67 2015-01-07) MIME-Version: 1.0 X-ClientProxiedBy: svr-ies-mbx-01.mgc.mentorg.com (139.181.222.1) To svr-ies-mbx-01.mgc.mentorg.com (139.181.222.1) 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 * 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. 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[];