haskal
/
kicad
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Revert "eeschema: Connectivity threading" 

This reverts commit 1a031e771f.

Some nets broken in commit.
This commit is contained in:
Seth Hillbrand 2019-04-10 20:05:23 -07:00
parent e28c937a5c
commit 8c9244e677
7 changed files with 65 additions and 173 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
common/advanced_config.cpp
View File

@ -58,13 +58,6 @@ namespace AC_KEYS
*/ */
static const wxChar EnableSvgImport[] = wxT( "EnableSvgImport" ); static const wxChar EnableSvgImport[] = wxT( "EnableSvgImport" );
/**
* Testing mode for new connectivity algorithm. Setting this to on will cause all modifications
* to the netlist to be recalculated on the fly. This may be slower than the standard process
* at the moment
*/
static const wxChar RealtimeConnectivity[] = wxT( "RealtimeConnectivity" );
/** /**
* Allow legacy canvas to be shown in GTK3. Legacy canvas is generally pretty * Allow legacy canvas to be shown in GTK3. Legacy canvas is generally pretty
* broken, but this avoids code in an ifdef where it could become broken * broken, but this avoids code in an ifdef where it could become broken
@ -190,9 +183,6 @@ void ADVANCED_CFG::loadSettings( wxConfigBase& aCfg )
configParams.push_back( new PARAM_CFG_BOOL( configParams.push_back( new PARAM_CFG_BOOL(
true, AC_KEYS::AllowLegacyCanvasInGtk3, &m_allowLegacyCanvasInGtk3, false ) ); true, AC_KEYS::AllowLegacyCanvasInGtk3, &m_allowLegacyCanvasInGtk3, false ) );
configParams.push_back(
new PARAM_CFG_BOOL( true, AC_KEYS::RealtimeConnectivity, &m_realTimeConnectivity, false ) );
wxConfigLoadSetups( &aCfg, configParams ); wxConfigLoadSetups( &aCfg, configParams );
dumpCfg( configParams ); dumpCfg( configParams );

155
eeschema/connection_graph.cpp
View File

@ -26,7 +26,6 @@
#include <unordered_map> #include <unordered_map>
#include <profile.h> #include <profile.h>
#include <advanced_config.h>
#include <common.h> #include <common.h>
#include <erc.h> #include <erc.h>
#include <sch_edit_frame.h> #include <sch_edit_frame.h>
@ -309,56 +308,23 @@ void CONNECTION_GRAPH::Recalculate( SCH_SHEET_LIST aSheetList, bool aUncondition
if( aUnconditional ) if( aUnconditional )
Reset(); Reset();
std::map<SCH_ITEM*, std::vector<SCH_SHEET_PATH>> sheets; for( const auto& sheet : aSheetList )
for( auto sheet : aSheetList )
{ {
if( auto list = sheet.LastDrawList() )
sheets[list].push_back( sheet );
}
size_t parallelThreadCount = std::min<size_t>( std::thread::hardware_concurrency(),
( sheets.size() + 1 ) / 2 );
std::atomic<size_t> nextSheet( 0 );
std::vector<std::future<size_t>> returns( parallelThreadCount );
auto update_connectivity = [&]() -> size_t
{
for( size_t sheetId = nextSheet++; sheetId < sheets.size(); sheetId = nextSheet++ )
{
auto sheet = sheets.begin();
std::advance( sheet, sheetId );
std::vector<SCH_ITEM*> items; std::vector<SCH_ITEM*> items;
for( auto item = sheet->first; item; item = item->Next() ) for( auto item = sheet.LastScreen()->GetDrawItems();
item; item = item->Next() )
{
if( item->IsConnectable() &&
( aUnconditional || item->IsConnectivityDirty() ) )
{ {
if( item->IsConnectable() && ( aUnconditional || item->IsConnectivityDirty() ) )
items.push_back( item ); items.push_back( item );
} }
auto it = sheet->second.begin();
updateItemConnectivity( *it, items );
for( ++it; it != sheet->second.end(); ++it )
initializeSheetConnections( *it, items );
} }
return 1; updateItemConnectivity( sheet, items );
};
if( parallelThreadCount == 1 )
update_connectivity();
else
{
for( size_t ii = 0; ii < parallelThreadCount; ++ii )
returns[ii] = std::async( std::launch::async, update_connectivity );
// Finalize the threads
for( size_t ii = 0; ii < parallelThreadCount; ++ii )
returns[ii].wait();
} }
phase1.Stop(); phase1.Stop();
wxLogTrace( "CONN_PROFILE", "UpdateItemConnectivity() %0.4f ms", phase1.msecs() ); wxLogTrace( "CONN_PROFILE", "UpdateItemConnectivity() %0.4f ms", phase1.msecs() );
@ -375,50 +341,10 @@ void CONNECTION_GRAPH::Recalculate( SCH_SHEET_LIST aSheetList, bool aUncondition
} }
void CONNECTION_GRAPH::initializeSheetConnections( SCH_SHEET_PATH aSheet,
std::vector<SCH_ITEM*>& aItemList )
{
for( auto item : aItemList )
{
if( item->Type() == SCH_SHEET_T )
{
for( auto& pin : static_cast<SCH_SHEET*>( item )->GetPins() )
pin.InitializeConnection( aSheet );
}
else if( item->Type() != SCH_COMPONENT_T )
{
auto conn = item->InitializeConnection( aSheet );
// Set bus/net property here so that the propagation code uses it
switch( item->Type() )
{
case SCH_LINE_T:
conn->SetType( ( item->GetLayer() == LAYER_BUS ) ?
CONNECTION_BUS : CONNECTION_NET );
break;
case SCH_BUS_BUS_ENTRY_T:
conn->SetType( CONNECTION_BUS );
break;
case SCH_PIN_T:
case SCH_BUS_WIRE_ENTRY_T:
conn->SetType( CONNECTION_NET );
break;
default:
break;
}
}
}
}
void CONNECTION_GRAPH::updateItemConnectivity( SCH_SHEET_PATH aSheet, void CONNECTION_GRAPH::updateItemConnectivity( SCH_SHEET_PATH aSheet,
std::vector<SCH_ITEM*>& aItemList ) std::vector<SCH_ITEM*> aItemList )
{ {
std::unordered_multimap< wxPoint, SCH_ITEM* > connection_map; std::unordered_map< wxPoint, std::vector<SCH_ITEM*> > connection_map;
for( auto item : aItemList ) for( auto item : aItemList )
{ {
@ -429,18 +355,25 @@ void CONNECTION_GRAPH::updateItemConnectivity( SCH_SHEET_PATH aSheet,
if( item->Type() == SCH_SHEET_T ) if( item->Type() == SCH_SHEET_T )
{ {
for( auto& pin : static_cast<SCH_SHEET*>( item )->GetPins() ) for( auto& pin : static_cast<SCH_SHEET*>( item )->GetPins() )
{
if( !pin.Connection( aSheet ) )
{ {
pin.InitializeConnection( aSheet ); pin.InitializeConnection( aSheet );
pin.ConnectedItems().clear(); }
connection_map.emplace( pin.GetTextPos(), &pin ); pin.ConnectedItems().clear();
InsertItem( &pin ); pin.Connection( aSheet )->Reset();
connection_map[ pin.GetTextPos() ].push_back( &pin );
m_items.insert( &pin );
} }
} }
else if( item->Type() == SCH_COMPONENT_T ) else if( item->Type() == SCH_COMPONENT_T )
{ {
auto component = static_cast<SCH_COMPONENT*>( item ); auto component = static_cast<SCH_COMPONENT*>( item );
component->UpdatePins( &aSheet );
for( auto& it : component->GetPinMap() ) for( auto& it : component->GetPinMap() )
{ {
SCH_PIN* pin = &it.second; SCH_PIN* pin = &it.second;
@ -455,15 +388,15 @@ void CONNECTION_GRAPH::updateItemConnectivity( SCH_SHEET_PATH aSheet,
// Invisible power pins need to be post-processed later // Invisible power pins need to be post-processed later
if( pin->IsPowerConnection() && !pin->IsVisible() ) if( pin->IsPowerConnection() && !pin->IsVisible() )
InsertPin( pin ); m_invisible_power_pins.push_back( pin );
connection_map.emplace( pos, pin ); connection_map[ pos ].push_back( pin );
InsertItem( pin ); m_items.insert( pin );
} }
} }
else else
{ {
InsertItem( item ); m_items.insert( item );
auto conn = item->InitializeConnection( aSheet ); auto conn = item->InitializeConnection( aSheet );
// Set bus/net property here so that the propagation code uses it // Set bus/net property here so that the propagation code uses it
@ -488,23 +421,22 @@ void CONNECTION_GRAPH::updateItemConnectivity( SCH_SHEET_PATH aSheet,
} }
for( auto point : points ) for( auto point : points )
connection_map.emplace( point, item ); {
connection_map[ point ].push_back( item );
}
} }
item->SetConnectivityDirty( false ); item->SetConnectivityDirty( false );
} }
auto primary_it = connection_map.begin(); for( const auto& it : connection_map )
for( auto it = connection_map.begin(); it != connection_map.end(); it = primary_it )
{ {
auto range = connection_map.equal_range( it->first ); auto connection_vec = it.second;
auto count = std::distance( range.first, range.second );
primary_it = range.second;
SCH_ITEM* junction = nullptr; SCH_ITEM* junction = nullptr;
for( primary_it = range.first; primary_it != range.second; ++primary_it ) for( auto primary_it = connection_vec.begin(); primary_it != connection_vec.end(); primary_it++ )
{ {
auto connected_item = primary_it->second; auto connected_item = *primary_it;
// Look for junctions. For points that have a junction, we want all // Look for junctions. For points that have a junction, we want all
// items to connect to the junction but not to each other. // items to connect to the junction but not to each other.
@ -526,10 +458,10 @@ void CONNECTION_GRAPH::updateItemConnectivity( SCH_SHEET_PATH aSheet,
// entry itself, this means that either the bus entry is not // entry itself, this means that either the bus entry is not
// connected to anything graphically, or that it is connected to // connected to anything graphically, or that it is connected to
// a segment at some point other than at one of the endpoints. // a segment at some point other than at one of the endpoints.
if( count == 1 ) if( connection_vec.size() == 1 )
{ {
auto screen = aSheet.LastScreen(); auto screen = aSheet.LastScreen();
auto bus = screen->GetBus( primary_it->first ); auto bus = screen->GetBus( it.first );
if( bus ) if( bus )
{ {
@ -542,41 +474,42 @@ void CONNECTION_GRAPH::updateItemConnectivity( SCH_SHEET_PATH aSheet,
// Bus-to-bus entries are treated just like bus wires // Bus-to-bus entries are treated just like bus wires
if( connected_item->Type() == SCH_BUS_BUS_ENTRY_T ) if( connected_item->Type() == SCH_BUS_BUS_ENTRY_T )
{ {
if( count < 2 ) if( connection_vec.size() < 2 )
{ {
auto screen = aSheet.LastScreen(); auto screen = aSheet.LastScreen();
auto bus = screen->GetBus( primary_it->first ); auto bus = screen->GetBus( it.first );
if( bus ) if( bus )
{ {
auto bus_entry = static_cast<SCH_BUS_BUS_ENTRY*>( connected_item ); auto bus_entry = static_cast<SCH_BUS_BUS_ENTRY*>( connected_item );
if( primary_it->first == bus_entry->GetPosition() ) if( it.first == bus_entry->GetPosition() )
bus_entry->m_connected_bus_items[0] = bus; bus_entry->m_connected_bus_items[0] = bus;
else else
bus_entry->m_connected_bus_items[1] = bus; bus_entry->m_connected_bus_items[1] = bus;
bus_entry->AddConnectionTo( bus ); bus_entry->ConnectedItems().insert( bus );
bus->AddConnectionTo( bus_entry ); bus->ConnectedItems().insert( bus_entry );
} }
} }
} }
for( auto test_it = std::next( primary_it ); test_it != range.second; ++test_it ) for( auto test_it = primary_it + 1; test_it != connection_vec.end(); test_it++ )
{ {
auto test_item = test_it->second; auto test_item = *test_it;
if( !junction && test_item->Type() == SCH_JUNCTION_T ) if( !junction && test_item->Type() == SCH_JUNCTION_T )
{ {
junction = test_item; junction = test_item;
} }
if( connected_item != junction && if( connected_item != test_item &&
connected_item != junction &&
connected_item->ConnectionPropagatesTo( test_item ) && connected_item->ConnectionPropagatesTo( test_item ) &&
test_item->ConnectionPropagatesTo( connected_item ) ) test_item->ConnectionPropagatesTo( connected_item ) )
{ {
connected_item->AddConnectionTo( test_item ); connected_item->ConnectedItems().insert( test_item );
test_item->AddConnectionTo( connected_item ); test_item->ConnectedItems().insert( connected_item );
} }
// Set up the link between the bus entry net and the bus // Set up the link between the bus entry net and the bus
@ -713,7 +646,7 @@ void CONNECTION_GRAPH::buildConnectionGraph()
// Resolve drivers for subgraphs and propagate connectivity info // Resolve drivers for subgraphs and propagate connectivity info
// We don't want to spin up a new thread for fewer than 4 nets (overhead costs) // We don't want to spin up a new thread for fewer than 8 nets (overhead costs)
size_t parallelThreadCount = std::min<size_t>( std::thread::hardware_concurrency(), size_t parallelThreadCount = std::min<size_t>( std::thread::hardware_concurrency(),
( m_subgraphs.size() + 3 ) / 4 ); ( m_subgraphs.size() + 3 ) / 4 );

38
eeschema/connection_graph.h
View File

@ -35,6 +35,10 @@
// #define CONNECTIVITY_DEBUG // #define CONNECTIVITY_DEBUG
#endif #endif
// Uncomment this line to enable real-time connectivity updates
// TODO(JE) re-enable this once performance concerns are sorted out
// #define CONNECTIVITY_REAL_TIME
class SCH_PIN; class SCH_PIN;
class SCH_EDIT_FRAME; class SCH_EDIT_FRAME;
@ -194,29 +198,12 @@ public:
// TODO(JE) firm up API and move to private // TODO(JE) firm up API and move to private
std::map<int, std::vector<CONNECTION_SUBGRAPH*> > m_net_code_to_subgraphs_map; std::map<int, std::vector<CONNECTION_SUBGRAPH*> > m_net_code_to_subgraphs_map;
inline void InsertItem( SCH_ITEM* aItem )
{
std::lock_guard<std::mutex> lock( m_item_mutex );
m_items.insert( aItem );
}
inline void InsertPin( SCH_PIN* aPin )
{
std::lock_guard<std::mutex> lock( m_power_pin_mutex );
m_invisible_power_pins.push_back( aPin );
}
private: private:
std::mutex m_item_mutex;
std::unordered_set<SCH_ITEM*> m_items; std::unordered_set<SCH_ITEM*> m_items;
std::vector<CONNECTION_SUBGRAPH*> m_subgraphs; std::vector<CONNECTION_SUBGRAPH*> m_subgraphs;
std::mutex m_power_pin_mutex;
std::vector<SCH_PIN*> m_invisible_power_pins; std::vector<SCH_PIN*> m_invisible_power_pins;
std::unordered_map<wxString, std::shared_ptr<BUS_ALIAS>> m_bus_alias_cache; std::unordered_map<wxString, std::shared_ptr<BUS_ALIAS>> m_bus_alias_cache;
@ -236,6 +223,8 @@ private:
int m_last_subgraph_code; int m_last_subgraph_code;
std::mutex m_item_mutex;
// Needed for m_UserUnits for now; maybe refactor later // Needed for m_UserUnits for now; maybe refactor later
SCH_EDIT_FRAME* m_frame; SCH_EDIT_FRAME* m_frame;
@ -267,20 +256,7 @@ private:
* @param aItemList is a list of items to consider * @param aItemList is a list of items to consider
*/ */
void updateItemConnectivity( SCH_SHEET_PATH aSheet, void updateItemConnectivity( SCH_SHEET_PATH aSheet,
std::vector<SCH_ITEM*>& aItemList ); std::vector<SCH_ITEM*> aItemList );
/**
* This is a shortcut function to only update the connections for duplicate sheets
* Since shared sheets have the same layout, we don't need to re-create the connection
* map, only add the sheet path to the item connection.
*
* N.B. This must be run sequentially after the first shared sheet
*
* @param aSheet path to the sheet with item list
* @param aItemList vector of items
*/
void initializeSheetConnections( SCH_SHEET_PATH aSheet,
std::vector<SCH_ITEM*>& aItemList );
/** /**
* Generates the connection graph (after all item connectivity has been updated) * Generates the connection graph (after all item connectivity has been updated)

11
eeschema/sch_connection.cpp
View File

@ -21,7 +21,6 @@
#include <boost/regex.hpp> #include <boost/regex.hpp>
#include <wx/tokenzr.h> #include <wx/tokenzr.h>
#include <advanced_config.h>
#include <connection_graph.h> #include <connection_graph.h>
#include <sch_screen.h> #include <sch_screen.h>
@ -282,8 +281,7 @@ wxString SCH_CONNECTION::Name( bool aIgnoreSheet ) const
void SCH_CONNECTION::AppendInfoToMsgPanel( MSG_PANEL_ITEMS& aList ) const void SCH_CONNECTION::AppendInfoToMsgPanel( MSG_PANEL_ITEMS& aList ) const
{ {
if( !ADVANCED_CFG::GetCfg().m_realTimeConnectivity ) #ifdef CONNECTIVITY_REAL_TIME
return;
wxString msg, group_name; wxString msg, group_name;
std::vector<wxString> group_members; std::vector<wxString> group_members;
@ -321,14 +319,14 @@ void SCH_CONNECTION::AppendInfoToMsgPanel( MSG_PANEL_ITEMS& aList ) const
} }
} }
} }
#endif
} }
void SCH_CONNECTION::AppendDebugInfoToMsgPanel( MSG_PANEL_ITEMS& aList ) const void SCH_CONNECTION::AppendDebugInfoToMsgPanel( MSG_PANEL_ITEMS& aList ) const
{ {
if( !ADVANCED_CFG::GetCfg().m_realTimeConnectivity ) #ifdef CONNECTIVITY_REAL_TIME
return;
wxString msg; wxString msg;
AppendInfoToMsgPanel( aList ); AppendInfoToMsgPanel( aList );
@ -347,6 +345,7 @@ void SCH_CONNECTION::AppendDebugInfoToMsgPanel( MSG_PANEL_ITEMS& aList ) const
msg.Printf( "%s at %p", Parent()->GetSelectMenuText( MILLIMETRES ), Parent() ); msg.Printf( "%s at %p", Parent()->GetSelectMenuText( MILLIMETRES ), Parent() );
aList.push_back( MSG_PANEL_ITEM( _( "Attached To" ), msg, RED ) ); aList.push_back( MSG_PANEL_ITEM( _( "Attached To" ), msg, RED ) );
#endif
} }

5
eeschema/sch_edit_frame.cpp
View File

@ -39,7 +39,6 @@
#include <executable_names.h> #include <executable_names.h>
#include <eda_dockart.h> #include <eda_dockart.h>
#include <advanced_config.h>
#include <general.h> #include <general.h>
#include <eeschema_id.h> #include <eeschema_id.h>
#include <netlist.h> #include <netlist.h>
@ -795,9 +794,9 @@ void SCH_EDIT_FRAME::OnModify()
m_foundItems.SetForceSearch(); m_foundItems.SetForceSearch();
#ifdef CONNECTIVITY_REAL_TIME
if( ADVANCED_CFG::GetCfg().m_realTimeConnectivity )
RecalculateConnections(); RecalculateConnections();
#endif
m_canvas->Refresh(); m_canvas->Refresh();
} }

4
eeschema/schedit.cpp
View File

@ -38,7 +38,6 @@
#include <kicad_device_context.h> #include <kicad_device_context.h>
#include <hotkeys_basic.h> #include <hotkeys_basic.h>
#include <advanced_config.h>
#include <general.h> #include <general.h>
#include <eeschema_id.h> #include <eeschema_id.h>
#include <list_operations.h> #include <list_operations.h>
@ -564,8 +563,9 @@ void SCH_EDIT_FRAME::OnSelectTool( wxCommandEvent& aEvent )
case ID_HIGHLIGHT: case ID_HIGHLIGHT:
// TODO(JE) remove once real-time connectivity is a given // TODO(JE) remove once real-time connectivity is a given
if( ADVANCED_CFG::GetCfg().m_realTimeConnectivity ) #ifndef CONNECTIVITY_REAL_TIME
RecalculateConnections(); RecalculateConnections();
#endif
SetToolID( ID_HIGHLIGHT, wxCURSOR_HAND, _("Highlight specific net") ); SetToolID( ID_HIGHLIGHT, wxCURSOR_HAND, _("Highlight specific net") );
break; break;

5
include/advanced_config.h
View File

@ -73,11 +73,6 @@ public:
*/ */
bool m_enableSvgImport; bool m_enableSvgImport;
/**
* Do real-time connectivity
*/
bool m_realTimeConnectivity;
/** /**
* Helper to determine if legacy canvas is allowed (according to platform * Helper to determine if legacy canvas is allowed (according to platform
* and config) * and config)