Skip to content

Commit

Permalink
Merge pull request #3210 from andreaTP/bump-chicory
Browse files Browse the repository at this point in the history 
Bump Chicory to 1.0.0-M1
  • Loading branch information
@kddnewton
kddnewton authored Nov 4, 2024
2 parents e54580a + 6f07f7d commit 0e0ae6f
Show file tree
Hide file tree
Showing 2 changed files with 48 additions and 23 deletions.
18 changes: 17 additions & 1 deletion java-wasm/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -15,14 +15,30 @@
<maven.compiler.source>11</maven.compiler.source>
<maven.compiler.target>11</maven.compiler.target>

<chicory.version>1.0.0-M1</chicory.version>
<junit.version>5.11.3</junit.version>
</properties>

<dependencyManagement>
<dependencies>
<dependency>
<groupId>com.dylibso.chicory</groupId>
<artifactId>bom</artifactId>
<version>${chicory.version}</version>
<type>pom</type>
<scope>import</scope>
</dependency>
</dependencies>
</dependencyManagement>

<dependencies>
<dependency>
<groupId>com.dylibso.chicory</groupId>
<artifactId>runtime</artifactId>
<version>0.0.12</version>
</dependency>
<dependency>
<groupId>com.dylibso.chicory</groupId>
<artifactId>wasi</artifactId>
</dependency>
<dependency>
<groupId>org.junit.jupiter</groupId>
Expand Down
53 changes: 31 additions & 22 deletions java-wasm/src/test/java/org/prism/DummyTest.java
View file
Original file line number Diff line number Diff line change
@@ -1,13 +1,14 @@
package org.prism;

import com.dylibso.chicory.runtime.HostImports;
import com.dylibso.chicory.runtime.Module;
import com.dylibso.chicory.runtime.ImportValues;
import com.dylibso.chicory.runtime.Instance;
import com.dylibso.chicory.wasi.WasiOptions;
import com.dylibso.chicory.wasi.WasiPreview1;
import com.dylibso.chicory.wasm.Parser;
import com.dylibso.chicory.wasm.types.Value;
import org.junit.jupiter.api.Test;

import java.io.File;
import java.nio.charset.StandardCharsets;
import java.util.Arrays;
import java.util.EnumSet;

import static org.junit.jupiter.api.Assertions.assertEquals;
Expand All @@ -17,7 +18,11 @@ public class DummyTest {

@Test
public void test1() {
var wasmPrism = Module.builder("prism.wasm").build().instantiate();
WasiOptions wasiOpts = WasiOptions.builder().build();
WasiPreview1 wasi = WasiPreview1.builder().withOptions(wasiOpts).build();
var wasmPrism = Instance.builder(Parser.parse(DummyTest.class.getResourceAsStream("/prism.wasm")))
.withImportValues(ImportValues.builder().addFunction(wasi.toHostFunctions()).build())
.build();
var memory = wasmPrism.memory();
var calloc = wasmPrism.export("calloc");
var pmSerializeParse = wasmPrism.export("pm_serialize_parse");
Expand All @@ -30,8 +35,8 @@ public void test1() {
var source = "1 + 1";
var sourceBytes = source.getBytes(StandardCharsets.US_ASCII);

var sourcePointer = calloc.apply(Value.i32(1), Value.i32(source.length()));
memory.writeString(sourcePointer[0].asInt(), source);
var sourcePointer = calloc.apply(1, source.length());
memory.writeString((int) sourcePointer[0], source);

var packedOptions = ParsingOptions.serialize(
new byte[] {},
Expand All @@ -46,18 +51,18 @@ public void test1() {
new byte[][][] {}
);

var optionsPointer = calloc.apply(Value.i32(1), Value.i32(packedOptions.length));
memory.write(optionsPointer[0].asInt(), packedOptions);
var optionsPointer = calloc.apply(1, packedOptions.length);
memory.write((int) optionsPointer[0], packedOptions);

var bufferPointer = calloc.apply(pmBufferSizeof.apply()[0], Value.i32(1));
var bufferPointer = calloc.apply(pmBufferSizeof.apply()[0], 1);
pmBufferInit.apply(bufferPointer);

pmSerializeParse.apply(
bufferPointer[0], sourcePointer[0], Value.i32(source.length()), optionsPointer[0]);
bufferPointer[0], sourcePointer[0], source.length(), optionsPointer[0]);

var result = memory.readBytes(
pmBufferValue.apply(bufferPointer[0])[0].asInt(),
pmBufferLength.apply(bufferPointer[0])[0].asInt());
(int) pmBufferValue.apply(bufferPointer[0])[0],
(int) pmBufferLength.apply(bufferPointer[0])[0]);

System.out.println("RESULT: " + new String(result));

Expand All @@ -71,7 +76,11 @@ public void test1() {

@Test
public void test2() {
var wasmPrism = Module.builder("prism.wasm").build().instantiate();
WasiOptions wasiOpts = WasiOptions.builder().build();
WasiPreview1 wasi = WasiPreview1.builder().withOptions(wasiOpts).build();
var wasmPrism = Instance.builder(Parser.parse(DummyTest.class.getResourceAsStream("/prism.wasm")))
.withImportValues(ImportValues.builder().addFunction(wasi.toHostFunctions()).build())
.build();
var memory = wasmPrism.memory();
var calloc = wasmPrism.export("calloc");
var pmSerializeParse = wasmPrism.export("pm_serialize_parse");
Expand All @@ -84,8 +93,8 @@ public void test2() {
var source = "puts \"h\ne\nl\nl\no\n\"";
var sourceBytes = source.getBytes(StandardCharsets.US_ASCII);

var sourcePointer = calloc.apply(Value.i32(1), Value.i32(source.length()));
memory.writeString(sourcePointer[0].asInt(), source);
var sourcePointer = calloc.apply(1, source.length());
memory.writeString((int) sourcePointer[0], source);

var packedOptions = ParsingOptions.serialize(
new byte[] {},
Expand All @@ -100,18 +109,18 @@ public void test2() {
new byte[][][] {}
);

var optionsPointer = calloc.apply(Value.i32(1), Value.i32(packedOptions.length));
memory.write(optionsPointer[0].asInt(), packedOptions);
var optionsPointer = calloc.apply(1, packedOptions.length);
memory.write((int) optionsPointer[0], packedOptions);

var bufferPointer = calloc.apply(pmBufferSizeof.apply()[0], Value.i32(1));
var bufferPointer = calloc.apply(pmBufferSizeof.apply()[0], 1);
pmBufferInit.apply(bufferPointer);

pmSerializeParse.apply(
bufferPointer[0], sourcePointer[0], Value.i32(source.length()), optionsPointer[0]);
bufferPointer[0], sourcePointer[0], source.length(), optionsPointer[0]);

var result = memory.readBytes(
pmBufferValue.apply(bufferPointer[0])[0].asInt(),
pmBufferLength.apply(bufferPointer[0])[0].asInt());
(int) pmBufferValue.apply(bufferPointer[0])[0],
(int) pmBufferLength.apply(bufferPointer[0])[0]);

System.out.println("RESULT: " + new String(result));

Expand Down

0 comments on commit 0e0ae6f

Please sign in to comment.