Bobby Bruce has submitted this change. (
https://gem5-review.googlesource.com/c/public/gem5/+/71158?usp=email )
Change subject: gpu-compute: Gfx version check for FS and SE mode
......................................................................
gpu-compute: Gfx version check for FS and SE mode
There is no GPU device in SE mode to get version from and no GPU driver
in FS mode to get version from, so a conditional needs to be added
depending on the mode to get the gfx version.
Change-Id: I33fdafb60d351ebc5148e2248244537fb5bebd31
Reviewed-on: https://gem5-review.googlesource.com/c/public/gem5/+/71078
Tested-by: kokoro <noreply+kok...@google.com>
Maintainer: Matt Sinclair <mattdsincl...@gmail.com>
Reviewed-by: Matt Sinclair <mattdsincl...@gmail.com>
(cherry picked from commit ebd5b3e4ae49b24dec4efc299d0b0198be9f4df3)
Reviewed-on: https://gem5-review.googlesource.com/c/public/gem5/+/71158
Reviewed-by: Matthew Poremba <matthew.pore...@amd.com>
Reviewed-by: Bobby Bruce <bbr...@ucdavis.edu>
Maintainer: Bobby Bruce <bbr...@ucdavis.edu>
---
M src/gpu-compute/gpu_command_processor.cc
M src/gpu-compute/gpu_compute_driver.hh
2 files changed, 5 insertions(+), 1 deletion(-)
Approvals:
Bobby Bruce: Looks good to me, approved; Looks good to me, approved
Matt Sinclair: Looks good to me, approved; Looks good to me, approved
kokoro: Regressions pass
Matthew Poremba: Looks good to me, approved
diff --git a/src/gpu-compute/gpu_command_processor.cc
b/src/gpu-compute/gpu_command_processor.cc
index 9755180..8f748bd 100644
--- a/src/gpu-compute/gpu_command_processor.cc
+++ b/src/gpu-compute/gpu_command_processor.cc
@@ -227,9 +227,11 @@
DPRINTF(GPUKernelInfo, "Kernel name: %s\n", kernel_name.c_str());
+ GfxVersion gfxVersion = FullSystem ? gpuDevice->getGfxVersion()
+ : driver()->getGfxVersion();
HSAQueueEntry *task = new HSAQueueEntry(kernel_name, queue_id,
dynamic_task_id, raw_pkt, &akc, host_pkt_addr, machine_code_addr,
- gpuDevice->getGfxVersion());
+ gfxVersion);
DPRINTF(GPUCommandProc, "Task ID: %i Got AQL: wg size (%dx%dx%d), "
"grid size (%dx%dx%d) kernarg addr: %#x, completion "
diff --git a/src/gpu-compute/gpu_compute_driver.hh
b/src/gpu-compute/gpu_compute_driver.hh
index def40f4..9a3c647 100644
--- a/src/gpu-compute/gpu_compute_driver.hh
+++ b/src/gpu-compute/gpu_compute_driver.hh
@@ -142,6 +142,8 @@
};
typedef class EventTableEntry ETEntry;
+ GfxVersion getGfxVersion() const { return gfxVersion; }
+
private:
/**
* GPU that is controlled by this driver.
--
To view, visit
https://gem5-review.googlesource.com/c/public/gem5/+/71158?usp=email
To unsubscribe, or for help writing mail filters, visit
https://gem5-review.googlesource.com/settings?usp=email
Gerrit-MessageType: merged
Gerrit-Project: public/gem5
Gerrit-Branch: release-staging-v23-0
Gerrit-Change-Id: I33fdafb60d351ebc5148e2248244537fb5bebd31
Gerrit-Change-Number: 71158
Gerrit-PatchSet: 2
Gerrit-Owner: Bobby Bruce <bbr...@ucdavis.edu>
Gerrit-Reviewer: Bobby Bruce <bbr...@ucdavis.edu>
Gerrit-Reviewer: Matt Sinclair <mattdsincl...@gmail.com>
Gerrit-Reviewer: Matthew Poremba <matthew.pore...@amd.com>
Gerrit-Reviewer: kokoro <noreply+kok...@google.com>
_______________________________________________
gem5-dev mailing list -- gem5-dev@gem5.org
To unsubscribe send an email to gem5-dev-le...@gem5.org
