Changes in benchmark/rmit.py [83b22b53:6f27b67]

File:

• benchmark/rmit.py (modified) (7 diffs)

benchmark/rmit.py

@@ -16 +16 @@
 import random
 import re
-import socket
 import subprocess
 import sys
@@ -96 +95 @@
         return nopts
 
-# returns the first option with key 'opt'
-def search_option(action, opt):
-        i = 0
-        while i < len(action):
-                if action[i] == opt:
-                        i += 1
-                        if i != len(action):
-                                return action[i]
-                i += 1
-
-        return None
-
 def actions_eta(actions):
         time = 0
         for a in actions:
-                o = search_option(a, '-d')
-                if o :
-                        time += int(o)
+                i = 0
+                while i < len(a):
+                        if a[i] == '-d':
+                                i += 1
+                                if i != len(a):
+                                        time += int(a[i])
+                        i += 1
         return time
-
-taskset_maps = None
-
-def init_taskset_maps():
-        global taskset_maps
-        known_hosts = {
-                "jax": {
-                        range(  1,  24) : "48-71",
-                        range( 25,  48) : "48-71,144-167",
-                        range( 49,  96) : "48-95,144-191",
-                        range( 97, 144) : "24-95,120-191",
-                        range(145, 192) : "0-95,96-191",
-                },
-        }
-
-        if (host := socket.gethostname()) in known_hosts:
-                taskset_maps = known_hosts[host]
-                return True
-
-        print("Warning unknown host '{}', disable taskset usage".format(host), file=sys.stderr)
-        return False
-
-
-def settaskset_one(action):
-        o = search_option(action, '-p')
-        if not o:
-                return action
-        try:
-                oi = int(o)
-        except ValueError:
-                return action
-
-        m = "Not found"
-        for key in taskset_maps:
-                if oi in key:
-                        return ['taskset', '-c', taskset_maps[key], *action]
-
-        print("Warning no mapping for {} cores".format(oi), file=sys.stderr)
-        return action
-
-def settaskset(actions):
-        return [settaskset_one(a) for a in actions]
 
 if __name__ == "__main__":
@@ -166 +115 @@
         parser.add_argument('--file', nargs='?', type=argparse.FileType('w'), default=sys.stdout)
         parser.add_argument('--trials', help='Number of trials to run per combinaison', type=int, default=3)
-        parser.add_argument('--notaskset', help='If specified, the trial will not use taskset to match the -p option', action='store_true')
         parser.add_argument('command', metavar='command', type=str, nargs=1, help='the command prefix to run')
         parser.add_argument('candidates', metavar='candidates', type=str, nargs='*', help='the candidate suffix to run')
@@ -222 +170 @@
 
         # ================================================================================
-        # Fixup the different commands
-
-        # Add tasksets
-        withtaskset = False
-        if not options.notaskset and init_taskset_maps():
-                withtaskset = True
-                actions = settaskset(actions)
-
-        # ================================================================================
-        # Now that we know what to run, print it.
-        # find expected time
-        time = actions_eta(actions)
-        print("Running {} trials{}".format(len(actions), "" if time == 0 else " (expecting to take {})".format(str(datetime.timedelta(seconds=int(time)))) ))
-
-        # dry run if options ask for it
+        # Figure out all the combinations to run
         if options.list:
                 for a in actions:
@@ -246 +180 @@
         # Prepare to run
 
+        # find expected time
+        time = actions_eta(actions)
+        print("Running {} trials{}".format(len(actions), "" if time == 0 else " (expecting to take {})".format(str(datetime.timedelta(seconds=int(time)))) ))
+
         random.shuffle(actions)
 
@@ -253 +191 @@
         first = True
         for i, a in enumerate(actions):
-                sa = " ".join(a[3:] if withtaskset else a)
+                sa = " ".join(a)
                 if first:
                         first = False
@@ -270 +208 @@
                                 match = re.search("^(.*):(.*)$", s)
                                 if match:
-                                        try:
-                                                fields[match.group(1).strip()] = float(match.group(2).strip().replace(',',''))
-                                        except:
-                                                pass
-
-                options.file.write(json.dumps([a[3 if withtaskset else 0][2:], sa, fields]))
+                                        fields[match.group(1).strip()] = float(match.group(2).strip().replace(',',''))
+
+                options.file.write(json.dumps([a[0][2:], sa, fields]))
                 options.file.flush()