Merge branch 'dev' into fix/add-opt-inline-fastpath

mmtk · Oct 24, 2024 · a6998d3 · a6998d3
2 parents f2f1e12 + 5918de4
commit a6998d3
Show file tree

Hide file tree

Showing 22 changed files with 361 additions and 5,758 deletions.
diff --git a/.github/scripts/ci-test-LinearAlgebra.sh b/.github/scripts/ci-test-LinearAlgebra.sh
@@ -5,7 +5,7 @@ set -e
 
 . $(dirname "$0")/common.sh
 
-export MMTK_MAX_HSIZE_G=7.5
+export MMTK_MAX_HSIZE_G=8
 total_mem=$(free -m | awk '/^Mem:/ {print $2}')
 mem_threshold=512 # use 0.5Gb as a threshold for the max rss based on the total free memory
 total_mem_restricted=$((total_mem- mem_threshold))

diff --git a/.github/scripts/common.sh b/.github/scripts/common.sh
@@ -1,5 +1,5 @@
 BINDING_PATH=$(realpath $(dirname "$0"))/../..
-JULIA_PATH=$BINDING_PATH/vm/julia
+export JULIA_PATH=$BINDING_PATH/vm/julia
 
 RUSTUP_TOOLCHAIN=`cat $BINDING_PATH/mmtk/rust-toolchain`
 JULIA_TEST_ARGS='--check-bounds=yes --startup-file=no --depwarn=error'

diff --git a/.github/workflows/binding-tests.yml b/.github/workflows/binding-tests.yml
@@ -19,6 +19,9 @@ jobs:
         run: |
           ./.github/scripts/ci-checkout.sh
           ./.github/scripts/ci-setup.sh
+          # removing these as they cause a conflict within bindgen
+          sudo rm -rf /usr/lib/llvm-14  
+          sudo rm -rf /usr/lib/llvm-13
       - name: Build Julia (Debug)
         run: |
           ./.github/scripts/ci-build.sh debug ${{ inputs.gc_plan }} ${{ inputs.moving }}
@@ -35,6 +38,9 @@ jobs:
         run: |
           ./.github/scripts/ci-checkout.sh
           ./.github/scripts/ci-setup.sh
+          # removing these as they cause a conflict within bindgen
+          sudo rm -rf /usr/lib/llvm-14  
+          sudo rm -rf /usr/lib/llvm-13
       - name: Patching unsupported tests
         run: |
           ./.github/scripts/ci-test-patching.sh
@@ -54,6 +60,9 @@ jobs:
         run: |
           ./.github/scripts/ci-checkout.sh
           ./.github/scripts/ci-setup.sh
+          # removing these as they cause a conflict within bindgen
+          sudo rm -rf /usr/lib/llvm-14  
+          sudo rm -rf /usr/lib/llvm-13
       - name: Patching unsupported tests
         run: |
           ./.github/scripts/ci-test-patching.sh
@@ -73,6 +82,9 @@ jobs:
         run: |
           ./.github/scripts/ci-checkout.sh
           ./.github/scripts/ci-setup.sh
+          # removing these as they cause a conflict within bindgen
+          sudo rm -rf /usr/lib/llvm-14  
+          sudo rm -rf /usr/lib/llvm-13
       - name: Build Julia (Release)
         run: |
           ./.github/scripts/ci-build.sh release ${{ inputs.gc_plan }} ${{ inputs.moving }}

diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
@@ -23,4 +23,4 @@ jobs:
     uses: ./.github/workflows/binding-tests.yml
     with:
       gc_plan: ${{ matrix.gc_plan }}
-      moving: ${{ matrix.moving }}
+      moving: ${{ matrix.moving }}