From 44f0751838e5f2cc78eacf410b22a7ed51e55e18 Mon Sep 17 00:00:00 2001 From: Martin Kroeker Date: Sat, 17 May 2025 19:21:15 +0200 Subject: [PATCH 1/9] limit mingw Release builds to -O2 for Fortran --- .github/workflows/dynamic_arch.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/.github/workflows/dynamic_arch.yml b/.github/workflows/dynamic_arch.yml index 2d5c7b6123..a4e6d2e0d3 100644 --- a/.github/workflows/dynamic_arch.yml +++ b/.github/workflows/dynamic_arch.yml @@ -268,6 +268,7 @@ jobs: -DUSE_THREAD=ON \ -DNUM_THREADS=64 \ -DTARGET=CORE2 \ + -DCMAKE_Fortran_FLAGS_RELEASE=-O2 \ ${{ matrix.idx64-flags }} \ -DCMAKE_C_COMPILER_LAUNCHER=ccache \ -DCMAKE_Fortran_COMPILER_LAUNCHER=ccache \ From 8b98564eaf8b08223c1a1cb25ef382e9f66df5b9 Mon Sep 17 00:00:00 2001 From: Martin Kroeker Date: Sat, 17 May 2025 21:03:03 +0200 Subject: [PATCH 2/9] set mingw C flags to -O2 as well --- .github/workflows/dynamic_arch.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/.github/workflows/dynamic_arch.yml b/.github/workflows/dynamic_arch.yml index a4e6d2e0d3..9d1990e60d 100644 --- a/.github/workflows/dynamic_arch.yml +++ b/.github/workflows/dynamic_arch.yml @@ -269,6 +269,7 @@ jobs: -DNUM_THREADS=64 \ -DTARGET=CORE2 \ -DCMAKE_Fortran_FLAGS_RELEASE=-O2 \ + -DCMAKE_C_FLAGS_RELEASE=-O2 \ ${{ matrix.idx64-flags }} \ -DCMAKE_C_COMPILER_LAUNCHER=ccache \ -DCMAKE_Fortran_COMPILER_LAUNCHER=ccache \ From b68b99095c40d06087e71cf372052c188523f5ca Mon Sep 17 00:00:00 2001 From: Martin Kroeker Date: Sat, 17 May 2025 23:58:20 +0200 Subject: [PATCH 3/9] Update dynamic_arch.yml --- .github/workflows/dynamic_arch.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/.github/workflows/dynamic_arch.yml b/.github/workflows/dynamic_arch.yml index 9d1990e60d..39db7a92bb 100644 --- a/.github/workflows/dynamic_arch.yml +++ b/.github/workflows/dynamic_arch.yml @@ -270,6 +270,7 @@ jobs: -DTARGET=CORE2 \ -DCMAKE_Fortran_FLAGS_RELEASE=-O2 \ -DCMAKE_C_FLAGS_RELEASE=-O2 \ + -DCMAKE_VERBOSE_MAKEFILE=ON \ ${{ matrix.idx64-flags }} \ -DCMAKE_C_COMPILER_LAUNCHER=ccache \ -DCMAKE_Fortran_COMPILER_LAUNCHER=ccache \ From 7f2d7da65d3c564572b237069b210ab70c154ffa Mon Sep 17 00:00:00 2001 From: Martin Kroeker Date: Sun, 18 May 2025 13:19:22 +0200 Subject: [PATCH 4/9] Fix passing of variable alpha in the CBLAS case --- interface/zsyr.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/interface/zsyr.c b/interface/zsyr.c index 8bc9ac1777..be66ff099f 100644 --- a/interface/zsyr.c +++ b/interface/zsyr.c @@ -116,12 +116,12 @@ void NAME(char *UPLO, blasint *N, FLOAT *ALPHA, #else -void CNAME(enum CBLAS_ORDER order, enum CBLAS_UPLO Uplo, int n, FLOAT alpha, FLOAT *x, int incx, FLOAT *a, int lda) { +void CNAME(enum CBLAS_ORDER order, enum CBLAS_UPLO Uplo, int n, void *valpha, FLOAT *x, int incx, FLOAT *a, int lda) { FLOAT *buffer; int uplo; blasint info; - FLOAT * ALPHA = α + FLOAT * ALPHA = (FLOAT*)valpha; FLOAT alpha_r = ALPHA[0]; FLOAT alpha_i = ALPHA[1]; #ifdef SMP From a611a6945dd91ea417ef5fc5be7e89cba36bd4af Mon Sep 17 00:00:00 2001 From: Martin Kroeker Date: Sun, 18 May 2025 17:30:24 +0200 Subject: [PATCH 5/9] Update dynamic_arch.yml --- .github/workflows/dynamic_arch.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/dynamic_arch.yml b/.github/workflows/dynamic_arch.yml index 39db7a92bb..08880ab134 100644 --- a/.github/workflows/dynamic_arch.yml +++ b/.github/workflows/dynamic_arch.yml @@ -268,8 +268,8 @@ jobs: -DUSE_THREAD=ON \ -DNUM_THREADS=64 \ -DTARGET=CORE2 \ - -DCMAKE_Fortran_FLAGS_RELEASE=-O2 \ - -DCMAKE_C_FLAGS_RELEASE=-O2 \ + -DCMAKE_Fortran_FLAGS_RELEASE=-O1 \ + -DCMAKE_C_FLAGS_RELEASE=-O1 \ -DCMAKE_VERBOSE_MAKEFILE=ON \ ${{ matrix.idx64-flags }} \ -DCMAKE_C_COMPILER_LAUNCHER=ccache \ From 5743cee9d08ec7d8d789d6a8e4df28a7a8e130d8 Mon Sep 17 00:00:00 2001 From: Martin Kroeker Date: Sun, 18 May 2025 20:55:37 +0200 Subject: [PATCH 6/9] Update dynamic_arch.yml --- .github/workflows/dynamic_arch.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/.github/workflows/dynamic_arch.yml b/.github/workflows/dynamic_arch.yml index 08880ab134..9877712fa0 100644 --- a/.github/workflows/dynamic_arch.yml +++ b/.github/workflows/dynamic_arch.yml @@ -202,6 +202,7 @@ jobs: env: CHERE_INVOKING: 1 + OPENBLAS_VERBOSE: 2 steps: - name: Get CPU name From 40c7163db0841594732fa50e2c1b7c41d4c5a9b3 Mon Sep 17 00:00:00 2001 From: Martin Kroeker Date: Mon, 19 May 2025 08:48:25 +0200 Subject: [PATCH 7/9] Update dynamic_arch.yml --- .github/workflows/dynamic_arch.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/dynamic_arch.yml b/.github/workflows/dynamic_arch.yml index 9877712fa0..5ba13881c1 100644 --- a/.github/workflows/dynamic_arch.yml +++ b/.github/workflows/dynamic_arch.yml @@ -202,7 +202,7 @@ jobs: env: CHERE_INVOKING: 1 - OPENBLAS_VERBOSE: 2 + OPENBLAS_CORETYPE: HASWELL steps: - name: Get CPU name From d0c61c4c51f594e2bc9d50a1d3b744271ba6150b Mon Sep 17 00:00:00 2001 From: Martin Kroeker Date: Wed, 21 May 2025 16:51:04 +0200 Subject: [PATCH 8/9] Update dynamic_arch.yml --- .github/workflows/dynamic_arch.yml | 3 --- 1 file changed, 3 deletions(-) diff --git a/.github/workflows/dynamic_arch.yml b/.github/workflows/dynamic_arch.yml index 5ba13881c1..e6c5f39d8c 100644 --- a/.github/workflows/dynamic_arch.yml +++ b/.github/workflows/dynamic_arch.yml @@ -202,7 +202,6 @@ jobs: env: CHERE_INVOKING: 1 - OPENBLAS_CORETYPE: HASWELL steps: - name: Get CPU name @@ -269,8 +268,6 @@ jobs: -DUSE_THREAD=ON \ -DNUM_THREADS=64 \ -DTARGET=CORE2 \ - -DCMAKE_Fortran_FLAGS_RELEASE=-O1 \ - -DCMAKE_C_FLAGS_RELEASE=-O1 \ -DCMAKE_VERBOSE_MAKEFILE=ON \ ${{ matrix.idx64-flags }} \ -DCMAKE_C_COMPILER_LAUNCHER=ccache \ From bf0b09d62254144adae42ec9726d6406bcbfe4fb Mon Sep 17 00:00:00 2001 From: Martin Kroeker Date: Wed, 21 May 2025 16:51:38 +0200 Subject: [PATCH 9/9] Update CMakeLists.txt --- ctest/CMakeLists.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ctest/CMakeLists.txt b/ctest/CMakeLists.txt index 03b157843c..83a7150057 100644 --- a/ctest/CMakeLists.txt +++ b/ctest/CMakeLists.txt @@ -6,7 +6,7 @@ enable_language(Fortran) endif() set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -DADD${BU} -DCBLAS") -if (BINARY32 AND CMAKE_C_PLATFORM_ID MATCHES "MinGW" AND CMAKE_Fortran_COMPILER_VERSION VERSION_EQUAL 14.2) +if (BINARY32 AND CMAKE_C_PLATFORM_ID MATCHES "MinGW" AND CMAKE_Fortran_COMPILER_VERSION VERSION_GREATER 14.1) list(REMOVE_ITEM ${CMAKE_Fortran_FLAGS} -O3 -O2 -O1 -Os) set (CMAKE_Fortran_FLAGS_RELEASE "" CACHE STRING "" FORCE) endif()