mirror of
https://sourceware.org/git/glibc.git
synced 2024-11-21 20:40:05 +00:00
8540f6d2a7
One wart in the original support for test wrappers for cross testing, as noted in <https://sourceware.org/ml/libc-alpha/2012-10/msg00722.html>, is the requirement for test wrappers to pass a poorly-defined set of environment variables from the build system to the system running the glibc under test. Although some variables are passed explicitly via $(test-wrapper-env), including LD_* variables that simply can't be passed implicitly because of the side effects they'd have on the build system's dynamic linker, others are passed implicitly, including variables such as GCONV_PATH and LOCPATH that could potentially affect the build system's libc (so effectively relying on any such effects not breaking the wrappers). In addition, the code in cross-test-ssh.sh for preserving environment variables is fragile (it depends on how bash formats a list of exported variables, and could well break for multi-line variable definitions where the contents contain things looking like other variable definitions). This patch moves to explicitly passing environment variables via $(test-wrapper-env). Makefile variables that previously used $(test-wrapper) are split up into -before-env and -after-env parts that can be passed separately to the various .sh files used in testing, so those files can then insert environment settings between the two parts. The common default environment settings in make-test-out are made into a separate makefile variable that can also be passed to scripts, rather than many scripts duplicating those settings (for testing an installed glibc, it is desirable to have the GCONV_PATH setting on just one place, so just that one place needs to support it pointing to an installed sysroot instead of the build tree). The default settings are included in the variables such as $(test-program-prefix), so that if tests do not need any non-default settings they can continue to use single variables rather than the split-up variables. Although this patch cleans up LC_ALL=C settings (that being part of the common defaults), various LANG=C and LANGUAGE=C settings remain. Those are generally unnecessary and I propose a subsequent cleanup to remove them. LC_ALL takes precedence over LANG, and while LANGUAGE takes precedence over LC_ALL, it only does so for settings other than LC_ALL=C. So LC_ALL=C on its own is sufficient to ensure the C locale, and anything that gets LC_ALL=C does not need the other settings. While preparing this patch I noticed some tests with .sh files that appeared to do nothing beyond what the generic makefile support for tests can do (localedata/tst-wctype.sh - the makefiles support -ENV variables and .input files - and localedata/tst-mbswcs.sh - just runs five tests that could be run individually from the makefile). So I propose another subsequent cleanup to move those to using the generic support instead of special .sh files. Tested x86_64 (native) and powerpc32 (cross). * Makeconfig (run-program-env): New variable. (run-program-prefix-before-env): Likewise. (run-program-prefix-after-env): Likewise. (run-program-prefix): Define in terms of new variables. (built-program-cmd-before-env): New variable. (built-program-cmd-after-env): Likewise. (built-program-cmd): Define in terms of new variables. (test-program-prefix-before-env): New variable. (test-program-prefix-after-env): Likewise. (test-program-prefix): Define in terms of new variables. (test-program-cmd-before-env): New variable. (test-program-cmd-after-env): Likewise. (test-program-cmd): Define in terms of new variables. * Rules (make-test-out): Use $(run-program-env). * scripts/cross-test-ssh.sh (env_blacklist): Remove variable. (help): Do not mention environment variables. Mention --timeoutfactor option. (timeoutfactor): New variable. (blacklist_exports): Remove function. (exports): Remove variable. (command): Do not include ${exports}. * manual/install.texi (Configuring and compiling): Do not mention test wrappers preserving environment variables. Mention that last assignment to a variable must take precedence. * INSTALL: Regenerated. * benchtests/Makefile (run-bench): Use $(run-program-env). * catgets/Makefile ($(objpfx)test1.cat): Use $(built-program-cmd-before-env), $(run-program-env) and $(built-program-cmd-after-env). ($(objpfx)test2.cat): Do not specify environment variables explicitly. ($(objpfx)de/libc.cat): Use $(built-program-cmd-before-env), $(run-program-env) and $(built-program-cmd-after-env). ($(objpfx)test-gencat.out): Use $(test-program-cmd-before-env), $(run-program-env) and $(test-program-cmd-after-env). ($(objpfx)sample.SJIS.cat): Do not specify environment variables explicitly. * catgets/test-gencat.sh: Use test_program_cmd_before_env, run_program_env and test_program_cmd_after_env arguments. * elf/Makefile ($(objpfx)tst-pathopt.out): Use $(run-program-env). * elf/tst-pathopt.sh: Use run_program_env argument. * iconvdata/Makefile ($(objpfx)iconv-test.out): Use $(test-wrapper-env) and $(run-program-env). * iconvdata/run-iconv-test.sh: Use test_wrapper_env and run_program_env arguments. * iconvdata/tst-table.sh: Do not set GCONV_PATH explicitly. * intl/Makefile ($(objpfx)tst-gettext.out): Use $(test-program-prefix-before-env), $(run-program-env) and $(test-program-prefix-after-env). ($(objpfx)tst-gettext2.out): Likewise. * intl/tst-gettext.sh: Use test_program_prefix_before_env, run_program_env and test_program_prefix_after_env arguments. * intl/tst-gettext2.sh: Likewise. * intl/tst-gettext4.sh: Do not set environment variables explicitly. * intl/tst-gettext6.sh: Likewise. * intl/tst-translit.sh: Likewise. * malloc/Makefile ($(objpfx)tst-mtrace.out): Use $(test-program-prefix-before-env), $(run-program-env) and $(test-program-prefix-after-env). * malloc/tst-mtrace.sh: Use test_program_prefix_before_env, run_program_env and test_program_prefix_after_env arguments. * math/Makefile (run-regen-ulps): Use $(run-program-env). * nptl/Makefile ($(objpfx)tst-tls6.out): Use $(run-program-env). * nptl/tst-tls6.sh: Use run_program_env argument. Set LANG=C explicitly with each use of ${test_wrapper_env}. * posix/Makefile ($(objpfx)wordexp-tst.out): Use $(test-program-prefix-before-env), $(run-program-env) and $(test-program-prefix-after-env). * posix/tst-getconf.sh: Do not set environment variables explicitly. * posix/wordexp-tst.sh: Use test_program_prefix_before_env, run_program_env and test_program_prefix_after_env arguments. * stdio-common/tst-printf.sh: Do not set environment variables explicitly. * stdlib/Makefile ($(objpfx)tst-fmtmsg.out): Use $(test-program-prefix-before-env), $(run-program-env) and $(test-program-prefix-after-env). * stdlib/tst-fmtmsg.sh: Use test_program_prefix_before_env, run_program_env and test_program_prefix_after_env arguments. Split $test calls into $test_pre and $test. * timezone/Makefile (build-testdata): Use $(built-program-cmd-before-env), $(run-program-env) and $(built-program-cmd-after-env). localedata/ChangeLog: * Makefile ($(addprefix $(objpfx),$(CTYPE_FILES))): Use $(built-program-cmd-before-env), $(run-program-env) and $(built-program-cmd-after-env). ($(objpfx)sort-test.out): Use $(test-program-prefix-before-env), $(run-program-env) and $(test-program-prefix-after-env). ($(objpfx)tst-fmon.out): Use $(run-program-prefix-before-env), $(run-program-env) and $(run-program-prefix-after-env). ($(objpfx)tst-locale.out): Use $(built-program-cmd-before-env), $(run-program-env) and $(built-program-cmd-after-env). ($(objpfx)tst-trans.out): Use $(run-program-prefix-before-env), $(run-program-env), $(run-program-prefix-after-env), $(test-program-prefix-before-env) and $(test-program-prefix-after-env). ($(objpfx)tst-ctype.out): Use $(test-program-cmd-before-env), $(run-program-env) and $(test-program-cmd-after-env). ($(objpfx)tst-wctype.out): Likewise. ($(objpfx)tst-langinfo.out): Likewise. ($(objpfx)tst-langinfo-static.out): Likewise. * gen-locale.sh: Use localedef_before_env, run_program_env and localedef_after_env arguments. * sort-test.sh: Use test_program_prefix_before_env, run_program_env and test_program_prefix_after_env arguments. * tst-ctype.sh: Use tst_ctype_before_env, run_program_env and tst_ctype_after_env arguments. * tst-fmon.sh: Use run_program_prefix_before_env, run_program_env and run_program_prefix_after_env arguments. * tst-langinfo.sh: Use tst_langinfo_before_env, run_program_env and tst_langinfo_after_env arguments. * tst-locale.sh: Use localedef_before_env, run_program_env and localedef_after_env arguments. * tst-mbswcs.sh: Do not set environment variables explicitly. * tst-numeric.sh: Likewise. * tst-rpmatch.sh: Likewise. * tst-trans.sh: Use run_program_prefix_before_env, run_program_env, run_program_prefix_after_env, test_program_prefix_before_env and test_program_prefix_after_env arguments. * tst-wctype.sh: Use tst_wctype_before_env, run_program_env and tst_wctype_after_env arguments. |
||
---|---|---|
.. | ||
scripts | ||
acos-inputs | ||
acosh-inputs | ||
asin-inputs | ||
asinh-inputs | ||
atan-inputs | ||
atanh-inputs | ||
bench-bcopy.c | ||
bench-bzero.c | ||
bench-memccpy.c | ||
bench-memchr.c | ||
bench-memcmp.c | ||
bench-memcpy.c | ||
bench-memmem.c | ||
bench-memmove.c | ||
bench-mempcpy.c | ||
bench-memrchr.c | ||
bench-memset.c | ||
bench-rawmemchr.c | ||
bench-skeleton.c | ||
bench-stpcpy_chk.c | ||
bench-stpcpy.c | ||
bench-stpncpy.c | ||
bench-strcasecmp.c | ||
bench-strcasestr.c | ||
bench-strcat.c | ||
bench-strchr.c | ||
bench-strchrnul.c | ||
bench-strcmp.c | ||
bench-strcpy_chk.c | ||
bench-strcpy.c | ||
bench-strcspn.c | ||
bench-string.h | ||
bench-strlen.c | ||
bench-strncasecmp.c | ||
bench-strncat.c | ||
bench-strncmp.c | ||
bench-strncpy.c | ||
bench-strnlen.c | ||
bench-strpbrk.c | ||
bench-strrchr.c | ||
bench-strsep.c | ||
bench-strspn.c | ||
bench-strstr.c | ||
bench-strtod.c | ||
bench-strtok.c | ||
bench-timing-type.c | ||
bench-timing.h | ||
cos-inputs | ||
cosh-inputs | ||
exp2-inputs | ||
exp-inputs | ||
ffs-inputs | ||
ffsll-inputs | ||
json-lib.c | ||
json-lib.h | ||
log2-inputs | ||
log-inputs | ||
Makefile | ||
modf-inputs | ||
pow-inputs | ||
pthread_once-inputs | ||
pthread_once-source.c | ||
README | ||
rint-inputs | ||
sin-inputs | ||
sincos-inputs | ||
sinh-inputs | ||
sqrt-inputs | ||
tan-inputs | ||
tanh-inputs |
Using the glibc microbenchmark suite ==================================== The glibc microbenchmark suite automatically generates code for specified functions, builds and calls them repeatedly for given inputs to give some basic performance properties of the function. Running the benchmark: ===================== The benchmark needs python 2.7 or later in addition to the dependencies required to build the GNU C Library. One may run the benchmark by invoking make as follows: $ make bench This runs each function for 10 seconds and appends its output to benchtests/bench.out. To ensure that the tests are rebuilt, one could run: $ make bench-clean The duration of each test can be configured setting the BENCH_DURATION variable in the call to make. One should run `make bench-clean' before changing BENCH_DURATION. $ make BENCH_DURATION=1 bench The benchmark suite does function call measurements using architecture-specific high precision timing instructions whenever available. When such support is not available, it uses clock_gettime (CLOCK_PROCESS_CPUTIME_ID). One can force the benchmark to use clock_gettime by invoking make as follows: $ make USE_CLOCK_GETTIME=1 bench Again, one must run `make bench-clean' before changing the measurement method. Adding a function to benchtests: =============================== If the name of the function is `foo', then the following procedure should allow one to add `foo' to the bench tests: - Append the function name to the bench variable in the Makefile. - Make a file called `foo-inputs` to provide the definition and input for the function. The file should have some directives telling the parser script about the function and then one input per line. Directives are lines that have a special meaning for the parser and they begin with two hashes '##'. The following directives are recognized: - args: This should be assigned a colon separated list of types of the input arguments. This directive may be skipped if the function does not take any inputs. One may identify output arguments by nesting them in <>. The generator will create variables to get outputs from the calling function. - ret: This should be assigned the type that the function returns. This directive may be skipped if the function does not return a value. - includes: This should be assigned a comma-separated list of headers that need to be included to provide declarations for the function and types it may need (specifically, this includes using "#include <header>"). - include-sources: This should be assigned a comma-separated list of source files that need to be included to provide definitions of global variables and functions (specifically, this includes using "#include "source"). See pthread_once-inputs and pthreads_once-source.c for an example of how to use this to benchmark a function that needs state across several calls. - init: Name of an initializer function to call to initialize the benchtest. - name: See following section for instructions on how to use this directive. Lines beginning with a single hash '#' are treated as comments. See pow-inputs for an example of an input file. Multiple execution units per function: ===================================== Some functions have distinct performance characteristics for different input domains and it may be necessary to measure those separately. For example, some math functions perform computations at different levels of precision (64-bit vs 240-bit vs 768-bit) and mixing them does not give a very useful picture of the performance of these functions. One could separate inputs for these domains in the same file by using the `name' directive that looks something like this: ##name: 240bit See the pow-inputs file for an example of what such a partitioned input file would look like. Benchmark Sets: ============== In addition to standard benchmarking of functions, one may also generate custom outputs for a set of functions. This is currently used by string function benchmarks where the aim is to compare performance between implementations at various alignments and for various sizes. To add a benchset for `foo': - Add `foo' to the benchset variable. - Write your bench-foo.c that prints out the measurements to stdout. - On execution, a bench-foo.out is created in $(objpfx) with the contents of stdout.