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

Avoid inner loop branch through compile time optimization

Browse Source
This commit is contained in:
Gunther H. Weber 2021-03-22 18:12:50 -07:00
parent 8ff6461ee7
commit abe7de6cc1
2 changed files with 14 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
vtkm/worklet/contourtree_augmented/meshtypes/ContourTreeMesh.h
View File

@ -551,13 +551,16 @@ inline void ContourTreeMesh<FieldType>::MergeWith(ContourTreeMesh<FieldType>& ot
contourtree_mesh_inc_ns::CombinedSimulatedSimplicityIndexComparator<FieldType>
cssicFunctorExecObj(
this->GlobalMeshIndex, other.GlobalMeshIndex, this->SortedValues, other.SortedValues);
contourtree_mesh_inc_ns::CopyIntoCombinedArrayWorklet copyIntoCombinedArrayWorklet;
this->Invoke(copyIntoCombinedArrayWorklet,
contourtree_mesh_inc_ns::CopyIntoCombinedArrayWorklet<true>
copyIntoCombinedArrayWorkletLowerBound;
this->Invoke(copyIntoCombinedArrayWorkletLowerBound,
thisIndices,
otherIndices,
cssicFunctorExecObj,
overallSortOrder);
this->Invoke(copyIntoCombinedArrayWorklet,
contourtree_mesh_inc_ns::CopyIntoCombinedArrayWorklet<false>
copyIntoCombinedArrayWorkletUpperBound;
this->Invoke(copyIntoCombinedArrayWorkletUpperBound,
otherIndices,
thisIndices,
cssicFunctorExecObj,

14
vtkm/worklet/contourtree_augmented/meshtypes/contourtreemesh/CopyIntoCombinedArrayWorklet.h
View File

@ -76,6 +76,7 @@ namespace contourtree_augmented
namespace mesh_dem_contourtree_mesh_inc
{
template <bool useLowerBound>
class CopyIntoCombinedArrayWorklet : public vtkm::worklet::WorkletMapField
{
public:
@ -96,19 +97,20 @@ public:
const ComparisonFunctorType& comparisonFunctor,
OutputArrayPortalType& resultArrayPortal) const
{
//std::cout << "Value " << value << " at idx " << idx << ": ";
// Find position of value in other array. Note: We use lower and upper bounds for
// the two different arrays for the case where an element occurs in both arrays,
// so that one position is "shifted" upwards and unique in the result array.
vtkm::Id posInOther = vtkm::worklet::contourtree_augmented::IsThis(value)
// the two different arrays (passed as template bool parameter so that the test
// occurs at compile time). If the same value occurs in both arrays, this approach
// "shifts" the position upwards for one of the arrays/elements, resulting in a
// uniuqe positioj in the result array. (Without this distinction, both values would
// end up at the same location in the result array, leaving and "empty"/uninitialized
// position.
vtkm::Id posInOther = useLowerBound
? vtkm::LowerBound(otherArrayPortal, value, comparisonFunctor)
: vtkm::UpperBound(otherArrayPortal, value, comparisonFunctor);
//std::cout << " posInOther=" << posInOther;
// The position of the current elemnt is its index in our array plus its
// position in the ohter array.
resultArrayPortal.Set(idx + posInOther, value);
//std::cout << " -> Setting " << idx + posInOther << " to " << value << std::endl;
}
}; // CopyIntoCombinedArrayWorklet