This is an archive of the discontinued LLVM Phabricator instance.

Differential D134871

[llvm] [lit] Move %clang_dxc substitution from clang/test
ClosedPublic

Authored by mgorny on Sep 29 2022, 4:10 AM.

Details

Reviewers
python3kgae
beanz
MaskRay
zturner
Commits
rG74085ebfb68e: [llvm] [lit] Move %clang_dxc substitution from clang/test
Summary

Move the %clang_dxc substitution from local definition in clang/test
to lit's llvm/config.py module where all other driver definitions
are found. This improves consistency and makes it easier to control
global clang options.

Diff Detail

Event Timeline

mgorny created this revision.Sep 29 2022, 4:10 AM
Herald added a project: Restricted Project. · View Herald TranscriptSep 29 2022, 4:10 AM
Herald added subscribers: StephenFan, delcypher. · View Herald Transcript
mgorny requested review of this revision.Sep 29 2022, 4:10 AM
Herald added a project: Restricted Project. · View Herald TranscriptSep 29 2022, 4:10 AM
Harbormaster completed remote builds in B189372: Diff 463843.Sep 29 2022, 5:16 AM
python3kgae accepted this revision.Sep 29 2022, 7:53 AM

LGTM.
Thanks for the fix.

This revision is now accepted and ready to land.Sep 29 2022, 7:53 AM
This revision was landed with ongoing or failed builds.Sep 29 2022, 12:00 PM
Closed by commit rG74085ebfb68e: [llvm] [lit] Move %clang_dxc substitution from clang/test (authored by mgorny). · Explain Why
This revision was automatically updated to reflect the committed changes.
mgorny added a commit: rG74085ebfb68e: [llvm] [lit] Move %clang_dxc substitution from clang/test.
Herald added a project: Restricted Project. · View Herald TranscriptSep 29 2022, 12:00 PM

Revision Contents

PathSize
clang/
test/
2 lines
llvm/
utils/
lit/
lit/
llvm/
2 lines

Diff 463984

clang/test/lit.cfg.py

Show First 20 Lines • Show All 57 Lines • ▼ Show 20 Lines
# tools that might happen to be in the user's PATH. # tools that might happen to be in the user's PATH.
tool_dirs = [config.clang_tools_dir, config.llvm_tools_dir] tool_dirs = [config.clang_tools_dir, config.llvm_tools_dir]
tools = [ tools = [
'apinotes-test', 'c-index-test', 'clang-diff', 'clang-format', 'clang-repl', 'clang-offload-packager', 'apinotes-test', 'c-index-test', 'clang-diff', 'clang-format', 'clang-repl', 'clang-offload-packager',
'clang-tblgen', 'clang-scan-deps', 'opt', 'llvm-ifs', 'yaml2obj', 'clang-linker-wrapper', 'clang-tblgen', 'clang-scan-deps', 'opt', 'llvm-ifs', 'yaml2obj', 'clang-linker-wrapper',
ToolSubst('%clang_extdef_map', command=FindTool( ToolSubst('%clang_extdef_map', command=FindTool(
'clang-extdef-mapping'), unresolved='ignore'), 'clang-extdef-mapping'), unresolved='ignore'),
ToolSubst('%clang_dxc', command=config.clang,
extra_args=['--driver-mode=dxc']),
] ]
if config.clang_examples: if config.clang_examples:
config.available_features.add('examples') config.available_features.add('examples')
def have_host_jit_feature_support(feature_name): def have_host_jit_feature_support(feature_name):
clang_repl_exe = lit.util.which('clang-repl', config.clang_tools_dir) clang_repl_exe = lit.util.which('clang-repl', config.clang_tools_dir)
▲ Show 20 Lines • Show All 213 Lines • Show Last 20 Lines

llvm/utils/lit/lit/llvm/config.py

Show First 20 Lines • Show All 538 Lines • ▼ Show 20 Lines def use_clang(self, additional_tool_dirs=[], additional_flags=[],
ToolSubst('%clang_cc1', command=self.config.clang, ToolSubst('%clang_cc1', command=self.config.clang,
extra_args=['-cc1', '-internal-isystem', extra_args=['-cc1', '-internal-isystem',
builtin_include_dir, '-nostdsysteminc'] + builtin_include_dir, '-nostdsysteminc'] +
additional_flags), additional_flags),
ToolSubst('%clang_cpp', command=self.config.clang, ToolSubst('%clang_cpp', command=self.config.clang,
extra_args=['--driver-mode=cpp']+additional_flags), extra_args=['--driver-mode=cpp']+additional_flags),
ToolSubst('%clang_cl', command=self.config.clang, ToolSubst('%clang_cl', command=self.config.clang,
extra_args=['--driver-mode=cl']+additional_flags), extra_args=['--driver-mode=cl']+additional_flags),
ToolSubst('%clang_dxc', command=self.config.clang,
extra_args=['--driver-mode=dxc']+additional_flags),
ToolSubst('%clangxx', command=self.config.clang, ToolSubst('%clangxx', command=self.config.clang,
extra_args=['--driver-mode=g++']+additional_flags), extra_args=['--driver-mode=g++']+additional_flags),
] ]
self.add_tool_substitutions(tool_substitutions) self.add_tool_substitutions(tool_substitutions)
self.config.substitutions.append( self.config.substitutions.append(
('%resource_dir', builtin_include_dir)) ('%resource_dir', builtin_include_dir))
self.config.substitutions.append( self.config.substitutions.append(
▲ Show 20 Lines • Show All 128 Lines • Show Last 20 Lines