From: Anton Afanasyev Date: Mon, 19 Aug 2019 22:58:26 +0000 (+0000) Subject: [Support][Time profiler] Make FE codegen blocks to be inside frontend blocks X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=387fd059a36f735b46e4499e4aa2e1d2eb6db979;p=clang [Support][Time profiler] Make FE codegen blocks to be inside frontend blocks Summary: Add `Frontend` time trace entry to `HandleTranslationUnit()` function. Add test to check all codegen blocks are inside frontend blocks. Also, change `--time-trace-granularity` option a bit to make sure very small time blocks are outputed to json-file when using `--time-trace-granularity=0`. This fixes http://llvm.org/pr41969 Reviewers: russell.gallop, lebedev.ri, thakis Reviewed By: russell.gallop Subscribers: vsapsai, aras-p, lebedev.ri, hiraditya, cfe-commits, llvm-commits Tags: #clang, #llvm Differential Revision: https://reviews.llvm.org/D63325 git-svn-id: https://llvm.org/svn/llvm-project/cfe/trunk@369308 91177308-0d34-0410-b5e6-96231b3b80d8 --- diff --git a/lib/CodeGen/CodeGenAction.cpp b/lib/CodeGen/CodeGenAction.cpp index ab568a765a..2356f84c05 100644 --- a/lib/CodeGen/CodeGenAction.cpp +++ b/lib/CodeGen/CodeGenAction.cpp @@ -38,6 +38,7 @@ #include "llvm/Pass.h" #include "llvm/Support/MemoryBuffer.h" #include "llvm/Support/SourceMgr.h" +#include "llvm/Support/TimeProfiler.h" #include "llvm/Support/Timer.h" #include "llvm/Support/ToolOutputFile.h" #include "llvm/Support/YAMLTraits.h" @@ -229,6 +230,7 @@ namespace clang { void HandleTranslationUnit(ASTContext &C) override { { + llvm::TimeTraceScope TimeScope("Frontend", StringRef("")); PrettyStackTraceString CrashInfo("Per-file LLVM IR generation"); if (FrontendTimesIsEnabled) { LLVMIRGenerationRefCount += 1; diff --git a/test/Driver/check-time-trace-sections.cpp b/test/Driver/check-time-trace-sections.cpp new file mode 100644 index 0000000000..4d1c0fde3a --- /dev/null +++ b/test/Driver/check-time-trace-sections.cpp @@ -0,0 +1,7 @@ +// REQUIRES: shell +// RUN: %clangxx -S -ftime-trace -ftime-trace-granularity=0 -o %T/check-time-trace-sections %s +// RUN: cat %T/check-time-trace-sections.json | %python %S/check-time-trace-sections.py + +template +void foo(T) {} +void bar() { foo(0); } diff --git a/test/Driver/check-time-trace-sections.py b/test/Driver/check-time-trace-sections.py new file mode 100644 index 0000000000..e807dae24a --- /dev/null +++ b/test/Driver/check-time-trace-sections.py @@ -0,0 +1,25 @@ +#!/usr/bin/env python + +import json, sys + +def is_inside(range1, range2): + a = range1["ts"]; b = a + range1["dur"] + c = range2["ts"]; d = c + range2["dur"] + return (a >= c and a <= d) and (b >= c and b <= d) + +def is_before(range1, range2): + b = range1["ts"] + range1["dur"]; c = range2["ts"] + return b <= c + +events = json.loads(sys.stdin.read())["traceEvents"] +codegens = filter(lambda x: x["name"] == "CodeGen Function", events) +frontends = filter(lambda x: x["name"] == "Frontend", events) +backends = filter(lambda x: x["name"] == "Backend", events) + +if not all([any([is_inside(codegen, frontend) for frontend in frontends]) + for codegen in codegens]): + sys.exit("Not all CodeGen sections are inside any Frontend section!") + +if not all([all([is_before(frontend, backend) for frontend in frontends]) + for backend in backends]): + sys.exit("Not all Frontend section are before all Backend sections!")