Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Dev optmize softmax #4171

Merged
merged 4 commits into from
Sep 13, 2022
Merged

Dev optmize softmax #4171

Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
0fca97d
fix softmax neon
luqiang-guo Aug 23, 2022
d519981
refine
luqiang-guo Aug 23, 2022
e5ae19f
fix softmax reciprocal
luqiang-guo Sep 8, 2022
ad96151
apply code-format changes
luqiang-guo Sep 8, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
73 changes: 18 additions & 55 deletions src/layer/arm/softmax_arm.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -76,15 +76,12 @@ int Softmax_arm::forward_inplace(Mat& bottom_top_blob, const Option& opt) const
_sum = vaddq_f32(_sum, vrev64q_f32(_sum));
_sum = vaddq_f32(_sum, vextq_f32(_sum, _sum, 2));
#endif

float32x4_t _reciprocal_sum = vrecpeq_f32(_sum);
_reciprocal_sum = vmulq_f32(vrecpsq_f32(_sum, _reciprocal_sum), _reciprocal_sum);
for (int i = 0; i < w; i++)
{
float32x4_t _p = vld1q_f32(ptr + i * 4);
#if __aarch64__
_p = vdivq_f32(_p, _sum);
#else
_p = div_ps(_p, _sum);
#endif
_p = vmulq_f32(_p, _reciprocal_sum);
vst1q_f32(ptr + i * 4, _p);
}
}
Expand Down Expand Up @@ -152,11 +149,7 @@ int Softmax_arm::forward_inplace(Mat& bottom_top_blob, const Option& opt) const
{
float32x4_t _p = vld1q_f32(ptr);
float32x4_t _sum = vdupq_n_f32(sum[j]);
#if __aarch64__
_p = vdivq_f32(_p, _sum);
#else
_p = div_ps(_p, _sum);
#endif
vst1q_f32(ptr, _p);
ptr += 4;
}
Expand Down Expand Up @@ -189,14 +182,12 @@ int Softmax_arm::forward_inplace(Mat& bottom_top_blob, const Option& opt) const
_sum = vaddq_f32(_sum, _p);
}

float32x4_t _reciprocal_sum = vrecpeq_f32(_sum);
_reciprocal_sum = vmulq_f32(vrecpsq_f32(_sum, _reciprocal_sum), _reciprocal_sum);
for (int j = 0; j < w; j++)
{
float32x4_t _p = vld1q_f32(ptr + j * 4);
#if __aarch64__
_p = vdivq_f32(_p, _sum);
#else
_p = div_ps(_p, _sum);
#endif
_p = vmulq_f32(_p, _reciprocal_sum);
vst1q_f32(ptr + j * 4, _p);
}
}
Expand Down Expand Up @@ -269,11 +260,7 @@ int Softmax_arm::forward_inplace(Mat& bottom_top_blob, const Option& opt) const
{
float32x4_t _p = vld1q_f32(ptr);
float32x4_t _sum = vdupq_n_f32(sum[i]);
#if __aarch64__
_p = vdivq_f32(_p, _sum);
#else
_p = div_ps(_p, _sum);
#endif
vst1q_f32(ptr, _p);
ptr += 4;
}
Expand Down Expand Up @@ -356,11 +343,7 @@ int Softmax_arm::forward_inplace(Mat& bottom_top_blob, const Option& opt) const
{
float32x4_t _p = vld1q_f32(ptr);
float32x4_t _sum = vld1q_f32(sumptr);
#if __aarch64__
_p = vdivq_f32(_p, _sum);
#else
_p = div_ps(_p, _sum);
#endif
vst1q_f32(ptr, _p);
ptr += 4;
sumptr += 4;
Expand Down Expand Up @@ -398,14 +381,12 @@ int Softmax_arm::forward_inplace(Mat& bottom_top_blob, const Option& opt) const
_sum = vaddq_f32(_sum, _p);
}

float32x4_t _reciprocal_sum = vrecpeq_f32(_sum);
_reciprocal_sum = vmulq_f32(vrecpsq_f32(_sum, _reciprocal_sum), _reciprocal_sum);
for (int j = 0; j < w; j++)
{
float32x4_t _p = vld1q_f32(ptr + j * 4);
#if __aarch64__
_p = vdivq_f32(_p, _sum);
#else
_p = div_ps(_p, _sum);
#endif
_p = vmulq_f32(_p, _reciprocal_sum);
vst1q_f32(ptr + j * 4, _p);
}

Expand Down Expand Up @@ -480,14 +461,12 @@ int Softmax_arm::forward_inplace(Mat& bottom_top_blob, const Option& opt) const
int i = 0;
#if __ARM_NEON
float32x4_t _sum = vdupq_n_f32(sum);
float32x4_t _reciprocal_sum = vrecpeq_f32(_sum);
_reciprocal_sum = vmulq_f32(vrecpsq_f32(_sum, _reciprocal_sum), _reciprocal_sum);
for (; i + 3 < w; i += 4)
{
float32x4_t _p = vld1q_f32(ptr + i);
#if __aarch64__
_p = vdivq_f32(_p, _sum);
#else
_p = div_ps(_p, _sum);
#endif
_p = vmulq_f32(_p, _reciprocal_sum);
vst1q_f32(ptr + i, _p);
}
#endif // __ARM_NEON
Expand Down Expand Up @@ -587,11 +566,7 @@ int Softmax_arm::forward_inplace(Mat& bottom_top_blob, const Option& opt) const
{
float32x4_t _p = vld1q_f32(ptr);
float32x4_t _sum = vld1q_f32(psum);
#if __aarch64__
_p = vdivq_f32(_p, _sum);
#else
_p = div_ps(_p, _sum);
#endif
vst1q_f32(ptr, _p);

ptr += 4;
Expand Down Expand Up @@ -674,14 +649,12 @@ int Softmax_arm::forward_inplace(Mat& bottom_top_blob, const Option& opt) const
int j = 0;
#if __ARM_NEON
float32x4_t _sum = vdupq_n_f32(sum);
float32x4_t _reciprocal_sum = vrecpeq_f32(_sum);
_reciprocal_sum = vmulq_f32(vrecpsq_f32(_sum, _reciprocal_sum), _reciprocal_sum);
for (; j + 3 < w; j += 4)
{
float32x4_t _p = vld1q_f32(ptr + j);
#if __aarch64__
_p = vdivq_f32(_p, _sum);
#else
_p = div_ps(_p, _sum);
#endif
_p = vmulq_f32(_p, _reciprocal_sum);
vst1q_f32(ptr + j, _p);
}
#endif // __ARM_NEON
Expand Down Expand Up @@ -790,11 +763,7 @@ int Softmax_arm::forward_inplace(Mat& bottom_top_blob, const Option& opt) const
{
float32x4_t _p = vld1q_f32(ptr);
float32x4_t _sum = vld1q_f32(sumptr);
#if __aarch64__
_p = vdivq_f32(_p, _sum);
#else
_p = div_ps(_p, _sum);
#endif // __aarch64__
vst1q_f32(ptr, _p);

ptr += 4;
Expand Down Expand Up @@ -902,11 +871,7 @@ int Softmax_arm::forward_inplace(Mat& bottom_top_blob, const Option& opt) const
{
float32x4_t _p = vld1q_f32(ptr + j);
float32x4_t _sum = vld1q_f32(sumptr + j);
#if __aarch64__
_p = vdivq_f32(_p, _sum);
#else
_p = div_ps(_p, _sum);
#endif
vst1q_f32(ptr + j, _p);
}
#endif // __ARM_NEON
Expand Down Expand Up @@ -989,14 +954,12 @@ int Softmax_arm::forward_inplace(Mat& bottom_top_blob, const Option& opt) const
int j = 0;
#if __ARM_NEON
float32x4_t _sum = vdupq_n_f32(sum);
float32x4_t _reciprocal_sum = vrecpeq_f32(_sum);
_reciprocal_sum = vmulq_f32(vrecpsq_f32(_sum, _reciprocal_sum), _reciprocal_sum);
for (; j + 3 < w; j += 4)
{
float32x4_t _p = vld1q_f32(ptr + j);
#if __aarch64__
_p = vdivq_f32(_p, _sum);
#else
_p = div_ps(_p, _sum);
#endif
_p = vmulq_f32(_p, _reciprocal_sum);
vst1q_f32(ptr + j, _p);
}
#endif // __ARM_NEON
Expand Down