From 5f7c47b461b7e3ffb727baeee62f41ac537cc0ba Mon Sep 17 00:00:00 2001 From: jsteube 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 170d1ce..0333607 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 b8334fd..b865e58 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 85ec6ce..ccad5ac 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 e9f3080..cb31a7b 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 9ed68a2..0b43b7b 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 28e95ba..18064b4 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 18c0786..3cb9abe 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 b422a71..758a61b 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 b659525..e9e39f3 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 8abacc4..d70c41c 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 2ad50ce..b67e4f7 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 c40e0ad..18266f8 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 1c24133..b81cca7 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 9b76aa4..c82455f 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 b6c3d75..7ba0054 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 fcfe3b9..ac7a491 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 2da6eb4..3c59a5d 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 31cd660..ef9ab94 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 efda0bd..8b52959 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 80602e1..cb73bc8 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 292f636..8e78ee4 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 56ead01..ad9eda7 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 be66c87..895139d 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 2030320..1a985b4 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 69b3b6f..736256e 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 0ad1c17..ae6fc06 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 a5d38a2..d61350a 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 7621c5f..d493ce9 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 ce73e43..779ede6 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 7f96264..2a7826b 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 1cfb69a..900269c 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 fbaad38..49f6f68 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 ce2c64b..1ca632a 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 49fad8a..26bd7dd 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 d7d7668..0350c41 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 8abc821..92d6aec 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 e745ddf..aa7c66b 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 f056a16..515b765 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 6d0b68d..18c9167 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 7524b94..43ef83b 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 bf785ef..f7c475f 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 22c6bde..c5c452d 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 64f686d..fd44eca 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 bd58f48..4c8a19f 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 0c0b414..fd3b1a9 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 e0111fc..5dd5ef4 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 4eb4181..f5cf9db 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 b5dd9fc..1f2cb8d 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 e04fce0..dcb5a57 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 3c6c672..71ee5c3 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 d7c624c..8391a69 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 ce69731..5d53ffc 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 93f2501..d54e309 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 e914e79..0216abe 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 46500bd..b1d9a93 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 14d5a05..3c08f9d 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 19713d3..8fe390a 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 f30c03a..5652a99 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 7423ebe..bc825ca 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 9309aa9..84f2fb6 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 e4f8e22..4220109 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 72abf06..e0bf112 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 178f777..6dffaf2 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 7bad83e..7a2a0d8 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 1036de1..c4d21cb 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 865795d..a075758 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 d11d389..46823e4 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 5a113dc..f232588 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 b559da6..88a891f 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 fc54f7c4..bd0b532 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 842c29d..9edb44d 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 6d1c1e5..3dff2b9 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 7c37b77..d90a179 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 5cbce06..613b9f4 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 0f445a6..26113ad 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 71b8d67..f8adb72 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 3bc61f3..70e37c6 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 9e211f7..46aa766 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 77c4df4..1090e13 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 bbec4bb..b341003 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 fcc420e..b32dba1 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 7d693da..1eb5f50 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 3a1af43..013238a 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 e7a2ae1..1e52a4e 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 862aec3..4c2c052 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 02c276e..068228f 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 cae268f..080d933 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 e40af0c..1569a72 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 dc25c90..8a0bf6b 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 3ff43a8..1dd6050 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 46818f2..a49c272 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 3428c74..1d2eeab 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 5e7e889..87dbff7 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 eef489b..b6ddcee 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 bc28ac2..d4d45db 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 00c3636..beaf7ff 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 e714450..d8dd937 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 13230df..453a515 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 ff1b251..1cd79c1 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 cda4754..2dece7c 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 6b419c3..25de31e 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 6824dfb..c0ab7f3 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 cc2cab3..a8eabc8 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 00c2d61..e6bbd16 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 6d3a611..c2e7b46 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 9ccb090..e0f174d 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 6512ddb..ab5edb3 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 c67483a..2c2fd6b 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 4da81a5..610d456 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 c27e122..0692cca 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 a0c4fbd..4cff0ff 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 7cc2567..40edb29 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 4279e85..13327ae 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 73f555f..10b3605 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 bba27b0..c02c84c 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 3f978b6..ef66c20 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 835da39..bbc9db5 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 8ab9307..cabbbfe 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 bf3eeb9..394270a 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 4738882..4985721 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 216add4..fcdc6cf 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 2beab4b..603543b 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 2cbe9ad..870b8c1 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 37f7999..d02a2f2 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 c98a0b6..b7c2955 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 ba2e957..bb1a308 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 1f8f5d1..cc030f6 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 f9f1317..e262e12 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 2792a2b..156503f 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 6abe71f..693635b 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 a27347d..20be419 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 4c0a1d4..c9f8482 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 9c912bc..53346bc 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 66dc71f..07d83f7 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 e23e5a0..cbda048 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 6ad6d7a..8b03d39 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 132a8fb..a32890e 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 601e3c1..ca31cdc 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 91daea7..3e7f06a 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 c58da65..f56e065 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 7b829ab..50f4dec 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 61490e0..1cb39a8 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 9009507..f083944 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 b11b391..4fe7bfa 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 70e0dd5..5c52eaa 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 281bd11..86c8f25 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 f9305b6..63c4aa9 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 48eb12f..494240f 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 b561de4..dda4ec7 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 f15b819..2b6e6fa 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 679110d..20f1efc 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 1323d31..3197a9d 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 643f759..664a072 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 88eab76..a88a637 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 0e60511..a8b984f 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 5c5b5e2..dd29655 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 1e6cf74..501a8a7 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 5cd3d27..4c83f39 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 5a9e9ca..30bce71 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 e2e8e30..14ce427 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 0a8c6f7..83d62b8 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 a9d6d97..cf5b0d8 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 0d29349..3263395 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 46838fc..d62d4f6 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 4155d60..d54494f 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 4a3cd85..d18fee4 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 d962176..eaf4e3e 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 0134cee..f7a3a0b 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 037f22b..e85cd1e 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 5a719e0..762dd93 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 ddd8900..5c874c3 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 e2ee82c..806bc27 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 215d98b..d1d4a85 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 456a656..4314cab 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 59f5277..8497359 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 49a2ce7..5d1291f 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 c6447de..b107cef 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 92382ad..ace39a7 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 c0c9b72..0d4be3b 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 ad76e9c..4301851 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 7b6014b..ae80ee1 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 95553c2..ef362d7 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 b4ccd38..5aeb7d0 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 9424575..0adc179 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 1330ea8..99f23ac 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 1ae654d..a5a0fb8 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 4356bff..67c0156 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 757c9ee..587caf0 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 bdcc7bc..6abaa4b 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 337d31a..19b74bf 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 91336fb..7d21ad1 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 f14dd36..4a74c6b 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 2fcf8c1..dd55878 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 ff38e4b..695f0a0 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 74d5791..5a5a0b0 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 c1a4105..2cfea77 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 5d88ec6..95710ac 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 1774d38..172579a 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 9b46654..9441da2 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 6252a99..a84e6cb 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 a14c1d6..a478f7b 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 43a4fcd..f8800f6 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 28d1a8d..5132ba3 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 fdb442b..34d362d 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 a5d7d1b..fb52fbd 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 3717f26..91fe799 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 098317e..6d593a0 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 2356f1e..27ced3e 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 79a6664..98a2f7e 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 0c42bd8..f48400e 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 47bcdda..d4dc9d4 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 b22d02a..e1228ab 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 1e23baf..13c5ca3 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 2ceda7b..1e1f9c4 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 a71184b..f6b4610 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 b2b12ba..75eee96 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 4b4f197..f8372d7 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 5f845f0..6d22d36 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 79da3fa..ce71935 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 3c2f60b..42dcaf5 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 bc972d3..4df52c9 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 2bba22c..601fb92 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 5f571cd..b5a0179 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 81d23cb..926d27e 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 9bb232a..744795e 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 f0bba13..57d38ad 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 264ffc8..e472e52 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 dcf642c..867406b 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 4a0f483..bcbe857 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 9641a07..cf96775 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 52ad037..39a70bf 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 fad8e5d..3b3b237 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 31343f9..c00d73f 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 c5bef54..309ad10 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 07782d7..58be8d9 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 2a0237c..2aa7157 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 fbdc05b..2e1c891 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 9fd620c..499b69c 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 ef418bb..2a8e233 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 9c96b0f..b40379d 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 23fab4a..9872fbb 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 073e0fc..a7b0f87 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 d4d0b97..fdcc739 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 f4288d6..266ca14 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 e3568ef..20b060a 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 a07f75d..6ff7a91 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 d5d0539..d79e77e 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 293f9a1..7a25de6 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 7c0e10a..f585d8a 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 5d92a6f..45023d6 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 3e61eff..25a0332 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 22ef2a4..1b32c8a 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 3bfdcf5..be1b7d2 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 10b2a48..219e081 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 5febbbe..e0020b1 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 97f8897..94763f3 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 e07607d..1a7f2fb 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 d031552..52768c7 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 63e8997..d0081cf 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 bd624b3..685ea05 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 a66815a..5150999 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 96a3b06..5ab92f3 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 67790a1..99ba332 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 67fc6f3..d99ca31 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 f09f743..309564c 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 6efc225..195752f 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 1ead01e..8448b27 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 2e4cae6..947b076 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 46bf9eb..e844e07 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 eb222bc..e0ad6e3 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 8dbeb6f..9f9c633 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 83c06dc..3690ee5 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 902099e..833dfa4 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 d35224f..5eee78e 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 51e9393..a3cb1cf 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 ca528ab..9aa854c 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 0b9e38f..f731b8f 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 2acdda6..c00ecc7 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 8431275..e32ea4b 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 8aeb169..a8a873d 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 be447e7..dcf108d 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 e2de9d7..354a3ca 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 65f17c5..5de64ef 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 f83c5dc..007b795 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 f7db026..922f717 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 bb032d8..66369a0 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 c00d202..f617cfb 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 7db896f..3c3fbce 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 0b26a46..df32b8b 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 e055d75..42ef41c 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 d30290a..41f8446 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 13a0087..3c25bb6 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 cf2b51e..01a7ac2 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 a057ee1..f254a0c 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 ca2f33f..814d53d 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 cc2a412..31c8123 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 ed0fa92..d5642ca 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 cbec710..45f18e7 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 bf7c8bc..a804e6d 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 5b4ff60..8a68255 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 f965e4f..7022f61 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 23d9ba5..9a9f03d 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 8a467ae..c003b66 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 0113fc0..6737f6d 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 51359c0..8af6607 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 1d74528..a49c14a 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 a1b8769..aea9d0d 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 14a7a49..9360d89 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 9316254..d851d16 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 1aec6a5..d6ccacc 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 f6fa9d7..9797b91 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 e01764f..6b8be7c 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 db96747..3b09f84 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 faa4e96..dc8712e 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 fb09dbb..0e28e6d 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 4b07762..ddb26fc 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 6119aeb..a194b8f 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 5acbf9b..2c4a026 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 f18ac23..9f76a9b 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 15fe60a..0fc9470 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 02edce1..9912601 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 0b6ff1c..217f16d 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 12c3942..19ac58e 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 7aeeb42..7181c14 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 ba58495..deb5352 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 e0b39de..6c25b06 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 e56a909..f071dea 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 47d7f6d..672927e 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 ec1dd2d..db0d7d5 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 -- 2.25.1