Skip to content

Commit

Permalink
Fix issues related to sigma nodes in phi updater
Browse files Browse the repository at this point in the history
  • Loading branch information
@konsoletyper
konsoletyper committed Sep 2, 2024
1 parent 019eb45 commit d2f5815
Show file tree
Hide file tree
Showing 2 changed files with 39 additions and 72 deletions.
108 changes: 39 additions & 69 deletions core/src/main/java/org/teavm/model/util/PhiUpdater.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -101,6 +101,7 @@ public class PhiUpdater {
private Sigma[][] sigmas;
private Predicate<Instruction> sigmaPredicate = instruction -> false;
private int[][][] frontierVariableCache;
private Variable[][] pendingVariableMap;

public int getSourceVariable(int var) {
if (var >= variableToSourceMap.size()) {
Expand Down Expand Up @@ -141,6 +142,7 @@ public void updatePhis(Program program, Variable[] parameters) {
domTree = GraphUtils.buildDominatorTree(cfg);
domFrontiers = new int[cfg.size()][];
domGraph = GraphUtils.buildDominatorGraph(domTree, program.basicBlockCount());
pendingVariableMap = new Variable[program.basicBlockCount()][];

variableMap = new Variable[program.variableCount()];
usedDefinitions = new boolean[program.variableCount()];
Expand Down Expand Up @@ -207,11 +209,7 @@ private void estimateSigmas() {
Sigma sigma = new Sigma(block, variables[j]);
sigmasInBlock[j] = sigma;
for (BasicBlock target : targets) {
Variable outgoingVar = program.createVariable();
variableToSourceMap.add(sigma.getValue().getIndex());
outgoingVar.setDebugName(sigma.getValue().getDebugName());
outgoingVar.setLabel(sigma.getValue().getLabel());
Outgoing outgoing = new Outgoing(outgoingVar, target);
Outgoing outgoing = new Outgoing(variables[j], target);
sigma.getOutgoings().add(outgoing);
}
}
Expand Down Expand Up @@ -264,12 +262,6 @@ private void estimatePhis() {
}
}

if (sigmas[i] != null) {
for (Sigma sigma : sigmas[i]) {
markAssignment(sigma.getValue());
}
}

for (int successor : domGraph.outgoingEdges(i)) {
stack.addLast(successor);
}
Expand Down Expand Up @@ -307,31 +299,22 @@ private void increaseDefinitionCount(Variable var) {
}
}

private static class Task {
Variable[] variables;
BasicBlock block;
}

private void renameVariables() {
Deque<Task> stack = new ArrayDeque<>();
Deque<BasicBlock> stack = new ArrayDeque<>();
for (int i = 0; i < program.basicBlockCount(); ++i) {
if (domGraph.incomingEdgesCount(i) == 0) {
Task task = new Task();
task.block = program.basicBlockAt(i);
task.variables = variableMap.clone();
stack.push(task);
stack.push(program.basicBlockAt(i));
pendingVariableMap[i] = variableMap.clone();
}
}

List<List<Incoming>> phiOutputs = ProgramUtils.getPhiOutputs(program);

while (!stack.isEmpty()) {
Collections.fill(definedVersions, null);
Task task = stack.pop();

currentBlock = task.block;
currentBlock = stack.pop();
int index = currentBlock.getIndex();
variableMap = task.variables.clone();
variableMap = pendingVariableMap[index];
pendingVariableMap[index] = null;

if (currentBlock.getExceptionVariable() != null) {
currentBlock.setExceptionVariable(define(currentBlock.getExceptionVariable()));
Expand All @@ -355,30 +338,20 @@ private void renameVariables() {

int[] successors = domGraph.outgoingEdges(index);

for (Incoming output : phiOutputs.get(index)) {
Variable var = output.getValue();
Variable sigmaVar = applySigmaRename(output.getPhi().getBasicBlock(), var);
var = sigmaVar != var ? sigmaVar : use(var);
output.setValue(var);
Sigma[] nextSigmas = sigmas[index];
if (nextSigmas != null) {
for (Sigma sigma : sigmas[index]) {
sigma.setValue(use(sigma.getValue()));
}
}

Sigma[] nextSigmas = sigmas[index];
var oldVariableMap = variableMap;
for (int j = successors.length - 1; j >= 0; --j) {
int successor = successors[j];
Task next = new Task();
next.variables = variableMap.clone();
next.block = program.basicBlockAt(successor);
if (nextSigmas != null) {
for (Sigma sigma : nextSigmas) {
for (Outgoing outgoing : sigma.getOutgoings()) {
if (outgoing.getTarget().getIndex() == successor) {
next.variables[sigma.getValue().getIndex()] = outgoing.getValue();
break;
}
}
}
}
stack.push(next);
var variables = oldVariableMap.clone();
pendingVariableMap[successor] = variables;
stack.push(program.basicBlockAt(successor));
variableMap = variables;
}

IntSet exceptionHandlingSuccessors = new IntHashSet();
Expand All @@ -387,13 +360,19 @@ private void renameVariables() {
}

for (int successor : cfg.outgoingEdges(index)) {
renameOutgoingPhis(successor, exceptionHandlingSuccessors.contains(successor));
}

if (sigmas[index] != null) {
for (Sigma sigma : sigmas[index]) {
sigma.setValue(use(sigma.getValue()));
variableMap = domTree.directlyDominates(currentBlock.getIndex(), successor)
? pendingVariableMap[successor]
: oldVariableMap.clone();
if (nextSigmas != null) {
for (var sigma : nextSigmas) {
for (var outgoing : sigma.getOutgoings()) {
if (outgoing.getTarget().getIndex() == successor) {
outgoing.setValue(define(outgoing.getValue()));
}
}
}
}
renameOutgoingPhis(successor, exceptionHandlingSuccessors.contains(successor));
}
}
}
Expand Down Expand Up @@ -445,7 +424,6 @@ private void renameOutgoingPhis(int successor, boolean allVersions) {

for (int j = 0; j < phis.size(); ++j) {
Phi phi = phis.get(j);
Variable originalVar = program.variableAt(phiIndexes[j]);
Variable var = variableMap[phiIndexes[j]];
if (var != null) {
List<Variable> versions = definedVersions.get(phiIndexes[j]);
Expand All @@ -458,32 +436,24 @@ private void renameOutgoingPhis(int successor, boolean allVersions) {
}
}

Variable sigmaVar = applySigmaRename(program.basicBlockAt(successor), originalVar);
Incoming incoming = new Incoming();
incoming.setSource(currentBlock);
incoming.setValue(sigmaVar != originalVar ? sigmaVar : var);
incoming.setValue(var);
phi.getIncomings().add(incoming);
phi.getReceiver().setDebugName(var.getDebugName());
}
}
}

private Variable applySigmaRename(BasicBlock target, Variable var) {
Sigma[] blockSigmas = sigmas[currentBlock.getIndex()];
if (blockSigmas == null) {
return var;
}
for (Sigma sigma : blockSigmas) {
if (sigma.getValue() != var) {
continue;
}
for (Outgoing outgoing : sigma.getOutgoings()) {
if (outgoing.getTarget() == target) {
return outgoing.getValue();
for (var phi : program.basicBlockAt(successor).getPhis()) {
for (var incoming : phi.getIncomings()) {
if (incoming.getSource() == currentBlock) {
var value = variableMap[incoming.getValue().getIndex()];
if (value != null) {
incoming.setValue(value);
}
}
}
}
return var;
}

private void markAssignment(Variable var) {
Expand Down
3 changes: 0 additions & 3 deletions core/src/test/java/org/teavm/model/analysis/test/NullnessAnalysisTest.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -86,9 +86,6 @@ public void nonDominatedBranch() {
}

@Test
@Ignore
// Fix this issue and un-ignore
// Also, un-ignore TestYear.test_isLeap
public void nonDominatedBranch2() {
test();
}
Expand Down

0 comments on commit d2f5815

Please sign in to comment.