PolyesterWeave

Author: chriselrod

Project.toml

@@ -1,20 +1,20 @@
 name = "LoopVectorization"
 uuid = "bdcacae8-1622-11e9-2a5c-532679323890"
 authors = ["Chris Elrod <[email protected]>"]
-version = "0.12.72"
+version = "0.12.73"
 
 [deps]
 ArrayInterface = "4fba245c-0d91-5ea0-9b3e-6abc04ee57a9"
+CloseOpenIntervals = "fb6a15b2-703c-40df-9091-08a04967cfa9"
 DocStringExtensions = "ffbed154-4ef7-542d-bbb7-c09d3a79fcae"
 IfElse = "615f187c-cbe4-4ef1-ba3b-2fcf58d6d173"
 LayoutPointers = "10f19ff3-798f-405d-979b-55457f8fc047"
 LinearAlgebra = "37e2e46d-f89d-539d-b4ee-838fcccc9c8e"
 OffsetArrays = "6fe1bfb0-de20-5000-8ca7-80f57d26f881"
-Polyester = "f517fe37-dbe3-4b94-8317-1923a5111588"
+PolyesterWeave = "1d0040c9-8b98-4ee7-8388-3f51789ca0ad"
 Requires = "ae029012-a4dd-5104-9daa-d747884805df"
 SLEEFPirates = "476501e8-09a2-5ece-8869-fb82de89a1fa"
 Static = "aedffcd0-7271-4cad-89d0-dc628f76c6d3"
-StrideArraysCore = "7792a7ef-975c-4747-a70f-980b88e8d1da"
 ThreadingUtilities = "8290d209-cae3-49c0-8002-c8c24d57dab5"
 UnPack = "3a884ed6-31ef-47d7-9d2a-63182c4928ed"
 VectorizationBase = "3d5dd08c-fd9d-11e8-17fa-ed2836048c2f"
@@ -25,11 +25,10 @@ DocStringExtensions = "0.8"
 IfElse = "0.1"
 LayoutPointers = "0.1.2"
 OffsetArrays = "1.4.1"
-Polyester = "0.4.0"
+PolyesterWeave = "0.1"
 Requires = "1"
 SLEEFPirates = "0.6.23"
 Static = "0.2, 0.3"
-StrideArraysCore = "0.2"
 ThreadingUtilities = "0.4.5"
 UnPack = "1"
 VectorizationBase = "0.21.4"

src/LoopVectorization.jl

@@ -30,7 +30,7 @@ using LayoutPointers: stridedpointer_preserve, GroupedStridedPointers
 
 using IfElse: ifelse
 
-using ThreadingUtilities, Polyester
+using ThreadingUtilities, PolyesterWeave
 using Base.Broadcast: Broadcasted, DefaultArrayStyle
 using LinearAlgebra: Adjoint, Transpose, Diagonal
 using Base.Meta: isexpr
@@ -42,7 +42,7 @@ using SLEEFPirates: log_fast, log2_fast, log10_fast, pow, sin_fast, cos_fast, si
 
 using ArrayInterface
 using ArrayInterface: OptionallyStaticUnitRange, OptionallyStaticRange, Zero, One, StaticBool, True, False, reduce_tup, indices, UpTri, LoTri, strides, offsets, size, axes, StrideIndex
-using StrideArraysCore: CloseOpen, PtrArray
+using CloseOpenIntervals: AbstractCloseOpen, CloseOpen#, SafeCloseOpen
 # @static if VERSION ≥ v"1.6.0-rc1" #TODO: delete `else` when dropping 1.5 support
     # using ArrayInterface: static_step
 # else # Julia 1.5 did not define `step` on CartesianIndices

src/codegen/lower_threads.jl

@@ -387,8 +387,8 @@ function thread_one_loops_expr(
       var"#nrequest#" = vsub_nw((var"#nthreads#" % UInt32), 0x00000001)
       var"##do#thread##" = var"#nrequest#" ≠ 0x00000000
       if var"##do#thread##"
-        var"#threads#tuple#", var"#torelease#tuple#" = Polyester.request_threads(var"#nrequest#")
-        # var"#threads#tuple#", var"#torelease#tuple#" = Polyester.request_threads(Threads.threadid()%UInt32, var"#nrequest#")
+        var"#threads#tuple#", var"#torelease#tuple#" = PolyesterWeave.request_threads(var"#nrequest#")
+        # var"#threads#tuple#", var"#torelease#tuple#" = PolyesterWeave.request_threads(Threads.threadid()%UInt32, var"#nrequest#")
 
         var"#thread#factor#0#" = var"#nthreads#"
         $iterdef
@@ -397,7 +397,7 @@ function thread_one_loops_expr(
         for var"#threads#" in var"#threads#tuple#"
 
           var"#thread#launch#count#" = 0x00000000
-          var"#thread#mask#" = Polyester.mask(var"#threads#")
+          var"#thread#mask#" = PolyesterWeave.mask(var"#threads#")
           var"#nrequest#" = length(var"#threads#")
           var"#threads#remain#" = var"#thread#launch#count#" ≠ var"#nrequest#"
           var"##do#thread##" |= var"#threads#remain#"
@@ -425,8 +425,8 @@ function thread_one_loops_expr(
           var"#nrem#thread#0#" -= var"#nrequest#"
         end
       else# eliminate undef var errors that the compiler should be able to figure out are unreachable, but doesn't
-        var"#torelease#tuple#" = (zero(Polyester.worker_type()),)
-        var"#threads#tuple#" = (Polyester.UnsignedIteratorEarlyStop(zero(Polyester.worker_type()), 0x00000000),)
+        var"#torelease#tuple#" = (zero(PolyesterWeave.worker_type()),)
+        var"#threads#tuple#" = (PolyesterWeave.UnsignedIteratorEarlyStop(zero(PolyesterWeave.worker_type()), 0x00000000),)
       end
     end
     var"#avx#call#args#" = $avxcall_args
@@ -436,7 +436,7 @@ function thread_one_loops_expr(
     for var"#i#" ∈ eachindex(var"#threads#tuple#")
       var"#threads#" = var"#threads#tuple#"[var"#i#"]
 
-      var"#thread#mask#" = Polyester.mask(var"#threads#")
+      var"#thread#mask#" = PolyesterWeave.mask(var"#threads#")
       var"#threads#remain#" = (length(var"#threads#tuple#") == 1) || (var"#thread#mask#" ≠ zero(var"#thread#mask#"))
       while var"#threads#remain#"
         VectorizationBase.assume(var"#thread#mask#" ≠ zero(var"#thread#mask#"))
@@ -448,7 +448,7 @@ function thread_one_loops_expr(
         $update_return_values
         var"#threads#remain#" = var"#thread#mask#" ≠ 0x00000000
       end
-      Polyester.free_threads!(var"#torelease#tuple#"[var"#i#"])
+      PolyesterWeave.free_threads!(var"#torelease#tuple#"[var"#i#"])
     end
     $retexpr
   end
@@ -581,8 +581,8 @@ function thread_two_loops_expr(
       var"#loop#1#start#init#" = var"#iter#start#0#"
       var"##do#thread##" = var"#nrequest#" ≠ 0x00000000
       if var"##do#thread##"
-        # var"#threads#tuple#", var"#torelease#tuple#" = Polyester.request_threads(Threads.threadid(), var"#nrequest#")
-        var"#threads#tuple#", var"#torelease#tuple#" = Polyester.request_threads(var"#nrequest#")
+        # var"#threads#tuple#", var"#torelease#tuple#" = PolyesterWeave.request_threads(Threads.threadid(), var"#nrequest#")
+        var"#threads#tuple#", var"#torelease#tuple#" = PolyesterWeave.request_threads(var"#nrequest#")
         var"##do#thread##" = false
         $iterdef1
         $iterdef2
@@ -593,7 +593,7 @@ function thread_two_loops_expr(
           var"#nrequest#" = length(var"#threads#")
           # @show var"#base#block#size#thread#0#", var"#block#rem#step#0#" var"#base#block#size#thread#1#", var"#block#rem#step#1#"
           var"#thread#launch#count#" = 0x00000000
-          var"#thread#mask#" = Polyester.mask(var"#threads#")
+          var"#thread#mask#" = PolyesterWeave.mask(var"#threads#")
           var"#threads#remain#" = var"#thread#launch#count#" ≠ var"#nrequest#"
           var"##do#thread##" |= var"#threads#remain#"
           while var"#threads#remain#"
@@ -630,8 +630,8 @@ function thread_two_loops_expr(
           end
         end
       else# eliminate undef var errors that the compiler should be able to figure out are unreachable, but doesn't
-        var"#torelease#tuple#" = (zero(Polyester.worker_type()),)
-        var"#threads#tuple#" = Polyester.UnsignedIteratorEarlyStop(zero(Polyester.worker_type()), 0x00000000)
+        var"#torelease#tuple#" = (zero(PolyesterWeave.worker_type()),)
+        var"#threads#tuple#" = PolyesterWeave.UnsignedIteratorEarlyStop(zero(PolyesterWeave.worker_type()), 0x00000000)
       end
     end
     # @show $lastboundexpr
@@ -641,7 +641,7 @@ function thread_two_loops_expr(
     var"#thread#id#" = 0x00000000
     for var"#i#" ∈ eachindex(var"#threads#tuple#")
       var"#threads#" = var"#threads#tuple#"[var"#i#"]
-      var"#thread#mask#" = Polyester.mask(var"#threads#")
+      var"#thread#mask#" = PolyesterWeave.mask(var"#threads#")
       var"#threads#remain#" = (length(var"#threads#tuple#") == 1) || (var"#thread#mask#" ≠ zero(var"#thread#mask#"))
       while var"#threads#remain#"
         VectorizationBase.assume(var"#thread#mask#" ≠ zero(var"#thread#mask#"))
@@ -653,7 +653,7 @@ function thread_two_loops_expr(
         $update_return_values
         var"#threads#remain#" = var"#thread#mask#" ≠ 0x00000000
       end
-      Polyester.free_threads!(var"#torelease#tuple#"[var"#i#"])
+      PolyesterWeave.free_threads!(var"#torelease#tuple#"[var"#i#"])
     end
     $retexpr
   end

src/condense_loopset.jl

@@ -222,8 +222,8 @@ end
 ## turn a LoopSet into a type object which can be used to reconstruct the LoopSet.
 
 @inline zerorangestart(r::Base.OneTo) = CloseOpen(maybestaticlast(r))
-@inline zerorangestart(r::CloseOpen) = CloseOpen(length(r))
-@inline zerorangestart(r::CloseOpen{Zero}) = r
+@inline zerorangestart(r::AbstractCloseOpen) = CloseOpen(length(r))
+@inline zerorangestart(r::AbstractCloseOpen{Zero}) = r
 @inline zerorangestart(r::AbstractUnitRange) = Zero():One():(maybestaticlast(r)-maybestaticfirst(r))
 @inline zerorangestart(r::AbstractRange) = Zero():static_step(r):(maybestaticlast(r)-maybestaticfirst(r))
 @inline zerorangestart(r::CartesianIndices) = CartesianIndices(map(zerorangestart, r.indices))
@@ -420,7 +420,6 @@ end
 
 
 @inline densewrapper(sp, A) = sp
-# @inline dummy_ptrarray(sp::AbstractStridedPointer{T,N}, A::AbstractArray{T,N}) where {T,N} = PtrArray(sp, VectorizationBase.zerotuple(Val{N}()), VectorizationBase.val_dense_dims(A))
 @inline densewrapper(sp::AbstractStridedPointer{T,N}, A::AbstractArray{T,N}) where {T,N} = _densewrapper(sp, VectorizationBase.val_dense_dims(A))
 @inline _densewrapper(sp, ::Nothing) = sp
 @inline _densewrapper(sp::AbstractStridedPointer, ::Val{D}) where {D} = VectorizationBase.DensePointerWrapper{D}(sp)

src/modeling/graphs.jl

@@ -200,12 +200,12 @@ function addexpr(ex, incr::Integer)
 end
 staticmulincr(ptr, incr) = Expr(:call, lv(:staticmul), Expr(:call, :eltype, ptr), incr)
 
-@inline cmpend(i::Int, r::CloseOpen) = i < getfield(r,:upper)
+@inline cmpend(i::Int, r::AbstractCloseOpen) = i < getfield(r,:upper)
 @inline cmpend(i::Int, r::AbstractUnitRange) = i ≤ last(r)
 @inline cmpend(i::Int, r::AbstractRange) = i ≤ last(r)
 
-@inline vcmpend(i::Int, r::CloseOpen, ::StaticInt{W}) where {W} = i ≤ vsub_nsw((getfield(r,:upper) % Int), W)
-@inline vcmpendzs(i::Int, r::CloseOpen, ::StaticInt{W}) where {W} = i ≠ ((getfield(r,:upper) % Int) &  (-W))
+@inline vcmpend(i::Int, r::AbstractCloseOpen, ::StaticInt{W}) where {W} = i ≤ vsub_nsw((getfield(r,:upper) % Int), W)
+@inline vcmpendzs(i::Int, r::AbstractCloseOpen, ::StaticInt{W}) where {W} = i ≠ ((getfield(r,:upper) % Int) &  (-W))
 @inline vcmpend(i::Int, r::AbstractUnitRange, ::StaticInt{W}) where {W} = i ≤ vsub_nsw(last(r), W-1)
 @inline vcmpendzs(i::Int, r::AbstractUnitRange, ::StaticInt{W}) where {W} = i ≠ (length(r) &  (-W))
 # i = 0
@@ -884,7 +884,7 @@ end
   ifelse(ArrayInterface.gt(StaticInt{S}(), Zero()), r, _reverse(r))
 end
 @inline canonicalize_range(r::OptionallyStaticRange, s::Integer) = s > 0 ? r : _reverse(r)
-@inline canonicalize_range(r::CloseOpen) = r
+@inline canonicalize_range(r::AbstractCloseOpen) = r
 @inline canonicalize_range(r::AbstractUnitRange) = maybestaticfirst(r):maybestaticlast(r)
 @inline canonicalize_range(r::OptionallyStaticRange) = canonicalize_range(r, static_step(r))
 @inline canonicalize_range(r::AbstractRange) = canonicalize_range(maybestaticfirst(r):static_step(r):maybestaticlast(r))

src/reconstruct_loopset.jl

@@ -14,12 +14,12 @@ Base.promote_rule(::Type{UpperBoundedInteger{N,S}}, ::Type{T}) where {N,T<:Base.
 Base.convert(::Type{T}, i::UpperBoundedInteger) where {T<:Number} = convert(T, i.i)
 Base.convert(::Type{UpperBoundedInteger{N,T}}, i::UpperBoundedInteger{N,T}) where {N,T<:Base.BitInteger} = i
 upper_bound(_) = typemax(Int)
-upper_bound(::Type{CloseOpen{T,UpperBoundedInteger{N,S}}}) where {T,N,S} = N - 1
+upper_bound(::Type{CO}) where {T,N,S,CO<:AbstractCloseOpen{T,UpperBoundedInteger{N,S}}} = N - 1
 
-@inline Base.last(r::CloseOpen{<:Integer,<:UpperBoundedInteger}) = getfield(getfield(r,:upper),:i) - One()
+@inline Base.last(r::AbstractCloseOpen{<:Integer,<:UpperBoundedInteger}) = getfield(getfield(r,:upper),:i) - One()
 @inline ArrayInterface.static_last(r::CloseOpen{<:Integer,<:UpperBoundedInteger}) = getfield(getfield(r,:upper),:i) - One()
-@inline Base.length(r::CloseOpen{<:Integer,<:UpperBoundedInteger}) = getfield(getfield(r,:upper),:i) - getfield(r,:start)
-@inline Base.length(r::CloseOpen{Zero,<:UpperBoundedInteger}) = getfield(getfield(r,:upper),:i)
+@inline Base.length(r::AbstractCloseOpen{<:Integer,<:UpperBoundedInteger}) = getfield(getfield(r,:upper),:i) - getfield(r,:start)
+@inline Base.length(r::AbstractCloseOpen{Zero,<:UpperBoundedInteger}) = getfield(getfield(r,:upper),:i)
 
 function Loop(ls::LoopSet, ex::Expr, sym::Symbol, f, s, l, ub::Int)
     if (f !== nothing) && (s !== nothing) && (l !== nothing)
@@ -70,7 +70,7 @@ end
 function Loop(::LoopSet, ::Expr, sym::Symbol, ::Type{ArrayInterface.OptionallyStaticStepRange{StaticInt{L}, StaticInt{S}, StaticInt{U}}}) where {L,S,U}
     static_loop(sym, L, S, U)
 end
-function Loop(::LoopSet, ::Expr, sym::Symbol, ::Type{CloseOpen{Static{L}, Static{U}}}) where {L,U}
+function Loop(::LoopSet, ::Expr, sym::Symbol, ::Type{CO}) where {L,U,CO<:AbstractCloseOpen{Static{L}, Static{U}}}
     static_loop(sym, L, 1, U - 1)
 end