diff options
| author | Miao Wang <miaowang@google.com> | 2022-09-03 02:03:26 +0000 |
|---|---|---|
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2022-09-03 02:03:26 +0000 |
| commit | ec808b18debf1b5c7a22dd088f64dc6f37ee8549 (patch) | |
| tree | cae5d9e85bae203795be4e415b574724d8b1262a /src/xnnpack/ibilinear.h | |
| parent | 411167b862cfe3beea251d336d3ced9e6e107db1 (diff) | |
| parent | 17b8163acb2da73284c0fbb39d92c8d5b3ec05ac (diff) | |
| download | XNNPACK-android14-qpr1-release.tar.gz | |
Merge remote-tracking branch 'aosp/upstream-master' into rebase_xnnpack am: fae7f36a17 am: 13537e4925 am: 25ce731454 am: b76378fce6 am: 17b8163acbandroid-14.0.0_r45android-14.0.0_r44android-14.0.0_r43android-14.0.0_r42android-14.0.0_r41android-14.0.0_r40android-14.0.0_r39android-14.0.0_r38android-14.0.0_r27android-14.0.0_r26android-14.0.0_r25android-14.0.0_r24android-14.0.0_r23android-14.0.0_r22android-14.0.0_r21android-14.0.0_r20android-14.0.0_r19android-14.0.0_r18android-14.0.0_r17android-14.0.0_r16aml_rkp_341510000aml_rkp_341311000aml_rkp_341114000aml_rkp_341015010aml_rkp_341012000aml_hef_341717050aml_hef_341613000aml_hef_341512030aml_hef_341415040aml_hef_341311010aml_hef_341114030aml_cfg_341510000android14-qpr1-s2-releaseandroid14-qpr1-releaseandroid14-mainline-healthfitness-releaseandroid14-devandroid14-d2-s5-releaseandroid14-d2-s4-releaseandroid14-d2-s3-releaseandroid14-d2-s2-releaseandroid14-d2-s1-releaseandroid14-d2-release
Original change: https://android-review.googlesource.com/c/platform/external/XNNPACK/+/2200461
Change-Id: I7c55aa4ed5a15bc7c6e041c394bda717df1e6855
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
Diffstat (limited to 'src/xnnpack/ibilinear.h')
| -rw-r--r-- | src/xnnpack/ibilinear.h | 37 |
1 files changed, 36 insertions, 1 deletions
diff --git a/src/xnnpack/ibilinear.h b/src/xnnpack/ibilinear.h index 739bb9a64..2744e404b 100644 --- a/src/xnnpack/ibilinear.h +++ b/src/xnnpack/ibilinear.h @@ -8,7 +8,6 @@ #include <stddef.h> #include <stdint.h> -#include <xnnpack/params.h> #include <xnnpack/common.h> #ifdef __cplusplus @@ -16,6 +15,23 @@ extern "C" { #endif +#define DECLARE_F16_IBILINEAR_UKERNEL_FUNCTION(fn_name) \ + XNN_INTERNAL void fn_name( \ + size_t output_pixels, \ + size_t channels, \ + const void** input, \ + size_t input_offset, \ + const void* weights, \ + void* output, \ + size_t output_increment); + +DECLARE_F16_IBILINEAR_UKERNEL_FUNCTION(xnn_f16_ibilinear_ukernel__fma3_c8) +DECLARE_F16_IBILINEAR_UKERNEL_FUNCTION(xnn_f16_ibilinear_ukernel__fma3_c16) + +DECLARE_F16_IBILINEAR_UKERNEL_FUNCTION(xnn_f16_ibilinear_ukernel__neonfp16arith_c8) +DECLARE_F16_IBILINEAR_UKERNEL_FUNCTION(xnn_f16_ibilinear_ukernel__neonfp16arith_c16) + + #define DECLARE_F32_IBILINEAR_UKERNEL_FUNCTION(fn_name) \ XNN_INTERNAL void fn_name( \ size_t output_pixels, \ @@ -42,6 +58,7 @@ DECLARE_F32_IBILINEAR_UKERNEL_FUNCTION(xnn_f32_ibilinear_ukernel__sse_c8) DECLARE_F32_IBILINEAR_UKERNEL_FUNCTION(xnn_f32_ibilinear_ukernel__wasmsimd_c4) DECLARE_F32_IBILINEAR_UKERNEL_FUNCTION(xnn_f32_ibilinear_ukernel__wasmsimd_c8) + #define DECLARE_S8_IBILINEAR_UKERNEL_FUNCTION(fn_name) \ XNN_INTERNAL void fn_name( \ size_t output_pixels, \ @@ -81,6 +98,7 @@ DECLARE_S8_IBILINEAR_UKERNEL_FUNCTION(xnn_s8_ibilinear_ukernel__wasmsimd_mul32_c uint8_t* output, \ size_t output_increment); + DECLARE_U8_IBILINEAR_UKERNEL_FUNCTION(xnn_u8_ibilinear_ukernel__scalar_c1) DECLARE_U8_IBILINEAR_UKERNEL_FUNCTION(xnn_u8_ibilinear_ukernel__scalar_c2) DECLARE_U8_IBILINEAR_UKERNEL_FUNCTION(xnn_u8_ibilinear_ukernel__scalar_c4) @@ -119,13 +137,30 @@ DECLARE_F32_IBILINEAR_CHW_UKERNEL_FUNCTION(xnn_f32_ibilinear_chw_ukernel__wasmsi DECLARE_F32_IBILINEAR_CHW_UKERNEL_FUNCTION(xnn_f32_ibilinear_chw_ukernel__neon_p4) DECLARE_F32_IBILINEAR_CHW_UKERNEL_FUNCTION(xnn_f32_ibilinear_chw_ukernel__neon_p8) +DECLARE_F32_IBILINEAR_CHW_UKERNEL_FUNCTION(xnn_f32_ibilinear_chw_ukernel__neon_p16) DECLARE_F32_IBILINEAR_CHW_UKERNEL_FUNCTION(xnn_f32_ibilinear_chw_ukernel__neonfma_p4) DECLARE_F32_IBILINEAR_CHW_UKERNEL_FUNCTION(xnn_f32_ibilinear_chw_ukernel__neonfma_p8) +DECLARE_F32_IBILINEAR_CHW_UKERNEL_FUNCTION(xnn_f32_ibilinear_chw_ukernel__neonfma_p16) DECLARE_F32_IBILINEAR_CHW_UKERNEL_FUNCTION(xnn_f32_ibilinear_chw_ukernel__sse_p4) DECLARE_F32_IBILINEAR_CHW_UKERNEL_FUNCTION(xnn_f32_ibilinear_chw_ukernel__sse_p8) + +#define DECLARE_F16_IBILINEAR_CHW_UKERNEL_FUNCTION(fn_name) \ + XNN_INTERNAL void fn_name( \ + size_t output_pixels, \ + size_t channels, \ + const void** input, \ + size_t input_offset, \ + const void* weights, \ + void* output, \ + size_t input_increment); + +DECLARE_F16_IBILINEAR_CHW_UKERNEL_FUNCTION(xnn_f16_ibilinear_chw_ukernel__neonfp16arith_p4) +DECLARE_F16_IBILINEAR_CHW_UKERNEL_FUNCTION(xnn_f16_ibilinear_chw_ukernel__neonfp16arith_p8) +DECLARE_F16_IBILINEAR_CHW_UKERNEL_FUNCTION(xnn_f16_ibilinear_chw_ukernel__neonfp16arith_p16) + #ifdef __cplusplus } // extern "C" #endif |