diff --git a/CUDADataFormats/SiPixelDigi/interface/SiPixelDigisCUDASOAView.h b/CUDADataFormats/SiPixelDigi/interface/SiPixelDigisCUDASOAView.h index 36b3a5d5907ab..70d00ae584279 100644 --- a/CUDADataFormats/SiPixelDigi/interface/SiPixelDigisCUDASOAView.h +++ b/CUDADataFormats/SiPixelDigi/interface/SiPixelDigisCUDASOAView.h @@ -96,14 +96,13 @@ class SiPixelDigisCUDASOAView { uint32_t* rawIdArr_; template - ReturnType* getColumnAddress(LocationType column, StoreType& store, int maxFedWords) { - return reinterpret_cast(store.get() + - static_cast(column) * roundFor128ByteAlignment(maxFedWords)); + ReturnType* getColumnAddress(LocationType column, StoreType& store, int size) { + return reinterpret_cast(store.get() + static_cast(column) * roundFor128ByteAlignment(size)); } - static int roundFor128ByteAlignment(int numFedWords) { - int mul = 128 / sizeof(uint16_t); - return ((numFedWords + mul - 1) / mul) * mul; + static int roundFor128ByteAlignment(int size) { + constexpr int mul = 128 / sizeof(uint16_t); + return ((size + mul - 1) / mul) * mul; }; }; diff --git a/CUDADataFormats/SiPixelDigi/src/SiPixelDigisCUDA.cc b/CUDADataFormats/SiPixelDigi/src/SiPixelDigisCUDA.cc index 49a95e5044087..9a7f8ae8bdad5 100644 --- a/CUDADataFormats/SiPixelDigi/src/SiPixelDigisCUDA.cc +++ b/CUDADataFormats/SiPixelDigi/src/SiPixelDigisCUDA.cc @@ -8,7 +8,7 @@ SiPixelDigisCUDA::SiPixelDigisCUDA(size_t maxFedWords, cudaStream_t stream) : m_store(cms::cuda::make_device_unique( SiPixelDigisCUDASOAView::roundFor128ByteAlignment(maxFedWords) * - int(SiPixelDigisCUDASOAView::StorageLocation::kMAX), + static_cast(SiPixelDigisCUDASOAView::StorageLocation::kMAX), stream)), m_view(m_store, maxFedWords, SiPixelDigisCUDASOAView::StorageLocation::kMAX) { assert(maxFedWords != 0); @@ -17,11 +17,12 @@ SiPixelDigisCUDA::SiPixelDigisCUDA(size_t maxFedWords, cudaStream_t stream) cms::cuda::host::unique_ptr SiPixelDigisCUDA::copyAllToHostAsync( cudaStream_t stream) const { auto ret = cms::cuda::make_host_unique( - m_view.roundFor128ByteAlignment(nDigis()) * int(SiPixelDigisCUDASOAView::StorageLocationHost::kMAX), stream); + m_view.roundFor128ByteAlignment(nDigis()) * static_cast(SiPixelDigisCUDASOAView::StorageLocationHost::kMAX), + stream); cudaCheck(cudaMemcpyAsync(ret.get(), m_view.clus(), m_view.roundFor128ByteAlignment(nDigis()) * sizeof(SiPixelDigisCUDA::StoreType) * - int(SiPixelDigisCUDASOAView::StorageLocationHost::kMAX), + static_cast(SiPixelDigisCUDASOAView::StorageLocationHost::kMAX), cudaMemcpyDeviceToHost, stream)); return ret;