Enabling/disabling GPUs from CLI

xmrstak/backend/amd/autoAdjust.hpp

@@ -89,6 +89,27 @@ class autoAdjust
 		std::string conf;
 		for(auto& ctx : devVec)
 		{
+			std::string enabledGpus = params::inst().amdGpus;
+			bool enabled = true;
+			if (!enabledGpus.empty())
+			{
+				enabled = false;
+				std::stringstream ss(enabledGpus);
+
+				int i = -1;
+				while (ss >> i)
+				{
+					if (i == ctx.deviceIdx)
+					{
+						enabled = true;
+						break;
+					}
+
+					while (ss.peek() == ',' || ss.peek() == ' ')
+						ss.ignore();
+				}
+			}
+
 			size_t minFreeMem = 128u * byteToMiB;
 			/* 1000 is a magic selected limit, the reason is that more than 2GiB memory
 			 * sowing down the memory performance because of TLB cache misses
@@ -196,6 +217,9 @@ class autoAdjust
 			}
 			if(intensity != 0)
 			{
+				if (!enabled)
+					conf += "/* Disabled\n";
+
 				for(uint32_t thd = 0; thd < numThreads; ++thd)
 				{
 					conf += "  // gpu: " + ctx.name + std::string("  compute units: ") + std::to_string(ctx.computeUnits) + "\n";
@@ -209,6 +233,9 @@ class autoAdjust
 							std::to_string(numUnroll) + ", \"comp_mode\" : true, \"interleave\" : " + std::to_string(ctx.interleave) + "\n" +
 							"  },\n";
 				}
+
+				if (!enabled)
+					conf += "*/\n";
 			}
 			else
 			{

xmrstak/backend/nvidia/autoAdjust.hpp

@@ -81,8 +81,32 @@ class autoAdjust
 		std::string conf;
 		for(auto& ctx : nvidCtxVec)
 		{
+			std::string enabledGpus = params::inst().nvidiaGpus;
+			bool enabled = true;
+			if (!enabledGpus.empty())
+			{
+				enabled = false;
+				std::stringstream ss(enabledGpus);
+
+				int i = -1;
+				while (ss >> i)
+				{
+					if (i == ctx.device_id)
+					{
+						enabled = true;
+						break;
+					}
+
+					while (ss.peek() == ',' || ss.peek() == ' ')
+						ss.ignore();
+				}
+			}
+
 			if(ctx.device_threads * ctx.device_blocks > 0)
 			{
+				if (!enabled)
+					conf += "/* Disabled\n";
+
 				conf += std::string("  // gpu: ") + ctx.name + " architecture: " + std::to_string(ctx.device_arch[0] * 10 + ctx.device_arch[1]) + "\n";
 				conf += std::string("  //      memory: ") + std::to_string(ctx.free_device_memory / byte2mib) + "/" + std::to_string(ctx.total_device_memory / byte2mib) + " MiB\n";
 				conf += std::string("  //      smx: ") + std::to_string(ctx.device_mpcount) + "\n";
@@ -92,6 +116,9 @@ class autoAdjust
 						"    \"affine_to_cpu\" : false, \"sync_mode\" : 3,\n" +
 						"    \"mem_mode\" : 1,\n" +
 						"  },\n";
+
+				if (!enabled)
+					conf += "*/\n";
 			}
 		}
 

xmrstak/cli/cli-miner.cpp

@@ -80,6 +80,7 @@ void help()
 #endif
 #ifndef CONF_NO_OPENCL
 	cout << "  --noAMD                    disable the AMD miner backend" << endl;
+	cout << "  --amdGpus GPUS             indices of AMD GPUs to use. Example: 0,2,3" << endl;
 	cout << "  --noAMDCache               disable the AMD(OpenCL) cache for precompiled binaries" << endl;
 	cout << "  --openCLVendor VENDOR      use OpenCL driver of VENDOR and devices [AMD,NVIDIA]" << endl;
 	cout << "                             default: AMD" << endl;
@@ -88,6 +89,7 @@ void help()
 #endif
 #ifndef CONF_NO_CUDA
 	cout << "  --noNVIDIA                 disable the NVIDIA miner backend" << endl;
+	cout << "  --nvidiaGpus GPUS          indices of NVIDIA GPUs to use. Example: 0,2,3" << endl;
 	cout << "  --nvidia FILE              NVIDIA backend miner config file" << endl;
 #endif
 	cout << "  --log FILE                 miner output file" << endl;
@@ -472,6 +474,17 @@ int main(int argc, char* argv[])
 		{
 			params::inst().useAMD = false;
 		}
+		else if (opName.compare("--amdGpus") == 0)
+		{
+			++i;
+			if (i >= argc)
+			{
+				printer::inst()->print_msg(L0, "No argument for parameter '--amdGpus' given");
+				win_exit();
+				return 1;
+			}
+			params::inst().amdGpus = argv[i];
+		}
 		else if(opName.compare("--openCLVendor") == 0)
 		{
 			++i;
@@ -498,6 +511,17 @@ int main(int argc, char* argv[])
 		{
 			params::inst().useNVIDIA = false;
 		}
+		else if (opName.compare("--nvidiaGpus") == 0)
+		{
+			++i;
+			if (i >= argc)
+			{
+				printer::inst()->print_msg(L0, "No argument for parameter '--nvidiaGpus' given");
+				win_exit();
+				return 1;
+			}
+			params::inst().nvidiaGpus = argv[i];
+		}
 		else if(opName.compare("--cpu") == 0)
 		{
 			++i;

xmrstak/params.hpp

@@ -25,6 +25,8 @@ struct params
 	bool AMDCache;
 	bool useNVIDIA;
 	bool useCPU;
+	std::string amdGpus;
+	std::string nvidiaGpus;
 	// user selected OpenCL vendor
 	std::string openCLVendor;