1
0
mirror of https://github.com/hashcat/hashcat.git synced 2024-11-30 03:48:17 +00:00

Converted to new SIMD: -m 200 -a 0

This commit is contained in:
Jens Steube 2016-02-05 17:43:00 +01:00
parent 73b9732f55
commit d2f49e3668

View File

@ -5,6 +5,8 @@
#define _MYSQL323_ #define _MYSQL323_
#define NEW_SIMD_CODE
#include "include/constants.h" #include "include/constants.h"
#include "include/kernel_vendor.h" #include "include/kernel_vendor.h"
@ -18,9 +20,7 @@
#include "OpenCL/common.c" #include "OpenCL/common.c"
#include "include/rp_kernel.h" #include "include/rp_kernel.h"
#include "OpenCL/rp.c" #include "OpenCL/rp.c"
#include "OpenCL/simd.c"
#define COMPARE_S "OpenCL/check_single_comp4.c"
#define COMPARE_M "OpenCL/check_multi_comp4.c"
__kernel void m00200_m04 (__global pw_t *pws, __global kernel_rule_t *rules_buf, __global comb_t *combs_buf, __global bf_t *bfs_buf, __global void *tmps, __global void *hooks, __global u32 *bitmaps_buf_s1_a, __global u32 *bitmaps_buf_s1_b, __global u32 *bitmaps_buf_s1_c, __global u32 *bitmaps_buf_s1_d, __global u32 *bitmaps_buf_s2_a, __global u32 *bitmaps_buf_s2_b, __global u32 *bitmaps_buf_s2_c, __global u32 *bitmaps_buf_s2_d, __global plain_t *plains_buf, __global digest_t *digests_buf, __global u32 *hashes_shown, __global salt_t *salt_bufs, __global void *esalt_bufs, __global u32 *d_return_buf, __global u32 *d_scryptV_buf, const u32 bitmap_mask, const u32 bitmap_shift1, const u32 bitmap_shift2, const u32 salt_pos, const u32 loop_pos, const u32 loop_cnt, const u32 rules_cnt, const u32 digests_cnt, const u32 digests_offset, const u32 combs_mode, const u32 gid_max) __kernel void m00200_m04 (__global pw_t *pws, __global kernel_rule_t *rules_buf, __global comb_t *combs_buf, __global bf_t *bfs_buf, __global void *tmps, __global void *hooks, __global u32 *bitmaps_buf_s1_a, __global u32 *bitmaps_buf_s1_b, __global u32 *bitmaps_buf_s1_c, __global u32 *bitmaps_buf_s1_d, __global u32 *bitmaps_buf_s2_a, __global u32 *bitmaps_buf_s2_b, __global u32 *bitmaps_buf_s2_c, __global u32 *bitmaps_buf_s2_d, __global plain_t *plains_buf, __global digest_t *digests_buf, __global u32 *hashes_shown, __global salt_t *salt_bufs, __global void *esalt_bufs, __global u32 *d_return_buf, __global u32 *d_scryptV_buf, const u32 bitmap_mask, const u32 bitmap_shift1, const u32 bitmap_shift2, const u32 salt_pos, const u32 loop_pos, const u32 loop_cnt, const u32 rules_cnt, const u32 digests_cnt, const u32 digests_offset, const u32 combs_mode, const u32 gid_max)
{ {
@ -58,39 +58,16 @@ __kernel void m00200_m04 (__global pw_t *pws, __global kernel_rule_t *rules_buf,
* loop * loop
*/ */
for (u32 il_pos = 0; il_pos < rules_cnt; il_pos++) for (u32 il_pos = 0; il_pos < rules_cnt; il_pos += VECT_SIZE)
{ {
u32 w0[4]; u32x w0[4] = { 0 };
u32x w1[4] = { 0 };
u32x w2[4] = { 0 };
u32x w3[4] = { 0 };
w0[0] = pw_buf0[0]; const u32 out_len = apply_rules_vect (pw_buf0, pw_buf1, pw_len, rules_buf, il_pos, w0, w1);
w0[1] = pw_buf0[1];
w0[2] = pw_buf0[2];
w0[3] = pw_buf0[3];
u32 w1[4]; u32x w_t[16];
w1[0] = pw_buf1[0];
w1[1] = pw_buf1[1];
w1[2] = pw_buf1[2];
w1[3] = pw_buf1[3];
u32 w2[4];
w2[0] = 0;
w2[1] = 0;
w2[2] = 0;
w2[3] = 0;
u32 w3[4];
w3[0] = 0;
w3[1] = 0;
w3[2] = 0;
w3[3] = 0;
const u32 out_len = apply_rules (rules_buf[il_pos].cmds, w0, w1, pw_len);
u32 w_t[16];
w_t[ 0] = w0[0]; w_t[ 0] = w0[0];
w_t[ 1] = w0[1]; w_t[ 1] = w0[1];
@ -109,10 +86,12 @@ __kernel void m00200_m04 (__global pw_t *pws, __global kernel_rule_t *rules_buf,
w_t[14] = 0; w_t[14] = 0;
w_t[15] = 0; w_t[15] = 0;
u32 a = MYSQL323_A; u32x a = MYSQL323_A;
u32 b = MYSQL323_B; u32x b = MYSQL323_B;
u32x c = 0;
u32x d = 0;
u32 add = 7; u32x add = 7;
#define ROUND(v) \ #define ROUND(v) \
{ \ { \
@ -126,7 +105,7 @@ __kernel void m00200_m04 (__global pw_t *pws, __global kernel_rule_t *rules_buf,
for (i = 0, j = 0; i <= (int) out_len - 4; i += 4, j += 1) for (i = 0, j = 0; i <= (int) out_len - 4; i += 4, j += 1)
{ {
const u32 wj = w_t[j]; const u32x wj = w_t[j];
ROUND ((wj >> 0) & 0xff); ROUND ((wj >> 0) & 0xff);
ROUND ((wj >> 8) & 0xff); ROUND ((wj >> 8) & 0xff);
@ -134,7 +113,7 @@ __kernel void m00200_m04 (__global pw_t *pws, __global kernel_rule_t *rules_buf,
ROUND ((wj >> 24) & 0xff); ROUND ((wj >> 24) & 0xff);
} }
const u32 wj = w_t[j]; const u32x wj = w_t[j];
const u32 left = out_len - i; const u32 left = out_len - i;
@ -157,12 +136,7 @@ __kernel void m00200_m04 (__global pw_t *pws, __global kernel_rule_t *rules_buf,
a &= 0x7fffffff; a &= 0x7fffffff;
b &= 0x7fffffff; b &= 0x7fffffff;
const u32 r0 = a; COMPARE_M_SIMD (a, b, c, d);
const u32 r1 = b;
const u32 r2 = 0;
const u32 r3 = 0;
#include COMPARE_M
} }
} }
@ -222,39 +196,16 @@ __kernel void m00200_s04 (__global pw_t *pws, __global kernel_rule_t *rules_buf,
* loop * loop
*/ */
for (u32 il_pos = 0; il_pos < rules_cnt; il_pos++) for (u32 il_pos = 0; il_pos < rules_cnt; il_pos += VECT_SIZE)
{ {
u32 w0[4]; u32x w0[4] = { 0 };
u32x w1[4] = { 0 };
u32x w2[4] = { 0 };
u32x w3[4] = { 0 };
w0[0] = pw_buf0[0]; const u32 out_len = apply_rules_vect (pw_buf0, pw_buf1, pw_len, rules_buf, il_pos, w0, w1);
w0[1] = pw_buf0[1];
w0[2] = pw_buf0[2];
w0[3] = pw_buf0[3];
u32 w1[4]; u32x w_t[16];
w1[0] = pw_buf1[0];
w1[1] = pw_buf1[1];
w1[2] = pw_buf1[2];
w1[3] = pw_buf1[3];
u32 w2[4];
w2[0] = 0;
w2[1] = 0;
w2[2] = 0;
w2[3] = 0;
u32 w3[4];
w3[0] = 0;
w3[1] = 0;
w3[2] = 0;
w3[3] = 0;
const u32 out_len = apply_rules (rules_buf[il_pos].cmds, w0, w1, pw_len);
u32 w_t[16];
w_t[ 0] = w0[0]; w_t[ 0] = w0[0];
w_t[ 1] = w0[1]; w_t[ 1] = w0[1];
@ -273,10 +224,12 @@ __kernel void m00200_s04 (__global pw_t *pws, __global kernel_rule_t *rules_buf,
w_t[14] = 0; w_t[14] = 0;
w_t[15] = 0; w_t[15] = 0;
u32 a = MYSQL323_A; u32x a = MYSQL323_A;
u32 b = MYSQL323_B; u32x b = MYSQL323_B;
u32x c = 0;
u32x d = 0;
u32 add = 7; u32x add = 7;
#define ROUND(v) \ #define ROUND(v) \
{ \ { \
@ -290,7 +243,7 @@ __kernel void m00200_s04 (__global pw_t *pws, __global kernel_rule_t *rules_buf,
for (i = 0, j = 0; i <= (int) out_len - 4; i += 4, j += 1) for (i = 0, j = 0; i <= (int) out_len - 4; i += 4, j += 1)
{ {
const u32 wj = w_t[j]; const u32x wj = w_t[j];
ROUND ((wj >> 0) & 0xff); ROUND ((wj >> 0) & 0xff);
ROUND ((wj >> 8) & 0xff); ROUND ((wj >> 8) & 0xff);
@ -298,7 +251,7 @@ __kernel void m00200_s04 (__global pw_t *pws, __global kernel_rule_t *rules_buf,
ROUND ((wj >> 24) & 0xff); ROUND ((wj >> 24) & 0xff);
} }
const u32 wj = w_t[j]; const u32x wj = w_t[j];
const u32 left = out_len - i; const u32 left = out_len - i;
@ -321,12 +274,7 @@ __kernel void m00200_s04 (__global pw_t *pws, __global kernel_rule_t *rules_buf,
a &= 0x7fffffff; a &= 0x7fffffff;
b &= 0x7fffffff; b &= 0x7fffffff;
const u32 r0 = a; COMPARE_S_SIMD (a, b, c, d);
const u32 r1 = b;
const u32 r2 = 0;
const u32 r3 = 0;
#include COMPARE_S
} }
} }