From: Subrata <sub...@us...> - 2009-09-21 16:13:37
|
Update of /cvsroot/ltp/ltp/testcases/kernel/power_management In directory ddv4jf1.ch3.sourceforge.com:/tmp/cvs-serv32466/ltp/testcases/kernel/power_management Modified Files: runpwtests.sh Log Message: To include Additional 5 new test cases: Additional 5 new testcases to test cpu consolidation resets when sched_smt &(/) sched_mc is reset to zero. Signed-off-by: poornima nayak <mp...@li...>. Index: runpwtests.sh =================================================================== RCS file: /cvsroot/ltp/ltp/testcases/kernel/power_management/runpwtests.sh,v retrieving revision 1.13 retrieving revision 1.14 diff -C2 -d -r1.13 -r1.14 *** runpwtests.sh 30 Aug 2009 16:48:12 -0000 1.13 --- runpwtests.sh 21 Sep 2009 16:13:26 -0000 1.14 *************** *** 171,174 **** --- 171,175 ---- else get_sched_values sched_mc; max_sched_mc=$? + echo "max sched mc $max_sched_mc" for sched_mc in `seq 0 $max_sched_mc`; do : $(( TST_COUNT+=1)) *************** *** 188,200 **** : $(( TST_COUNT+=1)) if [ -f /proc/sys/kernel/timer_migration ]; then ! if test_timer_migration.sh; then ! tst_resm TPASS "Timer Migration interface test" ! else ! RC=$? ! tst_resm TFAIL "Timer migration interface test" ! fi else - check_kv_arch "timer_migration"; supp=$? if [ $supp -eq $YES ]; then RC=$? --- 189,203 ---- : $(( TST_COUNT+=1)) + check_kv_arch "timer_migration"; supp=$? if [ -f /proc/sys/kernel/timer_migration ]; then ! if [ $supp -eq $YES ]; then ! if test_timer_migration.sh; then ! tst_resm TPASS "Timer Migration interface test" ! else ! RC=$? ! tst_resm TFAIL "Timer migration interface test" ! fi ! fi else if [ $supp -eq $YES ]; then RC=$? *************** *** 205,254 **** fi - : $(( TST_COUNT+=1)) - if check_cpufreq_sysfs_files.sh; then - tst_resm TPASS "CPUFREQ sysfs tests" - else - RC=$? - tst_resm TFAIL "CPUFREQ sysfs tests " - fi - if [ $# -gt 0 -a "$1" = "-exclusive" ]; then # Test CPU consolidation if [ $multi_socket -eq $YES -a $multi_core -eq $YES ]; then - work_loads_list="ebizzy kernbench" for sched_mc in `seq 0 $max_sched_mc`; do ! for work_load in ${work_loads_list} ! do ! : $(( TST_COUNT += 1 )) ! sched_mc_pass_cnt=0 ! for repeat_test in `seq 1 10`; do ! #Testcase to validate CPU consolidation for sched_mc ! if cpu_consolidation.py -c $sched_mc -w $work_load ; then ! : $(( sched_mc_pass_cnt += 1 )) ! fi ! done ! analyze_package_consolidation_result $sched_mc $work_load $sched_mc_pass_cnt ! done if [ $hyper_threaded -eq $YES ]; then for sched_smt in `seq 0 $max_sched_smt`; do ! for work_load in ${work_loads_list}; do ! : $(( TST_COUNT += 1 )) ! sched_mc_smt_pass_cnt=0 ! for repeat_test in `seq 1 10`; do ! # Testcase to validate CPU consolidation for ! # for sched_mc & sched_smt with stress=50% ! if cpu_consolidation.py -c $sched_mc -t $sched_smt -w $work_load; then ! : $(( sched_mc_smt_pass_cnt += 1 )) ! fi ! echo "sched_mc_smt_pass_cnt = $sched_mc_smt_pass_cnt" ! done ! analyze_package_consolidation_result $sched_mc $work_load $sched_mc_smt_pass_cnt $sched_smt done done fi done fi ! if [ $hyper_threaded -eq $YES ]; then #Testcase to validate consolidation at core level sched_smt_pass_cnt=0 : $(( TST_COUNT += 1 )) --- 208,250 ---- fi if [ $# -gt 0 -a "$1" = "-exclusive" ]; then # Test CPU consolidation if [ $multi_socket -eq $YES -a $multi_core -eq $YES ]; then for sched_mc in `seq 0 $max_sched_mc`; do ! : $(( TST_COUNT += 1 )) ! sched_mc_pass_cnt=0 ! if [ $sched_mc -eq 2 ]; then ! work_load="kernbench" ! else ! work_load="ebizzy" ! fi ! for repeat_test in `seq 1 10`; do ! #Testcase to validate CPU consolidation for sched_mc ! if cpu_consolidation.py -c $sched_mc -w $work_load ; then ! : $(( sched_mc_pass_cnt += 1 )) ! fi ! done ! analyze_package_consolidation_result $sched_mc $sched_mc_pass_cnt ! if [ $hyper_threaded -eq $YES ]; then for sched_smt in `seq 0 $max_sched_smt`; do ! : $(( TST_COUNT += 1 )) ! sched_mc_smt_pass_cnt=0 ! for repeat_test in `seq 1 10`; do ! # Testcase to validate CPU consolidation for ! # for sched_mc & sched_smt with stress=50% ! if cpu_consolidation.py -c $sched_mc -t $sched_smt -w $work_load; then ! : $(( sched_mc_smt_pass_cnt += 1 )) ! fi done + analyze_package_consolidation_result $sched_mc $sched_mc_smt_pass_cnt $sched_smt done fi done + fi ! if [ $hyper_threaded -eq $YES -a $multi_socket -eq $YES ]; then #Testcase to validate consolidation at core level + work_load="ebizzy" sched_smt_pass_cnt=0 : $(( TST_COUNT += 1 )) *************** *** 260,318 **** done analyze_core_consolidation_result $sched_smt $work_load $sched_smt_pass_cnt fi ! # Verify ILB runs in same package as workload ! if [ $multi_socket -eq $YES -a $multi_core -eq $YES ]; then ! work_loads_list="ebizzy kernbench" for sched_mc in `seq 0 $max_sched_mc`; do ! for work_load in ${work_loads_list} ! do ! : $(( TST_COUNT += 1 )) ! ilb_test.py -c $sched_mc -w $work_load; RC=$? ! if [ $RC -eq 0 ]; then ! tst_resm TPASS "ILB & workload in same package for sched_mc=$sched_mc" else ! if [ $sched_mc -eq 0 ]; then ! tst_resm TPASS "ILB & workload is not in same package when sched_mc=0" ! else ! tst_resm TFAIL "ILB did not run in same package" ! fi fi ! done if [ $hyper_threaded -eq $YES ]; then for sched_smt in `seq 0 $max_sched_smt`; do ! for work_load in ${work_loads_list}; do ! : $(( TST_COUNT += 1 )) ! ilb_test.py -c $sched_mc -t sched_smt -w $work_load; RC=$? ! if [ $RC -eq 0 ]; then ! tst_resm TPASS "ILB & workload in same package for sched_mc=$sched_mc" else ! if [ $sched_mc -eq 0 ]; then ! tst_resm TPASS "ILB & workload is not in same package when sched_mc=0" ! else ! tst_resm TFAIL "ILB did not run in same package" ! fi fi ! done done fi done fi - if [ $multi_socket -eq $YES -a $hyper_threaded -eq $YES -a $multi_core -eq $YES ]; then - for sched_smt in `seq 0 $max_sched_smt`; do - for work_load in ${work_loads_list}; do - : $(( TST_COUNT += 1 )) - ilb_test.py -t $sched_smt -w $work_load; RC=$? - if [ $RC -eq 0 ]; then - tst_resm TPASS "ILB & workload not load not in same package for sched_smt=$sched_smt" - else - if [ $sched_smt -eq 0 ]; then - tst_resm TPASS "Its oky if ILB is not in same package when sched_smt=0" - else - tst_resm TFAIL "ILB did not run in same package" - fi - fi - done - done - fi fi --- 256,357 ---- done analyze_core_consolidation_result $sched_smt $work_load $sched_smt_pass_cnt + + # Vary only sched_smt from 1 to 0 when workload is running and ensure that + # tasks do not consolidate to single core when sched_smt is set to 0 + : $(( TST_COUNT += 1 )) + if cpu_consolidation.py -vt; then + tst_resm TPASS "CPU consolidation test by varying sched_smt" + else + tst_resm TFAIL "CPU consolidation test by varying sched_smt" + fi fi ! ! # Verify threads consolidation stops when sched_mc &(/) sched_smt is disabled ! if [ $multi_socket -eq $YES -a $multi_core -eq $YES ]; then ! : $(( TST_COUNT += 1 )) ! # Vary sched_mc from 1 to 0 when workload is running and ensure that ! # tasks do not consolidate to single package when sched_mc is set to 0 ! if cpu_consolidation.py -v -c 1; then ! tst_resm TPASS "CPU consolidation test by varying sched_mc 1 to 0" ! else ! tst_resm TFAIL "CPU consolidation test by varying sched_mc 1 to 0" ! fi ! ! # Vary sched_mc from 2 to 0 when workload is running and ensure that ! # tasks do not consolidate to single package when sched_mc is set to 0 ! : $(( TST_COUNT += 1 )) ! if cpu_consolidation.py -v -c 2; then ! tst_resm TPASS "CPU consolidation test by varying sched_mc 2 to 0" ! else ! tst_resm TFAIL "CPU consolidation test by varying sched_mc 2 to 0" ! fi ! ! if [ $hyper_threaded -eq $YES ]; then ! # Vary sched_mc & sched_smt from 1 to 0 & 2 to 0 when workload is running and ensure that ! # tasks do not consolidate to single package when sched_mc is set to 0 ! : $(( TST_COUNT += 1 )) ! if cpu_consolidation.py -v -c 1 -t 1; then ! tst_resm TPASS "CPU consolidation test by varying sched_mc \ ! & sched_smt from 1 to 0" ! else ! tst_resm TFAIL "CPU consolidation test by varying sched_mc \ ! & sched_smt from 1 to 0" ! fi ! ! : $(( TST_COUNT += 1 )) ! if cpu_consolidation.py -v -c 2 -t 2; then ! tst_resm TPASS "CPU consolidation test by varying sched_mc \ ! & sched_smt from 2 to 0" ! else ! tst_resm TFAIL "CPU consolidation test by varying sched_mc \ ! & sched_smt from 2 to 0" ! fi ! fi ! fi ! ! # Verify threads consolidation stops when is disabled in HT systems ! if [ $hyper_threaded -eq $YES -a $multi_socket -eq $YES ]; then ! # Vary only sched_smt from 1 to 0 when workload is running and ensure that ! # tasks do not consolidate to single core when sched_smt is set to 0 ! : $(( TST_COUNT += 1 )) ! if cpu_consolidation.py -v -t 1; then ! tst_resm TPASS "CPU consolidation test by varying sched_smt 1 to 0" ! else ! tst_resm TFAIL "CPU consolidation test by varying sched_smt 1 to 0" ! fi ! fi ! ! # Verify ILB runs in same package as workload ! if [ $multi_socket -eq $YES -a $multi_core -eq $YES ]; then for sched_mc in `seq 0 $max_sched_mc`; do ! : $(( TST_COUNT += 1 )) ! ilb_test.py -c $sched_mc; RC=$? ! if [ $RC -eq 0 ]; then ! tst_resm TPASS "ILB & workload in same package for sched_mc=$sched_mc" ! else ! if [ $sched_mc -eq 0 ]; then ! tst_resm TPASS "ILB & workload is not in same package when sched_mc=0" else ! tst_resm TFAIL "ILB did not run in same package" fi ! fi if [ $hyper_threaded -eq $YES ]; then for sched_smt in `seq 0 $max_sched_smt`; do ! : $(( TST_COUNT += 1 )) ! ilb_test.py -c $sched_mc -t sched_smt; RC=$? ! if [ $RC -eq 0 ]; then ! tst_resm TPASS "ILB & workload in same package for sched_mc=$sched_mc" ! else ! if [ $sched_mc -eq 0 -a $sched_smt -eq 0 ]; then ! tst_resm TPASS "ILB & workload is not in same package when\ ! sched_mc & sched_smt is 0" else ! tst_resm TFAIL "ILB did not run in same package" fi ! fi done fi done fi fi |