diff --git a/mypyc/codegen/emit.py b/mypyc/codegen/emit.py index bef560b3d42a..bb889028b961 100644 --- a/mypyc/codegen/emit.py +++ b/mypyc/codegen/emit.py @@ -17,7 +17,6 @@ REG_PREFIX, STATIC_PREFIX, TYPE_PREFIX, - use_vectorcall, ) from mypyc.ir.class_ir import ClassIR, all_concrete_classes from mypyc.ir.func_ir import FuncDecl @@ -398,9 +397,6 @@ def _emit_attr_bitmap_update( if value: self.emit_line("}") - def use_vectorcall(self) -> bool: - return use_vectorcall(self.capi_version) - def emit_undefined_attr_check( self, rtype: RType, diff --git a/mypyc/codegen/emitclass.py b/mypyc/codegen/emitclass.py index 54c979482f66..79ae6abf1f60 100644 --- a/mypyc/codegen/emitclass.py +++ b/mypyc/codegen/emitclass.py @@ -31,10 +31,6 @@ def native_slot(cl: ClassIR, fn: FuncIR, emitter: Emitter) -> str: return f"{NATIVE_PREFIX}{fn.cname(emitter.names)}" -def wrapper_slot(cl: ClassIR, fn: FuncIR, emitter: Emitter) -> str: - return f"{PREFIX}{fn.cname(emitter.names)}" - - # We maintain a table from dunder function names to struct slots they # correspond to and functions that generate a wrapper (if necessary) # and return the function name to stick in the slot. @@ -137,12 +133,7 @@ def wrapper_slot(cl: ClassIR, fn: FuncIR, emitter: Emitter) -> str: def generate_call_wrapper(cl: ClassIR, fn: FuncIR, emitter: Emitter) -> str: - if emitter.use_vectorcall(): - # Use vectorcall wrapper if supported (PEP 590). - return "PyVectorcall_Call" - else: - # On older Pythons use the legacy wrapper. - return wrapper_slot(cl, fn, emitter) + return "PyVectorcall_Call" def slot_key(attr: str) -> str: @@ -333,7 +324,7 @@ def emit_line() -> None: flags = ["Py_TPFLAGS_DEFAULT", "Py_TPFLAGS_HEAPTYPE", "Py_TPFLAGS_BASETYPE"] if generate_full: flags.append("Py_TPFLAGS_HAVE_GC") - if cl.has_method("__call__") and emitter.use_vectorcall(): + if cl.has_method("__call__"): fields["tp_vectorcall_offset"] = "offsetof({}, vectorcall)".format( cl.struct_name(emitter.names) ) @@ -381,7 +372,7 @@ def generate_object_struct(cl: ClassIR, emitter: Emitter) -> None: seen_attrs: set[tuple[str, RType]] = set() lines: list[str] = [] lines += ["typedef struct {", "PyObject_HEAD", "CPyVTableItem *vtable;"] - if cl.has_method("__call__") and emitter.use_vectorcall(): + if cl.has_method("__call__"): lines.append("vectorcallfunc vectorcall;") bitmap_attrs = [] for base in reversed(cl.base_mro): @@ -576,7 +567,7 @@ def generate_setup_for_class( field = emitter.bitmap_field(i) emitter.emit_line(f"self->{field} = 0;") - if cl.has_method("__call__") and emitter.use_vectorcall(): + if cl.has_method("__call__"): name = cl.method_decl("__call__").cname(emitter.names) emitter.emit_line(f"self->vectorcall = {PREFIX}{name};") diff --git a/mypyc/codegen/emitmodule.py b/mypyc/codegen/emitmodule.py index bd2958c285c3..1ec3064eb5b9 100644 --- a/mypyc/codegen/emitmodule.py +++ b/mypyc/codegen/emitmodule.py @@ -45,7 +45,6 @@ TYPE_VAR_PREFIX, shared_lib_name, short_id_from_name, - use_vectorcall, ) from mypyc.errors import Errors from mypyc.ir.func_ir import FuncIR @@ -1106,7 +1105,7 @@ def is_fastcall_supported(fn: FuncIR, capi_version: tuple[int, int]) -> bool: if fn.class_name is not None: if fn.name == "__call__": # We can use vectorcalls (PEP 590) when supported - return use_vectorcall(capi_version) + return True # TODO: Support fastcall for __init__. return fn.name != "__init__" return True diff --git a/mypyc/codegen/emitwrapper.py b/mypyc/codegen/emitwrapper.py index f9bed440bb28..1918c946772c 100644 --- a/mypyc/codegen/emitwrapper.py +++ b/mypyc/codegen/emitwrapper.py @@ -24,7 +24,6 @@ NATIVE_PREFIX, PREFIX, bitmap_name, - use_vectorcall, ) from mypyc.ir.class_ir import ClassIR from mypyc.ir.func_ir import FUNC_STATICMETHOD, FuncIR, RuntimeArg @@ -173,7 +172,7 @@ def generate_wrapper_function( arg_ptrs += [f"&obj_{groups[ARG_STAR2][0].name}" if groups[ARG_STAR2] else "NULL"] arg_ptrs += [f"&obj_{arg.name}" for arg in reordered_args] - if fn.name == "__call__" and use_vectorcall(emitter.capi_version): + if fn.name == "__call__": nargs = "PyVectorcall_NARGS(nargs)" else: nargs = "nargs" diff --git a/mypyc/common.py b/mypyc/common.py index c49952510c07..992376472086 100644 --- a/mypyc/common.py +++ b/mypyc/common.py @@ -106,16 +106,6 @@ def short_name(name: str) -> str: return name -def use_vectorcall(capi_version: tuple[int, int]) -> bool: - # We can use vectorcalls to make calls on Python 3.8+ (PEP 590). - return capi_version >= (3, 8) - - -def use_method_vectorcall(capi_version: tuple[int, int]) -> bool: - # We can use a dedicated vectorcall API to call methods on Python 3.9+. - return capi_version >= (3, 9) - - def get_id_from_name(name: str, fullname: str, line: int) -> str: """Create a unique id for a function. diff --git a/mypyc/irbuild/ll_builder.py b/mypyc/irbuild/ll_builder.py index bae38f27b346..1c8ec0f25670 100644 --- a/mypyc/irbuild/ll_builder.py +++ b/mypyc/irbuild/ll_builder.py @@ -21,8 +21,6 @@ MIN_LITERAL_SHORT_INT, MIN_SHORT_INT, PLATFORM_SIZE, - use_method_vectorcall, - use_vectorcall, ) from mypyc.errors import Errors from mypyc.ir.class_ir import ClassIR, all_concrete_classes @@ -892,11 +890,9 @@ def py_call( Use py_call_op or py_call_with_kwargs_op for Python function call. """ - if use_vectorcall(self.options.capi_version): - # More recent Python versions support faster vectorcalls. - result = self._py_vector_call(function, arg_values, line, arg_kinds, arg_names) - if result is not None: - return result + result = self._py_vector_call(function, arg_values, line, arg_kinds, arg_names) + if result is not None: + return result # If all arguments are positional, we can use py_call_op. if arg_kinds is None or all(kind == ARG_POS for kind in arg_kinds): @@ -971,13 +967,11 @@ def py_method_call( arg_names: Sequence[str | None] | None, ) -> Value: """Call a Python method (non-native and slow).""" - if use_method_vectorcall(self.options.capi_version): - # More recent Python versions support faster vectorcalls. - result = self._py_vector_method_call( - obj, method_name, arg_values, line, arg_kinds, arg_names - ) - if result is not None: - return result + result = self._py_vector_method_call( + obj, method_name, arg_values, line, arg_kinds, arg_names + ) + if result is not None: + return result if arg_kinds is None or all(kind == ARG_POS for kind in arg_kinds): # Use legacy method call API