diff --git a/cmake/kernel.cmake b/cmake/kernel.cmake
index 26f94bc0b5..3b9e3849d9 100644
--- a/cmake/kernel.cmake
+++ b/cmake/kernel.cmake
@@ -230,10 +230,12 @@ macro(SetDefaultL2)
 if (BUILD_BFLOAT16)
   SetFallback(BGEMVNKERNEL ../generic/gemv_n.c)
   SetFallback(BGEMVTKERNEL ../generic/gemv_t.c)
-  SetFallback(SHGEMVNKERNEL ../generic/gemv_n.c)
-  SetFallback(SHGEMVTKERNEL ../generic/gemv_t.c)
   SetFallback(SBGEMVNKERNEL ../x86_64/sbgemv_n.c)
   SetFallback(SBGEMVTKERNEL ../x86_64/sbgemv_t.c)
+endif ()
+if (BUILD_HFLOAT16)
+  SetFallback(SHGEMVNKERNEL ../generic/gemv_n.c)
+  SetFallback(SHGEMVTKERNEL ../generic/gemv_t.c)
   SetFallback(SHGERKERNEL ../generic/ger.c)
 endif ()
 endmacro ()
diff --git a/driver/level2/CMakeLists.txt b/driver/level2/CMakeLists.txt
index c52b461a7e..a0360f7e1a 100644
--- a/driver/level2/CMakeLists.txt
+++ b/driver/level2/CMakeLists.txt
@@ -202,6 +202,15 @@ if (BUILD_BFLOAT16)
   if (USE_THREAD)
     GenerateNamedObjects("sbgemv_thread.c" "" "gemv_thread_n" false "" "" false "BFLOAT16")
     GenerateNamedObjects("sbgemv_thread.c" "TRANSA" "gemv_thread_t" false "" "" false "BFLOAT16")
+    GenerateNamedObjects("sbgemv_thread.c" "BGEMM;BFLOAT16" "bgemv_thread_n" false "" "" true "")
+    GenerateNamedObjects("sbgemv_thread.c" "BGEMM;BFLOAT16;TRANSA" "bgemv_thread_t" false "" "" true "")
+  endif ()
+endif ()
+
+if (BUILD_HFLOAT16)
+  if (USE_THREAD)
+    GenerateNamedObjects("sbgemv_thread.c" "" "gemv_thread_n" false "" "" false "HFLOAT16")
+    GenerateNamedObjects("sbgemv_thread.c" "TRANSA" "gemv_thread_t" false "" "" false "HFLOAT16")
   endif ()
 endif ()
 
diff --git a/driver/level3/CMakeLists.txt b/driver/level3/CMakeLists.txt
index be2ba23c24..468628af2e 100644
--- a/driver/level3/CMakeLists.txt
+++ b/driver/level3/CMakeLists.txt
@@ -17,6 +17,7 @@ foreach (GEMM_DEFINE ${GEMM_DEFINES})
     GenerateNamedObjects("gemm.c" "${GEMM_DEFINE};BGEMM" "gemm_${GEMM_DEFINE_LC}" 0 "" "" false "BFLOAT16")
     if (USE_THREAD AND NOT USE_SIMPLE_THREADED_LEVEL3)
       GenerateNamedObjects("gemm.c" "${GEMM_DEFINE};THREADED_LEVEL3" "gemm_thread_${GEMM_DEFINE_LC}" 0 "" "" false "BFLOAT16")
+      GenerateNamedObjects("gemm.c" "${GEMM_DEFINE};THREADED_LEVEL3;BGEMM" "gemm_thread_${GEMM_DEFINE_LC}" 0 "" "" false "BFLOAT16")
     endif ()
   endif ()
   if (BUILD_HFLOAT16)