Skip to content

Commit 86af96b

Browse files
committed
changed to default 1 thread, updated tests
1 parent d2cc92f commit 86af96b

7 files changed

+14
-10
lines changed

llvm/test/tools/llvm-dwarfdump/X86/debug-names-verify-abbrev-forms.s

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
# RUN: llvm-mc -triple x86_64-pc-linux %s -filetype=obj | \
2-
# RUN: not llvm-dwarfdump -verify --verify-num-threads 1 - | FileCheck %s
2+
# RUN: not llvm-dwarfdump -verify - | FileCheck %s
33

44
# CHECK: error: NameIndex @ 0x0: Abbreviation 0x2: DW_IDX_compile_unit uses an unexpected form DW_FORM_ref1 (expected form class constant).
55
# CHECK: error: NameIndex @ 0x0: Abbreviation 0x2: DW_IDX_type_unit uses an unexpected form DW_FORM_ref1 (expected form class constant).

llvm/test/tools/llvm-dwarfdump/X86/debug-names-verify-completeness.s

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
# RUN: llvm-mc -triple x86_64-pc-linux %s -filetype=obj -o - | not llvm-dwarfdump -verify --verify-num-threads 1 - | FileCheck %s
1+
# RUN: llvm-mc -triple x86_64-pc-linux %s -filetype=obj -o - | not llvm-dwarfdump -verify - | FileCheck %s
22

33
# CHECK: error: Name Index @ 0x0: Entry for DIE @ {{.*}} (DW_TAG_namespace) with name namesp missing.
44
# CHECK: error: Name Index @ 0x0: Entry for DIE @ {{.*}} (DW_TAG_variable) with name var_block_addr missing.

llvm/test/tools/llvm-dwarfdump/X86/debug-names-verify-cu-lists.s

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
# RUN: llvm-mc -triple x86_64-pc-linux %s -filetype=obj | \
2-
# RUN: not llvm-dwarfdump -verify --verify-num-threads 1 - | FileCheck %s
2+
# RUN: not llvm-dwarfdump -verify - | FileCheck %s
33

44
# CHECK: error: Name Index @ 0x0 does not index any CU
55
# CHECK: error: Name Index @ 0x28 references a non-existing CU @ 0x1

llvm/test/tools/llvm-dwarfdump/X86/debug-names-verify-entries.s

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
# RUN: llvm-mc -triple x86_64-pc-linux %s -filetype=obj -o - | not llvm-dwarfdump -verify --verify-num-threads 1 - | FileCheck %s
1+
# RUN: llvm-mc -triple x86_64-pc-linux %s -filetype=obj -o - | not llvm-dwarfdump -verify - | FileCheck %s
22

33
# CHECK: error: Name Index @ 0x0: Unable to get string associated with name 1.
44
# CHECK: error: Name Index @ 0x0: Entry @ 0x73 contains an invalid CU index (47).

llvm/test/tools/llvm-dwarfdump/verify_split_dwarf_debug_names.test

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
# RUN: yaml2obj %p/Inputs/verify_split_dwarf_debug_names_exe.yaml > %t1/a.out
66
# RUN: yaml2obj %p/Inputs/verify_split_dwarf_debug_names_main_dwo.yaml > %t1/main.dwo
77
# RUN: cd %t1
8-
# RUN: llvm-dwarfdump --verify --verify-num-threads 1 %t1/a.out | FileCheck %s
8+
# RUN: llvm-dwarfdump --verify %t1/a.out | FileCheck %s
99

1010
# CHECK: Verifying unit: 1 / 1
1111
# CHECK: Verifying dwo Units...
@@ -17,7 +17,7 @@
1717
# Now verify if we remove the "main.dwo" file that we get an error letting us
1818
# know that the .dwo file was not able to be found.
1919
# RUN: rm %t1/main.dwo
20-
# RUN: not llvm-dwarfdump --verify --verify-num-threads 1 %t1/a.out | FileCheck --check-prefix=NODWO %s
20+
# RUN: not llvm-dwarfdump --verify %t1/a.out | FileCheck --check-prefix=NODWO %s
2121

2222
# NODWO: Verifying unit: 1 / 1
2323
# NODWO: Verifying dwo Units...

llvm/test/tools/llvm-dwarfdump/verify_split_dwarf_debug_names_ftus.test

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
# RUN: yaml2obj %p/Inputs/verify_split_dwarf_debug_names_ftus_exe.yaml > %t1/a.out
66
# RUN: yaml2obj %p/Inputs/verify_split_dwarf_debug_names_ftus_dwo.yaml > %t1/main.dwo
77
# RUN: cd %t1
8-
# RUN: llvm-dwarfdump --verify --verify-num-threads 1 %t1/a.out | FileCheck %s
8+
# RUN: llvm-dwarfdump --verify %t1/a.out | FileCheck %s
99

1010
# CHECK: Verifying unit: 1 / 1
1111
# CHECK: Verifying dwo Units...
@@ -17,7 +17,7 @@
1717
# Now verify if we remove the "main.dwo" file that we get an error letting us
1818
# know that the .dwo file was not able to be found.
1919
# RUN: rm %t1/main.dwo
20-
# RUN: not llvm-dwarfdump --verify --verify-num-threads 1 %t1/a.out | FileCheck --check-prefix=NODWO %s
20+
# RUN: not llvm-dwarfdump --verify %t1/a.out | FileCheck --check-prefix=NODWO %s
2121

2222
# NODWO: Verifying unit: 1 / 1
2323
# NODWO: Verifying dwo Units...

llvm/tools/llvm-dwarfdump/llvm-dwarfdump.cpp

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -287,8 +287,12 @@ static cl::opt<bool>
287287
static opt<bool> Verify("verify", desc("Verify the DWARF debug info."),
288288
cat(DwarfDumpCategory));
289289
static opt<unsigned> VerifyNumThreads(
290-
"verify-num-threads", init(hardware_concurrency().compute_thread_count()),
291-
desc("Number of threads to use for --verify."), cat(DwarfDumpCategory));
290+
"verify-num-threads", init(1),
291+
desc("Number of threads to use for --verify. Single threaded verification "
292+
"is the default unless this option is specified. This can cause the "
293+
"output to be non determinisitic, but can speed up verification and "
294+
"is useful when running with the summary only or JSON summary modes."),
295+
cat(DwarfDumpCategory));
292296
static opt<ErrorDetailLevel> ErrorDetails(
293297
"error-display", init(Unspecified),
294298
desc("Set the level of detail and summary to display when verifying "

0 commit comments

Comments
 (0)