From 3d3d82a19086b512fbe24becfc43575e17a14722 Mon Sep 17 00:00:00 2001 From: Corey Richardson Date: Wed, 10 Jul 2013 06:37:32 -0400 Subject: [PATCH 1/2] Restructure benchmarks --- src/test/bench/{std-smallintmap.rs => extra/smallintmap.rs} | 0 src/test/bench/{ => rt}/msgsend-pipes-shared.rs | 0 src/test/bench/{ => rt}/msgsend-pipes.rs | 0 src/test/bench/{ => rt}/msgsend-ring-mutex-arcs.rs | 0 src/test/bench/{ => rt}/msgsend-ring-pipes.rs | 0 src/test/bench/{ => rt}/msgsend-ring-rw-arcs.rs | 0 src/test/bench/{ => rt}/pingpong.rs | 0 src/test/bench/{ => rt}/task-perf-alloc-unwind.rs | 0 src/test/bench/{ => rt}/task-perf-jargon-metal-smoke.rs | 0 src/test/bench/{ => rt}/task-perf-linked-failure.rs | 0 src/test/bench/{ => rt}/task-perf-one-million.rs | 0 src/test/bench/{ => rt}/task-perf-spawnalot.rs | 0 src/test/bench/{shootout-ackermann.rs => shootout/ackermann.rs} | 0 .../bench/{shootout-binarytrees.rs => shootout/binarytrees.rs} | 0 .../{shootout-chameneos-redux.rs => shootout/chameneos-redux.rs} | 0 .../{shootout-fannkuch-redux.rs => shootout/fannkuch-redux.rs} | 0 .../bench/{shootout-fasta-redux.rs => shootout/fasta-redux.rs} | 0 src/test/bench/{shootout-fasta.rs => shootout/fasta.rs} | 0 src/test/bench/{shootout-fibo.rs => shootout/fibo.rs} | 0 .../k-nucleotide-pipes.rs} | 0 .../{shootout-k-nucleotide.data => shootout/k-nucleotide.data} | 0 .../bench/{shootout-k-nucleotide.rs => shootout/k-nucleotide.rs} | 0 .../bench/{shootout-mandelbrot.rs => shootout/mandelbrot.rs} | 0 src/test/bench/{shootout-nbody.rs => shootout/nbody.rs} | 0 src/test/bench/{shootout-pfib.rs => shootout/pfib.rs} | 0 src/test/bench/{shootout-pidigits.rs => shootout/pidigits.rs} | 0 .../reverse-complement.rs} | 0 .../bench/{shootout-spectralnorm.rs => shootout/spectralnorm.rs} | 0 .../bench/{shootout-threadring.rs => shootout/threadring.rs} | 0 src/test/bench/{core-map.rs => std/map.rs} | 0 src/test/bench/{core-set.rs => std/set.rs} | 0 src/test/bench/{core-std.rs => std/std.rs} | 1 + src/test/bench/{core-uint-to-str.rs => std/uint-to-str.rs} | 0 33 files changed, 1 insertion(+) rename src/test/bench/{std-smallintmap.rs => extra/smallintmap.rs} (100%) rename src/test/bench/{ => rt}/msgsend-pipes-shared.rs (100%) rename src/test/bench/{ => rt}/msgsend-pipes.rs (100%) rename src/test/bench/{ => rt}/msgsend-ring-mutex-arcs.rs (100%) rename src/test/bench/{ => rt}/msgsend-ring-pipes.rs (100%) rename src/test/bench/{ => rt}/msgsend-ring-rw-arcs.rs (100%) rename src/test/bench/{ => rt}/pingpong.rs (100%) rename src/test/bench/{ => rt}/task-perf-alloc-unwind.rs (100%) rename src/test/bench/{ => rt}/task-perf-jargon-metal-smoke.rs (100%) rename src/test/bench/{ => rt}/task-perf-linked-failure.rs (100%) rename src/test/bench/{ => rt}/task-perf-one-million.rs (100%) rename src/test/bench/{ => rt}/task-perf-spawnalot.rs (100%) rename src/test/bench/{shootout-ackermann.rs => shootout/ackermann.rs} (100%) rename src/test/bench/{shootout-binarytrees.rs => shootout/binarytrees.rs} (100%) rename src/test/bench/{shootout-chameneos-redux.rs => shootout/chameneos-redux.rs} (100%) rename src/test/bench/{shootout-fannkuch-redux.rs => shootout/fannkuch-redux.rs} (100%) rename src/test/bench/{shootout-fasta-redux.rs => shootout/fasta-redux.rs} (100%) rename src/test/bench/{shootout-fasta.rs => shootout/fasta.rs} (100%) rename src/test/bench/{shootout-fibo.rs => shootout/fibo.rs} (100%) rename src/test/bench/{shootout-k-nucleotide-pipes.rs => shootout/k-nucleotide-pipes.rs} (100%) rename src/test/bench/{shootout-k-nucleotide.data => shootout/k-nucleotide.data} (100%) rename src/test/bench/{shootout-k-nucleotide.rs => shootout/k-nucleotide.rs} (100%) rename src/test/bench/{shootout-mandelbrot.rs => shootout/mandelbrot.rs} (100%) rename src/test/bench/{shootout-nbody.rs => shootout/nbody.rs} (100%) rename src/test/bench/{shootout-pfib.rs => shootout/pfib.rs} (100%) rename src/test/bench/{shootout-pidigits.rs => shootout/pidigits.rs} (100%) rename src/test/bench/{shootout-reverse-complement.rs => shootout/reverse-complement.rs} (100%) rename src/test/bench/{shootout-spectralnorm.rs => shootout/spectralnorm.rs} (100%) rename src/test/bench/{shootout-threadring.rs => shootout/threadring.rs} (100%) rename src/test/bench/{core-map.rs => std/map.rs} (100%) rename src/test/bench/{core-set.rs => std/set.rs} (100%) rename src/test/bench/{core-std.rs => std/std.rs} (98%) rename src/test/bench/{core-uint-to-str.rs => std/uint-to-str.rs} (100%) diff --git a/src/test/bench/std-smallintmap.rs b/src/test/bench/extra/smallintmap.rs similarity index 100% rename from src/test/bench/std-smallintmap.rs rename to src/test/bench/extra/smallintmap.rs diff --git a/src/test/bench/msgsend-pipes-shared.rs b/src/test/bench/rt/msgsend-pipes-shared.rs similarity index 100% rename from src/test/bench/msgsend-pipes-shared.rs rename to src/test/bench/rt/msgsend-pipes-shared.rs diff --git a/src/test/bench/msgsend-pipes.rs b/src/test/bench/rt/msgsend-pipes.rs similarity index 100% rename from src/test/bench/msgsend-pipes.rs rename to src/test/bench/rt/msgsend-pipes.rs diff --git a/src/test/bench/msgsend-ring-mutex-arcs.rs b/src/test/bench/rt/msgsend-ring-mutex-arcs.rs similarity index 100% rename from src/test/bench/msgsend-ring-mutex-arcs.rs rename to src/test/bench/rt/msgsend-ring-mutex-arcs.rs diff --git a/src/test/bench/msgsend-ring-pipes.rs b/src/test/bench/rt/msgsend-ring-pipes.rs similarity index 100% rename from src/test/bench/msgsend-ring-pipes.rs rename to src/test/bench/rt/msgsend-ring-pipes.rs diff --git a/src/test/bench/msgsend-ring-rw-arcs.rs b/src/test/bench/rt/msgsend-ring-rw-arcs.rs similarity index 100% rename from src/test/bench/msgsend-ring-rw-arcs.rs rename to src/test/bench/rt/msgsend-ring-rw-arcs.rs diff --git a/src/test/bench/pingpong.rs b/src/test/bench/rt/pingpong.rs similarity index 100% rename from src/test/bench/pingpong.rs rename to src/test/bench/rt/pingpong.rs diff --git a/src/test/bench/task-perf-alloc-unwind.rs b/src/test/bench/rt/task-perf-alloc-unwind.rs similarity index 100% rename from src/test/bench/task-perf-alloc-unwind.rs rename to src/test/bench/rt/task-perf-alloc-unwind.rs diff --git a/src/test/bench/task-perf-jargon-metal-smoke.rs b/src/test/bench/rt/task-perf-jargon-metal-smoke.rs similarity index 100% rename from src/test/bench/task-perf-jargon-metal-smoke.rs rename to src/test/bench/rt/task-perf-jargon-metal-smoke.rs diff --git a/src/test/bench/task-perf-linked-failure.rs b/src/test/bench/rt/task-perf-linked-failure.rs similarity index 100% rename from src/test/bench/task-perf-linked-failure.rs rename to src/test/bench/rt/task-perf-linked-failure.rs diff --git a/src/test/bench/task-perf-one-million.rs b/src/test/bench/rt/task-perf-one-million.rs similarity index 100% rename from src/test/bench/task-perf-one-million.rs rename to src/test/bench/rt/task-perf-one-million.rs diff --git a/src/test/bench/task-perf-spawnalot.rs b/src/test/bench/rt/task-perf-spawnalot.rs similarity index 100% rename from src/test/bench/task-perf-spawnalot.rs rename to src/test/bench/rt/task-perf-spawnalot.rs diff --git a/src/test/bench/shootout-ackermann.rs b/src/test/bench/shootout/ackermann.rs similarity index 100% rename from src/test/bench/shootout-ackermann.rs rename to src/test/bench/shootout/ackermann.rs diff --git a/src/test/bench/shootout-binarytrees.rs b/src/test/bench/shootout/binarytrees.rs similarity index 100% rename from src/test/bench/shootout-binarytrees.rs rename to src/test/bench/shootout/binarytrees.rs diff --git a/src/test/bench/shootout-chameneos-redux.rs b/src/test/bench/shootout/chameneos-redux.rs similarity index 100% rename from src/test/bench/shootout-chameneos-redux.rs rename to src/test/bench/shootout/chameneos-redux.rs diff --git a/src/test/bench/shootout-fannkuch-redux.rs b/src/test/bench/shootout/fannkuch-redux.rs similarity index 100% rename from src/test/bench/shootout-fannkuch-redux.rs rename to src/test/bench/shootout/fannkuch-redux.rs diff --git a/src/test/bench/shootout-fasta-redux.rs b/src/test/bench/shootout/fasta-redux.rs similarity index 100% rename from src/test/bench/shootout-fasta-redux.rs rename to src/test/bench/shootout/fasta-redux.rs diff --git a/src/test/bench/shootout-fasta.rs b/src/test/bench/shootout/fasta.rs similarity index 100% rename from src/test/bench/shootout-fasta.rs rename to src/test/bench/shootout/fasta.rs diff --git a/src/test/bench/shootout-fibo.rs b/src/test/bench/shootout/fibo.rs similarity index 100% rename from src/test/bench/shootout-fibo.rs rename to src/test/bench/shootout/fibo.rs diff --git a/src/test/bench/shootout-k-nucleotide-pipes.rs b/src/test/bench/shootout/k-nucleotide-pipes.rs similarity index 100% rename from src/test/bench/shootout-k-nucleotide-pipes.rs rename to src/test/bench/shootout/k-nucleotide-pipes.rs diff --git a/src/test/bench/shootout-k-nucleotide.data b/src/test/bench/shootout/k-nucleotide.data similarity index 100% rename from src/test/bench/shootout-k-nucleotide.data rename to src/test/bench/shootout/k-nucleotide.data diff --git a/src/test/bench/shootout-k-nucleotide.rs b/src/test/bench/shootout/k-nucleotide.rs similarity index 100% rename from src/test/bench/shootout-k-nucleotide.rs rename to src/test/bench/shootout/k-nucleotide.rs diff --git a/src/test/bench/shootout-mandelbrot.rs b/src/test/bench/shootout/mandelbrot.rs similarity index 100% rename from src/test/bench/shootout-mandelbrot.rs rename to src/test/bench/shootout/mandelbrot.rs diff --git a/src/test/bench/shootout-nbody.rs b/src/test/bench/shootout/nbody.rs similarity index 100% rename from src/test/bench/shootout-nbody.rs rename to src/test/bench/shootout/nbody.rs diff --git a/src/test/bench/shootout-pfib.rs b/src/test/bench/shootout/pfib.rs similarity index 100% rename from src/test/bench/shootout-pfib.rs rename to src/test/bench/shootout/pfib.rs diff --git a/src/test/bench/shootout-pidigits.rs b/src/test/bench/shootout/pidigits.rs similarity index 100% rename from src/test/bench/shootout-pidigits.rs rename to src/test/bench/shootout/pidigits.rs diff --git a/src/test/bench/shootout-reverse-complement.rs b/src/test/bench/shootout/reverse-complement.rs similarity index 100% rename from src/test/bench/shootout-reverse-complement.rs rename to src/test/bench/shootout/reverse-complement.rs diff --git a/src/test/bench/shootout-spectralnorm.rs b/src/test/bench/shootout/spectralnorm.rs similarity index 100% rename from src/test/bench/shootout-spectralnorm.rs rename to src/test/bench/shootout/spectralnorm.rs diff --git a/src/test/bench/shootout-threadring.rs b/src/test/bench/shootout/threadring.rs similarity index 100% rename from src/test/bench/shootout-threadring.rs rename to src/test/bench/shootout/threadring.rs diff --git a/src/test/bench/core-map.rs b/src/test/bench/std/map.rs similarity index 100% rename from src/test/bench/core-map.rs rename to src/test/bench/std/map.rs diff --git a/src/test/bench/core-set.rs b/src/test/bench/std/set.rs similarity index 100% rename from src/test/bench/core-set.rs rename to src/test/bench/std/set.rs diff --git a/src/test/bench/core-std.rs b/src/test/bench/std/std.rs similarity index 98% rename from src/test/bench/core-std.rs rename to src/test/bench/std/std.rs index 867be38545cdf..7fce673506e05 100644 --- a/src/test/bench/core-std.rs +++ b/src/test/bench/std/std.rs @@ -9,6 +9,7 @@ // except according to those terms. // Microbenchmarks for various functions in std and extra +// FIXME #7685: rewrite to use the new bench runner extern mod extra; diff --git a/src/test/bench/core-uint-to-str.rs b/src/test/bench/std/uint-to-str.rs similarity index 100% rename from src/test/bench/core-uint-to-str.rs rename to src/test/bench/std/uint-to-str.rs From 480c66fe6f762537ac2cf41c90f31509238003a9 Mon Sep 17 00:00:00 2001 From: Corey Richardson Date: Thu, 11 Jul 2013 07:01:43 -0400 Subject: [PATCH 2/2] wip makefile fix --- mk/tests.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/mk/tests.mk b/mk/tests.mk index 6b6f515ce2b5a..b00514ace1392 100644 --- a/mk/tests.mk +++ b/mk/tests.mk @@ -427,7 +427,7 @@ RFAIL_RC := $(wildcard $(S)src/test/run-fail/*.rc) RFAIL_RS := $(wildcard $(S)src/test/run-fail/*.rs) CFAIL_RC := $(wildcard $(S)src/test/compile-fail/*.rc) CFAIL_RS := $(wildcard $(S)src/test/compile-fail/*.rs) -BENCH_RS := $(wildcard $(S)src/test/bench/*.rs) +BENCH_RS := $(wildcard $(S)src/test/bench/*.rs) $(wildcard $(S)src/test/bench/extra/*.rs) $(wildcard $(S)src/test/bench/rt/*.rs) $(wildcard $(S)src/test/bench/shootout/*.rs) $(wildcard $(S)src/test/bench/std/*.rs)) PRETTY_RS := $(wildcard $(S)src/test/pretty/*.rs) DEBUGINFO_RS := $(wildcard $(S)src/test/debug-info/*.rs)