llvm-lit test cases pass

Author: Andres Wearden

llvm/include/llvm/ProfileData/Coverage/CoverageMapping.h

@@ -1031,7 +1031,7 @@ class CoverageMapping {
     ArrayRef<std::unique_ptr<CoverageMappingReader>> CoverageReaders,
     std::optional<std::reference_wrapper<IndexedInstrProfReader>>
         &ProfileReader,
-    CoverageMapping &Coverage, StringRef Arch, StringRef ObjectFilename = "", bool ShowArchExecutables = false);
+    CoverageMapping &Coverage, StringRef Arch, StringRef ObjectFilename = "", bool ShowArchExecutables = false, bool MergeBinaryCoverage = false);
 
   static Error loadFromReaders(
     ArrayRef<std::unique_ptr<CoverageMappingReader>> CoverageReaders,
@@ -1046,13 +1046,13 @@ class CoverageMapping {
                    &ProfileReader,
                CoverageMapping &Coverage, bool &DataFound,
                SmallVectorImpl<object::BuildID> *FoundBinaryIDs = nullptr, StringRef ObjectFilename = "", 
-                bool ShowArchExecutables = false);
+                bool ShowArchExecutables = false, bool MergeBinaryCoverage = false);
 
   /// Add a function record corresponding to \p Record.
   Error loadFunctionRecord(
       const CoverageMappingRecord &Record,
       const std::optional<std::reference_wrapper<IndexedInstrProfReader>>
-          &ProfileReader, StringRef ObjectFilename = "", bool ShowArchExecutables = false);
+          &ProfileReader, StringRef ObjectFilename = "", bool ShowArchExecutables = false, bool MergeBinaryCoverage = false);
 
   Error loadFunctionRecord(const CoverageMappingRecord &Record, 
     const std::optional<std::reference_wrapper<IndexedInstrProfReader>> &ProfileReader, 
@@ -1090,7 +1090,7 @@ class CoverageMapping {
        std::optional<StringRef> ProfileFilename, vfs::FileSystem &FS,
        ArrayRef<StringRef> Arches = {}, StringRef CompilationDir = "",
        const object::BuildIDFetcher *BIDFetcher = nullptr,
-       bool CheckBinaryIDs = false, bool ShowArchExecutables = false);
+       bool CheckBinaryIDs = false, bool ShowArchExecutables = false, bool MergeBinaryCoverage = false);
 
   /// The number of functions that couldn't have their profiles mapped.
   ///
@@ -1115,7 +1115,7 @@ class CoverageMapping {
   /// The given filename must be the name as recorded in the coverage
   /// information. That is, only names returned from getUniqueSourceFiles will
   /// yield a result.
-  LLVM_ABI CoverageData getCoverageForFile(StringRef Filename, bool ShowArchExecutables = false) const;
+  LLVM_ABI CoverageData getCoverageForFile(StringRef Filename, bool ShowArchExecutables = false, bool MergeBinaryCoverage = false) const;
 
   /// Get the coverage for a particular function.
   LLVM_ABI CoverageData
@@ -1280,9 +1280,9 @@ uint64_t getFuncNameRef(const FuncRecordTy *Record) {
 /// a hash.
 template <class FuncRecordTy, llvm::endianness Endian>
 Error getFuncNameViaRef(const FuncRecordTy *Record,
-                        InstrProfSymtab &ProfileNames, StringRef &FuncName, StringRef Arch = "") {
+                        InstrProfSymtab &ProfileNames, StringRef &FuncName, StringRef ObjectFilename = "") {
   uint64_t NameRef = getFuncNameRef<FuncRecordTy, Endian>(Record);
-  ProfileNames.setArchitecture(Arch.str());
+  ProfileNames.setObjectFilename(ObjectFilename);
   FuncName = ProfileNames.getFuncOrVarName(NameRef);
   return Error::success();
 }
@@ -1425,9 +1425,9 @@ struct CovMapFunctionRecordV3 {
   }
 
   template <llvm::endianness Endian>
-  Error getFuncName(InstrProfSymtab &ProfileNames, StringRef &FuncName, StringRef Arch = "") const {
+  Error getFuncName(InstrProfSymtab &ProfileNames, StringRef &FuncName, StringRef ObjectFilename = "") const {
     return accessors::getFuncNameViaRef<ThisT, Endian>(this, ProfileNames,
-                                                       FuncName, Arch);
+                                                       FuncName, ObjectFilename);
   }
 
   /// Get the filename set reference.

llvm/include/llvm/ProfileData/Coverage/CoverageMappingReader.h

@@ -40,11 +40,16 @@ struct CoverageMappingRecord {
   ArrayRef<CounterExpression> Expressions;
   ArrayRef<CounterMappingRegion> MappingRegions;
   StringRef Arch;
+  StringRef ObjectFilename;
 
   const StringRef &getArchitecture() const { return Arch; }
   void setArchitecture(StringRef NewArch){
     Arch = StringRef(NewArch);
   }
+  const StringRef &getObjectFilename() const { return ObjectFilename; }
+  void setObjectFilename(StringRef ObjectFilename){
+    this->ObjectFilename = StringRef(ObjectFilename);
+  }
 };
 
 /// A file format agnostic iterator over coverage mapping data.
@@ -223,14 +228,14 @@ class LLVM_ABI BinaryCoverageReader : public CoverageMappingReader {
   create(MemoryBufferRef ObjectBuffer, StringRef Arch,
          SmallVectorImpl<std::unique_ptr<MemoryBuffer>> &ObjectFileBuffers,
          StringRef CompilationDir = "",
-         SmallVectorImpl<object::BuildIDRef> *BinaryIDs = nullptr);
+         SmallVectorImpl<object::BuildIDRef> *BinaryIDs = nullptr, StringRef ObjectFilename = "");
 
   static Expected<std::unique_ptr<BinaryCoverageReader>>
   createCoverageReaderFromBuffer(
       StringRef Coverage, FuncRecordsStorage &&FuncRecords,
       CoverageMapCopyStorage &&CoverageMap,
       std::unique_ptr<InstrProfSymtab> ProfileNamesPtr, uint8_t BytesInAddress,
-      llvm::endianness Endian, StringRef CompilationDir = "", StringRef Arch = "");
+      llvm::endianness Endian, StringRef CompilationDir = "", StringRef Arch = "", StringRef ObjectFilename = "");
 
   Error readNextRecord(CoverageMappingRecord &Record) override;
 };

llvm/include/llvm/ProfileData/InstrProf.h

@@ -369,7 +369,7 @@ LLVM_ABI bool needsComdatForCounter(const GlobalObject &GV, const Module &M);
 /// InstrProf.h:getInstrProfNameSeparator). This method decodes the string and
 /// calls `NameCallback` for each substring.
 LLVM_ABI Error readAndDecodeStrings(
-    StringRef NameStrings, std::function<Error(StringRef)> NameCallback, StringRef Architecture = "");
+    StringRef NameStrings, std::function<Error(StringRef)> NameCallback, StringRef ObjectFilename = "");
 
 
 /// An enum describing the attributes of an instrumented profile.
@@ -513,12 +513,14 @@ class InstrProfSymtab {
   // suffixes that begins with "." except ".__uniq." are stripped.
   // FIXME: Unify this with `FunctionSamples::getCanonicalFnName`.
   LLVM_ABI static StringRef getCanonicalName(StringRef PGOName);
-
   //ANDRES Function
+  StringRef getObjectFilename() {return ObjectFilename;}
+  void setObjectFilename(StringRef ObjectFilename) {this->ObjectFilename = ObjectFilename;}
   StringRef getArchitecture() {return Architecture;}
-  void setArchitecture(StringRef Arch) {Architecture = Arch;}
+  void setArchitecture(StringRef Architecture) {this->Architecture = Architecture;}
   //ANDRES Function
 private:
+  StringRef ObjectFilename;
   StringRef Architecture;
   using AddrIntervalMap =
       IntervalMap<uint64_t, uint64_t, 4, IntervalMapHalfOpenInfo<uint64_t>>;
@@ -643,20 +645,19 @@ class InstrProfSymtab {
     // won't have duplicated entries in the first place.
 
     uint64_t HashValue = IndexedInstrProf::ComputeHash(SymbolName);
-    llvm::StringRef HashRef(SymbolName);
-    if(!Architecture.empty()){
-      std::string HashStr = std::to_string(HashValue);
-      std::string CombinedStr = HashStr + ":" + Architecture.str();
-      HashRef = CombinedStr;
+    std::string HashStr(std::to_string(HashValue));
+    // llvm::errs() << "HELLLOOOOOOOOO" << "\n";
+    if(!ObjectFilename.empty()){
+      std::string CombinedStr = HashStr + ":" + ObjectFilename.str();
+      llvm::errs() << CombinedStr << "\n";
+      StringRef HashRef = CombinedStr;
       HashValue = IndexedInstrProf::ComputeHash(HashRef);
     }
     auto Ins = NameTab.insert(SymbolName);
     if (Ins.second) {
       MD5NameMap.push_back(std::make_pair(HashValue /*IndexedInstrProf::ComputeHash(HashRef)*/, Ins.first->getKey()));
       Sorted = false;
     }
-    for(int I = 0; I < int(MD5NameMap.size()); ++I){
-    }
     return Error::success();
   }
 
@@ -784,19 +785,20 @@ StringRef InstrProfSymtab::getFuncOrVarNameIfDefined(uint64_t MD5Hash) {
 StringRef InstrProfSymtab::getFuncOrVarName(uint64_t MD5Hash) {
   finalizeSymtab();
   std::string TempMD5HashStr = std::to_string(MD5Hash);
-  if(!Architecture.empty()){
-    std::string CombinedHashStr = TempMD5HashStr + ":" + Architecture.str();
+  if(!ObjectFilename.empty()){
+    std::string CombinedHashStr = TempMD5HashStr + ":" + ObjectFilename.str();
     llvm::StringRef CombinedHashRef(CombinedHashStr);
     MD5Hash = IndexedInstrProf::ComputeHash(CombinedHashRef);
   }
   auto Result = llvm::lower_bound(MD5NameMap, MD5Hash, [](const std::pair<uint64_t, StringRef> &LHS, uint64_t RHS) { return LHS.first < RHS; });
 
-  // for(auto name : MD5NameMap){
-  //   llvm::errs() << "Function Name " << name.second  << " Result->first: " << name.first << "\n";
-  // }
-  // llvm::errs() << "Function Name " << Result->second  << " Result->first: " << Result->first << " vs. " << MD5Hash << "\n";
+  for(auto name : MD5NameMap){
+    llvm::errs() << "Function Name " << name.second  << " Result->first: " << name.first << "\n";
+  }
+  llvm::errs() << "Function Name " << Result->second  << " Result->first: " << Result->first << " vs. " << MD5Hash << "\n";
   if (Result != MD5NameMap.end() && Result->first == MD5Hash)
     return Result->second;
+  llvm::errs() << "MISMATCH HERE" << "\n";
   return StringRef();
 }
 

llvm/include/llvm/ProfileData/InstrProfReader.h

@@ -162,8 +162,8 @@ class InstrProfReader {
   LLVM_ABI void accumulateCounts(CountSumOrPercent &Sum, bool IsCS);
 
 protected:
-  //ANDRES Storing Architecture Information as a string
-  std::string Architecture;
+  //ANDRES Storing ObjectFilename Information as a string
+  std::string ObjectFilename;
 
   std::unique_ptr<InstrProfSymtab> Symtab;
   /// A list of temporal profile traces.
@@ -213,19 +213,19 @@ class InstrProfReader {
       const object::BuildIDFetcher *BIDFetcher = nullptr,
       const InstrProfCorrelator::ProfCorrelatorKind BIDFetcherCorrelatorKind =
           InstrProfCorrelator::ProfCorrelatorKind::NONE,
-      std::function<void(Error)> Warn = nullptr, StringRef Architecture = "");
+      std::function<void(Error)> Warn = nullptr, StringRef ObjectFilename = "");
 
   LLVM_ABI static Expected<std::unique_ptr<InstrProfReader>> create(
       std::unique_ptr<MemoryBuffer> Buffer,
       const InstrProfCorrelator *Correlator = nullptr,
       const object::BuildIDFetcher *BIDFetcher = nullptr,
       const InstrProfCorrelator::ProfCorrelatorKind BIDFetcherCorrelatorKind =
           InstrProfCorrelator::ProfCorrelatorKind::NONE,
-      std::function<void(Error)> Warn = nullptr, StringRef Architecture = "");
+      std::function<void(Error)> Warn = nullptr, StringRef ObjectFilename = "");
 
-  StringRef getArchitecture() {return Architecture;}
+  StringRef getObjectFilename() {return ObjectFilename;}
 
-  void setArchitecture(StringRef Arch) {Architecture = Arch;}
+  void setObjectFilename(StringRef ObjectFilename) {this->ObjectFilename = ObjectFilename;}
   /// \param Weight for raw profiles use this as the temporal profile trace
   ///               weight
   /// \returns a list of temporal profile traces.
@@ -877,7 +877,7 @@ class LLVM_ABI IndexedInstrProfReader : public InstrProfReader {
 
   static Expected<std::unique_ptr<IndexedInstrProfReader>>
   create(const Twine &Path, vfs::FileSystem &FS,
-        const std::string &Arch, const Twine &RemappingPath = "");
+        const std::string &ObjectFilename, const Twine &RemappingPath = "");
 
   static Expected<std::unique_ptr<IndexedInstrProfReader>>
   create(std::unique_ptr<MemoryBuffer> Buffer,

llvm/include/llvm/ProfileData/InstrProfWriter.h

@@ -113,7 +113,7 @@ class InstrProfWriter {
   /// for this function and the hash and number of counts match, each counter is
   /// summed. Optionally scale counts by \p Weight.
   LLVM_ABI void addRecord(NamedInstrProfRecord &&I, uint64_t Weight,
-                          function_ref<void(Error)> Warn, StringRef Architecture = "");
+                          function_ref<void(Error)> Warn, StringRef ObjectFilename = "");
   // void addRecord(NamedInstrProfRecord &&I, uint64_t Weight, function_ref<void(Error)> Warn);
   void addRecord(NamedInstrProfRecord &&I, function_ref<void(Error)> Warn) {
     addRecord(std::move(I), 1, Warn);
@@ -225,7 +225,7 @@ class InstrProfWriter {
 
 private:
   void addRecord(StringRef Name, uint64_t Hash, InstrProfRecord &&I,
-                 uint64_t Weight, function_ref<void(Error)> Warn, StringRef Architecture = "");
+                 uint64_t Weight, function_ref<void(Error)> Warn, StringRef ObjectFilename = "");
   bool shouldEncodeData(const ProfilingData &PD);
   /// Add \p Trace using reservoir sampling.
   void addTemporalProfileTrace(TemporalProfTraceTy Trace);