ddidderr/zstd-rs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Improved speed tests

Browse Source 
Better compatibility with Mac OS-X
Force attribution to a selected core # (Linux)
This commit is contained in:
Yann Collet
2017-03-26 23:52:19 -07:00
parent 0246d5c531
commit 41fefd573a
1 changed files with 13 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files
tests/test-zstd-speed.py
+13 -7
View File
@@ -14,14 +14,15 @@
# - dir1/zstd and dir2/zstd will be merged in a single results file # - dir1/zstd and dir2/zstd will be merged in a single results file
import argparse import argparse
import os import os # getloadavg
import string import string
import subprocess import subprocess
import time import time # strftime
import traceback import traceback
import hashlib import hashlib
import platform # system
script_version = 'v1.1.1 (2016-10-28)' script_version = 'v1.1.2 (2017-03-26)'
default_repo_url = 'https://github.com/facebook/zstd.git' default_repo_url = 'https://github.com/facebook/zstd.git'
working_dir_name = 'speedTest' working_dir_name = 'speedTest'
working_path = os.getcwd() + '/' + working_dir_name # /path/to/zstd/tests/speedTest working_path = os.getcwd() + '/' + working_dir_name # /path/to/zstd/tests/speedTest
@@ -152,10 +153,15 @@ def benchmark_and_compare(branch, commit, last_commit, args, executableName, md5
% (os.getloadavg()[0], args.maxLoadAvg, sleepTime)) % (os.getloadavg()[0], args.maxLoadAvg, sleepTime))
time.sleep(sleepTime) time.sleep(sleepTime)
start_load = str(os.getloadavg()) start_load = str(os.getloadavg())
if args.dictionary: osType = platform.system()
result = execute('programs/%s -rqi5b1e%s -D %s %s' % (executableName, args.lastCLevel, args.dictionary, testFilePath), print_output=True) if osType == 'Linux':
cpuSelector = "taskset --cpu-list 0"
else: else:
result = execute('programs/%s -rqi5b1e%s %s' % (executableName, args.lastCLevel, testFilePath), print_output=True) cpuSelector = ""
if args.dictionary:
result = execute('%s programs/%s -rqi5b1e%s -D %s %s' % (cpuSelector, executableName, args.lastCLevel, args.dictionary, testFilePath), print_output=True)
else:
result = execute('%s programs/%s -rqi5b1e%s %s' % (cpuSelector, executableName, args.lastCLevel, testFilePath), print_output=True)
end_load = str(os.getloadavg()) end_load = str(os.getloadavg())
linesExpected = args.lastCLevel + 1 linesExpected = args.lastCLevel + 1
if len(result) != linesExpected: if len(result) != linesExpected:
@@ -291,7 +297,7 @@ if __name__ == '__main__':
log("ERROR: e-mail senders 'mail' or 'mutt' not found") log("ERROR: e-mail senders 'mail' or 'mutt' not found")
exit(1) exit(1)
clang_version = execute("clang -v 2>&1 | grep 'clang version' | sed -e 's:.*version \\([0-9.]*\\).*:\\1:' -e 's:\\.\\([0-9][0-9]\\):\\1:g'", verbose)[0]; clang_version = execute("clang -v 2>&1 | grep ' version ' | sed -e 's:.*version \\([0-9.]*\\).*:\\1:' -e 's:\\.\\([0-9][0-9]\\):\\1:g'", verbose)[0];
gcc_version = execute("gcc -dumpversion", verbose)[0]; gcc_version = execute("gcc -dumpversion", verbose)[0];
if verbose: if verbose: