Fix HiFi relu for int8

Differential Revision: D69542780

Pull Request resolved: pytorch/executorch#8424

Author: mcremon-meta

backends/cadence/hifi/operators/op_quantized_relu_out.cpp

@@ -26,11 +26,12 @@ void quantized_relu_per_tensor_out(
     const int64_t out_multiplier,
     const int64_t out_shift,
     Tensor& output) {
-  const uint8_t _in_zero_point = static_cast<uint8_t>(in_zero_point);
-  const uint8_t _out_zero_point = static_cast<uint8_t>(out_zero_point);
-  const int32_t _out_multiplier = static_cast<int32_t>(out_multiplier);
-  const int32_t _out_shift = static_cast<int32_t>(out_shift);
+    const int32_t _out_multiplier = static_cast<int32_t>(out_multiplier);
+    const int32_t _out_shift = static_cast<int32_t>(out_shift);
+
   if (input.scalar_type() == executorch::aten::ScalarType::Byte) {
+    const uint8_t _in_zero_point = static_cast<uint8_t>(in_zero_point);
+    const uint8_t _out_zero_point = static_cast<uint8_t>(out_zero_point);
     const uint8_t* p_in = input.const_data_ptr<uint8_t>();
     uint8_t* p_out = output.mutable_data_ptr<uint8_t>();
 
@@ -48,6 +49,8 @@ void quantized_relu_per_tensor_out(
     ET_CHECK_MSG(ret_val == 0, "An internal error occured");
 
   } else if (input.scalar_type() == executorch::aten::ScalarType::Char) {
+    const int8_t _in_zero_point = static_cast<int8_t>(in_zero_point);
+    const int8_t _out_zero_point = static_cast<int8_t>(out_zero_point);
     const int8_t* p_in = input.const_data_ptr<int8_t>();
     int8_t* p_out = output.mutable_data_ptr<int8_t>();
 
@@ -72,28 +75,6 @@ void quantized_relu_per_tensor_out(
   }
 }
 
-void quantized_relu_per_tensor_out(
-    KernelRuntimeContext& ctx,
-    const Tensor& input,
-    const Tensor& in_zero_point,
-    const int64_t out_zero_point,
-    const Tensor& out_multiplier,
-    const Tensor& out_shift,
-    Tensor& output) {
-  int8_t _in_zero_point = in_zero_point.const_data_ptr<int8_t>()[0];
-  int32_t _out_multiplier = out_multiplier.const_data_ptr<int32_t>()[0];
-  int32_t _out_shift = out_shift.const_data_ptr<int32_t>()[0];
-
-  quantized_relu_per_tensor_out(
-      ctx,
-      input,
-      _in_zero_point,
-      out_zero_point,
-      _out_multiplier,
-      _out_shift,
-      output);
-}
-
 } // namespace native
 } // namespace HiFi
 } // namespace impl