feat: utilize more WASM target features

vaultie · Jul 30, 2024 · 21fd0c7 · 21fd0c7
1 parent 1285c7d
commit 21fd0c7
Show file tree

Hide file tree

Showing 5 changed files with 58 additions and 32 deletions.
diff --git a/crates/teddybear-js/Cargo.toml b/crates/teddybear-js/Cargo.toml
@@ -10,7 +10,14 @@ categories.workspace = true
 crate-type = ["cdylib", "rlib"]
 
 [package.metadata.wasm-pack.profile.release]
-wasm-opt = ["--enable-simd", "-Oz"]
+wasm-opt = [
+    "--enable-bulk-memory",
+    "--enable-mutable-globals",
+    "--enable-nontrapping-float-to-int",
+    "--enable-sign-ext",
+    "--enable-simd",
+    "-Oz"
+]
 
 [dependencies]
 teddybear-c2pa = { workspace = true }

diff --git a/flake.lock b/flake.lock
diff --git a/flake.nix b/flake.nix
@@ -11,6 +11,7 @@
       type = "github";
       owner = "ipetkov";
       repo = "crane";
+      ref = "v0.18.0";
       inputs.nixpkgs.follows = "nixpkgs";
     };
 
@@ -97,10 +98,23 @@
 
         cargoArtifacts = craneLib.buildDepsOnly nativeArgs;
 
+        # https://webassembly.org/features
+        # https://github.com/rust-lang/rust/blob/master/compiler/rustc_target/src/target_features.rs#L323-L337
+        enabledWasmFeatures = [
+          "bulk-memory"
+          "mutable-globals"
+          "nontrapping-fptoint"
+          "sign-ext"
+          "simd128"
+        ];
+
         wasmArgs =
           commonArgs
           // {
-            RUSTFLAGS = "-Ctarget-feature=+simd128";
+            RUSTFLAGS = let
+              fmt = pkgs.lib.concatMapStringsSep "," (f: "+${f}") enabledWasmFeatures;
+            in "-C target-feature=${fmt}";
+
             CARGO_BUILD_TARGET = "wasm32-unknown-unknown";
           };
 
@@ -111,15 +125,19 @@
             cargoExtraArgs = "-p teddybear-js --locked";
           });
 
-        esm = pkgs.callPackage ./nix/package.nix {
-          inherit craneLib wasmArgs wasmCargoArtifacts wasm-pack;
-        };
-
-        cjs = pkgs.callPackage ./nix/package.nix {
-          inherit craneLib wasmArgs wasmCargoArtifacts wasm-pack;
+        mkPackage = buildForNode:
+          pkgs.callPackage ./nix/package.nix {
+            inherit
+              buildForNode
+              craneLib
+              wasmArgs
+              wasmCargoArtifacts
+              wasm-pack
+              ;
+          };
 
-          buildForNode = true;
-        };
+        esm = mkPackage false;
+        cjs = mkPackage true;
 
         uni = pkgs.callPackage ./nix/uni.nix {
           inherit cjs esm;
@@ -149,7 +167,7 @@
         checks = {
           inherit cjs esm uni;
 
-          node = pkgs.callPackage ./nix/node-testing.nix {
+          e2e-test = pkgs.callPackage ./nix/node-testing.nix {
             inherit uni;
 
             src = nix-filter.lib.filter {
@@ -166,7 +184,7 @@
             yarnLockHash = "sha256-LTKJdshmknuSy2hC3SfYRBR5SfDamoMVH+aeC/aKwyA=";
           };
 
-          test = craneLib.cargoTest (nativeArgs
+          unit-test = craneLib.cargoTest (nativeArgs
             // {
               inherit cargoArtifacts;
             });

diff --git a/nix/package.nix b/nix/package.nix
@@ -1,13 +1,13 @@
 {
+  binaryen,
+  buildForNode,
   craneLib,
   lib,
-  binaryen,
+  wabt,
   wasmArgs,
   wasmCargoArtifacts,
-  wabt,
   wasm-bindgen-cli,
   wasm-pack,
-  buildForNode ? false,
 }: let
   target =
     if buildForNode

diff --git a/nix/uni.nix b/nix/uni.nix
@@ -17,12 +17,12 @@ stdenvNoCC.mkDerivation {
     runHook preBuild
 
     jq '.files = ["index_bg.js", "index_bg.wasm", "index.cjs", "index.mjs", "index.d.ts"]' \
-      ${esm}/package.json \
-      > package.json
+      ${esm}/package.json > package.json
 
-    jq '.main = "index.cjs"' package.json | sponge package.json
-    jq '.module = "index.mjs"' package.json | sponge package.json
-    jq '.sideEffects = ["./index.js", "./snippets/*"]' package.json | sponge package.json
+    jq '.main = "index.cjs"' package.json \
+      | jq '.module = "index.mjs"' \
+      | jq '.sideEffects = ["./index.cjs", "./index.mjs"]' \
+      | sponge package.json
 
     # CJS
     cp ${cjs}/index.js index.cjs