se.py, fs.py:

import Caches
Simulation.py:
Fix typo - L2Cache --> L1Cache

configs/common/Simulation.py:
    Fix typo - L2Cache --> L1Cache
configs/example/fs.py:
configs/example/se.py:
    import Caches

--HG--
extra : convert_revision : 4292225b322c069665262eab7c83b5341844fba0

diff --git a/configs/common/FSConfig.py b/configs/common/FSConfig.py
index 05888b10b575a8f80f5b7dbb50ffe0ea8f964cf8..7ba1b001c33197471a0e145c632dcbe9aee48870 100644 (file)
--- a/configs/common/FSConfig.py
+++ b/configs/common/FSConfig.py
@@ -72,7 +72,8 @@ def makeLinuxAlphaSystem(mem_mode, mdesc = None):
     self.mem_mode = mem_mode
     self.sim_console = SimConsole(listener=ConsoleListener(port=3456))
     self.kernel = binary('vmlinux')
-    self.pal = binary('ts_osfpal')
+##    self.pal = binary('ts_osfpal')
+    self.pal = '/z/hsul/work/m5/alpha-system/palcode/ts_osfpal'
     self.console = binary('console')
     self.boot_osflags = 'root=/dev/hda1 console=ttyS0'
 

diff --git a/configs/common/Simulation.py b/configs/common/Simulation.py
index a2d045a5ea17bdab0facdef9b6e4ec325c56ca1e..5e9c1d3399064fbdf33d1a855186f0254b21eb4d 100644 (file)
--- a/configs/common/Simulation.py
+++ b/configs/common/Simulation.py
@@ -30,7 +30,7 @@ from os import getcwd
 import m5
 from m5.objects import *
 m5.AddToPath('../common')
-from Caches import *
+from Caches import L1Cache
 
 def run(options, root, testsys):
     if options.maxtick:

diff --git a/configs/example/fs.py b/configs/example/fs.py
index aefa261691d488f210f07c85a7873c2e2d225ebe..3ce4638791a6693aaf52ad144053ed6d7ea6c971 100644 (file)
--- a/configs/example/fs.py
+++ b/configs/example/fs.py
@@ -35,6 +35,7 @@ from FSConfig import *
 from SysPaths import *
 from Benchmarks import *
 import Simulation
+from Caches import *
 
 if not m5.build_env['FULL_SYSTEM']:
     m5.panic("This script requires full-system mode (ALPHA_FS).")
@@ -104,7 +105,7 @@ test_sys.cpu = [TestCPUClass(cpu_id=i) for i in xrange(np)]
 for i in xrange(np):
     if options.caches and not options.standard_switch:
         test_sys.cpu[i].addPrivateSplitL1Caches(L1Cache(size = '32kB'),
-                                                L2Cache(size = '64kB'))
+                                                L1Cache(size = '64kB'))
     test_sys.cpu[i].connectMemPorts(test_sys.membus)
     test_sys.cpu[i].mem = test_sys.physmem
 

diff --git a/configs/example/se.py b/configs/example/se.py
index 1afeaf39189d03c19e5cd4dae6629b9047ecc706..83c2b1f8dd51904740c3e8c5f1035e8045c5a626 100644 (file)
--- a/configs/example/se.py
+++ b/configs/example/se.py
@@ -35,11 +35,16 @@ from m5.objects import *
 import os, optparse, sys
 m5.AddToPath('../common')
 import Simulation
+from Caches import *
 
 # Get paths we might need.  It's expected this file is in m5/configs/example.
 config_path = os.path.dirname(os.path.abspath(__file__))
 config_root = os.path.dirname(config_path)
 m5_root = os.path.dirname(config_root)
+print m5_root
+print config_path
+print config_root
+
 
 parser = optparse.OptionParser()
 
@@ -111,7 +116,7 @@ system.physmem.port = system.membus.port
 for i in xrange(np):
     if options.caches and not options.standard_switch:
         system.cpu[i].addPrivateSplitL1Caches(L1Cache(size = '32kB'),
-                                              L2Cache(size = '64kB'))
+                                              L1Cache(size = '64kB'))
     system.cpu[i].connectMemPorts(system.membus)
     system.cpu[i].mem = system.physmem
     system.cpu[i].workload = process