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

tests/unit/test-smp-parse: Test smp_props.has_clusters

Browse Source 
The smp_props.has_clusters in MachineClass is not a user configured
field, and it indicates if user specifies "clusters" in -smp.

After -smp parsing, other module could aware if the cluster level
is configured by user. This is used when the machine has only 1 cluster
since there's only 1 cluster by default.

Add the check to cover this field.

Signed-off-by: Zhao Liu <zhao1.liu@intel.com>
Tested-by: Xiaoling Song <xiaoling.song@intel.com>
Acked-by: Thomas Huth <thuth@redhat.com>
Message-ID: <20240308160148.3130837-13-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:47 +08:00 committed by Philippe Mathieu-Daudé
parent ef88e1e875
commit 71e44ee0b2
1 changed files with 14 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -573,7 +573,8 @@ static unsigned int cpu_topology_get_cores_per_socket(const CpuTopology *topo)
static char *cpu_topology_to_string(const CpuTopology *topo, static char *cpu_topology_to_string(const CpuTopology *topo,
unsigned int threads_per_socket, unsigned int threads_per_socket,
unsigned int cores_per_socket) unsigned int cores_per_socket,
bool has_clusters)
{ {
return g_strdup_printf( return g_strdup_printf(
"(CpuTopology) {\n" "(CpuTopology) {\n"
@ -588,17 +589,20 @@ static char *cpu_topology_to_string(const CpuTopology *topo,
" .max_cpus = %u,\n" " .max_cpus = %u,\n"
" .threads_per_socket = %u,\n" " .threads_per_socket = %u,\n"
" .cores_per_socket = %u,\n" " .cores_per_socket = %u,\n"
" .has_clusters = %s,\n"
"}", "}",
topo->cpus, topo->drawers, topo->books, topo->cpus, topo->drawers, topo->books,
topo->sockets, topo->dies, topo->clusters, topo->sockets, topo->dies, topo->clusters,
topo->cores, topo->threads, topo->max_cpus, topo->cores, topo->threads, topo->max_cpus,
threads_per_socket, cores_per_socket); threads_per_socket, cores_per_socket,
has_clusters ? "true" : "false");
} }
static void check_parse(MachineState *ms, const SMPConfiguration *config, static void check_parse(MachineState *ms, const SMPConfiguration *config,
const CpuTopology *expect_topo, const char *expect_err, const CpuTopology *expect_topo, const char *expect_err,
bool is_valid) bool is_valid)
{ {
MachineClass *mc = MACHINE_GET_CLASS(ms);
g_autofree char *config_str = smp_config_to_string(config); g_autofree char *config_str = smp_config_to_string(config);
g_autofree char *expect_topo_str = NULL, *output_topo_str = NULL; g_autofree char *expect_topo_str = NULL, *output_topo_str = NULL;
unsigned int expect_threads_per_socket, expect_cores_per_socket; unsigned int expect_threads_per_socket, expect_cores_per_socket;
@ -611,15 +615,18 @@ static void check_parse(MachineState *ms, const SMPConfiguration *config,
cpu_topology_get_cores_per_socket(expect_topo); cpu_topology_get_cores_per_socket(expect_topo);
expect_topo_str = cpu_topology_to_string(expect_topo, expect_topo_str = cpu_topology_to_string(expect_topo,
expect_threads_per_socket, expect_threads_per_socket,
expect_cores_per_socket); expect_cores_per_socket,
config->has_clusters);
/* call the generic parser */ /* call the generic parser */
machine_parse_smp_config(ms, config, &err); machine_parse_smp_config(ms, config, &err);
ms_threads_per_socket = machine_topo_get_threads_per_socket(ms); ms_threads_per_socket = machine_topo_get_threads_per_socket(ms);
ms_cores_per_socket = machine_topo_get_cores_per_socket(ms); ms_cores_per_socket = machine_topo_get_cores_per_socket(ms);
output_topo_str = cpu_topology_to_string(&ms->smp, ms_threads_per_socket, output_topo_str = cpu_topology_to_string(&ms->smp,
ms_cores_per_socket); ms_threads_per_socket,
ms_cores_per_socket,
mc->smp_props.has_clusters);
/* when the configuration is supposed to be valid */ /* when the configuration is supposed to be valid */
if (is_valid) { if (is_valid) {
@ -634,7 +641,8 @@ static void check_parse(MachineState *ms, const SMPConfiguration *config,
(ms->smp.threads == expect_topo->threads) && (ms->smp.threads == expect_topo->threads) &&
(ms->smp.max_cpus == expect_topo->max_cpus) && (ms->smp.max_cpus == expect_topo->max_cpus) &&
(ms_threads_per_socket == expect_threads_per_socket) && (ms_threads_per_socket == expect_threads_per_socket) &&
(ms_cores_per_socket == expect_cores_per_socket)) { (ms_cores_per_socket == expect_cores_per_socket) &&
(mc->smp_props.has_clusters == config->has_clusters)) {
return; return;
} }