This is an archive of the discontinued LLVM Phabricator instance.

Differential D37532

Util: Improve update_llc_test_checks to scrub macosx-style assembly annotations
ClosedPublic

Authored by zvi on Sep 6 2017, 1:34 PM.

Details

Reviewers
spatel
chandlerc
craig.topper
Commits
rGd635eeb01a45: Util: Improve update_llc_test_checks to scrub macosx-style assembly annotations
rL312678: Util: Improve update_llc_test_checks to scrub macosx-style assembly annotations
Summary

In D37523 Sanjay pointed out that the tool does not scrub macosx-style 'End of Function' annotations,
where the comments begin with a double-#.

I tested this patch by verifying all existing occurences of 'End function' are scrubbed:
find ./test/CodeGen/X86 -name '*.ll' | xargs grep -l "End function" | xargs utils/update_llc_test_checks.py --llc-binary build/bin/llc

Diff Detail

Repository
rL LLVM

Event Timeline

zvi created this revision.Sep 6 2017, 1:34 PM
spatel accepted this revision.Sep 6 2017, 2:52 PM

LGTM - thanks!

As I wrote in the other review, the vast majority of x86 regression tests that I've seen that do specify an OS are doing so unnecessarily.
So I think we should just fix those RUN line triples as we're making other changes, but this will prevent comment noise distractions.

This revision is now accepted and ready to land.Sep 6 2017, 2:52 PM
Closed by commit rL312678: Util: Improve update_llc_test_checks to scrub macosx-style assembly annotations (authored by zvi). · Explain WhySep 6 2017, 4:07 PM
This revision was automatically updated to reflect the committed changes.

Revision Contents

PathSize
llvm/
trunk/
utils/
2 lines

Diff 114093

llvm/trunk/utils/update_llc_test_checks.py

Show All 23 Linesdef llc(args, cmd_args, ir):
return stdout return stdout
# RegEx: this is where the magic happens. # RegEx: this is where the magic happens.
ASM_FUNCTION_X86_RE = re.compile( ASM_FUNCTION_X86_RE = re.compile(
r'^_?(?P<func>[^:]+):[ \t]*#+[ \t]*@(?P=func)\n[^:]*?' r'^_?(?P<func>[^:]+):[ \t]*#+[ \t]*@(?P=func)\n[^:]*?'
r'(?P<body>^##?[ \t]+[^:]+:.*?)\s*' r'(?P<body>^##?[ \t]+[^:]+:.*?)\s*'
r'^\s*(?:[^:\n]+?:\s*\n\s*\.size|\.cfi_endproc|\.globl|\.comm|\.(?:sub)?section|# -- End function)', r'^\s*(?:[^:\n]+?:\s*\n\s*\.size|\.cfi_endproc|\.globl|\.comm|\.(?:sub)?section|#+ -- End function)',
flags=(re.M | re.S)) flags=(re.M | re.S))
ASM_FUNCTION_ARM_RE = re.compile( ASM_FUNCTION_ARM_RE = re.compile(
r'^(?P<func>[0-9a-zA-Z_]+):\n' # f: (name of function) r'^(?P<func>[0-9a-zA-Z_]+):\n' # f: (name of function)
r'\s+\.fnstart\n' # .fnstart r'\s+\.fnstart\n' # .fnstart
r'(?P<body>.*?)\n' # (body of the function) r'(?P<body>.*?)\n' # (body of the function)
r'.Lfunc_end[0-9]+:', # .Lfunc_end0: or # -- End function r'.Lfunc_end[0-9]+:', # .Lfunc_end0: or # -- End function
flags=(re.M | re.S)) flags=(re.M | re.S))
▲ Show 20 Lines • Show All 340 Lines • Show Last 20 Lines