diff options
| author | Anthony Gutierrez <atgutier@umich.edu> | 2011-12-15 00:43:35 -0500 |
|---|---|---|
| committer | Anthony Gutierrez <atgutier@umich.edu> | 2011-12-15 00:43:35 -0500 |
| commit | 19e65a650266a526ca47389188f21bbde79d5054 (patch) | |
| tree | bce6d2b14de64f3e2239cba8f73209ba1d0f1197 | |
| parent | 94ce9712787c59720727890893ded8a533158e2d (diff) | |
| download | gem5-19e65a650266a526ca47389188f21bbde79d5054.tar.xz | |
ARM: Update config files for Android/BBench images available on website.
--HG--
extra : rebase_source : ca98021c3f96422374fbd4500da312a5a9dd00df
| -rw-r--r-- | configs/boot/bbench.rcS | 43 | ||||
| -rw-r--r-- | configs/common/Benchmarks.py | 5 | ||||
| -rw-r--r-- | configs/common/FSConfig.py | 2 |
3 files changed, 48 insertions, 2 deletions
diff --git a/configs/boot/bbench.rcS b/configs/boot/bbench.rcS new file mode 100644 index 000000000..fd2ac0f52 --- /dev/null +++ b/configs/boot/bbench.rcS @@ -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 --git a/configs/common/Benchmarks.py b/configs/common/Benchmarks.py index 74c5622dc..d4607dc55 100644 --- a/configs/common/Benchmarks.py +++ b/configs/common/Benchmarks.py @@ -111,7 +111,10 @@ Benchmarks = { '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 --git a/configs/common/FSConfig.py b/configs/common/FSConfig.py index 967570265..3e0a3df2e 100644 --- a/configs/common/FSConfig.py +++ b/configs/common/FSConfig.py @@ -252,7 +252,7 @@ def makeArmSystem(mem_mode, machine_type, mdesc = None, bare_metal=False): 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 |