mx/Jungfraujoch
0
0
Fork 0
Code Issues Pull Requests 1 Actions 2 Packages Projects Releases 38 Wiki Activity

JFConversionFixedPoint: vectorization, try again

Browse Source
This commit is contained in:
leonarski_f
2023-06-13 20:58:35 +02:00
parent ee4eb6e067
commit 697e727a16
1 changed files with 32 additions and 28 deletions
Download Patch File Download Diff File Expand all files Collapse all files

60
jungfrau/JFConversionFixedPoint.cpp
View File

@@ -51,7 +51,12 @@ void JFConversionFixedPoint::Setup(const JFModuleGainCalibration &gain_calibrati
inline int32_t jf_round(int32_t in) {
const int32_t half = (1L << (FIXED_PRECISION-1));
if (in > 0)
if (in <= INT16_MIN * (1L << FIXED_PRECISION))
return INT16_MIN * (1L << FIXED_PRECISION);
else if (in >= INT16_MAX * (1L << FIXED_PRECISION))
return INT16_MAX * (1L << FIXED_PRECISION);
else if (in > 0)
return in + half;
else
return in - half;
@@ -65,38 +70,37 @@ void JFConversionFixedPoint::ConvertModule(int16_t *dest, const uint16_t *source
auto pedestal_g1_aligned = std::assume_aligned<64>(pedestal_g1);
auto pedestal_g2_aligned = std::assume_aligned<64>(pedestal_g2);
#pragma ivdep
for (int i = 0; i < RAW_MODULE_SIZE; i++) {
uint16_t gainbits = source[i] & 0xc000;
int32_t adc = source[i] & 0x3fff;
int32_t val = INT32_MIN;
switch (gainbits) {
case 0:
[[likely]]
val = (adc - pedestal_g0_aligned[i]) * gain_g0_aligned[i];
break;
case 0x4000:
if (source[i] != 0x4000)
val = (adc - pedestal_g1_aligned[i]) * gain_g1_aligned[i];
break;
case 0xc000:
if (source[i] == 0xc000)
val = INT32_MAX;
else if (source[i] != 0xffff)
val = (adc - pedestal_g2_aligned[i]) * gain_g2_aligned[i];
break;
default:
break;
}
dest[i] = static_cast<int16_t>(jf_round((adc - pedestal_g0_aligned[i]) * gain_g0_aligned[i])
/ (1L << FIXED_PRECISION));
if (val <= INT16_MIN * (1L << FIXED_PRECISION))
[[unlikely]]
dest[i] = INT16_MIN;
else if (val >= INT16_MAX * (1L << FIXED_PRECISION))
[[unlikely]]
dest[i] = INT16_MAX;
else
dest[i] = static_cast<int16_t>(jf_round(val)/ (1L << FIXED_PRECISION));
int16_t val_1 = jf_round((adc - pedestal_g1_aligned[i]) * gain_g1_aligned[i])
/ (1L << FIXED_PRECISION);
int16_t val_2 = jf_round((adc - pedestal_g2_aligned[i]) * gain_g2_aligned[i])
/ (1L << FIXED_PRECISION);
if (gainbits == 0x4000)
dest[i] = val_1;
if (gainbits == 0xc000)
dest[i] = val_2;
if (gainbits == 0x8000)
dest[i] = INT16_MIN;
if (source[i] == 0xffff)
dest[i] = INT16_MIN;
if (source[i] == 0x4000)
dest[i] = INT16_MIN;
if (source[i] == 0xc000)
dest[i] = INT16_MAX;
}
}