From 786a1f7fb5f1d34fd92d4f4c9ba68a26a026ce0e Mon Sep 17 00:00:00 2001 From: Liangliang He Date: Tue, 3 Apr 2018 15:48:24 +0800 Subject: [PATCH] Reduce conv2d ops benchmark test cases --- mace/ops/conv_2d_benchmark.cc | 35 +++++++++++++---------------------- 1 file changed, 13 insertions(+), 22 deletions(-) diff --git a/mace/ops/conv_2d_benchmark.cc b/mace/ops/conv_2d_benchmark.cc index 4197f65c..98a5017d 100644 --- a/mace/ops/conv_2d_benchmark.cc +++ b/mace/ops/conv_2d_benchmark.cc @@ -122,37 +122,28 @@ static void Conv2d(int iters, #define BM_CONV_2D(N, C, H, W, KH, KW, S, D, P, OC) \ BM_CONV_2D_MACRO(N, C, H, W, KH, KW, S, D, P, OC, float, CPU); \ + BM_CONV_2D_MACRO(N, C, H, W, KH, KW, S, D, P, OC, float, NEON); \ BM_CONV_2D_MACRO(N, C, H, W, KH, KW, S, D, P, OC, float, OPENCL); \ - BM_CONV_2D_MACRO(N, C, H, W, KH, KW, S, D, P, OC, half, OPENCL); \ - BM_CONV_2D_MACRO(N, C, H, W, KH, KW, S, D, P, OC, float, NEON); + BM_CONV_2D_MACRO(N, C, H, W, KH, KW, S, D, P, OC, half, OPENCL); -BM_CONV_2D(1, 256, 64, 64, 3, 3, 1, 1, VALID, 256); - -BM_CONV_2D(1, 512, 15, 15, 1, 1, 1, 1, VALID, 1024); -BM_CONV_2D(1, 32, 60, 60, 1, 1, 1, 1, VALID, 128); - -BM_CONV_2D(1, 128, 60, 60, 3, 3, 1, 1, VALID, 128); -BM_CONV_2D(1, 32, 60, 60, 3, 3, 1, 1, SAME, 32); -BM_CONV_2D(1, 3, 512, 512, 7, 7, 2, 1, SAME, 64); - -BM_CONV_2D(1, 128, 16, 16, 3, 3, 1, 1, VALID, 32); -BM_CONV_2D(1, 128, 64, 64, 3, 3, 1, 1, VALID, 32); - -BM_CONV_2D(1, 3, 480, 480, 1, 1, 1, 1, VALID, 3); +// Filter sizes and data alignments BM_CONV_2D(1, 64, 32, 32, 1, 1, 1, 1, VALID, 128); -BM_CONV_2D(1, 64, 33, 31, 1, 1, 1, 1, VALID, 128); // Test bad alignments -BM_CONV_2D(1, 64, 32, 32, 3, 3, 2, 1, SAME, 128); -BM_CONV_2D(1, 64, 33, 31, 3, 3, 2, 1, SAME, 128); -BM_CONV_2D(1, 3, 224, 224, 3, 3, 2, 1, SAME, 32); -BM_CONV_2D(1, 3, 224, 224, 3, 3, 2, 1, VALID, 32); +BM_CONV_2D(1, 64, 33, 31, 1, 1, 1, 1, VALID, 128); +BM_CONV_2D(1, 64, 32, 32, 3, 3, 1, 1, SAME, 128); +BM_CONV_2D(1, 64, 33, 31, 3, 3, 1, 1, SAME, 128); BM_CONV_2D(1, 64, 32, 32, 5, 5, 1, 1, SAME, 128); BM_CONV_2D(1, 64, 32, 31, 5, 5, 1, 1, SAME, 128); +BM_CONV_2D(1, 64, 32, 31, 15, 1, 1, 1, SAME, 128); +BM_CONV_2D(1, 64, 32, 31, 1, 15, 1, 1, SAME, 128); -BM_CONV_2D(1, 1024, 16, 16, 15, 1, 1, 1, SAME, 2); +// 3 channels input +BM_CONV_2D(1, 3, 480, 480, 1, 1, 1, 1, VALID, 3); +BM_CONV_2D(1, 3, 224, 224, 3, 3, 2, 1, SAME, 32); +BM_CONV_2D(1, 3, 224, 224, 3, 3, 2, 1, VALID, 32); -// Dilation +// Dilations BM_CONV_2D(1, 32, 256, 256, 3, 3, 1, 2, VALID, 32); BM_CONV_2D(1, 32, 256, 256, 3, 3, 1, 4, VALID, 32); -- GitLab