At-Opt configuration

x10.compiler/src/x10/optimizations/atOptimzer/AbstractPlaceTree.java

@@ -0,0 +1,20 @@
+package x10.optimizations.atOptimzer;
+
+import x10.optimizations.atOptimzer.PlaceNode;
+
+public class AbstractPlaceTree
+{
+	public PlaceNode absPlTree;
+
+	public AbstractPlaceTree(PlaceNode plNode) {
+		this.absPlTree = plNode;
+	}
+
+	public AbstractPlaceTree() {
+		this.absPlTree = null;
+	}
+
+	public void addPlaceNode(PlaceNode plNode) {
+		this.absPlTree = plNode;
+	}
+}

x10.compiler/src/x10/optimizations/atOptimzer/ClassInfo.java

@@ -0,0 +1,34 @@
+package x10.optimizations.atOptimzer;
+
+import java.util.*;
+
+public class ClassInfo {
+
+	public String classifier;
+	public String type;
+	public String name;
+	/* x10Type also using it for parameter optimization as well. 
+	 * for field X10Type is used for storing the type.
+	 * for parameter x10Type is used to maintain the count
+	 */
+	public String x10Type = "";
+	public int classNo = 0;
+	public int methodNo = 0;
+	public int methodNoIn = 0;
+	public LinkedList<ClassInfo> methodPara = null;
+	/* field to store the unique id for identifying function-overloading - for method only*/
+	public String uniqueId;
+
+	public ClassInfo() {
+		this.classifier = null;
+		this.type = null;
+		this.name = null;
+	}	
+
+	public ClassInfo(String f_classifier, String f_type, String f_name) {
+		this.classifier = f_classifier;
+		this.type = f_type;
+		this.name = f_name;
+	}
+
+}

x10.compiler/src/x10/optimizations/atOptimzer/ClosureDetails.java

@@ -0,0 +1,23 @@
+package x10.optimizations.atOptimzer;
+
+import java.util.*;
+
+public class ClosureDetails {
+	public String name;
+	public int fromClass = 0;
+	public int fromMethod = 0;
+	public int fromplace = 0;
+	public int toClass = 0;
+	public int toMethod = 0;
+	public int toplace = 0;
+	public int countCRSWS = -1;
+
+	public ClosureDetails(String closureName, int fromClass, int fromMethod, int fromplace ) {
+		this.name = closureName;
+		this.fromClass = fromClass;
+		this.fromMethod = fromMethod;
+		this.fromplace = fromplace;
+	}
+
+}
+

x10.compiler/src/x10/optimizations/atOptimzer/EdgeRep.java

@@ -0,0 +1,42 @@
+package x10.optimizations.atOptimzer;
+
+import java.util.*;
+
+public class EdgeRep {
+
+	public String edgeType;
+	public String desName;
+	public String fieldName = "";
+	public String edgeName = "";
+	public boolean copyFlag = false;
+
+	public EdgeRep(String edgeType, String desName) {
+		this.edgeType = edgeType;
+		this.desName = desName;
+	}
+
+	public EdgeRep(String edgeType, String desName, boolean copyFlag) {
+		this.edgeType = edgeType;
+		this.desName = desName;
+		this.copyFlag = copyFlag;
+	}
+
+	public EdgeRep(String edgeType, String desName, String fieldName) {
+		this.edgeType = edgeType;
+		this.desName = desName;
+		this.fieldName = fieldName;
+	}
+
+	public EdgeRep(String edgeType, String desName, String fieldName, boolean copyFlag) {
+		this.edgeType = edgeType;
+		this.desName = desName;
+		this.fieldName = fieldName;
+		this.copyFlag = copyFlag;
+	}
+
+	public EdgeRep() {
+		this.edgeType = "";
+		this.desName = "";
+		this.fieldName = "";
+	}
+}

x10.compiler/src/x10/optimizations/atOptimzer/ForClosureObject.java

@@ -0,0 +1,23 @@
+package x10.optimizations.atOptimzer;
+
+import java.util.HashMap;
+import java.util.LinkedList;
+import java.util.Stack;
+
+import x10.optimizations.atOptimzer.ForClosureObjectField;
+
+public class ForClosureObject {
+	public String varName = "";
+	public boolean ambiguity = false;
+	public LinkedList<ForClosureObjectField> fieldDetails = null;
+
+	public ForClosureObject () {		
+	}
+
+	public ForClosureObject(String varName, boolean ambiguity) {
+		this.varName = varName;
+		this.ambiguity = ambiguity;
+		this.fieldDetails = new LinkedList<ForClosureObjectField>();
+	}
+
+}

x10.compiler/src/x10/optimizations/atOptimzer/ForClosureObjectField.java

@@ -0,0 +1,32 @@
+package x10.optimizations.atOptimzer;
+
+import java.util.*;
+import java.util.HashMap;
+import java.util.LinkedList;
+import java.util.Stack;
+
+public class ForClosureObjectField {
+	public String fieldName = "";
+	public String tempStoredName = "";
+	public String fieldType = "";
+	public boolean ambiguity = false;
+	public String fieldObjName = "";
+
+	public ForClosureObjectField () {
+
+	}
+
+	public ForClosureObjectField(String fieldName, String tempStoredName, String fieldType) {
+		this.fieldName = fieldName;
+		this.tempStoredName = tempStoredName;
+		this.fieldType = fieldType;
+	}
+
+	public ForClosureObjectField(String fieldName, String tempStoredName, String fieldType, boolean ambiguity, String fieldObjName) {
+		this.fieldName = fieldName;
+		this.tempStoredName = tempStoredName;
+		this.fieldType = fieldType;
+		this.ambiguity = ambiguity;
+		this.fieldObjName = fieldObjName;
+	}
+}

x10.compiler/src/x10/optimizations/atOptimzer/ForClosureObjectcpp.java

@@ -0,0 +1,17 @@
+package x10.optimizations.atOptimzer;
+
+import java.util.HashMap;
+import java.util.LinkedList;
+import java.util.Stack;
+
+import x10.optimizations.atOptimzer.ForClosureObjectField;
+
+public class ForClosureObjectcpp {
+	public String fldName = "";
+	public String zzName = "";
+	public String type = "";
+
+	public ForClosureObjectcpp () {		
+	}
+
+}

x10.compiler/src/x10/optimizations/atOptimzer/ObjNode.java

@@ -0,0 +1,21 @@
+package x10.optimizations.atOptimzer;
+
+import java.util.*;
+
+public class ObjNode {
+	public String name;
+	public String objType;
+	public boolean copyFlag = false;
+	public int counter = 0;
+
+	public ObjNode(String objName, String objType) {
+		this.name = objName;
+		this.objType = objType;
+	}
+
+	public ObjNode(String objName, String objType, boolean copyFlag) {
+		this.name = objName;
+		this.objType = objType;
+		this.copyFlag = copyFlag;
+	}
+}

x10.compiler/src/x10/optimizations/atOptimzer/PlaceNode.java

@@ -0,0 +1,40 @@
+package x10.optimizations.atOptimzer;
+
+public class PlaceNode 
+{
+	public String toName;
+	public PlaceNode child;
+	public PlaceNode sibling;
+
+	public PlaceNode(String placeName) {
+		this.toName = placeName;
+		this.child = null;
+		this.sibling = null;
+	}
+
+	public PlaceNode() {
+		this.toName = null;
+		this.child = null;
+		this.sibling = null;
+	}
+
+	public void addChild(PlaceNode plNode) {
+		PlaceNode temp = this;
+
+		if(temp.child == null) {
+			temp.child = plNode;
+		}
+		else {
+			PlaceNode temp1 = temp.child;
+
+			while(temp1.sibling != null) {
+				temp1 = temp1.sibling;
+			}
+			temp1.sibling = plNode;
+
+		}
+	}
+
+	public void addSibling() {
+	}
+}

x10.compiler/src/x10/optimizations/atOptimzer/VarWithLineNo.java

@@ -0,0 +1,14 @@
+package x10.optimizations.atOptimzer;
+
+import java.util.*;
+
+public class VarWithLineNo {
+	public String name;
+	public int lineNo;
+
+	public VarWithLineNo(String varName, int lineNo) {
+		this.name = varName;
+		this.lineNo = lineNo;
+	}
+
+}

x10.compiler/src/x10/optimizations/atOptimzer/processInfo.java

@@ -0,0 +1,14 @@
+package x10.optimizations.atOptimzer;
+
+import java.util.HashMap;
+import java.util.LinkedList;
+import java.util.Stack;
+
+import x10.optimizations.atOptimzer.processInfo;
+
+public class processInfo
+{
+	public Stack<String> currClass = new Stack<String>();
+	public HashMap<String, LinkedList<ClassInfo>> classDetails  = new HashMap<String, LinkedList<ClassInfo>>();
+
+}

x10.compiler/src/x10cpp/visit/Emitter.java

@@ -34,6 +34,7 @@
 import java.util.Collections;
 import java.util.HashMap;
 import java.util.Iterator;
+import java.util.LinkedList;
 import java.util.List;
 import java.util.Map;
 import java.util.regex.Matcher;
@@ -108,10 +109,24 @@
 import x10cpp.debug.LineNumberMap;
 import x10cpp.types.X10CPPContext_c;
 
+//Nobita code
+import  static x10cpp.visit.MessagePassingCodeGenerator.currClass;
+import  static x10cpp.visit.MessagePassingCodeGenerator.currMethod;
+import  static x10cpp.visit.MessagePassingCodeGenerator.iterationCount;
+import  static x10cpp.visit.MessagePassingCodeGenerator.classDetails;
+import x10.optimizations.atOptimzer.VarWithLineNo;
+import x10.optimizations.atOptimzer.ClassInfo;
+
+
+
 public class Emitter {
 
     private final Translator tr;
     private ASTQuery query;
+    //nobita code
+    public static String fieldDec = "";
+    public static boolean field = false;
+
     public Emitter(Translator tr) {
         this.tr = tr;
         query = new ASTQuery(tr);
@@ -240,7 +255,14 @@ void printType(Type type, CodeWriter w) {
 		printType(type,w,null);
 	}	
 	void printType(Type type, CodeWriter w, Context ctx) {
+		if (field) { 
+			String str = translateType(type, true, true, ctx);
+			fieldDec = str;
+			w.write(str);
+		}
+		else {
 		w.write(translateType(type, true, true, ctx));
+		}
 	}
 
 	/**
@@ -915,7 +937,21 @@ void printHeader(FieldDecl_c n, CodeWriter h, Translator tr, boolean qualify) {
 			h.write("volatile ");
 		}
 
+		//Nobita code
+		if (iterationCount == 0) { field = true; fieldDec = "";}
 		printType(n.type().type(), h);
+		if (field) {
+			field = false;
+			VarWithLineNo temp1 = currClass.peek();
+
+			ClassInfo fieldDetails = new ClassInfo("field", n.type().nameString(), n.name().toString());
+			fieldDetails.x10Type = fieldDec;
+
+			LinkedList<ClassInfo> fi = classDetails.get(temp1.name);
+			fi.add(fieldDetails);
+			fieldDec = "";
+		}
+
 		h.allowBreak(2, 2, " ", 1);
 		if (qualify) {
 		    X10ClassType declClass = (X10ClassType)n.fieldDef().asInstance().container().toClass();