gh-134584: JIT: Eliminate redundant refcount ops for X_INT (GH-142765)

diff --git a/Include/internal/pycore_opcode_metadata.h b/Include/internal/pycore_opcode_metadata.h
index 15e35fd53605e32709c45815ef0ecbf507c279dc..cbbbbcedf2bed276d91911b27b16152d50d22cba 100644 (file)
--- a/Include/internal/pycore_opcode_metadata.h
+++ b/Include/internal/pycore_opcode_metadata.h
@@ -1330,12 +1330,12 @@ const struct opcode_macro_expansion
 _PyOpcode_macro_expansion[256] = {
     [BINARY_OP] = { .nuops = 1, .uops = { { _BINARY_OP, OPARG_SIMPLE, 4 } } },
     [BINARY_OP_ADD_FLOAT] = { .nuops = 5, .uops = { { _GUARD_TOS_FLOAT, OPARG_SIMPLE, 0 }, { _GUARD_NOS_FLOAT, OPARG_SIMPLE, 0 }, { _BINARY_OP_ADD_FLOAT, OPARG_SIMPLE, 5 }, { _POP_TOP_FLOAT, OPARG_SIMPLE, 5 }, { _POP_TOP_FLOAT, OPARG_SIMPLE, 5 } } },
-    [BINARY_OP_ADD_INT] = { .nuops = 3, .uops = { { _GUARD_TOS_INT, OPARG_SIMPLE, 0 }, { _GUARD_NOS_INT, OPARG_SIMPLE, 0 }, { _BINARY_OP_ADD_INT, OPARG_SIMPLE, 5 } } },
+    [BINARY_OP_ADD_INT] = { .nuops = 5, .uops = { { _GUARD_TOS_INT, OPARG_SIMPLE, 0 }, { _GUARD_NOS_INT, OPARG_SIMPLE, 0 }, { _BINARY_OP_ADD_INT, OPARG_SIMPLE, 5 }, { _POP_TOP_INT, OPARG_SIMPLE, 5 }, { _POP_TOP_INT, OPARG_SIMPLE, 5 } } },
     [BINARY_OP_ADD_UNICODE] = { .nuops = 3, .uops = { { _GUARD_TOS_UNICODE, OPARG_SIMPLE, 0 }, { _GUARD_NOS_UNICODE, OPARG_SIMPLE, 0 }, { _BINARY_OP_ADD_UNICODE, OPARG_SIMPLE, 5 } } },
     [BINARY_OP_EXTEND] = { .nuops = 2, .uops = { { _GUARD_BINARY_OP_EXTEND, 4, 1 }, { _BINARY_OP_EXTEND, 4, 1 } } },
     [BINARY_OP_INPLACE_ADD_UNICODE] = { .nuops = 3, .uops = { { _GUARD_TOS_UNICODE, OPARG_SIMPLE, 0 }, { _GUARD_NOS_UNICODE, OPARG_SIMPLE, 0 }, { _BINARY_OP_INPLACE_ADD_UNICODE, OPARG_SIMPLE, 5 } } },
     [BINARY_OP_MULTIPLY_FLOAT] = { .nuops = 5, .uops = { { _GUARD_TOS_FLOAT, OPARG_SIMPLE, 0 }, { _GUARD_NOS_FLOAT, OPARG_SIMPLE, 0 }, { _BINARY_OP_MULTIPLY_FLOAT, OPARG_SIMPLE, 5 }, { _POP_TOP_FLOAT, OPARG_SIMPLE, 5 }, { _POP_TOP_FLOAT, OPARG_SIMPLE, 5 } } },
-    [BINARY_OP_MULTIPLY_INT] = { .nuops = 3, .uops = { { _GUARD_TOS_INT, OPARG_SIMPLE, 0 }, { _GUARD_NOS_INT, OPARG_SIMPLE, 0 }, { _BINARY_OP_MULTIPLY_INT, OPARG_SIMPLE, 5 } } },
+    [BINARY_OP_MULTIPLY_INT] = { .nuops = 5, .uops = { { _GUARD_TOS_INT, OPARG_SIMPLE, 0 }, { _GUARD_NOS_INT, OPARG_SIMPLE, 0 }, { _BINARY_OP_MULTIPLY_INT, OPARG_SIMPLE, 5 }, { _POP_TOP_INT, OPARG_SIMPLE, 5 }, { _POP_TOP_INT, OPARG_SIMPLE, 5 } } },
     [BINARY_OP_SUBSCR_DICT] = { .nuops = 2, .uops = { { _GUARD_NOS_DICT, OPARG_SIMPLE, 0 }, { _BINARY_OP_SUBSCR_DICT, OPARG_SIMPLE, 5 } } },
     [BINARY_OP_SUBSCR_GETITEM] = { .nuops = 4, .uops = { { _CHECK_PEP_523, OPARG_SIMPLE, 5 }, { _BINARY_OP_SUBSCR_CHECK_FUNC, OPARG_SIMPLE, 5 }, { _BINARY_OP_SUBSCR_INIT_CALL, OPARG_SIMPLE, 5 }, { _PUSH_FRAME, OPARG_SIMPLE, 5 } } },
     [BINARY_OP_SUBSCR_LIST_INT] = { .nuops = 3, .uops = { { _GUARD_TOS_INT, OPARG_SIMPLE, 0 }, { _GUARD_NOS_LIST, OPARG_SIMPLE, 0 }, { _BINARY_OP_SUBSCR_LIST_INT, OPARG_SIMPLE, 5 } } },
@@ -1343,7 +1343,7 @@ _PyOpcode_macro_expansion[256] = {
     [BINARY_OP_SUBSCR_STR_INT] = { .nuops = 3, .uops = { { _GUARD_TOS_INT, OPARG_SIMPLE, 0 }, { _GUARD_NOS_UNICODE, OPARG_SIMPLE, 0 }, { _BINARY_OP_SUBSCR_STR_INT, OPARG_SIMPLE, 5 } } },
     [BINARY_OP_SUBSCR_TUPLE_INT] = { .nuops = 3, .uops = { { _GUARD_TOS_INT, OPARG_SIMPLE, 0 }, { _GUARD_NOS_TUPLE, OPARG_SIMPLE, 0 }, { _BINARY_OP_SUBSCR_TUPLE_INT, OPARG_SIMPLE, 5 } } },
     [BINARY_OP_SUBTRACT_FLOAT] = { .nuops = 5, .uops = { { _GUARD_TOS_FLOAT, OPARG_SIMPLE, 0 }, { _GUARD_NOS_FLOAT, OPARG_SIMPLE, 0 }, { _BINARY_OP_SUBTRACT_FLOAT, OPARG_SIMPLE, 5 }, { _POP_TOP_FLOAT, OPARG_SIMPLE, 5 }, { _POP_TOP_FLOAT, OPARG_SIMPLE, 5 } } },
-    [BINARY_OP_SUBTRACT_INT] = { .nuops = 3, .uops = { { _GUARD_TOS_INT, OPARG_SIMPLE, 0 }, { _GUARD_NOS_INT, OPARG_SIMPLE, 0 }, { _BINARY_OP_SUBTRACT_INT, OPARG_SIMPLE, 5 } } },
+    [BINARY_OP_SUBTRACT_INT] = { .nuops = 5, .uops = { { _GUARD_TOS_INT, OPARG_SIMPLE, 0 }, { _GUARD_NOS_INT, OPARG_SIMPLE, 0 }, { _BINARY_OP_SUBTRACT_INT, OPARG_SIMPLE, 5 }, { _POP_TOP_INT, OPARG_SIMPLE, 5 }, { _POP_TOP_INT, OPARG_SIMPLE, 5 } } },
     [BINARY_SLICE] = { .nuops = 1, .uops = { { _BINARY_SLICE, OPARG_SIMPLE, 0 } } },
     [BUILD_INTERPOLATION] = { .nuops = 1, .uops = { { _BUILD_INTERPOLATION, OPARG_SIMPLE, 0 } } },
     [BUILD_LIST] = { .nuops = 1, .uops = { { _BUILD_LIST, OPARG_SIMPLE, 0 } } },
@@ -1382,7 +1382,7 @@ _PyOpcode_macro_expansion[256] = {
     [CHECK_EXC_MATCH] = { .nuops = 1, .uops = { { _CHECK_EXC_MATCH, OPARG_SIMPLE, 0 } } },
     [COMPARE_OP] = { .nuops = 1, .uops = { { _COMPARE_OP, OPARG_SIMPLE, 0 } } },
     [COMPARE_OP_FLOAT] = { .nuops = 3, .uops = { { _GUARD_TOS_FLOAT, OPARG_SIMPLE, 0 }, { _GUARD_NOS_FLOAT, OPARG_SIMPLE, 0 }, { _COMPARE_OP_FLOAT, OPARG_SIMPLE, 1 } } },
-    [COMPARE_OP_INT] = { .nuops = 3, .uops = { { _GUARD_TOS_INT, OPARG_SIMPLE, 0 }, { _GUARD_NOS_INT, OPARG_SIMPLE, 0 }, { _COMPARE_OP_INT, OPARG_SIMPLE, 1 } } },
+    [COMPARE_OP_INT] = { .nuops = 5, .uops = { { _GUARD_TOS_INT, OPARG_SIMPLE, 0 }, { _GUARD_NOS_INT, OPARG_SIMPLE, 0 }, { _COMPARE_OP_INT, OPARG_SIMPLE, 1 }, { _POP_TOP_INT, OPARG_SIMPLE, 1 }, { _POP_TOP_INT, OPARG_SIMPLE, 1 } } },
     [COMPARE_OP_STR] = { .nuops = 3, .uops = { { _GUARD_TOS_UNICODE, OPARG_SIMPLE, 0 }, { _GUARD_NOS_UNICODE, OPARG_SIMPLE, 0 }, { _COMPARE_OP_STR, OPARG_SIMPLE, 1 } } },
     [CONTAINS_OP] = { .nuops = 1, .uops = { { _CONTAINS_OP, OPARG_SIMPLE, 0 } } },
     [CONTAINS_OP_DICT] = { .nuops = 2, .uops = { { _GUARD_TOS_DICT, OPARG_SIMPLE, 0 }, { _CONTAINS_OP_DICT, OPARG_SIMPLE, 1 } } },

diff --git a/Include/internal/pycore_uop_ids.h b/Include/internal/pycore_uop_ids.h
index f2c92668e079a99b95073f404c5a5f74b384c69f..69bd9af099161d5dc9b3e21e46bf1ed422c78f94 100644 (file)
--- a/Include/internal/pycore_uop_ids.h
+++ b/Include/internal/pycore_uop_ids.h
@@ -362,742 +362,739 @@ extern "C" {
 #define _BINARY_OP_ADD_FLOAT_r03 555
 #define _BINARY_OP_ADD_FLOAT_r13 556
 #define _BINARY_OP_ADD_FLOAT_r23 557
-#define _BINARY_OP_ADD_INT_r01 558
-#define _BINARY_OP_ADD_INT_r11 559
-#define _BINARY_OP_ADD_INT_r21 560
-#define _BINARY_OP_ADD_INT_r32 561
-#define _BINARY_OP_ADD_UNICODE_r01 562
-#define _BINARY_OP_ADD_UNICODE_r11 563
-#define _BINARY_OP_ADD_UNICODE_r21 564
-#define _BINARY_OP_ADD_UNICODE_r32 565
-#define _BINARY_OP_EXTEND_r21 566
-#define _BINARY_OP_INPLACE_ADD_UNICODE_r20 567
-#define _BINARY_OP_MULTIPLY_FLOAT_r03 568
-#define _BINARY_OP_MULTIPLY_FLOAT_r13 569
-#define _BINARY_OP_MULTIPLY_FLOAT_r23 570
-#define _BINARY_OP_MULTIPLY_INT_r01 571
-#define _BINARY_OP_MULTIPLY_INT_r11 572
-#define _BINARY_OP_MULTIPLY_INT_r21 573
-#define _BINARY_OP_MULTIPLY_INT_r32 574
-#define _BINARY_OP_SUBSCR_CHECK_FUNC_r23 575
-#define _BINARY_OP_SUBSCR_DICT_r21 576
-#define _BINARY_OP_SUBSCR_INIT_CALL_r01 577
-#define _BINARY_OP_SUBSCR_INIT_CALL_r11 578
-#define _BINARY_OP_SUBSCR_INIT_CALL_r21 579
-#define _BINARY_OP_SUBSCR_INIT_CALL_r31 580
-#define _BINARY_OP_SUBSCR_LIST_INT_r21 581
-#define _BINARY_OP_SUBSCR_LIST_SLICE_r21 582
-#define _BINARY_OP_SUBSCR_STR_INT_r21 583
-#define _BINARY_OP_SUBSCR_TUPLE_INT_r21 584
-#define _BINARY_OP_SUBTRACT_FLOAT_r03 585
-#define _BINARY_OP_SUBTRACT_FLOAT_r13 586
-#define _BINARY_OP_SUBTRACT_FLOAT_r23 587
-#define _BINARY_OP_SUBTRACT_INT_r01 588
-#define _BINARY_OP_SUBTRACT_INT_r11 589
-#define _BINARY_OP_SUBTRACT_INT_r21 590
-#define _BINARY_OP_SUBTRACT_INT_r32 591
-#define _BINARY_SLICE_r31 592
-#define _BUILD_INTERPOLATION_r01 593
-#define _BUILD_LIST_r01 594
-#define _BUILD_MAP_r01 595
-#define _BUILD_SET_r01 596
-#define _BUILD_SLICE_r01 597
-#define _BUILD_STRING_r01 598
-#define _BUILD_TEMPLATE_r21 599
-#define _BUILD_TUPLE_r01 600
-#define _CALL_BUILTIN_CLASS_r01 601
-#define _CALL_BUILTIN_FAST_r01 602
-#define _CALL_BUILTIN_FAST_WITH_KEYWORDS_r01 603
-#define _CALL_BUILTIN_O_r03 604
-#define _CALL_INTRINSIC_1_r11 605
-#define _CALL_INTRINSIC_2_r21 606
-#define _CALL_ISINSTANCE_r31 607
-#define _CALL_KW_NON_PY_r11 608
-#define _CALL_LEN_r33 609
-#define _CALL_LIST_APPEND_r02 610
-#define _CALL_LIST_APPEND_r12 611
-#define _CALL_LIST_APPEND_r22 612
-#define _CALL_LIST_APPEND_r32 613
-#define _CALL_METHOD_DESCRIPTOR_FAST_r01 614
-#define _CALL_METHOD_DESCRIPTOR_FAST_WITH_KEYWORDS_r01 615
-#define _CALL_METHOD_DESCRIPTOR_NOARGS_r01 616
-#define _CALL_METHOD_DESCRIPTOR_O_r01 617
-#define _CALL_NON_PY_GENERAL_r01 618
-#define _CALL_STR_1_r32 619
-#define _CALL_TUPLE_1_r32 620
-#define _CALL_TYPE_1_r31 621
-#define _CHECK_AND_ALLOCATE_OBJECT_r00 622
-#define _CHECK_ATTR_CLASS_r01 623
-#define _CHECK_ATTR_CLASS_r11 624
-#define _CHECK_ATTR_CLASS_r22 625
-#define _CHECK_ATTR_CLASS_r33 626
-#define _CHECK_ATTR_METHOD_LAZY_DICT_r01 627
-#define _CHECK_ATTR_METHOD_LAZY_DICT_r11 628
-#define _CHECK_ATTR_METHOD_LAZY_DICT_r22 629
-#define _CHECK_ATTR_METHOD_LAZY_DICT_r33 630
-#define _CHECK_CALL_BOUND_METHOD_EXACT_ARGS_r00 631
-#define _CHECK_EG_MATCH_r22 632
-#define _CHECK_EXC_MATCH_r22 633
-#define _CHECK_FUNCTION_EXACT_ARGS_r00 634
-#define _CHECK_FUNCTION_VERSION_r00 635
-#define _CHECK_FUNCTION_VERSION_INLINE_r00 636
-#define _CHECK_FUNCTION_VERSION_INLINE_r11 637
-#define _CHECK_FUNCTION_VERSION_INLINE_r22 638
-#define _CHECK_FUNCTION_VERSION_INLINE_r33 639
-#define _CHECK_FUNCTION_VERSION_KW_r11 640
-#define _CHECK_IS_NOT_PY_CALLABLE_r00 641
-#define _CHECK_IS_NOT_PY_CALLABLE_KW_r11 642
-#define _CHECK_MANAGED_OBJECT_HAS_VALUES_r01 643
-#define _CHECK_MANAGED_OBJECT_HAS_VALUES_r11 644
-#define _CHECK_MANAGED_OBJECT_HAS_VALUES_r22 645
-#define _CHECK_MANAGED_OBJECT_HAS_VALUES_r33 646
-#define _CHECK_METHOD_VERSION_r00 647
-#define _CHECK_METHOD_VERSION_KW_r11 648
-#define _CHECK_PEP_523_r00 649
-#define _CHECK_PEP_523_r11 650
-#define _CHECK_PEP_523_r22 651
-#define _CHECK_PEP_523_r33 652
-#define _CHECK_PERIODIC_r00 653
-#define _CHECK_PERIODIC_AT_END_r00 654
-#define _CHECK_PERIODIC_IF_NOT_YIELD_FROM_r00 655
-#define _CHECK_RECURSION_REMAINING_r00 656
-#define _CHECK_RECURSION_REMAINING_r11 657
-#define _CHECK_RECURSION_REMAINING_r22 658
-#define _CHECK_RECURSION_REMAINING_r33 659
-#define _CHECK_STACK_SPACE_r00 660
-#define _CHECK_STACK_SPACE_OPERAND_r00 661
-#define _CHECK_STACK_SPACE_OPERAND_r11 662
-#define _CHECK_STACK_SPACE_OPERAND_r22 663
-#define _CHECK_STACK_SPACE_OPERAND_r33 664
-#define _CHECK_VALIDITY_r00 665
-#define _CHECK_VALIDITY_r11 666
-#define _CHECK_VALIDITY_r22 667
-#define _CHECK_VALIDITY_r33 668
-#define _COLD_DYNAMIC_EXIT_r00 669
-#define _COLD_EXIT_r00 670
-#define _COMPARE_OP_r21 671
-#define _COMPARE_OP_FLOAT_r01 672
-#define _COMPARE_OP_FLOAT_r11 673
-#define _COMPARE_OP_FLOAT_r21 674
-#define _COMPARE_OP_FLOAT_r32 675
-#define _COMPARE_OP_INT_r21 676
-#define _COMPARE_OP_STR_r21 677
-#define _CONTAINS_OP_r21 678
-#define _CONTAINS_OP_DICT_r21 679
-#define _CONTAINS_OP_SET_r21 680
-#define _CONVERT_VALUE_r11 681
-#define _COPY_r01 682
-#define _COPY_1_r02 683
-#define _COPY_1_r12 684
-#define _COPY_1_r23 685
-#define _COPY_2_r03 686
-#define _COPY_2_r13 687
-#define _COPY_2_r23 688
-#define _COPY_3_r03 689
-#define _COPY_3_r13 690
-#define _COPY_3_r23 691
-#define _COPY_3_r33 692
-#define _COPY_FREE_VARS_r00 693
-#define _COPY_FREE_VARS_r11 694
-#define _COPY_FREE_VARS_r22 695
-#define _COPY_FREE_VARS_r33 696
-#define _CREATE_INIT_FRAME_r01 697
-#define _DELETE_ATTR_r10 698
-#define _DELETE_DEREF_r00 699
-#define _DELETE_FAST_r00 700
-#define _DELETE_GLOBAL_r00 701
-#define _DELETE_NAME_r00 702
-#define _DELETE_SUBSCR_r20 703
-#define _DEOPT_r00 704
-#define _DEOPT_r10 705
-#define _DEOPT_r20 706
-#define _DEOPT_r30 707
-#define _DICT_MERGE_r10 708
-#define _DICT_UPDATE_r10 709
-#define _DO_CALL_r01 710
-#define _DO_CALL_FUNCTION_EX_r31 711
-#define _DO_CALL_KW_r11 712
-#define _DYNAMIC_EXIT_r00 713
-#define _DYNAMIC_EXIT_r10 714
-#define _DYNAMIC_EXIT_r20 715
-#define _DYNAMIC_EXIT_r30 716
-#define _END_FOR_r10 717
-#define _END_SEND_r21 718
-#define _ERROR_POP_N_r00 719
-#define _EXIT_INIT_CHECK_r10 720
-#define _EXIT_TRACE_r00 721
-#define _EXIT_TRACE_r10 722
-#define _EXIT_TRACE_r20 723
-#define _EXIT_TRACE_r30 724
-#define _EXPAND_METHOD_r00 725
-#define _EXPAND_METHOD_KW_r11 726
-#define _FATAL_ERROR_r00 727
-#define _FATAL_ERROR_r11 728
-#define _FATAL_ERROR_r22 729
-#define _FATAL_ERROR_r33 730
-#define _FORMAT_SIMPLE_r11 731
-#define _FORMAT_WITH_SPEC_r21 732
-#define _FOR_ITER_r23 733
-#define _FOR_ITER_GEN_FRAME_r23 734
-#define _FOR_ITER_TIER_TWO_r23 735
-#define _GET_AITER_r11 736
-#define _GET_ANEXT_r12 737
-#define _GET_AWAITABLE_r11 738
-#define _GET_ITER_r12 739
-#define _GET_LEN_r12 740
-#define _GET_YIELD_FROM_ITER_r11 741
-#define _GUARD_BINARY_OP_EXTEND_r22 742
-#define _GUARD_CALLABLE_ISINSTANCE_r03 743
-#define _GUARD_CALLABLE_ISINSTANCE_r13 744
-#define _GUARD_CALLABLE_ISINSTANCE_r23 745
-#define _GUARD_CALLABLE_ISINSTANCE_r33 746
-#define _GUARD_CALLABLE_LEN_r03 747
-#define _GUARD_CALLABLE_LEN_r13 748
-#define _GUARD_CALLABLE_LEN_r23 749
-#define _GUARD_CALLABLE_LEN_r33 750
-#define _GUARD_CALLABLE_LIST_APPEND_r03 751
-#define _GUARD_CALLABLE_LIST_APPEND_r13 752
-#define _GUARD_CALLABLE_LIST_APPEND_r23 753
-#define _GUARD_CALLABLE_LIST_APPEND_r33 754
-#define _GUARD_CALLABLE_STR_1_r03 755
-#define _GUARD_CALLABLE_STR_1_r13 756
-#define _GUARD_CALLABLE_STR_1_r23 757
-#define _GUARD_CALLABLE_STR_1_r33 758
-#define _GUARD_CALLABLE_TUPLE_1_r03 759
-#define _GUARD_CALLABLE_TUPLE_1_r13 760
-#define _GUARD_CALLABLE_TUPLE_1_r23 761
-#define _GUARD_CALLABLE_TUPLE_1_r33 762
-#define _GUARD_CALLABLE_TYPE_1_r03 763
-#define _GUARD_CALLABLE_TYPE_1_r13 764
-#define _GUARD_CALLABLE_TYPE_1_r23 765
-#define _GUARD_CALLABLE_TYPE_1_r33 766
-#define _GUARD_DORV_NO_DICT_r01 767
-#define _GUARD_DORV_NO_DICT_r11 768
-#define _GUARD_DORV_NO_DICT_r22 769
-#define _GUARD_DORV_NO_DICT_r33 770
-#define _GUARD_DORV_VALUES_INST_ATTR_FROM_DICT_r01 771
-#define _GUARD_DORV_VALUES_INST_ATTR_FROM_DICT_r11 772
-#define _GUARD_DORV_VALUES_INST_ATTR_FROM_DICT_r22 773
-#define _GUARD_DORV_VALUES_INST_ATTR_FROM_DICT_r33 774
-#define _GUARD_GLOBALS_VERSION_r00 775
-#define _GUARD_GLOBALS_VERSION_r11 776
-#define _GUARD_GLOBALS_VERSION_r22 777
-#define _GUARD_GLOBALS_VERSION_r33 778
-#define _GUARD_IP_RETURN_GENERATOR_r00 779
-#define _GUARD_IP_RETURN_GENERATOR_r11 780
-#define _GUARD_IP_RETURN_GENERATOR_r22 781
-#define _GUARD_IP_RETURN_GENERATOR_r33 782
-#define _GUARD_IP_RETURN_VALUE_r00 783
-#define _GUARD_IP_RETURN_VALUE_r11 784
-#define _GUARD_IP_RETURN_VALUE_r22 785
-#define _GUARD_IP_RETURN_VALUE_r33 786
-#define _GUARD_IP_YIELD_VALUE_r00 787
-#define _GUARD_IP_YIELD_VALUE_r11 788
-#define _GUARD_IP_YIELD_VALUE_r22 789
-#define _GUARD_IP_YIELD_VALUE_r33 790
-#define _GUARD_IP__PUSH_FRAME_r00 791
-#define _GUARD_IP__PUSH_FRAME_r11 792
-#define _GUARD_IP__PUSH_FRAME_r22 793
-#define _GUARD_IP__PUSH_FRAME_r33 794
-#define _GUARD_IS_FALSE_POP_r00 795
-#define _GUARD_IS_FALSE_POP_r10 796
-#define _GUARD_IS_FALSE_POP_r21 797
-#define _GUARD_IS_FALSE_POP_r32 798
-#define _GUARD_IS_NONE_POP_r00 799
-#define _GUARD_IS_NONE_POP_r10 800
-#define _GUARD_IS_NONE_POP_r21 801
-#define _GUARD_IS_NONE_POP_r32 802
-#define _GUARD_IS_NOT_NONE_POP_r10 803
-#define _GUARD_IS_TRUE_POP_r00 804
-#define _GUARD_IS_TRUE_POP_r10 805
-#define _GUARD_IS_TRUE_POP_r21 806
-#define _GUARD_IS_TRUE_POP_r32 807
-#define _GUARD_KEYS_VERSION_r01 808
-#define _GUARD_KEYS_VERSION_r11 809
-#define _GUARD_KEYS_VERSION_r22 810
-#define _GUARD_KEYS_VERSION_r33 811
-#define _GUARD_NOS_DICT_r02 812
-#define _GUARD_NOS_DICT_r12 813
-#define _GUARD_NOS_DICT_r22 814
-#define _GUARD_NOS_DICT_r33 815
-#define _GUARD_NOS_FLOAT_r02 816
-#define _GUARD_NOS_FLOAT_r12 817
-#define _GUARD_NOS_FLOAT_r22 818
-#define _GUARD_NOS_FLOAT_r33 819
-#define _GUARD_NOS_INT_r02 820
-#define _GUARD_NOS_INT_r12 821
-#define _GUARD_NOS_INT_r22 822
-#define _GUARD_NOS_INT_r33 823
-#define _GUARD_NOS_LIST_r02 824
-#define _GUARD_NOS_LIST_r12 825
-#define _GUARD_NOS_LIST_r22 826
-#define _GUARD_NOS_LIST_r33 827
-#define _GUARD_NOS_NOT_NULL_r02 828
-#define _GUARD_NOS_NOT_NULL_r12 829
-#define _GUARD_NOS_NOT_NULL_r22 830
-#define _GUARD_NOS_NOT_NULL_r33 831
-#define _GUARD_NOS_NULL_r02 832
-#define _GUARD_NOS_NULL_r12 833
-#define _GUARD_NOS_NULL_r22 834
-#define _GUARD_NOS_NULL_r33 835
-#define _GUARD_NOS_OVERFLOWED_r02 836
-#define _GUARD_NOS_OVERFLOWED_r12 837
-#define _GUARD_NOS_OVERFLOWED_r22 838
-#define _GUARD_NOS_OVERFLOWED_r33 839
-#define _GUARD_NOS_TUPLE_r02 840
-#define _GUARD_NOS_TUPLE_r12 841
-#define _GUARD_NOS_TUPLE_r22 842
-#define _GUARD_NOS_TUPLE_r33 843
-#define _GUARD_NOS_UNICODE_r02 844
-#define _GUARD_NOS_UNICODE_r12 845
-#define _GUARD_NOS_UNICODE_r22 846
-#define _GUARD_NOS_UNICODE_r33 847
-#define _GUARD_NOT_EXHAUSTED_LIST_r02 848
-#define _GUARD_NOT_EXHAUSTED_LIST_r12 849
-#define _GUARD_NOT_EXHAUSTED_LIST_r22 850
-#define _GUARD_NOT_EXHAUSTED_LIST_r33 851
-#define _GUARD_NOT_EXHAUSTED_RANGE_r02 852
-#define _GUARD_NOT_EXHAUSTED_RANGE_r12 853
-#define _GUARD_NOT_EXHAUSTED_RANGE_r22 854
-#define _GUARD_NOT_EXHAUSTED_RANGE_r33 855
-#define _GUARD_NOT_EXHAUSTED_TUPLE_r02 856
-#define _GUARD_NOT_EXHAUSTED_TUPLE_r12 857
-#define _GUARD_NOT_EXHAUSTED_TUPLE_r22 858
-#define _GUARD_NOT_EXHAUSTED_TUPLE_r33 859
-#define _GUARD_THIRD_NULL_r03 860
-#define _GUARD_THIRD_NULL_r13 861
-#define _GUARD_THIRD_NULL_r23 862
-#define _GUARD_THIRD_NULL_r33 863
-#define _GUARD_TOS_ANY_SET_r01 864
-#define _GUARD_TOS_ANY_SET_r11 865
-#define _GUARD_TOS_ANY_SET_r22 866
-#define _GUARD_TOS_ANY_SET_r33 867
-#define _GUARD_TOS_DICT_r01 868
-#define _GUARD_TOS_DICT_r11 869
-#define _GUARD_TOS_DICT_r22 870
-#define _GUARD_TOS_DICT_r33 871
-#define _GUARD_TOS_FLOAT_r01 872
-#define _GUARD_TOS_FLOAT_r11 873
-#define _GUARD_TOS_FLOAT_r22 874
-#define _GUARD_TOS_FLOAT_r33 875
-#define _GUARD_TOS_INT_r01 876
-#define _GUARD_TOS_INT_r11 877
-#define _GUARD_TOS_INT_r22 878
-#define _GUARD_TOS_INT_r33 879
-#define _GUARD_TOS_LIST_r01 880
-#define _GUARD_TOS_LIST_r11 881
-#define _GUARD_TOS_LIST_r22 882
-#define _GUARD_TOS_LIST_r33 883
-#define _GUARD_TOS_OVERFLOWED_r01 884
-#define _GUARD_TOS_OVERFLOWED_r11 885
-#define _GUARD_TOS_OVERFLOWED_r22 886
-#define _GUARD_TOS_OVERFLOWED_r33 887
-#define _GUARD_TOS_SLICE_r01 888
-#define _GUARD_TOS_SLICE_r11 889
-#define _GUARD_TOS_SLICE_r22 890
-#define _GUARD_TOS_SLICE_r33 891
-#define _GUARD_TOS_TUPLE_r01 892
-#define _GUARD_TOS_TUPLE_r11 893
-#define _GUARD_TOS_TUPLE_r22 894
-#define _GUARD_TOS_TUPLE_r33 895
-#define _GUARD_TOS_UNICODE_r01 896
-#define _GUARD_TOS_UNICODE_r11 897
-#define _GUARD_TOS_UNICODE_r22 898
-#define _GUARD_TOS_UNICODE_r33 899
-#define _GUARD_TYPE_VERSION_r01 900
-#define _GUARD_TYPE_VERSION_r11 901
-#define _GUARD_TYPE_VERSION_r22 902
-#define _GUARD_TYPE_VERSION_r33 903
-#define _GUARD_TYPE_VERSION_AND_LOCK_r01 904
-#define _GUARD_TYPE_VERSION_AND_LOCK_r11 905
-#define _GUARD_TYPE_VERSION_AND_LOCK_r22 906
-#define _GUARD_TYPE_VERSION_AND_LOCK_r33 907
-#define _HANDLE_PENDING_AND_DEOPT_r00 908
-#define _HANDLE_PENDING_AND_DEOPT_r10 909
-#define _HANDLE_PENDING_AND_DEOPT_r20 910
-#define _HANDLE_PENDING_AND_DEOPT_r30 911
-#define _IMPORT_FROM_r12 912
-#define _IMPORT_NAME_r21 913
-#define _INIT_CALL_BOUND_METHOD_EXACT_ARGS_r00 914
-#define _INIT_CALL_PY_EXACT_ARGS_r01 915
-#define _INIT_CALL_PY_EXACT_ARGS_0_r01 916
-#define _INIT_CALL_PY_EXACT_ARGS_1_r01 917
-#define _INIT_CALL_PY_EXACT_ARGS_2_r01 918
-#define _INIT_CALL_PY_EXACT_ARGS_3_r01 919
-#define _INIT_CALL_PY_EXACT_ARGS_4_r01 920
-#define _INSERT_NULL_r10 921
-#define _INSTRUMENTED_FOR_ITER_r23 922
-#define _INSTRUMENTED_INSTRUCTION_r00 923
-#define _INSTRUMENTED_JUMP_FORWARD_r00 924
-#define _INSTRUMENTED_JUMP_FORWARD_r11 925
-#define _INSTRUMENTED_JUMP_FORWARD_r22 926
-#define _INSTRUMENTED_JUMP_FORWARD_r33 927
-#define _INSTRUMENTED_LINE_r00 928
-#define _INSTRUMENTED_NOT_TAKEN_r00 929
-#define _INSTRUMENTED_NOT_TAKEN_r11 930
-#define _INSTRUMENTED_NOT_TAKEN_r22 931
-#define _INSTRUMENTED_NOT_TAKEN_r33 932
-#define _INSTRUMENTED_POP_JUMP_IF_FALSE_r00 933
-#define _INSTRUMENTED_POP_JUMP_IF_FALSE_r10 934
-#define _INSTRUMENTED_POP_JUMP_IF_FALSE_r21 935
-#define _INSTRUMENTED_POP_JUMP_IF_FALSE_r32 936
-#define _INSTRUMENTED_POP_JUMP_IF_NONE_r10 937
-#define _INSTRUMENTED_POP_JUMP_IF_NOT_NONE_r10 938
-#define _INSTRUMENTED_POP_JUMP_IF_TRUE_r00 939
-#define _INSTRUMENTED_POP_JUMP_IF_TRUE_r10 940
-#define _INSTRUMENTED_POP_JUMP_IF_TRUE_r21 941
-#define _INSTRUMENTED_POP_JUMP_IF_TRUE_r32 942
-#define _IS_NONE_r11 943
-#define _IS_OP_r21 944
-#define _ITER_CHECK_LIST_r02 945
-#define _ITER_CHECK_LIST_r12 946
-#define _ITER_CHECK_LIST_r22 947
-#define _ITER_CHECK_LIST_r33 948
-#define _ITER_CHECK_RANGE_r02 949
-#define _ITER_CHECK_RANGE_r12 950
-#define _ITER_CHECK_RANGE_r22 951
-#define _ITER_CHECK_RANGE_r33 952
-#define _ITER_CHECK_TUPLE_r02 953
-#define _ITER_CHECK_TUPLE_r12 954
-#define _ITER_CHECK_TUPLE_r22 955
-#define _ITER_CHECK_TUPLE_r33 956
-#define _ITER_JUMP_LIST_r02 957
-#define _ITER_JUMP_LIST_r12 958
-#define _ITER_JUMP_LIST_r22 959
-#define _ITER_JUMP_LIST_r33 960
-#define _ITER_JUMP_RANGE_r02 961
-#define _ITER_JUMP_RANGE_r12 962
-#define _ITER_JUMP_RANGE_r22 963
-#define _ITER_JUMP_RANGE_r33 964
-#define _ITER_JUMP_TUPLE_r02 965
-#define _ITER_JUMP_TUPLE_r12 966
-#define _ITER_JUMP_TUPLE_r22 967
-#define _ITER_JUMP_TUPLE_r33 968
-#define _ITER_NEXT_LIST_r23 969
-#define _ITER_NEXT_LIST_TIER_TWO_r23 970
-#define _ITER_NEXT_RANGE_r03 971
-#define _ITER_NEXT_RANGE_r13 972
-#define _ITER_NEXT_RANGE_r23 973
-#define _ITER_NEXT_TUPLE_r03 974
-#define _ITER_NEXT_TUPLE_r13 975
-#define _ITER_NEXT_TUPLE_r23 976
-#define _JUMP_BACKWARD_NO_INTERRUPT_r00 977
-#define _JUMP_BACKWARD_NO_INTERRUPT_r11 978
-#define _JUMP_BACKWARD_NO_INTERRUPT_r22 979
-#define _JUMP_BACKWARD_NO_INTERRUPT_r33 980
-#define _JUMP_TO_TOP_r00 981
-#define _LIST_APPEND_r10 982
-#define _LIST_EXTEND_r10 983
-#define _LOAD_ATTR_r10 984
-#define _LOAD_ATTR_CLASS_r11 985
-#define _LOAD_ATTR_GETATTRIBUTE_OVERRIDDEN_r11 986
-#define _LOAD_ATTR_INSTANCE_VALUE_r11 987
-#define _LOAD_ATTR_METHOD_LAZY_DICT_r02 988
-#define _LOAD_ATTR_METHOD_LAZY_DICT_r12 989
-#define _LOAD_ATTR_METHOD_LAZY_DICT_r23 990
-#define _LOAD_ATTR_METHOD_NO_DICT_r02 991
-#define _LOAD_ATTR_METHOD_NO_DICT_r12 992
-#define _LOAD_ATTR_METHOD_NO_DICT_r23 993
-#define _LOAD_ATTR_METHOD_WITH_VALUES_r02 994
-#define _LOAD_ATTR_METHOD_WITH_VALUES_r12 995
-#define _LOAD_ATTR_METHOD_WITH_VALUES_r23 996
-#define _LOAD_ATTR_MODULE_r11 997
-#define _LOAD_ATTR_NONDESCRIPTOR_NO_DICT_r11 998
-#define _LOAD_ATTR_NONDESCRIPTOR_WITH_VALUES_r11 999
-#define _LOAD_ATTR_PROPERTY_FRAME_r11 1000
-#define _LOAD_ATTR_SLOT_r11 1001
-#define _LOAD_ATTR_WITH_HINT_r11 1002
-#define _LOAD_BUILD_CLASS_r01 1003
-#define _LOAD_BYTECODE_r00 1004
-#define _LOAD_COMMON_CONSTANT_r01 1005
-#define _LOAD_COMMON_CONSTANT_r12 1006
-#define _LOAD_COMMON_CONSTANT_r23 1007
-#define _LOAD_CONST_r01 1008
-#define _LOAD_CONST_r12 1009
-#define _LOAD_CONST_r23 1010
-#define _LOAD_CONST_INLINE_r01 1011
-#define _LOAD_CONST_INLINE_r12 1012
-#define _LOAD_CONST_INLINE_r23 1013
-#define _LOAD_CONST_INLINE_BORROW_r01 1014
-#define _LOAD_CONST_INLINE_BORROW_r12 1015
-#define _LOAD_CONST_INLINE_BORROW_r23 1016
-#define _LOAD_CONST_UNDER_INLINE_r02 1017
-#define _LOAD_CONST_UNDER_INLINE_r12 1018
-#define _LOAD_CONST_UNDER_INLINE_r23 1019
-#define _LOAD_CONST_UNDER_INLINE_BORROW_r02 1020
-#define _LOAD_CONST_UNDER_INLINE_BORROW_r12 1021
-#define _LOAD_CONST_UNDER_INLINE_BORROW_r23 1022
-#define _LOAD_DEREF_r01 1023
-#define _LOAD_FAST_r01 1024
-#define _LOAD_FAST_r12 1025
-#define _LOAD_FAST_r23 1026
-#define _LOAD_FAST_0_r01 1027
-#define _LOAD_FAST_0_r12 1028
-#define _LOAD_FAST_0_r23 1029
-#define _LOAD_FAST_1_r01 1030
-#define _LOAD_FAST_1_r12 1031
-#define _LOAD_FAST_1_r23 1032
-#define _LOAD_FAST_2_r01 1033
-#define _LOAD_FAST_2_r12 1034
-#define _LOAD_FAST_2_r23 1035
-#define _LOAD_FAST_3_r01 1036
-#define _LOAD_FAST_3_r12 1037
-#define _LOAD_FAST_3_r23 1038
-#define _LOAD_FAST_4_r01 1039
-#define _LOAD_FAST_4_r12 1040
-#define _LOAD_FAST_4_r23 1041
-#define _LOAD_FAST_5_r01 1042
-#define _LOAD_FAST_5_r12 1043
-#define _LOAD_FAST_5_r23 1044
-#define _LOAD_FAST_6_r01 1045
-#define _LOAD_FAST_6_r12 1046
-#define _LOAD_FAST_6_r23 1047
-#define _LOAD_FAST_7_r01 1048
-#define _LOAD_FAST_7_r12 1049
-#define _LOAD_FAST_7_r23 1050
-#define _LOAD_FAST_AND_CLEAR_r01 1051
-#define _LOAD_FAST_AND_CLEAR_r12 1052
-#define _LOAD_FAST_AND_CLEAR_r23 1053
-#define _LOAD_FAST_BORROW_r01 1054
-#define _LOAD_FAST_BORROW_r12 1055
-#define _LOAD_FAST_BORROW_r23 1056
-#define _LOAD_FAST_BORROW_0_r01 1057
-#define _LOAD_FAST_BORROW_0_r12 1058
-#define _LOAD_FAST_BORROW_0_r23 1059
-#define _LOAD_FAST_BORROW_1_r01 1060
-#define _LOAD_FAST_BORROW_1_r12 1061
-#define _LOAD_FAST_BORROW_1_r23 1062
-#define _LOAD_FAST_BORROW_2_r01 1063
-#define _LOAD_FAST_BORROW_2_r12 1064
-#define _LOAD_FAST_BORROW_2_r23 1065
-#define _LOAD_FAST_BORROW_3_r01 1066
-#define _LOAD_FAST_BORROW_3_r12 1067
-#define _LOAD_FAST_BORROW_3_r23 1068
-#define _LOAD_FAST_BORROW_4_r01 1069
-#define _LOAD_FAST_BORROW_4_r12 1070
-#define _LOAD_FAST_BORROW_4_r23 1071
-#define _LOAD_FAST_BORROW_5_r01 1072
-#define _LOAD_FAST_BORROW_5_r12 1073
-#define _LOAD_FAST_BORROW_5_r23 1074
-#define _LOAD_FAST_BORROW_6_r01 1075
-#define _LOAD_FAST_BORROW_6_r12 1076
-#define _LOAD_FAST_BORROW_6_r23 1077
-#define _LOAD_FAST_BORROW_7_r01 1078
-#define _LOAD_FAST_BORROW_7_r12 1079
-#define _LOAD_FAST_BORROW_7_r23 1080
-#define _LOAD_FAST_BORROW_LOAD_FAST_BORROW_r02 1081
-#define _LOAD_FAST_BORROW_LOAD_FAST_BORROW_r13 1082
-#define _LOAD_FAST_CHECK_r01 1083
-#define _LOAD_FAST_CHECK_r12 1084
-#define _LOAD_FAST_CHECK_r23 1085
-#define _LOAD_FAST_LOAD_FAST_r02 1086
-#define _LOAD_FAST_LOAD_FAST_r13 1087
-#define _LOAD_FROM_DICT_OR_DEREF_r11 1088
-#define _LOAD_FROM_DICT_OR_GLOBALS_r11 1089
-#define _LOAD_GLOBAL_r00 1090
-#define _LOAD_GLOBAL_BUILTINS_r01 1091
-#define _LOAD_GLOBAL_MODULE_r01 1092
-#define _LOAD_LOCALS_r01 1093
-#define _LOAD_LOCALS_r12 1094
-#define _LOAD_LOCALS_r23 1095
-#define _LOAD_NAME_r01 1096
-#define _LOAD_SMALL_INT_r01 1097
-#define _LOAD_SMALL_INT_r12 1098
-#define _LOAD_SMALL_INT_r23 1099
-#define _LOAD_SMALL_INT_0_r01 1100
-#define _LOAD_SMALL_INT_0_r12 1101
-#define _LOAD_SMALL_INT_0_r23 1102
-#define _LOAD_SMALL_INT_1_r01 1103
-#define _LOAD_SMALL_INT_1_r12 1104
-#define _LOAD_SMALL_INT_1_r23 1105
-#define _LOAD_SMALL_INT_2_r01 1106
-#define _LOAD_SMALL_INT_2_r12 1107
-#define _LOAD_SMALL_INT_2_r23 1108
-#define _LOAD_SMALL_INT_3_r01 1109
-#define _LOAD_SMALL_INT_3_r12 1110
-#define _LOAD_SMALL_INT_3_r23 1111
-#define _LOAD_SPECIAL_r00 1112
-#define _LOAD_SUPER_ATTR_ATTR_r31 1113
-#define _LOAD_SUPER_ATTR_METHOD_r32 1114
-#define _MAKE_CALLARGS_A_TUPLE_r33 1115
-#define _MAKE_CELL_r00 1116
-#define _MAKE_FUNCTION_r11 1117
-#define _MAKE_WARM_r00 1118
-#define _MAKE_WARM_r11 1119
-#define _MAKE_WARM_r22 1120
-#define _MAKE_WARM_r33 1121
-#define _MAP_ADD_r20 1122
-#define _MATCH_CLASS_r31 1123
-#define _MATCH_KEYS_r23 1124
-#define _MATCH_MAPPING_r02 1125
-#define _MATCH_MAPPING_r12 1126
-#define _MATCH_MAPPING_r23 1127
-#define _MATCH_SEQUENCE_r02 1128
-#define _MATCH_SEQUENCE_r12 1129
-#define _MATCH_SEQUENCE_r23 1130
-#define _MAYBE_EXPAND_METHOD_r00 1131
-#define _MAYBE_EXPAND_METHOD_KW_r11 1132
-#define _MONITOR_CALL_r00 1133
-#define _MONITOR_CALL_KW_r11 1134
-#define _MONITOR_JUMP_BACKWARD_r00 1135
-#define _MONITOR_JUMP_BACKWARD_r11 1136
-#define _MONITOR_JUMP_BACKWARD_r22 1137
-#define _MONITOR_JUMP_BACKWARD_r33 1138
-#define _MONITOR_RESUME_r00 1139
-#define _NOP_r00 1140
-#define _NOP_r11 1141
-#define _NOP_r22 1142
-#define _NOP_r33 1143
-#define _POP_CALL_r20 1144
-#define _POP_CALL_LOAD_CONST_INLINE_BORROW_r21 1145
-#define _POP_CALL_ONE_r30 1146
-#define _POP_CALL_ONE_LOAD_CONST_INLINE_BORROW_r31 1147
-#define _POP_CALL_TWO_r30 1148
-#define _POP_CALL_TWO_LOAD_CONST_INLINE_BORROW_r31 1149
-#define _POP_EXCEPT_r10 1150
-#define _POP_ITER_r20 1151
-#define _POP_JUMP_IF_FALSE_r00 1152
-#define _POP_JUMP_IF_FALSE_r10 1153
-#define _POP_JUMP_IF_FALSE_r21 1154
-#define _POP_JUMP_IF_FALSE_r32 1155
-#define _POP_JUMP_IF_TRUE_r00 1156
-#define _POP_JUMP_IF_TRUE_r10 1157
-#define _POP_JUMP_IF_TRUE_r21 1158
-#define _POP_JUMP_IF_TRUE_r32 1159
-#define _POP_TOP_r10 1160
-#define _POP_TOP_FLOAT_r00 1161
-#define _POP_TOP_FLOAT_r10 1162
-#define _POP_TOP_FLOAT_r21 1163
-#define _POP_TOP_FLOAT_r32 1164
-#define _POP_TOP_INT_r00 1165
-#define _POP_TOP_INT_r10 1166
-#define _POP_TOP_INT_r21 1167
-#define _POP_TOP_INT_r32 1168
-#define _POP_TOP_LOAD_CONST_INLINE_r11 1169
-#define _POP_TOP_LOAD_CONST_INLINE_BORROW_r11 1170
-#define _POP_TOP_NOP_r00 1171
-#define _POP_TOP_NOP_r10 1172
-#define _POP_TOP_NOP_r21 1173
-#define _POP_TOP_NOP_r32 1174
-#define _POP_TOP_UNICODE_r00 1175
-#define _POP_TOP_UNICODE_r10 1176
-#define _POP_TOP_UNICODE_r21 1177
-#define _POP_TOP_UNICODE_r32 1178
-#define _POP_TWO_r20 1179
-#define _POP_TWO_LOAD_CONST_INLINE_BORROW_r21 1180
-#define _PUSH_EXC_INFO_r02 1181
-#define _PUSH_EXC_INFO_r12 1182
-#define _PUSH_EXC_INFO_r23 1183
-#define _PUSH_FRAME_r10 1184
-#define _PUSH_NULL_r01 1185
-#define _PUSH_NULL_r12 1186
-#define _PUSH_NULL_r23 1187
-#define _PUSH_NULL_CONDITIONAL_r00 1188
-#define _PY_FRAME_GENERAL_r01 1189
-#define _PY_FRAME_KW_r11 1190
-#define _QUICKEN_RESUME_r00 1191
-#define _QUICKEN_RESUME_r11 1192
-#define _QUICKEN_RESUME_r22 1193
-#define _QUICKEN_RESUME_r33 1194
-#define _REPLACE_WITH_TRUE_r11 1195
-#define _RESUME_CHECK_r00 1196
-#define _RESUME_CHECK_r11 1197
-#define _RESUME_CHECK_r22 1198
-#define _RESUME_CHECK_r33 1199
-#define _RETURN_GENERATOR_r01 1200
-#define _RETURN_VALUE_r11 1201
-#define _SAVE_RETURN_OFFSET_r00 1202
-#define _SAVE_RETURN_OFFSET_r11 1203
-#define _SAVE_RETURN_OFFSET_r22 1204
-#define _SAVE_RETURN_OFFSET_r33 1205
-#define _SEND_r22 1206
-#define _SEND_GEN_FRAME_r22 1207
-#define _SETUP_ANNOTATIONS_r00 1208
-#define _SET_ADD_r10 1209
-#define _SET_FUNCTION_ATTRIBUTE_r01 1210
-#define _SET_FUNCTION_ATTRIBUTE_r11 1211
-#define _SET_FUNCTION_ATTRIBUTE_r21 1212
-#define _SET_FUNCTION_ATTRIBUTE_r32 1213
-#define _SET_IP_r00 1214
-#define _SET_IP_r11 1215
-#define _SET_IP_r22 1216
-#define _SET_IP_r33 1217
-#define _SET_UPDATE_r10 1218
-#define _SPILL_OR_RELOAD_r01 1219
-#define _SPILL_OR_RELOAD_r02 1220
-#define _SPILL_OR_RELOAD_r03 1221
-#define _SPILL_OR_RELOAD_r10 1222
-#define _SPILL_OR_RELOAD_r12 1223
-#define _SPILL_OR_RELOAD_r13 1224
-#define _SPILL_OR_RELOAD_r20 1225
-#define _SPILL_OR_RELOAD_r21 1226
-#define _SPILL_OR_RELOAD_r23 1227
-#define _SPILL_OR_RELOAD_r30 1228
-#define _SPILL_OR_RELOAD_r31 1229
-#define _SPILL_OR_RELOAD_r32 1230
-#define _START_EXECUTOR_r00 1231
-#define _STORE_ATTR_r20 1232
-#define _STORE_ATTR_INSTANCE_VALUE_r21 1233
-#define _STORE_ATTR_SLOT_r20 1234
-#define _STORE_ATTR_WITH_HINT_r20 1235
-#define _STORE_DEREF_r10 1236
-#define _STORE_FAST_r10 1237
-#define _STORE_FAST_0_r10 1238
-#define _STORE_FAST_1_r10 1239
-#define _STORE_FAST_2_r10 1240
-#define _STORE_FAST_3_r10 1241
-#define _STORE_FAST_4_r10 1242
-#define _STORE_FAST_5_r10 1243
-#define _STORE_FAST_6_r10 1244
-#define _STORE_FAST_7_r10 1245
-#define _STORE_FAST_LOAD_FAST_r11 1246
-#define _STORE_FAST_STORE_FAST_r20 1247
-#define _STORE_GLOBAL_r10 1248
-#define _STORE_NAME_r10 1249
-#define _STORE_SLICE_r30 1250
-#define _STORE_SUBSCR_r30 1251
-#define _STORE_SUBSCR_DICT_r31 1252
-#define _STORE_SUBSCR_LIST_INT_r32 1253
-#define _SWAP_r11 1254
-#define _SWAP_2_r02 1255
-#define _SWAP_2_r12 1256
-#define _SWAP_2_r22 1257
-#define _SWAP_2_r33 1258
-#define _SWAP_3_r03 1259
-#define _SWAP_3_r13 1260
-#define _SWAP_3_r23 1261
-#define _SWAP_3_r33 1262
-#define _TIER2_RESUME_CHECK_r00 1263
-#define _TIER2_RESUME_CHECK_r11 1264
-#define _TIER2_RESUME_CHECK_r22 1265
-#define _TIER2_RESUME_CHECK_r33 1266
-#define _TO_BOOL_r11 1267
-#define _TO_BOOL_BOOL_r01 1268
-#define _TO_BOOL_BOOL_r11 1269
-#define _TO_BOOL_BOOL_r22 1270
-#define _TO_BOOL_BOOL_r33 1271
-#define _TO_BOOL_INT_r11 1272
-#define _TO_BOOL_LIST_r11 1273
-#define _TO_BOOL_NONE_r01 1274
-#define _TO_BOOL_NONE_r11 1275
-#define _TO_BOOL_NONE_r22 1276
-#define _TO_BOOL_NONE_r33 1277
-#define _TO_BOOL_STR_r11 1278
-#define _TRACE_RECORD_r00 1279
-#define _UNARY_INVERT_r11 1280
-#define _UNARY_NEGATIVE_r11 1281
-#define _UNARY_NOT_r01 1282
-#define _UNARY_NOT_r11 1283
-#define _UNARY_NOT_r22 1284
-#define _UNARY_NOT_r33 1285
-#define _UNPACK_EX_r10 1286
-#define _UNPACK_SEQUENCE_r10 1287
-#define _UNPACK_SEQUENCE_LIST_r10 1288
-#define _UNPACK_SEQUENCE_TUPLE_r10 1289
-#define _UNPACK_SEQUENCE_TWO_TUPLE_r12 1290
-#define _WITH_EXCEPT_START_r33 1291
-#define _YIELD_VALUE_r11 1292
-#define MAX_UOP_REGS_ID 1292
+#define _BINARY_OP_ADD_INT_r03 558
+#define _BINARY_OP_ADD_INT_r13 559
+#define _BINARY_OP_ADD_INT_r23 560
+#define _BINARY_OP_ADD_UNICODE_r01 561
+#define _BINARY_OP_ADD_UNICODE_r11 562
+#define _BINARY_OP_ADD_UNICODE_r21 563
+#define _BINARY_OP_ADD_UNICODE_r32 564
+#define _BINARY_OP_EXTEND_r21 565
+#define _BINARY_OP_INPLACE_ADD_UNICODE_r20 566
+#define _BINARY_OP_MULTIPLY_FLOAT_r03 567
+#define _BINARY_OP_MULTIPLY_FLOAT_r13 568
+#define _BINARY_OP_MULTIPLY_FLOAT_r23 569
+#define _BINARY_OP_MULTIPLY_INT_r03 570
+#define _BINARY_OP_MULTIPLY_INT_r13 571
+#define _BINARY_OP_MULTIPLY_INT_r23 572
+#define _BINARY_OP_SUBSCR_CHECK_FUNC_r23 573
+#define _BINARY_OP_SUBSCR_DICT_r21 574
+#define _BINARY_OP_SUBSCR_INIT_CALL_r01 575
+#define _BINARY_OP_SUBSCR_INIT_CALL_r11 576
+#define _BINARY_OP_SUBSCR_INIT_CALL_r21 577
+#define _BINARY_OP_SUBSCR_INIT_CALL_r31 578
+#define _BINARY_OP_SUBSCR_LIST_INT_r21 579
+#define _BINARY_OP_SUBSCR_LIST_SLICE_r21 580
+#define _BINARY_OP_SUBSCR_STR_INT_r21 581
+#define _BINARY_OP_SUBSCR_TUPLE_INT_r21 582
+#define _BINARY_OP_SUBTRACT_FLOAT_r03 583
+#define _BINARY_OP_SUBTRACT_FLOAT_r13 584
+#define _BINARY_OP_SUBTRACT_FLOAT_r23 585
+#define _BINARY_OP_SUBTRACT_INT_r03 586
+#define _BINARY_OP_SUBTRACT_INT_r13 587
+#define _BINARY_OP_SUBTRACT_INT_r23 588
+#define _BINARY_SLICE_r31 589
+#define _BUILD_INTERPOLATION_r01 590
+#define _BUILD_LIST_r01 591
+#define _BUILD_MAP_r01 592
+#define _BUILD_SET_r01 593
+#define _BUILD_SLICE_r01 594
+#define _BUILD_STRING_r01 595
+#define _BUILD_TEMPLATE_r21 596
+#define _BUILD_TUPLE_r01 597
+#define _CALL_BUILTIN_CLASS_r01 598
+#define _CALL_BUILTIN_FAST_r01 599
+#define _CALL_BUILTIN_FAST_WITH_KEYWORDS_r01 600
+#define _CALL_BUILTIN_O_r03 601
+#define _CALL_INTRINSIC_1_r11 602
+#define _CALL_INTRINSIC_2_r21 603
+#define _CALL_ISINSTANCE_r31 604
+#define _CALL_KW_NON_PY_r11 605
+#define _CALL_LEN_r33 606
+#define _CALL_LIST_APPEND_r02 607
+#define _CALL_LIST_APPEND_r12 608
+#define _CALL_LIST_APPEND_r22 609
+#define _CALL_LIST_APPEND_r32 610
+#define _CALL_METHOD_DESCRIPTOR_FAST_r01 611
+#define _CALL_METHOD_DESCRIPTOR_FAST_WITH_KEYWORDS_r01 612
+#define _CALL_METHOD_DESCRIPTOR_NOARGS_r01 613
+#define _CALL_METHOD_DESCRIPTOR_O_r01 614
+#define _CALL_NON_PY_GENERAL_r01 615
+#define _CALL_STR_1_r32 616
+#define _CALL_TUPLE_1_r32 617
+#define _CALL_TYPE_1_r31 618
+#define _CHECK_AND_ALLOCATE_OBJECT_r00 619
+#define _CHECK_ATTR_CLASS_r01 620
+#define _CHECK_ATTR_CLASS_r11 621
+#define _CHECK_ATTR_CLASS_r22 622
+#define _CHECK_ATTR_CLASS_r33 623
+#define _CHECK_ATTR_METHOD_LAZY_DICT_r01 624
+#define _CHECK_ATTR_METHOD_LAZY_DICT_r11 625
+#define _CHECK_ATTR_METHOD_LAZY_DICT_r22 626
+#define _CHECK_ATTR_METHOD_LAZY_DICT_r33 627
+#define _CHECK_CALL_BOUND_METHOD_EXACT_ARGS_r00 628
+#define _CHECK_EG_MATCH_r22 629
+#define _CHECK_EXC_MATCH_r22 630
+#define _CHECK_FUNCTION_EXACT_ARGS_r00 631
+#define _CHECK_FUNCTION_VERSION_r00 632
+#define _CHECK_FUNCTION_VERSION_INLINE_r00 633
+#define _CHECK_FUNCTION_VERSION_INLINE_r11 634
+#define _CHECK_FUNCTION_VERSION_INLINE_r22 635
+#define _CHECK_FUNCTION_VERSION_INLINE_r33 636
+#define _CHECK_FUNCTION_VERSION_KW_r11 637
+#define _CHECK_IS_NOT_PY_CALLABLE_r00 638
+#define _CHECK_IS_NOT_PY_CALLABLE_KW_r11 639
+#define _CHECK_MANAGED_OBJECT_HAS_VALUES_r01 640
+#define _CHECK_MANAGED_OBJECT_HAS_VALUES_r11 641
+#define _CHECK_MANAGED_OBJECT_HAS_VALUES_r22 642
+#define _CHECK_MANAGED_OBJECT_HAS_VALUES_r33 643
+#define _CHECK_METHOD_VERSION_r00 644
+#define _CHECK_METHOD_VERSION_KW_r11 645
+#define _CHECK_PEP_523_r00 646
+#define _CHECK_PEP_523_r11 647
+#define _CHECK_PEP_523_r22 648
+#define _CHECK_PEP_523_r33 649
+#define _CHECK_PERIODIC_r00 650
+#define _CHECK_PERIODIC_AT_END_r00 651
+#define _CHECK_PERIODIC_IF_NOT_YIELD_FROM_r00 652
+#define _CHECK_RECURSION_REMAINING_r00 653
+#define _CHECK_RECURSION_REMAINING_r11 654
+#define _CHECK_RECURSION_REMAINING_r22 655
+#define _CHECK_RECURSION_REMAINING_r33 656
+#define _CHECK_STACK_SPACE_r00 657
+#define _CHECK_STACK_SPACE_OPERAND_r00 658
+#define _CHECK_STACK_SPACE_OPERAND_r11 659
+#define _CHECK_STACK_SPACE_OPERAND_r22 660
+#define _CHECK_STACK_SPACE_OPERAND_r33 661
+#define _CHECK_VALIDITY_r00 662
+#define _CHECK_VALIDITY_r11 663
+#define _CHECK_VALIDITY_r22 664
+#define _CHECK_VALIDITY_r33 665
+#define _COLD_DYNAMIC_EXIT_r00 666
+#define _COLD_EXIT_r00 667
+#define _COMPARE_OP_r21 668
+#define _COMPARE_OP_FLOAT_r01 669
+#define _COMPARE_OP_FLOAT_r11 670
+#define _COMPARE_OP_FLOAT_r21 671
+#define _COMPARE_OP_FLOAT_r32 672
+#define _COMPARE_OP_INT_r23 673
+#define _COMPARE_OP_STR_r21 674
+#define _CONTAINS_OP_r21 675
+#define _CONTAINS_OP_DICT_r21 676
+#define _CONTAINS_OP_SET_r21 677
+#define _CONVERT_VALUE_r11 678
+#define _COPY_r01 679
+#define _COPY_1_r02 680
+#define _COPY_1_r12 681
+#define _COPY_1_r23 682
+#define _COPY_2_r03 683
+#define _COPY_2_r13 684
+#define _COPY_2_r23 685
+#define _COPY_3_r03 686
+#define _COPY_3_r13 687
+#define _COPY_3_r23 688
+#define _COPY_3_r33 689
+#define _COPY_FREE_VARS_r00 690
+#define _COPY_FREE_VARS_r11 691
+#define _COPY_FREE_VARS_r22 692
+#define _COPY_FREE_VARS_r33 693
+#define _CREATE_INIT_FRAME_r01 694
+#define _DELETE_ATTR_r10 695
+#define _DELETE_DEREF_r00 696
+#define _DELETE_FAST_r00 697
+#define _DELETE_GLOBAL_r00 698
+#define _DELETE_NAME_r00 699
+#define _DELETE_SUBSCR_r20 700
+#define _DEOPT_r00 701
+#define _DEOPT_r10 702
+#define _DEOPT_r20 703
+#define _DEOPT_r30 704
+#define _DICT_MERGE_r10 705
+#define _DICT_UPDATE_r10 706
+#define _DO_CALL_r01 707
+#define _DO_CALL_FUNCTION_EX_r31 708
+#define _DO_CALL_KW_r11 709
+#define _DYNAMIC_EXIT_r00 710
+#define _DYNAMIC_EXIT_r10 711
+#define _DYNAMIC_EXIT_r20 712
+#define _DYNAMIC_EXIT_r30 713
+#define _END_FOR_r10 714
+#define _END_SEND_r21 715
+#define _ERROR_POP_N_r00 716
+#define _EXIT_INIT_CHECK_r10 717
+#define _EXIT_TRACE_r00 718
+#define _EXIT_TRACE_r10 719
+#define _EXIT_TRACE_r20 720
+#define _EXIT_TRACE_r30 721
+#define _EXPAND_METHOD_r00 722
+#define _EXPAND_METHOD_KW_r11 723
+#define _FATAL_ERROR_r00 724
+#define _FATAL_ERROR_r11 725
+#define _FATAL_ERROR_r22 726
+#define _FATAL_ERROR_r33 727
+#define _FORMAT_SIMPLE_r11 728
+#define _FORMAT_WITH_SPEC_r21 729
+#define _FOR_ITER_r23 730
+#define _FOR_ITER_GEN_FRAME_r23 731
+#define _FOR_ITER_TIER_TWO_r23 732
+#define _GET_AITER_r11 733
+#define _GET_ANEXT_r12 734
+#define _GET_AWAITABLE_r11 735
+#define _GET_ITER_r12 736
+#define _GET_LEN_r12 737
+#define _GET_YIELD_FROM_ITER_r11 738
+#define _GUARD_BINARY_OP_EXTEND_r22 739
+#define _GUARD_CALLABLE_ISINSTANCE_r03 740
+#define _GUARD_CALLABLE_ISINSTANCE_r13 741
+#define _GUARD_CALLABLE_ISINSTANCE_r23 742
+#define _GUARD_CALLABLE_ISINSTANCE_r33 743
+#define _GUARD_CALLABLE_LEN_r03 744
+#define _GUARD_CALLABLE_LEN_r13 745
+#define _GUARD_CALLABLE_LEN_r23 746
+#define _GUARD_CALLABLE_LEN_r33 747
+#define _GUARD_CALLABLE_LIST_APPEND_r03 748
+#define _GUARD_CALLABLE_LIST_APPEND_r13 749
+#define _GUARD_CALLABLE_LIST_APPEND_r23 750
+#define _GUARD_CALLABLE_LIST_APPEND_r33 751
+#define _GUARD_CALLABLE_STR_1_r03 752
+#define _GUARD_CALLABLE_STR_1_r13 753
+#define _GUARD_CALLABLE_STR_1_r23 754
+#define _GUARD_CALLABLE_STR_1_r33 755
+#define _GUARD_CALLABLE_TUPLE_1_r03 756
+#define _GUARD_CALLABLE_TUPLE_1_r13 757
+#define _GUARD_CALLABLE_TUPLE_1_r23 758
+#define _GUARD_CALLABLE_TUPLE_1_r33 759
+#define _GUARD_CALLABLE_TYPE_1_r03 760
+#define _GUARD_CALLABLE_TYPE_1_r13 761
+#define _GUARD_CALLABLE_TYPE_1_r23 762
+#define _GUARD_CALLABLE_TYPE_1_r33 763
+#define _GUARD_DORV_NO_DICT_r01 764
+#define _GUARD_DORV_NO_DICT_r11 765
+#define _GUARD_DORV_NO_DICT_r22 766
+#define _GUARD_DORV_NO_DICT_r33 767
+#define _GUARD_DORV_VALUES_INST_ATTR_FROM_DICT_r01 768
+#define _GUARD_DORV_VALUES_INST_ATTR_FROM_DICT_r11 769
+#define _GUARD_DORV_VALUES_INST_ATTR_FROM_DICT_r22 770
+#define _GUARD_DORV_VALUES_INST_ATTR_FROM_DICT_r33 771
+#define _GUARD_GLOBALS_VERSION_r00 772
+#define _GUARD_GLOBALS_VERSION_r11 773
+#define _GUARD_GLOBALS_VERSION_r22 774
+#define _GUARD_GLOBALS_VERSION_r33 775
+#define _GUARD_IP_RETURN_GENERATOR_r00 776
+#define _GUARD_IP_RETURN_GENERATOR_r11 777
+#define _GUARD_IP_RETURN_GENERATOR_r22 778
+#define _GUARD_IP_RETURN_GENERATOR_r33 779
+#define _GUARD_IP_RETURN_VALUE_r00 780
+#define _GUARD_IP_RETURN_VALUE_r11 781
+#define _GUARD_IP_RETURN_VALUE_r22 782
+#define _GUARD_IP_RETURN_VALUE_r33 783
+#define _GUARD_IP_YIELD_VALUE_r00 784
+#define _GUARD_IP_YIELD_VALUE_r11 785
+#define _GUARD_IP_YIELD_VALUE_r22 786
+#define _GUARD_IP_YIELD_VALUE_r33 787
+#define _GUARD_IP__PUSH_FRAME_r00 788
+#define _GUARD_IP__PUSH_FRAME_r11 789
+#define _GUARD_IP__PUSH_FRAME_r22 790
+#define _GUARD_IP__PUSH_FRAME_r33 791
+#define _GUARD_IS_FALSE_POP_r00 792
+#define _GUARD_IS_FALSE_POP_r10 793
+#define _GUARD_IS_FALSE_POP_r21 794
+#define _GUARD_IS_FALSE_POP_r32 795
+#define _GUARD_IS_NONE_POP_r00 796
+#define _GUARD_IS_NONE_POP_r10 797
+#define _GUARD_IS_NONE_POP_r21 798
+#define _GUARD_IS_NONE_POP_r32 799
+#define _GUARD_IS_NOT_NONE_POP_r10 800
+#define _GUARD_IS_TRUE_POP_r00 801
+#define _GUARD_IS_TRUE_POP_r10 802
+#define _GUARD_IS_TRUE_POP_r21 803
+#define _GUARD_IS_TRUE_POP_r32 804
+#define _GUARD_KEYS_VERSION_r01 805
+#define _GUARD_KEYS_VERSION_r11 806
+#define _GUARD_KEYS_VERSION_r22 807
+#define _GUARD_KEYS_VERSION_r33 808
+#define _GUARD_NOS_DICT_r02 809
+#define _GUARD_NOS_DICT_r12 810
+#define _GUARD_NOS_DICT_r22 811
+#define _GUARD_NOS_DICT_r33 812
+#define _GUARD_NOS_FLOAT_r02 813
+#define _GUARD_NOS_FLOAT_r12 814
+#define _GUARD_NOS_FLOAT_r22 815
+#define _GUARD_NOS_FLOAT_r33 816
+#define _GUARD_NOS_INT_r02 817
+#define _GUARD_NOS_INT_r12 818
+#define _GUARD_NOS_INT_r22 819
+#define _GUARD_NOS_INT_r33 820
+#define _GUARD_NOS_LIST_r02 821
+#define _GUARD_NOS_LIST_r12 822
+#define _GUARD_NOS_LIST_r22 823
+#define _GUARD_NOS_LIST_r33 824
+#define _GUARD_NOS_NOT_NULL_r02 825
+#define _GUARD_NOS_NOT_NULL_r12 826
+#define _GUARD_NOS_NOT_NULL_r22 827
+#define _GUARD_NOS_NOT_NULL_r33 828
+#define _GUARD_NOS_NULL_r02 829
+#define _GUARD_NOS_NULL_r12 830
+#define _GUARD_NOS_NULL_r22 831
+#define _GUARD_NOS_NULL_r33 832
+#define _GUARD_NOS_OVERFLOWED_r02 833
+#define _GUARD_NOS_OVERFLOWED_r12 834
+#define _GUARD_NOS_OVERFLOWED_r22 835
+#define _GUARD_NOS_OVERFLOWED_r33 836
+#define _GUARD_NOS_TUPLE_r02 837
+#define _GUARD_NOS_TUPLE_r12 838
+#define _GUARD_NOS_TUPLE_r22 839
+#define _GUARD_NOS_TUPLE_r33 840
+#define _GUARD_NOS_UNICODE_r02 841
+#define _GUARD_NOS_UNICODE_r12 842
+#define _GUARD_NOS_UNICODE_r22 843
+#define _GUARD_NOS_UNICODE_r33 844
+#define _GUARD_NOT_EXHAUSTED_LIST_r02 845
+#define _GUARD_NOT_EXHAUSTED_LIST_r12 846
+#define _GUARD_NOT_EXHAUSTED_LIST_r22 847
+#define _GUARD_NOT_EXHAUSTED_LIST_r33 848
+#define _GUARD_NOT_EXHAUSTED_RANGE_r02 849
+#define _GUARD_NOT_EXHAUSTED_RANGE_r12 850
+#define _GUARD_NOT_EXHAUSTED_RANGE_r22 851
+#define _GUARD_NOT_EXHAUSTED_RANGE_r33 852
+#define _GUARD_NOT_EXHAUSTED_TUPLE_r02 853
+#define _GUARD_NOT_EXHAUSTED_TUPLE_r12 854
+#define _GUARD_NOT_EXHAUSTED_TUPLE_r22 855
+#define _GUARD_NOT_EXHAUSTED_TUPLE_r33 856
+#define _GUARD_THIRD_NULL_r03 857
+#define _GUARD_THIRD_NULL_r13 858
+#define _GUARD_THIRD_NULL_r23 859
+#define _GUARD_THIRD_NULL_r33 860
+#define _GUARD_TOS_ANY_SET_r01 861
+#define _GUARD_TOS_ANY_SET_r11 862
+#define _GUARD_TOS_ANY_SET_r22 863
+#define _GUARD_TOS_ANY_SET_r33 864
+#define _GUARD_TOS_DICT_r01 865
+#define _GUARD_TOS_DICT_r11 866
+#define _GUARD_TOS_DICT_r22 867
+#define _GUARD_TOS_DICT_r33 868
+#define _GUARD_TOS_FLOAT_r01 869
+#define _GUARD_TOS_FLOAT_r11 870
+#define _GUARD_TOS_FLOAT_r22 871
+#define _GUARD_TOS_FLOAT_r33 872
+#define _GUARD_TOS_INT_r01 873
+#define _GUARD_TOS_INT_r11 874
+#define _GUARD_TOS_INT_r22 875
+#define _GUARD_TOS_INT_r33 876
+#define _GUARD_TOS_LIST_r01 877
+#define _GUARD_TOS_LIST_r11 878
+#define _GUARD_TOS_LIST_r22 879
+#define _GUARD_TOS_LIST_r33 880
+#define _GUARD_TOS_OVERFLOWED_r01 881
+#define _GUARD_TOS_OVERFLOWED_r11 882
+#define _GUARD_TOS_OVERFLOWED_r22 883
+#define _GUARD_TOS_OVERFLOWED_r33 884
+#define _GUARD_TOS_SLICE_r01 885
+#define _GUARD_TOS_SLICE_r11 886
+#define _GUARD_TOS_SLICE_r22 887
+#define _GUARD_TOS_SLICE_r33 888
+#define _GUARD_TOS_TUPLE_r01 889
+#define _GUARD_TOS_TUPLE_r11 890
+#define _GUARD_TOS_TUPLE_r22 891
+#define _GUARD_TOS_TUPLE_r33 892
+#define _GUARD_TOS_UNICODE_r01 893
+#define _GUARD_TOS_UNICODE_r11 894
+#define _GUARD_TOS_UNICODE_r22 895
+#define _GUARD_TOS_UNICODE_r33 896
+#define _GUARD_TYPE_VERSION_r01 897
+#define _GUARD_TYPE_VERSION_r11 898
+#define _GUARD_TYPE_VERSION_r22 899
+#define _GUARD_TYPE_VERSION_r33 900
+#define _GUARD_TYPE_VERSION_AND_LOCK_r01 901
+#define _GUARD_TYPE_VERSION_AND_LOCK_r11 902
+#define _GUARD_TYPE_VERSION_AND_LOCK_r22 903
+#define _GUARD_TYPE_VERSION_AND_LOCK_r33 904
+#define _HANDLE_PENDING_AND_DEOPT_r00 905
+#define _HANDLE_PENDING_AND_DEOPT_r10 906
+#define _HANDLE_PENDING_AND_DEOPT_r20 907
+#define _HANDLE_PENDING_AND_DEOPT_r30 908
+#define _IMPORT_FROM_r12 909
+#define _IMPORT_NAME_r21 910
+#define _INIT_CALL_BOUND_METHOD_EXACT_ARGS_r00 911
+#define _INIT_CALL_PY_EXACT_ARGS_r01 912
+#define _INIT_CALL_PY_EXACT_ARGS_0_r01 913
+#define _INIT_CALL_PY_EXACT_ARGS_1_r01 914
+#define _INIT_CALL_PY_EXACT_ARGS_2_r01 915
+#define _INIT_CALL_PY_EXACT_ARGS_3_r01 916
+#define _INIT_CALL_PY_EXACT_ARGS_4_r01 917
+#define _INSERT_NULL_r10 918
+#define _INSTRUMENTED_FOR_ITER_r23 919
+#define _INSTRUMENTED_INSTRUCTION_r00 920
+#define _INSTRUMENTED_JUMP_FORWARD_r00 921
+#define _INSTRUMENTED_JUMP_FORWARD_r11 922
+#define _INSTRUMENTED_JUMP_FORWARD_r22 923
+#define _INSTRUMENTED_JUMP_FORWARD_r33 924
+#define _INSTRUMENTED_LINE_r00 925
+#define _INSTRUMENTED_NOT_TAKEN_r00 926
+#define _INSTRUMENTED_NOT_TAKEN_r11 927
+#define _INSTRUMENTED_NOT_TAKEN_r22 928
+#define _INSTRUMENTED_NOT_TAKEN_r33 929
+#define _INSTRUMENTED_POP_JUMP_IF_FALSE_r00 930
+#define _INSTRUMENTED_POP_JUMP_IF_FALSE_r10 931
+#define _INSTRUMENTED_POP_JUMP_IF_FALSE_r21 932
+#define _INSTRUMENTED_POP_JUMP_IF_FALSE_r32 933
+#define _INSTRUMENTED_POP_JUMP_IF_NONE_r10 934
+#define _INSTRUMENTED_POP_JUMP_IF_NOT_NONE_r10 935
+#define _INSTRUMENTED_POP_JUMP_IF_TRUE_r00 936
+#define _INSTRUMENTED_POP_JUMP_IF_TRUE_r10 937
+#define _INSTRUMENTED_POP_JUMP_IF_TRUE_r21 938
+#define _INSTRUMENTED_POP_JUMP_IF_TRUE_r32 939
+#define _IS_NONE_r11 940
+#define _IS_OP_r21 941
+#define _ITER_CHECK_LIST_r02 942
+#define _ITER_CHECK_LIST_r12 943
+#define _ITER_CHECK_LIST_r22 944
+#define _ITER_CHECK_LIST_r33 945
+#define _ITER_CHECK_RANGE_r02 946
+#define _ITER_CHECK_RANGE_r12 947
+#define _ITER_CHECK_RANGE_r22 948
+#define _ITER_CHECK_RANGE_r33 949
+#define _ITER_CHECK_TUPLE_r02 950
+#define _ITER_CHECK_TUPLE_r12 951
+#define _ITER_CHECK_TUPLE_r22 952
+#define _ITER_CHECK_TUPLE_r33 953
+#define _ITER_JUMP_LIST_r02 954
+#define _ITER_JUMP_LIST_r12 955
+#define _ITER_JUMP_LIST_r22 956
+#define _ITER_JUMP_LIST_r33 957
+#define _ITER_JUMP_RANGE_r02 958
+#define _ITER_JUMP_RANGE_r12 959
+#define _ITER_JUMP_RANGE_r22 960
+#define _ITER_JUMP_RANGE_r33 961
+#define _ITER_JUMP_TUPLE_r02 962
+#define _ITER_JUMP_TUPLE_r12 963
+#define _ITER_JUMP_TUPLE_r22 964
+#define _ITER_JUMP_TUPLE_r33 965
+#define _ITER_NEXT_LIST_r23 966
+#define _ITER_NEXT_LIST_TIER_TWO_r23 967
+#define _ITER_NEXT_RANGE_r03 968
+#define _ITER_NEXT_RANGE_r13 969
+#define _ITER_NEXT_RANGE_r23 970
+#define _ITER_NEXT_TUPLE_r03 971
+#define _ITER_NEXT_TUPLE_r13 972
+#define _ITER_NEXT_TUPLE_r23 973
+#define _JUMP_BACKWARD_NO_INTERRUPT_r00 974
+#define _JUMP_BACKWARD_NO_INTERRUPT_r11 975
+#define _JUMP_BACKWARD_NO_INTERRUPT_r22 976
+#define _JUMP_BACKWARD_NO_INTERRUPT_r33 977
+#define _JUMP_TO_TOP_r00 978
+#define _LIST_APPEND_r10 979
+#define _LIST_EXTEND_r10 980
+#define _LOAD_ATTR_r10 981
+#define _LOAD_ATTR_CLASS_r11 982
+#define _LOAD_ATTR_GETATTRIBUTE_OVERRIDDEN_r11 983
+#define _LOAD_ATTR_INSTANCE_VALUE_r11 984
+#define _LOAD_ATTR_METHOD_LAZY_DICT_r02 985
+#define _LOAD_ATTR_METHOD_LAZY_DICT_r12 986
+#define _LOAD_ATTR_METHOD_LAZY_DICT_r23 987
+#define _LOAD_ATTR_METHOD_NO_DICT_r02 988
+#define _LOAD_ATTR_METHOD_NO_DICT_r12 989
+#define _LOAD_ATTR_METHOD_NO_DICT_r23 990
+#define _LOAD_ATTR_METHOD_WITH_VALUES_r02 991
+#define _LOAD_ATTR_METHOD_WITH_VALUES_r12 992
+#define _LOAD_ATTR_METHOD_WITH_VALUES_r23 993
+#define _LOAD_ATTR_MODULE_r11 994
+#define _LOAD_ATTR_NONDESCRIPTOR_NO_DICT_r11 995
+#define _LOAD_ATTR_NONDESCRIPTOR_WITH_VALUES_r11 996
+#define _LOAD_ATTR_PROPERTY_FRAME_r11 997
+#define _LOAD_ATTR_SLOT_r11 998
+#define _LOAD_ATTR_WITH_HINT_r11 999
+#define _LOAD_BUILD_CLASS_r01 1000
+#define _LOAD_BYTECODE_r00 1001
+#define _LOAD_COMMON_CONSTANT_r01 1002
+#define _LOAD_COMMON_CONSTANT_r12 1003
+#define _LOAD_COMMON_CONSTANT_r23 1004
+#define _LOAD_CONST_r01 1005
+#define _LOAD_CONST_r12 1006
+#define _LOAD_CONST_r23 1007
+#define _LOAD_CONST_INLINE_r01 1008
+#define _LOAD_CONST_INLINE_r12 1009
+#define _LOAD_CONST_INLINE_r23 1010
+#define _LOAD_CONST_INLINE_BORROW_r01 1011
+#define _LOAD_CONST_INLINE_BORROW_r12 1012
+#define _LOAD_CONST_INLINE_BORROW_r23 1013
+#define _LOAD_CONST_UNDER_INLINE_r02 1014
+#define _LOAD_CONST_UNDER_INLINE_r12 1015
+#define _LOAD_CONST_UNDER_INLINE_r23 1016
+#define _LOAD_CONST_UNDER_INLINE_BORROW_r02 1017
+#define _LOAD_CONST_UNDER_INLINE_BORROW_r12 1018
+#define _LOAD_CONST_UNDER_INLINE_BORROW_r23 1019
+#define _LOAD_DEREF_r01 1020
+#define _LOAD_FAST_r01 1021
+#define _LOAD_FAST_r12 1022
+#define _LOAD_FAST_r23 1023
+#define _LOAD_FAST_0_r01 1024
+#define _LOAD_FAST_0_r12 1025
+#define _LOAD_FAST_0_r23 1026
+#define _LOAD_FAST_1_r01 1027
+#define _LOAD_FAST_1_r12 1028
+#define _LOAD_FAST_1_r23 1029
+#define _LOAD_FAST_2_r01 1030
+#define _LOAD_FAST_2_r12 1031
+#define _LOAD_FAST_2_r23 1032
+#define _LOAD_FAST_3_r01 1033
+#define _LOAD_FAST_3_r12 1034
+#define _LOAD_FAST_3_r23 1035
+#define _LOAD_FAST_4_r01 1036
+#define _LOAD_FAST_4_r12 1037
+#define _LOAD_FAST_4_r23 1038
+#define _LOAD_FAST_5_r01 1039
+#define _LOAD_FAST_5_r12 1040
+#define _LOAD_FAST_5_r23 1041
+#define _LOAD_FAST_6_r01 1042
+#define _LOAD_FAST_6_r12 1043
+#define _LOAD_FAST_6_r23 1044
+#define _LOAD_FAST_7_r01 1045
+#define _LOAD_FAST_7_r12 1046
+#define _LOAD_FAST_7_r23 1047
+#define _LOAD_FAST_AND_CLEAR_r01 1048
+#define _LOAD_FAST_AND_CLEAR_r12 1049
+#define _LOAD_FAST_AND_CLEAR_r23 1050
+#define _LOAD_FAST_BORROW_r01 1051
+#define _LOAD_FAST_BORROW_r12 1052
+#define _LOAD_FAST_BORROW_r23 1053
+#define _LOAD_FAST_BORROW_0_r01 1054
+#define _LOAD_FAST_BORROW_0_r12 1055
+#define _LOAD_FAST_BORROW_0_r23 1056
+#define _LOAD_FAST_BORROW_1_r01 1057
+#define _LOAD_FAST_BORROW_1_r12 1058
+#define _LOAD_FAST_BORROW_1_r23 1059
+#define _LOAD_FAST_BORROW_2_r01 1060
+#define _LOAD_FAST_BORROW_2_r12 1061
+#define _LOAD_FAST_BORROW_2_r23 1062
+#define _LOAD_FAST_BORROW_3_r01 1063
+#define _LOAD_FAST_BORROW_3_r12 1064
+#define _LOAD_FAST_BORROW_3_r23 1065
+#define _LOAD_FAST_BORROW_4_r01 1066
+#define _LOAD_FAST_BORROW_4_r12 1067
+#define _LOAD_FAST_BORROW_4_r23 1068
+#define _LOAD_FAST_BORROW_5_r01 1069
+#define _LOAD_FAST_BORROW_5_r12 1070
+#define _LOAD_FAST_BORROW_5_r23 1071
+#define _LOAD_FAST_BORROW_6_r01 1072
+#define _LOAD_FAST_BORROW_6_r12 1073
+#define _LOAD_FAST_BORROW_6_r23 1074
+#define _LOAD_FAST_BORROW_7_r01 1075
+#define _LOAD_FAST_BORROW_7_r12 1076
+#define _LOAD_FAST_BORROW_7_r23 1077
+#define _LOAD_FAST_BORROW_LOAD_FAST_BORROW_r02 1078
+#define _LOAD_FAST_BORROW_LOAD_FAST_BORROW_r13 1079
+#define _LOAD_FAST_CHECK_r01 1080
+#define _LOAD_FAST_CHECK_r12 1081
+#define _LOAD_FAST_CHECK_r23 1082
+#define _LOAD_FAST_LOAD_FAST_r02 1083
+#define _LOAD_FAST_LOAD_FAST_r13 1084
+#define _LOAD_FROM_DICT_OR_DEREF_r11 1085
+#define _LOAD_FROM_DICT_OR_GLOBALS_r11 1086
+#define _LOAD_GLOBAL_r00 1087
+#define _LOAD_GLOBAL_BUILTINS_r01 1088
+#define _LOAD_GLOBAL_MODULE_r01 1089
+#define _LOAD_LOCALS_r01 1090
+#define _LOAD_LOCALS_r12 1091
+#define _LOAD_LOCALS_r23 1092
+#define _LOAD_NAME_r01 1093
+#define _LOAD_SMALL_INT_r01 1094
+#define _LOAD_SMALL_INT_r12 1095
+#define _LOAD_SMALL_INT_r23 1096
+#define _LOAD_SMALL_INT_0_r01 1097
+#define _LOAD_SMALL_INT_0_r12 1098
+#define _LOAD_SMALL_INT_0_r23 1099
+#define _LOAD_SMALL_INT_1_r01 1100
+#define _LOAD_SMALL_INT_1_r12 1101
+#define _LOAD_SMALL_INT_1_r23 1102
+#define _LOAD_SMALL_INT_2_r01 1103
+#define _LOAD_SMALL_INT_2_r12 1104
+#define _LOAD_SMALL_INT_2_r23 1105
+#define _LOAD_SMALL_INT_3_r01 1106
+#define _LOAD_SMALL_INT_3_r12 1107
+#define _LOAD_SMALL_INT_3_r23 1108
+#define _LOAD_SPECIAL_r00 1109
+#define _LOAD_SUPER_ATTR_ATTR_r31 1110
+#define _LOAD_SUPER_ATTR_METHOD_r32 1111
+#define _MAKE_CALLARGS_A_TUPLE_r33 1112
+#define _MAKE_CELL_r00 1113
+#define _MAKE_FUNCTION_r11 1114
+#define _MAKE_WARM_r00 1115
+#define _MAKE_WARM_r11 1116
+#define _MAKE_WARM_r22 1117
+#define _MAKE_WARM_r33 1118
+#define _MAP_ADD_r20 1119
+#define _MATCH_CLASS_r31 1120
+#define _MATCH_KEYS_r23 1121
+#define _MATCH_MAPPING_r02 1122
+#define _MATCH_MAPPING_r12 1123
+#define _MATCH_MAPPING_r23 1124
+#define _MATCH_SEQUENCE_r02 1125
+#define _MATCH_SEQUENCE_r12 1126
+#define _MATCH_SEQUENCE_r23 1127
+#define _MAYBE_EXPAND_METHOD_r00 1128
+#define _MAYBE_EXPAND_METHOD_KW_r11 1129
+#define _MONITOR_CALL_r00 1130
+#define _MONITOR_CALL_KW_r11 1131
+#define _MONITOR_JUMP_BACKWARD_r00 1132
+#define _MONITOR_JUMP_BACKWARD_r11 1133
+#define _MONITOR_JUMP_BACKWARD_r22 1134
+#define _MONITOR_JUMP_BACKWARD_r33 1135
+#define _MONITOR_RESUME_r00 1136
+#define _NOP_r00 1137
+#define _NOP_r11 1138
+#define _NOP_r22 1139
+#define _NOP_r33 1140
+#define _POP_CALL_r20 1141
+#define _POP_CALL_LOAD_CONST_INLINE_BORROW_r21 1142
+#define _POP_CALL_ONE_r30 1143
+#define _POP_CALL_ONE_LOAD_CONST_INLINE_BORROW_r31 1144
+#define _POP_CALL_TWO_r30 1145
+#define _POP_CALL_TWO_LOAD_CONST_INLINE_BORROW_r31 1146
+#define _POP_EXCEPT_r10 1147
+#define _POP_ITER_r20 1148
+#define _POP_JUMP_IF_FALSE_r00 1149
+#define _POP_JUMP_IF_FALSE_r10 1150
+#define _POP_JUMP_IF_FALSE_r21 1151
+#define _POP_JUMP_IF_FALSE_r32 1152
+#define _POP_JUMP_IF_TRUE_r00 1153
+#define _POP_JUMP_IF_TRUE_r10 1154
+#define _POP_JUMP_IF_TRUE_r21 1155
+#define _POP_JUMP_IF_TRUE_r32 1156
+#define _POP_TOP_r10 1157
+#define _POP_TOP_FLOAT_r00 1158
+#define _POP_TOP_FLOAT_r10 1159
+#define _POP_TOP_FLOAT_r21 1160
+#define _POP_TOP_FLOAT_r32 1161
+#define _POP_TOP_INT_r00 1162
+#define _POP_TOP_INT_r10 1163
+#define _POP_TOP_INT_r21 1164
+#define _POP_TOP_INT_r32 1165
+#define _POP_TOP_LOAD_CONST_INLINE_r11 1166
+#define _POP_TOP_LOAD_CONST_INLINE_BORROW_r11 1167
+#define _POP_TOP_NOP_r00 1168
+#define _POP_TOP_NOP_r10 1169
+#define _POP_TOP_NOP_r21 1170
+#define _POP_TOP_NOP_r32 1171
+#define _POP_TOP_UNICODE_r00 1172
+#define _POP_TOP_UNICODE_r10 1173
+#define _POP_TOP_UNICODE_r21 1174
+#define _POP_TOP_UNICODE_r32 1175
+#define _POP_TWO_r20 1176
+#define _POP_TWO_LOAD_CONST_INLINE_BORROW_r21 1177
+#define _PUSH_EXC_INFO_r02 1178
+#define _PUSH_EXC_INFO_r12 1179
+#define _PUSH_EXC_INFO_r23 1180
+#define _PUSH_FRAME_r10 1181
+#define _PUSH_NULL_r01 1182
+#define _PUSH_NULL_r12 1183
+#define _PUSH_NULL_r23 1184
+#define _PUSH_NULL_CONDITIONAL_r00 1185
+#define _PY_FRAME_GENERAL_r01 1186
+#define _PY_FRAME_KW_r11 1187
+#define _QUICKEN_RESUME_r00 1188
+#define _QUICKEN_RESUME_r11 1189
+#define _QUICKEN_RESUME_r22 1190
+#define _QUICKEN_RESUME_r33 1191
+#define _REPLACE_WITH_TRUE_r11 1192
+#define _RESUME_CHECK_r00 1193
+#define _RESUME_CHECK_r11 1194
+#define _RESUME_CHECK_r22 1195
+#define _RESUME_CHECK_r33 1196
+#define _RETURN_GENERATOR_r01 1197
+#define _RETURN_VALUE_r11 1198
+#define _SAVE_RETURN_OFFSET_r00 1199
+#define _SAVE_RETURN_OFFSET_r11 1200
+#define _SAVE_RETURN_OFFSET_r22 1201
+#define _SAVE_RETURN_OFFSET_r33 1202
+#define _SEND_r22 1203
+#define _SEND_GEN_FRAME_r22 1204
+#define _SETUP_ANNOTATIONS_r00 1205
+#define _SET_ADD_r10 1206
+#define _SET_FUNCTION_ATTRIBUTE_r01 1207
+#define _SET_FUNCTION_ATTRIBUTE_r11 1208
+#define _SET_FUNCTION_ATTRIBUTE_r21 1209
+#define _SET_FUNCTION_ATTRIBUTE_r32 1210
+#define _SET_IP_r00 1211
+#define _SET_IP_r11 1212
+#define _SET_IP_r22 1213
+#define _SET_IP_r33 1214
+#define _SET_UPDATE_r10 1215
+#define _SPILL_OR_RELOAD_r01 1216
+#define _SPILL_OR_RELOAD_r02 1217
+#define _SPILL_OR_RELOAD_r03 1218
+#define _SPILL_OR_RELOAD_r10 1219
+#define _SPILL_OR_RELOAD_r12 1220
+#define _SPILL_OR_RELOAD_r13 1221
+#define _SPILL_OR_RELOAD_r20 1222
+#define _SPILL_OR_RELOAD_r21 1223
+#define _SPILL_OR_RELOAD_r23 1224
+#define _SPILL_OR_RELOAD_r30 1225
+#define _SPILL_OR_RELOAD_r31 1226
+#define _SPILL_OR_RELOAD_r32 1227
+#define _START_EXECUTOR_r00 1228
+#define _STORE_ATTR_r20 1229
+#define _STORE_ATTR_INSTANCE_VALUE_r21 1230
+#define _STORE_ATTR_SLOT_r20 1231
+#define _STORE_ATTR_WITH_HINT_r20 1232
+#define _STORE_DEREF_r10 1233
+#define _STORE_FAST_r10 1234
+#define _STORE_FAST_0_r10 1235
+#define _STORE_FAST_1_r10 1236
+#define _STORE_FAST_2_r10 1237
+#define _STORE_FAST_3_r10 1238
+#define _STORE_FAST_4_r10 1239
+#define _STORE_FAST_5_r10 1240
+#define _STORE_FAST_6_r10 1241
+#define _STORE_FAST_7_r10 1242
+#define _STORE_FAST_LOAD_FAST_r11 1243
+#define _STORE_FAST_STORE_FAST_r20 1244
+#define _STORE_GLOBAL_r10 1245
+#define _STORE_NAME_r10 1246
+#define _STORE_SLICE_r30 1247
+#define _STORE_SUBSCR_r30 1248
+#define _STORE_SUBSCR_DICT_r31 1249
+#define _STORE_SUBSCR_LIST_INT_r32 1250
+#define _SWAP_r11 1251
+#define _SWAP_2_r02 1252
+#define _SWAP_2_r12 1253
+#define _SWAP_2_r22 1254
+#define _SWAP_2_r33 1255
+#define _SWAP_3_r03 1256
+#define _SWAP_3_r13 1257
+#define _SWAP_3_r23 1258
+#define _SWAP_3_r33 1259
+#define _TIER2_RESUME_CHECK_r00 1260
+#define _TIER2_RESUME_CHECK_r11 1261
+#define _TIER2_RESUME_CHECK_r22 1262
+#define _TIER2_RESUME_CHECK_r33 1263
+#define _TO_BOOL_r11 1264
+#define _TO_BOOL_BOOL_r01 1265
+#define _TO_BOOL_BOOL_r11 1266
+#define _TO_BOOL_BOOL_r22 1267
+#define _TO_BOOL_BOOL_r33 1268
+#define _TO_BOOL_INT_r11 1269
+#define _TO_BOOL_LIST_r11 1270
+#define _TO_BOOL_NONE_r01 1271
+#define _TO_BOOL_NONE_r11 1272
+#define _TO_BOOL_NONE_r22 1273
+#define _TO_BOOL_NONE_r33 1274
+#define _TO_BOOL_STR_r11 1275
+#define _TRACE_RECORD_r00 1276
+#define _UNARY_INVERT_r11 1277
+#define _UNARY_NEGATIVE_r11 1278
+#define _UNARY_NOT_r01 1279
+#define _UNARY_NOT_r11 1280
+#define _UNARY_NOT_r22 1281
+#define _UNARY_NOT_r33 1282
+#define _UNPACK_EX_r10 1283
+#define _UNPACK_SEQUENCE_r10 1284
+#define _UNPACK_SEQUENCE_LIST_r10 1285
+#define _UNPACK_SEQUENCE_TUPLE_r10 1286
+#define _UNPACK_SEQUENCE_TWO_TUPLE_r12 1287
+#define _WITH_EXCEPT_START_r33 1288
+#define _YIELD_VALUE_r11 1289
+#define MAX_UOP_REGS_ID 1289
 
 #ifdef __cplusplus
 }

diff --git a/Include/internal/pycore_uop_metadata.h b/Include/internal/pycore_uop_metadata.h
index 97e7478ab3f0b48979bc3ad9ae5253105a68ee27..d06eba97ccf785f3c6bb748fb0bf2f84e9228df4 100644 (file)
--- a/Include/internal/pycore_uop_metadata.h
+++ b/Include/internal/pycore_uop_metadata.h
@@ -978,30 +978,30 @@ const _PyUopCachingInfo _PyUop_Caching[MAX_UOP_ID+1] = {
         },
     },
     [_BINARY_OP_MULTIPLY_INT] = {
-        .best = { 0, 1, 2, 3 },
+        .best = { 0, 1, 2, 2 },
         .entries = {
-            { 1, 0, _BINARY_OP_MULTIPLY_INT_r01 },
-            { 1, 1, _BINARY_OP_MULTIPLY_INT_r11 },
-            { 1, 2, _BINARY_OP_MULTIPLY_INT_r21 },
-            { 2, 3, _BINARY_OP_MULTIPLY_INT_r32 },
+            { 3, 0, _BINARY_OP_MULTIPLY_INT_r03 },
+            { 3, 1, _BINARY_OP_MULTIPLY_INT_r13 },
+            { 3, 2, _BINARY_OP_MULTIPLY_INT_r23 },
+            { -1, -1, -1 },
         },
     },
     [_BINARY_OP_ADD_INT] = {
-        .best = { 0, 1, 2, 3 },
+        .best = { 0, 1, 2, 2 },
         .entries = {
-            { 1, 0, _BINARY_OP_ADD_INT_r01 },
-            { 1, 1, _BINARY_OP_ADD_INT_r11 },
-            { 1, 2, _BINARY_OP_ADD_INT_r21 },
-            { 2, 3, _BINARY_OP_ADD_INT_r32 },
+            { 3, 0, _BINARY_OP_ADD_INT_r03 },
+            { 3, 1, _BINARY_OP_ADD_INT_r13 },
+            { 3, 2, _BINARY_OP_ADD_INT_r23 },
+            { -1, -1, -1 },
         },
     },
     [_BINARY_OP_SUBTRACT_INT] = {
-        .best = { 0, 1, 2, 3 },
+        .best = { 0, 1, 2, 2 },
         .entries = {
-            { 1, 0, _BINARY_OP_SUBTRACT_INT_r01 },
-            { 1, 1, _BINARY_OP_SUBTRACT_INT_r11 },
-            { 1, 2, _BINARY_OP_SUBTRACT_INT_r21 },
-            { 2, 3, _BINARY_OP_SUBTRACT_INT_r32 },
+            { 3, 0, _BINARY_OP_SUBTRACT_INT_r03 },
+            { 3, 1, _BINARY_OP_SUBTRACT_INT_r13 },
+            { 3, 2, _BINARY_OP_SUBTRACT_INT_r23 },
+            { -1, -1, -1 },
         },
     },
     [_GUARD_NOS_FLOAT] = {
@@ -1873,7 +1873,7 @@ const _PyUopCachingInfo _PyUop_Caching[MAX_UOP_ID+1] = {
         .entries = {
             { -1, -1, -1 },
             { -1, -1, -1 },
-            { 1, 2, _COMPARE_OP_INT_r21 },
+            { 3, 2, _COMPARE_OP_INT_r23 },
             { -1, -1, -1 },
         },
     },
@@ -3388,18 +3388,15 @@ const uint16_t _PyUop_Uncached[MAX_UOP_REGS_ID+1] = {
     [_GUARD_TOS_OVERFLOWED_r11] = _GUARD_TOS_OVERFLOWED,
     [_GUARD_TOS_OVERFLOWED_r22] = _GUARD_TOS_OVERFLOWED,
     [_GUARD_TOS_OVERFLOWED_r33] = _GUARD_TOS_OVERFLOWED,
-    [_BINARY_OP_MULTIPLY_INT_r01] = _BINARY_OP_MULTIPLY_INT,
-    [_BINARY_OP_MULTIPLY_INT_r11] = _BINARY_OP_MULTIPLY_INT,
-    [_BINARY_OP_MULTIPLY_INT_r21] = _BINARY_OP_MULTIPLY_INT,
-    [_BINARY_OP_MULTIPLY_INT_r32] = _BINARY_OP_MULTIPLY_INT,
-    [_BINARY_OP_ADD_INT_r01] = _BINARY_OP_ADD_INT,
-    [_BINARY_OP_ADD_INT_r11] = _BINARY_OP_ADD_INT,
-    [_BINARY_OP_ADD_INT_r21] = _BINARY_OP_ADD_INT,
-    [_BINARY_OP_ADD_INT_r32] = _BINARY_OP_ADD_INT,
-    [_BINARY_OP_SUBTRACT_INT_r01] = _BINARY_OP_SUBTRACT_INT,
-    [_BINARY_OP_SUBTRACT_INT_r11] = _BINARY_OP_SUBTRACT_INT,
-    [_BINARY_OP_SUBTRACT_INT_r21] = _BINARY_OP_SUBTRACT_INT,
-    [_BINARY_OP_SUBTRACT_INT_r32] = _BINARY_OP_SUBTRACT_INT,
+    [_BINARY_OP_MULTIPLY_INT_r03] = _BINARY_OP_MULTIPLY_INT,
+    [_BINARY_OP_MULTIPLY_INT_r13] = _BINARY_OP_MULTIPLY_INT,
+    [_BINARY_OP_MULTIPLY_INT_r23] = _BINARY_OP_MULTIPLY_INT,
+    [_BINARY_OP_ADD_INT_r03] = _BINARY_OP_ADD_INT,
+    [_BINARY_OP_ADD_INT_r13] = _BINARY_OP_ADD_INT,
+    [_BINARY_OP_ADD_INT_r23] = _BINARY_OP_ADD_INT,
+    [_BINARY_OP_SUBTRACT_INT_r03] = _BINARY_OP_SUBTRACT_INT,
+    [_BINARY_OP_SUBTRACT_INT_r13] = _BINARY_OP_SUBTRACT_INT,
+    [_BINARY_OP_SUBTRACT_INT_r23] = _BINARY_OP_SUBTRACT_INT,
     [_GUARD_NOS_FLOAT_r02] = _GUARD_NOS_FLOAT,
     [_GUARD_NOS_FLOAT_r12] = _GUARD_NOS_FLOAT,
     [_GUARD_NOS_FLOAT_r22] = _GUARD_NOS_FLOAT,
@@ -3554,7 +3551,7 @@ const uint16_t _PyUop_Uncached[MAX_UOP_REGS_ID+1] = {
     [_COMPARE_OP_FLOAT_r11] = _COMPARE_OP_FLOAT,
     [_COMPARE_OP_FLOAT_r21] = _COMPARE_OP_FLOAT,
     [_COMPARE_OP_FLOAT_r32] = _COMPARE_OP_FLOAT,
-    [_COMPARE_OP_INT_r21] = _COMPARE_OP_INT,
+    [_COMPARE_OP_INT_r23] = _COMPARE_OP_INT,
     [_COMPARE_OP_STR_r21] = _COMPARE_OP_STR,
     [_IS_OP_r21] = _IS_OP,
     [_CONTAINS_OP_r21] = _CONTAINS_OP,
@@ -3903,10 +3900,9 @@ const char *const _PyOpcode_uop_name[MAX_UOP_REGS_ID+1] = {
     [_BINARY_OP_ADD_FLOAT_r13] = "_BINARY_OP_ADD_FLOAT_r13",
     [_BINARY_OP_ADD_FLOAT_r23] = "_BINARY_OP_ADD_FLOAT_r23",
     [_BINARY_OP_ADD_INT] = "_BINARY_OP_ADD_INT",
-    [_BINARY_OP_ADD_INT_r01] = "_BINARY_OP_ADD_INT_r01",
-    [_BINARY_OP_ADD_INT_r11] = "_BINARY_OP_ADD_INT_r11",
-    [_BINARY_OP_ADD_INT_r21] = "_BINARY_OP_ADD_INT_r21",
-    [_BINARY_OP_ADD_INT_r32] = "_BINARY_OP_ADD_INT_r32",
+    [_BINARY_OP_ADD_INT_r03] = "_BINARY_OP_ADD_INT_r03",
+    [_BINARY_OP_ADD_INT_r13] = "_BINARY_OP_ADD_INT_r13",
+    [_BINARY_OP_ADD_INT_r23] = "_BINARY_OP_ADD_INT_r23",
     [_BINARY_OP_ADD_UNICODE] = "_BINARY_OP_ADD_UNICODE",
     [_BINARY_OP_ADD_UNICODE_r01] = "_BINARY_OP_ADD_UNICODE_r01",
     [_BINARY_OP_ADD_UNICODE_r11] = "_BINARY_OP_ADD_UNICODE_r11",
@@ -3921,10 +3917,9 @@ const char *const _PyOpcode_uop_name[MAX_UOP_REGS_ID+1] = {
     [_BINARY_OP_MULTIPLY_FLOAT_r13] = "_BINARY_OP_MULTIPLY_FLOAT_r13",
     [_BINARY_OP_MULTIPLY_FLOAT_r23] = "_BINARY_OP_MULTIPLY_FLOAT_r23",
     [_BINARY_OP_MULTIPLY_INT] = "_BINARY_OP_MULTIPLY_INT",
-    [_BINARY_OP_MULTIPLY_INT_r01] = "_BINARY_OP_MULTIPLY_INT_r01",
-    [_BINARY_OP_MULTIPLY_INT_r11] = "_BINARY_OP_MULTIPLY_INT_r11",
-    [_BINARY_OP_MULTIPLY_INT_r21] = "_BINARY_OP_MULTIPLY_INT_r21",
-    [_BINARY_OP_MULTIPLY_INT_r32] = "_BINARY_OP_MULTIPLY_INT_r32",
+    [_BINARY_OP_MULTIPLY_INT_r03] = "_BINARY_OP_MULTIPLY_INT_r03",
+    [_BINARY_OP_MULTIPLY_INT_r13] = "_BINARY_OP_MULTIPLY_INT_r13",
+    [_BINARY_OP_MULTIPLY_INT_r23] = "_BINARY_OP_MULTIPLY_INT_r23",
     [_BINARY_OP_SUBSCR_CHECK_FUNC] = "_BINARY_OP_SUBSCR_CHECK_FUNC",
     [_BINARY_OP_SUBSCR_CHECK_FUNC_r23] = "_BINARY_OP_SUBSCR_CHECK_FUNC_r23",
     [_BINARY_OP_SUBSCR_DICT] = "_BINARY_OP_SUBSCR_DICT",
@@ -3947,10 +3942,9 @@ const char *const _PyOpcode_uop_name[MAX_UOP_REGS_ID+1] = {
     [_BINARY_OP_SUBTRACT_FLOAT_r13] = "_BINARY_OP_SUBTRACT_FLOAT_r13",
     [_BINARY_OP_SUBTRACT_FLOAT_r23] = "_BINARY_OP_SUBTRACT_FLOAT_r23",
     [_BINARY_OP_SUBTRACT_INT] = "_BINARY_OP_SUBTRACT_INT",
-    [_BINARY_OP_SUBTRACT_INT_r01] = "_BINARY_OP_SUBTRACT_INT_r01",
-    [_BINARY_OP_SUBTRACT_INT_r11] = "_BINARY_OP_SUBTRACT_INT_r11",
-    [_BINARY_OP_SUBTRACT_INT_r21] = "_BINARY_OP_SUBTRACT_INT_r21",
-    [_BINARY_OP_SUBTRACT_INT_r32] = "_BINARY_OP_SUBTRACT_INT_r32",
+    [_BINARY_OP_SUBTRACT_INT_r03] = "_BINARY_OP_SUBTRACT_INT_r03",
+    [_BINARY_OP_SUBTRACT_INT_r13] = "_BINARY_OP_SUBTRACT_INT_r13",
+    [_BINARY_OP_SUBTRACT_INT_r23] = "_BINARY_OP_SUBTRACT_INT_r23",
     [_BINARY_SLICE] = "_BINARY_SLICE",
     [_BINARY_SLICE_r31] = "_BINARY_SLICE_r31",
     [_BUILD_INTERPOLATION] = "_BUILD_INTERPOLATION",
@@ -4088,7 +4082,7 @@ const char *const _PyOpcode_uop_name[MAX_UOP_REGS_ID+1] = {
     [_COMPARE_OP_FLOAT_r21] = "_COMPARE_OP_FLOAT_r21",
     [_COMPARE_OP_FLOAT_r32] = "_COMPARE_OP_FLOAT_r32",
     [_COMPARE_OP_INT] = "_COMPARE_OP_INT",
-    [_COMPARE_OP_INT_r21] = "_COMPARE_OP_INT_r21",
+    [_COMPARE_OP_INT_r23] = "_COMPARE_OP_INT_r23",
     [_COMPARE_OP_STR] = "_COMPARE_OP_STR",
     [_COMPARE_OP_STR_r21] = "_COMPARE_OP_STR_r21",
     [_CONTAINS_OP] = "_CONTAINS_OP",

diff --git a/Lib/test/test_capi/test_opt.py b/Lib/test/test_capi/test_opt.py
index cfb5d6ef91cb5bded4d052e726d76e0df7a1088a..5a52d7609d2cf1d3842eb1cbb6b88b4c36e54369 100644 (file)
--- a/Lib/test/test_capi/test_opt.py
+++ b/Lib/test/test_capi/test_opt.py
@@ -1426,8 +1426,9 @@ class TestUopsOptimization(unittest.TestCase):
         self.assertEqual(res, 3)
         self.assertIsNotNone(ex)
         uops = get_opnames(ex)
-        self.assertNotIn("_BINARY_OP_ADD_INT", uops)
-        self.assertNotIn("_POP_TWO_LOAD_CONST_INLINE_BORROW", uops)
+        # TODO (gh-142764): Re-enable after we get back automatic constant propagation.
+        # self.assertNotIn("_BINARY_OP_ADD_INT", uops)
+        # self.assertNotIn("_POP_TWO_LOAD_CONST_INLINE_BORROW", uops)
         self.assertNotIn("_GUARD_NOS_INT", uops)
         self.assertNotIn("_GUARD_TOS_INT", uops)
 
@@ -1645,6 +1646,7 @@ class TestUopsOptimization(unittest.TestCase):
         self.assertNotIn("_COMPARE_OP", uops)
         self.assertNotIn("_POP_TWO_LOAD_CONST_INLINE_BORROW", uops)
 
+    @unittest.skip("TODO (gh-142764): Re-enable after we get back automatic constant propagation.")
     def test_compare_op_int_pop_two_load_const_inline_borrow(self):
         def testfunc(n):
             x = 0
@@ -2064,8 +2066,9 @@ class TestUopsOptimization(unittest.TestCase):
         uops = get_opnames(ex)
         self.assertIn("_CALL_TUPLE_1", uops)
         self.assertIn("_UNPACK_SEQUENCE_TWO_TUPLE", uops)
-        self.assertNotIn("_COMPARE_OP_INT", uops)
-        self.assertNotIn("_GUARD_IS_TRUE_POP", uops)
+        # TODO (gh-142764): Re-enable after we get back automatic constant propagation.
+        # self.assertNotIn("_COMPARE_OP_INT", uops)
+        # self.assertNotIn("_GUARD_IS_TRUE_POP", uops)
 
     def test_call_len(self):
         def testfunc(n):
@@ -2130,8 +2133,9 @@ class TestUopsOptimization(unittest.TestCase):
         # length allows us to optimize more code, such as conditionals
         # in this case
         self.assertIn("_CALL_LEN", uops)
-        self.assertNotIn("_COMPARE_OP_INT", uops)
-        self.assertNotIn("_GUARD_IS_TRUE_POP", uops)
+        # TODO (gh-142764): Re-enable after we get back automatic constant propagation.
+        # self.assertNotIn("_COMPARE_OP_INT", uops)
+        # self.assertNotIn("_GUARD_IS_TRUE_POP", uops)
 
     def test_call_builtin_o(self):
         def testfunc(n):
@@ -2206,8 +2210,9 @@ class TestUopsOptimization(unittest.TestCase):
         self.assertIsNotNone(ex)
         uops = get_opnames(ex)
         self.assertIn("_BINARY_OP_SUBSCR_TUPLE_INT", uops)
-        self.assertNotIn("_COMPARE_OP_INT", uops)
-        self.assertNotIn("_GUARD_IS_TRUE_POP", uops)
+        # TODO (gh-142764): Re-enable after we get back automatic constant propagation.
+        # self.assertNotIn("_COMPARE_OP_INT", uops)
+        # self.assertNotIn("_GUARD_IS_TRUE_POP", uops)
 
     def test_call_isinstance_guards_removed(self):
         def testfunc(n):
@@ -2468,6 +2473,66 @@ class TestUopsOptimization(unittest.TestCase):
         uops = get_opnames(ex)
         self.assertIn("_POP_TOP_NOP", uops)
 
+    def test_int_add_op_refcount_elimination(self):
+        def testfunc(n):
+            c = 1
+            res = 0
+            for _ in range(n):
+                res = c + c
+            return res
+
+        res, ex = self._run_with_optimizer(testfunc, TIER2_THRESHOLD)
+        self.assertIsNotNone(ex)
+        uops = get_opnames(ex)
+        self.assertIn("_BINARY_OP_ADD_INT", uops)
+        self.assertIn("_POP_TOP_NOP", uops)
+        self.assertNotIn("_POP_TOP", uops)
+
+    def test_int_sub_op_refcount_elimination(self):
+        def testfunc(n):
+            c = 1
+            res = 0
+            for _ in range(n):
+                res = c - c
+            return res
+
+        res, ex = self._run_with_optimizer(testfunc, TIER2_THRESHOLD)
+        self.assertIsNotNone(ex)
+        uops = get_opnames(ex)
+        self.assertIn("_BINARY_OP_SUBTRACT_INT", uops)
+        self.assertIn("_POP_TOP_NOP", uops)
+        self.assertNotIn("_POP_TOP", uops)
+
+    def test_int_mul_op_refcount_elimination(self):
+        def testfunc(n):
+            c = 1
+            res = 0
+            for _ in range(n):
+                res = c * c
+            return res
+
+        res, ex = self._run_with_optimizer(testfunc, TIER2_THRESHOLD)
+        self.assertIsNotNone(ex)
+        uops = get_opnames(ex)
+        self.assertIn("_BINARY_OP_MULTIPLY_INT", uops)
+        self.assertIn("_POP_TOP_NOP", uops)
+        self.assertNotIn("_POP_TOP", uops)
+
+    def test_int_cmp_op_refcount_elimination(self):
+        def testfunc(n):
+            c = 1
+            res = 0
+            for _ in range(n):
+                res = c == c
+            return res
+
+        res, ex = self._run_with_optimizer(testfunc, TIER2_THRESHOLD)
+        self.assertIsNotNone(ex)
+        uops = get_opnames(ex)
+        self.assertIn("_COMPARE_OP_INT", uops)
+        self.assertIn("_POP_TOP_NOP", uops)
+        self.assertNotIn("_POP_TOP", uops)
+
     def test_remove_guard_for_slice_list(self):
         def f(n):
             for i in range(n):

diff --git a/Python/bytecodes.c b/Python/bytecodes.c
index cf5bf0b6769e2a374f3818ba61aa131de5137882..8420d09e81903698758f02558b17eca8a3e967d8 100644 (file)
--- a/Python/bytecodes.c
+++ b/Python/bytecodes.c
@@ -614,7 +614,7 @@ dummy_func(
             EXIT_IF(!_PyLong_IsCompact((PyLongObject *)value_o));
         }
 
-        pure op(_BINARY_OP_MULTIPLY_INT, (left, right -- res)) {
+        pure op(_BINARY_OP_MULTIPLY_INT, (left, right -- res, l, r)) {
             PyObject *left_o = PyStackRef_AsPyObjectBorrow(left);
             PyObject *right_o = PyStackRef_AsPyObjectBorrow(right);
             assert(PyLong_CheckExact(left_o));
@@ -624,12 +624,12 @@ dummy_func(
             STAT_INC(BINARY_OP, hit);
             res = _PyCompactLong_Multiply((PyLongObject *)left_o, (PyLongObject *)right_o);
             EXIT_IF(PyStackRef_IsNull(res));
-            PyStackRef_CLOSE_SPECIALIZED(right, _PyLong_ExactDealloc);
-            PyStackRef_CLOSE_SPECIALIZED(left, _PyLong_ExactDealloc);
+            l = left;
+            r = right;
             INPUTS_DEAD();
         }
 
-        pure op(_BINARY_OP_ADD_INT, (left, right -- res)) {
+        pure op(_BINARY_OP_ADD_INT, (left, right -- res, l, r)) {
             PyObject *left_o = PyStackRef_AsPyObjectBorrow(left);
             PyObject *right_o = PyStackRef_AsPyObjectBorrow(right);
             assert(PyLong_CheckExact(left_o));
@@ -639,12 +639,12 @@ dummy_func(
             STAT_INC(BINARY_OP, hit);
             res = _PyCompactLong_Add((PyLongObject *)left_o, (PyLongObject *)right_o);
             EXIT_IF(PyStackRef_IsNull(res));
-            PyStackRef_CLOSE_SPECIALIZED(right, _PyLong_ExactDealloc);
-            PyStackRef_CLOSE_SPECIALIZED(left, _PyLong_ExactDealloc);
+            l = left;
+            r = right;
             INPUTS_DEAD();
         }
 
-        pure op(_BINARY_OP_SUBTRACT_INT, (left, right -- res)) {
+        pure op(_BINARY_OP_SUBTRACT_INT, (left, right -- res, l, r)) {
             PyObject *left_o = PyStackRef_AsPyObjectBorrow(left);
             PyObject *right_o = PyStackRef_AsPyObjectBorrow(right);
             assert(PyLong_CheckExact(left_o));
@@ -654,19 +654,19 @@ dummy_func(
             STAT_INC(BINARY_OP, hit);
             res = _PyCompactLong_Subtract((PyLongObject *)left_o, (PyLongObject *)right_o);
             EXIT_IF(PyStackRef_IsNull(res));
-            PyStackRef_CLOSE_SPECIALIZED(right, _PyLong_ExactDealloc);
-            PyStackRef_CLOSE_SPECIALIZED(left, _PyLong_ExactDealloc);
+            l = left;
+            r = right;
             INPUTS_DEAD();
         }
 
         macro(BINARY_OP_MULTIPLY_INT) =
-            _GUARD_TOS_INT + _GUARD_NOS_INT + unused/5 + _BINARY_OP_MULTIPLY_INT;
+            _GUARD_TOS_INT + _GUARD_NOS_INT + unused/5 + _BINARY_OP_MULTIPLY_INT + _POP_TOP_INT + _POP_TOP_INT;
 
         macro(BINARY_OP_ADD_INT) =
-            _GUARD_TOS_INT + _GUARD_NOS_INT + unused/5 + _BINARY_OP_ADD_INT;
+            _GUARD_TOS_INT + _GUARD_NOS_INT + unused/5 + _BINARY_OP_ADD_INT + _POP_TOP_INT + _POP_TOP_INT;
 
         macro(BINARY_OP_SUBTRACT_INT) =
-            _GUARD_TOS_INT + _GUARD_NOS_INT + unused/5 + _BINARY_OP_SUBTRACT_INT;
+            _GUARD_TOS_INT + _GUARD_NOS_INT + unused/5 + _BINARY_OP_SUBTRACT_INT + _POP_TOP_INT + _POP_TOP_INT;
 
         op(_GUARD_NOS_FLOAT, (left, unused -- left, unused)) {
             PyObject *left_o = PyStackRef_AsPyObjectBorrow(left);
@@ -2701,7 +2701,7 @@ dummy_func(
             _GUARD_TOS_FLOAT + _GUARD_NOS_FLOAT + unused/1 + _COMPARE_OP_FLOAT;
 
         macro(COMPARE_OP_INT) =
-            _GUARD_TOS_INT + _GUARD_NOS_INT + unused/1 + _COMPARE_OP_INT;
+            _GUARD_TOS_INT + _GUARD_NOS_INT + unused/1 + _COMPARE_OP_INT + _POP_TOP_INT + _POP_TOP_INT;
 
         macro(COMPARE_OP_STR) =
             _GUARD_TOS_UNICODE + _GUARD_NOS_UNICODE + unused/1 + _COMPARE_OP_STR;
@@ -2724,7 +2724,7 @@ dummy_func(
         }
 
         // Similar to COMPARE_OP_FLOAT
-        op(_COMPARE_OP_INT, (left, right -- res)) {
+        op(_COMPARE_OP_INT, (left, right -- res, l, r)) {
             PyObject *left_o = PyStackRef_AsPyObjectBorrow(left);
             PyObject *right_o = PyStackRef_AsPyObjectBorrow(right);
 
@@ -2737,9 +2737,9 @@ dummy_func(
             Py_ssize_t iright = _PyLong_CompactValue((PyLongObject *)right_o);
             // 2 if <, 4 if >, 8 if ==; this matches the low 4 bits of the oparg
             int sign_ish = COMPARISON_BIT(ileft, iright);
-            PyStackRef_CLOSE_SPECIALIZED(left, _PyLong_ExactDealloc);
+            l = left;
+            r = right;
             DEAD(left);
-            PyStackRef_CLOSE_SPECIALIZED(right, _PyLong_ExactDealloc);
             DEAD(right);
             res =  (sign_ish & oparg) ? PyStackRef_True : PyStackRef_False;
             // It's always a bool, so we don't care about oparg & 16.

diff --git a/Python/executor_cases.c.h b/Python/executor_cases.c.h
index d8f33bc979710d251042f08fe9198645cc32e97c..b4d4684f8785b132040daf3636c71cedf513c855 100644 (file)
--- a/Python/executor_cases.c.h
+++ b/Python/executor_cases.c.h
@@ -3353,12 +3353,14 @@
             break;
         }
 
-        case _BINARY_OP_MULTIPLY_INT_r01: {
+        case _BINARY_OP_MULTIPLY_INT_r03: {
             CHECK_CURRENT_CACHED_VALUES(0);
             assert(WITHIN_STACK_BOUNDS_IGNORING_CACHE());
             _PyStackRef right;
             _PyStackRef left;
             _PyStackRef res;
+            _PyStackRef l;
+            _PyStackRef r;
             right = stack_pointer[-1];
             left = stack_pointer[-2];
             PyObject *left_o = PyStackRef_AsPyObjectBorrow(left);
@@ -3373,22 +3375,26 @@
                 SET_CURRENT_CACHED_VALUES(0);
                 JUMP_TO_JUMP_TARGET();
             }
-            PyStackRef_CLOSE_SPECIALIZED(right, _PyLong_ExactDealloc);
-            PyStackRef_CLOSE_SPECIALIZED(left, _PyLong_ExactDealloc);
+            l = left;
+            r = right;
+            _tos_cache2 = r;
+            _tos_cache1 = l;
             _tos_cache0 = res;
-            SET_CURRENT_CACHED_VALUES(1);
+            SET_CURRENT_CACHED_VALUES(3);
             stack_pointer += -2;
             ASSERT_WITHIN_STACK_BOUNDS(__FILE__, __LINE__);
             assert(WITHIN_STACK_BOUNDS_IGNORING_CACHE());
             break;
         }
 
-        case _BINARY_OP_MULTIPLY_INT_r11: {
+        case _BINARY_OP_MULTIPLY_INT_r13: {
             CHECK_CURRENT_CACHED_VALUES(1);
             assert(WITHIN_STACK_BOUNDS_IGNORING_CACHE());
             _PyStackRef right;
             _PyStackRef left;
             _PyStackRef res;
+            _PyStackRef l;
+            _PyStackRef r;
             _PyStackRef _stack_item_0 = _tos_cache0;
             right = _stack_item_0;
             left = stack_pointer[-1];
@@ -3405,22 +3411,26 @@
                 SET_CURRENT_CACHED_VALUES(1);
                 JUMP_TO_JUMP_TARGET();
             }
-            PyStackRef_CLOSE_SPECIALIZED(right, _PyLong_ExactDealloc);
-            PyStackRef_CLOSE_SPECIALIZED(left, _PyLong_ExactDealloc);
+            l = left;
+            r = right;
+            _tos_cache2 = r;
+            _tos_cache1 = l;
             _tos_cache0 = res;
-            SET_CURRENT_CACHED_VALUES(1);
+            SET_CURRENT_CACHED_VALUES(3);
             stack_pointer += -1;
             ASSERT_WITHIN_STACK_BOUNDS(__FILE__, __LINE__);
             assert(WITHIN_STACK_BOUNDS_IGNORING_CACHE());
             break;
         }
 
-        case _BINARY_OP_MULTIPLY_INT_r21: {
+        case _BINARY_OP_MULTIPLY_INT_r23: {
             CHECK_CURRENT_CACHED_VALUES(2);
             assert(WITHIN_STACK_BOUNDS_IGNORING_CACHE());
             _PyStackRef right;
             _PyStackRef left;
             _PyStackRef res;
+            _PyStackRef l;
+            _PyStackRef r;
             _PyStackRef _stack_item_0 = _tos_cache0;
             _PyStackRef _stack_item_1 = _tos_cache1;
             right = _stack_item_1;
@@ -3439,55 +3449,24 @@
                 SET_CURRENT_CACHED_VALUES(2);
                 JUMP_TO_JUMP_TARGET();
             }
-            PyStackRef_CLOSE_SPECIALIZED(right, _PyLong_ExactDealloc);
-            PyStackRef_CLOSE_SPECIALIZED(left, _PyLong_ExactDealloc);
+            l = left;
+            r = right;
+            _tos_cache2 = r;
+            _tos_cache1 = l;
             _tos_cache0 = res;
-            SET_CURRENT_CACHED_VALUES(1);
-            assert(WITHIN_STACK_BOUNDS_IGNORING_CACHE());
-            break;
-        }
-
-        case _BINARY_OP_MULTIPLY_INT_r32: {
-            CHECK_CURRENT_CACHED_VALUES(3);
-            assert(WITHIN_STACK_BOUNDS_IGNORING_CACHE());
-            _PyStackRef right;
-            _PyStackRef left;
-            _PyStackRef res;
-            _PyStackRef _stack_item_0 = _tos_cache0;
-            _PyStackRef _stack_item_1 = _tos_cache1;
-            _PyStackRef _stack_item_2 = _tos_cache2;
-            right = _stack_item_2;
-            left = _stack_item_1;
-            PyObject *left_o = PyStackRef_AsPyObjectBorrow(left);
-            PyObject *right_o = PyStackRef_AsPyObjectBorrow(right);
-            assert(PyLong_CheckExact(left_o));
-            assert(PyLong_CheckExact(right_o));
-            assert(_PyLong_BothAreCompact((PyLongObject *)left_o, (PyLongObject *)right_o));
-            STAT_INC(BINARY_OP, hit);
-            res = _PyCompactLong_Multiply((PyLongObject *)left_o, (PyLongObject *)right_o);
-            if (PyStackRef_IsNull(res)) {
-                UOP_STAT_INC(uopcode, miss);
-                _tos_cache2 = right;
-                _tos_cache1 = left;
-                _tos_cache0 = _stack_item_0;
-                SET_CURRENT_CACHED_VALUES(3);
-                JUMP_TO_JUMP_TARGET();
-            }
-            PyStackRef_CLOSE_SPECIALIZED(right, _PyLong_ExactDealloc);
-            PyStackRef_CLOSE_SPECIALIZED(left, _PyLong_ExactDealloc);
-            _tos_cache1 = res;
-            _tos_cache0 = _stack_item_0;
-            SET_CURRENT_CACHED_VALUES(2);
+            SET_CURRENT_CACHED_VALUES(3);
             assert(WITHIN_STACK_BOUNDS_IGNORING_CACHE());
             break;
         }
 
-        case _BINARY_OP_ADD_INT_r01: {
+        case _BINARY_OP_ADD_INT_r03: {
             CHECK_CURRENT_CACHED_VALUES(0);
             assert(WITHIN_STACK_BOUNDS_IGNORING_CACHE());
             _PyStackRef right;
             _PyStackRef left;
             _PyStackRef res;
+            _PyStackRef l;
+            _PyStackRef r;
             right = stack_pointer[-1];
             left = stack_pointer[-2];
             PyObject *left_o = PyStackRef_AsPyObjectBorrow(left);
@@ -3502,22 +3481,26 @@
                 SET_CURRENT_CACHED_VALUES(0);
                 JUMP_TO_JUMP_TARGET();
             }
-            PyStackRef_CLOSE_SPECIALIZED(right, _PyLong_ExactDealloc);
-            PyStackRef_CLOSE_SPECIALIZED(left, _PyLong_ExactDealloc);
+            l = left;
+            r = right;
+            _tos_cache2 = r;
+            _tos_cache1 = l;
             _tos_cache0 = res;
-            SET_CURRENT_CACHED_VALUES(1);
+            SET_CURRENT_CACHED_VALUES(3);
             stack_pointer += -2;
             ASSERT_WITHIN_STACK_BOUNDS(__FILE__, __LINE__);
             assert(WITHIN_STACK_BOUNDS_IGNORING_CACHE());
             break;
         }
 
-        case _BINARY_OP_ADD_INT_r11: {
+        case _BINARY_OP_ADD_INT_r13: {
             CHECK_CURRENT_CACHED_VALUES(1);
             assert(WITHIN_STACK_BOUNDS_IGNORING_CACHE());
             _PyStackRef right;
             _PyStackRef left;
             _PyStackRef res;
+            _PyStackRef l;
+            _PyStackRef r;
             _PyStackRef _stack_item_0 = _tos_cache0;
             right = _stack_item_0;
             left = stack_pointer[-1];
@@ -3534,22 +3517,26 @@
                 SET_CURRENT_CACHED_VALUES(1);
                 JUMP_TO_JUMP_TARGET();
             }
-            PyStackRef_CLOSE_SPECIALIZED(right, _PyLong_ExactDealloc);
-            PyStackRef_CLOSE_SPECIALIZED(left, _PyLong_ExactDealloc);
+            l = left;
+            r = right;
+            _tos_cache2 = r;
+            _tos_cache1 = l;
             _tos_cache0 = res;
-            SET_CURRENT_CACHED_VALUES(1);
+            SET_CURRENT_CACHED_VALUES(3);
             stack_pointer += -1;
             ASSERT_WITHIN_STACK_BOUNDS(__FILE__, __LINE__);
             assert(WITHIN_STACK_BOUNDS_IGNORING_CACHE());
             break;
         }
 
-        case _BINARY_OP_ADD_INT_r21: {
+        case _BINARY_OP_ADD_INT_r23: {
             CHECK_CURRENT_CACHED_VALUES(2);
             assert(WITHIN_STACK_BOUNDS_IGNORING_CACHE());
             _PyStackRef right;
             _PyStackRef left;
             _PyStackRef res;
+            _PyStackRef l;
+            _PyStackRef r;
             _PyStackRef _stack_item_0 = _tos_cache0;
             _PyStackRef _stack_item_1 = _tos_cache1;
             right = _stack_item_1;
@@ -3568,55 +3555,24 @@
                 SET_CURRENT_CACHED_VALUES(2);
                 JUMP_TO_JUMP_TARGET();
             }
-            PyStackRef_CLOSE_SPECIALIZED(right, _PyLong_ExactDealloc);
-            PyStackRef_CLOSE_SPECIALIZED(left, _PyLong_ExactDealloc);
+            l = left;
+            r = right;
+            _tos_cache2 = r;
+            _tos_cache1 = l;
             _tos_cache0 = res;
-            SET_CURRENT_CACHED_VALUES(1);
-            assert(WITHIN_STACK_BOUNDS_IGNORING_CACHE());
-            break;
-        }
-
-        case _BINARY_OP_ADD_INT_r32: {
-            CHECK_CURRENT_CACHED_VALUES(3);
-            assert(WITHIN_STACK_BOUNDS_IGNORING_CACHE());
-            _PyStackRef right;
-            _PyStackRef left;
-            _PyStackRef res;
-            _PyStackRef _stack_item_0 = _tos_cache0;
-            _PyStackRef _stack_item_1 = _tos_cache1;
-            _PyStackRef _stack_item_2 = _tos_cache2;
-            right = _stack_item_2;
-            left = _stack_item_1;
-            PyObject *left_o = PyStackRef_AsPyObjectBorrow(left);
-            PyObject *right_o = PyStackRef_AsPyObjectBorrow(right);
-            assert(PyLong_CheckExact(left_o));
-            assert(PyLong_CheckExact(right_o));
-            assert(_PyLong_BothAreCompact((PyLongObject *)left_o, (PyLongObject *)right_o));
-            STAT_INC(BINARY_OP, hit);
-            res = _PyCompactLong_Add((PyLongObject *)left_o, (PyLongObject *)right_o);
-            if (PyStackRef_IsNull(res)) {
-                UOP_STAT_INC(uopcode, miss);
-                _tos_cache2 = right;
-                _tos_cache1 = left;
-                _tos_cache0 = _stack_item_0;
-                SET_CURRENT_CACHED_VALUES(3);
-                JUMP_TO_JUMP_TARGET();
-            }
-            PyStackRef_CLOSE_SPECIALIZED(right, _PyLong_ExactDealloc);
-            PyStackRef_CLOSE_SPECIALIZED(left, _PyLong_ExactDealloc);
-            _tos_cache1 = res;
-            _tos_cache0 = _stack_item_0;
-            SET_CURRENT_CACHED_VALUES(2);
+            SET_CURRENT_CACHED_VALUES(3);
             assert(WITHIN_STACK_BOUNDS_IGNORING_CACHE());
             break;
         }
 
-        case _BINARY_OP_SUBTRACT_INT_r01: {
+        case _BINARY_OP_SUBTRACT_INT_r03: {
             CHECK_CURRENT_CACHED_VALUES(0);
             assert(WITHIN_STACK_BOUNDS_IGNORING_CACHE());
             _PyStackRef right;
             _PyStackRef left;
             _PyStackRef res;
+            _PyStackRef l;
+            _PyStackRef r;
             right = stack_pointer[-1];
             left = stack_pointer[-2];
             PyObject *left_o = PyStackRef_AsPyObjectBorrow(left);
@@ -3631,22 +3587,26 @@
                 SET_CURRENT_CACHED_VALUES(0);
                 JUMP_TO_JUMP_TARGET();
             }
-            PyStackRef_CLOSE_SPECIALIZED(right, _PyLong_ExactDealloc);
-            PyStackRef_CLOSE_SPECIALIZED(left, _PyLong_ExactDealloc);
+            l = left;
+            r = right;
+            _tos_cache2 = r;
+            _tos_cache1 = l;
             _tos_cache0 = res;
-            SET_CURRENT_CACHED_VALUES(1);
+            SET_CURRENT_CACHED_VALUES(3);
             stack_pointer += -2;
             ASSERT_WITHIN_STACK_BOUNDS(__FILE__, __LINE__);
             assert(WITHIN_STACK_BOUNDS_IGNORING_CACHE());
             break;
         }
 
-        case _BINARY_OP_SUBTRACT_INT_r11: {
+        case _BINARY_OP_SUBTRACT_INT_r13: {
             CHECK_CURRENT_CACHED_VALUES(1);
             assert(WITHIN_STACK_BOUNDS_IGNORING_CACHE());
             _PyStackRef right;
             _PyStackRef left;
             _PyStackRef res;
+            _PyStackRef l;
+            _PyStackRef r;
             _PyStackRef _stack_item_0 = _tos_cache0;
             right = _stack_item_0;
             left = stack_pointer[-1];
@@ -3663,22 +3623,26 @@
                 SET_CURRENT_CACHED_VALUES(1);
                 JUMP_TO_JUMP_TARGET();
             }
-            PyStackRef_CLOSE_SPECIALIZED(right, _PyLong_ExactDealloc);
-            PyStackRef_CLOSE_SPECIALIZED(left, _PyLong_ExactDealloc);
+            l = left;
+            r = right;
+            _tos_cache2 = r;
+            _tos_cache1 = l;
             _tos_cache0 = res;
-            SET_CURRENT_CACHED_VALUES(1);
+            SET_CURRENT_CACHED_VALUES(3);
             stack_pointer += -1;
             ASSERT_WITHIN_STACK_BOUNDS(__FILE__, __LINE__);
             assert(WITHIN_STACK_BOUNDS_IGNORING_CACHE());
             break;
         }
 
-        case _BINARY_OP_SUBTRACT_INT_r21: {
+        case _BINARY_OP_SUBTRACT_INT_r23: {
             CHECK_CURRENT_CACHED_VALUES(2);
             assert(WITHIN_STACK_BOUNDS_IGNORING_CACHE());
             _PyStackRef right;
             _PyStackRef left;
             _PyStackRef res;
+            _PyStackRef l;
+            _PyStackRef r;
             _PyStackRef _stack_item_0 = _tos_cache0;
             _PyStackRef _stack_item_1 = _tos_cache1;
             right = _stack_item_1;
@@ -3697,45 +3661,12 @@
                 SET_CURRENT_CACHED_VALUES(2);
                 JUMP_TO_JUMP_TARGET();
             }
-            PyStackRef_CLOSE_SPECIALIZED(right, _PyLong_ExactDealloc);
-            PyStackRef_CLOSE_SPECIALIZED(left, _PyLong_ExactDealloc);
+            l = left;
+            r = right;
+            _tos_cache2 = r;
+            _tos_cache1 = l;
             _tos_cache0 = res;
-            SET_CURRENT_CACHED_VALUES(1);
-            assert(WITHIN_STACK_BOUNDS_IGNORING_CACHE());
-            break;
-        }
-
-        case _BINARY_OP_SUBTRACT_INT_r32: {
-            CHECK_CURRENT_CACHED_VALUES(3);
-            assert(WITHIN_STACK_BOUNDS_IGNORING_CACHE());
-            _PyStackRef right;
-            _PyStackRef left;
-            _PyStackRef res;
-            _PyStackRef _stack_item_0 = _tos_cache0;
-            _PyStackRef _stack_item_1 = _tos_cache1;
-            _PyStackRef _stack_item_2 = _tos_cache2;
-            right = _stack_item_2;
-            left = _stack_item_1;
-            PyObject *left_o = PyStackRef_AsPyObjectBorrow(left);
-            PyObject *right_o = PyStackRef_AsPyObjectBorrow(right);
-            assert(PyLong_CheckExact(left_o));
-            assert(PyLong_CheckExact(right_o));
-            assert(_PyLong_BothAreCompact((PyLongObject *)left_o, (PyLongObject *)right_o));
-            STAT_INC(BINARY_OP, hit);
-            res = _PyCompactLong_Subtract((PyLongObject *)left_o, (PyLongObject *)right_o);
-            if (PyStackRef_IsNull(res)) {
-                UOP_STAT_INC(uopcode, miss);
-                _tos_cache2 = right;
-                _tos_cache1 = left;
-                _tos_cache0 = _stack_item_0;
-                SET_CURRENT_CACHED_VALUES(3);
-                JUMP_TO_JUMP_TARGET();
-            }
-            PyStackRef_CLOSE_SPECIALIZED(right, _PyLong_ExactDealloc);
-            PyStackRef_CLOSE_SPECIALIZED(left, _PyLong_ExactDealloc);
-            _tos_cache1 = res;
-            _tos_cache0 = _stack_item_0;
-            SET_CURRENT_CACHED_VALUES(2);
+            SET_CURRENT_CACHED_VALUES(3);
             assert(WITHIN_STACK_BOUNDS_IGNORING_CACHE());
             break;
         }
@@ -9054,12 +8985,14 @@
             break;
         }
 
-        case _COMPARE_OP_INT_r21: {
+        case _COMPARE_OP_INT_r23: {
             CHECK_CURRENT_CACHED_VALUES(2);
             assert(WITHIN_STACK_BOUNDS_IGNORING_CACHE());
             _PyStackRef right;
             _PyStackRef left;
             _PyStackRef res;
+            _PyStackRef l;
+            _PyStackRef r;
             _PyStackRef _stack_item_0 = _tos_cache0;
             _PyStackRef _stack_item_1 = _tos_cache1;
             oparg = CURRENT_OPARG();
@@ -9075,13 +9008,13 @@
             Py_ssize_t ileft = _PyLong_CompactValue((PyLongObject *)left_o);
             Py_ssize_t iright = _PyLong_CompactValue((PyLongObject *)right_o);
             int sign_ish = COMPARISON_BIT(ileft, iright);
-            PyStackRef_CLOSE_SPECIALIZED(left, _PyLong_ExactDealloc);
-            PyStackRef_CLOSE_SPECIALIZED(right, _PyLong_ExactDealloc);
+            l = left;
+            r = right;
             res =  (sign_ish & oparg) ? PyStackRef_True : PyStackRef_False;
+            _tos_cache2 = r;
+            _tos_cache1 = l;
             _tos_cache0 = res;
-            _tos_cache1 = PyStackRef_ZERO_BITS;
-            _tos_cache2 = PyStackRef_ZERO_BITS;
-            SET_CURRENT_CACHED_VALUES(1);
+            SET_CURRENT_CACHED_VALUES(3);
             assert(WITHIN_STACK_BOUNDS_IGNORING_CACHE());
             break;
         }

diff --git a/Python/generated_cases.c.h b/Python/generated_cases.c.h
index 1e7778c7e752bbe111717db7f1d20a3c1223bbf3..3b8ad4565af987806eb90d3549f07e9c1ff55ec1 100644 (file)
--- a/Python/generated_cases.c.h
+++ b/Python/generated_cases.c.h
@@ -170,6 +170,8 @@
             _PyStackRef left;
             _PyStackRef right;
             _PyStackRef res;
+            _PyStackRef l;
+            _PyStackRef r;
             // _GUARD_TOS_INT
             {
                 value = stack_pointer[-1];
@@ -206,8 +208,20 @@
                     assert(_PyOpcode_Deopt[opcode] == (BINARY_OP));
                     JUMP_TO_PREDICTED(BINARY_OP);
                 }
-                PyStackRef_CLOSE_SPECIALIZED(right, _PyLong_ExactDealloc);
-                PyStackRef_CLOSE_SPECIALIZED(left, _PyLong_ExactDealloc);
+                l = left;
+                r = right;
+            }
+            // _POP_TOP_INT
+            {
+                value = r;
+                assert(PyLong_CheckExact(PyStackRef_AsPyObjectBorrow(value)));
+                PyStackRef_CLOSE_SPECIALIZED(value, _PyLong_ExactDealloc);
+            }
+            // _POP_TOP_INT
+            {
+                value = l;
+                assert(PyLong_CheckExact(PyStackRef_AsPyObjectBorrow(value)));
+                PyStackRef_CLOSE_SPECIALIZED(value, _PyLong_ExactDealloc);
             }
             stack_pointer[-2] = res;
             stack_pointer += -1;
@@ -511,6 +525,8 @@
             _PyStackRef left;
             _PyStackRef right;
             _PyStackRef res;
+            _PyStackRef l;
+            _PyStackRef r;
             // _GUARD_TOS_INT
             {
                 value = stack_pointer[-1];
@@ -547,8 +563,20 @@
                     assert(_PyOpcode_Deopt[opcode] == (BINARY_OP));
                     JUMP_TO_PREDICTED(BINARY_OP);
                 }
-                PyStackRef_CLOSE_SPECIALIZED(right, _PyLong_ExactDealloc);
-                PyStackRef_CLOSE_SPECIALIZED(left, _PyLong_ExactDealloc);
+                l = left;
+                r = right;
+            }
+            // _POP_TOP_INT
+            {
+                value = r;
+                assert(PyLong_CheckExact(PyStackRef_AsPyObjectBorrow(value)));
+                PyStackRef_CLOSE_SPECIALIZED(value, _PyLong_ExactDealloc);
+            }
+            // _POP_TOP_INT
+            {
+                value = l;
+                assert(PyLong_CheckExact(PyStackRef_AsPyObjectBorrow(value)));
+                PyStackRef_CLOSE_SPECIALIZED(value, _PyLong_ExactDealloc);
             }
             stack_pointer[-2] = res;
             stack_pointer += -1;
@@ -1109,6 +1137,8 @@
             _PyStackRef left;
             _PyStackRef right;
             _PyStackRef res;
+            _PyStackRef l;
+            _PyStackRef r;
             // _GUARD_TOS_INT
             {
                 value = stack_pointer[-1];
@@ -1145,8 +1175,20 @@
                     assert(_PyOpcode_Deopt[opcode] == (BINARY_OP));
                     JUMP_TO_PREDICTED(BINARY_OP);
                 }
-                PyStackRef_CLOSE_SPECIALIZED(right, _PyLong_ExactDealloc);
-                PyStackRef_CLOSE_SPECIALIZED(left, _PyLong_ExactDealloc);
+                l = left;
+                r = right;
+            }
+            // _POP_TOP_INT
+            {
+                value = r;
+                assert(PyLong_CheckExact(PyStackRef_AsPyObjectBorrow(value)));
+                PyStackRef_CLOSE_SPECIALIZED(value, _PyLong_ExactDealloc);
+            }
+            // _POP_TOP_INT
+            {
+                value = l;
+                assert(PyLong_CheckExact(PyStackRef_AsPyObjectBorrow(value)));
+                PyStackRef_CLOSE_SPECIALIZED(value, _PyLong_ExactDealloc);
             }
             stack_pointer[-2] = res;
             stack_pointer += -1;
@@ -4544,6 +4586,8 @@
             _PyStackRef left;
             _PyStackRef right;
             _PyStackRef res;
+            _PyStackRef l;
+            _PyStackRef r;
             // _GUARD_TOS_INT
             {
                 value = stack_pointer[-1];
@@ -4578,10 +4622,22 @@
                 Py_ssize_t ileft = _PyLong_CompactValue((PyLongObject *)left_o);
                 Py_ssize_t iright = _PyLong_CompactValue((PyLongObject *)right_o);
                 int sign_ish = COMPARISON_BIT(ileft, iright);
-                PyStackRef_CLOSE_SPECIALIZED(left, _PyLong_ExactDealloc);
-                PyStackRef_CLOSE_SPECIALIZED(right, _PyLong_ExactDealloc);
+                l = left;
+                r = right;
                 res =  (sign_ish & oparg) ? PyStackRef_True : PyStackRef_False;
             }
+            // _POP_TOP_INT
+            {
+                value = r;
+                assert(PyLong_CheckExact(PyStackRef_AsPyObjectBorrow(value)));
+                PyStackRef_CLOSE_SPECIALIZED(value, _PyLong_ExactDealloc);
+            }
+            // _POP_TOP_INT
+            {
+                value = l;
+                assert(PyLong_CheckExact(PyStackRef_AsPyObjectBorrow(value)));
+                PyStackRef_CLOSE_SPECIALIZED(value, _PyLong_ExactDealloc);
+            }
             stack_pointer[-2] = res;
             stack_pointer += -1;
             ASSERT_WITHIN_STACK_BOUNDS(__FILE__, __LINE__);

diff --git a/Python/optimizer_bytecodes.c b/Python/optimizer_bytecodes.c
index 9e9af6186c4df5142fd5525e696ecb78cd05610e..b97b4c35d9aab3eaddc8444663c74c7f8ded1192 100644 (file)
--- a/Python/optimizer_bytecodes.c
+++ b/Python/optimizer_bytecodes.c
@@ -251,37 +251,37 @@ dummy_func(void) {
         }
     }
 
-    op(_BINARY_OP_ADD_INT, (left, right -- res)) {
-        REPLACE_OPCODE_IF_EVALUATES_PURE(left, right);
+    op(_BINARY_OP_ADD_INT, (left, right -- res, l, r)) {
         res = sym_new_compact_int(ctx);
+        l = left;
+        r = right;
     }
 
-    op(_BINARY_OP_SUBTRACT_INT, (left, right -- res)) {
-        REPLACE_OPCODE_IF_EVALUATES_PURE(left, right);
+    op(_BINARY_OP_SUBTRACT_INT, (left, right -- res, l, r)) {
         res = sym_new_compact_int(ctx);
+        l = left;
+        r = right;
     }
 
-    op(_BINARY_OP_MULTIPLY_INT, (left, right -- res)) {
-        REPLACE_OPCODE_IF_EVALUATES_PURE(left, right);
+    op(_BINARY_OP_MULTIPLY_INT, (left, right -- res, l, r)) {
         res = sym_new_compact_int(ctx);
+        l = left;
+        r = right;
     }
 
     op(_BINARY_OP_ADD_FLOAT, (left, right -- res, l, r)) {
-        REPLACE_OPCODE_IF_EVALUATES_PURE(left, right);
         res = sym_new_type(ctx, &PyFloat_Type);
         l = left;
         r = right;
     }
 
     op(_BINARY_OP_SUBTRACT_FLOAT, (left, right -- res, l, r)) {
-        REPLACE_OPCODE_IF_EVALUATES_PURE(left, right);
         res = sym_new_type(ctx, &PyFloat_Type);
         l = left;
         r = right;
     }
 
     op(_BINARY_OP_MULTIPLY_FLOAT, (left, right -- res, l, r)) {
-        REPLACE_OPCODE_IF_EVALUATES_PURE(left, right);
         res = sym_new_type(ctx, &PyFloat_Type);
         l = left;
         r = right;
@@ -446,9 +446,10 @@ dummy_func(void) {
         }
     }
 
-    op(_COMPARE_OP_INT, (left, right -- res)) {
-        REPLACE_OPCODE_IF_EVALUATES_PURE(left, right);
+    op(_COMPARE_OP_INT, (left, right -- res, l, r)) {
         res = sym_new_type(ctx, &PyBool_Type);
+        l = left;
+        r = right;
     }
 
     op(_COMPARE_OP_FLOAT, (left, right -- res)) {

diff --git a/Python/optimizer_cases.c.h b/Python/optimizer_cases.c.h
index b79e9125d6bf2ea737ad4786fd0ccc658666e664..0d56464ea91c88d7be6234562c4c3087255ee0b9 100644 (file)
--- a/Python/optimizer_cases.c.h
+++ b/Python/optimizer_cases.c.h
@@ -497,50 +497,18 @@
             JitOptRef right;
             JitOptRef left;
             JitOptRef res;
+            JitOptRef l;
+            JitOptRef r;
             right = stack_pointer[-1];
             left = stack_pointer[-2];
-            if (
-                sym_is_safe_const(ctx, left) &&
-                sym_is_safe_const(ctx, right)
-            ) {
-                JitOptRef left_sym = left;
-                JitOptRef right_sym = right;
-                _PyStackRef left = sym_get_const_as_stackref(ctx, left_sym);
-                _PyStackRef right = sym_get_const_as_stackref(ctx, right_sym);
-                _PyStackRef res_stackref;
-                /* Start of uop copied from bytecodes for constant evaluation */
-                PyObject *left_o = PyStackRef_AsPyObjectBorrow(left);
-                PyObject *right_o = PyStackRef_AsPyObjectBorrow(right);
-                assert(PyLong_CheckExact(left_o));
-                assert(PyLong_CheckExact(right_o));
-                assert(_PyLong_BothAreCompact((PyLongObject *)left_o, (PyLongObject *)right_o));
-                STAT_INC(BINARY_OP, hit);
-                res_stackref = _PyCompactLong_Multiply((PyLongObject *)left_o, (PyLongObject *)right_o);
-                if (PyStackRef_IsNull(res_stackref )) {
-                    ctx->done = true;
-                    break;
-                }
-                PyStackRef_CLOSE_SPECIALIZED(right, _PyLong_ExactDealloc);
-                PyStackRef_CLOSE_SPECIALIZED(left, _PyLong_ExactDealloc);
-                /* End of uop copied from bytecodes for constant evaluation */
-                res = sym_new_const_steal(ctx, PyStackRef_AsPyObjectSteal(res_stackref));
-                if (sym_is_const(ctx, res)) {
-                    PyObject *result = sym_get_const(ctx, res);
-                    if (_Py_IsImmortal(result)) {
-                        // Replace with _POP_TWO_LOAD_CONST_INLINE_BORROW since we have two inputs and an immortal result
-                        REPLACE_OP(this_instr, _POP_TWO_LOAD_CONST_INLINE_BORROW, 0, (uintptr_t)result);
-                    }
-                }
-                CHECK_STACK_BOUNDS(-1);
-                stack_pointer[-2] = res;
-                stack_pointer += -1;
-                ASSERT_WITHIN_STACK_BOUNDS(__FILE__, __LINE__);
-                break;
-            }
             res = sym_new_compact_int(ctx);
-            CHECK_STACK_BOUNDS(-1);
+            l = left;
+            r = right;
+            CHECK_STACK_BOUNDS(1);
             stack_pointer[-2] = res;
-            stack_pointer += -1;
+            stack_pointer[-1] = l;
+            stack_pointer[0] = r;
+            stack_pointer += 1;
             ASSERT_WITHIN_STACK_BOUNDS(__FILE__, __LINE__);
             break;
         }
@@ -549,50 +517,18 @@
             JitOptRef right;
             JitOptRef left;
             JitOptRef res;
+            JitOptRef l;
+            JitOptRef r;
             right = stack_pointer[-1];
             left = stack_pointer[-2];
-            if (
-                sym_is_safe_const(ctx, left) &&
-                sym_is_safe_const(ctx, right)
-            ) {
-                JitOptRef left_sym = left;
-                JitOptRef right_sym = right;
-                _PyStackRef left = sym_get_const_as_stackref(ctx, left_sym);
-                _PyStackRef right = sym_get_const_as_stackref(ctx, right_sym);
-                _PyStackRef res_stackref;
-                /* Start of uop copied from bytecodes for constant evaluation */
-                PyObject *left_o = PyStackRef_AsPyObjectBorrow(left);
-                PyObject *right_o = PyStackRef_AsPyObjectBorrow(right);
-                assert(PyLong_CheckExact(left_o));
-                assert(PyLong_CheckExact(right_o));
-                assert(_PyLong_BothAreCompact((PyLongObject *)left_o, (PyLongObject *)right_o));
-                STAT_INC(BINARY_OP, hit);
-                res_stackref = _PyCompactLong_Add((PyLongObject *)left_o, (PyLongObject *)right_o);
-                if (PyStackRef_IsNull(res_stackref )) {
-                    ctx->done = true;
-                    break;
-                }
-                PyStackRef_CLOSE_SPECIALIZED(right, _PyLong_ExactDealloc);
-                PyStackRef_CLOSE_SPECIALIZED(left, _PyLong_ExactDealloc);
-                /* End of uop copied from bytecodes for constant evaluation */
-                res = sym_new_const_steal(ctx, PyStackRef_AsPyObjectSteal(res_stackref));
-                if (sym_is_const(ctx, res)) {
-                    PyObject *result = sym_get_const(ctx, res);
-                    if (_Py_IsImmortal(result)) {
-                        // Replace with _POP_TWO_LOAD_CONST_INLINE_BORROW since we have two inputs and an immortal result
-                        REPLACE_OP(this_instr, _POP_TWO_LOAD_CONST_INLINE_BORROW, 0, (uintptr_t)result);
-                    }
-                }
-                CHECK_STACK_BOUNDS(-1);
-                stack_pointer[-2] = res;
-                stack_pointer += -1;
-                ASSERT_WITHIN_STACK_BOUNDS(__FILE__, __LINE__);
-                break;
-            }
             res = sym_new_compact_int(ctx);
-            CHECK_STACK_BOUNDS(-1);
+            l = left;
+            r = right;
+            CHECK_STACK_BOUNDS(1);
             stack_pointer[-2] = res;
-            stack_pointer += -1;
+            stack_pointer[-1] = l;
+            stack_pointer[0] = r;
+            stack_pointer += 1;
             ASSERT_WITHIN_STACK_BOUNDS(__FILE__, __LINE__);
             break;
         }
@@ -601,50 +537,18 @@
             JitOptRef right;
             JitOptRef left;
             JitOptRef res;
+            JitOptRef l;
+            JitOptRef r;
             right = stack_pointer[-1];
             left = stack_pointer[-2];
-            if (
-                sym_is_safe_const(ctx, left) &&
-                sym_is_safe_const(ctx, right)
-            ) {
-                JitOptRef left_sym = left;
-                JitOptRef right_sym = right;
-                _PyStackRef left = sym_get_const_as_stackref(ctx, left_sym);
-                _PyStackRef right = sym_get_const_as_stackref(ctx, right_sym);
-                _PyStackRef res_stackref;
-                /* Start of uop copied from bytecodes for constant evaluation */
-                PyObject *left_o = PyStackRef_AsPyObjectBorrow(left);
-                PyObject *right_o = PyStackRef_AsPyObjectBorrow(right);
-                assert(PyLong_CheckExact(left_o));
-                assert(PyLong_CheckExact(right_o));
-                assert(_PyLong_BothAreCompact((PyLongObject *)left_o, (PyLongObject *)right_o));
-                STAT_INC(BINARY_OP, hit);
-                res_stackref = _PyCompactLong_Subtract((PyLongObject *)left_o, (PyLongObject *)right_o);
-                if (PyStackRef_IsNull(res_stackref )) {
-                    ctx->done = true;
-                    break;
-                }
-                PyStackRef_CLOSE_SPECIALIZED(right, _PyLong_ExactDealloc);
-                PyStackRef_CLOSE_SPECIALIZED(left, _PyLong_ExactDealloc);
-                /* End of uop copied from bytecodes for constant evaluation */
-                res = sym_new_const_steal(ctx, PyStackRef_AsPyObjectSteal(res_stackref));
-                if (sym_is_const(ctx, res)) {
-                    PyObject *result = sym_get_const(ctx, res);
-                    if (_Py_IsImmortal(result)) {
-                        // Replace with _POP_TWO_LOAD_CONST_INLINE_BORROW since we have two inputs and an immortal result
-                        REPLACE_OP(this_instr, _POP_TWO_LOAD_CONST_INLINE_BORROW, 0, (uintptr_t)result);
-                    }
-                }
-                CHECK_STACK_BOUNDS(-1);
-                stack_pointer[-2] = res;
-                stack_pointer += -1;
-                ASSERT_WITHIN_STACK_BOUNDS(__FILE__, __LINE__);
-                break;
-            }
             res = sym_new_compact_int(ctx);
-            CHECK_STACK_BOUNDS(-1);
+            l = left;
+            r = right;
+            CHECK_STACK_BOUNDS(1);
             stack_pointer[-2] = res;
-            stack_pointer += -1;
+            stack_pointer[-1] = l;
+            stack_pointer[0] = r;
+            stack_pointer += 1;
             ASSERT_WITHIN_STACK_BOUNDS(__FILE__, __LINE__);
             break;
         }
@@ -677,44 +581,6 @@
             JitOptRef r;
             right = stack_pointer[-1];
             left = stack_pointer[-2];
-            if (
-                sym_is_safe_const(ctx, left) &&
-                sym_is_safe_const(ctx, right)
-            ) {
-                JitOptRef left_sym = left;
-                JitOptRef right_sym = right;
-                _PyStackRef left = sym_get_const_as_stackref(ctx, left_sym);
-                _PyStackRef right = sym_get_const_as_stackref(ctx, right_sym);
-                _PyStackRef res_stackref;
-                _PyStackRef l_stackref;
-                _PyStackRef r_stackref;
-                /* Start of uop copied from bytecodes for constant evaluation */
-                PyObject *left_o = PyStackRef_AsPyObjectBorrow(left);
-                PyObject *right_o = PyStackRef_AsPyObjectBorrow(right);
-                assert(PyFloat_CheckExact(left_o));
-                assert(PyFloat_CheckExact(right_o));
-                STAT_INC(BINARY_OP, hit);
-                double dres =
-                ((PyFloatObject *)left_o)->ob_fval *
-                ((PyFloatObject *)right_o)->ob_fval;
-                res_stackref = PyStackRef_FromPyObjectSteal(PyFloat_FromDouble(dres));
-                if (PyStackRef_IsNull(res)) {
-                    JUMP_TO_LABEL(error);
-                }
-                l_stackref = left;
-                r_stackref = right;
-                /* End of uop copied from bytecodes for constant evaluation */
-                res = sym_new_const_steal(ctx, PyStackRef_AsPyObjectSteal(res_stackref));
-                l = sym_new_const_steal(ctx, PyStackRef_AsPyObjectSteal(l_stackref));
-                r = sym_new_const_steal(ctx, PyStackRef_AsPyObjectSteal(r_stackref));
-                CHECK_STACK_BOUNDS(1);
-                stack_pointer[-2] = res;
-                stack_pointer[-1] = l;
-                stack_pointer[0] = r;
-                stack_pointer += 1;
-                ASSERT_WITHIN_STACK_BOUNDS(__FILE__, __LINE__);
-                break;
-            }
             res = sym_new_type(ctx, &PyFloat_Type);
             l = left;
             r = right;
@@ -735,44 +601,6 @@
             JitOptRef r;
             right = stack_pointer[-1];
             left = stack_pointer[-2];
-            if (
-                sym_is_safe_const(ctx, left) &&
-                sym_is_safe_const(ctx, right)
-            ) {
-                JitOptRef left_sym = left;
-                JitOptRef right_sym = right;
-                _PyStackRef left = sym_get_const_as_stackref(ctx, left_sym);
-                _PyStackRef right = sym_get_const_as_stackref(ctx, right_sym);
-                _PyStackRef res_stackref;
-                _PyStackRef l_stackref;
-                _PyStackRef r_stackref;
-                /* Start of uop copied from bytecodes for constant evaluation */
-                PyObject *left_o = PyStackRef_AsPyObjectBorrow(left);
-                PyObject *right_o = PyStackRef_AsPyObjectBorrow(right);
-                assert(PyFloat_CheckExact(left_o));
-                assert(PyFloat_CheckExact(right_o));
-                STAT_INC(BINARY_OP, hit);
-                double dres =
-                ((PyFloatObject *)left_o)->ob_fval +
-                ((PyFloatObject *)right_o)->ob_fval;
-                res_stackref = PyStackRef_FromPyObjectSteal(PyFloat_FromDouble(dres));
-                if (PyStackRef_IsNull(res)) {
-                    JUMP_TO_LABEL(error);
-                }
-                l_stackref = left;
-                r_stackref = right;
-                /* End of uop copied from bytecodes for constant evaluation */
-                res = sym_new_const_steal(ctx, PyStackRef_AsPyObjectSteal(res_stackref));
-                l = sym_new_const_steal(ctx, PyStackRef_AsPyObjectSteal(l_stackref));
-                r = sym_new_const_steal(ctx, PyStackRef_AsPyObjectSteal(r_stackref));
-                CHECK_STACK_BOUNDS(1);
-                stack_pointer[-2] = res;
-                stack_pointer[-1] = l;
-                stack_pointer[0] = r;
-                stack_pointer += 1;
-                ASSERT_WITHIN_STACK_BOUNDS(__FILE__, __LINE__);
-                break;
-            }
             res = sym_new_type(ctx, &PyFloat_Type);
             l = left;
             r = right;
@@ -793,44 +621,6 @@
             JitOptRef r;
             right = stack_pointer[-1];
             left = stack_pointer[-2];
-            if (
-                sym_is_safe_const(ctx, left) &&
-                sym_is_safe_const(ctx, right)
-            ) {
-                JitOptRef left_sym = left;
-                JitOptRef right_sym = right;
-                _PyStackRef left = sym_get_const_as_stackref(ctx, left_sym);
-                _PyStackRef right = sym_get_const_as_stackref(ctx, right_sym);
-                _PyStackRef res_stackref;
-                _PyStackRef l_stackref;
-                _PyStackRef r_stackref;
-                /* Start of uop copied from bytecodes for constant evaluation */
-                PyObject *left_o = PyStackRef_AsPyObjectBorrow(left);
-                PyObject *right_o = PyStackRef_AsPyObjectBorrow(right);
-                assert(PyFloat_CheckExact(left_o));
-                assert(PyFloat_CheckExact(right_o));
-                STAT_INC(BINARY_OP, hit);
-                double dres =
-                ((PyFloatObject *)left_o)->ob_fval -
-                ((PyFloatObject *)right_o)->ob_fval;
-                res_stackref = PyStackRef_FromPyObjectSteal(PyFloat_FromDouble(dres));
-                if (PyStackRef_IsNull(res)) {
-                    JUMP_TO_LABEL(error);
-                }
-                l_stackref = left;
-                r_stackref = right;
-                /* End of uop copied from bytecodes for constant evaluation */
-                res = sym_new_const_steal(ctx, PyStackRef_AsPyObjectSteal(res_stackref));
-                l = sym_new_const_steal(ctx, PyStackRef_AsPyObjectSteal(l_stackref));
-                r = sym_new_const_steal(ctx, PyStackRef_AsPyObjectSteal(r_stackref));
-                CHECK_STACK_BOUNDS(1);
-                stack_pointer[-2] = res;
-                stack_pointer[-1] = l;
-                stack_pointer[0] = r;
-                stack_pointer += 1;
-                ASSERT_WITHIN_STACK_BOUNDS(__FILE__, __LINE__);
-                break;
-            }
             res = sym_new_type(ctx, &PyFloat_Type);
             l = left;
             r = right;
@@ -2028,50 +1818,18 @@
             JitOptRef right;
             JitOptRef left;
             JitOptRef res;
+            JitOptRef l;
+            JitOptRef r;
             right = stack_pointer[-1];
             left = stack_pointer[-2];
-            if (
-                sym_is_safe_const(ctx, left) &&
-                sym_is_safe_const(ctx, right)
-            ) {
-                JitOptRef left_sym = left;
-                JitOptRef right_sym = right;
-                _PyStackRef left = sym_get_const_as_stackref(ctx, left_sym);
-                _PyStackRef right = sym_get_const_as_stackref(ctx, right_sym);
-                _PyStackRef res_stackref;
-                /* Start of uop copied from bytecodes for constant evaluation */
-                PyObject *left_o = PyStackRef_AsPyObjectBorrow(left);
-                PyObject *right_o = PyStackRef_AsPyObjectBorrow(right);
-                assert(_PyLong_IsCompact((PyLongObject *)left_o));
-                assert(_PyLong_IsCompact((PyLongObject *)right_o));
-                STAT_INC(COMPARE_OP, hit);
-                assert(_PyLong_DigitCount((PyLongObject *)left_o) <= 1 &&
-                   _PyLong_DigitCount((PyLongObject *)right_o) <= 1);
-                Py_ssize_t ileft = _PyLong_CompactValue((PyLongObject *)left_o);
-                Py_ssize_t iright = _PyLong_CompactValue((PyLongObject *)right_o);
-                int sign_ish = COMPARISON_BIT(ileft, iright);
-                PyStackRef_CLOSE_SPECIALIZED(left, _PyLong_ExactDealloc);
-                PyStackRef_CLOSE_SPECIALIZED(right, _PyLong_ExactDealloc);
-                res_stackref =  (sign_ish & oparg) ? PyStackRef_True : PyStackRef_False;
-                /* End of uop copied from bytecodes for constant evaluation */
-                res = sym_new_const_steal(ctx, PyStackRef_AsPyObjectSteal(res_stackref));
-                if (sym_is_const(ctx, res)) {
-                    PyObject *result = sym_get_const(ctx, res);
-                    if (_Py_IsImmortal(result)) {
-                        // Replace with _POP_TWO_LOAD_CONST_INLINE_BORROW since we have two inputs and an immortal result
-                        REPLACE_OP(this_instr, _POP_TWO_LOAD_CONST_INLINE_BORROW, 0, (uintptr_t)result);
-                    }
-                }
-                CHECK_STACK_BOUNDS(-1);
-                stack_pointer[-2] = res;
-                stack_pointer += -1;
-                ASSERT_WITHIN_STACK_BOUNDS(__FILE__, __LINE__);
-                break;
-            }
             res = sym_new_type(ctx, &PyBool_Type);
-            CHECK_STACK_BOUNDS(-1);
+            l = left;
+            r = right;
+            CHECK_STACK_BOUNDS(1);
             stack_pointer[-2] = res;
-            stack_pointer += -1;
+            stack_pointer[-1] = l;
+            stack_pointer[0] = r;
+            stack_pointer += 1;
             ASSERT_WITHIN_STACK_BOUNDS(__FILE__, __LINE__);
             break;
         }