diff options
| author | Alex Richardson <Alexander.Richardson@cl.cam.ac.uk> | 2021-09-28 15:10:07 +0100 |
|---|---|---|
| committer | Alex Richardson <Alexander.Richardson@cl.cam.ac.uk> | 2021-09-28 17:57:36 +0100 |
| commit | 547e5e4ae613cf5ae3727abef84d5ac0334d9987 (patch) | |
| tree | 7b6f0384f35bb19c0e464273e0e1dbfc479b6a4a /llvm | |
| parent | ee3109b044a2bb727b91df53f99483cfe7593a72 (diff) | |
| download | llvm-547e5e4ae613cf5ae3727abef84d5ac0334d9987.zip llvm-547e5e4ae613cf5ae3727abef84d5ac0334d9987.tar.gz llvm-547e5e4ae613cf5ae3727abef84d5ac0334d9987.tar.bz2 | |
[update_llc_test_checks.py] Fix MIPS ASM regex for functions with EH
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.
Reviewed By: atanasyan, MaskRay
Differential Revision: https://reviews.llvm.org/D100027
Diffstat (limited to 'llvm')
3 files changed, 20 insertions, 2 deletions
diff --git a/llvm/test/tools/UpdateTestChecks/update_llc_test_checks/Inputs/mips64_eh.ll b/llvm/test/tools/UpdateTestChecks/update_llc_test_checks/Inputs/mips64_eh.ll index f5bf99c..14d9cdb 100644 --- a/llvm/test/tools/UpdateTestChecks/update_llc_test_checks/Inputs/mips64_eh.ll +++ b/llvm/test/tools/UpdateTestChecks/update_llc_test_checks/Inputs/mips64_eh.ll @@ -1,5 +1,4 @@ ; 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*){ %1 = invoke i32 @foo() to label %good unwind label %bad diff --git a/llvm/test/tools/UpdateTestChecks/update_llc_test_checks/Inputs/mips64_eh.ll.expected b/llvm/test/tools/UpdateTestChecks/update_llc_test_checks/Inputs/mips64_eh.ll.expected index 08535a9..897209a 100644 --- a/llvm/test/tools/UpdateTestChecks/update_llc_test_checks/Inputs/mips64_eh.ll.expected +++ b/llvm/test/tools/UpdateTestChecks/update_llc_test_checks/Inputs/mips64_eh.ll.expected @@ -1,8 +1,26 @@ ; NOTE: Assertions have been autogenerated by utils/update_llc_test_checks.py ; 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*){ +; 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 good: ret i32 5 diff --git a/llvm/utils/UpdateTestChecks/asm.py b/llvm/utils/UpdateTestChecks/asm.py index 2a18899..a877fea 100644 --- a/llvm/utils/UpdateTestChecks/asm.py +++ b/llvm/utils/UpdateTestChecks/asm.py @@ -59,6 +59,7 @@ ASM_FUNCTION_M68K_RE = re.compile( ASM_FUNCTION_MIPS_RE = re.compile( 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'(?P<body>.*?)\n' # (body of the function) # Mips+LLVM standard asm epilogue |