From aee6552360d54556a4e22cc2121b1458c4977cbd Mon Sep 17 00:00:00 2001 From: nihuini Date: Mon, 16 Apr 2018 17:15:34 +0800 Subject: [PATCH] memcpy is fast :) --- src/layer/arm/slice_arm.cpp | 110 ------------------------------------ src/layer/arm/slice_arm.h | 30 ---------- 2 files changed, 140 deletions(-) delete mode 100644 src/layer/arm/slice_arm.cpp delete mode 100644 src/layer/arm/slice_arm.h diff --git a/src/layer/arm/slice_arm.cpp b/src/layer/arm/slice_arm.cpp deleted file mode 100644 index 3b89c9001..000000000 --- a/src/layer/arm/slice_arm.cpp +++ /dev/null @@ -1,110 +0,0 @@ -// Tencent is pleased to support the open source community by making ncnn available. -// -// Copyright (C) 2017 THL A29 Limited, a Tencent company. All rights reserved. -// -// Licensed under the BSD 3-Clause License (the "License"); you may not use this file except -// in compliance with the License. You may obtain a copy of the License at -// -// https://opensource.org/licenses/BSD-3-Clause -// -// Unless required by applicable law or agreed to in writing, software distributed -// under the License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR -// CONDITIONS OF ANY KIND, either express or implied. See the License for the -// specific language governing permissions and limitations under the License. - -#include "slice_arm.h" -#if __ARM_NEON -#include -#endif // __ARM_NEON - -namespace ncnn { - -DEFINE_LAYER_CREATOR(Slice_arm) - -int Slice_arm::forward(const std::vector& bottom_blobs, std::vector& top_blobs) const -{ - const Mat& bottom_blob = bottom_blobs[0]; - int w = bottom_blob.w; - int h = bottom_blob.h; - int channels = bottom_blob.c; - - int q = 0; - const int* slices_ptr = slices; - for (size_t i=0; i> 3; - int remain = size - (nn << 3); -#else - int remain = size; -#endif // __ARM_NEON - -#if __ARM_NEON -#if __aarch64__ - if (nn > 0) - { - asm volatile( - "0: \n" - "prfm pldl1keep, [%1, #256] \n" - "ld1 {v0.4s, v1.4s}, [%1], #32 \n" - "subs %w0, %w0, #1 \n" - "st1 {v0.4s, v1.4s}, [%2], #32 \n" - "bne 0b \n" - : "=r"(nn), // %0 - "=r"(ptr), // %1 - "=r"(outptr) // %2 - : "0"(nn), - "1"(ptr), - "2"(outptr) - : "cc", "memory", "v0", "v1" - ); - } -#else - if (nn > 0) - { - asm volatile( - "0: \n" - "pld [%1, #256] \n" - "vld1.f32 {d0-d3}, [%1 :128]! \n" - "subs %0, #1 \n" - "vst1.f32 {d0-d3}, [%2 :128]! \n" - "bne 0b \n" - : "=r"(nn), // %0 - "=r"(ptr), // %1 - "=r"(outptr) // %2 - : "0"(nn), - "1"(ptr), - "2"(outptr) - : "cc", "memory", "q0" - ); - } -#endif // __aarch64__ -#endif // __ARM_NEON - for (; remain>0; remain--) - { - *outptr++ = *ptr++; - } - - q += slice; - } - - return 0; -} - -} // namespace ncnn diff --git a/src/layer/arm/slice_arm.h b/src/layer/arm/slice_arm.h deleted file mode 100644 index 16e97dc82..000000000 --- a/src/layer/arm/slice_arm.h +++ /dev/null @@ -1,30 +0,0 @@ -// Tencent is pleased to support the open source community by making ncnn available. -// -// Copyright (C) 2017 THL A29 Limited, a Tencent company. All rights reserved. -// -// Licensed under the BSD 3-Clause License (the "License"); you may not use this file except -// in compliance with the License. You may obtain a copy of the License at -// -// https://opensource.org/licenses/BSD-3-Clause -// -// Unless required by applicable law or agreed to in writing, software distributed -// under the License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR -// CONDITIONS OF ANY KIND, either express or implied. See the License for the -// specific language governing permissions and limitations under the License. - -#ifndef LAYER_SLICE_ARM_H -#define LAYER_SLICE_ARM_H - -#include "slice.h" - -namespace ncnn { - -class Slice_arm : public Slice -{ -public: - virtual int forward(const std::vector& bottom_blobs, std::vector& top_blobs) const; -}; - -} // namespace ncnn - -#endif // LAYER_SLICE_ARM_H