From 1b06962002f23245ad014d699ca0155e574c22a2 Mon Sep 17 00:00:00 2001
From: Rick Yiu <rickyiu@google.com>
Date: Thu, 21 Oct 2021 12:00:17 +0800
Subject: [PATCH] Configure dex2oat group settings

Also associate with its vendor group.

Bug: 201223712
Test: build pass
Change-Id: I86a2e2eb628d2f412079e9c8321809f48b1e4be3
---
 conf/init.gs101.rc | 20 ++++++++++++--------
 task_profiles.json | 29 +++++++++++++++++++++++++++++
 2 files changed, 41 insertions(+), 8 deletions(-)

diff --git a/conf/init.gs101.rc b/conf/init.gs101.rc
index 956604d2..d08a7aab 100644
--- a/conf/init.gs101.rc
+++ b/conf/init.gs101.rc
@@ -719,12 +719,15 @@ on property:sys.boot_completed=1
     write /sys/kernel/vendor_sched/sys_prefer_idle 0
     # cfs_rq clamp is using tg->uclamp setting
     # align it with the vendor_group setting
-    write /sys/kernel/vendor_sched/bg_uclamp_max 615
-    write /dev/cpuctl/background/cpu.uclamp.max 60
-    write /sys/kernel/vendor_sched/bg_group_throttle 615
-    write /sys/kernel/vendor_sched/sysbg_uclamp_max 615
-    write /dev/cpuctl/system-background/cpu.uclamp.max 60
-    write /sys/kernel/vendor_sched/sysbg_group_throttle 615
+    write /sys/kernel/vendor_sched/bg_uclamp_max 512
+    write /dev/cpuctl/background/cpu.uclamp.max 50
+    write /sys/kernel/vendor_sched/bg_group_throttle 512
+    write /sys/kernel/vendor_sched/sysbg_uclamp_max 512
+    write /dev/cpuctl/system-background/cpu.uclamp.max 50
+    write /sys/kernel/vendor_sched/sysbg_group_throttle 512
+    write /sys/kernel/vendor_sched/dex2oat_uclamp_max 615
+    write /dev/cpuctl/dex2oat/cpu.uclamp.max 60
+    write /sys/kernel/vendor_sched/dex2oat_group_throttle 615
 
     # Setup groups for SF (RT used for SF RE, SF used for SF main)
     write /sys/kernel/vendor_sched/rt_uclamp_min 125
@@ -732,9 +735,10 @@ on property:sys.boot_completed=1
     write /sys/kernel/vendor_sched/sf_uclamp_min 30
     write /sys/kernel/vendor_sched/sf_prefer_idle 1
 
-    # Setup cpu.shares to throttle background groups (bg ~ 5% sysbg ~ 10%)
+    # Setup cpu.shares to throttle background groups (bg ~ 5% sysbg ~ 5% dex2oat ~2.5%)
     write /dev/cpuctl/background/cpu.shares 1024
-    write /dev/cpuctl/system-background/cpu.shares 2048
+    write /dev/cpuctl/system-background/cpu.shares 1024
+    write /dev/cpuctl/dex2oat/cpu.shares 512
     write /dev/cpuctl/system/cpu.shares 20480
     # We only have system and background groups holding tasks and the groups below are empty
     write /dev/cpuctl/camera-daemon/cpu.shares 20480
diff --git a/task_profiles.json b/task_profiles.json
index 02c8f376..864961fb 100644
--- a/task_profiles.json
+++ b/task_profiles.json
@@ -66,6 +66,28 @@
         }
       ]
     },
+    {
+      "Name": "Dex2oatPerformance",
+      "Actions": [
+        {
+          "Name": "JoinCgroup",
+          "Params":
+          {
+            "Controller": "cpu",
+            "Path": "dex2oat"
+          }
+        },
+        {
+          "Name": "WriteFile",
+          "Params":
+          {
+            "FilePath": "/sys/kernel/vendor_sched/set_task_group_dex2oat",
+            "Value": "<pid>",
+            "LogFailures": "false"
+          }
+        }
+      ]
+    },
     {
       "Name": "CameraServiceHighCapacity",
       "Actions": [
@@ -309,5 +331,12 @@
         }
       ]
     }
+  ],
+
+  "AggregateProfiles": [
+    {
+      "Name": "Dex2OatBootComplete",
+      "Profiles": [ "Dex2oatPerformance", "ProcessCapacityNormal", "LowIoPriority", "TimerSlackHigh" ]
+    }
   ]
 }