kumi 0.0.24 → 0.0.25

data/golden/loop_fusion/expected/lir_06_const_prop.txt

@@ -32,25 +32,25 @@
   )
   (Declaration department_summary
     %t24 = load_input "departments" :: array
-    %t42 = const "manager" :: string
-    %t44 = const 1 :: integer
-    %t45 = const 0 :: integer
+    %t46 = const "manager" :: string
+    %t48 = const 1 :: integer
+    %t49 = const 0 :: integer
     loop departments id=L5 in %t24 as el=%departments_el_25, idx=%departments_i_26
       %t27 = load_field departments_el_25["name"] :: string
       %acc33 = decl_acc :: integer
       %t34 = load_field departments_el_25["employees"] :: any
-      %acc39 = decl_acc :: integer
-      loop employees id=L6 in %t34 as el=%employees_el_6, idx=%employees_i_7
-        %t35 = load_field employees_el_6["salary"] :: integer
-        %acc33 = acc_add agg.sum(%acc33, %t35) :: integer
-        %t41 = load_field employees_el_6["role"] :: string
-        %t43 = call core.eq(%t41, %t42) :: boolean
-        %t46 = select %t43, %t44, %t45 :: integer
-        %acc39 = acc_add agg.sum(%acc39, %t46) :: integer
+      %acc41 = decl_acc :: integer
+      loop employees id=L6 in %t34 as el=%t35, idx=%t36
+        %t37 = load_field t35["salary"] :: integer
+        %acc33 = acc_add agg.sum(%acc33, %t37) :: integer
+        %t45 = load_field t35["role"] :: string
+        %t47 = call core.eq(%t45, %t46) :: boolean
+        %t50 = select %t47, %t48, %t49 :: integer
+        %acc41 = acc_add agg.sum(%acc41, %t50) :: integer
       end_loop
-      %t36 = acc_load %acc33 :: integer
-      %t47 = acc_load %acc39 :: integer
-      %t30 = make_object{name: %t27, total_payroll: %t36, manager_count: %t47} :: object
+      %t38 = acc_load %acc33 :: integer
+      %t51 = acc_load %acc41 :: integer
+      %t30 = make_object{name: %t27, total_payroll: %t38, manager_count: %t51} :: object
       yield %t30
     end_loop
   )

data/golden/loop_fusion/expected/schema_javascript.mjs

@@ -36,26 +36,26 @@ export function _manager_count(input) {
 export function _department_summary(input) {
   let out = [];
   let t24 = input["departments"];
-  const t42 = "manager";
-  const t44 = 1;
-  const t45 = 0;
+  const t46 = "manager";
+  const t48 = 1;
+  const t49 = 0;
   t24.forEach((departments_el_25, departments_i_26) => {
     let t27 = departments_el_25["name"];
     let acc33 = 0;
     let t34 = departments_el_25["employees"];
-    let acc39 = 0;
-    t34.forEach((employees_el_6, employees_i_7) => {
-      let t35 = employees_el_6["salary"];
-      acc33 += t35;
-      let t41 = employees_el_6["role"];
-      let t43 = t41 == t42;
-      let t46 = t43 ? t44 : t45;
-      acc39 += t46;
+    let acc41 = 0;
+    t34.forEach((t35, t36) => {
+      let t37 = t35["salary"];
+      acc33 += t37;
+      let t45 = t35["role"];
+      let t47 = t45 == t46;
+      let t50 = t47 ? t48 : t49;
+      acc41 += t50;
     });
     let t30 = {
       "name": t27,
       "total_payroll": acc33,
-      "manager_count": acc39
+      "manager_count": acc41
     };
     out.push(t30);
   });

data/golden/loop_fusion/expected/schema_ruby.rb

@@ -1,5 +1,5 @@
 # Autogenerated by Kumi Codegen
-module Kumi::Compiled::KUMI_336c6ae90c9ed351f0bb7257fc77debf7b18d4e0f96efd6da3ffc642c33e77ce
+module Kumi::Compiled::KUMI_f73439f44efea38d0e3ff71d0a88169a9b4e6158dd1d4fc358b80ff61c3dbbac
   def self.from(input_data = nil)
     instance = Object.new
     instance.extend(self)
@@ -67,28 +67,28 @@ module Kumi::Compiled::KUMI_336c6ae90c9ed351f0bb7257fc77debf7b18d4e0f96efd6da3ff
   def _department_summary(input = @input)
     out = []
     t24 = input["departments"] || input[:departments]
-    t42 = "manager"
-    t44 = 1
-    t45 = 0
+    t46 = "manager"
+    t48 = 1
+    t49 = 0
     t24.each_with_index do |departments_el_25, departments_i_26|
       t27 = departments_el_25["name"] || departments_el_25[:name]
       acc33 = 0
       t34 = departments_el_25["employees"] || departments_el_25[:employees]
-      acc39 = 0
-      t34.each_with_index do |employees_el_6, employees_i_7|
-        t35 = employees_el_6["salary"] || employees_el_6[:salary]
-        acc33 += t35
-        t41 = employees_el_6["role"] || employees_el_6[:role]
-        t43 = t41 == t42
-        t46 = t43 ? t44 : t45
-        acc39 += t46
+      acc41 = 0
+      t34.each_with_index do |t35, t36|
+        t37 = t35["salary"] || t35[:salary]
+        acc33 += t37
+        t45 = t35["role"] || t35[:role]
+        t47 = t45 == t46
+        t50 = t47 ? t48 : t49
+        acc41 += t50
       end
-      t36 = acc33
-      t47 = acc39
+      t38 = acc33
+      t51 = acc41
       t30 = {
         "name" => t27,
-        "total_payroll" => t36,
-        "manager_count" => t47
+        "total_payroll" => t38,
+        "manager_count" => t51
       }
       out << t30
     end

data/golden/min_reduce_scope/expected/schema_ruby.rb

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

data/golden/mixed_dimensions/expected/lir_02_inlined.txt

@@ -26,17 +26,17 @@
     %t16 = load_input "matrix" :: array
     %acc28 = decl_acc :: integer
     %t29 = load_input "numbers" :: array
-    loop numbers id=L6 in %t29 as el=%numbers_el_3, idx=%numbers_i_4
-      %t30 = load_field numbers_el_3["value"] :: integer
-      %acc28 = acc_add agg.sum(%acc28, %t30) :: integer
+    loop numbers id=L6 in %t29 as el=%t30, idx=%t31
+      %t32 = load_field t30["value"] :: integer
+      %acc28 = acc_add agg.sum(%acc28, %t32) :: integer
     end_loop
-    %t31 = acc_load %acc28 :: integer
+    %t33 = acc_load %acc28 :: integer
     loop matrix id=L4 in %t16 as el=%matrix_el_17, idx=%matrix_i_18
       %t19 = load_field matrix_el_17["row"] :: any
       loop row id=L5 in %t19 as el=%row_el_20, idx=%row_i_21
         %t22 = load_input "scalar_val" :: integer
         %t24 = load_field row_el_20["cell"] :: float
-        %t25 = make_tuple(%t22, %t31, %t24) :: tuple<integer, integer, float>
+        %t25 = make_tuple(%t22, %t33, %t24) :: tuple<integer, integer, float>
         yield %t25
       end_loop
     end_loop

data/golden/mixed_dimensions/expected/lir_03_cse.txt

@@ -26,17 +26,17 @@
     %t16 = load_input "matrix" :: array
     %acc28 = decl_acc :: integer
     %t29 = load_input "numbers" :: array
-    loop numbers id=L6 in %t29 as el=%numbers_el_3, idx=%numbers_i_4
-      %t30 = load_field numbers_el_3["value"] :: integer
-      %acc28 = acc_add agg.sum(%acc28, %t30) :: integer
+    loop numbers id=L6 in %t29 as el=%t30, idx=%t31
+      %t32 = load_field t30["value"] :: integer
+      %acc28 = acc_add agg.sum(%acc28, %t32) :: integer
     end_loop
-    %t31 = acc_load %acc28 :: integer
+    %t33 = acc_load %acc28 :: integer
     loop matrix id=L4 in %t16 as el=%matrix_el_17, idx=%matrix_i_18
       %t19 = load_field matrix_el_17["row"] :: any
       loop row id=L5 in %t19 as el=%row_el_20, idx=%row_i_21
         %t22 = load_input "scalar_val" :: integer
         %t24 = load_field row_el_20["cell"] :: float
-        %t25 = make_tuple(%t22, %t31, %t24) :: tuple<integer, integer, float>
+        %t25 = make_tuple(%t22, %t33, %t24) :: tuple<integer, integer, float>
         yield %t25
       end_loop
     end_loop

data/golden/mixed_dimensions/expected/lir_04_1_loop_fusion.txt

@@ -26,17 +26,17 @@
     %t16 = load_input "matrix" :: array
     %acc28 = decl_acc :: integer
     %t29 = load_input "numbers" :: array
-    loop numbers id=L6 in %t29 as el=%numbers_el_3, idx=%numbers_i_4
-      %t30 = load_field numbers_el_3["value"] :: integer
-      %acc28 = acc_add agg.sum(%acc28, %t30) :: integer
+    loop numbers id=L6 in %t29 as el=%t30, idx=%t31
+      %t32 = load_field t30["value"] :: integer
+      %acc28 = acc_add agg.sum(%acc28, %t32) :: integer
     end_loop
-    %t31 = acc_load %acc28 :: integer
+    %t33 = acc_load %acc28 :: integer
     loop matrix id=L4 in %t16 as el=%matrix_el_17, idx=%matrix_i_18
       %t19 = load_field matrix_el_17["row"] :: any
       loop row id=L5 in %t19 as el=%row_el_20, idx=%row_i_21
         %t22 = load_input "scalar_val" :: integer
         %t24 = load_field row_el_20["cell"] :: float
-        %t25 = make_tuple(%t22, %t31, %t24) :: tuple<integer, integer, float>
+        %t25 = make_tuple(%t22, %t33, %t24) :: tuple<integer, integer, float>
         yield %t25
       end_loop
     end_loop

data/golden/mixed_dimensions/expected/lir_04_loop_invcm.txt

@@ -26,17 +26,17 @@
     %t16 = load_input "matrix" :: array
     %acc28 = decl_acc :: integer
     %t29 = load_input "numbers" :: array
-    loop numbers id=L6 in %t29 as el=%numbers_el_3, idx=%numbers_i_4
-      %t30 = load_field numbers_el_3["value"] :: integer
-      %acc28 = acc_add agg.sum(%acc28, %t30) :: integer
+    loop numbers id=L6 in %t29 as el=%t30, idx=%t31
+      %t32 = load_field t30["value"] :: integer
+      %acc28 = acc_add agg.sum(%acc28, %t32) :: integer
     end_loop
-    %t31 = acc_load %acc28 :: integer
+    %t33 = acc_load %acc28 :: integer
     %t22 = load_input "scalar_val" :: integer
     loop matrix id=L4 in %t16 as el=%matrix_el_17, idx=%matrix_i_18
       %t19 = load_field matrix_el_17["row"] :: any
       loop row id=L5 in %t19 as el=%row_el_20, idx=%row_i_21
         %t24 = load_field row_el_20["cell"] :: float
-        %t25 = make_tuple(%t22, %t31, %t24) :: tuple<integer, integer, float>
+        %t25 = make_tuple(%t22, %t33, %t24) :: tuple<integer, integer, float>
         yield %t25
       end_loop
     end_loop

data/golden/mixed_dimensions/expected/lir_06_const_prop.txt

@@ -26,17 +26,17 @@
     %t16 = load_input "matrix" :: array
     %acc28 = decl_acc :: integer
     %t29 = load_input "numbers" :: array
-    loop numbers id=L6 in %t29 as el=%numbers_el_3, idx=%numbers_i_4
-      %t30 = load_field numbers_el_3["value"] :: integer
-      %acc28 = acc_add agg.sum(%acc28, %t30) :: integer
+    loop numbers id=L6 in %t29 as el=%t30, idx=%t31
+      %t32 = load_field t30["value"] :: integer
+      %acc28 = acc_add agg.sum(%acc28, %t32) :: integer
     end_loop
-    %t31 = acc_load %acc28 :: integer
+    %t33 = acc_load %acc28 :: integer
     %t22 = load_input "scalar_val" :: integer
     loop matrix id=L4 in %t16 as el=%matrix_el_17, idx=%matrix_i_18
       %t19 = load_field matrix_el_17["row"] :: any
       loop row id=L5 in %t19 as el=%row_el_20, idx=%row_i_21
         %t24 = load_field row_el_20["cell"] :: float
-        %t25 = make_tuple(%t22, %t31, %t24) :: tuple<integer, integer, float>
+        %t25 = make_tuple(%t22, %t33, %t24) :: tuple<integer, integer, float>
         yield %t25
       end_loop
     end_loop

data/golden/mixed_dimensions/expected/schema_javascript.mjs

@@ -28,9 +28,9 @@ export function _mixed_array(input) {
   let t16 = input["matrix"];
   let acc28 = 0;
   let t29 = input["numbers"];
-  t29.forEach((numbers_el_3, numbers_i_4) => {
-    let t30 = numbers_el_3["value"];
-    acc28 += t30;
+  t29.forEach((t30, t31) => {
+    let t32 = t30["value"];
+    acc28 += t32;
   });
   let t22 = input["scalar_val"];
   t16.forEach((matrix_el_17, matrix_i_18) => {

data/golden/mixed_dimensions/expected/schema_ruby.rb

@@ -1,5 +1,5 @@
 # Autogenerated by Kumi Codegen
-module Kumi::Compiled::KUMI_f287fabc5c73178904b2d2c681872bb3b1319afebf27a33602b623633c180ca2
+module Kumi::Compiled::KUMI_bbe68fd87d3413dc8dc47548ccbe52c6bf4a9912417fdfc1a4c2fd87cd576fd9
   def self.from(input_data = nil)
     instance = Object.new
     instance.extend(self)
@@ -59,18 +59,18 @@ module Kumi::Compiled::KUMI_f287fabc5c73178904b2d2c681872bb3b1319afebf27a33602b6
     t16 = input["matrix"] || input[:matrix]
     acc28 = 0
     t29 = input["numbers"] || input[:numbers]
-    t29.each_with_index do |numbers_el_3, numbers_i_4|
-      t30 = numbers_el_3["value"] || numbers_el_3[:value]
-      acc28 += t30
+    t29.each_with_index do |t30, t31|
+      t32 = t30["value"] || t30[:value]
+      acc28 += t32
     end
-    t31 = acc28
+    t33 = acc28
     t22 = input["scalar_val"] || input[:scalar_val]
     t16.each_with_index do |matrix_el_17, matrix_i_18|
       out_1 = []
       t19 = matrix_el_17["row"] || matrix_el_17[:row]
       t19.each_with_index do |row_el_20, row_i_21|
         t24 = row_el_20["cell"] || row_el_20[:cell]
-        t25 = [t22, t31, t24]
+        t25 = [t22, t33, t24]
         out_1 << t25
       end
       out << out_1

data/golden/multirank_hoisting/expected/lir_02_inlined.txt

@@ -29,22 +29,22 @@
     end_loop
   )
   (Declaration elem_affine
+    %t66 = load_input "global_offset" :: float
+    %t67 = const 1.0 :: float
+    %t68 = call core.add(%t66, %t67) :: float
     %t19 = load_input "batch" :: array
     loop batch id=L4 in %t19 as el=%batch_el_20, idx=%batch_i_21
+      %t62 = load_input "batch" :: array
+      %t64 = load_field batch_el_20["mean"] :: float
+      %t65 = call core.add(%t64, %t68) :: float
       %t22 = load_field batch_el_20["row"] :: any
-      %t81 = load_input "global_offset" :: float
-      %t82 = const 1.0 :: float
-      %t83 = call core.add(%t81, %t82) :: float
       loop row id=L5 in %t22 as el=%row_el_23, idx=%row_i_24
-        %t25 = load_field row_el_23["col"] :: any
         %t57 = load_input "batch" :: array
         %t58 = load_field batch_el_20["row"] :: any
         %t59 = load_field row_el_23["scale"] :: float
         %t60 = const 2.0 :: float
         %t61 = call core.mul(%t59, %t60) :: float
-        %t62 = load_input "batch" :: array
-        %t64 = load_field batch_el_20["mean"] :: float
-        %t65 = call core.add(%t64, %t83) :: float
+        %t25 = load_field row_el_23["col"] :: any
         loop col id=L6 in %t25 as el=%col_el_26, idx=%col_i_27
           %t28 = load_field col_el_26["val"] :: float
           %t30 = call core.mul(%t28, %t61) :: float
@@ -55,31 +55,31 @@
     end_loop
   )
   (Declaration row_sum_affine
+    %t86 = load_input "global_offset" :: float
+    %t87 = const 1.0 :: float
+    %t88 = call core.add(%t86, %t87) :: float
     %t33 = load_input "batch" :: array
     loop batch id=L7 in %t33 as el=%batch_el_34, idx=%batch_i_35
+      %t82 = load_input "batch" :: array
+      %t84 = load_field batch_el_34["mean"] :: float
+      %t85 = call core.add(%t84, %t88) :: float
       %t36 = load_field batch_el_34["row"] :: any
       loop row id=L8 in %t36 as el=%row_el_37, idx=%row_i_38
+        %t77 = load_input "batch" :: array
+        %t78 = load_field batch_el_34["row"] :: any
+        %t79 = load_field row_el_37["scale"] :: float
+        %t80 = const 2.0 :: float
+        %t81 = call core.mul(%t79, %t80) :: float
         %acc_39 = decl_acc :: float
         %t40 = load_field row_el_37["col"] :: any
-        %t84 = load_input "batch" :: array
-        %t85 = load_field batch_el_34["row"] :: any
-        %t86 = load_field row_el_37["scale"] :: float
-        %t87 = const 2.0 :: float
-        %t88 = call core.mul(%t86, %t87) :: float
-        %t89 = load_input "batch" :: array
-        %t90 = load_input "global_offset" :: float
-        %t91 = const 1.0 :: float
-        %t92 = call core.add(%t90, %t91) :: float
-        %t93 = load_field batch_el_34["mean"] :: float
-        %t94 = call core.add(%t93, %t92) :: float
         loop col id=L9 in %t40 as el=%col_el_41, idx=%col_i_42
-          %t66 = load_input "batch" :: array
-          %t67 = load_field batch_el_34["row"] :: any
-          %t68 = load_field row_el_37["col"] :: any
-          %t69 = load_field col_el_41["val"] :: float
-          %t71 = call core.mul(%t69, %t88) :: float
-          %t73 = call core.add(%t71, %t94) :: float
-          %acc_39 = acc_add agg.sum(%acc_39, %t73) :: float
+          %t69 = load_input "batch" :: array
+          %t70 = load_field batch_el_34["row"] :: any
+          %t71 = load_field row_el_37["col"] :: any
+          %t72 = load_field col_el_41["val"] :: float
+          %t74 = call core.mul(%t72, %t81) :: float
+          %t76 = call core.add(%t74, %t85) :: float
+          %acc_39 = acc_add agg.sum(%acc_39, %t76) :: float
         end_loop
         %t44 = acc_load %acc_39 :: float
         yield %t44
@@ -87,37 +87,37 @@
     end_loop
   )
   (Declaration batch_total_affine
+    %t115 = load_input "global_offset" :: float
+    %t116 = const 1.0 :: float
+    %t117 = call core.add(%t115, %t116) :: float
     %t45 = load_input "batch" :: array
     loop batch id=L10 in %t45 as el=%batch_el_46, idx=%batch_i_47
+      %t111 = load_input "batch" :: array
+      %t113 = load_field batch_el_46["mean"] :: float
+      %t114 = call core.add(%t113, %t117) :: float
       %acc_48 = decl_acc :: float
       %t49 = load_field batch_el_46["row"] :: any
       loop row id=L11 in %t49 as el=%row_el_50, idx=%row_i_51
-        %t74 = load_input "batch" :: array
-        %t75 = load_field batch_el_46["row"] :: any
-        %acc77 = decl_acc :: float
-        %t78 = load_field row_el_50["col"] :: any
-        %t110 = load_input "global_offset" :: float
-        %t111 = const 1.0 :: float
-        %t112 = call core.add(%t110, %t111) :: float
-        loop col id=L12 in %t78 as el=%col_el_41, idx=%col_i_42
-          %t95 = load_input "batch" :: array
-          %t96 = load_field batch_el_46["row"] :: any
-          %t97 = load_field row_el_50["col"] :: any
+        %t106 = load_input "batch" :: array
+        %t107 = load_field batch_el_46["row"] :: any
+        %t108 = load_field row_el_50["scale"] :: float
+        %t109 = const 2.0 :: float
+        %t110 = call core.mul(%t108, %t109) :: float
+        %t89 = load_input "batch" :: array
+        %t90 = load_field batch_el_46["row"] :: any
+        %acc92 = decl_acc :: float
+        %t93 = load_field row_el_50["col"] :: any
+        loop col id=L12 in %t93 as el=%t94, idx=%t95
           %t98 = load_input "batch" :: array
           %t99 = load_field batch_el_46["row"] :: any
-          %t100 = load_field row_el_50["scale"] :: float
-          %t101 = const 2.0 :: float
-          %t102 = call core.mul(%t100, %t101) :: float
-          %t103 = load_input "batch" :: array
-          %t105 = load_field batch_el_46["mean"] :: float
-          %t106 = call core.add(%t105, %t112) :: float
-          %t107 = load_field col_el_41["val"] :: float
-          %t108 = call core.mul(%t107, %t102) :: float
-          %t109 = call core.add(%t108, %t106) :: float
-          %acc77 = acc_add agg.sum(%acc77, %t109) :: float
+          %t100 = load_field row_el_50["col"] :: any
+          %t101 = load_field t94["val"] :: float
+          %t103 = call core.mul(%t101, %t110) :: float
+          %t105 = call core.add(%t103, %t114) :: float
+          %acc92 = acc_add agg.sum(%acc92, %t105) :: float
         end_loop
-        %t80 = acc_load %acc77 :: float
-        %acc_48 = acc_add agg.sum(%acc_48, %t80) :: float
+        %t97 = acc_load %acc92 :: float
+        %acc_48 = acc_add agg.sum(%acc_48, %t97) :: float
       end_loop
       %t53 = acc_load %acc_48 :: float
       yield %t53

data/golden/multirank_hoisting/expected/lir_03_cse.txt

@@ -29,19 +29,19 @@
     end_loop
   )
   (Declaration elem_affine
+    %t66 = load_input "global_offset" :: float
+    %t67 = const 1.0 :: float
+    %t68 = call core.add(%t66, %t67) :: float
     %t19 = load_input "batch" :: array
     loop batch id=L4 in %t19 as el=%batch_el_20, idx=%batch_i_21
+      %t64 = load_field batch_el_20["mean"] :: float
       %t22 = load_field batch_el_20["row"] :: any
-      %t81 = load_input "global_offset" :: float
-      %t82 = const 1.0 :: float
-      %t83 = call core.add(%t81, %t82) :: float
+      %t65 = call core.add(%t64, %t68) :: float
       loop row id=L5 in %t22 as el=%row_el_23, idx=%row_i_24
-        %t25 = load_field row_el_23["col"] :: any
         %t59 = load_field row_el_23["scale"] :: float
         %t60 = const 2.0 :: float
         %t61 = call core.mul(%t59, %t60) :: float
-        %t64 = load_field batch_el_20["mean"] :: float
-        %t65 = call core.add(%t64, %t83) :: float
+        %t25 = load_field row_el_23["col"] :: any
         loop col id=L6 in %t25 as el=%col_el_26, idx=%col_i_27
           %t28 = load_field col_el_26["val"] :: float
           %t30 = call core.mul(%t28, %t61) :: float
@@ -52,25 +52,25 @@
     end_loop
   )
   (Declaration row_sum_affine
+    %t86 = load_input "global_offset" :: float
+    %t87 = const 1.0 :: float
+    %t88 = call core.add(%t86, %t87) :: float
     %t33 = load_input "batch" :: array
     loop batch id=L7 in %t33 as el=%batch_el_34, idx=%batch_i_35
+      %t84 = load_field batch_el_34["mean"] :: float
       %t36 = load_field batch_el_34["row"] :: any
+      %t85 = call core.add(%t84, %t88) :: float
       loop row id=L8 in %t36 as el=%row_el_37, idx=%row_i_38
+        %t79 = load_field row_el_37["scale"] :: float
+        %t80 = const 2.0 :: float
+        %t81 = call core.mul(%t79, %t80) :: float
         %acc_39 = decl_acc :: float
         %t40 = load_field row_el_37["col"] :: any
-        %t86 = load_field row_el_37["scale"] :: float
-        %t87 = const 2.0 :: float
-        %t88 = call core.mul(%t86, %t87) :: float
-        %t90 = load_input "global_offset" :: float
-        %t91 = const 1.0 :: float
-        %t92 = call core.add(%t90, %t91) :: float
-        %t93 = load_field batch_el_34["mean"] :: float
-        %t94 = call core.add(%t93, %t92) :: float
         loop col id=L9 in %t40 as el=%col_el_41, idx=%col_i_42
-          %t69 = load_field col_el_41["val"] :: float
-          %t71 = call core.mul(%t69, %t88) :: float
-          %t73 = call core.add(%t71, %t94) :: float
-          %acc_39 = acc_add agg.sum(%acc_39, %t73) :: float
+          %t72 = load_field col_el_41["val"] :: float
+          %t74 = call core.mul(%t72, %t81) :: float
+          %t76 = call core.add(%t74, %t85) :: float
+          %acc_39 = acc_add agg.sum(%acc_39, %t76) :: float
         end_loop
         %t44 = acc_load %acc_39 :: float
         yield %t44
@@ -78,29 +78,29 @@
     end_loop
   )
   (Declaration batch_total_affine
+    %t115 = load_input "global_offset" :: float
+    %t116 = const 1.0 :: float
+    %t117 = call core.add(%t115, %t116) :: float
     %t45 = load_input "batch" :: array
     loop batch id=L10 in %t45 as el=%batch_el_46, idx=%batch_i_47
+      %t113 = load_field batch_el_46["mean"] :: float
       %acc_48 = decl_acc :: float
       %t49 = load_field batch_el_46["row"] :: any
+      %t114 = call core.add(%t113, %t117) :: float
       loop row id=L11 in %t49 as el=%row_el_50, idx=%row_i_51
-        %acc77 = decl_acc :: float
-        %t78 = load_field row_el_50["col"] :: any
-        %t110 = load_input "global_offset" :: float
-        %t111 = const 1.0 :: float
-        %t112 = call core.add(%t110, %t111) :: float
-        loop col id=L12 in %t78 as el=%col_el_41, idx=%col_i_42
-          %t100 = load_field row_el_50["scale"] :: float
-          %t101 = const 2.0 :: float
-          %t102 = call core.mul(%t100, %t101) :: float
-          %t105 = load_field batch_el_46["mean"] :: float
-          %t106 = call core.add(%t105, %t112) :: float
-          %t107 = load_field col_el_41["val"] :: float
-          %t108 = call core.mul(%t107, %t102) :: float
-          %t109 = call core.add(%t108, %t106) :: float
-          %acc77 = acc_add agg.sum(%acc77, %t109) :: float
+        %t108 = load_field row_el_50["scale"] :: float
+        %t109 = const 2.0 :: float
+        %t110 = call core.mul(%t108, %t109) :: float
+        %acc92 = decl_acc :: float
+        %t93 = load_field row_el_50["col"] :: any
+        loop col id=L12 in %t93 as el=%t94, idx=%t95
+          %t101 = load_field t94["val"] :: float
+          %t103 = call core.mul(%t101, %t110) :: float
+          %t105 = call core.add(%t103, %t114) :: float
+          %acc92 = acc_add agg.sum(%acc92, %t105) :: float
         end_loop
-        %t80 = acc_load %acc77 :: float
-        %acc_48 = acc_add agg.sum(%acc_48, %t80) :: float
+        %t97 = acc_load %acc92 :: float
+        %acc_48 = acc_add agg.sum(%acc_48, %t97) :: float
       end_loop
       %t53 = acc_load %acc_48 :: float
       yield %t53