Skip to content

Commit 20d8cb8

Browse files
estaats-googleestaats-google
authored
Add fwtp_perfetto_counter ftrace event (#3653)
This ftrace event reports counter events in Pixel firmware. This ftrace event is only on Pixel kernels and is not upstream. Bug: 386832373 Test: Verified FWTP counter tracepoints may be collected with Perfetto and displayed with traceconv.
1 parent eca6f6f commit 20d8cb8

File tree

11 files changed

+1238
-1139
lines changed

11 files changed

+1238
-1139
lines changed

‎Android.bp‎

Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -3217,6 +3217,7 @@ filegroup {
32173217
"protos/perfetto/trace/ftrace/ftrace_event.proto",
32183218
"protos/perfetto/trace/ftrace/ftrace_event_bundle.proto",
32193219
"protos/perfetto/trace/ftrace/ftrace_stats.proto",
3220+
"protos/perfetto/trace/ftrace/fwtp_ftrace.proto",
32203221
"protos/perfetto/trace/ftrace/g2d.proto",
32213222
"protos/perfetto/trace/ftrace/generic.proto",
32223223
"protos/perfetto/trace/ftrace/google_icc_trace.proto",
@@ -7839,6 +7840,7 @@ genrule {
78397840
"protos/perfetto/trace/ftrace/ftrace_event.proto",
78407841
"protos/perfetto/trace/ftrace/ftrace_event_bundle.proto",
78417842
"protos/perfetto/trace/ftrace/ftrace_stats.proto",
7843+
"protos/perfetto/trace/ftrace/fwtp_ftrace.proto",
78427844
"protos/perfetto/trace/ftrace/g2d.proto",
78437845
"protos/perfetto/trace/ftrace/generic.proto",
78447846
"protos/perfetto/trace/ftrace/google_icc_trace.proto",
@@ -8275,6 +8277,7 @@ filegroup {
82758277
"protos/perfetto/trace/ftrace/ftrace_event.proto",
82768278
"protos/perfetto/trace/ftrace/ftrace_event_bundle.proto",
82778279
"protos/perfetto/trace/ftrace/ftrace_stats.proto",
8280+
"protos/perfetto/trace/ftrace/fwtp_ftrace.proto",
82788281
"protos/perfetto/trace/ftrace/g2d.proto",
82798282
"protos/perfetto/trace/ftrace/generic.proto",
82808283
"protos/perfetto/trace/ftrace/google_icc_trace.proto",
@@ -8372,6 +8375,7 @@ genrule {
83728375
"external/perfetto/protos/perfetto/trace/ftrace/ftrace_event.gen.cc",
83738376
"external/perfetto/protos/perfetto/trace/ftrace/ftrace_event_bundle.gen.cc",
83748377
"external/perfetto/protos/perfetto/trace/ftrace/ftrace_stats.gen.cc",
8378+
"external/perfetto/protos/perfetto/trace/ftrace/fwtp_ftrace.gen.cc",
83758379
"external/perfetto/protos/perfetto/trace/ftrace/g2d.gen.cc",
83768380
"external/perfetto/protos/perfetto/trace/ftrace/generic.gen.cc",
83778381
"external/perfetto/protos/perfetto/trace/ftrace/google_icc_trace.gen.cc",
@@ -8469,6 +8473,7 @@ genrule {
84698473
"external/perfetto/protos/perfetto/trace/ftrace/ftrace_event.gen.h",
84708474
"external/perfetto/protos/perfetto/trace/ftrace/ftrace_event_bundle.gen.h",
84718475
"external/perfetto/protos/perfetto/trace/ftrace/ftrace_stats.gen.h",
8476+
"external/perfetto/protos/perfetto/trace/ftrace/fwtp_ftrace.gen.h",
84728477
"external/perfetto/protos/perfetto/trace/ftrace/g2d.gen.h",
84738478
"external/perfetto/protos/perfetto/trace/ftrace/generic.gen.h",
84748479
"external/perfetto/protos/perfetto/trace/ftrace/google_icc_trace.gen.h",
@@ -8562,6 +8567,7 @@ filegroup {
85628567
"protos/perfetto/trace/ftrace/ftrace_event.proto",
85638568
"protos/perfetto/trace/ftrace/ftrace_event_bundle.proto",
85648569
"protos/perfetto/trace/ftrace/ftrace_stats.proto",
8570+
"protos/perfetto/trace/ftrace/fwtp_ftrace.proto",
85658571
"protos/perfetto/trace/ftrace/g2d.proto",
85668572
"protos/perfetto/trace/ftrace/generic.proto",
85678573
"protos/perfetto/trace/ftrace/google_icc_trace.proto",
@@ -8658,6 +8664,7 @@ genrule {
86588664
"external/perfetto/protos/perfetto/trace/ftrace/ftrace_event.pb.cc",
86598665
"external/perfetto/protos/perfetto/trace/ftrace/ftrace_event_bundle.pb.cc",
86608666
"external/perfetto/protos/perfetto/trace/ftrace/ftrace_stats.pb.cc",
8667+
"external/perfetto/protos/perfetto/trace/ftrace/fwtp_ftrace.pb.cc",
86618668
"external/perfetto/protos/perfetto/trace/ftrace/g2d.pb.cc",
86628669
"external/perfetto/protos/perfetto/trace/ftrace/generic.pb.cc",
86638670
"external/perfetto/protos/perfetto/trace/ftrace/google_icc_trace.pb.cc",
@@ -8754,6 +8761,7 @@ genrule {
87548761
"external/perfetto/protos/perfetto/trace/ftrace/ftrace_event.pb.h",
87558762
"external/perfetto/protos/perfetto/trace/ftrace/ftrace_event_bundle.pb.h",
87568763
"external/perfetto/protos/perfetto/trace/ftrace/ftrace_stats.pb.h",
8764+
"external/perfetto/protos/perfetto/trace/ftrace/fwtp_ftrace.pb.h",
87578765
"external/perfetto/protos/perfetto/trace/ftrace/g2d.pb.h",
87588766
"external/perfetto/protos/perfetto/trace/ftrace/generic.pb.h",
87598767
"external/perfetto/protos/perfetto/trace/ftrace/google_icc_trace.pb.h",
@@ -8847,6 +8855,7 @@ filegroup {
88478855
"protos/perfetto/trace/ftrace/ftrace_event.proto",
88488856
"protos/perfetto/trace/ftrace/ftrace_event_bundle.proto",
88498857
"protos/perfetto/trace/ftrace/ftrace_stats.proto",
8858+
"protos/perfetto/trace/ftrace/fwtp_ftrace.proto",
88508859
"protos/perfetto/trace/ftrace/g2d.proto",
88518860
"protos/perfetto/trace/ftrace/generic.proto",
88528861
"protos/perfetto/trace/ftrace/google_icc_trace.proto",
@@ -8944,6 +8953,7 @@ genrule {
89448953
"external/perfetto/protos/perfetto/trace/ftrace/ftrace_event.pbzero.cc",
89458954
"external/perfetto/protos/perfetto/trace/ftrace/ftrace_event_bundle.pbzero.cc",
89468955
"external/perfetto/protos/perfetto/trace/ftrace/ftrace_stats.pbzero.cc",
8956+
"external/perfetto/protos/perfetto/trace/ftrace/fwtp_ftrace.pbzero.cc",
89478957
"external/perfetto/protos/perfetto/trace/ftrace/g2d.pbzero.cc",
89488958
"external/perfetto/protos/perfetto/trace/ftrace/generic.pbzero.cc",
89498959
"external/perfetto/protos/perfetto/trace/ftrace/google_icc_trace.pbzero.cc",
@@ -9041,6 +9051,7 @@ genrule {
90419051
"external/perfetto/protos/perfetto/trace/ftrace/ftrace_event.pbzero.h",
90429052
"external/perfetto/protos/perfetto/trace/ftrace/ftrace_event_bundle.pbzero.h",
90439053
"external/perfetto/protos/perfetto/trace/ftrace/ftrace_stats.pbzero.h",
9054+
"external/perfetto/protos/perfetto/trace/ftrace/fwtp_ftrace.pbzero.h",
90449055
"external/perfetto/protos/perfetto/trace/ftrace/g2d.pbzero.h",
90459056
"external/perfetto/protos/perfetto/trace/ftrace/generic.pbzero.h",
90469057
"external/perfetto/protos/perfetto/trace/ftrace/google_icc_trace.pbzero.h",
@@ -17016,6 +17027,7 @@ java_library {
1701617027
"protos/perfetto/trace/ftrace/ftrace_event.proto",
1701717028
"protos/perfetto/trace/ftrace/ftrace_event_bundle.proto",
1701817029
"protos/perfetto/trace/ftrace/ftrace_stats.proto",
17030+
"protos/perfetto/trace/ftrace/fwtp_ftrace.proto",
1701917031
"protos/perfetto/trace/ftrace/g2d.proto",
1702017032
"protos/perfetto/trace/ftrace/generic.proto",
1702117033
"protos/perfetto/trace/ftrace/google_icc_trace.proto",

‎BUILD‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -6577,6 +6577,7 @@ perfetto_proto_library(
65776577
"protos/perfetto/trace/ftrace/ftrace_event.proto",
65786578
"protos/perfetto/trace/ftrace/ftrace_event_bundle.proto",
65796579
"protos/perfetto/trace/ftrace/ftrace_stats.proto",
6580+
"protos/perfetto/trace/ftrace/fwtp_ftrace.proto",
65806581
"protos/perfetto/trace/ftrace/g2d.proto",
65816582
"protos/perfetto/trace/ftrace/generic.proto",
65826583
"protos/perfetto/trace/ftrace/google_icc_trace.proto",

‎protos/perfetto/trace/ftrace/all_protos.gni‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -45,6 +45,7 @@ ftrace_proto_names = [
4545
"filemap.proto",
4646
"fs.proto",
4747
"ftrace.proto",
48+
"fwtp_ftrace.proto",
4849
"g2d.proto",
4950
"google_icc_trace.proto",
5051
"google_irm_trace.proto",

‎protos/perfetto/trace/ftrace/ftrace_event.proto‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -45,6 +45,7 @@ import "protos/perfetto/trace/ftrace/fence.proto";
4545
import "protos/perfetto/trace/ftrace/filemap.proto";
4646
import "protos/perfetto/trace/ftrace/fs.proto";
4747
import "protos/perfetto/trace/ftrace/ftrace.proto";
48+
import "protos/perfetto/trace/ftrace/fwtp_ftrace.proto";
4849
import "protos/perfetto/trace/ftrace/g2d.proto";
4950
import "protos/perfetto/trace/ftrace/google_icc_trace.proto";
5051
import "protos/perfetto/trace/ftrace/google_irm_trace.proto";
@@ -745,5 +746,6 @@ message FtraceEvent {
745746
DrmSchedJobQueueFtraceEvent drm_sched_job_queue = 593;
746747
DrmSchedJobRunFtraceEvent drm_sched_job_run = 594;
747748
DrmSchedJobUnschedulableFtraceEvent drm_sched_job_unschedulable = 595;
749+
FwtpPerfettoCounterFtraceEvent fwtp_perfetto_counter = 596;
748750
}
749751
}

‎protos/perfetto/trace/ftrace/fwtp_ftrace.proto‎

Lines changed: 14 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,14 @@
1+
// Autogenerated by:
2+
// ../../src/tools/ftrace_proto_gen/ftrace_proto_gen.cc
3+
// Do not edit.
4+
5+
syntax = "proto2";
6+
package perfetto.protos;
7+
8+
message FwtpPerfettoCounterFtraceEvent {
9+
optional uint64 timestamp = 1;
10+
optional uint32 track_id = 2;
11+
optional string category = 3;
12+
optional string name = 4;
13+
optional uint32 value = 5;
14+
}

‎protos/perfetto/trace/perfetto_trace.proto‎

Lines changed: 13 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -9990,6 +9990,18 @@ message FuncgraphExitFtraceEvent {
99909990

99919991
// End of protos/perfetto/trace/ftrace/ftrace.proto
99929992

9993+
// Begin of protos/perfetto/trace/ftrace/fwtp_ftrace.proto
9994+
9995+
message FwtpPerfettoCounterFtraceEvent {
9996+
optional uint64 timestamp = 1;
9997+
optional uint32 track_id = 2;
9998+
optional string category = 3;
9999+
optional string name = 4;
10000+
optional uint32 value = 5;
10001+
}
10002+
10003+
// End of protos/perfetto/trace/ftrace/fwtp_ftrace.proto
10004+
999310005
// Begin of protos/perfetto/trace/ftrace/g2d.proto
999410006

999510007
message G2dTracingMarkWriteFtraceEvent {
@@ -12807,6 +12819,7 @@ message FtraceEvent {
1280712819
DrmSchedJobQueueFtraceEvent drm_sched_job_queue = 593;
1280812820
DrmSchedJobRunFtraceEvent drm_sched_job_run = 594;
1280912821
DrmSchedJobUnschedulableFtraceEvent drm_sched_job_unschedulable = 595;
12822+
FwtpPerfettoCounterFtraceEvent fwtp_perfetto_counter = 596;
1281012823
}
1281112824
}
1281212825

‎python/perfetto/protos/perfetto/trace/perfetto_trace_pb2.py‎

Lines changed: 1139 additions & 1137 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

0 commit comments

Comments
 (0)