Merge remote-tracking branch 'sym/sym-1.40.x' into newgc

Conflicts:
	.github/actions/4d-test-libs/action.yml
	.github/actions/6-integration-test/action.yml

Author: kinke

.circleci/config.yml

@@ -32,7 +32,7 @@ commonSteps: &commonSteps
           fi
           # Install lit
           python3 --version
-          python3 -m pip install --user lit
+          python3 -m pip install --user lit psutil
           python3 -c "import lit.main; lit.main.main();" --version . | head -n 1
           # Download & extract host LDC if HOST_LDC_VERSION is set
           if [[ -v HOST_LDC_VERSION ]]; then
@@ -83,7 +83,7 @@ commonSteps: &commonSteps
     - run:
         name: Run defaultlib unittests & druntime integration tests
         when: always
-        command: cd ../build && ctest -j$PARALLELISM --output-on-failure -E "dmd-testsuite|ldc2-unittest|lit-tests"
+        command: cd ../build && ctest -j$PARALLELISM --output-on-failure -E "dmd-testsuite|ldc2-unittest|lit-tests" --timeout 120
 
 version: 2
 jobs:

.cirrus.yml

@@ -34,31 +34,14 @@ common_steps_template: &COMMON_STEPS_TEMPLATE
       ctest --output-on-failure -R ldc2-unittest
     run_lit_testsuite_script: |
       cd $CIRRUS_WORKING_DIR/../build/tests
-      if [[ "$CI_OS-$CI_ARCH" == "linux-aarch64" ]]; then
-        # FIXME: the following tests fail
-        rm $CIRRUS_WORKING_DIR/tests/debuginfo/nested_gdb.d
-        rm $CIRRUS_WORKING_DIR/tests/sanitizers/fuzz_basic.d
-      fi
       python3 runlit.py -v -j $PARALLELISM .
     run_dmd_testsuite_script: |
       cd $CIRRUS_WORKING_DIR/../build
       DMD_TESTSUITE_MAKE_ARGS=-j$PARALLELISM ctest -V -R dmd-testsuite
     run_defaultlib_tests_script: |
       # Run defaultlib unittests & druntime integration tests
       cd $CIRRUS_WORKING_DIR/../build
-      excludes="dmd-testsuite|ldc2-unittest|lit-tests"
-      if [[ "$CI_OS-$CI_ARCH" == "linux-aarch64" ]]; then
-        # FIXME: failing unittest(s)
-        excludes+='|^std.internal.math.gammafunction'
-        # FIXME: failing unittest(s) with enabled optimizations
-        excludes+='|^std.math.exponential(-shared)?$'
-        # FIXME: subtest rt_trap_exceptions fails
-        excludes+='|^druntime-test-exceptions-debug$'
-        # std.path unittests apparently need HOME, which happens not to be set
-        export HOME=~
-        echo "Setting HOME to '$HOME'"
-      fi
-      ctest -j$PARALLELISM --output-on-failure -E "$excludes"
+      ctest -j$PARALLELISM --output-on-failure -E "dmd-testsuite|ldc2-unittest|lit-tests" --timeout 120
 
 # Performs the extra packaging steps for jobs producing a prebuilt package.
 # Requires env variables CI_ARCH, CI_OS, GITHUB_TOKEN and PARALLELISM (and CC for FreeBSD).
@@ -93,8 +76,8 @@ packaging_steps_template: &PACKAGING_STEPS_TEMPLATE
   # Run dynamic-compile integration test
   run_dynamic_compile_integration_test_script: |
     cd $CIRRUS_WORKING_DIR/..
-    # FIXME: disabled since LLVM 12, needs https://github.com/ldc-developers/ldc/pull/3184
-    if false; then
+    # FreeBSD's LLVM 15 is too old (need LLVM 18+ for dynamic-compile)
+    if [[ "$CI_OS" != "freebsd" ]]; then
       installed/bin/ldc2 -enable-dynamic-compile -run $CIRRUS_WORKING_DIR/tests/dynamiccompile/array.d
     fi
   # Run ImportC integration test
@@ -126,7 +109,7 @@ packaging_steps_template: &PACKAGING_STEPS_TEMPLATE
   # Build & copy reggae
   build_reggae_script: |
     cd $CIRRUS_WORKING_DIR/..
-    git clone --recursive https://github.com/kinke/reggae.git
+    git clone --recursive https://github.com/atilaneves/reggae.git
     cd reggae
     git checkout "$(cat $CIRRUS_WORKING_DIR/packaging/reggae_version)"
     # needs rdmd in PATH
@@ -161,7 +144,7 @@ packaging_steps_template: &PACKAGING_STEPS_TEMPLATE
     fi
 
 # Installs Ubuntu 20.04+ prerequisites.
-# Requires env variables CI_ARCH, HOST_LDC_VERSION, EXTRA_APT_PACKAGES and EXTRA_CMAKE_FLAGS.
+# Requires env variables CI_ARCH, EXTRA_APT_PACKAGES and EXTRA_CMAKE_FLAGS.
 install_ubuntu_prerequisites_template: &INSTALL_UBUNTU_PREREQUISITES_TEMPLATE
   install_prerequisites_script: |
     cd $CIRRUS_WORKING_DIR/..
@@ -177,32 +160,21 @@ install_ubuntu_prerequisites_template: &INSTALL_UBUNTU_PREREQUISITES_TEMPLATE
     fi
     apt-get -q update
     apt-get -yq install \
-      git-core ninja-build $gcc_pkg \
+      git-core cmake ninja-build $gcc_pkg \
       zlib1g-dev $libcurl_pkg curl gdb python3 python3-pip tzdata unzip zip \
       $EXTRA_APT_PACKAGES
     python3 --version
-    # Download & extract CMake
-    curl -fL --retry 3 --max-time 300 -o cmake.tar.gz https://github.com/Kitware/CMake/releases/download/v3.27.1/cmake-3.27.1-linux-$CI_ARCH.tar.gz
-    mkdir cmake
-    tar -xf cmake.tar.gz --strip 1 -C cmake
-    rm cmake.tar.gz
-    # Download & extract custom Ninja on x86_64
+    # Install custom Ninja on x86_64
     if [[ "$CI_ARCH" == "x86_64" ]]; then
       curl -fL --retry 3 --max-time 60 -O https://github.com/symmetryinvestments/ninja/releases/download/v1.11.1-sym1/ninja-linux.zip
       mkdir ninja
       unzip ninja-linux.zip -d ninja
       rm ninja-linux.zip
+      ln -sf $PWD/ninja/ninja /usr/bin/ninja
     fi
-    # Download & extract host LDC
-    curl -fL --retry 3 --max-time 300 -o ldc2.tar.xz https://github.com/ldc-developers/ldc/releases/download/v$HOST_LDC_VERSION/ldc2-$HOST_LDC_VERSION-linux-$CI_ARCH.tar.xz
-    mkdir host-ldc
-    tar -xf ldc2.tar.xz --strip 1 -C host-ldc
-    rm ldc2.tar.xz
 
 environment:
   CIRRUS_CLONE_DEPTH: 50
-  HOST_LDC_VERSION: 1.31.0
-  LLVM_VERSION: 19.1.3
   GITHUB_TOKEN: ENCRYPTED[0955bd48c8d4e5391446fc0149d0719ad0b63df27ec9e6c180a5730a5b10dc7f28f09d1383423db158d21380ee2b022a]
 
 task:
@@ -218,7 +190,6 @@ task:
     EXTRA_APT_PACKAGES: "gdmd llvm-dev libclang-common-19-dev lld"
     EXTRA_CMAKE_FLAGS: "-DBUILD_SHARED_LIBS=ON -DBUILD_LTO_LIBS=ON -DD_COMPILER=gdmd -DLDC_LINK_MANUALLY=ON"
     PARALLELISM: 8
-    PATH: ${CIRRUS_WORKING_DIR}/../cmake/bin:${CIRRUS_WORKING_DIR}/../ninja:${PATH}
     # for gdmd:
     LANG: C.UTF-8
   << : *INSTALL_UBUNTU_PREREQUISITES_TEMPLATE
@@ -235,85 +206,9 @@ task:
   << : *COMMON_STEPS_TEMPLATE
 
 task:
-  name: Ubuntu 20.04 aarch64
-  compute_engine_instance:
-    image_project: ubuntu-os-cloud
-    image: family/ubuntu-2004-lts-arm64
-    platform: linux
-    architecture: arm64
-    cpu: 4
-    memory: 8G
-    disk: 20
-  timeout_in: 60m
-  environment:
-    CI_ARCH: aarch64
-    CI_OS: linux
-    EXTRA_APT_PACKAGES: libxml2-dev libzstd-dev p7zip-full
-    EXTRA_CMAKE_FLAGS: >-
-      -DBUILD_LTO_LIBS=ON
-      -DD_COMPILER_FLAGS="-O -flto=full -defaultlib=phobos2-ldc-lto,druntime-ldc-lto"
-      -DEXTRA_CXXFLAGS=-flto=full
-      -DCMAKE_EXE_LINKER_FLAGS=-static-libstdc++
-      -DJITRT_EXTRA_LDFLAGS=-static-libstdc++
-      -DCOMPILER_RT_LIBDIR_OS=aarch64-unknown-linux-gnu
-      -DLLVM_ROOT_DIR=$CIRRUS_WORKING_DIR/../llvm
-      -DD_COMPILER=$CIRRUS_WORKING_DIR/../bootstrap-ldc/bin/ldmd2
-    PARALLELISM: 4
-    PATH: ${CIRRUS_WORKING_DIR}/../cmake/bin:${PATH}
-    CLANG_VERSION: '15.0.3' # 15.0.6 requires a more recent libstdc++.so.6 than shipped with Ubuntu 20
-    CC: $CIRRUS_WORKING_DIR/../clang/bin/clang
-    CXX: $CIRRUS_WORKING_DIR/../clang/bin/clang++
-  << : *INSTALL_UBUNTU_PREREQUISITES_TEMPLATE
-  # Download & extract LDC-flavoured LLVM
-  download_prebuilt_llvm_script: |
-    cd $CIRRUS_WORKING_DIR/..
-    assertsSuffix=""
-    if [[ "${CIRRUS_TAG:-}" == "" ]]; then
-      echo 'Using LLVM with enabled assertions'
-      assertsSuffix="-withAsserts"
-    fi
-    llvm_tag="CI"
-    if [[ "$LLVM_VERSION" = *.* ]]; then llvm_tag="ldc-v$LLVM_VERSION"; fi
-    llvm_url="https://github.com/ldc-developers/llvm-project/releases/download/$llvm_tag/llvm-$LLVM_VERSION-linux-$CI_ARCH$assertsSuffix.tar.xz"
-    curl -fL --retry 3 --max-time 300 -o llvm.tar.xz $llvm_url
-    mkdir -p llvm
-    tar -xf llvm.tar.xz --strip 1 -C llvm
-    rm llvm.tar.xz
-    # Make lld the default linker (likely with enabled assertions unfortunately)
-    ln -sf "$PWD/llvm/bin/ld.lld" /usr/bin/ld
-    ld --version
-    # Make sure to link libzstd statically
-    rm /usr/lib/aarch64-linux-gnu/libzstd.so
-  # Download & extract clang
-  download_prebuilt_clang_script: |
-    cd $CIRRUS_WORKING_DIR/..
-    curl -fL --retry 3 --max-time 300 -o clang.tar.xz https://github.com/llvm/llvm-project/releases/download/llvmorg-$CLANG_VERSION/clang+llvm-$CLANG_VERSION-$CI_ARCH-linux-gnu.tar.xz
-    mkdir clang
-    tar -xf clang.tar.xz --strip 1 -C clang
-    rm clang.tar.xz
-  clone_submodules_early_script: |
-    cd $CIRRUS_WORKING_DIR
-    git submodule update --init --depth $CIRRUS_CLONE_DEPTH
-  # Build a first LDC as host compiler for the actual build
-  build_bootstrap_ldc_script: |
-    cd $CIRRUS_WORKING_DIR/..
-    mkdir bootstrap-ldc
-    cd bootstrap-ldc
-    cmake -G Ninja $CIRRUS_WORKING_DIR \
-      -DCMAKE_BUILD_TYPE=Release \
-      -DLLVM_ROOT_DIR=$PWD/../llvm \
-      -DD_COMPILER=$PWD/../host-ldc/bin/ldmd2 \
-      -DBUILD_SHARED_LIBS=OFF \
-      -DBUILD_LTO_LIBS=ON
-    ninja -j$PARALLELISM obj/ldc2.o all
-    bin/ldc2 -version
-  << : *COMMON_STEPS_TEMPLATE
-  << : *PACKAGING_STEPS_TEMPLATE
-
-task:
-  name: FreeBSD 13.3 x64
+  name: FreeBSD 13.4 x64
   freebsd_instance:
-    image_family: freebsd-13-3
+    image_family: freebsd-13-4
     cpu: 4
     memory: 8G
   timeout_in: 60m
@@ -325,13 +220,17 @@ task:
       -DD_COMPILER_FLAGS="-O -flto=full -defaultlib=phobos2-ldc-lto,druntime-ldc-lto"
       -DEXTRA_CXXFLAGS=-flto=full
     PARALLELISM: 4
-    CC: clang
+    CC: clang15
+    CXX: clang++15
   install_prerequisites_script: |
     cd $CIRRUS_WORKING_DIR/..
     sysctl -n hw.ncpu
-    pkg install -y git cmake ninja gmake llvm bash gtar 7-zip ldc
+    pkg install -y git cmake ninja gmake llvm15 bash gtar 7-zip ldc
     python3 --version
     python3 -m ensurepip
+    # set up default llvm-config
+    ls -l /usr/local/bin/llvm-config*
+    ln -sf llvm-config15 /usr/local/bin/llvm-config
   clone_submodules_early_script: |
     cd $CIRRUS_WORKING_DIR
     git submodule update --init --depth $CIRRUS_CLONE_DEPTH
@@ -344,6 +243,7 @@ task:
       -DCMAKE_BUILD_TYPE=Release \
       -DD_COMPILER=ldmd2 \
       -DBUILD_SHARED_LIBS=OFF \
+      -DLDC_DYNAMIC_COMPILE=OFF \
       -DBUILD_LTO_LIBS=ON
     ninja -j$PARALLELISM
     bin/ldc2 -version