diff options
Diffstat (limited to 'math')
-rw-r--r-- | math/Makefile | 33 | ||||
-rw-r--r-- | math/gen-libm-have-vector-test.sh | 9 | ||||
-rw-r--r-- | math/test-double-vlen2.h | 71 | ||||
-rw-r--r-- | math/test-double-vlen4.h | 71 | ||||
-rw-r--r-- | math/test-double-vlen8.h | 71 | ||||
-rw-r--r-- | math/test-vec-loop.h | 42 |
6 files changed, 288 insertions, 9 deletions
diff --git a/math/Makefile b/math/Makefile index 9a3cf3228b..8f14f255df 100644 --- a/math/Makefile +++ b/math/Makefile @@ -115,8 +115,9 @@ tests-static = test-fpucw-static test-fpucw-ieee-static test-longdouble-yes = test-ldouble test-ildoubl ifneq (no,$(PERL)) +libm-vec-tests = $(addprefix test-,$(libmvec-tests)) libm-tests = test-float test-double $(test-longdouble-$(long-double-fcts)) \ - test-ifloat test-idouble + test-ifloat test-idouble $(libm-vec-tests) libm-tests.o = $(addsuffix .o,$(libm-tests)) tests += $(libm-tests) @@ -143,8 +144,22 @@ $(objpfx)test-double.o: $(objpfx)libm-test.stmp $(objpfx)test-idouble.o: $(objpfx)libm-test.stmp $(objpfx)test-ldouble.o: $(objpfx)libm-test.stmp $(objpfx)test-ildoubl.o: $(objpfx)libm-test.stmp +$(addprefix $(objpfx), $(addsuffix .o, $(libm-vec-tests))): $(objpfx)libm-test.stmp endif +libm-test-fast-math-cflags = -fno-builtin -D__FAST_MATH__ -DTEST_FAST_MATH +libm-test-vec-cflags = $(libm-test-fast-math-cflags) -fno-inline \ + -ffloat-store -D_OPENMP=201307 -Wno-unknown-pragmas + +CFLAGS-test-double-vlen2.c = $(libm-test-vec-cflags) +CFLAGS-test-double-vlen2-wrappers.c = $(double-vlen2-arch-ext-cflags) + +CFLAGS-test-double-vlen4.c = $(libm-test-vec-cflags) +CFLAGS-test-double-vlen4-wrappers.c = $(double-vlen4-arch-ext-cflags) + +CFLAGS-test-double-vlen8.c = $(libm-test-vec-cflags) +CFLAGS-test-double-vlen8-wrappers.c = $(double-vlen8-arch-ext-cflags) + CFLAGS-test-float.c = -fno-inline -ffloat-store -fno-builtin CFLAGS-test-double.c = -fno-inline -ffloat-store -fno-builtin CFLAGS-test-ldouble.c = -fno-inline -ffloat-store -fno-builtin @@ -155,12 +170,12 @@ CFLAGS-test-tgmath.c = -fno-builtin CFLAGS-test-tgmath2.c = -fno-builtin CFLAGS-test-tgmath-ret.c = -fno-builtin CFLAGS-test-powl.c = -fno-builtin -CPPFLAGS-test-ifloat.c = -U__LIBC_INTERNAL_MATH_INLINES -D__FAST_MATH__ \ - -DTEST_FAST_MATH -fno-builtin -CPPFLAGS-test-idouble.c = -U__LIBC_INTERNAL_MATH_INLINES -D__FAST_MATH__ \ - -DTEST_FAST_MATH -fno-builtin -CPPFLAGS-test-ildoubl.c = -U__LIBC_INTERNAL_MATH_INLINES -D__FAST_MATH__ \ - -DTEST_FAST_MATH -fno-builtin +CPPFLAGS-test-ifloat.c = -U__LIBC_INTERNAL_MATH_INLINES \ + $(libm-test-fast-math-cflags) +CPPFLAGS-test-idouble.c = -U__LIBC_INTERNAL_MATH_INLINES \ + $(libm-test-fast-math-cflags) +CPPFLAGS-test-ildoubl.c = -U__LIBC_INTERNAL_MATH_INLINES \ + $(libm-test-fast-math-cflags) # The -lieee module sets the _LIB_VERSION_ switch to IEEE mode @@ -236,8 +251,10 @@ $(objpfx)libieee.a: $(objpfx)ieee-math.o $(patsubst %/,cd % &&,$(objpfx)) \ $(LN_S) $(<F) $(@F) -$(addprefix $(objpfx),$(filter-out $(tests-static),$(tests))): $(libm) +$(addprefix $(objpfx),$(filter-out $(tests-static) $(libm-vec-tests),$(tests))): $(libm) $(addprefix $(objpfx),$(tests-static)): $(objpfx)libm.a +$(addprefix $(objpfx), $(libm-vec-tests)): $(objpfx)%: $(libm) $(libmvec) \ + $(objpfx)init-arch.o $(objpfx)%-wrappers.o gmp-objs = $(patsubst %,$(common-objpfx)stdlib/%.o,\ add_n sub_n cmp addmul_1 mul_1 mul_n divmod_1 \ diff --git a/math/gen-libm-have-vector-test.sh b/math/gen-libm-have-vector-test.sh index eeddf76b70..8c36078662 100644 --- a/math/gen-libm-have-vector-test.sh +++ b/math/gen-libm-have-vector-test.sh @@ -25,6 +25,7 @@ print_defs() echo "#if defined TEST_VECTOR_$1 && TEST_VECTOR_$1" echo "# define HAVE_VECTOR_$1 1" echo "# define ${1}_VEC_SUFF WRAPPER_NAME ($1)" + echo "WRAPPER_DECL$2 (WRAPPER_NAME ($1))" echo "#else" echo "# define HAVE_VECTOR_$1 0" echo "# define ${1}_VEC_SUFF $1" @@ -32,12 +33,18 @@ print_defs() echo } -for func in $(grep ALL_RM_TEST libm-test.inc | grep -v define | sed -r "s/.*\(//; s/,.*//"); do +for func in $(cat libm-test.inc | grep ALL_RM_TEST | grep -v define | grep -v RUN_TEST_LOOP_ff_f | sed -r "s/.*\(//; s/,.*//" ); do print_defs ${func} print_defs ${func}f print_defs ${func}l done +for func in $(cat libm-test.inc | grep ALL_RM_TEST | grep RUN_TEST_LOOP_ff_f | sed -r "s/.*\(//; s/,.*//" ); do + print_defs ${func} "_ff" + print_defs ${func}f "_ff" + print_defs ${func}l "_ff" +done + # When all functions will use ALL_RM_TEST instead of using START directly, # this code can be removed. for func in $(grep 'START.*;$' libm-test.inc | sed -r "s/.*\(//; s/,.*//"); do diff --git a/math/test-double-vlen2.h b/math/test-double-vlen2.h new file mode 100644 index 0000000000..37d70604e5 --- /dev/null +++ b/math/test-double-vlen2.h @@ -0,0 +1,71 @@ +/* Definitions for double vector tests with vector length 2. + Copyright (C) 2014-2015 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/>. */ + +#define FLOAT double +#define FUNC(function) function +#define TEST_MSG "testing double vector math (without inline functions)\n" +#define MATHCONST(x) x +#define CHOOSE(Clongdouble,Cdouble,Cfloat,Cinlinelongdouble,Cinlinedouble,Cinlinefloat) Cdouble +#define PRINTF_EXPR "e" +#define PRINTF_XEXPR "a" +#define PRINTF_NEXPR "f" +#define TEST_DOUBLE 1 +#define TEST_MATHVEC 1 + +#ifndef __NO_MATH_INLINES +# define __NO_MATH_INLINES +#endif + +#define EXCEPTION_TESTS_double 0 +#define ROUNDING_TESTS_double(MODE) ((MODE) == FE_TONEAREST) + +#define CNCT(x, y) x ## y +#define CONCAT(a, b) CNCT (a, b) + +#define VEC_SUFF _vlen2 +#define WRAPPER_NAME(function) CONCAT (function, VEC_SUFF) + +#define FUNC_TEST(function) function ## _VEC_SUFF + +#define WRAPPER_DECL(function) extern FLOAT function (FLOAT); +#define WRAPPER_DECL_ff(function) extern FLOAT function (FLOAT, FLOAT); + +// Wrapper from scalar to vector function with vector length 8. +#define VECTOR_WRAPPER(scalar_func, vector_func) \ +extern VEC_TYPE vector_func (VEC_TYPE); \ +FLOAT scalar_func (FLOAT x) \ +{ \ + int i; \ + VEC_TYPE mx; \ + INIT_VEC_LOOP (mx, x, 2); \ + VEC_TYPE mr = vector_func (mx); \ + TEST_VEC_LOOP (2); \ +} + +// Wrapper from scalar 2 argument function to vector one. +#define VECTOR_WRAPPER_ff(scalar_func, vector_func) \ +extern VEC_TYPE vector_func (VEC_TYPE, VEC_TYPE); \ +FLOAT scalar_func (FLOAT x, FLOAT y) \ +{ \ + int i; \ + VEC_TYPE mx; \ + INIT_VEC_LOOP (mx, x, 2); \ + INIT_VEC_LOOP (my, y, 2); \ + VEC_TYPE mr = vector_func (mx, my); \ + TEST_VEC_LOOP (2); \ +} diff --git a/math/test-double-vlen4.h b/math/test-double-vlen4.h new file mode 100644 index 0000000000..4fca9d80b0 --- /dev/null +++ b/math/test-double-vlen4.h @@ -0,0 +1,71 @@ +/* Definitions for double vector tests with vector length 4. + Copyright (C) 2014-2015 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/>. */ + +#define FLOAT double +#define FUNC(function) function +#define TEST_MSG "testing double vector math (without inline functions)\n" +#define MATHCONST(x) x +#define CHOOSE(Clongdouble,Cdouble,Cfloat,Cinlinelongdouble,Cinlinedouble,Cinlinefloat) Cdouble +#define PRINTF_EXPR "e" +#define PRINTF_XEXPR "a" +#define PRINTF_NEXPR "f" +#define TEST_DOUBLE 1 +#define TEST_MATHVEC 1 + +#ifndef __NO_MATH_INLINES +# define __NO_MATH_INLINES +#endif + +#define EXCEPTION_TESTS_double 0 +#define ROUNDING_TESTS_double(MODE) ((MODE) == FE_TONEAREST) + +#define CNCT(x, y) x ## y +#define CONCAT(a, b) CNCT (a, b) + +#define VEC_SUFF _vlen4 +#define WRAPPER_NAME(function) CONCAT (function, VEC_SUFF) + +#define FUNC_TEST(function) function ## _VEC_SUFF + +#define WRAPPER_DECL(function) extern FLOAT function (FLOAT); +#define WRAPPER_DECL_ff(function) extern FLOAT function (FLOAT, FLOAT); + +// Wrapper from scalar to vector function with vector length 4. +#define VECTOR_WRAPPER(scalar_func, vector_func) \ +extern VEC_TYPE vector_func (VEC_TYPE); \ +FLOAT scalar_func (FLOAT x) \ +{ \ + int i; \ + VEC_TYPE mx; \ + INIT_VEC_LOOP (mx, x, 4); \ + VEC_TYPE mr = vector_func (mx); \ + TEST_VEC_LOOP (4); \ +} + +// Wrapper from scalar 2 argument function to vector one. +#define VECTOR_WRAPPER_ff(scalar_func, vector_func) \ +extern VEC_TYPE vector_func (VEC_TYPE, VEC_TYPE); \ +FLOAT scalar_func (FLOAT x, FLOAT y) \ +{ \ + int i; \ + VEC_TYPE mx, my; \ + INIT_VEC_LOOP (mx, x, 4); \ + INIT_VEC_LOOP (my, y, 4); \ + VEC_TYPE mr = vector_func (mx, my); \ + TEST_VEC_LOOP (4); \ +} diff --git a/math/test-double-vlen8.h b/math/test-double-vlen8.h new file mode 100644 index 0000000000..6780e81513 --- /dev/null +++ b/math/test-double-vlen8.h @@ -0,0 +1,71 @@ +/* Definitions for double vector tests with vector length 8. + Copyright (C) 2014-2015 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/>. */ + +#define FLOAT double +#define FUNC(function) function +#define TEST_MSG "testing double vector math (without inline functions)\n" +#define MATHCONST(x) x +#define CHOOSE(Clongdouble,Cdouble,Cfloat,Cinlinelongdouble,Cinlinedouble,Cinlinefloat) Cdouble +#define PRINTF_EXPR "e" +#define PRINTF_XEXPR "a" +#define PRINTF_NEXPR "f" +#define TEST_DOUBLE 1 +#define TEST_MATHVEC 1 + +#ifndef __NO_MATH_INLINES +# define __NO_MATH_INLINES +#endif + +#define EXCEPTION_TESTS_double 0 +#define ROUNDING_TESTS_double(MODE) ((MODE) == FE_TONEAREST) + +#define CNCT(x, y) x ## y +#define CONCAT(a, b) CNCT (a, b) + +#define VEC_SUFF _vlen8 +#define WRAPPER_NAME(function) CONCAT (function, VEC_SUFF) + +#define FUNC_TEST(function) function ## _VEC_SUFF + +#define WRAPPER_DECL(function) extern FLOAT function (FLOAT); +#define WRAPPER_DECL_ff(function) extern FLOAT function (FLOAT, FLOAT); + +// Wrapper from scalar to vector function with vector length 8. +#define VECTOR_WRAPPER(scalar_func, vector_func) \ +extern VEC_TYPE vector_func (VEC_TYPE); \ +FLOAT scalar_func (FLOAT x) \ +{ \ + int i; \ + VEC_TYPE mx; \ + INIT_VEC_LOOP (mx, x, 8); \ + VEC_TYPE mr = vector_func (mx); \ + TEST_VEC_LOOP (8); \ +} + +// Wrapper from scalar 2 argument function to vector one. +#define VECTOR_WRAPPER_ff(scalar_func, vector_func) \ +extern VEC_TYPE vector_func (VEC_TYPE, VEC_TYPE); \ +FLOAT scalar_func (FLOAT x, FLOAT y) \ +{ \ + int i; \ + VEC_TYPE mx, my; \ + INIT_VEC_LOOP (mx, x, 8); \ + INIT_VEC_LOOP (my, y, 8); \ + VEC_TYPE mr = vector_func (mx, my); \ + TEST_VEC_LOOP (8); \ +} diff --git a/math/test-vec-loop.h b/math/test-vec-loop.h new file mode 100644 index 0000000000..1a76c3ed58 --- /dev/null +++ b/math/test-vec-loop.h @@ -0,0 +1,42 @@ +/* Loop macro used in vector math functions tests. + Copyright (C) 2014-2015 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/>. */ + +/* This macro is used in VECTOR_WRAPPER macros for vector tests. */ +#define TEST_VEC_LOOP(len) \ + do \ + { \ + for (i = 1; i < len; i++) \ + { \ + if ((FLOAT) mr[0] != (FLOAT) mr[i]) \ + { \ + return ((FLOAT) mr[0] + 0.1); \ + } \ + } \ + return ((FLOAT) mr[0]); \ + } \ + while (0) + +#define INIT_VEC_LOOP(vec, val, len) \ + do \ + { \ + for (i = 0; i < len; i++) \ + { \ + vec[i] = val; \ + } \ + } \ + while (0) |