This is an archive of the discontinued LLVM Phabricator instance.

Differential D138975

[perf-training] Support additional test suffixes
ClosedPublic

Authored by phosek on Nov 29 2022, 7:13 PM.

Details

Reviewers
smeenai
Commits
rG78acf911eddd: [perf-training] Support additional test suffixes
Summary

.cc and .test are commonly used and supported by other lit test suites.

Diff Detail

Event Timeline

phosek created this revision.Nov 29 2022, 7:13 PM
Herald added a project: Restricted Project. · View Herald TranscriptNov 29 2022, 7:13 PM
phosek requested review of this revision.Nov 29 2022, 7:13 PM
Herald added a project: Restricted Project. · View Herald TranscriptNov 29 2022, 7:13 PM
Herald added a subscriber: cfe-commits. · View Herald Transcript
smeenai accepted this revision.Nov 29 2022, 7:14 PM

LGTM

This revision is now accepted and ready to land.Nov 29 2022, 7:14 PM
Harbormaster completed remote builds in B200160: Diff 478786.Nov 29 2022, 8:16 PM
Closed by commit rG78acf911eddd: [perf-training] Support additional test suffixes (authored by phosek). · Explain WhyNov 29 2022, 9:37 PM
This revision was automatically updated to reflect the committed changes.
phosek added a commit: rG78acf911eddd: [perf-training] Support additional test suffixes.

Revision Contents

PathSize
clang/
utils/
perf-training/
2 lines
2 lines

Diff 478800

clang/utils/perf-training/lit.cfg

Show All 19 Lines if 'darwin' in config.target_triple:
return '-isysroot %s' % sdk_path return '-isysroot %s' % sdk_path
return '' return ''
sysroot_flags = getSysrootFlagsOnDarwin(config, lit_config) sysroot_flags = getSysrootFlagsOnDarwin(config, lit_config)
config.clang = lit.util.which('clang', config.clang_tools_dir).replace('\\', '/') config.clang = lit.util.which('clang', config.clang_tools_dir).replace('\\', '/')
config.name = 'Clang Perf Training' config.name = 'Clang Perf Training'
config.suffixes = ['.c', '.cpp', '.m', '.mm', '.cu', '.ll', '.cl', '.s', '.S', '.modulemap'] config.suffixes = ['.c', '.cc', '.cpp', '.m', '.mm', '.cu', '.ll', '.cl', '.s', '.S', '.modulemap', '.test']
cc1_wrapper = '%s %s/perf-helper.py cc1' % (config.python_exe, config.perf_helper_dir) cc1_wrapper = '%s %s/perf-helper.py cc1' % (config.python_exe, config.perf_helper_dir)
use_lit_shell = os.environ.get("LIT_USE_INTERNAL_SHELL") use_lit_shell = os.environ.get("LIT_USE_INTERNAL_SHELL")
config.test_format = lit.formats.ShTest(use_lit_shell == "0") config.test_format = lit.formats.ShTest(use_lit_shell == "0")
config.substitutions.append( ('%clang_cpp_skip_driver', ' %s %s %s ' % (cc1_wrapper, config.clang, sysroot_flags))) config.substitutions.append( ('%clang_cpp_skip_driver', ' %s %s %s ' % (cc1_wrapper, config.clang, sysroot_flags)))
config.substitutions.append( ('%clang_cpp', ' %s --driver-mode=g++ %s ' % (config.clang, sysroot_flags))) config.substitutions.append( ('%clang_cpp', ' %s --driver-mode=g++ %s ' % (config.clang, sysroot_flags)))
config.substitutions.append( ('%clang_skip_driver', ' %s %s %s ' % (cc1_wrapper, config.clang, sysroot_flags))) config.substitutions.append( ('%clang_skip_driver', ' %s %s %s ' % (cc1_wrapper, config.clang, sysroot_flags)))
config.substitutions.append( ('%clang', ' %s %s ' % (config.clang, sysroot_flags) ) ) config.substitutions.append( ('%clang', ' %s %s ' % (config.clang, sysroot_flags) ) )
config.substitutions.append( ('%test_root', config.test_exec_root ) ) config.substitutions.append( ('%test_root', config.test_exec_root ) )
config.environment['LLVM_PROFILE_FILE'] = 'perf-training-%4m.profraw' config.environment['LLVM_PROFILE_FILE'] = 'perf-training-%4m.profraw'

clang/utils/perf-training/order-files.lit.cfg

Show All 20 Lines if 'darwin' in config.target_triple:
return '-isysroot %s' % sdk_path return '-isysroot %s' % sdk_path
return '' return ''
sysroot_flags = getSysrootFlagsOnDarwin(config, lit_config) sysroot_flags = getSysrootFlagsOnDarwin(config, lit_config)
config.clang = os.path.realpath(lit.util.which('clang', config.clang_tools_dir)).replace('\\', '/') config.clang = os.path.realpath(lit.util.which('clang', config.clang_tools_dir)).replace('\\', '/')
config.name = 'Clang Perf Training' config.name = 'Clang Perf Training'
config.suffixes = ['.c', '.cpp', '.m', '.mm', '.cu', '.ll', '.cl', '.s', '.S', '.modulemap'] config.suffixes = ['.c', '.cc', '.cpp', '.m', '.mm', '.cu', '.ll', '.cl', '.s', '.S', '.modulemap', '.test']
dtrace_wrapper = '%s %s/perf-helper.py dtrace' % (config.python_exe, config.perf_helper_dir) dtrace_wrapper = '%s %s/perf-helper.py dtrace' % (config.python_exe, config.perf_helper_dir)
dtrace_wrapper_cc1 = '%s %s/perf-helper.py dtrace --cc1' % (config.python_exe, config.perf_helper_dir) dtrace_wrapper_cc1 = '%s %s/perf-helper.py dtrace --cc1' % (config.python_exe, config.perf_helper_dir)
if 'darwin' in config.target_triple: if 'darwin' in config.target_triple:
lit_config.note('using DTrace oneshot probe') lit_config.note('using DTrace oneshot probe')
dtrace_wrapper = '%s --use-oneshot' % dtrace_wrapper dtrace_wrapper = '%s --use-oneshot' % dtrace_wrapper
dtrace_wrapper_cc1 = '%s --use-oneshot' % dtrace_wrapper_cc1 dtrace_wrapper_cc1 = '%s --use-oneshot' % dtrace_wrapper_cc1
Show All 9 Lines