mirror of
https://sourceware.org/git/glibc.git
synced 2024-11-22 21:10:07 +00:00
7c3018f9e4
This patch adds a new build module called 'testsuite'.
IS_IN (testsuite) implies _ISOMAC, as do IS_IN_build and __cplusplus
(which means several ad-hoc tests for __cplusplus can go away).
libc-symbols.h now suppresses almost all of *itself* when _ISOMAC is
defined; in particular, _ISOMAC mode does not get config.h
automatically anymore.
There are still quite a few tests that need to see internal gunk of
one variety or another. For them, we now have 'tests-internal' and
'test-internal-extras'; files in this category will still be compiled
with MODULE_NAME=nonlib, and everything proceeds as it always has.
The bulk of this patch is moving tests from 'tests' to
'tests-internal'. There is also 'tests-static-internal', which has
the same effect on files in 'tests-static', and 'modules-names-tests',
which has the *inverse* effect on files in 'modules-names' (it's
inverted because most of the things in modules-names are *not* tests).
For both of these, the file must appear in *both* the new variable and
the old one.
There is also now a special case for when libc-symbols.h is included
without MODULE_NAME being defined at all. (This happens during the
creation of libc-modules.h, and also when preprocessing Versions
files.) When this happens, IS_IN is set to be always false and
_ISOMAC is *not* defined, which was the status quo, but now it's
explicit.
The remaining changes to C source files in this patch seemed likely to
cause problems in the absence of the main change. They should be
relatively self-explanatory. In a few cases I duplicated a definition
from an internal header rather than move the test to tests-internal;
this was a judgement call each time and I'm happy to change those
however reviewers feel is more appropriate.
* Makerules: New subdir configuration variables 'tests-internal'
and 'test-internal-extras'. Test files in these categories will
still be compiled with MODULE_NAME=nonlib. Test files in the
existing categories (tests, xtests, test-srcs, test-extras) are
now compiled with MODULE_NAME=testsuite.
New subdir configuration variable 'modules-names-tests'. Files
which are in both 'modules-names' and 'modules-names-tests' will
be compiled with MODULE_NAME=testsuite instead of
MODULE_NAME=extramodules.
(gen-as-const-headers): Move to tests-internal.
(do-tests-clean, common-mostlyclean): Support tests-internal.
* Makeconfig (built-modules): Add testsuite.
* Makefile: Change libof-check-installed-headers-c and
libof-check-installed-headers-cxx to 'testsuite'.
* Rules: Likewise. Support tests-internal.
* benchtests/strcoll-inputs/filelist#en_US.UTF-8:
Remove extra-modules.mk.
* config.h.in: Don't check for __OPTIMIZE__ or __FAST_MATH__ here.
* include/libc-symbols.h: Move definitions of _GNU_SOURCE,
PASTE_NAME, PASTE_NAME1, IN_MODULE, IS_IN, and IS_IN_LIB to the
very top of the file and rationalize their order.
If MODULE_NAME is not defined at all, define IS_IN to always be
false, and don't define _ISOMAC.
If any of IS_IN (testsuite), IS_IN_build, or __cplusplus are
true, define _ISOMAC and suppress everything else in this file,
starting with the inclusion of config.h.
Do check for inappropriate definitions of __OPTIMIZE__ and
__FAST_MATH__ here, but only if _ISOMAC is not defined.
Correct some out-of-date commentary.
* include/math.h: If _ISOMAC is defined, undefine NO_LONG_DOUBLE
and _Mlong_double_ before including math.h.
* include/string.h: If _ISOMAC is defined, don't expose
_STRING_ARCH_unaligned. Move a comment to a more appropriate
location.
* include/errno.h, include/stdio.h, include/stdlib.h, include/string.h
* include/time.h, include/unistd.h, include/wchar.h: No need to
check __cplusplus nor use __BEGIN_DECLS/__END_DECLS.
* misc/sys/cdefs.h (__NTHNL): New macro.
* sysdeps/m68k/m680x0/fpu/bits/mathinline.h
(__m81_defun): Use __NTHNL to avoid errors with GCC 6.
* elf/tst-env-setuid-tunables.c: Include config.h with _LIBC
defined, for HAVE_TUNABLES.
* inet/tst-checks-posix.c: No need to define _ISOMAC.
* intl/tst-gettext2.c: Provide own definition of N_.
* math/test-signgam-finite-c99.c: No need to define _ISOMAC.
* math/test-signgam-main.c: No need to define _ISOMAC.
* stdlib/tst-strtod.c: Convert to test-driver. Split locale_test to...
* stdlib/tst-strtod1i.c: ...this new file.
* stdlib/tst-strtod5.c: Convert to test-driver and add copyright notice.
Split tests of __strtod_internal to...
* stdlib/tst-strtod5i.c: ...this new file.
* string/test-string.h: Include stdint.h. Duplicate definition of
inhibit_loop_to_libcall here (from libc-symbols.h).
* string/test-strstr.c: Provide dummy definition of
libc_hidden_builtin_def when including strstr.c.
* sysdeps/ia64/fpu/libm-symbols.h: Suppress entire file in _ISOMAC
mode; no need to test __STRICT_ANSI__ nor __cplusplus as well.
* sysdeps/x86_64/fpu/math-tests-arch.h: Include cpu-features.h.
Don't include init-arch.h.
* sysdeps/x86_64/multiarch/test-multiarch.h: Include cpu-features.h.
Don't include init-arch.h.
* elf/Makefile: Move tst-ptrguard1-static, tst-stackguard1-static,
tst-tls1-static, tst-tls2-static, tst-tls3-static, loadtest,
unload, unload2, circleload1, neededtest, neededtest2,
neededtest3, neededtest4, tst-tls1, tst-tls2, tst-tls3,
tst-tls6, tst-tls7, tst-tls8, tst-dlmopen2, tst-ptrguard1,
tst-stackguard1, tst-_dl_addr_inside_object, and all of the
ifunc tests to tests-internal.
Don't add $(modules-names) to test-extras.
* inet/Makefile: Move tst-inet6_scopeid_pton to tests-internal.
Add tst-deadline to tests-static-internal.
* malloc/Makefile: Move tst-mallocstate and tst-scratch_buffer to
tests-internal.
* misc/Makefile: Move tst-atomic and tst-atomic-long to tests-internal.
* nptl/Makefile: Move tst-typesizes, tst-rwlock19, tst-sem11,
tst-sem12, tst-sem13, tst-barrier5, tst-signal7, tst-tls3,
tst-tls3-malloc, tst-tls5, tst-stackguard1, tst-sem11-static,
tst-sem12-static, and tst-stackguard1-static to tests-internal.
Link tests-internal with libpthread also.
Don't add $(modules-names) to test-extras.
* nss/Makefile: Move tst-field to tests-internal.
* posix/Makefile: Move bug-regex5, bug-regex20, bug-regex33,
tst-rfc3484, tst-rfc3484-2, and tst-rfc3484-3 to tests-internal.
* stdlib/Makefile: Move tst-strtod1i, tst-strtod3, tst-strtod4,
tst-strtod5i, tst-tls-atexit, and tst-tls-atexit-nodelete to
tests-internal.
* sunrpc/Makefile: Move tst-svc_register to tests-internal.
* sysdeps/powerpc/Makefile: Move test-get_hwcap and
test-get_hwcap-static to tests-internal.
* sysdeps/unix/sysv/linux/Makefile: Move tst-setgetname to
tests-internal.
* sysdeps/x86_64/fpu/Makefile: Add all libmvec test modules to
modules-names-tests.
240 lines
10 KiB
Makefile
240 lines
10 KiB
Makefile
ifeq ($(subdir),mathvec)
|
|
libmvec-support += svml_d_cos2_core svml_d_cos4_core_avx \
|
|
svml_d_cos4_core svml_d_cos8_core \
|
|
svml_d_sin2_core svml_d_sin4_core_avx \
|
|
svml_d_sin4_core svml_d_sin8_core svml_d_trig_data \
|
|
svml_s_cosf4_core svml_s_cosf8_core_avx \
|
|
svml_s_cosf8_core svml_s_cosf16_core svml_s_trig_data \
|
|
svml_s_sinf4_core svml_s_sinf8_core_avx \
|
|
svml_s_sinf8_core svml_s_sinf16_core \
|
|
svml_d_sincos2_core svml_d_sincos4_core_avx \
|
|
svml_d_sincos4_core svml_d_sincos8_core \
|
|
svml_d_log2_core svml_d_log4_core_avx svml_d_log4_core \
|
|
svml_d_log8_core svml_d_log_data svml_s_logf4_core \
|
|
svml_s_logf8_core_avx svml_s_logf8_core svml_s_logf16_core \
|
|
svml_s_logf_data svml_d_exp2_core svml_d_exp4_core_avx \
|
|
svml_d_exp4_core svml_d_exp8_core svml_d_exp_data \
|
|
svml_s_expf4_core svml_s_expf8_core_avx svml_s_expf8_core \
|
|
svml_s_expf16_core svml_s_expf_data svml_d_pow2_core \
|
|
svml_d_pow4_core_avx svml_d_pow4_core svml_d_pow8_core \
|
|
svml_d_pow_data svml_s_powf4_core svml_s_powf8_core_avx \
|
|
svml_s_powf8_core svml_s_powf16_core svml_s_powf_data \
|
|
svml_s_sincosf4_core svml_s_sincosf8_core_avx \
|
|
svml_s_sincosf8_core svml_s_sincosf16_core svml_finite_alias
|
|
|
|
libmvec-static-only-routines = svml_finite_alias
|
|
endif
|
|
|
|
# Variables for libmvec tests.
|
|
ifeq ($(subdir),math)
|
|
ifeq ($(build-mathvec),yes)
|
|
libmvec-tests += double-vlen2 double-vlen4 double-vlen4-avx2 \
|
|
float-vlen4 float-vlen8 float-vlen8-avx2
|
|
tests += test-double-libmvec-alias test-double-libmvec-alias-avx \
|
|
test-double-libmvec-alias-avx2 test-double-libmvec-alias-main \
|
|
test-double-libmvec-alias-avx-main test-double-libmvec-alias-avx2-main \
|
|
test-float-libmvec-alias test-float-libmvec-alias-avx \
|
|
test-float-libmvec-alias-avx2 test-float-libmvec-alias-main \
|
|
test-float-libmvec-alias-avx-main test-float-libmvec-alias-avx2-main \
|
|
test-double-libmvec-sincos test-double-libmvec-sincos-avx \
|
|
test-double-libmvec-sincos-avx2 test-float-libmvec-sincosf \
|
|
test-float-libmvec-sincosf-avx test-float-libmvec-sincosf-avx2
|
|
modules-names += test-double-libmvec-alias-mod \
|
|
test-double-libmvec-alias-avx-mod \
|
|
test-double-libmvec-alias-avx2-mod \
|
|
test-float-libmvec-alias-mod \
|
|
test-float-libmvec-alias-avx-mod \
|
|
test-float-libmvec-alias-avx2-mod
|
|
modules-names-tests += test-double-libmvec-alias-mod \
|
|
test-double-libmvec-alias-avx-mod \
|
|
test-double-libmvec-alias-avx2-mod \
|
|
test-float-libmvec-alias-mod \
|
|
test-float-libmvec-alias-avx-mod \
|
|
test-float-libmvec-alias-avx2-mod
|
|
extra-test-objs += test-double-libmvec-sincos-avx-main.o \
|
|
test-double-libmvec-sincos-avx2-main.o \
|
|
test-double-libmvec-sincos-main.o \
|
|
test-float-libmvec-sincosf-avx-main.o \
|
|
test-float-libmvec-sincosf-avx2-main.o\
|
|
test-float-libmvec-sincosf-main.o
|
|
test-double-libmvec-alias-mod.so-no-z-defs = yes
|
|
test-double-libmvec-alias-avx-mod.so-no-z-defs = yes
|
|
test-double-libmvec-alias-avx2-mod.so-no-z-defs = yes
|
|
test-float-libmvec-alias-mod.so-no-z-defs = yes
|
|
test-float-libmvec-alias-avx-mod.so-no-z-defs = yes
|
|
test-float-libmvec-alias-avx2-mod.so-no-z-defs = yes
|
|
|
|
$(objpfx)test-double-libmvec-alias: \
|
|
$(objpfx)test-double-libmvec-alias-mod.so
|
|
$(objpfx)test-double-libmvec-alias-mod.so: \
|
|
$(objpfx)../mathvec/libmvec_nonshared.a $(libmvec)
|
|
|
|
$(objpfx)test-double-libmvec-alias-avx: \
|
|
$(objpfx)test-double-libmvec-alias-avx-mod.so
|
|
$(objpfx)test-double-libmvec-alias-avx-mod.so: \
|
|
$(objpfx)../mathvec/libmvec_nonshared.a $(libmvec)
|
|
|
|
$(objpfx)test-double-libmvec-alias-avx2: \
|
|
$(objpfx)test-double-libmvec-alias-avx2-mod.so
|
|
$(objpfx)test-double-libmvec-alias-avx2-mod.so: \
|
|
$(objpfx)../mathvec/libmvec_nonshared.a $(libmvec)
|
|
|
|
$(objpfx)test-double-libmvec-alias-main: \
|
|
$(objpfx)test-double-libmvec-alias-mod.os \
|
|
$(objpfx)../mathvec/libmvec_nonshared.a $(libmvec)
|
|
|
|
$(objpfx)test-double-libmvec-alias-avx-main: \
|
|
$(objpfx)test-double-libmvec-alias-avx-mod.os \
|
|
$(objpfx)../mathvec/libmvec_nonshared.a $(libmvec)
|
|
|
|
$(objpfx)test-double-libmvec-alias-avx2-main: \
|
|
$(objpfx)test-double-libmvec-alias-avx2-mod.os \
|
|
$(objpfx)../mathvec/libmvec_nonshared.a $(libmvec)
|
|
|
|
$(objpfx)test-float-libmvec-alias: \
|
|
$(objpfx)test-float-libmvec-alias-mod.so
|
|
$(objpfx)test-float-libmvec-alias-mod.so: \
|
|
$(objpfx)../mathvec/libmvec_nonshared.a $(libmvec)
|
|
|
|
$(objpfx)test-float-libmvec-alias-avx: \
|
|
$(objpfx)test-float-libmvec-alias-avx-mod.so
|
|
$(objpfx)test-float-libmvec-alias-avx-mod.so: \
|
|
$(objpfx)../mathvec/libmvec_nonshared.a $(libmvec)
|
|
|
|
$(objpfx)test-float-libmvec-alias-avx2: \
|
|
$(objpfx)test-float-libmvec-alias-avx2-mod.so
|
|
$(objpfx)test-float-libmvec-alias-avx2-mod.so: \
|
|
$(objpfx)../mathvec/libmvec_nonshared.a $(libmvec)
|
|
|
|
$(objpfx)test-float-libmvec-alias-main: \
|
|
$(objpfx)test-float-libmvec-alias-mod.os \
|
|
$(objpfx)../mathvec/libmvec_nonshared.a $(libmvec)
|
|
|
|
$(objpfx)test-float-libmvec-alias-avx-main: \
|
|
$(objpfx)test-float-libmvec-alias-avx-mod.os \
|
|
$(objpfx)../mathvec/libmvec_nonshared.a $(libmvec)
|
|
|
|
$(objpfx)test-float-libmvec-alias-avx2-main: \
|
|
$(objpfx)test-float-libmvec-alias-avx2-mod.os \
|
|
$(objpfx)../mathvec/libmvec_nonshared.a $(libmvec)
|
|
|
|
$(objpfx)test-double-libmvec-sincos: \
|
|
$(objpfx)test-double-libmvec-sincos.o \
|
|
$(objpfx)test-double-libmvec-sincos-main.o $(libmvec)
|
|
|
|
$(objpfx)test-double-libmvec-sincos-avx: \
|
|
$(objpfx)test-double-libmvec-sincos-avx.o \
|
|
$(objpfx)test-double-libmvec-sincos-avx-main.o $(libmvec)
|
|
|
|
$(objpfx)test-double-libmvec-sincos-avx2: \
|
|
$(objpfx)test-double-libmvec-sincos-avx2.o \
|
|
$(objpfx)test-double-libmvec-sincos-avx2-main.o $(libmvec)
|
|
|
|
$(objpfx)test-float-libmvec-sincosf: \
|
|
$(objpfx)test-float-libmvec-sincosf.o \
|
|
$(objpfx)test-float-libmvec-sincosf-main.o $(libmvec)
|
|
|
|
$(objpfx)test-float-libmvec-sincosf-avx: \
|
|
$(objpfx)test-float-libmvec-sincosf-avx.o \
|
|
$(objpfx)test-float-libmvec-sincosf-avx-main.o $(libmvec)
|
|
|
|
$(objpfx)test-float-libmvec-sincosf-avx2: \
|
|
$(objpfx)test-float-libmvec-sincosf-avx2.o \
|
|
$(objpfx)test-float-libmvec-sincosf-avx2-main.o $(libmvec)
|
|
|
|
ifeq (yes,$(config-cflags-avx512))
|
|
libmvec-tests += double-vlen8 float-vlen16
|
|
tests += test-double-libmvec-alias-avx512 \
|
|
test-float-libmvec-alias-avx512 \
|
|
test-double-libmvec-alias-avx512-main \
|
|
test-float-libmvec-alias-avx512-main \
|
|
test-double-libmvec-sincos-avx512 \
|
|
test-float-libmvec-sincosf-avx512
|
|
modules-names += test-double-libmvec-alias-avx512-mod \
|
|
test-float-libmvec-alias-avx512-mod
|
|
modules-names-tests += test-double-libmvec-alias-avx512-mod \
|
|
test-float-libmvec-alias-avx512-mod
|
|
extra-test-objs += test-double-libmvec-sincos-avx512-main.o \
|
|
test-float-libmvec-sincosf-avx512-main.o
|
|
test-double-libmvec-alias-avx512-mod.so-no-z-defs = yes
|
|
test-float-libmvec-alias-avx512-mod.so-no-z-defs = yes
|
|
|
|
$(objpfx)test-double-libmvec-alias-avx512: \
|
|
$(objpfx)test-double-libmvec-alias-avx512-mod.so
|
|
$(objpfx)test-double-libmvec-alias-avx512-mod.so: \
|
|
$(objpfx)../mathvec/libmvec_nonshared.a $(libmvec)
|
|
|
|
$(objpfx)test-double-libmvec-alias-avx512-main: \
|
|
$(objpfx)test-double-libmvec-alias-avx512-mod.os \
|
|
$(objpfx)../mathvec/libmvec_nonshared.a $(libmvec)
|
|
|
|
$(objpfx)test-float-libmvec-alias-avx512: \
|
|
$(objpfx)test-float-libmvec-alias-avx512-mod.so
|
|
$(objpfx)test-float-libmvec-alias-avx512-mod.so: \
|
|
$(objpfx)../mathvec/libmvec_nonshared.a $(libmvec)
|
|
|
|
$(objpfx)test-float-libmvec-alias-avx512-main: \
|
|
$(objpfx)test-float-libmvec-alias-avx512-mod.os \
|
|
$(objpfx)../mathvec/libmvec_nonshared.a $(libmvec)
|
|
|
|
$(objpfx)test-double-libmvec-sincos-avx512: \
|
|
$(objpfx)test-double-libmvec-sincos-avx512.o \
|
|
$(objpfx)test-double-libmvec-sincos-avx512-main.o $(libmvec)
|
|
|
|
$(objpfx)test-float-libmvec-sincosf-avx512: \
|
|
$(objpfx)test-float-libmvec-sincosf-avx512.o \
|
|
$(objpfx)test-float-libmvec-sincosf-avx512-main.o $(libmvec)
|
|
endif
|
|
|
|
double-vlen2-funcs = cos exp log pow sin sincos
|
|
double-vlen4-funcs = cos exp log pow sin sincos
|
|
double-vlen4-avx2-funcs = cos exp log pow sin sincos
|
|
double-vlen8-funcs = cos exp log pow sin sincos
|
|
float-vlen4-funcs = cos exp log pow sin sincos
|
|
float-vlen8-funcs = cos exp log pow sin sincos
|
|
float-vlen8-avx2-funcs = cos exp log pow sin sincos
|
|
float-vlen16-funcs = cos exp log pow sin sincos
|
|
|
|
double-vlen4-arch-ext-cflags = -mavx
|
|
double-vlen4-arch-ext2-cflags = -mavx2
|
|
double-vlen8-arch-ext-cflags = -mavx512f
|
|
|
|
float-vlen8-arch-ext-cflags = -mavx
|
|
float-vlen8-arch-ext2-cflags = -mavx2
|
|
float-vlen16-arch-ext-cflags = -mavx512f
|
|
|
|
libmvec-sincos-cflags = $(libm-test-fast-math-cflags) -fno-inline -fopenmp -Wno-unknown-pragmas
|
|
libmvec-alias-cflags = $(libmvec-sincos-cflags) -ffloat-store -ffinite-math-only
|
|
|
|
CFLAGS-test-double-libmvec-alias-mod.c = $(libmvec-alias-cflags)
|
|
CFLAGS-test-double-libmvec-alias-avx-mod.c = $(double-vlen4-arch-ext-cflags) $(libmvec-alias-cflags) -DREQUIRE_AVX
|
|
CFLAGS-test-double-libmvec-alias-avx2-mod.c = $(double-vlen4-arch-ext2-cflags) $(libmvec-alias-cflags) -DREQUIRE_AVX2
|
|
CFLAGS-test-double-libmvec-alias-avx512-mod.c = $(double-vlen8-arch-ext-cflags) $(libmvec-alias-cflags) -DREQUIRE_AVX512F
|
|
|
|
CFLAGS-test-float-libmvec-alias-mod.c = $(libmvec-alias-cflags)
|
|
CFLAGS-test-float-libmvec-alias-avx-mod.c = $(double-vlen4-arch-ext-cflags) $(libmvec-alias-cflags) -DREQUIRE_AVX
|
|
CFLAGS-test-float-libmvec-alias-avx2-mod.c = $(double-vlen4-arch-ext2-cflags) $(libmvec-alias-cflags) -DREQUIRE_AVX2
|
|
CFLAGS-test-float-libmvec-alias-avx512-mod.c = $(double-vlen8-arch-ext-cflags) $(libmvec-alias-cflags) -DREQUIRE_AVX512F
|
|
|
|
CFLAGS-test-double-vlen4-avx2-wrappers.c = $(double-vlen4-arch-ext2-cflags)
|
|
|
|
CFLAGS-test-float-vlen8-avx2-wrappers.c = $(float-vlen8-arch-ext2-cflags)
|
|
|
|
CFLAGS-test-double-libmvec-sincos-main.c = $(libmvec-sincos-cflags)
|
|
CFLAGS-test-double-libmvec-sincos-avx.c = -DREQUIRE_AVX
|
|
CFLAGS-test-double-libmvec-sincos-avx-main.c = $(libmvec-sincos-cflags) $(double-vlen4-arch-ext-cflags)
|
|
CFLAGS-test-double-libmvec-sincos-avx2.c = -DREQUIRE_AVX2
|
|
CFLAGS-test-double-libmvec-sincos-avx2-main.c = $(libmvec-sincos-cflags) $(double-vlen4-arch-ext2-cflags)
|
|
CFLAGS-test-double-libmvec-sincos-avx512.c = -DREQUIRE_AVX512F
|
|
CFLAGS-test-double-libmvec-sincos-avx512-main.c = $(libmvec-sincos-cflags) $(double-vlen8-arch-ext-cflags)
|
|
|
|
CFLAGS-test-float-libmvec-sincosf-main.c = $(libmvec-sincos-cflags)
|
|
CFLAGS-test-float-libmvec-sincosf-avx.c = -DREQUIRE_AVX
|
|
CFLAGS-test-float-libmvec-sincosf-avx-main.c = $(libmvec-sincos-cflags) $(float-vlen8-arch-ext-cflags)
|
|
CFLAGS-test-float-libmvec-sincosf-avx2.c = -DREQUIRE_AVX2
|
|
CFLAGS-test-float-libmvec-sincosf-avx2-main.c = $(libmvec-sincos-cflags) $(float-vlen8-arch-ext2-cflags)
|
|
CFLAGS-test-float-libmvec-sincosf-avx512.c = -DREQUIRE_AVX512F
|
|
CFLAGS-test-float-libmvec-sincosf-avx512-main.c = $(libmvec-sincos-cflags) $(float-vlen16-arch-ext-cflags)
|
|
endif
|
|
endif
|