Merge pull request #5929 from moluopro/remove-misspelled-bdsdc-sources

Fix CMake dynamic-arch fallback and remove unused BDSDC source copies

Author: martin-frbg

.github/workflows/c910v.yml

@@ -58,8 +58,11 @@ jobs:
         run: |
           # Force use c910v qemu-user
           wget https://github.com/revyos/qemu/commit/222729c7455784dd855216d7a2bec4bd8f2a6800.patch
+          # Backport the upstream linux-user clone_lock fix
+          wget -O qemu-clone-lock.patch https://gitlab.com/qemu-project/qemu/-/commit/d22e9aec572396836782e993cb18d598e6012688.patch
           cd qemu
           patch -p1 < ../222729c7455784dd855216d7a2bec4bd8f2a6800.patch
+          patch -p1 < ../qemu-clone-lock.patch
           export CXXFLAGS="-Wno-error"; export CFLAGS="-Wno-error"
           ./configure --prefix=$GITHUB_WORKSPACE/qemu-install --target-list=riscv64-linux-user --disable-system
           make -j$(nproc)

azure-pipelines.yml

@@ -223,12 +223,13 @@ jobs:
      LIBRARY_PATH: /usr/local/opt/llvm/lib
   steps:   
   - script: |
+      set -euo pipefail
       brew update
       brew install llvm libomp
       mkdir build
       cd build
-      cmake -DTARGET=CORE2 -DUSE_OPENMP=1 -DINTERFACE64=1 -DDYNAMIC_ARCH=1 -DDYNAMIC_LIST='NEHALEM HASWELL SKYLAKEX' -DCMAKE_C_COMPILER=/usr/local/opt/llvm/bin/clang -DNOFORTRAN=1 -DNO_AVX512=1 ..
-      make
+      cmake -DTARGET=CORE2 -DUSE_OPENMP=1 -DINTERFACE64=1 -DDYNAMIC_ARCH=1 -DDYNAMIC_LIST='NEHALEM;HASWELL;SKYLAKEX' -DCMAKE_C_COMPILER=/usr/local/opt/llvm/bin/clang -DNOFORTRAN=1 -DNO_AVX512=1 ..
+      cmake --build . --parallel "$(sysctl -n hw.logicalcpu)"
       ctest
       
 - job: OSX_dynarch_cmake
@@ -239,9 +240,10 @@ jobs:
      LIBRARY_PATH: /usr/local/opt/llvm/lib
   steps:   
   - script: |
+      set -euo pipefail
       mkdir build
       cd build
-      cmake -DTARGET=CORE2 -DDYNAMIC_ARCH=1 -DDYNAMIC_LIST='NEHALEM HASWELL SKYLAKEX' -DCMAKE_C_COMPILER=gcc-13 -DCMAKE_Fortran_COMPILER=gfortran-13 -DBUILD_SHARED_LIBS=ON ..
+      cmake -DTARGET=CORE2 -DDYNAMIC_ARCH=1 -DDYNAMIC_LIST='NEHALEM;HASWELL;SKYLAKEX' -DCMAKE_C_COMPILER=gcc-13 -DCMAKE_Fortran_COMPILER=gfortran-13 -DBUILD_SHARED_LIBS=ON ..
       cmake --build .
       ctest
 

kernel/CMakeLists.txt

@@ -36,8 +36,13 @@ function (build_core TARGET_CORE KDIR TSUFFIX KERNEL_DEFINITIONS)
     if (${DYNAMIC_ARCH})
         include("${PROJECT_SOURCE_DIR}/cmake/system.cmake")
     endif ()
+    # getarch may select a fallback core when CPU features are disabled.
+    set (KERNEL_CORE "${TARGET_CORE}")
+    if (${DYNAMIC_ARCH} AND NOT CMAKE_CROSSCOMPILING)
+        set (KERNEL_CORE "${CORE}")
+    endif ()
     ParseMakefileVars("${KERNELDIR}/KERNEL")
-    ParseMakefileVars("${KERNELDIR}/KERNEL.${TARGET_CORE}")
+    ParseMakefileVars("${KERNELDIR}/KERNEL.${KERNEL_CORE}")
     SetDefaultL1()
     SetDefaultL2()
     SetDefaultL3()
@@ -234,11 +239,11 @@ function (build_core TARGET_CORE KDIR TSUFFIX KERNEL_DEFINITIONS)
     endif ()
     # Makefile.L3
     set(USE_TRMM false)
-    string(TOUPPER ${TARGET_CORE} UC_TARGET_CORE)
-    if (ARM OR ARM64 OR RISCV64 OR WASM OR (UC_TARGET_CORE MATCHES LONGSOON3B) OR (UC_TARGET_CORE MATCHES GENERIC) OR (UC_TARGET_CORE MATCHES HASWELL) OR (UC_TARGET_CORE MATCHES ZEN) OR (UC_TARGET_CORE MATCHES SKYLAKEX) OR (UC_TARGET_CORE MATCHES COOPERLAKE) OR (UC_TARGET_CORE MATCHES SAPPHIRERAPIDS))
+    string(TOUPPER "${KERNEL_CORE}" UC_KERNEL_CORE)
+    if (ARM OR ARM64 OR RISCV64 OR WASM OR (UC_KERNEL_CORE MATCHES LONGSOON3B) OR (UC_KERNEL_CORE MATCHES GENERIC) OR (UC_KERNEL_CORE MATCHES HASWELL) OR (UC_KERNEL_CORE MATCHES ZEN) OR (UC_KERNEL_CORE MATCHES SKYLAKEX) OR (UC_KERNEL_CORE MATCHES COOPERLAKE) OR (UC_KERNEL_CORE MATCHES SAPPHIRERAPIDS))
       set(USE_TRMM true)
     endif ()
-    if (ZARCH OR (UC_TARGET_CORE MATCHES POWER8) OR (UC_TARGET_CORE MATCHES POWER9) OR (UC_TARGET_CORE MATCHES POWER10))
+    if (ZARCH OR (UC_KERNEL_CORE MATCHES POWER8) OR (UC_KERNEL_CORE MATCHES POWER9) OR (UC_KERNEL_CORE MATCHES POWER10))
       set(USE_TRMM true)
     endif ()
     set(USE_DIRECT_STRMM false)
@@ -261,7 +266,7 @@ function (build_core TARGET_CORE KDIR TSUFFIX KERNEL_DEFINITIONS)
     if (ARM64)
        set(USE_DIRECT_SSYMM true)
     endif()
-    if (UC_TARGET_CORE MATCHES ARMV9SME OR UC_TARGET_CORE MATCHES VORTEXM4)
+    if (UC_KERNEL_CORE MATCHES ARMV9SME OR UC_KERNEL_CORE MATCHES VORTEXM4)
           set (HAVE_SME true)
     endif ()