[llvm] [BOLT][DWARF] Remove deprecated opt (PR #99575)
Sayhaan Siddiqui via llvm-commits
llvm-commits at lists.llvm.org
Thu Jul 18 16:43:02 PDT 2024
https://github.com/sayhaan updated https://github.com/llvm/llvm-project/pull/99575
>From fddc66a391cc3584bf56a1f6a4374fd1e9ebf587 Mon Sep 17 00:00:00 2001
From: Sayhaan Siddiqui <sayhaan at meta.com>
Date: Thu, 18 Jul 2024 14:41:56 -0700
Subject: [PATCH 1/9] Remove deprecated opt
Summary:
Test Plan:
Reviewers:
Subscribers:
Tasks:
Tags:
Differential Revision: https://phabricator.intern.facebook.com/D59935657
---
bolt/lib/Rewrite/DWARFRewriter.cpp | 14 +-------------
1 file changed, 1 insertion(+), 13 deletions(-)
diff --git a/bolt/lib/Rewrite/DWARFRewriter.cpp b/bolt/lib/Rewrite/DWARFRewriter.cpp
index 4ba6344925856..213da8d59f19d 100644
--- a/bolt/lib/Rewrite/DWARFRewriter.cpp
+++ b/bolt/lib/Rewrite/DWARFRewriter.cpp
@@ -326,12 +326,6 @@ static cl::opt<bool> KeepARanges(
"keep or generate .debug_aranges section if .gdb_index is written"),
cl::Hidden, cl::cat(BoltCategory));
-static cl::opt<bool> DeterministicDebugInfo(
- "deterministic-debuginfo",
- cl::desc("disables parallel execution of tasks that may produce "
- "nondeterministic debug info"),
- cl::init(true), cl::cat(BoltCategory));
-
static cl::opt<std::string> DwarfOutputPath(
"dwarf-output-path",
cl::desc("Path to where .dwo files or dwp file will be written out to."),
@@ -607,11 +601,6 @@ void DWARFRewriter::updateDebugInfo() {
StrWriter = std::make_unique<DebugStrWriter>(*BC.DwCtx, false);
StrOffstsWriter = std::make_unique<DebugStrOffsetsWriter>(BC);
- if (!opts::DeterministicDebugInfo) {
- opts::DeterministicDebugInfo = true;
- errs() << "BOLT-WARNING: --deterministic-debuginfo is being deprecated\n";
- }
-
/// Stores and serializes information that will be put into the
/// .debug_addr DWARF section.
std::unique_ptr<DebugAddrWriter> FinalAddrWriter;
@@ -759,8 +748,7 @@ void DWARFRewriter::updateDebugInfo() {
CUOffsetMap OffsetMap =
finalizeTypeSections(DIEBlder, *Streamer, GDBIndexSection);
- const bool SingleThreadedMode =
- opts::NoThreads || opts::DeterministicDebugInfo;
+ const bool SingleThreadedMode = opts::NoThreads;
if (!SingleThreadedMode)
DIEBlder.buildCompileUnits();
if (SingleThreadedMode) {
>From d33936cdc4d83935848f345eb8a3213c3919eea6 Mon Sep 17 00:00:00 2001
From: Sayhaan Siddiqui <sayhaan at meta.com>
Date: Thu, 18 Jul 2024 15:06:52 -0700
Subject: [PATCH 2/9] Update initialization
---
bolt/lib/Rewrite/DWARFRewriter.cpp | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/bolt/lib/Rewrite/DWARFRewriter.cpp b/bolt/lib/Rewrite/DWARFRewriter.cpp
index 213da8d59f19d..df0aee2dc28ce 100644
--- a/bolt/lib/Rewrite/DWARFRewriter.cpp
+++ b/bolt/lib/Rewrite/DWARFRewriter.cpp
@@ -748,7 +748,7 @@ void DWARFRewriter::updateDebugInfo() {
CUOffsetMap OffsetMap =
finalizeTypeSections(DIEBlder, *Streamer, GDBIndexSection);
- const bool SingleThreadedMode = opts::NoThreads;
+ const bool SingleThreadedMode = true;
if (!SingleThreadedMode)
DIEBlder.buildCompileUnits();
if (SingleThreadedMode) {
>From e059b063dddfd83ed13758200c57fceabe029207 Mon Sep 17 00:00:00 2001
From: Sayhaan Siddiqui <sayhaan at meta.com>
Date: Thu, 18 Jul 2024 15:14:23 -0700
Subject: [PATCH 3/9] Update docs
Summary:
Test Plan:
Reviewers:
Subscribers:
Tasks:
Tags:
Differential Revision: https://phabricator.intern.facebook.com/D59937644
---
bolt/docs/CommandLineArgumentReference.md | 5 -----
1 file changed, 5 deletions(-)
diff --git a/bolt/docs/CommandLineArgumentReference.md b/bolt/docs/CommandLineArgumentReference.md
index bd6e2ec01b53e..711b4c07ea47f 100644
--- a/bolt/docs/CommandLineArgumentReference.md
+++ b/bolt/docs/CommandLineArgumentReference.md
@@ -113,11 +113,6 @@
Prints out offsets for abbrev and debug_info of Skeleton CUs that get patched.
-- `--deterministic-debuginfo`
-
- Disables parallel execution of tasks that may produce nondeterministic debug
- info
-
- `--dot-tooltip-code`
Add basic block instructions as tool tips on nodes
>From 2206952a57f684593d0085fc7cfb0e5ce383f2aa Mon Sep 17 00:00:00 2001
From: Sayhaan Siddiqui <sayhaan at meta.com>
Date: Thu, 18 Jul 2024 16:34:32 -0700
Subject: [PATCH 4/9] Remove opt code
---
bolt/lib/Rewrite/DWARFRewriter.cpp | 11 -----------
1 file changed, 11 deletions(-)
diff --git a/bolt/lib/Rewrite/DWARFRewriter.cpp b/bolt/lib/Rewrite/DWARFRewriter.cpp
index df0aee2dc28ce..b2bbf05f5806e 100644
--- a/bolt/lib/Rewrite/DWARFRewriter.cpp
+++ b/bolt/lib/Rewrite/DWARFRewriter.cpp
@@ -748,10 +748,6 @@ void DWARFRewriter::updateDebugInfo() {
CUOffsetMap OffsetMap =
finalizeTypeSections(DIEBlder, *Streamer, GDBIndexSection);
- const bool SingleThreadedMode = true;
- if (!SingleThreadedMode)
- DIEBlder.buildCompileUnits();
- if (SingleThreadedMode) {
CUPartitionVector PartVec = partitionCUs(*BC.DwCtx);
for (std::vector<DWARFUnit *> &Vec : PartVec) {
DIEBlder.buildCompileUnits(Vec);
@@ -759,13 +755,6 @@ void DWARFRewriter::updateDebugInfo() {
processUnitDIE(CU, &DIEBlder);
finalizeCompileUnits(DIEBlder, *Streamer, OffsetMap,
DIEBlder.getProcessedCUs(), *FinalAddrWriter);
- }
- } else {
- // Update unit debug info in parallel
- ThreadPoolInterface &ThreadPool = ParallelUtilities::getThreadPool();
- for (std::unique_ptr<DWARFUnit> &CU : BC.DwCtx->compile_units())
- ThreadPool.async(processUnitDIE, CU.get(), &DIEBlder);
- ThreadPool.wait();
}
DebugNamesTable.emitAccelTable();
>From 0d0c7e274ed09034cffdecda6cf3f2491a481a0b Mon Sep 17 00:00:00 2001
From: Sayhaan Siddiqui <sayhaan at meta.com>
Date: Thu, 18 Jul 2024 16:36:36 -0700
Subject: [PATCH 5/9] Formatting changes
---
bolt/lib/Rewrite/DWARFRewriter.cpp | 13 ++++++-------
1 file changed, 6 insertions(+), 7 deletions(-)
diff --git a/bolt/lib/Rewrite/DWARFRewriter.cpp b/bolt/lib/Rewrite/DWARFRewriter.cpp
index b2bbf05f5806e..3d62d1762116a 100644
--- a/bolt/lib/Rewrite/DWARFRewriter.cpp
+++ b/bolt/lib/Rewrite/DWARFRewriter.cpp
@@ -748,13 +748,12 @@ void DWARFRewriter::updateDebugInfo() {
CUOffsetMap OffsetMap =
finalizeTypeSections(DIEBlder, *Streamer, GDBIndexSection);
- CUPartitionVector PartVec = partitionCUs(*BC.DwCtx);
- for (std::vector<DWARFUnit *> &Vec : PartVec) {
- DIEBlder.buildCompileUnits(Vec);
- for (DWARFUnit *CU : DIEBlder.getProcessedCUs())
- processUnitDIE(CU, &DIEBlder);
- finalizeCompileUnits(DIEBlder, *Streamer, OffsetMap,
- DIEBlder.getProcessedCUs(), *FinalAddrWriter);
+ CUPartitionVector PartVec = partitionCUs(*BC.DwCtx);
+ for (std::vector<DWARFUnit *> &Vec : PartVec) {
+ DIEBlder.buildCompileUnits(Vec);
+ for (DWARFUnit *CU : DIEBlder.getProcessedCUs())
+ processUnitDIE(CU, &DIEBlder);
+ finalizeCompileUnits(DIEBlder, *Streamer, OffsetMap, DIEBlder.getProcessedCUs(), *FinalAddrWriter);
}
DebugNamesTable.emitAccelTable();
>From cecffdd3b712b5dd0f7fb395fceec6f8ede03f4b Mon Sep 17 00:00:00 2001
From: Sayhaan Siddiqui <sayhaan at meta.com>
Date: Thu, 18 Jul 2024 16:38:21 -0700
Subject: [PATCH 6/9] Formatting changes
---
bolt/lib/Rewrite/DWARFRewriter.cpp | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
diff --git a/bolt/lib/Rewrite/DWARFRewriter.cpp b/bolt/lib/Rewrite/DWARFRewriter.cpp
index 3d62d1762116a..1ec216b39e95c 100644
--- a/bolt/lib/Rewrite/DWARFRewriter.cpp
+++ b/bolt/lib/Rewrite/DWARFRewriter.cpp
@@ -753,7 +753,8 @@ void DWARFRewriter::updateDebugInfo() {
DIEBlder.buildCompileUnits(Vec);
for (DWARFUnit *CU : DIEBlder.getProcessedCUs())
processUnitDIE(CU, &DIEBlder);
- finalizeCompileUnits(DIEBlder, *Streamer, OffsetMap, DIEBlder.getProcessedCUs(), *FinalAddrWriter);
+ finalizeCompileUnits(DIEBlder, *Streamer, OffsetMap,
+ DIEBlder.getProcessedCUs(), *FinalAddrWriter);
}
DebugNamesTable.emitAccelTable();
>From a6bce1dbcd1641c5ef81f8e04c3e3fcd6a662cd0 Mon Sep 17 00:00:00 2001
From: Sayhaan Siddiqui <sayhaan at meta.com>
Date: Thu, 18 Jul 2024 16:39:33 -0700
Subject: [PATCH 7/9] Formatting changes
---
bolt/lib/Rewrite/DWARFRewriter.cpp | 3 +--
1 file changed, 1 insertion(+), 2 deletions(-)
diff --git a/bolt/lib/Rewrite/DWARFRewriter.cpp b/bolt/lib/Rewrite/DWARFRewriter.cpp
index 1ec216b39e95c..3d62d1762116a 100644
--- a/bolt/lib/Rewrite/DWARFRewriter.cpp
+++ b/bolt/lib/Rewrite/DWARFRewriter.cpp
@@ -753,8 +753,7 @@ void DWARFRewriter::updateDebugInfo() {
DIEBlder.buildCompileUnits(Vec);
for (DWARFUnit *CU : DIEBlder.getProcessedCUs())
processUnitDIE(CU, &DIEBlder);
- finalizeCompileUnits(DIEBlder, *Streamer, OffsetMap,
- DIEBlder.getProcessedCUs(), *FinalAddrWriter);
+ finalizeCompileUnits(DIEBlder, *Streamer, OffsetMap, DIEBlder.getProcessedCUs(), *FinalAddrWriter);
}
DebugNamesTable.emitAccelTable();
>From 2f525a20caa5b7599b0b8c536fbd7679f1bb57f7 Mon Sep 17 00:00:00 2001
From: Sayhaan Siddiqui <sayhaan at meta.com>
Date: Thu, 18 Jul 2024 16:41:04 -0700
Subject: [PATCH 8/9] Formatting changes
---
bolt/lib/Rewrite/DWARFRewriter.cpp | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
diff --git a/bolt/lib/Rewrite/DWARFRewriter.cpp b/bolt/lib/Rewrite/DWARFRewriter.cpp
index 3d62d1762116a..1ec216b39e95c 100644
--- a/bolt/lib/Rewrite/DWARFRewriter.cpp
+++ b/bolt/lib/Rewrite/DWARFRewriter.cpp
@@ -753,7 +753,8 @@ void DWARFRewriter::updateDebugInfo() {
DIEBlder.buildCompileUnits(Vec);
for (DWARFUnit *CU : DIEBlder.getProcessedCUs())
processUnitDIE(CU, &DIEBlder);
- finalizeCompileUnits(DIEBlder, *Streamer, OffsetMap, DIEBlder.getProcessedCUs(), *FinalAddrWriter);
+ finalizeCompileUnits(DIEBlder, *Streamer, OffsetMap,
+ DIEBlder.getProcessedCUs(), *FinalAddrWriter);
}
DebugNamesTable.emitAccelTable();
>From 6e5699234cedb00725b2bd76845c9dcad8b16206 Mon Sep 17 00:00:00 2001
From: Sayhaan Siddiqui <sayhaan at meta.com>
Date: Thu, 18 Jul 2024 16:41:54 -0700
Subject: [PATCH 9/9] Formatting changes
More information about the llvm-commits
mailing list