OpenE2K/qemu-e2k
13
4
Fork 0
Code Issues 4 Pull Requests Projects 2 Releases Activity

tests/unit/test-smp-parse: Test "drawers" and "books" combination case

Browse Source 
Since s390 machine supports both "drawers" and "books" in -smp, add the
"drawers" and "books" combination test case to match the actual topology
usage scenario.

Signed-off-by: Zhao Liu <zhao1.liu@intel.com>
Tested-by: Xiaoling Song <xiaoling.song@intel.com>
Reviewed-by: Thomas Huth <thuth@redhat.com>
Message-ID: <20240308160148.3130837-11-zhao1.liu@linux.intel.com>
Signed-off-by: Philippe Mathieu-Daudé <philmd@linaro.org>
This commit is contained in:
Zhao Liu 2024-03-09 00:01:45 +08:00 committed by Philippe Mathieu-Daudé
parent 5a4c4148cb
commit 3f90fb089e
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_drawers_invalid[] = {
},
};
static const struct SMPTestData data_with_drawers_books_invalid[] = {
{
/*
* config: -smp 200,drawers=2,books=2,sockets=2,cores=4,\
* threads=2,maxcpus=200
*/
.config = SMP_CONFIG_WITH_BOOKS_DRAWERS(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: "
"drawers (3) * books (5) * sockets (2) * "
"cores (4) * threads (2) != maxcpus (200)",
}, {
/*
* config: -smp 242,drawers=2,books=2,sockets=2,cores=4,\
* threads=2,maxcpus=240
*/
.config = SMP_CONFIG_WITH_BOOKS_DRAWERS(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: "
"drawers (3) * books (5) * sockets (2) * "
"cores (4) * threads (2) "
"== maxcpus (240) < smp_cpus (242)",
},
};
static char *smp_config_to_string(const SMPConfiguration *config)
{
return g_strdup_printf(
@ -698,6 +725,14 @@ static void machine_with_drawers_class_init(ObjectClass *oc, void *data)
mc->smp_props.drawers_supported = true;
}
static void machine_with_drawers_books_class_init(ObjectClass *oc, void *data)
{
MachineClass *mc = MACHINE_CLASS(oc);
mc->smp_props.drawers_supported = true;
mc->smp_props.books_supported = true;
}
static void test_generic_valid(const void *opaque)
{
const char *machine_type = opaque;
@ -936,6 +971,67 @@ static void test_with_drawers(const void *opaque)
object_unref(obj);
}
static void test_with_drawers_books(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_drawers = 5, num_books = 3;
int i;
for (i = 0; i < ARRAY_SIZE(data_generic_valid); i++) {
data = data_generic_valid[i];
unsupported_params_init(mc, &data);
/*
* when drawers and books parameters are omitted, they will
* be both set as 1.
*/
data.expect_prefer_sockets.drawers = 1;
data.expect_prefer_sockets.books = 1;
data.expect_prefer_cores.drawers = 1;
data.expect_prefer_cores.books = 1;
smp_parse_test(ms, &data, true);
/* when drawers and books parameters are both specified */
data.config.has_drawers = true;
data.config.drawers = num_drawers;
data.config.has_books = true;
data.config.books = num_books;
if (data.config.has_cpus) {
data.config.cpus *= num_drawers * num_books;
}
if (data.config.has_maxcpus) {
data.config.maxcpus *= num_drawers * num_books;
}
data.expect_prefer_sockets.drawers = num_drawers;
data.expect_prefer_sockets.books = num_books;
data.expect_prefer_sockets.cpus *= num_drawers * num_books;
data.expect_prefer_sockets.max_cpus *= num_drawers * num_books;
data.expect_prefer_cores.drawers = num_drawers;
data.expect_prefer_cores.books = num_books;
data.expect_prefer_cores.cpus *= num_drawers * num_books;
data.expect_prefer_cores.max_cpus *= num_drawers * num_books;
smp_parse_test(ms, &data, true);
}
for (i = 0; i < ARRAY_SIZE(data_with_drawers_books_invalid); i++) {
data = data_with_drawers_books_invalid[i];
unsupported_params_init(mc, &data);
smp_parse_test(ms, &data, false);
}
object_unref(obj);
}
/* Type info of the tested machine */
static const TypeInfo smp_machine_types[] = {
{
@ -968,6 +1064,10 @@ static const TypeInfo smp_machine_types[] = {
.name = MACHINE_TYPE_NAME("smp-with-drawers"),
.parent = TYPE_MACHINE,
.class_init = machine_with_drawers_class_init,
}, {
.name = MACHINE_TYPE_NAME("smp-with-drawers-books"),
.parent = TYPE_MACHINE,
.class_init = machine_with_drawers_books_class_init,
}
};
@ -997,6 +1097,9 @@ int main(int argc, char *argv[])
g_test_add_data_func("/test-smp-parse/with_drawers",
MACHINE_TYPE_NAME("smp-with-drawers"),
test_with_drawers);
g_test_add_data_func("/test-smp-parse/with_drawers_books",
MACHINE_TYPE_NAME("smp-with-drawers-books"),
test_with_drawers_books);
g_test_run();