Skip to content
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

Jump to bottom

optimizer: eliminate more isdefined checks #44755

Merged
merged 1 commit into from
Mar 28, 2022
Merged

optimizer: eliminate more isdefined checks #44755

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
22 changes: 10 additions & 12 deletions base/compiler/ssair/passes.jl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -372,10 +372,7 @@ function lift_leaves(compact::IncrementalCompact,
lift_arg!(compact, leaf, cache_key, def, 1+field, lifted_leaves)
continue
elseif isexpr(def, :new)
typ = widenconst(types(compact)[leaf])
if isa(typ, UnionAll)
typ = unwrap_unionall(typ)
end
typ = unwrap_unionall(widenconst(types(compact)[leaf]))
(isa(typ, DataType) && !isabstracttype(typ)) || return nothing
@assert !ismutabletype(typ)
if length(def.args) < 1+field
Expand Down Expand Up @@ -786,10 +783,7 @@ function sroa_pass!(ir::IRCode)
push!(preserved, preserved_arg.id)
continue
elseif isexpr(def, :new)
typ = widenconst(argextype(SSAValue(defidx), compact))
if isa(typ, UnionAll)
typ = unwrap_unionall(typ)
end
typ = unwrap_unionall(widenconst(argextype(SSAValue(defidx), compact)))
if typ isa DataType && !ismutabletype(typ)
record_immutable_preserve!(new_preserves, def, compact)
push!(preserved, preserved_arg.id)
Expand Down Expand Up @@ -948,10 +942,7 @@ function sroa_mutables!(ir::IRCode, defuses::IdDict{Int, Tuple{SPCSet, SSADefUse
defexpr = ir[SSAValue(idx)][:inst]
isexpr(defexpr, :new) || continue
newidx = idx
typ = ir.stmts[newidx][:type]
if isa(typ, UnionAll)
typ = unwrap_unionall(typ)
end
typ = unwrap_unionall(ir.stmts[newidx][:type])
# Could still end up here if we tried to setfield! on an immutable, which would
# error at runtime, but is not illegal to have in the IR.
ismutabletype(typ) || continue
Expand Down Expand Up @@ -1023,6 +1014,13 @@ function sroa_mutables!(ir::IRCode, defuses::IdDict{Int, Tuple{SPCSet, SSADefUse
end
has_safe_def(ir, get_domtree(), allblocks, du, newidx, use.idx) || @goto skip
end
else # always have some definition at the allocation site
for i = 1:length(du.uses)
use = du.uses[i]
if use.kind === :isdefined
ir[SSAValue(use.idx)][:inst] = true
end
end
end
end
# Everything accounted for. Go field by field and perform idf:
Expand Down
25 changes: 25 additions & 0 deletions test/compiler/irpasses.jl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -493,6 +493,31 @@ let src = code_typed1(isdefined_elim)
end
@test isdefined_elim() == Any[]

function abmult(r::Int, x0)
if r < 0
r = -r
end
f = x -> x * r
return @inline f(x0)
end
let src = code_typed1(abmult, (Int,Int))
@test is_scalar_replaced(src)
end
@test abmult(-3, 3) == 9

function abmult2(r0::Int, x0)
r::Int = r0
if r < 0
r = -r
end
f = x -> x * r
return f(x0)
end
let src = code_typed1(abmult2, (Int,Int))
@test is_scalar_replaced(src)
end
@test abmult2(-3, 3) == 9

# comparison lifting
# ==================

Expand Down