From 5f7c47b461b7e3ffb727baeee62f41ac537cc0ba Mon Sep 17 00:00:00 2001
From: jsteube <jens.steube@gmail.com>
Date: Sun, 3 Jan 2016 01:48:05 +0100
Subject: [PATCH] Fix path to includes
---
OpenCL/amp_a0.cl | 2 +-
OpenCL/amp_a1.cl | 2 +-
OpenCL/amp_a3.cl | 2 +-
OpenCL/m00000_a0.cl | 8 ++++----
OpenCL/m00000_a1.cl | 8 ++++----
OpenCL/m00000_a3.cl | 8 ++++----
OpenCL/m00010_a0.cl | 8 ++++----
OpenCL/m00010_a1.cl | 8 ++++----
OpenCL/m00010_a3.cl | 8 ++++----
OpenCL/m00020_a0.cl | 8 ++++----
OpenCL/m00020_a1.cl | 8 ++++----
OpenCL/m00020_a3.cl | 8 ++++----
OpenCL/m00030_a0.cl | 8 ++++----
OpenCL/m00030_a1.cl | 8 ++++----
OpenCL/m00030_a3.cl | 8 ++++----
OpenCL/m00040_a0.cl | 8 ++++----
OpenCL/m00040_a1.cl | 8 ++++----
OpenCL/m00040_a3.cl | 8 ++++----
OpenCL/m00050_a0.cl | 8 ++++----
OpenCL/m00050_a1.cl | 8 ++++----
OpenCL/m00050_a3.cl | 8 ++++----
OpenCL/m00060_a0.cl | 8 ++++----
OpenCL/m00060_a1.cl | 8 ++++----
OpenCL/m00060_a3.cl | 8 ++++----
OpenCL/m00100_a0.cl | 8 ++++----
OpenCL/m00100_a1.cl | 8 ++++----
OpenCL/m00100_a3.cl | 8 ++++----
OpenCL/m00110_a0.cl | 8 ++++----
OpenCL/m00110_a1.cl | 8 ++++----
OpenCL/m00110_a3.cl | 8 ++++----
OpenCL/m00120_a0.cl | 8 ++++----
OpenCL/m00120_a1.cl | 8 ++++----
OpenCL/m00120_a3.cl | 8 ++++----
OpenCL/m00130_a0.cl | 8 ++++----
OpenCL/m00130_a1.cl | 8 ++++----
OpenCL/m00130_a3.cl | 8 ++++----
OpenCL/m00140_a0.cl | 8 ++++----
OpenCL/m00140_a1.cl | 8 ++++----
OpenCL/m00140_a3.cl | 8 ++++----
OpenCL/m00150_a0.cl | 8 ++++----
OpenCL/m00150_a1.cl | 8 ++++----
OpenCL/m00150_a3.cl | 8 ++++----
OpenCL/m00160_a0.cl | 8 ++++----
OpenCL/m00160_a1.cl | 8 ++++----
OpenCL/m00160_a3.cl | 8 ++++----
OpenCL/m00190_a0.cl | 8 ++++----
OpenCL/m00190_a1.cl | 8 ++++----
OpenCL/m00190_a3.cl | 8 ++++----
OpenCL/m00200_a0.cl | 8 ++++----
OpenCL/m00200_a1.cl | 8 ++++----
OpenCL/m00200_a3.cl | 8 ++++----
OpenCL/m00300_a0.cl | 8 ++++----
OpenCL/m00300_a1.cl | 8 ++++----
OpenCL/m00300_a3.cl | 8 ++++----
OpenCL/m00400.cl | 8 ++++----
OpenCL/m00500.cl | 8 ++++----
OpenCL/m00900_a0.cl | 8 ++++----
OpenCL/m00900_a1.cl | 8 ++++----
OpenCL/m00900_a3.cl | 8 ++++----
OpenCL/m01000_a0.cl | 8 ++++----
OpenCL/m01000_a1.cl | 8 ++++----
OpenCL/m01000_a3.cl | 8 ++++----
OpenCL/m01100_a0.cl | 8 ++++----
OpenCL/m01100_a1.cl | 8 ++++----
OpenCL/m01100_a3.cl | 8 ++++----
OpenCL/m01400_a0.cl | 8 ++++----
OpenCL/m01400_a1.cl | 8 ++++----
OpenCL/m01400_a3.cl | 8 ++++----
OpenCL/m01410_a0.cl | 8 ++++----
OpenCL/m01410_a1.cl | 8 ++++----
OpenCL/m01410_a3.cl | 8 ++++----
OpenCL/m01420_a0.cl | 8 ++++----
OpenCL/m01420_a1.cl | 8 ++++----
OpenCL/m01420_a3.cl | 8 ++++----
OpenCL/m01430_a0.cl | 8 ++++----
OpenCL/m01430_a1.cl | 8 ++++----
OpenCL/m01430_a3.cl | 8 ++++----
OpenCL/m01440_a0.cl | 8 ++++----
OpenCL/m01440_a1.cl | 8 ++++----
OpenCL/m01440_a3.cl | 8 ++++----
OpenCL/m01450_a0.cl | 8 ++++----
OpenCL/m01450_a1.cl | 8 ++++----
OpenCL/m01450_a3.cl | 8 ++++----
OpenCL/m01460_a0.cl | 8 ++++----
OpenCL/m01460_a1.cl | 8 ++++----
OpenCL/m01460_a3.cl | 8 ++++----
OpenCL/m01500_a0.cl | 8 ++++----
OpenCL/m01500_a1.cl | 8 ++++----
OpenCL/m01500_a3.cl | 8 ++++----
OpenCL/m01600.cl | 8 ++++----
OpenCL/m01700_a0.cl | 8 ++++----
OpenCL/m01700_a1.cl | 8 ++++----
OpenCL/m01700_a3.cl | 8 ++++----
OpenCL/m01710_a0.cl | 8 ++++----
OpenCL/m01710_a1.cl | 8 ++++----
OpenCL/m01710_a3.cl | 8 ++++----
OpenCL/m01720_a0.cl | 8 ++++----
OpenCL/m01720_a1.cl | 8 ++++----
OpenCL/m01720_a3.cl | 8 ++++----
OpenCL/m01730_a0.cl | 8 ++++----
OpenCL/m01730_a1.cl | 8 ++++----
OpenCL/m01730_a3.cl | 8 ++++----
OpenCL/m01740_a0.cl | 8 ++++----
OpenCL/m01740_a1.cl | 8 ++++----
OpenCL/m01740_a3.cl | 8 ++++----
OpenCL/m01750_a0.cl | 8 ++++----
OpenCL/m01750_a1.cl | 8 ++++----
OpenCL/m01750_a3.cl | 8 ++++----
OpenCL/m01760_a0.cl | 8 ++++----
OpenCL/m01760_a1.cl | 8 ++++----
OpenCL/m01760_a3.cl | 8 ++++----
OpenCL/m01800.cl | 8 ++++----
OpenCL/m02100.cl | 8 ++++----
OpenCL/m02400_a0.cl | 8 ++++----
OpenCL/m02400_a1.cl | 8 ++++----
OpenCL/m02400_a3.cl | 8 ++++----
OpenCL/m02410_a0.cl | 8 ++++----
OpenCL/m02410_a1.cl | 8 ++++----
OpenCL/m02410_a3.cl | 8 ++++----
OpenCL/m02500.cl | 8 ++++----
OpenCL/m02610_a0.cl | 8 ++++----
OpenCL/m02610_a1.cl | 8 ++++----
OpenCL/m02610_a3.cl | 8 ++++----
OpenCL/m02710_a0.cl | 8 ++++----
OpenCL/m02710_a1.cl | 8 ++++----
OpenCL/m02710_a3.cl | 8 ++++----
OpenCL/m02810_a0.cl | 8 ++++----
OpenCL/m02810_a1.cl | 8 ++++----
OpenCL/m02810_a3.cl | 8 ++++----
OpenCL/m03000_a0.cl | 8 ++++----
OpenCL/m03000_a1.cl | 8 ++++----
OpenCL/m03000_a3.cl | 8 ++++----
OpenCL/m03100_a0.cl | 8 ++++----
OpenCL/m03100_a1.cl | 8 ++++----
OpenCL/m03100_a3.cl | 8 ++++----
OpenCL/m03200.cl | 8 ++++----
OpenCL/m03710_a0.cl | 8 ++++----
OpenCL/m03710_a1.cl | 8 ++++----
OpenCL/m03710_a3.cl | 8 ++++----
OpenCL/m03800_a0.cl | 8 ++++----
OpenCL/m03800_a1.cl | 8 ++++----
OpenCL/m03800_a3.cl | 8 ++++----
OpenCL/m04310_a0.cl | 8 ++++----
OpenCL/m04310_a1.cl | 8 ++++----
OpenCL/m04310_a3.cl | 8 ++++----
OpenCL/m04400_a0.cl | 8 ++++----
OpenCL/m04400_a1.cl | 8 ++++----
OpenCL/m04400_a3.cl | 8 ++++----
OpenCL/m04500_a0.cl | 8 ++++----
OpenCL/m04500_a1.cl | 8 ++++----
OpenCL/m04500_a3.cl | 8 ++++----
OpenCL/m04700_a0.cl | 8 ++++----
OpenCL/m04700_a1.cl | 8 ++++----
OpenCL/m04700_a3.cl | 8 ++++----
OpenCL/m04800_a0.cl | 8 ++++----
OpenCL/m04800_a1.cl | 8 ++++----
OpenCL/m04800_a3.cl | 8 ++++----
OpenCL/m04900_a0.cl | 8 ++++----
OpenCL/m04900_a1.cl | 8 ++++----
OpenCL/m04900_a3.cl | 8 ++++----
OpenCL/m05000_a0.cl | 8 ++++----
OpenCL/m05000_a1.cl | 8 ++++----
OpenCL/m05000_a3.cl | 8 ++++----
OpenCL/m05100_a0.cl | 8 ++++----
OpenCL/m05100_a1.cl | 8 ++++----
OpenCL/m05100_a3.cl | 8 ++++----
OpenCL/m05200.cl | 8 ++++----
OpenCL/m05300_a0.cl | 8 ++++----
OpenCL/m05300_a1.cl | 8 ++++----
OpenCL/m05300_a3.cl | 8 ++++----
OpenCL/m05400_a0.cl | 8 ++++----
OpenCL/m05400_a1.cl | 8 ++++----
OpenCL/m05400_a3.cl | 8 ++++----
OpenCL/m05500_a0.cl | 8 ++++----
OpenCL/m05500_a1.cl | 8 ++++----
OpenCL/m05500_a3.cl | 8 ++++----
OpenCL/m05600_a0.cl | 8 ++++----
OpenCL/m05600_a1.cl | 8 ++++----
OpenCL/m05600_a3.cl | 8 ++++----
OpenCL/m05800.cl | 8 ++++----
OpenCL/m06000_a0.cl | 8 ++++----
OpenCL/m06000_a1.cl | 8 ++++----
OpenCL/m06000_a3.cl | 8 ++++----
OpenCL/m06100_a0.cl | 8 ++++----
OpenCL/m06100_a1.cl | 8 ++++----
OpenCL/m06100_a3.cl | 8 ++++----
OpenCL/m06211.cl | 4 ++--
OpenCL/m06212.cl | 4 ++--
OpenCL/m06213.cl | 4 ++--
OpenCL/m06221.cl | 4 ++--
OpenCL/m06222.cl | 4 ++--
OpenCL/m06223.cl | 4 ++--
OpenCL/m06231.cl | 4 ++--
OpenCL/m06232.cl | 4 ++--
OpenCL/m06233.cl | 4 ++--
OpenCL/m06300.cl | 8 ++++----
OpenCL/m06400.cl | 8 ++++----
OpenCL/m06500.cl | 8 ++++----
OpenCL/m06600.cl | 8 ++++----
OpenCL/m06700.cl | 8 ++++----
OpenCL/m06800.cl | 8 ++++----
OpenCL/m06900_a0.cl | 8 ++++----
OpenCL/m06900_a1.cl | 8 ++++----
OpenCL/m06900_a3.cl | 8 ++++----
OpenCL/m07100.cl | 8 ++++----
OpenCL/m07300_a0.cl | 8 ++++----
OpenCL/m07300_a1.cl | 8 ++++----
OpenCL/m07300_a3.cl | 8 ++++----
OpenCL/m07400.cl | 8 ++++----
OpenCL/m07500_a0.cl | 4 ++--
OpenCL/m07500_a1.cl | 4 ++--
OpenCL/m07500_a3.cl | 4 ++--
OpenCL/m07600_a0.cl | 8 ++++----
OpenCL/m07600_a1.cl | 8 ++++----
OpenCL/m07600_a3.cl | 8 ++++----
OpenCL/m07700_a0.cl | 8 ++++----
OpenCL/m07700_a1.cl | 8 ++++----
OpenCL/m07700_a3.cl | 8 ++++----
OpenCL/m07800_a0.cl | 8 ++++----
OpenCL/m07800_a1.cl | 8 ++++----
OpenCL/m07800_a3.cl | 8 ++++----
OpenCL/m07900.cl | 8 ++++----
OpenCL/m08000_a0.cl | 8 ++++----
OpenCL/m08000_a1.cl | 8 ++++----
OpenCL/m08000_a3.cl | 8 ++++----
OpenCL/m08100_a0.cl | 8 ++++----
OpenCL/m08100_a1.cl | 8 ++++----
OpenCL/m08100_a3.cl | 8 ++++----
OpenCL/m08200.cl | 8 ++++----
OpenCL/m08300_a0.cl | 8 ++++----
OpenCL/m08300_a1.cl | 8 ++++----
OpenCL/m08300_a3.cl | 8 ++++----
OpenCL/m08400_a0.cl | 8 ++++----
OpenCL/m08400_a1.cl | 8 ++++----
OpenCL/m08400_a3.cl | 8 ++++----
OpenCL/m08500_a0.cl | 8 ++++----
OpenCL/m08500_a1.cl | 8 ++++----
OpenCL/m08500_a3.cl | 8 ++++----
OpenCL/m08600_a0.cl | 8 ++++----
OpenCL/m08600_a1.cl | 8 ++++----
OpenCL/m08600_a3.cl | 8 ++++----
OpenCL/m08700_a0.cl | 8 ++++----
OpenCL/m08700_a1.cl | 8 ++++----
OpenCL/m08700_a3.cl | 8 ++++----
OpenCL/m08800.cl | 4 ++--
OpenCL/m08900.cl | 8 ++++----
OpenCL/m09000.cl | 8 ++++----
OpenCL/m09100.cl | 8 ++++----
OpenCL/m09400.cl | 8 ++++----
OpenCL/m09500.cl | 8 ++++----
OpenCL/m09600.cl | 8 ++++----
OpenCL/m09700_a0.cl | 8 ++++----
OpenCL/m09700_a1.cl | 8 ++++----
OpenCL/m09700_a3.cl | 8 ++++----
OpenCL/m09710_a0.cl | 8 ++++----
OpenCL/m09710_a1.cl | 8 ++++----
OpenCL/m09710_a3.cl | 8 ++++----
OpenCL/m09720_a0.cl | 8 ++++----
OpenCL/m09720_a1.cl | 8 ++++----
OpenCL/m09720_a3.cl | 8 ++++----
OpenCL/m09800_a0.cl | 8 ++++----
OpenCL/m09800_a1.cl | 8 ++++----
OpenCL/m09800_a3.cl | 8 ++++----
OpenCL/m09810_a0.cl | 8 ++++----
OpenCL/m09810_a1.cl | 8 ++++----
OpenCL/m09810_a3.cl | 8 ++++----
OpenCL/m09820_a0.cl | 8 ++++----
OpenCL/m09820_a1.cl | 8 ++++----
OpenCL/m09820_a3.cl | 8 ++++----
OpenCL/m09900_a0.cl | 8 ++++----
OpenCL/m09900_a1.cl | 8 ++++----
OpenCL/m09900_a3.cl | 8 ++++----
OpenCL/m10100_a0.cl | 8 ++++----
OpenCL/m10100_a1.cl | 8 ++++----
OpenCL/m10100_a3.cl | 8 ++++----
OpenCL/m10300.cl | 8 ++++----
OpenCL/m10400_a0.cl | 8 ++++----
OpenCL/m10400_a1.cl | 8 ++++----
OpenCL/m10400_a3.cl | 8 ++++----
OpenCL/m10410_a0.cl | 8 ++++----
OpenCL/m10410_a1.cl | 8 ++++----
OpenCL/m10410_a3.cl | 8 ++++----
OpenCL/m10420_a0.cl | 8 ++++----
OpenCL/m10420_a1.cl | 8 ++++----
OpenCL/m10420_a3.cl | 8 ++++----
OpenCL/m10500.cl | 8 ++++----
OpenCL/m10700.cl | 8 ++++----
OpenCL/m10800_a0.cl | 8 ++++----
OpenCL/m10800_a1.cl | 8 ++++----
OpenCL/m10800_a3.cl | 8 ++++----
OpenCL/m10900.cl | 8 ++++----
OpenCL/m11000_a0.cl | 8 ++++----
OpenCL/m11000_a1.cl | 8 ++++----
OpenCL/m11000_a3.cl | 8 ++++----
OpenCL/m11100_a0.cl | 8 ++++----
OpenCL/m11100_a1.cl | 8 ++++----
OpenCL/m11100_a3.cl | 8 ++++----
OpenCL/m11200_a0.cl | 8 ++++----
OpenCL/m11200_a1.cl | 8 ++++----
OpenCL/m11200_a3.cl | 8 ++++----
OpenCL/m11300.cl | 4 ++--
OpenCL/m11400_a0.cl | 8 ++++----
OpenCL/m11400_a1.cl | 8 ++++----
OpenCL/m11400_a3.cl | 8 ++++----
OpenCL/m11500_a0.cl | 8 ++++----
OpenCL/m11500_a1.cl | 8 ++++----
OpenCL/m11500_a3.cl | 8 ++++----
OpenCL/m11600.cl | 8 ++++----
OpenCL/m11700_a0.cl | 8 ++++----
OpenCL/m11700_a1.cl | 8 ++++----
OpenCL/m11700_a3.cl | 8 ++++----
OpenCL/m11800_a0.cl | 8 ++++----
OpenCL/m11800_a1.cl | 8 ++++----
OpenCL/m11800_a3.cl | 8 ++++----
OpenCL/m11900.cl | 8 ++++----
OpenCL/m12000.cl | 8 ++++----
OpenCL/m12200.cl | 8 ++++----
OpenCL/m12300.cl | 8 ++++----
OpenCL/m12400.cl | 8 ++++----
OpenCL/m12500.cl | 8 ++++----
OpenCL/m12600_a0.cl | 8 ++++----
OpenCL/m12600_a1.cl | 8 ++++----
OpenCL/m12600_a3.cl | 8 ++++----
OpenCL/m12700.cl | 8 ++++----
OpenCL/m12800.cl | 8 ++++----
OpenCL/markov_be.cl | 2 +-
OpenCL/markov_le.cl | 2 +-
src/Makefile | 34 +++++++++++++++++++---------------
src/oclHashcat.c | 4 ++--
329 files changed, 1286 insertions(+), 1282 deletions(-)
diff --git a/OpenCL/amp_a0.cl b/OpenCL/amp_a0.cl
index 170d1ce84..0333607aa 100644
--- a/OpenCL/amp_a0.cl
+++ b/OpenCL/amp_a0.cl
@@ -5,7 +5,7 @@
#include "include/constants.h"
#include "include/kernel_vendor.h"
-#include "types_ocl.c"
+#include "OpenCL/types_ocl.c"
#include "include/rp_gpu.h"
#include "rp.c"
diff --git a/OpenCL/amp_a1.cl b/OpenCL/amp_a1.cl
index b8334fded..b865e5861 100644
--- a/OpenCL/amp_a1.cl
+++ b/OpenCL/amp_a1.cl
@@ -5,7 +5,7 @@
#include "include/constants.h"
#include "include/kernel_vendor.h"
-#include "types_ocl.c"
+#include "OpenCL/types_ocl.c"
static void switch_buffer_by_offset (u32 w0[4], u32 w1[4], u32 w2[4], u32 w3[4], const u32 offset)
{
diff --git a/OpenCL/amp_a3.cl b/OpenCL/amp_a3.cl
index 85ec6ceac..ccad5acce 100644
--- a/OpenCL/amp_a3.cl
+++ b/OpenCL/amp_a3.cl
@@ -5,7 +5,7 @@
#include "include/constants.h"
#include "include/kernel_vendor.h"
-#include "types_ocl.c"
+#include "OpenCL/types_ocl.c"
__kernel void __attribute__((reqd_work_group_size (64, 1, 1))) amp (__global pw_t *pws, __global pw_t *pws_amp, __global gpu_rule_t *rules_buf, __global comb_t *combs_buf, __global bf_t *bfs_buf, const u32 combs_mode, const u32 gid_max)
{
diff --git a/OpenCL/m00000_a0.cl b/OpenCL/m00000_a0.cl
index e9f308056..cb31a7b9f 100644
--- a/OpenCL/m00000_a0.cl
+++ b/OpenCL/m00000_a0.cl
@@ -14,13 +14,13 @@
#define DGST_R3 1
#include "include/kernel_functions.c"
-#include "types_ocl.c"
-#include "common.c"
+#include "OpenCL/types_ocl.c"
+#include "OpenCL/common.c"
#include "include/rp_gpu.h"
#include "rp.c"
-#define COMPARE_S "check_single_comp4.c"
-#define COMPARE_M "check_multi_comp4.c"
+#define COMPARE_S "OpenCL/check_single_comp4.c"
+#define COMPARE_M "OpenCL/check_multi_comp4.c"
__kernel void __attribute__((reqd_work_group_size (64, 1, 1))) m00000_m04 (__global pw_t *pws, __global gpu_rule_t *rules_buf, __global comb_t *combs_buf, __global bf_t *bfs_buf, __global void *tmps, __global void *hooks, __global u32 *bitmaps_buf_s1_a, __global u32 *bitmaps_buf_s1_b, __global u32 *bitmaps_buf_s1_c, __global u32 *bitmaps_buf_s1_d, __global u32 *bitmaps_buf_s2_a, __global u32 *bitmaps_buf_s2_b, __global u32 *bitmaps_buf_s2_c, __global u32 *bitmaps_buf_s2_d, __global plain_t *plains_buf, __global digest_t *digests_buf, __global u32 *hashes_shown, __global salt_t *salt_bufs, __global void *esalt_bufs, __global u32 *d_return_buf, __global u32 *d_scryptV_buf, const u32 bitmap_mask, const u32 bitmap_shift1, const u32 bitmap_shift2, const u32 salt_pos, const u32 loop_pos, const u32 loop_cnt, const u32 rules_cnt, const u32 digests_cnt, const u32 digests_offset, const u32 combs_mode, const u32 gid_max)
{
diff --git a/OpenCL/m00000_a1.cl b/OpenCL/m00000_a1.cl
index 9ed68a217..0b43b7bd2 100644
--- a/OpenCL/m00000_a1.cl
+++ b/OpenCL/m00000_a1.cl
@@ -14,11 +14,11 @@
#define DGST_R3 1
#include "include/kernel_functions.c"
-#include "types_ocl.c"
-#include "common.c"
+#include "OpenCL/types_ocl.c"
+#include "OpenCL/common.c"
-#define COMPARE_S "check_single_comp4.c"
-#define COMPARE_M "check_multi_comp4.c"
+#define COMPARE_S "OpenCL/check_single_comp4.c"
+#define COMPARE_M "OpenCL/check_multi_comp4.c"
__kernel void __attribute__((reqd_work_group_size (64, 1, 1))) m00000_m04 (__global pw_t *pws, __global gpu_rule_t *rules_buf, __global comb_t *combs_buf, __global bf_t *bfs_buf, __global void *tmps, __global void *hooks, __global u32 *bitmaps_buf_s1_a, __global u32 *bitmaps_buf_s1_b, __global u32 *bitmaps_buf_s1_c, __global u32 *bitmaps_buf_s1_d, __global u32 *bitmaps_buf_s2_a, __global u32 *bitmaps_buf_s2_b, __global u32 *bitmaps_buf_s2_c, __global u32 *bitmaps_buf_s2_d, __global plain_t *plains_buf, __global digest_t *digests_buf, __global u32 *hashes_shown, __global salt_t *salt_bufs, __global void *esalt_bufs, __global u32 *d_return_buf, __global u32 *d_scryptV_buf, const u32 bitmap_mask, const u32 bitmap_shift1, const u32 bitmap_shift2, const u32 salt_pos, const u32 loop_pos, const u32 loop_cnt, const u32 combs_cnt, const u32 digests_cnt, const u32 digests_offset, const u32 combs_mode, const u32 gid_max)
{
diff --git a/OpenCL/m00000_a3.cl b/OpenCL/m00000_a3.cl
index 28e95ba2a..18064b4bf 100644
--- a/OpenCL/m00000_a3.cl
+++ b/OpenCL/m00000_a3.cl
@@ -14,11 +14,11 @@
#define DGST_R3 1
#include "include/kernel_functions.c"
-#include "types_ocl.c"
-#include "common.c"
+#include "OpenCL/types_ocl.c"
+#include "OpenCL/common.c"
-#define COMPARE_S "check_single_comp4.c"
-#define COMPARE_M "check_multi_comp4.c"
+#define COMPARE_S "OpenCL/check_single_comp4.c"
+#define COMPARE_M "OpenCL/check_multi_comp4.c"
#define MD5_STEP_REV(f,a,b,c,d,x,t,s) \
{ \
diff --git a/OpenCL/m00010_a0.cl b/OpenCL/m00010_a0.cl
index 18c07869f..3cb9abe76 100644
--- a/OpenCL/m00010_a0.cl
+++ b/OpenCL/m00010_a0.cl
@@ -14,13 +14,13 @@
#define DGST_R3 1
#include "include/kernel_functions.c"
-#include "types_ocl.c"
-#include "common.c"
+#include "OpenCL/types_ocl.c"
+#include "OpenCL/common.c"
#include "include/rp_gpu.h"
#include "rp.c"
-#define COMPARE_S "check_single_comp4.c"
-#define COMPARE_M "check_multi_comp4.c"
+#define COMPARE_S "OpenCL/check_single_comp4.c"
+#define COMPARE_M "OpenCL/check_multi_comp4.c"
__kernel void __attribute__((reqd_work_group_size (64, 1, 1))) m00010_m04 (__global pw_t *pws, __global gpu_rule_t *rules_buf, __global comb_t *combs_buf, __global bf_t *bfs_buf, __global void *tmps, __global void *hooks, __global u32 *bitmaps_buf_s1_a, __global u32 *bitmaps_buf_s1_b, __global u32 *bitmaps_buf_s1_c, __global u32 *bitmaps_buf_s1_d, __global u32 *bitmaps_buf_s2_a, __global u32 *bitmaps_buf_s2_b, __global u32 *bitmaps_buf_s2_c, __global u32 *bitmaps_buf_s2_d, __global plain_t *plains_buf, __global digest_t *digests_buf, __global u32 *hashes_shown, __global salt_t *salt_bufs, __global void *esalt_bufs, __global u32 *d_return_buf, __global u32 *d_scryptV_buf, const u32 bitmap_mask, const u32 bitmap_shift1, const u32 bitmap_shift2, const u32 salt_pos, const u32 loop_pos, const u32 loop_cnt, const u32 rules_cnt, const u32 digests_cnt, const u32 digests_offset, const u32 combs_mode, const u32 gid_max)
{
diff --git a/OpenCL/m00010_a1.cl b/OpenCL/m00010_a1.cl
index b422a71cf..758a61b38 100644
--- a/OpenCL/m00010_a1.cl
+++ b/OpenCL/m00010_a1.cl
@@ -14,11 +14,11 @@
#define DGST_R3 1
#include "include/kernel_functions.c"
-#include "types_ocl.c"
-#include "common.c"
+#include "OpenCL/types_ocl.c"
+#include "OpenCL/common.c"
-#define COMPARE_S "check_single_comp4.c"
-#define COMPARE_M "check_multi_comp4.c"
+#define COMPARE_S "OpenCL/check_single_comp4.c"
+#define COMPARE_M "OpenCL/check_multi_comp4.c"
__kernel void __attribute__((reqd_work_group_size (64, 1, 1))) m00010_m04 (__global pw_t *pws, __global gpu_rule_t *rules_buf, __global comb_t *combs_buf, __global bf_t *bfs_buf, __global void *tmps, __global void *hooks, __global u32 *bitmaps_buf_s1_a, __global u32 *bitmaps_buf_s1_b, __global u32 *bitmaps_buf_s1_c, __global u32 *bitmaps_buf_s1_d, __global u32 *bitmaps_buf_s2_a, __global u32 *bitmaps_buf_s2_b, __global u32 *bitmaps_buf_s2_c, __global u32 *bitmaps_buf_s2_d, __global plain_t *plains_buf, __global digest_t *digests_buf, __global u32 *hashes_shown, __global salt_t *salt_bufs, __global void *esalt_bufs, __global u32 *d_return_buf, __global u32 *d_scryptV_buf, const u32 bitmap_mask, const u32 bitmap_shift1, const u32 bitmap_shift2, const u32 salt_pos, const u32 loop_pos, const u32 loop_cnt, const u32 combs_cnt, const u32 digests_cnt, const u32 digests_offset, const u32 combs_mode, const u32 gid_max)
{
diff --git a/OpenCL/m00010_a3.cl b/OpenCL/m00010_a3.cl
index b65952555..e9e39f3aa 100644
--- a/OpenCL/m00010_a3.cl
+++ b/OpenCL/m00010_a3.cl
@@ -14,11 +14,11 @@
#define DGST_R3 1
#include "include/kernel_functions.c"
-#include "types_ocl.c"
-#include "common.c"
+#include "OpenCL/types_ocl.c"
+#include "OpenCL/common.c"
-#define COMPARE_S "check_single_comp4.c"
-#define COMPARE_M "check_multi_comp4.c"
+#define COMPARE_S "OpenCL/check_single_comp4.c"
+#define COMPARE_M "OpenCL/check_multi_comp4.c"
#define MD5_STEP_REV(f,a,b,c,d,x,t,s) \
{ \
diff --git a/OpenCL/m00020_a0.cl b/OpenCL/m00020_a0.cl
index 8abacc4f6..d70c41cf8 100644
--- a/OpenCL/m00020_a0.cl
+++ b/OpenCL/m00020_a0.cl
@@ -14,13 +14,13 @@
#define DGST_R3 1
#include "include/kernel_functions.c"
-#include "types_ocl.c"
-#include "common.c"
+#include "OpenCL/types_ocl.c"
+#include "OpenCL/common.c"
#include "include/rp_gpu.h"
#include "rp.c"
-#define COMPARE_S "check_single_comp4.c"
-#define COMPARE_M "check_multi_comp4.c"
+#define COMPARE_S "OpenCL/check_single_comp4.c"
+#define COMPARE_M "OpenCL/check_multi_comp4.c"
__kernel void __attribute__((reqd_work_group_size (64, 1, 1))) m00020_m04 (__global pw_t *pws, __global gpu_rule_t *rules_buf, __global comb_t *combs_buf, __global bf_t *bfs_buf, __global void *tmps, __global void *hooks, __global u32 *bitmaps_buf_s1_a, __global u32 *bitmaps_buf_s1_b, __global u32 *bitmaps_buf_s1_c, __global u32 *bitmaps_buf_s1_d, __global u32 *bitmaps_buf_s2_a, __global u32 *bitmaps_buf_s2_b, __global u32 *bitmaps_buf_s2_c, __global u32 *bitmaps_buf_s2_d, __global plain_t *plains_buf, __global digest_t *digests_buf, __global u32 *hashes_shown, __global salt_t *salt_bufs, __global void *esalt_bufs, __global u32 *d_return_buf, __global u32 *d_scryptV_buf, const u32 bitmap_mask, const u32 bitmap_shift1, const u32 bitmap_shift2, const u32 salt_pos, const u32 loop_pos, const u32 loop_cnt, const u32 rules_cnt, const u32 digests_cnt, const u32 digests_offset, const u32 combs_mode, const u32 gid_max)
{
diff --git a/OpenCL/m00020_a1.cl b/OpenCL/m00020_a1.cl
index 2ad50ce3d..b67e4f7a7 100644
--- a/OpenCL/m00020_a1.cl
+++ b/OpenCL/m00020_a1.cl
@@ -14,11 +14,11 @@
#define DGST_R3 1
#include "include/kernel_functions.c"
-#include "types_ocl.c"
-#include "common.c"
+#include "OpenCL/types_ocl.c"
+#include "OpenCL/common.c"
-#define COMPARE_S "check_single_comp4.c"
-#define COMPARE_M "check_multi_comp4.c"
+#define COMPARE_S "OpenCL/check_single_comp4.c"
+#define COMPARE_M "OpenCL/check_multi_comp4.c"
__kernel void __attribute__((reqd_work_group_size (64, 1, 1))) m00020_m04 (__global pw_t *pws, __global gpu_rule_t *rules_buf, __global comb_t *combs_buf, __global bf_t *bfs_buf, __global void *tmps, __global void *hooks, __global u32 *bitmaps_buf_s1_a, __global u32 *bitmaps_buf_s1_b, __global u32 *bitmaps_buf_s1_c, __global u32 *bitmaps_buf_s1_d, __global u32 *bitmaps_buf_s2_a, __global u32 *bitmaps_buf_s2_b, __global u32 *bitmaps_buf_s2_c, __global u32 *bitmaps_buf_s2_d, __global plain_t *plains_buf, __global digest_t *digests_buf, __global u32 *hashes_shown, __global salt_t *salt_bufs, __global void *esalt_bufs, __global u32 *d_return_buf, __global u32 *d_scryptV_buf, const u32 bitmap_mask, const u32 bitmap_shift1, const u32 bitmap_shift2, const u32 salt_pos, const u32 loop_pos, const u32 loop_cnt, const u32 combs_cnt, const u32 digests_cnt, const u32 digests_offset, const u32 combs_mode, const u32 gid_max)
{
diff --git a/OpenCL/m00020_a3.cl b/OpenCL/m00020_a3.cl
index c40e0ad48..18266f827 100644
--- a/OpenCL/m00020_a3.cl
+++ b/OpenCL/m00020_a3.cl
@@ -14,11 +14,11 @@
#define DGST_R3 1
#include "include/kernel_functions.c"
-#include "types_ocl.c"
-#include "common.c"
+#include "OpenCL/types_ocl.c"
+#include "OpenCL/common.c"
-#define COMPARE_S "check_single_comp4.c"
-#define COMPARE_M "check_multi_comp4.c"
+#define COMPARE_S "OpenCL/check_single_comp4.c"
+#define COMPARE_M "OpenCL/check_multi_comp4.c"
static void m00020m (u32 w0[4], u32 w1[4], u32 w2[4], u32 w3[4], const u32 pw_len, __global pw_t *pws, __global gpu_rule_t *rules_buf, __global comb_t *combs_buf, __global bf_t *bfs_buf, __global void *tmps, __global void *hooks, __global u32 *bitmaps_buf_s1_a, __global u32 *bitmaps_buf_s1_b, __global u32 *bitmaps_buf_s1_c, __global u32 *bitmaps_buf_s1_d, __global u32 *bitmaps_buf_s2_a, __global u32 *bitmaps_buf_s2_b, __global u32 *bitmaps_buf_s2_c, __global u32 *bitmaps_buf_s2_d, __global plain_t *plains_buf, __global digest_t *digests_buf, __global u32 *hashes_shown, __global salt_t *salt_bufs, __global void *esalt_bufs, __global u32 *d_return_buf, __global u32 *d_scryptV_buf, const u32 bitmap_mask, const u32 bitmap_shift1, const u32 bitmap_shift2, const u32 salt_pos, const u32 loop_pos, const u32 loop_cnt, const u32 bfs_cnt, const u32 digests_cnt, const u32 digests_offset)
{
diff --git a/OpenCL/m00030_a0.cl b/OpenCL/m00030_a0.cl
index 1c2413347..b81cca71b 100644
--- a/OpenCL/m00030_a0.cl
+++ b/OpenCL/m00030_a0.cl
@@ -14,13 +14,13 @@
#define DGST_R3 1
#include "include/kernel_functions.c"
-#include "types_ocl.c"
-#include "common.c"
+#include "OpenCL/types_ocl.c"
+#include "OpenCL/common.c"
#include "include/rp_gpu.h"
#include "rp.c"
-#define COMPARE_S "check_single_comp4.c"
-#define COMPARE_M "check_multi_comp4.c"
+#define COMPARE_S "OpenCL/check_single_comp4.c"
+#define COMPARE_M "OpenCL/check_multi_comp4.c"
// no unicode yet
diff --git a/OpenCL/m00030_a1.cl b/OpenCL/m00030_a1.cl
index 9b76aa411..c82455f35 100644
--- a/OpenCL/m00030_a1.cl
+++ b/OpenCL/m00030_a1.cl
@@ -14,11 +14,11 @@
#define DGST_R3 1
#include "include/kernel_functions.c"
-#include "types_ocl.c"
-#include "common.c"
+#include "OpenCL/types_ocl.c"
+#include "OpenCL/common.c"
-#define COMPARE_S "check_single_comp4.c"
-#define COMPARE_M "check_multi_comp4.c"
+#define COMPARE_S "OpenCL/check_single_comp4.c"
+#define COMPARE_M "OpenCL/check_multi_comp4.c"
// no unicode yet
diff --git a/OpenCL/m00030_a3.cl b/OpenCL/m00030_a3.cl
index b6c3d758f..7ba005428 100644
--- a/OpenCL/m00030_a3.cl
+++ b/OpenCL/m00030_a3.cl
@@ -14,11 +14,11 @@
#define DGST_R3 1
#include "include/kernel_functions.c"
-#include "types_ocl.c"
-#include "common.c"
+#include "OpenCL/types_ocl.c"
+#include "OpenCL/common.c"
-#define COMPARE_S "check_single_comp4.c"
-#define COMPARE_M "check_multi_comp4.c"
+#define COMPARE_S "OpenCL/check_single_comp4.c"
+#define COMPARE_M "OpenCL/check_multi_comp4.c"
#define MD5_STEP_REV(f,a,b,c,d,x,t,s) \
{ \
diff --git a/OpenCL/m00040_a0.cl b/OpenCL/m00040_a0.cl
index fcfe3b93c..ac7a4914d 100644
--- a/OpenCL/m00040_a0.cl
+++ b/OpenCL/m00040_a0.cl
@@ -14,13 +14,13 @@
#define DGST_R3 1
#include "include/kernel_functions.c"
-#include "types_ocl.c"
-#include "common.c"
+#include "OpenCL/types_ocl.c"
+#include "OpenCL/common.c"
#include "include/rp_gpu.h"
#include "rp.c"
-#define COMPARE_S "check_single_comp4.c"
-#define COMPARE_M "check_multi_comp4.c"
+#define COMPARE_S "OpenCL/check_single_comp4.c"
+#define COMPARE_M "OpenCL/check_multi_comp4.c"
__kernel void __attribute__((reqd_work_group_size (64, 1, 1))) m00040_m04 (__global pw_t *pws, __global gpu_rule_t *rules_buf, __global comb_t *combs_buf, __global bf_t *bfs_buf, __global void *tmps, __global void *hooks, __global u32 *bitmaps_buf_s1_a, __global u32 *bitmaps_buf_s1_b, __global u32 *bitmaps_buf_s1_c, __global u32 *bitmaps_buf_s1_d, __global u32 *bitmaps_buf_s2_a, __global u32 *bitmaps_buf_s2_b, __global u32 *bitmaps_buf_s2_c, __global u32 *bitmaps_buf_s2_d, __global plain_t *plains_buf, __global digest_t *digests_buf, __global u32 *hashes_shown, __global salt_t *salt_bufs, __global void *esalt_bufs, __global u32 *d_return_buf, __global u32 *d_scryptV_buf, const u32 bitmap_mask, const u32 bitmap_shift1, const u32 bitmap_shift2, const u32 salt_pos, const u32 loop_pos, const u32 loop_cnt, const u32 rules_cnt, const u32 digests_cnt, const u32 digests_offset, const u32 combs_mode, const u32 gid_max)
{
diff --git a/OpenCL/m00040_a1.cl b/OpenCL/m00040_a1.cl
index 2da6eb408..3c59a5db4 100644
--- a/OpenCL/m00040_a1.cl
+++ b/OpenCL/m00040_a1.cl
@@ -14,11 +14,11 @@
#define DGST_R3 1
#include "include/kernel_functions.c"
-#include "types_ocl.c"
-#include "common.c"
+#include "OpenCL/types_ocl.c"
+#include "OpenCL/common.c"
-#define COMPARE_S "check_single_comp4.c"
-#define COMPARE_M "check_multi_comp4.c"
+#define COMPARE_S "OpenCL/check_single_comp4.c"
+#define COMPARE_M "OpenCL/check_multi_comp4.c"
// no unicode yet
diff --git a/OpenCL/m00040_a3.cl b/OpenCL/m00040_a3.cl
index 31cd660a8..ef9ab940c 100644
--- a/OpenCL/m00040_a3.cl
+++ b/OpenCL/m00040_a3.cl
@@ -14,11 +14,11 @@
#define DGST_R3 1
#include "include/kernel_functions.c"
-#include "types_ocl.c"
-#include "common.c"
+#include "OpenCL/types_ocl.c"
+#include "OpenCL/common.c"
-#define COMPARE_S "check_single_comp4.c"
-#define COMPARE_M "check_multi_comp4.c"
+#define COMPARE_S "OpenCL/check_single_comp4.c"
+#define COMPARE_M "OpenCL/check_multi_comp4.c"
static void m00040m (u32 w0[4], u32 w1[4], u32 w2[4], u32 w3[4], const u32 pw_len, __global pw_t *pws, __global gpu_rule_t *rules_buf, __global comb_t *combs_buf, __global bf_t *bfs_buf, __global void *tmps, __global void *hooks, __global u32 *bitmaps_buf_s1_a, __global u32 *bitmaps_buf_s1_b, __global u32 *bitmaps_buf_s1_c, __global u32 *bitmaps_buf_s1_d, __global u32 *bitmaps_buf_s2_a, __global u32 *bitmaps_buf_s2_b, __global u32 *bitmaps_buf_s2_c, __global u32 *bitmaps_buf_s2_d, __global plain_t *plains_buf, __global digest_t *digests_buf, __global u32 *hashes_shown, __global salt_t *salt_bufs, __global void *esalt_bufs, __global u32 *d_return_buf, __global u32 *d_scryptV_buf, const u32 bitmap_mask, const u32 bitmap_shift1, const u32 bitmap_shift2, const u32 salt_pos, const u32 loop_pos, const u32 loop_cnt, const u32 bfs_cnt, const u32 digests_cnt, const u32 digests_offset)
{
diff --git a/OpenCL/m00050_a0.cl b/OpenCL/m00050_a0.cl
index efda0bd61..8b52959de 100644
--- a/OpenCL/m00050_a0.cl
+++ b/OpenCL/m00050_a0.cl
@@ -14,13 +14,13 @@
#define DGST_R3 1
#include "include/kernel_functions.c"
-#include "types_ocl.c"
-#include "common.c"
+#include "OpenCL/types_ocl.c"
+#include "OpenCL/common.c"
#include "include/rp_gpu.h"
#include "rp.c"
-#define COMPARE_S "check_single_comp4.c"
-#define COMPARE_M "check_multi_comp4.c"
+#define COMPARE_S "OpenCL/check_single_comp4.c"
+#define COMPARE_M "OpenCL/check_multi_comp4.c"
static void md5_transform (const u32 w0[4], const u32 w1[4], const u32 w2[4], const u32 w3[4], u32 digest[4])
{
diff --git a/OpenCL/m00050_a1.cl b/OpenCL/m00050_a1.cl
index 80602e11e..cb73bc8ef 100644
--- a/OpenCL/m00050_a1.cl
+++ b/OpenCL/m00050_a1.cl
@@ -14,11 +14,11 @@
#define DGST_R3 1
#include "include/kernel_functions.c"
-#include "types_ocl.c"
-#include "common.c"
+#include "OpenCL/types_ocl.c"
+#include "OpenCL/common.c"
-#define COMPARE_S "check_single_comp4.c"
-#define COMPARE_M "check_multi_comp4.c"
+#define COMPARE_S "OpenCL/check_single_comp4.c"
+#define COMPARE_M "OpenCL/check_multi_comp4.c"
static void md5_transform (const u32 w0[4], const u32 w1[4], const u32 w2[4], const u32 w3[4], u32 digest[4])
{
diff --git a/OpenCL/m00050_a3.cl b/OpenCL/m00050_a3.cl
index 292f636a4..8e78ee4b3 100644
--- a/OpenCL/m00050_a3.cl
+++ b/OpenCL/m00050_a3.cl
@@ -14,11 +14,11 @@
#define DGST_R3 1
#include "include/kernel_functions.c"
-#include "types_ocl.c"
-#include "common.c"
+#include "OpenCL/types_ocl.c"
+#include "OpenCL/common.c"
-#define COMPARE_S "check_single_comp4.c"
-#define COMPARE_M "check_multi_comp4.c"
+#define COMPARE_S "OpenCL/check_single_comp4.c"
+#define COMPARE_M "OpenCL/check_multi_comp4.c"
static void md5_transform (const u32 w0[4], const u32 w1[4], const u32 w2[4], const u32 w3[4], u32 digest[4])
{
diff --git a/OpenCL/m00060_a0.cl b/OpenCL/m00060_a0.cl
index 56ead01df..ad9eda7a8 100644
--- a/OpenCL/m00060_a0.cl
+++ b/OpenCL/m00060_a0.cl
@@ -14,13 +14,13 @@
#define DGST_R3 1
#include "include/kernel_functions.c"
-#include "types_ocl.c"
-#include "common.c"
+#include "OpenCL/types_ocl.c"
+#include "OpenCL/common.c"
#include "include/rp_gpu.h"
#include "rp.c"
-#define COMPARE_S "check_single_comp4.c"
-#define COMPARE_M "check_multi_comp4.c"
+#define COMPARE_S "OpenCL/check_single_comp4.c"
+#define COMPARE_M "OpenCL/check_multi_comp4.c"
static void md5_transform (const u32 w0[4], const u32 w1[4], const u32 w2[4], const u32 w3[4], u32 digest[4])
{
diff --git a/OpenCL/m00060_a1.cl b/OpenCL/m00060_a1.cl
index be66c8780..895139dce 100644
--- a/OpenCL/m00060_a1.cl
+++ b/OpenCL/m00060_a1.cl
@@ -14,11 +14,11 @@
#define DGST_R3 1
#include "include/kernel_functions.c"
-#include "types_ocl.c"
-#include "common.c"
+#include "OpenCL/types_ocl.c"
+#include "OpenCL/common.c"
-#define COMPARE_S "check_single_comp4.c"
-#define COMPARE_M "check_multi_comp4.c"
+#define COMPARE_S "OpenCL/check_single_comp4.c"
+#define COMPARE_M "OpenCL/check_multi_comp4.c"
static void md5_transform (const u32 w0[4], const u32 w1[4], const u32 w2[4], const u32 w3[4], u32 digest[4])
{
diff --git a/OpenCL/m00060_a3.cl b/OpenCL/m00060_a3.cl
index 20303206d..1a985b4c1 100644
--- a/OpenCL/m00060_a3.cl
+++ b/OpenCL/m00060_a3.cl
@@ -14,11 +14,11 @@
#define DGST_R3 1
#include "include/kernel_functions.c"
-#include "types_ocl.c"
-#include "common.c"
+#include "OpenCL/types_ocl.c"
+#include "OpenCL/common.c"
-#define COMPARE_S "check_single_comp4.c"
-#define COMPARE_M "check_multi_comp4.c"
+#define COMPARE_S "OpenCL/check_single_comp4.c"
+#define COMPARE_M "OpenCL/check_multi_comp4.c"
static void md5_transform (const u32 w0[4], const u32 w1[4], const u32 w2[4], const u32 w3[4], u32 digest[4])
{
diff --git a/OpenCL/m00100_a0.cl b/OpenCL/m00100_a0.cl
index 69b3b6f76..736256e92 100644
--- a/OpenCL/m00100_a0.cl
+++ b/OpenCL/m00100_a0.cl
@@ -14,13 +14,13 @@
#define DGST_R3 1
#include "include/kernel_functions.c"
-#include "types_ocl.c"
-#include "common.c"
+#include "OpenCL/types_ocl.c"
+#include "OpenCL/common.c"
#include "include/rp_gpu.h"
#include "rp.c"
-#define COMPARE_S "check_single_comp4.c"
-#define COMPARE_M "check_multi_comp4.c"
+#define COMPARE_S "OpenCL/check_single_comp4.c"
+#define COMPARE_M "OpenCL/check_multi_comp4.c"
__kernel void __attribute__((reqd_work_group_size (64, 1, 1))) m00100_m04 (__global pw_t *pws, __global gpu_rule_t *rules_buf, __global comb_t *combs_buf, __global bf_t *bfs_buf, __global void *tmps, __global void *hooks, __global u32 *bitmaps_buf_s1_a, __global u32 *bitmaps_buf_s1_b, __global u32 *bitmaps_buf_s1_c, __global u32 *bitmaps_buf_s1_d, __global u32 *bitmaps_buf_s2_a, __global u32 *bitmaps_buf_s2_b, __global u32 *bitmaps_buf_s2_c, __global u32 *bitmaps_buf_s2_d, __global plain_t *plains_buf, __global digest_t *digests_buf, __global u32 *hashes_shown, __global salt_t *salt_bufs, __global void *esalt_bufs, __global u32 *d_return_buf, __global u32 *d_scryptV_buf, const u32 bitmap_mask, const u32 bitmap_shift1, const u32 bitmap_shift2, const u32 salt_pos, const u32 loop_pos, const u32 loop_cnt, const u32 rules_cnt, const u32 digests_cnt, const u32 digests_offset, const u32 combs_mode, const u32 gid_max)
{
diff --git a/OpenCL/m00100_a1.cl b/OpenCL/m00100_a1.cl
index 0ad1c1710..ae6fc0661 100644
--- a/OpenCL/m00100_a1.cl
+++ b/OpenCL/m00100_a1.cl
@@ -14,11 +14,11 @@
#define DGST_R3 1
#include "include/kernel_functions.c"
-#include "types_ocl.c"
-#include "common.c"
+#include "OpenCL/types_ocl.c"
+#include "OpenCL/common.c"
-#define COMPARE_S "check_single_comp4.c"
-#define COMPARE_M "check_multi_comp4.c"
+#define COMPARE_S "OpenCL/check_single_comp4.c"
+#define COMPARE_M "OpenCL/check_multi_comp4.c"
__kernel void __attribute__((reqd_work_group_size (64, 1, 1))) m00100_m04 (__global pw_t *pws, __global gpu_rule_t *rules_buf, __global comb_t *combs_buf, __global bf_t *bfs_buf, __global void *tmps, __global void *hooks, __global u32 *bitmaps_buf_s1_a, __global u32 *bitmaps_buf_s1_b, __global u32 *bitmaps_buf_s1_c, __global u32 *bitmaps_buf_s1_d, __global u32 *bitmaps_buf_s2_a, __global u32 *bitmaps_buf_s2_b, __global u32 *bitmaps_buf_s2_c, __global u32 *bitmaps_buf_s2_d, __global plain_t *plains_buf, __global digest_t *digests_buf, __global u32 *hashes_shown, __global salt_t *salt_bufs, __global void *esalt_bufs, __global u32 *d_return_buf, __global u32 *d_scryptV_buf, const u32 bitmap_mask, const u32 bitmap_shift1, const u32 bitmap_shift2, const u32 salt_pos, const u32 loop_pos, const u32 loop_cnt, const u32 combs_cnt, const u32 digests_cnt, const u32 digests_offset, const u32 combs_mode, const u32 gid_max)
{
diff --git a/OpenCL/m00100_a3.cl b/OpenCL/m00100_a3.cl
index a5d38a2ac..d61350aa2 100644
--- a/OpenCL/m00100_a3.cl
+++ b/OpenCL/m00100_a3.cl
@@ -14,11 +14,11 @@
#define DGST_R3 1
#include "include/kernel_functions.c"
-#include "types_ocl.c"
-#include "common.c"
+#include "OpenCL/types_ocl.c"
+#include "OpenCL/common.c"
-#define COMPARE_S "check_single_comp4.c"
-#define COMPARE_M "check_multi_comp4.c"
+#define COMPARE_S "OpenCL/check_single_comp4.c"
+#define COMPARE_M "OpenCL/check_multi_comp4.c"
static void m00100m (u32 w[16], const u32 pw_len, __global pw_t *pws, __global gpu_rule_t *rules_buf, __global comb_t *combs_buf, __constant u32 * words_buf_r, __global void *tmps, __global void *hooks, __global u32 *bitmaps_buf_s1_a, __global u32 *bitmaps_buf_s1_b, __global u32 *bitmaps_buf_s1_c, __global u32 *bitmaps_buf_s1_d, __global u32 *bitmaps_buf_s2_a, __global u32 *bitmaps_buf_s2_b, __global u32 *bitmaps_buf_s2_c, __global u32 *bitmaps_buf_s2_d, __global plain_t *plains_buf, __global digest_t *digests_buf, __global u32 *hashes_shown, __global salt_t *salt_bufs, __global void *esalt_bufs, __global u32 *d_return_buf, __global u32 *d_scryptV_buf, const u32 bitmap_mask, const u32 bitmap_shift1, const u32 bitmap_shift2, const u32 salt_pos, const u32 loop_pos, const u32 loop_cnt, const u32 bfs_cnt, const u32 digests_cnt, const u32 digests_offset)
{
diff --git a/OpenCL/m00110_a0.cl b/OpenCL/m00110_a0.cl
index 7621c5f6c..d493ce92b 100644
--- a/OpenCL/m00110_a0.cl
+++ b/OpenCL/m00110_a0.cl
@@ -14,13 +14,13 @@
#define DGST_R3 1
#include "include/kernel_functions.c"
-#include "types_ocl.c"
-#include "common.c"
+#include "OpenCL/types_ocl.c"
+#include "OpenCL/common.c"
#include "include/rp_gpu.h"
#include "rp.c"
-#define COMPARE_S "check_single_comp4.c"
-#define COMPARE_M "check_multi_comp4.c"
+#define COMPARE_S "OpenCL/check_single_comp4.c"
+#define COMPARE_M "OpenCL/check_multi_comp4.c"
__kernel void __attribute__((reqd_work_group_size (64, 1, 1))) m00110_m04 (__global pw_t *pws, __global gpu_rule_t *rules_buf, __global comb_t *combs_buf, __global bf_t *bfs_buf, __global void *tmps, __global void *hooks, __global u32 *bitmaps_buf_s1_a, __global u32 *bitmaps_buf_s1_b, __global u32 *bitmaps_buf_s1_c, __global u32 *bitmaps_buf_s1_d, __global u32 *bitmaps_buf_s2_a, __global u32 *bitmaps_buf_s2_b, __global u32 *bitmaps_buf_s2_c, __global u32 *bitmaps_buf_s2_d, __global plain_t *plains_buf, __global digest_t *digests_buf, __global u32 *hashes_shown, __global salt_t *salt_bufs, __global void *esalt_bufs, __global u32 *d_return_buf, __global u32 *d_scryptV_buf, const u32 bitmap_mask, const u32 bitmap_shift1, const u32 bitmap_shift2, const u32 salt_pos, const u32 loop_pos, const u32 loop_cnt, const u32 rules_cnt, const u32 digests_cnt, const u32 digests_offset, const u32 combs_mode, const u32 gid_max)
{
diff --git a/OpenCL/m00110_a1.cl b/OpenCL/m00110_a1.cl
index ce73e43bc..779ede66e 100644
--- a/OpenCL/m00110_a1.cl
+++ b/OpenCL/m00110_a1.cl
@@ -14,11 +14,11 @@
#define DGST_R3 1
#include "include/kernel_functions.c"
-#include "types_ocl.c"
-#include "common.c"
+#include "OpenCL/types_ocl.c"
+#include "OpenCL/common.c"
-#define COMPARE_S "check_single_comp4.c"
-#define COMPARE_M "check_multi_comp4.c"
+#define COMPARE_S "OpenCL/check_single_comp4.c"
+#define COMPARE_M "OpenCL/check_multi_comp4.c"
__kernel void __attribute__((reqd_work_group_size (64, 1, 1))) m00110_m04 (__global pw_t *pws, __global gpu_rule_t *rules_buf, __global comb_t *combs_buf, __global bf_t *bfs_buf, __global void *tmps, __global void *hooks, __global u32 *bitmaps_buf_s1_a, __global u32 *bitmaps_buf_s1_b, __global u32 *bitmaps_buf_s1_c, __global u32 *bitmaps_buf_s1_d, __global u32 *bitmaps_buf_s2_a, __global u32 *bitmaps_buf_s2_b, __global u32 *bitmaps_buf_s2_c, __global u32 *bitmaps_buf_s2_d, __global plain_t *plains_buf, __global digest_t *digests_buf, __global u32 *hashes_shown, __global salt_t *salt_bufs, __global void *esalt_bufs, __global u32 *d_return_buf, __global u32 *d_scryptV_buf, const u32 bitmap_mask, const u32 bitmap_shift1, const u32 bitmap_shift2, const u32 salt_pos, const u32 loop_pos, const u32 loop_cnt, const u32 combs_cnt, const u32 digests_cnt, const u32 digests_offset, const u32 combs_mode, const u32 gid_max)
{
diff --git a/OpenCL/m00110_a3.cl b/OpenCL/m00110_a3.cl
index 7f96264f9..2a7826b89 100644
--- a/OpenCL/m00110_a3.cl
+++ b/OpenCL/m00110_a3.cl
@@ -14,11 +14,11 @@
#define DGST_R3 1
#include "include/kernel_functions.c"
-#include "types_ocl.c"
-#include "common.c"
+#include "OpenCL/types_ocl.c"
+#include "OpenCL/common.c"
-#define COMPARE_S "check_single_comp4.c"
-#define COMPARE_M "check_multi_comp4.c"
+#define COMPARE_S "OpenCL/check_single_comp4.c"
+#define COMPARE_M "OpenCL/check_multi_comp4.c"
static void m00110m (u32 w[16], const u32 pw_len, __global pw_t *pws, __global gpu_rule_t *rules_buf, __global comb_t *combs_buf, __constant u32 * words_buf_r, __global void *tmps, __global void *hooks, __global u32 *bitmaps_buf_s1_a, __global u32 *bitmaps_buf_s1_b, __global u32 *bitmaps_buf_s1_c, __global u32 *bitmaps_buf_s1_d, __global u32 *bitmaps_buf_s2_a, __global u32 *bitmaps_buf_s2_b, __global u32 *bitmaps_buf_s2_c, __global u32 *bitmaps_buf_s2_d, __global plain_t *plains_buf, __global digest_t *digests_buf, __global u32 *hashes_shown, __global salt_t *salt_bufs, __global void *esalt_bufs, __global u32 *d_return_buf, __global u32 *d_scryptV_buf, const u32 bitmap_mask, const u32 bitmap_shift1, const u32 bitmap_shift2, const u32 salt_pos, const u32 loop_pos, const u32 loop_cnt, const u32 bfs_cnt, const u32 digests_cnt, const u32 digests_offset)
{
diff --git a/OpenCL/m00120_a0.cl b/OpenCL/m00120_a0.cl
index 1cfb69ac5..900269c28 100644
--- a/OpenCL/m00120_a0.cl
+++ b/OpenCL/m00120_a0.cl
@@ -14,13 +14,13 @@
#define DGST_R3 1
#include "include/kernel_functions.c"
-#include "types_ocl.c"
-#include "common.c"
+#include "OpenCL/types_ocl.c"
+#include "OpenCL/common.c"
#include "include/rp_gpu.h"
#include "rp.c"
-#define COMPARE_S "check_single_comp4.c"
-#define COMPARE_M "check_multi_comp4.c"
+#define COMPARE_S "OpenCL/check_single_comp4.c"
+#define COMPARE_M "OpenCL/check_multi_comp4.c"
__kernel void __attribute__((reqd_work_group_size (64, 1, 1))) m00120_m04 (__global pw_t *pws, __global gpu_rule_t *rules_buf, __global comb_t *combs_buf, __global bf_t *bfs_buf, __global void *tmps, __global void *hooks, __global u32 *bitmaps_buf_s1_a, __global u32 *bitmaps_buf_s1_b, __global u32 *bitmaps_buf_s1_c, __global u32 *bitmaps_buf_s1_d, __global u32 *bitmaps_buf_s2_a, __global u32 *bitmaps_buf_s2_b, __global u32 *bitmaps_buf_s2_c, __global u32 *bitmaps_buf_s2_d, __global plain_t *plains_buf, __global digest_t *digests_buf, __global u32 *hashes_shown, __global salt_t *salt_bufs, __global void *esalt_bufs, __global u32 *d_return_buf, __global u32 *d_scryptV_buf, const u32 bitmap_mask, const u32 bitmap_shift1, const u32 bitmap_shift2, const u32 salt_pos, const u32 loop_pos, const u32 loop_cnt, const u32 rules_cnt, const u32 digests_cnt, const u32 digests_offset, const u32 combs_mode, const u32 gid_max)
{
diff --git a/OpenCL/m00120_a1.cl b/OpenCL/m00120_a1.cl
index fbaad382e..49f6f68f7 100644
--- a/OpenCL/m00120_a1.cl
+++ b/OpenCL/m00120_a1.cl
@@ -14,11 +14,11 @@
#define DGST_R3 1
#include "include/kernel_functions.c"
-#include "types_ocl.c"
-#include "common.c"
+#include "OpenCL/types_ocl.c"
+#include "OpenCL/common.c"
-#define COMPARE_S "check_single_comp4.c"
-#define COMPARE_M "check_multi_comp4.c"
+#define COMPARE_S "OpenCL/check_single_comp4.c"
+#define COMPARE_M "OpenCL/check_multi_comp4.c"
__kernel void __attribute__((reqd_work_group_size (64, 1, 1))) m00120_m04 (__global pw_t *pws, __global gpu_rule_t *rules_buf, __global comb_t *combs_buf, __global bf_t *bfs_buf, __global void *tmps, __global void *hooks, __global u32 *bitmaps_buf_s1_a, __global u32 *bitmaps_buf_s1_b, __global u32 *bitmaps_buf_s1_c, __global u32 *bitmaps_buf_s1_d, __global u32 *bitmaps_buf_s2_a, __global u32 *bitmaps_buf_s2_b, __global u32 *bitmaps_buf_s2_c, __global u32 *bitmaps_buf_s2_d, __global plain_t *plains_buf, __global digest_t *digests_buf, __global u32 *hashes_shown, __global salt_t *salt_bufs, __global void *esalt_bufs, __global u32 *d_return_buf, __global u32 *d_scryptV_buf, const u32 bitmap_mask, const u32 bitmap_shift1, const u32 bitmap_shift2, const u32 salt_pos, const u32 loop_pos, const u32 loop_cnt, const u32 combs_cnt, const u32 digests_cnt, const u32 digests_offset, const u32 combs_mode, const u32 gid_max)
{
diff --git a/OpenCL/m00120_a3.cl b/OpenCL/m00120_a3.cl
index ce2c64bac..1ca632afb 100644
--- a/OpenCL/m00120_a3.cl
+++ b/OpenCL/m00120_a3.cl
@@ -14,11 +14,11 @@
#define DGST_R3 1
#include "include/kernel_functions.c"
-#include "types_ocl.c"
-#include "common.c"
+#include "OpenCL/types_ocl.c"
+#include "OpenCL/common.c"
-#define COMPARE_S "check_single_comp4.c"
-#define COMPARE_M "check_multi_comp4.c"
+#define COMPARE_S "OpenCL/check_single_comp4.c"
+#define COMPARE_M "OpenCL/check_multi_comp4.c"
static void overwrite_at (u32 sw[16], const u32 w0, const u32 salt_len)
{
diff --git a/OpenCL/m00130_a0.cl b/OpenCL/m00130_a0.cl
index 49fad8af8..26bd7dd6a 100644
--- a/OpenCL/m00130_a0.cl
+++ b/OpenCL/m00130_a0.cl
@@ -14,13 +14,13 @@
#define DGST_R3 1
#include "include/kernel_functions.c"
-#include "types_ocl.c"
-#include "common.c"
+#include "OpenCL/types_ocl.c"
+#include "OpenCL/common.c"
#include "include/rp_gpu.h"
#include "rp.c"
-#define COMPARE_S "check_single_comp4.c"
-#define COMPARE_M "check_multi_comp4.c"
+#define COMPARE_S "OpenCL/check_single_comp4.c"
+#define COMPARE_M "OpenCL/check_multi_comp4.c"
// no unicode yet
diff --git a/OpenCL/m00130_a1.cl b/OpenCL/m00130_a1.cl
index d7d766853..0350c4117 100644
--- a/OpenCL/m00130_a1.cl
+++ b/OpenCL/m00130_a1.cl
@@ -14,11 +14,11 @@
#define DGST_R3 1
#include "include/kernel_functions.c"
-#include "types_ocl.c"
-#include "common.c"
+#include "OpenCL/types_ocl.c"
+#include "OpenCL/common.c"
-#define COMPARE_S "check_single_comp4.c"
-#define COMPARE_M "check_multi_comp4.c"
+#define COMPARE_S "OpenCL/check_single_comp4.c"
+#define COMPARE_M "OpenCL/check_multi_comp4.c"
// no unicode yet
diff --git a/OpenCL/m00130_a3.cl b/OpenCL/m00130_a3.cl
index 8abc821d3..92d6aec87 100644
--- a/OpenCL/m00130_a3.cl
+++ b/OpenCL/m00130_a3.cl
@@ -14,11 +14,11 @@
#define DGST_R3 1
#include "include/kernel_functions.c"
-#include "types_ocl.c"
-#include "common.c"
+#include "OpenCL/types_ocl.c"
+#include "OpenCL/common.c"
-#define COMPARE_S "check_single_comp4.c"
-#define COMPARE_M "check_multi_comp4.c"
+#define COMPARE_S "OpenCL/check_single_comp4.c"
+#define COMPARE_M "OpenCL/check_multi_comp4.c"
static void m00130m (u32 w[16], const u32 pw_len, __global pw_t *pws, __global gpu_rule_t *rules_buf, __global comb_t *combs_buf, __constant u32 * words_buf_r, __global void *tmps, __global void *hooks, __global u32 *bitmaps_buf_s1_a, __global u32 *bitmaps_buf_s1_b, __global u32 *bitmaps_buf_s1_c, __global u32 *bitmaps_buf_s1_d, __global u32 *bitmaps_buf_s2_a, __global u32 *bitmaps_buf_s2_b, __global u32 *bitmaps_buf_s2_c, __global u32 *bitmaps_buf_s2_d, __global plain_t *plains_buf, __global digest_t *digests_buf, __global u32 *hashes_shown, __global salt_t *salt_bufs, __global void *esalt_bufs, __global u32 *d_return_buf, __global u32 *d_scryptV_buf, const u32 bitmap_mask, const u32 bitmap_shift1, const u32 bitmap_shift2, const u32 salt_pos, const u32 loop_pos, const u32 loop_cnt, const u32 bfs_cnt, const u32 digests_cnt, const u32 digests_offset)
{
diff --git a/OpenCL/m00140_a0.cl b/OpenCL/m00140_a0.cl
index e745ddff2..aa7c66b86 100644
--- a/OpenCL/m00140_a0.cl
+++ b/OpenCL/m00140_a0.cl
@@ -14,13 +14,13 @@
#define DGST_R3 1
#include "include/kernel_functions.c"
-#include "types_ocl.c"
-#include "common.c"
+#include "OpenCL/types_ocl.c"
+#include "OpenCL/common.c"
#include "include/rp_gpu.h"
#include "rp.c"
-#define COMPARE_S "check_single_comp4.c"
-#define COMPARE_M "check_multi_comp4.c"
+#define COMPARE_S "OpenCL/check_single_comp4.c"
+#define COMPARE_M "OpenCL/check_multi_comp4.c"
// no unicode yet
diff --git a/OpenCL/m00140_a1.cl b/OpenCL/m00140_a1.cl
index f056a16a3..515b76542 100644
--- a/OpenCL/m00140_a1.cl
+++ b/OpenCL/m00140_a1.cl
@@ -14,11 +14,11 @@
#define DGST_R3 1
#include "include/kernel_functions.c"
-#include "types_ocl.c"
-#include "common.c"
+#include "OpenCL/types_ocl.c"
+#include "OpenCL/common.c"
-#define COMPARE_S "check_single_comp4.c"
-#define COMPARE_M "check_multi_comp4.c"
+#define COMPARE_S "OpenCL/check_single_comp4.c"
+#define COMPARE_M "OpenCL/check_multi_comp4.c"
// no unicode yet
diff --git a/OpenCL/m00140_a3.cl b/OpenCL/m00140_a3.cl
index 6d0b68dd0..18c916725 100644
--- a/OpenCL/m00140_a3.cl
+++ b/OpenCL/m00140_a3.cl
@@ -14,11 +14,11 @@
#define DGST_R3 1
#include "include/kernel_functions.c"
-#include "types_ocl.c"
-#include "common.c"
+#include "OpenCL/types_ocl.c"
+#include "OpenCL/common.c"
-#define COMPARE_S "check_single_comp4.c"
-#define COMPARE_M "check_multi_comp4.c"
+#define COMPARE_S "OpenCL/check_single_comp4.c"
+#define COMPARE_M "OpenCL/check_multi_comp4.c"
static void overwrite_at (u32 sw[16], const u32 w0, const u32 salt_len)
{
diff --git a/OpenCL/m00150_a0.cl b/OpenCL/m00150_a0.cl
index 7524b9486..43ef83bb8 100644
--- a/OpenCL/m00150_a0.cl
+++ b/OpenCL/m00150_a0.cl
@@ -14,13 +14,13 @@
#define DGST_R3 1
#include "include/kernel_functions.c"
-#include "types_ocl.c"
-#include "common.c"
+#include "OpenCL/types_ocl.c"
+#include "OpenCL/common.c"
#include "include/rp_gpu.h"
#include "rp.c"
-#define COMPARE_S "check_single_comp4.c"
-#define COMPARE_M "check_multi_comp4.c"
+#define COMPARE_S "OpenCL/check_single_comp4.c"
+#define COMPARE_M "OpenCL/check_multi_comp4.c"
static void sha1_transform (const u32 w0[4], const u32 w1[4], const u32 w2[4], const u32 w3[4], u32 digest[5])
{
diff --git a/OpenCL/m00150_a1.cl b/OpenCL/m00150_a1.cl
index bf785efc0..f7c475f81 100644
--- a/OpenCL/m00150_a1.cl
+++ b/OpenCL/m00150_a1.cl
@@ -14,11 +14,11 @@
#define DGST_R3 1
#include "include/kernel_functions.c"
-#include "types_ocl.c"
-#include "common.c"
+#include "OpenCL/types_ocl.c"
+#include "OpenCL/common.c"
-#define COMPARE_S "check_single_comp4.c"
-#define COMPARE_M "check_multi_comp4.c"
+#define COMPARE_S "OpenCL/check_single_comp4.c"
+#define COMPARE_M "OpenCL/check_multi_comp4.c"
static void sha1_transform (const u32 w0[4], const u32 w1[4], const u32 w2[4], const u32 w3[4], u32 digest[5])
{
diff --git a/OpenCL/m00150_a3.cl b/OpenCL/m00150_a3.cl
index 22c6bde48..c5c452d50 100644
--- a/OpenCL/m00150_a3.cl
+++ b/OpenCL/m00150_a3.cl
@@ -14,11 +14,11 @@
#define DGST_R3 1
#include "include/kernel_functions.c"
-#include "types_ocl.c"
-#include "common.c"
+#include "OpenCL/types_ocl.c"
+#include "OpenCL/common.c"
-#define COMPARE_S "check_single_comp4.c"
-#define COMPARE_M "check_multi_comp4.c"
+#define COMPARE_S "OpenCL/check_single_comp4.c"
+#define COMPARE_M "OpenCL/check_multi_comp4.c"
static void sha1_transform (const u32 w0[4], const u32 w1[4], const u32 w2[4], const u32 w3[4], u32 digest[5])
{
diff --git a/OpenCL/m00160_a0.cl b/OpenCL/m00160_a0.cl
index 64f686dcd..fd44eca5d 100644
--- a/OpenCL/m00160_a0.cl
+++ b/OpenCL/m00160_a0.cl
@@ -14,13 +14,13 @@
#define DGST_R3 1
#include "include/kernel_functions.c"
-#include "types_ocl.c"
-#include "common.c"
+#include "OpenCL/types_ocl.c"
+#include "OpenCL/common.c"
#include "include/rp_gpu.h"
#include "rp.c"
-#define COMPARE_S "check_single_comp4.c"
-#define COMPARE_M "check_multi_comp4.c"
+#define COMPARE_S "OpenCL/check_single_comp4.c"
+#define COMPARE_M "OpenCL/check_multi_comp4.c"
static void sha1_transform (const u32 w0[4], const u32 w1[4], const u32 w2[4], const u32 w3[4], u32 digest[5])
{
diff --git a/OpenCL/m00160_a1.cl b/OpenCL/m00160_a1.cl
index bd58f48f6..4c8a19f07 100644
--- a/OpenCL/m00160_a1.cl
+++ b/OpenCL/m00160_a1.cl
@@ -14,11 +14,11 @@
#define DGST_R3 1
#include "include/kernel_functions.c"
-#include "types_ocl.c"
-#include "common.c"
+#include "OpenCL/types_ocl.c"
+#include "OpenCL/common.c"
-#define COMPARE_S "check_single_comp4.c"
-#define COMPARE_M "check_multi_comp4.c"
+#define COMPARE_S "OpenCL/check_single_comp4.c"
+#define COMPARE_M "OpenCL/check_multi_comp4.c"
static void sha1_transform (const u32 w0[4], const u32 w1[4], const u32 w2[4], const u32 w3[4], u32 digest[5])
{
diff --git a/OpenCL/m00160_a3.cl b/OpenCL/m00160_a3.cl
index 0c0b41497..fd3b1a9c7 100644
--- a/OpenCL/m00160_a3.cl
+++ b/OpenCL/m00160_a3.cl
@@ -14,11 +14,11 @@
#define DGST_R3 1
#include "include/kernel_functions.c"
-#include "types_ocl.c"
-#include "common.c"
+#include "OpenCL/types_ocl.c"
+#include "OpenCL/common.c"
-#define COMPARE_S "check_single_comp4.c"
-#define COMPARE_M "check_multi_comp4.c"
+#define COMPARE_S "OpenCL/check_single_comp4.c"
+#define COMPARE_M "OpenCL/check_multi_comp4.c"
static void sha1_transform (const u32 w0[4], const u32 w1[4], const u32 w2[4], const u32 w3[4], u32 digest[5])
{
diff --git a/OpenCL/m00190_a0.cl b/OpenCL/m00190_a0.cl
index e0111fc2b..5dd5ef481 100644
--- a/OpenCL/m00190_a0.cl
+++ b/OpenCL/m00190_a0.cl
@@ -14,13 +14,13 @@
#define DGST_R3 2
#include "include/kernel_functions.c"
-#include "types_ocl.c"
-#include "common.c"
+#include "OpenCL/types_ocl.c"
+#include "OpenCL/common.c"
#include "include/rp_gpu.h"
#include "rp.c"
-#define COMPARE_S "check_single_comp4.c"
-#define COMPARE_M "check_multi_comp4.c"
+#define COMPARE_S "OpenCL/check_single_comp4.c"
+#define COMPARE_M "OpenCL/check_multi_comp4.c"
__kernel void __attribute__((reqd_work_group_size (64, 1, 1))) m00190_m04 (__global pw_t *pws, __global gpu_rule_t *rules_buf, __global comb_t *combs_buf, __global bf_t *bfs_buf, __global void *tmps, __global void *hooks, __global u32 *bitmaps_buf_s1_a, __global u32 *bitmaps_buf_s1_b, __global u32 *bitmaps_buf_s1_c, __global u32 *bitmaps_buf_s1_d, __global u32 *bitmaps_buf_s2_a, __global u32 *bitmaps_buf_s2_b, __global u32 *bitmaps_buf_s2_c, __global u32 *bitmaps_buf_s2_d, __global plain_t *plains_buf, __global digest_t *digests_buf, __global u32 *hashes_shown, __global salt_t *salt_bufs, __global void *esalt_bufs, __global u32 *d_return_buf, __global u32 *d_scryptV_buf, const u32 bitmap_mask, const u32 bitmap_shift1, const u32 bitmap_shift2, const u32 salt_pos, const u32 loop_pos, const u32 loop_cnt, const u32 rules_cnt, const u32 digests_cnt, const u32 digests_offset, const u32 combs_mode, const u32 gid_max)
{
diff --git a/OpenCL/m00190_a1.cl b/OpenCL/m00190_a1.cl
index 4eb4181d4..f5cf9db06 100644
--- a/OpenCL/m00190_a1.cl
+++ b/OpenCL/m00190_a1.cl
@@ -14,11 +14,11 @@
#define DGST_R3 2
#include "include/kernel_functions.c"
-#include "types_ocl.c"
-#include "common.c"
+#include "OpenCL/types_ocl.c"
+#include "OpenCL/common.c"
-#define COMPARE_S "check_single_comp4.c"
-#define COMPARE_M "check_multi_comp4.c"
+#define COMPARE_S "OpenCL/check_single_comp4.c"
+#define COMPARE_M "OpenCL/check_multi_comp4.c"
__kernel void __attribute__((reqd_work_group_size (64, 1, 1))) m00190_m04 (__global pw_t *pws, __global gpu_rule_t *rules_buf, __global comb_t *combs_buf, __global bf_t *bfs_buf, __global void *tmps, __global void *hooks, __global u32 *bitmaps_buf_s1_a, __global u32 *bitmaps_buf_s1_b, __global u32 *bitmaps_buf_s1_c, __global u32 *bitmaps_buf_s1_d, __global u32 *bitmaps_buf_s2_a, __global u32 *bitmaps_buf_s2_b, __global u32 *bitmaps_buf_s2_c, __global u32 *bitmaps_buf_s2_d, __global plain_t *plains_buf, __global digest_t *digests_buf, __global u32 *hashes_shown, __global salt_t *salt_bufs, __global void *esalt_bufs, __global u32 *d_return_buf, __global u32 *d_scryptV_buf, const u32 bitmap_mask, const u32 bitmap_shift1, const u32 bitmap_shift2, const u32 salt_pos, const u32 loop_pos, const u32 loop_cnt, const u32 combs_cnt, const u32 digests_cnt, const u32 digests_offset, const u32 combs_mode, const u32 gid_max)
{
diff --git a/OpenCL/m00190_a3.cl b/OpenCL/m00190_a3.cl
index b5dd9fc83..1f2cb8d82 100644
--- a/OpenCL/m00190_a3.cl
+++ b/OpenCL/m00190_a3.cl
@@ -14,11 +14,11 @@
#define DGST_R3 2
#include "include/kernel_functions.c"
-#include "types_ocl.c"
-#include "common.c"
+#include "OpenCL/types_ocl.c"
+#include "OpenCL/common.c"
-#define COMPARE_S "check_single_comp4.c"
-#define COMPARE_M "check_multi_comp4.c"
+#define COMPARE_S "OpenCL/check_single_comp4.c"
+#define COMPARE_M "OpenCL/check_multi_comp4.c"
static void m00190m (u32 w[16], const u32 pw_len, __global pw_t *pws, __global gpu_rule_t *rules_buf, __global comb_t *combs_buf, __constant u32 * words_buf_r, __global void *tmps, __global void *hooks, __global u32 *bitmaps_buf_s1_a, __global u32 *bitmaps_buf_s1_b, __global u32 *bitmaps_buf_s1_c, __global u32 *bitmaps_buf_s1_d, __global u32 *bitmaps_buf_s2_a, __global u32 *bitmaps_buf_s2_b, __global u32 *bitmaps_buf_s2_c, __global u32 *bitmaps_buf_s2_d, __global plain_t *plains_buf, __global digest_t *digests_buf, __global u32 *hashes_shown, __global salt_t *salt_bufs, __global void *esalt_bufs, __global u32 *d_return_buf, __global u32 *d_scryptV_buf, const u32 bitmap_mask, const u32 bitmap_shift1, const u32 bitmap_shift2, const u32 salt_pos, const u32 loop_pos, const u32 loop_cnt, const u32 bfs_cnt, const u32 digests_cnt, const u32 digests_offset)
{
diff --git a/OpenCL/m00200_a0.cl b/OpenCL/m00200_a0.cl
index e04fce0dd..dcb5a57cb 100644
--- a/OpenCL/m00200_a0.cl
+++ b/OpenCL/m00200_a0.cl
@@ -14,13 +14,13 @@
#define DGST_R3 3
#include "include/kernel_functions.c"
-#include "types_ocl.c"
-#include "common.c"
+#include "OpenCL/types_ocl.c"
+#include "OpenCL/common.c"
#include "include/rp_gpu.h"
#include "rp.c"
-#define COMPARE_S "check_single_comp4.c"
-#define COMPARE_M "check_multi_comp4.c"
+#define COMPARE_S "OpenCL/check_single_comp4.c"
+#define COMPARE_M "OpenCL/check_multi_comp4.c"
__kernel void __attribute__((reqd_work_group_size (64, 1, 1))) m00200_m04 (__global pw_t *pws, __global gpu_rule_t *rules_buf, __global comb_t *combs_buf, __global bf_t *bfs_buf, __global void *tmps, __global void *hooks, __global u32 *bitmaps_buf_s1_a, __global u32 *bitmaps_buf_s1_b, __global u32 *bitmaps_buf_s1_c, __global u32 *bitmaps_buf_s1_d, __global u32 *bitmaps_buf_s2_a, __global u32 *bitmaps_buf_s2_b, __global u32 *bitmaps_buf_s2_c, __global u32 *bitmaps_buf_s2_d, __global plain_t *plains_buf, __global digest_t *digests_buf, __global u32 *hashes_shown, __global salt_t *salt_bufs, __global void *esalt_bufs, __global u32 *d_return_buf, __global u32 *d_scryptV_buf, const u32 bitmap_mask, const u32 bitmap_shift1, const u32 bitmap_shift2, const u32 salt_pos, const u32 loop_pos, const u32 loop_cnt, const u32 rules_cnt, const u32 digests_cnt, const u32 digests_offset, const u32 combs_mode, const u32 gid_max)
{
diff --git a/OpenCL/m00200_a1.cl b/OpenCL/m00200_a1.cl
index 3c6c67225..71ee5c3b8 100644
--- a/OpenCL/m00200_a1.cl
+++ b/OpenCL/m00200_a1.cl
@@ -14,11 +14,11 @@
#define DGST_R3 3
#include "include/kernel_functions.c"
-#include "types_ocl.c"
-#include "common.c"
+#include "OpenCL/types_ocl.c"
+#include "OpenCL/common.c"
-#define COMPARE_S "check_single_comp4.c"
-#define COMPARE_M "check_multi_comp4.c"
+#define COMPARE_S "OpenCL/check_single_comp4.c"
+#define COMPARE_M "OpenCL/check_multi_comp4.c"
__kernel void __attribute__((reqd_work_group_size (64, 1, 1))) m00200_m04 (__global pw_t *pws, __global gpu_rule_t *rules_buf, __global comb_t *combs_buf, __global bf_t *bfs_buf, __global void *tmps, __global void *hooks, __global u32 *bitmaps_buf_s1_a, __global u32 *bitmaps_buf_s1_b, __global u32 *bitmaps_buf_s1_c, __global u32 *bitmaps_buf_s1_d, __global u32 *bitmaps_buf_s2_a, __global u32 *bitmaps_buf_s2_b, __global u32 *bitmaps_buf_s2_c, __global u32 *bitmaps_buf_s2_d, __global plain_t *plains_buf, __global digest_t *digests_buf, __global u32 *hashes_shown, __global salt_t *salt_bufs, __global void *esalt_bufs, __global u32 *d_return_buf, __global u32 *d_scryptV_buf, const u32 bitmap_mask, const u32 bitmap_shift1, const u32 bitmap_shift2, const u32 salt_pos, const u32 loop_pos, const u32 loop_cnt, const u32 combs_cnt, const u32 digests_cnt, const u32 digests_offset, const u32 combs_mode, const u32 gid_max)
{
diff --git a/OpenCL/m00200_a3.cl b/OpenCL/m00200_a3.cl
index d7c624c32..8391a6931 100644
--- a/OpenCL/m00200_a3.cl
+++ b/OpenCL/m00200_a3.cl
@@ -14,11 +14,11 @@
#define DGST_R3 3
#include "include/kernel_functions.c"
-#include "types_ocl.c"
-#include "common.c"
+#include "OpenCL/types_ocl.c"
+#include "OpenCL/common.c"
-#define COMPARE_S "check_single_comp4.c"
-#define COMPARE_M "check_multi_comp4.c"
+#define COMPARE_S "OpenCL/check_single_comp4.c"
+#define COMPARE_M "OpenCL/check_multi_comp4.c"
static void m00200m (u32 w[16], const u32 pw_len, __global pw_t *pws, __global gpu_rule_t *rules_buf, __global comb_t *combs_buf, __constant u32 * words_buf_r, __global void *tmps, __global void *hooks, __global u32 *bitmaps_buf_s1_a, __global u32 *bitmaps_buf_s1_b, __global u32 *bitmaps_buf_s1_c, __global u32 *bitmaps_buf_s1_d, __global u32 *bitmaps_buf_s2_a, __global u32 *bitmaps_buf_s2_b, __global u32 *bitmaps_buf_s2_c, __global u32 *bitmaps_buf_s2_d, __global plain_t *plains_buf, __global digest_t *digests_buf, __global u32 *hashes_shown, __global salt_t *salt_bufs, __global void *esalt_bufs, __global u32 *d_return_buf, __global u32 *d_scryptV_buf, const u32 bitmap_mask, const u32 bitmap_shift1, const u32 bitmap_shift2, const u32 salt_pos, const u32 loop_pos, const u32 loop_cnt, const u32 bfs_cnt, const u32 digests_cnt, const u32 digests_offset)
{
diff --git a/OpenCL/m00300_a0.cl b/OpenCL/m00300_a0.cl
index ce697317e..5d53ffca9 100644
--- a/OpenCL/m00300_a0.cl
+++ b/OpenCL/m00300_a0.cl
@@ -14,13 +14,13 @@
#define DGST_R3 1
#include "include/kernel_functions.c"
-#include "types_ocl.c"
-#include "common.c"
+#include "OpenCL/types_ocl.c"
+#include "OpenCL/common.c"
#include "include/rp_gpu.h"
#include "rp.c"
-#define COMPARE_S "check_single_comp4.c"
-#define COMPARE_M "check_multi_comp4.c"
+#define COMPARE_S "OpenCL/check_single_comp4.c"
+#define COMPARE_M "OpenCL/check_multi_comp4.c"
__kernel void __attribute__((reqd_work_group_size (64, 1, 1))) m00300_m04 (__global pw_t *pws, __global gpu_rule_t *rules_buf, __global comb_t *combs_buf, __global bf_t *bfs_buf, __global void *tmps, __global void *hooks, __global u32 *bitmaps_buf_s1_a, __global u32 *bitmaps_buf_s1_b, __global u32 *bitmaps_buf_s1_c, __global u32 *bitmaps_buf_s1_d, __global u32 *bitmaps_buf_s2_a, __global u32 *bitmaps_buf_s2_b, __global u32 *bitmaps_buf_s2_c, __global u32 *bitmaps_buf_s2_d, __global plain_t *plains_buf, __global digest_t *digests_buf, __global u32 *hashes_shown, __global salt_t *salt_bufs, __global void *esalt_bufs, __global u32 *d_return_buf, __global u32 *d_scryptV_buf, const u32 bitmap_mask, const u32 bitmap_shift1, const u32 bitmap_shift2, const u32 salt_pos, const u32 loop_pos, const u32 loop_cnt, const u32 rules_cnt, const u32 digests_cnt, const u32 digests_offset, const u32 combs_mode, const u32 gid_max)
{
diff --git a/OpenCL/m00300_a1.cl b/OpenCL/m00300_a1.cl
index 93f250115..d54e30974 100644
--- a/OpenCL/m00300_a1.cl
+++ b/OpenCL/m00300_a1.cl
@@ -14,11 +14,11 @@
#define DGST_R3 1
#include "include/kernel_functions.c"
-#include "types_ocl.c"
-#include "common.c"
+#include "OpenCL/types_ocl.c"
+#include "OpenCL/common.c"
-#define COMPARE_S "check_single_comp4.c"
-#define COMPARE_M "check_multi_comp4.c"
+#define COMPARE_S "OpenCL/check_single_comp4.c"
+#define COMPARE_M "OpenCL/check_multi_comp4.c"
__kernel void __attribute__((reqd_work_group_size (64, 1, 1))) m00300_m04 (__global pw_t *pws, __global gpu_rule_t *rules_buf, __global comb_t *combs_buf, __global bf_t *bfs_buf, __global void *tmps, __global void *hooks, __global u32 *bitmaps_buf_s1_a, __global u32 *bitmaps_buf_s1_b, __global u32 *bitmaps_buf_s1_c, __global u32 *bitmaps_buf_s1_d, __global u32 *bitmaps_buf_s2_a, __global u32 *bitmaps_buf_s2_b, __global u32 *bitmaps_buf_s2_c, __global u32 *bitmaps_buf_s2_d, __global plain_t *plains_buf, __global digest_t *digests_buf, __global u32 *hashes_shown, __global salt_t *salt_bufs, __global void *esalt_bufs, __global u32 *d_return_buf, __global u32 *d_scryptV_buf, const u32 bitmap_mask, const u32 bitmap_shift1, const u32 bitmap_shift2, const u32 salt_pos, const u32 loop_pos, const u32 loop_cnt, const u32 combs_cnt, const u32 digests_cnt, const u32 digests_offset, const u32 combs_mode, const u32 gid_max)
{
diff --git a/OpenCL/m00300_a3.cl b/OpenCL/m00300_a3.cl
index e914e79ae..0216abe59 100644
--- a/OpenCL/m00300_a3.cl
+++ b/OpenCL/m00300_a3.cl
@@ -14,11 +14,11 @@
#define DGST_R3 1
#include "include/kernel_functions.c"
-#include "types_ocl.c"
-#include "common.c"
+#include "OpenCL/types_ocl.c"
+#include "OpenCL/common.c"
-#define COMPARE_S "check_single_comp4.c"
-#define COMPARE_M "check_multi_comp4.c"
+#define COMPARE_S "OpenCL/check_single_comp4.c"
+#define COMPARE_M "OpenCL/check_multi_comp4.c"
static void m00300m (u32 w[16], const u32 pw_len, __global pw_t *pws, __global gpu_rule_t *rules_buf, __global comb_t *combs_buf, __constant u32 * words_buf_r, __global void *tmps, __global void *hooks, __global u32 *bitmaps_buf_s1_a, __global u32 *bitmaps_buf_s1_b, __global u32 *bitmaps_buf_s1_c, __global u32 *bitmaps_buf_s1_d, __global u32 *bitmaps_buf_s2_a, __global u32 *bitmaps_buf_s2_b, __global u32 *bitmaps_buf_s2_c, __global u32 *bitmaps_buf_s2_d, __global plain_t *plains_buf, __global digest_t *digests_buf, __global u32 *hashes_shown, __global salt_t *salt_bufs, __global void *esalt_bufs, __global u32 *d_return_buf, __global u32 *d_scryptV_buf, const u32 bitmap_mask, const u32 bitmap_shift1, const u32 bitmap_shift2, const u32 salt_pos, const u32 loop_pos, const u32 loop_cnt, const u32 bfs_cnt, const u32 digests_cnt, const u32 digests_offset)
{
diff --git a/OpenCL/m00400.cl b/OpenCL/m00400.cl
index 46500bd16..b1d9a93c6 100644
--- a/OpenCL/m00400.cl
+++ b/OpenCL/m00400.cl
@@ -14,11 +14,11 @@
#define DGST_R3 3
#include "include/kernel_functions.c"
-#include "types_ocl.c"
-#include "common.c"
+#include "OpenCL/types_ocl.c"
+#include "OpenCL/common.c"
-#define COMPARE_S "check_single_comp4.c"
-#define COMPARE_M "check_multi_comp4.c"
+#define COMPARE_S "OpenCL/check_single_comp4.c"
+#define COMPARE_M "OpenCL/check_multi_comp4.c"
static void md5_transform (const u32 w0[4], const u32 w1[4], const u32 w2[4], const u32 w3[4], u32 digest[4])
{
diff --git a/OpenCL/m00500.cl b/OpenCL/m00500.cl
index 14d5a05f9..3c08f9df4 100644
--- a/OpenCL/m00500.cl
+++ b/OpenCL/m00500.cl
@@ -14,11 +14,11 @@
#define DGST_R3 3
#include "include/kernel_functions.c"
-#include "types_ocl.c"
-#include "common.c"
+#include "OpenCL/types_ocl.c"
+#include "OpenCL/common.c"
-#define COMPARE_S "check_single_comp4.c"
-#define COMPARE_M "check_multi_comp4.c"
+#define COMPARE_S "OpenCL/check_single_comp4.c"
+#define COMPARE_M "OpenCL/check_multi_comp4.c"
#define md5crypt_magic 0x00243124
diff --git a/OpenCL/m00900_a0.cl b/OpenCL/m00900_a0.cl
index 19713d327..8fe390ac0 100644
--- a/OpenCL/m00900_a0.cl
+++ b/OpenCL/m00900_a0.cl
@@ -14,13 +14,13 @@
#define DGST_R3 1
#include "include/kernel_functions.c"
-#include "types_ocl.c"
-#include "common.c"
+#include "OpenCL/types_ocl.c"
+#include "OpenCL/common.c"
#include "include/rp_gpu.h"
#include "rp.c"
-#define COMPARE_S "check_single_comp4.c"
-#define COMPARE_M "check_multi_comp4.c"
+#define COMPARE_S "OpenCL/check_single_comp4.c"
+#define COMPARE_M "OpenCL/check_multi_comp4.c"
__kernel void __attribute__((reqd_work_group_size (64, 1, 1))) m00900_m04 (__global pw_t *pws, __global gpu_rule_t *rules_buf, __global comb_t *combs_buf, __global bf_t *bfs_buf, __global void *tmps, __global void *hooks, __global u32 *bitmaps_buf_s1_a, __global u32 *bitmaps_buf_s1_b, __global u32 *bitmaps_buf_s1_c, __global u32 *bitmaps_buf_s1_d, __global u32 *bitmaps_buf_s2_a, __global u32 *bitmaps_buf_s2_b, __global u32 *bitmaps_buf_s2_c, __global u32 *bitmaps_buf_s2_d, __global plain_t *plains_buf, __global digest_t *digests_buf, __global u32 *hashes_shown, __global salt_t *salt_bufs, __global void *esalt_bufs, __global u32 *d_return_buf, __global u32 *d_scryptV_buf, const u32 bitmap_mask, const u32 bitmap_shift1, const u32 bitmap_shift2, const u32 salt_pos, const u32 loop_pos, const u32 loop_cnt, const u32 rules_cnt, const u32 digests_cnt, const u32 digests_offset, const u32 combs_mode, const u32 gid_max)
{
diff --git a/OpenCL/m00900_a1.cl b/OpenCL/m00900_a1.cl
index f30c03aa7..5652a9994 100644
--- a/OpenCL/m00900_a1.cl
+++ b/OpenCL/m00900_a1.cl
@@ -14,11 +14,11 @@
#define DGST_R3 1
#include "include/kernel_functions.c"
-#include "types_ocl.c"
-#include "common.c"
+#include "OpenCL/types_ocl.c"
+#include "OpenCL/common.c"
-#define COMPARE_S "check_single_comp4.c"
-#define COMPARE_M "check_multi_comp4.c"
+#define COMPARE_S "OpenCL/check_single_comp4.c"
+#define COMPARE_M "OpenCL/check_multi_comp4.c"
__kernel void __attribute__((reqd_work_group_size (64, 1, 1))) m00900_m04 (__global pw_t *pws, __global gpu_rule_t *rules_buf, __global comb_t *combs_buf, __global bf_t *bfs_buf, __global void *tmps, __global void *hooks, __global u32 *bitmaps_buf_s1_a, __global u32 *bitmaps_buf_s1_b, __global u32 *bitmaps_buf_s1_c, __global u32 *bitmaps_buf_s1_d, __global u32 *bitmaps_buf_s2_a, __global u32 *bitmaps_buf_s2_b, __global u32 *bitmaps_buf_s2_c, __global u32 *bitmaps_buf_s2_d, __global plain_t *plains_buf, __global digest_t *digests_buf, __global u32 *hashes_shown, __global salt_t *salt_bufs, __global void *esalt_bufs, __global u32 *d_return_buf, __global u32 *d_scryptV_buf, const u32 bitmap_mask, const u32 bitmap_shift1, const u32 bitmap_shift2, const u32 salt_pos, const u32 loop_pos, const u32 loop_cnt, const u32 combs_cnt, const u32 digests_cnt, const u32 digests_offset, const u32 combs_mode, const u32 gid_max)
{
diff --git a/OpenCL/m00900_a3.cl b/OpenCL/m00900_a3.cl
index 7423ebe6a..bc825ca6d 100644
--- a/OpenCL/m00900_a3.cl
+++ b/OpenCL/m00900_a3.cl
@@ -14,11 +14,11 @@
#define DGST_R3 1
#include "include/kernel_functions.c"
-#include "types_ocl.c"
-#include "common.c"
+#include "OpenCL/types_ocl.c"
+#include "OpenCL/common.c"
-#define COMPARE_S "check_single_comp4.c"
-#define COMPARE_M "check_multi_comp4.c"
+#define COMPARE_S "OpenCL/check_single_comp4.c"
+#define COMPARE_M "OpenCL/check_multi_comp4.c"
#define MD4_STEP_REV(f,a,b,c,d,x,t,s) \
{ \
diff --git a/OpenCL/m01000_a0.cl b/OpenCL/m01000_a0.cl
index 9309aa98e..84f2fb685 100644
--- a/OpenCL/m01000_a0.cl
+++ b/OpenCL/m01000_a0.cl
@@ -14,13 +14,13 @@
#define DGST_R3 1
#include "include/kernel_functions.c"
-#include "types_ocl.c"
-#include "common.c"
+#include "OpenCL/types_ocl.c"
+#include "OpenCL/common.c"
#include "include/rp_gpu.h"
#include "rp.c"
-#define COMPARE_S "check_single_comp4.c"
-#define COMPARE_M "check_multi_comp4.c"
+#define COMPARE_S "OpenCL/check_single_comp4.c"
+#define COMPARE_M "OpenCL/check_multi_comp4.c"
__kernel void __attribute__((reqd_work_group_size (64, 1, 1))) m01000_m04 (__global pw_t *pws, __global gpu_rule_t *rules_buf, __global comb_t *combs_buf, __global bf_t *bfs_buf, __global void *tmps, __global void *hooks, __global u32 *bitmaps_buf_s1_a, __global u32 *bitmaps_buf_s1_b, __global u32 *bitmaps_buf_s1_c, __global u32 *bitmaps_buf_s1_d, __global u32 *bitmaps_buf_s2_a, __global u32 *bitmaps_buf_s2_b, __global u32 *bitmaps_buf_s2_c, __global u32 *bitmaps_buf_s2_d, __global plain_t *plains_buf, __global digest_t *digests_buf, __global u32 *hashes_shown, __global salt_t *salt_bufs, __global void *esalt_bufs, __global u32 *d_return_buf, __global u32 *d_scryptV_buf, const u32 bitmap_mask, const u32 bitmap_shift1, const u32 bitmap_shift2, const u32 salt_pos, const u32 loop_pos, const u32 loop_cnt, const u32 rules_cnt, const u32 digests_cnt, const u32 digests_offset, const u32 combs_mode, const u32 gid_max)
{
diff --git a/OpenCL/m01000_a1.cl b/OpenCL/m01000_a1.cl
index e4f8e2286..42201092a 100644
--- a/OpenCL/m01000_a1.cl
+++ b/OpenCL/m01000_a1.cl
@@ -14,11 +14,11 @@
#define DGST_R3 1
#include "include/kernel_functions.c"
-#include "types_ocl.c"
-#include "common.c"
+#include "OpenCL/types_ocl.c"
+#include "OpenCL/common.c"
-#define COMPARE_S "check_single_comp4.c"
-#define COMPARE_M "check_multi_comp4.c"
+#define COMPARE_S "OpenCL/check_single_comp4.c"
+#define COMPARE_M "OpenCL/check_multi_comp4.c"
__kernel void __attribute__((reqd_work_group_size (64, 1, 1))) m01000_m04 (__global pw_t *pws, __global gpu_rule_t *rules_buf, __global comb_t *combs_buf, __global bf_t *bfs_buf, __global void *tmps, __global void *hooks, __global u32 *bitmaps_buf_s1_a, __global u32 *bitmaps_buf_s1_b, __global u32 *bitmaps_buf_s1_c, __global u32 *bitmaps_buf_s1_d, __global u32 *bitmaps_buf_s2_a, __global u32 *bitmaps_buf_s2_b, __global u32 *bitmaps_buf_s2_c, __global u32 *bitmaps_buf_s2_d, __global plain_t *plains_buf, __global digest_t *digests_buf, __global u32 *hashes_shown, __global salt_t *salt_bufs, __global void *esalt_bufs, __global u32 *d_return_buf, __global u32 *d_scryptV_buf, const u32 bitmap_mask, const u32 bitmap_shift1, const u32 bitmap_shift2, const u32 salt_pos, const u32 loop_pos, const u32 loop_cnt, const u32 combs_cnt, const u32 digests_cnt, const u32 digests_offset, const u32 combs_mode, const u32 gid_max)
{
diff --git a/OpenCL/m01000_a3.cl b/OpenCL/m01000_a3.cl
index 72abf0660..e0bf112bc 100644
--- a/OpenCL/m01000_a3.cl
+++ b/OpenCL/m01000_a3.cl
@@ -14,11 +14,11 @@
#define DGST_R3 1
#include "include/kernel_functions.c"
-#include "types_ocl.c"
-#include "common.c"
+#include "OpenCL/types_ocl.c"
+#include "OpenCL/common.c"
-#define COMPARE_S "check_single_comp4.c"
-#define COMPARE_M "check_multi_comp4.c"
+#define COMPARE_S "OpenCL/check_single_comp4.c"
+#define COMPARE_M "OpenCL/check_multi_comp4.c"
#define MD4_STEP_REV(f,a,b,c,d,x,t,s) \
{ \
diff --git a/OpenCL/m01100_a0.cl b/OpenCL/m01100_a0.cl
index 178f77766..6dffaf264 100644
--- a/OpenCL/m01100_a0.cl
+++ b/OpenCL/m01100_a0.cl
@@ -14,13 +14,13 @@
#define DGST_R3 1
#include "include/kernel_functions.c"
-#include "types_ocl.c"
-#include "common.c"
+#include "OpenCL/types_ocl.c"
+#include "OpenCL/common.c"
#include "include/rp_gpu.h"
#include "rp.c"
-#define COMPARE_S "check_single_comp4.c"
-#define COMPARE_M "check_multi_comp4.c"
+#define COMPARE_S "OpenCL/check_single_comp4.c"
+#define COMPARE_M "OpenCL/check_multi_comp4.c"
__kernel void __attribute__((reqd_work_group_size (64, 1, 1))) m01100_m04 (__global pw_t *pws, __global gpu_rule_t *rules_buf, __global comb_t *combs_buf, __global bf_t *bfs_buf, __global void *tmps, __global void *hooks, __global u32 *bitmaps_buf_s1_a, __global u32 *bitmaps_buf_s1_b, __global u32 *bitmaps_buf_s1_c, __global u32 *bitmaps_buf_s1_d, __global u32 *bitmaps_buf_s2_a, __global u32 *bitmaps_buf_s2_b, __global u32 *bitmaps_buf_s2_c, __global u32 *bitmaps_buf_s2_d, __global plain_t *plains_buf, __global digest_t *digests_buf, __global u32 *hashes_shown, __global salt_t *salt_bufs, __global void *esalt_bufs, __global u32 *d_return_buf, __global u32 *d_scryptV_buf, const u32 bitmap_mask, const u32 bitmap_shift1, const u32 bitmap_shift2, const u32 salt_pos, const u32 loop_pos, const u32 loop_cnt, const u32 rules_cnt, const u32 digests_cnt, const u32 digests_offset, const u32 combs_mode, const u32 gid_max)
{
diff --git a/OpenCL/m01100_a1.cl b/OpenCL/m01100_a1.cl
index 7bad83ee6..7a2a0d8d0 100644
--- a/OpenCL/m01100_a1.cl
+++ b/OpenCL/m01100_a1.cl
@@ -14,11 +14,11 @@
#define DGST_R3 1
#include "include/kernel_functions.c"
-#include "types_ocl.c"
-#include "common.c"
+#include "OpenCL/types_ocl.c"
+#include "OpenCL/common.c"
-#define COMPARE_S "check_single_comp4.c"
-#define COMPARE_M "check_multi_comp4.c"
+#define COMPARE_S "OpenCL/check_single_comp4.c"
+#define COMPARE_M "OpenCL/check_multi_comp4.c"
__kernel void __attribute__((reqd_work_group_size (64, 1, 1))) m01100_m04 (__global pw_t *pws, __global gpu_rule_t *rules_buf, __global comb_t *combs_buf, __global bf_t *bfs_buf, __global void *tmps, __global void *hooks, __global u32 *bitmaps_buf_s1_a, __global u32 *bitmaps_buf_s1_b, __global u32 *bitmaps_buf_s1_c, __global u32 *bitmaps_buf_s1_d, __global u32 *bitmaps_buf_s2_a, __global u32 *bitmaps_buf_s2_b, __global u32 *bitmaps_buf_s2_c, __global u32 *bitmaps_buf_s2_d, __global plain_t *plains_buf, __global digest_t *digests_buf, __global u32 *hashes_shown, __global salt_t *salt_bufs, __global void *esalt_bufs, __global u32 *d_return_buf, __global u32 *d_scryptV_buf, const u32 bitmap_mask, const u32 bitmap_shift1, const u32 bitmap_shift2, const u32 salt_pos, const u32 loop_pos, const u32 loop_cnt, const u32 combs_cnt, const u32 digests_cnt, const u32 digests_offset, const u32 combs_mode, const u32 gid_max)
{
diff --git a/OpenCL/m01100_a3.cl b/OpenCL/m01100_a3.cl
index 1036de158..c4d21cbb6 100644
--- a/OpenCL/m01100_a3.cl
+++ b/OpenCL/m01100_a3.cl
@@ -14,11 +14,11 @@
#define DGST_R3 1
#include "include/kernel_functions.c"
-#include "types_ocl.c"
-#include "common.c"
+#include "OpenCL/types_ocl.c"
+#include "OpenCL/common.c"
-#define COMPARE_S "check_single_comp4.c"
-#define COMPARE_M "check_multi_comp4.c"
+#define COMPARE_S "OpenCL/check_single_comp4.c"
+#define COMPARE_M "OpenCL/check_multi_comp4.c"
static void m01100m (u32 w[16], const u32 pw_len, __global pw_t *pws, __global gpu_rule_t *rules_buf, __global comb_t *combs_buf, __constant u32 * words_buf_r, __global void *tmps, __global void *hooks, __global u32 *bitmaps_buf_s1_a, __global u32 *bitmaps_buf_s1_b, __global u32 *bitmaps_buf_s1_c, __global u32 *bitmaps_buf_s1_d, __global u32 *bitmaps_buf_s2_a, __global u32 *bitmaps_buf_s2_b, __global u32 *bitmaps_buf_s2_c, __global u32 *bitmaps_buf_s2_d, __global plain_t *plains_buf, __global digest_t *digests_buf, __global u32 *hashes_shown, __global salt_t *salt_bufs, __global void *esalt_bufs, __global u32 *d_return_buf, __global u32 *d_scryptV_buf, const u32 bitmap_mask, const u32 bitmap_shift1, const u32 bitmap_shift2, const u32 salt_pos, const u32 loop_pos, const u32 loop_cnt, const u32 bfs_cnt, const u32 digests_cnt, const u32 digests_offset)
{
diff --git a/OpenCL/m01400_a0.cl b/OpenCL/m01400_a0.cl
index 865795d05..a075758c6 100644
--- a/OpenCL/m01400_a0.cl
+++ b/OpenCL/m01400_a0.cl
@@ -14,13 +14,13 @@
#define DGST_R3 6
#include "include/kernel_functions.c"
-#include "types_ocl.c"
-#include "common.c"
+#include "OpenCL/types_ocl.c"
+#include "OpenCL/common.c"
#include "include/rp_gpu.h"
#include "rp.c"
-#define COMPARE_S "check_single_comp4.c"
-#define COMPARE_M "check_multi_comp4.c"
+#define COMPARE_S "OpenCL/check_single_comp4.c"
+#define COMPARE_M "OpenCL/check_multi_comp4.c"
__kernel void __attribute__((reqd_work_group_size (64, 1, 1))) m01400_m04 (__global pw_t *pws, __global gpu_rule_t *rules_buf, __global comb_t *combs_buf, __global bf_t *bfs_buf, __global void *tmps, __global void *hooks, __global u32 *bitmaps_buf_s1_a, __global u32 *bitmaps_buf_s1_b, __global u32 *bitmaps_buf_s1_c, __global u32 *bitmaps_buf_s1_d, __global u32 *bitmaps_buf_s2_a, __global u32 *bitmaps_buf_s2_b, __global u32 *bitmaps_buf_s2_c, __global u32 *bitmaps_buf_s2_d, __global plain_t *plains_buf, __global digest_t *digests_buf, __global u32 *hashes_shown, __global salt_t *salt_bufs, __global void *esalt_bufs, __global u32 *d_return_buf, __global u32 *d_scryptV_buf, const u32 bitmap_mask, const u32 bitmap_shift1, const u32 bitmap_shift2, const u32 salt_pos, const u32 loop_pos, const u32 loop_cnt, const u32 rules_cnt, const u32 digests_cnt, const u32 digests_offset, const u32 combs_mode, const u32 gid_max)
{
diff --git a/OpenCL/m01400_a1.cl b/OpenCL/m01400_a1.cl
index d11d38927..46823e4fb 100644
--- a/OpenCL/m01400_a1.cl
+++ b/OpenCL/m01400_a1.cl
@@ -14,11 +14,11 @@
#define DGST_R3 6
#include "include/kernel_functions.c"
-#include "types_ocl.c"
-#include "common.c"
+#include "OpenCL/types_ocl.c"
+#include "OpenCL/common.c"
-#define COMPARE_S "check_single_comp4.c"
-#define COMPARE_M "check_multi_comp4.c"
+#define COMPARE_S "OpenCL/check_single_comp4.c"
+#define COMPARE_M "OpenCL/check_multi_comp4.c"
__kernel void __attribute__((reqd_work_group_size (64, 1, 1))) m01400_m04 (__global pw_t *pws, __global gpu_rule_t *rules_buf, __global comb_t *combs_buf, __global bf_t *bfs_buf, __global void *tmps, __global void *hooks, __global u32 *bitmaps_buf_s1_a, __global u32 *bitmaps_buf_s1_b, __global u32 *bitmaps_buf_s1_c, __global u32 *bitmaps_buf_s1_d, __global u32 *bitmaps_buf_s2_a, __global u32 *bitmaps_buf_s2_b, __global u32 *bitmaps_buf_s2_c, __global u32 *bitmaps_buf_s2_d, __global plain_t *plains_buf, __global digest_t *digests_buf, __global u32 *hashes_shown, __global salt_t *salt_bufs, __global void *esalt_bufs, __global u32 *d_return_buf, __global u32 *d_scryptV_buf, const u32 bitmap_mask, const u32 bitmap_shift1, const u32 bitmap_shift2, const u32 salt_pos, const u32 loop_pos, const u32 loop_cnt, const u32 combs_cnt, const u32 digests_cnt, const u32 digests_offset, const u32 combs_mode, const u32 gid_max)
{
diff --git a/OpenCL/m01400_a3.cl b/OpenCL/m01400_a3.cl
index 5a113dc65..f23258849 100644
--- a/OpenCL/m01400_a3.cl
+++ b/OpenCL/m01400_a3.cl
@@ -14,11 +14,11 @@
#define DGST_R3 6
#include "include/kernel_functions.c"
-#include "types_ocl.c"
-#include "common.c"
+#include "OpenCL/types_ocl.c"
+#include "OpenCL/common.c"
-#define COMPARE_S "check_single_comp4.c"
-#define COMPARE_M "check_multi_comp4.c"
+#define COMPARE_S "OpenCL/check_single_comp4.c"
+#define COMPARE_M "OpenCL/check_multi_comp4.c"
static void m01400m (u32 w[16], const u32 pw_len, __global pw_t *pws, __global gpu_rule_t *rules_buf, __global comb_t *combs_buf, __constant u32 * words_buf_r, __global void *tmps, __global void *hooks, __global u32 *bitmaps_buf_s1_a, __global u32 *bitmaps_buf_s1_b, __global u32 *bitmaps_buf_s1_c, __global u32 *bitmaps_buf_s1_d, __global u32 *bitmaps_buf_s2_a, __global u32 *bitmaps_buf_s2_b, __global u32 *bitmaps_buf_s2_c, __global u32 *bitmaps_buf_s2_d, __global plain_t *plains_buf, __global digest_t *digests_buf, __global u32 *hashes_shown, __global salt_t *salt_bufs, __global void *esalt_bufs, __global u32 *d_return_buf, __global u32 *d_scryptV_buf, const u32 bitmap_mask, const u32 bitmap_shift1, const u32 bitmap_shift2, const u32 salt_pos, const u32 loop_pos, const u32 loop_cnt, const u32 bfs_cnt, const u32 digests_cnt, const u32 digests_offset)
{
diff --git a/OpenCL/m01410_a0.cl b/OpenCL/m01410_a0.cl
index b559da662..88a891fa9 100644
--- a/OpenCL/m01410_a0.cl
+++ b/OpenCL/m01410_a0.cl
@@ -14,13 +14,13 @@
#define DGST_R3 6
#include "include/kernel_functions.c"
-#include "types_ocl.c"
-#include "common.c"
+#include "OpenCL/types_ocl.c"
+#include "OpenCL/common.c"
#include "include/rp_gpu.h"
#include "rp.c"
-#define COMPARE_S "check_single_comp4.c"
-#define COMPARE_M "check_multi_comp4.c"
+#define COMPARE_S "OpenCL/check_single_comp4.c"
+#define COMPARE_M "OpenCL/check_multi_comp4.c"
__kernel void __attribute__((reqd_work_group_size (64, 1, 1))) m01410_m04 (__global pw_t *pws, __global gpu_rule_t *rules_buf, __global comb_t *combs_buf, __global bf_t *bfs_buf, __global void *tmps, __global void *hooks, __global u32 *bitmaps_buf_s1_a, __global u32 *bitmaps_buf_s1_b, __global u32 *bitmaps_buf_s1_c, __global u32 *bitmaps_buf_s1_d, __global u32 *bitmaps_buf_s2_a, __global u32 *bitmaps_buf_s2_b, __global u32 *bitmaps_buf_s2_c, __global u32 *bitmaps_buf_s2_d, __global plain_t *plains_buf, __global digest_t *digests_buf, __global u32 *hashes_shown, __global salt_t *salt_bufs, __global void *esalt_bufs, __global u32 *d_return_buf, __global u32 *d_scryptV_buf, const u32 bitmap_mask, const u32 bitmap_shift1, const u32 bitmap_shift2, const u32 salt_pos, const u32 loop_pos, const u32 loop_cnt, const u32 rules_cnt, const u32 digests_cnt, const u32 digests_offset, const u32 combs_mode, const u32 gid_max)
{
diff --git a/OpenCL/m01410_a1.cl b/OpenCL/m01410_a1.cl
index fc54f7c42..bd0b532e6 100644
--- a/OpenCL/m01410_a1.cl
+++ b/OpenCL/m01410_a1.cl
@@ -14,11 +14,11 @@
#define DGST_R3 6
#include "include/kernel_functions.c"
-#include "types_ocl.c"
-#include "common.c"
+#include "OpenCL/types_ocl.c"
+#include "OpenCL/common.c"
-#define COMPARE_S "check_single_comp4.c"
-#define COMPARE_M "check_multi_comp4.c"
+#define COMPARE_S "OpenCL/check_single_comp4.c"
+#define COMPARE_M "OpenCL/check_multi_comp4.c"
__kernel void __attribute__((reqd_work_group_size (64, 1, 1))) m01410_m04 (__global pw_t *pws, __global gpu_rule_t *rules_buf, __global comb_t *combs_buf, __global bf_t *bfs_buf, __global void *tmps, __global void *hooks, __global u32 *bitmaps_buf_s1_a, __global u32 *bitmaps_buf_s1_b, __global u32 *bitmaps_buf_s1_c, __global u32 *bitmaps_buf_s1_d, __global u32 *bitmaps_buf_s2_a, __global u32 *bitmaps_buf_s2_b, __global u32 *bitmaps_buf_s2_c, __global u32 *bitmaps_buf_s2_d, __global plain_t *plains_buf, __global digest_t *digests_buf, __global u32 *hashes_shown, __global salt_t *salt_bufs, __global void *esalt_bufs, __global u32 *d_return_buf, __global u32 *d_scryptV_buf, const u32 bitmap_mask, const u32 bitmap_shift1, const u32 bitmap_shift2, const u32 salt_pos, const u32 loop_pos, const u32 loop_cnt, const u32 combs_cnt, const u32 digests_cnt, const u32 digests_offset, const u32 combs_mode, const u32 gid_max)
{
diff --git a/OpenCL/m01410_a3.cl b/OpenCL/m01410_a3.cl
index 842c29d89..9edb44d09 100644
--- a/OpenCL/m01410_a3.cl
+++ b/OpenCL/m01410_a3.cl
@@ -14,11 +14,11 @@
#define DGST_R3 6
#include "include/kernel_functions.c"
-#include "types_ocl.c"
-#include "common.c"
+#include "OpenCL/types_ocl.c"
+#include "OpenCL/common.c"
-#define COMPARE_S "check_single_comp4.c"
-#define COMPARE_M "check_multi_comp4.c"
+#define COMPARE_S "OpenCL/check_single_comp4.c"
+#define COMPARE_M "OpenCL/check_multi_comp4.c"
static void m01410m (u32 w[16], const u32 pw_len, __global pw_t *pws, __global gpu_rule_t *rules_buf, __global comb_t *combs_buf, __constant u32 * words_buf_r, __global void *tmps, __global void *hooks, __global u32 *bitmaps_buf_s1_a, __global u32 *bitmaps_buf_s1_b, __global u32 *bitmaps_buf_s1_c, __global u32 *bitmaps_buf_s1_d, __global u32 *bitmaps_buf_s2_a, __global u32 *bitmaps_buf_s2_b, __global u32 *bitmaps_buf_s2_c, __global u32 *bitmaps_buf_s2_d, __global plain_t *plains_buf, __global digest_t *digests_buf, __global u32 *hashes_shown, __global salt_t *salt_bufs, __global void *esalt_bufs, __global u32 *d_return_buf, __global u32 *d_scryptV_buf, const u32 bitmap_mask, const u32 bitmap_shift1, const u32 bitmap_shift2, const u32 salt_pos, const u32 loop_pos, const u32 loop_cnt, const u32 bfs_cnt, const u32 digests_cnt, const u32 digests_offset)
{
diff --git a/OpenCL/m01420_a0.cl b/OpenCL/m01420_a0.cl
index 6d1c1e589..3dff2b94b 100644
--- a/OpenCL/m01420_a0.cl
+++ b/OpenCL/m01420_a0.cl
@@ -14,13 +14,13 @@
#define DGST_R3 6
#include "include/kernel_functions.c"
-#include "types_ocl.c"
-#include "common.c"
+#include "OpenCL/types_ocl.c"
+#include "OpenCL/common.c"
#include "include/rp_gpu.h"
#include "rp.c"
-#define COMPARE_S "check_single_comp4.c"
-#define COMPARE_M "check_multi_comp4.c"
+#define COMPARE_S "OpenCL/check_single_comp4.c"
+#define COMPARE_M "OpenCL/check_multi_comp4.c"
__kernel void __attribute__((reqd_work_group_size (64, 1, 1))) m01420_m04 (__global pw_t *pws, __global gpu_rule_t *rules_buf, __global comb_t *combs_buf, __global bf_t *bfs_buf, __global void *tmps, __global void *hooks, __global u32 *bitmaps_buf_s1_a, __global u32 *bitmaps_buf_s1_b, __global u32 *bitmaps_buf_s1_c, __global u32 *bitmaps_buf_s1_d, __global u32 *bitmaps_buf_s2_a, __global u32 *bitmaps_buf_s2_b, __global u32 *bitmaps_buf_s2_c, __global u32 *bitmaps_buf_s2_d, __global plain_t *plains_buf, __global digest_t *digests_buf, __global u32 *hashes_shown, __global salt_t *salt_bufs, __global void *esalt_bufs, __global u32 *d_return_buf, __global u32 *d_scryptV_buf, const u32 bitmap_mask, const u32 bitmap_shift1, const u32 bitmap_shift2, const u32 salt_pos, const u32 loop_pos, const u32 loop_cnt, const u32 rules_cnt, const u32 digests_cnt, const u32 digests_offset, const u32 combs_mode, const u32 gid_max)
{
diff --git a/OpenCL/m01420_a1.cl b/OpenCL/m01420_a1.cl
index 7c37b77b4..d90a17953 100644
--- a/OpenCL/m01420_a1.cl
+++ b/OpenCL/m01420_a1.cl
@@ -14,11 +14,11 @@
#define DGST_R3 6
#include "include/kernel_functions.c"
-#include "types_ocl.c"
-#include "common.c"
+#include "OpenCL/types_ocl.c"
+#include "OpenCL/common.c"
-#define COMPARE_S "check_single_comp4.c"
-#define COMPARE_M "check_multi_comp4.c"
+#define COMPARE_S "OpenCL/check_single_comp4.c"
+#define COMPARE_M "OpenCL/check_multi_comp4.c"
__kernel void __attribute__((reqd_work_group_size (64, 1, 1))) m01420_m04 (__global pw_t *pws, __global gpu_rule_t *rules_buf, __global comb_t *combs_buf, __global bf_t *bfs_buf, __global void *tmps, __global void *hooks, __global u32 *bitmaps_buf_s1_a, __global u32 *bitmaps_buf_s1_b, __global u32 *bitmaps_buf_s1_c, __global u32 *bitmaps_buf_s1_d, __global u32 *bitmaps_buf_s2_a, __global u32 *bitmaps_buf_s2_b, __global u32 *bitmaps_buf_s2_c, __global u32 *bitmaps_buf_s2_d, __global plain_t *plains_buf, __global digest_t *digests_buf, __global u32 *hashes_shown, __global salt_t *salt_bufs, __global void *esalt_bufs, __global u32 *d_return_buf, __global u32 *d_scryptV_buf, const u32 bitmap_mask, const u32 bitmap_shift1, const u32 bitmap_shift2, const u32 salt_pos, const u32 loop_pos, const u32 loop_cnt, const u32 combs_cnt, const u32 digests_cnt, const u32 digests_offset, const u32 combs_mode, const u32 gid_max)
{
diff --git a/OpenCL/m01420_a3.cl b/OpenCL/m01420_a3.cl
index 5cbce06a3..613b9f41d 100644
--- a/OpenCL/m01420_a3.cl
+++ b/OpenCL/m01420_a3.cl
@@ -14,11 +14,11 @@
#define DGST_R3 6
#include "include/kernel_functions.c"
-#include "types_ocl.c"
-#include "common.c"
+#include "OpenCL/types_ocl.c"
+#include "OpenCL/common.c"
-#define COMPARE_S "check_single_comp4.c"
-#define COMPARE_M "check_multi_comp4.c"
+#define COMPARE_S "OpenCL/check_single_comp4.c"
+#define COMPARE_M "OpenCL/check_multi_comp4.c"
static void m01420m (u32 w0[4], u32 w1[4], u32 w2[4], u32 w3[4], const u32 pw_len, __global pw_t *pws, __global gpu_rule_t *rules_buf, __global comb_t *combs_buf, __global bf_t *bfs_buf, __global void *tmps, __global void *hooks, __global u32 *bitmaps_buf_s1_a, __global u32 *bitmaps_buf_s1_b, __global u32 *bitmaps_buf_s1_c, __global u32 *bitmaps_buf_s1_d, __global u32 *bitmaps_buf_s2_a, __global u32 *bitmaps_buf_s2_b, __global u32 *bitmaps_buf_s2_c, __global u32 *bitmaps_buf_s2_d, __global plain_t *plains_buf, __global digest_t *digests_buf, __global u32 *hashes_shown, __global salt_t *salt_bufs, __global void *esalt_bufs, __global u32 *d_return_buf, __global u32 *d_scryptV_buf, const u32 bitmap_mask, const u32 bitmap_shift1, const u32 bitmap_shift2, const u32 salt_pos, const u32 loop_pos, const u32 loop_cnt, const u32 bfs_cnt, const u32 digests_cnt, const u32 digests_offset)
{
diff --git a/OpenCL/m01430_a0.cl b/OpenCL/m01430_a0.cl
index 0f445a68c..26113adf5 100644
--- a/OpenCL/m01430_a0.cl
+++ b/OpenCL/m01430_a0.cl
@@ -14,13 +14,13 @@
#define DGST_R3 6
#include "include/kernel_functions.c"
-#include "types_ocl.c"
-#include "common.c"
+#include "OpenCL/types_ocl.c"
+#include "OpenCL/common.c"
#include "include/rp_gpu.h"
#include "rp.c"
-#define COMPARE_S "check_single_comp4.c"
-#define COMPARE_M "check_multi_comp4.c"
+#define COMPARE_S "OpenCL/check_single_comp4.c"
+#define COMPARE_M "OpenCL/check_multi_comp4.c"
__kernel void __attribute__((reqd_work_group_size (64, 1, 1))) m01430_m04 (__global pw_t *pws, __global gpu_rule_t *rules_buf, __global comb_t *combs_buf, __global bf_t *bfs_buf, __global void *tmps, __global void *hooks, __global u32 *bitmaps_buf_s1_a, __global u32 *bitmaps_buf_s1_b, __global u32 *bitmaps_buf_s1_c, __global u32 *bitmaps_buf_s1_d, __global u32 *bitmaps_buf_s2_a, __global u32 *bitmaps_buf_s2_b, __global u32 *bitmaps_buf_s2_c, __global u32 *bitmaps_buf_s2_d, __global plain_t *plains_buf, __global digest_t *digests_buf, __global u32 *hashes_shown, __global salt_t *salt_bufs, __global void *esalt_bufs, __global u32 *d_return_buf, __global u32 *d_scryptV_buf, const u32 bitmap_mask, const u32 bitmap_shift1, const u32 bitmap_shift2, const u32 salt_pos, const u32 loop_pos, const u32 loop_cnt, const u32 rules_cnt, const u32 digests_cnt, const u32 digests_offset, const u32 combs_mode, const u32 gid_max)
{
diff --git a/OpenCL/m01430_a1.cl b/OpenCL/m01430_a1.cl
index 71b8d67af..f8adb7274 100644
--- a/OpenCL/m01430_a1.cl
+++ b/OpenCL/m01430_a1.cl
@@ -14,11 +14,11 @@
#define DGST_R3 6
#include "include/kernel_functions.c"
-#include "types_ocl.c"
-#include "common.c"
+#include "OpenCL/types_ocl.c"
+#include "OpenCL/common.c"
-#define COMPARE_S "check_single_comp4.c"
-#define COMPARE_M "check_multi_comp4.c"
+#define COMPARE_S "OpenCL/check_single_comp4.c"
+#define COMPARE_M "OpenCL/check_multi_comp4.c"
__kernel void __attribute__((reqd_work_group_size (64, 1, 1))) m01430_m04 (__global pw_t *pws, __global gpu_rule_t *rules_buf, __global comb_t *combs_buf, __global bf_t *bfs_buf, __global void *tmps, __global void *hooks, __global u32 *bitmaps_buf_s1_a, __global u32 *bitmaps_buf_s1_b, __global u32 *bitmaps_buf_s1_c, __global u32 *bitmaps_buf_s1_d, __global u32 *bitmaps_buf_s2_a, __global u32 *bitmaps_buf_s2_b, __global u32 *bitmaps_buf_s2_c, __global u32 *bitmaps_buf_s2_d, __global plain_t *plains_buf, __global digest_t *digests_buf, __global u32 *hashes_shown, __global salt_t *salt_bufs, __global void *esalt_bufs, __global u32 *d_return_buf, __global u32 *d_scryptV_buf, const u32 bitmap_mask, const u32 bitmap_shift1, const u32 bitmap_shift2, const u32 salt_pos, const u32 loop_pos, const u32 loop_cnt, const u32 combs_cnt, const u32 digests_cnt, const u32 digests_offset, const u32 combs_mode, const u32 gid_max)
{
diff --git a/OpenCL/m01430_a3.cl b/OpenCL/m01430_a3.cl
index 3bc61f36e..70e37c66e 100644
--- a/OpenCL/m01430_a3.cl
+++ b/OpenCL/m01430_a3.cl
@@ -14,11 +14,11 @@
#define DGST_R3 6
#include "include/kernel_functions.c"
-#include "types_ocl.c"
-#include "common.c"
+#include "OpenCL/types_ocl.c"
+#include "OpenCL/common.c"
-#define COMPARE_S "check_single_comp4.c"
-#define COMPARE_M "check_multi_comp4.c"
+#define COMPARE_S "OpenCL/check_single_comp4.c"
+#define COMPARE_M "OpenCL/check_multi_comp4.c"
static void m01430m (u32 w[16], const u32 pw_len, __global pw_t *pws, __global gpu_rule_t *rules_buf, __global comb_t *combs_buf, __constant u32 * words_buf_r, __global void *tmps, __global void *hooks, __global u32 *bitmaps_buf_s1_a, __global u32 *bitmaps_buf_s1_b, __global u32 *bitmaps_buf_s1_c, __global u32 *bitmaps_buf_s1_d, __global u32 *bitmaps_buf_s2_a, __global u32 *bitmaps_buf_s2_b, __global u32 *bitmaps_buf_s2_c, __global u32 *bitmaps_buf_s2_d, __global plain_t *plains_buf, __global digest_t *digests_buf, __global u32 *hashes_shown, __global salt_t *salt_bufs, __global void *esalt_bufs, __global u32 *d_return_buf, __global u32 *d_scryptV_buf, const u32 bitmap_mask, const u32 bitmap_shift1, const u32 bitmap_shift2, const u32 salt_pos, const u32 loop_pos, const u32 loop_cnt, const u32 bfs_cnt, const u32 digests_cnt, const u32 digests_offset)
{
diff --git a/OpenCL/m01440_a0.cl b/OpenCL/m01440_a0.cl
index 9e211f740..46aa76672 100644
--- a/OpenCL/m01440_a0.cl
+++ b/OpenCL/m01440_a0.cl
@@ -14,13 +14,13 @@
#define DGST_R3 6
#include "include/kernel_functions.c"
-#include "types_ocl.c"
-#include "common.c"
+#include "OpenCL/types_ocl.c"
+#include "OpenCL/common.c"
#include "include/rp_gpu.h"
#include "rp.c"
-#define COMPARE_S "check_single_comp4.c"
-#define COMPARE_M "check_multi_comp4.c"
+#define COMPARE_S "OpenCL/check_single_comp4.c"
+#define COMPARE_M "OpenCL/check_multi_comp4.c"
__kernel void __attribute__((reqd_work_group_size (64, 1, 1))) m01440_m04 (__global pw_t *pws, __global gpu_rule_t *rules_buf, __global comb_t *combs_buf, __global bf_t *bfs_buf, __global void *tmps, __global void *hooks, __global u32 *bitmaps_buf_s1_a, __global u32 *bitmaps_buf_s1_b, __global u32 *bitmaps_buf_s1_c, __global u32 *bitmaps_buf_s1_d, __global u32 *bitmaps_buf_s2_a, __global u32 *bitmaps_buf_s2_b, __global u32 *bitmaps_buf_s2_c, __global u32 *bitmaps_buf_s2_d, __global plain_t *plains_buf, __global digest_t *digests_buf, __global u32 *hashes_shown, __global salt_t *salt_bufs, __global void *esalt_bufs, __global u32 *d_return_buf, __global u32 *d_scryptV_buf, const u32 bitmap_mask, const u32 bitmap_shift1, const u32 bitmap_shift2, const u32 salt_pos, const u32 loop_pos, const u32 loop_cnt, const u32 rules_cnt, const u32 digests_cnt, const u32 digests_offset, const u32 combs_mode, const u32 gid_max)
{
diff --git a/OpenCL/m01440_a1.cl b/OpenCL/m01440_a1.cl
index 77c4df46e..1090e134a 100644
--- a/OpenCL/m01440_a1.cl
+++ b/OpenCL/m01440_a1.cl
@@ -14,11 +14,11 @@
#define DGST_R3 6
#include "include/kernel_functions.c"
-#include "types_ocl.c"
-#include "common.c"
+#include "OpenCL/types_ocl.c"
+#include "OpenCL/common.c"
-#define COMPARE_S "check_single_comp4.c"
-#define COMPARE_M "check_multi_comp4.c"
+#define COMPARE_S "OpenCL/check_single_comp4.c"
+#define COMPARE_M "OpenCL/check_multi_comp4.c"
__kernel void __attribute__((reqd_work_group_size (64, 1, 1))) m01440_m04 (__global pw_t *pws, __global gpu_rule_t *rules_buf, __global comb_t *combs_buf, __global bf_t *bfs_buf, __global void *tmps, __global void *hooks, __global u32 *bitmaps_buf_s1_a, __global u32 *bitmaps_buf_s1_b, __global u32 *bitmaps_buf_s1_c, __global u32 *bitmaps_buf_s1_d, __global u32 *bitmaps_buf_s2_a, __global u32 *bitmaps_buf_s2_b, __global u32 *bitmaps_buf_s2_c, __global u32 *bitmaps_buf_s2_d, __global plain_t *plains_buf, __global digest_t *digests_buf, __global u32 *hashes_shown, __global salt_t *salt_bufs, __global void *esalt_bufs, __global u32 *d_return_buf, __global u32 *d_scryptV_buf, const u32 bitmap_mask, const u32 bitmap_shift1, const u32 bitmap_shift2, const u32 salt_pos, const u32 loop_pos, const u32 loop_cnt, const u32 combs_cnt, const u32 digests_cnt, const u32 digests_offset, const u32 combs_mode, const u32 gid_max)
{
diff --git a/OpenCL/m01440_a3.cl b/OpenCL/m01440_a3.cl
index bbec4bb5c..b34100372 100644
--- a/OpenCL/m01440_a3.cl
+++ b/OpenCL/m01440_a3.cl
@@ -14,11 +14,11 @@
#define DGST_R3 6
#include "include/kernel_functions.c"
-#include "types_ocl.c"
-#include "common.c"
+#include "OpenCL/types_ocl.c"
+#include "OpenCL/common.c"
-#define COMPARE_S "check_single_comp4.c"
-#define COMPARE_M "check_multi_comp4.c"
+#define COMPARE_S "OpenCL/check_single_comp4.c"
+#define COMPARE_M "OpenCL/check_multi_comp4.c"
static void m01440m (u32 w0[4], u32 w1[4], u32 w2[4], u32 w3[4], const u32 pw_len, __global pw_t *pws, __global gpu_rule_t *rules_buf, __global comb_t *combs_buf, __global bf_t *bfs_buf, __global void *tmps, __global void *hooks, __global u32 *bitmaps_buf_s1_a, __global u32 *bitmaps_buf_s1_b, __global u32 *bitmaps_buf_s1_c, __global u32 *bitmaps_buf_s1_d, __global u32 *bitmaps_buf_s2_a, __global u32 *bitmaps_buf_s2_b, __global u32 *bitmaps_buf_s2_c, __global u32 *bitmaps_buf_s2_d, __global plain_t *plains_buf, __global digest_t *digests_buf, __global u32 *hashes_shown, __global salt_t *salt_bufs, __global void *esalt_bufs, __global u32 *d_return_buf, __global u32 *d_scryptV_buf, const u32 bitmap_mask, const u32 bitmap_shift1, const u32 bitmap_shift2, const u32 salt_pos, const u32 loop_pos, const u32 loop_cnt, const u32 bfs_cnt, const u32 digests_cnt, const u32 digests_offset)
{
diff --git a/OpenCL/m01450_a0.cl b/OpenCL/m01450_a0.cl
index fcc420e5c..b32dba148 100644
--- a/OpenCL/m01450_a0.cl
+++ b/OpenCL/m01450_a0.cl
@@ -14,13 +14,13 @@
#define DGST_R3 6
#include "include/kernel_functions.c"
-#include "types_ocl.c"
-#include "common.c"
+#include "OpenCL/types_ocl.c"
+#include "OpenCL/common.c"
#include "include/rp_gpu.h"
#include "rp.c"
-#define COMPARE_S "check_single_comp4.c"
-#define COMPARE_M "check_multi_comp4.c"
+#define COMPARE_S "OpenCL/check_single_comp4.c"
+#define COMPARE_M "OpenCL/check_multi_comp4.c"
__constant u32 k_sha256[64] =
{
diff --git a/OpenCL/m01450_a1.cl b/OpenCL/m01450_a1.cl
index 7d693da8d..1eb5f50d5 100644
--- a/OpenCL/m01450_a1.cl
+++ b/OpenCL/m01450_a1.cl
@@ -14,11 +14,11 @@
#define DGST_R3 6
#include "include/kernel_functions.c"
-#include "types_ocl.c"
-#include "common.c"
+#include "OpenCL/types_ocl.c"
+#include "OpenCL/common.c"
-#define COMPARE_S "check_single_comp4.c"
-#define COMPARE_M "check_multi_comp4.c"
+#define COMPARE_S "OpenCL/check_single_comp4.c"
+#define COMPARE_M "OpenCL/check_multi_comp4.c"
__constant u32 k_sha256[64] =
{
diff --git a/OpenCL/m01450_a3.cl b/OpenCL/m01450_a3.cl
index 3a1af4326..013238ae5 100644
--- a/OpenCL/m01450_a3.cl
+++ b/OpenCL/m01450_a3.cl
@@ -14,11 +14,11 @@
#define DGST_R3 6
#include "include/kernel_functions.c"
-#include "types_ocl.c"
-#include "common.c"
+#include "OpenCL/types_ocl.c"
+#include "OpenCL/common.c"
-#define COMPARE_S "check_single_comp4.c"
-#define COMPARE_M "check_multi_comp4.c"
+#define COMPARE_S "OpenCL/check_single_comp4.c"
+#define COMPARE_M "OpenCL/check_multi_comp4.c"
__constant u32 k_sha256[64] =
{
diff --git a/OpenCL/m01460_a0.cl b/OpenCL/m01460_a0.cl
index e7a2ae130..1e52a4e65 100644
--- a/OpenCL/m01460_a0.cl
+++ b/OpenCL/m01460_a0.cl
@@ -14,13 +14,13 @@
#define DGST_R3 6
#include "include/kernel_functions.c"
-#include "types_ocl.c"
-#include "common.c"
+#include "OpenCL/types_ocl.c"
+#include "OpenCL/common.c"
#include "include/rp_gpu.h"
#include "rp.c"
-#define COMPARE_S "check_single_comp4.c"
-#define COMPARE_M "check_multi_comp4.c"
+#define COMPARE_S "OpenCL/check_single_comp4.c"
+#define COMPARE_M "OpenCL/check_multi_comp4.c"
__constant u32 k_sha256[64] =
{
diff --git a/OpenCL/m01460_a1.cl b/OpenCL/m01460_a1.cl
index 862aec3ac..4c2c05272 100644
--- a/OpenCL/m01460_a1.cl
+++ b/OpenCL/m01460_a1.cl
@@ -14,11 +14,11 @@
#define DGST_R3 6
#include "include/kernel_functions.c"
-#include "types_ocl.c"
-#include "common.c"
+#include "OpenCL/types_ocl.c"
+#include "OpenCL/common.c"
-#define COMPARE_S "check_single_comp4.c"
-#define COMPARE_M "check_multi_comp4.c"
+#define COMPARE_S "OpenCL/check_single_comp4.c"
+#define COMPARE_M "OpenCL/check_multi_comp4.c"
__constant u32 k_sha256[64] =
{
diff --git a/OpenCL/m01460_a3.cl b/OpenCL/m01460_a3.cl
index 02c276e29..068228faa 100644
--- a/OpenCL/m01460_a3.cl
+++ b/OpenCL/m01460_a3.cl
@@ -14,11 +14,11 @@
#define DGST_R3 6
#include "include/kernel_functions.c"
-#include "types_ocl.c"
-#include "common.c"
+#include "OpenCL/types_ocl.c"
+#include "OpenCL/common.c"
-#define COMPARE_S "check_single_comp4.c"
-#define COMPARE_M "check_multi_comp4.c"
+#define COMPARE_S "OpenCL/check_single_comp4.c"
+#define COMPARE_M "OpenCL/check_multi_comp4.c"
__constant u32 k_sha256[64] =
{
diff --git a/OpenCL/m01500_a0.cl b/OpenCL/m01500_a0.cl
index cae268fb2..080d93301 100644
--- a/OpenCL/m01500_a0.cl
+++ b/OpenCL/m01500_a0.cl
@@ -14,13 +14,13 @@
#define DGST_R3 3
#include "include/kernel_functions.c"
-#include "types_ocl.c"
-#include "common.c"
+#include "OpenCL/types_ocl.c"
+#include "OpenCL/common.c"
#include "include/rp_gpu.h"
#include "rp.c"
-#define COMPARE_S "check_single_comp4.c"
-#define COMPARE_M "check_multi_comp4.c"
+#define COMPARE_S "OpenCL/check_single_comp4.c"
+#define COMPARE_M "OpenCL/check_multi_comp4.c"
#define PERM_OP(a,b,tt,n,m) \
{ \
diff --git a/OpenCL/m01500_a1.cl b/OpenCL/m01500_a1.cl
index e40af0cc9..1569a7286 100644
--- a/OpenCL/m01500_a1.cl
+++ b/OpenCL/m01500_a1.cl
@@ -14,11 +14,11 @@
#define DGST_R3 3
#include "include/kernel_functions.c"
-#include "types_ocl.c"
-#include "common.c"
+#include "OpenCL/types_ocl.c"
+#include "OpenCL/common.c"
-#define COMPARE_S "check_single_comp4.c"
-#define COMPARE_M "check_multi_comp4.c"
+#define COMPARE_S "OpenCL/check_single_comp4.c"
+#define COMPARE_M "OpenCL/check_multi_comp4.c"
#define PERM_OP(a,b,tt,n,m) \
{ \
diff --git a/OpenCL/m01500_a3.cl b/OpenCL/m01500_a3.cl
index dc25c9089..8a0bf6baa 100644
--- a/OpenCL/m01500_a3.cl
+++ b/OpenCL/m01500_a3.cl
@@ -16,11 +16,11 @@
#define DGST_R3 3
#include "include/kernel_functions.c"
-#include "types_ocl.c"
-#include "common.c"
+#include "OpenCL/types_ocl.c"
+#include "OpenCL/common.c"
-#define COMPARE_S "check_single_comp4_bs.c"
-#define COMPARE_M "check_multi_comp4_bs.c"
+#define COMPARE_S "OpenCL/check_single_comp4_bs.c"
+#define COMPARE_M "OpenCL/check_multi_comp4_bs.c"
#define myselx(a,b,c) ((c) ? (b) : (a))
diff --git a/OpenCL/m01600.cl b/OpenCL/m01600.cl
index 3ff43a824..1dd6050f0 100644
--- a/OpenCL/m01600.cl
+++ b/OpenCL/m01600.cl
@@ -14,11 +14,11 @@
#define DGST_R3 3
#include "include/kernel_functions.c"
-#include "types_ocl.c"
-#include "common.c"
+#include "OpenCL/types_ocl.c"
+#include "OpenCL/common.c"
-#define COMPARE_S "check_single_comp4.c"
-#define COMPARE_M "check_multi_comp4.c"
+#define COMPARE_S "OpenCL/check_single_comp4.c"
+#define COMPARE_M "OpenCL/check_multi_comp4.c"
#define md5apr1_magic0 0x72706124
#define md5apr1_magic1 0x00002431
diff --git a/OpenCL/m01700_a0.cl b/OpenCL/m01700_a0.cl
index 46818f273..a49c272b7 100644
--- a/OpenCL/m01700_a0.cl
+++ b/OpenCL/m01700_a0.cl
@@ -14,13 +14,13 @@
#define DGST_R3 7
#include "include/kernel_functions.c"
-#include "types_ocl.c"
-#include "common.c"
+#include "OpenCL/types_ocl.c"
+#include "OpenCL/common.c"
#include "include/rp_gpu.h"
#include "rp.c"
-#define COMPARE_S "check_single_comp4.c"
-#define COMPARE_M "check_multi_comp4.c"
+#define COMPARE_S "OpenCL/check_single_comp4.c"
+#define COMPARE_M "OpenCL/check_multi_comp4.c"
__constant u64 k_sha512[80] =
{
diff --git a/OpenCL/m01700_a1.cl b/OpenCL/m01700_a1.cl
index 3428c741f..1d2eeabe0 100644
--- a/OpenCL/m01700_a1.cl
+++ b/OpenCL/m01700_a1.cl
@@ -14,11 +14,11 @@
#define DGST_R3 7
#include "include/kernel_functions.c"
-#include "types_ocl.c"
-#include "common.c"
+#include "OpenCL/types_ocl.c"
+#include "OpenCL/common.c"
-#define COMPARE_S "check_single_comp4.c"
-#define COMPARE_M "check_multi_comp4.c"
+#define COMPARE_S "OpenCL/check_single_comp4.c"
+#define COMPARE_M "OpenCL/check_multi_comp4.c"
__constant u64 k_sha512[80] =
{
diff --git a/OpenCL/m01700_a3.cl b/OpenCL/m01700_a3.cl
index 5e7e889e2..87dbff77c 100644
--- a/OpenCL/m01700_a3.cl
+++ b/OpenCL/m01700_a3.cl
@@ -14,11 +14,11 @@
#define DGST_R3 7
#include "include/kernel_functions.c"
-#include "types_ocl.c"
-#include "common.c"
+#include "OpenCL/types_ocl.c"
+#include "OpenCL/common.c"
-#define COMPARE_S "check_single_comp4.c"
-#define COMPARE_M "check_multi_comp4.c"
+#define COMPARE_S "OpenCL/check_single_comp4.c"
+#define COMPARE_M "OpenCL/check_multi_comp4.c"
__constant u64 k_sha512[80] =
{
diff --git a/OpenCL/m01710_a0.cl b/OpenCL/m01710_a0.cl
index eef489bc9..b6ddcee03 100644
--- a/OpenCL/m01710_a0.cl
+++ b/OpenCL/m01710_a0.cl
@@ -14,13 +14,13 @@
#define DGST_R3 7
#include "include/kernel_functions.c"
-#include "types_ocl.c"
-#include "common.c"
+#include "OpenCL/types_ocl.c"
+#include "OpenCL/common.c"
#include "include/rp_gpu.h"
#include "rp.c"
-#define COMPARE_S "check_single_comp4.c"
-#define COMPARE_M "check_multi_comp4.c"
+#define COMPARE_S "OpenCL/check_single_comp4.c"
+#define COMPARE_M "OpenCL/check_multi_comp4.c"
__constant u64 k_sha512[80] =
{
diff --git a/OpenCL/m01710_a1.cl b/OpenCL/m01710_a1.cl
index bc28ac273..d4d45dbfc 100644
--- a/OpenCL/m01710_a1.cl
+++ b/OpenCL/m01710_a1.cl
@@ -14,11 +14,11 @@
#define DGST_R3 7
#include "include/kernel_functions.c"
-#include "types_ocl.c"
-#include "common.c"
+#include "OpenCL/types_ocl.c"
+#include "OpenCL/common.c"
-#define COMPARE_S "check_single_comp4.c"
-#define COMPARE_M "check_multi_comp4.c"
+#define COMPARE_S "OpenCL/check_single_comp4.c"
+#define COMPARE_M "OpenCL/check_multi_comp4.c"
__constant u64 k_sha512[80] =
{
diff --git a/OpenCL/m01710_a3.cl b/OpenCL/m01710_a3.cl
index 00c3636f4..beaf7ff62 100644
--- a/OpenCL/m01710_a3.cl
+++ b/OpenCL/m01710_a3.cl
@@ -14,11 +14,11 @@
#define DGST_R3 7
#include "include/kernel_functions.c"
-#include "types_ocl.c"
-#include "common.c"
+#include "OpenCL/types_ocl.c"
+#include "OpenCL/common.c"
-#define COMPARE_S "check_single_comp4.c"
-#define COMPARE_M "check_multi_comp4.c"
+#define COMPARE_S "OpenCL/check_single_comp4.c"
+#define COMPARE_M "OpenCL/check_multi_comp4.c"
__constant u64 k_sha512[80] =
{
diff --git a/OpenCL/m01720_a0.cl b/OpenCL/m01720_a0.cl
index e714450d3..d8dd9377f 100644
--- a/OpenCL/m01720_a0.cl
+++ b/OpenCL/m01720_a0.cl
@@ -14,13 +14,13 @@
#define DGST_R3 7
#include "include/kernel_functions.c"
-#include "types_ocl.c"
-#include "common.c"
+#include "OpenCL/types_ocl.c"
+#include "OpenCL/common.c"
#include "include/rp_gpu.h"
#include "rp.c"
-#define COMPARE_S "check_single_comp4.c"
-#define COMPARE_M "check_multi_comp4.c"
+#define COMPARE_S "OpenCL/check_single_comp4.c"
+#define COMPARE_M "OpenCL/check_multi_comp4.c"
__constant u64 k_sha512[80] =
{
diff --git a/OpenCL/m01720_a1.cl b/OpenCL/m01720_a1.cl
index 13230df4d..453a515ae 100644
--- a/OpenCL/m01720_a1.cl
+++ b/OpenCL/m01720_a1.cl
@@ -14,11 +14,11 @@
#define DGST_R3 7
#include "include/kernel_functions.c"
-#include "types_ocl.c"
-#include "common.c"
+#include "OpenCL/types_ocl.c"
+#include "OpenCL/common.c"
-#define COMPARE_S "check_single_comp4.c"
-#define COMPARE_M "check_multi_comp4.c"
+#define COMPARE_S "OpenCL/check_single_comp4.c"
+#define COMPARE_M "OpenCL/check_multi_comp4.c"
__constant u64 k_sha512[80] =
{
diff --git a/OpenCL/m01720_a3.cl b/OpenCL/m01720_a3.cl
index ff1b25193..1cd79c1ee 100644
--- a/OpenCL/m01720_a3.cl
+++ b/OpenCL/m01720_a3.cl
@@ -14,11 +14,11 @@
#define DGST_R3 7
#include "include/kernel_functions.c"
-#include "types_ocl.c"
-#include "common.c"
+#include "OpenCL/types_ocl.c"
+#include "OpenCL/common.c"
-#define COMPARE_S "check_single_comp4.c"
-#define COMPARE_M "check_multi_comp4.c"
+#define COMPARE_S "OpenCL/check_single_comp4.c"
+#define COMPARE_M "OpenCL/check_multi_comp4.c"
__constant u64 k_sha512[80] =
{
diff --git a/OpenCL/m01730_a0.cl b/OpenCL/m01730_a0.cl
index cda4754d1..2dece7c60 100644
--- a/OpenCL/m01730_a0.cl
+++ b/OpenCL/m01730_a0.cl
@@ -14,13 +14,13 @@
#define DGST_R3 7
#include "include/kernel_functions.c"
-#include "types_ocl.c"
-#include "common.c"
+#include "OpenCL/types_ocl.c"
+#include "OpenCL/common.c"
#include "include/rp_gpu.h"
#include "rp.c"
-#define COMPARE_S "check_single_comp4.c"
-#define COMPARE_M "check_multi_comp4.c"
+#define COMPARE_S "OpenCL/check_single_comp4.c"
+#define COMPARE_M "OpenCL/check_multi_comp4.c"
__constant u64 k_sha512[80] =
{
diff --git a/OpenCL/m01730_a1.cl b/OpenCL/m01730_a1.cl
index 6b419c37f..25de31e5c 100644
--- a/OpenCL/m01730_a1.cl
+++ b/OpenCL/m01730_a1.cl
@@ -14,11 +14,11 @@
#define DGST_R3 7
#include "include/kernel_functions.c"
-#include "types_ocl.c"
-#include "common.c"
+#include "OpenCL/types_ocl.c"
+#include "OpenCL/common.c"
-#define COMPARE_S "check_single_comp4.c"
-#define COMPARE_M "check_multi_comp4.c"
+#define COMPARE_S "OpenCL/check_single_comp4.c"
+#define COMPARE_M "OpenCL/check_multi_comp4.c"
__constant u64 k_sha512[80] =
{
diff --git a/OpenCL/m01730_a3.cl b/OpenCL/m01730_a3.cl
index 6824dfbca..c0ab7f380 100644
--- a/OpenCL/m01730_a3.cl
+++ b/OpenCL/m01730_a3.cl
@@ -14,11 +14,11 @@
#define DGST_R3 7
#include "include/kernel_functions.c"
-#include "types_ocl.c"
-#include "common.c"
+#include "OpenCL/types_ocl.c"
+#include "OpenCL/common.c"
-#define COMPARE_S "check_single_comp4.c"
-#define COMPARE_M "check_multi_comp4.c"
+#define COMPARE_S "OpenCL/check_single_comp4.c"
+#define COMPARE_M "OpenCL/check_multi_comp4.c"
__constant u64 k_sha512[80] =
{
diff --git a/OpenCL/m01740_a0.cl b/OpenCL/m01740_a0.cl
index cc2cab3a2..a8eabc8bc 100644
--- a/OpenCL/m01740_a0.cl
+++ b/OpenCL/m01740_a0.cl
@@ -14,13 +14,13 @@
#define DGST_R3 7
#include "include/kernel_functions.c"
-#include "types_ocl.c"
-#include "common.c"
+#include "OpenCL/types_ocl.c"
+#include "OpenCL/common.c"
#include "include/rp_gpu.h"
#include "rp.c"
-#define COMPARE_S "check_single_comp4.c"
-#define COMPARE_M "check_multi_comp4.c"
+#define COMPARE_S "OpenCL/check_single_comp4.c"
+#define COMPARE_M "OpenCL/check_multi_comp4.c"
__constant u64 k_sha512[80] =
{
diff --git a/OpenCL/m01740_a1.cl b/OpenCL/m01740_a1.cl
index 00c2d61a4..e6bbd1643 100644
--- a/OpenCL/m01740_a1.cl
+++ b/OpenCL/m01740_a1.cl
@@ -14,11 +14,11 @@
#define DGST_R3 7
#include "include/kernel_functions.c"
-#include "types_ocl.c"
-#include "common.c"
+#include "OpenCL/types_ocl.c"
+#include "OpenCL/common.c"
-#define COMPARE_S "check_single_comp4.c"
-#define COMPARE_M "check_multi_comp4.c"
+#define COMPARE_S "OpenCL/check_single_comp4.c"
+#define COMPARE_M "OpenCL/check_multi_comp4.c"
__constant u64 k_sha512[80] =
{
diff --git a/OpenCL/m01740_a3.cl b/OpenCL/m01740_a3.cl
index 6d3a611c4..c2e7b46a1 100644
--- a/OpenCL/m01740_a3.cl
+++ b/OpenCL/m01740_a3.cl
@@ -14,11 +14,11 @@
#define DGST_R3 7
#include "include/kernel_functions.c"
-#include "types_ocl.c"
-#include "common.c"
+#include "OpenCL/types_ocl.c"
+#include "OpenCL/common.c"
-#define COMPARE_S "check_single_comp4.c"
-#define COMPARE_M "check_multi_comp4.c"
+#define COMPARE_S "OpenCL/check_single_comp4.c"
+#define COMPARE_M "OpenCL/check_multi_comp4.c"
__constant u64 k_sha512[80] =
{
diff --git a/OpenCL/m01750_a0.cl b/OpenCL/m01750_a0.cl
index 9ccb09098..e0f174d3d 100644
--- a/OpenCL/m01750_a0.cl
+++ b/OpenCL/m01750_a0.cl
@@ -14,13 +14,13 @@
#define DGST_R3 7
#include "include/kernel_functions.c"
-#include "types_ocl.c"
-#include "common.c"
+#include "OpenCL/types_ocl.c"
+#include "OpenCL/common.c"
#include "include/rp_gpu.h"
#include "rp.c"
-#define COMPARE_S "check_single_comp4.c"
-#define COMPARE_M "check_multi_comp4.c"
+#define COMPARE_S "OpenCL/check_single_comp4.c"
+#define COMPARE_M "OpenCL/check_multi_comp4.c"
__constant u64 k_sha512[80] =
{
diff --git a/OpenCL/m01750_a1.cl b/OpenCL/m01750_a1.cl
index 6512ddb26..ab5edb316 100644
--- a/OpenCL/m01750_a1.cl
+++ b/OpenCL/m01750_a1.cl
@@ -14,11 +14,11 @@
#define DGST_R3 7
#include "include/kernel_functions.c"
-#include "types_ocl.c"
-#include "common.c"
+#include "OpenCL/types_ocl.c"
+#include "OpenCL/common.c"
-#define COMPARE_S "check_single_comp4.c"
-#define COMPARE_M "check_multi_comp4.c"
+#define COMPARE_S "OpenCL/check_single_comp4.c"
+#define COMPARE_M "OpenCL/check_multi_comp4.c"
__constant u64 k_sha512[80] =
{
diff --git a/OpenCL/m01750_a3.cl b/OpenCL/m01750_a3.cl
index c67483ab4..2c2fd6b52 100644
--- a/OpenCL/m01750_a3.cl
+++ b/OpenCL/m01750_a3.cl
@@ -14,11 +14,11 @@
#define DGST_R3 7
#include "include/kernel_functions.c"
-#include "types_ocl.c"
-#include "common.c"
+#include "OpenCL/types_ocl.c"
+#include "OpenCL/common.c"
-#define COMPARE_S "check_single_comp4.c"
-#define COMPARE_M "check_multi_comp4.c"
+#define COMPARE_S "OpenCL/check_single_comp4.c"
+#define COMPARE_M "OpenCL/check_multi_comp4.c"
__constant u64 k_sha512[80] =
{
diff --git a/OpenCL/m01760_a0.cl b/OpenCL/m01760_a0.cl
index 4da81a559..610d456b4 100644
--- a/OpenCL/m01760_a0.cl
+++ b/OpenCL/m01760_a0.cl
@@ -14,13 +14,13 @@
#define DGST_R3 7
#include "include/kernel_functions.c"
-#include "types_ocl.c"
-#include "common.c"
+#include "OpenCL/types_ocl.c"
+#include "OpenCL/common.c"
#include "include/rp_gpu.h"
#include "rp.c"
-#define COMPARE_S "check_single_comp4.c"
-#define COMPARE_M "check_multi_comp4.c"
+#define COMPARE_S "OpenCL/check_single_comp4.c"
+#define COMPARE_M "OpenCL/check_multi_comp4.c"
__constant u64 k_sha512[80] =
{
diff --git a/OpenCL/m01760_a1.cl b/OpenCL/m01760_a1.cl
index c27e12276..0692cca14 100644
--- a/OpenCL/m01760_a1.cl
+++ b/OpenCL/m01760_a1.cl
@@ -14,11 +14,11 @@
#define DGST_R3 7
#include "include/kernel_functions.c"
-#include "types_ocl.c"
-#include "common.c"
+#include "OpenCL/types_ocl.c"
+#include "OpenCL/common.c"
-#define COMPARE_S "check_single_comp4.c"
-#define COMPARE_M "check_multi_comp4.c"
+#define COMPARE_S "OpenCL/check_single_comp4.c"
+#define COMPARE_M "OpenCL/check_multi_comp4.c"
__constant u64 k_sha512[80] =
{
diff --git a/OpenCL/m01760_a3.cl b/OpenCL/m01760_a3.cl
index a0c4fbdb9..4cff0ff0f 100644
--- a/OpenCL/m01760_a3.cl
+++ b/OpenCL/m01760_a3.cl
@@ -14,11 +14,11 @@
#define DGST_R3 7
#include "include/kernel_functions.c"
-#include "types_ocl.c"
-#include "common.c"
+#include "OpenCL/types_ocl.c"
+#include "OpenCL/common.c"
-#define COMPARE_S "check_single_comp4.c"
-#define COMPARE_M "check_multi_comp4.c"
+#define COMPARE_S "OpenCL/check_single_comp4.c"
+#define COMPARE_M "OpenCL/check_multi_comp4.c"
__constant u64 k_sha512[80] =
{
diff --git a/OpenCL/m01800.cl b/OpenCL/m01800.cl
index 7cc25672d..40edb29f4 100644
--- a/OpenCL/m01800.cl
+++ b/OpenCL/m01800.cl
@@ -14,11 +14,11 @@
#define DGST_R3 3
#include "include/kernel_functions.c"
-#include "types_ocl.c"
-#include "common.c"
+#include "OpenCL/types_ocl.c"
+#include "OpenCL/common.c"
-#define COMPARE_S "check_single_comp4.c"
-#define COMPARE_M "check_multi_comp4.c"
+#define COMPARE_S "OpenCL/check_single_comp4.c"
+#define COMPARE_M "OpenCL/check_multi_comp4.c"
#define PUTCHAR64_BE(a,p,c) ((u8 *)(a))[(p) ^ 7] = (u8) (c)
#define GETCHAR64_BE(a,p) ((u8 *)(a))[(p) ^ 7]
diff --git a/OpenCL/m02100.cl b/OpenCL/m02100.cl
index 4279e858b..13327ae07 100644
--- a/OpenCL/m02100.cl
+++ b/OpenCL/m02100.cl
@@ -14,11 +14,11 @@
#define DGST_R3 3
#include "include/kernel_functions.c"
-#include "types_ocl.c"
-#include "common.c"
+#include "OpenCL/types_ocl.c"
+#include "OpenCL/common.c"
-#define COMPARE_S "check_single_comp4.c"
-#define COMPARE_M "check_multi_comp4.c"
+#define COMPARE_S "OpenCL/check_single_comp4.c"
+#define COMPARE_M "OpenCL/check_multi_comp4.c"
static void md4_transform (const u32 w0[4], const u32 w1[4], const u32 w2[4], const u32 w3[4], u32 digest[4])
{
diff --git a/OpenCL/m02400_a0.cl b/OpenCL/m02400_a0.cl
index 73f555fd4..10b36057d 100644
--- a/OpenCL/m02400_a0.cl
+++ b/OpenCL/m02400_a0.cl
@@ -14,13 +14,13 @@
#define DGST_R3 1
#include "include/kernel_functions.c"
-#include "types_ocl.c"
-#include "common.c"
+#include "OpenCL/types_ocl.c"
+#include "OpenCL/common.c"
#include "include/rp_gpu.h"
#include "rp.c"
-#define COMPARE_S "check_single_comp4.c"
-#define COMPARE_M "check_multi_comp4.c"
+#define COMPARE_S "OpenCL/check_single_comp4.c"
+#define COMPARE_M "OpenCL/check_multi_comp4.c"
__kernel void __attribute__((reqd_work_group_size (64, 1, 1))) m02400_m04 (__global pw_t *pws, __global gpu_rule_t * rules_buf, __global comb_t *combs_buf, __global bf_t *bfs_buf, __global void *tmps, __global void *hooks, __global u32 *bitmaps_buf_s1_a, __global u32 *bitmaps_buf_s1_b, __global u32 *bitmaps_buf_s1_c, __global u32 *bitmaps_buf_s1_d, __global u32 *bitmaps_buf_s2_a, __global u32 *bitmaps_buf_s2_b, __global u32 *bitmaps_buf_s2_c, __global u32 *bitmaps_buf_s2_d, __global plain_t *plains_buf, __global digest_t *digests_buf, __global u32 *hashes_shown, __global salt_t *salt_bufs, __global void *esalt_bufs, __global u32 *d_return_buf, __global u32 *d_scryptV_buf, const u32 bitmap_mask, const u32 bitmap_shift1, const u32 bitmap_shift2, const u32 salt_pos, const u32 loop_pos, const u32 loop_cnt, const u32 rules_cnt, const u32 digests_cnt, const u32 digests_offset, const u32 combs_mode, const u32 gid_max)
{
diff --git a/OpenCL/m02400_a1.cl b/OpenCL/m02400_a1.cl
index bba27b011..c02c84ce9 100644
--- a/OpenCL/m02400_a1.cl
+++ b/OpenCL/m02400_a1.cl
@@ -14,11 +14,11 @@
#define DGST_R3 1
#include "include/kernel_functions.c"
-#include "types_ocl.c"
-#include "common.c"
+#include "OpenCL/types_ocl.c"
+#include "OpenCL/common.c"
-#define COMPARE_S "check_single_comp4.c"
-#define COMPARE_M "check_multi_comp4.c"
+#define COMPARE_S "OpenCL/check_single_comp4.c"
+#define COMPARE_M "OpenCL/check_multi_comp4.c"
__kernel void __attribute__((reqd_work_group_size (64, 1, 1))) m02400_m04 (__global pw_t *pws, __global gpu_rule_t *rules_buf, __global comb_t *combs_buf, __global bf_t *bfs_buf, __global void *tmps, __global void *hooks, __global u32 *bitmaps_buf_s1_a, __global u32 *bitmaps_buf_s1_b, __global u32 *bitmaps_buf_s1_c, __global u32 *bitmaps_buf_s1_d, __global u32 *bitmaps_buf_s2_a, __global u32 *bitmaps_buf_s2_b, __global u32 *bitmaps_buf_s2_c, __global u32 *bitmaps_buf_s2_d, __global plain_t *plains_buf, __global digest_t *digests_buf, __global u32 *hashes_shown, __global salt_t *salt_bufs, __global void *esalt_bufs, __global u32 *d_return_buf, __global u32 *d_scryptV_buf, const u32 bitmap_mask, const u32 bitmap_shift1, const u32 bitmap_shift2, const u32 salt_pos, const u32 loop_pos, const u32 loop_cnt, const u32 combs_cnt, const u32 digests_cnt, const u32 digests_offset, const u32 combs_mode, const u32 gid_max)
{
diff --git a/OpenCL/m02400_a3.cl b/OpenCL/m02400_a3.cl
index 3f978b6b9..ef66c20f0 100644
--- a/OpenCL/m02400_a3.cl
+++ b/OpenCL/m02400_a3.cl
@@ -14,11 +14,11 @@
#define DGST_R3 1
#include "include/kernel_functions.c"
-#include "types_ocl.c"
-#include "common.c"
+#include "OpenCL/types_ocl.c"
+#include "OpenCL/common.c"
-#define COMPARE_S "check_single_comp4.c"
-#define COMPARE_M "check_multi_comp4.c"
+#define COMPARE_S "OpenCL/check_single_comp4.c"
+#define COMPARE_M "OpenCL/check_multi_comp4.c"
static void m02400m (u32 w[16], const u32 pw_len, __global pw_t *pws, __global gpu_rule_t *rules_buf, __global comb_t *combs_buf, __constant u32 * words_buf_r, __global void *tmps, __global void *hooks, __global u32 *bitmaps_buf_s1_a, __global u32 *bitmaps_buf_s1_b, __global u32 *bitmaps_buf_s1_c, __global u32 *bitmaps_buf_s1_d, __global u32 *bitmaps_buf_s2_a, __global u32 *bitmaps_buf_s2_b, __global u32 *bitmaps_buf_s2_c, __global u32 *bitmaps_buf_s2_d, __global plain_t *plains_buf, __global digest_t *digests_buf, __global u32 *hashes_shown, __global salt_t *salt_bufs, __global void *esalt_bufs, __global u32 *d_return_buf, __global u32 *d_scryptV_buf, const u32 bitmap_mask, const u32 bitmap_shift1, const u32 bitmap_shift2, const u32 salt_pos, const u32 loop_pos, const u32 loop_cnt, const u32 bfs_cnt, const u32 digests_cnt, const u32 digests_offset)
{
diff --git a/OpenCL/m02410_a0.cl b/OpenCL/m02410_a0.cl
index 835da39c6..bbc9db5db 100644
--- a/OpenCL/m02410_a0.cl
+++ b/OpenCL/m02410_a0.cl
@@ -14,13 +14,13 @@
#define DGST_R3 1
#include "include/kernel_functions.c"
-#include "types_ocl.c"
-#include "common.c"
+#include "OpenCL/types_ocl.c"
+#include "OpenCL/common.c"
#include "include/rp_gpu.h"
#include "rp.c"
-#define COMPARE_S "check_single_comp4.c"
-#define COMPARE_M "check_multi_comp4.c"
+#define COMPARE_S "OpenCL/check_single_comp4.c"
+#define COMPARE_M "OpenCL/check_multi_comp4.c"
__kernel void __attribute__((reqd_work_group_size (64, 1, 1))) m02410_m04 (__global pw_t *pws, __global gpu_rule_t * rules_buf, __global comb_t *combs_buf, __global bf_t *bfs_buf, __global void *tmps, __global void *hooks, __global u32 *bitmaps_buf_s1_a, __global u32 *bitmaps_buf_s1_b, __global u32 *bitmaps_buf_s1_c, __global u32 *bitmaps_buf_s1_d, __global u32 *bitmaps_buf_s2_a, __global u32 *bitmaps_buf_s2_b, __global u32 *bitmaps_buf_s2_c, __global u32 *bitmaps_buf_s2_d, __global plain_t *plains_buf, __global digest_t *digests_buf, __global u32 *hashes_shown, __global salt_t *salt_bufs, __global void *esalt_bufs, __global u32 *d_return_buf, __global u32 *d_scryptV_buf, const u32 bitmap_mask, const u32 bitmap_shift1, const u32 bitmap_shift2, const u32 salt_pos, const u32 loop_pos, const u32 loop_cnt, const u32 rules_cnt, const u32 digests_cnt, const u32 digests_offset, const u32 combs_mode, const u32 gid_max)
{
diff --git a/OpenCL/m02410_a1.cl b/OpenCL/m02410_a1.cl
index 8ab93078d..cabbbfeb3 100644
--- a/OpenCL/m02410_a1.cl
+++ b/OpenCL/m02410_a1.cl
@@ -14,11 +14,11 @@
#define DGST_R3 1
#include "include/kernel_functions.c"
-#include "types_ocl.c"
-#include "common.c"
+#include "OpenCL/types_ocl.c"
+#include "OpenCL/common.c"
-#define COMPARE_S "check_single_comp4.c"
-#define COMPARE_M "check_multi_comp4.c"
+#define COMPARE_S "OpenCL/check_single_comp4.c"
+#define COMPARE_M "OpenCL/check_multi_comp4.c"
__kernel void __attribute__((reqd_work_group_size (64, 1, 1))) m02410_m04 (__global pw_t *pws, __global gpu_rule_t *rules_buf, __global comb_t *combs_buf, __global bf_t *bfs_buf, __global void *tmps, __global void *hooks, __global u32 *bitmaps_buf_s1_a, __global u32 *bitmaps_buf_s1_b, __global u32 *bitmaps_buf_s1_c, __global u32 *bitmaps_buf_s1_d, __global u32 *bitmaps_buf_s2_a, __global u32 *bitmaps_buf_s2_b, __global u32 *bitmaps_buf_s2_c, __global u32 *bitmaps_buf_s2_d, __global plain_t *plains_buf, __global digest_t *digests_buf, __global u32 *hashes_shown, __global salt_t *salt_bufs, __global void *esalt_bufs, __global u32 *d_return_buf, __global u32 *d_scryptV_buf, const u32 bitmap_mask, const u32 bitmap_shift1, const u32 bitmap_shift2, const u32 salt_pos, const u32 loop_pos, const u32 loop_cnt, const u32 combs_cnt, const u32 digests_cnt, const u32 digests_offset, const u32 combs_mode, const u32 gid_max)
{
diff --git a/OpenCL/m02410_a3.cl b/OpenCL/m02410_a3.cl
index bf3eeb99c..394270a8e 100644
--- a/OpenCL/m02410_a3.cl
+++ b/OpenCL/m02410_a3.cl
@@ -14,11 +14,11 @@
#define DGST_R3 1
#include "include/kernel_functions.c"
-#include "types_ocl.c"
-#include "common.c"
+#include "OpenCL/types_ocl.c"
+#include "OpenCL/common.c"
-#define COMPARE_S "check_single_comp4.c"
-#define COMPARE_M "check_multi_comp4.c"
+#define COMPARE_S "OpenCL/check_single_comp4.c"
+#define COMPARE_M "OpenCL/check_multi_comp4.c"
static void m02410m (u32 w[16], const u32 pw_len, __global pw_t *pws, __global gpu_rule_t *rules_buf, __global comb_t *combs_buf, __constant u32 * words_buf_r, __global void *tmps, __global void *hooks, __global u32 *bitmaps_buf_s1_a, __global u32 *bitmaps_buf_s1_b, __global u32 *bitmaps_buf_s1_c, __global u32 *bitmaps_buf_s1_d, __global u32 *bitmaps_buf_s2_a, __global u32 *bitmaps_buf_s2_b, __global u32 *bitmaps_buf_s2_c, __global u32 *bitmaps_buf_s2_d, __global plain_t *plains_buf, __global digest_t *digests_buf, __global u32 *hashes_shown, __global salt_t *salt_bufs, __global void *esalt_bufs, __global u32 *d_return_buf, __global u32 *d_scryptV_buf, const u32 bitmap_mask, const u32 bitmap_shift1, const u32 bitmap_shift2, const u32 salt_pos, const u32 loop_pos, const u32 loop_cnt, const u32 bfs_cnt, const u32 digests_cnt, const u32 digests_offset)
{
diff --git a/OpenCL/m02500.cl b/OpenCL/m02500.cl
index 473888259..49857212c 100644
--- a/OpenCL/m02500.cl
+++ b/OpenCL/m02500.cl
@@ -14,11 +14,11 @@
#define DGST_R3 3
#include "include/kernel_functions.c"
-#include "types_ocl.c"
-#include "common.c"
+#include "OpenCL/types_ocl.c"
+#include "OpenCL/common.c"
-#define COMPARE_S "check_single_comp4.c"
-#define COMPARE_M "check_multi_comp4.c"
+#define COMPARE_S "OpenCL/check_single_comp4.c"
+#define COMPARE_M "OpenCL/check_multi_comp4.c"
static void md5_transform (const u32 w0[4], const u32 w1[4], const u32 w2[4], const u32 w3[4], u32 digest[4])
{
diff --git a/OpenCL/m02610_a0.cl b/OpenCL/m02610_a0.cl
index 216add436..fcdc6cf24 100644
--- a/OpenCL/m02610_a0.cl
+++ b/OpenCL/m02610_a0.cl
@@ -14,13 +14,13 @@
#define DGST_R3 1
#include "include/kernel_functions.c"
-#include "types_ocl.c"
-#include "common.c"
+#include "OpenCL/types_ocl.c"
+#include "OpenCL/common.c"
#include "include/rp_gpu.h"
#include "rp.c"
-#define COMPARE_S "check_single_comp4.c"
-#define COMPARE_M "check_multi_comp4.c"
+#define COMPARE_S "OpenCL/check_single_comp4.c"
+#define COMPARE_M "OpenCL/check_multi_comp4.c"
#define uint_to_hex_lower8(i) l_bin2asc[(i)]
diff --git a/OpenCL/m02610_a1.cl b/OpenCL/m02610_a1.cl
index 2beab4b41..603543b15 100644
--- a/OpenCL/m02610_a1.cl
+++ b/OpenCL/m02610_a1.cl
@@ -14,11 +14,11 @@
#define DGST_R3 1
#include "include/kernel_functions.c"
-#include "types_ocl.c"
-#include "common.c"
+#include "OpenCL/types_ocl.c"
+#include "OpenCL/common.c"
-#define COMPARE_S "check_single_comp4.c"
-#define COMPARE_M "check_multi_comp4.c"
+#define COMPARE_S "OpenCL/check_single_comp4.c"
+#define COMPARE_M "OpenCL/check_multi_comp4.c"
#define uint_to_hex_lower8(i) l_bin2asc[(i)]
diff --git a/OpenCL/m02610_a3.cl b/OpenCL/m02610_a3.cl
index 2cbe9add8..870b8c129 100644
--- a/OpenCL/m02610_a3.cl
+++ b/OpenCL/m02610_a3.cl
@@ -14,11 +14,11 @@
#define DGST_R3 1
#include "include/kernel_functions.c"
-#include "types_ocl.c"
-#include "common.c"
+#include "OpenCL/types_ocl.c"
+#include "OpenCL/common.c"
-#define COMPARE_S "check_single_comp4.c"
-#define COMPARE_M "check_multi_comp4.c"
+#define COMPARE_S "OpenCL/check_single_comp4.c"
+#define COMPARE_M "OpenCL/check_multi_comp4.c"
#define uint_to_hex_lower8(i) l_bin2asc[(i)]
diff --git a/OpenCL/m02710_a0.cl b/OpenCL/m02710_a0.cl
index 37f799946..d02a2f2f2 100644
--- a/OpenCL/m02710_a0.cl
+++ b/OpenCL/m02710_a0.cl
@@ -14,13 +14,13 @@
#define DGST_R3 1
#include "include/kernel_functions.c"
-#include "types_ocl.c"
-#include "common.c"
+#include "OpenCL/types_ocl.c"
+#include "OpenCL/common.c"
#include "include/rp_gpu.h"
#include "rp.c"
-#define COMPARE_S "check_single_comp4.c"
-#define COMPARE_M "check_multi_comp4.c"
+#define COMPARE_S "OpenCL/check_single_comp4.c"
+#define COMPARE_M "OpenCL/check_multi_comp4.c"
#define uint_to_hex_lower8(i) l_bin2asc[(i)]
diff --git a/OpenCL/m02710_a1.cl b/OpenCL/m02710_a1.cl
index c98a0b68d..b7c29550b 100644
--- a/OpenCL/m02710_a1.cl
+++ b/OpenCL/m02710_a1.cl
@@ -14,11 +14,11 @@
#define DGST_R3 1
#include "include/kernel_functions.c"
-#include "types_ocl.c"
-#include "common.c"
+#include "OpenCL/types_ocl.c"
+#include "OpenCL/common.c"
-#define COMPARE_S "check_single_comp4.c"
-#define COMPARE_M "check_multi_comp4.c"
+#define COMPARE_S "OpenCL/check_single_comp4.c"
+#define COMPARE_M "OpenCL/check_multi_comp4.c"
#define uint_to_hex_lower8(i) l_bin2asc[(i)]
diff --git a/OpenCL/m02710_a3.cl b/OpenCL/m02710_a3.cl
index ba2e9571c..bb1a308e7 100644
--- a/OpenCL/m02710_a3.cl
+++ b/OpenCL/m02710_a3.cl
@@ -14,11 +14,11 @@
#define DGST_R3 1
#include "include/kernel_functions.c"
-#include "types_ocl.c"
-#include "common.c"
+#include "OpenCL/types_ocl.c"
+#include "OpenCL/common.c"
-#define COMPARE_S "check_single_comp4.c"
-#define COMPARE_M "check_multi_comp4.c"
+#define COMPARE_S "OpenCL/check_single_comp4.c"
+#define COMPARE_M "OpenCL/check_multi_comp4.c"
#define uint_to_hex_lower8(i) l_bin2asc[(i)]
diff --git a/OpenCL/m02810_a0.cl b/OpenCL/m02810_a0.cl
index 1f8f5d1c4..cc030f681 100644
--- a/OpenCL/m02810_a0.cl
+++ b/OpenCL/m02810_a0.cl
@@ -14,13 +14,13 @@
#define DGST_R3 1
#include "include/kernel_functions.c"
-#include "types_ocl.c"
-#include "common.c"
+#include "OpenCL/types_ocl.c"
+#include "OpenCL/common.c"
#include "include/rp_gpu.h"
#include "rp.c"
-#define COMPARE_S "check_single_comp4.c"
-#define COMPARE_M "check_multi_comp4.c"
+#define COMPARE_S "OpenCL/check_single_comp4.c"
+#define COMPARE_M "OpenCL/check_multi_comp4.c"
#define uint_to_hex_lower8(i) l_bin2asc[(i)]
diff --git a/OpenCL/m02810_a1.cl b/OpenCL/m02810_a1.cl
index f9f13173f..e262e1296 100644
--- a/OpenCL/m02810_a1.cl
+++ b/OpenCL/m02810_a1.cl
@@ -14,11 +14,11 @@
#define DGST_R3 1
#include "include/kernel_functions.c"
-#include "types_ocl.c"
-#include "common.c"
+#include "OpenCL/types_ocl.c"
+#include "OpenCL/common.c"
-#define COMPARE_S "check_single_comp4.c"
-#define COMPARE_M "check_multi_comp4.c"
+#define COMPARE_S "OpenCL/check_single_comp4.c"
+#define COMPARE_M "OpenCL/check_multi_comp4.c"
#define uint_to_hex_lower8(i) l_bin2asc[(i)]
diff --git a/OpenCL/m02810_a3.cl b/OpenCL/m02810_a3.cl
index 2792a2b3d..156503f22 100644
--- a/OpenCL/m02810_a3.cl
+++ b/OpenCL/m02810_a3.cl
@@ -14,11 +14,11 @@
#define DGST_R3 1
#include "include/kernel_functions.c"
-#include "types_ocl.c"
-#include "common.c"
+#include "OpenCL/types_ocl.c"
+#include "OpenCL/common.c"
-#define COMPARE_S "check_single_comp4.c"
-#define COMPARE_M "check_multi_comp4.c"
+#define COMPARE_S "OpenCL/check_single_comp4.c"
+#define COMPARE_M "OpenCL/check_multi_comp4.c"
#define uint_to_hex_lower8(i) l_bin2asc[(i)]
diff --git a/OpenCL/m03000_a0.cl b/OpenCL/m03000_a0.cl
index 6abe71fa6..693635b79 100644
--- a/OpenCL/m03000_a0.cl
+++ b/OpenCL/m03000_a0.cl
@@ -14,13 +14,13 @@
#define DGST_R3 3
#include "include/kernel_functions.c"
-#include "types_ocl.c"
-#include "common.c"
+#include "OpenCL/types_ocl.c"
+#include "OpenCL/common.c"
#include "include/rp_gpu.h"
#include "rp.c"
-#define COMPARE_S "check_single_comp4.c"
-#define COMPARE_M "check_multi_comp4.c"
+#define COMPARE_S "OpenCL/check_single_comp4.c"
+#define COMPARE_M "OpenCL/check_multi_comp4.c"
#define PERM_OP(a,b,tt,n,m) \
{ \
diff --git a/OpenCL/m03000_a1.cl b/OpenCL/m03000_a1.cl
index a27347da4..20be419b8 100644
--- a/OpenCL/m03000_a1.cl
+++ b/OpenCL/m03000_a1.cl
@@ -14,11 +14,11 @@
#define DGST_R3 3
#include "include/kernel_functions.c"
-#include "types_ocl.c"
-#include "common.c"
+#include "OpenCL/types_ocl.c"
+#include "OpenCL/common.c"
-#define COMPARE_S "check_single_comp4.c"
-#define COMPARE_M "check_multi_comp4.c"
+#define COMPARE_S "OpenCL/check_single_comp4.c"
+#define COMPARE_M "OpenCL/check_multi_comp4.c"
#define PERM_OP(a,b,tt,n,m) \
{ \
diff --git a/OpenCL/m03000_a3.cl b/OpenCL/m03000_a3.cl
index 4c0a1d4d1..c9f84822b 100644
--- a/OpenCL/m03000_a3.cl
+++ b/OpenCL/m03000_a3.cl
@@ -15,11 +15,11 @@
#define DGST_R3 3
#include "include/kernel_functions.c"
-#include "types_ocl.c"
-#include "common.c"
+#include "OpenCL/types_ocl.c"
+#include "OpenCL/common.c"
-#define COMPARE_S "check_single_comp4_bs.c"
-#define COMPARE_M "check_multi_comp4_bs.c"
+#define COMPARE_S "OpenCL/check_single_comp4_bs.c"
+#define COMPARE_M "OpenCL/check_multi_comp4_bs.c"
#ifdef IS_NV
#define KXX_DECL
diff --git a/OpenCL/m03100_a0.cl b/OpenCL/m03100_a0.cl
index 9c912bc1c..53346bcf9 100644
--- a/OpenCL/m03100_a0.cl
+++ b/OpenCL/m03100_a0.cl
@@ -14,13 +14,13 @@
#define DGST_R3 3
#include "include/kernel_functions.c"
-#include "types_ocl.c"
-#include "common.c"
+#include "OpenCL/types_ocl.c"
+#include "OpenCL/common.c"
#include "include/rp_gpu.h"
#include "rp.c"
-#define COMPARE_S "check_single_comp4.c"
-#define COMPARE_M "check_multi_comp4.c"
+#define COMPARE_S "OpenCL/check_single_comp4.c"
+#define COMPARE_M "OpenCL/check_multi_comp4.c"
#define PERM_OP(a,b,tt,n,m) \
{ \
diff --git a/OpenCL/m03100_a1.cl b/OpenCL/m03100_a1.cl
index 66dc71f74..07d83f792 100644
--- a/OpenCL/m03100_a1.cl
+++ b/OpenCL/m03100_a1.cl
@@ -14,11 +14,11 @@
#define DGST_R3 3
#include "include/kernel_functions.c"
-#include "types_ocl.c"
-#include "common.c"
+#include "OpenCL/types_ocl.c"
+#include "OpenCL/common.c"
-#define COMPARE_S "check_single_comp4.c"
-#define COMPARE_M "check_multi_comp4.c"
+#define COMPARE_S "OpenCL/check_single_comp4.c"
+#define COMPARE_M "OpenCL/check_multi_comp4.c"
#define PERM_OP(a,b,tt,n,m) \
{ \
diff --git a/OpenCL/m03100_a3.cl b/OpenCL/m03100_a3.cl
index e23e5a0ab..cbda0485d 100644
--- a/OpenCL/m03100_a3.cl
+++ b/OpenCL/m03100_a3.cl
@@ -14,11 +14,11 @@
#define DGST_R3 3
#include "include/kernel_functions.c"
-#include "types_ocl.c"
-#include "common.c"
+#include "OpenCL/types_ocl.c"
+#include "OpenCL/common.c"
-#define COMPARE_S "check_single_comp4.c"
-#define COMPARE_M "check_multi_comp4.c"
+#define COMPARE_S "OpenCL/check_single_comp4.c"
+#define COMPARE_M "OpenCL/check_multi_comp4.c"
#define PERM_OP(a,b,tt,n,m) \
{ \
diff --git a/OpenCL/m03200.cl b/OpenCL/m03200.cl
index 6ad6d7add..8b03d39f8 100644
--- a/OpenCL/m03200.cl
+++ b/OpenCL/m03200.cl
@@ -14,11 +14,11 @@
#define DGST_R3 3
#include "include/kernel_functions.c"
-#include "types_ocl.c"
-#include "common.c"
+#include "OpenCL/types_ocl.c"
+#include "OpenCL/common.c"
-#define COMPARE_S "check_single_comp4.c"
-#define COMPARE_M "check_multi_comp4.c"
+#define COMPARE_S "OpenCL/check_single_comp4.c"
+#define COMPARE_M "OpenCL/check_multi_comp4.c"
// http://www.schneier.com/code/constants.txt
diff --git a/OpenCL/m03710_a0.cl b/OpenCL/m03710_a0.cl
index 132a8fbe7..a32890e92 100644
--- a/OpenCL/m03710_a0.cl
+++ b/OpenCL/m03710_a0.cl
@@ -14,13 +14,13 @@
#define DGST_R3 1
#include "include/kernel_functions.c"
-#include "types_ocl.c"
-#include "common.c"
+#include "OpenCL/types_ocl.c"
+#include "OpenCL/common.c"
#include "include/rp_gpu.h"
#include "rp.c"
-#define COMPARE_S "check_single_comp4.c"
-#define COMPARE_M "check_multi_comp4.c"
+#define COMPARE_S "OpenCL/check_single_comp4.c"
+#define COMPARE_M "OpenCL/check_multi_comp4.c"
#define uint_to_hex_lower8(i) l_bin2asc[(i)]
diff --git a/OpenCL/m03710_a1.cl b/OpenCL/m03710_a1.cl
index 601e3c1ef..ca31cdc21 100644
--- a/OpenCL/m03710_a1.cl
+++ b/OpenCL/m03710_a1.cl
@@ -14,11 +14,11 @@
#define DGST_R3 1
#include "include/kernel_functions.c"
-#include "types_ocl.c"
-#include "common.c"
+#include "OpenCL/types_ocl.c"
+#include "OpenCL/common.c"
-#define COMPARE_S "check_single_comp4.c"
-#define COMPARE_M "check_multi_comp4.c"
+#define COMPARE_S "OpenCL/check_single_comp4.c"
+#define COMPARE_M "OpenCL/check_multi_comp4.c"
#define uint_to_hex_lower8(i) l_bin2asc[(i)]
diff --git a/OpenCL/m03710_a3.cl b/OpenCL/m03710_a3.cl
index 91daea786..3e7f06afc 100644
--- a/OpenCL/m03710_a3.cl
+++ b/OpenCL/m03710_a3.cl
@@ -14,11 +14,11 @@
#define DGST_R3 1
#include "include/kernel_functions.c"
-#include "types_ocl.c"
-#include "common.c"
+#include "OpenCL/types_ocl.c"
+#include "OpenCL/common.c"
-#define COMPARE_S "check_single_comp4.c"
-#define COMPARE_M "check_multi_comp4.c"
+#define COMPARE_S "OpenCL/check_single_comp4.c"
+#define COMPARE_M "OpenCL/check_multi_comp4.c"
#define uint_to_hex_lower8(i) l_bin2asc[(i)]
diff --git a/OpenCL/m03800_a0.cl b/OpenCL/m03800_a0.cl
index c58da6510..f56e06546 100644
--- a/OpenCL/m03800_a0.cl
+++ b/OpenCL/m03800_a0.cl
@@ -14,13 +14,13 @@
#define DGST_R3 1
#include "include/kernel_functions.c"
-#include "types_ocl.c"
-#include "common.c"
+#include "OpenCL/types_ocl.c"
+#include "OpenCL/common.c"
#include "include/rp_gpu.h"
#include "rp.c"
-#define COMPARE_S "check_single_comp4.c"
-#define COMPARE_M "check_multi_comp4.c"
+#define COMPARE_S "OpenCL/check_single_comp4.c"
+#define COMPARE_M "OpenCL/check_multi_comp4.c"
__kernel void __attribute__((reqd_work_group_size (64, 1, 1))) m03800_m04 (__global pw_t *pws, __global gpu_rule_t *rules_buf, __global comb_t *combs_buf, __global bf_t *bfs_buf, __global void *tmps, __global void *hooks, __global u32 *bitmaps_buf_s1_a, __global u32 *bitmaps_buf_s1_b, __global u32 *bitmaps_buf_s1_c, __global u32 *bitmaps_buf_s1_d, __global u32 *bitmaps_buf_s2_a, __global u32 *bitmaps_buf_s2_b, __global u32 *bitmaps_buf_s2_c, __global u32 *bitmaps_buf_s2_d, __global plain_t *plains_buf, __global digest_t *digests_buf, __global u32 *hashes_shown, __global salt_t *salt_bufs, __global void *esalt_bufs, __global u32 *d_return_buf, __global u32 *d_scryptV_buf, const u32 bitmap_mask, const u32 bitmap_shift1, const u32 bitmap_shift2, const u32 salt_pos, const u32 loop_pos, const u32 loop_cnt, const u32 rules_cnt, const u32 digests_cnt, const u32 digests_offset, const u32 combs_mode, const u32 gid_max)
{
diff --git a/OpenCL/m03800_a1.cl b/OpenCL/m03800_a1.cl
index 7b829abf3..50f4dece9 100644
--- a/OpenCL/m03800_a1.cl
+++ b/OpenCL/m03800_a1.cl
@@ -14,11 +14,11 @@
#define DGST_R3 1
#include "include/kernel_functions.c"
-#include "types_ocl.c"
-#include "common.c"
+#include "OpenCL/types_ocl.c"
+#include "OpenCL/common.c"
-#define COMPARE_S "check_single_comp4.c"
-#define COMPARE_M "check_multi_comp4.c"
+#define COMPARE_S "OpenCL/check_single_comp4.c"
+#define COMPARE_M "OpenCL/check_multi_comp4.c"
__kernel void __attribute__((reqd_work_group_size (64, 1, 1))) m03800_m04 (__global pw_t *pws, __global gpu_rule_t *rules_buf, __global comb_t *combs_buf, __global bf_t *bfs_buf, __global void *tmps, __global void *hooks, __global u32 *bitmaps_buf_s1_a, __global u32 *bitmaps_buf_s1_b, __global u32 *bitmaps_buf_s1_c, __global u32 *bitmaps_buf_s1_d, __global u32 *bitmaps_buf_s2_a, __global u32 *bitmaps_buf_s2_b, __global u32 *bitmaps_buf_s2_c, __global u32 *bitmaps_buf_s2_d, __global plain_t *plains_buf, __global digest_t *digests_buf, __global u32 *hashes_shown, __global salt_t *salt_bufs, __global void *esalt_bufs, __global u32 *d_return_buf, __global u32 *d_scryptV_buf, const u32 bitmap_mask, const u32 bitmap_shift1, const u32 bitmap_shift2, const u32 salt_pos, const u32 loop_pos, const u32 loop_cnt, const u32 combs_cnt, const u32 digests_cnt, const u32 digests_offset, const u32 combs_mode, const u32 gid_max)
{
diff --git a/OpenCL/m03800_a3.cl b/OpenCL/m03800_a3.cl
index 61490e079..1cb39a84a 100644
--- a/OpenCL/m03800_a3.cl
+++ b/OpenCL/m03800_a3.cl
@@ -14,11 +14,11 @@
#define DGST_R3 1
#include "include/kernel_functions.c"
-#include "types_ocl.c"
-#include "common.c"
+#include "OpenCL/types_ocl.c"
+#include "OpenCL/common.c"
-#define COMPARE_S "check_single_comp4.c"
-#define COMPARE_M "check_multi_comp4.c"
+#define COMPARE_S "OpenCL/check_single_comp4.c"
+#define COMPARE_M "OpenCL/check_multi_comp4.c"
static void m03800m (u32 w0[4], u32 w1[4], u32 w2[4], u32 w3[4], const u32 pw_len, __global pw_t *pws, __global gpu_rule_t *rules_buf, __global comb_t *combs_buf, __global bf_t *bfs_buf, __global void *tmps, __global void *hooks, __global u32 *bitmaps_buf_s1_a, __global u32 *bitmaps_buf_s1_b, __global u32 *bitmaps_buf_s1_c, __global u32 *bitmaps_buf_s1_d, __global u32 *bitmaps_buf_s2_a, __global u32 *bitmaps_buf_s2_b, __global u32 *bitmaps_buf_s2_c, __global u32 *bitmaps_buf_s2_d, __global plain_t *plains_buf, __global digest_t *digests_buf, __global u32 *hashes_shown, __global salt_t *salt_bufs, __global void *esalt_bufs, __global u32 *d_return_buf, __global u32 *d_scryptV_buf, const u32 bitmap_mask, const u32 bitmap_shift1, const u32 bitmap_shift2, const u32 salt_pos, const u32 loop_pos, const u32 loop_cnt, const u32 bfs_cnt, const u32 digests_cnt, const u32 digests_offset)
{
diff --git a/OpenCL/m04310_a0.cl b/OpenCL/m04310_a0.cl
index 9009507ca..f08394425 100644
--- a/OpenCL/m04310_a0.cl
+++ b/OpenCL/m04310_a0.cl
@@ -14,13 +14,13 @@
#define DGST_R3 1
#include "include/kernel_functions.c"
-#include "types_ocl.c"
-#include "common.c"
+#include "OpenCL/types_ocl.c"
+#include "OpenCL/common.c"
#include "include/rp_gpu.h"
#include "rp.c"
-#define COMPARE_S "check_single_comp4.c"
-#define COMPARE_M "check_multi_comp4.c"
+#define COMPARE_S "OpenCL/check_single_comp4.c"
+#define COMPARE_M "OpenCL/check_multi_comp4.c"
#define uint_to_hex_lower8(i) l_bin2asc[(i)]
diff --git a/OpenCL/m04310_a1.cl b/OpenCL/m04310_a1.cl
index b11b391e2..4fe7bfadd 100644
--- a/OpenCL/m04310_a1.cl
+++ b/OpenCL/m04310_a1.cl
@@ -14,11 +14,11 @@
#define DGST_R3 1
#include "include/kernel_functions.c"
-#include "types_ocl.c"
-#include "common.c"
+#include "OpenCL/types_ocl.c"
+#include "OpenCL/common.c"
-#define COMPARE_S "check_single_comp4.c"
-#define COMPARE_M "check_multi_comp4.c"
+#define COMPARE_S "OpenCL/check_single_comp4.c"
+#define COMPARE_M "OpenCL/check_multi_comp4.c"
#define uint_to_hex_lower8(i) l_bin2asc[(i)]
diff --git a/OpenCL/m04310_a3.cl b/OpenCL/m04310_a3.cl
index 70e0dd580..5c52eaaa1 100644
--- a/OpenCL/m04310_a3.cl
+++ b/OpenCL/m04310_a3.cl
@@ -14,11 +14,11 @@
#define DGST_R3 1
#include "include/kernel_functions.c"
-#include "types_ocl.c"
-#include "common.c"
+#include "OpenCL/types_ocl.c"
+#include "OpenCL/common.c"
-#define COMPARE_S "check_single_comp4.c"
-#define COMPARE_M "check_multi_comp4.c"
+#define COMPARE_S "OpenCL/check_single_comp4.c"
+#define COMPARE_M "OpenCL/check_multi_comp4.c"
#define uint_to_hex_lower8(i) l_bin2asc[(i)]
diff --git a/OpenCL/m04400_a0.cl b/OpenCL/m04400_a0.cl
index 281bd1183..86c8f25dd 100644
--- a/OpenCL/m04400_a0.cl
+++ b/OpenCL/m04400_a0.cl
@@ -14,13 +14,13 @@
#define DGST_R3 1
#include "include/kernel_functions.c"
-#include "types_ocl.c"
-#include "common.c"
+#include "OpenCL/types_ocl.c"
+#include "OpenCL/common.c"
#include "include/rp_gpu.h"
#include "rp.c"
-#define COMPARE_S "check_single_comp4.c"
-#define COMPARE_M "check_multi_comp4.c"
+#define COMPARE_S "OpenCL/check_single_comp4.c"
+#define COMPARE_M "OpenCL/check_multi_comp4.c"
#define uint_to_hex_lower8(i) l_bin2asc[(i)]
diff --git a/OpenCL/m04400_a1.cl b/OpenCL/m04400_a1.cl
index f9305b624..63c4aa959 100644
--- a/OpenCL/m04400_a1.cl
+++ b/OpenCL/m04400_a1.cl
@@ -14,11 +14,11 @@
#define DGST_R3 1
#include "include/kernel_functions.c"
-#include "types_ocl.c"
-#include "common.c"
+#include "OpenCL/types_ocl.c"
+#include "OpenCL/common.c"
-#define COMPARE_S "check_single_comp4.c"
-#define COMPARE_M "check_multi_comp4.c"
+#define COMPARE_S "OpenCL/check_single_comp4.c"
+#define COMPARE_M "OpenCL/check_multi_comp4.c"
#define uint_to_hex_lower8(i) l_bin2asc[(i)]
diff --git a/OpenCL/m04400_a3.cl b/OpenCL/m04400_a3.cl
index 48eb12f09..494240f79 100644
--- a/OpenCL/m04400_a3.cl
+++ b/OpenCL/m04400_a3.cl
@@ -14,11 +14,11 @@
#define DGST_R3 1
#include "include/kernel_functions.c"
-#include "types_ocl.c"
-#include "common.c"
+#include "OpenCL/types_ocl.c"
+#include "OpenCL/common.c"
-#define COMPARE_S "check_single_comp4.c"
-#define COMPARE_M "check_multi_comp4.c"
+#define COMPARE_S "OpenCL/check_single_comp4.c"
+#define COMPARE_M "OpenCL/check_multi_comp4.c"
#define uint_to_hex_lower8(i) l_bin2asc[(i)]
diff --git a/OpenCL/m04500_a0.cl b/OpenCL/m04500_a0.cl
index b561de4bc..dda4ec70f 100644
--- a/OpenCL/m04500_a0.cl
+++ b/OpenCL/m04500_a0.cl
@@ -14,13 +14,13 @@
#define DGST_R3 1
#include "include/kernel_functions.c"
-#include "types_ocl.c"
-#include "common.c"
+#include "OpenCL/types_ocl.c"
+#include "OpenCL/common.c"
#include "include/rp_gpu.h"
#include "rp.c"
-#define COMPARE_S "check_single_comp4.c"
-#define COMPARE_M "check_multi_comp4.c"
+#define COMPARE_S "OpenCL/check_single_comp4.c"
+#define COMPARE_M "OpenCL/check_multi_comp4.c"
#define uint_to_hex_lower8_le(i) l_bin2asc[(i)]
diff --git a/OpenCL/m04500_a1.cl b/OpenCL/m04500_a1.cl
index f15b81994..2b6e6fa74 100644
--- a/OpenCL/m04500_a1.cl
+++ b/OpenCL/m04500_a1.cl
@@ -14,11 +14,11 @@
#define DGST_R3 1
#include "include/kernel_functions.c"
-#include "types_ocl.c"
-#include "common.c"
+#include "OpenCL/types_ocl.c"
+#include "OpenCL/common.c"
-#define COMPARE_S "check_single_comp4.c"
-#define COMPARE_M "check_multi_comp4.c"
+#define COMPARE_S "OpenCL/check_single_comp4.c"
+#define COMPARE_M "OpenCL/check_multi_comp4.c"
#define uint_to_hex_lower8_le(i) l_bin2asc[(i)]
diff --git a/OpenCL/m04500_a3.cl b/OpenCL/m04500_a3.cl
index 679110d1c..20f1efc91 100644
--- a/OpenCL/m04500_a3.cl
+++ b/OpenCL/m04500_a3.cl
@@ -14,11 +14,11 @@
#define DGST_R3 1
#include "include/kernel_functions.c"
-#include "types_ocl.c"
-#include "common.c"
+#include "OpenCL/types_ocl.c"
+#include "OpenCL/common.c"
-#define COMPARE_S "check_single_comp4.c"
-#define COMPARE_M "check_multi_comp4.c"
+#define COMPARE_S "OpenCL/check_single_comp4.c"
+#define COMPARE_M "OpenCL/check_multi_comp4.c"
#define uint_to_hex_lower8_le(i) l_bin2asc[(i)]
diff --git a/OpenCL/m04700_a0.cl b/OpenCL/m04700_a0.cl
index 1323d3189..3197a9d82 100644
--- a/OpenCL/m04700_a0.cl
+++ b/OpenCL/m04700_a0.cl
@@ -15,13 +15,13 @@
#include "include/kernel_functions.c"
#undef _MD5_
-#include "types_ocl.c"
-#include "common.c"
+#include "OpenCL/types_ocl.c"
+#include "OpenCL/common.c"
#include "include/rp_gpu.h"
#include "rp.c"
-#define COMPARE_S "check_single_comp4.c"
-#define COMPARE_M "check_multi_comp4.c"
+#define COMPARE_S "OpenCL/check_single_comp4.c"
+#define COMPARE_M "OpenCL/check_multi_comp4.c"
#define uint_to_hex_lower8_le(i) l_bin2asc[(i)]
diff --git a/OpenCL/m04700_a1.cl b/OpenCL/m04700_a1.cl
index 643f759f2..664a0729b 100644
--- a/OpenCL/m04700_a1.cl
+++ b/OpenCL/m04700_a1.cl
@@ -15,11 +15,11 @@
#include "include/kernel_functions.c"
#undef _MD5_
-#include "types_ocl.c"
-#include "common.c"
+#include "OpenCL/types_ocl.c"
+#include "OpenCL/common.c"
-#define COMPARE_S "check_single_comp4.c"
-#define COMPARE_M "check_multi_comp4.c"
+#define COMPARE_S "OpenCL/check_single_comp4.c"
+#define COMPARE_M "OpenCL/check_multi_comp4.c"
#define uint_to_hex_lower8_le(i) l_bin2asc[(i)]
diff --git a/OpenCL/m04700_a3.cl b/OpenCL/m04700_a3.cl
index 88eab76d2..a88a6379d 100644
--- a/OpenCL/m04700_a3.cl
+++ b/OpenCL/m04700_a3.cl
@@ -15,11 +15,11 @@
#include "include/kernel_functions.c"
#undef _MD5_
-#include "types_ocl.c"
-#include "common.c"
+#include "OpenCL/types_ocl.c"
+#include "OpenCL/common.c"
-#define COMPARE_S "check_single_comp4.c"
-#define COMPARE_M "check_multi_comp4.c"
+#define COMPARE_S "OpenCL/check_single_comp4.c"
+#define COMPARE_M "OpenCL/check_multi_comp4.c"
#define uint_to_hex_lower8_le(i) l_bin2asc[(i)]
diff --git a/OpenCL/m04800_a0.cl b/OpenCL/m04800_a0.cl
index 0e6051175..a8b984f0e 100644
--- a/OpenCL/m04800_a0.cl
+++ b/OpenCL/m04800_a0.cl
@@ -14,13 +14,13 @@
#define DGST_R3 1
#include "include/kernel_functions.c"
-#include "types_ocl.c"
-#include "common.c"
+#include "OpenCL/types_ocl.c"
+#include "OpenCL/common.c"
#include "include/rp_gpu.h"
#include "rp.c"
-#define COMPARE_S "check_single_comp4.c"
-#define COMPARE_M "check_multi_comp4.c"
+#define COMPARE_S "OpenCL/check_single_comp4.c"
+#define COMPARE_M "OpenCL/check_multi_comp4.c"
__kernel void __attribute__((reqd_work_group_size (64, 1, 1))) m04800_m04 (__global pw_t *pws, __global gpu_rule_t *rules_buf, __global comb_t *combs_buf, __global bf_t *bfs_buf, __global void *tmps, __global void *hooks, __global u32 *bitmaps_buf_s1_a, __global u32 *bitmaps_buf_s1_b, __global u32 *bitmaps_buf_s1_c, __global u32 *bitmaps_buf_s1_d, __global u32 *bitmaps_buf_s2_a, __global u32 *bitmaps_buf_s2_b, __global u32 *bitmaps_buf_s2_c, __global u32 *bitmaps_buf_s2_d, __global plain_t *plains_buf, __global digest_t *digests_buf, __global u32 *hashes_shown, __global salt_t *salt_bufs, __global void *esalt_bufs, __global u32 *d_return_buf, __global u32 *d_scryptV_buf, const u32 bitmap_mask, const u32 bitmap_shift1, const u32 bitmap_shift2, const u32 salt_pos, const u32 loop_pos, const u32 loop_cnt, const u32 rules_cnt, const u32 digests_cnt, const u32 digests_offset, const u32 combs_mode, const u32 gid_max)
{
diff --git a/OpenCL/m04800_a1.cl b/OpenCL/m04800_a1.cl
index 5c5b5e296..dd2965591 100644
--- a/OpenCL/m04800_a1.cl
+++ b/OpenCL/m04800_a1.cl
@@ -14,11 +14,11 @@
#define DGST_R3 1
#include "include/kernel_functions.c"
-#include "types_ocl.c"
-#include "common.c"
+#include "OpenCL/types_ocl.c"
+#include "OpenCL/common.c"
-#define COMPARE_S "check_single_comp4.c"
-#define COMPARE_M "check_multi_comp4.c"
+#define COMPARE_S "OpenCL/check_single_comp4.c"
+#define COMPARE_M "OpenCL/check_multi_comp4.c"
__kernel void __attribute__((reqd_work_group_size (64, 1, 1))) m04800_m04 (__global pw_t *pws, __global gpu_rule_t *rules_buf, __global comb_t *combs_buf, __global bf_t *bfs_buf, __global void *tmps, __global void *hooks, __global u32 *bitmaps_buf_s1_a, __global u32 *bitmaps_buf_s1_b, __global u32 *bitmaps_buf_s1_c, __global u32 *bitmaps_buf_s1_d, __global u32 *bitmaps_buf_s2_a, __global u32 *bitmaps_buf_s2_b, __global u32 *bitmaps_buf_s2_c, __global u32 *bitmaps_buf_s2_d, __global plain_t *plains_buf, __global digest_t *digests_buf, __global u32 *hashes_shown, __global salt_t *salt_bufs, __global void *esalt_bufs, __global u32 *d_return_buf, __global u32 *d_scryptV_buf, const u32 bitmap_mask, const u32 bitmap_shift1, const u32 bitmap_shift2, const u32 salt_pos, const u32 loop_pos, const u32 loop_cnt, const u32 combs_cnt, const u32 digests_cnt, const u32 digests_offset, const u32 combs_mode, const u32 gid_max)
{
diff --git a/OpenCL/m04800_a3.cl b/OpenCL/m04800_a3.cl
index 1e6cf743a..501a8a7d7 100644
--- a/OpenCL/m04800_a3.cl
+++ b/OpenCL/m04800_a3.cl
@@ -14,11 +14,11 @@
#define DGST_R3 1
#include "include/kernel_functions.c"
-#include "types_ocl.c"
-#include "common.c"
+#include "OpenCL/types_ocl.c"
+#include "OpenCL/common.c"
-#define COMPARE_S "check_single_comp4.c"
-#define COMPARE_M "check_multi_comp4.c"
+#define COMPARE_S "OpenCL/check_single_comp4.c"
+#define COMPARE_M "OpenCL/check_multi_comp4.c"
static void m04800m (u32 w0[4], u32 w1[4], u32 w2[4], u32 w3[4], const u32 pw_len, __global pw_t *pws, __global gpu_rule_t *rules_buf, __global comb_t *combs_buf, __global bf_t *bfs_buf, __global void *tmps, __global void *hooks, __global u32 *bitmaps_buf_s1_a, __global u32 *bitmaps_buf_s1_b, __global u32 *bitmaps_buf_s1_c, __global u32 *bitmaps_buf_s1_d, __global u32 *bitmaps_buf_s2_a, __global u32 *bitmaps_buf_s2_b, __global u32 *bitmaps_buf_s2_c, __global u32 *bitmaps_buf_s2_d, __global plain_t *plains_buf, __global digest_t *digests_buf, __global u32 *hashes_shown, __global salt_t *salt_bufs, __global void *esalt_bufs, __global u32 *d_return_buf, __global u32 *d_scryptV_buf, const u32 bitmap_mask, const u32 bitmap_shift1, const u32 bitmap_shift2, const u32 salt_pos, const u32 loop_pos, const u32 loop_cnt, const u32 bfs_cnt, const u32 digests_cnt, const u32 digests_offset)
{
diff --git a/OpenCL/m04900_a0.cl b/OpenCL/m04900_a0.cl
index 5cd3d2746..4c83f396f 100644
--- a/OpenCL/m04900_a0.cl
+++ b/OpenCL/m04900_a0.cl
@@ -14,13 +14,13 @@
#define DGST_R3 1
#include "include/kernel_functions.c"
-#include "types_ocl.c"
-#include "common.c"
+#include "OpenCL/types_ocl.c"
+#include "OpenCL/common.c"
#include "include/rp_gpu.h"
#include "rp.c"
-#define COMPARE_S "check_single_comp4.c"
-#define COMPARE_M "check_multi_comp4.c"
+#define COMPARE_S "OpenCL/check_single_comp4.c"
+#define COMPARE_M "OpenCL/check_multi_comp4.c"
__kernel void __attribute__((reqd_work_group_size (64, 1, 1))) m04900_m04 (__global pw_t *pws, __global gpu_rule_t *rules_buf, __global comb_t *combs_buf, __global bf_t *bfs_buf, __global void *tmps, __global void *hooks, __global u32 *bitmaps_buf_s1_a, __global u32 *bitmaps_buf_s1_b, __global u32 *bitmaps_buf_s1_c, __global u32 *bitmaps_buf_s1_d, __global u32 *bitmaps_buf_s2_a, __global u32 *bitmaps_buf_s2_b, __global u32 *bitmaps_buf_s2_c, __global u32 *bitmaps_buf_s2_d, __global plain_t *plains_buf, __global digest_t *digests_buf, __global u32 *hashes_shown, __global salt_t *salt_bufs, __global void *esalt_bufs, __global u32 *d_return_buf, __global u32 *d_scryptV_buf, const u32 bitmap_mask, const u32 bitmap_shift1, const u32 bitmap_shift2, const u32 salt_pos, const u32 loop_pos, const u32 loop_cnt, const u32 rules_cnt, const u32 digests_cnt, const u32 digests_offset, const u32 combs_mode, const u32 gid_max)
{
diff --git a/OpenCL/m04900_a1.cl b/OpenCL/m04900_a1.cl
index 5a9e9cafc..30bce71b8 100644
--- a/OpenCL/m04900_a1.cl
+++ b/OpenCL/m04900_a1.cl
@@ -14,11 +14,11 @@
#define DGST_R3 1
#include "include/kernel_functions.c"
-#include "types_ocl.c"
-#include "common.c"
+#include "OpenCL/types_ocl.c"
+#include "OpenCL/common.c"
-#define COMPARE_S "check_single_comp4.c"
-#define COMPARE_M "check_multi_comp4.c"
+#define COMPARE_S "OpenCL/check_single_comp4.c"
+#define COMPARE_M "OpenCL/check_multi_comp4.c"
__kernel void __attribute__((reqd_work_group_size (64, 1, 1))) m04900_m04 (__global pw_t *pws, __global gpu_rule_t *rules_buf, __global comb_t *combs_buf, __global bf_t *bfs_buf, __global void *tmps, __global void *hooks, __global u32 *bitmaps_buf_s1_a, __global u32 *bitmaps_buf_s1_b, __global u32 *bitmaps_buf_s1_c, __global u32 *bitmaps_buf_s1_d, __global u32 *bitmaps_buf_s2_a, __global u32 *bitmaps_buf_s2_b, __global u32 *bitmaps_buf_s2_c, __global u32 *bitmaps_buf_s2_d, __global plain_t *plains_buf, __global digest_t *digests_buf, __global u32 *hashes_shown, __global salt_t *salt_bufs, __global void *esalt_bufs, __global u32 *d_return_buf, __global u32 *d_scryptV_buf, const u32 bitmap_mask, const u32 bitmap_shift1, const u32 bitmap_shift2, const u32 salt_pos, const u32 loop_pos, const u32 loop_cnt, const u32 combs_cnt, const u32 digests_cnt, const u32 digests_offset, const u32 combs_mode, const u32 gid_max)
{
diff --git a/OpenCL/m04900_a3.cl b/OpenCL/m04900_a3.cl
index e2e8e3055..14ce4271a 100644
--- a/OpenCL/m04900_a3.cl
+++ b/OpenCL/m04900_a3.cl
@@ -14,11 +14,11 @@
#define DGST_R3 1
#include "include/kernel_functions.c"
-#include "types_ocl.c"
-#include "common.c"
+#include "OpenCL/types_ocl.c"
+#include "OpenCL/common.c"
-#define COMPARE_S "check_single_comp4.c"
-#define COMPARE_M "check_multi_comp4.c"
+#define COMPARE_S "OpenCL/check_single_comp4.c"
+#define COMPARE_M "OpenCL/check_multi_comp4.c"
static void m04900m (u32 w0[4], u32 w1[4], u32 w2[4], u32 w3[4], const u32 pw_len, __global pw_t *pws, __global gpu_rule_t *rules_buf, __global comb_t *combs_buf, __global bf_t *bfs_buf, __global void *tmps, __global void *hooks, __global u32 *bitmaps_buf_s1_a, __global u32 *bitmaps_buf_s1_b, __global u32 *bitmaps_buf_s1_c, __global u32 *bitmaps_buf_s1_d, __global u32 *bitmaps_buf_s2_a, __global u32 *bitmaps_buf_s2_b, __global u32 *bitmaps_buf_s2_c, __global u32 *bitmaps_buf_s2_d, __global plain_t *plains_buf, __global digest_t *digests_buf, __global u32 *hashes_shown, __global salt_t *salt_bufs, __global void *esalt_bufs, __global u32 *d_return_buf, __global u32 *d_scryptV_buf, const u32 bitmap_mask, const u32 bitmap_shift1, const u32 bitmap_shift2, const u32 salt_pos, const u32 loop_pos, const u32 loop_cnt, const u32 bfs_cnt, const u32 digests_cnt, const u32 digests_offset)
{
diff --git a/OpenCL/m05000_a0.cl b/OpenCL/m05000_a0.cl
index 0a8c6f70f..83d62b832 100644
--- a/OpenCL/m05000_a0.cl
+++ b/OpenCL/m05000_a0.cl
@@ -14,13 +14,13 @@
#define DGST_R3 5
#include "include/kernel_functions.c"
-#include "types_ocl.c"
-#include "common.c"
+#include "OpenCL/types_ocl.c"
+#include "OpenCL/common.c"
#include "include/rp_gpu.h"
#include "rp.c"
-#define COMPARE_S "check_single_comp4.c"
-#define COMPARE_M "check_multi_comp4.c"
+#define COMPARE_S "OpenCL/check_single_comp4.c"
+#define COMPARE_M "OpenCL/check_multi_comp4.c"
__constant u64 keccakf_rndc[24] =
{
diff --git a/OpenCL/m05000_a1.cl b/OpenCL/m05000_a1.cl
index a9d6d97c8..cf5b0d8e1 100644
--- a/OpenCL/m05000_a1.cl
+++ b/OpenCL/m05000_a1.cl
@@ -14,11 +14,11 @@
#define DGST_R3 5
#include "include/kernel_functions.c"
-#include "types_ocl.c"
-#include "common.c"
+#include "OpenCL/types_ocl.c"
+#include "OpenCL/common.c"
-#define COMPARE_S "check_single_comp4.c"
-#define COMPARE_M "check_multi_comp4.c"
+#define COMPARE_S "OpenCL/check_single_comp4.c"
+#define COMPARE_M "OpenCL/check_multi_comp4.c"
__constant u64 keccakf_rndc[24] =
{
diff --git a/OpenCL/m05000_a3.cl b/OpenCL/m05000_a3.cl
index 0d29349e6..326339533 100644
--- a/OpenCL/m05000_a3.cl
+++ b/OpenCL/m05000_a3.cl
@@ -14,11 +14,11 @@
#define DGST_R3 5
#include "include/kernel_functions.c"
-#include "types_ocl.c"
-#include "common.c"
+#include "OpenCL/types_ocl.c"
+#include "OpenCL/common.c"
-#define COMPARE_S "check_single_comp4.c"
-#define COMPARE_M "check_multi_comp4.c"
+#define COMPARE_S "OpenCL/check_single_comp4.c"
+#define COMPARE_M "OpenCL/check_multi_comp4.c"
__constant u64 keccakf_rndc[24] =
{
diff --git a/OpenCL/m05100_a0.cl b/OpenCL/m05100_a0.cl
index 46838fc3b..d62d4f6a9 100644
--- a/OpenCL/m05100_a0.cl
+++ b/OpenCL/m05100_a0.cl
@@ -14,13 +14,13 @@
#define DGST_R3 3
#include "include/kernel_functions.c"
-#include "types_ocl.c"
-#include "common.c"
+#include "OpenCL/types_ocl.c"
+#include "OpenCL/common.c"
#include "include/rp_gpu.h"
#include "rp.c"
-#define COMPARE_S "check_single_comp4.c"
-#define COMPARE_M "check_multi_comp4.c"
+#define COMPARE_S "OpenCL/check_single_comp4.c"
+#define COMPARE_M "OpenCL/check_multi_comp4.c"
__kernel void __attribute__((reqd_work_group_size (64, 1, 1))) m05100_m04 (__global pw_t *pws, __global gpu_rule_t *rules_buf, __global comb_t *combs_buf, __global bf_t *bfs_buf, __global void *tmps, __global void *hooks, __global u32 *bitmaps_buf_s1_a, __global u32 *bitmaps_buf_s1_b, __global u32 *bitmaps_buf_s1_c, __global u32 *bitmaps_buf_s1_d, __global u32 *bitmaps_buf_s2_a, __global u32 *bitmaps_buf_s2_b, __global u32 *bitmaps_buf_s2_c, __global u32 *bitmaps_buf_s2_d, __global plain_t *plains_buf, __global digest_t *digests_buf, __global u32 *hashes_shown, __global salt_t *salt_bufs, __global void *esalt_bufs, __global u32 *d_return_buf, __global u32 *d_scryptV_buf, const u32 bitmap_mask, const u32 bitmap_shift1, const u32 bitmap_shift2, const u32 salt_pos, const u32 loop_pos, const u32 loop_cnt, const u32 rules_cnt, const u32 digests_cnt, const u32 digests_offset, const u32 combs_mode, const u32 gid_max)
{
diff --git a/OpenCL/m05100_a1.cl b/OpenCL/m05100_a1.cl
index 4155d60c8..d54494fce 100644
--- a/OpenCL/m05100_a1.cl
+++ b/OpenCL/m05100_a1.cl
@@ -14,11 +14,11 @@
#define DGST_R3 3
#include "include/kernel_functions.c"
-#include "types_ocl.c"
-#include "common.c"
+#include "OpenCL/types_ocl.c"
+#include "OpenCL/common.c"
-#define COMPARE_S "check_single_comp4.c"
-#define COMPARE_M "check_multi_comp4.c"
+#define COMPARE_S "OpenCL/check_single_comp4.c"
+#define COMPARE_M "OpenCL/check_multi_comp4.c"
__kernel void __attribute__((reqd_work_group_size (64, 1, 1))) m05100_m04 (__global pw_t *pws, __global gpu_rule_t *rules_buf, __global comb_t *combs_buf, __global bf_t *bfs_buf, __global void *tmps, __global void *hooks, __global u32 *bitmaps_buf_s1_a, __global u32 *bitmaps_buf_s1_b, __global u32 *bitmaps_buf_s1_c, __global u32 *bitmaps_buf_s1_d, __global u32 *bitmaps_buf_s2_a, __global u32 *bitmaps_buf_s2_b, __global u32 *bitmaps_buf_s2_c, __global u32 *bitmaps_buf_s2_d, __global plain_t *plains_buf, __global digest_t *digests_buf, __global u32 *hashes_shown, __global salt_t *salt_bufs, __global void *esalt_bufs, __global u32 *d_return_buf, __global u32 *d_scryptV_buf, const u32 bitmap_mask, const u32 bitmap_shift1, const u32 bitmap_shift2, const u32 salt_pos, const u32 loop_pos, const u32 loop_cnt, const u32 combs_cnt, const u32 digests_cnt, const u32 digests_offset, const u32 combs_mode, const u32 gid_max)
{
diff --git a/OpenCL/m05100_a3.cl b/OpenCL/m05100_a3.cl
index 4a3cd85e2..d18fee44b 100644
--- a/OpenCL/m05100_a3.cl
+++ b/OpenCL/m05100_a3.cl
@@ -14,11 +14,11 @@
#define DGST_R3 3
#include "include/kernel_functions.c"
-#include "types_ocl.c"
-#include "common.c"
+#include "OpenCL/types_ocl.c"
+#include "OpenCL/common.c"
-#define COMPARE_S "check_single_comp4.c"
-#define COMPARE_M "check_multi_comp4.c"
+#define COMPARE_S "OpenCL/check_single_comp4.c"
+#define COMPARE_M "OpenCL/check_multi_comp4.c"
static void m05100m (u32 w0[4], u32 w1[4], u32 w2[4], u32 w3[4], const u32 pw_len, __global pw_t *pws, __global gpu_rule_t *rules_buf, __global comb_t *combs_buf, __global bf_t *bfs_buf, __global void *tmps, __global void *hooks, __global u32 *bitmaps_buf_s1_a, __global u32 *bitmaps_buf_s1_b, __global u32 *bitmaps_buf_s1_c, __global u32 *bitmaps_buf_s1_d, __global u32 *bitmaps_buf_s2_a, __global u32 *bitmaps_buf_s2_b, __global u32 *bitmaps_buf_s2_c, __global u32 *bitmaps_buf_s2_d, __global plain_t *plains_buf, __global digest_t *digests_buf, __global u32 *hashes_shown, __global salt_t *salt_bufs, __global void *esalt_bufs, __global u32 *d_return_buf, __global u32 *d_scryptV_buf, const u32 bitmap_mask, const u32 bitmap_shift1, const u32 bitmap_shift2, const u32 salt_pos, const u32 loop_pos, const u32 loop_cnt, const u32 bfs_cnt, const u32 digests_cnt, const u32 digests_offset)
{
diff --git a/OpenCL/m05200.cl b/OpenCL/m05200.cl
index d96217658..eaf4e3e34 100644
--- a/OpenCL/m05200.cl
+++ b/OpenCL/m05200.cl
@@ -14,11 +14,11 @@
#define DGST_R3 3
#include "include/kernel_functions.c"
-#include "types_ocl.c"
-#include "common.c"
+#include "OpenCL/types_ocl.c"
+#include "OpenCL/common.c"
-#define COMPARE_S "check_single_comp4.c"
-#define COMPARE_M "check_multi_comp4.c"
+#define COMPARE_S "OpenCL/check_single_comp4.c"
+#define COMPARE_M "OpenCL/check_multi_comp4.c"
__constant u32 k_sha256[64] =
{
diff --git a/OpenCL/m05300_a0.cl b/OpenCL/m05300_a0.cl
index 0134ceead..f7a3a0b06 100644
--- a/OpenCL/m05300_a0.cl
+++ b/OpenCL/m05300_a0.cl
@@ -14,13 +14,13 @@
#define DGST_R3 1
#include "include/kernel_functions.c"
-#include "types_ocl.c"
-#include "common.c"
+#include "OpenCL/types_ocl.c"
+#include "OpenCL/common.c"
#include "include/rp_gpu.h"
#include "rp.c"
-#define COMPARE_S "check_single_comp4.c"
-#define COMPARE_M "check_multi_comp4.c"
+#define COMPARE_S "OpenCL/check_single_comp4.c"
+#define COMPARE_M "OpenCL/check_multi_comp4.c"
static void md5_transform (const u32 w0[4], const u32 w1[4], const u32 w2[4], const u32 w3[4], u32 digest[4])
{
diff --git a/OpenCL/m05300_a1.cl b/OpenCL/m05300_a1.cl
index 037f22b36..e85cd1e2d 100644
--- a/OpenCL/m05300_a1.cl
+++ b/OpenCL/m05300_a1.cl
@@ -14,11 +14,11 @@
#define DGST_R3 1
#include "include/kernel_functions.c"
-#include "types_ocl.c"
-#include "common.c"
+#include "OpenCL/types_ocl.c"
+#include "OpenCL/common.c"
-#define COMPARE_S "check_single_comp4.c"
-#define COMPARE_M "check_multi_comp4.c"
+#define COMPARE_S "OpenCL/check_single_comp4.c"
+#define COMPARE_M "OpenCL/check_multi_comp4.c"
static void md5_transform (const u32 w0[4], const u32 w1[4], const u32 w2[4], const u32 w3[4], u32 digest[4])
{
diff --git a/OpenCL/m05300_a3.cl b/OpenCL/m05300_a3.cl
index 5a719e0d7..762dd93d4 100644
--- a/OpenCL/m05300_a3.cl
+++ b/OpenCL/m05300_a3.cl
@@ -14,11 +14,11 @@
#define DGST_R3 1
#include "include/kernel_functions.c"
-#include "types_ocl.c"
-#include "common.c"
+#include "OpenCL/types_ocl.c"
+#include "OpenCL/common.c"
-#define COMPARE_S "check_single_comp4.c"
-#define COMPARE_M "check_multi_comp4.c"
+#define COMPARE_S "OpenCL/check_single_comp4.c"
+#define COMPARE_M "OpenCL/check_multi_comp4.c"
static void md5_transform (const u32 w0[4], const u32 w1[4], const u32 w2[4], const u32 w3[4], u32 digest[4])
{
diff --git a/OpenCL/m05400_a0.cl b/OpenCL/m05400_a0.cl
index ddd890050..5c874c338 100644
--- a/OpenCL/m05400_a0.cl
+++ b/OpenCL/m05400_a0.cl
@@ -14,13 +14,13 @@
#define DGST_R3 1
#include "include/kernel_functions.c"
-#include "types_ocl.c"
-#include "common.c"
+#include "OpenCL/types_ocl.c"
+#include "OpenCL/common.c"
#include "include/rp_gpu.h"
#include "rp.c"
-#define COMPARE_S "check_single_comp4.c"
-#define COMPARE_M "check_multi_comp4.c"
+#define COMPARE_S "OpenCL/check_single_comp4.c"
+#define COMPARE_M "OpenCL/check_multi_comp4.c"
static void sha1_transform (const u32 w0[4], const u32 w1[4], const u32 w2[4], const u32 w3[4], u32 digest[5])
{
diff --git a/OpenCL/m05400_a1.cl b/OpenCL/m05400_a1.cl
index e2ee82c53..806bc273e 100644
--- a/OpenCL/m05400_a1.cl
+++ b/OpenCL/m05400_a1.cl
@@ -14,11 +14,11 @@
#define DGST_R3 1
#include "include/kernel_functions.c"
-#include "types_ocl.c"
-#include "common.c"
+#include "OpenCL/types_ocl.c"
+#include "OpenCL/common.c"
-#define COMPARE_S "check_single_comp4.c"
-#define COMPARE_M "check_multi_comp4.c"
+#define COMPARE_S "OpenCL/check_single_comp4.c"
+#define COMPARE_M "OpenCL/check_multi_comp4.c"
static void sha1_transform (const u32 w0[4], const u32 w1[4], const u32 w2[4], const u32 w3[4], u32 digest[5])
{
diff --git a/OpenCL/m05400_a3.cl b/OpenCL/m05400_a3.cl
index 215d98b14..d1d4a855e 100644
--- a/OpenCL/m05400_a3.cl
+++ b/OpenCL/m05400_a3.cl
@@ -14,11 +14,11 @@
#define DGST_R3 1
#include "include/kernel_functions.c"
-#include "types_ocl.c"
-#include "common.c"
+#include "OpenCL/types_ocl.c"
+#include "OpenCL/common.c"
-#define COMPARE_S "check_single_comp4.c"
-#define COMPARE_M "check_multi_comp4.c"
+#define COMPARE_S "OpenCL/check_single_comp4.c"
+#define COMPARE_M "OpenCL/check_multi_comp4.c"
static void sha1_transform (const u32 w0[4], const u32 w1[4], const u32 w2[4], const u32 w3[4], u32 digest[5])
{
diff --git a/OpenCL/m05500_a0.cl b/OpenCL/m05500_a0.cl
index 456a65637..4314cab9a 100644
--- a/OpenCL/m05500_a0.cl
+++ b/OpenCL/m05500_a0.cl
@@ -14,13 +14,13 @@
#define DGST_R3 3
#include "include/kernel_functions.c"
-#include "types_ocl.c"
-#include "common.c"
+#include "OpenCL/types_ocl.c"
+#include "OpenCL/common.c"
#include "include/rp_gpu.h"
#include "rp.c"
-#define COMPARE_S "check_single_comp4.c"
-#define COMPARE_M "check_multi_comp4.c"
+#define COMPARE_S "OpenCL/check_single_comp4.c"
+#define COMPARE_M "OpenCL/check_multi_comp4.c"
#define PERM_OP(a,b,tt,n,m) \
{ \
diff --git a/OpenCL/m05500_a1.cl b/OpenCL/m05500_a1.cl
index 59f527712..84973597e 100644
--- a/OpenCL/m05500_a1.cl
+++ b/OpenCL/m05500_a1.cl
@@ -14,11 +14,11 @@
#define DGST_R3 3
#include "include/kernel_functions.c"
-#include "types_ocl.c"
-#include "common.c"
+#include "OpenCL/types_ocl.c"
+#include "OpenCL/common.c"
-#define COMPARE_S "check_single_comp4.c"
-#define COMPARE_M "check_multi_comp4.c"
+#define COMPARE_S "OpenCL/check_single_comp4.c"
+#define COMPARE_M "OpenCL/check_multi_comp4.c"
#define PERM_OP(a,b,tt,n,m) \
{ \
diff --git a/OpenCL/m05500_a3.cl b/OpenCL/m05500_a3.cl
index 49a2ce774..5d1291f89 100644
--- a/OpenCL/m05500_a3.cl
+++ b/OpenCL/m05500_a3.cl
@@ -14,11 +14,11 @@
#define DGST_R3 3
#include "include/kernel_functions.c"
-#include "types_ocl.c"
-#include "common.c"
+#include "OpenCL/types_ocl.c"
+#include "OpenCL/common.c"
-#define COMPARE_S "check_single_comp4.c"
-#define COMPARE_M "check_multi_comp4.c"
+#define COMPARE_S "OpenCL/check_single_comp4.c"
+#define COMPARE_M "OpenCL/check_multi_comp4.c"
#define PERM_OP(a,b,tt,n,m) \
{ \
diff --git a/OpenCL/m05600_a0.cl b/OpenCL/m05600_a0.cl
index c6447de59..b107cefc5 100644
--- a/OpenCL/m05600_a0.cl
+++ b/OpenCL/m05600_a0.cl
@@ -14,13 +14,13 @@
#define DGST_R3 1
#include "include/kernel_functions.c"
-#include "types_ocl.c"
-#include "common.c"
+#include "OpenCL/types_ocl.c"
+#include "OpenCL/common.c"
#include "include/rp_gpu.h"
#include "rp.c"
-#define COMPARE_S "check_single_comp4.c"
-#define COMPARE_M "check_multi_comp4.c"
+#define COMPARE_S "OpenCL/check_single_comp4.c"
+#define COMPARE_M "OpenCL/check_multi_comp4.c"
static void md4_transform (const u32 w0[4], const u32 w1[4], const u32 w2[4], const u32 w3[4], u32 digest[4])
{
diff --git a/OpenCL/m05600_a1.cl b/OpenCL/m05600_a1.cl
index 92382ade3..ace39a720 100644
--- a/OpenCL/m05600_a1.cl
+++ b/OpenCL/m05600_a1.cl
@@ -14,11 +14,11 @@
#define DGST_R3 1
#include "include/kernel_functions.c"
-#include "types_ocl.c"
-#include "common.c"
+#include "OpenCL/types_ocl.c"
+#include "OpenCL/common.c"
-#define COMPARE_S "check_single_comp4.c"
-#define COMPARE_M "check_multi_comp4.c"
+#define COMPARE_S "OpenCL/check_single_comp4.c"
+#define COMPARE_M "OpenCL/check_multi_comp4.c"
static void md4_transform (const u32 w0[4], const u32 w1[4], const u32 w2[4], const u32 w3[4], u32 digest[4])
{
diff --git a/OpenCL/m05600_a3.cl b/OpenCL/m05600_a3.cl
index c0c9b72aa..0d4be3bb8 100644
--- a/OpenCL/m05600_a3.cl
+++ b/OpenCL/m05600_a3.cl
@@ -14,11 +14,11 @@
#define DGST_R3 1
#include "include/kernel_functions.c"
-#include "types_ocl.c"
-#include "common.c"
+#include "OpenCL/types_ocl.c"
+#include "OpenCL/common.c"
-#define COMPARE_S "check_single_comp4.c"
-#define COMPARE_M "check_multi_comp4.c"
+#define COMPARE_S "OpenCL/check_single_comp4.c"
+#define COMPARE_M "OpenCL/check_multi_comp4.c"
static void md4_transform (const u32 w0[4], const u32 w1[4], const u32 w2[4], const u32 w3[4], u32 digest[4])
{
diff --git a/OpenCL/m05800.cl b/OpenCL/m05800.cl
index ad76e9c4b..4301851eb 100644
--- a/OpenCL/m05800.cl
+++ b/OpenCL/m05800.cl
@@ -14,11 +14,11 @@
#define DGST_R3 3
#include "include/kernel_functions.c"
-#include "types_ocl.c"
-#include "common.c"
+#include "OpenCL/types_ocl.c"
+#include "OpenCL/common.c"
-#define COMPARE_S "check_single_comp4.c"
-#define COMPARE_M "check_multi_comp4.c"
+#define COMPARE_S "OpenCL/check_single_comp4.c"
+#define COMPARE_M "OpenCL/check_multi_comp4.c"
typedef struct
{
diff --git a/OpenCL/m06000_a0.cl b/OpenCL/m06000_a0.cl
index 7b6014b87..ae80ee148 100644
--- a/OpenCL/m06000_a0.cl
+++ b/OpenCL/m06000_a0.cl
@@ -14,13 +14,13 @@
#define DGST_R3 3
#include "include/kernel_functions.c"
-#include "types_ocl.c"
-#include "common.c"
+#include "OpenCL/types_ocl.c"
+#include "OpenCL/common.c"
#include "include/rp_gpu.h"
#include "rp.c"
-#define COMPARE_S "check_single_comp4.c"
-#define COMPARE_M "check_multi_comp4.c"
+#define COMPARE_S "OpenCL/check_single_comp4.c"
+#define COMPARE_M "OpenCL/check_multi_comp4.c"
static void ripemd160_transform (const u32 w[16], u32 dgst[5])
{
diff --git a/OpenCL/m06000_a1.cl b/OpenCL/m06000_a1.cl
index 95553c290..ef362d77d 100644
--- a/OpenCL/m06000_a1.cl
+++ b/OpenCL/m06000_a1.cl
@@ -14,11 +14,11 @@
#define DGST_R3 3
#include "include/kernel_functions.c"
-#include "types_ocl.c"
-#include "common.c"
+#include "OpenCL/types_ocl.c"
+#include "OpenCL/common.c"
-#define COMPARE_S "check_single_comp4.c"
-#define COMPARE_M "check_multi_comp4.c"
+#define COMPARE_S "OpenCL/check_single_comp4.c"
+#define COMPARE_M "OpenCL/check_multi_comp4.c"
static void ripemd160_transform (const u32 w[16], u32 dgst[5])
{
diff --git a/OpenCL/m06000_a3.cl b/OpenCL/m06000_a3.cl
index b4ccd38eb..5aeb7d076 100644
--- a/OpenCL/m06000_a3.cl
+++ b/OpenCL/m06000_a3.cl
@@ -14,11 +14,11 @@
#define DGST_R3 3
#include "include/kernel_functions.c"
-#include "types_ocl.c"
-#include "common.c"
+#include "OpenCL/types_ocl.c"
+#include "OpenCL/common.c"
-#define COMPARE_S "check_single_comp4.c"
-#define COMPARE_M "check_multi_comp4.c"
+#define COMPARE_S "OpenCL/check_single_comp4.c"
+#define COMPARE_M "OpenCL/check_multi_comp4.c"
static void ripemd160_transform (const u32 w[16], u32 dgst[5])
{
diff --git a/OpenCL/m06100_a0.cl b/OpenCL/m06100_a0.cl
index 942457500..0adc17921 100644
--- a/OpenCL/m06100_a0.cl
+++ b/OpenCL/m06100_a0.cl
@@ -14,13 +14,13 @@
#define DGST_R3 3
#include "include/kernel_functions.c"
-#include "types_ocl.c"
-#include "common.c"
+#include "OpenCL/types_ocl.c"
+#include "OpenCL/common.c"
#include "include/rp_gpu.h"
#include "rp.c"
-#define COMPARE_S "check_single_comp4.c"
-#define COMPARE_M "check_multi_comp4.c"
+#define COMPARE_S "OpenCL/check_single_comp4.c"
+#define COMPARE_M "OpenCL/check_multi_comp4.c"
#define R 10
diff --git a/OpenCL/m06100_a1.cl b/OpenCL/m06100_a1.cl
index 1330ea8c6..99f23ac83 100644
--- a/OpenCL/m06100_a1.cl
+++ b/OpenCL/m06100_a1.cl
@@ -14,11 +14,11 @@
#define DGST_R3 3
#include "include/kernel_functions.c"
-#include "types_ocl.c"
-#include "common.c"
+#include "OpenCL/types_ocl.c"
+#include "OpenCL/common.c"
-#define COMPARE_S "check_single_comp4.c"
-#define COMPARE_M "check_multi_comp4.c"
+#define COMPARE_S "OpenCL/check_single_comp4.c"
+#define COMPARE_M "OpenCL/check_multi_comp4.c"
#define R 10
diff --git a/OpenCL/m06100_a3.cl b/OpenCL/m06100_a3.cl
index 1ae654d49..a5a0fb8ca 100644
--- a/OpenCL/m06100_a3.cl
+++ b/OpenCL/m06100_a3.cl
@@ -14,11 +14,11 @@
#define DGST_R3 3
#include "include/kernel_functions.c"
-#include "types_ocl.c"
-#include "common.c"
+#include "OpenCL/types_ocl.c"
+#include "OpenCL/common.c"
-#define COMPARE_S "check_single_comp4.c"
-#define COMPARE_M "check_multi_comp4.c"
+#define COMPARE_S "OpenCL/check_single_comp4.c"
+#define COMPARE_M "OpenCL/check_multi_comp4.c"
#define R 10
diff --git a/OpenCL/m06211.cl b/OpenCL/m06211.cl
index 4356bff64..67c0156e8 100644
--- a/OpenCL/m06211.cl
+++ b/OpenCL/m06211.cl
@@ -14,8 +14,8 @@
#define DGST_R3 3
#include "include/kernel_functions.c"
-#include "types_ocl.c"
-#include "common.c"
+#include "OpenCL/types_ocl.c"
+#include "OpenCL/common.c"
#include "gpu_aes256_amd.c"
#include "gpu_twofish256_amd.c"
diff --git a/OpenCL/m06212.cl b/OpenCL/m06212.cl
index 757c9ee48..587caf06e 100644
--- a/OpenCL/m06212.cl
+++ b/OpenCL/m06212.cl
@@ -14,8 +14,8 @@
#define DGST_R3 3
#include "include/kernel_functions.c"
-#include "types_ocl.c"
-#include "common.c"
+#include "OpenCL/types_ocl.c"
+#include "OpenCL/common.c"
#include "gpu_aes256_amd.c"
#include "gpu_twofish256_amd.c"
diff --git a/OpenCL/m06213.cl b/OpenCL/m06213.cl
index bdcc7bcb1..6abaa4be5 100644
--- a/OpenCL/m06213.cl
+++ b/OpenCL/m06213.cl
@@ -14,8 +14,8 @@
#define DGST_R3 3
#include "include/kernel_functions.c"
-#include "types_ocl.c"
-#include "common.c"
+#include "OpenCL/types_ocl.c"
+#include "OpenCL/common.c"
#include "gpu_aes256_amd.c"
#include "gpu_twofish256_amd.c"
diff --git a/OpenCL/m06221.cl b/OpenCL/m06221.cl
index 337d31a4a..19b74bf35 100644
--- a/OpenCL/m06221.cl
+++ b/OpenCL/m06221.cl
@@ -14,8 +14,8 @@
#define DGST_R3 3
#include "include/kernel_functions.c"
-#include "types_ocl.c"
-#include "common.c"
+#include "OpenCL/types_ocl.c"
+#include "OpenCL/common.c"
#include "gpu_aes256_amd.c"
#include "gpu_twofish256_amd.c"
diff --git a/OpenCL/m06222.cl b/OpenCL/m06222.cl
index 91336fb21..7d21ad1e1 100644
--- a/OpenCL/m06222.cl
+++ b/OpenCL/m06222.cl
@@ -14,8 +14,8 @@
#define DGST_R3 3
#include "include/kernel_functions.c"
-#include "types_ocl.c"
-#include "common.c"
+#include "OpenCL/types_ocl.c"
+#include "OpenCL/common.c"
#include "gpu_aes256_amd.c"
#include "gpu_twofish256_amd.c"
diff --git a/OpenCL/m06223.cl b/OpenCL/m06223.cl
index f14dd360d..4a74c6b0a 100644
--- a/OpenCL/m06223.cl
+++ b/OpenCL/m06223.cl
@@ -14,8 +14,8 @@
#define DGST_R3 3
#include "include/kernel_functions.c"
-#include "types_ocl.c"
-#include "common.c"
+#include "OpenCL/types_ocl.c"
+#include "OpenCL/common.c"
#include "gpu_aes256_amd.c"
#include "gpu_twofish256_amd.c"
diff --git a/OpenCL/m06231.cl b/OpenCL/m06231.cl
index 2fcf8c16f..dd55878d7 100644
--- a/OpenCL/m06231.cl
+++ b/OpenCL/m06231.cl
@@ -14,8 +14,8 @@
#define DGST_R3 3
#include "include/kernel_functions.c"
-#include "types_ocl.c"
-#include "common.c"
+#include "OpenCL/types_ocl.c"
+#include "OpenCL/common.c"
#include "gpu_aes256_amd.c"
#include "gpu_twofish256_amd.c"
diff --git a/OpenCL/m06232.cl b/OpenCL/m06232.cl
index ff38e4b75..695f0a049 100644
--- a/OpenCL/m06232.cl
+++ b/OpenCL/m06232.cl
@@ -14,8 +14,8 @@
#define DGST_R3 3
#include "include/kernel_functions.c"
-#include "types_ocl.c"
-#include "common.c"
+#include "OpenCL/types_ocl.c"
+#include "OpenCL/common.c"
#include "gpu_aes256_amd.c"
#include "gpu_twofish256_amd.c"
diff --git a/OpenCL/m06233.cl b/OpenCL/m06233.cl
index 74d579131..5a5a0b028 100644
--- a/OpenCL/m06233.cl
+++ b/OpenCL/m06233.cl
@@ -14,8 +14,8 @@
#define DGST_R3 3
#include "include/kernel_functions.c"
-#include "types_ocl.c"
-#include "common.c"
+#include "OpenCL/types_ocl.c"
+#include "OpenCL/common.c"
#include "gpu_aes256_amd.c"
#include "gpu_twofish256_amd.c"
diff --git a/OpenCL/m06300.cl b/OpenCL/m06300.cl
index c1a410599..2cfea77db 100644
--- a/OpenCL/m06300.cl
+++ b/OpenCL/m06300.cl
@@ -14,11 +14,11 @@
#define DGST_R3 3
#include "include/kernel_functions.c"
-#include "types_ocl.c"
-#include "common.c"
+#include "OpenCL/types_ocl.c"
+#include "OpenCL/common.c"
-#define COMPARE_S "check_single_comp4.c"
-#define COMPARE_M "check_multi_comp4.c"
+#define COMPARE_S "OpenCL/check_single_comp4.c"
+#define COMPARE_M "OpenCL/check_multi_comp4.c"
static void md5_transform (const u32 w0[4], const u32 w1[4], const u32 w2[4], const u32 w3[4], u32 digest[4])
{
diff --git a/OpenCL/m06400.cl b/OpenCL/m06400.cl
index 5d88ec6c6..95710acd5 100644
--- a/OpenCL/m06400.cl
+++ b/OpenCL/m06400.cl
@@ -14,11 +14,11 @@
#define DGST_R3 3
#include "include/kernel_functions.c"
-#include "types_ocl.c"
-#include "common.c"
+#include "OpenCL/types_ocl.c"
+#include "OpenCL/common.c"
-#define COMPARE_S "check_single_comp4.c"
-#define COMPARE_M "check_multi_comp4.c"
+#define COMPARE_S "OpenCL/check_single_comp4.c"
+#define COMPARE_M "OpenCL/check_multi_comp4.c"
__constant u32 k_sha256[64] =
{
diff --git a/OpenCL/m06500.cl b/OpenCL/m06500.cl
index 1774d3882..172579a50 100644
--- a/OpenCL/m06500.cl
+++ b/OpenCL/m06500.cl
@@ -14,11 +14,11 @@
#define DGST_R3 3
#include "include/kernel_functions.c"
-#include "types_ocl.c"
-#include "common.c"
+#include "OpenCL/types_ocl.c"
+#include "OpenCL/common.c"
-#define COMPARE_S "check_single_comp4.c"
-#define COMPARE_M "check_multi_comp4.c"
+#define COMPARE_S "OpenCL/check_single_comp4.c"
+#define COMPARE_M "OpenCL/check_multi_comp4.c"
__constant u64 k_sha512[80] =
{
diff --git a/OpenCL/m06600.cl b/OpenCL/m06600.cl
index 9b4665477..9441da293 100644
--- a/OpenCL/m06600.cl
+++ b/OpenCL/m06600.cl
@@ -14,11 +14,11 @@
#define DGST_R3 3
#include "include/kernel_functions.c"
-#include "types_ocl.c"
-#include "common.c"
+#include "OpenCL/types_ocl.c"
+#include "OpenCL/common.c"
-#define COMPARE_S "check_single_comp4.c"
-#define COMPARE_M "check_multi_comp4.c"
+#define COMPARE_S "OpenCL/check_single_comp4.c"
+#define COMPARE_M "OpenCL/check_multi_comp4.c"
__constant u32 te0[256] =
{
diff --git a/OpenCL/m06700.cl b/OpenCL/m06700.cl
index 6252a995c..a84e6cbe8 100644
--- a/OpenCL/m06700.cl
+++ b/OpenCL/m06700.cl
@@ -14,11 +14,11 @@
#define DGST_R3 3
#include "include/kernel_functions.c"
-#include "types_ocl.c"
-#include "common.c"
+#include "OpenCL/types_ocl.c"
+#include "OpenCL/common.c"
-#define COMPARE_S "check_single_comp4.c"
-#define COMPARE_M "check_multi_comp4.c"
+#define COMPARE_S "OpenCL/check_single_comp4.c"
+#define COMPARE_M "OpenCL/check_multi_comp4.c"
static void sha1_transform (const u32 w0[4], const u32 w1[4], const u32 w2[4], const u32 w3[4], u32 digest[5])
{
diff --git a/OpenCL/m06800.cl b/OpenCL/m06800.cl
index a14c1d66d..a478f7bfd 100644
--- a/OpenCL/m06800.cl
+++ b/OpenCL/m06800.cl
@@ -14,11 +14,11 @@
#define DGST_R3 3
#include "include/kernel_functions.c"
-#include "types_ocl.c"
-#include "common.c"
+#include "OpenCL/types_ocl.c"
+#include "OpenCL/common.c"
-#define COMPARE_S "check_single_comp4.c"
-#define COMPARE_M "check_multi_comp4.c"
+#define COMPARE_S "OpenCL/check_single_comp4.c"
+#define COMPARE_M "OpenCL/check_multi_comp4.c"
__constant u32 te0[256] =
{
diff --git a/OpenCL/m06900_a0.cl b/OpenCL/m06900_a0.cl
index 43a4fcd96..f8800f654 100644
--- a/OpenCL/m06900_a0.cl
+++ b/OpenCL/m06900_a0.cl
@@ -14,13 +14,13 @@
#define DGST_R3 3
#include "include/kernel_functions.c"
-#include "types_ocl.c"
-#include "common.c"
+#include "OpenCL/types_ocl.c"
+#include "OpenCL/common.c"
#include "include/rp_gpu.h"
#include "rp.c"
-#define COMPARE_S "check_single_comp4.c"
-#define COMPARE_M "check_multi_comp4.c"
+#define COMPARE_S "OpenCL/check_single_comp4.c"
+#define COMPARE_M "OpenCL/check_multi_comp4.c"
__constant u32 c_tables[4][256] =
{
diff --git a/OpenCL/m06900_a1.cl b/OpenCL/m06900_a1.cl
index 28d1a8d87..5132ba327 100644
--- a/OpenCL/m06900_a1.cl
+++ b/OpenCL/m06900_a1.cl
@@ -14,11 +14,11 @@
#define DGST_R3 3
#include "include/kernel_functions.c"
-#include "types_ocl.c"
-#include "common.c"
+#include "OpenCL/types_ocl.c"
+#include "OpenCL/common.c"
-#define COMPARE_S "check_single_comp4.c"
-#define COMPARE_M "check_multi_comp4.c"
+#define COMPARE_S "OpenCL/check_single_comp4.c"
+#define COMPARE_M "OpenCL/check_multi_comp4.c"
__constant u32 c_tables[4][256] =
{
diff --git a/OpenCL/m06900_a3.cl b/OpenCL/m06900_a3.cl
index fdb442be7..34d362d99 100644
--- a/OpenCL/m06900_a3.cl
+++ b/OpenCL/m06900_a3.cl
@@ -14,11 +14,11 @@
#define DGST_R3 3
#include "include/kernel_functions.c"
-#include "types_ocl.c"
-#include "common.c"
+#include "OpenCL/types_ocl.c"
+#include "OpenCL/common.c"
-#define COMPARE_S "check_single_comp4.c"
-#define COMPARE_M "check_multi_comp4.c"
+#define COMPARE_S "OpenCL/check_single_comp4.c"
+#define COMPARE_M "OpenCL/check_multi_comp4.c"
__constant u32 c_tables[4][256] =
{
diff --git a/OpenCL/m07100.cl b/OpenCL/m07100.cl
index a5d7d1b3e..fb52fbda8 100644
--- a/OpenCL/m07100.cl
+++ b/OpenCL/m07100.cl
@@ -14,11 +14,11 @@
#define DGST_R3 3
#include "include/kernel_functions.c"
-#include "types_ocl.c"
-#include "common.c"
+#include "OpenCL/types_ocl.c"
+#include "OpenCL/common.c"
-#define COMPARE_S "check_single_comp4.c"
-#define COMPARE_M "check_multi_comp4.c"
+#define COMPARE_S "OpenCL/check_single_comp4.c"
+#define COMPARE_M "OpenCL/check_multi_comp4.c"
__constant u64 k_sha512[80] =
{
diff --git a/OpenCL/m07300_a0.cl b/OpenCL/m07300_a0.cl
index 3717f26ee..91fe7990a 100644
--- a/OpenCL/m07300_a0.cl
+++ b/OpenCL/m07300_a0.cl
@@ -14,13 +14,13 @@
#define DGST_R3 1
#include "include/kernel_functions.c"
-#include "types_ocl.c"
-#include "common.c"
+#include "OpenCL/types_ocl.c"
+#include "OpenCL/common.c"
#include "include/rp_gpu.h"
#include "rp.c"
-#define COMPARE_S "check_single_comp4.c"
-#define COMPARE_M "check_multi_comp4.c"
+#define COMPARE_S "OpenCL/check_single_comp4.c"
+#define COMPARE_M "OpenCL/check_multi_comp4.c"
static void sha1_transform (const u32 w0[4], const u32 w1[4], const u32 w2[4], const u32 w3[4], u32 digest[5])
{
diff --git a/OpenCL/m07300_a1.cl b/OpenCL/m07300_a1.cl
index 098317e21..6d593a0cd 100644
--- a/OpenCL/m07300_a1.cl
+++ b/OpenCL/m07300_a1.cl
@@ -14,11 +14,11 @@
#define DGST_R3 1
#include "include/kernel_functions.c"
-#include "types_ocl.c"
-#include "common.c"
+#include "OpenCL/types_ocl.c"
+#include "OpenCL/common.c"
-#define COMPARE_S "check_single_comp4.c"
-#define COMPARE_M "check_multi_comp4.c"
+#define COMPARE_S "OpenCL/check_single_comp4.c"
+#define COMPARE_M "OpenCL/check_multi_comp4.c"
static void sha1_transform (const u32 w0[4], const u32 w1[4], const u32 w2[4], const u32 w3[4], u32 digest[5])
{
diff --git a/OpenCL/m07300_a3.cl b/OpenCL/m07300_a3.cl
index 2356f1e67..27ced3e1e 100644
--- a/OpenCL/m07300_a3.cl
+++ b/OpenCL/m07300_a3.cl
@@ -14,11 +14,11 @@
#define DGST_R3 1
#include "include/kernel_functions.c"
-#include "types_ocl.c"
-#include "common.c"
+#include "OpenCL/types_ocl.c"
+#include "OpenCL/common.c"
-#define COMPARE_S "check_single_comp4.c"
-#define COMPARE_M "check_multi_comp4.c"
+#define COMPARE_S "OpenCL/check_single_comp4.c"
+#define COMPARE_M "OpenCL/check_multi_comp4.c"
static void sha1_transform (const u32 w0[4], const u32 w1[4], const u32 w2[4], const u32 w3[4], u32 digest[5])
{
diff --git a/OpenCL/m07400.cl b/OpenCL/m07400.cl
index 79a6664e6..98a2f7e0f 100644
--- a/OpenCL/m07400.cl
+++ b/OpenCL/m07400.cl
@@ -14,11 +14,11 @@
#define DGST_R3 3
#include "include/kernel_functions.c"
-#include "types_ocl.c"
-#include "common.c"
+#include "OpenCL/types_ocl.c"
+#include "OpenCL/common.c"
-#define COMPARE_S "check_single_comp4.c"
-#define COMPARE_M "check_multi_comp4.c"
+#define COMPARE_S "OpenCL/check_single_comp4.c"
+#define COMPARE_M "OpenCL/check_multi_comp4.c"
__constant u32 k_sha256[64] =
{
diff --git a/OpenCL/m07500_a0.cl b/OpenCL/m07500_a0.cl
index 0c42bd880..f48400edd 100644
--- a/OpenCL/m07500_a0.cl
+++ b/OpenCL/m07500_a0.cl
@@ -14,8 +14,8 @@
#define DGST_R3 6
#include "include/kernel_functions.c"
-#include "types_ocl.c"
-#include "common.c"
+#include "OpenCL/types_ocl.c"
+#include "OpenCL/common.c"
#include "include/rp_gpu.h"
#include "rp.c"
diff --git a/OpenCL/m07500_a1.cl b/OpenCL/m07500_a1.cl
index 47bcdda34..d4dc9d4a4 100644
--- a/OpenCL/m07500_a1.cl
+++ b/OpenCL/m07500_a1.cl
@@ -14,8 +14,8 @@
#define DGST_R3 6
#include "include/kernel_functions.c"
-#include "types_ocl.c"
-#include "common.c"
+#include "OpenCL/types_ocl.c"
+#include "OpenCL/common.c"
typedef struct
{
diff --git a/OpenCL/m07500_a3.cl b/OpenCL/m07500_a3.cl
index b22d02a2d..e1228ab25 100644
--- a/OpenCL/m07500_a3.cl
+++ b/OpenCL/m07500_a3.cl
@@ -14,8 +14,8 @@
#define DGST_R3 6
#include "include/kernel_functions.c"
-#include "types_ocl.c"
-#include "common.c"
+#include "OpenCL/types_ocl.c"
+#include "OpenCL/common.c"
typedef struct
{
diff --git a/OpenCL/m07600_a0.cl b/OpenCL/m07600_a0.cl
index 1e23bafb5..13c5ca37c 100644
--- a/OpenCL/m07600_a0.cl
+++ b/OpenCL/m07600_a0.cl
@@ -14,13 +14,13 @@
#define DGST_R3 1
#include "include/kernel_functions.c"
-#include "types_ocl.c"
-#include "common.c"
+#include "OpenCL/types_ocl.c"
+#include "OpenCL/common.c"
#include "include/rp_gpu.h"
#include "rp.c"
-#define COMPARE_S "check_single_comp4.c"
-#define COMPARE_M "check_multi_comp4.c"
+#define COMPARE_S "OpenCL/check_single_comp4.c"
+#define COMPARE_M "OpenCL/check_multi_comp4.c"
#define uint_to_hex_lower8(i) l_bin2asc[(i)]
diff --git a/OpenCL/m07600_a1.cl b/OpenCL/m07600_a1.cl
index 2ceda7bea..1e1f9c428 100644
--- a/OpenCL/m07600_a1.cl
+++ b/OpenCL/m07600_a1.cl
@@ -14,11 +14,11 @@
#define DGST_R3 1
#include "include/kernel_functions.c"
-#include "types_ocl.c"
-#include "common.c"
+#include "OpenCL/types_ocl.c"
+#include "OpenCL/common.c"
-#define COMPARE_S "check_single_comp4.c"
-#define COMPARE_M "check_multi_comp4.c"
+#define COMPARE_S "OpenCL/check_single_comp4.c"
+#define COMPARE_M "OpenCL/check_multi_comp4.c"
#define uint_to_hex_lower8(i) l_bin2asc[(i)]
diff --git a/OpenCL/m07600_a3.cl b/OpenCL/m07600_a3.cl
index a71184bd7..f6b46102a 100644
--- a/OpenCL/m07600_a3.cl
+++ b/OpenCL/m07600_a3.cl
@@ -14,11 +14,11 @@
#define DGST_R3 1
#include "include/kernel_functions.c"
-#include "types_ocl.c"
-#include "common.c"
+#include "OpenCL/types_ocl.c"
+#include "OpenCL/common.c"
-#define COMPARE_S "check_single_comp4.c"
-#define COMPARE_M "check_multi_comp4.c"
+#define COMPARE_S "OpenCL/check_single_comp4.c"
+#define COMPARE_M "OpenCL/check_multi_comp4.c"
#define uint_to_hex_lower8(i) l_bin2asc[(i)]
diff --git a/OpenCL/m07700_a0.cl b/OpenCL/m07700_a0.cl
index b2b12bae9..75eee96a6 100644
--- a/OpenCL/m07700_a0.cl
+++ b/OpenCL/m07700_a0.cl
@@ -14,13 +14,13 @@
#define DGST_R3 3
#include "include/kernel_functions.c"
-#include "types_ocl.c"
-#include "common.c"
+#include "OpenCL/types_ocl.c"
+#include "OpenCL/common.c"
#include "include/rp_gpu.h"
#include "rp.c"
-#define COMPARE_S "check_single_comp4.c"
-#define COMPARE_M "check_multi_comp4.c"
+#define COMPARE_S "OpenCL/check_single_comp4.c"
+#define COMPARE_M "OpenCL/check_multi_comp4.c"
#define GETCHAR(a,p) (((a)[(p) / 4] >> (((p) & 3) * 8)) & 0xff)
#define PUTCHAR(a,p,c) ((a)[(p) / 4] = (((a)[(p) / 4] & ~(0xff << (((p) & 3) * 8))) | ((c) << (((p) & 3) * 8))))
diff --git a/OpenCL/m07700_a1.cl b/OpenCL/m07700_a1.cl
index 4b4f1975a..f8372d765 100644
--- a/OpenCL/m07700_a1.cl
+++ b/OpenCL/m07700_a1.cl
@@ -14,11 +14,11 @@
#define DGST_R3 3
#include "include/kernel_functions.c"
-#include "types_ocl.c"
-#include "common.c"
+#include "OpenCL/types_ocl.c"
+#include "OpenCL/common.c"
-#define COMPARE_S "check_single_comp4.c"
-#define COMPARE_M "check_multi_comp4.c"
+#define COMPARE_S "OpenCL/check_single_comp4.c"
+#define COMPARE_M "OpenCL/check_multi_comp4.c"
#define GETCHAR(a,p) (((a)[(p) / 4] >> (((p) & 3) * 8)) & 0xff)
#define PUTCHAR(a,p,c) ((a)[(p) / 4] = (((a)[(p) / 4] & ~(0xff << (((p) & 3) * 8))) | ((c) << (((p) & 3) * 8))))
diff --git a/OpenCL/m07700_a3.cl b/OpenCL/m07700_a3.cl
index 5f845f00b..6d22d3634 100644
--- a/OpenCL/m07700_a3.cl
+++ b/OpenCL/m07700_a3.cl
@@ -14,11 +14,11 @@
#define DGST_R3 3
#include "include/kernel_functions.c"
-#include "types_ocl.c"
-#include "common.c"
+#include "OpenCL/types_ocl.c"
+#include "OpenCL/common.c"
-#define COMPARE_S "check_single_comp4.c"
-#define COMPARE_M "check_multi_comp4.c"
+#define COMPARE_S "OpenCL/check_single_comp4.c"
+#define COMPARE_M "OpenCL/check_multi_comp4.c"
#define GETCHAR(a,p) (((a)[(p) / 4] >> (((p) & 3) * 8)) & 0xff)
#define PUTCHAR(a,p,c) ((a)[(p) / 4] = (((a)[(p) / 4] & ~(0xff << (((p) & 3) * 8))) | ((c) << (((p) & 3) * 8))))
diff --git a/OpenCL/m07800_a0.cl b/OpenCL/m07800_a0.cl
index 79da3fa39..ce71935f8 100644
--- a/OpenCL/m07800_a0.cl
+++ b/OpenCL/m07800_a0.cl
@@ -14,13 +14,13 @@
#define DGST_R3 1
#include "include/kernel_functions.c"
-#include "types_ocl.c"
-#include "common.c"
+#include "OpenCL/types_ocl.c"
+#include "OpenCL/common.c"
#include "include/rp_gpu.h"
#include "rp.c"
-#define COMPARE_S "check_single_comp4.c"
-#define COMPARE_M "check_multi_comp4.c"
+#define COMPARE_S "OpenCL/check_single_comp4.c"
+#define COMPARE_M "OpenCL/check_multi_comp4.c"
#define GETSHIFTEDINT(a,n) amd_bytealign ((a)[((n)/4)+1], (a)[((n)/4)+0], (n))
diff --git a/OpenCL/m07800_a1.cl b/OpenCL/m07800_a1.cl
index 3c2f60b7c..42dcaf5f9 100644
--- a/OpenCL/m07800_a1.cl
+++ b/OpenCL/m07800_a1.cl
@@ -14,11 +14,11 @@
#define DGST_R3 1
#include "include/kernel_functions.c"
-#include "types_ocl.c"
-#include "common.c"
+#include "OpenCL/types_ocl.c"
+#include "OpenCL/common.c"
-#define COMPARE_S "check_single_comp4.c"
-#define COMPARE_M "check_multi_comp4.c"
+#define COMPARE_S "OpenCL/check_single_comp4.c"
+#define COMPARE_M "OpenCL/check_multi_comp4.c"
#define GETSHIFTEDINT(a,n) amd_bytealign ((a)[((n)/4)+1], (a)[((n)/4)+0], (n))
diff --git a/OpenCL/m07800_a3.cl b/OpenCL/m07800_a3.cl
index bc972d3bc..4df52c934 100644
--- a/OpenCL/m07800_a3.cl
+++ b/OpenCL/m07800_a3.cl
@@ -14,11 +14,11 @@
#define DGST_R3 1
#include "include/kernel_functions.c"
-#include "types_ocl.c"
-#include "common.c"
+#include "OpenCL/types_ocl.c"
+#include "OpenCL/common.c"
-#define COMPARE_S "check_single_comp4.c"
-#define COMPARE_M "check_multi_comp4.c"
+#define COMPARE_S "OpenCL/check_single_comp4.c"
+#define COMPARE_M "OpenCL/check_multi_comp4.c"
#define GETSHIFTEDINT(a,n) amd_bytealign ((a)[((n)/4)+1], (a)[((n)/4)+0], (n))
diff --git a/OpenCL/m07900.cl b/OpenCL/m07900.cl
index 2bba22cc2..601fb9271 100644
--- a/OpenCL/m07900.cl
+++ b/OpenCL/m07900.cl
@@ -14,11 +14,11 @@
#define DGST_R3 3
#include "include/kernel_functions.c"
-#include "types_ocl.c"
-#include "common.c"
+#include "OpenCL/types_ocl.c"
+#include "OpenCL/common.c"
-#define COMPARE_S "check_single_comp4.c"
-#define COMPARE_M "check_multi_comp4.c"
+#define COMPARE_S "OpenCL/check_single_comp4.c"
+#define COMPARE_M "OpenCL/check_multi_comp4.c"
__constant u64 k_sha512[80] =
{
diff --git a/OpenCL/m08000_a0.cl b/OpenCL/m08000_a0.cl
index 5f571cd09..b5a017976 100644
--- a/OpenCL/m08000_a0.cl
+++ b/OpenCL/m08000_a0.cl
@@ -14,13 +14,13 @@
#define DGST_R3 6
#include "include/kernel_functions.c"
-#include "types_ocl.c"
-#include "common.c"
+#include "OpenCL/types_ocl.c"
+#include "OpenCL/common.c"
#include "include/rp_gpu.h"
#include "rp.c"
-#define COMPARE_S "check_single_comp4.c"
-#define COMPARE_M "check_multi_comp4.c"
+#define COMPARE_S "OpenCL/check_single_comp4.c"
+#define COMPARE_M "OpenCL/check_multi_comp4.c"
__constant u32 k_sha256[64] =
{
diff --git a/OpenCL/m08000_a1.cl b/OpenCL/m08000_a1.cl
index 81d23cb91..926d27e7a 100644
--- a/OpenCL/m08000_a1.cl
+++ b/OpenCL/m08000_a1.cl
@@ -14,11 +14,11 @@
#define DGST_R3 6
#include "include/kernel_functions.c"
-#include "types_ocl.c"
-#include "common.c"
+#include "OpenCL/types_ocl.c"
+#include "OpenCL/common.c"
-#define COMPARE_S "check_single_comp4.c"
-#define COMPARE_M "check_multi_comp4.c"
+#define COMPARE_S "OpenCL/check_single_comp4.c"
+#define COMPARE_M "OpenCL/check_multi_comp4.c"
__constant u32 k_sha256[64] =
{
diff --git a/OpenCL/m08000_a3.cl b/OpenCL/m08000_a3.cl
index 9bb232a9a..744795ec2 100644
--- a/OpenCL/m08000_a3.cl
+++ b/OpenCL/m08000_a3.cl
@@ -14,11 +14,11 @@
#define DGST_R3 6
#include "include/kernel_functions.c"
-#include "types_ocl.c"
-#include "common.c"
+#include "OpenCL/types_ocl.c"
+#include "OpenCL/common.c"
-#define COMPARE_S "check_single_comp4.c"
-#define COMPARE_M "check_multi_comp4.c"
+#define COMPARE_S "OpenCL/check_single_comp4.c"
+#define COMPARE_M "OpenCL/check_multi_comp4.c"
__constant u32 k_sha256[64] =
{
diff --git a/OpenCL/m08100_a0.cl b/OpenCL/m08100_a0.cl
index f0bba13c5..57d38ad90 100644
--- a/OpenCL/m08100_a0.cl
+++ b/OpenCL/m08100_a0.cl
@@ -14,13 +14,13 @@
#define DGST_R3 1
#include "include/kernel_functions.c"
-#include "types_ocl.c"
-#include "common.c"
+#include "OpenCL/types_ocl.c"
+#include "OpenCL/common.c"
#include "include/rp_gpu.h"
#include "rp.c"
-#define COMPARE_S "check_single_comp4.c"
-#define COMPARE_M "check_multi_comp4.c"
+#define COMPARE_S "OpenCL/check_single_comp4.c"
+#define COMPARE_M "OpenCL/check_multi_comp4.c"
__kernel void __attribute__((reqd_work_group_size (64, 1, 1))) m08100_m04 (__global pw_t *pws, __global gpu_rule_t *rules_buf, __global comb_t *combs_buf, __global bf_t *bfs_buf, __global void *tmps, __global void *hooks, __global u32 *bitmaps_buf_s1_a, __global u32 *bitmaps_buf_s1_b, __global u32 *bitmaps_buf_s1_c, __global u32 *bitmaps_buf_s1_d, __global u32 *bitmaps_buf_s2_a, __global u32 *bitmaps_buf_s2_b, __global u32 *bitmaps_buf_s2_c, __global u32 *bitmaps_buf_s2_d, __global plain_t *plains_buf, __global digest_t *digests_buf, __global u32 *hashes_shown, __global salt_t *salt_bufs, __global void *esalt_bufs, __global u32 *d_return_buf, __global u32 *d_scryptV_buf, const u32 bitmap_mask, const u32 bitmap_shift1, const u32 bitmap_shift2, const u32 salt_pos, const u32 loop_pos, const u32 loop_cnt, const u32 rules_cnt, const u32 digests_cnt, const u32 digests_offset, const u32 combs_mode, const u32 gid_max)
{
diff --git a/OpenCL/m08100_a1.cl b/OpenCL/m08100_a1.cl
index 264ffc889..e472e5202 100644
--- a/OpenCL/m08100_a1.cl
+++ b/OpenCL/m08100_a1.cl
@@ -14,11 +14,11 @@
#define DGST_R3 1
#include "include/kernel_functions.c"
-#include "types_ocl.c"
-#include "common.c"
+#include "OpenCL/types_ocl.c"
+#include "OpenCL/common.c"
-#define COMPARE_S "check_single_comp4.c"
-#define COMPARE_M "check_multi_comp4.c"
+#define COMPARE_S "OpenCL/check_single_comp4.c"
+#define COMPARE_M "OpenCL/check_multi_comp4.c"
__kernel void __attribute__((reqd_work_group_size (64, 1, 1))) m08100_m04 (__global pw_t *pws, __global gpu_rule_t *rules_buf, __global comb_t *combs_buf, __global bf_t *bfs_buf, __global void *tmps, __global void *hooks, __global u32 *bitmaps_buf_s1_a, __global u32 *bitmaps_buf_s1_b, __global u32 *bitmaps_buf_s1_c, __global u32 *bitmaps_buf_s1_d, __global u32 *bitmaps_buf_s2_a, __global u32 *bitmaps_buf_s2_b, __global u32 *bitmaps_buf_s2_c, __global u32 *bitmaps_buf_s2_d, __global plain_t *plains_buf, __global digest_t *digests_buf, __global u32 *hashes_shown, __global salt_t *salt_bufs, __global void *esalt_bufs, __global u32 *d_return_buf, __global u32 *d_scryptV_buf, const u32 bitmap_mask, const u32 bitmap_shift1, const u32 bitmap_shift2, const u32 salt_pos, const u32 loop_pos, const u32 loop_cnt, const u32 combs_cnt, const u32 digests_cnt, const u32 digests_offset, const u32 combs_mode, const u32 gid_max)
{
diff --git a/OpenCL/m08100_a3.cl b/OpenCL/m08100_a3.cl
index dcf642c7b..867406b0c 100644
--- a/OpenCL/m08100_a3.cl
+++ b/OpenCL/m08100_a3.cl
@@ -14,11 +14,11 @@
#define DGST_R3 1
#include "include/kernel_functions.c"
-#include "types_ocl.c"
-#include "common.c"
+#include "OpenCL/types_ocl.c"
+#include "OpenCL/common.c"
-#define COMPARE_S "check_single_comp4.c"
-#define COMPARE_M "check_multi_comp4.c"
+#define COMPARE_S "OpenCL/check_single_comp4.c"
+#define COMPARE_M "OpenCL/check_multi_comp4.c"
static void m08100m (u32 w0[4], u32 w1[4], u32 w2[4], u32 w3[4], const u32 pw_len, __global pw_t *pws, __global gpu_rule_t *rules_buf, __global comb_t *combs_buf, __global bf_t *bfs_buf, __global void *tmps, __global void *hooks, __global u32 *bitmaps_buf_s1_a, __global u32 *bitmaps_buf_s1_b, __global u32 *bitmaps_buf_s1_c, __global u32 *bitmaps_buf_s1_d, __global u32 *bitmaps_buf_s2_a, __global u32 *bitmaps_buf_s2_b, __global u32 *bitmaps_buf_s2_c, __global u32 *bitmaps_buf_s2_d, __global plain_t *plains_buf, __global digest_t *digests_buf, __global u32 *hashes_shown, __global salt_t *salt_bufs, __global void *esalt_bufs, __global u32 *d_return_buf, __global u32 *d_scryptV_buf, const u32 bitmap_mask, const u32 bitmap_shift1, const u32 bitmap_shift2, const u32 salt_pos, const u32 loop_pos, const u32 loop_cnt, const u32 bfs_cnt, const u32 digests_cnt, const u32 digests_offset)
{
diff --git a/OpenCL/m08200.cl b/OpenCL/m08200.cl
index 4a0f48378..bcbe8577c 100644
--- a/OpenCL/m08200.cl
+++ b/OpenCL/m08200.cl
@@ -14,11 +14,11 @@
#define DGST_R3 3
#include "include/kernel_functions.c"
-#include "types_ocl.c"
-#include "common.c"
+#include "OpenCL/types_ocl.c"
+#include "OpenCL/common.c"
-#define COMPARE_S "check_single_comp4.c"
-#define COMPARE_M "check_multi_comp4.c"
+#define COMPARE_S "OpenCL/check_single_comp4.c"
+#define COMPARE_M "OpenCL/check_multi_comp4.c"
__constant u32 k_sha256[64] =
{
diff --git a/OpenCL/m08300_a0.cl b/OpenCL/m08300_a0.cl
index 9641a07bc..cf96775a3 100644
--- a/OpenCL/m08300_a0.cl
+++ b/OpenCL/m08300_a0.cl
@@ -14,13 +14,13 @@
#define DGST_R3 1
#include "include/kernel_functions.c"
-#include "types_ocl.c"
-#include "common.c"
+#include "OpenCL/types_ocl.c"
+#include "OpenCL/common.c"
#include "include/rp_gpu.h"
#include "rp.c"
-#define COMPARE_S "check_single_comp4.c"
-#define COMPARE_M "check_multi_comp4.c"
+#define COMPARE_S "OpenCL/check_single_comp4.c"
+#define COMPARE_M "OpenCL/check_multi_comp4.c"
static void sha1_transform (const u32 w0[4], const u32 w1[4], const u32 w2[4], const u32 w3[4], u32 digest[5])
{
diff --git a/OpenCL/m08300_a1.cl b/OpenCL/m08300_a1.cl
index 52ad03779..39a70bf00 100644
--- a/OpenCL/m08300_a1.cl
+++ b/OpenCL/m08300_a1.cl
@@ -14,11 +14,11 @@
#define DGST_R3 1
#include "include/kernel_functions.c"
-#include "types_ocl.c"
-#include "common.c"
+#include "OpenCL/types_ocl.c"
+#include "OpenCL/common.c"
-#define COMPARE_S "check_single_comp4.c"
-#define COMPARE_M "check_multi_comp4.c"
+#define COMPARE_S "OpenCL/check_single_comp4.c"
+#define COMPARE_M "OpenCL/check_multi_comp4.c"
static void sha1_transform (const u32 w0[4], const u32 w1[4], const u32 w2[4], const u32 w3[4], u32 digest[5])
{
diff --git a/OpenCL/m08300_a3.cl b/OpenCL/m08300_a3.cl
index fad8e5d7e..3b3b23769 100644
--- a/OpenCL/m08300_a3.cl
+++ b/OpenCL/m08300_a3.cl
@@ -14,11 +14,11 @@
#define DGST_R3 1
#include "include/kernel_functions.c"
-#include "types_ocl.c"
-#include "common.c"
+#include "OpenCL/types_ocl.c"
+#include "OpenCL/common.c"
-#define COMPARE_S "check_single_comp4.c"
-#define COMPARE_M "check_multi_comp4.c"
+#define COMPARE_S "OpenCL/check_single_comp4.c"
+#define COMPARE_M "OpenCL/check_multi_comp4.c"
static void sha1_transform (const u32 w0[4], const u32 w1[4], const u32 w2[4], const u32 w3[4], u32 digest[5])
{
diff --git a/OpenCL/m08400_a0.cl b/OpenCL/m08400_a0.cl
index 31343f9ce..c00d73ff0 100644
--- a/OpenCL/m08400_a0.cl
+++ b/OpenCL/m08400_a0.cl
@@ -14,13 +14,13 @@
#define DGST_R3 1
#include "include/kernel_functions.c"
-#include "types_ocl.c"
-#include "common.c"
+#include "OpenCL/types_ocl.c"
+#include "OpenCL/common.c"
#include "include/rp_gpu.h"
#include "rp.c"
-#define COMPARE_S "check_single_comp4.c"
-#define COMPARE_M "check_multi_comp4.c"
+#define COMPARE_S "OpenCL/check_single_comp4.c"
+#define COMPARE_M "OpenCL/check_multi_comp4.c"
#define uint_to_hex_lower8_le(i) l_bin2asc[(i)]
diff --git a/OpenCL/m08400_a1.cl b/OpenCL/m08400_a1.cl
index c5bef54d0..309ad1014 100644
--- a/OpenCL/m08400_a1.cl
+++ b/OpenCL/m08400_a1.cl
@@ -14,11 +14,11 @@
#define DGST_R3 1
#include "include/kernel_functions.c"
-#include "types_ocl.c"
-#include "common.c"
+#include "OpenCL/types_ocl.c"
+#include "OpenCL/common.c"
-#define COMPARE_S "check_single_comp4.c"
-#define COMPARE_M "check_multi_comp4.c"
+#define COMPARE_S "OpenCL/check_single_comp4.c"
+#define COMPARE_M "OpenCL/check_multi_comp4.c"
#define uint_to_hex_lower8_le(i) l_bin2asc[(i)]
diff --git a/OpenCL/m08400_a3.cl b/OpenCL/m08400_a3.cl
index 07782d7e4..58be8d966 100644
--- a/OpenCL/m08400_a3.cl
+++ b/OpenCL/m08400_a3.cl
@@ -14,11 +14,11 @@
#define DGST_R3 1
#include "include/kernel_functions.c"
-#include "types_ocl.c"
-#include "common.c"
+#include "OpenCL/types_ocl.c"
+#include "OpenCL/common.c"
-#define COMPARE_S "check_single_comp4.c"
-#define COMPARE_M "check_multi_comp4.c"
+#define COMPARE_S "OpenCL/check_single_comp4.c"
+#define COMPARE_M "OpenCL/check_multi_comp4.c"
#define uint_to_hex_lower8_le(i) l_bin2asc[(i)]
diff --git a/OpenCL/m08500_a0.cl b/OpenCL/m08500_a0.cl
index 2a0237cd4..2aa715785 100644
--- a/OpenCL/m08500_a0.cl
+++ b/OpenCL/m08500_a0.cl
@@ -14,13 +14,13 @@
#define DGST_R3 3
#include "include/kernel_functions.c"
-#include "types_ocl.c"
-#include "common.c"
+#include "OpenCL/types_ocl.c"
+#include "OpenCL/common.c"
#include "include/rp_gpu.h"
#include "rp.c"
-#define COMPARE_S "check_single_comp4.c"
-#define COMPARE_M "check_multi_comp4.c"
+#define COMPARE_S "OpenCL/check_single_comp4.c"
+#define COMPARE_M "OpenCL/check_multi_comp4.c"
#define PERM_OP(a,b,tt,n,m) \
{ \
diff --git a/OpenCL/m08500_a1.cl b/OpenCL/m08500_a1.cl
index fbdc05b4d..2e1c89113 100644
--- a/OpenCL/m08500_a1.cl
+++ b/OpenCL/m08500_a1.cl
@@ -14,11 +14,11 @@
#define DGST_R3 3
#include "include/kernel_functions.c"
-#include "types_ocl.c"
-#include "common.c"
+#include "OpenCL/types_ocl.c"
+#include "OpenCL/common.c"
-#define COMPARE_S "check_single_comp4.c"
-#define COMPARE_M "check_multi_comp4.c"
+#define COMPARE_S "OpenCL/check_single_comp4.c"
+#define COMPARE_M "OpenCL/check_multi_comp4.c"
#define PERM_OP(a,b,tt,n,m) \
{ \
diff --git a/OpenCL/m08500_a3.cl b/OpenCL/m08500_a3.cl
index 9fd620c54..499b69ca3 100644
--- a/OpenCL/m08500_a3.cl
+++ b/OpenCL/m08500_a3.cl
@@ -14,11 +14,11 @@
#define DGST_R3 3
#include "include/kernel_functions.c"
-#include "types_ocl.c"
-#include "common.c"
+#include "OpenCL/types_ocl.c"
+#include "OpenCL/common.c"
-#define COMPARE_S "check_single_comp4.c"
-#define COMPARE_M "check_multi_comp4.c"
+#define COMPARE_S "OpenCL/check_single_comp4.c"
+#define COMPARE_M "OpenCL/check_multi_comp4.c"
#define PERM_OP(a,b,tt,n,m) \
{ \
diff --git a/OpenCL/m08600_a0.cl b/OpenCL/m08600_a0.cl
index ef418bb0f..2a8e23383 100644
--- a/OpenCL/m08600_a0.cl
+++ b/OpenCL/m08600_a0.cl
@@ -14,13 +14,13 @@
#define DGST_R3 3
#include "include/kernel_functions.c"
-#include "types_ocl.c"
-#include "common.c"
+#include "OpenCL/types_ocl.c"
+#include "OpenCL/common.c"
#include "include/rp_gpu.h"
#include "rp.c"
-#define COMPARE_S "check_single_comp4.c"
-#define COMPARE_M "check_multi_comp4.c"
+#define COMPARE_S "OpenCL/check_single_comp4.c"
+#define COMPARE_M "OpenCL/check_multi_comp4.c"
__constant u32 lotus_magic_table[256] =
{
diff --git a/OpenCL/m08600_a1.cl b/OpenCL/m08600_a1.cl
index 9c96b0f5f..b40379d89 100644
--- a/OpenCL/m08600_a1.cl
+++ b/OpenCL/m08600_a1.cl
@@ -14,11 +14,11 @@
#define DGST_R3 3
#include "include/kernel_functions.c"
-#include "types_ocl.c"
-#include "common.c"
+#include "OpenCL/types_ocl.c"
+#include "OpenCL/common.c"
-#define COMPARE_S "check_single_comp4.c"
-#define COMPARE_M "check_multi_comp4.c"
+#define COMPARE_S "OpenCL/check_single_comp4.c"
+#define COMPARE_M "OpenCL/check_multi_comp4.c"
__constant u32 lotus_magic_table[256] =
{
diff --git a/OpenCL/m08600_a3.cl b/OpenCL/m08600_a3.cl
index 23fab4aab..9872fbb5a 100644
--- a/OpenCL/m08600_a3.cl
+++ b/OpenCL/m08600_a3.cl
@@ -14,11 +14,11 @@
#define DGST_R3 3
#include "include/kernel_functions.c"
-#include "types_ocl.c"
-#include "common.c"
+#include "OpenCL/types_ocl.c"
+#include "OpenCL/common.c"
-#define COMPARE_S "check_single_comp4.c"
-#define COMPARE_M "check_multi_comp4.c"
+#define COMPARE_S "OpenCL/check_single_comp4.c"
+#define COMPARE_M "OpenCL/check_multi_comp4.c"
__constant u32 lotus_magic_table[256] =
{
diff --git a/OpenCL/m08700_a0.cl b/OpenCL/m08700_a0.cl
index 073e0fc9e..a7b0f87bb 100644
--- a/OpenCL/m08700_a0.cl
+++ b/OpenCL/m08700_a0.cl
@@ -14,13 +14,13 @@
#define DGST_R3 3
#include "include/kernel_functions.c"
-#include "types_ocl.c"
-#include "common.c"
+#include "OpenCL/types_ocl.c"
+#include "OpenCL/common.c"
#include "include/rp_gpu.h"
#include "rp.c"
-#define COMPARE_S "check_single_comp4.c"
-#define COMPARE_M "check_multi_comp4.c"
+#define COMPARE_S "OpenCL/check_single_comp4.c"
+#define COMPARE_M "OpenCL/check_multi_comp4.c"
__constant u32 lotus_magic_table[256] =
{
diff --git a/OpenCL/m08700_a1.cl b/OpenCL/m08700_a1.cl
index d4d0b97e6..fdcc73978 100644
--- a/OpenCL/m08700_a1.cl
+++ b/OpenCL/m08700_a1.cl
@@ -14,11 +14,11 @@
#define DGST_R3 3
#include "include/kernel_functions.c"
-#include "types_ocl.c"
-#include "common.c"
+#include "OpenCL/types_ocl.c"
+#include "OpenCL/common.c"
-#define COMPARE_S "check_single_comp4.c"
-#define COMPARE_M "check_multi_comp4.c"
+#define COMPARE_S "OpenCL/check_single_comp4.c"
+#define COMPARE_M "OpenCL/check_multi_comp4.c"
__constant u32 lotus_magic_table[256] =
{
diff --git a/OpenCL/m08700_a3.cl b/OpenCL/m08700_a3.cl
index f4288d6d5..266ca14b5 100644
--- a/OpenCL/m08700_a3.cl
+++ b/OpenCL/m08700_a3.cl
@@ -14,11 +14,11 @@
#define DGST_R3 3
#include "include/kernel_functions.c"
-#include "types_ocl.c"
-#include "common.c"
+#include "OpenCL/types_ocl.c"
+#include "OpenCL/common.c"
-#define COMPARE_S "check_single_comp4.c"
-#define COMPARE_M "check_multi_comp4.c"
+#define COMPARE_S "OpenCL/check_single_comp4.c"
+#define COMPARE_M "OpenCL/check_multi_comp4.c"
__constant u32 lotus_magic_table[256] =
{
diff --git a/OpenCL/m08800.cl b/OpenCL/m08800.cl
index e3568ef57..20b060aec 100644
--- a/OpenCL/m08800.cl
+++ b/OpenCL/m08800.cl
@@ -14,8 +14,8 @@
#define DGST_R3 3
#include "include/kernel_functions.c"
-#include "types_ocl.c"
-#include "common.c"
+#include "OpenCL/types_ocl.c"
+#include "OpenCL/common.c"
__constant u32 te0[256] =
{
diff --git a/OpenCL/m08900.cl b/OpenCL/m08900.cl
index a07f75df2..6ff7a912b 100644
--- a/OpenCL/m08900.cl
+++ b/OpenCL/m08900.cl
@@ -14,11 +14,11 @@
#define DGST_R3 3
#include "include/kernel_functions.c"
-#include "types_ocl.c"
-#include "common.c"
+#include "OpenCL/types_ocl.c"
+#include "OpenCL/common.c"
-#define COMPARE_S "check_single_comp4.c"
-#define COMPARE_M "check_multi_comp4.c"
+#define COMPARE_S "OpenCL/check_single_comp4.c"
+#define COMPARE_M "OpenCL/check_multi_comp4.c"
__constant u32 k_sha256[64] =
{
diff --git a/OpenCL/m09000.cl b/OpenCL/m09000.cl
index d5d053908..d79e77e3c 100644
--- a/OpenCL/m09000.cl
+++ b/OpenCL/m09000.cl
@@ -14,11 +14,11 @@
#define DGST_R3 3
#include "include/kernel_functions.c"
-#include "types_ocl.c"
-#include "common.c"
+#include "OpenCL/types_ocl.c"
+#include "OpenCL/common.c"
-#define COMPARE_S "check_single_comp4.c"
-#define COMPARE_M "check_multi_comp4.c"
+#define COMPARE_S "OpenCL/check_single_comp4.c"
+#define COMPARE_M "OpenCL/check_multi_comp4.c"
// http://www.schneier.com/code/constants.txt
diff --git a/OpenCL/m09100.cl b/OpenCL/m09100.cl
index 293f9a1f6..7a25de6cb 100644
--- a/OpenCL/m09100.cl
+++ b/OpenCL/m09100.cl
@@ -17,11 +17,11 @@
#undef _SHA1_
-#include "types_ocl.c"
-#include "common.c"
+#include "OpenCL/types_ocl.c"
+#include "OpenCL/common.c"
-#define COMPARE_S "check_single_comp4.c"
-#define COMPARE_M "check_multi_comp4.c"
+#define COMPARE_S "OpenCL/check_single_comp4.c"
+#define COMPARE_M "OpenCL/check_multi_comp4.c"
__constant char lotus64_table[] = "0123456789ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz+/";
diff --git a/OpenCL/m09400.cl b/OpenCL/m09400.cl
index 7c0e10ac4..f585d8aed 100644
--- a/OpenCL/m09400.cl
+++ b/OpenCL/m09400.cl
@@ -14,11 +14,11 @@
#define DGST_R3 3
#include "include/kernel_functions.c"
-#include "types_ocl.c"
-#include "common.c"
+#include "OpenCL/types_ocl.c"
+#include "OpenCL/common.c"
-#define COMPARE_S "check_single_comp4.c"
-#define COMPARE_M "check_multi_comp4.c"
+#define COMPARE_S "OpenCL/check_single_comp4.c"
+#define COMPARE_M "OpenCL/check_multi_comp4.c"
__constant u32 te0[256] =
{
diff --git a/OpenCL/m09500.cl b/OpenCL/m09500.cl
index 5d92a6fd5..45023d6f3 100644
--- a/OpenCL/m09500.cl
+++ b/OpenCL/m09500.cl
@@ -14,11 +14,11 @@
#define DGST_R3 3
#include "include/kernel_functions.c"
-#include "types_ocl.c"
-#include "common.c"
+#include "OpenCL/types_ocl.c"
+#include "OpenCL/common.c"
-#define COMPARE_S "check_single_comp4.c"
-#define COMPARE_M "check_multi_comp4.c"
+#define COMPARE_S "OpenCL/check_single_comp4.c"
+#define COMPARE_M "OpenCL/check_multi_comp4.c"
__constant u32 te0[256] =
{
diff --git a/OpenCL/m09600.cl b/OpenCL/m09600.cl
index 3e61effa2..25a0332b1 100644
--- a/OpenCL/m09600.cl
+++ b/OpenCL/m09600.cl
@@ -14,11 +14,11 @@
#define DGST_R3 3
#include "include/kernel_functions.c"
-#include "types_ocl.c"
-#include "common.c"
+#include "OpenCL/types_ocl.c"
+#include "OpenCL/common.c"
-#define COMPARE_S "check_single_comp4.c"
-#define COMPARE_M "check_multi_comp4.c"
+#define COMPARE_S "OpenCL/check_single_comp4.c"
+#define COMPARE_M "OpenCL/check_multi_comp4.c"
__constant u32 te0[256] =
{
diff --git a/OpenCL/m09700_a0.cl b/OpenCL/m09700_a0.cl
index 22ef2a49e..1b32c8a6e 100644
--- a/OpenCL/m09700_a0.cl
+++ b/OpenCL/m09700_a0.cl
@@ -14,13 +14,13 @@
#define DGST_R3 3
#include "include/kernel_functions.c"
-#include "types_ocl.c"
-#include "common.c"
+#include "OpenCL/types_ocl.c"
+#include "OpenCL/common.c"
#include "include/rp_gpu.h"
#include "rp.c"
-#define COMPARE_S "check_single_comp4.c"
-#define COMPARE_M "check_multi_comp4.c"
+#define COMPARE_S "OpenCL/check_single_comp4.c"
+#define COMPARE_M "OpenCL/check_multi_comp4.c"
typedef struct
{
diff --git a/OpenCL/m09700_a1.cl b/OpenCL/m09700_a1.cl
index 3bfdcf593..be1b7d2b0 100644
--- a/OpenCL/m09700_a1.cl
+++ b/OpenCL/m09700_a1.cl
@@ -14,11 +14,11 @@
#define DGST_R3 3
#include "include/kernel_functions.c"
-#include "types_ocl.c"
-#include "common.c"
+#include "OpenCL/types_ocl.c"
+#include "OpenCL/common.c"
-#define COMPARE_S "check_single_comp4.c"
-#define COMPARE_M "check_multi_comp4.c"
+#define COMPARE_S "OpenCL/check_single_comp4.c"
+#define COMPARE_M "OpenCL/check_multi_comp4.c"
typedef struct
{
diff --git a/OpenCL/m09700_a3.cl b/OpenCL/m09700_a3.cl
index 10b2a487d..219e08103 100644
--- a/OpenCL/m09700_a3.cl
+++ b/OpenCL/m09700_a3.cl
@@ -14,11 +14,11 @@
#define DGST_R3 3
#include "include/kernel_functions.c"
-#include "types_ocl.c"
-#include "common.c"
+#include "OpenCL/types_ocl.c"
+#include "OpenCL/common.c"
-#define COMPARE_S "check_single_comp4.c"
-#define COMPARE_M "check_multi_comp4.c"
+#define COMPARE_S "OpenCL/check_single_comp4.c"
+#define COMPARE_M "OpenCL/check_multi_comp4.c"
typedef struct
{
diff --git a/OpenCL/m09710_a0.cl b/OpenCL/m09710_a0.cl
index 5febbbef5..e0020b19e 100644
--- a/OpenCL/m09710_a0.cl
+++ b/OpenCL/m09710_a0.cl
@@ -14,13 +14,13 @@
#define DGST_R3 3
#include "include/kernel_functions.c"
-#include "types_ocl.c"
-#include "common.c"
+#include "OpenCL/types_ocl.c"
+#include "OpenCL/common.c"
#include "include/rp_gpu.h"
#include "rp.c"
-#define COMPARE_S "check_single_comp4.c"
-#define COMPARE_M "check_multi_comp4.c"
+#define COMPARE_S "OpenCL/check_single_comp4.c"
+#define COMPARE_M "OpenCL/check_multi_comp4.c"
typedef struct
{
diff --git a/OpenCL/m09710_a1.cl b/OpenCL/m09710_a1.cl
index 97f889759..94763f35d 100644
--- a/OpenCL/m09710_a1.cl
+++ b/OpenCL/m09710_a1.cl
@@ -14,11 +14,11 @@
#define DGST_R3 3
#include "include/kernel_functions.c"
-#include "types_ocl.c"
-#include "common.c"
+#include "OpenCL/types_ocl.c"
+#include "OpenCL/common.c"
-#define COMPARE_S "check_single_comp4.c"
-#define COMPARE_M "check_multi_comp4.c"
+#define COMPARE_S "OpenCL/check_single_comp4.c"
+#define COMPARE_M "OpenCL/check_multi_comp4.c"
typedef struct
{
diff --git a/OpenCL/m09710_a3.cl b/OpenCL/m09710_a3.cl
index e07607df2..1a7f2fb00 100644
--- a/OpenCL/m09710_a3.cl
+++ b/OpenCL/m09710_a3.cl
@@ -14,11 +14,11 @@
#define DGST_R3 3
#include "include/kernel_functions.c"
-#include "types_ocl.c"
-#include "common.c"
+#include "OpenCL/types_ocl.c"
+#include "OpenCL/common.c"
-#define COMPARE_S "check_single_comp4.c"
-#define COMPARE_M "check_multi_comp4.c"
+#define COMPARE_S "OpenCL/check_single_comp4.c"
+#define COMPARE_M "OpenCL/check_multi_comp4.c"
typedef struct
{
diff --git a/OpenCL/m09720_a0.cl b/OpenCL/m09720_a0.cl
index d03155255..52768c720 100644
--- a/OpenCL/m09720_a0.cl
+++ b/OpenCL/m09720_a0.cl
@@ -14,13 +14,13 @@
#define DGST_R3 3
#include "include/kernel_functions.c"
-#include "types_ocl.c"
-#include "common.c"
+#include "OpenCL/types_ocl.c"
+#include "OpenCL/common.c"
#include "include/rp_gpu.h"
#include "rp.c"
-#define COMPARE_S "check_single_comp4.c"
-#define COMPARE_M "check_multi_comp4.c"
+#define COMPARE_S "OpenCL/check_single_comp4.c"
+#define COMPARE_M "OpenCL/check_multi_comp4.c"
static void md5_transform (const u32 w0[4], const u32 w1[4], const u32 w2[4], const u32 w3[4], u32 digest[4])
{
diff --git a/OpenCL/m09720_a1.cl b/OpenCL/m09720_a1.cl
index 63e89973b..d0081cf65 100644
--- a/OpenCL/m09720_a1.cl
+++ b/OpenCL/m09720_a1.cl
@@ -14,11 +14,11 @@
#define DGST_R3 3
#include "include/kernel_functions.c"
-#include "types_ocl.c"
-#include "common.c"
+#include "OpenCL/types_ocl.c"
+#include "OpenCL/common.c"
-#define COMPARE_S "check_single_comp4.c"
-#define COMPARE_M "check_multi_comp4.c"
+#define COMPARE_S "OpenCL/check_single_comp4.c"
+#define COMPARE_M "OpenCL/check_multi_comp4.c"
static void md5_transform (const u32 w0[4], const u32 w1[4], const u32 w2[4], const u32 w3[4], u32 digest[4])
{
diff --git a/OpenCL/m09720_a3.cl b/OpenCL/m09720_a3.cl
index bd624b356..685ea056d 100644
--- a/OpenCL/m09720_a3.cl
+++ b/OpenCL/m09720_a3.cl
@@ -14,11 +14,11 @@
#define DGST_R3 3
#include "include/kernel_functions.c"
-#include "types_ocl.c"
-#include "common.c"
+#include "OpenCL/types_ocl.c"
+#include "OpenCL/common.c"
-#define COMPARE_S "check_single_comp4.c"
-#define COMPARE_M "check_multi_comp4.c"
+#define COMPARE_S "OpenCL/check_single_comp4.c"
+#define COMPARE_M "OpenCL/check_multi_comp4.c"
static void md5_transform (const u32 w0[4], const u32 w1[4], const u32 w2[4], const u32 w3[4], u32 digest[4])
{
diff --git a/OpenCL/m09800_a0.cl b/OpenCL/m09800_a0.cl
index a66815a88..515099907 100644
--- a/OpenCL/m09800_a0.cl
+++ b/OpenCL/m09800_a0.cl
@@ -14,13 +14,13 @@
#define DGST_R3 3
#include "include/kernel_functions.c"
-#include "types_ocl.c"
-#include "common.c"
+#include "OpenCL/types_ocl.c"
+#include "OpenCL/common.c"
#include "include/rp_gpu.h"
#include "rp.c"
-#define COMPARE_S "check_single_comp4.c"
-#define COMPARE_M "check_multi_comp4.c"
+#define COMPARE_S "OpenCL/check_single_comp4.c"
+#define COMPARE_M "OpenCL/check_multi_comp4.c"
typedef struct
{
diff --git a/OpenCL/m09800_a1.cl b/OpenCL/m09800_a1.cl
index 96a3b06f5..5ab92f3bd 100644
--- a/OpenCL/m09800_a1.cl
+++ b/OpenCL/m09800_a1.cl
@@ -14,11 +14,11 @@
#define DGST_R3 3
#include "include/kernel_functions.c"
-#include "types_ocl.c"
-#include "common.c"
+#include "OpenCL/types_ocl.c"
+#include "OpenCL/common.c"
-#define COMPARE_S "check_single_comp4.c"
-#define COMPARE_M "check_multi_comp4.c"
+#define COMPARE_S "OpenCL/check_single_comp4.c"
+#define COMPARE_M "OpenCL/check_multi_comp4.c"
typedef struct
{
diff --git a/OpenCL/m09800_a3.cl b/OpenCL/m09800_a3.cl
index 67790a183..99ba332d3 100644
--- a/OpenCL/m09800_a3.cl
+++ b/OpenCL/m09800_a3.cl
@@ -14,11 +14,11 @@
#define DGST_R3 3
#include "include/kernel_functions.c"
-#include "types_ocl.c"
-#include "common.c"
+#include "OpenCL/types_ocl.c"
+#include "OpenCL/common.c"
-#define COMPARE_S "check_single_comp4.c"
-#define COMPARE_M "check_multi_comp4.c"
+#define COMPARE_S "OpenCL/check_single_comp4.c"
+#define COMPARE_M "OpenCL/check_multi_comp4.c"
typedef struct
{
diff --git a/OpenCL/m09810_a0.cl b/OpenCL/m09810_a0.cl
index 67fc6f3c2..d99ca31f3 100644
--- a/OpenCL/m09810_a0.cl
+++ b/OpenCL/m09810_a0.cl
@@ -14,13 +14,13 @@
#define DGST_R3 3
#include "include/kernel_functions.c"
-#include "types_ocl.c"
-#include "common.c"
+#include "OpenCL/types_ocl.c"
+#include "OpenCL/common.c"
#include "include/rp_gpu.h"
#include "rp.c"
-#define COMPARE_S "check_single_comp4.c"
-#define COMPARE_M "check_multi_comp4.c"
+#define COMPARE_S "OpenCL/check_single_comp4.c"
+#define COMPARE_M "OpenCL/check_multi_comp4.c"
typedef struct
{
diff --git a/OpenCL/m09810_a1.cl b/OpenCL/m09810_a1.cl
index f09f743e6..309564ce9 100644
--- a/OpenCL/m09810_a1.cl
+++ b/OpenCL/m09810_a1.cl
@@ -14,11 +14,11 @@
#define DGST_R3 3
#include "include/kernel_functions.c"
-#include "types_ocl.c"
-#include "common.c"
+#include "OpenCL/types_ocl.c"
+#include "OpenCL/common.c"
-#define COMPARE_S "check_single_comp4.c"
-#define COMPARE_M "check_multi_comp4.c"
+#define COMPARE_S "OpenCL/check_single_comp4.c"
+#define COMPARE_M "OpenCL/check_multi_comp4.c"
typedef struct
{
diff --git a/OpenCL/m09810_a3.cl b/OpenCL/m09810_a3.cl
index 6efc2258c..195752f30 100644
--- a/OpenCL/m09810_a3.cl
+++ b/OpenCL/m09810_a3.cl
@@ -14,11 +14,11 @@
#define DGST_R3 3
#include "include/kernel_functions.c"
-#include "types_ocl.c"
-#include "common.c"
+#include "OpenCL/types_ocl.c"
+#include "OpenCL/common.c"
-#define COMPARE_S "check_single_comp4.c"
-#define COMPARE_M "check_multi_comp4.c"
+#define COMPARE_S "OpenCL/check_single_comp4.c"
+#define COMPARE_M "OpenCL/check_multi_comp4.c"
typedef struct
{
diff --git a/OpenCL/m09820_a0.cl b/OpenCL/m09820_a0.cl
index 1ead01eaa..8448b2738 100644
--- a/OpenCL/m09820_a0.cl
+++ b/OpenCL/m09820_a0.cl
@@ -14,13 +14,13 @@
#define DGST_R3 3
#include "include/kernel_functions.c"
-#include "types_ocl.c"
-#include "common.c"
+#include "OpenCL/types_ocl.c"
+#include "OpenCL/common.c"
#include "include/rp_gpu.h"
#include "rp.c"
-#define COMPARE_S "check_single_comp4.c"
-#define COMPARE_M "check_multi_comp4.c"
+#define COMPARE_S "OpenCL/check_single_comp4.c"
+#define COMPARE_M "OpenCL/check_multi_comp4.c"
static void sha1_transform (const u32 w0[4], const u32 w1[4], const u32 w2[4], const u32 w3[4], u32 digest[5])
{
diff --git a/OpenCL/m09820_a1.cl b/OpenCL/m09820_a1.cl
index 2e4cae665..947b0762c 100644
--- a/OpenCL/m09820_a1.cl
+++ b/OpenCL/m09820_a1.cl
@@ -14,11 +14,11 @@
#define DGST_R3 3
#include "include/kernel_functions.c"
-#include "types_ocl.c"
-#include "common.c"
+#include "OpenCL/types_ocl.c"
+#include "OpenCL/common.c"
-#define COMPARE_S "check_single_comp4.c"
-#define COMPARE_M "check_multi_comp4.c"
+#define COMPARE_S "OpenCL/check_single_comp4.c"
+#define COMPARE_M "OpenCL/check_multi_comp4.c"
static void sha1_transform (const u32 w0[4], const u32 w1[4], const u32 w2[4], const u32 w3[4], u32 digest[5])
{
diff --git a/OpenCL/m09820_a3.cl b/OpenCL/m09820_a3.cl
index 46bf9eb77..e844e0785 100644
--- a/OpenCL/m09820_a3.cl
+++ b/OpenCL/m09820_a3.cl
@@ -14,11 +14,11 @@
#define DGST_R3 3
#include "include/kernel_functions.c"
-#include "types_ocl.c"
-#include "common.c"
+#include "OpenCL/types_ocl.c"
+#include "OpenCL/common.c"
-#define COMPARE_S "check_single_comp4.c"
-#define COMPARE_M "check_multi_comp4.c"
+#define COMPARE_S "OpenCL/check_single_comp4.c"
+#define COMPARE_M "OpenCL/check_multi_comp4.c"
static void sha1_transform (const u32 w0[4], const u32 w1[4], const u32 w2[4], const u32 w3[4], u32 digest[5])
{
diff --git a/OpenCL/m09900_a0.cl b/OpenCL/m09900_a0.cl
index eb222bcfc..e0ad6e30e 100644
--- a/OpenCL/m09900_a0.cl
+++ b/OpenCL/m09900_a0.cl
@@ -14,13 +14,13 @@
#define DGST_R3 1
#include "include/kernel_functions.c"
-#include "types_ocl.c"
-#include "common.c"
+#include "OpenCL/types_ocl.c"
+#include "OpenCL/common.c"
#include "include/rp_gpu.h"
#include "rp.c"
-#define COMPARE_S "check_single_comp4.c"
-#define COMPARE_M "check_multi_comp4.c"
+#define COMPARE_S "OpenCL/check_single_comp4.c"
+#define COMPARE_M "OpenCL/check_multi_comp4.c"
__kernel void __attribute__((reqd_work_group_size (64, 1, 1))) m09900_m04 (__global pw_t *pws, __global gpu_rule_t * rules_buf, __global comb_t *combs_buf, __global bf_t *bfs_buf, __global void *tmps, __global void *hooks, __global u32 *bitmaps_buf_s1_a, __global u32 *bitmaps_buf_s1_b, __global u32 *bitmaps_buf_s1_c, __global u32 *bitmaps_buf_s1_d, __global u32 *bitmaps_buf_s2_a, __global u32 *bitmaps_buf_s2_b, __global u32 *bitmaps_buf_s2_c, __global u32 *bitmaps_buf_s2_d, __global plain_t *plains_buf, __global digest_t *digests_buf, __global u32 *hashes_shown, __global salt_t *salt_bufs, __global void *esalt_bufs, __global u32 *d_return_buf, __global u32 *d_scryptV_buf, const u32 bitmap_mask, const u32 bitmap_shift1, const u32 bitmap_shift2, const u32 salt_pos, const u32 loop_pos, const u32 loop_cnt, const u32 rules_cnt, const u32 digests_cnt, const u32 digests_offset, const u32 combs_mode, const u32 gid_max)
{
diff --git a/OpenCL/m09900_a1.cl b/OpenCL/m09900_a1.cl
index 8dbeb6ffc..9f9c6334c 100644
--- a/OpenCL/m09900_a1.cl
+++ b/OpenCL/m09900_a1.cl
@@ -14,11 +14,11 @@
#define DGST_R3 1
#include "include/kernel_functions.c"
-#include "types_ocl.c"
-#include "common.c"
+#include "OpenCL/types_ocl.c"
+#include "OpenCL/common.c"
-#define COMPARE_S "check_single_comp4.c"
-#define COMPARE_M "check_multi_comp4.c"
+#define COMPARE_S "OpenCL/check_single_comp4.c"
+#define COMPARE_M "OpenCL/check_multi_comp4.c"
__kernel void __attribute__((reqd_work_group_size (64, 1, 1))) m09900_m04 (__global pw_t *pws, __global gpu_rule_t *rules_buf, __global comb_t *combs_buf, __global bf_t *bfs_buf, __global void *tmps, __global void *hooks, __global u32 *bitmaps_buf_s1_a, __global u32 *bitmaps_buf_s1_b, __global u32 *bitmaps_buf_s1_c, __global u32 *bitmaps_buf_s1_d, __global u32 *bitmaps_buf_s2_a, __global u32 *bitmaps_buf_s2_b, __global u32 *bitmaps_buf_s2_c, __global u32 *bitmaps_buf_s2_d, __global plain_t *plains_buf, __global digest_t *digests_buf, __global u32 *hashes_shown, __global salt_t *salt_bufs, __global void *esalt_bufs, __global u32 *d_return_buf, __global u32 *d_scryptV_buf, const u32 bitmap_mask, const u32 bitmap_shift1, const u32 bitmap_shift2, const u32 salt_pos, const u32 loop_pos, const u32 loop_cnt, const u32 combs_cnt, const u32 digests_cnt, const u32 digests_offset, const u32 combs_mode, const u32 gid_max)
{
diff --git a/OpenCL/m09900_a3.cl b/OpenCL/m09900_a3.cl
index 83c06dc41..3690ee5ff 100644
--- a/OpenCL/m09900_a3.cl
+++ b/OpenCL/m09900_a3.cl
@@ -14,11 +14,11 @@
#define DGST_R3 1
#include "include/kernel_functions.c"
-#include "types_ocl.c"
-#include "common.c"
+#include "OpenCL/types_ocl.c"
+#include "OpenCL/common.c"
-#define COMPARE_S "check_single_comp4.c"
-#define COMPARE_M "check_multi_comp4.c"
+#define COMPARE_S "OpenCL/check_single_comp4.c"
+#define COMPARE_M "OpenCL/check_multi_comp4.c"
static void m09900m (u32 w[16], const u32 pw_len, __global pw_t *pws, __global gpu_rule_t *rules_buf, __global comb_t *combs_buf, __constant u32 * words_buf_r, __global void *tmps, __global void *hooks, __global u32 *bitmaps_buf_s1_a, __global u32 *bitmaps_buf_s1_b, __global u32 *bitmaps_buf_s1_c, __global u32 *bitmaps_buf_s1_d, __global u32 *bitmaps_buf_s2_a, __global u32 *bitmaps_buf_s2_b, __global u32 *bitmaps_buf_s2_c, __global u32 *bitmaps_buf_s2_d, __global plain_t *plains_buf, __global digest_t *digests_buf, __global u32 *hashes_shown, __global salt_t *salt_bufs, __global void *esalt_bufs, __global u32 *d_return_buf, __global u32 *d_scryptV_buf, const u32 bitmap_mask, const u32 bitmap_shift1, const u32 bitmap_shift2, const u32 salt_pos, const u32 loop_pos, const u32 loop_cnt, const u32 bfs_cnt, const u32 digests_cnt, const u32 digests_offset)
{
diff --git a/OpenCL/m10100_a0.cl b/OpenCL/m10100_a0.cl
index 902099ecb..833dfa40b 100644
--- a/OpenCL/m10100_a0.cl
+++ b/OpenCL/m10100_a0.cl
@@ -14,13 +14,13 @@
#define DGST_R3 3
#include "include/kernel_functions.c"
-#include "types_ocl.c"
-#include "common.c"
+#include "OpenCL/types_ocl.c"
+#include "OpenCL/common.c"
#include "include/rp_gpu.h"
#include "rp.c"
-#define COMPARE_S "check_single_comp4.c"
-#define COMPARE_M "check_multi_comp4.c"
+#define COMPARE_S "OpenCL/check_single_comp4.c"
+#define COMPARE_M "OpenCL/check_multi_comp4.c"
#define SIPROUND(v0,v1,v2,v3) \
(v0) += (v1); \
diff --git a/OpenCL/m10100_a1.cl b/OpenCL/m10100_a1.cl
index d35224f06..5eee78ecb 100644
--- a/OpenCL/m10100_a1.cl
+++ b/OpenCL/m10100_a1.cl
@@ -14,11 +14,11 @@
#define DGST_R3 3
#include "include/kernel_functions.c"
-#include "types_ocl.c"
-#include "common.c"
+#include "OpenCL/types_ocl.c"
+#include "OpenCL/common.c"
-#define COMPARE_S "check_single_comp4.c"
-#define COMPARE_M "check_multi_comp4.c"
+#define COMPARE_S "OpenCL/check_single_comp4.c"
+#define COMPARE_M "OpenCL/check_multi_comp4.c"
#define SIPROUND(v0,v1,v2,v3) \
(v0) += (v1); \
diff --git a/OpenCL/m10100_a3.cl b/OpenCL/m10100_a3.cl
index 51e939387..a3cb1cfd2 100644
--- a/OpenCL/m10100_a3.cl
+++ b/OpenCL/m10100_a3.cl
@@ -14,11 +14,11 @@
#define DGST_R3 3
#include "include/kernel_functions.c"
-#include "types_ocl.c"
-#include "common.c"
+#include "OpenCL/types_ocl.c"
+#include "OpenCL/common.c"
-#define COMPARE_S "check_single_comp4.c"
-#define COMPARE_M "check_multi_comp4.c"
+#define COMPARE_S "OpenCL/check_single_comp4.c"
+#define COMPARE_M "OpenCL/check_multi_comp4.c"
#define SIPROUND(v0,v1,v2,v3) \
(v0) += (v1); \
diff --git a/OpenCL/m10300.cl b/OpenCL/m10300.cl
index ca528abce..9aa854cbc 100644
--- a/OpenCL/m10300.cl
+++ b/OpenCL/m10300.cl
@@ -14,11 +14,11 @@
#define DGST_R3 3
#include "include/kernel_functions.c"
-#include "types_ocl.c"
-#include "common.c"
+#include "OpenCL/types_ocl.c"
+#include "OpenCL/common.c"
-#define COMPARE_S "check_single_comp4.c"
-#define COMPARE_M "check_multi_comp4.c"
+#define COMPARE_S "OpenCL/check_single_comp4.c"
+#define COMPARE_M "OpenCL/check_multi_comp4.c"
static void sha1_transform (const u32 w0[4], const u32 w1[4], const u32 w2[4], const u32 w3[4], u32 digest[5])
{
diff --git a/OpenCL/m10400_a0.cl b/OpenCL/m10400_a0.cl
index 0b9e38fa0..f731b8f2e 100644
--- a/OpenCL/m10400_a0.cl
+++ b/OpenCL/m10400_a0.cl
@@ -14,13 +14,13 @@
#define DGST_R3 3
#include "include/kernel_functions.c"
-#include "types_ocl.c"
-#include "common.c"
+#include "OpenCL/types_ocl.c"
+#include "OpenCL/common.c"
#include "include/rp_gpu.h"
#include "rp.c"
-#define COMPARE_S "check_single_comp4.c"
-#define COMPARE_M "check_multi_comp4.c"
+#define COMPARE_S "OpenCL/check_single_comp4.c"
+#define COMPARE_M "OpenCL/check_multi_comp4.c"
__constant u32 padding[8] =
{
diff --git a/OpenCL/m10400_a1.cl b/OpenCL/m10400_a1.cl
index 2acdda618..c00ecc770 100644
--- a/OpenCL/m10400_a1.cl
+++ b/OpenCL/m10400_a1.cl
@@ -14,11 +14,11 @@
#define DGST_R3 3
#include "include/kernel_functions.c"
-#include "types_ocl.c"
-#include "common.c"
+#include "OpenCL/types_ocl.c"
+#include "OpenCL/common.c"
-#define COMPARE_S "check_single_comp4.c"
-#define COMPARE_M "check_multi_comp4.c"
+#define COMPARE_S "OpenCL/check_single_comp4.c"
+#define COMPARE_M "OpenCL/check_multi_comp4.c"
__constant u32 padding[8] =
{
diff --git a/OpenCL/m10400_a3.cl b/OpenCL/m10400_a3.cl
index 84312752a..e32ea4bc5 100644
--- a/OpenCL/m10400_a3.cl
+++ b/OpenCL/m10400_a3.cl
@@ -14,11 +14,11 @@
#define DGST_R3 3
#include "include/kernel_functions.c"
-#include "types_ocl.c"
-#include "common.c"
+#include "OpenCL/types_ocl.c"
+#include "OpenCL/common.c"
-#define COMPARE_S "check_single_comp4.c"
-#define COMPARE_M "check_multi_comp4.c"
+#define COMPARE_S "OpenCL/check_single_comp4.c"
+#define COMPARE_M "OpenCL/check_multi_comp4.c"
__constant u32 padding[8] =
{
diff --git a/OpenCL/m10410_a0.cl b/OpenCL/m10410_a0.cl
index 8aeb16923..a8a873d01 100644
--- a/OpenCL/m10410_a0.cl
+++ b/OpenCL/m10410_a0.cl
@@ -14,13 +14,13 @@
#define DGST_R3 3
#include "include/kernel_functions.c"
-#include "types_ocl.c"
-#include "common.c"
+#include "OpenCL/types_ocl.c"
+#include "OpenCL/common.c"
#include "include/rp_gpu.h"
#include "rp.c"
-#define COMPARE_S "check_single_comp4.c"
-#define COMPARE_M "check_multi_comp4.c"
+#define COMPARE_S "OpenCL/check_single_comp4.c"
+#define COMPARE_M "OpenCL/check_multi_comp4.c"
__constant u32 padding[8] =
{
diff --git a/OpenCL/m10410_a1.cl b/OpenCL/m10410_a1.cl
index be447e7e5..dcf108d42 100644
--- a/OpenCL/m10410_a1.cl
+++ b/OpenCL/m10410_a1.cl
@@ -14,11 +14,11 @@
#define DGST_R3 3
#include "include/kernel_functions.c"
-#include "types_ocl.c"
-#include "common.c"
+#include "OpenCL/types_ocl.c"
+#include "OpenCL/common.c"
-#define COMPARE_S "check_single_comp4.c"
-#define COMPARE_M "check_multi_comp4.c"
+#define COMPARE_S "OpenCL/check_single_comp4.c"
+#define COMPARE_M "OpenCL/check_multi_comp4.c"
__constant u32 padding[8] =
{
diff --git a/OpenCL/m10410_a3.cl b/OpenCL/m10410_a3.cl
index e2de9d75b..354a3cae5 100644
--- a/OpenCL/m10410_a3.cl
+++ b/OpenCL/m10410_a3.cl
@@ -14,11 +14,11 @@
#define DGST_R3 3
#include "include/kernel_functions.c"
-#include "types_ocl.c"
-#include "common.c"
+#include "OpenCL/types_ocl.c"
+#include "OpenCL/common.c"
-#define COMPARE_S "check_single_comp4.c"
-#define COMPARE_M "check_multi_comp4.c"
+#define COMPARE_S "OpenCL/check_single_comp4.c"
+#define COMPARE_M "OpenCL/check_multi_comp4.c"
__constant u32 padding[8] =
{
diff --git a/OpenCL/m10420_a0.cl b/OpenCL/m10420_a0.cl
index 65f17c5e9..5de64efed 100644
--- a/OpenCL/m10420_a0.cl
+++ b/OpenCL/m10420_a0.cl
@@ -14,13 +14,13 @@
#define DGST_R3 3
#include "include/kernel_functions.c"
-#include "types_ocl.c"
-#include "common.c"
+#include "OpenCL/types_ocl.c"
+#include "OpenCL/common.c"
#include "include/rp_gpu.h"
#include "rp.c"
-#define COMPARE_S "check_single_comp4.c"
-#define COMPARE_M "check_multi_comp4.c"
+#define COMPARE_S "OpenCL/check_single_comp4.c"
+#define COMPARE_M "OpenCL/check_multi_comp4.c"
__constant u32 padding[8] =
{
diff --git a/OpenCL/m10420_a1.cl b/OpenCL/m10420_a1.cl
index f83c5dcf5..007b7956c 100644
--- a/OpenCL/m10420_a1.cl
+++ b/OpenCL/m10420_a1.cl
@@ -14,11 +14,11 @@
#define DGST_R3 3
#include "include/kernel_functions.c"
-#include "types_ocl.c"
-#include "common.c"
+#include "OpenCL/types_ocl.c"
+#include "OpenCL/common.c"
-#define COMPARE_S "check_single_comp4.c"
-#define COMPARE_M "check_multi_comp4.c"
+#define COMPARE_S "OpenCL/check_single_comp4.c"
+#define COMPARE_M "OpenCL/check_multi_comp4.c"
__constant u32 padding[8] =
{
diff --git a/OpenCL/m10420_a3.cl b/OpenCL/m10420_a3.cl
index f7db02693..922f717b5 100644
--- a/OpenCL/m10420_a3.cl
+++ b/OpenCL/m10420_a3.cl
@@ -14,11 +14,11 @@
#define DGST_R3 3
#include "include/kernel_functions.c"
-#include "types_ocl.c"
-#include "common.c"
+#include "OpenCL/types_ocl.c"
+#include "OpenCL/common.c"
-#define COMPARE_S "check_single_comp4.c"
-#define COMPARE_M "check_multi_comp4.c"
+#define COMPARE_S "OpenCL/check_single_comp4.c"
+#define COMPARE_M "OpenCL/check_multi_comp4.c"
__constant u32 padding[8] =
{
diff --git a/OpenCL/m10500.cl b/OpenCL/m10500.cl
index bb032d84e..66369a098 100644
--- a/OpenCL/m10500.cl
+++ b/OpenCL/m10500.cl
@@ -14,11 +14,11 @@
#define DGST_R3 3
#include "include/kernel_functions.c"
-#include "types_ocl.c"
-#include "common.c"
+#include "OpenCL/types_ocl.c"
+#include "OpenCL/common.c"
-#define COMPARE_S "check_single_comp4.c"
-#define COMPARE_M "check_multi_comp4.c"
+#define COMPARE_S "OpenCL/check_single_comp4.c"
+#define COMPARE_M "OpenCL/check_multi_comp4.c"
__constant u32 padding[8] =
{
diff --git a/OpenCL/m10700.cl b/OpenCL/m10700.cl
index c00d2024f..f617cfb41 100644
--- a/OpenCL/m10700.cl
+++ b/OpenCL/m10700.cl
@@ -14,11 +14,11 @@
#define DGST_R3 3
#include "include/kernel_functions.c"
-#include "types_ocl.c"
-#include "common.c"
+#include "OpenCL/types_ocl.c"
+#include "OpenCL/common.c"
-#define COMPARE_S "check_single_comp4.c"
-#define COMPARE_M "check_multi_comp4.c"
+#define COMPARE_S "OpenCL/check_single_comp4.c"
+#define COMPARE_M "OpenCL/check_multi_comp4.c"
typedef struct
{
diff --git a/OpenCL/m10800_a0.cl b/OpenCL/m10800_a0.cl
index 7db896ff8..3c3fbcec6 100644
--- a/OpenCL/m10800_a0.cl
+++ b/OpenCL/m10800_a0.cl
@@ -14,13 +14,13 @@
#define DGST_R3 5
#include "include/kernel_functions.c"
-#include "types_ocl.c"
-#include "common.c"
+#include "OpenCL/types_ocl.c"
+#include "OpenCL/common.c"
#include "include/rp_gpu.h"
#include "rp.c"
-#define COMPARE_S "check_single_comp4.c"
-#define COMPARE_M "check_multi_comp4.c"
+#define COMPARE_S "OpenCL/check_single_comp4.c"
+#define COMPARE_M "OpenCL/check_multi_comp4.c"
__constant u64 k_sha384[80] =
{
diff --git a/OpenCL/m10800_a1.cl b/OpenCL/m10800_a1.cl
index 0b26a4696..df32b8be5 100644
--- a/OpenCL/m10800_a1.cl
+++ b/OpenCL/m10800_a1.cl
@@ -14,11 +14,11 @@
#define DGST_R3 5
#include "include/kernel_functions.c"
-#include "types_ocl.c"
-#include "common.c"
+#include "OpenCL/types_ocl.c"
+#include "OpenCL/common.c"
-#define COMPARE_S "check_single_comp4.c"
-#define COMPARE_M "check_multi_comp4.c"
+#define COMPARE_S "OpenCL/check_single_comp4.c"
+#define COMPARE_M "OpenCL/check_multi_comp4.c"
__constant u64 k_sha384[80] =
{
diff --git a/OpenCL/m10800_a3.cl b/OpenCL/m10800_a3.cl
index e055d7539..42ef41cf0 100644
--- a/OpenCL/m10800_a3.cl
+++ b/OpenCL/m10800_a3.cl
@@ -14,11 +14,11 @@
#define DGST_R3 5
#include "include/kernel_functions.c"
-#include "types_ocl.c"
-#include "common.c"
+#include "OpenCL/types_ocl.c"
+#include "OpenCL/common.c"
-#define COMPARE_S "check_single_comp4.c"
-#define COMPARE_M "check_multi_comp4.c"
+#define COMPARE_S "OpenCL/check_single_comp4.c"
+#define COMPARE_M "OpenCL/check_multi_comp4.c"
__constant u64 k_sha384[80] =
{
diff --git a/OpenCL/m10900.cl b/OpenCL/m10900.cl
index d30290a0f..41f844693 100644
--- a/OpenCL/m10900.cl
+++ b/OpenCL/m10900.cl
@@ -15,11 +15,11 @@
#include "include/kernel_functions.c"
-#include "types_ocl.c"
-#include "common.c"
+#include "OpenCL/types_ocl.c"
+#include "OpenCL/common.c"
-#define COMPARE_S "check_single_comp4.c"
-#define COMPARE_M "check_multi_comp4.c"
+#define COMPARE_S "OpenCL/check_single_comp4.c"
+#define COMPARE_M "OpenCL/check_multi_comp4.c"
__constant u32 k_sha256[64] =
{
diff --git a/OpenCL/m11000_a0.cl b/OpenCL/m11000_a0.cl
index 13a008784..3c25bb68e 100644
--- a/OpenCL/m11000_a0.cl
+++ b/OpenCL/m11000_a0.cl
@@ -14,13 +14,13 @@
#define DGST_R3 1
#include "include/kernel_functions.c"
-#include "types_ocl.c"
-#include "common.c"
+#include "OpenCL/types_ocl.c"
+#include "OpenCL/common.c"
#include "include/rp_gpu.h"
#include "rp.c"
-#define COMPARE_S "check_single_comp4.c"
-#define COMPARE_M "check_multi_comp4.c"
+#define COMPARE_S "OpenCL/check_single_comp4.c"
+#define COMPARE_M "OpenCL/check_multi_comp4.c"
__kernel void __attribute__((reqd_work_group_size (64, 1, 1))) m11000_m04 (__global pw_t *pws, __global gpu_rule_t *rules_buf, __global comb_t *combs_buf, __global bf_t *bfs_buf, __global void *tmps, __global void *hooks, __global u32 *bitmaps_buf_s1_a, __global u32 *bitmaps_buf_s1_b, __global u32 *bitmaps_buf_s1_c, __global u32 *bitmaps_buf_s1_d, __global u32 *bitmaps_buf_s2_a, __global u32 *bitmaps_buf_s2_b, __global u32 *bitmaps_buf_s2_c, __global u32 *bitmaps_buf_s2_d, __global plain_t *plains_buf, __global digest_t *digests_buf, __global u32 *hashes_shown, __global salt_t *salt_bufs, __global void *esalt_bufs, __global u32 *d_return_buf, __global u32 *d_scryptV_buf, const u32 bitmap_mask, const u32 bitmap_shift1, const u32 bitmap_shift2, const u32 salt_pos, const u32 loop_pos, const u32 loop_cnt, const u32 rules_cnt, const u32 digests_cnt, const u32 digests_offset, const u32 combs_mode, const u32 gid_max)
{
diff --git a/OpenCL/m11000_a1.cl b/OpenCL/m11000_a1.cl
index cf2b51e3e..01a7ac2c6 100644
--- a/OpenCL/m11000_a1.cl
+++ b/OpenCL/m11000_a1.cl
@@ -14,11 +14,11 @@
#define DGST_R3 1
#include "include/kernel_functions.c"
-#include "types_ocl.c"
-#include "common.c"
+#include "OpenCL/types_ocl.c"
+#include "OpenCL/common.c"
-#define COMPARE_S "check_single_comp4.c"
-#define COMPARE_M "check_multi_comp4.c"
+#define COMPARE_S "OpenCL/check_single_comp4.c"
+#define COMPARE_M "OpenCL/check_multi_comp4.c"
__kernel void __attribute__((reqd_work_group_size (64, 1, 1))) m11000_m04 (__global pw_t *pws, __global gpu_rule_t *rules_buf, __global comb_t *combs_buf, __global bf_t *bfs_buf, __global void *tmps, __global void *hooks, __global u32 *bitmaps_buf_s1_a, __global u32 *bitmaps_buf_s1_b, __global u32 *bitmaps_buf_s1_c, __global u32 *bitmaps_buf_s1_d, __global u32 *bitmaps_buf_s2_a, __global u32 *bitmaps_buf_s2_b, __global u32 *bitmaps_buf_s2_c, __global u32 *bitmaps_buf_s2_d, __global plain_t *plains_buf, __global digest_t *digests_buf, __global u32 *hashes_shown, __global salt_t *salt_bufs, __global void *esalt_bufs, __global u32 *d_return_buf, __global u32 *d_scryptV_buf, const u32 bitmap_mask, const u32 bitmap_shift1, const u32 bitmap_shift2, const u32 salt_pos, const u32 loop_pos, const u32 loop_cnt, const u32 combs_cnt, const u32 digests_cnt, const u32 digests_offset, const u32 combs_mode, const u32 gid_max)
{
diff --git a/OpenCL/m11000_a3.cl b/OpenCL/m11000_a3.cl
index a057ee1ac..f254a0cb2 100644
--- a/OpenCL/m11000_a3.cl
+++ b/OpenCL/m11000_a3.cl
@@ -14,11 +14,11 @@
#define DGST_R3 1
#include "include/kernel_functions.c"
-#include "types_ocl.c"
-#include "common.c"
+#include "OpenCL/types_ocl.c"
+#include "OpenCL/common.c"
-#define COMPARE_S "check_single_comp4.c"
-#define COMPARE_M "check_multi_comp4.c"
+#define COMPARE_S "OpenCL/check_single_comp4.c"
+#define COMPARE_M "OpenCL/check_multi_comp4.c"
static void m11000m (u32 w0[4], u32 w1[4], u32 w2[4], u32 w3[4], const u32 pw_len, __global pw_t *pws, __global gpu_rule_t *rules_buf, __global comb_t *combs_buf, __global bf_t *bfs_buf, __global void *tmps, __global void *hooks, __global u32 *bitmaps_buf_s1_a, __global u32 *bitmaps_buf_s1_b, __global u32 *bitmaps_buf_s1_c, __global u32 *bitmaps_buf_s1_d, __global u32 *bitmaps_buf_s2_a, __global u32 *bitmaps_buf_s2_b, __global u32 *bitmaps_buf_s2_c, __global u32 *bitmaps_buf_s2_d, __global plain_t *plains_buf, __global digest_t *digests_buf, __global u32 *hashes_shown, __global salt_t *salt_bufs, __global void *esalt_bufs, __global u32 *d_return_buf, __global u32 *d_scryptV_buf, const u32 bitmap_mask, const u32 bitmap_shift1, const u32 bitmap_shift2, const u32 salt_pos, const u32 loop_pos, const u32 loop_cnt, const u32 bfs_cnt, const u32 digests_cnt, const u32 digests_offset)
{
diff --git a/OpenCL/m11100_a0.cl b/OpenCL/m11100_a0.cl
index ca2f33fed..814d53dff 100644
--- a/OpenCL/m11100_a0.cl
+++ b/OpenCL/m11100_a0.cl
@@ -14,13 +14,13 @@
#define DGST_R3 1
#include "include/kernel_functions.c"
-#include "types_ocl.c"
-#include "common.c"
+#include "OpenCL/types_ocl.c"
+#include "OpenCL/common.c"
#include "include/rp_gpu.h"
#include "rp.c"
-#define COMPARE_S "check_single_comp4.c"
-#define COMPARE_M "check_multi_comp4.c"
+#define COMPARE_S "OpenCL/check_single_comp4.c"
+#define COMPARE_M "OpenCL/check_multi_comp4.c"
#define uint_to_hex_lower8(i) l_bin2asc[(i)]
diff --git a/OpenCL/m11100_a1.cl b/OpenCL/m11100_a1.cl
index cc2a412f4..31c812323 100644
--- a/OpenCL/m11100_a1.cl
+++ b/OpenCL/m11100_a1.cl
@@ -14,11 +14,11 @@
#define DGST_R3 1
#include "include/kernel_functions.c"
-#include "types_ocl.c"
-#include "common.c"
+#include "OpenCL/types_ocl.c"
+#include "OpenCL/common.c"
-#define COMPARE_S "check_single_comp4.c"
-#define COMPARE_M "check_multi_comp4.c"
+#define COMPARE_S "OpenCL/check_single_comp4.c"
+#define COMPARE_M "OpenCL/check_multi_comp4.c"
#define uint_to_hex_lower8(i) l_bin2asc[(i)]
diff --git a/OpenCL/m11100_a3.cl b/OpenCL/m11100_a3.cl
index ed0fa9287..d5642ca8b 100644
--- a/OpenCL/m11100_a3.cl
+++ b/OpenCL/m11100_a3.cl
@@ -14,11 +14,11 @@
#define DGST_R3 1
#include "include/kernel_functions.c"
-#include "types_ocl.c"
-#include "common.c"
+#include "OpenCL/types_ocl.c"
+#include "OpenCL/common.c"
-#define COMPARE_S "check_single_comp4.c"
-#define COMPARE_M "check_multi_comp4.c"
+#define COMPARE_S "OpenCL/check_single_comp4.c"
+#define COMPARE_M "OpenCL/check_multi_comp4.c"
#define uint_to_hex_lower8(i) l_bin2asc[(i)]
diff --git a/OpenCL/m11200_a0.cl b/OpenCL/m11200_a0.cl
index cbec710ef..45f18e7e7 100644
--- a/OpenCL/m11200_a0.cl
+++ b/OpenCL/m11200_a0.cl
@@ -14,13 +14,13 @@
#define DGST_R3 1
#include "include/kernel_functions.c"
-#include "types_ocl.c"
-#include "common.c"
+#include "OpenCL/types_ocl.c"
+#include "OpenCL/common.c"
#include "include/rp_gpu.h"
#include "rp.c"
-#define COMPARE_S "check_single_comp4.c"
-#define COMPARE_M "check_multi_comp4.c"
+#define COMPARE_S "OpenCL/check_single_comp4.c"
+#define COMPARE_M "OpenCL/check_multi_comp4.c"
__kernel void __attribute__((reqd_work_group_size (64, 1, 1))) m11200_m04 (__global pw_t *pws, __global gpu_rule_t *rules_buf, __global comb_t *combs_buf, __global bf_t *bfs_buf, __global void *tmps, __global void *hooks, __global u32 *bitmaps_buf_s1_a, __global u32 *bitmaps_buf_s1_b, __global u32 *bitmaps_buf_s1_c, __global u32 *bitmaps_buf_s1_d, __global u32 *bitmaps_buf_s2_a, __global u32 *bitmaps_buf_s2_b, __global u32 *bitmaps_buf_s2_c, __global u32 *bitmaps_buf_s2_d, __global plain_t *plains_buf, __global digest_t *digests_buf, __global u32 *hashes_shown, __global salt_t *salt_bufs, __global void *esalt_bufs, __global u32 *d_return_buf, __global u32 *d_scryptV_buf, const u32 bitmap_mask, const u32 bitmap_shift1, const u32 bitmap_shift2, const u32 salt_pos, const u32 loop_pos, const u32 loop_cnt, const u32 rules_cnt, const u32 digests_cnt, const u32 digests_offset, const u32 combs_mode, const u32 gid_max)
{
diff --git a/OpenCL/m11200_a1.cl b/OpenCL/m11200_a1.cl
index bf7c8bcbf..a804e6d60 100644
--- a/OpenCL/m11200_a1.cl
+++ b/OpenCL/m11200_a1.cl
@@ -14,11 +14,11 @@
#define DGST_R3 1
#include "include/kernel_functions.c"
-#include "types_ocl.c"
-#include "common.c"
+#include "OpenCL/types_ocl.c"
+#include "OpenCL/common.c"
-#define COMPARE_S "check_single_comp4.c"
-#define COMPARE_M "check_multi_comp4.c"
+#define COMPARE_S "OpenCL/check_single_comp4.c"
+#define COMPARE_M "OpenCL/check_multi_comp4.c"
__kernel void __attribute__((reqd_work_group_size (64, 1, 1))) m11200_m04 (__global pw_t *pws, __global gpu_rule_t *rules_buf, __global comb_t *combs_buf, __global bf_t *bfs_buf, __global void *tmps, __global void *hooks, __global u32 *bitmaps_buf_s1_a, __global u32 *bitmaps_buf_s1_b, __global u32 *bitmaps_buf_s1_c, __global u32 *bitmaps_buf_s1_d, __global u32 *bitmaps_buf_s2_a, __global u32 *bitmaps_buf_s2_b, __global u32 *bitmaps_buf_s2_c, __global u32 *bitmaps_buf_s2_d, __global plain_t *plains_buf, __global digest_t *digests_buf, __global u32 *hashes_shown, __global salt_t *salt_bufs, __global void *esalt_bufs, __global u32 *d_return_buf, __global u32 *d_scryptV_buf, const u32 bitmap_mask, const u32 bitmap_shift1, const u32 bitmap_shift2, const u32 salt_pos, const u32 loop_pos, const u32 loop_cnt, const u32 combs_cnt, const u32 digests_cnt, const u32 digests_offset, const u32 combs_mode, const u32 gid_max)
{
diff --git a/OpenCL/m11200_a3.cl b/OpenCL/m11200_a3.cl
index 5b4ff6046..8a682554d 100644
--- a/OpenCL/m11200_a3.cl
+++ b/OpenCL/m11200_a3.cl
@@ -14,11 +14,11 @@
#define DGST_R3 1
#include "include/kernel_functions.c"
-#include "types_ocl.c"
-#include "common.c"
+#include "OpenCL/types_ocl.c"
+#include "OpenCL/common.c"
-#define COMPARE_S "check_single_comp4.c"
-#define COMPARE_M "check_multi_comp4.c"
+#define COMPARE_S "OpenCL/check_single_comp4.c"
+#define COMPARE_M "OpenCL/check_multi_comp4.c"
static void m11200m (u32 w0[4], u32 w1[4], u32 w2[4], u32 w3[4], const u32 pw_len, __global pw_t *pws, __global gpu_rule_t *rules_buf, __global comb_t *combs_buf, __global bf_t *bfs_buf, __global void *tmps, __global void *hooks, __global u32 *bitmaps_buf_s1_a, __global u32 *bitmaps_buf_s1_b, __global u32 *bitmaps_buf_s1_c, __global u32 *bitmaps_buf_s1_d, __global u32 *bitmaps_buf_s2_a, __global u32 *bitmaps_buf_s2_b, __global u32 *bitmaps_buf_s2_c, __global u32 *bitmaps_buf_s2_d, __global plain_t *plains_buf, __global digest_t *digests_buf, __global u32 *hashes_shown, __global salt_t *salt_bufs, __global void *esalt_bufs, __global u32 *d_return_buf, __global u32 *d_scryptV_buf, const u32 bitmap_mask, const u32 bitmap_shift1, const u32 bitmap_shift2, const u32 salt_pos, const u32 loop_pos, const u32 loop_cnt, const u32 bfs_cnt, const u32 digests_cnt, const u32 digests_offset)
{
diff --git a/OpenCL/m11300.cl b/OpenCL/m11300.cl
index f965e4f2c..7022f61f5 100644
--- a/OpenCL/m11300.cl
+++ b/OpenCL/m11300.cl
@@ -14,8 +14,8 @@
#define DGST_R3 3
#include "include/kernel_functions.c"
-#include "types_ocl.c"
-#include "common.c"
+#include "OpenCL/types_ocl.c"
+#include "OpenCL/common.c"
__constant u32 te0[256] =
{
diff --git a/OpenCL/m11400_a0.cl b/OpenCL/m11400_a0.cl
index 23d9ba5c8..9a9f03de5 100644
--- a/OpenCL/m11400_a0.cl
+++ b/OpenCL/m11400_a0.cl
@@ -14,13 +14,13 @@
#define DGST_R3 1
#include "include/kernel_functions.c"
-#include "types_ocl.c"
-#include "common.c"
+#include "OpenCL/types_ocl.c"
+#include "OpenCL/common.c"
#include "include/rp_gpu.h"
#include "rp.c"
-#define COMPARE_S "check_single_comp4.c"
-#define COMPARE_M "check_multi_comp4.c"
+#define COMPARE_S "OpenCL/check_single_comp4.c"
+#define COMPARE_M "OpenCL/check_multi_comp4.c"
#define uint_to_hex_lower8(i) l_bin2asc[(i)]
diff --git a/OpenCL/m11400_a1.cl b/OpenCL/m11400_a1.cl
index 8a467ae38..c003b66a4 100644
--- a/OpenCL/m11400_a1.cl
+++ b/OpenCL/m11400_a1.cl
@@ -14,11 +14,11 @@
#define DGST_R3 1
#include "include/kernel_functions.c"
-#include "types_ocl.c"
-#include "common.c"
+#include "OpenCL/types_ocl.c"
+#include "OpenCL/common.c"
-#define COMPARE_S "check_single_comp4.c"
-#define COMPARE_M "check_multi_comp4.c"
+#define COMPARE_S "OpenCL/check_single_comp4.c"
+#define COMPARE_M "OpenCL/check_multi_comp4.c"
#define uint_to_hex_lower8(i) l_bin2asc[(i)]
diff --git a/OpenCL/m11400_a3.cl b/OpenCL/m11400_a3.cl
index 0113fc0c3..6737f6ddf 100644
--- a/OpenCL/m11400_a3.cl
+++ b/OpenCL/m11400_a3.cl
@@ -14,11 +14,11 @@
#define DGST_R3 1
#include "include/kernel_functions.c"
-#include "types_ocl.c"
-#include "common.c"
+#include "OpenCL/types_ocl.c"
+#include "OpenCL/common.c"
-#define COMPARE_S "check_single_comp4.c"
-#define COMPARE_M "check_multi_comp4.c"
+#define COMPARE_S "OpenCL/check_single_comp4.c"
+#define COMPARE_M "OpenCL/check_multi_comp4.c"
#define uint_to_hex_lower8(i) l_bin2asc[(i)]
diff --git a/OpenCL/m11500_a0.cl b/OpenCL/m11500_a0.cl
index 51359c0f3..8af660729 100644
--- a/OpenCL/m11500_a0.cl
+++ b/OpenCL/m11500_a0.cl
@@ -14,13 +14,13 @@
#define DGST_R3 3
#include "include/kernel_functions.c"
-#include "types_ocl.c"
-#include "common.c"
+#include "OpenCL/types_ocl.c"
+#include "OpenCL/common.c"
#include "include/rp_gpu.h"
#include "rp.c"
-#define COMPARE_S "check_single_comp4.c"
-#define COMPARE_M "check_multi_comp4.c"
+#define COMPARE_S "OpenCL/check_single_comp4.c"
+#define COMPARE_M "OpenCL/check_multi_comp4.c"
__constant u32 crc32tab[0x100] =
{
diff --git a/OpenCL/m11500_a1.cl b/OpenCL/m11500_a1.cl
index 1d74528bf..a49c14ab3 100644
--- a/OpenCL/m11500_a1.cl
+++ b/OpenCL/m11500_a1.cl
@@ -14,11 +14,11 @@
#define DGST_R3 3
#include "include/kernel_functions.c"
-#include "types_ocl.c"
-#include "common.c"
+#include "OpenCL/types_ocl.c"
+#include "OpenCL/common.c"
-#define COMPARE_S "check_single_comp4.c"
-#define COMPARE_M "check_multi_comp4.c"
+#define COMPARE_S "OpenCL/check_single_comp4.c"
+#define COMPARE_M "OpenCL/check_multi_comp4.c"
__constant u32 crc32tab[0x100] =
{
diff --git a/OpenCL/m11500_a3.cl b/OpenCL/m11500_a3.cl
index a1b8769b1..aea9d0d1b 100644
--- a/OpenCL/m11500_a3.cl
+++ b/OpenCL/m11500_a3.cl
@@ -14,11 +14,11 @@
#define DGST_R3 3
#include "include/kernel_functions.c"
-#include "types_ocl.c"
-#include "common.c"
+#include "OpenCL/types_ocl.c"
+#include "OpenCL/common.c"
-#define COMPARE_S "check_single_comp4.c"
-#define COMPARE_M "check_multi_comp4.c"
+#define COMPARE_S "OpenCL/check_single_comp4.c"
+#define COMPARE_M "OpenCL/check_multi_comp4.c"
__constant u32 crc32tab[0x100] =
{
diff --git a/OpenCL/m11600.cl b/OpenCL/m11600.cl
index 14a7a4932..9360d897c 100644
--- a/OpenCL/m11600.cl
+++ b/OpenCL/m11600.cl
@@ -14,11 +14,11 @@
#define DGST_R3 3
#include "include/kernel_functions.c"
-#include "types_ocl.c"
-#include "common.c"
+#include "OpenCL/types_ocl.c"
+#include "OpenCL/common.c"
-#define COMPARE_S "check_single_comp4.c"
-#define COMPARE_M "check_multi_comp4.c"
+#define COMPARE_S "OpenCL/check_single_comp4.c"
+#define COMPARE_M "OpenCL/check_multi_comp4.c"
__constant u32 te0[256] =
{
diff --git a/OpenCL/m11700_a0.cl b/OpenCL/m11700_a0.cl
index 93162548d..d851d16ea 100644
--- a/OpenCL/m11700_a0.cl
+++ b/OpenCL/m11700_a0.cl
@@ -14,13 +14,13 @@
#define DGST_R3 3
#include "include/kernel_functions.c"
-#include "types_ocl.c"
-#include "common.c"
+#include "OpenCL/types_ocl.c"
+#include "OpenCL/common.c"
#include "include/rp_gpu.h"
#include "rp.c"
-#define COMPARE_S "check_single_comp4.c"
-#define COMPARE_M "check_multi_comp4.c"
+#define COMPARE_S "OpenCL/check_single_comp4.c"
+#define COMPARE_M "OpenCL/check_multi_comp4.c"
#define INITVAL 0x0101010101010101
diff --git a/OpenCL/m11700_a1.cl b/OpenCL/m11700_a1.cl
index 1aec6a56d..d6ccaccc1 100644
--- a/OpenCL/m11700_a1.cl
+++ b/OpenCL/m11700_a1.cl
@@ -14,11 +14,11 @@
#define DGST_R3 3
#include "include/kernel_functions.c"
-#include "types_ocl.c"
-#include "common.c"
+#include "OpenCL/types_ocl.c"
+#include "OpenCL/common.c"
-#define COMPARE_S "check_single_comp4.c"
-#define COMPARE_M "check_multi_comp4.c"
+#define COMPARE_S "OpenCL/check_single_comp4.c"
+#define COMPARE_M "OpenCL/check_multi_comp4.c"
#define INITVAL 0x0101010101010101
diff --git a/OpenCL/m11700_a3.cl b/OpenCL/m11700_a3.cl
index f6fa9d776..9797b91c5 100644
--- a/OpenCL/m11700_a3.cl
+++ b/OpenCL/m11700_a3.cl
@@ -14,11 +14,11 @@
#define DGST_R3 3
#include "include/kernel_functions.c"
-#include "types_ocl.c"
-#include "common.c"
+#include "OpenCL/types_ocl.c"
+#include "OpenCL/common.c"
-#define COMPARE_S "check_single_comp4.c"
-#define COMPARE_M "check_multi_comp4.c"
+#define COMPARE_S "OpenCL/check_single_comp4.c"
+#define COMPARE_M "OpenCL/check_multi_comp4.c"
#define INITVAL 0x0101010101010101
diff --git a/OpenCL/m11800_a0.cl b/OpenCL/m11800_a0.cl
index e01764ff5..6b8be7c8a 100644
--- a/OpenCL/m11800_a0.cl
+++ b/OpenCL/m11800_a0.cl
@@ -14,13 +14,13 @@
#define DGST_R3 3
#include "include/kernel_functions.c"
-#include "types_ocl.c"
-#include "common.c"
+#include "OpenCL/types_ocl.c"
+#include "OpenCL/common.c"
#include "include/rp_gpu.h"
#include "rp.c"
-#define COMPARE_S "check_single_comp4.c"
-#define COMPARE_M "check_multi_comp4.c"
+#define COMPARE_S "OpenCL/check_single_comp4.c"
+#define COMPARE_M "OpenCL/check_multi_comp4.c"
#define INITVAL 0
diff --git a/OpenCL/m11800_a1.cl b/OpenCL/m11800_a1.cl
index db967473d..3b09f84a4 100644
--- a/OpenCL/m11800_a1.cl
+++ b/OpenCL/m11800_a1.cl
@@ -14,11 +14,11 @@
#define DGST_R3 3
#include "include/kernel_functions.c"
-#include "types_ocl.c"
-#include "common.c"
+#include "OpenCL/types_ocl.c"
+#include "OpenCL/common.c"
-#define COMPARE_S "check_single_comp4.c"
-#define COMPARE_M "check_multi_comp4.c"
+#define COMPARE_S "OpenCL/check_single_comp4.c"
+#define COMPARE_M "OpenCL/check_multi_comp4.c"
#define INITVAL 0
diff --git a/OpenCL/m11800_a3.cl b/OpenCL/m11800_a3.cl
index faa4e96e7..dc8712e98 100644
--- a/OpenCL/m11800_a3.cl
+++ b/OpenCL/m11800_a3.cl
@@ -14,11 +14,11 @@
#define DGST_R3 3
#include "include/kernel_functions.c"
-#include "types_ocl.c"
-#include "common.c"
+#include "OpenCL/types_ocl.c"
+#include "OpenCL/common.c"
-#define COMPARE_S "check_single_comp4.c"
-#define COMPARE_M "check_multi_comp4.c"
+#define COMPARE_S "OpenCL/check_single_comp4.c"
+#define COMPARE_M "OpenCL/check_multi_comp4.c"
#define INITVAL 0
diff --git a/OpenCL/m11900.cl b/OpenCL/m11900.cl
index fb09dbbcf..0e28e6d5f 100644
--- a/OpenCL/m11900.cl
+++ b/OpenCL/m11900.cl
@@ -15,11 +15,11 @@
#include "include/kernel_functions.c"
-#include "types_ocl.c"
-#include "common.c"
+#include "OpenCL/types_ocl.c"
+#include "OpenCL/common.c"
-#define COMPARE_S "check_single_comp4.c"
-#define COMPARE_M "check_multi_comp4.c"
+#define COMPARE_S "OpenCL/check_single_comp4.c"
+#define COMPARE_M "OpenCL/check_multi_comp4.c"
static void md5_transform (const u32 w0[4], const u32 w1[4], const u32 w2[4], const u32 w3[4], u32 digest[4])
{
diff --git a/OpenCL/m12000.cl b/OpenCL/m12000.cl
index 4b0776241..ddb26fc3d 100644
--- a/OpenCL/m12000.cl
+++ b/OpenCL/m12000.cl
@@ -15,11 +15,11 @@
#include "include/kernel_functions.c"
-#include "types_ocl.c"
-#include "common.c"
+#include "OpenCL/types_ocl.c"
+#include "OpenCL/common.c"
-#define COMPARE_S "check_single_comp4.c"
-#define COMPARE_M "check_multi_comp4.c"
+#define COMPARE_S "OpenCL/check_single_comp4.c"
+#define COMPARE_M "OpenCL/check_multi_comp4.c"
static void sha1_transform (const u32 w0[4], const u32 w1[4], const u32 w2[4], const u32 w3[4], u32 digest[5])
{
diff --git a/OpenCL/m12200.cl b/OpenCL/m12200.cl
index 6119aeb8c..a194b8fbe 100644
--- a/OpenCL/m12200.cl
+++ b/OpenCL/m12200.cl
@@ -14,11 +14,11 @@
#define DGST_R3 3
#include "include/kernel_functions.c"
-#include "types_ocl.c"
-#include "common.c"
+#include "OpenCL/types_ocl.c"
+#include "OpenCL/common.c"
-#define COMPARE_S "check_single_comp4.c"
-#define COMPARE_M "check_multi_comp4.c"
+#define COMPARE_S "OpenCL/check_single_comp4.c"
+#define COMPARE_M "OpenCL/check_multi_comp4.c"
__constant u64 k_sha512[80] =
{
diff --git a/OpenCL/m12300.cl b/OpenCL/m12300.cl
index 5acbf9be6..2c4a02630 100644
--- a/OpenCL/m12300.cl
+++ b/OpenCL/m12300.cl
@@ -14,11 +14,11 @@
#define DGST_R3 3
#include "include/kernel_functions.c"
-#include "types_ocl.c"
-#include "common.c"
+#include "OpenCL/types_ocl.c"
+#include "OpenCL/common.c"
-#define COMPARE_S "check_single_comp4.c"
-#define COMPARE_M "check_multi_comp4.c"
+#define COMPARE_S "OpenCL/check_single_comp4.c"
+#define COMPARE_M "OpenCL/check_multi_comp4.c"
__constant u64 k_sha512[80] =
{
diff --git a/OpenCL/m12400.cl b/OpenCL/m12400.cl
index f18ac2379..9f76a9b48 100644
--- a/OpenCL/m12400.cl
+++ b/OpenCL/m12400.cl
@@ -14,11 +14,11 @@
#define DGST_R3 3
#include "include/kernel_functions.c"
-#include "types_ocl.c"
-#include "common.c"
+#include "OpenCL/types_ocl.c"
+#include "OpenCL/common.c"
-#define COMPARE_S "check_single_comp4.c"
-#define COMPARE_M "check_multi_comp4.c"
+#define COMPARE_S "OpenCL/check_single_comp4.c"
+#define COMPARE_M "OpenCL/check_multi_comp4.c"
#define PERM_OP(a,b,tt,n,m) \
{ \
diff --git a/OpenCL/m12500.cl b/OpenCL/m12500.cl
index 15fe60a76..0fc947054 100644
--- a/OpenCL/m12500.cl
+++ b/OpenCL/m12500.cl
@@ -15,11 +15,11 @@
#include "include/kernel_functions.c"
-#include "types_ocl.c"
-#include "common.c"
+#include "OpenCL/types_ocl.c"
+#include "OpenCL/common.c"
-#define COMPARE_S "check_single_comp4.c"
-#define COMPARE_M "check_multi_comp4.c"
+#define COMPARE_S "OpenCL/check_single_comp4.c"
+#define COMPARE_M "OpenCL/check_multi_comp4.c"
#define ROUNDS 0x40000
diff --git a/OpenCL/m12600_a0.cl b/OpenCL/m12600_a0.cl
index 02edce1f3..9912601cc 100644
--- a/OpenCL/m12600_a0.cl
+++ b/OpenCL/m12600_a0.cl
@@ -14,13 +14,13 @@
#define DGST_R3 6
#include "include/kernel_functions.c"
-#include "types_ocl.c"
-#include "common.c"
+#include "OpenCL/types_ocl.c"
+#include "OpenCL/common.c"
#include "include/rp_gpu.h"
#include "rp.c"
-#define COMPARE_S "check_single_comp4.c"
-#define COMPARE_M "check_multi_comp4.c"
+#define COMPARE_S "OpenCL/check_single_comp4.c"
+#define COMPARE_M "OpenCL/check_multi_comp4.c"
#define uint_to_hex_upper8(i) l_bin2asc[(i)]
diff --git a/OpenCL/m12600_a1.cl b/OpenCL/m12600_a1.cl
index 0b6ff1c3b..217f16d07 100644
--- a/OpenCL/m12600_a1.cl
+++ b/OpenCL/m12600_a1.cl
@@ -14,11 +14,11 @@
#define DGST_R3 6
#include "include/kernel_functions.c"
-#include "types_ocl.c"
-#include "common.c"
+#include "OpenCL/types_ocl.c"
+#include "OpenCL/common.c"
-#define COMPARE_S "check_single_comp4.c"
-#define COMPARE_M "check_multi_comp4.c"
+#define COMPARE_S "OpenCL/check_single_comp4.c"
+#define COMPARE_M "OpenCL/check_multi_comp4.c"
#define uint_to_hex_upper8(i) l_bin2asc[(i)]
diff --git a/OpenCL/m12600_a3.cl b/OpenCL/m12600_a3.cl
index 12c394294..19ac58e33 100644
--- a/OpenCL/m12600_a3.cl
+++ b/OpenCL/m12600_a3.cl
@@ -14,11 +14,11 @@
#define DGST_R3 6
#include "include/kernel_functions.c"
-#include "types_ocl.c"
-#include "common.c"
+#include "OpenCL/types_ocl.c"
+#include "OpenCL/common.c"
-#define COMPARE_S "check_single_comp4.c"
-#define COMPARE_M "check_multi_comp4.c"
+#define COMPARE_S "OpenCL/check_single_comp4.c"
+#define COMPARE_M "OpenCL/check_multi_comp4.c"
#define uint_to_hex_upper8(i) l_bin2asc[(i)]
diff --git a/OpenCL/m12700.cl b/OpenCL/m12700.cl
index 7aeeb422e..7181c14cf 100644
--- a/OpenCL/m12700.cl
+++ b/OpenCL/m12700.cl
@@ -14,11 +14,11 @@
#define DGST_R3 3
#include "include/kernel_functions.c"
-#include "types_ocl.c"
-#include "common.c"
+#include "OpenCL/types_ocl.c"
+#include "OpenCL/common.c"
-#define COMPARE_S "check_single_comp4.c"
-#define COMPARE_M "check_multi_comp4.c"
+#define COMPARE_S "OpenCL/check_single_comp4.c"
+#define COMPARE_M "OpenCL/check_multi_comp4.c"
__constant u32 te0[256] =
{
diff --git a/OpenCL/m12800.cl b/OpenCL/m12800.cl
index ba5849548..deb535290 100644
--- a/OpenCL/m12800.cl
+++ b/OpenCL/m12800.cl
@@ -15,11 +15,11 @@
#include "include/kernel_functions.c"
-#include "types_ocl.c"
-#include "common.c"
+#include "OpenCL/types_ocl.c"
+#include "OpenCL/common.c"
-#define COMPARE_S "check_single_comp4.c"
-#define COMPARE_M "check_multi_comp4.c"
+#define COMPARE_S "OpenCL/check_single_comp4.c"
+#define COMPARE_M "OpenCL/check_multi_comp4.c"
#define uint_to_hex_lower8(i) l_bin2asc[(i)]
diff --git a/OpenCL/markov_be.cl b/OpenCL/markov_be.cl
index e0b39deab..6c25b06b7 100644
--- a/OpenCL/markov_be.cl
+++ b/OpenCL/markov_be.cl
@@ -7,7 +7,7 @@
#define CHARSIZ 256
-#include "types_ocl.c"
+#include "OpenCL/types_ocl.c"
static void generate_pw (u32 pw_buf[16], __global cs_t *root_css_buf, __global cs_t *markov_css_buf, const u32 pw_l_len, const u32 pw_r_len, const u32 mask80, const u32 bits14, const u32 bits15, u64 val)
{
diff --git a/OpenCL/markov_le.cl b/OpenCL/markov_le.cl
index e56a9097c..f071deab2 100644
--- a/OpenCL/markov_le.cl
+++ b/OpenCL/markov_le.cl
@@ -7,7 +7,7 @@
#define CHARSIZ 256
-#include "types_ocl.c"
+#include "OpenCL/types_ocl.c"
static void generate_pw (u32 pw_buf[16], __global cs_t *root_css_buf, __global cs_t *markov_css_buf, const u32 pw_l_len, const u32 pw_r_len, const u32 mask80, const u32 bits14, const u32 bits15, u64 val)
{
diff --git a/src/Makefile b/src/Makefile
index 47d7f6d04..672927e28 100644
--- a/src/Makefile
+++ b/src/Makefile
@@ -121,21 +121,25 @@ win64: oclHashcat64.exe
##
install: native
- $(INSTALL) -m 755 -d $(DOCUMENT_FOLDER)
- $(CP) -a docs/* $(DOCUMENT_FOLDER)/
- $(INSTALL) -m 755 -d $(DOCUMENT_FOLDER)/extra
- $(CP) -a extra/* $(DOCUMENT_FOLDER)/extra/
- $(INSTALL) -m 755 -d $(SHARED_FOLDER)
- $(INSTALL) -m 755 -d $(SHARED_FOLDER)/charsets
- $(CP) -a charsets/* $(SHARED_FOLDER)/charsets/
- $(INSTALL) -m 755 -d $(SHARED_FOLDER)/masks
- $(CP) -a masks/* $(SHARED_FOLDER)/masks/
- $(INSTALL) -m 755 -d $(SHARED_FOLDER)/OpenCL
- $(CP) -a OpenCL/* $(SHARED_FOLDER)/OpenCL/
- $(INSTALL) -m 755 -d $(SHARED_FOLDER)/rules
- $(CP) -a rules/* $(SHARED_FOLDER)/rules/
- $(INSTALL) -m 755 -T hashcat.hcstat $(SHARED_FOLDER)/hashcat.hcstat
- $(INSTALL) -m 755 -T oclHashcat $(INSTALL_FOLDER)/oclHashcat
+ $(INSTALL) -m 755 -d $(DOCUMENT_FOLDER)
+ $(CP) -a docs/* $(DOCUMENT_FOLDER)/
+ $(INSTALL) -m 755 -d $(DOCUMENT_FOLDER)/extra
+ $(CP) -a extra/* $(DOCUMENT_FOLDER)/extra/
+ $(INSTALL) -m 755 -d $(SHARED_FOLDER)
+ $(INSTALL) -m 755 -d $(SHARED_FOLDER)/charsets
+ $(CP) -a charsets/* $(SHARED_FOLDER)/charsets/
+ $(INSTALL) -m 755 -d $(SHARED_FOLDER)/masks
+ $(CP) -a masks/* $(SHARED_FOLDER)/masks/
+ $(INSTALL) -m 755 -d $(SHARED_FOLDER)/include
+ $(INSTALL) -m 644 include/constants.h $(SHARED_FOLDER)/include/
+ $(INSTALL) -m 644 include/kernel_functions.c $(SHARED_FOLDER)/include/
+ $(INSTALL) -m 644 include/kernel_vendor.h $(SHARED_FOLDER)/include/
+ $(INSTALL) -m 755 -d $(SHARED_FOLDER)/OpenCL
+ $(CP) -a OpenCL/* $(SHARED_FOLDER)/OpenCL/
+ $(INSTALL) -m 755 -d $(SHARED_FOLDER)/rules
+ $(CP) -a rules/* $(SHARED_FOLDER)/rules/
+ $(INSTALL) -m 644 hashcat.hcstat $(SHARED_FOLDER)/
+ $(INSTALL) -m 755 oclHashcat $(INSTALL_FOLDER)/
uninstall:
$(RM) -f $(INSTALL_FOLDER)/oclHashcat
diff --git a/src/oclHashcat.c b/src/oclHashcat.c
index ec1dd2df1..db0d7d5a0 100644
--- a/src/oclHashcat.c
+++ b/src/oclHashcat.c
@@ -345,7 +345,7 @@ const char *USAGE_BIG[] =
"",
"* Markov:",
"",
- " --markov-hcstat=FILE Specify hcstat file to use, default is hcstat",
+ " --markov-hcstat=FILE Specify hcstat file to use, default is hashcat.hcstat",
" --markov-disable Disables markov-chains, emulates classic brute-force",
" --markov-classic Enables classic markov-chains, no per-position enhancement",
" -t, --markov-threshold=NUM Threshold when to stop accepting new markov-chains",
@@ -13133,7 +13133,7 @@ int main (int argc, char **argv)
// we don't have sm_* on AMD but it doesn't matter
- sprintf (build_opts, "-I. -IOpenCL/ -DVENDOR_ID=%d -DCUDA_ARCH=%d", vendor_id, (device_param->sm_major * 100) + device_param->sm_minor);
+ sprintf (build_opts, "-I%s/ -DVENDOR_ID=%d -DCUDA_ARCH=%d", shared_dir, vendor_id, (device_param->sm_major * 100) + device_param->sm_minor);
/**
* main kernel