ITS: test new GPU tracking

Author: mpuccio

Detectors/ITSMFT/ITS/tracking/GPU/ITStrackingGPU/TrackingKernels.h

@@ -262,7 +262,6 @@ void countTrackSeedHandler(TrackSeed<NLayers>* trackSeeds,
                            const std::vector<float>& layerxX0Host,
                            const unsigned int nSeeds,
                            const float Bz,
-                           const int startLevel,
                            const float maxChi2ClusterAttachment,
                            const float maxChi2NDF,
                            const int reseedIfShorter,
@@ -276,20 +275,35 @@ template <int NLayers>
 void computeTrackSeedHandler(TrackSeed<NLayers>* trackSeeds,
                              const TrackingFrameInfo** foundTrackingFrameInfo,
                              const Cluster** unsortedClusters,
+                             const IndexTableUtils<NLayers>* utils,
+                             const typename ROFMaskTable<NLayers>::View& rofMask,
+                             const typename ROFOverlapTable<NLayers>::View& rofOverlaps,
+                             const Cluster** clusters,
+                             const unsigned char** usedClusters,
+                             const int** clustersIndexTables,
+                             const int** ROFClusters,
                              o2::its::TrackITSExt* tracks,
                              const int* seedLUT,
+                             TrackExtensionHypothesis<NLayers>* activeHypotheses,
+                             TrackExtensionHypothesis<NLayers>* nextHypotheses,
                              const std::vector<float>& layerRadiiHost,
                              const std::vector<float>& minPtsHost,
                              const std::vector<float>& layerxX0Host,
                              const unsigned int nSeeds,
                              const unsigned int nTracks,
                              const float Bz,
-                             const int startLevel,
                              const float maxChi2ClusterAttachment,
                              const float maxChi2NDF,
                              const int reseedIfShorter,
                              const bool repeatRefitOut,
                              const bool shiftRefToCluster,
+                             const int nLayers,
+                             const int phiBins,
+                             const int beamWidth,
+                             const bool extendTop,
+                             const bool extendBot,
+                             const float nSigmaCutPhi,
+                             const float nSigmaCutZ,
                              const o2::base::Propagator* propagator,
                              const o2::base::PropagatorF::MatCorrType matCorrType,
                              o2::its::ExternalAllocator* alloc);

Detectors/ITSMFT/ITS/tracking/GPU/cuda/TrackerTraitsGPU.cxx

@@ -308,6 +308,11 @@ void TrackerTraitsGPU<NLayers>::findRoads(const int iteration)
   firstClusters.resize(this->mTrkParams[iteration].NLayers);
   sharedFirstClusters.resize(this->mTrkParams[iteration].NLayers);
   const auto hostTopology = mTimeFrameGPU->getTrackingTopologyView();
+  const bool extendTop = this->mTrkParams[iteration].PassFlags[IterationStep::TrackFollowerTop];
+  const bool extendBot = this->mTrkParams[iteration].PassFlags[IterationStep::TrackFollowerBot];
+  const bool extendTracks = extendTop || extendBot;
+  int nExtendedTracks{0};
+  int nExtendedClusters{0};
   for (int startLevel{this->mTrkParams[iteration].CellsPerRoad()}; startLevel >= this->mTrkParams[iteration].CellMinimumLevel(); --startLevel) {
     bounded_vector<TrackSeed<NLayers>> trackSeeds(this->getMemoryPool().get());
     for (int startCellTopologyId{0}; startCellTopologyId < hostTopology.nCells; ++startCellTopologyId) {
@@ -357,7 +362,6 @@ void TrackerTraitsGPU<NLayers>::findRoads(const int iteration)
                           this->mTrkParams[iteration].LayerxX0,
                           trackSeeds.size(),
                           this->mBz,
-                          startLevel,
                           this->mTrkParams[iteration].MaxChi2ClusterAttachment,
                           this->mTrkParams[iteration].MaxChi2NDF,
                           this->mTrkParams[iteration].ReseedIfShorter,
@@ -367,32 +371,66 @@ void TrackerTraitsGPU<NLayers>::findRoads(const int iteration)
                           this->mTrkParams[iteration].CorrType,
                           mTimeFrameGPU->getFrameworkAllocator());
     mTimeFrameGPU->createTrackITSExtDevice(trackSeeds.size());
+    if (extendTracks) {
+      mTimeFrameGPU->createTrackExtensionScratchDevice(kTrackExtensionLaunchThreads, this->mTrkParams[iteration].TrackFollowerBeamWidth);
+    }
     computeTrackSeedHandler(mTimeFrameGPU->getDeviceTrackSeeds(),
                             mTimeFrameGPU->getDeviceArrayTrackingFrameInfo(),
                             mTimeFrameGPU->getDeviceArrayUnsortedClusters(),
+                            mTimeFrameGPU->getDeviceIndexTableUtils(),
+                            mTimeFrameGPU->getDeviceROFMaskTableView(),
+                            mTimeFrameGPU->getDeviceROFOverlapTableView(),
+                            mTimeFrameGPU->getDeviceArrayClusters(),
+                            (const unsigned char**)mTimeFrameGPU->getDeviceArrayUsedClusters(),
+                            mTimeFrameGPU->getDeviceArrayClustersIndexTables(),
+                            mTimeFrameGPU->getDeviceROFrameClusters(),
                             mTimeFrameGPU->getDeviceTrackITSExt(),
                             mTimeFrameGPU->getDeviceTrackSeedsLUT(),
+                            extendTracks ? mTimeFrameGPU->getDeviceActiveTrackExtensionHypotheses() : nullptr,
+                            extendTracks ? mTimeFrameGPU->getDeviceNextTrackExtensionHypotheses() : nullptr,
                             this->mTrkParams[iteration].LayerRadii,
                             this->mTrkParams[iteration].MinPt,
                             this->mTrkParams[iteration].LayerxX0,
                             trackSeeds.size(),
                             mTimeFrameGPU->getNTrackSeeds(),
                             this->mBz,
-                            startLevel,
                             this->mTrkParams[iteration].MaxChi2ClusterAttachment,
                             this->mTrkParams[iteration].MaxChi2NDF,
                             this->mTrkParams[iteration].ReseedIfShorter,
                             this->mTrkParams[iteration].RepeatRefitOut,
                             this->mTrkParams[iteration].ShiftRefToCluster,
+                            this->mTrkParams[iteration].NLayers,
+                            this->mTrkParams[iteration].PhiBins,
+                            this->mTrkParams[iteration].TrackFollowerBeamWidth,
+                            extendTop,
+                            extendBot,
+                            this->mTrkParams[iteration].TrackFollowerNSigmaCutPhi,
+                            this->mTrkParams[iteration].TrackFollowerNSigmaCutZ,
                             mTimeFrameGPU->getDevicePropagator(),
                             this->mTrkParams[iteration].CorrType,
                             mTimeFrameGPU->getFrameworkAllocator());
     mTimeFrameGPU->downloadTrackITSExtDevice();
 
     auto& tracks = mTimeFrameGPU->getTrackITSExt();
+    const auto previousAcceptedTracks = this->mTimeFrame->getTracks().size();
     this->acceptTracks(iteration, tracks, firstClusters, sharedFirstClusters);
+    if (extendTracks) {
+      for (auto iTrack{previousAcceptedTracks}; iTrack < this->mTimeFrame->getTracks().size(); ++iTrack) {
+        const auto diff = (this->mTimeFrame->getTracks()[iTrack].getPattern() >> kExtendedPatternShift) & makeAddedClustersPatternMask<NLayers>();
+        if (!diff) {
+          continue;
+        }
+        ++nExtendedTracks;
+        for (int iLayer{0}; iLayer < this->mTrkParams[iteration].NLayers; ++iLayer) {
+          nExtendedClusters += (diff >> iLayer) & 0x1u;
+        }
+      }
+    }
     mTimeFrameGPU->loadUsedClustersDevice();
   }
+  if (extendTracks) {
+    LOGP(info, "Integrated track extension accepted {} tracks using {} clusters in iteration {}", nExtendedTracks, nExtendedClusters, iteration);
+  }
   this->markTracks(iteration, sharedFirstClusters);
   // wipe the artefact memory
   mTimeFrameGPU->popMemoryStack(iteration);