This is an archive of the discontinued LLVM Phabricator instance.

Differential D63145

[NFC] Improve triple match of scripts that update tests
ClosedPublic

Authored by dnsampaio on Jun 11 2019, 9:28 AM.

Details

Reviewers
lebedev.ri
RKSimon
MaskRay
gbedwell
Commits
rG0265716b272d: [NFC] Improve triple match of scripts that update tests
rL363656: [NFC] Improve triple match of scripts that update tests
Summary

The prior behavior of the triple matcher would stop
in the first matched triple. It was not possible to
create specific matches for sub-sets of a triple
(e.g aarch64-apple-darwin would never be used after
aarch64 was matched).

This patch:

  1. Allows that specialized triples take priority,

considering that the string lenght of the triple
indentifies how specialized a triple is. If two
triples of same lenght match, the one matched first
prevails, preserving the old behavior.

  1. Remove 20 duplicated triples of arm, thumb,

aarch64 options with same arguments, matching
the common prefix (aarch64, arm, thumb) of them.

  1. Creates three new function matching regexes and

five triple options for arm64-apple-ios,
(arm|thumb)-apple-ios and thumb(v5)?-macho

Diff Detail

Event Timeline

dnsampaio created this revision.Jun 11 2019, 9:28 AM
Herald added a project: Restricted Project. · View Herald TranscriptJun 11 2019, 9:28 AM
Herald added subscribers: llvm-commits, kristof.beyls, javed.absar. · View Herald Transcript
Harbormaster completed remote builds in B33209: Diff 204087.Jun 11 2019, 9:30 AM
lebedev.ri added a reviewer: RKSimon.Jun 11 2019, 9:33 AM
RKSimon added reviewers: MaskRay, gbedwell.Jun 15 2019, 6:43 AM

The logic looks fine, but somebody who knows python might know a better way to do this?

MaskRay added inline comments.Jun 15 2019, 9:56 PM
utils/UpdateTestChecks/asm.py
322

Single quotes to be consistent with other strings in this file.

328

is None

dnsampaio updated this revision to Diff 205277.Jun 18 2019, 2:35 AM

Fixed inline requests

Harbormaster completed remote builds in B33541: Diff 205277.Jun 18 2019, 2:35 AM
MaskRay accepted this revision.Jun 18 2019, 2:50 AM
This revision is now accepted and ready to land.Jun 18 2019, 2:50 AM
Closed by commit rL363656: [NFC] Improve triple match of scripts that update tests (authored by dnsampaio). · Explain WhyJun 18 2019, 3:01 AM
This revision was automatically updated to reflect the committed changes.

Revision Contents

PathSize
utils/
UpdateTestChecks/
69 lines

Diff 204087

utils/UpdateTestChecks/asm.py

Show First 20 Lines • Show All 90 Lines • ▼ Show 20 Lines
ASM_FUNCTION_SYSTEMZ_RE = re.compile( ASM_FUNCTION_SYSTEMZ_RE = re.compile(
r'^_?(?P<func>[^:]+):[ \t]*#+[ \t]*@(?P=func)\n' r'^_?(?P<func>[^:]+):[ \t]*#+[ \t]*@(?P=func)\n'
r'[ \t]+.cfi_startproc\n' r'[ \t]+.cfi_startproc\n'
r'(?P<body>.*?)\n' r'(?P<body>.*?)\n'
r'.Lfunc_end[0-9]+:\n', r'.Lfunc_end[0-9]+:\n',
flags=(re.M | re.S)) flags=(re.M | re.S))
ASM_FUNCTION_AARCH64_DARWIN_RE = re.compile(
r'^_(?P<func>[^:]+):[ \t]*;[ \t]@(?P=func)\n'
r'([ \t]*.cfi_startproc\n[\s]*)?'
r'(?P<body>.*?)'
r'([ \t]*.cfi_endproc\n[\s]*)?'
r'^[ \t]*;[ \t]--[ \t]End[ \t]function',
flags=(re.M | re.S))
ASM_FUNCTION_ARM_MACHO_RE = re.compile(
r'^_(?P<func>[^:]+):[ \t]*\n'
r'([ \t]*.cfi_startproc\n[ \t]*)?'
r'(?P<body>.*?)\n'
r'[ \t]*\.cfi_endproc\n',
flags=(re.M | re.S))
ASM_FUNCTION_ARM_IOS_RE = re.compile(
r'^_(?P<func>[^:]+):[ \t]*\n'
r'^Lfunc_begin(?P<id>[0-9][1-9]*):\n'
r'(?P<body>.*?)'
r'^Lfunc_end(?P=id):\n'
r'^[ \t]*@[ \t]--[ \t]End[ \t]function',
flags=(re.M | re.S))
ASM_FUNCTION_WASM32_RE = re.compile( ASM_FUNCTION_WASM32_RE = re.compile(
r'^_?(?P<func>[^:]+):[ \t]*#+[ \t]*@(?P=func)\n' r'^_?(?P<func>[^:]+):[ \t]*#+[ \t]*@(?P=func)\n'
r'(?P<body>.*?)\n' r'(?P<body>.*?)\n'
r'.Lfunc_end[0-9]+:\n', r'.Lfunc_end[0-9]+:\n',
flags=(re.M | re.S)) flags=(re.M | re.S))
SCRUB_LOOP_COMMENT_RE = re.compile( SCRUB_LOOP_COMMENT_RE = re.compile(
▲ Show 20 Lines • Show All 158 Lines • ▼ Show 20 Linesdef get_triple_from_march(march):
return 'x86' return 'x86'
def build_function_body_dictionary_for_triple(args, raw_tool_output, triple, prefixes, func_dict): def build_function_body_dictionary_for_triple(args, raw_tool_output, triple, prefixes, func_dict):
target_handlers = { target_handlers = {
'x86_64': (scrub_asm_x86, ASM_FUNCTION_X86_RE), 'x86_64': (scrub_asm_x86, ASM_FUNCTION_X86_RE),
'i686': (scrub_asm_x86, ASM_FUNCTION_X86_RE), 'i686': (scrub_asm_x86, ASM_FUNCTION_X86_RE),
'x86': (scrub_asm_x86, ASM_FUNCTION_X86_RE), 'x86': (scrub_asm_x86, ASM_FUNCTION_X86_RE),
'i386': (scrub_asm_x86, ASM_FUNCTION_X86_RE), 'i386': (scrub_asm_x86, ASM_FUNCTION_X86_RE),
'arm64-eabi': (scrub_asm_arm_eabi, ASM_FUNCTION_AARCH64_RE),
'aarch64': (scrub_asm_arm_eabi, ASM_FUNCTION_AARCH64_RE), 'aarch64': (scrub_asm_arm_eabi, ASM_FUNCTION_AARCH64_RE),
'aarch64-apple-darwin': (scrub_asm_arm_eabi, ASM_FUNCTION_AARCH64_DARWIN_RE),
'hexagon': (scrub_asm_hexagon, ASM_FUNCTION_HEXAGON_RE), 'hexagon': (scrub_asm_hexagon, ASM_FUNCTION_HEXAGON_RE),
'r600': (scrub_asm_amdgpu, ASM_FUNCTION_AMDGPU_RE), 'r600': (scrub_asm_amdgpu, ASM_FUNCTION_AMDGPU_RE),
'amdgcn': (scrub_asm_amdgpu, ASM_FUNCTION_AMDGPU_RE), 'amdgcn': (scrub_asm_amdgpu, ASM_FUNCTION_AMDGPU_RE),
'arm-eabi': (scrub_asm_arm_eabi, ASM_FUNCTION_ARM_RE), 'arm': (scrub_asm_arm_eabi, ASM_FUNCTION_ARM_RE),
'thumb-eabi': (scrub_asm_arm_eabi, ASM_FUNCTION_ARM_RE), 'arm64': (scrub_asm_arm_eabi, ASM_FUNCTION_AARCH64_RE),
'thumbv6': (scrub_asm_arm_eabi, ASM_FUNCTION_ARM_RE), 'arm64-apple-ios': (scrub_asm_arm_eabi, ASM_FUNCTION_AARCH64_DARWIN_RE),
'thumbv6-eabi': (scrub_asm_arm_eabi, ASM_FUNCTION_ARM_RE), 'armv7-apple-ios' : (scrub_asm_arm_eabi, ASM_FUNCTION_ARM_IOS_RE),
'thumbv6t2': (scrub_asm_arm_eabi, ASM_FUNCTION_ARM_RE), 'thumb': (scrub_asm_arm_eabi, ASM_FUNCTION_ARM_RE),
'thumbv6t2-eabi': (scrub_asm_arm_eabi, ASM_FUNCTION_ARM_RE), 'thumb-macho': (scrub_asm_arm_eabi, ASM_FUNCTION_ARM_MACHO_RE),
'thumbv6m': (scrub_asm_arm_eabi, ASM_FUNCTION_ARM_RE), 'thumbv5-macho': (scrub_asm_arm_eabi, ASM_FUNCTION_ARM_MACHO_RE),
'thumbv6m-eabi': (scrub_asm_arm_eabi, ASM_FUNCTION_ARM_RE), 'thumbv7-apple-ios' : (scrub_asm_arm_eabi, ASM_FUNCTION_ARM_IOS_RE),
'thumbv7': (scrub_asm_arm_eabi, ASM_FUNCTION_ARM_RE),
'thumbv7-eabi': (scrub_asm_arm_eabi, ASM_FUNCTION_ARM_RE),
'thumbv7m': (scrub_asm_arm_eabi, ASM_FUNCTION_ARM_RE),
'thumbv7m-eabi': (scrub_asm_arm_eabi, ASM_FUNCTION_ARM_RE),
'thumbv8-eabi': (scrub_asm_arm_eabi, ASM_FUNCTION_ARM_RE),
'thumbv8m.base': (scrub_asm_arm_eabi, ASM_FUNCTION_ARM_RE),
'thumbv8m.main': (scrub_asm_arm_eabi, ASM_FUNCTION_ARM_RE),
'armv6': (scrub_asm_arm_eabi, ASM_FUNCTION_ARM_RE),
'armv7': (scrub_asm_arm_eabi, ASM_FUNCTION_ARM_RE),
'armv7-eabi': (scrub_asm_arm_eabi, ASM_FUNCTION_ARM_RE),
'armeb-eabi': (scrub_asm_arm_eabi, ASM_FUNCTION_ARM_RE),
'armv7eb-eabi': (scrub_asm_arm_eabi, ASM_FUNCTION_ARM_RE),
'armv7eb': (scrub_asm_arm_eabi, ASM_FUNCTION_ARM_RE),
'armv8a': (scrub_asm_arm_eabi, ASM_FUNCTION_ARM_RE),
'mips': (scrub_asm_mips, ASM_FUNCTION_MIPS_RE), 'mips': (scrub_asm_mips, ASM_FUNCTION_MIPS_RE),
'ppc32': (scrub_asm_powerpc, ASM_FUNCTION_PPC_RE), 'ppc32': (scrub_asm_powerpc, ASM_FUNCTION_PPC_RE),
'powerpc64': (scrub_asm_powerpc, ASM_FUNCTION_PPC_RE), 'powerpc64': (scrub_asm_powerpc, ASM_FUNCTION_PPC_RE),
'powerpc64le': (scrub_asm_powerpc, ASM_FUNCTION_PPC_RE), 'powerpc64le': (scrub_asm_powerpc, ASM_FUNCTION_PPC_RE),
'riscv32': (scrub_asm_riscv, ASM_FUNCTION_RISCV_RE), 'riscv32': (scrub_asm_riscv, ASM_FUNCTION_RISCV_RE),
'riscv64': (scrub_asm_riscv, ASM_FUNCTION_RISCV_RE), 'riscv64': (scrub_asm_riscv, ASM_FUNCTION_RISCV_RE),
'lanai': (scrub_asm_lanai, ASM_FUNCTION_LANAI_RE), 'lanai': (scrub_asm_lanai, ASM_FUNCTION_LANAI_RE),
'sparc': (scrub_asm_sparc, ASM_FUNCTION_SPARC_RE), 'sparc': (scrub_asm_sparc, ASM_FUNCTION_SPARC_RE),
'sparcv9': (scrub_asm_sparc, ASM_FUNCTION_SPARC_RE), 'sparcv9': (scrub_asm_sparc, ASM_FUNCTION_SPARC_RE),
's390x': (scrub_asm_systemz, ASM_FUNCTION_SYSTEMZ_RE), 's390x': (scrub_asm_systemz, ASM_FUNCTION_SYSTEMZ_RE),
'wasm32': (scrub_asm_wasm32, ASM_FUNCTION_WASM32_RE), 'wasm32': (scrub_asm_wasm32, ASM_FUNCTION_WASM32_RE),
} }
handlers = None handler = None
best_prefix = ""
MaskRayUnsubmitted
Not Done
ReplyInline Actions

Single quotes to be consistent with other strings in this file.

MaskRay: Single quotes to be consistent with other strings in this file.
for prefix, s in target_handlers.items(): for prefix, s in target_handlers.items():
if triple.startswith(prefix): if triple.startswith(prefix) and len(prefix) > len(best_prefix):
handlers = s handler = s
break best_prefix = prefix
else:
if handler == None:
MaskRayUnsubmitted
Not Done
ReplyInline Actions

is None

MaskRay: `is None`
raise KeyError('Triple %r is not supported' % (triple)) raise KeyError('Triple %r is not supported' % (triple))
scrubber, function_re = handlers scrubber, function_re = handler
common.build_function_body_dictionary( common.build_function_body_dictionary(
function_re, scrubber, [args], raw_tool_output, prefixes, function_re, scrubber, [args], raw_tool_output, prefixes,
func_dict, args.verbose) func_dict, args.verbose)
##### Generator of assembly CHECK lines ##### Generator of assembly CHECK lines
def add_asm_checks(output_lines, comment_marker, prefix_list, func_dict, func_name): def add_asm_checks(output_lines, comment_marker, prefix_list, func_dict, func_name):
# Label format is based on ASM string. # Label format is based on ASM string.
check_label_format = '{} %s-LABEL: %s:'.format(comment_marker) check_label_format = '{} %s-LABEL: %s:'.format(comment_marker)
common.add_checks(output_lines, comment_marker, prefix_list, func_dict, func_name, check_label_format, True, False) common.add_checks(output_lines, comment_marker, prefix_list, func_dict, func_name, check_label_format, True, False)