llvmbot wrote:
<!--LLVM PR SUMMARY COMMENT--> @llvm/pr-subscribers-clang-driver @llvm/pr-subscribers-clang Author: Trass3r (Trass3r) <details> <summary>Changes</summary> This improves consistency in the trace files as other entries are demangled too. @<!-- -->jamieschmeiser @<!-- -->An-DJ --- Full diff: https://github.com/llvm/llvm-project/pull/87626.diff 4 Files Affected: - (modified) clang/test/Driver/ftime-trace-sections.py (+13-2) - (modified) llvm/lib/IR/LegacyPassManager.cpp (+3-1) - (modified) llvm/lib/Passes/CMakeLists.txt (+1) - (modified) llvm/lib/Passes/StandardInstrumentations.cpp (+5-4) ``````````diff diff --git a/clang/test/Driver/ftime-trace-sections.py b/clang/test/Driver/ftime-trace-sections.py old mode 100644 new mode 100755 index 02afa4ac54eb7b..eeb3aa24131a39 --- a/clang/test/Driver/ftime-trace-sections.py +++ b/clang/test/Driver/ftime-trace-sections.py @@ -19,9 +19,12 @@ def is_before(range1, range2): log_contents = json.loads(sys.stdin.read()) events = log_contents["traceEvents"] -codegens = [event for event in events if event["name"] == "CodeGen Function"] + +instants = [event for event in events if event["name"] == "InstantiateFunction"] +codegens = [event for event in events if event["name"] == "CodeGen Function"] +opts = [event for event in events if event["name"] == "OptFunction"] frontends = [event for event in events if event["name"] == "Frontend"] -backends = [event for event in events if event["name"] == "Backend"] +backends = [event for event in events if event["name"] == "Backend"] beginning_of_time = log_contents["beginningOfTime"] / 1000000 seconds_since_epoch = time.time() @@ -48,3 +51,11 @@ def is_before(range1, range2): ] ): sys.exit("Not all Frontend section are before all Backend sections!") + +# Check that entries for foo exist and are in a demangled form. +if not any(e for e in instants if "foo<int>" in e["args"]["detail"]): + sys.exit("Missing Instantiate entry for foo!") +if not any(e for e in codegens if "foo<int>" in e["args"]["detail"]): + sys.exit("Missing CodeGen entry for foo!") +if not any(e for e in opts if "foo<int>" in e["args"]["detail"]): + sys.exit("Missing Optimize entry for foo!") diff --git a/llvm/lib/IR/LegacyPassManager.cpp b/llvm/lib/IR/LegacyPassManager.cpp index 953f21ce740590..9e3578954418ad 100644 --- a/llvm/lib/IR/LegacyPassManager.cpp +++ b/llvm/lib/IR/LegacyPassManager.cpp @@ -12,6 +12,7 @@ #include "llvm/IR/LegacyPassManager.h" #include "llvm/ADT/MapVector.h" +#include "llvm/Demangle/Demangle.h" #include "llvm/IR/DiagnosticInfo.h" #include "llvm/IR/IRPrintingPasses.h" #include "llvm/IR/LLVMContext.h" @@ -1421,7 +1422,8 @@ bool FPPassManager::runOnFunction(Function &F) { // Store name outside of loop to avoid redundant calls. const StringRef Name = F.getName(); - llvm::TimeTraceScope FunctionScope("OptFunction", Name); + llvm::TimeTraceScope FunctionScope( + "OptFunction", [&F]() { return demangle(F.getName().str()); }); for (unsigned Index = 0; Index < getNumContainedPasses(); ++Index) { FunctionPass *FP = getContainedPass(Index); diff --git a/llvm/lib/Passes/CMakeLists.txt b/llvm/lib/Passes/CMakeLists.txt index 6425f4934b2103..b5224327d79216 100644 --- a/llvm/lib/Passes/CMakeLists.txt +++ b/llvm/lib/Passes/CMakeLists.txt @@ -21,6 +21,7 @@ add_llvm_component_library(LLVMPasses CodeGen Core Coroutines + Demangle HipStdPar IPO InstCombine diff --git a/llvm/lib/Passes/StandardInstrumentations.cpp b/llvm/lib/Passes/StandardInstrumentations.cpp index 697988b3fc7c0b..0faf865cd013c8 100644 --- a/llvm/lib/Passes/StandardInstrumentations.cpp +++ b/llvm/lib/Passes/StandardInstrumentations.cpp @@ -20,6 +20,7 @@ #include "llvm/Analysis/LazyCallGraph.h" #include "llvm/Analysis/LoopInfo.h" #include "llvm/CodeGen/MachineFunction.h" +#include "llvm/Demangle/Demangle.h" #include "llvm/IR/Constants.h" #include "llvm/IR/Function.h" #include "llvm/IR/Module.h" @@ -215,12 +216,12 @@ void printIR(raw_ostream &OS, const Loop *L) { printLoop(const_cast<Loop &>(*L), OS); } -std::string getIRName(Any IR) { +std::string getIRName(Any IR, bool demangled = false) { if (unwrapIR<Module>(IR)) return "[module]"; if (const auto *F = unwrapIR<Function>(IR)) - return F->getName().str(); + return demangled ? demangle(F->getName()) : F->getName().str(); if (const auto *C = unwrapIR<LazyCallGraph::SCC>(IR)) return C->getName(); @@ -229,7 +230,7 @@ std::string getIRName(Any IR) { return L->getName().str(); if (const auto *MF = unwrapIR<MachineFunction>(IR)) - return MF->getName().str(); + return demangled ? demangle(MF->getName()) : MF->getName().str(); llvm_unreachable("Unknown wrapped IR type"); } @@ -1495,7 +1496,7 @@ void TimeProfilingPassesHandler::registerCallbacks( } void TimeProfilingPassesHandler::runBeforePass(StringRef PassID, Any IR) { - timeTraceProfilerBegin(PassID, getIRName(IR)); + timeTraceProfilerBegin(PassID, getIRName(IR, true)); } void TimeProfilingPassesHandler::runAfterPass() { timeTraceProfilerEnd(); } `````````` </details> https://github.com/llvm/llvm-project/pull/87626 _______________________________________________ cfe-commits mailing list cfe-commits@lists.llvm.org https://lists.llvm.org/cgi-bin/mailman/listinfo/cfe-commits
