diff options
| author | Sean Wilson <spwilson2@wisc.edu> | 2017-06-27 14:18:10 -0500 |
|---|---|---|
| committer | Sean Wilson <spwilson2@wisc.edu> | 2017-07-12 20:07:05 +0000 |
| commit | 741261f10bb308cdc200c5dfd8eb68567349cf19 (patch) | |
| tree | b44581cb4b93d64c079a80ab9e510205ffe93d0a /src/gpu-compute/shader.cc | |
| parent | 55f70760de9cf9d16905372d885b7925722721a8 (diff) | |
| download | gem5-741261f10bb308cdc200c5dfd8eb68567349cf19.tar.xz | |
gpu-compute: Refactor some Event subclasses to lambdas
Change-Id: Ic1332b8e8ba0afacbe591c80f4d06afbf5f04bd9
Signed-off-by: Sean Wilson <spwilson2@wisc.edu>
Reviewed-on: https://gem5-review.googlesource.com/3922
Reviewed-by: Jason Lowe-Power <jason@lowepower.com>
Reviewed-by: Anthony Gutierrez <anthony.gutierrez@amd.com>
Maintainer: Anthony Gutierrez <anthony.gutierrez@amd.com>
Diffstat (limited to 'src/gpu-compute/shader.cc')
| -rw-r--r-- | src/gpu-compute/shader.cc | 38 |
1 files changed, 15 insertions, 23 deletions
diff --git a/src/gpu-compute/shader.cc b/src/gpu-compute/shader.cc index 6d6154503..41671f85b 100644 --- a/src/gpu-compute/shader.cc +++ b/src/gpu-compute/shader.cc @@ -50,14 +50,17 @@ #include "mem/ruby/system/RubySystem.hh" #include "sim/sim_exit.hh" -Shader::Shader(const Params *p) : ClockedObject(p), - clock(p->clk_domain->clockPeriod()), cpuThread(nullptr), gpuTc(nullptr), - cpuPointer(p->cpu_pointer), tickEvent(this), timingSim(p->timing), - hsail_mode(SIMT), impl_kern_boundary_sync(p->impl_kern_boundary_sync), - separate_acquire_release(p->separate_acquire_release), coissue_return(1), - trace_vgpr_all(1), n_cu((p->CUs).size()), n_wf(p->n_wf), - globalMemSize(p->globalmem), nextSchedCu(0), sa_n(0), tick_cnt(0), - box_tick_cnt(0), start_tick_cnt(0) +Shader::Shader(const Params *p) + : ClockedObject(p), clock(p->clk_domain->clockPeriod()), + cpuThread(nullptr), gpuTc(nullptr), cpuPointer(p->cpu_pointer), + tickEvent([this]{ processTick(); }, "Shader tick", + false, Event::CPU_Tick_Pri), + timingSim(p->timing), hsail_mode(SIMT), + impl_kern_boundary_sync(p->impl_kern_boundary_sync), + separate_acquire_release(p->separate_acquire_release), coissue_return(1), + trace_vgpr_all(1), n_cu((p->CUs).size()), n_wf(p->n_wf), + globalMemSize(p->globalmem), nextSchedCu(0), sa_n(0), tick_cnt(0), + box_tick_cnt(0), start_tick_cnt(0) { cuList.resize(n_cu); @@ -317,27 +320,16 @@ Shader::ScheduleAdd(uint32_t *val,Tick when,int x) ++sa_n; } -Shader::TickEvent::TickEvent(Shader *_shader) - : Event(CPU_Tick_Pri), shader(_shader) -{ -} - void -Shader::TickEvent::process() +Shader::processTick() { - if (shader->busy()) { - shader->exec(); - shader->schedule(this, curTick() + shader->ticks(1)); + if (busy()) { + exec(); + schedule(tickEvent, curTick() + ticks(1)); } } -const char* -Shader::TickEvent::description() const -{ - return "Shader tick"; -} - void Shader::AccessMem(uint64_t address, void *ptr, uint32_t size, int cu_id, MemCmd cmd, bool suppress_func_errors) |