From: Joseph Myers Date: Wed, 22 Aug 2018 15:22:06 +0000 (+0000) Subject: Don't redefine ROUNDING_TESTS_* in math/test-*-vlen*.h. X-Git-Tag: glibc-2.29~507 X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=debc4c9870dcf9f495561d3f7d8afd52878fecf0;p=thirdparty%2Fglibc.git 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. --- diff --git a/ChangeLog b/ChangeLog index 0f435dcae41..923f1f1d13a 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,5 +1,22 @@ 2018-08-22 Joseph Myers + * 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. + * sysdeps/generic/math-tests-rounding.h: New file. * sysdeps/generic/math-tests.h: Include . (ROUNDING_TESTS_float): Do not define here. diff --git a/math/libm-test-driver.c b/math/libm-test-driver.c index 2bbfdef242e..665274d1c51 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 \ diff --git a/math/test-double-vlen2.h b/math/test-double-vlen2.h index 12f37bab852..6c39e6da5f9 100644 --- a/math/test-double-vlen2.h +++ b/math/test-double-vlen2.h @@ -19,10 +19,6 @@ #include "test-double.h" #include "test-math-no-inline.h" #include "test-math-vector.h" -#include - -#undef ROUNDING_TESTS_double -#define ROUNDING_TESTS_double(MODE) ((MODE) == FE_TONEAREST) #define VEC_SUFF _vlen2 #define VEC_LEN 2 diff --git a/math/test-double-vlen4.h b/math/test-double-vlen4.h index a28fef367cb..3193bc09152 100644 --- a/math/test-double-vlen4.h +++ b/math/test-double-vlen4.h @@ -19,10 +19,6 @@ #include "test-double.h" #include "test-math-no-inline.h" #include "test-math-vector.h" -#include - -#undef ROUNDING_TESTS_double -#define ROUNDING_TESTS_double(MODE) ((MODE) == FE_TONEAREST) #define VEC_SUFF _vlen4 #define VEC_LEN 4 diff --git a/math/test-double-vlen8.h b/math/test-double-vlen8.h index 93e4daba2ad..d769da99032 100644 --- a/math/test-double-vlen8.h +++ b/math/test-double-vlen8.h @@ -19,10 +19,6 @@ #include "test-double.h" #include "test-math-no-inline.h" #include "test-math-vector.h" -#include - -#undef ROUNDING_TESTS_double -#define ROUNDING_TESTS_double(MODE) ((MODE) == FE_TONEAREST) #define VEC_SUFF _vlen8 #define VEC_LEN 8 diff --git a/math/test-float-vlen16.h b/math/test-float-vlen16.h index 3cdd97dabfb..a9353e3d6d6 100644 --- a/math/test-float-vlen16.h +++ b/math/test-float-vlen16.h @@ -19,10 +19,6 @@ #include "test-float.h" #include "test-math-no-inline.h" #include "test-math-vector.h" -#include - -#undef ROUNDING_TESTS_float -#define ROUNDING_TESTS_float(MODE) ((MODE) == FE_TONEAREST) #define VEC_SUFF _vlen16 #define VEC_LEN 16 diff --git a/math/test-float-vlen4.h b/math/test-float-vlen4.h index 76374b98fe4..cd01d1070e0 100644 --- a/math/test-float-vlen4.h +++ b/math/test-float-vlen4.h @@ -19,10 +19,6 @@ #include "test-float.h" #include "test-math-no-inline.h" #include "test-math-vector.h" -#include - -#undef ROUNDING_TESTS_float -#define ROUNDING_TESTS_float(MODE) ((MODE) == FE_TONEAREST) #define VEC_SUFF _vlen4 #define VEC_LEN 4 diff --git a/math/test-float-vlen8.h b/math/test-float-vlen8.h index b44d00e0ac6..15527811083 100644 --- a/math/test-float-vlen8.h +++ b/math/test-float-vlen8.h @@ -19,10 +19,6 @@ #include "test-float.h" #include "test-math-no-inline.h" #include "test-math-vector.h" -#include - -#undef ROUNDING_TESTS_float -#define ROUNDING_TESTS_float(MODE) ((MODE) == FE_TONEAREST) #define VEC_SUFF _vlen8 #define VEC_LEN 8