aaron/ispc
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

set 3.4 version of LLVM to alloy.py, perf.py correction

Browse Source
This commit is contained in:
Ilia Filippov
2014-02-13 15:14:04 +04:00
parent cc81cd3215
commit 54b991cfcb
2 changed files with 7 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
alloy.py
View File

@@ -524,8 +524,9 @@ def validation_run(only, only_targets, reference_branch, number, notify, update,
performance.ref = "ispc_ref.exe" performance.ref = "ispc_ref.exe"
performance.perf_target = "" performance.perf_target = ""
performance.in_file = "." + os.sep + f_date + os.sep + "performance.log" performance.in_file = "." + os.sep + f_date + os.sep + "performance.log"
# prepare LLVM 3.3 as newest LLVM # prepare newest LLVM
need_LLVM = check_LLVM(["3.3"]) newest_LLVM="3.4"
need_LLVM = check_LLVM([newest_LLVM])
if len(need_LLVM) != 0: if len(need_LLVM) != 0:
build_LLVM(need_LLVM[0], "", "", "", False, False, False, True, False, make) build_LLVM(need_LLVM[0], "", "", "", False, False, False, True, False, make)
if perf_llvm == False: 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("stash current branch ", "git stash", True)
try_do_LLVM("checkout reference branch " + reference_branch + " ", "git checkout " + reference_branch, True) try_do_LLVM("checkout reference branch " + reference_branch + " ", "git checkout " + reference_branch, True)
sys.stdout.write(".\n") sys.stdout.write(".\n")
build_ispc("3.3", make) build_ispc(newest_LLVM, make)
sys.stdout.write(".\n") sys.stdout.write(".\n")
if current_OS != "Windows": if current_OS != "Windows":
os.rename("ispc", "ispc_ref") os.rename("ispc", "ispc_ref")
@@ -553,12 +554,12 @@ def validation_run(only, only_targets, reference_branch, number, notify, update,
if stashing: if stashing:
try_do_LLVM("return current branch ", "git stash pop", True) try_do_LLVM("return current branch ", "git stash pop", True)
sys.stdout.write("You can interrupt script now.\n") sys.stdout.write("You can interrupt script now.\n")
build_ispc("3.3", make) build_ispc(newest_LLVM, make)
else: else:
# build compiler with two different LLVM versions # build compiler with two different LLVM versions
if len(check_LLVM([reference_branch])) != 0: if len(check_LLVM([reference_branch])) != 0:
error("you haven't got llvm called " + reference_branch, 1) 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") os.rename("ispc", "ispc_ref")
build_ispc(reference_branch, make) build_ispc(reference_branch, make)
# begin validation run for performance. output is inserted into perf() # begin validation run for performance. output is inserted into perf()

2
perf.py
View File

@@ -533,7 +533,7 @@ def perf(options1, args):
A = print_answer(answer, target_number) A = print_answer(answer, target_number)
if options.ref != "": if options.ref != "":
print_debug("\n\nREFERENCE COMPILER:\n", s, perf_log) print_debug("\n\nREFERENCE COMPILER:\n", s, perf_log)
B = print_answer(answer_ref) B = print_answer(answer_ref, target_number)
# print perf report # print perf report
compare(A,B) compare(A,B)