GPU: Clear error codes after printing

davidrohr · davidrohr · commit 97df43f61dfc · 2022-06-05T21:33:28.000+02:00
diff --git a/GPU/GPUTracking/Global/GPUChainTracking.cxx b/GPU/GPUTracking/Global/GPUChainTracking.cxx
@@ -864,17 +864,18 @@ int GPUChainTracking::CheckErrorCodes(bool cpuOnly, bool forceShowErrors)
       }
     }
   }
+  ClearErrorCodes(cpuOnly);
   return retVal;
 }
 
-void GPUChainTracking::ClearErrorCodes()
+void GPUChainTracking::ClearErrorCodes(bool cpuOnly)
 {
   processors()->errorCodes.clear();
-  const auto& threadContext = GetThreadContext();
-  if (mRec->IsGPU()) {
+  if (mRec->IsGPU() && !cpuOnly) {
+    const auto& threadContext = GetThreadContext();
     WriteToConstantMemory(RecoStep::NoRecoStep, (char*)&processors()->errorCodes - (char*)processors(), &processorsShadow()->errorCodes, sizeof(processorsShadow()->errorCodes), 0);
+    TransferMemoryResourceLinkToGPU(RecoStep::NoRecoStep, mInputsHost->mResourceErrorCodes, 0);
   }
-  TransferMemoryResourceLinkToGPU(RecoStep::NoRecoStep, mInputsHost->mResourceErrorCodes, 0);
 }
 
 void GPUChainTracking::SetDefaultInternalO2Propagator(bool useGPUField)
diff --git a/GPU/GPUTracking/Global/GPUChainTracking.h b/GPU/GPUTracking/Global/GPUChainTracking.h
@@ -81,7 +81,7 @@ class GPUChainTracking : public GPUChain, GPUReconstructionHelpers::helperDelega
   int CheckErrorCodes(bool cpuOnly = false, bool forceShowErrors = false) override;
   bool SupportsDoublePipeline() override { return true; }
   int FinalizePipelinedProcessing() override;
-  void ClearErrorCodes();
+  void ClearErrorCodes(bool cpuOnly = false);
   void DoQueuedCalibUpdates(int stream); // Forces doing queue calib updates, don't call when you are not sure you are allowed to do so!
 
   // Structures for input and output data

Original file line number	Diff line number	Diff line change
`@@ -864,17 +864,18 @@ int GPUChainTracking::CheckErrorCodes(bool cpuOnly, bool forceShowErrors)`
`864`	`864`	`}`
`865`	`865`	`}`
`866`	`866`	`}`
	`867`	`+ ClearErrorCodes(cpuOnly);`
`867`	`868`	`return retVal;`
`868`	`869`	`}`
`869`	`870`
`870`		`-void GPUChainTracking::ClearErrorCodes()`
	`871`	`+void GPUChainTracking::ClearErrorCodes(bool cpuOnly)`
`871`	`872`	`{`
`872`	`873`	`processors()->errorCodes.clear();`
`873`		`- const auto& threadContext = GetThreadContext();`
`874`		`- if (mRec->IsGPU()) {`
	`874`	`+ if (mRec->IsGPU() && !cpuOnly) {`
	`875`	`+ const auto& threadContext = GetThreadContext();`
`875`	`876`	`WriteToConstantMemory(RecoStep::NoRecoStep, (char)&processors()->errorCodes - (char)processors(), &processorsShadow()->errorCodes, sizeof(processorsShadow()->errorCodes), 0);`
	`877`	`+ TransferMemoryResourceLinkToGPU(RecoStep::NoRecoStep, mInputsHost->mResourceErrorCodes, 0);`
`876`	`878`	`}`
`877`		`- TransferMemoryResourceLinkToGPU(RecoStep::NoRecoStep, mInputsHost->mResourceErrorCodes, 0);`
`878`	`879`	`}`
`879`	`880`
`880`	`881`	`void GPUChainTracking::SetDefaultInternalO2Propagator(bool useGPUField)`