derek/gem5
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

dev-amdgpu: Add a few MQD attributes to GPUFS checkpoint

Browse Source 
During GPUFS checkpoint restore, doorbells callbacks are created based
on certain MQD attributes. These callbacks are required to create new
SDMA doorbells. If these attributes are not present in the checkpoint,
the restore hangs indefinitely waiting for ioctl calls that access these
doorbells to finish execution. This commit adds the attributes required
for checkpoint restore to proceed.

Change-Id: Id3d1b7a2627d4c50133d923096495957a233f675
Reviewed-on: https://gem5-review.googlesource.com/c/public/gem5/+/70077
Reviewed-by: Matt Sinclair <mattdsinclair@gmail.com>
Reviewed-by: Matthew Poremba <matthew.poremba@amd.com>
Maintainer: Matt Sinclair <mattdsinclair@gmail.com>
Tested-by: kokoro <noreply+kokoro@google.com>
Maintainer: Matthew Poremba <matthew.poremba@amd.com>
This commit is contained in:
Vishnu Ramadas
2023-04-26 13:04:51 -05:00
committed by VISHNU RAMADAS
parent 74fcc4d6b7
commit f5af8b5876
1 changed files with 30 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

30
src/dev/amdgpu/pm4_packet_processor.cc
View File

@@ -1025,6 +1025,11 @@ PM4PacketProcessor::serialize(CheckpointOut &cp) const
uint32_t pipe[num_queues];
uint32_t queue[num_queues];
bool privileged[num_queues];
uint32_t hqd_active[num_queues];
uint32_t hqd_vmid[num_queues];
Addr aql_rptr[num_queues];
uint32_t doorbell[num_queues];
uint32_t hqd_pq_control[num_queues];
int i = 0;
for (auto iter : queues) {
@@ -1048,6 +1053,11 @@ PM4PacketProcessor::serialize(CheckpointOut &cp) const
pipe[i] = q->pipe();
queue[i] = q->queue();
privileged[i] = q->privileged();
hqd_active[i] = q->getMQD()->hqd_active;
hqd_vmid[i] = q->getMQD()->hqd_vmid;
aql_rptr[i] = q->getMQD()->aqlRptr;
doorbell[i] = q->getMQD()->doorbell;
hqd_pq_control[i] = q->getMQD()->hqd_pq_control;
i++;
}
@@ -1067,6 +1077,11 @@ PM4PacketProcessor::serialize(CheckpointOut &cp) const
SERIALIZE_ARRAY(pipe, num_queues);
SERIALIZE_ARRAY(queue, num_queues);
SERIALIZE_ARRAY(privileged, num_queues);
SERIALIZE_ARRAY(hqd_active, num_queues);
SERIALIZE_ARRAY(hqd_vmid, num_queues);
SERIALIZE_ARRAY(aql_rptr, num_queues);
SERIALIZE_ARRAY(doorbell, num_queues);
SERIALIZE_ARRAY(hqd_pq_control, num_queues);
}
void
@@ -1093,6 +1108,11 @@ PM4PacketProcessor::unserialize(CheckpointIn &cp)
uint32_t pipe[num_queues];
uint32_t queue[num_queues];
bool privileged[num_queues];
uint32_t hqd_active[num_queues];
uint32_t hqd_vmid[num_queues];
Addr aql_rptr[num_queues];
uint32_t doorbell[num_queues];
uint32_t hqd_pq_control[num_queues];
UNSERIALIZE_ARRAY(id, num_queues);
UNSERIALIZE_ARRAY(mqd_base, num_queues);
@@ -1109,6 +1129,11 @@ PM4PacketProcessor::unserialize(CheckpointIn &cp)
UNSERIALIZE_ARRAY(pipe, num_queues);
UNSERIALIZE_ARRAY(queue, num_queues);
UNSERIALIZE_ARRAY(privileged, num_queues);
UNSERIALIZE_ARRAY(hqd_active, num_queues);
UNSERIALIZE_ARRAY(hqd_vmid, num_queues);
UNSERIALIZE_ARRAY(aql_rptr, num_queues);
UNSERIALIZE_ARRAY(doorbell, num_queues);
UNSERIALIZE_ARRAY(hqd_pq_control, num_queues);
for (int i = 0; i < num_queues; i++) {
QueueDesc *mqd = new QueueDesc();
@@ -1132,6 +1157,11 @@ PM4PacketProcessor::unserialize(CheckpointIn &cp)
queues[id[i]]->processing(processing[i]);
queues[id[i]]->ib(ib[i]);
queues[id[i]]->setPkt(me[i], pipe[i], queue[i], privileged[i]);
queues[id[i]]->getMQD()->hqd_active = hqd_active[i];
queues[id[i]]->getMQD()->hqd_vmid = hqd_vmid[i];
queues[id[i]]->getMQD()->aqlRptr = aql_rptr[i];
queues[id[i]]->getMQD()->doorbell = doorbell[i];
queues[id[i]]->getMQD()->hqd_pq_control = hqd_pq_control[i];
DPRINTF(PM4PacketProcessor, "PM4 queue %d, rptr: %p wptr: %p\n",
queues[id[i]]->id(), queues[id[i]]->rptr(),