GPU: Fix memoryScalingFactor not applied for TPC compression unattached clusters

davidrohr · davidrohr · commit d540b7522e9b · 2022-08-19T13:18:58.000+02:00
diff --git a/GPU/GPUTracking/DataCompression/GPUTPCCompression.cxx b/GPU/GPUTracking/DataCompression/GPUTPCCompression.cxx
@@ -117,7 +117,7 @@ void GPUTPCCompression::RegisterMemoryAllocation()
 void GPUTPCCompression::SetMaxData(const GPUTrackingInOutPointers& io)
 {
   mMaxClusters = io.clustersNative->nClustersTotal;
-  mMaxClusterFactorBase1024 = mMaxClusters > 100000000 ? mRec->MemoryScalers()->tpcCompressedUnattachedHitsBase1024[mRec->GetParam().rec.tpc.rejectionStrategy] : 1024;
+  mMaxClusterFactorBase1024 = mMaxClusters > 100000000 ? mRec->MemoryScalers()->NTPCUnattachedHitsBase1024(mRec->GetParam().rec.tpc.rejectionStrategy) : 1024;
   mMaxClustersInCache = mMaxClusters * mMaxClusterFactorBase1024 / 1024;
   mMaxTrackClusters = mRec->GetConstantMem().tpcMerger.NOutputTrackClusters();
   mMaxTracks = mRec->GetConstantMem().tpcMerger.NOutputTracks();
diff --git a/GPU/GPUTracking/DataTypes/GPUMemorySizeScalers.h b/GPU/GPUTracking/DataTypes/GPUMemorySizeScalers.h
@@ -79,6 +79,7 @@ struct GPUMemorySizeScalers {
   inline size_t NTPCSectorTrackHits(size_t tpcHits) { return getValue(tpcMaxSectorTrackHits, tpcHits * tpcSectorTrackHitsPerHit); }
   inline size_t NTPCMergedTracks(size_t tpcSliceTracks) { return getValue(tpcMaxMergedTracks, tpcSliceTracks * tpcMergedTrackPerSliceTrack); }
   inline size_t NTPCMergedTrackHits(size_t tpcSliceTrackHitss) { return getValue(tpcMaxMergedTrackHits, tpcSliceTrackHitss * tpcMergedTrackHitPerSliceHit); }
+  inline size_t NTPCUnattachedHitsBase1024(int type) { return returnMaxVal ? 1024 : std::min<size_t>(1024, tpcCompressedUnattachedHitsBase1024[type] * factor * temporaryFactor); }
 };
 
 } // namespace GPUCA_NAMESPACE::gpu

Original file line number	Diff line number	Diff line change
`@@ -117,7 +117,7 @@ void GPUTPCCompression::RegisterMemoryAllocation()`
`117`	`117`	`void GPUTPCCompression::SetMaxData(const GPUTrackingInOutPointers& io)`
`118`	`118`	`{`
`119`	`119`	`mMaxClusters = io.clustersNative->nClustersTotal;`
`120`		`- mMaxClusterFactorBase1024 = mMaxClusters > 100000000 ? mRec->MemoryScalers()->tpcCompressedUnattachedHitsBase1024[mRec->GetParam().rec.tpc.rejectionStrategy] : 1024;`
	`120`	`+ mMaxClusterFactorBase1024 = mMaxClusters > 100000000 ? mRec->MemoryScalers()->NTPCUnattachedHitsBase1024(mRec->GetParam().rec.tpc.rejectionStrategy) : 1024;`
`121`	`121`	`mMaxClustersInCache = mMaxClusters * mMaxClusterFactorBase1024 / 1024;`
`122`	`122`	`mMaxTrackClusters = mRec->GetConstantMem().tpcMerger.NOutputTrackClusters();`
`123`	`123`	`mMaxTracks = mRec->GetConstantMem().tpcMerger.NOutputTracks();`