electron-rare/kicad-source-mirror
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Some performance optimizations for PNS/DRC

Browse Source 
Removed the double map lookup (count() + op[])
Normalized the commutative caching so A,B = B,A
Batched the locks for the layers
This commit is contained in:
Seth Hillbrand
2026-01-09 16:50:08 -08:00
parent e741ee2e6c
commit ab8ff442d3
3 changed files with 85 additions and 49 deletions
Download Patch File Download Diff File Expand all files Collapse all files
pcbnew/pcbexpr_functions.cpp
+44 -19
View File
@@ -729,33 +729,58 @@ static void intersectsAreaFunc( LIBEVAL::CONTEXT* aCtx, void* self )
else
testLayers = commonLayers;
for( PCB_LAYER_ID layer : testLayers.UIOrder() )
bool isTransient = ( item->GetFlags() & ROUTER_TRANSIENT ) != 0;
std::vector<PCB_LAYER_ID> layersToCompute;
if( !isTransient )
{
PTR_PTR_LAYER_CACHE_KEY key = { aArea, item, layer };
std::shared_lock<std::shared_mutex> readLock( board->m_CachesMutex );
if( ( item->GetFlags() & ROUTER_TRANSIENT ) == 0 )
for( PCB_LAYER_ID layer : testLayers.UIOrder() )
{
std::shared_lock<std::shared_mutex> readLock( board->m_CachesMutex );
PTR_PTR_LAYER_CACHE_KEY key = { aArea, item, layer };
auto i = board->m_IntersectsAreaCache.find( key );
if( i != board->m_IntersectsAreaCache.end() && i->second )
return true;
if( i != board->m_IntersectsAreaCache.end() )
{
if( i->second )
return true;
}
else
{
layersToCompute.push_back( layer );
}
}
bool collides = collidesWithArea( item, layer, context, aArea );
if( ( item->GetFlags() & ROUTER_TRANSIENT ) == 0 )
{
std::unique_lock<std::shared_mutex> writeLock( board->m_CachesMutex );
board->m_IntersectsAreaCache[ key ] = collides;
}
if( collides )
return true;
}
else
{
for( PCB_LAYER_ID layer : testLayers.UIOrder() )
layersToCompute.push_back( layer );
}
return false;
std::vector<std::pair<PTR_PTR_LAYER_CACHE_KEY, bool>> results;
bool anyCollision = false;
for( PCB_LAYER_ID layer : layersToCompute )
{
bool collides = collidesWithArea( item, layer, context, aArea );
if( !isTransient )
results.push_back( { { aArea, item, layer }, collides } );
if( collides )
anyCollision = true;
}
if( !isTransient && !results.empty() )
{
std::unique_lock<std::shared_mutex> writeLock( board->m_CachesMutex );
for( const auto& [key, collides] : results )
board->m_IntersectsAreaCache[key] = collides;
}
return anyCollision;
} ) )
{
return 1.0;