Simplify SiPixelFedCablingMapGPU SoA #301
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -33,21 +33,15 @@ class SiPixelFedCablingMapGPUWrapper { | |
|
|
||
| private: | ||
| const SiPixelFedCablingMap *cablingMap_; | ||
| std::vector<unsigned char, CUDAHostAllocator<unsigned char>> modToUnpDefault; | ||
| unsigned int size; | ||
|
|
||
| bool hasQuality_; | ||
|
|
||
| SiPixelFedCablingMapGPU *cablingMapHost = nullptr; // pointer to struct in CPU | ||
|
|
||
| struct GPUData { | ||
| ~GPUData(); | ||
| SiPixelFedCablingMapGPU *cablingMapDevice = nullptr; // pointer to struct in GPU | ||
|
There was a problem hiding this comment. last comment not relevant to this PR, but rather to The pattern seems to be:
Payload *cablingMapHost = nullptr; // pointer to struct in CPU
struct PayloadWrapper {
~PayloadWrapper();
Payload *payload = nullptr; // pointer to struct in GPU
};
CUDAESProduct<PayloadWrapper> payload_;
Payload const* getGPUProductAsync(cuda::stream_t<>& cudaStream) const {
const auto& data = payload_.dataForCurrentDeviceAsync(cudaStream, [this](PayloadWrapper& data, cuda::stream_t<>& stream) {
// allocate
cudaCheck(cudaMalloc(&data.payload, sizeof(Payload)));
// transfer
cudaCheck(cudaMemcpyAsync(data.payload, this->cablingMapHost, sizeof(Payload), cudaMemcpyDefault, stream.id()));
});
return data.payload;
}Would it make sense to encapsulate more of the common part into And/or to drop the PayloadWrapper in favour of a unique_ptr, possibly with a custom destructor ? There was a problem hiding this comment. I'm all for encapsulating patterns, but I need to think this for a while. I made an issue #336 of it to remind. |
||
| }; | ||
| CUDAESProduct<GPUData> gpuData_; | ||
|
|
||
|
|
||
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -22,11 +22,11 @@ SiPixelFedCablingMapGPUWrapper::SiPixelFedCablingMapGPUWrapper(SiPixelFedCabling | |
| TrackerGeometry const& trackerGeom, | ||
| SiPixelQuality const *badPixelInfo): | ||
| cablingMap_(&cablingMap), | ||
| modToUnpDefault(pixelgpudetails::MAX_SIZE), | ||
| hasQuality_(badPixelInfo != nullptr) | ||
| { | ||
| cudaCheck(cudaMallocHost(&cablingMapHost, sizeof(SiPixelFedCablingMapGPU))); | ||
|
|
||
| std::vector<unsigned int> const& fedIds = cablingMap.fedIds(); | ||
| std::unique_ptr<SiPixelFedCablingTree> const& cabling = cablingMap.cablingTree(); | ||
|
There was a problem hiding this comment. not relevant for this PR, but wouldn't it be simpler to use a "dumb" pointer ( There was a problem hiding this comment. I'd say it would be clearer to drop There was a problem hiding this comment. same for |
||
|
|
||
|
|
@@ -41,21 +41,21 @@ SiPixelFedCablingMapGPUWrapper::SiPixelFedCablingMapGPUWrapper(SiPixelFedCabling | |
| for (unsigned int roc = 1; roc <= pixelgpudetails::MAX_ROC; roc++) { | ||
| path = {fed, link, roc}; | ||
|
There was a problem hiding this comment. is there a reason why at line 39 we use for (unsigned int fed = startFed; fed <= endFed; fed++) {instead of for (unsigned int fed: fedIds) {? There was a problem hiding this comment. I don't know if it can happen, but if |
||
| const sipixelobjects::PixelROC* pixelRoc = cabling->findItem(path); | ||
| cablingMapHost->fed[index] = fed; | ||
| cablingMapHost->link[index] = link; | ||
| cablingMapHost->roc[index] = roc; | ||
| if (pixelRoc != nullptr) { | ||
| cablingMapHost->RawId[index] = pixelRoc->rawId(); | ||
| cablingMapHost->rocInDet[index] = pixelRoc->idInDetUnit(); | ||
| modToUnpDefault[index] = false; | ||
| if (badPixelInfo != nullptr) | ||
| cablingMapHost->badRocs[index] = badPixelInfo->IsRocBad(pixelRoc->rawId(), pixelRoc->idInDetUnit()); | ||
| else | ||
| cablingMapHost->badRocs[index] = false; | ||
| } else { // store some dummy number | ||
| cablingMapHost->RawId[index] = 9999; | ||
| cablingMapHost->rocInDet[index] = 9999; | ||
| cablingMapHost->badRocs[index] = true; | ||
| modToUnpDefault[index] = true; | ||
| } | ||
| index++; | ||
|
|
@@ -72,58 +72,44 @@ SiPixelFedCablingMapGPUWrapper::SiPixelFedCablingMapGPUWrapper(SiPixelFedCabling | |
| // idinLnk varies between 1 to 8 | ||
|
|
||
| for (int i = 1; i < index; i++) { | ||
| if (cablingMapHost->RawId[i] == 9999) { | ||
| cablingMapHost->moduleId[i] = 9999; | ||
| } else { | ||
| /* | ||
| std::cout << cablingMapHost->RawId[i] << std::endl; | ||
| */ | ||
| auto gdet = trackerGeom.idToDetUnit(cablingMapHost->RawId[i]); | ||
| if (!gdet) { | ||
| LogDebug("SiPixelFedCablingMapGPU") << " Not found: " << cablingMapHost->RawId[i] << std::endl; | ||
| continue; | ||
| } | ||
| cablingMapHost->moduleId[i] = gdet->index(); | ||
| } | ||
| LogDebug("SiPixelFedCablingMapGPU") << "----------------------------------------------------------------------------" << std::endl; | ||
| LogDebug("SiPixelFedCablingMapGPU") << i << std::setw(20) << cablingMapHost->fed[i] << std::setw(20) << cablingMapHost->link[i] << std::setw(20) << cablingMapHost->roc[i] << std::endl; | ||
| LogDebug("SiPixelFedCablingMapGPU") << i << std::setw(20) << cablingMapHost->RawId[i] << std::setw(20) << cablingMapHost->rocInDet[i] << std::setw(20) << cablingMapHost->moduleId[i] << std::endl; | ||
| LogDebug("SiPixelFedCablingMapGPU") << i << std::setw(20) << (bool)cablingMapHost->badRocs[i] << std::setw(20) << std::endl; | ||
| LogDebug("SiPixelFedCablingMapGPU") << "----------------------------------------------------------------------------" << std::endl; | ||
|
|
||
| } | ||
|
|
||
| cablingMapHost->size = index-1; | ||
| } | ||
|
|
||
|
|
||
| SiPixelFedCablingMapGPUWrapper::~SiPixelFedCablingMapGPUWrapper() { | ||
| cudaCheck(cudaFreeHost(cablingMapHost)); | ||
| } | ||
|
|
||
|
|
||
| const SiPixelFedCablingMapGPU *SiPixelFedCablingMapGPUWrapper::getGPUProductAsync(cuda::stream_t<>& cudaStream) const { | ||
| const auto& data = gpuData_.dataForCurrentDeviceAsync(cudaStream, [this](GPUData& data, cuda::stream_t<>& stream) { | ||
| // allocate | ||
| cudaCheck(cudaMalloc(&data.cablingMapDevice, sizeof(SiPixelFedCablingMapGPU))); | ||
|
|
||
| // transfer | ||
| cudaCheck(cudaMemcpyAsync(data.cablingMapDevice, this->cablingMapHost, sizeof(SiPixelFedCablingMapGPU), cudaMemcpyDefault, stream.id())); | ||
| }); | ||
| return data.cablingMapDevice; | ||
| } | ||
|
|
||
|
|
@@ -170,16 +156,6 @@ cudautils::device::unique_ptr<unsigned char[]> SiPixelFedCablingMapGPUWrapper::g | |
|
|
||
|
|
||
| SiPixelFedCablingMapGPUWrapper::GPUData::~GPUData() { | ||
| cudaCheck(cudaFree(cablingMapDevice)); | ||
| } | ||
|
|
||
|
|
||
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
modToUnpDefault_?