Do not unbox PInt/PFloat/PString if they have a pointer.

fangerer · fangerer · commit c3185e56e0ef · 2018-10-22T09:36:18.000+02:00
diff --git a/graalpython/com.oracle.graal.python/src/com/oracle/graal/python/builtins/objects/cext/CExtNodes.java b/graalpython/com.oracle.graal.python/src/com/oracle/graal/python/builtins/objects/cext/CExtNodes.java
@@ -375,33 +375,40 @@ public static ToSulongNode create() {
      * allocated in native code for consumption in Java.
      */
     public abstract static class AsPythonObjectNode extends CExtBaseNode {
+        @Child private MaterializeDelegateNode materializeNode;
+
         public abstract Object execute(Object value);
 
         @Specialization
         boolean doBoolNativeWrapper(BoolNativeWrapper object) {
             return object.getValue();
         }
 
-        @Specialization(guards = "!isMaterialized(object)")
+        @Specialization(guards = "!object.isNative()")
         byte doByteNativeWrapper(ByteNativeWrapper object) {
             return object.getValue();
         }
 
-        @Specialization(guards = "!isMaterialized(object)")
+        @Specialization(guards = "!object.isNative()")
         int doIntNativeWrapper(IntNativeWrapper object) {
             return object.getValue();
         }
 
-        @Specialization(guards = "!isMaterialized(object)")
+        @Specialization(guards = "!object.isNative()")
         long doLongNativeWrapper(LongNativeWrapper object) {
             return object.getValue();
         }
 
-        @Specialization(guards = "!isMaterialized(object)")
+        @Specialization(guards = "!object.isNative()")
         double doDoubleNativeWrapper(DoubleNativeWrapper object) {
             return object.getValue();
         }
 
+        @Specialization(guards = "object.isNative()")
+        Object doPrimitiveNativeWrapper(PrimitiveNativeWrapper object) {
+            return getMaterializeNode().execute(object);
+        }
+
         @Specialization(guards = {"!isPrimitiveNativeWrapper(object)", "object.getClass() == cachedClass"}, limit = "3")
         Object doNativeWrapper(PythonNativeWrapper object,
                         @SuppressWarnings("unused") @Cached("object.getClass()") Class<? extends PythonNativeWrapper> cachedClass) {
@@ -483,6 +490,14 @@ public static Object doSlowPath(Object object) {
             return object;
         }
 
+        private MaterializeDelegateNode getMaterializeNode() {
+            if (materializeNode == null) {
+                CompilerDirectives.transferToInterpreterAndInvalidate();
+                materializeNode = insert(MaterializeDelegateNode.create());
+            }
+            return materializeNode;
+        }
+
         public static AsPythonObjectNode create() {
             return AsPythonObjectNodeGen.create();
         }
@@ -495,8 +510,6 @@ public abstract static class MaterializeDelegateNode extends CExtBaseNode {
 
         public abstract Object execute(PythonNativeWrapper object);
 
-        @Child GetClassNode getClassNode;
-
         @Specialization(guards = "!isMaterialized(object)")
         PInt doBoolNativeWrapper(BoolNativeWrapper object) {
             PInt materializedInt = factory().createInt(object.getValue());
@@ -537,6 +550,7 @@ PInt doLongNativeWrapper(LongNativeWrapper object) {
         PFloat doDoubleNativeWrapper(DoubleNativeWrapper object) {
             PFloat materializedInt = factory().createFloat(object.getValue());
             object.setMaterializedObject(materializedInt);
+            materializedInt.setNativeWrapper(object);
             return materializedInt;
         }
 
diff --git a/graalpython/com.oracle.graal.python/src/com/oracle/graal/python/builtins/objects/common/SequenceStorageNodes.java b/graalpython/com.oracle.graal.python/src/com/oracle/graal/python/builtins/objects/common/SequenceStorageNodes.java
@@ -833,7 +833,7 @@ protected void doInt(IntSequenceStorage storage, int idx, int value) {
             storage.setIntItemNormalized(idx, value);
         }
 
-        @Specialization
+        @Specialization(guards = "!value.isNative()")
         protected void doInt(IntSequenceStorage storage, int idx, PInt value) {
             try {
                 storage.setIntItemNormalized(idx, value.intValueExact());
@@ -847,7 +847,7 @@ protected void doLong(LongSequenceStorage storage, int idx, long value) {
             storage.setLongItemNormalized(idx, value);
         }
 
-        @Specialization
+        @Specialization(guards = "!value.isNative()")
         protected void doLong(LongSequenceStorage storage, int idx, PInt value) {
             try {
                 storage.setLongItemNormalized(idx, value.longValueExact());
diff --git a/graalpython/com.oracle.graal.python/src/com/oracle/graal/python/builtins/objects/floats/PFloat.java b/graalpython/com.oracle.graal.python/src/com/oracle/graal/python/builtins/objects/floats/PFloat.java
@@ -59,6 +59,10 @@ public String toString() {
         return Double.toString(value);
     }
 
+    public boolean isNative() {
+        return getNativeWrapper() != null && getNativeWrapper().isNative();
+    }
+
     public static PFloat create(double value) {
         return create(null, value);
     }
diff --git a/graalpython/com.oracle.graal.python/src/com/oracle/graal/python/builtins/objects/ints/PInt.java b/graalpython/com.oracle.graal.python/src/com/oracle/graal/python/builtins/objects/ints/PInt.java
@@ -180,4 +180,8 @@ public static boolean isIntRange(long val) {
         return val == (int) val;
     }
 
+    public boolean isNative() {
+        return getNativeWrapper() != null && getNativeWrapper().isNative();
+    }
+
 }
diff --git a/graalpython/com.oracle.graal.python/src/com/oracle/graal/python/builtins/objects/str/PString.java b/graalpython/com.oracle.graal.python/src/com/oracle/graal/python/builtins/objects/str/PString.java
@@ -72,4 +72,8 @@ public int hashCode() {
     public boolean equals(Object obj) {
         return obj != null && obj.equals(value);
     }
+
+    public boolean isNative() {
+        return getNativeWrapper() != null && getNativeWrapper().isNative();
+    }
 }
diff --git a/graalpython/com.oracle.graal.python/src/com/oracle/graal/python/nodes/frame/WriteLocalVariableNode.java b/graalpython/com.oracle.graal.python/src/com/oracle/graal/python/nodes/frame/WriteLocalVariableNode.java
@@ -105,7 +105,7 @@ public int write(VirtualFrame frame, int value) {
             return value;
         }
 
-        @Specialization(guards = {"isLongOrObjectKind(frame)", "isPrimitiveInt(value)"}, rewriteOn = ArithmeticException.class)
+        @Specialization(guards = {"isLongOrObjectKind(frame)", "isPrimitiveInt(value)", "!value.isNative()"}, rewriteOn = ArithmeticException.class)
         public PInt writePIntAsLong(VirtualFrame frame, PInt value) {
             frame.getFrameDescriptor().setFrameSlotKind(frameSlot, FrameSlotKind.Long);
             frame.setLong(frameSlot, value.longValueExact());
diff --git a/graalpython/com.oracle.graal.python/src/com/oracle/graal/python/nodes/generator/WriteGeneratorFrameVariableNode.java b/graalpython/com.oracle.graal.python/src/com/oracle/graal/python/nodes/generator/WriteGeneratorFrameVariableNode.java
@@ -118,7 +118,7 @@ public int write(VirtualFrame frame, int value) {
             return value;
         }
 
-        @Specialization(guards = {"isLongOrObjectKind(frame)", "isPrimitiveInt(value)"}, rewriteOn = ArithmeticException.class)
+        @Specialization(guards = {"isLongOrObjectKind(frame)", "isPrimitiveInt(value)", "!value.isNative()"}, rewriteOn = ArithmeticException.class)
         public PInt writePIntAsLong(VirtualFrame frame, PInt value) {
             Frame generatorFrame = getGeneratorFrame(frame);
             generatorFrame.getFrameDescriptor().setFrameSlotKind(frameSlot, FrameSlotKind.Long);
diff --git a/graalpython/com.oracle.graal.python/src/com/oracle/graal/python/nodes/interop/PTypeToForeignNode.java b/graalpython/com.oracle.graal.python/src/com/oracle/graal/python/nodes/interop/PTypeToForeignNode.java
@@ -56,17 +56,18 @@ Object access(Object object) {
 
     public static boolean isBoxed(Object object) {
         if (object instanceof PFloat) {
-            return true;
+            return !((PFloat) object).isNative();
         } else if (object instanceof PInt) {
             try {
                 // try to use primitive
-                ((PInt) object).longValueExact();
-                return true;
+                PInt boxed = (PInt) object;
+                boxed.longValueExact();
+                return !boxed.isNative();
             } catch (ArithmeticException e) {
                 return false;
             }
         } else if (object instanceof PString) {
-            return true;
+            return !((PString) object).isNative();
         }
         return false;
     }
diff --git a/graalpython/com.oracle.graal.python/src/com/oracle/graal/python/nodes/interop/PTypeUnboxNode.java b/graalpython/com.oracle.graal.python/src/com/oracle/graal/python/nodes/interop/PTypeUnboxNode.java
@@ -54,27 +54,27 @@ public static PTypeUnboxNode create() {
 
     public abstract Object execute(Object value);
 
-    @Specialization
+    @Specialization(guards = "!obj.isNative()")
     String access(PString obj) {
         return obj.getValue();
     }
 
-    @Specialization
+    @Specialization(guards = "!obj.isNative()")
     double access(PFloat obj) {
         return obj.getValue();
     }
 
-    @Specialization(rewriteOn = ArithmeticException.class)
+    @Specialization(guards = "!obj.isNative()", rewriteOn = ArithmeticException.class)
     int accessInt(PInt obj) {
         return obj.intValueExact();
     }
 
-    @Specialization(rewriteOn = ArithmeticException.class)
+    @Specialization(guards = "!obj.isNative()", rewriteOn = ArithmeticException.class)
     long accessLong(PInt obj) {
         return obj.longValueExact();
     }
 
-    @Specialization
+    @Specialization(guards = "!obj.isNative()")
     Object accessPInt(PInt obj) {
         try {
             // try to use primitive

Original file line number	Diff line number	Diff line change
`@@ -59,6 +59,10 @@ public String toString() {`
`59`	`59`	`return Double.toString(value);`
`60`	`60`	`}`
`61`	`61`
	`62`	`+ public boolean isNative() {`
	`63`	`+ return getNativeWrapper() != null && getNativeWrapper().isNative();`
	`64`	`+ }`
	`65`	`+`
`62`	`66`	`public static PFloat create(double value) {`
`63`	`67`	`return create(null, value);`
`64`	`68`	`}`
Original file line number	Diff line number	Diff line change
`@@ -180,4 +180,8 @@ public static boolean isIntRange(long val) {`
`180`	`180`	`return val == (int) val;`
`181`	`181`	`}`
`182`	`182`
	`183`	`+ public boolean isNative() {`
	`184`	`+ return getNativeWrapper() != null && getNativeWrapper().isNative();`
	`185`	`+ }`
	`186`	`+`
`183`	`187`	`}`
Original file line number	Diff line number	Diff line change
`@@ -72,4 +72,8 @@ public int hashCode() {`
`72`	`72`	`public boolean equals(Object obj) {`
`73`	`73`	`return obj != null && obj.equals(value);`
`74`	`74`	`}`
	`75`	`+`
	`76`	`+ public boolean isNative() {`
	`77`	`+ return getNativeWrapper() != null && getNativeWrapper().isNative();`
	`78`	`+ }`
`75`	`79`	`}`
Original file line number	Diff line number	Diff line change
`@@ -105,7 +105,7 @@ public int write(VirtualFrame frame, int value) {`
`105`	`105`	`return value;`
`106`	`106`	`}`
`107`	`107`
`108`		`- @Specialization(guards = {"isLongOrObjectKind(frame)", "isPrimitiveInt(value)"}, rewriteOn = ArithmeticException.class)`
	`108`	`+ @Specialization(guards = {"isLongOrObjectKind(frame)", "isPrimitiveInt(value)", "!value.isNative()"}, rewriteOn = ArithmeticException.class)`
`109`	`109`	`public PInt writePIntAsLong(VirtualFrame frame, PInt value) {`
`110`	`110`	`frame.getFrameDescriptor().setFrameSlotKind(frameSlot, FrameSlotKind.Long);`
`111`	`111`	`frame.setLong(frameSlot, value.longValueExact());`
Original file line number	Diff line number	Diff line change
`@@ -118,7 +118,7 @@ public int write(VirtualFrame frame, int value) {`
`118`	`118`	`return value;`
`119`	`119`	`}`
`120`	`120`
`121`		`- @Specialization(guards = {"isLongOrObjectKind(frame)", "isPrimitiveInt(value)"}, rewriteOn = ArithmeticException.class)`
	`121`	`+ @Specialization(guards = {"isLongOrObjectKind(frame)", "isPrimitiveInt(value)", "!value.isNative()"}, rewriteOn = ArithmeticException.class)`
`122`	`122`	`public PInt writePIntAsLong(VirtualFrame frame, PInt value) {`
`123`	`123`	`Frame generatorFrame = getGeneratorFrame(frame);`
`124`	`124`	`generatorFrame.getFrameDescriptor().setFrameSlotKind(frameSlot, FrameSlotKind.Long);`