core
/
eccodes
mirror of https://github.com/ecmwf/eccodes.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

ECC-1125: Code contribution to improve performance on NEC

This commit is contained in:
Shahram Najm 2020-06-25 15:03:20 +01:00
parent d3d2c94448
commit 8bd6ce1bdb
1 changed files with 42 additions and 44 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

86
src/grib_bits_any_endian_vector.c
View File

@ -10,7 +10,7 @@
/*************************************************************************** /***************************************************************************
* Enrico Fucile - 19.06.2007 * * Enrico Fucile - 19.06.2007 *
* * * Johannes Schick, Deutscher Wetterdienst - 24.06.2020 *
***************************************************************************/ ***************************************************************************/
int grib_decode_long_array(const unsigned char* p, long* bitp, long bitsPerValue, int grib_decode_long_array(const unsigned char* p, long* bitp, long bitsPerValue,
size_t n_vals, long* val) size_t n_vals, long* val)
@ -18,7 +18,6 @@ int grib_decode_long_array(const unsigned char* p, long* bitp, long bitsPerValue
long i = 0; long i = 0;
unsigned long lvalue = 0; unsigned long lvalue = 0;
/* if (bitsPerValue % 8) { */
if (bitsPerValue % 8 || (*bitp & 7)) { if (bitsPerValue % 8 || (*bitp & 7)) {
int j = 0; int j = 0;
for (i = 0; i < n_vals; i++) { for (i = 0; i < n_vals; i++) {
@ -113,50 +112,49 @@ int grib_encode_double_array(size_t n_vals, const double* val, long bits_per_val
} }
} }
else { else {
if (bits_per_value == 16 && !((uint64_t)p&3)) { if (bits_per_value == 16 && !((uint64_t)p & 3)) {
uint32_t *encoded4byte = (uint32_t *) p; uint32_t* encoded4byte = (uint32_t*)p;
uint32_t tmp; uint32_t tmp;
unsigned long unsigned_val2 = 0; unsigned long unsigned_val2 = 0;
for(i = 0; i < n_vals - 1; i+=2){ for (i = 0; i < n_vals - 1; i += 2) {
unsigned_val = (unsigned long)((((val[i]*d)-reference_value)*divisor)+0.5); unsigned_val = (unsigned long)((((val[i] * d) - reference_value) * divisor) + 0.5);
unsigned_val2 = (unsigned long)((((val[i+1]*d)-reference_value)*divisor)+0.5); unsigned_val2 = (unsigned long)((((val[i + 1] * d) - reference_value) * divisor) + 0.5);
tmp = (unsigned_val2 & 0xff); tmp = (unsigned_val2 & 0xff);
tmp = (tmp << 8) + (unsigned_val2 >> 8 & 0xff); tmp = (tmp << 8) + (unsigned_val2 >> 8 & 0xff);
tmp = (tmp << 8) + (unsigned_val & 0xff); tmp = (tmp << 8) + (unsigned_val & 0xff);
tmp = (tmp << 8) + ((unsigned_val >> 8) & 0xff); tmp = (tmp << 8) + ((unsigned_val >> 8) & 0xff);
*encoded4byte = tmp; *encoded4byte = tmp;
encoded4byte++; encoded4byte++;
*off+=32; *off += 32;
}
/* remainder */
if (n_vals % 2) {
int blen = 0;
i = n_vals - 1;
encoded = (unsigned char*)encoded4byte;
blen = bits_per_value;
unsigned_val = (unsigned long)((((val[i] * d) - reference_value) * divisor) + 0.5);
while (blen >= 8) {
blen -= 8;
*encoded = (unsigned_val >> blen);
encoded++;
*off += 8;
}
}
} }
/* remainder */ else {
if (n_vals % 2) { for (i = 0; i < n_vals; i++) {
int blen = 0; int blen = 0;
i = n_vals-1; blen = bits_per_value;
encoded = (unsigned char *) encoded4byte; unsigned_val = (unsigned long)((((val[i] * d) - reference_value) * divisor) + 0.5);
blen = bits_per_value; while (blen >= 8) {
unsigned_val = (unsigned long)((((val[i]*d)-reference_value)*divisor)+0.5); blen -= 8;
while(blen >= 8) *encoded = (unsigned_val >> blen);
{ encoded++;
blen -= 8; *off += 8;
*encoded = (unsigned_val >> blen); }
encoded++; }
*off+=8;
}
} }
}
else {
for (i = 0; i < n_vals; i++) {
int blen = 0;
blen = bits_per_value;
unsigned_val = (unsigned long)((((val[i] * d) - reference_value) * divisor) + 0.5);
while (blen >= 8) {
blen -= 8;
*encoded = (unsigned_val >> blen);
encoded++;
*off += 8;
}
}
}
} }
return GRIB_SUCCESS; return GRIB_SUCCESS;
} }