https://github.com/python/cpython/commit/0c81ce13602b88fd59f23f701ed8dc377d74e76e
commit: 0c81ce13602b88fd59f23f701ed8dc377d74e76e
branch: main
author: Mark Shannon <[email protected]>
committer: markshannon <[email protected]>
date: 2024-03-05T15:06:00Z
summary:
GH-115819: Eliminate Boolean guards when value is known (GH-116355)
files:
M Include/internal/pycore_optimizer.h
M Lib/test/test_capi/test_opt.py
M Python/optimizer_analysis.c
M Python/optimizer_bytecodes.c
M Python/optimizer_cases.c.h
M Python/optimizer_symbols.c
diff --git a/Include/internal/pycore_optimizer.h
b/Include/internal/pycore_optimizer.h
index 7c977728a95024..fcead4d8714870 100644
--- a/Include/internal/pycore_optimizer.h
+++ b/Include/internal/pycore_optimizer.h
@@ -90,6 +90,7 @@ extern _Py_UopsSymbol *_Py_uop_sym_new_type(
_Py_UOpsContext *ctx, PyTypeObject *typ);
extern _Py_UopsSymbol *_Py_uop_sym_new_const(_Py_UOpsContext *ctx, PyObject
*const_val);
extern _Py_UopsSymbol *_Py_uop_sym_new_null(_Py_UOpsContext *ctx);
+extern bool _Py_uop_sym_has_type(_Py_UopsSymbol *sym);
extern bool _Py_uop_sym_matches_type(_Py_UopsSymbol *sym, PyTypeObject *typ);
extern bool _Py_uop_sym_set_null(_Py_UopsSymbol *sym);
extern bool _Py_uop_sym_set_non_null(_Py_UopsSymbol *sym);
diff --git a/Lib/test/test_capi/test_opt.py b/Lib/test/test_capi/test_opt.py
index a0a19225b79433..b0859a382de523 100644
--- a/Lib/test/test_capi/test_opt.py
+++ b/Lib/test/test_capi/test_opt.py
@@ -331,7 +331,8 @@ def testfunc(a):
ex = get_first_executor(testfunc)
self.assertIsNotNone(ex)
uops = get_opnames(ex)
- self.assertIn("_GUARD_IS_NOT_NONE_POP", uops)
+ self.assertNotIn("_GUARD_IS_NONE_POP", uops)
+ self.assertNotIn("_GUARD_IS_NOT_NONE_POP", uops)
def test_pop_jump_if_not_none(self):
def testfunc(a):
@@ -347,7 +348,8 @@ def testfunc(a):
ex = get_first_executor(testfunc)
self.assertIsNotNone(ex)
uops = get_opnames(ex)
- self.assertIn("_GUARD_IS_NONE_POP", uops)
+ self.assertNotIn("_GUARD_IS_NONE_POP", uops)
+ self.assertNotIn("_GUARD_IS_NOT_NONE_POP", uops)
def test_pop_jump_if_true(self):
def testfunc(n):
diff --git a/Python/optimizer_analysis.c b/Python/optimizer_analysis.c
index 1e1d5529ee17d7..21cccdb95de76b 100644
--- a/Python/optimizer_analysis.c
+++ b/Python/optimizer_analysis.c
@@ -292,6 +292,7 @@ remove_globals(_PyInterpreterFrame *frame,
_PyUOpInstruction *buffer,
#define sym_is_null _Py_uop_sym_is_null
#define sym_new_const _Py_uop_sym_new_const
#define sym_new_null _Py_uop_sym_new_null
+#define sym_has_type _Py_uop_sym_has_type
#define sym_matches_type _Py_uop_sym_matches_type
#define sym_set_null _Py_uop_sym_set_null
#define sym_set_non_null _Py_uop_sym_set_non_null
@@ -324,6 +325,16 @@ optimize_to_bool(
return 0;
}
+static void
+eliminate_pop_guard(_PyUOpInstruction *this_instr, bool exit)
+{
+ REPLACE_OP(this_instr, _POP_TOP, 0, 0);
+ if (exit) {
+ REPLACE_OP((this_instr+1), _EXIT_TRACE, 0, 0);
+ this_instr[1].target = this_instr->target;
+ }
+}
+
/* 1 for success, 0 for not ready, cannot error at the moment. */
static int
optimize_uops(
diff --git a/Python/optimizer_bytecodes.c b/Python/optimizer_bytecodes.c
index 2cf54270e4ad35..ee67a2b075b015 100644
--- a/Python/optimizer_bytecodes.c
+++ b/Python/optimizer_bytecodes.c
@@ -21,6 +21,7 @@ typedef struct _Py_UOpsAbstractFrame _Py_UOpsAbstractFrame;
#define sym_new_const _Py_uop_sym_new_const
#define sym_new_null _Py_uop_sym_new_null
#define sym_matches_type _Py_uop_sym_matches_type
+#define sym_has_type _Py_uop_sym_has_type
#define sym_set_null _Py_uop_sym_set_null
#define sym_set_non_null _Py_uop_sym_set_non_null
#define sym_set_type _Py_uop_sym_set_type
@@ -36,6 +37,8 @@ optimize_to_bool(
_Py_UopsSymbol *value,
_Py_UopsSymbol **result_ptr);
+extern void
+eliminate_pop_guard(_PyUOpInstruction *this_instr, bool exit)
static int
dummy_func(void) {
@@ -557,7 +560,45 @@ dummy_func(void) {
(void)iter;
}
+ op(_GUARD_IS_TRUE_POP, (flag -- )) {
+ if (sym_is_const(flag)) {
+ PyObject *value = sym_get_const(flag);
+ assert(value != NULL);
+ eliminate_pop_guard(this_instr, value != Py_True);
+ }
+ }
+
+ op(_GUARD_IS_FALSE_POP, (flag -- )) {
+ if (sym_is_const(flag)) {
+ PyObject *value = sym_get_const(flag);
+ assert(value != NULL);
+ eliminate_pop_guard(this_instr, value != Py_False);
+ }
+ }
+
+ op(_GUARD_IS_NONE_POP, (flag -- )) {
+ if (sym_is_const(flag)) {
+ PyObject *value = sym_get_const(flag);
+ assert(value != NULL);
+ eliminate_pop_guard(this_instr, !Py_IsNone(value));
+ }
+ else if (sym_has_type(flag)) {
+ assert(!sym_matches_type(flag, &_PyNone_Type));
+ eliminate_pop_guard(this_instr, true);
+ }
+ }
+ op(_GUARD_IS_NOT_NONE_POP, (flag -- )) {
+ if (sym_is_const(flag)) {
+ PyObject *value = sym_get_const(flag);
+ assert(value != NULL);
+ eliminate_pop_guard(this_instr, Py_IsNone(value));
+ }
+ else if (sym_has_type(flag)) {
+ assert(!sym_matches_type(flag, &_PyNone_Type));
+ eliminate_pop_guard(this_instr, false);
+ }
+ }
// END BYTECODES //
diff --git a/Python/optimizer_cases.c.h b/Python/optimizer_cases.c.h
index f2c186a0ae1380..6e65e2e0b4c4ca 100644
--- a/Python/optimizer_cases.c.h
+++ b/Python/optimizer_cases.c.h
@@ -1803,21 +1803,57 @@
/* _INSTRUMENTED_POP_JUMP_IF_NOT_NONE is not a viable micro-op for
tier 2 */
case _GUARD_IS_TRUE_POP: {
+ _Py_UopsSymbol *flag;
+ flag = stack_pointer[-1];
+ if (sym_is_const(flag)) {
+ PyObject *value = sym_get_const(flag);
+ assert(value != NULL);
+ eliminate_pop_guard(this_instr, value != Py_True);
+ }
stack_pointer += -1;
break;
}
case _GUARD_IS_FALSE_POP: {
+ _Py_UopsSymbol *flag;
+ flag = stack_pointer[-1];
+ if (sym_is_const(flag)) {
+ PyObject *value = sym_get_const(flag);
+ assert(value != NULL);
+ eliminate_pop_guard(this_instr, value != Py_False);
+ }
stack_pointer += -1;
break;
}
case _GUARD_IS_NONE_POP: {
+ _Py_UopsSymbol *flag;
+ flag = stack_pointer[-1];
+ if (sym_is_const(flag)) {
+ PyObject *value = sym_get_const(flag);
+ assert(value != NULL);
+ eliminate_pop_guard(this_instr, !Py_IsNone(value));
+ }
+ else if (sym_has_type(flag)) {
+ assert(!sym_matches_type(flag, &_PyNone_Type));
+ eliminate_pop_guard(this_instr, true);
+ }
stack_pointer += -1;
break;
}
case _GUARD_IS_NOT_NONE_POP: {
+ _Py_UopsSymbol *flag;
+ flag = stack_pointer[-1];
+ if (sym_is_const(flag)) {
+ PyObject *value = sym_get_const(flag);
+ assert(value != NULL);
+ eliminate_pop_guard(this_instr, Py_IsNone(value));
+ }
+ else if (sym_has_type(flag)) {
+ assert(!sym_matches_type(flag, &_PyNone_Type));
+ eliminate_pop_guard(this_instr, false);
+ }
stack_pointer += -1;
break;
}
diff --git a/Python/optimizer_symbols.c b/Python/optimizer_symbols.c
index 29fe31a0e9b94c..86b0d4d395afa2 100644
--- a/Python/optimizer_symbols.c
+++ b/Python/optimizer_symbols.c
@@ -231,6 +231,15 @@ _Py_uop_sym_new_null(_Py_UOpsContext *ctx)
return null_sym;
}
+bool
+_Py_uop_sym_has_type(_Py_UopsSymbol *sym)
+{
+ if (_Py_uop_sym_is_bottom(sym)) {
+ return false;
+ }
+ return sym->typ != NULL;
+}
+
bool
_Py_uop_sym_matches_type(_Py_UopsSymbol *sym, PyTypeObject *typ)
{
_______________________________________________
Python-checkins mailing list -- [email protected]
To unsubscribe send an email to [email protected]
https://mail.python.org/mailman3/lists/python-checkins.python.org/
Member address: [email protected]
