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

Move AMD ROCm driver check out of a --force condition

Browse Source
This commit is contained in:
jsteube 2017-09-08 12:44:06 +02:00
parent ac9f1da747
commit 2b4be5d093
1 changed files with 19 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

29
src/opencl.c
View File

@ -3176,6 +3176,24 @@ int opencl_ctx_devices_init (hashcat_ctx_t *hashcat_ctx, const int comptime)
device_param->pcie_bus = amdtopo.pcie.bus; device_param->pcie_bus = amdtopo.pcie.bus;
device_param->pcie_device = amdtopo.pcie.device; device_param->pcie_device = amdtopo.pcie.device;
device_param->pcie_function = amdtopo.pcie.function; device_param->pcie_function = amdtopo.pcie.function;
// check for AMD ROCm driver
const char *t1 = strstr (device_param->driver_version, "(HSA,LC)");
const char *t2 = strstr (device_param->driver_version, "(PAL,LC)");
const char *t3 = strstr (device_param->driver_version, "(PAL,HSAIL)");
const char *t4 = strstr (device_param->driver_version, "(HSA, LC)");
const char *t5 = strstr (device_param->driver_version, "(PAL, LC)");
const char *t6 = strstr (device_param->driver_version, "(PAL, HSAIL)");
if ((t1 == NULL) && (t2 == NULL) && (t3 == NULL) && (t4 == NULL) && (t5 == NULL) && (t6 == NULL))
{
device_param->is_rocm = false;
}
else
{
device_param->is_rocm = true;
}
} }
if ((device_param->platform_vendor_id == VENDOR_ID_NV) && (device_param->device_vendor_id == VENDOR_ID_NV)) if ((device_param->platform_vendor_id == VENDOR_ID_NV) && (device_param->device_vendor_id == VENDOR_ID_NV))
@ -3286,14 +3304,7 @@ int opencl_ctx_devices_init (hashcat_ctx_t *hashcat_ctx, const int comptime)
bool amd_warn = true; bool amd_warn = true;
#if defined (__linux__) #if defined (__linux__)
const char *t1 = strstr (device_param->driver_version, "(HSA,LC)"); if (device_param->is_rocm == false)
const char *t2 = strstr (device_param->driver_version, "(PAL,LC)");
const char *t3 = strstr (device_param->driver_version, "(PAL,HSAIL)");
const char *t4 = strstr (device_param->driver_version, "(HSA, LC)");
const char *t5 = strstr (device_param->driver_version, "(PAL, LC)");
const char *t6 = strstr (device_param->driver_version, "(PAL, HSAIL)");
if ((t1 == NULL) && (t2 == NULL) && (t3 == NULL) && (t4 == NULL) && (t5 == NULL) && (t6 == NULL))
{ {
// AMDGPU-PRO Driver 16.40 and higher // AMDGPU-PRO Driver 16.40 and higher
if (atoi (device_param->driver_version) >= 2117) amd_warn = false; if (atoi (device_param->driver_version) >= 2117) amd_warn = false;
@ -3309,8 +3320,6 @@ int opencl_ctx_devices_init (hashcat_ctx_t *hashcat_ctx, const int comptime)
{ {
// Support for ROCm platform // Support for ROCm platform
if (atof (device_param->driver_version) >= 1.1) amd_warn = false; if (atof (device_param->driver_version) >= 1.1) amd_warn = false;
device_param->is_rocm = true;
} }
#elif defined (_WIN) #elif defined (_WIN)
// AMD Radeon Software 14.9 and higher, should be updated to 15.12 // AMD Radeon Software 14.9 and higher, should be updated to 15.12