Add dpu and g2d events
Bug: 171296908
Change-Id: I6625e37f491a897f6965a2c87536bb15e6045421
diff --git a/Android.bp b/Android.bp
index 9b79fcb..b381d2c 100644
--- a/Android.bp
+++ b/Android.bp
@@ -3716,6 +3716,7 @@
"protos/perfetto/trace/ftrace/clk.proto",
"protos/perfetto/trace/ftrace/compaction.proto",
"protos/perfetto/trace/ftrace/cpuhp.proto",
+ "protos/perfetto/trace/ftrace/dpu.proto",
"protos/perfetto/trace/ftrace/ext4.proto",
"protos/perfetto/trace/ftrace/f2fs.proto",
"protos/perfetto/trace/ftrace/fastrpc.proto",
@@ -3725,6 +3726,7 @@
"protos/perfetto/trace/ftrace/ftrace_event.proto",
"protos/perfetto/trace/ftrace/ftrace_event_bundle.proto",
"protos/perfetto/trace/ftrace/ftrace_stats.proto",
+ "protos/perfetto/trace/ftrace/g2d.proto",
"protos/perfetto/trace/ftrace/generic.proto",
"protos/perfetto/trace/ftrace/gpu_mem.proto",
"protos/perfetto/trace/ftrace/i2c.proto",
@@ -3763,6 +3765,7 @@
"external/perfetto/protos/perfetto/trace/ftrace/clk.gen.cc",
"external/perfetto/protos/perfetto/trace/ftrace/compaction.gen.cc",
"external/perfetto/protos/perfetto/trace/ftrace/cpuhp.gen.cc",
+ "external/perfetto/protos/perfetto/trace/ftrace/dpu.gen.cc",
"external/perfetto/protos/perfetto/trace/ftrace/ext4.gen.cc",
"external/perfetto/protos/perfetto/trace/ftrace/f2fs.gen.cc",
"external/perfetto/protos/perfetto/trace/ftrace/fastrpc.gen.cc",
@@ -3772,6 +3775,7 @@
"external/perfetto/protos/perfetto/trace/ftrace/ftrace_event.gen.cc",
"external/perfetto/protos/perfetto/trace/ftrace/ftrace_event_bundle.gen.cc",
"external/perfetto/protos/perfetto/trace/ftrace/ftrace_stats.gen.cc",
+ "external/perfetto/protos/perfetto/trace/ftrace/g2d.gen.cc",
"external/perfetto/protos/perfetto/trace/ftrace/generic.gen.cc",
"external/perfetto/protos/perfetto/trace/ftrace/gpu_mem.gen.cc",
"external/perfetto/protos/perfetto/trace/ftrace/i2c.gen.cc",
@@ -3810,6 +3814,7 @@
"protos/perfetto/trace/ftrace/clk.proto",
"protos/perfetto/trace/ftrace/compaction.proto",
"protos/perfetto/trace/ftrace/cpuhp.proto",
+ "protos/perfetto/trace/ftrace/dpu.proto",
"protos/perfetto/trace/ftrace/ext4.proto",
"protos/perfetto/trace/ftrace/f2fs.proto",
"protos/perfetto/trace/ftrace/fastrpc.proto",
@@ -3819,6 +3824,7 @@
"protos/perfetto/trace/ftrace/ftrace_event.proto",
"protos/perfetto/trace/ftrace/ftrace_event_bundle.proto",
"protos/perfetto/trace/ftrace/ftrace_stats.proto",
+ "protos/perfetto/trace/ftrace/g2d.proto",
"protos/perfetto/trace/ftrace/generic.proto",
"protos/perfetto/trace/ftrace/gpu_mem.proto",
"protos/perfetto/trace/ftrace/i2c.proto",
@@ -3857,6 +3863,7 @@
"external/perfetto/protos/perfetto/trace/ftrace/clk.gen.h",
"external/perfetto/protos/perfetto/trace/ftrace/compaction.gen.h",
"external/perfetto/protos/perfetto/trace/ftrace/cpuhp.gen.h",
+ "external/perfetto/protos/perfetto/trace/ftrace/dpu.gen.h",
"external/perfetto/protos/perfetto/trace/ftrace/ext4.gen.h",
"external/perfetto/protos/perfetto/trace/ftrace/f2fs.gen.h",
"external/perfetto/protos/perfetto/trace/ftrace/fastrpc.gen.h",
@@ -3866,6 +3873,7 @@
"external/perfetto/protos/perfetto/trace/ftrace/ftrace_event.gen.h",
"external/perfetto/protos/perfetto/trace/ftrace/ftrace_event_bundle.gen.h",
"external/perfetto/protos/perfetto/trace/ftrace/ftrace_stats.gen.h",
+ "external/perfetto/protos/perfetto/trace/ftrace/g2d.gen.h",
"external/perfetto/protos/perfetto/trace/ftrace/generic.gen.h",
"external/perfetto/protos/perfetto/trace/ftrace/gpu_mem.gen.h",
"external/perfetto/protos/perfetto/trace/ftrace/i2c.gen.h",
@@ -3908,6 +3916,7 @@
"protos/perfetto/trace/ftrace/clk.proto",
"protos/perfetto/trace/ftrace/compaction.proto",
"protos/perfetto/trace/ftrace/cpuhp.proto",
+ "protos/perfetto/trace/ftrace/dpu.proto",
"protos/perfetto/trace/ftrace/ext4.proto",
"protos/perfetto/trace/ftrace/f2fs.proto",
"protos/perfetto/trace/ftrace/fastrpc.proto",
@@ -3917,6 +3926,7 @@
"protos/perfetto/trace/ftrace/ftrace_event.proto",
"protos/perfetto/trace/ftrace/ftrace_event_bundle.proto",
"protos/perfetto/trace/ftrace/ftrace_stats.proto",
+ "protos/perfetto/trace/ftrace/g2d.proto",
"protos/perfetto/trace/ftrace/generic.proto",
"protos/perfetto/trace/ftrace/gpu_mem.proto",
"protos/perfetto/trace/ftrace/i2c.proto",
@@ -3954,6 +3964,7 @@
"external/perfetto/protos/perfetto/trace/ftrace/clk.pb.cc",
"external/perfetto/protos/perfetto/trace/ftrace/compaction.pb.cc",
"external/perfetto/protos/perfetto/trace/ftrace/cpuhp.pb.cc",
+ "external/perfetto/protos/perfetto/trace/ftrace/dpu.pb.cc",
"external/perfetto/protos/perfetto/trace/ftrace/ext4.pb.cc",
"external/perfetto/protos/perfetto/trace/ftrace/f2fs.pb.cc",
"external/perfetto/protos/perfetto/trace/ftrace/fastrpc.pb.cc",
@@ -3963,6 +3974,7 @@
"external/perfetto/protos/perfetto/trace/ftrace/ftrace_event.pb.cc",
"external/perfetto/protos/perfetto/trace/ftrace/ftrace_event_bundle.pb.cc",
"external/perfetto/protos/perfetto/trace/ftrace/ftrace_stats.pb.cc",
+ "external/perfetto/protos/perfetto/trace/ftrace/g2d.pb.cc",
"external/perfetto/protos/perfetto/trace/ftrace/generic.pb.cc",
"external/perfetto/protos/perfetto/trace/ftrace/gpu_mem.pb.cc",
"external/perfetto/protos/perfetto/trace/ftrace/i2c.pb.cc",
@@ -4001,6 +4013,7 @@
"protos/perfetto/trace/ftrace/clk.proto",
"protos/perfetto/trace/ftrace/compaction.proto",
"protos/perfetto/trace/ftrace/cpuhp.proto",
+ "protos/perfetto/trace/ftrace/dpu.proto",
"protos/perfetto/trace/ftrace/ext4.proto",
"protos/perfetto/trace/ftrace/f2fs.proto",
"protos/perfetto/trace/ftrace/fastrpc.proto",
@@ -4010,6 +4023,7 @@
"protos/perfetto/trace/ftrace/ftrace_event.proto",
"protos/perfetto/trace/ftrace/ftrace_event_bundle.proto",
"protos/perfetto/trace/ftrace/ftrace_stats.proto",
+ "protos/perfetto/trace/ftrace/g2d.proto",
"protos/perfetto/trace/ftrace/generic.proto",
"protos/perfetto/trace/ftrace/gpu_mem.proto",
"protos/perfetto/trace/ftrace/i2c.proto",
@@ -4047,6 +4061,7 @@
"external/perfetto/protos/perfetto/trace/ftrace/clk.pb.h",
"external/perfetto/protos/perfetto/trace/ftrace/compaction.pb.h",
"external/perfetto/protos/perfetto/trace/ftrace/cpuhp.pb.h",
+ "external/perfetto/protos/perfetto/trace/ftrace/dpu.pb.h",
"external/perfetto/protos/perfetto/trace/ftrace/ext4.pb.h",
"external/perfetto/protos/perfetto/trace/ftrace/f2fs.pb.h",
"external/perfetto/protos/perfetto/trace/ftrace/fastrpc.pb.h",
@@ -4056,6 +4071,7 @@
"external/perfetto/protos/perfetto/trace/ftrace/ftrace_event.pb.h",
"external/perfetto/protos/perfetto/trace/ftrace/ftrace_event_bundle.pb.h",
"external/perfetto/protos/perfetto/trace/ftrace/ftrace_stats.pb.h",
+ "external/perfetto/protos/perfetto/trace/ftrace/g2d.pb.h",
"external/perfetto/protos/perfetto/trace/ftrace/generic.pb.h",
"external/perfetto/protos/perfetto/trace/ftrace/gpu_mem.pb.h",
"external/perfetto/protos/perfetto/trace/ftrace/i2c.pb.h",
@@ -4098,6 +4114,7 @@
"protos/perfetto/trace/ftrace/clk.proto",
"protos/perfetto/trace/ftrace/compaction.proto",
"protos/perfetto/trace/ftrace/cpuhp.proto",
+ "protos/perfetto/trace/ftrace/dpu.proto",
"protos/perfetto/trace/ftrace/ext4.proto",
"protos/perfetto/trace/ftrace/f2fs.proto",
"protos/perfetto/trace/ftrace/fastrpc.proto",
@@ -4107,6 +4124,7 @@
"protos/perfetto/trace/ftrace/ftrace_event.proto",
"protos/perfetto/trace/ftrace/ftrace_event_bundle.proto",
"protos/perfetto/trace/ftrace/ftrace_stats.proto",
+ "protos/perfetto/trace/ftrace/g2d.proto",
"protos/perfetto/trace/ftrace/generic.proto",
"protos/perfetto/trace/ftrace/gpu_mem.proto",
"protos/perfetto/trace/ftrace/i2c.proto",
@@ -4145,6 +4163,7 @@
"external/perfetto/protos/perfetto/trace/ftrace/clk.pbzero.cc",
"external/perfetto/protos/perfetto/trace/ftrace/compaction.pbzero.cc",
"external/perfetto/protos/perfetto/trace/ftrace/cpuhp.pbzero.cc",
+ "external/perfetto/protos/perfetto/trace/ftrace/dpu.pbzero.cc",
"external/perfetto/protos/perfetto/trace/ftrace/ext4.pbzero.cc",
"external/perfetto/protos/perfetto/trace/ftrace/f2fs.pbzero.cc",
"external/perfetto/protos/perfetto/trace/ftrace/fastrpc.pbzero.cc",
@@ -4154,6 +4173,7 @@
"external/perfetto/protos/perfetto/trace/ftrace/ftrace_event.pbzero.cc",
"external/perfetto/protos/perfetto/trace/ftrace/ftrace_event_bundle.pbzero.cc",
"external/perfetto/protos/perfetto/trace/ftrace/ftrace_stats.pbzero.cc",
+ "external/perfetto/protos/perfetto/trace/ftrace/g2d.pbzero.cc",
"external/perfetto/protos/perfetto/trace/ftrace/generic.pbzero.cc",
"external/perfetto/protos/perfetto/trace/ftrace/gpu_mem.pbzero.cc",
"external/perfetto/protos/perfetto/trace/ftrace/i2c.pbzero.cc",
@@ -4192,6 +4212,7 @@
"protos/perfetto/trace/ftrace/clk.proto",
"protos/perfetto/trace/ftrace/compaction.proto",
"protos/perfetto/trace/ftrace/cpuhp.proto",
+ "protos/perfetto/trace/ftrace/dpu.proto",
"protos/perfetto/trace/ftrace/ext4.proto",
"protos/perfetto/trace/ftrace/f2fs.proto",
"protos/perfetto/trace/ftrace/fastrpc.proto",
@@ -4201,6 +4222,7 @@
"protos/perfetto/trace/ftrace/ftrace_event.proto",
"protos/perfetto/trace/ftrace/ftrace_event_bundle.proto",
"protos/perfetto/trace/ftrace/ftrace_stats.proto",
+ "protos/perfetto/trace/ftrace/g2d.proto",
"protos/perfetto/trace/ftrace/generic.proto",
"protos/perfetto/trace/ftrace/gpu_mem.proto",
"protos/perfetto/trace/ftrace/i2c.proto",
@@ -4239,6 +4261,7 @@
"external/perfetto/protos/perfetto/trace/ftrace/clk.pbzero.h",
"external/perfetto/protos/perfetto/trace/ftrace/compaction.pbzero.h",
"external/perfetto/protos/perfetto/trace/ftrace/cpuhp.pbzero.h",
+ "external/perfetto/protos/perfetto/trace/ftrace/dpu.pbzero.h",
"external/perfetto/protos/perfetto/trace/ftrace/ext4.pbzero.h",
"external/perfetto/protos/perfetto/trace/ftrace/f2fs.pbzero.h",
"external/perfetto/protos/perfetto/trace/ftrace/fastrpc.pbzero.h",
@@ -4248,6 +4271,7 @@
"external/perfetto/protos/perfetto/trace/ftrace/ftrace_event.pbzero.h",
"external/perfetto/protos/perfetto/trace/ftrace/ftrace_event_bundle.pbzero.h",
"external/perfetto/protos/perfetto/trace/ftrace/ftrace_stats.pbzero.h",
+ "external/perfetto/protos/perfetto/trace/ftrace/g2d.pbzero.h",
"external/perfetto/protos/perfetto/trace/ftrace/generic.pbzero.h",
"external/perfetto/protos/perfetto/trace/ftrace/gpu_mem.pbzero.h",
"external/perfetto/protos/perfetto/trace/ftrace/i2c.pbzero.h",
diff --git a/BUILD b/BUILD
index f3ac09f..4b44849 100644
--- a/BUILD
+++ b/BUILD
@@ -2317,6 +2317,7 @@
"protos/perfetto/trace/ftrace/clk.proto",
"protos/perfetto/trace/ftrace/compaction.proto",
"protos/perfetto/trace/ftrace/cpuhp.proto",
+ "protos/perfetto/trace/ftrace/dpu.proto",
"protos/perfetto/trace/ftrace/ext4.proto",
"protos/perfetto/trace/ftrace/f2fs.proto",
"protos/perfetto/trace/ftrace/fastrpc.proto",
@@ -2326,6 +2327,7 @@
"protos/perfetto/trace/ftrace/ftrace_event.proto",
"protos/perfetto/trace/ftrace/ftrace_event_bundle.proto",
"protos/perfetto/trace/ftrace/ftrace_stats.proto",
+ "protos/perfetto/trace/ftrace/g2d.proto",
"protos/perfetto/trace/ftrace/generic.proto",
"protos/perfetto/trace/ftrace/gpu_mem.proto",
"protos/perfetto/trace/ftrace/i2c.proto",
diff --git a/protos/perfetto/trace/ftrace/all_protos.gni b/protos/perfetto/trace/ftrace/all_protos.gni
index 5745ab2..6ae204f 100644
--- a/protos/perfetto/trace/ftrace/all_protos.gni
+++ b/protos/perfetto/trace/ftrace/all_protos.gni
@@ -26,12 +26,14 @@
"clk.proto",
"compaction.proto",
"cpuhp.proto",
+ "dpu.proto",
"ext4.proto",
"f2fs.proto",
"fastrpc.proto",
"fence.proto",
"filemap.proto",
"ftrace.proto",
+ "g2d.proto",
"gpu_mem.proto",
"i2c.proto",
"ion.proto",
diff --git a/protos/perfetto/trace/ftrace/dpu.proto b/protos/perfetto/trace/ftrace/dpu.proto
new file mode 100644
index 0000000..31eefc3
--- /dev/null
+++ b/protos/perfetto/trace/ftrace/dpu.proto
@@ -0,0 +1,15 @@
+// Autogenerated by:
+// ../../tools/ftrace_proto_gen/ftrace_proto_gen.cc
+// Do not edit.
+
+syntax = "proto2";
+package perfetto.protos;
+
+message DpuTracingMarkWriteFtraceEvent {
+ optional int32 pid = 1;
+ optional string trace_name = 2;
+ optional uint32 trace_begin = 3;
+ optional string name = 4;
+ optional uint32 type = 5;
+ optional int32 value = 6;
+}
diff --git a/protos/perfetto/trace/ftrace/ftrace_event.proto b/protos/perfetto/trace/ftrace/ftrace_event.proto
index 2895afd..0a49ae2 100644
--- a/protos/perfetto/trace/ftrace/ftrace_event.proto
+++ b/protos/perfetto/trace/ftrace/ftrace_event.proto
@@ -26,12 +26,14 @@
import "protos/perfetto/trace/ftrace/clk.proto";
import "protos/perfetto/trace/ftrace/compaction.proto";
import "protos/perfetto/trace/ftrace/cpuhp.proto";
+import "protos/perfetto/trace/ftrace/dpu.proto";
import "protos/perfetto/trace/ftrace/ext4.proto";
import "protos/perfetto/trace/ftrace/f2fs.proto";
import "protos/perfetto/trace/ftrace/fastrpc.proto";
import "protos/perfetto/trace/ftrace/fence.proto";
import "protos/perfetto/trace/ftrace/filemap.proto";
import "protos/perfetto/trace/ftrace/ftrace.proto";
+import "protos/perfetto/trace/ftrace/g2d.proto";
import "protos/perfetto/trace/ftrace/gpu_mem.proto";
import "protos/perfetto/trace/ftrace/i2c.proto";
import "protos/perfetto/trace/ftrace/ion.proto";
@@ -432,5 +434,7 @@
CpuhpEnterFtraceEvent cpuhp_enter = 345;
CpuhpLatencyFtraceEvent cpuhp_latency = 346;
FastrpcDmaStatFtraceEvent fastrpc_dma_stat = 347;
+ DpuTracingMarkWriteFtraceEvent dpu_tracing_mark_write = 348;
+ G2dTracingMarkWriteFtraceEvent g2d_tracing_mark_write = 349;
}
}
diff --git a/protos/perfetto/trace/ftrace/g2d.proto b/protos/perfetto/trace/ftrace/g2d.proto
new file mode 100644
index 0000000..ac5b0cb
--- /dev/null
+++ b/protos/perfetto/trace/ftrace/g2d.proto
@@ -0,0 +1,15 @@
+// Autogenerated by:
+// ../../tools/ftrace_proto_gen/ftrace_proto_gen.cc
+// Do not edit.
+
+syntax = "proto2";
+package perfetto.protos;
+
+message G2dTracingMarkWriteFtraceEvent {
+ optional int32 pid = 1;
+ optional string trace_name = 2;
+ optional uint32 trace_begin = 3;
+ optional string name = 4;
+ optional uint32 type = 5;
+ optional int32 value = 6;
+}
diff --git a/protos/perfetto/trace/perfetto_trace.proto b/protos/perfetto/trace/perfetto_trace.proto
index 26c8bf5..1ea8b67 100644
--- a/protos/perfetto/trace/perfetto_trace.proto
+++ b/protos/perfetto/trace/perfetto_trace.proto
@@ -2691,6 +2691,19 @@
// End of protos/perfetto/trace/ftrace/cpuhp.proto
+// Begin of protos/perfetto/trace/ftrace/dpu.proto
+
+message DpuTracingMarkWriteFtraceEvent {
+ optional int32 pid = 1;
+ optional string trace_name = 2;
+ optional uint32 trace_begin = 3;
+ optional string name = 4;
+ optional uint32 type = 5;
+ optional int32 value = 6;
+}
+
+// End of protos/perfetto/trace/ftrace/dpu.proto
+
// Begin of protos/perfetto/trace/ftrace/ext4.proto
message Ext4DaWriteBeginFtraceEvent {
@@ -3664,6 +3677,19 @@
// End of protos/perfetto/trace/ftrace/ftrace.proto
+// Begin of protos/perfetto/trace/ftrace/g2d.proto
+
+message G2dTracingMarkWriteFtraceEvent {
+ optional int32 pid = 1;
+ optional string trace_name = 2;
+ optional uint32 trace_begin = 3;
+ optional string name = 4;
+ optional uint32 type = 5;
+ optional int32 value = 6;
+}
+
+// End of protos/perfetto/trace/ftrace/g2d.proto
+
// Begin of protos/perfetto/trace/ftrace/generic.proto
// This generic proto is used to output events in the trace
@@ -4912,6 +4938,8 @@
CpuhpEnterFtraceEvent cpuhp_enter = 345;
CpuhpLatencyFtraceEvent cpuhp_latency = 346;
FastrpcDmaStatFtraceEvent fastrpc_dma_stat = 347;
+ DpuTracingMarkWriteFtraceEvent dpu_tracing_mark_write = 348;
+ G2dTracingMarkWriteFtraceEvent g2d_tracing_mark_write = 349;
}
}
diff --git a/src/trace_processor/importers/ftrace/ftrace_descriptors.cc b/src/trace_processor/importers/ftrace/ftrace_descriptors.cc
index c39ce59..413f90e 100644
--- a/src/trace_processor/importers/ftrace/ftrace_descriptors.cc
+++ b/src/trace_processor/importers/ftrace/ftrace_descriptors.cc
@@ -24,7 +24,7 @@
namespace trace_processor {
namespace {
-std::array<MessageDescriptor, 347> descriptors{{
+std::array<MessageDescriptor, 350> descriptors{{
{nullptr, 0, {}},
{nullptr, 0, {}},
{nullptr, 0, {}},
@@ -3694,6 +3694,42 @@
{"time", ProtoSchemaType::kUint64},
},
},
+ {
+ "fastrpc_dma_stat",
+ 3,
+ {
+ {},
+ {"cid", ProtoSchemaType::kInt32},
+ {"len", ProtoSchemaType::kInt64},
+ {"total_allocated", ProtoSchemaType::kUint64},
+ },
+ },
+ {
+ "dpu_tracing_mark_write",
+ 6,
+ {
+ {},
+ {"pid", ProtoSchemaType::kInt32},
+ {"trace_name", ProtoSchemaType::kString},
+ {"trace_begin", ProtoSchemaType::kUint32},
+ {"name", ProtoSchemaType::kString},
+ {"type", ProtoSchemaType::kUint32},
+ {"value", ProtoSchemaType::kInt32},
+ },
+ },
+ {
+ "g2d_tracing_mark_write",
+ 6,
+ {
+ {},
+ {"pid", ProtoSchemaType::kInt32},
+ {"trace_name", ProtoSchemaType::kString},
+ {"trace_begin", ProtoSchemaType::kUint32},
+ {"name", ProtoSchemaType::kString},
+ {"type", ProtoSchemaType::kUint32},
+ {"value", ProtoSchemaType::kInt32},
+ },
+ },
}};
} // namespace
diff --git a/src/traced/probes/ftrace/event_info.cc b/src/traced/probes/ftrace/event_info.cc
index d901fa0..b49ac87 100644
--- a/src/traced/probes/ftrace/event_info.cc
+++ b/src/traced/probes/ftrace/event_info.cc
@@ -1085,6 +1085,31 @@
kUnsetFtraceId,
346,
kUnsetSize},
+ {"tracing_mark_write",
+ "dpu",
+ {
+ {kUnsetOffset, kUnsetSize, FtraceFieldType::kInvalidFtraceFieldType,
+ "pid", 1, ProtoSchemaType::kInt32,
+ TranslationStrategy::kInvalidTranslationStrategy},
+ {kUnsetOffset, kUnsetSize, FtraceFieldType::kInvalidFtraceFieldType,
+ "trace_name", 2, ProtoSchemaType::kString,
+ TranslationStrategy::kInvalidTranslationStrategy},
+ {kUnsetOffset, kUnsetSize, FtraceFieldType::kInvalidFtraceFieldType,
+ "trace_begin", 3, ProtoSchemaType::kUint32,
+ TranslationStrategy::kInvalidTranslationStrategy},
+ {kUnsetOffset, kUnsetSize, FtraceFieldType::kInvalidFtraceFieldType,
+ "name", 4, ProtoSchemaType::kString,
+ TranslationStrategy::kInvalidTranslationStrategy},
+ {kUnsetOffset, kUnsetSize, FtraceFieldType::kInvalidFtraceFieldType,
+ "type", 5, ProtoSchemaType::kUint32,
+ TranslationStrategy::kInvalidTranslationStrategy},
+ {kUnsetOffset, kUnsetSize, FtraceFieldType::kInvalidFtraceFieldType,
+ "value", 6, ProtoSchemaType::kInt32,
+ TranslationStrategy::kInvalidTranslationStrategy},
+ },
+ kUnsetFtraceId,
+ 348,
+ kUnsetSize},
{"ext4_da_write_begin",
"ext4",
{
@@ -4045,6 +4070,31 @@
kUnsetFtraceId,
3,
kUnsetSize},
+ {"tracing_mark_write",
+ "g2d",
+ {
+ {kUnsetOffset, kUnsetSize, FtraceFieldType::kInvalidFtraceFieldType,
+ "pid", 1, ProtoSchemaType::kInt32,
+ TranslationStrategy::kInvalidTranslationStrategy},
+ {kUnsetOffset, kUnsetSize, FtraceFieldType::kInvalidFtraceFieldType,
+ "trace_name", 2, ProtoSchemaType::kString,
+ TranslationStrategy::kInvalidTranslationStrategy},
+ {kUnsetOffset, kUnsetSize, FtraceFieldType::kInvalidFtraceFieldType,
+ "trace_begin", 3, ProtoSchemaType::kUint32,
+ TranslationStrategy::kInvalidTranslationStrategy},
+ {kUnsetOffset, kUnsetSize, FtraceFieldType::kInvalidFtraceFieldType,
+ "name", 4, ProtoSchemaType::kString,
+ TranslationStrategy::kInvalidTranslationStrategy},
+ {kUnsetOffset, kUnsetSize, FtraceFieldType::kInvalidFtraceFieldType,
+ "type", 5, ProtoSchemaType::kUint32,
+ TranslationStrategy::kInvalidTranslationStrategy},
+ {kUnsetOffset, kUnsetSize, FtraceFieldType::kInvalidFtraceFieldType,
+ "value", 6, ProtoSchemaType::kInt32,
+ TranslationStrategy::kInvalidTranslationStrategy},
+ },
+ kUnsetFtraceId,
+ 349,
+ kUnsetSize},
{"gpu_mem_total",
"gpu_mem",
{
diff --git a/src/traced/probes/ftrace/test/data/synthetic/available_events b/src/traced/probes/ftrace/test/data/synthetic/available_events
index 01dbfeb..1267a9f 100644
--- a/src/traced/probes/ftrace/test/data/synthetic/available_events
+++ b/src/traced/probes/ftrace/test/data/synthetic/available_events
@@ -8,3 +8,5 @@
clk:clk_set_rate
sde:tracing_mark_write
fastrpc:fastrpc_dma_stat
+dpu:tracing_mark_write
+g2d:tracing_mark_write
diff --git a/src/traced/probes/ftrace/test/data/synthetic/events/dpu/tracing_mark_write/format b/src/traced/probes/ftrace/test/data/synthetic/events/dpu/tracing_mark_write/format
new file mode 100644
index 0000000..51e0e8b
--- /dev/null
+++ b/src/traced/probes/ftrace/test/data/synthetic/events/dpu/tracing_mark_write/format
@@ -0,0 +1,14 @@
+name: tracing_mark_write
+ID: 1280
+format:
+ field:unsigned short common_type; offset:0; size:2; signed:0;
+ field:unsigned char common_flags; offset:2; size:1; signed:0;
+ field:unsigned char common_preempt_count; offset:3; size:1; signed:0;
+ field:int common_pid; offset:4; size:4; signed:1;
+
+ field:char type; offset:8; size:1; signed:0;
+ field:int pid; offset:12; size:4; signed:1;
+ field:__data_loc char[] name; offset:16; size:4; signed:0;
+ field:int value; offset:20; size:4; signed:1;
+
+print fmt: "%c|%d|%s|%d", REC->type, REC->pid, __get_str(name), REC->value
diff --git a/src/traced/probes/ftrace/test/data/synthetic/events/g2d/tracing_mark_write/format b/src/traced/probes/ftrace/test/data/synthetic/events/g2d/tracing_mark_write/format
new file mode 100644
index 0000000..f17c68b
--- /dev/null
+++ b/src/traced/probes/ftrace/test/data/synthetic/events/g2d/tracing_mark_write/format
@@ -0,0 +1,14 @@
+name: tracing_mark_write
+ID: 1202
+format:
+ field:unsigned short common_type; offset:0; size:2; signed:0;
+ field:unsigned char common_flags; offset:2; size:1; signed:0;
+ field:unsigned char common_preempt_count; offset:3; size:1; signed:0;
+ field:int common_pid; offset:4; size:4; signed:1;
+
+ field:char type; offset:8; size:1; signed:0;
+ field:int pid; offset:12; size:4; signed:1;
+ field:__data_loc char[] name; offset:16; size:4; signed:0;
+ field:int value; offset:20; size:4; signed:1;
+
+print fmt: "%c|%d|%s|%d", REC->type, REC->pid, __get_str(name), REC->value
diff --git a/tools/ftrace_proto_gen/event_list b/tools/ftrace_proto_gen/event_list
index 82b6d1c..7c198f8 100644
--- a/tools/ftrace_proto_gen/event_list
+++ b/tools/ftrace_proto_gen/event_list
@@ -342,3 +342,5 @@
cpuhp/cpuhp_enter
cpuhp/cpuhp_latency
fastrpc/fastrpc_dma_stat
+dpu/tracing_mark_write
+g2d/tracing_mark_write
diff --git a/tools/ftrace_proto_gen/ftrace_proto_gen.cc b/tools/ftrace_proto_gen/ftrace_proto_gen.cc
index 5320199..318edbc 100644
--- a/tools/ftrace_proto_gen/ftrace_proto_gen.cc
+++ b/tools/ftrace_proto_gen/ftrace_proto_gen.cc
@@ -59,8 +59,10 @@
std::string EventNameToProtoFieldName(const std::string& group,
const std::string& name) {
std::string event_name = (name == "0") ? "zero" : name;
- if (group == "sde") {
- event_name = "sde_" + event_name;
+ // These groups have events where the name alone conflicts with an existing
+ // proto:
+ if (group == "sde" || group == "g2d" || group == "dpu") {
+ event_name = group + "_" + event_name;
}
return event_name;
}