From nobody Sun Nov 16 00:57:42 2025 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; dkim=pass header.i=@intel.com; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=pass(p=none dis=none) header.from=intel.com ARC-Seal: i=1; a=rsa-sha256; t=1745407705; cv=none; d=zohomail.com; s=zohoarc; b=QYTeKf/uIGWuaVvRxsFktwiTtAC1JGCu1hgmcn1yY+Y3jRZCYY+x/TGpsLhaaU+SrkHh+QVXcEGU4+CljuYVcAlZSAc1iS96iBtW3AsWdrPaYkaHjxw5U+IH9e8mqSBwTbgZVFMAgy9pE1YcLg0uluesFpQ2ZqkD5CxxAEqVW9g= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1745407705; h=Content-Type:Content-Transfer-Encoding:Cc:Cc:Date:Date:From:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:Subject:To:To:Message-Id:Reply-To; bh=vWL+RBxNG5KPAO23NFruiK01eNr3CZ6TRDkqUlTdom8=; b=UbSlKqGTeEMvsw4PBMTxeO3NKcO3vwZZHvGoePB1KjON5yyt7hIfzKJLjiPWJOMBiD4YeXXjIVUn32pDyB01IzFpyirw1ZuGtixt2G/ZuU1cok/d0E3X6iyjsqbNJkRrPyqJbfxTYs2ITJbDzhcxoHeC3pJfDLneepJuJzj6FBg= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass header.i=@intel.com; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=pass header.from= (p=none dis=none) Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1745407705124997.489986703737; Wed, 23 Apr 2025 04:28:25 -0700 (PDT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1u7YFu-0004EE-Kz; Wed, 23 Apr 2025 07:27:06 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1u7YFJ-0003xD-PJ for qemu-devel@nongnu.org; Wed, 23 Apr 2025 07:26:32 -0400 Received: from mgamail.intel.com ([192.198.163.12]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1u7YFH-0002wd-81 for qemu-devel@nongnu.org; Wed, 23 Apr 2025 07:26:29 -0400 Received: from orviesa003.jf.intel.com ([10.64.159.143]) by fmvoesa106.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 23 Apr 2025 04:26:26 -0700 Received: from liuzhao-optiplex-7080.sh.intel.com ([10.239.160.39]) by orviesa003.jf.intel.com with ESMTP; 23 Apr 2025 04:26:23 -0700 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=intel.com; i=@intel.com; q=dns/txt; s=Intel; t=1745407587; x=1776943587; h=from:to:cc:subject:date:message-id:in-reply-to: references:mime-version:content-transfer-encoding; bh=ZACIexM/oE4FNN0LXsaQvogct46TsXFr8hAXTBqvlCM=; b=BqRhQiSL61tV5GoiQ3CxkUfIDPLy/v4hO1mCeH4A4datoPfwGbXVaS87 TU2PAabSpQSOZmenEX+nXsR/7sDIq1S8utIgpHninjsJ03tlkk+eGRE40 6+/M7p3ejqZmhBAeiyWZABAjxgXocheAVvAe0YNIbS96ON5JqL8+Deedz UcFO9DAoUdEkDF0BvFfm1JqF+MD14ZdCEyuqql7ykmn4kTdh7tcpe7Ute lwj3SeDRnIhuzding3fmGil2104whUJOmQqFD62NxkX5p3jpaShlNvFNw 43d5t0Ogto5Rk66V0oiSRniVcA4WOsF4GVoPgTnet1gRcHtYsjJPuC/FD w==; X-CSE-ConnectionGUID: MVQI8b3RQk6tl/eyRG8OYw== X-CSE-MsgGUID: jn7bHW8bQTu0tAIRPR8DWA== X-IronPort-AV: E=McAfee;i="6700,10204,11411"; a="50825276" X-IronPort-AV: E=Sophos;i="6.15,233,1739865600"; d="scan'208";a="50825276" X-CSE-ConnectionGUID: gSa9HZhSRsyXUQ8/6Q7mhA== X-CSE-MsgGUID: AOj9NinMQG+cUDI4+oh1HA== X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="6.15,233,1739865600"; d="scan'208";a="137150748" From: Zhao Liu To: Paolo Bonzini , Marcelo Tosatti , =?UTF-8?q?Daniel=20P=20=2E=20Berrang=C3=A9?= , Igor Mammedov Cc: Babu Moger , Ewan Hai , Xiaoyao Li , Tejus GK , Jason Zeng , Manish Mishra , Tao Su , qemu-devel@nongnu.org, kvm@vger.kernel.org, Zhao Liu Subject: [RFC 04/10] i386/cpu: Introduce cache model for GraniteRapids Date: Wed, 23 Apr 2025 19:46:56 +0800 Message-Id: <20250423114702.1529340-5-zhao1.liu@intel.com> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20250423114702.1529340-1-zhao1.liu@intel.com> References: <20250423114702.1529340-1-zhao1.liu@intel.com> MIME-Version: 1.0 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+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Received-SPF: pass client-ip=192.198.163.12; envelope-from=zhao1.liu@intel.com; helo=mgamail.intel.com X-Spam_score_int: -46 X-Spam_score: -4.7 X-Spam_bar: ---- X-Spam_report: (-4.7 / 5.0 requ) BAYES_00=-1.9, DKIMWL_WL_HIGH=-0.294, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_MED=-2.3, RCVD_IN_VALIDITY_CERTIFIED_BLOCKED=0.001, RCVD_IN_VALIDITY_RPBL_BLOCKED=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.29 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: qemu-devel-bounces+importer=patchew.org@nongnu.org X-ZohoMail-DKIM: pass (identity @intel.com) X-ZM-MESSAGEID: 1745407707464019100 Add the cache model to GraniteRapids (v3) to better emulate its environment. The cache model is based on GraniteRapids-SP (Scalable Performance): --- cache 0 --- cache type =3D data cache (1) cache level =3D 0x1 (1) self-initializing cache level =3D true fully associative cache =3D false maximum IDs for CPUs sharing cache =3D 0x1 (1) maximum IDs for cores in pkg =3D 0x3f (63) system coherency line size =3D 0x40 (64) physical line partitions =3D 0x1 (1) ways of associativity =3D 0xc (12) number of sets =3D 0x40 (64) WBINVD/INVD acts on lower caches =3D false inclusive to lower caches =3D false complex cache indexing =3D false number of sets (s) =3D 64 (size synth) =3D 49152 (48 KB) --- cache 1 --- cache type =3D instruction cache (2) cache level =3D 0x1 (1) self-initializing cache level =3D true fully associative cache =3D false maximum IDs for CPUs sharing cache =3D 0x1 (1) maximum IDs for cores in pkg =3D 0x3f (63) system coherency line size =3D 0x40 (64) physical line partitions =3D 0x1 (1) ways of associativity =3D 0x10 (16) number of sets =3D 0x40 (64) WBINVD/INVD acts on lower caches =3D false inclusive to lower caches =3D false complex cache indexing =3D false number of sets (s) =3D 64 (size synth) =3D 65536 (64 KB) --- cache 2 --- cache type =3D unified cache (3) cache level =3D 0x2 (2) self-initializing cache level =3D true fully associative cache =3D false maximum IDs for CPUs sharing cache =3D 0x1 (1) maximum IDs for cores in pkg =3D 0x3f (63) system coherency line size =3D 0x40 (64) physical line partitions =3D 0x1 (1) ways of associativity =3D 0x10 (16) number of sets =3D 0x800 (2048) WBINVD/INVD acts on lower caches =3D false inclusive to lower caches =3D false complex cache indexing =3D false number of sets (s) =3D 2048 (size synth) =3D 2097152 (2 MB) --- cache 3 --- cache type =3D unified cache (3) cache level =3D 0x3 (3) self-initializing cache level =3D true fully associative cache =3D false maximum IDs for CPUs sharing cache =3D 0xff (255) maximum IDs for cores in pkg =3D 0x3f (63) system coherency line size =3D 0x40 (64) physical line partitions =3D 0x1 (1) ways of associativity =3D 0x10 (16) number of sets =3D 0x48000 (294912) WBINVD/INVD acts on lower caches =3D false inclusive to lower caches =3D false complex cache indexing =3D true number of sets (s) =3D 294912 (size synth) =3D 301989888 (288 MB) --- cache 4 --- cache type =3D no more caches (0) Suggested-by: Tejus GK Suggested-by: Jason Zeng Suggested-by: "Daniel P . Berrang=C3=A9" Signed-off-by: Zhao Liu --- target/i386/cpu.c | 96 +++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 96 insertions(+) diff --git a/target/i386/cpu.c b/target/i386/cpu.c index 4f7ab6246e39..00e4a8372c28 100644 --- a/target/i386/cpu.c +++ b/target/i386/cpu.c @@ -2453,6 +2453,97 @@ static const CPUCaches epyc_genoa_cache_info =3D { }, }; =20 +static const CPUCaches xeon_gnr_cache_info =3D { + .l1d_cache =3D &(CPUCacheInfo) { + // CPUID 0x4.0x0.EAX + .type =3D DATA_CACHE, + .level =3D 1, + .self_init =3D true, + + // CPUID 0x4.0x0.EBX + .line_size =3D 64, + .partitions =3D 1, + .associativity =3D 12, + + // CPUID 0x4.0x0.ECX + .sets =3D 64, + + // CPUID 0x4.0x0.EDX + .no_invd_sharing =3D false, + .inclusive =3D false, + .complex_indexing =3D false, + + .size =3D 48 * KiB, + .share_level =3D CPU_TOPOLOGY_LEVEL_CORE, + }, + .l1i_cache =3D &(CPUCacheInfo) { + // CPUID 0x4.0x1.EAX + .type =3D INSTRUCTION_CACHE, + .level =3D 1, + .self_init =3D true, + + // CPUID 0x4.0x1.EBX + .line_size =3D 64, + .partitions =3D 1, + .associativity =3D 16, + + // CPUID 0x4.0x1.ECX + .sets =3D 64, + + // CPUID 0x4.0x1.EDX + .no_invd_sharing =3D false, + .inclusive =3D false, + .complex_indexing =3D false, + + .size =3D 64 * KiB, + .share_level =3D CPU_TOPOLOGY_LEVEL_CORE, + }, + .l2_cache =3D &(CPUCacheInfo) { + // CPUID 0x4.0x2.EAX + .type =3D UNIFIED_CACHE, + .level =3D 2, + .self_init =3D true, + + // CPUID 0x4.0x2.EBX + .line_size =3D 64, + .partitions =3D 1, + .associativity =3D 16, + + // CPUID 0x4.0x2.ECX + .sets =3D 2048, + + // CPUID 0x4.0x2.EDX + .no_invd_sharing =3D false, + .inclusive =3D false, + .complex_indexing =3D false, + + .size =3D 2 * MiB, + .share_level =3D CPU_TOPOLOGY_LEVEL_CORE, + }, + .l3_cache =3D &(CPUCacheInfo) { + // CPUID 0x4.0x3.EAX + .type =3D UNIFIED_CACHE, + .level =3D 3, + .self_init =3D true, + + // CPUID 0x4.0x3.EBX + .line_size =3D 64, + .partitions =3D 1, + .associativity =3D 16, + + // CPUID 0x4.0x3.ECX + .sets =3D 294912, + + // CPUID 0x4.0x3.EDX + .no_invd_sharing =3D false, + .inclusive =3D false, + .complex_indexing =3D true, + + .size =3D 288 * MiB, + .share_level =3D CPU_TOPOLOGY_LEVEL_SOCKET, + }, +}; + static const CPUCaches xeon_srf_cache_info =3D { .l1d_cache =3D &(CPUCacheInfo) { // CPUID 0x4.0x0.EAX @@ -4517,6 +4608,11 @@ static const X86CPUDefinition builtin_x86_defs[] =3D= { { /* end of list */ } } }, + { + .version =3D 3, + .note =3D "with gnr-sp cache model", + .cache_info =3D &xeon_gnr_cache_info, + }, { /* end of list */ }, }, }, --=20 2.34.1