Add feature to determine if host architecture is 64-bit in llvm-lit

[jakehehrlich]

Summary

I have a test that I'd like to add to llvm that demands using more than 32-bits worth of address space. This test can't be run on 32-bit systems because they don't have enough address space. The host triple should be used to determine this instead of config.host_arch because on Debian systems config.host_arch is not correct. This change adds the "host-arch-is-64bit" feature to allow tests to restrict themselves to the 64-bit case.

[zturner]

test/lit.cfg.py

171 ↗

(On Diff #121023)

So if I remember correctly from discussing on IRC, HOST_ARCH is the equivalent of running uname -p, but now we're adding host-arch-is-64bit which is not a simple function of HOST_ARCH, since uname -p might return unknown.

If so, I think this is going to lead to confusion. To be honest, if HOST_ARCH is unreliable as you say, then we shouldn't be using it for anything and I would just assume deprecate it in favor of having everything be based on llvm_host_triple.

With that in mind, I think it would be better to just delete this feature.

173–175 ↗

(On Diff #121023)

This is again slightly confusing, because what does "host arch" mean? Does it mean the physical processor installed in the machine? The bitness of the OS that is running? Or the bitness of the LLVM toolchain that is running? In this case it's the latter (the bitness of the LLVM toolchain that is running), so can we call this "llvm-64-bits" or something to make it more clear what this feature actually represents?

Also, as a minor nit, I think it would be slightly more pythonic to write this as:

known_arches = ["x86_64", "mips64", "ppc64", "aarch64"]
if any(config.llvm_host_triple.startswith(x) for x in known_arches):
  config.available_features.add("llvm-64-bits")

[jakehehrlich]

1. Deleted config.host_arch as a feature
2. Changed host-arch-is64bit to llvm-64-bits
3. Changed code to by more idiomatic as pointed out by Zach

[zturner]

I actually think that the llvm-64-bits feature should go in the common config.py setup, but I don't think we're quite there yet. It would require some additional work to make sure everyone who uses LLVM can agree on a common set of variables that must be passed in through configure, and currently we don't have that.

So I think this is good for now, and maybe in the future I'll try to generalize it a bit so this can be moved into config.py

llvm/trunk/test/lit.cfg.py

 # 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 any(config.llvm_host_triple.startswith(x) for x in known_arches):
+  config.available_features.add("llvm-64-bits")
 
 # 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.

llvm/trunk/test/lit.site.cfg.py.in

 config.go_executable = "@GO_EXECUTABLE@"
 config.enable_shared = @ENABLE_SHARED@
 config.enable_assertions = @ENABLE_ASSERTIONS@
 config.enable_abi_breaking_checks = "@LLVM_ENABLE_ABI_BREAKING_CHECKS@"
 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_arch = "@HOST_ARCH@"
 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_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@'
 
 # 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))
 
 @LIT_SITE_CFG_IN_FOOTER@
 
 # Let the main config do the real work.
 lit_config.load_config(config, "@LLVM_SOURCE_DIR@/test/lit.cfg.py")