Skip to content

Commit d52fe00

Browse files
dsharletgxnnpack-bot
authored andcommitted
Re-enable tile_k = 1 x86 kernel for msan
This was erroneously disabled, it doesn't use _mm256_hadd_ps, and it causes us to not have any kernel for consistent arithmetic with msan. Also, clean up logging in the case we don't have a kernel. PiperOrigin-RevId: 838818343
1 parent ba0a32d commit d52fe00

File tree

2 files changed

+8
-5
lines changed

2 files changed

+8
-5
lines changed

ynnpack/kernels/dot/dot.cc

Lines changed: 8 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -318,9 +318,14 @@ dot_kernel get_dot_kernel(const dot_shape& shape,
318318
#include "ynnpack/kernels/dot/kernels.inc"
319319
#undef YNN_DOT_KERNEL
320320
if (!packed_shape) {
321-
YNN_LOG_INFO() << "Using dot kernel " << optimizer.kernel_used
322-
<< " for dot " << shape.m << "x" << shape.n << "x"
323-
<< shape.k1;
321+
if (optimizer.result.kernel) {
322+
YNN_LOG_INFO() << "Using dot kernel " << optimizer.kernel_used
323+
<< " for dot " << shape.m << "x" << shape.n << "x"
324+
<< shape.k1;
325+
} else {
326+
YNN_LOG_WARNING() << "No dot kernel found for dot " << shape.m << "x"
327+
<< shape.n << "x" << shape.k1;
328+
}
324329
}
325330
return optimizer.result;
326331
}

ynnpack/kernels/dot/kernels.inc

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -37,9 +37,7 @@ YNN_DOT_KERNEL(arch_flag::amxint8, dot_uint8_int8_int32_16x64x64_16x16x4_amxint8
3737
#endif // MEMORY_SANITIZER
3838
#endif // YNN_ARCH_X86_AVX2
3939
#ifdef YNN_ARCH_X86_FMA3
40-
#ifndef MEMORY_SANITIZER // TODO(b/458235638)
4140
#include "ynnpack/kernels/dot/x86_fma3_fp32.inc"
42-
#endif // MEMORY_SANITIZER
4341
#endif // YNN_ARCH_X86_FMA3
4442
#ifdef YNN_ARCH_X86_AVX2_FMA3
4543
#include "ynnpack/kernels/dot/x86_avx2_fma3_bf16_bf16_fp32.inc"

0 commit comments

Comments
 (0)