From 26978969a1d294130efd9557201af0056b43e7ad Mon Sep 17 00:00:00 2001 From: Naresh Kamboju Date: Tue, 3 Nov 2015 15:52:38 +0530 Subject: wa2-lava: obsolete prepare-device.sh All the operations from prepare-device.sh has been moved in to agenda files. So prepare-device.sh is no more required. Change-Id: Ib6806ceb5b939fd1827cf04c0db29c15c63a1430 Signed-off-by: Naresh Kamboju --- prepare-device.sh | 186 ------------------------------------------------------ wa2host.yaml | 11 ++-- 2 files changed, 5 insertions(+), 192 deletions(-) delete mode 100755 prepare-device.sh diff --git a/prepare-device.sh b/prepare-device.sh deleted file mode 100755 index 2153b9e..0000000 --- a/prepare-device.sh +++ /dev/null @@ -1,186 +0,0 @@ -#!/bin/bash -# -# Workload Automation v2 for LAVA -# -# Copyright (C) 2014, Linaro Limited. -# -# This program is free software; you can redistribute it and/or -# modify it under the terms of the GNU General Public License -# as published by the Free Software Foundation; either version 2 -# of the License, or (at your option) any later version. -# -# This program is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU General Public License for more details. -# -# You should have received a copy of the GNU General Public License -# along with this program; if not, write to the Free Software -# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. -# -# Author: Milosz Wasilewski -# Author: Naresh Kamboju -# - -#set -e -echo "Preparing device for mode: $1" - -disable_iks () { - IPADDR=`cat IPADDR` - echo "Disable IKS for $IPADDR" - echo "adb -s $IPADDR shell \"echo 0 > /sys/kernel/bL_switcher/active\"" - adb -s $IPADDR shell "echo 0 > /sys/kernel/bL_switcher/active" - adb -s $IPADDR shell "cat /sys/kernel/bL_switcher/active" -} - -adb_connect_device () { - expr "$1" : '[0-9][0-9]*\.[0-9][0-9]*\.[0-9][0-9]*\.[0-9][0-9]*$' - if [ $? -eq 0 ]; then adb connect $1; IPADDR=$1:5555; fi -} - -IPADDR=`cat IPADDR` -adb_connect_device $IPADDR -echo $IPADDR -adb devices -adb wait-for-device - -if [ $1 == 'iks' ] -then - # enable IKS - echo "Enable IKS for $IPADDR" - echo "adb -s $IPADDR shell \"echo 1 > /sys/kernel/bL_switcher/active\"" - adb -s $IPADDR shell "echo 1 > /sys/kernel/bL_switcher/active" - adb -s $IPADDR shell "cat /sys/kernel/bL_switcher/active" -fi - -if [ $1 == 'a7only' ] -then - echo "Disable A15 cluster" - adb -s $IPADDR shell "echo 0 > /sys/devices/system/cpu/cpu1/online" - adb -s $IPADDR shell "echo 0 > /sys/devices/system/cpu/cpu2/online" -fi - -if [ $1 == 'a15only' ] -then - echo "Disable A7 cluster" - adb -s $IPADDR shell "echo 0 > /sys/devices/system/cpu/cpu0/online" - adb -s $IPADDR shell "echo 0 > /sys/devices/system/cpu/cpu3/online" - adb -s $IPADDR shell "echo 0 > /sys/devices/system/cpu/cpu4/online" -fi - -if [ $1 == 'a53only' ] -then - echo "Disable A57 cluster" - adb -s $IPADDR shell "echo 0 > /sys/devices/system/cpu/cpu1/online | su" - adb -s $IPADDR shell "echo 0 > /sys/devices/system/cpu/cpu2/online | su" - adb -s $IPADDR shell "echo 85 > /sys/devices/system/cpu/cpu0/cpufreq/interactive/go_hispeed_load | su" - adb -s $IPADDR shell "echo 700000 > /sys/devices/system/cpu/cpu0/cpufreq/interactive/hispeed_freq | su" -fi - -if [ $1 == 'a57only' ] -then - echo "Disable A53 cluster" - adb -s $IPADDR shell "echo 0 > /sys/devices/system/cpu/cpu0/online | su" - adb -s $IPADDR shell "echo 0 > /sys/devices/system/cpu/cpu3/online | su" - adb -s $IPADDR shell "echo 0 > /sys/devices/system/cpu/cpu4/online | su" - adb -s $IPADDR shell "echo 0 > /sys/devices/system/cpu/cpu5/online | su" - adb -s $IPADDR shell "echo 85 > /sys/devices/system/cpu/cpu1/cpufreq/interactive/go_hispeed_load | su" - adb -s $IPADDR shell "echo 800000 > /sys/devices/system/cpu/cpu1/cpufreq/interactive/hispeed_freq | su" -fi - -if [ $1 == 'hmp' ] -then - if [ $2 == 'vexpress-tc2' ] - then - disable_iks - fi - if [ $2 == 'juno' ] - then - adb -s $IPADDR shell "echo 85 > /sys/devices/system/cpu/cpu0/cpufreq/interactive/go_hispeed_load | su" - adb -s $IPADDR shell "echo 700000 > /sys/devices/system/cpu/cpu0/cpufreq/interactive/hispeed_freq | su" - adb -s $IPADDR shell "echo 85 > /sys/devices/system/cpu/cpu1/cpufreq/interactive/go_hispeed_load | su" - adb -s $IPADDR shell "echo 800000 > /sys/devices/system/cpu/cpu1/cpufreq/interactive/hispeed_freq | su" - fi -fi - -if [ $1 == 'easON_a53bc' ] -then - if [ $2 == 'juno' ] - then - adb -s $IPADDR shell "echo ENERGY_AWARE > /sys/kernel/debug/sched_features | su" - adb -s $IPADDR shell "echo 85 > /sys/devices/system/cpu/cpu0/cpufreq/interactive/go_hispeed_load | su" - adb -s $IPADDR shell "echo 700000 > /sys/devices/system/cpu/cpu0/cpufreq/interactive/hispeed_freq | su" - adb -s $IPADDR shell "echo 85 > /sys/devices/system/cpu/cpu1/cpufreq/interactive/go_hispeed_load | su" - adb -s $IPADDR shell "echo 800000 > /sys/devices/system/cpu/cpu1/cpufreq/interactive/hispeed_freq | su" - fi -fi - -if [ $1 == 'easOFF_a53bc' ] -then - if [ $2 == 'juno' ] - then - adb -s $IPADDR shell "echo NO_ENERGY_AWARE > /sys/kernel/debug/sched_features | su" - adb -s $IPADDR shell "echo 85 > /sys/devices/system/cpu/cpu0/cpufreq/interactive/go_hispeed_load | su" - adb -s $IPADDR shell "echo 700000 > /sys/devices/system/cpu/cpu0/cpufreq/interactive/hispeed_freq | su" - adb -s $IPADDR shell "echo 85 > /sys/devices/system/cpu/cpu1/cpufreq/interactive/go_hispeed_load | su" - adb -s $IPADDR shell "echo 800000 > /sys/devices/system/cpu/cpu1/cpufreq/interactive/hispeed_freq | su" - fi -fi - -if [ $1 == 'easON_a53only' ] -then - if [ $2 == 'juno' ] - then - adb -s $IPADDR shell "echo ENERGY_AWARE > /sys/kernel/debug/sched_features | su" - echo "Disable A57 cluster" - adb -s $IPADDR shell "echo 0 > /sys/devices/system/cpu/cpu1/online | su" - adb -s $IPADDR shell "echo 0 > /sys/devices/system/cpu/cpu2/online | su" - adb -s $IPADDR shell "echo 85 > /sys/devices/system/cpu/cpu0/cpufreq/interactive/go_hispeed_load | su" - adb -s $IPADDR shell "echo 700000 > /sys/devices/system/cpu/cpu0/cpufreq/interactive/hispeed_freq | su" - fi -fi - -if [ $1 == 'easOFF_a53only' ] -then - if [ $2 == 'juno' ] - then - adb -s $IPADDR shell "echo NO_ENERGY_AWARE > /sys/kernel/debug/sched_features | su" - echo "Disable A57 cluster" - adb -s $IPADDR shell "echo 0 > /sys/devices/system/cpu/cpu1/online | su" - adb -s $IPADDR shell "echo 0 > /sys/devices/system/cpu/cpu2/online | su" - adb -s $IPADDR shell "echo 85 > /sys/devices/system/cpu/cpu0/cpufreq/interactive/go_hispeed_load | su" - adb -s $IPADDR shell "echo 700000 > /sys/devices/system/cpu/cpu0/cpufreq/interactive/hispeed_freq | su" - fi -fi - -if [ $1 == 'easON_a57only' ] -then - if [ $2 == 'juno' ] - then - adb -s $IPADDR shell "echo ENERGY_AWARE > /sys/kernel/debug/sched_features | su" - echo "Disable A53 cluster" - adb -s $IPADDR shell "echo 0 > /sys/devices/system/cpu/cpu0/online | su" - adb -s $IPADDR shell "echo 0 > /sys/devices/system/cpu/cpu3/online | su" - adb -s $IPADDR shell "echo 0 > /sys/devices/system/cpu/cpu4/online | su" - adb -s $IPADDR shell "echo 0 > /sys/devices/system/cpu/cpu5/online | su" - adb -s $IPADDR shell "echo 85 > /sys/devices/system/cpu/cpu1/cpufreq/interactive/go_hispeed_load | su" - adb -s $IPADDR shell "echo 800000 > /sys/devices/system/cpu/cpu1/cpufreq/interactive/hispeed_freq | su" - fi -fi - -if [ $1 == 'easOFF_a57only' ] -then - if [ $2 == 'juno' ] - then - adb -s $IPADDR shell "echo NO_ENERGY_AWARE > /sys/kernel/debug/sched_features | su" - echo "Disable A53 cluster" - adb -s $IPADDR shell "echo 0 > /sys/devices/system/cpu/cpu0/online | su" - adb -s $IPADDR shell "echo 0 > /sys/devices/system/cpu/cpu3/online | su" - adb -s $IPADDR shell "echo 0 > /sys/devices/system/cpu/cpu4/online | su" - adb -s $IPADDR shell "echo 0 > /sys/devices/system/cpu/cpu5/online | su" - adb -s $IPADDR shell "echo 85 > /sys/devices/system/cpu/cpu1/cpufreq/interactive/go_hispeed_load | su" - adb -s $IPADDR shell "echo 800000 > /sys/devices/system/cpu/cpu1/cpufreq/interactive/hispeed_freq | su" - fi -fi - -exit 0 diff --git a/wa2host.yaml b/wa2host.yaml index f3467f5..75b2584 100644 --- a/wa2host.yaml +++ b/wa2host.yaml @@ -57,9 +57,8 @@ run: - lava-test-case step1-$SIGNAL_PREFIX-prepare-agenda --shell ./prepare-agenda.py --agenda $AGENDA --job-name $JOB_NAME - lava-test-case step2-$SIGNAL_PREFIX-wait-for-ip --shell lava-wait $SIGNAL_PREFIX-send-ip - lava-test-case step3-$SIGNAL_PREFIX-prepare-config --shell ./prepare-config.py --prefix $SIGNAL_PREFIX --config $CONFIG - - lava-test-case step4-$SIGNAL_PREFIX-prepare-device --shell ./prepare-device.sh $MODE $DEVICE - - lava-test-case step5-$SIGNAL_PREFIX-run-workload --shell ./run-workload.sh $AGENDA $JOB_NAME - - if [ -f ./$JOB_NAME/results.csv ]; then lava-test-case-attach step6-$SIGNAL_PREFIX-run-workload ./$JOB_NAME/results.csv; fi - - if [ -f ./$JOB_NAME/run.log ]; then lava-test-case-attach step7-$SIGNAL_PREFIX-run-workload ./$JOB_NAME/run.log; fi - - lava-test-case step8-$SIGNAL_PREFIX-tear-down --shell ./tear-down.sh $JOB_NAME - - lava-test-case step9-$SIGNAL_PREFIX-multinode-sync --shell lava-sync $SIGNAL_PREFIX-finished + - lava-test-case step4-$SIGNAL_PREFIX-run-workload --shell ./run-workload.sh $AGENDA $JOB_NAME + - if [ -f ./$JOB_NAME/results.csv ]; then lava-test-case-attach step5-$SIGNAL_PREFIX-run-workload ./$JOB_NAME/results.csv; fi + - if [ -f ./$JOB_NAME/run.log ]; then lava-test-case-attach step6-$SIGNAL_PREFIX-run-workload ./$JOB_NAME/run.log; fi + - lava-test-case step7-$SIGNAL_PREFIX-tear-down --shell ./tear-down.sh $JOB_NAME + - lava-test-case step8-$SIGNAL_PREFIX-multinode-sync --shell lava-sync $SIGNAL_PREFIX-finished -- cgit v1.2.3