Merge pull request #643 from Junnplus/cpu-type

add cpuType for specify cpu

Author: AkihiroSuda

pkg/limayaml/default.yaml

@@ -27,6 +27,12 @@ images:
 - location: "https://cloud-images.ubuntu.com/impish/current/impish-server-cloudimg-arm64.img"
   arch: "aarch64"
 
+# Specify QEMU CPU emulation, e.g., "host", "qemu64", "Haswell".
+# You can see what options are available for host emulation with: `qemu-system-$(arch) -cpu help`.
+# Setting of instructions is supported like this: "qemu64,+ssse3".
+# Default: "host" (native arch), "qemu64" (Intel on ARM), or "cortex-a72" (ARM on Intel)
+cpuType: null
+
 # CPUs: if you see performance issues, try limiting cpus to 1.
 # Default: 4
 cpus: null

pkg/limayaml/defaults.go

@@ -81,6 +81,25 @@ func FillDefault(y, d, o *LimaYAML, filePath string) {
 		}
 	}
 
+	if y.CPUType == nil {
+		y.CPUType = d.CPUType
+	}
+	if o.CPUType != nil {
+		y.CPUType = o.CPUType
+	}
+	if y.CPUType == nil || *y.CPUType == "" {
+		if IsNativeArch(*y.Arch) {
+			y.CPUType = pointer.String("host")
+		} else if *y.Arch == X8664 {
+			// Intel on ARM
+			// Since https://github.com/lima-vm/lima/pull/494, we use qemu64 cpu for better emulation of x86_64.
+			y.CPUType = pointer.String("qemu64")
+		} else {
+			// ARM on Intel
+			y.CPUType = pointer.String("cortex-a72")
+		}
+	}
+
 	if y.CPUs == nil {
 		y.CPUs = d.CPUs
 	}
@@ -461,3 +480,9 @@ func ResolveArch(s *string) Arch {
 	}
 	return *s
 }
+
+func IsNativeArch(arch Arch) bool {
+	nativeX8664 := arch == X8664 && runtime.GOARCH == "amd64"
+	nativeAARCH64 := arch == AARCH64 && runtime.GOARCH == "arm64"
+	return nativeX8664 || nativeAARCH64
+}

pkg/limayaml/defaults_test.go

@@ -47,10 +47,11 @@ func TestFillDefault(t *testing.T) {
 
 	// Builtin default values
 	builtin := LimaYAML{
-		Arch:   pointer.String(arch),
-		CPUs:   pointer.Int(4),
-		Memory: pointer.String("4GiB"),
-		Disk:   pointer.String("100GiB"),
+		Arch:    pointer.String(arch),
+		CPUType: pointer.String("host"),
+		CPUs:    pointer.Int(4),
+		Memory:  pointer.String("4GiB"),
+		Disk:    pointer.String("100GiB"),
 		Containerd: Containerd{
 			System:   pointer.Bool(false),
 			User:     pointer.Bool(true),
@@ -168,10 +169,11 @@ func TestFillDefault(t *testing.T) {
 
 	// Choose values that are different from the "builtin" defaults
 	d = LimaYAML{
-		Arch:   pointer.String("unknown"),
-		CPUs:   pointer.Int(7),
-		Memory: pointer.String("5GiB"),
-		Disk:   pointer.String("105GiB"),
+		Arch:    pointer.String("unknown"),
+		CPUType: pointer.String("host"),
+		CPUs:    pointer.Int(7),
+		Memory:  pointer.String("5GiB"),
+		Disk:    pointer.String("105GiB"),
 		Containerd: Containerd{
 			System: pointer.Bool(true),
 			User:   pointer.Bool(false),
@@ -280,10 +282,11 @@ func TestFillDefault(t *testing.T) {
 	// User-provided overrides should override user-provided config settings
 
 	o = LimaYAML{
-		Arch:   pointer.String(arch),
-		CPUs:   pointer.Int(12),
-		Memory: pointer.String("7GiB"),
-		Disk:   pointer.String("117GiB"),
+		Arch:    pointer.String(arch),
+		CPUType: pointer.String("host"),
+		CPUs:    pointer.Int(12),
+		Memory:  pointer.String("7GiB"),
+		Disk:    pointer.String("117GiB"),
 		Containerd: Containerd{
 			System: pointer.Bool(true),
 			User:   pointer.Bool(false),

pkg/limayaml/limayaml.go

@@ -9,6 +9,7 @@ import (
 type LimaYAML struct {
 	Arch              *Arch             `yaml:"arch,omitempty" json:"arch,omitempty"`
 	Images            []File            `yaml:"images" json:"images"` // REQUIRED
+	CPUType           *string           `yaml:"cpuType,omitempty" json:"cpuType,omitempty"`
 	CPUs              *int              `yaml:"cpus,omitempty" json:"cpus,omitempty"`
 	Memory            *string           `yaml:"memory,omitempty" json:"memory,omitempty"` // go-units.RAMInBytes
 	Disk              *string           `yaml:"disk,omitempty" json:"disk,omitempty"`     // go-units.RAMInBytes

pkg/limayaml/validate.go

@@ -50,6 +50,10 @@ func Validate(y LimaYAML, warn bool) error {
 		}
 	}
 
+	if *y.CPUType == "" {
+		return fmt.Errorf("field `cpuType` must be set")
+	}
+
 	if *y.CPUs == 0 {
 		return errors.New("field `cpus` must be set")
 	}

pkg/qemu/qemu.go

@@ -206,16 +206,12 @@ func Cmdline(cfg Config) (string, []string, error) {
 		}
 		return "", nil, errors.New(errStr)
 	}
+
+	cpu := *y.CPUType
+	args = appendArgsIfNoConflict(args, "-cpu", cpu)
 	switch *y.Arch {
 	case limayaml.X8664:
-		cpu := "qemu64"
-		if isNativeArch(*y.Arch) {
-			cpu = "host"
-		}
-		args = appendArgsIfNoConflict(args, "-cpu", cpu)
-		if isNativeArch(*y.Arch) {
-			args = appendArgsIfNoConflict(args, "-machine", "q35,accel="+accel)
-		} else {
+		if strings.HasPrefix(cpu, "qemu64") {
 			// use q35 machine with vmware io port disabled.
 			args = appendArgsIfNoConflict(args, "-machine", "q35,vmport=off")
 			// use tcg accelerator with multi threading with 512MB translation block size
@@ -225,13 +221,10 @@ func Cmdline(cfg Config) (string, []string, error) {
 			args = appendArgsIfNoConflict(args, "-accel", "tcg,thread=multi,tb-size=512")
 			// This will disable CPU S3 state.
 			args = append(args, "-global", "ICH9-LPC.disable_s3=1")
+		} else {
+			args = appendArgsIfNoConflict(args, "-machine", "q35,accel="+accel)
 		}
 	case limayaml.AARCH64:
-		cpu := "cortex-a72"
-		if isNativeArch(*y.Arch) {
-			cpu = "host"
-		}
-		args = appendArgsIfNoConflict(args, "-cpu", cpu)
 		args = appendArgsIfNoConflict(args, "-machine", "virt,accel="+accel+",highmem=off")
 	}
 
@@ -396,14 +389,8 @@ func getExe(arch limayaml.Arch) (string, []string, error) {
 	return exe, args, nil
 }
 
-func isNativeArch(arch limayaml.Arch) bool {
-	nativeX8664 := arch == limayaml.X8664 && runtime.GOARCH == "amd64"
-	nativeAARCH64 := arch == limayaml.AARCH64 && runtime.GOARCH == "arm64"
-	return nativeX8664 || nativeAARCH64
-}
-
 func getAccel(arch limayaml.Arch) string {
-	if isNativeArch(arch) {
+	if limayaml.IsNativeArch(arch) {
 		switch runtime.GOOS {
 		case "darwin":
 			return "hvf"

pkg/store/instance.go

@@ -33,6 +33,7 @@ type Instance struct {
 	Status       Status             `json:"status"`
 	Dir          string             `json:"dir"`
 	Arch         limayaml.Arch      `json:"arch"`
+	CPUType      string             `json:"cpuType"`
 	CPUs         int                `json:"cpus,omitempty"`
 	Memory       int64              `json:"memory,omitempty"` // bytes
 	Disk         int64              `json:"disk,omitempty"`   // bytes
@@ -75,6 +76,7 @@ func Inspect(instName string) (*Instance, error) {
 	}
 	inst.Dir = instDir
 	inst.Arch = *y.Arch
+	inst.CPUType = *y.CPUType
 	inst.CPUs = *y.CPUs
 	memory, err := units.RAMInBytes(*y.Memory)
 	if err == nil {