arno/hashcat
1
0
Fork 0
mirror of https://github.com/hashcat/hashcat.git synced 2025-01-03 20:31:08 +00:00
Code Issues Releases Wiki Activity

Merge pull request #3168 from matrix/opencl_apple_silicon_deviceType

Browse Source 
OpenCL Backend: show device_type in device list info on Apple Silicon
This commit is contained in:
Jens Steube 2022-02-12 20:45:02 +01:00 committed by GitHub
commit 7ea244bba7
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 26 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
docs/changes.txt
View File

@ -58,6 +58,7 @@
- Metal Runtime: added support for vectors up to 4 - Metal Runtime: added support for vectors up to 4
- OpenCL Backend: added workaround to make optimized kernels work on Apple Silicon - OpenCL Backend: added workaround to make optimized kernels work on Apple Silicon
- OpenCL Backend: moved functions to ext_OpenCL.c and includes to ext_OpenCL.h - OpenCL Backend: moved functions to ext_OpenCL.c and includes to ext_OpenCL.h
- OpenCL Backend: show device_type in device list info on Apple Silicon
- OpenCL Kernel: Set native_threads to 32 on Apple GPU's for various hash-modes - OpenCL Kernel: Set native_threads to 32 on Apple GPU's for various hash-modes
- OpenCL Runtime: Added support to use Apple Silicon compute devices - OpenCL Runtime: Added support to use Apple Silicon compute devices
- OpenCL Runtime: Add some unstable warnings detected on macOS - OpenCL Runtime: Add some unstable warnings detected on macOS

18
src/terminal.c
View File

@ -1387,6 +1387,23 @@ void backend_info_compact (hashcat_ctx_t *hashcat_ctx)
u64 device_available_mem = device_param->device_available_mem; u64 device_available_mem = device_param->device_available_mem;
if ((device_param->skipped == false) && (device_param->skipped_warning == false)) if ((device_param->skipped == false) && (device_param->skipped_warning == false))
{
if (strncmp (device_name, "Apple M", 7) == 0)
{
cl_device_type opencl_device_type = device_param->opencl_device_type;
const char *device_type_desc = ((opencl_device_type & CL_DEVICE_TYPE_CPU) ? "CPU" : ((opencl_device_type & CL_DEVICE_TYPE_GPU) ? "GPU" : "Accelerator"));
event_log_info (hashcat_ctx, "* Device #%u: %s, %s, %" PRIu64 "/%" PRIu64 " MB (%" PRIu64 " MB allocatable), %uMCU",
device_id + 1,
device_name,
device_type_desc,
device_available_mem / 1024 / 1024,
device_global_mem / 1024 / 1024,
device_maxmem_alloc / 1024 / 1024,
device_processors);
}
else
{ {
event_log_info (hashcat_ctx, "* Device #%u: %s, %" PRIu64 "/%" PRIu64 " MB (%" PRIu64 " MB allocatable), %uMCU", event_log_info (hashcat_ctx, "* Device #%u: %s, %" PRIu64 "/%" PRIu64 " MB (%" PRIu64 " MB allocatable), %uMCU",
device_id + 1, device_id + 1,
@ -1396,6 +1413,7 @@ void backend_info_compact (hashcat_ctx_t *hashcat_ctx)
device_maxmem_alloc / 1024 / 1024, device_maxmem_alloc / 1024 / 1024,
device_processors); device_processors);
} }
}
else else
{ {
event_log_info (hashcat_ctx, "* Device #%u: %s, skipped", event_log_info (hashcat_ctx, "* Device #%u: %s, skipped",