1
0
mirror of https://github.com/hashcat/hashcat.git synced 2024-11-27 02:18:21 +00:00

Make sure -T does not come in inflict with FIXED_LOCAL_SIZE

This commit is contained in:
jsteube 2019-03-20 10:22:26 +01:00
parent f08fe1fe90
commit aec49509b8
3 changed files with 42 additions and 21 deletions

View File

@ -88,6 +88,12 @@ char *module_jit_build_options (MAYBE_UNUSED const hashconfig_t *hashconfig, MAY
fixed_local_size = 1; fixed_local_size = 1;
} }
else else
{
if (user_options->kernel_threads_chgd == true)
{
fixed_local_size = user_options->kernel_threads;
}
else
{ {
u32 overhead = 0; u32 overhead = 0;
@ -104,6 +110,7 @@ char *module_jit_build_options (MAYBE_UNUSED const hashconfig_t *hashconfig, MAY
fixed_local_size = (device_param->device_local_mem_size - overhead) / 4096; fixed_local_size = (device_param->device_local_mem_size - overhead) / 4096;
} }
}
hc_asprintf (&jit_build_options, "-D FIXED_LOCAL_SIZE=%u", fixed_local_size); hc_asprintf (&jit_build_options, "-D FIXED_LOCAL_SIZE=%u", fixed_local_size);

View File

@ -81,6 +81,12 @@ char *module_jit_build_options (MAYBE_UNUSED const hashconfig_t *hashconfig, MAY
fixed_local_size = 1; fixed_local_size = 1;
} }
else else
{
if (user_options->kernel_threads_chgd == true)
{
fixed_local_size = user_options->kernel_threads;
}
else
{ {
u32 overhead = 0; u32 overhead = 0;
@ -91,6 +97,7 @@ char *module_jit_build_options (MAYBE_UNUSED const hashconfig_t *hashconfig, MAY
fixed_local_size = (device_param->device_local_mem_size - overhead) / 4096; fixed_local_size = (device_param->device_local_mem_size - overhead) / 4096;
} }
}
hc_asprintf (&jit_build_options, "-D FIXED_LOCAL_SIZE=%u", fixed_local_size); hc_asprintf (&jit_build_options, "-D FIXED_LOCAL_SIZE=%u", fixed_local_size);

View File

@ -73,6 +73,12 @@ char *module_jit_build_options (MAYBE_UNUSED const hashconfig_t *hashconfig, MAY
fixed_local_size = 1; fixed_local_size = 1;
} }
else else
{
if (user_options->kernel_threads_chgd == true)
{
fixed_local_size = user_options->kernel_threads;
}
else
{ {
u32 overhead = 0; u32 overhead = 0;
@ -83,6 +89,7 @@ char *module_jit_build_options (MAYBE_UNUSED const hashconfig_t *hashconfig, MAY
fixed_local_size = (device_param->device_local_mem_size - overhead) / 4096; fixed_local_size = (device_param->device_local_mem_size - overhead) / 4096;
} }
}
hc_asprintf (&jit_build_options, "-D FIXED_LOCAL_SIZE=%u", fixed_local_size); hc_asprintf (&jit_build_options, "-D FIXED_LOCAL_SIZE=%u", fixed_local_size);