[polly] r313407 - Resubmit "[lit] Force site configs to run before source-tree configs"
Zachary Turner via llvm-commits
llvm-commits at lists.llvm.org
Fri Sep 15 15:10:47 PDT 2017
Author: zturner
Date: Fri Sep 15 15:10:46 2017
New Revision: 313407
URL: http://llvm.org/viewvc/llvm-project?rev=313407&view=rev
Log:
Resubmit "[lit] Force site configs to run before source-tree configs"
This is a resubmission of r313270. It broke standalone builds of
compiler-rt because we were not correctly generating the llvm-lit
script in the standalone build directory.
The fixes incorporated here attempt to find llvm/utils/llvm-lit
from the source tree returned by llvm-config. If present, it
will generate llvm-lit into the output directory. Regardless,
the user can specify -DLLVM_EXTERNAL_LIT to point to a specific
lit.py on their file system. This supports the use case of
someone installing lit via a package manager. If it cannot find
a source tree, and -DLLVM_EXTERNAL_LIT is either unspecified or
invalid, then we print a warning that tests will not be able
to run.
Differential Revision: https://reviews.llvm.org/D37756
Modified:
polly/trunk/test/Unit/lit.cfg
polly/trunk/test/lit.cfg
Modified: polly/trunk/test/Unit/lit.cfg
URL: http://llvm.org/viewvc/llvm-project/polly/trunk/test/Unit/lit.cfg?rev=313407&r1=313406&r2=313407&view=diff
==============================================================================
--- polly/trunk/test/Unit/lit.cfg (original)
+++ polly/trunk/test/Unit/lit.cfg Fri Sep 15 15:10:46 2017
@@ -19,14 +19,11 @@ config.suffixes = []
# test_source_root: The root path where tests are located.
# test_exec_root: The root path where tests should be run.
-polly_obj_root = getattr(config, 'polly_obj_root', None)
-if polly_obj_root is not None:
- config.test_exec_root = os.path.join(polly_obj_root, 'unittests')
- config.test_source_root = config.test_exec_root
+config.test_exec_root = os.path.join(config.polly_obj_root, 'unittests')
+config.test_source_root = config.test_exec_root
# testFormat: The test format to use to interpret tests.
-llvm_build_mode = getattr(config, 'llvm_build_mode', "Debug")
-config.test_format = lit.formats.GoogleTest(llvm_build_mode, 'Tests')
+config.test_format = lit.formats.GoogleTest(config.llvm_build_mode, 'Tests')
# Propagate the temp directory. Windows requires this because it uses \Windows\
# if none of these are present.
@@ -40,55 +37,6 @@ for symbolizer in ['ASAN_SYMBOLIZER_PATH
if symbolizer in os.environ:
config.environment[symbolizer] = os.environ[symbolizer]
-###
-
-# Check that the object root is known.
-if config.test_exec_root is None:
- # Otherwise, we haven't loaded the site specific configuration (the user is
- # probably trying to run on a test file directly, and either the site
- # configuration hasn't been created by the build system, or we are in an
- # out-of-tree build situation).
-
- # Check for 'polly_unit_site_config' user parameter, and use that if available.
- site_cfg = lit_config.params.get('polly_unit_site_config', None)
- if site_cfg and os.path.exists(site_cfg):
- lit_config.load_config(config, site_cfg)
- raise SystemExit
-
- # Try to detect the situation where we are using an out-of-tree build by
- # looking for 'llvm-config'.
- #
- # FIXME: I debated (i.e., wrote and threw away) adding logic to
- # automagically generate the lit.site.cfg if we are in some kind of fresh
- # build situation. This means knowing how to invoke the build system
- # though, and I decided it was too much magic.
-
- llvm_config = lit.util.which('llvm-config', config.environment['PATH'])
- if not llvm_config:
- lit_config.fatal('No site specific configuration available!')
-
- # Get the source and object roots.
- llvm_src_root = lit.util.capture(['llvm-config', '--src-root']).strip()
- llvm_obj_root = lit.util.capture(['llvm-config', '--obj-root']).strip()
- polly_src_root = os.path.join(llvm_src_root, "tools", "polly")
- polly_obj_root = os.path.join(llvm_obj_root, "tools", "polly")
-
- # Validate that we got a tree which points to here, using the standard
- # tools/clang layout.
- this_src_root = os.path.join(os.path.dirname(__file__),'..','..')
- if os.path.realpath(polly_src_root) != os.path.realpath(this_src_root):
- lit_config.fatal('No site specific configuration available!')
-
- # Check that the site specific configuration exists.
- site_cfg = os.path.join(polly_obj_root, 'test', 'Unit', 'lit.site.cfg')
- if not os.path.exists(site_cfg):
- lit_config.fatal('No site specific configuration available!')
-
- # Okay, that worked. Notify the user of the automagic, and reconfigure.
- lit_config.note('using out-of-tree build at %r' % polly_obj_root)
- lit_config.load_config(config, site_cfg)
- raise SystemExit
-
shlibpath_var = ''
if platform.system() == 'Linux':
shlibpath_var = 'LD_LIBRARY_PATH'
@@ -98,10 +46,7 @@ elif platform.system() == 'Windows':
shlibpath_var = 'PATH'
# Point the dynamic loader at dynamic libraries in 'lib'.
-llvm_libs_dir = getattr(config, 'llvm_libs_dir', None)
-if not llvm_libs_dir:
- lit_config.fatal('No LLVM libs dir set!')
-shlibpath = os.path.pathsep.join((llvm_libs_dir,
+shlibpath = os.path.pathsep.join((config.llvm_libs_dir,
config.environment.get(shlibpath_var,'')))
# Win32 seeks DLLs along %PATH%.
Modified: polly/trunk/test/lit.cfg
URL: http://llvm.org/viewvc/llvm-project/polly/trunk/test/lit.cfg?rev=313407&r1=313406&r2=313407&view=diff
==============================================================================
--- polly/trunk/test/lit.cfg (original)
+++ polly/trunk/test/lit.cfg Fri Sep 15 15:10:46 2017
@@ -27,90 +27,25 @@ config.suffixes = ['.ll']
config.test_source_root = os.path.dirname(__file__)
# test_exec_root: The root path where tests should be run.
-polly_obj_root = getattr(config, 'polly_obj_root', None)
-if polly_obj_root is not None:
- config.test_exec_root = os.path.join(polly_obj_root, 'test')
-
-# Set llvm_{src,obj}_root for use by others.
-config.llvm_src_root = getattr(config, 'llvm_src_root', None)
-config.llvm_obj_root = getattr(config, 'llvm_obj_root', None)
+config.test_exec_root = os.path.join(config.polly_obj_root, 'test')
# Tweak the PATH to include the tools dir and the scripts dir.
-if polly_obj_root is not None:
- llvm_tools_dir = getattr(config, 'llvm_tools_dir', None)
- if not llvm_tools_dir:
- lit_config.fatal('No LLVM tools dir set!')
- extra_paths = getattr(config, 'extra_paths', [])
- base_paths = [llvm_tools_dir, config.environment['PATH']]
- path = os.path.pathsep.join(base_paths + extra_paths)
- config.environment['PATH'] = path
-
- llvm_libs_dir = getattr(config, 'llvm_libs_dir', None)
- if not llvm_libs_dir:
- lit_config.fatal('No LLVM libs dir set!')
- path = os.path.pathsep.join((llvm_libs_dir,
- config.environment.get('LD_LIBRARY_PATH','')))
- config.environment['LD_LIBRARY_PATH'] = path
-
-###
-
-# Check that the object root is known.
-if config.test_exec_root is None:
- # Otherwise, we haven't loaded the site specific configuration (the user is
- # probably trying to run on a test file directly, and either the site
- # configuration hasn't been created by the build system, or we are in an
- # out-of-tree build situation).
-
- # Check for 'polly_site_config' user parameter, and use that if available.
- site_cfg = lit_config.params.get('polly_site_config', None)
- if site_cfg and os.path.exists(site_cfg):
- lit_config.load_config(config, site_cfg)
- raise SystemExit
-
- # Try to detect the situation where we are using an out-of-tree build by
- # looking for 'llvm-config'.
- #
- # FIXME: I debated (i.e., wrote and threw away) adding logic to
- # automagically generate the lit.site.cfg if we are in some kind of fresh
- # build situation. This means knowing how to invoke the build system though,
- # and I decided it was too much magic. We should solve this by just having
- # the .cfg files generated during the configuration step.
-
- llvm_config = lit.util.which('llvm-config', config.environment['PATH'])
- if not llvm_config:
- lit_config.fatal('No site specific configuration available!')
-
- # Get the source and object roots.
- llvm_src_root = subprocess.check_output(['llvm-config', '--src-root']).decode("utf-8").strip()
- llvm_obj_root = subprocess.check_output(['llvm-config', '--obj-root']).decode("utf-8").strip()
-
- polly_src_root = os.path.join(llvm_src_root, "tools", "polly")
- polly_obj_root = os.path.join(llvm_obj_root, "tools", "polly")
-
- # Validate that we got a tree which points to here, using the standard
- # tools/polly layout.
- this_src_root = os.path.dirname(config.test_source_root)
- if os.path.realpath(polly_src_root) != os.path.realpath(this_src_root):
- lit_config.fatal('No site specific configuration available!')
-
- # Check that the site specific configuration exists.
- site_cfg = os.path.join(polly_obj_root, 'test', 'lit.site.cfg')
- if not os.path.exists(site_cfg):
- lit_config.fatal('No site specific configuration available!')
-
- # Okay, that worked. Notify the user of the automagic, and reconfigure.
- lit_config.note('using out-of-tree build at %r' % polly_obj_root)
- lit_config.load_config(config, site_cfg)
- raise SystemExit
+base_paths = [config.llvm_tools_dir, config.environment['PATH']]
+path = os.path.pathsep.join(base_paths + config.extra_paths)
+config.environment['PATH'] = path
+
+path = os.path.pathsep.join((config.llvm_libs_dir,
+ config.environment.get('LD_LIBRARY_PATH','')))
+config.environment['LD_LIBRARY_PATH'] = path
# opt knows whether it is compiled with -DNDEBUG.
import subprocess
try:
- opt_cmd = subprocess.Popen([os.path.join(llvm_tools_dir, 'opt'), '-version'],
+ opt_cmd = subprocess.Popen([os.path.join(config.llvm_tools_dir, 'opt'), '-version'],
stdout = subprocess.PIPE,
env=config.environment)
except OSError:
- print("Could not find opt in " + llvm_tools_dir)
+ print("Could not find opt in " + config.llvm_tools_dir)
exit(42)
if re.search(r'with assertions', opt_cmd.stdout.read().decode('ascii')):
@@ -118,13 +53,14 @@ if re.search(r'with assertions', opt_cmd
opt_cmd.wait()
try:
- llvm_config_cmd = subprocess.Popen([os.path.join(llvm_tools_dir,
- 'llvm-config'),
+ llvm_config_cmd = subprocess.Popen([os.path.join(
+ config.llvm_tools_dir,
+ 'llvm-config'),
'--targets-built'],
stdout = subprocess.PIPE,
env=config.environment)
except OSError:
- print("Could not find llvm-config in " + llvm_tools_dir)
+ print("Could not find llvm-config in " + config.llvm_tools_dir)
exit(42)
if re.search(r'NVPTX', llvm_config_cmd.stdout.read().decode('ascii')):
More information about the llvm-commits
mailing list