Skip to content

gh-90370: avoid temporary tuple creation for vararg in AC #126064

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 9 commits into from
Oct 31, 2024
Merged

gh-90370: avoid temporary tuple creation for vararg in AC #126064

Changes from 1 commit
Commits
Show all changes
9 commits
Select commit Hold shift + click to select a range
ad5e812
gh-90370: avoid temporary tuple creation for vararg in AC
skirpichev Oct 26, 2024
aa2044c
+ fix mypy and lint errors
skirpichev Oct 28, 2024
b3a9a78
address review: revert math changes
skirpichev Oct 28, 2024
42c977a
address review: has_varag_hack -> pass_vararg_directly
skirpichev Oct 28, 2024
ac67ef3
Merge branch 'master' into ac-vararg-opt-90370
skirpichev Oct 28, 2024
1dc2756
address review: use _PyTuple_FromArray()
skirpichev Oct 28, 2024
00a356b
address review, style: use f-strings, code cleanup
skirpichev Oct 28, 2024
db6b0f3
+1
skirpichev Oct 28, 2024
f179557
huh, make clinic doesn't do this
skirpichev Oct 28, 2024
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
Prev Previous commit
Next Next commit
address review, style: use f-strings, code cleanup
  • Loading branch information
@skirpichev
skirpichev committed Oct 28, 2024
commit 00a356b9b2dcf6eccb285a06ca050e054ee7e69f
19 changes: 6 additions & 13 deletions Tools/clinic/libclinic/parse_args.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -470,10 +470,7 @@ def parse_pos_only(self) -> None:
argname_fmt = 'PyTuple_GET_ITEM(args, %d)'

if self.vararg != NO_VARARG:
if self.max_pos == 0:
self.declarations = "Py_ssize_t nvararg = %s;" % nargs
else:
self.declarations = "Py_ssize_t nvararg = Py_MAX(%s - %d, 0);" % (nargs, self.max_pos)
self.declarations = f"Py_ssize_t nvararg = {nargs} - {self.max_pos};"
else:
self.declarations = ""

Expand Down Expand Up @@ -525,17 +522,13 @@ def parse_pos_only(self) -> None:
use_parser_code = True
for i, p in enumerate(self.parameters):
if p.is_vararg():
var = p.converter.parser_name
if self.fastcall:
parser_code.append(libclinic.normalize_snippet("""
%s = args + %s;
""" % (
p.converter.parser_name,
self.vararg
), indent=4))
code = f"{var} = args + {self.vararg};"
else:
parser_code.append(libclinic.normalize_snippet("""
%s = _PyTuple_CAST(args)->ob_item;
""" % p.converter.parser_name, indent=4))
code = f"{var} = _PyTuple_CAST(args)->ob_item;"

@serhiy-storchaka serhiy-storchaka Nov 5, 2024

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This is not compatible with limited_capi and does not work if there are other positional parameters.

@erlend-aasland erlend-aasland Nov 5, 2024

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Are you addressing this with #122945?

@serhiy-storchaka serhiy-storchaka Nov 5, 2024

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

#122945 was created earlier.

This change creates conflicts with #122945. I'm trying to resolve them, but this is not easy.

@erlend-aasland erlend-aasland Nov 5, 2024

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I know and I understand that; I was just wondering if you were going to address the shortcomings in this PR with #122945 (after resolving the conflicts), or if we should create a separate PR for addressing the shortcomings?

@skirpichev skirpichev Nov 5, 2024

Copy link
Copy Markdown
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Sorry, but I think that solving this separately will introduce conflict with #122945.

formatted_code = libclinic.normalize_snippet(code, indent=4)
parser_code.append(formatted_code)
continue

displayname = p.get_displayname(i+1)
Expand Down