Merge PR #384: Update Truffle, Graal, and MX to current version

smarr · Apr 25, 2022 · 92041ce · 92041ce · rebenchdb · Apr 25, 2022
2 parents c190573 + b1d9b00
commit 92041ce
Show file tree

Hide file tree

Showing 30 changed files with 263 additions and 368 deletions.
diff --git a/.classpath b/.classpath
@@ -1,6 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <classpath>
-	<classpathentry combineaccessrules="false" kind="src" path="/com.oracle.truffle.api.jdk8"/>
 	<classpathentry kind="src" path="src"/>
 	<classpathentry kind="src" path="tests/java"/>
 	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/>
@@ -22,7 +21,6 @@
 	<classpathentry combineaccessrules="false" kind="src" path="/BlackDiamonds"/>
 	<classpathentry kind="src" path="/com.oracle.truffle.tools.profiler"/>
 	<classpathentry kind="src" path="/org.graalvm.polyglot.tck"/>
-	<classpathentry kind="src" path="/com.oracle.svm.core"/>
 	<classpathentry kind="lib" path="libs/affinity.jar" sourcepath="libs/affinity-sources.jar"/>
 	<classpathentry kind="output" path="build/classes"/>
 </classpath>
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
@@ -12,15 +12,12 @@ jobs:
             job: test-osx
 
           - os: ubuntu-20.04
-            java: 8
             job: test-1
 
           - os: ubuntu-20.04
-            java: 11
             job: test-2
 
           - os: ubuntu-20.04
-            java: 11
             job: lint
 
 
@@ -34,51 +31,51 @@ jobs:
       - name: Compile SOMns Jar and Unit Tests
         if: matrix.job != 'lint'
         run: |
-          export JAVA_HOME=$JAVA_HOME_${{ matrix.java }}_X64
+          export JAVA_HOME=$JAVA_HOME_17_X64
           ant -e jar unit-tests
 
       - name: SOMns Test Suite
         if: matrix.job != 'lint'
         run: |
-          export JAVA_HOME=$JAVA_HOME_${{ matrix.java }}_X64
-          ./som --no-libgraal core-lib/TestSuite/TestRunner.ns
+          export JAVA_HOME=$JAVA_HOME_17_X64
+          ./som -G core-lib/TestSuite/TestRunner.ns
 
       - name: Build Native Image
         if: matrix.job == 'test-1'
         run: |
-          export JAVA_HOME=$JAVA_HOME_${{ matrix.java }}_X64
+          export JAVA_HOME=$JAVA_HOME_17_X64
           ant -e native-tests
 
       - name: Kompos Tests
         if: matrix.job == 'test-2'
         run: |
-          export JAVA_HOME=$JAVA_HOME_${{ matrix.java }}_X64
+          export JAVA_HOME=$JAVA_HOME_17_X64
           ant -e kompos
           cd tools/kompos
           npm test
 
       - name: Dynamic Metrics Tests
         if: matrix.job == 'test-osx'
         run: |
-          export JAVA_HOME=$JAVA_HOME_${{ matrix.java }}_X64
+          export JAVA_HOME=$JAVA_HOME_17_X64
           ant -e dynamic-metrics-tests
 
       - name: Super Instructions Tests
         if: matrix.job == 'test-2'
         run: |
-          export JAVA_HOME=$JAVA_HOME_${{ matrix.java }}_X64
+          export JAVA_HOME=$JAVA_HOME_17_X64
           ant -e superinstructions-tests
 
       - name: Replay Tests 1
         if: matrix.job == 'test-1'
         run: |
-          export JAVA_HOME=$JAVA_HOME_${{ matrix.java }}_X64
+          export JAVA_HOME=$JAVA_HOME_17_X64
           ./tests/replay/test.sh 1
 
       - name: Replay Tests 2
         if: matrix.job == 'test-2'
         run: |
-          export JAVA_HOME=$JAVA_HOME_${{ matrix.java }}_X64
+          export JAVA_HOME=$JAVA_HOME_17_X64
           ./tests/replay/test.sh 2
 
     # Disabled due to breaking changes in the tracing infrastructure. Not fixed to make merge of Snapshotting PR(#293) easier.
@@ -97,15 +94,15 @@ jobs:
         if: matrix.job == 'lint'
         run: |
            export ECLIPSE_TAR=eclipse.tar.gz
-           export ECLIPSE_URL=https://ftp.snt.utwente.nl/pub/software/eclipse/eclipse/downloads/drops4/R-4.19-202103031800/eclipse-SDK-4.19-linux-gtk-x86_64.tar.gz
+           export ECLIPSE_URL=https://ftp.snt.utwente.nl/pub/software/eclipse/eclipse/downloads/drops4/R-4.23-202203080310/eclipse-SDK-4.23-linux-gtk-x86_64.tar.gz
            curl ${ECLIPSE_URL} -o ${ECLIPSE_TAR}
            tar -C ${GITHUB_WORKSPACE}/.. -xzf ${ECLIPSE_TAR}
 
       - name: Check Eclipse Format
         if: matrix.job == 'lint'
         run: |
           export ECLIPSE_EXE=${GITHUB_WORKSPACE}/../eclipse/eclipse
-          export JAVA_HOME=$JAVA_HOME_11_X64
+          export JAVA_HOME=$JAVA_HOME_17_X64
           ant -e eclipseformat-check
 
       - name: Lint Kompos

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
@@ -7,8 +7,8 @@ stages:
 variables:
   PYTHONUNBUFFERED: "true"
   JVMCI_VERSION_CHECK: ignore
-  ECLIPSE_EXE: /home/gitlab-runner/.local/eclipse/eclipse
-  JAVA_HOME: /usr/lib/jvm/java-8-openjdk-amd64
+  ECLIPSE_EXE: /home/gitlab-runner/.local/eclipse4.23/eclipse
+  JAVA_HOME: /usr/lib/jvm/java-17-openjdk-amd64
 
 before_script:
   - git submodule update --init