From 3a26c557c27522a675088b32a37fbde512489dd9 Mon Sep 17 00:00:00 2001 From: Dobromir Dobrev Date: Thu, 6 Dec 2018 16:22:59 +0000 Subject: [PATCH 1/2] Remove superfluous use of volatile --- libethash-cl/kernels/cl/ethash.cl | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/libethash-cl/kernels/cl/ethash.cl b/libethash-cl/kernels/cl/ethash.cl index e2cd49bab0..9ec6d182a5 100644 --- a/libethash-cl/kernels/cl/ethash.cl +++ b/libethash-cl/kernels/cl/ethash.cl @@ -250,7 +250,7 @@ struct SearchResults { __attribute__((reqd_work_group_size(WORKSIZE, 1, 1))) __kernel void search( - __global volatile struct SearchResults* restrict g_output, + __global struct SearchResults* restrict g_output, __constant uint2 const* g_header, __global ulong8 const* _g_dag, uint dag_size, @@ -277,7 +277,7 @@ __kernel void search( __local compute_hash_share * const share = sharebuf + hash_id; // sha3_512(header .. nonce) - volatile uint2 state[25]; + uint2 state[25]; state[0] = g_header[0]; state[1] = g_header[1]; state[2] = g_header[2]; @@ -306,7 +306,7 @@ __kernel void search( uint2 mixhash[4]; - for (volatile int pass = 0; pass < 2; ++pass) { + for (int pass = 0; pass < 2; ++pass) { KECCAK_PROCESS(state, select(5, 12, pass != 0), select(8, 1, pass != 0), isolate); if (pass > 0) break; @@ -315,7 +315,7 @@ __kernel void search( uint8 mix; #pragma unroll 1 - for (volatile uint tid = 0; tid < 4; tid++) { + for (uint tid = 0; tid < 4; tid++) { if (tid == thread_id) { share->uint2s[0] = state[0]; share->uint2s[1] = state[1]; @@ -338,10 +338,10 @@ __kernel void search( for (uint a = 0; a < (ACCESSES & isolate); a += 8) { #else #pragma unroll 1 - for (volatile uint a = 0; a < ACCESSES; a += 8) { + for (uint a = 0; a < ACCESSES; a += 8) { #endif const uint lane_idx = 4 * hash_id + a / 8 % 4; - for (volatile uint x = 0; x < 8; ++x) + for (uint x = 0; x < 8; ++x) MIX(x); } From 61ee230f32352782c55be1d7bf27d60044eb7e7b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Pawe=C5=82=20Bylica?= Date: Thu, 13 Dec 2018 11:39:34 +0100 Subject: [PATCH 2/2] =?UTF-8?q?Bump=20version:=200.16.1=20=E2=86=92=200.16?= =?UTF-8?q?.2?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .bumpversion.cfg | 2 +- CMakeLists.txt | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/.bumpversion.cfg b/.bumpversion.cfg index 260eb2e135..aa041edf20 100644 --- a/.bumpversion.cfg +++ b/.bumpversion.cfg @@ -1,5 +1,5 @@ [bumpversion] -current_version = 0.16.1 +current_version = 0.16.2 commit = True tag = True parse = (?P\d+)\.(?P\d+)\.(?P\d+)((?Prc|\.dev)(?P\d+))? diff --git a/CMakeLists.txt b/CMakeLists.txt index 80c908b703..11f4222d34 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -20,7 +20,7 @@ HunterGate( ) project(ethminer) -set(PROJECT_VERSION 0.16.1) +set(PROJECT_VERSION 0.16.2) cable_set_build_type(DEFAULT Release CONFIGURATION_TYPES Release RelWithDebInfo)