Skip to content

Commit

Permalink
[GR-38047] Introduced compact and extended extra data array format.
Browse files Browse the repository at this point in the history 
PullRequest: graal/11816
  • Loading branch information
@flohuemer
flohuemer committed Jun 17, 2022
2 parents 50c4a7b + b7a0a29 commit e827e79
Show file tree
Hide file tree
Showing 29 changed files with 2,227 additions and 765 deletions.
2 changes: 2 additions & 0 deletions wasm/src/org.graalvm.wasm.test/src/org/graalvm/wasm/test/WasmTestSuite.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -40,6 +40,7 @@
*/
package org.graalvm.wasm.test;

import org.graalvm.wasm.test.suites.ExtraDataSuite;
import org.graalvm.wasm.test.suites.WasmImplementationLimitationsSuite;
import org.graalvm.wasm.test.suites.arithmetic.Float32Suite;
import org.graalvm.wasm.test.suites.arithmetic.Float64Suite;
Expand Down Expand Up @@ -83,6 +84,7 @@
ValidationSuite.class,
WasmLateLinkingSuite.class,
WasmImplementationLimitationsSuite.class,
ExtraDataSuite.class
})
public class WasmTestSuite {
@Test
Expand Down
238 changes: 238 additions & 0 deletions wasm/src/org.graalvm.wasm.test/src/org/graalvm/wasm/test/suites/ExtraDataSuite.java
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,238 @@
/*
* Copyright (c) 2022, 2022, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* The Universal Permissive License (UPL), Version 1.0
*
* Subject to the condition set forth below, permission is hereby granted to any
* person obtaining a copy of this software, associated documentation and/or
* data (collectively the "Software"), free of charge and under any and all
* copyright rights in the Software, and any and all patent rights owned or
* freely licensable by each licensor hereunder covering either (i) the
* unmodified Software as contributed to or provided by such licensor, or (ii)
* the Larger Works (as defined below), to deal in both
*
* (a) the Software, and
*
* (b) any piece of software and/or hardware listed in the lrgrwrks.txt file if
* one is included with the Software each a "Larger Work" to which the Software
* is contributed by such licensors),
*
* without restriction, including without limitation the rights to copy, create
* derivative works of, display, perform, and distribute the Software and make,
* use, sell, offer for sale, import, export, have made, and have sold the
* Software and the Larger Work(s), and to sublicense the foregoing rights on
* either these or other terms.
*
* This license is subject to the following condition:
*
* The above copyright notice and either this complete permission notice or at a
* minimum a reference to the UPL must be included in all copies or substantial
* portions of the Software.
*
* THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
* IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
* FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
* AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
* LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
* OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
* SOFTWARE.
*/

package org.graalvm.wasm.test.suites;

import org.graalvm.wasm.WasmType;
import org.graalvm.wasm.parser.validation.ParserState;
import org.junit.Assert;
import org.junit.Test;

public class ExtraDataSuite {
private static int compactTargetInfo(int byteCodeTarget, int extraDataTarget) {
int e = Short.toUnsignedInt((short) extraDataTarget);
int b = Short.toUnsignedInt((short) byteCodeTarget);
return ((e << 16) + b) & 0x7fff_ffff;
}

private static int extendedTargetInfo(int extraDataTarget) {
return 0x8000_0000 | extraDataTarget;
}

@Test
public void testCompactByteCodeTargetMaxBackJump() {
ParserState state = new ParserState();
state.enterBlock(WasmType.VOID_TYPE);
state.enterLoop(WasmType.VOID_TYPE, 10);
state.addConditionalBranch(0, 32778);
state.exit(32779);
state.exit(32780);

final int[] expected = {compactTargetInfo(-32768, 0), 0};
Assert.assertArrayEquals(expected, state.extraData());
}

@Test
public void testCompactByteCodeTargetMaxForwardJump() {
ParserState state = new ParserState();
state.enterBlock(WasmType.VOID_TYPE);
state.enterBlock(WasmType.VOID_TYPE);
state.addConditionalBranch(0, 10);
state.exit(32777);
state.exit(32778);
final int[] expected = {compactTargetInfo(32767, 2), 0};
Assert.assertArrayEquals(expected, state.extraData());
}

@Test
public void testExtendedByteCodeTargetMinBackJump() {
ParserState state = new ParserState();
state.enterBlock(WasmType.VOID_TYPE);
state.enterLoop(WasmType.VOID_TYPE, 10);
state.addConditionalBranch(0, 32779);
state.exit(32780);
state.exit(32781);
final int[] expected = {extendedTargetInfo(0), -32769, 0, 0, 0};
Assert.assertArrayEquals(expected, state.extraData());
}

@Test
public void testExtendedByteCodeTargetMinForwardJump() {
ParserState state = new ParserState();
state.enterBlock(WasmType.VOID_TYPE);
state.enterBlock(WasmType.VOID_TYPE);
state.addConditionalBranch(0, 10);
state.exit(32778);
state.exit(32779);
final int[] expected = {extendedTargetInfo(5), 32768, 0, 0, 0};
Assert.assertArrayEquals(expected, state.extraData());
}

@Test
public void testCompactExtraDataTargetMaxBackJump() {
ParserState state = new ParserState();
state.enterBlock(WasmType.VOID_TYPE);
state.enterLoop(WasmType.VOID_TYPE, 0);
for (int i = 0; i < 16384; i++) {
state.addCall(0);
}
state.addConditionalBranch(0, 16385);
state.exit(16386);
state.exit(16387);
final int[] expected = new int[16386];
expected[16384] = compactTargetInfo(-16385, -16384);
Assert.assertArrayEquals(expected, state.extraData());
}

@Test
public void testCompactExtraDataTargetMaxForwardJump() {
ParserState state = new ParserState();
state.enterBlock(WasmType.VOID_TYPE);
state.enterBlock(WasmType.VOID_TYPE);
state.addConditionalBranch(0, 0);
for (int i = 0; i < 16381; i++) {
state.addCall(0);
}
state.exit(16382);
state.exit(16383);
final int[] expected = new int[16383];
expected[0] = compactTargetInfo(16382, 16383);
Assert.assertArrayEquals(expected, state.extraData());
}

@Test
public void testExtendedExtraDataTargetMinBackwardJump() {
ParserState state = new ParserState();
state.enterBlock(WasmType.VOID_TYPE);
state.enterLoop(WasmType.VOID_TYPE, 0);
for (int i = 0; i < 16385; i++) {
state.addCall(0);
}
state.addConditionalBranch(0, 16386);
state.exit(16387);
state.exit(16388);
final int[] expected = new int[16390];
expected[16385] = extendedTargetInfo(-16385);
expected[16386] = -16386;
Assert.assertArrayEquals(expected, state.extraData());
}

@Test
public void testExtendedExtraDataTargetMinForwardJump() {
ParserState state = new ParserState();
state.enterBlock(WasmType.VOID_TYPE);
state.enterBlock(WasmType.VOID_TYPE);
state.addConditionalBranch(0, 0);
for (int i = 0; i < 16382; i++) {
state.addCall(0);
}
state.exit(16383);
state.exit(16384);
final int[] expected = new int[16387];
expected[0] = extendedTargetInfo(16387);
expected[1] = 16383;
Assert.assertArrayEquals(expected, state.extraData());
}

@Test
public void testCompactReturnLength() {
ParserState state = new ParserState();
state.enterBlock(WasmType.VOID_TYPE);
state.enterBlock(WasmType.I32_TYPE);
state.push(WasmType.I32_TYPE);
state.addConditionalBranch(0, 10);
state.exit(20);
state.pop();
state.exit(21);
final int[] expected = {compactTargetInfo(10, 2), 1 << 24};
Assert.assertArrayEquals(expected, state.extraData());
}

@Test
public void testCompactStackSize() {
ParserState state = new ParserState();
state.enterBlock(WasmType.VOID_TYPE);
state.push(WasmType.I32_TYPE);
state.enterBlock(WasmType.VOID_TYPE);
state.addConditionalBranch(0, 10);
state.exit(20);
state.pop();
state.exit(21);
final int[] expected = {compactTargetInfo(10, 2), 1 << 16};
Assert.assertArrayEquals(expected, state.extraData());
}

@Test
public void testCompactStackSizeMax() {
ParserState state = new ParserState();
state.enterBlock(WasmType.VOID_TYPE);
for (int i = 0; i < 255; i++) {
state.push(WasmType.I32_TYPE);
}
state.enterBlock(WasmType.VOID_TYPE);
state.addConditionalBranch(0, 10);
state.exit(20);
for (int i = 0; i < 255; i++) {
state.pop();
}
state.exit(21);
final int[] expected = {compactTargetInfo(10, 2), 255 << 16};
Assert.assertArrayEquals(expected, state.extraData());
}

@Test
public void testExtendedStackSizeMin() {
ParserState state = new ParserState();
state.enterBlock(WasmType.VOID_TYPE);
for (int i = 0; i < 256; i++) {
state.push(WasmType.I32_TYPE);
}
state.enterBlock(WasmType.VOID_TYPE);
state.addConditionalBranch(0, 10);
state.exit(20);
for (int i = 0; i < 256; i++) {
state.pop();
}
state.exit(21);
final int[] expected = {extendedTargetInfo(5), 10, 0, 256, 0};
Assert.assertArrayEquals(expected, state.extraData());
}
}
12 changes: 8 additions & 4 deletions wasm/src/org.graalvm.wasm/src/org/graalvm/wasm/BinaryParser.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -435,10 +435,11 @@ private CodeEntry readFunction(int functionIndex, byte[] locals, byte returnType
break;
}
case Instructions.IF: {
final int branchOffset = offset;
state.popChecked(I32_TYPE); // condition
final byte ifReturnType = readBlockType();

state.enterIf(ifReturnType);
state.enterIf(ifReturnType, branchOffset);
break;
}
case Instructions.END: {
Expand All @@ -450,21 +451,24 @@ private CodeEntry readFunction(int functionIndex, byte[] locals, byte returnType
break;
}
case Instructions.BR: {
final int branchOffset = offset;
final int branchLabel = readTargetOffset();
state.addUnconditionalBranch(branchLabel);
state.addUnconditionalBranch(branchLabel, branchOffset);

// This instruction is stack-polymorphic
state.setUnreachable();
break;
}
case Instructions.BR_IF: {
final int branchOffset = offset;
final int branchLabel = readTargetOffset();
state.popChecked(I32_TYPE); // condition
state.addConditionalBranch(branchLabel);
state.addConditionalBranch(branchLabel, branchOffset);

break;
}
case Instructions.BR_TABLE: {
final int branchOffset = offset;
state.popChecked(I32_TYPE); // index
final int length = readLength();

Expand All @@ -473,7 +477,7 @@ private CodeEntry readFunction(int functionIndex, byte[] locals, byte returnType
final int branchLabel = readTargetOffset();
branchTable[i] = branchLabel;
}
state.addBranchTable(branchTable);
state.addBranchTable(branchTable, branchOffset);

// This instruction is stack-polymorphic
state.setUnreachable();
Expand Down
Loading

0 comments on commit e827e79

Please sign in to comment.