Enabled reference ops (openvinotoolkit#121)

alvoron · Mar 28, 2023 · 07369c3 · 07369c3
1 parent cf713ed
commit 07369c3
Show file tree

Hide file tree

Showing 19 changed files with 137 additions and 65 deletions.
diff --git a/src/plugins/intel_cpu/src/nodes/bin_conv.cpp b/src/plugins/intel_cpu/src/nodes/bin_conv.cpp
@@ -42,7 +42,7 @@ using namespace Xbyak;
 namespace ov {
 namespace intel_cpu {
 namespace node {
-
+#if defined(OPENVINO_ARCH_X86_64)
 #define GET_OFF(field) offsetof(jit_bin_conv_call_args, field)
 
 template <cpu_isa_t isa>
@@ -874,7 +874,7 @@ struct jit_uni_bin_conv_kernel_f32 : public jit_uni_bin_conv_kernel, public jit_
         }
     }
 };
-
+#endif
 bool BinaryConvolution::isSupportedOperation(const std::shared_ptr<const ngraph::Node>& op, std::string& errorMessage) noexcept {
     try {
         if (isDynamicNgraphNode(op)) {
@@ -913,7 +913,7 @@ BinaryConvolution::BinaryConvolution(const std::shared_ptr<ngraph::Node>& op, co
         }
         paddingL = binConv->get_pads_begin();
         paddingR = binConv->get_pads_end();
-
+#if defined(OPENVINO_ARCH_X86_64)
         if (mayiuse(x64::avx512_core)) {
             implType = impl_desc_type::jit_avx512;
         } else if (mayiuse(x64::avx2)) {
@@ -923,6 +923,9 @@ BinaryConvolution::BinaryConvolution(const std::shared_ptr<ngraph::Node>& op, co
         } else {
             implType = impl_desc_type::ref;
         }
+#else
+    implType = impl_desc_type::ref;
+#endif
     } else {
         IE_THROW(NotImplemented) << errorMessage;
     }
@@ -1092,7 +1095,7 @@ void BinaryConvolution::createPrimitive() {
                    IMPLICATION(jcp.kw > 7, (jcp.t_pad == 0 && jcp.l_pad == 0) || (jcp.stride_w == 1 && jcp.stride_h == 1));
     if (!args_ok)
         IE_THROW() << "BinaryConvolution with name '" << getName() << "' has unsupported parameters";
-
+#if defined(OPENVINO_ARCH_X86_64)
     if (implType == impl_desc_type::jit_avx512) {
         bin_conv_kernel.reset(new jit_uni_bin_conv_kernel_f32<x64::avx512_core>(jcp, jcp_dw_conv, *attr.get()));
     } else if (implType == impl_desc_type::jit_avx2) {
@@ -1102,6 +1105,7 @@ void BinaryConvolution::createPrimitive() {
     }
     if (bin_conv_kernel)
         bin_conv_kernel->create_ker();
+#endif
 }
 
 bool BinaryConvolution::canFuse(const NodePtr& node) const {

diff --git a/src/plugins/intel_cpu/src/nodes/def_conv.cpp b/src/plugins/intel_cpu/src/nodes/def_conv.cpp
@@ -23,7 +23,7 @@ using namespace Xbyak;
 namespace ov {
 namespace intel_cpu {
 namespace node {
-
+#if defined(OPENVINO_ARCH_X86_64)
 #define GET_OFF(field) offsetof(jit_def_conv_call_args, field)
 
 template <cpu_isa_t isa>
@@ -667,7 +667,7 @@ struct jit_uni_def_conv_kernel_f32 : public jit_uni_def_conv_kernel, public jit_
         pop(reg_sampled_offs);
     }
 };
-
+#endif
 bool DeformableConvolution::isSupportedOperation(const std::shared_ptr<const ngraph::Node>& op, std::string& errorMessage) noexcept {
     try {
         if (!one_of(op->get_type_info(),
@@ -820,6 +820,7 @@ void DeformableConvolution::initSupportedPrimitiveDescriptors() {
     config.outConfs[0].inPlace(-1);
 
     impl_desc_type impl_type;
+#if defined(OPENVINO_ARCH_X86_64)
     const int simd_w = mayiuse(cpu::x64::avx512_core) ? 16 : 8;
 
     auto &weiDims = getInputShapeAtPort(WEI_ID).getDims();
@@ -842,7 +843,10 @@ void DeformableConvolution::initSupportedPrimitiveDescriptors() {
     } else {
         impl_type = impl_desc_type::ref;
     }
-
+#else
+    impl_type = impl_desc_type::ref;
+#endif
+#if defined(OPENVINO_ARCH_X86_64)
     if (!enforceRef && mayiuse(cpu::x64::sse41)) {
         // optimized implementation
         auto dataFormat = memory::format_tag::nhwc;
@@ -864,6 +868,7 @@ void DeformableConvolution::initSupportedPrimitiveDescriptors() {
                                                                               memory::data_type::f32, dataFormat));
         supportedPrimitiveDescriptors.push_back({config, impl_type});
     } else {
+#endif
         // reference implementation
         config.inConfs[DATA_ID].setMemDesc(std::make_shared<DnnlBlockedMemoryDesc>(getInputShapeAtPort(DATA_ID), memory::data_type::f32,
                                                                                    memory::format_tag::nchw));
@@ -878,7 +883,9 @@ void DeformableConvolution::initSupportedPrimitiveDescriptors() {
         config.outConfs[0].setMemDesc(std::make_shared<DnnlBlockedMemoryDesc>(getOutputShapeAtPort(DATA_ID), memory::data_type::f32,
                                                                               memory::format_tag::nchw));
         supportedPrimitiveDescriptors.push_back({config, impl_type});
+#if defined(OPENVINO_ARCH_X86_64)
     }
+#endif
 }
 
 void DeformableConvolution::DefConvExecutor::prepareSamplingWeights(
@@ -1029,7 +1036,7 @@ DeformableConvolution::DefConvExecutor::DefConvExecutor(const DefConvAttr &defCo
     if (withModulation) {
         modStrides = descVector[MOD_ID]->getStrides();
     }
-
+#if defined(OPENVINO_ARCH_X86_64)
     const VectorDims srcDims = descVector[DATA_ID]->getShape().getStaticDims();
     const VectorDims weiDims = descVector[WEI_ID]->getShape().getStaticDims();
     const VectorDims dstDims = descVector[descVector.size() - 1]->getShape().getStaticDims();
@@ -1080,11 +1087,13 @@ DeformableConvolution::DefConvExecutor::DefConvExecutor(const DefConvAttr &defCo
     jcp.nb_oc_blocking = !mayiuse(cpu::x64::avx2) ? 2 : 4;
 
     jcp.nthr = dnnl_get_max_threads();
+#endif
 }
 
 DeformableConvolution::DefConvJitExecutor::DefConvJitExecutor(const DefConvAttr &defConvAttr,
                             const std::vector<std::shared_ptr<BlockedMemoryDesc>> &descVector) :
                 DefConvExecutor(defConvAttr, descVector) {
+#if defined(OPENVINO_ARCH_X86_64)
     if (mayiuse(cpu::x64::avx512_core)) {
         def_conv_kernel.reset(new jit_uni_def_conv_kernel_f32<cpu::x64::avx512_core>(jcp));
     } else if (mayiuse(cpu::x64::avx2)) {
@@ -1099,6 +1108,7 @@ DeformableConvolution::DefConvJitExecutor::DefConvJitExecutor(const DefConvAttr
     } else {
         IE_THROW() << "Can't compile DefConvJitExecutor";
     }
+#endif
 }
 
 void DeformableConvolution::DefConvRefExecutor::exec(const float* src, const float* offsets,

diff --git a/src/plugins/intel_cpu/src/nodes/dft.cpp b/src/plugins/intel_cpu/src/nodes/dft.cpp
@@ -535,10 +535,11 @@ void DFT::prepareParams() {
             hasFFT = true;
         }
     }
-
+#if defined(OPENVINO_ARCH_X86_64)
     if (mayiuse(cpu::x64::sse41)) {
         createJITKernels(hasDFT, hasFFT);
     }
+#endif
 }
 
 std::vector<int32_t> DFT::getAxes() const {
@@ -553,7 +554,7 @@ std::vector<int32_t> DFT::getAxes() const {
     std::sort(axes.begin(), axes.end());
     return axes;
 }
-
+#if defined(OPENVINO_ARCH_X86_64)
 void DFT::createJITKernels(bool hasDFT, bool hasFFT) {
     if (hasDFT && dftKernel == nullptr) {
         if (mayiuse(cpu::x64::avx512_core)) {
@@ -585,7 +586,7 @@ void DFT::createJITKernels(bool hasDFT, bool hasFFT) {
             fftKernel->create_ker();
     }
 }
-
+#endif
 }   // namespace node
 }   // namespace intel_cpu
 }   // namespace ov
diff --git a/src/plugins/intel_cpu/src/nodes/dft.h b/src/plugins/intel_cpu/src/nodes/dft.h
@@ -30,8 +30,9 @@ class DFT : public Node {
 
 private:
     std::vector<int32_t> getAxes() const;
+#if defined(OPENVINO_ARCH_X86_64)
     void createJITKernels(bool hasDFT, bool hasFFT);
-
+#endif
     void dftNd(float* output,
                const VectorDims& outputShape,
                const VectorDims& outputStrides,

diff --git a/src/plugins/intel_cpu/src/nodes/extract_image_patches.cpp b/src/plugins/intel_cpu/src/nodes/extract_image_patches.cpp
@@ -25,7 +25,7 @@ using namespace Xbyak;
 namespace ov {
 namespace intel_cpu {
 namespace node {
-
+#if defined(OPENVINO_ARCH_X86_64)
 #define GET_OFF(field) offsetof(jit_extract_image_patches_args, field)
 
 template <cpu_isa_t isa>
@@ -270,7 +270,7 @@ struct jit_extract_image_patches_kernel : public jit_uni_extract_image_patches_k
             dd(i * jpp.SW * jpp.dtype_size);
     }
 };
-
+#endif
 bool ExtractImagePatches::isSupportedOperation(const std::shared_ptr<const ngraph::Node>& op, std::string& errorMessage) noexcept {
     try {
         auto extImgPatcher = ngraph::as_type_ptr<const ngraph::opset3::ExtractImagePatches>(op);
@@ -378,8 +378,13 @@ void ExtractImagePatches::prepareParams() {
     const auto& out_dims = getChildEdgesAtPort(0)[0]->getMemory().getStaticDims();
     const auto prcSize = getOriginalInputPrecisionAtPort(0).size();
     ExtractImagePatchesKey key = {in_dims, out_dims, _ksizes, _strides, _rates, _auto_pad, prcSize};
+#if defined(OPENVINO_ARCH_X86_64)
     const auto isJit = mayiuse(x64::sse41);
+#else
+    const auto isJit = false;
+#endif
     auto buildExecutor = [&isJit](const ExtractImagePatchesKey& key) -> executorPtr {
+#if defined(OPENVINO_ARCH_X86_64)
         if (isJit) {
             return std::make_shared<ExtractImagePatchesJitExecutor>(key.inDims,
                                                                     key.outDims,
@@ -389,14 +394,18 @@ void ExtractImagePatches::prepareParams() {
                                                                     key.padType,
                                                                     key.prcSize);
         } else {
+#else
             return std::make_shared<ExtractImagePatchesRefExecutor>(key.inDims,
                                                                     key.outDims,
                                                                     key.kSizes,
                                                                     key.strides,
                                                                     key.rates,
                                                                     key.padType,
                                                                     key.prcSize);
+#endif
+#if defined(OPENVINO_ARCH_X86_64)
         }
+#endif
     };
     auto cache = context->getParamsCache();
     auto result = cache->getOrCreate(key, buildExecutor);
@@ -478,7 +487,7 @@ void ExtractImagePatches::ExtractImagePatchesRefExecutor::executeReference(
         memset(my_dst_ptr, 0, num_bytes_to_set);
     });
 }
-
+#if defined(OPENVINO_ARCH_X86_64)
 void ExtractImagePatches::ExtractImagePatchesJitExecutor::executeOptimizedGeneric(
     void* src, void* dst, const VectorDims& istrides, const VectorDims& ostrides) const {
     const char* src_data = reinterpret_cast<const char*>(src);
@@ -508,7 +517,7 @@ void ExtractImagePatches::ExtractImagePatchesJitExecutor::executeOptimizedGeneri
         (*pKernel)(&args);
     });
 }
-
+#endif
 jit_extract_image_patches_params ExtractImagePatches::ExtractImagePatchesExecutor::fillJpp(
     const VectorDims& inDims,
     const VectorDims& outDims,
@@ -564,6 +573,7 @@ jit_extract_image_patches_params ExtractImagePatches::ExtractImagePatchesExecuto
     }
 
     jpp.dtype_size = prcSize;
+#if defined(OPENVINO_ARCH_X86_64)
     if (mayiuse(x64::avx512_core)) {
         jpp.block_size = cpu_isa_traits<x64::avx512_core>::vlen / prcSize;
     } else if (mayiuse(x64::avx2)) {
@@ -573,10 +583,11 @@ jit_extract_image_patches_params ExtractImagePatches::ExtractImagePatchesExecuto
     } else {
         jpp.block_size = 1;
     }
-
+#endif
+    jpp.block_size = 1;
     return jpp;
 }
-
+#if defined(OPENVINO_ARCH_X86_64)
 ExtractImagePatches::ExtractImagePatchesJitExecutor::ExtractImagePatchesJitExecutor(
     const VectorDims& inDims,
     const VectorDims& outDims,
@@ -606,7 +617,7 @@ void ExtractImagePatches::ExtractImagePatchesJitExecutor::exec(
         IE_THROW() << "Can't execute, kernel for extract image patches node is not compiled";
     executeOptimizedGeneric(src, dst, istrides, ostrides);
 }
-
+#endif
 ExtractImagePatches::ExtractImagePatchesRefExecutor::ExtractImagePatchesRefExecutor(
     const VectorDims& inDims,
     const VectorDims& outDims,

diff --git a/src/plugins/intel_cpu/src/nodes/extract_image_patches.h b/src/plugins/intel_cpu/src/nodes/extract_image_patches.h
@@ -95,7 +95,7 @@ class ExtractImagePatches : public Node {
 
     using executorPtr = std::shared_ptr<ExtractImagePatchesExecutor>;
     executorPtr execPtr = nullptr;
-
+#if defined(OPENVINO_ARCH_X86_64)
     struct ExtractImagePatchesJitExecutor : public ExtractImagePatchesExecutor {
         ExtractImagePatchesJitExecutor(
             const VectorDims& inDims,
@@ -111,7 +111,7 @@ class ExtractImagePatches : public Node {
     private:
         std::unique_ptr<jit_uni_extract_image_patches_kernel> pKernel;
     };
-
+#endif
     struct ExtractImagePatchesRefExecutor : public ExtractImagePatchesExecutor {
         ExtractImagePatchesRefExecutor(
             const VectorDims& inDims,

diff --git a/src/plugins/intel_cpu/src/nodes/fake_quantize.cpp b/src/plugins/intel_cpu/src/nodes/fake_quantize.cpp
@@ -42,7 +42,7 @@ using namespace Xbyak;
 namespace ov {
 namespace intel_cpu {
 namespace node {
-
+#if defined(OPENVINO_ARCH_X86_64)
 #define GET_OFF(field) offsetof(jit_quantize_call_args, field)
 
 template <cpu_isa_t isa>
@@ -827,7 +827,7 @@ struct jit_uni_quantization_kernel : public jit_uni_quantize_kernel, public jit_
         }
     }
 };
-
+#endif
 bool FakeQuantize::isSupportedOperation(const std::shared_ptr<const ngraph::Node>& op, std::string& errorMessage) noexcept {
     try {
         const auto fq = std::dynamic_pointer_cast<const ngraph::opset1::FakeQuantize>(op);
@@ -1263,6 +1263,7 @@ void FakeQuantize::initSupportedPrimitiveDescriptors() {
         return;
 
     impl_desc_type impl_type;
+#if defined(OPENVINO_ARCH_X86_64)
     if (mayiuse(cpu::x64::avx512_core)) {
         impl_type = impl_desc_type::jit_avx512;
     } else if (mayiuse(cpu::x64::avx2)) {
@@ -1272,8 +1273,14 @@ void FakeQuantize::initSupportedPrimitiveDescriptors() {
     } else {
         impl_type = impl_desc_type::ref;
     }
-
+#else
+    impl_type = impl_desc_type::ref;
+#endif
+#if defined(OPENVINO_ARCH_X86_64)
     if (!mayiuse(cpu::x64::sse41) || getAxis() != 1) {
+#else
+        if (getAxis() != 1) {
+#endif
         impl_type = impl_desc_type::ref;
 
         if (!isBinarization()) {
@@ -1414,6 +1421,7 @@ void FakeQuantize::prepareParams() {
     auto selectedPrimitiveDescriptor = getSelectedPrimitiveDescriptor();
     if (!selectedPrimitiveDescriptor)
         IE_THROW() << "CPU quantize node with name '" << getName() << "' doesn't have primitive descriptors.";
+#if defined(OPENVINO_ARCH_X86_64)
     if (selectedPrimitiveDescriptor->getImplementationType() != impl_desc_type::ref) {
         const auto& config = getSelectedPrimitiveDescriptor()->getConfig();
         const auto& inDims = getParentEdgesAtPort(0)[0]->getMemory().getStaticDims();
@@ -1439,6 +1447,7 @@ void FakeQuantize::prepareParams() {
         auto result = cache->getOrCreate(key, buildExecutor);
         execPtr = result.first;
     }
+#endif
 }
 
 void FakeQuantize::executeReference() {
@@ -1557,7 +1566,7 @@ void FakeQuantize::executeReference() {
         });
     }
 }
-
+#if defined(OPENVINO_ARCH_X86_64)
 void FakeQuantize::executeBinarization(const std::unique_ptr<jit_uni_quantize_kernel> &pKernel) const {
     auto &srcMemory = getParentEdgeAt(0)->getMemoryPtr();
     auto &dstMemory = getChildEdgeAt(0)->getMemoryPtr();
@@ -1728,7 +1737,7 @@ void FakeQuantize::executeQuantization(const std::unique_ptr<jit_uni_quantize_ke
         });
     }
 }
-
+#endif
 void FakeQuantize::executeDynamicImpl(dnnl::stream strm) {
     execute(strm);
 }
@@ -2079,7 +2088,7 @@ bool FakeQuantize::appendAttrPostOps(DnnlPostOpsComposer& dnnlpoc,
     dnnlpoc.appendLinear(f.osc, f.osh, allowBinary);
     return true;
 }
-
+#if defined(OPENVINO_ARCH_X86_64)
 FakeQuantize::FakeQuantizeJitExecutor::FakeQuantizeJitExecutor(const jit_quantize_params &_jqp) {
     bool isBinarization = _jqp.op_type == Algorithm::FQBinarization;
     if (mayiuse(cpu::x64::avx512_core)) {
@@ -2115,7 +2124,7 @@ void FakeQuantize::FakeQuantizeJitExecutor::exec(const FakeQuantize& node) {
         node.executeQuantization(pKernel);
     }
 }
-
+#endif
 bool FakeQuantize::created() const {
     return getType() == Type::FakeQuantize;
 }