Skip to content

Commit 95f29a0

Browse files
alankellyxnnpack-bot
authored andcommitted
Add WAsmSIMD rdsum accumulating microkernels
PiperOrigin-RevId: 627686402
1 parent 7189ed9 commit 95f29a0

17 files changed

+3397
-6
lines changed

bench/f32-rdsum.cc

Lines changed: 57 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -82,6 +82,63 @@ BENCHMARK_CAPTURE(f32_rsum_discontig, scalar_c4,
8282
#endif // XNN_ARCH_X86 || XNN_ARCH_X86_64
8383

8484

85+
#if XNN_ARCH_X86 || XNN_ARCH_X86_64
86+
BENCHMARK_CAPTURE(f32_rsum_discontig, avx_c16,
87+
xnn_f32_rdsum_ukernel_7p7x__avx_c16,
88+
xnn_init_f32_scale_avx_params,
89+
benchmark::utils::CheckAVX)
90+
->Apply(BenchmarkBatch)
91+
->UseRealTime();
92+
#endif // XNN_ARCH_X86 || XNN_ARCH_X86_64
93+
94+
95+
#if XNN_ARCH_X86 || XNN_ARCH_X86_64
96+
BENCHMARK_CAPTURE(f32_rsum_discontig, avx_c32,
97+
xnn_f32_rdsum_ukernel_7p7x__avx_c32,
98+
xnn_init_f32_scale_avx_params,
99+
benchmark::utils::CheckAVX)
100+
->Apply(BenchmarkBatch)
101+
->UseRealTime();
102+
#endif // XNN_ARCH_X86 || XNN_ARCH_X86_64
103+
104+
105+
#if XNN_ARCH_X86 || XNN_ARCH_X86_64
106+
BENCHMARK_CAPTURE(f32_rsum_discontig, avx_c64,
107+
xnn_f32_rdsum_ukernel_7p7x__avx_c64,
108+
xnn_init_f32_scale_avx_params,
109+
benchmark::utils::CheckAVX)
110+
->Apply(BenchmarkBatch)
111+
->UseRealTime();
112+
#endif // XNN_ARCH_X86 || XNN_ARCH_X86_64
113+
114+
115+
#if XNN_ARCH_WASMSIMD || XNN_ARCH_WASMRELAXEDSIMD
116+
BENCHMARK_CAPTURE(f32_rsum_discontig, wasmsimd_c16,
117+
xnn_f32_rdsum_ukernel_7p7x__wasmsimd_c16,
118+
xnn_init_f32_scale_scalar_params)
119+
->Apply(BenchmarkBatch)
120+
->UseRealTime();
121+
#endif // XNN_ARCH_WASMSIMD || XNN_ARCH_WASMRELAXEDSIMD
122+
123+
124+
#if XNN_ARCH_WASMSIMD || XNN_ARCH_WASMRELAXEDSIMD
125+
BENCHMARK_CAPTURE(f32_rsum_discontig, wasmsimd_c32,
126+
xnn_f32_rdsum_ukernel_7p7x__wasmsimd_c32,
127+
xnn_init_f32_scale_scalar_params)
128+
->Apply(BenchmarkBatch)
129+
->UseRealTime();
130+
#endif // XNN_ARCH_WASMSIMD || XNN_ARCH_WASMRELAXEDSIMD
131+
132+
133+
#if XNN_ARCH_WASMSIMD || XNN_ARCH_WASMRELAXEDSIMD
134+
BENCHMARK_CAPTURE(f32_rsum_discontig, wasmsimd_c64,
135+
xnn_f32_rdsum_ukernel_7p7x__wasmsimd_c64,
136+
xnn_init_f32_scale_scalar_params)
137+
->Apply(BenchmarkBatch)
138+
->UseRealTime();
139+
#endif // XNN_ARCH_WASMSIMD || XNN_ARCH_WASMRELAXEDSIMD
140+
141+
85142
#ifndef XNNPACK_BENCHMARK_NO_MAIN
86143
BENCHMARK_MAIN();
87144
#endif

cmake/microkernels.cmake

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -132,6 +132,9 @@ SET(ALL_AVX_MICROKERNEL_SRCS
132132
src/f32-qu8-vcvt/gen/f32-qu8-vcvt-avx-u16.c
133133
src/f32-qu8-vcvt/gen/f32-qu8-vcvt-avx-u24.c
134134
src/f32-qu8-vcvt/gen/f32-qu8-vcvt-avx-u32.c
135+
src/f32-rdsum/gen/f32-rdsum-7p7x-minmax-avx-c16.c
136+
src/f32-rdsum/gen/f32-rdsum-7p7x-minmax-avx-c32.c
137+
src/f32-rdsum/gen/f32-rdsum-7p7x-minmax-avx-c64.c
135138
src/f32-rminmax/gen/f32-rmax-avx-u8.c
136139
src/f32-rminmax/gen/f32-rmax-avx-u16-acc2.c
137140
src/f32-rminmax/gen/f32-rmax-avx-u24-acc3.c
@@ -8897,6 +8900,9 @@ SET(ALL_WASMSIMD_MICROKERNEL_SRCS
88978900
src/f32-raddstoreexpminusmax/gen/f32-raddstoreexpminusmax-wasmsimd-rr2-p5-u20-acc2.c
88988901
src/f32-raddstoreexpminusmax/gen/f32-raddstoreexpminusmax-wasmsimd-rr2-p5-u20-acc5.c
88998902
src/f32-raddstoreexpminusmax/gen/f32-raddstoreexpminusmax-wasmsimd-rr2-p5-u20.c
8903+
src/f32-rdsum/gen/f32-rdsum-7p7x-minmax-wasmsimd-c16.c
8904+
src/f32-rdsum/gen/f32-rdsum-7p7x-minmax-wasmsimd-c32.c
8905+
src/f32-rdsum/gen/f32-rdsum-7p7x-minmax-wasmsimd-c64.c
89008906
src/f32-rminmax/gen/f32-rmax-wasmsimd-minmax-u4.c
89018907
src/f32-rminmax/gen/f32-rmax-wasmsimd-minmax-u8-acc2.c
89028908
src/f32-rminmax/gen/f32-rmax-wasmsimd-minmax-u12-acc3.c

microkernels.bzl

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -129,6 +129,9 @@ ALL_AVX_MICROKERNEL_SRCS = [
129129
"src/f32-qu8-vcvt/gen/f32-qu8-vcvt-avx-u16.c",
130130
"src/f32-qu8-vcvt/gen/f32-qu8-vcvt-avx-u24.c",
131131
"src/f32-qu8-vcvt/gen/f32-qu8-vcvt-avx-u32.c",
132+
"src/f32-rdsum/gen/f32-rdsum-7p7x-minmax-avx-c16.c",
133+
"src/f32-rdsum/gen/f32-rdsum-7p7x-minmax-avx-c32.c",
134+
"src/f32-rdsum/gen/f32-rdsum-7p7x-minmax-avx-c64.c",
132135
"src/f32-rminmax/gen/f32-rmax-avx-u8.c",
133136
"src/f32-rminmax/gen/f32-rmax-avx-u16-acc2.c",
134137
"src/f32-rminmax/gen/f32-rmax-avx-u24-acc3.c",
@@ -8932,6 +8935,9 @@ ALL_WASMSIMD_MICROKERNEL_SRCS = [
89328935
"src/f32-raddstoreexpminusmax/gen/f32-raddstoreexpminusmax-wasmsimd-rr2-p5-u20-acc2.c",
89338936
"src/f32-raddstoreexpminusmax/gen/f32-raddstoreexpminusmax-wasmsimd-rr2-p5-u20-acc5.c",
89348937
"src/f32-raddstoreexpminusmax/gen/f32-raddstoreexpminusmax-wasmsimd-rr2-p5-u20.c",
8938+
"src/f32-rdsum/gen/f32-rdsum-7p7x-minmax-wasmsimd-c16.c",
8939+
"src/f32-rdsum/gen/f32-rdsum-7p7x-minmax-wasmsimd-c32.c",
8940+
"src/f32-rdsum/gen/f32-rdsum-7p7x-minmax-wasmsimd-c64.c",
89358941
"src/f32-rminmax/gen/f32-rmax-wasmsimd-minmax-u4.c",
89368942
"src/f32-rminmax/gen/f32-rmax-wasmsimd-minmax-u8-acc2.c",
89378943
"src/f32-rminmax/gen/f32-rmax-wasmsimd-minmax-u12-acc3.c",

scripts/generate-f32-rdsum.sh

Lines changed: 12 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7,14 +7,24 @@
77
#################################### Scalar ###################################
88
tools/xngen src/f32-rdsum/scalar.c.in -D ACCUMULATORS=7 -o src/f32-rdsum/gen/f32-rdsum-7p7x-minmax-scalar.c &
99

10-
#################################### NEON ###################################
10+
#################################### NEON #####################################
1111
tools/xngen src/f32-rdsum/neon.c.in -D CHANNELS=16 -D ACCUMULATORS=7 -o src/f32-rdsum/gen/f32-rdsum-7p7x-minmax-neon-c16.c &
1212
tools/xngen src/f32-rdsum/neon.c.in -D CHANNELS=32 -D ACCUMULATORS=7 -o src/f32-rdsum/gen/f32-rdsum-7p7x-minmax-neon-c32.c &
1313
tools/xngen src/f32-rdsum/neon.c.in -D CHANNELS=64 -D ACCUMULATORS=7 -o src/f32-rdsum/gen/f32-rdsum-7p7x-minmax-neon-c64.c &
1414

15-
#################################### SSE ####################################
15+
#################################### SSE ######################################
1616
tools/xngen src/f32-rdsum/sse.c.in -D CHANNELS=16 -D ACCUMULATORS=7 -o src/f32-rdsum/gen/f32-rdsum-7p7x-minmax-sse-c16.c &
1717
tools/xngen src/f32-rdsum/sse.c.in -D CHANNELS=32 -D ACCUMULATORS=7 -o src/f32-rdsum/gen/f32-rdsum-7p7x-minmax-sse-c32.c &
1818
tools/xngen src/f32-rdsum/sse.c.in -D CHANNELS=64 -D ACCUMULATORS=7 -o src/f32-rdsum/gen/f32-rdsum-7p7x-minmax-sse-c64.c &
1919

20+
#################################### AVX ######################################
21+
tools/xngen src/f32-rdsum/avx.c.in -D CHANNELS=16 -D ACCUMULATORS=7 -o src/f32-rdsum/gen/f32-rdsum-7p7x-minmax-avx-c16.c &
22+
tools/xngen src/f32-rdsum/avx.c.in -D CHANNELS=32 -D ACCUMULATORS=7 -o src/f32-rdsum/gen/f32-rdsum-7p7x-minmax-avx-c32.c &
23+
tools/xngen src/f32-rdsum/avx.c.in -D CHANNELS=64 -D ACCUMULATORS=7 -o src/f32-rdsum/gen/f32-rdsum-7p7x-minmax-avx-c64.c &
24+
25+
#################################### WAsm SIMD ################################
26+
tools/xngen src/f32-rdsum/wasm-simd.c.in -D CHANNELS=16 -D ACCUMULATORS=7 -o src/f32-rdsum/gen/f32-rdsum-7p7x-minmax-wasmsimd-c16.c &
27+
tools/xngen src/f32-rdsum/wasm-simd.c.in -D CHANNELS=32 -D ACCUMULATORS=7 -o src/f32-rdsum/gen/f32-rdsum-7p7x-minmax-wasmsimd-c32.c &
28+
tools/xngen src/f32-rdsum/wasm-simd.c.in -D CHANNELS=64 -D ACCUMULATORS=7 -o src/f32-rdsum/gen/f32-rdsum-7p7x-minmax-wasmsimd-c64.c &
29+
2030
wait

src/f32-rdsum/avx.c.in

Lines changed: 143 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,143 @@
1+
// Copyright 2024 Google LLC
2+
//
3+
// This source code is licensed under the BSD-style license found in the
4+
// LICENSE file in the root directory of this source tree.
5+
6+
$ABC = "0123456789ABCDEFGHIJKLMNOPQRSTUVWXYZ"
7+
#include <assert.h>
8+
9+
#include <immintrin.h>
10+
11+
#include <xnnpack/common.h>
12+
#include <xnnpack/reduce.h>
13+
#include <xnnpack/math.h>
14+
15+
16+
$UNROLL = CHANNELS >> 3
17+
void xnn_f32_rdsum_ukernel_${ACCUMULATORS}p${ACCUMULATORS}x__avx_c${CHANNELS}(
18+
size_t rows,
19+
size_t channels,
20+
const float* input,
21+
size_t input_stride,
22+
const float* zero,
23+
float* output,
24+
const union xnn_f32_scale_params params[restrict XNN_MIN_ELEMENTS(1)])
25+
{
26+
assert(rows != 0);
27+
assert(channels != 0);
28+
assert(input != NULL);
29+
assert(output != NULL);
30+
31+
const __m256 vscale = _mm256_set1_ps(params->avx.scale);
32+
33+
size_t input_increment = ${ACCUMULATORS} * input_stride;
34+
for (; channels >= ${CHANNELS}; channels -= ${CHANNELS}) {
35+
const float* i0 = input;
36+
$for i in range(1, ACCUMULATORS):
37+
const float* i${i} = (const float*) ((uintptr_t) input + ${i} * input_stride);
38+
39+
$for i in range(UNROLL):
40+
__m256 vacc${i} = _mm256_setzero_ps();
41+
42+
for (int r = rows; r > 0; r -= ${ACCUMULATORS}) {
43+
$for N in range(1, ACCUMULATORS, 2):
44+
if XNN_UNPREDICTABLE(r < ${N+1}) {
45+
i${N} = zero;
46+
}
47+
if XNN_UNPREDICTABLE(r <= ${N+1}) {
48+
i${N+1} = zero;
49+
}
50+
$for c in range(UNROLL):
51+
__m256 vin${c};
52+
$for j in range(ACCUMULATORS):
53+
$for c in range(UNROLL):
54+
vin${c} = _mm256_loadu_ps(&i${j}[${c*8}]);
55+
$for c in range(UNROLL):
56+
vacc${c} = _mm256_add_ps(vin${c}, vacc${c});
57+
$for N in range(0, ACCUMULATORS):
58+
i${N} = (const float*) ((uintptr_t) i${N} + input_increment);
59+
}
60+
$for i in range(UNROLL):
61+
vacc${i} = _mm256_mul_ps(vacc${i}, vscale);
62+
63+
const float* o = output;
64+
$for i in range(0, UNROLL):
65+
__m256 vo${i} = _mm256_loadu_ps(o); o += 8;
66+
$for i in range(0, UNROLL):
67+
vacc${i} = _mm256_add_ps(vo${i}, vacc${i});
68+
$for i in range(0, UNROLL):
69+
_mm256_storeu_ps(output, vacc${i}); output += 8;
70+
71+
input = (const float*) ((uintptr_t) input + ${CHANNELS} * sizeof(float));
72+
}
73+
__m256i vmask;
74+
if (channels != 0) {
75+
input_increment = ${ACCUMULATORS} * input_stride;
76+
const float* i0 = input;
77+
$for i in range(1, ACCUMULATORS):
78+
const float* i${i} = (const float*) ((uintptr_t) input + ${i} * input_stride);
79+
__m256 vacc[${UNROLL}];
80+
$for i in range(UNROLL):
81+
vacc[${i}] = _mm256_setzero_ps();
82+
83+
const size_t num_full_chunks = channels >> 3;
84+
const size_t num_chunks = round_up_po2(channels, 8) >> 3;
85+
const size_t remainder = channels & 0x7;
86+
for (int r = rows; r > 0; r -= ${ACCUMULATORS}) {
87+
$for N in range(1, ACCUMULATORS, 2):
88+
if XNN_UNPREDICTABLE(r < ${N+1}) {
89+
i${N} = zero;
90+
}
91+
if XNN_UNPREDICTABLE(r <= ${N+1}) {
92+
i${N+1} = zero;
93+
}
94+
for (int i = 0; i < num_full_chunks; ++i) {
95+
$for c in range(ACCUMULATORS):
96+
vacc[i] = _mm256_add_ps(_mm256_loadu_ps(&i${c}[i*8]), vacc[i]);
97+
}
98+
99+
if (remainder) {
100+
vmask = _mm256_loadu_si256((const __m256i*) ((uintptr_t) &params->avx.mask_table[7] - (channels & 0x7) * sizeof(float)));
101+
$for c in range(ACCUMULATORS):
102+
vacc[num_full_chunks] = _mm256_add_ps(_mm256_maskload_ps(&i${c}[num_full_chunks*8], vmask), vacc[num_full_chunks]);
103+
}
104+
$for N in range(ACCUMULATORS):
105+
i${N} = (const float*) ((uintptr_t) i${N} + input_increment);
106+
}
107+
for (size_t i = 0; i < num_chunks; ++i) {
108+
vacc[i] = _mm256_mul_ps(vacc[i], vscale);
109+
}
110+
111+
__m256 vo[${UNROLL}];
112+
const float* o = output;
113+
for (int i = 0; i < channels >> 3; ++i) {
114+
vo[i] = _mm256_loadu_ps(o); o += 8;
115+
}
116+
for (int i = 0; i < channels >> 3; ++i) {
117+
vacc[i] = _mm256_add_ps(vo[i], vacc[i]);
118+
}
119+
for (int i = 0; i < channels >> 3; ++i) {
120+
_mm256_storeu_ps(output, vacc[i]); output += 8;
121+
}
122+
if (remainder) {
123+
const size_t pos = num_full_chunks;
124+
__m256 vout = vacc[pos];
125+
const __m256 vdata = _mm256_maskload_ps(output, vmask);
126+
vout = _mm256_add_ps(vout, vdata);
127+
__m128 vout_lo = _mm256_castps256_ps128(vout);
128+
if (channels & 4) {
129+
_mm_storeu_ps(output, vout_lo);
130+
vout_lo = _mm256_extractf128_ps(vout, 1);
131+
output += 4;
132+
}
133+
if (channels & 2) {
134+
_mm_storel_pi((__m64*) output, vout_lo);
135+
vout_lo = _mm_movehl_ps(vout_lo, vout_lo);
136+
output += 2;
137+
}
138+
if (channels & 1) {
139+
_mm_store_ss(output, vout_lo);
140+
}
141+
}
142+
}
143+
}

0 commit comments

Comments
 (0)