Changeset 2758 for trunk/src/kmk

Timestamp:

Jan 28, 2015, 2:03:58 PM (10 years ago)

Author:

bird

Message:

Some more variable stats I added the other day (not in release builds).

Location:

trunk/src/kmk

Files:

• function.c (modified) (2 diffs)
• main.c (modified) (2 diffs)
• make.h (modified) (1 diff)
• variable.c (modified) (8 diffs)
• variable.h (modified) (1 diff)

trunk/src/kmk/function.c

@@ -2043 +2043 @@
       size_t off;
       const struct floc *reading_file_saved = reading_file;
+#ifdef CONFIG_WITH_MAKE_STATS
+      unsigned long long uStartTick = CURRENT_CLOCK_TICK();
+      MAKE_STATS_2(v->cEvalVals++);
+#endif
 
       /* Make a copy of the value to the variable buffer since
@@ -2068 +2072 @@
         pop_variable_scope ();
       restore_variable_buffer (buf, len);
+
+      MAKE_STATS_2(v->cTicksEvalVal += CURRENT_CLOCK_TICK() - uStartTick);
     }
 

trunk/src/kmk/main.c

@@ -1368 +1368 @@
   PATH_VAR (current_directory);
   unsigned int restarts = 0;
+#ifdef CONFIG_WITH_MAKE_STATS
+  unsigned long long uStartTick = CURRENT_CLOCK_TICK();
+#endif
 #ifdef WINDOWS32
   char *unix_path = NULL;
@@ -2922 +2925 @@
              _("warning:  Clock skew detected.  Your build may be incomplete."));
 
+    MAKE_STATS_2(if (uStartTick) printf("main ticks elapsed: %ull\n", (unsigned long long)(CURRENT_CLOCK_TICK() - uStartTick)) );
     /* Exit.  */
     die (status);

trunk/src/kmk/make.h

@@ -238 +238 @@
 
 /* bird - start */
+#ifdef _MSC_VER
+# include <intrin.h>
+# define CURRENT_CLOCK_TICK() __rdtsc()
+#else
+# define CURRENT_CLOCK_TICK() 0
+#endif
+
 #define COMMA ,
 #ifdef CONFIG_WITH_VALUE_LENGTH

trunk/src/kmk/variable.c

@@ -448 +448 @@
   MAKE_STATS_2(v->reallocs = 0);
   MAKE_STATS_2(v->references = 0);
+  MAKE_STATS_2(v->cEvalVals = 0);
+  MAKE_STATS_2(v->cTicksEvalVal = 0);
 
   v->exportable = 1;
@@ -605 +607 @@
       MAKE_STATS_2(v->changes = 0);
       MAKE_STATS_2(v->reallocs = 0);
+      MAKE_STATS_2(v->references = 0);
+      MAKE_STATS_2(v->cEvalVals = 0);
+      MAKE_STATS_2(v->cTicksEvalVal = 0);
       v->exportable = 1;
       if (*name != '_' && (*name < 'A' || *name > 'Z')
@@ -894 +899 @@
       if (v != VAR_NOT_KBUILD_ACCESSOR)
         {
-          MAKE_STATS (v->references++);
+          MAKE_STATS_2 (v->references++);
           return v;
         }
@@ -929 +934 @@
           RESOLVE_ALIAS_VARIABLE(v);
 # endif
-         MAKE_STATS (v->references++);
-          return v->special ? lookup_special_var (v) : v;
+          MAKE_STATS_2 (v->references++);
+           return v->special ? lookup_special_var (v) : v;
         }
 
@@ -1032 +1037 @@
         {
           RESOLVE_ALIAS_VARIABLE(v);
-          MAKE_STATS (v->references++);
+          MAKE_STATS_2 (v->references++);
           return v;
         }
@@ -1060 +1065 @@
   RESOLVE_ALIAS_VARIABLE(v);
 # endif
-  MAKE_STATS (if (v) v->references++);
+  MAKE_STATS_2 (if (v) v->references++);
   return v;
 #endif /* CONFIG_WITH_STRCACHE2 */
@@ -2764 +2769 @@
 static unsigned long var_stats_reallocs, var_stats_realloced;
 static unsigned long var_stats_references, var_stats_referenced;
+static unsigned long var_stats_evalvals, var_stats_evalvaled;
+static uintmax_t var_stats_evalval_ticks;
 static unsigned long var_stats_val_len, var_stats_val_alloc_len;
 static unsigned long var_stats_val_rdonly_len;
@@ -2836 +2843 @@
   var_stats_changes += v->changes;
   var_stats_changed += (v->changes != 0);
+
   if (v->reallocs != 0)
       printf (_(", %u reallocs"), v->reallocs);
   var_stats_reallocs += v->reallocs;
   var_stats_realloced += (v->reallocs != 0);
+
   if (v->references != 0)
       printf (_(", %u references"), v->references);
   var_stats_references += v->references;
   var_stats_referenced += (v->references != 0);
+
+  if (v->cEvalVals != 0)
+      //printf (_(", %u evalvals (%llu ticks)"), v->cEvalVals, v->cTicksEvalVal);
+      printf (_(", %u evalvals (%llu ms)"), v->cEvalVals, v->cTicksEvalVal / 3299998);
+  var_stats_evalvals += v->cEvalVals;
+  var_stats_evalvaled += (v->cEvalVals != 0);
+
   var_stats_val_len += v->value_length;
   if (v->value_alloc_len)

trunk/src/kmk/variable.h

@@ -113 +113 @@
     unsigned int reallocs;     /* Realloc on value count.  */
     unsigned int references;   /* Lookup count.  */
+    unsigned cEvalVals;        /* $(evalval v) or $(evalvalctx v) count */
+    unsigned long long cTicksEvalVal; /* Number of ticks spend in cEvalVal. */
 #endif
   };