diff --git a/dnn/src/x86/pooling/max_pooling_w2x2_s2x2_sse.cpp b/dnn/src/x86/pooling/max_pooling_w2x2_s2x2_sse.cpp index 3ee3d30953e5a80b2d19ea8e3dff3b38897484f8..de52daf57bbbf1baf46c4c9a09b38ad33a305364 100644 --- a/dnn/src/x86/pooling/max_pooling_w2x2_s2x2_sse.cpp +++ b/dnn/src/x86/pooling/max_pooling_w2x2_s2x2_sse.cpp @@ -38,11 +38,11 @@ void max_pooling_w2x2_s2x2_sse(const float *src, const int src_h, const int src_ { // brute-force with padding int idst_h, idst_w; -#define FUCK1 \ +#define CALCULATE1 \ const int isrc_h = -pad_h + 2*idst_h; \ const float *src_d = src + isrc_h * src_w; \ float *dst_d = dst + idst_h * dst_w; -#define FUCK2 \ +#define CALCULATE2 \ const int isrc_w = -pad_w + 2*idst_w; \ const float *src_dd = src_d + isrc_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) { - FUCK1 + CALCULATE1 for (idst_w = 0; idst_w < dst_w; ++idst_w) { - FUCK2 + CALCULATE2 } } for (idst_h = dst_h_end; idst_h < dst_h; ++idst_h) { - FUCK1 + CALCULATE1 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) { - FUCK1 + CALCULATE1 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) { - FUCK1 + CALCULATE1 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; for (idst_h = dst_h_beg; idst_h + 4 <= dst_h_end; idst_h += 4) { diff --git a/dnn/src/x86/pooling/mean_pooling_w2x2_s2x2_avx.cpp b/dnn/src/x86/pooling/mean_pooling_w2x2_s2x2_avx.cpp index b75cca3a4932571709477cb730e2a2b392aa50c5..e0e76fa6a4a9d2c7cb993c42109a7daa3405684e 100644 --- a/dnn/src/x86/pooling/mean_pooling_w2x2_s2x2_avx.cpp +++ b/dnn/src/x86/pooling/mean_pooling_w2x2_s2x2_avx.cpp @@ -35,11 +35,11 @@ void mean_pooling_w2x2_s2x2_avx(const float *src, const int src_h, const int src // brute-force with padding int idst_h, idst_w; size_t count; -#define FUCK1 \ +#define CALCULATE1 \ const int isrc_h = -pad_h + 2*idst_h; \ const float *src_d = src + isrc_h * src_w; \ float *dst_d = dst + idst_h * dst_w; -#define FUCK2 \ +#define CALCULATE2 \ const int isrc_w = -pad_w + 2*idst_w; \ const float *src_dd = src_d + isrc_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) { - FUCK1 + CALCULATE1 for (idst_w = 0; idst_w < dst_w; ++idst_w) { - FUCK2 + CALCULATE2 } } for (idst_h = dst_h_end; idst_h < dst_h; ++idst_h) { - FUCK1 + CALCULATE1 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) { - FUCK1 + CALCULATE1 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) { - FUCK1 + CALCULATE1 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; for (idst_h = dst_h_beg; idst_h + 4 <= dst_h_end; idst_h += 4) { diff --git a/dnn/src/x86/pooling/mean_pooling_w2x2_s2x2_sse3.cpp b/dnn/src/x86/pooling/mean_pooling_w2x2_s2x2_sse3.cpp index 9567af25388c5497165e1bc379dbc7b48305d493..065f606c38d74d75c6810b8c2d2d78380165e559 100644 --- a/dnn/src/x86/pooling/mean_pooling_w2x2_s2x2_sse3.cpp +++ b/dnn/src/x86/pooling/mean_pooling_w2x2_s2x2_sse3.cpp @@ -33,11 +33,11 @@ void mean_pooling_w2x2_s2x2_sse3(const float *src, const int src_h, const int sr // brute-force with padding int idst_h, idst_w; size_t count; -#define FUCK1 \ +#define CALCULATE1 \ const int isrc_h = -pad_h + 2*idst_h; \ const float *src_d = src + isrc_h * src_w; \ float *dst_d = dst + idst_h * dst_w; -#define FUCK2 \ +#define CALCULATE2 \ const int isrc_w = -pad_w + 2*idst_w; \ const float *src_dd = src_d + isrc_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) { - FUCK1 + CALCULATE1 for (idst_w = 0; idst_w < dst_w; ++idst_w) { - FUCK2 + CALCULATE2 } } for (idst_h = dst_h_end; idst_h < dst_h; ++idst_h) { - FUCK1 + CALCULATE1 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) { - FUCK1 + CALCULATE1 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) { - FUCK1 + CALCULATE1 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; for (idst_h = dst_h_beg; idst_h + 4 <= dst_h_end; idst_h += 4) {