Skip to content

Commit 843e9e1

Browse files
sayhaansayhaan
committed
Updates
1 parent fe32431 commit 843e9e1

File tree

53 files changed

+75
-64
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

53 files changed

+75
-64
lines changed

‎bolt/docs/CommandLineArgumentReference.md

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -113,6 +113,10 @@
113113

114114
Prints out offsets for abbrev and debug_info of Skeleton CUs that get patched.
115115

116+
- `--debug-thread-count=<uint>`
117+
118+
Specifies the number of threads to be used when processing DWO debug information.
119+
116120
- `--dot-tooltip-code`
117121

118122
Add basic block instructions as tool tips on nodes

‎bolt/include/bolt/Core/DebugData.h

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -277,7 +277,9 @@ class DebugRangeListsSectionWriter : public DebugRangesSectionWriter {
277277
void finalizeSection() override;
278278

279279
// Returns true if section is empty.
280-
bool empty() { return RangesBuffer->empty(); }
280+
bool empty() {
281+
return RangesBuffer.get() == nullptr || RangesBuffer->empty();
282+
}
281283

282284
static bool classof(const DebugRangesSectionWriter *Writer) {
283285
return Writer->getKind() == RangesWriterKind::DebugRangeListsWriter;

‎bolt/include/bolt/Core/ParallelUtilities.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -51,7 +51,7 @@ enum SchedulingPolicy {
5151

5252
/// Return the managed thread pool and initialize it if not initialized.
5353
ThreadPoolInterface &
54-
getThreadPool(const unsigned int ThreadsCount = opts::ThreadCount);
54+
getThreadPool(const unsigned ThreadsCount = opts::ThreadCount);
5555

5656
/// Perform the work on each BinaryFunction except those that are accepted
5757
/// by SkipPredicate, scheduling heuristic is based on SchedPolicy.

‎bolt/include/bolt/Rewrite/DWARFRewriter.h

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -184,7 +184,8 @@ class DWARFRewriter {
184184
/// Output .dwo files.
185185
void writeDWOFiles(DWARFUnit &, const OverriddenSectionsMap &,
186186
const std::string &, DebugLocWriter &,
187-
DebugStrOffsetsWriter &, DebugStrWriter &);
187+
DebugStrOffsetsWriter &, DebugStrWriter &,
188+
DebugRangesSectionWriter &);
188189
using KnownSectionsEntry = std::pair<MCSection *, DWARFSectionKind>;
189190
};
190191

‎bolt/lib/Core/BinaryContext.cpp

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -120,6 +120,7 @@ void BinaryContext::logBOLTErrorsAndQuitOnFatal(Error E) {
120120
});
121121
}
122122

123+
std::mutex ArchMutex;
123124
BinaryContext::BinaryContext(std::unique_ptr<MCContext> Ctx,
124125
std::unique_ptr<DWARFContext> DwCtx,
125126
std::unique_ptr<Triple> TheTriple,
@@ -142,7 +143,10 @@ BinaryContext::BinaryContext(std::unique_ptr<MCContext> Ctx,
142143
InstPrinter(std::move(InstPrinter)), MIA(std::move(MIA)),
143144
MIB(std::move(MIB)), MRI(std::move(MRI)), DisAsm(std::move(DisAsm)),
144145
Logger(Logger), InitialDynoStats(isAArch64()) {
145-
Relocation::Arch = this->TheTriple->getArch();
146+
{
147+
std::lock_guard<std::mutex> Lock(ArchMutex);
148+
Relocation::Arch = this->TheTriple->getArch();
149+
}
146150
RegularPageSize = isAArch64() ? RegularPageSizeAArch64 : RegularPageSizeX86;
147151
PageAlign = opts::NoHugePages ? RegularPageSize : HugePageSize;
148152
}

‎bolt/lib/Core/ParallelUtilities.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -102,7 +102,7 @@ inline unsigned estimateTotalCost(const BinaryContext &BC,
102102

103103
} // namespace
104104

105-
ThreadPoolInterface &getThreadPool(const unsigned int ThreadsCount) {
105+
ThreadPoolInterface &getThreadPool(const unsigned ThreadsCount) {
106106
if (ThreadPoolPtr.get())
107107
return *ThreadPoolPtr;
108108

‎bolt/lib/Rewrite/DWARFRewriter.cpp

Lines changed: 13 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -481,8 +481,8 @@ static void emitDWOBuilder(const std::string &DWOName,
481481
DWARFUnit &SplitCU, DWARFUnit &CU,
482482
DebugLocWriter &LocWriter,
483483
DebugStrOffsetsWriter &StrOffstsWriter,
484-
DebugStrWriter &StrWriter,
485-
GDBIndex &GDBIndexSection) {
484+
DebugStrWriter &StrWriter, GDBIndex &GDBIndexSection,
485+
DebugRangesSectionWriter &TempRangesSectionWriter) {
486486
// Populate debug_info and debug_abbrev for current dwo into StringRef.
487487
DWODIEBuilder.generateAbbrevs();
488488
DWODIEBuilder.finish();
@@ -538,7 +538,7 @@ static void emitDWOBuilder(const std::string &DWOName,
538538
OverriddenSections[Kind] = Contents;
539539
}
540540
Rewriter.writeDWOFiles(CU, OverriddenSections, DWOName, LocWriter,
541-
StrOffstsWriter, StrWriter);
541+
StrOffstsWriter, StrWriter, TempRangesSectionWriter);
542542
}
543543

544544
using DWARFUnitVec = std::vector<DWARFUnit *>;
@@ -675,7 +675,7 @@ void DWARFRewriter::updateDebugInfo() {
675675

676676
emitDWOBuilder(DWOName, DWODIEBuilder, *this, SplitCU, Unit,
677677
DebugLocDWoWriter, DWOStrOffstsWriter, DWOStrWriter,
678-
GDBIndexSection);
678+
GDBIndexSection, TempRangesSectionWriter);
679679
};
680680
auto processMainBinaryCU = [&](DWARFUnit &Unit, DIEBuilder &DIEBlder) {
681681
std::optional<DWARFUnit *> SplitCU;
@@ -738,9 +738,9 @@ void DWARFRewriter::updateDebugInfo() {
738738
continue;
739739
DebugAddrWriter &AddressWriter =
740740
*AddressWritersByCU[CU->getOffset()].get();
741-
DebugRangesSectionWriter *TempRangesSectionWriter =
742-
CU->getVersion() >= 5 ? RangeListsWritersByCU[*DWOId].get()
743-
: LegacyRangesWritersByCU[*DWOId].get();
741+
DebugRangesSectionWriter &TempRangesSectionWriter =
742+
CU->getVersion() >= 5 ? *RangeListsWritersByCU[*DWOId].get()
743+
: *LegacyRangesWritersByCU[*DWOId].get();
744744
std::optional<std::string> DwarfOutputPath =
745745
opts::DwarfOutputPath.empty()
746746
? std::nullopt
@@ -753,8 +753,8 @@ void DWARFRewriter::updateDebugInfo() {
753753
*DWODIEBuildersByCU.emplace_back(std::move(DWODIEBuilderPtr)).get();
754754
if (CU->getVersion() >= 5)
755755
StrOffstsWriter->finalizeSection(*CU, DIEBlder);
756-
ThreadPool.async([&, DwarfOutputPath, DWOName] {
757-
processSplitCU(*CU, **SplitCU, DIEBlder, *TempRangesSectionWriter,
756+
ThreadPool.async([&, DwarfOutputPath, DWOName, CU, SplitCU] {
757+
processSplitCU(*CU, **SplitCU, DIEBlder, TempRangesSectionWriter,
758758
AddressWriter, DWOName, DwarfOutputPath, DWODIEBuilder);
759759
});
760760
}
@@ -1819,7 +1819,8 @@ std::optional<StringRef> updateDebugData(
18191819
void DWARFRewriter::writeDWOFiles(
18201820
DWARFUnit &CU, const OverriddenSectionsMap &OverridenSections,
18211821
const std::string &DWOName, DebugLocWriter &LocWriter,
1822-
DebugStrOffsetsWriter &StrOffstsWriter, DebugStrWriter &StrWriter) {
1822+
DebugStrOffsetsWriter &StrOffstsWriter, DebugStrWriter &StrWriter,
1823+
DebugRangesSectionWriter &TempRangesSectionWriter) {
18231824
// Setup DWP code once.
18241825
DWARFContext *DWOCtx = BC.getDWOContext();
18251826
const uint64_t DWOId = *CU.getDWOId();
@@ -1866,9 +1867,8 @@ void DWARFRewriter::writeDWOFiles(
18661867

18671868
DebugRangeListsSectionWriter *RangeListssWriter = nullptr;
18681869
if (CU.getVersion() == 5) {
1869-
assert(RangeListsWritersByCU.count(DWOId) != 0 &&
1870-
"No RangeListsWriter for DWO ID.");
1871-
RangeListssWriter = RangeListsWritersByCU[DWOId].get();
1870+
RangeListssWriter =
1871+
llvm::dyn_cast<DebugRangeListsSectionWriter>(&TempRangesSectionWriter);
18721872

18731873
// Handling .debug_rnglists.dwo separately. The original .o/.dwo might not
18741874
// have .debug_rnglists so won't be part of the loop below.

‎bolt/test/X86/dwarf4-cross-cu-backward-different-abbrev.test

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
# RUN: llvm-mc -dwarf-version=4 -filetype=obj -triple x86_64-unknown-linux %p/Inputs/dwarf4-cross-reference-different-abbrev-dst.s -o %t.o
44
# RUN: llvm-mc -dwarf-version=4 -filetype=obj -triple x86_64-unknown-linux %p/Inputs/dwarf4-cross-reference-different-abbrev-src.s -o %t1.o
55
# RUN: %clang %cflags -gdwarf-4 %t.o %t1.o -o %t.exe
6-
# RUN: llvm-bolt %t.exe -o %t.bolt --update-debug-sections --debug-thread-count=72
6+
# RUN: llvm-bolt %t.exe -o %t.bolt --update-debug-sections --debug-thread-count=72 --cu-processing-batch-size=72
77
# RUN: llvm-dwarfdump --show-form --verbose --debug-info %t.exe | FileCheck --check-prefix=PRECHECK %s
88
# RUN: llvm-dwarfdump --show-form --verbose --debug-info %t.bolt | FileCheck --check-prefix=POSTCHECK %s
99

‎bolt/test/X86/dwarf4-cross-cu-forward-different-abbrev.test

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
# RUN: llvm-mc -dwarf-version=4 -filetype=obj -triple x86_64-unknown-linux %p/Inputs/dwarf4-cross-reference-different-abbrev-dst.s -o %t.o
44
# RUN: llvm-mc -dwarf-version=4 -filetype=obj -triple x86_64-unknown-linux %p/Inputs/dwarf4-cross-reference-different-abbrev-src.s -o %t1.o
55
# RUN: %clang %cflags -gdwarf-4 %t1.o %t.o -o %t.exe
6-
# RUN: llvm-bolt %t.exe -o %t.bolt --update-debug-sections --debug-thread-count=72
6+
# RUN: llvm-bolt %t.exe -o %t.bolt --update-debug-sections --debug-thread-count=72 --cu-processing-batch-size=72
77
# RUN: llvm-dwarfdump --show-form --verbose --debug-info %t.exe | FileCheck --check-prefix=PRECHECK %s
88
# RUN: llvm-dwarfdump --show-form --verbose --debug-info %t.bolt | FileCheck --check-prefix=POSTCHECK %s
99

‎bolt/test/X86/dwarf4-cross-cu-loclist-dwarf4-loclist--dwarf5-loclist.test

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
# RUN: llvm-mc -dwarf-version=5 -filetype=obj -triple x86_64-unknown-linux %p/Inputs/dwarf5-loclist.s -o %t1.o
55
# RUN: llvm-mc -dwarf-version=4 -filetype=obj -triple x86_64-unknown-linux %p/Inputs/dwarf4-two-entries-loclist.s -o %t2.o
66
# RUN: %clang %cflags %t1.o %t2.o %t.o -o %t.exe
7-
# RUN: llvm-bolt %t.exe -o %t.bolt --update-debug-sections --debug-thread-count=72
7+
# RUN: llvm-bolt %t.exe -o %t.bolt --update-debug-sections --debug-thread-count=72 --cu-processing-batch-size=72
88
# RUN: llvm-dwarfdump --show-form --verbose --debug-info %t.exe | FileCheck --check-prefix=PRECHECK %s
99
# RUN: llvm-dwarfdump --show-form --verbose --debug-info %t.bolt | FileCheck --check-prefix=POSTCHECK %s
1010

‎bolt/test/X86/dwarf4-df-dualcu-loclist.test

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
; RUN: llvm-mc -dwarf-version=4 -filetype=obj -triple x86_64-unknown-linux %p/Inputs/dwarf4-df-dualcu-loclist-helper.s \
77
; RUN: -split-dwarf-file=helper.dwo -o helper.o
88
; RUN: %clang %cflags -gdwarf-5 -O2 -gsplit-dwarf=split main.o helper.o -o main.exe
9-
; RUN: llvm-bolt main.exe -o main.exe.bolt --update-debug-sections --debug-thread-count=72
9+
; RUN: llvm-bolt main.exe -o main.exe.bolt --update-debug-sections --debug-thread-count=1 --cu-processing-batch-size=72
1010
; RUN: llvm-dwarfdump --show-form --verbose --debug-info main.dwo | FileCheck -check-prefix=PRE-BOLT-DWO-MAIN %s
1111
; RUN: llvm-dwarfdump --show-form --verbose --debug-info main.dwo.dwo | FileCheck -check-prefix=BOLT-DWO-MAIN %s
1212
; RUN: llvm-dwarfdump --show-form --verbose --debug-info helper.dwo | FileCheck -check-prefix=PRE-BOLT-DWO-HELPER %s

‎bolt/test/X86/dwarf4-df-dualcu.test

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
; RUN: llvm-mc -dwarf-version=4 -filetype=obj -triple x86_64-unknown-linux %p/Inputs/dwarf4-df-dualcu-helper.s \
77
; RUN: -split-dwarf-file=helper.dwo -o helper.o
88
; RUN: %clang %cflags -gdwarf-5 -gsplit-dwarf=split main.o helper.o -o main.exe -fno-pic -no-pie
9-
; RUN: llvm-bolt main.exe -o main.exe.bolt --update-debug-sections --always-convert-to-ranges --debug-thread-count=72
9+
; RUN: llvm-bolt main.exe -o main.exe.bolt --update-debug-sections --always-convert-to-ranges
1010
; RUN: llvm-dwarfdump --show-form --verbose --debug-info main.exe | FileCheck -check-prefix=PRE-BOLT %s
1111
; RUN: llvm-dwarfdump --show-form --verbose --debug-ranges main.exe.bolt &> %t/foo.txt
1212
; RUN: llvm-dwarfdump --show-form --verbose --debug-info main.exe.bolt >> %t/foo.txt

‎bolt/test/X86/dwarf4-df-input-lowpc-ranges-cus.test

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
; RUN: llvm-mc -dwarf-version=4 -filetype=obj -triple x86_64-unknown-linux %p/Inputs/dwarf4-df-input-lowpc-ranges-other.s \
77
; RUN: -split-dwarf-file=mainOther.dwo -o other.o
88
; RUN: %clang %cflags -gdwarf-4 -gsplit-dwarf=split main.o other.o -o main.exe
9-
; RUN: llvm-bolt main.exe -o main.exe.bolt --update-debug-sections --debug-thread-count=72
9+
; RUN: llvm-bolt main.exe -o main.exe.bolt --update-debug-sections
1010
; RUN: llvm-dwarfdump --show-form --verbose --debug-ranges main.exe.bolt &> %t/foo.txt
1111
; RUN: llvm-dwarfdump --show-form --verbose --debug-info main.exe.bolt >> %t/foo.txt
1212
; RUN: cat %t/foo.txt | FileCheck -check-prefix=BOLT %s

‎bolt/test/X86/dwarf4-split-dwarf-no-address.test

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
; RUN: llvm-mc --split-dwarf-file=helper.dwo --triple=x86_64-unknown-linux-gnu \
77
; RUN: --filetype=obj %p/Inputs/dwarf4-split-dwarf-no-address-helper.s -o=helper.o
88
; RUN: %clang %cflags -gdwarf-4 -gsplit-dwarf=split main.o helper.o -o main.exe -fno-pic -no-pie
9-
; RUN: llvm-bolt main.exe -o main.exe.bolt --update-debug-sections --debug-thread-count=72
9+
; RUN: llvm-bolt main.exe -o main.exe.bolt --update-debug-sections --debug-thread-count=72 --cu-processing-batch-size=72
1010
; RUN: llvm-dwarfdump --show-form --verbose --debug-info main.exe.bolt | FileCheck -check-prefix=BOLT %s
1111

1212
;; Testing that there are no asserts/crashes when one of the DWARF4 CUs does not modify .debug_addr

‎bolt/test/X86/dwarf4-split-gdb-index-types-gdb-generated.test

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
# RUN: llvm-mc --split-dwarf-file=helper.dwo -dwarf-version=4 -filetype=obj -triple x86_64-unknown-linux %p/Inputs/dwarf4-split-gdb-index-types-helper.s -o helpergdb.o
88
# RUN: %clang %cflags maingdb.o helpergdb.o -o maingdb.exe -Wl,-q
99
# RUN: llvm-objcopy maingdb.exe --add-section=.gdb_index=%p/Inputs/dwarf4-split-gdb-index-types-v8.gdb-index
10-
# RUN: llvm-bolt maingdb.exe -o maingdb.exe.bolt --update-debug-sections --debug-thread-count=72
10+
# RUN: llvm-bolt maingdb.exe -o maingdb.exe.bolt --update-debug-sections
1111
# RUN: llvm-dwarfdump --gdb-index maingdb.exe.bolt | FileCheck --check-prefix=POSTCHECK %s
1212

1313
## Tests that BOLT correctly handles gdb-index generated by GDB with split-dwarf DWARF4.

‎bolt/test/X86/dwarf4-subprogram-multiple-ranges-cus.test

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
# RUN: llvm-mc -dwarf-version=4 -filetype=obj -triple x86_64-unknown-linux %p/Inputs/dwarf4-subprogram-multiple-ranges-main.s -o %t1.o
44
# RUN: llvm-mc -dwarf-version=4 -filetype=obj -triple x86_64-unknown-linux %p/Inputs/dwarf4-subprogram-multiple-ranges-other.s -o %t2.o
55
# RUN: %clang %cflags %t1.o %t2.o -o %t.exe -Wl,-q
6-
# RUN: llvm-bolt %t.exe -o %t.bolt --update-debug-sections --debug-thread-count=72
6+
# RUN: llvm-bolt %t.exe -o %t.bolt --update-debug-sections --debug-thread-count=72 --cu-processing-batch-size=72
77
# RUN: llvm-objdump %t.bolt --disassemble > %t1.txt
88
# RUN: llvm-dwarfdump --show-form --verbose --debug-info %t.bolt >> %t1.txt
99
# RUN: cat %t1.txt | FileCheck --check-prefix=POSTCHECK %s

‎bolt/test/X86/dwarf4-types-dwarf5-types.test

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
# RUN: llvm-mc -dwarf-version=4 -filetype=obj -triple x86_64-unknown-linux %p/Inputs/dwarf4-types-dwarf5-types-main.s -o %tmain.o
44
# RUN: llvm-mc -dwarf-version=5 -filetype=obj -triple x86_64-unknown-linux %p/Inputs/dwarf4-types-dwarf5-types-helper.s -o %thelper.o
55
# RUN: %clang %cflags %tmain.o %thelper.o -o %t.exe -Wl,-q
6-
# RUN: llvm-bolt %t.exe -o %t.bolt --update-debug-sections --debug-thread-count=72
6+
# RUN: llvm-bolt %t.exe -o %t.bolt --update-debug-sections --debug-thread-count=72 --cu-processing-batch-size=72
77
# RUN: llvm-dwarfdump --show-form --verbose --debug-info %t.bolt | FileCheck --check-prefix=POSTCHECK %s
88
# RUN: llvm-dwarfdump --show-form --verbose --debug-types %t.bolt | FileCheck --check-prefix=POSTCHECKTU %s
99

‎bolt/test/X86/dwarf4-types-dwarf5.test

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
# RUN: llvm-mc -dwarf-version=4 -filetype=obj -triple x86_64-unknown-linux %p/Inputs/dwarf4-types-dwarf5-main.s -o %tmain.o
44
# RUN: llvm-mc -dwarf-version=5 -filetype=obj -triple x86_64-unknown-linux %p/Inputs/dwarf4-types-dwarf5-helper.s -o %thelper.o
55
# RUN: %clang %cflags %tmain.o %thelper.o -o %t.exe -Wl,-q
6-
# RUN: llvm-bolt %t.exe -o %t.bolt --update-debug-sections --debug-thread-count=72
6+
# RUN: llvm-bolt %t.exe -o %t.bolt --update-debug-sections --debug-thread-count=72 --cu-processing-batch-size=72
77
# RUN: llvm-dwarfdump --show-form --verbose --debug-info %t.bolt | FileCheck --check-prefix=POSTCHECK %s
88
# RUN: llvm-dwarfdump --show-form --verbose --debug-types %t.bolt | FileCheck --check-prefix=POSTCHECKTU %s
99

‎bolt/test/X86/dwarf5-addr-section-reuse.s

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
# RUN: llvm-mc -dwarf-version=5 -filetype=obj -triple x86_64-unknown-linux %p/Inputs/dwarf5-helper2-addr-section-reuse.s -o %thelper2.o
44
# RUN: %clang %cflags -dwarf-5 %thelper1.o %tmain.o %thelper2.o -o %t.exe -Wl,-q
55
# RUN: llvm-dwarfdump --debug-info %t.exe | FileCheck --check-prefix=PRECHECK %s
6-
# RUN: llvm-bolt %t.exe -o %t.exe.bolt --update-debug-sections --debug-thread-count=72
6+
# RUN: llvm-bolt %t.exe -o %t.exe.bolt --update-debug-sections --debug-thread-count=72 --cu-processing-batch-size=72
77
# RUN: llvm-dwarfdump --debug-info %t.exe.bolt | FileCheck --check-prefix=POSTCHECK %s
88

99
## This test checks that when a binary is bolted if CU is not modified and has DW_AT_addr_base that is shared

‎bolt/test/X86/dwarf5-call-pc-function-null-check.test

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
# RUN: llvm-mc -dwarf-version=5 -filetype=obj -triple x86_64-unknown-linux %p/Inputs/dwarf5-call-pc-function-null-check-main.s -o %tmain.o
44
# RUN: llvm-mc -dwarf-version=5 -filetype=obj -triple x86_64-unknown-linux %p/Inputs/dwarf5-call-pc-function-null-check-helper.s -o %thelper.o
55
# RUN: %clang %cflags -dwarf-5 %tmain.o %thelper.o -o %t.exe -Wl,-q
6-
# RUN: llvm-bolt %t.exe -o %t.exe.bolt --update-debug-sections --debug-thread-count=72
6+
# RUN: llvm-bolt %t.exe -o %t.exe.bolt --update-debug-sections --debug-thread-count=72 --cu-processing-batch-size=72
77
# RUN: llvm-dwarfdump --show-form --verbose --debug-info %t.exe > %t.txt
88
# RUN: llvm-dwarfdump --show-form --verbose --debug-info %t.exe.bolt >> %t.txt
99
# RUN: cat %t.txt | FileCheck --check-prefix=CHECK %s

‎bolt/test/X86/dwarf5-call-pc.test

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
# RUN: llvm-mc -dwarf-version=5 -filetype=obj -triple x86_64-unknown-linux %p/Inputs/dwarf5-call-pc-main.s -o %tmain.o
44
# RUN: llvm-mc -dwarf-version=5 -filetype=obj -triple x86_64-unknown-linux %p/Inputs/dwarf5-call-pc-helper.s -o %thelper.o
55
# RUN: %clang %cflags -dwarf-5 %tmain.o %thelper.o -o %t.exe -Wl,-q
6-
# RUN: llvm-bolt %t.exe -o %t.exe.bolt --update-debug-sections -reorder-blocks=reverse --debug-thread-count=72
6+
# RUN: llvm-bolt %t.exe -o %t.exe.bolt --update-debug-sections -reorder-blocks=reverse --debug-thread-count=72 --cu-processing-batch-size=72
77
# RUN: llvm-dwarfdump --show-form --verbose --debug-info %t.exe > %tmain.txt
88
# RUN: llvm-objdump %t.exe --disassemble >> %tmain.txt
99
# RUN: llvm-dwarfdump --show-form --verbose --debug-info %t.exe.bolt > %tmainbolt.txt

‎bolt/test/X86/dwarf5-cu-no-debug-addr.test

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
# RUN: llvm-mc -dwarf-version=5 -filetype=obj -triple x86_64-unknown-linux %p/Inputs/dwarf5-cu-no-debug-addr-main.s -o %t1main.o
44
# RUN: llvm-mc -dwarf-version=5 -filetype=obj -triple x86_64-unknown-linux %p/Inputs/dwarf5-cu-no-debug-addr-helper.s -o %t1helper.o
55
# RUN: %clang %cflags -dwarf-5 %t1main.o %t1helper.o -o %t.exe -Wl,-q
6-
# RUN: llvm-bolt %t.exe -o %t.bolt --update-debug-sections --debug-thread-count=72
6+
# RUN: llvm-bolt %t.exe -o %t.bolt --update-debug-sections --debug-thread-count=72 --cu-processing-batch-size=72
77
# RUN: llvm-dwarfdump --show-form --verbose --debug-info %t.exe | FileCheck --check-prefix=PRECHECK %s
88
# RUN: llvm-dwarfdump --show-form --verbose --debug-info %t.bolt | FileCheck --check-prefix=POSTCHECK %s
99

‎bolt/test/X86/dwarf5-df-input-lowpc-ranges-cus.test

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
; RUN: llvm-mc -dwarf-version=5 -filetype=obj -triple x86_64-unknown-linux %p/Inputs/dwarf5-df-input-lowpc-ranges-other.s \
77
; RUN: -split-dwarf-file=mainOther.dwo -o other.o
88
; RUN: %clang %cflags main.o other.o -o main.exe
9-
; RUN: llvm-bolt main.exe -o main.exe.bolt --update-debug-sections --debug-thread-count=72
9+
; RUN: llvm-bolt main.exe -o main.exe.bolt --update-debug-sections --debug-thread-count=1 --cu-processing-batch-size=72
1010
; RUN: llvm-dwarfdump --show-form --verbose --debug-rnglists main.exe.bolt &> %t/foo.txt
1111
; RUN: llvm-dwarfdump --show-form --verbose --debug-addr main.exe.bolt >> %t/foo.txt
1212
; RUN: llvm-dwarfdump --show-form --verbose --debug-info main.exe.bolt >> %t/foo.txt

‎bolt/test/X86/dwarf5-df-mono-dualcu.test

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
; RUN: -split-dwarf-file=main.dwo -o main.o
66
; RUN: llvm-mc -filetype=obj -triple x86_64-unknown-linux-gnu %p/Inputs/dwarf5-df-mono-helper.s -o=helper.o
77
; RUN: %clang %cflags -gdwarf-5 main.o helper.o -o main.exe -fno-pic -no-pie
8-
; RUN: llvm-bolt main.exe -o main.exe.bolt --update-debug-sections --always-convert-to-ranges --debug-thread-count=72
8+
; RUN: llvm-bolt main.exe -o main.exe.bolt --update-debug-sections --always-convert-to-ranges --debug-thread-count=1 --cu-processing-batch-size=72
99
; RUN: llvm-dwarfdump --show-form --verbose --debug-info main.exe | FileCheck -check-prefix=PRE-BOLT %s
1010
; RUN: llvm-dwarfdump --show-form --verbose --debug-addr main.exe.bolt &> %t/foo.txt
1111
; RUN: llvm-dwarfdump --show-form --verbose --debug-info main.exe.bolt >> %t/foo.txt

‎bolt/test/X86/dwarf5-df-output-dir-same-name.test

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@
99
; RUN: llvm-mc -dwarf-version=5 -filetype=obj -triple x86_64-unknown-linux %p/Inputs/dwarf5-df-output-dir-same-name-helper.s \
1010
; RUN: -split-dwarf-file=objects/o2/split.dwo -o helper.o
1111
; RUN: %clang %cflags -gdwarf-5 -gsplit-dwarf=split main.o helper.o -o main.exe
12-
; RUN: llvm-bolt main.exe -o main.exe.bolt --update-debug-sections --dwarf-output-path=%t/dwo --debug-thread-count=72
12+
; RUN: llvm-bolt main.exe -o main.exe.bolt --update-debug-sections --dwarf-output-path=%t/dwo --debug-thread-count=72 --cu-processing-batch-size=72
1313
; RUN: ls -l %t/dwo > log
1414
; RUN: llvm-dwarfdump --debug-info main.exe.bolt >> log
1515
; RUN: cat log | FileCheck -check-prefix=BOLT %s

0 commit comments

Comments
 (0)