gh-120326: Include ``intrin.h`` on Windows by Eclips4 · Pull Request #120329 · python/cpython

Eclips4 · 2024-06-10T20:18:11Z

Issue: Python 3.13 beta 2 build fails on Windows when using both --experimental-jit and --disable-gil #120326

Eclips4 · 2024-06-10T21:07:20Z

@cdgriffith can you confirm that this resolves the issue?

cdgriffith · 2024-06-10T21:26:20Z

@Eclips4 The build completes, and produces a 3.14 executable (assuming this will also be merged into 3.13).

Thank you for fast fix!

Include/object.h

Misc/NEWS.d/next/Build/2024-06-11-00-38-05.gh-issue-120326.JHSDF1.rst

vstinner

LGTM, I just left minor suggestions.

…DF1.rst Co-authored-by: Victor Stinner <vstinner@python.org>

Co-authored-by: Victor Stinner <vstinner@python.org>

Eclips4 · 2024-06-11T13:12:30Z

Thanks for the review, Victor.

vstinner

LGTM

vstinner

Oh wait, now I recall vaguely a C++20 module issue if the include is done inside a extern "C" { ... }. Would it be possible to move the include to Python.h, and add a comment explaining why it's needed, mention at least one function which is used?

Also, is this include only needed for Free Threading, or for JIT compiler, or both?

vstinner · 2024-06-11T15:46:06Z

Thanks, I enabled auto-merge.

For example, I see that _Py_ThreadId() uses:

#if defined(_MSC_VER) && defined(_M_X64)                           
    tid = __readgsqword(48);

Eclips4 · 2024-06-11T16:22:47Z

@vstinner I've disabled automerge due to failure of "Tests / Windows (free-threading) / build and test (x86) (pull_request)" job (see https://github.com/python/cpython/actions/runs/9468440435/attempts/1?pr=120329) . I've re-run it and seems it will pass (UPD: Yes, it is).

I don't know if it is related to this pull request, but it is definitely something strange, and I am not sure we can merge it now. However, I cannot reproduce the failure from the job locally on my Windows setup :(

miss-islington-app · 2024-06-11T17:50:25Z

Thanks @Eclips4 for the PR, and @vstinner for merging it 🌮🎉.. I'm working now to backport this PR to: 3.13.
🐍🍒⛏🤖

…ythonGH-120329) (cherry picked from commit 939c201) Co-authored-by: Kirill Podoprigora <kirill.bast9@mail.ru>

bedevere-app · 2024-06-11T17:50:36Z

GH-120363 is a backport of this pull request to the 3.13 branch.

vstinner · 2024-06-11T17:51:11Z

@vstinner I've disabled automerge due to failure of "Tests / Windows (free-threading) / build and test (x86) (pull_request)" job (see https://github.com/python/cpython/actions/runs/9468440435/attempts/1?pr=120329) . I've re-run it and seems it will pass (UPD: Yes, it is).

I don't see how an include can trigger this issue. It's strange since the job passed when re-run.

vstinner · 2024-06-11T17:55:40Z

Oh, the x86 job failed again on the commit checks: https://github.com/python/cpython/actions/runs/9470417218/job/26091279722

Run .\python.bat -m test.pythoninfo
Running Debug|Win32 interpreter...
Error: Process completed with exit code 1.

vstinner · 2024-06-11T18:18:42Z

I built Python with Free Threading on Windows for x86: I failed to reproduce the issue.

I ran PCbuild\build.bat -e -d -p x86 --disable-gil to build Python, and then I ran python.bat -m test.pythoninfo.

vstinner · 2024-06-12T08:52:34Z

Windows x86 Free Threading failed 2x in a row, and then succeeded 5x in a row. This bug is strange. I don't know how to debug it since I cannot reproduce it locally.

miss-islington-app · 2024-06-12T15:11:56Z

Thanks @Eclips4 for the PR, and @vstinner for merging it 🌮🎉.. I'm working now to backport this PR to: 3.13.
🐍🍒⛏🤖

…ythonGH-120329) (cherry picked from commit 939c201) Co-authored-by: Kirill Podoprigora <kirill.bast9@mail.ru>

bedevere-app · 2024-06-12T15:12:08Z

GH-120414 is a backport of this pull request to the 3.13 branch.

…H-120329) (#120414) gh-120326: Include <intrin.h> on Windows with Free Threading (GH-120329) (cherry picked from commit 939c201) Co-authored-by: Kirill Podoprigora <kirill.bast9@mail.ru>

…ython#120329)

include intrih.h on windows

999ee5f

Eclips4 requested a review from brandtbucher June 10, 2024 20:18

bedevere-app bot mentioned this pull request Jun 10, 2024

Python 3.13 beta 2 build fails on Windows when using both --experimental-jit and --disable-gil #120326

Closed

bedevere-app bot added the awaiting review label Jun 10, 2024

AlexWaygood changed the title ~~gh-120326: Include intrih.h on Windows~~ gh-120326: Include intrin.h on Windows Jun 10, 2024

Eclips4 added the needs backport to 3.13 bugs and security fixes label Jun 10, 2024

Add a NEWS entry

4532019

vstinner reviewed Jun 11, 2024

View reviewed changes

Include/object.h Outdated Show resolved Hide resolved

vstinner reviewed Jun 11, 2024

View reviewed changes

Misc/NEWS.d/next/Build/2024-06-11-00-38-05.gh-issue-120326.JHSDF1.rst Outdated Show resolved Hide resolved

vstinner approved these changes Jun 11, 2024

View reviewed changes

bedevere-app bot added awaiting merge and removed awaiting review labels Jun 11, 2024

Eclips4 and others added 2 commits June 11, 2024 16:12

Update Misc/NEWS.d/next/Build/2024-06-11-00-38-05.gh-issue-120326.JHS…

12bed42

…DF1.rst Co-authored-by: Victor Stinner <vstinner@python.org>

Update Include/object.h

17e9a4a

Co-authored-by: Victor Stinner <vstinner@python.org>

vstinner approved these changes Jun 11, 2024

View reviewed changes

vstinner reviewed Jun 11, 2024

View reviewed changes

Move include to Pytho.h

5a1dd9c

vstinner enabled auto-merge (squash) June 11, 2024 15:43

Eclips4 disabled auto-merge June 11, 2024 16:18

vstinner merged commit 939c201 into python:main Jun 11, 2024

bedevere-app bot removed the awaiting merge label Jun 11, 2024

bedevere-app bot removed the needs backport to 3.13 bugs and security fixes label Jun 11, 2024

vstinner mentioned this pull request Jun 11, 2024

[3.13] gh-120326: Include <intrin.h> on Windows with Free Threading (GH-120329) #120363

Closed

vstinner added the needs backport to 3.13 bugs and security fixes label Jun 12, 2024

bedevere-app bot removed the needs backport to 3.13 bugs and security fixes label Jun 12, 2024

Eclips4 deleted the issue-120326 branch June 15, 2024 16:13

mrahtz pushed a commit to mrahtz/cpython that referenced this pull request Jun 30, 2024

pythongh-120326: Include <intrin.h> on Windows with Free Threading (p…

3ab7b39

…ython#120329)

noahbkim pushed a commit to hudson-trading/cpython that referenced this pull request Jul 11, 2024

pythongh-120326: Include <intrin.h> on Windows with Free Threading (p…

1eae91b

…ython#120329)

estyxx pushed a commit to estyxx/cpython that referenced this pull request Jul 17, 2024

pythongh-120326: Include <intrin.h> on Windows with Free Threading (p…

c41f116

…ython#120329)

Uh oh!

Conversation

Eclips4 commented Jun 10, 2024 • edited by bedevere-app bot Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

Eclips4 commented Jun 10, 2024

Uh oh!

cdgriffith commented Jun 10, 2024

Uh oh!

Uh oh!

Uh oh!

vstinner left a comment

Choose a reason for hiding this comment

Uh oh!

Eclips4 commented Jun 11, 2024

Uh oh!

vstinner left a comment

Choose a reason for hiding this comment

Uh oh!

vstinner left a comment

Choose a reason for hiding this comment

Uh oh!

vstinner commented Jun 11, 2024

Uh oh!

Eclips4 commented Jun 11, 2024 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

miss-islington-app bot commented Jun 11, 2024

Uh oh!

bedevere-app bot commented Jun 11, 2024

Uh oh!

vstinner commented Jun 11, 2024

Uh oh!

vstinner commented Jun 11, 2024

Uh oh!

vstinner commented Jun 11, 2024

Uh oh!

vstinner commented Jun 12, 2024

Uh oh!

miss-islington-app bot commented Jun 12, 2024

Uh oh!

bedevere-app bot commented Jun 12, 2024

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

3 participants

Eclips4 commented Jun 10, 2024 •

edited by bedevere-app bot

Loading

Eclips4 commented Jun 11, 2024 •

edited

Loading