Skip to content

Commit

Permalink
Run template generators
Browse files Browse the repository at this point in the history 
- generate bench/f16-f32acc-rdsum
- rvv packw microkernels
- reduce.h
- rmax and vsubc yaml test files

PiperOrigin-RevId: 633411846
  • Loading branch information
@fbarchard @xnnpack-bot
fbarchard authored and xnnpack-bot committed May 18, 2024
1 parent 22ff33b commit fc8cb2e
Show file tree
Hide file tree
Showing 16 changed files with 27 additions and 29 deletions.
2 changes: 1 addition & 1 deletion src/qs8-rsum/gen/qs8-rsum-minmax-fp32-neondot-u64-acc4.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -53,8 +53,8 @@ void xnn_qs8_rsum_minmax_fp32_ukernel__neondot_u64_acc4(
}
}
vacc0 = vaddq_s32(vacc0, vacc1);
vacc2 = vaddq_s32(vacc2, vacc3);
vacc0 = vaddq_s32(vacc0, vacc2);
vacc0 = vaddq_s32(vacc0, vacc3);
int32x2_t vacc_lo = vadd_s32(vget_low_s32(vacc0), vget_high_s32(vacc0));
vacc_lo = vpadd_s32(vacc_lo, vacc_lo);

Expand Down
2 changes: 1 addition & 1 deletion src/x32-packw/gen/x32-packw-x1v-gemm-goi-rvv-u2.c
View file
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
// Auto-generated file. Do not edit!
// Template: src/x32-packw/NRv-rvv.in
// Template: src/x32-packw/rvv.c.in
// Generator: tools/xngen
//
// Copyright 2024 SiFive, Inc.
Expand Down
2 changes: 1 addition & 1 deletion src/x32-packw/gen/x32-packw-x1v-gemm-goi-rvv-u4.c
View file
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
// Auto-generated file. Do not edit!
// Template: src/x32-packw/NRv-rvv.in
// Template: src/x32-packw/rvv.c.in
// Generator: tools/xngen
//
// Copyright 2024 SiFive, Inc.
Expand Down
2 changes: 1 addition & 1 deletion src/x32-packw/gen/x32-packw-x1v-gemm-goi-rvv-u8.c
View file
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
// Auto-generated file. Do not edit!
// Template: src/x32-packw/NRv-rvv.in
// Template: src/x32-packw/rvv.c.in
// Generator: tools/xngen
//
// Copyright 2024 SiFive, Inc.
Expand Down
2 changes: 1 addition & 1 deletion src/x32-packw/gen/x32-packw-x2v-gemm-goi-rvv-u2.c
View file
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
// Auto-generated file. Do not edit!
// Template: src/x32-packw/NRv-rvv.in
// Template: src/x32-packw/rvv.c.in
// Generator: tools/xngen
//
// Copyright 2024 SiFive, Inc.
Expand Down
2 changes: 1 addition & 1 deletion src/x32-packw/gen/x32-packw-x2v-gemm-goi-rvv-u4.c
View file
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
// Auto-generated file. Do not edit!
// Template: src/x32-packw/NRv-rvv.in
// Template: src/x32-packw/rvv.c.in
// Generator: tools/xngen
//
// Copyright 2024 SiFive, Inc.
Expand Down
2 changes: 1 addition & 1 deletion src/x32-packw/gen/x32-packw-x2v-gemm-goi-rvv-u8.c
View file
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
// Auto-generated file. Do not edit!
// Template: src/x32-packw/NRv-rvv.in
// Template: src/x32-packw/rvv.c.in
// Generator: tools/xngen
//
// Copyright 2024 SiFive, Inc.
Expand Down
2 changes: 1 addition & 1 deletion src/x32-packw/gen/x32-packw-x4v-gemm-goi-rvv-u2.c
View file
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
// Auto-generated file. Do not edit!
// Template: src/x32-packw/NRv-rvv.in
// Template: src/x32-packw/rvv.c.in
// Generator: tools/xngen
//
// Copyright 2024 SiFive, Inc.
Expand Down
2 changes: 1 addition & 1 deletion src/x32-packw/gen/x32-packw-x4v-gemm-goi-rvv-u4.c
View file
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
// Auto-generated file. Do not edit!
// Template: src/x32-packw/NRv-rvv.in
// Template: src/x32-packw/rvv.c.in
// Generator: tools/xngen
//
// Copyright 2024 SiFive, Inc.
Expand Down
2 changes: 1 addition & 1 deletion src/x32-packw/gen/x32-packw-x4v-gemm-goi-rvv-u8.c
View file
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
// Auto-generated file. Do not edit!
// Template: src/x32-packw/NRv-rvv.in
// Template: src/x32-packw/rvv.c.in
// Generator: tools/xngen
//
// Copyright 2024 SiFive, Inc.
Expand Down
2 changes: 1 addition & 1 deletion src/x32-packw/gen/x32-packw-x8v-gemm-goi-rvv-u2.c
View file
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
// Auto-generated file. Do not edit!
// Template: src/x32-packw/NRv-rvv.in
// Template: src/x32-packw/rvv.c.in
// Generator: tools/xngen
//
// Copyright 2024 SiFive, Inc.
Expand Down
2 changes: 1 addition & 1 deletion src/x32-packw/gen/x32-packw-x8v-gemm-goi-rvv-u4.c
View file
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
// Auto-generated file. Do not edit!
// Template: src/x32-packw/NRv-rvv.in
// Template: src/x32-packw/rvv.c.in
// Generator: tools/xngen
//
// Copyright 2024 SiFive, Inc.
Expand Down
2 changes: 1 addition & 1 deletion src/x32-packw/gen/x32-packw-x8v-gemm-goi-rvv-u8.c
View file
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
// Auto-generated file. Do not edit!
// Template: src/x32-packw/NRv-rvv.in
// Template: src/x32-packw/rvv.c.in
// Generator: tools/xngen
//
// Copyright 2024 SiFive, Inc.
Expand Down
28 changes: 14 additions & 14 deletions src/xnnpack/reduce.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -364,23 +364,23 @@ DECLARE_QS8_RSUM_UKERNEL_FUNCTION(xnn_qs8_rsum_minmax_fp32_ukernel__neondot_u64_
float* output, \
const union xnn_f32_scale_params params[XNN_RESTRICT XNN_MIN_ELEMENTS(1)]);

DECLARE_F32_RDSUM_UKERNEL_FUNCTION(xnn_f32_rdsum_ukernel_7p7x__avx_c16)
DECLARE_F32_RDSUM_UKERNEL_FUNCTION(xnn_f32_rdsum_ukernel_7p7x__avx_c32)
DECLARE_F32_RDSUM_UKERNEL_FUNCTION(xnn_f32_rdsum_ukernel_7p7x__avx_c64)
DECLARE_F32_RDSUM_UKERNEL_FUNCTION(xnn_f32_rdsum_ukernel_7p7x__avx512f_c16)
DECLARE_F32_RDSUM_UKERNEL_FUNCTION(xnn_f32_rdsum_ukernel_7p7x__avx512f_c32)
DECLARE_F32_RDSUM_UKERNEL_FUNCTION(xnn_f32_rdsum_ukernel_7p7x__avx512f_c64)
DECLARE_F32_RDSUM_UKERNEL_FUNCTION(xnn_f32_rdsum_ukernel_7p7x__avx512f_c128)
DECLARE_F32_RDSUM_UKERNEL_FUNCTION(xnn_f32_rdsum_ukernel_7p7x__neon_c16)
DECLARE_F32_RDSUM_UKERNEL_FUNCTION(xnn_f32_rdsum_ukernel_7p7x__neon_c32)
DECLARE_F32_RDSUM_UKERNEL_FUNCTION(xnn_f32_rdsum_ukernel_7p7x__neon_c64)
DECLARE_F32_RDSUM_UKERNEL_FUNCTION(xnn_f32_rdsum_ukernel_7p7x__scalar_c4)
DECLARE_F32_RDSUM_UKERNEL_FUNCTION(xnn_f32_rdsum_ukernel_7p7x__sse_c16)
DECLARE_F32_RDSUM_UKERNEL_FUNCTION(xnn_f32_rdsum_ukernel_7p7x__sse_c32)
DECLARE_F32_RDSUM_UKERNEL_FUNCTION(xnn_f32_rdsum_ukernel_7p7x__sse_c64)
DECLARE_F32_RDSUM_UKERNEL_FUNCTION(xnn_f32_rdsum_ukernel_7p7x__avx_c16)
DECLARE_F32_RDSUM_UKERNEL_FUNCTION(xnn_f32_rdsum_ukernel_7p7x__avx_c32)
DECLARE_F32_RDSUM_UKERNEL_FUNCTION(xnn_f32_rdsum_ukernel_7p7x__avx_c64)
DECLARE_F32_RDSUM_UKERNEL_FUNCTION(xnn_f32_rdsum_ukernel_7p7x__wasmsimd_c16)
DECLARE_F32_RDSUM_UKERNEL_FUNCTION(xnn_f32_rdsum_ukernel_7p7x__wasmsimd_c32)
DECLARE_F32_RDSUM_UKERNEL_FUNCTION(xnn_f32_rdsum_ukernel_7p7x__wasmsimd_c64)
DECLARE_F32_RDSUM_UKERNEL_FUNCTION(xnn_f32_rdsum_ukernel_7p7x__avx512f_c16)
DECLARE_F32_RDSUM_UKERNEL_FUNCTION(xnn_f32_rdsum_ukernel_7p7x__avx512f_c32)
DECLARE_F32_RDSUM_UKERNEL_FUNCTION(xnn_f32_rdsum_ukernel_7p7x__avx512f_c64)
DECLARE_F32_RDSUM_UKERNEL_FUNCTION(xnn_f32_rdsum_ukernel_7p7x__avx512f_c128)

#define DECLARE_F16_F32ACC_RDSUM_UKERNEL_FUNCTION(fn_name) \
XNN_INTERNAL void fn_name( \
Expand All @@ -392,17 +392,17 @@ DECLARE_F32_RDSUM_UKERNEL_FUNCTION(xnn_f32_rdsum_ukernel_7p7x__avx512f_c128)
void* output, \
const union xnn_f16_f32acc_scale_params params[XNN_RESTRICT XNN_MIN_ELEMENTS(1)]);

DECLARE_F16_F32ACC_RDSUM_UKERNEL_FUNCTION(xnn_f16_f32acc_rdsum_ukernel_7p7x__neonfp16arith_c16)
DECLARE_F16_F32ACC_RDSUM_UKERNEL_FUNCTION(xnn_f16_f32acc_rdsum_ukernel_7p7x__neonfp16arith_c32)
DECLARE_F16_F32ACC_RDSUM_UKERNEL_FUNCTION(xnn_f16_f32acc_rdsum_ukernel_7p7x__neonfp16arith_c64)
DECLARE_F16_F32ACC_RDSUM_UKERNEL_FUNCTION(xnn_f16_f32acc_rdsum_ukernel_7p7x__f16c_c16)
DECLARE_F16_F32ACC_RDSUM_UKERNEL_FUNCTION(xnn_f16_f32acc_rdsum_ukernel_7p7x__f16c_c32)
DECLARE_F16_F32ACC_RDSUM_UKERNEL_FUNCTION(xnn_f16_f32acc_rdsum_ukernel_7p7x__f16c_c64)
DECLARE_F16_F32ACC_RDSUM_UKERNEL_FUNCTION(xnn_f16_f32acc_rdsum_ukernel_7p7x__f16c_c128)
DECLARE_F16_F32ACC_RDSUM_UKERNEL_FUNCTION(xnn_f16_f32acc_rdsum_ukernel_7p7x__avx512skx_c16)
DECLARE_F16_F32ACC_RDSUM_UKERNEL_FUNCTION(xnn_f16_f32acc_rdsum_ukernel_7p7x__avx512skx_c32)
DECLARE_F16_F32ACC_RDSUM_UKERNEL_FUNCTION(xnn_f16_f32acc_rdsum_ukernel_7p7x__avx512skx_c64)
DECLARE_F16_F32ACC_RDSUM_UKERNEL_FUNCTION(xnn_f16_f32acc_rdsum_ukernel_7p7x__avx512skx_c128)
DECLARE_F16_F32ACC_RDSUM_UKERNEL_FUNCTION(xnn_f16_f32acc_rdsum_ukernel_7p7x__f16c_c16)
DECLARE_F16_F32ACC_RDSUM_UKERNEL_FUNCTION(xnn_f16_f32acc_rdsum_ukernel_7p7x__f16c_c32)
DECLARE_F16_F32ACC_RDSUM_UKERNEL_FUNCTION(xnn_f16_f32acc_rdsum_ukernel_7p7x__f16c_c64)
DECLARE_F16_F32ACC_RDSUM_UKERNEL_FUNCTION(xnn_f16_f32acc_rdsum_ukernel_7p7x__f16c_c128)
DECLARE_F16_F32ACC_RDSUM_UKERNEL_FUNCTION(xnn_f16_f32acc_rdsum_ukernel_7p7x__neonfp16arith_c16)
DECLARE_F16_F32ACC_RDSUM_UKERNEL_FUNCTION(xnn_f16_f32acc_rdsum_ukernel_7p7x__neonfp16arith_c32)
DECLARE_F16_F32ACC_RDSUM_UKERNEL_FUNCTION(xnn_f16_f32acc_rdsum_ukernel_7p7x__neonfp16arith_c64)

#ifdef __cplusplus
} // extern "C"
Expand Down
1 change: 0 additions & 1 deletion test/f16-rmax.yaml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -33,4 +33,3 @@
- name: xnn_f16_rmax_ukernel__scalar_u3_acc3
- name: xnn_f16_rmax_ukernel__scalar_u4_acc2
- name: xnn_f16_rmax_ukernel__scalar_u4_acc4

1 change: 0 additions & 1 deletion test/f16-vsubc-minmax.yaml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -28,4 +28,3 @@
init: xnn_init_f16_minmax_avx_params
- name: xnn_f16_vsubc_minmax_ukernel__f16c_u16
init: xnn_init_f16_minmax_avx_params

0 comments on commit fc8cb2e

Please sign in to comment.