diff options
author | Saul Romero <saul.romero@arm.com> | 2016-02-12 12:12:27 +0000 |
---|---|---|
committer | Saul Romero <saul.romero@arm.com> | 2016-05-17 10:33:21 +0100 |
commit | 03a004d667d947d6beaf6d156176f264a15c985a (patch) | |
tree | 04e280b768deda2549b1b3f475e7d8cad0aa3abe | |
parent | 83d2be0277fed7f1a9ab4d0577c243a7c576ccb0 (diff) |
Implement fallback setting of CPU_FAST & CPU_SLOW from defconfig files
-These are the 3 files where all the tests get the CPU_FAST & CPU_SLOW
settings from runtime builtin functions. In case of failure now
the settings are filled from defconfig variables.
-Keeping error messages which notify the error in run-time CPUs
identifications.
-LAVA link job with these changes:
http://ssg-sw.cambridge.arm.com/lava/scheduler/job/17627/log_file
Change-Id: I80657fab214d50f9577c2a38ffc5d8e36a010f55
Author: Saul Romero <saul.romero@arm.com>
-rwxr-xr-x | components/basics.sh/basics.sh | 14 | ||||
-rwxr-xr-x | components/functestlib.sh/functestlib.sh | 14 | ||||
-rwxr-xr-x | suites/stability/non_functional_suite/common/non_functional_script.sh | 14 |
3 files changed, 33 insertions, 9 deletions
diff --git a/components/basics.sh/basics.sh b/components/basics.sh/basics.sh index e2a4141..efadeb7 100755 --- a/components/basics.sh/basics.sh +++ b/components/basics.sh/basics.sh @@ -53,9 +53,21 @@ for cpu in 0 1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 16 17 18 19 20 21 21 22 23 24 2 commafast=, fi done +if [ -z "$CPU_SLOW" ]; then + CPU_SLOW=$(echo ${CONFIG_BIGLITTLE_LITTLE_CPUS// /,}) + echo "ERROR: little CPUs run-time identification FAILED" + echo "Falling back to defconfig CONFIG_BIGLITTLE_LITTLE_CPUS value..." +fi + +if [ -z "$CPU_FAST" ]; then + CPU_FAST=$(echo ${CONFIG_BIGLITTLE_BIG_CPUS// /,}) + echo "ERROR: big CPUs run-time identification FAILED" + echo "Falling back to defconfig CONFIG_BIGLITTLE_BIG_CPUS value..." +fi + echo "Fast CPU $CPU_FAST Slow CPU $CPU_SLOW" -if [ ! -e /sys/kernel/hmp/up_threshold ] || [ ! -e /sys/kernel/hmp/down_threshold ]; then +if [ ! -e /sys/kernel/hmp/up_threshold ] || [ ! -e /sys/kernel/hmp/down_threshold ]; then echo "up-threshold and down-threshold values not exported. Precondition failure" #non-zero exit signals test runner to declare this test as a failure exit 1 diff --git a/components/functestlib.sh/functestlib.sh b/components/functestlib.sh/functestlib.sh index 9164d12..c7222ed 100755 --- a/components/functestlib.sh/functestlib.sh +++ b/components/functestlib.sh/functestlib.sh @@ -783,16 +783,14 @@ populatebiglittlecpulists() fi if [ "x$__BIGCPUS" == "x" ]; then - echo - echo "ERROR: big CPUs identification FAILED" - echo "Current SchedTest suite supports only: A7+A15 or A53+A57 big.LITTLE systems" - echo + __BIGCPUS="$CONFIG_BIGLITTLE_BIG_CPUS" + echo "ERROR: big CPUs run-time identification FAILED" + echo "Falling back to defconfig CONFIG_BIGLITTLE_BIG_CPUS value..." fi if [ "x$__LITTLECPUS" == "x" ]; then - echo - echo "ERROR: LITTLE CPUs identification FAILED" - echo "Current SchedTest suite supports only: A7+A15 or A53+A57 big.LITTLE systems" - echo + __LITTLECPUS="$CONFIG_BIGLITTLE_LITTLE_CPUS" + echo "ERROR: little CPUs run-time identification FAILED" + echo "Falling back to defconfig CONFIG_BIGLITTLE_LITTLE_CPUS value..." fi } diff --git a/suites/stability/non_functional_suite/common/non_functional_script.sh b/suites/stability/non_functional_suite/common/non_functional_script.sh index fbf17aa..3a9ceaf 100755 --- a/suites/stability/non_functional_suite/common/non_functional_script.sh +++ b/suites/stability/non_functional_suite/common/non_functional_script.sh @@ -67,6 +67,20 @@ while [ $end == 0 ] ; do fi let cpu=$cpu+1 done +if [ -z "$CPU_SLOW" ]; then + CPU_SLOW=$CONFIG_BIGLITTLE_LITTLE_CPUS + CPU_ALL=$CPU_SLOW + echo "ERROR: CPU slow run-time identification FAILED" + echo "Falling back to defconfig CONFIG_BIGLITTLE_LITTLE_CPUS value..." +fi + +if [ -z "$CPU_FAST" ]; then + CPU_FAST=$CONFIG_BIGLITTLE_BIG_CPUS + CPU_ALL="$CPU_ALL $CPU_FAST" + echo "ERROR: CPU fast run-time identification FAILED" + echo "Falling back to defconfig CONFIG_BIGLITTLE_BIG_CPUS value..." +fi + echo "Fast CPU $CPU_FAST Slow CPU $CPU_SLOW" #General rule; function with return values, put |