Rooba
/
boinc
mirror of https://github.com/BOINC/boinc.git
1
0
Fork 0
Code Issues 1 Packages Projects Releases Wiki Activity

client: debug Apple Silicon GPU detection

This commit is contained in:
David Anderson 2024-02-05 03:10:16 +01:00
parent 61e2f05f17
commit 1597316b97
3 changed files with 31 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

38
client/gpu_detect.cpp
View File

@ -212,7 +212,8 @@ void COPROCS::detect_gpus(vector<string> &warnings) {
catch (...) {
gpu_warning(warnings, "Caught SIGSEGV in OpenCL detection");
}
#else
#else // non-Windows
void (*old_sig)(int) = signal(SIGSEGV, segv_handler);
if (setjmp(resume)) {
gpu_warning(warnings, "Caught SIGSEGV in NVIDIA GPU detection");
@ -227,6 +228,8 @@ void COPROCS::detect_gpus(vector<string> &warnings) {
} else {
ati.get(warnings);
}
#else
apple_gpu.get(warnings);
#endif
if (setjmp(resume)) {
gpu_warning(warnings, "Caught SIGSEGV in INTEL GPU detection");
@ -848,24 +851,33 @@ void COPROC_APPLE::get(vector<string>&) {
if (retval) return;
FILE* f = fopen("temp", "r");
if (!f) return;
char buf[256], model[256];
int n, metal;
bool have_model=false, have_ncores=false, have_metal=false;
char buf[256], chipset_model[256];
int n, metalv;
bool have_model=false, have_ncores=false, have_metalv=false;
while (fgets(buf, sizeof(buf), f)) {
if (sscanf(buf, "%*[ ]Chipset Model: %[^\n]", model) == 1) {
if (sscanf(buf, "%*[ ]Chipset Model: %[^\n]", chipset_model) == 1) {
have_model = true;
} else if (sscanf(buf, "%*[ ]Total Number of Cores: %d", n) == 1) {
} else if (sscanf(buf, "%*[ ]Total Number of Cores: %d", &n) == 1) {
have_ncores = true;
} else if (sscanf(buf, "%*[ ]Metal Support: %[^\n]", metal) == 1) {
have_metal = true;
} else if (sscanf(buf, "%*[ ]Metal Support: Metal %d", &metalv) == 1) {
have_metalv = true;
}
}
fclose(f);
if (have_model && have_ncores && have_metal) {
count = 1;
safe_strcpy(chipset_model, model);
ncores = n;
metal_support = metal;
if (have_model && have_ncores && have_metalv) {
COPROC_APPLE ca;
ca.count = 1;
safe_strcpy(ca.model, chipset_model);
ca.ncores = n;
ca.metal_support = metalv;
ca.have_metal = true;
apple_gpus.push_back(ca);
}
}
void COPROC_APPLE::correlate(bool, vector<int> &ignore_devs) {
if (!ignore_devs.empty() && ignore_devs[0]==0) return;
if (apple_gpus.empty()) return;
*this = apple_gpus[0];
}
#endif

11
client/gpu_opencl.cpp
View File

@ -717,12 +717,6 @@ void COPROCS::get_opencl(
prop.opencl_available_ram = prop.global_mem_size;
apple_gpu_opencls.push_back(prop);
// At present Apple GPUs only support OpenCL
// and do not have a native GPGPU framework,
// so treat each detected GPU as a native device.
//
apple_gpus.push_back(c);
} else {
//////////// OTHER GPU OR ACCELERATOR //////////////
// Put each coprocessor instance into a separate other_opencls element
@ -857,9 +851,12 @@ void COPROCS::correlate_opencl(
use_all, apple_gpu_opencls,
ignore_gpu_instance[PROC_TYPE_APPLE_GPU]
);
apple_gpu.available_ram = apple_gpu.opencl_prop.global_mem_size;
safe_strcpy(apple_gpu.model, apple_gpu.opencl_prop.name);
}
apple_gpu.set_peak_flops();
if (!apple_gpu.available_ram) {
apple_gpu.available_ram = apple_gpu.opencl_prop.global_mem_size;
}
}
}

4
lib/coproc.h
View File

@ -382,8 +382,8 @@ struct COPROC_APPLE : public COPROC {
#endif
COPROC_APPLE(int): COPROC() {}
COPROC_APPLE(): COPROC() {clear();}
void get(std::vector<std::string>& ) {};
void correlate(bool , std::vector<int>& ) {};
void get(std::vector<std::string>&);
void correlate(bool , std::vector<int>&);
void clear();
int parse(XML_PARSER&);
void set_peak_flops();