Uh oh!
There was an error while loading.Please reload this page.
- Notifications
You must be signed in to change notification settings - Fork33.7k
GH-135904: Add tests for the JIT build process#136766
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.
By clicking “Sign up for GitHub”, you agree to ourterms of service andprivacy statement. We’ll occasionally send you account related emails.
Already on GitHub?Sign in to your account
Open
brandtbucher wants to merge13 commits intopython:mainChoose a base branch
base:main
Could not load branches
Branch not found:{{ refName }}
Loading
Could not load tags
Nothing to show
Loading
Are you sure you want to change the base?
Some commits from the old base branch may be removed from the timeline, and old review comments may become outdated.
Uh oh!
There was an error while loading.Please reload this page.
Open
Changes from1 commit
Commits
Show all changes
13 commits Select commitHold shift + click to select a range
7a6d819 Test the JIT stencils build process
brandtbuchera322ad4 Cleanup
brandtbuchere1eb85d Add expected output for Windows
brandtbucherf4c05b3 Add expected output for macOS
brandtbucher00cd7e3 Is it BSS?
brandtbucher202fb6f It *is* BSS!
brandtbucher4e5554c Optimistically strip writable data
brandtbucher9db0563 Ditto for ELF
brandtbucherc4c3ccc Ditto for Mach-O, and *way* simplify the parsing!
brandtbucherc6fc7bd Rework tests
brandtbucher558c83b Merge branch 'jit-tests' of https://github.com/brandtbucher/cpython i…
brandtbucher867a686 Cleanup for PR
brandtbucher7c9c3ff Check for all of the tools
brandtbucherFile filter
Filter by extension
Conversations
Failed to load comments.
Loading
Uh oh!
There was an error while loading.Please reload this page.
Jump to
Jump to file
Failed to load files.
Loading
Uh oh!
There was an error while loading.Please reload this page.
Diff view
Diff view
Cleanup
- Loading branch information
Uh oh!
There was an error while loading.Please reload this page.
commita322ad46cdf45e5a94ef92e476a2e47d64e26a1e
There are no files selected for viewing
80 changes: 49 additions & 31 deletionsLib/test/test_jit_stencils.py
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,49 +1,67 @@ | ||
| import pathlib | ||
| import shlex | ||
| import sys | ||
| import sysconfig | ||
| import tempfile | ||
| import test.support | ||
| import test.support.script_helper | ||
| import unittest | ||
| _CPYTHON = pathlib.Path(test.support.REPO_ROOT).resolve() | ||
tomasr8 marked this conversation as resolved. Show resolvedHide resolvedUh oh!There was an error while loading.Please reload this page. | ||
| _TOOLS_JIT = _CPYTHON / "Tools" / "jit" | ||
| _TOOLS_JIT_TEST = _TOOLS_JIT / "test" | ||
| _TOOLS_JIT_TEST_TEST_EXECUTOR_CASES_C_H = _TOOLS_JIT_TEST / "test_executor_cases.c.h" | ||
| _TOOLS_JIT_BUILD_PY = _TOOLS_JIT / "build.py" | ||
| @test.support.cpython_only | ||
| @unittest.skipIf(test.support.Py_DEBUG, "Debug stencils aren't tested.") | ||
| @unittest.skipIf(test.support.Py_GIL_DISABLED, "Free-threaded stencils aren't tested.") | ||
| @unittest.skipUnless(sysconfig.is_python_build(), "Requires a local Python build.") | ||
| class TestJITStencils(unittest.TestCase): | ||
| def _build_jit_stencils(self, target: str) -> str: | ||
| with tempfile.TemporaryDirectory() as work: | ||
Member There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others.Learn more. I think MemberAuthor There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others.Learn more. Hm, I'll take a look! MemberAuthor There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others.Learn more. Is it, like, better? Haha. Member There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others.Learn more. Couldn't tell you 😅 but it seems quite common. Though both are used so it probably doesn't matter :) | ||
| jit_stencils_h = pathlib.Path(work, f"jit_stencils-{target}.h").resolve() | ||
| pyconfig_h = pathlib.Path(sysconfig.get_config_h_filename()).resolve() | ||
| result, args = test.support.script_helper.run_python_until_end( | ||
| _TOOLS_JIT_BUILD_PY, | ||
| "--input-file", _TOOLS_JIT_TEST_TEST_EXECUTOR_CASES_C_H, | ||
Contributor There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others.Learn more. This is just for my understanding. is this needed in case we need to regenerate this during development and we need to test it, right? | ||
| "--output-dir", jit_stencils_h.parent, | ||
| "--pyconfig-dir", pyconfig_h.parent, | ||
| target, | ||
| __isolated=False, | ||
| ) | ||
| if result.rc: | ||
| self.skipTest(f"Build failed: {shlex.join(map(str, args))}") | ||
| body = jit_stencils_h.read_text() | ||
| # Strip out two lines of header comments: | ||
| _, _, body = body.split("\n", 2) | ||
| return body | ||
| def _check_jit_stencils( | ||
| self, expected: str, actual: str, test_jit_stencils_h: pathlib.Path | ||
| ) -> None: | ||
| try: | ||
| self.assertEqual(expected.strip("\n"), actual.strip("\n")) | ||
| except AssertionError as e: | ||
| # Make it easy to re-validate the expected output: | ||
| relative = test_jit_stencils_h.relative_to(_CPYTHON) | ||
| message = f"If this is expected, replace {relative} with:" | ||
| banner = "=" * len(message) | ||
| e.add_note("\n".join([banner, message, banner])) | ||
| e.add_note(actual) | ||
| raise | ||
| def test_jit_stencils(self): | ||
| self.maxDiff = None | ||
| found = False | ||
| for test_jit_stencils_h in _TOOLS_JIT_TEST.glob("test_jit_stencils-*.h"): | ||
| target = test_jit_stencils_h.stem.removeprefix("test_jit_stencils-") | ||
| with self.subTest(target): | ||
| expected = test_jit_stencils_h.read_text() | ||
| actual = self._build_jit_stencils(target) | ||
| found = True | ||
| self._check_jit_stencils(expected, actual, test_jit_stencils_h) | ||
| # This is a local build. If the JIT is available, at least one test should run: | ||
| assert found or not sys._jit.is_available(), "No JIT stencils built!" | ||
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,27 +1,29 @@ | ||
| case 0: { | ||
| // Zero-length jumps should be removed: | ||
| break; | ||
| } | ||
| case 1: { | ||
| // -Os duplicates less code than -O3: | ||
| PyAPI_DATA(bool) sausage; | ||
| PyAPI_DATA(bool) spammed; | ||
| PyAPI_FUNC(void) order_eggs_and_bacon(void); | ||
| PyAPI_FUNC(void) order_eggs_sausage_and_bacon(void); | ||
| if (!sausage) { | ||
| order_eggs_and_bacon(); | ||
| } | ||
| else { | ||
| order_eggs_sausage_and_bacon(); | ||
| } | ||
| spammed = false; | ||
| break; | ||
| } | ||
| case 2: { | ||
| // The assembly optimizer inverts hot branches: | ||
| PyAPI_DATA(bool) spam; | ||
| if (spam) { | ||
| JUMP_TO_ERROR(); | ||
| } | ||
| break; | ||
| } | ||
150 changes: 60 additions & 90 deletionsTools/jit/test/test_jit_stencils-aarch64-unknown-linux-gnu.h
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.Learn more about bidirectional Unicode characters
Oops, something went wrong.
Uh oh!
There was an error while loading.Please reload this page.
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.