summaryrefslogtreecommitdiff
path: root/src/gpu-compute/shader.hh
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.hh
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.hh')
-rw-r--r--src/gpu-compute/shader.hh2
1 files changed, 1 insertions, 1 deletions
diff --git a/src/gpu-compute/shader.hh b/src/gpu-compute/shader.hh
index 13afab977..55c3feef9 100644
--- a/src/gpu-compute/shader.hh
+++ b/src/gpu-compute/shader.hh
@@ -73,7 +73,7 @@ static const int LDS_SIZE = 65536;
// Class Shader: This describes a single shader instance. Most
// configurations will only have a single shader.
-class Shader : public SimObject
+class Shader : public ClockedObject
{
protected:
// Shader's clock period in terms of number of ticks of curTime,