fix permute checker function

Author: Hakim7267

lib/src/private/src/mli_check.cc

@@ -2689,26 +2689,23 @@ mli_status mli_chk_permute_sa8 (const mli_tensor * in, const mli_permute_cfg * c
     if (in->el_params.sa.dim >= 0) {
         bool fail = false;
         if (out->el_params.sa.zero_point.mem.pi16 == in->el_params.sa.zero_point.mem.pi16)
-            fail |= MLI_CHECK((out->el_params.sa.zero_point.mem.pi16 == in->el_params.sa.zero_point.mem.pi16) \
-                    && (out->el_params.sa.scale.mem.pi16 == in->el_params.sa.scale.mem.pi16) \
+            fail |= MLI_CHECK((out->el_params.sa.scale.mem.pi16 == in->el_params.sa.scale.mem.pi16) \
                     && (out->el_params.sa.scale_frac_bits.mem.pi8 == in->el_params.sa.scale_frac_bits.mem.pi8),
                     "El_params data for out tensor wasn`t initialized in a consistent way");
-        if (out->el_params.sa.zero_point.mem.pi16 != in->el_params.sa.zero_point.mem.pi16)
-            fail |= MLI_CHECK((out->el_params.sa.zero_point.mem.pi16 != in->el_params.sa.zero_point.mem.pi16) \
-                    && (out->el_params.sa.scale.mem.pi16 != in->el_params.sa.scale.mem.pi16) \
-                    && (out->el_params.sa.scale_frac_bits.mem.pi8 != in->el_params.sa.scale_frac_bits.mem.pi8),
+        if (out->el_params.sa.zero_point.mem.pi16 != nullptr && out->el_params.sa.zero_point.mem.pi16 != in->el_params.sa.zero_point.mem.pi16)
+            fail |= MLI_CHECK((out->el_params.sa.scale.mem.pi16 != nullptr && out->el_params.sa.scale.mem.pi16 != in->el_params.sa.scale.mem.pi16) \
+                    && (out->el_params.sa.scale_frac_bits.mem.pi8 != nullptr && out->el_params.sa.scale_frac_bits.mem.pi8 != in->el_params.sa.scale_frac_bits.mem.pi8),
                     "El_params data for out tensor wasn`t initialized in a consistent way");
         if (out->el_params.sa.zero_point.mem.pi16 == nullptr)
-            fail |= MLI_CHECK((out->el_params.sa.zero_point.mem.pi16 == nullptr) \
-                    && (out->el_params.sa.scale.mem.pi16 == nullptr) \
+            fail |= MLI_CHECK((out->el_params.sa.scale.mem.pi16 == nullptr) \
                     && (out->el_params.sa.scale_frac_bits.mem.pi8 == nullptr),
                     "El_params data for out tensor wasn`t initialized in a consistent way");
 
         if (!fail && out->el_params.sa.zero_point.mem.pi16 != in->el_params.sa.zero_point.mem.pi16 \
                 && out->el_params.sa.zero_point.mem.pi16 != nullptr)
-            fail |= MLI_CHECK(out->el_params.sa.zero_point.capacity >= in->el_params.sa.zero_point.capacity \
-                    && out->el_params.sa.scale.capacity >= in->el_params.sa.scale.capacity \
-                    && out->el_params.sa.scale_frac_bits.capacity >= in->el_params.sa.scale_frac_bits.capacity,
+            fail |= MLI_CHECK(out->el_params.sa.zero_point.capacity >= (in->shape[in->el_params.sa.dim] * sizeof(int16_t)) \
+                    && out->el_params.sa.scale.capacity >= (in->shape[in->el_params.sa.dim] * sizeof(int16_t)) \
+                    && out->el_params.sa.scale_frac_bits.capacity >= (in->shape[in->el_params.sa.dim] * sizeof(int8_t)),
                     "Not enough memory allocated for quantization parameters");
         if (fail) return MLI_STATUS_SPEC_PARAM_MISMATCH;
     }
@@ -2837,6 +2834,16 @@ mli_status mli_chk_data_movement(const mli_tensor *in, const mli_mov_cfg_t *cfg,
                     && (out->el_params.sa.scale_frac_bits.mem.pi8 == nullptr),
                     "El_params data for out tensor wasn`t initialized in a consistent way");
 
+        //check that the configurations are valid
+        for (uint32_t i=0; i < in->rank; i++) {
+            if (MLI_CHECK((cfg->size[i] + cfg->offset[i]) <= in->shape[i] + cfg->padding_pre[i] + cfg->padding_post[i],"Size is larger than padded input"))
+                return MLI_STATUS_BAD_FUNC_CFG;
+            if (MLI_CHECK(cfg->sub_sample_step[i] > 0,"sub_sample_step should be greater than 0"))
+                return MLI_STATUS_BAD_FUNC_CFG;
+            if (MLI_CHECK(cfg->perm_dim[i] < in->rank,"permute out of range"))
+                return MLI_STATUS_BAD_FUNC_CFG;
+        }
+
         int32_t in_dim = in->el_params.sa.dim;
         int32_t out_dim = 0;
         for (int dim = 0; dim < (int)in->rank; dim++) {
@@ -2870,16 +2877,6 @@ mli_status mli_chk_data_movement(const mli_tensor *in, const mli_mov_cfg_t *cfg,
 
     }
 
-    //check that the configurations are valid
-    for (uint32_t i=0; i < in->rank; i++) {
-        if (MLI_CHECK((cfg->size[i] + cfg->offset[i]) <= in->shape[i] + cfg->padding_pre[i] + cfg->padding_post[i],"Size is larger than padded input"))
-            return MLI_STATUS_BAD_FUNC_CFG;
-        if (MLI_CHECK(cfg->sub_sample_step[i] > 0,"sub_sample_step should be greater than 0"))
-            return MLI_STATUS_BAD_FUNC_CFG;
-        if (MLI_CHECK(cfg->perm_dim[i] < in->rank,"permute out of range"))
-            return MLI_STATUS_BAD_FUNC_CFG;
-    }
-
     //check that input and output are not overlapped
     if (MLI_CHECK(mli_chk_tensors_not_overlapped(in, out),"in and out buffer must not be overlapped")) {
         return MLI_STATUS_INCOMPATEBLE_TENSORS;