diff --git a/blake2.cpp b/blake2.cpp
index 595be168..cc1743df 100644
--- a/blake2.cpp
+++ b/blake2.cpp
@@ -23,22 +23,24 @@ NAMESPACE_BEGIN(CryptoPP)
 # undef CRYPTOPP_BOOL_SSE4_INTRINSICS_AVAILABLE
 #endif
 
-// Sun Studio 12.3 and earlier lack SSE2's _mm_set_epi64x. Win32 lacks _mm_set_epi64x (Win64 supplies it except for VS2008).
+// Sun Studio 12.3 and earlier lack SSE2's _mm_set_epi64x. Win32 lacks _mm_set_epi64x, Win64 supplies it except for VS2008.
 // Also see http://stackoverflow.com/a/38547909/608639
 #if CRYPTOPP_BOOL_SSE2_INTRINSICS_AVAILABLE && ((__SUNPRO_CC >= 0x5100 && __SUNPRO_CC < 0x5130) || (defined(_MSC_VER) && _MSC_VER < 1600) || (defined(_M_IX86) && _MSC_VER >= 1600))
-inline __m128i _mm_set_epi64x(const word64 a, const word64 b)
+inline __m128i MM_SET_EPI64X(const word64 a, const word64 b)
 {
-	const word64 t[2] = {b,a}; __m128i r;
-	memcpy(&r, &t, sizeof(r));
-	return r;
+    const word64 t[2] = {b,a}; __m128i r;
+    memcpy(&r, &t, sizeof(r));
+    return r;
 }
+#else
+# define MM_SET_EPI64X(a, b) _mm_set_epi64x(a, b)
 #endif
 
 // C/C++ implementation
 static void BLAKE2_CXX_Compress32(const byte* input, BLAKE2_State<word32, false>& state);
 static void BLAKE2_CXX_Compress64(const byte* input, BLAKE2_State<word64, true>& state);
 
-// Also see http://github.com/weidai11/cryptopp/issues/247 for singling out SunCC 5.12
+// Also see http://github.com/weidai11/cryptopp/issues/247 for SunCC 5.12
 #if CRYPTOPP_BOOL_SSE2_INTRINSICS_AVAILABLE
 static void BLAKE2_SSE2_Compress32(const byte* input, BLAKE2_State<word32, false>& state);
 # if (__SUNPRO_CC != 0x5120)
@@ -51,7 +53,7 @@ static void BLAKE2_SSE4_Compress32(const byte* input, BLAKE2_State<word32, false
 static void BLAKE2_SSE4_Compress64(const byte* input, BLAKE2_State<word64, true>& state);
 #endif
 
-#if CRYPTOPP_BOOL_NEON_INTRINSICS_AVAILABLE
+#if CRYPTOPP_BOOL_ARM32 && CRYPTOPP_BOOL_NEON_INTRINSICS_AVAILABLE
 static void BLAKE2_NEON_Compress32(const byte* input, BLAKE2_State<word32, false>& state);
 static void BLAKE2_NEON_Compress64(const byte* input, BLAKE2_State<word64, true>& state);
 #endif
@@ -67,15 +69,15 @@ struct CRYPTOPP_NO_VTABLE BLAKE2_IV {};
 template<>
 struct CRYPTOPP_NO_VTABLE BLAKE2_IV<false>
 {
-	CRYPTOPP_CONSTANT(IVSIZE = 8)
-	// Always align for NEON and SSE
-	CRYPTOPP_ALIGN_DATA(16) static const word32 iv[8];
+    CRYPTOPP_CONSTANT(IVSIZE = 8)
+    // Always align for NEON and SSE
+    CRYPTOPP_ALIGN_DATA(16) static const word32 iv[8];
 };
 
 CRYPTOPP_ALIGN_DATA(16)
 const word32 BLAKE2_IV<false>::iv[8] = {
-	0x6A09E667UL, 0xBB67AE85UL, 0x3C6EF372UL, 0xA54FF53AUL,
-	0x510E527FUL, 0x9B05688CUL, 0x1F83D9ABUL, 0x5BE0CD19UL
+    0x6A09E667UL, 0xBB67AE85UL, 0x3C6EF372UL, 0xA54FF53AUL,
+    0x510E527FUL, 0x9B05688CUL, 0x1F83D9ABUL, 0x5BE0CD19UL
 };
 
 #define BLAKE2S_IV(n) BLAKE2_IV<false>::iv[n]
@@ -83,17 +85,17 @@ const word32 BLAKE2_IV<false>::iv[8] = {
 template<>
 struct CRYPTOPP_NO_VTABLE BLAKE2_IV<true>
 {
-	CRYPTOPP_CONSTANT(IVSIZE = 8)
-	// Always align for NEON and SSE
-	CRYPTOPP_ALIGN_DATA(16) static const word64 iv[8];
+    CRYPTOPP_CONSTANT(IVSIZE = 8)
+    // Always align for NEON and SSE
+    CRYPTOPP_ALIGN_DATA(16) static const word64 iv[8];
 };
 
 CRYPTOPP_ALIGN_DATA(16)
 const word64 BLAKE2_IV<true>::iv[8] = {
-	W64LIT(0x6a09e667f3bcc908), W64LIT(0xbb67ae8584caa73b),
-	W64LIT(0x3c6ef372fe94f82b), W64LIT(0xa54ff53a5f1d36f1),
-	W64LIT(0x510e527fade682d1), W64LIT(0x9b05688c2b3e6c1f),
-	W64LIT(0x1f83d9abfb41bd6b), W64LIT(0x5be0cd19137e2179)
+    W64LIT(0x6a09e667f3bcc908), W64LIT(0xbb67ae8584caa73b),
+    W64LIT(0x3c6ef372fe94f82b), W64LIT(0xa54ff53a5f1d36f1),
+    W64LIT(0x510e527fade682d1), W64LIT(0x9b05688c2b3e6c1f),
+    W64LIT(0x1f83d9abfb41bd6b), W64LIT(0x5be0cd19137e2179)
 };
 
 #define BLAKE2B_IV(n) BLAKE2_IV<true>::iv[n]
@@ -106,46 +108,46 @@ struct CRYPTOPP_NO_VTABLE BLAKE2_Sigma {};
 template<>
 struct CRYPTOPP_NO_VTABLE BLAKE2_Sigma<false>
 {
-	// Always align for NEON and SSE
-	CRYPTOPP_ALIGN_DATA(16) static const byte sigma[10][16];
+    // Always align for NEON and SSE
+    CRYPTOPP_ALIGN_DATA(16) static const byte sigma[10][16];
 };
 
 CRYPTOPP_ALIGN_DATA(16)
 const byte BLAKE2_Sigma<false>::sigma[10][16] = {
-	{  0,  1,  2,  3,  4,  5,  6,  7,  8,  9, 10, 11, 12, 13, 14, 15 },
-	{ 14, 10,  4,  8,  9, 15, 13,  6,  1, 12,  0,  2, 11,  7,  5,  3 },
-	{ 11,  8, 12,  0,  5,  2, 15, 13, 10, 14,  3,  6,  7,  1,  9,  4 },
-	{  7,  9,  3,  1, 13, 12, 11, 14,  2,  6,  5, 10,  4,  0, 15,  8 },
-	{  9,  0,  5,  7,  2,  4, 10, 15, 14,  1, 11, 12,  6,  8,  3, 13 },
-	{  2, 12,  6, 10,  0, 11,  8,  3,  4, 13,  7,  5, 15, 14,  1,  9 },
-	{ 12,  5,  1, 15, 14, 13,  4, 10,  0,  7,  6,  3,  9,  2,  8, 11 },
-	{ 13, 11,  7, 14, 12,  1,  3,  9,  5,  0, 15,  4,  8,  6,  2, 10 },
-	{  6, 15, 14,  9, 11,  3,  0,  8, 12,  2, 13,  7,  1,  4, 10,  5 },
-	{ 10,  2,  8,  4,  7,  6,  1,  5, 15, 11,  9, 14,  3, 12, 13 , 0 },
+    {  0,  1,  2,  3,  4,  5,  6,  7,  8,  9, 10, 11, 12, 13, 14, 15 },
+    { 14, 10,  4,  8,  9, 15, 13,  6,  1, 12,  0,  2, 11,  7,  5,  3 },
+    { 11,  8, 12,  0,  5,  2, 15, 13, 10, 14,  3,  6,  7,  1,  9,  4 },
+    {  7,  9,  3,  1, 13, 12, 11, 14,  2,  6,  5, 10,  4,  0, 15,  8 },
+    {  9,  0,  5,  7,  2,  4, 10, 15, 14,  1, 11, 12,  6,  8,  3, 13 },
+    {  2, 12,  6, 10,  0, 11,  8,  3,  4, 13,  7,  5, 15, 14,  1,  9 },
+    { 12,  5,  1, 15, 14, 13,  4, 10,  0,  7,  6,  3,  9,  2,  8, 11 },
+    { 13, 11,  7, 14, 12,  1,  3,  9,  5,  0, 15,  4,  8,  6,  2, 10 },
+    {  6, 15, 14,  9, 11,  3,  0,  8, 12,  2, 13,  7,  1,  4, 10,  5 },
+    { 10,  2,  8,  4,  7,  6,  1,  5, 15, 11,  9, 14,  3, 12, 13 , 0 },
 };
 
 //! \brief BLAKE2b sigma table specialization
 template<>
 struct CRYPTOPP_NO_VTABLE BLAKE2_Sigma<true>
 {
-	// Always align for NEON and SSE
-	CRYPTOPP_ALIGN_DATA(16) static const byte sigma[12][16];
+    // Always align for NEON and SSE
+    CRYPTOPP_ALIGN_DATA(16) static const byte sigma[12][16];
 };
 
 CRYPTOPP_ALIGN_DATA(16)
 const byte BLAKE2_Sigma<true>::sigma[12][16] = {
-	{  0,  1,  2,  3,  4,  5,  6,  7,  8,  9, 10, 11, 12, 13, 14, 15 },
-	{ 14, 10,  4,  8,  9, 15, 13,  6,  1, 12,  0,  2, 11,  7,  5,  3 },
-	{ 11,  8, 12,  0,  5,  2, 15, 13, 10, 14,  3,  6,  7,  1,  9,  4 },
-	{  7,  9,  3,  1, 13, 12, 11, 14,  2,  6,  5, 10,  4,  0, 15,  8 },
-	{  9,  0,  5,  7,  2,  4, 10, 15, 14,  1, 11, 12,  6,  8,  3, 13 },
-	{  2, 12,  6, 10,  0, 11,  8,  3,  4, 13,  7,  5, 15, 14,  1,  9 },
-	{ 12,  5,  1, 15, 14, 13,  4, 10,  0,  7,  6,  3,  9,  2,  8, 11 },
-	{ 13, 11,  7, 14, 12,  1,  3,  9,  5,  0, 15,  4,  8,  6,  2, 10 },
-	{  6, 15, 14,  9, 11,  3,  0,  8, 12,  2, 13,  7,  1,  4, 10,  5 },
-	{ 10,  2,  8,  4,  7,  6,  1,  5, 15, 11,  9, 14,  3, 12, 13 , 0 },
-	{  0,  1,  2,  3,  4,  5,  6,  7,  8,  9, 10, 11, 12, 13, 14, 15 },
-	{ 14, 10,  4,  8,  9, 15, 13,  6,  1, 12,  0,  2, 11,  7,  5,  3 }
+    {  0,  1,  2,  3,  4,  5,  6,  7,  8,  9, 10, 11, 12, 13, 14, 15 },
+    { 14, 10,  4,  8,  9, 15, 13,  6,  1, 12,  0,  2, 11,  7,  5,  3 },
+    { 11,  8, 12,  0,  5,  2, 15, 13, 10, 14,  3,  6,  7,  1,  9,  4 },
+    {  7,  9,  3,  1, 13, 12, 11, 14,  2,  6,  5, 10,  4,  0, 15,  8 },
+    {  9,  0,  5,  7,  2,  4, 10, 15, 14,  1, 11, 12,  6,  8,  3, 13 },
+    {  2, 12,  6, 10,  0, 11,  8,  3,  4, 13,  7,  5, 15, 14,  1,  9 },
+    { 12,  5,  1, 15, 14, 13,  4, 10,  0,  7,  6,  3,  9,  2,  8, 11 },
+    { 13, 11,  7, 14, 12,  1,  3,  9,  5,  0, 15,  4,  8,  6,  2, 10 },
+    {  6, 15, 14,  9, 11,  3,  0,  8, 12,  2, 13,  7,  1,  4, 10,  5 },
+    { 10,  2,  8,  4,  7,  6,  1,  5, 15, 11,  9, 14,  3, 12, 13 , 0 },
+    {  0,  1,  2,  3,  4,  5,  6,  7,  8,  9, 10, 11, 12, 13, 14, 15 },
+    { 14, 10,  4,  8,  9, 15, 13,  6,  1, 12,  0,  2, 11,  7,  5,  3 }
 };
 
 typedef void (*pfnCompress32)(const byte*, BLAKE2_State<word32, false>&);
@@ -154,463 +156,463 @@ typedef void (*pfnCompress64)(const byte*, BLAKE2_State<word64, true>&);
 pfnCompress64 InitializeCompress64Fn()
 {
 #if CRYPTOPP_BOOL_SSE4_INTRINSICS_AVAILABLE
-	if (HasSSE4())
-		return &BLAKE2_SSE4_Compress64;
-	else
+    if (HasSSE4())
+        return &BLAKE2_SSE4_Compress64;
+    else
 #endif
 #if CRYPTOPP_BOOL_SSE2_INTRINSICS_AVAILABLE
 # if (__SUNPRO_CC != 0x5120)
-	if (HasSSE2())
-		return &BLAKE2_SSE2_Compress64;
-	else
+    if (HasSSE2())
+        return &BLAKE2_SSE2_Compress64;
+    else
 # endif
 #endif
-#if CRYPTOPP_BOOL_NEON_INTRINSICS_AVAILABLE
-	if (HasNEON())
-		return &BLAKE2_NEON_Compress64;
-	else
+#if CRYPTOPP_BOOL_ARM32 && CRYPTOPP_BOOL_NEON_INTRINSICS_AVAILABLE
+    if (HasNEON())
+        return &BLAKE2_NEON_Compress64;
+    else
 #endif
-	return &BLAKE2_CXX_Compress64;
+    return &BLAKE2_CXX_Compress64;
 }
 
 pfnCompress32 InitializeCompress32Fn()
 {
 #if CRYPTOPP_BOOL_SSE4_INTRINSICS_AVAILABLE
-	if (HasSSE4())
-		return &BLAKE2_SSE4_Compress32;
-	else
+    if (HasSSE4())
+        return &BLAKE2_SSE4_Compress32;
+    else
 #endif
 #if CRYPTOPP_BOOL_SSE2_INTRINSICS_AVAILABLE
-	if (HasSSE2())
-		return &BLAKE2_SSE2_Compress32;
-	else
+    if (HasSSE2())
+        return &BLAKE2_SSE2_Compress32;
+    else
 #endif
-#if CRYPTOPP_BOOL_NEON_INTRINSICS_AVAILABLE
-	if (HasNEON())
-		return &BLAKE2_NEON_Compress32;
-	else
+#if CRYPTOPP_BOOL_ARM32 && CRYPTOPP_BOOL_NEON_INTRINSICS_AVAILABLE
+    if (HasNEON())
+        return &BLAKE2_NEON_Compress32;
+    else
 #endif
-	return &BLAKE2_CXX_Compress32;
+    return &BLAKE2_CXX_Compress32;
 }
 
 #endif // CRYPTOPP_DOXYGEN_PROCESSING
 
 BLAKE2_ParameterBlock<false>::BLAKE2_ParameterBlock(size_t digestLen, size_t keyLen,
-		const byte* saltStr, size_t saltLen,
-		const byte* personalizationStr, size_t personalizationLen)
+        const byte* saltStr, size_t saltLen,
+        const byte* personalizationStr, size_t personalizationLen)
 {
-	// Avoid Coverity finding SIZEOF_MISMATCH/suspicious_sizeof
-	digestLength = (byte)digestLen;
-	keyLength = (byte)keyLen;
-	fanout = depth = 1;
-	nodeDepth = innerLength = 0;
+    // Avoid Coverity finding SIZEOF_MISMATCH/suspicious_sizeof
+    digestLength = (byte)digestLen;
+    keyLength = (byte)keyLen;
+    fanout = depth = 1;
+    nodeDepth = innerLength = 0;
 
-	memset(leafLength, 0x00, COUNTOF(leafLength));
-	memset(nodeOffset, 0x00, COUNTOF(nodeOffset));
+    memset(leafLength, 0x00, COUNTOF(leafLength));
+    memset(nodeOffset, 0x00, COUNTOF(nodeOffset));
 
-	if (saltStr && saltLen)
-	{
-		memcpy_s(salt, COUNTOF(salt), saltStr, saltLen);
-		const size_t rem = COUNTOF(salt) - saltLen;
-		const size_t off = COUNTOF(salt) - rem;
-		if (rem)
-			memset(salt+off, 0x00, rem);
-	}
-	else
-	{
-		memset(salt, 0x00, COUNTOF(salt));
-	}
+    if (saltStr && saltLen)
+    {
+        memcpy_s(salt, COUNTOF(salt), saltStr, saltLen);
+        const size_t rem = COUNTOF(salt) - saltLen;
+        const size_t off = COUNTOF(salt) - rem;
+        if (rem)
+            memset(salt+off, 0x00, rem);
+    }
+    else
+    {
+        memset(salt, 0x00, COUNTOF(salt));
+    }
 
-	if (personalizationStr && personalizationLen)
-	{
-		memcpy_s(personalization, COUNTOF(personalization), personalizationStr, personalizationLen);
-		const size_t rem = COUNTOF(personalization) - personalizationLen;
-		const size_t off = COUNTOF(personalization) - rem;
-		if (rem)
-			memset(personalization+off, 0x00, rem);
-	}
-	else
-	{
-		memset(personalization, 0x00, COUNTOF(personalization));
-	}
+    if (personalizationStr && personalizationLen)
+    {
+        memcpy_s(personalization, COUNTOF(personalization), personalizationStr, personalizationLen);
+        const size_t rem = COUNTOF(personalization) - personalizationLen;
+        const size_t off = COUNTOF(personalization) - rem;
+        if (rem)
+            memset(personalization+off, 0x00, rem);
+    }
+    else
+    {
+        memset(personalization, 0x00, COUNTOF(personalization));
+    }
 }
 
 BLAKE2_ParameterBlock<true>::BLAKE2_ParameterBlock(size_t digestLen, size_t keyLen,
-		const byte* saltStr, size_t saltLen,
-		const byte* personalizationStr, size_t personalizationLen)
+        const byte* saltStr, size_t saltLen,
+        const byte* personalizationStr, size_t personalizationLen)
 {
-	// Avoid Coverity finding SIZEOF_MISMATCH/suspicious_sizeof
-	digestLength = (byte)digestLen;
-	keyLength = (byte)keyLen;
-	fanout = depth = 1;
-	nodeDepth = innerLength = 0;
+    // Avoid Coverity finding SIZEOF_MISMATCH/suspicious_sizeof
+    digestLength = (byte)digestLen;
+    keyLength = (byte)keyLen;
+    fanout = depth = 1;
+    nodeDepth = innerLength = 0;
 
-	memset(rfu, 0x00, COUNTOF(rfu));
-	memset(leafLength, 0x00, COUNTOF(leafLength));
-	memset(nodeOffset, 0x00, COUNTOF(nodeOffset));
+    memset(rfu, 0x00, COUNTOF(rfu));
+    memset(leafLength, 0x00, COUNTOF(leafLength));
+    memset(nodeOffset, 0x00, COUNTOF(nodeOffset));
 
-	if (saltStr && saltLen)
-	{
-		memcpy_s(salt, COUNTOF(salt), saltStr, saltLen);
-		const size_t rem = COUNTOF(salt) - saltLen;
-		const size_t off = COUNTOF(salt) - rem;
-		if (rem)
-			memset(salt+off, 0x00, rem);
-	}
-	else
-	{
-		memset(salt, 0x00, COUNTOF(salt));
-	}
+    if (saltStr && saltLen)
+    {
+        memcpy_s(salt, COUNTOF(salt), saltStr, saltLen);
+        const size_t rem = COUNTOF(salt) - saltLen;
+        const size_t off = COUNTOF(salt) - rem;
+        if (rem)
+            memset(salt+off, 0x00, rem);
+    }
+    else
+    {
+        memset(salt, 0x00, COUNTOF(salt));
+    }
 
-	if (personalizationStr && personalizationLen)
-	{
-		memcpy_s(personalization, COUNTOF(personalization), personalizationStr, personalizationLen);
-		const size_t rem = COUNTOF(personalization) - personalizationLen;
-		const size_t off = COUNTOF(personalization) - rem;
-		if (rem)
-			memset(personalization+off, 0x00, rem);
-	}
-	else
-	{
-		memset(personalization, 0x00, COUNTOF(personalization));
-	}
+    if (personalizationStr && personalizationLen)
+    {
+        memcpy_s(personalization, COUNTOF(personalization), personalizationStr, personalizationLen);
+        const size_t rem = COUNTOF(personalization) - personalizationLen;
+        const size_t off = COUNTOF(personalization) - rem;
+        if (rem)
+            memset(personalization+off, 0x00, rem);
+    }
+    else
+    {
+        memset(personalization, 0x00, COUNTOF(personalization));
+    }
 }
 
 template <class W, bool T_64bit>
 void BLAKE2_Base<W, T_64bit>::UncheckedSetKey(const byte *key, unsigned int length, const CryptoPP::NameValuePairs& params)
 {
-	if (key && length)
-	{
-		AlignedSecByteBlock temp(BLOCKSIZE);
-		memcpy_s(temp, BLOCKSIZE, key, length);
+    if (key && length)
+    {
+        AlignedSecByteBlock temp(BLOCKSIZE);
+        memcpy_s(temp, BLOCKSIZE, key, length);
 
-		const size_t rem = BLOCKSIZE - length;
-		if (rem)
-			memset(temp+length, 0x00, rem);
+        const size_t rem = BLOCKSIZE - length;
+        if (rem)
+            memset(temp+length, 0x00, rem);
 
-		m_key.swap(temp);
-	}
-	else
-	{
-		m_key.resize(0);
-	}
+        m_key.swap(temp);
+    }
+    else
+    {
+        m_key.resize(0);
+    }
 
 #if defined(__COVERITY__)
-	// Avoid Coverity finding SIZEOF_MISMATCH/suspicious_sizeof
-	ParameterBlock& block = *m_block.data();
-	memset(m_block.data(), 0x00, sizeof(ParameterBlock));
+    // Avoid Coverity finding SIZEOF_MISMATCH/suspicious_sizeof
+    ParameterBlock& block = *m_block.data();
+    memset(m_block.data(), 0x00, sizeof(ParameterBlock));
 #else
-	// Set Head bytes; Tail bytes are set below
-	ParameterBlock& block = *m_block.data();
-	memset(m_block.data(), 0x00, T_64bit ? 32 : 16);
+    // Set Head bytes; Tail bytes are set below
+    ParameterBlock& block = *m_block.data();
+    memset(m_block.data(), 0x00, T_64bit ? 32 : 16);
 #endif
 
-	block.keyLength = (byte)length;
-	block.digestLength = (byte)params.GetIntValueWithDefault(Name::DigestSize(), DIGESTSIZE);
-	block.fanout = block.depth = 1;
+    block.keyLength = (byte)length;
+    block.digestLength = (byte)params.GetIntValueWithDefault(Name::DigestSize(), DIGESTSIZE);
+    block.fanout = block.depth = 1;
 
-	ConstByteArrayParameter t;
-	if (params.GetValue(Name::Salt(), t) && t.begin() && t.size())
-	{
-		memcpy_s(block.salt, COUNTOF(block.salt), t.begin(), t.size());
-		const size_t rem = COUNTOF(block.salt) - t.size();
-		const size_t off = COUNTOF(block.salt) - rem;
-		if (rem)
-			memset(block.salt+off, 0x00, rem);
-	}
-	else
-	{
-		memset(block.salt, 0x00, COUNTOF(block.salt));
-	}
+    ConstByteArrayParameter t;
+    if (params.GetValue(Name::Salt(), t) && t.begin() && t.size())
+    {
+        memcpy_s(block.salt, COUNTOF(block.salt), t.begin(), t.size());
+        const size_t rem = COUNTOF(block.salt) - t.size();
+        const size_t off = COUNTOF(block.salt) - rem;
+        if (rem)
+            memset(block.salt+off, 0x00, rem);
+    }
+    else
+    {
+        memset(block.salt, 0x00, COUNTOF(block.salt));
+    }
 
-	if (params.GetValue(Name::Personalization(), t) && t.begin() && t.size())
-	{
-		memcpy_s(block.personalization, COUNTOF(block.personalization), t.begin(), t.size());
-		const size_t rem = COUNTOF(block.personalization) - t.size();
-		const size_t off = COUNTOF(block.personalization) - rem;
-		if (rem)
-			memset(block.personalization+off, 0x00, rem);
-	}
-	else
-	{
-		memset(block.personalization, 0x00, COUNTOF(block.personalization));
-	}
+    if (params.GetValue(Name::Personalization(), t) && t.begin() && t.size())
+    {
+        memcpy_s(block.personalization, COUNTOF(block.personalization), t.begin(), t.size());
+        const size_t rem = COUNTOF(block.personalization) - t.size();
+        const size_t off = COUNTOF(block.personalization) - rem;
+        if (rem)
+            memset(block.personalization+off, 0x00, rem);
+    }
+    else
+    {
+        memset(block.personalization, 0x00, COUNTOF(block.personalization));
+    }
 }
 
 template <class W, bool T_64bit>
 BLAKE2_Base<W, T_64bit>::BLAKE2_Base() : m_state(1), m_block(1), m_digestSize(DIGESTSIZE), m_treeMode(false)
 {
-	UncheckedSetKey(NULL, 0, g_nullNameValuePairs);
-	Restart();
+    UncheckedSetKey(NULL, 0, g_nullNameValuePairs);
+    Restart();
 }
 
 template <class W, bool T_64bit>
 BLAKE2_Base<W, T_64bit>::BLAKE2_Base(bool treeMode, unsigned int digestSize) : m_state(1), m_block(1), m_digestSize(digestSize), m_treeMode(treeMode)
 {
-	CRYPTOPP_ASSERT(digestSize <= DIGESTSIZE);
+    CRYPTOPP_ASSERT(digestSize <= DIGESTSIZE);
 
-	UncheckedSetKey(NULL, 0, g_nullNameValuePairs);
-	Restart();
+    UncheckedSetKey(NULL, 0, g_nullNameValuePairs);
+    Restart();
 }
 
 template <class W, bool T_64bit>
 BLAKE2_Base<W, T_64bit>::BLAKE2_Base(const byte *key, size_t keyLength, const byte* salt, size_t saltLength,
-	const byte* personalization, size_t personalizationLength, bool treeMode, unsigned int digestSize)
-	: m_state(1), m_block(1), m_digestSize(digestSize), m_treeMode(treeMode)
+    const byte* personalization, size_t personalizationLength, bool treeMode, unsigned int digestSize)
+    : m_state(1), m_block(1), m_digestSize(digestSize), m_treeMode(treeMode)
 {
-	CRYPTOPP_ASSERT(keyLength <= MAX_KEYLENGTH);
-	CRYPTOPP_ASSERT(digestSize <= DIGESTSIZE);
-	CRYPTOPP_ASSERT(saltLength <= SALTSIZE);
-	CRYPTOPP_ASSERT(personalizationLength <= PERSONALIZATIONSIZE);
+    CRYPTOPP_ASSERT(keyLength <= MAX_KEYLENGTH);
+    CRYPTOPP_ASSERT(digestSize <= DIGESTSIZE);
+    CRYPTOPP_ASSERT(saltLength <= SALTSIZE);
+    CRYPTOPP_ASSERT(personalizationLength <= PERSONALIZATIONSIZE);
 
-	UncheckedSetKey(key, static_cast<unsigned int>(keyLength), MakeParameters(Name::DigestSize(),(int)digestSize)(Name::TreeMode(),treeMode, false)
-		(Name::Salt(), ConstByteArrayParameter(salt, saltLength))(Name::Personalization(), ConstByteArrayParameter(personalization, personalizationLength)));
-	Restart();
+    UncheckedSetKey(key, static_cast<unsigned int>(keyLength), MakeParameters(Name::DigestSize(),(int)digestSize)(Name::TreeMode(),treeMode, false)
+        (Name::Salt(), ConstByteArrayParameter(salt, saltLength))(Name::Personalization(), ConstByteArrayParameter(personalization, personalizationLength)));
+    Restart();
 }
 
 template <class W, bool T_64bit>
 void BLAKE2_Base<W, T_64bit>::Restart()
 {
-	static const W zero[2] = {0,0};
-	Restart(*m_block.data(), zero);
+    static const W zero[2] = {0,0};
+    Restart(*m_block.data(), zero);
 }
 
 template <class W, bool T_64bit>
 void BLAKE2_Base<W, T_64bit>::Restart(const BLAKE2_ParameterBlock<T_64bit>& block, const W counter[2])
 {
-	// We take a parameter block as a parameter to allow customized state.
-	// Avoid the copy of the parameter block when we are passing our own block.
-	if (&block != m_block.data())
-	{
-		memcpy_s(m_block.data(), sizeof(ParameterBlock), &block, sizeof(ParameterBlock));
-		m_block.data()->digestLength = (byte)m_digestSize;
-		m_block.data()->keyLength = (byte)m_key.size();
-	}
+    // We take a parameter block as a parameter to allow customized state.
+    // Avoid the copy of the parameter block when we are passing our own block.
+    if (&block != m_block.data())
+    {
+        memcpy_s(m_block.data(), sizeof(ParameterBlock), &block, sizeof(ParameterBlock));
+        m_block.data()->digestLength = (byte)m_digestSize;
+        m_block.data()->keyLength = (byte)m_key.size();
+    }
 
-	State& state = *m_state.data();
-	state.t[0] = state.t[1] = 0, state.f[0] = state.f[1] = 0, state.length = 0;
+    State& state = *m_state.data();
+    state.t[0] = state.t[1] = 0, state.f[0] = state.f[1] = 0, state.length = 0;
 
-	if (counter != NULL)
-	{
-		state.t[0] = counter[0];
-		state.t[1] = counter[1];
-	}
+    if (counter != NULL)
+    {
+        state.t[0] = counter[0];
+        state.t[1] = counter[1];
+    }
 
-	PutBlock<W, LittleEndian, true> put(m_block.data(), &state.h[0]);
-	put(BLAKE2_IV<T_64bit>::iv[0])(BLAKE2_IV<T_64bit>::iv[1])(BLAKE2_IV<T_64bit>::iv[2])(BLAKE2_IV<T_64bit>::iv[3]);
-	put(BLAKE2_IV<T_64bit>::iv[4])(BLAKE2_IV<T_64bit>::iv[5])(BLAKE2_IV<T_64bit>::iv[6])(BLAKE2_IV<T_64bit>::iv[7]);
+    PutBlock<W, LittleEndian, true> put(m_block.data(), &state.h[0]);
+    put(BLAKE2_IV<T_64bit>::iv[0])(BLAKE2_IV<T_64bit>::iv[1])(BLAKE2_IV<T_64bit>::iv[2])(BLAKE2_IV<T_64bit>::iv[3]);
+    put(BLAKE2_IV<T_64bit>::iv[4])(BLAKE2_IV<T_64bit>::iv[5])(BLAKE2_IV<T_64bit>::iv[6])(BLAKE2_IV<T_64bit>::iv[7]);
 
-	// When BLAKE2 is keyed, the input stream is simply {key||message}. Key it
-	// during Restart to avoid FirstPut and friends. Key size == 0 means no key.
-	if (m_key.size())
-		Update(m_key, m_key.size());
+    // When BLAKE2 is keyed, the input stream is simply {key||message}. Key it
+    // during Restart to avoid FirstPut and friends. Key size == 0 means no key.
+    if (m_key.size())
+        Update(m_key, m_key.size());
 }
 
 template <class W, bool T_64bit>
 void BLAKE2_Base<W, T_64bit>::Update(const byte *input, size_t length)
 {
-	State& state = *m_state.data();
-	if (state.length + length > BLOCKSIZE)
-	{
-		// Complete current block
-		const size_t fill = BLOCKSIZE - state.length;
-		memcpy_s(&state.buffer[state.length], fill, input, fill);
+    State& state = *m_state.data();
+    if (state.length + length > BLOCKSIZE)
+    {
+        // Complete current block
+        const size_t fill = BLOCKSIZE - state.length;
+        memcpy_s(&state.buffer[state.length], fill, input, fill);
 
-		IncrementCounter();
-		Compress(state.buffer);
-		state.length = 0;
+        IncrementCounter();
+        Compress(state.buffer);
+        state.length = 0;
 
-		length -= fill, input += fill;
+        length -= fill, input += fill;
 
-		// Compress in-place to avoid copies
-		while (length > BLOCKSIZE)
-		{
-			IncrementCounter();
-			Compress(input);
-			length -= BLOCKSIZE, input += BLOCKSIZE;
-		}
-	}
+        // Compress in-place to avoid copies
+        while (length > BLOCKSIZE)
+        {
+            IncrementCounter();
+            Compress(input);
+            length -= BLOCKSIZE, input += BLOCKSIZE;
+        }
+    }
 
-	// Copy tail bytes
-	if (input && length)
-	{
-		CRYPTOPP_ASSERT(length <= BLOCKSIZE - state.length);
-		memcpy_s(&state.buffer[state.length], length, input, length);
-		state.length += static_cast<unsigned int>(length);
-	}
+    // Copy tail bytes
+    if (input && length)
+    {
+        CRYPTOPP_ASSERT(length <= BLOCKSIZE - state.length);
+        memcpy_s(&state.buffer[state.length], length, input, length);
+        state.length += static_cast<unsigned int>(length);
+    }
 }
 
 template <class W, bool T_64bit>
 void BLAKE2_Base<W, T_64bit>::TruncatedFinal(byte *hash, size_t size)
 {
-	this->ThrowIfInvalidTruncatedSize(size);
+    this->ThrowIfInvalidTruncatedSize(size);
 
-	// Set last block unconditionally
-	State& state = *m_state.data();
-	state.f[0] = static_cast<W>(-1);
+    // Set last block unconditionally
+    State& state = *m_state.data();
+    state.f[0] = static_cast<W>(-1);
 
-	// Set last node if tree mode
-	if (m_treeMode)
-		state.f[1] = static_cast<W>(-1);
+    // Set last node if tree mode
+    if (m_treeMode)
+        state.f[1] = static_cast<W>(-1);
 
-	// Increment counter for tail bytes only
-	IncrementCounter(state.length);
+    // Increment counter for tail bytes only
+    IncrementCounter(state.length);
 
-	memset(state.buffer + state.length, 0x00, BLOCKSIZE - state.length);
-	Compress(state.buffer);
+    memset(state.buffer + state.length, 0x00, BLOCKSIZE - state.length);
+    Compress(state.buffer);
 
-	// Copy to caller buffer
-	memcpy_s(hash, size, &state.h[0], size);
+    // Copy to caller buffer
+    memcpy_s(hash, size, &state.h[0], size);
 
-	Restart();
+    Restart();
 }
 
 template <class W, bool T_64bit>
 void BLAKE2_Base<W, T_64bit>::IncrementCounter(size_t count)
 {
-	State& state = *m_state.data();
-	state.t[0] += static_cast<W>(count);
-	state.t[1] += !!(state.t[0] < count);
+    State& state = *m_state.data();
+    state.t[0] += static_cast<W>(count);
+    state.t[1] += !!(state.t[0] < count);
 }
 
 template <>
 void BLAKE2_Base<word64, true>::Compress(const byte *input)
 {
-	// Selects the most advanced implementation at runtime
-	static const pfnCompress64 s_pfn = InitializeCompress64Fn();
-	s_pfn(input, *m_state.data());
+    // Selects the most advanced implementation at runtime
+    static const pfnCompress64 s_pfn = InitializeCompress64Fn();
+    s_pfn(input, *m_state.data());
 }
 
 template <>
 void BLAKE2_Base<word32, false>::Compress(const byte *input)
 {
-	// Selects the most advanced implementation at runtime
-	static const pfnCompress32 s_pfn = InitializeCompress32Fn();
-	s_pfn(input, *m_state.data());
+    // Selects the most advanced implementation at runtime
+    static const pfnCompress32 s_pfn = InitializeCompress32Fn();
+    s_pfn(input, *m_state.data());
 }
 
 void BLAKE2_CXX_Compress64(const byte* input, BLAKE2_State<word64, true>& state)
 {
-	#undef BLAKE2_G
-	#undef BLAKE2_ROUND
+    #undef BLAKE2_G
+    #undef BLAKE2_ROUND
 
-	#define BLAKE2_G(r,i,a,b,c,d) \
-	  do { \
-	    a = a + b + m[BLAKE2_Sigma<true>::sigma[r][2*i+0]]; \
-	    d = rotrVariable<word64>(d ^ a, 32); \
-	    c = c + d; \
-	    b = rotrVariable<word64>(b ^ c, 24); \
-	    a = a + b + m[BLAKE2_Sigma<true>::sigma[r][2*i+1]]; \
-	    d = rotrVariable<word64>(d ^ a, 16); \
-	    c = c + d; \
-	    b = rotrVariable<word64>(b ^ c, 63); \
-	  } while(0)
+    #define BLAKE2_G(r,i,a,b,c,d) \
+      do { \
+        a = a + b + m[BLAKE2_Sigma<true>::sigma[r][2*i+0]]; \
+        d = rotrVariable<word64>(d ^ a, 32); \
+        c = c + d; \
+        b = rotrVariable<word64>(b ^ c, 24); \
+        a = a + b + m[BLAKE2_Sigma<true>::sigma[r][2*i+1]]; \
+        d = rotrVariable<word64>(d ^ a, 16); \
+        c = c + d; \
+        b = rotrVariable<word64>(b ^ c, 63); \
+      } while(0)
 
-	#define BLAKE2_ROUND(r)  \
-	  do { \
-	    BLAKE2_G(r,0,v[ 0],v[ 4],v[ 8],v[12]); \
-	    BLAKE2_G(r,1,v[ 1],v[ 5],v[ 9],v[13]); \
-	    BLAKE2_G(r,2,v[ 2],v[ 6],v[10],v[14]); \
-	    BLAKE2_G(r,3,v[ 3],v[ 7],v[11],v[15]); \
-	    BLAKE2_G(r,4,v[ 0],v[ 5],v[10],v[15]); \
-	    BLAKE2_G(r,5,v[ 1],v[ 6],v[11],v[12]); \
-	    BLAKE2_G(r,6,v[ 2],v[ 7],v[ 8],v[13]); \
-	    BLAKE2_G(r,7,v[ 3],v[ 4],v[ 9],v[14]); \
-	  } while(0)
+    #define BLAKE2_ROUND(r)  \
+      do { \
+        BLAKE2_G(r,0,v[ 0],v[ 4],v[ 8],v[12]); \
+        BLAKE2_G(r,1,v[ 1],v[ 5],v[ 9],v[13]); \
+        BLAKE2_G(r,2,v[ 2],v[ 6],v[10],v[14]); \
+        BLAKE2_G(r,3,v[ 3],v[ 7],v[11],v[15]); \
+        BLAKE2_G(r,4,v[ 0],v[ 5],v[10],v[15]); \
+        BLAKE2_G(r,5,v[ 1],v[ 6],v[11],v[12]); \
+        BLAKE2_G(r,6,v[ 2],v[ 7],v[ 8],v[13]); \
+        BLAKE2_G(r,7,v[ 3],v[ 4],v[ 9],v[14]); \
+      } while(0)
 
-	word64 m[16], v[16];
+    word64 m[16], v[16];
 
-	GetBlock<word64, LittleEndian, true> get1(input);
-	get1(m[0])(m[1])(m[2])(m[3])(m[4])(m[5])(m[6])(m[7])(m[8])(m[9])(m[10])(m[11])(m[12])(m[13])(m[14])(m[15]);
+    GetBlock<word64, LittleEndian, true> get1(input);
+    get1(m[0])(m[1])(m[2])(m[3])(m[4])(m[5])(m[6])(m[7])(m[8])(m[9])(m[10])(m[11])(m[12])(m[13])(m[14])(m[15]);
 
-	GetBlock<word64, LittleEndian, true> get2(&state.h[0]);
-	get2(v[0])(v[1])(v[2])(v[3])(v[4])(v[5])(v[6])(v[7]);
+    GetBlock<word64, LittleEndian, true> get2(&state.h[0]);
+    get2(v[0])(v[1])(v[2])(v[3])(v[4])(v[5])(v[6])(v[7]);
 
-	v[ 8] = BLAKE2B_IV(0);
-	v[ 9] = BLAKE2B_IV(1);
-	v[10] = BLAKE2B_IV(2);
-	v[11] = BLAKE2B_IV(3);
-	v[12] = state.t[0] ^ BLAKE2B_IV(4);
-	v[13] = state.t[1] ^ BLAKE2B_IV(5);
-	v[14] = state.f[0] ^ BLAKE2B_IV(6);
-	v[15] = state.f[1] ^ BLAKE2B_IV(7);
+    v[ 8] = BLAKE2B_IV(0);
+    v[ 9] = BLAKE2B_IV(1);
+    v[10] = BLAKE2B_IV(2);
+    v[11] = BLAKE2B_IV(3);
+    v[12] = state.t[0] ^ BLAKE2B_IV(4);
+    v[13] = state.t[1] ^ BLAKE2B_IV(5);
+    v[14] = state.f[0] ^ BLAKE2B_IV(6);
+    v[15] = state.f[1] ^ BLAKE2B_IV(7);
 
-	BLAKE2_ROUND( 0 );
-	BLAKE2_ROUND( 1 );
-	BLAKE2_ROUND( 2 );
-	BLAKE2_ROUND( 3 );
-	BLAKE2_ROUND( 4 );
-	BLAKE2_ROUND( 5 );
-	BLAKE2_ROUND( 6 );
-	BLAKE2_ROUND( 7 );
-	BLAKE2_ROUND( 8 );
-	BLAKE2_ROUND( 9 );
-	BLAKE2_ROUND( 10 );
-	BLAKE2_ROUND( 11 );
+    BLAKE2_ROUND(0);
+    BLAKE2_ROUND(1);
+    BLAKE2_ROUND(2);
+    BLAKE2_ROUND(3);
+    BLAKE2_ROUND(4);
+    BLAKE2_ROUND(5);
+    BLAKE2_ROUND(6);
+    BLAKE2_ROUND(7);
+    BLAKE2_ROUND(8);
+    BLAKE2_ROUND(9);
+    BLAKE2_ROUND(10);
+    BLAKE2_ROUND(11);
 
-	for(unsigned int i = 0; i < 8; ++i)
-		state.h[i] = state.h[i] ^ ConditionalByteReverse(LittleEndian::ToEnum(), v[i] ^ v[i + 8]);
+    for(unsigned int i = 0; i < 8; ++i)
+        state.h[i] = state.h[i] ^ ConditionalByteReverse(LittleEndian::ToEnum(), v[i] ^ v[i + 8]);
 }
 
 void BLAKE2_CXX_Compress32(const byte* input, BLAKE2_State<word32, false>& state)
 {
-	#undef BLAKE2_G
-	#undef BLAKE2_ROUND
+    #undef BLAKE2_G
+    #undef BLAKE2_ROUND
 
-	#define BLAKE2_G(r,i,a,b,c,d) \
-	  do { \
-	    a = a + b + m[BLAKE2_Sigma<false>::sigma[r][2*i+0]]; \
-	    d = rotrVariable<word32>(d ^ a, 16); \
-	    c = c + d; \
-	    b = rotrVariable<word32>(b ^ c, 12); \
-	    a = a + b + m[BLAKE2_Sigma<false>::sigma[r][2*i+1]]; \
-	    d = rotrVariable<word32>(d ^ a, 8); \
-	    c = c + d; \
-	    b = rotrVariable<word32>(b ^ c, 7); \
-	  } while(0)
+    #define BLAKE2_G(r,i,a,b,c,d) \
+      do { \
+        a = a + b + m[BLAKE2_Sigma<false>::sigma[r][2*i+0]]; \
+        d = rotrVariable<word32>(d ^ a, 16); \
+        c = c + d; \
+        b = rotrVariable<word32>(b ^ c, 12); \
+        a = a + b + m[BLAKE2_Sigma<false>::sigma[r][2*i+1]]; \
+        d = rotrVariable<word32>(d ^ a, 8); \
+        c = c + d; \
+        b = rotrVariable<word32>(b ^ c, 7); \
+      } while(0)
 
-	#define BLAKE2_ROUND(r)  \
-	  do { \
-	    BLAKE2_G(r,0,v[ 0],v[ 4],v[ 8],v[12]); \
-	    BLAKE2_G(r,1,v[ 1],v[ 5],v[ 9],v[13]); \
-	    BLAKE2_G(r,2,v[ 2],v[ 6],v[10],v[14]); \
-	    BLAKE2_G(r,3,v[ 3],v[ 7],v[11],v[15]); \
-	    BLAKE2_G(r,4,v[ 0],v[ 5],v[10],v[15]); \
-	    BLAKE2_G(r,5,v[ 1],v[ 6],v[11],v[12]); \
-	    BLAKE2_G(r,6,v[ 2],v[ 7],v[ 8],v[13]); \
-	    BLAKE2_G(r,7,v[ 3],v[ 4],v[ 9],v[14]); \
-	  } while(0)
+    #define BLAKE2_ROUND(r)  \
+      do { \
+        BLAKE2_G(r,0,v[ 0],v[ 4],v[ 8],v[12]); \
+        BLAKE2_G(r,1,v[ 1],v[ 5],v[ 9],v[13]); \
+        BLAKE2_G(r,2,v[ 2],v[ 6],v[10],v[14]); \
+        BLAKE2_G(r,3,v[ 3],v[ 7],v[11],v[15]); \
+        BLAKE2_G(r,4,v[ 0],v[ 5],v[10],v[15]); \
+        BLAKE2_G(r,5,v[ 1],v[ 6],v[11],v[12]); \
+        BLAKE2_G(r,6,v[ 2],v[ 7],v[ 8],v[13]); \
+        BLAKE2_G(r,7,v[ 3],v[ 4],v[ 9],v[14]); \
+      } while(0)
 
-	word32 m[16], v[16];
+    word32 m[16], v[16];
 
-	GetBlock<word32, LittleEndian, true> get1(input);
-	get1(m[0])(m[1])(m[2])(m[3])(m[4])(m[5])(m[6])(m[7])(m[8])(m[9])(m[10])(m[11])(m[12])(m[13])(m[14])(m[15]);
+    GetBlock<word32, LittleEndian, true> get1(input);
+    get1(m[0])(m[1])(m[2])(m[3])(m[4])(m[5])(m[6])(m[7])(m[8])(m[9])(m[10])(m[11])(m[12])(m[13])(m[14])(m[15]);
 
-	GetBlock<word32, LittleEndian, true> get2(&state.h[0]);
-	get2(v[0])(v[1])(v[2])(v[3])(v[4])(v[5])(v[6])(v[7]);
+    GetBlock<word32, LittleEndian, true> get2(&state.h[0]);
+    get2(v[0])(v[1])(v[2])(v[3])(v[4])(v[5])(v[6])(v[7]);
 
-	v[ 8] = BLAKE2S_IV(0);
-	v[ 9] = BLAKE2S_IV(1);
-	v[10] = BLAKE2S_IV(2);
-	v[11] = BLAKE2S_IV(3);
-	v[12] = state.t[0] ^ BLAKE2S_IV(4);
-	v[13] = state.t[1] ^ BLAKE2S_IV(5);
-	v[14] = state.f[0] ^ BLAKE2S_IV(6);
-	v[15] = state.f[1] ^ BLAKE2S_IV(7);
+    v[ 8] = BLAKE2S_IV(0);
+    v[ 9] = BLAKE2S_IV(1);
+    v[10] = BLAKE2S_IV(2);
+    v[11] = BLAKE2S_IV(3);
+    v[12] = state.t[0] ^ BLAKE2S_IV(4);
+    v[13] = state.t[1] ^ BLAKE2S_IV(5);
+    v[14] = state.f[0] ^ BLAKE2S_IV(6);
+    v[15] = state.f[1] ^ BLAKE2S_IV(7);
 
-	BLAKE2_ROUND( 0 );
-	BLAKE2_ROUND( 1 );
-	BLAKE2_ROUND( 2 );
-	BLAKE2_ROUND( 3 );
-	BLAKE2_ROUND( 4 );
-	BLAKE2_ROUND( 5 );
-	BLAKE2_ROUND( 6 );
-	BLAKE2_ROUND( 7 );
-	BLAKE2_ROUND( 8 );
-	BLAKE2_ROUND( 9 );
+    BLAKE2_ROUND(0);
+    BLAKE2_ROUND(1);
+    BLAKE2_ROUND(2);
+    BLAKE2_ROUND(3);
+    BLAKE2_ROUND(4);
+    BLAKE2_ROUND(5);
+    BLAKE2_ROUND(6);
+    BLAKE2_ROUND(7);
+    BLAKE2_ROUND(8);
+    BLAKE2_ROUND(9);
 
-	for(unsigned int i = 0; i < 8; ++i)
-		state.h[i] = state.h[i] ^ ConditionalByteReverse(LittleEndian::ToEnum(), v[i] ^ v[i + 8]);
+    for(unsigned int i = 0; i < 8; ++i)
+        state.h[i] = state.h[i] ^ ConditionalByteReverse(LittleEndian::ToEnum(), v[i] ^ v[i + 8]);
 }
 
 #if CRYPTOPP_BOOL_SSE2_INTRINSICS_AVAILABLE
@@ -1052,8 +1054,8 @@ static void BLAKE2_SSE2_Compress64(const byte* input, BLAKE2_State<word64, true>
   row4l = _mm_xor_si128(_mm_loadu_si128((const __m128i*)(const void*)(&BLAKE2B_IV(4))), _mm_loadu_si128((const __m128i*)(const void*)(&state.t[0])));
   row4h = _mm_xor_si128(_mm_loadu_si128((const __m128i*)(const void*)(&BLAKE2B_IV(6))), _mm_loadu_si128((const __m128i*)(const void*)(&state.f[0])));
 
-  b0 = _mm_set_epi64x(m2, m0);
-  b1 = _mm_set_epi64x(m6, m4);
+  b0 = MM_SET_EPI64X(m2, m0);
+  b1 = MM_SET_EPI64X(m6, m4);
   row1l = _mm_add_epi64(_mm_add_epi64(row1l, b0), row2l);
   row1h = _mm_add_epi64(_mm_add_epi64(row1h, b1), row2h);
   row4l = _mm_xor_si128(row4l, row1l);
@@ -1067,8 +1069,8 @@ static void BLAKE2_SSE2_Compress64(const byte* input, BLAKE2_State<word64, true>
   row2l = _mm_xor_si128(_mm_srli_epi64(row2l,24),_mm_slli_epi64(row2l, 40));
   row2h = _mm_xor_si128(_mm_srli_epi64(row2h,24),_mm_slli_epi64(row2h, 40));
 
-  b0 = _mm_set_epi64x(m3, m1);
-  b1 = _mm_set_epi64x(m7, m5);
+  b0 = MM_SET_EPI64X(m3, m1);
+  b1 = MM_SET_EPI64X(m7, m5);
   row1l = _mm_add_epi64(_mm_add_epi64(row1l, b0), row2l);
   row1h = _mm_add_epi64(_mm_add_epi64(row1h, b1), row2h);
   row4l = _mm_xor_si128(row4l, row1l);
@@ -1088,8 +1090,8 @@ static void BLAKE2_SSE2_Compress64(const byte* input, BLAKE2_State<word64, true>
   row2l = _mm_unpackhi_epi64(row2l, _mm_unpacklo_epi64(row2h, row2h));
   row2h = _mm_unpackhi_epi64(row2h, _mm_unpacklo_epi64(t1, t1));
 
-  b0 = _mm_set_epi64x(m10, m8);
-  b1 = _mm_set_epi64x(m14, m12);
+  b0 = MM_SET_EPI64X(m10, m8);
+  b1 = MM_SET_EPI64X(m14, m12);
   row1l = _mm_add_epi64(_mm_add_epi64(row1l, b0), row2l);
   row1h = _mm_add_epi64(_mm_add_epi64(row1h, b1), row2h);
   row4l = _mm_xor_si128(row4l, row1l);
@@ -1103,8 +1105,8 @@ static void BLAKE2_SSE2_Compress64(const byte* input, BLAKE2_State<word64, true>
   row2l = _mm_xor_si128(_mm_srli_epi64(row2l,24),_mm_slli_epi64(row2l,40));
   row2h = _mm_xor_si128(_mm_srli_epi64(row2h,24),_mm_slli_epi64(row2h,40));
 
-  b0 = _mm_set_epi64x(m11, m9);
-  b1 = _mm_set_epi64x(m15, m13);
+  b0 = MM_SET_EPI64X(m11, m9);
+  b1 = MM_SET_EPI64X(m15, m13);
   row1l = _mm_add_epi64(_mm_add_epi64(row1l, b0), row2l);
   row1h = _mm_add_epi64(_mm_add_epi64(row1h, b1), row2h);
   row4l = _mm_xor_si128(row4l, row1l);
@@ -1124,8 +1126,8 @@ static void BLAKE2_SSE2_Compress64(const byte* input, BLAKE2_State<word64, true>
   row4l = _mm_unpackhi_epi64(row4l, _mm_unpacklo_epi64(row4h, row4h));
   row4h = _mm_unpackhi_epi64(row4h, _mm_unpacklo_epi64(t1, t1));
 
-  b0 = _mm_set_epi64x(m4, m14);
-  b1 = _mm_set_epi64x(m13, m9);
+  b0 = MM_SET_EPI64X(m4, m14);
+  b1 = MM_SET_EPI64X(m13, m9);
   row1l = _mm_add_epi64(_mm_add_epi64(row1l, b0), row2l);
   row1h = _mm_add_epi64(_mm_add_epi64(row1h, b1), row2h);
   row4l = _mm_xor_si128(row4l, row1l);
@@ -1139,8 +1141,8 @@ static void BLAKE2_SSE2_Compress64(const byte* input, BLAKE2_State<word64, true>
   row2l = _mm_xor_si128(_mm_srli_epi64(row2l,24),_mm_slli_epi64(row2l,40));
   row2h = _mm_xor_si128(_mm_srli_epi64(row2h,24),_mm_slli_epi64(row2h,40));
 
-  b0 = _mm_set_epi64x(m8, m10);
-  b1 = _mm_set_epi64x(m6, m15);
+  b0 = MM_SET_EPI64X(m8, m10);
+  b1 = MM_SET_EPI64X(m6, m15);
   row1l = _mm_add_epi64(_mm_add_epi64(row1l, b0), row2l);
   row1h = _mm_add_epi64(_mm_add_epi64(row1h, b1), row2h);
   row4l = _mm_xor_si128(row4l, row1l);
@@ -1159,8 +1161,8 @@ static void BLAKE2_SSE2_Compress64(const byte* input, BLAKE2_State<word64, true>
   row4h = _mm_unpackhi_epi64(t0, _mm_unpacklo_epi64(row4h, row4h));
   row2l = _mm_unpackhi_epi64(row2l, _mm_unpacklo_epi64(row2h, row2h));
   row2h = _mm_unpackhi_epi64(row2h, _mm_unpacklo_epi64(t1, t1));
-  b0 = _mm_set_epi64x(m0, m1);
-  b1 = _mm_set_epi64x(m5, m11);
+  b0 = MM_SET_EPI64X(m0, m1);
+  b1 = MM_SET_EPI64X(m5, m11);
   row1l = _mm_add_epi64(_mm_add_epi64(row1l, b0), row2l);
   row1h = _mm_add_epi64(_mm_add_epi64(row1h, b1), row2h);
   row4l = _mm_xor_si128(row4l, row1l);
@@ -1174,8 +1176,8 @@ static void BLAKE2_SSE2_Compress64(const byte* input, BLAKE2_State<word64, true>
   row2l = _mm_xor_si128(_mm_srli_epi64(row2l,24),_mm_slli_epi64(row2l,40));
   row2h = _mm_xor_si128(_mm_srli_epi64(row2h,24),_mm_slli_epi64(row2h,40));
 
-  b0 = _mm_set_epi64x(m2, m12);
-  b1 = _mm_set_epi64x(m3, m7);
+  b0 = MM_SET_EPI64X(m2, m12);
+  b1 = MM_SET_EPI64X(m3, m7);
   row1l = _mm_add_epi64(_mm_add_epi64(row1l, b0), row2l);
   row1h = _mm_add_epi64(_mm_add_epi64(row1h, b1), row2h);
   row4l = _mm_xor_si128(row4l, row1l);
@@ -1195,8 +1197,8 @@ static void BLAKE2_SSE2_Compress64(const byte* input, BLAKE2_State<word64, true>
   row4l = _mm_unpackhi_epi64(row4l, _mm_unpacklo_epi64(row4h, row4h));
   row4h = _mm_unpackhi_epi64(row4h, _mm_unpacklo_epi64(t1, t1));
 
-  b0 = _mm_set_epi64x(m12, m11);
-  b1 = _mm_set_epi64x(m15, m5);
+  b0 = MM_SET_EPI64X(m12, m11);
+  b1 = MM_SET_EPI64X(m15, m5);
   row1l = _mm_add_epi64(_mm_add_epi64(row1l, b0), row2l);
   row1h = _mm_add_epi64(_mm_add_epi64(row1h, b1), row2h);
   row4l = _mm_xor_si128(row4l, row1l);
@@ -1210,8 +1212,8 @@ static void BLAKE2_SSE2_Compress64(const byte* input, BLAKE2_State<word64, true>
   row2l = _mm_xor_si128(_mm_srli_epi64(row2l,24),_mm_slli_epi64(row2l,40));
   row2h = _mm_xor_si128(_mm_srli_epi64(row2h,24),_mm_slli_epi64(row2h,40));
 
-  b0 = _mm_set_epi64x(m0, m8);
-  b1 = _mm_set_epi64x(m13, m2);
+  b0 = MM_SET_EPI64X(m0, m8);
+  b1 = MM_SET_EPI64X(m13, m2);
   row1l = _mm_add_epi64(_mm_add_epi64(row1l, b0), row2l);
   row1h = _mm_add_epi64(_mm_add_epi64(row1h, b1), row2h);
   row4l = _mm_xor_si128(row4l, row1l);
@@ -1230,8 +1232,8 @@ static void BLAKE2_SSE2_Compress64(const byte* input, BLAKE2_State<word64, true>
   row4h = _mm_unpackhi_epi64(t0, _mm_unpacklo_epi64(row4h, row4h));
   row2l = _mm_unpackhi_epi64(row2l, _mm_unpacklo_epi64(row2h, row2h));
   row2h = _mm_unpackhi_epi64(row2h, _mm_unpacklo_epi64(t1, t1));
-  b0 = _mm_set_epi64x(m3, m10);
-  b1 = _mm_set_epi64x(m9, m7);
+  b0 = MM_SET_EPI64X(m3, m10);
+  b1 = MM_SET_EPI64X(m9, m7);
   row1l = _mm_add_epi64(_mm_add_epi64(row1l, b0), row2l);
   row1h = _mm_add_epi64(_mm_add_epi64(row1h, b1), row2h);
   row4l = _mm_xor_si128(row4l, row1l);
@@ -1245,8 +1247,8 @@ static void BLAKE2_SSE2_Compress64(const byte* input, BLAKE2_State<word64, true>
   row2l = _mm_xor_si128(_mm_srli_epi64(row2l,24),_mm_slli_epi64(row2l,40));
   row2h = _mm_xor_si128(_mm_srli_epi64(row2h,24),_mm_slli_epi64(row2h,40));
 
-  b0 = _mm_set_epi64x(m6, m14);
-  b1 = _mm_set_epi64x(m4, m1);
+  b0 = MM_SET_EPI64X(m6, m14);
+  b1 = MM_SET_EPI64X(m4, m1);
   row1l = _mm_add_epi64(_mm_add_epi64(row1l, b0), row2l);
   row1h = _mm_add_epi64(_mm_add_epi64(row1h, b1), row2h);
   row4l = _mm_xor_si128(row4l, row1l);
@@ -1266,8 +1268,8 @@ static void BLAKE2_SSE2_Compress64(const byte* input, BLAKE2_State<word64, true>
   row4l = _mm_unpackhi_epi64(row4l, _mm_unpacklo_epi64(row4h, row4h));
   row4h = _mm_unpackhi_epi64(row4h, _mm_unpacklo_epi64(t1, t1));
 
-  b0 = _mm_set_epi64x(m3, m7);
-  b1 = _mm_set_epi64x(m11, m13);
+  b0 = MM_SET_EPI64X(m3, m7);
+  b1 = MM_SET_EPI64X(m11, m13);
   row1l = _mm_add_epi64(_mm_add_epi64(row1l, b0), row2l);
   row1h = _mm_add_epi64(_mm_add_epi64(row1h, b1), row2h);
   row4l = _mm_xor_si128(row4l, row1l);
@@ -1281,8 +1283,8 @@ static void BLAKE2_SSE2_Compress64(const byte* input, BLAKE2_State<word64, true>
   row2l = _mm_xor_si128(_mm_srli_epi64(row2l,24),_mm_slli_epi64(row2l,40));
   row2h = _mm_xor_si128(_mm_srli_epi64(row2h,24),_mm_slli_epi64(row2h,40));
 
-  b0 = _mm_set_epi64x(m1, m9);
-  b1 = _mm_set_epi64x(m14, m12);
+  b0 = MM_SET_EPI64X(m1, m9);
+  b1 = MM_SET_EPI64X(m14, m12);
   row1l = _mm_add_epi64(_mm_add_epi64(row1l, b0), row2l);
   row1h = _mm_add_epi64(_mm_add_epi64(row1h, b1), row2h);
   row4l = _mm_xor_si128(row4l, row1l);
@@ -1301,8 +1303,8 @@ static void BLAKE2_SSE2_Compress64(const byte* input, BLAKE2_State<word64, true>
   row4h = _mm_unpackhi_epi64(t0, _mm_unpacklo_epi64(row4h, row4h));
   row2l = _mm_unpackhi_epi64(row2l, _mm_unpacklo_epi64(row2h, row2h));
   row2h = _mm_unpackhi_epi64(row2h, _mm_unpacklo_epi64(t1, t1));
-  b0 = _mm_set_epi64x(m5, m2);
-  b1 = _mm_set_epi64x(m15, m4);
+  b0 = MM_SET_EPI64X(m5, m2);
+  b1 = MM_SET_EPI64X(m15, m4);
   row1l = _mm_add_epi64(_mm_add_epi64(row1l, b0), row2l);
   row1h = _mm_add_epi64(_mm_add_epi64(row1h, b1), row2h);
   row4l = _mm_xor_si128(row4l, row1l);
@@ -1316,8 +1318,8 @@ static void BLAKE2_SSE2_Compress64(const byte* input, BLAKE2_State<word64, true>
   row2l = _mm_xor_si128(_mm_srli_epi64(row2l,24),_mm_slli_epi64(row2l,40));
   row2h = _mm_xor_si128(_mm_srli_epi64(row2h,24),_mm_slli_epi64(row2h,40));
 
-  b0 = _mm_set_epi64x(m10, m6);
-  b1 = _mm_set_epi64x(m8, m0);
+  b0 = MM_SET_EPI64X(m10, m6);
+  b1 = MM_SET_EPI64X(m8, m0);
   row1l = _mm_add_epi64(_mm_add_epi64(row1l, b0), row2l);
   row1h = _mm_add_epi64(_mm_add_epi64(row1h, b1), row2h);
   row4l = _mm_xor_si128(row4l, row1l);
@@ -1337,8 +1339,8 @@ static void BLAKE2_SSE2_Compress64(const byte* input, BLAKE2_State<word64, true>
   row4l = _mm_unpackhi_epi64(row4l, _mm_unpacklo_epi64(row4h, row4h));
   row4h = _mm_unpackhi_epi64(row4h, _mm_unpacklo_epi64(t1, t1));
 
-  b0 = _mm_set_epi64x(m5, m9);
-  b1 = _mm_set_epi64x(m10, m2);
+  b0 = MM_SET_EPI64X(m5, m9);
+  b1 = MM_SET_EPI64X(m10, m2);
   row1l = _mm_add_epi64(_mm_add_epi64(row1l, b0), row2l);
   row1h = _mm_add_epi64(_mm_add_epi64(row1h, b1), row2h);
   row4l = _mm_xor_si128(row4l, row1l);
@@ -1352,8 +1354,8 @@ static void BLAKE2_SSE2_Compress64(const byte* input, BLAKE2_State<word64, true>
   row2l = _mm_xor_si128(_mm_srli_epi64(row2l,24),_mm_slli_epi64(row2l,40));
   row2h = _mm_xor_si128(_mm_srli_epi64(row2h,24),_mm_slli_epi64(row2h,40));
 
-  b0 = _mm_set_epi64x(m7, m0);
-  b1 = _mm_set_epi64x(m15, m4);
+  b0 = MM_SET_EPI64X(m7, m0);
+  b1 = MM_SET_EPI64X(m15, m4);
   row1l = _mm_add_epi64(_mm_add_epi64(row1l, b0), row2l);
   row1h = _mm_add_epi64(_mm_add_epi64(row1h, b1), row2h);
   row4l = _mm_xor_si128(row4l, row1l);
@@ -1372,8 +1374,9 @@ static void BLAKE2_SSE2_Compress64(const byte* input, BLAKE2_State<word64, true>
   row4h = _mm_unpackhi_epi64(t0, _mm_unpacklo_epi64(row4h, row4h));
   row2l = _mm_unpackhi_epi64(row2l, _mm_unpacklo_epi64(row2h, row2h));
   row2h = _mm_unpackhi_epi64(row2h, _mm_unpacklo_epi64(t1, t1));
-  b0 = _mm_set_epi64x(m11, m14);
-  b1 = _mm_set_epi64x(m3, m6);
+
+  b0 = MM_SET_EPI64X(m11, m14);
+  b1 = MM_SET_EPI64X(m3, m6);
   row1l = _mm_add_epi64(_mm_add_epi64(row1l, b0), row2l);
   row1h = _mm_add_epi64(_mm_add_epi64(row1h, b1), row2h);
   row4l = _mm_xor_si128(row4l, row1l);
@@ -1388,8 +1391,8 @@ static void BLAKE2_SSE2_Compress64(const byte* input, BLAKE2_State<word64, true>
   row2h = _mm_xor_si128(_mm_srli_epi64(row2h,24),_mm_slli_epi64(row2h,40));
 
 
-  b0 = _mm_set_epi64x(m12, m1);
-  b1 = _mm_set_epi64x(m13, m8);
+  b0 = MM_SET_EPI64X(m12, m1);
+  b1 = MM_SET_EPI64X(m13, m8);
   row1l = _mm_add_epi64(_mm_add_epi64(row1l, b0), row2l);
   row1h = _mm_add_epi64(_mm_add_epi64(row1h, b1), row2h);
   row4l = _mm_xor_si128(row4l, row1l);
@@ -1409,8 +1412,8 @@ static void BLAKE2_SSE2_Compress64(const byte* input, BLAKE2_State<word64, true>
   row4l = _mm_unpackhi_epi64(row4l, _mm_unpacklo_epi64(row4h, row4h));
   row4h = _mm_unpackhi_epi64(row4h, _mm_unpacklo_epi64(t1, t1));
 
-  b0 = _mm_set_epi64x(m6, m2);
-  b1 = _mm_set_epi64x(m8, m0);
+  b0 = MM_SET_EPI64X(m6, m2);
+  b1 = MM_SET_EPI64X(m8, m0);
   row1l = _mm_add_epi64(_mm_add_epi64(row1l, b0), row2l);
   row1h = _mm_add_epi64(_mm_add_epi64(row1h, b1), row2h);
   row4l = _mm_xor_si128(row4l, row1l);
@@ -1424,8 +1427,8 @@ static void BLAKE2_SSE2_Compress64(const byte* input, BLAKE2_State<word64, true>
   row2l = _mm_xor_si128(_mm_srli_epi64(row2l,24),_mm_slli_epi64(row2l,40));
   row2h = _mm_xor_si128(_mm_srli_epi64(row2h,24),_mm_slli_epi64(row2h,40));
 
-  b0 = _mm_set_epi64x(m10, m12);
-  b1 = _mm_set_epi64x(m3, m11);
+  b0 = MM_SET_EPI64X(m10, m12);
+  b1 = MM_SET_EPI64X(m3, m11);
   row1l = _mm_add_epi64(_mm_add_epi64(row1l, b0), row2l);
   row1h = _mm_add_epi64(_mm_add_epi64(row1h, b1), row2h);
   row4l = _mm_xor_si128(row4l, row1l);
@@ -1444,8 +1447,9 @@ static void BLAKE2_SSE2_Compress64(const byte* input, BLAKE2_State<word64, true>
   row4h = _mm_unpackhi_epi64(t0, _mm_unpacklo_epi64(row4h, row4h));
   row2l = _mm_unpackhi_epi64(row2l, _mm_unpacklo_epi64(row2h, row2h));
   row2h = _mm_unpackhi_epi64(row2h, _mm_unpacklo_epi64(t1, t1));
-  b0 = _mm_set_epi64x(m7, m4);
-  b1 = _mm_set_epi64x(m1, m15);
+
+  b0 = MM_SET_EPI64X(m7, m4);
+  b1 = MM_SET_EPI64X(m1, m15);
   row1l = _mm_add_epi64(_mm_add_epi64(row1l, b0), row2l);
   row1h = _mm_add_epi64(_mm_add_epi64(row1h, b1), row2h);
   row4l = _mm_xor_si128(row4l, row1l);
@@ -1459,8 +1463,8 @@ static void BLAKE2_SSE2_Compress64(const byte* input, BLAKE2_State<word64, true>
   row2l = _mm_xor_si128(_mm_srli_epi64(row2l,24),_mm_slli_epi64(row2l,40));
   row2h = _mm_xor_si128(_mm_srli_epi64(row2h,24),_mm_slli_epi64(row2h,40));
 
-  b0 = _mm_set_epi64x(m5, m13);
-  b1 = _mm_set_epi64x(m9, m14);
+  b0 = MM_SET_EPI64X(m5, m13);
+  b1 = MM_SET_EPI64X(m9, m14);
   row1l = _mm_add_epi64(_mm_add_epi64(row1l, b0), row2l);
   row1h = _mm_add_epi64(_mm_add_epi64(row1h, b1), row2h);
   row4l = _mm_xor_si128(row4l, row1l);
@@ -1480,8 +1484,8 @@ static void BLAKE2_SSE2_Compress64(const byte* input, BLAKE2_State<word64, true>
   row4l = _mm_unpackhi_epi64(row4l, _mm_unpacklo_epi64(row4h, row4h));
   row4h = _mm_unpackhi_epi64(row4h, _mm_unpacklo_epi64(t1, t1));
 
-  b0 = _mm_set_epi64x(m1, m12);
-  b1 = _mm_set_epi64x(m4, m14);
+  b0 = MM_SET_EPI64X(m1, m12);
+  b1 = MM_SET_EPI64X(m4, m14);
   row1l = _mm_add_epi64(_mm_add_epi64(row1l, b0), row2l);
   row1h = _mm_add_epi64(_mm_add_epi64(row1h, b1), row2h);
   row4l = _mm_xor_si128(row4l, row1l);
@@ -1495,8 +1499,8 @@ static void BLAKE2_SSE2_Compress64(const byte* input, BLAKE2_State<word64, true>
   row2l = _mm_xor_si128(_mm_srli_epi64(row2l,24),_mm_slli_epi64(row2l,40));
   row2h = _mm_xor_si128(_mm_srli_epi64(row2h,24),_mm_slli_epi64(row2h,40));
 
-  b0 = _mm_set_epi64x(m15, m5);
-  b1 = _mm_set_epi64x(m10, m13);
+  b0 = MM_SET_EPI64X(m15, m5);
+  b1 = MM_SET_EPI64X(m10, m13);
   row1l = _mm_add_epi64(_mm_add_epi64(row1l, b0), row2l);
   row1h = _mm_add_epi64(_mm_add_epi64(row1h, b1), row2h);
   row4l = _mm_xor_si128(row4l, row1l);
@@ -1515,8 +1519,9 @@ static void BLAKE2_SSE2_Compress64(const byte* input, BLAKE2_State<word64, true>
   row4h = _mm_unpackhi_epi64(t0, _mm_unpacklo_epi64(row4h, row4h));
   row2l = _mm_unpackhi_epi64(row2l, _mm_unpacklo_epi64(row2h, row2h));
   row2h = _mm_unpackhi_epi64(row2h, _mm_unpacklo_epi64(t1, t1));
-  b0 = _mm_set_epi64x(m6, m0);
-  b1 = _mm_set_epi64x(m8, m9);
+
+  b0 = MM_SET_EPI64X(m6, m0);
+  b1 = MM_SET_EPI64X(m8, m9);
   row1l = _mm_add_epi64(_mm_add_epi64(row1l, b0), row2l);
   row1h = _mm_add_epi64(_mm_add_epi64(row1h, b1), row2h);
   row4l = _mm_xor_si128(row4l, row1l);
@@ -1530,8 +1535,8 @@ static void BLAKE2_SSE2_Compress64(const byte* input, BLAKE2_State<word64, true>
   row2l = _mm_xor_si128(_mm_srli_epi64(row2l,24),_mm_slli_epi64(row2l,40));
   row2h = _mm_xor_si128(_mm_srli_epi64(row2h,24),_mm_slli_epi64(row2h,40));
 
-  b0 = _mm_set_epi64x(m3, m7);
-  b1 = _mm_set_epi64x(m11, m2);
+  b0 = MM_SET_EPI64X(m3, m7);
+  b1 = MM_SET_EPI64X(m11, m2);
   row1l = _mm_add_epi64(_mm_add_epi64(row1l, b0), row2l);
   row1h = _mm_add_epi64(_mm_add_epi64(row1h, b1), row2h);
   row4l = _mm_xor_si128(row4l, row1l);
@@ -1551,8 +1556,8 @@ static void BLAKE2_SSE2_Compress64(const byte* input, BLAKE2_State<word64, true>
   row4l = _mm_unpackhi_epi64(row4l, _mm_unpacklo_epi64(row4h, row4h));
   row4h = _mm_unpackhi_epi64(row4h, _mm_unpacklo_epi64(t1, t1));
 
-  b0 = _mm_set_epi64x(m7, m13);
-  b1 = _mm_set_epi64x(m3, m12);
+  b0 = MM_SET_EPI64X(m7, m13);
+  b1 = MM_SET_EPI64X(m3, m12);
   row1l = _mm_add_epi64(_mm_add_epi64(row1l, b0), row2l);
   row1h = _mm_add_epi64(_mm_add_epi64(row1h, b1), row2h);
   row4l = _mm_xor_si128(row4l, row1l);
@@ -1566,8 +1571,8 @@ static void BLAKE2_SSE2_Compress64(const byte* input, BLAKE2_State<word64, true>
   row2l = _mm_xor_si128(_mm_srli_epi64(row2l,24),_mm_slli_epi64(row2l,40));
   row2h = _mm_xor_si128(_mm_srli_epi64(row2h,24),_mm_slli_epi64(row2h,40));
 
-  b0 = _mm_set_epi64x(m14, m11);
-  b1 = _mm_set_epi64x(m9, m1);
+  b0 = MM_SET_EPI64X(m14, m11);
+  b1 = MM_SET_EPI64X(m9, m1);
   row1l = _mm_add_epi64(_mm_add_epi64(row1l, b0), row2l);
   row1h = _mm_add_epi64(_mm_add_epi64(row1h, b1), row2h);
   row4l = _mm_xor_si128(row4l, row1l);
@@ -1586,8 +1591,9 @@ static void BLAKE2_SSE2_Compress64(const byte* input, BLAKE2_State<word64, true>
   row4h = _mm_unpackhi_epi64(t0, _mm_unpacklo_epi64(row4h, row4h));
   row2l = _mm_unpackhi_epi64(row2l, _mm_unpacklo_epi64(row2h, row2h));
   row2h = _mm_unpackhi_epi64(row2h, _mm_unpacklo_epi64(t1, t1));
-  b0 = _mm_set_epi64x(m15, m5);
-  b1 = _mm_set_epi64x(m2, m8);
+
+  b0 = MM_SET_EPI64X(m15, m5);
+  b1 = MM_SET_EPI64X(m2, m8);
   row1l = _mm_add_epi64(_mm_add_epi64(row1l, b0), row2l);
   row1h = _mm_add_epi64(_mm_add_epi64(row1h, b1), row2h);
   row4l = _mm_xor_si128(row4l, row1l);
@@ -1601,8 +1607,8 @@ static void BLAKE2_SSE2_Compress64(const byte* input, BLAKE2_State<word64, true>
   row2l = _mm_xor_si128(_mm_srli_epi64(row2l,24),_mm_slli_epi64(row2l,40));
   row2h = _mm_xor_si128(_mm_srli_epi64(row2h,24),_mm_slli_epi64(row2h,40));
 
-  b0 = _mm_set_epi64x(m4, m0);
-  b1 = _mm_set_epi64x(m10, m6);
+  b0 = MM_SET_EPI64X(m4, m0);
+  b1 = MM_SET_EPI64X(m10, m6);
   row1l = _mm_add_epi64(_mm_add_epi64(row1l, b0), row2l);
   row1h = _mm_add_epi64(_mm_add_epi64(row1h, b1), row2h);
   row4l = _mm_xor_si128(row4l, row1l);
@@ -1622,8 +1628,8 @@ static void BLAKE2_SSE2_Compress64(const byte* input, BLAKE2_State<word64, true>
   row4l = _mm_unpackhi_epi64(row4l, _mm_unpacklo_epi64(row4h, row4h));
   row4h = _mm_unpackhi_epi64(row4h, _mm_unpacklo_epi64(t1, t1));
 
-  b0 = _mm_set_epi64x(m14, m6);
-  b1 = _mm_set_epi64x(m0, m11);
+  b0 = MM_SET_EPI64X(m14, m6);
+  b1 = MM_SET_EPI64X(m0, m11);
   row1l = _mm_add_epi64(_mm_add_epi64(row1l, b0), row2l);
   row1h = _mm_add_epi64(_mm_add_epi64(row1h, b1), row2h);
   row4l = _mm_xor_si128(row4l, row1l);
@@ -1637,8 +1643,8 @@ static void BLAKE2_SSE2_Compress64(const byte* input, BLAKE2_State<word64, true>
   row2l = _mm_xor_si128(_mm_srli_epi64(row2l,24),_mm_slli_epi64(row2l,40));
   row2h = _mm_xor_si128(_mm_srli_epi64(row2h,24),_mm_slli_epi64(row2h,40));
 
-  b0 = _mm_set_epi64x(m9, m15);
-  b1 = _mm_set_epi64x(m8, m3);
+  b0 = MM_SET_EPI64X(m9, m15);
+  b1 = MM_SET_EPI64X(m8, m3);
   row1l = _mm_add_epi64(_mm_add_epi64(row1l, b0), row2l);
   row1h = _mm_add_epi64(_mm_add_epi64(row1h, b1), row2h);
   row4l = _mm_xor_si128(row4l, row1l);
@@ -1657,8 +1663,9 @@ static void BLAKE2_SSE2_Compress64(const byte* input, BLAKE2_State<word64, true>
   row4h = _mm_unpackhi_epi64(t0, _mm_unpacklo_epi64(row4h, row4h));
   row2l = _mm_unpackhi_epi64(row2l, _mm_unpacklo_epi64(row2h, row2h));
   row2h = _mm_unpackhi_epi64(row2h, _mm_unpacklo_epi64(t1, t1));
-  b0 = _mm_set_epi64x(m13, m12);
-  b1 = _mm_set_epi64x(m10, m1);
+
+  b0 = MM_SET_EPI64X(m13, m12);
+  b1 = MM_SET_EPI64X(m10, m1);
   row1l = _mm_add_epi64(_mm_add_epi64(row1l, b0), row2l);
   row1h = _mm_add_epi64(_mm_add_epi64(row1h, b1), row2h);
   row4l = _mm_xor_si128(row4l, row1l);
@@ -1672,8 +1679,8 @@ static void BLAKE2_SSE2_Compress64(const byte* input, BLAKE2_State<word64, true>
   row2l = _mm_xor_si128(_mm_srli_epi64(row2l,24),_mm_slli_epi64(row2l,40));
   row2h = _mm_xor_si128(_mm_srli_epi64(row2h,24),_mm_slli_epi64(row2h,40));
 
-  b0 = _mm_set_epi64x(m7, m2);
-  b1 = _mm_set_epi64x(m5, m4);
+  b0 = MM_SET_EPI64X(m7, m2);
+  b1 = MM_SET_EPI64X(m5, m4);
   row1l = _mm_add_epi64(_mm_add_epi64(row1l, b0), row2l);
   row1h = _mm_add_epi64(_mm_add_epi64(row1h, b1), row2h);
   row4l = _mm_xor_si128(row4l, row1l);
@@ -1693,8 +1700,8 @@ static void BLAKE2_SSE2_Compress64(const byte* input, BLAKE2_State<word64, true>
   row4l = _mm_unpackhi_epi64(row4l, _mm_unpacklo_epi64(row4h, row4h));
   row4h = _mm_unpackhi_epi64(row4h, _mm_unpacklo_epi64(t1, t1));
 
-  b0 = _mm_set_epi64x(m8, m10);
-  b1 = _mm_set_epi64x(m1, m7);
+  b0 = MM_SET_EPI64X(m8, m10);
+  b1 = MM_SET_EPI64X(m1, m7);
   row1l = _mm_add_epi64(_mm_add_epi64(row1l, b0), row2l);
   row1h = _mm_add_epi64(_mm_add_epi64(row1h, b1), row2h);
   row4l = _mm_xor_si128(row4l, row1l);
@@ -1708,8 +1715,8 @@ static void BLAKE2_SSE2_Compress64(const byte* input, BLAKE2_State<word64, true>
   row2l = _mm_xor_si128(_mm_srli_epi64(row2l,24),_mm_slli_epi64(row2l,40));
   row2h = _mm_xor_si128(_mm_srli_epi64(row2h,24),_mm_slli_epi64(row2h,40));
 
-  b0 = _mm_set_epi64x(m4, m2);
-  b1 = _mm_set_epi64x(m5, m6);
+  b0 = MM_SET_EPI64X(m4, m2);
+  b1 = MM_SET_EPI64X(m5, m6);
   row1l = _mm_add_epi64(_mm_add_epi64(row1l, b0), row2l);
   row1h = _mm_add_epi64(_mm_add_epi64(row1h, b1), row2h);
   row4l = _mm_xor_si128(row4l, row1l);
@@ -1728,8 +1735,9 @@ static void BLAKE2_SSE2_Compress64(const byte* input, BLAKE2_State<word64, true>
   row4h = _mm_unpackhi_epi64(t0, _mm_unpacklo_epi64(row4h, row4h));
   row2l = _mm_unpackhi_epi64(row2l, _mm_unpacklo_epi64(row2h, row2h));
   row2h = _mm_unpackhi_epi64(row2h, _mm_unpacklo_epi64(t1, t1));
-  b0 = _mm_set_epi64x(m9, m15);
-  b1 = _mm_set_epi64x(m13, m3);
+
+  b0 = MM_SET_EPI64X(m9, m15);
+  b1 = MM_SET_EPI64X(m13, m3);
   row1l = _mm_add_epi64(_mm_add_epi64(row1l, b0), row2l);
   row1h = _mm_add_epi64(_mm_add_epi64(row1h, b1), row2h);
   row4l = _mm_xor_si128(row4l, row1l);
@@ -1743,8 +1751,8 @@ static void BLAKE2_SSE2_Compress64(const byte* input, BLAKE2_State<word64, true>
   row2l = _mm_xor_si128(_mm_srli_epi64(row2l,24),_mm_slli_epi64(row2l,40));
   row2h = _mm_xor_si128(_mm_srli_epi64(row2h,24),_mm_slli_epi64(row2h,40));
 
-  b0 = _mm_set_epi64x(m14, m11);
-  b1 = _mm_set_epi64x(m0, m12);
+  b0 = MM_SET_EPI64X(m14, m11);
+  b1 = MM_SET_EPI64X(m0, m12);
   row1l = _mm_add_epi64(_mm_add_epi64(row1l, b0), row2l);
   row1h = _mm_add_epi64(_mm_add_epi64(row1h, b1), row2h);
   row4l = _mm_xor_si128(row4l, row1l);
@@ -1764,8 +1772,8 @@ static void BLAKE2_SSE2_Compress64(const byte* input, BLAKE2_State<word64, true>
   row4l = _mm_unpackhi_epi64(row4l, _mm_unpacklo_epi64(row4h, row4h));
   row4h = _mm_unpackhi_epi64(row4h, _mm_unpacklo_epi64(t1, t1));
 
-  b0 = _mm_set_epi64x(m2, m0);
-  b1 = _mm_set_epi64x(m6, m4);
+  b0 = MM_SET_EPI64X(m2, m0);
+  b1 = MM_SET_EPI64X(m6, m4);
   row1l = _mm_add_epi64(_mm_add_epi64(row1l, b0), row2l);
   row1h = _mm_add_epi64(_mm_add_epi64(row1h, b1), row2h);
   row4l = _mm_xor_si128(row4l, row1l);
@@ -1779,8 +1787,8 @@ static void BLAKE2_SSE2_Compress64(const byte* input, BLAKE2_State<word64, true>
   row2l = _mm_xor_si128(_mm_srli_epi64(row2l,24),_mm_slli_epi64(row2l,40));
   row2h = _mm_xor_si128(_mm_srli_epi64(row2h,24),_mm_slli_epi64(row2h,40));
 
-  b0 = _mm_set_epi64x(m3, m1);
-  b1 = _mm_set_epi64x(m7, m5);
+  b0 = MM_SET_EPI64X(m3, m1);
+  b1 = MM_SET_EPI64X(m7, m5);
   row1l = _mm_add_epi64(_mm_add_epi64(row1l, b0), row2l);
   row1h = _mm_add_epi64(_mm_add_epi64(row1h, b1), row2h);
   row4l = _mm_xor_si128(row4l, row1l);
@@ -1800,8 +1808,8 @@ static void BLAKE2_SSE2_Compress64(const byte* input, BLAKE2_State<word64, true>
   row2l = _mm_unpackhi_epi64(row2l, _mm_unpacklo_epi64(row2h, row2h));
   row2h = _mm_unpackhi_epi64(row2h, _mm_unpacklo_epi64(t1, t1));
 
-  b0 = _mm_set_epi64x(m10, m8);
-  b1 = _mm_set_epi64x(m14, m12);
+  b0 = MM_SET_EPI64X(m10, m8);
+  b1 = MM_SET_EPI64X(m14, m12);
   row1l = _mm_add_epi64(_mm_add_epi64(row1l, b0), row2l);
   row1h = _mm_add_epi64(_mm_add_epi64(row1h, b1), row2h);
   row4l = _mm_xor_si128(row4l, row1l);
@@ -1815,8 +1823,8 @@ static void BLAKE2_SSE2_Compress64(const byte* input, BLAKE2_State<word64, true>
   row2l = _mm_xor_si128(_mm_srli_epi64(row2l,24),_mm_slli_epi64(row2l,40));
   row2h = _mm_xor_si128(_mm_srli_epi64(row2h,24),_mm_slli_epi64(row2h,40));
 
-  b0 = _mm_set_epi64x(m11, m9);
-  b1 = _mm_set_epi64x(m15, m13);
+  b0 = MM_SET_EPI64X(m11, m9);
+  b1 = MM_SET_EPI64X(m15, m13);
   row1l = _mm_add_epi64(_mm_add_epi64(row1l, b0), row2l);
   row1h = _mm_add_epi64(_mm_add_epi64(row1h, b1), row2h);
   row4l = _mm_xor_si128(row4l, row1l);
@@ -1836,8 +1844,8 @@ static void BLAKE2_SSE2_Compress64(const byte* input, BLAKE2_State<word64, true>
   row4l = _mm_unpackhi_epi64(row4l, _mm_unpacklo_epi64(row4h, row4h));
   row4h = _mm_unpackhi_epi64(row4h, _mm_unpacklo_epi64(t1, t1));
 
-  b0 = _mm_set_epi64x(m4, m14);
-  b1 = _mm_set_epi64x(m13, m9);
+  b0 = MM_SET_EPI64X(m4, m14);
+  b1 = MM_SET_EPI64X(m13, m9);
   row1l = _mm_add_epi64(_mm_add_epi64(row1l, b0), row2l);
   row1h = _mm_add_epi64(_mm_add_epi64(row1h, b1), row2h);
   row4l = _mm_xor_si128(row4l, row1l);
@@ -1851,8 +1859,8 @@ static void BLAKE2_SSE2_Compress64(const byte* input, BLAKE2_State<word64, true>
   row2l = _mm_xor_si128(_mm_srli_epi64(row2l,24),_mm_slli_epi64(row2l,40));
   row2h = _mm_xor_si128(_mm_srli_epi64(row2h,24),_mm_slli_epi64(row2h,40));
 
-  b0 = _mm_set_epi64x(m8, m10);
-  b1 = _mm_set_epi64x(m6, m15);
+  b0 = MM_SET_EPI64X(m8, m10);
+  b1 = MM_SET_EPI64X(m6, m15);
   row1l = _mm_add_epi64(_mm_add_epi64(row1l, b0), row2l);
   row1h = _mm_add_epi64(_mm_add_epi64(row1h, b1), row2h);
   row4l = _mm_xor_si128(row4l, row1l);
@@ -1871,8 +1879,9 @@ static void BLAKE2_SSE2_Compress64(const byte* input, BLAKE2_State<word64, true>
   row4h = _mm_unpackhi_epi64(t0, _mm_unpacklo_epi64(row4h, row4h));
   row2l = _mm_unpackhi_epi64(row2l, _mm_unpacklo_epi64(row2h, row2h));
   row2h = _mm_unpackhi_epi64(row2h, _mm_unpacklo_epi64(t1, t1));
-  b0 = _mm_set_epi64x(m0, m1);
-  b1 = _mm_set_epi64x(m5, m11);
+
+  b0 = MM_SET_EPI64X(m0, m1);
+  b1 = MM_SET_EPI64X(m5, m11);
   row1l = _mm_add_epi64(_mm_add_epi64(row1l, b0), row2l);
   row1h = _mm_add_epi64(_mm_add_epi64(row1h, b1), row2h);
   row4l = _mm_xor_si128(row4l, row1l);
@@ -1886,8 +1895,8 @@ static void BLAKE2_SSE2_Compress64(const byte* input, BLAKE2_State<word64, true>
   row2l = _mm_xor_si128(_mm_srli_epi64(row2l,24),_mm_slli_epi64(row2l,40));
   row2h = _mm_xor_si128(_mm_srli_epi64(row2h,24),_mm_slli_epi64(row2h,40));
 
-  b0 = _mm_set_epi64x(m2, m12);
-  b1 = _mm_set_epi64x(m3, m7);
+  b0 = MM_SET_EPI64X(m2, m12);
+  b1 = MM_SET_EPI64X(m3, m7);
   row1l = _mm_add_epi64(_mm_add_epi64(row1l, b0), row2l);
   row1h = _mm_add_epi64(_mm_add_epi64(row1h, b1), row2h);
   row4l = _mm_xor_si128(row4l, row1l);
@@ -3452,1621 +3461,684 @@ static void BLAKE2_SSE4_Compress64(const byte* input, BLAKE2_State<word64, true>
 }
 #endif  // CRYPTOPP_BOOL_SSE4_INTRINSICS_AVAILABLE
 
-#if CRYPTOPP_BOOL_NEON_INTRINSICS_AVAILABLE
-
-// Reverse words for ARM (use arguments to _mm_set_epi32 without reversing them).
-#define vld1q_u32_rev(x, a,b,c,d) d[1]=c[0],d[2]=b[0],d[3]=a[0]; x = vld1q_u32(d);
-
-// Keep things straight due to swapping. For a 128-bit vector, H64 denotes
-//   the high 64-bit vector, and L64 denotes the low 64-bit vector. The
-//   vectors are the same as returned by vget_high_u64 and vget_low_u64.
-static const int LANE_H64 = 1;
-static const int LANE_L64 = 0;
+#if CRYPTOPP_BOOL_ARM32 && CRYPTOPP_BOOL_NEON_INTRINSICS_AVAILABLE
 
 static void BLAKE2_NEON_Compress32(const byte* input, BLAKE2_State<word32, false>& state)
 {
-  //CRYPTOPP_ASSERT(IsAlignedOn(input,GetAlignmentOf<uint8_t*>()));
-  CRYPTOPP_ASSERT(IsAlignedOn(&state.h[0],GetAlignmentOf<uint32x4_t>()));
-  CRYPTOPP_ASSERT(IsAlignedOn(&state.h[4],GetAlignmentOf<uint32x4_t>()));
-  CRYPTOPP_ASSERT(IsAlignedOn(&state.t[0],GetAlignmentOf<uint32x4_t>()));
-
-  CRYPTOPP_ALIGN_DATA(16) uint32_t m0[4], m1[4], m2[4], m3[4], m4[4], m5[4], m6[4], m7[4];
-  CRYPTOPP_ALIGN_DATA(16) uint32_t m8[4], m9[4], m10[4], m11[4], m12[4], m13[4], m14[4], m15[4];
-
-  GetBlock<word32, LittleEndian, true> get(input);
-  get(m0[0])(m1[0])(m2[0])(m3[0])(m4[0])(m5[0])(m6[0])(m7[0])(m8[0])(m9[0])(m10[0])(m11[0])(m12[0])(m13[0])(m14[0])(m15[0]);
-
-  uint32x4_t row1,row2,row3,row4;
-  uint32x4_t buf1,buf2,buf3,buf4;
-  uint32x4_t ff0,ff1;
-
-  row1 = ff0 = vld1q_u32((const uint32_t*)&state.h[0]);
-  row2 = ff1 = vld1q_u32((const uint32_t*)&state.h[4]);
-  row3 = vld1q_u32((const uint32_t*)&BLAKE2S_IV(0));
-  row4 = veorq_u32(vld1q_u32((const uint32_t*)&BLAKE2S_IV(4)), vld1q_u32((const uint32_t*)&state.t[0]));
-
-  // buf1 = vld1q_u32(m6,m4,m2,m0);
-  vld1q_u32_rev(buf1, m6,m4,m2,m0);
-
-  row1 = vaddq_u32(vaddq_u32(row1,buf1),row2);
-  row4 = veorq_u32(row4,row1);
-  row4 = veorq_u32(vshrq_n_u32(row4,16),vshlq_n_u32(row4,16));
-  row3 = vaddq_u32(row3,row4);
-  row2 = veorq_u32(row2,row3);
-  row2 = veorq_u32(vshrq_n_u32(row2,12),vshlq_n_u32(row2,20));
-
-  // buf2 = vld1q_u32(m7,m5,m3,m1);
-  vld1q_u32_rev(buf2, m7,m5,m3,m1);
-
-  row1 = vaddq_u32(vaddq_u32(row1,buf2),row2);
-  row4 = veorq_u32(row4,row1);
-  row4 = veorq_u32(vshrq_n_u32(row4,8),vshlq_n_u32(row4,24));
-  row3 = vaddq_u32(row3,row4);
-  row2 = veorq_u32(row2,row3);
-  row2 = veorq_u32(vshrq_n_u32(row2,7),vshlq_n_u32(row2,25));
-
-  row4 = vextq_u32(row4,row4,3);
-  row3 = vcombine_u32(vget_high_u32(row3),vget_low_u32(row3));
-  row2 = vextq_u32(row2,row2,1);
-
-  // buf3 = vld1q_u32(m14,m12,m10,m8);
-  vld1q_u32_rev(buf3, m14,m12,m10,m8);
-
-  row1 = vaddq_u32(vaddq_u32(row1,buf3),row2);
-  row4 = veorq_u32(row4,row1);
-  row4 = veorq_u32(vshrq_n_u32(row4,16),vshlq_n_u32(row4,16));
-  row3 = vaddq_u32(row3,row4);
-  row2 = veorq_u32(row2,row3);
-  row2 = veorq_u32(vshrq_n_u32(row2,12),vshlq_n_u32(row2,20));
-
-  // buf4 = vld1q_u32(m15,m13,m11,m9);
-  vld1q_u32_rev(buf4, m15,m13,m11,m9);
-
-  row1 = vaddq_u32(vaddq_u32(row1,buf4),row2);
-  row4 = veorq_u32(row4,row1);
-  row4 = veorq_u32(vshrq_n_u32(row4,8),vshlq_n_u32(row4,24));
-  row3 = vaddq_u32(row3,row4);
-  row2 = veorq_u32(row2,row3);
-  row2 = veorq_u32(vshrq_n_u32(row2,7),vshlq_n_u32(row2,25));
-
-  row4 = vextq_u32(row4,row4,1);
-  row3 = vcombine_u32(vget_high_u32(row3),vget_low_u32(row3));
-  row2 = vextq_u32(row2,row2,3);
-
-  // buf1 = vld1q_u32(m13,m9,m4,m14);
-  vld1q_u32_rev(buf1, m13,m9,m4,m14);
-
-  row1 = vaddq_u32(vaddq_u32(row1,buf1),row2);
-  row4 = veorq_u32(row4,row1);
-  row4 = veorq_u32(vshrq_n_u32(row4,16),vshlq_n_u32(row4,16));
-  row3 = vaddq_u32(row3,row4);
-  row2 = veorq_u32(row2,row3);
-  row2 = veorq_u32(vshrq_n_u32(row2,12),vshlq_n_u32(row2,20));
-
-  // buf2 = vld1q_u32(m6,m15,m8,m10);
-  vld1q_u32_rev(buf2, m6,m15,m8,m10);
-
-  row1 = vaddq_u32(vaddq_u32(row1,buf2),row2);
-  row4 = veorq_u32(row4,row1);
-  row4 = veorq_u32(vshrq_n_u32(row4,8),vshlq_n_u32(row4,24));
-  row3 = vaddq_u32(row3,row4);
-  row2 = veorq_u32(row2,row3);
-  row2 = veorq_u32(vshrq_n_u32(row2,7),vshlq_n_u32(row2,25));
-
-  row4 = vextq_u32(row4,row4,3);
-  row3 = vcombine_u32(vget_high_u32(row3),vget_low_u32(row3));
-  row2 = vextq_u32(row2,row2,1);
-
-  // buf3 = vld1q_u32(m5,m11,m0,m1);
-  vld1q_u32_rev(buf3, m5,m11,m0,m1);
-
-  row1 = vaddq_u32(vaddq_u32(row1,buf3),row2);
-  row4 = veorq_u32(row4,row1);
-  row4 = veorq_u32(vshrq_n_u32(row4,16),vshlq_n_u32(row4,16));
-  row3 = vaddq_u32(row3,row4);
-  row2 = veorq_u32(row2,row3);
-  row2 = veorq_u32(vshrq_n_u32(row2,12),vshlq_n_u32(row2,20));
-
-  // buf4 = vld1q_u32(m3,m7,m2,m12);
-  vld1q_u32_rev(buf4, m3,m7,m2,m12);
-
-  row1 = vaddq_u32(vaddq_u32(row1,buf4),row2);
-  row4 = veorq_u32(row4,row1);
-  row4 = veorq_u32(vshrq_n_u32(row4,8),vshlq_n_u32(row4,24));
-  row3 = vaddq_u32(row3,row4);
-  row2 = veorq_u32(row2,row3);
-  row2 = veorq_u32(vshrq_n_u32(row2,7),vshlq_n_u32(row2,25));
-
-  row4 = vextq_u32(row4,row4,1);
-  row3 = vcombine_u32(vget_high_u32(row3),vget_low_u32(row3));
-  row2 = vextq_u32(row2,row2,3);
-
-  // buf1 = vld1q_u32(m15,m5,m12,m11);
-  vld1q_u32_rev(buf1, m15,m5,m12,m11);
-
-  row1 = vaddq_u32(vaddq_u32(row1,buf1),row2);
-  row4 = veorq_u32(row4,row1);
-  row4 = veorq_u32(vshrq_n_u32(row4,16),vshlq_n_u32(row4,16));
-  row3 = vaddq_u32(row3,row4);
-  row2 = veorq_u32(row2,row3);
-  row2 = veorq_u32(vshrq_n_u32(row2,12),vshlq_n_u32(row2,20));
-
-  // buf2 = vld1q_u32(m13,m2,m0,m8);
-  vld1q_u32_rev(buf2, m13,m2,m0,m8);
-
-  row1 = vaddq_u32(vaddq_u32(row1,buf2),row2);
-  row4 = veorq_u32(row4,row1);
-  row4 = veorq_u32(vshrq_n_u32(row4,8),vshlq_n_u32(row4,24));
-  row3 = vaddq_u32(row3,row4);
-  row2 = veorq_u32(row2,row3);
-  row2 = veorq_u32(vshrq_n_u32(row2,7),vshlq_n_u32(row2,25));
-
-  row4 = vextq_u32(row4,row4,3);
-  row3 = vcombine_u32(vget_high_u32(row3),vget_low_u32(row3));
-  row2 = vextq_u32(row2,row2,1);
-
-  // buf3 = vld1q_u32(m9,m7,m3,m10);
-  vld1q_u32_rev(buf3, m9,m7,m3,m10);
-
-  row1 = vaddq_u32(vaddq_u32(row1,buf3),row2);
-  row4 = veorq_u32(row4,row1);
-  row4 = veorq_u32(vshrq_n_u32(row4,16),vshlq_n_u32(row4,16));
-  row3 = vaddq_u32(row3,row4);
-  row2 = veorq_u32(row2,row3);
-  row2 = veorq_u32(vshrq_n_u32(row2,12),vshlq_n_u32(row2,20));
-
-  // buf4 = vld1q_u32(m4,m1,m6,m14);
-  vld1q_u32_rev(buf4, m4,m1,m6,m14);
-
-  row1 = vaddq_u32(vaddq_u32(row1,buf4),row2);
-  row4 = veorq_u32(row4,row1);
-  row4 = veorq_u32(vshrq_n_u32(row4,8),vshlq_n_u32(row4,24));
-  row3 = vaddq_u32(row3,row4);
-  row2 = veorq_u32(row2,row3);
-  row2 = veorq_u32(vshrq_n_u32(row2,7),vshlq_n_u32(row2,25));
-
-  row4 = vextq_u32(row4,row4,1);
-  row3 = vcombine_u32(vget_high_u32(row3),vget_low_u32(row3));
-  row2 = vextq_u32(row2,row2,3);
-
-  // buf1 = vld1q_u32(m11,m13,m3,m7);
-  vld1q_u32_rev(buf1, m11,m13,m3,m7);
-
-  row1 = vaddq_u32(vaddq_u32(row1,buf1),row2);
-  row4 = veorq_u32(row4,row1);
-  row4 = veorq_u32(vshrq_n_u32(row4,16),vshlq_n_u32(row4,16));
-  row3 = vaddq_u32(row3,row4);
-  row2 = veorq_u32(row2,row3);
-  row2 = veorq_u32(vshrq_n_u32(row2,12),vshlq_n_u32(row2,20));
-
-  // buf2 = vld1q_u32(m14,m12,m1,m9);
-  vld1q_u32_rev(buf2, m14,m12,m1,m9);
-
-  row1 = vaddq_u32(vaddq_u32(row1,buf2),row2);
-  row4 = veorq_u32(row4,row1);
-  row4 = veorq_u32(vshrq_n_u32(row4,8),vshlq_n_u32(row4,24));
-  row3 = vaddq_u32(row3,row4);
-  row2 = veorq_u32(row2,row3);
-  row2 = veorq_u32(vshrq_n_u32(row2,7),vshlq_n_u32(row2,25));
-
-  row4 = vextq_u32(row4,row4,3);
-  row3 = vcombine_u32(vget_high_u32(row3),vget_low_u32(row3));
-  row2 = vextq_u32(row2,row2,1);
-
-  // buf3 = vld1q_u32(m15,m4,m5,m2);
-  vld1q_u32_rev(buf3, m15,m4,m5,m2);
-
-  row1 = vaddq_u32(vaddq_u32(row1,buf3),row2);
-  row4 = veorq_u32(row4,row1);
-  row4 = veorq_u32(vshrq_n_u32(row4,16),vshlq_n_u32(row4,16));
-  row3 = vaddq_u32(row3,row4);
-  row2 = veorq_u32(row2,row3);
-  row2 = veorq_u32(vshrq_n_u32(row2,12),vshlq_n_u32(row2,20));
-
-  // buf4 = vld1q_u32(m8,m0,m10,m6);
-  vld1q_u32_rev(buf4, m8,m0,m10,m6);
-
-  row1 = vaddq_u32(vaddq_u32(row1,buf4),row2);
-  row4 = veorq_u32(row4,row1);
-  row4 = veorq_u32(vshrq_n_u32(row4,8),vshlq_n_u32(row4,24));
-  row3 = vaddq_u32(row3,row4);
-  row2 = veorq_u32(row2,row3);
-  row2 = veorq_u32(vshrq_n_u32(row2,7),vshlq_n_u32(row2,25));
-
-  row4 = vextq_u32(row4,row4,1);
-  row3 = vcombine_u32(vget_high_u32(row3),vget_low_u32(row3));
-  row2 = vextq_u32(row2,row2,3);
-
-  // buf1 = vld1q_u32(m10,m2,m5,m9);
-  vld1q_u32_rev(buf1, m10,m2,m5,m9);
-
-  row1 = vaddq_u32(vaddq_u32(row1,buf1),row2);
-  row4 = veorq_u32(row4,row1);
-  row4 = veorq_u32(vshrq_n_u32(row4,16),vshlq_n_u32(row4,16));
-  row3 = vaddq_u32(row3,row4);
-  row2 = veorq_u32(row2,row3);
-  row2 = veorq_u32(vshrq_n_u32(row2,12),vshlq_n_u32(row2,20));
-
-  // buf2 = vld1q_u32(m15,m4,m7,m0);
-  vld1q_u32_rev(buf2, m15,m4,m7,m0);
-
-  row1 = vaddq_u32(vaddq_u32(row1,buf2),row2);
-  row4 = veorq_u32(row4,row1);
-  row4 = veorq_u32(vshrq_n_u32(row4,8),vshlq_n_u32(row4,24));
-  row3 = vaddq_u32(row3,row4);
-  row2 = veorq_u32(row2,row3);
-  row2 = veorq_u32(vshrq_n_u32(row2,7),vshlq_n_u32(row2,25));
-
-  row4 = vextq_u32(row4,row4,3);
-  row3 = vcombine_u32(vget_high_u32(row3),vget_low_u32(row3));
-  row2 = vextq_u32(row2,row2,1);
-
-  // buf3 = vld1q_u32(m3,m6,m11,m14);
-  vld1q_u32_rev(buf3, m3,m6,m11,m14);
-
-  row1 = vaddq_u32(vaddq_u32(row1,buf3),row2);
-  row4 = veorq_u32(row4,row1);
-  row4 = veorq_u32(vshrq_n_u32(row4,16),vshlq_n_u32(row4,16));
-  row3 = vaddq_u32(row3,row4);
-  row2 = veorq_u32(row2,row3);
-  row2 = veorq_u32(vshrq_n_u32(row2,12),vshlq_n_u32(row2,20));
-
-  // buf4 = vld1q_u32(m13,m8,m12,m1);
-  vld1q_u32_rev(buf4, m13,m8,m12,m1);
-
-  row1 = vaddq_u32(vaddq_u32(row1,buf4),row2);
-  row4 = veorq_u32(row4,row1);
-  row4 = veorq_u32(vshrq_n_u32(row4,8),vshlq_n_u32(row4,24));
-  row3 = vaddq_u32(row3,row4);
-  row2 = veorq_u32(row2,row3);
-  row2 = veorq_u32(vshrq_n_u32(row2,7),vshlq_n_u32(row2,25));
-
-  row4 = vextq_u32(row4,row4,1);
-  row3 = vcombine_u32(vget_high_u32(row3),vget_low_u32(row3));
-  row2 = vextq_u32(row2,row2,3);
-
-  // buf1 = vld1q_u32(m8,m0,m6,m2);
-  vld1q_u32_rev(buf1, m8,m0,m6,m2);
-
-  row1 = vaddq_u32(vaddq_u32(row1,buf1),row2);
-  row4 = veorq_u32(row4,row1);
-  row4 = veorq_u32(vshrq_n_u32(row4,16),vshlq_n_u32(row4,16));
-  row3 = vaddq_u32(row3,row4);
-  row2 = veorq_u32(row2,row3);
-  row2 = veorq_u32(vshrq_n_u32(row2,12),vshlq_n_u32(row2,20));
-
-  // buf2 = vld1q_u32(m3,m11,m10,m12);
-  vld1q_u32_rev(buf2, m3,m11,m10,m12);
-
-  row1 = vaddq_u32(vaddq_u32(row1,buf2),row2);
-  row4 = veorq_u32(row4,row1);
-  row4 = veorq_u32(vshrq_n_u32(row4,8),vshlq_n_u32(row4,24));
-  row3 = vaddq_u32(row3,row4);
-  row2 = veorq_u32(row2,row3);
-  row2 = veorq_u32(vshrq_n_u32(row2,7),vshlq_n_u32(row2,25));
-
-  row4 = vextq_u32(row4,row4,3);
-  row3 = vcombine_u32(vget_high_u32(row3),vget_low_u32(row3));
-  row2 = vextq_u32(row2,row2,1);
-
-  // buf3 = vld1q_u32(m1,m15,m7,m4);
-  vld1q_u32_rev(buf3, m1,m15,m7,m4);
-
-  row1 = vaddq_u32(vaddq_u32(row1,buf3),row2);
-  row4 = veorq_u32(row4,row1);
-  row4 = veorq_u32(vshrq_n_u32(row4,16),vshlq_n_u32(row4,16));
-  row3 = vaddq_u32(row3,row4);
-  row2 = veorq_u32(row2,row3);
-  row2 = veorq_u32(vshrq_n_u32(row2,12),vshlq_n_u32(row2,20));
-
-  // buf4 = vld1q_u32(m9,m14,m5,m13);
-  vld1q_u32_rev(buf4, m9,m14,m5,m13);
-
-  row1 = vaddq_u32(vaddq_u32(row1,buf4),row2);
-  row4 = veorq_u32(row4,row1);
-  row4 = veorq_u32(vshrq_n_u32(row4,8),vshlq_n_u32(row4,24));
-  row3 = vaddq_u32(row3,row4);
-  row2 = veorq_u32(row2,row3);
-  row2 = veorq_u32(vshrq_n_u32(row2,7),vshlq_n_u32(row2,25));
-
-  row4 = vextq_u32(row4,row4,1);
-  row3 = vcombine_u32(vget_high_u32(row3),vget_low_u32(row3));
-  row2 = vextq_u32(row2,row2,3);
-
-  // buf1 = vld1q_u32(m4,m14,m1,m12);
-  vld1q_u32_rev(buf1, m4,m14,m1,m12);
-
-  row1 = vaddq_u32(vaddq_u32(row1,buf1),row2);
-  row4 = veorq_u32(row4,row1);
-  row4 = veorq_u32(vshrq_n_u32(row4,16),vshlq_n_u32(row4,16));
-  row3 = vaddq_u32(row3,row4);
-  row2 = veorq_u32(row2,row3);
-  row2 = veorq_u32(vshrq_n_u32(row2,12),vshlq_n_u32(row2,20));
-
-  // buf2 = vld1q_u32(m10,m13,m15,m5);
-  vld1q_u32_rev(buf2, m10,m13,m15,m5);
-
-  row1 = vaddq_u32(vaddq_u32(row1,buf2),row2);
-  row4 = veorq_u32(row4,row1);
-  row4 = veorq_u32(vshrq_n_u32(row4,8),vshlq_n_u32(row4,24));
-  row3 = vaddq_u32(row3,row4);
-  row2 = veorq_u32(row2,row3);
-  row2 = veorq_u32(vshrq_n_u32(row2,7),vshlq_n_u32(row2,25));
-
-  row4 = vextq_u32(row4,row4,3);
-  row3 = vcombine_u32(vget_high_u32(row3),vget_low_u32(row3));
-  row2 = vextq_u32(row2,row2,1);
-
-  // buf3 = vld1q_u32(m8,m9,m6,m0);
-  vld1q_u32_rev(buf3, m8,m9,m6,m0);
-
-  row1 = vaddq_u32(vaddq_u32(row1,buf3),row2);
-  row4 = veorq_u32(row4,row1);
-  row4 = veorq_u32(vshrq_n_u32(row4,16),vshlq_n_u32(row4,16));
-  row3 = vaddq_u32(row3,row4);
-  row2 = veorq_u32(row2,row3);
-  row2 = veorq_u32(vshrq_n_u32(row2,12),vshlq_n_u32(row2,20));
-
-  // buf4 = vld1q_u32(m11,m2,m3,m7);
-  vld1q_u32_rev(buf4, m11,m2,m3,m7);
-
-  row1 = vaddq_u32(vaddq_u32(row1,buf4),row2);
-  row4 = veorq_u32(row4,row1);
-  row4 = veorq_u32(vshrq_n_u32(row4,8),vshlq_n_u32(row4,24));
-  row3 = vaddq_u32(row3,row4);
-  row2 = veorq_u32(row2,row3);
-  row2 = veorq_u32(vshrq_n_u32(row2,7),vshlq_n_u32(row2,25));
-
-  row4 = vextq_u32(row4,row4,1);
-  row3 = vcombine_u32(vget_high_u32(row3),vget_low_u32(row3));
-  row2 = vextq_u32(row2,row2,3);
-
-  // buf1 = vld1q_u32(m3,m12,m7,m13);
-  vld1q_u32_rev(buf1, m3,m12,m7,m13);
-
-  row1 = vaddq_u32(vaddq_u32(row1,buf1),row2);
-  row4 = veorq_u32(row4,row1);
-  row4 = veorq_u32(vshrq_n_u32(row4,16),vshlq_n_u32(row4,16));
-  row3 = vaddq_u32(row3,row4);
-  row2 = veorq_u32(row2,row3);
-  row2 = veorq_u32(vshrq_n_u32(row2,12),vshlq_n_u32(row2,20));
-
-  // buf2 = vld1q_u32(m9,m1,m14,m11);
-  vld1q_u32_rev(buf2, m9,m1,m14,m11);
-
-  row1 = vaddq_u32(vaddq_u32(row1,buf2),row2);
-  row4 = veorq_u32(row4,row1);
-  row4 = veorq_u32(vshrq_n_u32(row4,8),vshlq_n_u32(row4,24));
-  row3 = vaddq_u32(row3,row4);
-  row2 = veorq_u32(row2,row3);
-  row2 = veorq_u32(vshrq_n_u32(row2,7),vshlq_n_u32(row2,25));
-
-  row4 = vextq_u32(row4,row4,3);
-  row3 = vcombine_u32(vget_high_u32(row3),vget_low_u32(row3));
-  row2 = vextq_u32(row2,row2,1);
-
-  // buf3 = vld1q_u32(m2,m8,m15,m5);
-  vld1q_u32_rev(buf3, m2,m8,m15,m5);
-
-  row1 = vaddq_u32(vaddq_u32(row1,buf3),row2);
-  row4 = veorq_u32(row4,row1);
-  row4 = veorq_u32(vshrq_n_u32(row4,16),vshlq_n_u32(row4,16));
-  row3 = vaddq_u32(row3,row4);
-  row2 = veorq_u32(row2,row3);
-  row2 = veorq_u32(vshrq_n_u32(row2,12),vshlq_n_u32(row2,20));
-
-  // buf4 = vld1q_u32(m10,m6,m4,m0);
-  vld1q_u32_rev(buf4, m10,m6,m4,m0);
-
-  row1 = vaddq_u32(vaddq_u32(row1,buf4),row2);
-  row4 = veorq_u32(row4,row1);
-  row4 = veorq_u32(vshrq_n_u32(row4,8),vshlq_n_u32(row4,24));
-  row3 = vaddq_u32(row3,row4);
-  row2 = veorq_u32(row2,row3);
-  row2 = veorq_u32(vshrq_n_u32(row2,7),vshlq_n_u32(row2,25));
-
-  row4 = vextq_u32(row4,row4,1);
-  row3 = vcombine_u32(vget_high_u32(row3),vget_low_u32(row3));
-  row2 = vextq_u32(row2,row2,3);
-
-  // buf1 = vld1q_u32(m0,m11,m14,m6);
-  vld1q_u32_rev(buf1, m0,m11,m14,m6);
-
-  row1 = vaddq_u32(vaddq_u32(row1,buf1),row2);
-  row4 = veorq_u32(row4,row1);
-  row4 = veorq_u32(vshrq_n_u32(row4,16),vshlq_n_u32(row4,16));
-  row3 = vaddq_u32(row3,row4);
-  row2 = veorq_u32(row2,row3);
-  row2 = veorq_u32(vshrq_n_u32(row2,12),vshlq_n_u32(row2,20));
-
-  // buf2 = vld1q_u32(m8,m3,m9,m15);
-  vld1q_u32_rev(buf2, m8,m3,m9,m15);
-
-  row1 = vaddq_u32(vaddq_u32(row1,buf2),row2);
-  row4 = veorq_u32(row4,row1);
-  row4 = veorq_u32(vshrq_n_u32(row4,8),vshlq_n_u32(row4,24));
-  row3 = vaddq_u32(row3,row4);
-  row2 = veorq_u32(row2,row3);
-  row2 = veorq_u32(vshrq_n_u32(row2,7),vshlq_n_u32(row2,25));
-
-  row4 = vextq_u32(row4,row4,3);
-  row3 = vcombine_u32(vget_high_u32(row3),vget_low_u32(row3));
-  row2 = vextq_u32(row2,row2,1);
-
-  // buf3 = vld1q_u32(m10,m1,m13,m12);
-  vld1q_u32_rev(buf3, m10,m1,m13,m12);
-
-  row1 = vaddq_u32(vaddq_u32(row1,buf3),row2);
-  row4 = veorq_u32(row4,row1);
-  row4 = veorq_u32(vshrq_n_u32(row4,16),vshlq_n_u32(row4,16));
-  row3 = vaddq_u32(row3,row4);
-  row2 = veorq_u32(row2,row3);
-  row2 = veorq_u32(vshrq_n_u32(row2,12),vshlq_n_u32(row2,20));
-
-  // buf4 = vld1q_u32(m5,m4,m7,m2);
-  vld1q_u32_rev(buf4, m5,m4,m7,m2);
-
-  row1 = vaddq_u32(vaddq_u32(row1,buf4),row2);
-  row4 = veorq_u32(row4,row1);
-  row4 = veorq_u32(vshrq_n_u32(row4,8),vshlq_n_u32(row4,24));
-  row3 = vaddq_u32(row3,row4);
-  row2 = veorq_u32(row2,row3);
-  row2 = veorq_u32(vshrq_n_u32(row2,7),vshlq_n_u32(row2,25));
-
-  row4 = vextq_u32(row4,row4,1);
-  row3 = vcombine_u32(vget_high_u32(row3),vget_low_u32(row3));
-  row2 = vextq_u32(row2,row2,3);
-
-  // buf1 = vld1q_u32(m1,m7,m8,m10);
-  vld1q_u32_rev(buf1, m1,m7,m8,m10);
-
-  row1 = vaddq_u32(vaddq_u32(row1,buf1),row2);
-  row4 = veorq_u32(row4,row1);
-  row4 = veorq_u32(vshrq_n_u32(row4,16),vshlq_n_u32(row4,16));
-  row3 = vaddq_u32(row3,row4);
-  row2 = veorq_u32(row2,row3);
-  row2 = veorq_u32(vshrq_n_u32(row2,12),vshlq_n_u32(row2,20));
-
-  // buf2 = vld1q_u32(m5,m6,m4,m2);
-  vld1q_u32_rev(buf2, m5,m6,m4,m2);
-
-  row1 = vaddq_u32(vaddq_u32(row1,buf2),row2);
-  row4 = veorq_u32(row4,row1);
-  row4 = veorq_u32(vshrq_n_u32(row4,8),vshlq_n_u32(row4,24));
-  row3 = vaddq_u32(row3,row4);
-  row2 = veorq_u32(row2,row3);
-  row2 = veorq_u32(vshrq_n_u32(row2,7),vshlq_n_u32(row2,25));
-
-  row4 = vextq_u32(row4,row4,3);
-  row3 = vcombine_u32(vget_high_u32(row3),vget_low_u32(row3));
-  row2 = vextq_u32(row2,row2,1);
-
-  // buf3 = vld1q_u32(m13,m3,m9,m15);
-  vld1q_u32_rev(buf3, m13,m3,m9,m15);
-
-  row1 = vaddq_u32(vaddq_u32(row1,buf3),row2);
-  row4 = veorq_u32(row4,row1);
-  row4 = veorq_u32(vshrq_n_u32(row4,16),vshlq_n_u32(row4,16));
-  row3 = vaddq_u32(row3,row4);
-  row2 = veorq_u32(row2,row3);
-  row2 = veorq_u32(vshrq_n_u32(row2,12),vshlq_n_u32(row2,20));
-
-  // buf4 = vld1q_u32(m0,m12,m14,m11);
-  vld1q_u32_rev(buf4, m0,m12,m14,m11);
-
-  row1 = vaddq_u32(vaddq_u32(row1,buf4),row2);
-  row4 = veorq_u32(row4,row1);
-  row4 = veorq_u32(vshrq_n_u32(row4,8),vshlq_n_u32(row4,24));
-  row3 = vaddq_u32(row3,row4);
-  row2 = veorq_u32(row2,row3);
-  row2 = veorq_u32(vshrq_n_u32(row2,7),vshlq_n_u32(row2,25));
-
-  row4 = vextq_u32(row4,row4,1);
-  row3 = vcombine_u32(vget_high_u32(row3),vget_low_u32(row3));
-  row2 = vextq_u32(row2,row2,3);
-
-  vst1q_u32((uint32_t*)&state.h[0],veorq_u32(ff0,veorq_u32(row1,row3)));
-  vst1q_u32((uint32_t*)&state.h[4],veorq_u32(ff1,veorq_u32(row2,row4)));
+	#undef LOAD_MSG_0_1
+    #define LOAD_MSG_0_1(buf) \
+    do { uint32x2_t t0, t1; \
+    t0 = vzip_u32(vget_low_u32(m0), vget_high_u32(m0)).val[0]; \
+    t1 = vzip_u32(vget_low_u32(m1), vget_high_u32(m1)).val[0]; \
+    buf = vcombine_u32(t0, t1); } while(0)
+
+	#undef LOAD_MSG_0_2
+    #define LOAD_MSG_0_2(buf) \
+    do { uint32x2_t t0, t1; \
+    t0 = vzip_u32(vget_low_u32(m0), vget_high_u32(m0)).val[1]; \
+    t1 = vzip_u32(vget_low_u32(m1), vget_high_u32(m1)).val[1]; \
+    buf = vcombine_u32(t0, t1); } while(0)
+
+	#undef LOAD_MSG_0_3
+    #define LOAD_MSG_0_3(buf) \
+    do { uint32x2_t t0, t1; \
+    t0 = vzip_u32(vget_low_u32(m2), vget_high_u32(m2)).val[0]; \
+    t1 = vzip_u32(vget_low_u32(m3), vget_high_u32(m3)).val[0]; \
+    buf = vcombine_u32(t0, t1); } while(0)
+
+	#undef LOAD_MSG_0_4
+    #define LOAD_MSG_0_4(buf) \
+    do { uint32x2_t t0, t1; \
+    t0 = vzip_u32(vget_low_u32(m2), vget_high_u32(m2)).val[1]; \
+    t1 = vzip_u32(vget_low_u32(m3), vget_high_u32(m3)).val[1]; \
+    buf = vcombine_u32(t0, t1); } while(0)
+
+	#undef LOAD_MSG_1_1
+    #define LOAD_MSG_1_1(buf) \
+    do { uint32x2_t t0, t1; \
+    t0 = vzip_u32(vget_high_u32(m3), vget_low_u32(m1)).val[0]; \
+    t1 = vzip_u32(vget_low_u32(m2), vget_low_u32(m3)).val[1]; \
+    buf = vcombine_u32(t0, t1); } while(0)
+
+	#undef LOAD_MSG_1_2
+    #define LOAD_MSG_1_2(buf) \
+    do { uint32x2_t t0, t1; \
+    t0 = vzip_u32(vget_high_u32(m2), vget_low_u32(m2)).val[0]; \
+    t1 = vext_u32(vget_high_u32(m3), vget_high_u32(m1), 1); \
+    buf = vcombine_u32(t0, t1); } while(0)
+
+	#undef LOAD_MSG_1_3
+    #define LOAD_MSG_1_3(buf) \
+    do { uint32x2_t t0, t1; \
+    t0 = vext_u32(vget_low_u32(m0), vget_low_u32(m0), 1); \
+    t1 = vzip_u32(vget_high_u32(m2), vget_low_u32(m1)).val[1]; \
+    buf = vcombine_u32(t0, t1); } while(0)
+
+	#undef LOAD_MSG_1_4
+    #define LOAD_MSG_1_4(buf) \
+    do { uint32x2_t t0, t1; \
+    t0 = vzip_u32(vget_low_u32(m3), vget_high_u32(m0)).val[0]; \
+    t1 = vzip_u32(vget_high_u32(m1), vget_high_u32(m0)).val[1]; \
+    buf = vcombine_u32(t0, t1); } while(0)
+
+	#undef LOAD_MSG_2_1
+    #define LOAD_MSG_2_1(buf) \
+    do { uint32x2_t t0, t1; \
+    t0 = vext_u32(vget_high_u32(m2), vget_low_u32(m3), 1); \
+    t1 = vzip_u32(vget_low_u32(m1), vget_high_u32(m3)).val[1]; \
+    buf = vcombine_u32(t0, t1); } while(0)
+
+	#undef LOAD_MSG_2_2
+    #define LOAD_MSG_2_2(buf) \
+    do { uint32x2_t t0, t1; \
+    t0 = vzip_u32(vget_low_u32(m2), vget_low_u32(m0)).val[0]; \
+    t1 = vbsl_u32(vcreate_u32(0xFFFFFFFF), vget_high_u32(m0), vget_low_u32(m3)); \
+    buf = vcombine_u32(t0, t1); } while(0)
+
+	#undef LOAD_MSG_2_3
+    #define LOAD_MSG_2_3(buf) \
+    do { uint32x2_t t0, t1; \
+    t0 = vbsl_u32(vcreate_u32(0xFFFFFFFF), vget_high_u32(m2), vget_high_u32(m0)); \
+    t1 = vzip_u32(vget_high_u32(m1), vget_low_u32(m2)).val[1]; \
+    buf = vcombine_u32(t0, t1); } while(0)
+
+	#undef LOAD_MSG_2_4
+    #define LOAD_MSG_2_4(buf) \
+    do { uint32x2_t t0, t1; \
+    t0 = vzip_u32(vget_high_u32(m3), vget_high_u32(m1)).val[0]; \
+    t1 = vext_u32(vget_low_u32(m0), vget_low_u32(m1), 1); \
+    buf = vcombine_u32(t0, t1); } while(0)
+
+	#undef LOAD_MSG_3_1
+    #define LOAD_MSG_3_1(buf) \
+    do { uint32x2_t t0, t1; \
+    t0 = vzip_u32(vget_high_u32(m1), vget_high_u32(m0)).val[1]; \
+    t1 = vzip_u32(vget_low_u32(m3), vget_high_u32(m2)).val[1]; \
+    buf = vcombine_u32(t0, t1); } while(0)
+
+	#undef LOAD_MSG_3_2
+    #define LOAD_MSG_3_2(buf) \
+    do { uint32x2_t t0, t1; \
+    t0 = vzip_u32(vget_low_u32(m2), vget_low_u32(m0)).val[1]; \
+    t1 = vzip_u32(vget_low_u32(m3), vget_high_u32(m3)).val[0]; \
+    buf = vcombine_u32(t0, t1); } while(0)
+
+	#undef LOAD_MSG_3_3
+    #define LOAD_MSG_3_3(buf) \
+    do { uint32x2_t t0, t1; \
+    t0 = vbsl_u32(vcreate_u32(0xFFFFFFFF), vget_high_u32(m0), vget_low_u32(m1)); \
+    t1 = vbsl_u32(vcreate_u32(0xFFFFFFFF), vget_low_u32(m1), vget_high_u32(m3)); \
+    buf = vcombine_u32(t0, t1); } while(0)
+
+	#undef LOAD_MSG_3_4
+    #define LOAD_MSG_3_4(buf) \
+    do { uint32x2_t t0, t1; \
+    t0 = vzip_u32(vget_high_u32(m1), vget_high_u32(m2)).val[0]; \
+    t1 = vzip_u32(vget_low_u32(m0), vget_low_u32(m2)).val[0]; \
+    buf = vcombine_u32(t0, t1); } while(0)
+
+	#undef LOAD_MSG_4_1
+    #define LOAD_MSG_4_1(buf) \
+    do { uint32x2_t t0, t1; \
+    t0 = vzip_u32(vget_low_u32(m2), vget_low_u32(m1)).val[1]; \
+    t1 = vzip_u32((vget_high_u32(m0)), vget_high_u32(m2)).val[0]; \
+    buf = vcombine_u32(t0, t1); } while(0)
+
+	#undef LOAD_MSG_4_2
+    #define LOAD_MSG_4_2(buf) \
+    do { uint32x2_t t0, t1; \
+    t0 = vbsl_u32(vcreate_u32(0xFFFFFFFF), vget_low_u32(m0), vget_high_u32(m1)); \
+    t1 = vbsl_u32(vcreate_u32(0xFFFFFFFF), vget_low_u32(m1), vget_high_u32(m3)); \
+    buf = vcombine_u32(t0, t1); } while(0)
+
+	#undef LOAD_MSG_4_3
+    #define LOAD_MSG_4_3(buf) \
+    do { uint32x2_t t0, t1; \
+    t0 = vbsl_u32(vcreate_u32(0xFFFFFFFF), vget_high_u32(m3), vget_high_u32(m2)); \
+    t1 = vbsl_u32(vcreate_u32(0xFFFFFFFF), vget_high_u32(m1), vget_high_u32(m0)); \
+    buf = vcombine_u32(t0, t1); } while(0)
+
+	#undef LOAD_MSG_4_4
+    #define LOAD_MSG_4_4(buf) \
+    do { uint32x2_t t0, t1; \
+    t0 = vext_u32(vget_low_u32(m0), vget_low_u32(m3), 1); \
+    t1 = vbsl_u32(vcreate_u32(0xFFFFFFFF), vget_low_u32(m2), vget_low_u32(m3)); \
+    buf = vcombine_u32(t0, t1); } while(0)
+
+	#undef LOAD_MSG_5_1
+    #define LOAD_MSG_5_1(buf) \
+    do { uint32x2_t t0, t1; \
+    t0 = vzip_u32((vget_high_u32(m0)), vget_high_u32(m1)).val[0]; \
+    t1 = vzip_u32(vget_low_u32(m0), vget_low_u32(m2)).val[0]; \
+    buf = vcombine_u32(t0, t1); } while(0)
+
+	#undef LOAD_MSG_5_2
+    #define LOAD_MSG_5_2(buf) \
+    do { uint32x2_t t0, t1; \
+    t0 = vzip_u32(vget_low_u32(m3), vget_high_u32(m2)).val[0]; \
+    t1 = vzip_u32(vget_high_u32(m2), vget_high_u32(m0)).val[1]; \
+    buf = vcombine_u32(t0, t1); } while(0)
+
+	#undef LOAD_MSG_5_3
+    #define LOAD_MSG_5_3(buf) \
+    do { uint32x2_t t0, t1; \
+    t0 = vbsl_u32(vcreate_u32(0xFFFFFFFF), vget_low_u32(m1), vget_high_u32(m1)); \
+    t1 = vzip_u32(vget_high_u32(m3), vget_low_u32(m0)).val[1]; \
+    buf = vcombine_u32(t0, t1); } while(0)
+
+	#undef LOAD_MSG_5_4
+    #define LOAD_MSG_5_4(buf) \
+    do { uint32x2_t t0, t1; \
+    t0 = vzip_u32(vget_low_u32(m3), vget_low_u32(m1)).val[1]; \
+    t1 = vbsl_u32(vcreate_u32(0xFFFFFFFF), vget_high_u32(m3), vget_low_u32(m2)); \
+    buf = vcombine_u32(t0, t1); } while(0)
+
+	#undef LOAD_MSG_6_1
+    #define LOAD_MSG_6_1(buf) \
+    do { uint32x2_t t0, t1; \
+    t0 = vbsl_u32(vcreate_u32(0xFFFFFFFF), vget_low_u32(m3), vget_low_u32(m0)); \
+    t1 = vzip_u32(vget_high_u32(m3), vget_low_u32(m1)).val[0]; \
+    buf = vcombine_u32(t0, t1); } while(0)
+
+	#undef LOAD_MSG_6_2
+    #define LOAD_MSG_6_2(buf) \
+    do { uint32x2_t t0, t1; \
+    t0 = vzip_u32(vget_low_u32(m1), vget_high_u32(m3)).val[1]; \
+    t1 = vext_u32(vget_low_u32(m3), vget_high_u32(m2), 1); \
+    buf = vcombine_u32(t0, t1); } while(0)
+
+	#undef LOAD_MSG_6_3
+    #define LOAD_MSG_6_3(buf) \
+    do { uint32x2_t t0, t1; \
+    t0 = vzip_u32(vget_low_u32(m0), vget_high_u32(m1)).val[0]; \
+    t1 = vext_u32(vget_low_u32(m2), vget_low_u32(m2), 1); \
+    buf = vcombine_u32(t0, t1); } while(0)
+
+	#undef LOAD_MSG_6_4
+    #define LOAD_MSG_6_4(buf) \
+    do { uint32x2_t t0, t1; \
+    t0 = vzip_u32(vget_high_u32(m1), vget_high_u32(m0)).val[1]; \
+    t1 = vbsl_u32(vcreate_u32(0xFFFFFFFF), vget_high_u32(m0), vget_high_u32(m2)); \
+    buf = vcombine_u32(t0, t1); } while(0)
+
+	#undef LOAD_MSG_7_1
+    #define LOAD_MSG_7_1(buf) \
+    do { uint32x2_t t0, t1; \
+    t0 = vzip_u32(vget_low_u32(m3), vget_high_u32(m1)).val[1]; \
+    t1 = vbsl_u32(vcreate_u32(0xFFFFFFFF), vget_low_u32(m3), vget_high_u32(m0)); \
+    buf = vcombine_u32(t0, t1); } while(0)
+
+	#undef LOAD_MSG_7_2
+    #define LOAD_MSG_7_2(buf) \
+    do { uint32x2_t t0, t1; \
+    t0 = vext_u32(vget_high_u32(m2), vget_high_u32(m3), 1); \
+    t1 = vzip_u32(vget_low_u32(m0), vget_low_u32(m2)).val[1]; \
+    buf = vcombine_u32(t0, t1); } while(0)
+
+	#undef LOAD_MSG_7_3
+    #define LOAD_MSG_7_3(buf) \
+    do { uint32x2_t t0, t1; \
+    t0 = vzip_u32(vget_low_u32(m1), vget_high_u32(m3)).val[1]; \
+    t1 = vzip_u32(vget_low_u32(m2), vget_high_u32(m0)).val[0]; \
+    buf = vcombine_u32(t0, t1); } while(0)
+
+	#undef LOAD_MSG_7_4
+    #define LOAD_MSG_7_4(buf) \
+    do { uint32x2_t t0, t1; \
+    t0 = vzip_u32(vget_low_u32(m0), vget_low_u32(m1)).val[0]; \
+    t1 = vzip_u32(vget_high_u32(m1), vget_high_u32(m2)).val[0]; \
+    buf = vcombine_u32(t0, t1); } while(0)
+
+	#undef LOAD_MSG_8_1
+    #define LOAD_MSG_8_1(buf) \
+    do { uint32x2_t t0, t1; \
+    t0 = vzip_u32(vget_high_u32(m1), vget_high_u32(m3)).val[0]; \
+    t1 = vext_u32(vget_high_u32(m2), vget_low_u32(m0), 1); \
+    buf = vcombine_u32(t0, t1); } while(0)
+
+	#undef LOAD_MSG_8_2
+    #define LOAD_MSG_8_2(buf) \
+    do { uint32x2_t t0, t1; \
+    t0 = vzip_u32(vget_high_u32(m3), vget_low_u32(m2)).val[1]; \
+    t1 = vext_u32(vget_high_u32(m0), vget_low_u32(m2), 1); \
+    buf = vcombine_u32(t0, t1); } while(0)
+		
+	#undef LOAD_MSG_8_3
+    #define LOAD_MSG_8_3(buf) \
+    do { uint32x2_t t0, t1; \
+    t0 = vbsl_u32(vcreate_u32(0xFFFFFFFF), vget_low_u32(m3), vget_low_u32(m3)); \
+    t1 = vext_u32(vget_low_u32(m0), vget_high_u32(m2), 1); \
+    buf = vcombine_u32(t0, t1); } while(0)
+
+	#undef LOAD_MSG_8_4
+    #define LOAD_MSG_8_4(buf) \
+    do { uint32x2_t t0, t1; \
+    t0 = vbsl_u32(vcreate_u32(0xFFFFFFFF), vget_high_u32(m0), vget_high_u32(m1)); \
+    t1 = vbsl_u32(vcreate_u32(0xFFFFFFFF), vget_low_u32(m1), vget_low_u32(m1)); \
+    buf = vcombine_u32(t0, t1); } while(0)
+
+	#undef LOAD_MSG_9_1
+    #define LOAD_MSG_9_1(buf) \
+    do { uint32x2_t t0, t1; \
+    t0 = vzip_u32(vget_high_u32(m2), vget_low_u32(m2)).val[0]; \
+    t1 = vzip_u32(vget_high_u32(m1), vget_low_u32(m0)).val[1]; \
+    buf = vcombine_u32(t0, t1); } while(0)
+
+	#undef LOAD_MSG_9_2
+    #define LOAD_MSG_9_2(buf) \
+    do { uint32x2_t t0, t1; \
+    t0 = vzip_u32((vget_high_u32(m0)), vget_low_u32(m1)).val[0]; \
+    t1 = vbsl_u32(vcreate_u32(0xFFFFFFFF), vget_high_u32(m1), vget_low_u32(m1)); \
+    buf = vcombine_u32(t0, t1); } while(0)
+
+	#undef LOAD_MSG_9_3
+    #define LOAD_MSG_9_3(buf) \
+    do { uint32x2_t t0, t1; \
+    t0 = vzip_u32(vget_high_u32(m3), vget_low_u32(m2)).val[1]; \
+    t1 = vzip_u32((vget_high_u32(m0)), vget_low_u32(m3)).val[1]; \
+    buf = vcombine_u32(t0, t1); } while(0)
+
+	#undef LOAD_MSG_9_4
+    #define LOAD_MSG_9_4(buf) \
+    do { uint32x2_t t0, t1; \
+    t0 = vext_u32(vget_high_u32(m2), vget_high_u32(m3), 1); \
+    t1 = vzip_u32(vget_low_u32(m3), vget_low_u32(m0)).val[0]; \
+    buf = vcombine_u32(t0, t1); } while(0)
+							  
+	#define vrorq_n_u32_16(x) vreinterpretq_u32_u16(vrev32q_u16(vreinterpretq_u16_u32(x)))
+
+	#define vrorq_n_u32_8(x) vsriq_n_u32(vshlq_n_u32((x), 24), (x), 8)
+
+	#define vrorq_n_u32(x, c) vsriq_n_u32(vshlq_n_u32((x), 32-(c)), (x), (c))
+		
+	#undef G1
+	#define G1(row1,row2,row3,row4,buf) \
+	do { \
+	  row1 = vaddq_u32(vaddq_u32(row1, buf), row2); row4 = veorq_u32(row4, row1); \
+	  row4 = vrorq_n_u32_16(row4); row3 = vaddq_u32(row3, row4); \
+	  row2 = veorq_u32(row2, row3); row2 = vrorq_n_u32(row2, 12); \
+	} while(0)
+
+	#undef G2
+	#define G2(row1,row2,row3,row4,buf) \
+	do { \
+	  row1 = vaddq_u32(vaddq_u32(row1, buf), row2); row4 = veorq_u32(row4, row1); \
+	  row4 = vrorq_n_u32_8(row4); row3 = vaddq_u32(row3, row4); \
+	  row2 = veorq_u32(row2, row3); row2 = vrorq_n_u32(row2, 7); \
+	} while(0)
+
+	#undef DIAGONALIZE
+	#define DIAGONALIZE(row1,row2,row3,row4) \
+	do { \
+	  row4 = vextq_u32(row4, row4, 3); row3 = vextq_u32(row3, row3, 2); row2 = vextq_u32(row2, row2, 1); \
+	} while(0)
+
+	#undef UNDIAGONALIZE
+	#define UNDIAGONALIZE(row1,row2,row3,row4) \
+	do { \
+	  row4 = vextq_u32(row4, row4, 1); \
+	  row3 = vextq_u32(row3, row3, 2); \
+	  row2 = vextq_u32(row2, row2, 3); \
+	} while(0)
+
+	#undef ROUND
+	#define ROUND(r)  \
+	do { \
+	  uint32x4_t buf1, buf2, buf3, buf4; \
+	  LOAD_MSG_ ##r ##_1(buf1); \
+	  G1(row1,row2,row3,row4,buf1); \
+	  LOAD_MSG_ ##r ##_2(buf2); \
+	  G2(row1,row2,row3,row4,buf2); \
+	  DIAGONALIZE(row1,row2,row3,row4); \
+	  LOAD_MSG_ ##r ##_3(buf3); \
+	  G1(row1,row2,row3,row4,buf3); \
+	  LOAD_MSG_ ##r ##_4(buf4); \
+	  G2(row1,row2,row3,row4,buf4); \
+	  UNDIAGONALIZE(row1,row2,row3,row4); \
+	} while(0)
+
+    CRYPTOPP_ASSERT(IsAlignedOn(&state.h[0],GetAlignmentOf<uint32x4_t>()));
+    CRYPTOPP_ASSERT(IsAlignedOn(&state.t[0],GetAlignmentOf<uint32x4_t>()));
+    CRYPTOPP_ASSERT(IsAlignedOn(&state.f[0],GetAlignmentOf<uint32x4_t>()));
+
+    const uint32x4_t m0 = vreinterpretq_u32_u8(vld1q_u8((input + 00)));
+    const uint32x4_t m1 = vreinterpretq_u32_u8(vld1q_u8((input + 16)));
+    const uint32x4_t m2 = vreinterpretq_u32_u8(vld1q_u8((input + 32)));
+    const uint32x4_t m3 = vreinterpretq_u32_u8(vld1q_u8((input + 48)));
+
+    uint32x4_t row1, row2, row3, row4;
+
+    const uint32x4_t f0 = row1 = vld1q_u32(&state.h[0]);
+    const uint32x4_t f1 = row2 = vld1q_u32(&state.h[4]);
+    row3 = vld1q_u32(&BLAKE2S_IV(0));
+    row4 = veorq_u32(vld1q_u32(&BLAKE2S_IV(4)), vld1q_u32(&state.t[0]));
+
+    ROUND(0);
+    ROUND(1);
+    ROUND(2);
+    ROUND(3);
+    ROUND(4);
+    ROUND(5);
+    ROUND(6);
+    ROUND(7);
+    ROUND(8);
+    ROUND(9);
+
+    vst1q_u32(&state.h[0], veorq_u32(f0, veorq_u32(row1, row3)));
+    vst1q_u32(&state.h[4], veorq_u32(f1, veorq_u32(row2, row4)));
 }
 
 static void BLAKE2_NEON_Compress64(const byte* input, BLAKE2_State<word64, true>& state)
 {
-  //CRYPTOPP_ASSERT(IsAlignedOn(input,GetAlignmentOf<uint8_t*>()));
-  CRYPTOPP_ASSERT(IsAlignedOn(&state.h[0],GetAlignmentOf<uint64x2_t>()));
-  CRYPTOPP_ASSERT(IsAlignedOn(&state.h[4],GetAlignmentOf<uint64x2_t>()));
-  CRYPTOPP_ASSERT(IsAlignedOn(&state.t[0],GetAlignmentOf<uint64x2_t>()));
+    #undef LOAD_MSG_0_1
+    #define LOAD_MSG_0_1(b0, b1) \
+    do { b0 = vcombine_u64(vget_low_u64(m0), vget_low_u64(m1)); b1 = vcombine_u64(vget_low_u64(m2), vget_low_u64(m3)); } while(0)
 
-  uint64x2_t m0m1,m2m3,m4m5,m6m7,m8m9,m10m11,m12m13,m14m15;
+    #undef LOAD_MSG_0_2
+    #define LOAD_MSG_0_2(b0, b1) \
+    do { b0 = vcombine_u64(vget_high_u64(m0), vget_high_u64(m1)); b1 = vcombine_u64(vget_high_u64(m2), vget_high_u64(m3)); } while(0)
 
-    m0m1 = vreinterpretq_u64_u8(vld1q_u8(input+  0));
-    m2m3 = vreinterpretq_u64_u8(vld1q_u8(input+ 16));
-    m4m5 = vreinterpretq_u64_u8(vld1q_u8(input+ 32));
-    m6m7 = vreinterpretq_u64_u8(vld1q_u8(input+ 48));
-    m8m9 = vreinterpretq_u64_u8(vld1q_u8(input+ 64));
-  m10m11 = vreinterpretq_u64_u8(vld1q_u8(input+ 80));
-  m12m13 = vreinterpretq_u64_u8(vld1q_u8(input+ 96));
-  m14m15 = vreinterpretq_u64_u8(vld1q_u8(input+112));
+    #undef LOAD_MSG_0_3
+    #define LOAD_MSG_0_3(b0, b1) \
+    do { b0 = vcombine_u64(vget_low_u64(m4), vget_low_u64(m5)); b1 = vcombine_u64(vget_low_u64(m6), vget_low_u64(m7)); } while(0)
 
-  uint64x2_t row1l, row1h, row2l, row2h;
-  uint64x2_t row3l, row3h, row4l, row4h;
-  uint64x2_t b0 = {0,0}, b1 = {0,0}, t0, t1;
+    #undef LOAD_MSG_0_4
+    #define LOAD_MSG_0_4(b0, b1) \
+    do { b0 = vcombine_u64(vget_high_u64(m4), vget_high_u64(m5)); b1 = vcombine_u64(vget_high_u64(m6), vget_high_u64(m7)); } while(0)
 
-  row1l = vld1q_u64((const uint64_t *)&state.h[0]);
-  row1h = vld1q_u64((const uint64_t *)&state.h[2]);
-  row2l = vld1q_u64((const uint64_t *)&state.h[4]);
-  row2h = vld1q_u64((const uint64_t *)&state.h[6]);
-  row3l = vld1q_u64((const uint64_t *)&BLAKE2B_IV(0));
-  row3h = vld1q_u64((const uint64_t *)&BLAKE2B_IV(2));
-  row4l = veorq_u64(vld1q_u64((const uint64_t *)&BLAKE2B_IV(4)), vld1q_u64((const uint64_t*)&state.t[0]));
-  row4h = veorq_u64(vld1q_u64((const uint64_t *)&BLAKE2B_IV(6)), vld1q_u64((const uint64_t*)&state.f[0]));
+    #undef LOAD_MSG_1_1
+    #define LOAD_MSG_1_1(b0, b1) \
+    do { b0 = vcombine_u64(vget_low_u64(m7), vget_low_u64(m2)); b1 = vcombine_u64(vget_high_u64(m4), vget_high_u64(m6)); } while(0)
 
-  b0 = vsetq_lane_u64(vgetq_lane_u64(m0m1,LANE_L64),b0,LANE_L64);
-  b0 = vsetq_lane_u64(vgetq_lane_u64(m2m3,LANE_L64),b0,LANE_H64);
-  b1 = vsetq_lane_u64(vgetq_lane_u64(m4m5,LANE_L64),b1,LANE_L64);
-  b1 = vsetq_lane_u64(vgetq_lane_u64(m6m7,LANE_L64),b1,LANE_H64);
-  row1l = vaddq_u64(vaddq_u64(row1l, b0), row2l);
-  row1h = vaddq_u64(vaddq_u64(row1h, b1), row2h);
-  row4l = veorq_u64(row4l, row1l);
-  row4h = veorq_u64(row4h, row1h);
-  row4l = veorq_u64(vshrq_n_u64(row4l,32),vshlq_n_u64(row4l,32));
-  row4h = veorq_u64(vshrq_n_u64(row4h,32),vshlq_n_u64(row4h,32));
-  row3l = vaddq_u64(row3l, row4l);
-  row3h = vaddq_u64(row3h, row4h);
-  row2l = veorq_u64(row2l, row3l);
-  row2h = veorq_u64(row2h, row3h);
-  row2l = veorq_u64(vshrq_n_u64(row2l,24),vshlq_n_u64(row2l,40));
-  row2h = veorq_u64(vshrq_n_u64(row2h,24),vshlq_n_u64(row2h,40));
+    #undef LOAD_MSG_1_2
+    #define LOAD_MSG_1_2(b0, b1) \
+    do { b0 = vcombine_u64(vget_low_u64(m5), vget_low_u64(m4)); b1 = vextq_u64(m7, m3, 1); } while(0)
 
-  b0 = vsetq_lane_u64(vgetq_lane_u64(m0m1,LANE_H64),b0,LANE_L64);
-  b0 = vsetq_lane_u64(vgetq_lane_u64(m2m3,LANE_H64),b0,LANE_H64);
-  b1 = vsetq_lane_u64(vgetq_lane_u64(m4m5,LANE_H64),b1,LANE_L64);
-  b1 = vsetq_lane_u64(vgetq_lane_u64(m6m7,LANE_H64),b1,LANE_H64);
-  row1l = vaddq_u64(vaddq_u64(row1l, b0), row2l);
-  row1h = vaddq_u64(vaddq_u64(row1h, b1), row2h);
-  row4l = veorq_u64(row4l, row1l);
-  row4h = veorq_u64(row4h, row1h);
-  row4l = veorq_u64(vshrq_n_u64(row4l,16),vshlq_n_u64(row4l,48));
-  row4h = veorq_u64(vshrq_n_u64(row4h,16),vshlq_n_u64(row4h,48));
-  row3l = vaddq_u64(row3l, row4l);
-  row3h = vaddq_u64(row3h, row4h);
-  row2l = veorq_u64(row2l, row3l);
-  row2h = veorq_u64(row2h, row3h);
-  row2l = veorq_u64(vshrq_n_u64(row2l,63),vshlq_n_u64(row2l,1));
-  row2h = veorq_u64(vshrq_n_u64(row2h,63),vshlq_n_u64(row2h,1));
+    #undef LOAD_MSG_1_3
+    #define LOAD_MSG_1_3(b0, b1) \
+    do { b0 = vextq_u64(m0, m0, 1); b1 = vcombine_u64(vget_high_u64(m5), vget_high_u64(m2)); } while(0)
 
-  t0 = row4l, t1 = row2l, row4l = row3l, row3l = row3h, row3h = row4l;
-  row4l = vsetq_lane_u64(vgetq_lane_u64(row4h,LANE_H64),row4l,LANE_L64);
-  row4l = vsetq_lane_u64(vgetq_lane_u64(t0,LANE_L64),row4l,LANE_H64);
-  row4h = vsetq_lane_u64(vgetq_lane_u64(row4h,LANE_L64),row4h,LANE_H64);
-  row4h = vsetq_lane_u64(vgetq_lane_u64(t0,LANE_H64),row4h,LANE_L64);
-  row2l = vsetq_lane_u64(vgetq_lane_u64(row2l,LANE_H64),row2l,LANE_L64);
-  row2l = vsetq_lane_u64(vgetq_lane_u64(row2h,LANE_L64),row2l,LANE_H64);
-  row2h = vsetq_lane_u64(vgetq_lane_u64(row2h,LANE_H64),row2h,LANE_L64);
-  row2h = vsetq_lane_u64(vgetq_lane_u64(t1,LANE_L64),row2h,LANE_H64);
+    #undef LOAD_MSG_1_4
+    #define LOAD_MSG_1_4(b0, b1) \
+    do { b0 = vcombine_u64(vget_low_u64(m6), vget_low_u64(m1)); b1 = vcombine_u64(vget_high_u64(m3), vget_high_u64(m1)); } while(0)
 
-  b0 = vsetq_lane_u64(vgetq_lane_u64(m8m9,LANE_L64),b0,LANE_L64);
-  b0 = vsetq_lane_u64(vgetq_lane_u64(m10m11,LANE_L64),b0,LANE_H64);
-  b1 = vsetq_lane_u64(vgetq_lane_u64(m12m13,LANE_L64),b1,LANE_L64);
-  b1 = vsetq_lane_u64(vgetq_lane_u64(m14m15,LANE_L64),b1,LANE_H64);
-  row1l = vaddq_u64(vaddq_u64(row1l, b0), row2l);
-  row1h = vaddq_u64(vaddq_u64(row1h, b1), row2h);
-  row4l = veorq_u64(row4l, row1l);
-  row4h = veorq_u64(row4h, row1h);
-  row4l = veorq_u64(vshrq_n_u64(row4l,32),vshlq_n_u64(row4l,32));
-  row4h = veorq_u64(vshrq_n_u64(row4h,32),vshlq_n_u64(row4h,32));
-  row3l = vaddq_u64(row3l, row4l);
-  row3h = vaddq_u64(row3h, row4h);
-  row2l = veorq_u64(row2l, row3l);
-  row2h = veorq_u64(row2h, row3h);
-  row2l = veorq_u64(vshrq_n_u64(row2l,24),vshlq_n_u64(row2l,40));
-  row2h = veorq_u64(vshrq_n_u64(row2h,24),vshlq_n_u64(row2h,40));
+    #undef LOAD_MSG_2_1
+    #define LOAD_MSG_2_1(b0, b1) \
+    do { b0 = vextq_u64(m5, m6, 1); b1 = vcombine_u64(vget_high_u64(m2), vget_high_u64(m7)); } while(0)
 
-  b0 = vsetq_lane_u64(vgetq_lane_u64(m8m9,LANE_H64),b0,LANE_L64);
-  b0 = vsetq_lane_u64(vgetq_lane_u64(m10m11,LANE_H64),b0,LANE_H64);
-  b1 = vsetq_lane_u64(vgetq_lane_u64(m12m13,LANE_H64),b1,LANE_L64);
-  b1 = vsetq_lane_u64(vgetq_lane_u64(m14m15,LANE_H64),b1,LANE_H64);
-  row1l = vaddq_u64(vaddq_u64(row1l, b0), row2l);
-  row1h = vaddq_u64(vaddq_u64(row1h, b1), row2h);
-  row4l = veorq_u64(row4l, row1l);
-  row4h = veorq_u64(row4h, row1h);
-  row4l = veorq_u64(vshrq_n_u64(row4l,16),vshlq_n_u64(row4l,48));
-  row4h = veorq_u64(vshrq_n_u64(row4h,16),vshlq_n_u64(row4h,48));
-  row3l = vaddq_u64(row3l, row4l);
-  row3h = vaddq_u64(row3h, row4h);
-  row2l = veorq_u64(row2l, row3l);
-  row2h = veorq_u64(row2h, row3h);
-  row2l = veorq_u64(vshrq_n_u64(row2l,63),vshlq_n_u64(row2l,1));
-  row2h = veorq_u64(vshrq_n_u64(row2h,63),vshlq_n_u64(row2h,1));
+    #undef LOAD_MSG_2_2
+    #define LOAD_MSG_2_2(b0, b1) \
+    do { b0 = vcombine_u64(vget_low_u64(m4), vget_low_u64(m0)); b1 = vcombine_u64(vget_low_u64(m1), vget_high_u64(m6)); } while(0)
 
-  t0 = row3l, row3l = row3h, row3h = t0, t0 = row2l, t1 = row4l;
-  row2l = vsetq_lane_u64(vgetq_lane_u64(row2l,LANE_L64),row2l,LANE_H64);
-  row2l = vsetq_lane_u64(vgetq_lane_u64(row2h,LANE_H64),row2l,LANE_L64);
-  row2h = vsetq_lane_u64(vgetq_lane_u64(row2h,LANE_L64),row2h,LANE_H64);
-  row2h = vsetq_lane_u64(vgetq_lane_u64(t0,LANE_H64),row2h,LANE_L64);
-  row4l = vsetq_lane_u64(vgetq_lane_u64(row4l,LANE_H64),row4l,LANE_L64);
-  row4l = vsetq_lane_u64(vgetq_lane_u64(row4h,LANE_L64),row4l,LANE_H64);
-  row4h = vsetq_lane_u64(vgetq_lane_u64(row4h,LANE_H64),row4h,LANE_L64);
-  row4h = vsetq_lane_u64(vgetq_lane_u64(t1,LANE_L64),row4h,LANE_H64);
+    #undef LOAD_MSG_2_3
+    #define LOAD_MSG_2_3(b0, b1) \
+    do { b0 = vcombine_u64(vget_low_u64(m5), vget_high_u64(m1)); b1 = vcombine_u64(vget_high_u64(m3), vget_high_u64(m4)); } while(0)
 
-  b0 = vsetq_lane_u64(vgetq_lane_u64(m14m15,LANE_L64),b0,LANE_L64);
-  b0 = vsetq_lane_u64(vgetq_lane_u64(m4m5,LANE_L64),b0,LANE_H64);
-  b1 = vsetq_lane_u64(vgetq_lane_u64(m8m9,LANE_H64),b1,LANE_L64);
-  b1 = vsetq_lane_u64(vgetq_lane_u64(m12m13,LANE_H64),b1,LANE_H64);
-  row1l = vaddq_u64(vaddq_u64(row1l, b0), row2l);
-  row1h = vaddq_u64(vaddq_u64(row1h, b1), row2h);
-  row4l = veorq_u64(row4l, row1l);
-  row4h = veorq_u64(row4h, row1h);
-  row4l = veorq_u64(vshrq_n_u64(row4l,32),vshlq_n_u64(row4l,32));
-  row4h = veorq_u64(vshrq_n_u64(row4h,32),vshlq_n_u64(row4h,32));
-  row3l = vaddq_u64(row3l, row4l);
-  row3h = vaddq_u64(row3h, row4h);
-  row2l = veorq_u64(row2l, row3l);
-  row2h = veorq_u64(row2h, row3h);
-  row2l = veorq_u64(vshrq_n_u64(row2l,24),vshlq_n_u64(row2l,40));
-  row2h = veorq_u64(vshrq_n_u64(row2h,24),vshlq_n_u64(row2h,40));
+    #undef LOAD_MSG_2_4
+    #define LOAD_MSG_2_4(b0, b1) \
+    do { b0 = vcombine_u64(vget_low_u64(m7), vget_low_u64(m3)); b1 = vextq_u64(m0, m2, 1); } while(0)
 
-  b0 = vsetq_lane_u64(vgetq_lane_u64(m10m11,LANE_L64),b0,LANE_L64);
-  b0 = vsetq_lane_u64(vgetq_lane_u64(m8m9,LANE_L64),b0,LANE_H64);
-  b1 = vsetq_lane_u64(vgetq_lane_u64(m14m15,LANE_H64),b1,LANE_L64);
-  b1 = vsetq_lane_u64(vgetq_lane_u64(m6m7,LANE_L64),b1,LANE_H64);
-  row1l = vaddq_u64(vaddq_u64(row1l, b0), row2l);
-  row1h = vaddq_u64(vaddq_u64(row1h, b1), row2h);
-  row4l = veorq_u64(row4l, row1l);
-  row4h = veorq_u64(row4h, row1h);
-  row4l = veorq_u64(vshrq_n_u64(row4l,16),vshlq_n_u64(row4l,48));
-  row4h = veorq_u64(vshrq_n_u64(row4h,16),vshlq_n_u64(row4h,48));
-  row3l = vaddq_u64(row3l, row4l);
-  row3h = vaddq_u64(row3h, row4h);
-  row2l = veorq_u64(row2l, row3l);
-  row2h = veorq_u64(row2h, row3h);
-  row2l = veorq_u64(vshrq_n_u64(row2l,63),vshlq_n_u64(row2l,1));
-  row2h = veorq_u64(vshrq_n_u64(row2h,63),vshlq_n_u64(row2h,1));
+    #undef LOAD_MSG_3_1
+    #define LOAD_MSG_3_1(b0, b1) \
+    do { b0 = vcombine_u64(vget_high_u64(m3), vget_high_u64(m1)); b1 = vcombine_u64(vget_high_u64(m6), vget_high_u64(m5)); } while(0)
 
-  t0 = row4l, t1 = row2l, row4l = row3l, row3l = row3h, row3h = row4l;
-  row4l = vsetq_lane_u64(vgetq_lane_u64(row4h,LANE_H64),row4l,LANE_L64);
-  row4l = vsetq_lane_u64(vgetq_lane_u64(t0,LANE_L64),row4l,LANE_H64);
-  row4h = vsetq_lane_u64(vgetq_lane_u64(row4h,LANE_L64),row4h,LANE_H64);
-  row4h = vsetq_lane_u64(vgetq_lane_u64(t0,LANE_H64),row4h,LANE_L64);
-  row2l = vsetq_lane_u64(vgetq_lane_u64(row2l,LANE_H64),row2l,LANE_L64);
-  row2l = vsetq_lane_u64(vgetq_lane_u64(row2h,LANE_L64),row2l,LANE_H64);
-  row2h = vsetq_lane_u64(vgetq_lane_u64(row2h,LANE_H64),row2h,LANE_L64);
-  row2h = vsetq_lane_u64(vgetq_lane_u64(t1,LANE_L64),row2h,LANE_H64);
+    #undef LOAD_MSG_3_2
+    #define LOAD_MSG_3_2(b0, b1) \
+    do { b0 = vcombine_u64(vget_high_u64(m4), vget_high_u64(m0)); b1 = vcombine_u64(vget_low_u64(m6), vget_low_u64(m7)); } while(0)
 
-  b0 = vsetq_lane_u64(vgetq_lane_u64(m0m1,LANE_H64),b0,LANE_L64);
-  b0 = vsetq_lane_u64(vgetq_lane_u64(m0m1,LANE_L64),b0,LANE_H64);
-  b1 = vsetq_lane_u64(vgetq_lane_u64(m10m11,LANE_H64),b1,LANE_L64);
-  b1 = vsetq_lane_u64(vgetq_lane_u64(m4m5,LANE_H64),b1,LANE_H64);
-  row1l = vaddq_u64(vaddq_u64(row1l, b0), row2l);
-  row1h = vaddq_u64(vaddq_u64(row1h, b1), row2h);
-  row4l = veorq_u64(row4l, row1l);
-  row4h = veorq_u64(row4h, row1h);
-  row4l = veorq_u64(vshrq_n_u64(row4l,32),vshlq_n_u64(row4l,32));
-  row4h = veorq_u64(vshrq_n_u64(row4h,32),vshlq_n_u64(row4h,32));
-  row3l = vaddq_u64(row3l, row4l);
-  row3h = vaddq_u64(row3h, row4h);
-  row2l = veorq_u64(row2l, row3l);
-  row2h = veorq_u64(row2h, row3h);
-  row2l = veorq_u64(vshrq_n_u64(row2l,24),vshlq_n_u64(row2l,40));
-  row2h = veorq_u64(vshrq_n_u64(row2h,24),vshlq_n_u64(row2h,40));
+    #undef LOAD_MSG_3_3
+    #define LOAD_MSG_3_3(b0, b1) \
+    do { b0 = vcombine_u64(vget_low_u64(m1), vget_high_u64(m2)); b1 = vcombine_u64(vget_low_u64(m2), vget_high_u64(m7)); } while(0)
 
-  b0 = vsetq_lane_u64(vgetq_lane_u64(m12m13,LANE_L64),b0,LANE_L64);
-  b0 = vsetq_lane_u64(vgetq_lane_u64(m2m3,LANE_L64),b0,LANE_H64);
-  b1 = vsetq_lane_u64(vgetq_lane_u64(m6m7,LANE_H64),b1,LANE_L64);
-  b1 = vsetq_lane_u64(vgetq_lane_u64(m2m3,LANE_H64),b1,LANE_H64);
-  row1l = vaddq_u64(vaddq_u64(row1l, b0), row2l);
-  row1h = vaddq_u64(vaddq_u64(row1h, b1), row2h);
-  row4l = veorq_u64(row4l, row1l);
-  row4h = veorq_u64(row4h, row1h);
-  row4l = veorq_u64(vshrq_n_u64(row4l,16),vshlq_n_u64(row4l,48));
-  row4h = veorq_u64(vshrq_n_u64(row4h,16),vshlq_n_u64(row4h,48));
-  row3l = vaddq_u64(row3l, row4l);
-  row3h = vaddq_u64(row3h, row4h);
-  row2l = veorq_u64(row2l, row3l);
-  row2h = veorq_u64(row2h, row3h);
-  row2l = veorq_u64(vshrq_n_u64(row2l,63),vshlq_n_u64(row2l,1));
-  row2h = veorq_u64(vshrq_n_u64(row2h,63),vshlq_n_u64(row2h,1));
+    #undef LOAD_MSG_3_4
+    #define LOAD_MSG_3_4(b0, b1) \
+    do { b0 = vcombine_u64(vget_low_u64(m3), vget_low_u64(m5)); b1 = vcombine_u64(vget_low_u64(m0), vget_low_u64(m4)); } while(0)
 
-  t0 = row3l, row3l = row3h, row3h = t0, t0 = row2l, t1 = row4l;
-  row2l = vsetq_lane_u64(vgetq_lane_u64(row2l,LANE_L64),row2l,LANE_H64);
-  row2l = vsetq_lane_u64(vgetq_lane_u64(row2h,LANE_H64),row2l,LANE_L64);
-  row2h = vsetq_lane_u64(vgetq_lane_u64(row2h,LANE_L64),row2h,LANE_H64);
-  row2h = vsetq_lane_u64(vgetq_lane_u64(t0,LANE_H64),row2h,LANE_L64);
-  row4l = vsetq_lane_u64(vgetq_lane_u64(row4l,LANE_H64),row4l,LANE_L64);
-  row4l = vsetq_lane_u64(vgetq_lane_u64(row4h,LANE_L64),row4l,LANE_H64);
-  row4h = vsetq_lane_u64(vgetq_lane_u64(row4h,LANE_H64),row4h,LANE_L64);
-  row4h = vsetq_lane_u64(vgetq_lane_u64(t1,LANE_L64),row4h,LANE_H64);
+    #undef LOAD_MSG_4_1
+    #define LOAD_MSG_4_1(b0, b1) \
+    do { b0 = vcombine_u64(vget_high_u64(m4), vget_high_u64(m2)); b1 = vcombine_u64(vget_low_u64(m1), vget_low_u64(m5)); } while(0)
 
-  b0 = vsetq_lane_u64(vgetq_lane_u64(m10m11,LANE_H64),b0,LANE_L64);
-  b0 = vsetq_lane_u64(vgetq_lane_u64(m12m13,LANE_L64),b0,LANE_H64);
-  b1 = vsetq_lane_u64(vgetq_lane_u64(m4m5,LANE_H64),b1,LANE_L64);
-  b1 = vsetq_lane_u64(vgetq_lane_u64(m14m15,LANE_H64),b1,LANE_H64);
-  row1l = vaddq_u64(vaddq_u64(row1l, b0), row2l);
-  row1h = vaddq_u64(vaddq_u64(row1h, b1), row2h);
-  row4l = veorq_u64(row4l, row1l);
-  row4h = veorq_u64(row4h, row1h);
-  row4l = veorq_u64(vshrq_n_u64(row4l,32),vshlq_n_u64(row4l,32));
-  row4h = veorq_u64(vshrq_n_u64(row4h,32),vshlq_n_u64(row4h,32));
-  row3l = vaddq_u64(row3l, row4l);
-  row3h = vaddq_u64(row3h, row4h);
-  row2l = veorq_u64(row2l, row3l);
-  row2h = veorq_u64(row2h, row3h);
-  row2l = veorq_u64(vshrq_n_u64(row2l,24),vshlq_n_u64(row2l,40));
-  row2h = veorq_u64(vshrq_n_u64(row2h,24),vshlq_n_u64(row2h,40));
+    #undef LOAD_MSG_4_2
+    #define LOAD_MSG_4_2(b0, b1) \
+    do { b0 = vcombine_u64(vget_low_u64(m0), vget_high_u64(m3)); b1 = vcombine_u64(vget_low_u64(m2), vget_high_u64(m7)); } while(0)
 
-  b0 = vsetq_lane_u64(vgetq_lane_u64(m8m9,LANE_L64),b0,LANE_L64);
-  b0 = vsetq_lane_u64(vgetq_lane_u64(m0m1,LANE_L64),b0,LANE_H64);
-  b1 = vsetq_lane_u64(vgetq_lane_u64(m2m3,LANE_L64),b1,LANE_L64);
-  b1 = vsetq_lane_u64(vgetq_lane_u64(m12m13,LANE_H64),b1,LANE_H64);
-  row1l = vaddq_u64(vaddq_u64(row1l, b0), row2l);
-  row1h = vaddq_u64(vaddq_u64(row1h, b1), row2h);
-  row4l = veorq_u64(row4l, row1l);
-  row4h = veorq_u64(row4h, row1h);
-  row4l = veorq_u64(vshrq_n_u64(row4l,16),vshlq_n_u64(row4l,48));
-  row4h = veorq_u64(vshrq_n_u64(row4h,16),vshlq_n_u64(row4h,48));
-  row3l = vaddq_u64(row3l, row4l);
-  row3h = vaddq_u64(row3h, row4h);
-  row2l = veorq_u64(row2l, row3l);
-  row2h = veorq_u64(row2h, row3h);
-  row2l = veorq_u64(vshrq_n_u64(row2l,63),vshlq_n_u64(row2l,1));
-  row2h = veorq_u64(vshrq_n_u64(row2h,63),vshlq_n_u64(row2h,1));
+    #undef LOAD_MSG_4_3
+    #define LOAD_MSG_4_3(b0, b1) \
+    do { b0 = vcombine_u64(vget_low_u64(m7), vget_high_u64(m5)); b1 = vcombine_u64(vget_low_u64(m3), vget_high_u64(m1)); } while(0)
 
-  t0 = row4l, t1 = row2l, row4l = row3l, row3l = row3h, row3h = row4l;
-  row4l = vsetq_lane_u64(vgetq_lane_u64(row4h,LANE_H64),row4l,LANE_L64);
-  row4l = vsetq_lane_u64(vgetq_lane_u64(t0,LANE_L64),row4l,LANE_H64);
-  row4h = vsetq_lane_u64(vgetq_lane_u64(row4h,LANE_L64),row4h,LANE_H64);
-  row4h = vsetq_lane_u64(vgetq_lane_u64(t0,LANE_H64),row4h,LANE_L64);
-  row2l = vsetq_lane_u64(vgetq_lane_u64(row2l,LANE_H64),row2l,LANE_L64);
-  row2l = vsetq_lane_u64(vgetq_lane_u64(row2h,LANE_L64),row2l,LANE_H64);
-  row2h = vsetq_lane_u64(vgetq_lane_u64(row2h,LANE_H64),row2h,LANE_L64);
-  row2h = vsetq_lane_u64(vgetq_lane_u64(t1,LANE_L64),row2h,LANE_H64);
+    #undef LOAD_MSG_4_4
+    #define LOAD_MSG_4_4(b0, b1) \
+    do { b0 = vextq_u64(m0, m6, 1); b1 = vcombine_u64(vget_low_u64(m4), vget_high_u64(m6)); } while(0)
 
-  b0 = vsetq_lane_u64(vgetq_lane_u64(m10m11,LANE_L64),b0,LANE_L64);
-  b0 = vsetq_lane_u64(vgetq_lane_u64(m2m3,LANE_H64),b0,LANE_H64);
-  b1 = vsetq_lane_u64(vgetq_lane_u64(m6m7,LANE_H64),b1,LANE_L64);
-  b1 = vsetq_lane_u64(vgetq_lane_u64(m8m9,LANE_H64),b1,LANE_H64);
-  row1l = vaddq_u64(vaddq_u64(row1l, b0), row2l);
-  row1h = vaddq_u64(vaddq_u64(row1h, b1), row2h);
-  row4l = veorq_u64(row4l, row1l);
-  row4h = veorq_u64(row4h, row1h);
-  row4l = veorq_u64(vshrq_n_u64(row4l,32),vshlq_n_u64(row4l,32));
-  row4h = veorq_u64(vshrq_n_u64(row4h,32),vshlq_n_u64(row4h,32));
-  row3l = vaddq_u64(row3l, row4l);
-  row3h = vaddq_u64(row3h, row4h);
-  row2l = veorq_u64(row2l, row3l);
-  row2h = veorq_u64(row2h, row3h);
-  row2l = veorq_u64(vshrq_n_u64(row2l,24),vshlq_n_u64(row2l,40));
-  row2h = veorq_u64(vshrq_n_u64(row2h,24),vshlq_n_u64(row2h,40));
+    #undef LOAD_MSG_5_1
+    #define LOAD_MSG_5_1(b0, b1) \
+    do { b0 = vcombine_u64(vget_low_u64(m1), vget_low_u64(m3)); b1 = vcombine_u64(vget_low_u64(m0), vget_low_u64(m4)); } while(0)
 
-  b0 = vsetq_lane_u64(vgetq_lane_u64(m14m15,LANE_L64),b0,LANE_L64);
-  b0 = vsetq_lane_u64(vgetq_lane_u64(m6m7,LANE_L64),b0,LANE_H64);
-  b1 = vsetq_lane_u64(vgetq_lane_u64(m0m1,LANE_H64),b1,LANE_L64);
-  b1 = vsetq_lane_u64(vgetq_lane_u64(m4m5,LANE_L64),b1,LANE_H64);
-  row1l = vaddq_u64(vaddq_u64(row1l, b0), row2l);
-  row1h = vaddq_u64(vaddq_u64(row1h, b1), row2h);
-  row4l = veorq_u64(row4l, row1l);
-  row4h = veorq_u64(row4h, row1h);
-  row4l = veorq_u64(vshrq_n_u64(row4l,16),vshlq_n_u64(row4l,48));
-  row4h = veorq_u64(vshrq_n_u64(row4h,16),vshlq_n_u64(row4h,48));
-  row3l = vaddq_u64(row3l, row4l);
-  row3h = vaddq_u64(row3h, row4h);
-  row2l = veorq_u64(row2l, row3l);
-  row2h = veorq_u64(row2h, row3h);
-  row2l = veorq_u64(vshrq_n_u64(row2l,63),vshlq_n_u64(row2l,1));
-  row2h = veorq_u64(vshrq_n_u64(row2h,63),vshlq_n_u64(row2h,1));
+    #undef LOAD_MSG_5_2
+    #define LOAD_MSG_5_2(b0, b1) \
+    do { b0 = vcombine_u64(vget_low_u64(m6), vget_low_u64(m5)); b1 = vcombine_u64(vget_high_u64(m5), vget_high_u64(m1)); } while(0)
 
-  t0 = row3l, row3l = row3h, row3h = t0, t0 = row2l, t1 = row4l;
-  row2l = vsetq_lane_u64(vgetq_lane_u64(row2l,LANE_L64),row2l,LANE_H64);
-  row2l = vsetq_lane_u64(vgetq_lane_u64(row2h,LANE_H64),row2l,LANE_L64);
-  row2h = vsetq_lane_u64(vgetq_lane_u64(row2h,LANE_L64),row2h,LANE_H64);
-  row2h = vsetq_lane_u64(vgetq_lane_u64(t0,LANE_H64),row2h,LANE_L64);
-  row4l = vsetq_lane_u64(vgetq_lane_u64(row4l,LANE_H64),row4l,LANE_L64);
-  row4l = vsetq_lane_u64(vgetq_lane_u64(row4h,LANE_L64),row4l,LANE_H64);
-  row4h = vsetq_lane_u64(vgetq_lane_u64(row4h,LANE_H64),row4h,LANE_L64);
-  row4h = vsetq_lane_u64(vgetq_lane_u64(t1,LANE_L64),row4h,LANE_H64);
+    #undef LOAD_MSG_5_3
+    #define LOAD_MSG_5_3(b0, b1) \
+    do { b0 = vcombine_u64(vget_low_u64(m2), vget_high_u64(m3)); b1 = vcombine_u64(vget_high_u64(m7), vget_high_u64(m0)); } while(0)
 
-  b0 = vsetq_lane_u64(vgetq_lane_u64(m6m7,LANE_H64),b0,LANE_L64);
-  b0 = vsetq_lane_u64(vgetq_lane_u64(m2m3,LANE_H64),b0,LANE_H64);
-  b1 = vsetq_lane_u64(vgetq_lane_u64(m12m13,LANE_H64),b1,LANE_L64);
-  b1 = vsetq_lane_u64(vgetq_lane_u64(m10m11,LANE_H64),b1,LANE_H64);
-  row1l = vaddq_u64(vaddq_u64(row1l, b0), row2l);
-  row1h = vaddq_u64(vaddq_u64(row1h, b1), row2h);
-  row4l = veorq_u64(row4l, row1l);
-  row4h = veorq_u64(row4h, row1h);
-  row4l = veorq_u64(vshrq_n_u64(row4l,32),vshlq_n_u64(row4l,32));
-  row4h = veorq_u64(vshrq_n_u64(row4h,32),vshlq_n_u64(row4h,32));
-  row3l = vaddq_u64(row3l, row4l);
-  row3h = vaddq_u64(row3h, row4h);
-  row2l = veorq_u64(row2l, row3l);
-  row2h = veorq_u64(row2h, row3h);
-  row2l = veorq_u64(vshrq_n_u64(row2l,24),vshlq_n_u64(row2l,40));
-  row2h = veorq_u64(vshrq_n_u64(row2h,24),vshlq_n_u64(row2h,40));
+    #undef LOAD_MSG_5_4
+    #define LOAD_MSG_5_4(b0, b1) \
+    do { b0 = vcombine_u64(vget_high_u64(m6), vget_high_u64(m2)); b1 = vcombine_u64(vget_low_u64(m7), vget_high_u64(m4)); } while(0)
 
-  b0 = vsetq_lane_u64(vgetq_lane_u64(m8m9,LANE_H64),b0,LANE_L64);
-  b0 = vsetq_lane_u64(vgetq_lane_u64(m0m1,LANE_H64),b0,LANE_H64);
-  b1 = vsetq_lane_u64(vgetq_lane_u64(m12m13,LANE_L64),b1,LANE_L64);
-  b1 = vsetq_lane_u64(vgetq_lane_u64(m14m15,LANE_L64),b1,LANE_H64);
-  row1l = vaddq_u64(vaddq_u64(row1l, b0), row2l);
-  row1h = vaddq_u64(vaddq_u64(row1h, b1), row2h);
-  row4l = veorq_u64(row4l, row1l);
-  row4h = veorq_u64(row4h, row1h);
-  row4l = veorq_u64(vshrq_n_u64(row4l,16),vshlq_n_u64(row4l,48));
-  row4h = veorq_u64(vshrq_n_u64(row4h,16),vshlq_n_u64(row4h,48));
-  row3l = vaddq_u64(row3l, row4l);
-  row3h = vaddq_u64(row3h, row4h);
-  row2l = veorq_u64(row2l, row3l);
-  row2h = veorq_u64(row2h, row3h);
-  row2l = veorq_u64(vshrq_n_u64(row2l,63),vshlq_n_u64(row2l,1));
-  row2h = veorq_u64(vshrq_n_u64(row2h,63),vshlq_n_u64(row2h,1));
+    #undef LOAD_MSG_6_1
+    #define LOAD_MSG_6_1(b0, b1) \
+    do { b0 = vcombine_u64(vget_low_u64(m6), vget_high_u64(m0)); b1 = vcombine_u64(vget_low_u64(m7), vget_low_u64(m2)); } while(0)
 
-  t0 = row4l, t1 = row2l, row4l = row3l, row3l = row3h, row3h = row4l;
-  row4l = vsetq_lane_u64(vgetq_lane_u64(row4h,LANE_H64),row4l,LANE_L64);
-  row4l = vsetq_lane_u64(vgetq_lane_u64(t0,LANE_L64),row4l,LANE_H64);
-  row4h = vsetq_lane_u64(vgetq_lane_u64(row4h,LANE_L64),row4h,LANE_H64);
-  row4h = vsetq_lane_u64(vgetq_lane_u64(t0,LANE_H64),row4h,LANE_L64);
-  row2l = vsetq_lane_u64(vgetq_lane_u64(row2l,LANE_H64),row2l,LANE_L64);
-  row2l = vsetq_lane_u64(vgetq_lane_u64(row2h,LANE_L64),row2l,LANE_H64);
-  row2h = vsetq_lane_u64(vgetq_lane_u64(row2h,LANE_H64),row2h,LANE_L64);
-  row2h = vsetq_lane_u64(vgetq_lane_u64(t1,LANE_L64),row2h,LANE_H64);
+    #undef LOAD_MSG_6_2
+    #define LOAD_MSG_6_2(b0, b1) \
+    do { b0 = vcombine_u64(vget_high_u64(m2), vget_high_u64(m7)); b1 = vextq_u64(m6, m5, 1); } while(0)
 
-  b0 = vsetq_lane_u64(vgetq_lane_u64(m2m3,LANE_L64),b0,LANE_L64);
-  b0 = vsetq_lane_u64(vgetq_lane_u64(m4m5,LANE_H64),b0,LANE_H64);
-  b1 = vsetq_lane_u64(vgetq_lane_u64(m4m5,LANE_L64),b1,LANE_L64);
-  b1 = vsetq_lane_u64(vgetq_lane_u64(m14m15,LANE_H64),b1,LANE_H64);
-  row1l = vaddq_u64(vaddq_u64(row1l, b0), row2l);
-  row1h = vaddq_u64(vaddq_u64(row1h, b1), row2h);
-  row4l = veorq_u64(row4l, row1l);
-  row4h = veorq_u64(row4h, row1h);
-  row4l = veorq_u64(vshrq_n_u64(row4l,32),vshlq_n_u64(row4l,32));
-  row4h = veorq_u64(vshrq_n_u64(row4h,32),vshlq_n_u64(row4h,32));
-  row3l = vaddq_u64(row3l, row4l);
-  row3h = vaddq_u64(row3h, row4h);
-  row2l = veorq_u64(row2l, row3l);
-  row2h = veorq_u64(row2h, row3h);
-  row2l = veorq_u64(vshrq_n_u64(row2l,24),vshlq_n_u64(row2l,40));
-  row2h = veorq_u64(vshrq_n_u64(row2h,24),vshlq_n_u64(row2h,40));
+    #undef LOAD_MSG_6_3
+    #define LOAD_MSG_6_3(b0, b1) \
+    do { b0 = vcombine_u64(vget_low_u64(m0), vget_low_u64(m3)); b1 = vextq_u64(m4, m4, 1); } while(0)
 
-  b0 = vsetq_lane_u64(vgetq_lane_u64(m6m7,LANE_L64),b0,LANE_L64);
-  b0 = vsetq_lane_u64(vgetq_lane_u64(m10m11,LANE_L64),b0,LANE_H64);
-  b1 = vsetq_lane_u64(vgetq_lane_u64(m0m1,LANE_L64),b1,LANE_L64);
-  b1 = vsetq_lane_u64(vgetq_lane_u64(m8m9,LANE_L64),b1,LANE_H64);
-  row1l = vaddq_u64(vaddq_u64(row1l, b0), row2l);
-  row1h = vaddq_u64(vaddq_u64(row1h, b1), row2h);
-  row4l = veorq_u64(row4l, row1l);
-  row4h = veorq_u64(row4h, row1h);
-  row4l = veorq_u64(vshrq_n_u64(row4l,16),vshlq_n_u64(row4l,48));
-  row4h = veorq_u64(vshrq_n_u64(row4h,16),vshlq_n_u64(row4h,48));
-  row3l = vaddq_u64(row3l, row4l);
-  row3h = vaddq_u64(row3h, row4h);
-  row2l = veorq_u64(row2l, row3l);
-  row2h = veorq_u64(row2h, row3h);
-  row2l = veorq_u64(vshrq_n_u64(row2l,63),vshlq_n_u64(row2l,1));
-  row2h = veorq_u64(vshrq_n_u64(row2h,63),vshlq_n_u64(row2h,1));
+    #undef LOAD_MSG_6_4
+    #define LOAD_MSG_6_4(b0, b1) \
+    do { b0 = vcombine_u64(vget_high_u64(m3), vget_high_u64(m1)); b1 = vcombine_u64(vget_low_u64(m1), vget_high_u64(m5)); } while(0)
 
-  t0 = row3l, row3l = row3h, row3h = t0, t0 = row2l, t1 = row4l;
-  row2l = vsetq_lane_u64(vgetq_lane_u64(row2l,LANE_L64),row2l,LANE_H64);
-  row2l = vsetq_lane_u64(vgetq_lane_u64(row2h,LANE_H64),row2l,LANE_L64);
-  row2h = vsetq_lane_u64(vgetq_lane_u64(row2h,LANE_L64),row2h,LANE_H64);
-  row2h = vsetq_lane_u64(vgetq_lane_u64(t0,LANE_H64),row2h,LANE_L64);
-  row4l = vsetq_lane_u64(vgetq_lane_u64(row4l,LANE_H64),row4l,LANE_L64);
-  row4l = vsetq_lane_u64(vgetq_lane_u64(row4h,LANE_L64),row4l,LANE_H64);
-  row4h = vsetq_lane_u64(vgetq_lane_u64(row4h,LANE_H64),row4h,LANE_L64);
-  row4h = vsetq_lane_u64(vgetq_lane_u64(t1,LANE_L64),row4h,LANE_H64);
+    #undef LOAD_MSG_7_1
+    #define LOAD_MSG_7_1(b0, b1) \
+    do { b0 = vcombine_u64(vget_high_u64(m6), vget_high_u64(m3)); b1 = vcombine_u64(vget_low_u64(m6), vget_high_u64(m1)); } while(0)
 
-  b0 = vsetq_lane_u64(vgetq_lane_u64(m8m9,LANE_H64),b0,LANE_L64);
-  b0 = vsetq_lane_u64(vgetq_lane_u64(m4m5,LANE_H64),b0,LANE_H64);
-  b1 = vsetq_lane_u64(vgetq_lane_u64(m2m3,LANE_L64),b1,LANE_L64);
-  b1 = vsetq_lane_u64(vgetq_lane_u64(m10m11,LANE_L64),b1,LANE_H64);
-  row1l = vaddq_u64(vaddq_u64(row1l, b0), row2l);
-  row1h = vaddq_u64(vaddq_u64(row1h, b1), row2h);
-  row4l = veorq_u64(row4l, row1l);
-  row4h = veorq_u64(row4h, row1h);
-  row4l = veorq_u64(vshrq_n_u64(row4l,32),vshlq_n_u64(row4l,32));
-  row4h = veorq_u64(vshrq_n_u64(row4h,32),vshlq_n_u64(row4h,32));
-  row3l = vaddq_u64(row3l, row4l);
-  row3h = vaddq_u64(row3h, row4h);
-  row2l = veorq_u64(row2l, row3l);
-  row2h = veorq_u64(row2h, row3h);
-  row2l = veorq_u64(vshrq_n_u64(row2l,24),vshlq_n_u64(row2l,40));
-  row2h = veorq_u64(vshrq_n_u64(row2h,24),vshlq_n_u64(row2h,40));
-
-  b0 = vsetq_lane_u64(vgetq_lane_u64(m0m1,LANE_L64),b0,LANE_L64);
-  b0 = vsetq_lane_u64(vgetq_lane_u64(m6m7,LANE_H64),b0,LANE_H64);
-  b1 = vsetq_lane_u64(vgetq_lane_u64(m4m5,LANE_L64),b1,LANE_L64);
-  b1 = vsetq_lane_u64(vgetq_lane_u64(m14m15,LANE_H64),b1,LANE_H64);
-  row1l = vaddq_u64(vaddq_u64(row1l, b0), row2l);
-  row1h = vaddq_u64(vaddq_u64(row1h, b1), row2h);
-  row4l = veorq_u64(row4l, row1l);
-  row4h = veorq_u64(row4h, row1h);
-  row4l = veorq_u64(vshrq_n_u64(row4l,16),vshlq_n_u64(row4l,48));
-  row4h = veorq_u64(vshrq_n_u64(row4h,16),vshlq_n_u64(row4h,48));
-  row3l = vaddq_u64(row3l, row4l);
-  row3h = vaddq_u64(row3h, row4h);
-  row2l = veorq_u64(row2l, row3l);
-  row2h = veorq_u64(row2h, row3h);
-  row2l = veorq_u64(vshrq_n_u64(row2l,63),vshlq_n_u64(row2l,1));
-  row2h = veorq_u64(vshrq_n_u64(row2h,63),vshlq_n_u64(row2h,1));
-
-  t0 = row4l, t1 = row2l, row4l = row3l, row3l = row3h, row3h = row4l;
-  row4l = vsetq_lane_u64(vgetq_lane_u64(row4h,LANE_H64),row4l,LANE_L64);
-  row4l = vsetq_lane_u64(vgetq_lane_u64(t0,LANE_L64),row4l,LANE_H64);
-  row4h = vsetq_lane_u64(vgetq_lane_u64(row4h,LANE_L64),row4h,LANE_H64);
-  row4h = vsetq_lane_u64(vgetq_lane_u64(t0,LANE_H64),row4h,LANE_L64);
-  row2l = vsetq_lane_u64(vgetq_lane_u64(row2l,LANE_H64),row2l,LANE_L64);
-  row2l = vsetq_lane_u64(vgetq_lane_u64(row2h,LANE_L64),row2l,LANE_H64);
-  row2h = vsetq_lane_u64(vgetq_lane_u64(row2h,LANE_H64),row2h,LANE_L64);
-  row2h = vsetq_lane_u64(vgetq_lane_u64(t1,LANE_L64),row2h,LANE_H64);
-
-  b0 = vsetq_lane_u64(vgetq_lane_u64(m14m15,LANE_L64),b0,LANE_L64);
-  b0 = vsetq_lane_u64(vgetq_lane_u64(m10m11,LANE_H64),b0,LANE_H64);
-  b1 = vsetq_lane_u64(vgetq_lane_u64(m6m7,LANE_L64),b1,LANE_L64);
-  b1 = vsetq_lane_u64(vgetq_lane_u64(m2m3,LANE_H64),b1,LANE_H64);
-  row1l = vaddq_u64(vaddq_u64(row1l, b0), row2l);
-  row1h = vaddq_u64(vaddq_u64(row1h, b1), row2h);
-  row4l = veorq_u64(row4l, row1l);
-  row4h = veorq_u64(row4h, row1h);
-  row4l = veorq_u64(vshrq_n_u64(row4l,32),vshlq_n_u64(row4l,32));
-  row4h = veorq_u64(vshrq_n_u64(row4h,32),vshlq_n_u64(row4h,32));
-  row3l = vaddq_u64(row3l, row4l);
-  row3h = vaddq_u64(row3h, row4h);
-  row2l = veorq_u64(row2l, row3l);
-  row2h = veorq_u64(row2h, row3h);
-  row2l = veorq_u64(vshrq_n_u64(row2l,24),vshlq_n_u64(row2l,40));
-  row2h = veorq_u64(vshrq_n_u64(row2h,24),vshlq_n_u64(row2h,40));
-
-  b0 = vsetq_lane_u64(vgetq_lane_u64(m0m1,LANE_H64),b0,LANE_L64);
-  b0 = vsetq_lane_u64(vgetq_lane_u64(m12m13,LANE_L64),b0,LANE_H64);
-  b1 = vsetq_lane_u64(vgetq_lane_u64(m8m9,LANE_L64),b1,LANE_L64);
-  b1 = vsetq_lane_u64(vgetq_lane_u64(m12m13,LANE_H64),b1,LANE_H64);
-  row1l = vaddq_u64(vaddq_u64(row1l, b0), row2l);
-  row1h = vaddq_u64(vaddq_u64(row1h, b1), row2h);
-  row4l = veorq_u64(row4l, row1l);
-  row4h = veorq_u64(row4h, row1h);
-  row4l = veorq_u64(vshrq_n_u64(row4l,16),vshlq_n_u64(row4l,48));
-  row4h = veorq_u64(vshrq_n_u64(row4h,16),vshlq_n_u64(row4h,48));
-  row3l = vaddq_u64(row3l, row4l);
-  row3h = vaddq_u64(row3h, row4h);
-  row2l = veorq_u64(row2l, row3l);
-  row2h = veorq_u64(row2h, row3h);
-  row2l = veorq_u64(vshrq_n_u64(row2l,63),vshlq_n_u64(row2l,1));
-  row2h = veorq_u64(vshrq_n_u64(row2h,63),vshlq_n_u64(row2h,1));
-
-  t0 = row3l, row3l = row3h, row3h = t0, t0 = row2l, t1 = row4l;
-  row2l = vsetq_lane_u64(vgetq_lane_u64(row2l,LANE_L64),row2l,LANE_H64);
-  row2l = vsetq_lane_u64(vgetq_lane_u64(row2h,LANE_H64),row2l,LANE_L64);
-  row2h = vsetq_lane_u64(vgetq_lane_u64(row2h,LANE_L64),row2h,LANE_H64);
-  row2h = vsetq_lane_u64(vgetq_lane_u64(t0,LANE_H64),row2h,LANE_L64);
-  row4l = vsetq_lane_u64(vgetq_lane_u64(row4l,LANE_H64),row4l,LANE_L64);
-  row4l = vsetq_lane_u64(vgetq_lane_u64(row4h,LANE_L64),row4l,LANE_H64);
-  row4h = vsetq_lane_u64(vgetq_lane_u64(row4h,LANE_H64),row4h,LANE_L64);
-  row4h = vsetq_lane_u64(vgetq_lane_u64(t1,LANE_L64),row4h,LANE_H64);
-
-  b0 = vsetq_lane_u64(vgetq_lane_u64(m2m3,LANE_L64),b0,LANE_L64);
-  b0 = vsetq_lane_u64(vgetq_lane_u64(m6m7,LANE_L64),b0,LANE_H64);
-  b1 = vsetq_lane_u64(vgetq_lane_u64(m0m1,LANE_L64),b1,LANE_L64);
-  b1 = vsetq_lane_u64(vgetq_lane_u64(m8m9,LANE_L64),b1,LANE_H64);
-  row1l = vaddq_u64(vaddq_u64(row1l, b0), row2l);
-  row1h = vaddq_u64(vaddq_u64(row1h, b1), row2h);
-  row4l = veorq_u64(row4l, row1l);
-  row4h = veorq_u64(row4h, row1h);
-  row4l = veorq_u64(vshrq_n_u64(row4l,32),vshlq_n_u64(row4l,32));
-  row4h = veorq_u64(vshrq_n_u64(row4h,32),vshlq_n_u64(row4h,32));
-  row3l = vaddq_u64(row3l, row4l);
-  row3h = vaddq_u64(row3h, row4h);
-  row2l = veorq_u64(row2l, row3l);
-  row2h = veorq_u64(row2h, row3h);
-  row2l = veorq_u64(vshrq_n_u64(row2l,24),vshlq_n_u64(row2l,40));
-  row2h = veorq_u64(vshrq_n_u64(row2h,24),vshlq_n_u64(row2h,40));
-
-  b0 = vsetq_lane_u64(vgetq_lane_u64(m12m13,LANE_L64),b0,LANE_L64);
-  b0 = vsetq_lane_u64(vgetq_lane_u64(m10m11,LANE_L64),b0,LANE_H64);
-  b1 = vsetq_lane_u64(vgetq_lane_u64(m10m11,LANE_H64),b1,LANE_L64);
-  b1 = vsetq_lane_u64(vgetq_lane_u64(m2m3,LANE_H64),b1,LANE_H64);
-  row1l = vaddq_u64(vaddq_u64(row1l, b0), row2l);
-  row1h = vaddq_u64(vaddq_u64(row1h, b1), row2h);
-  row4l = veorq_u64(row4l, row1l);
-  row4h = veorq_u64(row4h, row1h);
-  row4l = veorq_u64(vshrq_n_u64(row4l,16),vshlq_n_u64(row4l,48));
-  row4h = veorq_u64(vshrq_n_u64(row4h,16),vshlq_n_u64(row4h,48));
-  row3l = vaddq_u64(row3l, row4l);
-  row3h = vaddq_u64(row3h, row4h);
-  row2l = veorq_u64(row2l, row3l);
-  row2h = veorq_u64(row2h, row3h);
-  row2l = veorq_u64(vshrq_n_u64(row2l,63),vshlq_n_u64(row2l,1));
-  row2h = veorq_u64(vshrq_n_u64(row2h,63),vshlq_n_u64(row2h,1));
-
-  t0 = row4l, t1 = row2l, row4l = row3l, row3l = row3h, row3h = row4l;
-  row4l = vsetq_lane_u64(vgetq_lane_u64(row4h,LANE_H64),row4l,LANE_L64);
-  row4l = vsetq_lane_u64(vgetq_lane_u64(t0,LANE_L64),row4l,LANE_H64);
-  row4h = vsetq_lane_u64(vgetq_lane_u64(row4h,LANE_L64),row4h,LANE_H64);
-  row4h = vsetq_lane_u64(vgetq_lane_u64(t0,LANE_H64),row4h,LANE_L64);
-  row2l = vsetq_lane_u64(vgetq_lane_u64(row2l,LANE_H64),row2l,LANE_L64);
-  row2l = vsetq_lane_u64(vgetq_lane_u64(row2h,LANE_L64),row2l,LANE_H64);
-  row2h = vsetq_lane_u64(vgetq_lane_u64(row2h,LANE_H64),row2h,LANE_L64);
-  row2h = vsetq_lane_u64(vgetq_lane_u64(t1,LANE_L64),row2h,LANE_H64);
-
-  b0 = vsetq_lane_u64(vgetq_lane_u64(m4m5,LANE_L64),b0,LANE_L64);
-  b0 = vsetq_lane_u64(vgetq_lane_u64(m6m7,LANE_H64),b0,LANE_H64);
-  b1 = vsetq_lane_u64(vgetq_lane_u64(m14m15,LANE_H64),b1,LANE_L64);
-  b1 = vsetq_lane_u64(vgetq_lane_u64(m0m1,LANE_H64),b1,LANE_H64);
-  row1l = vaddq_u64(vaddq_u64(row1l, b0), row2l);
-  row1h = vaddq_u64(vaddq_u64(row1h, b1), row2h);
-  row4l = veorq_u64(row4l, row1l);
-  row4h = veorq_u64(row4h, row1h);
-  row4l = veorq_u64(vshrq_n_u64(row4l,32),vshlq_n_u64(row4l,32));
-  row4h = veorq_u64(vshrq_n_u64(row4h,32),vshlq_n_u64(row4h,32));
-  row3l = vaddq_u64(row3l, row4l);
-  row3h = vaddq_u64(row3h, row4h);
-  row2l = veorq_u64(row2l, row3l);
-  row2h = veorq_u64(row2h, row3h);
-  row2l = veorq_u64(vshrq_n_u64(row2l,24),vshlq_n_u64(row2l,40));
-  row2h = veorq_u64(vshrq_n_u64(row2h,24),vshlq_n_u64(row2h,40));
-
-  b0 = vsetq_lane_u64(vgetq_lane_u64(m12m13,LANE_H64),b0,LANE_L64);
-  b0 = vsetq_lane_u64(vgetq_lane_u64(m4m5,LANE_H64),b0,LANE_H64);
-  b1 = vsetq_lane_u64(vgetq_lane_u64(m14m15,LANE_L64),b1,LANE_L64);
-  b1 = vsetq_lane_u64(vgetq_lane_u64(m8m9,LANE_H64),b1,LANE_H64);
-  row1l = vaddq_u64(vaddq_u64(row1l, b0), row2l);
-  row1h = vaddq_u64(vaddq_u64(row1h, b1), row2h);
-  row4l = veorq_u64(row4l, row1l);
-  row4h = veorq_u64(row4h, row1h);
-  row4l = veorq_u64(vshrq_n_u64(row4l,16),vshlq_n_u64(row4l,48));
-  row4h = veorq_u64(vshrq_n_u64(row4h,16),vshlq_n_u64(row4h,48));
-  row3l = vaddq_u64(row3l, row4l);
-  row3h = vaddq_u64(row3h, row4h);
-  row2l = veorq_u64(row2l, row3l);
-  row2h = veorq_u64(row2h, row3h);
-  row2l = veorq_u64(vshrq_n_u64(row2l,63),vshlq_n_u64(row2l,1));
-  row2h = veorq_u64(vshrq_n_u64(row2h,63),vshlq_n_u64(row2h,1));
-
-  t0 = row3l, row3l = row3h, row3h = t0, t0 = row2l, t1 = row4l;
-  row2l = vsetq_lane_u64(vgetq_lane_u64(row2l,LANE_L64),row2l,LANE_H64);
-  row2l = vsetq_lane_u64(vgetq_lane_u64(row2h,LANE_H64),row2l,LANE_L64);
-  row2h = vsetq_lane_u64(vgetq_lane_u64(row2h,LANE_L64),row2h,LANE_H64);
-  row2h = vsetq_lane_u64(vgetq_lane_u64(t0,LANE_H64),row2h,LANE_L64);
-  row4l = vsetq_lane_u64(vgetq_lane_u64(row4l,LANE_H64),row4l,LANE_L64);
-  row4l = vsetq_lane_u64(vgetq_lane_u64(row4h,LANE_L64),row4l,LANE_H64);
-  row4h = vsetq_lane_u64(vgetq_lane_u64(row4h,LANE_H64),row4h,LANE_L64);
-  row4h = vsetq_lane_u64(vgetq_lane_u64(t1,LANE_L64),row4h,LANE_H64);
-
-  b0 = vsetq_lane_u64(vgetq_lane_u64(m12m13,LANE_L64),b0,LANE_L64);
-  b0 = vsetq_lane_u64(vgetq_lane_u64(m0m1,LANE_H64),b0,LANE_H64);
-  b1 = vsetq_lane_u64(vgetq_lane_u64(m14m15,LANE_L64),b1,LANE_L64);
-  b1 = vsetq_lane_u64(vgetq_lane_u64(m4m5,LANE_L64),b1,LANE_H64);
-  row1l = vaddq_u64(vaddq_u64(row1l, b0), row2l);
-  row1h = vaddq_u64(vaddq_u64(row1h, b1), row2h);
-  row4l = veorq_u64(row4l, row1l);
-  row4h = veorq_u64(row4h, row1h);
-  row4l = veorq_u64(vshrq_n_u64(row4l,32),vshlq_n_u64(row4l,32));
-  row4h = veorq_u64(vshrq_n_u64(row4h,32),vshlq_n_u64(row4h,32));
-  row3l = vaddq_u64(row3l, row4l);
-  row3h = vaddq_u64(row3h, row4h);
-  row2l = veorq_u64(row2l, row3l);
-  row2h = veorq_u64(row2h, row3h);
-  row2l = veorq_u64(vshrq_n_u64(row2l,24),vshlq_n_u64(row2l,40));
-  row2h = veorq_u64(vshrq_n_u64(row2h,24),vshlq_n_u64(row2h,40));
-
-  b0 = vsetq_lane_u64(vgetq_lane_u64(m4m5,LANE_H64),b0,LANE_L64);
-  b0 = vsetq_lane_u64(vgetq_lane_u64(m14m15,LANE_H64),b0,LANE_H64);
-  b1 = vsetq_lane_u64(vgetq_lane_u64(m12m13,LANE_H64),b1,LANE_L64);
-  b1 = vsetq_lane_u64(vgetq_lane_u64(m10m11,LANE_L64),b1,LANE_H64);
-  row1l = vaddq_u64(vaddq_u64(row1l, b0), row2l);
-  row1h = vaddq_u64(vaddq_u64(row1h, b1), row2h);
-  row4l = veorq_u64(row4l, row1l);
-  row4h = veorq_u64(row4h, row1h);
-  row4l = veorq_u64(vshrq_n_u64(row4l,16),vshlq_n_u64(row4l,48));
-  row4h = veorq_u64(vshrq_n_u64(row4h,16),vshlq_n_u64(row4h,48));
-  row3l = vaddq_u64(row3l, row4l);
-  row3h = vaddq_u64(row3h, row4h);
-  row2l = veorq_u64(row2l, row3l);
-  row2h = veorq_u64(row2h, row3h);
-  row2l = veorq_u64(vshrq_n_u64(row2l,63),vshlq_n_u64(row2l,1));
-  row2h = veorq_u64(vshrq_n_u64(row2h,63),vshlq_n_u64(row2h,1));
-
-  t0 = row4l, t1 = row2l, row4l = row3l, row3l = row3h, row3h = row4l;
-  row4l = vsetq_lane_u64(vgetq_lane_u64(row4h,LANE_H64),row4l,LANE_L64);
-  row4l = vsetq_lane_u64(vgetq_lane_u64(t0,LANE_L64),row4l,LANE_H64);
-  row4h = vsetq_lane_u64(vgetq_lane_u64(row4h,LANE_L64),row4h,LANE_H64);
-  row4h = vsetq_lane_u64(vgetq_lane_u64(t0,LANE_H64),row4h,LANE_L64);
-  row2l = vsetq_lane_u64(vgetq_lane_u64(row2l,LANE_H64),row2l,LANE_L64);
-  row2l = vsetq_lane_u64(vgetq_lane_u64(row2h,LANE_L64),row2l,LANE_H64);
-  row2h = vsetq_lane_u64(vgetq_lane_u64(row2h,LANE_H64),row2h,LANE_L64);
-  row2h = vsetq_lane_u64(vgetq_lane_u64(t1,LANE_L64),row2h,LANE_H64);
-
-  b0 = vsetq_lane_u64(vgetq_lane_u64(m0m1,LANE_L64),b0,LANE_L64);
-  b0 = vsetq_lane_u64(vgetq_lane_u64(m6m7,LANE_L64),b0,LANE_H64);
-  b1 = vsetq_lane_u64(vgetq_lane_u64(m8m9,LANE_H64),b1,LANE_L64);
-  b1 = vsetq_lane_u64(vgetq_lane_u64(m8m9,LANE_L64),b1,LANE_H64);
-  row1l = vaddq_u64(vaddq_u64(row1l, b0), row2l);
-  row1h = vaddq_u64(vaddq_u64(row1h, b1), row2h);
-  row4l = veorq_u64(row4l, row1l);
-  row4h = veorq_u64(row4h, row1h);
-  row4l = veorq_u64(vshrq_n_u64(row4l,32),vshlq_n_u64(row4l,32));
-  row4h = veorq_u64(vshrq_n_u64(row4h,32),vshlq_n_u64(row4h,32));
-  row3l = vaddq_u64(row3l, row4l);
-  row3h = vaddq_u64(row3h, row4h);
-  row2l = veorq_u64(row2l, row3l);
-  row2h = veorq_u64(row2h, row3h);
-  row2l = veorq_u64(vshrq_n_u64(row2l,24),vshlq_n_u64(row2l,40));
-  row2h = veorq_u64(vshrq_n_u64(row2h,24),vshlq_n_u64(row2h,40));
-
-  b0 = vsetq_lane_u64(vgetq_lane_u64(m6m7,LANE_H64),b0,LANE_L64);
-  b0 = vsetq_lane_u64(vgetq_lane_u64(m2m3,LANE_H64),b0,LANE_H64);
-  b1 = vsetq_lane_u64(vgetq_lane_u64(m2m3,LANE_L64),b1,LANE_L64);
-  b1 = vsetq_lane_u64(vgetq_lane_u64(m10m11,LANE_H64),b1,LANE_H64);
-  row1l = vaddq_u64(vaddq_u64(row1l, b0), row2l);
-  row1h = vaddq_u64(vaddq_u64(row1h, b1), row2h);
-  row4l = veorq_u64(row4l, row1l);
-  row4h = veorq_u64(row4h, row1h);
-  row4l = veorq_u64(vshrq_n_u64(row4l,16),vshlq_n_u64(row4l,48));
-  row4h = veorq_u64(vshrq_n_u64(row4h,16),vshlq_n_u64(row4h,48));
-  row3l = vaddq_u64(row3l, row4l);
-  row3h = vaddq_u64(row3h, row4h);
-  row2l = veorq_u64(row2l, row3l);
-  row2h = veorq_u64(row2h, row3h);
-  row2l = veorq_u64(vshrq_n_u64(row2l,63),vshlq_n_u64(row2l,1));
-  row2h = veorq_u64(vshrq_n_u64(row2h,63),vshlq_n_u64(row2h,1));
-
-  t0 = row3l, row3l = row3h, row3h = t0, t0 = row2l, t1 = row4l;
-  row2l = vsetq_lane_u64(vgetq_lane_u64(row2l,LANE_L64),row2l,LANE_H64);
-  row2l = vsetq_lane_u64(vgetq_lane_u64(row2h,LANE_H64),row2l,LANE_L64);
-  row2h = vsetq_lane_u64(vgetq_lane_u64(row2h,LANE_L64),row2h,LANE_H64);
-  row2h = vsetq_lane_u64(vgetq_lane_u64(t0,LANE_H64),row2h,LANE_L64);
-  row4l = vsetq_lane_u64(vgetq_lane_u64(row4l,LANE_H64),row4l,LANE_L64);
-  row4l = vsetq_lane_u64(vgetq_lane_u64(row4h,LANE_L64),row4l,LANE_H64);
-  row4h = vsetq_lane_u64(vgetq_lane_u64(row4h,LANE_H64),row4h,LANE_L64);
-  row4h = vsetq_lane_u64(vgetq_lane_u64(t1,LANE_L64),row4h,LANE_H64);
-
-  b0 = vsetq_lane_u64(vgetq_lane_u64(m12m13,LANE_H64),b0,LANE_L64);
-  b0 = vsetq_lane_u64(vgetq_lane_u64(m6m7,LANE_H64),b0,LANE_H64);
-  b1 = vsetq_lane_u64(vgetq_lane_u64(m12m13,LANE_L64),b1,LANE_L64);
-  b1 = vsetq_lane_u64(vgetq_lane_u64(m2m3,LANE_H64),b1,LANE_H64);
-  row1l = vaddq_u64(vaddq_u64(row1l, b0), row2l);
-  row1h = vaddq_u64(vaddq_u64(row1h, b1), row2h);
-  row4l = veorq_u64(row4l, row1l);
-  row4h = veorq_u64(row4h, row1h);
-  row4l = veorq_u64(vshrq_n_u64(row4l,32),vshlq_n_u64(row4l,32));
-  row4h = veorq_u64(vshrq_n_u64(row4h,32),vshlq_n_u64(row4h,32));
-  row3l = vaddq_u64(row3l, row4l);
-  row3h = vaddq_u64(row3h, row4h);
-  row2l = veorq_u64(row2l, row3l);
-  row2h = veorq_u64(row2h, row3h);
-  row2l = veorq_u64(vshrq_n_u64(row2l,24),vshlq_n_u64(row2l,40));
-  row2h = veorq_u64(vshrq_n_u64(row2h,24),vshlq_n_u64(row2h,40));
-
-  b0 = vsetq_lane_u64(vgetq_lane_u64(m10m11,LANE_H64),b0,LANE_L64);
-  b0 = vsetq_lane_u64(vgetq_lane_u64(m14m15,LANE_L64),b0,LANE_H64);
-  b1 = vsetq_lane_u64(vgetq_lane_u64(m0m1,LANE_H64),b1,LANE_L64);
-  b1 = vsetq_lane_u64(vgetq_lane_u64(m8m9,LANE_H64),b1,LANE_H64);
-  row1l = vaddq_u64(vaddq_u64(row1l, b0), row2l);
-  row1h = vaddq_u64(vaddq_u64(row1h, b1), row2h);
-  row4l = veorq_u64(row4l, row1l);
-  row4h = veorq_u64(row4h, row1h);
-  row4l = veorq_u64(vshrq_n_u64(row4l,16),vshlq_n_u64(row4l,48));
-  row4h = veorq_u64(vshrq_n_u64(row4h,16),vshlq_n_u64(row4h,48));
-  row3l = vaddq_u64(row3l, row4l);
-  row3h = vaddq_u64(row3h, row4h);
-  row2l = veorq_u64(row2l, row3l);
-  row2h = veorq_u64(row2h, row3h);
-  row2l = veorq_u64(vshrq_n_u64(row2l,63),vshlq_n_u64(row2l,1));
-  row2h = veorq_u64(vshrq_n_u64(row2h,63),vshlq_n_u64(row2h,1));
-
-  t0 = row4l, t1 = row2l, row4l = row3l, row3l = row3h, row3h = row4l;
-  row4l = vsetq_lane_u64(vgetq_lane_u64(row4h,LANE_H64),row4l,LANE_L64);
-  row4l = vsetq_lane_u64(vgetq_lane_u64(t0,LANE_L64),row4l,LANE_H64);
-  row4h = vsetq_lane_u64(vgetq_lane_u64(row4h,LANE_L64),row4h,LANE_H64);
-  row4h = vsetq_lane_u64(vgetq_lane_u64(t0,LANE_H64),row4h,LANE_L64);
-  row2l = vsetq_lane_u64(vgetq_lane_u64(row2l,LANE_H64),row2l,LANE_L64);
-  row2l = vsetq_lane_u64(vgetq_lane_u64(row2h,LANE_L64),row2l,LANE_H64);
-  row2h = vsetq_lane_u64(vgetq_lane_u64(row2h,LANE_H64),row2h,LANE_L64);
-  row2h = vsetq_lane_u64(vgetq_lane_u64(t1,LANE_L64),row2h,LANE_H64);
-
-  b0 = vsetq_lane_u64(vgetq_lane_u64(m4m5,LANE_H64),b0,LANE_L64);
-  b0 = vsetq_lane_u64(vgetq_lane_u64(m14m15,LANE_H64),b0,LANE_H64);
-  b1 = vsetq_lane_u64(vgetq_lane_u64(m8m9,LANE_L64),b1,LANE_L64);
-  b1 = vsetq_lane_u64(vgetq_lane_u64(m2m3,LANE_L64),b1,LANE_H64);
-  row1l = vaddq_u64(vaddq_u64(row1l, b0), row2l);
-  row1h = vaddq_u64(vaddq_u64(row1h, b1), row2h);
-  row4l = veorq_u64(row4l, row1l);
-  row4h = veorq_u64(row4h, row1h);
-  row4l = veorq_u64(vshrq_n_u64(row4l,32),vshlq_n_u64(row4l,32));
-  row4h = veorq_u64(vshrq_n_u64(row4h,32),vshlq_n_u64(row4h,32));
-  row3l = vaddq_u64(row3l, row4l);
-  row3h = vaddq_u64(row3h, row4h);
-  row2l = veorq_u64(row2l, row3l);
-  row2h = veorq_u64(row2h, row3h);
-  row2l = veorq_u64(vshrq_n_u64(row2l,24),vshlq_n_u64(row2l,40));
-  row2h = veorq_u64(vshrq_n_u64(row2h,24),vshlq_n_u64(row2h,40));
-
-  b0 = vsetq_lane_u64(vgetq_lane_u64(m0m1,LANE_L64),b0,LANE_L64);
-  b0 = vsetq_lane_u64(vgetq_lane_u64(m4m5,LANE_L64),b0,LANE_H64);
-  b1 = vsetq_lane_u64(vgetq_lane_u64(m6m7,LANE_L64),b1,LANE_L64);
-  b1 = vsetq_lane_u64(vgetq_lane_u64(m10m11,LANE_L64),b1,LANE_H64);
-  row1l = vaddq_u64(vaddq_u64(row1l, b0), row2l);
-  row1h = vaddq_u64(vaddq_u64(row1h, b1), row2h);
-  row4l = veorq_u64(row4l, row1l);
-  row4h = veorq_u64(row4h, row1h);
-  row4l = veorq_u64(vshrq_n_u64(row4l,16),vshlq_n_u64(row4l,48));
-  row4h = veorq_u64(vshrq_n_u64(row4h,16),vshlq_n_u64(row4h,48));
-  row3l = vaddq_u64(row3l, row4l);
-  row3h = vaddq_u64(row3h, row4h);
-  row2l = veorq_u64(row2l, row3l);
-  row2h = veorq_u64(row2h, row3h);
-  row2l = veorq_u64(vshrq_n_u64(row2l,63),vshlq_n_u64(row2l,1));
-  row2h = veorq_u64(vshrq_n_u64(row2h,63),vshlq_n_u64(row2h,1));
-
-  t0 = row3l, row3l = row3h, row3h = t0, t0 = row2l, t1 = row4l;
-  row2l = vsetq_lane_u64(vgetq_lane_u64(row2l,LANE_L64),row2l,LANE_H64);
-  row2l = vsetq_lane_u64(vgetq_lane_u64(row2h,LANE_H64),row2l,LANE_L64);
-  row2h = vsetq_lane_u64(vgetq_lane_u64(row2h,LANE_L64),row2h,LANE_H64);
-  row2h = vsetq_lane_u64(vgetq_lane_u64(t0,LANE_H64),row2h,LANE_L64);
-  row4l = vsetq_lane_u64(vgetq_lane_u64(row4l,LANE_H64),row4l,LANE_L64);
-  row4l = vsetq_lane_u64(vgetq_lane_u64(row4h,LANE_L64),row4l,LANE_H64);
-  row4h = vsetq_lane_u64(vgetq_lane_u64(row4h,LANE_H64),row4h,LANE_L64);
-  row4h = vsetq_lane_u64(vgetq_lane_u64(t1,LANE_L64),row4h,LANE_H64);
-
-  b0 = vsetq_lane_u64(vgetq_lane_u64(m6m7,LANE_L64),b0,LANE_L64);
-  b0 = vsetq_lane_u64(vgetq_lane_u64(m14m15,LANE_L64),b0,LANE_H64);
-  b1 = vsetq_lane_u64(vgetq_lane_u64(m10m11,LANE_H64),b1,LANE_L64);
-  b1 = vsetq_lane_u64(vgetq_lane_u64(m0m1,LANE_L64),b1,LANE_H64);
-  row1l = vaddq_u64(vaddq_u64(row1l, b0), row2l);
-  row1h = vaddq_u64(vaddq_u64(row1h, b1), row2h);
-  row4l = veorq_u64(row4l, row1l);
-  row4h = veorq_u64(row4h, row1h);
-  row4l = veorq_u64(vshrq_n_u64(row4l,32),vshlq_n_u64(row4l,32));
-  row4h = veorq_u64(vshrq_n_u64(row4h,32),vshlq_n_u64(row4h,32));
-  row3l = vaddq_u64(row3l, row4l);
-  row3h = vaddq_u64(row3h, row4h);
-  row2l = veorq_u64(row2l, row3l);
-  row2h = veorq_u64(row2h, row3h);
-  row2l = veorq_u64(vshrq_n_u64(row2l,24),vshlq_n_u64(row2l,40));
-  row2h = veorq_u64(vshrq_n_u64(row2h,24),vshlq_n_u64(row2h,40));
-
-  b0 = vsetq_lane_u64(vgetq_lane_u64(m14m15,LANE_H64),b0,LANE_L64);
-  b0 = vsetq_lane_u64(vgetq_lane_u64(m8m9,LANE_H64),b0,LANE_H64);
-  b1 = vsetq_lane_u64(vgetq_lane_u64(m2m3,LANE_H64),b1,LANE_L64);
-  b1 = vsetq_lane_u64(vgetq_lane_u64(m8m9,LANE_L64),b1,LANE_H64);
-  row1l = vaddq_u64(vaddq_u64(row1l, b0), row2l);
-  row1h = vaddq_u64(vaddq_u64(row1h, b1), row2h);
-  row4l = veorq_u64(row4l, row1l);
-  row4h = veorq_u64(row4h, row1h);
-  row4l = veorq_u64(vshrq_n_u64(row4l,16),vshlq_n_u64(row4l,48));
-  row4h = veorq_u64(vshrq_n_u64(row4h,16),vshlq_n_u64(row4h,48));
-  row3l = vaddq_u64(row3l, row4l);
-  row3h = vaddq_u64(row3h, row4h);
-  row2l = veorq_u64(row2l, row3l);
-  row2h = veorq_u64(row2h, row3h);
-  row2l = veorq_u64(vshrq_n_u64(row2l,63),vshlq_n_u64(row2l,1));
-  row2h = veorq_u64(vshrq_n_u64(row2h,63),vshlq_n_u64(row2h,1));
-
-  t0 = row4l, t1 = row2l, row4l = row3l, row3l = row3h, row3h = row4l;
-  row4l = vsetq_lane_u64(vgetq_lane_u64(row4h,LANE_H64),row4l,LANE_L64);
-  row4l = vsetq_lane_u64(vgetq_lane_u64(t0,LANE_L64),row4l,LANE_H64);
-  row4h = vsetq_lane_u64(vgetq_lane_u64(row4h,LANE_L64),row4h,LANE_H64);
-  row4h = vsetq_lane_u64(vgetq_lane_u64(t0,LANE_H64),row4h,LANE_L64);
-  row2l = vsetq_lane_u64(vgetq_lane_u64(row2l,LANE_H64),row2l,LANE_L64);
-  row2l = vsetq_lane_u64(vgetq_lane_u64(row2h,LANE_L64),row2l,LANE_H64);
-  row2h = vsetq_lane_u64(vgetq_lane_u64(row2h,LANE_H64),row2h,LANE_L64);
-  row2h = vsetq_lane_u64(vgetq_lane_u64(t1,LANE_L64),row2h,LANE_H64);
-
-  b0 = vsetq_lane_u64(vgetq_lane_u64(m12m13,LANE_L64),b0,LANE_L64);
-  b0 = vsetq_lane_u64(vgetq_lane_u64(m12m13,LANE_H64),b0,LANE_H64);
-  b1 = vsetq_lane_u64(vgetq_lane_u64(m0m1,LANE_H64),b1,LANE_L64);
-  b1 = vsetq_lane_u64(vgetq_lane_u64(m10m11,LANE_L64),b1,LANE_H64);
-  row1l = vaddq_u64(vaddq_u64(row1l, b0), row2l);
-  row1h = vaddq_u64(vaddq_u64(row1h, b1), row2h);
-  row4l = veorq_u64(row4l, row1l);
-  row4h = veorq_u64(row4h, row1h);
-  row4l = veorq_u64(vshrq_n_u64(row4l,32),vshlq_n_u64(row4l,32));
-  row4h = veorq_u64(vshrq_n_u64(row4h,32),vshlq_n_u64(row4h,32));
-  row3l = vaddq_u64(row3l, row4l);
-  row3h = vaddq_u64(row3h, row4h);
-  row2l = veorq_u64(row2l, row3l);
-  row2h = veorq_u64(row2h, row3h);
-  row2l = veorq_u64(vshrq_n_u64(row2l,24),vshlq_n_u64(row2l,40));
-  row2h = veorq_u64(vshrq_n_u64(row2h,24),vshlq_n_u64(row2h,40));
-
-  b0 = vsetq_lane_u64(vgetq_lane_u64(m2m3,LANE_L64),b0,LANE_L64);
-  b0 = vsetq_lane_u64(vgetq_lane_u64(m6m7,LANE_H64),b0,LANE_H64);
-  b1 = vsetq_lane_u64(vgetq_lane_u64(m4m5,LANE_L64),b1,LANE_L64);
-  b1 = vsetq_lane_u64(vgetq_lane_u64(m4m5,LANE_H64),b1,LANE_H64);
-  row1l = vaddq_u64(vaddq_u64(row1l, b0), row2l);
-  row1h = vaddq_u64(vaddq_u64(row1h, b1), row2h);
-  row4l = veorq_u64(row4l, row1l);
-  row4h = veorq_u64(row4h, row1h);
-  row4l = veorq_u64(vshrq_n_u64(row4l,16),vshlq_n_u64(row4l,48));
-  row4h = veorq_u64(vshrq_n_u64(row4h,16),vshlq_n_u64(row4h,48));
-  row3l = vaddq_u64(row3l, row4l);
-  row3h = vaddq_u64(row3h, row4h);
-  row2l = veorq_u64(row2l, row3l);
-  row2h = veorq_u64(row2h, row3h);
-  row2l = veorq_u64(vshrq_n_u64(row2l,63),vshlq_n_u64(row2l,1));
-  row2h = veorq_u64(vshrq_n_u64(row2h,63),vshlq_n_u64(row2h,1));
-
-  t0 = row3l, row3l = row3h, row3h = t0, t0 = row2l, t1 = row4l;
-  row2l = vsetq_lane_u64(vgetq_lane_u64(row2l,LANE_L64),row2l,LANE_H64);
-  row2l = vsetq_lane_u64(vgetq_lane_u64(row2h,LANE_H64),row2l,LANE_L64);
-  row2h = vsetq_lane_u64(vgetq_lane_u64(row2h,LANE_L64),row2h,LANE_H64);
-  row2h = vsetq_lane_u64(vgetq_lane_u64(t0,LANE_H64),row2h,LANE_L64);
-  row4l = vsetq_lane_u64(vgetq_lane_u64(row4l,LANE_H64),row4l,LANE_L64);
-  row4l = vsetq_lane_u64(vgetq_lane_u64(row4h,LANE_L64),row4l,LANE_H64);
-  row4h = vsetq_lane_u64(vgetq_lane_u64(row4h,LANE_H64),row4h,LANE_L64);
-  row4h = vsetq_lane_u64(vgetq_lane_u64(t1,LANE_L64),row4h,LANE_H64);
-
-  b0 = vsetq_lane_u64(vgetq_lane_u64(m10m11,LANE_L64),b0,LANE_L64);
-  b0 = vsetq_lane_u64(vgetq_lane_u64(m8m9,LANE_L64),b0,LANE_H64);
-  b1 = vsetq_lane_u64(vgetq_lane_u64(m6m7,LANE_H64),b1,LANE_L64);
-  b1 = vsetq_lane_u64(vgetq_lane_u64(m0m1,LANE_H64),b1,LANE_H64);
-  row1l = vaddq_u64(vaddq_u64(row1l, b0), row2l);
-  row1h = vaddq_u64(vaddq_u64(row1h, b1), row2h);
-  row4l = veorq_u64(row4l, row1l);
-  row4h = veorq_u64(row4h, row1h);
-  row4l = veorq_u64(vshrq_n_u64(row4l,32),vshlq_n_u64(row4l,32));
-  row4h = veorq_u64(vshrq_n_u64(row4h,32),vshlq_n_u64(row4h,32));
-  row3l = vaddq_u64(row3l, row4l);
-  row3h = vaddq_u64(row3h, row4h);
-  row2l = veorq_u64(row2l, row3l);
-  row2h = veorq_u64(row2h, row3h);
-  row2l = veorq_u64(vshrq_n_u64(row2l,24),vshlq_n_u64(row2l,40));
-  row2h = veorq_u64(vshrq_n_u64(row2h,24),vshlq_n_u64(row2h,40));
-
-  b0 = vsetq_lane_u64(vgetq_lane_u64(m2m3,LANE_L64),b0,LANE_L64);
-  b0 = vsetq_lane_u64(vgetq_lane_u64(m4m5,LANE_L64),b0,LANE_H64);
-  b1 = vsetq_lane_u64(vgetq_lane_u64(m6m7,LANE_L64),b1,LANE_L64);
-  b1 = vsetq_lane_u64(vgetq_lane_u64(m4m5,LANE_H64),b1,LANE_H64);
-  row1l = vaddq_u64(vaddq_u64(row1l, b0), row2l);
-  row1h = vaddq_u64(vaddq_u64(row1h, b1), row2h);
-  row4l = veorq_u64(row4l, row1l);
-  row4h = veorq_u64(row4h, row1h);
-  row4l = veorq_u64(vshrq_n_u64(row4l,16),vshlq_n_u64(row4l,48));
-  row4h = veorq_u64(vshrq_n_u64(row4h,16),vshlq_n_u64(row4h,48));
-  row3l = vaddq_u64(row3l, row4l);
-  row3h = vaddq_u64(row3h, row4h);
-  row2l = veorq_u64(row2l, row3l);
-  row2h = veorq_u64(row2h, row3h);
-  row2l = veorq_u64(vshrq_n_u64(row2l,63),vshlq_n_u64(row2l,1));
-  row2h = veorq_u64(vshrq_n_u64(row2h,63),vshlq_n_u64(row2h,1));
-
-  t0 = row4l, t1 = row2l, row4l = row3l, row3l = row3h, row3h = row4l;
-  row4l = vsetq_lane_u64(vgetq_lane_u64(row4h,LANE_H64),row4l,LANE_L64);
-  row4l = vsetq_lane_u64(vgetq_lane_u64(t0,LANE_L64),row4l,LANE_H64);
-  row4h = vsetq_lane_u64(vgetq_lane_u64(row4h,LANE_L64),row4h,LANE_H64);
-  row4h = vsetq_lane_u64(vgetq_lane_u64(t0,LANE_H64),row4h,LANE_L64);
-  row2l = vsetq_lane_u64(vgetq_lane_u64(row2l,LANE_H64),row2l,LANE_L64);
-  row2l = vsetq_lane_u64(vgetq_lane_u64(row2h,LANE_L64),row2l,LANE_H64);
-  row2h = vsetq_lane_u64(vgetq_lane_u64(row2h,LANE_H64),row2h,LANE_L64);
-  row2h = vsetq_lane_u64(vgetq_lane_u64(t1,LANE_L64),row2h,LANE_H64);
-
-  b0 = vsetq_lane_u64(vgetq_lane_u64(m14m15,LANE_H64),b0,LANE_L64);
-  b0 = vsetq_lane_u64(vgetq_lane_u64(m8m9,LANE_H64),b0,LANE_H64);
-  b1 = vsetq_lane_u64(vgetq_lane_u64(m2m3,LANE_H64),b1,LANE_L64);
-  b1 = vsetq_lane_u64(vgetq_lane_u64(m12m13,LANE_H64),b1,LANE_H64);
-  row1l = vaddq_u64(vaddq_u64(row1l, b0), row2l);
-  row1h = vaddq_u64(vaddq_u64(row1h, b1), row2h);
-  row4l = veorq_u64(row4l, row1l);
-  row4h = veorq_u64(row4h, row1h);
-  row4l = veorq_u64(vshrq_n_u64(row4l,32),vshlq_n_u64(row4l,32));
-  row4h = veorq_u64(vshrq_n_u64(row4h,32),vshlq_n_u64(row4h,32));
-  row3l = vaddq_u64(row3l, row4l);
-  row3h = vaddq_u64(row3h, row4h);
-  row2l = veorq_u64(row2l, row3l);
-  row2h = veorq_u64(row2h, row3h);
-  row2l = veorq_u64(vshrq_n_u64(row2l,24),vshlq_n_u64(row2l,40));
-  row2h = veorq_u64(vshrq_n_u64(row2h,24),vshlq_n_u64(row2h,40));
-
-  b0 = vsetq_lane_u64(vgetq_lane_u64(m10m11,LANE_H64),b0,LANE_L64);
-  b0 = vsetq_lane_u64(vgetq_lane_u64(m14m15,LANE_L64),b0,LANE_H64);
-  b1 = vsetq_lane_u64(vgetq_lane_u64(m12m13,LANE_L64),b1,LANE_L64);
-  b1 = vsetq_lane_u64(vgetq_lane_u64(m0m1,LANE_L64),b1,LANE_H64);
-  row1l = vaddq_u64(vaddq_u64(row1l, b0), row2l);
-  row1h = vaddq_u64(vaddq_u64(row1h, b1), row2h);
-  row4l = veorq_u64(row4l, row1l);
-  row4h = veorq_u64(row4h, row1h);
-  row4l = veorq_u64(vshrq_n_u64(row4l,16),vshlq_n_u64(row4l,48));
-  row4h = veorq_u64(vshrq_n_u64(row4h,16),vshlq_n_u64(row4h,48));
-  row3l = vaddq_u64(row3l, row4l);
-  row3h = vaddq_u64(row3h, row4h);
-  row2l = veorq_u64(row2l, row3l);
-  row2h = veorq_u64(row2h, row3h);
-  row2l = veorq_u64(vshrq_n_u64(row2l,63),vshlq_n_u64(row2l,1));
-  row2h = veorq_u64(vshrq_n_u64(row2h,63),vshlq_n_u64(row2h,1));
-
-  t0 = row3l, row3l = row3h, row3h = t0, t0 = row2l, t1 = row4l;
-  row2l = vsetq_lane_u64(vgetq_lane_u64(row2l,LANE_L64),row2l,LANE_H64);
-  row2l = vsetq_lane_u64(vgetq_lane_u64(row2h,LANE_H64),row2l,LANE_L64);
-  row2h = vsetq_lane_u64(vgetq_lane_u64(row2h,LANE_L64),row2h,LANE_H64);
-  row2h = vsetq_lane_u64(vgetq_lane_u64(t0,LANE_H64),row2h,LANE_L64);
-  row4l = vsetq_lane_u64(vgetq_lane_u64(row4l,LANE_H64),row4l,LANE_L64);
-  row4l = vsetq_lane_u64(vgetq_lane_u64(row4h,LANE_L64),row4l,LANE_H64);
-  row4h = vsetq_lane_u64(vgetq_lane_u64(row4h,LANE_H64),row4h,LANE_L64);
-  row4h = vsetq_lane_u64(vgetq_lane_u64(t1,LANE_L64),row4h,LANE_H64);
-
-  b0 = vsetq_lane_u64(vgetq_lane_u64(m0m1,LANE_L64),b0,LANE_L64);
-  b0 = vsetq_lane_u64(vgetq_lane_u64(m2m3,LANE_L64),b0,LANE_H64);
-  b1 = vsetq_lane_u64(vgetq_lane_u64(m4m5,LANE_L64),b1,LANE_L64);
-  b1 = vsetq_lane_u64(vgetq_lane_u64(m6m7,LANE_L64),b1,LANE_H64);
-  row1l = vaddq_u64(vaddq_u64(row1l, b0), row2l);
-  row1h = vaddq_u64(vaddq_u64(row1h, b1), row2h);
-  row4l = veorq_u64(row4l, row1l);
-  row4h = veorq_u64(row4h, row1h);
-  row4l = veorq_u64(vshrq_n_u64(row4l,32),vshlq_n_u64(row4l,32));
-  row4h = veorq_u64(vshrq_n_u64(row4h,32),vshlq_n_u64(row4h,32));
-  row3l = vaddq_u64(row3l, row4l);
-  row3h = vaddq_u64(row3h, row4h);
-  row2l = veorq_u64(row2l, row3l);
-  row2h = veorq_u64(row2h, row3h);
-  row2l = veorq_u64(vshrq_n_u64(row2l,24),vshlq_n_u64(row2l,40));
-  row2h = veorq_u64(vshrq_n_u64(row2h,24),vshlq_n_u64(row2h,40));
-
-  b0 = vsetq_lane_u64(vgetq_lane_u64(m0m1,LANE_H64),b0,LANE_L64);
-  b0 = vsetq_lane_u64(vgetq_lane_u64(m2m3,LANE_H64),b0,LANE_H64);
-  b1 = vsetq_lane_u64(vgetq_lane_u64(m4m5,LANE_H64),b1,LANE_L64);
-  b1 = vsetq_lane_u64(vgetq_lane_u64(m6m7,LANE_H64),b1,LANE_H64);
-  row1l = vaddq_u64(vaddq_u64(row1l, b0), row2l);
-  row1h = vaddq_u64(vaddq_u64(row1h, b1), row2h);
-  row4l = veorq_u64(row4l, row1l);
-  row4h = veorq_u64(row4h, row1h);
-  row4l = veorq_u64(vshrq_n_u64(row4l,16),vshlq_n_u64(row4l,48));
-  row4h = veorq_u64(vshrq_n_u64(row4h,16),vshlq_n_u64(row4h,48));
-  row3l = vaddq_u64(row3l, row4l);
-  row3h = vaddq_u64(row3h, row4h);
-  row2l = veorq_u64(row2l, row3l);
-  row2h = veorq_u64(row2h, row3h);
-  row2l = veorq_u64(vshrq_n_u64(row2l,63),vshlq_n_u64(row2l,1));
-  row2h = veorq_u64(vshrq_n_u64(row2h,63),vshlq_n_u64(row2h,1));
-
-  t0 = row4l, t1 = row2l, row4l = row3l, row3l = row3h, row3h = row4l;
-  row4l = vsetq_lane_u64(vgetq_lane_u64(row4h,LANE_H64),row4l,LANE_L64);
-  row4l = vsetq_lane_u64(vgetq_lane_u64(t0,LANE_L64),row4l,LANE_H64);
-  row4h = vsetq_lane_u64(vgetq_lane_u64(row4h,LANE_L64),row4h,LANE_H64);
-  row4h = vsetq_lane_u64(vgetq_lane_u64(t0,LANE_H64),row4h,LANE_L64);
-  row2l = vsetq_lane_u64(vgetq_lane_u64(row2l,LANE_H64),row2l,LANE_L64);
-  row2l = vsetq_lane_u64(vgetq_lane_u64(row2h,LANE_L64),row2l,LANE_H64);
-  row2h = vsetq_lane_u64(vgetq_lane_u64(row2h,LANE_H64),row2h,LANE_L64);
-  row2h = vsetq_lane_u64(vgetq_lane_u64(t1,LANE_L64),row2h,LANE_H64);
-
-  b0 = vsetq_lane_u64(vgetq_lane_u64(m8m9,LANE_L64),b0,LANE_L64);
-  b0 = vsetq_lane_u64(vgetq_lane_u64(m10m11,LANE_L64),b0,LANE_H64);
-  b1 = vsetq_lane_u64(vgetq_lane_u64(m12m13,LANE_L64),b1,LANE_L64);
-  b1 = vsetq_lane_u64(vgetq_lane_u64(m14m15,LANE_L64),b1,LANE_H64);
-  row1l = vaddq_u64(vaddq_u64(row1l, b0), row2l);
-  row1h = vaddq_u64(vaddq_u64(row1h, b1), row2h);
-  row4l = veorq_u64(row4l, row1l);
-  row4h = veorq_u64(row4h, row1h);
-  row4l = veorq_u64(vshrq_n_u64(row4l,32),vshlq_n_u64(row4l,32));
-  row4h = veorq_u64(vshrq_n_u64(row4h,32),vshlq_n_u64(row4h,32));
-  row3l = vaddq_u64(row3l, row4l);
-  row3h = vaddq_u64(row3h, row4h);
-  row2l = veorq_u64(row2l, row3l);
-  row2h = veorq_u64(row2h, row3h);
-  row2l = veorq_u64(vshrq_n_u64(row2l,24),vshlq_n_u64(row2l,40));
-  row2h = veorq_u64(vshrq_n_u64(row2h,24),vshlq_n_u64(row2h,40));
-
-  b0 = vsetq_lane_u64(vgetq_lane_u64(m8m9,LANE_H64),b0,LANE_L64);
-  b0 = vsetq_lane_u64(vgetq_lane_u64(m10m11,LANE_H64),b0,LANE_H64);
-  b1 = vsetq_lane_u64(vgetq_lane_u64(m12m13,LANE_H64),b1,LANE_L64);
-  b1 = vsetq_lane_u64(vgetq_lane_u64(m14m15,LANE_H64),b1,LANE_H64);
-  row1l = vaddq_u64(vaddq_u64(row1l, b0), row2l);
-  row1h = vaddq_u64(vaddq_u64(row1h, b1), row2h);
-  row4l = veorq_u64(row4l, row1l);
-  row4h = veorq_u64(row4h, row1h);
-  row4l = veorq_u64(vshrq_n_u64(row4l,16),vshlq_n_u64(row4l,48));
-  row4h = veorq_u64(vshrq_n_u64(row4h,16),vshlq_n_u64(row4h,48));
-  row3l = vaddq_u64(row3l, row4l);
-  row3h = vaddq_u64(row3h, row4h);
-  row2l = veorq_u64(row2l, row3l);
-  row2h = veorq_u64(row2h, row3h);
-  row2l = veorq_u64(vshrq_n_u64(row2l,63),vshlq_n_u64(row2l,1));
-  row2h = veorq_u64(vshrq_n_u64(row2h,63),vshlq_n_u64(row2h,1));
-
-  t0 = row3l, row3l = row3h, row3h = t0, t0 = row2l, t1 = row4l;
-  row2l = vsetq_lane_u64(vgetq_lane_u64(row2l,LANE_L64),row2l,LANE_H64);
-  row2l = vsetq_lane_u64(vgetq_lane_u64(row2h,LANE_H64),row2l,LANE_L64);
-  row2h = vsetq_lane_u64(vgetq_lane_u64(row2h,LANE_L64),row2h,LANE_H64);
-  row2h = vsetq_lane_u64(vgetq_lane_u64(t0,LANE_H64),row2h,LANE_L64);
-  row4l = vsetq_lane_u64(vgetq_lane_u64(row4l,LANE_H64),row4l,LANE_L64);
-  row4l = vsetq_lane_u64(vgetq_lane_u64(row4h,LANE_L64),row4l,LANE_H64);
-  row4h = vsetq_lane_u64(vgetq_lane_u64(row4h,LANE_H64),row4h,LANE_L64);
-  row4h = vsetq_lane_u64(vgetq_lane_u64(t1,LANE_L64),row4h,LANE_H64);
-
-  b0 = vsetq_lane_u64(vgetq_lane_u64(m14m15,LANE_L64),b0,LANE_L64);
-  b0 = vsetq_lane_u64(vgetq_lane_u64(m4m5,LANE_L64),b0,LANE_H64);
-  b1 = vsetq_lane_u64(vgetq_lane_u64(m8m9,LANE_H64),b1,LANE_L64);
-  b1 = vsetq_lane_u64(vgetq_lane_u64(m12m13,LANE_H64),b1,LANE_H64);
-  row1l = vaddq_u64(vaddq_u64(row1l, b0), row2l);
-  row1h = vaddq_u64(vaddq_u64(row1h, b1), row2h);
-  row4l = veorq_u64(row4l, row1l);
-  row4h = veorq_u64(row4h, row1h);
-  row4l = veorq_u64(vshrq_n_u64(row4l,32),vshlq_n_u64(row4l,32));
-  row4h = veorq_u64(vshrq_n_u64(row4h,32),vshlq_n_u64(row4h,32));
-  row3l = vaddq_u64(row3l, row4l);
-  row3h = vaddq_u64(row3h, row4h);
-  row2l = veorq_u64(row2l, row3l);
-  row2h = veorq_u64(row2h, row3h);
-  row2l = veorq_u64(vshrq_n_u64(row2l,24),vshlq_n_u64(row2l,40));
-  row2h = veorq_u64(vshrq_n_u64(row2h,24),vshlq_n_u64(row2h,40));
-
-  b0 = vsetq_lane_u64(vgetq_lane_u64(m10m11,LANE_L64),b0,LANE_L64);
-  b0 = vsetq_lane_u64(vgetq_lane_u64(m8m9,LANE_L64),b0,LANE_H64);
-  b1 = vsetq_lane_u64(vgetq_lane_u64(m14m15,LANE_H64),b1,LANE_L64);
-  b1 = vsetq_lane_u64(vgetq_lane_u64(m6m7,LANE_L64),b1,LANE_H64);
-  row1l = vaddq_u64(vaddq_u64(row1l, b0), row2l);
-  row1h = vaddq_u64(vaddq_u64(row1h, b1), row2h);
-  row4l = veorq_u64(row4l, row1l);
-  row4h = veorq_u64(row4h, row1h);
-  row4l = veorq_u64(vshrq_n_u64(row4l,16),vshlq_n_u64(row4l,48));
-  row4h = veorq_u64(vshrq_n_u64(row4h,16),vshlq_n_u64(row4h,48));
-  row3l = vaddq_u64(row3l, row4l);
-  row3h = vaddq_u64(row3h, row4h);
-  row2l = veorq_u64(row2l, row3l);
-  row2h = veorq_u64(row2h, row3h);
-  row2l = veorq_u64(vshrq_n_u64(row2l,63),vshlq_n_u64(row2l,1));
-  row2h = veorq_u64(vshrq_n_u64(row2h,63),vshlq_n_u64(row2h,1));
-
-  t0 = row4l, t1 = row2l, row4l = row3l, row3l = row3h, row3h = row4l;
-  row4l = vsetq_lane_u64(vgetq_lane_u64(row4h,LANE_H64),row4l,LANE_L64);
-  row4l = vsetq_lane_u64(vgetq_lane_u64(t0,LANE_L64),row4l,LANE_H64);
-  row4h = vsetq_lane_u64(vgetq_lane_u64(row4h,LANE_L64),row4h,LANE_H64);
-  row4h = vsetq_lane_u64(vgetq_lane_u64(t0,LANE_H64),row4h,LANE_L64);
-  row2l = vsetq_lane_u64(vgetq_lane_u64(row2l,LANE_H64),row2l,LANE_L64);
-  row2l = vsetq_lane_u64(vgetq_lane_u64(row2h,LANE_L64),row2l,LANE_H64);
-  row2h = vsetq_lane_u64(vgetq_lane_u64(row2h,LANE_H64),row2h,LANE_L64);
-  row2h = vsetq_lane_u64(vgetq_lane_u64(t1,LANE_L64),row2h,LANE_H64);
-
-  b0 = vsetq_lane_u64(vgetq_lane_u64(m0m1,LANE_H64),b0,LANE_L64);
-  b0 = vsetq_lane_u64(vgetq_lane_u64(m0m1,LANE_L64),b0,LANE_H64);
-  b1 = vsetq_lane_u64(vgetq_lane_u64(m10m11,LANE_H64),b1,LANE_L64);
-  b1 = vsetq_lane_u64(vgetq_lane_u64(m4m5,LANE_H64),b1,LANE_H64);
-  row1l = vaddq_u64(vaddq_u64(row1l, b0), row2l);
-  row1h = vaddq_u64(vaddq_u64(row1h, b1), row2h);
-  row4l = veorq_u64(row4l, row1l);
-  row4h = veorq_u64(row4h, row1h);
-  row4l = veorq_u64(vshrq_n_u64(row4l,32),vshlq_n_u64(row4l,32));
-  row4h = veorq_u64(vshrq_n_u64(row4h,32),vshlq_n_u64(row4h,32));
-  row3l = vaddq_u64(row3l, row4l);
-  row3h = vaddq_u64(row3h, row4h);
-  row2l = veorq_u64(row2l, row3l);
-  row2h = veorq_u64(row2h, row3h);
-  row2l = veorq_u64(vshrq_n_u64(row2l,24),vshlq_n_u64(row2l,40));
-  row2h = veorq_u64(vshrq_n_u64(row2h,24),vshlq_n_u64(row2h,40));
-
-  b0 = vsetq_lane_u64(vgetq_lane_u64(m12m13,LANE_L64),b0,LANE_L64);
-  b0 = vsetq_lane_u64(vgetq_lane_u64(m2m3,LANE_L64),b0,LANE_H64);
-  b1 = vsetq_lane_u64(vgetq_lane_u64(m6m7,LANE_H64),b1,LANE_L64);
-  b1 = vsetq_lane_u64(vgetq_lane_u64(m2m3,LANE_H64),b1,LANE_H64);
-  row1l = vaddq_u64(vaddq_u64(row1l, b0), row2l);
-  row1h = vaddq_u64(vaddq_u64(row1h, b1), row2h);
-  row4l = veorq_u64(row4l, row1l);
-  row4h = veorq_u64(row4h, row1h);
-  row4l = veorq_u64(vshrq_n_u64(row4l,16),vshlq_n_u64(row4l,48));
-  row4h = veorq_u64(vshrq_n_u64(row4h,16),vshlq_n_u64(row4h,48));
-  row3l = vaddq_u64(row3l, row4l);
-  row3h = vaddq_u64(row3h, row4h);
-  row2l = veorq_u64(row2l, row3l);
-  row2h = veorq_u64(row2h, row3h);
-  row2l = veorq_u64(vshrq_n_u64(row2l,63),vshlq_n_u64(row2l,1));
-  row2h = veorq_u64(vshrq_n_u64(row2h,63),vshlq_n_u64(row2h,1));
-
-  t0 = row3l, row3l = row3h, row3h = t0, t0 = row2l, t1 = row4l;
-  row2l = vsetq_lane_u64(vgetq_lane_u64(row2l,LANE_L64),row2l,LANE_H64);
-  row2l = vsetq_lane_u64(vgetq_lane_u64(row2h,LANE_H64),row2l,LANE_L64);
-  row2h = vsetq_lane_u64(vgetq_lane_u64(row2h,LANE_L64),row2h,LANE_H64);
-  row2h = vsetq_lane_u64(vgetq_lane_u64(t0,LANE_H64),row2h,LANE_L64);
-  row4l = vsetq_lane_u64(vgetq_lane_u64(row4l,LANE_H64),row4l,LANE_L64);
-  row4l = vsetq_lane_u64(vgetq_lane_u64(row4h,LANE_L64),row4l,LANE_H64);
-  row4h = vsetq_lane_u64(vgetq_lane_u64(row4h,LANE_H64),row4h,LANE_L64);
-  row4h = vsetq_lane_u64(vgetq_lane_u64(t1,LANE_L64),row4h,LANE_H64);
-
-  row1l = veorq_u64(row3l, row1l);
-  row1h = veorq_u64(row3h, row1h);
-  vst1q_u64((uint64_t*)&state.h[0], veorq_u64(vld1q_u64((const uint64_t*)&state.h[0]), row1l));
-  vst1q_u64((uint64_t*)&state.h[2], veorq_u64(vld1q_u64((const uint64_t*)&state.h[2]), row1h));
-
-  row2l = veorq_u64(row4l, row2l);
-  row2h = veorq_u64(row4h, row2h);
-  vst1q_u64((uint64_t*)&state.h[4], veorq_u64(vld1q_u64((const uint64_t*)&state.h[4]), row2l));
-  vst1q_u64((uint64_t*)&state.h[6], veorq_u64(vld1q_u64((const uint64_t*)&state.h[6]), row2h));
+    #undef LOAD_MSG_7_2
+    #define LOAD_MSG_7_2(b0, b1) \
+    do { b0 = vextq_u64(m5, m7, 1); b1 = vcombine_u64(vget_high_u64(m0), vget_high_u64(m4)); } while(0)
+
+    #undef LOAD_MSG_7_3
+    #define LOAD_MSG_7_3(b0, b1) \
+    do { b0 = vcombine_u64(vget_high_u64(m2), vget_high_u64(m7)); b1 = vcombine_u64(vget_low_u64(m4), vget_low_u64(m1)); } while(0)
+
+    #undef LOAD_MSG_7_4
+    #define LOAD_MSG_7_4(b0, b1) \
+    do { b0 = vcombine_u64(vget_low_u64(m0), vget_low_u64(m2)); b1 = vcombine_u64(vget_low_u64(m3), vget_low_u64(m5)); } while(0)
+
+    #undef LOAD_MSG_8_1
+    #define LOAD_MSG_8_1(b0, b1) \
+    do { b0 = vcombine_u64(vget_low_u64(m3), vget_low_u64(m7)); b1 = vextq_u64(m5, m0, 1); } while(0)
+
+    #undef LOAD_MSG_8_2
+    #define LOAD_MSG_8_2(b0, b1) \
+    do { b0 = vcombine_u64(vget_high_u64(m7), vget_high_u64(m4)); b1 = vextq_u64(m1, m4, 1); } while(0)
+
+    #undef LOAD_MSG_8_3
+    #define LOAD_MSG_8_3(b0, b1) \
+    do { b0 = m6; b1 = vextq_u64(m0, m5, 1); } while(0)
+
+    #undef LOAD_MSG_8_4
+    #define LOAD_MSG_8_4(b0, b1) \
+    do { b0 = vcombine_u64(vget_low_u64(m1), vget_high_u64(m3)); b1 = m2; } while(0)
+
+    #undef LOAD_MSG_9_1
+    #define LOAD_MSG_9_1(b0, b1) \
+    do { b0 = vcombine_u64(vget_low_u64(m5), vget_low_u64(m4)); b1 = vcombine_u64(vget_high_u64(m3), vget_high_u64(m0)); } while(0)
+
+    #undef LOAD_MSG_9_2
+    #define LOAD_MSG_9_2(b0, b1) \
+    do { b0 = vcombine_u64(vget_low_u64(m1), vget_low_u64(m2)); b1 = vcombine_u64(vget_low_u64(m3), vget_high_u64(m2)); } while(0)
+
+    #undef LOAD_MSG_9_3
+    #define LOAD_MSG_9_3(b0, b1) \
+    do { b0 = vcombine_u64(vget_high_u64(m7), vget_high_u64(m4)); b1 = vcombine_u64(vget_high_u64(m1), vget_high_u64(m6)); } while(0)
+
+    #undef LOAD_MSG_9_4
+    #define LOAD_MSG_9_4(b0, b1) \
+    do { b0 = vextq_u64(m5, m7, 1); b1 = vcombine_u64(vget_low_u64(m6), vget_low_u64(m0)); } while(0)
+
+    #undef LOAD_MSG_10_1
+    #define LOAD_MSG_10_1(b0, b1) \
+    do { b0 = vcombine_u64(vget_low_u64(m0), vget_low_u64(m1)); b1 = vcombine_u64(vget_low_u64(m2), vget_low_u64(m3)); } while(0)
+
+    #undef LOAD_MSG_10_2
+    #define LOAD_MSG_10_2(b0, b1) \
+    do { b0 = vcombine_u64(vget_high_u64(m0), vget_high_u64(m1)); b1 = vcombine_u64(vget_high_u64(m2), vget_high_u64(m3)); } while(0)
+
+    #undef LOAD_MSG_10_3
+    #define LOAD_MSG_10_3(b0, b1) \
+    do { b0 = vcombine_u64(vget_low_u64(m4), vget_low_u64(m5)); b1 = vcombine_u64(vget_low_u64(m6), vget_low_u64(m7)); } while(0)
+
+    #undef LOAD_MSG_10_4
+    #define LOAD_MSG_10_4(b0, b1) \
+    do { b0 = vcombine_u64(vget_high_u64(m4), vget_high_u64(m5)); b1 = vcombine_u64(vget_high_u64(m6), vget_high_u64(m7)); } while(0)
+
+    #undef LOAD_MSG_11_1
+    #define LOAD_MSG_11_1(b0, b1) \
+    do { b0 = vcombine_u64(vget_low_u64(m7), vget_low_u64(m2)); b1 = vcombine_u64(vget_high_u64(m4), vget_high_u64(m6)); } while(0)
+
+    #undef LOAD_MSG_11_2
+    #define LOAD_MSG_11_2(b0, b1) \
+    do { b0 = vcombine_u64(vget_low_u64(m5), vget_low_u64(m4)); b1 = vextq_u64(m7, m3, 1); } while(0)
+
+    #undef LOAD_MSG_11_3
+    #define LOAD_MSG_11_3(b0, b1) \
+    do { b0 = vextq_u64(m0, m0, 1); b1 = vcombine_u64(vget_high_u64(m5), vget_high_u64(m2)); } while(0)
+
+    #undef LOAD_MSG_11_4
+    #define LOAD_MSG_11_4(b0, b1) \
+    do { b0 = vcombine_u64(vget_low_u64(m6), vget_low_u64(m1)); b1 = vcombine_u64(vget_high_u64(m3), vget_high_u64(m1)); } while(0)
+
+    #define vrorq_n_u64_32(x) vreinterpretq_u64_u32(vrev64q_u32(vreinterpretq_u32_u64((x))))
+
+    #define vrorq_n_u64_24(x) vcombine_u64(\
+        vreinterpret_u64_u8(vext_u8(vreinterpret_u8_u64(vget_low_u64(x)), vreinterpret_u8_u64(vget_low_u64(x)), 3)), \
+        vreinterpret_u64_u8(vext_u8(vreinterpret_u8_u64(vget_high_u64(x)), vreinterpret_u8_u64(vget_high_u64(x)), 3)))
+
+    #define vrorq_n_u64_16(x) vcombine_u64(\
+        vreinterpret_u64_u8(vext_u8(vreinterpret_u8_u64(vget_low_u64(x)), vreinterpret_u8_u64(vget_low_u64(x)), 2)), \
+        vreinterpret_u64_u8(vext_u8(vreinterpret_u8_u64(vget_high_u64(x)), vreinterpret_u8_u64(vget_high_u64(x)), 2)))
+
+    #define vrorq_n_u64_63(x) veorq_u64(vaddq_u64(x, x), vshrq_n_u64(x, 63))
+
+    #undef BLAKE2_G1
+    #define BLAKE2_G1(row1l,row2l,row3l,row4l,row1h,row2h,row3h,row4h,b0,b1) \
+    do { \
+      row1l = vaddq_u64(vaddq_u64(row1l, b0), row2l); \
+      row1h = vaddq_u64(vaddq_u64(row1h, b1), row2h); \
+      row4l = veorq_u64(row4l, row1l); row4h = veorq_u64(row4h, row1h); \
+      row4l = vrorq_n_u64_32(row4l); row4h = vrorq_n_u64_32(row4h); \
+      row3l = vaddq_u64(row3l, row4l); row3h = vaddq_u64(row3h, row4h); \
+      row2l = veorq_u64(row2l, row3l); row2h = veorq_u64(row2h, row3h); \
+      row2l = vrorq_n_u64_24(row2l); row2h = vrorq_n_u64_24(row2h); \
+    } while(0)
+
+    #undef BLAKE2_G2
+    #define BLAKE2_G2(row1l,row2l,row3l,row4l,row1h,row2h,row3h,row4h,b0,b1) \
+    do { \
+      row1l = vaddq_u64(vaddq_u64(row1l, b0), row2l); \
+      row1h = vaddq_u64(vaddq_u64(row1h, b1), row2h); \
+      row4l = veorq_u64(row4l, row1l); row4h = veorq_u64(row4h, row1h); \
+      row4l = vrorq_n_u64_16(row4l); row4h = vrorq_n_u64_16(row4h); \
+      row3l = vaddq_u64(row3l, row4l); row3h = vaddq_u64(row3h, row4h); \
+      row2l = veorq_u64(row2l, row3l); row2h = veorq_u64(row2h, row3h); \
+      row2l = vrorq_n_u64_63(row2l); row2h = vrorq_n_u64_63(row2h); \
+    } while(0)
+
+	#undef DIAGONALIZE
+    #define DIAGONALIZE(row1l,row2l,row3l,row4l,row1h,row2h,row3h,row4h) \
+    do { \
+      uint64x2_t t0 = vextq_u64(row2l, row2h, 1); \
+      uint64x2_t t1 = vextq_u64(row2h, row2l, 1); \
+      row2l = t0; row2h = t1; t0 = row3l;  row3l = row3h; row3h = t0; \
+      t0 = vextq_u64(row4h, row4l, 1); t1 = vextq_u64(row4l, row4h, 1); \
+      row4l = t0; row4h = t1; \
+    } while(0)
+
+	#undef UNDIAGONALIZE
+    #define UNDIAGONALIZE(row1l,row2l,row3l,row4l,row1h,row2h,row3h,row4h) \
+    do { \
+      uint64x2_t t0 = vextq_u64(row2h, row2l, 1); \
+      uint64x2_t t1 = vextq_u64(row2l, row2h, 1); \
+      row2l = t0; row2h = t1; t0 = row3l; row3l = row3h; row3h = t0; \
+      t0 = vextq_u64(row4l, row4h, 1); t1 = vextq_u64(row4h, row4l, 1); \
+      row4l = t0; row4h = t1; \
+    } while(0)
+
+    #undef BLAKE2B_ROUND
+    #define BLAKE2B_ROUND(r) \
+    do { \
+      uint64x2_t b0, b1; \
+      LOAD_MSG_ ##r ##_1(b0, b1); \
+      BLAKE2_G1(row1l,row2l,row3l,row4l,row1h,row2h,row3h,row4h,b0,b1); \
+      LOAD_MSG_ ##r ##_2(b0, b1); \
+      BLAKE2_G2(row1l,row2l,row3l,row4l,row1h,row2h,row3h,row4h,b0,b1); \
+      DIAGONALIZE(row1l,row2l,row3l,row4l,row1h,row2h,row3h,row4h); \
+      LOAD_MSG_ ##r ##_3(b0, b1); \
+      BLAKE2_G1(row1l,row2l,row3l,row4l,row1h,row2h,row3h,row4h,b0,b1); \
+      LOAD_MSG_ ##r ##_4(b0, b1); \
+      BLAKE2_G2(row1l,row2l,row3l,row4l,row1h,row2h,row3h,row4h,b0,b1); \
+      UNDIAGONALIZE(row1l,row2l,row3l,row4l,row1h,row2h,row3h,row4h); \
+    } while(0)
+
+    CRYPTOPP_ASSERT(IsAlignedOn(&state.h[0],GetAlignmentOf<uint64x2_t>()));
+    CRYPTOPP_ASSERT(IsAlignedOn(&state.t[0],GetAlignmentOf<uint64x2_t>()));
+    CRYPTOPP_ASSERT(IsAlignedOn(&state.f[0],GetAlignmentOf<uint64x2_t>()));
+
+    const uint64x2_t m0 = vreinterpretq_u64_u8(vld1q_u8(input +  00));
+    const uint64x2_t m1 = vreinterpretq_u64_u8(vld1q_u8(input +  16));
+    const uint64x2_t m2 = vreinterpretq_u64_u8(vld1q_u8(input +  32));
+    const uint64x2_t m3 = vreinterpretq_u64_u8(vld1q_u8(input +  48));
+    const uint64x2_t m4 = vreinterpretq_u64_u8(vld1q_u8(input +  64));
+    const uint64x2_t m5 = vreinterpretq_u64_u8(vld1q_u8(input +  80));
+    const uint64x2_t m6 = vreinterpretq_u64_u8(vld1q_u8(input +  96));
+    const uint64x2_t m7 = vreinterpretq_u64_u8(vld1q_u8(input + 112));
+
+    uint64x2_t row1l, row1h, row2l, row2h;
+    uint64x2_t row3l, row3h, row4l, row4h;
+
+    const uint64x2_t h0 = row1l = vld1q_u64(&state.h[0]);
+    const uint64x2_t h1 = row1h = vld1q_u64(&state.h[2]);
+    const uint64x2_t h2 = row2l = vld1q_u64(&state.h[4]);
+    const uint64x2_t h3 = row2h = vld1q_u64(&state.h[6]);
+
+    row3l = vld1q_u64(&BLAKE2B_IV(0));
+    row3h = vld1q_u64(&BLAKE2B_IV(2));
+    row4l = veorq_u64(vld1q_u64(&BLAKE2B_IV(4)), vld1q_u64(&state.t[0]));
+    row4h = veorq_u64(vld1q_u64(&BLAKE2B_IV(6)), vld1q_u64(&state.f[0]));
+
+    BLAKE2B_ROUND(0);
+    BLAKE2B_ROUND(1);
+    BLAKE2B_ROUND(2);
+    BLAKE2B_ROUND(3);
+    BLAKE2B_ROUND(4);
+    BLAKE2B_ROUND(5);
+    BLAKE2B_ROUND(6);
+    BLAKE2B_ROUND(7);
+    BLAKE2B_ROUND(8);
+    BLAKE2B_ROUND(9);
+    BLAKE2B_ROUND(10);
+    BLAKE2B_ROUND(11);
+
+    vst1q_u64(&state.h[0], veorq_u64(h0, veorq_u64(row1l, row3l)));
+    vst1q_u64(&state.h[2], veorq_u64(h1, veorq_u64(row1h, row3h)));
+    vst1q_u64(&state.h[4], veorq_u64(h2, veorq_u64(row2l, row4l)));
+    vst1q_u64(&state.h[6], veorq_u64(h3, veorq_u64(row2h, row4h)));
 }
-#endif  // CRYPTOPP_BOOL_NEON_INTRINSICS_AVAILABLE
+#endif  // CRYPTOPP_BOOL_ARM32 && CRYPTOPP_BOOL_NEON_INTRINSICS_AVAILABLE
 
 template class BLAKE2_Base<word32, false>;
 template class BLAKE2_Base<word64, true>;