From e40f80fe4ac6d4a96e02ce6fed26209242e4476a Mon Sep 17 00:00:00 2001 From: Michael Williamson Date: Tue, 26 Dec 2023 21:58:01 +0000 Subject: Support running wasm64 through node --- .../compiler/backends/wasm/WasmTarget.java | 27 +++++++++++++++++++--- .../compiler/backends/wasm/PatioToWasmTests.java | 2 +- .../compiler/backends/wasm/Wasm32ExampleTests.java | 2 +- .../compiler/backends/wasm/Wasm64ExampleTests.java | 2 +- .../compiler/backends/wasm/WasmTesting.java | 18 +++++++++------ 5 files changed, 38 insertions(+), 13 deletions(-) (limited to 'src') diff --git a/src/main/java/org/shedlang/compiler/backends/wasm/WasmTarget.java b/src/main/java/org/shedlang/compiler/backends/wasm/WasmTarget.java index cee2e24b..b1805f5a 100644 --- a/src/main/java/org/shedlang/compiler/backends/wasm/WasmTarget.java +++ b/src/main/java/org/shedlang/compiler/backends/wasm/WasmTarget.java @@ -6,27 +6,44 @@ import org.shedlang.compiler.backends.wasm.structure.ast.types.WasmValueType; import java.util.List; public enum WasmTarget { - WASM32("wasm32", WasmIndexType.I32, WasmValueType.I32, List.of(), List.of()), - WASM64("wasm64", WasmIndexType.I64, WasmValueType.I64, List.of("-mwasm64"), List.of("--enable-memory64")); + WASM32( + "wasm32", + WasmIndexType.I32, + WasmValueType.I32, + List.of(), + List.of(), + List.of() + ), + WASM64( + "wasm64", + WasmIndexType.I64, + WasmValueType.I64, + List.of("-mwasm64"), + List.of("--enable-memory64"), + List.of("--experimental-wasm-memory64") + ); private final String targetName; private final WasmIndexType indexType; private final WasmValueType sizeT; private final List linkerFlags; private final List wabtFlags; + private final List nodeFlags; WasmTarget( String name, WasmIndexType indexType, WasmValueType sizeT, List linkerFlags, - List wabtFlags + List wabtFlags, + List nodeFlags ) { this.targetName = name; this.indexType = indexType; this.sizeT = sizeT; this.linkerFlags = linkerFlags; this.wabtFlags = wabtFlags; + this.nodeFlags = nodeFlags; } public String targetName() { @@ -60,4 +77,8 @@ public enum WasmTarget { public List wabtFlags() { return wabtFlags; } + + public List nodeFlags() { + return this.nodeFlags; + } } diff --git a/src/test/java/org/shedlang/compiler/backends/wasm/PatioToWasmTests.java b/src/test/java/org/shedlang/compiler/backends/wasm/PatioToWasmTests.java index 59c24bf7..d14cdedf 100644 --- a/src/test/java/org/shedlang/compiler/backends/wasm/PatioToWasmTests.java +++ b/src/test/java/org/shedlang/compiler/backends/wasm/PatioToWasmTests.java @@ -67,7 +67,7 @@ public class PatioToWasmTests extends PatioExampleTests { WasmBinaryFormatTesting.validate(executablePath, WasmTarget.WASM32); return TestProcessRunner.runCaptureOutput(Lists.concat( - WasmTesting.BINARY_RUNNER, + WasmTesting.binaryRunner(WasmTarget.WASM32), List.of( executablePath.toString() ) diff --git a/src/test/java/org/shedlang/compiler/backends/wasm/Wasm32ExampleTests.java b/src/test/java/org/shedlang/compiler/backends/wasm/Wasm32ExampleTests.java index fdf605ad..c7f2d0b5 100644 --- a/src/test/java/org/shedlang/compiler/backends/wasm/Wasm32ExampleTests.java +++ b/src/test/java/org/shedlang/compiler/backends/wasm/Wasm32ExampleTests.java @@ -13,7 +13,7 @@ public class Wasm32ExampleTests extends ExampleTests { @Override protected List binaryRunner() { - return WasmTesting.BINARY_RUNNER; + return WasmTesting.binaryRunner(WasmTarget.WASM32); } @Override diff --git a/src/test/java/org/shedlang/compiler/backends/wasm/Wasm64ExampleTests.java b/src/test/java/org/shedlang/compiler/backends/wasm/Wasm64ExampleTests.java index 049ee7b5..72281622 100644 --- a/src/test/java/org/shedlang/compiler/backends/wasm/Wasm64ExampleTests.java +++ b/src/test/java/org/shedlang/compiler/backends/wasm/Wasm64ExampleTests.java @@ -13,7 +13,7 @@ public class Wasm64ExampleTests extends ExampleTests { @Override protected List binaryRunner() { - return WasmTesting.BINARY_RUNNER; + return WasmTesting.binaryRunner(WasmTarget.WASM64); } @Override diff --git a/src/test/java/org/shedlang/compiler/backends/wasm/WasmTesting.java b/src/test/java/org/shedlang/compiler/backends/wasm/WasmTesting.java index 5de7e949..b68ef0bc 100644 --- a/src/test/java/org/shedlang/compiler/backends/wasm/WasmTesting.java +++ b/src/test/java/org/shedlang/compiler/backends/wasm/WasmTesting.java @@ -1,6 +1,7 @@ package org.shedlang.compiler.backends.wasm; import org.shedlang.compiler.filesystem.ShedCompilerFiles; +import org.shedlang.compiler.util.P; import java.util.List; @@ -8,11 +9,14 @@ public class WasmTesting { private WasmTesting() { } - public static final List BINARY_RUNNER = List.of( - "node", - "--experimental-wasi-unstable-preview1", - "--experimental-wasm-eh", - "--no-warnings=ExperimentalWarning", - ShedCompilerFiles.getRoot().resolve("run-wasm.js").toString() - ); + public static List binaryRunner(WasmTarget target) { + return P.vector( + "node", + "--experimental-wasi-unstable-preview1", + "--experimental-wasm-eh", + "--no-warnings=ExperimentalWarning" + ).plusAll(target.nodeFlags()).plus( + ShedCompilerFiles.getRoot().resolve("run-wasm.js").toString() + ); + } } -- cgit v1.2.3