Ticket #23: arend_7_5.5-profile-matcher.diff

engine/matchpat.c

@@ -36 +36 @@
 /* Pattern profiling functions:                                           */
 /**************************************************************************/
 
-/* define this to see how each phase of pattern rejection is performing */
-/* #define PROFILE_MATCHER */
-
-
-#ifdef PROFILE_MATCHER
-static int totals[6];
-#endif
-
 
 #if PROFILE_PATTERNS
 /* Initialize pattern profiling fields in one pattern struct array. */
@@ -382 +374 @@
        */
 
       if (anchor_test != pattern->anchored_at_X)
-      {
-#ifdef PROFILE_MATCHER
-        /* oops - need to work out something we deferred */
-        totals[0] += (pattern->trfno == 5 ? 4 : pattern->trfno);
-#endif
         continue;  /* does not match the anchor */
-      }
 
       ll = 0;  /* first transformation number */
       end_transformation = pattern->trfno;
@@ -399 +385 @@
         end_transformation = 6;
       }
       
-#ifdef PROFILE_MATCHER
-      totals[0] += end_transformation - ll;
-#endif
-
       /* try each orientation transformation. Assume at least 1 */
 
       do {
@@ -411 +393 @@
         int nodes_before;
 #endif
         
-#ifdef PROFILE_MATCHER
-        ++totals[1];
-#endif
-
 #if GRID_OPT == 1
 
         /* We first perform the grid check : this checks up to 16
@@ -432 +410 @@
 
 #endif /* GRID_OPT == 1 */
 
-#ifdef PROFILE_MATCHER
-        ++totals[2];
-#endif
         /* Next, we do the range check. This applies the edge
          * constraints implicitly.
          */
@@ -460 +435 @@
             continue;  /* out of range */
         }
 
-#ifdef PROFILE_MATCHER   
-        ++totals[3];
-#endif
-
         /* Now iterate over the elements of the pattern. */
         found_goal = 0;
         for (k = 0; k < pattern->patlen; ++k) { /* match each point */
@@ -502 +473 @@
 #endif /* we don't trust the grid optimisation */
 
 
-#ifdef PROFILE_MATCHER
-        ++totals[4];
-#endif
-
         /* Make it here ==> We have matched all the elements to the board. */
         if ((goal != NULL) && !found_goal)
           goto match_failed;
 
-#ifdef PROFILE_MATCHER
-        ++totals[5];
-#endif
-
 #if PROFILE_PATTERNS
         pattern->hits++;
         nodes_before = stats.nodes;
@@ -535 +498 @@
       } while (++ll < end_transformation); /* ll loop over symmetries */
     } /* if not rejected by maxwt */
   } while ((++pattern)->patn);  /* loop over patterns */
-
-
-#ifdef PROFILE_MATCHER
-  fprintf(stderr, 
-          "total %d, anchor=%d, grid=%d, edge=%d, matched=%d, accepted=%d\n",
-          totals[0], totals[1], totals[2], totals[3], totals[4], totals[5]);
-#endif
-
 }
 
 
@@ -976 +931 @@
   int nodes_before;
 #endif
   
-#ifdef PROFILE_MATCHER
-  ++totals[1];
-#endif
-
   if (0)
     gprintf("check_pattern_light @ %1m rot:%d pattern: %s\n", 
             anchor, ll, pattern->name);
@@ -1023 +974 @@
     if (goal != NULL && !found_goal)
       goto match_failed;
   }
-
-#ifdef PROFILE_MATCHER
-  ++totals[4];
-#endif
 
 #if PROFILE_PATTERNS
   pattern->hits++;