Skip to content

Commit

Permalink
MRx2 GEMM/IGEMM fma3 variant
Browse files Browse the repository at this point in the history
PiperOrigin-RevId: 719127729
  • Loading branch information
fbarchard authored and xnnpack-bot committed Jan 24, 2025
1 parent a108468 commit 6d2b569
Show file tree
Hide file tree
Showing 25 changed files with 1,484 additions and 70 deletions.
44 changes: 33 additions & 11 deletions bench/f32-gemm-minmax.cc
Original file line number Diff line number Diff line change
Expand Up @@ -3421,6 +3421,17 @@

BENCHMARK_GEMM(f32_gemm_minmax_ukernel_4x2c4__sse)

static void f32_gemm_minmax_ukernel_6x2c4__sse(benchmark::State& state, const char* net) {
GEMMBenchmark(state,
xnn_f32_gemm_minmax_ukernel_6x2c4__sse,
xnn_init_f32_minmax_scalar_params,
xnn_pack_f32_gemm_goi_w,
/*mr=*/6, /*nr=*/2, /*kr=*/4, /*sr=*/1,
/*isa_check=*/nullptr);
}

BENCHMARK_GEMM(f32_gemm_minmax_ukernel_6x2c4__sse)

static void f32_gemm_minmax_ukernel_4x8__sse_dup(benchmark::State& state, const char* net) {
GEMMBenchmark(state,
xnn_f32_gemm_minmax_ukernel_4x8__sse_dup,
Expand Down Expand Up @@ -3487,17 +3498,6 @@

BENCHMARK_GEMM(f32_gemm_minmax_ukernel_5x8s4__sse)

static void f32_gemm_minmax_ukernel_6x2c4__sse(benchmark::State& state, const char* net) {
GEMMBenchmark(state,
xnn_f32_gemm_minmax_ukernel_6x2c4__sse,
xnn_init_f32_minmax_scalar_params,
xnn_pack_f32_gemm_goi_w,
/*mr=*/6, /*nr=*/2, /*kr=*/4, /*sr=*/1,
/*isa_check=*/nullptr);
}

BENCHMARK_GEMM(f32_gemm_minmax_ukernel_6x2c4__sse)

static void f32_gemm_minmax_ukernel_6x8__sse_dup(benchmark::State& state, const char* net) {
GEMMBenchmark(state,
xnn_f32_gemm_minmax_ukernel_6x8__sse_dup,
Expand Down Expand Up @@ -3531,6 +3531,28 @@

BENCHMARK_GEMM(f32_gemm_minmax_ukernel_6x8s4__sse)

static void f32_gemm_minmax_ukernel_4x2c4__fma3(benchmark::State& state, const char* net) {
GEMMBenchmark(state,
xnn_f32_gemm_minmax_ukernel_4x2c4__fma3,
xnn_init_f32_minmax_scalar_params,
xnn_pack_f32_gemm_goi_w,
/*mr=*/4, /*nr=*/2, /*kr=*/4, /*sr=*/1,
benchmark::utils::CheckFMA3);
}

BENCHMARK_GEMM(f32_gemm_minmax_ukernel_4x2c4__fma3)

static void f32_gemm_minmax_ukernel_6x2c4__fma3(benchmark::State& state, const char* net) {
GEMMBenchmark(state,
xnn_f32_gemm_minmax_ukernel_6x2c4__fma3,
xnn_init_f32_minmax_scalar_params,
xnn_pack_f32_gemm_goi_w,
/*mr=*/6, /*nr=*/2, /*kr=*/4, /*sr=*/1,
benchmark::utils::CheckFMA3);
}

BENCHMARK_GEMM(f32_gemm_minmax_ukernel_6x2c4__fma3)

static void f32_gemm_minmax_ukernel_1x8__fma3_broadcast(benchmark::State& state, const char* net) {
GEMMBenchmark(state,
xnn_f32_gemm_minmax_ukernel_1x8__fma3_broadcast,
Expand Down
6 changes: 6 additions & 0 deletions cmake/gen/fma3_microkernels.cmake
Original file line number Diff line number Diff line change
Expand Up @@ -125,8 +125,10 @@ SET(NON_PROD_FMA3_MICROKERNEL_SRCS
src/f32-dwconv/gen/f32-dwconv-25p16c-minmax-fma3.c
src/f32-gemm/gen/f32-gemm-3x16-minmax-fma3-broadcast.c
src/f32-gemm/gen/f32-gemm-3x16s4-minmax-fma3-broadcast.c
src/f32-gemm/gen/f32-gemm-4x2c4-minmax-fma3.c
src/f32-gemm/gen/f32-gemm-4x16-minmax-fma3-broadcast.c
src/f32-gemm/gen/f32-gemm-5x16s4-minmax-fma3-broadcast.c
src/f32-gemm/gen/f32-gemm-6x2c4-minmax-fma3.c
src/f32-gemm/gen/f32-gemm-6x8-minmax-fma3-broadcast.c
src/f32-gemm/gen/f32-gemm-6x16-minmax-fma3-broadcast.c
src/f32-gemm/gen/f32-gemm-6x16s4-minmax-fma3-broadcast.c
Expand All @@ -150,9 +152,11 @@ SET(NON_PROD_FMA3_MICROKERNEL_SRCS
src/f32-gemminc/gen/f32-gemminc-8x8-minmax-fma3-broadcast.c
src/f32-igemm/gen/f32-igemm-3x16-minmax-fma3-broadcast.c
src/f32-igemm/gen/f32-igemm-3x16s4-minmax-fma3-broadcast.c
src/f32-igemm/gen/f32-igemm-4x2c4-minmax-fma3.c
src/f32-igemm/gen/f32-igemm-4x16-minmax-fma3-broadcast.c
src/f32-igemm/gen/f32-igemm-5x16-minmax-fma3-broadcast.c
src/f32-igemm/gen/f32-igemm-5x16s4-minmax-fma3-broadcast.c
src/f32-igemm/gen/f32-igemm-6x2c4-minmax-fma3.c
src/f32-igemm/gen/f32-igemm-6x8-minmax-fma3-broadcast.c
src/f32-igemm/gen/f32-igemm-6x16-minmax-fma3-broadcast-prfm.c
src/f32-igemm/gen/f32-igemm-6x16-minmax-fma3-broadcast.c
Expand All @@ -167,7 +171,9 @@ SET(NON_PROD_FMA3_MICROKERNEL_SRCS
src/f32-qc4w-gemm/gen/f32-qc4w-gemm-8x16-minmax-fma3-broadcast.c
src/f32-qc8w-gemm/gen/f32-qc8w-gemm-2x16-minmax-fma3-broadcast.c
src/f32-qc8w-gemm/gen/f32-qc8w-gemm-3x16-minmax-fma3-broadcast.c
src/f32-qc8w-gemm/gen/f32-qc8w-gemm-4x2c4-minmax-fma3.c
src/f32-qc8w-gemm/gen/f32-qc8w-gemm-4x16-minmax-fma3-broadcast.c
src/f32-qc8w-gemm/gen/f32-qc8w-gemm-6x2c4-minmax-fma3.c
src/f32-qc8w-gemm/gen/f32-qc8w-gemm-6x16-minmax-fma3-broadcast.c
src/f32-qc8w-gemm/gen/f32-qc8w-gemm-7x16-minmax-fma3-broadcast.c
src/f32-qc8w-gemm/gen/f32-qc8w-gemm-8x16-minmax-fma3-broadcast.c
Expand Down
6 changes: 6 additions & 0 deletions gen/fma3_microkernels.bzl
Original file line number Diff line number Diff line change
Expand Up @@ -122,8 +122,10 @@ NON_PROD_FMA3_MICROKERNEL_SRCS = [
"src/f32-dwconv/gen/f32-dwconv-25p16c-minmax-fma3.c",
"src/f32-gemm/gen/f32-gemm-3x16-minmax-fma3-broadcast.c",
"src/f32-gemm/gen/f32-gemm-3x16s4-minmax-fma3-broadcast.c",
"src/f32-gemm/gen/f32-gemm-4x2c4-minmax-fma3.c",
"src/f32-gemm/gen/f32-gemm-4x16-minmax-fma3-broadcast.c",
"src/f32-gemm/gen/f32-gemm-5x16s4-minmax-fma3-broadcast.c",
"src/f32-gemm/gen/f32-gemm-6x2c4-minmax-fma3.c",
"src/f32-gemm/gen/f32-gemm-6x8-minmax-fma3-broadcast.c",
"src/f32-gemm/gen/f32-gemm-6x16-minmax-fma3-broadcast.c",
"src/f32-gemm/gen/f32-gemm-6x16s4-minmax-fma3-broadcast.c",
Expand All @@ -147,9 +149,11 @@ NON_PROD_FMA3_MICROKERNEL_SRCS = [
"src/f32-gemminc/gen/f32-gemminc-8x8-minmax-fma3-broadcast.c",
"src/f32-igemm/gen/f32-igemm-3x16-minmax-fma3-broadcast.c",
"src/f32-igemm/gen/f32-igemm-3x16s4-minmax-fma3-broadcast.c",
"src/f32-igemm/gen/f32-igemm-4x2c4-minmax-fma3.c",
"src/f32-igemm/gen/f32-igemm-4x16-minmax-fma3-broadcast.c",
"src/f32-igemm/gen/f32-igemm-5x16-minmax-fma3-broadcast.c",
"src/f32-igemm/gen/f32-igemm-5x16s4-minmax-fma3-broadcast.c",
"src/f32-igemm/gen/f32-igemm-6x2c4-minmax-fma3.c",
"src/f32-igemm/gen/f32-igemm-6x8-minmax-fma3-broadcast.c",
"src/f32-igemm/gen/f32-igemm-6x16-minmax-fma3-broadcast-prfm.c",
"src/f32-igemm/gen/f32-igemm-6x16-minmax-fma3-broadcast.c",
Expand All @@ -164,7 +168,9 @@ NON_PROD_FMA3_MICROKERNEL_SRCS = [
"src/f32-qc4w-gemm/gen/f32-qc4w-gemm-8x16-minmax-fma3-broadcast.c",
"src/f32-qc8w-gemm/gen/f32-qc8w-gemm-2x16-minmax-fma3-broadcast.c",
"src/f32-qc8w-gemm/gen/f32-qc8w-gemm-3x16-minmax-fma3-broadcast.c",
"src/f32-qc8w-gemm/gen/f32-qc8w-gemm-4x2c4-minmax-fma3.c",
"src/f32-qc8w-gemm/gen/f32-qc8w-gemm-4x16-minmax-fma3-broadcast.c",
"src/f32-qc8w-gemm/gen/f32-qc8w-gemm-6x2c4-minmax-fma3.c",
"src/f32-qc8w-gemm/gen/f32-qc8w-gemm-6x16-minmax-fma3-broadcast.c",
"src/f32-qc8w-gemm/gen/f32-qc8w-gemm-7x16-minmax-fma3-broadcast.c",
"src/f32-qc8w-gemm/gen/f32-qc8w-gemm-8x16-minmax-fma3-broadcast.c",
Expand Down
6 changes: 4 additions & 2 deletions scripts/generate-f32-gemm.sh
Original file line number Diff line number Diff line change
Expand Up @@ -534,8 +534,10 @@ tools/xngen src/f32-gemm/sse-shuffle.c.in -D MR=6 -D NR=8 -D INC=0 -D SSE=1 -D D
tools/xngen src/f32-gemm/sse-shuffle.c.in -D MR=6 -D NR=8 -D INC=1 -D SSE=1 -D DATATYPE=F32 -o src/f32-gemminc/gen/f32-gemminc-6x8s4-minmax-sse.c &

### MRx2 micro-kernels
tools/xngen src/f32-gemm/MRx2c4-sse.c.in -D MR=4 -D NR=2 -D SSE=1 -D DATATYPE=F32 -o src/f32-gemm/gen/f32-gemm-4x2c4-minmax-sse.c &
tools/xngen src/f32-gemm/MRx2c4-sse.c.in -D MR=6 -D NR=2 -D SSE=1 -D DATATYPE=F32 -o src/f32-gemm/gen/f32-gemm-6x2c4-minmax-sse.c &
tools/xngen src/f32-gemm/MRx2c4-sse.c.in -D MR=4 -D NR=2 -D SSE=1 -D FMA=0 -D DATATYPE=F32 -o src/f32-gemm/gen/f32-gemm-4x2c4-minmax-sse.c &
tools/xngen src/f32-gemm/MRx2c4-sse.c.in -D MR=6 -D NR=2 -D SSE=1 -D FMA=0 -D DATATYPE=F32 -o src/f32-gemm/gen/f32-gemm-6x2c4-minmax-sse.c &
tools/xngen src/f32-gemm/MRx2c4-sse.c.in -D MR=4 -D NR=2 -D SSE=1 -D FMA=3 -D DATATYPE=F32 -o src/f32-gemm/gen/f32-gemm-4x2c4-minmax-fma3.c &
tools/xngen src/f32-gemm/MRx2c4-sse.c.in -D MR=6 -D NR=2 -D SSE=1 -D FMA=3 -D DATATYPE=F32 -o src/f32-gemm/gen/f32-gemm-6x2c4-minmax-fma3.c &

################################### x86 AVX ###################################
### AVX+BROADCAST micro-kernels
Expand Down
6 changes: 4 additions & 2 deletions scripts/generate-f32-igemm.sh
Original file line number Diff line number Diff line change
Expand Up @@ -315,8 +315,10 @@ tools/xngen src/f32-igemm/sse-shuffle.c.in -D MR=5 -D NR=8 -o src/f32-igemm/gen/
tools/xngen src/f32-igemm/sse-shuffle.c.in -D MR=6 -D NR=8 -o src/f32-igemm/gen/f32-igemm-6x8s4-minmax-sse.c &

### MRx2 micro-kernels
tools/xngen src/f32-igemm/MRx2c4-sse.c.in -D MR=4 -D NR=2 -o src/f32-igemm/gen/f32-igemm-4x2c4-minmax-sse.c &
tools/xngen src/f32-igemm/MRx2c4-sse.c.in -D MR=6 -D NR=2 -o src/f32-igemm/gen/f32-igemm-6x2c4-minmax-sse.c &
tools/xngen src/f32-igemm/MRx2c4-sse.c.in -D MR=4 -D NR=2 -D FMA=0 -o src/f32-igemm/gen/f32-igemm-4x2c4-minmax-sse.c &
tools/xngen src/f32-igemm/MRx2c4-sse.c.in -D MR=6 -D NR=2 -D FMA=0 -o src/f32-igemm/gen/f32-igemm-6x2c4-minmax-sse.c &
tools/xngen src/f32-igemm/MRx2c4-sse.c.in -D MR=4 -D NR=2 -D FMA=3 -o src/f32-igemm/gen/f32-igemm-4x2c4-minmax-fma3.c &
tools/xngen src/f32-igemm/MRx2c4-sse.c.in -D MR=6 -D NR=2 -D FMA=3 -o src/f32-igemm/gen/f32-igemm-6x2c4-minmax-fma3.c &

################################### x86 AVX ###################################
### AVX+BROADCAST micro-kernels
Expand Down
6 changes: 4 additions & 2 deletions scripts/generate-f32-qc8w-gemm.sh
Original file line number Diff line number Diff line change
Expand Up @@ -272,8 +272,10 @@ tools/xngen src/f32-gemm/sse-shuffle.c.in -D MR=5 -D NR=8 -D INC=0 -D SSE=4 -D D
tools/xngen src/f32-gemm/sse-shuffle.c.in -D MR=6 -D NR=8 -D INC=0 -D SSE=4 -D DATATYPE=QC8 -o src/f32-qc8w-gemm/gen/f32-qc8w-gemm-6x8s4-minmax-sse41.c &

### MRx2 micro-kernels
tools/xngen src/f32-gemm/MRx2c4-sse.c.in -D MR=4 -D NR=2 -D SSE=4 -D DATATYPE=QC8 -o src/f32-qc8w-gemm/gen/f32-qc8w-gemm-4x2c4-minmax-sse41.c &
tools/xngen src/f32-gemm/MRx2c4-sse.c.in -D MR=6 -D NR=2 -D SSE=4 -D DATATYPE=QC8 -o src/f32-qc8w-gemm/gen/f32-qc8w-gemm-6x2c4-minmax-sse41.c &
tools/xngen src/f32-gemm/MRx2c4-sse.c.in -D MR=4 -D NR=2 -D SSE=4 -D FMA=0 -D DATATYPE=QC8 -o src/f32-qc8w-gemm/gen/f32-qc8w-gemm-4x2c4-minmax-sse41.c &
tools/xngen src/f32-gemm/MRx2c4-sse.c.in -D MR=6 -D NR=2 -D SSE=4 -D FMA=0 -D DATATYPE=QC8 -o src/f32-qc8w-gemm/gen/f32-qc8w-gemm-6x2c4-minmax-sse41.c &
tools/xngen src/f32-gemm/MRx2c4-sse.c.in -D MR=4 -D NR=2 -D SSE=4 -D FMA=3 -D DATATYPE=QC8 -o src/f32-qc8w-gemm/gen/f32-qc8w-gemm-4x2c4-minmax-fma3.c &
tools/xngen src/f32-gemm/MRx2c4-sse.c.in -D MR=6 -D NR=2 -D SSE=4 -D FMA=3 -D DATATYPE=QC8 -o src/f32-qc8w-gemm/gen/f32-qc8w-gemm-6x2c4-minmax-fma3.c &

################################### x86 AVX ###################################
### AVX BROADCAST micro-kernels
Expand Down
14 changes: 10 additions & 4 deletions src/f32-gemm/MRx2c4-sse.c.in
Original file line number Diff line number Diff line change
Expand Up @@ -20,9 +20,9 @@ $if DATATYPE == "QC8":

$RANGE_MRX2 = list(range(0, MR, 2))
$if DATATYPE in ["QC8", "QC4"]:
$ISA = {2: "sse2", 4: "sse41"}[SSE]
$ISA = "fma3" if FMA else {2: "sse2", 4: "sse41"}[SSE]
$else:
$ISA = "sse"
$ISA = "fma3" if FMA else "sse"
$DATATYPE_SPEC = {"F32": "f32", "QC8": "f32_qc8w", "QC4": "f32_qc4w"}[DATATYPE]
void xnn_${DATATYPE_SPEC}_gemm_minmax_ukernel_${MR}x${NR}c4__${ISA}(
size_t mr,
Expand Down Expand Up @@ -121,7 +121,10 @@ void xnn_${DATATYPE_SPEC}_gemm_minmax_ukernel_${MR}x${NR}c4__${ISA}(

$for M in range(MR):
$for N in range(NR):
vacc${M}x${N}c4 = _mm_add_ps(vacc${M}x${N}c4, _mm_mul_ps(va${M}, vb${N}));
$if FMA == 3:
vacc${M}x${N}c4 = _mm_fmadd_ps(va${M}, vb${N}, vacc${M}x${N}c4);
$else:
vacc${M}x${N}c4 = _mm_add_ps(vacc${M}x${N}c4, _mm_mul_ps(va${M}, vb${N}));
}
if XNN_UNLIKELY(k != 0) {
$for M in range(MR):
Expand Down Expand Up @@ -154,7 +157,10 @@ void xnn_${DATATYPE_SPEC}_gemm_minmax_ukernel_${MR}x${NR}c4__${ISA}(

$for M in range(MR):
$for N in range(NR):
vacc${M}x${N}c4 = _mm_add_ps(vacc${M}x${N}c4, _mm_mul_ps(_mm_andnot_ps(vmask${N}, va${M}), vb${N}));
$if FMA == 3:
vacc${M}x${N}c4 = _mm_fmadd_ps(_mm_andnot_ps(vmask${N}, va${M}), vb${N}, vacc${M}x${N}c4);
$else:
vacc${M}x${N}c4 = _mm_add_ps(vacc${M}x${N}c4, _mm_mul_ps(_mm_andnot_ps(vmask${N}, va${M}), vb${N}));
}

$for M in range(MR):
Expand Down
165 changes: 165 additions & 0 deletions src/f32-gemm/gen/f32-gemm-4x2c4-minmax-fma3.c
Original file line number Diff line number Diff line change
@@ -0,0 +1,165 @@
// Auto-generated file. Do not edit!
// Template: src/f32-gemm/MRx2c4-sse.c.in
// Generator: tools/xngen
//
// Copyright 2019 Google LLC
//
// This source code is licensed under the BSD-style license found in the
// LICENSE file in the root directory of this source tree.

#include <assert.h>

#include <xmmintrin.h>

#include "xnnpack/gemm.h"


void xnn_f32_gemm_minmax_ukernel_4x2c4__fma3(
size_t mr,
size_t nc,
size_t kc,
const float* restrict a,
size_t a_stride,
const float* restrict w,
float* restrict c,
size_t cm_stride,
size_t cn_stride,
const union xnn_f32_minmax_params params[restrict XNN_MIN_ELEMENTS(1)]) XNN_OOB_READS
{
assert(mr != 0);
assert(mr <= 4);
assert(nc != 0);
assert(kc != 0);
assert(kc % sizeof(float) == 0);
assert(a != NULL);
assert(w != NULL);
assert(c != NULL);

const float* a0 = a;
float* c0 = c;
const float* a1 = (const float*) ((uintptr_t) a0 + a_stride);
float* c1 = (float*) ((uintptr_t) c0 + cm_stride);
if XNN_UNPREDICTABLE(mr < 2) {
a1 = a0;
c1 = c0;
}
const float* a2 = (const float*) ((uintptr_t) a1 + a_stride);
float* c2 = (float*) ((uintptr_t) c1 + cm_stride);
if XNN_UNPREDICTABLE(mr <= 2) {
a2 = a1;
c2 = c1;
}
const float* a3 = (const float*) ((uintptr_t) a2 + a_stride);
float* c3 = (float*) ((uintptr_t) c2 + cm_stride);
if XNN_UNPREDICTABLE(mr != 4) {
a3 = a2;
c3 = c2;
}

const __m128 vmin = _mm_set1_ps(params->scalar.min);
const __m128 vmax = _mm_set1_ps(params->scalar.max);
XNN_FORCE_REALIZATION(vmin);
XNN_FORCE_REALIZATION(vmax);

do {
__m128 vacc0x0c4 = _mm_load_ss(w);
__m128 vacc0x1c4 = _mm_load_ss(w + 1);
__m128 vacc1x0c4 = vacc0x0c4;
__m128 vacc1x1c4 = vacc0x1c4;
__m128 vacc2x0c4 = vacc0x0c4;
__m128 vacc2x1c4 = vacc0x1c4;
__m128 vacc3x0c4 = vacc0x0c4;
__m128 vacc3x1c4 = vacc0x1c4;
w += 2;

size_t k = kc;
for (; k >= 4 * sizeof(float); k -= 4 * sizeof(float)) {
const __m128 va0 = _mm_loadu_ps(a0);
a0 += 4;
const __m128 va1 = _mm_loadu_ps(a1);
a1 += 4;
const __m128 va2 = _mm_loadu_ps(a2);
a2 += 4;
const __m128 va3 = _mm_loadu_ps(a3);
a3 += 4;

const __m128 vb0 = _mm_loadu_ps(w);
const __m128 vb1 = _mm_loadu_ps(w + 4);
w += 8;

vacc0x0c4 = _mm_fmadd_ps(va0, vb0, vacc0x0c4);
vacc0x1c4 = _mm_fmadd_ps(va0, vb1, vacc0x1c4);
vacc1x0c4 = _mm_fmadd_ps(va1, vb0, vacc1x0c4);
vacc1x1c4 = _mm_fmadd_ps(va1, vb1, vacc1x1c4);
vacc2x0c4 = _mm_fmadd_ps(va2, vb0, vacc2x0c4);
vacc2x1c4 = _mm_fmadd_ps(va2, vb1, vacc2x1c4);
vacc3x0c4 = _mm_fmadd_ps(va3, vb0, vacc3x0c4);
vacc3x1c4 = _mm_fmadd_ps(va3, vb1, vacc3x1c4);
}
if XNN_UNLIKELY(k != 0) {
const __m128 va0 = _mm_loadu_ps(a0);
a0 = (const float*) ((uintptr_t) a0 + k);
const __m128 va1 = _mm_loadu_ps(a1);
a1 = (const float*) ((uintptr_t) a1 + k);
const __m128 va2 = _mm_loadu_ps(a2);
a2 = (const float*) ((uintptr_t) a2 + k);
const __m128 va3 = _mm_loadu_ps(a3);
a3 = (const float*) ((uintptr_t) a3 + k);

const __m128 vb0 = _mm_loadu_ps(w);
const __m128 vb1 = _mm_loadu_ps(w + 4);
w += 8;

const __m128 vmask0 = _mm_cmpeq_ps(_mm_setzero_ps(), vb0);
const __m128 vmask1 = _mm_cmpeq_ps(_mm_setzero_ps(), vb1);

vacc0x0c4 = _mm_fmadd_ps(_mm_andnot_ps(vmask0, va0), vb0, vacc0x0c4);
vacc0x1c4 = _mm_fmadd_ps(_mm_andnot_ps(vmask1, va0), vb1, vacc0x1c4);
vacc1x0c4 = _mm_fmadd_ps(_mm_andnot_ps(vmask0, va1), vb0, vacc1x0c4);
vacc1x1c4 = _mm_fmadd_ps(_mm_andnot_ps(vmask1, va1), vb1, vacc1x1c4);
vacc2x0c4 = _mm_fmadd_ps(_mm_andnot_ps(vmask0, va2), vb0, vacc2x0c4);
vacc2x1c4 = _mm_fmadd_ps(_mm_andnot_ps(vmask1, va2), vb1, vacc2x1c4);
vacc3x0c4 = _mm_fmadd_ps(_mm_andnot_ps(vmask0, va3), vb0, vacc3x0c4);
vacc3x1c4 = _mm_fmadd_ps(_mm_andnot_ps(vmask1, va3), vb1, vacc3x1c4);
}

const __m128 vacc0x01c2 = _mm_add_ps(_mm_unpacklo_ps(vacc0x0c4, vacc0x1c4), _mm_unpackhi_ps(vacc0x0c4, vacc0x1c4));
const __m128 vacc1x01c2 = _mm_add_ps(_mm_unpacklo_ps(vacc1x0c4, vacc1x1c4), _mm_unpackhi_ps(vacc1x0c4, vacc1x1c4));
const __m128 vacc2x01c2 = _mm_add_ps(_mm_unpacklo_ps(vacc2x0c4, vacc2x1c4), _mm_unpackhi_ps(vacc2x0c4, vacc2x1c4));
const __m128 vacc3x01c2 = _mm_add_ps(_mm_unpacklo_ps(vacc3x0c4, vacc3x1c4), _mm_unpackhi_ps(vacc3x0c4, vacc3x1c4));

__m128 vacc01x01 = _mm_add_ps(_mm_movelh_ps(vacc0x01c2, vacc1x01c2), _mm_movehl_ps(vacc1x01c2, vacc0x01c2));
__m128 vacc23x01 = _mm_add_ps(_mm_movelh_ps(vacc2x01c2, vacc3x01c2), _mm_movehl_ps(vacc3x01c2, vacc2x01c2));

vacc01x01 = _mm_min_ps(vacc01x01, vmax);
vacc23x01 = _mm_min_ps(vacc23x01, vmax);

vacc01x01 = _mm_max_ps(vacc01x01, vmin);
vacc23x01 = _mm_max_ps(vacc23x01, vmin);

if XNN_LIKELY(nc >= 2) {
_mm_storel_pi((__m64*) c0, vacc01x01);
c0 = (float*) ((uintptr_t) c0 + cn_stride);
a0 = (const float*) ((uintptr_t) a0 - kc);
_mm_storeh_pi((__m64*) c1, vacc01x01);
c1 = (float*) ((uintptr_t) c1 + cn_stride);
a1 = (const float*) ((uintptr_t) a1 - kc);
_mm_storel_pi((__m64*) c2, vacc23x01);
c2 = (float*) ((uintptr_t) c2 + cn_stride);
a2 = (const float*) ((uintptr_t) a2 - kc);
_mm_storeh_pi((__m64*) c3, vacc23x01);
c3 = (float*) ((uintptr_t) c3 + cn_stride);
a3 = (const float*) ((uintptr_t) a3 - kc);

nc -= 2;
} else {
assert(nc == 1);
_mm_store_ss(c0, vacc01x01);
_mm_store_ss(c1, _mm_movehl_ps(vacc01x01, vacc01x01));
_mm_store_ss(c2, vacc23x01);
_mm_store_ss(c3, _mm_movehl_ps(vacc23x01, vacc23x01));

nc = 0;
}
} while (nc != 0);
}
Loading

0 comments on commit 6d2b569

Please sign in to comment.