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

some fixes for trunk 3.8

Browse Source
This commit is contained in:
Andrey Shishpanov
2015-07-16 19:16:47 +03:00
parent 73f7f583e4
commit 415f2e938c
5 changed files with 26 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
alloy.py
View File

@@ -124,6 +124,9 @@ def build_LLVM(version_LLVM, revision, folder, tarball, debug, selfbuild, extra,
FOLDER_NAME=version_LLVM
if version_LLVM == "trunk":
SVN_PATH="trunk"
if version_LLVM == "3.7":
SVN_PATH="branches/release_37"
version_LLVM = "3_7"
if version_LLVM == "3.6":
SVN_PATH="tags/RELEASE_361/final"
version_LLVM = "3_6"
@@ -296,6 +299,7 @@ def unsupported_llvm_targets(LLVM_VERSION):
"3.5":["avx512knl-i32x16"],
"3.6":["avx512knl-i32x16"],
"3.7":[],
"3.8":[],
"trunk":[]}
return prohibited_list[LLVM_VERSION]
@@ -413,8 +417,10 @@ def build_ispc(version_LLVM, make):
temp = "3_5"
if version_LLVM == "3.6":
temp = "3_6"
if version_LLVM == "trunk":
if version_LLVM == "3.7":
temp = "3_7"
if version_LLVM == "trunk":
temp = "3_8"
os.environ["LLVM_VERSION"] = "LLVM_" + temp
try_do_LLVM("clean ISPC for building", "msbuild ispc.vcxproj /t:clean", True)
try_do_LLVM("build ISPC with LLVM version " + version_LLVM + " ", "msbuild ispc.vcxproj /V:m /p:Platform=Win32 /p:Configuration=Release /t:rebuild", True)
@@ -554,7 +560,7 @@ def validation_run(only, only_targets, reference_branch, number, notify, update,
archs.append("x86-64")
if "native" in only:
sde_targets_t = []
for i in ["3.2", "3.3", "3.4", "3.5", "3.6", "trunk"]:
for i in ["3.2", "3.3", "3.4", "3.5", "3.6", "3.7", "trunk"]:
if i in only:
LLVM.append(i)
if "current" in only:
@@ -833,7 +839,7 @@ def Main():
if os.environ.get("SMTP_ISPC") == None:
error("you have no SMTP_ISPC in your environment for option notify", 1)
if options.only != "":
test_only_r = " 3.2 3.3 3.4 3.5 3.6 trunk current build stability performance x86 x86-64 x86_64 -O0 -O2 native debug nodebug "
test_only_r = " 3.2 3.3 3.4 3.5 3.6 3.7 trunk current build stability performance x86 x86-64 x86_64 -O0 -O2 native debug nodebug "
test_only = options.only.split(" ")
for iterator in test_only:
if not (" " + iterator + " " in test_only_r):
@@ -943,7 +949,7 @@ if __name__ == '__main__':
llvm_group = OptionGroup(parser, "Options for building LLVM",
"These options must be used with -b option.")
llvm_group.add_option('--version', dest='version',
help='version of llvm to build: 3.2 3.3 3.4 3.5 3.6 trunk. Default: trunk', default="trunk")
help='version of llvm to build: 3.2 3.3 3.4 3.5 3.6 3.7 trunk. Default: trunk', default="trunk")
llvm_group.add_option('--with-gcc-toolchain', dest='gcc_toolchain_path',
help='GCC install dir to use when building clang. It is important to set when ' +
'you have alternative gcc installation. Note that otherwise gcc from standard ' +
@@ -984,7 +990,7 @@ if __name__ == '__main__':
run_group.add_option('--only', dest='only',
help='set types of tests. Possible values:\n' +
'-O0, -O2, x86, x86-64, stability (test only stability), performance (test only performance),\n' +
'build (only build with different LLVM), 3.2, 3.3, 3.4, 3.5, 3.6, trunk, native (do not use SDE),\n' +
'build (only build with different LLVM), 3.2, 3.3, 3.4, 3.5, 3.6, 3.7, trunk, native (do not use SDE),\n' +
'current (do not rebuild ISPC), debug (only with debug info), nodebug (only without debug info, default).',
default="")
run_group.add_option('--perf_LLVM', dest='perf_llvm',