GPU: Fix GPUChkErr macro, GPU::Common should not use GPU::GPUTracking internals

davidrohr · davidrohr · commit 64abf5c5e675 · 2025-03-18T08:10:18.000+01:00
diff --git a/GPU/Common/GPUCommonHelpers.h b/GPU/Common/GPUCommonHelpers.h
@@ -33,6 +33,7 @@
 #define GPUChkErrSI(x) o2::gpu::internal::GPUReconstructionChkErr(x, __FILE__, __LINE__, false)
 
 #include "GPUCommonDef.h"
+#include "GPUCommonLogger.h"
 #include <cstdint>
 
 namespace o2::gpu::internal
@@ -43,7 +44,7 @@ extern int32_t GPUCOMMON_INTERNAL_CAT(GPUReconstruction, GPUCA_GPUTYPE, ChkErr)(
 inline int32_t GPUReconstructionCPUChkErr(const int64_t error, const char* file, int32_t line)
 {
   if (error) {
-    GPUError("GPUCommon Error Code %d (%s:%d)", error, file, line);
+    LOGF(error, "GPUCommon Error Code %ld (%s:%d)", (long)error, file, line);
   }
   return error != 0;
 }

Original file line number	Diff line number	Diff line change
`@@ -33,6 +33,7 @@`
`33`	`33`	`#define GPUChkErrSI(x) o2::gpu::internal::GPUReconstructionChkErr(x, __FILE__, __LINE__, false)`
`34`	`34`
`35`	`35`	`#include "GPUCommonDef.h"`
	`36`	`+#include "GPUCommonLogger.h"`
`36`	`37`	`#include <cstdint>`
`37`	`38`
`38`	`39`	`namespace o2::gpu::internal`
`@@ -43,7 +44,7 @@ extern int32_t GPUCOMMON_INTERNAL_CAT(GPUReconstruction, GPUCA_GPUTYPE, ChkErr)(`
`43`	`44`	`inline int32_t GPUReconstructionCPUChkErr(const int64_t error, const char* file, int32_t line)`
`44`	`45`	`{`
`45`	`46`	`if (error) {`
`46`		`- GPUError("GPUCommon Error Code %d (%s:%d)", error, file, line);`
	`47`	`+ LOGF(error, "GPUCommon Error Code %ld (%s:%d)", (long)error, file, line);`
`47`	`48`	`}`
`48`	`49`	`return error != 0;`
`49`	`50`	`}`