From ce9ac3834293ee2d695d10147f8fb2b8f7865973 Mon Sep 17 00:00:00 2001 From: Anthony Gutierrez Date: Mon, 11 Jun 2012 11:07:42 -0400 Subject: [PATCH] configs: add run scripts for ics/gb versions of android and bbench 1) Modifies Benchmarks.py to add support for Android ICS and BBench on Android ICS. 2) An rcS script is added for BBench on ICS. 3) Separates benchmark entries and rcS scripts for GB/ICS 4) Removes the debugging output from the existing BBench run script. These print statements were used for debugging and they seemed to confuse users into believing they should see some terminal output. --- configs/boot/bbench-gb.rcS | 38 ++++++++++++++++++++++++++++++++++++ configs/boot/bbench-ics.rcS | 38 ++++++++++++++++++++++++++++++++++++ configs/common/Benchmarks.py | 12 ++++++++---- 3 files changed, 84 insertions(+), 4 deletions(-) create mode 100644 configs/boot/bbench-gb.rcS create mode 100644 configs/boot/bbench-ics.rcS diff --git a/configs/boot/bbench-gb.rcS b/configs/boot/bbench-gb.rcS new file mode 100644 index 000000000..e9225c02f --- /dev/null +++ b/configs/boot/bbench-gb.rcS @@ -0,0 +1,38 @@ +#!/system/bin/sh + +#Author: Anthony Gutierrez +# run script for bbench on gingerbread + +stop_m5() { + /sbin/m5 exit + + return +} + +wait_bb_finishfifo() { + echo "FINISH

FINISH

" > /data/bbench/finish_fifo.html + + return +} + +mkfifo_bbench() { + mkfifo /data/bbench/finish_fifo.html + + return +} + +run_bbench_test() { + mkfifo_bbench + am start -n com.android.browser/.BrowserActivity + wait_bb_finishfifo + + rm /data/bbench/finish_fifo.html + stop_m5 + + return +} + +sleep 10 +/sbin/m5 dumpstats +/sbin/m5 resetstats +run_bbench_test diff --git a/configs/boot/bbench-ics.rcS b/configs/boot/bbench-ics.rcS new file mode 100644 index 000000000..1bb67d9fb --- /dev/null +++ b/configs/boot/bbench-ics.rcS @@ -0,0 +1,38 @@ +#!/system/bin/sh + +#Author: Anthony Gutierrez +# run script for bbench on ics + +stop_m5() { + /sbin/m5 exit + + return +} + +wait_bb_finishfifo() { + echo "FINISH

FINISH

" > /data/bbench/finish_fifo.html + + return +} + +mkfifo_bbench() { + /sbin/busybox mkfifo /data/bbench/finish_fifo.html + + return +} + +run_bbench_test() { + mkfifo_bbench + am start -a android.intent.action.VIEW -d file:///data/bbench/index.html -t application/x-webarchive-xml + wait_bb_finishfifo + + rm /data/bbench/finish_fifo.html + stop_m5 + + return +} + +sleep 10 +/sbin/m5 dumpstats +/sbin/m5 resetstats +run_bbench_test diff --git a/configs/common/Benchmarks.py b/configs/common/Benchmarks.py index bf8b84f17..41d5435f9 100644 --- a/configs/common/Benchmarks.py +++ b/configs/common/Benchmarks.py @@ -111,10 +111,14 @@ Benchmarks = { 'ValStreamCopy': [SysConfig('micro_streamcopy.rcS', '512MB')], 'MutexTest': [SysConfig('mutex-test.rcS', '128MB')], - 'ArmAndroid': [SysConfig('null.rcS', '256MB', - 'ARMv7a-Gingerbread-Android.SMP.mouse.nolock.clean.img')], - 'bbench': [SysConfig('bbench.rcS', '256MB', - 'ARMv7a-Gingerbread-Android.SMP.mouse.nolock.img')] + 'ArmAndroid-GB': [SysConfig('null.rcS', '256MB', + 'ARMv7a-Gingerbread-Android.SMP.mouse.nolock.clean.img')], + 'bbench-gb': [SysConfig('bbench-gb.rcS', '256MB', + 'ARMv7a-Gingerbread-Android.SMP.mouse.nolock.img')], + 'ArmAndroid-ICS': [SysConfig('null.rcS', '256MB', + 'ARMv7a-ICS-Android.SMP.nolock.clean.img')], + 'bbench-ics': [SysConfig('bbench-ics.rcS', '256MB', + 'ARMv7a-ICS-Android.SMP.nolock.img')] } benchs = Benchmarks.keys() -- 2.30.2