From 7f8e1c53752210261627a29e8877579df06bdece Mon Sep 17 00:00:00 2001 From: Naveen Saini Date: Thu, 29 Dec 2022 09:42:18 +0800 Subject: tune-skylake.inc: remove qemu-usermode check QEMU 7.2.0 has now support for avx2 with followign change: x86: TCG support for AVX, AVX2, F16C, FMA3 and VAES instructions Ref https://git.yoctoproject.org/poky/commit/?id=9caff14abbb742e5083056b899ee6fc0a5fba8f3 Signed-off-by: Naveen Saini Signed-off-by: Anuj Mittal --- conf/machine/include/tune-skylake.inc | 26 +------------------------- 1 file changed, 1 insertion(+), 25 deletions(-) (limited to 'conf/machine/include/tune-skylake.inc') diff --git a/conf/machine/include/tune-skylake.inc b/conf/machine/include/tune-skylake.inc index 05b7283c..b6e5527f 100644 --- a/conf/machine/include/tune-skylake.inc +++ b/conf/machine/include/tune-skylake.inc @@ -12,7 +12,7 @@ require conf/machine/include/x86/tune-corei7.inc # Extra tune features TUNEVALID[skylake] = "Enable skylake specific processor optimizations" -TUNE_CCARGS .= "${@bb.utils.contains('TUNE_FEATURES', 'skylake', ' -march=skylake ${SKYLAKE_TUNE} -mfpmath=sse', '', d)}" +TUNE_CCARGS .= "${@bb.utils.contains('TUNE_FEATURES', 'skylake', ' -march=skylake -mtune=generic -mavx2 -mfpmath=sse', '', d)}" # Extra tune selections @@ -22,27 +22,3 @@ BASE_LIB:tune-skylake-64 = "lib64" 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 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 \ -" -- cgit v1.2.3-54-g00ecf