test: update tp diff test wattson testcases

As DSU estimation adds "interconnect" power into it, dsu power will behigher

Test: tools/diff_test_trace_processor.py
Bug: 338654268
Signed-off-by: Runping Lai <runpinglai@google.com>

Author: runpinglai-creator

test/trace_processor/diff_tests/metrics/android/tests.py

@@ -506,8 +506,8 @@ def test_wattson_trace_rails_wo_cpuidle(self):
             period_id: 1
             period_dur: 16532191699
             cpu_subsystem {
-              estimated_mw: 94.580833
-              estimated_mws: 1563.628418
+              estimated_mw: 138.959335
+              estimated_mws: 2297.302246
               policy0 {
                 estimated_mw: 48.416279
                 estimated_mws: 800.427185
@@ -553,8 +553,8 @@ def test_wattson_trace_rails_wo_cpuidle(self):
                 }
               }
               dsu_scu {
-                estimated_mw: 3.509021
-                estimated_mws: 58.011806
+                estimated_mw: 47.887524
+                estimated_mws: 791.685730
               }
             }
           }

test/trace_processor/diff_tests/stdlib/wattson/tests.py

@@ -209,26 +209,26 @@ def test_wattson_dsu_devfreq_system_state(self):
             """),
         out=Csv("""
             "ts","dur","cpu0_mw","cpu1_mw","cpu2_mw","cpu3_mw","cpu4_mw","cpu5_mw","cpu6_mw","cpu7_mw","dsu_scu_mw"
-            4108586789603,35685,2.670000,205.600000,205.600000,205.600000,674.240000,674.240000,674.240000,3327.560000,1166.695271
-            4108586825288,30843,205.600000,205.600000,205.600000,205.600000,674.240000,674.240000,674.240000,3327.560000,1166.698554
-            4108586856131,13387,205.600000,205.600000,205.600000,205.600000,674.240000,674.240000,674.240000,99.470000,1166.545753
-            4108586869518,22542,205.600000,205.600000,205.600000,205.600000,674.240000,674.240000,674.240000,3327.560000,1166.655587
-            4108586892060,2482,205.600000,205.600000,205.600000,2.670000,674.240000,674.240000,674.240000,3327.560000,1166.164641
-            4108586894542,68563,205.600000,205.600000,205.600000,205.600000,674.240000,674.240000,674.240000,3327.560000,1166.746124
-            4108586963105,59652,205.600000,205.600000,205.600000,2.670000,674.240000,674.240000,674.240000,3327.560000,1166.716706
-            4108587022757,3743,2.670000,205.600000,205.600000,2.670000,674.240000,674.240000,674.240000,3327.560000,1166.170321
-            4108587026500,15992,205.600000,205.600000,205.600000,2.670000,674.240000,674.240000,674.240000,3327.560000,1166.620056
-            4108587042492,15625,205.600000,205.600000,205.600000,2.670000,674.240000,674.240000,674.240000,99.470000,1166.668234
-            4108587058117,8138,205.600000,205.600000,205.600000,2.670000,674.240000,674.240000,674.240000,3327.560000,1166.555033
-            4108587066255,80566,205.600000,205.600000,205.600000,205.600000,674.240000,674.240000,674.240000,3327.560000,1166.717766
-            4108587146821,19572,205.600000,205.600000,205.600000,205.600000,674.240000,674.240000,674.240000,99.470000,1166.626795
-            4108587166393,219116,205.600000,205.600000,205.600000,205.600000,674.240000,674.240000,674.240000,3327.560000,1166.750356
-            4108587385509,81991,205.600000,2.670000,205.600000,205.600000,674.240000,674.240000,674.240000,3327.560000,1166.743880
-            4108587467500,90413,205.600000,2.670000,2.670000,205.600000,674.240000,674.240000,674.240000,3327.560000,1166.736713
-            4108587557913,92896,2.670000,2.670000,2.670000,205.600000,674.240000,674.240000,674.240000,3327.560000,1166.730805
-            4108587650809,95296,205.600000,2.670000,2.670000,205.600000,674.240000,674.240000,674.240000,3327.560000,1166.740927
-            4108587746105,12451,2.670000,2.670000,2.670000,205.600000,674.240000,674.240000,674.240000,3327.560000,1166.556475
-            4108587758556,28524,2.670000,2.670000,205.600000,205.600000,674.240000,674.240000,674.240000,3327.560000,1166.680924
+            4108586789603,35685,2.670000,205.600000,205.600000,205.600000,674.240000,674.240000,674.240000,3327.560000,1271.145271
+            4108586825288,30843,205.600000,205.600000,205.600000,205.600000,674.240000,674.240000,674.240000,3327.560000,1271.148554
+            4108586856131,13387,205.600000,205.600000,205.600000,205.600000,674.240000,674.240000,674.240000,99.470000,1270.995753
+            4108586869518,22542,205.600000,205.600000,205.600000,205.600000,674.240000,674.240000,674.240000,3327.560000,1271.105587
+            4108586892060,2482,205.600000,205.600000,205.600000,2.670000,674.240000,674.240000,674.240000,3327.560000,1270.614641
+            4108586894542,68563,205.600000,205.600000,205.600000,205.600000,674.240000,674.240000,674.240000,3327.560000,1271.196124
+            4108586963105,59652,205.600000,205.600000,205.600000,2.670000,674.240000,674.240000,674.240000,3327.560000,1271.166706
+            4108587022757,3743,2.670000,205.600000,205.600000,2.670000,674.240000,674.240000,674.240000,3327.560000,1270.620321
+            4108587026500,15992,205.600000,205.600000,205.600000,2.670000,674.240000,674.240000,674.240000,3327.560000,1271.070056
+            4108587042492,15625,205.600000,205.600000,205.600000,2.670000,674.240000,674.240000,674.240000,99.470000,1271.118234
+            4108587058117,8138,205.600000,205.600000,205.600000,2.670000,674.240000,674.240000,674.240000,3327.560000,1271.005033
+            4108587066255,80566,205.600000,205.600000,205.600000,205.600000,674.240000,674.240000,674.240000,3327.560000,1271.167766
+            4108587146821,19572,205.600000,205.600000,205.600000,205.600000,674.240000,674.240000,674.240000,99.470000,1271.076795
+            4108587166393,219116,205.600000,205.600000,205.600000,205.600000,674.240000,674.240000,674.240000,3327.560000,1271.200356
+            4108587385509,81991,205.600000,2.670000,205.600000,205.600000,674.240000,674.240000,674.240000,3327.560000,1271.193880
+            4108587467500,90413,205.600000,2.670000,2.670000,205.600000,674.240000,674.240000,674.240000,3327.560000,1271.186713
+            4108587557913,92896,2.670000,2.670000,2.670000,205.600000,674.240000,674.240000,674.240000,3327.560000,1271.180805
+            4108587650809,95296,205.600000,2.670000,2.670000,205.600000,674.240000,674.240000,674.240000,3327.560000,1271.190927
+            4108587746105,12451,2.670000,2.670000,2.670000,205.600000,674.240000,674.240000,674.240000,3327.560000,1271.006475
+            4108587758556,28524,2.670000,2.670000,205.600000,205.600000,674.240000,674.240000,674.240000,3327.560000,1271.130924
             """))
 
   def test_wattson_time_window_api(self):
@@ -332,11 +332,11 @@ def test_wattson_devfreq_hotplug_and_suspend(self):
             """),
         out=Csv("""
             "ts","dur","cpu0_mw","cpu1_mw","cpu2_mw","cpu3_mw","cpu4_mw","cpu5_mw","cpu6_mw","cpu7_mw","dsu_scu_mw"
-            165725450194,7527,111.020000,0.000000,0.000000,0.000000,0.000000,0.000000,0.000000,375.490000,14.560000
-            165725457721,17334,111.020000,0.000000,0.000000,0.000000,0.000000,0.000000,0.000000,0.000000,14.560000
-            165725475055,6999,0.000000,0.000000,0.000000,0.000000,0.000000,0.000000,0.000000,0.000000,0.000000
-            165725482054,1546,111.020000,0.000000,0.000000,0.000000,0.000000,0.000000,0.000000,0.000000,14.560000
-            165725483600,4468465,111.020000,0.000000,0.000000,0.000000,0.000000,0.000000,0.000000,0.000000,14.560000
+            165725450194,7527,111.020000,0.000000,0.000000,0.000000,0.000000,0.000000,0.000000,375.490000,63.790000
+            165725457721,17334,111.020000,0.000000,0.000000,0.000000,0.000000,0.000000,0.000000,0.000000,63.790000
+            165725475055,6999,0.000000,0.000000,0.000000,0.000000,0.000000,0.000000,0.000000,0.000000,49.230000
+            165725482054,1546,111.020000,0.000000,0.000000,0.000000,0.000000,0.000000,0.000000,0.000000,63.790000
+            165725483600,4468465,111.020000,0.000000,0.000000,0.000000,0.000000,0.000000,0.000000,0.000000,63.790000
             165729952065,73480460119,0.000000,0.000000,0.000000,0.000000,0.000000,0.000000,0.000000,0.000000,0.000000
             """))
 
@@ -490,11 +490,11 @@ def test_wattson_multi_variant_static(self):
         """,
         out=Csv("""
           "ts","dur","cpu0_mw","cpu1_mw","cpu2_mw","cpu3_mw","cpu4_mw","cpu5_mw","cpu6_mw","cpu7_mw","dsu_scu_mw"
-          11209755572327,32239,100.800000,100.800000,3.360000,30.950000,30.950000,473.600000,473.600000,2244.540000,140.319659
-          11209755604566,43021,100.800000,100.800000,30.950000,30.950000,30.950000,473.600000,473.600000,2244.540000,140.317743
-          11209755647587,3776,139.420000,100.800000,30.950000,30.950000,30.950000,473.600000,473.600000,2244.540000,152.216139
-          11209755651363,50651,139.420000,139.420000,30.950000,30.950000,30.950000,473.600000,473.600000,2244.540000,152.239919
-          11209755702014,8177,139.420000,139.420000,30.950000,3.360000,30.950000,473.600000,473.600000,2244.540000,152.214294
+          11209755572327,32239,100.800000,100.800000,3.360000,30.950000,30.950000,473.600000,473.600000,2244.540000,149.839659
+          11209755604566,43021,100.800000,100.800000,30.950000,30.950000,30.950000,473.600000,473.600000,2244.540000,149.837743
+          11209755647587,3776,139.420000,100.800000,30.950000,30.950000,30.950000,473.600000,473.600000,2244.540000,162.226139
+          11209755651363,50651,139.420000,139.420000,30.950000,30.950000,30.950000,473.600000,473.600000,2244.540000,162.249919
+          11209755702014,8177,139.420000,139.420000,30.950000,3.360000,30.950000,473.600000,473.600000,2244.540000,162.224294
           """))
 
   def test_wattson_tpu_estimate(self):