From ee48a509e29db1d47188837b51e50aa134c5d5c9 Mon Sep 17 00:00:00 2001 From: Martin Pelikan Date: Thu, 1 Mar 2018 01:59:24 +0000 Subject: [PATCH] [XRay] cache symbolized function names for a repeatedly queried function ID Summary: Processing 2 GB XRay traces with "llvm-xray convert -symbolize" needs to go over each trace record and symbolize the function name refered to by its ID. Currently this happens by asking the LLVM symbolizer code every single time. A simple cache can save around 30 minutes of processing of that trace. llvm-xray's resident memory usage increased negligibly with this cache. Reviewers: dberris Subscribers: llvm-commits Differential Revision: https://reviews.llvm.org/D43896 llvm-svn: 326407 --- tools/llvm-xray/func-id-helper.cc | 8 +++++++- tools/llvm-xray/func-id-helper.h | 2 ++ 2 files changed, 9 insertions(+), 1 deletion(-) diff --git a/tools/llvm-xray/func-id-helper.cc b/tools/llvm-xray/func-id-helper.cc index 3234010695b..9bf55b23bdd 100644 --- a/tools/llvm-xray/func-id-helper.cc +++ b/tools/llvm-xray/func-id-helper.cc @@ -19,6 +19,10 @@ using namespace llvm; using namespace xray; std::string FuncIdConversionHelper::SymbolOrNumber(int32_t FuncId) const { + auto CacheIt = CachedNames.find(FuncId); + if (CacheIt != CachedNames.end()) + return CacheIt->second; + std::ostringstream F; auto It = FunctionAddresses.find(FuncId); if (It == FunctionAddresses.end()) { @@ -37,7 +41,9 @@ std::string FuncIdConversionHelper::SymbolOrNumber(int32_t FuncId) const { F << "@(" << std::hex << It->second << ")"; }); - return F.str(); + auto S = F.str(); + CachedNames[FuncId] = S; + return S; } std::string FuncIdConversionHelper::FileLineAndColumn(int32_t FuncId) const { diff --git a/tools/llvm-xray/func-id-helper.h b/tools/llvm-xray/func-id-helper.h index 7348a7100b0..3e0780d54f9 100644 --- a/tools/llvm-xray/func-id-helper.h +++ b/tools/llvm-xray/func-id-helper.h @@ -13,6 +13,7 @@ #ifndef LLVM_TOOLS_LLVM_XRAY_FUNC_ID_HELPER_H #define LLVM_TOOLS_LLVM_XRAY_FUNC_ID_HELPER_H +#include "llvm/ADT/DenseMap.h" #include "llvm/DebugInfo/Symbolize/Symbolize.h" #include @@ -28,6 +29,7 @@ private: std::string BinaryInstrMap; symbolize::LLVMSymbolizer &Symbolizer; const FunctionAddressMap &FunctionAddresses; + mutable llvm::DenseMap CachedNames; public: FuncIdConversionHelper(std::string BinaryInstrMap,