diff options
| author | Marat Dukhan <maratek@google.com> | 2022-08-22 07:53:25 -0700 |
|---|---|---|
| committer | XNNPACK Team <xnnpack-github-robot@google.com> | 2022-08-22 07:54:32 -0700 |
| commit | bd223d2c4ab7f618b878292d275a5d7ee9bab038 (patch) | |
| tree | 29d7b7a5fafe7d1d3ced0128ff7499685e79114f | |
| parent | 5dfe80fcb697e31e7c1ffe48e3bcfc69025c28ea (diff) | |
| download | XNNPACK-bd223d2c4ab7f618b878292d275a5d7ee9bab038.tar.gz | |
Fix naming of the U64->U32 VSQRTSHIFT microkernel
PiperOrigin-RevId: 469184880
| -rw-r--r-- | bench/u64-u32-vsqrtshift.cc | 4 | ||||
| -rw-r--r-- | src/u64-u32-vsqrtshift/scalar-cvtu32-sqrt-cvtu32f64-x1.c | 2 | ||||
| -rw-r--r-- | src/xnnpack/vunary.h | 2 | ||||
| -rw-r--r-- | test/u64-u32-vsqrtshift.cc | 12 | ||||
| -rw-r--r-- | test/u64-u32-vsqrtshift.yaml | 2 |
5 files changed, 11 insertions, 11 deletions
diff --git a/bench/u64-u32-vsqrtshift.cc b/bench/u64-u32-vsqrtshift.cc index 70f109459..239d66b47 100644 --- a/bench/u64-u32-vsqrtshift.cc +++ b/bench/u64-u32-vsqrtshift.cc @@ -61,8 +61,8 @@ static void u64_u32_vsqrtshift( benchmark::Counter(uint64_t(state.iterations()) * bytes_per_iteration, benchmark::Counter::kIsRate); } -BENCHMARK_CAPTURE(u64_u32_vsqrtshift, scalar_cvtu32_sqrt_cvtf64u32_x1, - xnn_u64_u32_vsqrtshift_ukernel__scalar_cvtu32_sqrt_cvtf64u32_x1, +BENCHMARK_CAPTURE(u64_u32_vsqrtshift, scalar_cvtu32_sqrt_cvtu32f64_x1, + xnn_u64_u32_vsqrtshift_ukernel__scalar_cvtu32_sqrt_cvtu32f64_x1, xnn_init_u64_u32_sqrtshift_scalar_params) ->Apply(benchmark::utils::UnaryElementwiseParameters<uint64_t, uint32_t>) ->UseRealTime(); diff --git a/src/u64-u32-vsqrtshift/scalar-cvtu32-sqrt-cvtu32f64-x1.c b/src/u64-u32-vsqrtshift/scalar-cvtu32-sqrt-cvtu32f64-x1.c index 801e9aeeb..4a277cd0c 100644 --- a/src/u64-u32-vsqrtshift/scalar-cvtu32-sqrt-cvtu32f64-x1.c +++ b/src/u64-u32-vsqrtshift/scalar-cvtu32-sqrt-cvtu32f64-x1.c @@ -12,7 +12,7 @@ #include <xnnpack/vunary.h> -void xnn_u64_u32_vsqrtshift_ukernel__scalar_cvtu32_sqrt_cvtf64u32_x1( +void xnn_u64_u32_vsqrtshift_ukernel__scalar_cvtu32_sqrt_cvtu32f64_x1( size_t batch, const uint64_t* input, uint32_t* output, diff --git a/src/xnnpack/vunary.h b/src/xnnpack/vunary.h index e74d6113a..4441cd368 100644 --- a/src/xnnpack/vunary.h +++ b/src/xnnpack/vunary.h @@ -1085,7 +1085,7 @@ DECLARE_U8_VCLAMP_UKERNEL_FUNCTION(xnn_u8_vclamp_ukernel__wasmsimd_x64) const union xnn_u64_u32_sqrtshift_params* params); -DECLARE_U64_U32_VSQRTSHIFT_UKERNEL_FUNCTION(xnn_u64_u32_vsqrtshift_ukernel__scalar_cvtu32_sqrt_cvtf64u32_x1) +DECLARE_U64_U32_VSQRTSHIFT_UKERNEL_FUNCTION(xnn_u64_u32_vsqrtshift_ukernel__scalar_cvtu32_sqrt_cvtu32f64_x1) #define DECLARE_XX_VUNARY_UKERNEL_FUNCTION(fn_name) \ diff --git a/test/u64-u32-vsqrtshift.cc b/test/u64-u32-vsqrtshift.cc index 1313a8950..2d721931d 100644 --- a/test/u64-u32-vsqrtshift.cc +++ b/test/u64-u32-vsqrtshift.cc @@ -17,27 +17,27 @@ #include "vunary-microkernel-tester.h" -TEST(U64_U32_VSQRTSHIFT__SCALAR_CVTU32_SQRT_CVTF64U32_X1, batch_eq_1) { +TEST(U64_U32_VSQRTSHIFT__SCALAR_CVTU32_SQRT_CVTU32F64_X1, batch_eq_1) { VUnaryMicrokernelTester() .batch_size(1) - .Test(xnn_u64_u32_vsqrtshift_ukernel__scalar_cvtu32_sqrt_cvtf64u32_x1, xnn_init_u64_u32_sqrtshift_scalar_params); + .Test(xnn_u64_u32_vsqrtshift_ukernel__scalar_cvtu32_sqrt_cvtu32f64_x1, xnn_init_u64_u32_sqrtshift_scalar_params); } -TEST(U64_U32_VSQRTSHIFT__SCALAR_CVTU32_SQRT_CVTF64U32_X1, batch_gt_1) { +TEST(U64_U32_VSQRTSHIFT__SCALAR_CVTU32_SQRT_CVTU32F64_X1, batch_gt_1) { for (size_t batch_size = 2; batch_size < 10; batch_size++) { VUnaryMicrokernelTester() .batch_size(batch_size) - .Test(xnn_u64_u32_vsqrtshift_ukernel__scalar_cvtu32_sqrt_cvtf64u32_x1, xnn_init_u64_u32_sqrtshift_scalar_params); + .Test(xnn_u64_u32_vsqrtshift_ukernel__scalar_cvtu32_sqrt_cvtu32f64_x1, xnn_init_u64_u32_sqrtshift_scalar_params); } } -TEST(U64_U32_VSQRTSHIFT__SCALAR_CVTU32_SQRT_CVTF64U32_X1, shift) { +TEST(U64_U32_VSQRTSHIFT__SCALAR_CVTU32_SQRT_CVTU32F64_X1, shift) { for (uint32_t shift = 0; shift < 32; shift++) { for (size_t batch_size = 1; batch_size <= 5; batch_size += 1) { VUnaryMicrokernelTester() .batch_size(batch_size) .shift(shift) - .Test(xnn_u64_u32_vsqrtshift_ukernel__scalar_cvtu32_sqrt_cvtf64u32_x1, xnn_init_u64_u32_sqrtshift_scalar_params); + .Test(xnn_u64_u32_vsqrtshift_ukernel__scalar_cvtu32_sqrt_cvtu32f64_x1, xnn_init_u64_u32_sqrtshift_scalar_params); } } }
\ No newline at end of file diff --git a/test/u64-u32-vsqrtshift.yaml b/test/u64-u32-vsqrtshift.yaml index 81357114b..e13a707ff 100644 --- a/test/u64-u32-vsqrtshift.yaml +++ b/test/u64-u32-vsqrtshift.yaml @@ -4,5 +4,5 @@ # LICENSE file in the root directory of this source tree. # Scalar -- name: xnn_u64_u32_vsqrtshift_ukernel__scalar_cvtu32_sqrt_cvtf64u32_x1 +- name: xnn_u64_u32_vsqrtshift_ukernel__scalar_cvtu32_sqrt_cvtu32f64_x1 init: xnn_init_u64_u32_sqrtshift_scalar_params |