llvmbot wrote:
<!--LLVM PR SUMMARY COMMENT--> @llvm/pr-subscribers-clang-driver Author: None (MaggieYingYi) <details> <summary>Changes</summary> When profiling code using `-ftime-trace` with the default `time-trace-granularity` value (500 microseconds), in some code there is a large empty timeline in the flame chart profiling view (using Chrome Tracing view). If you pass `-ftime-trace-granularity=0` in order to show all time traces, the empty timeline consists of a large number of small time scopes named `EvaluateAsConstExpr`. This change adds an enclosing time trace scope for the function `Parser::ParseDeclarationOrFunctionDefinition` to record the time spent parsing the function's declaration or definition. --- Full diff: https://github.com/llvm/llvm-project/pull/65268.diff 3 Files Affected: - (modified) clang/lib/Parse/Parser.cpp (+9-1) - (added) clang/test/Driver/check-time-trace-ParseDeclarationOrFunctionDefinition.cpp (+14) - (modified) clang/unittests/Support/TimeProfilerTest.cpp (+26-18) ``````````diff diff --git a/clang/lib/Parse/Parser.cpp b/clang/lib/Parse/Parser.cpp index 0f930248e77174b..533a9af173178b0 100644 --- a/clang/lib/Parse/Parser.cpp +++ b/clang/lib/Parse/Parser.cpp @@ -13,8 +13,8 @@ #include "clang/Parse/Parser.h" #include "clang/AST/ASTConsumer.h" #include "clang/AST/ASTContext.h" -#include "clang/AST/DeclTemplate.h" #include "clang/AST/ASTLambda.h" +#include "clang/AST/DeclTemplate.h" #include "clang/Basic/FileManager.h" #include "clang/Parse/ParseDiagnostic.h" #include "clang/Parse/RAIIObjectsForParser.h" @@ -22,6 +22,7 @@ #include "clang/Sema/ParsedTemplate.h" #include "clang/Sema/Scope.h" #include "llvm/Support/Path.h" +#include "llvm/Support/TimeProfiler.h" using namespace clang; @@ -1229,6 +1230,9 @@ Parser::DeclGroupPtrTy Parser::ParseDeclOrFunctionDefInternal( Parser::DeclGroupPtrTy Parser::ParseDeclarationOrFunctionDefinition( ParsedAttributes &Attrs, ParsedAttributes &DeclSpecAttrs, ParsingDeclSpec *DS, AccessSpecifier AS) { + // Add an enclosing time trace scope for a bunch of small scopes with + // "EvaluateAsConstExpr". + llvm::TimeTraceScope TimeScope("ParseDeclarationOrFunctionDefinition"); if (DS) { return ParseDeclOrFunctionDefInternal(Attrs, DeclSpecAttrs, *DS, AS); } else { @@ -1259,6 +1263,10 @@ Parser::DeclGroupPtrTy Parser::ParseDeclarationOrFunctionDefinition( Decl *Parser::ParseFunctionDefinition(ParsingDeclarator &D, const ParsedTemplateInfo &TemplateInfo, LateParsedAttrList *LateParsedAttrs) { + llvm::TimeTraceScope TimeScope( + "ParseFunctionDefinition", + Actions.GetNameForDeclarator(D).getName().getAsString()); + // Poison SEH identifiers so they are flagged as illegal in function bodies. PoisonSEHIdentifiersRAIIObject PoisonSEHIdentifiers(*this, true); const DeclaratorChunk::FunctionTypeInfo &FTI = D.getFunctionTypeInfo(); diff --git a/clang/test/Driver/check-time-trace-ParseDeclarationOrFunctionDefinition.cpp b/clang/test/Driver/check-time-trace-ParseDeclarationOrFunctionDefinition.cpp new file mode 100644 index 000000000000000..96bb37d57823e8b --- /dev/null +++ b/clang/test/Driver/check-time-trace-ParseDeclarationOrFunctionDefinition.cpp @@ -0,0 +1,14 @@ +// RUN: %clangxx -S -ftime-trace -ftime-trace-granularity=0 -o %T/check-time-trace-ParseDeclarationOrFunctionDefinition %s +// RUN: cat %T/check-time-trace-ParseDeclarationOrFunctionDefinition.json \ +// RUN: | %python -c 'import json, sys; json.dump(json.loads(sys.stdin.read()), sys.stdout, sort_keys=True, indent=2)' \ +// RUN: | FileCheck %s + +// CHECK-DAG: "name": "ParseDeclarationOrFunctionDefinition" +// CHECK-DAG: "name": "ParseFunctionDefinition" +// CHECK-DAG: "detail": "foo" +// CHECK-DAG: "name": "ParseFunctionDefinition" +// CHECK-DAG: "detail": "bar" + +template <typename T> +void foo(T) {} +void bar() { foo(0); } diff --git a/clang/unittests/Support/TimeProfilerTest.cpp b/clang/unittests/Support/TimeProfilerTest.cpp index a7ca2bf91e474ef..f69a54692b0072a 100644 --- a/clang/unittests/Support/TimeProfilerTest.cpp +++ b/clang/unittests/Support/TimeProfilerTest.cpp @@ -177,22 +177,29 @@ constexpr int slow_init_list[] = {1, 1, 2, 3, 5, 8, 13, 21}; // 25th line std::string TraceGraph = buildTraceGraph(Json); ASSERT_TRUE(TraceGraph == R"( Frontend -| EvaluateAsRValue (<test.cc:8:21>) -| EvaluateForOverflow (<test.cc:8:21, col:25>) -| EvaluateForOverflow (<test.cc:8:30, col:32>) -| EvaluateAsRValue (<test.cc:9:14>) -| EvaluateForOverflow (<test.cc:9:9, col:14>) -| isPotentialConstantExpr (slow_namespace::slow_func) -| EvaluateAsBooleanCondition (<test.cc:8:21, col:25>) -| | EvaluateAsRValue (<test.cc:8:21, col:25>) -| EvaluateAsBooleanCondition (<test.cc:8:21, col:25>) -| | EvaluateAsRValue (<test.cc:8:21, col:25>) -| EvaluateAsInitializer (slow_value) -| EvaluateAsConstantExpr (<test.cc:17:33, col:59>) -| EvaluateAsConstantExpr (<test.cc:18:11, col:37>) -| EvaluateAsConstantExpr (<test.cc:23:31, col:57>) -| EvaluateAsRValue (<test.cc:22:14, line:23:58>) -| EvaluateAsInitializer (slow_init_list) +| ParseDeclarationOrFunctionDefinition +| ParseDeclarationOrFunctionDefinition +| | ParseFunctionDefinition (slow_func) +| | | EvaluateAsRValue (<test.cc:8:21>) +| | | EvaluateForOverflow (<test.cc:8:21, col:25>) +| | | EvaluateForOverflow (<test.cc:8:30, col:32>) +| | | EvaluateAsRValue (<test.cc:9:14>) +| | | EvaluateForOverflow (<test.cc:9:9, col:14>) +| | | isPotentialConstantExpr (slow_namespace::slow_func) +| | | EvaluateAsBooleanCondition (<test.cc:8:21, col:25>) +| | | | EvaluateAsRValue (<test.cc:8:21, col:25>) +| | | EvaluateAsBooleanCondition (<test.cc:8:21, col:25>) +| | | | EvaluateAsRValue (<test.cc:8:21, col:25>) +| ParseDeclarationOrFunctionDefinition +| | ParseFunctionDefinition (slow_test) +| | | EvaluateAsInitializer (slow_value) +| | | EvaluateAsConstantExpr (<test.cc:17:33, col:59>) +| | | EvaluateAsConstantExpr (<test.cc:18:11, col:37>) +| ParseDeclarationOrFunctionDefinition +| | EvaluateAsConstantExpr (<test.cc:23:31, col:57>) +| | EvaluateAsRValue (<test.cc:22:14, line:23:58>) +| ParseDeclarationOrFunctionDefinition +| | EvaluateAsInitializer (slow_init_list) | PerformPendingInstantiations )"); @@ -213,8 +220,9 @@ struct { std::string TraceGraph = buildTraceGraph(Json); ASSERT_TRUE(TraceGraph == R"( Frontend -| isIntegerConstantExpr (<test.c:3:18>) -| EvaluateKnownConstIntCheckOverflow (<test.c:3:18>) +| ParseDeclarationOrFunctionDefinition +| | isIntegerConstantExpr (<test.c:3:18>) +| | EvaluateKnownConstIntCheckOverflow (<test.c:3:18>) | PerformPendingInstantiations )"); `````````` </details> https://github.com/llvm/llvm-project/pull/65268 _______________________________________________ cfe-commits mailing list cfe-commits@lists.llvm.org https://lists.llvm.org/cgi-bin/mailman/listinfo/cfe-commits
