GPU TPC: Don't fail in ZS decoding if there was only trigger/etc input but no ZS data

davidrohr · davidrohr · commit 61bbcaf771b8 · 2022-05-26T23:56:32.000+02:00
diff --git a/GPU/GPUTracking/Global/GPUChainTrackingClusterizer.cxx b/GPU/GPUTracking/Global/GPUChainTrackingClusterizer.cxx
@@ -355,7 +355,7 @@ int GPUChainTracking::RunTPCClusterizer_prepare(bool restorePointers)
   }
   mCFContext->fragmentFirst = CfFragment{std::max<int>(mCFContext->tpcMaxTimeBin + 1, TPC_MAX_FRAGMENT_LEN), TPC_MAX_FRAGMENT_LEN};
   for (int iSlice = 0; iSlice < GetProcessingSettings().nTPCClustererLanes && iSlice < NSLICES; iSlice++) {
-    if (mIOPtrs.tpcZS && mCFContext->nPagesSector[iSlice]) {
+    if (mIOPtrs.tpcZS && mCFContext->nPagesSector[iSlice] && mCFContext->zsVersion != -1) {
       mCFContext->nextPos[iSlice] = RunTPCClusterizer_transferZS(iSlice, mCFContext->fragmentFirst, GetProcessingSettings().nTPCClustererLanes + iSlice);
     }
   }
@@ -492,7 +492,7 @@ int GPUChainTracking::RunTPCClusterizer(bool synchronizeOutput)
         }
 
         if (mIOPtrs.tpcZS) {
-          if (mCFContext->nPagesSector[iSlice]) {
+          if (mCFContext->nPagesSector[iSlice] && mCFContext->zsVersion != -1) {
             clusterer.mPmemory->counters.nPositions = mCFContext->nextPos[iSlice].first;
             clusterer.mPmemory->counters.nPagesSubslice = mCFContext->nextPos[iSlice].second;
           } else {
@@ -510,14 +510,14 @@ int GPUChainTracking::RunTPCClusterizer(bool synchronizeOutput)
         }
         DoDebugAndDump(RecoStep::TPCClusterFinding, 0, clusterer, &GPUTPCClusterFinder::DumpChargeMap, *mDebugFile, "Zeroed Charges");
 
-        if (mIOPtrs.tpcZS && mCFContext->nPagesSector[iSlice]) {
+        if (mIOPtrs.tpcZS && mCFContext->nPagesSector[iSlice] && mCFContext->zsVersion != -1) {
           TransferMemoryResourceLinkToGPU(RecoStep::TPCClusterFinding, mInputsHost->mResourceZS, lane);
           SynchronizeStream(GetProcessingSettings().nTPCClustererLanes + lane);
         }
 
         SynchronizeStream(mRec->NStreams() - 1); // Wait for copying to constant memory
 
-        if (mIOPtrs.tpcZS && !mCFContext->nPagesSector[iSlice]) {
+        if (mIOPtrs.tpcZS && (!mCFContext->nPagesSector[iSlice] || mCFContext->zsVersion == -1)) {
           continue;
         }
 
@@ -559,7 +559,7 @@ int GPUChainTracking::RunTPCClusterizer(bool synchronizeOutput)
             nextSlice += GetProcessingSettings().nTPCClustererLanes;
             f = mCFContext->fragmentFirst;
           }
-          if (nextSlice < NSLICES && mIOPtrs.tpcZS && mCFContext->nPagesSector[nextSlice]) {
+          if (nextSlice < NSLICES && mIOPtrs.tpcZS && mCFContext->nPagesSector[nextSlice] && mCFContext->zsVersion != -1) {
             mCFContext->nextPos[nextSlice] = RunTPCClusterizer_transferZS(nextSlice, f, GetProcessingSettings().nTPCClustererLanes + lane);
           }
         }
diff --git a/GPU/GPUTracking/Global/GPUChainTrackingMerger.cxx b/GPU/GPUTracking/Global/GPUChainTrackingMerger.cxx
@@ -226,7 +226,6 @@ int GPUChainTracking::RunTPCTrackingMerger(bool synchronizeOutput)
   }
   if (doGPU && !doGPUall) {
     TransferMemoryResourcesToHost(RecoStep::TPCMerging, &Merger, 0);
-    GPUError("foo1");
     SynchronizeStream(0);
   }
 
@@ -274,7 +273,6 @@ int GPUChainTracking::RunTPCTrackingMerger(bool synchronizeOutput)
   }
   if (GetProcessingSettings().keepDisplayMemory && !GetProcessingSettings().keepAllMemory) {
     TransferMemoryResourcesToHost(RecoStep::TPCMerging, &Merger, -1, true);
-    GPUError("foo2");
   }
 
   mRec->ReturnVolatileDeviceMemory();
@@ -307,7 +305,6 @@ int GPUChainTracking::RunTPCTrackingMerger(bool synchronizeOutput)
     if (GetProcessingSettings().runMC && mIOPtrs.clustersNative && mIOPtrs.clustersNative->clustersMCTruth) {
       AllocateRegisteredMemory(Merger.MemoryResOutputO2MC(), mSubOutputControls[GPUTrackingOutputs::getIndex(&GPUTrackingOutputs::tpcTracksO2Labels)]);
       TransferMemoryResourcesToHost(RecoStep::TPCMerging, &Merger, -1, true);
-      GPUError("foo3");
       runKernel<GPUTPCGMO2Output, GPUTPCGMO2Output::mc>(GetGridAuto(0, GPUReconstruction::krnlDeviceType::CPU), krnlRunRangeNone, krnlEventNone);
     } else if (doGPUall) {
       RecordMarker(&mEvents->single, 0);

Original file line number	Diff line number	Diff line change
`@@ -355,7 +355,7 @@ int GPUChainTracking::RunTPCClusterizer_prepare(bool restorePointers)`
`355`	`355`	`}`
`356`	`356`	`mCFContext->fragmentFirst = CfFragment{std::max<int>(mCFContext->tpcMaxTimeBin + 1, TPC_MAX_FRAGMENT_LEN), TPC_MAX_FRAGMENT_LEN};`
`357`	`357`	`for (int iSlice = 0; iSlice < GetProcessingSettings().nTPCClustererLanes && iSlice < NSLICES; iSlice++) {`
`358`		`- if (mIOPtrs.tpcZS && mCFContext->nPagesSector[iSlice]) {`
	`358`	`+ if (mIOPtrs.tpcZS && mCFContext->nPagesSector[iSlice] && mCFContext->zsVersion != -1) {`
`359`	`359`	`mCFContext->nextPos[iSlice] = RunTPCClusterizer_transferZS(iSlice, mCFContext->fragmentFirst, GetProcessingSettings().nTPCClustererLanes + iSlice);`
`360`	`360`	`}`
`361`	`361`	`}`
`@@ -492,7 +492,7 @@ int GPUChainTracking::RunTPCClusterizer(bool synchronizeOutput)`
`492`	`492`	`}`
`493`	`493`
`494`	`494`	`if (mIOPtrs.tpcZS) {`
`495`		`- if (mCFContext->nPagesSector[iSlice]) {`
	`495`	`+ if (mCFContext->nPagesSector[iSlice] && mCFContext->zsVersion != -1) {`
`496`	`496`	`clusterer.mPmemory->counters.nPositions = mCFContext->nextPos[iSlice].first;`
`497`	`497`	`clusterer.mPmemory->counters.nPagesSubslice = mCFContext->nextPos[iSlice].second;`
`498`	`498`	`} else {`
`@@ -510,14 +510,14 @@ int GPUChainTracking::RunTPCClusterizer(bool synchronizeOutput)`
`510`	`510`	`}`
`511`	`511`	`DoDebugAndDump(RecoStep::TPCClusterFinding, 0, clusterer, &GPUTPCClusterFinder::DumpChargeMap, *mDebugFile, "Zeroed Charges");`
`512`	`512`
`513`		`- if (mIOPtrs.tpcZS && mCFContext->nPagesSector[iSlice]) {`
	`513`	`+ if (mIOPtrs.tpcZS && mCFContext->nPagesSector[iSlice] && mCFContext->zsVersion != -1) {`
`514`	`514`	`TransferMemoryResourceLinkToGPU(RecoStep::TPCClusterFinding, mInputsHost->mResourceZS, lane);`
`515`	`515`	`SynchronizeStream(GetProcessingSettings().nTPCClustererLanes + lane);`
`516`	`516`	`}`
`517`	`517`
`518`	`518`	`SynchronizeStream(mRec->NStreams() - 1); // Wait for copying to constant memory`
`519`	`519`
`520`		`- if (mIOPtrs.tpcZS && !mCFContext->nPagesSector[iSlice]) {`
	`520`	`+ if (mIOPtrs.tpcZS && (!mCFContext->nPagesSector[iSlice] \|\| mCFContext->zsVersion == -1)) {`
`521`	`521`	`continue;`
`522`	`522`	`}`
`523`	`523`
`@@ -559,7 +559,7 @@ int GPUChainTracking::RunTPCClusterizer(bool synchronizeOutput)`
`559`	`559`	`nextSlice += GetProcessingSettings().nTPCClustererLanes;`
`560`	`560`	`f = mCFContext->fragmentFirst;`
`561`	`561`	`}`
`562`		`- if (nextSlice < NSLICES && mIOPtrs.tpcZS && mCFContext->nPagesSector[nextSlice]) {`
	`562`	`+ if (nextSlice < NSLICES && mIOPtrs.tpcZS && mCFContext->nPagesSector[nextSlice] && mCFContext->zsVersion != -1) {`
`563`	`563`	`mCFContext->nextPos[nextSlice] = RunTPCClusterizer_transferZS(nextSlice, f, GetProcessingSettings().nTPCClustererLanes + lane);`
`564`	`564`	`}`
`565`	`565`	`}`
Original file line number	Diff line number	Diff line change
`@@ -226,7 +226,6 @@ int GPUChainTracking::RunTPCTrackingMerger(bool synchronizeOutput)`
`226`	`226`	`}`
`227`	`227`	`if (doGPU && !doGPUall) {`
`228`	`228`	`TransferMemoryResourcesToHost(RecoStep::TPCMerging, &Merger, 0);`
`229`		`- GPUError("foo1");`
`230`	`229`	`SynchronizeStream(0);`
`231`	`230`	`}`
`232`	`231`
`@@ -274,7 +273,6 @@ int GPUChainTracking::RunTPCTrackingMerger(bool synchronizeOutput)`
`274`	`273`	`}`
`275`	`274`	`if (GetProcessingSettings().keepDisplayMemory && !GetProcessingSettings().keepAllMemory) {`
`276`	`275`	`TransferMemoryResourcesToHost(RecoStep::TPCMerging, &Merger, -1, true);`
`277`		`- GPUError("foo2");`
`278`	`276`	`}`
`279`	`277`
`280`	`278`	`mRec->ReturnVolatileDeviceMemory();`
`@@ -307,7 +305,6 @@ int GPUChainTracking::RunTPCTrackingMerger(bool synchronizeOutput)`
`307`	`305`	`if (GetProcessingSettings().runMC && mIOPtrs.clustersNative && mIOPtrs.clustersNative->clustersMCTruth) {`
`308`	`306`	`AllocateRegisteredMemory(Merger.MemoryResOutputO2MC(), mSubOutputControls[GPUTrackingOutputs::getIndex(&GPUTrackingOutputs::tpcTracksO2Labels)]);`
`309`	`307`	`TransferMemoryResourcesToHost(RecoStep::TPCMerging, &Merger, -1, true);`
`310`		`- GPUError("foo3");`
`311`	`308`	`runKernel<GPUTPCGMO2Output, GPUTPCGMO2Output::mc>(GetGridAuto(0, GPUReconstruction::krnlDeviceType::CPU), krnlRunRangeNone, krnlEventNone);`
`312`	`309`	`} else if (doGPUall) {`
`313`	`310`	`RecordMarker(&mEvents->single, 0);`