Updating Kokkos lib to 2.03.00

This commit is contained in:
Stan Moore
2017-04-25 13:48:51 -06:00
parent 9f6e126a2f
commit 8910ec6e59
261 changed files with 27816 additions and 17799 deletions

View File

@ -60,6 +60,342 @@ namespace Test {
enum { NUMBER_OF_TRIALS = 5 };
template< class DeviceType , class LayoutType >
void run_test_mdrange( int exp_beg , int exp_end, const char deviceTypeName[], int range_offset = 0, int tile_offset = 0 )
// exp_beg = 6 => 2^6 = 64 is starting range length
{
#define MDRANGE_PERFORMANCE_OUTPUT_VERBOSE 0
std::string label_mdrange ;
label_mdrange.append( "\"MDRange< double , " );
label_mdrange.append( deviceTypeName );
label_mdrange.append( " >\"" );
std::string label_range_col2 ;
label_range_col2.append( "\"RangeColTwo< double , " );
label_range_col2.append( deviceTypeName );
label_range_col2.append( " >\"" );
std::string label_range_col_all ;
label_range_col_all.append( "\"RangeColAll< double , " );
label_range_col_all.append( deviceTypeName );
label_range_col_all.append( " >\"" );
if ( std::is_same<LayoutType, Kokkos::LayoutRight>::value) {
std::cout << "--------------------------------------------------------------\n"
<< "Performance tests for MDRange Layout Right"
<< "\n--------------------------------------------------------------" << std::endl;
} else {
std::cout << "--------------------------------------------------------------\n"
<< "Performance tests for MDRange Layout Left"
<< "\n--------------------------------------------------------------" << std::endl;
}
for (int i = exp_beg ; i < exp_end ; ++i) {
const int range_length = (1<<i) + range_offset;
std::cout << "\n--------------------------------------------------------------\n"
<< "--------------------------------------------------------------\n"
<< "MDRange Test: range bounds: " << range_length << " , " << range_length << " , " << range_length
<< "\n--------------------------------------------------------------\n"
<< "--------------------------------------------------------------\n";
// << std::endl;
int t0_min = 0, t1_min = 0, t2_min = 0;
double seconds_min = 0.0;
// Test 1: The MDRange in full
{
int t0 = 1, t1 = 1, t2 = 1;
int counter = 1;
#if !defined(KOKKOS_HAVE_CUDA)
int min_bnd = 8;
int tfast = range_length;
#else
int min_bnd = 2;
int tfast = 32;
#endif
while ( tfast >= min_bnd ) {
int tmid = min_bnd;
while ( tmid < tfast ) {
t0 = min_bnd;
t1 = tmid;
t2 = tfast;
int t2_rev = min_bnd;
int t1_rev = tmid;
int t0_rev = tfast;
#if defined(KOKKOS_HAVE_CUDA)
//Note: Product of tile sizes must be < 1024 for Cuda
if ( t0*t1*t2 >= 1024 ) {
printf(" Exceeded Cuda tile limits; onto next range set\n\n");
break;
}
#endif
// Run 1 with tiles LayoutRight style
double seconds_1 = 0;
{ seconds_1 = MultiDimRangePerf3D< DeviceType , double , LayoutType >::test_multi_index(range_length,range_length,range_length, t0, t1, t2) ; }
#if MDRANGE_PERFORMANCE_OUTPUT_VERBOSE
std::cout << label_mdrange
<< " , " << t0 << " , " << t1 << " , " << t2
<< " , " << seconds_1
<< std::endl ;
#endif
if ( counter == 1 ) {
seconds_min = seconds_1;
t0_min = t0;
t1_min = t1;
t2_min = t2;
}
else {
if ( seconds_1 < seconds_min )
{
seconds_min = seconds_1;
t0_min = t0;
t1_min = t1;
t2_min = t2;
}
}
// Run 2 with tiles LayoutLeft style - reverse order of tile dims
double seconds_1rev = 0;
{ seconds_1rev = MultiDimRangePerf3D< DeviceType , double , LayoutType >::test_multi_index(range_length,range_length,range_length, t0_rev, t1_rev, t2_rev) ; }
#if MDRANGE_PERFORMANCE_OUTPUT_VERBOSE
std::cout << label_mdrange
<< " , " << t0_rev << " , " << t1_rev << " , " << t2_rev
<< " , " << seconds_1rev
<< std::endl ;
#endif
if ( seconds_1rev < seconds_min )
{
seconds_min = seconds_1rev;
t0_min = t0_rev;
t1_min = t1_rev;
t2_min = t2_rev;
}
++counter;
tmid <<= 1;
} //end inner while
tfast >>=1;
} //end outer while
std::cout << "\n"
<< "--------------------------------------------------------------\n"
<< label_mdrange
<< "\n Min values "
<< "\n Range length per dim (3D): " << range_length
<< "\n TileDims: " << t0_min << " , " << t1_min << " , " << t2_min
<< "\n Min time: " << seconds_min
<< "\n---------------------------------------------------------------"
<< std::endl ;
} //end scope
#if !defined(KOKKOS_HAVE_CUDA)
double seconds_min_c = 0.0;
int t0c_min = 0, t1c_min = 0, t2c_min = 0;
int counter = 1;
{
int min_bnd = 8;
// Test 1_c: MDRange with 0 for 'inner' tile dim; this case will utilize the full span in that direction, should be similar to Collapse<2>
if ( std::is_same<LayoutType, Kokkos::LayoutRight>::value ) {
for ( unsigned int T0 = min_bnd; T0 < static_cast<unsigned int>(range_length); T0<<=1 ) {
for ( unsigned int T1 = min_bnd; T1 < static_cast<unsigned int>(range_length); T1<<=1 ) {
double seconds_c = 0;
{ seconds_c = MultiDimRangePerf3D< DeviceType , double , LayoutType >::test_multi_index(range_length,range_length,range_length, T0, T1, 0) ; }
#if MDRANGE_PERFORMANCE_OUTPUT_VERBOSE
std::cout << " MDRange LR with '0' tile - collapse-like \n"
<< label_mdrange
<< " , " << T0 << " , " << T1 << " , " << range_length
<< " , " << seconds_c
<< std::endl ;
#endif
t2c_min = range_length;
if ( counter == 1 ) {
seconds_min_c = seconds_c;
t0c_min = T0;
t1c_min = T1;
}
else {
if ( seconds_c < seconds_min_c )
{
seconds_min_c = seconds_c;
t0c_min = T0;
t1c_min = T1;
}
}
++counter;
}
}
}
else {
for ( unsigned int T1 = min_bnd; T1 <= static_cast<unsigned int>(range_length); T1<<=1 ) {
for ( unsigned int T2 = min_bnd; T2 <= static_cast<unsigned int>(range_length); T2<<=1 ) {
double seconds_c = 0;
{ seconds_c = MultiDimRangePerf3D< DeviceType , double , LayoutType >::test_multi_index(range_length,range_length,range_length, 0, T1, T2) ; }
#if MDRANGE_PERFORMANCE_OUTPUT_VERBOSE
std::cout << " MDRange LL with '0' tile - collapse-like \n"
<< label_mdrange
<< " , " <<range_length << " < " << T1 << " , " << T2
<< " , " << seconds_c
<< std::endl ;
#endif
t0c_min = range_length;
if ( counter == 1 ) {
seconds_min_c = seconds_c;
t1c_min = T1;
t2c_min = T2;
}
else {
if ( seconds_c < seconds_min_c )
{
seconds_min_c = seconds_c;
t1c_min = T1;
t2c_min = T2;
}
}
++counter;
}
}
}
std::cout
// << "--------------------------------------------------------------\n"
<< label_mdrange
<< " Collapse<2> style: "
<< "\n Min values "
<< "\n Range length per dim (3D): " << range_length
<< "\n TileDims: " << t0c_min << " , " << t1c_min << " , " << t2c_min
<< "\n Min time: " << seconds_min_c
<< "\n---------------------------------------------------------------"
<< std::endl ;
} //end scope test 2
#endif
// Test 2: RangePolicy Collapse2 style
double seconds_2 = 0;
{ seconds_2 = RangePolicyCollapseTwo< DeviceType , double , LayoutType >::test_index_collapse_two(range_length,range_length,range_length) ; }
std::cout << label_range_col2
<< " , " << range_length
<< " , " << seconds_2
<< std::endl ;
// Test 3: RangePolicy Collapse all style - not necessary, always slow
/*
double seconds_3 = 0;
{ seconds_3 = RangePolicyCollapseAll< DeviceType , double , LayoutType >::test_collapse_all(range_length,range_length,range_length) ; }
std::cout << label_range_col_all
<< " , " << range_length
<< " , " << seconds_3
<< "\n---------------------------------------------------------------"
<< std::endl ;
*/
// Compare fastest times... will never be collapse all so ignore it
// seconds_min = tiled MDRange
// seconds_min_c = collapse<2>-like MDRange (tiledim = span for fast dim) - only for non-Cuda, else tile too long
// seconds_2 = collapse<2>-style RangePolicy
// seconds_3 = collapse<3>-style RangePolicy
#if !defined(KOKKOS_HAVE_CUDA)
if ( seconds_min < seconds_min_c ) {
if ( seconds_min < seconds_2 ) {
std::cout << "--------------------------------------------------------------\n"
<< " Fastest run: MDRange tiled\n"
<< " Time: " << seconds_min
<< " Difference: " << seconds_2 - seconds_min
<< " Other times: \n"
<< " MDrange collapse-like (tiledim = span on fast dim) type: " << seconds_min_c << "\n"
<< " Collapse2 Range Policy: " << seconds_2 << "\n"
<< "\n--------------------------------------------------------------"
<< "\n--------------------------------------------------------------"
//<< "\n\n"
<< std::endl;
}
else if ( seconds_min > seconds_2 ) {
std::cout << " Fastest run: Collapse2 RangePolicy\n"
<< " Time: " << seconds_2
<< " Difference: " << seconds_min - seconds_2
<< " Other times: \n"
<< " MDrange Tiled: " << seconds_min << "\n"
<< " MDrange collapse-like (tiledim = span on fast dim) type: " << seconds_min_c << "\n"
<< "\n--------------------------------------------------------------"
<< "\n--------------------------------------------------------------"
//<< "\n\n"
<< std::endl;
}
}
else if ( seconds_min > seconds_min_c ) {
if ( seconds_min_c < seconds_2 ) {
std::cout << "--------------------------------------------------------------\n"
<< " Fastest run: MDRange collapse-like (tiledim = span on fast dim) type\n"
<< " Time: " << seconds_min_c
<< " Difference: " << seconds_2 - seconds_min_c
<< " Other times: \n"
<< " MDrange Tiled: " << seconds_min << "\n"
<< " Collapse2 Range Policy: " << seconds_2 << "\n"
<< "\n--------------------------------------------------------------"
<< "\n--------------------------------------------------------------"
//<< "\n\n"
<< std::endl;
}
else if ( seconds_min_c > seconds_2 ) {
std::cout << " Fastest run: Collapse2 RangePolicy\n"
<< " Time: " << seconds_2
<< " Difference: " << seconds_min_c - seconds_2
<< " Other times: \n"
<< " MDrange Tiled: " << seconds_min << "\n"
<< " MDrange collapse-like (tiledim = span on fast dim) type: " << seconds_min_c << "\n"
<< "\n--------------------------------------------------------------"
<< "\n--------------------------------------------------------------"
//<< "\n\n"
<< std::endl;
}
} // end else if
#else
if ( seconds_min < seconds_2 ) {
std::cout << "--------------------------------------------------------------\n"
<< " Fastest run: MDRange tiled\n"
<< " Time: " << seconds_min
<< " Difference: " << seconds_2 - seconds_min
<< " Other times: \n"
<< " Collapse2 Range Policy: " << seconds_2 << "\n"
<< "\n--------------------------------------------------------------"
<< "\n--------------------------------------------------------------"
//<< "\n\n"
<< std::endl;
}
else if ( seconds_min > seconds_2 ) {
std::cout << " Fastest run: Collapse2 RangePolicy\n"
<< " Time: " << seconds_2
<< " Difference: " << seconds_min - seconds_2
<< " Other times: \n"
<< " MDrange Tiled: " << seconds_min << "\n"
<< "\n--------------------------------------------------------------"
<< "\n--------------------------------------------------------------"
//<< "\n\n"
<< std::endl;
}
#endif
} //end for
#undef MDRANGE_PERFORMANCE_OUTPUT_VERBOSE
}
template< class DeviceType >