From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-20.5 required=3.0 tests=BAYES_00, HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_CR_TRAILER,INCLUDES_PATCH, MAILING_LIST_MULTI,MENTIONS_GIT_HOSTING,NICE_REPLY_A,SPF_HELO_NONE,SPF_PASS, URIBL_BLOCKED,USER_AGENT_SANE_1 autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id BC6C2C63793 for ; Thu, 22 Jul 2021 06:17:09 +0000 (UTC) Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPS id CB59A61260 for ; Thu, 22 Jul 2021 06:17:08 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org CB59A61260 Authentication-Results: mail.kernel.org; dmarc=fail (p=none dis=none) header.from=huawei.com Authentication-Results: mail.kernel.org; spf=pass smtp.mailfrom=qemu-devel-bounces+qemu-devel=archiver.kernel.org@nongnu.org Received: from localhost ([::1]:59444 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1m6S15-0001ci-P8 for qemu-devel@archiver.kernel.org; Thu, 22 Jul 2021 02:17:07 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:40658) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1m6Rza-0000KD-Mj for qemu-devel@nongnu.org; Thu, 22 Jul 2021 02:15:34 -0400 Received: from szxga01-in.huawei.com ([45.249.212.187]:2442) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1m6RzU-0003jm-F1 for qemu-devel@nongnu.org; Thu, 22 Jul 2021 02:15:34 -0400 Received: from dggemv711-chm.china.huawei.com (unknown [172.30.72.56]) by szxga01-in.huawei.com (SkyGuard) with ESMTP id 4GVhtN4MC8zZrbt; Thu, 22 Jul 2021 14:11:56 +0800 (CST) Received: from dggpemm500023.china.huawei.com (7.185.36.83) by dggemv711-chm.china.huawei.com (10.1.198.66) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256) id 15.1.2176.2; Thu, 22 Jul 2021 14:15:19 +0800 Received: from [10.174.187.128] (10.174.187.128) by dggpemm500023.china.huawei.com (7.185.36.83) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_CBC_SHA256) id 15.1.2176.2; Thu, 22 Jul 2021 14:15:19 +0800 Subject: Re: [PATCH for-6.2 v2 11/11] tests/unit: Add a unit test for smp parsing To: Andrew Jones References: <20210719032043.25416-1-wangyanan55@huawei.com> <20210719032043.25416-12-wangyanan55@huawei.com> <20210719185755.56r72aiqfuygqhcc@gator> From: "wangyanan (Y)" Message-ID: <59d1833f-d42e-66df-e5f9-fd7efd6f6d0c@huawei.com> Date: Thu, 22 Jul 2021 14:15:18 +0800 User-Agent: Mozilla/5.0 (Windows NT 10.0; Win64; x64; rv:78.0) Gecko/20100101 Thunderbird/78.4.0 MIME-Version: 1.0 In-Reply-To: <20210719185755.56r72aiqfuygqhcc@gator> Content-Type: text/plain; charset="utf-8"; format=flowed Content-Transfer-Encoding: 7bit Content-Language: en-US X-Originating-IP: [10.174.187.128] X-ClientProxiedBy: dggeme705-chm.china.huawei.com (10.1.199.101) To dggpemm500023.china.huawei.com (7.185.36.83) X-CFilter-Loop: Reflected Received-SPF: pass client-ip=45.249.212.187; envelope-from=wangyanan55@huawei.com; helo=szxga01-in.huawei.com X-Spam_score_int: -42 X-Spam_score: -4.3 X-Spam_bar: ---- X-Spam_report: (-4.3 / 5.0 requ) BAYES_00=-1.9, NICE_REPLY_A=-0.117, RCVD_IN_DNSWL_MED=-2.3, 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: Peter Maydell , Thomas Huth , =?UTF-8?Q?Daniel_P=2e_Berrang=c3=a9?= , Eduardo Habkost , "Michael S . Tsirkin" , Richard Henderson , qemu-devel@nongnu.org, Greg Kurz , Halil Pasic , Paolo Bonzini , Igor Mammedov , yuzenghui@huawei.com, wanghaibin.wang@huawei.com, David Gibson Errors-To: qemu-devel-bounces+qemu-devel=archiver.kernel.org@nongnu.org Sender: "Qemu-devel" On 2021/7/20 2:57, Andrew Jones wrote: > On Mon, Jul 19, 2021 at 11:20:43AM +0800, Yanan Wang wrote: >> Add a QEMU unit test for the parsing of given SMP configuration. >> Since all the parsing logic is in generic function smp_parse(), >> this test passes diffenent SMP configurations to the function >> and compare the parsing result with what is expected. >> >> In the test, all possible collections of the topology parameters >> and the corressponding expected results are listed, including the >> valid and invalid ones. >> >> The preference of sockets over cores and the preference of cores >> over sockets, and the support of multi-dies are also considered. >> >> Signed-off-by: Yanan Wang >> --- >> MAINTAINERS | 1 + >> tests/unit/meson.build | 1 + >> tests/unit/test-smp-parse.c | 1117 +++++++++++++++++++++++++++++++++++ >> 3 files changed, 1119 insertions(+) >> create mode 100644 tests/unit/test-smp-parse.c >> >> diff --git a/MAINTAINERS b/MAINTAINERS >> index 70633e3bf4..160dba2e57 100644 >> --- a/MAINTAINERS >> +++ b/MAINTAINERS >> @@ -1636,6 +1636,7 @@ F: include/hw/boards.h >> F: include/hw/core/cpu.h >> F: include/hw/cpu/cluster.h >> F: include/sysemu/numa.h >> +F: tests/unit/test-smp-parse.c >> T: git https://gitlab.com/ehabkost/qemu.git machine-next >> >> Xtensa Machines >> diff --git a/tests/unit/meson.build b/tests/unit/meson.build >> index 3e0504dd21..694a924627 100644 >> --- a/tests/unit/meson.build >> +++ b/tests/unit/meson.build >> @@ -44,6 +44,7 @@ tests = { >> 'test-uuid': [], >> 'ptimer-test': ['ptimer-test-stubs.c', meson.source_root() / 'hw/core/ptimer.c'], >> 'test-qapi-util': [], >> + 'test-smp-parse': [qom, meson.source_root() / 'hw/core/machine-smp.c'], >> } >> >> if have_system or have_tools >> diff --git a/tests/unit/test-smp-parse.c b/tests/unit/test-smp-parse.c >> new file mode 100644 >> index 0000000000..bc1d324c3d >> --- /dev/null >> +++ b/tests/unit/test-smp-parse.c >> @@ -0,0 +1,1117 @@ >> +/* >> + * SMP parsing unit-tests >> + * >> + * Copyright (C) 2021, Huawei, Inc. >> + * >> + * Authors: >> + * Yanan Wang >> + * >> + * This work is licensed under the terms of the GNU LGPL, version 2.1 or later. >> + * See the COPYING.LIB file in the top-level directory. >> + */ >> + >> +#include "qemu/osdep.h" >> +#include "qom/object.h" >> +#include "qemu/module.h" >> +#include "qapi/error.h" >> + >> +#include "hw/boards.h" >> + >> +#define T true >> +#define F false >> + >> +/** >> + * SMPTestData: >> + * @config - the given SMP configuration for parsing >> + * @should_be_valid - whether the given configuration is supposed to be valid >> + * @expect - the CPU topology info expected to be parsed out >> + */ >> +typedef struct SMPTestData { >> + SMPConfiguration config; >> + bool should_be_valid; > Long way to say 'valid'. Indeed..., "valid" should be enough. >> + CpuTopology expect; >> +} SMPTestData; >> + >> +/* the specific machine type info for this test */ >> +static const TypeInfo smp_machine_info = { >> + .name = TYPE_MACHINE, >> + .parent = TYPE_OBJECT, >> + .class_size = sizeof(MachineClass), >> + .instance_size = sizeof(MachineState), >> +}; >> + >> +/* >> + * prefer sockets over cores over threads before 6.2. >> + * all possible SMP configurations and the corressponding expected outputs > corresponding (please run spell check on your commit messages) > Ok, I missed the check. >> + * are listed for testing, including the valid and invalid ones. >> + */ >> +static struct SMPTestData prefer_sockets[] = { >> + { >> + /* config: no smp configuration provided >> + * expect: cpus=1,sockets=1,dies=1,cores=1,threads=1,maxcpus=1 */ >> + .config = (SMPConfiguration) { F, 0, F, 0, F, 0, F, 0, F, 0, F, 0 }, > SMPConfiguration and CpuTopology have named fields so we could drop the > 'expect: ...' comment line and instead do > > { > /* no configuration provided */ > .config = { .has_cpus = F, .has_maxcpus = F, ... }, > .valid = T, > .expect = { .sockets = 1, .cores = 1, ... }, > }, { > ... > } > > which may be easier to maintain. OTOH, the concise form this approach has > is also nice. I tried the structure initialization with explicit name fields in it like above, actually we are supposed to do in this way so that we don't have to worry about the order change of the structure members. But this would break the 80-char line limit or introduce more lines for for each SMP configuration. If this is not a real problem, I also prefer above format. > I don't think you should need the casts in the assignments > though. Yes, the casts may be unnecessary, will remove them. > >> + .should_be_valid = true, >> + .expect = (CpuTopology) { 1, 1, 1, 1, 1, 1 }, >> + }, { >> + /* config: -smp 8 >> + * expect: cpus=8,sockets=8,dies=1,cores=1,threads=1,maxcpus=8 */ >> + .config = (SMPConfiguration) { T, 8, F, 0, F, 0, F, 0, F, 0, F, 0 }, >> + .should_be_valid = true, >> + .expect = (CpuTopology) { 8, 8, 1, 1, 1, 8 }, >> + }, { >> + /* config: -smp sockets=2 >> + * expect: cpus=2,sockets=2,dies=1,cores=1,threads=1,maxcpus=2 */ >> + .config = (SMPConfiguration) { F, 0, T, 2, F, 0, F, 0, F, 0, F, 0 }, >> + .should_be_valid = true, >> + .expect = (CpuTopology) { 2, 2, 1, 1, 1, 2 }, >> + }, { >> + /* config: -smp cores=4 >> + * expect: cpus=4,sockets=1,dies=1,cores=4,threads=1,maxcpus=4 */ >> + .config = (SMPConfiguration) { F, 0, F, 0, F, 0, T, 4, F, 0, F, 0 }, >> + .should_be_valid = true, >> + .expect = (CpuTopology) { 4, 1, 1, 4, 1, 4 }, >> + }, { >> + /* config: -smp threads=2 >> + * expect: cpus=2,sockets=1,dies=1,cores=1,threads=2,maxcpus=2 */ >> + .config = (SMPConfiguration) { F, 0, F, 0, F, 0, F, 0, T, 2, F, 0 }, >> + .should_be_valid = true, >> + .expect = (CpuTopology) { 2, 1, 1, 1, 2, 2 }, >> + }, { >> + /* config: -smp maxcpus=16 >> + * expect: cpus=16,sockets=16,dies=1,cores=1,threads=1,maxcpus=16 */ >> + .config = (SMPConfiguration) { F, 0, F, 0, F, 0, F, 0, F, 0, T, 16 }, >> + .should_be_valid = true, >> + .expect = (CpuTopology) { 16, 16, 1, 1, 1, 16 }, >> + }, { >> + /* config: -smp 8,sockets=2 >> + * expect: cpus=8,sockets=2,dies=1,cores=4,threads=1,maxcpus=8 */ >> + .config = (SMPConfiguration) { T, 8, T, 2, F, 0, F, 0, F, 0, F, 0 }, >> + .should_be_valid = true, >> + .expect = (CpuTopology) { 8, 2, 1, 4, 1, 8 }, >> + }, { >> + /* config: -smp 8,cores=4 >> + * expect: cpus=8,sockets=2,dies=1,cores=4,threads=1,maxcpus=8 */ >> + .config = (SMPConfiguration) { T, 8, F, 0, F, 0, T, 4, F, 0, F, 0 }, >> + .should_be_valid = true, >> + .expect = (CpuTopology) { 8, 2, 1, 4, 1, 8 }, >> + }, { >> + /* config: -smp 8,threads=2 >> + * expect: cpus=8,sockets=4,dies=1,cores=1,threads=2,maxcpus=8 */ >> + .config = (SMPConfiguration) { T, 8, F, 0, F, 0, F, 0, T, 2, F, 0 }, >> + .should_be_valid = true, >> + .expect = (CpuTopology) { 8, 4, 1, 1, 2, 8 }, >> + }, { >> + /* config: -smp 8,maxcpus=16 >> + * expect: cpus=8,sockets=16,dies=1,cores=1,threads=1,maxcpus=16 */ >> + .config = (SMPConfiguration) { T, 8, F, 0, F, 0, F, 0, F, 0, T, 16 }, >> + .should_be_valid = true, >> + .expect = (CpuTopology) { 8, 16, 1, 1, 1, 16 }, >> + }, { >> + /* config: -smp sockets=2,cores=4 >> + * expect: cpus=8,sockets=2,dies=1,cores=4,threads=1,maxcpus=8 */ >> + .config = (SMPConfiguration) { F, 0, T, 2, F, 0, T, 4, F, 0, F, 0 }, >> + .should_be_valid = true, >> + .expect = (CpuTopology) { 8, 2, 1, 4, 1, 8 }, >> + }, { >> + /* config: -smp sockets=2,threads=2 >> + * expect: cpus=4,sockets=2,dies=1,cores=1,threads=2,maxcpus=4 */ >> + .config = (SMPConfiguration) { F, 0, T, 2, F, 0, F, 0, T, 2, F, 0 }, >> + .should_be_valid = true, >> + .expect = (CpuTopology) { 4, 2, 1, 1, 2, 4 }, >> + }, { >> + /* config: -smp sockets=2,maxcpus=16 >> + * expect: cpus=16,sockets=2,dies=1,cores=8,threads=1,maxcpus=16 */ >> + .config = (SMPConfiguration) { F, 0, T, 2, F, 0, F, 0, F, 0, T, 16 }, >> + .should_be_valid = true, >> + .expect = (CpuTopology) { 16, 2, 1, 8, 1, 16 }, >> + }, { >> + /* config: -smp cores=4,threads=2 >> + * expect: cpus=8,sockets=1,dies=1,cores=4,threads=2,maxcpus=8 */ >> + .config = (SMPConfiguration) { F, 0, F, 0, F, 0, T, 4, T, 2, F, 0 }, >> + .should_be_valid = true, >> + .expect = (CpuTopology) { 8, 1, 1, 4, 2, 8 }, >> + }, { >> + /* config: -smp cores=4,maxcpus=16 >> + * expect: cpus=16,sockets=4,dies=1,cores=4,threads=1,maxcpus=16 */ >> + .config = (SMPConfiguration) { F, 0, F, 0, F, 0, T, 4, F, 0, T, 16 }, >> + .should_be_valid = true, >> + .expect = (CpuTopology) { 16, 4, 1, 4, 1, 16 }, >> + }, { >> + /* config: -smp threads=2,maxcpus=16 >> + * expect: cpus=16,sockets=8,dies=1,cores=1,threads=2,maxcpus=16 */ >> + .config = (SMPConfiguration) { F, 0, F, 0, F, 0, F, 0, T, 2, T, 16 }, >> + .should_be_valid = true, >> + .expect = (CpuTopology) { 16, 8, 1, 1, 2, 16 }, >> + }, { >> + /* config: -smp 8,sockets=2,cores=4 >> + * expect: cpus=8,sockets=2,dies=1,cores=4,threads=1,maxcpus=8 */ >> + .config = (SMPConfiguration) { T, 8, T, 2, F, 0, T, 4, F, 0, F, 0 }, >> + .should_be_valid = true, >> + .expect = (CpuTopology) { 8, 2, 1, 4, 1, 8 }, >> + }, { >> + /* config: -smp 8,sockets=2,threads=2 >> + * expect: cpus=8,sockets=2,dies=1,cores=2,threads=2,maxcpus=8 */ >> + .config = (SMPConfiguration) { T, 8, T, 2, F, 0, F, 0, T, 2, F, 0 }, >> + .should_be_valid = true, >> + .expect = (CpuTopology) { 8, 2, 1, 2, 2, 8 }, >> + }, { >> + /* config: -smp 8,sockets=2,maxcpus=16 >> + * expect: cpus=8,sockets=2,dies=1,cores=8,threads=1,maxcpus=16 */ >> + .config = (SMPConfiguration) { T, 8, T, 2, F, 0, F, 0, F, 0, T, 16 }, >> + .should_be_valid = true, >> + .expect = (CpuTopology) { 8, 2, 1, 8, 1, 16 }, >> + }, { >> + /* config: -smp 8,cores=4,threads=2 >> + * expect: cpus=8,sockets=1,dies=1,cores=4,threads=2,maxcpus=8 */ >> + .config = (SMPConfiguration) { T, 8, F, 0, F, 0, T, 4, T, 2, F, 0 }, >> + .should_be_valid = true, >> + .expect = (CpuTopology) { 8, 1, 1, 4, 2, 8 }, >> + }, { >> + /* config: -smp 8,cores=4,maxcpus=16 >> + * expect: cpus=8,sockets=4,dies=1,cores=4,threads=1,maxcpus=16 */ >> + .config = (SMPConfiguration) { T, 8, F, 0, F, 0, T, 4, F, 0, T, 16 }, >> + .should_be_valid = true, >> + .expect = (CpuTopology) { 8, 4, 1, 4, 1, 16 }, >> + }, { >> + /* config: -smp 8,threads=2,maxcpus=16 >> + * expect: cpus=8,sockets=8,dies=1,cores=1,threads=2,maxcpus=16 */ >> + .config = (SMPConfiguration) { T, 8, F, 0, F, 0, F, 0, T, 2, T, 16 }, >> + .should_be_valid = true, >> + .expect = (CpuTopology) { 8, 8, 1, 1, 2, 16 }, >> + }, { >> + /* config: -smp sockets=2,cores=4,threads=2 >> + * expect: cpus=16,sockets=2,dies=1,cores=4,threads=2,maxcpus=16 */ >> + .config = (SMPConfiguration) { F, 0, T, 2, F, 0, T, 4, T, 2, F, 0 }, >> + .should_be_valid = true, >> + .expect = (CpuTopology) { 16, 2, 1, 4, 2, 16 }, >> + }, { >> + /* config: -smp sockets=2,cores=4,maxcpus=16 >> + * expect: cpus=16,sockets=2,dies=1,cores=4,threads=2,maxcpus=16 */ >> + .config = (SMPConfiguration) { F, 0, T, 2, F, 0, T, 4, F, 0, T, 16 }, >> + .should_be_valid = true, >> + .expect = (CpuTopology) { 16, 2, 1, 4, 2, 16 }, >> + }, { >> + /* config: -smp sockets=2,threads=2,maxcpus=16 >> + * expect: cpus=16,sockets=2,dies=1,cores=4,threads=2,maxcpus=16 */ >> + .config = (SMPConfiguration) { F, 0, T, 2, F, 0, F, 0, T, 2, T, 16 }, >> + .should_be_valid = true, >> + .expect = (CpuTopology) { 16, 2, 1, 4, 2, 16 }, >> + }, { >> + /* config: -smp cores=4,threads=2,maxcpus=16 >> + * expect: cpus=16,sockets=2,dies=1,cores=4,threads=2,maxcpus=16 */ >> + .config = (SMPConfiguration) { F, 0, F, 0, F, 0, T, 4, T, 2, T, 16 }, >> + .should_be_valid = true, >> + .expect = (CpuTopology) { 16, 2, 1, 4, 2, 16 }, >> + }, { >> + /* config: -smp 8,sockets=2,cores=4,threads=1 >> + * expect: cpus=8,sockets=2,dies=1,cores=4,threads=1,maxcpus=8 */ >> + .config = (SMPConfiguration) { T, 8, T, 2, F, 0, T, 4, T, 1, F, 0 }, >> + .should_be_valid = true, >> + .expect = (CpuTopology) { 8, 2, 1, 4, 1, 8 }, >> + }, { >> + /* config: -smp 8,sockets=2,cores=4,maxcpus=16 >> + * expect: cpus=8,sockets=2,dies=1,cores=4,threads=2,maxcpus=16 */ >> + .config = (SMPConfiguration) { T, 8, T, 2, F, 0, T, 4, F, 0, T, 16 }, >> + .should_be_valid = true, >> + .expect = (CpuTopology) { 8, 2, 1, 4, 2, 16 }, >> + }, { >> + /* config: -smp 8,sockets=2,threads=2,maxcpus=16 >> + * expect: cpus=8,sockets=2,dies=1,cores=4,threads=2,maxcpus=16 */ >> + .config = (SMPConfiguration) { T, 8, T, 2, F, 0, F, 0, T, 2, T, 16 }, >> + .should_be_valid = true, >> + .expect = (CpuTopology) { 8, 2, 1, 4, 2, 16 }, >> + }, { >> + /* config: -smp 8,cores=4,threads=2,maxcpus=16 >> + * expect: cpus=8,sockets=2,dies=1,cores=4,threads=2,maxcpus=16 */ >> + .config = (SMPConfiguration) { T, 8, F, 0, F, 0, T, 4, T, 2, T, 16 }, >> + .should_be_valid = true, >> + .expect = (CpuTopology) { 8, 2, 1, 4, 2, 16 }, >> + }, { >> + /* config: -smp sockets=2,cores=4,threads=2,maxcpus=16 >> + * expect: -smp 16,sockets=2,dies=1,cores=4,threads=2,maxcpus=16 */ >> + .config = (SMPConfiguration) { F, 0, T, 2, F, 0, T, 4, T, 2, T, 16 }, >> + .should_be_valid = true, >> + .expect = (CpuTopology) { 16, 2, 1, 4, 2, 16 }, >> + }, { >> + /* config: -smp 8,sockets=2,cores=4,threads=2,maxcpus=16 >> + * expect: cpus=8,sockets=2,dies=1,cores=4,threads=2,maxcpus=16 */ >> + .config = (SMPConfiguration) { T, 8, T, 2, F, 0, T, 4, T, 2, T, 16 }, >> + .should_be_valid = true, >> + .expect = (CpuTopology) { 8, 2, 1, 4, 2, 16 }, >> + }, { >> + /* config: -smp 8,sockets=2,dies=1,cores=4,threads=2,maxcpus=16 >> + * expect: cpus=8,sockets=2,dies=1,cores=4,threads=2,maxcpus=16 */ >> + .config = (SMPConfiguration) { T, 8, T, 2, T, 1, T, 4, T, 2, T, 16 }, >> + .should_be_valid = true, >> + .expect = (CpuTopology) { 8, 2, 1, 4, 2, 16 }, >> + }, { >> + /* config: -smp 0 >> + * expect: error, "anything=0" is not allowed */ >> + .config = (SMPConfiguration) { T, 0, F, 0, F, 0, F, 0, F, 0, F, 0 }, >> + .should_be_valid = false, >> + }, { >> + /* config: -smp 8,sockets=0 >> + * expect: error, "anything=0" is not allowed */ >> + .config = (SMPConfiguration) { T, 8, T, 0, F, 0, F, 0, F, 0, F, 0 }, >> + .should_be_valid = false, >> + }, { >> + /* config: -smp 8,sockets=2,dies=0 >> + * expect: error, "anything=0" is not allowed */ >> + .config = (SMPConfiguration) { T, 0, T, 2, T, 0, F, 0, F, 0, F, 0 }, >> + .should_be_valid = false, >> + }, { >> + /* config: -smp 8,sockets=2,dies=1,cores=0 >> + * expect: error, "anything=0" is not allowed */ >> + .config = (SMPConfiguration) { T, 8, T, 2, T, 1, T, 0, F, 0, F, 0 }, >> + .should_be_valid = false, >> + }, { >> + /* config: -smp 8,sockets=2,dies=1,cores=4,threads=0 >> + * expect: error, "anything=0" is not allowed */ >> + .config = (SMPConfiguration) { T, 8, T, 2, T, 1, T, 4, T, 0, F, 0 }, >> + .should_be_valid = false, >> + }, { >> + /* config: -smp 8,sockets=2,dies=1,cores=4,threads=2,maxcpus=0 >> + * expect: error, "anything=0" is not allowed */ >> + .config = (SMPConfiguration) { T, 8, T, 2, T, 1, T, 4, T, 2, T, 0 }, >> + .should_be_valid = false, >> + }, { >> + /* config: -smp 8,dies=2 >> + * expect: error, multi-dies not supported */ >> + .config = (SMPConfiguration) { T, 8, F, 0, T, 2, F, 0, F, 0, F, 0 }, >> + .should_be_valid = false, >> + }, { >> + /* config: -smp 8,sockets=2,cores=8 >> + * expect: error, sum (16) != max_cpus (8) */ >> + .config = (SMPConfiguration) { T, 8, T, 2, F, 0, T, 4, T, 2, F, 0 }, >> + .should_be_valid = false, >> + }, { >> + /* config: -smp 8,sockets=2,cores=5,threads=2,maxcpus=16 >> + * expect: error, sum (20) != max_cpus (16) */ >> + .config = (SMPConfiguration) { F, 0, T, 3, F, 0, T, 5, T, 1, T, 16 }, >> + .should_be_valid = false, >> + }, { >> + /* config: -smp 16,maxcpus=12 >> + * expect: error, sum (12) < smp_cpus (16) */ >> + .config = (SMPConfiguration) { T, 16, F, 0, F, 0, F, 0, F, 0, T, 12 }, >> + .should_be_valid = false, >> + }, >> +}; >> + >> +static struct SMPTestData prefer_sockets_support_dies[] = { >> + { >> + /* config: -smp dies=2 >> + * expect: cpus=2,sockets=1,dies=2,cores=1,threads=1,maxcpus=2 */ >> + .config = (SMPConfiguration) { F, 0, F, 0, T, 2, F, 0, F, 0, F, 0 }, >> + .should_be_valid = true, >> + .expect = (CpuTopology) { 2, 1, 2, 1, 1, 2 }, >> + }, { >> + /* config: -smp 16,dies=2 >> + * expect: cpus=16,sockets=8,dies=2,cores=1,threads=1,maxcpus=16 */ >> + .config = (SMPConfiguration) { T, 16, F, 0, T, 2, F, 0, F, 0, F, 0 }, >> + .should_be_valid = true, >> + .expect = (CpuTopology) { 16, 8, 2, 1, 1, 16 }, >> + }, { >> + /* config: -smp sockets=2,dies=2 >> + * expect: cpus=4,sockets=2,dies=2,cores=1,threads=1,maxcpus=4 */ >> + .config = (SMPConfiguration) { F, 0, T, 2, T, 2, F, 0, F, 0, F, 0 }, >> + .should_be_valid = true, >> + .expect = (CpuTopology) { 4, 2, 2, 1, 1, 4 }, >> + }, { >> + /* config: -smp dies=2,cores=4 >> + * expect: cpus=8,sockets=1,dies=2,cores=4,threads=1,maxcpus=8 */ >> + .config = (SMPConfiguration) { F, 0, F, 0, T, 2, T, 4, F, 0, F, 0 }, >> + .should_be_valid = true, >> + .expect = (CpuTopology) { 8, 1, 2, 4, 1, 8 }, >> + }, { >> + /* config: -smp dies=2,threads=2 >> + * expect: cpus=4,sockets=1,dies=2,cores=1,threads=2,maxcpus=4 */ >> + .config = (SMPConfiguration) { F, 0, F, 0, T, 2, F, 0, T, 2, F, 0 }, >> + .should_be_valid = true, >> + .expect = (CpuTopology) { 4, 1, 2, 1, 2, 4 }, >> + }, { >> + /* config: -smp dies=2,maxcpus=32 >> + * expect: cpus=32,sockets=16,dies=2,cores=1,threads=1,maxcpus=32 */ >> + .config = (SMPConfiguration) { F, 0, F, 0, T, 2, F, 0, F, 0, T, 32 }, >> + .should_be_valid = true, >> + .expect = (CpuTopology) { 32, 16, 2, 1, 1, 32 }, >> + }, { >> + /* config: -smp 16,sockets=2,dies=2 >> + * expect: cpus=16,sockets=2,dies=2,cores=4,threads=1,maxcpus=16 */ >> + .config = (SMPConfiguration) { T, 16, T, 2, T, 2, F, 0, F, 0, F, 0 }, >> + .should_be_valid = true, >> + .expect = (CpuTopology) { 16, 2, 2, 4, 1, 16 }, >> + }, { >> + /* config: -smp 16,dies=2,cores=4 >> + * expect: cpus=16,sockets=2,dies=2,cores=4,threads=1,maxcpus=16 */ >> + .config = (SMPConfiguration) { T, 16, F, 0, T, 2, T, 4, F, 0, F, 0 }, >> + .should_be_valid = true, >> + .expect = (CpuTopology) { 16, 2, 2, 4, 1, 16 }, >> + }, { >> + /* config: -smp 16,dies=2,threads=2 >> + * expect: cpus=16,sockets=4,dies=2,cores=1,threads=2,maxcpus=16 */ >> + .config = (SMPConfiguration) { T, 16, F, 0, T, 2, F, 0, T, 2, F, 0 }, >> + .should_be_valid = true, >> + .expect = (CpuTopology) { 16, 4, 2, 1, 2, 16 }, >> + }, { >> + /* config: -smp 16,dies=2,maxcpus=32 >> + * expect: cpus=16,sockets=16,dies=2,cores=1,threads=1,maxcpus=32 */ >> + .config = (SMPConfiguration) { T, 16, F, 0, T, 2, F, 0, F, 0, T, 32 }, >> + .should_be_valid = true, >> + .expect = (CpuTopology) { 16, 16, 2, 1, 1, 32 }, >> + }, { >> + /* config: -smp sockets=2,dies=2,cores=4 >> + * expect: cpus=16,sockets=2,dies=2,cores=4,threads=1,maxcpus=16 */ >> + .config = (SMPConfiguration) { F, 0, T, 2, T, 2, T, 4, F, 0, F, 0 }, >> + .should_be_valid = true, >> + .expect = (CpuTopology) { 16, 2, 2, 4, 1, 16 }, >> + }, { >> + /* config: -smp sockets=2,dies=2,threads=2 >> + * expect: cpus=8,sockets=2,dies=2,cores=1,threads=2,maxcpus=8 */ >> + .config = (SMPConfiguration) { F, 0, T, 2, T, 2, F, 0, T, 2, F, 0 }, >> + .should_be_valid = true, >> + .expect = (CpuTopology) { 8, 2, 2, 1, 2, 8 }, >> + }, { >> + /* config: -smp sockets=2,dies=2,maxcpus=32 >> + * expect: cpus=32,sockets=2,dies=2,cores=8,threads=1,maxcpus=32 */ >> + .config = (SMPConfiguration) { F, 0, T, 2, T, 2, F, 0, F, 0, T, 32 }, >> + .should_be_valid = true, >> + .expect = (CpuTopology) { 32, 2, 2, 8, 1, 32 }, >> + }, { >> + /* config: -smp dies=2,cores=4,threads=2 >> + * expect: cpus=16,sockets=1,dies=2,cores=4,threads=2,maxcpus=16 */ >> + .config = (SMPConfiguration) { F, 0, F, 0, T, 2, T, 4, T, 2, F, 0 }, >> + .should_be_valid = true, >> + .expect = (CpuTopology) { 16, 1, 2, 4, 2, 16 }, >> + }, { >> + /* config: -smp dies=2,cores=4,maxcpus=32 >> + * expect: cpus=32,sockets=4,dies=2,cores=4,threads=1,maxcpus=32 */ >> + .config = (SMPConfiguration) { F, 0, F, 0, T, 2, T, 4, F, 0, T, 32 }, >> + .should_be_valid = true, >> + .expect = (CpuTopology) { 32, 4, 2, 4, 1, 32 }, >> + }, { >> + /* config: -smp dies=2,threads=2,maxcpus=32 >> + * expect: cpus=32,sockets=8,dies=2,cores=1,threads=2,maxcpus=32 */ >> + .config = (SMPConfiguration) { F, 0, F, 0, T, 2, F, 0, T, 2, T, 32 }, >> + .should_be_valid = true, >> + .expect = (CpuTopology) { 32, 8, 2, 1, 2, 32 }, >> + }, { >> + /* config: -smp 16,sockets=2,dies=2,cores=4 >> + * expect: cpus=16,sockets=2,dies=2,cores=4,threads=1,maxcpus=16 */ >> + .config = (SMPConfiguration) { T, 16, T, 2, T, 2, T, 4, F, 0, F, 0 }, >> + .should_be_valid = true, >> + .expect = (CpuTopology) { 16, 2, 2, 4, 1, 16 }, >> + }, { >> + /* config: -smp 16,sockets=2,dies=2,threads=2 >> + * expect: cpus=16,sockets=2,dies=2,cores=2,threads=2,maxcpus=16 */ >> + .config = (SMPConfiguration) { T, 16, T, 2, T, 2, F, 0, T, 2, F, 0 }, >> + .should_be_valid = true, >> + .expect = (CpuTopology) { 16, 2, 2, 2, 2, 16 }, >> + }, { >> + /* config: -smp 16,sockets=2,dies=2,maxcpus=32 >> + * expect: cpus=16,sockets=2,dies=2,cores=8,threads=1,maxcpus=32 */ >> + .config = (SMPConfiguration) { T, 16, T, 2, T, 2, F, 0, F, 0, T, 32 }, >> + .should_be_valid = true, >> + .expect = (CpuTopology) { 16, 2, 2, 8, 1, 32 }, >> + }, { >> + /* config: -smp 16,dies=2,cores=4,threads=2 >> + * expect: cpus=16,sockets=1,dies=2,cores=4,threads=2,maxcpus=16 */ >> + .config = (SMPConfiguration) { T, 16, F, 0, T, 2, T, 4, T, 2, F, 0 }, >> + .should_be_valid = true, >> + .expect = (CpuTopology) { 16, 1, 2, 4, 2, 16 }, >> + }, { >> + /* config: -smp 16,dies=2,cores=4,maxcpus=32 >> + * expect: cpus=16,sockets=4,dies=2,cores=4,threads=1,maxcpus=32 */ >> + .config = (SMPConfiguration) { T, 16, F, 0, T, 2, T, 4, F, 0, T, 32 }, >> + .should_be_valid = true, >> + .expect = (CpuTopology) { 16, 4, 2, 4, 1, 32 }, >> + }, { >> + /* config: -smp 16,dies=2,threads=2,maxcpus=32 >> + * expect: cpus=16,sockets=8,dies=2,cores=1,threads=2,maxcpus=32 */ >> + .config = (SMPConfiguration) { T, 16, F, 0, T, 2, F, 0, T, 2, T, 32 }, >> + .should_be_valid = true, >> + .expect = (CpuTopology) { 16, 8, 2, 1, 2, 32 }, >> + }, { >> + /* config: -smp sockets=2,dies=2,cores=4,threads=2 >> + * expect: cpus=32,sockets=2,dies=2,cores=4,threads=2,maxcpus=32 */ >> + .config = (SMPConfiguration) { F, 0, T, 2, T, 2, T, 4, T, 2, F, 0 }, >> + .should_be_valid = true, >> + .expect = (CpuTopology) { 32, 2, 2, 4, 2, 32 }, >> + }, { >> + /* config: -smp sockets=2,dies=2,cores=4,maxcpus=32 >> + * expect: cpus=32,sockets=2,dies=2,cores=4,threads=2,maxcpus=32 */ >> + .config = (SMPConfiguration) { F, 0, T, 2, T, 2, T, 4, F, 0, T, 32 }, >> + .should_be_valid = true, >> + .expect = (CpuTopology) { 32, 2, 2, 4, 2, 32 }, >> + }, { >> + /* config: -smp sockets=2,dies=2,threads=2,maxcpus=32 >> + * expect: cpus=32,sockets=2,dies=2,cores=4,threads=2,maxcpus=32 */ >> + .config = (SMPConfiguration) { F, 0, T, 2, T, 2, F, 0, T, 2, T, 32 }, >> + .should_be_valid = true, >> + .expect = (CpuTopology) { 32, 2, 2, 4, 2, 32 }, >> + }, { >> + /* config: -smp dies=2,cores=4,threads=2,maxcpus=32 >> + * expect: cpus=32,sockets=2,dies=2,cores=4,threads=2,maxcpus=32 */ >> + .config = (SMPConfiguration) { F, 0, F, 0, T, 2, T, 4, T, 2, T, 32 }, >> + .should_be_valid = true, >> + .expect = (CpuTopology) { 32, 2, 2, 4, 2, 32 }, >> + }, { >> + /* config: -smp 16,sockets=2,dies=2,cores=4,threads=1 >> + * expect: cpus=16,sockets=2,dies=2,cores=4,threads=1,maxcpus=16 */ >> + .config = (SMPConfiguration) { T, 16, T, 2, T, 2, T, 4, T, 1, F, 0 }, >> + .should_be_valid = true, >> + .expect = (CpuTopology) { 16, 2, 2, 4, 1, 16 }, >> + }, { >> + /* config: -smp 16,sockets=2,dies=2,cores=4,maxcpus=32 >> + * expect: cpus=16,sockets=2,dies=2,cores=4,threads=2,maxcpus=32 */ >> + .config = (SMPConfiguration) { T, 16, T, 2, T, 2, T, 4, F, 0, T, 32 }, >> + .should_be_valid = true, >> + .expect = (CpuTopology) { 16, 2, 2, 4, 2, 32 }, >> + }, { >> + /* config: -smp 16,sockets=2,dies=2,threads=2,maxcpus=32 >> + * expect: cpus=16,sockets=2,dies=2,cores=4,threads=2,maxcpus=32 */ >> + .config = (SMPConfiguration) { T, 16, T, 2, T, 2, F, 0, T, 2, T, 32 }, >> + .should_be_valid = true, >> + .expect = (CpuTopology) { 16, 2, 2, 4, 2, 32 }, >> + }, { >> + /* config: -smp 16,dies=2,cores=4,threads=2,maxcpus=32 >> + * expect: cpus=16,sockets=2,dies=2,cores=4,threads=2,maxcpus=32 */ >> + .config = (SMPConfiguration) { T, 16, F, 0, T, 2, T, 4, T, 2, T, 32 }, >> + .should_be_valid = true, >> + .expect = (CpuTopology) { 16, 2, 2, 4, 2, 32 }, >> + }, { >> + /* config: -smp sockets=2,dies=2,cores=4,threads=2,maxcpus=32 >> + * expect: -smp 32,sockets=2,dies=2,cores=4,threads=2,maxcpus=32 */ >> + .config = (SMPConfiguration) { F, 0, T, 2, T, 2, T, 4, T, 2, T, 32 }, >> + .should_be_valid = true, >> + .expect = (CpuTopology) { 32, 2, 2, 4, 2, 32 }, >> + }, { >> + /* config: -smp 16,sockets=2,dies=2,cores=4,threads=2,maxcpus=32 >> + * expect: cpus=16,sockets=2,dies=2,cores=4,threads=2,maxcpus=32 */ >> + .config = (SMPConfiguration) { T, 16, T, 2, T, 2, T, 4, T, 2, T, 32 }, >> + .should_be_valid = true, >> + .expect = (CpuTopology) { 16, 2, 2, 4, 2, 32 }, >> + }, >> +}; >> + >> +/* >> + * prefer cores over sockets over threads since 6.2. >> + * all possible SMP configurations and the corressponding expected outputs >> + * are listed for testing, including the valid and invalid ones. >> + */ >> +static struct SMPTestData prefer_cores[] = { >> + { >> + /* config: no smp configuration >> + * expect: cpus=1,sockets=1,dies=1,cores=1,threads=1,maxcpus=1 */ >> + .config = (SMPConfiguration) { F, 0, F, 0, F, 0, F, 0, F, 0, F, 0 }, >> + .should_be_valid = true, >> + .expect = (CpuTopology) { 1, 1, 1, 1, 1, 1 }, >> + }, { >> + /* config: -smp 8 >> + * expect: cpus=8,sockets=1,dies=1,cores=8,threads=1,maxcpus=8 */ >> + .config = (SMPConfiguration) { T, 8, F, 0, F, 0, F, 0, F, 0, F, 0 }, >> + .should_be_valid = true, >> + .expect = (CpuTopology) { 8, 1, 1, 8, 1, 8 }, >> + }, { >> + /* config: -smp sockets=2 >> + * expect: cpus=2,sockets=2,dies=1,cores=1,threads=1,maxcpus=2 */ >> + .config = (SMPConfiguration) { F, 0, T, 2, F, 0, F, 0, F, 0, F, 0 }, >> + .should_be_valid = true, >> + .expect = (CpuTopology) { 2, 2, 1, 1, 1, 2 }, >> + }, { >> + /* config: -smp cores=4 >> + * expect: cpus=4,sockets=1,dies=1,cores=4,threads=1,maxcpus=4 */ >> + .config = (SMPConfiguration) { F, 0, F, 0, F, 0, T, 4, F, 0, F, 0 }, >> + .should_be_valid = true, >> + .expect = (CpuTopology) { 4, 1, 1, 4, 1, 4 }, >> + }, { >> + /* config: -smp threads=2 >> + * expect: cpus=2,sockets=1,dies=1,cores=1,threads=2,maxcpus=2 */ >> + .config = (SMPConfiguration) { F, 0, F, 0, F, 0, F, 0, T, 2, F, 0 }, >> + .should_be_valid = true, >> + .expect = (CpuTopology) { 2, 1, 1, 1, 2, 2 }, >> + }, { >> + /* config: -smp maxcpus=16 >> + * expect: cpus=16,sockets=1,dies=1,cores=16,threads=1,maxcpus=16 */ >> + .config = (SMPConfiguration) { F, 0, F, 0, F, 0, F, 0, F, 0, T, 16 }, >> + .should_be_valid = true, >> + .expect = (CpuTopology) { 16, 1, 1, 16, 1, 16 }, >> + }, { >> + /* config: -smp 8,sockets=2 >> + * expect: cpus=8,sockets=2,dies=1,cores=4,threads=1,maxcpus=8 */ >> + .config = (SMPConfiguration) { T, 8, T, 2, F, 0, F, 0, F, 0, F, 0 }, >> + .should_be_valid = true, >> + .expect = (CpuTopology) { 8, 2, 1, 4, 1, 8 }, >> + }, { >> + /* config: -smp 8,cores=4 >> + * expect: cpus=8,sockets=2,dies=1,cores=4,threads=1,maxcpus=8 */ >> + .config = (SMPConfiguration) { T, 8, F, 0, F, 0, T, 4, F, 0, F, 0 }, >> + .should_be_valid = true, >> + .expect = (CpuTopology) { 8, 2, 1, 4, 1, 8 }, >> + }, { >> + /* config: -smp 8,threads=2 >> + * expect: cpus=8,sockets=1,dies=1,cores=4,threads=2,maxcpus=8 */ >> + .config = (SMPConfiguration) { T, 8, F, 0, F, 0, F, 0, T, 2, F, 0 }, >> + .should_be_valid = true, >> + .expect = (CpuTopology) { 8, 1, 1, 4, 2, 8 }, >> + }, { >> + /* config: -smp 8,maxcpus=16 >> + * expect: cpus=8,sockets=1,dies=1,cores=16,threads=1,maxcpus=16 */ >> + .config = (SMPConfiguration) { T, 8, F, 0, F, 0, F, 0, F, 0, T, 16 }, >> + .should_be_valid = true, >> + .expect = (CpuTopology) { 8, 1, 1, 16, 1, 16 }, >> + }, { >> + /* config: -smp sockets=2,cores=4 >> + * expect: cpus=8,sockets=2,dies=1,cores=4,threads=1,maxcpus=8 */ >> + .config = (SMPConfiguration) { F, 0, T, 2, F, 0, T, 4, F, 0, F, 0 }, >> + .should_be_valid = true, >> + .expect = (CpuTopology) { 8, 2, 1, 4, 1, 8 }, >> + }, { >> + /* config: -smp sockets=2,threads=2 >> + * expect: cpus=4,sockets=2,dies=1,cores=1,threads=2,maxcpus=4 */ >> + .config = (SMPConfiguration) { F, 0, T, 2, F, 0, F, 0, T, 2, F, 0 }, >> + .should_be_valid = true, >> + .expect = (CpuTopology) { 4, 2, 1, 1, 2, 4 }, >> + }, { >> + /* config: -smp sockets=2,maxcpus=16 >> + * expect: cpus=16,sockets=2,dies=1,cores=8,threads=1,maxcpus=16 */ >> + .config = (SMPConfiguration) { F, 0, T, 2, F, 0, F, 0, F, 0, T, 16 }, >> + .should_be_valid = true, >> + .expect = (CpuTopology) { 16, 2, 1, 8, 1, 16 }, >> + }, { >> + /* config: -smp cores=4,threads=2 >> + * expect: cpus=8,sockets=1,dies=1,cores=4,threads=2,maxcpus=8 */ >> + .config = (SMPConfiguration) { F, 0, F, 0, F, 0, T, 4, T, 2, F, 0 }, >> + .should_be_valid = true, >> + .expect = (CpuTopology) { 8, 1, 1, 4, 2, 8 }, >> + }, { >> + /* config: -smp cores=4,maxcpus=16 >> + * expect: cpus=16,sockets=4,dies=1,cores=4,threads=1,maxcpus=16 */ >> + .config = (SMPConfiguration) { F, 0, F, 0, F, 0, T, 4, F, 0, T, 16 }, >> + .should_be_valid = true, >> + .expect = (CpuTopology) { 16, 4, 1, 4, 1, 16 }, >> + }, { >> + /* config: -smp threads=2,maxcpus=16 >> + * expect: cpus=16,sockets=1,dies=1,cores=8,threads=2,maxcpus=16 */ >> + .config = (SMPConfiguration) { F, 0, F, 0, F, 0, F, 0, T, 2, T, 16 }, >> + .should_be_valid = true, >> + .expect = (CpuTopology) { 16, 1, 1, 8, 2, 16 }, >> + }, { >> + /* config: -smp 8,sockets=2,cores=4 >> + * expect: cpus=8,sockets=2,dies=1,cores=4,threads=1,maxcpus=8 */ >> + .config = (SMPConfiguration) { T, 8, T, 2, F, 0, T, 4, F, 0, F, 0 }, >> + .should_be_valid = true, >> + .expect = (CpuTopology) { 8, 2, 1, 4, 1, 8 }, >> + }, { >> + /* config: -smp 8,sockets=2,threads=2 >> + * expect: cpus=8,sockets=2,dies=1,cores=2,threads=2,maxcpus=8 */ >> + .config = (SMPConfiguration) { T, 8, T, 2, F, 0, F, 0, T, 2, F, 0 }, >> + .should_be_valid = true, >> + .expect = (CpuTopology) { 8, 2, 1, 2, 2, 8 }, >> + }, { >> + /* config: -smp 8,sockets=2,maxcpus=16 >> + * expect: cpus=8,sockets=2,dies=1,cores=8,threads=1,maxcpus=16 */ >> + .config = (SMPConfiguration) { T, 8, T, 2, F, 0, F, 0, F, 0, T, 16 }, >> + .should_be_valid = true, >> + .expect = (CpuTopology) { 8, 2, 1, 8, 1, 16 }, >> + }, { >> + /* config: -smp 8,cores=4,threads=2 >> + * expect: cpus=8,sockets=1,dies=1,cores=4,threads=2,maxcpus=8 */ >> + .config = (SMPConfiguration) { T, 8, F, 0, F, 0, T, 4, T, 2, F, 0 }, >> + .should_be_valid = true, >> + .expect = (CpuTopology) { 8, 1, 1, 4, 2, 8 }, >> + }, { >> + /* config: -smp 8,cores=4,maxcpus=16 >> + * expect: cpus=8,sockets=4,dies=1,cores=4,threads=1,maxcpus=16 */ >> + .config = (SMPConfiguration) { T, 8, F, 0, F, 0, T, 4, F, 0, T, 16 }, >> + .should_be_valid = true, >> + .expect = (CpuTopology) { 8, 4, 1, 4, 1, 16 }, >> + }, { >> + /* config: -smp 8,threads=2,maxcpus=16 >> + * expect: cpus=8,sockets=1,dies=1,cores=8,threads=2,maxcpus=16 */ >> + .config = (SMPConfiguration) { T, 8, F, 0, F, 0, F, 0, T, 2, T, 16 }, >> + .should_be_valid = true, >> + .expect = (CpuTopology) { 8, 1, 1, 8, 2, 16 }, >> + }, { >> + /* config: -smp sockets=2,cores=4,threads=2 >> + * expect: cpus=16,sockets=2,dies=1,cores=4,threads=2,maxcpus=16 */ >> + .config = (SMPConfiguration) { F, 0, T, 2, F, 0, T, 4, T, 2, F, 0 }, >> + .should_be_valid = true, >> + .expect = (CpuTopology) { 16, 2, 1, 4, 2, 16 }, >> + }, { >> + /* config: -smp sockets=2,cores=4,maxcpus=16 >> + * expect: cpus=16,sockets=2,dies=1,cores=4,threads=2,maxcpus=16 */ >> + .config = (SMPConfiguration) { F, 0, T, 2, F, 0, T, 4, F, 0, T, 16 }, >> + .should_be_valid = true, >> + .expect = (CpuTopology) { 16, 2, 1, 4, 2, 16 }, >> + }, { >> + /* config: -smp sockets=2,threads=2,maxcpus=16 >> + * expect: cpus=16,sockets=2,dies=1,cores=4,threads=2,maxcpus=16 */ >> + .config = (SMPConfiguration) { F, 0, T, 2, F, 0, F, 0, T, 2, T, 16 }, >> + .should_be_valid = true, >> + .expect = (CpuTopology) { 16, 2, 1, 4, 2, 16 }, >> + }, { >> + /* config: -smp cores=4,threads=2,maxcpus=16 >> + * expect: cpus=16,sockets=2,dies=1,cores=4,threads=2,maxcpus=16 */ >> + .config = (SMPConfiguration) { F, 0, F, 0, F, 0, T, 4, T, 2, T, 16 }, >> + .should_be_valid = true, >> + .expect = (CpuTopology) { 16, 2, 1, 4, 2, 16 }, >> + }, { >> + /* config: -smp 8,sockets=2,cores=4,threads=1 >> + * expect: cpus=8,sockets=2,dies=1,cores=4,threads=1,maxcpus=8 */ >> + .config = (SMPConfiguration) { T, 8, T, 2, F, 0, T, 4, T, 1, F, 0 }, >> + .should_be_valid = true, >> + .expect = (CpuTopology) { 8, 2, 1, 4, 1, 8 }, >> + }, { >> + /* config: -smp 8,sockets=2,cores=4,maxcpus=16 >> + * expect: cpus=8,sockets=2,dies=1,cores=4,threads=2,maxcpus=16 */ >> + .config = (SMPConfiguration) { T, 8, T, 2, F, 0, T, 4, F, 0, T, 16 }, >> + .should_be_valid = true, >> + .expect = (CpuTopology) { 8, 2, 1, 4, 2, 16 }, >> + }, { >> + /* config: -smp 8,sockets=2,threads=2,maxcpus=16 >> + * expect: cpus=8,sockets=2,dies=1,cores=4,threads=2,maxcpus=16 */ >> + .config = (SMPConfiguration) { T, 8, T, 2, F, 0, F, 0, T, 2, T, 16 }, >> + .should_be_valid = true, >> + .expect = (CpuTopology) { 8, 2, 1, 4, 2, 16 }, >> + }, { >> + /* config: -smp 8,cores=4,threads=2,maxcpus=16 >> + * expect: cpus=8,sockets=2,dies=1,cores=4,threads=2,maxcpus=16 */ >> + .config = (SMPConfiguration) { T, 8, F, 0, F, 0, T, 4, T, 2, T, 16 }, >> + .should_be_valid = true, >> + .expect = (CpuTopology) { 8, 2, 1, 4, 2, 16 }, >> + }, { >> + /* config: -smp sockets=2,cores=4,threads=2,maxcpus=16 >> + * expect: -smp 16,sockets=2,dies=1,cores=4,threads=2,maxcpus=16 */ >> + .config = (SMPConfiguration) { F, 0, T, 2, F, 0, T, 4, T, 2, T, 16 }, >> + .should_be_valid = true, >> + .expect = (CpuTopology) { 16, 2, 1, 4, 2, 16 }, >> + }, { >> + /* config: -smp 8,sockets=2,cores=4,threads=2,maxcpus=16 >> + * expect: cpus=8,sockets=2,dies=1,cores=4,threads=2,maxcpus=16 */ >> + .config = (SMPConfiguration) { T, 8, T, 2, F, 0, T, 4, T, 2, T, 16 }, >> + .should_be_valid = true, >> + .expect = (CpuTopology) { 8, 2, 1, 4, 2, 16 }, >> + }, { >> + /* config: -smp 8,sockets=2,dies=1,cores=4,threads=2,maxcpus=16 >> + * expect: cpus=8,sockets=2,dies=1,cores=4,threads=2,maxcpus=16 */ >> + .config = (SMPConfiguration) { T, 8, T, 2, T, 1, T, 4, T, 2, T, 16 }, >> + .should_be_valid = true, >> + .expect = (CpuTopology) { 8, 2, 1, 4, 2, 16 }, >> + }, { >> + /* config: -smp 0 >> + * expect: error, "anything=0" is not allowed */ >> + .config = (SMPConfiguration) { T, 0, F, 0, F, 0, F, 0, F, 0, F, 0 }, >> + .should_be_valid = false, >> + }, { >> + /* config: -smp 8,sockets=0 >> + * expect: error, "anything=0" is not allowed */ >> + .config = (SMPConfiguration) { T, 8, T, 0, F, 0, F, 0, F, 0, F, 0 }, >> + .should_be_valid = false, >> + }, { >> + /* config: -smp 8,sockets=2,dies=0 >> + * expect: error, "anything=0" is not allowed */ >> + .config = (SMPConfiguration) { T, 0, T, 2, T, 0, F, 0, F, 0, F, 0 }, >> + .should_be_valid = false, >> + }, { >> + /* config: -smp 8,sockets=2,dies=1,cores=0 >> + * expect: error, "anything=0" is not allowed */ >> + .config = (SMPConfiguration) { T, 8, T, 2, T, 1, T, 0, F, 0, F, 0 }, >> + .should_be_valid = false, >> + }, { >> + /* config: -smp 8,sockets=2,dies=1,cores=4,threads=0 >> + * expect: error, "anything=0" is not allowed */ >> + .config = (SMPConfiguration) { T, 8, T, 2, T, 1, T, 4, T, 0, F, 0 }, >> + .should_be_valid = false, >> + }, { >> + /* config: -smp 8,sockets=2,dies=1,cores=4,threads=2,maxcpus=0 >> + * expect: error, "anything=0" is not allowed */ >> + .config = (SMPConfiguration) { T, 8, T, 2, T, 1, T, 4, T, 2, T, 0 }, >> + .should_be_valid = false, >> + }, { >> + /* config: -smp 8,dies=2 >> + * expect: error, multi-dies not supported */ >> + .config = (SMPConfiguration) { T, 8, F, 0, T, 2, F, 0, F, 0, F, 0 }, >> + .should_be_valid = false, >> + }, { >> + /* config: -smp 8,sockets=2,cores=8 >> + * expect: error, sum (16) != max_cpus (8) */ >> + .config = (SMPConfiguration) { T, 8, T, 2, F, 0, T, 4, T, 2, F, 0 }, >> + .should_be_valid = false, >> + }, { >> + /* config: -smp 8,sockets=2,cores=5,threads=2,maxcpus=16 >> + * expect: error, sum (20) != max_cpus (16) */ >> + .config = (SMPConfiguration) { F, 0, T, 3, F, 0, T, 5, T, 1, T, 16 }, >> + .should_be_valid = false, >> + }, { >> + /* config: -smp 16,maxcpus=12 >> + * expect: error, sum (12) < smp_cpus (16) */ >> + .config = (SMPConfiguration) { T, 16, F, 0, F, 0, F, 0, F, 0, T, 12 }, >> + .should_be_valid = false, >> + }, >> +}; >> + >> +static struct SMPTestData prefer_cores_support_dies[] = { >> + { >> + /* config: -smp dies=2 >> + * expect: cpus=2,sockets=1,dies=2,cores=1,threads=1,maxcpus=2 */ >> + .config = (SMPConfiguration) { F, 0, F, 0, T, 2, F, 0, F, 0, F, 0 }, >> + .should_be_valid = true, >> + .expect = (CpuTopology) { 2, 1, 2, 1, 1, 2 }, >> + }, { >> + /* config: -smp 16,dies=2 >> + * expect: cpus=16,sockets=1,dies=2,cores=8,threads=1,maxcpus=16 */ >> + .config = (SMPConfiguration) { T, 16, F, 0, T, 2, F, 0, F, 0, F, 0 }, >> + .should_be_valid = true, >> + .expect = (CpuTopology) { 16, 1, 2, 8, 1, 16 }, >> + }, { >> + /* config: -smp sockets=2,dies=2 >> + * expect: cpus=4,sockets=2,dies=2,cores=1,threads=1,maxcpus=4 */ >> + .config = (SMPConfiguration) { F, 0, T, 2, T, 2, F, 0, F, 0, F, 0 }, >> + .should_be_valid = true, >> + .expect = (CpuTopology) { 4, 2, 2, 1, 1, 4 }, >> + }, { >> + /* config: -smp dies=2,cores=4 >> + * expect: cpus=8,sockets=1,dies=2,cores=4,threads=1,maxcpus=8 */ >> + .config = (SMPConfiguration) { F, 0, F, 0, T, 2, T, 4, F, 0, F, 0 }, >> + .should_be_valid = true, >> + .expect = (CpuTopology) { 8, 1, 2, 4, 1, 8 }, >> + }, { >> + /* config: -smp dies=2,threads=2 >> + * expect: cpus=4,sockets=1,dies=2,cores=1,threads=2,maxcpus=4 */ >> + .config = (SMPConfiguration) { F, 0, F, 0, T, 2, F, 0, T, 2, F, 0 }, >> + .should_be_valid = true, >> + .expect = (CpuTopology) { 4, 1, 2, 1, 2, 4 }, >> + }, { >> + /* config: -smp dies=2,maxcpus=32 >> + * expect: cpus=32,sockets=1,dies=2,cores=16,threads=1,maxcpus=32 */ >> + .config = (SMPConfiguration) { F, 0, F, 0, T, 2, F, 0, F, 0, T, 32 }, >> + .should_be_valid = true, >> + .expect = (CpuTopology) { 32, 1, 2, 16, 1, 32 }, >> + }, { >> + /* config: -smp 16,sockets=2,dies=2 >> + * expect: cpus=16,sockets=2,dies=2,cores=4,threads=1,maxcpus=16 */ >> + .config = (SMPConfiguration) { T, 16, T, 2, T, 2, F, 0, F, 0, F, 0 }, >> + .should_be_valid = true, >> + .expect = (CpuTopology) { 16, 2, 2, 4, 1, 16 }, >> + }, { >> + /* config: -smp 16,dies=2,cores=4 >> + * expect: cpus=16,sockets=2,dies=2,cores=4,threads=1,maxcpus=16 */ >> + .config = (SMPConfiguration) { T, 16, F, 0, T, 2, T, 4, F, 0, F, 0 }, >> + .should_be_valid = true, >> + .expect = (CpuTopology) { 16, 2, 2, 4, 1, 16 }, >> + }, { >> + /* config: -smp 16,dies=2,threads=2 >> + * expect: cpus=16,sockets=1,dies=2,cores=4,threads=2,maxcpus=16 */ >> + .config = (SMPConfiguration) { T, 16, F, 0, T, 2, F, 0, T, 2, F, 0 }, >> + .should_be_valid = true, >> + .expect = (CpuTopology) { 16, 1, 2, 4, 2, 16 }, >> + }, { >> + /* config: -smp 16,dies=2,maxcpus=32 >> + * expect: cpus=16,sockets=1,dies=2,cores=16,threads=1,maxcpus=32 */ >> + .config = (SMPConfiguration) { T, 16, F, 0, T, 2, F, 0, F, 0, T, 32 }, >> + .should_be_valid = true, >> + .expect = (CpuTopology) { 16, 1, 2, 16, 1, 32 }, >> + }, { >> + /* config: -smp sockets=2,dies=2,cores=4 >> + * expect: cpus=16,sockets=2,dies=2,cores=4,threads=1,maxcpus=16 */ >> + .config = (SMPConfiguration) { F, 0, T, 2, T, 2, T, 4, F, 0, F, 0 }, >> + .should_be_valid = true, >> + .expect = (CpuTopology) { 16, 2, 2, 4, 1, 16 }, >> + }, { >> + /* config: -smp sockets=2,dies=2,threads=2 >> + * expect: cpus=8,sockets=2,dies=2,cores=1,threads=2,maxcpus=8 */ >> + .config = (SMPConfiguration) { F, 0, T, 2, T, 2, F, 0, T, 2, F, 0 }, >> + .should_be_valid = true, >> + .expect = (CpuTopology) { 8, 2, 2, 1, 2, 8 }, >> + }, { >> + /* config: -smp sockets=2,dies=2,maxcpus=32 >> + * expect: cpus=32,sockets=2,dies=2,cores=8,threads=1,maxcpus=32 */ >> + .config = (SMPConfiguration) { F, 0, T, 2, T, 2, F, 0, F, 0, T, 32 }, >> + .should_be_valid = true, >> + .expect = (CpuTopology) { 32, 2, 2, 8, 1, 32 }, >> + }, { >> + /* config: -smp dies=2,cores=4,threads=2 >> + * expect: cpus=16,sockets=1,dies=2,cores=4,threads=2,maxcpus=16 */ >> + .config = (SMPConfiguration) { F, 0, F, 0, T, 2, T, 4, T, 2, F, 0 }, >> + .should_be_valid = true, >> + .expect = (CpuTopology) { 16, 1, 2, 4, 2, 16 }, >> + }, { >> + /* config: -smp dies=2,cores=4,maxcpus=32 >> + * expect: cpus=32,sockets=4,dies=2,cores=4,threads=1,maxcpus=32 */ >> + .config = (SMPConfiguration) { F, 0, F, 0, T, 2, T, 4, F, 0, T, 32 }, >> + .should_be_valid = true, >> + .expect = (CpuTopology) { 32, 4, 2, 4, 1, 32 }, >> + }, { >> + /* config: -smp dies=2,threads=2,maxcpus=32 >> + * expect: cpus=32,sockets=1,dies=2,cores=8,threads=2,maxcpus=32 */ >> + .config = (SMPConfiguration) { F, 0, F, 0, T, 2, F, 0, T, 2, T, 32 }, >> + .should_be_valid = true, >> + .expect = (CpuTopology) { 32, 1, 2, 8, 2, 32 }, >> + }, { >> + /* config: -smp 16,sockets=2,dies=2,cores=4 >> + * expect: cpus=16,sockets=2,dies=2,cores=4,threads=1,maxcpus=16 */ >> + .config = (SMPConfiguration) { T, 16, T, 2, T, 2, T, 4, F, 0, F, 0 }, >> + .should_be_valid = true, >> + .expect = (CpuTopology) { 16, 2, 2, 4, 1, 16 }, >> + }, { >> + /* config: -smp 16,sockets=2,dies=2,threads=2 >> + * expect: cpus=16,sockets=2,dies=2,cores=2,threads=2,maxcpus=16 */ >> + .config = (SMPConfiguration) { T, 16, T, 2, T, 2, F, 0, T, 2, F, 0 }, >> + .should_be_valid = true, >> + .expect = (CpuTopology) { 16, 2, 2, 2, 2, 16 }, >> + }, { >> + /* config: -smp 16,sockets=2,dies=2,maxcpus=32 >> + * expect: cpus=16,sockets=2,dies=2,cores=8,threads=1,maxcpus=32 */ >> + .config = (SMPConfiguration) { T, 16, T, 2, T, 2, F, 0, F, 0, T, 32 }, >> + .should_be_valid = true, >> + .expect = (CpuTopology) { 16, 2, 2, 8, 1, 32 }, >> + }, { >> + /* config: -smp 16,dies=2,cores=4,threads=2 >> + * expect: cpus=16,sockets=1,dies=2,cores=4,threads=2,maxcpus=16 */ >> + .config = (SMPConfiguration) { T, 16, F, 0, T, 2, T, 4, T, 2, F, 0 }, >> + .should_be_valid = true, >> + .expect = (CpuTopology) { 16, 1, 2, 4, 2, 16 }, >> + }, { >> + /* config: -smp 16,dies=2,cores=4,maxcpus=32 >> + * expect: cpus=16,sockets=4,dies=2,cores=4,threads=1,maxcpus=32 */ >> + .config = (SMPConfiguration) { T, 16, F, 0, T, 2, T, 4, F, 0, T, 32 }, >> + .should_be_valid = true, >> + .expect = (CpuTopology) { 16, 4, 2, 4, 1, 32 }, >> + }, { >> + /* config: -smp 16,dies=2,threads=2,maxcpus=32 >> + * expect: cpus=16,sockets=1,dies=2,cores=8,threads=2,maxcpus=32 */ >> + .config = (SMPConfiguration) { T, 16, F, 0, T, 2, F, 0, T, 2, T, 32 }, >> + .should_be_valid = true, >> + .expect = (CpuTopology) { 16, 1, 2, 8, 2, 32 }, >> + }, { >> + /* config: -smp sockets=2,dies=2,cores=4,threads=2 >> + * expect: cpus=32,sockets=2,dies=2,cores=4,threads=2,maxcpus=32 */ >> + .config = (SMPConfiguration) { F, 0, T, 2, T, 2, T, 4, T, 2, F, 0 }, >> + .should_be_valid = true, >> + .expect = (CpuTopology) { 32, 2, 2, 4, 2, 32 }, >> + }, { >> + /* config: -smp sockets=2,dies=2,cores=4,maxcpus=32 >> + * expect: cpus=32,sockets=2,dies=2,cores=4,threads=2,maxcpus=32 */ >> + .config = (SMPConfiguration) { F, 0, T, 2, T, 2, T, 4, F, 0, T, 32 }, >> + .should_be_valid = true, >> + .expect = (CpuTopology) { 32, 2, 2, 4, 2, 32 }, >> + }, { >> + /* config: -smp sockets=2,dies=2,threads=2,maxcpus=32 >> + * expect: cpus=32,sockets=2,dies=2,cores=4,threads=2,maxcpus=32 */ >> + .config = (SMPConfiguration) { F, 0, T, 2, T, 2, F, 0, T, 2, T, 32 }, >> + .should_be_valid = true, >> + .expect = (CpuTopology) { 32, 2, 2, 4, 2, 32 }, >> + }, { >> + /* config: -smp dies=2,cores=4,threads=2,maxcpus=32 >> + * expect: cpus=32,sockets=2,dies=2,cores=4,threads=2,maxcpus=32 */ >> + .config = (SMPConfiguration) { F, 0, F, 0, T, 2, T, 4, T, 2, T, 32 }, >> + .should_be_valid = true, >> + .expect = (CpuTopology) { 32, 2, 2, 4, 2, 32 }, >> + }, { >> + /* config: -smp 16,sockets=2,dies=2,cores=4,threads=1 >> + * expect: cpus=16,sockets=2,dies=2,cores=4,threads=1,maxcpus=16 */ >> + .config = (SMPConfiguration) { T, 16, T, 2, T, 2, T, 4, T, 1, F, 0 }, >> + .should_be_valid = true, >> + .expect = (CpuTopology) { 16, 2, 2, 4, 1, 16 }, >> + }, { >> + /* config: -smp 16,sockets=2,dies=2,cores=4,maxcpus=32 >> + * expect: cpus=16,sockets=2,dies=2,cores=4,threads=2,maxcpus=32 */ >> + .config = (SMPConfiguration) { T, 16, T, 2, T, 2, T, 4, F, 0, T, 32 }, >> + .should_be_valid = true, >> + .expect = (CpuTopology) { 16, 2, 2, 4, 2, 32 }, >> + }, { >> + /* config: -smp 16,sockets=2,dies=2,threads=2,maxcpus=32 >> + * expect: cpus=16,sockets=2,dies=2,cores=4,threads=2,maxcpus=32 */ >> + .config = (SMPConfiguration) { T, 16, T, 2, T, 2, F, 0, T, 2, T, 32 }, >> + .should_be_valid = true, >> + .expect = (CpuTopology) { 16, 2, 2, 4, 2, 32 }, >> + }, { >> + /* config: -smp 16,dies=2,cores=4,threads=2,maxcpus=32 >> + * expect: cpus=16,sockets=2,dies=2,cores=4,threads=2,maxcpus=32 */ >> + .config = (SMPConfiguration) { T, 16, F, 0, T, 2, T, 4, T, 2, T, 32 }, >> + .should_be_valid = true, >> + .expect = (CpuTopology) { 16, 2, 2, 4, 2, 32 }, >> + }, { >> + /* config: -smp sockets=2,dies=2,cores=4,threads=2,maxcpus=32 >> + * expect: -smp 32,sockets=2,dies=2,cores=4,threads=2,maxcpus=32 */ >> + .config = (SMPConfiguration) { F, 0, T, 2, T, 2, T, 4, T, 2, T, 32 }, >> + .should_be_valid = true, >> + .expect = (CpuTopology) { 32, 2, 2, 4, 2, 32 }, >> + }, { >> + /* config: -smp 16,sockets=2,dies=2,cores=4,threads=2,maxcpus=32 >> + * expect: cpus=16,sockets=2,dies=2,cores=4,threads=2,maxcpus=32 */ >> + .config = (SMPConfiguration) { T, 16, T, 2, T, 2, T, 4, T, 2, T, 32 }, >> + .should_be_valid = true, >> + .expect = (CpuTopology) { 16, 2, 2, 4, 2, 32 }, >> + }, >> +}; >> + >> +static char *get_config_info(SMPConfiguration *config) >> +{ >> + return g_strdup_printf( >> + "(SMPConfiguration) {\n" >> + " .has_cpus = %5s, cpus = %ld,\n" >> + " .has_sockets = %5s, sockets = %ld,\n" >> + " .has_dies = %5s, dies = %ld,\n" >> + " .has_cores = %5s, cores = %ld,\n" >> + " .has_threads = %5s, threads = %ld,\n" >> + " .has_maxcpus = %5s, maxcpus = %ld,\n" >> + "}", >> + config->has_cpus ? "true" : "false", config->cpus, >> + config->has_sockets ? "true" : "false", config->sockets, >> + config->has_dies ? "true" : "false", config->dies, >> + config->has_cores ? "true" : "false", config->cores, >> + config->has_threads ? "true" : "false", config->threads, >> + config->has_maxcpus ? "true" : "false", config->maxcpus); >> +} >> + >> +static char *get_topo_info(CpuTopology *topo) >> +{ >> + return g_strdup_printf( >> + "(CpuTopology) {\n" >> + " .cpus = %u,\n" >> + " .sockets = %u,\n" >> + " .dies = %u,\n" >> + " .cores = %u,\n" >> + " .threads = %u,\n" >> + " .max_cpus = %u,\n" >> + "}", >> + topo->cpus, topo->sockets, topo->dies, >> + topo->cores, topo->threads, topo->max_cpus); >> +} >> + >> +static void check_smp_parse(MachineState *ms, SMPTestData *data) >> +{ >> + SMPConfiguration *config = &data->config; >> + CpuTopology *expect = &data->expect; >> + g_autofree char *config_info = NULL; >> + g_autofree char *expect_info = NULL; >> + g_autofree char *result_info = NULL; >> + Error *err = NULL; >> + >> + /* call the generic parser smp_parse() in hw/core/machine-smp.c */ >> + smp_parse(ms, config, &err); >> + >> + if (data->should_be_valid) { >> + if ((err == NULL) && >> + (ms->smp.cpus == expect->cpus) && >> + (ms->smp.sockets == expect->sockets) && >> + (ms->smp.dies == expect->dies) && >> + (ms->smp.cores == expect->cores) && >> + (ms->smp.threads == expect->threads) && >> + (ms->smp.max_cpus == expect->max_cpus)) { >> + return; >> + } >> + >> + config_info = get_config_info(config); >> + expect_info = get_topo_info(expect); >> + >> + if (err != NULL) { >> + g_printerr("Check smp_parse failed:\n" >> + "config: %s\n" >> + "expect: %s\n" >> + "should_be_valid: yes\n\n" >> + "result_is_valid: no\n" >> + "error_msg: %s\n", >> + config_info, expect_info, error_get_pretty(err)); >> + error_free(err); >> + } else { >> + result_info = get_topo_info(&ms->smp); >> + g_printerr("Check smp_parse failed:\n" >> + "config: %s\n" >> + "expect: %s\n" >> + "should_be_valid: yes\n\n" >> + "result_is_valid: yes\n" >> + "result: %s\n", >> + config_info, expect_info, result_info); >> + } >> + } else { >> + if (err != NULL) { >> + error_free(err); >> + return; >> + } >> + >> + config_info = get_config_info(config); >> + result_info = get_topo_info(&ms->smp); >> + >> + g_printerr("Check smp_parse failed:\n" >> + "config: %s\n" >> + "should_be_valid: no\n\n" >> + "result_is_valid: yes\n" >> + "result: %s\n", >> + config_info, result_info); >> + } >> + >> + abort(); >> +} >> + >> +static void smp_prefer_sockets_test(void) >> +{ >> + Object *obj = object_new(TYPE_MACHINE); >> + MachineState *ms = MACHINE(obj); >> + MachineClass *mc = MACHINE_GET_CLASS(obj); >> + int i; >> + >> + /* make sure that we have created the object */ >> + g_assert_nonnull(ms); >> + g_assert_nonnull(mc); >> + >> + mc->smp_prefer_sockets = true; >> + >> + /* test cases when multi-dies are not supported */ >> + mc->smp_dies_supported = false; >> + for (i = 0; i < ARRAY_SIZE(prefer_sockets); i++) { >> + check_smp_parse(ms, &prefer_sockets[i]); >> + } >> + >> + /* test cases when multi-dies are supported */ >> + mc->smp_dies_supported = true; >> + for (i = 0; i < ARRAY_SIZE(prefer_sockets_support_dies); i++) { >> + check_smp_parse(ms, &prefer_sockets_support_dies[i]); >> + } >> + >> + object_unref(obj); >> +} >> + >> +static void smp_prefer_cores_test(void) >> +{ >> + Object *obj = object_new(TYPE_MACHINE); >> + MachineState *ms = MACHINE(obj); >> + MachineClass *mc = MACHINE_GET_CLASS(obj); >> + int i; >> + >> + /* make sure that we have created the object */ >> + g_assert_nonnull(ms); >> + g_assert_nonnull(mc); >> + >> + mc->smp_prefer_sockets = false; >> + >> + /* test cases when multi-dies are not supported */ >> + mc->smp_dies_supported = false; >> + for (i = 0; i < ARRAY_SIZE(prefer_cores); i++) { >> + check_smp_parse(ms, &prefer_cores[i]); >> + } >> + >> + /* test cases when multi-dies are supported */ >> + mc->smp_dies_supported = true; >> + for (i = 0; i < ARRAY_SIZE(prefer_cores_support_dies); i++) { >> + check_smp_parse(ms, &prefer_cores_support_dies[i]); >> + } >> + >> + object_unref(obj); >> +} >> + >> +int main(int argc, char *argv[]) >> +{ >> + g_test_init(&argc, &argv, NULL); >> + >> + module_call_init(MODULE_INIT_QOM); >> + type_register_static(&smp_machine_info); >> + >> + g_test_add_func("/test-smp-parse/prefer_sockets", smp_prefer_sockets_test); >> + g_test_add_func("/test-smp-parse/prefer_cores", smp_prefer_cores_test); >> + >> + g_test_run(); >> + >> + return 0; >> +} >> -- >> 2.19.1 >> > Besides the nits, it looks good to me. > > Reviewed-by: Andrew Jones > Thanks, Yanan . > .