arno/hashcat
1
0
Fork 0
mirror of https://github.com/hashcat/hashcat.git synced 2025-06-26 18:02:39 +00:00
Code Issues Releases Wiki Activity

Add support for Metal > 300 and reject support for older version

Browse Source
This commit is contained in:
Jens Steube 2022-11-16 14:26:54 +01:00
parent adcd3e3e87
commit 66b22fa644
2 changed files with 20 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
OpenCL/inc_vendor.h
View File

@ -12,7 +12,7 @@
#define IS_CUDA #define IS_CUDA
#elif defined __HIPCC__ #elif defined __HIPCC__
#define IS_HIP #define IS_HIP
#elif defined __METAL_MACOS__ #elif defined __METAL__
#define IS_METAL #define IS_METAL
#else #else
#define IS_OPENCL #define IS_OPENCL

21
src/backend.c
View File

@ -4503,7 +4503,19 @@ int backend_ctx_init (hashcat_ctx_t *hashcat_ctx)
if (hc_mtlRuntimeGetVersionString (hashcat_ctx, backend_ctx->metal_runtimeVersionStr, &version_len) == -1) return -1; if (hc_mtlRuntimeGetVersionString (hashcat_ctx, backend_ctx->metal_runtimeVersionStr, &version_len) == -1) return -1;
// TODO: needs version check if (atoi (backend_ctx->metal_runtimeVersionStr) < 300)
{
event_log_warning (hashcat_ctx, "Unsupported Apple Metal runtime version '%s' detected! Falling back to OpenCL...", backend_ctx->metal_runtimeVersionStr);
event_log_warning (hashcat_ctx, NULL);
rc_metal_init = -1;
backend_ctx->rc_metal_init = rc_metal_init;
backend_ctx->mtl = NULL;
mtl_close (hashcat_ctx);
}
} }
else else
{ {
@ -4511,6 +4523,8 @@ int backend_ctx_init (hashcat_ctx_t *hashcat_ctx)
backend_ctx->rc_metal_init = rc_metal_init; backend_ctx->rc_metal_init = rc_metal_init;
backend_ctx->mtl = NULL;
mtl_close (hashcat_ctx); mtl_close (hashcat_ctx);
} }
} }
@ -9265,8 +9279,11 @@ int backend_session_begin (hashcat_ctx_t *hashcat_ctx)
{ {
// set some limits with Metal // set some limits with Metal
device_param->kernel_threads_max = 128; device_param->kernel_threads_max = 64;
device_param->kernel_threads_min = MIN (device_param->kernel_threads_min, device_param->kernel_threads_max);
device_param->kernel_loops_max = 1024; // autotune go over ... device_param->kernel_loops_max = 1024; // autotune go over ...
device_param->kernel_loops_min = MIN (device_param->kernel_loops_min, device_param->kernel_loops_max);
} }
#endif #endif