From a75d5dc8917f93696f5ac1becb7ca73813073580 Mon Sep 17 00:00:00 2001 From: Martin Kroeker Date: Sun, 19 Jul 2026 12:30:00 +0200 Subject: [PATCH 1/5] Set timeout of 100 minutes for OSX DYNAMIC_ARCH, make OSX cmake build verbose --- azure-pipelines.yml | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/azure-pipelines.yml b/azure-pipelines.yml index ca887df463..b3beafefc0 100644 --- a/azure-pipelines.yml +++ b/azure-pipelines.yml @@ -203,6 +203,7 @@ jobs: make TARGET=NEHALEM CC=/usr/local/opt/llvm/bin/clang FC=/usr/local/opt/flang/bin/flang NO_SHARED=1 - job: OSX_OpenMP_Clang + timeoutInMinutes: 100 pool: vmImage: 'macOS-latest' variables: @@ -216,6 +217,7 @@ jobs: make TARGET=CORE2 USE_OPENMP=1 DYNAMIC_ARCH=1 DYNAMIC_LIST='NEHALEM HASWELL SKYLAKEX' CC=/usr/local/opt/llvm/bin/clang NOFORTRAN=1 - job: OSX_OpenMP_Clang_cmake + timeoutInMinutes: 100 pool: vmImage: 'macOS-latest' variables: @@ -227,11 +229,12 @@ jobs: 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 .. + cmake -DCMAKE_VERBOSE_MAKEFILE=ON -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 ctest - job: OSX_dynarch_cmake + timeoutInMinutes: 100 pool: vmImage: 'macOS-14' variables: From 3c1d77417b2e3801038abc64376c5830e541dc86 Mon Sep 17 00:00:00 2001 From: Martin Kroeker Date: Sun, 19 Jul 2026 12:58:36 +0200 Subject: [PATCH 2/5] fix cmake dynamic_list syntax --- azure-pipelines.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/azure-pipelines.yml b/azure-pipelines.yml index b3beafefc0..5c0881bcc8 100644 --- a/azure-pipelines.yml +++ b/azure-pipelines.yml @@ -229,7 +229,7 @@ jobs: brew install llvm libomp mkdir build cd build - cmake -DCMAKE_VERBOSE_MAKEFILE=ON -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 -DCMAKE_VERBOSE_MAKEFILE=ON -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 ctest From 854b597ddebaffe6a1e09b1ed5683db3d60fe8cf Mon Sep 17 00:00:00 2001 From: Martin Kroeker Date: Mon, 20 Jul 2026 22:42:57 +0200 Subject: [PATCH 3/5] remove SKYLAKEX and newer from provided DYNAMIC_LIST if NO_AVX512 also set --- cmake/arch.cmake | 3 +++ 1 file changed, 3 insertions(+) diff --git a/cmake/arch.cmake b/cmake/arch.cmake index b902937a05..1cd4c1a1d8 100644 --- a/cmake/arch.cmake +++ b/cmake/arch.cmake @@ -111,6 +111,9 @@ if (DYNAMIC_ARCH) string(REGEX REPLACE "-march=native" "" CMAKE_C_FLAGS "${CMAKE_C_FLAGS}") endif () if (DYNAMIC_LIST) + if (NO_AVX512) + string (REGEX REPLACE "SKYLAKEX|COOPERLAKE|SAPPHIRERAPIDS" "" DYNAMIC_LIST ${DYNAMIC_LIST}) + endif() set(DYNAMIC_CORE PRESCOTT ${DYNAMIC_LIST}) endif () endif () From 6f5c9675b357f05f5be99cda4313bb2f3a656dfe Mon Sep 17 00:00:00 2001 From: Martin Kroeker Date: Tue, 21 Jul 2026 00:04:29 +0200 Subject: [PATCH 4/5] Use remove_item to prune dynamic_list --- cmake/arch.cmake | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/cmake/arch.cmake b/cmake/arch.cmake index 1cd4c1a1d8..89fa0233bf 100644 --- a/cmake/arch.cmake +++ b/cmake/arch.cmake @@ -112,7 +112,7 @@ if (DYNAMIC_ARCH) endif () if (DYNAMIC_LIST) if (NO_AVX512) - string (REGEX REPLACE "SKYLAKEX|COOPERLAKE|SAPPHIRERAPIDS" "" DYNAMIC_LIST ${DYNAMIC_LIST}) + list(REMOVE_ITEM ${DYNAMIC_LIST} SKYLAKEX COOPERLAKE SAPPHIRERAPIDS) endif() set(DYNAMIC_CORE PRESCOTT ${DYNAMIC_LIST}) endif () From 6df799fdb2a8fa7ba7072baa364578cbd824d9c2 Mon Sep 17 00:00:00 2001 From: Martin Kroeker Date: Tue, 21 Jul 2026 10:02:08 +0200 Subject: [PATCH 5/5] Update arch.cmake --- cmake/arch.cmake | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/cmake/arch.cmake b/cmake/arch.cmake index 89fa0233bf..881976944b 100644 --- a/cmake/arch.cmake +++ b/cmake/arch.cmake @@ -112,7 +112,7 @@ if (DYNAMIC_ARCH) endif () if (DYNAMIC_LIST) if (NO_AVX512) - list(REMOVE_ITEM ${DYNAMIC_LIST} SKYLAKEX COOPERLAKE SAPPHIRERAPIDS) + list(REMOVE_ITEM DYNAMIC_LIST "SKYLAKEX" "COOPERLAKE" "SAPPHIRERAPIDS") endif() set(DYNAMIC_CORE PRESCOTT ${DYNAMIC_LIST}) endif ()