diff options
| -rw-r--r-- | ChangeLog | 5 | ||||
| -rw-r--r-- | Rules | 30 | ||||
| -rw-r--r-- | benchtests/Makefile | 34 |
3 files changed, 39 insertions, 30 deletions
diff --git a/ChangeLog b/ChangeLog index 36efa0b02b..9757623081 100644 --- a/ChangeLog +++ b/ChangeLog @@ -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. diff --git a/Rules b/Rules index a75d25b057..86a052014d 100644 --- a/Rules +++ b/Rules @@ -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 diff --git a/benchtests/Makefile b/benchtests/Makefile index a6a92995a8..86d59057f2 100644 --- a/benchtests/Makefile +++ b/benchtests/Makefile @@ -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 $@ |