Create real opencl.c to better distinguish between opencl helper functions and library handling functions

src/Makefile

@@ -165,7 +165,7 @@ LFLAGS_CROSS_WIN         := -lpsapi
 ## Objects
 ##
 
-NATIVE_OBJS              := obj/affinity.NATIVE.o obj/filehandling.NATIVE.o obj/tuningdb.NATIVE.o obj/locking.NATIVE.o obj/folder.NATIVE.o obj/bitops.NATIVE.o obj/convert.NATIVE.o obj/cpu_aes.NATIVE.o obj/cpu_crc32.NATIVE.o obj/cpu_des.NATIVE.o obj/cpu_md5.NATIVE.o obj/cpu_sha1.NATIVE.o obj/cpu_sha256.NATIVE.o obj/data.NATIVE.o obj/ext_OpenCL.NATIVE.o obj/hwmon.NATIVE.o obj/interface.NATIVE.o obj/logfile.NATIVE.o obj/logging.NATIVE.o obj/memory.NATIVE.o obj/mpsp.NATIVE.o obj/rp_cpu.NATIVE.o obj/rp_kernel_on_cpu.NATIVE.o obj/shared.NATIVE.o obj/terminal.NATIVE.o obj/usage.NATIVE.o
+NATIVE_OBJS              := obj/opencl.NATIVE.o obj/affinity.NATIVE.o obj/filehandling.NATIVE.o obj/tuningdb.NATIVE.o obj/locking.NATIVE.o obj/folder.NATIVE.o obj/bitops.NATIVE.o obj/convert.NATIVE.o obj/cpu_aes.NATIVE.o obj/cpu_crc32.NATIVE.o obj/cpu_des.NATIVE.o obj/cpu_md5.NATIVE.o obj/cpu_sha1.NATIVE.o obj/cpu_sha256.NATIVE.o obj/data.NATIVE.o obj/ext_OpenCL.NATIVE.o obj/hwmon.NATIVE.o obj/interface.NATIVE.o obj/logfile.NATIVE.o obj/logging.NATIVE.o obj/memory.NATIVE.o obj/mpsp.NATIVE.o obj/rp_cpu.NATIVE.o obj/rp_kernel_on_cpu.NATIVE.o obj/shared.NATIVE.o obj/terminal.NATIVE.o obj/usage.NATIVE.o
 
 ifeq ($(UNAME),Linux)
 NATIVE_OBJS              += obj/ext_ADL.NATIVE.o
@@ -174,8 +174,8 @@ NATIVE_OBJS              += obj/ext_nvml.NATIVE.o
 NATIVE_OBJS              += obj/ext_xnvctrl.NATIVE.o
 endif
 
-LINUX_32_OBJS            := obj/affinity.LINUX.32.o obj/filehandling.LINUX.32.o obj/tuningdb.LINUX.32.o obj/locking.LINUX.32.o obj/folder.LINUX.32.o obj/bitops.LINUX.32.o obj/convert.LINUX.32.o obj/cpu_aes.LINUX.32.o obj/cpu_crc32.LINUX.32.o obj/cpu_des.LINUX.32.o obj/cpu_md5.LINUX.32.o obj/cpu_sha1.LINUX.32.o obj/cpu_sha256.LINUX.32.o obj/data.LINUX.32.o obj/ext_ADL.LINUX.32.o obj/ext_nvapi.LINUX.32.o obj/ext_nvml.LINUX.32.o obj/ext_OpenCL.LINUX.32.o obj/ext_xnvctrl.LINUX.32.o obj/hwmon.LINUX.32.o obj/interface.LINUX.32.o obj/logfile.LINUX.32.o obj/logging.LINUX.32.o obj/memory.LINUX.32.o obj/mpsp.LINUX.32.o obj/rp_cpu.LINUX.32.o obj/rp_kernel_on_cpu.LINUX.32.o obj/shared.LINUX.32.o obj/terminal.LINUX.32.o obj/usage.LINUX.32.o
-LINUX_64_OBJS            := obj/affinity.LINUX.64.o obj/filehandling.LINUX.64.o obj/tuningdb.LINUX.64.o obj/locking.LINUX.64.o obj/folder.LINUX.64.o obj/bitops.LINUX.64.o obj/convert.LINUX.64.o obj/cpu_aes.LINUX.64.o obj/cpu_crc32.LINUX.64.o obj/cpu_des.LINUX.64.o obj/cpu_md5.LINUX.64.o obj/cpu_sha1.LINUX.64.o obj/cpu_sha256.LINUX.64.o obj/data.LINUX.64.o obj/ext_ADL.LINUX.64.o obj/ext_nvapi.LINUX.64.o obj/ext_nvml.LINUX.64.o obj/ext_OpenCL.LINUX.64.o obj/ext_xnvctrl.LINUX.64.o obj/hwmon.LINUX.64.o obj/interface.LINUX.64.o obj/logfile.LINUX.64.o obj/logging.LINUX.64.o obj/memory.LINUX.64.o obj/mpsp.LINUX.64.o obj/rp_cpu.LINUX.64.o obj/rp_kernel_on_cpu.LINUX.64.o obj/shared.LINUX.64.o obj/terminal.LINUX.64.o obj/usage.LINUX.64.o
+LINUX_32_OBJS            := obj/opencl.LINUX.32.o obj/affinity.LINUX.32.o obj/filehandling.LINUX.32.o obj/tuningdb.LINUX.32.o obj/locking.LINUX.32.o obj/folder.LINUX.32.o obj/bitops.LINUX.32.o obj/convert.LINUX.32.o obj/cpu_aes.LINUX.32.o obj/cpu_crc32.LINUX.32.o obj/cpu_des.LINUX.32.o obj/cpu_md5.LINUX.32.o obj/cpu_sha1.LINUX.32.o obj/cpu_sha256.LINUX.32.o obj/data.LINUX.32.o obj/ext_ADL.LINUX.32.o obj/ext_nvapi.LINUX.32.o obj/ext_nvml.LINUX.32.o obj/ext_OpenCL.LINUX.32.o obj/ext_xnvctrl.LINUX.32.o obj/hwmon.LINUX.32.o obj/interface.LINUX.32.o obj/logfile.LINUX.32.o obj/logging.LINUX.32.o obj/memory.LINUX.32.o obj/mpsp.LINUX.32.o obj/rp_cpu.LINUX.32.o obj/rp_kernel_on_cpu.LINUX.32.o obj/shared.LINUX.32.o obj/terminal.LINUX.32.o obj/usage.LINUX.32.o
+LINUX_64_OBJS            := obj/opencl.LINUX.64.o obj/affinity.LINUX.64.o obj/filehandling.LINUX.64.o obj/tuningdb.LINUX.64.o obj/locking.LINUX.64.o obj/folder.LINUX.64.o obj/bitops.LINUX.64.o obj/convert.LINUX.64.o obj/cpu_aes.LINUX.64.o obj/cpu_crc32.LINUX.64.o obj/cpu_des.LINUX.64.o obj/cpu_md5.LINUX.64.o obj/cpu_sha1.LINUX.64.o obj/cpu_sha256.LINUX.64.o obj/data.LINUX.64.o obj/ext_ADL.LINUX.64.o obj/ext_nvapi.LINUX.64.o obj/ext_nvml.LINUX.64.o obj/ext_OpenCL.LINUX.64.o obj/ext_xnvctrl.LINUX.64.o obj/hwmon.LINUX.64.o obj/interface.LINUX.64.o obj/logfile.LINUX.64.o obj/logging.LINUX.64.o obj/memory.LINUX.64.o obj/mpsp.LINUX.64.o obj/rp_cpu.LINUX.64.o obj/rp_kernel_on_cpu.LINUX.64.o obj/shared.LINUX.64.o obj/terminal.LINUX.64.o obj/usage.LINUX.64.o
 
 # Windows CRT file globbing:
 
@@ -185,8 +185,8 @@ CRT_GLOB_INCLUDE_FOLDER  := $(dir $(lastword $(MAKEFILE_LIST)))
 
 include $(CRT_GLOB_INCLUDE_FOLDER)/win_file_globbing.mk
 
-WIN_32_OBJS              := obj/affinity.WIN.32.o obj/filehandling.WIN.32.o obj/tuningdb.WIN.32.o obj/locking.WIN.32.o obj/folder.WIN.32.o obj/bitops.WIN.32.o obj/convert.WIN.32.o obj/cpu_aes.WIN.32.o obj/cpu_crc32.WIN.32.o obj/cpu_des.WIN.32.o obj/cpu_md5.WIN.32.o obj/cpu_sha1.WIN.32.o obj/cpu_sha256.WIN.32.o obj/data.WIN.32.o obj/ext_ADL.WIN.32.o obj/ext_nvapi.WIN.32.o obj/ext_nvml.WIN.32.o obj/ext_OpenCL.WIN.32.o obj/ext_xnvctrl.WIN.32.o obj/hwmon.WIN.32.o obj/interface.WIN.32.o obj/logfile.WIN.32.o obj/logging.WIN.32.o obj/memory.WIN.32.o obj/mpsp.WIN.32.o obj/rp_cpu.WIN.32.o obj/rp_kernel_on_cpu.WIN.32.o obj/shared.WIN.32.o obj/terminal.WIN.32.o obj/usage.WIN.32.o $(CRT_GLOB_32)
-WIN_64_OBJS              := obj/affinity.WIN.64.o obj/filehandling.WIN.64.o obj/tuningdb.WIN.64.o obj/locking.WIN.64.o obj/folder.WIN.64.o obj/bitops.WIN.64.o obj/convert.WIN.64.o obj/cpu_aes.WIN.64.o obj/cpu_crc32.WIN.64.o obj/cpu_des.WIN.64.o obj/cpu_md5.WIN.64.o obj/cpu_sha1.WIN.64.o obj/cpu_sha256.WIN.64.o obj/data.WIN.64.o obj/ext_ADL.WIN.64.o obj/ext_nvapi.WIN.64.o obj/ext_nvml.WIN.64.o obj/ext_OpenCL.WIN.64.o obj/ext_xnvctrl.WIN.64.o obj/hwmon.WIN.64.o obj/interface.WIN.64.o obj/logfile.WIN.64.o obj/logging.WIN.64.o obj/memory.WIN.64.o obj/mpsp.WIN.64.o obj/rp_cpu.WIN.64.o obj/rp_kernel_on_cpu.WIN.64.o obj/shared.WIN.64.o obj/terminal.WIN.64.o obj/usage.WIN.64.o $(CRT_GLOB_64)
+WIN_32_OBJS              := obj/opencl.WIN.32.o obj/affinity.WIN.32.o obj/filehandling.WIN.32.o obj/tuningdb.WIN.32.o obj/locking.WIN.32.o obj/folder.WIN.32.o obj/bitops.WIN.32.o obj/convert.WIN.32.o obj/cpu_aes.WIN.32.o obj/cpu_crc32.WIN.32.o obj/cpu_des.WIN.32.o obj/cpu_md5.WIN.32.o obj/cpu_sha1.WIN.32.o obj/cpu_sha256.WIN.32.o obj/data.WIN.32.o obj/ext_ADL.WIN.32.o obj/ext_nvapi.WIN.32.o obj/ext_nvml.WIN.32.o obj/ext_OpenCL.WIN.32.o obj/ext_xnvctrl.WIN.32.o obj/hwmon.WIN.32.o obj/interface.WIN.32.o obj/logfile.WIN.32.o obj/logging.WIN.32.o obj/memory.WIN.32.o obj/mpsp.WIN.32.o obj/rp_cpu.WIN.32.o obj/rp_kernel_on_cpu.WIN.32.o obj/shared.WIN.32.o obj/terminal.WIN.32.o obj/usage.WIN.32.o $(CRT_GLOB_32)
+WIN_64_OBJS              := obj/opencl.WIN.64.o obj/affinity.WIN.64.o obj/filehandling.WIN.64.o obj/tuningdb.WIN.64.o obj/locking.WIN.64.o obj/folder.WIN.64.o obj/bitops.WIN.64.o obj/convert.WIN.64.o obj/cpu_aes.WIN.64.o obj/cpu_crc32.WIN.64.o obj/cpu_des.WIN.64.o obj/cpu_md5.WIN.64.o obj/cpu_sha1.WIN.64.o obj/cpu_sha256.WIN.64.o obj/data.WIN.64.o obj/ext_ADL.WIN.64.o obj/ext_nvapi.WIN.64.o obj/ext_nvml.WIN.64.o obj/ext_OpenCL.WIN.64.o obj/ext_xnvctrl.WIN.64.o obj/hwmon.WIN.64.o obj/interface.WIN.64.o obj/logfile.WIN.64.o obj/logging.WIN.64.o obj/memory.WIN.64.o obj/mpsp.WIN.64.o obj/rp_cpu.WIN.64.o obj/rp_kernel_on_cpu.WIN.64.o obj/shared.WIN.64.o obj/terminal.WIN.64.o obj/usage.WIN.64.o $(CRT_GLOB_64)
 
 ##
 ## Targets: Global

src/data.c

@@ -15,6 +15,7 @@
 #include "hwmon.h"
 #include "mpsp.h"
 #include "rp_cpu.h"
+#include "opencl.h"
 #include "data.h"
 
 hc_global_data_t data;

src/ext_OpenCL.c

@@ -7,10 +7,8 @@
 
 #include "common.h"
 #include "types_int.h"
-#include "types.h"
 #include "memory.h"
 #include "logging.h"
-#include "timer.h"
 #include "dynloader.h"
 #include "ext_OpenCL.h"
 

src/hashcat.c

@@ -45,6 +45,7 @@
 #include "cpu_sha1.h"
 #include "cpu_sha256.h"
 #include "filehandling.h"
+#include "opencl.h"
 #include "tuningdb.h"
 #include "thread.h"
 #include "locking.h"

src/hwmon.c

@@ -19,6 +19,7 @@
 #include "hwmon.h"
 #include "mpsp.h"
 #include "rp_cpu.h"
+#include "opencl.h"
 #include "data.h"
 
 #ifdef HAVE_HWMON

src/interface.c

@@ -33,6 +33,7 @@
 #include "hwmon.h"
 #include "mpsp.h"
 #include "rp_cpu.h"
+#include "opencl.h"
 #include "data.h"
 #include "interface.h"
 

src/logfile.c

@@ -23,6 +23,7 @@
 #include "hwmon.h"
 #include "rp_cpu.h"
 #include "mpsp.h"
+#include "opencl.h"
 #include "data.h"
 #include "logfile.h"
 

src/mpsp.c

@@ -26,6 +26,7 @@
 #include "hwmon.h"
 #include "mpsp.h"
 #include "rp_cpu.h"
+#include "opencl.h"
 #include "data.h"
 #include "shared.h"
 

src/opencl.c

@@ -0,0 +1,123 @@
+/**
+ * Authors.....: Jens Steube <jens.steube@gmail.com>
+ *               Gabriele Gristina <matrix@hashcat.net>
+ *
+ * License.....: MIT
+ */
+
+#include "common.h"
+#include "types_int.h"
+#include "types.h"
+#include "memory.h"
+#include "logging.h"
+#include "ext_OpenCL.h"
+#include "timer.h"
+#include "opencl.h"
+
+uint setup_opencl_platforms_filter (char *opencl_platforms)
+{
+  uint opencl_platforms_filter = 0;
+
+  if (opencl_platforms)
+  {
+    char *platforms = mystrdup (opencl_platforms);
+
+    char *next = strtok (platforms, ",");
+
+    do
+    {
+      int platform = atoi (next);
+
+      if (platform < 1 || platform > 32)
+      {
+        log_error ("ERROR: Invalid OpenCL platform %u specified", platform);
+
+        exit (-1);
+      }
+
+      opencl_platforms_filter |= 1u << (platform - 1);
+
+    } while ((next = strtok (NULL, ",")) != NULL);
+
+    myfree (platforms);
+  }
+  else
+  {
+    opencl_platforms_filter = -1u;
+  }
+
+  return opencl_platforms_filter;
+}
+
+u32 setup_devices_filter (char *opencl_devices)
+{
+  u32 devices_filter = 0;
+
+  if (opencl_devices)
+  {
+    char *devices = mystrdup (opencl_devices);
+
+    char *next = strtok (devices, ",");
+
+    do
+    {
+      int device_id = atoi (next);
+
+      if (device_id < 1 || device_id > 32)
+      {
+        log_error ("ERROR: Invalid device_id %u specified", device_id);
+
+        exit (-1);
+      }
+
+      devices_filter |= 1u << (device_id - 1);
+
+    } while ((next = strtok (NULL, ",")) != NULL);
+
+    myfree (devices);
+  }
+  else
+  {
+    devices_filter = -1u;
+  }
+
+  return devices_filter;
+}
+
+cl_device_type setup_device_types_filter (char *opencl_device_types)
+{
+  cl_device_type device_types_filter = 0;
+
+  if (opencl_device_types)
+  {
+    char *device_types = mystrdup (opencl_device_types);
+
+    char *next = strtok (device_types, ",");
+
+    do
+    {
+      int device_type = atoi (next);
+
+      if (device_type < 1 || device_type > 3)
+      {
+        log_error ("ERROR: Invalid device_type %u specified", device_type);
+
+        exit (-1);
+      }
+
+      device_types_filter |= 1u << device_type;
+
+    } while ((next = strtok (NULL, ",")) != NULL);
+
+    myfree (device_types);
+  }
+  else
+  {
+    // Do not use CPU by default, this often reduces GPU performance because
+    // the CPU is too busy to handle GPU synchronization
+
+    device_types_filter = CL_DEVICE_TYPE_ALL & ~CL_DEVICE_TYPE_CPU;
+  }
+
+  return device_types_filter;
+}

src/rp_cpu.c

@@ -25,6 +25,7 @@
 #include "hwmon.h"
 #include "mpsp.h"
 #include "rp_cpu.h"
+#include "opencl.h"
 #include "data.h"
 #include "shared.h"
 #include "rp_cpu.h"

src/shared.c

@@ -29,6 +29,7 @@
 #include "hwmon.h"
 #include "mpsp.h"
 #include "rp_cpu.h"
+#include "opencl.h"
 #include "data.h"
 #include "shared.h"
 
@@ -903,113 +904,6 @@ void handle_left_request_lm (pot_t *pot, uint pot_cnt, char *input_buf, int inpu
   if (weak_hash_found == 1) myfree (pot_right_ptr);
 }
 
-uint setup_opencl_platforms_filter (char *opencl_platforms)
-{
-  uint opencl_platforms_filter = 0;
-
-  if (opencl_platforms)
-  {
-    char *platforms = mystrdup (opencl_platforms);
-
-    char *next = strtok (platforms, ",");
-
-    do
-    {
-      int platform = atoi (next);
-
-      if (platform < 1 || platform > 32)
-      {
-        log_error ("ERROR: Invalid OpenCL platform %u specified", platform);
-
-        exit (-1);
-      }
-
-      opencl_platforms_filter |= 1u << (platform - 1);
-
-    } while ((next = strtok (NULL, ",")) != NULL);
-
-    myfree (platforms);
-  }
-  else
-  {
-    opencl_platforms_filter = -1u;
-  }
-
-  return opencl_platforms_filter;
-}
-
-u32 setup_devices_filter (char *opencl_devices)
-{
-  u32 devices_filter = 0;
-
-  if (opencl_devices)
-  {
-    char *devices = mystrdup (opencl_devices);
-
-    char *next = strtok (devices, ",");
-
-    do
-    {
-      int device_id = atoi (next);
-
-      if (device_id < 1 || device_id > 32)
-      {
-        log_error ("ERROR: Invalid device_id %u specified", device_id);
-
-        exit (-1);
-      }
-
-      devices_filter |= 1u << (device_id - 1);
-
-    } while ((next = strtok (NULL, ",")) != NULL);
-
-    myfree (devices);
-  }
-  else
-  {
-    devices_filter = -1u;
-  }
-
-  return devices_filter;
-}
-
-cl_device_type setup_device_types_filter (char *opencl_device_types)
-{
-  cl_device_type device_types_filter = 0;
-
-  if (opencl_device_types)
-  {
-    char *device_types = mystrdup (opencl_device_types);
-
-    char *next = strtok (device_types, ",");
-
-    do
-    {
-      int device_type = atoi (next);
-
-      if (device_type < 1 || device_type > 3)
-      {
-        log_error ("ERROR: Invalid device_type %u specified", device_type);
-
-        exit (-1);
-      }
-
-      device_types_filter |= 1u << device_type;
-
-    } while ((next = strtok (NULL, ",")) != NULL);
-
-    myfree (device_types);
-  }
-  else
-  {
-    // Do not use CPU by default, this often reduces GPU performance because
-    // the CPU is too busy to handle GPU synchronization
-
-    device_types_filter = CL_DEVICE_TYPE_ALL & ~CL_DEVICE_TYPE_CPU;
-  }
-
-  return device_types_filter;
-}
 
 u32 get_random_num (const u32 min, const u32 max)
 {

src/tuningdb.c

@@ -11,6 +11,7 @@
 #include "memory.h"
 #include "filehandling.h"
 #include "ext_OpenCL.h"
+#include "opencl.h"
 #include "tuningdb.h"
 
 static int sort_by_tuning_db_alias (const void *v1, const void *v2)