unix: BOLT fixes #463
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,50 @@ | ||
| diff --git a/configure.ac b/configure.ac | ||
| index bc8c357e996..eef55d4839a 100644 | ||
| --- a/configure.ac | ||
| +++ b/configure.ac | ||
| @@ -2104,6 +2104,27 @@ AS_VAR_IF([enable_shared], [yes], [ | ||
| BOLT_BINARIES="${BOLT_BINARIES} \$(INSTSONAME)" | ||
| ]) | ||
|
|
||
| +AC_ARG_VAR( | ||
| + [BOLT_COMMON_FLAGS], | ||
| + [Common arguments to llvm-bolt when instrumenting and applying] | ||
| +) | ||
| + | ||
| +AC_MSG_CHECKING([BOLT_COMMON_FLAGS]) | ||
| +if test -z "${BOLT_COMMON_FLAGS}" | ||
| +then | ||
| + AS_VAR_SET( | ||
| + [BOLT_COMMON_FLAGS], | ||
| + [m4_normalize(" | ||
| + [-update-debug-sections] | ||
| + | ||
| + dnl At least LLVM 19.x doesn't support computed gotos in PIC compiled code. | ||
| + dnl Exclude functions containing computed gotos. | ||
| + dnl TODO this may be fixed in LLVM 20.x via https://github.com/llvm/llvm-project/pull/120267. | ||
| + [-skip-funcs=_PyEval_EvalFrameDefault,sre_ucs1_match/1,sre_ucs2_match/1,sre_ucs4_match/1] | ||
| + ")] | ||
| + ) | ||
| +fi | ||
| + | ||
| AC_ARG_VAR( | ||
| [BOLT_INSTRUMENT_FLAGS], | ||
| [Arguments to llvm-bolt when instrumenting binaries] | ||
| @@ -2111,7 +2132,7 @@ AC_ARG_VAR( | ||
| AC_MSG_CHECKING([BOLT_INSTRUMENT_FLAGS]) | ||
| if test -z "${BOLT_INSTRUMENT_FLAGS}" | ||
| then | ||
| - BOLT_INSTRUMENT_FLAGS= | ||
| + BOLT_INSTRUMENT_FLAGS="${BOLT_COMMON_FLAGS}" | ||
| fi | ||
| AC_MSG_RESULT([$BOLT_INSTRUMENT_FLAGS]) | ||
|
|
||
| @@ -2125,7 +2146,7 @@ then | ||
| AS_VAR_SET( | ||
| [BOLT_APPLY_FLAGS], | ||
| [m4_normalize(" | ||
| - -update-debug-sections | ||
| + ${BOLT_COMMON_FLAGS} | ||
| -reorder-blocks=ext-tsp | ||
| -reorder-functions=hfsort+ | ||
| -split-functions |
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,36 @@ | ||
| diff --git a/Lib/test/test_embed.py b/Lib/test/test_embed.py | ||
| index 7110fb889f3..61e4d0f6179 100644 | ||
| --- a/Lib/test/test_embed.py | ||
| +++ b/Lib/test/test_embed.py | ||
| @@ -940,6 +940,7 @@ def check_all_configs(self, testname, expected_config=None, | ||
| self.check_global_config(configs) | ||
| return configs | ||
|
|
||
| + @unittest.skip("segfaults on BOLT instrumented binaries") | ||
| def test_init_default_config(self): | ||
| self.check_all_configs("test_init_initialize_config", api=API_COMPAT) | ||
|
|
||
| @@ -1039,6 +1040,7 @@ def test_init_from_config(self): | ||
| self.check_all_configs("test_init_from_config", config, preconfig, | ||
| api=API_COMPAT) | ||
|
|
||
| + @unittest.skip("segfaults on BOLT instrumented binaries") | ||
| def test_init_compat_env(self): | ||
| preconfig = { | ||
| 'allocator': ALLOCATOR_FOR_CONFIG, | ||
| @@ -1074,6 +1076,7 @@ def test_init_compat_env(self): | ||
| self.check_all_configs("test_init_compat_env", config, preconfig, | ||
| api=API_COMPAT) | ||
|
|
||
| + @unittest.skip("segfaults on BOLT instrumented binaries") | ||
| def test_init_python_env(self): | ||
| preconfig = { | ||
| 'allocator': ALLOCATOR_FOR_CONFIG, | ||
| @@ -1772,6 +1775,7 @@ def test_init_set_config(self): | ||
| self.check_all_configs("test_init_set_config", config, | ||
| api=API_ISOLATED) | ||
|
|
||
| + @unittest.skip("segfaults on BOLT instrumented binaries") | ||
| def test_initconfig_api(self): | ||
| preconfig = { | ||
| 'configure_locale': True, |
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,20 @@ | ||
| diff --git a/Lib/test/test_embed.py b/Lib/test/test_embed.py | ||
| index 13713cf37b8..ba23880b15f 100644 | ||
| --- a/Lib/test/test_embed.py | ||
| +++ b/Lib/test/test_embed.py | ||
| @@ -1615,6 +1615,7 @@ def test_getpath_abspath_win32(self): | ||
| for (_, expected), result in zip(CASES, results): | ||
| self.assertEqual(result, expected) | ||
|
|
||
| + @unittest.skip("segfaults on BOLT instrumented binaries") | ||
| def test_global_pathconfig(self): | ||
| # Test C API functions getting the path configuration: | ||
| # | ||
| @@ -1866,6 +1867,7 @@ def test_no_memleak(self): | ||
| self.assertEqual(blocks, 0, out) | ||
|
|
||
|
|
||
| [email protected]("segfaults on BOLT instrumented binaries") | ||
| class StdPrinterTests(EmbeddingTestsMixin, unittest.TestCase): | ||
| # Test PyStdPrinter_Type which is used by _PySys_SetPreliminaryStderr(): | ||
| # "Set up a preliminary stderr printer until we have enough |
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.
Should these also be gated by
-n "${BOLT_CAPABLE}"so we don't disable tests unnecessarily?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.
We don't actually run the full suite of tests. So it doesn't matter today.
(It would be nice to actually run the full test suite against the built distribution but that's for another PR I suppose.)
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.
Won't these be reflected in the distributed Python too? Like, a consumer would have these tests disabled?
Agree it doesn't seem critical.
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.
Oh, right, I forgot we distributed the unit tests.
I'll file an issue to clean things up. Agree we could do something better here. And we may be paving over a legit bug somewhere by disabling tests that segfault.