From nobody Tue Nov 18 17:31:38 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=1716962725; cv=none; d=zohomail.com; s=zohoarc; b=DLD+lWfRxgHgNgnb8L8Q7Kwq2ScfD1n6M+JS6OTK37pEpCtYLTUDbj3w4e4O3bWjM5mPVjOKsDQiCgGe9K7bm0bE+cQnaKmJztKW1APMjUOciTjlGcbi2sbwgXjzsVWTrfTQ909nNYTjyMBJAu4qT3nlMbkKDZisBrvz/k6dClE= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1716962725; h=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=60dLB9my6VNRGmfrfaq6+gaJSdplOkuN7agN/jXvCmQ=; b=XC4jYR1BTv9a8QsmXhQupK26vn5hhY1XTzsISY4b27/D2Mru0iEmdDwYvGmQ2zvvGiljUzn5hP69C7TTCJLEgOXavNK2eExgQIMtCwcHBOXl30hZdaT93brqEuEzpmOFEx2ShpKj0qrYEjkrBtCj/b/9prjgifpyiUT6nYSXIgk= 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 1716962725969318.78596613044306; Tue, 28 May 2024 23:05:25 -0700 (PDT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1sCCQF-0005aY-39; Wed, 29 May 2024 02:04:27 -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 1sCCQD-0005aK-S2 for qemu-devel@nongnu.org; Wed, 29 May 2024 02:04:25 -0400 Received: from mgamail.intel.com ([198.175.65.20]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1sCCQC-0002vg-2D for qemu-devel@nongnu.org; Wed, 29 May 2024 02:04:25 -0400 Received: from orviesa003.jf.intel.com ([10.64.159.143]) by orvoesa112.jf.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 28 May 2024 23:04:23 -0700 Received: from liuzhao-optiplex-7080.sh.intel.com ([10.239.160.36]) by orviesa003.jf.intel.com with ESMTP; 28 May 2024 23:04:21 -0700 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=intel.com; i=@intel.com; q=dns/txt; s=Intel; t=1716962664; x=1748498664; h=from:to:cc:subject:date:message-id:in-reply-to: references:mime-version:content-transfer-encoding; bh=1tROmMxTH8Fj6lqefijwEFqOzoduSv9Zi31JvU5h8iI=; b=aXLvbRABnN9TNBIBN7lvwX8+0KPorbDJ4piq4aQH7MIrVY2NhBY+q8oq TCs9/HHbJIVa4WbYPwvEthQ/4vCaFOZbzQj3rMspCYt2Mb8Jy0Gd+qeJh 0LxMZPjldZwkhaank6Ca/iJvup9lm5CFJjEcXDgVEzwoMG9CNUkO6Z0Lg ARVDYlFqds3IgGdqddaOpbzDAeJYfKSoc+c9ERN/vQrhPPCq4g/lvXmhz 764gvcWeGcwYH65sLmq+FL5PCiepGg/7HEuzVKf24IH5hgg4D0IXB4csV MSLlErgnCYyJhEXGgj95jr03pskksj/+bKg52UvOXKGjhqw9DpX9ASRND g==; X-CSE-ConnectionGUID: U57plTq0R+6RaMssAWveEQ== X-CSE-MsgGUID: WIddqH/HTdaO6YxuEmhEtA== X-IronPort-AV: E=McAfee;i="6600,9927,11085"; a="13187507" X-IronPort-AV: E=Sophos;i="6.08,197,1712646000"; d="scan'208";a="13187507" X-CSE-ConnectionGUID: KS823CJJTy6ntd77w0bpWw== X-CSE-MsgGUID: BIQ9OmQLRDiyCMqPr1WXUg== X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="6.08,197,1712646000"; d="scan'208";a="40144765" From: Zhao Liu To: Eduardo Habkost , Marcel Apfelbaum , =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= , Yanan Wang , Thomas Huth , qemu-devel@nongnu.org Cc: Yongwei Ma , Zhao Liu Subject: [PATCH 7/8] tests/unit/test-smp-parse: Test "modules" and "dies" combination case Date: Wed, 29 May 2024 14:19:24 +0800 Message-Id: <20240529061925.350323-8-zhao1.liu@intel.com> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20240529061925.350323-1-zhao1.liu@intel.com> References: <20240529061925.350323-1-zhao1.liu@intel.com> MIME-Version: 1.0 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=198.175.65.20; envelope-from=zhao1.liu@intel.com; helo=mgamail.intel.com X-Spam_score_int: -43 X-Spam_score: -4.4 X-Spam_bar: ---- X-Spam_report: (-4.4 / 5.0 requ) BAYES_00=-1.9, DKIMWL_WL_HIGH=-0.034, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_MED=-2.3, SPF_HELO_NONE=0.001, SPF_PASS=-0.001, T_SCC_BODY_TEXT_LINE=-0.01 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: 1716962727184100011 Content-Type: text/plain; charset="utf-8" Since i386 PC machine supports both "modules" and "dies" in -smp, add the "modules" and "dies" combination test case to match the actual topology usage scenario. Signed-off-by: Zhao Liu --- tests/unit/test-smp-parse.c | 103 ++++++++++++++++++++++++++++++++++++ 1 file changed, 103 insertions(+) diff --git a/tests/unit/test-smp-parse.c b/tests/unit/test-smp-parse.c index 01832e5eda32..2ca8530e935e 100644 --- a/tests/unit/test-smp-parse.c +++ b/tests/unit/test-smp-parse.c @@ -445,6 +445,33 @@ static const struct SMPTestData data_with_dies_invalid= [] =3D { }, }; =20 +static const struct SMPTestData data_with_modules_dies_invalid[] =3D { + { + /* + * config: -smp 200,sockets=3D3,dies=3D5,modules=3D2,cores=3D4,\ + * threads=3D2,maxcpus=3D200 + */ + .config =3D SMP_CONFIG_WITH_MODS_DIES(T, 200, T, 3, T, 5, T, + 2, T, 4, T, 2, T, 200), + .expect_error =3D "Invalid CPU topology: " + "product of the hierarchy must match maxcpus: " + "sockets (3) * dies (5) * modules (2) * " + "cores (4) * threads (2) !=3D maxcpus (200)", + }, { + /* + * config: -smp 242,sockets=3D3,dies=3D5,modules=3D2,cores=3D4,\ + * threads=3D2,maxcpus=3D240 + */ + .config =3D SMP_CONFIG_WITH_MODS_DIES(T, 242, T, 3, T, 5, T, + 2, T, 4, T, 2, T, 240), + .expect_error =3D "Invalid CPU topology: " + "maxcpus must be equal to or greater than smp: " + "sockets (3) * dies (5) * modules (2) * " + "cores (4) * threads (2) " + "=3D=3D maxcpus (240) < smp_cpus (242)", + }, +}; + static const struct SMPTestData data_with_clusters_invalid[] =3D { { /* config: -smp 16,sockets=3D2,clusters=3D2,cores=3D4,threads=3D2,= maxcpus=3D16 */ @@ -905,6 +932,14 @@ static void machine_with_dies_class_init(ObjectClass *= oc, void *data) mc->smp_props.dies_supported =3D true; } =20 +static void machine_with_modules_dies_class_init(ObjectClass *oc, void *da= ta) +{ + MachineClass *mc =3D MACHINE_CLASS(oc); + + mc->smp_props.modules_supported =3D true; + mc->smp_props.dies_supported =3D true; +} + static void machine_with_clusters_class_init(ObjectClass *oc, void *data) { MachineClass *mc =3D MACHINE_CLASS(oc); @@ -1082,6 +1117,67 @@ static void test_with_dies(const void *opaque) object_unref(obj); } =20 +static void test_with_modules_dies(const void *opaque) +{ + const char *machine_type =3D opaque; + Object *obj =3D object_new(machine_type); + MachineState *ms =3D MACHINE(obj); + MachineClass *mc =3D MACHINE_GET_CLASS(obj); + SMPTestData data =3D {}; + unsigned int num_modules =3D 5, num_dies =3D 3; + int i; + + for (i =3D 0; i < ARRAY_SIZE(data_generic_valid); i++) { + data =3D data_generic_valid[i]; + unsupported_params_init(mc, &data); + + /* + * when modules and dies parameters are omitted, they will + * be both set as 1. + */ + data.expect_prefer_sockets.modules =3D 1; + data.expect_prefer_sockets.dies =3D 1; + data.expect_prefer_cores.modules =3D 1; + data.expect_prefer_cores.dies =3D 1; + + smp_parse_test(ms, &data, true); + + /* when modules and dies parameters are both specified */ + data.config.has_modules =3D true; + data.config.modules =3D num_modules; + data.config.has_dies =3D true; + data.config.dies =3D num_dies; + + if (data.config.has_cpus) { + data.config.cpus *=3D num_modules * num_dies; + } + if (data.config.has_maxcpus) { + data.config.maxcpus *=3D num_modules * num_dies; + } + + data.expect_prefer_sockets.modules =3D num_modules; + data.expect_prefer_sockets.dies =3D num_dies; + data.expect_prefer_sockets.cpus *=3D num_modules * num_dies; + data.expect_prefer_sockets.max_cpus *=3D num_modules * num_dies; + + data.expect_prefer_cores.modules =3D num_modules; + data.expect_prefer_cores.dies =3D num_dies; + data.expect_prefer_cores.cpus *=3D num_modules * num_dies; + data.expect_prefer_cores.max_cpus *=3D num_modules * num_dies; + + smp_parse_test(ms, &data, true); + } + + for (i =3D 0; i < ARRAY_SIZE(data_with_modules_dies_invalid); i++) { + data =3D data_with_modules_dies_invalid[i]; + unsupported_params_init(mc, &data); + + smp_parse_test(ms, &data, false); + } + + object_unref(obj); +} + static void test_with_clusters(const void *opaque) { const char *machine_type =3D opaque; @@ -1398,6 +1494,10 @@ static const TypeInfo smp_machine_types[] =3D { .name =3D MACHINE_TYPE_NAME("smp-with-dies"), .parent =3D TYPE_MACHINE, .class_init =3D machine_with_dies_class_init, + }, { + .name =3D MACHINE_TYPE_NAME("smp-with-modules-dies"), + .parent =3D TYPE_MACHINE, + .class_init =3D machine_with_modules_dies_class_init, }, { .name =3D MACHINE_TYPE_NAME("smp-with-clusters"), .parent =3D TYPE_MACHINE, @@ -1441,6 +1541,9 @@ int main(int argc, char *argv[]) g_test_add_data_func("/test-smp-parse/with_dies", MACHINE_TYPE_NAME("smp-with-dies"), test_with_dies); + g_test_add_data_func("/test-smp-parse/with_modules_dies", + MACHINE_TYPE_NAME("smp-with-modules-dies"), + test_with_modules_dies); g_test_add_data_func("/test-smp-parse/with_clusters", MACHINE_TYPE_NAME("smp-with-clusters"), test_with_clusters); --=20 2.34.1