ShuriZma
/
xemu
mirror of https://github.com/xemu-project/xemu.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

tests/unit/test-smp-parse: Test "modules" parameter in -smp 

Cover the module cases in test-smp-parse.

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

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

@ -48,17 +48,19 @@
} }
/* /*
* Currently a 4-level topology hierarchy is supported on PC machines * Currently a 5-level topology hierarchy is supported on PC machines
* -sockets/dies/cores/threads * -sockets/dies/modules/cores/threads
*/ */
#define SMP_CONFIG_WITH_DIES(ha, a, hb, b, hc, c, hd, d, he, e, hf, f) \ #define SMP_CONFIG_WITH_MODS_DIES(ha, a, hb, b, hc, c, hd, d, \
he, e, hf, f, hg, g) \
{ \ { \
.has_cpus = ha, .cpus = a, \ .has_cpus = ha, .cpus = a, \
.has_sockets = hb, .sockets = b, \ .has_sockets = hb, .sockets = b, \
.has_dies = hc, .dies = c, \ .has_dies = hc, .dies = c, \
.has_cores = hd, .cores = d, \ .has_modules = hd, .modules = d, \
.has_threads = he, .threads = e, \ .has_cores = he, .cores = e, \
.has_maxcpus = hf, .maxcpus = f, \ .has_threads = hf, .threads = f, \
.has_maxcpus = hg, .maxcpus = g, \
} }
/* /*
@ -345,8 +347,14 @@ static const struct SMPTestData data_generic_valid[] = {
static const struct SMPTestData data_generic_invalid[] = { static const struct SMPTestData data_generic_invalid[] = {
{ {
/* config: -smp 2,modules=2 */
.config = SMP_CONFIG_WITH_MODS_DIES(T, 2, F, 0, F, 0, T, 2,
F, 0, F, 0, F, 0),
.expect_error = "modules > 1 not supported by this machine's CPU topology",
}, {
/* config: -smp 2,dies=2 */ /* config: -smp 2,dies=2 */
.config = SMP_CONFIG_WITH_DIES(T, 2, F, 0, T, 2, F, 0, F, 0, F, 0), .config = SMP_CONFIG_WITH_MODS_DIES(T, 2, F, 0, T, 2, F, 0,
F, 0, F, 0, F, 0),
.expect_error = "dies > 1 not supported by this machine's CPU topology", .expect_error = "dies > 1 not supported by this machine's CPU topology",
}, { }, {
/* config: -smp 2,clusters=2 */ /* config: -smp 2,clusters=2 */
@ -397,17 +405,39 @@ static const struct SMPTestData data_generic_invalid[] = {
}, },
}; };
static const struct SMPTestData data_with_modules_invalid[] = {
{
/* config: -smp 16,sockets=2,modules=2,cores=4,threads=2,maxcpus=16 */
.config = SMP_CONFIG_WITH_MODS_DIES(T, 16, T, 2, F, 0, T, 2,
T, 4, T, 2, T, 16),
.expect_error = "Invalid CPU topology: "
"product of the hierarchy must match maxcpus: "
"sockets (2) * modules (2) * cores (4) * threads (2) "
"!= maxcpus (16)",
}, {
/* config: -smp 34,sockets=2,modules=2,cores=4,threads=2,maxcpus=32 */
.config = SMP_CONFIG_WITH_MODS_DIES(T, 34, T, 2, F, 0, T, 2,
T, 4, T, 2, T, 32),
.expect_error = "Invalid CPU topology: "
"maxcpus must be equal to or greater than smp: "
"sockets (2) * modules (2) * cores (4) * threads (2) "
"== maxcpus (32) < smp_cpus (34)",
},
};
static const struct SMPTestData data_with_dies_invalid[] = { static const struct SMPTestData data_with_dies_invalid[] = {
{ {
/* config: -smp 16,sockets=2,dies=2,cores=4,threads=2,maxcpus=16 */ /* config: -smp 16,sockets=2,dies=2,cores=4,threads=2,maxcpus=16 */
.config = SMP_CONFIG_WITH_DIES(T, 16, T, 2, T, 2, T, 4, T, 2, T, 16), .config = SMP_CONFIG_WITH_MODS_DIES(T, 16, T, 2, T, 2, F, 0,
T, 4, T, 2, T, 16),
.expect_error = "Invalid CPU topology: " .expect_error = "Invalid CPU topology: "
"product of the hierarchy must match maxcpus: " "product of the hierarchy must match maxcpus: "
"sockets (2) * dies (2) * cores (4) * threads (2) " "sockets (2) * dies (2) * cores (4) * threads (2) "
"!= maxcpus (16)", "!= maxcpus (16)",
}, { }, {
/* config: -smp 34,sockets=2,dies=2,cores=4,threads=2,maxcpus=32 */ /* config: -smp 34,sockets=2,dies=2,cores=4,threads=2,maxcpus=32 */
.config = SMP_CONFIG_WITH_DIES(T, 34, T, 2, T, 2, T, 4, T, 2, T, 32), .config = SMP_CONFIG_WITH_MODS_DIES(T, 34, T, 2, T, 2, F, 0,
T, 4, T, 2, T, 32),
.expect_error = "Invalid CPU topology: " .expect_error = "Invalid CPU topology: "
"maxcpus must be equal to or greater than smp: " "maxcpus must be equal to or greater than smp: "
"sockets (2) * dies (2) * cores (4) * threads (2) " "sockets (2) * dies (2) * cores (4) * threads (2) "
@ -861,6 +891,13 @@ static void machine_generic_invalid_class_init(ObjectClass *oc, void *data)
mc->max_cpus = MAX_CPUS - 1; mc->max_cpus = MAX_CPUS - 1;
} }
static void machine_with_modules_class_init(ObjectClass *oc, void *data)
{
MachineClass *mc = MACHINE_CLASS(oc);
mc->smp_props.modules_supported = true;
}
static void machine_with_dies_class_init(ObjectClass *oc, void *data) static void machine_with_dies_class_init(ObjectClass *oc, void *data)
{ {
MachineClass *mc = MACHINE_CLASS(oc); MachineClass *mc = MACHINE_CLASS(oc);
@ -945,6 +982,56 @@ static void test_generic_invalid(const void *opaque)
object_unref(obj); object_unref(obj);
} }
static void test_with_modules(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 = 2;
int i;
for (i = 0; i < ARRAY_SIZE(data_generic_valid); i++) {
data = data_generic_valid[i];
unsupported_params_init(mc, &data);
/* when modules parameter is omitted, it will be set as 1 */
data.expect_prefer_sockets.modules = 1;
data.expect_prefer_cores.modules = 1;
smp_parse_test(ms, &data, true);
/* when modules parameter is specified */
data.config.has_modules = true;
data.config.modules = num_modules;
if (data.config.has_cpus) {
data.config.cpus *= num_modules;
}
if (data.config.has_maxcpus) {
data.config.maxcpus *= num_modules;
}
data.expect_prefer_sockets.modules = num_modules;
data.expect_prefer_sockets.cpus *= num_modules;
data.expect_prefer_sockets.max_cpus *= num_modules;
data.expect_prefer_cores.modules = num_modules;
data.expect_prefer_cores.cpus *= num_modules;
data.expect_prefer_cores.max_cpus *= num_modules;
smp_parse_test(ms, &data, true);
}
for (i = 0; i < ARRAY_SIZE(data_with_modules_invalid); i++) {
data = data_with_modules_invalid[i];
unsupported_params_init(mc, &data);
smp_parse_test(ms, &data, false);
}
object_unref(obj);
}
static void test_with_dies(const void *opaque) static void test_with_dies(const void *opaque)
{ {
const char *machine_type = opaque; const char *machine_type = opaque;
@ -1303,6 +1390,10 @@ static const TypeInfo smp_machine_types[] = {
.name = MACHINE_TYPE_NAME("smp-generic-invalid"), .name = MACHINE_TYPE_NAME("smp-generic-invalid"),
.parent = TYPE_MACHINE, .parent = TYPE_MACHINE,
.class_init = machine_generic_invalid_class_init, .class_init = machine_generic_invalid_class_init,
}, {
.name = MACHINE_TYPE_NAME("smp-with-modules"),
.parent = TYPE_MACHINE,
.class_init = machine_with_modules_class_init,
}, { }, {
.name = MACHINE_TYPE_NAME("smp-with-dies"), .name = MACHINE_TYPE_NAME("smp-with-dies"),
.parent = TYPE_MACHINE, .parent = TYPE_MACHINE,
@ -1344,6 +1435,9 @@ int main(int argc, char *argv[])
g_test_add_data_func("/test-smp-parse/generic/invalid", g_test_add_data_func("/test-smp-parse/generic/invalid",
MACHINE_TYPE_NAME("smp-generic-invalid"), MACHINE_TYPE_NAME("smp-generic-invalid"),
test_generic_invalid); test_generic_invalid);
g_test_add_data_func("/test-smp-parse/with_modules",
MACHINE_TYPE_NAME("smp-with-modules"),
test_with_modules);
g_test_add_data_func("/test-smp-parse/with_dies", g_test_add_data_func("/test-smp-parse/with_dies",
MACHINE_TYPE_NAME("smp-with-dies"), MACHINE_TYPE_NAME("smp-with-dies"),
test_with_dies); test_with_dies);