X-Git-Url: http://git.megacz.com/?p=sbp.git;a=blobdiff_plain;f=src%2Fedu%2Fberkeley%2Fsbp%2FGSS.java;h=217889b49d2ab7570522ad4c57c6d114e6972e49;hp=80fbd5c4655f28e7e0e2aad060b02975fe09ddca;hb=3ee451bce342d4bb61ad6235ba57bdf817bfdd1a;hpb=e5cfb136bf7fd1352eff1bd87a458aa4ff748537 diff --git a/src/edu/berkeley/sbp/GSS.java b/src/edu/berkeley/sbp/GSS.java index 80fbd5c..217889b 100644 --- a/src/edu/berkeley/sbp/GSS.java +++ b/src/edu/berkeley/sbp/GSS.java @@ -1,3 +1,5 @@ +// Copyright 2006 all rights reserved; see LICENSE file for BSD-style license + package edu.berkeley.sbp; import edu.berkeley.sbp.*; import edu.berkeley.sbp.util.*; @@ -10,27 +12,31 @@ import java.lang.reflect.*; /** implements Tomita's Graph Structured Stack */ class GSS { - public static int count = 0; + static int count = 0; + static int shifts = 0; + static int reductions = 0; + int resets = 0; + int waits = 0; public GSS() { } private Phase.Node[] reducing_list = null; - public int resets = 0; - public int waits = 0; + // FIXME: right now, these are the performance bottleneck HashMapBag waiting = new HashMapBag(); HashMapBag performed = new HashMapBag(); HashMapBag lastperformed = new HashMapBag(); HashMapBag expected = new HashMapBag(); /** FIXME */ - public Forest.Ref finalResult; + Forest.Many finalResult; /** corresponds to a positions between tokens the input stream; same as Tomita's U_i's */ class Phase implements Invokable.Node>, IntegerMappable, GraphViz.ToGraphViz, Iterable { public Iterator iterator() { return hash.iterator(); } public void invoke(State st, Forest result, Node n) { + shifts++; good |= next.newNode(n, result, st, false); } @@ -41,23 +47,24 @@ class GSS { boolean reducing; private IntPairMap hash; /* ALLOC */ - private IntPairMap singularReductions; /* ALLOC */ private boolean closed; private boolean good; private Phase next = null; private Phase prev; private Input.Location location; + private Input.Location nextLocation; public final Parser parser; private Forest forest; - public Phase(Phase prev, Parser parser, Phase previous, Tok token, Input.Location location, Forest forest) throws ParseFailed { + public Phase(Phase prev, Parser parser, Phase previous, Tok token, Input.Location location, Input.Location nextLocation, Forest forest) throws ParseFailed { this.prev = prev; this.forest = forest; this.parser = parser; this.pos = previous==null ? 0 : previous.pos+1; this.token = token; this.location = location; + this.nextLocation = nextLocation; performed.clear(); reset(); } @@ -69,7 +76,6 @@ class GSS { lastperformed.addAll(performed); performed.clear(); hash = new IntPairMap(); - singularReductions = new IntPairMap(); reset = false; good = false; closed = false; @@ -87,6 +93,7 @@ class GSS { } public Input.Location getLocation() { return location; } + public Input.Location getNextLocation() { return nextLocation; } /** add a new node (merging with existing nodes if possible) * @param parent the parent of the new node @@ -131,8 +138,7 @@ class GSS { } } } - if (!owner.lame) - newNode(parent, pending, state, fromEmptyReduction); + newNode(parent, pending, state, fromEmptyReduction); if (reduction != null) { boolean redo = true; while(redo) { @@ -148,13 +154,14 @@ class GSS { } } } + private boolean newNode2(Node p, Node parent, Forest pending, State state, boolean fromEmptyReduction) { - //if (p.parents().contains(parent)) return true; - p.merge(parent, pending); + if (p.merge(parent, pending)) return true; p.parents().add(parent, true); if (p!=parent && !fromEmptyReduction && reducing) p.performReductions(parent); return true; } + private boolean newNode3(Node parent, Forest pending, State state, boolean fromEmptyReduction) { do { if (token != null && state.canShift(token)) break; @@ -220,7 +227,6 @@ class GSS { // this massively improves GC performance if (prev!=null && parser.helpgc) { prev.hash = null; - prev.singularReductions = null; } this.next = next; closed = true; @@ -228,7 +234,7 @@ class GSS { boolean ok = false; for(Phase.Node n : hash.values()) { if (token == null && n.state.isAccepting()) { - if (finalResult==null) finalResult = new Forest.Ref(); + if (finalResult==null) finalResult = new Forest.Many(); for(Object f : n.results()) finalResult.merge((Forest)f); } @@ -274,24 +280,7 @@ class GSS { final class Node implements Invokable, IntegerMappable, GraphViz.ToGraphViz { public FastSet set = new FastSet(); - public GraphViz.Node toGraphViz(GraphViz gv) { - if (gv.hasNode(this)) return gv.createNode(this); - GraphViz.Node n = gv.createNode(this); - n.label = ""+state.toStringx(); - n.shape = "rectangle"; - n.fill = "green"; - //GraphViz.Node f = pending().toGraphViz(gv); - //n.add(f); - for(Forest result : results()) n.edge(result, ""); - for(Node parent : parents()) n.edge(parent, ""); - ((GraphViz.Group)phase().toGraphViz(gv)).add(n); - return n; - } - public boolean isTransparent() { return false; } - public boolean isHidden() { return false; } - - - //private Forest.Ref holder = new Forest.Ref(); + private boolean allqueued = false; /** what state this node is in */ @@ -299,28 +288,25 @@ class GSS { /** which Phase this Node belongs to (node that Node is also a non-static inner class of Phase) */ public Phase phase() { return Phase.this; } - //private Forest pending() { return !Phase.this.closed ? holder : holder.resolve(); } - private HashMap resultMap = new HashMap(); - public void merge(Node parent, Forest result) { - //holder.merge(result); - Forest.Ref f = (Forest.Ref)resultMap.get(parent); - if (f==null) { f = new Forest.Ref(); resultMap.put(parent, f); } + + private HashSet resultMap = new HashSet(); + public Iterable results() { return resultMap; } + public FastSet parents() { return set; } + public boolean merge(Node parent, Forest result) { + // FIXME: inefficient! + for(Forest.Many f : results()) { + if (f.parents.contains(parent) /* UGLY: */ && f.parents.size()==1) { + f.merge(result); + return true; + } + } + Forest.Many f = new Forest.Many(); + f.parents.add(parent); f.merge(result); + resultMap.add(f); set.add(parent, true); + return false; } - //public Iterable childrenFor(Forest result) { return resultMap.getAll(result); } - public Iterable results() { return resultMap.values(); } - private Forest pending(Node n) { - //return !Phase.this.closed ? holder : holder.resolve(); - /* - for(Forest f : resultMap) - if (resultMap.contains(f, n)) - return f; - return null; - */ - return resultMap.get(n); - } - public FastSet parents() { return set; } public void performReductions() { if (allqueued) return; @@ -335,7 +321,7 @@ class GSS { public void performEmptyReductions() { state.invokeReductions(token, this, null, null); } public final void invoke(Position r, Node n, Node n2) { - //if (r.owner().lame) return; + reductions++; if (n==null || n2==null || r.pos==0) { if (r.pos==0) { if (n==null) n = this; @@ -343,76 +329,33 @@ class GSS { } if (n==null) return; Forest[] holder = new Forest[r.pos]; - if (r.pos==0) n.finish(r, r.zero(), n.phase(), holder); - else n.reduce(r, r.pos-1, n.phase(), holder, null, n.pending(n)); + if (r.pos==0) n.finish(r, r.zero(n.phase().getLocation().createRegion(n.phase().getLocation())), n.phase()); + else n.reduce(r, r.pos-1, n.phase(), null); } else { - Forest[] holder = new Forest[r.pos]; if (r.pos<=0) throw new Error("called wrong form of reduce()"); int pos = r.pos-1; - n.reduce(r, pos, n.phase(), holder, n2, n.pending(n)); + n.reduce(r, pos, n.phase(), n2); } } - /* - public void reduce(Position r, int pos, Phase target, Forest[] holder) { - reduce(r, pos, target, holder, null); } - public void reduce(Position r, int pos, Phase target, Forest[] holder, Node only) { - reduce(r, pos, target, holder, only, this.pending()); - } - */ - public void reduce(Position r, int pos, Phase target, Forest[] holder, Node only, Forest pending) { + public void reduce(Position r, int pos, Phase target, Node only) { + Forest[] holder = r.holder; Forest old = holder[pos]; - holder[pos] = pending; - if (pos==0) { - - // FIXME: I'm unsure about this -- basically we want to deal with the case where - // there are two nodes, each of whose Ref points to the same Forest instance. - // Some node in the next phase has both of these as parents. This might happen - // since the same reduction can appear in more than one state. - - if (only != null) { - holder[pos] = pending(only); - System.arraycopy(holder, 0, r.holder, 0, holder.length); - for(int i=0; i rr = new HashSet(); + for(Forest result : results()) rr.add(result); + for(Forest result : rr) + for(Node child : ((Forest.Many)result).parents) { + if (only != null && child!=only) continue; + holder[pos] = result; + if (pos==0) child.finish(r, r.rewrite(child.phase().getNextLocation().createRegion(target.getLocation())), target); + else child.reduce(r, pos-1, target, null); } - } + holder[pos] = old; } - public void finish(Position r, Forest result, Phase target, Forest[] holder) { + public void finish(Position r, Forest result, Phase target) { Parser.Table.State state0 = state.gotoSetNonTerminals.get(r.owner()); if (result==null) throw new Error(); if (state0!=null) @@ -429,6 +372,23 @@ class GSS { } public int toInt() { return idx; } private final int idx = node_idx++; + + // GraphViz ////////////////////////////////////////////////////////////////////////////// + + public GraphViz.Node toGraphViz(GraphViz gv) { + if (gv.hasNode(this)) return gv.createNode(this); + GraphViz.Node n = gv.createNode(this); + n.label = ""+state.toStringx(); + n.shape = "rectangle"; + n.fill = "green"; + for(Forest result : results()) n.edge(result, ""); + for(Node parent : parents()) n.edge(parent, ""); + ((GraphViz.Group)phase().toGraphViz(gv)).add(n); + return n; + } + public boolean isTransparent() { return false; } + public boolean isHidden() { return false; } + } private int node_idx = 0;