forgot one additional change in 0.4.0

fixes performance regressions since microw8 0.2.1

Cargo.toml

@@ -1,6 +1,6 @@
 [package]
 name = "uw8"
-version = "0.3.0"
+version = "0.4.0"
 edition = "2021"
 
 # See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html
@@ -11,7 +11,7 @@ native = ["wasmtime", "uw8-window", "cpal", "rubato" ]
 browser = ["warp", "tokio", "tokio-stream", "webbrowser"]
 
 [dependencies]
-wasmtime = { version = "19.0.1", optional = true }
+wasmtime = { git = "https://github.com/bytecodealliance/wasmtime.git", rev = "0f48f939b9870036562ca02ff21253547a9f1a5c", optional = true }
 anyhow = "1"
 env_logger = "0.11.3"
 log = "0.4"

README.md

@@ -15,9 +15,9 @@ See [here](https://exoticorn.github.io/microw8/) for more information and docs.
 
 ## Downloads
 
-* [Linux](https://github.com/exoticorn/microw8/releases/download/v0.3.0/microw8-0.3.0-linux.tgz)
+* [Linux](https://github.com/exoticorn/microw8/releases/download/v0.3.0/microw8-0.4.0-linux.tgz)
-* [MacOS](https://github.com/exoticorn/microw8/releases/download/v0.3.0/microw8-0.3.0-macos.tgz)
+* [MacOS](https://github.com/exoticorn/microw8/releases/download/v0.3.0/microw8-0.4.0-macos.tgz)
-* [Windows](https://github.com/exoticorn/microw8/releases/download/v0.3.0/microw8-0.3.0-windows.zip)
+* [Windows](https://github.com/exoticorn/microw8/releases/download/v0.3.0/microw8-0.4.0-windows.zip)
 
 The download includes
 

examples/curlywas/tunnel.cwa

@@ -3,14 +3,16 @@ include "../include/microw8-api.cwa"
 export fn upd() {
     let i: i32;
     loop pixels {
-        let inline t = time() * 63 as f32;
+        let inline t = 16!56;
-        let lazy x = (i % 320 - 160) as f32;
+        let inline x = (i % 320 - 160) as f32;
-        let lazy y = (i / 320 - 120) as f32;
+        let inline y = (i #/ 320 - 120) as f32;
-        let inline d = 40000 as f32 / sqrt(x * x + y * y);
+        let inline d = 0xa000 as f32 / sqrt(x * x + y * y);
-        let inline u = atan2(x, y) * (512.0 / 3.141);
+        let inline a = atan2(x, y) * 163_f; // (512 / pi)
-        let inline c = ((i32.trunc_sat_f32_s(d + t * 2 as f32) ^ i32.trunc_sat_f32_s(u + t)) & 255) >> 4;
+        let inline u = i32.trunc_sat_f32_s(a) + t;
+        let inline v = i32.trunc_sat_f32_s(d) + t * 2;
+        let inline c = ((v ^ u) #/ 16) % 16;
         i?FRAMEBUFFER = c;
 
         branch_if (i := i + 1) < 320*240: pixels;
     }
-}
+}

examples/tinygo/build.sh

@@ -1,6 +0,0 @@
-#!/bin/bash
-
-tinygo build -o cart.wasm -target target.json ./main.go
-uw8 filter-exports cart.wasm cart.wasm && \
-#wasm-opt -Oz --fast-math --strip-producers -o cart.wasm cart.wasm && \
-uw8 pack -l 9 cart.wasm cart.uw8

examples/tinygo/main.go

@@ -1,38 +0,0 @@
-package main
-
-import (
-	"math"
-	"unsafe"
-)
-
-//go:wasm-module env
-//export atan2
-func atan2(x, y float32) float32
-
-//go:wasm-module env
-//export time
-func time() float32
-
-func sqrt(v float32) float32 {
-	return float32(math.Sqrt(float64(v)))
-}
-
-var FRAMEBUFFER = (*[320 * 240]byte)(unsafe.Pointer(uintptr(120)))
-
-//export upd
-func upd() {
-	var i int
-	for i < 320*240 {
-		t := time() * 63.0
-		x := float32(i%320 - 160)
-		y := float32(i/320 - 120)
-		d := float32(40000.0) / sqrt(x*x+y*y)
-		u := atan2(x, y) * 512.0 / 3.141
-		c := uint8((int(d+t*2.0) ^ int(u+t)) >> 4)
-		FRAMEBUFFER[i] = c
-		i++
-	}
-}
-
-func main() {
-}

examples/tinygo/target.json

@@ -1,23 +0,0 @@
-{
-  "llvm-target": "wasm32--wasi",
-  "build-tags": [ "tinygo.wasm" ],
-  "goos": "js",
-  "goarch": "wasm",
-  "linker": "wasm-ld",
-  "libc": "wasi-libc",
-  "cflags": [
-    "--target=wasm32--wasi",
-    "--sysroot={root}/lib/wasi-libc/sysroot",
-    "-Oz"
-  ],
-  "ldflags": [
-    "--no-entry",
-    "--export-all",
-    "--import-memory",
-    "--initial-memory=262144",
-    "--global-base=81920",
-    "-zstack-size=4096",
-    "--strip-all"
-  ],
-  "wasm-abi": "js"
-}

site/content/_index.md

@@ -31,19 +31,19 @@ Examplers for older versions:
 
 ## Versions
 
-### v0.3.0
+### v0.4.0
 
-* [Web runtime](v0.3.0)
+* [Web runtime](../v0.4.0)
-* [Linux](https://github.com/exoticorn/microw8/releases/download/v0.3.0/microw8-0.3.0-linux.tgz)
+* [Linux](https://github.com/exoticorn/microw8/releases/download/v0.4.0/microw8-0.4.0-linux.tgz)
-* [MacOS](https://github.com/exoticorn/microw8/releases/download/v0.3.0/microw8-0.3.0-macos.tgz)
+* [MacOS](https://github.com/exoticorn/microw8/releases/download/v0.4.0/microw8-0.4.0-macos.tgz)
-* [Windows](https://github.com/exoticorn/microw8/releases/download/v0.3.0/microw8-0.3.0-windows.zip)
+* [Windows](https://github.com/exoticorn/microw8/releases/download/v0.4.0/microw8-0.4.0-windows.zip)
 
 Changes:
 
-* add blitSprite and grabSprite API calls
+* add support for sound on mono- and surround-only devices
-* add support for integer scaling up to 16x for printing text
+* update wasmtime dependency to fix performance regression in 0.3.0
-* fix incompatibility with sound devices only offering 16bit audio formats
+* add frame counter since module start at location 72
-* add support for br_table instruction in packed carts
+* add 6 and 7 parameter function types to base module
 
 ### Older versions
 

site/content/docs.md

@@ -21,7 +21,7 @@ loaded.
 00000-00040: user memory
 00040-00044: time since module start in ms
 00044-0004c: gamepad state
-0004c-00050: reserved
+0004c-00050: number of frames since module start
 00050-00070: sound data (synced to sound thread)
 00070-00078: reserved
 00078-12c78: frame buffer
@@ -594,7 +594,7 @@ a base module provided by MicroW8.
 
 You can generate this base module yourself using
 `uw8-tool`. As a quick summary, it provides all function
-types with up to 5 parameters (i32 or f32) where the
+types with up to 7 parameters (i32 or f32) where the
 `f32` parameters always preceed the `i32` parameters.
 Then it includes all imports that MicroW8 provides,
 a function section with a single function of type

site/content/versions.md

@@ -2,6 +2,20 @@
 description = "Versions"
 +++
 
+### v0.4.0
+
+* [Web runtime](../v0.4.0)
+* [Linux](https://github.com/exoticorn/microw8/releases/download/v0.4.0/microw8-0.4.0-linux.tgz)
+* [MacOS](https://github.com/exoticorn/microw8/releases/download/v0.4.0/microw8-0.4.0-macos.tgz)
+* [Windows](https://github.com/exoticorn/microw8/releases/download/v0.4.0/microw8-0.4.0-windows.zip)
+
+Changes:
+
+* add support for sound on mono- and surround-only devices
+* update wasmtime dependency to fix performance regression in 0.3.0
+* add frame counter since module start at location 72
+* add 6 and 7 parameter function types to base module
+
 ### v0.3.0
 
 * [Web runtime](../v0.3.0)

site/templates/index.html

@@ -4,7 +4,7 @@
         <section>
             <h1 class="text-center heading-text">A WebAssembly based fantasy console</h1>
         </section>
-        <a href="v0.3.0">
+        <a href="v0.4.0">
             <img class="demonstration-gif" style="width:640px;height:480px;image-rendering:pixelated" src="img/technotunnel.png"></img>
         </a>
     </div>

src/run_native.rs

@@ -27,6 +27,7 @@ struct UW8Instance {
     end_frame: TypedFunc<(), ()>,
     update: Option<TypedFunc<(), ()>>,
     start_time: Instant,
+    frame_counter: u32,
     watchdog: Arc<Mutex<UW8WatchDog>>,
     sound_tx: Option<mpsc::SyncSender<RegisterUpdate>>,
 }
@@ -159,6 +160,7 @@ impl super::Runtime for MicroW8 {
             end_frame,
             update,
             start_time: Instant::now(),
+            frame_counter: 0,
             watchdog,
             sound_tx,
         });
@@ -191,8 +193,11 @@ impl super::Runtime for MicroW8 {
                 let mem = instance.memory.data_mut(&mut instance.store);
                 mem[64..68].copy_from_slice(&time.to_le_bytes());
                 mem[68..72].copy_from_slice(&input.gamepads);
+                mem[72..76].copy_from_slice(&instance.frame_counter.to_le_bytes());
             }
 
+            instance.frame_counter = instance.frame_counter.wrapping_add(1);
+
             instance.store.set_epoch_deadline(self.timeout as u64);
             if let Some(ref update) = instance.update {
                 if let Err(err) = update.call(&mut instance.store, ()) {
@@ -328,9 +333,8 @@ fn init_sound(
     let mut configs: Vec<_> = device
         .supported_output_configs()?
         .filter(|config| {
-            config.channels() <= 2
+            config.sample_format() == cpal::SampleFormat::F32
-                && (config.sample_format() == cpal::SampleFormat::F32
+                || config.sample_format() == cpal::SampleFormat::I16
-                    || config.sample_format() == cpal::SampleFormat::I16)
         })
         .collect();
 
@@ -532,6 +536,25 @@ fn init_sound(
         }
     }
 
+    fn stereo_to_surround<F>(mut buffer: &mut [f32], num_channels: usize, callback: &mut F)
+    where
+        F: FnMut(&mut [f32]),
+    {
+        let mut in_buffer = [0f32; 256];
+        buffer.fill(0.);
+
+        while !buffer.is_empty() {
+            let step_size = (buffer.len() / num_channels).min(in_buffer.len() / 2);
+            let step_buffer = &mut in_buffer[..step_size * 2];
+            callback(step_buffer);
+            for index in 0..step_size {
+                buffer[index * num_channels + 0] = step_buffer[index * 2 + 0];
+                buffer[index * num_channels + 1] = step_buffer[index * 2 + 1];
+            }
+            buffer = &mut buffer[step_size * num_channels..];
+        }
+    }
+
     let stream = if sample_format == cpal::SampleFormat::F32 {
         if num_channels == 2 {
             device.build_output_stream(
@@ -542,7 +565,7 @@ fn init_sound(
                 },
                 None,
             )?
-        } else {
+        } else if num_channels == 1 {
             device.build_output_stream(
                 &config,
                 move |buffer: &mut [f32], _| stereo_to_mono(buffer, &mut callback),
@@ -551,6 +574,17 @@ fn init_sound(
                 },
                 None,
             )?
+        } else {
+            device.build_output_stream(
+                &config,
+                move |buffer: &mut [f32], _| {
+                    stereo_to_surround(buffer, num_channels as usize, &mut callback)
+                },
+                move |err| {
+                    dbg!(err);
+                },
+                None,
+            )?
         }
     } else {
         if num_channels == 2 {
@@ -562,7 +596,7 @@ fn init_sound(
                 },
                 None,
             )?
-        } else {
+        } else if num_channels == 1 {
             device.build_output_stream(
                 &config,
                 move |buffer: &mut [i16], _| {
@@ -573,6 +607,19 @@ fn init_sound(
                 },
                 None,
             )?
+        } else {
+            device.build_output_stream(
+                &config,
+                move |buffer: &mut [i16], _| {
+                    f32_to_i16(buffer, &mut |b| {
+                        stereo_to_surround(b, num_channels as usize, &mut callback)
+                    })
+                },
+                move |err| {
+                    dbg!(err);
+                },
+                None,
+            )?
         }
     };
 

uw8-tool/src/base_module.rs

@@ -37,7 +37,7 @@ impl BaseModule {
 
         let mut types = vec![];
         let mut type_map = HashMap::new();
-        for num_params in 0..6 {
+        for num_params in 0..8 {
             for num_f32 in 0..=num_params {
                 for &result in &[None, Some(ValType::I32), Some(ValType::F32)] {
                     let mut params = vec![];

web/src/index.html

@@ -10,7 +10,7 @@
     </head>
     <body>
         <div id="uw8">
-            <a href="https://exoticorn.github.io/microw8">MicroW8</a> 0.3.0
+            <a href="https://exoticorn.github.io/microw8">MicroW8</a> 0.3.1
         </div>
         <div id="centered">
             <canvas class="screen" id="screen" width="320" height="240">

web/src/microw8.js

@@ -240,6 +240,7 @@ export default function MicroW8(screen, config = {}) {
             await audioReadyPromise;
     
             let startTime = Date.now();
+            let frameCounter = 0;
     
             const timePerFrame = 1000 / 60;
 
@@ -306,6 +307,7 @@ export default function MicroW8(screen, config = {}) {
                         let time = Date.now() - startTime;
                         u32Mem[16] = time;
                         u32Mem[17] = pad | gamepad;
+                        u32Mem[18] = frameCounter++;
                         if(instance.exports.upd) {
                             instance.exports.upd();
                         }