diff options
| -rw-r--r-- | ChangeLog | 13 | ||||
| -rw-r--r-- | sysdeps/x86_64/Makefile | 8 | ||||
| -rw-r--r-- | sysdeps/x86_64/tst-audit10-aux.c | 41 | ||||
| -rw-r--r-- | sysdeps/x86_64/tst-audit10.c | 34 | ||||
| -rw-r--r-- | sysdeps/x86_64/tst-audit4-aux.c | 39 | ||||
| -rw-r--r-- | sysdeps/x86_64/tst-audit4.c | 45 |
6 files changed, 125 insertions, 55 deletions
@@ -1,5 +1,18 @@ 2016-03-07 Florian Weimer <fweimer@redhat.com> + [BZ #19269] + * sysdeps/x86_64/Makefile (tst-audit4): Depend on + tst-audit4-aux.o. + (tst-audit10): Depend on tst-audit10-aux.o. + (CFLAGS-tst-audit4-aux.c): Compile with AVX enabled. + (CFLAGS-tst-audit10-aux.c): Compile with AVX512 enabled. + * sysdeps/x86_64/tst-audit4.c (do_test): Call tst_audit4_aux + instead of inline AVX code. + * sysdeps/x86_64/tst-audit10.c (do_test): Call tst_audit10_aux + instead of inline AVX512 code. + * sysdeps/x86_64/tst-audit4-aux.c: New file + * sysdeps/x86_64/tst-audit10-aux.c: New file + [BZ #19648] * test-skeleton.c (main): Do not set RLIMIT_DATA. diff --git a/sysdeps/x86_64/Makefile b/sysdeps/x86_64/Makefile index 788e4fc..aa4a754 100644 --- a/sysdeps/x86_64/Makefile +++ b/sysdeps/x86_64/Makefile @@ -64,7 +64,7 @@ $(objpfx)tst-audit3: $(objpfx)tst-auditmod3a.so $(objpfx)tst-audit3.out: $(objpfx)tst-auditmod3b.so tst-audit3-ENV = LD_AUDIT=$(objpfx)tst-auditmod3b.so -$(objpfx)tst-audit4: $(objpfx)tst-auditmod4a.so +$(objpfx)tst-audit4: $(objpfx)tst-audit4-aux.o $(objpfx)tst-auditmod4a.so $(objpfx)tst-audit4.out: $(objpfx)tst-auditmod4b.so tst-audit4-ENV = LD_AUDIT=$(objpfx)tst-auditmod4b.so @@ -81,12 +81,12 @@ $(objpfx)tst-audit7: $(objpfx)tst-auditmod7a.so $(objpfx)tst-audit7.out: $(objpfx)tst-auditmod7b.so tst-audit7-ENV = LD_AUDIT=$(objpfx)tst-auditmod7b.so -$(objpfx)tst-audit10: $(objpfx)tst-auditmod10a.so +$(objpfx)tst-audit10: $(objpfx)tst-audit10-aux.o $(objpfx)tst-auditmod10a.so $(objpfx)tst-audit10.out: $(objpfx)tst-auditmod10b.so tst-audit10-ENV = LD_AUDIT=$(objpfx)tst-auditmod10b.so AVX-CFLAGS=-mavx -mno-vzeroupper -CFLAGS-tst-audit4.c += $(AVX-CFLAGS) +CFLAGS-tst-audit4-aux.c += $(AVX-CFLAGS) CFLAGS-tst-auditmod4a.c += $(AVX-CFLAGS) CFLAGS-tst-auditmod4b.c += $(AVX-CFLAGS) CFLAGS-tst-auditmod6b.c += $(AVX-CFLAGS) @@ -94,7 +94,7 @@ CFLAGS-tst-auditmod6c.c += $(AVX-CFLAGS) CFLAGS-tst-auditmod7b.c += $(AVX-CFLAGS) ifeq (yes,$(config-cflags-avx512)) AVX512-CFLAGS = -mavx512f -CFLAGS-tst-audit10.c += $(AVX512-CFLAGS) +CFLAGS-tst-audit10-aux.c += $(AVX512-CFLAGS) CFLAGS-tst-auditmod10a.c += $(AVX512-CFLAGS) CFLAGS-tst-auditmod10b.c += $(AVX512-CFLAGS) endif diff --git a/sysdeps/x86_64/tst-audit10-aux.c b/sysdeps/x86_64/tst-audit10-aux.c new file mode 100644 index 0000000..4398b8f --- /dev/null +++ b/sysdeps/x86_64/tst-audit10-aux.c @@ -0,0 +1,41 @@ +/* Test case for preserved AVX512 registers in dynamic linker, -mavx512f part. + 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/>. */ + +#include <immintrin.h> +#include <stdlib.h> +#include <string.h> + +extern __m512i audit_test (__m512i, __m512i, __m512i, __m512i, + __m512i, __m512i, __m512i, __m512i); + +int +tst_audit10_aux (void) +{ +#ifdef __AVX512F__ + __m512i zmm = _mm512_setzero_si512 (); + __m512i ret = audit_test (zmm, zmm, zmm, zmm, zmm, zmm, zmm, zmm); + + zmm = _mm512_set1_epi64 (0x12349876); + + if (memcmp (&zmm, &ret, sizeof (ret))) + abort (); + return 0; +#else /* __AVX512F__ */ + return 77; +#endif /* __AVX512F__ */ +} diff --git a/sysdeps/x86_64/tst-audit10.c b/sysdeps/x86_64/tst-audit10.c index d104341..92e0cb4 100644 --- a/sysdeps/x86_64/tst-audit10.c +++ b/sysdeps/x86_64/tst-audit10.c @@ -1,4 +1,5 @@ -/* Copyright (C) 2012-2016 Free Software Foundation, Inc. +/* Test case for preserved AVX512 registers in dynamic linker. + 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 @@ -15,13 +16,9 @@ License along with the GNU C Library; if not, see <http://www.gnu.org/licenses/>. */ -/* Test case for x86-64 preserved registers in dynamic linker. */ - -#ifdef __AVX512F__ -#include <stdlib.h> -#include <string.h> #include <cpuid.h> -#include <immintrin.h> + +int tst_audit10_aux (void); static int avx512_enabled (void) @@ -42,32 +39,15 @@ avx512_enabled (void) return (eax & 0xe6) == 0xe6; } - -extern __m512i audit_test (__m512i, __m512i, __m512i, __m512i, - __m512i, __m512i, __m512i, __m512i); static int do_test (void) { /* Run AVX512 test only if AVX512 is supported. */ if (avx512_enabled ()) - { - __m512i zmm = _mm512_setzero_si512 (); - __m512i ret = audit_test (zmm, zmm, zmm, zmm, zmm, zmm, zmm, zmm); - - zmm = _mm512_set1_epi64 (0x12349876); - - if (memcmp (&zmm, &ret, sizeof (ret))) - abort (); - } - return 0; -} -#else -static int -do_test (void) -{ - return 0; + return tst_audit10_aux (); + else + return 77; } -#endif #define TEST_FUNCTION do_test () #include "../../test-skeleton.c" diff --git a/sysdeps/x86_64/tst-audit4-aux.c b/sysdeps/x86_64/tst-audit4-aux.c new file mode 100644 index 0000000..a1aeb65 --- /dev/null +++ b/sysdeps/x86_64/tst-audit4-aux.c @@ -0,0 +1,39 @@ +/* Test case for preserved AVX registers in dynamic linker, -mavx part. + Copyright (C) 2009-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 <immintrin.h> +#include <stdlib.h> +#include <string.h> + +extern __m256i audit_test (__m256i, __m256i, __m256i, __m256i, + __m256i, __m256i, __m256i, __m256i); + +int +tst_audit4_aux (void) +{ +#ifdef __AVX__ + __m256i ymm = _mm256_setzero_si256 (); + __m256i ret = audit_test (ymm, ymm, ymm, ymm, ymm, ymm, ymm, ymm); + ymm = _mm256_set1_epi32 (0x12349876); + if (memcmp (&ymm, &ret, sizeof (ret))) + abort (); + return 0; +#else /* __AVX__ */ + return 77; +#endif /* __AVX__ */ +} diff --git a/sysdeps/x86_64/tst-audit4.c b/sysdeps/x86_64/tst-audit4.c index 44d5123..d8e2ab1 100644 --- a/sysdeps/x86_64/tst-audit4.c +++ b/sysdeps/x86_64/tst-audit4.c @@ -1,11 +1,24 @@ -/* Test case for x86-64 preserved registers in dynamic linker. */ +/* Test case for preserved AVX registers in dynamic linker. + Copyright (C) 2009-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/>. */ -#ifdef __AVX__ -#include <stdlib.h> -#include <string.h> #include <cpuid.h> -#include <immintrin.h> +int tst_audit4_aux (void); static int avx_enabled (void) @@ -22,31 +35,15 @@ avx_enabled (void) return (eax & 6) == 6; } - -extern __m256i audit_test (__m256i, __m256i, __m256i, __m256i, - __m256i, __m256i, __m256i, __m256i); static int do_test (void) { /* Run AVX test only if AVX is supported. */ if (avx_enabled ()) - { - __m256i ymm = _mm256_setzero_si256 (); - __m256i ret = audit_test (ymm, ymm, ymm, ymm, ymm, ymm, ymm, ymm); - - ymm = _mm256_set1_epi32 (0x12349876); - if (memcmp (&ymm, &ret, sizeof (ret))) - abort (); - } - return 0; -} -#else -static int -do_test (void) -{ - return 0; + return tst_audit4_aux (); + else + return 77; } -#endif #define TEST_FUNCTION do_test () #include "../../test-skeleton.c" |