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

Use OpenMP 2.0 for MSC compilers (GH #787)

pull/795/head
Jeffrey Walton 2019-01-20 22:10:36 -05:00
parent 92808945c1
commit aa043b38a7
No known key found for this signature in database
GPG Key ID: B36AB348921B1838
3 changed files with 18 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
cryptest.nmake
View File

@ -155,6 +155,7 @@ LDLIBS =
# CXXFLAGS = $(CXXFLAGS) /DDEBUG /D_DEBUG /Oi /Oy- /Od /MTd # CXXFLAGS = $(CXXFLAGS) /DDEBUG /D_DEBUG /Oi /Oy- /Od /MTd
# Release build. Add /OPT:REF to linker # Release build. Add /OPT:REF to linker
CXXFLAGS = $(CXXFLAGS) /DNDEBUG /D_NDEBUG /Oi /Oy /O2 /MT CXXFLAGS = $(CXXFLAGS) /DNDEBUG /D_NDEBUG /Oi /Oy /O2 /MT
# Linker flags.
LDFLAGS = $(LDFLAGS) /OPT:REF LDFLAGS = $(LDFLAGS) /OPT:REF
# Attempt to detect when <sdkddkver.h> and <winapifamily.h> are available # Attempt to detect when <sdkddkver.h> and <winapifamily.h> are available

5
salsa.cpp
View File

@ -90,9 +90,14 @@ void Salsa20_Core(word32* data, unsigned int rounds)
x[15] ^= rotlConstant<18>(x[14]+x[13]); x[15] ^= rotlConstant<18>(x[14]+x[13]);
} }
#ifdef _MSC_VER
for (size_t i = 0; i < 16; ++i)
data[i] += x[i];
#else
#pragma omp simd #pragma omp simd
for (size_t i = 0; i < 16; ++i) for (size_t i = 0; i < 16; ++i)
data[i] += x[i]; data[i] += x[i];
#endif
} }
std::string Salsa20_Policy::AlgorithmProvider() const std::string Salsa20_Policy::AlgorithmProvider() const

16
scrypt.cpp
View File

@ -60,9 +60,14 @@ static inline void BlockCopy(byte* dest, byte* src, size_t len)
static inline void BlockXOR(byte* dest, byte* src, size_t len) static inline void BlockXOR(byte* dest, byte* src, size_t len)
{ {
#ifdef _MSC_VER
for (size_t i = 0; i < len; ++i)
dest[i] ^= src[i];
#else
#pragma omp simd #pragma omp simd
for (size_t i = 0; i < len; ++i) for (size_t i = 0; i < len; ++i)
dest[i] ^= src[i]; dest[i] ^= src[i];
#endif
} }
static inline void PBKDF2_SHA256(byte* buf, size_t dkLen, static inline void PBKDF2_SHA256(byte* buf, size_t dkLen,
@ -252,10 +257,13 @@ size_t Scrypt::DeriveKey(byte*derived, size_t derivedLen, const byte*secret, siz
// 1: (B_0 ... B_{p-1}) <-- PBKDF2(P, S, 1, p * MFLen) // 1: (B_0 ... B_{p-1}) <-- PBKDF2(P, S, 1, p * MFLen)
PBKDF2_SHA256(B, B.size(), secret, secretLen, salt, saltLen, 1); PBKDF2_SHA256(B, B.size(), secret, secretLen, salt, saltLen, 1);
// Visual Studio and OpenMP 2.0 fixup. We must use int, not size_t.
int maxParallel=0;
if (!SafeConvert(parallel, maxParallel))
maxParallel = std::numeric_limits<int>::max();
#ifdef _OPENMP #ifdef _OPENMP
int threads = STDMIN(omp_get_max_threads(), int threads = STDMIN(omp_get_max_threads(), maxParallel);
static_cast<int>(STDMIN(static_cast<size_t>(parallel),
static_cast<size_t>(std::numeric_limits<int>::max()))));
#endif #endif
// http://stackoverflow.com/q/49604260/608639 // http://stackoverflow.com/q/49604260/608639
@ -267,7 +275,7 @@ size_t Scrypt::DeriveKey(byte*derived, size_t derivedLen, const byte*secret, siz
// 2: for i = 0 to p - 1 do // 2: for i = 0 to p - 1 do
#pragma omp for #pragma omp for
for (size_t i = 0; i < static_cast<size_t>(parallel); ++i) for (int i = 0; i < maxParallel; ++i)
{ {
// 3: B_i <-- MF(B_i, N) // 3: B_i <-- MF(B_i, N)
const ptrdiff_t offset = static_cast<ptrdiff_t>(blockSize*i*128); const ptrdiff_t offset = static_cast<ptrdiff_t>(blockSize*i*128);