try fix warnings from clang-tidy

mqy · mqy · commit 3621657cad79 · 2023-05-29T09:35:54.000+08:00
diff --git a/examples/mulmat-tune/mulmat-tune-tool.c b/examples/mulmat-tune/mulmat-tune-tool.c
@@ -21,11 +21,11 @@
 
 static int tune_time_min(int *a, int len);
 static void print_blas_build_tips(void);
-static void progress(int i, int max);
+static void progress(int i, int n);
 static bool prompt_yes_no(const char *prompt);
 
-static void cmd_tune(struct ggml_mulmat_tune *b, int n_pass, bool verbose);
-static void cmd_analyze(struct ggml_mulmat_tune *b);
+static void cmd_tune(struct ggml_mulmat_tune *tune, int n_pass, bool verbose);
+static void cmd_analyze(struct ggml_mulmat_tune *tune);
 
 static void usage(char *prog) {
     const char *usage_lines[] = {
@@ -90,6 +90,7 @@ int main(int argc, char **argv) {
 
         {
             const char *name = ggml_get_blas_vendor();
+            GGML_ASSERT(name != NULL);
             int n = sizeof(tune.blas_vendor);
             strncpy(tune.blas_vendor, name, n - 1);
         }
@@ -274,9 +275,8 @@ int main(int argc, char **argv) {
                 model = arg_model;
             }
 
-            int rc;
-            if (rc = ggml_mulmat_tune_setup_model(&tune, model, m_num),
-                rc != 0) {
+            int rc = ggml_mulmat_tune_setup_model(&tune, model, m_num);
+            if (rc != 0) {
                 fprintf(stderr, "error: unknown model: %s\n", model);
                 usage(argv[0]);
                 exit(1);
@@ -371,6 +371,7 @@ void cmd_tune(struct ggml_mulmat_tune *tune, int n_pass, bool verbose) {
                 max_NxK = sz;
             }
         }
+        GGML_ASSERT(max_NxK > 0);
 
         // NOTE: proximate.
         size_t q_buf_size = 2 * max_NxK * sizeof(int64_t);
@@ -573,7 +574,8 @@ static bool prompt_yes_no(const char *prompt) {
         } else if (i == 2) {
             if (buf[0] == 'Y' || buf[0] == 'y') {
                 return true;
-            } else if (buf[0] == 'N' || buf[0] == 'n') {
+            }
+            if (buf[0] == 'N' || buf[0] == 'n') {
                 return false;
             }
         }
@@ -632,6 +634,7 @@ static void cmd_analyze(struct ggml_mulmat_tune *tune) {
             for (int ip = 0; ip < shape->n_profiles; ip++) {
                 const struct ggml_task_profile *profile = &shape->profiles[ip];
                 int *total_time = malloc(sizeof(int) * m_num);
+                memset(total_time, 0, sizeof(int) * m_num);
 
                 bool has_parallel = false;
                 for (int k = 0; k < 3; k++) {
diff --git a/examples/mulmat-tune/mulmat-tune.c b/examples/mulmat-tune/mulmat-tune.c
@@ -3,6 +3,8 @@
 #include "examples/mulmat-tune/mulmat-tune.h"
 #include "ggml.h"
 
+#define UNUSED(x) (void)(x)
+
 // TODO: this should be setup by llama instead.
 int ggml_mulmat_tune_setup_model(struct ggml_mulmat_tune *tune,
                                  const char *model_name, int m_num) {
@@ -129,10 +131,10 @@ int ggml_mulmat_tune_read_data(struct ggml_mulmat_tune *tune, FILE *fp) {
     for (int i_shape = 0; i_shape < tune->n_shapes; i_shape++) {
         struct ggml_mulmat_tune_shape *shape = &tune->shapes[i_shape];
 
-        if (rc = fscanf(fp, "%d %d %d %d %d %d", &shape->N, &shape->K,
-                        &shape->src0_type, &shape->src1_type,
-                        &shape->n_profiles, &shape->m_num),
-            rc <= 0) {
+        rc = fscanf(fp, "%d %d %d %d %d %d", &shape->N, &shape->K,
+                    &shape->src0_type, &shape->src1_type, &shape->n_profiles,
+                    &shape->m_num);
+        if (rc <= 0) {
             return rc;
         }
 
@@ -159,8 +161,8 @@ int ggml_mulmat_tune_read_data(struct ggml_mulmat_tune *tune, FILE *fp) {
             for (int j = 0; j < 3; j++) {
                 struct ggml_task_stage *ts = &profile->stages[j];
                 int backend, parallel, wait;
-                if (rc = fscanf(fp, "%d %d %d", &backend, &parallel, &wait),
-                    rc <= 0) {
+                rc = fscanf(fp, "%d %d %d", &backend, &parallel, &wait);
+                if (rc <= 0) {
                     return rc;
                 }
                 ts->backend = backend;
@@ -173,16 +175,17 @@ int ggml_mulmat_tune_read_data(struct ggml_mulmat_tune *tune, FILE *fp) {
             int M;
             for (int ip = 0; ip < shape->n_profiles; ip++) {
                 if (ip == 0) {
-                    if (rc = fscanf(fp, "%d", &M), rc <= 0) {
+                    rc = fscanf(fp, "%d", &M);
+                    if (rc <= 0) {
                         return rc;
                     }
                 }
                 struct ggml_mulmat_tune_m *item =
                     &shape->items[ip * shape->m_num + i_m];
                 item->M = M;
-                if (rc = fscanf(fp, "%d %d %d", &item->stages_time[0],
-                                &item->stages_time[1], &item->stages_time[2]),
-                    rc <= 0) {
+                rc = fscanf(fp, "%d %d %d", &item->stages_time[0],
+                            &item->stages_time[1], &item->stages_time[2]);
+                if (rc <= 0) {
                     return rc;
                 }
             }
@@ -194,10 +197,10 @@ int ggml_mulmat_tune_read_data(struct ggml_mulmat_tune *tune, FILE *fp) {
 
 int ggml_mulmat_tune_write_data(const struct ggml_mulmat_tune *tune, FILE *fp) {
     int rc;
-    if (rc = fprintf(fp, "%d %s %d %s %d %s %d\n\n", tune->version, tune->model,
-                     tune->type, tune->type_name, tune->backend,
-                     tune->blas_vendor, tune->n_shapes),
-        rc <= 0) {
+    rc = fprintf(fp, "%d %s %d %s %d %s %d\n\n", tune->version, tune->model,
+                 tune->type, tune->type_name, tune->backend, tune->blas_vendor,
+                 tune->n_shapes);
+    if (rc <= 0) {
         return rc;
     }
 
@@ -206,29 +209,31 @@ int ggml_mulmat_tune_write_data(const struct ggml_mulmat_tune *tune, FILE *fp) {
             printf("\n");
         }
         const struct ggml_mulmat_tune_shape *shape = &tune->shapes[i_shape];
-        if (rc = fprintf(fp, "%d %d  %d %d %d %d\n", shape->N, shape->K,
-                         shape->src0_type, shape->src1_type, shape->n_profiles,
-                         shape->m_num),
-            rc <= 0) {
+        rc = fprintf(fp, "%d %d  %d %d %d %d\n", shape->N, shape->K,
+                     shape->src0_type, shape->src1_type, shape->n_profiles,
+                     shape->m_num);
+        if (rc <= 0) {
             return rc;
         }
 
         for (int i = 0; i < shape->n_profiles; i++) {
             struct ggml_task_profile *profile = &shape->profiles[i];
             for (int j = 0; j < 3; j++) {
                 struct ggml_task_stage *ts = &profile->stages[j];
-                if (rc = fprintf(fp, "%2d %d %d", ts->backend,
-                                 ts->parallel ? 1 : 0, ts->wait ? 1 : 0),
-                    rc <= 0) {
+                rc = fprintf(fp, "%2d %d %d", ts->backend, ts->parallel ? 1 : 0,
+                             ts->wait ? 1 : 0);
+                if (rc <= 0) {
                     return rc;
                 }
                 if (j < 2) {
-                    if (rc = fprintf(fp, "  "), rc <= 0) {
+                    rc = fprintf(fp, "  ");
+                    if (rc <= 0) {
                         return rc;
                     }
                 }
             }
-            if (rc = fprintf(fp, "\n"), rc <= 0) {
+            rc = fprintf(fp, "\n");
+            if (rc <= 0) {
                 return rc;
             }
         }
@@ -238,26 +243,29 @@ int ggml_mulmat_tune_write_data(const struct ggml_mulmat_tune *tune, FILE *fp) {
                 struct ggml_mulmat_tune_m *item =
                     &shape->items[ip * shape->m_num + i_m];
                 if (ip == 0) {
-                    if (rc = fprintf(fp, "%4d", item->M), rc <= 0) {
+                    rc = fprintf(fp, "%4d", item->M);
+                    if (rc <= 0) {
                         return rc;
                     }
                 }
 
                 struct ggml_task_profile *profile = &shape->profiles[ip];
                 for (int k = 0; k < 3; k++) {
                     if (profile->stages[k].backend != GGML_BACKEND_UNKNOWN) {
-                        if (rc = fprintf(fp, "%9d", item->stages_time[k]),
-                            rc <= 0) {
+                        rc = fprintf(fp, "%9d", item->stages_time[k]);
+                        if (rc <= 0) {
                             return rc;
                         }
                     } else {
-                        if (rc = fprintf(fp, " 0"), rc <= 0) {
+                        rc = fprintf(fp, " 0");
+                        if (rc <= 0) {
                             return rc;
                         }
                     }
                 }
             }
-            if (rc = fprintf(fp, "\n"), rc <= 0) {
+            rc = fprintf(fp, "\n");
+            if (rc <= 0) {
                 return rc;
             }
         }
@@ -366,13 +374,14 @@ void ggml_mulmat_tune_shape_estimate_time(
             int curr_v = curr->stages_time[stage];
 
             // t = aM + b
-            double a, b;
+            double a;
+            double b;
 
             if (prev == curr) {
                 a = 0.0;
                 b = curr_v;
             } else {
-                a = (curr_v - prev_v) / (curr->M - prev->M);
+                a = 1.0 * (curr_v - prev_v) / (curr->M - prev->M);
                 b = curr_v - a * curr->M;
             }
             double t = a * M + b;
@@ -405,7 +414,7 @@ const char *ggml_get_backend_name(enum ggml_backend backend) {
 }
 
 const char *ggml_get_blas_vendor(void) {
-    const char *vendor;
+    const char *vendor = NULL;
 #if defined(GGML_USE_CUBLAS)
     vendor = "CUBLAS";
 #endif
@@ -441,6 +450,7 @@ enum ggml_backend ggml_auto_detect_backend(void) {
 
 int ggml_get_builtin_blas_backends(int backends[]) {
     if (!ggml_cpu_has_blas()) {
+        UNUSED(backends);
         return 0;
     }
 
@@ -573,7 +583,6 @@ int ggml_mulmat_get_task_profiles(struct ggml_task_profile **profiles,
     } else if (ggml_is_quantized(src0_type)) {
         *profiles = ggml_mulmat_task_profiles_qxx;
         return ggml_mulmat_task_profiles_qxx_n;
-    } else {
-        GGML_ASSERT(false);
     }
+    GGML_ASSERT(false);
 }
diff --git a/examples/mulmat-tune/mulmat-tune.h b/examples/mulmat-tune/mulmat-tune.h
@@ -83,7 +83,7 @@ int ggml_mulmat_tune_setup_model(struct ggml_mulmat_tune *tune,
 
 int ggml_mulmat_tune_write_data(const struct ggml_mulmat_tune *tune, FILE *fp);
 
-int ggml_mulmat_tune_read_data(struct ggml_mulmat_tune *tune, FILE *file);
+int ggml_mulmat_tune_read_data(struct ggml_mulmat_tune *tune, FILE *fp);
 
 const struct ggml_mulmat_tune_shape *
 ggml_mulmat_tune_get_shape(const struct ggml_mulmat_tune *tune, int N, int K,
diff --git a/ggml.c b/ggml.c
@@ -14269,7 +14269,8 @@ static inline void ggml_graph_compute_thread_setup_workers(
             struct ggml_task_stage *next = &profile->stages[i];
             if (next->parallel) {
                 break;
-            } else if (next->wait) {
+            }
+            if (next->wait) {
                 shared->wait_on_task_done = true;
                 GGML_PRINT_THREAD_DEBUG(">>>> wait_on_task_done is enabled\n");
                 break;
diff --git a/tests/test-mulmat-tune.c b/tests/test-mulmat-tune.c
@@ -189,8 +189,6 @@ void test_ggml_mulmat_tune_estimate_time_zero_NK(void) {
         .blas_vendor = "OpenBLAS",
     };
 
-    const int m_step = 2;
-    const int m_start = m_step;
     const int m_num = 2;
 
     ggml_mulmat_tune_setup_model(&tune, "7B", m_num);
