Merge branch 'master' into experiments

experiments/modes/exectools.py

@@ -159,16 +159,16 @@ class SimpleComponent(Component):
     async def process_out(self, lines, eof):
         if self.verbose:
             for l in lines:
-                print(self.label, 'OUT:', lines)
+                print(self.label, 'OUT:', lines, flush=True)
 
     async def process_err(self, lines, eof):
         if self.verbose:
             for l in lines:
-                print(self.label, 'ERR:', lines)
+                print(self.label, 'ERR:', lines, flush=True)
 
     async def terminated(self, rc):
         if self.verbose:
-            print(self.label, 'TERMINATED:', rc)
+            print(self.label, 'TERMINATED:', rc, flush=True)
         if not self.canfail and rc != 0:
             raise Exception('Command Failed: ' + str(self.cmd_parts))
 

experiments/modes/runtime.py

@@ -200,7 +200,11 @@ class SlurmRuntime(Runtime):
                 s = int(exp.timeout % 60)
                 f.write('#SBATCH --time=%02d:%02d:%02d\n' % (h, m, s))
 
-            f.write('python3 run.py --pickled %s\n' % (exp_path))
+            extra = ''
+            if self.verbose:
+                extra = '--verbose'
+
+            f.write('python3 run.py %s --pickled %s\n' % (extra, exp_path))
             f.write('status=$?\n')
             if self.cleanup:
                 f.write('rm -rf %s\n' % (run.env.workdir))

experiments/modes/simulators.py

+import math
+
 class Simulator(object):
     # number of cores required for this simulator
     def resreq_cores(self):
@@ -103,7 +105,17 @@ class QemuHost(HostSim):
             f'-m {self.node_config.memory} -smp {self.node_config.cores} ')
 
         if self.sync:
-            cmd += ' -cpu Skylake-Server -icount shift=0,sleep=off '
+            unit = self.cpu_freq[-3:]
+            if unit.lower() == 'ghz':
+                base = 0
+            elif unit.lower() == 'mhz':
+                base = 3
+            else:
+                raise Exception('cpu frequency specified in unsupported unit')
+            num = float(self.cpu_freq[:-3])
+            shift = base - int(math.ceil(math.log(num, 2)))
+
+            cmd += f' -cpu Skylake-Server -icount shift={shift},sleep=off '
         else:
             cmd += ' -cpu host -enable-kvm '
 

experiments/pyexps/dctcp.py

@@ -10,7 +10,7 @@ import modes.nodeconfig as node
 # net:  switch/dumbbell/bridge
 # app: DCTCPm
 
-types_of_host = ['qemu', 'gt']
+types_of_host = ['qemu', 'qt','gt']
 types_of_nic = ['cv','cb','ib']
 types_of_net = ['dumbbell']
 types_of_app = ['DCTCPm']
@@ -41,13 +41,19 @@ for h in types_of_host:
 
             e = exp.Experiment( h + '-' + c + '-' + 'dumbbell' + '-' + 'DCTCPm' + f'{k_val}' + f'-{mtu}')
             e.add_network(net)
-            e.checkpoint = True
 
             # host
             if h == 'qemu':
                 host_class = sim.QemuHost
+            elif h == 'qt':
+                def qemu_timing():
+                    h = sim.QemuHost()
+                    h.sync = True
+                    return h
+                host_class = qemu_timing
             elif h == 'gt':
                 host_class = sim.Gem5Host
+                e.checkpoint = True
             else:
                 raise NameError(h)
 

libnicbm/nicbm.cc

@@ -34,22 +34,18 @@ static void sigusr1_handler(int dummy)
 
 volatile union cosim_pcie_proto_d2h *Runner::d2h_alloc(void)
 {
-    volatile union cosim_pcie_proto_d2h *msg =
-        nicsim_d2h_alloc(&nsparams, main_time);
-    if (msg == NULL) {
+    volatile union cosim_pcie_proto_d2h *msg;
+    while ((msg = nicsim_d2h_alloc(&nsparams, main_time)) == NULL) {
         fprintf(stderr, "d2h_alloc: no entry available\n");
-        abort();
     }
     return msg;
 }
 
 volatile union cosim_eth_proto_d2n *Runner::d2n_alloc(void)
 {
-    volatile union cosim_eth_proto_d2n *msg =
-        nicsim_d2n_alloc(&nsparams, main_time);
-    if (msg == NULL) {
+    volatile union cosim_eth_proto_d2n *msg;
+    while ((msg = nicsim_d2n_alloc(&nsparams, main_time)) == NULL) {
         fprintf(stderr, "d2n_alloc: no entry available\n");
-        abort();
     }
     return msg;
 }