change in the multicore version runtime. now it is able to choose which cores to...
[IRC.git] / Robust / src / Main / Main.java
index 5bcfe4353d834fd4ab1bd2d8b8095149d7f0564e..748c0027fa06bdfcf33a21ecfae53e671574d0e8 100644 (file)
@@ -17,10 +17,12 @@ import IR.Tree.SemanticCheck;
 import IR.Flat.BuildCodeMultiCore;
 import IR.Flat.BuildFlat;
 import IR.Flat.BuildCode;
+import IR.Flat.Inliner;
 import IR.ClassDescriptor;
 import IR.State;
 import IR.TaskDescriptor;
 import IR.TypeUtil;
+import Analysis.Scheduling.MCImplSynthesis;
 import Analysis.Scheduling.Schedule;
 import Analysis.Scheduling.ScheduleAnalysis;
 import Analysis.Scheduling.ScheduleSimulator;
@@ -39,6 +41,13 @@ import Analysis.Locality.GenerateConversions;
 import Analysis.Prefetch.PrefetchAnalysis;
 import Analysis.FlatIRGraph.FlatIRGraph;
 import Analysis.OwnershipAnalysis.OwnershipAnalysis;
+import Analysis.Disjoint.DisjointAnalysis;
+import Analysis.MLP.MLPAnalysis;
+import Analysis.Loops.*;
+import Analysis.Liveness;
+import Analysis.ArrayReferencees;
+import IR.MethodDescriptor;
+import IR.Flat.FlatMethod;
 import Interface.*;
 import Util.GraphNode;
 import Util.GraphNode.DFS;
@@ -51,6 +60,13 @@ public class Main {
   public static void main(String args[]) throws Exception {
     String ClassLibraryPrefix="./ClassLibrary/";
     State state=new State();
+    Vector sourcefiles=new Vector();
+    state.classpath.add(".");
+
+    String outputdir = null;
+    boolean isDistributeInfo = false;
+    boolean isDisAll = false;
+    int startnum = 0;
 
     for(int i=0; i<args.length; i++) {
       String option=args[i];
@@ -64,13 +80,21 @@ public class Main {
        state.FASTCHECK=true;
       else if (option.equals("-selfloop"))
        state.selfloops.add(args[++i]);
+         else if (option.equals("-outputdir"))
+       state.outputdir = args[++i];
       else if (option.equals("-excprefetch"))
        state.excprefetch.add(args[++i]);
       else if (option.equals("-classlibrary"))
-       ClassLibraryPrefix=args[++i]+"/";
-      else if(option.equals("-numcore")) {
+       state.classpath.add(args[++i]);
+      else if (option.equals("-inlineatomic")) {
+       state.INLINEATOMIC=true;
+       state.inlineatomicdepth=Integer.parseInt(args[++i]);
+      } else if(option.equals("-numcore")) {
        ++i;
        state.CORENUM = Integer.parseInt(args[i]);
+      } else if(option.equals("-numcore4gc")) {
+        ++i;
+        state.CORENUM4GC = Integer.parseInt(args[i]);
       } else if (option.equals("-mainclass"))
        state.main=args[++i];
       else if (option.equals("-trueprob")) {
@@ -79,8 +103,12 @@ public class Main {
        State.PRINTFLAT=true;
       else if (option.equals("-printscheduling"))
        State.PRINTSCHEDULING=true;
+      else if (option.equals("-minimize"))
+       state.MINIMIZE=true;
       else if (option.equals("-printschedulesim"))
        State.PRINTSCHEDULESIM=true;
+      else if (option.equals("-printcriticalpath"))
+         State.PRINTCRITICALPATH=true;
       else if (option.equals("-struct"))
        state.structfile=args[++i];
       else if (option.equals("-conscheck"))
@@ -89,10 +117,20 @@ public class Main {
        state.TASK=true;
       else if (option.equals("-abortreaders"))
        state.ABORTREADERS=true;
+      else if (option.equals("-sandbox"))
+       state.SANDBOX=true;
       else if (option.equals("-taskstate"))
        state.TASKSTATE=true;
       else if (option.equals("-tagstate"))
        state.TAGSTATE=true;
+      else if (option.equals("-stmarray"))
+       state.STMARRAY=true;
+      else if (option.equals("-eventmonitor"))
+       state.EVENTMONITOR=true;
+      else if (option.equals("-dualview"))
+       state.DUALVIEW=true;
+      else if (option.equals("-hybrid"))
+       state.HYBRID=true;
       else if (option.equals("-flatirtasks")) {
        state.FLATIRGRAPH=true;
        state.FLATIRGRAPHTASKS=true;
@@ -104,6 +142,8 @@ public class Main {
        state.FLATIRGRAPHLIBMETHODS=true;
       } else if (option.equals("-multicore"))
        state.MULTICORE=true;
+      else if (option.equals("-multicoregc"))
+        state.MULTICOREGC=true;
       else if (option.equals("-ownership"))
        state.OWNERSHIP=true;
       else if (option.equals("-ownallocdepth")) {
@@ -113,33 +153,109 @@ public class Main {
        if (args[++i].equals("all")) {
          state.OWNERSHIPWRITEALL=true;
        }
-      } else if (option.equals("-ownaliasfile"))
+      } else if (option.equals("-ownaliasfile")) {
+       state.OWNERSHIPALIASFILE=args[++i];
+      } else if (option.equals("-ownaliasfiletab")) {
        state.OWNERSHIPALIASFILE=args[++i];
+        state.OWNERSHIPALIASTAB=true;      
+      } else if (option.equals("-owndebugcallee")) {
+       state.OWNERSHIPDEBUGCALLEE=args[++i];
+      } else if (option.equals("-owndebugcaller")) {
+       state.OWNERSHIPDEBUGCALLER=args[++i];
+      } else if (option.equals("-owndebugcallcount")) {
+       state.OWNERSHIPDEBUGCALLCOUNT=Integer.parseInt(args[++i]);
+      }
+      else if (option.equals("-disjoint"))
+       state.DISJOINT=true;
+      else if (option.equals("-disjoint-k")) {
+       state.DISJOINTALLOCDEPTH=Integer.parseInt(args[++i]);
+      } else if (option.equals("-disjoint-write-dots")) {
+       state.DISJOINTWRITEDOTS = true;
+        String arg = args[++i];
+       if( arg.equals("all") ) {
+         state.DISJOINTWRITEALL = true;
+       } else if( arg.equals("final") ) {
+          state.DISJOINTWRITEALL = false;
+        } else {
+          throw new Error("disjoint-write-dots requires argument <all/final>");
+        }
+      } else if (option.equals("-disjoint-alias-file")) {
+       state.DISJOINTALIASFILE = args[++i];
+        String arg = args[++i];
+       if( arg.equals("normal") ) {
+         state.DISJOINTALIASTAB = false;
+       } else if( arg.equals("tabbed") ) {
+          state.DISJOINTALIASTAB = true;
+        } else {
+          throw new Error("disjoint-alias-file requires arguments <filename> <normal/tabbed>");
+        }
+      } else if (option.equals("-disjoint-debug-callsite")) {
+       state.DISJOINTDEBUGCALLEE=args[++i];
+       state.DISJOINTDEBUGCALLER=args[++i];
+       state.DISJOINTDEBUGCALLCOUNT=Integer.parseInt(args[++i]);
+      }
       else if (option.equals("-optional"))
        state.OPTIONAL=true;
+      else if (option.equals("-optimize"))
+       state.OPTIMIZE=true;
+      else if (option.equals("-dcopts"))
+       state.DCOPTS=true;
+      else if (option.equals("-arraypad"))
+       state.ARRAYPAD=true;
+      else if (option.equals("-delaycomp"))
+       state.DELAYCOMP=true;
       else if (option.equals("-raw"))
        state.RAW=true;
       else if (option.equals("-scheduling"))
        state.SCHEDULING=true;
-      else if (option.equals("-useprofile"))
+      else if (option.equals("-distributioninfo"))
+       isDistributeInfo=true;
+      else if (option.equals("-disall"))
+        isDisAll=true;
+      else if (option.equals("-disstart"))
+        startnum = Integer.parseInt(args[++i]);
+      else if (option.equals("-useprofile")) {
        state.USEPROFILE=true;
+    state.profilename = args[++i];
+      }
       else if (option.equals("-thread"))
        state.THREAD=true;
       else if (option.equals("-dsm"))
        state.DSM=true;
+      else if (option.equals("-recoverystats"))
+  state.DSMRECOVERYSTATS=true;
+      else if (option.equals("-dsmtask"))
+  state.DSMTASK=true;
+      else if (option.equals("-singleTM"))
+       state.SINGLETM=true;
+      else if (option.equals("-readset"))
+       state.READSET=true;
       else if (option.equals("-webinterface"))
        state.WEBINTERFACE=true;
       else if (option.equals("-instructionfailures"))
        state.INSTRUCTIONFAILURE=true;
       else if (option.equals("-abcclose"))
        state.ARRAYBOUNDARYCHECK=false;
-      else if (option.equals("-help")) {
+
+      else if (option.equals("-mlp")) {
+       state.MLP            = true;
+       state.OWNERSHIP      = true;
+       state.MLP_NUMCORES   = Integer.parseInt( args[++i] );
+       state.MLP_MAXSESEAGE = Integer.parseInt( args[++i] );
+
+      } else if (option.equals("-mlpdebug")) {
+       state.MLPDEBUG=true;
+
+      } else if (option.equals("-methodeffects")) {
+       state.METHODEFFECTS=true;
+      }else if (option.equals("-help")) {
        System.out.println("-classlibrary classlibrarydirectory -- directory where classlibrary is located");
        System.out.println("-selfloop task -- this task doesn't self loop its parameters forever");
        System.out.println("-dir outputdirectory -- output code in outputdirectory");
        System.out.println("-struct structfile -- output structure declarations for repair tool");
        System.out.println("-mainclass -- main function to call");
        System.out.println("-dsm -- distributed shared memory support");
+       System.out.println("-singleTM -- single machine committing transactions");
        System.out.println("-abortreaders -- abort readers");
        System.out.println("-precise -- use precise garbage collection");
        System.out.println("-conscheck -- turn on consistency checking");
@@ -158,12 +274,14 @@ public class Main {
        System.out.println("-ownallocdepth <d> -- set allocation depth for ownership analysis");
        System.out.println("-ownwritedots <all/final> -- write ownership graphs; can be all results or just final results");
        System.out.println("-ownaliasfile <filename> -- write a text file showing all detected aliases in program tasks");
+       System.out.println("-optimize -- enable optimizations");
        System.out.println("-optional -- enable optional arguments");
        System.out.println("-abcclose close the array boundary check");
        System.out.println("-scheduling do task scheduling");
+       System.out.println("-mlp <num cores> <max sese age> build mlp code");
+       System.out.println("-mlpdebug if mlp, report progress and interim results");
        System.out.println("-multicore generate multi-core version binary");
        System.out.println("-numcore set the number of cores (should be used together with -multicore), defaultly set as 1");
-       System.out.println("-raw generate raw version binary (should be used together with -multicore)");
        System.out.println("-interrupt generate raw version binary with interruption (should be used togethere with -raw)");
        System.out.println("-rawconfig config raw simulator as 4xn (should be used together with -raw)");
        System.out.println("-rawpath print out execute path information for raw version (should be used together with -raw)");
@@ -176,93 +294,153 @@ public class Main {
        System.out.println("-help -- print out help");
        System.exit(0);
       } else {
-       readSourceFile(state, args[i]);
+       sourcefiles.add(args[i]);
       }
     }
+    
+    //add default classpath
+    if (state.classpath.size()==1)
+      state.classpath.add(ClassLibraryPrefix);
 
+    BuildIR bir=new BuildIR(state);
+    TypeUtil tu=new TypeUtil(state, bir);
+    
 
-    readSourceFile(state, ClassLibraryPrefix+"System.java");
-    readSourceFile(state, ClassLibraryPrefix+"String.java");
-    readSourceFile(state, ClassLibraryPrefix+"HashSet.java");
-    readSourceFile(state, ClassLibraryPrefix+"HashMap.java");
-    readSourceFile(state, ClassLibraryPrefix+"HashMapIterator.java");
-    readSourceFile(state, ClassLibraryPrefix+"HashEntry.java");
-    readSourceFile(state, ClassLibraryPrefix+"Integer.java");
-    readSourceFile(state, ClassLibraryPrefix+"StringBuffer.java");
-    //if(!state.RAW) {
-    readSourceFile(state, ClassLibraryPrefix+"FileInputStream.java");
-    readSourceFile(state, ClassLibraryPrefix+"PushbackInputStream.java");
-    readSourceFile(state, ClassLibraryPrefix+"InputStream.java");
-    readSourceFile(state, ClassLibraryPrefix+"OutputStream.java");
-    readSourceFile(state, ClassLibraryPrefix+"FileOutputStream.java");
-    readSourceFile(state, ClassLibraryPrefix+"File.java");
-    readSourceFile(state, ClassLibraryPrefix+"InetAddress.java");
-    readSourceFile(state, ClassLibraryPrefix+"SocketInputStream.java");
-    readSourceFile(state, ClassLibraryPrefix+"SocketOutputStream.java");
-    readSourceFile(state, ClassLibraryPrefix+"gnu/StringTokenizer.java");
-    //}
-    readSourceFile(state, ClassLibraryPrefix+"Math.java");
-    readSourceFile(state, ClassLibraryPrefix+"gnu/Random.java");
-    readSourceFile(state, ClassLibraryPrefix+"Vector.java");
-    readSourceFile(state, ClassLibraryPrefix+"Enumeration.java");
-    readSourceFile(state, ClassLibraryPrefix+"Dictionary.java");
-    readSourceFile(state, ClassLibraryPrefix+"Writer.java");
-    readSourceFile(state, ClassLibraryPrefix+"BufferedWriter.java");
-    readSourceFile(state, ClassLibraryPrefix+"OutputStreamWriter.java");
-    readSourceFile(state, ClassLibraryPrefix+"FileWriter.java");
-    readSourceFile(state, ClassLibraryPrefix+"Date.java");
+    SemanticCheck sc=new SemanticCheck(state,tu);
 
-    if (state.TASK) {
-      if (state.FASTCHECK)
-       readSourceFile(state, ClassLibraryPrefix+"ObjectFC.java");
-      else
-       readSourceFile(state, ClassLibraryPrefix+"Object.java");
-      readSourceFile(state, ClassLibraryPrefix+"TagDescriptor.java");
-    } else if (state.DSM) {
-      readSourceFile(state, ClassLibraryPrefix+"ThreadDSM.java");
-      readSourceFile(state, ClassLibraryPrefix+"ObjectJavaDSM.java");
-      readSourceFile(state, ClassLibraryPrefix+"Barrier.java");
-    } else {
-      if (state.THREAD) {
-       readSourceFile(state, ClassLibraryPrefix+"Thread.java");
-       readSourceFile(state, ClassLibraryPrefix+"ObjectJava.java");
-      } else
-       readSourceFile(state, ClassLibraryPrefix+"ObjectJavaNT.java");
-    }
+    for(int i=0;i<sourcefiles.size();i++)
+      loadClass(state, bir,(String)sourcefiles.get(i));
 
+    //Stuff the runtime wants to see
+    sc.getClass("String");
+    sc.getClass("Math");
+    sc.getClass("File");
+    sc.getClass("Socket");
+    sc.getClass("ServerSocket");
+    sc.getClass("FileInputStream");
+    sc.getClass("FileOutputStream");
     if (state.TASK) {
-      readSourceFile(state, ClassLibraryPrefix+"StartupObject.java");
-      readSourceFile(state, ClassLibraryPrefix+"Socket.java");
-      readSourceFile(state, ClassLibraryPrefix+"ServerSocket.java");
-    } else {
-      readSourceFile(state, ClassLibraryPrefix+"SocketJava.java");
-      readSourceFile(state, ClassLibraryPrefix+"ServerSocketJava.java");
+      sc.getClass("TagDescriptor");
+    }
+    if (state.THREAD||state.DSM||state.SINGLETM) {
+      sc.getClass("Thread");
     }
 
-    BuildIR bir=new BuildIR(state);
-    bir.buildtree();
-
-    TypeUtil tu=new TypeUtil(state);
-
-    SemanticCheck sc=new SemanticCheck(state,tu);
     sc.semanticCheck();
+
     tu.createFullTable();
 
     BuildFlat bf=new BuildFlat(state,tu);
     bf.buildFlat();
     SafetyAnalysis sa=null;
     PrefetchAnalysis pa=null;
+    MLPAnalysis mlpa=null;
+    if (state.INLINEATOMIC) {
+      Iterator classit=state.getClassSymbolTable().getDescriptorsIterator();
+      while(classit.hasNext()) {
+        ClassDescriptor cn=(ClassDescriptor)classit.next();
+        Iterator methodit=cn.getMethods();
+        while(methodit.hasNext()) {
+         // do inlining
+          MethodDescriptor md=(MethodDescriptor)methodit.next();
+          FlatMethod fm=state.getMethodFlat(md);
+         Inliner.inlineAtomic(state, tu, fm, state.inlineatomicdepth);
+       }
+      }
+    }
+
+
+    if (state.OPTIMIZE) {
+      CallGraph callgraph=new CallGraph(state);
+      CopyPropagation cp=new CopyPropagation();
+      DeadCode dc=new DeadCode();
+      GlobalFieldType gft=new GlobalFieldType(callgraph, state, tu.getMain());
+      CSE cse=new CSE(gft, tu);
+      localCSE lcse=new localCSE(gft, tu);
+      LoopOptimize lo=new LoopOptimize(gft, tu);
+      Iterator classit=state.getClassSymbolTable().getDescriptorsIterator();
+      while(classit.hasNext()) {
+        ClassDescriptor cn=(ClassDescriptor)classit.next();
+        Iterator methodit=cn.getMethods();
+        while(methodit.hasNext()) {
+          /* Classify parameters */
+          MethodDescriptor md=(MethodDescriptor)methodit.next();
+          FlatMethod fm=state.getMethodFlat(md);
+         cp.optimize(fm);
+         dc.optimize(fm);
+         lo.optimize(fm);
+         cp.optimize(fm);
+         dc.optimize(fm);
+         lcse.doAnalysis(fm);
+         cse.doAnalysis(fm);
+         cp.optimize(fm);
+         dc.optimize(fm);
+         cp.optimize(fm);
+         dc.optimize(fm);
+        }
+      }
+    }
+
+    if (state.FLATIRGRAPH) {
+      FlatIRGraph firg = new FlatIRGraph(state,
+                                         state.FLATIRGRAPHTASKS,
+                                         state.FLATIRGRAPHUSERMETHODS,
+                                         state.FLATIRGRAPHLIBMETHODS);
+    }
+    
+    if (state.OWNERSHIP && !state.MLP) {
+      CallGraph callGraph = new CallGraph(state);
+      Liveness liveness = new Liveness();
+      ArrayReferencees ar = new ArrayReferencees(state);
+      OwnershipAnalysis oa = new OwnershipAnalysis(state,
+                                                   tu,
+                                                   callGraph,
+                                                  liveness,
+                                                   ar,
+                                                   state.OWNERSHIPALLOCDEPTH,
+                                                   state.OWNERSHIPWRITEDOTS,
+                                                   state.OWNERSHIPWRITEALL,
+                                                   state.OWNERSHIPALIASFILE,
+                                                   state.METHODEFFECTS);
+    }
+
+    if (state.MLP) {
+      CallGraph callGraph = new CallGraph(state);
+      Liveness liveness = new Liveness();
+      ArrayReferencees ar = new ArrayReferencees(state);
+      OwnershipAnalysis oa = new OwnershipAnalysis(state,
+                                                   tu,
+                                                   callGraph,
+                                                  liveness,
+                                                   ar,
+                                                  state.OWNERSHIPALLOCDEPTH,
+                                                   state.OWNERSHIPWRITEDOTS,
+                                                   state.OWNERSHIPWRITEALL,
+                                                   state.OWNERSHIPALIASFILE,
+                                                   state.METHODEFFECTS);
+      mlpa = new MLPAnalysis(state,
+                             tu,
+                             callGraph,
+                             oa);
+    }    
+
+    if (state.DISJOINT) {
+      CallGraph        cg = new CallGraph(state);
+      Liveness         l  = new Liveness();
+      ArrayReferencees ar = new ArrayReferencees(state);
+      DisjointAnalysis oa = new DisjointAnalysis(state, tu, cg, l, ar);
+    }
 
     if (state.TAGSTATE) {
       CallGraph callgraph=new CallGraph(state);
       TagAnalysis taganalysis=new TagAnalysis(state, callgraph);
-      TaskTagAnalysis tta=new TaskTagAnalysis(state, taganalysis);
+      TaskTagAnalysis tta=new TaskTagAnalysis(state, taganalysis, tu);
     }
 
     if (state.TASKSTATE) {
       CallGraph callgraph=new CallGraph(state);
       TagAnalysis taganalysis=new TagAnalysis(state, callgraph);
-      TaskAnalysis ta=new TaskAnalysis(state, taganalysis);
+      TaskAnalysis ta=new TaskAnalysis(state, taganalysis, tu);
       ta.taskAnalysis();
       TaskGraph tg=new TaskGraph(state, ta);
       tg.createDOTfiles();
@@ -286,110 +464,117 @@ public class Main {
       if (state.SCHEDULING) {
        // Use ownership analysis to get alias information
        CallGraph callGraph = new CallGraph(state);
+       Liveness liveness = new Liveness();
+        ArrayReferencees ar = new ArrayReferencees(state);
        OwnershipAnalysis oa = new OwnershipAnalysis(state,
                                                     tu,
                                                     callGraph,
+                                                    liveness,
+                                                     ar,
                                                     state.OWNERSHIPALLOCDEPTH,
                                                     state.OWNERSHIPWRITEDOTS,
                                                     state.OWNERSHIPWRITEALL,
                                                     state.OWNERSHIPALIASFILE);
+       
+       // synthesis a layout according to target multicore processor
+       MCImplSynthesis mcImplSynthesis = new MCImplSynthesis(state,
+                                                             ta,
+                                                             oa);
+       if(isDistributeInfo) {
+           mcImplSynthesis.distribution(isDisAll, startnum);
+       } else {
+           //double timeStartAnalysis = (double) System.nanoTime();
+           mcImplSynthesis.setScheduleThreshold(20);
+           mcImplSynthesis.setProbThreshold(0);
+           mcImplSynthesis.setGenerateThreshold(30);
+           Vector<Schedule> scheduling = mcImplSynthesis.synthesis();
+           
+           //double timeEndAnalysis = (double) System.nanoTime();
+           //double dt = (timeEndAnalysis - timeStartAnalysis)/(Math.pow( 10.0, 9.0 ) );
+           //System.err.println("The analysis took" + dt +  "sec.");
+        //System.exit(0);
 
-       // generate multiple schedulings
-       ScheduleAnalysis scheduleAnalysis = new ScheduleAnalysis(state,
-                                                                ta);
-       // necessary preparation such as read profile info etc.
-       scheduleAnalysis.preparation();
-       scheduleAnalysis.preSchedule();
-       scheduleAnalysis.scheduleAnalysis();
-       //scheduleAnalysis.setCoreNum(scheduleAnalysis.getSEdges4Test().size());
-       scheduleAnalysis.setCoreNum(state.CORENUM);
-       scheduleAnalysis.schedule();
-
-       //simulate these schedulings
-       ScheduleSimulator scheduleSimulator = new ScheduleSimulator(scheduleAnalysis.getCoreNum(),
-                                                                   state,
-                                                                   ta);
-       Vector<Vector<Schedule>> schedulings = scheduleAnalysis.getSchedulings();
-       Vector<Integer> selectedScheduling = scheduleSimulator.simulate(schedulings);
-
-       if(state.MULTICORE) {
-         Vector<Schedule> scheduling = scheduleAnalysis.getSchedulings().elementAt(selectedScheduling.firstElement());
-         BuildCodeMultiCore bcm=new BuildCodeMultiCore(state,
-                                                       bf.getMap(),
-                                                       tu,
-                                                       sa,
-                                                       scheduling,
-                                                       scheduleAnalysis.getCoreNum(),
-                                                       pa);
-         bcm.setOwnershipAnalysis(oa);
-         bcm.buildCode();
-         scheduling = null;
+           // generate multicore codes
+           if(state.MULTICORE) {
+               BuildCodeMultiCore bcm=new BuildCodeMultiCore(state,
+                                                             bf.getMap(),
+                                                             tu,
+                                                             sa,
+                                                             scheduling,
+                                                             mcImplSynthesis.getCoreNum(),
+                                                  state.CORENUM4GC,
+                                                             pa);
+               bcm.setOwnershipAnalysis(oa);
+               bcm.buildCode();
+           }
+           scheduling.clear();
+           scheduling = null;
        }
-       schedulings = null;
-       selectedScheduling = null;
       }
-
     }
-
     if(!state.MULTICORE) {
-      if (state.DSM) {
+      if (state.DSM||state.SINGLETM) {
        CallGraph callgraph=new CallGraph(state);
        if (state.PREFETCH) {
          //speed up prefetch generation using locality analysis results
          LocalityAnalysis la=new LocalityAnalysis(state, callgraph, tu);
          pa=new PrefetchAnalysis(state, callgraph, tu, la);
        }
-
        LocalityAnalysis la=new LocalityAnalysis(state, callgraph, tu);
        GenerateConversions gc=new GenerateConversions(la, state);
-       BuildCode bc=new BuildCode(state, bf.getMap(), tu, la, pa);
+       BuildCode bc=new BuildCode(state, bf.getMap(), tu, la, pa, mlpa);
        bc.buildCode();
       } else {
-       BuildCode bc=new BuildCode(state, bf.getMap(), tu, sa, pa);
+       BuildCode bc=new BuildCode(state, bf.getMap(), tu, sa, pa, mlpa);
        bc.buildCode();
       }
     }
 
-    if (state.FLATIRGRAPH) {
-      FlatIRGraph firg = new FlatIRGraph(state,
-                                         state.FLATIRGRAPHTASKS,
-                                         state.FLATIRGRAPHUSERMETHODS,
-                                         state.FLATIRGRAPHLIBMETHODS);
-    }
-
-    if (state.OWNERSHIP) {
-      CallGraph callGraph = new CallGraph(state);
-      OwnershipAnalysis oa = new OwnershipAnalysis(state,
-                                                   tu,
-                                                   callGraph,
-                                                   state.OWNERSHIPALLOCDEPTH,
-                                                   state.OWNERSHIPWRITEDOTS,
-                                                   state.OWNERSHIPWRITEALL,
-                                                   state.OWNERSHIPALIASFILE);
-    }
-
+    System.out.println("Lines="+state.lines);
     System.exit(0);
   }
 
-  /** Reads in a source file and adds the parse tree to the state object. */
-
-  private static void readSourceFile(State state, String sourcefile) throws Exception {
-    Reader fr = new BufferedReader(new FileReader(sourcefile));
-    Lex.Lexer l = new Lex.Lexer(fr);
-    java_cup.runtime.lr_parser g;
-    g = new Parse.Parser(l);
-    ParseNode p=null;
+  public static void loadClass(State state, BuildIR bir, String sourcefile) {
     try {
-      p=(ParseNode) g./*debug_*/ parse().value;
+      ParseNode pn=readSourceFile(state, sourcefile);
+      bir.buildtree(pn, null);
     } catch (Exception e) {
-      System.err.println("Error parsing file:"+sourcefile);
+      System.out.println("Error in sourcefile:"+sourcefile);
+      e.printStackTrace();
+      System.exit(-1);
+    } catch (Error e) {
+      System.out.println("Error in sourcefile:"+sourcefile);
       e.printStackTrace();
       System.exit(-1);
     }
-    state.addParseNode(p);
-    if (l.numErrors()!=0) {
-      System.out.println("Error parsing "+sourcefile);
-      System.exit(l.numErrors());
+  }
+
+  /** Reads in a source file and adds the parse tree to the state object. */
+
+  public static ParseNode readSourceFile(State state, String sourcefile) {
+    try {
+      Reader fr= new BufferedReader(new FileReader(sourcefile));
+      Lex.Lexer l = new Lex.Lexer(fr);
+      java_cup.runtime.lr_parser g;
+      g = new Parse.Parser(l);
+      ParseNode p=null;
+      try {
+       p=(ParseNode) g./*debug_*/parse().value;
+      } catch (Exception e) {
+       System.err.println("Error parsing file:"+sourcefile);
+       e.printStackTrace();
+       System.exit(-1);
+      }
+      state.addParseNode(p);
+      if (l.numErrors()!=0) {
+       System.out.println("Error parsing "+sourcefile);
+       System.exit(l.numErrors());
+      }
+      state.lines+=l.line_num;
+      return p;
+
+    } catch (Exception e) {
+      throw new Error(e);
     }
   }
 }