diff options
| -rw-r--r-- | ChangeLog | 26 | ||||
| -rw-r--r-- | stdlib/tst-strtod-round-skeleton.c | 236 | ||||
| -rw-r--r-- | stdlib/tst-strtod-round.c | 206 | ||||
| -rw-r--r-- | wcsmbs/Makefile | 3 | ||||
| -rw-r--r-- | wcsmbs/tst-wcstod-round.c | 31 |
5 files changed, 303 insertions, 199 deletions
diff --git a/ChangeLog b/ChangeLog index 3e39147efa..e91bd08118 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,29 @@ +2016-08-19 Paul E. Murphy <murphyp@linux.vnet.ibm.com> + + * stdlib/tst-strtod-round-skeleton.c: + Refactored from tst-strtod-round.c. + + (L_): New macro to apply literal modifier. + (FNPFX): New macro to select str or wcs prefix. + (CHAR): New macro to choose wchar_t or char. + (STRM): New macro to choose printf for tested character type. + + (STRTO): New macro to choose appropriate string -> real function. + (FNPFXS): Stringitized version of FNPFX. + (STR): Support for above macro. + (STRX): Likewise. + + (TEST): Update with above macros. + (test): Likewise. + (GEN_ONE_TEST): Likewise. + (test_in_one_mode): Likewise. + + * stdlib/tst-strtod-round.c: New file. + * wcsmbs/tst-wcstod-round.c: New file. + + * wcsmbs/Makefile: (tests): Add tst-wcstod-round + (tst-wcstod-round): Add libm depencency for fesetround. + 2016-08-19 Zack Weinberg <zackw@panix.com> * debug/tst-chk1.c: Add tests for fortification of bcopy and bzero. diff --git a/stdlib/tst-strtod-round-skeleton.c b/stdlib/tst-strtod-round-skeleton.c new file mode 100644 index 0000000000..1853c529c2 --- /dev/null +++ b/stdlib/tst-strtod-round-skeleton.c @@ -0,0 +1,236 @@ +/* Test for correct rounding of results of strtod and related + functions. + Copyright (C) 2012-2016 Free Software Foundation, Inc. + This file is part of the GNU C Library. + + The GNU C Library is free software; you can redistribute it and/or + modify it under the terms of the GNU Lesser General Public + License as published by the Free Software Foundation; either + version 2.1 of the License, or (at your option) any later version. + + The GNU C Library is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + Lesser General Public License for more details. + + You should have received a copy of the GNU Lesser General Public + License along with the GNU C Library; if not, see + <http://www.gnu.org/licenses/>. */ + +/* Defining _LIBC_TEST ensures long double math functions are + declared in the headers. */ +#define _LIBC_TEST 1 +#include <fenv.h> +#include <float.h> +#include <math.h> +#include <stdbool.h> +#include <stdio.h> +#include <stdlib.h> +#include <string.h> +#include <math-tests.h> + +#include "tst-strtod.h" + +/* Non-standard macros expected to be externally defined: + + L_(str): Pastes the appropriate modifier to a string literal str. + + FNPFX: Expands to the correct prefix for the strtod equivalent + of type CHAR. (e.g str or wcs). + + CHAR: Expands to the string type being tested (e.g wchar_t or char). + + STRM: Expands to a string literal suitable for printing CHAR* via + printf (e.g "%s" or "%ls"). */ + +#define _CONCAT(a, b) a ## b +#define CONCAT(a, b) _CONCAT (a, b) + +#define STRTO(x) CONCAT (CONCAT (FNPFX, to), x) + +#if LDBL_MANT_DIG == 106 && LDBL_MAX_EXP == 1024 +/* This is a stupid hack for IBM long double. This test ignores + inexact values for long double due to the limitations of the + format. This ensures rounding tests are ignored. */ +# undef ROUNDING_TESTS_long_double +# define ROUNDING_TESTS_long_double(x) 0 +#endif + +/* Generator to create an FTYPE member variabled named FSUF + used to populate struct member variables. */ +#define FTYPE_MEMBER(FSUF, FTYPE, FTOSTR, FTOSTRM, LSUF, CSUF) \ + FTYPE FSUF; + +/* Likewise, but each member is of type bool. */ +#define BOOL_MEMBER(FSUF, FTYPE, FTOSTR, FTOSTRM, LSUF, CSUF) \ + bool FSUF; + +#define STRUCT_FOREACH_FLOAT_FTYPE GEN_TEST_STRTOD_FOREACH (FTYPE_MEMBER) +#define STRUCT_FOREACH_FLOAT_BOOL GEN_TEST_STRTOD_FOREACH (BOOL_MEMBER) + +/* Define the long double choose (CHOOSE_ld) macro + to select the appropriate generated long double + value from the generated test data. */ +#if LDBL_MANT_DIG == 53 && LDBL_MAX_EXP == 1024 +/* This is for the long double == double format. */ +# define CHOOSE_ld(f,d,...) d +#elif LDBL_MANT_DIG == 64 && LDBL_MAX_EXP == 16384 && LDBL_MIN_EXP == -16381 +/* This is for the Intel extended float format. */ +# define CHOOSE_ld(f,d,ld64i,...) ld64i +#elif LDBL_MANT_DIG == 64 && LDBL_MAX_EXP == 16384 && LDBL_MIN_EXP == -16382 +/* This is for the Motorola extended float format. */ +# define CHOOSE_ld(f,d,ld64i,ld64m,...) ld64m +#elif LDBL_MANT_DIG == 106 && LDBL_MAX_EXP == 1024 +/* This is for the IBM extended double format. */ +# define CHOOSE_ld(f,d,ld64i,ld64m,ld106,...) ld106 +#elif LDBL_MANT_DIG == 113 && LDBL_MAX_EXP == 16384 +/* This is for the IEEE binary128 format. */ +# define CHOOSE_ld(f,d,ld64i,ld64m,ld106,ld113,...) ld113 +#else +# error "unknown long double format" +#endif + +/* Add type specific choosing macros below. */ +#define CHOOSE_f(f,...) f +#define CHOOSE_d(f,d,...) d +/* long double is special, and handled above. */ + +/* Selector for expected result field of a given type. */ +#define _ENTRY(FSUF, FTYPE, FTOSTR, FTOSTRM, LSUF, CSUF, ...) \ + CONCAT (CHOOSE_ ## FSUF (__VA_ARGS__), LSUF), +#define ENTRY(...) \ + GEN_TEST_STRTOD_FOREACH (_ENTRY, __VA_ARGS__) + +/* Selector for boolean exact tag of expected results. */ +#define _XNTRY(FSUF, FTYPE, FTOSTR, FTOSTRM, LSUF, CSUF, ...) \ + CHOOSE_ ## FSUF (__VA_ARGS__), +#define XNTRY(...) \ + GEN_TEST_STRTOD_FOREACH (_XNTRY, __VA_ARGS__) + +/* This is hacky way around the seemingly unavoidable macro + expansion of the INFINITY or HUGE_VAL like macros in the + above. It is assumed the compiler will implicitly convert + the infinity correctly. */ +#define INF INFINITY + 0.0 + +/* This macro is used in conjunction with the output from the + gen-tst-strtod-round utility to select the appropriately + rounded long double value for a given format. */ +#define TEST(s, \ + fx, fd, fn, fz, fu, \ + dx, dd, dn, dz, du, \ + ld64ix, ld64id, ld64in, ld64iz, ld64iu, \ + ld64mx, ld64md, ld64mn, ld64mz, ld64mu, \ + ld106x, ld106d, ld106n, ld106z, ld106u, \ + ld113x, ld113d, ld113n, ld113z, ld113u) \ + { \ + L_ (s), \ + { XNTRY (fx, dx, ld64ix, ld64mx, ld106x, ld113x) }, \ + { \ + { ENTRY (fn, dn, ld64in, ld64mn, ld106n, ld113n) }, \ + { ENTRY (fd, dd, ld64id, ld64md, ld106d, ld113d) }, \ + { ENTRY (fz, dz, ld64iz, ld64mz, ld106z, ld113z) }, \ + { ENTRY (fu, du, ld64iu, ld64mu, ld106u, ld113u) } \ + } \ + } + +struct test_exactness + { + STRUCT_FOREACH_FLOAT_BOOL + }; + +struct test_results + { + STRUCT_FOREACH_FLOAT_FTYPE + }; + +struct test { + const CHAR *s; + struct test_exactness exact; + struct test_results r[4]; +}; + +/* Include the generated test data. */ +#include "tst-strtod-round-data.h" + +#define STRX(x) #x +#define STR(x) STRX (x) +#define FNPFXS STR (FNPFX) + +#define GEN_ONE_TEST(FSUF, FTYPE, FTOSTR, FTOSTRM, LSUF, CSUF) \ +{ \ + FTYPE f = STRTO (FSUF) (s, NULL); \ + if (f != expected->FSUF \ + || (copysign ## CSUF) (1.0 ## LSUF, f) \ + != (copysign ## CSUF) (1.0 ## LSUF, expected->FSUF)) \ + { \ + CHAR efstr[FSTRLENMAX]; \ + CHAR fstr[FSTRLENMAX]; \ + FTOSTR (efstr, FSTRLENMAX, L_("%") L_(FTOSTRM) L_("a"), \ + expected->FSUF); \ + FTOSTR (fstr, FSTRLENMAX, L_("%") L_(FTOSTRM) L_("a"), f);\ + printf (FNPFXS "to" #FSUF " (" STRM ") returned " STRM \ + " not " STRM " (%s)\n", \ + s, fstr, efstr, mode_name); \ + if (ROUNDING_TESTS (FTYPE, rnd_mode) || exact->FSUF) \ + result = 1; \ + else \ + printf ("ignoring this inexact result\n"); \ + } \ +} + +static int +test_in_one_mode (const CHAR *s, const struct test_results *expected, + const struct test_exactness *exact, const char *mode_name, + int rnd_mode) +{ + int result = 0; + GEN_TEST_STRTOD_FOREACH (GEN_ONE_TEST) + return result; +} + +static const struct fetestmodes + { + const char *mode_name; + int rnd_mode; + int rnd_i; /* Corresponding index into r array of struct test. */ + } modes[] = { + { "default rounding mode", FE_TONEAREST, 0 }, +#ifdef FE_DOWNWARD + { "FE_DOWNWARD", FE_DOWNWARD, 1 }, +#endif +#ifdef FE_TOWARDZERO + { "FE_TOWARDZERO", FE_TOWARDZERO, 2 }, +#endif +#ifdef FE_UPWARD + { "FE_UPWARD", FE_UPWARD, 3 }, +#endif + {} +}; + +static int +do_test (void) +{ + int save_round_mode __attribute__ ((unused)) = fegetround (); + int result = 0; + for (size_t i = 0; i < sizeof (tests) / sizeof (tests[0]); i++) + { + result |= test_in_one_mode (tests[i].s, &tests[i].r[modes[0].rnd_i], + &tests[i].exact, modes[0].mode_name, + modes[0].rnd_mode); + for (const struct fetestmodes *m = &modes[1]; m->mode_name != NULL; m++) + { + if (!fesetround (m->rnd_mode)) + { + result |= test_in_one_mode (tests[i].s, &tests[i].r[m->rnd_i], + &tests[i].exact, m->mode_name, + m->rnd_mode); + fesetround (save_round_mode); + } + } + } + return result; +} + +#define TEST_FUNCTION do_test () +#include "../test-skeleton.c" diff --git a/stdlib/tst-strtod-round.c b/stdlib/tst-strtod-round.c index 509f96ac9e..ae5d6f8478 100644 --- a/stdlib/tst-strtod-round.c +++ b/stdlib/tst-strtod-round.c @@ -1,6 +1,5 @@ -/* Test for correct rounding of results of strtod and related - functions. - Copyright (C) 2012-2016 Free Software Foundation, Inc. +/* char shim for tst-strtod-round-skeleton.c. + Copyright (C) 2016 Free Software Foundation, Inc. This file is part of the GNU C Library. The GNU C Library is free software; you can redistribute it and/or @@ -17,200 +16,9 @@ License along with the GNU C Library; if not, see <http://www.gnu.org/licenses/>. */ -/* Defining _LIBC_TEST ensures long double math functions are - declared in the headers. */ -#define _LIBC_TEST 1 -#include <fenv.h> -#include <float.h> -#include <math.h> -#include <stdbool.h> -#include <stdio.h> -#include <stdlib.h> -#include <string.h> -#include <math-tests.h> +#define L_(str) str +#define FNPFX str +#define CHAR char +#define STRM "%s" -#include "tst-strtod.h" - -#define _CONCAT(a, b) a ## b -#define CONCAT(a, b) _CONCAT (a, b) - -#if LDBL_MANT_DIG == 106 && LDBL_MAX_EXP == 1024 -/* This is a stupid hack for IBM long double. This test ignores - inexact values for long double due to the limitations of the - format. This ensures rounding tests are ignored. */ -# undef ROUNDING_TESTS_long_double -# define ROUNDING_TESTS_long_double(x) 0 -#endif - -/* Generator to create an FTYPE member variabled named FSUF - used to populate struct member variables. */ -#define FTYPE_MEMBER(FSUF, FTYPE, FTOSTR, FTOSTRM, LSUF, CSUF) \ - FTYPE FSUF; - -/* Likewise, but each member is of type bool. */ -#define BOOL_MEMBER(FSUF, FTYPE, FTOSTR, FTOSTRM, LSUF, CSUF) \ - bool FSUF; - -#define STRUCT_FOREACH_FLOAT_FTYPE GEN_TEST_STRTOD_FOREACH (FTYPE_MEMBER) -#define STRUCT_FOREACH_FLOAT_BOOL GEN_TEST_STRTOD_FOREACH (BOOL_MEMBER) - -/* Define the long double choose (CHOOSE_ld) macro - to select the appropriate generated long double - value from the generated test data. */ -#if LDBL_MANT_DIG == 53 && LDBL_MAX_EXP == 1024 -/* This is for the long double == double format. */ -# define CHOOSE_ld(f,d,...) d -#elif LDBL_MANT_DIG == 64 && LDBL_MAX_EXP == 16384 && LDBL_MIN_EXP == -16381 -/* This is for the Intel extended float format. */ -# define CHOOSE_ld(f,d,ld64i,...) ld64i -#elif LDBL_MANT_DIG == 64 && LDBL_MAX_EXP == 16384 && LDBL_MIN_EXP == -16382 -/* This is for the Motorola extended float format. */ -# define CHOOSE_ld(f,d,ld64i,ld64m,...) ld64m -#elif LDBL_MANT_DIG == 106 && LDBL_MAX_EXP == 1024 -/* This is for the IBM extended double format. */ -# define CHOOSE_ld(f,d,ld64i,ld64m,ld106,...) ld106 -#elif LDBL_MANT_DIG == 113 && LDBL_MAX_EXP == 16384 -/* This is for the IEEE binary128 format. */ -# define CHOOSE_ld(f,d,ld64i,ld64m,ld106,ld113,...) ld113 -#else -# error "unknown long double format" -#endif - -/* Add type specific choosing macros below. */ -#define CHOOSE_f(f,...) f -#define CHOOSE_d(f,d,...) d -/* long double is special, and handled above. */ - -/* Selector for expected result field of a given type. */ -#define _ENTRY(FSUF, FTYPE, FTOSTR, FTOSTRM, LSUF, CSUF, ...) \ - CONCAT (CHOOSE_ ## FSUF (__VA_ARGS__), LSUF), -#define ENTRY(...) \ - GEN_TEST_STRTOD_FOREACH (_ENTRY, __VA_ARGS__) - -/* Selector for boolean exact tag of expected results. */ -#define _XNTRY(FSUF, FTYPE, FTOSTR, FTOSTRM, LSUF, CSUF, ...) \ - CHOOSE_ ## FSUF (__VA_ARGS__), -#define XNTRY(...) \ - GEN_TEST_STRTOD_FOREACH (_XNTRY, __VA_ARGS__) - -/* This is hacky way around the seemingly unavoidable macro - expansion of the INFINITY or HUGE_VAL like macros in the - above. It is assumed the compiler will implicitly convert - the infinity correctly. */ -#define INF INFINITY + 0.0 - -/* This macro is used in conjunction with the output from the - gen-tst-strtod-round utility to select the appropriately - rounded long double value for a given format. */ -#define TEST(s, \ - fx, fd, fn, fz, fu, \ - dx, dd, dn, dz, du, \ - ld64ix, ld64id, ld64in, ld64iz, ld64iu, \ - ld64mx, ld64md, ld64mn, ld64mz, ld64mu, \ - ld106x, ld106d, ld106n, ld106z, ld106u, \ - ld113x, ld113d, ld113n, ld113z, ld113u) \ - { \ - s, \ - { XNTRY (fx, dx, ld64ix, ld64mx, ld106x, ld113x) }, \ - { \ - { ENTRY (fn, dn, ld64in, ld64mn, ld106n, ld113n) }, \ - { ENTRY (fd, dd, ld64id, ld64md, ld106d, ld113d) }, \ - { ENTRY (fz, dz, ld64iz, ld64mz, ld106z, ld113z) }, \ - { ENTRY (fu, du, ld64iu, ld64mu, ld106u, ld113u) } \ - } \ - } - -struct test_exactness - { - STRUCT_FOREACH_FLOAT_BOOL - }; - -struct test_results - { - STRUCT_FOREACH_FLOAT_FTYPE - }; - -struct test { - const char *s; - struct test_exactness exact; - struct test_results r[4]; -}; - -/* Include the generated test data. */ -#include "tst-strtod-round-data.h" - -#define GEN_ONE_TEST(FSUF, FTYPE, FTOSTR, FTOSTRM, LSUF, CSUF) \ -{ \ - FTYPE f = strto ## FSUF (s, NULL); \ - if (f != expected->FSUF \ - || (copysign ## CSUF) (1.0 ## LSUF, f) \ - != (copysign ## CSUF) (1.0 ## LSUF, expected->FSUF)) \ - { \ - char efstr[FSTRLENMAX]; \ - char fstr[FSTRLENMAX]; \ - FTOSTR (efstr, FSTRLENMAX, "%" FTOSTRM "a", expected->FSUF); \ - FTOSTR (fstr, FSTRLENMAX, "%" FTOSTRM "a", f); \ - printf ("strto" #FSUF " (%s) returned %s not %s" \ - " (%s)\n", s, fstr, efstr, mode_name); \ - if (ROUNDING_TESTS (FTYPE, rnd_mode) || exact->FSUF) \ - result = 1; \ - else \ - printf ("ignoring this inexact result\n"); \ - } \ -} - -static int -test_in_one_mode (const char *s, const struct test_results *expected, - const struct test_exactness *exact, const char *mode_name, - int rnd_mode) -{ - int result = 0; - GEN_TEST_STRTOD_FOREACH (GEN_ONE_TEST) - return result; -} - -static const struct fetestmodes - { - const char *mode_name; - int rnd_mode; - int rnd_i; /* Corresponding index into r array of struct test. */ - } modes[] = { - { "default rounding mode", FE_TONEAREST, 0 }, -#ifdef FE_DOWNWARD - { "FE_DOWNWARD", FE_DOWNWARD, 1 }, -#endif -#ifdef FE_TOWARDZERO - { "FE_TOWARDZERO", FE_TOWARDZERO, 2 }, -#endif -#ifdef FE_UPWARD - { "FE_UPWARD", FE_UPWARD, 3 }, -#endif - {} -}; - -static int -do_test (void) -{ - int save_round_mode __attribute__ ((unused)) = fegetround (); - int result = 0; - for (size_t i = 0; i < sizeof (tests) / sizeof (tests[0]); i++) - { - result |= test_in_one_mode (tests[i].s, &tests[i].r[modes[0].rnd_i], - &tests[i].exact, modes[0].mode_name, - modes[0].rnd_mode); - for (const struct fetestmodes *m = &modes[1]; m->mode_name != NULL; m++) - { - if (!fesetround (m->rnd_mode)) - { - result |= test_in_one_mode (tests[i].s, &tests[i].r[m->rnd_i], - &tests[i].exact, m->mode_name, - m->rnd_mode); - fesetround (save_round_mode); - } - } - } - return result; -} - -#define TEST_FUNCTION do_test () -#include "../test-skeleton.c" +#include <tst-strtod-round-skeleton.c> diff --git a/wcsmbs/Makefile b/wcsmbs/Makefile index 8b599f75be..9384a10678 100644 --- a/wcsmbs/Makefile +++ b/wcsmbs/Makefile @@ -49,6 +49,7 @@ strop-tests := wcscmp wcsncmp wmemcmp wcslen wcschr wcsrchr wcscpy wcsnlen \ tests := tst-wcstof wcsmbs-tst1 tst-wcsnlen tst-btowc tst-mbrtowc \ tst-wcrtomb tst-wcpncpy tst-mbsrtowcs tst-wchar-h tst-mbrtowc2 \ tst-c16c32-1 wcsatcliff tst-wcstol-locale tst-wcstod-nan-locale \ + tst-wcstod-round \ $(addprefix test-,$(strop-tests)) include ../Rules @@ -68,6 +69,8 @@ $(objpfx)tst-wcstol-locale.out: $(gen-locales) $(objpfx)tst-wcstod-nan-locale.out: $(gen-locales) endif +$(objpfx)tst-wcstod-round: $(libm) + CFLAGS-wcwidth.c = -I../wctype CFLAGS-wcswidth.c = -I../wctype diff --git a/wcsmbs/tst-wcstod-round.c b/wcsmbs/tst-wcstod-round.c new file mode 100644 index 0000000000..38ddaea192 --- /dev/null +++ b/wcsmbs/tst-wcstod-round.c @@ -0,0 +1,31 @@ +/* wide character shim for tst-strtod-round-skeleton.c. + Copyright (C) 2016 Free Software Foundation, Inc. + This file is part of the GNU C Library. + + The GNU C Library is free software; you can redistribute it and/or + modify it under the terms of the GNU Lesser General Public + License as published by the Free Software Foundation; either + version 2.1 of the License, or (at your option) any later version. + + The GNU C Library is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + Lesser General Public License for more details. + + You should have received a copy of the GNU Lesser General Public + License along with the GNU C Library; if not, see + <http://www.gnu.org/licenses/>. */ + +#include <wchar.h> + +/* Include stdio.h early to avoid issues with the snprintf + redefinition below. */ +#include <stdio.h> + +#define L_(str) L ## str +#define FNPFX wcs +#define CHAR wchar_t +#define STRM "%ls" +#define snprintf swprintf + +#include <stdlib/tst-strtod-round-skeleton.c> |