Manual LICM in op_convolution

kernels/portable/cpu/op_convolution.cpp

@@ -72,6 +72,13 @@ void conv2d_impl(
   exec_aten::SizesType w_coord[kTensorDimensionLimit];
   w_coord[0] = out_c;
 
+  const int64_t stride_y = val_at(stride, 0);
+  const int64_t padding_y = val_at(padding, 0, /*default_value=*/0);
+  const int64_t dilation_y = val_at(dilation, 0);
+  const int64_t stride_x = val_at(stride, 1);
+  const int64_t padding_x = val_at(padding, 1, /*default_value=*/0);
+  const int64_t dilation_x = val_at(dilation, 1);
+
   // Compute 2D output region
   for (size_t out_y = 0; out_y < out_H; ++out_y) {
     out_coord[2] = out_y;
@@ -87,19 +94,13 @@ void conv2d_impl(
         for (size_t w_y = 0; w_y < w_H; ++w_y) {
           w_coord[2] = w_y;
 
-          int64_t stride_y = val_at(stride, 0);
-          int64_t padding_y = val_at(padding, 0, /*default_value=*/0);
-          int64_t dilation_y = val_at(dilation, 0);
           size_t in_y = stride_y * out_y + dilation_y * w_y - padding_y;
           in_coord[2] = in_y;
           // Only proceed if input y coordinate is within bounds
           if (in_y >= 0 && in_y < in_H) {
             for (size_t w_x = 0; w_x < w_W; ++w_x) {
               w_coord[3] = w_x;
 
-              int64_t stride_x = val_at(stride, 1);
-              int64_t padding_x = val_at(padding, 1, /*default_value=*/0);
-              int64_t dilation_x = val_at(dilation, 1);
               size_t in_x = stride_x * out_x + dilation_x * w_x - padding_x;
               in_coord[3] = in_x;
 

kernels/portable/cpu/util/kernel_ops_util.cpp

@@ -46,16 +46,6 @@ bool param_array_is_valid(
 
 } // namespace
 
-int64_t val_at(IntArrayRef array, size_t i, int64_t default_value) {
-  if (array.size() == 1) {
-    return array[0];
-  } else if (array.size() > 1) {
-    return array[i];
-  } else {
-    return default_value;
-  }
-}
-
 bool int_array_all_ge(IntArrayRef array, int64_t val) {
   for (size_t i = 0; i < array.size(); ++i) {
     if (array[i] < val) {

kernels/portable/cpu/util/kernel_ops_util.h

@@ -20,7 +20,15 @@ namespace executor {
  * the first element will be returned regardless of what i is requested to
  * simulate broadcasting.
  */
-int64_t val_at(IntArrayRef array, size_t i, int64_t default_value = 1);
+inline int64_t val_at(IntArrayRef array, size_t i, int64_t default_value = 1) {
+  if (array.size() == 1) {
+    return array[0];
+  } else if (array.size() > 1) {
+    return array[i];
+  } else {
+    return default_value;
+  }
+}
 
 /**
  * Checks that all elements of an IntArray are greater than or equal to `val`.