[PATCH] D122498: [BOLT][test] Enable cross-target testing

[Maksim Panchenko via Phabricator via llvm-commits]

maksfb updated this revision to Diff 420381.
maksfb edited the summary of this revision.
maksfb added a comment.

Rebase


Repository:
  rG LLVM Github Monorepo

CHANGES SINCE LAST ACTION
  https://reviews.llvm.org/D122498/new/

https://reviews.llvm.org/D122498

Files:
  bolt/test/AArch64/lit.local.cfg
  bolt/test/X86/lit.local.cfg
  bolt/test/lit.cfg.py
  bolt/test/lit.site.cfg.py.in


Index: bolt/test/lit.site.cfg.py.in
===================================================================
--- bolt/test/lit.site.cfg.py.in
+++ bolt/test/lit.site.cfg.py.in
@@ -21,6 +21,7 @@
 config.python_executable = "@PYTHON_EXECUTABLE@"
 config.bolt_clang = "@BOLT_CLANG_EXE@"
 config.bolt_lld = "@BOLT_LLD_EXE@"
+config.targets_to_build = "@TARGETS_TO_BUILD@"
 
 import lit.llvm
 lit.llvm.initialize(lit_config, config)
Index: bolt/test/lit.cfg.py
===================================================================
--- bolt/test/lit.cfg.py
+++ bolt/test/lit.cfg.py
@@ -102,3 +102,5 @@
      ('--cxxflags', {r'-D_GLIBCXX_DEBUG\b': 'libstdcxx-safe-mode'}),
         ('--targets-built', calculate_arch_features)
      ])
+
+config.targets = frozenset(config.targets_to_build.split())
Index: bolt/test/X86/lit.local.cfg
===================================================================
--- bolt/test/X86/lit.local.cfg
+++ bolt/test/X86/lit.local.cfg
@@ -1,4 +1,4 @@
-if config.host_arch not in ['x86', 'X86', 'x86_64']:
+if not 'X86' in config.root.targets:
     config.unsupported = True
 
 config.substitutions.insert(
Index: bolt/test/AArch64/lit.local.cfg
===================================================================
--- bolt/test/AArch64/lit.local.cfg
+++ bolt/test/AArch64/lit.local.cfg
@@ -1,4 +1,4 @@
-if config.host_arch not in ['aarch64']:
+if 'AArch64' not in config.root.targets:
     config.unsupported = True
 
 config.substitutions.insert(


-------------- next part --------------
A non-text attachment was scrubbed...
Name: D122498.420381.patch
Type: text/x-patch
Size: 1463 bytes
Desc: not available
URL: <http://lists.llvm.org/pipermail/llvm-commits/attachments/20220405/ab3e14b3/attachment.bin>