From: Derek Hower <drh5@cs.wisc.edu>
Date: Fri, 11 Sep 2009 19:17:21 +0000 (-0500)
Subject: merge
X-Git-Tag: Calvin_Submission~23
X-Git-Url: https://git.libre-soc.org/?a=commitdiff_plain;h=bd770274b013acd21caf6bd864a8e3374c06138e;p=gem5.git

merge
---

bd770274b013acd21caf6bd864a8e3374c06138e
diff --cc src/mem/ruby/config/TwoLevel_SplitL1UnifiedL2.rb
index aa176d0f1,83020742e..e20b7249e
--- a/src/mem/ruby/config/TwoLevel_SplitL1UnifiedL2.rb
+++ b/src/mem/ruby/config/TwoLevel_SplitL1UnifiedL2.rb
@@@ -79,9 -80,15 +87,17 @@@ num_l2_banks.times { |n
      net_ports << MOESI_CMP_directory_L2CacheController.new("L2CacheController_"+n.to_s,
                                                             "L2Cache",
                                                             cache)
 +    net_ports.last.request_latency = l2_cache_latency + 2
 +    net_ports.last.response_latency = l2_cache_latency + 2
    end
+ 
+   if protocol == "MESI_CMP_directory"
+     net_ports << MESI_CMP_directory_L2CacheController.new("L2CacheController_"+n.to_s,
+                                                            "L2Cache",
+                                                            cache)
+   end
+ 
+ 
  }
  num_memories.times { |n|
    directory = DirectoryMemory.new("DirectoryMemory_"+n.to_s, memory_size_mb/num_memories)