Skip to content

ITS: GPU: fix perVtx + upc iteration + atomic level update #14540

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
f3sch merged 1 commit into from
Jul 24, 2025
Merged

ITS: GPU: fix perVtx + upc iteration + atomic level update #14540

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion Detectors/ITSMFT/ITS/tracking/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,6 @@
# granted to it by virtue of its status as an Intergovernmental Organization
# or submit itself to any jurisdiction.

#add_compile_options(-O0 -g -fPIC -fno-omit-frame-pointer)
o2_add_library(ITStracking
TARGETVARNAME targetName
SOURCES src/ClusterLines.cxx
Expand Down Expand Up @@ -37,6 +36,7 @@ o2_add_library(ITStracking
PRIVATE_LINK_LIBRARIES
O2::Steer
TBB::tbb)
# target_compile_options(${targetName} PRIVATE -O0 -g -fPIC -fno-omit-frame-pointer)

o2_add_library(ITSTrackingInterface
TARGETVARNAME targetName
Expand Down
7 changes: 1 addition & 6 deletions Detectors/ITSMFT/ITS/tracking/GPU/ITStrackingGPU/TimeFrameGPU.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,11 +23,6 @@
namespace o2::its::gpu
{

class DefaultGPUAllocator : public ExternalAllocator
{
void* allocate(size_t size) override;
};

template <int nLayers = 7>
class TimeFrameGPU : public TimeFrame<nLayers>
{
Expand Down Expand Up @@ -84,7 +79,7 @@ class TimeFrameGPU : public TimeFrame<nLayers>
return mGpuStreams[stream];
}
auto& getStreams() { return mGpuStreams; }
void wipe(const int);
virtual void wipe() final;

/// interface
int getNClustersInRofSpan(const int, const int, const int) const;
Expand Down
6 changes: 6 additions & 0 deletions Detectors/ITSMFT/ITS/tracking/GPU/ITStrackingGPU/Utils.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,6 +21,12 @@
#include "GPUCommonDef.h"
#include "GPUCommonHelpers.h"

#ifndef __HIPCC__
#define THRUST_NAMESPACE thrust::cuda
#else
#define THRUST_NAMESPACE thrust::hip
#endif

namespace o2::its
{

Expand Down
138 changes: 72 additions & 66 deletions Detectors/ITSMFT/ITS/tracking/GPU/cuda/TimeFrameGPU.cu
View file
Open in desktop

Large diffs are not rendered by default.

27 changes: 12 additions & 15 deletions Detectors/ITSMFT/ITS/tracking/GPU/cuda/TrackerTraitsGPU.cxx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,10 +18,10 @@
#include "ITStrackingGPU/TrackerTraitsGPU.h"
#include "ITStrackingGPU/TrackingKernels.h"
#include "ITStracking/TrackingConfigParam.h"
#include "ITStracking/Constants.h"

namespace o2::its
{
constexpr int UnusedIndex{-1};

template <int nLayers>
void TrackerTraitsGPU<nLayers>::initialiseTimeFrame(const int iteration)
Expand All @@ -48,10 +48,8 @@ void TrackerTraitsGPU<nLayers>::adoptTimeFrame(TimeFrame<nLayers>* tf)
template <int nLayers>
void TrackerTraitsGPU<nLayers>::computeLayerTracklets(const int iteration, int iROFslice, int iVertex)
{
auto& conf = o2::its::ITSGpuTrackingParamConfig::Instance();
const auto& conf = o2::its::ITSGpuTrackingParamConfig::Instance();

const Vertex diamondVert({this->mTrkParams[iteration].Diamond[0], this->mTrkParams[iteration].Diamond[1], this->mTrkParams[iteration].Diamond[2]}, {25.e-6f, 0.f, 0.f, 25.e-6f, 0.f, 36.f}, 1, 1.f);
gsl::span<const Vertex> diamondSpan(&diamondVert, 1);
int startROF{this->mTrkParams[iteration].nROFsPerIterations > 0 ? iROFslice * this->mTrkParams[iteration].nROFsPerIterations : 0};
int endROF{o2::gpu::CAMath::Min(this->mTrkParams[iteration].nROFsPerIterations > 0 ? (iROFslice + 1) * this->mTrkParams[iteration].nROFsPerIterations + this->mTrkParams[iteration].DeltaROF : mTimeFrameGPU->getNrof(), mTimeFrameGPU->getNrof())};

Expand Down Expand Up @@ -128,6 +126,7 @@ void TrackerTraitsGPU<nLayers>::computeLayerCells(const int iteration)

for (int iLayer = 0; iLayer < this->mTrkParams[iteration].CellsPerRoad(); ++iLayer) {
if (!mTimeFrameGPU->getNTracklets()[iLayer + 1] || !mTimeFrameGPU->getNTracklets()[iLayer]) {
mTimeFrameGPU->getNCells()[iLayer] = 0;
continue;
}
const int currentLayerTrackletsNum{static_cast<int>(mTimeFrameGPU->getNTracklets()[iLayer])};
Expand Down Expand Up @@ -173,9 +172,10 @@ void TrackerTraitsGPU<nLayers>::findCellsNeighbours(const int iteration)
mTimeFrameGPU->createNeighboursIndexTablesDevice();
const auto& conf = o2::its::ITSGpuTrackingParamConfig::Instance();
for (int iLayer{0}; iLayer < this->mTrkParams[iteration].CellsPerRoad() - 1; ++iLayer) {
const int currentLayerCellsNum{static_cast<int>(mTimeFrameGPU->getNCells()[iLayer])};
const int nextLayerCellsNum{static_cast<int>(mTimeFrameGPU->getNCells()[iLayer + 1])};

if (!nextLayerCellsNum) {
if (!nextLayerCellsNum || !currentLayerCellsNum) {
mTimeFrameGPU->getNNeighbours()[iLayer] = 0;
continue;
}

Expand All @@ -188,7 +188,7 @@ void TrackerTraitsGPU<nLayers>::findCellsNeighbours(const int iteration)
this->mTrkParams[0].MaxChi2ClusterAttachment,
this->mBz,
iLayer,
mTimeFrameGPU->getNCells()[iLayer],
currentLayerCellsNum,
nextLayerCellsNum,
1e2,
conf.nBlocks,
Expand All @@ -204,7 +204,7 @@ void TrackerTraitsGPU<nLayers>::findCellsNeighbours(const int iteration)
this->mTrkParams[0].MaxChi2ClusterAttachment,
this->mBz,
iLayer,
mTimeFrameGPU->getNCells()[iLayer],
currentLayerCellsNum,
nextLayerCellsNum,
1e2,
conf.nBlocks,
Expand Down Expand Up @@ -251,8 +251,8 @@ void TrackerTraitsGPU<nLayers>::findRoads(const int iteration)
conf.nThreads);
}
// fixme: I don't want to move tracks back and forth, but I need a way to use a thrust::allocator that is aware of our managed memory.
if (!trackSeeds.size()) {
LOGP(info, "No track seeds found, skipping track finding");
if (trackSeeds.empty()) {
LOGP(debug, "No track seeds found, skipping track finding");
continue;
}
mTimeFrameGPU->createTrackITSExtDevice(trackSeeds);
Expand Down Expand Up @@ -283,7 +283,7 @@ void TrackerTraitsGPU<nLayers>::findRoads(const int iteration)
int nShared = 0;
bool isFirstShared{false};
for (int iLayer{0}; iLayer < this->mTrkParams[0].NLayers; ++iLayer) {
if (track.getClusterIndex(iLayer) == UnusedIndex) {
if (track.getClusterIndex(iLayer) == constants::UnusedIndex) {
continue;
}
nShared += int(mTimeFrameGPU->isClusterUsed(iLayer, track.getClusterIndex(iLayer)));
Expand All @@ -296,7 +296,7 @@ void TrackerTraitsGPU<nLayers>::findRoads(const int iteration)

std::array<int, 3> rofs{INT_MAX, INT_MAX, INT_MAX};
for (int iLayer{0}; iLayer < this->mTrkParams[0].NLayers; ++iLayer) {
if (track.getClusterIndex(iLayer) == UnusedIndex) {
if (track.getClusterIndex(iLayer) == constants::UnusedIndex) {
continue;
}
mTimeFrameGPU->markUsedCluster(iLayer, track.getClusterIndex(iLayer));
Expand All @@ -320,9 +320,6 @@ void TrackerTraitsGPU<nLayers>::findRoads(const int iteration)
}
mTimeFrameGPU->loadUsedClustersDevice();
}
if (iteration == this->mTrkParams.size() - 1) {
mTimeFrameGPU->unregisterHostMemory(0);
}
};

template <int nLayers>
Expand Down
Loading