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/mem/ruby/system/GPUCoalescer.py | 10 +++++++++- 1 file changed, 9 insertions(+), 1 deletion(-) (limited to 'src/mem/ruby/system/GPUCoalescer.py') diff --git a/src/mem/ruby/system/GPUCoalescer.py b/src/mem/ruby/system/GPUCoalescer.py index 0c19f875d..101a5fe30 100644 --- a/src/mem/ruby/system/GPUCoalescer.py +++ b/src/mem/ruby/system/GPUCoalescer.py @@ -36,7 +36,7 @@ from m5.params import * from m5.proxy import * from Sequencer import * -class RubyGPUCoalescer(RubySequencer): +class RubyGPUCoalescer(RubyPort): type = 'RubyGPUCoalescer' cxx_class = 'GPUCoalescer' cxx_header = "mem/ruby/system/GPUCoalescer.hh" @@ -46,3 +46,11 @@ class RubyGPUCoalescer(RubySequencer): "max requests (incl. prefetches) outstanding") assume_rfo = Param.Bool(True, "assume protocol implementes Read for " "Ownership coherence"); + + icache = Param.RubyCache("") + dcache = Param.RubyCache("") + deadlock_threshold = Param.Cycles(500000, + "max outstanding cycles for a request before " \ + "deadlock/livelock declared") + garnet_standalone = Param.Bool(False, "") + dcache_hit_latency = Param.Cycles(1, "Data cache hit latency") -- cgit v1.2.3