From debc4c9870dcf9f495561d3f7d8afd52878fecf0 Mon Sep 17 00:00:00 2001 From: Joseph Myers Date: Wed, 22 Aug 2018 15:22:06 +0000 Subject: Don't redefine ROUNDING_TESTS_* in math/test-*-vlen*.h. This patch completes the move of ROUNDING_TESTS_* macros to typo-proof conventions by stopping redefining them in test-*-vlen*.h. Instead, libm-test-driver.c is made to check TEST_MATHVEC when setting non-to-nearest rounding modes. Tested for x86_64. * math/test-double-vlen2.h: Don't include . (ROUNDING_TESTS_double): Remove. * math/test-double-vlen4.h: Don't include . (ROUNDING_TESTS_double): Remove. * math/test-double-vlen8.h: Don't include . (ROUNDING_TESTS_double): Remove. * math/test-float-vlen16.h: Don't include . (ROUNDING_TESTS_float): Remove. * math/test-float-vlen4.h: Don't include . (ROUNDING_TESTS_float): Remove. * math/test-float-vlen8.h: Don't include . (ROUNDING_TESTS_float): Remove. * math/libm-test-driver.c (IF_ROUND_INIT_FE_DOWNWARD): Check !TEST_MATHVEC here. (IF_ROUND_INIT_FE_TOWARDZERO): Likewise. (IF_ROUND_INIT_FE_UPWARD): Likewise. --- math/libm-test-driver.c | 3 +++ 1 file changed, 3 insertions(+) (limited to 'math/libm-test-driver.c') diff --git a/math/libm-test-driver.c b/math/libm-test-driver.c index 2bbfdef242..665274d1c5 100644 --- a/math/libm-test-driver.c +++ b/math/libm-test-driver.c @@ -389,6 +389,7 @@ struct test_Ff_b1_data #define IF_ROUND_INIT_FE_DOWNWARD \ int save_round_mode = fegetround (); \ if (ROUNDING_TESTS (FLOAT, FE_DOWNWARD) \ + && !TEST_MATHVEC \ && fesetround (FE_DOWNWARD) == 0) #define IF_ROUND_INIT_FE_TONEAREST \ int save_round_mode = fegetround (); \ @@ -397,10 +398,12 @@ struct test_Ff_b1_data #define IF_ROUND_INIT_FE_TOWARDZERO \ int save_round_mode = fegetround (); \ if (ROUNDING_TESTS (FLOAT, FE_TOWARDZERO) \ + && !TEST_MATHVEC \ && fesetround (FE_TOWARDZERO) == 0) #define IF_ROUND_INIT_FE_UPWARD \ int save_round_mode = fegetround (); \ if (ROUNDING_TESTS (FLOAT, FE_UPWARD) \ + && !TEST_MATHVEC \ && fesetround (FE_UPWARD) == 0) #define ROUND_RESTORE_ /* Empty. */ #define ROUND_RESTORE_FE_DOWNWARD \ -- cgit v1.2.3