Ticket #1756: PathProfile.patch

source/simulation2/components/CCmpPathfinder.cpp

@@ -36 +36 @@
 #include "simulation2/helpers/Rasterize.h"
 #include "simulation2/serialization/SerializeTemplates.h"
 
+#define PATHFIND_PROFILE 1
+#if PATHFIND_PROFILE
+    #include "lib/timer.h"
+    TIMER_ADD_CLIENT(tc_ProcessSameTurnMoves);
+    TIMER_ADD_CLIENT(tc_FinishAsyncRequests);
+    TIMER_ADD_CLIENT(tc_ProcessLongRequests);
+    TIMER_ADD_CLIENT(tc_ProcessShortRequests);
+    TIMER_ADD_CLIENT(tc_ProcessLongRequests_Loop);  
+#else
+    #define TIMER_ACCRUE(a) ;
+#endif
+
+
 // Default cost to move a single tile is a fairly arbitrary number, which should be big
 // enough to be precise when multiplied/divided and small enough to never overflow when
 // summing the cost of a whole path.
@@ -586 +599 @@
 
 void CCmpPathfinder::FinishAsyncRequests()
 {
+    TIMER_ACCRUE(tc_FinishAsyncRequests);
+
     // Save the request queue in case it gets modified while iterating
     std::vector<AsyncLongPathRequest> longRequests;
     m_AsyncLongPathRequests.swap(longRequests);
@@ -604 +619 @@
 
 void CCmpPathfinder::ProcessLongRequests(const std::vector<AsyncLongPathRequest>& longRequests)
 {
+    TIMER_ACCRUE(tc_ProcessLongRequests);
+
     for (size_t i = 0; i < longRequests.size(); ++i)
     {
+        TIMER_ACCRUE(tc_ProcessLongRequests_Loop);
         const AsyncLongPathRequest& req = longRequests[i];
         Path path;
 #if PATHFIND_USE_JPS
@@ -620 +638 @@
 
 void CCmpPathfinder::ProcessShortRequests(const std::vector<AsyncShortPathRequest>& shortRequests)
 {
+    TIMER_ACCRUE(tc_ProcessShortRequests);
+
     for (size_t i = 0; i < shortRequests.size(); ++i)
     {
         const AsyncShortPathRequest& req = shortRequests[i];
@@ -633 +653 @@
 
 void CCmpPathfinder::ProcessSameTurnMoves()
 {
+    TIMER_ACCRUE(tc_ProcessSameTurnMoves);
+
     if (!m_AsyncLongPathRequests.empty())
     {
         // Figure out how many moves we can do this time

source/simulation2/components/CCmpPathfinder_Hier.cpp

@@ -23 +23 @@
 #include "renderer/TerrainOverlay.h"
 #include "simulation2/helpers/Render.h"
 
+#define PATHFINDER_HIER_PROFILE 1
+#if PATHFINDER_HIER_PROFILE
+    #include "lib/timer.h"
+    TIMER_ADD_CLIENT(tc_MakeGoalReachable);
+#else
+    #define TIMER_ACCRUE(a) ;
+#endif
+
 class PathfinderHierOverlay;
 
 /**
@@ -531 +539 @@
 
 bool CCmpPathfinder_Hier::MakeGoalReachable(u16 i0, u16 j0, PathGoal& goal, pass_class_t passClass)
 {
+    TIMER_ACCRUE(tc_MakeGoalReachable);
     RegionID source = Get(i0, j0, passClass);
 
     // Find everywhere that's reachable
@@ -553 +562 @@
         if (!goal.RectContainsGoal(x0, z0, x1, z1))
             continue;
 
-        // If the region contains the goal area, the goal is reachable
-        // and we don't need to move it
+            // If the region contains the goal area, the goal is reachable
+            // and we don't need to move it
         if (GetChunk(it->ci, it->cj, passClass).RegionContainsGoal(it->r, goal))
-            return false;
-    }
+                return false;
+        }
 
     // The goal area wasn't reachable,
     // so find the navcell that's nearest to the goal's center

source/simulation2/components/CCmpPathfinder_JPS.cpp

@@ -27 +27 @@
 
 #define PATHFIND_STATS 0
 
-#define USE_JUMPPOINT_CACHE 1
+#define USE_JUMPPOINT_CACHE 0
 
 #define ACCEPT_DIAGONAL_GAPS 0
 
@@ -243 +243 @@
         mirror \
         ? (transpose ? terrain.get((j), w-1-(i)) : terrain.get(w-1-(i), (j))) \
         : (transpose ? terrain.get((j), (i)) : terrain.get((i), (j))) \
-    , passClass)
+        , passClass)
 
         rows.reserve(h);
         for (int j = 0; j < h; ++j)
@@ -456 +456 @@
     PathGoal goal;
 
     u16 iGoal, jGoal; // goal tile
-
+    
     ICmpPathfinder::pass_class_t passClass;
 
     PriorityQueue open;
@@ -807 +807 @@
 
     PathfinderStateJPS state = { 0 };
 
+#if USE_JUMPPOINT_CACHE
     state.jpc = m_JumpPointCache[passClass].get();
-#if USE_JUMPPOINT_CACHE
     if (!state.jpc)
     {
         state.jpc = new JumpPointCache;

source/simulation2/helpers/PathGoal.cpp

@@ -23 +23 @@
 #include "simulation2/components/ICmpObstructionManager.h"
 #include "simulation2/helpers/Geometry.h"
 
+#define PATHGOAL_PROFILE 1
+#if PATHGOAL_PROFILE
+    #include "lib/timer.h"
+    TIMER_ADD_CLIENT(tc_NavcellContainsGoal);
+#else
+    #define TIMER_ACCRUE(a) ;
+#endif
+
 static bool NavcellContainsCircle(int i, int j, fixed x, fixed z, fixed r, bool inside)
 {
     // Accept any navcell (i,j) that contains a point which is inside[/outside]
@@ -93 +101 @@
 
 bool PathGoal::NavcellContainsGoal(int i, int j) const
 {
+    TIMER_ACCRUE(tc_NavcellContainsGoal);
     switch (type)
     {
     case POINT:
@@ -103 +112 @@
         return gi == i && gj == j;
     }
     case CIRCLE:
-        return NavcellContainsCircle(i, j, x, z, hw, true);
+            return NavcellContainsCircle(i, j, x, z, hw, true);
     case INVERTED_CIRCLE:
         return NavcellContainsCircle(i, j, x, z, hw, false);
     case SQUARE:
-        return NavcellContainsSquare(i, j, x, z, u, v, hw, hh, true);
+            return NavcellContainsSquare(i, j, x, z, u, v, hw, hh, true);
     case INVERTED_SQUARE:
         return NavcellContainsSquare(i, j, x, z, u, v, hw, hh, false);
     default: