Update ccnuma_fs scripts.

Author: mcai

compile_ALPHA.sh

@@ -1,5 +1,6 @@
 #!/usr/bin/env bash
 #scons build/ALPHA/gem5.fast
-scons build/ALPHA_MESI_Two_Level/gem5.opt
+#scons build/ALPHA_MESI_Two_Level/gem5.opt
+scons build/ALPHA_MESI_Two_Level/gem5.opt TRACING_ON=1
 #~ scons build/ARM/gem5.fast -j2
 #scons build/ALPHA_MESI_CMP_directory/gem5.fast -j2

configs/common/Options.py

@@ -205,6 +205,8 @@ def addCommonOptions(parser):
         help="switch from timing to Detailed CPU after warmup period of <N>")
     parser.add_option("-p", "--prog-interval", type="str",
         help="CPU Progress Interval")
+    parser.add_option("--two-phase", action="store",
+                      help="switch from atomic to timing CPU after kernel boots")
 
     # Fastforwarding and simpoint related materials
     parser.add_option("-W", "--warmup-insts", action="store", type="int",

configs/common/Simulation.py

@@ -78,7 +78,7 @@ def setCPUClass(options):
         if options.restore_with_cpu != options.cpu_type:
             CPUClass = TmpClass
             TmpClass, test_mem_mode = getCPUClass(options.restore_with_cpu)
-    elif options.fast_forward:
+    elif options.fast_forward or options.two_phase:
         CPUClass = TmpClass
         TmpClass = AtomicSimpleCPU
         test_mem_mode = 'atomic'
@@ -633,6 +633,9 @@ def run(options, root, testsys, cpu_class):
             print "Switch at instruction count:%s" % \
                     str(testsys.cpu[0].max_insts_any_thread)
             exit_event = m5.simulate()
+        elif options.two_phase:
+            print "Switch after kernel boots"
+            exit_event = m5.simulate()
         else:
             print "Switch at curTick count:%s" % str(10000)
             exit_event = m5.simulate(10000)
@@ -682,7 +685,7 @@ def run(options, root, testsys, cpu_class):
         restoreSimpointCheckpoint()
 
     else:
-        if options.fast_forward:
+        if options.fast_forward or options.two_phase:
             m5.stats.reset()
         print "**** REAL SIMULATION ****"
 

configs/numa/ccnuma_FSConfig.py

@@ -54,6 +54,15 @@ def childImage(self, ci):
         self.image.child.image_file = ci
 
 class MemBus(SystemXBar):
+    # pass
+    badaddr_responder = BadAddr()
+    default = Self.badaddr_responder.pio
+
+class CoherentSystemBus(SystemXBar):
+    badaddr_responder = BadAddr()
+    default = Self.badaddr_responder.pio
+
+class NonCoherentSystemBus(IOXBar):
     badaddr_responder = BadAddr()
     default = Self.badaddr_responder.pio
 
@@ -64,7 +73,7 @@ def fillInCmdline(mdesc, template, **kwargs):
     kwargs.setdefault('script', mdesc.script())
     return template % kwargs
 
-def makeLinuxAlphaSystem(mem_mode, mdesc=None, ruby=False, cmdline=None):
+def makeLinuxAlphaSystem(mem_mode, options, mdesc=None, cmdline=None):
     class BaseTsunami(Tsunami):
         ethernet = NSGigE(pci_bus=0, pci_dev=1, pci_func=0)
         ide = IdeController(disks=[Parent.disk0, Parent.disk2],
@@ -88,7 +97,13 @@ class BaseTsunami(Tsunami):
     self.tsunami.ethernet.pio = self.iobus.master
     self.tsunami.ethernet.config = self.iobus.master
 
-    self.systembus = IOXBar()
+    self.systembus = MemBus()
+    # self.systembus = IOXBar()
+
+    # if options.caches or options.l2cache:
+    #     self.systembus = CoherentSystemBus()
+    # else:
+    #     self.systembus = NonCoherentSystemBus()
 
     # By default the bridge responds to all addresses above the I/O
     # base address (including the PCI config space)

configs/numa/ccnuma_fs.py

@@ -81,6 +81,14 @@ def cmd_line_template():
         return open(options.command_line_file).read().strip()
     return None
 
+class NUMACache(Cache):
+    assoc = 8
+    hit_latency = 50
+    response_latency = 50
+    mshrs = 20
+    size = '1kB'
+    tgts_per_mshr = 12
+
 class Domain:
     def __init__(self, id = -1):
         self.id = id
@@ -92,7 +100,7 @@ def __init__(self, id = -1):
 def build_test_system(np):
     cmdline = cmd_line_template()
     if buildEnv['TARGET_ISA'] == "alpha":
-        test_sys = makeLinuxAlphaSystem(test_mem_mode, bm[0], options.ruby,
+        test_sys = makeLinuxAlphaSystem(test_mem_mode, options, bm[0],
                                         cmdline=cmdline)
     else:
         fatal("Incapable of building %s full system!", buildEnv['TARGET_ISA'])
@@ -154,8 +162,10 @@ def build_test_system(np):
 
     for domain in domains:
         if  options.caches or options.l2cache:
-            domain.numa_cache_downward = IOCache(addr_ranges = [])
+            # domain.numa_cache_downward = IOCache(addr_ranges = [])
             domain.numa_cache_upward = IOCache(addr_ranges = [])
+            domain.numa_cache_downward = NUMACache(addr_ranges = [])
+            # domain.numa_cache_upward = NUMACache(addr_ranges = [])
 
             for r in range(options.num_domains):
                 addr_range = [AddrRange(Addr(str(r * 512) + 'MB'), size = options.mem_size_per_domain)] # TODO: 512 should not be hardcoded

run_all_experiments_ALPHA.py

@@ -28,6 +28,7 @@
             else:
                 dir = 'results/alpha/' + l2_tags + '/' + bench +'/' + str(num_thread) + 'c/'
 
+            os.system('rm -fr ' + dir)
             os.system('mkdir -p ' + dir)
 
             cmd_first_run = 'build/ALPHA_MESI_Two_Level/gem5.opt -d ' + dir + ' configs/example/fs.py --num-cpus=' \

run_all_experiments_ALPHA_CCNUMA.py

@@ -20,16 +20,17 @@
     for num_thread in num_threads:
         dir = 'results/alpha_ccnuma/' + bench +'/' + str(num_thread) + 'c/'
 
+        os.system('rm -fr ' + dir)
         os.system('mkdir -p ' + dir)
 
-        cmd_first_run = 'build/ALPHA_MESI_Two_Level/gem5.opt -d ' + dir + ' configs/numa/ccnuma_fs.py --num-cpus=' \
+        cmd_first_run = 'build/ALPHA_MESI_Two_Level/gem5.opt --debug-flags=AddrRanges -d ' + dir + ' configs/numa/ccnuma_fs.py --num-cpus=' \
                         + str(num_thread) + ' --script=ext/parsec/2.1/run_scripts/' \
                         + bench + '_' + str(num_thread) + 'c_simsmall_ckpts.rcS' \
                         + ' --num_domains=2 --num_cpus_per_domain=2 --mem_size_per_domain=512MB'
         print cmd_first_run
         os.system(cmd_first_run)
 
-        cmd_second_run = 'build/ALPHA_MESI_Two_Level/gem5.opt -d ' + dir + ' configs/numa/ccnuma_fs.py --cpu-type=timing --num-cpus=' \
+        cmd_second_run = 'build/ALPHA_MESI_Two_Level/gem5.opt --debug-flags=AddrRanges -d ' + dir + ' configs/numa/ccnuma_fs.py --cpu-type=timing --num-cpus=' \
                          + str(num_thread) \
                          + ' --caches --l2cache --num-l2caches=1' \
                          + ' --l1d_size=32kB --l1i_size=32kB --l2_size=256kB --checkpoint-restore=1 --restore-with-cpu=timing' \

run_all_experiments_ALPHA_CCNUMA_no_checkpoints.py

@@ -0,0 +1,37 @@
+#!/usr/bin/python
+
+#
+# A Python script to run all checkpoint-based experiments for PARSEC 2.1 benchmarks.
+#
+# Copyright (C) Min Cai 2015
+#
+
+import os
+
+# benches = ['blackscholes', 'bodytrack', 'canneal', 'dedup', 'facesim',
+#            'ferret', 'fluidanimate', 'freqmine', 'streamcluster',
+#            'swaptions', 'vips', 'x264']
+benches = ['blackscholes']
+
+# num_threads = [1, 2, 4, 8, 16, 32]
+num_threads = [4]
+
+for bench in benches:
+    for num_thread in num_threads:
+        dir = 'results/alpha_ccnuma_no_checkpoints/' + bench +'/' + str(num_thread) + 'c/'
+
+        os.system('rm -fr ' + dir)
+        os.system('mkdir -p ' + dir)
+
+        cmd_run = 'build/ALPHA_MESI_Two_Level/gem5.opt -d ' + dir + ' configs/numa/ccnuma_fs.py --two-phase --cpu-type=timing --num-cpus=' \
+                         + str(num_thread) + ' --script=ext/parsec/2.1/run_scripts/' \
+                          + bench + '_' + str(num_thread) + 'c_simsmall.rcS' \
+                          + ' --caches --l2cache --num-l2caches=1' \
+                         + ' --l1d_size=32kB --l1i_size=32kB --l2_size=256kB' \
+                         + ' --num_domains=2 --num_cpus_per_domain=2 --mem_size_per_domain=512MB'
+        print cmd_run
+        os.system(cmd_run)
+
+        # cmd_mcpat = './mcpat.py --config=' + dir + 'config.json --stats=' + dir + 'stats.txt --mcpat_in=' + dir + 'mcpat_in.xml --mcpat_out=' + dir + 'mcpat_out.txt'
+        # print cmd_mcpat
+        # os.system(cmd_mcpat)

run_all_experiments_ALPHA_RUBY_GARNET.py

@@ -20,6 +20,8 @@
 for bench in benches:
     for num_thread in num_threads:
         dir = 'results/alpha_ruby_garnet/' + bench + '/' + str(num_thread) + 'c/'
+
+        os.system('rm -fr ' + dir)
         os.system('mkdir -p ' + dir)
 
         num_dirs = 2 # TODO: should not be hardcoded!!!

run_all_experiments_ALPHA_no_checkpoints.py

@@ -0,0 +1,36 @@
+#!/usr/bin/python
+
+#
+# A Python script to run all checkpoint-based experiments for PARSEC 2.1 benchmarks.
+#
+# Copyright (C) Min Cai 2015
+#
+
+import os
+
+# benches = ['blackscholes', 'bodytrack', 'canneal', 'dedup', 'facesim',
+#            'ferret', 'fluidanimate', 'freqmine', 'streamcluster',
+#            'swaptions', 'vips', 'x264']
+benches = ['blackscholes']
+
+# num_threads = [1, 2, 4, 8, 16, 32]
+num_threads = [4]
+
+for bench in benches:
+    for num_thread in num_threads:
+        dir = 'results/alpha_no_checkpoints/' + bench +'/' + str(num_thread) + 'c/'
+
+        os.system('rm -fr ' + dir)
+        os.system('mkdir -p ' + dir)
+
+        cmd_run = 'build/ALPHA_MESI_Two_Level/gem5.opt -d ' + dir + ' configs/example/fs.py --two-phase --cpu-type=timing --num-cpus=' \
+                         + str(num_thread) + ' --script=ext/parsec/2.1/run_scripts/' \
+                          + bench + '_' + str(num_thread) + 'c_simsmall.rcS' \
+                          + ' --caches --l2cache --num-l2caches=1' \
+                         + ' --l1d_size=32kB --l1i_size=32kB --l2_size=256kB'
+        print cmd_run
+        os.system(cmd_run)
+
+        # cmd_mcpat = './mcpat.py --config=' + dir + 'config.json --stats=' + dir + 'stats.txt --mcpat_in=' + dir + 'mcpat_in.xml --mcpat_out=' + dir + 'mcpat_out.txt'
+        # print cmd_mcpat
+        # os.system(cmd_mcpat)