Skip to content
Permalink

Comparing changes

Choose two branches to see what’s changed or to start a new pull request. If you need to, you can also or learn more about diff comparisons.

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also . Learn more about diff comparisons here.
base repository: jruby/jruby
Failed to load repositories. Confirm that selected base ref is valid, then try again.
Loading
base: e5c4114a6c67
Choose a base ref
...
head repository: jruby/jruby
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: d9ac26b2f9a8
Choose a head ref
  • 2 commits
  • 6 files changed
  • 1 contributor

Commits on Mar 9, 2015

  1. [Truffle] Reduce diff with truffle-head for YieldDispatchNodes.

    @eregon
    eregon committed Mar 9, 2015
    Copy the full SHA
    b9786f0 View commit details

  2. [Truffle] Fix parser warnings in rubinius code.

    @eregon
    eregon committed Mar 9, 2015
    Copy the full SHA
    d9ac26b View commit details
34 changes: 15 additions & 19 deletions truffle/src/main/java/org/jruby/truffle/nodes/yield/CachedYieldDispatchNode.java
View file
Original file line number Diff line number Diff line change
@@ -14,6 +14,7 @@
import com.oracle.truffle.api.nodes.DirectCallNode;
import com.oracle.truffle.api.nodes.NodeCost;
import com.oracle.truffle.api.nodes.NodeInfo;

import org.jruby.truffle.runtime.RubyArguments;
import org.jruby.truffle.runtime.RubyContext;
import org.jruby.truffle.runtime.core.RubyProc;
@@ -22,6 +23,9 @@
@NodeInfo(cost = NodeCost.POLYMORPHIC)
public class CachedYieldDispatchNode extends YieldDispatchNode {

private static final boolean INLINER_ALWAYS_CLONE_YIELD = Options.TRUFFLE_INLINER_ALWAYS_CLONE_YIELD.load();
private static final boolean INLINER_ALWAYS_INLINE_YIELD = Options.TRUFFLE_INLINER_ALWAYS_INLINE_YIELD.load();

@Child private DirectCallNode callNode;
@Child private YieldDispatchNode next;

@@ -31,42 +35,34 @@ public CachedYieldDispatchNode(RubyContext context, RubyProc block, YieldDispatc
callNode = Truffle.getRuntime().createDirectCallNode(block.getCallTargetForBlocks());
insert(callNode);

if (Options.TRUFFLE_INLINER_ALWAYS_CLONE_YIELD.load() && callNode.isCallTargetCloningAllowed()) {
if (INLINER_ALWAYS_CLONE_YIELD && callNode.isCallTargetCloningAllowed()) {
callNode.cloneCallTarget();
}

if (Options.TRUFFLE_INLINER_ALWAYS_INLINE_YIELD.load() && callNode.isInlinable()) {
if (INLINER_ALWAYS_INLINE_YIELD && callNode.isInlinable()) {
callNode.forceInlining();
}

this.next = next;
}

@Override
public Object dispatch(VirtualFrame frame, RubyProc block, Object[] argumentsObjects) {
if (block.getCallTargetForBlocks() != callNode.getCallTarget()) {
return next.dispatch(frame, block, argumentsObjects);
}

return callNode.call(frame, RubyArguments.pack(block.getMethod(), block.getDeclarationFrame(), block.getSelfCapturedInScope(), block.getBlockCapturedInScope(), argumentsObjects));
protected boolean guard(RubyProc block) {
return block.getCallTargetForBlocks() == callNode.getCallTarget();
}

@Override
public Object dispatchWithModifiedBlock(VirtualFrame frame, RubyProc block, RubyProc modifiedBlock, Object[] argumentsObjects) {
if (block.getCallTargetForBlocks() != callNode.getCallTarget()) {
return next.dispatch(frame, block, argumentsObjects);
}

return callNode.call(frame, RubyArguments.pack(block.getMethod(), block.getDeclarationFrame(), block.getSelfCapturedInScope(), modifiedBlock, argumentsObjects));
protected YieldDispatchNode getNext() {
return next;
}

@Override
public Object dispatchWithModifiedSelf(VirtualFrame frame, RubyProc block, Object self, Object... argumentsObjects) {
if (block.getCallTargetForBlocks() != callNode.getCallTarget()) {
return next.dispatchWithModifiedSelf(frame, block, self, argumentsObjects);
public Object dispatchWithSelfAndBlock(VirtualFrame frame, RubyProc block, Object self, RubyProc modifiedBlock, Object... argumentsObjects) {
if (guard(block)) {
return callNode.call(frame, RubyArguments.pack(block.getMethod(), block.getDeclarationFrame(), self, modifiedBlock, argumentsObjects));
} else {
return next.dispatchWithSelfAndBlock(frame, block, self, modifiedBlock, argumentsObjects);
}

return callNode.call(frame, RubyArguments.pack(block.getMethod(), block.getDeclarationFrame(), self, block.getBlockCapturedInScope(), argumentsObjects));
}

@Override
16 changes: 5 additions & 11 deletions truffle/src/main/java/org/jruby/truffle/nodes/yield/GeneralYieldDispatchNode.java
View file
Original file line number Diff line number Diff line change
@@ -14,6 +14,7 @@
import com.oracle.truffle.api.nodes.IndirectCallNode;
import com.oracle.truffle.api.nodes.NodeCost;
import com.oracle.truffle.api.nodes.NodeInfo;

import org.jruby.truffle.runtime.RubyArguments;
import org.jruby.truffle.runtime.RubyContext;
import org.jruby.truffle.runtime.core.RubyProc;
@@ -29,21 +30,14 @@ public GeneralYieldDispatchNode(RubyContext context) {
}

@Override
public Object dispatch(VirtualFrame frame, RubyProc block, Object[] argumentsObjects) {
return callNode.call(frame, block.getCallTargetForBlocks(),
RubyArguments.pack(block.getMethod(), block.getDeclarationFrame(), block.getSelfCapturedInScope(), block.getBlockCapturedInScope(), argumentsObjects));
}

@Override
public Object dispatchWithModifiedBlock(VirtualFrame frame, RubyProc block, RubyProc modifiedBlock, Object[] argumentsObjects) {
return callNode.call(frame, block.getCallTargetForBlocks(),
RubyArguments.pack(block.getMethod(), block.getDeclarationFrame(), block.getSelfCapturedInScope(), modifiedBlock, argumentsObjects));
protected boolean guard(RubyProc block) {
return true;
}

@Override
public Object dispatchWithModifiedSelf(VirtualFrame frame, RubyProc block, Object self, Object... argumentsObjects) {
public Object dispatchWithSelfAndBlock(VirtualFrame frame, RubyProc block, Object self, RubyProc modifiedBlock, Object... argumentsObjects) {
return callNode.call(frame, block.getCallTargetForBlocks(),
RubyArguments.pack(block.getMethod(), block.getDeclarationFrame(), self, block.getBlockCapturedInScope(), argumentsObjects));
RubyArguments.pack(block.getMethod(), block.getDeclarationFrame(), self, modifiedBlock, argumentsObjects));
}

}
86 changes: 38 additions & 48 deletions truffle/src/main/java/org/jruby/truffle/nodes/yield/UninitializedYieldDispatchNode.java
View file
Original file line number Diff line number Diff line change
@@ -9,14 +9,17 @@
*/
package org.jruby.truffle.nodes.yield;

import java.util.concurrent.Callable;

import com.oracle.truffle.api.CompilerDirectives;
import com.oracle.truffle.api.frame.VirtualFrame;
import com.oracle.truffle.api.nodes.NodeCost;
import com.oracle.truffle.api.nodes.NodeInfo;
import com.oracle.truffle.api.nodes.NodeUtil;

import org.jruby.truffle.nodes.dispatch.DispatchNode;
import org.jruby.truffle.runtime.RubyContext;
import org.jruby.truffle.runtime.core.RubyProc;
import org.jruby.util.cli.Options;

@NodeInfo(cost = NodeCost.UNINITIALIZED)
public class UninitializedYieldDispatchNode extends YieldDispatchNode {
@@ -28,57 +31,44 @@ public UninitializedYieldDispatchNode(RubyContext context) {
}

@Override
public Object dispatch(VirtualFrame frame, RubyProc block, Object[] argumentsObjects) {
CompilerDirectives.transferToInterpreterAndInvalidate();

depth++;

if (depth == Options.TRUFFLE_DISPATCH_POLYMORPHIC_MAX.load()) {
final YieldDispatchHeadNode dispatchHead = (YieldDispatchHeadNode) NodeUtil.getNthParent(this, depth);
final GeneralYieldDispatchNode newGeneralYield = new GeneralYieldDispatchNode(getContext());
dispatchHead.getDispatch().replace(newGeneralYield);
return newGeneralYield.dispatch(frame, block, argumentsObjects);
}

final CachedYieldDispatchNode dispatch = new CachedYieldDispatchNode(getContext(), block, this);
replace(dispatch);
return dispatch.dispatch(frame, block, argumentsObjects);
}

@Override
public Object dispatchWithModifiedBlock(VirtualFrame frame, RubyProc block, RubyProc modifiedBlock, Object[] argumentsObjects) {
CompilerDirectives.transferToInterpreterAndInvalidate();

depth++;

if (depth == Options.TRUFFLE_DISPATCH_POLYMORPHIC_MAX.load()) {
final YieldDispatchHeadNode dispatchHead = (YieldDispatchHeadNode) NodeUtil.getNthParent(this, depth);
final GeneralYieldDispatchNode newGeneralYield = new GeneralYieldDispatchNode(getContext());
dispatchHead.getDispatch().replace(newGeneralYield);
return newGeneralYield.dispatch(frame, block, argumentsObjects);
}

final CachedYieldDispatchNode dispatch = new CachedYieldDispatchNode(getContext(), block, this);
replace(dispatch);
return dispatch.dispatchWithModifiedBlock(frame, block, modifiedBlock, argumentsObjects);
protected boolean guard(RubyProc block) {
return false;
}

@Override
public Object dispatchWithModifiedSelf(VirtualFrame frame, RubyProc block, Object self, Object... argumentsObjects) {
public Object dispatchWithSelfAndBlock(VirtualFrame frame, final RubyProc block, Object self, RubyProc modifiedBlock, Object... argumentsObjects) {
CompilerDirectives.transferToInterpreterAndInvalidate();

depth++;

if (depth == Options.TRUFFLE_DISPATCH_POLYMORPHIC_MAX.load()) {
final YieldDispatchHeadNode dispatchHead = (YieldDispatchHeadNode) NodeUtil.getNthParent(this, depth);
final GeneralYieldDispatchNode newGeneralYield = new GeneralYieldDispatchNode(getContext());
dispatchHead.getDispatch().replace(newGeneralYield);
return newGeneralYield.dispatchWithModifiedSelf(frame, block, self, argumentsObjects);
}

final CachedYieldDispatchNode dispatch = new CachedYieldDispatchNode(getContext(), block, this);
replace(dispatch);
return dispatch.dispatchWithModifiedSelf(frame, block, self, argumentsObjects);
final UninitializedYieldDispatchNode currentNode = this;

final YieldDispatchNode dispatch = atomic(new Callable<YieldDispatchNode>() {
@Override
public YieldDispatchNode call() {
// First try to see if we did not a miss a specialization added by another thread.
final YieldDispatchHeadNode dispatchHead = (YieldDispatchHeadNode) NodeUtil.getNthParent(currentNode, depth + 1);

YieldDispatchNode lookupDispatch = dispatchHead.getDispatch();
while (lookupDispatch != null) {
if (lookupDispatch.guard(block)) {
// This one worked, no need to rewrite anything.
return lookupDispatch;
}
lookupDispatch = lookupDispatch.getNext();
}

if (depth < DispatchNode.DISPATCH_POLYMORPHIC_MAX) {
depth++;
CachedYieldDispatchNode cachedDispatch = new CachedYieldDispatchNode(getContext(), block, currentNode);
replace(cachedDispatch);
return cachedDispatch;
} else {
GeneralYieldDispatchNode newGeneralYield = new GeneralYieldDispatchNode(getContext());
dispatchHead.getDispatch().replace(newGeneralYield);
return newGeneralYield;
}
}
});

return dispatch.dispatchWithSelfAndBlock(frame, block, self, modifiedBlock, argumentsObjects);
}

}
6 changes: 3 additions & 3 deletions truffle/src/main/java/org/jruby/truffle/nodes/yield/YieldDispatchHeadNode.java
View file
Original file line number Diff line number Diff line change
@@ -31,11 +31,11 @@ public YieldDispatchHeadNode(RubyContext context) {
}

public Object dispatch(VirtualFrame frame, RubyProc block, Object... argumentsObjects) {
return dispatch.dispatch(frame, block, argumentsObjects);
return dispatch.dispatchWithSelfAndBlock(frame, block, block.getSelfCapturedInScope(), block.getBlockCapturedInScope(), argumentsObjects);
}

public Object dispatchWithModifiedBlock(VirtualFrame frame, RubyProc block, RubyProc modifiedBlock, Object... argumentsObjects) {
return dispatch.dispatchWithModifiedBlock(frame, block, modifiedBlock, argumentsObjects);
return dispatch.dispatchWithSelfAndBlock(frame, block, block.getSelfCapturedInScope(), modifiedBlock, argumentsObjects);
}

public Object dispatchWithModifiedSelf(VirtualFrame currentFrame, RubyProc block, Object self, Object... argumentsObjects) {
@@ -48,7 +48,7 @@ public Object dispatchWithModifiedSelf(VirtualFrame currentFrame, RubyProc block
try {
frame.setObject(slot, Visibility.PUBLIC);

return dispatch.dispatchWithModifiedSelf(currentFrame, block, self, argumentsObjects);
return dispatch.dispatchWithSelfAndBlock(currentFrame, block, self, block.getBlockCapturedInScope(), argumentsObjects);
} finally {
frame.setObject(slot, oldVisibility);
}
8 changes: 5 additions & 3 deletions truffle/src/main/java/org/jruby/truffle/nodes/yield/YieldDispatchNode.java
View file
Original file line number Diff line number Diff line change
@@ -23,11 +23,13 @@ public YieldDispatchNode(RubyContext context) {
this.context = context;
}

public abstract Object dispatch(VirtualFrame frame, RubyProc block, Object[] argumentsObjects);
protected YieldDispatchNode getNext() {
return null;
}

public abstract Object dispatchWithModifiedBlock(VirtualFrame frame, RubyProc block, RubyProc modifiedBlock, Object[] argumentsObjects);
protected abstract boolean guard(RubyProc block);

public abstract Object dispatchWithModifiedSelf(VirtualFrame frame, RubyProc block, Object self, Object... argumentsObjects);
public abstract Object dispatchWithSelfAndBlock(VirtualFrame frame, RubyProc block, Object self, RubyProc modifiedBlock, Object... argumentsObjects);

public RubyContext getContext() {
return context;
4 changes: 2 additions & 2 deletions truffle/src/main/ruby/core/rubinius/common/rationalizer.rb
View file
Original file line number Diff line number Diff line change
@@ -50,8 +50,8 @@ def convert
de = m[3]
re = m.post_match

ifp, exp = nu.split /[eE]/
ip, fp = ifp.split /\./
ifp, exp = nu.split(/[eE]/)
ip, fp = ifp.split(/\./)

value = Rational.new(ip.to_i, 1)