Refactor predicate optimizer symbol

- Delay analysis until predicate resolves
- Generalize predicate to lhs, rhs
- Expand to accept all safe constants (not just singletons)

Author: reidenong

Include/internal/pycore_optimizer.h

@@ -191,8 +191,7 @@ extern JitOptRef _Py_uop_sym_new_truthiness(JitOptContext *ctx, JitOptRef value,
 extern bool _Py_uop_sym_is_compact_int(JitOptRef sym);
 extern JitOptRef _Py_uop_sym_new_compact_int(JitOptContext *ctx);
 extern void _Py_uop_sym_set_compact_int(JitOptContext *ctx,  JitOptRef sym);
-extern JitOptRef _Py_uop_sym_new_predicate(JitOptContext *ctx, JitOptRef subject_ref, JitOptRef constant_ref, JitOptPredicateKind kind, bool invert);
-extern bool _Py_uop_sym_is_known_singleton(JitOptContext *ctx, JitOptRef sym);
+extern JitOptRef _Py_uop_sym_new_predicate(JitOptContext *ctx, JitOptRef lhs_ref, JitOptRef rhs_ref, JitOptPredicateKind kind, bool invert);
 extern void _Py_uop_sym_apply_predicate_narrowing(JitOptContext *ctx, JitOptRef sym, bool branch_is_true);
 
 extern void _Py_uop_abstractcontext_init(JitOptContext *ctx);

Include/internal/pycore_optimizer_types.h

@@ -80,8 +80,8 @@ typedef struct {
     uint8_t tag;
     uint8_t kind;
     bool invert;
-    uint16_t subject;
-    uint16_t constant;
+    uint16_t lhs;
+    uint16_t rhs;
 } JitOptPredicate;
 
 typedef struct {

Python/optimizer_analysis.c

@@ -187,7 +187,6 @@ incorrect_keys(PyObject *obj, uint32_t version)
 #define sym_new_compact_int _Py_uop_sym_new_compact_int
 #define sym_new_truthiness _Py_uop_sym_new_truthiness
 #define sym_new_predicate _Py_uop_sym_new_predicate
-#define sym_is_known_singleton _Py_uop_sym_is_known_singleton
 #define sym_apply_predicate_narrowing _Py_uop_sym_apply_predicate_narrowing
 
 #define JUMP_TO_LABEL(label) goto label;

Python/optimizer_bytecodes.c

@@ -39,7 +39,6 @@ typedef struct _Py_UOpsAbstractFrame _Py_UOpsAbstractFrame;
 #define sym_is_compact_int _Py_uop_sym_is_compact_int
 #define sym_new_truthiness _Py_uop_sym_new_truthiness
 #define sym_new_predicate _Py_uop_sym_new_predicate
-#define sym_is_known_singleton _Py_uop_sym_is_known_singleton
 #define sym_apply_predicate_narrowing _Py_uop_sym_apply_predicate_narrowing
 
 extern int
@@ -536,16 +535,7 @@ dummy_func(void) {
     }
 
     op(_IS_OP, (left, right -- b, l, r)) {
-        bool invert = (oparg != 0);
-        if (sym_is_known_singleton(ctx, left)) {
-            b = sym_new_predicate(ctx, right, left, JIT_PRED_IS ,invert);
-        }
-        else if (sym_is_known_singleton(ctx, right)) {
-            b = sym_new_predicate(ctx, left, right, JIT_PRED_IS, invert);
-        }
-        else {
-            b = sym_new_type(ctx, &PyBool_Type);
-        }
+        b = sym_new_predicate(ctx, left, right, JIT_PRED_IS, oparg != 0);
         l = left;
         r = right;
     }

Python/optimizer_cases.c.h

@@ -788,12 +788,10 @@ _Py_uop_sym_set_compact_int(JitOptContext *ctx, JitOptRef ref)
 }
 
 JitOptRef
-_Py_uop_sym_new_predicate(JitOptContext *ctx, JitOptRef subject_ref, JitOptRef constant_ref, JitOptPredicateKind kind, bool invert)
+_Py_uop_sym_new_predicate(JitOptContext *ctx, JitOptRef lhs_ref, JitOptRef rhs_ref, JitOptPredicateKind kind, bool invert)
 {
-    assert(_Py_uop_sym_is_const(ctx, constant_ref));
-
-    JitOptSymbol *subject = PyJitRef_Unwrap(subject_ref);
-    JitOptSymbol *constant = PyJitRef_Unwrap(constant_ref);
+    JitOptSymbol *lhs = PyJitRef_Unwrap(lhs_ref);
+    JitOptSymbol *rhs = PyJitRef_Unwrap(rhs_ref);
 
     JitOptSymbol *res = sym_new(ctx);
     if (res == NULL) {
@@ -803,22 +801,12 @@ _Py_uop_sym_new_predicate(JitOptContext *ctx, JitOptRef subject_ref, JitOptRef c
     res->tag = JIT_SYM_PREDICATE_TAG;
     res->predicate.invert = invert;
     res->predicate.kind = kind;
-    res->predicate.subject = (uint16_t)(subject - allocation_base(ctx));
-    res->predicate.constant = (uint16_t)(constant - allocation_base(ctx));
+    res->predicate.lhs = (uint16_t)(lhs - allocation_base(ctx));
+    res->predicate.rhs = (uint16_t)(rhs - allocation_base(ctx));
 
     return PyJitRef_Wrap(res);
 }
 
-bool
-_Py_uop_sym_is_known_singleton(JitOptContext *ctx, JitOptRef ref)
-{
-    if (_Py_uop_sym_is_safe_const(ctx, ref)) {
-        PyObject *value = _Py_uop_sym_get_const(ctx, ref);
-        return value == Py_None || value == Py_True || value == Py_False;
-    }
-    return false;
-}
-
 void
 _Py_uop_sym_apply_predicate_narrowing(JitOptContext *ctx, JitOptRef ref, bool branch_is_true)
 {
@@ -833,10 +821,17 @@ _Py_uop_sym_apply_predicate_narrowing(JitOptContext *ctx, JitOptRef ref, bool br
         return;
     }
 
-    if (pred.kind == JIT_PRED_IS) {
-        JitOptRef subject_ref = PyJitRef_Wrap(allocation_base(ctx) + pred.subject);
-        JitOptRef constant_ref = PyJitRef_Wrap(allocation_base(ctx) + pred.constant);
-        PyObject *const_val = _Py_uop_sym_get_const(ctx, constant_ref);
+    JitOptRef lhs_ref = PyJitRef_Wrap(allocation_base(ctx) + pred.lhs);
+    JitOptRef rhs_ref = PyJitRef_Wrap(allocation_base(ctx) + pred.rhs);
+
+    bool lhs_is_const = _Py_uop_sym_is_safe_const(ctx, lhs_ref);
+    bool rhs_is_const = _Py_uop_sym_is_safe_const(ctx, rhs_ref);
+
+    if (pred.kind == JIT_PRED_IS && (lhs_is_const || rhs_is_const)) {
+        JitOptRef subject_ref = lhs_is_const ? rhs_ref : lhs_ref;
+        JitOptRef const_ref = lhs_is_const ? lhs_ref : rhs_ref;
+
+        PyObject *const_val = _Py_uop_sym_get_const(ctx, const_ref);
         if (const_val == NULL) {
             return;
         }