aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSaul Romero <saul.romero@arm.com>2016-02-08 13:41:42 +0000
committerSaul Romero <saul.romero@arm.com>2016-02-11 16:33:30 +0000
commit83d2be0277fed7f1a9ab4d0577c243a7c576ccb0 (patch)
treea721c65dd6018e5b1c7378e61f0dbc0df1234b04
parent49530b16bea94be30c05e628b81066be36dcbf58 (diff)
Added support for non-contiguous CPU numbering
-Modified defconfig files for CPU lists for big-little CPU's -Modified functestlib.sh to return a list rather than a sequence -Added configuration lines to 'schedtest-juno_full.defconfig' -This change is for future proofing, currently these config parameters are not used by the test suites. That's true, all the tests are actually based on run-time identification of CPUs based on PART number. The list of "fast" and "slow" CPUs is built at the beginning of: 'components/basics.sh/basics.sh' which is sourced by most of the tests (but not all). Change-Id: I1f23a5f1b6ef4f12916095439c47d5261240b875 Signed-off-by: Saul Romero <saul.romero@arm.com>
-rw-r--r--build/configuration/defconfig/schedtest-juno.defconfig4
-rw-r--r--build/configuration/defconfig/schedtest-juno_full.defconfig8
-rw-r--r--build/configuration/defconfig/schedtest-juno_linux.defconfig4
-rw-r--r--build/configuration/defconfig/schedtest-juno_oe_lava.defconfig4
-rw-r--r--build/configuration/defconfig/schedtest-juno_r2.defconfig4
-rw-r--r--build/configuration/defconfig/schedtest-juno_r2_full.defconfig4
-rw-r--r--build/configuration/defconfig/schedtest-juno_r2_linux.defconfig4
-rw-r--r--build/configuration/defconfig/schedtest-juno_r2_oe_lava.defconfig4
-rw-r--r--build/configuration/defconfig/schedtest-odroid.defconfig4
-rw-r--r--build/configuration/defconfig/schedtest-odroid_full.defconfig4
-rw-r--r--build/configuration/defconfig/schedtest-tc2.defconfig4
-rw-r--r--build/configuration/defconfig/schedtest-tc2_linux.defconfig4
-rwxr-xr-xcomponents/functestlib.sh/functestlib.sh4
13 files changed, 30 insertions, 26 deletions
diff --git a/build/configuration/defconfig/schedtest-juno.defconfig b/build/configuration/defconfig/schedtest-juno.defconfig
index 205232f..e9c4248 100644
--- a/build/configuration/defconfig/schedtest-juno.defconfig
+++ b/build/configuration/defconfig/schedtest-juno.defconfig
@@ -35,9 +35,9 @@ CONFIG_TARGET_DESCRIPTION="ARM Juno, big.LITTLE GTS (2xCortex-A57 + 4xCortex-A53
#
# big.LITTLE configuration
#
-CONFIG_BIGLITTLE_LITTLE_CPUS="0 3"
+CONFIG_BIGLITTLE_LITTLE_CPUS="0 3 4 5"
CONFIG_BIGLITTLE_LITTLE_FREQS=" 450 850"
-CONFIG_BIGLITTLE_BIG_CPUS="4 5"
+CONFIG_BIGLITTLE_BIG_CPUS="1 2"
CONFIG_BIGLITTLE_BIG_FREQS=" 450 1100"
#
diff --git a/build/configuration/defconfig/schedtest-juno_full.defconfig b/build/configuration/defconfig/schedtest-juno_full.defconfig
index b0f1348..bdd7641 100644
--- a/build/configuration/defconfig/schedtest-juno_full.defconfig
+++ b/build/configuration/defconfig/schedtest-juno_full.defconfig
@@ -22,6 +22,10 @@ CONFIG_TARGET_PLATFORM="android"
CONFIG_TARGET_JUNO=y
# CONFIG_TARGET_TC2 is not set
# CONFIG_TARGET_ODROID_XU3 is not set
+CONFIG_TARGET_ARM_CORTEX_A53=y
+CONFIG_TARGET_ARM_CORTEX_A57=y
+CONFIG_TARGET_BIG_CPUPART="0xd07"
+CONFIG_TARGET_LITTLE_CPUPART="0xd03"
CONFIG_TARGET_NAME="Juno Development Board"
CONFIG_TARGET_ID="juno_devboard"
CONFIG_TARGET_DESCRIPTION="ARM Juno, big.LITTLE GTS (2xCortex-A57 + 4xCortex-A53)"
@@ -29,9 +33,9 @@ CONFIG_TARGET_DESCRIPTION="ARM Juno, big.LITTLE GTS (2xCortex-A57 + 4xCortex-A53
#
# big.LITTLE configuration
#
-CONFIG_BIGLITTLE_LITTLE_CPUS="0 3"
+CONFIG_BIGLITTLE_LITTLE_CPUS="0 3 4 5"
CONFIG_BIGLITTLE_LITTLE_FREQS=" 450 850"
-CONFIG_BIGLITTLE_BIG_CPUS="4 5"
+CONFIG_BIGLITTLE_BIG_CPUS="1 2"
CONFIG_BIGLITTLE_BIG_FREQS=" 450 1100"
#
diff --git a/build/configuration/defconfig/schedtest-juno_linux.defconfig b/build/configuration/defconfig/schedtest-juno_linux.defconfig
index ea77e3a..b3f01d8 100644
--- a/build/configuration/defconfig/schedtest-juno_linux.defconfig
+++ b/build/configuration/defconfig/schedtest-juno_linux.defconfig
@@ -35,9 +35,9 @@ CONFIG_TARGET_DESCRIPTION="ARM Juno, big.LITTLE GTS (2xCortex-A57 + 4xCortex-A53
#
# big.LITTLE configuration
#
-CONFIG_BIGLITTLE_LITTLE_CPUS="0 3"
+CONFIG_BIGLITTLE_LITTLE_CPUS="0 3 4 5"
CONFIG_BIGLITTLE_LITTLE_FREQS=" 450 850"
-CONFIG_BIGLITTLE_BIG_CPUS="4 5"
+CONFIG_BIGLITTLE_BIG_CPUS="1 2"
CONFIG_BIGLITTLE_BIG_FREQS=" 450 1100"
#
diff --git a/build/configuration/defconfig/schedtest-juno_oe_lava.defconfig b/build/configuration/defconfig/schedtest-juno_oe_lava.defconfig
index 723baba..7a56722 100644
--- a/build/configuration/defconfig/schedtest-juno_oe_lava.defconfig
+++ b/build/configuration/defconfig/schedtest-juno_oe_lava.defconfig
@@ -35,9 +35,9 @@ CONFIG_TARGET_DESCRIPTION="ARM Juno, big.LITTLE GTS (2xCortex-A57 + 4xCortex-A53
#
# big.LITTLE configuration
#
-CONFIG_BIGLITTLE_LITTLE_CPUS="0 3"
+CONFIG_BIGLITTLE_LITTLE_CPUS="0 3 4 5"
CONFIG_BIGLITTLE_LITTLE_FREQS=" 450 850"
-CONFIG_BIGLITTLE_BIG_CPUS="4 5"
+CONFIG_BIGLITTLE_BIG_CPUS="1 2"
CONFIG_BIGLITTLE_BIG_FREQS=" 450 1100"
#
diff --git a/build/configuration/defconfig/schedtest-juno_r2.defconfig b/build/configuration/defconfig/schedtest-juno_r2.defconfig
index 372e680..7590ef3 100644
--- a/build/configuration/defconfig/schedtest-juno_r2.defconfig
+++ b/build/configuration/defconfig/schedtest-juno_r2.defconfig
@@ -37,9 +37,9 @@ CONFIG_TARGET_DESCRIPTION="ARM Juno, big.LITTLE GTS (2xCortex-A72 + 4xCortex-A53
#
# big.LITTLE configuration
#
-CONFIG_BIGLITTLE_LITTLE_CPUS="0 3"
+CONFIG_BIGLITTLE_LITTLE_CPUS="0 3 4 5"
CONFIG_BIGLITTLE_LITTLE_FREQS=" 450 950"
-CONFIG_BIGLITTLE_BIG_CPUS="4 5"
+CONFIG_BIGLITTLE_BIG_CPUS="1 2"
CONFIG_BIGLITTLE_BIG_FREQS="600 1200"
#
diff --git a/build/configuration/defconfig/schedtest-juno_r2_full.defconfig b/build/configuration/defconfig/schedtest-juno_r2_full.defconfig
index 5cb4a8f..c8b7ea7 100644
--- a/build/configuration/defconfig/schedtest-juno_r2_full.defconfig
+++ b/build/configuration/defconfig/schedtest-juno_r2_full.defconfig
@@ -37,9 +37,9 @@ CONFIG_TARGET_DESCRIPTION="ARM Juno, big.LITTLE GTS (2xCortex-A72 + 4xCortex-A53
#
# big.LITTLE configuration
#
-CONFIG_BIGLITTLE_LITTLE_CPUS="0 3"
+CONFIG_BIGLITTLE_LITTLE_CPUS="0 3 4 5"
CONFIG_BIGLITTLE_LITTLE_FREQS=" 450 950"
-CONFIG_BIGLITTLE_BIG_CPUS="4 5"
+CONFIG_BIGLITTLE_BIG_CPUS="1 2"
CONFIG_BIGLITTLE_BIG_FREQS="600 1200"
#
diff --git a/build/configuration/defconfig/schedtest-juno_r2_linux.defconfig b/build/configuration/defconfig/schedtest-juno_r2_linux.defconfig
index 7fdb916..6c90d64 100644
--- a/build/configuration/defconfig/schedtest-juno_r2_linux.defconfig
+++ b/build/configuration/defconfig/schedtest-juno_r2_linux.defconfig
@@ -37,9 +37,9 @@ CONFIG_TARGET_DESCRIPTION="ARM Juno, big.LITTLE GTS (2xCortex-A72 + 4xCortex-A53
#
# big.LITTLE configuration
#
-CONFIG_BIGLITTLE_LITTLE_CPUS="0 3"
+CONFIG_BIGLITTLE_LITTLE_CPUS="0 3 4 5"
CONFIG_BIGLITTLE_LITTLE_FREQS=" 450 950"
-CONFIG_BIGLITTLE_BIG_CPUS="4 5"
+CONFIG_BIGLITTLE_BIG_CPUS="1 2"
CONFIG_BIGLITTLE_BIG_FREQS="600 1200"
#
diff --git a/build/configuration/defconfig/schedtest-juno_r2_oe_lava.defconfig b/build/configuration/defconfig/schedtest-juno_r2_oe_lava.defconfig
index 367ae63..2e01cb7 100644
--- a/build/configuration/defconfig/schedtest-juno_r2_oe_lava.defconfig
+++ b/build/configuration/defconfig/schedtest-juno_r2_oe_lava.defconfig
@@ -37,9 +37,9 @@ CONFIG_TARGET_DESCRIPTION="ARM Juno, big.LITTLE GTS (2xCortex-A72 + 4xCortex-A53
#
# big.LITTLE configuration
#
-CONFIG_BIGLITTLE_LITTLE_CPUS="0 3"
+CONFIG_BIGLITTLE_LITTLE_CPUS="0 3 4 5"
CONFIG_BIGLITTLE_LITTLE_FREQS=" 450 950"
-CONFIG_BIGLITTLE_BIG_CPUS="4 5"
+CONFIG_BIGLITTLE_BIG_CPUS="1 2"
CONFIG_BIGLITTLE_BIG_FREQS="600 1200"
#
diff --git a/build/configuration/defconfig/schedtest-odroid.defconfig b/build/configuration/defconfig/schedtest-odroid.defconfig
index 221720d..f91e70f 100644
--- a/build/configuration/defconfig/schedtest-odroid.defconfig
+++ b/build/configuration/defconfig/schedtest-odroid.defconfig
@@ -35,9 +35,9 @@ CONFIG_TARGET_DESCRIPTION="Samsung Exynos 5422, big.LITTLE GTS (4xCortex-A15/A7)
#
# big.LITTLE configuration
#
-CONFIG_BIGLITTLE_LITTLE_CPUS="0 3"
+CONFIG_BIGLITTLE_LITTLE_CPUS="0 1 2 3"
CONFIG_BIGLITTLE_LITTLE_FREQS="1000 1600"
-CONFIG_BIGLITTLE_BIG_CPUS="4 7"
+CONFIG_BIGLITTLE_BIG_CPUS="4 5 6 7"
CONFIG_BIGLITTLE_BIG_FREQS="1200 2200"
#
diff --git a/build/configuration/defconfig/schedtest-odroid_full.defconfig b/build/configuration/defconfig/schedtest-odroid_full.defconfig
index 86a304e..e490886 100644
--- a/build/configuration/defconfig/schedtest-odroid_full.defconfig
+++ b/build/configuration/defconfig/schedtest-odroid_full.defconfig
@@ -29,9 +29,9 @@ CONFIG_TARGET_DESCRIPTION="Samsung Exynos 5422, big.LITTLE GTS (4xCortex-A15/A7)
#
# big.LITTLE configuration
#
-CONFIG_BIGLITTLE_LITTLE_CPUS="0 3"
+CONFIG_BIGLITTLE_LITTLE_CPUS="0 1 2 3"
CONFIG_BIGLITTLE_LITTLE_FREQS="1000 1600"
-CONFIG_BIGLITTLE_BIG_CPUS="4 7"
+CONFIG_BIGLITTLE_BIG_CPUS="4 5 6 7"
CONFIG_BIGLITTLE_BIG_FREQS="1200 2200"
#
diff --git a/build/configuration/defconfig/schedtest-tc2.defconfig b/build/configuration/defconfig/schedtest-tc2.defconfig
index fb86d11..17a7254 100644
--- a/build/configuration/defconfig/schedtest-tc2.defconfig
+++ b/build/configuration/defconfig/schedtest-tc2.defconfig
@@ -35,9 +35,9 @@ CONFIG_TARGET_DESCRIPTION="ARM VExpress TC2, big.LITTLE GTS (2xCortex-A15 + 3xCo
#
# big.LITTLE configuration
#
-CONFIG_BIGLITTLE_LITTLE_CPUS="0 2"
+CONFIG_BIGLITTLE_LITTLE_CPUS="0 3 4"
CONFIG_BIGLITTLE_LITTLE_FREQS=" 350 1000"
-CONFIG_BIGLITTLE_BIG_CPUS="3 4"
+CONFIG_BIGLITTLE_BIG_CPUS="1 2"
CONFIG_BIGLITTLE_BIG_FREQS=" 500 1200"
#
diff --git a/build/configuration/defconfig/schedtest-tc2_linux.defconfig b/build/configuration/defconfig/schedtest-tc2_linux.defconfig
index c5dae2f..086fc4e 100644
--- a/build/configuration/defconfig/schedtest-tc2_linux.defconfig
+++ b/build/configuration/defconfig/schedtest-tc2_linux.defconfig
@@ -35,9 +35,9 @@ CONFIG_TARGET_DESCRIPTION="ARM VExpress TC2, big.LITTLE GTS (2xCortex-A15 + 3xCo
#
# big.LITTLE configuration
#
-CONFIG_BIGLITTLE_LITTLE_CPUS="0 2"
+CONFIG_BIGLITTLE_LITTLE_CPUS="0 3 4"
CONFIG_BIGLITTLE_LITTLE_FREQS=" 350 1000"
-CONFIG_BIGLITTLE_BIG_CPUS="3 4"
+CONFIG_BIGLITTLE_BIG_CPUS="1 2"
CONFIG_BIGLITTLE_BIG_FREQS=" 500 1200"
#
diff --git a/components/functestlib.sh/functestlib.sh b/components/functestlib.sh/functestlib.sh
index ed5c70f..9164d12 100755
--- a/components/functestlib.sh/functestlib.sh
+++ b/components/functestlib.sh/functestlib.sh
@@ -93,13 +93,13 @@ default_big_cpulist()
{
# This default matches TC2
# used when all other avenues fail
- __RET=`seq $CONFIG_BIGLITTLE_BIG_CPUS`
+ __RET=$CONFIG_BIGLITTLE_BIG_CPUS
}
default_little_cpulist()
{
# This default matches TC2
# used when all other avenues fail
- __RET=`seq $CONFIG_BIGLITTLE_LITTLE_CPUS`
+ __RET=$CONFIG_BIGLITTLE_LITTLE_CPUS
}
program_exists()