changeset ca98021c3f96 in /z/repo/gem5
details: http://repo.gem5.org/gem5?cmd=changeset;node=ca98021c3f96
description:
ARM: Update config files for Android/BBench images available on website.
diffstat:
configs/boot/bbench.rcS | 43 +++++++++++++++++++++++++++++++++++++++++++
configs/common/Benchmarks.py | 5 ++++-
configs/common/FSConfig.py | 2 +-
3 files changed, 48 insertions(+), 2 deletions(-)
diffs (74 lines):
diff -r 8152d4fa7d73 -r ca98021c3f96 configs/boot/bbench.rcS
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/configs/boot/bbench.rcS Thu Dec 15 00:43:35 2011 -0500
@@ -0,0 +1,43 @@
+#!/bin/sh
+
+#Author: Anthony Gutierrez
+
+stop_m5() {
+ echo "FINISHED";
+ /sbin/m5 exit
+
+ return
+}
+
+wait_bb_finishfifo() {
+ echo "<html><head>FINISH</head><body><h1>FINISH</h1></body></html>" >
/data/bbench/finish_fifo.html
+
+ return
+}
+
+mkfifo_bbench() {
+ mkfifo /data/bbench/finish_fifo.html
+
+ return
+}
+
+run_bbench_test() {
+ echo "STARTING BBENCH"
+
+ mkfifo_bbench
+
+ am start -n com.android.browser/.BrowserActivity
+ wait_bb_finishfifo
+
+ echo "END OF BBENCH RUN"
+
+ rm /data/bbench/finish_fifo.html
+ stop_m5
+
+ return
+}
+
+sleep 10
+/sbin/m5 dumpstats
+/sbin/m5 resetstats
+run_bbench_test
diff -r 8152d4fa7d73 -r ca98021c3f96 configs/common/Benchmarks.py
--- a/configs/common/Benchmarks.py Thu Dec 15 00:09:46 2011 -0500
+++ b/configs/common/Benchmarks.py Thu Dec 15 00:43:35 2011 -0500
@@ -111,7 +111,10 @@
'ValStreamCopy': [SysConfig('micro_streamcopy.rcS', '512MB')],
'MutexTest': [SysConfig('mutex-test.rcS', '128MB')],
- 'ArmAndroid': [SysConfig('null.rcS', '256MB', 'android-mbr.img')],
+ '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')]
}
benchs = Benchmarks.keys()
diff -r 8152d4fa7d73 -r ca98021c3f96 configs/common/FSConfig.py
--- a/configs/common/FSConfig.py Thu Dec 15 00:09:46 2011 -0500
+++ b/configs/common/FSConfig.py Thu Dec 15 00:43:35 2011 -0500
@@ -252,7 +252,7 @@
self.gic_cpu_addr = self.realview.gic.cpu_addr
self.flags_addr = self.realview.realview_io.pio_addr + 0x30
- if mdesc.disk().count('android'):
+ if mdesc.disk().lower().count('android'):
boot_flags += " init=/init "
self.boot_osflags = boot_flags
_______________________________________________
gem5-dev mailing list
[email protected]
http://m5sim.org/mailman/listinfo/gem5-dev
