src: cpu: int8: dilated conv: fixup case when ih<=dh

oneapi-src · Oct 1, 2019 · e68f151 · e68f151
1 parent ae8efde
commit e68f151
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 2 deletions.
diff --git a/src/cpu/jit_avx512_core_x8s8s32x_conv_kernel.cpp b/src/cpu/jit_avx512_core_x8s8s32x_conv_kernel.cpp
@@ -518,8 +518,10 @@ void _jit_avx512_core_x8s8s32x_fwd_kernel<Vmm>::kh_loop(
         L(no_t_overflow_label);
     }
     mov(reg_kj, ptr[param1 + GET_OFF(kh_padding)]);
-    if ((jcp.signed_input) || (!jcp.signed_input &&
-       (jcp.kh - 1) * (jcp.dilate_h + 1) < nstl::max(jcp.t_pad, jcp.b_pad))) {
+    if ((jcp.signed_input) || (jcp.dilate_h >= jcp.ih)
+            || (!jcp.signed_input
+                    && (jcp.kh - 1) * (jcp.dilate_h + 1)
+                            < nstl::max(jcp.t_pad, jcp.b_pad))) {
         cmp(reg_kj, 0);
         je(skip_kh_loop, T_NEAR);
     }

diff --git a/tests/benchdnn/inputs/test_conv_regression_general b/tests/benchdnn/inputs/test_conv_regression_general
@@ -145,3 +145,6 @@ mb1_g16ic16oc16_ih5oh2kh2sh3ph0
 
 # AVX JIT incorrectly calculates output when 'nb_oc_block' results in a prime number
 --reset --dir=FWD_I mb1ic3ih320oc51oh160kh7sh2ph3n"regression_oc-channel"
+
+# Dilated convolution with ih<=dh when there is _no_ compute work.
+--reset --conv --cfg=u8s8u8s32 mb1ic16ih1iw1oc16oh2ow1kh3kw1dh1ph1