From: David Blaikie Date: Sat, 5 Dec 2015 03:10:05 +0000 (+0000) Subject: [llvm-dwp] Rename the sufficiently-modified test to reflect it's non-simplicity X-Git-Url: http://demsky.eecs.uci.edu/git/?a=commitdiff_plain;h=eaf992ce08c4f3d08215149750f5342a628656ad;p=oota-llvm.git [llvm-dwp] Rename the sufficiently-modified test to reflect it's non-simplicity git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@254829 91177308-0d34-0410-b5e6-96231b3b80d8 --- diff --git a/test/tools/llvm-dwp/Inputs/simple/a.cpp b/test/tools/llvm-dwp/Inputs/simple/a.cpp deleted file mode 100644 index f85d105a99f..00000000000 --- a/test/tools/llvm-dwp/Inputs/simple/a.cpp +++ /dev/null @@ -1,2 +0,0 @@ -struct foo { }; -foo a; diff --git a/test/tools/llvm-dwp/Inputs/simple/a.dwo b/test/tools/llvm-dwp/Inputs/simple/a.dwo deleted file mode 100644 index 1fc71ca8d17..00000000000 Binary files a/test/tools/llvm-dwp/Inputs/simple/a.dwo and /dev/null differ diff --git a/test/tools/llvm-dwp/Inputs/simple/b.cpp b/test/tools/llvm-dwp/Inputs/simple/b.cpp deleted file mode 100644 index fedcc160f41..00000000000 --- a/test/tools/llvm-dwp/Inputs/simple/b.cpp +++ /dev/null @@ -1,3 +0,0 @@ -struct bar { }; -void b(bar) { -} diff --git a/test/tools/llvm-dwp/Inputs/simple/b.dwo b/test/tools/llvm-dwp/Inputs/simple/b.dwo deleted file mode 100644 index a69cd69eb99..00000000000 Binary files a/test/tools/llvm-dwp/Inputs/simple/b.dwo and /dev/null differ diff --git a/test/tools/llvm-dwp/Inputs/type_units/a.cpp b/test/tools/llvm-dwp/Inputs/type_units/a.cpp new file mode 100644 index 00000000000..f85d105a99f --- /dev/null +++ b/test/tools/llvm-dwp/Inputs/type_units/a.cpp @@ -0,0 +1,2 @@ +struct foo { }; +foo a; diff --git a/test/tools/llvm-dwp/Inputs/type_units/a.dwo b/test/tools/llvm-dwp/Inputs/type_units/a.dwo new file mode 100644 index 00000000000..1fc71ca8d17 Binary files /dev/null and b/test/tools/llvm-dwp/Inputs/type_units/a.dwo differ diff --git a/test/tools/llvm-dwp/Inputs/type_units/b.cpp b/test/tools/llvm-dwp/Inputs/type_units/b.cpp new file mode 100644 index 00000000000..fedcc160f41 --- /dev/null +++ b/test/tools/llvm-dwp/Inputs/type_units/b.cpp @@ -0,0 +1,3 @@ +struct bar { }; +void b(bar) { +} diff --git a/test/tools/llvm-dwp/Inputs/type_units/b.dwo b/test/tools/llvm-dwp/Inputs/type_units/b.dwo new file mode 100644 index 00000000000..a69cd69eb99 Binary files /dev/null and b/test/tools/llvm-dwp/Inputs/type_units/b.dwo differ diff --git a/test/tools/llvm-dwp/X86/simple.test b/test/tools/llvm-dwp/X86/simple.test deleted file mode 100644 index 5502ef23d29..00000000000 --- a/test/tools/llvm-dwp/X86/simple.test +++ /dev/null @@ -1,86 +0,0 @@ -RUN: llvm-dwp %p/../Inputs/simple/a.dwo %p/../Inputs/simple/b.dwo -o %t -RUN: llvm-dwarfdump %t | FileCheck %s - -FIXME: For some reason, piping straight from llvm-dwp to llvm-dwarfdump doesn't behave well - looks like dwarfdump is reading/closes before dwp has finished. - -DWP from non-type-unit debug info for these two translation units: -a.cpp: - struct foo { }; - foo a; - -b.cpp: - struct bar { }; - void b(bar) { - } - -CHECK-LABEL: .debug_abbrev.dwo contents: -CHECK-LABEL: Abbrev table for offset: -CHECK: 0x0000[[AAOFF:.*]] -CHECK: DW_TAG_compile_unit -CHECK: DW_TAG_variable -CHECK: DW_TAG_structure_type -CHECK-LABEL: Abbrev table for offset: -CHECK: 0x0000[[BAOFF:.*]] -CHECK: DW_TAG_compile_unit -CHECK: DW_TAG_structure_type -CHECK: DW_TAG_subprogram -CHECK: DW_TAG_formal_parameter - -CHECK: .debug_info.dwo contents: -CHECK: [[AOFF:0x[0-9a-f]*]]: -CHECK-LABEL: Compile Unit: length = 0x00000029 version = 0x0004 abbr_offset = -CHECK: 0x[[AAOFF]] addr_size = 0x08 (next unit at [[BOFF:.*]]) -CHECK: DW_TAG_compile_unit -CHECK: DW_AT_name {{.*}} "a.cpp" -CHECK: DW_AT_GNU_dwo_id {{.*}} ([[DWOA:.*]]) -CHECK: DW_TAG_variable -CHECK: DW_AT_name {{.*}} "a" -CHECK: DW_TAG_structure_type -CHECK: DW_AT_signature {{.*}} ([[FOOSIG:.*]]) - -CHECK: [[BOFF]]: -CHECK-LABEL: Compile Unit: length = 0x00000035 version = 0x0004 abbr_offset = -CHECK: 0x[[BAOFF]] addr_size = 0x08 (next unit at [[XOFF:.*]]) -CHECK: DW_AT_name {{.*}} "b.cpp" -CHECK: DW_AT_GNU_dwo_id {{.*}} ([[DWOB:.*]]) -CHECK: DW_TAG_structure_type -CHECK: DW_AT_signature {{.*}} ([[BARSIG:.*]]) -CHECK: DW_TAG_subprogram -CHECK: DW_AT_name {{.*}} "b" -CHECK: DW_TAG_formal_parameter - -CHECK-LABEL: .debug_types.dwo contents: -CHECK: [[FOOUOFF:0x[0-9a-f]*]]: -CHECK-LABEL: Type Unit: length = 0x00000020 version = 0x0004 abbr_offset = -CHECK: 0x[[AAOFF]] addr_size = 0x08 type_signature = [[FOOSIG]] type_offset = 0x[[FOOOFF:.*]] (next unit at [[BARUOFF:.*]]) -CHECK: DW_TAG_type_unit -CHECK: [[FOOOFF]]: DW_TAG_structure_type -CHECK: DW_AT_name {{.*}} "foo" -CHECK: [[BARUOFF]]: -CHECK-LABEL: Type Unit: length = 0x00000020 version = 0x0004 abbr_offset = -CHECK: 0x[[BAOFF]] addr_size = 0x08 type_signature = [[BARSIG]] type_offset = 0x001e (next unit at [[XUOFF:.*]]) -CHECK: DW_TAG_type_unit -CHECK: 0x00000042: DW_TAG_structure_type -CHECK: DW_AT_name {{.*}} "bar" - -CHECK-LABEL: .debug_cu_index contents: -CHECK: Index Signature INFO ABBREV LINE STR_OFFSETS -CHECK: 1 [[DWOA]] {{\[}}[[AOFF]], [[BOFF]]) [0x0000[[AAOFF]], 0x0000[[BAOFF]]) [0x00000000, 0x0000001a) [0x00000000, 0x00000010) -CHECK: 3 [[DWOB]] {{\[}}[[BOFF]], [[XOFF]]) [0x0000[[BAOFF]], 0x00000099) [0x0000001a, 0x00000034) [0x00000010, 0x00000024) - -CHECK-LABEL: .debug_tu_index contents: -CHECK: Index Signature TYPES ABBREV LINE STR_OFFSETS -CHECK: 1 [[FOOSIG]] {{\[}}[[FOOUOFF]], [[BARUOFF]]) [0x0000[[AAOFF]], 0x0000[[BAOFF]]) [0x00000000, 0x0000001a) [0x00000000, 0x00000010) -CHECK: 4 [[BARSIG]] {{\[}}[[BARUOFF]], [[XUOFF]]) [0x0000[[BAOFF]], 0x00000099) [0x0000001a, 0x00000034) [0x00000010, 0x00000024) - -CHECK-LABEL: .debug_str.dwo contents: -CHECK: "clang version -CHECK: 0x[[ACPP:.*]]: "a.cpp" -CHECK-NOT: "clang version -CHECK: 0x[[BCPP:.*]]: "b.cpp" - -CHECK-LABEL: .debug_str_offsets.dwo contents: -CHECK: : 00000000 -CHECK: : [[ACPP]] -CHECK: : 00000000 -CHECK: : [[BCPP]] diff --git a/test/tools/llvm-dwp/X86/type_units.test b/test/tools/llvm-dwp/X86/type_units.test new file mode 100644 index 00000000000..5502ef23d29 --- /dev/null +++ b/test/tools/llvm-dwp/X86/type_units.test @@ -0,0 +1,86 @@ +RUN: llvm-dwp %p/../Inputs/simple/a.dwo %p/../Inputs/simple/b.dwo -o %t +RUN: llvm-dwarfdump %t | FileCheck %s + +FIXME: For some reason, piping straight from llvm-dwp to llvm-dwarfdump doesn't behave well - looks like dwarfdump is reading/closes before dwp has finished. + +DWP from non-type-unit debug info for these two translation units: +a.cpp: + struct foo { }; + foo a; + +b.cpp: + struct bar { }; + void b(bar) { + } + +CHECK-LABEL: .debug_abbrev.dwo contents: +CHECK-LABEL: Abbrev table for offset: +CHECK: 0x0000[[AAOFF:.*]] +CHECK: DW_TAG_compile_unit +CHECK: DW_TAG_variable +CHECK: DW_TAG_structure_type +CHECK-LABEL: Abbrev table for offset: +CHECK: 0x0000[[BAOFF:.*]] +CHECK: DW_TAG_compile_unit +CHECK: DW_TAG_structure_type +CHECK: DW_TAG_subprogram +CHECK: DW_TAG_formal_parameter + +CHECK: .debug_info.dwo contents: +CHECK: [[AOFF:0x[0-9a-f]*]]: +CHECK-LABEL: Compile Unit: length = 0x00000029 version = 0x0004 abbr_offset = +CHECK: 0x[[AAOFF]] addr_size = 0x08 (next unit at [[BOFF:.*]]) +CHECK: DW_TAG_compile_unit +CHECK: DW_AT_name {{.*}} "a.cpp" +CHECK: DW_AT_GNU_dwo_id {{.*}} ([[DWOA:.*]]) +CHECK: DW_TAG_variable +CHECK: DW_AT_name {{.*}} "a" +CHECK: DW_TAG_structure_type +CHECK: DW_AT_signature {{.*}} ([[FOOSIG:.*]]) + +CHECK: [[BOFF]]: +CHECK-LABEL: Compile Unit: length = 0x00000035 version = 0x0004 abbr_offset = +CHECK: 0x[[BAOFF]] addr_size = 0x08 (next unit at [[XOFF:.*]]) +CHECK: DW_AT_name {{.*}} "b.cpp" +CHECK: DW_AT_GNU_dwo_id {{.*}} ([[DWOB:.*]]) +CHECK: DW_TAG_structure_type +CHECK: DW_AT_signature {{.*}} ([[BARSIG:.*]]) +CHECK: DW_TAG_subprogram +CHECK: DW_AT_name {{.*}} "b" +CHECK: DW_TAG_formal_parameter + +CHECK-LABEL: .debug_types.dwo contents: +CHECK: [[FOOUOFF:0x[0-9a-f]*]]: +CHECK-LABEL: Type Unit: length = 0x00000020 version = 0x0004 abbr_offset = +CHECK: 0x[[AAOFF]] addr_size = 0x08 type_signature = [[FOOSIG]] type_offset = 0x[[FOOOFF:.*]] (next unit at [[BARUOFF:.*]]) +CHECK: DW_TAG_type_unit +CHECK: [[FOOOFF]]: DW_TAG_structure_type +CHECK: DW_AT_name {{.*}} "foo" +CHECK: [[BARUOFF]]: +CHECK-LABEL: Type Unit: length = 0x00000020 version = 0x0004 abbr_offset = +CHECK: 0x[[BAOFF]] addr_size = 0x08 type_signature = [[BARSIG]] type_offset = 0x001e (next unit at [[XUOFF:.*]]) +CHECK: DW_TAG_type_unit +CHECK: 0x00000042: DW_TAG_structure_type +CHECK: DW_AT_name {{.*}} "bar" + +CHECK-LABEL: .debug_cu_index contents: +CHECK: Index Signature INFO ABBREV LINE STR_OFFSETS +CHECK: 1 [[DWOA]] {{\[}}[[AOFF]], [[BOFF]]) [0x0000[[AAOFF]], 0x0000[[BAOFF]]) [0x00000000, 0x0000001a) [0x00000000, 0x00000010) +CHECK: 3 [[DWOB]] {{\[}}[[BOFF]], [[XOFF]]) [0x0000[[BAOFF]], 0x00000099) [0x0000001a, 0x00000034) [0x00000010, 0x00000024) + +CHECK-LABEL: .debug_tu_index contents: +CHECK: Index Signature TYPES ABBREV LINE STR_OFFSETS +CHECK: 1 [[FOOSIG]] {{\[}}[[FOOUOFF]], [[BARUOFF]]) [0x0000[[AAOFF]], 0x0000[[BAOFF]]) [0x00000000, 0x0000001a) [0x00000000, 0x00000010) +CHECK: 4 [[BARSIG]] {{\[}}[[BARUOFF]], [[XUOFF]]) [0x0000[[BAOFF]], 0x00000099) [0x0000001a, 0x00000034) [0x00000010, 0x00000024) + +CHECK-LABEL: .debug_str.dwo contents: +CHECK: "clang version +CHECK: 0x[[ACPP:.*]]: "a.cpp" +CHECK-NOT: "clang version +CHECK: 0x[[BCPP:.*]]: "b.cpp" + +CHECK-LABEL: .debug_str_offsets.dwo contents: +CHECK: : 00000000 +CHECK: : [[ACPP]] +CHECK: : 00000000 +CHECK: : [[BCPP]]