VISHNU RAMADAS has submitted this change. (
https://gem5-review.googlesource.com/c/public/gem5/+/69299?usp=email )
Change subject: dev-amdgpu: Add GART translations to GPUFS checkpoint
......................................................................
dev-amdgpu: Add GART translations to GPUFS checkpoint
Earlier, the GART entries were not being checkpointed. Therefore, during
checkpoint restore, certain SDMA instances were initialized with
incorrect addresses that led to incorrect behavior. This commit
checkpoints the GART entries and restores them.
Change-Id: I5464a39ed431e482ff7519b89bd5b664fd992ccf
Reviewed-on: https://gem5-review.googlesource.com/c/public/gem5/+/69299
Reviewed-by: Matt Sinclair <mattdsincl...@gmail.com>
Reviewed-by: Matthew Poremba <matthew.pore...@amd.com>
Maintainer: Matt Sinclair <mattdsincl...@gmail.com>
Tested-by: kokoro <noreply+kok...@google.com>
---
M src/dev/amdgpu/amdgpu_device.cc
M src/dev/amdgpu/amdgpu_vm.cc
2 files changed, 29 insertions(+), 0 deletions(-)
Approvals:
kokoro: Regressions pass
Matt Sinclair: Looks good to me, but someone else must approve; Looks
good to me, approved
Matthew Poremba: Looks good to me, approved
diff --git a/src/dev/amdgpu/amdgpu_device.cc
b/src/dev/amdgpu/amdgpu_device.cc
index 2b58b20..cb180b6 100644
--- a/src/dev/amdgpu/amdgpu_device.cc
+++ b/src/dev/amdgpu/amdgpu_device.cc
@@ -536,6 +536,7 @@
// Serialize the device memory
deviceMem.serializeSection(cp, "deviceMem");
+ gpuvm.serializeSection(cp, "GPUVM");
}
void
@@ -597,6 +598,7 @@
// Unserialize the device memory
deviceMem.unserializeSection(cp, "deviceMem");
+ gpuvm.unserializeSection(cp, "GPUVM");
}
uint16_t
diff --git a/src/dev/amdgpu/amdgpu_vm.cc b/src/dev/amdgpu/amdgpu_vm.cc
index 7a30917..5a13ac9 100644
--- a/src/dev/amdgpu/amdgpu_vm.cc
+++ b/src/dev/amdgpu/amdgpu_vm.cc
@@ -186,6 +186,7 @@
Addr vm0PTBase = vmContext0.ptBase;
Addr vm0PTStart = vmContext0.ptStart;
Addr vm0PTEnd = vmContext0.ptEnd;
+ uint64_t gartTableSize;
SERIALIZE_SCALAR(vm0PTBase);
SERIALIZE_SCALAR(vm0PTStart);
SERIALIZE_SCALAR(vm0PTEnd);
@@ -213,6 +214,21 @@
SERIALIZE_ARRAY(ptBase, AMDGPU_VM_COUNT);
SERIALIZE_ARRAY(ptStart, AMDGPU_VM_COUNT);
SERIALIZE_ARRAY(ptEnd, AMDGPU_VM_COUNT);
+
+ gartTableSize = gartTable.size();
+ uint64_t* gartTableKey = new uint64_t[gartTableSize];
+ uint64_t* gartTableValue = new uint64_t[gartTableSize];
+ SERIALIZE_SCALAR(gartTableSize);
+ int i = 0;
+ for (auto it = gartTable.begin(); it != gartTable.end(); ++it) {
+ gartTableKey[i] = it->first;
+ gartTableValue[i] = it->second;
+ i++;
+ }
+ SERIALIZE_ARRAY(gartTableKey, gartTableSize);
+ SERIALIZE_ARRAY(gartTableValue, gartTableSize);
+ delete[] gartTableKey;
+ delete[] gartTableValue;
}
void
@@ -222,6 +238,7 @@
Addr vm0PTBase;
Addr vm0PTStart;
Addr vm0PTEnd;
+ uint64_t gartTableSize, *gartTableKey, *gartTableValue;
UNSERIALIZE_SCALAR(vm0PTBase);
UNSERIALIZE_SCALAR(vm0PTStart);
UNSERIALIZE_SCALAR(vm0PTEnd);
@@ -252,6 +269,16 @@
vmContexts[i].ptStart = ptStart[i];
vmContexts[i].ptEnd = ptEnd[i];
}
+ UNSERIALIZE_SCALAR(gartTableSize);
+ gartTableKey = new uint64_t[gartTableSize];
+ gartTableValue = new uint64_t[gartTableSize];
+ UNSERIALIZE_ARRAY(gartTableKey, gartTableSize);
+ UNSERIALIZE_ARRAY(gartTableValue, gartTableSize);
+ for (uint64_t i = 0; i < gartTableSize; i++) {
+ gartTable[gartTableKey[i]] = gartTableValue[i];
+ }
+ delete[] gartTableKey;
+ delete[] gartTableValue;
}
void
--
To view, visit
https://gem5-review.googlesource.com/c/public/gem5/+/69299?usp=email
To unsubscribe, or for help writing mail filters, visit
https://gem5-review.googlesource.com/settings
Gerrit-Project: public/gem5
Gerrit-Branch: develop
Gerrit-Change-Id: I5464a39ed431e482ff7519b89bd5b664fd992ccf
Gerrit-Change-Number: 69299
Gerrit-PatchSet: 3
Gerrit-Owner: VISHNU RAMADAS <vrama...@wisc.edu>
Gerrit-Reviewer: Matt Sinclair <mattdsincl...@gmail.com>
Gerrit-Reviewer: Matthew Poremba <matthew.pore...@amd.com>
Gerrit-Reviewer: VISHNU RAMADAS <vrama...@wisc.edu>
Gerrit-Reviewer: kokoro <noreply+kok...@google.com>
Gerrit-MessageType: merged
_______________________________________________
gem5-dev mailing list -- gem5-dev@gem5.org
To unsubscribe send an email to gem5-dev-le...@gem5.org
