This is an archive of the discontinued LLVM Phabricator instance.

Differential D100027

[update_llc_test_checks.py] Fix MIPS ASM regex for functions with EH
ClosedPublic

Authored by arichardson on Apr 7 2021, 2:30 AM.

Details

Reviewers
atanasyan
MaskRay
Commits
rG547e5e4ae613: [update_llc_test_checks.py] Fix MIPS ASM regex for functions with EH
Summary

On MIPS, functions with exception handling code emits an additional
temporary label at the start of the function (due to UseAssignmentForEHBegin):

_Z8do_catchv:                           # @_Z8do_catchv
.Ltmp3:
.set .Lfunc_begin0, .Ltmp3
.cfi_startproc
.cfi_personality 128, DW.ref.__gxx_personality_v0
.cfi_lsda 0, .Lexception0
.frame	$c11,48,$c17
.mask 	0x00000000,0
.fmask	0x00000000,0
.set	noreorder
.set	nomacro
.set	noat
# %bb.0:                                # %entry

The [^:]* regex was terminating the search after .Ltmp<N>: and therefore
not detecting functions with exception handling.

Diff Detail

Event Timeline

arichardson created this revision.Apr 7 2021, 2:30 AM
Herald added a subscriber: sdardis. · View Herald TranscriptApr 7 2021, 2:30 AM
arichardson requested review of this revision.Apr 7 2021, 2:30 AM
Herald added a project: Restricted Project. · View Herald TranscriptApr 7 2021, 2:30 AM
Herald added a subscriber: llvm-commits. · View Herald Transcript
Harbormaster completed remote builds in B97478: Diff 335763.Apr 7 2021, 3:50 AM
MaskRay added a comment.Apr 7 2021, 11:28 AM

This needs a test under test/tools/UpdateTestChecks/update_llc_test_checks/

MaskRay requested changes to this revision.May 7 2021, 10:15 AM
This revision now requires changes to proceed.May 7 2021, 10:15 AM
arichardson updated this revision to Diff 374818.Sep 24 2021, 5:56 AM

Include test (D110408)

Herald added a subscriber: jrtc27. · View Herald TranscriptSep 24 2021, 5:56 AM
arichardson added a parent revision: D110408: [update_llc_test_checks] Baseline test for D100027.Sep 24 2021, 5:57 AM
Harbormaster completed remote builds in B125546: Diff 374818.Sep 24 2021, 6:17 AM
atanasyan accepted this revision.Sep 24 2021, 9:21 AM

LGTM

MaskRay accepted this revision.Sep 24 2021, 11:19 AM

Looks great!

This revision is now accepted and ready to land.Sep 24 2021, 11:19 AM
This revision was landed with ongoing or failed builds.Sep 28 2021, 9:57 AM
Closed by commit rG547e5e4ae613: [update_llc_test_checks.py] Fix MIPS ASM regex for functions with EH (authored by arichardson). · Explain Why
This revision was automatically updated to reflect the committed changes.
arichardson mentioned this in rGee3109b044a2: [update_llc_test_checks] Baseline test for D100027.
arichardson added a commit: rG547e5e4ae613: [update_llc_test_checks.py] Fix MIPS ASM regex for functions with EH.

Revision Contents

PathSize
llvm/
test/
tools/
UpdateTestChecks/
update_llc_test_checks/
Inputs/
1 line
20 lines
utils/
UpdateTestChecks/
1 line

Diff 375621

llvm/test/tools/UpdateTestChecks/update_llc_test_checks/Inputs/mips64_eh.ll

; RUN: llc -mtriple=mips64-unknown-linux < %s | FileCheck %s ; RUN: llc -mtriple=mips64-unknown-linux < %s | FileCheck %s
; FIXME: doesn't generate any CHECK lines
define i32 @main() personality i8* bitcast (i32 (...)* @__gxx_personality_v0 to i8*){ define i32 @main() personality i8* bitcast (i32 (...)* @__gxx_personality_v0 to i8*){
%1 = invoke i32 @foo() to label %good unwind label %bad %1 = invoke i32 @foo() to label %good unwind label %bad
good: good:
ret i32 5 ret i32 5
bad: bad:
%2 = landingpad { i8*, i32 } %2 = landingpad { i8*, i32 }
cleanup cleanup
resume { i8*, i32 } %2 resume { i8*, i32 } %2
} }
declare i32 @foo() declare i32 @foo()
declare i32 @__gxx_personality_v0(...) declare i32 @__gxx_personality_v0(...)

llvm/test/tools/UpdateTestChecks/update_llc_test_checks/Inputs/mips64_eh.ll.expected

; NOTE: Assertions have been autogenerated by utils/update_llc_test_checks.py ; NOTE: Assertions have been autogenerated by utils/update_llc_test_checks.py
; RUN: llc -mtriple=mips64-unknown-linux < %s | FileCheck %s ; RUN: llc -mtriple=mips64-unknown-linux < %s | FileCheck %s
; FIXME: doesn't generate any CHECK lines
define i32 @main() personality i8* bitcast (i32 (...)* @__gxx_personality_v0 to i8*){ define i32 @main() personality i8* bitcast (i32 (...)* @__gxx_personality_v0 to i8*){
; CHECK-LABEL: main:
; CHECK: # %bb.0:
; CHECK-NEXT: daddiu $sp, $sp, -16
; CHECK-NEXT: .cfi_def_cfa_offset 16
; CHECK-NEXT: sd $ra, 8($sp) # 8-byte Folded Spill
; CHECK-NEXT: .cfi_offset 31, -8
; CHECK-NEXT: .Ltmp0:
; CHECK-NEXT: jal foo
; CHECK-NEXT: nop
; CHECK-NEXT: .Ltmp1:
; CHECK-NEXT: # %bb.1: # %good
; CHECK-NEXT: addiu $2, $zero, 5
; CHECK-NEXT: ld $ra, 8($sp) # 8-byte Folded Reload
; CHECK-NEXT: jr $ra
; CHECK-NEXT: daddiu $sp, $sp, 16
; CHECK-NEXT: .LBB0_2: # %bad
; CHECK-NEXT: .Ltmp2:
; CHECK-NEXT: jal _Unwind_Resume
; CHECK-NEXT: nop
%1 = invoke i32 @foo() to label %good unwind label %bad %1 = invoke i32 @foo() to label %good unwind label %bad
good: good:
ret i32 5 ret i32 5
bad: bad:
%2 = landingpad { i8*, i32 } %2 = landingpad { i8*, i32 }
cleanup cleanup
resume { i8*, i32 } %2 resume { i8*, i32 } %2
} }
declare i32 @foo() declare i32 @foo()
declare i32 @__gxx_personality_v0(...) declare i32 @__gxx_personality_v0(...)

llvm/utils/UpdateTestChecks/asm.py

Show First 20 Lines • Show All 53 Lines • ▼ Show 20 Lines
ASM_FUNCTION_M68K_RE = re.compile( ASM_FUNCTION_M68K_RE = re.compile(
r'^_?(?P<func>[^:]+):[ \t]*;[ \t]*@"?(?P=func)"?\n' r'^_?(?P<func>[^:]+):[ \t]*;[ \t]*@"?(?P=func)"?\n'
r'(?P<body>.*?)\s*' # (body of the function) r'(?P<body>.*?)\s*' # (body of the function)
r'.Lfunc_end[0-9]+:\n', r'.Lfunc_end[0-9]+:\n',
flags=(re.M | re.S)) flags=(re.M | re.S))
ASM_FUNCTION_MIPS_RE = re.compile( ASM_FUNCTION_MIPS_RE = re.compile(
r'^_?(?P<func>[^:]+):[ \t]*#+[ \t]*@"?(?P=func)"?\n[^:]*?' # f: (name of func) r'^_?(?P<func>[^:]+):[ \t]*#+[ \t]*@"?(?P=func)"?\n[^:]*?' # f: (name of func)
r'(?:\s*\.?Ltmp[^:\n]*:\n)?[^:]*?' # optional .Ltmp<N> for EH
r'(?:^[ \t]+\.(frame|f?mask|set).*?\n)+' # Mips+LLVM standard asm prologue r'(?:^[ \t]+\.(frame|f?mask|set).*?\n)+' # Mips+LLVM standard asm prologue
r'(?P<body>.*?)\n' # (body of the function) r'(?P<body>.*?)\n' # (body of the function)
# Mips+LLVM standard asm epilogue # Mips+LLVM standard asm epilogue
r'(?:(^[ \t]+\.set[^\n]*?\n)*^[ \t]+\.end.*?\n)' r'(?:(^[ \t]+\.set[^\n]*?\n)*^[ \t]+\.end.*?\n)'
r'(\$|\.L)func_end[0-9]+:\n', # $func_end0: (mips32 - O32) or r'(\$|\.L)func_end[0-9]+:\n', # $func_end0: (mips32 - O32) or
# .Lfunc_end0: (mips64 - NewABI) # .Lfunc_end0: (mips64 - NewABI)
flags=(re.M | re.S)) flags=(re.M | re.S))
▲ Show 20 Lines • Show All 356 Lines • Show Last 20 Lines