lli_mcjit += ' -mtriple='+config.host_triple+'-elf'
config.substitutions.append( ('%lli_mcjit', lli_mcjit) )
+# Similarly, have a macro to use llc with DWARF even when the host is win32.
+llc_dwarf = 'llc'
+if re.search(r'win32', config.target_triple):
+ llc_dwarf += ' -mtriple='+config.target_triple.replace('-win32', '-mingw32')
+config.substitutions.append( ('%llc_dwarf', llc_dwarf) )
+
# Provide a substition for those tests that need to run the jit to obtain data
# but simply want use the currently considered most reliable jit for platform
# FIXME: ppc32 is not ready for mcjit.
config.substitutions.append( ('%ocamlopt', config.ocamlopt_executable) )
config.substitutions.append( ('%llvmshlibdir', config.llvm_shlib_dir) )
config.substitutions.append( ('%shlibext', config.llvm_shlib_ext) )
+config.substitutions.append( ('%exeext', config.llvm_exe_ext) )
# For each occurrence of an llvm tool name as its own word, replace it
# with the full path to the build directory holding that tool. This
# tools that might happen to be in the user's PATH. Thus this list
# includes every tool placed in $(LLVM_OBJ_ROOT)/$(BuildMode)/bin
# (llvm_tools_dir in lit parlance).
- # Don't match 'bugpoint-' or 'clang-'.
- # Don't match '/clang' or '-clang'.
-if os.pathsep == ';':
- pathext = os.environ.get('PATHEXT', '').split(';')
-else:
- pathext = ['']
-# Regex to reject matching a hyphen
-NOHYPHEN = r"(?<!-)"
+
+# Avoid matching RUN line fragments that are actually part of
+# path names or options or whatever.
+# The regex is a pre-assertion to avoid matching a preceding
+# dot, hyphen, carat, or slash (.foo, -foo, etc.). Some patterns
+# also have a post-assertion to not match a trailing hyphen (foo-).
+NOJUNK = r"(?<!\.|-|\^|/)"
for pattern in [r"\bbugpoint\b(?!-)",
- r"(?<!/|-)\bclang\b(?!-)",
- r"\bgold\b",
- # Match llc but not -llc
- NOHYPHEN + r"\bllc\b",
+ NOJUNK + r"\bclang\b(?!-)",
+ NOJUNK + r"\bllc\b",
r"\blli\b",
r"\bllvm-PerfectShuffle\b",
r"\bllvm-ar\b",
r"\bllvm-dis\b",
r"\bllvm-dwarfdump\b",
r"\bllvm-extract\b",
- r"\bllvm-jistlistener\b",
r"\bllvm-link\b",
r"\bllvm-lto\b",
r"\bllvm-mc\b",
+ r"\bllvm-mcmarkup\b",
r"\bllvm-nm\b",
r"\bllvm-objdump\b",
+ r"\bllvm-profdata\b",
r"\bllvm-ranlib\b",
r"\bllvm-readobj\b",
r"\bllvm-rtdyld\b",
- r"\bllvm-shlib\b",
r"\bllvm-size\b",
r"\bllvm-tblgen\b",
r"\bllvm-c-test\b",
- # Match llvmc but not -llvmc
- NOHYPHEN + r"\bllvmc\b",
- # Match lto but not -lto
- NOHYPHEN + r"\blto\b",
r"\bmacho-dump\b",
- # Don't match '.opt', '-opt', '^opt' or '/opt'.
- r"(?<!\.|-|\^|/)\bopt\b",
+ NOJUNK + r"\bopt\b",
r"\bFileCheck\b",
r"\bFileUpdate\b",
r"\bc-index-test\b",
r"\bfpcmp\b",
+ r"\bobj2yaml\b",
+ r"\byaml2obj\b",
# Handle these specially as they are strings searched
# for during testing.
r"\| \bcount\b",
# name being surrounded by \b word match operators. If the
# pattern starts with "| ", include it in the string to be
# substituted.
- substitution = re.sub(r"^(\\)?((\| )?)\W+b([0-9A-Za-z-_]+)\\b\W*$",
- r"\2" + llvm_tools_dir + "/" + r"\4",
+ tool_match = re.match(r"^(\\)?((\| )?)\W+b([0-9A-Za-z-_]+)\\b\W*$",
pattern)
- for ext in pathext:
- substitution_ext = substitution + ext
- if os.path.exists(substitution_ext):
- substitution = substitution_ext
- break
- config.substitutions.append((pattern, substitution))
+ tool_pipe = tool_match.group(2)
+ tool_name = tool_match.group(4)
+ tool_path = lit.util.which(tool_name, llvm_tools_dir)
+ if not tool_path:
+ # Warn, but still provide a substitution.
+ lit_config.note('Did not find ' + tool_name + ' in ' + llvm_tools_dir)
+ tool_path = llvm_tools_dir + '/' + tool_name
+ config.substitutions.append((pattern, tool_pipe + tool_path))
### Features
config.available_features.add("msan")
# Direct object generation
-if not 'hexagon' in config.target_triple:
+if not 'hexagon' in config.target_triple and \
+ not re.match('(arm|thumb).*windows', config.target_triple):
config.available_features.add("object-emission")
if config.have_zlib == "1":
config.available_features.add("zlib")
+else:
+ config.available_features.add("nozlib")
# Native compilation: host arch == target arch
-if config.host_arch in config.target_triple:
+# FIXME: Consider cases that target can be executed
+# even if host_triple were different from target_triple.
+if config.host_triple == config.target_triple:
config.available_features.add("native")
-# llc knows whether he is compiled with -DNDEBUG.
+# Ask llvm-config about assertion mode.
import subprocess
try:
- llc_cmd = subprocess.Popen([os.path.join(llvm_tools_dir, 'llc'), '-version'],
- stdout = subprocess.PIPE)
+ llvm_config_cmd = subprocess.Popen(
+ [os.path.join(llvm_tools_dir, 'llvm-config'), '--assertion-mode'],
+ stdout = subprocess.PIPE)
except OSError:
- print("Could not find llc in " + llvm_tools_dir)
+ print("Could not find llvm-config in " + llvm_tools_dir)
exit(42)
-if re.search(r'with assertions', llc_cmd.stdout.read().decode('ascii')):
+if re.search(r'ON', llvm_config_cmd.stdout.read().decode('ascii')):
config.available_features.add('asserts')
-llc_cmd.wait()
+llvm_config_cmd.wait()
if 'darwin' == sys.platform:
try: