Skip to content
Draft
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion README.md
Original file line number Diff line number Diff line change
Expand Up @@ -74,7 +74,7 @@ If you have an interest in working on any of these please reach out in Zulip!
* [x] Decoupled interpreter and compiler "engines"
* [x] Build-time compiler passes all the same specs as interpreter
* [x] WASIp1 Support (including test gen)
* [x] SIMD Support
* [x] SIMD Support (interpreter and compiler; compare with a build without SIMD, see [SIMD](https://endive.run/docs/execution#simd))
* [x] Tail Call (interpreter and compiler)
* [x] Compiler out of experimental
* [x] Exception Handling
Expand Down
116 changes: 58 additions & 58 deletions compiler-tests/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -279,6 +279,64 @@
<wast>ref_null.wast</wast>
<wast>return.wast</wast>
<wast>select.wast</wast>
<wast>simd_address.wast</wast>
<wast>simd_align.wast</wast>
<wast>simd_bit_shift.wast</wast>
<wast>simd_bitwise.wast</wast>
<wast>simd_boolean.wast</wast>
<wast>simd_const.wast</wast>
<wast>simd_conversions.wast</wast>
<wast>simd_f32x4.wast</wast>
<wast>simd_f32x4_arith.wast</wast>
<wast>simd_f32x4_cmp.wast</wast>
<wast>simd_f32x4_pmin_pmax.wast</wast>
<wast>simd_f32x4_rounding.wast</wast>
<wast>simd_f64x2.wast</wast>
<wast>simd_f64x2_arith.wast</wast>
<wast>simd_f64x2_cmp.wast</wast>
<wast>simd_f64x2_pmin_pmax.wast</wast>
<wast>simd_f64x2_rounding.wast</wast>
<wast>simd_i16x8_arith.wast</wast>
<wast>simd_i16x8_arith2.wast</wast>
<wast>simd_i16x8_cmp.wast</wast>
<wast>simd_i16x8_extadd_pairwise_i8x16.wast</wast>
<wast>simd_i16x8_extmul_i8x16.wast</wast>
<wast>simd_i16x8_q15mulr_sat_s.wast</wast>
<wast>simd_i16x8_sat_arith.wast</wast>
<wast>simd_i32x4_arith.wast</wast>
<wast>simd_i32x4_arith2.wast</wast>
<wast>simd_i32x4_cmp.wast</wast>
<wast>simd_i32x4_dot_i16x8.wast</wast>
<wast>simd_i32x4_extadd_pairwise_i16x8.wast</wast>
<wast>simd_i32x4_extmul_i16x8.wast</wast>
<wast>simd_i32x4_trunc_sat_f32x4.wast</wast>
<wast>simd_i32x4_trunc_sat_f64x2.wast</wast>
<wast>simd_i64x2_arith.wast</wast>
<wast>simd_i64x2_arith2.wast</wast>
<wast>simd_i64x2_cmp.wast</wast>
<wast>simd_i64x2_extmul_i32x4.wast</wast>
<wast>simd_i8x16_arith.wast</wast>
<wast>simd_i8x16_arith2.wast</wast>
<wast>simd_i8x16_cmp.wast</wast>
<wast>simd_i8x16_sat_arith.wast</wast>
<wast>simd_int_to_int_extend.wast</wast>
<wast>simd_lane.wast</wast>
<wast>simd_linking.wast</wast>
<wast>simd_load.wast</wast>
<wast>simd_load16_lane.wast</wast>
<wast>simd_load32_lane.wast</wast>
<wast>simd_load64_lane.wast</wast>
<wast>simd_load8_lane.wast</wast>
<wast>simd_load_extend.wast</wast>
<wast>simd_load_splat.wast</wast>
<wast>simd_load_zero.wast</wast>
<wast>simd_select.wast</wast>
<wast>simd_splat.wast</wast>
<wast>simd_store.wast</wast>
<wast>simd_store16_lane.wast</wast>
<wast>simd_store32_lane.wast</wast>
<wast>simd_store64_lane.wast</wast>
<wast>simd_store8_lane.wast</wast>
<wast>skip-stack-guard-page.wast</wast>
<wast>stack.wast</wast>
<wast>start.wast</wast>
Expand Down Expand Up @@ -387,64 +445,6 @@
<excludedWasts>
<!-- obsolete-keywords is only stressing the wat parser -->
<wast>obsolete-keywords.wast</wast>
<wast>simd_address.wast</wast>
<wast>simd_align.wast</wast>
<wast>simd_bit_shift.wast</wast>
<wast>simd_bitwise.wast</wast>
<wast>simd_boolean.wast</wast>
<wast>simd_const.wast</wast>
<wast>simd_conversions.wast</wast>
<wast>simd_f32x4.wast</wast>
<wast>simd_f32x4_arith.wast</wast>
<wast>simd_f32x4_cmp.wast</wast>
<wast>simd_f32x4_pmin_pmax.wast</wast>
<wast>simd_f32x4_rounding.wast</wast>
<wast>simd_f64x2.wast</wast>
<wast>simd_f64x2_arith.wast</wast>
<wast>simd_f64x2_cmp.wast</wast>
<wast>simd_f64x2_pmin_pmax.wast</wast>
<wast>simd_f64x2_rounding.wast</wast>
<wast>simd_i16x8_arith.wast</wast>
<wast>simd_i16x8_arith2.wast</wast>
<wast>simd_i16x8_cmp.wast</wast>
<wast>simd_i16x8_extadd_pairwise_i8x16.wast</wast>
<wast>simd_i16x8_extmul_i8x16.wast</wast>
<wast>simd_i16x8_q15mulr_sat_s.wast</wast>
<wast>simd_i16x8_sat_arith.wast</wast>
<wast>simd_i32x4_arith.wast</wast>
<wast>simd_i32x4_arith2.wast</wast>
<wast>simd_i32x4_cmp.wast</wast>
<wast>simd_i32x4_dot_i16x8.wast</wast>
<wast>simd_i32x4_extadd_pairwise_i16x8.wast</wast>
<wast>simd_i32x4_extmul_i16x8.wast</wast>
<wast>simd_i32x4_trunc_sat_f32x4.wast</wast>
<wast>simd_i32x4_trunc_sat_f64x2.wast</wast>
<wast>simd_i64x2_arith.wast</wast>
<wast>simd_i64x2_arith2.wast</wast>
<wast>simd_i64x2_cmp.wast</wast>
<wast>simd_i64x2_extmul_i32x4.wast</wast>
<wast>simd_i8x16_arith.wast</wast>
<wast>simd_i8x16_arith2.wast</wast>
<wast>simd_i8x16_cmp.wast</wast>
<wast>simd_i8x16_sat_arith.wast</wast>
<wast>simd_int_to_int_extend.wast</wast>
<wast>simd_lane.wast</wast>
<wast>simd_linking.wast</wast>
<wast>simd_load.wast</wast>
<wast>simd_load16_lane.wast</wast>
<wast>simd_load32_lane.wast</wast>
<wast>simd_load64_lane.wast</wast>
<wast>simd_load8_lane.wast</wast>
<wast>simd_load_extend.wast</wast>
<wast>simd_load_splat.wast</wast>
<wast>simd_load_zero.wast</wast>
<wast>simd_select.wast</wast>
<wast>simd_splat.wast</wast>
<wast>simd_store.wast</wast>
<wast>simd_store16_lane.wast</wast>
<wast>simd_store32_lane.wast</wast>
<wast>simd_store64_lane.wast</wast>
<wast>simd_store8_lane.wast</wast>
</excludedWasts>
</configuration>
<executions>
Expand Down
Original file line number Diff line number Diff line change
@@ -0,0 +1,151 @@
package run.endive.testing;

import static org.junit.jupiter.api.Assertions.assertArrayEquals;
import static org.junit.jupiter.api.Assertions.assertFalse;
import static org.junit.jupiter.api.Assertions.assertTrue;

import java.util.ArrayList;
import java.util.List;
import java.util.Set;
import java.util.function.Function;
import org.junit.jupiter.api.Test;
import org.junit.jupiter.params.ParameterizedTest;
import org.junit.jupiter.params.provider.ValueSource;
import org.objectweb.asm.ClassReader;
import org.objectweb.asm.ClassVisitor;
import org.objectweb.asm.MethodVisitor;
import org.objectweb.asm.Opcodes;
import run.endive.compiler.InterpreterFallback;
import run.endive.compiler.MachineFactoryCompiler;
import run.endive.compiler.internal.Compiler;
import run.endive.corpus.CorpusResources;
import run.endive.corpus.WatGenerator;
import run.endive.runtime.HostFunction;
import run.endive.runtime.ImportValues;
import run.endive.runtime.Instance;
import run.endive.runtime.Machine;
import run.endive.wabt.Wat2Wasm;
import run.endive.wasm.Parser;
import run.endive.wasm.WasmModule;
import run.endive.wasm.types.FunctionType;
import run.endive.wasm.types.ValType;

/** v128 values across calls, results, globals, exceptions and method splitting. */
public class SimdBoundaryTest {

private static final WasmModule MODULE =
Parser.parse(CorpusResources.getResource("compiled/simd_boundary.wat.wasm"));

private static final long A = 0x0102030405060708L;
private static final long B = -0x0111111111111111L;

private static Instance instance(Function<Instance, Machine> machine) {
var hostAdd =
new HostFunction(
"env",
"host_add",
FunctionType.of(List.of(ValType.V128, ValType.V128), List.of(ValType.V128)),
(inst, args) -> new long[] {args[0] + args[2], args[1] + args[3]});
var builder =
Instance.builder(MODULE)
.withImportValues(ImportValues.builder().addFunction(hostAdd).build());
if (machine != null) {
builder.withMachineFactory(machine);
}
return builder.build();
}

private static void assertSameEverywhere(String export, long... args) {
var expected = instance(null).export(export).apply(args);
var compiled = instance(MachineFactoryCompiler::compile).export(export).apply(args);
assertArrayEquals(expected, compiled, export);
// $add, $pair, $pair_ref, $thrower, $double and $tail_indirect on the interpreter
var mixed =
instance(
MachineFactoryCompiler.builder(MODULE)
.withInterpretedFunctions(Set.of(1, 3, 4, 6, 11, 13))
.compile())
.export(export)
.apply(args);
assertArrayEquals(expected, mixed, export);
}

@ParameterizedTest
@ValueSource(strings = {"calls", "multi", "throw_catch", "tail_calls"})
public void sameAsInterpreter(String export) {
assertSameEverywhere(export, A, B);
}

@ParameterizedTest
@ValueSource(ints = {0, 1, 2})
public void selectAndBrTable(int sel) {
assertSameEverywhere("select_br", A, B, sel);
}

@Test
public void expectedValues() {
var compiled = instance(MachineFactoryCompiler::compile);
assertArrayEquals(new long[] {3 * A, 3 * B}, compiled.export("calls").apply(A, B));
assertArrayEquals(new long[] {3 * A + 8, 3 * B + 3}, compiled.export("multi").apply(A, B));
assertArrayEquals(new long[] {A, B, 7}, compiled.export("throw_catch").apply(A, B));
assertArrayEquals(new long[] {16 * A, 16 * B}, compiled.export("tail_calls").apply(A, B));
assertArrayEquals(new long[] {B, A}, compiled.export("select_br").apply(A, B, 0));
assertArrayEquals(
new long[] {A + 100, B + 100}, compiled.export("select_br").apply(A, B, 1));
}

@ParameterizedTest
@ValueSource(booleans = {false, true})
public void splitFunction(boolean trampoline) {
var module = Parser.parse(Wat2Wasm.parse(WatGenerator.simdSplit(trampoline)));
var chunks = chunkDescriptors(module);
assertFalse(chunks.isEmpty());
// direct chunks take the parameters, a v128 as two longs; trampoline chunks the frame
var prefix = trampoline ? "([J" : "(IJJ";
assertTrue(chunks.stream().allMatch(d -> d.startsWith(prefix)), chunks::toString);
var machine =
MachineFactoryCompiler.builder(module)
.withInterpreterFallback(InterpreterFallback.FAIL)
.withMethodSplitting(true)
.compile();
var expected = Instance.builder(module).build().export("run").apply(0, A, B);
var actual =
Instance.builder(module)
.withMachineFactory(machine)
.build()
.export("run")
.apply(0, A, B);
assertArrayEquals(expected, actual);
}

private static List<String> chunkDescriptors(WasmModule module) {
var result =
Compiler.builder(module)
.withInterpreterFallback(InterpreterFallback.FAIL)
.withMethodSplitting(true)
.build()
.compile();
assertTrue(result.interpretedFunctions().isEmpty());
var descriptors = new ArrayList<String>();
for (byte[] bytes : result.classBytes().values()) {
new ClassReader(bytes)
.accept(
new ClassVisitor(Opcodes.ASM9) {
@Override
public MethodVisitor visitMethod(
int access,
String name,
String descriptor,
String signature,
String[] exceptions) {
if (name.startsWith("chunk")) {
descriptors.add(descriptor);
}
return null;
}
},
ClassReader.SKIP_CODE);
}
return descriptors;
}
}
Loading
Loading