mirrors/qemu
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

tests/unit/test-smp-parse: Test "modules" and "dies" combination case

Browse Source 
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 <zhao1.liu@intel.com>
Tested-by: Yongwei Ma <yongwei.ma@intel.com>
Message-ID: <20240529061925.350323-8-zhao1.liu@intel.com>
Signed-off-by: Thomas Huth <thuth@redhat.com>
This commit is contained in:
Zhao Liu 2024-05-29 14:19:24 +08:00 committed by Thomas Huth
parent a05ed35854
commit fe4b99525a
1 changed files with 103 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

103
tests/unit/test-smp-parse.c
View File

@ -445,6 +445,33 @@ static const struct SMPTestData data_with_dies_invalid[] = {
},
};
static const struct SMPTestData data_with_modules_dies_invalid[] = {
{
/*
* config: -smp 200,sockets=3,dies=5,modules=2,cores=4,\
* threads=2,maxcpus=200
*/
.config = SMP_CONFIG_WITH_MODS_DIES(T, 200, T, 3, T, 5, T,
2, T, 4, T, 2, T, 200),
.expect_error = "Invalid CPU topology: "
"product of the hierarchy must match maxcpus: "
"sockets (3) * dies (5) * modules (2) * "
"cores (4) * threads (2) != maxcpus (200)",
}, {
/*
* config: -smp 242,sockets=3,dies=5,modules=2,cores=4,\
* threads=2,maxcpus=240
*/
.config = SMP_CONFIG_WITH_MODS_DIES(T, 242, T, 3, T, 5, T,
2, T, 4, T, 2, T, 240),
.expect_error = "Invalid CPU topology: "
"maxcpus must be equal to or greater than smp: "
"sockets (3) * dies (5) * modules (2) * "
"cores (4) * threads (2) "
"== maxcpus (240) < smp_cpus (242)",
},
};
static const struct SMPTestData data_with_clusters_invalid[] = {
{
/* config: -smp 16,sockets=2,clusters=2,cores=4,threads=2,maxcpus=16 */
@ -905,6 +932,14 @@ static void machine_with_dies_class_init(ObjectClass *oc, void *data)
mc->smp_props.dies_supported = true;
}
static void machine_with_modules_dies_class_init(ObjectClass *oc, void *data)
{
MachineClass *mc = MACHINE_CLASS(oc);
mc->smp_props.modules_supported = true;
mc->smp_props.dies_supported = true;
}
static void machine_with_clusters_class_init(ObjectClass *oc, void *data)
{
MachineClass *mc = MACHINE_CLASS(oc);
@ -1082,6 +1117,67 @@ static void test_with_dies(const void *opaque)
object_unref(obj);
}
static void test_with_modules_dies(const void *opaque)
{
const char *machine_type = opaque;
Object *obj = object_new(machine_type);
MachineState *ms = MACHINE(obj);
MachineClass *mc = MACHINE_GET_CLASS(obj);
SMPTestData data = {};
unsigned int num_modules = 5, num_dies = 3;
int i;
for (i = 0; i < ARRAY_SIZE(data_generic_valid); i++) {
data = 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 = 1;
data.expect_prefer_sockets.dies = 1;
data.expect_prefer_cores.modules = 1;
data.expect_prefer_cores.dies = 1;
smp_parse_test(ms, &data, true);
/* when modules and dies parameters are both specified */
data.config.has_modules = true;
data.config.modules = num_modules;
data.config.has_dies = true;
data.config.dies = num_dies;
if (data.config.has_cpus) {
data.config.cpus *= num_modules * num_dies;
}
if (data.config.has_maxcpus) {
data.config.maxcpus *= num_modules * num_dies;
}
data.expect_prefer_sockets.modules = num_modules;
data.expect_prefer_sockets.dies = num_dies;
data.expect_prefer_sockets.cpus *= num_modules * num_dies;
data.expect_prefer_sockets.max_cpus *= num_modules * num_dies;
data.expect_prefer_cores.modules = num_modules;
data.expect_prefer_cores.dies = num_dies;
data.expect_prefer_cores.cpus *= num_modules * num_dies;
data.expect_prefer_cores.max_cpus *= num_modules * num_dies;
smp_parse_test(ms, &data, true);
}
for (i = 0; i < ARRAY_SIZE(data_with_modules_dies_invalid); i++) {
data = 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 = opaque;
@ -1398,6 +1494,10 @@ static const TypeInfo smp_machine_types[] = {
.name = MACHINE_TYPE_NAME("smp-with-dies"),
.parent = TYPE_MACHINE,
.class_init = machine_with_dies_class_init,
}, {
.name = MACHINE_TYPE_NAME("smp-with-modules-dies"),
.parent = TYPE_MACHINE,
.class_init = machine_with_modules_dies_class_init,
}, {
.name = MACHINE_TYPE_NAME("smp-with-clusters"),
.parent = 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);