diff -r 0d512e211833 -r b0a4f3815b55 src/gpu-compute/shader.hh --- a/src/gpu-compute/shader.hh Tue Feb 21 18:52:16 2017 +0000 +++ b/src/gpu-compute/shader.hh Wed Feb 22 09:27:25 2017 +0000 @@ -73,7 +73,7 @@ // 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, diff -r 0d512e211833 -r b0a4f3815b55 src/gpu-compute/shader.cc --- a/src/gpu-compute/shader.cc Tue Feb 21 18:52:16 2017 +0000 +++ b/src/gpu-compute/shader.cc Wed Feb 22 09:27:25 2017 +0000 @@ -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 -r 0d512e211833 -r b0a4f3815b55 src/mem/ruby/system/GPUCoalescer.hh --- a/src/mem/ruby/system/GPUCoalescer.hh Tue Feb 21 18:52:16 2017 +0000 +++ b/src/mem/ruby/system/GPUCoalescer.hh Wed Feb 22 09:27:25 2017 +0000 @@ -49,7 +49,7 @@ #include "mem/request.hh" #include "mem/ruby/common/Address.hh" #include "mem/ruby/common/Consumer.hh" -#include "mem/ruby/system/RubyPort.hh" +#include "mem/ruby/system/Sequencer.hh" class DataBlock; class CacheMsg; @@ -255,10 +255,6 @@ bool handleLlsc(Addr address, GPUCoalescerRequest* request); - // Private copy constructor and assignment operator - GPUCoalescer(const GPUCoalescer& obj); - GPUCoalescer& operator=(const GPUCoalescer& obj); - class IssueEvent : public Event { private: @@ -370,6 +366,11 @@ std::vector m_InitialToForwardDelayHist; std::vector m_ForwardToFirstResponseDelayHist; std::vector m_FirstResponseToCompletionDelayHist; + +private: + // Private copy constructor and assignment operator + GPUCoalescer(const GPUCoalescer& obj); + GPUCoalescer& operator=(const GPUCoalescer& obj); }; inline std::ostream& diff -r 0d512e211833 -r b0a4f3815b55 src/mem/ruby/system/GPUCoalescer.py --- a/src/mem/ruby/system/GPUCoalescer.py Tue Feb 21 18:52:16 2017 +0000 +++ b/src/mem/ruby/system/GPUCoalescer.py Wed Feb 22 09:27:25 2017 +0000 @@ -36,7 +36,7 @@ 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 @@ "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")