diff --git a/Include/internal/pycore_opcode_metadata.h b/Include/internal/pycore_opcode_metadata.h index 8920dd42d7384a..7139b5a9e54483 100644 --- a/Include/internal/pycore_opcode_metadata.h +++ b/Include/internal/pycore_opcode_metadata.h @@ -1381,9 +1381,9 @@ _PyOpcode_macro_expansion[256] = { [CHECK_EG_MATCH] = { .nuops = 1, .uops = { { _CHECK_EG_MATCH, OPARG_SIMPLE, 0 } } }, [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_FLOAT] = { .nuops = 5, .uops = { { _GUARD_TOS_FLOAT, OPARG_SIMPLE, 0 }, { _GUARD_NOS_FLOAT, OPARG_SIMPLE, 0 }, { _COMPARE_OP_FLOAT, OPARG_SIMPLE, 1 }, { _POP_TOP_FLOAT, OPARG_SIMPLE, 1 }, { _POP_TOP_FLOAT, 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 } } }, + [COMPARE_OP_STR] = { .nuops = 5, .uops = { { _GUARD_TOS_UNICODE, OPARG_SIMPLE, 0 }, { _GUARD_NOS_UNICODE, OPARG_SIMPLE, 0 }, { _COMPARE_OP_STR, OPARG_SIMPLE, 1 }, { _POP_TOP_UNICODE, OPARG_SIMPLE, 1 }, { _POP_TOP_UNICODE, 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 } } }, [CONTAINS_OP_SET] = { .nuops = 2, .uops = { { _GUARD_TOS_ANY_SET, OPARG_SIMPLE, 0 }, { _CONTAINS_OP_SET, OPARG_SIMPLE, 1 } } }, diff --git a/Include/internal/pycore_uop_ids.h b/Include/internal/pycore_uop_ids.h index 42fb9464b6a13d..9b3c5fbcf8d4e0 100644 --- a/Include/internal/pycore_uop_ids.h +++ b/Include/internal/pycore_uop_ids.h @@ -477,640 +477,639 @@ extern "C" { #define _COLD_DYNAMIC_EXIT_r00 670 #define _COLD_EXIT_r00 671 #define _COMPARE_OP_r21 672 -#define _COMPARE_OP_FLOAT_r01 673 -#define _COMPARE_OP_FLOAT_r11 674 -#define _COMPARE_OP_FLOAT_r21 675 -#define _COMPARE_OP_FLOAT_r32 676 -#define _COMPARE_OP_INT_r23 677 -#define _COMPARE_OP_STR_r21 678 -#define _CONTAINS_OP_r21 679 -#define _CONTAINS_OP_DICT_r21 680 -#define _CONTAINS_OP_SET_r21 681 -#define _CONVERT_VALUE_r11 682 -#define _COPY_r01 683 -#define _COPY_1_r02 684 -#define _COPY_1_r12 685 -#define _COPY_1_r23 686 -#define _COPY_2_r03 687 -#define _COPY_2_r13 688 -#define _COPY_2_r23 689 -#define _COPY_3_r03 690 -#define _COPY_3_r13 691 -#define _COPY_3_r23 692 -#define _COPY_3_r33 693 -#define _COPY_FREE_VARS_r00 694 -#define _COPY_FREE_VARS_r11 695 -#define _COPY_FREE_VARS_r22 696 -#define _COPY_FREE_VARS_r33 697 -#define _CREATE_INIT_FRAME_r01 698 -#define _DELETE_ATTR_r10 699 -#define _DELETE_DEREF_r00 700 -#define _DELETE_FAST_r00 701 -#define _DELETE_GLOBAL_r00 702 -#define _DELETE_NAME_r00 703 -#define _DELETE_SUBSCR_r20 704 -#define _DEOPT_r00 705 -#define _DEOPT_r10 706 -#define _DEOPT_r20 707 -#define _DEOPT_r30 708 -#define _DICT_MERGE_r10 709 -#define _DICT_UPDATE_r10 710 -#define _DO_CALL_r01 711 -#define _DO_CALL_FUNCTION_EX_r31 712 -#define _DO_CALL_KW_r11 713 -#define _DYNAMIC_EXIT_r00 714 -#define _DYNAMIC_EXIT_r10 715 -#define _DYNAMIC_EXIT_r20 716 -#define _DYNAMIC_EXIT_r30 717 -#define _END_FOR_r10 718 -#define _END_SEND_r21 719 -#define _ERROR_POP_N_r00 720 -#define _EXIT_INIT_CHECK_r10 721 -#define _EXIT_TRACE_r00 722 -#define _EXIT_TRACE_r10 723 -#define _EXIT_TRACE_r20 724 -#define _EXIT_TRACE_r30 725 -#define _EXPAND_METHOD_r00 726 -#define _EXPAND_METHOD_KW_r11 727 -#define _FATAL_ERROR_r00 728 -#define _FATAL_ERROR_r11 729 -#define _FATAL_ERROR_r22 730 -#define _FATAL_ERROR_r33 731 -#define _FORMAT_SIMPLE_r11 732 -#define _FORMAT_WITH_SPEC_r21 733 -#define _FOR_ITER_r23 734 -#define _FOR_ITER_GEN_FRAME_r03 735 -#define _FOR_ITER_GEN_FRAME_r13 736 -#define _FOR_ITER_GEN_FRAME_r23 737 -#define _FOR_ITER_TIER_TWO_r23 738 -#define _GET_AITER_r11 739 -#define _GET_ANEXT_r12 740 -#define _GET_AWAITABLE_r11 741 -#define _GET_ITER_r12 742 -#define _GET_LEN_r12 743 -#define _GET_YIELD_FROM_ITER_r11 744 -#define _GUARD_BINARY_OP_EXTEND_r22 745 -#define _GUARD_CALLABLE_ISINSTANCE_r03 746 -#define _GUARD_CALLABLE_ISINSTANCE_r13 747 -#define _GUARD_CALLABLE_ISINSTANCE_r23 748 -#define _GUARD_CALLABLE_ISINSTANCE_r33 749 -#define _GUARD_CALLABLE_LEN_r03 750 -#define _GUARD_CALLABLE_LEN_r13 751 -#define _GUARD_CALLABLE_LEN_r23 752 -#define _GUARD_CALLABLE_LEN_r33 753 -#define _GUARD_CALLABLE_LIST_APPEND_r03 754 -#define _GUARD_CALLABLE_LIST_APPEND_r13 755 -#define _GUARD_CALLABLE_LIST_APPEND_r23 756 -#define _GUARD_CALLABLE_LIST_APPEND_r33 757 -#define _GUARD_CALLABLE_STR_1_r03 758 -#define _GUARD_CALLABLE_STR_1_r13 759 -#define _GUARD_CALLABLE_STR_1_r23 760 -#define _GUARD_CALLABLE_STR_1_r33 761 -#define _GUARD_CALLABLE_TUPLE_1_r03 762 -#define _GUARD_CALLABLE_TUPLE_1_r13 763 -#define _GUARD_CALLABLE_TUPLE_1_r23 764 -#define _GUARD_CALLABLE_TUPLE_1_r33 765 -#define _GUARD_CALLABLE_TYPE_1_r03 766 -#define _GUARD_CALLABLE_TYPE_1_r13 767 -#define _GUARD_CALLABLE_TYPE_1_r23 768 -#define _GUARD_CALLABLE_TYPE_1_r33 769 -#define _GUARD_DORV_NO_DICT_r01 770 -#define _GUARD_DORV_NO_DICT_r11 771 -#define _GUARD_DORV_NO_DICT_r22 772 -#define _GUARD_DORV_NO_DICT_r33 773 -#define _GUARD_DORV_VALUES_INST_ATTR_FROM_DICT_r01 774 -#define _GUARD_DORV_VALUES_INST_ATTR_FROM_DICT_r11 775 -#define _GUARD_DORV_VALUES_INST_ATTR_FROM_DICT_r22 776 -#define _GUARD_DORV_VALUES_INST_ATTR_FROM_DICT_r33 777 -#define _GUARD_GLOBALS_VERSION_r00 778 -#define _GUARD_GLOBALS_VERSION_r11 779 -#define _GUARD_GLOBALS_VERSION_r22 780 -#define _GUARD_GLOBALS_VERSION_r33 781 -#define _GUARD_IP_RETURN_GENERATOR_r00 782 -#define _GUARD_IP_RETURN_GENERATOR_r11 783 -#define _GUARD_IP_RETURN_GENERATOR_r22 784 -#define _GUARD_IP_RETURN_GENERATOR_r33 785 -#define _GUARD_IP_RETURN_VALUE_r00 786 -#define _GUARD_IP_RETURN_VALUE_r11 787 -#define _GUARD_IP_RETURN_VALUE_r22 788 -#define _GUARD_IP_RETURN_VALUE_r33 789 -#define _GUARD_IP_YIELD_VALUE_r00 790 -#define _GUARD_IP_YIELD_VALUE_r11 791 -#define _GUARD_IP_YIELD_VALUE_r22 792 -#define _GUARD_IP_YIELD_VALUE_r33 793 -#define _GUARD_IP__PUSH_FRAME_r00 794 -#define _GUARD_IP__PUSH_FRAME_r11 795 -#define _GUARD_IP__PUSH_FRAME_r22 796 -#define _GUARD_IP__PUSH_FRAME_r33 797 -#define _GUARD_IS_FALSE_POP_r00 798 -#define _GUARD_IS_FALSE_POP_r10 799 -#define _GUARD_IS_FALSE_POP_r21 800 -#define _GUARD_IS_FALSE_POP_r32 801 -#define _GUARD_IS_NONE_POP_r00 802 -#define _GUARD_IS_NONE_POP_r10 803 -#define _GUARD_IS_NONE_POP_r21 804 -#define _GUARD_IS_NONE_POP_r32 805 -#define _GUARD_IS_NOT_NONE_POP_r10 806 -#define _GUARD_IS_TRUE_POP_r00 807 -#define _GUARD_IS_TRUE_POP_r10 808 -#define _GUARD_IS_TRUE_POP_r21 809 -#define _GUARD_IS_TRUE_POP_r32 810 -#define _GUARD_KEYS_VERSION_r01 811 -#define _GUARD_KEYS_VERSION_r11 812 -#define _GUARD_KEYS_VERSION_r22 813 -#define _GUARD_KEYS_VERSION_r33 814 -#define _GUARD_NOS_DICT_r02 815 -#define _GUARD_NOS_DICT_r12 816 -#define _GUARD_NOS_DICT_r22 817 -#define _GUARD_NOS_DICT_r33 818 -#define _GUARD_NOS_FLOAT_r02 819 -#define _GUARD_NOS_FLOAT_r12 820 -#define _GUARD_NOS_FLOAT_r22 821 -#define _GUARD_NOS_FLOAT_r33 822 -#define _GUARD_NOS_INT_r02 823 -#define _GUARD_NOS_INT_r12 824 -#define _GUARD_NOS_INT_r22 825 -#define _GUARD_NOS_INT_r33 826 -#define _GUARD_NOS_LIST_r02 827 -#define _GUARD_NOS_LIST_r12 828 -#define _GUARD_NOS_LIST_r22 829 -#define _GUARD_NOS_LIST_r33 830 -#define _GUARD_NOS_NOT_NULL_r02 831 -#define _GUARD_NOS_NOT_NULL_r12 832 -#define _GUARD_NOS_NOT_NULL_r22 833 -#define _GUARD_NOS_NOT_NULL_r33 834 -#define _GUARD_NOS_NULL_r02 835 -#define _GUARD_NOS_NULL_r12 836 -#define _GUARD_NOS_NULL_r22 837 -#define _GUARD_NOS_NULL_r33 838 -#define _GUARD_NOS_OVERFLOWED_r02 839 -#define _GUARD_NOS_OVERFLOWED_r12 840 -#define _GUARD_NOS_OVERFLOWED_r22 841 -#define _GUARD_NOS_OVERFLOWED_r33 842 -#define _GUARD_NOS_TUPLE_r02 843 -#define _GUARD_NOS_TUPLE_r12 844 -#define _GUARD_NOS_TUPLE_r22 845 -#define _GUARD_NOS_TUPLE_r33 846 -#define _GUARD_NOS_UNICODE_r02 847 -#define _GUARD_NOS_UNICODE_r12 848 -#define _GUARD_NOS_UNICODE_r22 849 -#define _GUARD_NOS_UNICODE_r33 850 -#define _GUARD_NOT_EXHAUSTED_LIST_r02 851 -#define _GUARD_NOT_EXHAUSTED_LIST_r12 852 -#define _GUARD_NOT_EXHAUSTED_LIST_r22 853 -#define _GUARD_NOT_EXHAUSTED_LIST_r33 854 -#define _GUARD_NOT_EXHAUSTED_RANGE_r02 855 -#define _GUARD_NOT_EXHAUSTED_RANGE_r12 856 -#define _GUARD_NOT_EXHAUSTED_RANGE_r22 857 -#define _GUARD_NOT_EXHAUSTED_RANGE_r33 858 -#define _GUARD_NOT_EXHAUSTED_TUPLE_r02 859 -#define _GUARD_NOT_EXHAUSTED_TUPLE_r12 860 -#define _GUARD_NOT_EXHAUSTED_TUPLE_r22 861 -#define _GUARD_NOT_EXHAUSTED_TUPLE_r33 862 -#define _GUARD_THIRD_NULL_r03 863 -#define _GUARD_THIRD_NULL_r13 864 -#define _GUARD_THIRD_NULL_r23 865 -#define _GUARD_THIRD_NULL_r33 866 -#define _GUARD_TOS_ANY_SET_r01 867 -#define _GUARD_TOS_ANY_SET_r11 868 -#define _GUARD_TOS_ANY_SET_r22 869 -#define _GUARD_TOS_ANY_SET_r33 870 -#define _GUARD_TOS_DICT_r01 871 -#define _GUARD_TOS_DICT_r11 872 -#define _GUARD_TOS_DICT_r22 873 -#define _GUARD_TOS_DICT_r33 874 -#define _GUARD_TOS_FLOAT_r01 875 -#define _GUARD_TOS_FLOAT_r11 876 -#define _GUARD_TOS_FLOAT_r22 877 -#define _GUARD_TOS_FLOAT_r33 878 -#define _GUARD_TOS_INT_r01 879 -#define _GUARD_TOS_INT_r11 880 -#define _GUARD_TOS_INT_r22 881 -#define _GUARD_TOS_INT_r33 882 -#define _GUARD_TOS_LIST_r01 883 -#define _GUARD_TOS_LIST_r11 884 -#define _GUARD_TOS_LIST_r22 885 -#define _GUARD_TOS_LIST_r33 886 -#define _GUARD_TOS_OVERFLOWED_r01 887 -#define _GUARD_TOS_OVERFLOWED_r11 888 -#define _GUARD_TOS_OVERFLOWED_r22 889 -#define _GUARD_TOS_OVERFLOWED_r33 890 -#define _GUARD_TOS_SLICE_r01 891 -#define _GUARD_TOS_SLICE_r11 892 -#define _GUARD_TOS_SLICE_r22 893 -#define _GUARD_TOS_SLICE_r33 894 -#define _GUARD_TOS_TUPLE_r01 895 -#define _GUARD_TOS_TUPLE_r11 896 -#define _GUARD_TOS_TUPLE_r22 897 -#define _GUARD_TOS_TUPLE_r33 898 -#define _GUARD_TOS_UNICODE_r01 899 -#define _GUARD_TOS_UNICODE_r11 900 -#define _GUARD_TOS_UNICODE_r22 901 -#define _GUARD_TOS_UNICODE_r33 902 -#define _GUARD_TYPE_VERSION_r01 903 -#define _GUARD_TYPE_VERSION_r11 904 -#define _GUARD_TYPE_VERSION_r22 905 -#define _GUARD_TYPE_VERSION_r33 906 -#define _GUARD_TYPE_VERSION_AND_LOCK_r01 907 -#define _GUARD_TYPE_VERSION_AND_LOCK_r11 908 -#define _GUARD_TYPE_VERSION_AND_LOCK_r22 909 -#define _GUARD_TYPE_VERSION_AND_LOCK_r33 910 -#define _HANDLE_PENDING_AND_DEOPT_r00 911 -#define _HANDLE_PENDING_AND_DEOPT_r10 912 -#define _HANDLE_PENDING_AND_DEOPT_r20 913 -#define _HANDLE_PENDING_AND_DEOPT_r30 914 -#define _IMPORT_FROM_r12 915 -#define _IMPORT_NAME_r21 916 -#define _INIT_CALL_BOUND_METHOD_EXACT_ARGS_r00 917 -#define _INIT_CALL_PY_EXACT_ARGS_r01 918 -#define _INIT_CALL_PY_EXACT_ARGS_0_r01 919 -#define _INIT_CALL_PY_EXACT_ARGS_1_r01 920 -#define _INIT_CALL_PY_EXACT_ARGS_2_r01 921 -#define _INIT_CALL_PY_EXACT_ARGS_3_r01 922 -#define _INIT_CALL_PY_EXACT_ARGS_4_r01 923 -#define _INSERT_NULL_r10 924 -#define _INSTRUMENTED_FOR_ITER_r23 925 -#define _INSTRUMENTED_INSTRUCTION_r00 926 -#define _INSTRUMENTED_JUMP_FORWARD_r00 927 -#define _INSTRUMENTED_JUMP_FORWARD_r11 928 -#define _INSTRUMENTED_JUMP_FORWARD_r22 929 -#define _INSTRUMENTED_JUMP_FORWARD_r33 930 -#define _INSTRUMENTED_LINE_r00 931 -#define _INSTRUMENTED_NOT_TAKEN_r00 932 -#define _INSTRUMENTED_NOT_TAKEN_r11 933 -#define _INSTRUMENTED_NOT_TAKEN_r22 934 -#define _INSTRUMENTED_NOT_TAKEN_r33 935 -#define _INSTRUMENTED_POP_JUMP_IF_FALSE_r00 936 -#define _INSTRUMENTED_POP_JUMP_IF_FALSE_r10 937 -#define _INSTRUMENTED_POP_JUMP_IF_FALSE_r21 938 -#define _INSTRUMENTED_POP_JUMP_IF_FALSE_r32 939 -#define _INSTRUMENTED_POP_JUMP_IF_NONE_r10 940 -#define _INSTRUMENTED_POP_JUMP_IF_NOT_NONE_r10 941 -#define _INSTRUMENTED_POP_JUMP_IF_TRUE_r00 942 -#define _INSTRUMENTED_POP_JUMP_IF_TRUE_r10 943 -#define _INSTRUMENTED_POP_JUMP_IF_TRUE_r21 944 -#define _INSTRUMENTED_POP_JUMP_IF_TRUE_r32 945 -#define _IS_NONE_r11 946 -#define _IS_OP_r21 947 -#define _ITER_CHECK_LIST_r02 948 -#define _ITER_CHECK_LIST_r12 949 -#define _ITER_CHECK_LIST_r22 950 -#define _ITER_CHECK_LIST_r33 951 -#define _ITER_CHECK_RANGE_r02 952 -#define _ITER_CHECK_RANGE_r12 953 -#define _ITER_CHECK_RANGE_r22 954 -#define _ITER_CHECK_RANGE_r33 955 -#define _ITER_CHECK_TUPLE_r02 956 -#define _ITER_CHECK_TUPLE_r12 957 -#define _ITER_CHECK_TUPLE_r22 958 -#define _ITER_CHECK_TUPLE_r33 959 -#define _ITER_JUMP_LIST_r02 960 -#define _ITER_JUMP_LIST_r12 961 -#define _ITER_JUMP_LIST_r22 962 -#define _ITER_JUMP_LIST_r33 963 -#define _ITER_JUMP_RANGE_r02 964 -#define _ITER_JUMP_RANGE_r12 965 -#define _ITER_JUMP_RANGE_r22 966 -#define _ITER_JUMP_RANGE_r33 967 -#define _ITER_JUMP_TUPLE_r02 968 -#define _ITER_JUMP_TUPLE_r12 969 -#define _ITER_JUMP_TUPLE_r22 970 -#define _ITER_JUMP_TUPLE_r33 971 -#define _ITER_NEXT_LIST_r23 972 -#define _ITER_NEXT_LIST_TIER_TWO_r23 973 -#define _ITER_NEXT_RANGE_r03 974 -#define _ITER_NEXT_RANGE_r13 975 -#define _ITER_NEXT_RANGE_r23 976 -#define _ITER_NEXT_TUPLE_r03 977 -#define _ITER_NEXT_TUPLE_r13 978 -#define _ITER_NEXT_TUPLE_r23 979 -#define _JUMP_BACKWARD_NO_INTERRUPT_r00 980 -#define _JUMP_BACKWARD_NO_INTERRUPT_r11 981 -#define _JUMP_BACKWARD_NO_INTERRUPT_r22 982 -#define _JUMP_BACKWARD_NO_INTERRUPT_r33 983 -#define _JUMP_TO_TOP_r00 984 -#define _LIST_APPEND_r10 985 -#define _LIST_EXTEND_r10 986 -#define _LOAD_ATTR_r10 987 -#define _LOAD_ATTR_CLASS_r11 988 -#define _LOAD_ATTR_GETATTRIBUTE_OVERRIDDEN_r11 989 -#define _LOAD_ATTR_INSTANCE_VALUE_r02 990 -#define _LOAD_ATTR_INSTANCE_VALUE_r12 991 -#define _LOAD_ATTR_INSTANCE_VALUE_r23 992 -#define _LOAD_ATTR_METHOD_LAZY_DICT_r02 993 -#define _LOAD_ATTR_METHOD_LAZY_DICT_r12 994 -#define _LOAD_ATTR_METHOD_LAZY_DICT_r23 995 -#define _LOAD_ATTR_METHOD_NO_DICT_r02 996 -#define _LOAD_ATTR_METHOD_NO_DICT_r12 997 -#define _LOAD_ATTR_METHOD_NO_DICT_r23 998 -#define _LOAD_ATTR_METHOD_WITH_VALUES_r02 999 -#define _LOAD_ATTR_METHOD_WITH_VALUES_r12 1000 -#define _LOAD_ATTR_METHOD_WITH_VALUES_r23 1001 -#define _LOAD_ATTR_MODULE_r11 1002 -#define _LOAD_ATTR_NONDESCRIPTOR_NO_DICT_r11 1003 -#define _LOAD_ATTR_NONDESCRIPTOR_WITH_VALUES_r11 1004 -#define _LOAD_ATTR_PROPERTY_FRAME_r11 1005 -#define _LOAD_ATTR_SLOT_r11 1006 -#define _LOAD_ATTR_WITH_HINT_r12 1007 -#define _LOAD_BUILD_CLASS_r01 1008 -#define _LOAD_BYTECODE_r00 1009 -#define _LOAD_COMMON_CONSTANT_r01 1010 -#define _LOAD_COMMON_CONSTANT_r12 1011 -#define _LOAD_COMMON_CONSTANT_r23 1012 -#define _LOAD_CONST_r01 1013 -#define _LOAD_CONST_r12 1014 -#define _LOAD_CONST_r23 1015 -#define _LOAD_CONST_INLINE_r01 1016 -#define _LOAD_CONST_INLINE_r12 1017 -#define _LOAD_CONST_INLINE_r23 1018 -#define _LOAD_CONST_INLINE_BORROW_r01 1019 -#define _LOAD_CONST_INLINE_BORROW_r12 1020 -#define _LOAD_CONST_INLINE_BORROW_r23 1021 -#define _LOAD_CONST_UNDER_INLINE_r02 1022 -#define _LOAD_CONST_UNDER_INLINE_r12 1023 -#define _LOAD_CONST_UNDER_INLINE_r23 1024 -#define _LOAD_CONST_UNDER_INLINE_BORROW_r02 1025 -#define _LOAD_CONST_UNDER_INLINE_BORROW_r12 1026 -#define _LOAD_CONST_UNDER_INLINE_BORROW_r23 1027 -#define _LOAD_DEREF_r01 1028 -#define _LOAD_FAST_r01 1029 -#define _LOAD_FAST_r12 1030 -#define _LOAD_FAST_r23 1031 -#define _LOAD_FAST_0_r01 1032 -#define _LOAD_FAST_0_r12 1033 -#define _LOAD_FAST_0_r23 1034 -#define _LOAD_FAST_1_r01 1035 -#define _LOAD_FAST_1_r12 1036 -#define _LOAD_FAST_1_r23 1037 -#define _LOAD_FAST_2_r01 1038 -#define _LOAD_FAST_2_r12 1039 -#define _LOAD_FAST_2_r23 1040 -#define _LOAD_FAST_3_r01 1041 -#define _LOAD_FAST_3_r12 1042 -#define _LOAD_FAST_3_r23 1043 -#define _LOAD_FAST_4_r01 1044 -#define _LOAD_FAST_4_r12 1045 -#define _LOAD_FAST_4_r23 1046 -#define _LOAD_FAST_5_r01 1047 -#define _LOAD_FAST_5_r12 1048 -#define _LOAD_FAST_5_r23 1049 -#define _LOAD_FAST_6_r01 1050 -#define _LOAD_FAST_6_r12 1051 -#define _LOAD_FAST_6_r23 1052 -#define _LOAD_FAST_7_r01 1053 -#define _LOAD_FAST_7_r12 1054 -#define _LOAD_FAST_7_r23 1055 -#define _LOAD_FAST_AND_CLEAR_r01 1056 -#define _LOAD_FAST_AND_CLEAR_r12 1057 -#define _LOAD_FAST_AND_CLEAR_r23 1058 -#define _LOAD_FAST_BORROW_r01 1059 -#define _LOAD_FAST_BORROW_r12 1060 -#define _LOAD_FAST_BORROW_r23 1061 -#define _LOAD_FAST_BORROW_0_r01 1062 -#define _LOAD_FAST_BORROW_0_r12 1063 -#define _LOAD_FAST_BORROW_0_r23 1064 -#define _LOAD_FAST_BORROW_1_r01 1065 -#define _LOAD_FAST_BORROW_1_r12 1066 -#define _LOAD_FAST_BORROW_1_r23 1067 -#define _LOAD_FAST_BORROW_2_r01 1068 -#define _LOAD_FAST_BORROW_2_r12 1069 -#define _LOAD_FAST_BORROW_2_r23 1070 -#define _LOAD_FAST_BORROW_3_r01 1071 -#define _LOAD_FAST_BORROW_3_r12 1072 -#define _LOAD_FAST_BORROW_3_r23 1073 -#define _LOAD_FAST_BORROW_4_r01 1074 -#define _LOAD_FAST_BORROW_4_r12 1075 -#define _LOAD_FAST_BORROW_4_r23 1076 -#define _LOAD_FAST_BORROW_5_r01 1077 -#define _LOAD_FAST_BORROW_5_r12 1078 -#define _LOAD_FAST_BORROW_5_r23 1079 -#define _LOAD_FAST_BORROW_6_r01 1080 -#define _LOAD_FAST_BORROW_6_r12 1081 -#define _LOAD_FAST_BORROW_6_r23 1082 -#define _LOAD_FAST_BORROW_7_r01 1083 -#define _LOAD_FAST_BORROW_7_r12 1084 -#define _LOAD_FAST_BORROW_7_r23 1085 -#define _LOAD_FAST_BORROW_LOAD_FAST_BORROW_r02 1086 -#define _LOAD_FAST_BORROW_LOAD_FAST_BORROW_r13 1087 -#define _LOAD_FAST_CHECK_r01 1088 -#define _LOAD_FAST_CHECK_r12 1089 -#define _LOAD_FAST_CHECK_r23 1090 -#define _LOAD_FAST_LOAD_FAST_r02 1091 -#define _LOAD_FAST_LOAD_FAST_r13 1092 -#define _LOAD_FROM_DICT_OR_DEREF_r11 1093 -#define _LOAD_FROM_DICT_OR_GLOBALS_r11 1094 -#define _LOAD_GLOBAL_r00 1095 -#define _LOAD_GLOBAL_BUILTINS_r01 1096 -#define _LOAD_GLOBAL_MODULE_r01 1097 -#define _LOAD_LOCALS_r01 1098 -#define _LOAD_LOCALS_r12 1099 -#define _LOAD_LOCALS_r23 1100 -#define _LOAD_NAME_r01 1101 -#define _LOAD_SMALL_INT_r01 1102 -#define _LOAD_SMALL_INT_r12 1103 -#define _LOAD_SMALL_INT_r23 1104 -#define _LOAD_SMALL_INT_0_r01 1105 -#define _LOAD_SMALL_INT_0_r12 1106 -#define _LOAD_SMALL_INT_0_r23 1107 -#define _LOAD_SMALL_INT_1_r01 1108 -#define _LOAD_SMALL_INT_1_r12 1109 -#define _LOAD_SMALL_INT_1_r23 1110 -#define _LOAD_SMALL_INT_2_r01 1111 -#define _LOAD_SMALL_INT_2_r12 1112 -#define _LOAD_SMALL_INT_2_r23 1113 -#define _LOAD_SMALL_INT_3_r01 1114 -#define _LOAD_SMALL_INT_3_r12 1115 -#define _LOAD_SMALL_INT_3_r23 1116 -#define _LOAD_SPECIAL_r00 1117 -#define _LOAD_SUPER_ATTR_ATTR_r31 1118 -#define _LOAD_SUPER_ATTR_METHOD_r32 1119 -#define _MAKE_CALLARGS_A_TUPLE_r33 1120 -#define _MAKE_CELL_r00 1121 -#define _MAKE_FUNCTION_r11 1122 -#define _MAKE_WARM_r00 1123 -#define _MAKE_WARM_r11 1124 -#define _MAKE_WARM_r22 1125 -#define _MAKE_WARM_r33 1126 -#define _MAP_ADD_r20 1127 -#define _MATCH_CLASS_r31 1128 -#define _MATCH_KEYS_r23 1129 -#define _MATCH_MAPPING_r02 1130 -#define _MATCH_MAPPING_r12 1131 -#define _MATCH_MAPPING_r23 1132 -#define _MATCH_SEQUENCE_r02 1133 -#define _MATCH_SEQUENCE_r12 1134 -#define _MATCH_SEQUENCE_r23 1135 -#define _MAYBE_EXPAND_METHOD_r00 1136 -#define _MAYBE_EXPAND_METHOD_KW_r11 1137 -#define _MONITOR_CALL_r00 1138 -#define _MONITOR_CALL_KW_r11 1139 -#define _MONITOR_JUMP_BACKWARD_r00 1140 -#define _MONITOR_JUMP_BACKWARD_r11 1141 -#define _MONITOR_JUMP_BACKWARD_r22 1142 -#define _MONITOR_JUMP_BACKWARD_r33 1143 -#define _MONITOR_RESUME_r00 1144 -#define _NOP_r00 1145 -#define _NOP_r11 1146 -#define _NOP_r22 1147 -#define _NOP_r33 1148 -#define _POP_CALL_r20 1149 -#define _POP_CALL_LOAD_CONST_INLINE_BORROW_r21 1150 -#define _POP_CALL_ONE_r30 1151 -#define _POP_CALL_ONE_LOAD_CONST_INLINE_BORROW_r31 1152 -#define _POP_CALL_TWO_r30 1153 -#define _POP_CALL_TWO_LOAD_CONST_INLINE_BORROW_r31 1154 -#define _POP_EXCEPT_r10 1155 -#define _POP_ITER_r20 1156 -#define _POP_JUMP_IF_FALSE_r00 1157 -#define _POP_JUMP_IF_FALSE_r10 1158 -#define _POP_JUMP_IF_FALSE_r21 1159 -#define _POP_JUMP_IF_FALSE_r32 1160 -#define _POP_JUMP_IF_TRUE_r00 1161 -#define _POP_JUMP_IF_TRUE_r10 1162 -#define _POP_JUMP_IF_TRUE_r21 1163 -#define _POP_JUMP_IF_TRUE_r32 1164 -#define _POP_TOP_r10 1165 -#define _POP_TOP_FLOAT_r00 1166 -#define _POP_TOP_FLOAT_r10 1167 -#define _POP_TOP_FLOAT_r21 1168 -#define _POP_TOP_FLOAT_r32 1169 -#define _POP_TOP_INT_r00 1170 -#define _POP_TOP_INT_r10 1171 -#define _POP_TOP_INT_r21 1172 -#define _POP_TOP_INT_r32 1173 -#define _POP_TOP_LOAD_CONST_INLINE_r11 1174 -#define _POP_TOP_LOAD_CONST_INLINE_BORROW_r11 1175 -#define _POP_TOP_NOP_r00 1176 -#define _POP_TOP_NOP_r10 1177 -#define _POP_TOP_NOP_r21 1178 -#define _POP_TOP_NOP_r32 1179 -#define _POP_TOP_UNICODE_r00 1180 -#define _POP_TOP_UNICODE_r10 1181 -#define _POP_TOP_UNICODE_r21 1182 -#define _POP_TOP_UNICODE_r32 1183 -#define _POP_TWO_r20 1184 -#define _POP_TWO_LOAD_CONST_INLINE_BORROW_r21 1185 -#define _PUSH_EXC_INFO_r02 1186 -#define _PUSH_EXC_INFO_r12 1187 -#define _PUSH_EXC_INFO_r23 1188 -#define _PUSH_FRAME_r10 1189 -#define _PUSH_NULL_r01 1190 -#define _PUSH_NULL_r12 1191 -#define _PUSH_NULL_r23 1192 -#define _PUSH_NULL_CONDITIONAL_r00 1193 -#define _PY_FRAME_GENERAL_r01 1194 -#define _PY_FRAME_KW_r11 1195 -#define _QUICKEN_RESUME_r00 1196 -#define _QUICKEN_RESUME_r11 1197 -#define _QUICKEN_RESUME_r22 1198 -#define _QUICKEN_RESUME_r33 1199 -#define _REPLACE_WITH_TRUE_r11 1200 -#define _RESUME_CHECK_r00 1201 -#define _RESUME_CHECK_r11 1202 -#define _RESUME_CHECK_r22 1203 -#define _RESUME_CHECK_r33 1204 -#define _RETURN_GENERATOR_r01 1205 -#define _RETURN_VALUE_r11 1206 -#define _SAVE_RETURN_OFFSET_r00 1207 -#define _SAVE_RETURN_OFFSET_r11 1208 -#define _SAVE_RETURN_OFFSET_r22 1209 -#define _SAVE_RETURN_OFFSET_r33 1210 -#define _SEND_r22 1211 -#define _SEND_GEN_FRAME_r22 1212 -#define _SETUP_ANNOTATIONS_r00 1213 -#define _SET_ADD_r10 1214 -#define _SET_FUNCTION_ATTRIBUTE_r01 1215 -#define _SET_FUNCTION_ATTRIBUTE_r11 1216 -#define _SET_FUNCTION_ATTRIBUTE_r21 1217 -#define _SET_FUNCTION_ATTRIBUTE_r32 1218 -#define _SET_IP_r00 1219 -#define _SET_IP_r11 1220 -#define _SET_IP_r22 1221 -#define _SET_IP_r33 1222 -#define _SET_UPDATE_r10 1223 -#define _SHUFFLE_2_LOAD_CONST_INLINE_BORROW_r02 1224 -#define _SHUFFLE_2_LOAD_CONST_INLINE_BORROW_r12 1225 -#define _SHUFFLE_2_LOAD_CONST_INLINE_BORROW_r22 1226 -#define _SHUFFLE_2_LOAD_CONST_INLINE_BORROW_r32 1227 -#define _SHUFFLE_3_LOAD_CONST_INLINE_BORROW_r03 1228 -#define _SHUFFLE_3_LOAD_CONST_INLINE_BORROW_r13 1229 -#define _SHUFFLE_3_LOAD_CONST_INLINE_BORROW_r23 1230 -#define _SHUFFLE_3_LOAD_CONST_INLINE_BORROW_r33 1231 -#define _SPILL_OR_RELOAD_r01 1232 -#define _SPILL_OR_RELOAD_r02 1233 -#define _SPILL_OR_RELOAD_r03 1234 -#define _SPILL_OR_RELOAD_r10 1235 -#define _SPILL_OR_RELOAD_r12 1236 -#define _SPILL_OR_RELOAD_r13 1237 -#define _SPILL_OR_RELOAD_r20 1238 -#define _SPILL_OR_RELOAD_r21 1239 -#define _SPILL_OR_RELOAD_r23 1240 -#define _SPILL_OR_RELOAD_r30 1241 -#define _SPILL_OR_RELOAD_r31 1242 -#define _SPILL_OR_RELOAD_r32 1243 -#define _START_EXECUTOR_r00 1244 -#define _STORE_ATTR_r20 1245 -#define _STORE_ATTR_INSTANCE_VALUE_r21 1246 -#define _STORE_ATTR_SLOT_r21 1247 -#define _STORE_ATTR_WITH_HINT_r21 1248 -#define _STORE_DEREF_r10 1249 -#define _STORE_FAST_r10 1250 -#define _STORE_FAST_0_r10 1251 -#define _STORE_FAST_1_r10 1252 -#define _STORE_FAST_2_r10 1253 -#define _STORE_FAST_3_r10 1254 -#define _STORE_FAST_4_r10 1255 -#define _STORE_FAST_5_r10 1256 -#define _STORE_FAST_6_r10 1257 -#define _STORE_FAST_7_r10 1258 -#define _STORE_FAST_LOAD_FAST_r11 1259 -#define _STORE_FAST_STORE_FAST_r20 1260 -#define _STORE_GLOBAL_r10 1261 -#define _STORE_NAME_r10 1262 -#define _STORE_SLICE_r30 1263 -#define _STORE_SUBSCR_r30 1264 -#define _STORE_SUBSCR_DICT_r31 1265 -#define _STORE_SUBSCR_LIST_INT_r32 1266 -#define _SWAP_r11 1267 -#define _SWAP_2_r02 1268 -#define _SWAP_2_r12 1269 -#define _SWAP_2_r22 1270 -#define _SWAP_2_r33 1271 -#define _SWAP_3_r03 1272 -#define _SWAP_3_r13 1273 -#define _SWAP_3_r23 1274 -#define _SWAP_3_r33 1275 -#define _TIER2_RESUME_CHECK_r00 1276 -#define _TIER2_RESUME_CHECK_r11 1277 -#define _TIER2_RESUME_CHECK_r22 1278 -#define _TIER2_RESUME_CHECK_r33 1279 -#define _TO_BOOL_r11 1280 -#define _TO_BOOL_BOOL_r01 1281 -#define _TO_BOOL_BOOL_r11 1282 -#define _TO_BOOL_BOOL_r22 1283 -#define _TO_BOOL_BOOL_r33 1284 -#define _TO_BOOL_INT_r11 1285 -#define _TO_BOOL_LIST_r11 1286 -#define _TO_BOOL_NONE_r01 1287 -#define _TO_BOOL_NONE_r11 1288 -#define _TO_BOOL_NONE_r22 1289 -#define _TO_BOOL_NONE_r33 1290 -#define _TO_BOOL_STR_r11 1291 -#define _TRACE_RECORD_r00 1292 -#define _UNARY_INVERT_r11 1293 -#define _UNARY_NEGATIVE_r11 1294 -#define _UNARY_NOT_r01 1295 -#define _UNARY_NOT_r11 1296 -#define _UNARY_NOT_r22 1297 -#define _UNARY_NOT_r33 1298 -#define _UNPACK_EX_r10 1299 -#define _UNPACK_SEQUENCE_r10 1300 -#define _UNPACK_SEQUENCE_LIST_r10 1301 -#define _UNPACK_SEQUENCE_TUPLE_r10 1302 -#define _UNPACK_SEQUENCE_TWO_TUPLE_r12 1303 -#define _WITH_EXCEPT_START_r33 1304 -#define _YIELD_VALUE_r11 1305 -#define MAX_UOP_REGS_ID 1305 +#define _COMPARE_OP_FLOAT_r03 673 +#define _COMPARE_OP_FLOAT_r13 674 +#define _COMPARE_OP_FLOAT_r23 675 +#define _COMPARE_OP_INT_r23 676 +#define _COMPARE_OP_STR_r23 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_r03 734 +#define _FOR_ITER_GEN_FRAME_r13 735 +#define _FOR_ITER_GEN_FRAME_r23 736 +#define _FOR_ITER_TIER_TWO_r23 737 +#define _GET_AITER_r11 738 +#define _GET_ANEXT_r12 739 +#define _GET_AWAITABLE_r11 740 +#define _GET_ITER_r12 741 +#define _GET_LEN_r12 742 +#define _GET_YIELD_FROM_ITER_r11 743 +#define _GUARD_BINARY_OP_EXTEND_r22 744 +#define _GUARD_CALLABLE_ISINSTANCE_r03 745 +#define _GUARD_CALLABLE_ISINSTANCE_r13 746 +#define _GUARD_CALLABLE_ISINSTANCE_r23 747 +#define _GUARD_CALLABLE_ISINSTANCE_r33 748 +#define _GUARD_CALLABLE_LEN_r03 749 +#define _GUARD_CALLABLE_LEN_r13 750 +#define _GUARD_CALLABLE_LEN_r23 751 +#define _GUARD_CALLABLE_LEN_r33 752 +#define _GUARD_CALLABLE_LIST_APPEND_r03 753 +#define _GUARD_CALLABLE_LIST_APPEND_r13 754 +#define _GUARD_CALLABLE_LIST_APPEND_r23 755 +#define _GUARD_CALLABLE_LIST_APPEND_r33 756 +#define _GUARD_CALLABLE_STR_1_r03 757 +#define _GUARD_CALLABLE_STR_1_r13 758 +#define _GUARD_CALLABLE_STR_1_r23 759 +#define _GUARD_CALLABLE_STR_1_r33 760 +#define _GUARD_CALLABLE_TUPLE_1_r03 761 +#define _GUARD_CALLABLE_TUPLE_1_r13 762 +#define _GUARD_CALLABLE_TUPLE_1_r23 763 +#define _GUARD_CALLABLE_TUPLE_1_r33 764 +#define _GUARD_CALLABLE_TYPE_1_r03 765 +#define _GUARD_CALLABLE_TYPE_1_r13 766 +#define _GUARD_CALLABLE_TYPE_1_r23 767 +#define _GUARD_CALLABLE_TYPE_1_r33 768 +#define _GUARD_DORV_NO_DICT_r01 769 +#define _GUARD_DORV_NO_DICT_r11 770 +#define _GUARD_DORV_NO_DICT_r22 771 +#define _GUARD_DORV_NO_DICT_r33 772 +#define _GUARD_DORV_VALUES_INST_ATTR_FROM_DICT_r01 773 +#define _GUARD_DORV_VALUES_INST_ATTR_FROM_DICT_r11 774 +#define _GUARD_DORV_VALUES_INST_ATTR_FROM_DICT_r22 775 +#define _GUARD_DORV_VALUES_INST_ATTR_FROM_DICT_r33 776 +#define _GUARD_GLOBALS_VERSION_r00 777 +#define _GUARD_GLOBALS_VERSION_r11 778 +#define _GUARD_GLOBALS_VERSION_r22 779 +#define _GUARD_GLOBALS_VERSION_r33 780 +#define _GUARD_IP_RETURN_GENERATOR_r00 781 +#define _GUARD_IP_RETURN_GENERATOR_r11 782 +#define _GUARD_IP_RETURN_GENERATOR_r22 783 +#define _GUARD_IP_RETURN_GENERATOR_r33 784 +#define _GUARD_IP_RETURN_VALUE_r00 785 +#define _GUARD_IP_RETURN_VALUE_r11 786 +#define _GUARD_IP_RETURN_VALUE_r22 787 +#define _GUARD_IP_RETURN_VALUE_r33 788 +#define _GUARD_IP_YIELD_VALUE_r00 789 +#define _GUARD_IP_YIELD_VALUE_r11 790 +#define _GUARD_IP_YIELD_VALUE_r22 791 +#define _GUARD_IP_YIELD_VALUE_r33 792 +#define _GUARD_IP__PUSH_FRAME_r00 793 +#define _GUARD_IP__PUSH_FRAME_r11 794 +#define _GUARD_IP__PUSH_FRAME_r22 795 +#define _GUARD_IP__PUSH_FRAME_r33 796 +#define _GUARD_IS_FALSE_POP_r00 797 +#define _GUARD_IS_FALSE_POP_r10 798 +#define _GUARD_IS_FALSE_POP_r21 799 +#define _GUARD_IS_FALSE_POP_r32 800 +#define _GUARD_IS_NONE_POP_r00 801 +#define _GUARD_IS_NONE_POP_r10 802 +#define _GUARD_IS_NONE_POP_r21 803 +#define _GUARD_IS_NONE_POP_r32 804 +#define _GUARD_IS_NOT_NONE_POP_r10 805 +#define _GUARD_IS_TRUE_POP_r00 806 +#define _GUARD_IS_TRUE_POP_r10 807 +#define _GUARD_IS_TRUE_POP_r21 808 +#define _GUARD_IS_TRUE_POP_r32 809 +#define _GUARD_KEYS_VERSION_r01 810 +#define _GUARD_KEYS_VERSION_r11 811 +#define _GUARD_KEYS_VERSION_r22 812 +#define _GUARD_KEYS_VERSION_r33 813 +#define _GUARD_NOS_DICT_r02 814 +#define _GUARD_NOS_DICT_r12 815 +#define _GUARD_NOS_DICT_r22 816 +#define _GUARD_NOS_DICT_r33 817 +#define _GUARD_NOS_FLOAT_r02 818 +#define _GUARD_NOS_FLOAT_r12 819 +#define _GUARD_NOS_FLOAT_r22 820 +#define _GUARD_NOS_FLOAT_r33 821 +#define _GUARD_NOS_INT_r02 822 +#define _GUARD_NOS_INT_r12 823 +#define _GUARD_NOS_INT_r22 824 +#define _GUARD_NOS_INT_r33 825 +#define _GUARD_NOS_LIST_r02 826 +#define _GUARD_NOS_LIST_r12 827 +#define _GUARD_NOS_LIST_r22 828 +#define _GUARD_NOS_LIST_r33 829 +#define _GUARD_NOS_NOT_NULL_r02 830 +#define _GUARD_NOS_NOT_NULL_r12 831 +#define _GUARD_NOS_NOT_NULL_r22 832 +#define _GUARD_NOS_NOT_NULL_r33 833 +#define _GUARD_NOS_NULL_r02 834 +#define _GUARD_NOS_NULL_r12 835 +#define _GUARD_NOS_NULL_r22 836 +#define _GUARD_NOS_NULL_r33 837 +#define _GUARD_NOS_OVERFLOWED_r02 838 +#define _GUARD_NOS_OVERFLOWED_r12 839 +#define _GUARD_NOS_OVERFLOWED_r22 840 +#define _GUARD_NOS_OVERFLOWED_r33 841 +#define _GUARD_NOS_TUPLE_r02 842 +#define _GUARD_NOS_TUPLE_r12 843 +#define _GUARD_NOS_TUPLE_r22 844 +#define _GUARD_NOS_TUPLE_r33 845 +#define _GUARD_NOS_UNICODE_r02 846 +#define _GUARD_NOS_UNICODE_r12 847 +#define _GUARD_NOS_UNICODE_r22 848 +#define _GUARD_NOS_UNICODE_r33 849 +#define _GUARD_NOT_EXHAUSTED_LIST_r02 850 +#define _GUARD_NOT_EXHAUSTED_LIST_r12 851 +#define _GUARD_NOT_EXHAUSTED_LIST_r22 852 +#define _GUARD_NOT_EXHAUSTED_LIST_r33 853 +#define _GUARD_NOT_EXHAUSTED_RANGE_r02 854 +#define _GUARD_NOT_EXHAUSTED_RANGE_r12 855 +#define _GUARD_NOT_EXHAUSTED_RANGE_r22 856 +#define _GUARD_NOT_EXHAUSTED_RANGE_r33 857 +#define _GUARD_NOT_EXHAUSTED_TUPLE_r02 858 +#define _GUARD_NOT_EXHAUSTED_TUPLE_r12 859 +#define _GUARD_NOT_EXHAUSTED_TUPLE_r22 860 +#define _GUARD_NOT_EXHAUSTED_TUPLE_r33 861 +#define _GUARD_THIRD_NULL_r03 862 +#define _GUARD_THIRD_NULL_r13 863 +#define _GUARD_THIRD_NULL_r23 864 +#define _GUARD_THIRD_NULL_r33 865 +#define _GUARD_TOS_ANY_SET_r01 866 +#define _GUARD_TOS_ANY_SET_r11 867 +#define _GUARD_TOS_ANY_SET_r22 868 +#define _GUARD_TOS_ANY_SET_r33 869 +#define _GUARD_TOS_DICT_r01 870 +#define _GUARD_TOS_DICT_r11 871 +#define _GUARD_TOS_DICT_r22 872 +#define _GUARD_TOS_DICT_r33 873 +#define _GUARD_TOS_FLOAT_r01 874 +#define _GUARD_TOS_FLOAT_r11 875 +#define _GUARD_TOS_FLOAT_r22 876 +#define _GUARD_TOS_FLOAT_r33 877 +#define _GUARD_TOS_INT_r01 878 +#define _GUARD_TOS_INT_r11 879 +#define _GUARD_TOS_INT_r22 880 +#define _GUARD_TOS_INT_r33 881 +#define _GUARD_TOS_LIST_r01 882 +#define _GUARD_TOS_LIST_r11 883 +#define _GUARD_TOS_LIST_r22 884 +#define _GUARD_TOS_LIST_r33 885 +#define _GUARD_TOS_OVERFLOWED_r01 886 +#define _GUARD_TOS_OVERFLOWED_r11 887 +#define _GUARD_TOS_OVERFLOWED_r22 888 +#define _GUARD_TOS_OVERFLOWED_r33 889 +#define _GUARD_TOS_SLICE_r01 890 +#define _GUARD_TOS_SLICE_r11 891 +#define _GUARD_TOS_SLICE_r22 892 +#define _GUARD_TOS_SLICE_r33 893 +#define _GUARD_TOS_TUPLE_r01 894 +#define _GUARD_TOS_TUPLE_r11 895 +#define _GUARD_TOS_TUPLE_r22 896 +#define _GUARD_TOS_TUPLE_r33 897 +#define _GUARD_TOS_UNICODE_r01 898 +#define _GUARD_TOS_UNICODE_r11 899 +#define _GUARD_TOS_UNICODE_r22 900 +#define _GUARD_TOS_UNICODE_r33 901 +#define _GUARD_TYPE_VERSION_r01 902 +#define _GUARD_TYPE_VERSION_r11 903 +#define _GUARD_TYPE_VERSION_r22 904 +#define _GUARD_TYPE_VERSION_r33 905 +#define _GUARD_TYPE_VERSION_AND_LOCK_r01 906 +#define _GUARD_TYPE_VERSION_AND_LOCK_r11 907 +#define _GUARD_TYPE_VERSION_AND_LOCK_r22 908 +#define _GUARD_TYPE_VERSION_AND_LOCK_r33 909 +#define _HANDLE_PENDING_AND_DEOPT_r00 910 +#define _HANDLE_PENDING_AND_DEOPT_r10 911 +#define _HANDLE_PENDING_AND_DEOPT_r20 912 +#define _HANDLE_PENDING_AND_DEOPT_r30 913 +#define _IMPORT_FROM_r12 914 +#define _IMPORT_NAME_r21 915 +#define _INIT_CALL_BOUND_METHOD_EXACT_ARGS_r00 916 +#define _INIT_CALL_PY_EXACT_ARGS_r01 917 +#define _INIT_CALL_PY_EXACT_ARGS_0_r01 918 +#define _INIT_CALL_PY_EXACT_ARGS_1_r01 919 +#define _INIT_CALL_PY_EXACT_ARGS_2_r01 920 +#define _INIT_CALL_PY_EXACT_ARGS_3_r01 921 +#define _INIT_CALL_PY_EXACT_ARGS_4_r01 922 +#define _INSERT_NULL_r10 923 +#define _INSTRUMENTED_FOR_ITER_r23 924 +#define _INSTRUMENTED_INSTRUCTION_r00 925 +#define _INSTRUMENTED_JUMP_FORWARD_r00 926 +#define _INSTRUMENTED_JUMP_FORWARD_r11 927 +#define _INSTRUMENTED_JUMP_FORWARD_r22 928 +#define _INSTRUMENTED_JUMP_FORWARD_r33 929 +#define _INSTRUMENTED_LINE_r00 930 +#define _INSTRUMENTED_NOT_TAKEN_r00 931 +#define _INSTRUMENTED_NOT_TAKEN_r11 932 +#define _INSTRUMENTED_NOT_TAKEN_r22 933 +#define _INSTRUMENTED_NOT_TAKEN_r33 934 +#define _INSTRUMENTED_POP_JUMP_IF_FALSE_r00 935 +#define _INSTRUMENTED_POP_JUMP_IF_FALSE_r10 936 +#define _INSTRUMENTED_POP_JUMP_IF_FALSE_r21 937 +#define _INSTRUMENTED_POP_JUMP_IF_FALSE_r32 938 +#define _INSTRUMENTED_POP_JUMP_IF_NONE_r10 939 +#define _INSTRUMENTED_POP_JUMP_IF_NOT_NONE_r10 940 +#define _INSTRUMENTED_POP_JUMP_IF_TRUE_r00 941 +#define _INSTRUMENTED_POP_JUMP_IF_TRUE_r10 942 +#define _INSTRUMENTED_POP_JUMP_IF_TRUE_r21 943 +#define _INSTRUMENTED_POP_JUMP_IF_TRUE_r32 944 +#define _IS_NONE_r11 945 +#define _IS_OP_r21 946 +#define _ITER_CHECK_LIST_r02 947 +#define _ITER_CHECK_LIST_r12 948 +#define _ITER_CHECK_LIST_r22 949 +#define _ITER_CHECK_LIST_r33 950 +#define _ITER_CHECK_RANGE_r02 951 +#define _ITER_CHECK_RANGE_r12 952 +#define _ITER_CHECK_RANGE_r22 953 +#define _ITER_CHECK_RANGE_r33 954 +#define _ITER_CHECK_TUPLE_r02 955 +#define _ITER_CHECK_TUPLE_r12 956 +#define _ITER_CHECK_TUPLE_r22 957 +#define _ITER_CHECK_TUPLE_r33 958 +#define _ITER_JUMP_LIST_r02 959 +#define _ITER_JUMP_LIST_r12 960 +#define _ITER_JUMP_LIST_r22 961 +#define _ITER_JUMP_LIST_r33 962 +#define _ITER_JUMP_RANGE_r02 963 +#define _ITER_JUMP_RANGE_r12 964 +#define _ITER_JUMP_RANGE_r22 965 +#define _ITER_JUMP_RANGE_r33 966 +#define _ITER_JUMP_TUPLE_r02 967 +#define _ITER_JUMP_TUPLE_r12 968 +#define _ITER_JUMP_TUPLE_r22 969 +#define _ITER_JUMP_TUPLE_r33 970 +#define _ITER_NEXT_LIST_r23 971 +#define _ITER_NEXT_LIST_TIER_TWO_r23 972 +#define _ITER_NEXT_RANGE_r03 973 +#define _ITER_NEXT_RANGE_r13 974 +#define _ITER_NEXT_RANGE_r23 975 +#define _ITER_NEXT_TUPLE_r03 976 +#define _ITER_NEXT_TUPLE_r13 977 +#define _ITER_NEXT_TUPLE_r23 978 +#define _JUMP_BACKWARD_NO_INTERRUPT_r00 979 +#define _JUMP_BACKWARD_NO_INTERRUPT_r11 980 +#define _JUMP_BACKWARD_NO_INTERRUPT_r22 981 +#define _JUMP_BACKWARD_NO_INTERRUPT_r33 982 +#define _JUMP_TO_TOP_r00 983 +#define _LIST_APPEND_r10 984 +#define _LIST_EXTEND_r10 985 +#define _LOAD_ATTR_r10 986 +#define _LOAD_ATTR_CLASS_r11 987 +#define _LOAD_ATTR_GETATTRIBUTE_OVERRIDDEN_r11 988 +#define _LOAD_ATTR_INSTANCE_VALUE_r02 989 +#define _LOAD_ATTR_INSTANCE_VALUE_r12 990 +#define _LOAD_ATTR_INSTANCE_VALUE_r23 991 +#define _LOAD_ATTR_METHOD_LAZY_DICT_r02 992 +#define _LOAD_ATTR_METHOD_LAZY_DICT_r12 993 +#define _LOAD_ATTR_METHOD_LAZY_DICT_r23 994 +#define _LOAD_ATTR_METHOD_NO_DICT_r02 995 +#define _LOAD_ATTR_METHOD_NO_DICT_r12 996 +#define _LOAD_ATTR_METHOD_NO_DICT_r23 997 +#define _LOAD_ATTR_METHOD_WITH_VALUES_r02 998 +#define _LOAD_ATTR_METHOD_WITH_VALUES_r12 999 +#define _LOAD_ATTR_METHOD_WITH_VALUES_r23 1000 +#define _LOAD_ATTR_MODULE_r11 1001 +#define _LOAD_ATTR_NONDESCRIPTOR_NO_DICT_r11 1002 +#define _LOAD_ATTR_NONDESCRIPTOR_WITH_VALUES_r11 1003 +#define _LOAD_ATTR_PROPERTY_FRAME_r11 1004 +#define _LOAD_ATTR_SLOT_r11 1005 +#define _LOAD_ATTR_WITH_HINT_r12 1006 +#define _LOAD_BUILD_CLASS_r01 1007 +#define _LOAD_BYTECODE_r00 1008 +#define _LOAD_COMMON_CONSTANT_r01 1009 +#define _LOAD_COMMON_CONSTANT_r12 1010 +#define _LOAD_COMMON_CONSTANT_r23 1011 +#define _LOAD_CONST_r01 1012 +#define _LOAD_CONST_r12 1013 +#define _LOAD_CONST_r23 1014 +#define _LOAD_CONST_INLINE_r01 1015 +#define _LOAD_CONST_INLINE_r12 1016 +#define _LOAD_CONST_INLINE_r23 1017 +#define _LOAD_CONST_INLINE_BORROW_r01 1018 +#define _LOAD_CONST_INLINE_BORROW_r12 1019 +#define _LOAD_CONST_INLINE_BORROW_r23 1020 +#define _LOAD_CONST_UNDER_INLINE_r02 1021 +#define _LOAD_CONST_UNDER_INLINE_r12 1022 +#define _LOAD_CONST_UNDER_INLINE_r23 1023 +#define _LOAD_CONST_UNDER_INLINE_BORROW_r02 1024 +#define _LOAD_CONST_UNDER_INLINE_BORROW_r12 1025 +#define _LOAD_CONST_UNDER_INLINE_BORROW_r23 1026 +#define _LOAD_DEREF_r01 1027 +#define _LOAD_FAST_r01 1028 +#define _LOAD_FAST_r12 1029 +#define _LOAD_FAST_r23 1030 +#define _LOAD_FAST_0_r01 1031 +#define _LOAD_FAST_0_r12 1032 +#define _LOAD_FAST_0_r23 1033 +#define _LOAD_FAST_1_r01 1034 +#define _LOAD_FAST_1_r12 1035 +#define _LOAD_FAST_1_r23 1036 +#define _LOAD_FAST_2_r01 1037 +#define _LOAD_FAST_2_r12 1038 +#define _LOAD_FAST_2_r23 1039 +#define _LOAD_FAST_3_r01 1040 +#define _LOAD_FAST_3_r12 1041 +#define _LOAD_FAST_3_r23 1042 +#define _LOAD_FAST_4_r01 1043 +#define _LOAD_FAST_4_r12 1044 +#define _LOAD_FAST_4_r23 1045 +#define _LOAD_FAST_5_r01 1046 +#define _LOAD_FAST_5_r12 1047 +#define _LOAD_FAST_5_r23 1048 +#define _LOAD_FAST_6_r01 1049 +#define _LOAD_FAST_6_r12 1050 +#define _LOAD_FAST_6_r23 1051 +#define _LOAD_FAST_7_r01 1052 +#define _LOAD_FAST_7_r12 1053 +#define _LOAD_FAST_7_r23 1054 +#define _LOAD_FAST_AND_CLEAR_r01 1055 +#define _LOAD_FAST_AND_CLEAR_r12 1056 +#define _LOAD_FAST_AND_CLEAR_r23 1057 +#define _LOAD_FAST_BORROW_r01 1058 +#define _LOAD_FAST_BORROW_r12 1059 +#define _LOAD_FAST_BORROW_r23 1060 +#define _LOAD_FAST_BORROW_0_r01 1061 +#define _LOAD_FAST_BORROW_0_r12 1062 +#define _LOAD_FAST_BORROW_0_r23 1063 +#define _LOAD_FAST_BORROW_1_r01 1064 +#define _LOAD_FAST_BORROW_1_r12 1065 +#define _LOAD_FAST_BORROW_1_r23 1066 +#define _LOAD_FAST_BORROW_2_r01 1067 +#define _LOAD_FAST_BORROW_2_r12 1068 +#define _LOAD_FAST_BORROW_2_r23 1069 +#define _LOAD_FAST_BORROW_3_r01 1070 +#define _LOAD_FAST_BORROW_3_r12 1071 +#define _LOAD_FAST_BORROW_3_r23 1072 +#define _LOAD_FAST_BORROW_4_r01 1073 +#define _LOAD_FAST_BORROW_4_r12 1074 +#define _LOAD_FAST_BORROW_4_r23 1075 +#define _LOAD_FAST_BORROW_5_r01 1076 +#define _LOAD_FAST_BORROW_5_r12 1077 +#define _LOAD_FAST_BORROW_5_r23 1078 +#define _LOAD_FAST_BORROW_6_r01 1079 +#define _LOAD_FAST_BORROW_6_r12 1080 +#define _LOAD_FAST_BORROW_6_r23 1081 +#define _LOAD_FAST_BORROW_7_r01 1082 +#define _LOAD_FAST_BORROW_7_r12 1083 +#define _LOAD_FAST_BORROW_7_r23 1084 +#define _LOAD_FAST_BORROW_LOAD_FAST_BORROW_r02 1085 +#define _LOAD_FAST_BORROW_LOAD_FAST_BORROW_r13 1086 +#define _LOAD_FAST_CHECK_r01 1087 +#define _LOAD_FAST_CHECK_r12 1088 +#define _LOAD_FAST_CHECK_r23 1089 +#define _LOAD_FAST_LOAD_FAST_r02 1090 +#define _LOAD_FAST_LOAD_FAST_r13 1091 +#define _LOAD_FROM_DICT_OR_DEREF_r11 1092 +#define _LOAD_FROM_DICT_OR_GLOBALS_r11 1093 +#define _LOAD_GLOBAL_r00 1094 +#define _LOAD_GLOBAL_BUILTINS_r01 1095 +#define _LOAD_GLOBAL_MODULE_r01 1096 +#define _LOAD_LOCALS_r01 1097 +#define _LOAD_LOCALS_r12 1098 +#define _LOAD_LOCALS_r23 1099 +#define _LOAD_NAME_r01 1100 +#define _LOAD_SMALL_INT_r01 1101 +#define _LOAD_SMALL_INT_r12 1102 +#define _LOAD_SMALL_INT_r23 1103 +#define _LOAD_SMALL_INT_0_r01 1104 +#define _LOAD_SMALL_INT_0_r12 1105 +#define _LOAD_SMALL_INT_0_r23 1106 +#define _LOAD_SMALL_INT_1_r01 1107 +#define _LOAD_SMALL_INT_1_r12 1108 +#define _LOAD_SMALL_INT_1_r23 1109 +#define _LOAD_SMALL_INT_2_r01 1110 +#define _LOAD_SMALL_INT_2_r12 1111 +#define _LOAD_SMALL_INT_2_r23 1112 +#define _LOAD_SMALL_INT_3_r01 1113 +#define _LOAD_SMALL_INT_3_r12 1114 +#define _LOAD_SMALL_INT_3_r23 1115 +#define _LOAD_SPECIAL_r00 1116 +#define _LOAD_SUPER_ATTR_ATTR_r31 1117 +#define _LOAD_SUPER_ATTR_METHOD_r32 1118 +#define _MAKE_CALLARGS_A_TUPLE_r33 1119 +#define _MAKE_CELL_r00 1120 +#define _MAKE_FUNCTION_r11 1121 +#define _MAKE_WARM_r00 1122 +#define _MAKE_WARM_r11 1123 +#define _MAKE_WARM_r22 1124 +#define _MAKE_WARM_r33 1125 +#define _MAP_ADD_r20 1126 +#define _MATCH_CLASS_r31 1127 +#define _MATCH_KEYS_r23 1128 +#define _MATCH_MAPPING_r02 1129 +#define _MATCH_MAPPING_r12 1130 +#define _MATCH_MAPPING_r23 1131 +#define _MATCH_SEQUENCE_r02 1132 +#define _MATCH_SEQUENCE_r12 1133 +#define _MATCH_SEQUENCE_r23 1134 +#define _MAYBE_EXPAND_METHOD_r00 1135 +#define _MAYBE_EXPAND_METHOD_KW_r11 1136 +#define _MONITOR_CALL_r00 1137 +#define _MONITOR_CALL_KW_r11 1138 +#define _MONITOR_JUMP_BACKWARD_r00 1139 +#define _MONITOR_JUMP_BACKWARD_r11 1140 +#define _MONITOR_JUMP_BACKWARD_r22 1141 +#define _MONITOR_JUMP_BACKWARD_r33 1142 +#define _MONITOR_RESUME_r00 1143 +#define _NOP_r00 1144 +#define _NOP_r11 1145 +#define _NOP_r22 1146 +#define _NOP_r33 1147 +#define _POP_CALL_r20 1148 +#define _POP_CALL_LOAD_CONST_INLINE_BORROW_r21 1149 +#define _POP_CALL_ONE_r30 1150 +#define _POP_CALL_ONE_LOAD_CONST_INLINE_BORROW_r31 1151 +#define _POP_CALL_TWO_r30 1152 +#define _POP_CALL_TWO_LOAD_CONST_INLINE_BORROW_r31 1153 +#define _POP_EXCEPT_r10 1154 +#define _POP_ITER_r20 1155 +#define _POP_JUMP_IF_FALSE_r00 1156 +#define _POP_JUMP_IF_FALSE_r10 1157 +#define _POP_JUMP_IF_FALSE_r21 1158 +#define _POP_JUMP_IF_FALSE_r32 1159 +#define _POP_JUMP_IF_TRUE_r00 1160 +#define _POP_JUMP_IF_TRUE_r10 1161 +#define _POP_JUMP_IF_TRUE_r21 1162 +#define _POP_JUMP_IF_TRUE_r32 1163 +#define _POP_TOP_r10 1164 +#define _POP_TOP_FLOAT_r00 1165 +#define _POP_TOP_FLOAT_r10 1166 +#define _POP_TOP_FLOAT_r21 1167 +#define _POP_TOP_FLOAT_r32 1168 +#define _POP_TOP_INT_r00 1169 +#define _POP_TOP_INT_r10 1170 +#define _POP_TOP_INT_r21 1171 +#define _POP_TOP_INT_r32 1172 +#define _POP_TOP_LOAD_CONST_INLINE_r11 1173 +#define _POP_TOP_LOAD_CONST_INLINE_BORROW_r11 1174 +#define _POP_TOP_NOP_r00 1175 +#define _POP_TOP_NOP_r10 1176 +#define _POP_TOP_NOP_r21 1177 +#define _POP_TOP_NOP_r32 1178 +#define _POP_TOP_UNICODE_r00 1179 +#define _POP_TOP_UNICODE_r10 1180 +#define _POP_TOP_UNICODE_r21 1181 +#define _POP_TOP_UNICODE_r32 1182 +#define _POP_TWO_r20 1183 +#define _POP_TWO_LOAD_CONST_INLINE_BORROW_r21 1184 +#define _PUSH_EXC_INFO_r02 1185 +#define _PUSH_EXC_INFO_r12 1186 +#define _PUSH_EXC_INFO_r23 1187 +#define _PUSH_FRAME_r10 1188 +#define _PUSH_NULL_r01 1189 +#define _PUSH_NULL_r12 1190 +#define _PUSH_NULL_r23 1191 +#define _PUSH_NULL_CONDITIONAL_r00 1192 +#define _PY_FRAME_GENERAL_r01 1193 +#define _PY_FRAME_KW_r11 1194 +#define _QUICKEN_RESUME_r00 1195 +#define _QUICKEN_RESUME_r11 1196 +#define _QUICKEN_RESUME_r22 1197 +#define _QUICKEN_RESUME_r33 1198 +#define _REPLACE_WITH_TRUE_r11 1199 +#define _RESUME_CHECK_r00 1200 +#define _RESUME_CHECK_r11 1201 +#define _RESUME_CHECK_r22 1202 +#define _RESUME_CHECK_r33 1203 +#define _RETURN_GENERATOR_r01 1204 +#define _RETURN_VALUE_r11 1205 +#define _SAVE_RETURN_OFFSET_r00 1206 +#define _SAVE_RETURN_OFFSET_r11 1207 +#define _SAVE_RETURN_OFFSET_r22 1208 +#define _SAVE_RETURN_OFFSET_r33 1209 +#define _SEND_r22 1210 +#define _SEND_GEN_FRAME_r22 1211 +#define _SETUP_ANNOTATIONS_r00 1212 +#define _SET_ADD_r10 1213 +#define _SET_FUNCTION_ATTRIBUTE_r01 1214 +#define _SET_FUNCTION_ATTRIBUTE_r11 1215 +#define _SET_FUNCTION_ATTRIBUTE_r21 1216 +#define _SET_FUNCTION_ATTRIBUTE_r32 1217 +#define _SET_IP_r00 1218 +#define _SET_IP_r11 1219 +#define _SET_IP_r22 1220 +#define _SET_IP_r33 1221 +#define _SET_UPDATE_r10 1222 +#define _SHUFFLE_2_LOAD_CONST_INLINE_BORROW_r02 1223 +#define _SHUFFLE_2_LOAD_CONST_INLINE_BORROW_r12 1224 +#define _SHUFFLE_2_LOAD_CONST_INLINE_BORROW_r22 1225 +#define _SHUFFLE_2_LOAD_CONST_INLINE_BORROW_r32 1226 +#define _SHUFFLE_3_LOAD_CONST_INLINE_BORROW_r03 1227 +#define _SHUFFLE_3_LOAD_CONST_INLINE_BORROW_r13 1228 +#define _SHUFFLE_3_LOAD_CONST_INLINE_BORROW_r23 1229 +#define _SHUFFLE_3_LOAD_CONST_INLINE_BORROW_r33 1230 +#define _SPILL_OR_RELOAD_r01 1231 +#define _SPILL_OR_RELOAD_r02 1232 +#define _SPILL_OR_RELOAD_r03 1233 +#define _SPILL_OR_RELOAD_r10 1234 +#define _SPILL_OR_RELOAD_r12 1235 +#define _SPILL_OR_RELOAD_r13 1236 +#define _SPILL_OR_RELOAD_r20 1237 +#define _SPILL_OR_RELOAD_r21 1238 +#define _SPILL_OR_RELOAD_r23 1239 +#define _SPILL_OR_RELOAD_r30 1240 +#define _SPILL_OR_RELOAD_r31 1241 +#define _SPILL_OR_RELOAD_r32 1242 +#define _START_EXECUTOR_r00 1243 +#define _STORE_ATTR_r20 1244 +#define _STORE_ATTR_INSTANCE_VALUE_r21 1245 +#define _STORE_ATTR_SLOT_r21 1246 +#define _STORE_ATTR_WITH_HINT_r21 1247 +#define _STORE_DEREF_r10 1248 +#define _STORE_FAST_r10 1249 +#define _STORE_FAST_0_r10 1250 +#define _STORE_FAST_1_r10 1251 +#define _STORE_FAST_2_r10 1252 +#define _STORE_FAST_3_r10 1253 +#define _STORE_FAST_4_r10 1254 +#define _STORE_FAST_5_r10 1255 +#define _STORE_FAST_6_r10 1256 +#define _STORE_FAST_7_r10 1257 +#define _STORE_FAST_LOAD_FAST_r11 1258 +#define _STORE_FAST_STORE_FAST_r20 1259 +#define _STORE_GLOBAL_r10 1260 +#define _STORE_NAME_r10 1261 +#define _STORE_SLICE_r30 1262 +#define _STORE_SUBSCR_r30 1263 +#define _STORE_SUBSCR_DICT_r31 1264 +#define _STORE_SUBSCR_LIST_INT_r32 1265 +#define _SWAP_r11 1266 +#define _SWAP_2_r02 1267 +#define _SWAP_2_r12 1268 +#define _SWAP_2_r22 1269 +#define _SWAP_2_r33 1270 +#define _SWAP_3_r03 1271 +#define _SWAP_3_r13 1272 +#define _SWAP_3_r23 1273 +#define _SWAP_3_r33 1274 +#define _TIER2_RESUME_CHECK_r00 1275 +#define _TIER2_RESUME_CHECK_r11 1276 +#define _TIER2_RESUME_CHECK_r22 1277 +#define _TIER2_RESUME_CHECK_r33 1278 +#define _TO_BOOL_r11 1279 +#define _TO_BOOL_BOOL_r01 1280 +#define _TO_BOOL_BOOL_r11 1281 +#define _TO_BOOL_BOOL_r22 1282 +#define _TO_BOOL_BOOL_r33 1283 +#define _TO_BOOL_INT_r11 1284 +#define _TO_BOOL_LIST_r11 1285 +#define _TO_BOOL_NONE_r01 1286 +#define _TO_BOOL_NONE_r11 1287 +#define _TO_BOOL_NONE_r22 1288 +#define _TO_BOOL_NONE_r33 1289 +#define _TO_BOOL_STR_r11 1290 +#define _TRACE_RECORD_r00 1291 +#define _UNARY_INVERT_r11 1292 +#define _UNARY_NEGATIVE_r11 1293 +#define _UNARY_NOT_r01 1294 +#define _UNARY_NOT_r11 1295 +#define _UNARY_NOT_r22 1296 +#define _UNARY_NOT_r33 1297 +#define _UNPACK_EX_r10 1298 +#define _UNPACK_SEQUENCE_r10 1299 +#define _UNPACK_SEQUENCE_LIST_r10 1300 +#define _UNPACK_SEQUENCE_TUPLE_r10 1301 +#define _UNPACK_SEQUENCE_TWO_TUPLE_r12 1302 +#define _WITH_EXCEPT_START_r33 1303 +#define _YIELD_VALUE_r11 1304 +#define MAX_UOP_REGS_ID 1304 #ifdef __cplusplus } diff --git a/Include/internal/pycore_uop_metadata.h b/Include/internal/pycore_uop_metadata.h index 8b14ca794ce8d5..a61df5642a4d78 100644 --- a/Include/internal/pycore_uop_metadata.h +++ b/Include/internal/pycore_uop_metadata.h @@ -1862,12 +1862,12 @@ const _PyUopCachingInfo _PyUop_Caching[MAX_UOP_ID+1] = { }, }, [_COMPARE_OP_FLOAT] = { - .best = { 0, 1, 2, 3 }, + .best = { 0, 1, 2, 2 }, .entries = { - { 1, 0, _COMPARE_OP_FLOAT_r01 }, - { 1, 1, _COMPARE_OP_FLOAT_r11 }, - { 1, 2, _COMPARE_OP_FLOAT_r21 }, - { 2, 3, _COMPARE_OP_FLOAT_r32 }, + { 3, 0, _COMPARE_OP_FLOAT_r03 }, + { 3, 1, _COMPARE_OP_FLOAT_r13 }, + { 3, 2, _COMPARE_OP_FLOAT_r23 }, + { -1, -1, -1 }, }, }, [_COMPARE_OP_INT] = { @@ -1884,7 +1884,7 @@ const _PyUopCachingInfo _PyUop_Caching[MAX_UOP_ID+1] = { .entries = { { -1, -1, -1 }, { -1, -1, -1 }, - { 1, 2, _COMPARE_OP_STR_r21 }, + { 3, 2, _COMPARE_OP_STR_r23 }, { -1, -1, -1 }, }, }, @@ -3568,12 +3568,11 @@ const uint16_t _PyUop_Uncached[MAX_UOP_REGS_ID+1] = { [_STORE_ATTR_WITH_HINT_r21] = _STORE_ATTR_WITH_HINT, [_STORE_ATTR_SLOT_r21] = _STORE_ATTR_SLOT, [_COMPARE_OP_r21] = _COMPARE_OP, - [_COMPARE_OP_FLOAT_r01] = _COMPARE_OP_FLOAT, - [_COMPARE_OP_FLOAT_r11] = _COMPARE_OP_FLOAT, - [_COMPARE_OP_FLOAT_r21] = _COMPARE_OP_FLOAT, - [_COMPARE_OP_FLOAT_r32] = _COMPARE_OP_FLOAT, + [_COMPARE_OP_FLOAT_r03] = _COMPARE_OP_FLOAT, + [_COMPARE_OP_FLOAT_r13] = _COMPARE_OP_FLOAT, + [_COMPARE_OP_FLOAT_r23] = _COMPARE_OP_FLOAT, [_COMPARE_OP_INT_r23] = _COMPARE_OP_INT, - [_COMPARE_OP_STR_r21] = _COMPARE_OP_STR, + [_COMPARE_OP_STR_r23] = _COMPARE_OP_STR, [_IS_OP_r21] = _IS_OP, [_CONTAINS_OP_r21] = _CONTAINS_OP, [_GUARD_TOS_ANY_SET_r01] = _GUARD_TOS_ANY_SET, @@ -4113,14 +4112,13 @@ const char *const _PyOpcode_uop_name[MAX_UOP_REGS_ID+1] = { [_COMPARE_OP] = "_COMPARE_OP", [_COMPARE_OP_r21] = "_COMPARE_OP_r21", [_COMPARE_OP_FLOAT] = "_COMPARE_OP_FLOAT", - [_COMPARE_OP_FLOAT_r01] = "_COMPARE_OP_FLOAT_r01", - [_COMPARE_OP_FLOAT_r11] = "_COMPARE_OP_FLOAT_r11", - [_COMPARE_OP_FLOAT_r21] = "_COMPARE_OP_FLOAT_r21", - [_COMPARE_OP_FLOAT_r32] = "_COMPARE_OP_FLOAT_r32", + [_COMPARE_OP_FLOAT_r03] = "_COMPARE_OP_FLOAT_r03", + [_COMPARE_OP_FLOAT_r13] = "_COMPARE_OP_FLOAT_r13", + [_COMPARE_OP_FLOAT_r23] = "_COMPARE_OP_FLOAT_r23", [_COMPARE_OP_INT] = "_COMPARE_OP_INT", [_COMPARE_OP_INT_r23] = "_COMPARE_OP_INT_r23", [_COMPARE_OP_STR] = "_COMPARE_OP_STR", - [_COMPARE_OP_STR_r21] = "_COMPARE_OP_STR_r21", + [_COMPARE_OP_STR_r23] = "_COMPARE_OP_STR_r23", [_CONTAINS_OP] = "_CONTAINS_OP", [_CONTAINS_OP_r21] = "_CONTAINS_OP_r21", [_CONTAINS_OP_DICT] = "_CONTAINS_OP_DICT", diff --git a/Lib/test/test_capi/test_opt.py b/Lib/test/test_capi/test_opt.py index 9c9135411f9078..62fa02e10d949b 100644 --- a/Lib/test/test_capi/test_opt.py +++ b/Lib/test/test_capi/test_opt.py @@ -1664,6 +1664,7 @@ def testfunc(n): self.assertNotIn("_COMPARE_OP_INT", 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_str_pop_two_load_const_inline_borrow(self): def testfunc(n): x = 0 @@ -1681,6 +1682,7 @@ def testfunc(n): self.assertNotIn("_COMPARE_OP_STR", 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_float_pop_two_load_const_inline_borrow(self): def testfunc(n): x = 0 @@ -2609,6 +2611,36 @@ def testfunc(n): self.assertIn("_POP_TOP_NOP", uops) self.assertNotIn("_POP_TOP", uops) + def test_float_cmp_op_refcount_elimination(self): + def testfunc(n): + c = 1.0 + res = False + 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_FLOAT", uops) + self.assertIn("_POP_TOP_NOP", uops) + self.assertNotIn("_POP_TOP", uops) + + def test_str_cmp_op_refcount_elimination(self): + def testfunc(n): + c = "a" + res = False + 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_STR", uops) + self.assertIn("_POP_TOP_NOP", uops) + self.assertNotIn("_POP_TOP", uops) + def test_unicode_add_op_refcount_elimination(self): def testfunc(n): c = "a" diff --git a/Python/bytecodes.c b/Python/bytecodes.c index b909ee187950ec..43239b129f1b4b 100644 --- a/Python/bytecodes.c +++ b/Python/bytecodes.c @@ -2713,15 +2713,15 @@ dummy_func( macro(COMPARE_OP) = _SPECIALIZE_COMPARE_OP + _COMPARE_OP; macro(COMPARE_OP_FLOAT) = - _GUARD_TOS_FLOAT + _GUARD_NOS_FLOAT + unused/1 + _COMPARE_OP_FLOAT; + _GUARD_TOS_FLOAT + _GUARD_NOS_FLOAT + unused/1 + _COMPARE_OP_FLOAT + _POP_TOP_FLOAT + _POP_TOP_FLOAT; macro(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; + _GUARD_TOS_UNICODE + _GUARD_NOS_UNICODE + unused/1 + _COMPARE_OP_STR + _POP_TOP_UNICODE + _POP_TOP_UNICODE; - op(_COMPARE_OP_FLOAT, (left, right -- res)) { + op(_COMPARE_OP_FLOAT, (left, right -- res, l, r)) { PyObject *left_o = PyStackRef_AsPyObjectBorrow(left); PyObject *right_o = PyStackRef_AsPyObjectBorrow(right); @@ -2730,9 +2730,9 @@ dummy_func( double dright = PyFloat_AS_DOUBLE(right_o); // 1 if NaN, 2 if <, 4 if >, 8 if ==; this matches low four bits of the oparg int sign_ish = COMPARISON_BIT(dleft, dright); - PyStackRef_CLOSE_SPECIALIZED(left, _PyFloat_ExactDealloc); + l = left; + r = right; DEAD(left); - PyStackRef_CLOSE_SPECIALIZED(right, _PyFloat_ExactDealloc); DEAD(right); res = (sign_ish & oparg) ? PyStackRef_True : PyStackRef_False; // It's always a bool, so we don't care about oparg & 16. @@ -2761,16 +2761,16 @@ dummy_func( } // Similar to COMPARE_OP_FLOAT, but for ==, != only - op(_COMPARE_OP_STR, (left, right -- res)) { + op(_COMPARE_OP_STR, (left, right -- res, l, r)) { PyObject *left_o = PyStackRef_AsPyObjectBorrow(left); PyObject *right_o = PyStackRef_AsPyObjectBorrow(right); STAT_INC(COMPARE_OP, hit); int eq = _PyUnicode_Equal(left_o, right_o); assert((oparg >> 5) == Py_EQ || (oparg >> 5) == Py_NE); - PyStackRef_CLOSE_SPECIALIZED(left, _PyUnicode_ExactDealloc); + l = left; + r = right; DEAD(left); - PyStackRef_CLOSE_SPECIALIZED(right, _PyUnicode_ExactDealloc); DEAD(right); assert(eq == 0 || eq == 1); assert((oparg & 0xf) == COMPARISON_NOT_EQUALS || (oparg & 0xf) == COMPARISON_EQUALS); diff --git a/Python/executor_cases.c.h b/Python/executor_cases.c.h index b50347615c02f8..65941f25d897d9 100644 --- a/Python/executor_cases.c.h +++ b/Python/executor_cases.c.h @@ -8930,12 +8930,14 @@ break; } - case _COMPARE_OP_FLOAT_r01: { + case _COMPARE_OP_FLOAT_r03: { CHECK_CURRENT_CACHED_VALUES(0); assert(WITHIN_STACK_BOUNDS_IGNORING_CACHE()); _PyStackRef right; _PyStackRef left; _PyStackRef res; + _PyStackRef l; + _PyStackRef r; oparg = CURRENT_OPARG(); right = stack_pointer[-1]; left = stack_pointer[-2]; @@ -8945,23 +8947,27 @@ double dleft = PyFloat_AS_DOUBLE(left_o); double dright = PyFloat_AS_DOUBLE(right_o); int sign_ish = COMPARISON_BIT(dleft, dright); - PyStackRef_CLOSE_SPECIALIZED(left, _PyFloat_ExactDealloc); - PyStackRef_CLOSE_SPECIALIZED(right, _PyFloat_ExactDealloc); + l = left; + r = right; res = (sign_ish & oparg) ? PyStackRef_True : PyStackRef_False; + _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 _COMPARE_OP_FLOAT_r11: { + case _COMPARE_OP_FLOAT_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; oparg = CURRENT_OPARG(); right = _stack_item_0; @@ -8972,23 +8978,27 @@ double dleft = PyFloat_AS_DOUBLE(left_o); double dright = PyFloat_AS_DOUBLE(right_o); int sign_ish = COMPARISON_BIT(dleft, dright); - PyStackRef_CLOSE_SPECIALIZED(left, _PyFloat_ExactDealloc); - PyStackRef_CLOSE_SPECIALIZED(right, _PyFloat_ExactDealloc); + l = left; + r = right; res = (sign_ish & oparg) ? PyStackRef_True : PyStackRef_False; + _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 _COMPARE_OP_FLOAT_r21: { + case _COMPARE_OP_FLOAT_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(); @@ -9000,39 +9010,13 @@ double dleft = PyFloat_AS_DOUBLE(left_o); double dright = PyFloat_AS_DOUBLE(right_o); int sign_ish = COMPARISON_BIT(dleft, dright); - PyStackRef_CLOSE_SPECIALIZED(left, _PyFloat_ExactDealloc); - PyStackRef_CLOSE_SPECIALIZED(right, _PyFloat_ExactDealloc); + l = left; + r = right; res = (sign_ish & oparg) ? PyStackRef_True : PyStackRef_False; + _tos_cache2 = r; + _tos_cache1 = l; _tos_cache0 = res; - SET_CURRENT_CACHED_VALUES(1); - assert(WITHIN_STACK_BOUNDS_IGNORING_CACHE()); - break; - } - - case _COMPARE_OP_FLOAT_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; - oparg = CURRENT_OPARG(); - right = _stack_item_2; - left = _stack_item_1; - PyObject *left_o = PyStackRef_AsPyObjectBorrow(left); - PyObject *right_o = PyStackRef_AsPyObjectBorrow(right); - STAT_INC(COMPARE_OP, hit); - double dleft = PyFloat_AS_DOUBLE(left_o); - double dright = PyFloat_AS_DOUBLE(right_o); - int sign_ish = COMPARISON_BIT(dleft, dright); - PyStackRef_CLOSE_SPECIALIZED(left, _PyFloat_ExactDealloc); - PyStackRef_CLOSE_SPECIALIZED(right, _PyFloat_ExactDealloc); - res = (sign_ish & oparg) ? PyStackRef_True : PyStackRef_False; - _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; } @@ -9071,12 +9055,14 @@ break; } - case _COMPARE_OP_STR_r21: { + case _COMPARE_OP_STR_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(); @@ -9087,16 +9073,16 @@ STAT_INC(COMPARE_OP, hit); int eq = _PyUnicode_Equal(left_o, right_o); assert((oparg >> 5) == Py_EQ || (oparg >> 5) == Py_NE); - PyStackRef_CLOSE_SPECIALIZED(left, _PyUnicode_ExactDealloc); - PyStackRef_CLOSE_SPECIALIZED(right, _PyUnicode_ExactDealloc); + l = left; + r = right; assert(eq == 0 || eq == 1); assert((oparg & 0xf) == COMPARISON_NOT_EQUALS || (oparg & 0xf) == COMPARISON_EQUALS); assert(COMPARISON_NOT_EQUALS + 1 == COMPARISON_EQUALS); res = ((COMPARISON_NOT_EQUALS + eq) & 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 50759933814c4f..1a91cdaf6537e7 100644 --- a/Python/generated_cases.c.h +++ b/Python/generated_cases.c.h @@ -4449,6 +4449,8 @@ _PyStackRef left; _PyStackRef right; _PyStackRef res; + _PyStackRef l; + _PyStackRef r; // _GUARD_TOS_FLOAT { value = stack_pointer[-1]; @@ -4479,10 +4481,22 @@ double dleft = PyFloat_AS_DOUBLE(left_o); double dright = PyFloat_AS_DOUBLE(right_o); int sign_ish = COMPARISON_BIT(dleft, dright); - PyStackRef_CLOSE_SPECIALIZED(left, _PyFloat_ExactDealloc); - PyStackRef_CLOSE_SPECIALIZED(right, _PyFloat_ExactDealloc); + l = left; + r = right; res = (sign_ish & oparg) ? PyStackRef_True : PyStackRef_False; } + // _POP_TOP_FLOAT + { + value = r; + assert(PyFloat_CheckExact(PyStackRef_AsPyObjectBorrow(value))); + PyStackRef_CLOSE_SPECIALIZED(value, _PyFloat_ExactDealloc); + } + // _POP_TOP_FLOAT + { + value = l; + assert(PyFloat_CheckExact(PyStackRef_AsPyObjectBorrow(value))); + PyStackRef_CLOSE_SPECIALIZED(value, _PyFloat_ExactDealloc); + } stack_pointer[-2] = res; stack_pointer += -1; ASSERT_WITHIN_STACK_BOUNDS(__FILE__, __LINE__); @@ -4578,6 +4592,8 @@ _PyStackRef left; _PyStackRef right; _PyStackRef res; + _PyStackRef l; + _PyStackRef r; // _GUARD_TOS_UNICODE { value = stack_pointer[-1]; @@ -4608,13 +4624,25 @@ STAT_INC(COMPARE_OP, hit); int eq = _PyUnicode_Equal(left_o, right_o); assert((oparg >> 5) == Py_EQ || (oparg >> 5) == Py_NE); - PyStackRef_CLOSE_SPECIALIZED(left, _PyUnicode_ExactDealloc); - PyStackRef_CLOSE_SPECIALIZED(right, _PyUnicode_ExactDealloc); + l = left; + r = right; assert(eq == 0 || eq == 1); assert((oparg & 0xf) == COMPARISON_NOT_EQUALS || (oparg & 0xf) == COMPARISON_EQUALS); assert(COMPARISON_NOT_EQUALS + 1 == COMPARISON_EQUALS); res = ((COMPARISON_NOT_EQUALS + eq) & oparg) ? PyStackRef_True : PyStackRef_False; } + // _POP_TOP_UNICODE + { + value = r; + assert(PyUnicode_CheckExact(PyStackRef_AsPyObjectBorrow(value))); + PyStackRef_CLOSE_SPECIALIZED(value, _PyUnicode_ExactDealloc); + } + // _POP_TOP_UNICODE + { + value = l; + assert(PyUnicode_CheckExact(PyStackRef_AsPyObjectBorrow(value))); + PyStackRef_CLOSE_SPECIALIZED(value, _PyUnicode_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 1575b9e38424c5..9f7b2663dacfab 100644 --- a/Python/optimizer_bytecodes.c +++ b/Python/optimizer_bytecodes.c @@ -466,14 +466,16 @@ dummy_func(void) { r = right; } - op(_COMPARE_OP_FLOAT, (left, right -- res)) { - REPLACE_OPCODE_IF_EVALUATES_PURE(left, right); + op(_COMPARE_OP_FLOAT, (left, right -- res, l, r)) { res = sym_new_type(ctx, &PyBool_Type); + l = left; + r = right; } - op(_COMPARE_OP_STR, (left, right -- res)) { - REPLACE_OPCODE_IF_EVALUATES_PURE(left, right); + op(_COMPARE_OP_STR, (left, right -- res, l, r)) { res = sym_new_type(ctx, &PyBool_Type); + l = left; + r = right; } op(_IS_OP, (left, right -- b)) { diff --git a/Python/optimizer_cases.c.h b/Python/optimizer_cases.c.h index a8b043fbc875d2..630dc1703f9ab5 100644 --- a/Python/optimizer_cases.c.h +++ b/Python/optimizer_cases.c.h @@ -1818,46 +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); - STAT_INC(COMPARE_OP, hit); - double dleft = PyFloat_AS_DOUBLE(left_o); - double dright = PyFloat_AS_DOUBLE(right_o); - int sign_ish = COMPARISON_BIT(dleft, dright); - PyStackRef_CLOSE_SPECIALIZED(left, _PyFloat_ExactDealloc); - PyStackRef_CLOSE_SPECIALIZED(right, _PyFloat_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; } @@ -1886,48 +1858,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); - STAT_INC(COMPARE_OP, hit); - int eq = _PyUnicode_Equal(left_o, right_o); - assert((oparg >> 5) == Py_EQ || (oparg >> 5) == Py_NE); - PyStackRef_CLOSE_SPECIALIZED(left, _PyUnicode_ExactDealloc); - PyStackRef_CLOSE_SPECIALIZED(right, _PyUnicode_ExactDealloc); - assert(eq == 0 || eq == 1); - assert((oparg & 0xf) == COMPARISON_NOT_EQUALS || (oparg & 0xf) == COMPARISON_EQUALS); - assert(COMPARISON_NOT_EQUALS + 1 == COMPARISON_EQUALS); - res_stackref = ((COMPARISON_NOT_EQUALS + eq) & 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; }