@@ -289,16 +289,20 @@ if (GGML_CPU_ALL_VARIANTS)
289289 if (NOT GGML_BACKEND_DL)
290290 message (FATAL_ERROR "GGML_CPU_ALL_VARIANTS requires GGML_BACKEND_DL" )
291291 endif ()
292- ggml_add_cpu_backend_variant(x64)
293- ggml_add_cpu_backend_variant(sse42 SSE42)
294- ggml_add_cpu_backend_variant(sandybridge SSE42 AVX)
295- ggml_add_cpu_backend_variant(haswell SSE42 AVX F16C AVX2 BMI2 FMA)
296- ggml_add_cpu_backend_variant(skylakex SSE42 AVX F16C AVX2 BMI2 FMA AVX512)
297- ggml_add_cpu_backend_variant(icelake SSE42 AVX F16C AVX2 BMI2 FMA AVX512 AVX512_VBMI AVX512_VNNI)
298- ggml_add_cpu_backend_variant(alderlake SSE42 AVX F16C AVX2 BMI2 FMA AVX_VNNI)
299- if (NOT MSVC )
300- # MSVC doesn't support AMX
301- ggml_add_cpu_backend_variant(sapphirerapids SSE42 AVX F16C AVX2 BMI2 FMA AVX512 AVX512_VBMI AVX512_VNNI AVX512_BF16 AMX_TILE AMX_INT8)
292+ if (GGML_SYSTEM_ARCH STREQUAL "x86" )
293+ ggml_add_cpu_backend_variant(x64)
294+ ggml_add_cpu_backend_variant(sse42 SSE42)
295+ ggml_add_cpu_backend_variant(sandybridge SSE42 AVX)
296+ ggml_add_cpu_backend_variant(haswell SSE42 AVX F16C AVX2 BMI2 FMA)
297+ ggml_add_cpu_backend_variant(skylakex SSE42 AVX F16C AVX2 BMI2 FMA AVX512)
298+ ggml_add_cpu_backend_variant(icelake SSE42 AVX F16C AVX2 BMI2 FMA AVX512 AVX512_VBMI AVX512_VNNI)
299+ ggml_add_cpu_backend_variant(alderlake SSE42 AVX F16C AVX2 BMI2 FMA AVX_VNNI)
300+ if (NOT MSVC )
301+ # MSVC doesn't support AMX
302+ ggml_add_cpu_backend_variant(sapphirerapids SSE42 AVX F16C AVX2 BMI2 FMA AVX512 AVX512_VBMI AVX512_VNNI AVX512_BF16 AMX_TILE AMX_INT8)
303+ endif ()
304+ else ()
305+ message (FATAL_ERROR "GGML_CPU_ALL_VARIANTS not yet supported on ${GGML_SYSTEM_ARCH} " )
302306 endif ()
303307elseif (GGML_CPU)
304308 ggml_add_cpu_backend_variant_impl("" )
0 commit comments