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

Add additional PowerPC self tests

pull/703/head
Jeffrey Walton 2018-08-08 20:52:50 -04:00
parent 0464641069
commit bcf05a6c6b
No known key found for this signature in database
GPG Key ID: B36AB348921B1838
2 changed files with 112 additions and 63 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

76
ppc-simd.h
View File

@ -35,7 +35,7 @@
#if !(defined(_ARCH_PWR8) || defined(_ARCH_PWR9) || defined(__CRYPTO) || defined(__CRYPTO__)) #if !(defined(_ARCH_PWR8) || defined(_ARCH_PWR9) || defined(__CRYPTO) || defined(__CRYPTO__))
# undef CRYPTOPP_POWER8_AVAILABLE # undef CRYPTOPP_POWER8_AVAILABLE
# undef CRYPTOPP_POWER8_AES_AVAILABLE # undef CRYPTOPP_POWER8_AES_AVAILABLE
# undef CRYPTOPP_POWER8_VMULL_AVAILABLE # undef CRYPTOPP_POWER8_PMULL_AVAILABLE
# undef CRYPTOPP_POWER8_SHA_AVAILABLE # undef CRYPTOPP_POWER8_SHA_AVAILABLE
#endif #endif
@ -168,14 +168,27 @@ inline T1 VectorAdd(const T1& vec1, const T2& vec2)
template <unsigned int C, class T> template <unsigned int C, class T>
inline T VectorShiftLeft(const T& vec) inline T VectorShiftLeft(const T& vec)
{ {
const T zero = {0};
#if CRYPTOPP_BIG_ENDIAN #if CRYPTOPP_BIG_ENDIAN
enum { R=(C)&0xf }; if (C >= 16)
const T zero = {0}; {
return (T)vec_sld((uint8x16_p)vec, (uint8x16_p)zero, R); // Out of range
return zero;
}
else
{
return (T)vec_sld((uint8x16_p)vec, (uint8x16_p)zero, C);
}
#else #else
enum { R=(16-C)&0xf }; if (C >= 16)
const T zero = {0}; {
return (T)vec_sld((uint8x16_p)zero, (uint8x16_p)vec, R); // Out of range
return zero;
}
else
{
return (T)vec_sld((uint8x16_p)zero, (uint8x16_p)vec, 16-C);
}
#endif #endif
} }
@ -224,14 +237,27 @@ inline uint64x2_p VectorShiftLeft<0, uint64x2_p>(const uint64x2_p& vec)
template <unsigned int C, class T> template <unsigned int C, class T>
inline T VectorShiftRight(const T& vec) inline T VectorShiftRight(const T& vec)
{ {
const T zero = {0};
#if CRYPTOPP_BIG_ENDIAN #if CRYPTOPP_BIG_ENDIAN
enum { R=(16-C)&0xf }; if (C >= 16)
const T zero = {0}; {
return (T)vec_sld((uint8x16_p)zero, (uint8x16_p)vec, R); // Out of range
return zero;
}
else
{
return (T)vec_sld((uint8x16_p)zero, (uint8x16_p)vec, 16-C);
}
#else #else
enum { R=(C)&0xf }; if (C >= 16)
const T zero = {0}; {
return (T)vec_sld((uint8x16_p)vec, (uint8x16_p)zero, R); // Out of range
return zero;
}
else
{
return (T)vec_sld((uint8x16_p)vec, (uint8x16_p)zero, C);
}
#endif #endif
} }
@ -259,30 +285,6 @@ inline uint64x2_p VectorShiftRight<0, uint64x2_p>(const uint64x2_p& vec)
} }
#endif #endif
// Full specializations for 16 over uint8x16_p to uint64x2_p
template<>
inline uint8x16_p VectorShiftRight<16, uint8x16_p>(const uint8x16_p& vec)
{
return vec;
}
template<>
inline uint16x8_p VectorShiftRight<16, uint16x8_p>(const uint16x8_p& vec)
{
return vec;
}
template<>
inline uint32x4_p VectorShiftRight<16, uint32x4_p>(const uint32x4_p& vec)
{
return vec;
}
#if defined(CRYPTOPP_POWER8_AVAILABLE) || defined(CRYPTOPP_DOXYGEN_PROCESSING)
template<>
inline uint64x2_p VectorShiftRight<16, uint64x2_p>(const uint64x2_p& vec)
{
return vec;
}
#endif
/// \brief Compare two vectors /// \brief Compare two vectors
/// \tparam T1 vector type /// \tparam T1 vector type
/// \tparam T2 vector type /// \tparam T2 vector type

99
validat1.cpp
View File

@ -1067,7 +1067,7 @@ bool TestHuffmanCodes()
bool TestAltivecOps() bool TestAltivecOps()
{ {
std::cout << "\nTesting Altivec operations...\n\n"; std::cout << "\nTesting Altivec operations...\n\n";
bool pass=true; bool pass1=true, pass2=true;
if (HasAltivec() == false) if (HasAltivec() == false)
{ {
@ -1085,59 +1085,106 @@ bool TestAltivecOps()
CRYPTOPP_ALIGN_DATA(16) CRYPTOPP_ALIGN_DATA(16)
byte dest[20], src[20] = {23,22,21,20,19,18,17,16,15,14,13,12,11,10,9,8,7,6,5,4}; byte dest[20], src[20] = {23,22,21,20,19,18,17,16,15,14,13,12,11,10,9,8,7,6,5,4};
const byte exp1[16] ={22,21,20,19,18,17,16,15,14,13,12,11,10,9,8,7}; const byte st1[16] ={22,21,20,19,18,17,16,15,14,13,12,11,10,9,8,7};
const byte exp2[16] ={21,20,19,18,17,16,15,14,13,12,11,10,9,8,7,6}; const byte st2[16] ={21,20,19,18,17,16,15,14,13,12,11,10,9,8,7,6};
const byte exp3[16] ={20,19,18,17,16,15,14,13,12,11,10,9,8,7,6,5}; const byte st3[16] ={20,19,18,17,16,15,14,13,12,11,10,9,8,7,6,5};
VectorStore(VectorLoad(src), dest); VectorStore(VectorLoad(src), dest);
pass = (0 == std::memcmp(src, dest, 16)) && pass; pass1 = (0 == std::memcmp(src, dest, 16)) && pass1;
CRYPTOPP_ASSERT(pass); CRYPTOPP_ASSERT(pass1);
VectorStore(VectorLoad(src+1), dest+1); VectorStore(VectorLoad(src+1), dest+1);
pass = (0 == std::memcmp(exp1, dest+1, 16)) && pass; pass1 = (0 == std::memcmp(st1, dest+1, 16)) && pass1;
CRYPTOPP_ASSERT(pass); CRYPTOPP_ASSERT(pass1);
VectorStore(VectorLoad(src+2), dest+2); VectorStore(VectorLoad(src+2), dest+2);
pass = (0 == std::memcmp(exp2, dest+2, 16)) && pass; pass1 = (0 == std::memcmp(st2, dest+2, 16)) && pass1;
CRYPTOPP_ASSERT(pass); CRYPTOPP_ASSERT(pass1);
VectorStore(VectorLoad(src+3), dest+3); VectorStore(VectorLoad(src+3), dest+3);
pass = (0 == std::memcmp(exp3, dest+3, 16)) && pass; pass1 = (0 == std::memcmp(st3, dest+3, 16)) && pass1;
CRYPTOPP_ASSERT(pass); CRYPTOPP_ASSERT(pass1);
VectorStoreBE(VectorLoadBE(src), dest); VectorStoreBE(VectorLoadBE(src), dest);
pass = (0 == std::memcmp(src, dest, 16)) && pass; pass1 = (0 == std::memcmp(src, dest, 16)) && pass1;
CRYPTOPP_ASSERT(pass); CRYPTOPP_ASSERT(pass1);
VectorStoreBE(VectorLoadBE(src+1), dest+1); VectorStoreBE(VectorLoadBE(src+1), dest+1);
pass = (0 == std::memcmp(exp1, dest+1, 16)) && pass; pass1 = (0 == std::memcmp(st1, dest+1, 16)) && pass1;
CRYPTOPP_ASSERT(pass); CRYPTOPP_ASSERT(pass1);
VectorStoreBE(VectorLoadBE(src+2), dest+2); VectorStoreBE(VectorLoadBE(src+2), dest+2);
pass = (0 == std::memcmp(exp2, dest+2, 16)) && pass; pass1 = (0 == std::memcmp(st2, dest+2, 16)) && pass1;
CRYPTOPP_ASSERT(pass); CRYPTOPP_ASSERT(pass1);
VectorStoreBE(VectorLoadBE(src+3), dest+3); VectorStoreBE(VectorLoadBE(src+3), dest+3);
pass = (0 == std::memcmp(exp3, dest+3, 16)) && pass; pass1 = (0 == std::memcmp(st3, dest+3, 16)) && pass1;
CRYPTOPP_ASSERT(pass); CRYPTOPP_ASSERT(pass1);
#if defined(CRYPTOPP_LITTLE_ENDIAN) #if defined(CRYPTOPP_LITTLE_ENDIAN)
VectorStore(VectorLoadBE(src), dest); VectorStore(VectorLoadBE(src), dest);
pass = (0 != std::memcmp(src, dest, 16)) && pass; pass1 = (0 != std::memcmp(src, dest, 16)) && pass1;
CRYPTOPP_ASSERT(pass); CRYPTOPP_ASSERT(pass1);
VectorStoreBE(VectorLoad(src), dest); VectorStoreBE(VectorLoad(src), dest);
pass = (0 != std::memcmp(src, dest, 16)) && pass; pass1 = (0 != std::memcmp(src, dest, 16)) && pass1;
CRYPTOPP_ASSERT(pass); CRYPTOPP_ASSERT(pass1);
#endif #endif
if (!pass) if (!pass1)
std::cout << "FAILED:"; std::cout << "FAILED:";
else else
std::cout << "passed:"; std::cout << "passed:";
std::cout << " Altivec loads and stores" << std::endl; std::cout << " Altivec loads and stores" << std::endl;
return pass; //********** Shifts **********//
uint8x16_p val = {0xff,0xff,0xff,0xff, 0xff,0xff,0xff,0xff,
0xff,0xff,0xff,0xff, 0xff,0xff,0xff,0xff};
uint8x16_p t;
pass2 = (VectorEqual(val, t=VectorShiftLeft<0>(val))) && pass2;
CRYPTOPP_ASSERT(pass2);
pass2 = (VectorEqual(val, t=VectorShiftRight<0>(val))) && pass2;
CRYPTOPP_ASSERT(pass2);
uint8x16_p lsh1 = {0xff,0xff,0xff,0xff, 0xff,0xff,0xff,0xff,
0xff,0xff,0xff,0xff, 0xff,0xff,0xff,0x00};
uint8x16_p rsh1 = {0x00,0xff,0xff,0xff, 0xff,0xff,0xff,0xff,
0xff,0xff,0xff,0xff, 0xff,0xff,0xff,0xff};
pass2 = (VectorEqual(lsh1, t=VectorShiftLeft<1>(val))) && pass2;
CRYPTOPP_ASSERT(pass2);
pass2 = (VectorEqual(rsh1, t=VectorShiftRight<1>(val))) && pass2;
CRYPTOPP_ASSERT(pass2);
uint8x16_p lsh15 = {0xff,0x00,0x00,0x00, 0x00,0x00,0x00,0x00,
0x00,0x00,0x00,0x00, 0x00,0x00,0x00,0x00};
uint8x16_p rsh15 = {0x00,0x00,0x00,0x00, 0x00,0x00,0x00,0x00,
0x00,0x00,0x00,0x00, 0x00,0x00,0x00,0xff};
pass2 = (VectorEqual(lsh15, t=VectorShiftLeft<15>(val))) && pass2;
CRYPTOPP_ASSERT(pass2);
pass2 = (VectorEqual(rsh15, t=VectorShiftRight<15>(val))) && pass2;
CRYPTOPP_ASSERT(pass2);
uint8x16_p lsh16 = {0x00,0x00,0x00,0x00, 0x00,0x00,0x00,0x00,
0x00,0x00,0x00,0x00, 0x00,0x00,0x00,0x00};
uint8x16_p rsh16 = {0x00,0x00,0x00,0x00, 0x00,0x00,0x00,0x00,
0x00,0x00,0x00,0x00, 0x00,0x00,0x00,0x00};
pass2 = (VectorEqual(lsh16, t=VectorShiftLeft<16>(val))) && pass2;
CRYPTOPP_ASSERT(pass2);
pass2 = (VectorEqual(rsh16, t=VectorShiftRight<16>(val))) && pass2;
CRYPTOPP_ASSERT(pass2);
if (!pass2)
std::cout << "FAILED:";
else
std::cout << "passed:";
std::cout << " Altivec left and right shifts" << std::endl;
return pass1 && pass2;
} }
#endif #endif
#endif #endif