From d18813b867c26c7c79849a0db440d701255da49b Mon Sep 17 00:00:00 2001
From: Sakthivel Velumani <velumani@eurecom.fr>
Date: Fri, 21 Oct 2022 18:47:58 -0400
Subject: [PATCH] Native AVX intrensic call as macro

---
 CMakeLists.txt                   |  2 +-
 cmake_targets/tools/build_helper | 20 +++++++-------------
 2 files changed, 8 insertions(+), 14 deletions(-)

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 8101f9f6e1..6da0d206cd 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -289,7 +289,7 @@ set(CMAKE_EXE_LINKER_FLAGS  "${CMAKE_EXE_LINKER_FLAGS} -ggdb2 -Wl,-rpath -Wl,${C
 # set a flag for changes in the source code
 # these changes are related to hardcoded path to include .h files
 set(debugOpt "-ggdb2 -DMALLOC_CHECK_=3 -fno-delete-null-pointer-checks")
-set(CMAKE_C_FLAGS_DEBUG "${debugOpt} -Og")
+set(CMAKE_C_FLAGS_DEBUG "${debugOpt} -O0")
 set(CMAKE_C_FLAGS_RELWITHDEBINFO "${debugOpt} -O2")
 set(CMAKE_C_FLAGS_RELEASE "-O3")
 
diff --git a/cmake_targets/tools/build_helper b/cmake_targets/tools/build_helper
index 423389aadc..6a308deaaa 100755
--- a/cmake_targets/tools/build_helper
+++ b/cmake_targets/tools/build_helper
@@ -926,23 +926,17 @@ install_simde_from_source(){
     $SUDO patch /usr/include/simde/x86/avx.h << FIN
 --- /usr/include/simde/x86/avx.h.old	2022-10-03 19:17:39.828223432 +0200
 +++ /usr/include/simde/x86/avx.h	2022-10-05 16:19:55.086019445 +0200
-@@ -3636,12 +3636,16 @@
- SIMDE_FUNCTION_ATTRIBUTES
- simde__m256i simde_mm256_insertf128_si256(simde__m256i a, simde__m128i b, int imm8)
-     SIMDE_REQUIRE_CONSTANT_RANGE(imm8, 0, 1) {
-+#if defined(SIMDE_X86_AVX_NATIVE) 
-+   return _mm256_insertf128_si256(a, b, imm8);
-+#else
-   simde__m256i_private a_ = simde__m256i_to_private(a);
-   simde__m128i_private b_ = simde__m128i_to_private(b);
- 
-   a_.m128i_private[imm8] = b_;
- 
+@@ -3643,6 +3643,9 @@
+ simde__m256i simde_mm256_insertf128_si256(simde__m256i a, simde__m128i b, int im
+
    return simde__m256i_from_private(a_);
-+#endif
  }
++#if defined(SIMDE_X86_AVX_NATIVE)
++  #define simde_mm256_insertf128_si256(a, b, imm8) _mm256_insertf128_si256(a, b, imm8)
++#endif
  #if defined(SIMDE_X86_AVX_ENABLE_NATIVE_ALIASES)
    #undef _mm256_insertf128_si256
+   #define _mm256_insertf128_si256(a, b, imm8) simde_mm256_insertf128_si256(a, b, imm8)
 FIN
 }