Skip to content

Commit b92ddc6

Browse files
davidrohrdavidrohr
committed
GPU: Remove obsolete tracketConstructorWithoutPipeline option
1 parent ae60303 commit b92ddc6

File tree

6 files changed

+15
-54
lines changed

6 files changed

+15
-54
lines changed

‎GPU/GPUTracking/Base/GPUReconstruction.cxx‎

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -270,12 +270,6 @@ int32_t GPUReconstruction::InitPhaseBeforeDevice()
270270
}
271271
if (mProcessingSettings.deterministicGPUReconstruction && mProcessingSettings.debugLevel >= 6) {
272272
mProcessingSettings.nTPCClustererLanes = 1;
273-
if (mProcessingSettings.trackletConstructorInPipeline < 0) {
274-
mProcessingSettings.trackletConstructorInPipeline = 1;
275-
}
276-
if (mProcessingSettings.trackletSelectorSectors < 0) {
277-
mProcessingSettings.trackletSelectorSectors = 1;
278-
}
279273
}
280274
if (mProcessingSettings.createO2Output > 1 && mProcessingSettings.runQA && mProcessingSettings.qcRunFraction == 100.f) {
281275
mProcessingSettings.createO2Output = 1;

‎GPU/GPUTracking/Base/GPUReconstructionIncludes.h‎

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -30,12 +30,6 @@
3030
#include <fstream>
3131

3232
#define GPUCA_GPUReconstructionUpdateDefaults() \
33-
if (mProcessingSettings.trackletConstructorInPipeline < 0) { \
34-
mProcessingSettings.trackletConstructorInPipeline = GPUCA_CONSTRUCTOR_IN_PIPELINE; \
35-
} \
36-
if (mProcessingSettings.trackletSelectorSectors < 0) { \
37-
mProcessingSettings.trackletSelectorSectors = GPUCA_TRACKLET_SELECTOR_SECTOR_COUNT; \
38-
} \
3933
if (mProcessingSettings.alternateBorderSort < 0) { \
4034
mProcessingSettings.alternateBorderSort = GPUCA_ALTERNATE_BORDER_SORT; \
4135
} \

‎GPU/GPUTracking/Definitions/GPUDefGPUParameters.h‎

Lines changed: 0 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -84,11 +84,9 @@
8484
#define GPUCA_LB_COMPRESSION_GATHER 1024
8585
#define GPUCA_NEIGHBOURS_FINDER_MAX_NNEIGHUP 5
8686
#define GPUCA_TRACKLET_SELECTOR_HITS_REG_SIZE 20
87-
#define GPUCA_CONSTRUCTOR_IN_PIPELINE 1
8887
#define GPUCA_ALTERNATE_BORDER_SORT 1
8988
#define GPUCA_SORT_BEFORE_FIT 1
9089
#define GPUCA_MERGER_SPLIT_LOOP_INTERPOLATION 1
91-
#define GPUCA_TRACKLET_SELECTOR_SECTOR_COUNT 1
9290
#define GPUCA_NO_ATOMIC_PRECHECK 1
9391
#define GPUCA_DEDX_STORAGE_TYPE uint16_t
9492
#define GPUCA_MERGER_INTERPOLATION_ERROR_TYPE half
@@ -149,11 +147,9 @@
149147
#define GPUCA_LB_COMPRESSION_GATHER 1024
150148
#define GPUCA_NEIGHBOURS_FINDER_MAX_NNEIGHUP 5
151149
#define GPUCA_TRACKLET_SELECTOR_HITS_REG_SIZE 20
152-
#define GPUCA_CONSTRUCTOR_IN_PIPELINE 1
153150
#define GPUCA_ALTERNATE_BORDER_SORT 1
154151
#define GPUCA_SORT_BEFORE_FIT 1
155152
#define GPUCA_MERGER_SPLIT_LOOP_INTERPOLATION 1
156-
#define GPUCA_TRACKLET_SELECTOR_SECTOR_COUNT 1
157153
#define GPUCA_NO_ATOMIC_PRECHECK 1
158154
#define GPUCA_DEDX_STORAGE_TYPE uint16_t
159155
#define GPUCA_MERGER_INTERPOLATION_ERROR_TYPE half
@@ -214,11 +210,9 @@
214210
#define GPUCA_LB_COMPRESSION_GATHER 1024
215211
#define GPUCA_NEIGHBOURS_FINDER_MAX_NNEIGHUP 4
216212
#define GPUCA_TRACKLET_SELECTOR_HITS_REG_SIZE 20
217-
#define GPUCA_CONSTRUCTOR_IN_PIPELINE 1
218213
#define GPUCA_ALTERNATE_BORDER_SORT 1
219214
#define GPUCA_SORT_BEFORE_FIT 1
220215
#define GPUCA_MERGER_SPLIT_LOOP_INTERPOLATION 1
221-
#define GPUCA_TRACKLET_SELECTOR_SECTOR_COUNT 1
222216
#define GPUCA_NO_ATOMIC_PRECHECK 1
223217
#define GPUCA_DEDX_STORAGE_TYPE uint16_t
224218
#define GPUCA_MERGER_INTERPOLATION_ERROR_TYPE half
@@ -271,11 +265,9 @@
271265
#define GPUCA_LB_COMPRESSION_GATHER 1024
272266
#define GPUCA_NEIGHBOURS_FINDER_MAX_NNEIGHUP 4
273267
#define GPUCA_TRACKLET_SELECTOR_HITS_REG_SIZE 20
274-
#define GPUCA_CONSTRUCTOR_IN_PIPELINE 1
275268
#define GPUCA_ALTERNATE_BORDER_SORT 1
276269
#define GPUCA_SORT_BEFORE_FIT 1
277270
#define GPUCA_MERGER_SPLIT_LOOP_INTERPOLATION 1
278-
#define GPUCA_TRACKLET_SELECTOR_SECTOR_COUNT 1
279271
#define GPUCA_NO_ATOMIC_PRECHECK 1
280272
#define GPUCA_COMP_GATHER_KERNEL 4
281273
#define GPUCA_COMP_GATHER_MODE 3
@@ -530,9 +522,6 @@
530522
#ifndef GPUCA_TRACKLET_SELECTOR_HITS_REG_SIZE
531523
#define GPUCA_TRACKLET_SELECTOR_HITS_REG_SIZE 12
532524
#endif
533-
#ifndef GPUCA_CONSTRUCTOR_IN_PIPELINE
534-
#define GPUCA_CONSTRUCTOR_IN_PIPELINE 1
535-
#endif
536525
#ifndef GPUCA_ALTERNATE_BORDER_SORT
537526
#define GPUCA_ALTERNATE_BORDER_SORT 0
538527
#endif
@@ -542,9 +531,6 @@
542531
#ifndef GPUCA_MERGER_SPLIT_LOOP_INTERPOLATION
543532
#define GPUCA_MERGER_SPLIT_LOOP_INTERPOLATION 0
544533
#endif
545-
#ifndef GPUCA_TRACKLET_SELECTOR_SECTOR_COUNT
546-
#define GPUCA_TRACKLET_SELECTOR_SECTOR_COUNT 8 // Currently must be smaller than avaiable MultiProcessors on GPU or will result in wrong results
547-
#endif
548534
#ifndef GPUCA_COMP_GATHER_KERNEL
549535
#define GPUCA_COMP_GATHER_KERNEL 0
550536
#endif
@@ -554,11 +540,9 @@
554540
#else
555541
#define GPUCA_NEIGHBOURS_FINDER_MAX_NNEIGHUP 0
556542
#define GPUCA_TRACKLET_SELECTOR_HITS_REG_SIZE 0
557-
#define GPUCA_CONSTRUCTOR_IN_PIPELINE 1
558543
#define GPUCA_ALTERNATE_BORDER_SORT 0
559544
#define GPUCA_SORT_BEFORE_FIT 0
560545
#define GPUCA_MERGER_SPLIT_LOOP_INTERPOLATION 0
561-
#define GPUCA_TRACKLET_SELECTOR_SECTOR_COUNT 1
562546
#define GPUCA_THREAD_COUNT_FINDER 1
563547
#define GPUCA_COMP_GATHER_KERNEL 0
564548
#define GPUCA_COMP_GATHER_MODE 0

‎GPU/GPUTracking/Definitions/GPUSettingsList.h‎

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -257,8 +257,6 @@ AddOption(autoAdjustHostThreads, bool, true, "", 0, "Auto-adjust number of OMP t
257257
AddOption(nStreams, int8_t, 8, "", 0, "Number of GPU streams / command queues")
258258
AddOption(nTPCClustererLanes, int8_t, -1, "", 0, "Number of TPC clusterers that can run in parallel (-1 = autoset)")
259259
AddOption(overrideClusterizerFragmentLen, int32_t, -1, "", 0, "Force the cluster max fragment len to a certain value (-1 = autodetect)")
260-
AddOption(trackletSelectorSectors, int8_t, -1, "", 0, "Number of sectors to processes in parallel at max")
261-
AddOption(trackletConstructorInPipeline, int8_t, -1, "", 0, "Run tracklet constructor in the pipeline")
262260
AddOption(delayedOutput, bool, true, "", 0, "Delay output to be parallel to track fit")
263261
AddOption(mergerSortTracks, int8_t, -1, "", 0, "Sort track indizes for GPU track fit")
264262
AddOption(alternateBorderSort, int8_t, -1, "", 0, "Alternative implementation for sorting of border tracks")

‎GPU/GPUTracking/Global/GPUChainTrackingSectorTracker.cxx‎

Lines changed: 14 additions & 23 deletions
Original file line numberDiff line numberDiff line change
@@ -218,27 +218,23 @@ int32_t GPUChainTracking::RunTPCTrackingSectors_internal()
218218
AllocateRegisteredMemory(trk.MemoryResOutput());
219219
}
220220

221-
if (!(doGPU || GetProcessingSettings().debugLevel >= 1) || GetProcessingSettings().trackletConstructorInPipeline) {
222-
runKernel<GPUTPCTrackletConstructor>({GetGridAuto(useStream), {iSector}});
223-
DoDebugAndDump(RecoStep::TPCSectorTracking, 128, trk, &GPUTPCTracker::DumpTrackletHits, *mDebugFile);
224-
if (GetProcessingSettings().debugMask & 256 && GetProcessingSettings().deterministicGPUReconstruction < 2) {
225-
trk.DumpHitWeights(*mDebugFile);
226-
}
221+
runKernel<GPUTPCTrackletConstructor>({GetGridAuto(useStream), {iSector}});
222+
DoDebugAndDump(RecoStep::TPCSectorTracking, 128, trk, &GPUTPCTracker::DumpTrackletHits, *mDebugFile);
223+
if (GetProcessingSettings().debugMask & 256 && GetProcessingSettings().deterministicGPUReconstruction < 2) {
224+
trk.DumpHitWeights(*mDebugFile);
227225
}
228226

229-
if (!(doGPU || GetProcessingSettings().debugLevel >= 1) || GetProcessingSettings().trackletConstructorInPipeline) {
230-
runKernel<GPUTPCTrackletSelector>({GetGridAuto(useStream), {iSector}});
231-
runKernel<GPUTPCExtrapolationTrackingCopyNumbers>({{1, -ThreadCount(), useStream}, {iSector}}, 1);
232-
if (GetProcessingSettings().deterministicGPUReconstruction) {
233-
runKernel<GPUTPCSectorDebugSortKernels, GPUTPCSectorDebugSortKernels::sectorTracks>({GetGrid(1, 1, useStream), {iSector}});
234-
}
235-
TransferMemoryResourceLinkToHost(RecoStep::TPCSectorTracking, trk.MemoryResCommon(), useStream, &mEvents->sector[iSector]);
236-
streamMap[iSector] = useStream;
237-
if (GetProcessingSettings().debugLevel >= 3) {
238-
GPUInfo("Sector %u, Number of tracks: %d", iSector, *trk.NTracks());
239-
}
240-
DoDebugAndDump(RecoStep::TPCSectorTracking, 512, trk, &GPUTPCTracker::DumpTrackHits, *mDebugFile);
227+
runKernel<GPUTPCTrackletSelector>({GetGridAuto(useStream), {iSector}});
228+
runKernel<GPUTPCExtrapolationTrackingCopyNumbers>({{1, -ThreadCount(), useStream}, {iSector}}, 1);
229+
if (GetProcessingSettings().deterministicGPUReconstruction) {
230+
runKernel<GPUTPCSectorDebugSortKernels, GPUTPCSectorDebugSortKernels::sectorTracks>({GetGrid(1, 1, useStream), {iSector}});
241231
}
232+
TransferMemoryResourceLinkToHost(RecoStep::TPCSectorTracking, trk.MemoryResCommon(), useStream, &mEvents->sector[iSector]);
233+
streamMap[iSector] = useStream;
234+
if (GetProcessingSettings().debugLevel >= 3) {
235+
GPUInfo("Sector %u, Number of tracks: %d", iSector, *trk.NTracks());
236+
}
237+
DoDebugAndDump(RecoStep::TPCSectorTracking, 512, trk, &GPUTPCTracker::DumpTrackHits, *mDebugFile);
242238
});
243239
mRec->SetNActiveThreadsOuterLoop(1);
244240
if (error) {
@@ -280,11 +276,6 @@ int32_t GPUChainTracking::RunTPCTrackingSectors_internal()
280276

281277
if (GetProcessingSettings().keepAllMemory) {
282278
TransferMemoryResourcesToHost(RecoStep::TPCSectorTracking, &processors()->tpcTrackers[iSector], -1, true);
283-
if (!GetProcessingSettings().trackletConstructorInPipeline) {
284-
if (GetProcessingSettings().debugMask & 256 && GetProcessingSettings().deterministicGPUReconstruction < 2) {
285-
processors()->tpcTrackers[iSector].DumpHitWeights(*mDebugFile);
286-
}
287-
}
288279
}
289280

290281
if (transferRunning[iSector]) {

‎GPU/GPUTracking/SectorTracker/GPUTPCTracker.cxx‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -93,7 +93,7 @@ void* GPUTPCTracker::SetPointersCommon(void* mem)
9393
void GPUTPCTracker::RegisterMemoryAllocation()
9494
{
9595
AllocateAndInitializeLate();
96-
bool reuseCondition = !mRec->GetProcessingSettings().keepDisplayMemory && mRec->GetProcessingSettings().trackletConstructorInPipeline && ((mRec->GetRecoStepsGPU() & GPUDataTypes::RecoStep::TPCSectorTracking) || mRec->GetProcessingSettings().inKernelParallel == 1 || mRec->GetProcessingSettings().nHostThreads == 1);
96+
bool reuseCondition = !mRec->GetProcessingSettings().keepDisplayMemory && ((mRec->GetRecoStepsGPU() & GPUDataTypes::RecoStep::TPCSectorTracking) || mRec->GetProcessingSettings().inKernelParallel == 1 || mRec->GetProcessingSettings().nHostThreads == 1);
9797
GPUMemoryReuse reLinks{reuseCondition, GPUMemoryReuse::REUSE_1TO1, GPUMemoryReuse::TrackerDataLinks, (uint16_t)(mISector % mRec->GetProcessingSettings().nStreams)};
9898
mMemoryResLinks = mRec->RegisterMemoryAllocation(this, &GPUTPCTracker::SetPointersDataLinks, GPUMemoryResource::MEMORY_SCRATCH | GPUMemoryResource::MEMORY_STACK, "TPCSectorLinks", reLinks);
9999
mMemoryResSectorScratch = mRec->RegisterMemoryAllocation(this, &GPUTPCTracker::SetPointersDataScratch, GPUMemoryResource::MEMORY_SCRATCH | GPUMemoryResource::MEMORY_STACK | GPUMemoryResource::MEMORY_CUSTOM, "TPCSectorScratch");

0 commit comments

Comments
 (0)