[llvm] r328608 - [MachineScheduler] Add itinerary to schedcover.py. Make default work in the command line filter

[Craig Topper via llvm-commits]

Author: ctopper
Date: Mon Mar 26 21:26:39 2018
New Revision: 328608

URL: http://llvm.org/viewvc/llvm-project?rev=328608&view=rev
Log:
[MachineScheduler] Add itinerary to schedcover.py. Make default work in the command line filter

Summary:
This patch adds itinerary support to the schedcover.py script. I've been trying to use this script to figure out why SSE and AVX instructions are ending up in separate tablegen scheduler classes and sometimes its because we are using different itineraries.

Rather than using None to indicate the default scheduler model, I now use the string "default". I had to hack around the sorting a little to keep "default" at the beginning. But this also makes it so you can specify "default" on the command line to just get the defaults

I also fixed the regular expression code so that the no_default wasn't evaluated twice.

Reviewers: RKSimon, atrick, jmolloy, javed.absar

Reviewed By: javed.absar

Subscribers: llvm-commits

Differential Revision: https://reviews.llvm.org/D44834

Modified:
    llvm/trunk/utils/schedcover.py

Modified: llvm/trunk/utils/schedcover.py
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/utils/schedcover.py?rev=328608&r1=328607&r2=328608&view=diff
==============================================================================
--- llvm/trunk/utils/schedcover.py (original)
+++ llvm/trunk/utils/schedcover.py Mon Mar 26 21:26:39 2018
@@ -31,20 +31,26 @@ def filter_model(m):
 def display():
     global table, models
 
+    # remove default and itinerary so we can control their sort order to make
+    # them first
+    models.discard("default")
+    models.discard("itinerary")
+
     ordered_table  = sorted(table.items(), key=operator.itemgetter(0))
-    ordered_models = filter(filter_model, sorted(models))
+    ordered_models = ["itinerary", "default"]
+    ordered_models.extend(sorted(models))
+    ordered_models = filter(filter_model, ordered_models)
 
     # print header
     sys.stdout.write("instruction")
     for model in ordered_models:
-        if not model: model = "default"
         sys.stdout.write(", {}".format(model))
     sys.stdout.write(os.linesep)
 
     for (instr, mapping) in ordered_table:
         sys.stdout.write(instr)
         for model in ordered_models:
-            if model in mapping:
+            if model in mapping and mapping[model] is not None:
                 sys.stdout.write(", {}".format(mapping[model]))
             else:
                 sys.stdout.write(", ")
@@ -57,18 +63,21 @@ def machineModelCover(path):
     re_sched_no_default = re.compile("No machine model for ([^ ]*)\n");
     re_sched_spec = re.compile("InstRW on ([^ ]*) for ([^ ]*) (.*)\n");
     re_sched_no_spec = re.compile("No machine model for ([^ ]*) on processor (.*)\n");
+    re_sched_itin = re.compile("Itinerary for ([^ ]*): ([^ ]*)\n")
 
     # scan the file
     with open(path, 'r') as f:
         for line in f.readlines():
             match = re_sched_default.match(line)
-            if match: add(match.group(1), None, match.group(2))
+            if match: add(match.group(1), "default", match.group(2))
             match = re_sched_no_default.match(line)
-            if match: add(match.group(1), None)
+            if match: add(match.group(1), "default")
             match = re_sched_spec.match(line)
             if match: add(match.group(2), match.group(1), match.group(3))
-            match = re_sched_no_default.match(line)
-            if match: add(match.group(1), None)
+            match = re_sched_no_spec.match(line)
+            if match: add(match.group(1), match.group(2))
+            match = re_sched_itin.match(line)
+            if match: add(match.group(1), "itinerary", match.group(2))
 
     display()