Skip to content

Commit

Permalink
Don't try to run MCJIT/OrcJIT EH tests when C++ library is statically…
Browse files Browse the repository at this point in the history
… linked

These tests assumes availability of external symbols provided by the
C++ library, but those won't be available in case when the C++ library
is statically linked because lli itself doesn't need these.

This uses llvm-readobj -needed-libs to check if C++ library is linked as
shared library and exposes that information as a feature to lit.

Differential Revision: https://reviews.llvm.org/D41272

git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@321981 91177308-0d34-0410-b5e6-96231b3b80d8
  • Loading branch information
petrhosek committed Jan 8, 2018
1 parent fbe3e1c commit b10b158
Show file tree
Hide file tree
Showing 9 changed files with 38 additions and 0 deletions.
1 change: 1 addition & 0 deletions test/ExecutionEngine/MCJIT/eh-lg-pic.ll
Original file line number Diff line number Diff line change
@@ -1,3 +1,4 @@
; REQUIRES: cxx-shared-library
; RUN: %lli -relocation-model=pic -code-model=large %s
; XFAIL: cygwin, win32, mingw, mips-, mipsel-, i686, i386, aarch64, arm
declare i8* @__cxa_allocate_exception(i64)
Expand Down
1 change: 1 addition & 0 deletions test/ExecutionEngine/MCJIT/eh.ll
Original file line number Diff line number Diff line change
@@ -1,3 +1,4 @@
; REQUIRES: cxx-shared-library
; RUN: %lli %s
; XFAIL: arm, cygwin, win32, mingw
declare i8* @__cxa_allocate_exception(i64)
Expand Down
1 change: 1 addition & 0 deletions test/ExecutionEngine/MCJIT/multi-module-eh-a.ll
Original file line number Diff line number Diff line change
@@ -1,3 +1,4 @@
; REQUIRES: cxx-shared-library
; RUN: %lli -extra-module=%p/Inputs/multi-module-eh-b.ll %s
; XFAIL: arm, cygwin, win32, mingw
declare i8* @__cxa_allocate_exception(i64)
Expand Down
1 change: 1 addition & 0 deletions test/ExecutionEngine/MCJIT/remote/eh.ll
Original file line number Diff line number Diff line change
@@ -1,3 +1,4 @@
; REQUIRES: cxx-shared-library
; RUN: %lli -remote-mcjit -mcjit-remote-process=lli-child-target%exeext %s
; XFAIL: arm, cygwin, win32, mingw
; UNSUPPORTED: powerpc64-unknown-linux-gnu
Expand Down
1 change: 1 addition & 0 deletions test/ExecutionEngine/OrcMCJIT/eh-lg-pic.ll
Original file line number Diff line number Diff line change
@@ -1,3 +1,4 @@
; REQUIRES: cxx-shared-library
; RUN: %lli -jit-kind=orc-mcjit -relocation-model=pic -code-model=large %s
; XFAIL: cygwin, win32, mingw, mips-, mipsel-, i686, i386, aarch64, arm
declare i8* @__cxa_allocate_exception(i64)
Expand Down
1 change: 1 addition & 0 deletions test/ExecutionEngine/OrcMCJIT/eh.ll
Original file line number Diff line number Diff line change
@@ -1,3 +1,4 @@
; REQUIRES: cxx-shared-library
; RUN: %lli -jit-kind=orc-mcjit %s
; XFAIL: arm, cygwin, win32, mingw
declare i8* @__cxa_allocate_exception(i64)
Expand Down
1 change: 1 addition & 0 deletions test/ExecutionEngine/OrcMCJIT/multi-module-eh-a.ll
Original file line number Diff line number Diff line change
@@ -1,3 +1,4 @@
; REQUIRES: cxx-shared-library
; RUN: %lli -jit-kind=orc-mcjit -extra-module=%p/Inputs/multi-module-eh-b.ll %s
; XFAIL: arm, cygwin, win32, mingw
declare i8* @__cxa_allocate_exception(i64)
Expand Down
1 change: 1 addition & 0 deletions test/ExecutionEngine/OrcMCJIT/remote/eh.ll
Original file line number Diff line number Diff line change
@@ -1,3 +1,4 @@
; REQUIRES: cxx-shared-library
; RUN: %lli -remote-mcjit -mcjit-remote-process=lli-child-target%exeext %s
; XFAIL: arm, cygwin, win32, mingw
; UNSUPPORTED: powerpc64-unknown-linux-gnu
Expand Down
30 changes: 30 additions & 0 deletions test/lit.cfg.py
Original file line number Diff line number Diff line change
Expand Up @@ -194,6 +194,36 @@ def get_asan_rtlib():
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')

# Direct object generation
if not 'hexagon' in config.target_triple:
config.available_features.add('object-emission')
Expand Down

0 comments on commit b10b158

Please sign in to comment.