Move bench target to benchtests

The bench target will only be used within the benchtests directory.
This commit is contained in:
Siddhesh Poyarekar 2013-04-12 15:01:44 +05:30
parent 0a033d342e
commit 8fc1bee546
3 changed files with 39 additions and 30 deletions

View File

@ -1,3 +1,8 @@
2013-04-12 Siddhesh Poyarekar <siddhesh@redhat.com>
* Rules (bench): Move target definition...
* benchtests/Makefile: ... here.
2013-04-11 Carlos O'Donell <carlos@redhat.com>
* math/libm-test.inc (cos_test): Fix PI/2 test.

30
Rules
View File

@ -189,36 +189,6 @@ $(objpfx)%.out: /dev/null $(objpfx)% # Make it 2nd arg for canned sequence.
endif # tests
# Build and run benchmark programs.
binaries-bench := $(addprefix $(objpfx)bench-,$(bench))
run-bench = $(test-wrapper-env) \
GCONV_PATH=$(common-objpfx)iconvdata LC_ALL=C \
$($*-ENV) $(rtld-prefix) $${run}
bench: $(binaries-bench)
for run in $^; do \
echo "Running $${run}"; \
$(run-bench) >> $(objpfx)bench.out-tmp; \
done; \
if [ -f $(objpfx)bench.out ]; then \
mv -f $(objpfx)bench.out $(objpfx)bench.out.old; \
fi; \
mv -f $(objpfx)bench.out-tmp $(objpfx)bench.out
$(binaries-bench): %: %.o \
$(sort $(filter $(common-objpfx)lib%,$(link-libc))) \
$(addprefix $(csu-objpfx),start.o) $(+preinit) $(+postinit)
$(+link)
$(objpfx)bench-%.c: %-inputs bench-skeleton.c
{ if [ -n "$($*-INCLUDE)" ]; then \
cat $($*-INCLUDE); \
fi; \
$(..)scripts/bench.pl $(patsubst %-inputs,%,$<) \
$($*-ITER) $($*-ARGLIST) $($*-RET); } > $@-tmp
mv -f $@-tmp $@
.PHONY: distclean realclean subdir_distclean subdir_realclean \
subdir_clean subdir_mostlyclean subdir_testclean

View File

@ -104,5 +104,39 @@ slowatan-RET = double
slowatan-INCLUDE = slowatan.c
LDFLAGS-bench-slowatan = -lm
# Rules to build and execute the benchmarks. Do not put any benchmark
# parameters beyond this point.
include ../Makeconfig
include ../Rules
binaries-bench := $(addprefix $(objpfx)bench-,$(bench))
run-bench = $(test-wrapper-env) \
GCONV_PATH=$(common-objpfx)iconvdata LC_ALL=C \
$($*-ENV) $(rtld-prefix) $${run}
bench: $(binaries-bench)
for run in $^; do \
echo "Running $${run}"; \
$(run-bench) >> $(objpfx)bench.out-tmp; \
done; \
if [ -f $(objpfx)bench.out ]; then \
mv -f $(objpfx)bench.out $(objpfx)bench.out.old; \
fi; \
mv -f $(objpfx)bench.out-tmp $(objpfx)bench.out
$(binaries-bench): %: %.o \
$(sort $(filter $(common-objpfx)lib%,$(link-libc))) \
$(addprefix $(csu-objpfx),start.o) $(+preinit) $(+postinit)
$(+link)
$(objpfx)bench-%.c: %-inputs bench-skeleton.c
{ if [ -n "$($*-INCLUDE)" ]; then \
cat $($*-INCLUDE); \
fi; \
$(..)scripts/bench.pl $(patsubst %-inputs,%,$<) \
$($*-ITER) $($*-ARGLIST) $($*-RET); } > $@-tmp
mv -f $@-tmp $@