aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSiddhesh Poyarekar <siddhesh@redhat.com>2013-04-12 15:01:44 +0530
committerSiddhesh Poyarekar <siddhesh@redhat.com>2013-04-12 15:01:44 +0530
commit8fc1bee546c01b2b6975e4cb07be70cc531aa754 (patch)
treebc1d2e37911b6675cf2273abce1d3104e473eba6
parent0a033d342e102c92e638e2a9e97abbe8685c98d7 (diff)
downloadglibc-8fc1bee546c01b2b6975e4cb07be70cc531aa754.zip
glibc-8fc1bee546c01b2b6975e4cb07be70cc531aa754.tar.gz
glibc-8fc1bee546c01b2b6975e4cb07be70cc531aa754.tar.bz2
Move bench target to benchtests
The bench target will only be used within the benchtests directory.
-rw-r--r--ChangeLog5
-rw-r--r--Rules30
-rw-r--r--benchtests/Makefile34
3 files changed, 39 insertions, 30 deletions
diff --git a/ChangeLog b/ChangeLog
index 36efa0b..9757623 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 a75d25b..86a0520 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 a6a9299..86d5905 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 $@