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

Merge pull request #1185 from Shishpan/nightly_fixes

Browse Source 
Nightly fixes
This commit is contained in:
Dmitry Babokin
2016-03-13 21:24:01 +03:00
parent 533db89c76 c7e6b8302e
commit 3ea77d7ab9
2 changed files with 8 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
alloy.py
View File

@@ -730,7 +730,10 @@ def validation_run(only, only_targets, reference_branch, number, notify, update,
# *always* specify default values for global variables on each loop iteration
stability.wrapexe = ""
stability.compiler_exe = None
# choosing right compiler for a given target
# sometimes clang++ is not avaluable. if --ispc-build-compiler = gcc we will pass in g++ compiler
if options.ispc_build_compiler == "gcc":
stability.compiler_exe = "g++"
if ("knc-generic" in stability.target) or ("knl-generic" in stability.target):
stability.compiler_exe = "icpc"
stability.wrapexe = get_sde() + " " + sde_targets[j][0] + " -- "

5
run_tests.py
View File

@@ -270,9 +270,12 @@ def run_test(testname):
elif (options.target == "knl-generic"):
cc_cmd = "%s -O2 -I. %s %s test_static.cpp -DTEST_SIG=%d %s -o %s" % \
(options.compiler_exe, gcc_arch, "-xMIC-AVX512", match, obj_name, exe_name)
elif (options.target == "avx512knl-i32x16"):
elif (options.target == "avx512knl-i32x16" and options.compiler_exe == "clang++"):
cc_cmd = "%s -O2 -I. %s %s test_static.cpp -DTEST_SIG=%d %s -o %s" % \
(options.compiler_exe, gcc_arch, "-march=knl", match, obj_name, exe_name)
elif (options.target == "avx512skx-i32x16" and options.compiler_exe == "clang++"):
cc_cmd = "%s -O2 -I. %s %s test_static.cpp -DTEST_SIG=%d %s -o %s" % \
(options.compiler_exe, gcc_arch, "-march=skx", match, obj_name, exe_name)
else:
cc_cmd = "%s -O2 -I. %s %s test_static.cpp -DTEST_SIG=%d %s -o %s" % \
(options.compiler_exe, gcc_arch, gcc_isa, match, obj_name, exe_name)