Add 'make final' to only build the last (MIR, LIR) pair.

Author: Sean Stangl

Makefile

@@ -4,6 +4,12 @@ all: gv png pdf
 # Convenient shorthand.
 repng: clean png
 repdf: clean pdf
+refinal: clean final
+
+# Only generate the final (MIR, LIR) for each function.
+final: /tmp/ion.json
+	./iongraph --final $<
+	./genpngs
 
 gv: /tmp/ion.json
 	./iongraph $<

iongraph

@@ -204,7 +204,7 @@ def buildGraphsForPass(p):
     lir = p['lir']
     return (buildGraphForIR(name, mir, mir), buildGraphForIR(name, lir, mir))
 
-# function obj -> output file -> (Graph OR None, Graph OR None) list
+# function obj -> (Graph OR None, Graph OR None) list
 # First entry in each tuple corresponds to MIR; second, to LIR.
 def buildGraphs(func):
     graphstup = []
@@ -213,6 +213,11 @@ def buildGraphs(func):
         graphstup.append(gtup)
     return graphstup
 
+# function obj -> (Graph OR None, Graph OR None) list
+# Only builds the final pass.
+def buildOnlyFinalPass(func):
+    p = func['passes'][-1]
+    return [buildGraphsForPass(p)]
 
 # Write out a graph, constructing a nice filename.
 # function id -> pass id -> IR string -> Graph -> void
@@ -242,23 +247,45 @@ def parenthesize(s):
 
     return s
 
+def dieWithUsage():
+    sys.stderr.write(" Usage: " + sys.argv[0] + " [--final] <JSON file>\n")
+    sys.exit(1)
+
 def main():
 # Operate on provided file.
     from sys import argv
 
-    if len(argv) != 2 or argv[1] == '--help' or argv[1] == '-h':
-        sys.stderr.write(" Usage: " + sys.argv[0] + " <JSON file>\n")
-        sys.exit(1)
+    argFilename = ''
+    optFinal = False
+    
+
+    if len(argv) < 2 or argv[1] == '--help' or argv[1] == '-h':
+        dieWithUsage()
+
+    if len(argv) == 2:
+        argFilename = argv[1]
+    elif len(argv) == 3:
+        if argv[1] != '--final':
+            dieWithUsage()
+        argFilename = argv[2]
+        optFinal = True
+    else:
+        dieWithUsage()
 
-    f = open(argv[1], 'r')
+    f = open(argFilename, 'r')
     s = f.read()
     f.close()
 
     ion = json.loads(parenthesize(s))
 
     for i in range(0, len(ion['functions'])):
         func = ion['functions'][i]
-        gtl = buildGraphs(func)
+
+        gtl = []
+        if optFinal:
+            gtl = buildOnlyFinalPass(func)
+        else:
+            gtl = buildGraphs(func)
 
         if len(gtl) == 0:
             sys.stderr.write(" function %d (%s): abort during SSA construction.\n" % (i, func['name']))
@@ -270,8 +297,15 @@ def main():
             mir = gt[0]
             lir = gt[1]
 
-            # Only output one of (MIR, LIR). Prefer LIR.
-            # This is just to avoid spam; change if you care about it.
+            # If only the final pass is requested, output both MIR and LIR.
+            if optFinal:
+                if lir != None:
+                    outputPass(i, j, 'lir', lir)
+                if mir != None:
+                    outputPass(i, j, 'mir', mir)
+                continue
+
+            # Normally, only output one of (MIR, LIR), preferring LIR.
             if lir != None:
                 outputPass(i, j, 'lir', lir)
             elif mir != None: