Begin work on new optimizer framework

This introduces a new framework for middle-end optimizations in julia, based on SSA form IR. Much work is still left to be done, but thanks to Jameson's work this is in a bootstrappable form, so we're merging it behind a feature flag to allow for quick iteration. Documentation of the new IR format is available in the devdocs. Co-authored-by: Jameson Nash <[email protected]>
JuliaLang · Feb 27, 2018 · 8345b78 · 8345b78
1 parent ae3895d
commit 8345b78
Show file tree

Hide file tree

Showing 42 changed files with 2,662 additions and 367 deletions.
diff --git a/base/array.jl b/base/array.jl
@@ -214,6 +214,16 @@ end
 
 copyto!(dest::Array{T}, src::Array{T}) where {T} = copyto!(dest, 1, src, 1, length(src))
 
+# N.B: The generic definition in multidimensional.jl covers, this, this is just here
+# for bootstrapping purposes.
+function fill!(dest::Array{T}, x) where T
+ xT = convert(T, x)
+ for i in 1:length(dest)
+ @inbounds dest[i] = xT
+ end
+ dest
+end
+
 """
  copy(x)
 

diff --git a/base/boot.jl b/base/boot.jl
@@ -98,6 +98,16 @@
 # label::Int
 #end
 
+#struct PiNode
+# val
+# typ
+#end
+
+#struct PhiNode
+# edges::Vector{Any}
+# values::Vector{Any}
+#end
+
 #struct QuoteNode
 # value
 #end
@@ -141,7 +151,7 @@ export
  TypeError, ArgumentError, MethodError, AssertionError, LoadError, InitError,
  UndefKeywordError,
  # AST representation
- Expr, QuoteNode, LineNumberNode, GlobalRef,
+ Expr, QuoteNode, LineNumberNode, GlobalRef, PiNode, PhiNode,
  # object model functions
  fieldtype, getfield, setfield!, nfields, throw, tuple, ===, isdefined, eval,
  # sizeof # not exported, to avoid conflicting with Base.sizeof
@@ -344,6 +354,8 @@ eval(Core, :(LineNumberNode(l::Int, @nospecialize(f)) = $(Expr(:new, :LineNumber
 eval(Core, :(GlobalRef(m::Module, s::Symbol) = $(Expr(:new, :GlobalRef, :m, :s))))
 eval(Core, :(SlotNumber(n::Int) = $(Expr(:new, :SlotNumber, :n))))
 eval(Core, :(TypedSlot(n::Int, @nospecialize(t)) = $(Expr(:new, :TypedSlot, :n, :t))))
+eval(Core, :(PhiNode(edges::Array{Any, 1}, values::Array{Any, 1}) = $(Expr(:new, :PhiNode, :edges, :values))))
+eval(Core, :(PiNode(val, typ) = $(Expr(:new, :PiNode, :val, :typ))))
 
 Module(name::Symbol=:anonymous, std_imports::Bool=true) = ccall(:jl_f_new_module, Ref{Module}, (Any, Bool), name, std_imports)
 

diff --git a/base/checked.jl b/base/checked.jl
@@ -13,7 +13,7 @@ import Core.Intrinsics:
  checked_srem_int,
  checked_uadd_int, checked_usub_int, checked_umul_int, checked_udiv_int,
  checked_urem_int
-import Base: no_op_err, @_inline_meta, @_noinline_meta
+import ..no_op_err, ..@_inline_meta, ..@_noinline_meta
 
 # define promotion behavior for checked operations
 checked_add(x::Integer, y::Integer) = checked_add(promote(x,y)...)

diff --git a/base/compiler/bootstrap.jl b/base/compiler/bootstrap.jl
@@ -31,5 +31,3 @@ let fs = Any[typeinf_ext, typeinf, typeinf_edge, pure_eval_call],
  end
  end
 end
-
-ccall(:jl_set_typeinf_func, Cvoid, (Any,), typeinf_ext)
diff --git a/base/compiler/compiler.jl b/base/compiler/compiler.jl
@@ -50,6 +50,14 @@ include("refvalue.jl")
 # checked arithmetic
 const checked_add = +
 const checked_sub = -
+const SignedInt = Union{Int8,Int16,Int32,Int64,Int128}
+const UnsignedInt = Union{UInt8,UInt16,UInt32,UInt64,UInt128}
+sub_with_overflow(x::T, y::T) where {T<:SignedInt} = checked_ssub_int(x, y)
+sub_with_overflow(x::T, y::T) where {T<:UnsignedInt} = checked_usub_int(x, y)
+sub_with_overflow(x::Bool, y::Bool) = (x-y, false)
+add_with_overflow(x::T, y::T) where {T<:SignedInt} = checked_sadd_int(x, y)
+add_with_overflow(x::T, y::T) where {T<:UnsignedInt} = checked_uadd_int(x, y)
+add_with_overflow(x::Bool, y::Bool) = (x+y, false)
 
 # core array operations
 include("indices.jl")
@@ -66,12 +74,29 @@ include("reduce.jl")
 include("bitarray.jl")
 include("bitset.jl")
 include("abstractdict.jl")
+include("abstractset.jl")
 include("iterators.jl")
+using .Iterators: zip, enumerate
+using .Iterators: Flatten, product # for generators
 include("namedtuple.jl")
 
 # core docsystem
 include("docs/core.jl")
 
+# SubArray
+include("subarray.jl")
+macro views(x); esc(x); end
+
+# sorting
+function sort end
+function sort! end
+function issorted end
+function sortperm end
+include("ordering.jl")
+using .Order
+include("sort.jl")
+using .Sort
+
 ############
 # compiler #
 ############
@@ -96,6 +121,7 @@ include("compiler/typeinfer.jl")
 include("compiler/optimize.jl") # TODO: break this up further + extract utilities
 
 include("compiler/bootstrap.jl")
+ccall(:jl_set_typeinf_func, Cvoid, (Any,), typeinf_ext)
 
 end # baremodule Compiler
 ))