From 9dd1d67a394d3ec33f002b22daebc5e2aec9a9bf Mon Sep 17 00:00:00 2001 From: Anton Mitrokhin Date: Fri, 18 Jul 2014 19:34:34 +0400 Subject: [PATCH 1/2] pass g++ as a compiler to run_tests.py when ispc_build_compiler==gcc --- alloy.py | 3 +++ 1 file changed, 3 insertions(+) diff --git a/alloy.py b/alloy.py index 8bd26d6c..abe0969c 100755 --- a/alloy.py +++ b/alloy.py @@ -438,6 +438,9 @@ def validation_run(only, only_targets, reference_branch, number, notify, update, LLVM = [] targets = [] sde_targets = [] +# 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++" # parsing option only, update parameters of run if "-O2" in only: opts.append(False) From 7c3a2435b3726d49d0bddf2bcdd7569bebe71c11 Mon Sep 17 00:00:00 2001 From: Anton Mitrokhin Date: Sat, 19 Jul 2014 14:49:49 +0400 Subject: [PATCH 2/2] passing icpc compiler for knc target --- alloy.py | 12 +++++++++--- run_tests.py | 2 +- 2 files changed, 10 insertions(+), 4 deletions(-) diff --git a/alloy.py b/alloy.py index abe0969c..809c3f76 100755 --- a/alloy.py +++ b/alloy.py @@ -438,9 +438,7 @@ def validation_run(only, only_targets, reference_branch, number, notify, update, LLVM = [] targets = [] sde_targets = [] -# 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++" + # parsing option only, update parameters of run if "-O2" in only: opts.append(False) @@ -521,6 +519,14 @@ def validation_run(only, only_targets, reference_branch, number, notify, update, for j in range(0,len(targets)): stability.target = targets[j] stability.wrapexe = "" + # 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++" + # but 'knc' target is supported only by icpc, so set explicitly + if "knc" in targets[j]: + stability.compiler_exe = "icpc" + # now set archs for targets if "generic" in targets[j]: arch = gen_archs elif "knc" in targets[j]: diff --git a/run_tests.py b/run_tests.py index c9d8f2ff..b5bc2bb0 100755 --- a/run_tests.py +++ b/run_tests.py @@ -589,7 +589,7 @@ def run_tests(options1, args, print_version): options.compiler_exe = "cl.exe" else: options.compiler_exe = "clang++" - + # checks the required compiler otherwise prints an error message PATH_dir = string.split(os.getenv("PATH"), os.pathsep) compiler_exists = False