Merge pull request #244 from DeadSix27/test-processor

Apple Platform GPU Detection support

Author: YukihoAA

src/main.cpp

@@ -150,6 +150,54 @@ static void dump_procs()
 			case W2XCONV_PROC_OPENCL:
 			{
 				type = "OpenCL";
+				switch (p->sub_type)
+				{
+					case W2XCONV_PROC_OPENCL_AMD_GPU:
+					{
+						type = "AMD-GPU";
+						break;
+					}
+					case W2XCONV_PROC_OPENCL_NVIDIA_GPU:
+					{
+						type = "NVIDIA-GPU";
+						break;
+					}
+					case W2XCONV_PROC_OPENCL_INTEL_GPU:
+					{
+						type = "INTEL-GPU";
+						break;
+					}
+					case W2XCONV_PROC_OPENCL_UNKNOWN_GPU:
+					{
+						type = "UNKOWN-GPU";
+						break;
+					}
+					case W2XCONV_PROC_OPENCL_AMD_CPU:
+					{
+						type = "AMD-CPU";
+						break;
+					}
+					case W2XCONV_PROC_OPENCL_INTEL_CPU:
+					{
+						type = "INTEL-CPU";
+						break;
+					}
+					case W2XCONV_PROC_OPENCL_UNKNOWN_CPU:
+					{
+						type = "UNKOWN-CPU";
+						break;
+					}
+					case W2XCONV_PROC_OPENCL_DEVICE_UNKNOWN:
+					{
+						type = "UNKOWN";
+						break;
+					}
+					default:
+					{
+						type = "OpenCV";
+						break;
+					}
+				}
 				break;
 			}
 			default:
@@ -159,7 +207,7 @@ static void dump_procs()
 			}
 		}
 
-		printf("%4d: %-45s(%-10s): num_core=%d\n", i, p->dev_name, type, p->num_core);
+		printf("%4d: %-47s(%-10s): num_core=%d\n", i, p->dev_name, type, p->num_core);
 	}
 }
 

src/modelHandler_OpenCL.cpp

@@ -185,6 +185,8 @@ namespace w2xc
 			clGetPlatformInfo(plts[i], CL_PLATFORM_NAME, 0, nullptr, &sz);
 			std::vector<char> name(sz);
 			clGetPlatformInfo(plts[i], CL_PLATFORM_NAME, sz, &name[0], &sz);
+			
+			printf("Platform: %s\n",&name[0]);
 
 			bool is_amd = strstr(&name[0], "AMD") != NULL;
 			bool is_apple = strstr(&name[0], "Apple") != NULL;
@@ -208,6 +210,12 @@ namespace w2xc
 				cl_device_type dtype;
 
 				clGetDeviceInfo(dev, CL_DEVICE_TYPE, sizeof(dtype), &dtype, NULL);
+
+				size_t dev_name_len;
+				clGetDeviceInfo(dev, CL_DEVICE_NAME, 0, nullptr, &dev_name_len);
+				std::vector<char> dev_name(dev_name_len + 1);
+				clGetDeviceInfo(dev, CL_DEVICE_NAME, dev_name_len, &dev_name[0], &dev_name_len);
+				
 				int sub_type = 0;
 
 				if (is_amd)
@@ -222,6 +230,25 @@ namespace w2xc
 				{
 					sub_type = W2XCONV_PROC_OPENCL_PLATFORM_INTEL;
 				}
+				else if (is_apple)
+				{
+					if(strstr(&dev_name[0], "AMD") != NULL || strstr(&dev_name[0], "Radeon") != NULL)
+					{
+						sub_type = W2XCONV_PROC_OPENCL_PLATFORM_AMD;
+					}
+					else if(strstr(&dev_name[0], "NVIDIA") != NULL || strstr(&dev_name[0], "GeForce") != NULL)
+					{
+						sub_type = W2XCONV_PROC_OPENCL_PLATFORM_NVIDIA;
+					}
+					else if(strstr(&dev_name[0], "Intel") != NULL)
+					{
+						sub_type = W2XCONV_PROC_OPENCL_PLATFORM_INTEL;
+					}
+					else
+					{
+						sub_type = W2XCONV_PROC_OPENCL_PLATFORM_UNKNOWN;
+					}
+				}
 				else
 				{
 					sub_type = W2XCONV_PROC_OPENCL_PLATFORM_UNKNOWN;
@@ -241,11 +268,6 @@ namespace w2xc
 				}
 
 				proc.sub_type = sub_type;
-
-				size_t dev_name_len;
-				clGetDeviceInfo(dev, CL_DEVICE_NAME, 0, nullptr, &dev_name_len);
-				std::vector<char> dev_name(dev_name_len + 1);
-				clGetDeviceInfo(dev, CL_DEVICE_NAME, dev_name_len, &dev_name[0], &dev_name_len);
 
 				proc.dev_name = strdup(&dev_name[0]);
 				proc.dev_id = cur_dev_id++;