Keep track of size of integer literals. Do not promote bools unnecessarilly. Fixes #228.

Author: chriselrod

src/codegen/lower_constant.jl

@@ -181,8 +181,14 @@ function lower_licm_constants!(ls::LoopSet)
         # setconstantop!(ls, ops[id],  sym)
         # setconstantop!(ls, ops[id], Expr(:call, lv(:maybeconvert), ls.T, sym))
     end
-    for (id,intval) ∈ ls.preamble_symint
-        setop!(ls, ops[id], Expr(:call, lv(:sizeequivalentint), ELTYPESYMBOL, intval))
+    for (id,(intval,intsz,signed)) ∈ ls.preamble_symint
+        if intsz == 1
+            setop!(ls, ops[id], intval % Bool)
+        elseif signed
+            setop!(ls, ops[id], Expr(:call, lv(:sizeequivalentint), ELTYPESYMBOL, intval))
+        else
+            setop!(ls, ops[id], Expr(:call, lv(:sizeequivalentint), ELTYPESYMBOL, intval % UInt))
+        end
     end
     for (id,floatval) ∈ ls.preamble_symfloat
         setop!(ls, ops[id], Expr(:call, lv(:sizeequivalentfloat), ELTYPESYMBOL, floatval))

src/codegen/lowering.jl

@@ -586,8 +586,16 @@ function typeof_outer_reduction_init(ls::LoopSet, op::Operation)
     for (id, sym) ∈ ls.preamble_symsym
         opid == id && return Expr(:call, :typeof, sym)
     end
-    for (id,intval) ∈ ls.preamble_symint
-        opid == id && return :Int
+    for (id,(intval,intsz,signed)) ∈ ls.preamble_symint
+        if opid == id
+            if intsz == 1
+                return :Bool
+            elseif signed
+                return Symbol(:Int,intsz)
+            else
+                return Symbol(:UInt,intsz)
+            end
+        end
     end
     for (id,floatval) ∈ ls.preamble_symfloat
         opid == id && return :Float64

src/modeling/graphs.jl

@@ -415,7 +415,7 @@ struct LoopSet
     preamble::Expr
     prepreamble::Expr # performs extractions that must be performed first, and don't need further registering
     preamble_symsym::Vector{Tuple{Int,Symbol}}
-    preamble_symint::Vector{Tuple{Int,Int}}
+    preamble_symint::Vector{Tuple{Int,Tuple{Int,Int32,Bool}}}
     preamble_symfloat::Vector{Tuple{Int,Float64}}
     preamble_zeros::Vector{Tuple{Int,NumberType}}
     preamble_funcofeltypes::Vector{Tuple{Int,Float64}}
@@ -504,6 +504,15 @@ function pushpreamble!(ls::LoopSet, op::Operation, v::Symbol)
     end
     nothing
 end
+
+function integer_description(@nospecialize(v::Integer))::Tuple{Int,Int32,Bool}
+    if v isa Bool
+        ((v % Int)::Int, one(Int32), false)
+    else
+        ((v % Int)::Int, ((8sizeof(v))%Int32)::Int32, (v isa Signed)::Bool)
+    end
+end
+
 function pushpreamble!(ls::LoopSet, op::Operation, v::Number)
     typ = v isa Integer ? HardInt : HardFloat
     id = identifier(op)
@@ -512,7 +521,7 @@ function pushpreamble!(ls::LoopSet, op::Operation, v::Number)
     elseif isone(v)
         push!(ls.preamble_funcofeltypes, (id, MULTIPLICATIVE_IN_REDUCTIONS))
     elseif v isa Integer
-        push!(ls.preamble_symint, (id, convert(Int,v)))
+        push!(ls.preamble_symint, (id, integer_description(v)))
     else
         push!(ls.preamble_symfloat, (id, convert(Float64,v)))
     end
@@ -549,7 +558,7 @@ function LoopSet(mod::Symbol)
         LoopOrder(),
         Expr(:block),Expr(:block),
         Tuple{Int,Symbol}[],
-        Tuple{Int,Int}[],
+        Tuple{Int,Tuple{Int,Int32,Bool}}[],
         Tuple{Int,Float64}[],
         Tuple{Int,NumberType}[],Tuple{Int,Symbol}[],
         Symbol[], Symbol[], Symbol[],

src/parse/add_constants.jl

@@ -21,10 +21,13 @@ function add_constant!(ls::LoopSet, var::Number, elementbytes::Int = 8)
         end
         push!(ls.preamble_zeros, (identifier(op),typ))
     elseif var isa Integer
-        for (id,ivar) ∈ ls.preamble_symint
-            (instruction(ops[id]) === LOOPCONSTANT && ivar == var) && return ops[id]
+        idescript = integer_description(var)
+        for (id,descript) ∈ ls.preamble_symint
+            if (instruction(ops[id]) === LOOPCONSTANT) && (idescript == descript)
+                return ops[id]
+            end
         end
-        push!(ls.preamble_symint, (identifier(op), var))
+        push!(ls.preamble_symint, (identifier(op), idescript))
     else#if var isa FloatX
         for (id,fvar) ∈ ls.preamble_symfloat
             (instruction(ops[id]) === LOOPCONSTANT && fvar == var) && return ops[id]

src/reconstruct_loopset.jl

@@ -303,7 +303,14 @@ function expandbyoffset!(indexpand::Vector{T}, inds, offsets::Vector{Int}, expan
         ind = T === Int ? _ind : first(_ind)
         base = offsets[ind] + 1
         for inda ∈ base:(expand ? offsets[ind+1] : base)
-            T === Int ? push!(indexpand, inda) : push!(indexpand, (inda,last(_ind)))
+            if T === Int
+                push!(indexpand, inda)
+            elseif T === Tuple{Int,Tuple{Int,Int32,Bool}}
+                li = last(_ind)
+                push!(indexpand, (inda,(li[1],li[2],li[3])))
+            else
+                push!(indexpand, (inda,last(_ind)))
+            end
         end
     end
     indexpand