arne
/
cryptopp
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Avoid increment during stores of 4x blocks 

This provides another 0.1 cpb with GCC
pull/507/head
Jeffrey Walton 2017-09-14 15:12:07 -04:00
parent ddeae859d0
commit 08e4ee422e
No known key found for this signature in database
GPG Key ID: B36AB348921B1838
1 changed files with 9 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

25
rijndael-simd.cpp
View File

@ -796,7 +796,6 @@ uint8x16_p8 Load8x16(const uint8_t src[16])
/* http://stackoverflow.com/q/46124383/608639 */ /* http://stackoverflow.com/q/46124383/608639 */
return vec_xl_be(0, (uint8_t*)src); return vec_xl_be(0, (uint8_t*)src);
#else #else
/* GCC, Clang, etc */
return (uint8x16_p8)vec_vsx_ld(0, src); return (uint8x16_p8)vec_vsx_ld(0, src);
#endif #endif
} }
@ -807,7 +806,6 @@ uint8x16_p8 Load8x16(int off, const uint8_t src[16])
/* http://stackoverflow.com/q/46124383/608639 */ /* http://stackoverflow.com/q/46124383/608639 */
return vec_xl_be(off, (uint8_t*)src); return vec_xl_be(off, (uint8_t*)src);
#else #else
/* GCC, Clang, etc */
return (uint8x16_p8)vec_vsx_ld(off, src); return (uint8x16_p8)vec_vsx_ld(off, src);
#endif #endif
} }
@ -815,10 +813,9 @@ uint8x16_p8 Load8x16(int off, const uint8_t src[16])
void Store8x16(const uint8x16_p8 src, uint8_t dest[16]) void Store8x16(const uint8x16_p8 src, uint8_t dest[16])
{ {
#if defined(CRYPTOPP_XLC_VERSION) #if defined(CRYPTOPP_XLC_VERSION)
/* IBM XL C/C++ compiler */ /* http://stackoverflow.com/q/46124383/608639 */
vec_xst_be(src, 0, dest); vec_xst_be(src, 0, (uint8_t*)dest);
#else #else
/* GCC, Clang, etc */
vec_vsx_st(src, 0, dest); vec_vsx_st(src, 0, dest);
#endif #endif
} }
@ -829,7 +826,6 @@ uint64x2_p8 Load64x2(const uint8_t src[16])
/* http://stackoverflow.com/q/46124383/608639 */ /* http://stackoverflow.com/q/46124383/608639 */
return (uint64x2_p8)vec_xl_be(0, (uint8_t*)src); return (uint64x2_p8)vec_xl_be(0, (uint8_t*)src);
#else #else
/* GCC, Clang, etc */
# if defined(IS_LITTLE_ENDIAN) # if defined(IS_LITTLE_ENDIAN)
const uint8x16_p8 mask = {15,14,13,12, 11,10,9,8, 7,6,5,4, 3,2,1,0}; const uint8x16_p8 mask = {15,14,13,12, 11,10,9,8, 7,6,5,4, 3,2,1,0};
const uint8x16_p8 zero = {0}; const uint8x16_p8 zero = {0};
@ -846,7 +842,6 @@ uint64x2_p8 Load64x2(int off, const uint8_t src[16])
/* http://stackoverflow.com/q/46124383/608639 */ /* http://stackoverflow.com/q/46124383/608639 */
return (uint64x2_p8)vec_xl_be(off, (uint8_t*)src); return (uint64x2_p8)vec_xl_be(off, (uint8_t*)src);
#else #else
/* GCC, Clang, etc */
# if defined(IS_LITTLE_ENDIAN) # if defined(IS_LITTLE_ENDIAN)
const uint8x16_p8 mask = {15,14,13,12, 11,10,9,8, 7,6,5,4, 3,2,1,0}; const uint8x16_p8 mask = {15,14,13,12, 11,10,9,8, 7,6,5,4, 3,2,1,0};
const uint8x16_p8 zero = {0}; const uint8x16_p8 zero = {0};
@ -860,9 +855,9 @@ uint64x2_p8 Load64x2(int off, const uint8_t src[16])
void Store64x2(const uint64x2_p8 src, uint8_t dest[16]) void Store64x2(const uint64x2_p8 src, uint8_t dest[16])
{ {
#if defined(CRYPTOPP_XLC_VERSION) #if defined(CRYPTOPP_XLC_VERSION)
/* http://stackoverflow.com/q/46124383/608639 */
vec_xst_be((uint8x16_p8)src, 0, (uint8_t*)dest); vec_xst_be((uint8x16_p8)src, 0, (uint8_t*)dest);
#else #else
/* GCC, Clang, etc */
# if defined(IS_LITTLE_ENDIAN) # if defined(IS_LITTLE_ENDIAN)
const uint8x16_p8 mask = {15,14,13,12, 11,10,9,8, 7,6,5,4, 3,2,1,0}; const uint8x16_p8 mask = {15,14,13,12, 11,10,9,8, 7,6,5,4, 3,2,1,0};
const uint8x16_p8 zero = {0}; const uint8x16_p8 zero = {0};
@ -1158,15 +1153,13 @@ size_t Rijndael_AdvancedProcessBlocks_POWER8(F1 func1, F4 func4, const word32 *s
xorBlocks += 4*inc; xorBlocks += 4*inc;
} }
VectorStore(block0, outBlocks); const int inc = static_cast<int>(outIncrement);
outBlocks += outIncrement; VectorStore(block0, outBlocks+0*inc);
VectorStore(block1, outBlocks); VectorStore(block1, outBlocks+1*inc);
outBlocks += outIncrement; VectorStore(block2, outBlocks+2*inc);
VectorStore(block2, outBlocks); VectorStore(block3, outBlocks+3*inc);
outBlocks += outIncrement;
VectorStore(block3, outBlocks);
outBlocks += outIncrement;
outBlocks += 4*inc;
length -= 4*blockSize; length -= 4*blockSize;
} }
} }