dev-amdgpu: Support multiple CPs and MMIO AddrRanges
Currently gem5 assumes that there is only one command processor (CP) which contains the PM4 packet processor. Some GPU devices have multiple CPs which the driver tests individually during POST if they are used or not. Therefore, these additional CPs need to be supported. This commit allows for multiple PM4 packet processors which represent multiple CPs. Each of these processors will have its own independent MMIO address range. To more easily support ranges, the MMIO addresses now use AddrRange to index a PM4 packet processor instead of the hard-coded constexpr MMIO start and size pairs. By default only one PM4 packet processor is created, meaning the functionality of the simulation is unchanged for devices currently supported in gem5. Change-Id: I977f4fd3a169ef4a78671a4fb58c8ea0e19bf52c
This commit is contained in:
@@ -188,9 +188,15 @@ def makeGpuFSSystem(args):
|
||||
|
||||
system.pc.south_bridge.gpu.sdmas = sdma_engines
|
||||
|
||||
# Setup PM4 packet processor
|
||||
pm4_pkt_proc = PM4PacketProcessor()
|
||||
system.pc.south_bridge.gpu.pm4_pkt_proc = pm4_pkt_proc
|
||||
# Setup PM4 packet processors
|
||||
pm4_procs = []
|
||||
pm4_procs.append(
|
||||
PM4PacketProcessor(
|
||||
ip_id=0, mmio_range=AddrRange(start=0xC000, end=0xD000)
|
||||
)
|
||||
)
|
||||
|
||||
system.pc.south_bridge.gpu.pm4_pkt_procs = pm4_procs
|
||||
|
||||
# GPU data path
|
||||
gpu_mem_mgr = AMDGPUMemoryManager()
|
||||
@@ -207,7 +213,8 @@ def makeGpuFSSystem(args):
|
||||
for sdma in sdma_engines:
|
||||
system._dma_ports.append(sdma)
|
||||
system._dma_ports.append(device_ih)
|
||||
system._dma_ports.append(pm4_pkt_proc)
|
||||
for pm4_proc in pm4_procs:
|
||||
system._dma_ports.append(pm4_proc)
|
||||
system._dma_ports.append(system_hub)
|
||||
system._dma_ports.append(gpu_mem_mgr)
|
||||
system._dma_ports.append(hsapp_pt_walker)
|
||||
@@ -221,7 +228,8 @@ def makeGpuFSSystem(args):
|
||||
for sdma in sdma_engines:
|
||||
sdma.pio = system.iobus.mem_side_ports
|
||||
device_ih.pio = system.iobus.mem_side_ports
|
||||
pm4_pkt_proc.pio = system.iobus.mem_side_ports
|
||||
for pm4_proc in pm4_procs:
|
||||
pm4_proc.pio = system.iobus.mem_side_ports
|
||||
system_hub.pio = system.iobus.mem_side_ports
|
||||
|
||||
# Full system needs special TLBs for SQC, Scalar, and vector data ports
|
||||
|
||||
Reference in New Issue
Block a user