Skip to content

[GR-75343] Add profiling to improve PE performance of ObjectHashMap. #841

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
graalvmbot wants to merge 1 commit into from
+136 −120
Closed

[GR-75343] Add profiling to improve PE performance of ObjectHashMap. #841

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
23 changes: 4 additions & 19 deletions ...oracle.graal.python.test/src/com/oracle/graal/python/test/objects/ObjectHashMapTests.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -74,9 +74,6 @@
import com.oracle.truffle.api.frame.Frame;
import com.oracle.truffle.api.interop.TruffleObject;
import com.oracle.truffle.api.nodes.Node;
import com.oracle.truffle.api.profiles.InlinedBranchProfile;
import com.oracle.truffle.api.profiles.InlinedConditionProfile;
import com.oracle.truffle.api.profiles.InlinedCountingConditionProfile;

public class ObjectHashMapTests {
public static final class DictKey implements TruffleObject {
Expand Down Expand Up @@ -220,8 +217,7 @@ private static void popValues(ObjectHashMap map, LinkedHashMap<Long, Object> exp
var keys = expected.keySet().stream().toList().reversed().stream().limit(count).toArray(Long[]::new);
for (int i = 0; i < keys.length; i++) {
Long key = keys[i];
Object[] popped = PopNode.doPopWithRestart(null, map, InlinedConditionProfile.getUncached(), InlinedCountingConditionProfile.getUncached(), InlinedCountingConditionProfile.getUncached(),
InlinedBranchProfile.getUncached());
Object[] popped = PopNode.doPopWithRestartForTests(map);
Assert.assertEquals(Integer.toString(i), key, popped[0]);
Assert.assertEquals(Integer.toString(i), expected.get(key), popped[1]);
expected.remove(key);
Expand Down Expand Up @@ -376,25 +372,14 @@ private static long getKeyHash(Object key) {
}

private static Object get(ObjectHashMap map, Object key, long hash) {
InlinedCountingConditionProfile uncachedCounting = InlinedCountingConditionProfile.getUncached();
return ObjectHashMap.GetNode.doGetWithRestart(null, null, map, key, hash,
InlinedBranchProfile.getUncached(), uncachedCounting, uncachedCounting, uncachedCounting,
uncachedCounting, uncachedCounting,
new EqNodeStub());
return ObjectHashMap.GetNode.doGetWithRestartForTests(map, key, hash, new EqNodeStub());
}

private static void remove(ObjectHashMap map, Object key, long hash) {
InlinedCountingConditionProfile uncachedCounting = InlinedCountingConditionProfile.getUncached();
ObjectHashMap.RemoveNode.doRemoveWithRestart(null, null, map, key, hash,
InlinedBranchProfile.getUncached(), uncachedCounting, uncachedCounting, uncachedCounting,
uncachedCounting, InlinedBranchProfile.getUncached(), new EqNodeStub());
ObjectHashMap.RemoveNode.doRemoveWithRestartForTests(map, key, hash, new EqNodeStub());
}

private static void put(ObjectHashMap map, Object key, long hash, Object value) {
InlinedCountingConditionProfile uncachedCounting = InlinedCountingConditionProfile.getUncached();
PutNode.doPutWithRestart(null, null, map, key, hash, value,
InlinedBranchProfile.getUncached(), uncachedCounting, uncachedCounting, uncachedCounting,
uncachedCounting, InlinedBranchProfile.getUncached(), InlinedBranchProfile.getUncached(),
new EqNodeStub());
PutNode.doPutWithRestartForTests(map, key, hash, value, new EqNodeStub());
}
}
Loading
Loading