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

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

Browse Source 
Although drawer was introduced to -smp along with book by s390 machine,
as a general topology level in QEMU that may be reused by other arches
in the future, it is desirable to cover this parameter's parsing in a
separate case.

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-10-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:44 +08:00 committed by Philippe Mathieu-Daudé
parent f0fe1cd8b8
commit 5a4c4148cb
1 changed files with 89 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -329,6 +329,11 @@ static const struct SMPTestData data_generic_invalid[] = {
.config = SMP_CONFIG_WITH_BOOKS_DRAWERS(T, 2, F, 0, T, 2, F, .config = SMP_CONFIG_WITH_BOOKS_DRAWERS(T, 2, F, 0, T, 2, F,
0, F, 0, F, 0, F, 0), 0, F, 0, F, 0, F, 0),
.expect_error = "books not supported by this machine's CPU topology", .expect_error = "books not supported by this machine's CPU topology",
}, {
/* config: -smp 2,drawers=2 */
.config = SMP_CONFIG_WITH_BOOKS_DRAWERS(T, 2, T, 2, F, 0, F,
0, F, 0, F, 0, F, 0),
.expect_error = "drawers not supported by this machine's CPU topology",
}, { }, {
/* config: -smp 8,sockets=2,cores=4,threads=2,maxcpus=8 */ /* config: -smp 8,sockets=2,cores=4,threads=2,maxcpus=8 */
.config = SMP_CONFIG_GENERIC(T, 8, T, 2, T, 4, T, 2, T, 8), .config = SMP_CONFIG_GENERIC(T, 8, T, 2, T, 4, T, 2, T, 8),
@ -420,6 +425,26 @@ static const struct SMPTestData data_with_books_invalid[] = {
}, },
}; };
static const struct SMPTestData data_with_drawers_invalid[] = {
{
/* config: -smp 16,drawers=2,sockets=2,cores=4,threads=2,maxcpus=16 */
.config = SMP_CONFIG_WITH_BOOKS_DRAWERS(T, 16, T, 2, F, 1, T,
2, T, 4, T, 2, T, 16),
.expect_error = "Invalid CPU topology: "
"product of the hierarchy must match maxcpus: "
"drawers (2) * sockets (2) * cores (4) * threads (2) "
"!= maxcpus (16)",
}, {
/* config: -smp 34,drawers=2,sockets=2,cores=4,threads=2,maxcpus=32 */
.config = SMP_CONFIG_WITH_BOOKS_DRAWERS(T, 34, T, 2, F, 1, T,
2, T, 4, T, 2, T, 32),
.expect_error = "Invalid CPU topology: "
"maxcpus must be equal to or greater than smp: "
"drawers (2) * sockets (2) * cores (4) * threads (2) "
"== maxcpus (32) < smp_cpus (34)",
},
};
static char *smp_config_to_string(const SMPConfiguration *config) static char *smp_config_to_string(const SMPConfiguration *config)
{ {
return g_strdup_printf( return g_strdup_printf(
@ -666,6 +691,13 @@ static void machine_with_books_class_init(ObjectClass *oc, void *data)
mc->smp_props.books_supported = true; mc->smp_props.books_supported = true;
} }
static void machine_with_drawers_class_init(ObjectClass *oc, void *data)
{
MachineClass *mc = MACHINE_CLASS(oc);
mc->smp_props.drawers_supported = true;
}
static void test_generic_valid(const void *opaque) static void test_generic_valid(const void *opaque)
{ {
const char *machine_type = opaque; const char *machine_type = opaque;
@ -854,6 +886,56 @@ static void test_with_books(const void *opaque)
object_unref(obj); object_unref(obj);
} }
static void test_with_drawers(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 = 2;
int i;
for (i = 0; i < ARRAY_SIZE(data_generic_valid); i++) {
data = data_generic_valid[i];
unsupported_params_init(mc, &data);
/* when drawers parameter is omitted, it will be set as 1 */
data.expect_prefer_sockets.drawers = 1;
data.expect_prefer_cores.drawers = 1;
smp_parse_test(ms, &data, true);
/* when drawers parameter is specified */
data.config.has_drawers = true;
data.config.drawers = num_drawers;
if (data.config.has_cpus) {
data.config.cpus *= num_drawers;
}
if (data.config.has_maxcpus) {
data.config.maxcpus *= num_drawers;
}
data.expect_prefer_sockets.drawers = num_drawers;
data.expect_prefer_sockets.cpus *= num_drawers;
data.expect_prefer_sockets.max_cpus *= num_drawers;
data.expect_prefer_cores.drawers = num_drawers;
data.expect_prefer_cores.cpus *= num_drawers;
data.expect_prefer_cores.max_cpus *= num_drawers;
smp_parse_test(ms, &data, true);
}
for (i = 0; i < ARRAY_SIZE(data_with_drawers_invalid); i++) {
data = data_with_drawers_invalid[i];
unsupported_params_init(mc, &data);
smp_parse_test(ms, &data, false);
}
object_unref(obj);
}
/* Type info of the tested machine */ /* Type info of the tested machine */
static const TypeInfo smp_machine_types[] = { static const TypeInfo smp_machine_types[] = {
{ {
@ -882,6 +964,10 @@ static const TypeInfo smp_machine_types[] = {
.name = MACHINE_TYPE_NAME("smp-with-books"), .name = MACHINE_TYPE_NAME("smp-with-books"),
.parent = TYPE_MACHINE, .parent = TYPE_MACHINE,
.class_init = machine_with_books_class_init, .class_init = machine_with_books_class_init,
}, {
.name = MACHINE_TYPE_NAME("smp-with-drawers"),
.parent = TYPE_MACHINE,
.class_init = machine_with_drawers_class_init,
} }
}; };
@ -908,6 +994,9 @@ int main(int argc, char *argv[])
g_test_add_data_func("/test-smp-parse/with_books", g_test_add_data_func("/test-smp-parse/with_books",
MACHINE_TYPE_NAME("smp-with-books"), MACHINE_TYPE_NAME("smp-with-books"),
test_with_books); test_with_books);
g_test_add_data_func("/test-smp-parse/with_drawers",
MACHINE_TYPE_NAME("smp-with-drawers"),
test_with_drawers);
g_test_run(); g_test_run();