Skip to content

gh-90928: Improve static initialization of keywords tuple in AC #95907

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
erlend-aasland merged 6 commits into from
Aug 13, 2022
Merged

gh-90928: Improve static initialization of keywords tuple in AC #95907

Changes from 1 commit
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
cee430f
Proof of concept
erlend-aasland Aug 11, 2022
bda509a
Calculate num_keywords during template generation
erlend-aasland Aug 11, 2022
793c5aa
Regen clinic.test
erlend-aasland Aug 11, 2022
568a49c
Address review
erlend-aasland Aug 11, 2022
f1d533c
Update Tools/clinic/clinic.py
Aug 12, 2022
8915c05
Address last round of reviews
erlend-aasland Aug 12, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Next Next commit
Proof of concept 
Deduce num_keywords from f.parameters
  • Loading branch information
@erlend-aasland
erlend-aasland committed Aug 11, 2022
commit cee430fc1045bc74abaee174a0e52f0b47447723
20 changes: 14 additions & 6 deletions Tools/clinic/clinic.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -535,7 +535,15 @@ def normalize_snippet(s, *, indent=0):
return s


def declare_parser(*, hasformat=False):
def declare_parser(f, *, hasformat=False):
def num_keywords(f):
params = f.parameters.values()
kwds = [
p for p in params
if not p.is_positional_only() and not p.is_vararg()
]
return len(kwds)

"""
Generates the code template for a static local PyArg_Parser variable,
with an initializer. For core code (incl. builtin modules) the
Expand All @@ -549,7 +557,7 @@ def declare_parser(*, hasformat=False):
fname = '.fname = "{name}",'
format_ = ''
declarations = """
#define NUM_KEYWORDS {num_keywords}
#define NUM_KEYWORDS %d
#if NUM_KEYWORDS == 0

# if defined(Py_BUILD_CORE) && !defined(Py_BUILD_CORE_MODULE)
Expand Down Expand Up @@ -584,7 +592,7 @@ def declare_parser(*, hasformat=False):
.kwtuple = KWTUPLE,
}};
#undef KWTUPLE
""" % (format_ or fname)
""" % (num_keywords(f), format_ or fname)
return normalize_snippet(declarations)


Expand Down Expand Up @@ -1020,7 +1028,7 @@ def parser_body(prototype, *fields, declarations=''):
flags = "METH_FASTCALL|METH_KEYWORDS"
parser_prototype = parser_prototype_fastcall_keywords
argname_fmt = 'args[%d]'
declarations = declare_parser()
declarations = declare_parser(f)
declarations += "\nPyObject *argsbuf[%s];" % len(converters)
if has_optional_kw:
pre_buffer = "0" if vararg != NO_VARARG else "nargs"
Expand All @@ -1036,7 +1044,7 @@ def parser_body(prototype, *fields, declarations=''):
flags = "METH_VARARGS|METH_KEYWORDS"
parser_prototype = parser_prototype_keyword
argname_fmt = 'fastargs[%d]'
declarations = declare_parser()
declarations = declare_parser(f)
declarations += "\nPyObject *argsbuf[%s];" % len(converters)
declarations += "\nPyObject * const *fastargs;"
declarations += "\nPy_ssize_t nargs = PyTuple_GET_SIZE(args);"
Expand Down Expand Up @@ -1116,7 +1124,7 @@ def parser_body(prototype, *fields, declarations=''):
if add_label:
parser_code.append("%s:" % add_label)
else:
declarations = declare_parser(hasformat=True)
declarations = declare_parser(f, hasformat=True)
if not new_or_init:
parser_code = [normalize_snippet("""
if (!_PyArg_ParseStackAndKeywords(args, nargs, kwnames, &_parser{parse_arguments_comma}
Expand Down