Improve array access performance.

dim-s · dim-s · commit 5d568857f519 · 2020-02-20T23:16:02.000+03:00
diff --git a/gradle.properties b/gradle.properties
@@ -1,2 +1,2 @@
 
-innoSetupDir=C:\\Program Files (x86)\\Inno Setup 5
+innoSetupDir=C:\\Program Files (x86)\\Inno Setup 6
diff --git a/jphp-core/api-docs/README.md b/jphp-core/api-docs/README.md
@@ -3,13 +3,13 @@
 ---
 
 ## jphp-core
-> version 1.1.0, created by JPPM.
+> version 1.1.1, created by JPPM.
 
 Compiler and Launcher for JPHP.
 
 ### Install
 ```
-jppm add jphp-core@1.1.0
+jppm add jphp-core@1.1.1
 ```
 
 ### API
diff --git a/jphp-core/api-docs/README.ru.md b/jphp-core/api-docs/README.ru.md
@@ -3,13 +3,13 @@
 ---
 
 ## jphp-core
-> версия 1.1.0, создано с помощью JPPM.
+> версия 1.1.1, создано с помощью JPPM.
 
 Compiler and Launcher for JPHP.
 
 ### Установка
 ```
-jppm add jphp-core@1.1.0
+jppm add jphp-core@1.1.1
 ```
 
 ### АПИ
diff --git a/jphp-core/package.php.yml b/jphp-core/package.php.yml
@@ -1,10 +1,10 @@
 
 name: jphp-core
-version: 1.1.0
+version: 1.1.1
 description: Compiler and Launcher for JPHP.
 
 deps:
-  jphp-runtime: '~1.0.3'
+  jphp-runtime: '~1.1.0'
 
 
 plugins: [Doc, Hub]
diff --git a/jphp-core/src/org/develnext/jphp/core/compiler/jvm/statement/ExpressionStmtCompiler.java b/jphp-core/src/org/develnext/jphp/core/compiler/jvm/statement/ExpressionStmtCompiler.java
@@ -416,9 +416,9 @@ public void writePushMemory(Memory memory) {
             if (arrayKey instanceof String) {
                 writePushConstString((String) arrayKey);
                 writeSysStaticCall(KeyValueMemory.class, "valueOf", Memory.class, Memory.class, Memory.class, String.class);
-            } else if (arrayKey instanceof LongMemory) {
-                writePushConstantMemory((Memory) arrayKey);
-                writeSysStaticCall(KeyValueMemory.class, "valueOf", Memory.class, Memory.class, Memory.class, Memory.class);
+            } else if (arrayKey instanceof Long) {
+                writePushConstLong((long) arrayKey);
+                writeSysStaticCall(KeyValueMemory.class, "valueOf", Memory.class, Memory.class, Memory.class, Long.TYPE);
             } else {
                 writeSysStaticCall(KeyValueMemory.class, "valueOf", Memory.class, Memory.class, Memory.class);
             }
@@ -449,16 +449,24 @@ public void writePushMemory(Memory memory) {
                     writeSysDynamicCall(ArrayMemory.class, "add", ReferenceMemory.class, Memory.class);
                 } else {
                     Memory key = foreachIterator.getMemoryKey();
-                    writePushMemory(key);
-
-                    if (!key.isString()) {
+                    if (key instanceof LongMemory) {
+                        writePushConstLong(key.toLong());
+                        writePushMemory(foreachIterator.getValue());
                         writePopBoxing();
-                    }
 
-                    writePushMemory(foreachIterator.getValue());
-                    writePopBoxing();
+                        writeSysDynamicCall(ArrayMemory.class, "put", ReferenceMemory.class, Long.TYPE, Memory.class);
+                    } else {
+                        writePushMemory(key);
 
-                    writeSysDynamicCall(ArrayMemory.class, "put", ReferenceMemory.class, Object.class, Memory.class);
+                        if (!key.isString()) {
+                            writePopBoxing();
+                        }
+
+                        writePushMemory(foreachIterator.getValue());
+                        writePopBoxing();
+
+                        writeSysDynamicCall(ArrayMemory.class, "put", ReferenceMemory.class, Object.class, Memory.class);
+                    }
                 }
 
                 writePopAll(1);
diff --git a/jphp-core/tests/php/runtime/memory/ArrayMemoryTest.java b/jphp-core/tests/php/runtime/memory/ArrayMemoryTest.java
@@ -203,8 +203,8 @@ public void testKeySet() {
         set = arr.keySet();
         setArr = set.toArray();
         assertEquals(3, setArr.length);
-        assertEquals(0, ((Memory)setArr[0]).toInteger());
-        assertEquals(1, ((Memory)setArr[1]).toInteger());
+        assertEquals(0L, setArr[0]);
+        assertEquals(1L, setArr[1]);
         assertEquals("3", setArr[2].toString());
     }
 }
diff --git a/jphp-runtime/package.php.yml b/jphp-runtime/package.php.yml
@@ -14,6 +14,8 @@ config:
   ignore: ['/package.hub.yml']
 
 history:
+  1.1.1:
+    - Improve arrays performance.
   1.1.0:
     - Add PHP 7.2 features (ref in list, is_countable, count() warnings).
   1.0.10:
diff --git a/jphp-runtime/src/php/runtime/memory/ArrayMemory.java b/jphp-runtime/src/php/runtime/memory/ArrayMemory.java
@@ -235,26 +235,26 @@ public ArrayMemory checkCopied() {
     public static Object toKey(Memory key) {
         switch (key.type) {
             case STRING: {
-                String key1 = key.toString();
-                Memory number = StringMemory.toLong(key1);
-                if (number == null)
-                    return key1;
-                else
-                    return number;
+                if (((StringMemory)key).canBeConvertedToLong()) {
+                    return StringMemory.toLong(key.toString()).toLong();
+                } else {
+                    return key.toString();
+                }
             }
             case INT:
-                return key;
+            case DOUBLE:
+                return key.toLong();
             case NULL:
                 return Memory.CONST_EMPTY_STRING;
             case REFERENCE:
                 return toKey(key.toValue());
             default:
-                return LongMemory.valueOf(key.toLong());
+                return toKey(StringMemory.valueOf(key.toString()));
         }
     }
 
     public boolean containsLongKey(long key) {
-        return containsKey(LongMemory.valueOf(key));
+        return containsKey(key);
     }
 
     public boolean containsKey(Object key) {
@@ -273,10 +273,10 @@ public boolean containsKey(Object key) {
     private void convertToMap() {
         map = new ArrayMemoryMap();
         if (_list != null && !_list.isEmpty()) {
-            int i = 0;
+            long i = 0;
             for (ReferenceMemory memory : _list) {
                 if (memory != null) {
-                    map.put(LongMemory.valueOf(i), memory.getValue());
+                    map.put(i, memory.getValue());
                 }
                 i++;
             }
@@ -343,8 +343,8 @@ public ReferenceMemory getByScalarOrCreate(Object sKey) {
 
     public ReferenceMemory getByScalar(Object key) {
         if (_list != null) {
-            if (key instanceof Memory) {
-                int index = (int) ((Memory) key).toLong();
+            if (key instanceof Long) {
+                int index = ((Long)key).intValue();
                 if (index >= 0 && index < _list.size()) {
                     return _list.get(index);
                 } else
@@ -396,7 +396,7 @@ public ReferenceMemory add(Memory value) {
             getList().add(ref);
             size++;
         } else {
-            ref = put(LongMemory.valueOf(++lastLongIndex), value);
+            ref = put(++lastLongIndex, value);
         }
 
         return ref;
@@ -431,7 +431,7 @@ public void merge(ArrayMemory array, boolean recursive, Set<Integer> done) {
             } else {
                 for (Map.Entry<Object, Memory> entry : array.map.entrySet()) {
                     Object key = entry.getKey();
-                    if (key instanceof LongMemory) {
+                    if (key instanceof Long) {
                         add(entry.getValue().toImmutable());
                     } else {
                         Memory value = entry.getValue();
@@ -466,10 +466,10 @@ public void merge(ArrayMemory array, boolean recursive, Set<Integer> done) {
 
     public void putAll(ArrayMemory array) {
         if (array.map == null) {
-            int i = 0;
+            long i = 0;
             for (ReferenceMemory memory : array.getList()) {
                 if (memory != null)
-                    put(LongMemory.valueOf(i), memory.toImmutable());
+                    put(i, memory.toImmutable());
                 i++;
             }
         } else {
@@ -488,10 +488,10 @@ public void putAll(ArrayMemory array) {
 
     public void putAllRef(ArrayMemory array) {
         if (array.map == null) {
-            int i = 0;
+            long i = 0;
             for (ReferenceMemory memory : array.getList()) {
                 if (memory != null)
-                    put(LongMemory.valueOf(i), memory);
+                    put(i, memory);
                 i++;
             }
         } else {
@@ -541,16 +541,21 @@ public ReferenceMemory put(Object key, IObject value) {
         return put(key, ObjectMemory.valueOf(value));
     }
 
+    public ReferenceMemory put(long key, Memory value) {
+        return put((Long) key, value);
+    }
+
     public ReferenceMemory put(Object key, Memory value) {
-        if (key instanceof LongMemory) {
+        if (key instanceof Long) {
             ReferenceMemory mem = new ReferenceMemory(value);
 
-            int index = (int) ((LongMemory) key).value;
-
-            if (index > lastLongIndex)
-                lastLongIndex = index;
+            if ((Long) key > lastLongIndex) {
+                lastLongIndex = (Long) key;
+            }
 
             if (map == null) {
+                int index = ((Number) key).intValue();
+
                 int size = getList().size();
                 if (index >= 0) {
                     if (index < size) {
@@ -618,14 +623,13 @@ else if (key instanceof String) {
         }
 
         {
-            if (key instanceof Long)
-                key = LongMemory.valueOf((Long) key);
-            else if (key instanceof Integer)
-                key = LongMemory.valueOf((Integer) key);
-            else if (key instanceof String) {
+            if (key instanceof String) {
                 Memory tmp = StringMemory.toLong((String) key);
-                if (tmp != null)
-                    key = tmp;
+                if (tmp != null) {
+                    key = tmp.toLong();
+                }
+            } else if (key instanceof Integer) {
+                key = ((Integer) key).longValue();
             }
 
             Memory memory = map.remove(key);
@@ -639,7 +643,7 @@ else if (key instanceof String) {
     public Memory remove(Memory key) {
         Object _key = toKey(key);
         if (map == null) {
-            int index = _key instanceof LongMemory ? (int) key.toLong() : -1;
+            int index = _key instanceof Long ? ((Long) _key).intValue() : -1;
             if (index < 0 || _list == null || index >= getList().size())
                 return null;
 
@@ -813,8 +817,8 @@ public Memory peekKey() {
             return LongMemory.valueOf(size - 1);
         else {
             Object key = map.lastKey();
-            if (key instanceof Memory) {
-                return (Memory) key;
+            if (key instanceof Long) {
+                return LongMemory.valueOf((Long) key);
             } else if (key instanceof String) {
                 return StringMemory.valueOf(key.toString());
             }
@@ -834,8 +838,8 @@ public Memory getRandomElementKey(Random rnd) {
             }
 
             Object key = keys.next();
-            if (key instanceof LongMemory)
-                return (LongMemory) key;
+            if (key instanceof Long)
+                return LongMemory.valueOf((long) key);
             else
                 return new StringMemory((String) key);
         }
@@ -1168,13 +1172,13 @@ public Memory valueOfIndex(TraceInfo trace, Memory index) {
 
     @Override
     public Memory valueOfIndex(TraceInfo trace, long index) {
-        Memory e = getByScalar(LongMemory.valueOf(index));
+        Memory e = getByScalar(index);
         return e == null ? UNDEFINED : e;
     }
 
     @Override
     public Memory valueOfIndex(TraceInfo trace, double index) {
-        Memory e = getByScalar(LongMemory.valueOf((long) index));
+        Memory e = getByScalar((long) index);
         return e == null ? UNDEFINED : e;
     }
 
@@ -1187,7 +1191,7 @@ public Memory valueOfIndex(TraceInfo trace, boolean index) {
     @Override
     public Memory valueOfIndex(TraceInfo trace, String index) {
         Memory number = StringMemory.toLong(index);
-        Memory e = number == null ? getByScalar(index) : getByScalar(number);
+        Memory e = number == null ? getByScalar(index) : getByScalar(number.toLong());
         return e == null ? UNDEFINED : e;
     }
 
@@ -1234,12 +1238,12 @@ public Memory refOfIndex(TraceInfo trace, Memory index) {
     @Override
     public Memory refOfIndex(TraceInfo trace, long index) {
         checkCopied();
-        return getOrCreate(LongMemory.valueOf(index));
+        return getByScalarOrCreate(index);
     }
 
     @Override
     public Memory refOfIndex(TraceInfo trace, double index) {
-        return refOfIndex(null, LongMemory.valueOf((long) index));
+        return refOfIndex(trace, (long) index);
     }
 
     @Override
@@ -1252,7 +1256,7 @@ public Memory refOfIndex(TraceInfo trace, boolean index) {
     public Memory refOfIndex(TraceInfo trace, String index) {
         checkCopied();
         Memory number = StringMemory.toLong(index);
-        return number == null ? getByScalarOrCreate(index) : getByScalarOrCreate(number);
+        return number == null ? getByScalarOrCreate(index) : getByScalarOrCreate(number.toLong());
     }
 
     @Override
@@ -1402,7 +1406,7 @@ protected boolean prevValue() {
                         return false;
                     } else {
                         cursor--;
-                        currentKey = LongMemory.valueOf((long) cursor);
+                        currentKey = (long) cursor;
                         setCurrentValue(getList().get(cursor));
                         return true;
                     }
@@ -1434,7 +1438,7 @@ protected boolean nextValue() {
                         return false;
                     }
 
-                    currentKey = LongMemory.valueOf((long) cursor);
+                    currentKey = (long) cursor;
                     setCurrentValue(getList().get(cursor));
                     cursor++;
                     return true;
diff --git a/jphp-runtime/src/php/runtime/memory/KeyValueMemory.java b/jphp-runtime/src/php/runtime/memory/KeyValueMemory.java
@@ -22,6 +22,12 @@ public static Memory valueOf(Memory key, Memory value, String arrayKey) {
     }
 
     public static Memory valueOf(Memory key, Memory value, Memory arrayKey) {
+        KeyValueMemory memory = new KeyValueMemory(key, value);
+        memory.arrayKey = ArrayMemory.toKey(arrayKey);
+        return memory;
+    }
+
+    public static Memory valueOf(Memory key, Memory value, long arrayKey) {
         KeyValueMemory memory = new KeyValueMemory(key, value);
         memory.arrayKey = arrayKey;
         return memory;
diff --git a/jphp-runtime/src/php/runtime/memory/StringMemory.java b/jphp-runtime/src/php/runtime/memory/StringMemory.java
diff --git a/jphp-runtime/src/php/runtime/reflection/ParameterEntity.java b/jphp-runtime/src/php/runtime/reflection/ParameterEntity.java
diff --git a/sandbox/src/JPHP-INF/.bootstrap.php b/sandbox/src/JPHP-INF/.bootstrap.php

Original file line number	Diff line number	Diff line change
`@@ -1,2 +1,2 @@`
`1`	`1`
`2`		`-innoSetupDir=C:\\Program Files (x86)\\Inno Setup 5`
	`2`	`+innoSetupDir=C:\\Program Files (x86)\\Inno Setup 6`
Original file line number	Diff line number	Diff line change
`@@ -203,8 +203,8 @@ public void testKeySet() {`
`203`	`203`	`set = arr.keySet();`
`204`	`204`	`setArr = set.toArray();`
`205`	`205`	`assertEquals(3, setArr.length);`
`206`		`- assertEquals(0, ((Memory)setArr[0]).toInteger());`
`207`		`- assertEquals(1, ((Memory)setArr[1]).toInteger());`
	`206`	`+ assertEquals(0L, setArr[0]);`
	`207`	`+ assertEquals(1L, setArr[1]);`
`208`	`208`	`assertEquals("3", setArr[2].toString());`
`209`	`209`	`}`
`210`	`210`	`}`