Update version number

KlausT · Jan 13, 2017 · e60463a · e60463a
1 parent 8c5050d
commit e60463a
Show file tree

Hide file tree

Showing 7 changed files with 352 additions and 353 deletions.
diff --git a/ccminer.vcxproj b/ccminer.vcxproj
@@ -238,7 +238,7 @@ copy "$(CudaToolkitBinDir)\cudart*.dll" "$(OutDir)"</Command>
       <PerformDeviceLink>false</PerformDeviceLink>
     </CudaLink>
     <CudaLink>
-      <Optimization>O2</Optimization>
+      <Optimization>O3</Optimization>
     </CudaLink>
   </ItemDefinitionGroup>
   <ItemGroup>

diff --git a/configure.ac b/configure.ac
@@ -1,4 +1,4 @@
-AC_INIT([ccminer-cryptonight], [1.03])
+AC_INIT([ccminer-cryptonight], [2.00])
 
 AC_PREREQ([2.59c])
 AC_CANONICAL_SYSTEM

diff --git a/cpu-miner.c b/cpu-miner.c
@@ -2052,7 +2052,7 @@ static int msver(void)
 	return version;
 }
 
-#define PROGRAM_VERSION "1.03"
+#define PROGRAM_VERSION "2.00"
 int main(int argc, char *argv[])
 {
 	struct thr_info *thr;

diff --git a/cpuminer-config.h b/cpuminer-config.h
@@ -152,7 +152,7 @@
 #define PACKAGE_NAME "ccminer-cryptonight"
 
 /* Define to the full name and version of this package. */
-#define PACKAGE_STRING "ccminer-cryptonight 1.03"
+#define PACKAGE_STRING "ccminer-cryptonight 2.00"
 
 /* Define to the one symbol short name of this package. */
 #undef PACKAGE_TARNAME
@@ -161,7 +161,7 @@
 #undef PACKAGE_URL
 
 /* Define to the version of this package. */
-#define PACKAGE_VERSION "1.03"
+#define PACKAGE_VERSION "2.00"
 
 /* Version number of package */
 #undef VERSION

diff --git a/cryptonight.h b/cryptonight.h
@@ -2,7 +2,7 @@
 #include <cuda_runtime.h>
 
 #ifdef __INTELLISENSE__ 
-#define __CUDA_ARCH__ 520
+#define __CUDA_ARCH__ 610
 /* avoid red underlining */
 
 struct uint3
@@ -113,13 +113,9 @@ struct uint3  blockDim;
     ((uint64_t *)z)[0] = ((uint64_t *)(x))[0] ^ ((uint64_t *)(y))[0]; \
     ((uint64_t *)z)[1] = ((uint64_t *)(x))[1] ^ ((uint64_t *)(y))[1]; }
 
-#define MUL_SUM_XOR_DST(a,c,dst) { \
-    uint64_t hi, lo = cuda_mul128(((uint64_t *)a)[0], ((uint64_t *)dst)[0], &hi) + ((uint64_t *)c)[1]; \
-    hi += ((uint64_t *)c)[0]; \
-    ((uint64_t *)c)[0] = ((uint64_t *)dst)[0] ^ hi; \
-    ((uint64_t *)c)[1] = ((uint64_t *)dst)[1] ^ lo; \
-    ((uint64_t *)dst)[0] = hi; \
-    ((uint64_t *)dst)[1] = lo; }
+#define XOR_BLOCKS_DST2(x,y,z) { \
+    ((uint64_t *)z)[0] = (x)[0] ^ (y)[0]; \
+    ((uint64_t *)z)[1] = (x)[1] ^ (y)[1]; }
 
 #define E2I(x) ((size_t)(((*((uint64_t*)(x)) >> 4) & 0x1ffff)))
 

diff --git a/cryptonight/cuda_cryptonight_aes.cu b/cryptonight/cuda_cryptonight_aes.cu
@@ -276,7 +276,10 @@ static __constant__ uint32_t d_t_fn[1024] =
 
 __device__ __forceinline__ static void cn_aes_single_round(uint32_t * __restrict__ sharedMemory, const uint32_t * __restrict__ in, uint32_t * __restrict__ out, const uint32_t * __restrict__ expandedKey)
 {
-    round(sharedMemory, out, in, expandedKey);
+	out[0] = expandedKey[0] ^ t_fn0(in[0] & 0xff) ^ t_fn1((in[1] >> 8) & 0xff) ^ t_fn2((in[2] >> 16) & 0xff) ^ t_fn3((in[3] >> 24) & 0xff);
+	out[1] = expandedKey[1] ^ t_fn0(in[1] & 0xff) ^ t_fn1((in[2] >> 8) & 0xff) ^ t_fn2((in[3] >> 16) & 0xff) ^ t_fn3((in[0] >> 24) & 0xff);
+	out[2] = expandedKey[2] ^ t_fn0(in[2] & 0xff) ^ t_fn1((in[3] >> 8) & 0xff) ^ t_fn2((in[0] >> 16) & 0xff) ^ t_fn3((in[1] >> 24) & 0xff);
+	out[3] = expandedKey[3] ^ t_fn0(in[3] & 0xff) ^ t_fn1((in[0] >> 8) & 0xff) ^ t_fn2((in[1] >> 16) & 0xff) ^ t_fn3((in[2] >> 24) & 0xff);
 }
 
 __device__ __forceinline__ static void cn_aes_pseudo_round_mut(const uint32_t * __restrict__ sharedMemory, uint32_t * __restrict__ val, const uint32_t * __restrict__ expandedKey)