Skip to content

gh-109287: Desugar inst(X) to op(X); macro(X) = X#109294

Merged
gvanrossum merged 21 commits intopython:mainfrom
gvanrossum:inst-to-op
Sep 15, 2023
Merged

gh-109287: Desugar inst(X) to op(X); macro(X) = X#109294
gvanrossum merged 21 commits intopython:mainfrom
gvanrossum:inst-to-op

Conversation

@gvanrossum
Copy link
Member

@gvanrossum gvanrossum commented Sep 12, 2023 •
edited
Loading

I'm happy with this. The code generator needs to be cleaned up a bit more (e.g. the stats about instrs read/written are weird now).

@bedevere-app bedevere-app bot mentioned this pull request Sep 12, 2023
Closed
@gvanrossum

This comment was marked as outdated.

Sign in to view
@gvanrossum

This comment was marked as outdated.

Sign in to view
@gvanrossum
Copy link
Member Author

gvanrossum commented Sep 13, 2023 •
edited
Loading

I think super-instructions now work again (the old special-casing was salvageable). I have a few other things:

  • Generate instructions in the same order as before.
  • With -Xuops I get crashes in importlib/_bootstrap.py.
  • Try reusing op names for macro names.
  • Make test_generated_cases work.
  • Fix abstract_interp_cases.c.h (even though it's a placeholder).
  • Clean up the code generator.

@gvanrossum gvanrossum changed the title gh-109287: [WIP] Desugar inst(X) to op(__X); macro(X) = __X gh-109287: [WIP] Desugar inst(X) to op(X); macro(X) = X Sep 14, 2023
@gvanrossum gvanrossum marked this pull request as ready for review September 14, 2023 03:23
@gvanrossum
Copy link
Member Author

gvanrossum commented Sep 14, 2023

I'd add @markshannon but he said he's on vacation until end of next week.

@gvanrossum
Copy link
Member Author

gvanrossum commented Sep 14, 2023

CC @Fidget-Spinner (because I had to change the abstract interpretation code generator a bit).

@gvanrossum gvanrossum changed the title gh-109287: [WIP] Desugar inst(X) to op(X); macro(X) = X gh-109287: Desugar inst(X) to op(X); macro(X) = X Sep 14, 2023
iritkatriel
iritkatriel reviewed Sep 14, 2023
View reviewed changes
@gvanrossum gvanrossum merged commit a7a0797 into python:main Sep 15, 2023
@gvanrossum gvanrossum deleted the inst-to-op branch September 15, 2023 15:39
@bedevere-bot
Copy link

bedevere-bot commented Sep 15, 2023

⚠️⚠️⚠️ Buildbot failure ⚠️⚠️⚠️

Hi! The buildbot AMD64 RHEL8 FIPS Only Blake2 Builtin Hash 3.x has failed when building commit a7a0797.

What do you need to do:

  1. Don't panic.
  2. Check the buildbot page in the devguide if you don't know what the buildbots are or how they work.
  3. Go to the page of the buildbot that failed (https://buildbot.python.org/all/#builders/469/builds/6008) and take a look at the build logs.
  4. Check if the failure is related to this commit (a7a0797) or if it is a false positive.
  5. If the failure is related to this commit, please, reflect that on the issue and make a new Pull Request with a fix.

You can take a look at the buildbot page here:

https://buildbot.python.org/all/#builders/469/builds/6008

Failed tests:

  • test.test_asyncio.test_subprocess

Failed subtests:

  • test_subprocess_consistent_callbacks - test.test_asyncio.test_subprocess.SubprocessThreadedWatcherTests.test_subprocess_consistent_callbacks

Summary of the results of the build (if available):

==

Click to see traceback logs 
Traceback (most recent call last):
  File "/home/buildbot/buildarea/3.x.cstratak-RHEL8-fips-x86_64.no-builtin-hashes-except-blake2/build/Lib/test/test_asyncio/test_subprocess.py", line 788, in test_subprocess_consistent_callbacks
    self.loop.run_until_complete(main())
  File "/home/buildbot/buildarea/3.x.cstratak-RHEL8-fips-x86_64.no-builtin-hashes-except-blake2/build/Lib/asyncio/base_events.py", line 664, in run_until_complete
    return future.result()
           ^^^^^^^^^^^^^^^
  File "/home/buildbot/buildarea/3.x.cstratak-RHEL8-fips-x86_64.no-builtin-hashes-except-blake2/build/Lib/test/test_asyncio/test_subprocess.py", line 780, in main
    self.assertEqual(events, [
AssertionError: Lists differ: [('pi[29 chars]t'), 'pipe_connection_lost', ('pipe_data_recei[57 chars]ted'] != [('pi[29 chars]t'), ('pipe_data_received', 2, b'stderr'), 'pi[57 chars]ted']

@bedevere-bot
Copy link

bedevere-bot commented Sep 15, 2023

⚠️⚠️⚠️ Buildbot failure ⚠️⚠️⚠️

Hi! The buildbot s390x Fedora Clang 3.x has failed when building commit a7a0797.

What do you need to do:

  1. Don't panic.
  2. Check the buildbot page in the devguide if you don't know what the buildbots are or how they work.
  3. Go to the page of the buildbot that failed (https://buildbot.python.org/all/#builders/3/builds/4619) and take a look at the build logs.
  4. Check if the failure is related to this commit (a7a0797) or if it is a false positive.
  5. If the failure is related to this commit, please, reflect that on the issue and make a new Pull Request with a fix.

You can take a look at the buildbot page here:

https://buildbot.python.org/all/#builders/3/builds/4619

Failed tests:

  • test_tools

Failed subtests:

  • test_freeze_simple_script - test.test_tools.test_freeze.TestFreeze.test_freeze_simple_script

Summary of the results of the build (if available):

==

Click to see traceback logs 
Traceback (most recent call last):
  File "/home/dje/cpython-buildarea/3.x.edelsohn-fedora-z.clang/build/Lib/test/test_tools/test_freeze.py", line 28, in test_freeze_simple_script
    outdir, scriptfile, python = helper.prepare(script, outdir)
                                 ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
  File "/home/dje/cpython-buildarea/3.x.edelsohn-fedora-z.clang/build/Tools/freeze/test/freeze.py", line 146, in prepare
    copy_source_tree(srcdir, SRCDIR)
  File "/home/dje/cpython-buildarea/3.x.edelsohn-fedora-z.clang/build/Tools/freeze/test/freeze.py", line 95, in copy_source_tree
    shutil.copytree(oldroot, newroot, ignore=ignore_non_src)
  File "/home/dje/cpython-buildarea/3.x.edelsohn-fedora-z.clang/build/Lib/shutil.py", line 588, in copytree
    return _copytree(entries=entries, src=src, dst=dst, symlinks=symlinks,
           ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
  File "/home/dje/cpython-buildarea/3.x.edelsohn-fedora-z.clang/build/Lib/shutil.py", line 542, in _copytree
    raise Error(errors)
shutil.Error: [('/home/dje/cpython-buildarea/3.x.edelsohn-fedora-z.clang/build/build/test_python_2718958æ', '/tmp/test_python_mmyt_84w/tmp87piwyee/cpython/build/test_python_2718958æ', "[Errno 2] No such file or directory: '/home/dje/cpython-buildarea/3.x.edelsohn-fedora-z.clang/build/build/test_python_2718958æ'")]

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

@iritkatriel iritkatriel iritkatriel left review comments

@brandtbucher brandtbucher Awaiting requested review from brandtbucher

Assignees

No one assigned

Labels

skip news

Projects

None yet

Milestone

No milestone

Development

Successfully merging this pull request may close these issues.

3 participants

@gvanrossum @bedevere-bot @iritkatriel