Shuenhoy/vtk-m2
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge topic 'adjust_tbb_grain_size'

Browse Source 
5f55be17 Update the TBB grain size to be a more reasonable default.

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !740
This commit is contained in:
Robert Maynard 2017-04-07 16:26:54 +00:00 committed by Kitware Robot
commit 451930f03a
2 changed files with 6 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
vtkm/cont/tbb/internal/DeviceAdapterAlgorithmTBB.h
View File

@ -137,6 +137,8 @@ public:
static void Schedule(FunctorType functor,
vtkm::Id3 rangeMax)
{
static const vtkm::UInt32 TBB_GRAIN_SIZE_3D[3] = {1, 4, 256};
//we need to extract from the functor that uniform grid information
const vtkm::Id MESSAGE_SIZE = 1024;
char errorString[MESSAGE_SIZE];
@ -146,9 +148,9 @@ public:
//memory is generally setup in a way that iterating the first range
//in the tightest loop has the best cache coherence.
::tbb::blocked_range3d<vtkm::Id> range(0, rangeMax[2],
0, rangeMax[1],
0, rangeMax[0]);
::tbb::blocked_range3d<vtkm::Id> range(0, rangeMax[2], TBB_GRAIN_SIZE_3D[0],
0, rangeMax[1], TBB_GRAIN_SIZE_3D[1],
0, rangeMax[0], TBB_GRAIN_SIZE_3D[2]);
tbb::ScheduleKernelId3<FunctorType> kernel(functor,rangeMax);
kernel.SetErrorMessageBuffer(errorMessage);

2
vtkm/cont/tbb/internal/FunctorsTBB.h
View File

@ -75,7 +75,7 @@ namespace tbb {
// The "grain size" of scheduling with TBB. Not a lot of thought has gone
// into picking this size.
static const vtkm::Id TBB_GRAIN_SIZE = 4096;
static const vtkm::Id TBB_GRAIN_SIZE = 1024;
template<class InputPortalType, class T, class BinaryOperationType>