[DWP] Refactoring llvm-dwp in to a library part 2

[ayermolo]

Summary

This is follow up to https://reviews.llvm.org/D106198 where llvm-dwp was refactored in to multiple files.
In this patch moving them in to lib/include directories.

[ayermolo]

Updated ifdef for headers

[dblaikie]

Sounds good

[ayermolo]

rebase on latest

llvm/include/llvm/DWP/DWP.h

-#ifndef LLVM_TOOLS_LLVM_DWP_DWP_H
-#define LLVM_TOOLS_LLVM_DWP_DWP_H
+#ifndef LLVM_DWP_DWP_H
+#define LLVM_DWP_DWP_H
 
 #include "DWPStringPool.h"
 #include "llvm/ADT/ArrayRef.h"
 #include "llvm/ADT/MapVector.h"
 #include "llvm/ADT/StringRef.h"
 #include "llvm/DebugInfo/DWARF/DWARFContext.h"
 #include "llvm/DebugInfo/DWARF/DWARFUnitIndex.h"
 #include "llvm/MC/MCSection.h"
Error buildDuplicateError(const std::pair<uint64_t, UnitIndexEntry> &PrevE,
                           const CompileUnitIdentifiers &ID, StringRef DWPName);
 
 void writeIndex(MCStreamer &Out, MCSection *Section,
                 ArrayRef<unsigned> ContributionOffsets,
                 const MapVector<uint64_t, UnitIndexEntry> &IndexEntries,
                 uint32_t IndexVersion);
 
 } // namespace llvm
-#endif // LLVM_TOOLS_LLVM_DWP_DWP_H
+#endif // LLVM_DWP_DWP_H

llvm/include/llvm/DWP/DWPError.h

-#ifndef TOOLS_LLVM_DWP_DWPERROR
-#define TOOLS_LLVM_DWP_DWPERROR
+#ifndef LLVM_DWP_DWPERROR_H
+#define LLVM_DWP_DWPERROR_H
 
 #include "llvm/Support/Error.h"
 #include "llvm/Support/ErrorHandling.h"
 #include <string>
 
 namespace llvm {
 class DWPError : public ErrorInfo<DWPError> {
 public:
   DWPError(std::string Info) : Info(std::move(Info)) {}
   void log(raw_ostream &OS) const override { OS << Info; }
   std::error_code convertToErrorCode() const override {
     llvm_unreachable("Not implemented");
   }
   static char ID;
 
 private:
   std::string Info;
 };
 } // namespace llvm
 
-#endif
+#endif // LLVM_DWP_DWPERROR_H

llvm/include/llvm/DWP/DWPStringPool.h

-#ifndef TOOLS_LLVM_DWP_DWPSTRINGPOOL
-#define TOOLS_LLVM_DWP_DWPSTRINGPOOL
+#ifndef LLVM_DWP_DWPSTRINGPOOL_H
+#define LLVM_DWP_DWPSTRINGPOOL_H
 
 #include "llvm/ADT/DenseMap.h"
 #include "llvm/MC/MCSection.h"
 #include "llvm/MC/MCStreamer.h"
 #include <cassert>
 
 namespace llvm {
 class DWPStringPool {
if (Pair.second) {
       Offset += Length;
     }
 
     return Pair.first->second;
   }
 };
 } // namespace llvm
 
-#endif
+#endif // LLVM_DWP_DWPSTRINGPOOL_H

llvm/lib/CMakeLists.txt

 add_subdirectory(LTO)
 add_subdirectory(MC)
 add_subdirectory(MCA)
 add_subdirectory(Object)
 add_subdirectory(ObjectYAML)
 add_subdirectory(Option)
 add_subdirectory(Remarks)
 add_subdirectory(DebugInfo)
+add_subdirectory(DWP)
 add_subdirectory(ExecutionEngine)
 add_subdirectory(Target)
 add_subdirectory(AsmParser)
 add_subdirectory(LineEditor)
 add_subdirectory(ProfileData)
 add_subdirectory(Passes)
 add_subdirectory(TextAPI)
 add_subdirectory(ToolDrivers)

llvm/lib/DWP/CMakeLists.txt

+add_llvm_component_library(LLVMDWP
+  DWP.cpp
+  DWPError.cpp
+
+  ADDITIONAL_HEADER_DIRS
+  ${LLVM_MAIN_INCLUDE_DIR}/llvm/DWP
+
+  DEPENDS
+  intrinsics_gen
+
+  LINK_COMPONENTS
+  DebugInfoDWARF
+  MC
+  Object
+  Support
+  Target
+)

llvm/lib/DWP/DWP.cpp

 //===-- llvm-dwp.cpp - Split DWARF merging tool for llvm ------------------===//
 //
 // 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
 //
 //===----------------------------------------------------------------------===//
 //
 // A utility for merging DWARF 5 Split DWARF .dwo files into .dwp (DWARF
 // package files).
 //
 //===----------------------------------------------------------------------===//
-#include "DWP.h"
-#include "DWPError.h"
+#include "llvm/DWP/DWP.h"
+#include "llvm/DWP/DWPError.h"
 #include "llvm/MC/MCContext.h"
 #include "llvm/MC/MCObjectFileInfo.h"
 #include "llvm/MC/MCTargetOptionsCommandFlags.h"
 #include "llvm/Object/Decompressor.h"
 
 using namespace llvm;
 using namespace llvm::object;
 

llvm/lib/DWP/DWPError.cpp

-#include "DWPError.h"
+#include "llvm/DWP/DWPError.h"
 using namespace llvm;
 char DWPError::ID;

llvm/tools/llvm-dwp/CMakeLists.txt

 set(LLVM_LINK_COMPONENTS
-  AllTargetsAsmParsers
   AllTargetsCodeGens
   AllTargetsDescs
   AllTargetsInfos
-  AsmPrinter
   DebugInfoDWARF
+  DWP
   MC
   Object
   Support
-  Target
   )
 
 add_llvm_tool(llvm-dwp
   llvm-dwp.cpp
-  DWP.cpp
-  DWPError.cpp
 
   DEPENDS
   intrinsics_gen
   )
 
 if(LLVM_INSTALL_BINUTILS_SYMLINKS)
   add_llvm_tool_symlink(dwp llvm-dwp)
 endif()

llvm/tools/llvm-dwp/llvm-dwp.cpp

 //===-- llvm-dwp.cpp - Split DWARF merging tool for llvm ------------------===//
 //
 // 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
 //
 //===----------------------------------------------------------------------===//
 //
 // A utility for merging DWARF 5 Split DWARF .dwo files into .dwp (DWARF
 // package files).
 //
 //===----------------------------------------------------------------------===//
-#include "DWP.h"
-#include "DWPError.h"
-#include "DWPStringPool.h"
+#include "llvm/DWP/DWP.h"
+#include "llvm/DWP/DWPError.h"
+#include "llvm/DWP/DWPStringPool.h"
 #include "llvm/MC/MCAsmBackend.h"
 #include "llvm/MC/MCAsmInfo.h"
 #include "llvm/MC/MCCodeEmitter.h"
 #include "llvm/MC/MCContext.h"
 #include "llvm/MC/MCInstrInfo.h"
 #include "llvm/MC/MCObjectWriter.h"
 #include "llvm/MC/MCTargetOptionsCommandFlags.h"
 #include "llvm/Support/CommandLine.h"