CL mining overhaul

- Replace stable and experimental opencl kernel with jawawawa ethash.cl
- Restore original jawawawa result reporting array
- Delete --cl-kernel parameter. Try binary, if not fall back to opencl
- Support up to 255 solutions per pass (more than one)
- Shave some time off dag gen
- Properly delete old cl::Buffers when allocating new ones
- Binary kernel installation optional via cmake parameter
- Update relevant docs

Author: jean-m-cyr

CHANGELOG.md

@@ -13,6 +13,9 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/).
 - API responses return "ethminer-" as version prefix. [#1300](https://github.com/ethereum-mining/ethminer/pull/1300).
 - Stratum mode autodetection. No need to specify stratum+tcp or stratum1+tcp or stratum2+tcp
 - Connection failed due to login errors (wrong address or worker) are marked Unrecoverable and no longer used
+- Replaced opencl kernel with opensource jawawawa opencl kernel
+- Added support for jawawawa AMD binary kernels
+- AMD auto kernel selection. Try bin first, if not fall back to opencl.
 
 ## 0.15.0rc1
 

CMakeLists.txt

@@ -28,6 +28,7 @@ option(ETHASHCL "Build with OpenCL mining" ON)
 option(ETHASHCUDA "Build with CUDA mining" ON)
 option(ETHDBUS "Build with D-Bus support" OFF)
 option(APICORE "Build with API Server support" ON)
+option(BINKERN "Install AMD binary kernels" ON)
 
 # propagates CMake configuration options to the compiler
 function(configureProject)
@@ -43,6 +44,9 @@ function(configureProject)
 	if (APICORE)
 		add_definitions(-DAPI_CORE)
 	endif()
+	if (BINKERN)
+		add_definitions(-DBIN_KERN)
+	endif()
 endfunction()
 
 hunter_add_package(Boost COMPONENTS system filesystem)
@@ -70,6 +74,7 @@ message("-- ETHASHCL         Build OpenCL components                  ${ETHASHCL
 message("-- ETHASHCUDA       Build CUDA components                    ${ETHASHCUDA}")
 message("-- ETHDBUS          Build D-Bus components                   ${ETHDBUS}")
 message("-- APICORE          Build API Server components              ${APICORE}")
+message("-- BINKERN          Install AMD binary kernels               ${BINKERN}")
 message("------------------------------------------------------------------------")
 message("")
 
@@ -88,7 +93,9 @@ add_subdirectory(libpoolprotocols)
 
 if (ETHASHCL)
 	add_subdirectory(libethash-cl)
-	add_subdirectory(libethash-cl/kernels)
+	if (BINKERN)
+		add_subdirectory(libethash-cl/kernels)
+	endif()
 endif ()
 if (ETHASHCUDA)
 	add_subdirectory(libethash-cuda)

docs/BUILD.md

@@ -139,6 +139,7 @@ cmake .. -DETHASHCUDA=ON -DETHASHCL=OFF
 * `-DETHASHCUDA=ON` - enable CUDA mining, `ON` by default.
 * `-DAPICORE=ON` - enable API Server, `ON` by default.
 * `-DETHDBUS=ON` - enable D-Bus support, `OFF` by default.
+* `-DBINKERN=ON` - install AMD binary kernels, `ON` by default.
 
 ## Disable Hunter
 

ethminer/main.cpp

@@ -331,6 +331,12 @@ class MinerCLI
 
 #if ETH_ETHASHCL
 
+		app.add_option("--cl-kernel", m_clKernel,
+			"Ignored parameter. Kernel is auto-selected.", true)
+			->group(OpenCLGroup)
+			->check(CLI::Range(2));
+
+
 		app.add_option("--opencl-platform", m_openclPlatform,
 			"Use OpenCL platform n", true)
 			->group(OpenCLGroup);
@@ -340,27 +346,21 @@ class MinerCLI
 			->group(OpenCLGroup);
 
 		app.add_set("--cl-parallel-hash", m_openclThreadsPerHash, {1, 2, 4, 8},
-			"Set the number of threads per hash", true)
+			"ignored parameter", true)
 			->group(OpenCLGroup);
 
-		app.add_option("--cl-kernel", m_openclSelectedKernel,
-			"Select kernel. 0 stable kernel, 1 experimental kernel, 2 binary kernel", true)
-			->group(OpenCLGroup)
-			->check(CLI::Range(2));
-
 		app.add_option("--cl-iterations", m_openclIterations,
 			"Number of outer iterations to perform before enqeueing on a new nonce", true)
 			->group(OpenCLGroup)
 			->check(CLI::Range(1,99999));
 
 		app.add_option("--cl-global-work", m_globalWorkSizeMultiplier,
-			"Set the global work size multipler. Specify negative value for automatic scaling based on # of compute units", true)
+			"Set the global work size multipler.", true)
 			->group(OpenCLGroup);
 
-		app.add_option("--cl-local-work", m_localWorkSize,
+		app.add_set("--cl-local-work", m_localWorkSize, {64, 128, 192, 256},
 			"Set the local work size", true)
-			->group(OpenCLGroup)
-			->check(CLI::Range(64, 256));
+			->group(OpenCLGroup);
 
 #endif
 
@@ -564,14 +564,6 @@ class MinerCLI
 		}
 
 #if ETH_ETHASHCL
-		if ((m_localWorkSize != 64) &&
-			(m_localWorkSize != 128) &&
-			(m_localWorkSize != 192) &&
-			(m_localWorkSize != 256))
-		{
-           	cerr << endl << "opencl local work must be 64, 128, 192 or 256." << "\n\n";
-           	exit(-1);
-		}
 		m_openclDeviceCount = m_openclDevices.size();
 #endif
 
@@ -629,7 +621,6 @@ class MinerCLI
 				m_miningThreads = m_openclDeviceCount;
 			}
 
-			CLMiner::setCLKernel(m_openclSelectedKernel);
 			CLMiner::setNumberIterations(m_openclIterations);
 			CLMiner::setThreadsPerHash(m_openclThreadsPerHash);
 
@@ -641,7 +632,8 @@ class MinerCLI
 				m_dagLoadMode,
 				m_dagCreateDevice,
 				m_noEval,
-				m_exit
+				m_exit,
+				m_clKernel
 			)) {
 				stop_io_service();
 				exit(1);
@@ -904,13 +896,13 @@ class MinerCLI
 	unsigned m_miningThreads = UINT_MAX;
 	bool m_shouldListDevices = false;
 #if ETH_ETHASHCL
-	unsigned m_openclSelectedKernel = 0;  ///< A numeric value for the selected OpenCL kernel
 	unsigned m_openclIterations = 1;  ///< A numeric value for the number of iterations
 	unsigned m_openclDeviceCount = 0;
 	vector<unsigned> m_openclDevices;
-	unsigned m_openclThreadsPerHash = 8;
-	int m_globalWorkSizeMultiplier = CLMiner::c_defaultGlobalWorkSizeMultiplier;
+	int m_openclThreadsPerHash = -1;
+	unsigned m_globalWorkSizeMultiplier = CLMiner::c_defaultGlobalWorkSizeMultiplier;
 	unsigned m_localWorkSize = CLMiner::c_defaultLocalWorkSize;
+	int m_clKernel = -1;
 #endif
 #if ETH_ETHASHCUDA
 	unsigned m_cudaDeviceCount = 0;