From 73fcc62dba78e78d5c960c88d238dd8b53e318f2 Mon Sep 17 00:00:00 2001
From: "Uma Devi.S" <umadevi@multicorewareinc.com>
Date: Sat, 3 Aug 2024 13:35:23 +0530
Subject: [PATCH] Fix CI failure

---
 src/configs/binary-elementwise-config.c | 1 -
 src/xnnpack/simd/s16-avx512bw.h         | 2 +-
 src/xnnpack/simd/s32-neon.h             | 2 +-
 3 files changed, 2 insertions(+), 3 deletions(-)

diff --git a/src/configs/binary-elementwise-config.c b/src/configs/binary-elementwise-config.c
index e707ce322305..8fd2ae4cebe0 100644
--- a/src/configs/binary-elementwise-config.c
+++ b/src/configs/binary-elementwise-config.c
@@ -39,7 +39,6 @@ static struct xnn_binary_elementwise_config qs16_vmul_config = {0};
 static struct xnn_binary_elementwise_config qu8_vadd_config = {0};
 static struct xnn_binary_elementwise_config qu8_vmul_config = {0};
 
-<<<<<<< HEAD
 XNN_INIT_ONCE_GUARD(f16_vadd);
 XNN_INIT_ONCE_GUARD(f16_vdiv);
 XNN_INIT_ONCE_GUARD(f16_vmax);
diff --git a/src/xnnpack/simd/s16-avx512bw.h b/src/xnnpack/simd/s16-avx512bw.h
index 856bf2160eec..fc1d8c632a4b 100644
--- a/src/xnnpack/simd/s16-avx512bw.h
+++ b/src/xnnpack/simd/s16-avx512bw.h
@@ -69,7 +69,7 @@ static XNN_INLINE xnn_simd_s16_t xnn_set1_s16(int16_t v) {
 
 static XNN_INLINE xnn_simd_s16_t xnn_set1_or_load_s16(const int16_t* v) {
 #if XNN_ARCH_X86
-  return _mm512_load_epiint16_t((const __m128i*)v);
+  return _mm512_load_si512((const __m128i*)v);
 #else
   return _mm512_set1_epi16(*v);
 #endif
diff --git a/src/xnnpack/simd/s32-neon.h b/src/xnnpack/simd/s32-neon.h
index 83746daa402e..8093138ab3be 100644
--- a/src/xnnpack/simd/s32-neon.h
+++ b/src/xnnpack/simd/s32-neon.h
@@ -39,7 +39,7 @@ static XNN_INLINE xnn_simd_s32_t xnn_min_s32(xnn_simd_s32_t a,
 }
 
 static XNN_INLINE xnn_simd_s32_t xnn_cvt_s32_s16(xnn_simd_s32_t a, xnn_simd_s32_t b) {
-  return vcombine_s16(vqmovn_s32(a), vqmovn_s32(b));
+  return vreinterpretq_s32_s16(vcombine_s16(vqmovn_s32(a), vqmovn_s32(b)));
 }
 
 static XNN_INLINE float32x4_t xnn_cvt_s32_f32(xnn_simd_s32_t a) {