X-Git-Url: http://plrg.eecs.uci.edu/git/?a=blobdiff_plain;f=test%2Flit.cfg;h=335b86dae7d980025687e28ad00ccc9c46111ddd;hb=33e07581b22ed472103c91a246dab5b8ce08a1c7;hp=844cb2bb5162ef09b154a5f4e9ab2196801baa24;hpb=897105001238e442118ed77561f5e55935dd0d0e;p=oota-llvm.git diff --git a/test/lit.cfg b/test/lit.cfg index 844cb2bb516..335b86dae7d 100644 --- a/test/lit.cfg +++ b/test/lit.cfg @@ -96,10 +96,23 @@ for symbolizer in ['ASAN_SYMBOLIZER_PATH', 'MSAN_SYMBOLIZER_PATH']: config.environment[symbolizer] = os.environ[symbolizer] # Propagate options for sanitizers. -for options in ['ASAN_OPTIONS']: +for options in ['ASAN_OPTIONS', 'UBSAN_OPTIONS']: if options in os.environ: config.environment[options] = os.environ[options] +# Set up OCAMLPATH to include newly built OCaml libraries. +llvm_lib_dir = getattr(config, 'llvm_lib_dir', None) +if llvm_lib_dir: # empty llvm_lib_dir is falsey, reads as None + llvm_ocaml_lib = os.path.join(llvm_lib_dir, 'ocaml') + if 'OCAMLPATH' in os.environ: + ocamlpath = os.path.pathsep.join((llvm_ocaml_lib, os.environ['OCAMLPATH'])) + config.environment['OCAMLPATH'] = ocamlpath + else: + config.environment['OCAMLPATH'] = llvm_ocaml_lib + +# Set up OCAMLRUNPARAM to enable backtraces in OCaml tests. +config.environment['OCAMLRUNPARAM'] = 'b' + ### import os @@ -150,16 +163,15 @@ if config.test_exec_root is None: ### -# Provide a command line for mcjit tests -lli_mcjit = 'lli -use-mcjit' +lli = 'lli' # The target triple used by default by lli is the process target triple (some # triple appropriate for generating code for the current process) but because # we don't support COFF in MCJIT well enough for the tests, force ELF format on # Windows. FIXME: the process target triple should be used here, but this is # difficult to obtain on Windows. if re.search(r'cygwin|mingw32|win32', config.host_triple): - lli_mcjit += ' -mtriple='+config.host_triple+'-elf' -config.substitutions.append( ('%lli_mcjit', lli_mcjit) ) + lli += ' -mtriple='+config.host_triple+'-elf' +config.substitutions.append( ('%lli', lli ) ) # Similarly, have a macro to use llc with DWARF even when the host is win32. llc_dwarf = 'llc' @@ -167,29 +179,22 @@ if re.search(r'win32', config.target_triple): llc_dwarf += ' -mtriple='+config.target_triple.replace('-win32', '-mingw32') config.substitutions.append( ('%llc_dwarf', llc_dwarf) ) -# Process jit implementation option -jit_impl_cfg = lit_config.params.get('jit_impl', None) -if jit_impl_cfg == 'mcjit': - # When running with mcjit, mangle -mcjit into target triple - # and add -use-mcjit flag to lli invocation - if 'i386' in config.target_triple or 'i686' in config.target_triple: - config.target_triple += jit_impl_cfg + '-ia32' - elif 'x86_64' in config.target_triple: - config.target_triple += jit_impl_cfg + '-ia64' - else: - config.target_triple += jit_impl_cfg - - config.substitutions.append( ('%lli', 'lli -use-mcjit') ) -else: - config.substitutions.append( ('%lli', 'lli') ) - # Add site-specific substitutions. -config.substitutions.append( ('%ocamlopt', config.ocamlopt_executable) ) +config.substitutions.append( ('%go', config.go_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) ) config.substitutions.append( ('%python', config.python_executable) ) +# OCaml substitutions. +# Support tests for both native and bytecode builds. +if config.have_ocamlopt == '1': + config.substitutions.append( ('%ocamlcomp', + "%s ocamlopt %s" % (config.ocamlfind_executable, config.ocaml_flags)) ) +else: + config.substitutions.append( ('%ocamlcomp', + "%s ocamlc %s" % (config.ocamlfind_executable, config.ocaml_flags)) ) + # 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 # ensures that we are testing the tools just built and not some random @@ -216,6 +221,7 @@ for pattern in [r"\bbugpoint\b(?!-)", r"\bllvm-dis\b", r"\bllvm-dwarfdump\b", r"\bllvm-extract\b", + r"\bllvm-go\b", r"\bllvm-link\b", r"\bllvm-lto\b", r"\bllvm-mc\b", @@ -228,12 +234,14 @@ for pattern in [r"\bbugpoint\b(?!-)", r"\bllvm-rtdyld\b", r"\bllvm-size\b", r"\bllvm-tblgen\b", + r"\bllvm-vtabledump\b", r"\bllvm-c-test\b", r"\bmacho-dump\b", NOJUNK + r"\bopt\b", r"\bFileCheck\b", r"\bobj2yaml\b", r"\byaml2obj\b", + r"\bverify-uselistorder\b", # Handle these specially as they are strings searched # for during testing. r"\| \bcount\b", @@ -283,9 +291,14 @@ if config.llvm_use_sanitizer == "Address": if (config.llvm_use_sanitizer == "Memory" or config.llvm_use_sanitizer == "MemoryWithOrigins"): config.available_features.add("msan") +if config.llvm_use_sanitizer == "Undefined": + config.available_features.add("ubsan") +else: + config.available_features.add("not_ubsan") # Direct object generation -if not 'hexagon' in config.target_triple: +# Suppress x86_64-mingw32 while investigating since r219108. +if not 'hexagon' in config.target_triple and not re.match(r'^x86_64.*-(mingw32|win32)', config.target_triple): config.available_features.add("object-emission") if config.have_zlib == "1": @@ -299,12 +312,33 @@ else: if config.host_triple == config.target_triple: config.available_features.add("native") -# Ask llvm-config about assertion mode. import subprocess + +def have_ld_plugin_support(): + if not os.path.exists(os.path.join(config.llvm_shlib_dir, 'LLVMgold.so')): + return False + + ld_cmd = subprocess.Popen(['ld', '--help'], stdout = subprocess.PIPE) + if not '-plugin' in ld_cmd.stdout.read(): + return False + ld_cmd.wait() + + ld_version = subprocess.Popen(['ld', '--version'], stdout = subprocess.PIPE) + if not 'GNU gold' in ld_version.stdout.read(): + return False + ld_version.wait() + + return True + +if have_ld_plugin_support(): + config.available_features.add('ld_plugin') + +# Ask llvm-config about assertion mode. try: llvm_config_cmd = subprocess.Popen( [os.path.join(llvm_tools_dir, 'llvm-config'), '--assertion-mode'], - stdout = subprocess.PIPE) + stdout = subprocess.PIPE, + env=config.environment) except OSError: print("Could not find llvm-config in " + llvm_tools_dir) exit(42)