Skip to content
Merged
Changes from 1 commit
Commits
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
Original file line number Diff line number Diff line change
Expand Up @@ -82,6 +82,12 @@ namespace ALPAKA_ACCELERATOR_NAMESPACE::pixelClustering {
return Status{(status[index] >> shift) & mask};
}

ALPAKA_FN_ACC ALPAKA_FN_INLINE constexpr bool isDuplicate(uint32_t const* __restrict__ status,
uint16_t x,
uint16_t y) {
return getStatus(status, x, y) == kDuplicate;
}

// Record a pixel at the given coordinates and return the updated status.
ALPAKA_FN_ACC ALPAKA_FN_INLINE Status promote(Acc1D const& acc,
uint32_t* status,
Expand Down Expand Up @@ -232,21 +238,27 @@ namespace ALPAKA_ACCELERATOR_NAMESPACE::pixelClustering {
constexpr bool isPhase2 = std::is_base_of<pixelTopology::Phase2, TrackerTraits>::value;
if constexpr (not isPhase2) {
// packed words array used to store the pixelStatus of each pixel
auto& image = alpaka::declareSharedVar<uint32_t[pixelStatus::size], __COUNTER__>(acc);
auto& status = alpaka::declareSharedVar<uint32_t[pixelStatus::size], __COUNTER__>(acc);
Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

please do not rename the variable


if (lastPixel > 1) {
for (uint32_t i : cms::alpakatools::independent_group_elements(acc, pixelStatus::size)) {
image[i] = 0;
status[i] = 0;
}
alpaka::syncBlockThreads(acc);

for (uint32_t i : cms::alpakatools::independent_group_elements(acc, firstPixel, lastPixel)) {
// skip invalid pixels
if (digi_view[i].moduleId() == ::pixelClustering::invalidModuleId)
continue;
pixelStatus::promote(acc, status, digi_view[i].xx(), digi_view[i].yy());
}
alpaka::syncBlockThreads(acc);

for (uint32_t i : cms::alpakatools::independent_group_elements(acc, firstPixel, lastPixel)) {
// skip invalid pixels
if (digi_view[i].moduleId() == ::pixelClustering::invalidModuleId)
continue;
auto status = pixelStatus::promote(acc, image, digi_view[i].xx(), digi_view[i].yy());
if (pixelStatus::kDuplicate == status) {
// mark the duplicate pixel as invalid
if (pixelStatus::isDuplicate(status, digi_view[i].xx(), digi_view[i].yy())) {
digi_view[i].moduleId() = ::pixelClustering::invalidModuleId;
digi_view[i].rawIdArr() = 0;
}
Expand Down