saving changes

Author: Andres Wearden

llvm/include/llvm/ProfileData/InstrProf.h

@@ -369,9 +369,9 @@ 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 NameStrings, std::function<Error(StringRef)> NameCallback, StringRef Architecture = "");
+
 
-LLVM_ABI Error readAndDecodeStrings(StringRef NameStrings, std::function<Error(StringRef)> NameCallback, const std::string &Architecture);
 /// An enum describing the attributes of an instrumented profile.
 enum class InstrProfKind {
   Unknown = 0x0,
@@ -515,11 +515,11 @@ class InstrProfSymtab {
   LLVM_ABI static StringRef getCanonicalName(StringRef PGOName);
 
   //ANDRES Function
-  const std::string &getArchitecture() {return Architecture;}
-  void setArchitecture(const std::string &Arch) {Architecture = Arch;}
+  StringRef getArchitecture() {return Architecture;}
+  void setArchitecture(StringRef Arch) {Architecture = Arch;}
   //ANDRES Function
 private:
-  std::string Architecture;
+  StringRef Architecture;
   using AddrIntervalMap =
       IntervalMap<uint64_t, uint64_t, 4, IntervalMapHalfOpenInfo<uint64_t>>;
   StringRef Data;
@@ -635,35 +635,30 @@ class InstrProfSymtab {
 
   // Map the MD5 of the symbol name to the name.
   Error addSymbolName(StringRef SymbolName) {
-    StringRef FuncName;
-    StringRef ArchName = Architecture;
-    std::tie(FuncName, ArchName) = SymbolName.split("#");
+    // StringRef FuncName;
+    // StringRef ArchName = Architecture;
+    // std::tie(FuncName, ArchName) = SymbolName.split("#");
     if (SymbolName.empty())
       return make_error<InstrProfError>(instrprof_error::malformed,
                                         "symbol name is empty");
 
     // Insert into NameTab so that MD5NameMap (a vector that will be sorted)
     // won't have duplicated entries in the first place.
 
-    uint64_t HashValue = IndexedInstrProf::ComputeHash(FuncName);
-    llvm::StringRef HashRef(FuncName);
-    if(!ArchName.empty()){
+    uint64_t HashValue = IndexedInstrProf::ComputeHash(SymbolName);
+    llvm::StringRef HashRef(SymbolName);
+    if(!Architecture.empty()){
       std::string HashStr = std::to_string(HashValue);
-      std::string CombinedStr = HashStr + ":" + ArchName.str();
+      std::string CombinedStr = HashStr + ":" + Architecture.str();
       HashRef = CombinedStr;
       HashValue = IndexedInstrProf::ComputeHash(HashRef);
     }
-    llvm::errs() << "FuncName is " << FuncName << " is written in " << ArchName << "\n";
-    printf("Hash Value for %.*s %" PRIu64 "\n", static_cast<int>(SymbolName.size()), SymbolName.data(), HashValue);
-    auto Ins = NameTab.insert(FuncName);
-    printf("mapped value for %" PRIu64 " hash: %.*s\n", HashValue, static_cast<int>(Ins.first->getKey().size()), Ins.first->getKey().data());
+    auto Ins = NameTab.insert(SymbolName);
     if (Ins.second) {
       MD5NameMap.push_back(std::make_pair(HashValue /*IndexedInstrProf::ComputeHash(HashRef)*/, Ins.first->getKey()));
       Sorted = false;
     }
-    llvm::errs() << "Hash values when inside of addSymbolName" << "\n";
     for(int I = 0; I < int(MD5NameMap.size()); ++I){
-      llvm::errs() << "Hash: " << MD5NameMap[I].first << " Function Name: " << MD5NameMap[I].second << "\n";
     }
     return Error::success();
   }
@@ -792,19 +787,17 @@ StringRef InstrProfSymtab::getFuncOrVarNameIfDefined(uint64_t MD5Hash) {
 StringRef InstrProfSymtab::getFuncOrVarName(uint64_t MD5Hash) {
   finalizeSymtab();
   std::string TempMD5HashStr = std::to_string(MD5Hash);
-  llvm::errs() << "Before: " << MD5Hash << "\n";
   if(!Architecture.empty()){
-    std::string CombinedHashStr = TempMD5HashStr + ":" + Architecture;
+    std::string CombinedHashStr = TempMD5HashStr + ":" + Architecture.str();
     llvm::StringRef CombinedHashRef(CombinedHashStr);
     MD5Hash = IndexedInstrProf::ComputeHash(CombinedHashRef);
   }
-  llvm::errs() << "After: " << MD5Hash << "\n";
-  llvm::errs() << "Hash values when inside of getFuncOrVarName" << "\n";
-  for(int I = 0; I < int(MD5NameMap.size()); ++I){
-    llvm::errs() << "Hash: " << MD5NameMap[I].first << " Function Name: " << MD5NameMap[I].second << "\n";
-  }
   auto Result = llvm::lower_bound(MD5NameMap, MD5Hash, [](const std::pair<uint64_t, StringRef> &LHS, uint64_t RHS) { return LHS.first < RHS; });
-  llvm::errs() << "Architecture: " << (!Architecture.empty() ? Architecture : "No Specified Architecture") << ": " << Result->second << ": " << "Result->first: " << Result->first << " vs. MD5hash: " << 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;
   return StringRef();

llvm/include/llvm/ProfileData/InstrProfReader.h

@@ -213,19 +213,19 @@ class InstrProfReader {
       const object::BuildIDFetcher *BIDFetcher = nullptr,
       const InstrProfCorrelator::ProfCorrelatorKind BIDFetcherCorrelatorKind =
           InstrProfCorrelator::ProfCorrelatorKind::NONE,
-      std::function<void(Error)> Warn = nullptr, const std::string &Architecture = "");
+      std::function<void(Error)> Warn = nullptr, StringRef Architecture = "");
 
   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, const std::string &Architecture = "");
+      std::function<void(Error)> Warn = nullptr, StringRef Architecture = "");
 
-  const std::string &getArchitecture() {return Architecture;}
+  StringRef getArchitecture() {return Architecture;}
 
-  void setArchitecture(const std::string &Arch) {Architecture = Arch;}
+  void setArchitecture(StringRef Arch) {Architecture = Arch;}
   /// \param Weight for raw profiles use this as the temporal profile trace
   ///               weight
   /// \returns a list of temporal profile traces.

llvm/include/llvm/ProfileData/InstrProfWriter.h

@@ -113,12 +113,8 @@ 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);
-  LLVM_ABI void addRecord(StringRef Name, uint64_t Hash,
-                                InstrProfRecord &&I, uint64_t Weight,
-                                function_ref<void(Error)> Warn, const std::string &Architecture);
-  void addRecord(NamedInstrProfRecord &&I, uint64_t Weight, const std::string &Architecture,
-                                function_ref<void(Error)> Warn);
+                          function_ref<void(Error)> Warn, StringRef Architecture = "");
+  // 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);
   }
@@ -229,7 +225,7 @@ class InstrProfWriter {
 
 private:
   void addRecord(StringRef Name, uint64_t Hash, InstrProfRecord &&I,
-                 uint64_t Weight, function_ref<void(Error)> Warn);
+                 uint64_t Weight, function_ref<void(Error)> Warn, StringRef Architecture = "");
   bool shouldEncodeData(const ProfilingData &PD);
   /// Add \p Trace using reservoir sampling.
   void addTemporalProfileTrace(TemporalProfTraceTy Trace);