diff --git a/OpenCL/amp_a0.cl b/OpenCL/amp_a0.cl index e32dfcad5..b04d47475 100644 --- a/OpenCL/amp_a0.cl +++ b/OpenCL/amp_a0.cl @@ -7,8 +7,8 @@ #include "inc_vendor.cl" #include "inc_types.cl" -#include "inc_rp.h" -#include "inc_rp.cl" +#include "inc_rp_optimized.h" +#include "inc_rp_optimized.cl" __kernel void amp (__global pw_t *pws, __global pw_t *pws_amp, __global const kernel_rule_t *rules_buf, __global const pw_t *combs_buf, __global const bf_t *bfs_buf, const u32 combs_mode, const u32 gid_max) { diff --git a/OpenCL/inc_rp.cl b/OpenCL/inc_rp_optimized.cl similarity index 100% rename from OpenCL/inc_rp.cl rename to OpenCL/inc_rp_optimized.cl diff --git a/OpenCL/inc_rp.h b/OpenCL/inc_rp_optimized.h similarity index 100% rename from OpenCL/inc_rp.h rename to OpenCL/inc_rp_optimized.h diff --git a/OpenCL/m00000_a0-optimized.cl b/OpenCL/m00000_a0-optimized.cl index 884e7b816..83095708b 100644 --- a/OpenCL/m00000_a0-optimized.cl +++ b/OpenCL/m00000_a0-optimized.cl @@ -10,8 +10,8 @@ #include "inc_hash_functions.cl" #include "inc_types.cl" #include "inc_common.cl" -#include "inc_rp.h" -#include "inc_rp.cl" +#include "inc_rp_optimized.h" +#include "inc_rp_optimized.cl" #include "inc_simd.cl" __kernel void m00000_m04 (__global pw_t *pws, __global const kernel_rule_t *rules_buf, __global const pw_t *combs_buf, __global const bf_t *bfs_buf, __global void *tmps, __global void *hooks, __global const u32 *bitmaps_buf_s1_a, __global const u32 *bitmaps_buf_s1_b, __global const u32 *bitmaps_buf_s1_c, __global const u32 *bitmaps_buf_s1_d, __global const u32 *bitmaps_buf_s2_a, __global const u32 *bitmaps_buf_s2_b, __global const u32 *bitmaps_buf_s2_c, __global const u32 *bitmaps_buf_s2_d, __global plain_t *plains_buf, __global const digest_t *digests_buf, __global u32 *hashes_shown, __global const salt_t *salt_bufs, __global const void *esalt_bufs, __global u32 *d_return_buf, __global u32 *d_scryptV0_buf, __global u32 *d_scryptV1_buf, __global u32 *d_scryptV2_buf, __global u32 *d_scryptV3_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 il_cnt, const u32 digests_cnt, const u32 digests_offset, const u32 combs_mode, const u32 gid_max) diff --git a/OpenCL/m00000_a0.cl b/OpenCL/m00000_a0.cl index 82690362f..00d06138a 100644 --- a/OpenCL/m00000_a0.cl +++ b/OpenCL/m00000_a0.cl @@ -10,8 +10,8 @@ #include "inc_hash_functions.cl" #include "inc_types.cl" #include "inc_common.cl" -#include "inc_rp.h" -#include "inc_rp.cl" +#include "inc_rp_optimized.h" +#include "inc_rp_optimized.cl" #include "inc_scalar.cl" #include "inc_hash_md5.cl" diff --git a/OpenCL/m00010_a0-optimized.cl b/OpenCL/m00010_a0-optimized.cl index ebc59fa6f..14bc92316 100644 --- a/OpenCL/m00010_a0-optimized.cl +++ b/OpenCL/m00010_a0-optimized.cl @@ -10,8 +10,8 @@ #include "inc_hash_functions.cl" #include "inc_types.cl" #include "inc_common.cl" -#include "inc_rp.h" -#include "inc_rp.cl" +#include "inc_rp_optimized.h" +#include "inc_rp_optimized.cl" #include "inc_simd.cl" __kernel void m00010_m04 (__global pw_t *pws, __global const kernel_rule_t *rules_buf, __global const pw_t *combs_buf, __global const bf_t *bfs_buf, __global void *tmps, __global void *hooks, __global const u32 *bitmaps_buf_s1_a, __global const u32 *bitmaps_buf_s1_b, __global const u32 *bitmaps_buf_s1_c, __global const u32 *bitmaps_buf_s1_d, __global const u32 *bitmaps_buf_s2_a, __global const u32 *bitmaps_buf_s2_b, __global const u32 *bitmaps_buf_s2_c, __global const u32 *bitmaps_buf_s2_d, __global plain_t *plains_buf, __global const digest_t *digests_buf, __global u32 *hashes_shown, __global const salt_t *salt_bufs, __global const void *esalt_bufs, __global u32 *d_return_buf, __global u32 *d_scryptV0_buf, __global u32 *d_scryptV1_buf, __global u32 *d_scryptV2_buf, __global u32 *d_scryptV3_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 il_cnt, const u32 digests_cnt, const u32 digests_offset, const u32 combs_mode, const u32 gid_max) diff --git a/OpenCL/m00010_a0.cl b/OpenCL/m00010_a0.cl index 76e002021..c6451cc24 100644 --- a/OpenCL/m00010_a0.cl +++ b/OpenCL/m00010_a0.cl @@ -10,8 +10,8 @@ #include "inc_hash_functions.cl" #include "inc_types.cl" #include "inc_common.cl" -#include "inc_rp.h" -#include "inc_rp.cl" +#include "inc_rp_optimized.h" +#include "inc_rp_optimized.cl" #include "inc_scalar.cl" #include "inc_hash_md5.cl" diff --git a/OpenCL/m00020_a0-optimized.cl b/OpenCL/m00020_a0-optimized.cl index bffca539f..900efe938 100644 --- a/OpenCL/m00020_a0-optimized.cl +++ b/OpenCL/m00020_a0-optimized.cl @@ -10,8 +10,8 @@ #include "inc_hash_functions.cl" #include "inc_types.cl" #include "inc_common.cl" -#include "inc_rp.h" -#include "inc_rp.cl" +#include "inc_rp_optimized.h" +#include "inc_rp_optimized.cl" #include "inc_simd.cl" __kernel void m00020_m04 (__global pw_t *pws, __global const kernel_rule_t *rules_buf, __global const pw_t *combs_buf, __global const bf_t *bfs_buf, __global void *tmps, __global void *hooks, __global const u32 *bitmaps_buf_s1_a, __global const u32 *bitmaps_buf_s1_b, __global const u32 *bitmaps_buf_s1_c, __global const u32 *bitmaps_buf_s1_d, __global const u32 *bitmaps_buf_s2_a, __global const u32 *bitmaps_buf_s2_b, __global const u32 *bitmaps_buf_s2_c, __global const u32 *bitmaps_buf_s2_d, __global plain_t *plains_buf, __global const digest_t *digests_buf, __global u32 *hashes_shown, __global const salt_t *salt_bufs, __global const void *esalt_bufs, __global u32 *d_return_buf, __global u32 *d_scryptV0_buf, __global u32 *d_scryptV1_buf, __global u32 *d_scryptV2_buf, __global u32 *d_scryptV3_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 il_cnt, const u32 digests_cnt, const u32 digests_offset, const u32 combs_mode, const u32 gid_max) diff --git a/OpenCL/m00020_a0.cl b/OpenCL/m00020_a0.cl index 4cd3e5e84..1aeb8f9c7 100644 --- a/OpenCL/m00020_a0.cl +++ b/OpenCL/m00020_a0.cl @@ -10,8 +10,8 @@ #include "inc_hash_functions.cl" #include "inc_types.cl" #include "inc_common.cl" -#include "inc_rp.h" -#include "inc_rp.cl" +#include "inc_rp_optimized.h" +#include "inc_rp_optimized.cl" #include "inc_scalar.cl" #include "inc_hash_md5.cl" diff --git a/OpenCL/m00030_a0-optimized.cl b/OpenCL/m00030_a0-optimized.cl index 6820048ac..2f6c61228 100644 --- a/OpenCL/m00030_a0-optimized.cl +++ b/OpenCL/m00030_a0-optimized.cl @@ -10,8 +10,8 @@ #include "inc_hash_functions.cl" #include "inc_types.cl" #include "inc_common.cl" -#include "inc_rp.h" -#include "inc_rp.cl" +#include "inc_rp_optimized.h" +#include "inc_rp_optimized.cl" #include "inc_simd.cl" __kernel void m00030_m04 (__global pw_t *pws, __global const kernel_rule_t *rules_buf, __global const pw_t *combs_buf, __global const bf_t *bfs_buf, __global void *tmps, __global void *hooks, __global const u32 *bitmaps_buf_s1_a, __global const u32 *bitmaps_buf_s1_b, __global const u32 *bitmaps_buf_s1_c, __global const u32 *bitmaps_buf_s1_d, __global const u32 *bitmaps_buf_s2_a, __global const u32 *bitmaps_buf_s2_b, __global const u32 *bitmaps_buf_s2_c, __global const u32 *bitmaps_buf_s2_d, __global plain_t *plains_buf, __global const digest_t *digests_buf, __global u32 *hashes_shown, __global const salt_t *salt_bufs, __global const void *esalt_bufs, __global u32 *d_return_buf, __global u32 *d_scryptV0_buf, __global u32 *d_scryptV1_buf, __global u32 *d_scryptV2_buf, __global u32 *d_scryptV3_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 il_cnt, const u32 digests_cnt, const u32 digests_offset, const u32 combs_mode, const u32 gid_max) diff --git a/OpenCL/m00030_a0.cl b/OpenCL/m00030_a0.cl index 349802d62..e9c5af749 100644 --- a/OpenCL/m00030_a0.cl +++ b/OpenCL/m00030_a0.cl @@ -10,8 +10,8 @@ #include "inc_hash_functions.cl" #include "inc_types.cl" #include "inc_common.cl" -#include "inc_rp.h" -#include "inc_rp.cl" +#include "inc_rp_optimized.h" +#include "inc_rp_optimized.cl" #include "inc_scalar.cl" #include "inc_hash_md5.cl" diff --git a/OpenCL/m00040_a0-optimized.cl b/OpenCL/m00040_a0-optimized.cl index b58f59785..f80c3b3a8 100644 --- a/OpenCL/m00040_a0-optimized.cl +++ b/OpenCL/m00040_a0-optimized.cl @@ -10,8 +10,8 @@ #include "inc_hash_functions.cl" #include "inc_types.cl" #include "inc_common.cl" -#include "inc_rp.h" -#include "inc_rp.cl" +#include "inc_rp_optimized.h" +#include "inc_rp_optimized.cl" #include "inc_simd.cl" __kernel void m00040_m04 (__global pw_t *pws, __global const kernel_rule_t *rules_buf, __global const pw_t *combs_buf, __global const bf_t *bfs_buf, __global void *tmps, __global void *hooks, __global const u32 *bitmaps_buf_s1_a, __global const u32 *bitmaps_buf_s1_b, __global const u32 *bitmaps_buf_s1_c, __global const u32 *bitmaps_buf_s1_d, __global const u32 *bitmaps_buf_s2_a, __global const u32 *bitmaps_buf_s2_b, __global const u32 *bitmaps_buf_s2_c, __global const u32 *bitmaps_buf_s2_d, __global plain_t *plains_buf, __global const digest_t *digests_buf, __global u32 *hashes_shown, __global const salt_t *salt_bufs, __global const void *esalt_bufs, __global u32 *d_return_buf, __global u32 *d_scryptV0_buf, __global u32 *d_scryptV1_buf, __global u32 *d_scryptV2_buf, __global u32 *d_scryptV3_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 il_cnt, const u32 digests_cnt, const u32 digests_offset, const u32 combs_mode, const u32 gid_max) diff --git a/OpenCL/m00040_a0.cl b/OpenCL/m00040_a0.cl index af4b80719..c52d7735b 100644 --- a/OpenCL/m00040_a0.cl +++ b/OpenCL/m00040_a0.cl @@ -10,8 +10,8 @@ #include "inc_hash_functions.cl" #include "inc_types.cl" #include "inc_common.cl" -#include "inc_rp.h" -#include "inc_rp.cl" +#include "inc_rp_optimized.h" +#include "inc_rp_optimized.cl" #include "inc_scalar.cl" #include "inc_hash_md5.cl" diff --git a/OpenCL/m00050_a0-optimized.cl b/OpenCL/m00050_a0-optimized.cl index 6d902e5c5..d3d9cc8a1 100644 --- a/OpenCL/m00050_a0-optimized.cl +++ b/OpenCL/m00050_a0-optimized.cl @@ -10,8 +10,8 @@ #include "inc_hash_functions.cl" #include "inc_types.cl" #include "inc_common.cl" -#include "inc_rp.h" -#include "inc_rp.cl" +#include "inc_rp_optimized.h" +#include "inc_rp_optimized.cl" #include "inc_simd.cl" #include "inc_hash_md5.cl" diff --git a/OpenCL/m00050_a0.cl b/OpenCL/m00050_a0.cl index 51e5e14f6..09021f5bc 100644 --- a/OpenCL/m00050_a0.cl +++ b/OpenCL/m00050_a0.cl @@ -10,8 +10,8 @@ #include "inc_hash_functions.cl" #include "inc_types.cl" #include "inc_common.cl" -#include "inc_rp.h" -#include "inc_rp.cl" +#include "inc_rp_optimized.h" +#include "inc_rp_optimized.cl" #include "inc_scalar.cl" #include "inc_hash_md5.cl" diff --git a/OpenCL/m00060_a0-optimized.cl b/OpenCL/m00060_a0-optimized.cl index fe21e5e99..dad66e8ac 100644 --- a/OpenCL/m00060_a0-optimized.cl +++ b/OpenCL/m00060_a0-optimized.cl @@ -10,8 +10,8 @@ #include "inc_hash_functions.cl" #include "inc_types.cl" #include "inc_common.cl" -#include "inc_rp.h" -#include "inc_rp.cl" +#include "inc_rp_optimized.h" +#include "inc_rp_optimized.cl" #include "inc_simd.cl" #include "inc_hash_md5.cl" diff --git a/OpenCL/m00060_a0.cl b/OpenCL/m00060_a0.cl index 75369b728..5a1aa73d7 100644 --- a/OpenCL/m00060_a0.cl +++ b/OpenCL/m00060_a0.cl @@ -10,8 +10,8 @@ #include "inc_hash_functions.cl" #include "inc_types.cl" #include "inc_common.cl" -#include "inc_rp.h" -#include "inc_rp.cl" +#include "inc_rp_optimized.h" +#include "inc_rp_optimized.cl" #include "inc_scalar.cl" #include "inc_hash_md5.cl" diff --git a/OpenCL/m00100_a0-optimized.cl b/OpenCL/m00100_a0-optimized.cl index ae2e774a3..bbc547167 100644 --- a/OpenCL/m00100_a0-optimized.cl +++ b/OpenCL/m00100_a0-optimized.cl @@ -10,8 +10,8 @@ #include "inc_hash_functions.cl" #include "inc_types.cl" #include "inc_common.cl" -#include "inc_rp.h" -#include "inc_rp.cl" +#include "inc_rp_optimized.h" +#include "inc_rp_optimized.cl" #include "inc_simd.cl" __kernel void m00100_m04 (__global pw_t *pws, __global const kernel_rule_t *rules_buf, __global const pw_t *combs_buf, __global const bf_t *bfs_buf, __global void *tmps, __global void *hooks, __global const u32 *bitmaps_buf_s1_a, __global const u32 *bitmaps_buf_s1_b, __global const u32 *bitmaps_buf_s1_c, __global const u32 *bitmaps_buf_s1_d, __global const u32 *bitmaps_buf_s2_a, __global const u32 *bitmaps_buf_s2_b, __global const u32 *bitmaps_buf_s2_c, __global const u32 *bitmaps_buf_s2_d, __global plain_t *plains_buf, __global const digest_t *digests_buf, __global u32 *hashes_shown, __global const salt_t *salt_bufs, __global const void *esalt_bufs, __global u32 *d_return_buf, __global u32 *d_scryptV0_buf, __global u32 *d_scryptV1_buf, __global u32 *d_scryptV2_buf, __global u32 *d_scryptV3_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 il_cnt, const u32 digests_cnt, const u32 digests_offset, const u32 combs_mode, const u32 gid_max) diff --git a/OpenCL/m00100_a0.cl b/OpenCL/m00100_a0.cl index c14eaef04..e632c593d 100644 --- a/OpenCL/m00100_a0.cl +++ b/OpenCL/m00100_a0.cl @@ -10,8 +10,8 @@ #include "inc_hash_functions.cl" #include "inc_types.cl" #include "inc_common.cl" -#include "inc_rp.h" -#include "inc_rp.cl" +#include "inc_rp_optimized.h" +#include "inc_rp_optimized.cl" #include "inc_scalar.cl" #include "inc_hash_sha1.cl" diff --git a/OpenCL/m00110_a0-optimized.cl b/OpenCL/m00110_a0-optimized.cl index 9464be718..79cbb29a0 100644 --- a/OpenCL/m00110_a0-optimized.cl +++ b/OpenCL/m00110_a0-optimized.cl @@ -10,8 +10,8 @@ #include "inc_hash_functions.cl" #include "inc_types.cl" #include "inc_common.cl" -#include "inc_rp.h" -#include "inc_rp.cl" +#include "inc_rp_optimized.h" +#include "inc_rp_optimized.cl" #include "inc_simd.cl" __kernel void m00110_m04 (__global pw_t *pws, __global const kernel_rule_t *rules_buf, __global const pw_t *combs_buf, __global const bf_t *bfs_buf, __global void *tmps, __global void *hooks, __global const u32 *bitmaps_buf_s1_a, __global const u32 *bitmaps_buf_s1_b, __global const u32 *bitmaps_buf_s1_c, __global const u32 *bitmaps_buf_s1_d, __global const u32 *bitmaps_buf_s2_a, __global const u32 *bitmaps_buf_s2_b, __global const u32 *bitmaps_buf_s2_c, __global const u32 *bitmaps_buf_s2_d, __global plain_t *plains_buf, __global const digest_t *digests_buf, __global u32 *hashes_shown, __global const salt_t *salt_bufs, __global const void *esalt_bufs, __global u32 *d_return_buf, __global u32 *d_scryptV0_buf, __global u32 *d_scryptV1_buf, __global u32 *d_scryptV2_buf, __global u32 *d_scryptV3_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 il_cnt, const u32 digests_cnt, const u32 digests_offset, const u32 combs_mode, const u32 gid_max) diff --git a/OpenCL/m00110_a0.cl b/OpenCL/m00110_a0.cl index 030b0ca2e..bd17fc935 100644 --- a/OpenCL/m00110_a0.cl +++ b/OpenCL/m00110_a0.cl @@ -10,8 +10,8 @@ #include "inc_hash_functions.cl" #include "inc_types.cl" #include "inc_common.cl" -#include "inc_rp.h" -#include "inc_rp.cl" +#include "inc_rp_optimized.h" +#include "inc_rp_optimized.cl" #include "inc_scalar.cl" #include "inc_hash_sha1.cl" diff --git a/OpenCL/m00120_a0-optimized.cl b/OpenCL/m00120_a0-optimized.cl index 36f523860..d8a5c7f74 100644 --- a/OpenCL/m00120_a0-optimized.cl +++ b/OpenCL/m00120_a0-optimized.cl @@ -10,8 +10,8 @@ #include "inc_hash_functions.cl" #include "inc_types.cl" #include "inc_common.cl" -#include "inc_rp.h" -#include "inc_rp.cl" +#include "inc_rp_optimized.h" +#include "inc_rp_optimized.cl" #include "inc_simd.cl" __kernel void m00120_m04 (__global pw_t *pws, __global const kernel_rule_t *rules_buf, __global const pw_t *combs_buf, __global const bf_t *bfs_buf, __global void *tmps, __global void *hooks, __global const u32 *bitmaps_buf_s1_a, __global const u32 *bitmaps_buf_s1_b, __global const u32 *bitmaps_buf_s1_c, __global const u32 *bitmaps_buf_s1_d, __global const u32 *bitmaps_buf_s2_a, __global const u32 *bitmaps_buf_s2_b, __global const u32 *bitmaps_buf_s2_c, __global const u32 *bitmaps_buf_s2_d, __global plain_t *plains_buf, __global const digest_t *digests_buf, __global u32 *hashes_shown, __global const salt_t *salt_bufs, __global const void *esalt_bufs, __global u32 *d_return_buf, __global u32 *d_scryptV0_buf, __global u32 *d_scryptV1_buf, __global u32 *d_scryptV2_buf, __global u32 *d_scryptV3_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 il_cnt, const u32 digests_cnt, const u32 digests_offset, const u32 combs_mode, const u32 gid_max) diff --git a/OpenCL/m00120_a0.cl b/OpenCL/m00120_a0.cl index 78dca9c65..9efeaee78 100644 --- a/OpenCL/m00120_a0.cl +++ b/OpenCL/m00120_a0.cl @@ -10,8 +10,8 @@ #include "inc_hash_functions.cl" #include "inc_types.cl" #include "inc_common.cl" -#include "inc_rp.h" -#include "inc_rp.cl" +#include "inc_rp_optimized.h" +#include "inc_rp_optimized.cl" #include "inc_scalar.cl" #include "inc_hash_sha1.cl" diff --git a/OpenCL/m00130_a0-optimized.cl b/OpenCL/m00130_a0-optimized.cl index bbdb9193c..b5c8855a3 100644 --- a/OpenCL/m00130_a0-optimized.cl +++ b/OpenCL/m00130_a0-optimized.cl @@ -10,8 +10,8 @@ #include "inc_hash_functions.cl" #include "inc_types.cl" #include "inc_common.cl" -#include "inc_rp.h" -#include "inc_rp.cl" +#include "inc_rp_optimized.h" +#include "inc_rp_optimized.cl" #include "inc_simd.cl" __kernel void m00130_m04 (__global pw_t *pws, __global const kernel_rule_t *rules_buf, __global const pw_t *combs_buf, __global const bf_t *bfs_buf, __global void *tmps, __global void *hooks, __global const u32 *bitmaps_buf_s1_a, __global const u32 *bitmaps_buf_s1_b, __global const u32 *bitmaps_buf_s1_c, __global const u32 *bitmaps_buf_s1_d, __global const u32 *bitmaps_buf_s2_a, __global const u32 *bitmaps_buf_s2_b, __global const u32 *bitmaps_buf_s2_c, __global const u32 *bitmaps_buf_s2_d, __global plain_t *plains_buf, __global const digest_t *digests_buf, __global u32 *hashes_shown, __global const salt_t *salt_bufs, __global const void *esalt_bufs, __global u32 *d_return_buf, __global u32 *d_scryptV0_buf, __global u32 *d_scryptV1_buf, __global u32 *d_scryptV2_buf, __global u32 *d_scryptV3_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 il_cnt, const u32 digests_cnt, const u32 digests_offset, const u32 combs_mode, const u32 gid_max) diff --git a/OpenCL/m00130_a0.cl b/OpenCL/m00130_a0.cl index 859b3c2c1..81bffa707 100644 --- a/OpenCL/m00130_a0.cl +++ b/OpenCL/m00130_a0.cl @@ -10,8 +10,8 @@ #include "inc_hash_functions.cl" #include "inc_types.cl" #include "inc_common.cl" -#include "inc_rp.h" -#include "inc_rp.cl" +#include "inc_rp_optimized.h" +#include "inc_rp_optimized.cl" #include "inc_scalar.cl" #include "inc_hash_sha1.cl" diff --git a/OpenCL/m00140_a0-optimized.cl b/OpenCL/m00140_a0-optimized.cl index b0e0e98ae..b52160df5 100644 --- a/OpenCL/m00140_a0-optimized.cl +++ b/OpenCL/m00140_a0-optimized.cl @@ -10,8 +10,8 @@ #include "inc_hash_functions.cl" #include "inc_types.cl" #include "inc_common.cl" -#include "inc_rp.h" -#include "inc_rp.cl" +#include "inc_rp_optimized.h" +#include "inc_rp_optimized.cl" #include "inc_simd.cl" __kernel void m00140_m04 (__global pw_t *pws, __global const kernel_rule_t *rules_buf, __global const pw_t *combs_buf, __global const bf_t *bfs_buf, __global void *tmps, __global void *hooks, __global const u32 *bitmaps_buf_s1_a, __global const u32 *bitmaps_buf_s1_b, __global const u32 *bitmaps_buf_s1_c, __global const u32 *bitmaps_buf_s1_d, __global const u32 *bitmaps_buf_s2_a, __global const u32 *bitmaps_buf_s2_b, __global const u32 *bitmaps_buf_s2_c, __global const u32 *bitmaps_buf_s2_d, __global plain_t *plains_buf, __global const digest_t *digests_buf, __global u32 *hashes_shown, __global const salt_t *salt_bufs, __global const void *esalt_bufs, __global u32 *d_return_buf, __global u32 *d_scryptV0_buf, __global u32 *d_scryptV1_buf, __global u32 *d_scryptV2_buf, __global u32 *d_scryptV3_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 il_cnt, const u32 digests_cnt, const u32 digests_offset, const u32 combs_mode, const u32 gid_max) diff --git a/OpenCL/m00140_a0.cl b/OpenCL/m00140_a0.cl index aa9c8b04b..24747dab6 100644 --- a/OpenCL/m00140_a0.cl +++ b/OpenCL/m00140_a0.cl @@ -10,8 +10,8 @@ #include "inc_hash_functions.cl" #include "inc_types.cl" #include "inc_common.cl" -#include "inc_rp.h" -#include "inc_rp.cl" +#include "inc_rp_optimized.h" +#include "inc_rp_optimized.cl" #include "inc_scalar.cl" #include "inc_hash_sha1.cl" diff --git a/OpenCL/m00150_a0-optimized.cl b/OpenCL/m00150_a0-optimized.cl index 851854c48..ccaa4d8d9 100644 --- a/OpenCL/m00150_a0-optimized.cl +++ b/OpenCL/m00150_a0-optimized.cl @@ -10,8 +10,8 @@ #include "inc_hash_functions.cl" #include "inc_types.cl" #include "inc_common.cl" -#include "inc_rp.h" -#include "inc_rp.cl" +#include "inc_rp_optimized.h" +#include "inc_rp_optimized.cl" #include "inc_simd.cl" #include "inc_hash_sha1.cl" diff --git a/OpenCL/m00150_a0.cl b/OpenCL/m00150_a0.cl index 3e4d11f88..39361a681 100644 --- a/OpenCL/m00150_a0.cl +++ b/OpenCL/m00150_a0.cl @@ -10,8 +10,8 @@ #include "inc_hash_functions.cl" #include "inc_types.cl" #include "inc_common.cl" -#include "inc_rp.h" -#include "inc_rp.cl" +#include "inc_rp_optimized.h" +#include "inc_rp_optimized.cl" #include "inc_scalar.cl" #include "inc_hash_sha1.cl" diff --git a/OpenCL/m00160_a0-optimized.cl b/OpenCL/m00160_a0-optimized.cl index 41a7ce4ac..80e9a355a 100644 --- a/OpenCL/m00160_a0-optimized.cl +++ b/OpenCL/m00160_a0-optimized.cl @@ -10,8 +10,8 @@ #include "inc_hash_functions.cl" #include "inc_types.cl" #include "inc_common.cl" -#include "inc_rp.h" -#include "inc_rp.cl" +#include "inc_rp_optimized.h" +#include "inc_rp_optimized.cl" #include "inc_simd.cl" #include "inc_hash_sha1.cl" diff --git a/OpenCL/m00160_a0.cl b/OpenCL/m00160_a0.cl index d32cdac55..457d90020 100644 --- a/OpenCL/m00160_a0.cl +++ b/OpenCL/m00160_a0.cl @@ -10,8 +10,8 @@ #include "inc_hash_functions.cl" #include "inc_types.cl" #include "inc_common.cl" -#include "inc_rp.h" -#include "inc_rp.cl" +#include "inc_rp_optimized.h" +#include "inc_rp_optimized.cl" #include "inc_scalar.cl" #include "inc_hash_sha1.cl" diff --git a/OpenCL/m00200_a0-optimized.cl b/OpenCL/m00200_a0-optimized.cl index 34d95c198..5b5f720a7 100644 --- a/OpenCL/m00200_a0-optimized.cl +++ b/OpenCL/m00200_a0-optimized.cl @@ -11,8 +11,8 @@ #include "inc_hash_functions.cl" #include "inc_types.cl" #include "inc_common.cl" -#include "inc_rp.h" -#include "inc_rp.cl" +#include "inc_rp_optimized.h" +#include "inc_rp_optimized.cl" #include "inc_simd.cl" __kernel void m00200_m04 (__global pw_t *pws, __global const kernel_rule_t *rules_buf, __global const pw_t *combs_buf, __global const bf_t *bfs_buf, __global void *tmps, __global void *hooks, __global const u32 *bitmaps_buf_s1_a, __global const u32 *bitmaps_buf_s1_b, __global const u32 *bitmaps_buf_s1_c, __global const u32 *bitmaps_buf_s1_d, __global const u32 *bitmaps_buf_s2_a, __global const u32 *bitmaps_buf_s2_b, __global const u32 *bitmaps_buf_s2_c, __global const u32 *bitmaps_buf_s2_d, __global plain_t *plains_buf, __global const digest_t *digests_buf, __global u32 *hashes_shown, __global const salt_t *salt_bufs, __global const void *esalt_bufs, __global u32 *d_return_buf, __global u32 *d_scryptV0_buf, __global u32 *d_scryptV1_buf, __global u32 *d_scryptV2_buf, __global u32 *d_scryptV3_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 il_cnt, const u32 digests_cnt, const u32 digests_offset, const u32 combs_mode, const u32 gid_max) diff --git a/OpenCL/m00300_a0-optimized.cl b/OpenCL/m00300_a0-optimized.cl index 71b87e689..d83bef273 100644 --- a/OpenCL/m00300_a0-optimized.cl +++ b/OpenCL/m00300_a0-optimized.cl @@ -10,8 +10,8 @@ #include "inc_hash_functions.cl" #include "inc_types.cl" #include "inc_common.cl" -#include "inc_rp.h" -#include "inc_rp.cl" +#include "inc_rp_optimized.h" +#include "inc_rp_optimized.cl" #include "inc_simd.cl" __kernel void m00300_m04 (__global pw_t *pws, __global const kernel_rule_t *rules_buf, __global const pw_t *combs_buf, __global const bf_t *bfs_buf, __global void *tmps, __global void *hooks, __global const u32 *bitmaps_buf_s1_a, __global const u32 *bitmaps_buf_s1_b, __global const u32 *bitmaps_buf_s1_c, __global const u32 *bitmaps_buf_s1_d, __global const u32 *bitmaps_buf_s2_a, __global const u32 *bitmaps_buf_s2_b, __global const u32 *bitmaps_buf_s2_c, __global const u32 *bitmaps_buf_s2_d, __global plain_t *plains_buf, __global const digest_t *digests_buf, __global u32 *hashes_shown, __global const salt_t *salt_bufs, __global const void *esalt_bufs, __global u32 *d_return_buf, __global u32 *d_scryptV0_buf, __global u32 *d_scryptV1_buf, __global u32 *d_scryptV2_buf, __global u32 *d_scryptV3_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 il_cnt, const u32 digests_cnt, const u32 digests_offset, const u32 combs_mode, const u32 gid_max) diff --git a/OpenCL/m00300_a0.cl b/OpenCL/m00300_a0.cl index d05d17076..fbbe3c585 100644 --- a/OpenCL/m00300_a0.cl +++ b/OpenCL/m00300_a0.cl @@ -10,8 +10,8 @@ #include "inc_hash_functions.cl" #include "inc_types.cl" #include "inc_common.cl" -#include "inc_rp.h" -#include "inc_rp.cl" +#include "inc_rp_optimized.h" +#include "inc_rp_optimized.cl" #include "inc_scalar.cl" #include "inc_hash_sha1.cl" diff --git a/OpenCL/m00600_a0-optimized.cl b/OpenCL/m00600_a0-optimized.cl index 3be0016f7..1699b2e3b 100644 --- a/OpenCL/m00600_a0-optimized.cl +++ b/OpenCL/m00600_a0-optimized.cl @@ -10,8 +10,8 @@ #include "inc_hash_functions.cl" #include "inc_types.cl" #include "inc_common.cl" -#include "inc_rp.h" -#include "inc_rp.cl" +#include "inc_rp_optimized.h" +#include "inc_rp_optimized.cl" #include "inc_simd.cl" #define BLAKE2B_FINAL 1 diff --git a/OpenCL/m00600_a1-optimized.cl b/OpenCL/m00600_a1-optimized.cl index 88b3a8ad0..dd98ad93d 100644 --- a/OpenCL/m00600_a1-optimized.cl +++ b/OpenCL/m00600_a1-optimized.cl @@ -10,8 +10,8 @@ #include "inc_hash_functions.cl" #include "inc_types.cl" #include "inc_common.cl" -#include "inc_rp.h" -#include "inc_rp.cl" +#include "inc_rp_optimized.h" +#include "inc_rp_optimized.cl" #include "inc_simd.cl" #define BLAKE2B_FINAL 1 diff --git a/OpenCL/m00900_a0-optimized.cl b/OpenCL/m00900_a0-optimized.cl index a62b6be8e..a30503a8f 100644 --- a/OpenCL/m00900_a0-optimized.cl +++ b/OpenCL/m00900_a0-optimized.cl @@ -10,8 +10,8 @@ #include "inc_hash_functions.cl" #include "inc_types.cl" #include "inc_common.cl" -#include "inc_rp.h" -#include "inc_rp.cl" +#include "inc_rp_optimized.h" +#include "inc_rp_optimized.cl" #include "inc_simd.cl" __kernel void m00900_m04 (__global pw_t *pws, __global const kernel_rule_t *rules_buf, __global const pw_t *combs_buf, __global const bf_t *bfs_buf, __global void *tmps, __global void *hooks, __global const u32 *bitmaps_buf_s1_a, __global const u32 *bitmaps_buf_s1_b, __global const u32 *bitmaps_buf_s1_c, __global const u32 *bitmaps_buf_s1_d, __global const u32 *bitmaps_buf_s2_a, __global const u32 *bitmaps_buf_s2_b, __global const u32 *bitmaps_buf_s2_c, __global const u32 *bitmaps_buf_s2_d, __global plain_t *plains_buf, __global const digest_t *digests_buf, __global u32 *hashes_shown, __global const salt_t *salt_bufs, __global const void *esalt_bufs, __global u32 *d_return_buf, __global u32 *d_scryptV0_buf, __global u32 *d_scryptV1_buf, __global u32 *d_scryptV2_buf, __global u32 *d_scryptV3_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 il_cnt, const u32 digests_cnt, const u32 digests_offset, const u32 combs_mode, const u32 gid_max) diff --git a/OpenCL/m00900_a0.cl b/OpenCL/m00900_a0.cl index a58b5f934..9a14c10ee 100644 --- a/OpenCL/m00900_a0.cl +++ b/OpenCL/m00900_a0.cl @@ -10,8 +10,8 @@ #include "inc_hash_functions.cl" #include "inc_types.cl" #include "inc_common.cl" -#include "inc_rp.h" -#include "inc_rp.cl" +#include "inc_rp_optimized.h" +#include "inc_rp_optimized.cl" #include "inc_scalar.cl" #include "inc_hash_md4.cl" diff --git a/OpenCL/m01000_a0-optimized.cl b/OpenCL/m01000_a0-optimized.cl index 45b5866ff..6f263de46 100644 --- a/OpenCL/m01000_a0-optimized.cl +++ b/OpenCL/m01000_a0-optimized.cl @@ -10,8 +10,8 @@ #include "inc_hash_functions.cl" #include "inc_types.cl" #include "inc_common.cl" -#include "inc_rp.h" -#include "inc_rp.cl" +#include "inc_rp_optimized.h" +#include "inc_rp_optimized.cl" #include "inc_simd.cl" __kernel void m01000_m04 (__global pw_t *pws, __global const kernel_rule_t *rules_buf, __global const pw_t *combs_buf, __global const bf_t *bfs_buf, __global void *tmps, __global void *hooks, __global const u32 *bitmaps_buf_s1_a, __global const u32 *bitmaps_buf_s1_b, __global const u32 *bitmaps_buf_s1_c, __global const u32 *bitmaps_buf_s1_d, __global const u32 *bitmaps_buf_s2_a, __global const u32 *bitmaps_buf_s2_b, __global const u32 *bitmaps_buf_s2_c, __global const u32 *bitmaps_buf_s2_d, __global plain_t *plains_buf, __global const digest_t *digests_buf, __global u32 *hashes_shown, __global const salt_t *salt_bufs, __global const void *esalt_bufs, __global u32 *d_return_buf, __global u32 *d_scryptV0_buf, __global u32 *d_scryptV1_buf, __global u32 *d_scryptV2_buf, __global u32 *d_scryptV3_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 il_cnt, const u32 digests_cnt, const u32 digests_offset, const u32 combs_mode, const u32 gid_max) diff --git a/OpenCL/m01000_a0.cl b/OpenCL/m01000_a0.cl index c28b005e6..5263d98d0 100644 --- a/OpenCL/m01000_a0.cl +++ b/OpenCL/m01000_a0.cl @@ -10,8 +10,8 @@ #include "inc_hash_functions.cl" #include "inc_types.cl" #include "inc_common.cl" -#include "inc_rp.h" -#include "inc_rp.cl" +#include "inc_rp_optimized.h" +#include "inc_rp_optimized.cl" #include "inc_scalar.cl" #include "inc_hash_md4.cl" diff --git a/OpenCL/m01100_a0-optimized.cl b/OpenCL/m01100_a0-optimized.cl index 4c7744058..c42c6b226 100644 --- a/OpenCL/m01100_a0-optimized.cl +++ b/OpenCL/m01100_a0-optimized.cl @@ -10,8 +10,8 @@ #include "inc_hash_functions.cl" #include "inc_types.cl" #include "inc_common.cl" -#include "inc_rp.h" -#include "inc_rp.cl" +#include "inc_rp_optimized.h" +#include "inc_rp_optimized.cl" #include "inc_simd.cl" __kernel void m01100_m04 (__global pw_t *pws, __global const kernel_rule_t *rules_buf, __global const pw_t *combs_buf, __global const bf_t *bfs_buf, __global void *tmps, __global void *hooks, __global const u32 *bitmaps_buf_s1_a, __global const u32 *bitmaps_buf_s1_b, __global const u32 *bitmaps_buf_s1_c, __global const u32 *bitmaps_buf_s1_d, __global const u32 *bitmaps_buf_s2_a, __global const u32 *bitmaps_buf_s2_b, __global const u32 *bitmaps_buf_s2_c, __global const u32 *bitmaps_buf_s2_d, __global plain_t *plains_buf, __global const digest_t *digests_buf, __global u32 *hashes_shown, __global const salt_t *salt_bufs, __global const void *esalt_bufs, __global u32 *d_return_buf, __global u32 *d_scryptV0_buf, __global u32 *d_scryptV1_buf, __global u32 *d_scryptV2_buf, __global u32 *d_scryptV3_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 il_cnt, const u32 digests_cnt, const u32 digests_offset, const u32 combs_mode, const u32 gid_max) diff --git a/OpenCL/m01100_a0.cl b/OpenCL/m01100_a0.cl index 9dc3d1638..5ff66907e 100644 --- a/OpenCL/m01100_a0.cl +++ b/OpenCL/m01100_a0.cl @@ -10,8 +10,8 @@ #include "inc_hash_functions.cl" #include "inc_types.cl" #include "inc_common.cl" -#include "inc_rp.h" -#include "inc_rp.cl" +#include "inc_rp_optimized.h" +#include "inc_rp_optimized.cl" #include "inc_scalar.cl" #include "inc_hash_md4.cl" diff --git a/OpenCL/m01300_a0-optimized.cl b/OpenCL/m01300_a0-optimized.cl index 4104ce7da..4fcb4d8ea 100644 --- a/OpenCL/m01300_a0-optimized.cl +++ b/OpenCL/m01300_a0-optimized.cl @@ -10,8 +10,8 @@ #include "inc_hash_functions.cl" #include "inc_types.cl" #include "inc_common.cl" -#include "inc_rp.h" -#include "inc_rp.cl" +#include "inc_rp_optimized.h" +#include "inc_rp_optimized.cl" #include "inc_simd.cl" #define SHA224_STEP_REV(a,b,c,d,e,f,g) \ diff --git a/OpenCL/m01300_a0.cl b/OpenCL/m01300_a0.cl index 588e58786..57802bd69 100644 --- a/OpenCL/m01300_a0.cl +++ b/OpenCL/m01300_a0.cl @@ -10,8 +10,8 @@ #include "inc_hash_functions.cl" #include "inc_types.cl" #include "inc_common.cl" -#include "inc_rp.h" -#include "inc_rp.cl" +#include "inc_rp_optimized.h" +#include "inc_rp_optimized.cl" #include "inc_scalar.cl" #include "inc_hash_sha224.cl" diff --git a/OpenCL/m01400_a0-optimized.cl b/OpenCL/m01400_a0-optimized.cl index 940fa7a8e..b3627aa54 100644 --- a/OpenCL/m01400_a0-optimized.cl +++ b/OpenCL/m01400_a0-optimized.cl @@ -10,8 +10,8 @@ #include "inc_hash_functions.cl" #include "inc_types.cl" #include "inc_common.cl" -#include "inc_rp.h" -#include "inc_rp.cl" +#include "inc_rp_optimized.h" +#include "inc_rp_optimized.cl" #include "inc_simd.cl" #define SHA256_STEP_REV(a,b,c,d,e,f,g,h) \ diff --git a/OpenCL/m01400_a0.cl b/OpenCL/m01400_a0.cl index b26194a63..0f7281e04 100644 --- a/OpenCL/m01400_a0.cl +++ b/OpenCL/m01400_a0.cl @@ -10,8 +10,8 @@ #include "inc_hash_functions.cl" #include "inc_types.cl" #include "inc_common.cl" -#include "inc_rp.h" -#include "inc_rp.cl" +#include "inc_rp_optimized.h" +#include "inc_rp_optimized.cl" #include "inc_scalar.cl" #include "inc_hash_sha256.cl" diff --git a/OpenCL/m01410_a0-optimized.cl b/OpenCL/m01410_a0-optimized.cl index c0c8ee435..9d7b58cfd 100644 --- a/OpenCL/m01410_a0-optimized.cl +++ b/OpenCL/m01410_a0-optimized.cl @@ -10,8 +10,8 @@ #include "inc_hash_functions.cl" #include "inc_types.cl" #include "inc_common.cl" -#include "inc_rp.h" -#include "inc_rp.cl" +#include "inc_rp_optimized.h" +#include "inc_rp_optimized.cl" #include "inc_simd.cl" #define SHA256_STEP_REV(a,b,c,d,e,f,g,h) \ diff --git a/OpenCL/m01410_a0.cl b/OpenCL/m01410_a0.cl index b517e02bd..1fe1eacbe 100644 --- a/OpenCL/m01410_a0.cl +++ b/OpenCL/m01410_a0.cl @@ -10,8 +10,8 @@ #include "inc_hash_functions.cl" #include "inc_types.cl" #include "inc_common.cl" -#include "inc_rp.h" -#include "inc_rp.cl" +#include "inc_rp_optimized.h" +#include "inc_rp_optimized.cl" #include "inc_scalar.cl" #include "inc_hash_sha256.cl" diff --git a/OpenCL/m01420_a0-optimized.cl b/OpenCL/m01420_a0-optimized.cl index 868e263cb..5f27f4dce 100644 --- a/OpenCL/m01420_a0-optimized.cl +++ b/OpenCL/m01420_a0-optimized.cl @@ -10,8 +10,8 @@ #include "inc_hash_functions.cl" #include "inc_types.cl" #include "inc_common.cl" -#include "inc_rp.h" -#include "inc_rp.cl" +#include "inc_rp_optimized.h" +#include "inc_rp_optimized.cl" #include "inc_simd.cl" #define SHA256_STEP_REV(a,b,c,d,e,f,g,h) \ diff --git a/OpenCL/m01420_a0.cl b/OpenCL/m01420_a0.cl index 6adc7367f..833950267 100644 --- a/OpenCL/m01420_a0.cl +++ b/OpenCL/m01420_a0.cl @@ -10,8 +10,8 @@ #include "inc_hash_functions.cl" #include "inc_types.cl" #include "inc_common.cl" -#include "inc_rp.h" -#include "inc_rp.cl" +#include "inc_rp_optimized.h" +#include "inc_rp_optimized.cl" #include "inc_scalar.cl" #include "inc_hash_sha256.cl" diff --git a/OpenCL/m01430_a0-optimized.cl b/OpenCL/m01430_a0-optimized.cl index 0cb9e074e..883856c6d 100644 --- a/OpenCL/m01430_a0-optimized.cl +++ b/OpenCL/m01430_a0-optimized.cl @@ -10,8 +10,8 @@ #include "inc_hash_functions.cl" #include "inc_types.cl" #include "inc_common.cl" -#include "inc_rp.h" -#include "inc_rp.cl" +#include "inc_rp_optimized.h" +#include "inc_rp_optimized.cl" #include "inc_simd.cl" #define SHA256_STEP_REV(a,b,c,d,e,f,g,h) \ diff --git a/OpenCL/m01430_a0.cl b/OpenCL/m01430_a0.cl index e3236eef1..57e79232c 100644 --- a/OpenCL/m01430_a0.cl +++ b/OpenCL/m01430_a0.cl @@ -10,8 +10,8 @@ #include "inc_hash_functions.cl" #include "inc_types.cl" #include "inc_common.cl" -#include "inc_rp.h" -#include "inc_rp.cl" +#include "inc_rp_optimized.h" +#include "inc_rp_optimized.cl" #include "inc_scalar.cl" #include "inc_hash_sha256.cl" diff --git a/OpenCL/m01440_a0-optimized.cl b/OpenCL/m01440_a0-optimized.cl index 5aa26a5c0..151386433 100644 --- a/OpenCL/m01440_a0-optimized.cl +++ b/OpenCL/m01440_a0-optimized.cl @@ -10,8 +10,8 @@ #include "inc_hash_functions.cl" #include "inc_types.cl" #include "inc_common.cl" -#include "inc_rp.h" -#include "inc_rp.cl" +#include "inc_rp_optimized.h" +#include "inc_rp_optimized.cl" #include "inc_simd.cl" #define SHA256_STEP_REV(a,b,c,d,e,f,g,h) \ diff --git a/OpenCL/m01440_a0.cl b/OpenCL/m01440_a0.cl index 271d4367e..a12d41519 100644 --- a/OpenCL/m01440_a0.cl +++ b/OpenCL/m01440_a0.cl @@ -10,8 +10,8 @@ #include "inc_hash_functions.cl" #include "inc_types.cl" #include "inc_common.cl" -#include "inc_rp.h" -#include "inc_rp.cl" +#include "inc_rp_optimized.h" +#include "inc_rp_optimized.cl" #include "inc_scalar.cl" #include "inc_hash_sha256.cl" diff --git a/OpenCL/m01450_a0-optimized.cl b/OpenCL/m01450_a0-optimized.cl index 6a3d3c76f..06d72c161 100644 --- a/OpenCL/m01450_a0-optimized.cl +++ b/OpenCL/m01450_a0-optimized.cl @@ -10,8 +10,8 @@ #include "inc_hash_functions.cl" #include "inc_types.cl" #include "inc_common.cl" -#include "inc_rp.h" -#include "inc_rp.cl" +#include "inc_rp_optimized.h" +#include "inc_rp_optimized.cl" #include "inc_simd.cl" #include "inc_hash_sha256.cl" diff --git a/OpenCL/m01450_a0.cl b/OpenCL/m01450_a0.cl index e1462f303..d7b6f3e2e 100644 --- a/OpenCL/m01450_a0.cl +++ b/OpenCL/m01450_a0.cl @@ -10,8 +10,8 @@ #include "inc_hash_functions.cl" #include "inc_types.cl" #include "inc_common.cl" -#include "inc_rp.h" -#include "inc_rp.cl" +#include "inc_rp_optimized.h" +#include "inc_rp_optimized.cl" #include "inc_scalar.cl" #include "inc_hash_sha256.cl" diff --git a/OpenCL/m01460_a0-optimized.cl b/OpenCL/m01460_a0-optimized.cl index d2f19fd3d..c9ad8e338 100644 --- a/OpenCL/m01460_a0-optimized.cl +++ b/OpenCL/m01460_a0-optimized.cl @@ -10,8 +10,8 @@ #include "inc_hash_functions.cl" #include "inc_types.cl" #include "inc_common.cl" -#include "inc_rp.h" -#include "inc_rp.cl" +#include "inc_rp_optimized.h" +#include "inc_rp_optimized.cl" #include "inc_simd.cl" #include "inc_hash_sha256.cl" diff --git a/OpenCL/m01460_a0.cl b/OpenCL/m01460_a0.cl index d51c28cb6..3f839ce50 100644 --- a/OpenCL/m01460_a0.cl +++ b/OpenCL/m01460_a0.cl @@ -10,8 +10,8 @@ #include "inc_hash_functions.cl" #include "inc_types.cl" #include "inc_common.cl" -#include "inc_rp.h" -#include "inc_rp.cl" +#include "inc_rp_optimized.h" +#include "inc_rp_optimized.cl" #include "inc_scalar.cl" #include "inc_hash_sha256.cl" diff --git a/OpenCL/m01500_a0.cl b/OpenCL/m01500_a0.cl index aca153b0e..3d1c3970b 100644 --- a/OpenCL/m01500_a0.cl +++ b/OpenCL/m01500_a0.cl @@ -10,8 +10,8 @@ #include "inc_hash_functions.cl" #include "inc_types.cl" #include "inc_common.cl" -#include "inc_rp.h" -#include "inc_rp.cl" +#include "inc_rp_optimized.h" +#include "inc_rp_optimized.cl" #include "inc_simd.cl" #define PERM_OP(a,b,tt,n,m) \ diff --git a/OpenCL/m01700_a0-optimized.cl b/OpenCL/m01700_a0-optimized.cl index 80f47b085..529177f7e 100644 --- a/OpenCL/m01700_a0-optimized.cl +++ b/OpenCL/m01700_a0-optimized.cl @@ -10,8 +10,8 @@ #include "inc_hash_functions.cl" #include "inc_types.cl" #include "inc_common.cl" -#include "inc_rp.h" -#include "inc_rp.cl" +#include "inc_rp_optimized.h" +#include "inc_rp_optimized.cl" #include "inc_simd.cl" __constant u64a k_sha512[80] = diff --git a/OpenCL/m01700_a0.cl b/OpenCL/m01700_a0.cl index 72e3f0f2b..948653460 100644 --- a/OpenCL/m01700_a0.cl +++ b/OpenCL/m01700_a0.cl @@ -10,8 +10,8 @@ #include "inc_hash_functions.cl" #include "inc_types.cl" #include "inc_common.cl" -#include "inc_rp.h" -#include "inc_rp.cl" +#include "inc_rp_optimized.h" +#include "inc_rp_optimized.cl" #include "inc_scalar.cl" #include "inc_hash_sha512.cl" diff --git a/OpenCL/m01710_a0-optimized.cl b/OpenCL/m01710_a0-optimized.cl index 21c9b0391..e8fc432c8 100644 --- a/OpenCL/m01710_a0-optimized.cl +++ b/OpenCL/m01710_a0-optimized.cl @@ -10,8 +10,8 @@ #include "inc_hash_functions.cl" #include "inc_types.cl" #include "inc_common.cl" -#include "inc_rp.h" -#include "inc_rp.cl" +#include "inc_rp_optimized.h" +#include "inc_rp_optimized.cl" #include "inc_simd.cl" __constant u64a k_sha512[80] = diff --git a/OpenCL/m01710_a0.cl b/OpenCL/m01710_a0.cl index acd32a0f3..34f98e222 100644 --- a/OpenCL/m01710_a0.cl +++ b/OpenCL/m01710_a0.cl @@ -10,8 +10,8 @@ #include "inc_hash_functions.cl" #include "inc_types.cl" #include "inc_common.cl" -#include "inc_rp.h" -#include "inc_rp.cl" +#include "inc_rp_optimized.h" +#include "inc_rp_optimized.cl" #include "inc_scalar.cl" #include "inc_hash_sha512.cl" diff --git a/OpenCL/m01720_a0-optimized.cl b/OpenCL/m01720_a0-optimized.cl index 54a1ea172..501ee72b8 100644 --- a/OpenCL/m01720_a0-optimized.cl +++ b/OpenCL/m01720_a0-optimized.cl @@ -10,8 +10,8 @@ #include "inc_hash_functions.cl" #include "inc_types.cl" #include "inc_common.cl" -#include "inc_rp.h" -#include "inc_rp.cl" +#include "inc_rp_optimized.h" +#include "inc_rp_optimized.cl" #include "inc_simd.cl" __constant u64a k_sha512[80] = diff --git a/OpenCL/m01720_a0.cl b/OpenCL/m01720_a0.cl index e80c9426c..40830e5e7 100644 --- a/OpenCL/m01720_a0.cl +++ b/OpenCL/m01720_a0.cl @@ -10,8 +10,8 @@ #include "inc_hash_functions.cl" #include "inc_types.cl" #include "inc_common.cl" -#include "inc_rp.h" -#include "inc_rp.cl" +#include "inc_rp_optimized.h" +#include "inc_rp_optimized.cl" #include "inc_scalar.cl" #include "inc_hash_sha512.cl" diff --git a/OpenCL/m01730_a0-optimized.cl b/OpenCL/m01730_a0-optimized.cl index ed221ae2c..047a9e070 100644 --- a/OpenCL/m01730_a0-optimized.cl +++ b/OpenCL/m01730_a0-optimized.cl @@ -10,8 +10,8 @@ #include "inc_hash_functions.cl" #include "inc_types.cl" #include "inc_common.cl" -#include "inc_rp.h" -#include "inc_rp.cl" +#include "inc_rp_optimized.h" +#include "inc_rp_optimized.cl" #include "inc_simd.cl" __constant u64a k_sha512[80] = diff --git a/OpenCL/m01730_a0.cl b/OpenCL/m01730_a0.cl index 16a6753a7..b9b9f3d4a 100644 --- a/OpenCL/m01730_a0.cl +++ b/OpenCL/m01730_a0.cl @@ -10,8 +10,8 @@ #include "inc_hash_functions.cl" #include "inc_types.cl" #include "inc_common.cl" -#include "inc_rp.h" -#include "inc_rp.cl" +#include "inc_rp_optimized.h" +#include "inc_rp_optimized.cl" #include "inc_scalar.cl" #include "inc_hash_sha512.cl" diff --git a/OpenCL/m01740_a0-optimized.cl b/OpenCL/m01740_a0-optimized.cl index d5366f7c6..15de496f5 100644 --- a/OpenCL/m01740_a0-optimized.cl +++ b/OpenCL/m01740_a0-optimized.cl @@ -10,8 +10,8 @@ #include "inc_hash_functions.cl" #include "inc_types.cl" #include "inc_common.cl" -#include "inc_rp.h" -#include "inc_rp.cl" +#include "inc_rp_optimized.h" +#include "inc_rp_optimized.cl" #include "inc_simd.cl" __constant u64a k_sha512[80] = diff --git a/OpenCL/m01740_a0.cl b/OpenCL/m01740_a0.cl index 0c76ab222..3d8b383f2 100644 --- a/OpenCL/m01740_a0.cl +++ b/OpenCL/m01740_a0.cl @@ -10,8 +10,8 @@ #include "inc_hash_functions.cl" #include "inc_types.cl" #include "inc_common.cl" -#include "inc_rp.h" -#include "inc_rp.cl" +#include "inc_rp_optimized.h" +#include "inc_rp_optimized.cl" #include "inc_scalar.cl" #include "inc_hash_sha512.cl" diff --git a/OpenCL/m01750_a0-optimized.cl b/OpenCL/m01750_a0-optimized.cl index 48b050202..049df3d84 100644 --- a/OpenCL/m01750_a0-optimized.cl +++ b/OpenCL/m01750_a0-optimized.cl @@ -10,8 +10,8 @@ #include "inc_hash_functions.cl" #include "inc_types.cl" #include "inc_common.cl" -#include "inc_rp.h" -#include "inc_rp.cl" +#include "inc_rp_optimized.h" +#include "inc_rp_optimized.cl" #include "inc_simd.cl" #include "inc_hash_sha512.cl" diff --git a/OpenCL/m01750_a0.cl b/OpenCL/m01750_a0.cl index b3e12bff9..2d259c60c 100644 --- a/OpenCL/m01750_a0.cl +++ b/OpenCL/m01750_a0.cl @@ -10,8 +10,8 @@ #include "inc_hash_functions.cl" #include "inc_types.cl" #include "inc_common.cl" -#include "inc_rp.h" -#include "inc_rp.cl" +#include "inc_rp_optimized.h" +#include "inc_rp_optimized.cl" #include "inc_scalar.cl" #include "inc_hash_sha512.cl" diff --git a/OpenCL/m01760_a0-optimized.cl b/OpenCL/m01760_a0-optimized.cl index 8fbdbd0ea..fb11b1f27 100644 --- a/OpenCL/m01760_a0-optimized.cl +++ b/OpenCL/m01760_a0-optimized.cl @@ -10,8 +10,8 @@ #include "inc_hash_functions.cl" #include "inc_types.cl" #include "inc_common.cl" -#include "inc_rp.h" -#include "inc_rp.cl" +#include "inc_rp_optimized.h" +#include "inc_rp_optimized.cl" #include "inc_simd.cl" #include "inc_hash_sha512.cl" diff --git a/OpenCL/m01760_a0.cl b/OpenCL/m01760_a0.cl index 460e1cb3f..237e955ab 100644 --- a/OpenCL/m01760_a0.cl +++ b/OpenCL/m01760_a0.cl @@ -10,8 +10,8 @@ #include "inc_hash_functions.cl" #include "inc_types.cl" #include "inc_common.cl" -#include "inc_rp.h" -#include "inc_rp.cl" +#include "inc_rp_optimized.h" +#include "inc_rp_optimized.cl" #include "inc_scalar.cl" #include "inc_hash_sha512.cl" diff --git a/OpenCL/m02400_a0-optimized.cl b/OpenCL/m02400_a0-optimized.cl index 2269d8bc8..ff4405ef0 100644 --- a/OpenCL/m02400_a0-optimized.cl +++ b/OpenCL/m02400_a0-optimized.cl @@ -10,8 +10,8 @@ #include "inc_hash_functions.cl" #include "inc_types.cl" #include "inc_common.cl" -#include "inc_rp.h" -#include "inc_rp.cl" +#include "inc_rp_optimized.h" +#include "inc_rp_optimized.cl" #include "inc_simd.cl" __kernel void m02400_m04 (__global pw_t *pws, __global const kernel_rule_t *rules_buf, __global const pw_t *combs_buf, __global const bf_t *bfs_buf, __global void *tmps, __global void *hooks, __global const u32 *bitmaps_buf_s1_a, __global const u32 *bitmaps_buf_s1_b, __global const u32 *bitmaps_buf_s1_c, __global const u32 *bitmaps_buf_s1_d, __global const u32 *bitmaps_buf_s2_a, __global const u32 *bitmaps_buf_s2_b, __global const u32 *bitmaps_buf_s2_c, __global const u32 *bitmaps_buf_s2_d, __global plain_t *plains_buf, __global const digest_t *digests_buf, __global u32 *hashes_shown, __global const salt_t *salt_bufs, __global const void *esalt_bufs, __global u32 *d_return_buf, __global u32 *d_scryptV0_buf, __global u32 *d_scryptV1_buf, __global u32 *d_scryptV2_buf, __global u32 *d_scryptV3_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 il_cnt, const u32 digests_cnt, const u32 digests_offset, const u32 combs_mode, const u32 gid_max) diff --git a/OpenCL/m02410_a0-optimized.cl b/OpenCL/m02410_a0-optimized.cl index 169f87e1a..985b9639f 100644 --- a/OpenCL/m02410_a0-optimized.cl +++ b/OpenCL/m02410_a0-optimized.cl @@ -10,8 +10,8 @@ #include "inc_hash_functions.cl" #include "inc_types.cl" #include "inc_common.cl" -#include "inc_rp.h" -#include "inc_rp.cl" +#include "inc_rp_optimized.h" +#include "inc_rp_optimized.cl" #include "inc_simd.cl" __kernel void m02410_m04 (__global pw_t *pws, __global const kernel_rule_t *rules_buf, __global const pw_t *combs_buf, __global const bf_t *bfs_buf, __global void *tmps, __global void *hooks, __global const u32 *bitmaps_buf_s1_a, __global const u32 *bitmaps_buf_s1_b, __global const u32 *bitmaps_buf_s1_c, __global const u32 *bitmaps_buf_s1_d, __global const u32 *bitmaps_buf_s2_a, __global const u32 *bitmaps_buf_s2_b, __global const u32 *bitmaps_buf_s2_c, __global const u32 *bitmaps_buf_s2_d, __global plain_t *plains_buf, __global const digest_t *digests_buf, __global u32 *hashes_shown, __global const salt_t *salt_bufs, __global const void *esalt_bufs, __global u32 *d_return_buf, __global u32 *d_scryptV0_buf, __global u32 *d_scryptV1_buf, __global u32 *d_scryptV2_buf, __global u32 *d_scryptV3_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 il_cnt, const u32 digests_cnt, const u32 digests_offset, const u32 combs_mode, const u32 gid_max) diff --git a/OpenCL/m02610_a0-optimized.cl b/OpenCL/m02610_a0-optimized.cl index 85fd13bd6..66cbec732 100644 --- a/OpenCL/m02610_a0-optimized.cl +++ b/OpenCL/m02610_a0-optimized.cl @@ -10,8 +10,8 @@ #include "inc_hash_functions.cl" #include "inc_types.cl" #include "inc_common.cl" -#include "inc_rp.h" -#include "inc_rp.cl" +#include "inc_rp_optimized.h" +#include "inc_rp_optimized.cl" #include "inc_simd.cl" #if VECT_SIZE == 1 diff --git a/OpenCL/m02610_a0.cl b/OpenCL/m02610_a0.cl index d86d026c8..459b40ba4 100644 --- a/OpenCL/m02610_a0.cl +++ b/OpenCL/m02610_a0.cl @@ -10,8 +10,8 @@ #include "inc_hash_functions.cl" #include "inc_types.cl" #include "inc_common.cl" -#include "inc_rp.h" -#include "inc_rp.cl" +#include "inc_rp_optimized.h" +#include "inc_rp_optimized.cl" #include "inc_scalar.cl" #include "inc_hash_md5.cl" diff --git a/OpenCL/m02710_a0-optimized.cl b/OpenCL/m02710_a0-optimized.cl index 135f48bdd..1ec0bac14 100644 --- a/OpenCL/m02710_a0-optimized.cl +++ b/OpenCL/m02710_a0-optimized.cl @@ -10,8 +10,8 @@ #include "inc_hash_functions.cl" #include "inc_types.cl" #include "inc_common.cl" -#include "inc_rp.h" -#include "inc_rp.cl" +#include "inc_rp_optimized.h" +#include "inc_rp_optimized.cl" #include "inc_simd.cl" #if VECT_SIZE == 1 diff --git a/OpenCL/m02810_a0-optimized.cl b/OpenCL/m02810_a0-optimized.cl index 5c944f9a9..d6e63f577 100644 --- a/OpenCL/m02810_a0-optimized.cl +++ b/OpenCL/m02810_a0-optimized.cl @@ -10,8 +10,8 @@ #include "inc_hash_functions.cl" #include "inc_types.cl" #include "inc_common.cl" -#include "inc_rp.h" -#include "inc_rp.cl" +#include "inc_rp_optimized.h" +#include "inc_rp_optimized.cl" #include "inc_simd.cl" #if VECT_SIZE == 1 diff --git a/OpenCL/m02810_a0.cl b/OpenCL/m02810_a0.cl index c1e047201..4afbd8bf0 100644 --- a/OpenCL/m02810_a0.cl +++ b/OpenCL/m02810_a0.cl @@ -10,8 +10,8 @@ #include "inc_hash_functions.cl" #include "inc_types.cl" #include "inc_common.cl" -#include "inc_rp.h" -#include "inc_rp.cl" +#include "inc_rp_optimized.h" +#include "inc_rp_optimized.cl" #include "inc_scalar.cl" #include "inc_hash_md5.cl" diff --git a/OpenCL/m03000_a0.cl b/OpenCL/m03000_a0.cl index f54b03b05..d9bf08b96 100644 --- a/OpenCL/m03000_a0.cl +++ b/OpenCL/m03000_a0.cl @@ -10,8 +10,8 @@ #include "inc_hash_functions.cl" #include "inc_types.cl" #include "inc_common.cl" -#include "inc_rp.h" -#include "inc_rp.cl" +#include "inc_rp_optimized.h" +#include "inc_rp_optimized.cl" #include "inc_simd.cl" #define PERM_OP(a,b,tt,n,m) \ diff --git a/OpenCL/m03100_a0-optimized.cl b/OpenCL/m03100_a0-optimized.cl index 8b177b7b7..a004b9c24 100644 --- a/OpenCL/m03100_a0-optimized.cl +++ b/OpenCL/m03100_a0-optimized.cl @@ -11,8 +11,8 @@ #include "inc_hash_functions.cl" #include "inc_types.cl" #include "inc_common.cl" -#include "inc_rp.h" -#include "inc_rp.cl" +#include "inc_rp_optimized.h" +#include "inc_rp_optimized.cl" #include "inc_simd.cl" #define PERM_OP(a,b,tt,n,m) \ diff --git a/OpenCL/m03710_a0-optimized.cl b/OpenCL/m03710_a0-optimized.cl index 50ac6a56b..f1e50ba87 100644 --- a/OpenCL/m03710_a0-optimized.cl +++ b/OpenCL/m03710_a0-optimized.cl @@ -10,8 +10,8 @@ #include "inc_hash_functions.cl" #include "inc_types.cl" #include "inc_common.cl" -#include "inc_rp.h" -#include "inc_rp.cl" +#include "inc_rp_optimized.h" +#include "inc_rp_optimized.cl" #include "inc_simd.cl" #if VECT_SIZE == 1 diff --git a/OpenCL/m03710_a0.cl b/OpenCL/m03710_a0.cl index 1401ad716..d6f1ed07a 100644 --- a/OpenCL/m03710_a0.cl +++ b/OpenCL/m03710_a0.cl @@ -10,8 +10,8 @@ #include "inc_hash_functions.cl" #include "inc_types.cl" #include "inc_common.cl" -#include "inc_rp.h" -#include "inc_rp.cl" +#include "inc_rp_optimized.h" +#include "inc_rp_optimized.cl" #include "inc_scalar.cl" #include "inc_hash_md5.cl" diff --git a/OpenCL/m03800_a0-optimized.cl b/OpenCL/m03800_a0-optimized.cl index ffb19aab8..c3a0b9930 100644 --- a/OpenCL/m03800_a0-optimized.cl +++ b/OpenCL/m03800_a0-optimized.cl @@ -10,8 +10,8 @@ #include "inc_hash_functions.cl" #include "inc_types.cl" #include "inc_common.cl" -#include "inc_rp.h" -#include "inc_rp.cl" +#include "inc_rp_optimized.h" +#include "inc_rp_optimized.cl" #include "inc_simd.cl" __kernel void m03800_m04 (__global pw_t *pws, __global const kernel_rule_t *rules_buf, __global const pw_t *combs_buf, __global const bf_t *bfs_buf, __global void *tmps, __global void *hooks, __global const u32 *bitmaps_buf_s1_a, __global const u32 *bitmaps_buf_s1_b, __global const u32 *bitmaps_buf_s1_c, __global const u32 *bitmaps_buf_s1_d, __global const u32 *bitmaps_buf_s2_a, __global const u32 *bitmaps_buf_s2_b, __global const u32 *bitmaps_buf_s2_c, __global const u32 *bitmaps_buf_s2_d, __global plain_t *plains_buf, __global const digest_t *digests_buf, __global u32 *hashes_shown, __global const salt_t *salt_bufs, __global const void *esalt_bufs, __global u32 *d_return_buf, __global u32 *d_scryptV0_buf, __global u32 *d_scryptV1_buf, __global u32 *d_scryptV2_buf, __global u32 *d_scryptV3_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 il_cnt, const u32 digests_cnt, const u32 digests_offset, const u32 combs_mode, const u32 gid_max) diff --git a/OpenCL/m03800_a0.cl b/OpenCL/m03800_a0.cl index 8608dc55c..75e4673ed 100644 --- a/OpenCL/m03800_a0.cl +++ b/OpenCL/m03800_a0.cl @@ -10,8 +10,8 @@ #include "inc_hash_functions.cl" #include "inc_types.cl" #include "inc_common.cl" -#include "inc_rp.h" -#include "inc_rp.cl" +#include "inc_rp_optimized.h" +#include "inc_rp_optimized.cl" #include "inc_scalar.cl" #include "inc_hash_md5.cl" diff --git a/OpenCL/m03910_a0-optimized.cl b/OpenCL/m03910_a0-optimized.cl index e0faae0c1..c7d96058b 100644 --- a/OpenCL/m03910_a0-optimized.cl +++ b/OpenCL/m03910_a0-optimized.cl @@ -10,8 +10,8 @@ #include "inc_hash_functions.cl" #include "inc_types.cl" #include "inc_common.cl" -#include "inc_rp.h" -#include "inc_rp.cl" +#include "inc_rp_optimized.h" +#include "inc_rp_optimized.cl" #include "inc_simd.cl" #if VECT_SIZE == 1 diff --git a/OpenCL/m03910_a0.cl b/OpenCL/m03910_a0.cl index a296705c5..570587c2c 100644 --- a/OpenCL/m03910_a0.cl +++ b/OpenCL/m03910_a0.cl @@ -10,8 +10,8 @@ #include "inc_hash_functions.cl" #include "inc_types.cl" #include "inc_common.cl" -#include "inc_rp.h" -#include "inc_rp.cl" +#include "inc_rp_optimized.h" +#include "inc_rp_optimized.cl" #include "inc_scalar.cl" #include "inc_hash_md5.cl" diff --git a/OpenCL/m04010_a0-optimized.cl b/OpenCL/m04010_a0-optimized.cl index 9d008c854..f970328ec 100644 --- a/OpenCL/m04010_a0-optimized.cl +++ b/OpenCL/m04010_a0-optimized.cl @@ -10,8 +10,8 @@ #include "inc_hash_functions.cl" #include "inc_types.cl" #include "inc_common.cl" -#include "inc_rp.h" -#include "inc_rp.cl" +#include "inc_rp_optimized.h" +#include "inc_rp_optimized.cl" #include "inc_simd.cl" #if VECT_SIZE == 1 diff --git a/OpenCL/m04010_a0.cl b/OpenCL/m04010_a0.cl index e1365e632..17b75c12f 100644 --- a/OpenCL/m04010_a0.cl +++ b/OpenCL/m04010_a0.cl @@ -10,8 +10,8 @@ #include "inc_hash_functions.cl" #include "inc_types.cl" #include "inc_common.cl" -#include "inc_rp.h" -#include "inc_rp.cl" +#include "inc_rp_optimized.h" +#include "inc_rp_optimized.cl" #include "inc_scalar.cl" #include "inc_hash_md5.cl" diff --git a/OpenCL/m04110_a0-optimized.cl b/OpenCL/m04110_a0-optimized.cl index 0f095ee49..12e9d424d 100644 --- a/OpenCL/m04110_a0-optimized.cl +++ b/OpenCL/m04110_a0-optimized.cl @@ -10,8 +10,8 @@ #include "inc_hash_functions.cl" #include "inc_types.cl" #include "inc_common.cl" -#include "inc_rp.h" -#include "inc_rp.cl" +#include "inc_rp_optimized.h" +#include "inc_rp_optimized.cl" #include "inc_simd.cl" #if VECT_SIZE == 1 diff --git a/OpenCL/m04110_a0.cl b/OpenCL/m04110_a0.cl index ed85497a3..413ed0e55 100644 --- a/OpenCL/m04110_a0.cl +++ b/OpenCL/m04110_a0.cl @@ -10,8 +10,8 @@ #include "inc_hash_functions.cl" #include "inc_types.cl" #include "inc_common.cl" -#include "inc_rp.h" -#include "inc_rp.cl" +#include "inc_rp_optimized.h" +#include "inc_rp_optimized.cl" #include "inc_scalar.cl" #include "inc_hash_md5.cl" diff --git a/OpenCL/m04310_a0-optimized.cl b/OpenCL/m04310_a0-optimized.cl index bd7706b61..fd849fa00 100644 --- a/OpenCL/m04310_a0-optimized.cl +++ b/OpenCL/m04310_a0-optimized.cl @@ -10,8 +10,8 @@ #include "inc_hash_functions.cl" #include "inc_types.cl" #include "inc_common.cl" -#include "inc_rp.h" -#include "inc_rp.cl" +#include "inc_rp_optimized.h" +#include "inc_rp_optimized.cl" #include "inc_simd.cl" #if VECT_SIZE == 1 diff --git a/OpenCL/m04310_a0.cl b/OpenCL/m04310_a0.cl index 6e2ac764e..04ea44233 100644 --- a/OpenCL/m04310_a0.cl +++ b/OpenCL/m04310_a0.cl @@ -10,8 +10,8 @@ #include "inc_hash_functions.cl" #include "inc_types.cl" #include "inc_common.cl" -#include "inc_rp.h" -#include "inc_rp.cl" +#include "inc_rp_optimized.h" +#include "inc_rp_optimized.cl" #include "inc_scalar.cl" #include "inc_hash_md5.cl" diff --git a/OpenCL/m04400_a0-optimized.cl b/OpenCL/m04400_a0-optimized.cl index f1ed1e29f..22fbb4303 100644 --- a/OpenCL/m04400_a0-optimized.cl +++ b/OpenCL/m04400_a0-optimized.cl @@ -10,8 +10,8 @@ #include "inc_hash_functions.cl" #include "inc_types.cl" #include "inc_common.cl" -#include "inc_rp.h" -#include "inc_rp.cl" +#include "inc_rp_optimized.h" +#include "inc_rp_optimized.cl" #include "inc_simd.cl" #if VECT_SIZE == 1 diff --git a/OpenCL/m04400_a0.cl b/OpenCL/m04400_a0.cl index 7d583393c..73457f6c5 100644 --- a/OpenCL/m04400_a0.cl +++ b/OpenCL/m04400_a0.cl @@ -10,8 +10,8 @@ #include "inc_hash_functions.cl" #include "inc_types.cl" #include "inc_common.cl" -#include "inc_rp.h" -#include "inc_rp.cl" +#include "inc_rp_optimized.h" +#include "inc_rp_optimized.cl" #include "inc_scalar.cl" #include "inc_hash_md5.cl" #include "inc_hash_sha1.cl" diff --git a/OpenCL/m04500_a0-optimized.cl b/OpenCL/m04500_a0-optimized.cl index 15335e31c..7ee2f95e6 100644 --- a/OpenCL/m04500_a0-optimized.cl +++ b/OpenCL/m04500_a0-optimized.cl @@ -10,8 +10,8 @@ #include "inc_hash_functions.cl" #include "inc_types.cl" #include "inc_common.cl" -#include "inc_rp.h" -#include "inc_rp.cl" +#include "inc_rp_optimized.h" +#include "inc_rp_optimized.cl" #include "inc_simd.cl" #if VECT_SIZE == 1 diff --git a/OpenCL/m04500_a0.cl b/OpenCL/m04500_a0.cl index 35d111c0e..b76522bfc 100644 --- a/OpenCL/m04500_a0.cl +++ b/OpenCL/m04500_a0.cl @@ -10,8 +10,8 @@ #include "inc_hash_functions.cl" #include "inc_types.cl" #include "inc_common.cl" -#include "inc_rp.h" -#include "inc_rp.cl" +#include "inc_rp_optimized.h" +#include "inc_rp_optimized.cl" #include "inc_scalar.cl" #include "inc_hash_sha1.cl" diff --git a/OpenCL/m04520_a0-optimized.cl b/OpenCL/m04520_a0-optimized.cl index ffe67e08e..e2d7ef513 100644 --- a/OpenCL/m04520_a0-optimized.cl +++ b/OpenCL/m04520_a0-optimized.cl @@ -10,8 +10,8 @@ #include "inc_hash_functions.cl" #include "inc_types.cl" #include "inc_common.cl" -#include "inc_rp.h" -#include "inc_rp.cl" +#include "inc_rp_optimized.h" +#include "inc_rp_optimized.cl" #include "inc_simd.cl" #if VECT_SIZE == 1 diff --git a/OpenCL/m04520_a0.cl b/OpenCL/m04520_a0.cl index bf8924407..b414de223 100644 --- a/OpenCL/m04520_a0.cl +++ b/OpenCL/m04520_a0.cl @@ -10,8 +10,8 @@ #include "inc_hash_functions.cl" #include "inc_types.cl" #include "inc_common.cl" -#include "inc_rp.h" -#include "inc_rp.cl" +#include "inc_rp_optimized.h" +#include "inc_rp_optimized.cl" #include "inc_scalar.cl" #include "inc_hash_sha1.cl" diff --git a/OpenCL/m04700_a0-optimized.cl b/OpenCL/m04700_a0-optimized.cl index f837c2e38..259ec1ebf 100644 --- a/OpenCL/m04700_a0-optimized.cl +++ b/OpenCL/m04700_a0-optimized.cl @@ -10,8 +10,8 @@ #include "inc_hash_functions.cl" #include "inc_types.cl" #include "inc_common.cl" -#include "inc_rp.h" -#include "inc_rp.cl" +#include "inc_rp_optimized.h" +#include "inc_rp_optimized.cl" #include "inc_simd.cl" #if VECT_SIZE == 1 diff --git a/OpenCL/m04700_a0.cl b/OpenCL/m04700_a0.cl index 611834f5d..bf2db7bb0 100644 --- a/OpenCL/m04700_a0.cl +++ b/OpenCL/m04700_a0.cl @@ -10,8 +10,8 @@ #include "inc_hash_functions.cl" #include "inc_types.cl" #include "inc_common.cl" -#include "inc_rp.h" -#include "inc_rp.cl" +#include "inc_rp_optimized.h" +#include "inc_rp_optimized.cl" #include "inc_scalar.cl" #include "inc_hash_md5.cl" #include "inc_hash_sha1.cl" diff --git a/OpenCL/m04800_a0-optimized.cl b/OpenCL/m04800_a0-optimized.cl index 5c5851470..2be2545fd 100644 --- a/OpenCL/m04800_a0-optimized.cl +++ b/OpenCL/m04800_a0-optimized.cl @@ -10,8 +10,8 @@ #include "inc_hash_functions.cl" #include "inc_types.cl" #include "inc_common.cl" -#include "inc_rp.h" -#include "inc_rp.cl" +#include "inc_rp_optimized.h" +#include "inc_rp_optimized.cl" #include "inc_simd.cl" __kernel void m04800_m04 (__global pw_t *pws, __global const kernel_rule_t *rules_buf, __global const pw_t *combs_buf, __global const bf_t *bfs_buf, __global void *tmps, __global void *hooks, __global const u32 *bitmaps_buf_s1_a, __global const u32 *bitmaps_buf_s1_b, __global const u32 *bitmaps_buf_s1_c, __global const u32 *bitmaps_buf_s1_d, __global const u32 *bitmaps_buf_s2_a, __global const u32 *bitmaps_buf_s2_b, __global const u32 *bitmaps_buf_s2_c, __global const u32 *bitmaps_buf_s2_d, __global plain_t *plains_buf, __global const digest_t *digests_buf, __global u32 *hashes_shown, __global const salt_t *salt_bufs, __global const void *esalt_bufs, __global u32 *d_return_buf, __global u32 *d_scryptV0_buf, __global u32 *d_scryptV1_buf, __global u32 *d_scryptV2_buf, __global u32 *d_scryptV3_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 il_cnt, const u32 digests_cnt, const u32 digests_offset, const u32 combs_mode, const u32 gid_max) diff --git a/OpenCL/m04800_a0.cl b/OpenCL/m04800_a0.cl index fea15ad37..3e4a08686 100644 --- a/OpenCL/m04800_a0.cl +++ b/OpenCL/m04800_a0.cl @@ -10,8 +10,8 @@ #include "inc_hash_functions.cl" #include "inc_types.cl" #include "inc_common.cl" -#include "inc_rp.h" -#include "inc_rp.cl" +#include "inc_rp_optimized.h" +#include "inc_rp_optimized.cl" #include "inc_scalar.cl" #include "inc_hash_md5.cl" diff --git a/OpenCL/m04900_a0-optimized.cl b/OpenCL/m04900_a0-optimized.cl index 0cd61a661..52b3a1bb0 100644 --- a/OpenCL/m04900_a0-optimized.cl +++ b/OpenCL/m04900_a0-optimized.cl @@ -10,8 +10,8 @@ #include "inc_hash_functions.cl" #include "inc_types.cl" #include "inc_common.cl" -#include "inc_rp.h" -#include "inc_rp.cl" +#include "inc_rp_optimized.h" +#include "inc_rp_optimized.cl" #include "inc_simd.cl" __kernel void m04900_m04 (__global pw_t *pws, __global const kernel_rule_t *rules_buf, __global const pw_t *combs_buf, __global const bf_t *bfs_buf, __global void *tmps, __global void *hooks, __global const u32 *bitmaps_buf_s1_a, __global const u32 *bitmaps_buf_s1_b, __global const u32 *bitmaps_buf_s1_c, __global const u32 *bitmaps_buf_s1_d, __global const u32 *bitmaps_buf_s2_a, __global const u32 *bitmaps_buf_s2_b, __global const u32 *bitmaps_buf_s2_c, __global const u32 *bitmaps_buf_s2_d, __global plain_t *plains_buf, __global const digest_t *digests_buf, __global u32 *hashes_shown, __global const salt_t *salt_bufs, __global const void *esalt_bufs, __global u32 *d_return_buf, __global u32 *d_scryptV0_buf, __global u32 *d_scryptV1_buf, __global u32 *d_scryptV2_buf, __global u32 *d_scryptV3_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 il_cnt, const u32 digests_cnt, const u32 digests_offset, const u32 combs_mode, const u32 gid_max) diff --git a/OpenCL/m04900_a0.cl b/OpenCL/m04900_a0.cl index b1332a3de..ff71dc8b5 100644 --- a/OpenCL/m04900_a0.cl +++ b/OpenCL/m04900_a0.cl @@ -10,8 +10,8 @@ #include "inc_hash_functions.cl" #include "inc_types.cl" #include "inc_common.cl" -#include "inc_rp.h" -#include "inc_rp.cl" +#include "inc_rp_optimized.h" +#include "inc_rp_optimized.cl" #include "inc_scalar.cl" #include "inc_hash_sha1.cl" diff --git a/OpenCL/m05000_a0-optimized.cl b/OpenCL/m05000_a0-optimized.cl index 83a958a64..d91901727 100644 --- a/OpenCL/m05000_a0-optimized.cl +++ b/OpenCL/m05000_a0-optimized.cl @@ -10,8 +10,8 @@ #include "inc_hash_functions.cl" #include "inc_types.cl" #include "inc_common.cl" -#include "inc_rp.h" -#include "inc_rp.cl" +#include "inc_rp_optimized.h" +#include "inc_rp_optimized.cl" #include "inc_simd.cl" __constant u64a keccakf_rndc[24] = diff --git a/OpenCL/m05100_a0-optimized.cl b/OpenCL/m05100_a0-optimized.cl index d8ab3d7ab..affcac513 100644 --- a/OpenCL/m05100_a0-optimized.cl +++ b/OpenCL/m05100_a0-optimized.cl @@ -10,8 +10,8 @@ #include "inc_hash_functions.cl" #include "inc_types.cl" #include "inc_common.cl" -#include "inc_rp.h" -#include "inc_rp.cl" +#include "inc_rp_optimized.h" +#include "inc_rp_optimized.cl" #include "inc_simd.cl" __kernel void m05100_m04 (__global pw_t *pws, __global const kernel_rule_t *rules_buf, __global const pw_t *combs_buf, __global const bf_t *bfs_buf, __global void *tmps, __global void *hooks, __global const u32 *bitmaps_buf_s1_a, __global const u32 *bitmaps_buf_s1_b, __global const u32 *bitmaps_buf_s1_c, __global const u32 *bitmaps_buf_s1_d, __global const u32 *bitmaps_buf_s2_a, __global const u32 *bitmaps_buf_s2_b, __global const u32 *bitmaps_buf_s2_c, __global const u32 *bitmaps_buf_s2_d, __global plain_t *plains_buf, __global const digest_t *digests_buf, __global u32 *hashes_shown, __global const salt_t *salt_bufs, __global const void *esalt_bufs, __global u32 *d_return_buf, __global u32 *d_scryptV0_buf, __global u32 *d_scryptV1_buf, __global u32 *d_scryptV2_buf, __global u32 *d_scryptV3_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 il_cnt, const u32 digests_cnt, const u32 digests_offset, const u32 combs_mode, const u32 gid_max) diff --git a/OpenCL/m05100_a0.cl b/OpenCL/m05100_a0.cl index bbaf71b68..c69ed3e78 100644 --- a/OpenCL/m05100_a0.cl +++ b/OpenCL/m05100_a0.cl @@ -10,8 +10,8 @@ #include "inc_hash_functions.cl" #include "inc_types.cl" #include "inc_common.cl" -#include "inc_rp.h" -#include "inc_rp.cl" +#include "inc_rp_optimized.h" +#include "inc_rp_optimized.cl" #include "inc_scalar.cl" #include "inc_hash_md5.cl" diff --git a/OpenCL/m05300_a0-optimized.cl b/OpenCL/m05300_a0-optimized.cl index e342aca06..670927230 100644 --- a/OpenCL/m05300_a0-optimized.cl +++ b/OpenCL/m05300_a0-optimized.cl @@ -10,8 +10,8 @@ #include "inc_hash_functions.cl" #include "inc_types.cl" #include "inc_common.cl" -#include "inc_rp.h" -#include "inc_rp.cl" +#include "inc_rp_optimized.h" +#include "inc_rp_optimized.cl" #include "inc_simd.cl" #include "inc_hash_md5.cl" diff --git a/OpenCL/m05300_a0.cl b/OpenCL/m05300_a0.cl index 552785041..53cd62281 100644 --- a/OpenCL/m05300_a0.cl +++ b/OpenCL/m05300_a0.cl @@ -10,8 +10,8 @@ #include "inc_hash_functions.cl" #include "inc_types.cl" #include "inc_common.cl" -#include "inc_rp.h" -#include "inc_rp.cl" +#include "inc_rp_optimized.h" +#include "inc_rp_optimized.cl" #include "inc_scalar.cl" #include "inc_hash_md5.cl" diff --git a/OpenCL/m05400_a0-optimized.cl b/OpenCL/m05400_a0-optimized.cl index 27b282e44..faf6458a7 100644 --- a/OpenCL/m05400_a0-optimized.cl +++ b/OpenCL/m05400_a0-optimized.cl @@ -10,8 +10,8 @@ #include "inc_hash_functions.cl" #include "inc_types.cl" #include "inc_common.cl" -#include "inc_rp.h" -#include "inc_rp.cl" +#include "inc_rp_optimized.h" +#include "inc_rp_optimized.cl" #include "inc_simd.cl" #include "inc_hash_sha1.cl" diff --git a/OpenCL/m05400_a0.cl b/OpenCL/m05400_a0.cl index 252e18f61..27d5be542 100644 --- a/OpenCL/m05400_a0.cl +++ b/OpenCL/m05400_a0.cl @@ -10,8 +10,8 @@ #include "inc_hash_functions.cl" #include "inc_types.cl" #include "inc_common.cl" -#include "inc_rp.h" -#include "inc_rp.cl" +#include "inc_rp_optimized.h" +#include "inc_rp_optimized.cl" #include "inc_scalar.cl" #include "inc_hash_sha1.cl" diff --git a/OpenCL/m05500_a0-optimized.cl b/OpenCL/m05500_a0-optimized.cl index 49c9b7ee2..a73ea435b 100644 --- a/OpenCL/m05500_a0-optimized.cl +++ b/OpenCL/m05500_a0-optimized.cl @@ -10,8 +10,8 @@ #include "inc_hash_functions.cl" #include "inc_types.cl" #include "inc_common.cl" -#include "inc_rp.h" -#include "inc_rp.cl" +#include "inc_rp_optimized.h" +#include "inc_rp_optimized.cl" #include "inc_simd.cl" #define PERM_OP(a,b,tt,n,m) \ diff --git a/OpenCL/m05500_a0.cl b/OpenCL/m05500_a0.cl index d10338f6c..7dccde687 100644 --- a/OpenCL/m05500_a0.cl +++ b/OpenCL/m05500_a0.cl @@ -10,8 +10,8 @@ #include "inc_hash_functions.cl" #include "inc_types.cl" #include "inc_common.cl" -#include "inc_rp.h" -#include "inc_rp.cl" +#include "inc_rp_optimized.h" +#include "inc_rp_optimized.cl" #include "inc_scalar.cl" #include "inc_hash_md4.cl" diff --git a/OpenCL/m05600_a0-optimized.cl b/OpenCL/m05600_a0-optimized.cl index 4f67f8389..62582a63e 100644 --- a/OpenCL/m05600_a0-optimized.cl +++ b/OpenCL/m05600_a0-optimized.cl @@ -10,8 +10,8 @@ #include "inc_hash_functions.cl" #include "inc_types.cl" #include "inc_common.cl" -#include "inc_rp.h" -#include "inc_rp.cl" +#include "inc_rp_optimized.h" +#include "inc_rp_optimized.cl" #include "inc_simd.cl" #include "inc_hash_md4.cl" #include "inc_hash_md5.cl" diff --git a/OpenCL/m05600_a0.cl b/OpenCL/m05600_a0.cl index 1c2ac82bf..8703ccd82 100644 --- a/OpenCL/m05600_a0.cl +++ b/OpenCL/m05600_a0.cl @@ -10,8 +10,8 @@ #include "inc_hash_functions.cl" #include "inc_types.cl" #include "inc_common.cl" -#include "inc_rp.h" -#include "inc_rp.cl" +#include "inc_rp_optimized.h" +#include "inc_rp_optimized.cl" #include "inc_scalar.cl" #include "inc_hash_md4.cl" #include "inc_hash_md5.cl" diff --git a/OpenCL/m06000_a0-optimized.cl b/OpenCL/m06000_a0-optimized.cl index 58cc33acb..38283e336 100644 --- a/OpenCL/m06000_a0-optimized.cl +++ b/OpenCL/m06000_a0-optimized.cl @@ -10,8 +10,8 @@ #include "inc_hash_functions.cl" #include "inc_types.cl" #include "inc_common.cl" -#include "inc_rp.h" -#include "inc_rp.cl" +#include "inc_rp_optimized.h" +#include "inc_rp_optimized.cl" #include "inc_simd.cl" #include "inc_hash_ripemd160.cl" diff --git a/OpenCL/m06000_a0.cl b/OpenCL/m06000_a0.cl index cc67d8593..203439658 100644 --- a/OpenCL/m06000_a0.cl +++ b/OpenCL/m06000_a0.cl @@ -10,8 +10,8 @@ #include "inc_hash_functions.cl" #include "inc_types.cl" #include "inc_common.cl" -#include "inc_rp.h" -#include "inc_rp.cl" +#include "inc_rp_optimized.h" +#include "inc_rp_optimized.cl" #include "inc_scalar.cl" #include "inc_hash_ripemd160.cl" diff --git a/OpenCL/m06100_a0-optimized.cl b/OpenCL/m06100_a0-optimized.cl index afbbb7d0f..64c7129e3 100644 --- a/OpenCL/m06100_a0-optimized.cl +++ b/OpenCL/m06100_a0-optimized.cl @@ -10,8 +10,8 @@ #include "inc_hash_functions.cl" #include "inc_types.cl" #include "inc_common.cl" -#include "inc_rp.h" -#include "inc_rp.cl" +#include "inc_rp_optimized.h" +#include "inc_rp_optimized.cl" #include "inc_simd.cl" #include "inc_hash_whirlpool.cl" diff --git a/OpenCL/m06100_a0.cl b/OpenCL/m06100_a0.cl index 5b798d0c5..ae45fa353 100644 --- a/OpenCL/m06100_a0.cl +++ b/OpenCL/m06100_a0.cl @@ -10,8 +10,8 @@ #include "inc_hash_functions.cl" #include "inc_types.cl" #include "inc_common.cl" -#include "inc_rp.h" -#include "inc_rp.cl" +#include "inc_rp_optimized.h" +#include "inc_rp_optimized.cl" #include "inc_scalar.cl" #include "inc_hash_whirlpool.cl" diff --git a/OpenCL/m06900_a0-optimized.cl b/OpenCL/m06900_a0-optimized.cl index ccf2353ae..a40d352ff 100644 --- a/OpenCL/m06900_a0-optimized.cl +++ b/OpenCL/m06900_a0-optimized.cl @@ -10,8 +10,8 @@ #include "inc_hash_functions.cl" #include "inc_types.cl" #include "inc_common.cl" -#include "inc_rp.h" -#include "inc_rp.cl" +#include "inc_rp_optimized.h" +#include "inc_rp_optimized.cl" #include "inc_simd.cl" __constant u32a c_tables[4][256] = diff --git a/OpenCL/m07000_a0-optimized.cl b/OpenCL/m07000_a0-optimized.cl index aa4f20bc1..4901ee224 100644 --- a/OpenCL/m07000_a0-optimized.cl +++ b/OpenCL/m07000_a0-optimized.cl @@ -10,8 +10,8 @@ #include "inc_hash_functions.cl" #include "inc_types.cl" #include "inc_common.cl" -#include "inc_rp.h" -#include "inc_rp.cl" +#include "inc_rp_optimized.h" +#include "inc_rp_optimized.cl" #include "inc_simd.cl" __kernel void m07000_m04 (__global pw_t *pws, __global const kernel_rule_t *rules_buf, __global const pw_t *combs_buf, __global const bf_t *bfs_buf, __global void *tmps, __global void *hooks, __global const u32 *bitmaps_buf_s1_a, __global const u32 *bitmaps_buf_s1_b, __global const u32 *bitmaps_buf_s1_c, __global const u32 *bitmaps_buf_s1_d, __global const u32 *bitmaps_buf_s2_a, __global const u32 *bitmaps_buf_s2_b, __global const u32 *bitmaps_buf_s2_c, __global const u32 *bitmaps_buf_s2_d, __global plain_t *plains_buf, __global const digest_t *digests_buf, __global u32 *hashes_shown, __global const salt_t *salt_bufs, __global const void *esalt_bufs, __global u32 *d_return_buf, __global u32 *d_scryptV0_buf, __global u32 *d_scryptV1_buf, __global u32 *d_scryptV2_buf, __global u32 *d_scryptV3_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 il_cnt, const u32 digests_cnt, const u32 digests_offset, const u32 combs_mode, const u32 gid_max) diff --git a/OpenCL/m07000_a0.cl b/OpenCL/m07000_a0.cl index 412a929ef..ccfc6d192 100644 --- a/OpenCL/m07000_a0.cl +++ b/OpenCL/m07000_a0.cl @@ -10,8 +10,8 @@ #include "inc_hash_functions.cl" #include "inc_types.cl" #include "inc_common.cl" -#include "inc_rp.h" -#include "inc_rp.cl" +#include "inc_rp_optimized.h" +#include "inc_rp_optimized.cl" #include "inc_scalar.cl" #include "inc_hash_sha1.cl" diff --git a/OpenCL/m07300_a0-optimized.cl b/OpenCL/m07300_a0-optimized.cl index 5433290c0..0020f98a5 100644 --- a/OpenCL/m07300_a0-optimized.cl +++ b/OpenCL/m07300_a0-optimized.cl @@ -10,8 +10,8 @@ #include "inc_hash_functions.cl" #include "inc_types.cl" #include "inc_common.cl" -#include "inc_rp.h" -#include "inc_rp.cl" +#include "inc_rp_optimized.h" +#include "inc_rp_optimized.cl" #include "inc_simd.cl" #include "inc_hash_sha1.cl" diff --git a/OpenCL/m07300_a0.cl b/OpenCL/m07300_a0.cl index 596db3a54..5be49d782 100644 --- a/OpenCL/m07300_a0.cl +++ b/OpenCL/m07300_a0.cl @@ -10,8 +10,8 @@ #include "inc_hash_functions.cl" #include "inc_types.cl" #include "inc_common.cl" -#include "inc_rp.h" -#include "inc_rp.cl" +#include "inc_rp_optimized.h" +#include "inc_rp_optimized.cl" #include "inc_scalar.cl" #include "inc_hash_sha1.cl" diff --git a/OpenCL/m07500_a0-optimized.cl b/OpenCL/m07500_a0-optimized.cl index 6516fce4f..313b94fd6 100644 --- a/OpenCL/m07500_a0-optimized.cl +++ b/OpenCL/m07500_a0-optimized.cl @@ -11,8 +11,8 @@ #include "inc_hash_functions.cl" #include "inc_types.cl" #include "inc_common.cl" -#include "inc_rp.h" -#include "inc_rp.cl" +#include "inc_rp_optimized.h" +#include "inc_rp_optimized.cl" #include "inc_simd.cl" #include "inc_hash_md4.cl" #include "inc_hash_md5.cl" diff --git a/OpenCL/m07500_a0.cl b/OpenCL/m07500_a0.cl index 72491071f..e8e0878e2 100644 --- a/OpenCL/m07500_a0.cl +++ b/OpenCL/m07500_a0.cl @@ -11,8 +11,8 @@ #include "inc_hash_functions.cl" #include "inc_types.cl" #include "inc_common.cl" -#include "inc_rp.h" -#include "inc_rp.cl" +#include "inc_rp_optimized.h" +#include "inc_rp_optimized.cl" #include "inc_hash_md4.cl" #include "inc_hash_md5.cl" diff --git a/OpenCL/m07700_a0-optimized.cl b/OpenCL/m07700_a0-optimized.cl index 8a6b88cf1..a9fd86b3c 100644 --- a/OpenCL/m07700_a0-optimized.cl +++ b/OpenCL/m07700_a0-optimized.cl @@ -11,8 +11,8 @@ #include "inc_hash_functions.cl" #include "inc_types.cl" #include "inc_common.cl" -#include "inc_rp.h" -#include "inc_rp.cl" +#include "inc_rp_optimized.h" +#include "inc_rp_optimized.cl" #include "inc_simd.cl" #include "inc_hash_md5.cl" diff --git a/OpenCL/m07800_a0-optimized.cl b/OpenCL/m07800_a0-optimized.cl index 616e5483c..81337dc43 100644 --- a/OpenCL/m07800_a0-optimized.cl +++ b/OpenCL/m07800_a0-optimized.cl @@ -11,8 +11,8 @@ #include "inc_hash_functions.cl" #include "inc_types.cl" #include "inc_common.cl" -#include "inc_rp.h" -#include "inc_rp.cl" +#include "inc_rp_optimized.h" +#include "inc_rp_optimized.cl" #include "inc_simd.cl" #include "inc_hash_sha1.cl" diff --git a/OpenCL/m08000_a0-optimized.cl b/OpenCL/m08000_a0-optimized.cl index 8f6a24b94..d18b9d10d 100644 --- a/OpenCL/m08000_a0-optimized.cl +++ b/OpenCL/m08000_a0-optimized.cl @@ -10,8 +10,8 @@ #include "inc_hash_functions.cl" #include "inc_types.cl" #include "inc_common.cl" -#include "inc_rp.h" -#include "inc_rp.cl" +#include "inc_rp_optimized.h" +#include "inc_rp_optimized.cl" #include "inc_simd.cl" __constant u32a k_sha256[64] = diff --git a/OpenCL/m08100_a0-optimized.cl b/OpenCL/m08100_a0-optimized.cl index 24cb06b71..50454db38 100644 --- a/OpenCL/m08100_a0-optimized.cl +++ b/OpenCL/m08100_a0-optimized.cl @@ -10,8 +10,8 @@ #include "inc_hash_functions.cl" #include "inc_types.cl" #include "inc_common.cl" -#include "inc_rp.h" -#include "inc_rp.cl" +#include "inc_rp_optimized.h" +#include "inc_rp_optimized.cl" #include "inc_simd.cl" __kernel void m08100_m04 (__global pw_t *pws, __global const kernel_rule_t *rules_buf, __global const pw_t *combs_buf, __global const bf_t *bfs_buf, __global void *tmps, __global void *hooks, __global const u32 *bitmaps_buf_s1_a, __global const u32 *bitmaps_buf_s1_b, __global const u32 *bitmaps_buf_s1_c, __global const u32 *bitmaps_buf_s1_d, __global const u32 *bitmaps_buf_s2_a, __global const u32 *bitmaps_buf_s2_b, __global const u32 *bitmaps_buf_s2_c, __global const u32 *bitmaps_buf_s2_d, __global plain_t *plains_buf, __global const digest_t *digests_buf, __global u32 *hashes_shown, __global const salt_t *salt_bufs, __global const void *esalt_bufs, __global u32 *d_return_buf, __global u32 *d_scryptV0_buf, __global u32 *d_scryptV1_buf, __global u32 *d_scryptV2_buf, __global u32 *d_scryptV3_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 il_cnt, const u32 digests_cnt, const u32 digests_offset, const u32 combs_mode, const u32 gid_max) diff --git a/OpenCL/m08100_a0.cl b/OpenCL/m08100_a0.cl index 3f3839efa..4c21e1d95 100644 --- a/OpenCL/m08100_a0.cl +++ b/OpenCL/m08100_a0.cl @@ -10,8 +10,8 @@ #include "inc_hash_functions.cl" #include "inc_types.cl" #include "inc_common.cl" -#include "inc_rp.h" -#include "inc_rp.cl" +#include "inc_rp_optimized.h" +#include "inc_rp_optimized.cl" #include "inc_scalar.cl" #include "inc_hash_sha1.cl" diff --git a/OpenCL/m08300_a0-optimized.cl b/OpenCL/m08300_a0-optimized.cl index 0e3ed4fd2..13a6999b1 100644 --- a/OpenCL/m08300_a0-optimized.cl +++ b/OpenCL/m08300_a0-optimized.cl @@ -10,8 +10,8 @@ #include "inc_hash_functions.cl" #include "inc_types.cl" #include "inc_common.cl" -#include "inc_rp.h" -#include "inc_rp.cl" +#include "inc_rp_optimized.h" +#include "inc_rp_optimized.cl" #include "inc_simd.cl" #include "inc_hash_sha1.cl" diff --git a/OpenCL/m08300_a0.cl b/OpenCL/m08300_a0.cl index 906050bef..8296d0152 100644 --- a/OpenCL/m08300_a0.cl +++ b/OpenCL/m08300_a0.cl @@ -10,8 +10,8 @@ #include "inc_hash_functions.cl" #include "inc_types.cl" #include "inc_common.cl" -#include "inc_rp.h" -#include "inc_rp.cl" +#include "inc_rp_optimized.h" +#include "inc_rp_optimized.cl" #include "inc_scalar.cl" #include "inc_hash_sha1.cl" diff --git a/OpenCL/m08400_a0-optimized.cl b/OpenCL/m08400_a0-optimized.cl index ae9a01cac..778d7be4a 100644 --- a/OpenCL/m08400_a0-optimized.cl +++ b/OpenCL/m08400_a0-optimized.cl @@ -10,8 +10,8 @@ #include "inc_hash_functions.cl" #include "inc_types.cl" #include "inc_common.cl" -#include "inc_rp.h" -#include "inc_rp.cl" +#include "inc_rp_optimized.h" +#include "inc_rp_optimized.cl" #include "inc_simd.cl" #include "inc_hash_sha1.cl" diff --git a/OpenCL/m08400_a0.cl b/OpenCL/m08400_a0.cl index 123887eb7..28d218e5d 100644 --- a/OpenCL/m08400_a0.cl +++ b/OpenCL/m08400_a0.cl @@ -10,8 +10,8 @@ #include "inc_hash_functions.cl" #include "inc_types.cl" #include "inc_common.cl" -#include "inc_rp.h" -#include "inc_rp.cl" +#include "inc_rp_optimized.h" +#include "inc_rp_optimized.cl" #include "inc_scalar.cl" #include "inc_hash_sha1.cl" diff --git a/OpenCL/m08500_a0.cl b/OpenCL/m08500_a0.cl index 2a1d7a98a..bd3efc231 100644 --- a/OpenCL/m08500_a0.cl +++ b/OpenCL/m08500_a0.cl @@ -10,8 +10,8 @@ #include "inc_hash_functions.cl" #include "inc_types.cl" #include "inc_common.cl" -#include "inc_rp.h" -#include "inc_rp.cl" +#include "inc_rp_optimized.h" +#include "inc_rp_optimized.cl" #include "inc_simd.cl" #define PERM_OP(a,b,tt,n,m) \ diff --git a/OpenCL/m08600_a0.cl b/OpenCL/m08600_a0.cl index 4e65a519b..14140bdfd 100644 --- a/OpenCL/m08600_a0.cl +++ b/OpenCL/m08600_a0.cl @@ -11,8 +11,8 @@ #include "inc_hash_functions.cl" #include "inc_types.cl" #include "inc_common.cl" -#include "inc_rp.h" -#include "inc_rp.cl" +#include "inc_rp_optimized.h" +#include "inc_rp_optimized.cl" #include "inc_simd.cl" __constant u32a lotus_magic_table[256] = diff --git a/OpenCL/m08700_a0-optimized.cl b/OpenCL/m08700_a0-optimized.cl index 012b6784e..f28b80752 100644 --- a/OpenCL/m08700_a0-optimized.cl +++ b/OpenCL/m08700_a0-optimized.cl @@ -11,8 +11,8 @@ #include "inc_hash_functions.cl" #include "inc_types.cl" #include "inc_common.cl" -#include "inc_rp.h" -#include "inc_rp.cl" +#include "inc_rp_optimized.h" +#include "inc_rp_optimized.cl" #include "inc_simd.cl" __constant u32a lotus_magic_table[256] = diff --git a/OpenCL/m09700_a0-optimized.cl b/OpenCL/m09700_a0-optimized.cl index 49fc39362..642161dd8 100644 --- a/OpenCL/m09700_a0-optimized.cl +++ b/OpenCL/m09700_a0-optimized.cl @@ -11,8 +11,8 @@ #include "inc_hash_functions.cl" #include "inc_types.cl" #include "inc_common.cl" -#include "inc_rp.h" -#include "inc_rp.cl" +#include "inc_rp_optimized.h" +#include "inc_rp_optimized.cl" #include "inc_simd.cl" #include "inc_hash_md5.cl" diff --git a/OpenCL/m09710_a0-optimized.cl b/OpenCL/m09710_a0-optimized.cl index 4b72fcf7d..83656f525 100644 --- a/OpenCL/m09710_a0-optimized.cl +++ b/OpenCL/m09710_a0-optimized.cl @@ -11,8 +11,8 @@ #include "inc_hash_functions.cl" #include "inc_types.cl" #include "inc_common.cl" -#include "inc_rp.h" -#include "inc_rp.cl" +#include "inc_rp_optimized.h" +#include "inc_rp_optimized.cl" #include "inc_simd.cl" #include "inc_hash_md5.cl" diff --git a/OpenCL/m09720_a0-optimized.cl b/OpenCL/m09720_a0-optimized.cl index a8a0523d2..5c22d8523 100644 --- a/OpenCL/m09720_a0-optimized.cl +++ b/OpenCL/m09720_a0-optimized.cl @@ -10,8 +10,8 @@ #include "inc_hash_functions.cl" #include "inc_types.cl" #include "inc_common.cl" -#include "inc_rp.h" -#include "inc_rp.cl" +#include "inc_rp_optimized.h" +#include "inc_rp_optimized.cl" #include "inc_simd.cl" #include "inc_hash_md5.cl" diff --git a/OpenCL/m09800_a0-optimized.cl b/OpenCL/m09800_a0-optimized.cl index 2c26ce3be..512fd0da4 100644 --- a/OpenCL/m09800_a0-optimized.cl +++ b/OpenCL/m09800_a0-optimized.cl @@ -11,8 +11,8 @@ #include "inc_hash_functions.cl" #include "inc_types.cl" #include "inc_common.cl" -#include "inc_rp.h" -#include "inc_rp.cl" +#include "inc_rp_optimized.h" +#include "inc_rp_optimized.cl" #include "inc_simd.cl" #include "inc_hash_sha1.cl" diff --git a/OpenCL/m09810_a0-optimized.cl b/OpenCL/m09810_a0-optimized.cl index 8ee19da53..aa1000f39 100644 --- a/OpenCL/m09810_a0-optimized.cl +++ b/OpenCL/m09810_a0-optimized.cl @@ -11,8 +11,8 @@ #include "inc_hash_functions.cl" #include "inc_types.cl" #include "inc_common.cl" -#include "inc_rp.h" -#include "inc_rp.cl" +#include "inc_rp_optimized.h" +#include "inc_rp_optimized.cl" #include "inc_simd.cl" #include "inc_hash_sha1.cl" diff --git a/OpenCL/m09820_a0-optimized.cl b/OpenCL/m09820_a0-optimized.cl index f895d7939..630cc7a31 100644 --- a/OpenCL/m09820_a0-optimized.cl +++ b/OpenCL/m09820_a0-optimized.cl @@ -10,8 +10,8 @@ #include "inc_hash_functions.cl" #include "inc_types.cl" #include "inc_common.cl" -#include "inc_rp.h" -#include "inc_rp.cl" +#include "inc_rp_optimized.h" +#include "inc_rp_optimized.cl" #include "inc_simd.cl" #include "inc_hash_sha1.cl" diff --git a/OpenCL/m09900_a0-optimized.cl b/OpenCL/m09900_a0-optimized.cl index 45f4fda37..81bea5c8b 100644 --- a/OpenCL/m09900_a0-optimized.cl +++ b/OpenCL/m09900_a0-optimized.cl @@ -10,8 +10,8 @@ #include "inc_hash_functions.cl" #include "inc_types.cl" #include "inc_common.cl" -#include "inc_rp.h" -#include "inc_rp.cl" +#include "inc_rp_optimized.h" +#include "inc_rp_optimized.cl" #include "inc_simd.cl" __kernel void m09900_m04 (__global pw_t *pws, __global const kernel_rule_t *rules_buf, __global const pw_t *combs_buf, __global const bf_t *bfs_buf, __global void *tmps, __global void *hooks, __global const u32 *bitmaps_buf_s1_a, __global const u32 *bitmaps_buf_s1_b, __global const u32 *bitmaps_buf_s1_c, __global const u32 *bitmaps_buf_s1_d, __global const u32 *bitmaps_buf_s2_a, __global const u32 *bitmaps_buf_s2_b, __global const u32 *bitmaps_buf_s2_c, __global const u32 *bitmaps_buf_s2_d, __global plain_t *plains_buf, __global const digest_t *digests_buf, __global u32 *hashes_shown, __global const salt_t *salt_bufs, __global const void *esalt_bufs, __global u32 *d_return_buf, __global u32 *d_scryptV0_buf, __global u32 *d_scryptV1_buf, __global u32 *d_scryptV2_buf, __global u32 *d_scryptV3_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 il_cnt, const u32 digests_cnt, const u32 digests_offset, const u32 combs_mode, const u32 gid_max) diff --git a/OpenCL/m09900_a0.cl b/OpenCL/m09900_a0.cl index 7e7459d11..ab4f210d9 100644 --- a/OpenCL/m09900_a0.cl +++ b/OpenCL/m09900_a0.cl @@ -10,8 +10,8 @@ #include "inc_hash_functions.cl" #include "inc_types.cl" #include "inc_common.cl" -#include "inc_rp.h" -#include "inc_rp.cl" +#include "inc_rp_optimized.h" +#include "inc_rp_optimized.cl" #include "inc_scalar.cl" #include "inc_hash_md5.cl" diff --git a/OpenCL/m10100_a0-optimized.cl b/OpenCL/m10100_a0-optimized.cl index 5f97bf0a4..972f6ba40 100644 --- a/OpenCL/m10100_a0-optimized.cl +++ b/OpenCL/m10100_a0-optimized.cl @@ -11,8 +11,8 @@ #include "inc_hash_functions.cl" #include "inc_types.cl" #include "inc_common.cl" -#include "inc_rp.h" -#include "inc_rp.cl" +#include "inc_rp_optimized.h" +#include "inc_rp_optimized.cl" #include "inc_simd.cl" #define SIPROUND(v0,v1,v2,v3) \ diff --git a/OpenCL/m10400_a0-optimized.cl b/OpenCL/m10400_a0-optimized.cl index f93a6ad62..520738e6e 100644 --- a/OpenCL/m10400_a0-optimized.cl +++ b/OpenCL/m10400_a0-optimized.cl @@ -11,8 +11,8 @@ #include "inc_hash_functions.cl" #include "inc_types.cl" #include "inc_common.cl" -#include "inc_rp.h" -#include "inc_rp.cl" +#include "inc_rp_optimized.h" +#include "inc_rp_optimized.cl" #include "inc_simd.cl" #include "inc_hash_md5.cl" diff --git a/OpenCL/m10410_a0-optimized.cl b/OpenCL/m10410_a0-optimized.cl index c96e3b6d2..dae3cb876 100644 --- a/OpenCL/m10410_a0-optimized.cl +++ b/OpenCL/m10410_a0-optimized.cl @@ -11,8 +11,8 @@ #include "inc_hash_functions.cl" #include "inc_types.cl" #include "inc_common.cl" -#include "inc_rp.h" -#include "inc_rp.cl" +#include "inc_rp_optimized.h" +#include "inc_rp_optimized.cl" #include "inc_simd.cl" #include "inc_hash_md5.cl" diff --git a/OpenCL/m10420_a0-optimized.cl b/OpenCL/m10420_a0-optimized.cl index 7295e2741..5897e07e8 100644 --- a/OpenCL/m10420_a0-optimized.cl +++ b/OpenCL/m10420_a0-optimized.cl @@ -10,8 +10,8 @@ #include "inc_hash_functions.cl" #include "inc_types.cl" #include "inc_common.cl" -#include "inc_rp.h" -#include "inc_rp.cl" +#include "inc_rp_optimized.h" +#include "inc_rp_optimized.cl" #include "inc_simd.cl" #include "inc_hash_md5.cl" diff --git a/OpenCL/m10800_a0-optimized.cl b/OpenCL/m10800_a0-optimized.cl index 6ef2e2d3a..002a6b51b 100644 --- a/OpenCL/m10800_a0-optimized.cl +++ b/OpenCL/m10800_a0-optimized.cl @@ -10,8 +10,8 @@ #include "inc_hash_functions.cl" #include "inc_types.cl" #include "inc_common.cl" -#include "inc_rp.h" -#include "inc_rp.cl" +#include "inc_rp_optimized.h" +#include "inc_rp_optimized.cl" #include "inc_simd.cl" __constant u64a k_sha384[80] = diff --git a/OpenCL/m10800_a0.cl b/OpenCL/m10800_a0.cl index a84376f81..a49457b55 100644 --- a/OpenCL/m10800_a0.cl +++ b/OpenCL/m10800_a0.cl @@ -10,8 +10,8 @@ #include "inc_hash_functions.cl" #include "inc_types.cl" #include "inc_common.cl" -#include "inc_rp.h" -#include "inc_rp.cl" +#include "inc_rp_optimized.h" +#include "inc_rp_optimized.cl" #include "inc_scalar.cl" #include "inc_hash_sha384.cl" diff --git a/OpenCL/m11000_a0-optimized.cl b/OpenCL/m11000_a0-optimized.cl index 30a7e9950..b02dd347e 100644 --- a/OpenCL/m11000_a0-optimized.cl +++ b/OpenCL/m11000_a0-optimized.cl @@ -10,8 +10,8 @@ #include "inc_hash_functions.cl" #include "inc_types.cl" #include "inc_common.cl" -#include "inc_rp.h" -#include "inc_rp.cl" +#include "inc_rp_optimized.h" +#include "inc_rp_optimized.cl" #include "inc_simd.cl" __kernel void m11000_m04 (__global pw_t *pws, __global const kernel_rule_t *rules_buf, __global const pw_t *combs_buf, __global const bf_t *bfs_buf, __global void *tmps, __global void *hooks, __global const u32 *bitmaps_buf_s1_a, __global const u32 *bitmaps_buf_s1_b, __global const u32 *bitmaps_buf_s1_c, __global const u32 *bitmaps_buf_s1_d, __global const u32 *bitmaps_buf_s2_a, __global const u32 *bitmaps_buf_s2_b, __global const u32 *bitmaps_buf_s2_c, __global const u32 *bitmaps_buf_s2_d, __global plain_t *plains_buf, __global const digest_t *digests_buf, __global u32 *hashes_shown, __global const salt_t *salt_bufs, __global const void *esalt_bufs, __global u32 *d_return_buf, __global u32 *d_scryptV0_buf, __global u32 *d_scryptV1_buf, __global u32 *d_scryptV2_buf, __global u32 *d_scryptV3_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 il_cnt, const u32 digests_cnt, const u32 digests_offset, const u32 combs_mode, const u32 gid_max) diff --git a/OpenCL/m11000_a0.cl b/OpenCL/m11000_a0.cl index cc7310547..48759a64a 100644 --- a/OpenCL/m11000_a0.cl +++ b/OpenCL/m11000_a0.cl @@ -10,8 +10,8 @@ #include "inc_hash_functions.cl" #include "inc_types.cl" #include "inc_common.cl" -#include "inc_rp.h" -#include "inc_rp.cl" +#include "inc_rp_optimized.h" +#include "inc_rp_optimized.cl" #include "inc_scalar.cl" #include "inc_hash_md5.cl" diff --git a/OpenCL/m11100_a0-optimized.cl b/OpenCL/m11100_a0-optimized.cl index 5738d1901..1c16d2e04 100644 --- a/OpenCL/m11100_a0-optimized.cl +++ b/OpenCL/m11100_a0-optimized.cl @@ -10,8 +10,8 @@ #include "inc_hash_functions.cl" #include "inc_types.cl" #include "inc_common.cl" -#include "inc_rp.h" -#include "inc_rp.cl" +#include "inc_rp_optimized.h" +#include "inc_rp_optimized.cl" #include "inc_simd.cl" #if VECT_SIZE == 1 diff --git a/OpenCL/m11100_a0.cl b/OpenCL/m11100_a0.cl index e2b372639..8dfd25225 100644 --- a/OpenCL/m11100_a0.cl +++ b/OpenCL/m11100_a0.cl @@ -10,8 +10,8 @@ #include "inc_hash_functions.cl" #include "inc_types.cl" #include "inc_common.cl" -#include "inc_rp.h" -#include "inc_rp.cl" +#include "inc_rp_optimized.h" +#include "inc_rp_optimized.cl" #include "inc_scalar.cl" #include "inc_hash_md5.cl" diff --git a/OpenCL/m11200_a0-optimized.cl b/OpenCL/m11200_a0-optimized.cl index c237b5362..b63a9f5fc 100644 --- a/OpenCL/m11200_a0-optimized.cl +++ b/OpenCL/m11200_a0-optimized.cl @@ -10,8 +10,8 @@ #include "inc_hash_functions.cl" #include "inc_types.cl" #include "inc_common.cl" -#include "inc_rp.h" -#include "inc_rp.cl" +#include "inc_rp_optimized.h" +#include "inc_rp_optimized.cl" #include "inc_simd.cl" __kernel void m11200_m04 (__global pw_t *pws, __global const kernel_rule_t *rules_buf, __global const pw_t *combs_buf, __global const bf_t *bfs_buf, __global void *tmps, __global void *hooks, __global const u32 *bitmaps_buf_s1_a, __global const u32 *bitmaps_buf_s1_b, __global const u32 *bitmaps_buf_s1_c, __global const u32 *bitmaps_buf_s1_d, __global const u32 *bitmaps_buf_s2_a, __global const u32 *bitmaps_buf_s2_b, __global const u32 *bitmaps_buf_s2_c, __global const u32 *bitmaps_buf_s2_d, __global plain_t *plains_buf, __global const digest_t *digests_buf, __global u32 *hashes_shown, __global const salt_t *salt_bufs, __global const void *esalt_bufs, __global u32 *d_return_buf, __global u32 *d_scryptV0_buf, __global u32 *d_scryptV1_buf, __global u32 *d_scryptV2_buf, __global u32 *d_scryptV3_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 il_cnt, const u32 digests_cnt, const u32 digests_offset, const u32 combs_mode, const u32 gid_max) diff --git a/OpenCL/m11200_a0.cl b/OpenCL/m11200_a0.cl index 1ba45efe8..5970d3d11 100644 --- a/OpenCL/m11200_a0.cl +++ b/OpenCL/m11200_a0.cl @@ -10,8 +10,8 @@ #include "inc_hash_functions.cl" #include "inc_types.cl" #include "inc_common.cl" -#include "inc_rp.h" -#include "inc_rp.cl" +#include "inc_rp_optimized.h" +#include "inc_rp_optimized.cl" #include "inc_scalar.cl" #include "inc_hash_sha1.cl" diff --git a/OpenCL/m11400_a0.cl b/OpenCL/m11400_a0.cl index 72541c78c..873bdc008 100644 --- a/OpenCL/m11400_a0.cl +++ b/OpenCL/m11400_a0.cl @@ -10,8 +10,8 @@ #include "inc_hash_functions.cl" #include "inc_types.cl" #include "inc_common.cl" -#include "inc_rp.h" -#include "inc_rp.cl" +#include "inc_rp_optimized.h" +#include "inc_rp_optimized.cl" #include "inc_scalar.cl" #include "inc_hash_md5.cl" diff --git a/OpenCL/m11500_a0-optimized.cl b/OpenCL/m11500_a0-optimized.cl index d6775cf9b..2a2c7e84a 100644 --- a/OpenCL/m11500_a0-optimized.cl +++ b/OpenCL/m11500_a0-optimized.cl @@ -11,8 +11,8 @@ #include "inc_hash_functions.cl" #include "inc_types.cl" #include "inc_common.cl" -#include "inc_rp.h" -#include "inc_rp.cl" +#include "inc_rp_optimized.h" +#include "inc_rp_optimized.cl" #include "inc_simd.cl" __constant u32a crc32tab[0x100] = diff --git a/OpenCL/m11700_a0-optimized.cl b/OpenCL/m11700_a0-optimized.cl index c8873af86..1b7fdd288 100644 --- a/OpenCL/m11700_a0-optimized.cl +++ b/OpenCL/m11700_a0-optimized.cl @@ -11,8 +11,8 @@ #include "inc_hash_functions.cl" #include "inc_types.cl" #include "inc_common.cl" -#include "inc_rp.h" -#include "inc_rp.cl" +#include "inc_rp_optimized.h" +#include "inc_rp_optimized.cl" #include "inc_simd.cl" #define INITVAL 0x0101010101010101 diff --git a/OpenCL/m11800_a0-optimized.cl b/OpenCL/m11800_a0-optimized.cl index a1c25db68..264d4d81e 100644 --- a/OpenCL/m11800_a0-optimized.cl +++ b/OpenCL/m11800_a0-optimized.cl @@ -11,8 +11,8 @@ #include "inc_hash_functions.cl" #include "inc_types.cl" #include "inc_common.cl" -#include "inc_rp.h" -#include "inc_rp.cl" +#include "inc_rp_optimized.h" +#include "inc_rp_optimized.cl" #include "inc_simd.cl" #define INITVAL 0 diff --git a/OpenCL/m12600_a0-optimized.cl b/OpenCL/m12600_a0-optimized.cl index d7cb7e7b0..02ab5e7c6 100644 --- a/OpenCL/m12600_a0-optimized.cl +++ b/OpenCL/m12600_a0-optimized.cl @@ -10,8 +10,8 @@ #include "inc_hash_functions.cl" #include "inc_types.cl" #include "inc_common.cl" -#include "inc_rp.h" -#include "inc_rp.cl" +#include "inc_rp_optimized.h" +#include "inc_rp_optimized.cl" #include "inc_simd.cl" #if VECT_SIZE == 1 diff --git a/OpenCL/m12600_a0.cl b/OpenCL/m12600_a0.cl index 22ad327fb..a45625a6c 100644 --- a/OpenCL/m12600_a0.cl +++ b/OpenCL/m12600_a0.cl @@ -10,8 +10,8 @@ #include "inc_hash_functions.cl" #include "inc_types.cl" #include "inc_common.cl" -#include "inc_rp.h" -#include "inc_rp.cl" +#include "inc_rp_optimized.h" +#include "inc_rp_optimized.cl" #include "inc_scalar.cl" #include "inc_hash_sha1.cl" #include "inc_hash_sha256.cl" diff --git a/OpenCL/m13100_a0-optimized.cl b/OpenCL/m13100_a0-optimized.cl index ea147832e..0d9966ddd 100644 --- a/OpenCL/m13100_a0-optimized.cl +++ b/OpenCL/m13100_a0-optimized.cl @@ -11,8 +11,8 @@ #include "inc_hash_functions.cl" #include "inc_types.cl" #include "inc_common.cl" -#include "inc_rp.h" -#include "inc_rp.cl" +#include "inc_rp_optimized.h" +#include "inc_rp_optimized.cl" #include "inc_simd.cl" #include "inc_hash_md4.cl" #include "inc_hash_md5.cl" diff --git a/OpenCL/m13100_a0.cl b/OpenCL/m13100_a0.cl index a3672cff3..1bb983243 100644 --- a/OpenCL/m13100_a0.cl +++ b/OpenCL/m13100_a0.cl @@ -11,8 +11,8 @@ #include "inc_hash_functions.cl" #include "inc_types.cl" #include "inc_common.cl" -#include "inc_rp.h" -#include "inc_rp.cl" +#include "inc_rp_optimized.h" +#include "inc_rp_optimized.cl" #include "inc_hash_md4.cl" #include "inc_hash_md5.cl" diff --git a/OpenCL/m13300_a0-optimized.cl b/OpenCL/m13300_a0-optimized.cl index 7609205db..7460a929f 100644 --- a/OpenCL/m13300_a0-optimized.cl +++ b/OpenCL/m13300_a0-optimized.cl @@ -10,8 +10,8 @@ #include "inc_hash_functions.cl" #include "inc_types.cl" #include "inc_common.cl" -#include "inc_rp.h" -#include "inc_rp.cl" +#include "inc_rp_optimized.h" +#include "inc_rp_optimized.cl" #include "inc_simd.cl" __kernel void m13300_m04 (__global pw_t *pws, __global const kernel_rule_t *rules_buf, __global const pw_t *combs_buf, __global const bf_t *bfs_buf, __global void *tmps, __global void *hooks, __global const u32 *bitmaps_buf_s1_a, __global const u32 *bitmaps_buf_s1_b, __global const u32 *bitmaps_buf_s1_c, __global const u32 *bitmaps_buf_s1_d, __global const u32 *bitmaps_buf_s2_a, __global const u32 *bitmaps_buf_s2_b, __global const u32 *bitmaps_buf_s2_c, __global const u32 *bitmaps_buf_s2_d, __global plain_t *plains_buf, __global const digest_t *digests_buf, __global u32 *hashes_shown, __global const salt_t *salt_bufs, __global const void *esalt_bufs, __global u32 *d_return_buf, __global u32 *d_scryptV0_buf, __global u32 *d_scryptV1_buf, __global u32 *d_scryptV2_buf, __global u32 *d_scryptV3_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 il_cnt, const u32 digests_cnt, const u32 digests_offset, const u32 combs_mode, const u32 gid_max) diff --git a/OpenCL/m13300_a0.cl b/OpenCL/m13300_a0.cl index a8e85f335..843c1588a 100644 --- a/OpenCL/m13300_a0.cl +++ b/OpenCL/m13300_a0.cl @@ -10,8 +10,8 @@ #include "inc_hash_functions.cl" #include "inc_types.cl" #include "inc_common.cl" -#include "inc_rp.h" -#include "inc_rp.cl" +#include "inc_rp_optimized.h" +#include "inc_rp_optimized.cl" #include "inc_scalar.cl" #include "inc_hash_sha1.cl" diff --git a/OpenCL/m13500_a0-optimized.cl b/OpenCL/m13500_a0-optimized.cl index 50e15cc61..f02c42e13 100644 --- a/OpenCL/m13500_a0-optimized.cl +++ b/OpenCL/m13500_a0-optimized.cl @@ -11,8 +11,8 @@ #include "inc_hash_functions.cl" #include "inc_types.cl" #include "inc_common.cl" -#include "inc_rp.h" -#include "inc_rp.cl" +#include "inc_rp_optimized.h" +#include "inc_rp_optimized.cl" #include "inc_simd.cl" __kernel void m13500_m04 (__global pw_t *pws, __global const kernel_rule_t *rules_buf, __global const pw_t *combs_buf, __global const bf_t *bfs_buf, __global void *tmps, __global void *hooks, __global const u32 *bitmaps_buf_s1_a, __global const u32 *bitmaps_buf_s1_b, __global const u32 *bitmaps_buf_s1_c, __global const u32 *bitmaps_buf_s1_d, __global const u32 *bitmaps_buf_s2_a, __global const u32 *bitmaps_buf_s2_b, __global const u32 *bitmaps_buf_s2_c, __global const u32 *bitmaps_buf_s2_d, __global plain_t *plains_buf, __global const digest_t *digests_buf, __global u32 *hashes_shown, __global const salt_t *salt_bufs, __global pstoken_t *esalt_bufs, __global u32 *d_return_buf, __global u32 *d_scryptV0_buf, __global u32 *d_scryptV1_buf, __global u32 *d_scryptV2_buf, __global u32 *d_scryptV3_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 il_cnt, const u32 digests_cnt, const u32 digests_offset, const u32 combs_mode, const u32 gid_max) diff --git a/OpenCL/m13500_a0.cl b/OpenCL/m13500_a0.cl index 6e8befd86..d9acdec84 100644 --- a/OpenCL/m13500_a0.cl +++ b/OpenCL/m13500_a0.cl @@ -10,8 +10,8 @@ #include "inc_hash_functions.cl" #include "inc_types.cl" #include "inc_common.cl" -#include "inc_rp.h" -#include "inc_rp.cl" +#include "inc_rp_optimized.h" +#include "inc_rp_optimized.cl" #include "inc_scalar.cl" #include "inc_hash_sha1.cl" diff --git a/OpenCL/m13800_a0-optimized.cl b/OpenCL/m13800_a0-optimized.cl index 46db07c9e..2be75ef8f 100644 --- a/OpenCL/m13800_a0-optimized.cl +++ b/OpenCL/m13800_a0-optimized.cl @@ -11,8 +11,8 @@ #include "inc_hash_functions.cl" #include "inc_types.cl" #include "inc_common.cl" -#include "inc_rp.h" -#include "inc_rp.cl" +#include "inc_rp_optimized.h" +#include "inc_rp_optimized.cl" #include "inc_simd.cl" #include "inc_hash_sha256.cl" diff --git a/OpenCL/m13800_a0.cl b/OpenCL/m13800_a0.cl index f6dd8b14c..7ee3d4a59 100644 --- a/OpenCL/m13800_a0.cl +++ b/OpenCL/m13800_a0.cl @@ -10,8 +10,8 @@ #include "inc_hash_functions.cl" #include "inc_types.cl" #include "inc_common.cl" -#include "inc_rp.h" -#include "inc_rp.cl" +#include "inc_rp_optimized.h" +#include "inc_rp_optimized.cl" #include "inc_scalar.cl" #include "inc_hash_sha256.cl" diff --git a/OpenCL/m13900_a0-optimized.cl b/OpenCL/m13900_a0-optimized.cl index 20fe64d4c..9ca5f7abd 100644 --- a/OpenCL/m13900_a0-optimized.cl +++ b/OpenCL/m13900_a0-optimized.cl @@ -10,8 +10,8 @@ #include "inc_hash_functions.cl" #include "inc_types.cl" #include "inc_common.cl" -#include "inc_rp.h" -#include "inc_rp.cl" +#include "inc_rp_optimized.h" +#include "inc_rp_optimized.cl" #include "inc_simd.cl" #include "inc_hash_sha1.cl" diff --git a/OpenCL/m13900_a0.cl b/OpenCL/m13900_a0.cl index db192e0be..910428649 100644 --- a/OpenCL/m13900_a0.cl +++ b/OpenCL/m13900_a0.cl @@ -10,8 +10,8 @@ #include "inc_hash_functions.cl" #include "inc_types.cl" #include "inc_common.cl" -#include "inc_rp.h" -#include "inc_rp.cl" +#include "inc_rp_optimized.h" +#include "inc_rp_optimized.cl" #include "inc_scalar.cl" #include "inc_hash_sha1.cl" diff --git a/OpenCL/m14000_a0-optimized.cl b/OpenCL/m14000_a0-optimized.cl index 235b25395..9b3a289ba 100644 --- a/OpenCL/m14000_a0-optimized.cl +++ b/OpenCL/m14000_a0-optimized.cl @@ -10,8 +10,8 @@ #include "inc_hash_functions.cl" #include "inc_types.cl" #include "inc_common.cl" -#include "inc_rp.h" -#include "inc_rp.cl" +#include "inc_rp_optimized.h" +#include "inc_rp_optimized.cl" #include "inc_simd.cl" #define PERM_OP(a,b,tt,n,m) \ diff --git a/OpenCL/m14100_a0-optimized.cl b/OpenCL/m14100_a0-optimized.cl index d8bcacda5..049fd2cc5 100644 --- a/OpenCL/m14100_a0-optimized.cl +++ b/OpenCL/m14100_a0-optimized.cl @@ -10,8 +10,8 @@ #include "inc_hash_functions.cl" #include "inc_types.cl" #include "inc_common.cl" -#include "inc_rp.h" -#include "inc_rp.cl" +#include "inc_rp_optimized.h" +#include "inc_rp_optimized.cl" #include "inc_simd.cl" #define PERM_OP(a,b,tt,n,m) \ diff --git a/OpenCL/m14400_a0-optimized.cl b/OpenCL/m14400_a0-optimized.cl index 7a10ea82a..045222dd8 100644 --- a/OpenCL/m14400_a0-optimized.cl +++ b/OpenCL/m14400_a0-optimized.cl @@ -8,8 +8,8 @@ #include "inc_hash_functions.cl" #include "inc_types.cl" #include "inc_common.cl" -#include "inc_rp.h" -#include "inc_rp.cl" +#include "inc_rp_optimized.h" +#include "inc_rp_optimized.cl" #include "inc_simd.cl" #include "inc_hash_sha1.cl" diff --git a/OpenCL/m14400_a0.cl b/OpenCL/m14400_a0.cl index 7188d535c..e4ec1a87a 100644 --- a/OpenCL/m14400_a0.cl +++ b/OpenCL/m14400_a0.cl @@ -10,8 +10,8 @@ #include "inc_hash_functions.cl" #include "inc_types.cl" #include "inc_common.cl" -#include "inc_rp.h" -#include "inc_rp.cl" +#include "inc_rp_optimized.h" +#include "inc_rp_optimized.cl" #include "inc_scalar.cl" #include "inc_hash_sha1.cl" diff --git a/OpenCL/m14900_a0-optimized.cl b/OpenCL/m14900_a0-optimized.cl index 6447e3cc5..346f50661 100644 --- a/OpenCL/m14900_a0-optimized.cl +++ b/OpenCL/m14900_a0-optimized.cl @@ -11,8 +11,8 @@ #include "inc_hash_functions.cl" #include "inc_types.cl" #include "inc_common.cl" -#include "inc_rp.h" -#include "inc_rp.cl" +#include "inc_rp_optimized.h" +#include "inc_rp_optimized.cl" #include "inc_simd.cl" __constant u8a c_ftable[256] = diff --git a/OpenCL/m15000_a0-optimized.cl b/OpenCL/m15000_a0-optimized.cl index 80ac378d1..5d7f7c036 100644 --- a/OpenCL/m15000_a0-optimized.cl +++ b/OpenCL/m15000_a0-optimized.cl @@ -10,8 +10,8 @@ #include "inc_hash_functions.cl" #include "inc_types.cl" #include "inc_common.cl" -#include "inc_rp.h" -#include "inc_rp.cl" +#include "inc_rp_optimized.h" +#include "inc_rp_optimized.cl" #include "inc_simd.cl" __constant u64a k_sha512[80] = diff --git a/OpenCL/m15000_a0.cl b/OpenCL/m15000_a0.cl index 040ff966c..65bf7cc18 100644 --- a/OpenCL/m15000_a0.cl +++ b/OpenCL/m15000_a0.cl @@ -10,8 +10,8 @@ #include "inc_hash_functions.cl" #include "inc_types.cl" #include "inc_common.cl" -#include "inc_rp.h" -#include "inc_rp.cl" +#include "inc_rp_optimized.h" +#include "inc_rp_optimized.cl" #include "inc_scalar.cl" #include "inc_hash_sha512.cl" diff --git a/OpenCL/m15400_a0-optimized.cl b/OpenCL/m15400_a0-optimized.cl index 751bedfab..b775d69bb 100644 --- a/OpenCL/m15400_a0-optimized.cl +++ b/OpenCL/m15400_a0-optimized.cl @@ -10,8 +10,8 @@ #include "inc_hash_functions.cl" #include "inc_types.cl" #include "inc_common.cl" -#include "inc_rp.h" -#include "inc_rp.cl" +#include "inc_rp_optimized.h" +#include "inc_rp_optimized.cl" #include "inc_simd.cl" #define CHACHA_CONST_00 0x61707865 diff --git a/OpenCL/m15400_a1-optimized.cl b/OpenCL/m15400_a1-optimized.cl index e162d5f5f..39ca50623 100644 --- a/OpenCL/m15400_a1-optimized.cl +++ b/OpenCL/m15400_a1-optimized.cl @@ -10,8 +10,8 @@ #include "inc_hash_functions.cl" #include "inc_types.cl" #include "inc_common.cl" -#include "inc_rp.h" -#include "inc_rp.cl" +#include "inc_rp_optimized.h" +#include "inc_rp_optimized.cl" #include "inc_simd.cl" #define CHACHA_CONST_00 0x61707865 diff --git a/OpenCL/m15500_a0-optimized.cl b/OpenCL/m15500_a0-optimized.cl index d0418c2ab..d300e5f9b 100644 --- a/OpenCL/m15500_a0-optimized.cl +++ b/OpenCL/m15500_a0-optimized.cl @@ -10,8 +10,8 @@ #include "inc_hash_functions.cl" #include "inc_types.cl" #include "inc_common.cl" -#include "inc_rp.h" -#include "inc_rp.cl" +#include "inc_rp_optimized.h" +#include "inc_rp_optimized.cl" #include "inc_simd.cl" __kernel void m15500_m04 (__global pw_t *pws, __global const kernel_rule_t *rules_buf, __global const pw_t *combs_buf, __global const bf_t *bfs_buf, __global void *tmps, __global void *hooks, __global const u32 *bitmaps_buf_s1_a, __global const u32 *bitmaps_buf_s1_b, __global const u32 *bitmaps_buf_s1_c, __global const u32 *bitmaps_buf_s1_d, __global const u32 *bitmaps_buf_s2_a, __global const u32 *bitmaps_buf_s2_b, __global const u32 *bitmaps_buf_s2_c, __global const u32 *bitmaps_buf_s2_d, __global plain_t *plains_buf, __global const digest_t *digests_buf, __global u32 *hashes_shown, __global const salt_t *salt_bufs, __global const void *esalt_bufs, __global u32 *d_return_buf, __global u32 *d_scryptV0_buf, __global u32 *d_scryptV1_buf, __global u32 *d_scryptV2_buf, __global u32 *d_scryptV3_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 il_cnt, const u32 digests_cnt, const u32 digests_offset, const u32 combs_mode, const u32 gid_max) diff --git a/OpenCL/m15500_a0.cl b/OpenCL/m15500_a0.cl index c59255b70..1d736ae77 100644 --- a/OpenCL/m15500_a0.cl +++ b/OpenCL/m15500_a0.cl @@ -10,8 +10,8 @@ #include "inc_hash_functions.cl" #include "inc_types.cl" #include "inc_common.cl" -#include "inc_rp.h" -#include "inc_rp.cl" +#include "inc_rp_optimized.h" +#include "inc_rp_optimized.cl" #include "inc_scalar.cl" #include "inc_hash_sha1.cl" diff --git a/src/opencl.c b/src/opencl.c index f5ee60394..8450f5923 100644 --- a/src/opencl.c +++ b/src/opencl.c @@ -4180,7 +4180,7 @@ int opencl_session_begin (hashcat_ctx_t *hashcat_ctx) // this test needs to be done manually because of osx opencl runtime // if there's a problem with permission, its not reporting back and erroring out silently - #define files_cnt 15 + #define files_cnt 16 const char *files_names[files_cnt] = { @@ -4194,9 +4194,10 @@ int opencl_session_begin (hashcat_ctx_t *hashcat_ctx) "inc_comp_single.cl", "inc_hash_constants.h", "inc_hash_functions.cl", - "inc_rp.cl", - "inc_rp.h", + "inc_rp_optimized.cl", + "inc_rp_optimized.h", "inc_simd.cl", + "inc_scalar.cl", "inc_types.cl", "inc_vendor.cl", };