[GPU] Updated onednn submodule and added layout optimizer fix

openvinotoolkit · Nov 9, 2021 · c007201 · c007201
1 parent 87d550c
commit c007201
Show file tree

Hide file tree

Showing 3 changed files with 8 additions and 5 deletions.
diff --git a/inference-engine/thirdparty/clDNN/src/impls/ocl/reduce.cpp b/inference-engine/thirdparty/clDNN/src/impls/ocl/reduce.cpp
@@ -101,6 +101,11 @@ attach_reduce_impl::attach_reduce_impl() {
         std::make_tuple(data_types::i32, format::b_fs_yx_fsv16),
         std::make_tuple(data_types::i8, format::b_fs_yx_fsv16),
         std::make_tuple(data_types::u8, format::b_fs_yx_fsv16),
+        std::make_tuple(data_types::f32, format::b_fs_yx_fsv32),
+        std::make_tuple(data_types::f16, format::b_fs_yx_fsv32),
+        std::make_tuple(data_types::i32, format::b_fs_yx_fsv32),
+        std::make_tuple(data_types::i8, format::b_fs_yx_fsv32),
+        std::make_tuple(data_types::u8, format::b_fs_yx_fsv32),
     });
 }
 

diff --git a/inference-engine/thirdparty/clDNN/src/layout_optimizer.cpp b/inference-engine/thirdparty/clDNN/src/layout_optimizer.cpp
@@ -866,10 +866,8 @@ layout layout_optimizer::get_expected_layout(layout const& current_layout,
                 }
             } else if ((_optimization_attributes.b_fs_yx_fsv16_network &&
                        convolution_b_fs_yx_fsv16_opt(input_layout, output_layout, weights_layout, prim)) && is_2d) {
-                if (is_dw)
-                    expected_format = cldnn::format::b_fs_yx_fsv32;
-                else
-                    expected_format = cldnn::format::b_fs_yx_fsv16;
+                // TODO: optimize clDNN kernels for good support of b_fs_yx_fsv32 format
+                expected_format = cldnn::format::b_fs_yx_fsv32;
             } else {
                 expected_format = imad_case(node);
             }

diff --git a/thirdparty/onednn_gpu b/thirdparty/onednn_gpu
+2 −0		CMakeLists.txt
+80 −0		cmake/dnnl_compat.cmake
+5 −0		cmake/platform.cmake
+9 −9		doc/advanced/primitive_cache.md
+62 −58		doc/build/build_options.md
+5 −5		doc/performance_considerations/cpu_isa_hints.md
+4 −4		doc/performance_considerations/dispatcher_control.md
+3 −3		doc/performance_considerations/inspecting_jit.md
+15 −15		doc/performance_considerations/profilers.md
+16 −16		doc/performance_considerations/verbose.md
+2 −2		doc/programming_model/attributes_fpmath_mode.md
+6 −6		doc/programming_model/attributes_scratchpad.md
+10 −10		examples/memory_format_propagation.cpp
+10 −10		examples/performance_profiling.cpp
+3 −3		scripts/verbose_converter/src/dnnl_parser.py
+3 −3		scripts/verbose_converter/tests/benchdnn_test.py
+9 −13		src/common/fpmath_mode.cpp
+4 −6		src/common/ittnotify.cpp
+1 −0		src/common/ittnotify.hpp
+2 −2		src/common/primitive.cpp
+1 −1		src/common/primitive_cache.cpp
+5 −5		src/common/stack_checker.hpp
+37 −3		src/common/utils.cpp
+10 −1		src/common/utils.hpp
+16 −17		src/common/verbose.cpp
+1 −1		src/cpu/aarch64/acl_utils.hpp
+4 −3		src/cpu/aarch64/cpu_isa_traits.cpp
+3 −3		src/cpu/aarch64/cpu_isa_traits.hpp
+3 −3		src/cpu/jit_utils/linux_perf/linux_perf.cpp
+3 −3		src/cpu/matmul/gemm_x8s8s32x_matmul.cpp
+9 −6		src/cpu/x64/cpu_isa_traits.cpp
+11 −11		src/cpu/x64/cpu_isa_traits.hpp
+4 −4		src/cpu/x64/jit_brgemm_conv_utils.cpp
+66 −59		src/cpu/x64/jit_brgemm_inner_product.cpp
+2 −1		src/cpu/x64/jit_brgemm_inner_product.hpp
+17 −7		src/cpu/x64/jit_brgemm_inner_product_utils.cpp
+2 −2		src/cpu/x64/matmul/brgemm_matmul_utils.cpp
+1 −1		src/gpu/compute/compute_stream.cpp
+1 −1		src/gpu/compute/device_info.cpp
+1 −1		src/gpu/jit/conv/gen_convolution.cpp
+1 −1		src/gpu/jit/gemm/gen_gemm.hpp
+1 −1		src/gpu/jit/gemm/xe_hp_systolic_gemm.cpp
+1 −1		src/gpu/ocl/gen9_concat.cpp
+1 −1		src/gpu/ocl/gen9_concat.hpp
+4 −4		src/gpu/ocl/generic_reorder.cpp
+1 −1		src/gpu/ocl/ocl_gpu_hw_info.cpp
+2 −2		src/gpu/ocl/ocl_utils.hpp
+1 −1		src/gpu/ocl/verbose.hpp
+3 −3		src/sycl/level_zero_utils.cpp
+1 −1		src/sycl/sycl_engine.cpp
+1 −1		src/sycl/sycl_interop_gpu_kernel.cpp
+1 −1		src/sycl/verbose.hpp
+3 −0		tests/benchdnn/utils/parser.cpp
+20 −0		tests/gtests/internals/CMakeLists.txt
+111 −0		tests/gtests/internals/test_env_vars_dnnl.cpp
+111 −0		tests/gtests/internals/test_env_vars_onednn.cpp