eaglercraft/eagler-teavm-fork
1
0
Fork 0
mirror of https://github.com/Eaglercraft-TeaVM-Fork/eagler-teavm.git synced 2024-12-22 16:14:10 -08:00
Code Issues Actions Packages Projects Releases Wiki Activity

During node splitting, create copies for previously copied nodes, if necessary. See #219

Browse Source
This commit is contained in:
Alexey Andreev 2016-10-29 10:07:28 +03:00
parent 4b766f7b73
commit aebfe7d165
6 changed files with 73 additions and 23 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
core/src/main/java/org/teavm/common/DefaultGraphSplittingBackend.java
View File

@ -18,10 +18,6 @@ package org.teavm.common;
import com.carrotsearch.hppc.IntIntMap;
import com.carrotsearch.hppc.IntIntOpenHashMap;
/**
*
* @author Alexey Andreev
*/
public class DefaultGraphSplittingBackend implements GraphSplittingBackend {
private MutableDirectedGraph graph;
private int index;
@ -49,10 +45,6 @@ public class DefaultGraphSplittingBackend implements GraphSplittingBackend {
return prototypeNodes.get(index);
}
public int copyIndex(int index) {
return copyIndexes.get(index);
}
@Override
public int[] split(int[] domain, int[] nodes) {
int[] copies = new int[nodes.length];

4
core/src/main/java/org/teavm/common/GraphSplittingBackend.java
View File

@ -15,10 +15,6 @@
*/
package org.teavm.common;
/**
*
* @author Alexey Andreev
*/
public interface GraphSplittingBackend {
int[] split(int[] domain, int[] nodes);
}

13
core/src/main/java/org/teavm/common/GraphUtils.java
View File

@ -19,6 +19,7 @@ import java.util.ArrayList;
import java.util.Arrays;
import java.util.List;
import java.util.function.IntPredicate;
import java.util.stream.Collectors;
/**
*
@ -371,4 +372,16 @@ public final class GraphUtils {
}
return set;
}
public static String printToDot(Graph graph) {
StringBuilder sb = new StringBuilder("digraph G {\n");
for (int i = 0; i < graph.size(); ++i) {
String successors = Arrays.stream(graph.outgoingEdges(i))
.mapToObj(String::valueOf)
.collect(Collectors.joining(", "));
sb.append(" ").append(i).append(" -> {").append(successors).append("}\n");
}
sb.append("}");
return sb.toString();
}
}

60
core/src/main/java/org/teavm/common/IrreducibleGraphConverter.java
View File

@ -32,9 +32,19 @@ class IrreducibleGraphConverter {
private Graph cfg;
private int totalNodeCount;
private GraphSplittingBackend backend;
private IntSet[] nodeCopies;
private IntegerArray nodeOriginals;
public void convertToReducible(Graph cfg, int[] weight, GraphSplittingBackend backend) {
this.backend = backend;
nodeCopies = new IntOpenHashSet[cfg.size()];
nodeOriginals = new IntegerArray(cfg.size());
for (int i = 0; i < cfg.size(); ++i) {
nodeCopies[i] = new IntOpenHashSet();
nodeOriginals.add(i);
}
int[][] identityNodeMap = new int[cfg.size()][];
for (int i = 0; i < identityNodeMap.length; ++i) {
identityNodeMap[i] = new int[] { i };
@ -163,7 +173,11 @@ class IrreducibleGraphConverter {
}
// Delegate splitting to domain
int[][] newNodes = unflatten(backend.split(flatten(mappedDomain), flatten(mappedNonDomain)), mappedNonDomain);
int[] nodesToCopy = withCopies(flatten(mappedNonDomain));
int[] copies = backend.split(withCopies(flatten(mappedDomain)), nodesToCopy);
registerCopies(nodesToCopy, copies);
int[][] newNodes = unflatten(withoutCopies(copies), mappedNonDomain);
for (int[] nodes : newNodes) {
totalNodeCount += nodes.length;
}
@ -231,6 +245,50 @@ class IrreducibleGraphConverter {
handleLoops(new DJGraph(builder.build(), mappedWeight), newNodeMap);
}
private int[] withCopies(int[] nodes) {
IntegerArray nodesWithCopies = new IntegerArray(nodes.length);
for (int node : nodes) {
nodesWithCopies.add(node);
IntSet copies = nodeCopies[node];
if (copies != null) {
nodesWithCopies.addAll(copies.toArray());
}
}
return nodesWithCopies.getAll();
}
private int[] withoutCopies(int[] nodesWithCopies) {
IntSet visited = new IntOpenHashSet();
int[] nodes = new int[nodesWithCopies.length];
int sz = 0;
for (int node : nodesWithCopies) {
node = nodeOriginals.get(node);
if (visited.add(node)) {
nodes[sz++] = node;
}
}
return Arrays.copyOf(nodes, sz);
}
private void registerCopies(int[] originalNodes, int[] copies) {
for (int i = 0; i < originalNodes.length; ++i) {
int original = nodeOriginals.get(originalNodes[i]);
int copy = copies[i];
IntSet knownCopies = nodeCopies[original];
if (knownCopies == null) {
knownCopies = new IntOpenHashSet();
nodeCopies[original] = knownCopies;
}
if (knownCopies.add(copy)) {
while (nodeOriginals.size() <= copy) {
nodeOriginals.add(-1);
}
nodeOriginals.set(copy, original);
}
}
}
private void collapse(DJGraph djGraph, int[] scc, int[][] nodeMap) {
int cls = djGraph.collapse(scc);
IntegerArray nodes = new IntegerArray(djGraph.getGraph().size());

4
core/src/main/java/org/teavm/model/util/ProgramNodeSplittingBackend.java
View File

@ -21,10 +21,6 @@ import org.teavm.common.GraphSplittingBackend;
import org.teavm.model.BasicBlock;
import org.teavm.model.Program;
/**
*
* @author Alexey Andreev
*/
public class ProgramNodeSplittingBackend implements GraphSplittingBackend {
private Program program;

7
core/src/test/java/org/teavm/common/GraphTest.java
View File

@ -26,10 +26,6 @@ import java.util.Comparator;
import java.util.function.IntPredicate;
import org.junit.Test;
/**
*
* @author Alexey Andreev
*/
public class GraphTest {
@Test
public void stronglyConnectedComponentsCalculated() {
@ -205,7 +201,6 @@ public class GraphTest {
builder.addEdge(7, 8);
builder.addEdge(8, 7);
Graph graph = builder.build();
DefaultGraphSplittingBackend backend = new DefaultGraphSplittingBackend(graph);
int[] weights = new int[graph.size()];
Arrays.fill(weights, 1);
@ -214,7 +209,7 @@ public class GraphTest {
assertTrue("Should be irreducible", GraphUtils.isIrreducible(graph));
assertFalse("Should be reducible", GraphUtils.isIrreducible(result));
assertTrue("Should be equialent", isEquialent(backend, graph));
assertTrue("Should be equivalent", isEquialent(backend, graph));
}
private boolean isEquialent(DefaultGraphSplittingBackend backend, Graph proto) {