feat: CPU features

vdsm · Dec 16, 2023 · f93f870 · f93f870
1 parent a2e55c5
commit f93f870
Showing 1 changed file with 12 additions and 16 deletions.
diff --git a/src/cpu.sh b/src/cpu.sh
@@ -2,15 +2,15 @@
 set -Eeuo pipefail
 
 # Docker environment variables
- 
+
 : ${HOST_CPU:=''}
 : ${CPU_MODEL:='host'}
-: ${QEMU_CPU:='qemu64,+ssse3,+sse4,+sse4.1,+sse4.2'}
+: ${CPU_FEATURES:='+ssse3,+sse4.1,+sse4.2'}
 
 KVM_ERR=""
 KVM_OPTS=""
 
-if [ "$ARCH" == "amd64" ] && [[ "$KVM" != [Nn]* ]]; then
+if [[ "$ARCH" == "amd64" && "$KVM" != [Nn]* ]]; then
 
   if [ -e /dev/kvm ] && sh -c 'echo -n > /dev/kvm' &> /dev/null; then
     if ! grep -q -e vmx -e svm /proc/cpuinfo; then
@@ -24,40 +24,36 @@ if [ "$ARCH" == "amd64" ] && [[ "$KVM" != [Nn]* ]]; then
     error "KVM acceleration not detected $KVM_ERR, this will cause a major loss of performance."
     error "See the FAQ on how to enable it, or skip this error by setting KVM=N (not recommended)."
     [[ "$DEBUG" != [Yy1]* ]] && exit 88
-    [ "$CPU_MODEL" == "host"* ] && CPU_MODEL="$QEMU_CPU"
+    [[ "$CPU_MODEL" == "host"* ]] && CPU_MODEL="max,$CPU_FEATURES"
   else
     KVM_OPTS=",accel=kvm -enable-kvm"
   fi
 
-  if [ "$CPU_MODEL" == "host" ]; then
+  if [[ "$CPU_MODEL" != *"$CPU_FEATURES"* ]]; then
     if ! grep -qE '^flags.* (sse4_2)' /proc/cpuinfo; then
-      info "Your CPU does not have the SSE4.2 instruction set, it will be emulated.."
-      CPU_MODEL="host,+ssse3,+sse4,+sse4.1,+sse4.2"
+      info "Your CPU does not have the SSE4.2 instruction set that DSM needs, it will be emulated.."
+      CPU_MODEL="host,$CPU_FEATURES"
     fi
   fi
 
 else
 
-  [ "$CPU_MODEL" == "host"* ] && CPU_MODEL="$QEMU_CPU"
+  [[ "$CPU_MODEL" == "host"* ]] && CPU_MODEL="max,$CPU_FEATURES"
 
 fi
 
-if [ -z "$HOST_CPU" ] && [ "$CPU_MODEL" == "host"* ]; then
+if [ -z "$HOST_CPU" ]; then
   HOST_CPU=$(lscpu | grep 'Model name' | cut -f 2 -d ":" | awk '{$1=$1}1' | sed 's# @.*##g' | sed s/"(R)"//g | sed 's/[^[:alnum:] ]\+/ /g' | sed 's/  */ /g')
 fi
 
 if [ -n "$HOST_CPU" ]; then
   HOST_CPU="${HOST_CPU%%,*},,"
 else
-  if [ "$CPU_MODEL" == "host"* ] || [ "$CPU_MODEL" == "qemu"* ]; then
-    HOST_CPU="QEMU"
-  else
-    HOST_CPU="${CPU_MODEL%%,*}"
-  fi
+  HOST_CPU="QEMU, Virtual CPU,"
   if [ "$ARCH" == "amd64" ]; then
-    HOST_CPU="${HOST_CPU%%,*}, Virtual CPU, X86_64"
+    HOST_CPU="$HOST_CPU X86_64"
   else
-    HOST_CPU="${HOST_CPU%%,*}, Virtual CPU, $ARCH"
+    HOST_CPU="$HOST_CPU $ARCH"
   fi
 fi