From 26764247073f959e3e56db2a14b7e9dd81bb1092 Mon Sep 17 00:00:00 2001 From: Pablo Marquez Tello Date: Thu, 22 Feb 2024 15:52:59 +0000 Subject: Fix segfault in DWC in WoA * Resolves MLCE-1219 Change-Id: If997180ec88c35d6af05a06c8c5ef95681e67c05 Signed-off-by: Pablo Marquez Tello Reviewed-on: https://review.mlplatform.org/c/ml/ComputeLibrary/+/11182 Reviewed-by: Viet-Hoa Do Comments-Addressed: Arm Jenkins Benchmark: Arm Jenkins Tested-by: Arm Jenkins --- .../kernels/a64_s8q_nhwc_3x3_s1_output2x2_mla_depthfirst/generic.cpp | 4 ++-- .../kernels/a64_s8q_nhwc_3x3_s2_output2x2_mla_depthfirst/generic.cpp | 4 ++-- .../kernels/a64_s8q_nhwc_5x5_s1_output2x2_mla_depthfirst/generic.cpp | 4 ++-- .../kernels/a64_u8q_nhwc_3x3_s1_output2x2_mla_depthfirst/generic.cpp | 4 ++-- .../kernels/a64_u8q_nhwc_3x3_s2_output2x2_mla_depthfirst/generic.cpp | 4 ++-- .../kernels/a64_u8q_nhwc_5x5_s1_output2x2_mla_depthfirst/generic.cpp | 4 ++-- .../a64_u8s8u8q_nhwc_3x3_s1_output2x2_mla_depthfirst/generic.cpp | 4 ++-- .../a64_u8s8u8q_nhwc_3x3_s2_output2x2_mla_depthfirst/generic.cpp | 4 ++-- 8 files changed, 16 insertions(+), 16 deletions(-) (limited to 'src/core/NEON/kernels') diff --git a/src/core/NEON/kernels/arm_conv/depthwise/kernels/a64_s8q_nhwc_3x3_s1_output2x2_mla_depthfirst/generic.cpp b/src/core/NEON/kernels/arm_conv/depthwise/kernels/a64_s8q_nhwc_3x3_s1_output2x2_mla_depthfirst/generic.cpp index a181603f1e..4626007afa 100644 --- a/src/core/NEON/kernels/arm_conv/depthwise/kernels/a64_s8q_nhwc_3x3_s1_output2x2_mla_depthfirst/generic.cpp +++ b/src/core/NEON/kernels/arm_conv/depthwise/kernels/a64_s8q_nhwc_3x3_s1_output2x2_mla_depthfirst/generic.cpp @@ -1,5 +1,5 @@ /* - * Copyright (c) 2021-2023 Arm Limited. + * Copyright (c) 2021-2024 Arm Limited. * * SPDX-License-Identifier: MIT * @@ -45,7 +45,7 @@ void a64_s8q_nhwc_3x3_s1_output2x2_mla_depthfirst_impl( { struct Params { - long unsigned int n_channels; + uint64_t n_channels; const void *weights; const int32_t *bias; const arm_gemm::Requantize32 *requant; diff --git a/src/core/NEON/kernels/arm_conv/depthwise/kernels/a64_s8q_nhwc_3x3_s2_output2x2_mla_depthfirst/generic.cpp b/src/core/NEON/kernels/arm_conv/depthwise/kernels/a64_s8q_nhwc_3x3_s2_output2x2_mla_depthfirst/generic.cpp index 6432417c35..d98ab71cb8 100644 --- a/src/core/NEON/kernels/arm_conv/depthwise/kernels/a64_s8q_nhwc_3x3_s2_output2x2_mla_depthfirst/generic.cpp +++ b/src/core/NEON/kernels/arm_conv/depthwise/kernels/a64_s8q_nhwc_3x3_s2_output2x2_mla_depthfirst/generic.cpp @@ -1,5 +1,5 @@ /* - * Copyright (c) 2021-2023 Arm Limited. + * Copyright (c) 2021-2024 Arm Limited. * * SPDX-License-Identifier: MIT * @@ -45,7 +45,7 @@ void a64_s8q_nhwc_3x3_s2_output2x2_mla_depthfirst_impl( { struct Params { - long unsigned int n_channels; + uint64_t n_channels; const void *weights; const int32_t *bias; const arm_gemm::Requantize32 *requant; diff --git a/src/core/NEON/kernels/arm_conv/depthwise/kernels/a64_s8q_nhwc_5x5_s1_output2x2_mla_depthfirst/generic.cpp b/src/core/NEON/kernels/arm_conv/depthwise/kernels/a64_s8q_nhwc_5x5_s1_output2x2_mla_depthfirst/generic.cpp index 1dc0f33186..b1648bae14 100644 --- a/src/core/NEON/kernels/arm_conv/depthwise/kernels/a64_s8q_nhwc_5x5_s1_output2x2_mla_depthfirst/generic.cpp +++ b/src/core/NEON/kernels/arm_conv/depthwise/kernels/a64_s8q_nhwc_5x5_s1_output2x2_mla_depthfirst/generic.cpp @@ -1,5 +1,5 @@ /* - * Copyright (c) 2021-2023 Arm Limited. + * Copyright (c) 2021-2024 Arm Limited. * * SPDX-License-Identifier: MIT * @@ -45,7 +45,7 @@ void a64_s8q_nhwc_5x5_s1_output2x2_mla_depthfirst_impl( { struct Params { - long unsigned int n_channels; + uint64_t n_channels; const void *weights; const int32_t *bias; const arm_gemm::Requantize32 *requant; diff --git a/src/core/NEON/kernels/arm_conv/depthwise/kernels/a64_u8q_nhwc_3x3_s1_output2x2_mla_depthfirst/generic.cpp b/src/core/NEON/kernels/arm_conv/depthwise/kernels/a64_u8q_nhwc_3x3_s1_output2x2_mla_depthfirst/generic.cpp index 26fe4c8a10..d5b55cb9c5 100644 --- a/src/core/NEON/kernels/arm_conv/depthwise/kernels/a64_u8q_nhwc_3x3_s1_output2x2_mla_depthfirst/generic.cpp +++ b/src/core/NEON/kernels/arm_conv/depthwise/kernels/a64_u8q_nhwc_3x3_s1_output2x2_mla_depthfirst/generic.cpp @@ -1,5 +1,5 @@ /* - * Copyright (c) 2021-2023 Arm Limited. + * Copyright (c) 2021-2024 Arm Limited. * * SPDX-License-Identifier: MIT * @@ -45,7 +45,7 @@ void a64_u8q_nhwc_3x3_s1_output2x2_mla_depthfirst_impl( { struct Params { - long unsigned int n_channels; + uint64_t n_channels; const void *weights; const int32_t *bias; const arm_gemm::Requantize32 *requant; diff --git a/src/core/NEON/kernels/arm_conv/depthwise/kernels/a64_u8q_nhwc_3x3_s2_output2x2_mla_depthfirst/generic.cpp b/src/core/NEON/kernels/arm_conv/depthwise/kernels/a64_u8q_nhwc_3x3_s2_output2x2_mla_depthfirst/generic.cpp index fb533893a6..c4184622b0 100644 --- a/src/core/NEON/kernels/arm_conv/depthwise/kernels/a64_u8q_nhwc_3x3_s2_output2x2_mla_depthfirst/generic.cpp +++ b/src/core/NEON/kernels/arm_conv/depthwise/kernels/a64_u8q_nhwc_3x3_s2_output2x2_mla_depthfirst/generic.cpp @@ -1,5 +1,5 @@ /* - * Copyright (c) 2021-2023 Arm Limited. + * Copyright (c) 2021-2024 Arm Limited. * * SPDX-License-Identifier: MIT * @@ -45,7 +45,7 @@ void a64_u8q_nhwc_3x3_s2_output2x2_mla_depthfirst_impl( { struct Params { - long unsigned int n_channels; + uint64_t n_channels; const void *weights; const int32_t *bias; const arm_gemm::Requantize32 *requant; diff --git a/src/core/NEON/kernels/arm_conv/depthwise/kernels/a64_u8q_nhwc_5x5_s1_output2x2_mla_depthfirst/generic.cpp b/src/core/NEON/kernels/arm_conv/depthwise/kernels/a64_u8q_nhwc_5x5_s1_output2x2_mla_depthfirst/generic.cpp index ae663585a2..a3fa93df9c 100644 --- a/src/core/NEON/kernels/arm_conv/depthwise/kernels/a64_u8q_nhwc_5x5_s1_output2x2_mla_depthfirst/generic.cpp +++ b/src/core/NEON/kernels/arm_conv/depthwise/kernels/a64_u8q_nhwc_5x5_s1_output2x2_mla_depthfirst/generic.cpp @@ -1,5 +1,5 @@ /* - * Copyright (c) 2021-2023 Arm Limited. + * Copyright (c) 2021-2024 Arm Limited. * * SPDX-License-Identifier: MIT * @@ -45,7 +45,7 @@ void a64_u8q_nhwc_5x5_s1_output2x2_mla_depthfirst_impl( { struct Params { - long unsigned int n_channels; + uint64_t n_channels; const void *weights; const int32_t *bias; const arm_gemm::Requantize32 *requant; diff --git a/src/core/NEON/kernels/arm_conv/depthwise/kernels/a64_u8s8u8q_nhwc_3x3_s1_output2x2_mla_depthfirst/generic.cpp b/src/core/NEON/kernels/arm_conv/depthwise/kernels/a64_u8s8u8q_nhwc_3x3_s1_output2x2_mla_depthfirst/generic.cpp index 89253ba670..f1c1b2315c 100644 --- a/src/core/NEON/kernels/arm_conv/depthwise/kernels/a64_u8s8u8q_nhwc_3x3_s1_output2x2_mla_depthfirst/generic.cpp +++ b/src/core/NEON/kernels/arm_conv/depthwise/kernels/a64_u8s8u8q_nhwc_3x3_s1_output2x2_mla_depthfirst/generic.cpp @@ -1,5 +1,5 @@ /* - * Copyright (c) 2021-2023 Arm Limited. + * Copyright (c) 2021-2024 Arm Limited. * * SPDX-License-Identifier: MIT * @@ -45,7 +45,7 @@ void a64_u8s8u8q_nhwc_3x3_s1_output2x2_mla_depthfirst_impl( { struct Params { - long unsigned int n_channels; + uint64_t n_channels; const void *weights; const int32_t *bias; const arm_gemm::Requantize32 *requant; diff --git a/src/core/NEON/kernels/arm_conv/depthwise/kernels/a64_u8s8u8q_nhwc_3x3_s2_output2x2_mla_depthfirst/generic.cpp b/src/core/NEON/kernels/arm_conv/depthwise/kernels/a64_u8s8u8q_nhwc_3x3_s2_output2x2_mla_depthfirst/generic.cpp index 2cc802f9e6..e9db8e1322 100644 --- a/src/core/NEON/kernels/arm_conv/depthwise/kernels/a64_u8s8u8q_nhwc_3x3_s2_output2x2_mla_depthfirst/generic.cpp +++ b/src/core/NEON/kernels/arm_conv/depthwise/kernels/a64_u8s8u8q_nhwc_3x3_s2_output2x2_mla_depthfirst/generic.cpp @@ -1,5 +1,5 @@ /* - * Copyright (c) 2021-2023 Arm Limited. + * Copyright (c) 2021-2024 Arm Limited. * * SPDX-License-Identifier: MIT * @@ -45,7 +45,7 @@ void a64_u8s8u8q_nhwc_3x3_s2_output2x2_mla_depthfirst_impl( { struct Params { - long unsigned int n_channels; + uint64_t n_channels; const void *weights; const int32_t *bias; const arm_gemm::Requantize32 *requant; -- cgit v1.2.1