From d71a0d790d8d1113480c5a57d7bfbb9b7d0d0037 Mon Sep 17 00:00:00 2001
From: Andreas Hansson <andreas.hansson@arm.com>
Date: Fri, 21 Aug 2015 07:03:21 -0400
Subject: [PATCH] ruby: Move Rubys cache class from Cache.py to RubyCache.py

This patch serves to avoid name clashes with the classic cache. For
some reason having two 'SimObject' files with the same name creates
problems.

--HG--
rename : src/mem/ruby/structures/Cache.py => src/mem/ruby/structures/RubyCache.py
---
 configs/ruby/MI_example.py                         | 8 ++++----
 configs/ruby/Network_test.py                       | 6 +++---
 src/mem/ruby/structures/{Cache.py => RubyCache.py} | 0
 src/mem/ruby/structures/SConscript                 | 2 +-
 4 files changed, 8 insertions(+), 8 deletions(-)
 rename src/mem/ruby/structures/{Cache.py => RubyCache.py} (100%)

diff --git a/configs/ruby/MI_example.py b/configs/ruby/MI_example.py
index 4e01de65b..3e0c21a41 100644
--- a/configs/ruby/MI_example.py
+++ b/configs/ruby/MI_example.py
@@ -37,7 +37,7 @@ from Ruby import send_evicts
 #
 # Declare caches used by the protocol
 #
-class Cache(RubyCache): pass
+class L1Cache(RubyCache): pass
 
 def define_options(parser):
     return
@@ -70,9 +70,9 @@ def create_system(options, full_system, system, dma_ports, ruby_system):
         # Only one cache exists for this protocol, so by default use the L1D
         # config parameters.
         #
-        cache = Cache(size = options.l1d_size,
-                      assoc = options.l1d_assoc,
-                      start_index_bit = block_size_bits)
+        cache = L1Cache(size = options.l1d_size,
+                        assoc = options.l1d_assoc,
+                        start_index_bit = block_size_bits)
 
         #
         # Only one unified L1 cache exists.  Can cache instructions and data.
diff --git a/configs/ruby/Network_test.py b/configs/ruby/Network_test.py
index 7a968a253..eb31b3804 100644
--- a/configs/ruby/Network_test.py
+++ b/configs/ruby/Network_test.py
@@ -36,7 +36,7 @@ from Ruby import create_topology
 #
 # Declare caches used by the protocol
 #
-class Cache(RubyCache): pass
+class L1Cache(RubyCache): pass
 
 def define_options(parser):
     return
@@ -72,8 +72,8 @@ def create_system(options, full_system, system, dma_ports, ruby_system):
         # Only one cache exists for this protocol, so by default use the L1D
         # config parameters.
         #
-        cache = Cache(size = options.l1d_size,
-                      assoc = options.l1d_assoc)
+        cache = L1Cache(size = options.l1d_size,
+                        assoc = options.l1d_assoc)
 
         #
         # Only one unified L1 cache exists.  Can cache instructions and data.
diff --git a/src/mem/ruby/structures/Cache.py b/src/mem/ruby/structures/RubyCache.py
similarity index 100%
rename from src/mem/ruby/structures/Cache.py
rename to src/mem/ruby/structures/RubyCache.py
diff --git a/src/mem/ruby/structures/SConscript b/src/mem/ruby/structures/SConscript
index 18ab9daed..75fc6370e 100644
--- a/src/mem/ruby/structures/SConscript
+++ b/src/mem/ruby/structures/SConscript
@@ -33,7 +33,7 @@ Import('*')
 if env['PROTOCOL'] == 'None':
     Return()
 
-SimObject('Cache.py')
+SimObject('RubyCache.py')
 SimObject('DirectoryMemory.py')
 SimObject('LRUReplacementPolicy.py')
 SimObject('PseudoLRUReplacementPolicy.py')