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 <michal.berger@intel.com>
Change-Id: I6826ffe7b70e3d502f483cf1966930586a6f9f0b
Reviewed-on: https://review.spdk.io/gerrit/c/spdk/spdk/+/16934
Reviewed-by: Jim Harris <james.r.harris@intel.com>
Reviewed-by: Konrad Sztyber <konrad.sztyber@intel.com>
Reviewed-by: Richael <richael.zhuang@arm.com>
Tested-by: SPDK CI Jenkins <sys_sgci@intel.com>
This commit is contained in:
Michal Berger 2023-02-26 12:49:34 +01:00 committed by Konrad Sztyber
parent 7832b34f94
commit a18050e8d6

View File

@ -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