Skip to content

gh-124613, regrtest: Detect JIT build in build info #124793

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.

Sign up for GitHub

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

Merged
merged 5 commits into from
Sep 30, 2024
Merged

gh-124613, regrtest: Detect JIT build in build info #124793

Changes from 2 commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
f7abe5b
gh-124613, regrtest: Detect JIT build in build info
vstinner Sep 30, 2024
7f630cc
Read also PYTHON_JIT env var
vstinner Sep 30, 2024
7fedd5d
Document tier2 values
vstinner Sep 30, 2024
ac2a8aa
JIT and interpreter can be turned off as well
vstinner Sep 30, 2024
4f77477
regrtest: log PYTHON_GIL in build_info
vstinner Sep 30, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
39 changes: 36 additions & 3 deletions Lib/test/libregrtest/utils.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -300,7 +300,7 @@ def get_build_info():

config_args = sysconfig.get_config_var('CONFIG_ARGS') or ''
cflags = sysconfig.get_config_var('PY_CFLAGS') or ''
cflags_nodist = sysconfig.get_config_var('PY_CFLAGS_NODIST') or ''
cflags += ' ' + (sysconfig.get_config_var('PY_CFLAGS_NODIST') or '')
ldflags_nodist = sysconfig.get_config_var('PY_LDFLAGS_NODIST') or ''

build = []
Expand All @@ -313,16 +313,49 @@ def get_build_info():
# --with-pydebug
build.append('debug')

if '-DNDEBUG' in (cflags + cflags_nodist):
if '-DNDEBUG' in cflags:
build.append('without_assert')
else:
build.append('release')

if '--with-assertions' in config_args:
build.append('with_assert')
elif '-DNDEBUG' not in (cflags + cflags_nodist):
elif '-DNDEBUG' not in cflags:
build.append('with_assert')

# --enable-experimental-jit
tier2 = re.search('-D_Py_TIER2=([0-9]+)', cflags)
if tier2:
tier2 = int(tier2.group(1))

if not sys.flags.ignore_environment:
PYTHON_JIT = os.environ.get('PYTHON_JIT', '')
if PYTHON_JIT:
PYTHON_JIT = (PYTHON_JIT != '0')
else:
PYTHON_JIT = None

if tier2 == 1:
jit = 'JIT' # =yes
elif tier2 == 3:
if PYTHON_JIT:
jit = 'JIT=on'
else:
jit = 'JIT=off'
elif tier2 == 4:
jit = 'JIT=interpreter'
elif tier2 == 6: # Secret option
if PYTHON_JIT:
jit = 'JIT=interpreter-on'
else:
jit = 'JIT=interpreter-off'
elif '-D_Py_JIT' in cflags:
jit = 'JIT'
else:
jit = None
if jit:
build.append(jit)

# --enable-framework=name
framework = sysconfig.get_config_var('PYTHONFRAMEWORK')
if framework:
Expand Down
Loading