From b64afc1747e68da4ad8bbbf7bc93a024d5c4e789 Mon Sep 17 00:00:00 2001 From: Wei Wang Date: Thu, 2 May 2024 20:26:43 +0000 Subject: [PATCH] Revert "Set big core to cpu skip mask by default" This reverts commit 2cc7bc7c3d07ade96dfdc03bb957e2cf33751901. Reason for revert: may get geekbench5/6 regressed Bug: 338140604 Bug: 338141118 Change-Id: I76b2b98ca233fccc1f9a15c99bbb622bd7869392 --- perf/powerhint-caiman.json | 37 +------------------------------ perf/powerhint-komodo.json | 37 +------------------------------ perf/powerhint-ripcurrentpro.json | 37 +------------------------------ perf/powerhint-tokay.json | 37 +------------------------------ 4 files changed, 4 insertions(+), 144 deletions(-) diff --git a/perf/powerhint-caiman.json b/perf/powerhint-caiman.json index 5c36a43b..96fc3d46 100644 --- a/perf/powerhint-caiman.json +++ b/perf/powerhint-caiman.json @@ -221,6 +221,7 @@ "0x0", "0x80" ], + "DefaultIndex": 0, "ResetOnInit": true }, { @@ -864,12 +865,6 @@ "Duration": 1000, "Value": "0-3" }, - { - "PowerHint": "LAUNCH", - "Node": "CPUSkipMask", - "Duration": 5000, - "Value": "0x0" - }, { "PowerHint": "LAUNCH", "Node": "ReducePreferIdle", @@ -1017,12 +1012,6 @@ "Duration": 5000, "Value": "1" }, - { - "PowerHint": "LAUNCH_EXTEND", - "Node": "CPUSkipMask", - "Duration": 2000, - "Value": "0x0" - }, { "PowerHint": "LAUNCH_EXTEND", "Node": "CPUBigClusterMaxFreq", @@ -1297,12 +1286,6 @@ "Duration": 0, "Value": "0" }, - { - "PowerHint": "CAMERA_LAUNCH", - "Node": "CPUSkipMask", - "Duration": 1000, - "Value": "0x0" - }, { "PowerHint": "CAMERA_LAUNCH", "Node": "CPU_BIG_TSKIN_BYPASS", @@ -1897,12 +1880,6 @@ "Duration": 0, "Value": "camera" }, - { - "PowerHint": "CAMERA_STREAMING_EXTREME", - "Node": "CPUSkipMask", - "Duration": 0, - "Value": "0x0" - }, { "PowerHint": "CAMERA_STREAMING_HIGH", "Node": "PowerHALCameraRunning", @@ -2323,12 +2300,6 @@ "Duration": 0, "Value": "4-7" }, - { - "PowerHint": "CAMERA_STREAMING_LOW", - "Node": "CPUSkipMask", - "Duration": 0, - "Value": "0x0" - }, { "PowerHint": "CAMERA_STREAMING_VIDEO_CALL", "Node": "PowerHALCameraRunning", @@ -2473,12 +2444,6 @@ "Duration": 0, "Value": "30" }, - { - "PowerHint": "CAMERA_STREAMING_VIDEO_CALL", - "Node": "CPUSkipMask", - "Duration": 0, - "Value": "0x0" - }, { "PowerHint": "CAMERA_VIDEO_RECORDING", "Type": "MaskHint", diff --git a/perf/powerhint-komodo.json b/perf/powerhint-komodo.json index fa2beb7b..5083ecfa 100644 --- a/perf/powerhint-komodo.json +++ b/perf/powerhint-komodo.json @@ -221,6 +221,7 @@ "0x0", "0x80" ], + "DefaultIndex": 0, "ResetOnInit": true }, { @@ -864,12 +865,6 @@ "Duration": 1000, "Value": "0-3" }, - { - "PowerHint": "LAUNCH", - "Node": "CPUSkipMask", - "Duration": 5000, - "Value": "0x0" - }, { "PowerHint": "LAUNCH", "Node": "ReducePreferIdle", @@ -1017,12 +1012,6 @@ "Duration": 5000, "Value": "1" }, - { - "PowerHint": "LAUNCH_EXTEND", - "Node": "CPUSkipMask", - "Duration": 2000, - "Value": "0x0" - }, { "PowerHint": "LAUNCH_EXTEND", "Node": "CPUBigClusterMaxFreq", @@ -1297,12 +1286,6 @@ "Duration": 0, "Value": "0" }, - { - "PowerHint": "CAMERA_LAUNCH", - "Node": "CPUSkipMask", - "Duration": 1000, - "Value": "0x0" - }, { "PowerHint": "CAMERA_LAUNCH", "Node": "CPU_BIG_TSKIN_BYPASS", @@ -1897,12 +1880,6 @@ "Duration": 0, "Value": "camera" }, - { - "PowerHint": "CAMERA_STREAMING_EXTREME", - "Node": "CPUSkipMask", - "Duration": 0, - "Value": "0x0" - }, { "PowerHint": "CAMERA_STREAMING_HIGH", "Node": "PowerHALCameraRunning", @@ -2323,12 +2300,6 @@ "Duration": 0, "Value": "4-7" }, - { - "PowerHint": "CAMERA_STREAMING_LOW", - "Node": "CPUSkipMask", - "Duration": 0, - "Value": "0x0" - }, { "PowerHint": "CAMERA_STREAMING_VIDEO_CALL", "Node": "PowerHALCameraRunning", @@ -2473,12 +2444,6 @@ "Duration": 0, "Value": "30" }, - { - "PowerHint": "CAMERA_STREAMING_VIDEO_CALL", - "Node": "CPUSkipMask", - "Duration": 0, - "Value": "0x0" - }, { "PowerHint": "CAMERA_VIDEO_RECORDING", "Type": "MaskHint", diff --git a/perf/powerhint-ripcurrentpro.json b/perf/powerhint-ripcurrentpro.json index 8513e0be..d2984619 100644 --- a/perf/powerhint-ripcurrentpro.json +++ b/perf/powerhint-ripcurrentpro.json @@ -274,6 +274,7 @@ "0x0", "0x80" ], + "DefaultIndex": 0, "ResetOnInit": true }, { @@ -853,12 +854,6 @@ "Duration": 1000, "Value": "0-3" }, - { - "PowerHint": "LAUNCH", - "Node": "CPUSkipMask", - "Duration": 5000, - "Value": "0x0" - }, { "PowerHint": "LAUNCH", "Node": "ReducePreferIdle", @@ -1006,12 +1001,6 @@ "Duration": 5000, "Value": "1" }, - { - "PowerHint": "LAUNCH_EXTEND", - "Node": "CPUSkipMask", - "Duration": 2000, - "Value": "0x0" - }, { "PowerHint": "LAUNCH_EXTEND", "Node": "CPUBigClusterMaxFreq", @@ -1286,12 +1275,6 @@ "Duration": 0, "Value": "0" }, - { - "PowerHint": "CAMERA_LAUNCH", - "Node": "CPUSkipMask", - "Duration": 1000, - "Value": "0x0" - }, { "PowerHint": "CAMERA_LAUNCH", "Node": "CPU_BIG_TSKIN_BYPASS", @@ -1886,12 +1869,6 @@ "Duration": 0, "Value": "camera" }, - { - "PowerHint": "CAMERA_STREAMING_EXTREME", - "Node": "CPUSkipMask", - "Duration": 0, - "Value": "0x0" - }, { "PowerHint": "CAMERA_STREAMING_HIGH", "Node": "PowerHALCameraRunning", @@ -2312,12 +2289,6 @@ "Duration": 0, "Value": "4-7" }, - { - "PowerHint": "CAMERA_STREAMING_LOW", - "Node": "CPUSkipMask", - "Duration": 0, - "Value": "0x0" - }, { "PowerHint": "CAMERA_STREAMING_VIDEO_CALL", "Node": "PowerHALCameraRunning", @@ -2462,12 +2433,6 @@ "Duration": 0, "Value": "30" }, - { - "PowerHint": "CAMERA_STREAMING_VIDEO_CALL", - "Node": "CPUSkipMask", - "Duration": 0, - "Value": "0x0" - }, { "PowerHint": "CAMERA_VIDEO_RECORDING", "Type": "MaskHint", diff --git a/perf/powerhint-tokay.json b/perf/powerhint-tokay.json index 5c36a43b..96fc3d46 100644 --- a/perf/powerhint-tokay.json +++ b/perf/powerhint-tokay.json @@ -221,6 +221,7 @@ "0x0", "0x80" ], + "DefaultIndex": 0, "ResetOnInit": true }, { @@ -864,12 +865,6 @@ "Duration": 1000, "Value": "0-3" }, - { - "PowerHint": "LAUNCH", - "Node": "CPUSkipMask", - "Duration": 5000, - "Value": "0x0" - }, { "PowerHint": "LAUNCH", "Node": "ReducePreferIdle", @@ -1017,12 +1012,6 @@ "Duration": 5000, "Value": "1" }, - { - "PowerHint": "LAUNCH_EXTEND", - "Node": "CPUSkipMask", - "Duration": 2000, - "Value": "0x0" - }, { "PowerHint": "LAUNCH_EXTEND", "Node": "CPUBigClusterMaxFreq", @@ -1297,12 +1286,6 @@ "Duration": 0, "Value": "0" }, - { - "PowerHint": "CAMERA_LAUNCH", - "Node": "CPUSkipMask", - "Duration": 1000, - "Value": "0x0" - }, { "PowerHint": "CAMERA_LAUNCH", "Node": "CPU_BIG_TSKIN_BYPASS", @@ -1897,12 +1880,6 @@ "Duration": 0, "Value": "camera" }, - { - "PowerHint": "CAMERA_STREAMING_EXTREME", - "Node": "CPUSkipMask", - "Duration": 0, - "Value": "0x0" - }, { "PowerHint": "CAMERA_STREAMING_HIGH", "Node": "PowerHALCameraRunning", @@ -2323,12 +2300,6 @@ "Duration": 0, "Value": "4-7" }, - { - "PowerHint": "CAMERA_STREAMING_LOW", - "Node": "CPUSkipMask", - "Duration": 0, - "Value": "0x0" - }, { "PowerHint": "CAMERA_STREAMING_VIDEO_CALL", "Node": "PowerHALCameraRunning", @@ -2473,12 +2444,6 @@ "Duration": 0, "Value": "30" }, - { - "PowerHint": "CAMERA_STREAMING_VIDEO_CALL", - "Node": "CPUSkipMask", - "Duration": 0, - "Value": "0x0" - }, { "PowerHint": "CAMERA_VIDEO_RECORDING", "Type": "MaskHint",