MEM: Separate queries for snooping and address ranges

[gem5.git] / configs / splash2 / cluster.py

diff --git a/configs/splash2/cluster.py b/configs/splash2/cluster.py
index 769bdcf5a9acdec78f925a791661aeff2ad7a002..e8c471eaa7f79754544046d91606297391b9fb3a 100644 (file)
--- a/configs/splash2/cluster.py
+++ b/configs/splash2/cluster.py
@@ -30,10 +30,14 @@
 #
 # "m5 test.py"
 
+import os
+import optparse
+import sys
+
 import m5
 from m5.objects import *
-import os, optparse, sys
-m5.AddToPath('../common')
+
+m5.util.addToPath('../common')
 
 # --------------------
 # Define Command Line Options
@@ -230,7 +234,6 @@ for cluster in clusters:
     for cpu in cluster.cpus:
         cpu.icache_port = cluster.clusterbus.port
         cpu.dcache_port = cluster.clusterbus.port
-        cpu.mem = cluster.l1
 
 # ----------------------
 # Define the root
@@ -266,10 +269,11 @@ elif options.benchmark == 'WaterNSquared':
 elif options.benchmark == 'WaterSpatial':
     root.workload = Water_spatial()
 else:
-    panic("The --benchmark environment variable was set to something" \
-          +" improper.\nUse Cholesky, FFT, LUContig, LUNoncontig, Radix" \
-          +", Barnes, FMM, OceanContig,\nOceanNoncontig, Raytrace," \
-          +" WaterNSquared, or WaterSpatial\n")
+    m5.util.panic("""
+The --benchmark environment variable was set to something improper.
+Use Cholesky, FFT, LUContig, LUNoncontig, Radix, Barnes, FMM, OceanContig,
+OceanNoncontig, Raytrace, WaterNSquared, or WaterSpatial
+""")
 
 # --------------------
 # Assign the workload to the cpus
@@ -287,7 +291,7 @@ if options.timing or options.detailed:
     root.system.mem_mode = 'timing'
 
 # instantiate configuration
-m5.instantiate(root)
+m5.instantiate()
 
 # simulate until program terminates
 if options.maxtick: