https://github.com/sayhaan updated https://github.com/llvm/llvm-project/pull/99225
>From f07d79ccb57075ee75783cb4bd5cba4b4ca6af80 Mon Sep 17 00:00:00 2001 From: Amir Ayupov <aau...@meta.com> Date: Tue, 1 Jun 2021 11:37:41 -0700 Subject: [PATCH 1/4] Rebase: [Facebook] Add clang driver options to test debug info and BOLT Summary: This is an essential piece of infrastructure for us to be continuously testing debug info with BOLT. We can't only make changes to a test repo because we need to change debuginfo tests to call BOLT, hence, this diff needs to sit in our opensource repo. But when upstreaming to LLVM, this should be kept BOLT-only outside of LLVM. When upstreaming, we need to git diff and check all folders that are being modified by our commits and discard this one (and leave as an internal diff). To test BOLT in debuginfo tests, configure it with -DLLVM_TEST_BOLT=ON. Then run check-lldb and check-debuginfo. Manual rebase conflict history: https://phabricator.intern.facebook.com/D29205224 https://phabricator.intern.facebook.com/D29564078 https://phabricator.intern.facebook.com/D33289118 https://phabricator.intern.facebook.com/D34957174 https://phabricator.intern.facebook.com/D35317341 Test Plan: tested locally Configured with: -DLLVM_ENABLE_PROJECTS="clang;lld;lldb;compiler-rt;bolt;debuginfo-tests" -DLLVM_TEST_BOLT=ON Ran test suite with: ninja check-debuginfo ninja check-lldb Reviewers: maks, #llvm-bolt Reviewed By: maks Subscribers: ayermolo, phabricatorlinter Differential Revision: https://phabricator.intern.facebook.com/D46256657 Tasks: T92898286 --- clang/include/clang/Driver/Options.td | 4 ++++ clang/lib/Driver/ToolChains/Gnu.cpp | 29 ++++++++++++++++++++++++++ cross-project-tests/lit.cfg.py | 14 ++++++++++++- cross-project-tests/lit.site.cfg.py.in | 4 ++++ lldb/test/API/lit.cfg.py | 5 +++++ lldb/test/API/lit.site.cfg.py.in | 8 +++++++ lldb/test/Shell/helper/toolchain.py | 5 +++++ lldb/test/Shell/lit.site.cfg.py.in | 9 ++++++++ llvm/CMakeLists.txt | 4 ++++ 9 files changed, 81 insertions(+), 1 deletion(-) diff --git a/clang/include/clang/Driver/Options.td b/clang/include/clang/Driver/Options.td index 9c6cebd77ff0a..8ccbc4b372ba3 100644 --- a/clang/include/clang/Driver/Options.td +++ b/clang/include/clang/Driver/Options.td @@ -5553,6 +5553,10 @@ def pg : Flag<["-"], "pg">, HelpText<"Enable mcount instrumentation">, MarshallingInfoFlag<CodeGenOpts<"InstrumentForProfiling">>; def pipe : Flag<["-", "--"], "pipe">, HelpText<"Use pipes between commands, when possible">; +// Facebook T92898286 +def post_link_optimize : Flag<["--"], "post-link-optimize">, + HelpText<"Apply post-link optimizations using BOLT">; +// End Facebook T92898286 def prebind__all__twolevel__modules : Flag<["-"], "prebind_all_twolevel_modules">; def prebind : Flag<["-"], "prebind">; def preload : Flag<["-"], "preload">; diff --git a/clang/lib/Driver/ToolChains/Gnu.cpp b/clang/lib/Driver/ToolChains/Gnu.cpp index 52c2ee90b1b28..ff20deb9c4f86 100644 --- a/clang/lib/Driver/ToolChains/Gnu.cpp +++ b/clang/lib/Driver/ToolChains/Gnu.cpp @@ -672,12 +672,41 @@ void tools::gnutools::Linker::ConstructJob(Compilation &C, const JobAction &JA, } } + // Facebook T92898286 + if (Args.hasArg(options::OPT_post_link_optimize)) + CmdArgs.push_back("-q"); + // End Facebook T92898286 + Args.AddAllArgs(CmdArgs, options::OPT_T); const char *Exec = Args.MakeArgString(ToolChain.GetLinkerPath()); C.addCommand(std::make_unique<Command>(JA, *this, ResponseFileSupport::AtFileCurCP(), Exec, CmdArgs, Inputs, Output)); + // Facebook T92898286 + if (!Args.hasArg(options::OPT_post_link_optimize) || !Output.isFilename()) + return; + + const char *MvExec = Args.MakeArgString(ToolChain.GetProgramPath("mv")); + ArgStringList MoveCmdArgs; + MoveCmdArgs.push_back(Output.getFilename()); + const char *PreBoltBin = + Args.MakeArgString(Twine(Output.getFilename()) + ".pre-bolt"); + MoveCmdArgs.push_back(PreBoltBin); + C.addCommand(std::make_unique<Command>(JA, *this, ResponseFileSupport::None(), + MvExec, MoveCmdArgs, std::nullopt)); + + ArgStringList BoltCmdArgs; + const char *BoltExec = + Args.MakeArgString(ToolChain.GetProgramPath("llvm-bolt")); + BoltCmdArgs.push_back(PreBoltBin); + BoltCmdArgs.push_back("-reorder-blocks=reverse"); + BoltCmdArgs.push_back("-update-debug-sections"); + BoltCmdArgs.push_back("-o"); + BoltCmdArgs.push_back(Output.getFilename()); + C.addCommand(std::make_unique<Command>(JA, *this, ResponseFileSupport::None(), + BoltExec, BoltCmdArgs, std::nullopt)); + // End Facebook T92898286 } void tools::gnutools::Assembler::ConstructJob(Compilation &C, diff --git a/cross-project-tests/lit.cfg.py b/cross-project-tests/lit.cfg.py index 774c4eaf4d976..619634578dfe6 100644 --- a/cross-project-tests/lit.cfg.py +++ b/cross-project-tests/lit.cfg.py @@ -84,7 +84,13 @@ def get_required_attr(config, attr_name): # use_clang() and use_lld() respectively, so set them to "", if needed. if not hasattr(config, "clang_src_dir"): config.clang_src_dir = "" -llvm_config.use_clang(required=("clang" in config.llvm_enabled_projects)) +# Facebook T92898286 +should_test_bolt = get_required_attr(config, "llvm_test_bolt") +if should_test_bolt: + llvm_config.use_clang(required=("clang" in config.llvm_enabled_projects), additional_flags=["--post-link-optimize"]) +else: + llvm_config.use_clang(required=("clang" in config.llvm_enabled_projects)) +# End Facebook T92898286 if not hasattr(config, "lld_src_dir"): config.lld_src_dir = "" @@ -293,3 +299,9 @@ def get_clang_default_dwarf_version_string(triple): # Allow 'REQUIRES: XXX-registered-target' in tests. for arch in config.targets_to_build: config.available_features.add(arch.lower() + "-registered-target") + +# Facebook T92898286 +# Ensure the user's PYTHONPATH is included. +if "PYTHONPATH" in os.environ: + config.environment["PYTHONPATH"] = os.environ["PYTHONPATH"] +# End Facebook T92898286 diff --git a/cross-project-tests/lit.site.cfg.py.in b/cross-project-tests/lit.site.cfg.py.in index 39458dfc79afd..2d53cd377f033 100644 --- a/cross-project-tests/lit.site.cfg.py.in +++ b/cross-project-tests/lit.site.cfg.py.in @@ -21,6 +21,10 @@ config.mlir_src_root = "@MLIR_SOURCE_DIR@" config.llvm_use_sanitizer = "@LLVM_USE_SANITIZER@" +# Facebook T92898286 +config.llvm_test_bolt = lit.util.pythonize_bool("@LLVM_TEST_BOLT@") +# End Facebook T92898286 + import lit.llvm lit.llvm.initialize(lit_config, config) diff --git a/lldb/test/API/lit.cfg.py b/lldb/test/API/lit.cfg.py index 96520c7c82624..dfeb76544e57d 100644 --- a/lldb/test/API/lit.cfg.py +++ b/lldb/test/API/lit.cfg.py @@ -265,6 +265,11 @@ def delete_module_cache(path): if is_configured("lldb_framework_dir"): dotest_cmd += ["--framework", config.lldb_framework_dir] +# Facebook T92898286 +if is_configured("llvm_test_bolt"): + dotest_cmd += ["-E", '"--post-link-optimize"'] +# End Facebook T92898286 + if ( "lldb-repro-capture" in config.available_features or "lldb-repro-replay" in config.available_features diff --git a/lldb/test/API/lit.site.cfg.py.in b/lldb/test/API/lit.site.cfg.py.in index 8b2d09ae41cd2..602f45759e48f 100644 --- a/lldb/test/API/lit.site.cfg.py.in +++ b/lldb/test/API/lit.site.cfg.py.in @@ -1,5 +1,9 @@ @LIT_SITE_CFG_IN_HEADER@ +#Facebook T92898286 +import lit.util +#End Facebook T92898286 + config.llvm_src_root = "@LLVM_SOURCE_DIR@" config.llvm_obj_root = "@LLVM_BINARY_DIR@" config.llvm_tools_dir = lit_config.substitute("@LLVM_TOOLS_DIR@") @@ -39,6 +43,10 @@ config.libcxx_include_target_dir = "@LIBCXX_GENERATED_INCLUDE_TARGET_DIR@" config.lldb_module_cache = os.path.join("@LLDB_TEST_MODULE_CACHE_LLDB@", "lldb-api") config.clang_module_cache = os.path.join("@LLDB_TEST_MODULE_CACHE_CLANG@", "lldb-api") +# Facebook T92898286 +config.llvm_test_bolt = lit.util.pythonize_bool("@LLVM_TEST_BOLT@") +# End Facebook T92898286 + # Plugins lldb_build_intel_pt = '@LLDB_BUILD_INTEL_PT@' if lldb_build_intel_pt == '1': diff --git a/lldb/test/Shell/helper/toolchain.py b/lldb/test/Shell/helper/toolchain.py index 255955fc70d8c..7b7be06643166 100644 --- a/lldb/test/Shell/helper/toolchain.py +++ b/lldb/test/Shell/helper/toolchain.py @@ -165,6 +165,11 @@ def use_support_substitutions(config): if config.cmake_sysroot: host_flags += ["--sysroot={}".format(config.cmake_sysroot)] + # Facebook T92898286 + if config.llvm_test_bolt: + host_flags += ["--post-link-optimize"] + # End Facebook T92898286 + host_flags = " ".join(host_flags) config.substitutions.append(("%clang_host", "%clang " + host_flags)) config.substitutions.append(("%clangxx_host", "%clangxx " + host_flags)) diff --git a/lldb/test/Shell/lit.site.cfg.py.in b/lldb/test/Shell/lit.site.cfg.py.in index b69e7bce1bc0b..fe8323734b7db 100644 --- a/lldb/test/Shell/lit.site.cfg.py.in +++ b/lldb/test/Shell/lit.site.cfg.py.in @@ -1,5 +1,10 @@ @LIT_SITE_CFG_IN_HEADER@ +#Facebook T92898286 +import lit.util +#End Facebook T92898286 + + config.llvm_src_root = "@LLVM_SOURCE_DIR@" config.llvm_obj_root = "@LLVM_BINARY_DIR@" config.llvm_tools_dir = lit_config.substitute("@LLVM_TOOLS_DIR@") @@ -31,6 +36,10 @@ config.llvm_use_sanitizer = "@LLVM_USE_SANITIZER@" config.lldb_module_cache = os.path.join("@LLDB_TEST_MODULE_CACHE_LLDB@", "lldb-shell") config.clang_module_cache = os.path.join("@LLDB_TEST_MODULE_CACHE_CLANG@", "lldb-shell") +# Facebook T92898286 +config.llvm_test_bolt = lit.util.pythonize_bool("@LLVM_TEST_BOLT@") +# End Facebook T92898286 + import lit.llvm lit.llvm.initialize(lit_config, config) diff --git a/llvm/CMakeLists.txt b/llvm/CMakeLists.txt index 12618966c4adf..a08b477060f48 100644 --- a/llvm/CMakeLists.txt +++ b/llvm/CMakeLists.txt @@ -709,6 +709,10 @@ set(LLVM_LIB_FUZZING_ENGINE "" CACHE PATH option(LLVM_USE_SPLIT_DWARF "Use -gsplit-dwarf when compiling llvm and --gdb-index when linking." OFF) +# Facebook T92898286 +option(LLVM_TEST_BOLT "Enable BOLT testing in non-BOLT tests that use clang" OFF) +# End Facebook T92898286 + # Define an option controlling whether we should build for 32-bit on 64-bit # platforms, where supported. if( CMAKE_SIZEOF_VOID_P EQUAL 8 AND NOT (WIN32 OR ${CMAKE_SYSTEM_NAME} MATCHES "AIX")) >From 0abf851648085cdeace8c502c3e8ac89888d6df3 Mon Sep 17 00:00:00 2001 From: Sayhaan Siddiqui <sayh...@meta.com> Date: Thu, 18 Jul 2024 14:41:56 -0700 Subject: [PATCH 2/4] [BOLT][DWARF] Remove deprecated opt Summary: Remove deprecated DeterministicDebugInfo option and its uses. Test Plan: Run `ninja llvm check-bolt.` Reviewers: ayermolo, aaupov, #llvm-bolt Reviewed By: ayermolo Differential Revision: https://phabricator.intern.facebook.com/D59942763 Tasks: T187681160 --- bolt/docs/CommandLineArgumentReference.md | 5 --- bolt/lib/Rewrite/DWARFRewriter.cpp | 37 +++++------------------ 2 files changed, 7 insertions(+), 35 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 diff --git a/bolt/lib/Rewrite/DWARFRewriter.cpp b/bolt/lib/Rewrite/DWARFRewriter.cpp index 4ba6344925856..1ec216b39e95c 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,25 +748,13 @@ void DWARFRewriter::updateDebugInfo() { CUOffsetMap OffsetMap = finalizeTypeSections(DIEBlder, *Streamer, GDBIndexSection); - const bool SingleThreadedMode = - opts::NoThreads || opts::DeterministicDebugInfo; - if (!SingleThreadedMode) - DIEBlder.buildCompileUnits(); - if (SingleThreadedMode) { - 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); - } - } 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(); + 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 9f1bd66621d8fa18876a0670b6a1a1c939ca4b24 Mon Sep 17 00:00:00 2001 From: Sayhaan Siddiqui <sayh...@meta.com> Date: Tue, 16 Jul 2024 11:25:48 -0700 Subject: [PATCH 3/4] Split processUnitDIE into two lambdas Summary: Test Plan: Reviewers: Subscribers: Tasks: Tags: Differential Revision: https://phabricator.intern.facebook.com/D59822423 --- bolt/lib/Rewrite/DWARFRewriter.cpp | 213 +++++++++++++++-------------- 1 file changed, 112 insertions(+), 101 deletions(-) diff --git a/bolt/lib/Rewrite/DWARFRewriter.cpp b/bolt/lib/Rewrite/DWARFRewriter.cpp index 1ec216b39e95c..58538cec86334 100644 --- a/bolt/lib/Rewrite/DWARFRewriter.cpp +++ b/bolt/lib/Rewrite/DWARFRewriter.cpp @@ -620,45 +620,46 @@ void DWARFRewriter::updateDebugInfo() { uint32_t CUIndex = 0; std::mutex AccessMutex; // Needs to be invoked in the same order as CUs are processed. - auto createRangeLocListAddressWriters = - [&](DWARFUnit &CU) -> DebugLocWriter * { - std::lock_guard<std::mutex> Lock(AccessMutex); - const uint16_t DwarfVersion = CU.getVersion(); - if (DwarfVersion >= 5) { - auto AddrW = std::make_unique<DebugAddrWriterDwarf5>( - &BC, CU.getAddressByteSize(), CU.getAddrOffsetSectionBase()); - RangeListsSectionWriter->setAddressWriter(AddrW.get()); - LocListWritersByCU[CUIndex] = - std::make_unique<DebugLoclistWriter>(CU, DwarfVersion, false, *AddrW); - - if (std::optional<uint64_t> DWOId = CU.getDWOId()) { - assert(RangeListsWritersByCU.count(*DWOId) == 0 && - "RangeLists writer for DWO unit already exists."); - auto DWORangeListsSectionWriter = - std::make_unique<DebugRangeListsSectionWriter>(); - DWORangeListsSectionWriter->initSection(CU); - DWORangeListsSectionWriter->setAddressWriter(AddrW.get()); - RangeListsWritersByCU[*DWOId] = std::move(DWORangeListsSectionWriter); - } - AddressWritersByCU[CU.getOffset()] = std::move(AddrW); + llvm::DenseMap<uint64_t, uint64_t> LocListWritersIndexByCU; + auto createRangeLocListAddressWriters = [&](DWARFUnit &CU) { + std::lock_guard<std::mutex> Lock(AccessMutex); - } else { - auto AddrW = - std::make_unique<DebugAddrWriter>(&BC, CU.getAddressByteSize()); - AddressWritersByCU[CU.getOffset()] = std::move(AddrW); - LocListWritersByCU[CUIndex] = std::make_unique<DebugLocWriter>(); - if (std::optional<uint64_t> DWOId = CU.getDWOId()) { - assert(LegacyRangesWritersByCU.count(*DWOId) == 0 && - "LegacyRangeLists writer for DWO unit already exists."); - auto LegacyRangesSectionWriterByCU = - std::make_unique<DebugRangesSectionWriter>(); - LegacyRangesSectionWriterByCU->initSection(CU); - LegacyRangesWritersByCU[*DWOId] = - std::move(LegacyRangesSectionWriterByCU); - } - } - return LocListWritersByCU[CUIndex++].get(); - }; + const uint16_t DwarfVersion = CU.getVersion(); + if (DwarfVersion >= 5) { + auto AddrW = std::make_unique<DebugAddrWriterDwarf5>( + &BC, CU.getAddressByteSize(), CU.getAddrOffsetSectionBase()); + RangeListsSectionWriter->setAddressWriter(AddrW.get()); + LocListWritersByCU[CUIndex] = std::make_unique<DebugLoclistWriter>( + CU, DwarfVersion, false, *AddrW); + + if (std::optional<uint64_t> DWOId = CU.getDWOId()) { + assert(RangeListsWritersByCU.count(*DWOId) == 0 && + "RangeLists writer for DWO unit already exists."); + auto DWORangeListsSectionWriter = + std::make_unique<DebugRangeListsSectionWriter>(); + DWORangeListsSectionWriter->initSection(CU); + DWORangeListsSectionWriter->setAddressWriter(AddrW.get()); + RangeListsWritersByCU[*DWOId] = + std::move(DWORangeListsSectionWriter); + } + AddressWritersByCU[CU.getOffset()] = std::move(AddrW); + } else { + auto AddrW = + std::make_unique<DebugAddrWriter>(&BC, CU.getAddressByteSize()); + AddressWritersByCU[CU.getOffset()] = std::move(AddrW); + LocListWritersByCU[CUIndex] = std::make_unique<DebugLocWriter>(); + if (std::optional<uint64_t> DWOId = CU.getDWOId()) { + assert(LegacyRangesWritersByCU.count(*DWOId) == 0 && + "LegacyRangeLists writer for DWO unit already exists."); + auto LegacyRangesSectionWriterByCU = + std::make_unique<DebugRangesSectionWriter>(); + LegacyRangesSectionWriterByCU->initSection(CU); + LegacyRangesWritersByCU[*DWOId] = + std::move(LegacyRangesSectionWriterByCU); + } + } + LocListWritersIndexByCU[CU.getOffset()] = CUIndex++; + }; DWARF5AcceleratorTable DebugNamesTable(opts::CreateDebugNames, BC, *StrWriter); @@ -666,74 +667,68 @@ void DWARFRewriter::updateDebugInfo() { DWPState State; if (opts::WriteDWP) initDWPState(State); - auto processUnitDIE = [&](DWARFUnit *Unit, DIEBuilder *DIEBlder) { - // Check if the unit is a skeleton and we need special updates for it and - // its matching split/DWO CU. - std::optional<DWARFUnit *> SplitCU; + auto processSplitCU = [&](DWARFUnit &Unit, DWARFUnit &SplitCU, + DIEBuilder &DIEBlder, + DebugRangesSectionWriter &TempRangesSectionWriter, + DebugAddrWriter &AddressWriter) { + DIEBuilder DWODIEBuilder(BC, &(SplitCU).getContext(), DebugNamesTable, + &Unit); + DWODIEBuilder.buildDWOUnit(SplitCU); + std::string DWOName = ""; + std::optional<std::string> DwarfOutputPath = + opts::DwarfOutputPath.empty() + ? std::nullopt + : std::optional<std::string>(opts::DwarfOutputPath.c_str()); + { + std::lock_guard<std::mutex> Lock(AccessMutex); + DWOName = DIEBlder.updateDWONameCompDir( + *StrOffstsWriter, *StrWriter, Unit, DwarfOutputPath, std::nullopt); + } + DebugStrOffsetsWriter DWOStrOffstsWriter(BC); + DebugStrWriter DWOStrWriter((SplitCU).getContext(), true); + DWODIEBuilder.updateDWONameCompDirForTypes( + DWOStrOffstsWriter, DWOStrWriter, SplitCU, DwarfOutputPath, DWOName); + DebugLoclistWriter DebugLocDWoWriter(Unit, Unit.getVersion(), true, + AddressWriter); + + updateUnitDebugInfo(SplitCU, DWODIEBuilder, DebugLocDWoWriter, + TempRangesSectionWriter, AddressWriter); + DebugLocDWoWriter.finalize(DWODIEBuilder, + *DWODIEBuilder.getUnitDIEbyUnit(SplitCU)); + if (Unit.getVersion() >= 5) + TempRangesSectionWriter.finalizeSection(); + + emitDWOBuilder(DWOName, DWODIEBuilder, *this, SplitCU, Unit, State, + DebugLocDWoWriter, DWOStrOffstsWriter, DWOStrWriter, + GDBIndexSection); + }; + auto processMainBinaryCU = [&](DWARFUnit &Unit, DIEBuilder &DIEBlder) { + DebugAddrWriter &AddressWriter = + *AddressWritersByCU[Unit.getOffset()].get(); + DebugRangesSectionWriter &RangesSectionWriter = + Unit.getVersion() >= 5 ? *RangeListsSectionWriter.get() + : *LegacyRangesSectionWriter.get(); + DebugLocWriter &DebugLocWriter = + *LocListWritersByCU[LocListWritersIndexByCU[Unit.getOffset()]].get(); std::optional<uint64_t> RangesBase; - std::optional<uint64_t> DWOId = Unit->getDWOId(); + std::optional<DWARFUnit *> SplitCU; + std::optional<uint64_t> DWOId = Unit.getDWOId(); if (DWOId) SplitCU = BC.getDWOCU(*DWOId); - DebugLocWriter *DebugLocWriter = createRangeLocListAddressWriters(*Unit); - DebugRangesSectionWriter *RangesSectionWriter = - Unit->getVersion() >= 5 ? RangeListsSectionWriter.get() - : LegacyRangesSectionWriter.get(); - DebugAddrWriter *AddressWriter = - AddressWritersByCU[Unit->getOffset()].get(); - // Skipping CUs that failed to load. - if (SplitCU) { - DIEBuilder DWODIEBuilder(BC, &(*SplitCU)->getContext(), DebugNamesTable, - Unit); - DWODIEBuilder.buildDWOUnit(**SplitCU); - std::string DWOName = ""; - std::optional<std::string> DwarfOutputPath = - opts::DwarfOutputPath.empty() - ? std::nullopt - : std::optional<std::string>(opts::DwarfOutputPath.c_str()); - { - std::lock_guard<std::mutex> Lock(AccessMutex); - DWOName = DIEBlder->updateDWONameCompDir( - *StrOffstsWriter, *StrWriter, *Unit, DwarfOutputPath, std::nullopt); - } - DebugStrOffsetsWriter DWOStrOffstsWriter(BC); - DebugStrWriter DWOStrWriter((*SplitCU)->getContext(), true); - DWODIEBuilder.updateDWONameCompDirForTypes(DWOStrOffstsWriter, - DWOStrWriter, **SplitCU, - DwarfOutputPath, DWOName); - DebugLoclistWriter DebugLocDWoWriter(*Unit, Unit->getVersion(), true, - *AddressWriter); - DebugRangesSectionWriter *TempRangesSectionWriter = RangesSectionWriter; - if (Unit->getVersion() >= 5) { - TempRangesSectionWriter = RangeListsWritersByCU[*DWOId].get(); - } else { - TempRangesSectionWriter = LegacyRangesWritersByCU[*DWOId].get(); - RangesBase = RangesSectionWriter->getSectionOffset(); - } - - updateUnitDebugInfo(*(*SplitCU), DWODIEBuilder, DebugLocDWoWriter, - *TempRangesSectionWriter, *AddressWriter); - DebugLocDWoWriter.finalize(DWODIEBuilder, - *DWODIEBuilder.getUnitDIEbyUnit(**SplitCU)); - if (Unit->getVersion() >= 5) - TempRangesSectionWriter->finalizeSection(); - - emitDWOBuilder(DWOName, DWODIEBuilder, *this, **SplitCU, *Unit, State, - DebugLocDWoWriter, DWOStrOffstsWriter, DWOStrWriter, - GDBIndexSection); - } - - if (Unit->getVersion() >= 5) { - RangesBase = RangesSectionWriter->getSectionOffset() + + if (Unit.getVersion() >= 5) { + RangesBase = RangesSectionWriter.getSectionOffset() + getDWARF5RngListLocListHeaderSize(); - RangesSectionWriter->initSection(*Unit); - StrOffstsWriter->finalizeSection(*Unit, *DIEBlder); + RangesSectionWriter.initSection(Unit); + StrOffstsWriter->finalizeSection(Unit, DIEBlder); + } else if (SplitCU) { + RangesBase = LegacyRangesSectionWriter.get()->getSectionOffset(); } - updateUnitDebugInfo(*Unit, *DIEBlder, *DebugLocWriter, *RangesSectionWriter, - *AddressWriter, RangesBase); - DebugLocWriter->finalize(*DIEBlder, *DIEBlder->getUnitDIEbyUnit(*Unit)); - if (Unit->getVersion() >= 5) - RangesSectionWriter->finalizeSection(); + updateUnitDebugInfo(Unit, DIEBlder, DebugLocWriter, RangesSectionWriter, + AddressWriter, RangesBase); + DebugLocWriter.finalize(DIEBlder, *DIEBlder.getUnitDIEbyUnit(Unit)); + if (Unit.getVersion() >= 5) + RangesSectionWriter.finalizeSection(); }; DIEBuilder DIEBlder(BC, BC.DwCtx.get(), DebugNamesTable); @@ -751,8 +746,24 @@ void DWARFRewriter::updateDebugInfo() { CUPartitionVector PartVec = partitionCUs(*BC.DwCtx); for (std::vector<DWARFUnit *> &Vec : PartVec) { DIEBlder.buildCompileUnits(Vec); + for (DWARFUnit *CU : DIEBlder.getProcessedCUs()) { + createRangeLocListAddressWriters(*CU); + std::optional<DWARFUnit *> SplitCU; + std::optional<uint64_t> DWOId = CU->getDWOId(); + if (DWOId) + SplitCU = BC.getDWOCU(*DWOId); + if (!SplitCU) + continue; + DebugAddrWriter &AddressWriter = + *AddressWritersByCU[CU->getOffset()].get(); + DebugRangesSectionWriter *TempRangesSectionWriter = + CU->getVersion() >= 5 ? RangeListsWritersByCU[*DWOId].get() + : LegacyRangesWritersByCU[*DWOId].get(); + processSplitCU(*CU, **SplitCU, DIEBlder, *TempRangesSectionWriter, + AddressWriter); + } for (DWARFUnit *CU : DIEBlder.getProcessedCUs()) - processUnitDIE(CU, &DIEBlder); + processMainBinaryCU(*CU, DIEBlder); finalizeCompileUnits(DIEBlder, *Streamer, OffsetMap, DIEBlder.getProcessedCUs(), *FinalAddrWriter); } >From bb76ea1bcc11f4515cf0e49cbb978748fea59901 Mon Sep 17 00:00:00 2001 From: Sayhaan Siddiqui <sayh...@meta.com> Date: Fri, 19 Jul 2024 17:21:19 -0700 Subject: [PATCH 4/4] Formatting changes --- bolt/lib/Rewrite/DWARFRewriter.cpp | 75 +++++++++++++++--------------- 1 file changed, 37 insertions(+), 38 deletions(-) diff --git a/bolt/lib/Rewrite/DWARFRewriter.cpp b/bolt/lib/Rewrite/DWARFRewriter.cpp index 58538cec86334..ccb45f40c5c7a 100644 --- a/bolt/lib/Rewrite/DWARFRewriter.cpp +++ b/bolt/lib/Rewrite/DWARFRewriter.cpp @@ -622,44 +622,43 @@ void DWARFRewriter::updateDebugInfo() { // Needs to be invoked in the same order as CUs are processed. llvm::DenseMap<uint64_t, uint64_t> LocListWritersIndexByCU; auto createRangeLocListAddressWriters = [&](DWARFUnit &CU) { - std::lock_guard<std::mutex> Lock(AccessMutex); - - const uint16_t DwarfVersion = CU.getVersion(); - if (DwarfVersion >= 5) { - auto AddrW = std::make_unique<DebugAddrWriterDwarf5>( - &BC, CU.getAddressByteSize(), CU.getAddrOffsetSectionBase()); - RangeListsSectionWriter->setAddressWriter(AddrW.get()); - LocListWritersByCU[CUIndex] = std::make_unique<DebugLoclistWriter>( - CU, DwarfVersion, false, *AddrW); - - if (std::optional<uint64_t> DWOId = CU.getDWOId()) { - assert(RangeListsWritersByCU.count(*DWOId) == 0 && - "RangeLists writer for DWO unit already exists."); - auto DWORangeListsSectionWriter = - std::make_unique<DebugRangeListsSectionWriter>(); - DWORangeListsSectionWriter->initSection(CU); - DWORangeListsSectionWriter->setAddressWriter(AddrW.get()); - RangeListsWritersByCU[*DWOId] = - std::move(DWORangeListsSectionWriter); - } - AddressWritersByCU[CU.getOffset()] = std::move(AddrW); - } else { - auto AddrW = - std::make_unique<DebugAddrWriter>(&BC, CU.getAddressByteSize()); - AddressWritersByCU[CU.getOffset()] = std::move(AddrW); - LocListWritersByCU[CUIndex] = std::make_unique<DebugLocWriter>(); - if (std::optional<uint64_t> DWOId = CU.getDWOId()) { - assert(LegacyRangesWritersByCU.count(*DWOId) == 0 && - "LegacyRangeLists writer for DWO unit already exists."); - auto LegacyRangesSectionWriterByCU = - std::make_unique<DebugRangesSectionWriter>(); - LegacyRangesSectionWriterByCU->initSection(CU); - LegacyRangesWritersByCU[*DWOId] = - std::move(LegacyRangesSectionWriterByCU); - } - } - LocListWritersIndexByCU[CU.getOffset()] = CUIndex++; - }; + std::lock_guard<std::mutex> Lock(AccessMutex); + + const uint16_t DwarfVersion = CU.getVersion(); + if (DwarfVersion >= 5) { + auto AddrW = std::make_unique<DebugAddrWriterDwarf5>( + &BC, CU.getAddressByteSize(), CU.getAddrOffsetSectionBase()); + RangeListsSectionWriter->setAddressWriter(AddrW.get()); + LocListWritersByCU[CUIndex] = + std::make_unique<DebugLoclistWriter>(CU, DwarfVersion, false, *AddrW); + + if (std::optional<uint64_t> DWOId = CU.getDWOId()) { + assert(RangeListsWritersByCU.count(*DWOId) == 0 && + "RangeLists writer for DWO unit already exists."); + auto DWORangeListsSectionWriter = + std::make_unique<DebugRangeListsSectionWriter>(); + DWORangeListsSectionWriter->initSection(CU); + DWORangeListsSectionWriter->setAddressWriter(AddrW.get()); + RangeListsWritersByCU[*DWOId] = std::move(DWORangeListsSectionWriter); + } + AddressWritersByCU[CU.getOffset()] = std::move(AddrW); + } else { + auto AddrW = + std::make_unique<DebugAddrWriter>(&BC, CU.getAddressByteSize()); + AddressWritersByCU[CU.getOffset()] = std::move(AddrW); + LocListWritersByCU[CUIndex] = std::make_unique<DebugLocWriter>(); + if (std::optional<uint64_t> DWOId = CU.getDWOId()) { + assert(LegacyRangesWritersByCU.count(*DWOId) == 0 && + "LegacyRangeLists writer for DWO unit already exists."); + auto LegacyRangesSectionWriterByCU = + std::make_unique<DebugRangesSectionWriter>(); + LegacyRangesSectionWriterByCU->initSection(CU); + LegacyRangesWritersByCU[*DWOId] = + std::move(LegacyRangesSectionWriterByCU); + } + } + LocListWritersIndexByCU[CU.getOffset()] = CUIndex++; + }; DWARF5AcceleratorTable DebugNamesTable(opts::CreateDebugNames, BC, *StrWriter); _______________________________________________ cfe-commits mailing list cfe-commits@lists.llvm.org https://lists.llvm.org/cgi-bin/mailman/listinfo/cfe-commits
