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

Enable clang as default C++ compiler used by run_tests.py and perf.py

Browse Source
This commit is contained in:
Dmitry Babokin
2013-10-10 16:11:15 +04:00
parent 17b54cb0c8
commit d129e33b51
2 changed files with 7 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
perf.py
View File

@@ -326,8 +326,8 @@ def perf(options1, args):
ref_compiler_exists = False ref_compiler_exists = False
if is_windows == False: if is_windows == False:
ispc_test = "ispc" ispc_test = "ispc"
ref_compiler = "g++" ref_compiler = "clang++"
refc_compiler = "gcc" refc_compiler = "clang"
if options.compiler != "": if options.compiler != "":
if options.compiler == "clang" or options.compiler == "clang++": if options.compiler == "clang" or options.compiler == "clang++":
ref_compiler = "clang++" ref_compiler = "clang++"
@@ -335,6 +335,9 @@ def perf(options1, args):
if options.compiler == "icc" or options.compiler == "icpc": if options.compiler == "icc" or options.compiler == "icpc":
ref_compiler = "icpc" ref_compiler = "icpc"
refc_compiler = "icc" refc_compiler = "icc"
if options.compiler == "gcc" or options.compiler == "g++":
ref_compiler = "g++"
refc_compiler = "gcc"
else: else:
ispc_test = "ispc.exe" ispc_test = "ispc.exe"
ref_compiler = "cl.exe" ref_compiler = "cl.exe"

4
run_tests.py
View File

@@ -446,7 +446,7 @@ def verify():
f = open(test_states, 'r') f = open(test_states, 'r')
f_lines = f.readlines() f_lines = f.readlines()
f.close() f.close()
check = [["g++", "clang", "cl"],["-O0", "-O2"],["x86","x86-64"], check = [["g++", "clang++", "cl"],["-O0", "-O2"],["x86","x86-64"],
["Linux","Windows","Mac"],["LLVM 3.1","LLVM 3.2","LLVM 3.3","LLVM head"], ["Linux","Windows","Mac"],["LLVM 3.1","LLVM 3.2","LLVM 3.3","LLVM head"],
["sse2-i32x4", "sse2-i32x8", "sse4-i32x4", "sse4-i32x8", "sse4-i16x8", ["sse2-i32x4", "sse2-i32x8", "sse4-i32x4", "sse4-i32x8", "sse4-i16x8",
"sse4-i8x16", "avx1-i32x8", "avx1-i32x16", "avx1-i64x4", "avx1.1-i32x8", "avx1.1-i32x16", "sse4-i8x16", "avx1-i32x8", "avx1-i32x16", "avx1-i64x4", "avx1.1-i32x8", "avx1.1-i32x16",
@@ -550,7 +550,7 @@ def run_tests(options1, args, print_version):
if is_windows: if is_windows:
options.compiler_exe = "cl.exe" options.compiler_exe = "cl.exe"
else: else:
options.compiler_exe = "g++" options.compiler_exe = "clang++"
# checks the required compiler otherwise prints an error message # checks the required compiler otherwise prints an error message
PATH_dir = string.split(os.getenv("PATH"), os.pathsep) PATH_dir = string.split(os.getenv("PATH"), os.pathsep)