commit to push final changes

Author: Andres Wearden

llvm/include/llvm/ProfileData/InstrProf.h

@@ -513,12 +513,12 @@ 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 Architecture) {this->Architecture = Architecture;}
-  //ANDRES Function
+
 private:
   StringRef ObjectFilename;
   StringRef Architecture;
@@ -646,16 +646,15 @@ class InstrProfSymtab {
 
     uint64_t HashValue = IndexedInstrProf::ComputeHash(SymbolName);
     std::string HashStr(std::to_string(HashValue));
-    // llvm::errs() << "HELLLOOOOOOOOO" << "\n";
+    //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();
-      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()));
+      MD5NameMap.push_back(std::make_pair(HashValue, Ins.first->getKey()));
       Sorted = false;
     }
     return Error::success();
@@ -792,13 +791,8 @@ StringRef InstrProfSymtab::getFuncOrVarName(uint64_t MD5Hash) {
   }
   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";
   if (Result != MD5NameMap.end() && Result->first == MD5Hash)
     return Result->second;
-  llvm::errs() << "MISMATCH HERE" << "\n";
   return StringRef();
 }
 

llvm/include/llvm/ProfileData/InstrProfReader.h

@@ -162,7 +162,7 @@ class InstrProfReader {
   LLVM_ABI void accumulateCounts(CountSumOrPercent &Sum, bool IsCS);
 
 protected:
-  //ANDRES 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

@@ -825,157 +825,6 @@ class MCDCDecisionRecorder {
 
 } // namespace
 
-// Error CoverageMapping::loadFunctionRecord(
-//     const CoverageMappingRecord &Record,
-//     const std::optional<std::reference_wrapper<IndexedInstrProfReader>>
-//         &ProfileReader, StringRef Arch) {
-//   StringRef OrigFuncName = Record.FunctionName;
-//   if (OrigFuncName.empty())
-//     return make_error<CoverageMapError>(coveragemap_error::malformed,
-//                                         "record function name is empty");
-
-//   if (Record.Filenames.empty())
-//     OrigFuncName = getFuncNameWithoutPrefix(OrigFuncName);
-//   else
-//     OrigFuncName = getFuncNameWithoutPrefix(OrigFuncName, Record.Filenames[0]);
-
-//   CounterMappingContext Ctx(Record.Expressions);
-
-//   uint64_t FuncArchHash = Record.FunctionHash;
-//   if(!Arch.empty()){
-//     std::string HashStr = std::to_string(Record.FunctionHash) + ":" + Arch.str();
-//     llvm::StringRef HashRef(HashStr);
-//     FuncArchHash = IndexedInstrProf::ComputeHash(HashRef);
-//   }
-
-//   std::vector<uint64_t> Counts;
-//   if (ProfileReader) {
-//     if (Error E = ProfileReader.value().get().getFunctionCounts(
-//             Record.FunctionName, FuncArchHash, Counts)) {
-//       instrprof_error IPE = std::get<0>(InstrProfError::take(std::move(E)));
-//       if (IPE == instrprof_error::hash_mismatch) {
-//         FuncHashMismatches.emplace_back(std::string(Record.FunctionName),
-//                                         FuncArchHash);
-//         return Error::success();
-//       }
-//       if (IPE != instrprof_error::unknown_function)
-//         return make_error<InstrProfError>(IPE);
-//       Counts.assign(getMaxCounterID(Ctx, Record) + 1, 0);
-//     }
-//   } else {
-//     Counts.assign(getMaxCounterID(Ctx, Record) + 1, 0);
-//   }
-//   Ctx.setCounts(Counts);
-
-//   bool IsVersion11 =
-//       ProfileReader && ProfileReader.value().get().getVersion() <
-//                            IndexedInstrProf::ProfVersion::Version12;
-
-//   BitVector Bitmap;
-//   if (ProfileReader) {
-//     if (Error E = ProfileReader.value().get().getFunctionBitmap(
-//             Record.FunctionName, FuncArchHash, Bitmap)) {
-//       instrprof_error IPE = std::get<0>(InstrProfError::take(std::move(E)));
-//       if (IPE == instrprof_error::hash_mismatch) {
-//         FuncHashMismatches.emplace_back(std::string(Record.FunctionName),
-//                                         FuncArchHash);
-//         return Error::success();
-//       }
-//       if (IPE != instrprof_error::unknown_function)
-//         return make_error<InstrProfError>(IPE);
-//       Bitmap = BitVector(getMaxBitmapSize(Record, IsVersion11));
-//     }
-//   } else {
-//     Bitmap = BitVector(getMaxBitmapSize(Record, false));
-//   }
-//   Ctx.setBitmap(std::move(Bitmap));
-
-//   assert(!Record.MappingRegions.empty() && "Function has no regions");
-
-//   // This coverage record is a zero region for a function that's unused in
-//   // some TU, but used in a different TU. Ignore it. The coverage maps from the
-//   // the other TU will either be loaded (providing full region counts) or they
-//   // won't (in which case we don't unintuitively report functions as uncovered
-//   // when they have non-zero counts in the profile).
-//   if (Record.MappingRegions.size() == 1 &&
-//       Record.MappingRegions[0].Count.isZero() && Counts[0] > 0)
-//     return Error::success();
-
-//   MCDCDecisionRecorder MCDCDecisions;
-//   FunctionRecord Function(OrigFuncName, Record.Filenames);
-//   for (const auto &Region : Record.MappingRegions) {
-//     // MCDCDecisionRegion should be handled first since it overlaps with
-//     // others inside.
-//     if (Region.Kind == CounterMappingRegion::MCDCDecisionRegion) {
-//       MCDCDecisions.registerDecision(Region);
-//       continue;
-//     }
-//     Expected<int64_t> ExecutionCount = Ctx.evaluate(Region.Count);
-//     if (auto E = ExecutionCount.takeError()) {
-//       consumeError(std::move(E));
-//       return Error::success();
-//     }
-//     Expected<int64_t> AltExecutionCount = Ctx.evaluate(Region.FalseCount);
-//     if (auto E = AltExecutionCount.takeError()) {
-//       consumeError(std::move(E));
-//       return Error::success();
-//     }
-//     Function.pushRegion(Region, *ExecutionCount, *AltExecutionCount);
-
-//     // Record ExpansionRegion.
-//     if (Region.Kind == CounterMappingRegion::ExpansionRegion) {
-//       MCDCDecisions.recordExpansion(Region);
-//       continue;
-//     }
-
-//     // Do nothing unless MCDCBranchRegion.
-//     if (Region.Kind != CounterMappingRegion::MCDCBranchRegion)
-//       continue;
-
-//     auto Result = MCDCDecisions.processBranch(Region);
-//     if (!Result) // Any Decision doesn't complete.
-//       continue;
-
-//     auto MCDCDecision = Result->first;
-//     auto &MCDCBranches = Result->second;
-
-//     // Since the bitmap identifies the executed test vectors for an MC/DC
-//     // DecisionRegion, all of the information is now available to process.
-//     // This is where the bulk of the MC/DC progressing takes place.
-//     Expected<MCDCRecord> Record =
-//         Ctx.evaluateMCDCRegion(*MCDCDecision, MCDCBranches, IsVersion11);
-//     if (auto E = Record.takeError()) {
-//       consumeError(std::move(E));
-//       return Error::success();
-//     }
-
-//     // Save the MC/DC Record so that it can be visualized later.
-//     Function.pushMCDCRecord(std::move(*Record));
-//   }
-
-//   // Don't create records for (filenames, function) pairs we've already seen.
-//   auto FilenamesHash = hash_combine_range(Record.Filenames);
-//   if (!RecordProvenance[FilenamesHash].insert(hash_value(OrigFuncName)).second)
-//     return Error::success();
-
-//   Functions.push_back(std::move(Function));
-
-//   // Performance optimization: keep track of the indices of the function records
-//   // which correspond to each filename. This can be used to substantially speed
-//   // up queries for coverage info in a file.
-//   unsigned RecordIndex = Functions.size() - 1;
-//   for (StringRef Filename : Record.Filenames) {
-//     auto &RecordIndices = FilenameHash2RecordIndices[hash_value(Filename)];
-//     // Note that there may be duplicates in the filename set for a function
-//     // record, because of e.g. macro expansions in the function in which both
-//     // the macro and the function are defined in the same file.
-//     if (RecordIndices.empty() || RecordIndices.back() != RecordIndex)
-//       RecordIndices.push_back(RecordIndex);
-//   }
-
-//   return Error::success();
-// }
-
 Error CoverageMapping::loadFunctionRecord(
     const CoverageMappingRecord &Record,
     const std::optional<std::reference_wrapper<IndexedInstrProfReader>>
@@ -1200,7 +1049,6 @@ Error CoverageMapping::loadFromReaders(
         &ProfileReader,
     CoverageMapping &Coverage, StringRef Arch, StringRef ObjectFilename, bool ShowArchExecutables, bool MergeBinaryCoverage) {
 
-  // Coverage.setArchitecture(Arch);
   assert(!Coverage.SingleByteCoverage || !ProfileReader ||
          *Coverage.SingleByteCoverage ==
              ProfileReader.value().get().hasSingleByteCoverage());
@@ -1308,9 +1156,6 @@ Expected<std::unique_ptr<CoverageMapping>> CoverageMapping::load(
     return Arches[Idx];
   };
 
-  //I beleive there is an error in this area of code, it's iterating through all arch's of the object files
-  // but its only filling *Coverage with last architecture it gets to
-
   SmallVector<object::BuildID> FoundBinaryIDs;
   for (const auto &File : llvm::enumerate(ObjectFilenames)) {
     if (Error E = loadFromFile(File.value(), GetArch(File.index()),
@@ -1320,9 +1165,6 @@ Expected<std::unique_ptr<CoverageMapping>> CoverageMapping::load(
       return std::move(E);
   }
 
-  //I beleive there is an error in this area of code, it's iterating through all arch's of the object files
-  // but its only filling *Coverage with last architecture it gets to
-
   if (BIDFetcher) {
     std::vector<object::BuildID> ProfileBinaryIDs;
     if (ProfileReader)
@@ -1561,7 +1403,6 @@ class SegmentBuilder {
   }
 
   /// Combine counts of regions which cover the same area.
-  //[(3:12, 10:1), (4:1, 6:7), (6:7, 8:1)]
   static ArrayRef<CountedRegion>
   combineRegions(MutableArrayRef<CountedRegion> Regions) {
     if (Regions.empty())
@@ -1576,8 +1417,6 @@ class SegmentBuilder {
         ++Active;
         if (Active != I){
           *Active = *I;
-          // Active->ExecutionCount = 1;
-          // Active->Kind = CounterMappingRegion::CodeRegion;
         }
         continue;
       }
@@ -1608,14 +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.
     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()){
-          // llvm::errs() << "(" << to_string(J->startLoc().first) << ", " << to_string(J->endLoc().first) << ")" << "\n";
           for(auto *K = J + 1; K != Regions.end(); ++K){
             if(K->ObjectFilename == I->ObjectFilename &&
               J->startLoc() == K->startLoc() && J->endLoc() == K->endLoc()){
@@ -1686,12 +1527,7 @@ static SmallBitVector gatherFileIDs(StringRef SourceFile,
 static std::optional<unsigned>
 findMainViewFileID(const FunctionRecord &Function) {
   SmallBitVector IsNotExpandedFile(Function.Filenames.size(), true);
-  uint64_t counter = 0;
   for (const auto &CR : Function.CountedRegions){
-    // counter++;
-    // if(counter == 245){
-    //   llvm::errs() << counter << "\n";
-    // }
     if (CR.Kind == CounterMappingRegion::ExpansionRegion)
       IsNotExpandedFile[CR.ExpandedFileID] = false;
   }
@@ -1726,14 +1562,6 @@ CoverageData CoverageMapping::getCoverageForFile(StringRef Filename, bool ShowAr
   // DenseSet<CountedRegion> DeDuplicationSet;
   ArrayRef<unsigned> RecordIndices =
       getImpreciseRecordIndicesForFilename(Filename);
-  // for (unsigned RecordIndex : RecordIndices) {
-  //   const FunctionRecord &Function = AllFunctionRegions[RecordIndex];
-  //   for(const auto &I : Function.CountedRegions){
-  //     llvm::errs() << "(" << to_string(I.startLoc().first) << ", " << to_string(I.endLoc().first) << ")" << "\n";
-  //   }
-  // }
-  // ArrayRef<unsigned> RecordIndices =
-  //     getImpreciseRecordIndicesForFilename(Filename);
   for (unsigned RecordIndex : RecordIndices) {
     const FunctionRecord &Function = !MergeBinaryCoverage ? Functions[RecordIndex] : AllFunctionRegions[RecordIndex];
     auto MainFileID = findMainViewFileID(Filename, Function);

llvm/lib/ProfileData/InstrProf.cpp

@@ -574,49 +574,6 @@ Error InstrProfSymtab::addVTableWithName(GlobalVariable &VTable,
   return Error::success();
 }
 
-// Error readAndDecodeStrings(StringRef NameStrings,
-//                            std::function<Error(StringRef)> NameCallback, const std::string &Architecture) {
-//   const uint8_t *P = NameStrings.bytes_begin();
-//   const uint8_t *EndP = NameStrings.bytes_end();
-//   while (P < EndP) {
-//     uint32_t N;
-//     uint64_t UncompressedSize = decodeULEB128(P, &N);
-//     P += N;
-//     uint64_t CompressedSize = decodeULEB128(P, &N);
-//     P += N;
-//     const bool IsCompressed = (CompressedSize != 0);
-//     SmallVector<uint8_t, 128> UncompressedNameStrings;
-//     StringRef NameStrings;
-//     if (IsCompressed) {
-//       if (!llvm::compression::zlib::isAvailable())
-//         return make_error<InstrProfError>(instrprof_error::zlib_unavailable);
-
-//       if (Error E = compression::zlib::decompress(ArrayRef(P, CompressedSize),
-//                                                   UncompressedNameStrings,
-//                                                   UncompressedSize)) {
-//         consumeError(std::move(E));
-//         return make_error<InstrProfError>(instrprof_error::uncompress_failed);
-//       }
-//       P += CompressedSize;
-//       NameStrings = toStringRef(UncompressedNameStrings);
-//     } else {
-//       NameStrings =
-//           StringRef(reinterpret_cast<const char *>(P), UncompressedSize);
-//       P += UncompressedSize;
-//     }
-//     // Now parse the name strings.
-//     SmallVector<StringRef, 0> Names;
-//     NameStrings.split(Names, getInstrProfNameSeparator());
-//     for (StringRef &Name : Names){
-//       if (Error E = NameCallback(Name))
-//         return E;
-//     }
-//     while (P < EndP && *P == 0)
-//       P++;
-//   }
-//   return Error::success();
-// }
-
 Error readAndDecodeStrings(StringRef NameStrings,
                            std::function<Error(StringRef)> NameCallback, StringRef ObjectFilename) {
   const uint8_t *P = NameStrings.bytes_begin();
@@ -665,8 +622,7 @@ Error InstrProfSymtab::create(StringRef NameStrings) {
 }
 
 Error InstrProfSymtab::create(StringRef FuncNameStrings,
-                              StringRef VTableNameStrings) {
-  // const std::string &Architecture = getArchitecture();                                
+                              StringRef VTableNameStrings) {                          
   if (Error E = readAndDecodeStrings(FuncNameStrings, std::bind(&InstrProfSymtab::addFuncName, this, std::placeholders::_1)))
     return E;