Browse Source

fix(dnn/x86): replace suonds bad name

GitOrigin-RevId: b8f0f03bb0
tags/v0.4.0
Megvii Engine Team Xinran Xu 5 years ago
parent
commit
b9cf01718a
3 changed files with 36 additions and 36 deletions
  1. +12
    -12
      dnn/src/x86/pooling/max_pooling_w2x2_s2x2_sse.cpp
  2. +12
    -12
      dnn/src/x86/pooling/mean_pooling_w2x2_s2x2_avx.cpp
  3. +12
    -12
      dnn/src/x86/pooling/mean_pooling_w2x2_s2x2_sse3.cpp

+ 12
- 12
dnn/src/x86/pooling/max_pooling_w2x2_s2x2_sse.cpp View File

@@ -38,11 +38,11 @@ void max_pooling_w2x2_s2x2_sse(const float *src, const int src_h, const int src_
{ {
// brute-force with padding // brute-force with padding
int idst_h, idst_w; int idst_h, idst_w;
#define FUCK1 \
#define CALCULATE1 \
const int isrc_h = -pad_h + 2*idst_h; \ const int isrc_h = -pad_h + 2*idst_h; \
const float *src_d = src + isrc_h * src_w; \ const float *src_d = src + isrc_h * src_w; \
float *dst_d = dst + idst_h * dst_w; float *dst_d = dst + idst_h * dst_w;
#define FUCK2 \
#define CALCULATE2 \
const int isrc_w = -pad_w + 2*idst_w; \ const int isrc_w = -pad_w + 2*idst_w; \
const float *src_dd = src_d + isrc_w; \ const float *src_dd = src_d + isrc_w; \
float *dst_dd = dst_d + idst_w; \ float *dst_dd = dst_d + idst_w; \
@@ -61,34 +61,34 @@ void max_pooling_w2x2_s2x2_sse(const float *src, const int src_h, const int src_
} \ } \


for (idst_h = 0; idst_h < dst_h_beg; ++idst_h) { for (idst_h = 0; idst_h < dst_h_beg; ++idst_h) {
FUCK1
CALCULATE1
for (idst_w = 0; idst_w < dst_w; ++idst_w) { for (idst_w = 0; idst_w < dst_w; ++idst_w) {
FUCK2
CALCULATE2
} }
} }


for (idst_h = dst_h_end; idst_h < dst_h; ++idst_h) { for (idst_h = dst_h_end; idst_h < dst_h; ++idst_h) {
FUCK1
CALCULATE1
for (idst_w = 0; idst_w < dst_w; ++idst_w) { for (idst_w = 0; idst_w < dst_w; ++idst_w) {
FUCK2
CALCULATE2
} }
} }


for (idst_h = dst_h_beg; idst_h < dst_h_end; ++idst_h) { for (idst_h = dst_h_beg; idst_h < dst_h_end; ++idst_h) {
FUCK1
CALCULATE1
for (idst_w = 0; idst_w < dst_w_beg; ++idst_w) { for (idst_w = 0; idst_w < dst_w_beg; ++idst_w) {
FUCK2
CALCULATE2
} }
} }


for (idst_h = dst_h_beg; idst_h < dst_h_end; ++idst_h) { for (idst_h = dst_h_beg; idst_h < dst_h_end; ++idst_h) {
FUCK1
CALCULATE1
for (idst_w = dst_w_end; idst_w < dst_w; ++idst_w) { for (idst_w = dst_w_end; idst_w < dst_w; ++idst_w) {
FUCK2
CALCULATE2
} }
} }
#undef FUCK1
#undef FUCK2
#undef CALCULATE1
#undef CALCULATE2
} }
int idst_h; int idst_h;
for (idst_h = dst_h_beg; idst_h + 4 <= dst_h_end; idst_h += 4) { for (idst_h = dst_h_beg; idst_h + 4 <= dst_h_end; idst_h += 4) {


+ 12
- 12
dnn/src/x86/pooling/mean_pooling_w2x2_s2x2_avx.cpp View File

@@ -35,11 +35,11 @@ void mean_pooling_w2x2_s2x2_avx(const float *src, const int src_h, const int src
// brute-force with padding // brute-force with padding
int idst_h, idst_w; int idst_h, idst_w;
size_t count; size_t count;
#define FUCK1 \
#define CALCULATE1 \
const int isrc_h = -pad_h + 2*idst_h; \ const int isrc_h = -pad_h + 2*idst_h; \
const float *src_d = src + isrc_h * src_w; \ const float *src_d = src + isrc_h * src_w; \
float *dst_d = dst + idst_h * dst_w; float *dst_d = dst + idst_h * dst_w;
#define FUCK2 \
#define CALCULATE2 \
const int isrc_w = -pad_w + 2*idst_w; \ const int isrc_w = -pad_w + 2*idst_w; \
const float *src_dd = src_d + isrc_w; \ const float *src_dd = src_d + isrc_w; \
float *dst_dd = dst_d + idst_w; \ float *dst_dd = dst_d + idst_w; \
@@ -68,34 +68,34 @@ void mean_pooling_w2x2_s2x2_avx(const float *src, const int src_h, const int src
} }


for (idst_h = 0; idst_h < dst_h_beg; ++idst_h) { for (idst_h = 0; idst_h < dst_h_beg; ++idst_h) {
FUCK1
CALCULATE1
for (idst_w = 0; idst_w < dst_w; ++idst_w) { for (idst_w = 0; idst_w < dst_w; ++idst_w) {
FUCK2
CALCULATE2
} }
} }


for (idst_h = dst_h_end; idst_h < dst_h; ++idst_h) { for (idst_h = dst_h_end; idst_h < dst_h; ++idst_h) {
FUCK1
CALCULATE1
for (idst_w = 0; idst_w < dst_w; ++idst_w) { for (idst_w = 0; idst_w < dst_w; ++idst_w) {
FUCK2
CALCULATE2
} }
} }


for (idst_h = dst_h_beg; idst_h < dst_h_end; ++idst_h) { for (idst_h = dst_h_beg; idst_h < dst_h_end; ++idst_h) {
FUCK1
CALCULATE1
for (idst_w = 0; idst_w < dst_w_beg; ++idst_w) { for (idst_w = 0; idst_w < dst_w_beg; ++idst_w) {
FUCK2
CALCULATE2
} }
} }


for (idst_h = dst_h_beg; idst_h < dst_h_end; ++idst_h) { for (idst_h = dst_h_beg; idst_h < dst_h_end; ++idst_h) {
FUCK1
CALCULATE1
for (idst_w = dst_w_end; idst_w < dst_w; ++idst_w) { for (idst_w = dst_w_end; idst_w < dst_w; ++idst_w) {
FUCK2
CALCULATE2
} }
} }
#undef FUCK1
#undef FUCK2
#undef CALCULATE1
#undef CALCULATE2
} }
int idst_h; int idst_h;
for (idst_h = dst_h_beg; idst_h + 4 <= dst_h_end; idst_h += 4) { for (idst_h = dst_h_beg; idst_h + 4 <= dst_h_end; idst_h += 4) {


+ 12
- 12
dnn/src/x86/pooling/mean_pooling_w2x2_s2x2_sse3.cpp View File

@@ -33,11 +33,11 @@ void mean_pooling_w2x2_s2x2_sse3(const float *src, const int src_h, const int sr
// brute-force with padding // brute-force with padding
int idst_h, idst_w; int idst_h, idst_w;
size_t count; size_t count;
#define FUCK1 \
#define CALCULATE1 \
const int isrc_h = -pad_h + 2*idst_h; \ const int isrc_h = -pad_h + 2*idst_h; \
const float *src_d = src + isrc_h * src_w; \ const float *src_d = src + isrc_h * src_w; \
float *dst_d = dst + idst_h * dst_w; float *dst_d = dst + idst_h * dst_w;
#define FUCK2 \
#define CALCULATE2 \
const int isrc_w = -pad_w + 2*idst_w; \ const int isrc_w = -pad_w + 2*idst_w; \
const float *src_dd = src_d + isrc_w; \ const float *src_dd = src_d + isrc_w; \
float *dst_dd = dst_d + idst_w; \ float *dst_dd = dst_d + idst_w; \
@@ -66,34 +66,34 @@ void mean_pooling_w2x2_s2x2_sse3(const float *src, const int src_h, const int sr
} }


for (idst_h = 0; idst_h < dst_h_beg; ++idst_h) { for (idst_h = 0; idst_h < dst_h_beg; ++idst_h) {
FUCK1
CALCULATE1
for (idst_w = 0; idst_w < dst_w; ++idst_w) { for (idst_w = 0; idst_w < dst_w; ++idst_w) {
FUCK2
CALCULATE2
} }
} }


for (idst_h = dst_h_end; idst_h < dst_h; ++idst_h) { for (idst_h = dst_h_end; idst_h < dst_h; ++idst_h) {
FUCK1
CALCULATE1
for (idst_w = 0; idst_w < dst_w; ++idst_w) { for (idst_w = 0; idst_w < dst_w; ++idst_w) {
FUCK2
CALCULATE2
} }
} }


for (idst_h = dst_h_beg; idst_h < dst_h_end; ++idst_h) { for (idst_h = dst_h_beg; idst_h < dst_h_end; ++idst_h) {
FUCK1
CALCULATE1
for (idst_w = 0; idst_w < dst_w_beg; ++idst_w) { for (idst_w = 0; idst_w < dst_w_beg; ++idst_w) {
FUCK2
CALCULATE2
} }
} }


for (idst_h = dst_h_beg; idst_h < dst_h_end; ++idst_h) { for (idst_h = dst_h_beg; idst_h < dst_h_end; ++idst_h) {
FUCK1
CALCULATE1
for (idst_w = dst_w_end; idst_w < dst_w; ++idst_w) { for (idst_w = dst_w_end; idst_w < dst_w; ++idst_w) {
FUCK2
CALCULATE2
} }
} }
#undef FUCK1
#undef FUCK2
#undef CALCULATE1
#undef CALCULATE2
} }
int idst_h; int idst_h;
for (idst_h = dst_h_beg; idst_h + 4 <= dst_h_end; idst_h += 4) { for (idst_h = dst_h_beg; idst_h + 4 <= dst_h_end; idst_h += 4) {


Loading…
Cancel
Save