[PATCH] D88940: Add regular expressions to and DWARF Call Frame Information tests in case the architecture specific target is not compiled into LLVM.

[Greg Clayton via Phabricator via llvm-commits]

clayborg created this revision.
clayborg added reviewers: labath, aprantl, JDevlieghere, dblaikie, JamesNagurne.
Herald added subscribers: luismarques, apazos, sameer.abuasal, pzheng, s.egerton, lenary, Jim, jocewei, PkmX, the_o, brucehoult, MartinMosbeck, rogfer01, atanasyan, edward-jones, zzheng, jrtc27, niosHD, sabuasal, simoncook, johnrusso, rbar, asb, sdardis, emaste.
Herald added a reviewer: espindola.
Herald added a project: LLVM.
clayborg requested review of this revision.
Herald added a subscriber: MaskRay.

This should fix any build bots that avoid compiling some architectures into llvm after https://reviews.llvm.org/D88767.


Repository:
  rG LLVM Github Monorepo

https://reviews.llvm.org/D88940

Files:
  llvm/test/DebugInfo/RISCV/eh-frame.s
  llvm/test/DebugInfo/dwarfdump-debug-frame-simple.test
  llvm/test/MC/ELF/cfi-restore-extended.s
  llvm/test/MC/Mips/eh-frame.s
  llvm/test/MC/X86/i386-darwin-frame-register.ll


Index: llvm/test/MC/X86/i386-darwin-frame-register.ll
===================================================================
--- llvm/test/MC/X86/i386-darwin-frame-register.ll
+++ llvm/test/MC/X86/i386-darwin-frame-register.ll
@@ -11,7 +11,7 @@
 ; CHECK: .debug_frame contents:
 ; CHECK: ffffffff CIE
 ; CHECK-NOT: {{CIE|FDE}}
-; CHECK:   DW_CFA_def_cfa: ESP +4
+; CHECK:   DW_CFA_def_cfa: {{reg4|ESP}} +4
 
 ; ModuleID = 'foo.c'
 target datalayout = "e-m:o-p:32:32-f64:32:64-f80:128-n8:16:32-S128"
Index: llvm/test/MC/Mips/eh-frame.s
===================================================================
--- llvm/test/MC/Mips/eh-frame.s
+++ llvm/test/MC/Mips/eh-frame.s
@@ -66,7 +66,7 @@
 // DWARF32_PIC-NEXT: Augmentation data: 1B
 //                                      ^^ fde pointer encoding: DW_EH_PE_pcrel | DW_EH_PE_sdata4
 // DWARF32-EMPTY:
-// DWARF32-NEXT:     DW_CFA_def_cfa_register: SP_64
+// DWARF32-NEXT:     DW_CFA_def_cfa_register: {{reg29|SP_64}}
 //
 // DWARF32_ABS: 00000014 00000010 00000018 FDE cie=00000000 pc=00000000...00000000
 // DWARF32_PIC: 00000014 00000010 00000018 FDE cie=00000000 pc=0000001c...0000001c
@@ -90,7 +90,7 @@
 // DWARF64_PIC:      Augmentation data: 1B
 //                                      ^^ fde pointer encoding: DW_EH_PE_pcrel | DW_EH_PE_sdata4
 // DWARF64-EMPTY:
-// DWARF64-NEXT:     DW_CFA_def_cfa_register: SP_64
+// DWARF64-NEXT:     DW_CFA_def_cfa_register: {{reg29|SP_64}}
 // DWARF64_PIC-NEXT: DW_CFA_nop:
 //
 // DWARF64_ABS:      00000014 00000018 00000018 FDE cie=00000000 pc=00000000...00000000
Index: llvm/test/MC/ELF/cfi-restore-extended.s
===================================================================
--- llvm/test/MC/ELF/cfi-restore-extended.s
+++ llvm/test/MC/ELF/cfi-restore-extended.s
@@ -6,7 +6,7 @@
   nop
 // CHECK: DW_CFA_advance_loc: 1
   .cfi_restore %rbp
-// CHECK-NEXT: DW_CFA_restore: RBP
+// CHECK-NEXT: DW_CFA_restore: {{reg6|RBP}}
   nop
 // CHECK-NEXT: DW_CFA_advance_loc: 1
   .cfi_restore 89
Index: llvm/test/DebugInfo/dwarfdump-debug-frame-simple.test
===================================================================
--- llvm/test/DebugInfo/dwarfdump-debug-frame-simple.test
+++ llvm/test/DebugInfo/dwarfdump-debug-frame-simple.test
@@ -5,8 +5,8 @@
 
 ; FRAMES: 00000000 00000010 ffffffff CIE
 ; FRAMES: Version: 1
-; FRAMES:      DW_CFA_def_cfa: ESP +4
-; FRAMES-NEXT: DW_CFA_offset: EIP -4
+; FRAMES:      DW_CFA_def_cfa: {{reg4|ESP}} +4
+; FRAMES-NEXT: DW_CFA_offset: {{reg8|EIP}} -4
 ; FRAMES-NEXT: DW_CFA_nop:
 ; FRAMES-NEXT: DW_CFA_nop:
 
@@ -18,9 +18,9 @@
 ; FRAMES: 00000028 00000014 00000000 FDE cie=00000000 pc=00000030...00000080
 ; FRAMES:      DW_CFA_advance_loc: 1
 ; FRAMES-NEXT: DW_CFA_def_cfa_offset: +8
-; FRAMES-NEXT: DW_CFA_offset: EBP -8
+; FRAMES-NEXT: DW_CFA_offset: {{reg5|EBP}} -8
 ; FRAMES-NEXT: DW_CFA_advance_loc: 2
-; FRAMES-NEXT: DW_CFA_def_cfa_register: EBP
+; FRAMES-NEXT: DW_CFA_def_cfa_register: {{reg5|EBP}}
 
 ; FRAMES-NOT: CIE
 ; FRAMES-NOT: FDE
Index: llvm/test/DebugInfo/RISCV/eh-frame.s
===================================================================
--- llvm/test/DebugInfo/RISCV/eh-frame.s
+++ llvm/test/DebugInfo/RISCV/eh-frame.s
@@ -26,7 +26,7 @@
 # FDECFIEncoding and should be DW_EH_PE_pcrel | DW_EH_PE_sdata4 (0x1b).
 
 # CHECK:   Augmentation data:     1B
-# CHECK:   DW_CFA_def_cfa: X2 +0
+# CHECK:   DW_CFA_def_cfa: {{reg2|X2}} +0
 #
 # CHECK: 00000014 00000010 00000018 FDE cie=00000000 pc=00000000...00000004
 # CHECK:   DW_CFA_nop:


-------------- next part --------------
A non-text attachment was scrubbed...
Name: D88940.296576.patch
Type: text/x-patch
Size: 3483 bytes
Desc: not available
URL: <http://lists.llvm.org/pipermail/llvm-commits/attachments/20201007/f5e0a60e/attachment.bin>