From bd795cb04011968265a702ad00ab45af30cf5fd4 Mon Sep 17 00:00:00 2001
From: kjpus <35301243+kjpus@users.noreply.github.com>
Date: Mon, 27 Jan 2020 14:54:00 -0500
Subject: [fftw3] Fix SIMD compiler flag and mingw build failure (#9794)

* [fftw3] Fix SIMD compiler flag and mingw build failure

* Use vcpkg_check_features and single ENABLE_[SIMD]
---
 ports/fftw3/aligned_malloc.patch | 38 ++++++++++++++++++++++++
 ports/fftw3/fftw3_arch_fix.patch | 17 +++++++++++
 ports/fftw3/portfile.cmake       | 62 ++++++++--------------------------------
 3 files changed, 67 insertions(+), 50 deletions(-)
 create mode 100644 ports/fftw3/aligned_malloc.patch

diff --git a/ports/fftw3/aligned_malloc.patch b/ports/fftw3/aligned_malloc.patch
new file mode 100644
index 000000000..447ded62b
--- /dev/null
+++ b/ports/fftw3/aligned_malloc.patch
@@ -0,0 +1,38 @@
+diff --git a/cmake.config.h.in b/cmake.config.h.in
+index 1f4c505..fd763cc 100644
+--- a/cmake.config.h.in
++++ b/cmake.config.h.in
+@@ -112,6 +112,10 @@
+    you don't. */
+ #cmakedefine01 HAVE_DECL_POSIX_MEMALIGN
+
++/* Define to 1 if you have the declaration of `_aligned_malloc', and to 0 if you
++   don't. */
++#cmakedefine01 HAVE_DECL_ALIGNED_MALLOC
++
+ /* Define to 1 if you have the declaration of `sinl', and to 0 if you don't.
+    */
+ #cmakedefine01 HAVE_DECL_SINL
+@@ -184,6 +188,9 @@
+ /* Define to 1 if you have the `memalign' function. */
+ #cmakedefine HAVE_MEMALIGN 1
+
++/* Define to 1 if you have the `_aligned_malloc' function. */
++#cmakedefine HAVE_ALIGNED_MALLOC 1
++
+ /* Define to 1 if you have the `memmove' function. */
+ #cmakedefine HAVE_MEMMOVE 1
+
+diff --git a/kernel/kalloc.c b/kernel/kalloc.c
+index e42f6f3..ffc2257 100644
+--- a/kernel/kalloc.c
++++ b/kernel/kalloc.c
+@@ -103,7 +103,7 @@ void *X(kernel_malloc)(size_t n)
+ #    undef real_free
+ #    define real_free _mm_free
+
+-#  elif defined(_MSC_VER)
++#  elif defined(_MSC_VER) || defined (HAVE_ALIGNED_MALLOC)
+      /* MS Visual C++ 6.0 with a "Processor Pack" supports SIMD
+        and _aligned_malloc/free (uses malloc.h) */
+      p = (void *) _aligned_malloc(n, MIN_ALIGNMENT);
diff --git a/ports/fftw3/fftw3_arch_fix.patch b/ports/fftw3/fftw3_arch_fix.patch
index 922d86b97..0f1a7e5ae 100644
--- a/ports/fftw3/fftw3_arch_fix.patch
+++ b/ports/fftw3/fftw3_arch_fix.patch
@@ -2,6 +2,23 @@ diff --git a/CMakeLists.txt b/CMakeLists.txt
 index 95bd537a..245acc8f 100644
 --- a/CMakeLists.txt	
 +++ b/CMakeLists.txt
+@@ -66,6 +66,8 @@
+ check_prototype_definition (sinl "long double sinl( long double arg )" "0" math.h HAVE_DECL_SINL)
+ check_prototype_definition (memalign "void *memalign(size_t alignment, size_t size)" "0" malloc.h HAVE_DECL_MEMALIGN)
+ check_prototype_definition (posix_memalign "int posix_memalign(void **memptr, size_t alignment, size_t size)" "0" stdlib.h HAVE_DECL_POSIX_MEMALIGN)
++check_prototype_definition (_aligned_malloc "void* __cdecl _aligned_malloc(size_t _Size, size_t _Alignment)" "0" malloc.h HAVE_DECL_ALIGNED_MALLOC)
++ 
+ 
+ include (CheckSymbolExists)
+ check_symbol_exists (clock_gettime time.h HAVE_CLOCK_GETTIME)
+@@ -75,6 +77,7 @@
+ check_symbol_exists (srand48 stdlib.h HAVE_SRAND48)
+ check_symbol_exists (memalign malloc.h HAVE_MEMALIGN)
+ check_symbol_exists (posix_memalign stdlib.h HAVE_POSIX_MEMALIGN)
++check_symbol_exists (_aligned_malloc malloc.h HAVE_ALIGNED_MALLOC)
+ check_symbol_exists (mach_absolute_time mach/mach_time.h HAVE_MACH_ABSOLUTE_TIME)
+ check_symbol_exists (alloca alloca.h HAVE_ALLOCA)
+ if (NOT HAVE_ALLOCA)
 @@ -131,6 +131,7 @@ endif ()
  
  include (CheckCCompilerFlag)
diff --git a/ports/fftw3/portfile.cmake b/ports/fftw3/portfile.cmake
index 91f8f34a6..5132c9574 100644
--- a/ports/fftw3/portfile.cmake
+++ b/ports/fftw3/portfile.cmake
@@ -13,50 +13,19 @@ vcpkg_extract_source_archive_ex(
         omp_test.patch
         patch_targets.patch
         fftw3_arch_fix.patch
+        aligned_malloc.patch
 )
 
-if ("openmp" IN_LIST FEATURES)
-    set(ENABLE_OPENMP ON)
-else()
-    set(ENABLE_OPENMP OFF)
-endif()
-
-if ("avx" IN_LIST FEATURES)
-    set(HAVE_AVX ON)
-    set(HAVE_SSE ON)
-    set(HAVE_SSE2 ON)
-else()
-    set(HAVE_AVX OFF)
-endif()
-
-if ("avx2" IN_LIST FEATURES)
-    set(HAVE_AVX2 ON)
-    set(HAVE_FMA ON)
-    set(HAVE_SSE ON)
-    set(HAVE_SSE2 ON)
-else()
-    set(HAVE_AVX2 OFF)
-    set(HAVE_FMA OFF)
-endif()
-
-if ("sse" IN_LIST FEATURES)
-    set(HAVE_SSE ON)
-else()
-    set(HAVE_SSE OFF)
-endif()
-
-if ("sse2" IN_LIST FEATURES)
-    set(HAVE_SSE2 ON)
-    set(HAVE_SSE ON)
-else()
-    set(HAVE_SSE2 OFF)
-endif()
-
-if ("threads" IN_LIST FEATURES)
-    set(HAVE_THREADS ON)
-else()
-    set(HAVE_THREADS OFF)
-endif()
+vcpkg_check_features(
+    OUT_FEATURE_OPTIONS FEATURE_OPTIONS
+    openmp ENABLE_OPENMP
+    threads ENABLE_THREADS
+    threads WITH_COMBINED_THREADS
+    avx2 ENABLE_AVX2
+    avx ENABLE_AVX
+    sse2 ENABLE_SSE2
+    sse ENABLE_SSE
+)
 
 set(ENABLE_FLOAT_CMAKE fftw3f)
 set(ENABLE_LONG_DOUBLE_CMAKE fftw3l)
@@ -80,14 +49,7 @@ foreach(PRECISION ENABLE_FLOAT ENABLE_LONG_DOUBLE ENABLE_DEFAULT_PRECISION)
         PREFER_NINJA
         OPTIONS 
             -D${PRECISION}=ON
-            -DENABLE_OPENMP=${ENABLE_OPENMP}
-            -DHAVE_SSE=${HAVE_SSE}
-            -DHAVE_SSE2=${HAVE_SSE2}
-            -DHAVE_AVX=${HAVE_AVX}
-            -DHAVE_AVX2=${HAVE_AVX2}
-            -DHAVE_FMA=${HAVE_FMA}
-            -DENABLE_THREADS=${HAVE_THREADS}
-            -DWITH_COMBINED_THREADS=${HAVE_THREADS}
+            ${FEATURE_OPTIONS}
             -DBUILD_TESTS=OFF
         )
     endif()
-- 
cgit v1.2.3