Skip to content

Replace Vector with BitSet in optimization passes #46587

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 7 commits into from
Oct 8, 2022
Merged

Replace Vector with BitSet in optimization passes #46587

Changes from all commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
0ae9def
remove unnecessary sort
Sep 2, 2022
633c294
Update base/compiler/ssair/passes.jl
LilithHafner Sep 2, 2022
fcd7783
Merge branch 'master' into remove-sort-allblocks
LilithHafner Sep 2, 2022
e47b722
switch to BitSet
Sep 2, 2022
7193f4e
Merge branch 'master' into remove-sort-allblocks
Sep 2, 2022
b6aefba
Merge branch 'master' into remove-sort-allblocks
LilithHafner Sep 4, 2022
9eea1b8
Merge branch 'master' into remove-sort-allblocks
LilithHafner Oct 4, 2022
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
14 changes: 7 additions & 7 deletions base/compiler/ssair/passes.jl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -72,7 +72,7 @@ function try_compute_fieldidx_stmt(ir::Union{IncrementalCompact,IRCode}, stmt::E
return try_compute_fieldidx(typ, field)
end

function find_curblock(domtree::DomTree, allblocks::Vector{Int}, curblock::Int)
function find_curblock(domtree::DomTree, allblocks::BitSet, curblock::Int)
# TODO: This can be much faster by looking at current level and only
# searching for those blocks in a sorted order
while !(curblock in allblocks) && curblock !== 0
Expand All @@ -92,7 +92,7 @@ function val_for_def_expr(ir::IRCode, def::Int, fidx::Int)
end
end

function compute_value_for_block(ir::IRCode, domtree::DomTree, allblocks::Vector{Int}, du::SSADefUse, phinodes::IdDict{Int, SSAValue}, fidx::Int, curblock::Int)
function compute_value_for_block(ir::IRCode, domtree::DomTree, allblocks::BitSet, du::SSADefUse, phinodes::IdDict{Int, SSAValue}, fidx::Int, curblock::Int)
curblock = find_curblock(domtree, allblocks, curblock)
def = 0
for stmt in du.defs
Expand All @@ -103,7 +103,7 @@ function compute_value_for_block(ir::IRCode, domtree::DomTree, allblocks::Vector
def == 0 ? phinodes[curblock] : val_for_def_expr(ir, def, fidx)
end

function compute_value_for_use(ir::IRCode, domtree::DomTree, allblocks::Vector{Int},
function compute_value_for_use(ir::IRCode, domtree::DomTree, allblocks::BitSet,
du::SSADefUse, phinodes::IdDict{Int, SSAValue}, fidx::Int, use::Int)
def, useblock, curblock = find_def_for_use(ir, domtree, allblocks, du, use)
if def == 0
Expand All @@ -122,7 +122,7 @@ end
# even when the allocation contains an uninitialized field, we try an extra effort to check
# if this load at `idx` have any "safe" `setfield!` calls that define the field
function has_safe_def(
ir::IRCode, domtree::DomTree, allblocks::Vector{Int}, du::SSADefUse,
ir::IRCode, domtree::DomTree, allblocks::BitSet, du::SSADefUse,
newidx::Int, idx::Int)
def, _, _ = find_def_for_use(ir, domtree, allblocks, du, idx)
# will throw since we already checked this `:new` site doesn't define this field
Expand Down Expand Up @@ -157,7 +157,7 @@ end

# find the first dominating def for the given use
function find_def_for_use(
ir::IRCode, domtree::DomTree, allblocks::Vector{Int}, du::SSADefUse, use::Int, inclusive::Bool=false)
ir::IRCode, domtree::DomTree, allblocks::BitSet, du::SSADefUse, use::Int, inclusive::Bool=false)
useblock = block_for_inst(ir.cfg, use)
curblock = find_curblock(domtree, allblocks, useblock)
local def = 0
Expand Down Expand Up @@ -1306,7 +1306,7 @@ function sroa_mutables!(ir::IRCode, defuses::IdDict{Int, Tuple{SPCSet, SSADefUse
# but we should come up with semantics for well defined semantics
# for uninitialized fields first.
ndefuse = length(fielddefuse)
blocks = Vector{Tuple{#=phiblocks=# Vector{Int}, #=allblocks=# Vector{Int}}}(undef, ndefuse)
blocks = Vector{Tuple{#=phiblocks=# Vector{Int}, #=allblocks=# BitSet}}(undef, ndefuse)
for fidx in 1:ndefuse
du = fielddefuse[fidx]
isempty(du.uses) && continue
Expand All @@ -1317,7 +1317,7 @@ function sroa_mutables!(ir::IRCode, defuses::IdDict{Int, Tuple{SPCSet, SSADefUse
else
phiblocks = iterated_dominance_frontier(ir.cfg, ldu, get!(lazydomtree))
end
allblocks = sort!(vcat(phiblocks, ldu.def_bbs); alg=QuickSort)
allblocks = union!(BitSet(phiblocks), ldu.def_bbs)
blocks[fidx] = phiblocks, allblocks
if fidx + 1 > length(defexpr.args)
for i = 1:length(du.uses)
Expand Down