[tools/perf] Report radio power in power rails metric

Bug: b/161112814
Change-Id: I45ab822baa0ba5c8f9f52129ece60e337383624e
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/2328968Reviewed-by: Eric Seckler <eseckler@chromium.org>
Commit-Queue: Mikhail Khokhlov <khokhlov@google.com>
Cr-Commit-Position: refs/heads/master@{#793143}

tools/perf/core/tbmv3/metrics/power_rails_metric.proto

@@ -20,8 +20,10 @@ message PowerRailsMetric {
   optional float story_cpu_little_core_cluster_j = 3
       [(unit) = "J_smallerIsBetter"];
   optional float story_soc_j = 4 [(unit) = "J_smallerIsBetter"];
-  optional float story_display_j = 5 [(unit) = "J_smallerIsBetter"];
-  optional float story_duration_ms = 6 [(unit) = "ms"];
+  optional float story_cellular_j = 5 [(unit) = "J_smallerIsBetter"];
+  optional float story_wifi_j = 6 [(unit) = "J_smallerIsBetter"];
+  optional float story_display_j = 7 [(unit) = "J_smallerIsBetter"];
+  optional float story_duration_ms = 8 [(unit) = "ms"];
 
   // interaction_* values - power consumption over the combined duration
   // of Interaction.* events, e.g. Interaction.Gesture_ScrollAction.
@@ -31,8 +33,10 @@ message PowerRailsMetric {
   optional float interaction_cpu_little_core_cluster_j = 13
       [(unit) = "J_smallerIsBetter"];
   optional float interaction_soc_j = 14 [(unit) = "J_smallerIsBetter"];
-  optional float interaction_display_j = 15 [(unit) = "J_smallerIsBetter"];
-  optional float interaction_duration_ms = 16 [(unit) = "ms"];
+  optional float interaction_cellular_j = 15 [(unit) = "J_smallerIsBetter"];
+  optional float interaction_wifi_j = 16 [(unit) = "J_smallerIsBetter"];
+  optional float interaction_display_j = 17 [(unit) = "J_smallerIsBetter"];
+  optional float interaction_duration_ms = 18 [(unit) = "ms"];
 }
 
 extend TraceMetrics {

tools/perf/core/tbmv3/metrics/power_rails_metric.sql

@@ -98,6 +98,10 @@ SELECT PowerRailsMetric(
       (SELECT drain_j FROM story_drain WHERE subsystem = 'cpu_little'),
   'story_soc_j',
       (SELECT drain_j FROM story_drain WHERE subsystem = 'soc'),
+  'story_cellular_j',
+      (SELECT drain_j FROM story_drain WHERE subsystem = 'cellular'),
+  'story_wifi_j',
+      (SELECT drain_j FROM story_drain WHERE subsystem = 'wifi'),
   'story_display_j',
       (SELECT drain_j FROM story_drain WHERE subsystem = 'display'),
   'story_duration_ms',
@@ -110,6 +114,10 @@ SELECT PowerRailsMetric(
       (SELECT drain_j FROM interaction_drain WHERE subsystem = 'cpu_little'),
   'interaction_soc_j',
       (SELECT drain_j FROM interaction_drain WHERE subsystem = 'soc'),
+  'interaction_cellular_j',
+      (SELECT drain_j FROM interaction_drain WHERE subsystem = 'cellular'),
+  'interaction_wifi_j',
+      (SELECT drain_j FROM interaction_drain WHERE subsystem = 'wifi'),
   'interaction_display_j',
       (SELECT drain_j FROM interaction_drain WHERE subsystem = 'display'),
   'interaction_duration_ms',