Save feather-trace timer frequency, not CPU frequency, with each experiment.

4 files changed, 44 insertions, 27 deletions

diff --git a/common.py b/common.py
index ad3c418..6d1db97 100644
--- a/common.py
+++ b/common.py
@@ -33,12 +33,14 @@ def get_executable(prog, hint, optional=False):
 def get_config_option(option):
     '''Search for @option in installed kernel config (if present).
     Raise an IOError if the kernel config isn't found in /boot/.'''
-    uname = subprocess.check_output(["uname", "-r"])[-1]
+    uname = subprocess.check_output(["uname", "-r"]).strip()
     fname = "/boot/config-%s" % uname
 
     if os.path.exists(fname):
         config_regex = "^CONFIG_{}=(?P<val>.*)$".format(option)
-        match = re.search(config_regex, open(fname, 'r').read())
+        with open(fname, 'r') as f:
+            data = f.read()
+        match = re.search(config_regex, data, re.M)
         if not match:
             return None
         else:
diff --git a/config/config.py b/config/config.py
index d463999..31ef7c7 100644
--- a/config/config.py
+++ b/config/config.py
@@ -10,7 +10,7 @@ BINS = {'rtspin'    : get_executable('rtspin', 'liblitmus'),
         'ftsort'    : get_executable('ftsort', 'feather-trace-tools'),
         'st_trace'  : get_executable('st_trace', 'feather-trace-tools'),
         'trace-cmd' : get_executable('trace-cmd', 'rt-kernelshark'),
-                # Optional, as sched_trace is not a publically supported repository
+        # Optional, as sched_trace is not a publically supported repository
         'st_show'   : get_executable('st_show', 'sched_trace', True)}
 
 '''Names of output files.'''
@@ -20,19 +20,18 @@ FILES = {'ft_data'    : 'ft.bin',
          'log_data'   : 'trace.slog'}
 
 '''Default parameter names in params.py.'''
-# TODO: add check for config options
-PARAMS = {'sched'  : 'scheduler',     # Scheduler used by run_exps
-          'dur'    : 'duration',      # Duration of tests in run_exps
-          'kernel' : 'uname',         # Regex of required OS name in run_exps
-          'cycles' : 'cpu-frequency', # Frequency run_exps was run with
-          'tasks'  : 'tasks'          # Number of tasks
+PARAMS = {'sched'  : 'scheduler',       # Scheduler used by run_exps
+          'dur'    : 'duration',        # Duration of tests in run_exps
+          'kernel' : 'uname',           # Regex of required OS name in run_exps
+          'cycles' : 'clock-frequency', # Frequency run_exps was run with
+          'tasks'  : 'tasks'            # Number of tasks
           }
 
 '''Default values for program options.'''
 DEFAULTS = {'params_file' : 'params.py',
             'sched_file'  : 'sched.py',
             'duration'    : 10,
-            'spin'                : 'rtspin',
+            'spin'        : 'rtspin',
             'cycles'      : 2000}
 
 '''Default sched_trace events (this is all of them).'''
diff --git a/run/litmus_util.py b/run/litmus_util.py
index 340113d..ec1700e 100644
--- a/run/litmus_util.py
+++ b/run/litmus_util.py
@@ -4,6 +4,7 @@ import subprocess
 import os
 import stat
 import config.config as conf
+from common import get_config_option
 
 def num_cpus():
     '''Return the number of CPUs in the system.'''
@@ -17,18 +18,25 @@ def num_cpus():
                 cpus += 1
     return cpus
 
-def cpu_freq():
-    '''
-    The frequency (in MHz) of the CPU.
-    '''
-    reg = re.compile(r'^cpu MHz\s*:\s*(\d+)', re.M)
-    with open('/proc/cpuinfo', 'r') as f:
-        data = f.read()
-
-    match = re.search(reg, data)
-    if not match:
-        raise Exception("Cannot parse CPU frequency!")
-    return int(match.group(1))
+def ft_freq():
+    '''The frequency (in MHz) of the clock used by feather trace.'''
+    if get_config_option('CPU_V7') == 'y':
+        # Arm V7s use a millisecond timer
+        freq = 1000.0
+    elif get_config_option('X86') == 'y':
+        # X86 timer is equal to processor clock
+        reg = re.compile(r'^cpu MHz\s*:\s*(?P<FREQ>\d+)', re.M)
+        with open('/proc/cpuinfo', 'r') as f:
+            data = f.read()
+
+        match = re.search(reg, data)
+        if not match:
+            raise Exception("Cannot parse CPU frequency from x86 CPU!")
+        freq = int(match.group('FREQ'))
+    else:
+        # You're on your own
+        freq = 0
+    return freq
 
 def switch_scheduler(switch_to_in):
     '''Switch the scheduler to whatever is passed in.
diff --git a/run_exps.py b/run_exps.py
index 8fd9ed2..d1e0026 100755
--- a/run_exps.py
+++ b/run_exps.py
@@ -14,9 +14,13 @@ from run.executable.executable import Executable
 from run.experiment import Experiment,ExperimentDone
 from run.proc_entry import ProcEntry
 
-def InvalidKernel(Exception):
-    def __init__(self, kernel):
+class InvalidKernel(Exception):
+    def __init__(self, kernel, wanted):
         self.kernel = kernel
+        self.wanted = wanted
+
+    def __str__(self):
+        return "Kernel '%s' does not match '%s'." % (self.kernel, self.wanted)
 
 def parse_args():
     parser = OptionParser("usage: %prog [options] [sched_file]... [exp_dir]...")
@@ -114,12 +118,16 @@ def load_experiment(sched_file, scheduler, duration, param_file, out_dir):
     run_exp(sched_file, schedule, scheduler, kernel, duration, work_dir, out_dir)
 
     # Save parameters used to run experiment in out_dir
-    # Cycles is saved here for accurate overhead calculations later
     out_params = dict(params.items() +
                       [(conf.PARAMS['sched'],  scheduler),
                        (conf.PARAMS['tasks'],  len(schedule['spin'])),
-                       (conf.PARAMS['dur'],    duration),
-                       (conf.PARAMS['cycles'], lu.cpu_freq())])
+                       (conf.PARAMS['dur'],    duration)])
+
+    # Feather-trace clock frequency saved for accurate overhead parsing
+    ft_freq = lu.ft_freq()
+    if ft_freq:
+        out_params[conf.PARAMS['cycles']] = ft_freq
+
     with open("%s/%s" % (out_dir, conf.DEFAULTS['params_file']), 'w') as f:
         f.write(str(out_params))