[FORK][FIX][x64] Add proper post op checks to gemm_conv

Author: maxnick

src/cpu/gemm_convolution_utils.cpp

@@ -80,6 +80,17 @@ struct ref_pp_kernel_t : pp_kernel_t {
         ref_depthwise_injectors_.clear();
     }
 
+    static bool post_ops_ok(const convolution_pd_t *pd) {
+        using namespace dnnl::impl::primitive_kind;
+        const auto& po = pd->attr()->post_ops_;
+        for (int i = 0; i < po.len(); i++) {
+            if (!utils::one_of(po.entry_[i].kind, eltwise, depthwise, quantization)) {
+                return false;
+            }
+        }
+        return true;
+    }
+
     virtual void operator()(float *dst_orig, float *dst, const float *bias, const int len, const int oc_start, const int oc_work, const int oc_stride,
                             const std::vector<const void *>& post_ops_binary_rhs_arg_vec) const override;
 
@@ -197,9 +208,12 @@ pp_kernel_t *pp_kernel_t::create(
     if (res) return res;
 #endif
 
-    return new ref_pp_kernel_t(pd, jcp);
-}
+    if (ref_pp_kernel_t::post_ops_ok(pd)) {
+        return new ref_pp_kernel_t(pd, jcp);
+    }
 
+    return nullptr;
+}
 } // namespace gemm_convolution_utils
 
 namespace jit_gemm_convolution_utils {

src/cpu/x64/jit_gemm_convolution_utils.cpp

@@ -110,6 +110,23 @@ struct jit_pp_kernel_t : pp_kernel_t, public jit_generator {
         }
     }
 
+    static bool post_ops_ok(const convolution_pd_t *pd) {
+        const auto& post_ops = pd->attr()->post_ops_;
+        auto dst_md = pd->dst_md();
+        for (int i = 0; i < post_ops.len(); i++) {
+            const auto &post_op = post_ops.entry_[i];
+            if (post_op.is_binary()) {
+                if (!binary_injector::is_supported(isa,
+                        binary_injector::get_src1_desc(post_op, *dst_md),
+                        *dst_md,
+                        default_strategies())) {
+                        return false;
+                }
+            }
+        }
+        return true;
+    }
+
 private:
     void generate() override;
 
@@ -391,11 +408,11 @@ void jit_pp_kernel_t<isa>::generate() {
 
 pp_kernel_t *jit_pp_kernel_create(
         const convolution_pd_t *pd, const conv_gemm_conf_t &jcp) {
-    if (mayiuse(avx512_core)) {
+    if (mayiuse(avx512_core) && jit_pp_kernel_t<avx512_core>::post_ops_ok(pd)) {
         return new jit_pp_kernel_t<avx512_core>(pd, jcp);
-    } else if (mayiuse(avx2)) {
+    } else if (mayiuse(avx2) && jit_pp_kernel_t<avx2>::post_ops_ok(pd)) {
         return new jit_pp_kernel_t<avx2>(pd, jcp);
-    } else if (mayiuse(sse41)) {
+    } else if (mayiuse(sse41) && jit_pp_kernel_t<sse41>::post_ops_ok(pd)) {
         return new jit_pp_kernel_t<sse41>(pd, jcp);
     }
     return nullptr;