[Support] Move ItaniumManglingCanonicalizer and SymbolRemappingReader from Support to ProfileData

[RKSimon]

Summary

As mentioned on https://discourse.llvm.org/t/issues-in-llvm-tblgen-high-parallelized-build/68037, ItaniumManglingCanonicalizer is often slow to build, resulting in a bottleneck for distributed builds while waiting for LLVMSupport to complete.

SymbolRemappingReader is the only current user of ItaniumManglingCanonicalizer, and this is only used by ProfileData and llvm-cxxmap - so I propose we move both files into the ProfileData library.

An alternative would be to begin a LLVMSymbol library but I don't think we have a strong enough need for that yet.

[MaskRay]

ItaniumManglingCanonicalizer.cpp doesn't have many includes. I think it is fine to remain in llvm/lib/Support ...

[phosek]

Another alternative would be to move these classes to the Demangle library.

[RKSimon]

In D143318#4104408, @MaskRay wrote:

ItaniumManglingCanonicalizer.cpp doesn't have many includes. I think it is fine to remain in llvm/lib/Support ...

The frontend cost might not be high - but ItaniumManglingCanonicalizer.cpp is still slow to build, so getting it out of something as core as Support still make senses

[RKSimon]

In D143318#4104410, @phosek wrote:

Another alternative would be to move these classes to the Demangle library.

I'm happy to move this to LLVMDemangle instead if everyone agrees.

[chapuni]

@RKSimon
Could you cherry-pick it?
https://github.com/chapuni/llvm-project/commit/2c09237d8759bb6b1e99940e78901bde5b2bb98f

As a position to reduce overhead in tblgen, I don't agree to move this to LLVMDemangle.
LLVMSupport depends on LLVMDemangle. llvm-tblgen depends on them.

Besides, does this depend on LLVMSupport if you would move this to LLVMDemangle?

I think this is one of practical resolutions. One concern, "Does it make sense if llvm-cxxmap depends on LLVMProfile?"

@MaskRay
Fair enough, even if its user is only LLVMProfileData in the trunk.
That said, in fact, ItaniumManglingCanonicalizerTest.cpp spends the most time to build in LLVMSupport.

I don't have a strong opinion for this to move to LLVMProfileData.
Could we introduce another library, like "LLVMMangleSupport" ?

[RKSimon]

Add bazel build fix for llvm-cxxmap

[RKSimon]

fix the git diff lost renames

[nhaehnle]

This (moving to ProfileData) seems like a simple and pragmatic solution for a (perhaps not gigantic but) real problem. It feels fine to me.

[MaskRay]

LGTM.

clang/docs/tools/clang-formatted-files.txt

 llvm/include/llvm/ObjectYAML/YAML.h
 llvm/include/llvm/ObjectYAML/yaml2obj.h
 llvm/include/llvm/Option/OptSpecifier.h
 llvm/include/llvm/Passes/OptimizationLevel.h
 llvm/include/llvm/Passes/StandardInstrumentations.h
 llvm/include/llvm/ProfileData/GCOV.h
 llvm/include/llvm/ProfileData/InstrProfCorrelator.h
 llvm/include/llvm/ProfileData/InstrProfWriter.h
+llvm/include/llvm/ProfileData/ItaniumManglingCanonicalizer.h
 llvm/include/llvm/ProfileData/ProfileCommon.h
 llvm/include/llvm/ProfileData/RawMemProfReader.h
+llvm/include/llvm/ProfileData/SymbolRemappingReader.h
 llvm/include/llvm/ProfileData/Coverage/CoverageMappingReader.h
 llvm/include/llvm/ProfileData/Coverage/CoverageMappingWriter.h
 llvm/include/llvm/Remarks/BitstreamRemarkContainer.h
 llvm/include/llvm/Remarks/BitstreamRemarkParser.h
 llvm/include/llvm/Remarks/BitstreamRemarkSerializer.h
 llvm/include/llvm/Remarks/HotnessThresholdParser.h
 llvm/include/llvm/Remarks/RemarkFormat.h
 llvm/include/llvm/Remarks/RemarkLinker.h

 llvm/include/llvm/Support/ELFAttributes.h
 llvm/include/llvm/Support/ExitCodes.h
 llvm/include/llvm/Support/FileCollector.h
 llvm/include/llvm/Support/FileOutputBuffer.h
 llvm/include/llvm/Support/GenericIteratedDominanceFrontier.h
 llvm/include/llvm/Support/HashBuilder.h
 llvm/include/llvm/Support/InitLLVM.h
 llvm/include/llvm/Support/InstructionCost.h
-llvm/include/llvm/Support/ItaniumManglingCanonicalizer.h
 llvm/include/llvm/Support/MD5.h
 llvm/include/llvm/Support/MemAlloc.h
 llvm/include/llvm/Support/MemoryBufferRef.h
 llvm/include/llvm/Support/MSP430AttributeParser.h
 llvm/include/llvm/Support/MSP430Attributes.h
 llvm/include/llvm/Support/MSVCErrorWorkarounds.h
 llvm/include/llvm/Support/Parallel.h
 llvm/include/llvm/Support/PGOOptions.h
 llvm/include/llvm/Support/PointerLikeTypeTraits.h
 llvm/include/llvm/Support/RISCVAttributeParser.h
 llvm/include/llvm/Support/RISCVAttributes.h
 llvm/include/llvm/TargetParser/RISCVISAInfo.h
 llvm/include/llvm/Support/RWMutex.h
 llvm/include/llvm/Support/ScopedPrinter.h
 llvm/include/llvm/Support/SHA256.h
 llvm/include/llvm/Support/Signposts.h
 llvm/include/llvm/Support/SmallVectorMemoryBuffer.h
 llvm/include/llvm/Support/SMLoc.h
 llvm/include/llvm/Support/SMTAPI.h
 llvm/include/llvm/Support/SourceMgr.h
 llvm/include/llvm/Support/SuffixTree.h
-llvm/include/llvm/Support/SymbolRemappingReader.h
 llvm/include/llvm/Support/SystemUtils.h
 llvm/include/llvm/TargetParser/TargetParser.h
 llvm/include/llvm/Support/TrailingObjects.h
 llvm/include/llvm/Support/Unicode.h
 llvm/include/llvm/Support/UnicodeCharRanges.h
 llvm/include/llvm/Support/VersionTuple.h
 llvm/include/llvm/Support/WindowsError.h
 llvm/include/llvm/Support/WithColor.h

 llvm/unittests/Option/OptionMarshallingTest.cpp
 llvm/unittests/Passes/DoublerPlugin.cpp
 llvm/unittests/Passes/PassBuilderBindingsTest.cpp
 llvm/unittests/Passes/PluginsTest.cpp
 llvm/unittests/Passes/TestPlugin.cpp
 llvm/unittests/Passes/TestPlugin.h
 llvm/unittests/ProfileData/InstrProfDataTest.cpp
 llvm/unittests/ProfileData/MemProfTest.cpp
+llvm/unittests/ProfileData/SymbolRemappingReaderTest.cpp
 llvm/unittests/Remarks/BitstreamRemarksFormatTest.cpp
 llvm/unittests/Remarks/BitstreamRemarksParsingTest.cpp
 llvm/unittests/Remarks/RemarksLinkingTest.cpp
 llvm/unittests/Remarks/RemarksStrTabParsingTest.cpp
 llvm/unittests/Remarks/YAMLRemarksSerializerTest.cpp
 llvm/unittests/Support/AnnotationsTest.cpp
 llvm/unittests/Support/ArrayRecyclerTest.cpp
 llvm/unittests/Support/Base64Test.cpp

 llvm/unittests/Support/ParallelTest.cpp
 llvm/unittests/Support/raw_fd_stream_test.cpp
 llvm/unittests/Support/raw_sha1_ostream_test.cpp
 llvm/unittests/Support/RISCVAttributeParserTest.cpp
 llvm/unittests/Support/ScaledNumberTest.cpp
 llvm/unittests/Support/ScopedPrinterTest.cpp
 llvm/unittests/Support/SHA256.cpp
 llvm/unittests/Support/SuffixTreeTest.cpp
-llvm/unittests/Support/SymbolRemappingReaderTest.cpp
 llvm/unittests/Support/TarWriterTest.cpp
 llvm/unittests/Support/ToolOutputFileTest.cpp
 llvm/unittests/Support/TypeTraitsTest.cpp
 llvm/unittests/Support/UnicodeTest.cpp
 llvm/unittests/Support/VersionTupleTest.cpp
 llvm/unittests/Support/WithColorTest.cpp
 llvm/unittests/Support/xxhashTest.cpp
 llvm/unittests/Support/CommandLineInit/CommandLineInitTest.cpp

llvm/include/llvm/ProfileData/ItaniumManglingCanonicalizer.h

 //===--- ItaniumManglingCanonicalizer.h -------------------------*- C++ -*-===//
 //
 // Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.
 // See https://llvm.org/LICENSE.txt for license information.
 // SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
 //
 //===----------------------------------------------------------------------===//
 //
 // This file defines a class for computing equivalence classes of mangled names
 // given a set of equivalences between name fragments.
 //
 //===----------------------------------------------------------------------===//
 
-#ifndef LLVM_SUPPORT_ITANIUMMANGLINGCANONICALIZER_H
-#define LLVM_SUPPORT_ITANIUMMANGLINGCANONICALIZER_H
+#ifndef LLVM_PROFILEDATA_ITANIUMMANGLINGCANONICALIZER_H
+#define LLVM_PROFILEDATA_ITANIUMMANGLINGCANONICALIZER_H
 
 #include <cstdint>
 
 namespace llvm {
 
 class StringRef;
 
 /// Canonicalizer for mangled names.
public:
   Key lookup(StringRef Mangling);
 
 private:
   struct Impl;
   Impl *P;
 };
 } // namespace llvm
 
-#endif // LLVM_SUPPORT_ITANIUMMANGLINGCANONICALIZER_H
+#endif // LLVM_PROFILEDATA_ITANIUMMANGLINGCANONICALIZER_H

llvm/include/llvm/ProfileData/SampleProfReader.h

 
 #include "llvm/ADT/SmallVector.h"
 #include "llvm/ADT/StringRef.h"
 #include "llvm/IR/DiagnosticInfo.h"
 #include "llvm/IR/LLVMContext.h"
 #include "llvm/IR/ProfileSummary.h"
 #include "llvm/ProfileData/GCOV.h"
 #include "llvm/ProfileData/SampleProf.h"
+#include "llvm/ProfileData/SymbolRemappingReader.h"
 #include "llvm/Support/Debug.h"
 #include "llvm/Support/Discriminator.h"
 #include "llvm/Support/ErrorOr.h"
 #include "llvm/Support/MemoryBuffer.h"
-#include "llvm/Support/SymbolRemappingReader.h"
 #include <cstdint>
 #include <list>
 #include <memory>
 #include <optional>
 #include <string>
 #include <system_error>
 #include <unordered_set>
 #include <vector>

llvm/include/llvm/ProfileData/SymbolRemappingReader.h

 // # Substitutions must be remapped separately from namespace 'std' for now.
 // name Sa NSt3__19allocatorE
 // name Sb NSt3__112basic_stringE
 // type Ss NSt3__112basic_stringIcSt11char_traitsIcESaE
 // # ...
 //
 //===----------------------------------------------------------------------===//
 
-#ifndef LLVM_SUPPORT_SYMBOLREMAPPINGREADER_H
-#define LLVM_SUPPORT_SYMBOLREMAPPINGREADER_H
+#ifndef LLVM_PROFILEDATA_SYMBOLREMAPPINGREADER_H
+#define LLVM_PROFILEDATA_SYMBOLREMAPPINGREADER_H
 
 #include "llvm/ADT/StringRef.h"
+#include "llvm/ProfileData/ItaniumManglingCanonicalizer.h"
 #include "llvm/Support/Error.h"
-#include "llvm/Support/ItaniumManglingCanonicalizer.h"
 
 namespace llvm {
 
 class MemoryBuffer;
 
 class SymbolRemappingParseError : public ErrorInfo<SymbolRemappingParseError> {
 public:
   SymbolRemappingParseError(StringRef File, int64_t Line, const Twine &Message)
public:
   }
 
 private:
   ItaniumManglingCanonicalizer Canonicalizer;
 };
 
 } // end namespace llvm
 
-#endif // LLVM_SUPPORT_SYMBOLREMAPPINGREADER_H
+#endif // LLVM_PROFILEDATA_SYMBOLREMAPPINGREADER_H

llvm/lib/ProfileData/CMakeLists.txt

 add_llvm_component_library(LLVMProfileData
   GCOV.cpp
   InstrProf.cpp
   InstrProfCorrelator.cpp
   InstrProfReader.cpp
   InstrProfWriter.cpp
+  ItaniumManglingCanonicalizer.cpp
   MemProf.cpp
   ProfileSummaryBuilder.cpp
+  RawMemProfReader.cpp
   SampleProf.cpp
   SampleProfReader.cpp
   SampleProfWriter.cpp
-  RawMemProfReader.cpp
+  SymbolRemappingReader.cpp
 
   ADDITIONAL_HEADER_DIRS
   ${LLVM_MAIN_INCLUDE_DIR}/llvm/ProfileData
 
   DEPENDS
   intrinsics_gen
 
   LINK_COMPONENTS

llvm/lib/ProfileData/InstrProfReader.cpp

 #include "llvm/ADT/ArrayRef.h"
 #include "llvm/ADT/DenseMap.h"
 #include "llvm/ADT/StringExtras.h"
 #include "llvm/ADT/StringRef.h"
 #include "llvm/IR/ProfileSummary.h"
 #include "llvm/ProfileData/InstrProf.h"
 #include "llvm/ProfileData/MemProf.h"
 #include "llvm/ProfileData/ProfileCommon.h"
+#include "llvm/ProfileData/SymbolRemappingReader.h"
 #include "llvm/Support/Endian.h"
 #include "llvm/Support/Error.h"
 #include "llvm/Support/ErrorOr.h"
 #include "llvm/Support/MemoryBuffer.h"
 #include "llvm/Support/SwapByteOrder.h"
-#include "llvm/Support/SymbolRemappingReader.h"
 #include "llvm/Support/VirtualFileSystem.h"
 #include <algorithm>
 #include <cstddef>
 #include <cstdint>
 #include <limits>
 #include <memory>
 #include <system_error>
 #include <utility>

llvm/lib/ProfileData/ItaniumManglingCanonicalizer.cpp

 //===----------------- ItaniumManglingCanonicalizer.cpp -------------------===//
 //
 // Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.
 // See https://llvm.org/LICENSE.txt for license information.
 // SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
 //
 //===----------------------------------------------------------------------===//
 
-#include "llvm/Support/ItaniumManglingCanonicalizer.h"
+#include "llvm/ProfileData/ItaniumManglingCanonicalizer.h"
 #include "llvm/ADT/DenseMap.h"
 #include "llvm/ADT/FoldingSet.h"
 #include "llvm/ADT/StringRef.h"
 #include "llvm/Demangle/ItaniumDemangle.h"
 #include "llvm/Support/Allocator.h"
 
 using namespace llvm;
 using llvm::itanium_demangle::ForwardTemplateReference;

llvm/lib/ProfileData/SymbolRemappingReader.cpp

 //===- SymbolRemappingReader.cpp - Read symbol remapping file -------------===//
 //
 // Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.
 // See https://llvm.org/LICENSE.txt for license information.
 // SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
 //
 //===----------------------------------------------------------------------===//
 //
 // This file contains definitions needed for reading and applying symbol
 // remapping files.
 //
 //===----------------------------------------------------------------------===//
 
-#include "llvm/Support/SymbolRemappingReader.h"
+#include "llvm/ProfileData/SymbolRemappingReader.h"
 #include "llvm/ADT/StringSwitch.h"
 #include "llvm/ADT/Twine.h"
 #include "llvm/Support/LineIterator.h"
 #include "llvm/Support/MemoryBuffer.h"
 
 using namespace llvm;
 
 char SymbolRemappingParseError::ID;

llvm/lib/Support/CMakeLists.txt

add_llvm_component_library(LLVMSupport
   FormatVariadic.cpp
   GlobPattern.cpp
   GraphWriter.cpp
   Hashing.cpp
   InitLLVM.cpp
   InstructionCost.cpp
   IntEqClasses.cpp
   IntervalMap.cpp
-  ItaniumManglingCanonicalizer.cpp
   JSON.cpp
   KnownBits.cpp
   LEB128.cpp
   LineIterator.cpp
   Locale.cpp
   LockFileManager.cpp
   LowLevelType.cpp
   ManagedStatic.cpp
add_llvm_component_library(LLVMSupport
   SourceMgr.cpp
   SpecialCaseList.cpp
   Statistic.cpp
   StringExtras.cpp
   StringMap.cpp
   StringSaver.cpp
   StringRef.cpp
   SuffixTree.cpp
-  SymbolRemappingReader.cpp
   SystemUtils.cpp
   TarWriter.cpp
   ThreadPool.cpp
   TimeProfiler.cpp
   Timer.cpp
   ToolOutputFile.cpp
   TrigramIndex.cpp
   Twine.cpp

llvm/tools/llvm-cxxmap/CMakeLists.txt

 set(LLVM_LINK_COMPONENTS
   Core
   Support
+  ProfileData
   )
 
 add_llvm_tool(llvm-cxxmap
   llvm-cxxmap.cpp
   )

llvm/tools/llvm-cxxmap/llvm-cxxmap.cpp

 //===- llvm-cxxmap.cpp ----------------------------------------------------===//
 //
 // Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.
 // See https://llvm.org/LICENSE.txt for license information.
 // SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
 //
 //===----------------------------------------------------------------------===//
 //
 // llvm-cxxmap computes a correspondence between old symbol names and new
 // symbol names based on a symbol equivalence file.
 //
 //===----------------------------------------------------------------------===//
 
 #include "llvm/ADT/DenseMap.h"
 #include "llvm/ADT/DenseSet.h"
 #include "llvm/ADT/StringRef.h"
+#include "llvm/ProfileData/SymbolRemappingReader.h"
 #include "llvm/Support/CommandLine.h"
 #include "llvm/Support/FileSystem.h"
 #include "llvm/Support/InitLLVM.h"
 #include "llvm/Support/LineIterator.h"
 #include "llvm/Support/MemoryBuffer.h"
-#include "llvm/Support/SymbolRemappingReader.h"
 #include "llvm/Support/WithColor.h"
 #include "llvm/Support/raw_ostream.h"
 
 using namespace llvm;
 
 cl::OptionCategory CXXMapCategory("CXX Map Options");
 
 cl::opt<std::string> OldSymbolFile(cl::Positional, cl::Required,

llvm/unittests/ProfileData/CMakeLists.txt

 set(LLVM_LINK_COMPONENTS
   Core
   Coverage
   ProfileData
   Support
   Object
   )
 
 add_llvm_unittest(ProfileDataTests
   CoverageMappingTest.cpp
   InstrProfDataTest.cpp
   InstrProfTest.cpp
-  SampleProfTest.cpp
+  ItaniumManglingCanonicalizerTest.cpp
   MemProfTest.cpp
+  SampleProfTest.cpp
+  SymbolRemappingReaderTest.cpp
   )
 
 target_link_libraries(ProfileDataTests PRIVATE LLVMTestingSupport)

llvm/unittests/ProfileData/ItaniumManglingCanonicalizerTest.cpp

 //===-------------- ItaniumManglingCanonicalizerTest.cpp ------------------===//
 //
 // Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.
 // See https://llvm.org/LICENSE.txt for license information.
 // SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
 //
 //===----------------------------------------------------------------------===//
 
-#include "llvm/Support/ItaniumManglingCanonicalizer.h"
+#include "llvm/ProfileData/ItaniumManglingCanonicalizer.h"
 #include "llvm/ADT/ArrayRef.h"
 #include "llvm/ADT/StringRef.h"
 #include "gtest/gtest.h"
 
 #include <cstdlib>
 #include <map>
 #include <vector>
 

llvm/unittests/ProfileData/SymbolRemappingReaderTest.cpp

 //===- unittests/Support/SymbolRemappingReaderTest.cpp --------------------===//
 //
 // Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.
 // See https://llvm.org/LICENSE.txt for license information.
 // SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
 //
 //===----------------------------------------------------------------------===//
 
-#include "llvm/Support/SymbolRemappingReader.h"
+#include "llvm/ProfileData/SymbolRemappingReader.h"
 #include "llvm/Support/MemoryBuffer.h"
 #include "gtest/gtest.h"
 
 using namespace llvm;
 
 namespace {
 class SymbolRemappingReaderTest : public testing::Test {
 public:

llvm/unittests/Support/CMakeLists.txt

add_llvm_unittest(SupportTests
   FileOutputBufferTest.cpp
   FileUtilitiesTest.cpp
   FormatVariadicTest.cpp
   FSUniqueIDTest.cpp
   GlobPatternTest.cpp
   HashBuilderTest.cpp
   IndexedAccessorTest.cpp
   InstructionCostTest.cpp
-  ItaniumManglingCanonicalizerTest.cpp
   JSONTest.cpp
   KnownBitsTest.cpp
   LEB128Test.cpp
   LineIteratorTest.cpp
   LockFileManagerTest.cpp
   MatchersTest.cpp
   MD5Test.cpp
   ManagedStatic.cpp
add_llvm_unittest(SupportTests
   RISCVAttributeParserTest.cpp
   ScaledNumberTest.cpp
   ScopedPrinterTest.cpp
   SHA256.cpp
   SourceMgrTest.cpp
   SpecialCaseListTest.cpp
   SuffixTreeTest.cpp
   SwapByteOrderTest.cpp
-  SymbolRemappingReaderTest.cpp
   TarWriterTest.cpp
   TaskQueueTest.cpp
   ThreadPool.cpp
   Threading.cpp
   TimerTest.cpp
   TimeProfilerTest.cpp
   ToolOutputFileTest.cpp
   TypeNameTest.cpp

llvm/utils/gn/secondary/llvm/lib/ProfileData/BUILD.gn

 static_library("ProfileData") {
   output_name = "LLVMProfileData"
   deps = [
     "//llvm/lib/DebugInfo/DWARF",
     "//llvm/lib/DebugInfo/Symbolize",
     "//llvm/lib/IR",
     "//llvm/lib/Object",
     "//llvm/lib/Support",
     "//llvm/lib/TargetParser",
   ]
   sources = [
     "GCOV.cpp",
     "InstrProf.cpp",
     "InstrProfCorrelator.cpp",
     "InstrProfReader.cpp",
     "InstrProfWriter.cpp",
+    "ItaniumManglingCanonicalizer.cpp",
     "MemProf.cpp",
     "ProfileSummaryBuilder.cpp",
     "RawMemProfReader.cpp",
     "SampleProf.cpp",
     "SampleProfReader.cpp",
     "SampleProfWriter.cpp",
+    "SymbolRemappingReader.cpp",
   ]
 }

llvm/utils/gn/secondary/llvm/lib/Support/BUILD.gn

sources = [
     "FormattedStream.cpp",
     "GlobPattern.cpp",
     "GraphWriter.cpp",
     "Hashing.cpp",
     "InitLLVM.cpp",
     "InstructionCost.cpp",
     "IntEqClasses.cpp",
     "IntervalMap.cpp",
-    "ItaniumManglingCanonicalizer.cpp",
     "JSON.cpp",
     "KnownBits.cpp",
     "LEB128.cpp",
     "LineIterator.cpp",
     "Locale.cpp",
     "LockFileManager.cpp",
     "LowLevelType.cpp",
     "MD5.cpp",
sources = [
     "SourceMgr.cpp",
     "SpecialCaseList.cpp",
     "Statistic.cpp",
     "StringExtras.cpp",
     "StringMap.cpp",
     "StringRef.cpp",
     "StringSaver.cpp",
     "SuffixTree.cpp",
-    "SymbolRemappingReader.cpp",
     "SystemUtils.cpp",
     "TarWriter.cpp",
     "ThreadPool.cpp",
     "TimeProfiler.cpp",
     "Timer.cpp",
     "ToolOutputFile.cpp",
     "TrigramIndex.cpp",
     "Twine.cpp",

llvm/utils/gn/secondary/llvm/tools/llvm-cxxmap/BUILD.gn

 executable("llvm-cxxmap") {
   deps = [
     "//llvm/lib/IR",
+    "//llvm/lib/ProfileData",
     "//llvm/lib/Support",
     "//llvm/lib/Target:TargetsToBuild",
   ]
   sources = [ "llvm-cxxmap.cpp" ]
 }

llvm/utils/gn/secondary/llvm/unittests/ProfileData/BUILD.gn

 import("//third-party/unittest/unittest.gni")
 
 unittest("ProfileDataTests") {
   deps = [
     "//llvm/lib/IR",
     "//llvm/lib/ProfileData",
     "//llvm/lib/ProfileData/Coverage",
     "//llvm/lib/Testing/Support",
   ]
   sources = [
     "CoverageMappingTest.cpp",
     "InstrProfDataTest.cpp",
     "InstrProfTest.cpp",
+    "ItaniumManglingCanonicalizerTest.cpp",
     "MemProfTest.cpp",
     "SampleProfTest.cpp",
+    "SymbolRemappingReaderTest.cpp",
   ]
 }

llvm/utils/gn/secondary/llvm/unittests/Support/BUILD.gn

sources = [
     "FileCollectorTest.cpp",
     "FileOutputBufferTest.cpp",
     "FileUtilitiesTest.cpp",
     "FormatVariadicTest.cpp",
     "GlobPatternTest.cpp",
     "HashBuilderTest.cpp",
     "IndexedAccessorTest.cpp",
     "InstructionCostTest.cpp",
-    "ItaniumManglingCanonicalizerTest.cpp",
     "JSONTest.cpp",
     "KnownBitsTest.cpp",
     "LEB128Test.cpp",
     "LineIteratorTest.cpp",
     "LockFileManagerTest.cpp",
     "MD5Test.cpp",
     "ManagedStatic.cpp",
     "MatchersTest.cpp",
sources = [
     "ReverseIterationTest.cpp",
     "SHA256.cpp",
     "ScaledNumberTest.cpp",
     "ScopedPrinterTest.cpp",
     "SourceMgrTest.cpp",
     "SpecialCaseListTest.cpp",
     "SuffixTreeTest.cpp",
     "SwapByteOrderTest.cpp",
-    "SymbolRemappingReaderTest.cpp",
     "TarWriterTest.cpp",
     "TaskQueueTest.cpp",
     "ThreadPool.cpp",
     "Threading.cpp",
     "TimeProfilerTest.cpp",
     "TimerTest.cpp",
     "ToolOutputFileTest.cpp",
     "TrailingObjectsTest.cpp",

utils/bazel/llvm-project-overlay/llvm/BUILD.bazel

cc_binary(
     name = "llvm-cxxmap",
     srcs = glob([
         "tools/llvm-cxxmap/*.cpp",
         "tools/llvm-cxxmap/*.h",
     ]),
     copts = llvm_copts,
     stamp = 0,
     deps = [
+        ":ProfileData",
         ":Support",
     ],
 )
 
 gentbl(
     name = "CxxfiltOptsTableGen",
     strip_include_prefix = "tools/llvm-cxxfilt",
     tbl_outs = [(