From nobody Mon Nov 25 06:24:55 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of lists.xenproject.org designates 192.237.175.120 as permitted sender) client-ip=192.237.175.120; envelope-from=xen-devel-bounces@lists.xenproject.org; helo=lists.xenproject.org; Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of lists.xenproject.org designates 192.237.175.120 as permitted sender) smtp.mailfrom=xen-devel-bounces@lists.xenproject.org; dmarc=pass(p=reject dis=none) header.from=citrix.com ARC-Seal: i=1; a=rsa-sha256; t=1715380834; cv=none; d=zohomail.com; s=zohoarc; b=Q1ID/aWZEFgG3DoHpzZsg8oUq53K+ykJ8E4QTGTYFqZN2OCsfh8yZG/q9iPMdHOVWocusQ5dCi7+8aaB91sROMMyHFQsHJrM4PGc4LSGotMAXBLF85xe/LNLQ3Bsyd3oA4Z1oK31GV+ack/tBgCvqGhmgHp+QkcW9AvRbBHdhmA= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1715380834; h=Content-Type:Content-Transfer-Encoding:Cc:Cc:Date:Date:From:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:Subject:To:To:Message-Id:Reply-To; bh=NZZNtujjN9pYr6HT0e0A2/j3Mym7RChiLwN22jfYFXQ=; b=Lg0xV+Sdj+GZ51pV5kNtStFEvmolCyFQAqZQtTEeer0UrRxVQMU56cZ/krK3afKrMwNd5So/AI1yedx1LuMSv9ezjOt6eBH83ZAJw4UxE8xWRAGT3/gfhLqMSKEKw//PVLBYkVju+u6xQKk1vsVNUrD6dqffizbLSQP7N930E+E= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of lists.xenproject.org designates 192.237.175.120 as permitted sender) smtp.mailfrom=xen-devel-bounces@lists.xenproject.org; dmarc=pass header.from= (p=reject dis=none) Return-Path: Received: from lists.xenproject.org (lists.xenproject.org [192.237.175.120]) by mx.zohomail.com with SMTPS id 17153808342701000.1737795285544; Fri, 10 May 2024 15:40:34 -0700 (PDT) Received: from list by lists.xenproject.org with outflank-mailman.720097.1123127 (Exim 4.92) (envelope-from ) id 1s5YuS-0000fd-Nh; Fri, 10 May 2024 22:40:12 +0000 Received: by outflank-mailman (output) from mailman id 720097.1123127; Fri, 10 May 2024 22:40:12 +0000 Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1s5YuS-0000fY-Js; Fri, 10 May 2024 22:40:12 +0000 Received: by outflank-mailman (input) for mailman id 720097; Fri, 10 May 2024 22:40:11 +0000 Received: from se1-gles-flk1-in.inumbo.com ([94.247.172.50] helo=se1-gles-flk1.inumbo.com) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1s5YuQ-0000RL-UH for xen-devel@lists.xenproject.org; Fri, 10 May 2024 22:40:10 +0000 Received: from mail-ej1-x62b.google.com (mail-ej1-x62b.google.com [2a00:1450:4864:20::62b]) by se1-gles-flk1.inumbo.com (Halon) with ESMTPS id 40e7ea54-0f1e-11ef-b4bb-af5377834399; Sat, 11 May 2024 00:40:08 +0200 (CEST) Received: by mail-ej1-x62b.google.com with SMTP id a640c23a62f3a-a59a64db066so661797066b.3 for ; Fri, 10 May 2024 15:40:08 -0700 (PDT) Received: from andrewcoop.citrite.net (default-46-102-197-194.interdsl.co.uk. [46.102.197.194]) by smtp.gmail.com with ESMTPSA id a640c23a62f3a-a5a1781cf60sm233915866b.14.2024.05.10.15.40.06 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 10 May 2024 15:40:06 -0700 (PDT) X-Outflank-Mailman: Message body and most headers restored to incoming version X-BeenThere: xen-devel@lists.xenproject.org List-Id: Xen developer discussion List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Errors-To: xen-devel-bounces@lists.xenproject.org Precedence: list Sender: "Xen-devel" X-Inumbo-ID: 40e7ea54-0f1e-11ef-b4bb-af5377834399 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=citrix.com; s=google; t=1715380807; x=1715985607; darn=lists.xenproject.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=NZZNtujjN9pYr6HT0e0A2/j3Mym7RChiLwN22jfYFXQ=; b=dMcczuGdoQatw4rz5HetC7jd1Ll80NHUcG8fkCjdn2wstbs3XH4089I61pI+j1yc+x 9byQh0qXw3hHgrwZaJq9ChMZ7nkNmYZD/FIits5YxxClNmWb+dfmewkP3Ar8Ts3q6FBW CmVJ/pAyDNoLlipGv4auyRxSRz5svuz9779Tg= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1715380807; x=1715985607; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=NZZNtujjN9pYr6HT0e0A2/j3Mym7RChiLwN22jfYFXQ=; b=q/rBjAmNnQf+6nmPw0mH8EBedFvannOaxG9OwL68IJXTQCuxoDXpV4eunR4q4bIcvh CAE9fz4K9Knb4w1adgbaJxXFOZRpNZYE3VhhPQhUkpE32C6zAcaCkrc74SWM9+vyWxpA v/WYMKWrNrW9kuUCuG5oIwnOx+QYcti1+Uvu8WetWiYR+LPPcbfW5NRN1Ugl+oLSheRd cyGpXFaWCkd/tq3PCNfJUSWXmqSsx/7AoHa/6Wnt30dp9Maba6uOHAOHOP4fVoGPpmcT MJ3oqnSyx9gBoAT0xinOiLGO+HXVudOqVVNe6M6dqyZOVjVWy4EJlzyAy4YXRaqzqv6t +xgA== X-Gm-Message-State: AOJu0YywnCw8MX1NLb0HfgZAyMXE4TAb9gyFbKA6zw0FgHUOveAbw7+k kZWQBDRFhl9eSGD+DYURm7TYtD+L8tS4PkbtrlxsZal6hvGNbu1jRHABwXaDrm1xBa9rom+F5+Q M X-Google-Smtp-Source: AGHT+IFXXDmaCK9fx4msP1oV+MH9H9mEiBmmVYHwccM8SXOciaaLj3tBQWdnSEKuMH8C/e8C2XT1iw== X-Received: by 2002:a17:906:1d16:b0:a59:dd91:3417 with SMTP id a640c23a62f3a-a5a2d53b132mr250376266b.5.1715380807400; Fri, 10 May 2024 15:40:07 -0700 (PDT) From: Andrew Cooper To: Xen-devel Cc: =?UTF-8?q?Roger=20Pau=20Monn=C3=A9?= , Andrew Cooper , Jan Beulich Subject: [PATCH 4/4] tools/xen-cpuid: Drop old names Date: Fri, 10 May 2024 23:40:02 +0100 Message-Id: <20240510224002.2324578-5-andrew.cooper3@citrix.com> X-Mailer: git-send-email 2.30.2 In-Reply-To: <20240510224002.2324578-1-andrew.cooper3@citrix.com> References: <20240510224002.2324578-1-andrew.cooper3@citrix.com> MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable X-ZohoMail-DKIM: pass (identity @citrix.com) X-ZM-MESSAGEID: 1715380834731100003 From: Roger Pau Monn=C3=A9 Not used any more. Split out of previous patch to aid legibility. Signed-off-by: Roger Pau Monn=C3=A9 Signed-off-by: Andrew Cooper Acked-by: Roger Pau Monn=C3=A9 --- CC: Jan Beulich CC: Roger Pau Monn=C3=A9 v3: * New (split out) --- tools/misc/xen-cpuid.c | 287 +++-------------------------------------- 1 file changed, 18 insertions(+), 269 deletions(-) diff --git a/tools/misc/xen-cpuid.c b/tools/misc/xen-cpuid.c index 2f34694e9c57..2cb5322ed9aa 100644 --- a/tools/misc/xen-cpuid.c +++ b/tools/misc/xen-cpuid.c @@ -15,279 +15,28 @@ =20 static uint32_t nr_features; =20 -static const char *const str_1d[32] =3D -{ - [ 0] =3D "fpu", [ 1] =3D "vme", - [ 2] =3D "de", [ 3] =3D "pse", - [ 4] =3D "tsc", [ 5] =3D "msr", - [ 6] =3D "pae", [ 7] =3D "mce", - [ 8] =3D "cx8", [ 9] =3D "apic", - /* [10] */ [11] =3D "sysenter", - [12] =3D "mtrr", [13] =3D "pge", - [14] =3D "mca", [15] =3D "cmov", - [16] =3D "pat", [17] =3D "pse36", - [18] =3D "psn", [19] =3D "clflush", - /* [20] */ [21] =3D "ds", - [22] =3D "acpi", [23] =3D "mmx", - [24] =3D "fxsr", [25] =3D "sse", - [26] =3D "sse2", [27] =3D "ss", - [28] =3D "htt", [29] =3D "tm", - [30] =3D "ia64", [31] =3D "pbe", -}; - -static const char *const str_1c[32] =3D -{ - [ 0] =3D "sse3", [ 1] =3D "pclmulqdq", - [ 2] =3D "dtes64", [ 3] =3D "monitor", - [ 4] =3D "ds-cpl", [ 5] =3D "vmx", - [ 6] =3D "smx", [ 7] =3D "est", - [ 8] =3D "tm2", [ 9] =3D "ssse3", - [10] =3D "cntx-id", [11] =3D "sdgb", - [12] =3D "fma", [13] =3D "cx16", - [14] =3D "xtpr", [15] =3D "pdcm", - /* [16] */ [17] =3D "pcid", - [18] =3D "dca", [19] =3D "sse41", - [20] =3D "sse42", [21] =3D "x2apic", - [22] =3D "movebe", [23] =3D "popcnt", - [24] =3D "tsc-dl", [25] =3D "aesni", - [26] =3D "xsave", [27] =3D "osxsave", - [28] =3D "avx", [29] =3D "f16c", - [30] =3D "rdrnd", [31] =3D "hyper", -}; - -static const char *const str_e1d[32] =3D -{ - [ 0] =3D "fpu", [ 1] =3D "vme", - [ 2] =3D "de", [ 3] =3D "pse", - [ 4] =3D "tsc", [ 5] =3D "msr", - [ 6] =3D "pae", [ 7] =3D "mce", - [ 8] =3D "cx8", [ 9] =3D "apic", - /* [10] */ [11] =3D "syscall", - [12] =3D "mtrr", [13] =3D "pge", - [14] =3D "mca", [15] =3D "cmov", - [16] =3D "fcmov", [17] =3D "pse36", - /* [18] */ [19] =3D "mp", - [20] =3D "nx", /* [21] */ - [22] =3D "mmx+", [23] =3D "mmx", - [24] =3D "fxsr", [25] =3D "fxsr+", - [26] =3D "pg1g", [27] =3D "rdtscp", - /* [28] */ [29] =3D "lm", - [30] =3D "3dnow+", [31] =3D "3dnow", -}; - -static const char *const str_e1c[32] =3D -{ - [ 0] =3D "lahf-lm", [ 1] =3D "cmp", - [ 2] =3D "svm", [ 3] =3D "extapic", - [ 4] =3D "cr8d", [ 5] =3D "lzcnt", - [ 6] =3D "sse4a", [ 7] =3D "msse", - [ 8] =3D "3dnowpf", [ 9] =3D "osvw", - [10] =3D "ibs", [11] =3D "xop", - [12] =3D "skinit", [13] =3D "wdt", - /* [14] */ [15] =3D "lwp", - [16] =3D "fma4", [17] =3D "tce", - /* [18] */ [19] =3D "nodeid", - /* [20] */ [21] =3D "tbm", - [22] =3D "topoext", [23] =3D "perfctr-core", - [24] =3D "perfctr-nb", /* [25] */ - [26] =3D "dbx", [27] =3D "perftsc", - [28] =3D "pcx-l2i", [29] =3D "monitorx", - [30] =3D "addr-msk-ext", -}; - -static const char *const str_7b0[32] =3D -{ - [ 0] =3D "fsgsbase", [ 1] =3D "tsc-adj", - [ 2] =3D "sgx", [ 3] =3D "bmi1", - [ 4] =3D "hle", [ 5] =3D "avx2", - [ 6] =3D "fdp-exn", [ 7] =3D "smep", - [ 8] =3D "bmi2", [ 9] =3D "erms", - [10] =3D "invpcid", [11] =3D "rtm", - [12] =3D "pqm", [13] =3D "depfpp", - [14] =3D "mpx", [15] =3D "pqe", - [16] =3D "avx512f", [17] =3D "avx512dq", - [18] =3D "rdseed", [19] =3D "adx", - [20] =3D "smap", [21] =3D "avx512-ifma", - [22] =3D "pcommit", [23] =3D "clflushopt", - [24] =3D "clwb", [25] =3D "proc-trace", - [26] =3D "avx512pf", [27] =3D "avx512er", - [28] =3D "avx512cd", [29] =3D "sha", - [30] =3D "avx512bw", [31] =3D "avx512vl", -}; - -static const char *const str_Da1[32] =3D -{ - [ 0] =3D "xsaveopt", [ 1] =3D "xsavec", - [ 2] =3D "xgetbv1", [ 3] =3D "xsaves", -}; - -static const char *const str_7c0[32] =3D -{ - [ 0] =3D "prefetchwt1", [ 1] =3D "avx512-vbmi", - [ 2] =3D "umip", [ 3] =3D "pku", - [ 4] =3D "ospke", [ 5] =3D "waitpkg", - [ 6] =3D "avx512-vbmi2", [ 7] =3D "cet-ss", - [ 8] =3D "gfni", [ 9] =3D "vaes", - [10] =3D "vpclmulqdq", [11] =3D "avx512-vnni", - [12] =3D "avx512-bitalg", - [14] =3D "avx512-vpopcntdq", - - [22] =3D "rdpid", - /* 24 */ [25] =3D "cldemote", - /* 26 */ [27] =3D "movdiri", - [28] =3D "movdir64b", [29] =3D "enqcmd", - [30] =3D "sgx-lc", [31] =3D "pks", -}; - -static const char *const str_e7d[32] =3D -{ - /* 6 */ [ 7] =3D "hw-pstate", - [ 8] =3D "itsc", [ 9] =3D "cpb", - [10] =3D "efro", -}; - -static const char *const str_e8b[32] =3D -{ - [ 0] =3D "clzero", - [ 2] =3D "rstr-fp-err-ptrs", - - /* [ 8] */ [ 9] =3D "wbnoinvd", - - [12] =3D "ibpb", - [14] =3D "ibrs", [15] =3D "amd-stibp", - [16] =3D "ibrs-always", [17] =3D "stibp-always", - [18] =3D "ibrs-fast", [19] =3D "ibrs-same-mode", - - [20] =3D "no-lmsl", - /* [22] */ [23] =3D "ppin", - [24] =3D "amd-ssbd", [25] =3D "virt-ssbd", - [26] =3D "ssb-no", - [28] =3D "psfd", [29] =3D "btc-no", - [30] =3D "ibpb-ret", -}; - -static const char *const str_7d0[32] =3D -{ - [ 2] =3D "avx512-4vnniw", [ 3] =3D "avx512-4fmaps", - [ 4] =3D "fsrm", - - [ 8] =3D "avx512-vp2intersect", [ 9] =3D "srbds-ctrl", - [10] =3D "md-clear", [11] =3D "rtm-always-abort", - /* 12 */ [13] =3D "tsx-force-abort", - [14] =3D "serialize", [15] =3D "hybrid", - [16] =3D "tsxldtrk", - [18] =3D "pconfig", - [20] =3D "cet-ibt", - /* 22 */ [23] =3D "avx512-fp16", - - [26] =3D "ibrsb", [27] =3D "stibp", - [28] =3D "l1d-flush", [29] =3D "arch-caps", - [30] =3D "core-caps", [31] =3D "ssbd", -}; - -static const char *const str_7a1[32] =3D -{ - [ 0] =3D "sha512", [ 1] =3D "sm3", - [ 2] =3D "sm4", - [ 4] =3D "avx-vnni", [ 5] =3D "avx512-bf16", - - [10] =3D "fzrm", [11] =3D "fsrs", - [12] =3D "fsrcs", - - /* 18 */ [19] =3D "wrmsrns", - - /* 22 */ [23] =3D "avx-ifma", -}; - -static const char *const str_e21a[32] =3D -{ - [ 0] =3D "no-nest-bp", [ 1] =3D "fs-gs-ns", - [ 2] =3D "lfence+", - [ 6] =3D "nscb", - [ 8] =3D "auto-ibrs", - [10] =3D "amd-fsrs", [11] =3D "amd-fsrc", - - /* 16 */ [17] =3D "cpuid-user-dis", - [18] =3D "epsf", [19] =3D "fsrsc", - [20] =3D "amd-prefetchi", - - /* 26 */ [27] =3D "sbpb", - [28] =3D "ibpb-brtype", [29] =3D "srso-no", -}; - -static const char *const str_7b1[32] =3D -{ - [ 0] =3D "ppin", -}; - -static const char *const str_7c1[32] =3D -{ -}; - -static const char *const str_7d1[32] =3D -{ - [ 4] =3D "avx-vnni-int8", [ 5] =3D "avx-ne-convert", - - [10] =3D "avx-vnni-int16", - - [14] =3D "prefetchi", - - [18] =3D "cet-sss", -}; - -static const char *const str_7d2[32] =3D -{ - [ 0] =3D "intel-psfd", [ 1] =3D "ipred-ctrl", - [ 2] =3D "rrsba-ctrl", [ 3] =3D "ddp-ctrl", - [ 4] =3D "bhi-ctrl", [ 5] =3D "mcdt-no", -}; - -static const char *const str_m10Al[32] =3D -{ - [ 0] =3D "rdcl-no", [ 1] =3D "eibrs", - [ 2] =3D "rsba", [ 3] =3D "skip-l1dfl", - [ 4] =3D "intel-ssb-no", [ 5] =3D "mds-no", - [ 6] =3D "if-pschange-mc-no", [ 7] =3D "tsx-ctrl", - [ 8] =3D "taa-no", [ 9] =3D "mcu-ctrl", - [10] =3D "misc-pkg-ctrl", [11] =3D "energy-ctrl", - [12] =3D "doitm", [13] =3D "sbdr-ssdp-no", - [14] =3D "fbsdp-no", [15] =3D "psdp-no", - /* 16 */ [17] =3D "fb-clear", - [18] =3D "fb-clear-ctrl", [19] =3D "rrsba", - [20] =3D "bhi-no", [21] =3D "xapic-status", - /* 22 */ [23] =3D "ovrclk-status", - [24] =3D "pbrsb-no", [25] =3D "gds-ctrl", - [26] =3D "gds-no", [27] =3D "rfds-no", - [28] =3D "rfds-clear", -}; - -static const char *const str_m10Ah[32] =3D -{ -}; - static const struct { const char *name; const char *abbr; - const char *const *strs; } leaf_info[FEATURESET_NR_ENTRIES] =3D { - { "CPUID 0x00000001.edx", "1d", str_1d }, - { "CPUID 0x00000001.ecx", "1c", str_1c }, - { "CPUID 0x80000001.edx", "e1d", str_e1d }, - { "CPUID 0x80000001.ecx", "e1c", str_e1c }, - { "CPUID 0x0000000d:1.eax", "Da1", str_Da1 }, - { "CPUID 0x00000007:0.ebx", "7b0", str_7b0 }, - { "CPUID 0x00000007:0.ecx", "7c0", str_7c0 }, - { "CPUID 0x80000007.edx", "e7d", str_e7d }, - { "CPUID 0x80000008.ebx", "e8b", str_e8b }, - { "CPUID 0x00000007:0.edx", "7d0", str_7d0 }, - { "CPUID 0x00000007:1.eax", "7a1", str_7a1 }, - { "CPUID 0x80000021.eax", "e21a", str_e21a }, - { "CPUID 0x00000007:1.ebx", "7b1", str_7b1 }, - { "CPUID 0x00000007:2.edx", "7d2", str_7d2 }, - { "CPUID 0x00000007:1.ecx", "7c1", str_7c1 }, - { "CPUID 0x00000007:1.edx", "7d1", str_7d1 }, - { "MSR_ARCH_CAPS.lo", "m10Al", str_m10Al }, - { "MSR_ARCH_CAPS.hi", "m10Ah", str_m10Ah }, + { "CPUID 0x00000001.edx", "1d" }, + { "CPUID 0x00000001.ecx", "1c" }, + { "CPUID 0x80000001.edx", "e1d" }, + { "CPUID 0x80000001.ecx", "e1c" }, + { "CPUID 0x0000000d:1.eax", "Da1" }, + { "CPUID 0x00000007:0.ebx", "7b0" }, + { "CPUID 0x00000007:0.ecx", "7c0" }, + { "CPUID 0x80000007.edx", "e7d" }, + { "CPUID 0x80000008.ebx", "e8b" }, + { "CPUID 0x00000007:0.edx", "7d0" }, + { "CPUID 0x00000007:1.eax", "7a1" }, + { "CPUID 0x80000021.eax", "e21a" }, + { "CPUID 0x00000007:1.ebx", "7b1" }, + { "CPUID 0x00000007:2.edx", "7d2" }, + { "CPUID 0x00000007:1.ecx", "7c1" }, + { "CPUID 0x00000007:1.edx", "7d1" }, + { "MSR_ARCH_CAPS.lo", "m10Al" }, + { "MSR_ARCH_CAPS.hi", "m10Ah" }, }; =20 #define COL_ALIGN "24" --=20 2.30.2