Update

[ghstack-poisoned]

Author: swolchok

backends/arm/test/models/test_conformer.py

@@ -33,7 +33,7 @@ class TestConformer(unittest.TestCase):
         "executorch_exir_dialects_edge__ops_aten_max_default": 1,
         "executorch_exir_dialects_edge__ops_aten_eq_Scalar": 2,
         "executorch_exir_dialects_edge__ops_aten_where_self": 4,
-        "torch.ops.aten._assert_scalar.default": 10,
+        "torch.ops.aten._assert_scalar.default": 2,
         "torch.ops.aten._local_scalar_dense.default": 1,
         "torch.ops.higher_order.executorch_call_delegate": 6,
     }

backends/cadence/hifi/operators/op_add.cpp

@@ -143,14 +143,15 @@ Tensor& add_out(
 
   if ((a_dim == 0) && float_types) {
     for (int i = 0; i < b.numel(); i++)
-      out.mutable_data_ptr<float>()[i] =
-          a.const_data_ptr<float>()[0] + b.const_data_ptr<float>()[i];
+      out.mutable_data_ptr<float>()[i] = a.const_data_ptr<float>()[0] +
+          alpha_val * b.const_data_ptr<float>()[i];
     return out;
   }
   if ((b_dim == 0) && float_types) {
+    // Precompute the value of b * alpha since it's a constant.
+    const float val_b = alpha_val * b.const_data_ptr<float>()[0];
     for (int i = 0; i < a.numel(); i++)
-      out.mutable_data_ptr<float>()[i] =
-          a.const_data_ptr<float>()[i] + b.const_data_ptr<float>()[0];
+      out.mutable_data_ptr<float>()[i] = a.const_data_ptr<float>()[i] + val_b;
     return out;
   }
 

backends/cadence/hifi/operators/op_div.cpp

@@ -214,22 +214,6 @@ Tensor& div_out_mode(
   if ((a_type != ScalarType::Float) || (b_type != ScalarType::Float))
     optimized = 0;
 
-  bool float_types =
-      (a_type == ScalarType::Float) && (b_type == ScalarType::Float);
-
-  if ((a_dim == 0) && float_types) {
-    for (int i = 0; i < b.numel(); i++)
-      out.mutable_data_ptr<float>()[i] =
-          a.const_data_ptr<float>()[0] / b.const_data_ptr<float>()[i];
-    return out;
-  }
-  if ((b_dim == 0) && float_types) {
-    for (int i = 0; i < a.numel(); i++)
-      out.mutable_data_ptr<float>()[i] =
-          a.const_data_ptr<float>()[i] / b.const_data_ptr<float>()[0];
-    return out;
-  }
-
   if ((broadcast == 1) && (max_dim > kNnlibMaxDim))
     optimized = 0;
   int mode_val = -1;

backends/cadence/hifi/operators/op_sub.cpp

@@ -143,9 +143,10 @@ Tensor& sub_out(
     return out;
   }
   if ((b_dim == 0) && float_types) {
+    // Precompute the value of b * alpha since it's a constant.
+    const float val_b = alpha_val * b.const_data_ptr<float>()[0];
     for (int i = 0; i < a.numel(); i++)
-      out.mutable_data_ptr<float>()[i] =
-          a.const_data_ptr<float>()[i] - b.const_data_ptr<float>()[0];
+      out.mutable_data_ptr<float>()[i] = a.const_data_ptr<float>()[i] - val_b;
     return out;
   }