Merge pull request #1977 from miscellaneousbits/master

AMD max. 4 GB per allocation workaround for 8GB cards

Author: ddobreff

libethash-cl/CLMiner.cpp

@@ -31,7 +31,6 @@ struct CLChannel : public LogChannel
     static const bool debug = false;
 };
 #define cllog clog(CLChannel)
-#define ETHCL_LOG(_contents) cllog << _contents
 
 /**
  * Returns the name of a numerical cl_int error
@@ -372,8 +371,9 @@ void CLMiner::workLoop()
                 m_searchKernel.setArg(0, m_searchBuffer[0]);  // Supply output buffer to kernel.
                 m_searchKernel.setArg(1, m_header[0]);        // Supply header buffer to kernel.
                 m_searchKernel.setArg(2, m_dag[0]);           // Supply DAG buffer to kernel.
-                m_searchKernel.setArg(3, m_dagItems);
-                m_searchKernel.setArg(5, target);
+                m_searchKernel.setArg(3, m_dag[1]);           // Supply DAG buffer to kernel.
+                m_searchKernel.setArg(4, m_dagItems);
+                m_searchKernel.setArg(6, target);
 
 #ifdef DEV_BUILD
                 if (g_logOptions & LOG_SWITCH)
@@ -386,7 +386,7 @@ void CLMiner::workLoop()
             }
 
             // Run the kernel.
-            m_searchKernel.setArg(4, startNonce);
+            m_searchKernel.setArg(5, startNonce);
             m_queue[0].enqueueNDRangeKernel(
                 m_searchKernel, cl::NullRange, m_settings.globalWorkSize, m_settings.localWorkSize);
 
@@ -696,7 +696,8 @@ bool CLMiner::initEpoch_internal()
                       // Eventually resume mining when changing coin or epoch (NiceHash)
     }
 
-    cllog << "Generating DAG + Light : " << dev::getFormattedMemory((double)RequiredMemory);
+    cllog << "Generating split DAG + Light (total): "
+          << dev::getFormattedMemory((double)RequiredMemory);
 
     try
     {
@@ -746,6 +747,7 @@ bool CLMiner::initEpoch_internal()
         if (!m_settings.noExit)
             addDefinition(code, "FAST_EXIT", 1);
 
+
         // create miner OpenCL program
         cl::Program::Sources sources{{code.data(), code.size()}};
         cl::Program program(m_context[0], sources), binaryProgram;
@@ -778,7 +780,7 @@ bool CLMiner::initEpoch_internal()
             std::transform(device_name.begin(), device_name.end(), device_name.begin(), ::tolower);
             fname_strm << boost::dll::program_location().parent_path().string()
                        << "/kernels/ethash_" << device_name << "_lws" << m_settings.localWorkSize
-                       << (m_settings.noExit ? ".bin" : "_exit.bin");
+                       << (m_settings.noExit ? "" : "_exit") << ".bin";
             cllog << "Loading binary kernel " << fname_strm.str();
             try
             {
@@ -837,7 +839,8 @@ bool CLMiner::initEpoch_internal()
                   << dev::getFormattedMemory(
                          (double)(m_deviceDescriptor.totalMemory - RequiredMemory));
             m_dag.clear();
-            m_dag.push_back(cl::Buffer(m_context[0], CL_MEM_READ_ONLY, m_epochContext.dagSize));
+            m_dag.push_back(cl::Buffer(m_context[0], CL_MEM_READ_ONLY, m_epochContext.dagSize / 2));
+            m_dag.push_back(cl::Buffer(m_context[0], CL_MEM_READ_ONLY, m_epochContext.dagSize / 2));
             cllog << "Loading kernels";
 
             // If we have a binary kernel to use, let's try it
@@ -849,7 +852,6 @@ bool CLMiner::initEpoch_internal()
 
             m_dagKernel = cl::Kernel(program, "GenerateDAG");
 
-            cllog << "Writing light cache buffer";
             m_queue[0].enqueueWriteBuffer(
                 m_light[0], CL_TRUE, 0, m_epochContext.lightSize, m_epochContext.lightCache);
         }
@@ -860,22 +862,24 @@ bool CLMiner::initEpoch_internal()
             return true;
         }
         // create buffer for header
-        ETHCL_LOG("Creating buffer for header.");
+        cllog << "Creating buffer for header.";
         m_header.clear();
         m_header.push_back(cl::Buffer(m_context[0], CL_MEM_READ_ONLY, 32));
 
         m_searchKernel.setArg(1, m_header[0]);
         m_searchKernel.setArg(2, m_dag[0]);
-        m_searchKernel.setArg(3, m_dagItems);
+        m_searchKernel.setArg(3, m_dag[1]);
+        m_searchKernel.setArg(4, m_dagItems);
 
         // create mining buffers
-        ETHCL_LOG("Creating mining buffer");
+        cllog << "Creating mining buffer";
         m_searchBuffer.clear();
         m_searchBuffer.emplace_back(m_context[0], CL_MEM_WRITE_ONLY, sizeof(SearchResults));
 
         m_dagKernel.setArg(1, m_light[0]);
         m_dagKernel.setArg(2, m_dag[0]);
-        m_dagKernel.setArg(3, (uint32_t)(m_epochContext.lightSize / 64));
+        m_dagKernel.setArg(3, m_dag[1]);
+        m_dagKernel.setArg(4, (uint32_t)(m_epochContext.lightSize / 64));
 
         const uint32_t workItems = m_dagItems * 2;  // GPU computes partial 512-bit DAG items.
 

libethash-cl/kernels/Makefile

@@ -5,7 +5,7 @@ ASFLAGS=-I$(SDIR)
 AS=clrxasm
 
 .PHONY: all
-all: ellesmere tonga baffin gfx900 gfx901
+all: ellesmere tonga baffin gfx900 gfx901 gfx906
 	@echo "Built ethash kernel for Ellesmere, Tonga, Baffin, Gfx900 and Gfx901 architectures."
 
 .PHONY: clean
@@ -37,3 +37,7 @@ gfx900: gfx900_lws64.bin gfx900_lws128.bin gfx900_lws256.bin
 .PHONY: gfx901
 gfx901: gfx901_lws64.bin gfx901_lws128.bin gfx901_lws256.bin
 		@echo "Built gfx901 kernels..."
+
+.PHONY: gfx906
+gfx906: gfx906_lws64.bin gfx906_lws128.bin gfx906_lws256.bin
+		@echo "Built gfx906 kernels..."