rebase into latest master

Major refactoring after fully passing the test suite

fixed 2 very nasty bugs

First working skeleton of a compact hash table, still lots of cleaning up and profiling required

Some cleanup and style fixes

Made index.length always even and exploited that for more efficient mod division

No floating point div on the fast path in resizeIndexIfNeeded, index array overallocates so that it's bigger than the kvstore

bug fixes, test failures now down to only 2  from 13

InlinedConditionProfile instead of ConditionProfile, more efficient getIndexPosFromHash and minor improvements

Style and comments

jt test fast passes fully !

Major Refactor

Author: moste00

src/main/java/org/truffleruby/core/hash/CompareHashKeysNode.java

@@ -9,13 +9,14 @@
  */
 package org.truffleruby.core.hash;
 
+import org.truffleruby.core.basicobject.ReferenceEqualNode;
+import org.truffleruby.core.kernel.KernelNodes.SameOrEqlNode;
+import org.truffleruby.language.RubyBaseNode;
+
 import com.oracle.truffle.api.dsl.Cached;
 import com.oracle.truffle.api.dsl.GenerateUncached;
 import com.oracle.truffle.api.dsl.Specialization;
 import com.oracle.truffle.api.nodes.Node;
-import org.truffleruby.core.basicobject.ReferenceEqualNode;
-import org.truffleruby.core.kernel.KernelNodes.SameOrEqlNode;
-import org.truffleruby.language.RubyBaseNode;
 
 @GenerateUncached
 public abstract class CompareHashKeysNode extends RubyBaseNode {
@@ -47,4 +48,26 @@ boolean same(boolean compareByIdentity, Object key, int hashed, Object otherKey,
             @Cached SameOrEqlNode same) {
         return hashed == otherHashed && same.execute(key, otherKey);
     }
+
+    @GenerateUncached
+    public abstract static class AssumingEqualHashes extends RubyBaseNode {
+
+        public static AssumingEqualHashes getUncached() {
+            return CompareHashKeysNodeGen.AssumingEqualHashesNodeGen.getUncached();
+        }
+
+        public abstract boolean execute(boolean compareByIdentity, Object key, Object otherKey);
+
+        @Specialization(guards = "compareByIdentity")
+        boolean refEquals(boolean compareByIdentity, Object key, Object otherKey,
+                @Cached ReferenceEqualNode refEqual) {
+            return refEqual.execute(this, key, otherKey);
+        }
+
+        @Specialization(guards = "!compareByIdentity")
+        boolean same(boolean compareByIdentity, Object key, Object otherKey,
+                @Cached SameOrEqlNode same) {
+            return same.execute(key, otherKey);
+        }
+    }
 }

src/main/java/org/truffleruby/core/hash/HashLiteralNode.java

@@ -10,6 +10,7 @@
 package org.truffleruby.core.hash;
 
 import org.truffleruby.core.hash.library.BucketsHashStore;
+import org.truffleruby.core.hash.library.CompactHashStore;
 import org.truffleruby.core.hash.library.EmptyHashStore;
 import org.truffleruby.core.hash.library.PackedHashStoreLibrary;
 import org.truffleruby.core.hash.library.PackedHashStoreLibraryFactory;
@@ -28,13 +29,21 @@ protected HashLiteralNode(RubyNode[] keyValues) {
         this.keyValues = keyValues;
     }
 
+    private static final boolean bigHashTypeIsCompactHash;
+    static {
+        String type = System.getProperty("BigHashStrategy");
+        bigHashTypeIsCompactHash = type != null && type.equalsIgnoreCase("compact");
+    }
+
     public static HashLiteralNode create(RubyNode[] keyValues) {
         if (keyValues.length == 0) {
             return new EmptyHashStore.EmptyHashLiteralNode();
         } else if (keyValues.length <= PackedHashStoreLibrary.MAX_ENTRIES * 2) {
             return PackedHashStoreLibraryFactory.SmallHashLiteralNodeGen.create(keyValues);
         } else {
-            return new BucketsHashStore.GenericHashLiteralNode(keyValues);
+            return bigHashTypeIsCompactHash
+                    ? new CompactHashStore.CompactHashLiteralNode(keyValues)
+                    : new BucketsHashStore.GenericHashLiteralNode(keyValues);
         }
     }
 

src/main/java/org/truffleruby/core/hash/RubyHash.java

@@ -11,6 +11,20 @@
 
 import java.util.Set;
 
+import org.truffleruby.RubyContext;
+import org.truffleruby.collections.PEBiFunction;
+import org.truffleruby.core.hash.library.BucketsHashStore;
+import org.truffleruby.core.hash.library.CompactHashStore;
+import org.truffleruby.core.hash.library.HashStoreLibrary;
+import org.truffleruby.core.klass.RubyClass;
+import org.truffleruby.interop.ForeignToRubyNode;
+import org.truffleruby.language.Nil;
+import org.truffleruby.language.RubyDynamicObject;
+import org.truffleruby.language.dispatch.DispatchNode;
+import org.truffleruby.language.objects.IsFrozenNode;
+import org.truffleruby.language.objects.ObjectGraph;
+import org.truffleruby.language.objects.ObjectGraphNode;
+
 import com.oracle.truffle.api.CompilerDirectives.TruffleBoundary;
 import com.oracle.truffle.api.dsl.Bind;
 import com.oracle.truffle.api.dsl.Cached;
@@ -26,20 +40,7 @@
 import com.oracle.truffle.api.library.ExportMessage;
 import com.oracle.truffle.api.nodes.Node;
 import com.oracle.truffle.api.object.Shape;
-
 import com.oracle.truffle.api.profiles.InlinedConditionProfile;
-import org.truffleruby.RubyContext;
-import org.truffleruby.collections.PEBiFunction;
-import org.truffleruby.core.hash.library.BucketsHashStore;
-import org.truffleruby.core.hash.library.HashStoreLibrary;
-import org.truffleruby.core.klass.RubyClass;
-import org.truffleruby.interop.ForeignToRubyNode;
-import org.truffleruby.language.Nil;
-import org.truffleruby.language.RubyDynamicObject;
-import org.truffleruby.language.dispatch.DispatchNode;
-import org.truffleruby.language.objects.IsFrozenNode;
-import org.truffleruby.language.objects.ObjectGraph;
-import org.truffleruby.language.objects.ObjectGraphNode;
 
 @ExportLibrary(InteropLibrary.class)
 @ImportStatic(HashGuards.class)
@@ -86,6 +87,8 @@ public String toString() {
     public void getAdjacentObjects(Set<Object> reachable) {
         if (store instanceof BucketsHashStore) {
             ((BucketsHashStore) store).getAdjacentObjects(reachable);
+        } else if (store instanceof CompactHashStore) {
+            ((CompactHashStore) store).getAdjacentObjects(reachable);
         } else {
             ObjectGraph.addProperty(reachable, store);
         }