[tools/perf] Add cpu+system summary metric to power_rails_metric

This metric will be useful to track CPU power optimization work.

Bug: b/166816037
Change-Id: I7bbc7018345019db9f307b47ab7a8efbb61bb0b7
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/2388200Reviewed-by: Sami Kyöstilä <skyostil@chromium.org>
Commit-Queue: Mikhail Khokhlov <khokhlov@google.com>
Cr-Commit-Position: refs/heads/master@{#803577}

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

@@ -24,6 +24,7 @@ message PowerRailsMetric {
   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"];
+  optional float story_cpu_and_system_j = 9 [(unit) = "J_smallerIsBetter"];
 
   // interaction_* values - power consumption over the combined duration
   // of Interaction.* events, e.g. Interaction.Gesture_ScrollAction.
@@ -37,6 +38,8 @@ message PowerRailsMetric {
   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"];
+  optional float interaction_cpu_and_system_j = 19
+      [(unit) = "J_smallerIsBetter"];
 }
 
 extend TraceMetrics {

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

@@ -104,6 +104,9 @@ SELECT PowerRailsMetric(
       (SELECT drain_j FROM story_drain WHERE subsystem = 'wifi'),
   'story_display_j',
       (SELECT drain_j FROM story_drain WHERE subsystem = 'display'),
+  'story_cpu_and_system_j',
+      (SELECT sum(drain_j) FROM story_drain WHERE
+          subsystem IN ('cpu_big', 'cpu_little', 'soc')),
   'story_duration_ms',
       (SELECT dur_ms FROM story_drain WHERE subsystem = 'display'),
   'interaction_total_j',
@@ -120,6 +123,9 @@ SELECT PowerRailsMetric(
       (SELECT drain_j FROM interaction_drain WHERE subsystem = 'wifi'),
   'interaction_display_j',
       (SELECT drain_j FROM interaction_drain WHERE subsystem = 'display'),
+  'interaction_cpu_and_system_j',
+      (SELECT sum(drain_j) FROM interaction_drain WHERE
+          subsystem IN ('cpu_big', 'cpu_little', 'soc')),
   'interaction_duration_ms',
       (SELECT dur_ms FROM interaction_drain WHERE subsystem = 'display')
 );