facebook
/
zstd
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'dev' of github.com:Cyan4973/zstd into dev

dev
Yann Collet 2016-07-20 13:37:11 +02:00
parent d5c5a77990 2db88f4436
commit 106266f635
2 changed files with 66 additions and 48 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
appveyor.yml
View File

@ -27,7 +27,8 @@ install:
SET "CLANG_PARAMS=-C programs zstd fullbench fuzzer zbufftest paramgrill datagen CC=clang MOREFLAGS="--target=x86_64-w64-mingw32 -Werror -Wconversion -Wno-sign-conversion"" && SET "CLANG_PARAMS=-C programs zstd fullbench fuzzer zbufftest paramgrill datagen CC=clang MOREFLAGS="--target=x86_64-w64-mingw32 -Werror -Wconversion -Wno-sign-conversion"" &&
SET "PATH_MINGW32=c:\MinGW\bin;c:\MinGW\usr\bin" && SET "PATH_MINGW32=c:\MinGW\bin;c:\MinGW\usr\bin" &&
SET "PATH_MINGW64=c:\msys64\mingw64\bin;c:\msys64\usr\bin" && SET "PATH_MINGW64=c:\msys64\mingw64\bin;c:\msys64\usr\bin" &&
COPY C:\MinGW\bin\mingw32-make.exe C:\MinGW\bin\make.exe COPY C:\MinGW\bin\mingw32-make.exe C:\MinGW\bin\make.exe &&
COPY C:\MinGW\bin\gcc.exe C:\MinGW\bin\cc.exe
) else ( ) else (
IF [%PLATFORM%]==[x64] (SET ADDITIONALPARAM=/p:LibraryPath="C:\Program Files\Microsoft SDKs\Windows\v7.1\lib\x64;c:\Program Files (x86)\Microsoft Visual Studio 10.0\VC\lib\amd64;C:\Program Files (x86)\Microsoft Visual Studio 10.0\;C:\Program Files (x86)\Microsoft Visual Studio 10.0\lib\amd64;") IF [%PLATFORM%]==[x64] (SET ADDITIONALPARAM=/p:LibraryPath="C:\Program Files\Microsoft SDKs\Windows\v7.1\lib\x64;c:\Program Files (x86)\Microsoft Visual Studio 10.0\VC\lib\amd64;C:\Program Files (x86)\Microsoft Visual Studio 10.0\;C:\Program Files (x86)\Microsoft Visual Studio 10.0\lib\amd64;")
) )
@ -50,6 +51,8 @@ build_script:
ECHO *** && ECHO *** &&
ECHO *** Building %PLATFORM% && ECHO *** Building %PLATFORM% &&
ECHO *** && ECHO *** &&
make -v &&
cc -v &&
ECHO make %MAKE_PARAMS% && ECHO make %MAKE_PARAMS% &&
make %MAKE_PARAMS% && make %MAKE_PARAMS% &&
make clean make clean

109
tests/test-zstd-speed.py
View File

@ -15,14 +15,16 @@ working_path = os.getcwd() + '/' + working_dir_name # /path/to/zstd/tests/sp
clone_path = working_path + '/' + 'zstd' # /path/to/zstd/tests/speedTest/zstd clone_path = working_path + '/' + 'zstd' # /path/to/zstd/tests/speedTest/zstd
email_header = '[ZSTD_speedTest]' email_header = '[ZSTD_speedTest]'
pid = str(os.getpid()) pid = str(os.getpid())
verbose = False
def log(text): def log(text):
print(time.strftime("%Y/%m/%d %H:%M:%S") + ' - ' + text) print(time.strftime("%Y/%m/%d %H:%M:%S") + ' - ' + text)
def execute(command, print_output=False, print_error=True, param_shell=True): def execute(command, print_command=True, print_output=False, print_error=True, param_shell=True):
log("> " + command) if print_command:
log("> " + command)
popen = subprocess.Popen(command, stdout=subprocess.PIPE, stderr=subprocess.STDOUT, shell=param_shell, cwd=execute.cwd) popen = subprocess.Popen(command, stdout=subprocess.PIPE, stderr=subprocess.STDOUT, shell=param_shell, cwd=execute.cwd)
stdout = popen.communicate()[0] stdout = popen.communicate()[0]
stdout_lines = stdout.splitlines() stdout_lines = stdout.splitlines()
@ -38,7 +40,7 @@ execute.cwd = None
def does_command_exist(command): def does_command_exist(command):
try: try:
execute(command, False, False); execute(command, verbose, False, False);
except Exception as e: except Exception as e:
return False return False
return True return True
@ -50,33 +52,34 @@ def send_email(emails, topic, text, have_mutt, have_mail):
myfile.writelines(text) myfile.writelines(text)
myfile.close() myfile.close()
if have_mutt: if have_mutt:
execute('mutt -s "' + topic + '" ' + emails + ' < ' + logFileName) execute('mutt -s "' + topic + '" ' + emails + ' < ' + logFileName, verbose)
elif have_mail: elif have_mail:
execute('mail -s "' + topic + '" ' + emails + ' < ' + logFileName) execute('mail -s "' + topic + '" ' + emails + ' < ' + logFileName, verbose)
else: else:
log("e-mail cannot be sent (mail or mutt not found)") log("e-mail cannot be sent (mail or mutt not found)")
def send_email_with_attachments(branch, commit, last_commit, emails, text, results_files, logFileName, lower_limit, have_mutt, have_mail): def send_email_with_attachments(branch, commit, last_commit, args, text, results_files, logFileName, have_mutt, have_mail):
with open(logFileName, "w") as myfile: with open(logFileName, "w") as myfile:
myfile.writelines(text) myfile.writelines(text)
myfile.close() myfile.close()
email_topic = '%s:%s Warning for %s:%s last_commit=%s speed<%s' % (email_header, pid, branch, commit, last_commit, lower_limit) email_topic = '%s:%s Warning for %s:%s last_commit=%s speed<%s ratio<%s' % (email_header, pid, branch, commit, last_commit, args.lowerLimit, args.ratioLimit)
if have_mutt: if have_mutt:
execute('mutt -s "' + email_topic + '" ' + emails + ' -a ' + results_files + ' < ' + logFileName) execute('mutt -s "' + email_topic + '" ' + args.emails + ' -a ' + results_files + ' < ' + logFileName)
elif have_mail: elif have_mail:
execute('mail -s "' + email_topic + '" ' + emails + ' < ' + logFileName) execute('mail -s "' + email_topic + '" ' + args.emails + ' < ' + logFileName)
else: else:
log("e-mail cannot be sent (mail or mutt not found)") log("e-mail cannot be sent (mail or mutt not found)")
def git_get_branches(): def git_get_branches():
execute('git fetch -p') execute('git fetch -p', verbose)
output = execute('git branch -rl') branches = execute('git branch -rl', verbose)
for line in output: output = []
if "HEAD" in line: for line in branches:
output.remove(line) # remove "origin/HEAD -> origin/dev" if ("HEAD" not in line) and ("coverity_scan" not in line) and ("gh-pages" not in line):
return map(lambda l: l.strip(), output) output.append(line.strip())
return output
def git_get_changes(branch, commit, last_commit): def git_get_changes(branch, commit, last_commit):
@ -90,8 +93,9 @@ def git_get_changes(branch, commit, last_commit):
def get_last_results(resultsFileName): def get_last_results(resultsFileName):
if not os.path.isfile(resultsFileName): if not os.path.isfile(resultsFileName):
return None, None, None return None, None, None, None
commit = None commit = None
csize = []
cspeed = [] cspeed = []
dspeed = [] dspeed = []
with open(resultsFileName,'r') as f: with open(resultsFileName,'r') as f:
@ -99,23 +103,25 @@ def get_last_results(resultsFileName):
words = line.split() words = line.split()
if len(words) == 2: # branch + commit if len(words) == 2: # branch + commit
commit = words[1]; commit = words[1];
csize = []
cspeed = [] cspeed = []
dspeed = [] dspeed = []
if (len(words) == 8): # results if (len(words) == 8): # results
csize.append(int(words[1]))
cspeed.append(float(words[3])) cspeed.append(float(words[3]))
dspeed.append(float(words[5])) dspeed.append(float(words[5]))
return commit, cspeed, dspeed return commit, csize, cspeed, dspeed
def benchmark_and_compare(branch, commit, resultsFileName, lastCLevel, testFilePath, fileName, last_cspeed, last_dspeed, lower_limit, maxLoadAvg, message): def benchmark_and_compare(branch, commit, args, resultsFileName, testFilePath, fileName, last_csize, last_cspeed, last_dspeed):
sleepTime = 30 sleepTime = 30
while os.getloadavg()[0] > maxLoadAvg: while os.getloadavg()[0] > args.maxLoadAvg:
log("WARNING: bench loadavg=%.2f is higher than %s, sleeping for %s seconds" % (os.getloadavg()[0], maxLoadAvg, sleepTime)) log("WARNING: bench loadavg=%.2f is higher than %s, sleeping for %s seconds" % (os.getloadavg()[0], args.maxLoadAvg, sleepTime))
time.sleep(sleepTime) time.sleep(sleepTime)
start_load = str(os.getloadavg()) start_load = str(os.getloadavg())
result = execute('programs/zstd -qi5b1e%s %s' % (lastCLevel, testFilePath), print_output=True) result = execute('programs/zstd -qi5b1e%s %s' % (args.lastCLevel, testFilePath), print_output=True)
end_load = str(os.getloadavg()) end_load = str(os.getloadavg())
linesExpected = lastCLevel + 2; linesExpected = args.lastCLevel + 2;
if len(result) != linesExpected: if len(result) != linesExpected:
raise RuntimeError("ERROR: number of result lines=%d is different that expected %d\n%s" % (len(result), linesExpected, '\n'.join(result))) raise RuntimeError("ERROR: number of result lines=%d is different that expected %d\n%s" % (len(result), linesExpected, '\n'.join(result)))
with open(resultsFileName, "a") as myfile: with open(resultsFileName, "a") as myfile:
@ -125,16 +131,18 @@ def benchmark_and_compare(branch, commit, resultsFileName, lastCLevel, testFileP
if (last_cspeed == None): if (last_cspeed == None):
log("WARNING: No data for comparison for branch=%s file=%s " % (branch, fileName)) log("WARNING: No data for comparison for branch=%s file=%s " % (branch, fileName))
return "" return ""
commit, cspeed, dspeed = get_last_results(resultsFileName) commit, csize, cspeed, dspeed = get_last_results(resultsFileName)
text = "" text = ""
for i in range(0, min(len(cspeed), len(last_cspeed))): for i in range(0, min(len(cspeed), len(last_cspeed))):
print("%s:%s -%d cspeed=%6.2f clast=%6.2f cdiff=%1.4f dspeed=%6.2f dlast=%6.2f ddiff=%1.4f %s" % (branch, commit, i+1, cspeed[i], last_cspeed[i], cspeed[i]/last_cspeed[i], dspeed[i], last_dspeed[i], dspeed[i]/last_dspeed[i], fileName)) print("%s:%s -%d cSpeed=%6.2f cLast=%6.2f cDiff=%1.4f dSpeed=%6.2f dLast=%6.2f dDiff=%1.4f ratioDiff=%1.4f %s" % (branch, commit, i+1, cspeed[i], last_cspeed[i], cspeed[i]/last_cspeed[i], dspeed[i], last_dspeed[i], dspeed[i]/last_dspeed[i], float(csize[i])/last_csize[i], fileName))
if (cspeed[i]/last_cspeed[i] < lower_limit): if (cspeed[i]/last_cspeed[i] < args.lowerLimit):
text += "WARNING: -%d cspeed=%.2f clast=%.2f cdiff=%.4f %s\n" % (i+1, cspeed[i], last_cspeed[i], cspeed[i]/last_cspeed[i], fileName) text += "WARNING: -%d cSpeed=%.2f cLast=%.2f cDiff=%.4f %s\n" % (i+1, cspeed[i], last_cspeed[i], cspeed[i]/last_cspeed[i], fileName)
if (dspeed[i]/last_dspeed[i] < lower_limit): if (dspeed[i]/last_dspeed[i] < args.lowerLimit):
text += "WARNING: -%d dspeed=%.2f dlast=%.2f ddiff=%.4f %s\n" % (i+1, dspeed[i], last_dspeed[i], dspeed[i]/last_dspeed[i], fileName) text += "WARNING: -%d dSpeed=%.2f dLast=%.2f dDiff=%.4f %s\n" % (i+1, dspeed[i], last_dspeed[i], dspeed[i]/last_dspeed[i], fileName)
if (float(csize[i])/last_csize[i] < args.ratioLimit):
text += "WARNING: -%d cSize=%d last_cSize=%d diff=%.4f %s\n" % (i+1, csize[i], last_csize[i], float(csize[i])/last_csize[i], fileName)
if text: if text:
text = message + ("\nmaxLoadAvg=%s load average at start=%s end=%s\n" % (maxLoadAvg, start_load, end_load)) + text text = args.message + ("\nmaxLoadAvg=%s load average at start=%s end=%s\n" % (args.maxLoadAvg, start_load, end_load)) + text
return text return text
@ -158,17 +166,17 @@ def test_commit(branch, commit, last_commit, args, testFilePaths, have_mutt, hav
for filePath in testFilePaths: for filePath in testFilePaths:
fileName = filePath.rpartition('/')[2] fileName = filePath.rpartition('/')[2]
resultsFileName = working_path + "/results_" + branch.replace("/", "_") + "_" + fileName.replace(".", "_") + ".txt" resultsFileName = working_path + "/results_" + branch.replace("/", "_") + "_" + fileName.replace(".", "_") + ".txt"
last_commit, cspeed, dspeed = get_last_results(resultsFileName) last_commit, csize, cspeed, dspeed = get_last_results(resultsFileName)
if not args.dry_run: if not args.dry_run:
text = benchmark_and_compare(branch, commit, resultsFileName, args.lastCLevel, filePath, fileName, cspeed, dspeed, args.lowerLimit, args.maxLoadAvg, args.message) text = benchmark_and_compare(branch, commit, args, resultsFileName, filePath, fileName, csize, cspeed, dspeed)
if text: if text:
log("WARNING: redoing tests for branch %s: commit %s" % (branch, commit)) log("WARNING: redoing tests for branch %s: commit %s" % (branch, commit))
text = benchmark_and_compare(branch, commit, resultsFileName, args.lastCLevel, filePath, fileName, cspeed, dspeed, args.lowerLimit, args.maxLoadAvg, args.message) text = benchmark_and_compare(branch, commit, args, resultsFileName, filePath, fileName, csize, cspeed, dspeed)
if text: if text:
text_to_send.append(text) text_to_send.append(text)
results_files += resultsFileName + " " results_files += resultsFileName + " "
if text_to_send: if text_to_send:
send_email_with_attachments(branch, commit, last_commit, args.emails, text_to_send, results_files, logFileName, args.lowerLimit, have_mutt, have_mail) send_email_with_attachments(branch, commit, last_commit, args, text_to_send, results_files, logFileName, have_mutt, have_mail)
if __name__ == '__main__': if __name__ == '__main__':
@ -178,11 +186,14 @@ if __name__ == '__main__':
parser.add_argument('--message', help='attach an additional message to e-mail', default="") parser.add_argument('--message', help='attach an additional message to e-mail', default="")
parser.add_argument('--repoURL', help='changes default repository URL', default=default_repo_url) parser.add_argument('--repoURL', help='changes default repository URL', default=default_repo_url)
parser.add_argument('--lowerLimit', type=float, help='send email if speed is lower than given limit', default=0.98) parser.add_argument('--lowerLimit', type=float, help='send email if speed is lower than given limit', default=0.98)
parser.add_argument('--ratioLimit', type=float, help='send email if ratio is lower than given limit', default=0.999)
parser.add_argument('--maxLoadAvg', type=float, help='maximum load average to start testing', default=0.75) parser.add_argument('--maxLoadAvg', type=float, help='maximum load average to start testing', default=0.75)
parser.add_argument('--lastCLevel', type=int, help='last compression level for testing', default=5) parser.add_argument('--lastCLevel', type=int, help='last compression level for testing', default=5)
parser.add_argument('--sleepTime', type=int, help='frequency of repository checking in seconds', default=300) parser.add_argument('--sleepTime', type=int, help='frequency of repository checking in seconds', default=300)
parser.add_argument('--dry-run', dest='dry_run', action='store_true', help='not build', default=False) parser.add_argument('--dry-run', dest='dry_run', action='store_true', help='not build', default=False)
parser.add_argument('--verbose', action='store_true', help='more verbose logs', default=False)
args = parser.parse_args() args = parser.parse_args()
verbose = args.verbose
# check if test files are accessible # check if test files are accessible
testFileNames = args.testFileNames.split() testFileNames = args.testFileNames.split()
@ -202,18 +213,21 @@ 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)
print("PARAMETERS:\nrepoURL=%s" % args.repoURL) if verbose:
print("working_path=%s" % working_path) print("PARAMETERS:\nrepoURL=%s" % args.repoURL)
print("clone_path=%s" % clone_path) print("working_path=%s" % working_path)
print("testFilePath(%s)=%s" % (len(testFilePaths), testFilePaths)) print("clone_path=%s" % clone_path)
print("message=%s" % args.message) print("testFilePath(%s)=%s" % (len(testFilePaths), testFilePaths))
print("emails=%s" % args.emails) print("message=%s" % args.message)
print("maxLoadAvg=%s" % args.maxLoadAvg) print("emails=%s" % args.emails)
print("lowerLimit=%s" % args.lowerLimit) print("maxLoadAvg=%s" % args.maxLoadAvg)
print("lastCLevel=%s" % args.lastCLevel) print("lowerLimit=%s" % args.lowerLimit)
print("sleepTime=%s" % args.sleepTime) print("ratioLimit=%s" % args.ratioLimit)
print("dry_run=%s" % args.dry_run) print("lastCLevel=%s" % args.lastCLevel)
print("have_mutt=%s have_mail=%s" % (have_mutt, have_mail)) print("sleepTime=%s" % args.sleepTime)
print("dry_run=%s" % args.dry_run)
print("verbose=%s" % args.verbose)
print("have_mutt=%s have_mail=%s" % (have_mutt, have_mail))
# clone ZSTD repo if needed # clone ZSTD repo if needed
if not os.path.isdir(working_path): if not os.path.isdir(working_path):
@ -241,7 +255,7 @@ if __name__ == '__main__':
if (loadavg <= args.maxLoadAvg): if (loadavg <= args.maxLoadAvg):
branches = git_get_branches() branches = git_get_branches()
for branch in branches: for branch in branches:
commit = execute('git show -s --format=%h ' + branch)[0] commit = execute('git show -s --format=%h ' + branch, verbose)[0]
last_commit = update_config_file(branch, commit) last_commit = update_config_file(branch, commit)
if commit == last_commit: if commit == last_commit:
log("skipping branch %s: head %s already processed" % (branch, commit)) log("skipping branch %s: head %s already processed" % (branch, commit))
@ -252,7 +266,8 @@ if __name__ == '__main__':
test_commit(branch, commit, last_commit, args, testFilePaths, have_mutt, have_mail) test_commit(branch, commit, last_commit, args, testFilePaths, have_mutt, have_mail)
else: else:
log("WARNING: main loadavg=%.2f is higher than %s" % (loadavg, args.maxLoadAvg)) log("WARNING: main loadavg=%.2f is higher than %s" % (loadavg, args.maxLoadAvg))
log("sleep for %s seconds" % args.sleepTime) if verbose:
log("sleep for %s seconds" % args.sleepTime)
time.sleep(args.sleepTime) time.sleep(args.sleepTime)
except Exception as e: except Exception as e:
stack = traceback.format_exc() stack = traceback.format_exc()