From b42f7a8a3853a4b747d8291a744efa402e15d9bf Mon Sep 17 00:00:00 2001
From: Even Rouault <even.rouault@spatialys.com>
Date: Sun, 3 Nov 2024 22:30:20 +0100
Subject: [PATCH] Use include_sse2neon.h in gcore/gdal_minmax_element.hpp

---
 gcore/gdal_minmax_element.hpp | 6 +++++-
 perftests/CMakeLists.txt      | 3 +++
 2 files changed, 8 insertions(+), 1 deletion(-)

diff --git a/gcore/gdal_minmax_element.hpp b/gcore/gdal_minmax_element.hpp
index 0da63649a0..a213c36eea 100644
--- a/gcore/gdal_minmax_element.hpp
+++ b/gcore/gdal_minmax_element.hpp
@@ -33,14 +33,18 @@
 #error "Please define the GDAL_MINMAXELT_NS macro to define the namespace"
 #endif
 
+#ifdef USE_NEON_OPTIMIZATIONS
+#include "include_sse2neon.h"
+#define GDAL_MINMAX_ELEMENT_USE_SSE2
+#else
 #if defined(__x86_64) || defined(_M_X64)
 #define GDAL_MINMAX_ELEMENT_USE_SSE2
 #endif
-
 #ifdef GDAL_MINMAX_ELEMENT_USE_SSE2
 // SSE2 header
 #include <emmintrin.h>
 #endif
+#endif
 
 #include "gdal_priv_templates.hpp"
 #if GDAL_VERSION < GDAL_COMPUTE_VERSION(3, 10, 0)
diff --git a/perftests/CMakeLists.txt b/perftests/CMakeLists.txt
index 1c7546dcef..a103013d3c 100644
--- a/perftests/CMakeLists.txt
+++ b/perftests/CMakeLists.txt
@@ -25,5 +25,8 @@ gdal_standard_includes(bench_ogr_c_api)
 target_link_libraries(bench_ogr_c_api PRIVATE $<TARGET_NAME:${GDAL_LIB_TARGET_NAME}>)
 
 gdal_test_target(testperf_gdal_minmax_element testperf_gdal_minmax_element.cpp)
+if (GDAL_ENABLE_ARM_NEON_OPTIMIZATIONS)
+  target_compile_definitions(testperf_gdal_minmax_element PRIVATE -DUSE_NEON_OPTIMIZATIONS)
+endif()
 add_test(NAME testperf_gdal_minmax_element COMMAND testperf_gdal_minmax_element)
 set_property(TEST testperf_gdal_minmax_element PROPERTY ENVIRONMENT "${TEST_ENV}")