caiyu/nextpnr
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Use Bits library for bit instrisics.

Browse Source 
Signed-off-by: Keith Rothman <537074+litghost@users.noreply.github.com>
This commit is contained in:
Keith Rothman 2021-02-17 10:49:19 -08:00
parent 558a753d3d
commit 8f668f06ca
1 changed files with 4 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
common/exclusive_state_groups.h
View File

@ -24,6 +24,8 @@
#error Include after "nextpnr.h" only. #error Include after "nextpnr.h" only.
#endif #endif
#include "bits.h"
NEXTPNR_NAMESPACE_BEGIN NEXTPNR_NAMESPACE_BEGIN
// Implementation for exclusive state groups, used to implement generic // Implementation for exclusive state groups, used to implement generic
@ -103,10 +105,10 @@ template <size_t StateCount, typename StateType = int8_t, typename CountType = u
// Check whether the state group is now unselected or satified. // Check whether the state group is now unselected or satified.
auto value = selected_states.to_ulong(); auto value = selected_states.to_ulong();
auto number_selected = __builtin_popcount(value); auto number_selected = nextpnr::Bits::popcount(value);
if (number_selected == 1) { if (number_selected == 1) {
// Group is no longer overconstrained. // Group is no longer overconstrained.
state = __builtin_ctz(value); state = nextpnr::Bits::ctz(value);
NPNR_ASSERT(selected_states[state]); NPNR_ASSERT(selected_states[state]);
} else if (number_selected == 0) { } else if (number_selected == 0) {
// Group is unselected. // Group is unselected.