diff --git a/av1/encoder/encodeframe.c b/av1/encoder/encodeframe.c
index f696245..417325a 100644
--- a/av1/encoder/encodeframe.c
+++ b/av1/encoder/encodeframe.c
@@ -3736,7 +3736,7 @@
 // After this function is called, we will store the following to features:
 // features[0:17] = var and sse from subblocks
 // features[18] = DC q_index
-#define NUM_FEATURES 19
+#define NUM_FEATURES 25
 static void simple_motion_search_prune_part_features(
     AV1_COMP *const cpi, MACROBLOCK *x, PC_TREE *pc_tree, int mi_row,
     int mi_col, BLOCK_SIZE bsize, float *features) {
@@ -3752,15 +3752,15 @@
   // Setting up motion search
   const int ref_list[] = { LAST_FRAME, ALTREF_FRAME };
   const int num_refs = 2;
-  const int use_subpixel = 0;
+  const int use_subpixel = 1;
 
-  unsigned int none_sse = 0, none_var = 0;
   unsigned int int_features[NUM_FEATURES - 1];
 
   // Doing whole block first to update the mv
-  simple_motion_search_get_best_ref(cpi, x, pc_tree, mi_row, mi_col, bsize,
-                                    ref_list, num_refs, use_subpixel, 4,
-                                    &none_sse, &none_var);
+  simple_motion_search_get_best_ref(
+      cpi, x, pc_tree, mi_row, mi_col, bsize, ref_list, num_refs, use_subpixel,
+      4, &int_features[f_idx], &int_features[f_idx + 1]);
+  f_idx += 2;
 
   // Split subblocks
   BLOCK_SIZE subsize = get_partition_subsize(bsize, PARTITION_SPLIT);
@@ -3771,7 +3771,7 @@
 
     simple_motion_search_get_best_ref(
         cpi, x, pc_tree, sub_mi_row, sub_mi_col, subsize, ref_list, num_refs,
-        use_subpixel, r_idx, &int_features[f_idx + 1], &int_features[f_idx]);
+        use_subpixel, r_idx, &int_features[f_idx], &int_features[f_idx + 1]);
     f_idx += 2;
   }
 
@@ -3783,7 +3783,7 @@
 
     simple_motion_search_get_best_ref(
         cpi, x, pc_tree, sub_mi_row, sub_mi_col, subsize, ref_list, num_refs,
-        use_subpixel, -1, &int_features[f_idx + 1], &int_features[f_idx]);
+        use_subpixel, -1, &int_features[f_idx], &int_features[f_idx + 1]);
 
     f_idx += 2;
   }
@@ -3796,15 +3796,11 @@
 
     simple_motion_search_get_best_ref(
         cpi, x, pc_tree, sub_mi_row, sub_mi_col, subsize, ref_list, num_refs,
-        use_subpixel, -1, &int_features[f_idx + 1], &int_features[f_idx]);
+        use_subpixel, -1, &int_features[f_idx], &int_features[f_idx + 1]);
 
     f_idx += 2;
   }
 
-  // Whole block
-  int_features[f_idx++] = none_var;
-  int_features[f_idx++] = none_sse;
-
   aom_clear_system_state();
   for (int idx = 0; idx < f_idx; idx++) {
     features[idx] = logf(1.0f + (float)int_features[idx]);
@@ -3817,6 +3813,18 @@
   const int dc_q = av1_dc_quant_QTX(x->qindex, 0, xd->bd) >> (xd->bd - 8);
   features[f_idx++] = logf(1.0f + (float)(dc_q * dc_q) / 256.0f);
 
+  // Neighbor stuff
+  const int has_above = !!xd->above_mbmi;
+  const int has_left = !!xd->left_mbmi;
+  const BLOCK_SIZE above_bsize = has_above ? xd->above_mbmi->sb_type : bsize;
+  const BLOCK_SIZE left_bsize = has_left ? xd->left_mbmi->sb_type : bsize;
+  features[f_idx++] = (float)has_above;
+  features[f_idx++] = (float)mi_size_wide_log2[above_bsize];
+  features[f_idx++] = (float)mi_size_high_log2[above_bsize];
+  features[f_idx++] = (float)has_left;
+  features[f_idx++] = (float)mi_size_wide_log2[left_bsize];
+  features[f_idx++] = (float)mi_size_high_log2[left_bsize];
+
   assert(f_idx == NUM_FEATURES);
 }
 
@@ -3872,6 +3880,9 @@
                      prune_thresh[PARTITION_VERT] == 0.0f)) {
     return;
   }
+  if (bsize < BLOCK_8X8) {
+    return;
+  }
 
   // Get features
   float features[NUM_FEATURES] = { 0.0f };
@@ -4213,6 +4224,9 @@
 
   const int try_prune_rect =
       cpi->sf.simple_motion_search_prune_rect && !frame_is_intra_only(cm) &&
+      do_rectangular_split &&
+      (do_square_split || partition_none_allowed ||
+       (prune_horz && prune_vert)) &&
       (partition_horz_allowed || partition_vert_allowed) && bsize >= BLOCK_8X8;
 
   if (try_prune_rect) {
diff --git a/av1/encoder/partition_model_weights.h b/av1/encoder/partition_model_weights.h
index 69ccf4f..904a54b 100644
--- a/av1/encoder/partition_model_weights.h
+++ b/av1/encoder/partition_model_weights.h
@@ -2917,21 +2917,32 @@
 };
 
 // Thresholds for pruning a partition type
-// TODO(chiyotsai@google.com): Retune the thresholds for rectangular partition.
 static const float av1_simple_motion_search_prune_part_prune_thresh_128[10] = {
-  0.0f, 0.0110f, 0.0110f, 0.0f, 0.0f, 0.0f, 0.0f, 0.0f, 0.0f, 0.0f
+  0.0f, 0.0288721601835f, 0.0288721601835f, 0.0f, 0.0f, 0.0f, 0.0f, 0.0f, 0.0f,
+  0.0f
 };
 
 static const float av1_simple_motion_search_prune_part_prune_thresh_64[10] = {
-  0.0f, 0.0110f, 0.0110f, 0.0f, 0.0f, 0.0f, 0.0f, 0.0f, 0.0f, 0.0f
+  0.0f, 0.0281573780991f, 0.0281573780991f, 0.0f, 0.0f, 0.0f, 0.0f, 0.0f, 0.0f,
+  0.0f
 };
 
 static const float av1_simple_motion_search_prune_part_prune_thresh_32[10] = {
-  0.0f, 0.0110f, 0.0110f, 0.0f, 0.0f, 0.0f, 0.0f, 0.0f, 0.0f, 0.0f
+  0.0f, 0.0225501403434f, 0.0225501403434f, 0.0f, 0.0f, 0.0f, 0.0f, 0.0f, 0.0f,
+  0.0f
 };
 
 static const float av1_simple_motion_search_prune_part_prune_thresh_16[10] = {
-  0.0f, 0.0110f, 0.0110f, 0.0f, 0.0f, 0.0f, 0.0f, 0.0f, 0.0f, 0.0f
+  0.0f,
+  0.000961189195907f,
+  0.000961189195907f,
+  0.0f,
+  0.0f,
+  0.0f,
+  0.0f,
+  0.0f,
+  0.0f,
+  0.0f
 };
 
 static const float av1_simple_motion_search_prune_part_prune_thresh_8[10] = {
@@ -2939,197 +2950,142 @@
 };
 
 // Mean and std
-static const float av1_simple_motion_search_prune_part_mean_128[19] = {
-  11.561261f, 11.626691f, 10.820066f, 10.880652f, 11.193911f,
-  11.269741f, 10.509796f, 10.584754f, 12.659430f, 12.724323f,
-  12.254200f, 12.326454f, 12.632568f, 12.694887f, 11.814313f,
-  11.872458f, 13.690346f, 13.753730f, 5.165726f,
+static const float av1_simple_motion_search_prune_part_mean_128[25] = {
+  13.292176f, 13.231236f, 11.098058f, 11.049944f, 10.481336f,
+  10.431587f, 10.789337f, 10.732787f, 10.233817f, 10.173738f,
+  12.214045f, 12.157505f, 11.863353f, 11.802220f, 12.204053f,
+  12.152315f, 11.517566f, 11.465651f, 5.383040f,  0.757934f,
+  4.012611f,  4.052191f,  0.853365f,  3.954503f,  3.944135f,
 };
 
-static const float av1_simple_motion_search_prune_part_std_128[19] = {
-  2.434728f, 2.429037f, 3.701918f, 3.709713f, 3.288111f, 3.286657f, 4.174337f,
-  4.185339f, 2.531916f, 2.540137f, 3.488878f, 3.496263f, 2.459336f, 2.460739f,
-  3.919058f, 3.930766f, 2.511685f, 2.524923f, 2.257989f,
+static const float av1_simple_motion_search_prune_part_std_128[25] = {
+  2.589217f, 2.559396f, 2.268402f, 2.282274f, 3.341234f, 3.341994f, 3.033007f,
+  3.041550f, 3.786247f, 3.784053f, 2.523459f, 2.511275f, 3.349364f, 3.340481f,
+  2.390149f, 2.384226f, 3.599467f, 3.587460f, 2.319911f, 0.428335f, 1.241087f,
+  1.208679f, 0.353742f, 1.228122f, 1.211777f,
 };
 
-static const float av1_simple_motion_search_prune_part_mean_64[19] = {
-  10.073195f, 10.158249f, 9.627341f,  9.708094f,  9.002025f,
-  9.076430f,  8.597153f,  8.668316f,  11.021699f, 11.097507f,
-  9.852887f,  9.919513f,  11.007151f, 11.085718f, 10.525035f,
-  10.599575f, 11.936800f, 12.007580f, 4.860905f,
+static const float av1_simple_motion_search_prune_part_mean_64[25] = {
+  11.439831f, 11.382639f, 9.647134f, 9.578121f, 9.146770f,
+  9.084122f,  8.559063f,  8.499496f, 8.095865f, 8.041795f,
+  10.547537f, 10.486240f, 9.362147f, 9.308391f, 10.548071f,
+  10.484358f, 10.002225f, 9.944480f, 4.964504f, 0.897164f,
+  3.306144f,  3.351039f,  0.928582f, 3.319739f, 3.287726f,
 };
 
-static const float av1_simple_motion_search_prune_part_std_64[19] = {
-  2.272113f, 2.256767f, 3.023892f, 3.027094f, 3.794186f, 3.808349f, 4.143885f,
-  4.164291f, 2.262401f, 2.249636f, 4.039632f, 4.053496f, 2.234799f, 2.219867f,
-  3.136350f, 3.139975f, 2.199973f, 2.187191f, 2.185985f,
+static const float av1_simple_motion_search_prune_part_std_64[25] = {
+  2.033404f, 2.050657f, 2.064671f, 2.081519f, 2.916312f, 2.914649f, 3.628949f,
+  3.618760f, 4.011421f, 3.996068f, 2.087127f, 2.103106f, 3.885277f, 3.876166f,
+  2.035599f, 2.052976f, 3.052501f, 3.050985f, 2.232998f, 0.303745f, 1.111161f,
+  1.081292f, 0.257521f, 1.112510f, 1.089404f,
 };
 
-static const float av1_simple_motion_search_prune_part_mean_32[19] = {
-  8.499073f, 8.600074f, 8.508158f,  8.611221f,  8.498978f, 8.599821f, 8.506126f,
-  8.609448f, 9.481358f, 9.569901f,  9.481697f,  9.569918f, 9.469805f, 9.557789f,
-  9.483047f, 9.572816f, 10.416696f, 10.496502f, 4.413157f,
+static const float av1_simple_motion_search_prune_part_mean_32[25] = {
+  9.862349f, 9.793658f, 8.043962f, 7.954083f, 8.058867f, 7.966165f, 8.046844f,
+  7.956817f, 8.061414f, 7.967906f, 8.966450f, 8.890165f, 8.968315f, 8.891513f,
+  8.953573f, 8.877070f, 8.974275f, 8.895363f, 4.387239f, 0.954143f, 2.701000f,
+  2.751266f, 0.963302f, 2.716584f, 2.709725f,
 };
 
-static const float av1_simple_motion_search_prune_part_std_32[19] = {
-  2.129560f, 2.117602f, 2.115962f, 2.104043f, 2.136564f, 2.125870f, 2.125247f,
-  2.114250f, 2.146261f, 2.134374f, 2.160289f, 2.149360f, 2.116179f, 2.103744f,
-  2.099453f, 2.087138f, 2.115011f, 2.101419f, 2.024279f,
+static const float av1_simple_motion_search_prune_part_std_32[25] = {
+  1.971555f, 1.985517f, 1.935986f, 1.944743f, 1.924122f, 1.932169f, 1.943151f,
+  1.950612f, 1.931156f, 1.938242f, 1.987803f, 1.997670f, 2.000859f, 2.009913f,
+  1.938270f, 1.949277f, 1.922999f, 1.933145f, 1.991504f, 0.209175f, 0.973824f,
+  0.952221f, 0.188018f, 0.985295f, 0.946228f,
 };
 
-static const float av1_simple_motion_search_prune_part_mean_16[19] = {
-  6.990048f, 7.116367f, 6.883459f, 7.007796f, 6.993151f, 7.119445f, 6.886147f,
-  7.010345f, 7.994230f, 8.099907f, 7.998478f, 8.104088f, 7.988468f, 8.092865f,
-  7.868373f, 7.971079f, 8.946122f, 9.037547f, 3.976610f,
+static const float av1_simple_motion_search_prune_part_mean_16[25] = {
+  8.391692f, 8.303431f, 6.590342f, 6.459725f, 6.460719f, 6.333274f, 6.592615f,
+  6.461661f, 6.464787f, 6.337191f, 7.499753f, 7.395166f, 7.503220f, 7.398344f,
+  7.498312f, 7.395039f, 7.353743f, 7.253139f, 3.874267f, 0.979701f, 2.087404f,
+  2.131698f, 0.981005f, 2.110868f, 2.106539f,
 };
 
-static const float av1_simple_motion_search_prune_part_std_16[19] = {
-  1.963746f, 1.954729f, 2.127820f, 2.126451f, 1.963392f, 1.955016f, 2.126736f,
-  2.126004f, 1.991209f, 1.981070f, 1.992683f, 1.983143f, 1.986913f, 1.977408f,
-  2.200119f, 2.197786f, 1.997332f, 1.986091f, 1.829684f,
+static const float av1_simple_motion_search_prune_part_std_16[25] = {
+  1.865867f, 1.870012f, 1.773885f, 1.770447f, 1.972922f, 1.961361f, 1.777224f,
+  1.772864f, 1.974519f, 1.962281f, 1.831632f, 1.831837f, 1.837595f, 1.837008f,
+  1.822791f, 1.822053f, 2.074991f, 2.067200f, 1.676261f, 0.141022f, 0.840297f,
+  0.829935f, 0.136507f, 0.828972f, 0.808563f,
 };
 
-static const float av1_simple_motion_search_prune_part_mean_8[19] = {
-  5.362649f, 5.561670f, 5.362880f, 5.564151f, 5.365307f, 5.565139f, 5.365830f,
-  5.567452f, 6.453082f, 6.598073f, 6.458814f, 6.604363f, 6.454421f, 6.599441f,
-  6.458431f, 6.604804f, 7.469143f, 7.585015f, 3.625800f,
+static const float av1_simple_motion_search_prune_part_mean_8[25] = {
+  6.997798f, 6.867032f, 5.134819f, 4.883330f, 5.134804f, 4.879707f, 5.140518f,
+  4.886751f, 5.142186f, 4.885262f, 6.069946f, 5.896944f, 6.080442f, 5.906130f,
+  6.077539f, 5.905929f, 6.083087f, 5.909298f, 3.552709f, 0.990654f, 1.497349f,
+  1.531762f, 0.989606f, 1.496581f, 1.484139f,
 };
 
-static const float av1_simple_motion_search_prune_part_std_8[19] = {
-  1.846273f, 1.835266f, 1.846272f, 1.834365f, 1.836967f, 1.826428f, 1.837247f,
-  1.825985f, 1.886601f, 1.874138f, 1.874622f, 1.862656f, 1.877218f, 1.865398f,
-  1.874494f, 1.862057f, 1.896421f, 1.883210f, 1.670200f,
+static const float av1_simple_motion_search_prune_part_std_8[25] = {
+  1.727562f, 1.725050f, 1.633396f, 1.618773f, 1.633586f, 1.620657f, 1.620798f,
+  1.604892f, 1.621570f, 1.607439f, 1.691024f, 1.684225f, 1.676065f, 1.668442f,
+  1.680016f, 1.672452f, 1.677775f, 1.671586f, 1.451902f, 0.096223f, 0.751190f,
+  0.754040f, 0.101419f, 0.738239f, 0.729455f,
 };
 
-// BLOCK_128X128
 #define NUM_HIDDEN_LAYERS_128 1
-#define NUM_FEATURES_128 19
-#define NUM_LAYER_0_UNITS_128 24
+#define NUM_FEATURES_128 25
+#define NUM_LAYER_0_UNITS_128 8
 #define NUM_LOGITS_128 4
 
 static const float av1_simple_motion_search_prune_part_logits_kernel_128[] = {
-  -0.12815f,   -1.2107f,    0.525183f,  0.379155f,   -2.04966f,  -0.212818f,
-  -0.0609484f, -0.119338f,  1.07054f,   -0.0304129f, 0.563817f,  -0.0204729f,
-  0.757013f,   0.464791f,   0.191185f,  0.183903f,   -2.71738f,  1.41455f,
-  -0.449089f,  -0.0344047f, 0.349133f,  -0.945292f,  0.63729f,   -0.973444f,
-  -0.203447f,  -19.7875f,   -12.7536f,  -0.260806f,  0.934733f,  -3.17648f,
-  -1.11806f,   -4.63145f,   -16.0947f,  -24.203f,    -2.94649f,  -8.34109f,
-  -0.720804f,  -5.16623f,   -0.443715f, 0.510014f,   -4.2846f,   -11.2272f,
-  0.187633f,   -10.0189f,   -0.915574f, -0.235434f,  -2.57912f,  0.151642f,
-  -0.180428f,  -0.110439f,  0.349015f,  -1.83906f,   -3.38461f,  -0.309185f,
-  -9.3706f,    -5.54824f,   0.45334f,   -8.48801f,   0.392325f,  -4.19948f,
-  -0.535814f,  -4.92133f,   0.0159878f, 0.275078f,   -2.65358f,  1.32524f,
-  -0.761795f,  -14.782f,    -4.15338f,  -0.177581f,  -0.158376f, -0.0832793f,
-  0.226712f,   -0.349409f,  0.0529463f, -0.412873f,  -0.241807f, 0.19054f,
-  0.79237f,    0.218937f,   -1.60466f,  0.845653f,   -0.287058f, 0.766271f,
-  -0.455829f,  0.00261991f, 0.506805f,  -0.0593004f, 2.25348f,   -2.29282f,
-  0.0491916f,  0.38261f,    -0.281848f, -0.17802f,   -0.472124f, 0.204326f
-};
-
-static const float av1_simple_motion_search_prune_part_layer_0_kernel_128[] = {
-  0.485797f,   -0.326149f,  0.238042f,     -1.41255f,     -0.00899515f,
-  -0.715324f,  0.623049f,   0.502229f,     0.54064f,      -0.0667834f,
-  0.0591777f,  -0.435869f,  0.221466f,     -0.222184f,    0.696493f,
-  -0.514433f,  -0.771882f,  -0.080914f,    -1.58162f,     -0.214871f,
-  -0.0141856f, -0.566004f,  -1.01071f,     -0.0400122f,   -0.212581f,
-  0.144009f,   0.156065f,   0.419812f,     0.351579f,     -0.0363798f,
-  0.272286f,   0.177348f,   0.643484f,     -0.686943f,    -1.5021f,
-  -0.283203f,  -0.317958f,  0.834615f,     1.18195f,      0.704402f,
-  0.723567f,   0.0765064f,  0.0998969f,    0.358114f,     -0.471958f,
-  -0.33568f,   -0.0455057f, 0.0659417f,    0.717502f,     1.40203f,
-  -1.78214f,   -1.00743f,   -0.217992f,    -0.244456f,    -0.681988f,
-  0.199185f,   1.27797f,    0.744351f,     0.853728f,     0.976386f,
-  1.5212f,     0.246886f,   0.458125f,     -0.278508f,    -0.601164f,
-  -0.874409f,  -0.0882617f, -0.93093f,     -0.0279819f,   0.289613f,
-  -0.795015f,  1.2224f,     0.464495f,     -0.996107f,    -1.05131f,
-  0.780663f,   1.70779f,    -0.122481f,    2.64976f,      0.284897f,
-  -0.129159f,  -0.0472128f, 0.190105f,     0.549306f,     -0.829239f,
-  -2.87392f,   0.0735607f,  -1.00692f,     -0.0171315f,   0.217386f,
-  0.715055f,   1.2976f,     -0.387801f,    -0.301424f,    -0.265159f,
-  0.381381f,   -0.637641f,  0.424966f,     0.317794f,     1.99832f,
-  0.604094f,   0.444838f,   0.354898f,     -0.2603f,      -0.625206f,
-  1.37372f,    0.474128f,   1.47492f,      -0.318267f,    -0.32122f,
-  -1.29434f,   0.426303f,   -0.604944f,    -2.33438f,     -1.33476f,
-  -2.13254f,   2.28472f,    0.844804f,     0.366394f,     0.148218f,
-  -0.0996413f, -0.665787f,  1.30951f,      0.447868f,     -0.160892f,
-  0.336539f,   -0.461251f,  -0.940939f,    1.9886f,       0.774578f,
-  -0.0274317f, -0.288034f,  -0.188082f,    0.296018f,     -0.171846f,
-  0.245583f,   0.39913f,    -0.0544446f,   0.823534f,     0.215969f,
-  -0.393239f,  -0.208693f,  -0.336752f,    0.258191f,     1.03315f,
-  -0.0356378f, -0.35999f,   0.48529f,      1.09123f,      -0.243654f,
-  0.131594f,   -2.5832f,    1.26485f,      -0.700618f,    0.466223f,
-  -0.525984f,  2.19872f,    0.685663f,     1.40228f,      1.10528f,
-  0.0451285f,  -0.39981f,   -0.644025f,    -1.31137f,     0.836056f,
-  -0.884238f,  0.394441f,   -0.16017f,     -1.45246f,     -1.24252f,
-  0.195623f,   0.716485f,   -0.0522381f,   0.271321f,     0.560211f,
-  0.685537f,   -0.117774f,  -0.227596f,    0.346762f,     -0.402137f,
-  0.00528979f, 0.756388f,   0.181091f,     -0.513235f,    -0.354307f,
-  1.04355f,    -0.114563f,  0.457349f,     -0.525175f,    -1.306f,
-  -1.57685f,   -1.69919f,   0.393799f,     1.35822f,      -0.496799f,
-  0.102504f,   -0.0950497f, 0.518029f,     0.211844f,     0.385925f,
-  0.366614f,   0.52377f,    -0.22419f,     -0.209355f,    0.343361f,
-  0.0535484f,  0.320409f,   0.467987f,     -0.00542184f,  -1.02011f,
-  0.488822f,   -0.248647f,  0.113298f,     -0.665206f,    0.374419f,
-  0.731859f,   1.20004f,    -0.000319085f, -0.000491633f, -0.260543f,
-  0.804927f,   -0.410925f,  0.960751f,     0.281493f,     0.607288f,
-  -0.681745f,  -0.0925707f, -2.06876f,     -0.52926f,     0.864695f,
-  -0.712922f,  0.706643f,   -0.651177f,    -0.231887f,    -0.318515f,
-  0.0635488f,  -0.183294f,  -0.589271f,    0.288583f,     0.38702f,
-  0.582912f,   0.225519f,   1.23027f,      0.108471f,     1.3328f,
-  0.689896f,   -2.21988f,   -0.337789f,    -0.762238f,    1.79149f,
-  0.840519f,   0.825442f,   0.460811f,     0.434437f,     2.13268f,
-  -0.341805f,  -0.139746f,  -1.66773f,     -0.583511f,    -0.238547f,
-  0.156871f,   0.719404f,   1.05882f,      -0.173445f,    -0.867368f,
-  0.170469f,   1.57755f,    1.36095f,      -0.418987f,    -0.396689f,
-  0.289496f,   -0.292606f,  0.688943f,     0.176553f,     0.853828f,
-  1.19608f,    -0.557087f,  -0.58118f,     1.12805f,      0.232023f,
-  -0.167864f,  -0.222265f,  -0.719284f,    -0.802184f,    -2.85383f,
-  -1.01816f,   -1.344f,     -0.154875f,    0.308999f,     -0.62822f,
-  0.389045f,   -0.498046f,  -0.0646747f,   0.056343f,     0.188288f,
-  0.493475f,   0.241337f,   0.122423f,     -0.506522f,    0.0492923f,
-  0.0642163f,  -0.508636f,  0.0328815f,    0.78567f,      0.224673f,
-  0.627972f,   0.759423f,   1.16089f,      1.28274f,      1.19646f,
-  1.63401f,    1.56657f,    -0.131442f,    -0.423053f,    -0.599536f,
-  -1.20933f,   0.0438751f,  -0.538444f,    -0.749136f,    -0.769951f,
-  -1.06683f,   -1.66474f,   0.136208f,     1.35745f,      -0.960854f,
-  2.32612f,    0.349384f,   1.04506f,      -0.888194f,    1.28114f,
-  0.579831f,   0.53927f,    -1.07214f,     0.456708f,     -0.884062f,
-  0.789767f,   -0.776746f,  -0.0143946f,   -0.930974f,    -0.632568f,
-  -1.487f,     0.0284456f,  -0.865849f,    -1.51263f,     0.117335f,
-  -0.671304f,  -0.367558f,  -0.650224f,    1.09562f,      0.246097f,
-  0.461775f,   -0.722606f,  0.0886829f,    -0.490978f,    1.92718f,
-  0.864959f,   0.0705385f,  -0.543902f,    1.4704f,       -0.643494f,
-  0.194486f,   0.890657f,   0.901154f,     -0.458931f,    0.209679f,
-  0.303869f,   -0.167078f,  1.60197f,      1.05005f,      -0.499959f,
-  0.930484f,   -0.555236f,  -0.778482f,    -0.772935f,    -0.590988f,
-  -0.122397f,  -0.346605f,  0.100747f,     -0.237732f,    -0.180927f,
-  0.136491f,   -0.230076f,  1.52049f,      1.70212f,      0.415758f,
-  -0.811552f,  0.570249f,   1.73167f,      0.808393f,     -1.28608f,
-  0.518307f,   0.601205f,   0.258751f,     -0.498631f,    -0.790802f,
-  -0.465072f,  -0.507542f,  0.312956f,     -0.485421f,    -0.0525576f,
-  0.24136f,    -0.201595f,  -0.721587f,    0.190955f,     -0.123108f,
-  -0.263243f,  -0.36142f,   -0.105093f,    0.0651603f,    0.240065f,
-  0.241104f,   -0.238277f,  -1.11714f,     1.50723f,      0.443715f,
-  1.83051f,    1.29719f,    -0.0367089f,   1.57883f,      1.96011f,
-  0.0373268f,  0.480469f,   0.497726f,     1.47078f,      -0.359254f,
-  0.120578f,   -0.651964f,  -0.537215f,    -1.20527f,     -0.374681f,
-  -0.443443f,  -0.39421f,   0.688228f,     0.0989643f,    -1.28785f,
-  -1.24392f,   -0.165236f,  1.1812f,       -0.76329f,     1.44085f,
-  -0.540544f,  0.0958765f,  -0.31224f,     0.471211f,     -0.997358f,
-  1.16174f,    -0.948466f,  0.660749f,     -0.574517f,    1.42706f,
-  -0.477758f,  0.509914f,   -0.930534f,    0.722869f,     -0.955477f,
-  -0.383073f
-};
-
-static const float av1_simple_motion_search_prune_part_logits_bias_128[] = {
-  0.814703f, -1.18485f, -1.49788f, -0.0054509f
+  -0.129103f, 0.457758f,  -0.489986f, 0.65462f,   -0.184312f, 3.81202f,
+  -0.444407f, -0.64198f,  -0.575008f, 0.0311711f, 0.525243f,  -20.892f,
+  1.08811f,   -65.0976f,  -12.3973f,  -1.38278f,  -0.264233f, 0.241636f,
+  -10.6925f,  -0.725414f, -18.8987f,  -40.2284f,  -16.08f,    0.995331f,
+  1.47614f,   -0.964864f, 0.405506f,  0.140449f,  0.459534f,  -1.9093f,
+  0.398452f,  0.696949f
 };
 
 static const float av1_simple_motion_search_prune_part_layer_0_bias_128[] = {
-  -0.283185f, -2.5867f,  -2.07531f, -2.31513f,  -1.85869f,  -0.310685f,
-  -0.802324f, 0.056964f, -1.43881f, 2.84016f,   -1.15494f,  -2.30652f,
-  0.015622f,  0.303776f, 0.774322f, -1.25979f,  -2.37144f,  -1.35687f,
-  0.743607f,  0.768569f, -1.09908f, -0.470101f, -0.615497f, 1.04214f
+  1.22789f, -1.34527f, 0.759048f,  0.315086f,
+  1.0834f,  -1.58019f, -0.465158f, 1.20716f
+};
+
+static const float av1_simple_motion_search_prune_part_layer_0_kernel_128[] = {
+  -0.668677f,  0.58694f,    -0.417094f,   0.754735f,   -0.7859f,
+  0.377479f,   -0.0415929f, -0.0140585f,  -0.730001f,  0.747528f,
+  -0.135247f,  0.406505f,   -0.234184f,   0.956362f,   -0.637555f,
+  0.791884f,   0.0303722f,  1.04424f,     -0.727859f,  -0.274321f,
+  -0.122986f,  0.066312f,   -0.00559175f, -0.239643f,  -0.0188767f,
+  -0.102787f,  -0.262967f,  0.071882f,    -0.283398f,  0.111607f,
+  -0.425826f,  0.02699f,    0.108873f,    -0.180558f,  -0.0794057f,
+  0.29665f,    -0.0252969f, -0.0266213f,  -0.277462f,  -0.361973f,
+  0.512552f,   0.395011f,   -0.225876f,   0.301924f,   0.136954f,
+  0.507259f,   1.23425f,    0.0137135f,   0.662572f,   0.591583f,
+  0.101564f,   0.416805f,   -0.645081f,   -0.179086f,  -0.36747f,
+  -0.332213f,  0.095177f,   0.220739f,    -0.153256f,  0.706155f,
+  0.161701f,   0.696815f,   -1.21531f,    -0.115059f,  0.486764f,
+  -0.396093f,  0.784883f,   0.535357f,    -0.278021f,  0.143496f,
+  -0.44931f,   -0.144543f,  0.319326f,    0.0190167f,  -0.206295f,
+  0.373995f,   -0.247897f,  -0.608095f,   -0.41796f,   -0.137129f,
+  -0.709562f,  0.678273f,   0.537607f,    0.557474f,   0.453308f,
+  0.21405f,    -0.0466495f, 0.519139f,    -0.168832f,  0.902911f,
+  0.681131f,   -0.139876f,  -0.2052f,     -0.393271f,  0.262222f,
+  -0.246246f,  -0.213993f,  0.646619f,    0.0496181f,  -0.00354157f,
+  0.822927f,   0.0939522f,  0.180738f,    0.118355f,   0.120456f,
+  -0.0472214f, -0.144958f,  0.173405f,    -0.886644f,  -0.0949769f,
+  -0.813518f,  -0.3947f,    -0.128021f,   0.356196f,   0.469169f,
+  -0.413702f,  1.04242f,    0.428853f,    -0.387293f,  0.0850877f,
+  0.279409f,   -0.142276f,  0.0579376f,   0.211112f,   0.0703013f,
+  -1.9274f,    -0.729147f,  0.534193f,    0.773586f,   0.922864f,
+  0.642881f,   1.15127f,    0.621032f,    0.933942f,   1.01837f,
+  -0.660282f,  -0.40059f,   -1.11279f,    -0.77088f,   -0.43349f,
+  0.202361f,   -0.0840912f, 0.0935707f,   0.056333f,   -0.0779369f,
+  0.0173447f,  -0.0104756f, 0.0115005f,   -0.0195593f, 0.03592f,
+  -0.343454f,  -0.618048f,  0.258172f,    -0.412322f,  -0.0463746f,
+  -0.0413654f, -0.0400194f, 0.615981f,    -0.452094f,  0.644555f,
+  0.0822476f,  -0.359791f,  -0.0904274f,  0.209427f,   0.0116338f,
+  -0.190978f,  0.890233f,   0.737769f,    -1.66663f,   -0.392605f,
+  0.0785728f,  -0.224553f,  -0.128258f,   -0.227227f,  -0.0777773f,
+  0.685976f,   0.347042f,   -0.555325f,   -0.249221f,  0.0919837f,
+  -0.0660016f, -0.272316f,  0.0390632f,   -0.619624f,  -0.0565801f,
+  0.585026f,   0.597375f,   0.54114f,     0.593389f,   0.604391f,
+  0.0820294f,  -0.85339f,   -1.40741f,    -0.391675f,  0.0579205f,
+  -0.197626f,  0.130044f,   -0.234488f,   -0.0373991f, -0.0717973f
+};
+
+static const float av1_simple_motion_search_prune_part_logits_bias_128[] = {
+  1.58571f, -4.6314f, -2.00273f, 0.543699f
 };
 
 static const NN_CONFIG av1_simple_motion_search_prune_part_nn_config_128 = {
@@ -3154,160 +3110,243 @@
 #undef NUM_LAYER_0_UNITS_128
 #undef NUM_LOGITS_128
 
-// BLOCK_64X64
 #define NUM_HIDDEN_LAYERS_64 1
-#define NUM_FEATURES_64 19
-#define NUM_LAYER_0_UNITS_64 24
+#define NUM_FEATURES_64 25
+#define NUM_LAYER_0_UNITS_64 32
 #define NUM_LOGITS_64 10
 
 static const float av1_simple_motion_search_prune_part_logits_kernel_64[] = {
-  -2.71432f,    0.853994f,   0.740156f,   -0.30982f,   -0.448512f,  0.0984177f,
-  -0.664821f,   -0.150188f,  0.104798f,   1.27746f,    0.217043f,   -0.553914f,
-  -0.985639f,   1.99904f,    -0.994877f,  0.0697683f,  0.64856f,    -0.412276f,
-  -0.740292f,   0.93851f,    0.647461f,   0.874707f,   -1.06881f,   0.704589f,
-  0.641148f,    -0.23997f,   -0.0955951f, 0.249869f,   -0.240726f,  0.420737f,
-  -0.558423f,   -0.863005f,  0.981276f,   -0.520796f,  0.206416f,   -0.0512005f,
-  -0.76665f,    -0.341038f,  -0.727661f,  0.348269f,   -0.0786858f, -0.370214f,
-  -0.292226f,   -0.106107f,  0.262638f,   1.0065f,     0.558744f,   -0.0492801f,
-  -1.22877f,    0.225909f,   0.485238f,   -0.009513f,  -0.299224f,  -0.405938f,
-  -0.379131f,   0.0190173f,  -0.66387f,   0.846164f,   0.298606f,   -0.811507f,
-  -0.0853147f,  -0.146277f,  0.0860954f,  0.151524f,   0.239613f,   -0.0141985f,
-  0.684708f,    -0.0732401f, -0.709585f,  -1.86211f,   -0.622393f,  -0.503456f,
-  0.482376f,    -0.10075f,   -0.449184f,  0.999368f,   0.442391f,   -0.60335f,
-  0.631041f,    0.377315f,   -0.141438f,  -0.395021f,  -0.750439f,  0.79456f,
-  0.29555f,     -1.51727f,   0.964882f,   -0.256708f,  -0.182677f,  0.727967f,
-  0.411337f,    -0.252901f,  -0.546165f,  -0.620733f,  0.948828f,   0.187498f,
-  -6.20879f,    0.1671f,     -0.131667f,  -0.0719152f, -0.101839f,  -0.326827f,
-  0.00418824f,  -0.819253f,  -0.168854f,  -0.588437f,  -0.192699f,  0.126879f,
-  -0.0287044f,  -0.686708f,  -0.445826f,  -0.0993483f, -0.682881f,  0.0685043f,
-  -0.472371f,   -0.399788f,  0.170985f,   -0.164692f,  -0.380181f,  -0.268889f,
-  -3.16193f,    -0.965943f,  -0.178737f,  -0.517274f,  -0.102274f,  -0.359742f,
-  0.0117419f,   -0.0690246f, 0.206539f,   -1.29449f,   0.0976349f,  -0.188444f,
-  0.160939f,    -0.387867f,  -0.34513f,   -0.221073f,  -0.326615f,  0.0302811f,
-  0.245349f,    -0.381586f,  0.0414228f,  -0.414076f,  0.0232891f,  -0.118837f,
-  -2.81659f,    -0.288328f,  -0.0328096f, -0.61535f,   -0.23593f,   -1.16019f,
-  -0.0619081f,  0.0646133f,  -0.313036f,  -0.390373f,  -0.0481636f, 0.0450287f,
-  0.196415f,    -0.717419f,  -0.0707908f, -0.2078f,    -0.459761f,  0.230835f,
-  -0.0703036f,  -0.112402f,  -0.170908f,  0.0485359f,  -0.237293f,  -0.989058f,
-  -2.05295f,    0.134268f,   -0.173105f,  -0.493955f,  -0.28408f,   -0.91465f,
-  -0.00206022f, -0.297255f,  0.161636f,   -0.52414f,   -0.324677f,  -0.321039f,
-  0.188412f,    -0.333399f,  -0.325067f,  -0.024484f,  0.128572f,   0.20541f,
-  -0.0743476f,  0.0762302f,  -0.0370672f, -1.53757f,   -0.199054f,  -0.318512f,
-  -3.41239f,    -0.50942f,   0.100088f,   0.395587f,   0.00633016f, 0.851201f,
-  -0.0700995f,  -0.685436f,  0.0817234f,  -0.632139f,  -0.41931f,   0.15613f,
-  -0.201166f,   -0.0721472f, -0.239791f,  0.656797f,   -0.501886f,  -0.160969f,
-  -0.561536f,   -0.491154f,  -0.213447f,  0.21926f,    -0.542261f,  0.594975f,
-  -1.75303f,    0.284615f,   -0.0128245f, -0.0316972f, -0.300138f,  -0.980628f,
-  -0.332859f,   0.19298f,    -0.248332f,  0.445278f,   -0.470188f,  -0.483686f,
-  0.361407f,    -0.363551f,  0.175335f,   -0.401025f,  0.494573f,   0.366983f,
-  0.302351f,    -0.368503f,  -0.443071f,  -0.562775f,  -0.375816f,  -0.657459f
-};
-
-static const float av1_simple_motion_search_prune_part_layer_0_kernel_64[] = {
-  0.615272f,   -0.151592f,   0.346172f,   -0.0656032f,  0.212875f,
-  0.0798838f,  -0.146093f,   -0.230484f,  -0.620322f,   0.0277852f,
-  -0.400931f,  -0.777044f,   -0.0871401f, -0.248128f,   0.471518f,
-  -0.34174f,   -0.149884f,   -0.0763207f, 0.900372f,    0.233323f,
-  -0.788699f,  0.28221f,     0.327214f,   -0.244877f,   -0.414568f,
-  0.0472988f,  0.168193f,    0.64126f,    0.56686f,     -0.318429f,
-  0.530612f,   -0.750709f,   0.0400333f,  -0.023951f,   -0.0218727f,
-  -0.0449836f, -0.0764245f,  -0.070088f,  -0.0427561f,  -0.0873884f,
-  -0.216423f,  0.622787f,    0.0297492f,  -0.233673f,   0.510639f,
-  0.481654f,   -0.234274f,   0.347734f,   -0.480302f,   0.832741f,
-  0.228223f,   0.247019f,    -0.32416f,   0.352315f,    -1.1491f,
-  0.00806435f, -0.439654f,   0.151723f,   -0.0719021f,  0.463499f,
-  0.00134313f, 0.0553619f,   -0.582163f,  -0.215118f,   -0.291413f,
-  0.889738f,   0.284575f,    0.00450409f, -0.896799f,   0.0303598f,
-  0.187935f,   -0.160993f,   0.089854f,   0.0450689f,   -0.548899f,
-  -0.10556f,   0.29384f,     -0.154158f,  0.423591f,    0.322065f,
-  0.244633f,   -0.320866f,   0.739022f,   -0.500495f,   0.595557f,
-  -0.62001f,   0.259688f,    0.114985f,   -0.13888f,    -0.0737616f,
-  0.801863f,   -0.0606944f,  0.238712f,   -0.0636556f,  0.04317f,
-  0.359843f,   -0.273265f,   0.782092f,   0.341857f,    0.884373f,
-  0.378388f,   0.632049f,    0.633597f,   -0.32103f,    -1.1014f,
-  -0.852525f,  -0.867999f,   0.228625f,   0.444601f,    0.246595f,
-  0.386288f,   -0.341772f,   -0.335849f,  -0.482717f,   0.00928882f,
-  -0.262618f,  0.497003f,    0.579316f,   0.371681f,    -0.440324f,
-  0.115786f,   -0.112295f,   0.07564f,    -0.326419f,   -0.195152f,
-  0.315485f,   -0.368989f,   0.281852f,   0.418865f,    0.807047f,
-  0.293759f,   -0.129749f,   -1.26096f,   -0.0526466f,  -0.618876f,
-  0.330563f,   0.26479f,     0.364751f,   0.68361f,     0.500237f,
-  -0.564011f,  0.158277f,    -0.214105f,  0.50558f,     0.69422f,
-  -0.172224f,  -0.280568f,   0.17241f,    -0.500658f,   -0.00418558f,
-  -0.420356f,  0.0453594f,   0.00471851f, -0.273979f,   0.355633f,
-  0.515393f,   0.0699701f,   -0.413576f,  0.487255f,    -0.388845f,
-  -0.192441f,  -0.353274f,   -0.1773f,    0.256746f,    -0.380197f,
-  0.023061f,   0.431125f,    1.0368f,     -0.0915799f,  -0.268898f,
-  0.0408016f,  0.593356f,    0.308486f,   0.508452f,    -0.0623963f,
-  0.307066f,   0.180916f,    0.326197f,   0.246641f,    0.270665f,
-  -0.145655f,  -0.341277f,   0.0218018f,  -0.326939f,   -0.203528f,
-  -0.25496f,   -0.772783f,   -0.306114f,  -0.79778f,    0.690016f,
-  -0.183109f,  -0.076211f,   -0.474873f,  -0.0219729f,  -0.152253f,
-  -0.0315833f, -0.134908f,   -0.111871f,  0.0409385f,   -0.282586f,
-  -0.101171f,  0.351942f,    0.30023f,    0.369243f,    0.0619639f,
-  -0.170842f,  -0.235501f,   -0.615927f,  0.883574f,    0.150949f,
-  -0.338489f,  -0.213431f,   -0.6075f,    -0.107739f,   -0.251963f,
-  0.143906f,   0.254205f,    -0.260084f,  0.224897f,    0.609902f,
-  0.5606f,     0.795273f,    0.117204f,   0.345592f,    0.243912f,
-  0.0626369f,  -0.166448f,   -0.886364f,  -0.280833f,   -0.0891074f,
-  0.0372486f,  -0.138729f,   0.120189f,   0.345857f,    0.176341f,
-  0.481862f,   -0.137464f,   -0.208001f,  0.621677f,    -0.121462f,
-  0.00445475f, 0.159351f,    0.149918f,   0.198679f,    -0.489814f,
-  -0.30931f,   -0.39161f,    0.268615f,   0.323864f,    0.770061f,
-  0.27962f,    0.536173f,    0.122727f,   0.571712f,    0.48351f,
-  -0.13558f,   -0.426532f,   -0.100426f,  -0.209695f,   0.470483f,
-  -0.424789f,  0.0973791f,   -0.296483f,  -0.302057f,   -0.918591f,
-  0.16328f,    0.0335916f,   0.415762f,   -0.235873f,   -0.00934998f,
-  -0.0967718f, 0.616418f,    0.0931619f,  -0.447975f,   0.156388f,
-  -0.40139f,   0.382807f,    -0.578455f,  1.01437f,     0.37469f,
-  -0.986411f,  -0.827175f,   0.0344976f,  -0.00244486f, -0.142117f,
-  -0.344406f,  -0.0124787f,  -0.226427f,  -0.301835f,   -0.705097f,
-  0.214542f,   -0.0346878f,  -0.255193f,  0.552685f,    -0.104125f,
-  0.77408f,    0.00984395f,  0.0476041f,  -0.244548f,   -0.35082f,
-  -0.487322f,  0.700091f,    -0.138812f,  -0.0110718f,  -0.0400376f,
-  0.254488f,   -0.0867923f,  -0.215463f,  1.03355f,     0.214947f,
-  0.385536f,   0.140597f,    -0.234973f,  -0.0611124f,  1.0974f,
-  0.463592f,   -0.393788f,   -0.428132f,  -0.14664f,    -0.156533f,
-  -0.113426f,  -0.111081f,   -0.0228256f, 0.354909f,    -0.0232978f,
-  0.177394f,   0.0503901f,   -0.220314f,  0.170207f,    0.236719f,
-  0.681525f,   -0.245544f,   -0.119278f,  -0.258491f,   -0.285309f,
-  0.186384f,   -0.119177f,   -0.279398f,  -0.097341f,   -0.324634f,
-  -0.296797f,  -1.3325f,     0.147225f,   0.0158408f,   -0.0365257f,
-  -0.166737f,  -0.159859f,   -0.0765398f, 0.0973026f,   0.294529f,
-  -0.16425f,   0.241506f,    0.561487f,   0.799885f,    -0.565667f,
-  -0.254387f,  -0.360831f,   -0.138432f,  0.406999f,    0.463259f,
-  -0.497314f,  -0.00549591f, -0.0313973f, -0.386042f,   -0.364537f,
-  -0.079987f,  0.148503f,    0.0532473f,  -0.0196838f,  0.232687f,
-  0.212998f,   0.2142f,      0.409001f,   -0.104871f,   -0.217793f,
-  0.0161162f,  -0.371663f,   0.887427f,   0.420187f,    -0.649711f,
-  -0.398999f,  0.448972f,    -0.116108f,  0.0444676f,   -0.501289f,
-  -0.0410878f, 0.00447241f,  -0.402102f,  -0.0926268f,  -0.254362f,
-  -0.395526f,  0.165273f,    0.339347f,   0.91932f,     -0.280113f,
-  0.320112f,   -0.102728f,   -0.131682f,  -0.566621f,   0.386611f,
-  0.146975f,   0.333248f,    -0.179748f,  0.655328f,    0.222658f,
-  0.349512f,   -0.135588f,   -0.22506f,   -0.353001f,   -0.400244f,
-  -0.815125f,  0.72407f,     0.281178f,   -0.109426f,   -0.0977383f,
-  -0.679406f,  -0.401318f,   0.308941f,   -0.594461f,   0.482289f,
-  -0.168467f,  0.76529f,     -0.155056f,  0.0874018f,   0.266124f,
-  -0.0808725f, 0.078792f,    -0.33271f,   -1.0637f,     -0.172125f,
-  0.427025f,   0.332865f,    0.625523f,   0.264166f,    -0.843882f,
-  -0.275777f,  -0.657372f,   0.172814f,   0.0490389f,   -0.561928f,
-  0.0998399f,  0.106047f,    0.39061f,    0.422161f,    0.46369f,
-  -0.364271f,  -0.326968f,   -0.527243f,  -0.618535f,   -0.287804f,
-  -0.211365f,  0.349277f,    0.456535f,   -0.0815191f,  -0.156835f,
-  0.57273f
-};
-
-static const float av1_simple_motion_search_prune_part_logits_bias_64[] = {
-  0.272852f,  -0.260088f, 0.11881f,   0.146764f,  0.00289019f,
-  -0.559007f, -0.203668f, -0.268267f, -0.218921f, -0.260717f
+  0.10424f,    -0.346025f,  0.534547f,   -0.385925f,  2.58341f,    -0.256414f,
+  -0.232498f,  0.329823f,   -0.0777376f, -0.590939f,  0.062657f,   -0.628252f,
+  0.0934588f,  2.04029f,    -0.224448f,  0.371168f,   -0.385348f,  -0.589883f,
+  -3.73627f,   -0.943144f,  0.346409f,   -0.211215f,  -0.351008f,  0.418807f,
+  0.943663f,   0.173267f,   1.16585f,    -0.0840888f, 0.227464f,   0.374412f,
+  0.0422597f,  -0.338868f,  0.222576f,   0.431713f,   1.12366f,    0.00753411f,
+  0.248412f,   -0.0902425f, 0.542455f,   -0.665629f,  -0.311245f,  -0.205639f,
+  -0.447149f,  -0.0502733f, -0.290186f,  -0.794384f,  0.0940881f,  -0.0686117f,
+  -0.0199961f, -0.587965f,  0.777096f,   -0.083381f,  -1.21282f,   0.652959f,
+  -1.18238f,   0.539991f,   0.352497f,   -0.540076f,  -0.26222f,   -0.568556f,
+  0.409102f,   -0.131146f,  -0.407161f,  -0.188287f,  -0.478657f,  0.000401932f,
+  -0.689324f,  0.351064f,   -1.43704f,   -0.315185f,  -0.868726f,  0.376341f,
+  -0.0566277f, 0.364831f,   0.611298f,   -0.495253f,  -0.0193132f, 0.617978f,
+  0.189586f,   -0.236758f,  -0.608246f,  -0.149017f,  -1.78303f,   0.143023f,
+  0.698386f,   -0.994086f,  -0.673327f,  0.233868f,   0.360425f,   0.0294123f,
+  -0.248683f,  -0.148392f,  0.0861829f,  -0.190843f,  -0.414906f,  0.607378f,
+  -0.756715f,  -0.511713f,  -0.321556f,  1.0078f,     -1.18141f,   0.519751f,
+  0.834629f,   -0.359343f,  0.612262f,   -0.0730553f, 0.262935f,   0.488276f,
+  0.387071f,   -1.44123f,   1.08269f,    0.554402f,   -0.069f,     0.14113f,
+  0.323817f,   0.824314f,   -0.431417f,  -0.349448f,  0.950728f,   -0.587836f,
+  -0.83914f,   -0.10844f,   0.26602f,    0.831933f,   -0.271315f,  0.231563f,
+  0.417049f,   0.190627f,   -0.0940667f, 0.255363f,   -0.0741022f, -0.0987662f,
+  -0.847522f,  0.00287554f, 0.0615741f,  -0.0832218f, 0.0847148f,  -0.392843f,
+  -0.938068f,  -0.10621f,   -0.260859f,  -0.825175f,  -0.401039f,  0.315213f,
+  -0.108269f,  0.288036f,   -8.66166f,   -0.970752f,  -0.66678f,   -0.593405f,
+  -0.518294f,  -0.138722f,  -0.454698f,  -0.22969f,   -0.553006f,  -0.440111f,
+  0.462661f,   -0.536854f,  0.0108295f,  -0.522888f,  0.00111157f, 0.229999f,
+  0.0267768f,  0.176266f,   -1.57043f,   0.0318106f,  0.257534f,   -0.198583f,
+  0.175564f,   -0.251465f,  -0.262441f,  -1.65283f,   -0.319603f,  -0.875282f,
+  -0.301303f,  0.0170948f,  -0.227075f,  0.0299545f,  -4.98346f,   0.470046f,
+  -1.28051f,   -0.213809f,  -0.486585f,  -0.906463f,  -0.169984f,  -0.333153f,
+  -0.376733f,  0.108016f,   0.486744f,   -0.186936f,  -0.429259f,  0.056501f,
+  -0.266545f,  0.265447f,   -0.137718f,  -0.490687f,  -0.935668f,  -0.16229f,
+  -0.696932f,  0.173157f,   0.434959f,   -0.140595f,  0.345845f,   -1.08013f,
+  -0.0205929f, -0.815874f,  -0.179812f,  0.02767f,    -0.141727f,  0.471936f,
+  -7.29453f,   -1.04362f,   -0.745482f,  -0.28725f,   -0.214997f,  -0.0850651f,
+  -0.748471f,  0.161325f,   -1.04387f,   -0.705305f,  0.489427f,   -0.765373f,
+  -0.301576f,  0.0742467f,  -0.331282f,  0.0372328f,  -0.90298f,   -0.0608646f,
+  -2.18756f,   0.170384f,   -0.258357f,  0.106287f,   -0.161684f,  -0.103799f,
+  -0.127774f,  -0.156313f,  0.0705286f,  -0.977908f,  -0.281191f,  -0.056757f,
+  -0.309474f,  0.050476f,   -9.78198f,   -2.42795f,   -0.289626f,  -1.07579f,
+  -0.439256f,  -1.09948f,   -0.564671f,  0.0913182f,  -0.417216f,  -1.19909f,
+  0.287063f,   0.402315f,   -0.17646f,   0.540488f,   0.00840239f, 0.397492f,
+  0.702393f,   -0.10566f,   0.655296f,   -0.0443876f, 0.154918f,   -0.760479f,
+  -0.0523153f, -0.366199f,  -1.08212f,   -0.398556f,  -0.415203f,  -1.10488f,
+  0.208349f,   0.27079f,    0.101546f,   -0.205752f,  -13.7923f,   -0.218637f,
+  -1.10077f,   0.355735f,   -0.306196f,  0.627434f,   -0.473101f,  -0.308027f,
+  -1.12724f,   0.301597f,   0.660785f,   0.0576217f,  -0.155925f,  -0.56107f,
+  -0.223537f,  0.114299f,   -0.53803f,   -0.252674f,  -2.66103f,   -0.185245f,
+  -0.314673f,  0.403337f,   0.679821f,   -0.69231f,   0.506264f,   -0.999705f,
+  -0.549097f,  0.353745f,   0.188249f,   0.414484f,   -0.615853f,  0.525681f,
+  -5.23065f,   -3.05174f,   1.02074f,    -0.965499f,  -0.158947f,  0.0436088f,
+  -0.485824f,  0.0375094f,  -1.39985f,   -0.481392f,  0.485785f,   -0.24874f,
+  -0.359633f,  0.668108f
 };
 
 static const float av1_simple_motion_search_prune_part_layer_0_bias_64[] = {
-  -2.12804f,   0.445147f,  -0.0210471f, 0.533662f,   0.662023f,  0.020519f,
-  -0.0452071f, -0.343995f, 0.112379f,   -0.16776f,   0.112004f,  0.932147f,
-  -1.22944f,   -0.822248f, 0.370083f,   -0.0951491f, 0.0631258f, -0.875801f,
-  0.996276f,   0.116103f,  0.925914f,   0.054293f,   -1.02697f,  -0.359516f
+  0.0735592f, -0.045064f, -0.0114103f, 1.39246f,    -0.683467f,  0.155765f,
+  -0.667652f, -0.202425f, -0.585433f,  -0.146752f,  -0.0812931f, 0.580642f,
+  0.578542f,  -0.831916f, 0.610063f,   0.0101856f,  -0.235863f,  0.538141f,
+  -2.91334f,  -1.71887f,  0.126616f,   0.582497f,   -0.438879f,  0.221833f,
+  0.850773f,  -0.280886f, 0.443233f,   -0.0964873f, -0.216161f,  0.34413f,
+  0.656818f,  0.0169274f
+};
+
+static const float av1_simple_motion_search_prune_part_layer_0_kernel_64[] = {
+  -0.310947f,   -0.232675f,    0.0171092f,    0.0834474f,   0.373977f,
+  0.300429f,    0.215072f,     -0.454074f,    0.187565f,    0.282742f,
+  0.562562f,    -0.0419322f,   0.000978486f,  -0.298267f,   0.216934f,
+  -0.388722f,   -0.146866f,    -0.275946f,    0.202361f,    0.225847f,
+  1.42868f,     0.473127f,     -0.145747f,    -0.104986f,   0.153459f,
+  0.69382f,     0.162266f,     0.0207715f,    -0.45095f,    -0.412071f,
+  -0.235109f,   -0.130199f,    0.231741f,     0.460193f,    0.0378202f,
+  0.429516f,    0.387691f,     -0.272479f,    0.0723884f,   -0.453914f,
+  -0.150618f,   -0.10745f,     -0.258615f,    0.0838312f,   -0.00554958f,
+  0.105377f,    -0.0415479f,   0.13228f,      1.09044f,     -0.73053f,
+  -0.422553f,   -0.435842f,    0.211416f,     0.420332f,    0.0181353f,
+  -0.030891f,   0.522788f,     0.613526f,     0.374032f,    0.287986f,
+  -0.403118f,   -0.287362f,    -1.11523f,     -0.577713f,   -0.020228f,
+  0.86465f,     -0.0590579f,   0.341274f,     -0.0115644f,  -0.260236f,
+  0.192123f,    -0.0849825f,   0.0501709f,    0.444382f,    0.0762727f,
+  0.0926596f,   -0.101157f,    -0.142787f,    0.40861f,     0.555805f,
+  -0.00614654f, -0.122846f,    0.203163f,     0.234266f,    0.409795f,
+  -0.0206245f,  -0.224679f,    0.025081f,     0.518044f,    -0.287186f,
+  0.016494f,    -0.0886331f,   0.236438f,     -1.01032f,    0.118332f,
+  0.364217f,    0.061438f,     0.0381303f,    0.128418f,    0.0257077f,
+  -0.975751f,   -0.694894f,    0.00351914f,   0.278179f,    0.29363f,
+  0.525576f,    0.0604849f,    0.531734f,     0.406643f,    0.812497f,
+  -0.403196f,   -0.16664f,     -0.620887f,    -0.428194f,   0.275401f,
+  0.432063f,    -0.00378342f,  0.295758f,     0.105615f,    -0.00683626f,
+  0.00396146f,  0.00598654f,   -0.0131701f,   -0.0115787f,  0.00386643f,
+  -0.69686f,    -0.139623f,    -0.440817f,    0.0542873f,   0.217962f,
+  0.527035f,    -0.0201046f,   0.0471354f,    0.0271858f,   -0.0775197f,
+  -0.309797f,   0.184879f,     -0.232854f,    -0.407081f,   0.706227f,
+  -0.0877534f,  0.306843f,     0.455075f,     -0.333961f,   0.0759148f,
+  0.0444791f,   -0.0693626f,   -0.0850289f,   -0.513063f,   -0.643971f,
+  -0.630279f,   -0.153889f,    0.123315f,     0.00548238f,  0.170707f,
+  0.734339f,    -0.176988f,    0.322519f,     0.178365f,    0.183519f,
+  -0.698683f,   -0.12043f,     -0.349914f,    -0.0696762f,  -0.53986f,
+  -0.104738f,   1.05264f,      0.983568f,     -0.109035f,   0.0113748f,
+  0.0815189f,   -0.0628812f,   0.0769389f,    0.010261f,    0.146573f,
+  -0.433194f,   -0.211572f,    -0.000397392f, 0.445325f,    0.145091f,
+  -0.0625902f,  0.29394f,      0.302315f,     0.0892226f,   -0.209504f,
+  -0.0150374f,  0.242608f,     0.216223f,     0.366857f,    0.209829f,
+  -0.540035f,   0.117599f,     -0.329315f,    0.0471133f,   -0.0115449f,
+  -0.0638235f,  0.0527461f,    0.348149f,     0.360802f,    1.06624f,
+  -0.615991f,   -0.341396f,    0.18972f,      0.0709888f,   -0.0414466f,
+  -0.0193809f,  0.0938933f,    0.209058f,     0.575042f,    0.483608f,
+  -0.285875f,   -0.115905f,    -0.363637f,    0.375425f,    0.336217f,
+  0.0336358f,   -0.00265618f,  -0.406854f,    -0.792959f,   -0.219354f,
+  0.0331615f,   0.0298859f,    -0.211446f,    -0.00280773f, -0.194011f,
+  0.262109f,    0.548076f,     0.120183f,     -0.661603f,   0.241855f,
+  -0.501428f,   0.00102718f,   -0.347331f,    -0.58306f,    0.0977254f,
+  0.117491f,    0.0840667f,    0.00693675f,   0.000600294f, 0.649569f,
+  -0.0553811f,  -0.197198f,    0.397236f,     -0.523737f,   -0.564192f,
+  -0.374679f,   -0.249344f,    0.00861428f,   0.00393439f,  -0.0834608f,
+  0.124389f,    -0.0393049f,   0.0425391f,    -0.153383f,   -0.182346f,
+  0.420953f,    0.464221f,     0.288984f,     0.570921f,    -0.239965f,
+  0.247239f,    -0.083434f,    0.714418f,     0.986323f,    -0.460244f,
+  -0.260993f,   -0.947743f,    -1.0789f,      -0.0391231f,  0.612407f,
+  -0.0306767f,  0.281419f,     0.0072426f,    -0.37623f,    0.188744f,
+  0.221666f,    -0.424914f,    0.29703f,      0.261715f,    0.277809f,
+  -0.0617616f,  -0.000611999f, -0.0547053f,   -0.0901018f,  -0.347669f,
+  0.856072f,    0.596675f,     -0.467639f,    -1.09324f,    -0.184224f,
+  -0.56051f,    -0.0144704f,   0.102894f,     -0.122982f,   -0.0020749f,
+  -0.0423487f,  0.0328702f,    -0.0154263f,   0.0349021f,   -0.00315595f,
+  0.0254802f,   -0.729191f,    0.207296f,     -0.0212349f,  -0.207078f,
+  0.20636f,     -0.156883f,    0.429765f,     -0.42672f,    0.138775f,
+  -0.0267343f,  0.631528f,     0.300646f,     -0.4793f,     -0.273833f,
+  -0.0135367f,  -0.530819f,    -0.534881f,    0.830896f,    0.0266992f,
+  0.473744f,    0.210334f,     0.0234739f,    0.255394f,    0.123531f,
+  -0.489341f,   -0.796627f,    0.372617f,     0.190136f,    0.275342f,
+  0.739505f,    0.402354f,     0.782806f,     0.437374f,    1.04948f,
+  -0.55963f,    0.382704f,     -0.698321f,    0.0817868f,   -0.440108f,
+  -0.0635004f,  -0.277851f,    -0.524194f,    0.286157f,    -0.01097f,
+  -0.0293145f,  -0.0405071f,   -0.035662f,    -0.012871f,   -0.0516409f,
+  -0.406671f,   0.709259f,     -0.525177f,    0.521123f,    -0.44813f,
+  0.48412f,     -0.0546513f,   0.305253f,     -0.468328f,   0.316453f,
+  -0.36307f,    0.497515f,     -0.0606276f,   0.315764f,    -0.422066f,
+  0.554025f,    -0.679183f,    0.616914f,     0.00283324f,  -0.000643824f,
+  0.0639999f,   0.0488285f,    -0.141031f,    0.068003f,    -0.0792678f,
+  -0.425307f,   -0.152235f,    0.269917f,     -0.352327f,   0.44792f,
+  -0.116514f,   -0.465868f,    0.154287f,     0.0161028f,   -0.16848f,
+  -0.255487f,   0.189832f,     0.254883f,     0.0240822f,   0.432638f,
+  -0.136564f,   0.137036f,     0.0375734f,    0.989246f,    -0.126287f,
+  0.111416f,    -0.0271002f,   0.718755f,     -0.0412969f,  0.00645681f,
+  0.253811f,    -0.0186998f,   0.691971f,     -0.282042f,   -0.0783915f,
+  0.274592f,    -0.358449f,    0.34155f,      -0.186374f,   -0.136907f,
+  -0.192334f,   -0.251168f,    -0.100874f,    -0.166578f,   -0.336507f,
+  0.402373f,    0.173695f,     0.108788f,     0.00885581f,  -0.310063f,
+  1.05545f,     0.0295867f,    0.180785f,     -0.173469f,   -0.469924f,
+  -0.224155f,   0.665862f,     -0.126546f,    0.240691f,    -0.0415301f,
+  -0.598534f,   0.0012723f,    -0.122297f,    -0.558947f,   0.268844f,
+  0.241193f,    0.0524422f,    -0.1683f,      0.575588f,    -0.139012f,
+  0.0636691f,   -0.446709f,    -0.094532f,    0.883809f,    -0.112981f,
+  -0.224047f,   0.0811193f,    -0.140571f,    -0.09683f,    -0.0796143f,
+  -0.102246f,   -0.863392f,    -0.0755124f,   0.23125f,     -0.0301361f,
+  -0.153029f,   -0.172238f,    -0.0286382f,   -0.338495f,   -0.317216f,
+  -0.146629f,   -0.242264f,    -0.702306f,    -0.285052f,   0.0623479f,
+  0.265735f,    0.00674475f,   0.666196f,     0.883586f,    0.278416f,
+  -0.341692f,   -0.509931f,    -0.156263f,    0.635885f,    -0.544143f,
+  -0.572632f,   -0.213285f,    0.443396f,     -0.268329f,   0.0638439f,
+  -0.185397f,   0.071126f,     0.386503f,     -0.402212f,   -0.140784f,
+  -0.411661f,   0.049398f,     -0.0672907f,   -0.267034f,   -0.0560875f,
+  0.0607937f,   0.0445484f,    -0.547651f,    0.574718f,    0.417189f,
+  -0.0610166f,  0.0632293f,    0.391619f,     -0.00671215f, -0.136883f,
+  -0.339346f,   0.0356183f,    0.511993f,     0.178676f,    0.286998f,
+  0.136511f,    -0.00796929f,  0.203985f,     0.0423532f,   -0.175196f,
+  0.378534f,    0.770417f,     0.593778f,     0.0256067f,   -0.82394f,
+  -0.500691f,   -0.425725f,    -0.623708f,    -0.0406241f,  -0.00226464f,
+  0.0207836f,   0.30732f,      -0.00784268f,  0.0065445f,   -0.0991039f,
+  -0.20871f,    -0.206835f,    0.281219f,     0.119361f,    0.259346f,
+  -0.102713f,   0.186488f,     -0.034455f,    -0.00198392f, -0.279107f,
+  -0.638993f,   -0.374404f,    -0.48601f,     -0.262345f,   0.624532f,
+  0.620632f,    -0.227014f,    0.433579f,     -0.0455096f,  1.22123f,
+  -0.429156f,   0.12396f,      0.0815152f,    -0.0837355f,  0.0282623f,
+  -0.407475f,   0.787321f,     -0.434974f,    0.312904f,    -0.230805f,
+  0.213042f,    -0.250929f,    0.302997f,     -0.354709f,   0.0504905f,
+  -0.561706f,   0.595558f,     0.374951f,     0.802969f,    -0.674902f,
+  0.33136f,     0.156606f,     0.0218968f,    -0.694188f,   -0.0221949f,
+  -0.00639123f, 0.0146536f,    0.0104145f,    0.021635f,    -0.0499428f,
+  -0.575116f,   -0.239035f,    -0.0588276f,   0.599722f,    0.541932f,
+  0.437433f,    0.716268f,     0.193207f,     0.548351f,    0.326951f,
+  -0.197124f,   0.0355353f,    -0.0952009f,   -0.217265f,   -0.389789f,
+  0.0528124f,   -0.21334f,     -0.190296f,    -1.17367f,    0.108905f,
+  0.109397f,    -0.0192577f,   0.0343813f,    0.085004f,    -0.0556737f,
+  -0.0411158f,  -0.534989f,    0.0361896f,    0.124415f,    0.291603f,
+  -0.0311974f,  -0.326726f,    0.343131f,     0.0276456f,   -0.231827f,
+  -0.373894f,   -0.208898f,    -0.273011f,    0.061323f,    -0.0910538f,
+  -0.30746f,    -0.108644f,    -0.190736f,    1.58048f,     -0.0739711f,
+  -0.0623489f,  -0.137967f,    -0.0601359f,   -0.133004f,   -0.0857153f,
+  0.00955987f,  -0.365561f,    -0.0329051f,   0.463463f,    0.14758f,
+  -0.512256f,   -0.227463f,    -0.26008f,     -0.567777f,   0.0646234f,
+  1.02161f,     0.66157f,      -0.16733f,     0.264921f,    -0.242036f,
+  0.214622f,    0.0712054f,    -0.260377f,    0.0849665f,   0.735094f,
+  0.11001f,     0.297301f,     -0.333342f,    0.066978f,    -0.123625f,
+  1.07596f,     0.401263f,     0.0800875f,    -0.340862f,   -0.115587f,
+  -0.32692f,    -0.300842f,    0.0277397f,    0.0630788f,   -0.261198f,
+  0.428695f,    -0.0544757f,   -0.124511f,    0.036992f,    0.126322f,
+  0.0317603f,   0.0820762f,    0.117277f,     -1.14594f,    -0.108076f,
+  -0.0258198f,  -0.00337525f,  -0.00512531f,  0.1274f,      -0.0660535f,
+  -0.640733f,   0.197142f,     0.147278f,     0.489271f,    0.226507f,
+  -0.0668414f,  0.0946318f,    0.0994164f,    -0.820516f,   0.512939f,
+  -0.305172f,   -0.715187f,    -0.195125f,    0.279346f,    0.462144f,
+  0.913882f,    -0.453879f,    0.0582033f,    -0.462866f,   0.0538736f,
+  0.0115737f,   0.00626993f,   -0.0185185f,   0.0114601f,   -0.0181164f,
+  0.41588f,     -0.0447331f,   0.611756f,     0.43385f,     0.834465f,
+  0.122019f,    -0.352983f,    0.340429f,     -0.245425f,   -0.365328f,
+  -0.521825f,   0.0371057f,    0.172188f,     -0.387949f,   0.221054f,
+  0.0126359f,   0.422958f,     0.584198f,     -0.581498f,   -0.019466f,
+  -0.0271737f,  -0.0740885f,   0.00540879f,   0.186086f,    -0.0324402f,
+  -0.563462f,   -0.458759f,    -0.425296f,    -0.0118862f,  -0.641508f,
+  0.0132084f,   0.0581128f,    0.0231444f,    0.468587f,    0.258838f,
+  0.0296665f,   0.0562801f,    0.630014f,     0.381816f,    -0.269761f,
+  -0.135515f,   0.046186f,     1.07632f,      -0.050616f,   0.104987f,
+  0.29991f,     0.119316f,     0.117248f,     0.0795009f,   0.242573f,
+  0.0416634f,   -0.0577639f,   -0.0974078f,   0.106255f,    -0.13098f,
+  0.0141486f,   -0.00418257f,  0.144848f,     -0.463934f,   0.0452591f,
+  0.252617f,    0.205222f,     -0.189843f,    0.0652245f,   -0.135386f,
+  0.0500646f,   -0.200368f,    -0.0142312f,   -0.0286832f,  -0.254355f,
+  -1.02752f,    -0.73549f,     0.0364518f,    0.0416227f,   -0.13185f,
+  -0.0886515f,  -0.502314f,    -0.102916f,    0.410911f,    -0.355655f,
+  0.400416f,    -0.340217f,    0.208829f,     0.245972f,    0.149739f,
+  -0.49458f,    0.589482f,     0.550827f,     0.912709f,    -0.351275f,
+  -0.128076f,   -0.285172f,    -0.672752f,    0.090583f,    -0.245286f,
+  -0.737297f,   -0.201515f,    -0.025122f,    -0.109854f,   0.36738f
+};
+
+static const float av1_simple_motion_search_prune_part_logits_bias_64[] = {
+  0.346819f,  0.442965f,  -0.0216032f,  0.0229235f, -0.402797f,
+  -0.666074f, -0.455388f, -0.00353411f, -0.595511f, -0.845667f
 };
 
 static const NN_CONFIG av1_simple_motion_search_prune_part_nn_config_64 = {
@@ -3332,160 +3371,224 @@
 #undef NUM_LAYER_0_UNITS_64
 #undef NUM_LOGITS_64
 
-// BLOCK_32X32
 #define NUM_HIDDEN_LAYERS_32 1
-#define NUM_FEATURES_32 19
-#define NUM_LAYER_0_UNITS_32 24
+#define NUM_FEATURES_32 25
+#define NUM_LAYER_0_UNITS_32 28
 #define NUM_LOGITS_32 10
 
 static const float av1_simple_motion_search_prune_part_logits_kernel_32[] = {
-  -1.22965f,   0.49978f,    -0.376271f,  0.0615445f,  -0.212491f,  0.58427f,
-  0.142683f,   2.62142f,    -0.459751f,  -0.570143f,  0.72257f,    -0.64127f,
-  0.266919f,   0.3235f,     0.64405f,    -0.0398269f, -1.82822f,   -0.366573f,
-  0.753387f,   -0.274241f,  -0.484971f,  -0.503907f,  -0.911176f,  -0.455827f,
-  -0.706345f,  0.0687611f,  -0.362788f,  -0.369416f,  -0.530408f,  0.0812615f,
-  -0.863012f,  -0.613333f,  -0.268833f,  0.0982181f,  0.19374f,    -0.147078f,
-  -0.0200551f, 0.363817f,   0.179229f,   0.429671f,   0.905826f,   -0.441191f,
-  0.48874f,    0.539192f,   -0.418992f,  -0.468762f,  -0.482158f,  -0.770778f,
-  -0.743739f,  0.0175955f,  -0.40662f,   0.0276107f,  0.0110658f,  -0.119298f,
-  0.698777f,   -0.187602f,  -0.300483f,  -0.147972f,  0.324042f,   -0.0265165f,
-  -0.375496f,  0.245762f,   -0.111271f,  -0.829879f,  -0.434606f,  -0.367099f,
-  0.113229f,   -0.755101f,  -0.0623393f, -0.13764f,   -0.205864f,  -0.332027f,
-  0.966638f,   0.477078f,   0.262501f,   -0.110232f,  0.141242f,   -0.699602f,
-  -0.14943f,   -2.36868f,   0.556236f,   0.345883f,   -0.466765f,  0.279446f,
-  -0.56809f,   -0.356351f,  -0.503855f,  -0.607959f,  -0.0328514f, 0.313352f,
-  -0.644447f,  0.221808f,   0.254575f,   0.476802f,   1.40433f,    0.317169f,
-  0.109761f,   -0.0105197f, -0.22896f,   -0.389234f,  0.423948f,   -0.272114f,
-  -1.02704f,   -1.50706f,   0.0563541f,  -0.0371609f, -0.306187f,  0.0570354f,
-  -0.367998f,  0.0949103f,  -0.254703f,  -0.0853516f, 1.56471f,    -0.594372f,
-  -0.23582f,   0.267108f,   0.015297f,   -0.318317f,  0.287599f,   -0.687022f,
-  0.360804f,   -0.177637f,  -0.118144f,  -0.418225f,  -0.985658f,  -0.391334f,
-  -0.772539f,  -0.44002f,   0.0722112f,  -0.0825626f, 0.0466844f,  0.0525818f,
-  -0.788047f,  0.120401f,   -0.785688f,  -0.346177f,  0.240363f,   0.0248826f,
-  -0.0815654f, 0.39317f,    -0.122372f,  0.199969f,   0.202777f,   -0.1979f,
-  0.313558f,   -0.180202f,  0.191204f,   -0.313598f,  0.155464f,   -0.600106f,
-  0.0230461f,  -0.718126f,  0.266874f,   -0.313614f,  0.0352148f,  0.131058f,
-  -0.221112f,  0.115419f,   -1.41928f,   -0.909453f,  0.341747f,   -0.25318f,
-  -0.312476f,  -0.288919f,  -0.0135884f, -0.278496f,  0.381449f,   -0.0725586f,
-  0.254479f,   -0.0658647f, -0.694657f,  -0.0653643f, -0.0233378f, -0.484902f,
-  -0.104919f,  -1.52446f,   0.0140919f,  -0.142396f,  -0.11836f,   0.113235f,
-  -1.21564f,   0.0618471f,  0.0421833f,  -0.883143f,  0.288008f,   -0.278322f,
-  -0.185151f,  -0.616223f,  0.334549f,   0.370898f,   0.24646f,    -0.027439f,
-  0.366905f,   -0.40628f,   0.0260464f,  -0.506151f,  0.0191214f,  -0.104617f,
-  -0.848722f,  -1.66357f,   -0.194607f,  0.0346545f,  -0.412502f,  0.200471f,
-  -0.285588f,  0.0309609f,  -0.150546f,  0.569096f,   0.210382f,   0.14322f,
-  0.908182f,   1.23553f,    -0.432935f,  -0.0963189f, -0.610778f,  -0.532583f,
-  -0.302028f,  -0.600906f,  -0.0777476f, 0.0230625f,  0.375802f,   -0.466292f,
-  1.01104f,    -1.16706f,   0.0121855f,  0.0100479f,  -0.147181f,  0.255058f,
-  -0.285898f,  -0.167804f,  -0.240171f,  -1.15287f,   -1.51181f,   0.0859809f,
-  0.0811324f,  -0.829305f,  0.272793f,   0.407484f,   0.324943f,   0.230197f
-};
-
-static const float av1_simple_motion_search_prune_part_layer_0_kernel_32[] = {
-  -0.0711848f, 0.187893f,     -0.0532872f,  -0.0403218f, 0.132223f,
-  0.0150309f,  0.132917f,     -0.00883543f, -0.0614934f, 0.207838f,
-  -0.102772f,  0.127833f,     -0.332145f,   0.00237219f, -0.338402f,
-  0.123288f,   -0.248341f,    -0.0182967f,  -1.16283f,   -0.166611f,
-  -0.220962f,  -0.268939f,    -0.207455f,   -0.214904f,  -0.0639896f,
-  -0.0729676f, -0.000552725f, 0.217902f,    0.350537f,   -0.0217492f,
-  0.136239f,   0.0641448f,    0.515814f,    0.525507f,   0.240539f,
-  0.109375f,   0.322722f,     -1.20791f,    0.323287f,   0.0231209f,
-  -0.194629f,  0.143504f,     0.193943f,    -0.15059f,   -0.0156431f,
-  -0.210354f,  0.13426f,      -0.379795f,   0.0585494f,  0.0947257f,
-  0.948153f,   0.492681f,     -0.977907f,   -0.30367f,   0.216922f,
-  -0.366185f,  0.00734769f,   0.528627f,    0.334327f,   0.0222445f,
-  0.400606f,   -0.0313966f,   -0.047664f,   -0.512993f,  -0.433836f,
-  0.340769f,   -0.131347f,    -0.518235f,   -0.220933f,  -0.379338f,
-  -0.116978f,  0.143766f,     0.456281f,    -0.0921022f, -0.0109533f,
-  -0.107467f,  0.335672f,     -0.313228f,   0.175586f,   0.108769f,
-  0.129646f,   -0.053502f,    0.272574f,    0.220172f,   1.51046f,
-  0.255032f,   -0.162058f,    -0.770721f,   0.238623f,   -0.65159f,
-  -0.0354393f, -0.577323f,    0.0954972f,   -0.661719f,  0.227893f,
-  -0.0584787f, 0.234849f,     -0.16515f,    -0.247194f,  0.12563f,
-  0.39043f,    -0.178219f,    -0.0629665f,  0.395761f,   0.24224f,
-  -0.336032f,  0.552893f,     -0.300073f,   -0.235499f,  -0.33557f,
-  0.0398952f,  -0.853526f,    -0.550247f,   1.13965f,    0.197325f,
-  -0.0750203f, 0.145096f,     0.128642f,    0.113606f,   0.0972738f,
-  0.219874f,   0.252284f,     0.833398f,    0.398332f,   0.802753f,
-  0.650573f,   -0.725374f,    -0.548798f,   -0.668723f,  -0.705524f,
-  -0.929613f,  -0.138145f,    0.161306f,    0.578878f,   0.0605056f,
-  0.720406f,   0.163571f,     0.707962f,    -0.0777347f, 0.52085f,
-  0.279096f,   0.180012f,     -0.459535f,   0.219678f,   -0.273058f,
-  -0.030387f,  -0.262664f,    0.367791f,    -0.899145f,  -1.07191f,
-  -1.15497f,   0.460442f,     0.020009f,    -0.329794f,  0.846777f,
-  0.287855f,   0.603544f,     0.645424f,    0.00753003f, -0.0666031f,
-  -0.141114f,  -0.149588f,    -0.431897f,   -0.591811f,  0.134026f,
-  0.0933469f,  -0.130808f,    -0.0335611f,  -0.488446f,  -0.275566f,
-  -0.937488f,  0.245793f,     -0.548915f,   0.0108641f,  -0.216292f,
-  0.00680863f, -0.113137f,    -0.137064f,   0.083321f,   0.689742f,
-  -0.213193f,  0.172408f,     -0.123794f,   0.383401f,   -0.496176f,
-  0.427836f,   -0.644447f,    0.967995f,    0.181371f,   0.301512f,
-  -0.376098f,  -0.0571203f,   0.0012891f,   0.467542f,   -0.400791f,
-  -0.204521f,  0.253847f,     0.107368f,    -0.434741f,  -0.389665f,
-  0.30953f,    0.053949f,     -0.0415711f,  0.0432576f,  -0.319656f,
-  -0.228939f,  -0.0928546f,   0.164408f,    1.26655f,    0.991928f,
-  -0.0596439f, 0.0786943f,    0.001457f,    0.282831f,   0.0975484f,
-  0.13724f,    0.0891527f,    -0.0471925f,  0.255467f,   -0.469073f,
-  -0.0759757f, 0.331197f,     0.139434f,    -0.0118866f, 0.359463f,
-  -0.774947f,  -0.474647f,    -1.36563f,    0.24901f,    0.776025f,
-  0.150621f,   0.192407f,     0.752499f,    0.0435322f,  -0.0334263f,
-  0.470741f,   -0.781907f,    -0.149471f,   -0.649484f,  -0.866079f,
-  0.536967f,   0.541611f,     -0.00237101f, -0.119688f,  -0.594591f,
-  -0.967503f,  0.545025f,     -0.335037f,   -0.172105f,  -0.532514f,
-  -0.442211f,  -0.0864824f,   0.038418f,    -0.337492f,  -0.412653f,
-  0.0778177f,  0.0824839f,    -0.232478f,   0.553077f,   0.179073f,
-  0.222848f,   -0.261019f,    0.854277f,    -0.643185f,  0.476021f,
-  -0.0174448f, 0.621669f,     -0.527978f,   0.45279f,    -0.286967f,
-  0.328291f,   0.0627781f,    0.495794f,    0.0156424f,  -0.170515f,
-  -0.435815f,  -0.264061f,    -0.964473f,   0.259361f,   -0.297514f,
-  0.667044f,   0.719631f,     -0.812974f,   -0.350331f,  0.594795f,
-  -0.106071f,  -0.409225f,    0.283481f,    0.5735f,     -0.231666f,
-  -0.270059f,  0.687725f,     0.349693f,    0.0637911f,  0.208738f,
-  0.299087f,   -0.249188f,    -0.426365f,   -1.01906f,   0.0919539f,
-  -0.198362f,  0.256663f,     -0.302723f,   0.457283f,   0.433322f,
-  0.242223f,   0.740515f,     0.247248f,    0.436274f,   0.588906f,
-  0.852493f,   0.385838f,     0.243232f,    -0.501191f,  0.212121f,
-  0.297253f,   -0.664029f,    -0.470196f,   0.0175681f,  -1.01849f,
-  -0.619865f,  -1.26982f,     -0.088134f,   -0.29233f,   -0.196112f,
-  -0.141886f,  0.0602684f,    0.469327f,    0.0227135f,  0.275863f,
-  0.161156f,   -0.864189f,    -0.72576f,    0.62214f,    0.804845f,
-  0.183776f,   -0.155777f,    -0.0826676f,  -0.23302f,   0.0845181f,
-  -0.126365f,  0.0925764f,    0.889037f,    -0.208894f,  0.441273f,
-  0.476529f,   0.510144f,     0.321464f,    0.764386f,   0.198938f,
-  -0.669809f,  -0.13214f,     -0.426596f,   -0.547804f,  -0.0953238f,
-  0.164997f,   0.275626f,     -0.0469242f,  -0.923263f,  -1.05855f,
-  -0.487197f,  0.261922f,     -0.108634f,   0.409852f,   0.142348f,
-  0.153656f,   -0.119714f,    0.490507f,    -0.26725f,   -0.0651784f,
-  -0.962803f,  -0.596098f,    -0.686329f,   0.66723f,    0.290971f,
-  0.692586f,   0.56926f,      -0.0494205f,  -0.498585f,  -0.1832f,
-  -0.571507f,  -0.438308f,    0.607958f,    0.985154f,   0.131991f,
-  0.0469712f,  0.415769f,     -0.518799f,   -0.353338f,  -0.219197f,
-  -0.159141f,  0.085484f,     -0.405673f,   -0.222816f,  0.813276f,
-  0.323344f,   -0.235178f,    -0.40799f,    -0.083177f,  0.514834f,
-  0.177916f,   0.0197744f,    -0.523574f,   -0.445548f,  -0.21085f,
-  0.760991f,   0.170654f,     -0.00312635f, -0.175464f,  0.665364f,
-  -0.713881f,  -0.701069f,    -0.628863f,   1.03196f,    -0.0414137f,
-  -0.0163186f, 0.16796f,      -0.0263498f,  0.484873f,   0.153922f,
-  0.0593931f,  0.171615f,     0.330269f,    -0.0728948f, 0.42332f,
-  0.294273f,   -0.0185935f,   -0.609248f,   -0.305841f,  -0.293534f,
-  0.0766015f,  0.130506f,     0.16716f,     0.0168997f,  -0.429074f,
-  -0.744995f,  -0.972633f,    0.50621f,     -0.275645f,  0.402252f,
-  -0.0190824f, 0.637343f,     -0.410791f,   0.546844f,   -0.555088f,
-  0.491182f,   -0.0369695f,   0.974657f,    -0.142378f,  -0.148588f,
-  -0.217919f,  0.0146815f,    -0.419912f,   0.111356f,   -0.640505f,
-  -0.352691f
-};
-
-static const float av1_simple_motion_search_prune_part_logits_bias_32[] = {
-  0.0868818f, 0.370904f,  0.126136f,  0.57768f,   -0.316245f,
-  -0.526958f, -0.451775f, -0.595569f, -0.805166f, -0.592605f
+  0.486581f,    0.340847f,   -0.109226f,   0.467224f,   -0.541561f,
+  0.0943619f,   -0.429442f,  -0.207442f,   0.959963f,   0.618666f,
+  -0.0636751f,  0.144508f,   -0.0278289f,  0.332293f,   -0.751493f,
+  0.245438f,    -0.917758f,  0.612128f,    -0.32648f,   0.534618f,
+  -0.615239f,   2.71641f,    0.233759f,    0.820558f,   -0.249758f,
+  -0.427783f,   -0.359361f,  0.0375732f,   0.806973f,   0.352512f,
+  -0.0532192f,  0.0576861f,  -0.464178f,   -0.334877f,  -0.697042f,
+  0.0538218f,   0.0919659f,  -0.00765812f, 0.0603847f,  -0.460315f,
+  0.37979f,     -0.0867612f, -0.670683f,   -0.188619f,  -0.570586f,
+  0.233418f,    0.153581f,   0.290905f,    -0.624885f,  -0.557842f,
+  -0.555567f,   0.463773f,   -0.123909f,   -0.277731f,  0.0374468f,
+  0.409903f,    0.287638f,   -0.593066f,   -0.223434f,  0.154263f,
+  -0.250464f,   -0.077696f,  0.229652f,    -0.304174f,  0.308053f,
+  0.33155f,     -0.502825f,  0.361216f,    -0.499294f,  0.00595444f,
+  -0.307201f,   0.5766f,     -0.438384f,   -0.093701f,  -0.118586f,
+  0.202337f,    -0.486623f,  0.261552f,    0.139756f,   -0.655642f,
+  -0.0627001f,  -0.213053f,  -0.243037f,   0.205918f,   0.0718368f,
+  0.188041f,    0.141529f,   -0.132239f,   0.425827f,   -0.218353f,
+  0.153114f,    0.33268f,    0.0226116f,   0.167394f,   0.269854f,
+  -0.457001f,   0.1973f,     -0.526087f,   0.467528f,   0.290934f,
+  1.16267f,     0.0823663f,  -0.754389f,   -0.83716f,   0.270157f,
+  -1.41229f,    0.148511f,   -0.286832f,   0.664796f,   0.492254f,
+  0.360567f,    -0.533993f,  0.0435672f,   -0.103001f,  0.220668f,
+  0.594621f,    -0.0213356f, -0.347638f,   -0.694457f,  0.0759505f,
+  0.161358f,    -0.389384f,  -0.0455192f,  -0.61252f,   -0.174173f,
+  -0.00788878f, -1.22487f,   0.332233f,    -0.0457021f, -0.225918f,
+  -0.197657f,   -0.115408f,  -0.240589f,   -2.05681f,   0.00914629f,
+  -1.92213f,    0.0268578f,  -0.49076f,    -0.0120123f, 0.291157f,
+  0.267116f,    -0.0775724f, 0.181115f,    -0.392441f,  -0.488114f,
+  -0.28842f,    -0.115465f,  0.128974f,    -0.0829899f, -0.14096f,
+  -0.140145f,   -0.700281f,  0.0368945f,   -0.437598f,  0.243485f,
+  -1.00301f,    0.332324f,   0.125014f,    -0.0604481f, -0.0652028f,
+  -0.207295f,   -1.0209f,    -0.341525f,   0.191326f,   -0.147578f,
+  0.0878327f,   0.129827f,   -0.0848319f,  0.187381f,   -1.28663f,
+  0.00537885f,  -0.134277f,  -0.0411126f,  -0.3434f,    -0.0456494f,
+  0.37861f,     0.409095f,   0.237177f,    -0.396855f,  -0.205418f,
+  -1.31701f,    -0.319032f,  -0.123404f,   -0.240005f,  -0.305206f,
+  -0.0258176f,  -0.26367f,   -0.142396f,   0.191672f,   -1.44061f,
+  0.0554776f,   -0.571839f,  -0.284789f,   -0.425677f,  -0.0307376f,
+  0.20275f,     -0.223146f,  0.144612f,    0.0212636f,  0.0238303f,
+  -0.253802f,   -0.188922f,  -0.0637066f,  -0.340836f,  0.124774f,
+  0.130474f,    -0.154099f,  -0.0292733f,  0.158148f,   -0.246989f,
+  -0.259059f,   0.220224f,   0.228449f,    -0.41956f,   -0.321848f,
+  -0.2396f,     -0.316449f,  -1.3363f,     0.0264099f,  -1.46865f,
+  0.113073f,    0.0722885f,  -0.166986f,   -0.164877f,  0.0360911f,
+  0.534472f,    -0.551152f,  -0.328501f,   0.0781121f,  -0.378112f,
+  -0.459502f,   0.28015f,    -0.212302f,   -0.521641f,  0.618993f,
+  -0.347709f,   0.266253f,   -0.0280894f,  0.348511f,   -0.0155031f,
+  -0.100693f,   0.0447673f,  0.277519f,    -0.233998f,  -0.0796738f,
+  -1.73644f,    -0.160776f,  0.53092f,     -0.180406f,  0.056447f,
+  0.385356f,    -0.262337f,  -0.241479f,   -0.271426f,  -0.457354f,
+  -0.266788f,   0.367371f,   -0.103065f,   0.47783f,    -0.188327f,
+  -0.159636f,   0.00142907f, -0.409756f,   0.454889f,   -0.24566f,
+  -0.0760084f,  0.286355f,   0.462102f,    0.0431695f,  -0.127395f,
+  -0.200476f,   -0.350557f,  0.217275f,    -0.23975f,   0.255148f,
+  -0.280626f,   0.42476f,    0.157411f,    0.0358675f,  -0.192591f
 };
 
 static const float av1_simple_motion_search_prune_part_layer_0_bias_32[] = {
-  -1.85942f, 0.727049f,   -0.0421259f, 0.759194f,   0.241057f,  0.0752973f,
-  0.321934f, -0.593116f,  -0.873202f,  -0.238779f,  0.851339f,  -0.536633f,
-  -0.18552f, -0.0941714f, 0.0153855f,  -1.34736f,   -0.870722f, 0.0973251f,
-  0.491483f, 0.650638f,   -0.205986f,  -0.0499654f, -1.00592f,  0.65992f
+  0.940498f,  0.15602f,   -0.234831f, 0.0268585f, 0.144769f,  0.243081f,
+  0.611406f,  0.366093f,  0.361868f,  0.39668f,   0.401479f,  0.369467f,
+  0.0909503f, 0.710595f,  0.032786f,  0.525891f,  -1.0232f,   0.732557f,
+  -0.064425f, 0.865222f,  -0.042917f, -0.237191f, -0.527006f, -0.0172101f,
+  0.59681f,   -0.472405f, 0.0969218f, -0.250624f
+};
+
+static const float av1_simple_motion_search_prune_part_layer_0_kernel_32[] = {
+  0.355607f,    0.126701f,    -0.0825159f,  0.200675f,     -0.011308f,
+  -0.280057f,   0.559816f,    0.142689f,    0.0422419f,    -0.151692f,
+  -0.0275637f,  -0.283101f,   -0.20822f,    -0.200394f,    0.465427f,
+  0.344491f,    -0.525319f,   -0.358813f,   -0.39767f,     0.0974486f,
+  0.00559058f,  -0.00546089f, 0.0506486f,   0.114475f,     -0.0436463f,
+  -0.574152f,   -0.376294f,   0.16563f,     -0.0967032f,   0.00579838f,
+  0.0639909f,   -0.037129f,   0.407574f,    -0.231428f,    0.489326f,
+  -0.221566f,   -0.270382f,   -0.784628f,   -0.155502f,    0.481698f,
+  -0.0296057f,  0.431855f,    0.840807f,    0.112291f,     0.773874f,
+  -0.0610936f,  -0.012892f,   0.365154f,    0.0267687f,    -0.0751114f,
+  0.25043f,     0.516472f,    -0.186133f,   -0.12762f,     -0.168804f,
+  -0.146309f,   0.139314f,    -0.367113f,   -0.601079f,    0.0559856f,
+  0.176081f,    0.22397f,     0.434113f,    0.0363256f,    0.313051f,
+  0.0143976f,   0.190076f,    0.474607f,    -0.681134f,    -0.0709097f,
+  -0.253289f,   -0.216277f,   -0.0593789f,  -0.107795f,    -0.194842f,
+  0.513945f,    0.239171f,    -0.720561f,   0.0136723f,    -0.391147f,
+  -0.272043f,   -0.164766f,   0.124248f,    0.147178f,     -0.35497f,
+  0.397725f,    -0.117603f,   0.262937f,    -0.331964f,    0.182418f,
+  0.315671f,    -0.0385649f,  0.488769f,    -0.334568f,    0.00596018f,
+  0.0661557f,   -0.0446985f,  -0.0928255f,  -0.0221032f,   -0.019045f,
+  -0.20881f,    0.197907f,    -0.381881f,   0.0598071f,    -0.0434551f,
+  0.159283f,    -0.110631f,   0.266996f,    -0.0265494f,   0.135199f,
+  -0.00833162f, 0.804482f,    -0.114698f,   -0.15066f,     -0.479553f,
+  0.448407f,    -0.344069f,   -0.0280952f,  -0.208211f,    -0.102269f,
+  -0.679066f,   -0.37476f,    -0.0228875f,  0.0535049f,    0.111015f,
+  -0.18125f,    -0.167584f,   0.0110497f,   0.262723f,     -0.413839f,
+  -0.0611238f,  0.358499f,    0.0807514f,   0.208254f,     0.214499f,
+  0.11137f,     -0.14262f,    -0.0513973f,  0.243718f,     -0.373716f,
+  -0.00413366f, 0.216501f,    -0.164149f,   -0.064935f,    -0.0840282f,
+  0.0566148f,   0.0377686f,   0.289835f,    0.769388f,     0.891198f,
+  -0.592739f,   0.40744f,     -0.153095f,   0.657311f,     0.140737f,
+  0.28209f,     0.158344f,    0.353546f,    0.0868246f,    0.116887f,
+  0.402004f,    0.437184f,    0.589219f,    0.760594f,     -0.575419f,
+  -0.754308f,   -0.709219f,   -0.297814f,   -0.418609f,    -0.0262104f,
+  0.0411959f,   0.0597708f,   -0.143728f,   -0.136642f,    0.099614f,
+  -0.257601f,   -0.2404f,     0.305893f,    0.254009f,     -0.0301398f,
+  -0.0653091f,  -0.459002f,   -0.163404f,   0.123152f,     -0.0284252f,
+  -0.457272f,   0.00788622f,  -0.828399f,   -0.0534199f,   0.586877f,
+  0.982728f,    0.424581f,    0.0891856f,   0.383182f,     -0.122053f,
+  0.0808408f,   -0.00384914f, -0.0560201f,  -0.0524772f,   -0.263444f,
+  -0.239287f,   -0.882777f,   0.0180592f,   -0.0948711f,   -0.177946f,
+  0.0296473f,   0.096082f,    0.0455604f,   -0.108608f,    0.00777951f,
+  -0.140896f,   0.117187f,    -0.342467f,   -0.0691604f,   0.0761611f,
+  -0.0892053f,  0.111386f,    -0.167456f,   1.40616f,      -0.00478793f,
+  0.00547665f,  -0.0441829f,  0.0151323f,   -0.0674099f,   -0.0380578f,
+  0.16072f,     0.31882f,     0.245486f,    -0.424318f,    0.101845f,
+  -0.203343f,   -0.197402f,   -0.163025f,   -0.0771961f,   -0.264435f,
+  0.319429f,    0.250076f,    0.782726f,    0.386003f,     0.00700673f,
+  -0.375715f,   0.151453f,    -0.296265f,   -0.560183f,    -0.00767249f,
+  -0.109593f,   -0.119419f,   -0.0161516f,  0.0380283f,    -0.156417f,
+  0.131708f,    0.396268f,    -0.221796f,   0.232099f,     0.128852f,
+  0.0567268f,   0.297297f,    0.173269f,    0.213411f,     0.0384426f,
+  -0.290985f,   -0.0426841f,  -0.488292f,   -0.087101f,    -0.311582f,
+  0.83009f,     -0.153163f,   0.903335f,    -1.15644f,     -0.0378635f,
+  -0.0552129f,  -0.126362f,   -0.176945f,   0.0653115f,    0.0989368f,
+  -0.333543f,   -0.330586f,   0.29775f,     -0.103535f,    0.210824f,
+  -0.00300509f, 0.317105f,    0.216852f,    0.479718f,     0.0485808f,
+  -0.15662f,    0.718199f,    0.327513f,    0.115169f,     -0.423598f,
+  -0.456633f,   -0.575814f,   -0.494454f,   0.304411f,     0.0493055f,
+  -0.381171f,   0.467251f,    -0.122872f,   -0.167441f,    0.017253f,
+  -0.0583646f,  -0.1586f,     0.214046f,    -0.0284424f,   -0.217112f,
+  0.606567f,    -0.107533f,   0.36615f,     -0.0709227f,   0.604761f,
+  -0.244657f,   -0.296651f,   -0.595611f,   -0.156629f,    -0.693468f,
+  -0.310603f,   0.499272f,    0.282941f,    0.295043f,     -0.178704f,
+  0.281186f,    0.014329f,    -0.120819f,   0.154234f,     0.0131325f,
+  -0.472231f,   -0.631281f,   0.422955f,    0.711432f,     -0.118025f,
+  0.0864996f,   0.343971f,    -0.301477f,   -0.246638f,    0.165068f,
+  0.218044f,    0.224236f,    -0.0848522f,  0.00671216f,   0.401141f,
+  -0.218857f,   -0.0298495f,  -0.135725f,   -0.377618f,    0.022473f,
+  0.106955f,    -0.0582005f,  0.0468484f,   -0.0217442f,   0.130911f,
+  -0.0926905f,  0.383007f,    -0.159353f,   -0.222711f,    -0.0286419f,
+  0.372315f,    -0.469095f,   0.797571f,    -0.301315f,    0.239327f,
+  -0.997507f,   -0.363409f,   0.353717f,    0.676686f,     -0.0500028f,
+  0.0638539f,   -0.431927f,   0.243852f,    0.000884826f,  -0.00166585f,
+  0.0613292f,   -0.029558f,   -0.0248432f,  -0.0125607f,   -0.0309674f,
+  -0.743308f,   0.0409806f,   0.0921015f,   0.167816f,     0.406849f,
+  0.095677f,    0.0308913f,   0.139956f,    -0.400472f,    0.396617f,
+  0.936517f,    0.355057f,    -0.423816f,   -0.232472f,    -0.220188f,
+  -0.399746f,   -0.409623f,   -0.158797f,   0.361153f,     0.0327019f,
+  0.0690844f,   -0.032197f,   0.0248558f,   0.00438518f,   0.0222724f,
+  -0.326832f,   -0.314295f,   0.156563f,    0.0562703f,    0.332694f,
+  0.299424f,    0.228206f,    0.322038f,    0.0136098f,    0.0060297f,
+  -0.165851f,   -0.306512f,   0.0796508f,   -0.37158f,     0.239395f,
+  -0.349442f,   0.198515f,    -0.253854f,   -1.13694f,     0.0202873f,
+  -0.0504009f,  -0.130528f,   -0.017126f,   -0.0370001f,   -0.087458f,
+  -0.119952f,   -0.130404f,   0.0333733f,   -0.184736f,    0.182162f,
+  0.227776f,    -0.166563f,   -0.156162f,   0.118215f,     -0.220183f,
+  0.00474779f,  -0.107792f,   0.260493f,    0.11884f,      0.156587f,
+  0.303936f,    -0.131788f,   -0.314774f,   0.310606f,     0.0935523f,
+  0.790767f,    0.26461f,     0.0236426f,   0.0629469f,    0.0344072f,
+  -0.151513f,   0.211498f,    0.0245435f,   0.0629973f,    0.052019f,
+  -0.03308f,    0.123487f,    0.0885027f,   0.159172f,     -0.0510615f,
+  0.0298033f,   -0.130515f,   -0.121799f,   -0.104915f,    0.208822f,
+  -0.310496f,   -0.314106f,   0.303307f,    -0.0196736f,   0.0420045f,
+  0.461777f,    -0.433699f,   0.00345407f,  0.703139f,     -0.655637f,
+  -0.210767f,   -0.201278f,   0.163694f,    -0.236534f,    0.300877f,
+  0.0769982f,   -0.282453f,   0.149721f,    -0.0303466f,   -0.191473f,
+  -0.406056f,   -0.213472f,   0.1619f,      -0.245953f,    0.00544399f,
+  -0.121434f,   0.193012f,    -0.307165f,   1.45431f,      -0.161468f,
+  -0.12444f,    -0.146129f,   -0.0528212f,  -0.0925165f,   -0.134528f,
+  -0.479475f,   0.315525f,    0.133845f,    0.382158f,     -0.0799693f,
+  -0.151041f,   0.255772f,    0.409536f,    -0.240663f,    -0.323741f,
+  -0.205876f,   0.03699f,     -0.217541f,   0.108511f,     0.640628f,
+  0.705993f,    -0.423899f,   -0.78314f,    -0.100733f,    -0.00859087f,
+  0.0251879f,   0.0458335f,   0.00210128f,  -0.047576f,    -0.0560518f,
+  -1.23869f,    -0.829914f,   0.0346551f,   0.350505f,     0.193688f,
+  0.459154f,    0.137898f,    0.503818f,    0.260867f,     0.649539f,
+  0.0150802f,   0.0239274f,   -0.276069f,   -0.0621478f,   -0.193106f,
+  -0.0375665f,  -0.654529f,   0.189493f,    0.446625f,     -0.0208265f,
+  0.019838f,    -0.0201955f,  0.00180428f,  -0.0110678f,   -0.0172414f,
+  0.0276489f,   -0.252882f,   -0.0351807f,  -0.0518874f,   0.279098f,
+  -0.245122f,   0.101287f,    -0.114202f,   -0.0812187f,   0.572429f,
+  -0.0821731f,  0.564183f,    0.0222552f,   0.190111f,     -0.0417497f,
+  -0.00385925f, -0.182995f,   -0.240482f,   -0.291572f,    -0.0450444f,
+  0.0962974f,   -0.165973f,   -0.0954637f,  -0.163841f,    -0.833405f,
+  -1.31541f,    -0.336473f,   -0.0920702f,  0.816105f,     0.393377f,
+  0.0340241f,   -0.0844545f,  0.61729f,     -0.17596f,     0.241149f,
+  -0.42825f,    -0.59091f,    -0.290702f,   0.0796465f,    0.0982819f,
+  0.466934f,    0.261666f,    0.0373333f,   0.332509f,     -0.0266694f,
+  -0.0476951f,  -0.00642167f, -0.0132542f,  -0.000320841f, 0.00475532f,
+  0.000502778f, 0.296534f,    -0.13297f,    -0.113082f,    -0.327923f,
+  0.35901f,     -0.302246f,   0.189799f,    -0.37994f,     0.16107f,
+  -0.20414f,    0.548575f,    -0.460821f,   0.591878f,     -0.213113f,
+  -0.169373f,   -0.07332f,    0.228841f,    0.682302f,     -0.0665316f,
+  -0.142456f,   -0.0873117f,  0.00607451f,  0.0376443f,    0.0536673f,
+  -0.0109536f,  -0.400279f,   0.550058f,    0.820871f,     -0.666373f,
+  -0.471962f,   -0.315925f,   -0.313142f,   0.952742f,     0.473928f,
+  -0.119006f,   0.153241f,    -0.0383078f,  0.631869f,     -0.343423f,
+  -0.233473f,   -0.218195f,   -0.077688f,   -0.728291f,    0.0382408f,
+  -0.00662886f, -0.0419666f,  0.0309776f,   -0.0281592f,   0.0154229f,
+  -0.198534f,   0.0206324f,   0.0152272f,   -0.235067f,    0.0330486f,
+  0.139198f,    -0.0612118f,  0.133154f,    -0.258675f,    0.0900275f,
+  -0.127771f,   0.157322f,    -0.00767807f, -0.329258f,    0.327458f,
+  0.0528581f,   -0.181125f,   0.409995f,    -0.162979f,    -0.0193475f,
+  0.186009f,    0.0519501f,   0.651877f,    -0.37821f,     -1.10341f,
+  -0.189776f,   -0.0922788f,  0.460256f,    0.168011f,     0.440295f,
+  0.478135f,    0.374573f,    0.384048f,    0.116953f,     0.68886f,
+  -0.427727f,   -0.36676f,    -0.500013f,   -0.228685f,    -0.218859f,
+  0.208396f,    -0.0173765f,  -0.0680241f,  -0.00538013f,  -0.0674409f,
+  -0.092764f,   0.0295707f,   -0.0462887f,  -0.00636006f,  0.0334169f
+};
+
+static const float av1_simple_motion_search_prune_part_logits_bias_32[] = {
+  0.176459f,  0.154405f, 0.281821f,  0.375264f,  -0.882863f,
+  -0.240261f, -1.17075f, -0.280216f, -0.743836f, -0.317511f
 };
 
 static const NN_CONFIG av1_simple_motion_search_prune_part_nn_config_32 = {
@@ -3510,120 +3613,253 @@
 #undef NUM_LAYER_0_UNITS_32
 #undef NUM_LOGITS_32
 
-// BLOCK_16X16
 #define NUM_HIDDEN_LAYERS_16 1
-#define NUM_FEATURES_16 19
-#define NUM_LAYER_0_UNITS_16 16
+#define NUM_FEATURES_16 25
+#define NUM_LAYER_0_UNITS_16 32
 #define NUM_LOGITS_16 10
 
 static const float av1_simple_motion_search_prune_part_logits_kernel_16[] = {
-  0.274123f,   -0.551439f,  0.578938f,   -0.213001f,  -0.310021f,
-  0.0301311f,  -0.377388f,  -3.16339f,   0.434616f,   0.264216f,
-  0.320385f,   -1.41657f,   1.05919f,    -0.396075f,  -0.855458f,
-  0.418105f,   -0.0769093f, -0.54773f,   -0.215041f,  -0.13885f,
-  -0.209062f,  -0.526914f,  0.211082f,   -2.34741f,   -0.000587922f,
-  -0.431294f,  0.757511f,   -0.184199f,  -0.623552f,  -0.221362f,
-  -0.628871f,  0.646393f,   -0.192193f,  0.0166809f,  -0.061691f,
-  -0.214283f,  -0.35264f,   0.361452f,   -0.0160958f, -0.0475499f,
-  0.196822f,   0.44674f,    -0.408064f,  -0.559148f,  -0.67489f,
-  -0.202201f,  -0.358012f,  -0.341735f,  -0.325682f,  0.220407f,
-  -0.642416f,  0.350069f,   0.430505f,   -0.0997745f, -0.300435f,
-  1.25364f,    -0.869717f,  -0.0728051f, -0.172433f,  0.385328f,
-  -2.13737f,   0.673629f,   0.580102f,   -0.0745359f, -0.442542f,
-  -0.208393f,  -0.44303f,   0.318855f,   0.0557663f,  0.268257f,
-  -0.0941132f, -4.52876f,   -0.638897f,  -0.907808f,  0.28328f,
-  0.619328f,   -1.64249f,   0.0241431f,  -0.0880383f, 0.299287f,
-  -0.248316f,  0.039253f,   -0.544645f,  -0.141389f,  0.0185283f,
-  -1.01973f,   -0.269349f,  -4.88803f,   -0.632892f,  0.181151f,
-  0.193291f,   0.592713f,   -1.71466f,   0.398923f,   0.00355734f,
-  0.212158f,   -0.949188f,  0.386679f,   -0.243317f,  -0.17458f,
-  0.0576348f,  0.096034f,   -0.282317f,  -4.13556f,   -0.516689f,
-  0.169427f,   -0.541422f,  0.529281f,   -1.45161f,   -0.0417835f,
-  0.0174299f,  -0.26404f,   -0.105773f,  0.102701f,   -0.65039f,
-  0.308121f,   -0.185395f,  0.273611f,   -0.408464f,  -6.09866f,
-  -0.512249f,  0.0668662f,  -0.547454f,  0.62565f,    -1.63952f,
-  0.510116f,   0.127461f,   -0.506263f,  0.113016f,   -0.258605f,
-  -0.308066f,  0.0957733f,  0.059395f,   -0.915338f,  0.499407f,
-  -10.3199f,   -0.32224f,   -0.677307f,  1.13218f,    -0.0888689f,
-  -0.108029f,  -0.156533f,  -0.391431f,  0.576607f,   -0.0833897f,
-  0.536752f,   -0.0832957f, -0.0957492f, -0.135149f,  0.423881f,
-  0.317691f,   -7.29755f,   0.104775f,   0.534134f,   -0.797288f,
-  -0.386335f,  -0.20785f,   -0.0507494f, -0.338127f,  -0.868801f
-};
-
-static const float av1_simple_motion_search_prune_part_layer_0_kernel_16[] = {
-  -0.244782f,   0.00425059f, -0.337534f,  -0.423125f,   -0.349549f,
-  -0.00261207f, -0.0845866f, -0.259278f,  -0.375872f,   0.00052185f,
-  -0.427483f,   0.175625f,   -0.357737f,  0.129946f,    0.97588f,
-  1.19281f,     -0.51292f,   -0.100629f,  1.04044f,     0.197375f,
-  -0.210977f,   -0.20334f,   0.173408f,   0.431999f,    0.083979f,
-  -0.334416f,   -0.171408f,  0.160035f,   -0.0464933f,  0.164574f,
-  -0.162781f,   1.01648f,    0.624844f,   -1.20372f,    -0.698742f,
-  0.335747f,    -0.362217f,  -0.0817772f, -0.0366522f,  -0.249627f,
-  -0.3135f,     0.256151f,   -0.257869f,  0.0816391f,   -0.256592f,
-  0.071219f,    -0.295956f,  0.287213f,   -0.375107f,   -0.149275f,
-  0.0449292f,   0.49489f,    -0.958944f,  0.386166f,    -0.76147f,
-  -0.223786f,   1.91139f,    -0.0866129f, -0.516556f,   0.871813f,
-  0.389086f,    0.3205f,     0.605997f,   -0.531384f,   -0.693121f,
-  0.728219f,    0.223733f,   -0.58534f,   -0.410249f,   0.0271334f,
-  -0.43904f,    0.325998f,   -0.123988f,  0.103988f,    -0.2227f,
-  0.0779071f,   0.100073f,   -0.924956f,  -0.00472742f, -0.21932f,
-  -0.220187f,   -0.719278f,  0.099118f,   -0.0891471f,  0.743678f,
-  -0.173308f,   0.588225f,   -0.31524f,   1.1415f,      0.408762f,
-  -0.213088f,   -0.291621f,  0.655754f,   0.531725f,    -0.013178f,
-  -0.100753f,   -0.0775942f, -0.181806f,  -0.441297f,   -0.00589338f,
-  0.14217f,     -0.0592671f, 0.10907f,    1.47619f,     0.813817f,
-  0.1996f,      0.178263f,   -0.569958f,  -0.374858f,   -0.743922f,
-  -0.269343f,   -0.118752f,  0.0797114f,  0.027829f,    -0.133402f,
-  -0.164884f,   -0.42919f,   0.0682661f,  -0.206438f,   0.0184534f,
-  -0.141316f,   -0.138817f,  0.0305671f,  0.295578f,    -0.236413f,
-  0.172918f,    -0.35082f,   -0.0986917f, -0.650484f,   0.13655f,
-  0.212195f,    0.549501f,   1.64941f,    0.152883f,    0.0117464f,
-  -0.200688f,   -0.0412075f, -0.0296324f, 0.122624f,    0.1871f,
-  -0.515693f,   0.20351f,    0.333617f,   0.254752f,    0.293802f,
-  -0.428904f,   -0.0312053f, -0.879481f,  -0.516353f,   -0.417837f,
-  -0.230442f,   0.229367f,   0.615339f,   0.327347f,    0.288747f,
-  0.596166f,    0.497054f,   0.536953f,   0.462426f,    0.517022f,
-  -0.287359f,   -0.162824f,  -0.249174f,  -0.364887f,   -0.538065f,
-  -0.506783f,   -0.163213f,  -0.617007f,  -0.70433f,    -0.759151f,
-  -0.235183f,   -0.196496f,  0.0925943f,  -0.0786896f,  0.135073f,
-  -0.106243f,   -0.190647f,  -0.311848f,  -0.428009f,   0.467477f,
-  0.259139f,    1.4948f,     0.986061f,   -0.534924f,   -0.193525f,
-  -0.66125f,    -0.693799f,  -0.489594f,  0.238264f,    0.249978f,
-  -0.365372f,   -0.197998f,  -0.664471f,  -0.0312145f,  -0.297293f,
-  0.0278792f,   -0.877716f,  0.0473106f,  0.913044f,    0.815569f,
-  0.789972f,    0.641374f,   -0.122848f,  -0.353137f,   -0.381102f,
-  -0.960138f,   -0.166101f,  0.230364f,   0.534173f,    0.398882f,
-  0.0599076f,   0.00176035f, 0.291062f,   0.021087f,    0.374562f,
-  0.402516f,    0.144006f,   -0.149598f,  0.065063f,    -0.0774656f,
-  -0.18804f,    -0.21123f,   0.0119723f,  -0.244286f,   0.109912f,
-  -0.98136f,    -0.583136f,  -1.3897f,    0.33196f,     0.319226f,
-  0.490015f,    0.316438f,   0.565049f,   0.163159f,    0.523771f,
-  0.325115f,    -0.0515304f, -0.0827355f, 0.112763f,    -0.517608f,
-  -0.161398f,   -0.124513f,  -0.0384277f, -0.49491f,    -1.53384f,
-  -1.3086f,     1.20601f,    0.399591f,   0.233774f,    0.0154149f,
-  -0.431196f,   0.187116f,   0.033398f,   0.655468f,    -0.390814f,
-  0.418144f,    -0.572053f,  0.936493f,   -0.116933f,   -0.20803f,
-  -0.908834f,   1.2524f,     -0.285888f,  0.227437f,    -0.317727f,
-  -0.6331f,     0.159656f,   0.244652f,   0.169768f,    0.379279f,
-  0.37089f,     0.118264f,   0.150946f,   0.536513f,    -0.261398f,
-  -0.15329f,    -0.413112f,  -0.243792f,  -0.215096f,   0.288741f,
-  -0.193763f,   -0.130652f,  -0.328159f,  -0.719996f,   -1.66213f,
-  0.0815627f,   0.129643f,   -0.0974464f, -0.0660102f,  0.349602f,
-  0.120356f,    -0.144144f,  -0.13641f,   -0.154818f,   -0.468552f,
-  -0.442585f,   -0.312206f,  0.879662f,   0.846103f,    0.0485413f,
-  0.18676f,     -0.477959f,  -0.112404f,  -0.366477f
-};
-
-static const float av1_simple_motion_search_prune_part_logits_bias_16[] = {
-  0.791815f,  0.888054f,  0.406071f, -0.217564f, -0.504713f,
-  -0.514339f, -0.200842f, -1.09239f, -1.78297f,  -2.41754f
+  -0.520913f,   0.395611f,    0.0369091f,   -0.318591f,  -0.463252f,
+  0.134992f,    -0.43154f,    -0.0739112f,  -0.118817f,  0.476373f,
+  -0.281406f,   0.3413f,      0.456255f,    0.33307f,    0.2942f,
+  0.1317f,      0.498113f,    1.95406f,     -0.165726f,  -0.219306f,
+  -0.302656f,   -1.31157f,    -0.433662f,   0.151716f,   -0.214817f,
+  0.504523f,    -0.710049f,   0.359616f,    -0.412695f,  -0.103193f,
+  0.341912f,    0.351378f,    -0.181486f,   0.573862f,   -0.0396254f,
+  -0.17855f,    -0.276163f,   0.0367465f,   -0.353905f,  -0.204689f,
+  0.309581f,    -0.0439686f,  -0.147855f,   0.152745f,   0.290871f,
+  0.131049f,    -0.27808f,    -0.142997f,   0.207843f,   -1.23074f,
+  -0.267714f,   -0.336923f,   0.313781f,    -0.61488f,   -0.161984f,
+  0.238059f,    -0.0879942f,  -0.085543f,   -0.260156f,  -0.13614f,
+  -0.242196f,   0.201216f,    -0.248691f,   0.0936671f,  -0.350522f,
+  -0.35002f,    -0.156583f,   -0.00579001f, 0.300578f,   -0.341269f,
+  -0.290712f,   0.354802f,    -0.31629f,    0.509107f,   -0.236953f,
+  -0.0923519f,  0.544509f,    -0.280991f,   -0.017437f,  -0.202721f,
+  -0.116388f,   -0.7191f,     0.324586f,    0.254249f,   0.125505f,
+  0.00658697f,  -0.333322f,   -0.126537f,   -0.140004f,  -0.0241202f,
+  -0.172466f,   0.210035f,    -0.270833f,   0.0579044f,  0.0950352f,
+  -0.120382f,   0.063292f,    -0.394925f,   0.482165f,   0.147753f,
+  0.331465f,    -0.187444f,   0.1083f,      0.414028f,   0.279238f,
+  -0.486889f,   -0.674349f,   -0.313656f,   -0.131186f,  -0.100662f,
+  0.238191f,    -1.19083f,    -0.30667f,    -2.4324f,    0.235311f,
+  0.108605f,    1.67197f,     0.476157f,    0.30055f,    0.0839538f,
+  0.408469f,    -0.473517f,   0.560283f,    -0.0188136f, 0.273824f,
+  -0.43707f,    -0.0346978f,  -0.438315f,   -0.0196275f, -0.0567921f,
+  -0.220166f,   0.216175f,    -0.0180461f,  0.0116429f,  -0.0096949f,
+  -0.32613f,    0.176829f,    -0.243563f,   -0.240972f,  -0.621819f,
+  -0.00619648f, -0.145525f,   0.124324f,    -0.0306925f, 0.172208f,
+  -2.04631f,    -0.200087f,   -0.594135f,   -0.352303f,  -0.309826f,
+  0.0922786f,   -0.698371f,   -0.0366823f,  0.0244036f,  0.338775f,
+  -0.115947f,   0.144971f,    -0.0607037f,  -0.762412f,  0.0125584f,
+  -0.262427f,   -0.0830273f,  -0.291252f,   -0.176059f,  -0.203983f,
+  0.0871455f,   -0.0894925f,  0.0426263f,   -0.060001f,  -0.542355f,
+  -0.407837f,   -0.0419273f,  0.226608f,    -0.114844f,  0.158733f,
+  -0.187237f,   0.113163f,    -1.86337f,    -0.367544f,  -0.547048f,
+  -0.24192f,    -0.226764f,   0.090912f,    0.819604f,   0.433766f,
+  -0.841657f,   0.446987f,    -0.622761f,   -0.0296385f, -0.130176f,
+  -0.0518136f,  -0.640326f,   -0.330107f,   -0.137832f,  -0.0119033f,
+  0.39401f,     0.111331f,    -0.141367f,   -0.230289f,  0.171054f,
+  -0.924059f,   -0.107317f,   -0.347983f,   0.0261109f,  0.423002f,
+  -0.305817f,   0.247696f,    0.0436002f,   0.0305862f,  -1.52448f,
+  -0.595587f,   -0.155552f,   -1.11949f,    -0.513937f,  0.138347f,
+  -0.301487f,   0.352144f,    -0.615801f,   0.0326701f,  -0.215322f,
+  -0.0608176f,  -0.416557f,   -0.306073f,   -0.441512f,  -0.0569277f,
+  -0.709768f,   -0.602527f,   -0.311134f,   0.152471f,   -0.255299f,
+  0.354505f,    0.194464f,    0.0144251f,   0.110732f,   -0.4452f,
+  -0.804814f,   0.205325f,    -0.0957486f,  0.502684f,   0.09112f,
+  -0.533087f,   -1.77979f,    0.556992f,    -0.176157f,  -0.642633f,
+  0.11553f,     -0.232561f,   0.161277f,    -0.0631125f, -0.20759f,
+  0.489253f,    -0.067533f,   0.0231024f,   -0.179831f,  -0.272985f,
+  -0.390059f,   0.3089f,      0.185733f,    -0.257065f,  -0.508838f,
+  -0.550028f,   0.0665621f,   -0.138288f,   -0.413188f,  0.191193f,
+  -1.32969f,    -0.431025f,   0.270242f,    -0.340062f,  0.0817257f,
+  0.0376051f,   -0.18633f,    0.0828274f,   0.00670051f, -0.431295f,
+  -0.450316f,   -0.173042f,   -0.322248f,   0.370628f,   0.10019f,
+  0.317293f,    -0.266613f,   0.0752441f,   -0.425656f,  -0.112223f,
+  0.557991f,    -0.324368f,   -0.195261f,   -0.0526129f, -0.807472f,
+  -0.387466f,   0.192186f,    0.353213f,    -0.120238f,  0.107686f,
+  0.200678f,    -0.75363f,    0.466857f,    -0.282345f,  -0.0849236f,
+  -0.0490695f,  -0.00643182f, 0.123047f,    -0.207805f,  -0.130456f,
+  -1.09455f,    0.340973f,    0.334784f,    0.0706643f,  -1.65681f,
+  -0.319952f,   -0.198514f,   -0.0787972f,  0.089524f,   0.0531034f,
+  -0.202705f,   -0.0852339f,  -0.62572f,    -0.0734234f, -0.838088f
 };
 
 static const float av1_simple_motion_search_prune_part_layer_0_bias_16[] = {
-  0.89469f,   0.10871f,  0.664404f,  -0.00639695f, -0.745647f, 0.910444f,
-  0.168436f,  -4.05854f, 1.00981f,   0.743352f,    -0.73947f,  -2.5654f,
-  -0.654753f, 0.602252f, -0.973004f, 1.1113f
+  -0.0616197f, 0.939947f, 0.521161f,  0.213886f,  0.130324f,  -0.127443f,
+  -0.0538715f, 0.708746f, 0.445031f,  0.418781f,  -0.114539f, 0.521941f,
+  1.13719f,    0.606545f, -0.32193f,  -0.150788f, 0.158487f,  -0.224005f,
+  0.654715f,   0.115729f, -0.286506f, -2.06223f,  0.0117697f, 0.503905f,
+  -0.102339f,  0.653256f, -0.813561f, 0.905235f,  -0.417269f, -0.206265f,
+  0.661496f,   0.95533f
+};
+
+static const float av1_simple_motion_search_prune_part_layer_0_kernel_16[] = {
+  -0.203489f,   0.00686229f,  -0.161414f,   0.0637276f,   0.27516f,
+  0.512219f,    0.164205f,    0.00326062f,  -0.41914f,    -0.400334f,
+  0.554419f,    0.715772f,    -0.295569f,   -0.703503f,   0.0137744f,
+  -0.0934259f,  0.174234f,    -0.148618f,   -0.0360558f,  -0.0986598f,
+  -0.138502f,   -0.0770713f,  0.122922f,    -0.00784415f, 0.0953234f,
+  -0.255754f,   -0.310967f,   0.185306f,    0.464554f,    0.147338f,
+  -0.0612304f,  0.164783f,    0.301097f,    0.161364f,    -0.12723f,
+  -0.0265984f,  -0.471361f,   0.0578776f,   -0.362865f,   0.425789f,
+  0.402758f,    -0.190235f,   0.00549738f,  -0.570908f,   1.27206f,
+  0.048868f,    -0.0097675f,  0.0708324f,   0.0456103f,   0.0149062f,
+  -0.563032f,   -0.420573f,   0.107278f,    0.0938258f,   0.142712f,
+  -0.00251036f, -0.250583f,   0.522272f,    0.0113175f,   0.126751f,
+  -0.433028f,   -0.035542f,   -0.536686f,   -0.0668722f,  0.253094f,
+  0.254007f,    -0.435505f,   0.343001f,    0.0531542f,   -0.361914f,
+  -0.102664f,   0.0404874f,   0.132686f,    0.0762298f,   0.0236971f,
+  -0.419454f,   0.230877f,    -0.223714f,   0.037813f,    0.0818604f,
+  0.383705f,    -0.235028f,   -0.0554801f,  0.429851f,    0.0845829f,
+  0.166295f,    0.355111f,    -0.421197f,   0.298949f,    0.0218224f,
+  0.445705f,    -0.392217f,   -0.429578f,   -0.076276f,   -0.0963531f,
+  -0.631425f,   -0.225977f,   8.06349e-06f, 0.0676679f,   0.0779651f,
+  0.0706891f,   0.101377f,    0.517103f,    0.0945502f,   -0.52522f,
+  -0.312022f,   0.0358089f,   0.616509f,    -0.0507444f,  -0.465814f,
+  -0.0326024f,  0.591298f,    0.188544f,    -0.0633316f,  -0.199987f,
+  0.403118f,    -0.511281f,   -0.696263f,   0.112996f,    0.103875f,
+  0.0495595f,   -0.0107449f,  0.521539f,    -0.0123823f,  -0.0642751f,
+  0.08548f,     -0.0679207f,  0.526558f,    0.0651114f,   -0.342643f,
+  -0.349934f,   0.307437f,    0.368763f,    -0.194851f,   -0.134117f,
+  0.102448f,    -0.0520666f,  0.0415824f,   -0.175085f,   0.272685f,
+  0.0675856f,   0.120627f,    0.391408f,    -0.135249f,   -0.357024f,
+  0.019666f,    -0.0622677f,  0.407427f,    0.22655f,     -0.129432f,
+  -0.165327f,   0.004893f,    0.5479f,      0.0613981f,   -0.479682f,
+  -0.144228f,   -0.130106f,   0.206458f,    -0.342086f,   0.12691f,
+  -0.113554f,   0.231164f,    -0.051419f,   0.0401286f,   -0.560429f,
+  -0.070609f,   0.420232f,    0.442465f,    -0.237501f,   -0.000293732f,
+  -1.017f,      -0.210222f,   0.0157063f,   0.0488178f,   0.0734721f,
+  -0.52626f,    -0.276441f,   -0.521579f,   0.443532f,    -0.0819051f,
+  -0.0732633f,  -0.17999f,    0.258525f,    -0.0374872f,  0.150115f,
+  0.0510939f,   0.168116f,    0.473372f,    0.824489f,    0.302195f,
+  -0.348613f,   0.238569f,    0.176444f,    -0.633945f,   -0.0567195f,
+  -0.0305827f,  -0.0551851f,  0.85822f,     -0.0628099f,  0.0364294f,
+  -0.234823f,   0.179067f,    0.143208f,    -0.0511014f,  -0.404191f,
+  0.428035f,    0.0235506f,   0.371991f,    -0.312909f,   0.550933f,
+  -0.389265f,   -0.271813f,   -0.293461f,   -0.583752f,   0.179991f,
+  0.191698f,    0.659094f,    1.07941f,     -0.509555f,   -0.100638f,
+  0.079988f,    -0.0519107f,  -0.112723f,   -0.0663326f,  0.0353569f,
+  -0.795055f,   -0.465999f,   0.283579f,    0.340913f,    0.152738f,
+  0.294664f,    0.527839f,    0.187735f,    0.359461f,    0.164629f,
+  0.107512f,    0.390402f,    0.236702f,    0.114674f,    -0.525655f,
+  -0.555476f,   -0.6589f,     -0.266601f,   -0.0946547f,  0.6306f,
+  0.0248513f,   0.038497f,    0.432706f,    -0.0715465f,  0.0410172f,
+  -0.115313f,   -0.428684f,   0.136283f,    0.0913185f,   0.11277f,
+  0.0968689f,   -0.00437052f, 0.0888981f,   0.10304f,     0.02442f,
+  -0.211315f,   0.00981596f,  -0.0974827f,  0.208611f,    0.140644f,
+  0.0315567f,   0.350332f,    -0.291049f,   -0.0715449f,  -0.352992f,
+  -0.858004f,   0.828658f,    0.439092f,    0.0151291f,   0.0503828f,
+  0.0656112f,   -0.710749f,   -0.0951757f,  0.193908f,    0.00908018f,
+  0.141486f,    -0.0657711f,  0.099791f,    0.153729f,    -0.419576f,
+  -0.892636f,   -0.0449268f,  -0.170786f,   -0.156564f,   0.384511f,
+  0.296565f,    0.0569815f,   -0.103938f,   1.27479f,     -0.0406475f,
+  0.154083f,    -0.186442f,   0.0282588f,   0.0312102f,   -0.188994f,
+  0.284243f,    -0.564693f,   0.425525f,    -0.00924596f, 0.810003f,
+  0.233812f,    -0.0180273f,  0.121082f,    -0.209096f,   0.151437f,
+  0.286921f,    -0.348095f,   0.174813f,    -0.413798f,   0.108994f,
+  -0.34266f,    -0.0337981f,  -0.459f,      -0.409812f,   -0.0890104f,
+  0.0834802f,   -0.00259191f, -0.105914f,   -0.164207f,   0.0697689f,
+  -0.312098f,   -0.00650536f, -0.486758f,   -0.248486f,   0.24314f,
+  -0.0857144f,  0.0884781f,   -0.65615f,    -0.121744f,   0.0709335f,
+  -0.0237193f,  0.10764f,     -0.0409452f,  -0.0824305f,  0.42329f,
+  0.138258f,    0.502607f,    0.228545f,    0.0687789f,   0.0361586f,
+  0.39074f,     0.0722654f,   -0.0133148f,  0.283278f,    0.0743384f,
+  0.310292f,    -0.297675f,   -0.359935f,   0.521021f,    -0.10082f,
+  -0.272333f,   0.0120283f,   0.138118f,    -0.123711f,   -0.0711386f,
+  0.0170747f,   0.831039f,    0.0509626f,   0.790608f,    -0.0863406f,
+  -0.31962f,    0.0631013f,   0.0873453f,   -0.472331f,   -0.0826027f,
+  -0.241722f,   0.148835f,    -0.131611f,   0.000195347f, -0.0615804f,
+  -0.838663f,   -0.586979f,   0.247713f,    0.362254f,    0.492727f,
+  -0.132163f,   0.0516545f,   0.477838f,    -0.0395182f,  0.0124993f,
+  -0.771514f,   0.0386912f,   -0.118525f,   -0.346172f,   -0.265905f,
+  -0.175257f,   -0.406287f,   0.393837f,    0.409096f,    -0.408501f,
+  -0.0207146f,  0.0487809f,   0.0636982f,   0.0276368f,   0.0878249f,
+  0.0425889f,   0.0868633f,   0.17423f,     -0.128217f,   -0.477068f,
+  -0.321294f,   0.0393771f,   0.00812823f,  -0.350529f,   -0.129012f,
+  0.439953f,    0.396662f,    0.410475f,    -0.123129f,   -0.565966f,
+  0.0298635f,   -0.614611f,   -0.477514f,   0.453651f,    0.0617068f,
+  0.0530563f,   0.0479074f,   0.213551f,    0.039034f,    0.0449095f,
+  -1.06868f,    -1.2654f,     -0.175482f,   0.595068f,    -0.230095f,
+  0.719838f,    -0.272148f,   0.696564f,    0.0485396f,   0.468584f,
+  0.0695439f,   -0.0842122f,  -0.228978f,   0.161397f,    -0.000441421f,
+  -0.0297514f,  -0.250599f,   0.196656f,    0.608423f,    -0.0112096f,
+  0.0236881f,   -0.00167311f, 0.0040709f,   0.015495f,    0.00757698f,
+  -0.165886f,   0.359767f,    -0.0214696f,  0.377208f,    0.0303547f,
+  0.0657094f,   0.140775f,    0.21867f,     -0.203922f,   0.263878f,
+  -0.0529099f,  0.202438f,    -0.243226f,   0.156659f,    -0.627056f,
+  -0.845036f,   -0.500873f,   0.172588f,    0.402972f,    -0.147734f,
+  0.151792f,    -0.075579f,   0.443519f,    0.0311335f,   -0.0328222f,
+  -0.0299781f,  0.435956f,    -0.0987376f,  0.288402f,    0.135902f,
+  -0.173584f,   -0.186255f,   0.224524f,    -0.249645f,   0.123702f,
+  -0.0846244f,  0.491317f,    0.544846f,    0.338677f,    -0.258885f,
+  -0.617434f,   -0.629003f,   -0.347233f,   0.181262f,    -0.0606015f,
+  -0.537766f,   0.215089f,    -0.334527f,   0.0488534f,   0.0577997f,
+  -1.12431f,    -0.932292f,   -0.11559f,    0.573715f,    0.151128f,
+  0.693818f,    -0.16956f,    0.802591f,    -0.231531f,   1.04318f,
+  -0.476417f,   0.293452f,    -0.610136f,   0.27506f,     -0.384012f,
+  0.305366f,    -0.0540464f,  -0.337583f,   -0.174285f,   0.157248f,
+  0.0477345f,   -0.0229535f,  0.0475766f,   -0.00603319f, 0.00856119f,
+  -0.702893f,   -0.0579673f,  0.183024f,    -0.166222f,   0.109763f,
+  -0.148019f,   -0.258873f,   -0.0820157f,  -0.186716f,   -0.449265f,
+  -0.0534138f,  0.15732f,     0.46357f,     0.00502591f,  -0.0282085f,
+  0.152277f,    -0.855199f,   -0.357115f,   0.0366159f,   0.0131101f,
+  -0.0407758f,  0.0462835f,   0.146309f,    -0.00276278f, -0.0591814f,
+  -0.109437f,   0.506764f,    -0.044421f,   0.465907f,    0.114444f,
+  -0.241053f,   -0.362649f,   -0.432615f,   0.199989f,    -0.00635866f,
+  -0.521886f,   0.0958924f,   -0.485725f,   0.0430527f,   0.069746f,
+  0.681091f,    -0.288144f,   0.505671f,    0.0489065f,   -0.0373836f,
+  0.266079f,    0.145173f,    -0.011481f,   -0.225074f,   -0.754501f,
+  -0.122939f,   -0.294213f,   0.334738f,    0.281561f,    0.558977f,
+  -0.21551f,    -0.346507f,   -0.0625635f,  0.0782034f,   -0.236999f,
+  -0.803783f,   -0.601117f,   0.091192f,    0.636122f,    -0.250626f,
+  0.0354961f,   0.103915f,    0.508571f,    0.329911f,    -0.0425999f,
+  -0.0867587f,  -0.0385824f,  1.13914f,     -0.0261992f,  0.00484478f,
+  0.124603f,    -0.012173f,   -0.377358f,   -0.243563f,   0.236094f,
+  0.145663f,    -0.132752f,   0.347497f,    -0.529315f,   0.271632f,
+  -0.372805f,   0.0261836f,   0.126169f,    0.0941008f,   0.283773f,
+  0.765701f,    -0.226477f,   -0.181549f,   -0.306896f,   0.110165f,
+  -0.0784234f,  -0.0827892f,  -0.0374252f,  -0.0950872f,  -0.451015f,
+  -0.995793f,   -0.452663f,   0.293338f,    -0.380865f,   0.032683f,
+  0.0178248f,   0.0699194f,   -0.0811722f,  -0.0866096f,  0.139289f,
+  0.296604f,    0.192293f,    -0.0589607f,  -0.179878f,   0.00360266f,
+  -0.0905794f,  0.136744f,    -0.191555f,   1.31877f,     -0.0592033f,
+  -0.158766f,   0.0214746f,   -0.190113f,   -0.116671f,   0.0449292f,
+  -0.109533f,   -0.709307f,   0.386424f,    0.40201f,     0.262211f,
+  -0.155244f,   0.233988f,    -0.0166317f,  0.462665f,    0.0484462f,
+  0.210902f,    -0.352798f,   0.38698f,     -0.228261f,   -0.084309f,
+  -0.220751f,   -0.170879f,   -0.352617f,   -1.24277f,    0.266004f,
+  -0.0125749f,  -0.0380073f,  0.101838f,    -0.0483024f,  -0.0629178f,
+  -0.0695577f,  -0.103439f,   0.242131f,    -0.0796858f,  0.349718f,
+  -0.332045f,   0.0138352f,   -0.380235f,   -0.28717f,    -0.176276f,
+  0.865903f,    0.36593f,     0.243925f,    -0.422289f,   -0.117327f,
+  0.21876f,     0.245393f,    -0.426134f,   -0.186077f,   0.0352515f,
+  -0.123742f,   0.249376f,    1.3281f,      0.0707771f,   0.071415f,
+  -0.286827f,   -0.131691f,   -0.270881f,   -0.434378f,   0.376064f,
+  0.35966f,     0.513374f,    0.439378f,    -0.222716f,   -0.5874f,
+  0.487997f,    -0.293271f,   -0.184245f,   -0.037256f,   0.17723f,
+  -0.438651f,   0.428184f,    0.112983f,    -0.449287f,   -0.0451963f,
+  0.0854929f,   0.0735442f,   -0.0148642f,  -0.0586782f,  -0.176455f,
+  -0.438979f,   -0.127109f,   0.211478f,    0.388035f,    -0.0372021f,
+  0.220575f,    0.382144f,    0.302121f,    0.0857121f,   0.193445f,
+  -0.488858f,   -0.195288f,   -0.316184f,   -0.314026f,   -0.111956f,
+  0.0744768f,   0.292709f,    0.30187f,     -0.285506f,   -0.105006f,
+  0.0851402f,   -0.082318f,   0.277518f,    0.725294f,    -0.756304f,
+  0.0155309f,   -0.378542f,   0.293377f,    -0.347252f,   -0.338458f,
+  0.221449f,    -0.176443f,   -0.131972f,   0.0129163f,   -0.290649f,
+  0.198596f,    -0.0721333f,  0.620591f,    0.568736f,    0.174001f,
+  -0.205186f,   -0.265606f,   -0.249155f,   0.299163f,    1.11842f,
+  0.17423f,     0.196417f,    -0.014484f,   0.0735422f,   0.26329f,
+  0.12284f,     -0.750305f,   -0.351337f,   0.121994f,    -0.00542878f,
+  -0.295707f,   -0.094124f,   0.300993f,    0.412408f,    -0.170761f,
+  -0.0676329f,  -0.106638f,   -0.419785f,   -0.43878f,    0.22421f,
+  0.0339903f,   0.619851f,    0.0615381f,   0.514631f,    1.35424f,
+  -0.0679228f,  -0.203457f,   0.131948f,    -0.0041251f,  -0.209054f
+};
+
+static const float av1_simple_motion_search_prune_part_logits_bias_16[] = {
+  0.304025f,  0.131887f, 0.259279f,  -0.561564f, -0.161729f,
+  -0.208036f, 0.102206f, -0.162937f, -1.42311f,  -0.708305f
 };
 
 static const NN_CONFIG av1_simple_motion_search_prune_part_nn_config_16 = {
@@ -3648,135 +3884,210 @@
 #undef NUM_LAYER_0_UNITS_16
 #undef NUM_LOGITS_16
 
-// BLOCK_8X8
 #define NUM_HIDDEN_LAYERS_8 1
-#define NUM_FEATURES_8 19
-#define NUM_LAYER_0_UNITS_8 24
+#define NUM_FEATURES_8 25
+#define NUM_LAYER_0_UNITS_8 32
 #define NUM_LOGITS_8 4
 
 static const float av1_simple_motion_search_prune_part_logits_kernel_8[] = {
-  -0.806717f,  0.0244927f,  -0.0280725f, 0.210426f,   0.0820434f,  -0.0222324f,
-  -0.0728984f, -0.424785f,  -0.0568035f, -0.0744017f, 0.204282f,   0.43611f,
-  0.319456f,   0.119903f,   -0.333224f,  -0.932499f,  0.105907f,   0.0905287f,
-  -0.612538f,  0.0978191f,  -0.0858663f, 0.0468925f,  -0.312509f,  0.0527469f,
-  0.308466f,   -0.139768f,  -0.468023f,  -0.069522f,  0.248949f,   0.0408582f,
-  0.199935f,   -0.448705f,  0.242315f,   0.00472276f, -0.468445f,  -0.591226f,
-  0.107975f,   0.261228f,   -0.10724f,   0.104639f,   -0.211234f,  -0.304658f,
-  -0.261689f,  -0.259529f,  0.0331369f,  -0.468468f,  -0.0555605f, -0.0495414f,
-  0.247612f,   -0.112518f,  -0.393122f,  0.302172f,   -0.252151f,  0.076605f,
-  -0.34155f,   -0.182731f,  0.154079f,   -0.464538f,  -0.396327f,  -0.654858f,
-  0.0921198f,  0.202867f,   -0.0712573f, 0.0349611f,  0.243043f,   -0.177452f,
-  -0.205536f,  -0.268024f,  0.0358315f,  -0.560347f,  -0.204207f,  -0.0890628f,
-  -1.013f,     -0.461748f,  -0.429801f,  -0.100352f,  -0.34369f,   0.115318f,
-  -0.556285f,  -0.0751575f, 0.183418f,   -0.285223f,  0.197177f,   -0.825216f,
-  -0.125709f,  -0.100452f,  0.180481f,   0.764462f,   0.136609f,   -0.660743f,
-  0.212887f,   -0.410408f,  -0.330839f,  -0.714646f,  -0.115863f,  -0.389509f
-};
-
-static const float av1_simple_motion_search_prune_part_layer_0_kernel_8[] = {
-  0.0561017f,   0.530692f,    0.129047f,   0.296138f,   0.407593f,
-  0.151159f,    0.180472f,    0.298995f,   -0.0265362f, -0.380313f,
-  -0.136716f,   -0.0644648f,  0.00808564f, 0.0875876f,  -0.0719683f,
-  -0.0996071f,  -1.49722f,    -1.31176f,   1.54169f,    -0.50717f,
-  -0.0186767f,  -0.525924f,   0.0402954f,  -0.553913f,  0.139015f,
-  0.171752f,    -0.376497f,   0.485084f,   0.182424f,   -0.0236465f,
-  0.380048f,    -0.185493f,   0.554435f,   0.241565f,   -0.225917f,
-  -1.08637f,    -0.305121f,   1.3603f,     0.0806333f,  -0.0697466f,
-  0.216192f,    0.0493694f,   0.0620039f,  -0.0042489f, 0.0707283f,
-  0.0998331f,   -0.0252022f,  0.342077f,   -0.200664f,  0.335261f,
-  -0.100772f,   0.212881f,    -0.374258f,  0.310442f,   -1.95981f,
-  -1.16615f,    1.88243f,     0.503536f,   -0.0919037f, 0.392323f,
-  0.33149f,     0.563121f,    -0.0898854f, 0.130267f,   0.404959f,
-  1.06767f,     0.75134f,     0.810919f,   0.865237f,   -1.08001f,
-  -0.949809f,   -1.24941f,    -0.95081f,   -0.539575f,  -0.355324f,
-  -0.110592f,   -0.311277f,   0.023022f,   -0.039287f,  0.491298f,
-  -0.248853f,   -0.294741f,   0.288811f,   0.470638f,   0.330094f,
-  0.146603f,    0.0958486f,   0.308326f,   -0.87134f,   -1.06074f,
-  -0.315428f,   0.717577f,    -0.0174599f, -0.491904f,  0.977014f,
-  0.922693f,    0.0265707f,   -0.743468f,  -0.273647f,  -0.430625f,
-  -0.473789f,   0.119983f,    0.476441f,   0.639803f,   -0.0753475f,
-  -0.0746323f,  -0.0422539f,  0.013454f,   -0.0174412f, -0.253015f,
-  -0.279585f,   0.11562f,     -0.396919f,  0.306388f,   0.430346f,
-  0.275945f,    -0.196508f,   0.00180146f, 0.396652f,   0.324022f,
-  -0.142132f,   0.1768f,      -0.0746152f, 0.314189f,   -0.031924f,
-  0.254196f,    -0.253449f,   0.1537f,     -0.98635f,   -0.850926f,
-  0.0762147f,   -0.652507f,   1.16528f,    -0.122595f,  -0.00561333f,
-  0.424954f,    -0.00258127f, -0.421957f,  -0.0714059f, 0.782031f,
-  -0.0129133f,  -0.00544328f, -0.193527f,  -0.0936037f, -0.00490983f,
-  -0.852396f,   -0.649662f,   0.820325f,   0.484966f,   0.265405f,
-  -0.33032f,    0.104917f,    -0.364478f,  0.26858f,    0.068847f,
-  -0.0751046f,  0.238931f,    -0.151554f,  0.0296385f,  -0.14869f,
-  -0.173547f,   -0.397285f,   0.0561029f,  -0.0681254f, 0.222631f,
-  -0.00800993f, 0.0686761f,   0.196754f,   0.249358f,   0.348125f,
-  -2.22757f,    0.186675f,    -0.0426998f, 0.123301f,   -0.0196412f,
-  0.104882f,    0.138482f,    0.340663f,   0.0684671f,  -1.22841f,
-  -1.08539f,    -1.1055f,     -0.732678f,  0.766626f,   0.727742f,
-  1.26906f,     0.812594f,    -0.446312f,  -0.166752f,  0.396628f,
-  0.00141587f,  0.0137288f,   -0.0920456f, 0.123027f,   -0.118517f,
-  -0.0412321f,  -0.124952f,   0.00875945f, 0.0149883f,  -0.0218859f,
-  -0.233299f,   -0.0812722f,  0.269917f,   0.0246593f,  0.0915655f,
-  -0.019122f,   0.706718f,    -0.172051f,  -1.85551f,   0.0578997f,
-  0.100269f,    0.131412f,    -0.0952751f, 0.181419f,   -0.0106305f,
-  0.106179f,    -0.142344f,   0.0916649f,  -0.41298f,   0.113846f,
-  -0.322459f,   0.0415754f,   -0.2205f,    -0.224231f,  0.147907f,
-  -0.135093f,   -0.398757f,   1.93381f,    0.20456f,    -0.205381f,
-  -0.263999f,   0.364463f,    -0.424052f,  -0.0166924f, -0.319968f,
-  0.0439144f,   -0.692733f,   0.678982f,   -0.445194f,  -0.527451f,
-  0.383248f,    0.330927f,    -0.0367725f, 0.572847f,   -0.620804f,
-  -0.286471f,   1.39367f,     0.470732f,   0.0751676f,  0.637958f,
-  0.574865f,    0.411091f,    0.263806f,   0.555064f,   0.047788f,
-  0.201792f,    -0.0821822f,  -0.0226181f, -0.176679f,  -0.612642f,
-  -0.992254f,   -0.292099f,   -0.562201f,  -0.567948f,  -0.767681f,
-  1.33645f,     0.0932564f,   -0.421675f,  0.198262f,   -0.401979f,
-  0.244609f,    -0.261484f,   0.0304534f,  -0.200004f,  0.00951232f,
-  -0.085364f,   0.555152f,    -0.243778f,  0.371369f,   0.152997f,
-  0.154443f,    -0.281229f,   0.967176f,   1.0212f,     0.276169f,
-  0.0962747f,   0.449737f,    0.300859f,   0.376659f,   0.165669f,
-  0.332263f,    0.238315f,    0.376668f,   -0.139238f,  -0.0694765f,
-  -0.256137f,   -0.262146f,   -0.246265f,  0.0261978f,  -0.118975f,
-  -0.207184f,   -0.614041f,   -0.866987f,  -1.75604f,   -0.04917f,
-  0.0794673f,   -0.355224f,   0.0035685f,  -0.340216f,  0.398567f,
-  -0.314826f,   -0.12464f,    0.693428f,   0.701697f,   0.511653f,
-  0.861303f,    -0.64449f,    -1.06257f,   -0.773944f,  -0.838084f,
-  0.802429f,    -0.24573f,    0.720913f,   -0.31002f,   0.615694f,
-  0.287994f,    0.18495f,     0.0188525f,  0.374338f,   -0.12243f,
-  0.613532f,    0.132456f,    0.177285f,   -0.187238f,  0.0872563f,
-  -0.425068f,   0.154711f,    -0.24283f,   -0.193267f,  -1.14008f,
-  -1.17759f,    0.517845f,    0.458782f,   -0.161137f,  0.142772f,
-  0.2811f,      0.171871f,    0.276129f,   0.018275f,   0.390464f,
-  -0.156414f,   0.108248f,    -0.0909085f, -0.11346f,   0.0815138f,
-  0.0729377f,   -0.0769677f,  0.0110251f,  -0.46098f,   -0.421538f,
-  -2.18003f,    0.6639f,      0.541278f,   0.704337f,   0.480695f,
-  0.727474f,    0.473937f,    0.770863f,   0.41774f,    -0.112943f,
-  -0.107412f,   0.083639f,    -0.351127f,  -0.149221f,  0.0705735f,
-  -0.0908294f,  -0.0789572f,  -1.62533f,   -2.14051f,   -0.188871f,
-  0.796224f,    0.00144302f,  0.467569f,   -0.113915f,  0.660595f,
-  0.101025f,    0.020895f,    0.604505f,   -0.26598f,   -0.149282f,
-  -0.548818f,   -0.140463f,   0.13669f,    -0.0955724f, -0.694851f,
-  -0.13438f,    -0.384164f,   -0.600513f,  1.48183f,    0.16481f,
-  0.340894f,    -0.190813f,   0.487458f,   0.0769957f,  0.192901f,
-  0.039483f,    0.213366f,    -0.508968f,  -0.494034f,  -0.987906f,
-  -0.188502f,   -0.907188f,   0.0109838f,  -0.275008f,  -0.331017f,
-  -0.447202f,   0.0521897f,   0.837215f,   0.344802f,   0.216526f,
-  0.456105f,    0.139706f,    -0.373955f,  0.0232853f,  -0.365632f,
-  -0.0586727f,  0.828841f,    0.737974f,   -0.933899f,  -0.0620807f,
-  -0.262087f,   -0.0551274f,  -0.374378f,  0.118385f,   -0.0375933f,
-  -0.39549f,    -0.0844191f,  0.274343f,   0.21814f,    0.52751f,
-  0.449546f,    0.075518f,    0.369501f,   0.345248f,   0.403972f,
-  -0.465168f,   -0.551238f,   -0.354305f,  -0.233872f,  0.664137f,
-  -0.214848f,   -0.0363864f,  0.446154f,   -0.500073f,  -1.07883f,
-  -1.07772f
-};
-
-static const float av1_simple_motion_search_prune_part_logits_bias_8[] = {
-  1.09425f, -0.345875f, -0.56098f, -1.84859f
+  -0.266303f,  -0.387676f,  0.204501f,   -0.120842f,  -0.0752326f, 0.0337739f,
+  0.0243477f,  -0.356748f,  0.0143051f,  -0.16403f,   -0.139013f,  0.175003f,
+  -0.206754f,  0.349059f,   0.181763f,   0.212768f,   -0.313783f,  0.182829f,
+  0.00205376f, -0.939525f,  -0.0992424f, 0.306254f,   0.083329f,   -0.133137f,
+  -0.179022f,  -0.0237902f, 0.0601026f,  -0.216698f,  -0.551149f,  0.081711f,
+  -0.442191f,  0.0680832f,  -0.0353678f, 0.237704f,   0.23155f,    -0.36097f,
+  0.123389f,   -0.288927f,  0.178133f,   -0.152222f,  -0.235648f,  -0.0495293f,
+  -0.316522f,  0.034207f,   0.0463139f,  -0.817825f,  0.417443f,   -0.110984f,
+  -0.402371f,  0.0341694f,  -0.37383f,   0.414532f,   0.093993f,   0.0039505f,
+  0.0803175f,  -0.511859f,  -0.0154802f, 0.0979595f,  0.0909049f,  -0.120938f,
+  -0.577382f,  -0.155041f,  -0.404295f,  0.122223f,   -0.084703f,  0.00415336f,
+  0.149135f,   0.113219f,   0.124236f,   -0.240905f,  0.163909f,   -0.154202f,
+  -0.208917f,  0.00200158f, -0.71796f,   0.105984f,   -0.131996f,  -0.539603f,
+  0.223768f,   -0.0710733f, -0.346679f,  -0.0745909f, 0.171032f,   0.215701f,
+  0.218519f,   0.105981f,   -0.096209f,  -0.166453f,  -0.468894f,  -0.401578f,
+  -0.239222f,  0.111382f,   0.38747f,    -0.164734f,  -0.175955f,  0.336621f,
+  -0.0305501f, -0.0576765f, 0.0672671f,  -0.183692f,  0.412082f,   -0.262951f,
+  -0.153429f,  -0.128589f,  -0.530472f,  0.0936412f,  -1.08296f,   -0.45147f,
+  0.0714904f,  -3.96842f,   0.438125f,   -0.313945f,  0.231104f,   -0.00183851f,
+  -0.0192768f, -0.637531f,  -0.109296f,  0.0531702f,  0.00262162f, -0.615951f,
+  -0.546241f,  -0.635305f,  -0.0762367f, 0.0122019f,  0.423693f,   -0.129142f,
+  -0.112242f,  0.295184f
 };
 
 static const float av1_simple_motion_search_prune_part_layer_0_bias_8[] = {
-  -1.75332f, 0.419404f,  -0.0423004f, 0.345601f, -2.40097f,  -0.574857f,
-  -2.53366f, -0.207096f, -1.08866f,   0.801763f, -2.72428f,  -2.39884f,
-  1.04072f,  -0.782749f, -1.47003f,   -2.98207f, 0.8829f,    1.81741f,
-  -2.02369f, 0.241717f,  -0.178749f,  -3.00588f, -0.232007f, 0.21717f
+  -2.16023f,  -3.12831f, -0.213206f,  -2.97875f, -1.83791f, -2.84713f,
+  -0.909636f, -2.05893f, 0.00525274f, -1.51672f, -3.95017f, 1.82847f,
+  -0.853224f, -3.29503f, -0.537517f,  0.923106f, -3.18665f, -1.29905f,
+  1.64506f,   -1.99848f, -2.24315f,   0.408613f, 0.503671f, -3.83393f,
+  -2.88388f,  -3.52337f, 1.46818f,    -1.67169f, -3.83253f, 1.52644f,
+  -0.490783f, -0.415782f
+};
+
+static const float av1_simple_motion_search_prune_part_layer_0_kernel_8[] = {
+  -0.702198f,  -0.102148f,   0.0564545f,   -0.0555548f,  0.16184f,
+  0.0950792f,  0.136974f,    -0.00824146f, 0.05746f,     0.0447542f,
+  0.145978f,   0.0855769f,   -0.041449f,   0.301347f,    -0.0206691f,
+  -0.0662514f, -0.0525079f,  -0.0998387f,  -0.0891438f,  0.110545f,
+  -0.863098f,  -1.83798f,    0.238818f,    0.127797f,    0.116872f,
+  -0.270655f,  -0.21057f,    0.197013f,    -0.123332f,   0.137104f,
+  -0.174766f,  -0.00803025f, 0.0234369f,   -0.0894175f,  -0.0380927f,
+  0.00827928f, -0.134148f,   0.110575f,    -0.250173f,   0.116273f,
+  0.0197749f,  0.270391f,    0.108437f,    0.173197f,    -0.0650348f,
+  0.0884626f,  0.262792f,    0.0649228f,   0.5573f,      -2.81315f,
+  -0.479801f,  -1.15825f,    0.0807932f,   -0.19144f,    0.404016f,
+  -0.211521f,  0.233269f,    -0.391414f,   0.160381f,    -0.277233f,
+  0.426354f,   0.156839f,    0.494315f,    -0.214259f,   -0.0132062f,
+  0.148628f,   -0.0899568f,  0.161845f,    0.467689f,    0.229474f,
+  0.590634f,   -0.705793f,   -0.0486113f,  -0.439088f,   0.994566f,
+  0.679065f,   0.777869f,    -0.225291f,   -0.0303006f,  -0.638782f,
+  -0.0824632f, -0.128561f,   -0.327603f,   0.105624f,    0.567581f,
+  -0.396135f,  -0.471028f,   0.181286f,    0.274604f,    0.180169f,
+  0.0612144f,  -0.865004f,   0.0306804f,   0.142985f,    -0.0914358f,
+  -0.243284f,  0.358359f,    -0.443847f,   -0.371978f,   0.606933f,
+  -0.900408f,  -0.52076f,    0.472118f,    0.0610973f,   0.152526f,
+  -0.550379f,  0.309331f,    -0.141573f,   0.203046f,    -0.231485f,
+  0.505156f,   0.393224f,    0.435487f,    -0.218681f,   0.123707f,
+  -0.270383f,  -0.033565f,   0.210373f,    -2.33967f,    0.367434f,
+  0.0308118f,  -0.205771f,   0.546141f,    0.19837f,     0.035648f,
+  -0.467007f,  -1.50995f,    -0.0314176f,  0.11762f,     -0.15307f,
+  0.618257f,   -0.139502f,   0.303386f,    -0.00758681f, 0.228107f,
+  -0.594499f,  -0.201984f,   -0.239666f,   0.114878f,    -0.922174f,
+  -0.530137f,  -0.379366f,   -0.319582f,   0.0889624f,   -0.00544663f,
+  0.316264f,   -0.204262f,   -0.0959358f,  0.23552f,     0.141369f,
+  -0.207129f,  -1.04067f,    -0.0780501f,  0.226768f,    -0.246752f,
+  0.0823105f,  0.114783f,    0.49315f,     0.0197732f,   0.705433f,
+  0.158076f,   -0.250584f,   -0.157326f,   -0.0439547f,  -0.139047f,
+  0.090531f,   -0.38833f,    0.743143f,    -1.47418f,    -0.155009f,
+  0.511466f,   -0.726716f,   -0.181075f,   0.450133f,    -0.390204f,
+  0.292725f,   0.00811462f,  -0.347738f,   0.613381f,    -0.237124f,
+  0.750748f,   -0.383123f,   0.410309f,    -0.204166f,   0.667199f,
+  -0.313197f,  0.436059f,    -0.607571f,   0.193681f,    0.409399f,
+  0.631747f,   -0.0454149f,  0.198232f,    0.345591f,    -0.0137374f,
+  -0.307014f,  -0.535515f,   0.764678f,    -0.225686f,   -0.451621f,
+  -2.75564f,   -1.52877f,    0.0511933f,   0.905979f,    0.145029f,
+  0.759615f,   0.130166f,    0.83827f,     0.0655081f,   1.07555f,
+  -0.529777f,  0.682967f,    -0.412052f,   0.611947f,    -0.83676f,
+  0.940695f,   -0.465681f,   0.51505f,     -0.883659f,   -0.105524f,
+  -0.0344173f, -0.0683618f,  -0.00698688f, -0.139349f,   0.135741f,
+  -0.294455f,  -0.377834f,   -0.602084f,   -1.00128f,    0.483291f,
+  1.25327f,    0.178987f,    0.75068f,     -0.520731f,   -0.325517f,
+  0.272032f,   0.144144f,    -0.279453f,   0.564907f,    0.144036f,
+  0.297448f,   -0.504243f,   -0.250508f,   -1.26395f,    0.4816f,
+  0.392771f,   -0.389961f,   -0.261585f,   -0.127124f,   -0.202945f,
+  -0.709716f,  -0.174719f,   0.113613f,    0.477753f,    -0.226659f,
+  0.0697828f,  -0.177994f,   0.300726f,    -0.185504f,   0.339424f,
+  -0.316746f,  0.369693f,    -0.339723f,   -0.143886f,   -0.0326589f,
+  -0.268761f,  -0.241094f,   0.284876f,    -0.0270867f,  -0.207397f,
+  -1.42738f,   0.495612f,    -0.0277732f,  0.199675f,    1.48638f,
+  -0.659257f,  -1.28199f,    0.498702f,    0.140695f,    0.571152f,
+  0.416368f,   0.14153f,     0.126876f,    0.521114f,    -0.00150571f,
+  0.375581f,   0.00537624f,  0.1286f,      -0.332227f,   0.417663f,
+  -0.539023f,  0.217124f,    -0.787111f,   -0.0335266f,  1.56751f,
+  0.0640563f,  -0.158791f,   0.118195f,    0.000970493f, -0.0403852f,
+  -0.0572557f, -0.0201181f,  -0.10255f,    0.63237f,     0.156662f,
+  0.418696f,   -0.274802f,   -0.663923f,   -0.375232f,   -0.40846f,
+  0.462092f,   1.2176f,      -0.301532f,   -0.779704f,   -0.112876f,
+  0.0806591f,  -0.0141923f,  0.00960801f,  -0.663557f,   0.0979948f,
+  -0.0575999f, -0.012847f,   0.0403853f,   -0.133666f,   -0.00330217f,
+  -0.931518f,  -0.774599f,   -0.21391f,    0.377601f,    -0.183365f,
+  0.299094f,   0.0238552f,   0.206716f,    -0.18959f,    0.346013f,
+  -0.150991f,  -0.192817f,   -0.293962f,   -0.0537604f,  -0.0648171f,
+  -0.275941f,  -0.144854f,   -0.224092f,   2.43113f,     0.0422494f,
+  -0.047236f,  -0.0262028f,  0.0282119f,   -0.175553f,   0.0888502f,
+  0.580682f,   0.951055f,    -0.284441f,   -0.120133f,   -0.268058f,
+  -0.312083f,  -0.411556f,   0.21431f,     -0.28033f,    0.324851f,
+  -1.02787f,   -0.936816f,   -0.577628f,   0.544743f,    0.295807f,
+  0.406157f,   0.447927f,    0.25369f,     -0.811421f,   -0.0424979f,
+  -0.189867f,  0.00778673f,  -0.113587f,   -0.116175f,   -0.0542222f,
+  -1.80089f,   -1.44175f,    -0.35332f,    0.191314f,    -0.236691f,
+  -0.0261926f, -0.502363f,   0.252278f,    -0.485478f,   0.296495f,
+  0.455612f,   -0.0489631f,  0.227255f,    0.170975f,    0.473487f,
+  0.257812f,   0.178048f,    0.2506f,      2.04637f,     -0.173857f,
+  0.0583379f,  0.00765589f,  -0.025772f,   -0.162666f,   -0.016214f,
+  -0.607486f,  -0.0808025f,  0.0551611f,   -0.0772291f,  0.126421f,
+  0.10869f,    -0.0877463f,  -0.111527f,   -0.0775766f,  0.503886f,
+  -0.002757f,  -0.0421354f,  -0.247857f,   0.140827f,    0.383576f,
+  0.228232f,   -0.157877f,   -0.0927911f,  0.344687f,    0.191181f,
+  0.236533f,   0.00102869f,  -0.0184502f,  -1.4509f,     -1.15945f,
+  -0.521978f,  -0.643225f,   0.133139f,    0.0660321f,   0.0851957f,
+  0.0303648f,  0.0296239f,   0.0455713f,   0.175647f,    0.080532f,
+  0.0445691f,  -0.257356f,   -0.125602f,   -0.138829f,   -0.167057f,
+  -0.0992552f, -0.13944f,    0.507531f,    0.444997f,    0.221452f,
+  -0.308384f,  -0.327554f,   0.13235f,     2.1487f,      -1.15453f,
+  -0.280239f,  -0.363582f,   -0.00358745f, 0.012866f,    0.251088f,
+  0.0676416f,  0.178492f,    -0.136631f,   0.197938f,    -0.078198f,
+  0.812439f,   1.1173f,      0.712113f,    1.10124f,     -0.836503f,
+  -1.22433f,   -1.07894f,    -1.29215f,    0.56057f,     2.23928f,
+  -0.419029f,  0.282178f,    -0.0719266f,  -0.172192f,   0.28034f,
+  -2.99124f,   -2.01481f,    0.0688982f,   0.697466f,    0.00635555f,
+  0.566069f,   0.047534f,    0.507755f,    -0.00690707f, 0.712594f,
+  -0.191467f,  0.355733f,    -0.480016f,   0.664669f,    -0.390619f,
+  0.351199f,   -0.482342f,   0.325005f,    1.9089f,      0.155987f,
+  0.17032f,    0.132729f,    0.0402649f,   0.146991f,    0.0314905f,
+  -0.775316f,  -0.208892f,   -0.105993f,   0.0181653f,   -0.12735f,
+  0.0897852f,  0.0470231f,   0.25807f,     0.127406f,    -0.0893252f,
+  -0.279776f,  0.190844f,    0.110384f,    -0.148833f,   0.025293f,
+  0.239838f,   0.00932245f,  0.35103f,     -0.128268f,   -0.0536754f,
+  0.506899f,   -0.16793f,    0.0955582f,   -2.01108f,    0.721433f,
+  -2.31413f,   -2.08646f,    0.033315f,    0.689828f,    -0.271213f,
+  0.790425f,   -0.114234f,   0.755325f,    -0.211533f,   0.774544f,
+  -0.263268f,  0.795762f,    -0.551455f,   0.953602f,    -0.168454f,
+  0.529055f,   -0.768991f,   0.882371f,    0.29763f,     -0.155017f,
+  0.00464101f, 0.121093f,    0.948271f,    0.113138f,    -0.110332f,
+  -2.0492f,    -1.31322f,    -0.129212f,   0.464778f,    -0.181465f,
+  0.618403f,   0.0627984f,   0.465228f,    0.165729f,    0.278277f,
+  -0.563276f,  -0.358358f,   -0.590638f,   0.0104993f,   0.731206f,
+  0.752569f,   0.631615f,    0.811822f,    0.129804f,    -0.0558327f,
+  0.570081f,   -0.417922f,   -0.168275f,   0.0703671f,   0.269127f,
+  0.240457f,   -0.197159f,   -0.00179261f, 0.220065f,    0.463511f,
+  0.0714626f,  -0.716477f,   -0.441865f,   -0.717028f,   -0.149176f,
+  0.452182f,   0.662699f,    -0.906534f,   -0.817133f,   0.237747f,
+  0.26024f,    -7.7441e-05f, 0.0934616f,   0.824641f,    -0.0404494f,
+  -0.088297f,  -0.157899f,   0.037408f,    0.132435f,    -0.316155f,
+  -0.276785f,  0.0117868f,   0.185008f,    0.32369f,     -0.465855f,
+  -0.302127f,  0.303289f,    0.338597f,    -0.665408f,   -0.507594f,
+  0.526979f,   0.532091f,    0.234395f,    0.754063f,    0.116769f,
+  0.0800309f,  -0.939344f,   -1.51269f,    1.4583f,      0.178444f,
+  0.0106756f,  -0.213468f,   -0.00369439f, 0.071015f,    -0.192798f,
+  -0.0933147f, -0.129901f,   -0.368279f,   -0.246564f,   0.126966f,
+  0.478565f,   -0.476246f,   -0.762863f,   0.168883f,    0.536136f,
+  -0.272969f,  0.2573f,      -0.161577f,   0.311428f,    -0.777994f,
+  -1.29752f,   0.216046f,    0.329016f,    1.57265f,     0.168075f,
+  -0.192518f,  0.0829308f,   -0.073533f,   -0.0202034f,  0.114716f,
+  -0.34888f,   -0.519215f,   0.190809f,    0.0138507f,   0.133635f,
+  0.14194f,    0.410618f,    -0.165106f,   0.214438f,    0.0438265f,
+  -0.8481f,    -1.19182f,    -1.07878f,    -0.882217f,   0.45616f,
+  0.977385f,   0.74929f,     0.918466f,    0.904704f,    0.041938f,
+  0.0362776f,  0.0757255f,   1.14007f,     0.0516825f,   -0.160068f,
+  0.219535f,   0.638634f,    -0.0284544f,  -0.222849f,   -0.0344915f,
+  -0.0350256f, -0.0504452f,  -0.0458416f,  0.146099f,    0.0783083f,
+  0.206579f,   0.241264f,    0.28401f,     0.0425312f,   -0.802049f,
+  -0.746271f,  -0.578969f,   -0.078218f,   0.436176f,    -0.281465f,
+  -2.5539f,    0.237868f,    -0.121796f,   0.0715619f,   0.106992f,
+  -0.621862f,  -0.167142f,   0.153716f,    0.0570912f,   -0.06525f,
+  -0.923773f,  0.130759f,    0.0517066f,   0.0729862f,   -0.873064f,
+  0.0403328f,  -0.186499f,   -0.0831918f,  -0.223723f,   0.144697f,
+  0.212845f,   0.416876f,    0.361598f,    0.138229f,    0.0728777f,
+  -1.95419f,   -0.00382816f, -0.0440387f,  0.433627f,    0.44781f,
+  -1.05229f,   -1.54506f,    0.564827f,    -0.263456f,   0.296105f,
+  -0.158055f,  0.388274f,    -0.366639f,   0.212006f,    -0.245619f,
+  0.593064f,   0.088727f,    0.410632f,    -0.263462f,   0.507075f,
+  -0.0974155f, 0.275268f,    -0.1293f,     0.136679f,    1.98276f,
+  0.411766f,   0.391987f,    0.34283f,     -0.114077f,   0.258462f,
+  -0.302443f,  0.301138f,    -0.00726621f, 0.276441f,    -0.291582f,
+  0.66498f,    -0.321451f,   -0.332805f,   0.0943272f,   0.572253f,
+  -0.45818f,   -0.0219593f,  -0.151679f,   0.402033f,    -1.15502f,
+  -0.882955f,  0.772904f,    0.88126f,     -0.149555f,   0.709525f,
+  0.350116f,   -0.21531f,    0.797893f,    0.0230234f,   0.0203034f,
+  0.2744f,     1.08273f,     0.039349f,    0.503909f,    -0.45892f,
+  -0.579516f,  -0.344058f,   0.390628f,    -0.386941f,   -0.430317f,
+  -0.0807066f, 0.435906f,    0.522996f,    0.724476f,    -0.74371f,
+  -0.05376f,   -0.340898f,   -0.962646f,   -0.0278005f,  0.0981149f,
+  -0.0811161f, 0.00237994f,  0.850042f,    0.0665473f,   0.134413f
+};
+
+static const float av1_simple_motion_search_prune_part_logits_bias_8[] = {
+  1.63404f, -0.715866f, -1.0132f, -2.08745f
 };
 
 static const NN_CONFIG av1_simple_motion_search_prune_part_nn_config_8 = {