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

Added LLVM 3.7 support

Browse Source
This commit is contained in:
Andrey Guskov
2015-01-19 17:30:59 +03:00
parent abeda29087
commit ae8b724d92
7 changed files with 47 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

19
alloy.py
View File

@@ -109,6 +109,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.6":
SVN_PATH="branches/release_36/"
version_LLVM = "3_6"
if version_LLVM == "3.5":
SVN_PATH="tags/RELEASE_350/final"
version_LLVM = "3_5"
@@ -387,8 +390,10 @@ def build_ispc(version_LLVM, make):
temp = "3_4"
if version_LLVM == "3.5":
temp = "3_5"
if version_LLVM == "trunk":
if version_LLVM == "3.6":
temp = "3_6"
if version_LLVM == "trunk":
temp = "3_7"
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)
@@ -475,7 +480,7 @@ def validation_run(only, only_targets, reference_branch, number, notify, update,
print_debug("Folder: " + os.environ["ISPC_HOME"] + "\n", False, "")
date = datetime.datetime.now()
print_debug("Date: " + date.strftime('%H:%M %d/%m/%Y') + "\n", False, "")
newest_LLVM="3.5"
newest_LLVM="3.6"
msg_additional_info = ""
# *** *** ***
# Stability validation run
@@ -522,7 +527,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", "trunk"]:
for i in ["3.2", "3.3", "3.4", "3.5", "3.6", "trunk"]:
if i in only:
LLVM.append(i)
if "current" in only:
@@ -775,7 +780,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 trunk current build stability performance x86 x86-64 -O0 -O2 native "
test_only_r = " 3.2 3.3 3.4 3.5 3.6 trunk current build stability performance x86 x86-64 -O0 -O2 native "
test_only = options.only.split(" ")
for iterator in test_only:
if not (" " + iterator + " " in test_only_r):
@@ -884,7 +889,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 trunk. Default: trunk', default="trunk")
help='version of llvm to build: 3.2 3.3 3.4 3.5 3.6 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 ' +
@@ -925,10 +930,10 @@ 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, trunk, native (do not use SDE), current (do not rebuild ISPC).',
'build (only build with different LLVM), 3.2, 3.3, 3.4, 3.5, 3.6, trunk, native (do not use SDE), current (do not rebuild ISPC).',
default="")
run_group.add_option('--perf_LLVM', dest='perf_llvm',
help='compare LLVM 3.5 with "--compare-with", default trunk', default=False, action='store_true')
help='compare LLVM 3.6 with "--compare-with", default trunk', default=False, action='store_true')
parser.add_option_group(run_group)
# options for activity "setup PATHS"
setup_group = OptionGroup(parser, "Options for setup",