added three llvm-lit tests, testing the --merge-binary-coverage flag and the --show-arch-executables flag

Author: Andres Wearden

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

@@ -1018,6 +1018,7 @@ class CoverageMapping {
   DenseMap<std::pair<size_t, hash_code>, unsigned> RecordIndices;
   uint64_t DebugCount = 0;
   std::vector<FunctionRecord> AllFunctionRegions;
+  StringRef ObjectFilename;
 
 
   std::map<std::pair<std::string, std::string>, std::vector<uint64_t>> AggregatedCounts;
@@ -1073,6 +1074,12 @@ class CoverageMapping {
     Arch = StringRef(NewArch);
   }
 
+  void setObjectFilename(StringRef ObjectFilename){
+    this->ObjectFilename = StringRef(ObjectFilename);
+  }
+
+  const StringRef &getObjectFilename() const { return this->ObjectFilename; }
+
   CoverageMapping(const CoverageMapping &) = delete;
   CoverageMapping &operator=(const CoverageMapping &) = delete;
 

llvm/include/llvm/ProfileData/InstrProf.h

@@ -646,7 +646,8 @@ class InstrProfSymtab {
 
     uint64_t HashValue = IndexedInstrProf::ComputeHash(SymbolName);
     std::string HashStr(std::to_string(HashValue));
-    //if ObjectFilename is not empty from the --object-aware-hashing flag, add ObjectFilename to hash context
+    // if ObjectFilename is not empty from the --object-aware-hashing flag, add
+    // ObjectFilename to hash context
     if(!ObjectFilename.empty()){
       std::string CombinedStr = HashStr + ":" + ObjectFilename.str();
       StringRef HashRef = CombinedStr;

llvm/include/llvm/ProfileData/InstrProfReader.h

@@ -162,7 +162,7 @@ class InstrProfReader {
   LLVM_ABI void accumulateCounts(CountSumOrPercent &Sum, bool IsCS);
 
 protected:
-  //Storing ObjectFilename Information as a string
+  // Storing ObjectFilename Information as a string
   std::string ObjectFilename;
 
   std::unique_ptr<InstrProfSymtab> Symtab;

llvm/lib/ProfileData/Coverage/CoverageMapping.cpp

@@ -32,6 +32,7 @@
 #include "llvm/Support/ScopedPrinter.h"
 #include "llvm/Support/VirtualFileSystem.h"
 #include "llvm/Support/raw_ostream.h"
+#include "llvm/Object/ObjectFile.h"
 #include <algorithm>
 #include <cassert>
 #include <cmath>
@@ -825,6 +826,7 @@ class MCDCDecisionRecorder {
 
 } // namespace
 
+
 Error CoverageMapping::loadFunctionRecord(
     const CoverageMappingRecord &Record,
     const std::optional<std::reference_wrapper<IndexedInstrProfReader>>
@@ -954,13 +956,13 @@ Error CoverageMapping::loadFunctionRecord(
   auto FilenamesHash = hash_combine_range(Record.Filenames);
   std::string HashStr = OrigFuncName.str();
   if(ShowArchExecutables){
-    HashStr += ":" + Arch.str();
+    HashStr += ":" + ObjectFilename.str();
   }else{
     auto LogicalFuncKey = std::make_pair(FilenamesHash, hash_value(OrigFuncName));
     auto It = RecordIndices.find(LogicalFuncKey);
     if (It != RecordIndices.end()) {
       auto &ExistingFunction = Functions[It->second];
-      // Create a map of existing regions for efficient lookup.
+      // Create a map of existing regions for lookup.
       // The key uniquely identifies the source region.
       using RegionKey = std::tuple<unsigned, unsigned, unsigned, unsigned, unsigned>;
       std::map<RegionKey, CountedRegion *> ExistingRegionsMap;
@@ -987,9 +989,7 @@ Error CoverageMapping::loadFunctionRecord(
           ExistingFunction.CountedRegions.push_back(NewRegion);
         }
       }
-      // Since we modified an existing function, we don't add a new one.
-      // We just need to make sure we don't add the new 'Function' object later.
-      // The logic below this block needs to be adjusted to handle this.
+
       return Error::success();
     }
     RecordIndices.insert({LogicalFuncKey, Functions.size()});
@@ -1048,7 +1048,7 @@ Error CoverageMapping::loadFromReaders(
     std::optional<std::reference_wrapper<IndexedInstrProfReader>>
         &ProfileReader,
     CoverageMapping &Coverage, StringRef Arch, StringRef ObjectFilename, bool ShowArchExecutables, bool MergeBinaryCoverage) {
-  
+
   assert(!Coverage.SingleByteCoverage || !ProfileReader ||
          *Coverage.SingleByteCoverage ==
              ProfileReader.value().get().hasSingleByteCoverage());
@@ -1447,16 +1447,16 @@ class SegmentBuilder {
 
     sortNestedRegions(Regions);
 
-    
-    //check to see if a skipped region from executable A is within a CodeRegion from executable B,
-    //promote to CodeRegion if skipped region does not show up on any other executable.
+    // check to see if a skipped region from executable A is within a CodeRegion
+    // from executable B, promote to CodeRegion if skipped region does not show
+    // up on any other executable.
     for(auto *I = Regions.begin(); I != Regions.end(); ++I){
       bool FoundMatchInOtherBinary = false;
       for(auto *J = I + 1; J != Regions.end(); ++J){
-        if(I->ObjectFilename != J->ObjectFilename &&
-            J->Kind == CounterMappingRegion::SkippedRegion 
-            && I->Kind != CounterMappingRegion::SkippedRegion &&
-            J->startLoc() >= I->startLoc() && J->endLoc() <= I->endLoc()){
+        if (I->ObjectFilename != J->ObjectFilename &&
+            J->Kind == CounterMappingRegion::SkippedRegion &&
+            I->Kind != CounterMappingRegion::SkippedRegion &&
+            J->startLoc() >= I->startLoc() && J->endLoc() <= I->endLoc()) {
           for(auto *K = J + 1; K != Regions.end(); ++K){
             if(K->ObjectFilename == I->ObjectFilename &&
               J->startLoc() == K->startLoc() && J->endLoc() == K->endLoc()){
@@ -1527,7 +1527,7 @@ static SmallBitVector gatherFileIDs(StringRef SourceFile,
 static std::optional<unsigned>
 findMainViewFileID(const FunctionRecord &Function) {
   SmallBitVector IsNotExpandedFile(Function.Filenames.size(), true);
-  for (const auto &CR : Function.CountedRegions){
+  for (const auto &CR : Function.CountedRegions) {
     if (CR.Kind == CounterMappingRegion::ExpansionRegion)
       IsNotExpandedFile[CR.ExpandedFileID] = false;
   }

llvm/lib/ProfileData/InstrProf.cpp

@@ -622,7 +622,7 @@ Error InstrProfSymtab::create(StringRef NameStrings) {
 }
 
 Error InstrProfSymtab::create(StringRef FuncNameStrings,
-                              StringRef VTableNameStrings) {                          
+                              StringRef VTableNameStrings) {
   if (Error E = readAndDecodeStrings(FuncNameStrings, std::bind(&InstrProfSymtab::addFuncName, this, std::placeholders::_1)))
     return E;
 

llvm/lib/ProfileData/InstrProfReader.cpp

@@ -159,8 +159,7 @@ Expected<std::unique_ptr<InstrProfReader>> InstrProfReader::create(
     const InstrProfCorrelator *Correlator,
     const object::BuildIDFetcher *BIDFetcher,
     const InstrProfCorrelator::ProfCorrelatorKind BIDFetcherCorrelatorKind,
-    std::function<void(Error)> Warn, 
-    StringRef ObjectFilename) {
+    std::function<void(Error)> Warn, StringRef ObjectFilename) {
   // Set up the buffer to read.
   auto BufferOrError = setupMemoryBuffer(Path, FS);
   if (Error E = BufferOrError.takeError())
@@ -196,7 +195,7 @@ Expected<std::unique_ptr<InstrProfReader>> InstrProfReader::create(
 
   // Initialize the reader and return the result.
 
-  //Pass the ObjectFilename to Result
+  // Pass the ObjectFilename to Result
   if(Result){
     Result->setObjectFilename(ObjectFilename);
   }
@@ -536,8 +535,7 @@ bool RawInstrProfReader<IntPtrT>::hasFormat(const MemoryBuffer &DataBuffer) {
          llvm::byteswap(RawInstrProf::getMagic<IntPtrT>()) == Magic;
 }
 
-template <class IntPtrT>
-Error RawInstrProfReader<IntPtrT>::readHeader() {
+template <class IntPtrT> Error RawInstrProfReader<IntPtrT>::readHeader() {
   if (!hasFormat(*DataBuffer))
     return error(instrprof_error::bad_magic);
   if (DataBuffer->getBufferSize() < sizeof(RawInstrProf::Header))

llvm/lib/ProfileData/InstrProfWriter.cpp

@@ -195,13 +195,11 @@ void InstrProfWriter::overlapRecord(NamedInstrProfRecord &&Other,
   Dest.overlap(Other, Overlap, FuncLevelOverlap, ValueCutoff);
 }
 
-
-
 void InstrProfWriter::addRecord(StringRef Name, uint64_t Hash,
                                 InstrProfRecord &&I, uint64_t Weight,
                                 function_ref<void(Error)> Warn, StringRef ObjectFilename) {
   auto &ProfileDataMap = FunctionData[Name];
-  //add objectFilename to hash value if --object-aware-hashing is used
+  // add objectFilename to hash value if --object-aware-hashing is used
   if(!ObjectFilename.empty()){
     std::string HashStr = std::to_string(Hash) + ":" + ObjectFilename.str();
     llvm::StringRef HashRef(HashStr);

llvm/test/tools/llvm-cov/Inputs/fb.c

@@ -0,0 +1,5 @@
+int foo() { return 0; }
+
+int bar() { return 0; }
+
+int bun() { return 0; }

llvm/test/tools/llvm-cov/Inputs/mypg.c

@@ -0,0 +1,2 @@
+int baz() { return 0; }
+int main() { return 1; }

llvm/test/tools/llvm-cov/Inputs/myprogram.c

@@ -0,0 +1,8 @@
+extern int foo();
+extern int bar();
+extern int bun();
+
+
+int main() {
+  return foo() + bar() + bun();
+}