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

dev-amdgpu: Added PM4MapQueues to GPUFS checkpoint

Browse Source 
The GPUFS checkpoint restoration mechanism expects to find a
PM4MapQueues packet in the checkpoint. Since this was not being
checkpointed, the restore phase retrieved a null packet which led to a
segmentation fault. This commit adds PM4MapQueues to the checkpoint and
restores it when deserializing the checkpoint

Change-Id: Ib74a9f36fe89d740a74f94314ada41ecc363abe9
Reviewed-on: https://gem5-review.googlesource.com/c/public/gem5/+/69298
Reviewed-by: Matt Sinclair <mattdsinclair@gmail.com>
Maintainer: Matt Sinclair <mattdsinclair@gmail.com>
Tested-by: kokoro <noreply+kokoro@google.com>
Reviewed-by: Matthew Poremba <matthew.poremba@amd.com>
This commit is contained in:
Vishnu Ramadas
2023-03-27 08:33:45 -05:00
committed by VISHNU RAMADAS
parent ee2be9cffe
commit 65e0bd6eb4
2 changed files with 33 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -1021,6 +1021,10 @@ PM4PacketProcessor::serialize(CheckpointOut &cp) const
Addr offset[num_queues];
bool processing[num_queues];
bool ib[num_queues];
uint32_t me[num_queues];
uint32_t pipe[num_queues];
uint32_t queue[num_queues];
bool privileged[num_queues];
int i = 0;
for (auto iter : queues) {
@@ -1040,6 +1044,10 @@ PM4PacketProcessor::serialize(CheckpointOut &cp) const
offset[i] = q->offset();
processing[i] = q->processing();
ib[i] = q->ib();
me[i] = q->me();
pipe[i] = q->pipe();
queue[i] = q->queue();
privileged[i] = q->privileged();
i++;
}
@@ -1055,6 +1063,10 @@ PM4PacketProcessor::serialize(CheckpointOut &cp) const
SERIALIZE_ARRAY(offset, num_queues);
SERIALIZE_ARRAY(processing, num_queues);
SERIALIZE_ARRAY(ib, num_queues);
SERIALIZE_ARRAY(me, num_queues);
SERIALIZE_ARRAY(pipe, num_queues);
SERIALIZE_ARRAY(queue, num_queues);
SERIALIZE_ARRAY(privileged, num_queues);
}
void
@@ -1077,6 +1089,10 @@ PM4PacketProcessor::unserialize(CheckpointIn &cp)
Addr offset[num_queues];
bool processing[num_queues];
bool ib[num_queues];
uint32_t me[num_queues];
uint32_t pipe[num_queues];
uint32_t queue[num_queues];
bool privileged[num_queues];
UNSERIALIZE_ARRAY(id, num_queues);
UNSERIALIZE_ARRAY(mqd_base, num_queues);
@@ -1089,6 +1105,10 @@ PM4PacketProcessor::unserialize(CheckpointIn &cp)
UNSERIALIZE_ARRAY(offset, num_queues);
UNSERIALIZE_ARRAY(processing, num_queues);
UNSERIALIZE_ARRAY(ib, num_queues);
UNSERIALIZE_ARRAY(me, num_queues);
UNSERIALIZE_ARRAY(pipe, num_queues);
UNSERIALIZE_ARRAY(queue, num_queues);
UNSERIALIZE_ARRAY(privileged, num_queues);
for (int i = 0; i < num_queues; i++) {
QueueDesc *mqd = new QueueDesc();
@@ -1100,7 +1120,9 @@ PM4PacketProcessor::unserialize(CheckpointIn &cp)
mqd->ibBase = ib_base[i];
mqd->ibRptr = ib_rptr[i];
newQueue(mqd, offset[i], nullptr, id[i]);
PM4MapQueues* pkt = new PM4MapQueues;
memset(pkt, 0, sizeof(PM4MapQueues));
newQueue(mqd, offset[i], pkt, id[i]);
queues[id[i]]->ib(false);
queues[id[i]]->wptr(wptr[i]);
@@ -1109,6 +1131,8 @@ PM4PacketProcessor::unserialize(CheckpointIn &cp)
queues[id[i]]->offset(offset[i]);
queues[id[i]]->processing(processing[i]);
queues[id[i]]->ib(ib[i]);
queues[id[i]]->setPkt(me[i], pipe[i], queue[i], privileged[i]);
DPRINTF(PM4PacketProcessor, "PM4 queue %d, rptr: %p wptr: %p\n",
queues[id[i]]->id(), queues[id[i]]->rptr(),
queues[id[i]]->wptr());

9
src/dev/amdgpu/pm4_queues.hh
View File

@@ -391,7 +391,7 @@ class PM4Queue
Addr _offset;
bool _processing;
bool _ib;
const PM4MapQueues _pkt;
PM4MapQueues _pkt;
public:
PM4Queue() : _id(0), q(nullptr), _wptr(0), _offset(0), _processing(false),
_ib(false), _pkt() {}
@@ -486,6 +486,13 @@ class PM4Queue
uint32_t pipe() { return _pkt.pipe; }
uint32_t queue() { return _pkt.queueSlot; }
bool privileged() { return _pkt.queueSel == 0 ? 1 : 0; }
PM4MapQueues* getPkt() { return &_pkt; }
void setPkt(uint32_t me, uint32_t pipe, uint32_t queue, bool privileged) {
_pkt.me = me - 1;
_pkt.pipe = pipe;
_pkt.queueSlot = queue;
_pkt.queueSel = (privileged == 0) ? 1 : 0;
}
// Same computation as processMQD. See comment there for details.
uint64_t size() { return 4UL << ((q->hqd_pq_control & 0x3f) + 1); }