Cleared crash with GCC 4.8 and above and -O3. In a nutshell, it was due to vectorization and alignment violations agains the vmovdqa instruction

reviewable/pr7/r1
Jeffrey Walton 2015-07-13 22:53:16 -04:00
parent e78b8fe1df
commit 9bf0eed0f6
6 changed files with 62 additions and 9 deletions

View File

@ -1,6 +1,6 @@
CXXFLAGS ?= -DNDEBUG CXXFLAGS ?= -DNDEBUG
SYMBOLS ?= -g2 SYMBOLS ?= -g2
OPTIMIZE ?= -O2 OPTIMIZE ?= -O3
# -fPIC is supported, and enabled by default for x86_64. # -fPIC is supported, and enabled by default for x86_64.
# the following options reduce code size, but breaks link or makes link very slow on some systems # the following options reduce code size, but breaks link or makes link very slow on some systems
# CXXFLAGS += -ffunction-sections -fdata-sections # CXXFLAGS += -ffunction-sections -fdata-sections
@ -64,7 +64,6 @@ endif
# We can do integer math using the Posix shell in a GNUmakefile # We can do integer math using the Posix shell in a GNUmakefile
# Below, we are building a boolean circuit that says "Darwin && (GCC 4.2 || Clang)" # Below, we are building a boolean circuit that says "Darwin && (GCC 4.2 || Clang)"
MULTIARCH_SUPPORT = $(shell echo $$(($(IS_DARWIN) * ($(GCC42_OR_LATER) + $(CLANG_COMPILER))))) MULTIARCH_SUPPORT = $(shell echo $$(($(IS_DARWIN) * ($(GCC42_OR_LATER) + $(CLANG_COMPILER)))))
ifneq ($(MULTIARCH_SUPPORT),0) ifneq ($(MULTIARCH_SUPPORT),0)
CXXFLAGS += -arch x86_64 -arch i386 CXXFLAGS += -arch x86_64 -arch i386
else else

View File

@ -23,6 +23,11 @@
// This macro will be ignored if NO_OS_DEPENDENCE is defined. // This macro will be ignored if NO_OS_DEPENDENCE is defined.
#define USE_MS_CRYPTOAPI #define USE_MS_CRYPTOAPI
// Define this to ensure C/C++ standard compliance and adherence
// to aliasing rules and other alignment fodder. If you experience
// a break at -O3 with GCC, you should try this first.
// #define CRYPTOPP_NO_UNALIGNED_DATA_ACCESS
// ***************** Less Important Settings *************** // ***************** Less Important Settings ***************
// define this to retain (as much as possible) old deprecated function and class names // define this to retain (as much as possible) old deprecated function and class names
@ -342,7 +347,8 @@ NAMESPACE_END
#define CRYPTOPP_BOOL_X86 0 #define CRYPTOPP_BOOL_X86 0
#endif #endif
#if CRYPTOPP_BOOL_X64 || CRYPTOPP_BOOL_X86 || defined(__powerpc__) // CRYPTOPP_NO_UNALIGNED_DATA_ACCESS can be set on the command line or in config.h above.
#if !defined(CRYPTOPP_NO_UNALIGNED_DATA_ACCESS) && (CRYPTOPP_BOOL_X64 || CRYPTOPP_BOOL_X86 || defined(__powerpc__))
#define CRYPTOPP_ALLOW_UNALIGNED_DATA_ACCESS #define CRYPTOPP_ALLOW_UNALIGNED_DATA_ACCESS
#endif #endif

View File

@ -14,14 +14,20 @@
NAMESPACE_BEGIN(CryptoPP) NAMESPACE_BEGIN(CryptoPP)
// Vectorization at -O3 requires IsStrictAligned<word64> for GCC 4.8 and above with xorbuf and VerifyBufsEqual.
// Problems have not been experienced for the word32 variant, but it may aoccur in the future.
void xorbuf(byte *buf, const byte *mask, size_t count) void xorbuf(byte *buf, const byte *mask, size_t count)
{ {
size_t i; size_t i;
if (IsAligned<word32>(buf) && IsAligned<word32>(mask)) if (IsAligned<word32>(buf) && IsAligned<word32>(mask))
{ {
if (!CRYPTOPP_BOOL_SLOW_WORD64 && IsAligned<word64>(buf) && IsAligned<word64>(mask)) if (!CRYPTOPP_BOOL_SLOW_WORD64 && IsStrictAligned<word64>(buf) && IsStrictAligned<word64>(mask))
{ {
assert(IsAlignedOn(input, GetStrictAlignedOn<word64>(buf)));
assert(IsAlignedOn(mask, GetStrictAlignedOn<word64>(mask)));
for (i=0; i<count/8; i++) for (i=0; i<count/8; i++)
((word64*)buf)[i] ^= ((word64*)mask)[i]; ((word64*)buf)[i] ^= ((word64*)mask)[i];
count -= 8*i; count -= 8*i;
@ -50,8 +56,12 @@ void xorbuf(byte *output, const byte *input, const byte *mask, size_t count)
if (IsAligned<word32>(output) && IsAligned<word32>(input) && IsAligned<word32>(mask)) if (IsAligned<word32>(output) && IsAligned<word32>(input) && IsAligned<word32>(mask))
{ {
if (!CRYPTOPP_BOOL_SLOW_WORD64 && IsAligned<word64>(output) && IsAligned<word64>(input) && IsAligned<word64>(mask)) if (!CRYPTOPP_BOOL_SLOW_WORD64 && IsStrictAligned<word64>(output) && IsStrictAligned<word64>(input) && IsStrictAligned<word64>(mask))
{ {
assert(IsAlignedOn(output, GetStrictAlignedOn<word64>(output)));
assert(IsAlignedOn(input, GetStrictAlignedOn<word64>(input)));
assert(IsAlignedOn(mask, GetStrictAlignedOn<word64>(mask)));
for (i=0; i<count/8; i++) for (i=0; i<count/8; i++)
((word64*)output)[i] = ((word64*)input)[i] ^ ((word64*)mask)[i]; ((word64*)output)[i] = ((word64*)input)[i] ^ ((word64*)mask)[i];
count -= 8*i; count -= 8*i;
@ -84,8 +94,11 @@ bool VerifyBufsEqual(const byte *buf, const byte *mask, size_t count)
if (IsAligned<word32>(buf) && IsAligned<word32>(mask)) if (IsAligned<word32>(buf) && IsAligned<word32>(mask))
{ {
word32 acc32 = 0; word32 acc32 = 0;
if (!CRYPTOPP_BOOL_SLOW_WORD64 && IsAligned<word64>(buf) && IsAligned<word64>(mask)) if (!CRYPTOPP_BOOL_SLOW_WORD64 && IsStrictAligned<word64>(buf) && IsStrictAligned<word64>(mask))
{ {
assert(IsAlignedOn(buf, GetStrictAlignedOn<word64>(buf)));
assert(IsAlignedOn(mask, GetStrictAlignedOn<word64>(mask)));
word64 acc64 = 0; word64 acc64 = 0;
for (i=0; i<count/8; i++) for (i=0; i<count/8; i++)
acc64 |= ((word64*)buf)[i] ^ ((word64*)mask)[i]; acc64 |= ((word64*)buf)[i] ^ ((word64*)mask)[i];

35
misc.h
View File

@ -382,21 +382,26 @@ inline T1 RoundDownToMultipleOf(const T1 &n, const T2 &m)
template <class T1, class T2> template <class T1, class T2>
inline T1 RoundUpToMultipleOf(const T1 &n, const T2 &m) inline T1 RoundUpToMultipleOf(const T1 &n, const T2 &m)
{ {
// TODO: undefined behavior here...
if (n+m-1 < n) if (n+m-1 < n)
throw InvalidArgument("RoundUpToMultipleOf: integer overflow"); throw InvalidArgument("RoundUpToMultipleOf: integer overflow");
return RoundDownToMultipleOf(n+m-1, m); return RoundDownToMultipleOf(n+m-1, m);
} }
// Influenced by CRYPTOPP_ALLOW_UNALIGNED_DATA_ACCESS; may cause
// problems at -O3 and GCC vectorization.
template <class T> template <class T>
inline unsigned int GetAlignmentOf(T *dummy=NULL) // VC60 workaround inline unsigned int GetAlignmentOf(T *dummy=NULL) // VC60 workaround
{ {
#ifdef CRYPTOPP_ALLOW_UNALIGNED_DATA_ACCESS #ifdef CRYPTOPP_ALLOW_UNALIGNED_DATA_ACCESS
if (sizeof(T) < 16) if (sizeof(T) < 16)
return 1; return 1;
#endif #endif
#if (_MSC_VER >= 1300) #if (_MSC_VER >= 1300)
return __alignof(T); return __alignof(T);
#elif defined(__clang__)
return __alignof(T);
#elif defined(__GNUC__) #elif defined(__GNUC__)
return __alignof__(T); return __alignof__(T);
#elif CRYPTOPP_BOOL_SLOW_WORD64 #elif CRYPTOPP_BOOL_SLOW_WORD64
@ -406,17 +411,43 @@ inline unsigned int GetAlignmentOf(T *dummy=NULL) // VC60 workaround
#endif #endif
} }
// Not influenced by CRYPTOPP_ALLOW_UNALIGNED_DATA_ACCESS; will not
// cause problems with -O3 and GCC vectorization.
template <class T>
inline unsigned int GetStrictAlignmentOf(T *dummy=NULL) // VC60 workaround
{
#if (_MSC_VER >= 1300)
return __alignof(T);
#elif defined(__clang__)
return __alignof(T);
#elif defined(__GNUC__)
return __alignof__(T);
#else
return sizeof(T);
#endif
}
inline bool IsAlignedOn(const void *p, unsigned int alignment) inline bool IsAlignedOn(const void *p, unsigned int alignment)
{ {
return alignment==1 || (IsPowerOf2(alignment) ? ModPowerOf2((size_t)p, alignment) == 0 : (size_t)p % alignment == 0); return alignment==1 || (IsPowerOf2(alignment) ? ModPowerOf2((size_t)p, alignment) == 0 : (size_t)p % alignment == 0);
} }
// Influenced by CRYPTOPP_ALLOW_UNALIGNED_DATA_ACCESS; may cause
// problems at -O3 and GCC vectorization.
template <class T> template <class T>
inline bool IsAligned(const void *p, T *dummy=NULL) // VC60 workaround inline bool IsAligned(const void *p, T *dummy=NULL) // VC60 workaround
{ {
return IsAlignedOn(p, GetAlignmentOf<T>()); return IsAlignedOn(p, GetAlignmentOf<T>());
} }
// Not influenced by CRYPTOPP_ALLOW_UNALIGNED_DATA_ACCESS; will not
// cause problems with -O3 and GCC vectorization.
template <class T>
inline bool IsStrictAligned(const void *p, T *dummy=NULL) // VC60 workaround
{
return IsAlignedOn(p, GetStrictAlignmentOf<T>());
}
#ifdef IS_LITTLE_ENDIAN #ifdef IS_LITTLE_ENDIAN
typedef LittleEndian NativeByteOrder; typedef LittleEndian NativeByteOrder;
#else #else

2
sha3.h
View File

@ -15,7 +15,7 @@ public:
SHA3(unsigned int digestSize) : m_digestSize(digestSize) {Restart();} SHA3(unsigned int digestSize) : m_digestSize(digestSize) {Restart();}
unsigned int DigestSize() const {return m_digestSize;} unsigned int DigestSize() const {return m_digestSize;}
std::string AlgorithmName() const {return "SHA-3-" + IntToString(m_digestSize*8);} std::string AlgorithmName() const {return "SHA-3-" + IntToString(m_digestSize*8);}
unsigned int OptimalDataAlignment() const {return GetAlignmentOf<word64>();} unsigned int OptimalDataAlignment() const {return GetStrictAlignmentOf<word64>();}
void Update(const byte *input, size_t length); void Update(const byte *input, size_t length);
void Restart(); void Restart();

View File

@ -19,6 +19,10 @@
#include <map> #include <map>
#include <vector> #include <vector>
#if !defined(_NDEBUG) && !defined(NDEBUG)
# include <cassert>
#endif
#ifdef CRYPTOPP_INCLUDE_VECTOR_CC #ifdef CRYPTOPP_INCLUDE_VECTOR_CC
// workaround needed on Sun Studio 12u1 Sun C++ 5.10 SunOS_i386 128229-02 2009/09/21 // workaround needed on Sun Studio 12u1 Sun C++ 5.10 SunOS_i386 128229-02 2009/09/21
#include <vector.cc> #include <vector.cc>