Bunch of microoptimizations

src/Layers/xrRender_R2/r2_R_lights.cpp

@@ -32,7 +32,8 @@ void CRender::render_lights(light_Package& LP)
             L->vis_update();
             if (!L->vis.visible)
             {
-                source.erase(source.begin() + it);
+                std::swap(source[it], source.back());
+                source.pop_back();
                 it--;
             }
             else
@@ -42,25 +43,26 @@ void CRender::render_lights(light_Package& LP)
         }
     }
 
-    // 2. refactor - infact we could go from the backside and sort in ascending order
     {
         xr_vector<light*>& source = LP.v_shadowed;
         xr_vector<light*> refactored;
         refactored.reserve(source.size());
         const size_t total = source.size();
 
+        std::sort(source.begin(), source.end(), [](light* l1, light* l2)
+        {
+            const u32 a0 = l1->X.S.size;
+            const u32 a1 = l2->X.S.size;
+            return a0 < a1; // ascending order
+        });
+
         for (u16 smap_ID = 0; refactored.size() != total; ++smap_ID)
         {
             LP_smap_pool.initialize(RImplementation.o.smapsize);
-            std::sort(source.begin(), source.end(), [](light* l1, light* l2)
-            {
-                const u32 a0 = l1->X.S.size;
-                const u32 a1 = l2->X.S.size;
-                return a0 > a1; // reverse -> descending
-            });
-            for (size_t test = 0; test < source.size(); ++test)
+            for (auto &L : source)
             {
-                light* L = source[test];
+                if (!L)
+                    continue;
                 SMAP_Rect R{};
                 if (LP_smap_pool.push(R, L->X.S.size))
                 {
@@ -69,14 +71,12 @@ void CRender::render_lights(light_Package& LP)
                     L->X.S.posY = R.min.y;
                     L->vis.smap_ID = smap_ID;
                     refactored.push_back(L);
-                    source.erase(source.begin() + test);
-                    --test;
+                    L = nullptr;
                 }
             }
         }
 
         // save (lights are popped from back)
-        std::reverse(refactored.begin(), refactored.end());
         LP.v_shadowed = std::move(refactored);
     }
 
@@ -129,14 +129,14 @@ void CRender::render_lights(light_Package& LP)
         }
     };
 
-    const auto& flush_lights = [&]()
+    const auto& flush_lights = [] (CRender& render, xr_vector<task_data_t>& lights_queue)
     {
         for (const auto& [L, task, batch_id] : lights_queue)
         {
             VERIFY(task);
             TaskScheduler->Wait(*task);
 
-            auto& dsgraph = get_context(batch_id);
+            auto& dsgraph = render.get_context(batch_id);
 
             const bool bNormal = !dsgraph.mapNormalPasses[0][0].empty() || !dsgraph.mapMatrixPasses[0][0].empty();
             const bool bSpecial = !dsgraph.mapNormalPasses[1][0].empty() || !dsgraph.mapMatrixPasses[1][0].empty() ||
@@ -145,27 +145,27 @@ void CRender::render_lights(light_Package& LP)
             {
                 PIX_EVENT_CTX(dsgraph.cmd_list, SHADOWED_LIGHT);
 
-                Stats.s_merged++;
+                render.Stats.s_merged++;
                 L_spot_s.push_back(L);
-                Target->phase_smap_spot(dsgraph.cmd_list, L);
+                render.Target->phase_smap_spot(dsgraph.cmd_list, L);
                 dsgraph.cmd_list.set_xform_world(Fidentity);
                 dsgraph.cmd_list.set_xform_view(L->X.S.view);
                 dsgraph.cmd_list.set_xform_project(L->X.S.project);
                 dsgraph.render_graph(0);
                 if (ps_r2_ls_flags.test(R2FLAG_SUN_DETAILS))
                 {
-                    if (check_grass_shadow(L, ViewBase))
+                    if (check_grass_shadow(L, render.ViewBase))
                     {
-                        Details->fade_distance = -1; // Use light position to calc "fade"
-                        Details->light_position.set(L->position);
-                        Details->Render(dsgraph.cmd_list);
+                        render.Details->fade_distance = -1; // Use light position to calc "fade"
+                        render.Details->light_position.set(L->position);
+                        render.Details->Render(dsgraph.cmd_list);
                     }
                 }
                 L->X.S.transluent = FALSE;
                 if (bSpecial)
                 {
                     L->X.S.transluent = TRUE;
-                    Target->phase_smap_spot_tsh(dsgraph.cmd_list, L);
+                    render.Target->phase_smap_spot_tsh(dsgraph.cmd_list, L);
                     PIX_EVENT_CTX(dsgraph.cmd_list, SHADOWED_LIGHTS_RENDER_GRAPH);
                     dsgraph.render_graph(1); // normal level, secondary priority
                     PIX_EVENT_CTX(dsgraph.cmd_list, SHADOWED_LIGHTS_RENDER_SORTED);
@@ -174,7 +174,7 @@ void CRender::render_lights(light_Package& LP)
             }
             else
             {
-                Stats.s_finalclip++;
+                render.Stats.s_finalclip++;
             }
 
             L->svis[batch_id].end(); // NOTE(DX11): occqs are fetched here, this should be done on the imm context only
@@ -206,7 +206,7 @@ void CRender::render_lights(light_Package& LP)
             if (batch_id == R_dsgraph_structure::INVALID_CONTEXT_ID)
             {
                 VERIFY(!lights_queue.empty());
-                flush_lights();
+                flush_lights(*this, lights_queue);
                 continue;
             }
 
@@ -228,7 +228,7 @@ void CRender::render_lights(light_Package& LP)
             }
             lights_queue.emplace_back(data);
         }
-        flush_lights(); // in case if something left
+        flush_lights(*this, lights_queue); // in case if something left
 
         cmd_list.Invalidate();
 

src/xrAICore/Navigation/level_graph.h

@@ -232,6 +232,7 @@ class XRAICORE_API CLevelGraph
     IC void assign_y_values(xr_vector<T>& path);
     template <typename P>
     IC void iterate_vertices(const Fvector& min_position, const Fvector& max_position, const P& predicate) const;
+    IC std::pair<CLevelVertex*, CLevelVertex*> get_range(const Fvector& min_position, const Fvector& max_position) const;
     IC bool check_vertex_in_direction(u32 start_vertex_id, const Fvector2& start_position, u32 finish_vertex_id) const;
     IC u32 check_position_in_direction(
         u32 start_vertex_id, const Fvector2& start_position, const Fvector2& finish_position) const;

src/xrAICore/Navigation/level_graph_inline.h

@@ -571,6 +571,14 @@ IC void CLevelGraph::clear_mask_no_check(u32 vertex_id) { m_access_mask[vertex_i
 template <typename P>
 IC void CLevelGraph::iterate_vertices(
     const Fvector& min_position, const Fvector& max_position, const P& predicate) const
+{
+    auto [I, E] = get_range(min_position, max_position);
+
+    for (; I != E; ++I)
+        predicate(*I);
+}
+
+IC std::pair<CLevelGraph::CLevelVertex *, CLevelGraph::CLevelVertex *> CLevelGraph::get_range(const Fvector& min_position, const Fvector& max_position) const
 {
     const auto begin = m_nodes->begin(), end = m_nodes->end();
 
@@ -591,8 +599,7 @@ IC void CLevelGraph::iterate_vertices(
     else
         E = end;
 
-    for (; I != E; ++I)
-        predicate(*I);
+    return {I, E};
 }
 
 IC u32 CLevelGraph::max_x() const { return (m_max_x); }

src/xrGame/Level.cpp

@@ -443,8 +443,7 @@ void CLevel::OnFrame()
         if (g_mt_config.test(mtMap))
         {
             R_ASSERT(m_map_manager);
-            Device.seqParallel.push_back(
-                fastdelegate::FastDelegate0<>(m_map_manager, &CMapManager::Update));
+            Device.seqParallel.emplace_back(m_map_manager, &CMapManager::Update);
         }
         else
             MapManager().Update();

src/xrGame/cover_manager.cpp

@@ -74,37 +74,42 @@ void CCoverManager::compute_static_cover()
 {
     clear();
     xr_delete(m_covers);
-    m_covers = xr_new<CPointQuadTree>(
-        ai().level_graph().header().box(), ai().level_graph().header().cell_size() * .5f, 8 * 65536, 4 * 65536);
-    m_temp.resize(ai().level_graph().header().vertex_count());
-
+
     const CLevelGraph& graph = ai().level_graph();
-    const u32 levelVertexCount = ai().level_graph().header().vertex_count();
+    const LevelGraph::CHeader &levelGraphHeader = graph.header();
+    const u32 levelVertexCount = levelGraphHeader.vertex_count();
+
+    m_covers = xr_new<CPointQuadTree>(levelGraphHeader.box(), levelGraphHeader.cell_size() * .5f, 8 * 65536, 4 * 65536);
 
+    // avoiding extra allocations with a static storage for m_covers
+    static xr_vector<std::optional<CCoverPoint>> quadTreeStaticStorage;
+    quadTreeStaticStorage.resize(levelVertexCount);
+    m_temp.resize(levelVertexCount);
+
     xr_parallel_for(TaskRange<u32>(0, levelVertexCount), [&](const TaskRange<u32>& range)
     {
         for (u32 i = range.begin(); i != range.end(); ++i)
         {
-            const CLevelGraph::CLevelVertex& vertex = *graph.vertex(i);
-            if (vertex.high_cover(0) + vertex.high_cover(1) + vertex.high_cover(2) + vertex.high_cover(3))
-            {
-                m_temp[i] = edge_vertex(i);
-                continue;
-            }
+            m_temp[i] = false;
+            quadTreeStaticStorage[i] = std::nullopt;
 
-            if (vertex.low_cover(0) + vertex.low_cover(1) + vertex.low_cover(2) + vertex.low_cover(3))
+            const CLevelGraph::CLevelVertex& vertex = *graph.vertex(i);
+            const int highCover = vertex.high_cover(0) + vertex.high_cover(1) + vertex.high_cover(2) + vertex.high_cover(3); 
+            const int lowCover = vertex.low_cover(0) + vertex.low_cover(1) + vertex.low_cover(2) + vertex.low_cover(3); 
+
+            if (highCover || lowCover)
             {
                 m_temp[i] = edge_vertex(i);
-                continue;
+                if (m_temp[i] && critical_cover(i))
+                {
+                    quadTreeStaticStorage[i] = CCoverPoint(graph.vertex_position(graph.vertex(i)), i);
+                }
             }
-
-            m_temp[i] = false;
         }
     });
-
-    for (u32 i = 0; i < levelVertexCount; ++i)
-        if (m_temp[i] && critical_cover(i))
-            m_covers->insert(xr_new<CCoverPoint>(ai().level_graph().vertex_position(ai().level_graph().vertex(i)), i));
+    for (auto &p : quadTreeStaticStorage)
+        if (p.has_value())
+            m_covers->insert(&p.value());
 
     VERIFY(!m_smart_covers_storage);
     m_smart_covers_storage = xr_new<smart_cover::storage>();

src/xrGame/cover_manager.h

@@ -44,7 +44,9 @@ class CCoverManager
 
 protected:
     CPointQuadTree* m_covers;
-    xr_vector<bool> m_temp;
+    // vector<bool> is not applicable for `m_temp`
+    // since it is filled in parallel_for (https://timsong-cpp.github.io/cppwp/container.requirements.dataraces).
+    xr_vector<int> m_temp;
     mutable PointVector m_nearest;
 
 private:

src/xrGame/space_restriction_shape.cpp

@@ -12,6 +12,7 @@
 #include "xrAICore/Navigation/level_graph.h"
 #include "space_restrictor.h"
 #include "xrAICore/Navigation/graph_engine.h"
+#include "xrCore/Threading/ParallelFor.hpp"
 
 struct CBorderMergePredicate
 {
@@ -79,10 +80,43 @@ void CSpaceRestrictionShape::fill_shape(const CCF_Shape::shape_def& shape)
     }
     default: NODEFAULT;
     }
-    ai().level_graph().iterate_vertices(start, dest, CBorderMergePredicate(this));
+
+    CLevelGraph& graph = ai().level_graph();
+
+    std::mutex mergeMutex;
+
+    auto [begin, end] = graph.get_range(start, dest);
+    xr_parallel_for(TaskRange{begin, end}, [this, &mergeMutex, &graph] (auto &range) {
+        xr_vector<u32> m_border_chunk;
+        m_border_chunk.reserve(range.size());
+        for (auto &vertex : range)
+        {
+            if (inside(graph.vertex_id(&vertex), true) &&
+                !inside(graph.vertex_id(&vertex), false))
+                m_border_chunk.push_back(graph.vertex_id(&vertex));
+        }
+        std::lock_guard lock(mergeMutex);
+        if (m_border.capacity() < m_border.size() + m_border_chunk.size())
+            m_border.reserve(m_border.size() + m_border_chunk.size());
+        for (auto x : m_border_chunk)
+            m_border.push_back(x);
+    });
 
 #ifdef DEBUG
-    ai().level_graph().iterate_vertices(start, dest, CShapeTestPredicate(this));
+    xr_parallel_for(TaskRange{begin, end}, [this, &mergeMutex, &graph] (const auto &range) {
+        xr_vector<u32> m_test_storage_chunk;
+        m_test_storage_chunk.reserve(range.size());
+        for (auto &vertex : range)
+        {
+            if (inside(graph.vertex_id(&vertex), false))
+                m_test_storage_chunk.push_back(graph.vertex_id(&vertex));
+        }
+        std::lock_guard lock(mergeMutex);
+        if (m_test_storage.capacity() < m_test_storage.size() + m_test_storage_chunk.size())
+            m_test_storage.reserve(m_test_storage.size() + m_test_storage_chunk.size());
+        for (auto x : m_test_storage_chunk)
+            m_test_storage.push_back(x);
+    });
 #endif
 }
 

src/xrGame/space_restrictor.cpp

@@ -100,7 +100,14 @@ void CSpaceRestrictor::net_Destroy()
 bool CSpaceRestrictor::inside(const Fsphere& sphere) const
 {
     if (!actual())
-        prepare();
+    {
+        static std::mutex prepareMutex;
+        std::lock_guard lock(prepareMutex);
+
+        // Double-checked locking
+        if (!actual())
+            prepare();
+    }
 
     if (!m_selfbounds.intersect(sphere))
         return (false);