diff options
| -rwxr-xr-x | tools/benchmark.py | 38 | ||||
| -rwxr-xr-x | tools/benchmark_test.py | 22 |
2 files changed, 28 insertions, 32 deletions
diff --git a/tools/benchmark.py b/tools/benchmark.py index 9ba4f6cad..55e919643 100755 --- a/tools/benchmark.py +++ b/tools/benchmark.py @@ -84,7 +84,11 @@ def get_binary_sizes(build_dir): def get_strace_summary_text(test_args): f = tempfile.NamedTemporaryFile() - run(["strace", "-c", "-f", "-o", f.name] + test_args) + cmd = ["strace", "-c", "-f", "-o", f.name] + test_args + try: + subprocess.check_output(cmd) + except subprocess.CalledProcessError: + pass return f.read() @@ -125,17 +129,6 @@ def get_strace_summary(test_args): return strace_parse(get_strace_summary_text(test_args)) -def run_thread_count_benchmark(deno_exe): - thread_count_map = {} - thread_count_map["set_timeout"] = get_strace_summary([ - deno_exe, "--reload", "tests/004_set_timeout.ts" - ])["clone"]["calls"] + 1 - thread_count_map["fetch_deps"] = get_strace_summary([ - deno_exe, "--reload", "--allow-net", "tests/fetch_deps.ts" - ])["clone"]["calls"] + 1 - return thread_count_map - - def run_throughput(deno_exe): m = {} m["100M_tcp"] = throughput_benchmark.tcp(deno_exe, 100) @@ -145,14 +138,16 @@ def run_throughput(deno_exe): return m -def run_syscall_count_benchmark(deno_exe): - syscall_count_map = {} - syscall_count_map["hello"] = get_strace_summary( - [deno_exe, "--reload", "tests/002_hello.ts"])["total"]["calls"] - syscall_count_map["fetch_deps"] = get_strace_summary( - [deno_exe, "--reload", "--allow-net", - "tests/fetch_deps.ts"])["total"]["calls"] - return syscall_count_map +# "thread_count" and "syscall_count" are both calculated here. +def run_strace_benchmarks(deno_exe, new_data): + thread_count = {} + syscall_count = {} + for (name, args) in exec_time_benchmarks: + s = get_strace_summary([deno_exe] + args) + thread_count[name] = s["clone"]["calls"] + 1 + syscall_count[name] = s["total"]["calls"] + new_data["thread_count"] = thread_count + new_data["syscall_count"] = syscall_count # Takes the output from "/usr/bin/time -v" as input and extracts the 'maximum @@ -243,8 +238,7 @@ def main(argv): run_http(build_dir, new_data) if "linux" in sys.platform: - new_data["thread_count"] = run_thread_count_benchmark(deno_exe) - new_data["syscall_count"] = run_syscall_count_benchmark(deno_exe) + run_strace_benchmarks(deno_exe, new_data) new_data["max_memory"] = run_max_mem_benchmark(deno_exe) print "===== <BENCHMARK RESULTS>" diff --git a/tools/benchmark_test.py b/tools/benchmark_test.py index bc3ce8a71..9905d7d0e 100755 --- a/tools/benchmark_test.py +++ b/tools/benchmark_test.py @@ -36,16 +36,19 @@ def binary_size_test(build_dir): assert binary_size_dict["snapshot_deno.bin"] > 0 -def thread_count_test(deno_path): - thread_count_dict = benchmark.run_thread_count_benchmark(deno_path) - assert "set_timeout" in thread_count_dict - assert thread_count_dict["set_timeout"] > 1 +def strace_test(deno_path): + new_data = {} + benchmark.run_strace_benchmarks(deno_path, new_data) + assert "thread_count" in new_data + assert "syscall_count" in new_data + s = new_data["thread_count"] + assert "hello" in s + assert s["hello"] > 1 -def syscall_count_test(deno_path): - syscall_count_dict = benchmark.run_syscall_count_benchmark(deno_path) - assert "hello" in syscall_count_dict - assert syscall_count_dict["hello"] > 1 + s = new_data["syscall_count"] + assert "hello" in s + assert s["hello"] > 1 def benchmark_test(build_dir, deno_path): @@ -53,8 +56,7 @@ def benchmark_test(build_dir, deno_path): binary_size_test(build_dir) max_mem_parse_test() if "linux" in sys.platform: - thread_count_test(deno_path) - syscall_count_test(deno_path) + strace_test(deno_path) # This test assumes tools/http_server.py is running in the background. |