obj2yaml: Introduce CovMap dump

llvm/include/llvm/ObjectYAML/CovMap.h

@@ -16,16 +16,18 @@
 //
 // - llvm::covmap
 //
-//   Provides YAML encoder for coverage map.
+//   Provides YAML encoder and decoder for coverage map.
 //
 //===----------------------------------------------------------------------===//
 
 #ifndef LLVM_OBJECTYAML_COVMAP_H
 #define LLVM_OBJECTYAML_COVMAP_H
 
+#include "llvm/ADT/ArrayRef.h"
 #include "llvm/ADT/StringRef.h"
 #include "llvm/ObjectYAML/ELFYAML.h"
 #include "llvm/Support/Endian.h"
+#include "llvm/Support/Error.h"
 #include "llvm/Support/YAMLTraits.h"
 #include <array>
 #include <cstdint>
@@ -41,6 +43,8 @@ class raw_ostream;
 
 namespace llvm::coverage::yaml {
 
+struct DecoderContext;
+
 /// Base Counter, corresponding to coverage::Counter.
 struct CounterTy {
   enum TagTy : uint8_t {
@@ -57,6 +61,14 @@ struct CounterTy {
 
   virtual void mapping(llvm::yaml::IO &IO);
 
+  uint64_t getExtTagVal() const { return (Tag == Zero && Val != 0 ? Val : 0); }
+
+  /// Holds Val for extensions.
+  Error decodeOrTag(DecoderContext &Data);
+
+  /// Raise Error if Val isn't empty.
+  Error decode(DecoderContext &Data);
+
   void encode(raw_ostream &OS) const;
 };
 
@@ -77,6 +89,8 @@ struct DecisionTy {
 
   void mapping(llvm::yaml::IO &IO);
 
+  Error decode(DecoderContext &Data);
+
   void encode(raw_ostream &OS) const;
 };
 
@@ -110,6 +124,8 @@ struct RecTy : CounterTy {
 
   void mapping(llvm::yaml::IO &IO) override;
 
+  Error decode(DecoderContext &Data);
+
   void encode(raw_ostream &OS) const;
 };
 
@@ -131,6 +147,10 @@ struct CovFunTy {
 
   void mapping(llvm::yaml::IO &IO);
 
+  /// Depends on CovMap and SymTab(IPSK_names)
+  Expected<uint64_t> decode(const ArrayRef<uint8_t> Content, uint64_t Offset,
+                            endianness Endianness);
+
   void encode(raw_ostream &OS, endianness Endianness) const;
 };
 
@@ -147,6 +167,9 @@ struct CovMapTy {
 
   void mapping(llvm::yaml::IO &IO);
 
+  Expected<uint64_t> decode(const ArrayRef<uint8_t> Content, uint64_t Offset,
+                            endianness Endianness);
+
   /// Encode Filenames. This is mostly used just to obtain FilenamesRef.
   std::pair<uint64_t, std::string> encodeFilenames(bool Compress = false) const;
 
@@ -201,6 +224,31 @@ LLVM_COVERAGE_YAML_ELEM_MAPPING(CovMapTy)
 
 namespace llvm::covmap {
 
+class Decoder {
+protected:
+  endianness Endianness;
+
+public:
+  Decoder(endianness Endianness) : Endianness(Endianness) {}
+  virtual ~Decoder();
+
+  /// Returns DecoderImpl.
+  static std::unique_ptr<Decoder> get(endianness Endianness,
+                                      bool CovMapEnabled);
+
+  /// Called from the Sections loop in advance of the final dump.
+  /// Decoder predecodes CovMap for Version info.
+  virtual Error acquire(unsigned AddressAlign, StringRef Name,
+                        ArrayRef<uint8_t> Content) = 0;
+
+  /// Make contents on ELFYAML object. CovMap is predecoded.
+  virtual Error make(ELFYAML::CovMapSectionBase *Base,
+                     ArrayRef<uint8_t> Content) = 0;
+
+  /// Suppress emission of CovMap unless enabled.
+  static bool enabled;
+};
+
 /// Returns whether Name is interested.
 bool nameMatches(StringRef Name);
 

llvm/include/llvm/ProfileData/InstrProf.h

@@ -545,6 +545,12 @@ class InstrProfSymtab {
   /// This method is a wrapper to \c readAndDecodeStrings method.
   Error create(StringRef NameStrings);
 
+  // PrfNames is nested array.
+  using PrfNamesTy = SmallVector<std::string>;
+  using PrfNamesChunksTy = SmallVector<PrfNamesTy, 1>;
+
+  Expected<PrfNamesChunksTy> createAndGetList(ArrayRef<uint8_t> Content);
+
   /// Initialize symtab states with function names and vtable names. \c
   /// FuncNameStrings is a string composed of one or more encoded function name
   /// strings, and \c VTableNameStrings composes of one or more encoded vtable