This is an archive of the discontinued LLVM Phabricator instance.

Differential D115695

Adapt test to be compatible with AIX
ClosedPublic

Authored by Jake-Egan on Dec 13 2021, 7:01 PM.

Details

Reviewers
shchenz
stevewan
Commits
rG3aece7995cb6: Adapt test to be compatible with AIX
Summary

This patch updates the following test, which is falling to match ASM lines on AIX for two reasons:

  • .debug_info is mapped to .dwinfo, so the test fails to match debug_info before DW_TAG_label occurs
  • AIX uses inline strings, so DW_AT_NAME format is different and does not match DW_AT_decl_file in the next line.

Diff Detail

Event Timeline

Jake-Egan requested review of this revision.Dec 13 2021, 7:01 PM
Jake-Egan created this revision.
Herald added a project: Restricted Project. · View Herald TranscriptDec 13 2021, 7:01 PM
Herald added a subscriber: llvm-commits. · View Herald Transcript
Jake-Egan edited the summary of this revision. (Show Details)Dec 13 2021, 7:11 PM
Jake-Egan added reviewers: shchenz, stevewan.
Harbormaster completed remote builds in B139126: Diff 394114.Dec 13 2021, 7:43 PM
shchenz added inline comments.Dec 13 2021, 8:45 PM
llvm/test/DebugInfo/Generic/debug-label.ll
20

Can we use a RE to match both debug_info and dwinfo? Section name should be with more sense than cu_begin0?

Jake-Egan updated this revision to Diff 394232.Dec 14 2021, 6:26 AM
Jake-Egan edited the summary of this revision. (Show Details)

Use RE to match debug_info or dwinfo.

Jake-Egan marked an inline comment as done.Dec 14 2021, 6:27 AM
Harbormaster completed remote builds in B139213: Diff 394232.Dec 14 2021, 7:08 AM
shchenz accepted this revision.Dec 14 2021, 4:14 PM

LGTM. Thanks

This revision is now accepted and ready to land.Dec 14 2021, 4:14 PM
This revision was landed with ongoing or failed builds.Dec 16 2021, 9:35 AM
Closed by commit rG3aece7995cb6: Adapt test to be compatible with AIX (authored by Jake-Egan). · Explain Why
This revision was automatically updated to reflect the committed changes.
Jake-Egan added a commit: rG3aece7995cb6: Adapt test to be compatible with AIX.

Revision Contents

PathSize
llvm/
test/
DebugInfo/
Generic/
6 lines

Diff 394910

llvm/test/DebugInfo/Generic/debug-label.ll

Show All 11 Lines
; CHECK-NEXT: DW_AT_decl_line [DW_FORM_data1] {{.*}}7 ; CHECK-NEXT: DW_AT_decl_line [DW_FORM_data1] {{.*}}7
; CHECK-NEXT: DW_AT_low_pc [DW_FORM_addr] {{.*}}{{0x[0-9a-f]+}} ; CHECK-NEXT: DW_AT_low_pc [DW_FORM_addr] {{.*}}{{0x[0-9a-f]+}}
; CHECK-NOT: DW_AT_name {{.*}}"top" ; CHECK-NOT: DW_AT_name {{.*}}"top"
; ;
; RUN: llc -O0 -o - %s | FileCheck %s -check-prefix=ASM ; RUN: llc -O0 -o - %s | FileCheck %s -check-prefix=ASM
; ;
; ASM: [[TOP_LOW_PC:[.0-9a-zA-Z]+]]:{{[[:space:]].*}}DEBUG_LABEL: foo:top ; ASM: [[TOP_LOW_PC:[.0-9a-zA-Z]+]]:{{[[:space:]].*}}DEBUG_LABEL: foo:top
; ASM: [[DONE_LOW_PC:[.0-9a-zA-Z]+]]:{{[[:space:]].*}}DEBUG_LABEL: foo:done ; ASM: [[DONE_LOW_PC:[.0-9a-zA-Z]+]]:{{[[:space:]].*}}DEBUG_LABEL: foo:done
; ASM-LABEL: debug_info ; ASM-LABEL: {{debug_info|dwinfo}}
shchenzUnsubmitted
Done
ReplyInline Actions

Can we use a RE to match both debug_info and dwinfo? Section name should be with more sense than cu_begin0?

shchenz: Can we use a RE to match both `debug_info` and `dwinfo`? Section name should be with more sense…
; ASM: DW_TAG_label ; ASM: DW_TAG_label
; ASM-NEXT: DW_AT_name ; ASM-NEXT: DW_AT_name
; ASM-NEXT: 1 {{.*}} DW_AT_decl_file ; ASM: 1 {{.*}} DW_AT_decl_file
; ASM-NEXT: 4 {{.*}} DW_AT_decl_line ; ASM-NEXT: 4 {{.*}} DW_AT_decl_line
; ASM-NEXT: [[TOP_LOW_PC]]{{.*}} DW_AT_low_pc ; ASM-NEXT: [[TOP_LOW_PC]]{{.*}} DW_AT_low_pc
; ASM: DW_TAG_label ; ASM: DW_TAG_label
; ASM-NEXT: DW_AT_name ; ASM-NEXT: DW_AT_name
; ASM-NEXT: 1 {{.*}} DW_AT_decl_file ; ASM: 1 {{.*}} DW_AT_decl_file
; ASM-NEXT: 7 {{.*}} DW_AT_decl_line ; ASM-NEXT: 7 {{.*}} DW_AT_decl_line
; ASM-NEXT: [[DONE_LOW_PC]]{{.*}} DW_AT_low_pc ; ASM-NEXT: [[DONE_LOW_PC]]{{.*}} DW_AT_low_pc
source_filename = "debug-label.c" source_filename = "debug-label.c"
define dso_local i32 @foo(i32 %a, i32 %b) !dbg !6 { define dso_local i32 @foo(i32 %a, i32 %b) !dbg !6 {
entry: entry:
%a.addr = alloca i32, align 4 %a.addr = alloca i32, align 4
Show All 40 Lines