This patch adds vector cosf tests.

    * math/Makefile: Added CFLAGS for new tests.
    * math/test-float-vlen16.h: New file.
    * math/test-float-vlen4.h: New file.
    * math/test-float-vlen8.h: New file.
    * math/test-double-vlen2.h: Fixed 2 argument macro and comment.
    * sysdeps/x86_64/fpu/Makefile: Added new tests and variables.
    * sysdeps/x86_64/fpu/libm-test-ulps: Regenerated.
    * sysdeps/x86_64/fpu/test-float-vlen16-wrappers.c: New file.
    * sysdeps/x86_64/fpu/test-float-vlen16.c: New file.
    * sysdeps/x86_64/fpu/test-float-vlen4-wrappers.c: New file.
    * sysdeps/x86_64/fpu/test-float-vlen4.c: New file.
    * sysdeps/x86_64/fpu/test-float-vlen8-avx2-wrappers.c: New file.
    * sysdeps/x86_64/fpu/test-float-vlen8-avx2.c: New file.
    * sysdeps/x86_64/fpu/test-float-vlen8-wrappers.c: New file.
    * sysdeps/x86_64/fpu/test-float-vlen8.c: New file.

16 files changed, 461 insertions, 4 deletions

diff --git a/ChangeLog b/ChangeLog
index c3e52b25a9..353b383d43 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -68,6 +68,22 @@
 	* sysdeps/x86/fpu/bits/math-vector.h: Added SIMD declaration for cosf.
 	* NEWS: Mention addition of x86_64 vector cosf.
 
+	* math/Makefile: Added CFLAGS for new tests.
+	* math/test-float-vlen16.h: New file.
+	* math/test-float-vlen4.h: New file.
+	* math/test-float-vlen8.h: New file.
+	* math/test-double-vlen2.h: Fixed 2 argument macro and comment.
+	* sysdeps/x86_64/fpu/Makefile: Added new tests and variables.
+	* sysdeps/x86_64/fpu/libm-test-ulps: Regenerated.
+	* sysdeps/x86_64/fpu/test-float-vlen16-wrappers.c: New file.
+	* sysdeps/x86_64/fpu/test-float-vlen16.c: New file.
+	* sysdeps/x86_64/fpu/test-float-vlen4-wrappers.c: New file.
+	* sysdeps/x86_64/fpu/test-float-vlen4.c: New file.
+	* sysdeps/x86_64/fpu/test-float-vlen8-avx2-wrappers.c: New file.
+	* sysdeps/x86_64/fpu/test-float-vlen8-avx2.c: New file.
+	* sysdeps/x86_64/fpu/test-float-vlen8-wrappers.c: New file.
+	* sysdeps/x86_64/fpu/test-float-vlen8.c: New file.
+
 2015-06-09 Marko Myllynen  <myllynen@redhat.com>
 
 	* locale/C-ctype.c (PREDEFINED_CLASSES): Remove.
diff --git a/math/Makefile b/math/Makefile
index 8f14f255df..7f6b85ec0d 100644
--- a/math/Makefile
+++ b/math/Makefile
@@ -160,6 +160,15 @@ 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-vlen4.c = $(libm-test-vec-cflags)
+CFLAGS-test-float-vlen4-wrappers.c = $(float-vlen4-arch-ext-cflags)
+
+CFLAGS-test-float-vlen8.c = $(libm-test-vec-cflags)
+CFLAGS-test-float-vlen8-wrappers.c = $(float-vlen8-arch-ext-cflags)
+
+CFLAGS-test-float-vlen16.c = $(libm-test-vec-cflags)
+CFLAGS-test-float-vlen16-wrappers.c = $(float-vlen16-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
diff --git a/math/test-double-vlen2.h b/math/test-double-vlen2.h
index 37d70604e5..2e8415b16a 100644
--- a/math/test-double-vlen2.h
+++ b/math/test-double-vlen2.h
@@ -45,7 +45,7 @@
 #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.
+// Wrapper from scalar to vector function with vector length 2.
 #define VECTOR_WRAPPER(scalar_func, vector_func) \
 extern VEC_TYPE vector_func (VEC_TYPE);		\
 FLOAT scalar_func (FLOAT x)			\
@@ -63,7 +63,7 @@ extern VEC_TYPE vector_func (VEC_TYPE, VEC_TYPE);	\
 FLOAT scalar_func (FLOAT x, FLOAT y)		\
 {						\
   int i;					\
-  VEC_TYPE mx;					\
+  VEC_TYPE mx, my;				\
   INIT_VEC_LOOP (mx, x, 2);			\
   INIT_VEC_LOOP (my, y, 2);			\
   VEC_TYPE mr = vector_func (mx, my);		\
diff --git a/math/test-float-vlen16.h b/math/test-float-vlen16.h
new file mode 100644
index 0000000000..5c0a7a484f
--- /dev/null
+++ b/math/test-float-vlen16.h
@@ -0,0 +1,71 @@
+/* Definitions for float vector tests with vector length 16.
+   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 float
+#define FUNC(function) function ## f
+#define TEST_MSG "testing float vector math (without inline functions)\n"
+#define MATHCONST(x) x
+#define CHOOSE(Clongdouble,Cdouble,Cfloat,Cinlinelongdouble,Cinlinedouble,Cinlinefloat) Cfloat
+#define PRINTF_EXPR "e"
+#define PRINTF_XEXPR "a"
+#define PRINTF_NEXPR "f"
+#define TEST_FLOAT 1
+#define TEST_MATHVEC 1
+
+#ifndef __NO_MATH_INLINES
+# define __NO_MATH_INLINES
+#endif
+
+#define EXCEPTION_TESTS_float 0
+#define ROUNDING_TESTS_float(MODE) ((MODE) == FE_TONEAREST)
+
+#define CNCT(x, y) x ## y
+#define CONCAT(a, b) CNCT (a, b)
+
+#define VEC_SUFF _vlen16
+#define WRAPPER_NAME(function) CONCAT (function, VEC_SUFF)
+
+#define FUNC_TEST(function) function ## f ## _VEC_SUFF
+
+#define WRAPPER_DECL(func) extern FLOAT func (FLOAT x);
+#define WRAPPER_DECL_ff(func) extern FLOAT func (FLOAT x, FLOAT y);
+
+// Wrapper from scalar to vector function with vector length 16.
+#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, 16);			\
+  VEC_TYPE mr = vector_func (mx);		\
+  TEST_VEC_LOOP (16);				\
+}
+
+// Wrapper from scalar 2 argument function to vector one.
+#define VECTOR_WRAPPER_ff(scalar_func, vector_func) \
+extern VEC_TYPE vector_func (VEC_TYPE);		\
+FLOAT scalar_func (FLOAT x, FLOAT y)		\
+{						\
+  int i;					\
+  VEC_TYPE mx, my;				\
+  INIT_VEC_LOOP (mx, x, 16);			\
+  INIT_VEC_LOOP (my, y, 16);			\
+  VEC_TYPE mr = vector_func (mx, my);		\
+  TEST_VEC_LOOP (16);				\
+}
diff --git a/math/test-float-vlen4.h b/math/test-float-vlen4.h
new file mode 100644
index 0000000000..09485bccca
--- /dev/null
+++ b/math/test-float-vlen4.h
@@ -0,0 +1,71 @@
+/* Definitions for float 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 float
+#define FUNC(function) function ## f
+#define TEST_MSG "testing float vector math (without inline functions)\n"
+#define MATHCONST(x) x
+#define CHOOSE(Clongdouble,Cdouble,Cfloat,Cinlinelongdouble,Cinlinedouble,Cinlinefloat) Cfloat
+#define PRINTF_EXPR "e"
+#define PRINTF_XEXPR "a"
+#define PRINTF_NEXPR "f"
+#define TEST_FLOAT 1
+#define TEST_MATHVEC 1
+
+#ifndef __NO_MATH_INLINES
+# define __NO_MATH_INLINES
+#endif
+
+#define EXCEPTION_TESTS_float 0
+#define ROUNDING_TESTS_float(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 ## f ## _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);		\
+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-float-vlen8.h b/math/test-float-vlen8.h
new file mode 100644
index 0000000000..d309931c4c
--- /dev/null
+++ b/math/test-float-vlen8.h
@@ -0,0 +1,71 @@
+/* Definitions for float 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 float
+#define FUNC(function) function ## f
+#define TEST_MSG "testing float vector math (without inline functions)\n"
+#define MATHCONST(x) x
+#define CHOOSE(Clongdouble,Cdouble,Cfloat,Cinlinelongdouble,Cinlinedouble,Cinlinefloat) Cfloat
+#define PRINTF_EXPR "e"
+#define PRINTF_XEXPR "a"
+#define PRINTF_NEXPR "f"
+#define TEST_FLOAT 1
+#define TEST_MATHVEC 1
+
+#ifndef __NO_MATH_INLINES
+# define __NO_MATH_INLINES
+#endif
+
+#define EXCEPTION_TESTS_float 0
+#define ROUNDING_TESTS_float(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 ## f ## _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);		\
+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/sysdeps/x86_64/fpu/Makefile b/sysdeps/x86_64/fpu/Makefile
index af0d2af261..454cfbad0b 100644
--- a/sysdeps/x86_64/fpu/Makefile
+++ b/sysdeps/x86_64/fpu/Makefile
@@ -9,10 +9,11 @@ endif
 # Variables for libmvec tests.
 ifeq ($(subdir),math)
 ifeq ($(build-mathvec),yes)
-libmvec-tests += double-vlen2 double-vlen4 double-vlen4-avx2
+libmvec-tests += double-vlen2 double-vlen4 double-vlen4-avx2 \
+		 float-vlen4 float-vlen8 float-vlen8-avx2
 
 ifeq (yes,$(config-cflags-avx512))
-libmvec-tests += double-vlen8
+libmvec-tests += double-vlen8 float-vlen16
 endif
 
 double-vlen2-arch-ext-cflags = -msse4
@@ -20,8 +21,16 @@ double-vlen4-arch-ext-cflags = -mavx
 double-vlen4-arch-ext2-cflags = -mavx2
 double-vlen8-arch-ext-cflags = -mavx512f
 
+float-vlen4-arch-ext-cflags = -msse4
+float-vlen8-arch-ext-cflags = -mavx
+float-vlen8-arch-ext2-cflags = -mavx2
+float-vlen16-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)
 
+CFLAGS-test-float-vlen8-avx2.c = $(libm-test-vec-cflags)
+CFLAGS-test-float-vlen8-avx2-wrappers.c = $(float-vlen8-arch-ext2-cflags)
+
 endif
 endif
diff --git a/sysdeps/x86_64/fpu/libm-test-ulps b/sysdeps/x86_64/fpu/libm-test-ulps
index 0d1f6e830c..ed152d85f6 100644
--- a/sysdeps/x86_64/fpu/libm-test-ulps
+++ b/sysdeps/x86_64/fpu/libm-test-ulps
@@ -965,17 +965,25 @@ idouble: 1
 ildouble: 2
 ldouble: 2
 
+Function: "cos_vlen16":
+float: 1
+
 Function: "cos_vlen2":
 double: 1
 
 Function: "cos_vlen4":
 double: 1
+float: 1
 
 Function: "cos_vlen4_avx2":
 double: 1
 
 Function: "cos_vlen8":
 double: 1
+float: 1
+
+Function: "cos_vlen8_avx2":
+float: 1
 
 Function: "cosh":
 double: 1
diff --git a/sysdeps/x86_64/fpu/test-float-vlen16-wrappers.c b/sysdeps/x86_64/fpu/test-float-vlen16-wrappers.c
new file mode 100644
index 0000000000..2bb155f4de
--- /dev/null
+++ b/sysdeps/x86_64/fpu/test-float-vlen16-wrappers.c
@@ -0,0 +1,25 @@
+/* Wrapper part of tests for AVX-512 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
+   <http://www.gnu.org/licenses/>.  */
+
+#include "test-float-vlen16.h"
+#include "test-vec-loop.h"
+#include <immintrin.h>
+
+#define VEC_TYPE __m512
+
+VECTOR_WRAPPER (WRAPPER_NAME (cosf), _ZGVeN16v_cosf)
diff --git a/sysdeps/x86_64/fpu/test-float-vlen16.c b/sysdeps/x86_64/fpu/test-float-vlen16.c
new file mode 100644
index 0000000000..a664ad9383
--- /dev/null
+++ b/sysdeps/x86_64/fpu/test-float-vlen16.c
@@ -0,0 +1,25 @@
+/* Tests for AVX-512 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
+   <http://www.gnu.org/licenses/>.  */
+
+#include "test-float-vlen16.h"
+
+#define TEST_VECTOR_cosf 1
+
+#define REQUIRE_AVX512F
+
+#include "libm-test.c"
diff --git a/sysdeps/x86_64/fpu/test-float-vlen4-wrappers.c b/sysdeps/x86_64/fpu/test-float-vlen4-wrappers.c
new file mode 100644
index 0000000000..05d6a40241
--- /dev/null
+++ b/sysdeps/x86_64/fpu/test-float-vlen4-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
+   <http://www.gnu.org/licenses/>.  */
+
+#include "test-float-vlen4.h"
+#include "test-vec-loop.h"
+#include <immintrin.h>
+
+#define VEC_TYPE __m128
+
+VECTOR_WRAPPER (WRAPPER_NAME (cosf), _ZGVbN4v_cosf)
diff --git a/sysdeps/x86_64/fpu/test-float-vlen4.c b/sysdeps/x86_64/fpu/test-float-vlen4.c
new file mode 100644
index 0000000000..894652096f
--- /dev/null
+++ b/sysdeps/x86_64/fpu/test-float-vlen4.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
+   <http://www.gnu.org/licenses/>.  */
+
+#include "test-float-vlen4.h"
+
+#define TEST_VECTOR_cosf 1
+
+#include "libm-test.c"
diff --git a/sysdeps/x86_64/fpu/test-float-vlen8-avx2-wrappers.c b/sysdeps/x86_64/fpu/test-float-vlen8-avx2-wrappers.c
new file mode 100644
index 0000000000..cff9941e66
--- /dev/null
+++ b/sysdeps/x86_64/fpu/test-float-vlen8-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
+   <http://www.gnu.org/licenses/>.  */
+
+#include "test-float-vlen8.h"
+#include "test-vec-loop.h"
+#include <immintrin.h>
+
+#undef VEC_SUFF
+#define VEC_SUFF _vlen8_avx2
+
+#define VEC_TYPE __m256
+
+VECTOR_WRAPPER (WRAPPER_NAME (cosf), _ZGVdN8v_cosf)
diff --git a/sysdeps/x86_64/fpu/test-float-vlen8-avx2.c b/sysdeps/x86_64/fpu/test-float-vlen8-avx2.c
new file mode 100644
index 0000000000..f0ee6f2a96
--- /dev/null
+++ b/sysdeps/x86_64/fpu/test-float-vlen8-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
+   <http://www.gnu.org/licenses/>.  */
+
+#include "test-float-vlen8.h"
+
+#undef VEC_SUFF
+#define VEC_SUFF _vlen8_avx2
+
+#define TEST_VECTOR_cosf 1
+
+#define REQUIRE_AVX2
+
+#include "libm-test.c"
diff --git a/sysdeps/x86_64/fpu/test-float-vlen8-wrappers.c b/sysdeps/x86_64/fpu/test-float-vlen8-wrappers.c
new file mode 100644
index 0000000000..c2305a39a8
--- /dev/null
+++ b/sysdeps/x86_64/fpu/test-float-vlen8-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
+   <http://www.gnu.org/licenses/>.  */
+
+#include "test-float-vlen8.h"
+#include "test-vec-loop.h"
+#include <immintrin.h>
+
+#define VEC_TYPE __m256
+
+VECTOR_WRAPPER (WRAPPER_NAME (cosf), _ZGVcN8v_cosf)
diff --git a/sysdeps/x86_64/fpu/test-float-vlen8.c b/sysdeps/x86_64/fpu/test-float-vlen8.c
new file mode 100644
index 0000000000..b96dec697c
--- /dev/null
+++ b/sysdeps/x86_64/fpu/test-float-vlen8.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
+   <http://www.gnu.org/licenses/>.  */
+
+#include "test-float-vlen8.h"
+
+#define TEST_VECTOR_cosf 1
+
+#include "libm-test.c"