diff --git a/clang/docs/tools/clang-formatted-files.txt b/clang/docs/tools/clang-formatted-files.txt --- a/clang/docs/tools/clang-formatted-files.txt +++ b/clang/docs/tools/clang-formatted-files.txt @@ -5444,8 +5444,10 @@ 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 @@ -5496,7 +5498,6 @@ 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 @@ -5518,7 +5519,6 @@ 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 @@ -7325,6 +7325,7 @@ 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 @@ -7357,7 +7358,6 @@ 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 diff --git a/llvm/include/llvm/Support/ItaniumManglingCanonicalizer.h b/llvm/include/llvm/ProfileData/ItaniumManglingCanonicalizer.h rename from llvm/include/llvm/Support/ItaniumManglingCanonicalizer.h rename to llvm/include/llvm/ProfileData/ItaniumManglingCanonicalizer.h --- a/llvm/include/llvm/Support/ItaniumManglingCanonicalizer.h +++ b/llvm/include/llvm/ProfileData/ItaniumManglingCanonicalizer.h @@ -11,8 +11,8 @@ // //===----------------------------------------------------------------------===// -#ifndef LLVM_SUPPORT_ITANIUMMANGLINGCANONICALIZER_H -#define LLVM_SUPPORT_ITANIUMMANGLINGCANONICALIZER_H +#ifndef LLVM_PROFILEDATA_ITANIUMMANGLINGCANONICALIZER_H +#define LLVM_PROFILEDATA_ITANIUMMANGLINGCANONICALIZER_H #include @@ -90,4 +90,4 @@ }; } // namespace llvm -#endif // LLVM_SUPPORT_ITANIUMMANGLINGCANONICALIZER_H +#endif // LLVM_PROFILEDATA_ITANIUMMANGLINGCANONICALIZER_H diff --git a/llvm/include/llvm/ProfileData/SampleProfReader.h b/llvm/include/llvm/ProfileData/SampleProfReader.h --- a/llvm/include/llvm/ProfileData/SampleProfReader.h +++ b/llvm/include/llvm/ProfileData/SampleProfReader.h @@ -232,11 +232,11 @@ #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 #include #include diff --git a/llvm/include/llvm/Support/SymbolRemappingReader.h b/llvm/include/llvm/ProfileData/SymbolRemappingReader.h rename from llvm/include/llvm/Support/SymbolRemappingReader.h rename to llvm/include/llvm/ProfileData/SymbolRemappingReader.h --- a/llvm/include/llvm/Support/SymbolRemappingReader.h +++ b/llvm/include/llvm/ProfileData/SymbolRemappingReader.h @@ -56,12 +56,12 @@ // //===----------------------------------------------------------------------===// -#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 { @@ -130,4 +130,4 @@ } // end namespace llvm -#endif // LLVM_SUPPORT_SYMBOLREMAPPINGREADER_H +#endif // LLVM_PROFILEDATA_SYMBOLREMAPPINGREADER_H diff --git a/llvm/lib/ProfileData/CMakeLists.txt b/llvm/lib/ProfileData/CMakeLists.txt --- a/llvm/lib/ProfileData/CMakeLists.txt +++ b/llvm/lib/ProfileData/CMakeLists.txt @@ -4,12 +4,14 @@ 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 diff --git a/llvm/lib/ProfileData/InstrProfReader.cpp b/llvm/lib/ProfileData/InstrProfReader.cpp --- a/llvm/lib/ProfileData/InstrProfReader.cpp +++ b/llvm/lib/ProfileData/InstrProfReader.cpp @@ -20,12 +20,12 @@ #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 #include diff --git a/llvm/lib/Support/ItaniumManglingCanonicalizer.cpp b/llvm/lib/ProfileData/ItaniumManglingCanonicalizer.cpp rename from llvm/lib/Support/ItaniumManglingCanonicalizer.cpp rename to llvm/lib/ProfileData/ItaniumManglingCanonicalizer.cpp --- a/llvm/lib/Support/ItaniumManglingCanonicalizer.cpp +++ b/llvm/lib/ProfileData/ItaniumManglingCanonicalizer.cpp @@ -6,7 +6,7 @@ // //===----------------------------------------------------------------------===// -#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" diff --git a/llvm/lib/Support/SymbolRemappingReader.cpp b/llvm/lib/ProfileData/SymbolRemappingReader.cpp rename from llvm/lib/Support/SymbolRemappingReader.cpp rename to llvm/lib/ProfileData/SymbolRemappingReader.cpp --- a/llvm/lib/Support/SymbolRemappingReader.cpp +++ b/llvm/lib/ProfileData/SymbolRemappingReader.cpp @@ -11,7 +11,7 @@ // //===----------------------------------------------------------------------===// -#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" diff --git a/llvm/lib/Support/CMakeLists.txt b/llvm/lib/Support/CMakeLists.txt --- a/llvm/lib/Support/CMakeLists.txt +++ b/llvm/lib/Support/CMakeLists.txt @@ -175,7 +175,6 @@ InstructionCost.cpp IntEqClasses.cpp IntervalMap.cpp - ItaniumManglingCanonicalizer.cpp JSON.cpp KnownBits.cpp LEB128.cpp @@ -218,7 +217,6 @@ StringSaver.cpp StringRef.cpp SuffixTree.cpp - SymbolRemappingReader.cpp SystemUtils.cpp TarWriter.cpp ThreadPool.cpp diff --git a/llvm/tools/llvm-cxxmap/CMakeLists.txt b/llvm/tools/llvm-cxxmap/CMakeLists.txt --- a/llvm/tools/llvm-cxxmap/CMakeLists.txt +++ b/llvm/tools/llvm-cxxmap/CMakeLists.txt @@ -1,6 +1,7 @@ set(LLVM_LINK_COMPONENTS Core Support + ProfileData ) add_llvm_tool(llvm-cxxmap diff --git a/llvm/tools/llvm-cxxmap/llvm-cxxmap.cpp b/llvm/tools/llvm-cxxmap/llvm-cxxmap.cpp --- a/llvm/tools/llvm-cxxmap/llvm-cxxmap.cpp +++ b/llvm/tools/llvm-cxxmap/llvm-cxxmap.cpp @@ -14,12 +14,12 @@ #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" diff --git a/llvm/unittests/ProfileData/CMakeLists.txt b/llvm/unittests/ProfileData/CMakeLists.txt --- a/llvm/unittests/ProfileData/CMakeLists.txt +++ b/llvm/unittests/ProfileData/CMakeLists.txt @@ -10,8 +10,10 @@ CoverageMappingTest.cpp InstrProfDataTest.cpp InstrProfTest.cpp - SampleProfTest.cpp + ItaniumManglingCanonicalizerTest.cpp MemProfTest.cpp + SampleProfTest.cpp + SymbolRemappingReaderTest.cpp ) target_link_libraries(ProfileDataTests PRIVATE LLVMTestingSupport) diff --git a/llvm/unittests/Support/ItaniumManglingCanonicalizerTest.cpp b/llvm/unittests/ProfileData/ItaniumManglingCanonicalizerTest.cpp rename from llvm/unittests/Support/ItaniumManglingCanonicalizerTest.cpp rename to llvm/unittests/ProfileData/ItaniumManglingCanonicalizerTest.cpp --- a/llvm/unittests/Support/ItaniumManglingCanonicalizerTest.cpp +++ b/llvm/unittests/ProfileData/ItaniumManglingCanonicalizerTest.cpp @@ -6,7 +6,7 @@ // //===----------------------------------------------------------------------===// -#include "llvm/Support/ItaniumManglingCanonicalizer.h" +#include "llvm/ProfileData/ItaniumManglingCanonicalizer.h" #include "llvm/ADT/ArrayRef.h" #include "llvm/ADT/StringRef.h" #include "gtest/gtest.h" diff --git a/llvm/unittests/Support/SymbolRemappingReaderTest.cpp b/llvm/unittests/ProfileData/SymbolRemappingReaderTest.cpp rename from llvm/unittests/Support/SymbolRemappingReaderTest.cpp rename to llvm/unittests/ProfileData/SymbolRemappingReaderTest.cpp --- a/llvm/unittests/Support/SymbolRemappingReaderTest.cpp +++ b/llvm/unittests/ProfileData/SymbolRemappingReaderTest.cpp @@ -6,7 +6,7 @@ // //===----------------------------------------------------------------------===// -#include "llvm/Support/SymbolRemappingReader.h" +#include "llvm/ProfileData/SymbolRemappingReader.h" #include "llvm/Support/MemoryBuffer.h" #include "gtest/gtest.h" diff --git a/llvm/unittests/Support/CMakeLists.txt b/llvm/unittests/Support/CMakeLists.txt --- a/llvm/unittests/Support/CMakeLists.txt +++ b/llvm/unittests/Support/CMakeLists.txt @@ -46,7 +46,6 @@ HashBuilderTest.cpp IndexedAccessorTest.cpp InstructionCostTest.cpp - ItaniumManglingCanonicalizerTest.cpp JSONTest.cpp KnownBitsTest.cpp LEB128Test.cpp @@ -76,7 +75,6 @@ SpecialCaseListTest.cpp SuffixTreeTest.cpp SwapByteOrderTest.cpp - SymbolRemappingReaderTest.cpp TarWriterTest.cpp TaskQueueTest.cpp ThreadPool.cpp diff --git a/llvm/utils/gn/secondary/llvm/lib/ProfileData/BUILD.gn b/llvm/utils/gn/secondary/llvm/lib/ProfileData/BUILD.gn --- a/llvm/utils/gn/secondary/llvm/lib/ProfileData/BUILD.gn +++ b/llvm/utils/gn/secondary/llvm/lib/ProfileData/BUILD.gn @@ -14,11 +14,13 @@ "InstrProfCorrelator.cpp", "InstrProfReader.cpp", "InstrProfWriter.cpp", + "ItaniumManglingCanonicalizer.cpp", "MemProf.cpp", "ProfileSummaryBuilder.cpp", "RawMemProfReader.cpp", "SampleProf.cpp", "SampleProfReader.cpp", "SampleProfWriter.cpp", + "SymbolRemappingReader.cpp", ] } diff --git a/llvm/utils/gn/secondary/llvm/lib/Support/BUILD.gn b/llvm/utils/gn/secondary/llvm/lib/Support/BUILD.gn --- a/llvm/utils/gn/secondary/llvm/lib/Support/BUILD.gn +++ b/llvm/utils/gn/secondary/llvm/lib/Support/BUILD.gn @@ -89,7 +89,6 @@ "InstructionCost.cpp", "IntEqClasses.cpp", "IntervalMap.cpp", - "ItaniumManglingCanonicalizer.cpp", "JSON.cpp", "KnownBits.cpp", "LEB128.cpp", @@ -133,7 +132,6 @@ "StringRef.cpp", "StringSaver.cpp", "SuffixTree.cpp", - "SymbolRemappingReader.cpp", "SystemUtils.cpp", "TarWriter.cpp", "ThreadPool.cpp", diff --git a/llvm/utils/gn/secondary/llvm/tools/llvm-cxxmap/BUILD.gn b/llvm/utils/gn/secondary/llvm/tools/llvm-cxxmap/BUILD.gn --- a/llvm/utils/gn/secondary/llvm/tools/llvm-cxxmap/BUILD.gn +++ b/llvm/utils/gn/secondary/llvm/tools/llvm-cxxmap/BUILD.gn @@ -1,6 +1,7 @@ executable("llvm-cxxmap") { deps = [ "//llvm/lib/IR", + "//llvm/lib/ProfileData", "//llvm/lib/Support", "//llvm/lib/Target:TargetsToBuild", ] diff --git a/llvm/utils/gn/secondary/llvm/unittests/ProfileData/BUILD.gn b/llvm/utils/gn/secondary/llvm/unittests/ProfileData/BUILD.gn --- a/llvm/utils/gn/secondary/llvm/unittests/ProfileData/BUILD.gn +++ b/llvm/utils/gn/secondary/llvm/unittests/ProfileData/BUILD.gn @@ -11,7 +11,9 @@ "CoverageMappingTest.cpp", "InstrProfDataTest.cpp", "InstrProfTest.cpp", + "ItaniumManglingCanonicalizerTest.cpp", "MemProfTest.cpp", "SampleProfTest.cpp", + "SymbolRemappingReaderTest.cpp", ] } diff --git a/llvm/utils/gn/secondary/llvm/unittests/Support/BUILD.gn b/llvm/utils/gn/secondary/llvm/unittests/Support/BUILD.gn --- a/llvm/utils/gn/secondary/llvm/unittests/Support/BUILD.gn +++ b/llvm/utils/gn/secondary/llvm/unittests/Support/BUILD.gn @@ -49,7 +49,6 @@ "HashBuilderTest.cpp", "IndexedAccessorTest.cpp", "InstructionCostTest.cpp", - "ItaniumManglingCanonicalizerTest.cpp", "JSONTest.cpp", "KnownBitsTest.cpp", "LEB128Test.cpp", @@ -79,7 +78,6 @@ "SpecialCaseListTest.cpp", "SuffixTreeTest.cpp", "SwapByteOrderTest.cpp", - "SymbolRemappingReaderTest.cpp", "TarWriterTest.cpp", "TaskQueueTest.cpp", "ThreadPool.cpp", diff --git a/utils/bazel/llvm-project-overlay/llvm/BUILD.bazel b/utils/bazel/llvm-project-overlay/llvm/BUILD.bazel --- a/utils/bazel/llvm-project-overlay/llvm/BUILD.bazel +++ b/utils/bazel/llvm-project-overlay/llvm/BUILD.bazel @@ -3188,6 +3188,7 @@ copts = llvm_copts, stamp = 0, deps = [ + ":ProfileData", ":Support", ], )