Whitespace check-in

pull/737/head
Jeffrey Walton 2018-11-08 20:34:22 -05:00
parent aa1d0a5129
commit dede7bf6b4
No known key found for this signature in database
GPG Key ID: B36AB348921B1838
1 changed files with 12 additions and 11 deletions

View File

@ -2,15 +2,16 @@
// Jack Lloyd and Jeffrey Walton // Jack Lloyd and Jeffrey Walton
// //
// This source file uses intrinsics and built-ins to gain access to // This source file uses intrinsics and built-ins to gain access to
// SSE2, ARM NEON and ARMv8a, and Power7 Altivec instructions. A separate // AVX2 instructions. A separate source file is needed because
// source file is needed because additional CXXFLAGS are required to enable // additional CXXFLAGS are required to enable the appropriate
// the appropriate instructions sets in some build configurations. // instructions sets in some build configurations.
// //
// AVX implementation based on Botan's chacha_avx.cpp. Many thanks // AVX2 implementation based on Botan's chacha_avx.cpp. Many thanks
// to Jack Lloyd and the Botan team for allowing us to use it. // to Jack Lloyd and the Botan team for allowing us to use it.
// //
// Here are some relative numbers for ChaCha8: // Here are some relative numbers for ChaCha8:
// * Intel Skylake, 3.0 GHz: AVX2 at 4385 MB/s; 0.59 cpb. // * Intel Skylake, 3.0 GHz: AVX2 at 4411 MB/s; 0.57 cpb.
// * Intel Broadwell, 2.3 GHz: AVX2 at 3828 MB/s; 0.58 cpb.
// * AMD Bulldozer, 3.3 GHz: AVX2 at 1680 MB/s; 1.47 cpb. // * AMD Bulldozer, 3.3 GHz: AVX2 at 1680 MB/s; 1.47 cpb.
#include "pch.h" #include "pch.h"
@ -28,7 +29,7 @@
// Squash MS LNK4221 and libtool warnings // Squash MS LNK4221 and libtool warnings
extern const char CHACHA_AVX_FNAME[] = __FILE__; extern const char CHACHA_AVX_FNAME[] = __FILE__;
// Sun Studio 12.4 OK, 12.5 and 12.6 error. // Sun Studio 12.4 OK, 12.5 and 12.6 compile error.
#if (__SUNPRO_CC >= 0x5140) && (__SUNPRO_CC <= 0x5150) #if (__SUNPRO_CC >= 0x5140) && (__SUNPRO_CC <= 0x5150)
# define MAYBE_CONST # define MAYBE_CONST
#else #else