Merge pull request #137 from psychocrypt/topic-handleOpenClErrors

handle OpenCL errors

1 files changed, 82 insertions, 64 deletions

diff --git a/xmrstak/backend/amd/amd_gpu/gpu.cpp b/xmrstak/backend/amd/amd_gpu/gpu.cpp
index b5a9d61..12b356c 100644
--- a/xmrstak/backend/amd/amd_gpu/gpu.cpp
+++ b/xmrstak/backend/amd/amd_gpu/gpu.cpp
@@ -432,8 +432,11 @@ uint32_t getNumPlatforms()
 
 	// Get platform and device information
 	clStatus = clGetPlatformIDs(0, NULL, &num_platforms);
-	platforms = (cl_platform_id *) malloc(sizeof(cl_platform_id) * num_platforms);
-	clStatus = clGetPlatformIDs(num_platforms, platforms, NULL);
+	if(clStatus != CL_SUCCESS)
+	{
+		printer::inst()->print_msg(L1,"WARNING: %s when calling clGetPlatformIDs for number of platforms.", err_to_str(clStatus));
+		return 0u;
+	}
 
 	return num_platforms;
 }
@@ -448,39 +451,60 @@ std::vector<GpuContext> getAMDDevices(int index)
 
 	uint32_t numPlatforms = getNumPlatforms();
 
-
-	platforms = (cl_platform_id *) malloc(sizeof(cl_platform_id) * numPlatforms);
-	clStatus = clGetPlatformIDs(numPlatforms, platforms, NULL);
-
-	clStatus = clGetDeviceIDs( platforms[index], CL_DEVICE_TYPE_GPU, 0, NULL, &num_devices);
-	device_list = (cl_device_id *) malloc(sizeof(cl_device_id)*num_devices);
-	clStatus = clGetDeviceIDs( platforms[index], CL_DEVICE_TYPE_GPU, num_devices, device_list, NULL);
-	for (int k = 0; k < num_devices; k++) {
-		cl_int clError;
-		std::vector<char> devVendorVec(1024);
-		clError = clGetDeviceInfo(device_list[k], CL_DEVICE_VENDOR, devVendorVec.size(), devVendorVec.data(), NULL);
-		std::string devVendor(devVendorVec.data());
-		if( devVendor.find("Advanced Micro Devices") != std::string::npos)
+	if(numPlatforms)
+	{
+		platforms = (cl_platform_id *) malloc(sizeof(cl_platform_id) * numPlatforms);
+		clStatus = clGetPlatformIDs(numPlatforms, platforms, NULL);
+		if(clStatus == CL_SUCCESS)
 		{
-			GpuContext ctx;
-			ctx.deviceIdx = k;
-			clError = clGetDeviceInfo(device_list[k], CL_DEVICE_MAX_COMPUTE_UNITS, sizeof(int), &(ctx.computeUnits), NULL);
-			size_t maxMem;
-			clError = clGetDeviceInfo(device_list[k], CL_DEVICE_MAX_MEM_ALLOC_SIZE, sizeof(size_t), &(maxMem), NULL);
-			clError = clGetDeviceInfo(device_list[k], CL_DEVICE_GLOBAL_MEM_SIZE, sizeof(size_t), &(ctx.freeMem), NULL);
-			// if environment variable GPU_SINGLE_ALLOC_PERCENT is not set we can not allocate the full memory
-			ctx.freeMem = std::min(ctx.freeMem, maxMem);
-			std::vector<char> devNameVec(1024);
-			clError = clGetDeviceInfo(device_list[k], CL_DEVICE_NAME, devNameVec.size(), devNameVec.data(), NULL);
-			ctx.name = std::string(devNameVec.data());
-			printer::inst()->print_msg(L0,"Found OpenCL GPU %s.",ctx.name.c_str());
-			ctx.DeviceID = device_list[k];
-			ctxVec.push_back(ctx);
+			clStatus = clGetDeviceIDs( platforms[index], CL_DEVICE_TYPE_GPU, 0, NULL, &num_devices);
+			if(clStatus == CL_SUCCESS)
+			{
+				device_list = (cl_device_id *) malloc(sizeof(cl_device_id)*num_devices);
+				clStatus = clGetDeviceIDs( platforms[index], CL_DEVICE_TYPE_GPU, num_devices, device_list, NULL);
+				if(clStatus == CL_SUCCESS)
+				{
+					for (int k = 0; k < num_devices; k++)
+					{
+						cl_int clError;
+						std::vector<char> devVendorVec(1024);
+						clError = clGetDeviceInfo(device_list[k], CL_DEVICE_VENDOR, devVendorVec.size(), devVendorVec.data(), NULL);
+						if(clStatus == CL_SUCCESS)
+						{
+							std::string devVendor(devVendorVec.data());
+							if( devVendor.find("Advanced Micro Devices") != std::string::npos)
+							{
+								GpuContext ctx;
+								ctx.deviceIdx = k;
+								clError = clGetDeviceInfo(device_list[k], CL_DEVICE_MAX_COMPUTE_UNITS, sizeof(int), &(ctx.computeUnits), NULL);
+								size_t maxMem;
+								clError = clGetDeviceInfo(device_list[k], CL_DEVICE_MAX_MEM_ALLOC_SIZE, sizeof(size_t), &(maxMem), NULL);
+								clError = clGetDeviceInfo(device_list[k], CL_DEVICE_GLOBAL_MEM_SIZE, sizeof(size_t), &(ctx.freeMem), NULL);
+								// if environment variable GPU_SINGLE_ALLOC_PERCENT is not set we can not allocate the full memory
+								ctx.freeMem = std::min(ctx.freeMem, maxMem);
+								std::vector<char> devNameVec(1024);
+								clError = clGetDeviceInfo(device_list[k], CL_DEVICE_NAME, devNameVec.size(), devNameVec.data(), NULL);
+								ctx.name = std::string(devNameVec.data());
+								printer::inst()->print_msg(L0,"Found OpenCL GPU %s.",ctx.name.c_str());
+								ctx.DeviceID = device_list[k];
+								ctxVec.push_back(ctx);
+							}
+						}
+						else
+							printer::inst()->print_msg(L1,"WARNING: %s when calling clGetDeviceInfo to get the device vendor name.", err_to_str(clStatus));
+					}
+				}
+				else
+					printer::inst()->print_msg(L1,"WARNING: %s when calling clGetDeviceIDs for device information.", err_to_str(clStatus));
+				free(device_list);
+			}
+			else
+				printer::inst()->print_msg(L1,"WARNING: %s when calling clGetDeviceIDs for of devices.", err_to_str(clStatus));
 		}
+		else
+			printer::inst()->print_msg(L1,"WARNING: %s when calling clGetPlatformIDs for platform information.", err_to_str(clStatus));
 	}
-
-
-	free(device_list);
+	
 	free(platforms);
 
 	return ctxVec;
@@ -504,20 +528,25 @@ int getAMDPlatformIdx()
 
 	int platformIndex = -1;
 
-	for (int i = 0; i < numPlatforms; i++) {
-		size_t infoSize;
-		clGetPlatformInfo(platforms[i], CL_PLATFORM_VENDOR, 0, NULL, &infoSize);
-		std::vector<char> platformNameVec(infoSize);
+	if(clStatus == CL_SUCCESS)
+	{
+		for (int i = 0; i < numPlatforms; i++) {
+			size_t infoSize;
+			clGetPlatformInfo(platforms[i], CL_PLATFORM_VENDOR, 0, NULL, &infoSize);
+			std::vector<char> platformNameVec(infoSize);
 
-		clGetPlatformInfo(platforms[i], CL_PLATFORM_VENDOR, infoSize, platformNameVec.data(), NULL);
-		std::string platformName(platformNameVec.data());
-		if( platformName.find("Advanced Micro Devices") != std::string::npos)
-		{
-			platformIndex = i;
-			printer::inst()->print_msg(L0,"Found AMD platform index id = %i, name = %s",i , platformName.c_str());
-			break;
+			clGetPlatformInfo(platforms[i], CL_PLATFORM_VENDOR, infoSize, platformNameVec.data(), NULL);
+			std::string platformName(platformNameVec.data());
+			if( platformName.find("Advanced Micro Devices") != std::string::npos)
+			{
+				platformIndex = i;
+				printer::inst()->print_msg(L0,"Found AMD platform index id = %i, name = %s",i , platformName.c_str());
+				break;
+			}
 		}
 	}
+	else
+		printer::inst()->print_msg(L1,"WARNING: %s when calling clGetPlatformIDs for platform information.", err_to_str(clStatus));
 
 	free(platforms);
 	return platformIndex;
@@ -547,27 +576,6 @@ size_t InitOpenCL(GpuContext* ctx, size_t num_gpus, size_t platform_idx)
 		return ERR_STUPID_PARAMS;
 	}
 
-
-
-	cl_platform_id * platforms = NULL;
-	cl_int clStatus;
-	uint32_t numPlatforms = getNumPlatforms();
-
-	platforms = (cl_platform_id *) malloc(sizeof(cl_platform_id) * numPlatforms);
-	clStatus = clGetPlatformIDs(numPlatforms, platforms, NULL);
-
-	size_t infoSize;
-	clGetPlatformInfo(platforms[platform_idx], CL_PLATFORM_VENDOR, 0, NULL, &infoSize);
-	std::vector<char> platformNameVec(infoSize);
-	clGetPlatformInfo(platforms[platform_idx], CL_PLATFORM_VENDOR, infoSize, platformNameVec.data(), NULL);
-	std::string platformName(platformNameVec.data());
-	if( platformName.find("Advanced Micro Devices") == std::string::npos)
-	{
-		printer::inst()->print_msg(L1,"WARNING: using non AMD device: %s", platformName.c_str());
-	}
-
-	free(platforms);
-
 	/*MSVC skimping on devel costs by shoehorning C99 to be a subset of C++? Noooo... can't be.*/
 #ifdef __GNUC__
 	cl_platform_id PlatformIDList[entries];
@@ -580,6 +588,16 @@ size_t InitOpenCL(GpuContext* ctx, size_t num_gpus, size_t platform_idx)
 		return ERR_OCL_API;
 	}
 
+	size_t infoSize;
+	clGetPlatformInfo(PlatformIDList[platform_idx], CL_PLATFORM_VENDOR, 0, NULL, &infoSize);
+	std::vector<char> platformNameVec(infoSize);
+	clGetPlatformInfo(PlatformIDList[platform_idx], CL_PLATFORM_VENDOR, infoSize, platformNameVec.data(), NULL);
+	std::string platformName(platformNameVec.data());
+	if( platformName.find("Advanced Micro Devices") == std::string::npos)
+	{
+		printer::inst()->print_msg(L1,"WARNING: using non AMD device: %s", platformName.c_str());
+	}
+
 	if((ret = clGetDeviceIDs(PlatformIDList[platform_idx], CL_DEVICE_TYPE_GPU, 0, NULL, &entries)) != CL_SUCCESS)
 	{
 		printer::inst()->print_msg(L1,"Error %s when calling clGetDeviceIDs for number of devices.", err_to_str(ret));