gpu: ocl: fix wino zeropad

oneapi-src · Apr 24, 2023 · 97ac885 · 97ac885
1 parent 51d608d
commit 97ac885
Show file tree

Hide file tree

Showing 3 changed files with 7 additions and 3 deletions.
diff --git a/src/gpu/ocl/gen9_wino_conv_fwd_data_fused.cl b/src/gpu/ocl/gen9_wino_conv_fwd_data_fused.cl
@@ -1,5 +1,5 @@
 /*******************************************************************************
- * Copyright 2020-2021 Intel Corporation
+ * Copyright 2020-2023 Intel Corporation
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -615,7 +615,10 @@ gen9_wino_conv_fwd(__global DATA_T *dst, const __global DATA_T *src,
                             dst[dst_idx
                                     + dst_off(0, oc_off * COMP_OC_STRIDE, 0,
                                             h_off, w_off)]
-                                    = C[oc_off][h_off][w_off];
+                                    = (OC_WO_PADDING % OC_BLOCK == 0
+                                              || oc + oc_off < OC_WO_PADDING)
+                                    ? C[oc_off][h_off][w_off]
+                                    : DATA_ZERO;
                     }
                 }
             }

diff --git a/tests/benchdnn/inputs/conv/shapes_basic_gpu b/tests/benchdnn/inputs/conv/shapes_basic_gpu
@@ -6,6 +6,7 @@ g1ic17oc17_iw5ow5kw3pw1_n"1d_tail_conv:3x3"
 
 # two dimensional shapes
 g1ic3oc16_ih5oh5kh3ph1_n"2d_conv:1st"
+g1ic3oc17_ih5oh5kh3ph1_n"2d_conv:1st_tail"
 g1ic17oc17_ih5oh5kh1ph0_n"2d_tail_conv:1x1"
 g1ic16oc16_ih5oh5kh3ph1_n"2d_conv:3x3"
 g4ic16oc16_ih5oh5kh3ph1_n"2d_conv:grouped"

diff --git a/tests/benchdnn/inputs/conv/test_conv_gpu_ci b/tests/benchdnn/inputs/conv/test_conv_gpu_ci
@@ -51,7 +51,7 @@
 --stag=any,axb
 --alg=wino
 --cfg=f16,f32
---attr-post-ops=,sum:0.25+relu:0.5
+--attr-post-ops=,add:f32,sum:0.25+relu:0.5
 --batch=shapes_basic_gpu
 
 # f64