X-Git-Url: http://plrg.eecs.uci.edu/git/?a=blobdiff_plain;f=test%2Flit.cfg;h=627c8a198017608f8f7f14291796f3855672b4a3;hb=416c002bf32f02efd8ebb4093c015dba69fedb99;hp=b9b4df12217f04d5101a56159b4410ffd5a73a26;hpb=31e081ed96228d31f7674557ebac52b5954aff50;p=oota-llvm.git diff --git a/test/lit.cfg b/test/lit.cfg index b9b4df12217..627c8a19801 100644 --- a/test/lit.cfg +++ b/test/lit.cfg @@ -41,7 +41,7 @@ config.test_format = lit.formats.ShTest(execute_external) # suffixes: A list of file extensions to treat as test files. This is overriden # by individual lit.local.cfg files in the test subdirectories. -config.suffixes = ['.ll', '.c', '.cpp', '.test', '.txt', '.s'] +config.suffixes = ['.ll', '.c', '.cxx', '.test', '.txt', '.s'] # excludes: A list of directories to exclude from the testsuite. The 'Inputs' # subdirectories contain auxiliary inputs for various tests in their parent @@ -176,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|windows-msvc|win32', config.host_triple): lli += ' -mtriple='+config.host_triple+'-elf' config.substitutions.append( ('%lli', lli ) ) @@ -187,6 +187,8 @@ 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( ('%ld64', config.ld64_executable) ) config.substitutions.append( ('%go', config.go_executable) ) config.substitutions.append( ('%llvmshlibdir', config.llvm_shlib_dir) ) config.substitutions.append( ('%shlibext', config.llvm_shlib_ext) ) @@ -227,12 +229,14 @@ for pattern in [r"\bbugpoint\b(?!-)", r"\bllvm-bcanalyzer\b", r"\bllvm-config\b", r"\bllvm-cov\b", + r"\bllvm-cxxdump\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", + r"\bllvm-lib\b", r"\bllvm-link\b", r"\bllvm-lto\b", r"\bllvm-mc\b", @@ -245,13 +249,13 @@ 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"\byaml-bench\b", r"\bverify-uselistorder\b", # Handle these specially as they are strings searched # for during testing. @@ -265,11 +269,19 @@ for pattern in [r"\bbugpoint\b(?!-)", pattern) 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: + # Did the user specify the tool path + arguments? This allows things like + # llvm-lit "-Dllc=llc -enable-misched -verify-machineinstrs" + tool_path = lit_config.params.get(tool_name) + if tool_path is None: + tool_path = lit.util.which(tool_name, llvm_tools_dir) + if tool_path is None: # 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 @@ -307,9 +319,13 @@ if config.llvm_use_sanitizer == "Undefined": else: config.available_features.add("not_ubsan") +# Check if we should run long running tests. +if lit_config.params.get("run_long_tests", None) == "true": + config.available_features.add("long_tests") + # 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": @@ -317,10 +333,11 @@ if config.have_zlib == "1": else: config.available_features.add("nozlib") -# Native compilation: host arch == target arch +# Native compilation: host arch == target arch and native backend built-in # FIXME: Consider cases that target can be executed # even if host_triple were different from target_triple. -if config.host_triple == config.target_triple: +if (config.host_triple == config.target_triple and + config.native_target in config.targets_to_build): config.available_features.add("native") import subprocess @@ -329,8 +346,8 @@ 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) - ld_out = ld_cmd.stdout.read() + ld_cmd = subprocess.Popen([config.gold_executable, '--help'], stdout = subprocess.PIPE) + ld_out = ld_cmd.stdout.read().decode() ld_cmd.wait() if not '-plugin' in ld_out: @@ -345,11 +362,13 @@ def have_ld_plugin_support(): if len(fields) != 3: return False emulations = fields[2].split() - if 'elf32ppc' not in emulations or 'elf_x86_64' not in emulations: + if 'elf_x86_64' not in emulations: return False + if 'elf32ppc' in emulations: + config.available_features.add('ld_emu_elf32ppc') - ld_version = subprocess.Popen(['ld', '--version'], stdout = subprocess.PIPE) - if not 'GNU gold' in ld_version.stdout.read(): + 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() @@ -358,6 +377,22 @@ def have_ld_plugin_support(): if have_ld_plugin_support(): config.available_features.add('ld_plugin') +def have_ld64_plugin_support(): + if config.ld64_executable == '': + return False + + ld_cmd = subprocess.Popen([config.ld64_executable, '-v'], stderr = subprocess.PIPE) + ld_out = ld_cmd.stderr.read().decode() + ld_cmd.wait() + + if 'ld64' not in ld_out or 'LTO' not in ld_out: + return False + + return True + +if have_ld64_plugin_support(): + config.available_features.add('ld64_plugin') + # Ask llvm-config about assertion mode. try: llvm_config_cmd = subprocess.Popen( @@ -384,7 +419,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.