[llvm] 8f5a232 - [llvm-profgen] Trim tail CR+LF for LBR record line (#93210)

[via llvm-commits]

Author: Haohai Wen
Date: 2024-05-24T09:03:53+08:00
New Revision: 8f5a2325c39221efb6a0512639edb750ded62c44

URL: https://github.com/llvm/llvm-project/commit/8f5a2325c39221efb6a0512639edb750ded62c44
DIFF: https://github.com/llvm/llvm-project/commit/8f5a2325c39221efb6a0512639edb750ded62c44.diff

LOG: [llvm-profgen] Trim tail CR+LF for LBR record line (#93210)

On Windows, perfscript generated by sep contains CR+LF at the end of
LBR records line. This '\r' will be treated as a LBR record when running
llvm-profgen on Linux and then generate warning.

Added: 
    

Modified: 
    llvm/tools/llvm-profgen/PerfReader.cpp

Removed: 
    


################################################################################
diff  --git a/llvm/tools/llvm-profgen/PerfReader.cpp b/llvm/tools/llvm-profgen/PerfReader.cpp
index e9442027aed3f..e63c6d61b3bfc 100644
--- a/llvm/tools/llvm-profgen/PerfReader.cpp
+++ b/llvm/tools/llvm-profgen/PerfReader.cpp
@@ -552,7 +552,7 @@ bool PerfScriptReader::extractLBRStack(TraceStream &TraceIt,
   //                           ... 0x4005c8/0x4005dc/P/-/-/0
   // It's in FIFO order and seperated by whitespace.
   SmallVector<StringRef, 32> Records;
-  TraceIt.getCurrentLine().split(Records, " ", -1, false);
+  TraceIt.getCurrentLine().rtrim().split(Records, " ", -1, false);
   auto WarnInvalidLBR = [](TraceStream &TraceIt) {
     WithColor::warning() << "Invalid address in LBR record at line "
                          << TraceIt.getLineNumber() << ": "