merge main branch

StgSharp.Native/sn-src/k_panel.c

@@ -41,6 +41,7 @@ DECLARE_BUILD_PANEL(avx, float)
         }
 }
 
+<<<<<<< HEAD
 DECLARE_BUILD_PANEL(sse, float)
 {
         /* Single kernel -> 4 columns, each is one __m128 column vector. */
@@ -86,6 +87,8 @@ DECLARE_BUILD_PANEL(512, float)
         }
 }
 
+=======
+>>>>>>> 7bcb460a3994dda40f24cae0044b5a36f4f16515
 DECLARE_STORE_PANEL(avx, float)
 {
         const int Q = 8; /* fixed for AVX float panel */
@@ -141,6 +144,7 @@ DECLARE_STORE_PANEL(avx, float)
                 k_lb->xmm[kc_col] = bot128;
         }
 }
+<<<<<<< HEAD
 
 DECLARE_STORE_PANEL(sse, float)
 {
@@ -187,3 +191,5 @@ DECLARE_STORE_PANEL(512, float)
                 k[blk_col][3]->xmm[kc_col] = r3;
         }
 }
+=======
+>>>>>>> 7bcb460a3994dda40f24cae0044b5a36f4f16515