1 files changed, 23 insertions, 3 deletions

diff --git a/conf/machine/include/tune-skylake.inc b/conf/machine/include/tune-skylake.inc
index 78645def..4882600b 100644
--- a/conf/machine/include/tune-skylake.inc
+++ b/conf/machine/include/tune-skylake.inc
@@ -8,11 +8,11 @@
 DEFAULTTUNE ?= "skylake-64"
 
 # Include the previous tune to pull in PACKAGE_EXTRA_ARCHS
-require conf/machine/include/tune-core2.inc
+require conf/machine/include/tune-corei7.inc
 
 # Extra tune features
 TUNEVALID[skylake] = "Enable skylake specific processor optimizations"
-TUNE_CCARGS .= "${@bb.utils.contains('TUNE_FEATURES', 'skylake', ' -march=skylake -mtune=generic -mfpmath=sse -mavx2', '', d)}"
+TUNE_CCARGS .= "${@bb.utils.contains('TUNE_FEATURES', 'skylake', ' -march=skylake ${SKYLAKE_TUNE} -mfpmath=sse', '', d)}"
 
 # Extra tune selections
 
@@ -23,6 +23,26 @@ TUNE_PKGARCH_tune-skylake-64 = "skylake-64"
 PACKAGE_EXTRA_ARCHS_tune-skylake-64 = "${PACKAGE_EXTRA_ARCHS_tune-core2-64} skylake-64"
 QEMU_EXTRAOPTIONS_skylake-64 = " -cpu Skylake-Client"
 
-# Disable QEMU user
+
+# Disable QEMU usermode by default (get avx2)
 MACHINE_FEATURES_remove = "qemu-usermode"
 
+# If qemu-usermode is enabled, we have to disable avx2 ISA extensions, but we can keep mtune as skylake vs generic
+SKYLAKE_TUNE .= "${@bb.utils.contains('MACHINE_FEATURES', 'qemu-usermode', ' -mtune=skylake ${QEMU_UNAVAILABLE_ISA}', '-mtune=generic -mavx2', d)}"
+
+QEMU_UNAVAILABLE_ISA = " \
+-mno-avx \
+-mno-avx2 \
+-mno-avx512f \
+-mno-avx512er \
+-mno-avx512cd \
+-mno-avx512pf \
+-mno-avx512dq \
+-mno-avx512bw \
+-mno-avx512vl \
+-mno-avx512ifma \
+-mno-avx512vbmi \
+-mno-avx512vbmi2 \
+-mno-avx512vnni \
+-mno-avx512bitalg \
+"