Skip to content

bpo-41323: Perform 'peephole' optimizations directly on the CFG. #21517

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
markshannon merged 8 commits into from
Jul 30, 2020
Merged

bpo-41323: Perform 'peephole' optimizations directly on the CFG. #21517

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
d5b4bda
Move 'peephole' optimizations into compile.c and perform them directl…
markshannon Jul 17, 2020
c480401
Regenerate frozen importlib.
markshannon Jul 17, 2020
6b7019a
Remove commented out code.
markshannon Jul 17, 2020
a2915d5
Two minor code tidy ups.
markshannon Jul 20, 2020
7bc2522
Remove peephole.c
markshannon Jul 20, 2020
fda0bed
Fix leak in mark_reachable.
markshannon Jul 20, 2020
17541b6
Treat jumps to empty blocks as jumps to the following block.
markshannon Jul 21, 2020
1b57a42
Regenerate importlib
markshannon Jul 21, 2020
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
Remove peephole.c
  • Loading branch information
@markshannon
markshannon committed Jul 20, 2020
commit 7bc252233d97a104396dd84ca6760a3a4804ce38
1 change: 0 additions & 1 deletion Makefile.pre.in
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -354,7 +354,6 @@ PYTHON_OBJS= \
Python/mysnprintf.o \
Python/mystrtoul.o \
Python/pathconfig.o \
Python/peephole.o \
Python/preconfig.o \
Python/pyarena.o \
Python/pyctype.o \
Expand Down
1 change: 0 additions & 1 deletion PCbuild/pythoncore.vcxproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -460,7 +460,6 @@
<ClCompile Include="..\Python\mysnprintf.c" />
<ClCompile Include="..\Python\mystrtoul.c" />
<ClCompile Include="..\Python\pathconfig.c" />
<ClCompile Include="..\Python\peephole.c" />
<ClCompile Include="..\Python\preconfig.c" />
<ClCompile Include="..\Python\pyarena.c" />
<ClCompile Include="..\Python\pyctype.c" />
Expand Down
5 changes: 1 addition & 4 deletions PCbuild/pythoncore.vcxproj.filters
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1028,9 +1028,6 @@
<ClCompile Include="..\Python\pathconfig.c">
<Filter>Python</Filter>
</ClCompile>
<ClCompile Include="..\Python\peephole.c">
<Filter>Python</Filter>
</ClCompile>
<ClCompile Include="..\Python\preconfig.c">
<Filter>Python</Filter>
</ClCompile>
Expand Down Expand Up @@ -1184,4 +1181,4 @@
<Filter>Resource Files</Filter>
</ResourceCompile>
</ItemGroup>
</Project>
</Project>
12 changes: 11 additions & 1 deletion Python/compile.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@
* 3. Generate code for basic blocks. See compiler_mod() in this file.
* 4. Assemble the basic blocks into final code. See assemble() in
* this file.
* 5. Optimize the byte code (peephole optimizations). See peephole.c
* 5. Optimize the byte code (peephole optimizations).
*
* Note that compiler_mod() suggests module, but the module ast type
* (mod_ty) has cases for expressions and interactive statements.
Expand Down Expand Up @@ -6360,4 +6360,14 @@ optimize_cfg(struct assembler *a, PyObject *consts)
return 0;
}

/* Retained for API compatibility.
* Optimization is now done in optimize_cfg */

PyObject *
PyCode_Optimize(PyObject *code, PyObject* Py_UNUSED(consts),
PyObject *Py_UNUSED(names), PyObject *Py_UNUSED(lnotab_obj))
{
Py_INCREF(code);
return code;
}

14 changes: 0 additions & 14 deletions Python/peephole.c
View file
Open in desktop

This file was deleted.