[GR-31126] Add fast paths for common unary operations.

lukasstadler · lukasstadler · commit 99c6832907b8 · 2021-05-10T11:26:48.000Z
PullRequest: graalpython/1789
diff --git a/graalpython/com.oracle.graal.python.test/testData/goldenFiles/BasicTests/unary01.tast b/graalpython/com.oracle.graal.python.test/testData/goldenFiles/BasicTests/unary01.tast
@@ -5,9 +5,7 @@ ModuleRootNode Name: <module 'unary01'> SourceSection: [0,2]`+u`
   FrameDescriptor:  Empty
   Documentation: None
   InnerRootNode SourceSection: [0,2]`+u`
-    UnaryArithmeticExpression SourceSection: [0,2]`+u`
-      LookupAndCallUnaryNodeGen SourceSection: None
-        Op: __pos__
+    PosNodeGen SourceSection: [0,2]`+u`
       ReadNameNodeGen SourceSection: [1,2]`u`
         Identifier: u
         IsBuiltinClassProfile SourceSection: None
diff --git a/graalpython/com.oracle.graal.python.test/testData/goldenFiles/BasicTests/unary02.tast b/graalpython/com.oracle.graal.python.test/testData/goldenFiles/BasicTests/unary02.tast
@@ -5,9 +5,7 @@ ModuleRootNode Name: <module 'unary02'> SourceSection: [0,2]`-u`
   FrameDescriptor:  Empty
   Documentation: None
   InnerRootNode SourceSection: [0,2]`-u`
-    UnaryArithmeticExpression SourceSection: [0,2]`-u`
-      LookupAndCallUnaryNodeGen SourceSection: None
-        Op: __neg__
+    NegNodeGen SourceSection: [0,2]`-u`
       ReadNameNodeGen SourceSection: [1,2]`u`
         Identifier: u
         IsBuiltinClassProfile SourceSection: None
diff --git a/graalpython/com.oracle.graal.python.test/testData/goldenFiles/BasicTests/unary03.tast b/graalpython/com.oracle.graal.python.test/testData/goldenFiles/BasicTests/unary03.tast
@@ -5,9 +5,7 @@ ModuleRootNode Name: <module 'unary03'> SourceSection: [0,2]`~u`
   FrameDescriptor:  Empty
   Documentation: None
   InnerRootNode SourceSection: [0,2]`~u`
-    UnaryArithmeticExpression SourceSection: [0,2]`~u`
-      LookupAndCallUnaryNodeGen SourceSection: None
-        Op: __invert__
+    InvertNodeGen SourceSection: [0,2]`~u`
       ReadNameNodeGen SourceSection: [1,2]`u`
         Identifier: u
         IsBuiltinClassProfile SourceSection: None
diff --git a/graalpython/com.oracle.graal.python.test/testData/goldenFiles/NumberTests/Float04.tast b/graalpython/com.oracle.graal.python.test/testData/goldenFiles/NumberTests/Float04.tast
@@ -5,7 +5,5 @@ ModuleRootNode Name: <module 'Float04'> SourceSection: [0,5]`--0.0`
   FrameDescriptor:  Empty
   Documentation: None
   InnerRootNode SourceSection: [0,5]`--0.0`
-    UnaryArithmeticExpression SourceSection: [0,5]`--0.0`
-      LookupAndCallUnaryNodeGen SourceSection: None
-        Op: __neg__
+    NegNodeGen SourceSection: [0,5]`--0.0`
       DoubleLiteralNode SourceSection: [1,5]`-0.0`
diff --git a/graalpython/com.oracle.graal.python.test/testData/goldenFiles/NumberTests/int05.tast b/graalpython/com.oracle.graal.python.test/testData/goldenFiles/NumberTests/int05.tast
@@ -5,8 +5,6 @@ ModuleRootNode Name: <module 'int05'> SourceSection: [0,3]`--2`
   FrameDescriptor:  Empty
   Documentation: None
   InnerRootNode SourceSection: [0,3]`--2`
-    UnaryArithmeticExpression SourceSection: [0,3]`--2`
-      LookupAndCallUnaryNodeGen SourceSection: None
-        Op: __neg__
+    NegNodeGen SourceSection: [0,3]`--2`
       IntegerLiteralNode SourceSection: [1,3]`-2`
         Value: -2
diff --git a/graalpython/com.oracle.graal.python.test/testData/goldenFiles/NumberTests/int06.tast b/graalpython/com.oracle.graal.python.test/testData/goldenFiles/NumberTests/int06.tast
@@ -5,11 +5,7 @@ ModuleRootNode Name: <module 'int06'> SourceSection: [0,4]`---2`
   FrameDescriptor:  Empty
   Documentation: None
   InnerRootNode SourceSection: [0,4]`---2`
-    UnaryArithmeticExpression SourceSection: [0,4]`---2`
-      LookupAndCallUnaryNodeGen SourceSection: None
-        Op: __neg__
-      UnaryArithmeticExpression SourceSection: [1,4]`--2`
-        LookupAndCallUnaryNodeGen SourceSection: None
-          Op: __neg__
+    NegNodeGen SourceSection: [0,4]`---2`
+      NegNodeGen SourceSection: [1,4]`--2`
         IntegerLiteralNode SourceSection: [2,4]`-2`
           Value: -2
diff --git a/graalpython/com.oracle.graal.python.test/testData/goldenFiles/NumberTests/int07.tast b/graalpython/com.oracle.graal.python.test/testData/goldenFiles/NumberTests/int07.tast
@@ -5,14 +5,8 @@ ModuleRootNode Name: <module 'int07'> SourceSection: [0,5]`----2`
   FrameDescriptor:  Empty
   Documentation: None
   InnerRootNode SourceSection: [0,5]`----2`
-    UnaryArithmeticExpression SourceSection: [0,5]`----2`
-      LookupAndCallUnaryNodeGen SourceSection: None
-        Op: __neg__
-      UnaryArithmeticExpression SourceSection: [1,5]`---2`
-        LookupAndCallUnaryNodeGen SourceSection: None
-          Op: __neg__
-        UnaryArithmeticExpression SourceSection: [2,5]`--2`
-          LookupAndCallUnaryNodeGen SourceSection: None
-            Op: __neg__
+    NegNodeGen SourceSection: [0,5]`----2`
+      NegNodeGen SourceSection: [1,5]`---2`
+        NegNodeGen SourceSection: [2,5]`--2`
           IntegerLiteralNode SourceSection: [3,5]`-2`
             Value: -2
diff --git a/graalpython/com.oracle.graal.python.test/testData/testFiles/RuntimeFileTests/enumt.tast b/graalpython/com.oracle.graal.python.test/testData/testFiles/RuntimeFileTests/enumt.tast
@@ -6151,9 +6151,7 @@ ModuleRootNode Name: <module 'enumt'> SourceSection: [0,34561]`import sys↵from
                                         WriteLocalVariableNodeGen SourceSection: [26734,26748]`value = ~value`
                                           Identifier: value
                                           Frame: [1,value,Illegal]
-                                          UnaryArithmeticExpression SourceSection: [26742,26748]`~value`
-                                            LookupAndCallUnaryNodeGen SourceSection: None
-                                              Op: __invert__
+                                          InvertNodeGen SourceSection: [26742,26748]`~value`
                                             ReadLocalVariableNodeGen SourceSection: [26743,26748]`value`
                                               Frame: [1,value,Illegal]
                                         BlockNode SourceSection: None
@@ -6177,9 +6175,7 @@ ModuleRootNode Name: <module 'enumt'> SourceSection: [0,34561]`import sys↵from
                                         WriteLocalVariableNodeGen SourceSection: [26852,26886]`possible_member = ~p...`
                                           Identifier: possible_member
                                           Frame: [3,possible_member,Illegal]
-                                          UnaryArithmeticExpression SourceSection: [26870,26886]`~possible_member`
-                                            LookupAndCallUnaryNodeGen SourceSection: None
-                                              Op: __invert__
+                                          InvertNodeGen SourceSection: [26870,26886]`~possible_member`
                                             ReadLocalVariableNodeGen SourceSection: [26871,26886]`possible_member`
                                               Frame: [3,possible_member,Illegal]
                                         BlockNode SourceSection: None
@@ -7840,9 +7836,7 @@ ModuleRootNode Name: <module 'enumt'> SourceSection: [0,34561]`import sys↵from
                                                       EqNodeGen SourceSection: [30984,31010]`extra_flags == -flag...`
                                                         ReadLocalVariableNodeGen SourceSection: [30984,30995]`extra_flags`
                                                           Frame: [5,extra_flags,Illegal]
-                                                        UnaryArithmeticExpression SourceSection: [30999,31010]`-flag_value`
-                                                          LookupAndCallUnaryNodeGen SourceSection: None
-                                                            Op: __neg__
+                                                        NegNodeGen SourceSection: [30999,31010]`-flag_value`
                                                           ReadLocalVariableNodeGen SourceSection: [31000,31010]`flag_value`
                                                             Frame: [7,flag_value,Illegal]
                                                     WriteLocalVariableNodeGen SourceSection: [31032,31047]`extra_flags = 0`
@@ -8339,9 +8333,7 @@ ModuleRootNode Name: <module 'enumt'> SourceSection: [0,34561]`import sys↵from
                                         GetCallAttributeNodeGen SourceSection: None
                                           ReadLocalVariableNodeGen SourceSection: [32330,32334]`self`
                                             Frame: [0,self,Illegal]
-                                        UnaryArithmeticExpression SourceSection: [32345,32358]`~self._value_`
-                                          LookupAndCallUnaryNodeGen SourceSection: None
-                                            Op: __invert__
+                                        InvertNodeGen SourceSection: [32345,32358]`~self._value_`
                                           GetAttributeNode SourceSection: [32346,32358]`self._value_`
                                             GetFixedAttributeNodeGen SourceSection: None
                                               Key: _value_
@@ -8963,9 +8955,7 @@ ModuleRootNode Name: <module 'enumt'> SourceSection: [0,34561]`import sys↵from
                                 LookupAndCallInplaceNodeGen SourceSection: None
                                   ReadLocalVariableNodeGen SourceSection: [34078,34089]`not_covered`
                                     Frame: [2,not_covered,Illegal]
-                                  UnaryArithmeticExpression SourceSection: [34093,34106]`~member_value`
-                                    LookupAndCallUnaryNodeGen SourceSection: None
-                                      Op: __invert__
+                                  InvertNodeGen SourceSection: [34093,34106]`~member_value`
                                     ReadLocalVariableNodeGen SourceSection: [34094,34106]`member_value`
                                       Frame: [7,member_value,Illegal]
                                   ObjectLiteralNode SourceSection: None
diff --git a/graalpython/com.oracle.graal.python.test/testData/testFiles/RuntimeFileTests/heapq.tast b/graalpython/com.oracle.graal.python.test/testData/testFiles/RuntimeFileTests/heapq.tast
@@ -3024,9 +3024,7 @@ ModuleRootNode Name: <module 'heapq'> SourceSection: [0,23017]`"""Heap queue alg
                                       ReadAttributeFromObjectNotTypeNodeGen SourceSection: None
                                     IntegerLiteralNode SourceSection: [21677,21678]`0`
                                       Value: 0
-                                    UnaryArithmeticExpression SourceSection: [21680,21682]`-n`
-                                      LookupAndCallUnaryNodeGen SourceSection: None
-                                        Op: __neg__
+                                    NegNodeGen SourceSection: [21680,21682]`-n`
                                       ReadLocalVariableNodeGen SourceSection: [21681,21682]`n`
                                         Frame: [0,n,Illegal]
                                     IntegerLiteralNode SourceSection: [21684,21686]`-1`
@@ -3067,9 +3065,7 @@ ModuleRootNode Name: <module 'heapq'> SourceSection: [0,23017]`"""Heap queue alg
                         WriteLocalVariableNodeGen SourceSection: [21802,21812]`order = -n`
                           Identifier: order
                           Frame: [8,order,Illegal]
-                          UnaryArithmeticExpression SourceSection: [21810,21812]`-n`
-                            LookupAndCallUnaryNodeGen SourceSection: None
-                              Op: __neg__
+                          NegNodeGen SourceSection: [21810,21812]`-n`
                             ReadLocalVariableNodeGen SourceSection: [21811,21812]`n`
                               Frame: [0,n,Illegal]
                         WriteLocalVariableNodeGen SourceSection: [21821,21847]`_heapreplace = heapr...`
@@ -3330,9 +3326,7 @@ ModuleRootNode Name: <module 'heapq'> SourceSection: [0,23017]`"""Heap queue alg
                                   ReadAttributeFromObjectNotTypeNodeGen SourceSection: None
                                 IntegerLiteralNode SourceSection: [22222,22223]`0`
                                   Value: 0
-                                UnaryArithmeticExpression SourceSection: [22225,22227]`-n`
-                                  LookupAndCallUnaryNodeGen SourceSection: None
-                                    Op: __neg__
+                                NegNodeGen SourceSection: [22225,22227]`-n`
                                   ReadLocalVariableNodeGen SourceSection: [22226,22227]`n`
                                     Frame: [0,n,Illegal]
                                 IntegerLiteralNode SourceSection: [22229,22231]`-1`
@@ -3373,9 +3367,7 @@ ModuleRootNode Name: <module 'heapq'> SourceSection: [0,23017]`"""Heap queue alg
                     WriteLocalVariableNodeGen SourceSection: [22327,22337]`order = -n`
                       Identifier: order
                       Frame: [8,order,Illegal]
-                      UnaryArithmeticExpression SourceSection: [22335,22337]`-n`
-                        LookupAndCallUnaryNodeGen SourceSection: None
-                          Op: __neg__
+                      NegNodeGen SourceSection: [22335,22337]`-n`
                         ReadLocalVariableNodeGen SourceSection: [22336,22337]`n`
                           Frame: [0,n,Illegal]
                     WriteLocalVariableNodeGen SourceSection: [22342,22368]`_heapreplace = heapr...`
diff --git a/graalpython/com.oracle.graal.python.test/testData/testFiles/RuntimeFileTests/locale.tast b/graalpython/com.oracle.graal.python.test/testData/testFiles/RuntimeFileTests/locale.tast
@@ -781,9 +781,7 @@ ModuleRootNode Name: <module 'locale'> SourceSection: [0,78027]`"""Locale suppor
                                     Frame: [0,s,Illegal]
                                   SliceLiteralNodeGen SourceSection: [4626,4636]`-interval:`
                                     PythonObjectFactoryNodeGen SourceSection: None
-                                    UnaryArithmeticExpression SourceSection: [4626,4635]`-interval`
-                                      LookupAndCallUnaryNodeGen SourceSection: None
-                                        Op: __neg__
+                                    NegNodeGen SourceSection: [4626,4635]`-interval`
                                       ReadLocalVariableNodeGen SourceSection: [4627,4635]`interval`
                                         Frame: [9,interval,Illegal]
                                     EmptyNode SourceSection: None
@@ -797,9 +795,7 @@ ModuleRootNode Name: <module 'locale'> SourceSection: [0,78027]`"""Locale suppor
                                 SliceLiteralNodeGen SourceSection: [4653,4663]`:-interval`
                                   PythonObjectFactoryNodeGen SourceSection: None
                                   EmptyNode SourceSection: None
-                                  UnaryArithmeticExpression SourceSection: [4654,4663]`-interval`
-                                    LookupAndCallUnaryNodeGen SourceSection: None
-                                      Op: __neg__
+                                  NegNodeGen SourceSection: [4654,4663]`-interval`
                                     ReadLocalVariableNodeGen SourceSection: [4655,4663]`interval`
                                       Frame: [9,interval,Illegal]
                                   EmptyNode SourceSection: None
diff --git a/graalpython/com.oracle.graal.python.test/testData/testFiles/RuntimeFileTests/operator.tast b/graalpython/com.oracle.graal.python.test/testData/testFiles/RuntimeFileTests/operator.tast
@@ -821,9 +821,7 @@ ModuleRootNode Name: <module 'operator'> SourceSection: [0,10863]`"""↵Operator
                       WriteLocalVariableNodeGen SourceSection: None
                         Identifier: <return_val>
                         Frame: [1,<return_val>,Illegal]
-                        UnaryArithmeticExpression SourceSection: [2175,2177]`~a`
-                          LookupAndCallUnaryNodeGen SourceSection: None
-                            Op: __invert__
+                        InvertNodeGen SourceSection: [2175,2177]`~a`
                           ReadLocalVariableNodeGen SourceSection: [2176,2177]`a`
                             Frame: [0,a,Illegal]
                 Return Expresssion: ReadLocalVariableNodeGen SourceSection: None
@@ -1065,9 +1063,7 @@ ModuleRootNode Name: <module 'operator'> SourceSection: [0,10863]`"""↵Operator
                       WriteLocalVariableNodeGen SourceSection: None
                         Identifier: <return_val>
                         Frame: [1,<return_val>,Illegal]
-                        UnaryArithmeticExpression SourceSection: [2457,2459]`-a`
-                          LookupAndCallUnaryNodeGen SourceSection: None
-                            Op: __neg__
+                        NegNodeGen SourceSection: [2457,2459]`-a`
                           ReadLocalVariableNodeGen SourceSection: [2458,2459]`a`
                             Frame: [0,a,Illegal]
                 Return Expresssion: ReadLocalVariableNodeGen SourceSection: None
@@ -1156,9 +1152,7 @@ ModuleRootNode Name: <module 'operator'> SourceSection: [0,10863]`"""↵Operator
                       WriteLocalVariableNodeGen SourceSection: None
                         Identifier: <return_val>
                         Frame: [1,<return_val>,Illegal]
-                        UnaryArithmeticExpression SourceSection: [2556,2558]`+a`
-                          LookupAndCallUnaryNodeGen SourceSection: None
-                            Op: __pos__
+                        PosNodeGen SourceSection: [2556,2558]`+a`
                           ReadLocalVariableNodeGen SourceSection: [2557,2558]`a`
                             Frame: [0,a,Illegal]
                 Return Expresssion: ReadLocalVariableNodeGen SourceSection: None
diff --git a/graalpython/com.oracle.graal.python.test/testData/testFiles/RuntimeFileTests/sre_compile.tast b/graalpython/com.oracle.graal.python.test/testData/testFiles/RuntimeFileTests/sre_compile.tast
@@ -426,9 +426,7 @@ ModuleRootNode Name: <module 'sre_compile'> SourceSection: [0,26935]`#↵# Secre
                         LookupAndCallInplaceNodeGen SourceSection: None
                           ReadLocalVariableNodeGen SourceSection: [2414,2419]`flags`
                             Frame: [0,flags,Illegal]
-                          UnaryArithmeticExpression SourceSection: [2423,2434]`~TYPE_FLAGS`
-                            LookupAndCallUnaryNodeGen SourceSection: None
-                              Op: __invert__
+                          InvertNodeGen SourceSection: [2423,2434]`~TYPE_FLAGS`
                             ReadLocalVariableNodeGen SourceSection: [2424,2434]`TYPE_FLAGS`
                               Frame: [3,TYPE_FLAGS,Illegal]
                           ObjectLiteralNode SourceSection: None
@@ -443,9 +441,7 @@ ModuleRootNode Name: <module 'sre_compile'> SourceSection: [0,26935]`#↵# Secre
                               Frame: [0,flags,Illegal]
                             ReadLocalVariableNodeGen SourceSection: [2455,2464]`add_flags`
                               Frame: [1,add_flags,Illegal]
-                          UnaryArithmeticExpression SourceSection: [2468,2478]`~del_flags`
-                            LookupAndCallUnaryNodeGen SourceSection: None
-                              Op: __invert__
+                          InvertNodeGen SourceSection: [2468,2478]`~del_flags`
                             ReadLocalVariableNodeGen SourceSection: [2469,2478]`del_flags`
                               Frame: [2,del_flags,Illegal]
                 Return Expresssion: ReadLocalVariableNodeGen SourceSection: None
@@ -3655,9 +3651,7 @@ ModuleRootNode Name: <module 'sre_compile'> SourceSection: [0,26935]`#↵# Secre
                                     ReadFromCellNodeGen SourceSection: None
                                 IntegerLiteralNode SourceSection: [14928,14929]`0`
                                   Value: 0
-                                UnaryArithmeticExpression SourceSection: [14931,14941]`-_CODEBITS`
-                                  LookupAndCallUnaryNodeGen SourceSection: None
-                                    Op: __neg__
+                                NegNodeGen SourceSection: [14931,14941]`-_CODEBITS`
                                   ReadLocalCellNodeGen SourceSection: [14932,14941]`_CODEBITS`
                                     ReadLocalVariableNodeGen SourceSection: None
                                       Frame: [1,_CODEBITS,Illegal]
diff --git a/graalpython/com.oracle.graal.python.test/testData/testFiles/RuntimeFileTests/traceback.tast b/graalpython/com.oracle.graal.python.test/testData/testFiles/RuntimeFileTests/traceback.tast
@@ -2704,9 +2704,7 @@ ModuleRootNode Name: <module 'traceback'> SourceSection: [0,23096]`"""Extract, f
                                               KeywordArgumentsNodeGen SourceSection: None
                                                 ExecuteKeywordArgumentsNode SourceSection: None
                                                   KeywordLiteralNode SourceSection: None
-                                                    UnaryArithmeticExpression SourceSection: [12269,12275]`-limit`
-                                                      LookupAndCallUnaryNodeGen SourceSection: None
-                                                        Op: __neg__
+                                                    NegNodeGen SourceSection: [12269,12275]`-limit`
                                                       ReadLocalVariableNodeGen SourceSection: [12270,12275]`limit`
                                                         Frame: [3,limit,Illegal]
                                                 EmptyNode SourceSection: None
diff --git a/graalpython/com.oracle.graal.python/src/com/oracle/graal/python/builtins/modules/PythonCextBuiltins.java b/graalpython/com.oracle.graal.python/src/com/oracle/graal/python/builtins/modules/PythonCextBuiltins.java
diff --git a/graalpython/com.oracle.graal.python/src/com/oracle/graal/python/nodes/expression/UnaryArithmetic.java b/graalpython/com.oracle.graal.python/src/com/oracle/graal/python/nodes/expression/UnaryArithmetic.java
diff --git a/graalpython/com.oracle.graal.python/src/com/oracle/graal/python/nodes/expression/UnaryOpNode.java b/graalpython/com.oracle.graal.python/src/com/oracle/graal/python/nodes/expression/UnaryOpNode.java
