From a18050e8d656ebf4fe41bb4b2daa86f900743829 Mon Sep 17 00:00:00 2001 From: Michal Berger Date: Sun, 26 Feb 2023 12:49:34 +0100 Subject: [PATCH] test/scheduler: Merge cppc_cpufreq into acpi-cpufreq check They have exactly the same conditions, no need to keep it separate for now. Signed-off-by: Michal Berger Change-Id: I6826ffe7b70e3d502f483cf1966930586a6f9f0b Reviewed-on: https://review.spdk.io/gerrit/c/spdk/spdk/+/16934 Reviewed-by: Jim Harris Reviewed-by: Konrad Sztyber Reviewed-by: Richael Tested-by: SPDK CI Jenkins --- test/scheduler/governor.sh | 8 +------- 1 file changed, 1 insertion(+), 7 deletions(-) diff --git a/test/scheduler/governor.sh b/test/scheduler/governor.sh index 78b232c25..648d38861 100755 --- a/test/scheduler/governor.sh +++ b/test/scheduler/governor.sh @@ -117,7 +117,7 @@ verify_dpdk_governor() { fi case "$main_core_driver" in - acpi-cpufreq) + acpi-cpufreq | cppc_cpufreq) [[ $main_core_governor == userspace ]] \ && [[ -n ${main_core_freqs_map[main_core_setspeed]} ]] \ && ((main_core_setspeed == main_core_freqs[-1])) \ @@ -130,12 +130,6 @@ verify_dpdk_governor() { && ((main_core_set_max_freq == main_core_set_min_freq)) \ && ((dir == 0)) ;; - cppc_cpufreq) - [[ $main_core_governor == userspace ]] \ - && [[ -n ${main_core_freqs_map[main_core_setspeed]} ]] \ - && ((main_core_setspeed == main_core_freqs[-1])) \ - && ((dir == 0)) - ;; esac && ((main_core_set_cur_freq < old_main_core_set_cur_freq)) && all_set=1 # Print stats after first sane sample was taken