From 54b991cfcb87b327b3b36d738d3a857e1c34815b Mon Sep 17 00:00:00 2001 From: Ilia Filippov Date: Thu, 13 Feb 2014 15:14:04 +0400 Subject: [PATCH] set 3.4 version of LLVM to alloy.py, perf.py correction --- alloy.py | 11 ++++++----- perf.py | 2 +- 2 files changed, 7 insertions(+), 6 deletions(-) diff --git a/alloy.py b/alloy.py index 68013865..8f49b383 100755 --- a/alloy.py +++ b/alloy.py @@ -524,8 +524,9 @@ def validation_run(only, only_targets, reference_branch, number, notify, update, performance.ref = "ispc_ref.exe" performance.perf_target = "" performance.in_file = "." + os.sep + f_date + os.sep + "performance.log" -# prepare LLVM 3.3 as newest LLVM - need_LLVM = check_LLVM(["3.3"]) +# prepare newest LLVM + newest_LLVM="3.4" + need_LLVM = check_LLVM([newest_LLVM]) if len(need_LLVM) != 0: build_LLVM(need_LLVM[0], "", "", "", False, False, False, True, False, make) if perf_llvm == False: @@ -542,7 +543,7 @@ def validation_run(only, only_targets, reference_branch, number, notify, update, #try_do_LLVM("stash current branch ", "git stash", True) try_do_LLVM("checkout reference branch " + reference_branch + " ", "git checkout " + reference_branch, True) sys.stdout.write(".\n") - build_ispc("3.3", make) + build_ispc(newest_LLVM, make) sys.stdout.write(".\n") if current_OS != "Windows": os.rename("ispc", "ispc_ref") @@ -553,12 +554,12 @@ def validation_run(only, only_targets, reference_branch, number, notify, update, if stashing: try_do_LLVM("return current branch ", "git stash pop", True) sys.stdout.write("You can interrupt script now.\n") - build_ispc("3.3", make) + build_ispc(newest_LLVM, make) else: # build compiler with two different LLVM versions if len(check_LLVM([reference_branch])) != 0: error("you haven't got llvm called " + reference_branch, 1) - build_ispc("3.3", make) + build_ispc(newest_LLVM, make) os.rename("ispc", "ispc_ref") build_ispc(reference_branch, make) # begin validation run for performance. output is inserted into perf() diff --git a/perf.py b/perf.py index 65895335..30189040 100755 --- a/perf.py +++ b/perf.py @@ -533,7 +533,7 @@ def perf(options1, args): A = print_answer(answer, target_number) if options.ref != "": print_debug("\n\nREFERENCE COMPILER:\n", s, perf_log) - B = print_answer(answer_ref) + B = print_answer(answer_ref, target_number) # print perf report compare(A,B)