From b043dcf58ad766582aeab162fb855cc3fc95f2cf Mon Sep 17 00:00:00 2001 From: Andreas Sandberg Date: Mon, 27 Feb 2017 13:17:51 +0000 Subject: gpu-compute: Fix Python/C++ object hierarchy discrepancies MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit 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 Reviewed-on: https://gem5-review.googlesource.com/2228 Maintainer: Andreas Sandberg Reviewed-by: Tony Gutierrez Reviewed-by: Pierre-Yves Péneau Reviewed-by: Bradford Beckmann --- src/gpu-compute/shader.cc | 2 +- src/gpu-compute/shader.hh | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) (limited to 'src/gpu-compute') 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), 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, -- cgit v1.2.3