From bce49b46c7b9c1a9ddc4356157dd1f9fd23d6889 Mon Sep 17 00:00:00 2001
From: Felix Weiglhofer <weiglhofer@fias.uni-frankfurt.de>
Date: Wed, 10 May 2023 15:23:18 +0000
Subject: [PATCH] algo: Use common GPU identifier in STS Hitfinder.
---
algo/detectors/sts/StsHitfinder.cxx | 3 ---
algo/detectors/sts/StsHitfinder.h | 25 ++++++++++++-------------
2 files changed, 12 insertions(+), 16 deletions(-)
diff --git a/algo/detectors/sts/StsHitfinder.cxx b/algo/detectors/sts/StsHitfinder.cxx
index 23422af0b8..620e30488c 100644
--- a/algo/detectors/sts/StsHitfinder.cxx
+++ b/algo/detectors/sts/StsHitfinder.cxx
@@ -6,9 +6,6 @@
using namespace cbm::algo;
-
-XPU_IMAGE(GpuOnline);
-
XPU_CONSTANT(TheStsHitfinder);
XPU_KERNEL(SortDigis, StsSortDigiSmem)
diff --git a/algo/detectors/sts/StsHitfinder.h b/algo/detectors/sts/StsHitfinder.h
index 656f12a15d..6cba6abd13 100644
--- a/algo/detectors/sts/StsHitfinder.h
+++ b/algo/detectors/sts/StsHitfinder.h
@@ -9,11 +9,10 @@
#include <xpu/device.h>
+#include "gpu/DeviceImage.h"
+
namespace cbm::algo
{
- struct GpuOnline {
- }; // xpu image identifier, has to be moved when more steps are moved to GPU
-
// Block sizes / other compile time constants that need tuning
enum GpuConstants
{
@@ -35,16 +34,16 @@ namespace cbm::algo
};
// Kernel declarations
- XPU_EXPORT_KERNEL(GpuOnline, SortDigis);
+ XPU_EXPORT_KERNEL(GPUReco, SortDigis);
// Combine substeps for finding clusters into a single kernel
- XPU_EXPORT_KERNEL(GpuOnline, FindClustersSingleStep);
- XPU_EXPORT_KERNEL(GpuOnline, CalculateOffsets);
- XPU_EXPORT_KERNEL(GpuOnline, FindClusters);
- XPU_EXPORT_KERNEL(GpuOnline, FindClustersBasic);
- XPU_EXPORT_KERNEL(GpuOnline, CalculateClusters);
- XPU_EXPORT_KERNEL(GpuOnline, CalculateClustersBasic);
- XPU_EXPORT_KERNEL(GpuOnline, SortClusters);
- XPU_EXPORT_KERNEL(GpuOnline, FindHits);
+ XPU_EXPORT_KERNEL(GPUReco, FindClustersSingleStep);
+ XPU_EXPORT_KERNEL(GPUReco, CalculateOffsets);
+ XPU_EXPORT_KERNEL(GPUReco, FindClusters);
+ XPU_EXPORT_KERNEL(GPUReco, FindClustersBasic);
+ XPU_EXPORT_KERNEL(GPUReco, CalculateClusters);
+ XPU_EXPORT_KERNEL(GPUReco, CalculateClustersBasic);
+ XPU_EXPORT_KERNEL(GPUReco, SortClusters);
+ XPU_EXPORT_KERNEL(GPUReco, FindHits);
} // namespace cbm::algo
@@ -413,7 +412,7 @@ namespace cbm::algo
};
// StsHitfinder lives in constant memory
- XPU_EXPORT_CONSTANT(GpuOnline, StsHitfinderGpu, TheStsHitfinder);
+ XPU_EXPORT_CONSTANT(GPUReco, StsHitfinderGpu, TheStsHitfinder);
} // namespace cbm::algo
--
GitLab