diff --git a/llvm/test/lit.cfg.py b/llvm/test/lit.cfg.py index f92f7912038b..a67bd6527a50 100644 --- a/llvm/test/lit.cfg.py +++ b/llvm/test/lit.cfg.py @@ -1,333 +1,336 @@ # -*- Python -*- # Configuration file for the 'lit' test runner. import os import sys import re import platform import subprocess import lit.util import lit.formats from lit.llvm import llvm_config from lit.llvm.subst import FindTool from lit.llvm.subst import ToolSubst # name: The name of this test suite. config.name = 'LLVM' # testFormat: The test format to use to interpret tests. config.test_format = lit.formats.ShTest(not llvm_config.use_lit_shell) # 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', '.cxx', '.test', '.txt', '.s', '.mir'] # excludes: A list of directories to exclude from the testsuite. The 'Inputs' # subdirectories contain auxiliary inputs for various tests in their parent # directories. config.excludes = ['Inputs', 'CMakeLists.txt', 'README.txt', 'LICENSE.txt'] # test_source_root: The root path where tests are located. config.test_source_root = os.path.dirname(__file__) # test_exec_root: The root path where tests should be run. config.test_exec_root = os.path.join(config.llvm_obj_root, 'test') # Tweak the PATH to include the tools dir. llvm_config.with_environment('PATH', config.llvm_tools_dir, append_path=True) # Propagate some variables from the host environment. llvm_config.with_system_environment( ['HOME', 'INCLUDE', 'LIB', 'TMP', 'TEMP', 'ASAN_SYMBOLIZER_PATH', 'MSAN_SYMBOLIZER_PATH']) # Set up OCAMLPATH to include newly built OCaml libraries. top_ocaml_lib = os.path.join(config.llvm_lib_dir, 'ocaml') llvm_ocaml_lib = os.path.join(top_ocaml_lib, 'llvm') llvm_config.with_system_environment('OCAMLPATH') llvm_config.with_environment('OCAMLPATH', top_ocaml_lib, append_path=True) llvm_config.with_environment('OCAMLPATH', llvm_ocaml_lib, append_path=True) llvm_config.with_system_environment('CAML_LD_LIBRARY_PATH') llvm_config.with_environment( 'CAML_LD_LIBRARY_PATH', llvm_ocaml_lib, append_path=True) # Set up OCAMLRUNPARAM to enable backtraces in OCaml tests. llvm_config.with_environment('OCAMLRUNPARAM', 'b') # Provide the path to asan runtime lib 'libclang_rt.asan_osx_dynamic.dylib' if # available. This is darwin specific since it's currently only needed on darwin. def get_asan_rtlib(): if not 'Address' in config.llvm_use_sanitizer or \ not 'Darwin' in config.host_os or \ not 'x86' in config.host_triple: return '' try: import glob except: print('glob module not found, skipping get_asan_rtlib() lookup') return '' # The libclang_rt.asan_osx_dynamic.dylib path is obtained using the relative # path from the host cc. host_lib_dir = os.path.join(os.path.dirname(config.host_cc), '../lib') asan_dylib_dir_pattern = host_lib_dir + \ '/clang/*/lib/darwin/libclang_rt.asan_osx_dynamic.dylib' found_dylibs = glob.glob(asan_dylib_dir_pattern) if len(found_dylibs) != 1: return '' return found_dylibs[0] llvm_config.use_default_substitutions() # Add site-specific substitutions. config.substitutions.append(('%llvmshlibdir', config.llvm_shlib_dir)) config.substitutions.append(('%shlibext', config.llvm_shlib_ext)) config.substitutions.append(('%exeext', config.llvm_exe_ext)) lli_args = [] # 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|windows-gnu|windows-msvc', config.host_triple): lli_args = ['-mtriple=' + config.host_triple + '-elf'] llc_args = [] # Similarly, have a macro to use llc with DWARF even when the host is Windows if re.search(r'windows-msvc', config.target_triple): llc_args = [' -mtriple=' + config.target_triple.replace('-msvc', '-gnu')] # Provide the path to asan runtime lib if available. On darwin, this lib needs # to be loaded via DYLD_INSERT_LIBRARIES before libLTO.dylib in case the files # to be linked contain instrumented sanitizer code. ld64_cmd = config.ld64_executable asan_rtlib = get_asan_rtlib() if asan_rtlib: ld64_cmd = 'DYLD_INSERT_LIBRARIES={} {}'.format(asan_rtlib, ld64_cmd) ocamlc_command = '%s ocamlc -cclib -L%s %s' % ( config.ocamlfind_executable, config.llvm_lib_dir, config.ocaml_flags) ocamlopt_command = 'true' if config.have_ocamlopt: ocamlopt_command = '%s ocamlopt -cclib -L%s -cclib -Wl,-rpath,%s %s' % ( config.ocamlfind_executable, config.llvm_lib_dir, config.llvm_lib_dir, config.ocaml_flags) opt_viewer_cmd = '%s %s/tools/opt-viewer/opt-viewer.py' % (sys.executable, config.llvm_src_root) tools = [ ToolSubst('%lli', FindTool('lli'), post='.', extra_args=lli_args), ToolSubst('%llc_dwarf', FindTool('llc'), extra_args=llc_args), ToolSubst('%go', config.go_executable, unresolved='ignore'), ToolSubst('%gold', config.gold_executable, unresolved='ignore'), ToolSubst('%ld64', ld64_cmd, unresolved='ignore'), ToolSubst('%ocamlc', ocamlc_command, unresolved='ignore'), ToolSubst('%ocamlopt', ocamlopt_command, unresolved='ignore'), ToolSubst('%opt-viewer', opt_viewer_cmd), ToolSubst('%llvm-objcopy', FindTool('llvm-objcopy')), ToolSubst('%llvm-strip', FindTool('llvm-strip')), ] # FIXME: Why do we have both `lli` and `%lli` that do slightly different things? tools.extend([ 'dsymutil', 'lli', 'lli-child-target', 'llvm-ar', 'llvm-as', 'llvm-bcanalyzer', 'llvm-config', 'llvm-cov', 'llvm-cxxdump', 'llvm-cvtres', 'llvm-diff', 'llvm-dis', 'llvm-dwarfdump', 'llvm-exegesis', 'llvm-extract', 'llvm-isel-fuzzer', 'llvm-jitlink', 'llvm-opt-fuzzer', 'llvm-lib', 'llvm-link', 'llvm-lto', 'llvm-lto2', 'llvm-mc', 'llvm-mca', 'llvm-modextract', 'llvm-nm', 'llvm-objcopy', 'llvm-objdump', 'llvm-pdbutil', 'llvm-profdata', 'llvm-ranlib', 'llvm-rc', 'llvm-readelf', 'llvm-readobj', 'llvm-rtdyld', 'llvm-size', 'llvm-split', 'llvm-strings', 'llvm-strip', 'llvm-tblgen', 'llvm-undname', 'llvm-c-test', 'llvm-cxxfilt', 'llvm-xray', 'yaml2obj', 'obj2yaml', 'yaml-bench', 'verify-uselistorder', 'bugpoint', 'llc', 'llvm-symbolizer', 'opt', 'sancov', 'sanstats']) # The following tools are optional tools.extend([ ToolSubst('llvm-go', unresolved='ignore'), ToolSubst('llvm-mt', unresolved='ignore'), ToolSubst('Kaleidoscope-Ch3', unresolved='ignore'), ToolSubst('Kaleidoscope-Ch4', unresolved='ignore'), ToolSubst('Kaleidoscope-Ch5', unresolved='ignore'), ToolSubst('Kaleidoscope-Ch6', unresolved='ignore'), ToolSubst('Kaleidoscope-Ch7', unresolved='ignore'), ToolSubst('Kaleidoscope-Ch8', unresolved='ignore')]) llvm_config.add_tool_substitutions(tools, config.llvm_tools_dir) # Targets config.targets = frozenset(config.targets_to_build.split()) for arch in config.targets_to_build.split(): config.available_features.add(arch.lower() + '-registered-target') # Features known_arches = ["x86_64", "mips64", "ppc64", "aarch64"] if (config.host_ldflags.find("-m32") < 0 and any(config.llvm_host_triple.startswith(x) for x in known_arches)): config.available_features.add("llvm-64-bits") config.available_features.add("host-byteorder-" + sys.byteorder + "-endian") # Others/can-execute.txt if sys.platform not in ['win32']: config.available_features.add('can-execute') config.available_features.add('not_COFF') # Loadable module # FIXME: This should be supplied by Makefile or autoconf. if sys.platform in ['win32', 'cygwin']: loadable_module = (config.enable_shared == 1) else: loadable_module = True if loadable_module: config.available_features.add('loadable_module') # Static libraries are not built if BUILD_SHARED_LIBS is ON. if not config.build_shared_libs and not config.link_llvm_dylib: config.available_features.add('static-libs') def have_cxx_shared_library(): readobj_exe = lit.util.which('llvm-readobj', config.llvm_tools_dir) if not readobj_exe: print('llvm-readobj not found') return False try: readobj_cmd = subprocess.Popen( [readobj_exe, '-needed-libs', readobj_exe], stdout=subprocess.PIPE) except OSError: print('could not exec llvm-readobj') return False readobj_out = readobj_cmd.stdout.read().decode('ascii') readobj_cmd.wait() regex = re.compile(r'(libc\+\+|libstdc\+\+|msvcp).*\.(so|dylib|dll)') needed_libs = False for line in readobj_out.splitlines(): if 'NeededLibraries [' in line: needed_libs = True if ']' in line: needed_libs = False if needed_libs and regex.search(line.lower()): return True return False if have_cxx_shared_library(): config.available_features.add('cxx-shared-library') +if config.libcxx_used: + config.available_features.add('libcxx-used') + # Direct object generation if not 'hexagon' in config.target_triple: config.available_features.add('object-emission') # LLVM can be configured with an empty default triple # Some tests are "generic" and require a valid default triple if config.target_triple: config.available_features.add('default_triple') import subprocess def have_ld_plugin_support(): if not os.path.exists(os.path.join(config.llvm_shlib_dir, 'LLVMgold' + config.llvm_shlib_ext)): return False ld_cmd = subprocess.Popen( [config.gold_executable, '--help'], stdout=subprocess.PIPE, env={'LANG': 'C'}) ld_out = ld_cmd.stdout.read().decode() ld_cmd.wait() 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 'elf_x86_64' not in emulations: return False if 'elf32ppc' in emulations: config.available_features.add('ld_emu_elf32ppc') ld_version = subprocess.Popen( [config.gold_executable, '--version'], stdout=subprocess.PIPE, env={'LANG': 'C'}) if not 'GNU gold' in ld_version.stdout.read().decode(): return False ld_version.wait() return True if have_ld_plugin_support(): config.available_features.add('ld_plugin') def have_ld64_plugin_support(): if not os.path.exists(os.path.join(config.llvm_shlib_dir, 'libLTO' + config.llvm_shlib_ext)): return False 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 asserts and global-isel. llvm_config.feature_config( [('--assertion-mode', {'ON': 'asserts'}), ('--has-global-isel', {'ON': 'global-isel'})]) if 'darwin' == sys.platform: try: sysctl_cmd = subprocess.Popen(['sysctl', 'hw.optional.fma'], stdout=subprocess.PIPE) except OSError: print('Could not exec sysctl') result = sysctl_cmd.stdout.read().decode('ascii') if -1 != result.find('hw.optional.fma: 1'): config.available_features.add('fma3') sysctl_cmd.wait() # .debug_frame is not emitted for targeting Windows x64. if not re.match(r'^x86_64.*-(windows-gnu|windows-msvc)', config.target_triple): config.available_features.add('debug_frame') if config.have_libxar: config.available_features.add('xar') if config.enable_threads: config.available_features.add('thread_support') if config.llvm_libxml2_enabled: config.available_features.add('libxml2') if config.have_opt_viewer_modules: config.available_features.add('have_opt_viewer_modules') diff --git a/llvm/test/lit.site.cfg.py.in b/llvm/test/lit.site.cfg.py.in index ada27ff6a774..ef3ae83369ce 100644 --- a/llvm/test/lit.site.cfg.py.in +++ b/llvm/test/lit.site.cfg.py.in @@ -1,62 +1,63 @@ @LIT_SITE_CFG_IN_HEADER@ import sys config.host_triple = "@LLVM_HOST_TRIPLE@" config.target_triple = "@TARGET_TRIPLE@" config.llvm_src_root = "@LLVM_SOURCE_DIR@" config.llvm_obj_root = "@LLVM_BINARY_DIR@" config.llvm_tools_dir = "@LLVM_TOOLS_DIR@" config.llvm_lib_dir = "@LLVM_LIBRARY_DIR@" config.llvm_shlib_dir = "@SHLIBDIR@" config.llvm_shlib_ext = "@SHLIBEXT@" config.llvm_exe_ext = "@EXEEXT@" config.lit_tools_dir = "@LLVM_LIT_TOOLS_DIR@" config.python_executable = "@PYTHON_EXECUTABLE@" config.gold_executable = "@GOLD_EXECUTABLE@" config.ld64_executable = "@LD64_EXECUTABLE@" config.ocamlfind_executable = "@OCAMLFIND@" config.have_ocamlopt = @HAVE_OCAMLOPT@ config.have_ocaml_ounit = @HAVE_OCAML_OUNIT@ config.ocaml_flags = "@OCAMLFLAGS@" config.include_go_tests = @LLVM_INCLUDE_GO_TESTS@ config.go_executable = "@GO_EXECUTABLE@" config.enable_shared = @ENABLE_SHARED@ config.enable_assertions = @ENABLE_ASSERTIONS@ config.targets_to_build = "@TARGETS_TO_BUILD@" config.native_target = "@LLVM_NATIVE_ARCH@" config.llvm_bindings = "@LLVM_BINDINGS@".split(' ') config.host_os = "@HOST_OS@" config.host_cc = "@HOST_CC@" config.host_cxx = "@HOST_CXX@" config.host_ldflags = "@HOST_LDFLAGS@" config.llvm_use_intel_jitevents = @LLVM_USE_INTEL_JITEVENTS@ config.llvm_use_sanitizer = "@LLVM_USE_SANITIZER@" config.have_zlib = @HAVE_LIBZ@ config.have_libxar = @HAVE_LIBXAR@ config.have_dia_sdk = @LLVM_ENABLE_DIA_SDK@ config.enable_ffi = @LLVM_ENABLE_FFI@ config.build_examples = @LLVM_BUILD_EXAMPLES@ config.enable_threads = @LLVM_ENABLE_THREADS@ config.build_shared_libs = @BUILD_SHARED_LIBS@ config.link_llvm_dylib = @LLVM_LINK_LLVM_DYLIB@ config.llvm_libxml2_enabled = @LLVM_LIBXML2_ENABLED@ config.llvm_host_triple = '@LLVM_HOST_TRIPLE@' config.host_arch = "@HOST_ARCH@" config.have_opt_viewer_modules = @LLVM_HAVE_OPT_VIEWER_MODULES@ +config.libcxx_used = @LLVM_LIBCXX_USED@ # Support substitution of the tools_dir with user parameters. This is # used when we can't determine the tool dir at configuration time. try: config.llvm_tools_dir = config.llvm_tools_dir % lit_config.params config.llvm_shlib_dir = config.llvm_shlib_dir % lit_config.params except KeyError: e = sys.exc_info()[1] key, = e.args lit_config.fatal("unable to find %r parameter, use '--param=%s=VALUE'" % (key,key)) import lit.llvm lit.llvm.initialize(lit_config, config) # Let the main config do the real work. lit_config.load_config(config, "@LLVM_SOURCE_DIR@/test/lit.cfg.py") diff --git a/llvm/test/tools/llvm-isel-fuzzer/aarch64-execname-options.ll b/llvm/test/tools/llvm-isel-fuzzer/aarch64-execname-options.ll index 339d7b6b8e79..2cab8c747999 100644 --- a/llvm/test/tools/llvm-isel-fuzzer/aarch64-execname-options.ll +++ b/llvm/test/tools/llvm-isel-fuzzer/aarch64-execname-options.ll @@ -1,18 +1,21 @@ ; If the binary looks up libraries using an rpath, we can't test this ; without copying the whole lib dir or polluting the build dir. ; REQUIRES: static-libs ; REQUIRES: aarch64-registered-target +; The above also applies if the binary is built with libc++. +; UNSUPPORTED: libcxx-used + ; RUN: echo > %t.input ; RUN: cp llvm-isel-fuzzer %t.bin--aarch64 ; RUN: %t.bin--aarch64 %t.input 2>&1 | FileCheck -check-prefix=AARCH64 %s ; AARCH64: Injected args: -mtriple=aarch64 ; RUN: cp llvm-isel-fuzzer %t.bin--aarch64-O1 ; RUN: %t.bin--aarch64-O1 %t.input 2>&1 | FileCheck -check-prefix=OPT-AFTER %s ; OPT-AFTER: Injected args: -mtriple=aarch64 -O1 ; RUN: cp llvm-isel-fuzzer %t.bin--O3-aarch64 ; RUN: %t.bin--O3-aarch64 %t.input 2>&1 | FileCheck -check-prefix=OPT-BEFORE %s ; OPT-BEFORE: Injected args: -O3 -mtriple=aarch64 diff --git a/llvm/test/tools/llvm-isel-fuzzer/execname-options.ll b/llvm/test/tools/llvm-isel-fuzzer/execname-options.ll index a825cb450cc5..dfce73ed2e24 100644 --- a/llvm/test/tools/llvm-isel-fuzzer/execname-options.ll +++ b/llvm/test/tools/llvm-isel-fuzzer/execname-options.ll @@ -1,19 +1,22 @@ ; If the binary looks up libraries using an rpath, we can't test this ; without copying the whole lib dir or polluting the build dir. ; REQUIRES: static-libs +; The above also applies if the binary is built with libc++. +; UNSUPPORTED: libcxx-used + ; RUN: echo > %t.input ; RUN: cp llvm-isel-fuzzer %t.bin--gisel ; RUN: not %t.bin--gisel %t.input 2>&1 | FileCheck -check-prefix=GISEL %s ; GISEL: Injected args: -global-isel -O0 ; GISEL: -mtriple must be specified ; RUN: cp llvm-isel-fuzzer %t.bin--gisel-O2 ; RUN: not %t.bin--gisel-O2 %t.input 2>&1 | FileCheck -check-prefix=GISEL-O2 %s ; GISEL-O2: Injected args: -global-isel -O0 -O2 ; GISEL-O2: -mtriple must be specified ; RUN: cp llvm-isel-fuzzer %t.bin--unexist ; RUN: not %t.bin--unexist %t.input 2>&1 | FileCheck -check-prefix=NO-OPT %s ; NO-OPT: Unknown option: diff --git a/llvm/test/tools/llvm-opt-fuzzer/exec-options.ll b/llvm/test/tools/llvm-opt-fuzzer/exec-options.ll index 569965356500..1dd0fa5c46b7 100644 --- a/llvm/test/tools/llvm-opt-fuzzer/exec-options.ll +++ b/llvm/test/tools/llvm-opt-fuzzer/exec-options.ll @@ -1,30 +1,33 @@ ; If the binary looks up libraries using an rpath, we can't test this ; without copying the whole lib dir or polluting the build dir. ; REQUIRES: static-libs ; REQUIRES: x86-registered-target +; The above also applies if the binary is built with libc++. +; UNSUPPORTED: libcxx-used + ; This test is really flaky on Windows. On Windows, executables and DLLs cannot ; be deleted or written while they are loaded. The OS unlocks the file some ; time after the process terminates, so if 'rm' runs too quickly, it will fail ; with "access denied". ; UNSUPPORTED: system-windows ; Temporary bitcode file ; RUN: opt -o %t.input %s ; RUN: cp llvm-opt-fuzzer %t.bin-- ; RUN: not %t.bin-- %t.input 2>&1 | FileCheck -check-prefix=EMPTY %s ; EMPTY: -mtriple must be specified ; RUN: cp llvm-opt-fuzzer %t.bin--x86_64 ; RUN: not %t.bin--x86_64 %t.input 2>&1 | FileCheck -check-prefix=PASSES %s ; PASSES: at least one pass should be specified ; RUN: cp llvm-opt-fuzzer %t.bin--x86_64-unknown ; RUN: not %t.bin--x86_64-unknown %t.input 2>&1 | FileCheck -check-prefix=UNKNOWN %s ; UNKNOWN: Unknown option: unknown ; RUN: cp llvm-opt-fuzzer %t.bin--x86_64-instcombine ; RUN: %t.bin--x86_64-instcombine %t.input 2>&1 | FileCheck -check-prefix=CORRECT %s ; CORRECT: Injected args: -mtriple=x86_64 -passes=instcombine ; CORRECT: Running