Skip to content

Fix various issues with dwarf emission: #7116

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
sklam merged 14 commits into from
Jun 28, 2021
Merged

Fix various issues with dwarf emission: #7116

Changes from 1 commit
Commits
Show all changes
14 commits
Select commit Hold shift + click to select a range
51d0563
Change lang in compile_unit
vlad-perevezentsev Jun 1, 2021
5b295cc
Fix various issues with dwarf emission:
stuartarchibald Jun 11, 2021
bf19801
Add some basic testing of debug information.
stuartarchibald Jun 15, 2021
b727829
Add test for arg variable location
stuartarchibald Jun 21, 2021
77f4530
Remove remark about 'jumping' debug info from docs
stuartarchibald Jun 21, 2021
777f495
Merge remote-tracking branch 'upstream/master' into fix/7103
stuartarchibald Jun 21, 2021
f9f3a91
Fix up tests WRT alloca opt patch
stuartarchibald Jun 21, 2021
ed5183e
Numerous improvements/fixes.
stuartarchibald Jun 23, 2021
fc5859b
Fix test case to prevent reordering.
stuartarchibald Jun 23, 2021
78989a0
Merge remote-tracking branch 'upstream/master' into fix/7103
stuartarchibald Jun 25, 2021
b11eb20
Fix kwarg change
stuartarchibald Jun 25, 2021
7bb2960
Do not add vectorization helper passes at OPT=0
stuartarchibald Jun 25, 2021
c0d9ee8
Update comment
stuartarchibald Jun 28, 2021
8329107
Add predicate for debug emission throughout lowering.
stuartarchibald Jun 28, 2021
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
Prev Previous commit
Add predicate for debug emission throughout lowering. 
As title.
  • Loading branch information
@stuartarchibald
stuartarchibald committed Jun 28, 2021
commit 83291074f78b0c1fd178dd13d846ec799b94a7a5
29 changes: 18 additions & 11 deletions numba/core/lowering.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,6 +29,7 @@ def __init__(self, context, library, fndesc, func_ir, metadata=None):
self.call_conv = context.call_conv
self.generator_info = func_ir.generator_info
self.metadata = metadata
self.flags = utils.ConfigStack.top_or_none()

# Initialize LLVM
self.module = self.library.create_ir_module(self.fndesc.unique_name)
Expand Down Expand Up @@ -279,6 +280,14 @@ def init(self):
# find all singly assigned variables
self._find_singly_assigned_variable()

@property
def _disable_sroa_like_opt(self):
"""Flags that the SROA like optimisation that Numba performs (which
prevent alloca and subsequent load/store for locals) should be disabled.
Currently, this is conditional solely on the presence of a request for
the emission of debug information."""
return False if self.flags is None else self.flags.debuginfo

def _find_singly_assigned_variable(self):
func_ir = self.func_ir
blocks = func_ir.blocks
Expand Down Expand Up @@ -1285,8 +1294,8 @@ def _alloca_var(self, name, fetype):
return

# If the name is used in multiple blocks or lowering with debuginfo...
flags = utils.ConfigStack.top_or_none()
if (name not in self._singly_assigned_vars) or flags.debuginfo:
if ((name not in self._singly_assigned_vars) or
self._disable_sroa_like_opt):
# If not already defined, allocate it
llty = self.context.get_value_type(fetype)
ptr = self.alloca_lltype(name, llty)
Expand All @@ -1297,8 +1306,7 @@ def getvar(self, name):
"""
Get a pointer to the given variable's slot.
"""
flags = utils.ConfigStack.top_or_none()
if not flags.debuginfo:
if not self._disable_sroa_like_opt:
assert name not in self._blk_local_varmap
assert name not in self._singly_assigned_vars
return self.varmap[name]
Expand All @@ -1307,8 +1315,7 @@ def loadvar(self, name):
"""
Load the given variable's value.
"""
flags = utils.ConfigStack.top_or_none()
if name in self._blk_local_varmap and not flags.debuginfo:
if name in self._blk_local_varmap and not self._disable_sroa_like_opt:
return self._blk_local_varmap[name]
ptr = self.getvar(name)
return self.builder.load(ptr)
Expand All @@ -1322,8 +1329,8 @@ def storevar(self, value, name):
self._alloca_var(name, fetype)

# Store variable
flags = utils.ConfigStack.top_or_none()
if name in self._singly_assigned_vars and not flags.debuginfo:
if (name in self._singly_assigned_vars and
not self._disable_sroa_like_opt):
self._blk_local_varmap[name] = value
else:
# Clean up existing value stored in the variable
Expand All @@ -1347,18 +1354,18 @@ def delvar(self, name):
Delete the given variable.
"""
fetype = self.typeof(name)
flags = utils.ConfigStack.top_or_none()

# Out-of-order
if name not in self._blk_local_varmap and not flags.debuginfo:
if (name not in self._blk_local_varmap and
not self._disable_sroa_like_opt):
if name in self._singly_assigned_vars:
self._singly_assigned_vars.discard(name)

# Define if not already (may happen if the variable is deleted
# at the beginning of a loop, but only set later in the loop)
self._alloca_var(name, fetype)

if name in self._blk_local_varmap and not flags.debuginfo:
if name in self._blk_local_varmap and not self._disable_sroa_like_opt:
llval = self._blk_local_varmap[name]
self.decref(fetype, llval)
else:
Expand Down