From 557e729215ae2081d5322a36ef1745d9354cf64f Mon Sep 17 00:00:00 2001 From: Maxim Baryshnikov Date: Fri, 13 May 2016 14:07:01 +0200 Subject: [PATCH] l4: Improve benchmark. update-all-script: Comment unused code. --- build/boot-l4 | 3 ++- build/l4/ferret-modules.list | 4 +--- qemu-launch-scripts/update-inmates-and-overlay.sh | 4 ++-- 3 files changed, 5 insertions(+), 6 deletions(-) diff --git a/build/boot-l4 b/build/boot-l4 index c98e875..643bec8 100755 --- a/build/boot-l4 +++ b/build/boot-l4 @@ -1,4 +1,5 @@ #!/usr/bin/env novaboot -load l4/l4re/images/bootstrap.elf +load benchmarks-stuff/bootstrap_bench.elf -maxmem=51M + diff --git a/build/l4/ferret-modules.list b/build/l4/ferret-modules.list index e8f835d..b11db20 100644 --- a/build/l4/ferret-modules.list +++ b/build/l4/ferret-modules.list @@ -28,8 +28,6 @@ module ferret_sensor_dir entry bench kernel fiasco -serial_esc -roottask moe rom/bench.cfg +roottask moe --init=rom/benchmark module l4re -module ned -module bench.cfg module benchmark diff --git a/qemu-launch-scripts/update-inmates-and-overlay.sh b/qemu-launch-scripts/update-inmates-and-overlay.sh index 6f5a65b..8c87b72 100755 --- a/qemu-launch-scripts/update-inmates-and-overlay.sh +++ b/qemu-launch-scripts/update-inmates-and-overlay.sh @@ -20,12 +20,12 @@ cp ./configs/*.cell ../buildroot-overlay/jailhouse/configs/ echo "remake bootstrap and objcopy it to overlay.." cd ../build/l4 make hello -make benchmarks +#make benchmarks make bench cd l4re/pkg/bootstrap_custom objcopy -O binary ./server/src/OBJ-$ARCH_IMAGE/bootstrap.elf $START_DIR/../buildroot-overlay/jailhouse/bootstrap-jh.bin 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_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..." -- 2.39.2