X-Git-Url: http://plrg.eecs.uci.edu/git/?a=blobdiff_plain;f=test%2Flit.cfg;h=7b7a269b94b0d0490a5e52fd90ec2b8f1b698aa5;hb=52f1b6dbede268c5cf2ffffb0cc0facd7dbb44f1;hp=40b5a25c4971098bbedb716b3edfb59ede0bf8f1;hpb=3ada4ec04ca7f8f2938b73e85b594a6e1ae7c15a;p=oota-llvm.git diff --git a/test/lit.cfg b/test/lit.cfg index 40b5a25c497..7b7a269b94b 100644 --- a/test/lit.cfg +++ b/test/lit.cfg @@ -97,22 +97,25 @@ for symbolizer in ['ASAN_SYMBOLIZER_PATH', 'MSAN_SYMBOLIZER_PATH']: # Set up OCAMLPATH to include newly built OCaml libraries. llvm_lib_dir = getattr(config, 'llvm_lib_dir', None) -if not llvm_lib_dir: - llvm_lib_dir = os.path.join(getattr(config, 'llvm_obj_root', None), 'lib') - -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 - -if 'CAML_LD_LIBRARY_PATH' in os.environ: - caml_ld_library_path = os.path.pathsep.join((llvm_ocaml_lib, - os.environ['CAML_LD_LIBRARY_PATH'])) - config.environment['CAML_LD_LIBRARY_PATH'] = caml_ld_library_path -else: - config.environment['CAML_LD_LIBRARY_PATH'] = llvm_ocaml_lib +if llvm_lib_dir is None: + if llvm_obj_root is not None: + llvm_lib_dir = os.path.join(llvm_obj_root, 'lib') + +if llvm_lib_dir is not None: + llvm_ocaml_lib = os.path.join(llvm_lib_dir, 'ocaml') + if llvm_ocaml_lib is not None: + 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 + + if 'CAML_LD_LIBRARY_PATH' in os.environ: + caml_ld_library_path = os.path.pathsep.join((llvm_ocaml_lib, + os.environ['CAML_LD_LIBRARY_PATH'])) + config.environment['CAML_LD_LIBRARY_PATH'] = caml_ld_library_path + else: + config.environment['CAML_LD_LIBRARY_PATH'] = llvm_ocaml_lib # Set up OCAMLRUNPARAM to enable backtraces in OCaml tests. config.environment['OCAMLRUNPARAM'] = 'b' @@ -173,7 +176,7 @@ lli = 'lli' # 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): +if re.search(r'cygwin|mingw32|windows-gnu|win32', config.host_triple): lli += ' -mtriple='+config.host_triple+'-elf' config.substitutions.append( ('%lli', lli ) ) @@ -184,6 +187,7 @@ if re.search(r'win32', config.target_triple): config.substitutions.append( ('%llc_dwarf', llc_dwarf) ) # Add site-specific substitutions. +config.substitutions.append( ('%gold', config.gold_executable) ) config.substitutions.append( ('%go', config.go_executable) ) config.substitutions.append( ('%llvmshlibdir', config.llvm_shlib_dir) ) config.substitutions.append( ('%shlibext', config.llvm_shlib_ext) ) @@ -193,7 +197,8 @@ config.substitutions.append( ('%python', config.python_executable) ) # OCaml substitutions. # Support tests for both native and bytecode builds. config.substitutions.append( ('%ocamlc', - "%s ocamlc %s" % (config.ocamlfind_executable, config.ocaml_flags)) ) + "%s ocamlc -cclib -L%s %s" % + (config.ocamlfind_executable, llvm_lib_dir, config.ocaml_flags)) ) if config.have_ocamlopt in ('1', 'TRUE'): config.substitutions.append( ('%ocamlopt', "%s ocamlopt -cclib -L%s -cclib -Wl,-rpath,%s %s" % @@ -225,6 +230,7 @@ for pattern in [r"\bbugpoint\b(?!-)", r"\bllvm-cov\b", r"\bllvm-diff\b", r"\bllvm-dis\b", + r"\bllvm-dsymutil\b", r"\bllvm-dwarfdump\b", r"\bllvm-extract\b", r"\bllvm-go\b", @@ -265,6 +271,10 @@ for pattern in [r"\bbugpoint\b(?!-)", # 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 + if (tool_name == "llc" and + 'LLVM_ENABLE_MACHINE_VERIFIER' in os.environ and + os.environ['LLVM_ENABLE_MACHINE_VERIFIER'] == "1"): + tool_path += " -verify-machineinstrs" config.substitutions.append((pattern, tool_pipe + tool_path)) ### Targets @@ -304,7 +314,7 @@ else: # Direct object generation # 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): +if not 'hexagon' in config.target_triple and not re.match(r'^x86_64.*-(mingw32|windows-gnu|win32)', config.target_triple): config.available_features.add("object-emission") if config.have_zlib == "1": @@ -324,13 +334,27 @@ 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 = subprocess.Popen([config.gold_executable, '--help'], stdout = subprocess.PIPE) + ld_out = ld_cmd.stdout.read().decode() ld_cmd.wait() - ld_version = subprocess.Popen(['ld', '--version'], stdout = subprocess.PIPE) - if not 'GNU gold' in ld_version.stdout.read(): + if not '-plugin' in ld_out: + return False + + # check that the used emulations are supported. + emu_line = [l for l in ld_out.split('\n') if 'supported emulations' in l] + if len(emu_line) != 1: + return False + emu_line = emu_line[0] + fields = emu_line.split(':') + if len(fields) != 3: + return False + emulations = fields[2].split() + if 'elf32ppc' not in emulations or 'elf_x86_64' not in emulations: + return False + + ld_version = subprocess.Popen([config.gold_executable, '--version'], stdout = subprocess.PIPE) + if not 'GNU gold' in ld_version.stdout.read().decode(): return False ld_version.wait() @@ -365,7 +389,7 @@ if 'darwin' == sys.platform: sysctl_cmd.wait() # .debug_frame is not emitted for targeting Windows x64. -if not re.match(r'^x86_64.*-(mingw32|win32)', config.target_triple): +if not re.match(r'^x86_64.*-(mingw32|windows-gnu|win32)', config.target_triple): config.available_features.add('debug_frame') # Check if we should use gmalloc.