summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--benchmark/run_benchmarks.py9
-rw-r--r--benchmark/tb_filter_block.py3
-rw-r--r--benchmark/tb_grextras_delay.py4
-rw-r--r--benchmark/tb_grextras_math.py4
-rw-r--r--benchmark/tb_many_1_to_1_blocks.py4
-rw-r--r--benchmark/tb_many_rate_changes.py3
6 files changed, 22 insertions, 5 deletions
diff --git a/benchmark/run_benchmarks.py b/benchmark/run_benchmarks.py
index b89b377..3aa04ec 100644
--- a/benchmark/run_benchmarks.py
+++ b/benchmark/run_benchmarks.py
@@ -22,10 +22,14 @@ __path__ = os.path.dirname(__file__)
def time_a_single_one(args, env):
print env
t0 = time.time()
- p = subprocess.Popen(args=args, env=env)
+ p = subprocess.Popen(args=args, env=env, stdout=subprocess.PIPE)
p.wait()
t1 = time.time()
- return t1-t0
+ for line in p.stdout.read().splitlines():
+ if line.startswith('#/#/'):
+ return float(line[4:].strip())
+ raise Exception, 'no time result found!'
+ #return t1-t0
def do_a_benchmark(bm):
title = bm['wat']
@@ -51,6 +55,7 @@ def do_a_benchmark(bm):
run_results = list()
for num_runs in range(NUM_RUNS_PER_TEST):
t = time_a_single_one(args=args, env=env)
+ print 'execution time: ', t, 'secs'
run_results.append(bm['to_result'](t))
result_means.append(numpy.average(run_results))
result_stddevs.append(numpy.std(run_results))
diff --git a/benchmark/tb_filter_block.py b/benchmark/tb_filter_block.py
index df56a22..3726a92 100644
--- a/benchmark/tb_filter_block.py
+++ b/benchmark/tb_filter_block.py
@@ -73,5 +73,8 @@ if __name__ == '__main__':
parser.add_option("", "--which", dest="which", type="string", default='')
(options, args) = parser.parse_args()
tb = filter_test(num=options.num, which=options.which)
+ import time
+ s = time.time()
tb.run()
+ print '#/#/',time.time() - s
diff --git a/benchmark/tb_grextras_delay.py b/benchmark/tb_grextras_delay.py
index c24a440..2a68eb6 100644
--- a/benchmark/tb_grextras_delay.py
+++ b/benchmark/tb_grextras_delay.py
@@ -23,5 +23,7 @@ if __name__ == '__main__':
tb.connect(src0, (delay_block, 0))
tb.connect(delay_block, head, sink)
+ import time
+ s = time.time()
tb.run()
- tb.wait()
+ print '#/#/',time.time() - s
diff --git a/benchmark/tb_grextras_math.py b/benchmark/tb_grextras_math.py
index 144f34c..562608a 100644
--- a/benchmark/tb_grextras_math.py
+++ b/benchmark/tb_grextras_math.py
@@ -27,5 +27,7 @@ if __name__ == '__main__':
tb.connect(src1, (math_op, 1))
tb.connect(math_op, head, sink)
+ import time
+ s = time.time()
tb.run()
- tb.wait()
+ print '#/#/',time.time() - s
diff --git a/benchmark/tb_many_1_to_1_blocks.py b/benchmark/tb_many_1_to_1_blocks.py
index 2f7dcea..7900ea5 100644
--- a/benchmark/tb_many_1_to_1_blocks.py
+++ b/benchmark/tb_many_1_to_1_blocks.py
@@ -28,5 +28,7 @@ if __name__ == '__main__':
tb.connect(mult03, head, sink)
+ import time
+ s = time.time()
tb.run()
- tb.wait()
+ print '#/#/',time.time() - s
diff --git a/benchmark/tb_many_rate_changes.py b/benchmark/tb_many_rate_changes.py
index f1e2072..4f259b7 100644
--- a/benchmark/tb_many_rate_changes.py
+++ b/benchmark/tb_many_rate_changes.py
@@ -70,5 +70,8 @@ if __name__ == '__main__':
help="Set num [default=%default]")
(options, args) = parser.parse_args()
tb = many_rate_changing(num=options.num)
+ import time
+ s = time.time()
tb.run()
+ print '#/#/',time.time() - s