kumi 0.0.23 → 0.0.25

data/golden/inline_rename_scope_leak/expected/lir_01_hoist_scalar_references.txt

@@ -0,0 +1,35 @@
+(LIR
+  (Declaration sum_x
+    %acc_1 = decl_acc :: float
+    %t2 = load_input "xs" :: array
+    loop xs id=L1 in %t2 as el=%xs_el_3, idx=%xs_i_4
+      %t5 = load_field xs_el_3["v"] :: float
+      %acc_1 = acc_add agg.sum(%acc_1, %t5) :: float
+    end_loop
+    %t6 = acc_load %acc_1 :: float
+    yield %t6
+  )
+  (Declaration sum_y
+    %acc_7 = decl_acc :: float
+    %t8 = load_input "ys" :: array
+    loop ys id=L2 in %t8 as el=%ys_el_9, idx=%ys_i_10
+      %t11 = load_field ys_el_9["v"] :: float
+      %acc_7 = acc_add agg.sum(%acc_7, %t11) :: float
+    end_loop
+    %t12 = acc_load %acc_7 :: float
+    yield %t12
+  )
+  (Declaration tail
+    %t13 = const 7.0 :: float
+    %t14 = const 5.0 :: float
+    %t15 = call core.add(%t13, %t14) :: float
+    yield %t15
+  )
+  (Declaration out
+    %t16 = load_decl sum_x :: float
+    %t17 = load_decl sum_y :: float
+    %t18 = load_decl tail :: float
+    %t19 = make_object{x: %t16, y: %t17, t: %t18} :: object
+    yield %t19
+  )
+)

data/golden/inline_rename_scope_leak/expected/lir_02_inlined.txt

@@ -0,0 +1,49 @@
+(LIR
+  (Declaration sum_x
+    %acc_1 = decl_acc :: float
+    %t2 = load_input "xs" :: array
+    loop xs id=L1 in %t2 as el=%xs_el_3, idx=%xs_i_4
+      %t5 = load_field xs_el_3["v"] :: float
+      %acc_1 = acc_add agg.sum(%acc_1, %t5) :: float
+    end_loop
+    %t6 = acc_load %acc_1 :: float
+    yield %t6
+  )
+  (Declaration sum_y
+    %acc_7 = decl_acc :: float
+    %t8 = load_input "ys" :: array
+    loop ys id=L2 in %t8 as el=%ys_el_9, idx=%ys_i_10
+      %t11 = load_field ys_el_9["v"] :: float
+      %acc_7 = acc_add agg.sum(%acc_7, %t11) :: float
+    end_loop
+    %t12 = acc_load %acc_7 :: float
+    yield %t12
+  )
+  (Declaration tail
+    %t13 = const 7.0 :: float
+    %t14 = const 5.0 :: float
+    %t15 = call core.add(%t13, %t14) :: float
+    yield %t15
+  )
+  (Declaration out
+    %acc21 = decl_acc :: float
+    %t22 = load_input "xs" :: array
+    loop xs id=L3 in %t22 as el=%t23, idx=%t24
+      %t25 = load_field t23["v"] :: float
+      %acc21 = acc_add agg.sum(%acc21, %t25) :: float
+    end_loop
+    %t26 = acc_load %acc21 :: float
+    %acc28 = decl_acc :: float
+    %t29 = load_input "ys" :: array
+    loop ys id=L4 in %t29 as el=%t30, idx=%t31
+      %t32 = load_field t30["v"] :: float
+      %acc28 = acc_add agg.sum(%acc28, %t32) :: float
+    end_loop
+    %t33 = acc_load %acc28 :: float
+    %t34 = const 7.0 :: float
+    %t35 = const 5.0 :: float
+    %t36 = call core.add(%t34, %t35) :: float
+    %t19 = make_object{x: %t26, y: %t33, t: %t36} :: object
+    yield %t19
+  )
+)

data/golden/inline_rename_scope_leak/expected/lir_03_cse.txt

@@ -0,0 +1,49 @@
+(LIR
+  (Declaration sum_x
+    %acc_1 = decl_acc :: float
+    %t2 = load_input "xs" :: array
+    loop xs id=L1 in %t2 as el=%xs_el_3, idx=%xs_i_4
+      %t5 = load_field xs_el_3["v"] :: float
+      %acc_1 = acc_add agg.sum(%acc_1, %t5) :: float
+    end_loop
+    %t6 = acc_load %acc_1 :: float
+    yield %t6
+  )
+  (Declaration sum_y
+    %acc_7 = decl_acc :: float
+    %t8 = load_input "ys" :: array
+    loop ys id=L2 in %t8 as el=%ys_el_9, idx=%ys_i_10
+      %t11 = load_field ys_el_9["v"] :: float
+      %acc_7 = acc_add agg.sum(%acc_7, %t11) :: float
+    end_loop
+    %t12 = acc_load %acc_7 :: float
+    yield %t12
+  )
+  (Declaration tail
+    %t13 = const 7.0 :: float
+    %t14 = const 5.0 :: float
+    %t15 = call core.add(%t13, %t14) :: float
+    yield %t15
+  )
+  (Declaration out
+    %acc21 = decl_acc :: float
+    %t22 = load_input "xs" :: array
+    loop xs id=L3 in %t22 as el=%t23, idx=%t24
+      %t25 = load_field t23["v"] :: float
+      %acc21 = acc_add agg.sum(%acc21, %t25) :: float
+    end_loop
+    %t26 = acc_load %acc21 :: float
+    %acc28 = decl_acc :: float
+    %t29 = load_input "ys" :: array
+    loop ys id=L4 in %t29 as el=%t30, idx=%t31
+      %t32 = load_field t30["v"] :: float
+      %acc28 = acc_add agg.sum(%acc28, %t32) :: float
+    end_loop
+    %t33 = acc_load %acc28 :: float
+    %t34 = const 7.0 :: float
+    %t35 = const 5.0 :: float
+    %t36 = call core.add(%t34, %t35) :: float
+    %t19 = make_object{x: %t26, y: %t33, t: %t36} :: object
+    yield %t19
+  )
+)

data/golden/inline_rename_scope_leak/expected/lir_04_1_loop_fusion.txt

@@ -0,0 +1,49 @@
+(LIR
+  (Declaration sum_x
+    %acc_1 = decl_acc :: float
+    %t2 = load_input "xs" :: array
+    loop xs id=L1 in %t2 as el=%xs_el_3, idx=%xs_i_4
+      %t5 = load_field xs_el_3["v"] :: float
+      %acc_1 = acc_add agg.sum(%acc_1, %t5) :: float
+    end_loop
+    %t6 = acc_load %acc_1 :: float
+    yield %t6
+  )
+  (Declaration sum_y
+    %acc_7 = decl_acc :: float
+    %t8 = load_input "ys" :: array
+    loop ys id=L2 in %t8 as el=%ys_el_9, idx=%ys_i_10
+      %t11 = load_field ys_el_9["v"] :: float
+      %acc_7 = acc_add agg.sum(%acc_7, %t11) :: float
+    end_loop
+    %t12 = acc_load %acc_7 :: float
+    yield %t12
+  )
+  (Declaration tail
+    %t13 = const 7.0 :: float
+    %t14 = const 5.0 :: float
+    %t15 = call core.add(%t13, %t14) :: float
+    yield %t15
+  )
+  (Declaration out
+    %acc21 = decl_acc :: float
+    %t22 = load_input "xs" :: array
+    loop xs id=L3 in %t22 as el=%t23, idx=%t24
+      %t25 = load_field t23["v"] :: float
+      %acc21 = acc_add agg.sum(%acc21, %t25) :: float
+    end_loop
+    %t26 = acc_load %acc21 :: float
+    %acc28 = decl_acc :: float
+    %t29 = load_input "ys" :: array
+    loop ys id=L4 in %t29 as el=%t30, idx=%t31
+      %t32 = load_field t30["v"] :: float
+      %acc28 = acc_add agg.sum(%acc28, %t32) :: float
+    end_loop
+    %t33 = acc_load %acc28 :: float
+    %t34 = const 7.0 :: float
+    %t35 = const 5.0 :: float
+    %t36 = call core.add(%t34, %t35) :: float
+    %t19 = make_object{x: %t26, y: %t33, t: %t36} :: object
+    yield %t19
+  )
+)

data/golden/inline_rename_scope_leak/expected/lir_04_loop_invcm.txt

@@ -0,0 +1,49 @@
+(LIR
+  (Declaration sum_x
+    %acc_1 = decl_acc :: float
+    %t2 = load_input "xs" :: array
+    loop xs id=L1 in %t2 as el=%xs_el_3, idx=%xs_i_4
+      %t5 = load_field xs_el_3["v"] :: float
+      %acc_1 = acc_add agg.sum(%acc_1, %t5) :: float
+    end_loop
+    %t6 = acc_load %acc_1 :: float
+    yield %t6
+  )
+  (Declaration sum_y
+    %acc_7 = decl_acc :: float
+    %t8 = load_input "ys" :: array
+    loop ys id=L2 in %t8 as el=%ys_el_9, idx=%ys_i_10
+      %t11 = load_field ys_el_9["v"] :: float
+      %acc_7 = acc_add agg.sum(%acc_7, %t11) :: float
+    end_loop
+    %t12 = acc_load %acc_7 :: float
+    yield %t12
+  )
+  (Declaration tail
+    %t13 = const 7.0 :: float
+    %t14 = const 5.0 :: float
+    %t15 = call core.add(%t13, %t14) :: float
+    yield %t15
+  )
+  (Declaration out
+    %acc21 = decl_acc :: float
+    %t22 = load_input "xs" :: array
+    loop xs id=L3 in %t22 as el=%t23, idx=%t24
+      %t25 = load_field t23["v"] :: float
+      %acc21 = acc_add agg.sum(%acc21, %t25) :: float
+    end_loop
+    %t26 = acc_load %acc21 :: float
+    %acc28 = decl_acc :: float
+    %t29 = load_input "ys" :: array
+    loop ys id=L4 in %t29 as el=%t30, idx=%t31
+      %t32 = load_field t30["v"] :: float
+      %acc28 = acc_add agg.sum(%acc28, %t32) :: float
+    end_loop
+    %t33 = acc_load %acc28 :: float
+    %t34 = const 7.0 :: float
+    %t35 = const 5.0 :: float
+    %t36 = call core.add(%t34, %t35) :: float
+    %t19 = make_object{x: %t26, y: %t33, t: %t36} :: object
+    yield %t19
+  )
+)

data/golden/inline_rename_scope_leak/expected/lir_06_const_prop.txt

@@ -0,0 +1,49 @@
+(LIR
+  (Declaration sum_x
+    %acc_1 = decl_acc :: float
+    %t2 = load_input "xs" :: array
+    loop xs id=L1 in %t2 as el=%xs_el_3, idx=%xs_i_4
+      %t5 = load_field xs_el_3["v"] :: float
+      %acc_1 = acc_add agg.sum(%acc_1, %t5) :: float
+    end_loop
+    %t6 = acc_load %acc_1 :: float
+    yield %t6
+  )
+  (Declaration sum_y
+    %acc_7 = decl_acc :: float
+    %t8 = load_input "ys" :: array
+    loop ys id=L2 in %t8 as el=%ys_el_9, idx=%ys_i_10
+      %t11 = load_field ys_el_9["v"] :: float
+      %acc_7 = acc_add agg.sum(%acc_7, %t11) :: float
+    end_loop
+    %t12 = acc_load %acc_7 :: float
+    yield %t12
+  )
+  (Declaration tail
+    %t13 = const 7.0 :: float
+    %t14 = const 5.0 :: float
+    %t15 = call core.add(%t13, %t14) :: float
+    yield %t15
+  )
+  (Declaration out
+    %acc21 = decl_acc :: float
+    %t22 = load_input "xs" :: array
+    loop xs id=L3 in %t22 as el=%t23, idx=%t24
+      %t25 = load_field t23["v"] :: float
+      %acc21 = acc_add agg.sum(%acc21, %t25) :: float
+    end_loop
+    %t26 = acc_load %acc21 :: float
+    %acc28 = decl_acc :: float
+    %t29 = load_input "ys" :: array
+    loop ys id=L4 in %t29 as el=%t30, idx=%t31
+      %t32 = load_field t30["v"] :: float
+      %acc28 = acc_add agg.sum(%acc28, %t32) :: float
+    end_loop
+    %t33 = acc_load %acc28 :: float
+    %t34 = const 7.0 :: float
+    %t35 = const 5.0 :: float
+    %t36 = call core.add(%t34, %t35) :: float
+    %t19 = make_object{x: %t26, y: %t33, t: %t36} :: object
+    yield %t19
+  )
+)

data/golden/inline_rename_scope_leak/expected/nast.txt

@@ -0,0 +1,31 @@
+(NAST
+  (VALUE sum_x
+    (Call :"agg.sum"
+    (InputRef [:xs, :el, :v])
+  )
+  )
+  (VALUE sum_y
+    (Call :"agg.sum"
+    (InputRef [:ys, :el, :v])
+  )
+  )
+  (VALUE tail
+    (Call :"core.add"
+    (Const 7.0)
+    (Const 5.0)
+  )
+  )
+  (VALUE out
+    (Hash
+    (Pair x 
+      (Ref sum_x)
+    )
+    (Pair y 
+      (Ref sum_y)
+    )
+    (Pair t 
+      (Ref tail)
+    )
+  )
+  )
+)

data/golden/inline_rename_scope_leak/expected/schema_javascript.mjs

@@ -0,0 +1,51 @@
+export function _sum_x(input) {
+  let acc_1 = 0.0;
+  let t2 = input["xs"];
+  t2.forEach((xs_el_3, xs_i_4) => {
+    let t5 = xs_el_3["v"];
+    acc_1 += t5;
+  });
+  return acc_1;
+}
+
+export function _sum_y(input) {
+  let acc_7 = 0.0;
+  let t8 = input["ys"];
+  t8.forEach((ys_el_9, ys_i_10) => {
+    let t11 = ys_el_9["v"];
+    acc_7 += t11;
+  });
+  return acc_7;
+}
+
+export function _tail(input) {
+  const t13 = 7.0;
+  const t14 = 5.0;
+  let t15 = t13 + t14;
+  return t15;
+}
+
+export function _out(input) {
+  let acc21 = 0.0;
+  let t22 = input["xs"];
+  t22.forEach((t23, t24) => {
+    let t25 = t23["v"];
+    acc21 += t25;
+  });
+  let acc28 = 0.0;
+  let t29 = input["ys"];
+  t29.forEach((t30, t31) => {
+    let t32 = t30["v"];
+    acc28 += t32;
+  });
+  const t34 = 7.0;
+  const t35 = 5.0;
+  let t36 = t34 + t35;
+  let t19 = {
+    "x": acc21,
+    "y": acc28,
+    "t": t36
+  };
+  return t19;
+}
+

data/golden/inline_rename_scope_leak/expected/schema_ruby.rb

@@ -0,0 +1,82 @@
+# Autogenerated by Kumi Codegen
+module Kumi::Compiled::KUMI_db7971b324407d0f809565d983315fed4dc8a3f06f0530f13c577a5491ec479e
+  def self.from(input_data = nil)
+    instance = Object.new
+    instance.extend(self)
+    instance.instance_variable_set(:@input, input_data)
+    instance
+  end
+
+  def self.__kumi_executable__
+    instance = Object.new
+    instance.extend(self)
+    instance
+  end
+
+  def update(input_data)
+    @input = @input.merge(input_data)
+    self
+  end
+
+  def [](name)
+    case name
+    when :sum_x then _sum_x
+    when :sum_y then _sum_y
+    when :tail then _tail
+    when :out then _out
+    else raise KeyError, "Unknown declaration"
+    end
+  end
+
+  def _sum_x(input = @input)
+    acc_1 = 0.0
+    t2 = input["xs"] || input[:xs]
+    t2.each_with_index do |xs_el_3, xs_i_4|
+      t5 = xs_el_3["v"] || xs_el_3[:v]
+      acc_1 += t5
+    end
+    acc_1
+  end
+
+  def _sum_y(input = @input)
+    acc_7 = 0.0
+    t8 = input["ys"] || input[:ys]
+    t8.each_with_index do |ys_el_9, ys_i_10|
+      t11 = ys_el_9["v"] || ys_el_9[:v]
+      acc_7 += t11
+    end
+    acc_7
+  end
+
+  def _tail(input = @input)
+    t13 = 7.0
+    t14 = 5.0
+    t13 + t14
+  end
+
+  def _out(input = @input)
+    acc21 = 0.0
+    t22 = input["xs"] || input[:xs]
+    t22.each_with_index do |t23, t24|
+      t25 = t23["v"] || t23[:v]
+      acc21 += t25
+    end
+    t26 = acc21
+    acc28 = 0.0
+    t29 = input["ys"] || input[:ys]
+    t29.each_with_index do |t30, t31|
+      t32 = t30["v"] || t30[:v]
+      acc28 += t32
+    end
+    t33 = acc28
+    t34 = 7.0
+    t35 = 5.0
+    t36 = t34 + t35
+    t19 = {
+      "x" => t26,
+      "y" => t33,
+      "t" => t36
+    }
+    t19
+  end
+end

data/golden/inline_rename_scope_leak/expected/snast.txt

@@ -0,0 +1,31 @@
+(SNAST
+  (VALUE sum_x
+    (Reduce :agg.sum over [xs]
+      (InputRef xs.el.v key_chain=[]) :: [xs] -> float
+    ) :: [] -> float
+  ) :: [] -> float
+  (VALUE sum_y
+    (Reduce :agg.sum over [ys]
+      (InputRef ys.el.v key_chain=[]) :: [ys] -> float
+    ) :: [] -> float
+  ) :: [] -> float
+  (VALUE tail
+    (Call :core.add
+      (Const 7.0) :: [] -> float
+      (Const 5.0) :: [] -> float
+    ) :: [] -> float
+  ) :: [] -> float
+  (VALUE out
+    (Hash
+      (Pair x
+        (Ref sum_x) :: [] -> float
+      ) :: [] -> pair
+      (Pair y
+        (Ref sum_y) :: [] -> float
+      ) :: [] -> pair
+      (Pair t
+        (Ref tail) :: [] -> float
+      ) :: [] -> pair
+    ) :: [] -> hash
+  ) :: [] -> hash
+)

data/golden/inline_rename_scope_leak/expected.json

@@ -0,0 +1,7 @@
+{
+    "out": {
+        "x": 6.0,
+        "y": 30.0,
+        "t": 12.0
+    }
+}

data/golden/inline_rename_scope_leak/input.json

@@ -0,0 +1,4 @@
+{
+  "xs": [ { "v": 1.0 } , { "v": 2.0 } , { "v": 3.0 }  ],
+  "ys": [ { "v": 10.0 }, { "v": 20.0 } ]
+}

data/golden/inline_rename_scope_leak/schema.kumi

@@ -0,0 +1,24 @@
+schema do
+  input do
+    array :xs do
+      hash :el do
+        float :v
+      end
+    end
+    array :ys do
+      hash :el do
+        float :v
+      end
+    end
+  end
+
+  # two separate decls that each compile to a gamma (sum over array)
+  value :sum_x, fn(:sum, input.xs.el.v)
+  value :sum_y, fn(:sum, input.ys.el.v)
+
+  # unrelated scalar decl
+  value :tail, 7.0 + 5.0
+
+  # caller that forces two LoadDeclaration inlines, then a scalar op
+  value :out, { x: sum_x, y: sum_y, t: tail }
+end

data/golden/input_reference/expected/schema_ruby.rb

@@ -1,5 +1,5 @@
 # Autogenerated by Kumi Codegen
-module Kumi::Compiled::KUMI_553e66837fe392a06e5de16b6bc32e442b3e71b92f205eae1451b78a49fbac83
+module Kumi::Compiled::KUMI_bf8dc5780a3c569c78320ccfb3817762c3aca5afe7bdec14afc2720b6ca6940e
   def self.from(input_data = nil)
     instance = Object.new
     instance.extend(self)

data/golden/interleaved_fusion/expected/lir_02_inlined.txt

@@ -18,13 +18,13 @@
       %t38 = load_input "departments" :: array
       %acc40 = decl_acc :: integer
       %t41 = load_field departments_el_11["employees"] :: any
-      loop employees id=L7 in %t41 as el=%employees_el_6, idx=%employees_i_7
-        %t42 = load_field employees_el_6["salary"] :: integer
-        %acc40 = acc_add agg.sum(%acc40, %t42) :: integer
+      loop employees id=L7 in %t41 as el=%t42, idx=%t43
+        %t44 = load_field t42["salary"] :: integer
+        %acc40 = acc_add agg.sum(%acc40, %t44) :: integer
       end_loop
-      %t43 = acc_load %acc40 :: integer
+      %t45 = acc_load %acc40 :: integer
       %t14 = const 0.15 :: float
-      %t15 = call core.mul(%t43, %t14) :: float
+      %t15 = call core.mul(%t45, %t14) :: float
       yield %t15
     end_loop
   )
@@ -50,39 +50,39 @@
     %t30 = load_input "departments" :: array
     loop departments id=L6 in %t30 as el=%departments_el_31, idx=%departments_i_32
       %t33 = load_field departments_el_31["name"] :: string
-      %t44 = load_input "departments" :: array
-      %acc46 = decl_acc :: integer
-      %t47 = load_field departments_el_31["employees"] :: any
-      loop employees id=L8 in %t47 as el=%employees_el_6, idx=%employees_i_7
-        %t48 = load_field employees_el_6["salary"] :: integer
-        %acc46 = acc_add agg.sum(%acc46, %t48) :: integer
+      %t46 = load_input "departments" :: array
+      %acc48 = decl_acc :: integer
+      %t49 = load_field departments_el_31["employees"] :: any
+      loop employees id=L8 in %t49 as el=%t50, idx=%t51
+        %t52 = load_field t50["salary"] :: integer
+        %acc48 = acc_add agg.sum(%acc48, %t52) :: integer
       end_loop
-      %t49 = acc_load %acc46 :: integer
-      %t50 = load_input "departments" :: array
-      %t65 = load_input "departments" :: array
-      %acc67 = decl_acc :: integer
-      %t68 = load_field departments_el_31["employees"] :: any
-      loop employees id=L10 in %t68 as el=%employees_el_6, idx=%employees_i_7
-        %t69 = load_field employees_el_6["salary"] :: integer
-        %acc67 = acc_add agg.sum(%acc67, %t69) :: integer
-      end_loop
-      %t70 = acc_load %acc67 :: integer
-      %t52 = const 0.15 :: float
-      %t53 = call core.mul(%t70, %t52) :: float
+      %t53 = acc_load %acc48 :: integer
       %t54 = load_input "departments" :: array
-      %acc56 = decl_acc :: integer
-      %t57 = load_field departments_el_31["employees"] :: any
-      loop employees id=L9 in %t57 as el=%employees_el_21, idx=%employees_i_22
-        %t58 = load_field employees_el_21["role"] :: string
-        %t59 = const "manager" :: string
-        %t60 = call core.eq(%t58, %t59) :: boolean
-        %t61 = const 1 :: integer
-        %t62 = const 0 :: integer
-        %t63 = select %t60, %t61, %t62 :: integer
-        %acc56 = acc_add agg.sum(%acc56, %t63) :: integer
+      %t58 = load_input "departments" :: array
+      %acc60 = decl_acc :: integer
+      %t61 = load_field departments_el_31["employees"] :: any
+      loop employees id=L9 in %t61 as el=%t62, idx=%t63
+        %t64 = load_field t62["salary"] :: integer
+        %acc60 = acc_add agg.sum(%acc60, %t64) :: integer
+      end_loop
+      %t65 = acc_load %acc60 :: integer
+      %t56 = const 0.15 :: float
+      %t57 = call core.mul(%t65, %t56) :: float
+      %t66 = load_input "departments" :: array
+      %acc68 = decl_acc :: integer
+      %t69 = load_field departments_el_31["employees"] :: any
+      loop employees id=L10 in %t69 as el=%t70, idx=%t71
+        %t72 = load_field t70["role"] :: string
+        %t73 = const "manager" :: string
+        %t74 = call core.eq(%t72, %t73) :: boolean
+        %t75 = const 1 :: integer
+        %t76 = const 0 :: integer
+        %t77 = select %t74, %t75, %t76 :: integer
+        %acc68 = acc_add agg.sum(%acc68, %t77) :: integer
       end_loop
-      %t64 = acc_load %acc56 :: integer
-      %t37 = make_object{name: %t33, payroll: %t49, tax: %t53, managers: %t64} :: object
+      %t78 = acc_load %acc68 :: integer
+      %t37 = make_object{name: %t33, payroll: %t53, tax: %t57, managers: %t78} :: object
       yield %t37
     end_loop
   )