Factor out check for ref already being in ref_aliasing_syms.

Author: chriselrod

src/add_loads.jl

@@ -1,15 +1,22 @@
-function add_load!(ls::LoopSet, op::Operation, actualarray::Bool = true, broadcast::Bool = false)
-    @assert isload(op)
-    ref = op.ref
+function maybeaddref!(ls::LoopSet, op, ref)
     id = findfirst(r -> r == ref, ls.refs_aliasing_syms)
     # try to CSE
-    if id === nothing
+    if isnothing(id)
         push!(ls.syms_aliasing_refs, name(op))
         push!(ls.refs_aliasing_syms, ref)
+        0
     else
+        id
+    end    
+end
+
+function add_load!(ls::LoopSet, op::Operation, actualarray::Bool = true, broadcast::Bool = false)
+    @assert isload(op)
+    ref = op.ref
+    if (id = maybeaddref!(ls, op, ref)) > 0 # try to CSE
         opp = ls.opdict[ls.syms_aliasing_refs[id]] # throw an error if not found.
         return isstore(opp) ? getop(ls, first(parents(opp))) : opp
-    end    
+    end
     add_vptr!(ls, op.ref.ref.array, vptr(op), actualarray, broadcast)
     pushop!(ls, op, name(op))
 end

src/add_stores.jl

@@ -7,7 +7,7 @@ function cse_store!(ls::LoopSet, op::Operation)
     ls.operations[id] = op
     ls.opdict[op.variable] = op
 end
-function add_store!(ls::LoopSet, op::Operation, add_pvar::Bool = name(first(parents(op))) ∉ ls.syms_aliasing_refs)
+function add_store!(ls::LoopSet, op::Operation, add_pvar::Bool = !any(r -> r == op.ref, ls.refs_aliasing_syms))
     @assert isstore(op)
     if add_pvar
         push!(ls.syms_aliasing_refs, name(first(parents(op))))

src/split_loops.jl

@@ -101,7 +101,6 @@ function lower_and_split_loops(ls::LoopSet, inline::Int)
         # U_1 = T_1 = U_2 = T_2 = 2
         # @show cost_1 + cost_2 ≤ cost_fused, cost_1, cost_2, cost_fused
         if cost_1 + cost_2 ≤ cost_fused
-            # @show cost_1, cost_2, cost_fused
             ls_2_lowered = if length(remaining_ops) > 1
                 inline = iszero(inline) ? (shouldinline_1 % Int) : inline
                 lower_and_split_loops(ls_2, inline)