Skip to content

Make sure 16 bytes alignment is still enforced #15302

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
ktf merged 4 commits into from
Apr 24, 2026
Merged

Make sure 16 bytes alignment is still enforced #15302

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
f3a1fef
Make sure 16 bytes alignment is still enforced
ktf Apr 22, 2026
1d1d3d8
Update GPU/TPCFastTransformation/TPCFastSpaceChargeCorrection.cxx
ktf Apr 23, 2026
6806c5a
Update GPU/TPCFastTransformation/TPCFastSpaceChargeCorrection.cxx
ktf Apr 23, 2026
2e24ae5
Update GPU/TPCFastTransformation/TPCFastSpaceChargeCorrection.cxx
ktf Apr 23, 2026
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
10 changes: 7 additions & 3 deletions GPU/TPCFastTransformation/TPCFastSpaceChargeCorrection.cxx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -147,6 +147,7 @@ void TPCFastSpaceChargeCorrection::setActualBufferAddress(char* actualFlatBuffer
}
size_t bufferSize = scBufferOffset + scBufferSize;
for (int32_t is = 0; is < 3; is++) {
bufferSize = alignSize(bufferSize, SplineType::getParameterAlignmentBytes());
mCorrectionData[is] = reinterpret_cast<char*>(mFlatBufferPtr + bufferSize);
bufferSize += mSectorDataSizeBytes[is] * mGeo.getNumberOfSectors();
}
Expand Down Expand Up @@ -255,7 +256,7 @@ void TPCFastSpaceChargeCorrection::setActualBufferAddress(char* actualFlatBuffer

for (int32_t is = 0; is < 3; is++) {
size_t oldCorrectionDataOffset = alignSize(oldBufferSize, SplineType::getParameterAlignmentBytes());
size_t correctionDataOffset = bufferSize;
size_t correctionDataOffset = alignSize(bufferSize, SplineType::getParameterAlignmentBytes());
mCorrectionData[is] = reinterpret_cast<char*>(mFlatBufferPtr + correctionDataOffset);
memmove(mCorrectionData[is], mFlatBufferPtr + oldCorrectionDataOffset, mSectorDataSizeBytes[is] * mGeo.getNumberOfSectors());
oldBufferSize = oldCorrectionDataOffset + mSectorDataSizeBytes[is] * mGeo.getNumberOfSectors();
Expand Down Expand Up @@ -508,11 +509,13 @@ void TPCFastSpaceChargeCorrection::finishConstruction()
size_t bufferSize = scBufferOffsets[0] + scBufferSize;
size_t correctionDataOffset[3];
for (int32_t is = 0; is < 3; is++) {
correctionDataOffset[is] = bufferSize;
correctionDataOffset[is] = alignSize(bufferSize, SplineType::getParameterAlignmentBytes());
bufferSize = correctionDataOffset[is];
Comment thread
ktf marked this conversation as resolved.
Outdated
mSectorDataSizeBytes[is] = 0;
for (int32_t j = 0; j < mGeo.getNumberOfRows(); j++) {
RowInfo& row = getRowInfo(j);
row.dataOffsetBytes[is] = mSectorDataSizeBytes[is];
row.dataOffsetBytes[is] = alignSize(mSectorDataSizeBytes[is], SplineType::getParameterAlignmentBytes());
mSectorDataSizeBytes[is] = row.dataOffsetBytes[is];
Comment thread
ktf marked this conversation as resolved.
Outdated
const SplineType& spline = mConstructionScenarios[row.splineScenarioID];
if (is == 0) {
const SplineTypeXYZ& splineXYZ = reinterpret_cast<const SplineTypeXYZ&>(spline);
Expand All @@ -525,6 +528,7 @@ void TPCFastSpaceChargeCorrection::finishConstruction()
mSectorDataSizeBytes[is] += splineInvYZ.getSizeOfParameters();
}
}
mSectorDataSizeBytes[is] = alignSize(mSectorDataSizeBytes[is], SplineType::getParameterAlignmentBytes());
Comment thread
ktf marked this conversation as resolved.
Outdated
bufferSize += mSectorDataSizeBytes[is] * mGeo.getNumberOfSectors();
}

Expand Down
2 changes: 2 additions & 0 deletions GPU/TPCFastTransformation/TPCFastTransformPOD.cxx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -67,6 +67,7 @@ size_t TPCFastTransformPOD::estimateSize(const TPCFastSpaceChargeCorrection& ori
}
// space for splines data
for (int is = 0; is < 3; is++) {
nextDynOffs = FlatObject::alignSize(nextDynOffs, SplineType::getParameterAlignmentBytes());
nextDynOffs += origCorr.mSectorDataSizeBytes[is] * TPCFastTransformGeo::getNumberOfSectors();
}
nextDynOffs = alignOffset(nextDynOffs);
Expand Down Expand Up @@ -159,6 +160,7 @@ TPCFastTransformPOD* TPCFastTransformPOD::create(char* buff, size_t buffSize, co

// copy spline data
for (int is = 0; is < 3; is++) {
nextDynOffs = FlatObject::alignSize(nextDynOffs, SplineType::getParameterAlignmentBytes());
float* data = reinterpret_cast<float*>(buff + nextDynOffs);
LOGP(debug, "splinID={} start offset {} -> {}", is, nextDynOffs, (void*)data);

Expand Down