Merge branch 'main' of github.com:JuliaComputing/DAECompiler.jl into incidence-lattice

Author: serenity4

src/analysis/ADAnalyzer.jl

@@ -47,8 +47,8 @@ end
         return false
     end
     if isa(src, Compiler.OptimizationState)
-        @show src.linfo
-        @show src.src
+        @sshow src.linfo
+        @sshow src.src
         error()
     end
     if isa(src, AnalyzedSource)

src/analysis/refiner.jl

@@ -48,7 +48,7 @@ Compiler.cache_owner(::StructuralRefiner) = StructureCache()
         return RT(nothing, (false, true))
     end
 
-    callee_codeinst = invokee
+    callee_codeinst = invokee::CodeInstance
     callee_result = structural_analysis!(callee_codeinst, Compiler.get_inference_world(interp))
 
     if isa(callee_result, UncompilableIPOResult) || isa(callee_result.extended_rt, Const) || isa(callee_result.extended_rt, Type)

src/analysis/structural.jl

@@ -141,7 +141,7 @@ function _structural_analysis!(ci::CodeInstance, world::UInt)
                 # every Expr(:new) uniquely corresponds to a scope identity, so this
                 # is legal here (but not before)
                 compact[SSAValue(i)][:stmt] = Intrinsics.ScopeIdentity()
-                compact[SSAValue(i)][:flag] |= CC.IR_FLAG_REFINED
+                compact[SSAValue(i)][:flag] |= Compiler.IR_FLAG_REFINED
             end
             continue
         elseif isexpr(stmt, :splatnew)
@@ -159,7 +159,7 @@ function _structural_analysis!(ci::CodeInstance, world::UInt)
         elseif stmt === nothing
             continue
         else
-            @show stmt
+            @sshow stmt
         end
     end
     ir = Compiler.finish(compact)

src/intrinsics.jl

@@ -18,7 +18,7 @@ functions are:
 module Intrinsics
 
     import ..@defintrmethod
-    export continuous, discrete, epsilon, variable, equation, always, initial, initialguess, observed,
+    export Scope, GenScope, continuous, discrete, epsilon, variable, equation, always, initial, initialguess, observed,
         always!, initial!, initialguess!, observed!, sim_time, ett!, pre, threshold, ddt
 
     abstract type AbstractScope; end
@@ -303,7 +303,7 @@ module Intrinsics
     discrete(name::Symbol) = discrete(Scope(root_scope, name))
     discrete() = discrete(root_scope)
 
-    always() = equation(root_scope)
+    always() = equation(Always, root_scope)
     always!(val, scope::AbstractScope=root_scope) = always(scope)(val)
     always!(val::Number, name::Symbol) = always!(val, Scope(root_scope, name))
     initial() = initial(root_scope)

src/reflection.jl

@@ -26,12 +26,12 @@ end
 code_ad_by_type(@nospecialize(tt::Type); kwargs...) =
   _code_ad_by_type(tt; kwargs...).inferred.ir
 
-function code_structure_by_type(@nospecialize(tt::Type); world::UInt = Base.tls_world_age(),  kwargs...)
+function code_structure_by_type(@nospecialize(tt::Type); world::UInt = Base.tls_world_age(), result = false, kwargs...)
   ci = _code_ad_by_type(tt; world, kwargs...)
   # Perform or lookup DAECompiler specific analysis for this system.
-  result = structural_analysis!(ci, world)
-  isa(result, UncompilableIPOResult) && throw(result.error)
-  return result.ir
+  _result = structural_analysis!(ci, world)
+  isa(_result, UncompilableIPOResult) && throw(_result.error)
+  return result ? _result : _result.ir
 end
 
 

src/transform/codegen/init_uncompress.jl

@@ -120,7 +120,7 @@ function gen_init_uncompress!(
 
             if is_known_invoke(stmt, variable, ir) || is_equation_call(stmt, ir)
                 display(ir)
-                @show stmt
+                @sshow stmt
                 error()
             elseif is_known_invoke(stmt, equation, ir)
                 # Equation - used, but only as an arg to equation call, which will all get

src/transform/codegen/rhs.jl

@@ -187,7 +187,7 @@ function rhs_finish!(
                 assgn = var_assignment[varnum]
                 if assgn == nothing
                     display(StateSelection.MatchedSystemStructure(structure, var_eq_matching))
-                    @show varnum
+                    @sshow varnum
                     error("Variable left over in IR that doesn't have an assignment")
                 end
                 (kind, slot) = assgn

src/transform/tearing/schedule.jl

@@ -795,10 +795,10 @@ function tearing_schedule!(state::TransformationState, ci::CodeInstance, key::To
                             cstructure = make_structure_from_ipo(callee_result)
                             cvar_eq_matching = matching_for_key(callee_result, callee_key, cstructure)
                             display(StateSelection.MatchedSystemStructure(cstructure, cvar_eq_matching))
-                            @show eq_orders
-                            @show callee_result.total_incidence[callee_eq]
-                            @show total_incidence[caller_eq]
-                            @show callee_var_schedule
+                            @sshow eq_orders
+                            @sshow callee_result.total_incidence[callee_eq]
+                            @sshow total_incidence[caller_eq]
+                            @sshow callee_var_schedule
                             error("Caller Equation $(caller_eq) (callee equation $(callee_eq)) is not in the callee schedule ($sref)")
                         end
                     end
@@ -868,7 +868,7 @@ function tearing_schedule!(state::TransformationState, ci::CodeInstance, key::To
                 # TODO: Pull this up, if arguments are state-independent
                 continue
             else
-                @show stmt
+                @sshow stmt
                 error()
             end
         else
@@ -953,9 +953,9 @@ function tearing_schedule!(state::TransformationState, ci::CodeInstance, key::To
                 error()
             else
                 if !(lin_var in key.diff_states || lin_var in key.alg_states)
-                    @show lin_var
-                    @show ordinal
-                    @show eq_order
+                    @sshow lin_var
+                    @sshow ordinal
+                    @sshow eq_order
                     display(result.ir)
                     error("Tried to schedule variable $(lin_var) that we do not have a solution to (but our scheduling should have ensured that we do)")
                 end

src/utils.jl

@@ -127,3 +127,21 @@ macro insert_node_here(compact, line, ex, reverse_affinity = false)
         insert_node_here!($compact, inst, $reverse_affinity)
     end
 end
+
+"""
+    @sshow stmt
+    @sshow length(ir.stmts) typeof(val)
+
+Drop-in replacement for `@show`, but using `jl_safe_printf` to avoid task switches.
+
+This directly prints to C stdout; `stdout` redirects won't have any effect.
+"""
+macro sshow(exs...)
+    blk = Expr(:block)
+    for ex in exs
+        push!(blk.args, :(Core.println($(sprint(Base.show_unquoted,ex)*" = "),
+                                  repr(begin local value = $(esc(ex)) end))))
+    end
+    isempty(exs) || push!(blk.args, :value)
+    return blk
+end