Merge branch 'trunk' into arityfix

.gitattributes

@@ -72,6 +72,9 @@ tools/mantis2gh_stripped.csv typo.missing-header
 .depend                  typo.prune
 /.depend.menhir          typo.prune
 
+# These can be fixed at some point
+/tools/*.py              typo.long-line
+
 # Makefiles may contain tabs
 Makefile*                typo.makefile-whitespace=may
 
@@ -103,7 +106,6 @@ otherlibs/win32unix/stat.c        typo.long-line
 otherlibs/win32unix/symlink.c     typo.long-line
 
 runtime/sak.c            typo.non-ascii
-runtime/caml/compatibility.h    typo.very-long-line
 
 stdlib/hashbang     typo.white-at-eol typo.missing-lf
 
@@ -182,7 +184,7 @@ tools/ocaml-objcopy-macosx text eol=lf
 tools/ocamlsize text eol=lf
 tools/pre-commit-githook text eol=lf
 tools/markdown-add-pr-links.sh text eol=lf
-runtime/caml/compatibility.h typo.long-line=may
+runtime/caml/sizeclasses.h typo.missing-header typo.white-at-eol
 
 # These are all Perl scripts, so may not actually require this
 manual/tools/caml-tex text eol=lf

.github/workflows/build.yml

@@ -3,91 +3,104 @@ name: Build
 on: [push, pull_request]
 
 jobs:
-  no-naked-pointers:
-    runs-on: ubuntu-latest
+
+  build:
+    name: 'linux'
+    runs-on: 'ubuntu-latest'
     steps:
-    - name: Checkout
-      uses: actions/checkout@v2
-    - name: configure tree
-      run: ./configure --disable-naked-pointers --disable-stdlib-manpages --disable-dependency-generation --enable-ocamltest
-    - name: Build
-      run: |
-        make -j world.opt
-    - name: Run the testsuite
-      run: |
-        make -C testsuite USE_RUNTIME=d all
-  i386-static:
-    runs-on: ubuntu-latest
+      - name: Checkout
+        uses: actions/checkout@v2
+      - name: configure tree
+        run: |
+          MAKE_ARG=-j XARCH=x64 bash -xe tools/ci/actions/runner.sh configure
+      - name: Build
+        run: |
+          MAKE_ARG=-j bash -xe tools/ci/actions/runner.sh build
+      - name: Prepare Artifact
+        run: |
+          tar -czf /tmp/sources.tar.gz .
+      - uses: actions/upload-artifact@v2
+        with:
+          name: compiler
+          path: /tmp/sources.tar.gz
+          retention-days: 1
+
+  build-misc:
+    name: ${{ matrix.name }}
+    runs-on: ${{ matrix.os }}
+    strategy:
+      matrix:
+        include:
+          - name: linux-O0
+            os: ubuntu-latest
+            config_arg: CFLAGS='-O0'
+          - name: linux-debug
+            os: ubuntu-latest
+            env: OCAMLRUNPARAM=v=0,V=1 USE_RUNTIME=d
+          - name: macos
+            os: macos-latest
     steps:
-    - name: Checkout
-      uses: actions/checkout@v2
-    - name: Packages
-      run: |
-        sudo apt-get update -y && sudo apt-get install -y gcc-multilib gfortran-multilib
-    - name: configure tree
-      run: |
-        XARCH=i386 CONFIG_ARG='--disable-stdlib-manpages --disable-shared --enable-cmm-invariants' bash -xe tools/ci/actions/runner.sh configure
-    - name: Build
-      run: |
-        bash -xe tools/ci/actions/runner.sh build
-    - name: Run the testsuite
-      run: |
-        bash -xe tools/ci/actions/runner.sh test
-    - name: Install
-      run: |
-        bash -xe tools/ci/actions/runner.sh install
-    - name: Other checks
-      run: |
-        bash -xe tools/ci/actions/runner.sh other-checks
-  full-flambda:
+      - name: Checkout
+        uses: actions/checkout@v2
+      - name: OS Dependencies
+        if: runner.os == 'MacOS'
+        run: brew install parallel
+      - name: configure tree
+        run: |
+          CONFIG_ARG=${{ matrix.config_arg }} MAKE_ARG=-j XARCH=x64 bash -xe tools/ci/actions/runner.sh configure
+      - name: Build
+        run: |
+          MAKE_ARG=-j bash -xe tools/ci/actions/runner.sh build
+      - name: Run the testsuite
+        if: ${{ matrix.name != 'linux-O0' }}
+        run: |
+          bash -c 'SHOW_TIMINGS=1 tools/ci/actions/runner.sh test'
+      - name: Run the testsuite (linux-O0, parallel)
+        if: ${{ matrix.name == 'linux-O0' }}
+        env:
+          OCAMLRUNPARAM: v=0,V=1
+          USE_RUNTIME: d
+        run: |
+          bash -xe tools/ci/actions/runner.sh test_multicore 1 "parallel" "lib-threads" "lib-systhreads"
+
+  testsuite:
+    needs: build
+    # https://docs.github.com/en/actions/reference/workflow-syntax-for-github-actions#jobsjob_idneeds    strategy:
     runs-on: ubuntu-latest
+    strategy:
+      matrix:
+        id:
+          - debug-s4096
+          - taskset
+          - normal
+          - super
     steps:
-    - name: Checkout
-      uses: actions/checkout@v2
-      with:
-        fetch-depth: 50
-    - name: Packages
-      run: |
-        sudo apt-get update -y && sudo apt-get install -y texlive-latex-extra texlive-fonts-recommended hevea sass
-  # Ensure that make distclean can be run from an empty tree
-    - name: distclean
-      run: |
-        MAKE_ARG=-j make distclean
-    - name: configure tree
-      run: |
-        MAKE_ARG=-j XARCH=x64 CONFIG_ARG='--enable-flambda --enable-cmm-invariants --enable-dependency-generation --enable-native-toplevel' OCAMLRUNPARAM=b,v=0 bash -xe tools/ci/actions/runner.sh configure
-    - name: Build
-      run: |
-        MAKE_ARG=-j OCAMLRUNPARAM=b,v=0 bash -xe tools/ci/actions/runner.sh build
-    - name: Run the testsuite
-      run: |
-        MAKE_ARG=-j OCAMLRUNPARAM=b,v=0 bash -xe tools/ci/actions/runner.sh test
-    - name: Build API Documentation
-      run: |
-        MAKE_ARG=-j OCAMLRUNPARAM=b,v=0 bash -xe tools/ci/actions/runner.sh api-docs
-    - name: Install
-      run: |
-        MAKE_ARG=-j OCAMLRUNPARAM=b,v=0 bash -xe tools/ci/actions/runner.sh install
-    - name: Check for manual changes
-      id: manual
-      run: >-
-        tools/ci/actions/check-manual-modified.sh
-        '${{ github.ref }}'
-        '${{ github.event_name }}'
-        '${{ github.event.pull_request.base.ref }}'
-        '${{ github.event.pull_request.base.sha }}'
-        '${{ github.event.pull_request.head.ref }}'
-        '${{ github.event.pull_request.head.sha }}'
-        '${{ github.event.ref }}'
-        '${{ github.event.before }}'
-        '${{ github.event.ref }}'
-        '${{ github.event.after }}'
-        '${{ github.event.repository.full_name }}'
-    - name: Build the manual
-      run: |
-        MAKE_ARG=-j OCAMLRUNPARAM=b,v=0 bash -xe tools/ci/actions/runner.sh manual
-      # Temporarily disabled 23-Apr-2021 while Dune isn't building
-      if: steps.manual.outputs.changed == 'disabled'
-    - name: Other checks
-      run: |
-        MAKE_ARG=-j OCAMLRUNPARAM=b,v=0 bash -xe tools/ci/actions/runner.sh other-checks
+      - uses: actions/download-artifact@v2
+        with:
+          name: compiler
+      - name: Unpack Artifact
+        run: |
+          tar xf sources.tar.gz
+      - name: Run the testsuite
+        if: ${{ matrix.id == 'normal' }}
+        run: |
+          bash -xe tools/ci/actions/runner.sh test
+      - name: Run the testsuite (Super Charged)
+        if: ${{ matrix.id == 'super' }}
+        run: |
+          bash -xe tools/ci/actions/runner.sh test_multicore 3 "parallel" \
+          "callback" "gc-roots" "lib-threads" "lib-systhreads" \
+          "weak-ephe-final"
+      - name: Run the testsuite (s=4096, debug runtime)
+        env:
+          OCAMLRUNPARAM: s=4096,v=0
+          USE_RUNTIME: d
+        if: ${{ matrix.id == 'debug-s4096' }}
+        run: |
+          bash -xe tools/ci/actions/runner.sh test_multicore 1 "parallel" \
+          "lib-threads" "lib-systhreads" "weak-ephe-final"
+      - name: Run the testsuite (taskset -c 0)
+        if: ${{ matrix.id == 'taskset' }}
+        run: |
+          bash -xe tools/ci/actions/runner.sh test_multicore 1 "parallel" \
+          "lib-threads" "lib-systhreads" "weak-ephe-final"