From 46cfec1455e1e10cdef8ce30775053caef1471e7 Mon Sep 17 00:00:00 2001 From: andreatp Date: Thu, 4 Sep 2025 18:22:33 +0100 Subject: [PATCH 01/13] test on IBM Z and IBM Power --- .github/workflows/ci.yaml | 10 +++++++++- 1 file changed, 9 insertions(+), 1 deletion(-) diff --git a/.github/workflows/ci.yaml b/.github/workflows/ci.yaml index 48bc3b749..d88ee9d16 100644 --- a/.github/workflows/ci.yaml +++ b/.github/workflows/ci.yaml @@ -17,7 +17,15 @@ jobs: strategy: fail-fast: false matrix: - os: [ubuntu-latest, macos-latest, windows-latest, ubuntu-24.04-arm, windows-11-arm] + os: + - ubuntu-latest + - macos-latest + - windows-latest + - ubuntu-24.04-arm + - windows-11-arm + # Thanks to: https://github.com/IBM/actionspz + - ubuntu-24.04-ppc64le + - ubuntu-24.04-s390x version: [11, 17, 21] exclude: - os: windows-11-arm From 6bf74721f266c28393d4df8e93d57d390a04a614 Mon Sep 17 00:00:00 2001 From: andreatp Date: Fri, 5 Sep 2025 09:56:00 +0100 Subject: [PATCH 02/13] minor --- .github/workflows/ci.yaml | 1 + 1 file changed, 1 insertion(+) diff --git a/.github/workflows/ci.yaml b/.github/workflows/ci.yaml index d88ee9d16..ce85bec23 100644 --- a/.github/workflows/ci.yaml +++ b/.github/workflows/ci.yaml @@ -23,6 +23,7 @@ jobs: - windows-latest - ubuntu-24.04-arm - windows-11-arm + # Thanks to: https://github.com/IBM/actionspz - ubuntu-24.04-ppc64le - ubuntu-24.04-s390x From 2c819d6e20135e0867b34feddb197681f6b5e3f7 Mon Sep 17 00:00:00 2001 From: andreatp Date: Fri, 5 Sep 2025 10:01:10 +0100 Subject: [PATCH 03/13] separate job --- .github/workflows/ci.yaml | 4 --- .github/workflows/ibm-ci.yaml | 50 +++++++++++++++++++++++++++++++++++ 2 files changed, 50 insertions(+), 4 deletions(-) create mode 100644 .github/workflows/ibm-ci.yaml diff --git a/.github/workflows/ci.yaml b/.github/workflows/ci.yaml index ce85bec23..1ed8bc033 100644 --- a/.github/workflows/ci.yaml +++ b/.github/workflows/ci.yaml @@ -23,10 +23,6 @@ jobs: - windows-latest - ubuntu-24.04-arm - windows-11-arm - - # Thanks to: https://github.com/IBM/actionspz - - ubuntu-24.04-ppc64le - - ubuntu-24.04-s390x version: [11, 17, 21] exclude: - os: windows-11-arm diff --git a/.github/workflows/ibm-ci.yaml b/.github/workflows/ibm-ci.yaml new file mode 100644 index 000000000..b6e5c13f6 --- /dev/null +++ b/.github/workflows/ibm-ci.yaml @@ -0,0 +1,50 @@ +name: CI + +on: + push: + branches: [ main ] + pull_request: + +permissions: + contents: read + checks: write + +jobs: + ci: + name: CI + runs-on: ${{ matrix.os }} + continue-on-error: true + strategy: + fail-fast: false + matrix: + # Thanks to: https://github.com/IBM/actionspz + os: + - ubuntu-24.04-ppc64le + - ubuntu-24.04-s390x + version: [11, 17, 21] + steps: + - name: Checkout sources + uses: actions/checkout@v5 + - name: Checkout testsuite + uses: actions/checkout@v5 + with: + repository: WebAssembly/testsuite + path: testsuite + # The ref needs to stay in sync with the default value in test-gen-plugin + ref: 88e97b0f742f4c3ee01fea683da130f344dd7b02 + - name: Checkout wasi-testsuite + uses: actions/checkout@v5 + with: + repository: WebAssembly/wasi-testsuite + path: wasi-testsuite + ref: prod/testsuite-base + - name: Set up Java + uses: actions/setup-java@v5 + with: + distribution: 'semeru' + java-version: '${{ matrix.version }}' + cache: maven + - name: Test Java and Check Style + run: mvn -B spotless:check clean install + env: + MAVEN_OPTS: "-ea" From d450265a73cc6bd8816774a8e16a26e4283e5e6d Mon Sep 17 00:00:00 2001 From: andreatp Date: Fri, 5 Sep 2025 17:26:58 +0100 Subject: [PATCH 04/13] debug --- .github/workflows/ibm-ci.yaml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/ibm-ci.yaml b/.github/workflows/ibm-ci.yaml index b6e5c13f6..0a4f3b16f 100644 --- a/.github/workflows/ibm-ci.yaml +++ b/.github/workflows/ibm-ci.yaml @@ -41,10 +41,10 @@ jobs: - name: Set up Java uses: actions/setup-java@v5 with: - distribution: 'semeru' + distribution: 'temurin' java-version: '${{ matrix.version }}' cache: maven - name: Test Java and Check Style - run: mvn -B spotless:check clean install + run: mvn -B spotless:check clean install -X env: MAVEN_OPTS: "-ea" From 51a1363df2f5fda61221dedc651670ab04f15731 Mon Sep 17 00:00:00 2001 From: andreatp Date: Fri, 5 Sep 2025 19:45:21 +0100 Subject: [PATCH 05/13] more --- .github/workflows/ibm-ci.yaml | 15 +++++++++------ 1 file changed, 9 insertions(+), 6 deletions(-) diff --git a/.github/workflows/ibm-ci.yaml b/.github/workflows/ibm-ci.yaml index 0a4f3b16f..44a11ced3 100644 --- a/.github/workflows/ibm-ci.yaml +++ b/.github/workflows/ibm-ci.yaml @@ -10,17 +10,19 @@ permissions: checks: write jobs: - ci: - name: CI + ibm-ci: + name: IBM CI runs-on: ${{ matrix.os }} continue-on-error: true strategy: fail-fast: false matrix: # Thanks to: https://github.com/IBM/actionspz - os: - - ubuntu-24.04-ppc64le - - ubuntu-24.04-s390x + include: + - os: ubuntu-24.04-ppc64le + arch: ppc64le + - os: ubuntu-24.04-s390x + arch: s390x version: [11, 17, 21] steps: - name: Checkout sources @@ -41,8 +43,9 @@ jobs: - name: Set up Java uses: actions/setup-java@v5 with: - distribution: 'temurin' + distribution: 'semeru' java-version: '${{ matrix.version }}' + architecture: '$${{ matrix.arch }}' cache: maven - name: Test Java and Check Style run: mvn -B spotless:check clean install -X From 8b8862ac109d9980e333ae1f0fb79778117d7966 Mon Sep 17 00:00:00 2001 From: andreatp Date: Fri, 5 Sep 2025 19:51:59 +0100 Subject: [PATCH 06/13] try --- .github/workflows/ibm-ci.yaml | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/.github/workflows/ibm-ci.yaml b/.github/workflows/ibm-ci.yaml index 44a11ced3..537397fa4 100644 --- a/.github/workflows/ibm-ci.yaml +++ b/.github/workflows/ibm-ci.yaml @@ -18,6 +18,8 @@ jobs: fail-fast: false matrix: # Thanks to: https://github.com/IBM/actionspz + os: [ubuntu-24.04-ppc64le, ubuntu-24.04-s390x] + arch: [ppc64le, s390x] include: - os: ubuntu-24.04-ppc64le arch: ppc64le @@ -43,9 +45,8 @@ jobs: - name: Set up Java uses: actions/setup-java@v5 with: - distribution: 'semeru' + distribution: 'temurin' java-version: '${{ matrix.version }}' - architecture: '$${{ matrix.arch }}' cache: maven - name: Test Java and Check Style run: mvn -B spotless:check clean install -X From 3ae00187bb87863f88c584d21baa6ac71d8d1d1f Mon Sep 17 00:00:00 2001 From: andreatp Date: Fri, 5 Sep 2025 19:53:44 +0100 Subject: [PATCH 07/13] try --- .github/workflows/ibm-ci.yaml | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/.github/workflows/ibm-ci.yaml b/.github/workflows/ibm-ci.yaml index 537397fa4..3f4f08848 100644 --- a/.github/workflows/ibm-ci.yaml +++ b/.github/workflows/ibm-ci.yaml @@ -18,8 +18,6 @@ jobs: fail-fast: false matrix: # Thanks to: https://github.com/IBM/actionspz - os: [ubuntu-24.04-ppc64le, ubuntu-24.04-s390x] - arch: [ppc64le, s390x] include: - os: ubuntu-24.04-ppc64le arch: ppc64le @@ -45,8 +43,9 @@ jobs: - name: Set up Java uses: actions/setup-java@v5 with: - distribution: 'temurin' + distribution: 'semeru' java-version: '${{ matrix.version }}' + architecture: '${{ matrix.arch }}' cache: maven - name: Test Java and Check Style run: mvn -B spotless:check clean install -X From 7e78806e2c7c3cb82686a020bf1fc083ad89cb79 Mon Sep 17 00:00:00 2001 From: andreatp Date: Fri, 5 Sep 2025 19:55:46 +0100 Subject: [PATCH 08/13] more fixes --- .github/workflows/ibm-ci.yaml | 1 + 1 file changed, 1 insertion(+) diff --git a/.github/workflows/ibm-ci.yaml b/.github/workflows/ibm-ci.yaml index 3f4f08848..ab8121855 100644 --- a/.github/workflows/ibm-ci.yaml +++ b/.github/workflows/ibm-ci.yaml @@ -18,6 +18,7 @@ jobs: fail-fast: false matrix: # Thanks to: https://github.com/IBM/actionspz + os: [ubuntu-24.04-ppc64le, ubuntu-24.04-s390x] include: - os: ubuntu-24.04-ppc64le arch: ppc64le From 9fc2d1a14650098f5f09965475f3603cf4edb602 Mon Sep 17 00:00:00 2001 From: andreatp Date: Mon, 8 Sep 2025 15:21:14 +0100 Subject: [PATCH 09/13] explicitly set the antrun plugin version --- pom.xml | 13 +++++++++++++ wasm-tools/pom.xml | 2 +- 2 files changed, 14 insertions(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index cf58aded9..dca95f405 100644 --- a/pom.xml +++ b/pom.xml @@ -96,6 +96,7 @@ 0.21.0 2.0.2 0.1.0 + 3.1.0 @@ -292,6 +293,18 @@ ${maven-plugin-annotations.version} provided + + org.codehaus.mojo + wagon-maven-plugin + ${wagon-maven-plugin.version} + provided + + + org.apache.maven.plugins + maven-antrun-plugin + ${maven-antrun-plugin.version} + provided + diff --git a/wasm-tools/pom.xml b/wasm-tools/pom.xml index ef667aad0..d14177ead 100644 --- a/wasm-tools/pom.xml +++ b/wasm-tools/pom.xml @@ -71,6 +71,7 @@ + org.apache.maven.plugins maven-antrun-plugin @@ -94,7 +95,6 @@ org.codehaus.mojo wagon-maven-plugin - ${wagon-maven-plugin.version} download-wasm-tools From 49207ff34d2868060bf60ea67c80965e54dd1e38 Mon Sep 17 00:00:00 2001 From: andreatp Date: Mon, 8 Sep 2025 15:24:58 +0100 Subject: [PATCH 10/13] fmt --- pom.xml | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/pom.xml b/pom.xml index dca95f405..622e389fe 100644 --- a/pom.xml +++ b/pom.xml @@ -293,18 +293,18 @@ ${maven-plugin-annotations.version} provided - - org.codehaus.mojo - wagon-maven-plugin - ${wagon-maven-plugin.version} - provided - org.apache.maven.plugins maven-antrun-plugin ${maven-antrun-plugin.version} provided + + org.codehaus.mojo + wagon-maven-plugin + ${wagon-maven-plugin.version} + provided + From d3da6c4601b73fe4b6aaa5e2622cc84c58d6feba Mon Sep 17 00:00:00 2001 From: andreatp Date: Mon, 8 Sep 2025 15:32:19 +0100 Subject: [PATCH 11/13] debug --- pom.xml | 12 ------------ wasm-tools/pom.xml | 2 ++ 2 files changed, 2 insertions(+), 12 deletions(-) diff --git a/pom.xml b/pom.xml index 622e389fe..684f96696 100644 --- a/pom.xml +++ b/pom.xml @@ -293,18 +293,6 @@ ${maven-plugin-annotations.version} provided - - org.apache.maven.plugins - maven-antrun-plugin - ${maven-antrun-plugin.version} - provided - - - org.codehaus.mojo - wagon-maven-plugin - ${wagon-maven-plugin.version} - provided - diff --git a/wasm-tools/pom.xml b/wasm-tools/pom.xml index d14177ead..cbab18336 100644 --- a/wasm-tools/pom.xml +++ b/wasm-tools/pom.xml @@ -73,6 +73,7 @@ org.apache.maven.plugins maven-antrun-plugin + ${maven-antrun-plugin.version} @@ -95,6 +96,7 @@ org.codehaus.mojo wagon-maven-plugin + ${wagon-maven-plugin.version} download-wasm-tools From 80bb8930bc82e9669ee341ff86b4a306b9551fab Mon Sep 17 00:00:00 2001 From: andreatp Date: Mon, 8 Sep 2025 15:45:59 +0100 Subject: [PATCH 12/13] check 21 + temurin on Z --- .github/workflows/ibm-ci.yaml | 11 ++++++++--- 1 file changed, 8 insertions(+), 3 deletions(-) diff --git a/.github/workflows/ibm-ci.yaml b/.github/workflows/ibm-ci.yaml index ab8121855..2055260cc 100644 --- a/.github/workflows/ibm-ci.yaml +++ b/.github/workflows/ibm-ci.yaml @@ -1,10 +1,14 @@ -name: CI +name: IBM CI on: push: branches: [ main ] pull_request: +# on: +# schedule: +# - cron: "0 0 * * *" # everyday + permissions: contents: read checks: write @@ -25,6 +29,7 @@ jobs: - os: ubuntu-24.04-s390x arch: s390x version: [11, 17, 21] + jvm: [temurin, semeru] steps: - name: Checkout sources uses: actions/checkout@v5 @@ -44,11 +49,11 @@ jobs: - name: Set up Java uses: actions/setup-java@v5 with: - distribution: 'semeru' + distribution: '${{ matrix.jvm }}' java-version: '${{ matrix.version }}' architecture: '${{ matrix.arch }}' cache: maven - name: Test Java and Check Style - run: mvn -B spotless:check clean install -X + run: mvn -B clean install env: MAVEN_OPTS: "-ea" From 6f15484b19e1bbb078148276cf13a71e458b0fa1 Mon Sep 17 00:00:00 2001 From: andreatp Date: Mon, 8 Sep 2025 16:10:49 +0100 Subject: [PATCH 13/13] verify memory --- simd/src/test/java/com/dylibso/chicory/simd/BasicSimdTest.java | 2 ++ 1 file changed, 2 insertions(+) diff --git a/simd/src/test/java/com/dylibso/chicory/simd/BasicSimdTest.java b/simd/src/test/java/com/dylibso/chicory/simd/BasicSimdTest.java index 0eea22b2f..7ff316ad5 100644 --- a/simd/src/test/java/com/dylibso/chicory/simd/BasicSimdTest.java +++ b/simd/src/test/java/com/dylibso/chicory/simd/BasicSimdTest.java @@ -2,6 +2,7 @@ import static org.junit.jupiter.api.Assertions.assertEquals; +import com.dylibso.chicory.runtime.ByteArrayMemory; import com.dylibso.chicory.runtime.Instance; import com.dylibso.chicory.wasm.Parser; import org.junit.jupiter.api.Test; @@ -17,6 +18,7 @@ public void shouldRunBasicExample() { BasicSimdTest.class.getResourceAsStream( "/compiled/simd-example.wat.wasm"))) .withMachineFactory(SimdInterpreterMachine::new) + .withMemoryFactory(ByteArrayMemory::new) .build(); var main = instance.export("main"); var result = main.apply()[0];