summaryrefslogtreecommitdiff
path: root/src/gpu-compute/shader.cc
diff options
context:
space:
mode:
authorAndreas Sandberg <andreas.sandberg@arm.com>2017-02-27 13:17:51 +0000
committerAndreas Sandberg <andreas.sandberg@arm.com>2017-03-07 11:50:35 +0000
commitb043dcf58ad766582aeab162fb855cc3fc95f2cf (patch)
tree1da517346bef667cf20f80a54c934a3931129e4f /src/gpu-compute/shader.cc
parentc07a2d68f34ab4cef8b3ed4d079316d2b4306244 (diff)
downloadgem5-b043dcf58ad766582aeab162fb855cc3fc95f2cf.tar.xz
gpu-compute: Fix Python/C++ object hierarchy discrepancies
The GPUCoalescer and the Shader classes have different base classes in C++ and Python. This causes subtle bugs in SWIG and compilation errors for PyBind. Change-Id: I1ddd2a8ea43f083470538ddfea891347b21d14d8 Reviewed-by: Andreas Hansson <andreas.hansson@arm.com> Reviewed-on: https://gem5-review.googlesource.com/2228 Maintainer: Andreas Sandberg <andreas.sandberg@arm.com> Reviewed-by: Tony Gutierrez <anthony.gutierrez@amd.com> Reviewed-by: Pierre-Yves PĂ©neau <pierre-yves.peneau@lirmm.fr> Reviewed-by: Bradford Beckmann <brad.beckmann@amd.com>
Diffstat (limited to 'src/gpu-compute/shader.cc')
-rw-r--r--src/gpu-compute/shader.cc2
1 files changed, 1 insertions, 1 deletions
diff --git a/src/gpu-compute/shader.cc b/src/gpu-compute/shader.cc
index 6deaaab94..6c328a7fd 100644
--- a/src/gpu-compute/shader.cc
+++ b/src/gpu-compute/shader.cc
@@ -50,7 +50,7 @@
#include "mem/ruby/system/RubySystem.hh"
#include "sim/sim_exit.hh"
-Shader::Shader(const Params *p) : SimObject(p),
+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),