mirror of
https://github.com/Motorhead1991/qemu.git
synced 2025-08-04 00:03:54 -06:00
hw/riscv: spike: Allow creating multiple NUMA sockets
We extend RISC-V spike machine to allow creating a multi-socket machine. Each RISC-V spike machine socket is a NUMA node having a set of HARTs, a memory instance, and a CLINT instance. Other devices are shared between all sockets. We also update the generated device tree accordingly. By default, NUMA multi-socket support is disabled for RISC-V spike machine. To enable it, users can use "-numa" command-line options of QEMU. Example1: For two NUMA nodes with 2 CPUs each, append following to command-line options: "-smp 4 -numa node -numa node" Example2: For two NUMA nodes with 1 and 3 CPUs, append following to command-line options: "-smp 4 -numa node -numa node -numa cpu,node-id=0,core-id=0 \ -numa cpu,node-id=1,core-id=1 -numa cpu,node-id=1,core-id=2 \ -numa cpu,node-id=1,core-id=3" The maximum number of sockets in a RISC-V spike machine is 8 but this limit can be changed in future. Signed-off-by: Anup Patel <anup.patel@wdc.com> Reviewed-by: Atish Patra <atish.patra@wdc.com> Message-Id: <20200616032229.766089-5-anup.patel@wdc.com> Signed-off-by: Alistair Francis <alistair.francis@wdc.com>
This commit is contained in:
parent
83fcaefd9d
commit
a7172791e3
2 changed files with 168 additions and 77 deletions
|
@ -22,12 +22,19 @@
|
|||
#include "hw/riscv/riscv_hart.h"
|
||||
#include "hw/sysbus.h"
|
||||
|
||||
#define SPIKE_CPUS_MAX 8
|
||||
#define SPIKE_SOCKETS_MAX 8
|
||||
|
||||
#define TYPE_SPIKE_MACHINE MACHINE_TYPE_NAME("spike")
|
||||
#define SPIKE_MACHINE(obj) \
|
||||
OBJECT_CHECK(SpikeState, (obj), TYPE_SPIKE_MACHINE)
|
||||
|
||||
typedef struct {
|
||||
/*< private >*/
|
||||
SysBusDevice parent_obj;
|
||||
MachineState parent;
|
||||
|
||||
/*< public >*/
|
||||
RISCVHartArrayState soc;
|
||||
RISCVHartArrayState soc[SPIKE_SOCKETS_MAX];
|
||||
void *fdt;
|
||||
int fdt_size;
|
||||
} SpikeState;
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue