static_length instead of maybestaticlength

Author: chriselrod

src/LoopVectorization.jl

@@ -4,7 +4,7 @@ using Static: StaticInt, gt
 using VectorizationBase, SLEEFPirates, UnPack, OffsetArrays
 using VectorizationBase: register_size, register_count, cache_linesize, cache_size, has_opmask_registers,
   mask, pick_vector_width, MM, AbstractMask, data, grouped_strided_pointer, AbstractSIMD,
-  maybestaticlength, maybestaticsize, vzero, maybestaticrange, offsetprecalc, lazymul,
+  vzero, offsetprecalc, lazymul,
   vadd_nw, vadd_nsw, vadd_nuw, vsub_nw, vsub_nsw, vsub_nuw, vmul_nw, vmul_nsw, vmul_nuw,
     maybestaticfirst, maybestaticlast, gep, gesp, NativeTypes, #llvmptr,
     vfmadd, vfmsub, vfnmadd, vfnmsub, vfmadd_fast, vfmsub_fast, vfnmadd_fast, vfnmsub_fast, vfmadd231, vfmsub231, vfnmadd231, vfnmsub231,

src/broadcast.jl

@@ -385,7 +385,7 @@ function add_broadcast_loops!(ls::LoopSet, loopsyms::Vector{Symbol}, destsym::Sy
         push!(axes_tuple.args, Nrange)
         pushpreamble!(ls, Expr(:(=), Nlower, Expr(:call, lv(:maybestaticfirst), Nrange)))
         pushpreamble!(ls, Expr(:(=), Nupper, Expr(:call, lv(:maybestaticlast), Nrange)))
-        pushpreamble!(ls, Expr(:(=), Nlen, Expr(:call, lv(:maybestaticlength), Nrange)))
+        pushpreamble!(ls, Expr(:(=), Nlen, Expr(:call, GlobalRef(ArrayInterface,:static_length), Nrange)))
     end
 end
 # size of dest determines loops

src/modeling/graphs.jl

@@ -756,21 +756,21 @@ function add_block!(ls::LoopSet, ex::Expr, elementbytes::Int, position::Int)
     end
 end
 function maybestatic!(expr::Expr)
-    if expr.head === :call
-        f = first(expr.args)
-        if f === :length
-            expr.args[1] = lv(:maybestaticlength)
-        elseif f === :size && length(expr.args) == 3
-            i = expr.args[3]
-            if i isa Integer
-                expr.args[1] = lv(:maybestaticsize)
-                expr.args[3] = Expr(:call, Expr(:curly, :Val, convert(Int, i)))
-            end
-        else
-            static_literals!(expr)
-        end
+  if expr.head === :call
+    f = first(expr.args)
+    if f === :length
+      expr.args[1] = GlobalRef(ArrayInterface,:static_length)
+    elseif f === :size && length(expr.args) == 3
+      i = expr.args[3]
+      if i isa Integer
+        expr.args[1] = GlobalRef(ArrayInterface,:size)
+        expr.args[3] = staticexpr(convert(Int,i)::Int)
+      end
+    else
+      static_literals!(expr)
     end
-    expr
+  end
+  expr
 end
 add_loop_bound!(ls::LoopSet, itersym::Symbol, bound::Union{Integer,Symbol}, upper::Bool, step::Bool)::MaybeKnown = MaybeKnown(bound, upper ? 1024 : 1)
 function add_loop_bound!(ls::LoopSet, itersym::Symbol, bound::Expr, upper::Bool, step::Bool)::MaybeKnown
@@ -797,7 +797,7 @@ function range_loop!(ls::LoopSet, itersym::Symbol, l::MaybeKnown, u::MaybeKnown,
     isone(s) || pushexpr!(range, s)
     pushexpr!(range, u)
     pushprepreamble!(ls, Expr(:(=), rangename, range))
-    pushprepreamble!(ls, Expr(:(=), lenname, Expr(:call, lv(:maybestaticlength), rangename)))
+    pushprepreamble!(ls, Expr(:(=), lenname, Expr(:call, GlobalRef(ArrayInterface,:static_length), rangename)))
     Loop(itersym, l, u, s, rangename, lenname)
 end
 function range_loop!(ls::LoopSet, r::Expr, itersym::Symbol)::Loop
@@ -853,7 +853,7 @@ end
 function misc_loop!(ls::LoopSet, r::Union{Expr,Symbol}, itersym::Symbol, staticstepone::Bool)::Loop
     rangename = gensym!(ls, "looprange" * string(itersym)); lenname = gensym!(ls, "looplen" * string(itersym));
     pushprepreamble!(ls, Expr(:(=), rangename, Expr(:call, lv(:canonicalize_range), :(@inbounds $(static_literals!(r))))))
-    pushprepreamble!(ls, Expr(:(=), lenname, Expr(:call, lv(:maybestaticlength), rangename)))
+    pushprepreamble!(ls, Expr(:(=), lenname, Expr(:call, GlobalRef(ArrayInterface,:static_length), rangename)))
     L = add_loop_bound!(ls, itersym, Expr(:call, lv(:maybestaticfirst), rangename), false, false)
     U = add_loop_bound!(ls, itersym, Expr(:call, lv(:maybestaticlast), rangename), true, false)
     if staticstepone

src/reconstruct_loopset.jl

@@ -30,7 +30,7 @@ function Loop(ls::LoopSet, ex::Expr, sym::Symbol, f, s, l, ub::Int)
     rangesym = gensym(ssym * "_loop");
     lensym = gensym(ssym * "_looplen")
     pushpreamble!(ls, Expr(:(=), rangesym, ex))
-    pushpreamble!(ls, Expr(:(=), lensym, Expr(:call, lv(:maybestaticlength), rangesym)))
+    pushpreamble!(ls, Expr(:(=), lensym, Expr(:call, GlobalRef(ArrayInterface,:static_length), rangesym)))
     F = if f === nothing
         start = gensym(ssym*"_loopstart")
         pushpreamble!(ls, Expr(:(=), start, Expr(:call, %, Expr(:call, lv(:first), rangesym), Int)))