Skip to content

Commit 2250a7d

Browse files
azhai219AJThePro99
authored andcommitted
[CPU] oneDNN3.6 cherry-pick backports (openvinotoolkit#28843)
- fix the copy_a init in brgemm: uxlfoundation/oneDNN@59513f7 - relax the rnn tests test onednn branch is https://github.com/openvinotoolkit/oneDNN/tree/xiuchuan/dev-v3.6 but without permission of pushing cherry-pick commits to branch https://github.com/openvinotoolkit/oneDNN/tree/v3.6_for_ie_master oneDNN fork PR: openvinotoolkit/oneDNN#273
1 parent 46b4f10 commit 2250a7d

File tree

3 files changed

+2
-7
lines changed

3 files changed

+2
-7
lines changed

src/plugins/intel_cpu/src/nodes/kernels/x64/brgemm_kernel.cpp

+1
Original file line numberDiff line numberDiff line change
@@ -273,6 +273,7 @@ void BrgemmKernel::init_brgemm_copy_a(
273273
: DnnlExtensionUtils::sizeOfDataType(static_cast<dnnl::memory::data_type>(dt_in0));
274274
brgCopyKernelConf.transposed_A = transpose;
275275
brgCopyKernelConf.isa = is_avx_f16_only ? avx512_core_fp16 : avx512_core_amx;
276+
brgCopyKernelConf.orig_wei_dt = static_cast<dnnl_data_type_t>(DnnlExtensionUtils::ElementTypeToDataType(inType));
276277

277278
create_brgemm_matmul_copy_a(brgCopyKernel, &brgCopyKernelConf);
278279
}

src/plugins/intel_cpu/tests/functional/shared_tests_instances/skip_tests_config.cpp

-6
Original file line numberDiff line numberDiff line change
@@ -479,18 +479,12 @@ std::vector<std::string> disabledTestPatterns() {
479479
R"(.*smoke_MatMulCompressedWeights_corner_cases_basic/MatmulWeightsDecompression.CompareWithRefs/data_shape=\[\?.\?.\?\]_\(\[1,1,4096\]\)_weights_shape=\[4096,4096\]_group_size=128_weights_precision=nf4_decompression_precision=f16_scale_precision=undefined_transpose_weights=0_decompression_subtract=full_reshape_on_decompression=1_config=\(\).*)");
480480
retVector.emplace_back(R"(.*smoke_RDFT_CPU_1D/RDFTTestCPU.CompareWithRefs/prec=f32_IS0=\[\]_TS0=\(\(126\)\)_constAxes=true_axes=\(\(0\)\)_isInverse=false.*)");
481481
retVector.emplace_back(R"(.*smoke_RDFT_CPU_2D/RDFTTestCPU.CompareWithRefs/prec=f32_IS0=\[\]_TS0=\(\(16.38\)\)_constAxes=true_axes=\(\(0.1\)\)_isInverse=false.*)");
482-
// Issue: MFDNN-12818
483-
retVector.emplace_back(R"(.*smoke_LPT/RecurrentCellTransformation.CompareWithRefImpl/f32_\[1,1,3\]_CPU_f32FQ_X_level=256_.*_FQ_W_level=255.*)");
484-
retVector.emplace_back(R"(.*smoke_static/ConvertFqRnnToQuantizedRnn.CompareWithRefs/Type=GRUSequence.*2.5.10.*2.1.4.*2.1.4.*)");
485482
#endif
486483
if (!ov::with_cpu_x86_avx512_core()) {
487484
// on platforms which do not support bfloat16, we are disabling bf16 tests since there are no bf16 primitives,
488485
// tests are useless on such platforms
489486
retVector.emplace_back(R"(.*(BF|bf)16.*)");
490487
retVector.emplace_back(R"(.*bfloat16.*)");
491-
// Issue: MFDNN-12818
492-
retVector.emplace_back(R"(.*smoke_LPT/RecurrentCellTransformation.CompareWithRefImpl/f32_\[1,1,3\]_CPU_f32FQ_X_level=256_.*_FQ_W_level=255.*)");
493-
retVector.emplace_back(R"(.*smoke_static/ConvertFqRnnToQuantizedRnn.CompareWithRefs/Type=GRUSequence.*2.5.10.*2.1.4.*2.1.4.*)");
494488
}
495489
if (!ov::with_cpu_x86_avx2()) {
496490
// MatMul in Snippets uses BRGEMM that is supported only on AVX2 (and newer) platforms

0 commit comments

Comments
 (0)