[𝘀𝗽𝗿] initial version

Created using spr 1.3.4

Author: aaupov

bolt/test/merge-fdata-mixed-bat-no-lbr.test

@@ -5,7 +5,7 @@
 # RUN: split-file %s %t
 # RUN: not merge-fdata %t/a.fdata %t/b.fdata 2>&1 | FileCheck %s
 
-# CHECK: cannot mix profile collected in BOLT and non-BOLT deployments
+# CHECK: cannot mix profile with and without boltedcollection
 
 #--- a.fdata
 boltedcollection

bolt/test/merge-fdata-mixed-mode.test

@@ -6,7 +6,7 @@
 # RUN: split-file %s %t
 # RUN: not merge-fdata %t/a.fdata %t/b.fdata 2>&1 | FileCheck %s
 
-# CHECK: cannot mix 'no_lbr' and 'lbr' profiles.
+# CHECK: cannot mix profile with and without no_lbr
 
 #--- a.fdata
 no_lbr

bolt/tools/merge-fdata/merge-fdata.cpp

@@ -22,6 +22,7 @@
 #include "llvm/Support/Signals.h"
 #include "llvm/Support/ThreadPool.h"
 #include <algorithm>
+#include <fstream>
 #include <mutex>
 #include <unordered_map>
 
@@ -274,52 +275,40 @@ void mergeLegacyProfiles(const SmallVectorImpl<std::string> &Filenames) {
 
     if (isYAML(Filename))
       report_error(Filename, "cannot mix YAML and legacy formats");
-    ErrorOr<std::unique_ptr<MemoryBuffer>> MB =
-        MemoryBuffer::getFileOrSTDIN(Filename);
-    if (std::error_code EC = MB.getError())
-      report_error(Filename, EC);
 
-    StringRef Buf = MB.get()->getBuffer();
+    std::ifstream FdataFile(Filename, std::ios::in);
+    std::string FdataLine;
+
+    auto checkMode = [&](const std::string &Key, std::optional<bool> &Flag) {
+      std::string ErrorMsg = "cannot mix profile with and without " + Key;
+      auto Pos = FdataFile.tellg();
+      std::getline(FdataFile, FdataLine);
+      if (FdataLine.rfind(Key, 0) == 0) {
+        if (!Flag.value_or(true))
+          report_error(Filename, ErrorMsg);
+        Flag = true;
+      } else {
+        if (Flag.value_or(false))
+          report_error(Filename, ErrorMsg);
+        Flag = false;
+        // Rewind line
+        FdataFile.seekg(Pos);
+      }
+    };
+
     ProfileTy *Profile;
     {
       std::lock_guard<std::mutex> Lock(BoltedCollectionMutex);
       // Check if the string "boltedcollection" is in the first line
-      if (Buf.starts_with("boltedcollection\n")) {
-        if (!BoltedCollection.value_or(true))
-          report_error(
-              Filename,
-              "cannot mix profile collected in BOLT and non-BOLT deployments");
-        BoltedCollection = true;
-        Buf = Buf.drop_front(17);
-      } else {
-        if (BoltedCollection.value_or(false))
-          report_error(
-              Filename,
-              "cannot mix profile collected in BOLT and non-BOLT deployments");
-        BoltedCollection = false;
-      }
+      checkMode("boltedcollection", BoltedCollection);
       // Check if the string "no_lbr" is in the first line
       // (or second line if BoltedCollection is true)
-      size_t CheckNoLBRPos = Buf.find('\n');
-      if (CheckNoLBRPos != StringRef::npos) {
-        StringRef FirstLine = Buf.substr(0, CheckNoLBRPos);
-        if (FirstLine.contains("no_lbr")) {
-          if (!NoLBRCollection.value_or(true))
-            report_error(Filename, "cannot mix 'no_lbr' and 'lbr' profiles");
-          NoLBRCollection = true;
-          Buf = Buf.drop_front(CheckNoLBRPos + 1);
-        } else {
-          if (NoLBRCollection.value_or(false))
-            report_error(Filename, "cannot mix 'no_lbr' and 'lbr' profiles");
-          NoLBRCollection = false;
-        }
-      }
+      checkMode("no_lbr", NoLBRCollection);
       Profile = &Profiles[tid];
     }
 
-    SmallVector<StringRef> Lines;
-    SplitString(Buf, Lines, "\n");
-    for (StringRef Line : Lines) {
+    while (std::getline(FdataFile, FdataLine)) {
+      StringRef Line(FdataLine);
       size_t Pos = Line.rfind(" ");
       if (Pos == StringRef::npos)
         report_error(Filename, "Malformed / corrupted profile");