This is an archive of the discontinued LLVM Phabricator instance.

Differential D39789

Add RISC-V support to update_llc_test_checks.py
ClosedPublic

Authored by asb on Nov 8 2017, 3:47 AM.

Details

Reviewers
spatel
Commits
rG86f971ccd644: [utils] Add RISC-V support to update_llc_test_checks.py
rL317693: [utils] Add RISC-V support to update_llc_test_checks.py
Summary

This should be a trivial change, and I've started using it for generating all tests at https://github.com/lowrisc/riscv-llvm (i.e. it's been tested in action quite a lot). Note that the regex does not attempt to match .cfi_startproc, as I want to ensure compatibility for functions with the nounwind attribute.

Diff Detail

Event Timeline

asb created this revision.Nov 8 2017, 3:47 AM
spatel accepted this revision.Nov 8 2017, 6:21 AM

LGTM - thanks!

This revision is now accepted and ready to land.Nov 8 2017, 6:21 AM
Closed by commit rL317693: [utils] Add RISC-V support to update_llc_test_checks.py (authored by asb). · Explain WhyNov 8 2017, 6:25 AM
This revision was automatically updated to reflect the committed changes.

Revision Contents

PathSize
utils/
18 lines

Diff 122052

utils/update_llc_test_checks.py

Show First 20 Lines • Show All 52 Lines • ▼ Show 20 LinesASM_FUNCTION_PPC_RE = re.compile(
r'[ \t]+.cfi_startproc\n' r'[ \t]+.cfi_startproc\n'
r'(?:\.Lfunc_[gl]ep[0-9]+:\n(?:[ \t]+.*?\n)*)*' r'(?:\.Lfunc_[gl]ep[0-9]+:\n(?:[ \t]+.*?\n)*)*'
r'(?P<body>.*?)\n' r'(?P<body>.*?)\n'
# This list is incomplete # This list is incomplete
r'(?:^[ \t]*(?:\.long[ \t]+[^\n]+|\.quad[ \t]+[^\n]+)\n)*' r'(?:^[ \t]*(?:\.long[ \t]+[^\n]+|\.quad[ \t]+[^\n]+)\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_RISCV_RE = re.compile(
r'^_?(?P<func>[^:]+):[ \t]*#+[ \t]*@(?P=func)\n[^:]*?'
r'(?P<body>^##?[ \t]+[^:]+:.*?)\s*'
r'.Lfunc_end[0-9]+:\n',
flags=(re.M | re.S))
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))
▲ Show 20 Lines • Show All 61 Lines • ▼ Show 20 Linesdef scrub_asm_powerpc64(asm, args):
# Expand the tabs used for indentation. # Expand the tabs used for indentation.
asm = string.expandtabs(asm, 2) asm = string.expandtabs(asm, 2)
# Stripe unimportant comments # Stripe unimportant comments
asm = SCRUB_LOOP_COMMENT_RE.sub(r'', asm) asm = SCRUB_LOOP_COMMENT_RE.sub(r'', asm)
# Strip trailing whitespace. # Strip trailing whitespace.
asm = SCRUB_TRAILING_WHITESPACE_RE.sub(r'', asm) asm = SCRUB_TRAILING_WHITESPACE_RE.sub(r'', asm)
return asm return asm
def scrub_asm_riscv(asm):
# Scrub runs of whitespace out of the assembly, but leave the leading
# whitespace in place.
asm = SCRUB_WHITESPACE_RE.sub(r' ', asm)
# Expand the tabs used for indentation.
asm = string.expandtabs(asm, 2)
# Strip trailing whitespace.
asm = SCRUB_TRAILING_WHITESPACE_RE.sub(r'', asm)
return asm
def scrub_asm_systemz(asm, args): def scrub_asm_systemz(asm, args):
# Scrub runs of whitespace out of the assembly, but leave the leading # Scrub runs of whitespace out of the assembly, but leave the leading
# whitespace in place. # whitespace in place.
asm = SCRUB_WHITESPACE_RE.sub(r' ', asm) asm = SCRUB_WHITESPACE_RE.sub(r' ', asm)
# Expand the tabs used for indentation. # Expand the tabs used for indentation.
asm = string.expandtabs(asm, 2) asm = string.expandtabs(asm, 2)
# Strip trailing whitespace. # Strip trailing whitespace.
asm = SCRUB_TRAILING_WHITESPACE_RE.sub(r'', asm) asm = SCRUB_TRAILING_WHITESPACE_RE.sub(r'', asm)
Show All 10 Lines target_handlers = {
'i386': (scrub_asm_x86, ASM_FUNCTION_X86_RE), 'i386': (scrub_asm_x86, ASM_FUNCTION_X86_RE),
'aarch64': (scrub_asm_arm_eabi, ASM_FUNCTION_AARCH64_RE), 'aarch64': (scrub_asm_arm_eabi, ASM_FUNCTION_AARCH64_RE),
'arm-eabi': (scrub_asm_arm_eabi, ASM_FUNCTION_ARM_RE), 'arm-eabi': (scrub_asm_arm_eabi, ASM_FUNCTION_ARM_RE),
'thumb-eabi': (scrub_asm_arm_eabi, ASM_FUNCTION_ARM_RE), 'thumb-eabi': (scrub_asm_arm_eabi, ASM_FUNCTION_ARM_RE),
'thumbv8-eabi': (scrub_asm_arm_eabi, ASM_FUNCTION_ARM_RE), 'thumbv8-eabi': (scrub_asm_arm_eabi, ASM_FUNCTION_ARM_RE),
'armeb-eabi': (scrub_asm_arm_eabi, ASM_FUNCTION_ARM_RE), 'armeb-eabi': (scrub_asm_arm_eabi, ASM_FUNCTION_ARM_RE),
'powerpc64': (scrub_asm_powerpc64, ASM_FUNCTION_PPC_RE), 'powerpc64': (scrub_asm_powerpc64, ASM_FUNCTION_PPC_RE),
'powerpc64le': (scrub_asm_powerpc64, ASM_FUNCTION_PPC_RE), 'powerpc64le': (scrub_asm_powerpc64, ASM_FUNCTION_PPC_RE),
'riscv32': (scrub_asm_riscv, ASM_FUNCTION_RISCV_RE),
'riscv64': (scrub_asm_riscv, ASM_FUNCTION_RISCV_RE),
's390x': (scrub_asm_systemz, ASM_FUNCTION_SYSTEMZ_RE), 's390x': (scrub_asm_systemz, ASM_FUNCTION_SYSTEMZ_RE),
} }
handlers = None handlers = None
for prefix, s in target_handlers.items(): for prefix, s in target_handlers.items():
if triple.startswith(prefix): if triple.startswith(prefix):
handlers = s handlers = s
break break
else: else:
▲ Show 20 Lines • Show All 217 Lines • Show Last 20 Lines