# Node ID 17785cb5a67267c811fe513fd957a1d558fb37e5
# Parent  5ee72f4b293152dd0c75ab402a49696d6903e604
diff --git a/configs/ruby/MESI_Three_Level.py b/configs/ruby/MESI_Three_Level.py
--- a/configs/ruby/MESI_Three_Level.py
+++ b/configs/ruby/MESI_Three_Level.py
@@ -80,16 +80,19 @@ def create_system(options, full_system, 
 
     assert (options.num_l2caches % options.num_clusters == 0)
     num_l2caches_per_cluster = options.num_l2caches / options.num_clusters
 
     l2_bits = int(math.log(num_l2caches_per_cluster, 2))
     block_size_bits = int(math.log(options.cacheline_size, 2))
     l2_index_start = block_size_bits + l2_bits
 
+    # Otherwise, the extra l2caches will be unused.
+    assert(l2_bits == int(math.ceil(math.log(num_l2caches_per_cluster, 2))))
+
     #
     # Must create the individual controllers before the network to ensure the
     # controller constructors are called before the network constructor
     #
     for i in xrange(options.num_clusters):
         for j in xrange(num_cpus_per_cluster):
             #
             # First create the Ruby objects associated with this cpu
diff --git a/configs/ruby/MESI_Two_Level.py b/configs/ruby/MESI_Two_Level.py
--- a/configs/ruby/MESI_Two_Level.py
+++ b/configs/ruby/MESI_Two_Level.py
@@ -68,16 +68,19 @@ def create_system(options, full_system, 
 
     #
     # Must create the individual controllers before the network to ensure the
     # controller constructors are called before the network constructor
     #
     l2_bits = int(math.log(options.num_l2caches, 2))
     block_size_bits = int(math.log(options.cacheline_size, 2))
 
+    # Otherwise, the extra l2caches will be unused.
+    assert(l2_bits == math.ceil(math.log(options.num_l2caches, 2)))
+
     for i in xrange(options.num_cpus):
         #
         # First create the Ruby objects associated with this cpu
         #
         l1i_cache = L1Cache(size = options.l1i_size,
                             assoc = options.l1i_assoc,
                             start_index_bit = block_size_bits,
                             is_icache = True)
diff --git a/configs/ruby/MOESI_CMP_directory.py b/configs/ruby/MOESI_CMP_directory.py
--- a/configs/ruby/MOESI_CMP_directory.py
+++ b/configs/ruby/MOESI_CMP_directory.py
@@ -68,16 +68,19 @@ def create_system(options, full_system, 
 
     #
     # Must create the individual controllers before the network to ensure the
     # controller constructors are called before the network constructor
     #
     l2_bits = int(math.log(options.num_l2caches, 2))
     block_size_bits = int(math.log(options.cacheline_size, 2))
 
+    # Otherwise, the extra l2caches will be unused.
+    assert(l2_bits == math.ceil(math.log(options.num_l2caches, 2)))
+
     for i in xrange(options.num_cpus):
         #
         # First create the Ruby objects associated with this cpu
         #
         l1i_cache = L1Cache(size = options.l1i_size,
                             assoc = options.l1i_assoc,
                             start_index_bit = block_size_bits,
                             is_icache = True)
diff --git a/configs/ruby/MOESI_CMP_token.py b/configs/ruby/MOESI_CMP_token.py
--- a/configs/ruby/MOESI_CMP_token.py
+++ b/configs/ruby/MOESI_CMP_token.py
@@ -81,16 +81,19 @@ def create_system(options, full_system, 
 
     #
     # Must create the individual controllers before the network to ensure the
     # controller constructors are called before the network constructor
     #
     l2_bits = int(math.log(options.num_l2caches, 2))
     block_size_bits = int(math.log(options.cacheline_size, 2))
 
+    # Otherwise, the extra l2caches will be unused.
+    assert(l2_bits == math.ceil(math.log(options.num_l2caches, 2)))
+
     for i in xrange(options.num_cpus):
         #
         # First create the Ruby objects associated with this cpu
         #
         l1i_cache = L1Cache(size = options.l1i_size,
                             assoc = options.l1i_assoc,
                             start_index_bit = block_size_bits)
         l1d_cache = L1Cache(size = options.l1d_size,