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

Set vector width size for CUDA

Browse Source
This commit is contained in:
Jens Steube 2019-05-01 18:20:19 +02:00
parent 3c4f4df771
commit 456c57a6d0
2 changed files with 64 additions and 28 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
include/types.h
View File

@ -1016,7 +1016,7 @@ typedef struct hc_device_param
st_status_t st_status; st_status_t st_status;
u32 vector_width; int vector_width;
u32 kernel_wgs1; u32 kernel_wgs1;
u32 kernel_wgs12; u32 kernel_wgs12;

90
src/backend.c
View File

@ -5404,7 +5404,7 @@ int backend_session_begin (hashcat_ctx_t *hashcat_ctx)
// vector_width // vector_width
cl_uint vector_width; int vector_width;
if (user_options->backend_vector_width_chgd == false) if (user_options->backend_vector_width_chgd == false)
{ {
@ -5425,15 +5425,35 @@ int backend_session_begin (hashcat_ctx_t *hashcat_ctx)
{ {
if (hashconfig->opti_type & OPTI_TYPE_USES_BITS_64) if (hashconfig->opti_type & OPTI_TYPE_USES_BITS_64)
{ {
CL_rc = hc_clGetDeviceInfo (hashcat_ctx, device_param->opencl_device, CL_DEVICE_NATIVE_VECTOR_WIDTH_LONG, sizeof (vector_width), &vector_width, NULL); if (device_param->is_cuda == true)
{
// cuda does not support this query
if (CL_rc == -1) return -1; vector_width = 1;
}
if (device_param->is_opencl == true)
{
CL_rc = hc_clGetDeviceInfo (hashcat_ctx, device_param->opencl_device, CL_DEVICE_NATIVE_VECTOR_WIDTH_LONG, sizeof (vector_width), &vector_width, NULL);
if (CL_rc == -1) return -1;
}
} }
else else
{ {
CL_rc = hc_clGetDeviceInfo (hashcat_ctx, device_param->opencl_device, CL_DEVICE_NATIVE_VECTOR_WIDTH_INT, sizeof (vector_width), &vector_width, NULL); if (device_param->is_cuda == true)
{
// cuda does not support this query
if (CL_rc == -1) return -1; vector_width = 1;
}
if (device_param->is_opencl == true)
{
CL_rc = hc_clGetDeviceInfo (hashcat_ctx, device_param->opencl_device, CL_DEVICE_NATIVE_VECTOR_WIDTH_INT, sizeof (vector_width), &vector_width, NULL);
if (CL_rc == -1) return -1;
}
} }
} }
else else
@ -5603,30 +5623,38 @@ int backend_session_begin (hashcat_ctx_t *hashcat_ctx)
* create context for each device * create context for each device
*/ */
/* if (device_param->is_cuda == true)
cl_context_properties properties[3]; {
properties[0] = CL_CONTEXT_PLATFORM; }
properties[1] = (cl_context_properties) device_param->opencl_platform;
properties[2] = 0;
CL_rc = hc_clCreateContext (hashcat_ctx, properties, 1, &device_param->opencl_device, NULL, NULL, &device_param->context); if (device_param->is_opencl == true)
*/ {
/*
cl_context_properties properties[3];
CL_rc = hc_clCreateContext (hashcat_ctx, NULL, 1, &device_param->opencl_device, NULL, NULL, &device_param->context); properties[0] = CL_CONTEXT_PLATFORM;
properties[1] = (cl_context_properties) device_param->opencl_platform;
properties[2] = 0;
if (CL_rc == -1) return -1; CL_rc = hc_clCreateContext (hashcat_ctx, properties, 1, &device_param->opencl_device, NULL, NULL, &device_param->context);
*/
/** CL_rc = hc_clCreateContext (hashcat_ctx, NULL, 1, &device_param->opencl_device, NULL, NULL, &device_param->context);
* create command-queue
*/
// not supported with NV if (CL_rc == -1) return -1;
// device_param->command_queue = hc_clCreateCommandQueueWithProperties (hashcat_ctx, device_param->opencl_device, NULL);
CL_rc = hc_clCreateCommandQueue (hashcat_ctx, device_param->context, device_param->opencl_device, CL_QUEUE_PROFILING_ENABLE, &device_param->command_queue); /**
* create command-queue
*/
if (CL_rc == -1) return -1; // not supported with NV
// device_param->command_queue = hc_clCreateCommandQueueWithProperties (hashcat_ctx, device_param->opencl_device, NULL);
CL_rc = hc_clCreateCommandQueue (hashcat_ctx, device_param->context, device_param->opencl_device, CL_QUEUE_PROFILING_ENABLE, &device_param->command_queue);
if (CL_rc == -1) return -1;
}
/** /**
* create input buffers on device : calculate size of fixed memory buffers * create input buffers on device : calculate size of fixed memory buffers
@ -5902,7 +5930,7 @@ int backend_session_begin (hashcat_ctx_t *hashcat_ctx)
if (rc_read_kernel == false) return -1; if (rc_read_kernel == false) return -1;
if (backend_ctx->nvrtc) if (device_param->is_cuda)
{ {
nvrtcProgram program; nvrtcProgram program;
@ -5982,7 +6010,7 @@ int backend_session_begin (hashcat_ctx_t *hashcat_ctx)
if (rc_nvrtcDestroyProgram == -1) return -1; if (rc_nvrtcDestroyProgram == -1) return -1;
} }
if (1) // later just else if (device_param->is_opencl)
{ {
CL_rc = hc_clCreateProgramWithSource (hashcat_ctx, device_param->context, 1, (const char **) kernel_sources, NULL, &device_param->program); CL_rc = hc_clCreateProgramWithSource (hashcat_ctx, device_param->context, 1, (const char **) kernel_sources, NULL, &device_param->program);
@ -6052,13 +6080,21 @@ int backend_session_begin (hashcat_ctx_t *hashcat_ctx)
if (rc_read_kernel == false) return -1; if (rc_read_kernel == false) return -1;
CL_rc = hc_clCreateProgramWithBinary (hashcat_ctx, device_param->context, 1, &device_param->opencl_device, kernel_lengths, (const unsigned char **) kernel_sources, NULL, &device_param->program); if (device_param->is_cuda)
{
if (CL_rc == -1) return -1; }
CL_rc = hc_clBuildProgram (hashcat_ctx, device_param->program, 1, &device_param->opencl_device, build_options_module_buf, NULL, NULL); if (device_param->is_opencl)
{
CL_rc = hc_clCreateProgramWithBinary (hashcat_ctx, device_param->context, 1, &device_param->opencl_device, kernel_lengths, (const unsigned char **) kernel_sources, NULL, &device_param->program);
if (CL_rc == -1) return -1; if (CL_rc == -1) return -1;
CL_rc = hc_clBuildProgram (hashcat_ctx, device_param->program, 1, &device_param->opencl_device, build_options_module_buf, NULL, NULL);
if (CL_rc == -1) return -1;
}
} }
hcfree (kernel_sources[0]); hcfree (kernel_sources[0]);