From 8d54a5cbaba50739889056293905930fea4ee1f4 Mon Sep 17 00:00:00 2001
From: Vishnu Ramadas <vramadas@outlook.com>
Date: Thu, 12 Oct 2023 14:53:29 -0500
Subject: [PATCH] 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
---
 src/mem/ruby/slicc_interface/AbstractController.hh | 2 --
 src/mem/ruby/system/GPUCoalescer.hh                | 5 -----
 src/mem/ruby/system/VIPERCoalescer.hh              | 5 -----
 3 files changed, 12 deletions(-)

diff --git a/src/mem/ruby/slicc_interface/AbstractController.hh b/src/mem/ruby/slicc_interface/AbstractController.hh
index 7d93644bd8..72b679d6cf 100644
--- a/src/mem/ruby/slicc_interface/AbstractController.hh
+++ b/src/mem/ruby/slicc_interface/AbstractController.hh
@@ -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
diff --git a/src/mem/ruby/system/GPUCoalescer.hh b/src/mem/ruby/system/GPUCoalescer.hh
index 3f936b4b41..d6db5c00ba 100644
--- a/src/mem/ruby/system/GPUCoalescer.hh
+++ b/src/mem/ruby/system/GPUCoalescer.hh
@@ -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__
diff --git a/src/mem/ruby/system/VIPERCoalescer.hh b/src/mem/ruby/system/VIPERCoalescer.hh
index d185620244..c7e21e946b 100644
--- a/src/mem/ruby/system/VIPERCoalescer.hh
+++ b/src/mem/ruby/system/VIPERCoalescer.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__