Fabian 3 rokov pred
rodič
commit
143f74fd9f

+ 16 - 5
tests/benchmark/debian-bytemark.js → tests/benchmark/arch-bytemark.js

@@ -1,21 +1,32 @@
 #!/usr/bin/env node
 "use strict";
 
+const path = require("path");
 var V86 = require("../../build/libv86.js").V86;
 
+const V86_ROOT = path.join(__dirname, "../..");
+
 var emulator = new V86({
-    hda: { url: __dirname + "/../../images/debian-bench.img", async: true },
-    initial_state: { url: __dirname + "/../../images/debian-state-bench.bin" },
-    network_relay_url: "wss://127.0.0.1/",
+    bios: { url: path.join(V86_ROOT, "/bios/seabios.bin") },
+    vga_bios: { url: path.join(V86_ROOT, "/bios/vgabios.bin") },
     autostart: true,
-    memory_size: 128 * 1024 * 1024,
+    memory_size: 512 * 1024 * 1024,
     vga_memory_size: 8 * 1024 * 1024,
+    network_relay_url: "<UNUSED>",
+    initial_state: { url: __dirname + "/../../images/arch_state.bin" },
+    filesystem: {
+        basefs: {
+            url: path.join(V86_ROOT, "/images/fs.json"),
+        },
+        baseurl: path.join(V86_ROOT, "/images/arch/"),
+    },
+    screen_dummy: true,
 });
 
 emulator.bus.register("emulator-started", function()
 {
     setTimeout(() => {
-        emulator.serial0_send("cd bench && ./nbench\n");
+        emulator.serial0_send("cd nbench && ./nbench\n");
     }, 1000);
 });
 

+ 3 - 3
tests/benchmark/linux-boot.js

@@ -29,12 +29,12 @@ else
         vga_memory_size: 8 * 1024 * 1024,
         network_relay_url: "<UNUSED>",
         bzimage_initrd_from_filesystem: true,
-        cmdline: "rw init=/bin/systemd root=host9p console=ttyS0 spectre_v2=off pti=off",
+        cmdline: "rw console=ttyS0 apm=off root=host9p rootfstype=9p rootflags=trans=virtio,cache=loose mitigations=off audit=0 tsc=reliable nowatchdog init=/usr/bin/init-openrc",
         filesystem: {
             basefs: {
-                url: path.join(V86_ROOT, "/images/debian-base-fs.json"),
+                url: path.join(V86_ROOT, "/images/fs.json"),
             },
-            baseurl: path.join(V86_ROOT, "/images/debian-9p-rootfs-flat/"),
+            baseurl: path.join(V86_ROOT, "/images/arch/"),
         },
         screen_dummy: true,
     });