From nobody Tue May 7 22:54:58 2024 Delivered-To: importer2@patchew.org Authentication-Results: mx.zohomail.com; dkim=fail; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer2=patchew.org@nongnu.org; dmarc=fail(p=none dis=none) header.from=redhat.com ARC-Seal: i=1; a=rsa-sha256; t=1622040291; cv=none; d=zohomail.com; s=zohoarc; b=DVuoUkVdGHwnw1YnvErkWT6ybI5cBOwTCEtSke7Qw9icWjWz7/dOYFFMiUxBqXYb7PC5rRfdTpo51sIchHLojREfZlck1cEvsmSVfDRUrfw/rBPanztU7eEjEkV2zRt6eCPSIOPIGDwhemO9R7wWlBmSX1M21dwCaN8UGgWETBI= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1622040291; h=Content-Type:Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:To; bh=m/UXV+faOWq2I0Hna/niiE/7W+a67yHBEdZ7BzU4daM=; b=eIbpCuRwvF8TGLnIrq+fJLkCTOyRtJ1R8bGIQEgFkL+5Ref4sitzyTgv7/pDur6t7Vz295rXZOQZjqcoCay6lvpvWzqmzLEFISgTNgAmViN8LZKVqIbhSv+NX3Wd9Jhj3uAWQ271v1ep/R53ix0rxuWQPh5Itov5gr+2oEKwh/g= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=fail; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer2=patchew.org@nongnu.org; dmarc=fail header.from= (p=none dis=none) header.from= Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1622040291150667.9702163590541; Wed, 26 May 2021 07:44:51 -0700 (PDT) Received: from localhost ([::1]:55898 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1llum9-0004PB-EB for importer2@patchew.org; Wed, 26 May 2021 10:44:49 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:43856) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1lluiQ-0005Gj-IU for qemu-devel@nongnu.org; Wed, 26 May 2021 10:40:58 -0400 Received: from us-smtp-delivery-124.mimecast.com ([216.205.24.124]:25800) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1lluiK-0007qp-V7 for qemu-devel@nongnu.org; Wed, 26 May 2021 10:40:56 -0400 Received: from mimecast-mx01.redhat.com (mimecast-mx01.redhat.com [209.132.183.4]) (Using TLS) by relay.mimecast.com with ESMTP id us-mta-561-CcdjnJjqOFq57e0YX7OscA-1; Wed, 26 May 2021 10:40:50 -0400 Received: from smtp.corp.redhat.com (int-mx04.intmail.prod.int.phx2.redhat.com [10.5.11.14]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id 780608186E5; Wed, 26 May 2021 14:40:49 +0000 (UTC) Received: from localhost.localdomain.com (ovpn-115-19.ams2.redhat.com [10.36.115.19]) by smtp.corp.redhat.com (Postfix) with ESMTP id 79DEC5D9C6; Wed, 26 May 2021 14:40:46 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1622040052; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=m/UXV+faOWq2I0Hna/niiE/7W+a67yHBEdZ7BzU4daM=; b=E6Dv2CnudqhsGwvaJGfmltdrDx1F1Uq2Y5v8QrtT5PehemD6XcC6Fipbh7mNy6/74U98AA KIfU7kYf7yCGX0AAN9R4x0xJJYU8nDXsAY1Ew1952tJjUvrVc4EIrdZLrAATXQQB3w/7Se 8SpS67kMUSdscDJYN4UzKeWU+35MbVA= X-MC-Unique: CcdjnJjqOFq57e0YX7OscA-1 From: =?UTF-8?q?Daniel=20P=2E=20Berrang=C3=A9?= To: qemu-devel@nongnu.org Subject: [PATCH v2 1/4] docs: add a table showing x86-64 ABI compatibility levels Date: Wed, 26 May 2021 15:40:35 +0100 Message-Id: <20210526144038.278899-2-berrange@redhat.com> In-Reply-To: <20210526144038.278899-1-berrange@redhat.com> References: <20210526144038.278899-1-berrange@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.79 on 10.5.11.14 Authentication-Results: relay.mimecast.com; auth=pass smtp.auth=CUSA124A263 smtp.mailfrom=berrange@redhat.com X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable Received-SPF: pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer2=patchew.org@nongnu.org; helo=lists.gnu.org; Received-SPF: pass client-ip=216.205.24.124; envelope-from=berrange@redhat.com; helo=us-smtp-delivery-124.mimecast.com X-Spam_score_int: -31 X-Spam_score: -3.2 X-Spam_bar: --- X-Spam_report: (-3.2 / 5.0 requ) BAYES_00=-1.9, DKIMWL_WL_HIGH=-0.371, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_LOW=-0.7, RCVD_IN_MSPIKE_H4=0.001, RCVD_IN_MSPIKE_WL=0.001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=ham autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: =?UTF-8?q?Daniel=20P=2E=20Berrang=C3=A9?= , Eduardo Habkost , "Michael S. Tsirkin" , Richard Henderson , Cleber Rosa , Paolo Bonzini Errors-To: qemu-devel-bounces+importer2=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: fail (Header signature does not verify) It is useful to know which CPUs satisfy each x86-64 ABI compatibility level, when dealing with guest OS that require something newer than the baseline ABI. These ABI levels are defined in: https://gitlab.com/x86-psABIs/x86-64-ABI/ and supported by GCC, Clang, glibc and more. Signed-off-by: Daniel P. Berrang=C3=A9 --- MAINTAINERS | 2 +- docs/system/cpu-models-x86-abi.csv | 67 ++++++++++++++++++++++++++++++ docs/system/cpu-models-x86.rst.inc | 22 ++++++++++ 3 files changed, 90 insertions(+), 1 deletion(-) create mode 100644 docs/system/cpu-models-x86-abi.csv diff --git a/MAINTAINERS b/MAINTAINERS index 75e0f2d750..ed9c361ec1 100644 --- a/MAINTAINERS +++ b/MAINTAINERS @@ -329,7 +329,7 @@ F: tests/tcg/i386/ F: tests/tcg/x86_64/ F: hw/i386/ F: disas/i386.c -F: docs/system/cpu-models-x86.rst.inc +F: docs/system/cpu-models-x86* T: git https://gitlab.com/ehabkost/qemu.git x86-next =20 Xtensa TCG CPUs diff --git a/docs/system/cpu-models-x86-abi.csv b/docs/system/cpu-models-x8= 6-abi.csv new file mode 100644 index 0000000000..f3f3b60be1 --- /dev/null +++ b/docs/system/cpu-models-x86-abi.csv @@ -0,0 +1,67 @@ +Model,baseline,v2,v3,v4 +486-v1,,,, +Broadwell-v1,=E2=9C=85,=E2=9C=85,=E2=9C=85, +Broadwell-v2,=E2=9C=85,=E2=9C=85,=E2=9C=85, +Broadwell-v3,=E2=9C=85,=E2=9C=85,=E2=9C=85, +Broadwell-v4,=E2=9C=85,=E2=9C=85,=E2=9C=85, +Cascadelake-Server-v1,=E2=9C=85,=E2=9C=85,=E2=9C=85,=E2=9C=85 +Cascadelake-Server-v2,=E2=9C=85,=E2=9C=85,=E2=9C=85,=E2=9C=85 +Cascadelake-Server-v3,=E2=9C=85,=E2=9C=85,=E2=9C=85,=E2=9C=85 +Cascadelake-Server-v4,=E2=9C=85,=E2=9C=85,=E2=9C=85,=E2=9C=85 +Conroe-v1,=E2=9C=85,,, +Cooperlake-v1,=E2=9C=85,=E2=9C=85,=E2=9C=85,=E2=9C=85 +Denverton-v1,=E2=9C=85,=E2=9C=85,, +Denverton-v2,=E2=9C=85,=E2=9C=85,, +Dhyana-v1,=E2=9C=85,=E2=9C=85,=E2=9C=85, +EPYC-Milan-v1,=E2=9C=85,=E2=9C=85,=E2=9C=85, +EPYC-Rome-v1,=E2=9C=85,=E2=9C=85,=E2=9C=85, +EPYC-Rome-v2,=E2=9C=85,=E2=9C=85,=E2=9C=85, +EPYC-v1,=E2=9C=85,=E2=9C=85,=E2=9C=85, +EPYC-v2,=E2=9C=85,=E2=9C=85,=E2=9C=85, +EPYC-v3,=E2=9C=85,=E2=9C=85,=E2=9C=85, +Haswell-v1,=E2=9C=85,=E2=9C=85,=E2=9C=85, +Haswell-v2,=E2=9C=85,=E2=9C=85,=E2=9C=85, +Haswell-v3,=E2=9C=85,=E2=9C=85,=E2=9C=85, +Haswell-v4,=E2=9C=85,=E2=9C=85,=E2=9C=85, +Icelake-Client-v1,=E2=9C=85,=E2=9C=85,=E2=9C=85, +Icelake-Client-v2,=E2=9C=85,=E2=9C=85,=E2=9C=85, +Icelake-Server-v1,=E2=9C=85,=E2=9C=85,=E2=9C=85,=E2=9C=85 +Icelake-Server-v2,=E2=9C=85,=E2=9C=85,=E2=9C=85,=E2=9C=85 +Icelake-Server-v3,=E2=9C=85,=E2=9C=85,=E2=9C=85,=E2=9C=85 +Icelake-Server-v4,=E2=9C=85,=E2=9C=85,=E2=9C=85,=E2=9C=85 +IvyBridge-v1,=E2=9C=85,=E2=9C=85,, +IvyBridge-v2,=E2=9C=85,=E2=9C=85,, +KnightsMill-v1,=E2=9C=85,=E2=9C=85,=E2=9C=85, +Nehalem-v1,=E2=9C=85,=E2=9C=85,, +Nehalem-v2,=E2=9C=85,=E2=9C=85,, +Opteron_G1-v1,=E2=9C=85,,, +Opteron_G2-v1,=E2=9C=85,,, +Opteron_G3-v1,=E2=9C=85,,, +Opteron_G4-v1,=E2=9C=85,=E2=9C=85,, +Opteron_G5-v1,=E2=9C=85,=E2=9C=85,, +Penryn-v1,=E2=9C=85,,, +SandyBridge-v1,=E2=9C=85,=E2=9C=85,, +SandyBridge-v2,=E2=9C=85,=E2=9C=85,, +Skylake-Client-v1,=E2=9C=85,=E2=9C=85,=E2=9C=85, +Skylake-Client-v2,=E2=9C=85,=E2=9C=85,=E2=9C=85, +Skylake-Client-v3,=E2=9C=85,=E2=9C=85,=E2=9C=85, +Skylake-Server-v1,=E2=9C=85,=E2=9C=85,=E2=9C=85,=E2=9C=85 +Skylake-Server-v2,=E2=9C=85,=E2=9C=85,=E2=9C=85,=E2=9C=85 +Skylake-Server-v3,=E2=9C=85,=E2=9C=85,=E2=9C=85,=E2=9C=85 +Skylake-Server-v4,=E2=9C=85,=E2=9C=85,=E2=9C=85,=E2=9C=85 +Snowridge-v1,=E2=9C=85,=E2=9C=85,, +Snowridge-v2,=E2=9C=85,=E2=9C=85,, +Westmere-v1,=E2=9C=85,=E2=9C=85,, +Westmere-v2,=E2=9C=85,=E2=9C=85,, +athlon-v1,,,, +core2duo-v1,=E2=9C=85,,, +coreduo-v1,,,, +kvm32-v1,,,, +kvm64-v1,=E2=9C=85,,, +n270-v1,,,, +pentium-v1,,,, +pentium2-v1,,,, +pentium3-v1,,,, +phenom-v1,=E2=9C=85,,, +qemu32-v1,,,, +qemu64-v1,=E2=9C=85,,, diff --git a/docs/system/cpu-models-x86.rst.inc b/docs/system/cpu-models-x8= 6.rst.inc index 867c8216b5..f40ee03ecc 100644 --- a/docs/system/cpu-models-x86.rst.inc +++ b/docs/system/cpu-models-x86.rst.inc @@ -39,6 +39,28 @@ CPU, as they would with "Host passthrough", but gives mu= ch of the benefit of passthrough, while making live migration safe. =20 =20 +ABI compatibility levels for CPU models +^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ + +The x86_64 architecture has a number of `ABI compatibility levels`_ +defined. Traditionally most operating systems and toolchains would +only target the original baseline ABI. It is expected that in +future OS and toolchains are likely to target newer ABIs. The +table that follows illustrates which ABI compatibility levels +can be satisfied by the QEMU CPU models. Note that the table only +lists the long term stable CPU model versions (eg Haswell-v4). +In addition to whats listed, there are also many CPU model +aliases which resolve to a different CPU model version, +depending on the machine type is in use. + +.. _ABI compatibility levels: https://gitlab.com/x86-psABIs/x86-64-ABI/ + +.. csv-table:: x86-64 ABI compatibility levels + :file: cpu-models-x86-abi.csv + :widths: 40,15,15,15,15 + :header-rows: 2 + + Preferred CPU models for Intel x86 hosts ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ =20 --=20 2.31.1 From nobody Tue May 7 22:54:58 2024 Delivered-To: importer2@patchew.org Authentication-Results: mx.zohomail.com; dkim=fail; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer2=patchew.org@nongnu.org; dmarc=fail(p=none dis=none) header.from=redhat.com ARC-Seal: i=1; a=rsa-sha256; t=1622040290; cv=none; d=zohomail.com; s=zohoarc; b=cVP3w/OCQViCSPZqxfN/LM99nxcRuQw88Pmm1dHCtMEPm5gB97U+luzXYep5XlSjcNnZ/N2uABCC/7pI+CK+IOb2WIUxZK/tDP3zczsKN+vUb9KsM7Jhw7y5Txhhy1klyWg378uU2xdQaXnzaQ9LVw7fH0KrA3SxTg+CMiNW12A= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1622040290; h=Content-Type:Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:To; bh=koawmmpzVH85z7deJTRI0jHlOJdZMBJO/cAcReqVFJo=; b=cCdd8ali1iiwkKXW1z/0YUtuyqnGKebMhDbK8KVng/5QbgPCSy63HK5gCsMPb4GoaHOAoVBRyIljwiI31wMgwq7pKpAzSaE5KED4x5VcCZ7tTmZb/2/StVnPV9tu1+0/lMES4Dpg5vxByQMnx1THxCOdIyazlf7A9sOmDhm2hFk= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=fail; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer2=patchew.org@nongnu.org; dmarc=fail header.from= (p=none dis=none) header.from= Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 162204029015947.271844115718864; Wed, 26 May 2021 07:44:50 -0700 (PDT) Received: from localhost ([::1]:55874 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1llum9-0004O6-1d for importer2@patchew.org; Wed, 26 May 2021 10:44:49 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:43900) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1lluiV-0005P1-Tv for qemu-devel@nongnu.org; Wed, 26 May 2021 10:41:04 -0400 Received: from us-smtp-delivery-124.mimecast.com ([216.205.24.124]:57350) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1lluiR-0007wV-RQ for qemu-devel@nongnu.org; Wed, 26 May 2021 10:41:03 -0400 Received: from mimecast-mx01.redhat.com (mimecast-mx01.redhat.com [209.132.183.4]) (Using TLS) by relay.mimecast.com with ESMTP id us-mta-25-R6Fba7KXNnaX1ajnDR8oBQ-1; Wed, 26 May 2021 10:40:57 -0400 Received: from smtp.corp.redhat.com (int-mx04.intmail.prod.int.phx2.redhat.com [10.5.11.14]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id 60484800D62; Wed, 26 May 2021 14:40:56 +0000 (UTC) Received: from localhost.localdomain.com (ovpn-115-19.ams2.redhat.com [10.36.115.19]) by smtp.corp.redhat.com (Postfix) with ESMTP id D6A435D9C6; Wed, 26 May 2021 14:40:49 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1622040059; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=koawmmpzVH85z7deJTRI0jHlOJdZMBJO/cAcReqVFJo=; b=N7HB/A6KDIAkitRLxC9skk55Ut89V3X9ENdlmFH+I9qwcfPjzrVEBrll70Ih4XNGPvJK5n 1PzuLSCLnukwdYERSR9s/hTnI04g5cHWASEBbBnL1EiD5I2ejmZQBClJqqEisdau2X93tN tQ4oWb8QkrM7lQ3Y20AtaUHBXyHWJlE= X-MC-Unique: R6Fba7KXNnaX1ajnDR8oBQ-1 From: =?UTF-8?q?Daniel=20P=2E=20Berrang=C3=A9?= To: qemu-devel@nongnu.org Subject: [PATCH v2 2/4] target/i386: define CPU models to model x86-64 ABI levels Date: Wed, 26 May 2021 15:40:36 +0100 Message-Id: <20210526144038.278899-3-berrange@redhat.com> In-Reply-To: <20210526144038.278899-1-berrange@redhat.com> References: <20210526144038.278899-1-berrange@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.79 on 10.5.11.14 Authentication-Results: relay.mimecast.com; auth=pass smtp.auth=CUSA124A263 smtp.mailfrom=berrange@redhat.com X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable Received-SPF: pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer2=patchew.org@nongnu.org; helo=lists.gnu.org; Received-SPF: pass client-ip=216.205.24.124; envelope-from=berrange@redhat.com; helo=us-smtp-delivery-124.mimecast.com X-Spam_score_int: -31 X-Spam_score: -3.2 X-Spam_bar: --- X-Spam_report: (-3.2 / 5.0 requ) BAYES_00=-1.9, DKIMWL_WL_HIGH=-0.371, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_LOW=-0.7, RCVD_IN_MSPIKE_H4=0.001, RCVD_IN_MSPIKE_WL=0.001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=ham autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: =?UTF-8?q?Daniel=20P=2E=20Berrang=C3=A9?= , Eduardo Habkost , "Michael S. Tsirkin" , Richard Henderson , Cleber Rosa , Paolo Bonzini Errors-To: qemu-devel-bounces+importer2=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: fail (Header signature does not verify) To paraphrase: https://developers.redhat.com/blog/2021/01/05/building-red-hat-enterprise= -linux-9-for-the-x86-64-v2-microarchitecture-level/ In 2020, AMD, Intel, Red Hat, and SUSE worked together to define three microarchitecture levels on top of the historical x86-64 baseline: * x86-64: original x86_64 baseline instruction set * x86-64-v2: vector instructions up to Streaming SIMD Extensions 4.2 (SSE4.2) and Supplemental Streaming SIMD Extensions 3 (SSSE3), the POPCNT instruction, and CMPXCHG16B * x86-64-v3: vector instructions up to AVX2, MOVBE, and additional bit-manipulation instructions. * x86-64-v4: vector instructions from some of the AVX-512 variants. This list of features is defined in the doc at: https://gitlab.com/x86-psABIs/x86-64-ABI/ QEMU has historically defaulted to the "qemu64" CPU model on x86_64 targets, which is approximately the x86-64 baseline ABI, with 'SVM' added. It is thought it might be desirable if QEMU could provide CPU models that closely correspond to the ABI levels, while offering portability across the maximum number of physical CPUs. Historically we've found that defining CPU models with an arbitrary combination of CPU features can be problematic, as some guest OS will not check all features they use, and instead assume that if they see feature "XX", then "YY" will always exist. This is reasonable in bare metal, but subject to breakage in virtualization. Thus in defining the CPU models for the ABI levels, this patch attempted to base them off an existing CPU model. While each x86-64-abiNNN has a designated vendor, they are designed to be vendor agnostic models. ie they are capable of running on any physical x86_64 CPU model that satisfies the ABI level. eg although the x86-64-abi2 model is based on Nehalem, it should be able to run guests on an Opteron_G4/G5/EPYC host, since those CPUs support the features required by the x86-64 v2 ABI. More precisely the models were defined as: * x86-64-abi1: close match for Opteron_G1, minus vme * x86-64-abi2: perfect match for Nehalem * x86-64-abi3: close match of Haswell-noTSX, minus aes pcid erms invpcid tsc-deadline x2apic pclmulqdq * x86-64-abi4: close match of Skylake-Server-noTSX-IBRS, minus spec-ctrl None of the CPU models declare any VMX/SVM capability features. IOW, even if a "vmx"/"svm" flag is added, it will still be unsafe to attempt to live migrate the L1 guest if there are any L2 guests running with hardware virtualization. Given their vendor agnostic design, these CPU models are primarily thought tobe useful as the default CPU model for machine types. QEMU upstream is quite conservative in mandating new hardware features, but a downstream vendor may choose to mandate a newer x86-64 ABI level for downstream only machine types. Note that TCG is not capable of supporting the 2 newest ABI levels currently due to missing features: * x86-64-abi3: CPUID.01H:ECX.fma [bit 12] CPUID.01H:ECX.avx [bit 28] CPUID.01H:ECX.f16c [bit 29] CPUID.07H:EBX.avx2 [bit 5] * x86-64-abi4: CPUID.01H:ECX.pcid [bit 17] CPUID.01H:ECX.x2apic [bit 21] CPUID.01H:ECX.tsc-deadline [bit 24] CPUID.07H:EBX.invpcid [bit 10] CPUID.07H:EBX.avx512f [bit 16] CPUID.07H:EBX.avx512dq [bit 17] CPUID.07H:EBX.rdseed [bit 18] CPUID.07H:EBX.avx512cd [bit 28] CPUID.07H:EBX.avx512bw [bit 30] CPUID.07H:EBX.avx512vl [bit 31] CPUID.80000001H:ECX.3dnowprefetch [bit 8] CPUID.0DH:EAX.xsavec [bit 1] Signed-off-by: Daniel P. Berrang=C3=A9 --- docs/system/cpu-models-x86-abi.csv | 8 ++ target/i386/cpu.c | 156 +++++++++++++++++++++++++++++ 2 files changed, 164 insertions(+) diff --git a/docs/system/cpu-models-x86-abi.csv b/docs/system/cpu-models-x8= 6-abi.csv index f3f3b60be1..3392c39753 100644 --- a/docs/system/cpu-models-x86-abi.csv +++ b/docs/system/cpu-models-x86-abi.csv @@ -65,3 +65,11 @@ pentium3-v1,,,, phenom-v1,=E2=9C=85,,, qemu32-v1,,,, qemu64-v1,=E2=9C=85,,, +x86-64-abi1,=E2=9C=85,,, +x86-64-abi1-v1,=E2=9C=85,,, +x86-64-abi2,=E2=9C=85,=E2=9C=85,, +x86-64-abi2-v1,=E2=9C=85,=E2=9C=85,, +x86-64-abi3,=E2=9C=85,=E2=9C=85,=E2=9C=85, +x86-64-abi3-v1,=E2=9C=85,=E2=9C=85,=E2=9C=85, +x86-64-abi4,=E2=9C=85,=E2=9C=85,=E2=9C=85,=E2=9C=85 +x86-64-abi4-v1,=E2=9C=85,=E2=9C=85,=E2=9C=85,=E2=9C=85 diff --git a/target/i386/cpu.c b/target/i386/cpu.c index c496bfa1c2..e6609e278a 100644 --- a/target/i386/cpu.c +++ b/target/i386/cpu.c @@ -1798,6 +1798,162 @@ static CPUCaches epyc_milan_cache_info =3D { */ =20 static X86CPUDefinition builtin_x86_defs[] =3D { + /* + * These first few CPU models are designed to satisfy the + * x86_64 ABI levels defined in: + * + * https://gitlab.com/x86-psABIs/x86-64-ABI/ + * + * They were constructed as follows: + * + * - Find all the CPU models which can satisfy the ABI + * - Calculate the lowest common denominator (LCD) of these + * models' features + * - Find the named model most closely matching the LCD + * - Strip its features back to the LCD + * + * The above spec uses the "x86-64-vNN" naming convention. + * This clashes with the "vNN" suffix QEMU uses for versioning. + * Thus we use "abiNNN" as a suffix. + */ + { + /* + * Derived from Opteron_G1, minus + * vme + */ + .name =3D "x86-64-abi1", + .level =3D 5, + .vendor =3D CPUID_VENDOR_AMD, + .family =3D 15, + .model =3D 6, + .stepping =3D 1, + .features[FEAT_1_EDX] =3D + CPUID_SSE2 | CPUID_SSE | CPUID_FXSR | CPUID_MMX | + CPUID_CLFLUSH | CPUID_PSE36 | CPUID_PAT | CPUID_CMOV | CPUID_M= CA | + CPUID_PGE | CPUID_MTRR | CPUID_SEP | CPUID_APIC | CPUID_CX8 | + CPUID_MCE | CPUID_PAE | CPUID_MSR | CPUID_TSC | CPUID_PSE | + CPUID_DE | CPUID_FP87, + .features[FEAT_1_ECX] =3D + CPUID_EXT_SSE3, + .features[FEAT_8000_0001_EDX] =3D + CPUID_EXT2_LM | CPUID_EXT2_NX | CPUID_EXT2_SYSCALL, + .xlevel =3D 0x80000008, + .model_id =3D "QEMU x86-64 baseline ABI", + }, + { + /* Derived from Nehalem */ + .name =3D "x86-64-abi2", + .level =3D 11, + .vendor =3D CPUID_VENDOR_INTEL, + .family =3D 6, + .model =3D 26, + .stepping =3D 3, + .features[FEAT_1_EDX] =3D + CPUID_VME | CPUID_SSE2 | CPUID_SSE | CPUID_FXSR | CPUID_MMX | + CPUID_CLFLUSH | CPUID_PSE36 | CPUID_PAT | CPUID_CMOV | CPUID_M= CA | + CPUID_PGE | CPUID_MTRR | CPUID_SEP | CPUID_APIC | CPUID_CX8 | + CPUID_MCE | CPUID_PAE | CPUID_MSR | CPUID_TSC | CPUID_PSE | + CPUID_DE | CPUID_FP87, + .features[FEAT_1_ECX] =3D + CPUID_EXT_POPCNT | CPUID_EXT_SSE42 | CPUID_EXT_SSE41 | + CPUID_EXT_CX16 | CPUID_EXT_SSSE3 | CPUID_EXT_SSE3, + .features[FEAT_8000_0001_EDX] =3D + CPUID_EXT2_LM | CPUID_EXT2_SYSCALL | CPUID_EXT2_NX, + .features[FEAT_8000_0001_ECX] =3D + CPUID_EXT3_LAHF_LM, + .xlevel =3D 0x80000008, + .model_id =3D "QEMU x86-64-v2 ABI", + }, + { + /* + * Derived from Haswell-noTSX, minus + * aes pcid erms invpcid tsc-deadline x2apic pclmulqdq + */ + .name =3D "x86-64-abi3", + .level =3D 0xd, + .vendor =3D CPUID_VENDOR_INTEL, + .family =3D 6, + .model =3D 60, + .stepping =3D 1, + .features[FEAT_1_EDX] =3D + CPUID_VME | CPUID_SSE2 | CPUID_SSE | CPUID_FXSR | CPUID_MMX | + CPUID_CLFLUSH | CPUID_PSE36 | CPUID_PAT | CPUID_CMOV | CPUID_M= CA | + CPUID_PGE | CPUID_MTRR | CPUID_SEP | CPUID_APIC | CPUID_CX8 | + CPUID_MCE | CPUID_PAE | CPUID_MSR | CPUID_TSC | CPUID_PSE | + CPUID_DE | CPUID_FP87, + .features[FEAT_1_ECX] =3D + CPUID_EXT_AVX | CPUID_EXT_XSAVE | + CPUID_EXT_POPCNT | CPUID_EXT_SSE42 | + CPUID_EXT_SSE41 | CPUID_EXT_CX16 | CPUID_EXT_SSSE3 | + CPUID_EXT_SSE3 | + CPUID_EXT_FMA | CPUID_EXT_MOVBE | + CPUID_EXT_F16C | CPUID_EXT_RDRAND, + .features[FEAT_8000_0001_EDX] =3D + CPUID_EXT2_LM | CPUID_EXT2_RDTSCP | CPUID_EXT2_NX | + CPUID_EXT2_SYSCALL, + .features[FEAT_8000_0001_ECX] =3D + CPUID_EXT3_ABM | CPUID_EXT3_LAHF_LM, + .features[FEAT_7_0_EBX] =3D + CPUID_7_0_EBX_FSGSBASE | CPUID_7_0_EBX_BMI1 | + CPUID_7_0_EBX_AVX2 | CPUID_7_0_EBX_SMEP | + CPUID_7_0_EBX_BMI2, + .features[FEAT_XSAVE] =3D + CPUID_XSAVE_XSAVEOPT, + .features[FEAT_6_EAX] =3D + CPUID_6_EAX_ARAT, + .xlevel =3D 0x80000008, + .model_id =3D "QEMU x86-64-v3 ABI", + }, + + { + /* + * Derived from Skylake-Server-noTSX-IBRS, minus: + * spec-ctrl + */ + .name =3D "x86-64-abi4", + .level =3D 0xd, + .vendor =3D CPUID_VENDOR_INTEL, + .family =3D 6, + .model =3D 85, + .stepping =3D 4, + .features[FEAT_1_EDX] =3D + CPUID_VME | CPUID_SSE2 | CPUID_SSE | CPUID_FXSR | CPUID_MMX | + CPUID_CLFLUSH | CPUID_PSE36 | CPUID_PAT | CPUID_CMOV | CPUID_M= CA | + CPUID_PGE | CPUID_MTRR | CPUID_SEP | CPUID_APIC | CPUID_CX8 | + CPUID_MCE | CPUID_PAE | CPUID_MSR | CPUID_TSC | CPUID_PSE | + CPUID_DE | CPUID_FP87, + .features[FEAT_1_ECX] =3D + CPUID_EXT_AVX | CPUID_EXT_XSAVE | CPUID_EXT_AES | + CPUID_EXT_POPCNT | CPUID_EXT_X2APIC | CPUID_EXT_SSE42 | + CPUID_EXT_SSE41 | CPUID_EXT_CX16 | CPUID_EXT_SSSE3 | + CPUID_EXT_PCLMULQDQ | CPUID_EXT_SSE3 | + CPUID_EXT_TSC_DEADLINE_TIMER | CPUID_EXT_FMA | CPUID_EXT_MOVBE= | + CPUID_EXT_PCID | CPUID_EXT_F16C | CPUID_EXT_RDRAND, + .features[FEAT_8000_0001_EDX] =3D + CPUID_EXT2_LM | CPUID_EXT2_PDPE1GB | CPUID_EXT2_RDTSCP | + CPUID_EXT2_NX | CPUID_EXT2_SYSCALL, + .features[FEAT_8000_0001_ECX] =3D + CPUID_EXT3_ABM | CPUID_EXT3_LAHF_LM | CPUID_EXT3_3DNOWPREFETCH, + .features[FEAT_7_0_EBX] =3D + CPUID_7_0_EBX_FSGSBASE | CPUID_7_0_EBX_BMI1 | + CPUID_7_0_EBX_AVX2 | CPUID_7_0_EBX_SMEP | + CPUID_7_0_EBX_BMI2 | CPUID_7_0_EBX_ERMS | CPUID_7_0_EBX_INVPCI= D | + CPUID_7_0_EBX_RDSEED | CPUID_7_0_EBX_ADX | + CPUID_7_0_EBX_SMAP | CPUID_7_0_EBX_CLWB | + CPUID_7_0_EBX_AVX512F | CPUID_7_0_EBX_AVX512DQ | + CPUID_7_0_EBX_AVX512BW | CPUID_7_0_EBX_AVX512CD | + CPUID_7_0_EBX_AVX512VL, + .features[FEAT_7_0_ECX] =3D + CPUID_7_0_ECX_PKU, + .features[FEAT_XSAVE] =3D + CPUID_XSAVE_XSAVEOPT | CPUID_XSAVE_XSAVEC | + CPUID_XSAVE_XGETBV1, + .features[FEAT_6_EAX] =3D + CPUID_6_EAX_ARAT, + .xlevel =3D 0x80000008, + .model_id =3D "QEMU x86-64-v4 ABI", + }, + { .name =3D "qemu64", .level =3D 0xd, --=20 2.31.1 From nobody Tue May 7 22:54:58 2024 Delivered-To: importer2@patchew.org Authentication-Results: mx.zohomail.com; dkim=fail; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer2=patchew.org@nongnu.org; dmarc=fail(p=none dis=none) header.from=redhat.com ARC-Seal: i=1; a=rsa-sha256; t=1622040222; cv=none; d=zohomail.com; s=zohoarc; b=KARAJAEGu9ta7jTl+viv3BTh1eFZ7Bv1B5H2n8kIVykfz8/FmPdaCX67rtu+cKOLcl4VMoxpOC05NkQrZJlvkI83c+QLLmWV1EWDMe3LrwprMecb+UcIO0Fh0VLfPjo9ueUt9Slc4li3ejSQaZh/k1GSYrzuh63dunh9VEB+2sM= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1622040222; h=Content-Type:Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:To; bh=52tT4MEIVSxdQDRah/We1zDDbjRrS+6yjiMdvor+z9s=; b=YUqhGE/H+soQ6wtVMf+d39IFTnGTPEPUkY8Lgun31FSNGmJHz61pJxYtJrn1dIJSMDbi0SnGw/LGgUZlYwaTmH5DI7sT6T55ZuVX2XrAHv5xnoBSAP1o274iHzoboxEuadDgZEavw/rNHPREOmKg9cH9GeTTZ5GNuWWQL+jAuxI= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=fail; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer2=patchew.org@nongnu.org; dmarc=fail header.from= (p=none dis=none) header.from= Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1622040222828996.3066623020692; Wed, 26 May 2021 07:43:42 -0700 (PDT) Received: from localhost ([::1]:51100 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1llul3-0001D4-P6 for importer2@patchew.org; Wed, 26 May 2021 10:43:41 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:44048) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1lluj2-0006pV-LR for qemu-devel@nongnu.org; Wed, 26 May 2021 10:41:36 -0400 Received: from us-smtp-delivery-124.mimecast.com ([216.205.24.124]:23105) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1lluiy-0008M3-FK for qemu-devel@nongnu.org; Wed, 26 May 2021 10:41:36 -0400 Received: from mimecast-mx01.redhat.com (mimecast-mx01.redhat.com [209.132.183.4]) (Using TLS) by relay.mimecast.com with ESMTP id us-mta-73-1yfTgsVqOnKzbs4pGpKeCg-1; Wed, 26 May 2021 10:41:28 -0400 Received: from smtp.corp.redhat.com (int-mx04.intmail.prod.int.phx2.redhat.com [10.5.11.14]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id 6A2DB6D5D8; Wed, 26 May 2021 14:41:27 +0000 (UTC) Received: from localhost.localdomain.com (ovpn-115-19.ams2.redhat.com [10.36.115.19]) by smtp.corp.redhat.com (Postfix) with ESMTP id AA6535D9C6; Wed, 26 May 2021 14:40:56 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1622040091; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=52tT4MEIVSxdQDRah/We1zDDbjRrS+6yjiMdvor+z9s=; b=ioqW6vkfPwtt8Cf1k+5nig+bmHIcpvVDu2W6WctGmrrbRP9II2GLAJJb6x7eGH4rBfYD18 w6b09dTXqaqZM+q1pQr7ksYcu3n1vQpEu1/XbVfcTlxjaY+0LZW2zJbVmfrC2tdtbl9JHE W6E4mFl3yZSPwmUhV+wwC27YEuc05sE= X-MC-Unique: 1yfTgsVqOnKzbs4pGpKeCg-1 From: =?UTF-8?q?Daniel=20P=2E=20Berrang=C3=A9?= To: qemu-devel@nongnu.org Subject: [PATCH v2 3/4] scripts: helper to generate x86_64 CPU ABI compat info Date: Wed, 26 May 2021 15:40:37 +0100 Message-Id: <20210526144038.278899-4-berrange@redhat.com> In-Reply-To: <20210526144038.278899-1-berrange@redhat.com> References: <20210526144038.278899-1-berrange@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.79 on 10.5.11.14 Authentication-Results: relay.mimecast.com; auth=pass smtp.auth=CUSA124A263 smtp.mailfrom=berrange@redhat.com X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable Received-SPF: pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer2=patchew.org@nongnu.org; helo=lists.gnu.org; Received-SPF: pass client-ip=216.205.24.124; envelope-from=berrange@redhat.com; helo=us-smtp-delivery-124.mimecast.com X-Spam_score_int: -31 X-Spam_score: -3.2 X-Spam_bar: --- X-Spam_report: (-3.2 / 5.0 requ) BAYES_00=-1.9, DKIMWL_WL_HIGH=-0.371, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_LOW=-0.7, RCVD_IN_MSPIKE_H4=0.001, RCVD_IN_MSPIKE_WL=0.001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=ham autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: =?UTF-8?q?Daniel=20P=2E=20Berrang=C3=A9?= , Eduardo Habkost , "Michael S. Tsirkin" , Richard Henderson , Cleber Rosa , Paolo Bonzini Errors-To: qemu-devel-bounces+importer2=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: fail (Header signature does not verify) This script is what is used to generate the docs data table in: docs/system/cpu-models-x86-abi.csv It can be useful to run if adding new CPU models / versions and the csv needs updating. Signed-off-by: Daniel P. Berrang=C3=A9 --- scripts/cpu-x86-uarch-abi.py | 194 +++++++++++++++++++++++++++++++++++ 1 file changed, 194 insertions(+) create mode 100644 scripts/cpu-x86-uarch-abi.py diff --git a/scripts/cpu-x86-uarch-abi.py b/scripts/cpu-x86-uarch-abi.py new file mode 100644 index 0000000000..08acc52a81 --- /dev/null +++ b/scripts/cpu-x86-uarch-abi.py @@ -0,0 +1,194 @@ +#!/usr/bin/python3 +# +# SPDX-License-Identifier: GPL-2.0-or-later +# +# A script to generate a CSV file showing the x86_64 ABI +# compatibility levels for each CPU model. +# + +from qemu import qmp +import sys + +if len(sys.argv) !=3D 1: + print("syntax: %s QMP-SOCK\n\n" % __file__ + + "Where QMP-SOCK points to a QEMU process such as\n\n" + + " # qemu-system-x86_64 -qmp unix:/tmp/qmp,server,nowait " + + "-display none -accel kvm", file=3Dsys.stderr) + sys.exit(1) + +# Mandatory CPUID features for each microarch ABI level +levels =3D [ + [ # x86-64 baseline + "cmov", + "cx8", + "fpu", + "fxsr", + "mmx", + "syscall", + "sse", + "sse2", + ], + [ # x86-64-v2 + "cx16", + "lahf-lm", + "popcnt", + "pni", + "sse4.1", + "sse4.2", + "ssse3", + ], + [ # x86-64-v3 + "avx", + "avx2", + "bmi1", + "bmi2", + "f16c", + "fma", + "abm", + "movbe", + ], + [ # x86-64-v4 + "avx512f", + "avx512bw", + "avx512cd", + "avx512dq", + "avx512vl", + ], +] + +# Assumes externally launched process such as +# +# qemu-system-x86_64 -qmp unix:/tmp/qmp,server,nowait -display none -acc= el kvm +# +# Note different results will be obtained with TCG, as +# TCG masks out certain features otherwise present in +# the CPU model definitions, as does KVM. + + +sock =3D sys.argv[1] +cmd =3D sys.argv[2] +shell =3D qmp.QEMUMonitorProtocol(sock) +shell.connect() + +models =3D shell.cmd("query-cpu-definitions") + +# These QMP props don't correspond to CPUID fatures +# so ignore them +skip =3D [ + "family", + "min-level", + "min-xlevel", + "vendor", + "model", + "model-id", + "stepping", +] + +names =3D [] + +for model in models["return"]: + if "alias-of" in model: + continue + names.append(model["name"]) + +models =3D {} + +for name in sorted(names): + cpu =3D shell.cmd("query-cpu-model-expansion", + { "type": "static", + "model": { "name": name }}) + + got =3D {} + for (feature, present) in cpu["return"]["model"]["props"].items(): + if present and feature not in skip: + got[feature] =3D True + + if name in ["host", "max", "base"]: + continue + + models[name] =3D { + # Dict of all present features in this CPU model + "features": got, + + # Whether each x86-64 ABI level is satisfied + "levels": [False, False, False, False], + + # Number of extra CPUID features compared to the x86-64 ABI level + "distance":[-1, -1, -1, -1], + + # CPUID features present in model, but not in ABI level + "delta":[[], [], [], []], + + # CPUID features in ABI level but not present in model + "missing": [[], [], [], []], + } + + +# Calculate whether the CPU models satisfy each ABI level +for name in models.keys(): + for level in range(len(levels)): + got =3D set(models[name]["features"]) + want =3D set(levels[level]) + missing =3D want - got + match =3D True + if len(missing) > 0: + match =3D False + models[name]["levels"][level] =3D match + models[name]["missing"][level] =3D missing + +# Cache list of CPU models satisfying each ABI level +abi_models =3D [ + [], + [], + [], + [], +] + +for name in models.keys(): + for level in range(len(levels)): + if models[name]["levels"][level]: + abi_models[level].append(name) + + +for level in range(len(abi_models)): + # Find the union of features in all CPU models satisfying this ABI + allfeatures =3D {} + for name in abi_models[level]: + for feat in models[name]["features"]: + allfeatures[feat] =3D True + + # Find the intersection of features in all CPU models satisfying this = ABI + commonfeatures =3D [] + for feat in allfeatures: + present =3D True + for name in models.keys(): + if not models[name]["levels"][level]: + continue + if feat not in models[name]["features"]: + present =3D False + if present: + commonfeatures.append(feat) + + # Determine how many extra features are present compared to the lowest + # common denominator + for name in models.keys(): + if not models[name]["levels"][level]: + continue + + delta =3D set(models[name]["features"].keys()) - set(commonfeature= s) + models[name]["distance"][level] =3D len(delta) + models[name]["delta"][level] =3D delta + +def print_uarch_abi_csv(): + print("# Automatically generated from '%s'" % __file__) + print("Model,baseline,v2,v3,v4") + for name in models.keys(): + print(name, end=3D"") + for level in range(len(levels)): + if models[name]["levels"][level]: + print(",=E2=9C=85", end=3D"") + else: + print(",", end=3D"") + print() + +print_uarch_abi_csv() --=20 2.31.1 From nobody Tue May 7 22:54:58 2024 Delivered-To: importer2@patchew.org Authentication-Results: mx.zohomail.com; dkim=fail; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer2=patchew.org@nongnu.org; dmarc=fail(p=none dis=none) header.from=redhat.com ARC-Seal: i=1; a=rsa-sha256; t=1622040297; cv=none; d=zohomail.com; s=zohoarc; b=ar+ks5DapJsJ8LoGh3DBp4gzljcKh6neBW5fHAGk3oZlGMc21+BUb5ZYz5hAjtPkcpHifUUP6Vxdqkf/A4OSRYxrqjD0KVvScl/vpzWz4vtFohBQlo69OGjT1TEtjvyjQS23HONJ5x5Ul7vsLqB8jdDNnOZAIe7YksDQrSrYpvk= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1622040297; h=Content-Type:Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:To; bh=J6odVs5xN8ZYlXyVqtd7qX4Bk9a6EEe4oY9nZjJuO7M=; b=JYxHwimYxH+eLE8It9+4g1gKdrdEx65CLzaUu+54zN7dWy4A+RnAgLWneR3Q3KRsRAHxryaCI55kys3k2aYn90uyMObt3XUfDYWs0ZncK5S1oE2dREyBSMCQzcKEdfVcBJUMDGWrtHgiNh6hbPQE6LboWj7VY97XwXUWRH39jpk= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=fail; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer2=patchew.org@nongnu.org; dmarc=fail header.from= (p=none dis=none) header.from= Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 162204029754578.48848736903096; Wed, 26 May 2021 07:44:57 -0700 (PDT) Received: from localhost ([::1]:56558 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1llumF-0004pb-S7 for importer2@patchew.org; Wed, 26 May 2021 10:44:55 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:44108) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1llujK-00080e-4c for qemu-devel@nongnu.org; Wed, 26 May 2021 10:41:54 -0400 Received: from us-smtp-delivery-124.mimecast.com ([216.205.24.124]:31386) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1llujI-0008WQ-Es for qemu-devel@nongnu.org; Wed, 26 May 2021 10:41:53 -0400 Received: from mimecast-mx01.redhat.com (mimecast-mx01.redhat.com [209.132.183.4]) (Using TLS) by relay.mimecast.com with ESMTP id us-mta-463-RkOM2KhxM6GlwHdUxCZurA-1; Wed, 26 May 2021 10:41:49 -0400 Received: from smtp.corp.redhat.com (int-mx04.intmail.prod.int.phx2.redhat.com [10.5.11.14]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id D3027801817; Wed, 26 May 2021 14:41:47 +0000 (UTC) Received: from localhost.localdomain.com (ovpn-115-19.ams2.redhat.com [10.36.115.19]) by smtp.corp.redhat.com (Postfix) with ESMTP id BAE765D9C6; Wed, 26 May 2021 14:41:27 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1622040111; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=J6odVs5xN8ZYlXyVqtd7qX4Bk9a6EEe4oY9nZjJuO7M=; b=ZJNNZBX8jAIAOQ/mcpIukcpT2BHYYleDu1aPRJrFI7Lx7lIL6LV2q037vKiHatBufOQIKI Odk/u9QmHBZoz6n+fjrqp6Q2bOGatxmn5dHpdi7SCD60AOJd9v239pdmqzgcpwjMLLL6B4 e318ZC2YVhru7fxIsl7keex92l2vZFQ= X-MC-Unique: RkOM2KhxM6GlwHdUxCZurA-1 From: =?UTF-8?q?Daniel=20P=2E=20Berrang=C3=A9?= To: qemu-devel@nongnu.org Subject: [PATCH v2 4/4] NOT FOR MERGE target/i386: use x86-64-abi1 CPU model as default on x86_64 Date: Wed, 26 May 2021 15:40:38 +0100 Message-Id: <20210526144038.278899-5-berrange@redhat.com> In-Reply-To: <20210526144038.278899-1-berrange@redhat.com> References: <20210526144038.278899-1-berrange@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.79 on 10.5.11.14 Authentication-Results: relay.mimecast.com; auth=pass smtp.auth=CUSA124A263 smtp.mailfrom=berrange@redhat.com X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable Received-SPF: pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer2=patchew.org@nongnu.org; helo=lists.gnu.org; Received-SPF: pass client-ip=216.205.24.124; envelope-from=berrange@redhat.com; helo=us-smtp-delivery-124.mimecast.com X-Spam_score_int: -31 X-Spam_score: -3.2 X-Spam_bar: --- X-Spam_report: (-3.2 / 5.0 requ) BAYES_00=-1.9, DKIMWL_WL_HIGH=-0.371, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_LOW=-0.7, RCVD_IN_MSPIKE_H4=0.001, RCVD_IN_MSPIKE_WL=0.001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=ham autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: =?UTF-8?q?Daniel=20P=2E=20Berrang=C3=A9?= , Eduardo Habkost , "Michael S. Tsirkin" , Richard Henderson , Cleber Rosa , Paolo Bonzini Errors-To: qemu-devel-bounces+importer2=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: fail (Header signature does not verify) The only differences between x86-64-abi1 and qemu64 is that the former does not have the 'vme' or 'svm' flags. In practice I don't think we should make this change, because it doesn't especially add any value as-is. The only possible case is around 'svm' because KVM already masks that feature, but TCG allows it. Thus using x86-64-abi1 would mean that KVM and TCG expose a more consistent feature set. Also note that while libvirt can cope with default CPUs changing now, it can't with the default CPU being a model name that it does not already know about. Signed-off-by: Daniel P. Berrang=C3=A9 --- hw/i386/pc_piix.c | 3 +++ hw/i386/pc_q35.c | 3 +++ target/i386/cpu.h | 2 +- 3 files changed, 7 insertions(+), 1 deletion(-) diff --git a/hw/i386/pc_piix.c b/hw/i386/pc_piix.c index 30b8bd6ea9..8f23bad647 100644 --- a/hw/i386/pc_piix.c +++ b/hw/i386/pc_piix.c @@ -444,6 +444,9 @@ static void pc_i440fx_5_2_machine_options(MachineClass = *m) m->is_default =3D false; compat_props_add(m->compat_props, hw_compat_5_2, hw_compat_5_2_len); compat_props_add(m->compat_props, pc_compat_5_2, pc_compat_5_2_len); +#ifdef TARGET_X86_64 + m->default_cpu_type =3D X86_CPU_TYPE_NAME("qemu64"); +#endif } =20 DEFINE_I440FX_MACHINE(v5_2, "pc-i440fx-5.2", NULL, diff --git a/hw/i386/pc_q35.c b/hw/i386/pc_q35.c index 46a0f196f4..a684c1db3b 100644 --- a/hw/i386/pc_q35.c +++ b/hw/i386/pc_q35.c @@ -372,6 +372,9 @@ static void pc_q35_5_2_machine_options(MachineClass *m) m->alias =3D NULL; compat_props_add(m->compat_props, hw_compat_5_2, hw_compat_5_2_len); compat_props_add(m->compat_props, pc_compat_5_2, pc_compat_5_2_len); +#ifdef TARGET_X86_64 + m->default_cpu_type =3D X86_CPU_TYPE_NAME("qemu64"); +#endif } =20 DEFINE_Q35_MACHINE(v5_2, "pc-q35-5.2", NULL, diff --git a/target/i386/cpu.h b/target/i386/cpu.h index e6836393f7..e655a17f02 100644 --- a/target/i386/cpu.h +++ b/target/i386/cpu.h @@ -2001,7 +2001,7 @@ uint64_t cpu_get_tsc(CPUX86State *env); #define CPU_RESOLVING_TYPE TYPE_X86_CPU =20 #ifdef TARGET_X86_64 -#define TARGET_DEFAULT_CPU_TYPE X86_CPU_TYPE_NAME("qemu64") +#define TARGET_DEFAULT_CPU_TYPE X86_CPU_TYPE_NAME("x86-64-abi1") #else #define TARGET_DEFAULT_CPU_TYPE X86_CPU_TYPE_NAME("qemu32") #endif --=20 2.31.1