mem-ruby: Remove BUILD_GPU guards from ruby coalescer models
A previous commit added BUILD_GPU guards to gpu coalescer models since a related cache recorder commit added GPU support. This is no longer needed since the cache recorder moved to using a vector of RubyPorts instead of Sequencer/GPUCoalescer pointers. This commit removes BUILD_GPU guards from the Ruby coalescer models Change-Id: I23a7957d82524d6cd3483d22edfb35ac51796eca
This commit is contained in:
@@ -70,9 +70,7 @@ namespace ruby
|
||||
{
|
||||
|
||||
class Network;
|
||||
#ifdef BUILD_GPU
|
||||
class GPUCoalescer;
|
||||
#endif
|
||||
class DMASequencer;
|
||||
|
||||
// used to communicate that an in_port peeked the wrong message type
|
||||
|
||||
@@ -32,10 +32,6 @@
|
||||
#ifndef __MEM_RUBY_SYSTEM_GPU_COALESCER_HH__
|
||||
#define __MEM_RUBY_SYSTEM_GPU_COALESCER_HH__
|
||||
|
||||
#include "config/build_gpu.hh"
|
||||
|
||||
#if BUILD_GPU
|
||||
|
||||
#include <iostream>
|
||||
#include <unordered_map>
|
||||
|
||||
@@ -550,5 +546,4 @@ operator<<(std::ostream& out, const GPUCoalescer& obj)
|
||||
} // namespace ruby
|
||||
} // namespace gem5
|
||||
|
||||
#endif // BUILD_GPU
|
||||
#endif // __MEM_RUBY_SYSTEM_GPU_COALESCER_HH__
|
||||
|
||||
@@ -32,10 +32,6 @@
|
||||
#ifndef __MEM_RUBY_SYSTEM_VIPERCOALESCER_HH__
|
||||
#define __MEM_RUBY_SYSTEM_VIPERCOALESCER_HH__
|
||||
|
||||
#include "config/build_gpu.hh"
|
||||
|
||||
#if BUILD_GPU
|
||||
|
||||
#include <iostream>
|
||||
|
||||
#include "mem/ruby/common/Address.hh"
|
||||
@@ -96,5 +92,4 @@ class VIPERCoalescer : public GPUCoalescer
|
||||
} // namespace ruby
|
||||
} // namespace gem5
|
||||
|
||||
#endif // BUILD_GPU
|
||||
#endif //__MEM_RUBY_SYSTEM_VIPERCOALESCER_HH__
|
||||
|
||||
Reference in New Issue
Block a user