From 24a2718f595bc11dc6abb31303ceb8fdcb664f2f Mon Sep 17 00:00:00 2001 From: Andrew Senkevich Date: Tue, 9 Jun 2015 14:51:52 +0300 Subject: Addition of testing infrastructure for vector math functions. We test vector math functions using scalar tests infrastructure with help of special wrappers from scalar versions to vector ones. Wrapper implemented using platform specific vector types and placed in separate file for compilation with architecture specific options, main part of test has no such options. With help of system of definitions unfolding of which is drived from test code we have wrapper called in individual testing function instead of scalar function. Also system of definitions includes generated during make check header math/libm-have-vector-test.h with series of conditional definitions which help to avoid build fails for functions having no vector versions; runtime architecture check to prevent runtime fails of test run on inappropriate hardware. * math/Makefile: Added rules for vector tests. * math/gen-libm-have-vector-test.sh: Added generation of wrapper declaration under condition. * math/test-double-vlen2.h: New file. * math/test-double-vlen4.h: New file. * math/test-double-vlen8.h: New file. * math/test-vec-loop.h: Added initialization macro. * sysdeps/x86_64/fpu/Makefile: Added variables for vector tests. * sysdeps/x86_64/fpu/libm-test-ulps: Regenarated. * sysdeps/x86_64/fpu/math-tests-arch.h: New file. * sysdeps/x86_64/fpu/test-double-vlen2-wrappers.c: New file. * sysdeps/x86_64/fpu/test-double-vlen2.c: New file. * sysdeps/x86_64/fpu/test-double-vlen4-avx2-wrappers.c: New file. * sysdeps/x86_64/fpu/test-double-vlen4-avx2.c: New file. * sysdeps/x86_64/fpu/test-double-vlen4-wrappers.c: New file. * sysdeps/x86_64/fpu/test-double-vlen4.c: New file. * sysdeps/x86_64/fpu/test-double-vlen8-wrappers.c: New file. * sysdeps/x86_64/fpu/test-double-vlen8.c: New file. --- sysdeps/x86_64/fpu/Makefile | 20 +++++++ sysdeps/x86_64/fpu/libm-test-ulps | 12 ++++ sysdeps/x86_64/fpu/math-tests-arch.h | 65 ++++++++++++++++++++++ sysdeps/x86_64/fpu/test-double-vlen2-wrappers.c | 25 +++++++++ sysdeps/x86_64/fpu/test-double-vlen2.c | 23 ++++++++ .../x86_64/fpu/test-double-vlen4-avx2-wrappers.c | 28 ++++++++++ sysdeps/x86_64/fpu/test-double-vlen4-avx2.c | 28 ++++++++++ sysdeps/x86_64/fpu/test-double-vlen4-wrappers.c | 25 +++++++++ sysdeps/x86_64/fpu/test-double-vlen4.c | 23 ++++++++ sysdeps/x86_64/fpu/test-double-vlen8-wrappers.c | 25 +++++++++ sysdeps/x86_64/fpu/test-double-vlen8.c | 25 +++++++++ 11 files changed, 299 insertions(+) create mode 100644 sysdeps/x86_64/fpu/math-tests-arch.h create mode 100644 sysdeps/x86_64/fpu/test-double-vlen2-wrappers.c create mode 100644 sysdeps/x86_64/fpu/test-double-vlen2.c create mode 100644 sysdeps/x86_64/fpu/test-double-vlen4-avx2-wrappers.c create mode 100644 sysdeps/x86_64/fpu/test-double-vlen4-avx2.c create mode 100644 sysdeps/x86_64/fpu/test-double-vlen4-wrappers.c create mode 100644 sysdeps/x86_64/fpu/test-double-vlen4.c create mode 100644 sysdeps/x86_64/fpu/test-double-vlen8-wrappers.c create mode 100644 sysdeps/x86_64/fpu/test-double-vlen8.c (limited to 'sysdeps/x86_64') diff --git a/sysdeps/x86_64/fpu/Makefile b/sysdeps/x86_64/fpu/Makefile index 2f16323f78..2d5fcf894c 100644 --- a/sysdeps/x86_64/fpu/Makefile +++ b/sysdeps/x86_64/fpu/Makefile @@ -3,3 +3,23 @@ libmvec-support += svml_d_cos2_core svml_d_cos4_core_avx \ svml_d_cos4_core svml_d_cos8_core \ svml_d_cos_data init-arch endif + +# Variables for libmvec tests. +ifeq ($(subdir),math) +ifeq ($(build-mathvec),yes) +libmvec-tests += double-vlen2 double-vlen4 double-vlen4-avx2 + +ifeq (yes,$(config-cflags-avx512)) +libmvec-tests += double-vlen8 +endif + +double-vlen2-arch-ext-cflags = -msse4 +double-vlen4-arch-ext-cflags = -mavx +double-vlen4-arch-ext2-cflags = -mavx2 +double-vlen8-arch-ext-cflags = -mavx512f + +CFLAGS-test-double-vlen4-avx2.c = $(libm-test-vec-cflags) +CFLAGS-test-double-vlen4-avx2-wrappers.c = $(double-vlen4-arch-ext2-cflags) + +endif +endif diff --git a/sysdeps/x86_64/fpu/libm-test-ulps b/sysdeps/x86_64/fpu/libm-test-ulps index e60cc1b5f3..0d1f6e830c 100644 --- a/sysdeps/x86_64/fpu/libm-test-ulps +++ b/sysdeps/x86_64/fpu/libm-test-ulps @@ -965,6 +965,18 @@ idouble: 1 ildouble: 2 ldouble: 2 +Function: "cos_vlen2": +double: 1 + +Function: "cos_vlen4": +double: 1 + +Function: "cos_vlen4_avx2": +double: 1 + +Function: "cos_vlen8": +double: 1 + Function: "cosh": double: 1 float: 1 diff --git a/sysdeps/x86_64/fpu/math-tests-arch.h b/sysdeps/x86_64/fpu/math-tests-arch.h new file mode 100644 index 0000000000..56714f5142 --- /dev/null +++ b/sysdeps/x86_64/fpu/math-tests-arch.h @@ -0,0 +1,65 @@ +/* Runtime architecture check for math tests. x86_64 version. + 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 + . */ + +#if defined REQUIRE_AVX2 +# include + + /* Set to 1 if AVX2 supported. */ + static int avx2_usable; + +# define INIT_ARCH_EXT \ + do \ + { \ + __init_cpu_features (); \ + avx2_usable = __cpu_features.feature[index_AVX2_Usable] \ + & bit_AVX2_Usable; \ + } \ + while (0) + +# define CHECK_ARCH_EXT \ + do \ + { \ + if (!avx2_usable) return; \ + } \ + while (0) + +#elif defined REQUIRE_AVX512F +# include + + /* Set to 1 if supported. */ + static int avx512f_usable; + +# define INIT_ARCH_EXT \ + do \ + { \ + __init_cpu_features (); \ + avx512f_usable = __cpu_features.feature[index_AVX512F_Usable] \ + & bit_AVX512F_Usable; \ + } \ + while (0) + +# define CHECK_ARCH_EXT \ + do \ + { \ + if (!avx512f_usable) return; \ + } \ + while (0) + +#else +# include +#endif diff --git a/sysdeps/x86_64/fpu/test-double-vlen2-wrappers.c b/sysdeps/x86_64/fpu/test-double-vlen2-wrappers.c new file mode 100644 index 0000000000..bcfccb9814 --- /dev/null +++ b/sysdeps/x86_64/fpu/test-double-vlen2-wrappers.c @@ -0,0 +1,25 @@ +/* Wrapper part of tests for SSE ISA versions of vector math functions. + 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 + . */ + +#include "test-double-vlen2.h" +#include "test-vec-loop.h" +#include + +#define VEC_TYPE __m128d + +VECTOR_WRAPPER (WRAPPER_NAME (cos), _ZGVbN2v_cos) diff --git a/sysdeps/x86_64/fpu/test-double-vlen2.c b/sysdeps/x86_64/fpu/test-double-vlen2.c new file mode 100644 index 0000000000..03e20461e0 --- /dev/null +++ b/sysdeps/x86_64/fpu/test-double-vlen2.c @@ -0,0 +1,23 @@ +/* Tests for SSE ISA versions of vector math functions. + 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 + . */ + +#include "test-double-vlen2.h" + +#define TEST_VECTOR_cos 1 + +#include "libm-test.c" diff --git a/sysdeps/x86_64/fpu/test-double-vlen4-avx2-wrappers.c b/sysdeps/x86_64/fpu/test-double-vlen4-avx2-wrappers.c new file mode 100644 index 0000000000..69e3fb1a16 --- /dev/null +++ b/sysdeps/x86_64/fpu/test-double-vlen4-avx2-wrappers.c @@ -0,0 +1,28 @@ +/* Wrapper part of tests for AVX2 ISA versions of vector math functions. + 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 + . */ + +#include "test-double-vlen4.h" +#include "test-vec-loop.h" +#include + +#undef VEC_SUFF +#define VEC_SUFF _vlen4_avx2 + +#define VEC_TYPE __m256d + +VECTOR_WRAPPER (WRAPPER_NAME (cos), _ZGVdN4v_cos) diff --git a/sysdeps/x86_64/fpu/test-double-vlen4-avx2.c b/sysdeps/x86_64/fpu/test-double-vlen4-avx2.c new file mode 100644 index 0000000000..fcc4b64130 --- /dev/null +++ b/sysdeps/x86_64/fpu/test-double-vlen4-avx2.c @@ -0,0 +1,28 @@ +/* Tests for AVX2 ISA versions of vector math functions. + 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 + . */ + +#include "test-double-vlen4.h" + +#undef VEC_SUFF +#define VEC_SUFF _vlen4_avx2 + +#define TEST_VECTOR_cos 1 + +#define REQUIRE_AVX2 + +#include "libm-test.c" diff --git a/sysdeps/x86_64/fpu/test-double-vlen4-wrappers.c b/sysdeps/x86_64/fpu/test-double-vlen4-wrappers.c new file mode 100644 index 0000000000..cd9c0bb8a0 --- /dev/null +++ b/sysdeps/x86_64/fpu/test-double-vlen4-wrappers.c @@ -0,0 +1,25 @@ +/* Wrapper part of tests for AVX ISA versions of vector math functions. + 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 + . */ + +#include "test-double-vlen4.h" +#include "test-vec-loop.h" +#include + +#define VEC_TYPE __m256d + +VECTOR_WRAPPER (WRAPPER_NAME (cos), _ZGVcN4v_cos) diff --git a/sysdeps/x86_64/fpu/test-double-vlen4.c b/sysdeps/x86_64/fpu/test-double-vlen4.c new file mode 100644 index 0000000000..dd77b70e4b --- /dev/null +++ b/sysdeps/x86_64/fpu/test-double-vlen4.c @@ -0,0 +1,23 @@ +/* Tests for AVX ISA versions of vector math functions. + 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 + . */ + +#include "test-double-vlen4.h" + +#define TEST_VECTOR_cos 1 + +#include "libm-test.c" diff --git a/sysdeps/x86_64/fpu/test-double-vlen8-wrappers.c b/sysdeps/x86_64/fpu/test-double-vlen8-wrappers.c new file mode 100644 index 0000000000..9381360640 --- /dev/null +++ b/sysdeps/x86_64/fpu/test-double-vlen8-wrappers.c @@ -0,0 +1,25 @@ +/* Wrapper part of tests for AVX-512 versions of vector math functions. + 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 + . */ + +#include "test-double-vlen8.h" +#include "test-vec-loop.h" +#include + +#define VEC_TYPE __m512d + +VECTOR_WRAPPER (WRAPPER_NAME (cos), _ZGVeN8v_cos) diff --git a/sysdeps/x86_64/fpu/test-double-vlen8.c b/sysdeps/x86_64/fpu/test-double-vlen8.c new file mode 100644 index 0000000000..e4da2bdf36 --- /dev/null +++ b/sysdeps/x86_64/fpu/test-double-vlen8.c @@ -0,0 +1,25 @@ +/* Tests for AVX-512 versions of vector math functions. + 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 + . */ + +#include "test-double-vlen8.h" + +#define TEST_VECTOR_cos 1 + +#define REQUIRE_AVX512F + +#include "libm-test.c" -- cgit 1.4.1