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

Fewer anonymous funcs and despecialize inference #2131

Open
wants to merge 7 commits into
base: main
Choose a base branch
from
Open

Fewer anonymous funcs and despecialize inference #2131

Show file tree
Hide file tree
Changes from 5 commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
82352c2
Fewer anonymous funcs
wsmoses Nov 28, 2024
1ef3b56
minor cleanup
wsmoses Nov 28, 2024
30401f7
cleanup
wsmoses Nov 28, 2024
bdb69ba
fix
wsmoses Nov 28, 2024
083757b
Aggressively noinfer
wsmoses Nov 28, 2024
0aaa964
Merge branch 'main' into fanon
wsmoses Dec 7, 2024
d32a06f
Update utils.jl
wsmoses Dec 7, 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
18 changes: 9 additions & 9 deletions src/absint.jl
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
# Abstractly interpret julia from LLVM

# Return (bool if could interpret, julia object interpreted to)
function absint(arg::LLVM.Value, partial::Bool = false)
Base.@nospecializeinfer function absint(@nospecialize(arg::LLVM.Value), partial::Bool = false)::Tuple{Bool,Any}
if isa(arg, LLVM.BitCastInst) || isa(arg, LLVM.AddrSpaceCastInst)
return absint(operands(arg)[1], partial)
end
Expand Down Expand Up @@ -165,7 +165,7 @@ function absint(arg::LLVM.Value, partial::Bool = false)
return (false, nothing)
end

function actual_size(@nospecialize(typ2))
Base.@nospecializeinfer function actual_size(@nospecialize(typ2))::Int
@static if VERSION < v"1.11-"
if typ2 <: Array
return sizeof(Ptr{Cvoid}) + 2 + 2 + 4 + 2 * sizeof(Csize_t) + sizeof(Csize_t)
Expand All @@ -184,10 +184,10 @@ function actual_size(@nospecialize(typ2))
end
end

@inline function first_non_ghost(@nospecialize(typ2))
Base.@nospecializeinfer @inline function first_non_ghost(@nospecialize(typ2))::Tuple{Int, Int}
@static if VERSION < v"1.11-"
if typ2 <: Array
return (1, typed_fieldtype(typ2, 1))
return (1, 0)
end
end
fc = fieldcount(typ2)
Expand All @@ -204,7 +204,7 @@ end
return (-1, 0)
end

function should_recurse(@nospecialize(typ2), arg_t, byref, dl)
Base.@nospecializeinfer function should_recurse(@nospecialize(typ2), @nospecialize(arg_t::LLVM.LLVMType), byref::GPUCompiler.ArgumentCC, dl::LLVM.DataLayout)::Bool
sz = sizeof(dl, arg_t)
if byref != GPUCompiler.BITS_VALUE
if sz != sizeof(Int)
Expand All @@ -228,7 +228,7 @@ function should_recurse(@nospecialize(typ2), arg_t, byref, dl)
end
end

function get_base_and_offset(larg::LLVM.Value; offsetAllowed=true, inttoptr=false)::Tuple{LLVM.Value, Int}
Base.@nospecializeinfer function get_base_and_offset(@nospecialize(larg::LLVM.Value); offsetAllowed::Bool=true, inttoptr::Bool=false)::Tuple{LLVM.Value, Int}
offset = 0
while true
if isa(larg, LLVM.ConstantExpr)
Expand Down Expand Up @@ -276,8 +276,8 @@ function get_base_and_offset(larg::LLVM.Value; offsetAllowed=true, inttoptr=fals
return larg, offset
end

function abs_typeof(
arg::LLVM.Value,
Base.@nospecializeinfer function abs_typeof(
@nospecialize(arg::LLVM.Value),
partial::Bool = false, seenphis=Set{LLVM.PHIInst}()
)::Union{Tuple{Bool,Type,GPUCompiler.ArgumentCC},Tuple{Bool,Nothing,Nothing}}
if isa(arg, LLVM.BitCastInst) || isa(arg, LLVM.AddrSpaceCastInst)
Expand Down Expand Up @@ -729,7 +729,7 @@ function abs_typeof(
return (false, nothing, nothing)
end

function abs_cstring(arg::LLVM.Value)::Tuple{Bool,String}
Base.@nospecializeinfer function abs_cstring(@nospecialize(arg::LLVM.Value))::Tuple{Bool,String}
if isa(arg, ConstantExpr)
ce = arg
while isa(ce, ConstantExpr)
Expand Down
Loading
Loading