Add simple benchmark pkg.

diff --git a/build/l4/Makefile b/build/l4/Makefile
index 2a5ef571c77905a321bebf43d4dee39cc627c2fc..318eaf1e03217aecd97e3880766f388c067aae9e 100644 (file)
--- a/build/l4/Makefile
+++ b/build/l4/Makefile
@@ -78,3 +78,9 @@ hello:
 benchmarks:
        $(MAKE) -C l4re MODULE_SEARCH_PATH=$(CURDIR)/fiasco S=pkg/ferret:pkg/ferret/examples/monitors/simple_mon_re
        $(MAKE) -C l4re MODULES_LIST=$(CURDIR)/ferret-modules.list MODULE_SEARCH_PATH=$(CURDIR)/fiasco:$(CURDIR)/ned-confs/ E=ferret-bench elfimage
+
+.PHONY: bench
+bench:
+       $(MAKE) -C l4re MODULE_SEARCH_PATH=$(CURDIR)/fiasco S=pkg/benchmark
+       $(MAKE) -C l4re MODULES_LIST=$(CURDIR)/ferret-modules.list MODULE_SEARCH_PATH=$(CURDIR)/fiasco:$(CURDIR)/ned-confs/ E=bench elfimage
+

diff --git a/build/l4/ferret-modules.list b/build/l4/ferret-modules.list
index 53ae50574eec637907d9f567d010e2472d4e0acf..e8f835d4ab0d99c69545e468da85fd967c82dbaa 100644 (file)
--- a/build/l4/ferret-modules.list
+++ b/build/l4/ferret-modules.list
@@ -25,3 +25,11 @@ module ned
 module fer_scalar_demo
 module fer_simple_mon
 module ferret_sensor_dir
+
+entry bench
+kernel fiasco -serial_esc
+roottask moe rom/bench.cfg
+module l4re
+module ned
+module bench.cfg
+module benchmark

diff --git a/build/l4/ned-confs/bench.cfg b/build/l4/ned-confs/bench.cfg
new file mode 100644 (file)
index 0000000..2a12bf2
--- /dev/null
+++ b/build/l4/ned-confs/bench.cfg
@@ -0,0 +1,5 @@
+# this is a configuration to start 'bench'
+
+local L4 = require("L4");
+
+L4.default_loader:start({}, "rom/benchmark -s 1000000 -t 10");

diff --git a/buildroot-overlay/etc/profile.d/S22starttask.sh b/buildroot-overlay/etc/profile.d/S22starttask.sh
index d50270fd076c5c7157daf8f5c60e0397b94111aa..e1ea75e52ed8217ae9547d890074e8e3c8a4117c 100755 (executable)
--- a/buildroot-overlay/etc/profile.d/S22starttask.sh
+++ b/buildroot-overlay/etc/profile.d/S22starttask.sh
@@ -1,6 +1,7 @@
 #!/bin/bash
 set -e;
-/root/jailhouse-init-novabox.sh
+#/root/jailhouse-init-novabox.sh
+/root/jailhouse-init-qemu.sh
 #exec /root/fiasco-ferret-bench.sh
-#setserial /dev/ttyS0 uart unknown port 0x0 irq 0x0
-exec /root/hpet-demo-test.sh
+exec /root/fiasco-bench.sh
+#exec /root/hpet-demo-test.sh

diff --git a/buildroot-overlay/root/fiasco-bench.sh b/buildroot-overlay/root/fiasco-bench.sh
new file mode 100755 (executable)
index 0000000..2683e10
--- /dev/null
+++ b/buildroot-overlay/root/fiasco-bench.sh
@@ -0,0 +1,3 @@
+jailhouse cell create /jailhouse/configs/fiasco-demo.cell
+jailhouse cell load fiasco-demo /jailhouse/bootstrap_bench-jh.bin -a 0xf0000
+jailhouse cell start fiasco-demo

diff --git a/l4 b/l4
index 8c3e8038fdaee9c87eb5e17d775e98a63fd5cf76..6872a213ac58ef264825dc92aff484df59041065 160000 (submodule)
--- a/l4
+++ b/l4
@@ -1 +1 @@
-Subproject commit 8c3e8038fdaee9c87eb5e17d775e98a63fd5cf76
+Subproject commit 6872a213ac58ef264825dc92aff484df59041065

diff --git a/qemu-launch-scripts/update-inmates-and-overlay.sh b/qemu-launch-scripts/update-inmates-and-overlay.sh
index 025208c3a70d14e3ee23bc37794c75c9294f9e12..18a2ce1cd9565086804b75fe5e7d8e290b5e1446 100755 (executable)
--- a/qemu-launch-scripts/update-inmates-and-overlay.sh
+++ b/qemu-launch-scripts/update-inmates-and-overlay.sh
@@ -19,10 +19,11 @@ echo "remake bootstrap and objcopy it to overlay.."
 cd ../build/l4
 make hello
 make benchmarks
-
+make bench
 cd l4re/pkg/bootstrap_custom
 objcopy -O binary ./server/src/OBJ-$ARCH_IMAGE/bootstrap_hello.elf $START_DIR/../buildroot-overlay/jailhouse/bootstrap_hello-jh.bin
 objcopy -O binary ./server/src/OBJ-$ARCH_IMAGE/bootstrap_ferret-bench.elf $START_DIR/../buildroot-overlay/jailhouse/bootstrap_ferret-bench-jh.bin
+objcopy -O binary ./server/src/OBJ-$ARCH_IMAGE/bootstrap_bench.elf $START_DIR/../buildroot-overlay/jailhouse/bootstrap_bench-jh.bin
 
 echo "Update rootfs..."
 cd $START_DIR/../build/buildroot/