[ml_top/hw] Update Kelvin with vsubs.u fix

HDL CL: https://spacebeaker-review.git.corp.google.com/c/shodan/hw/kelvin/+/45370

Fix: 296483050
Change-Id: If18a033e1053b2bf5e819a851f574fe1848779a6
diff --git a/hw/top_matcha/ip/ml_top/rtl/kelvin.v b/hw/top_matcha/ip/ml_top/rtl/kelvin.v
index 0413998..b8255e5 100644
--- a/hw/top_matcha/ip/ml_top/rtl/kelvin.v
+++ b/hw/top_matcha/ip/ml_top/rtl/kelvin.v
@@ -1,4 +1,4 @@
-// SHA: 5a914477207ec5c965985e4e43269899de5e68eb
+// SHA: 1de9a1f125e62fdb53a67dedbad6f561ec20e306
 module Regfile(
   input         clock,
   input         reset,
@@ -49281,14 +49281,11 @@
   wire [6:0] _sub_T_7 = _sub_T_5 ? 7'h7f : 7'h0; // @[Library.scala 18:8]
   wire [7:0] _GEN_17 = {{1'd0}, _sub_T_7}; // @[VAluInt.scala 1331:89]
   wire [7:0] _sub_T_8 = _sub_T_3 | _GEN_17; // @[VAluInt.scala 1331:89]
-  wire  _sub_T_10 = satsubsel[0] & io_op_sub_subs; // @[VAluInt.scala 1333:36]
-  wire [7:0] _sub_T_12 = _sub_T_10 ? 8'hff : 8'h0; // @[Library.scala 18:8]
-  wire [7:0] _sub_T_13 = _sub_T_8 | _sub_T_12; // @[VAluInt.scala 1332:75]
-  wire  _sub_T_16 = satsubsel == 3'h0 & io_op_sub_subs | io_op_sub_sub; // @[VAluInt.scala 1334:59]
-  wire [7:0] _sub_T_18 = _sub_T_16 ? subtr[7:0] : 8'h0; // @[Library.scala 18:8]
-  wire [7:0] _sub_T_19 = _sub_T_13 | _sub_T_18; // @[VAluInt.scala 1333:69]
-  wire [7:0] _sub_T_21 = io_op_sub_hsub ? subtr[8:1] : 8'h0; // @[Library.scala 18:8]
-  wire [7:0] sub = _sub_T_19 | _sub_T_21; // @[VAluInt.scala 1334:97]
+  wire  _sub_T_15 = satsubsel == 3'h0 & io_op_sub_subs | io_op_sub_sub; // @[VAluInt.scala 1334:59]
+  wire [7:0] _sub_T_17 = _sub_T_15 ? subtr[7:0] : 8'h0; // @[Library.scala 18:8]
+  wire [7:0] _sub_T_18 = _sub_T_8 | _sub_T_17; // @[VAluInt.scala 1333:68]
+  wire [7:0] _sub_T_20 = io_op_sub_hsub ? subtr[8:1] : 8'h0; // @[Library.scala 18:8]
+  wire [7:0] sub = _sub_T_18 | _sub_T_20; // @[VAluInt.scala 1334:97]
   wire  subw_r_r__2 = subtr[9]; // @[Library.scala 50:25]
   wire [15:0] subw_r = {subw_r_r__2,subw_r_r__2,subw_r_r__2,subw_r_r__2,subw_r_r__2,subw_r_r__2,subtr}; // @[Cat.scala 31:58]
   wire [15:0] subw = io_op_sub_subw ? subw_r : 16'h0; // @[Library.scala 18:8]
@@ -49768,20 +49765,17 @@
   wire [7:0] _sraqs_r_T_31 = _sraqs_r_T_27 | _sraqs_r_T_30; // @[VAluInt.scala 1092:58]
   wire [7:0] _sraqs_r_T_33 = sraqs_is_norm_1 ? sraqs_rshf_1[7:0] : 8'h0; // @[Library.scala 18:8]
   wire [7:0] sraqs_1 = _sraqs_r_T_31 | _sraqs_r_T_33; // @[VAluInt.scala 1093:58]
-  wire  _sub_T_23 = satsubsel_1[2] & io_op_sub_subs; // @[VAluInt.scala 1331:36]
-  wire [7:0] _sub_T_25 = _sub_T_23 ? 8'h80 : 8'h0; // @[Library.scala 18:8]
-  wire  _sub_T_27 = satsubsel_1[1] & io_op_sub_subs; // @[VAluInt.scala 1332:36]
-  wire [6:0] _sub_T_29 = _sub_T_27 ? 7'h7f : 7'h0; // @[Library.scala 18:8]
-  wire [7:0] _GEN_49 = {{1'd0}, _sub_T_29}; // @[VAluInt.scala 1331:89]
-  wire [7:0] _sub_T_30 = _sub_T_25 | _GEN_49; // @[VAluInt.scala 1331:89]
-  wire  _sub_T_32 = satsubsel_1[0] & io_op_sub_subs; // @[VAluInt.scala 1333:36]
-  wire [7:0] _sub_T_34 = _sub_T_32 ? 8'hff : 8'h0; // @[Library.scala 18:8]
-  wire [7:0] _sub_T_35 = _sub_T_30 | _sub_T_34; // @[VAluInt.scala 1332:75]
-  wire  _sub_T_38 = satsubsel_1 == 3'h0 & io_op_sub_subs | io_op_sub_sub; // @[VAluInt.scala 1334:59]
-  wire [7:0] _sub_T_40 = _sub_T_38 ? subtr_1[7:0] : 8'h0; // @[Library.scala 18:8]
-  wire [7:0] _sub_T_41 = _sub_T_35 | _sub_T_40; // @[VAluInt.scala 1333:69]
-  wire [7:0] _sub_T_43 = io_op_sub_hsub ? subtr_1[8:1] : 8'h0; // @[Library.scala 18:8]
-  wire [7:0] sub_1 = _sub_T_41 | _sub_T_43; // @[VAluInt.scala 1334:97]
+  wire  _sub_T_22 = satsubsel_1[2] & io_op_sub_subs; // @[VAluInt.scala 1331:36]
+  wire [7:0] _sub_T_24 = _sub_T_22 ? 8'h80 : 8'h0; // @[Library.scala 18:8]
+  wire  _sub_T_26 = satsubsel_1[1] & io_op_sub_subs; // @[VAluInt.scala 1332:36]
+  wire [6:0] _sub_T_28 = _sub_T_26 ? 7'h7f : 7'h0; // @[Library.scala 18:8]
+  wire [7:0] _GEN_49 = {{1'd0}, _sub_T_28}; // @[VAluInt.scala 1331:89]
+  wire [7:0] _sub_T_29 = _sub_T_24 | _GEN_49; // @[VAluInt.scala 1331:89]
+  wire  _sub_T_36 = satsubsel_1 == 3'h0 & io_op_sub_subs | io_op_sub_sub; // @[VAluInt.scala 1334:59]
+  wire [7:0] _sub_T_38 = _sub_T_36 ? subtr_1[7:0] : 8'h0; // @[Library.scala 18:8]
+  wire [7:0] _sub_T_39 = _sub_T_29 | _sub_T_38; // @[VAluInt.scala 1333:68]
+  wire [7:0] _sub_T_41 = io_op_sub_hsub ? subtr_1[8:1] : 8'h0; // @[Library.scala 18:8]
+  wire [7:0] sub_1 = _sub_T_39 | _sub_T_41; // @[VAluInt.scala 1334:97]
   wire  subw_r_r_1_2 = subtr_1[9]; // @[Library.scala 50:25]
   wire [15:0] subw_r_1 = {subw_r_r_1_2,subw_r_r_1_2,subw_r_r_1_2,subw_r_r_1_2,subw_r_r_1_2,subw_r_r_1_2,subtr_1}; // @[Cat.scala 31:58]
   wire [15:0] subw_1 = io_op_sub_subw ? subw_r_1 : 16'h0; // @[Library.scala 18:8]
@@ -50254,20 +50248,17 @@
   wire [7:0] _sraqs_r_T_48 = _sraqs_r_T_44 | _sraqs_r_T_47; // @[VAluInt.scala 1092:58]
   wire [7:0] _sraqs_r_T_50 = sraqs_is_norm_2 ? sraqs_rshf_2[7:0] : 8'h0; // @[Library.scala 18:8]
   wire [7:0] sraqs_2 = _sraqs_r_T_48 | _sraqs_r_T_50; // @[VAluInt.scala 1093:58]
-  wire  _sub_T_45 = satsubsel_2[2] & io_op_sub_subs; // @[VAluInt.scala 1331:36]
-  wire [7:0] _sub_T_47 = _sub_T_45 ? 8'h80 : 8'h0; // @[Library.scala 18:8]
-  wire  _sub_T_49 = satsubsel_2[1] & io_op_sub_subs; // @[VAluInt.scala 1332:36]
-  wire [6:0] _sub_T_51 = _sub_T_49 ? 7'h7f : 7'h0; // @[Library.scala 18:8]
-  wire [7:0] _GEN_81 = {{1'd0}, _sub_T_51}; // @[VAluInt.scala 1331:89]
-  wire [7:0] _sub_T_52 = _sub_T_47 | _GEN_81; // @[VAluInt.scala 1331:89]
-  wire  _sub_T_54 = satsubsel_2[0] & io_op_sub_subs; // @[VAluInt.scala 1333:36]
-  wire [7:0] _sub_T_56 = _sub_T_54 ? 8'hff : 8'h0; // @[Library.scala 18:8]
-  wire [7:0] _sub_T_57 = _sub_T_52 | _sub_T_56; // @[VAluInt.scala 1332:75]
-  wire  _sub_T_60 = satsubsel_2 == 3'h0 & io_op_sub_subs | io_op_sub_sub; // @[VAluInt.scala 1334:59]
-  wire [7:0] _sub_T_62 = _sub_T_60 ? subtr_2[7:0] : 8'h0; // @[Library.scala 18:8]
-  wire [7:0] _sub_T_63 = _sub_T_57 | _sub_T_62; // @[VAluInt.scala 1333:69]
-  wire [7:0] _sub_T_65 = io_op_sub_hsub ? subtr_2[8:1] : 8'h0; // @[Library.scala 18:8]
-  wire [7:0] sub_2 = _sub_T_63 | _sub_T_65; // @[VAluInt.scala 1334:97]
+  wire  _sub_T_43 = satsubsel_2[2] & io_op_sub_subs; // @[VAluInt.scala 1331:36]
+  wire [7:0] _sub_T_45 = _sub_T_43 ? 8'h80 : 8'h0; // @[Library.scala 18:8]
+  wire  _sub_T_47 = satsubsel_2[1] & io_op_sub_subs; // @[VAluInt.scala 1332:36]
+  wire [6:0] _sub_T_49 = _sub_T_47 ? 7'h7f : 7'h0; // @[Library.scala 18:8]
+  wire [7:0] _GEN_81 = {{1'd0}, _sub_T_49}; // @[VAluInt.scala 1331:89]
+  wire [7:0] _sub_T_50 = _sub_T_45 | _GEN_81; // @[VAluInt.scala 1331:89]
+  wire  _sub_T_57 = satsubsel_2 == 3'h0 & io_op_sub_subs | io_op_sub_sub; // @[VAluInt.scala 1334:59]
+  wire [7:0] _sub_T_59 = _sub_T_57 ? subtr_2[7:0] : 8'h0; // @[Library.scala 18:8]
+  wire [7:0] _sub_T_60 = _sub_T_50 | _sub_T_59; // @[VAluInt.scala 1333:68]
+  wire [7:0] _sub_T_62 = io_op_sub_hsub ? subtr_2[8:1] : 8'h0; // @[Library.scala 18:8]
+  wire [7:0] sub_2 = _sub_T_60 | _sub_T_62; // @[VAluInt.scala 1334:97]
   wire  subw_r_r_2_2 = subtr_2[9]; // @[Library.scala 50:25]
   wire [15:0] subw_r_2 = {subw_r_r_2_2,subw_r_r_2_2,subw_r_r_2_2,subw_r_r_2_2,subw_r_r_2_2,subw_r_r_2_2,subtr_2}; // @[Cat.scala 31:58]
   wire [15:0] subw_2 = io_op_sub_subw ? subw_r_2 : 16'h0; // @[Library.scala 18:8]
@@ -50740,20 +50731,17 @@
   wire [7:0] _sraqs_r_T_65 = _sraqs_r_T_61 | _sraqs_r_T_64; // @[VAluInt.scala 1092:58]
   wire [7:0] _sraqs_r_T_67 = sraqs_is_norm_3 ? sraqs_rshf_3[7:0] : 8'h0; // @[Library.scala 18:8]
   wire [7:0] sraqs_3 = _sraqs_r_T_65 | _sraqs_r_T_67; // @[VAluInt.scala 1093:58]
-  wire  _sub_T_67 = satsubsel_3[2] & io_op_sub_subs; // @[VAluInt.scala 1331:36]
-  wire [7:0] _sub_T_69 = _sub_T_67 ? 8'h80 : 8'h0; // @[Library.scala 18:8]
-  wire  _sub_T_71 = satsubsel_3[1] & io_op_sub_subs; // @[VAluInt.scala 1332:36]
-  wire [6:0] _sub_T_73 = _sub_T_71 ? 7'h7f : 7'h0; // @[Library.scala 18:8]
-  wire [7:0] _GEN_113 = {{1'd0}, _sub_T_73}; // @[VAluInt.scala 1331:89]
-  wire [7:0] _sub_T_74 = _sub_T_69 | _GEN_113; // @[VAluInt.scala 1331:89]
-  wire  _sub_T_76 = satsubsel_3[0] & io_op_sub_subs; // @[VAluInt.scala 1333:36]
-  wire [7:0] _sub_T_78 = _sub_T_76 ? 8'hff : 8'h0; // @[Library.scala 18:8]
-  wire [7:0] _sub_T_79 = _sub_T_74 | _sub_T_78; // @[VAluInt.scala 1332:75]
-  wire  _sub_T_82 = satsubsel_3 == 3'h0 & io_op_sub_subs | io_op_sub_sub; // @[VAluInt.scala 1334:59]
-  wire [7:0] _sub_T_84 = _sub_T_82 ? subtr_3[7:0] : 8'h0; // @[Library.scala 18:8]
-  wire [7:0] _sub_T_85 = _sub_T_79 | _sub_T_84; // @[VAluInt.scala 1333:69]
-  wire [7:0] _sub_T_87 = io_op_sub_hsub ? subtr_3[8:1] : 8'h0; // @[Library.scala 18:8]
-  wire [7:0] sub_3 = _sub_T_85 | _sub_T_87; // @[VAluInt.scala 1334:97]
+  wire  _sub_T_64 = satsubsel_3[2] & io_op_sub_subs; // @[VAluInt.scala 1331:36]
+  wire [7:0] _sub_T_66 = _sub_T_64 ? 8'h80 : 8'h0; // @[Library.scala 18:8]
+  wire  _sub_T_68 = satsubsel_3[1] & io_op_sub_subs; // @[VAluInt.scala 1332:36]
+  wire [6:0] _sub_T_70 = _sub_T_68 ? 7'h7f : 7'h0; // @[Library.scala 18:8]
+  wire [7:0] _GEN_113 = {{1'd0}, _sub_T_70}; // @[VAluInt.scala 1331:89]
+  wire [7:0] _sub_T_71 = _sub_T_66 | _GEN_113; // @[VAluInt.scala 1331:89]
+  wire  _sub_T_78 = satsubsel_3 == 3'h0 & io_op_sub_subs | io_op_sub_sub; // @[VAluInt.scala 1334:59]
+  wire [7:0] _sub_T_80 = _sub_T_78 ? subtr_3[7:0] : 8'h0; // @[Library.scala 18:8]
+  wire [7:0] _sub_T_81 = _sub_T_71 | _sub_T_80; // @[VAluInt.scala 1333:68]
+  wire [7:0] _sub_T_83 = io_op_sub_hsub ? subtr_3[8:1] : 8'h0; // @[Library.scala 18:8]
+  wire [7:0] sub_3 = _sub_T_81 | _sub_T_83; // @[VAluInt.scala 1334:97]
   wire  subw_r_r_3_2 = subtr_3[9]; // @[Library.scala 50:25]
   wire [15:0] subw_r_3 = {subw_r_r_3_2,subw_r_r_3_2,subw_r_r_3_2,subw_r_r_3_2,subw_r_r_3_2,subw_r_r_3_2,subtr_3}; // @[Cat.scala 31:58]
   wire [15:0] subw_3 = io_op_sub_subw ? subw_r_3 : 16'h0; // @[Library.scala 18:8]
@@ -51251,20 +51239,17 @@
   wire [15:0] _srans_r_T_82 = _srans_r_T_78 | _srans_r_T_81; // @[VAluInt.scala 1092:58]
   wire [15:0] _srans_r_T_84 = srans_is_norm_4 ? srans_rshf_4[15:0] : 16'h0; // @[Library.scala 18:8]
   wire [15:0] srans_4 = _srans_r_T_82 | _srans_r_T_84; // @[VAluInt.scala 1093:58]
-  wire  _sub_T_89 = satsubsel_4[2] & io_op_sub_subs; // @[VAluInt.scala 1331:36]
-  wire [15:0] _sub_T_91 = _sub_T_89 ? 16'h8000 : 16'h0; // @[Library.scala 18:8]
-  wire  _sub_T_93 = satsubsel_4[1] & io_op_sub_subs; // @[VAluInt.scala 1332:36]
-  wire [14:0] _sub_T_95 = _sub_T_93 ? 15'h7fff : 15'h0; // @[Library.scala 18:8]
-  wire [15:0] _GEN_144 = {{1'd0}, _sub_T_95}; // @[VAluInt.scala 1331:89]
-  wire [15:0] _sub_T_96 = _sub_T_91 | _GEN_144; // @[VAluInt.scala 1331:89]
-  wire  _sub_T_98 = satsubsel_4[0] & io_op_sub_subs; // @[VAluInt.scala 1333:36]
-  wire [15:0] _sub_T_100 = _sub_T_98 ? 16'hffff : 16'h0; // @[Library.scala 18:8]
-  wire [15:0] _sub_T_101 = _sub_T_96 | _sub_T_100; // @[VAluInt.scala 1332:75]
-  wire  _sub_T_104 = satsubsel_4 == 3'h0 & io_op_sub_subs | io_op_sub_sub; // @[VAluInt.scala 1334:59]
-  wire [15:0] _sub_T_106 = _sub_T_104 ? subtr_4[15:0] : 16'h0; // @[Library.scala 18:8]
-  wire [15:0] _sub_T_107 = _sub_T_101 | _sub_T_106; // @[VAluInt.scala 1333:69]
-  wire [15:0] _sub_T_109 = io_op_sub_hsub ? subtr_4[16:1] : 16'h0; // @[Library.scala 18:8]
-  wire [15:0] sub_4 = _sub_T_107 | _sub_T_109; // @[VAluInt.scala 1334:97]
+  wire  _sub_T_85 = satsubsel_4[2] & io_op_sub_subs; // @[VAluInt.scala 1331:36]
+  wire [15:0] _sub_T_87 = _sub_T_85 ? 16'h8000 : 16'h0; // @[Library.scala 18:8]
+  wire  _sub_T_89 = satsubsel_4[1] & io_op_sub_subs; // @[VAluInt.scala 1332:36]
+  wire [14:0] _sub_T_91 = _sub_T_89 ? 15'h7fff : 15'h0; // @[Library.scala 18:8]
+  wire [15:0] _GEN_144 = {{1'd0}, _sub_T_91}; // @[VAluInt.scala 1331:89]
+  wire [15:0] _sub_T_92 = _sub_T_87 | _GEN_144; // @[VAluInt.scala 1331:89]
+  wire  _sub_T_99 = satsubsel_4 == 3'h0 & io_op_sub_subs | io_op_sub_sub; // @[VAluInt.scala 1334:59]
+  wire [15:0] _sub_T_101 = _sub_T_99 ? subtr_4[15:0] : 16'h0; // @[Library.scala 18:8]
+  wire [15:0] _sub_T_102 = _sub_T_92 | _sub_T_101; // @[VAluInt.scala 1333:68]
+  wire [15:0] _sub_T_104 = io_op_sub_hsub ? subtr_4[16:1] : 16'h0; // @[Library.scala 18:8]
+  wire [15:0] sub_4 = _sub_T_102 | _sub_T_104; // @[VAluInt.scala 1334:97]
   wire  subw_r_r_4_2 = subtr_4[17]; // @[Library.scala 50:25]
   wire [6:0] subw_r_lo_4 = {subw_r_r_4_2,subw_r_r_4_2,subw_r_r_4_2,subw_r_r_4_2,subw_r_r_4_2,subw_r_r_4_2,subw_r_r_4_2}; // @[Library.scala 43:7]
   wire [31:0] subw_r_4 = {subw_r_r_4_2,subw_r_r_4_2,subw_r_r_4_2,subw_r_r_4_2,subw_r_r_4_2,subw_r_r_4_2,subw_r_r_4_2,
@@ -51769,20 +51754,17 @@
   wire [15:0] _srans_r_T_99 = _srans_r_T_95 | _srans_r_T_98; // @[VAluInt.scala 1092:58]
   wire [15:0] _srans_r_T_101 = srans_is_norm_5 ? srans_rshf_5[15:0] : 16'h0; // @[Library.scala 18:8]
   wire [15:0] srans_5 = _srans_r_T_99 | _srans_r_T_101; // @[VAluInt.scala 1093:58]
-  wire  _sub_T_111 = satsubsel_5[2] & io_op_sub_subs; // @[VAluInt.scala 1331:36]
-  wire [15:0] _sub_T_113 = _sub_T_111 ? 16'h8000 : 16'h0; // @[Library.scala 18:8]
-  wire  _sub_T_115 = satsubsel_5[1] & io_op_sub_subs; // @[VAluInt.scala 1332:36]
-  wire [14:0] _sub_T_117 = _sub_T_115 ? 15'h7fff : 15'h0; // @[Library.scala 18:8]
-  wire [15:0] _GEN_178 = {{1'd0}, _sub_T_117}; // @[VAluInt.scala 1331:89]
-  wire [15:0] _sub_T_118 = _sub_T_113 | _GEN_178; // @[VAluInt.scala 1331:89]
-  wire  _sub_T_120 = satsubsel_5[0] & io_op_sub_subs; // @[VAluInt.scala 1333:36]
-  wire [15:0] _sub_T_122 = _sub_T_120 ? 16'hffff : 16'h0; // @[Library.scala 18:8]
-  wire [15:0] _sub_T_123 = _sub_T_118 | _sub_T_122; // @[VAluInt.scala 1332:75]
-  wire  _sub_T_126 = satsubsel_5 == 3'h0 & io_op_sub_subs | io_op_sub_sub; // @[VAluInt.scala 1334:59]
-  wire [15:0] _sub_T_128 = _sub_T_126 ? subtr_5[15:0] : 16'h0; // @[Library.scala 18:8]
-  wire [15:0] _sub_T_129 = _sub_T_123 | _sub_T_128; // @[VAluInt.scala 1333:69]
-  wire [15:0] _sub_T_131 = io_op_sub_hsub ? subtr_5[16:1] : 16'h0; // @[Library.scala 18:8]
-  wire [15:0] sub_5 = _sub_T_129 | _sub_T_131; // @[VAluInt.scala 1334:97]
+  wire  _sub_T_106 = satsubsel_5[2] & io_op_sub_subs; // @[VAluInt.scala 1331:36]
+  wire [15:0] _sub_T_108 = _sub_T_106 ? 16'h8000 : 16'h0; // @[Library.scala 18:8]
+  wire  _sub_T_110 = satsubsel_5[1] & io_op_sub_subs; // @[VAluInt.scala 1332:36]
+  wire [14:0] _sub_T_112 = _sub_T_110 ? 15'h7fff : 15'h0; // @[Library.scala 18:8]
+  wire [15:0] _GEN_178 = {{1'd0}, _sub_T_112}; // @[VAluInt.scala 1331:89]
+  wire [15:0] _sub_T_113 = _sub_T_108 | _GEN_178; // @[VAluInt.scala 1331:89]
+  wire  _sub_T_120 = satsubsel_5 == 3'h0 & io_op_sub_subs | io_op_sub_sub; // @[VAluInt.scala 1334:59]
+  wire [15:0] _sub_T_122 = _sub_T_120 ? subtr_5[15:0] : 16'h0; // @[Library.scala 18:8]
+  wire [15:0] _sub_T_123 = _sub_T_113 | _sub_T_122; // @[VAluInt.scala 1333:68]
+  wire [15:0] _sub_T_125 = io_op_sub_hsub ? subtr_5[16:1] : 16'h0; // @[Library.scala 18:8]
+  wire [15:0] sub_5 = _sub_T_123 | _sub_T_125; // @[VAluInt.scala 1334:97]
   wire  subw_r_r_5_2 = subtr_5[17]; // @[Library.scala 50:25]
   wire [6:0] subw_r_lo_5 = {subw_r_r_5_2,subw_r_r_5_2,subw_r_r_5_2,subw_r_r_5_2,subw_r_r_5_2,subw_r_r_5_2,subw_r_r_5_2}; // @[Library.scala 43:7]
   wire [31:0] subw_r_5 = {subw_r_r_5_2,subw_r_r_5_2,subw_r_r_5_2,subw_r_r_5_2,subw_r_r_5_2,subw_r_r_5_2,subw_r_r_5_2,
@@ -52276,20 +52258,17 @@
   wire [31:0] padd_sub_2 = io_op_padd_sub ? padd_sub_r_2 : 32'h0; // @[Library.scala 18:8]
   wire [31:0] padd_2 = padd_add_2 | padd_sub_2; // @[VAluInt.scala 1300:15]
   wire [31:0] rsub_6 = io_op_rsub_rsub ? rsubtr_6 : 32'h0; // @[Library.scala 18:8]
-  wire  _sub_T_133 = satsubsel_6[2] & io_op_sub_subs; // @[VAluInt.scala 1331:36]
-  wire [31:0] _sub_T_135 = _sub_T_133 ? 32'h80000000 : 32'h0; // @[Library.scala 18:8]
-  wire  _sub_T_137 = satsubsel_6[1] & io_op_sub_subs; // @[VAluInt.scala 1332:36]
-  wire [30:0] _sub_T_139 = _sub_T_137 ? 31'h7fffffff : 31'h0; // @[Library.scala 18:8]
-  wire [31:0] _GEN_211 = {{1'd0}, _sub_T_139}; // @[VAluInt.scala 1331:89]
-  wire [31:0] _sub_T_140 = _sub_T_135 | _GEN_211; // @[VAluInt.scala 1331:89]
-  wire  _sub_T_142 = satsubsel_6[0] & io_op_sub_subs; // @[VAluInt.scala 1333:36]
-  wire [31:0] _sub_T_144 = _sub_T_142 ? 32'hffffffff : 32'h0; // @[Library.scala 18:8]
-  wire [31:0] _sub_T_145 = _sub_T_140 | _sub_T_144; // @[VAluInt.scala 1332:75]
-  wire  _sub_T_148 = satsubsel_6 == 3'h0 & io_op_sub_subs | io_op_sub_sub; // @[VAluInt.scala 1334:59]
-  wire [31:0] _sub_T_150 = _sub_T_148 ? subtr_6[31:0] : 32'h0; // @[Library.scala 18:8]
-  wire [31:0] _sub_T_151 = _sub_T_145 | _sub_T_150; // @[VAluInt.scala 1333:69]
-  wire [31:0] _sub_T_153 = io_op_sub_hsub ? subtr_6[32:1] : 32'h0; // @[Library.scala 18:8]
-  wire [31:0] sub_6 = _sub_T_151 | _sub_T_153; // @[VAluInt.scala 1334:97]
+  wire  _sub_T_127 = satsubsel_6[2] & io_op_sub_subs; // @[VAluInt.scala 1331:36]
+  wire [31:0] _sub_T_129 = _sub_T_127 ? 32'h80000000 : 32'h0; // @[Library.scala 18:8]
+  wire  _sub_T_131 = satsubsel_6[1] & io_op_sub_subs; // @[VAluInt.scala 1332:36]
+  wire [30:0] _sub_T_133 = _sub_T_131 ? 31'h7fffffff : 31'h0; // @[Library.scala 18:8]
+  wire [31:0] _GEN_211 = {{1'd0}, _sub_T_133}; // @[VAluInt.scala 1331:89]
+  wire [31:0] _sub_T_134 = _sub_T_129 | _GEN_211; // @[VAluInt.scala 1331:89]
+  wire  _sub_T_141 = satsubsel_6 == 3'h0 & io_op_sub_subs | io_op_sub_sub; // @[VAluInt.scala 1334:59]
+  wire [31:0] _sub_T_143 = _sub_T_141 ? subtr_6[31:0] : 32'h0; // @[Library.scala 18:8]
+  wire [31:0] _sub_T_144 = _sub_T_134 | _sub_T_143; // @[VAluInt.scala 1333:68]
+  wire [31:0] _sub_T_146 = io_op_sub_hsub ? subtr_6[32:1] : 32'h0; // @[Library.scala 18:8]
+  wire [31:0] sub_6 = _sub_T_144 | _sub_T_146; // @[VAluInt.scala 1334:97]
   wire  _cmp_T_217 = io_op_cmp_eq & xeq_6; // @[Library.scala 22:8]
   wire  _cmp_T_218 = io_op_cmp_ne & xne_6; // @[Library.scala 22:8]
   wire  _cmp_T_219 = _cmp_T_217 | _cmp_T_218; // @[VAluInt.scala 1341:45]