-
-
Notifications
You must be signed in to change notification settings - Fork 198
Patch 3.14.0a5 PGO on Windows amd64 #526
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 our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
Closed
Closed
Changes from all commits
Commits
File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
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 |
---|---|---|
@@ -0,0 +1,72 @@ | ||
diff --git a/Python/ceval.c b/Python/ceval.c | ||
index c6a7a0f841f027..5f8f0ae69ef31b 100644 | ||
--- a/Python/ceval.c | ||
+++ b/Python/ceval.c | ||
@@ -764,15 +764,10 @@ _PyObjectArray_Free(PyObject **array, PyObject **scratch) | ||
#define PY_EVAL_C_STACK_UNITS 2 | ||
|
||
|
||
-/* _PyEval_EvalFrameDefault is too large to optimize for speed with PGO on MSVC | ||
- when the JIT is enabled or GIL is disabled. Disable that optimization around | ||
- this function only. If this is fixed upstream, we should gate this on the | ||
- version of MSVC. | ||
+/* _PyEval_EvalFrameDefault is too large to optimize for speed with PGO on MSVC. | ||
*/ | ||
#if (defined(_MSC_VER) && \ | ||
- defined(_Py_USING_PGO) && \ | ||
- (defined(_Py_JIT) || \ | ||
- defined(Py_GIL_DISABLED))) | ||
+ defined(_Py_USING_PGO)) | ||
#define DO_NOT_OPTIMIZE_INTERP_LOOP | ||
#endif | ||
diff --git a/PCbuild/pyproject.props b/PCbuild/pyproject.props | ||
index dbdb6b743bea37..17abfa85201a90 100644 | ||
--- a/PCbuild/pyproject.props | ||
+++ b/PCbuild/pyproject.props | ||
@@ -53,6 +53,7 @@ | ||
<ClCompile> | ||
<AdditionalIncludeDirectories>$(PySourcePath)Include;$(PySourcePath)Include\internal;$(PySourcePath)Include\internal\mimalloc;$(GeneratedPyConfigDir);$(PySourcePath)PC;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories> | ||
<PreprocessorDefinitions>WIN32;$(_Py3NamePreprocessorDefinition);$(_PlatformPreprocessorDefinition)$(_DebugPreprocessorDefinition)$(_PyStatsPreprocessorDefinition)$(_PydPreprocessorDefinition)%(PreprocessorDefinitions)</PreprocessorDefinitions> | ||
+ <PreprocessorDefinitions Condition="'$(SupportPGO)' and ($(Configuration) == 'PGInstrument' or $(Configuration) == 'PGUpdate')">_Py_USING_PGO=1;%(PreprocessorDefinitions)</PreprocessorDefinitions> | ||
|
||
<Optimization>MaxSpeed</Optimization> | ||
<IntrinsicFunctions>true</IntrinsicFunctions> | ||
diff --git a/Python/ceval.c b/Python/ceval.c | ||
index 1e4f1f3af20aca..c6a7a0f841f027 100644 | ||
--- a/Python/ceval.c | ||
+++ b/Python/ceval.c | ||
@@ -764,6 +764,23 @@ _PyObjectArray_Free(PyObject **array, PyObject **scratch) | ||
#define PY_EVAL_C_STACK_UNITS 2 | ||
|
||
|
||
+/* _PyEval_EvalFrameDefault is too large to optimize for speed with PGO on MSVC | ||
+ when the JIT is enabled or GIL is disabled. Disable that optimization around | ||
+ this function only. If this is fixed upstream, we should gate this on the | ||
+ version of MSVC. | ||
+ */ | ||
+#if (defined(_MSC_VER) && \ | ||
+ defined(_Py_USING_PGO) && \ | ||
+ (defined(_Py_JIT) || \ | ||
+ defined(Py_GIL_DISABLED))) | ||
+#define DO_NOT_OPTIMIZE_INTERP_LOOP | ||
+#endif | ||
+ | ||
+#ifdef DO_NOT_OPTIMIZE_INTERP_LOOP | ||
+# pragma optimize("t", off) | ||
+/* This setting is reversed below following _PyEval_EvalFrameDefault */ | ||
+#endif | ||
+ | ||
#ifdef Py_TAIL_CALL_INTERP | ||
#include "opcode_targets.h" | ||
#include "generated_cases.c.h" | ||
@@ -986,6 +1003,10 @@ _PyEval_EvalFrameDefault(PyThreadState *tstate, _PyInterpreterFrame *frame, int | ||
return NULL; | ||
} | ||
|
||
+#ifdef DO_NOT_OPTIMIZE_INTERP_LOOP | ||
+# pragma optimize("", on) | ||
+#endif | ||
+ | ||
#if defined(__GNUC__) | ||
# pragma GCC diagnostic pop | ||
#elif defined(_MSC_VER) /* MS_WINDOWS */ |
Oops, something went wrong.
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.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Presuming
patch
isn't available here and is why we don't have Windows patchfiles, but we'll see. Will follow with another approach if so.There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
git apply
might work too if you have git.