Skip to content
This repository has been archived by the owner on Dec 9, 2024. It is now read-only.

Warnings cleanup #383

Merged
merged 7 commits into from
Apr 6, 2024
Merged

Warnings cleanup #383

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
ad65716
clear shadow warnings
slava77devel Apr 3, 2024
c5e1a2c
add Wno-attributes from CMSSW set
slava77devel Apr 3, 2024
3e14558
correct type of alpaka::memset
slava77devel Apr 3, 2024
cf27f1b
cleanup maybe uninitialized
slava77devel Apr 3, 2024
ec8b752
code format
slava77devel Apr 3, 2024
d051a15
add more warning/error flags from scram-tools.file/tools/gcc/gcc-cxxc…
slava77devel Apr 3, 2024
8f67f82
move what was maybe initialized more locally to methods that are supp…
slava77devel Apr 5, 2024
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
4 changes: 2 additions & 2 deletions SDL/Constants.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -102,7 +102,7 @@ namespace SDL {
template <typename Vec>
ALPAKA_FN_HOST ALPAKA_FN_INLINE WorkDiv createWorkDiv(const Vec& blocksPerGrid,
const Vec& threadsPerBlock,
const Vec& elementsPerThread) {
const Vec& elementsPerThreadArg) {
Vec adjustedBlocks = blocksPerGrid;
Vec adjustedThreads = threadsPerBlock;

Expand All @@ -117,7 +117,7 @@ namespace SDL {
adjustedBlocks = Vec::all(static_cast<Idx>(1));
#endif

return WorkDiv(adjustedBlocks, adjustedThreads, elementsPerThread);
return WorkDiv(adjustedBlocks, adjustedThreads, elementsPerThreadArg);
}

// If a compile time flag does not define PT_CUT, default to 0.8 (GeV)
Expand Down
26 changes: 9 additions & 17 deletions SDL/Hit.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -93,11 +93,11 @@ namespace SDL {
hitRangesUpper_buf(allocBufWrapper<int>(devAccIn, nModules, queue)),
hitRangesnLower_buf(allocBufWrapper<int8_t>(devAccIn, nModules, queue)),
hitRangesnUpper_buf(allocBufWrapper<int8_t>(devAccIn, nModules, queue)) {
alpaka::memset(queue, hitRanges_buf, -1);
alpaka::memset(queue, hitRangesLower_buf, -1);
alpaka::memset(queue, hitRangesUpper_buf, -1);
alpaka::memset(queue, hitRangesnLower_buf, -1);
alpaka::memset(queue, hitRangesnUpper_buf, -1);
alpaka::memset(queue, hitRanges_buf, 0xff);
alpaka::memset(queue, hitRangesLower_buf, 0xff);
alpaka::memset(queue, hitRangesUpper_buf, 0xff);
alpaka::memset(queue, hitRangesnLower_buf, 0xff);
alpaka::memset(queue, hitRangesnUpper_buf, 0xff);
ariostas marked this conversation as resolved.
Show resolved Hide resolved
alpaka::wait(queue);
}
};
Expand Down Expand Up @@ -192,12 +192,8 @@ namespace SDL {
struct SDL::modules modulesInGPU,
struct SDL::hits hitsInGPU,
int const& nLowerModules) const {
using Dim = alpaka::Dim<TAcc>;
using Idx = alpaka::Idx<TAcc>;
using Vec = alpaka::Vec<Dim, Idx>;

Vec const globalThreadIdx = alpaka::getIdx<alpaka::Grid, alpaka::Threads>(acc);
Vec const gridThreadExtent = alpaka::getWorkDiv<alpaka::Grid, alpaka::Threads>(acc);
auto const globalThreadIdx = alpaka::getIdx<alpaka::Grid, alpaka::Threads>(acc);
auto const gridThreadExtent = alpaka::getWorkDiv<alpaka::Grid, alpaka::Threads>(acc);

for (int lowerIndex = globalThreadIdx[2]; lowerIndex < nLowerModules; lowerIndex += gridThreadExtent[2]) {
uint16_t upperIndex = modulesInGPU.partnerModuleIndices[lowerIndex];
Expand Down Expand Up @@ -226,12 +222,8 @@ namespace SDL {
struct SDL::hits hitsInGPU,
unsigned int const& nHits) const // Total number of hits in event
{
using Dim = alpaka::Dim<TAcc>;
using Idx = alpaka::Idx<TAcc>;
using Vec = alpaka::Vec<Dim, Idx>;

Vec const globalThreadIdx = alpaka::getIdx<alpaka::Grid, alpaka::Threads>(acc);
Vec const gridThreadExtent = alpaka::getWorkDiv<alpaka::Grid, alpaka::Threads>(acc);
auto const globalThreadIdx = alpaka::getIdx<alpaka::Grid, alpaka::Threads>(acc);
auto const gridThreadExtent = alpaka::getWorkDiv<alpaka::Grid, alpaka::Threads>(acc);
for (unsigned int ihit = globalThreadIdx[2]; ihit < nHits; ihit += gridThreadExtent[2]) {
float ihit_x = hitsInGPU.xs[ihit];
float ihit_y = hitsInGPU.ys[ihit];
Expand Down
40 changes: 10 additions & 30 deletions SDL/Kernels.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -198,12 +198,8 @@ namespace SDL {
struct SDL::modules modulesInGPU,
struct SDL::quintuplets quintupletsInGPU,
struct SDL::objectRanges rangesInGPU) const {
using Dim = alpaka::Dim<TAcc>;
using Idx = alpaka::Idx<TAcc>;
using Vec = alpaka::Vec<Dim, Idx>;

Vec const globalThreadIdx = alpaka::getIdx<alpaka::Grid, alpaka::Threads>(acc);
Vec const gridThreadExtent = alpaka::getWorkDiv<alpaka::Grid, alpaka::Threads>(acc);
auto const globalThreadIdx = alpaka::getIdx<alpaka::Grid, alpaka::Threads>(acc);
auto const gridThreadExtent = alpaka::getWorkDiv<alpaka::Grid, alpaka::Threads>(acc);

for (unsigned int lowmod = globalThreadIdx[0]; lowmod < *modulesInGPU.nLowerModules;
lowmod += gridThreadExtent[0]) {
Expand Down Expand Up @@ -257,12 +253,8 @@ namespace SDL {
ALPAKA_FN_ACC void operator()(TAcc const& acc,
struct SDL::quintuplets quintupletsInGPU,
struct SDL::objectRanges rangesInGPU) const {
using Dim = alpaka::Dim<TAcc>;
using Idx = alpaka::Idx<TAcc>;
using Vec = alpaka::Vec<Dim, Idx>;

Vec const globalThreadIdx = alpaka::getIdx<alpaka::Grid, alpaka::Threads>(acc);
Vec const gridThreadExtent = alpaka::getWorkDiv<alpaka::Grid, alpaka::Threads>(acc);
auto const globalThreadIdx = alpaka::getIdx<alpaka::Grid, alpaka::Threads>(acc);
auto const gridThreadExtent = alpaka::getWorkDiv<alpaka::Grid, alpaka::Threads>(acc);

for (unsigned int lowmodIdx1 = globalThreadIdx[1]; lowmodIdx1 < *(rangesInGPU.nEligibleT5Modules);
lowmodIdx1 += gridThreadExtent[1]) {
Expand Down Expand Up @@ -336,12 +328,8 @@ namespace SDL {
ALPAKA_FN_ACC void operator()(TAcc const& acc,
struct SDL::pixelTriplets pixelTripletsInGPU,
bool secondPass) const {
using Dim = alpaka::Dim<TAcc>;
using Idx = alpaka::Idx<TAcc>;
using Vec = alpaka::Vec<Dim, Idx>;

Vec const globalThreadIdx = alpaka::getIdx<alpaka::Grid, alpaka::Threads>(acc);
Vec const gridThreadExtent = alpaka::getWorkDiv<alpaka::Grid, alpaka::Threads>(acc);
auto const globalThreadIdx = alpaka::getIdx<alpaka::Grid, alpaka::Threads>(acc);
auto const gridThreadExtent = alpaka::getWorkDiv<alpaka::Grid, alpaka::Threads>(acc);

for (unsigned int ix = globalThreadIdx[1]; ix < *pixelTripletsInGPU.nPixelTriplets; ix += gridThreadExtent[1]) {
for (unsigned int jx = globalThreadIdx[2]; jx < *pixelTripletsInGPU.nPixelTriplets; jx += gridThreadExtent[2]) {
Expand Down Expand Up @@ -375,12 +363,8 @@ namespace SDL {
ALPAKA_FN_ACC void operator()(TAcc const& acc,
struct SDL::pixelQuintuplets pixelQuintupletsInGPU,
bool secondPass) const {
using Dim = alpaka::Dim<TAcc>;
using Idx = alpaka::Idx<TAcc>;
using Vec = alpaka::Vec<Dim, Idx>;

Vec const globalThreadIdx = alpaka::getIdx<alpaka::Grid, alpaka::Threads>(acc);
Vec const gridThreadExtent = alpaka::getWorkDiv<alpaka::Grid, alpaka::Threads>(acc);
auto const globalThreadIdx = alpaka::getIdx<alpaka::Grid, alpaka::Threads>(acc);
auto const gridThreadExtent = alpaka::getWorkDiv<alpaka::Grid, alpaka::Threads>(acc);

unsigned int nPixelQuintuplets = *pixelQuintupletsInGPU.nPixelQuintuplets;
for (unsigned int ix = globalThreadIdx[1]; ix < nPixelQuintuplets; ix += gridThreadExtent[1]) {
Expand Down Expand Up @@ -414,12 +398,8 @@ namespace SDL {
struct SDL::modules modulesInGPU,
struct SDL::segments segmentsInGPU,
bool secondpass) const {
using Dim = alpaka::Dim<TAcc>;
using Idx = alpaka::Idx<TAcc>;
using Vec = alpaka::Vec<Dim, Idx>;

Vec const globalThreadIdx = alpaka::getIdx<alpaka::Grid, alpaka::Threads>(acc);
Vec const gridThreadExtent = alpaka::getWorkDiv<alpaka::Grid, alpaka::Threads>(acc);
auto const globalThreadIdx = alpaka::getIdx<alpaka::Grid, alpaka::Threads>(acc);
auto const gridThreadExtent = alpaka::getWorkDiv<alpaka::Grid, alpaka::Threads>(acc);

int pixelModuleIndex = *modulesInGPU.nLowerModules;
unsigned int nPixelSegments = segmentsInGPU.nSegments[pixelModuleIndex];
Expand Down
5 changes: 4 additions & 1 deletion SDL/Makefile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -48,7 +48,10 @@ PTCUTFLAG =
LSTWARNINGSFLAG =
CMSSW_WERRORS_CPU = -Werror=pointer-arith -Werror=overlength-strings -Werror=return-type -Werror=missing-braces -Werror=unused-value -Werror=unused-label \
-Werror=address -Werror=format -Werror=sign-compare -Werror=write-strings -Werror=delete-non-virtual-dtor -Werror=strict-aliasing -Werror=narrowing \
-Werror=unused-but-set-variable -Werror=reorder -Werror=unused-variable -Werror=conversion-null -Werror=return-local-addr -Wnon-virtual-dtor -Werror=switch
-Werror=unused-but-set-variable -Werror=reorder -Werror=unused-variable -Werror=conversion-null -Werror=return-local-addr -Wnon-virtual-dtor -Werror=switch \
-Werror=main -Werror=overflow -Werror=format-contains-nul -Werror=type-limits -Wreturn-type -Wextra -Wpessimizing-move -Wclass-memaccess -Wunused \
-Wparentheses -Wno-vla -Wno-non-template-friend -Wno-long-long -Wno-cast-function-type -Wno-unused-but-set-parameter -Wno-ignored-qualifiers \
-Wno-unused-parameter -Wno-unused-local-typedefs -Wno-attributes
CMSSW_WERRORS_CUDA = $(patsubst %,-Xcompiler %,$(CMSSW_WERRORS_CPU))
CACHEFLAG_FLAGS = -DCACHE_ALLOC
T5CUTFLAGS = $(T5DNNFLAG) $(T5RZCHI2FLAG) $(T5RPHICHI2FLAG)
Expand Down
35 changes: 13 additions & 22 deletions SDL/MiniDoublet.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -648,7 +648,7 @@ namespace SDL {
float& shiftedX,
float& shiftedY,
float& shiftedZ,
float& noshiftedDz,
float& noShiftedDz,
float& noShiftedDphi,
float& noShiftedDphiChange,
float xLower,
Expand Down Expand Up @@ -720,6 +720,9 @@ namespace SDL {
noShiftedDphi = SDL::deltaPhi(acc, xLower, yLower, xUpper, yUpper);
}
} else {
shiftedX = 0;
shiftedY = 0;
shiftedZ = 0;
dPhi = SDL::deltaPhi(acc, xLower, yLower, xUpper, yUpper);
noShiftedDphi = dPhi;
}
Expand Down Expand Up @@ -762,7 +765,7 @@ namespace SDL {
}

pass = pass && (alpaka::math::abs(acc, dPhiChange) < miniCut);

noShiftedDz = 0; // not used anywhere
return pass;
};

Expand All @@ -779,7 +782,7 @@ namespace SDL {
float& shiftedX,
float& shiftedY,
float& shiftedZ,
float& noshiftedDz,
float& noShiftedDz,
float& noShiftedDphi,
float& noShiftedDphichange,
float xLower,
Expand Down Expand Up @@ -880,7 +883,7 @@ namespace SDL {
dPhiChange = dPhi / dzFrac * (1.f + dzFrac);
noShiftedDphichange = noShiftedDphi / dzFrac * (1.f + dzFrac);
pass = pass && (alpaka::math::abs(acc, dPhiChange) < miniCut);

noShiftedDz = 0; // not used anywhere
return pass;
};

Expand All @@ -891,12 +894,8 @@ namespace SDL {
struct SDL::hits hitsInGPU,
struct SDL::miniDoublets mdsInGPU,
struct SDL::objectRanges rangesInGPU) const {
using Dim = alpaka::Dim<TAcc>;
using Idx = alpaka::Idx<TAcc>;
using Vec = alpaka::Vec<Dim, Idx>;

Vec const globalThreadIdx = alpaka::getIdx<alpaka::Grid, alpaka::Threads>(acc);
Vec const gridThreadExtent = alpaka::getWorkDiv<alpaka::Grid, alpaka::Threads>(acc);
auto const globalThreadIdx = alpaka::getIdx<alpaka::Grid, alpaka::Threads>(acc);
auto const gridThreadExtent = alpaka::getWorkDiv<alpaka::Grid, alpaka::Threads>(acc);

for (uint16_t lowerModuleIndex = globalThreadIdx[1]; lowerModuleIndex < (*modulesInGPU.nLowerModules);
lowerModuleIndex += gridThreadExtent[1]) {
Expand Down Expand Up @@ -991,12 +990,8 @@ namespace SDL {
ALPAKA_FN_ACC void operator()(TAcc const& acc,
struct SDL::modules modulesInGPU,
struct SDL::objectRanges rangesInGPU) const {
using Dim = alpaka::Dim<TAcc>;
using Idx = alpaka::Idx<TAcc>;
using Vec = alpaka::Vec<Dim, Idx>;

Vec const globalThreadIdx = alpaka::getIdx<alpaka::Grid, alpaka::Threads>(acc);
Vec const gridThreadExtent = alpaka::getWorkDiv<alpaka::Grid, alpaka::Threads>(acc);
auto const globalThreadIdx = alpaka::getIdx<alpaka::Grid, alpaka::Threads>(acc);
auto const gridThreadExtent = alpaka::getWorkDiv<alpaka::Grid, alpaka::Threads>(acc);

// Initialize variables in shared memory and set to 0
int& nTotalMDs = alpaka::declareSharedVar<int, __COUNTER__>(acc);
Expand Down Expand Up @@ -1087,12 +1082,8 @@ namespace SDL {
struct SDL::miniDoublets mdsInGPU,
struct SDL::objectRanges rangesInGPU,
struct SDL::hits hitsInGPU) const {
using Dim = alpaka::Dim<TAcc>;
using Idx = alpaka::Idx<TAcc>;
using Vec = alpaka::Vec<Dim, Idx>;

Vec const globalThreadIdx = alpaka::getIdx<alpaka::Grid, alpaka::Threads>(acc);
Vec const gridThreadExtent = alpaka::getWorkDiv<alpaka::Grid, alpaka::Threads>(acc);
auto const globalThreadIdx = alpaka::getIdx<alpaka::Grid, alpaka::Threads>(acc);
auto const gridThreadExtent = alpaka::getWorkDiv<alpaka::Grid, alpaka::Threads>(acc);

for (uint16_t i = globalThreadIdx[2]; i < *modulesInGPU.nLowerModules; i += gridThreadExtent[2]) {
if (mdsInGPU.nMDs[i] == 0 or hitsInGPU.hitRanges[i * 2] == -1) {
Expand Down
24 changes: 12 additions & 12 deletions SDL/Module.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -137,18 +137,18 @@ namespace SDL {
device_nTotalSegs_buf(allocBufWrapper<unsigned int>(devAccIn, 1, queue)),
device_nTotalTrips_buf(allocBufWrapper<unsigned int>(devAccIn, 1, queue)),
device_nTotalQuints_buf(allocBufWrapper<unsigned int>(devAccIn, 1, queue)) {
alpaka::memset(queue, hitRanges_buf, -1);
alpaka::memset(queue, hitRangesLower_buf, -1);
alpaka::memset(queue, hitRangesUpper_buf, -1);
alpaka::memset(queue, hitRangesnLower_buf, -1);
alpaka::memset(queue, hitRangesnUpper_buf, -1);
alpaka::memset(queue, mdRanges_buf, -1);
alpaka::memset(queue, segmentRanges_buf, -1);
alpaka::memset(queue, trackletRanges_buf, -1);
alpaka::memset(queue, tripletRanges_buf, -1);
alpaka::memset(queue, trackCandidateRanges_buf, -1);
alpaka::memset(queue, quintupletRanges_buf, -1);
alpaka::memset(queue, quintupletModuleIndices_buf, -1);
alpaka::memset(queue, hitRanges_buf, 0xff);
alpaka::memset(queue, hitRangesLower_buf, 0xff);
alpaka::memset(queue, hitRangesUpper_buf, 0xff);
alpaka::memset(queue, hitRangesnLower_buf, 0xff);
alpaka::memset(queue, hitRangesnUpper_buf, 0xff);
alpaka::memset(queue, mdRanges_buf, 0xff);
alpaka::memset(queue, segmentRanges_buf, 0xff);
alpaka::memset(queue, trackletRanges_buf, 0xff);
alpaka::memset(queue, tripletRanges_buf, 0xff);
alpaka::memset(queue, trackCandidateRanges_buf, 0xff);
alpaka::memset(queue, quintupletRanges_buf, 0xff);
alpaka::memset(queue, quintupletModuleIndices_buf, 0xff);
ariostas marked this conversation as resolved.
Show resolved Hide resolved
alpaka::wait(queue);
}
};
Expand Down
Loading