This is an archive of the discontinued LLVM Phabricator instance.

Differential D111742

Add LLVM_EXTERNALIZE_DEBUGINFO_FLATTEN, which can do flat dSYM
AcceptedPublic

Authored by directhex on Oct 13 2021, 10:14 AM.

Details

Reviewers
JDevlieghere
Summary

As standard, dsymutil creates a directory structure for symbols - for example, llc goes to llc.dSYM/Contents/Resources/DWARF/llc.

dsymutil also accepts a -f/--flat parameter, which emits a single file without the extra directory baggage, e.g. llc to llc.dwarf.

Add a CMake option to enable this mode

Diff Detail

Event Timeline

directhex created this revision.Oct 13 2021, 10:14 AM
Herald added a reviewer: JDevlieghere. · View Herald TranscriptOct 13 2021, 10:14 AM
Herald added a subscriber: mgorny. · View Herald Transcript
directhex requested review of this revision.Oct 13 2021, 10:14 AM
Herald added a project: Restricted Project. · View Herald TranscriptOct 13 2021, 10:14 AM
Herald added a subscriber: llvm-commits. · View Herald Transcript
directhex added parent revisions: D111740: Align LLVM_EXTERNALIZE_DEBUGINFO behaviours on Linux w/ Darwin, D111741: Ensure LLVM_EXTERNALIZE_DEBUGINFO goes to bin/ not foo/bar/.Oct 13 2021, 10:14 AM
Harbormaster completed remote builds in B128668: Diff 379452.Oct 13 2021, 10:14 AM
directhex added a child revision: D111745: Add LLVM_EXTERNALIZE_DEBUGINFO_INSTALL, for installing debug symbols.Oct 13 2021, 10:16 AM
directhex added a child revision: D111746: Fix LLVM_EXTERNALIZE_DEBUGINFO docs, and add new options from patchset.Oct 13 2021, 10:37 AM
JDevlieghere added a comment.Oct 25 2021, 10:55 AM

What's the motivation for this?

directhex added a comment.Oct 26 2021, 6:10 AM

Our debug symbol infra works pretty much entirely on a single file model (i.e. it started life with .pdb Windows files, and was extended to handle symbols for macOS and Linux) so we use flat mode throughout our build system, in order for our symbol downloader (dotnet symbol) to work post-hoc. This change struck me as generally useful & worth submitting upstream, rather than carrying forever downstream.

JDevlieghere accepted this revision.Oct 28 2021, 4:31 PM

Alright, sounds reasonable. LGTM.

This revision is now accepted and ready to land.Oct 28 2021, 4:31 PM

Revision Contents

Diff 379452

llvm/cmake/modules/AddLLVM.cmake

Context not available.
if(APPLE) if(APPLE)
if(LLVM_EXTERNALIZE_DEBUGINFO_EXTENSION) if(LLVM_EXTERNALIZE_DEBUGINFO_EXTENSION)
set(file_ext ${LLVM_EXTERNALIZE_DEBUGINFO_EXTENSION}) set(file_ext ${LLVM_EXTERNALIZE_DEBUGINFO_EXTENSION})
elseif(LLVM_EXTERNALIZE_DEBUGINFO_FLATTEN)
set(file_ext dwarf)
else() else()
set(file_ext dSYM) set(file_ext dSYM)
endif() endif()
Context not available.
set(output_path "-o=${output_name}") set(output_path "-o=${output_name}")
endif() endif()
if(LLVM_EXTERNALIZE_DEBUGINFO_FLATTEN)
set(flatten_debuginfo "--flat")
else()
set(flatten_debuginfo "")
endif()
if(CMAKE_CXX_FLAGS MATCHES "-flto" if(CMAKE_CXX_FLAGS MATCHES "-flto"
OR CMAKE_CXX_FLAGS_${uppercase_CMAKE_BUILD_TYPE} MATCHES "-flto") OR CMAKE_CXX_FLAGS_${uppercase_CMAKE_BUILD_TYPE} MATCHES "-flto")
Context not available.
endif() endif()
add_custom_command(TARGET ${name} POST_BUILD add_custom_command(TARGET ${name} POST_BUILD
WORKING_DIRECTORY ${LLVM_RUNTIME_OUTPUT_INTDIR} WORKING_DIRECTORY ${LLVM_RUNTIME_OUTPUT_INTDIR}
COMMAND ${CMAKE_DSYMUTIL} ${output_path} $<TARGET_FILE:${name}> COMMAND ${CMAKE_DSYMUTIL} ${flatten_debuginfo} ${output_path} $<TARGET_FILE:${name}>
${strip_command} ${strip_command}
) )
else() else()
Context not available.