Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Correct limit for test on target fields and remove duplicate assertions #2945

Merged
merged 2 commits into from
Sep 15, 2023
Merged

Correct limit for test on target fields and remove duplicate assertions #2945

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
caaa7ef
Correct limit for test on target fields and remove duplicate assertions
heplesser Sep 14, 2023
ddd6069
Fix formatting
heplesser Sep 14, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
11 changes: 4 additions & 7 deletions nestkernel/target.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -193,11 +193,8 @@ Target::operator=( const Target& other )
inline Target::Target( const size_t tid, const size_t rank, const synindex syn_id, const size_t lcid )
: remote_target_id_( 0 )
{
assert( tid <= MAX_TID ); // MAX_TID is allowed since it is not used as invalid value
assert( rank <= MAX_RANK ); // MAX_RANK is allowed since it is not used as invalid value
assert( syn_id < MAX_SYN_ID );
assert( lcid < MAX_LCID );

// We need to call set_*() methods to properly encode values in bitfield.
// Validity of arguments is asserted in set_*() methods.
set_lcid( lcid );
set_rank( rank );
set_tid( tid );
Expand Down Expand Up @@ -234,7 +231,7 @@ Target::get_rank() const
inline void
Target::set_tid( const size_t tid )
{
assert( tid <= MAX_TID );
assert( tid <= MAX_TID ); // MAX_TID is allowed since it is not used as invalid value
remote_target_id_ = ( remote_target_id_ & ( ~MASK_TID ) ) | ( static_cast< uint64_t >( tid ) << BITPOS_TID );
}

Expand All @@ -247,7 +244,7 @@ Target::get_tid() const
inline void
Target::set_syn_id( const synindex syn_id )
{
assert( syn_id <= MAX_SYN_ID );
assert( syn_id < MAX_SYN_ID );
remote_target_id_ = ( remote_target_id_ & ( ~MASK_SYN_ID ) ) | ( static_cast< uint64_t >( syn_id ) << BITPOS_SYN_ID );
}

Expand Down
16 changes: 10 additions & 6 deletions testsuite/cpptests/test_target_fields.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -54,13 +54,15 @@ BOOST_AUTO_TEST_CASE( test_target_object_type_size )

BOOST_AUTO_TEST_CASE( test_target_object_type_constructor )
{
std::srand( time( nullptr ) );
std::srand( 1234567 );
for ( int i = 0; i < NUM_TEST_TRIALS; ++i )
{
// tid and rank can take on all values up to MAX_{TID,RANK}
// syn_id and lcid can only take values up to MAX_{SYN_ID,LCID}-1
const size_t tid = std::rand() % ( MAX_TID + 1 );
const size_t rank = std::rand() % ( MAX_RANK + 1 );
const synindex syn_id = std::rand() % ( MAX_SYN_ID + 1 );
const size_t lcid = std::rand() % ( MAX_LCID + 1 );
const synindex syn_id = std::rand() % MAX_SYN_ID;
const size_t lcid = std::rand() % MAX_LCID;

Target target_id_testInit( tid, rank, syn_id, lcid );

Expand All @@ -74,14 +76,16 @@ BOOST_AUTO_TEST_CASE( test_target_object_type_constructor )

BOOST_AUTO_TEST_CASE( test_target_object_type_set_get )
{
std::srand( time( nullptr ) );
std::srand( 2345678 );
Target target_id_testSetGet;
for ( int i = 0; i < NUM_TEST_TRIALS; ++i )
{
// tid and rank can take on all values up to MAX_{TID,RANK}
// syn_id and lcid can only take values up to MAX_{SYN_ID,LCID}-1
const size_t tid = std::rand() % ( MAX_TID + 1 );
const size_t rank = std::rand() % ( MAX_RANK + 1 );
const synindex syn_id = std::rand() % ( MAX_SYN_ID + 1 );
const size_t lcid = std::rand() % ( MAX_LCID + 1 );
const synindex syn_id = std::rand() % MAX_SYN_ID;
const size_t lcid = std::rand() % MAX_LCID;

enum_status_target_id status_target_id = TARGET_ID_UNPROCESSED;
if ( static_cast< bool >( std::rand() % 2 ) )
Expand Down
Loading