From ebcdbf18588e6aed55af03f2ad290d30fa1956eb Mon Sep 17 00:00:00 2001 From: Jens Steube Date: Fri, 5 Feb 2016 18:12:12 +0100 Subject: [PATCH] Converted to new SIMD: -m 2410 -a 0 --- OpenCL/m02410_a0.cl | 130 +++++++++++++++++--------------------------- 1 file changed, 50 insertions(+), 80 deletions(-) diff --git a/OpenCL/m02410_a0.cl b/OpenCL/m02410_a0.cl index a903b744b..eedf6454f 100644 --- a/OpenCL/m02410_a0.cl +++ b/OpenCL/m02410_a0.cl @@ -5,6 +5,8 @@ #define _MD5_ +#define NEW_SIMD_CODE + #include "include/constants.h" #include "include/kernel_vendor.h" @@ -18,9 +20,7 @@ #include "OpenCL/common.c" #include "include/rp_kernel.h" #include "OpenCL/rp.c" - -#define COMPARE_S "OpenCL/check_single_comp4.c" -#define COMPARE_M "OpenCL/check_multi_comp4.c" +#include "OpenCL/simd.c" __kernel void m02410_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) { @@ -45,6 +45,13 @@ __kernel void m02410_m04 (__global pw_t *pws, __global kernel_rule_t * rules_bu pw_buf0[2] = pws[gid].i[ 2]; pw_buf0[3] = pws[gid].i[ 3]; + u32 pw_buf1[4]; + + pw_buf1[0] = pws[gid].i[ 4]; + pw_buf1[1] = pws[gid].i[ 5]; + pw_buf1[2] = pws[gid].i[ 6]; + pw_buf1[3] = pws[gid].i[ 7]; + const u32 pw_len = pws[gid].pw_len; /** @@ -64,64 +71,48 @@ __kernel void m02410_m04 (__global pw_t *pws, __global kernel_rule_t * rules_bu * 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]; - w0[1] = pw_buf0[1]; - w0[2] = pw_buf0[2]; - w0[3] = pw_buf0[3]; + const u32 out_len = apply_rules_vect (pw_buf0, pw_buf1, pw_len, rules_buf, il_pos, w0, w1); - u32 w1[4]; + truncate_block (w0, out_len); w1[0] = 0; w1[1] = 0; w1[2] = 0; w1[3] = 0; - 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); - /** * append salt */ - u32 s0[4]; + u32x s0[4]; s0[0] = salt_buf0[0]; s0[1] = salt_buf0[1]; s0[2] = salt_buf0[2]; s0[3] = salt_buf0[3]; - u32 s1[4]; + u32x s1[4]; s1[0] = 0; s1[1] = 0; s1[2] = 0; s1[3] = 0; - u32 s2[4]; + u32x s2[4]; s2[0] = 0; s2[1] = 0; s2[2] = 0; s2[3] = 0; - u32 s3[4]; + u32x s3[4]; s3[0] = 0; s3[1] = 0; @@ -142,10 +133,10 @@ __kernel void m02410_m04 (__global pw_t *pws, __global kernel_rule_t * rules_bu w1[0] = 0x80; w3[2] = 16 * 8; - u32 a = MD5M_A; - u32 b = MD5M_B; - u32 c = MD5M_C; - u32 d = MD5M_D; + u32x a = MD5M_A; + u32x b = MD5M_B; + u32x c = MD5M_C; + u32x d = MD5M_D; MD5_STEP (MD5_Fo, a, b, c, d, w0[0], MD5C00, MD5S00); MD5_STEP (MD5_Fo, d, a, b, c, w0[1], MD5C01, MD5S01); @@ -220,12 +211,7 @@ __kernel void m02410_m04 (__global pw_t *pws, __global kernel_rule_t * rules_bu c &= 0x00ffffff; b &= 0x00ffffff; - const u32 r0 = a; - const u32 r1 = d; - const u32 r2 = c; - const u32 r3 = b; - - #include COMPARE_M + COMPARE_M_SIMD (a, d, c, b); } } @@ -260,6 +246,13 @@ __kernel void m02410_s04 (__global pw_t *pws, __global kernel_rule_t * rules_bu pw_buf0[2] = pws[gid].i[ 2]; pw_buf0[3] = pws[gid].i[ 3]; + u32 pw_buf1[4]; + + pw_buf1[0] = pws[gid].i[ 4]; + pw_buf1[1] = pws[gid].i[ 5]; + pw_buf1[2] = pws[gid].i[ 6]; + pw_buf1[3] = pws[gid].i[ 7]; + const u32 pw_len = pws[gid].pw_len; /** @@ -291,64 +284,48 @@ __kernel void m02410_s04 (__global pw_t *pws, __global kernel_rule_t * rules_bu * 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]; - w0[1] = pw_buf0[1]; - w0[2] = pw_buf0[2]; - w0[3] = pw_buf0[3]; + const u32 out_len = apply_rules_vect (pw_buf0, pw_buf1, pw_len, rules_buf, il_pos, w0, w1); - u32 w1[4]; + truncate_block (w0, out_len); w1[0] = 0; w1[1] = 0; w1[2] = 0; w1[3] = 0; - 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); - /** * append salt */ - u32 s0[4]; + u32x s0[4]; s0[0] = salt_buf0[0]; s0[1] = salt_buf0[1]; s0[2] = salt_buf0[2]; s0[3] = salt_buf0[3]; - u32 s1[4]; + u32x s1[4]; s1[0] = 0; s1[1] = 0; s1[2] = 0; s1[3] = 0; - u32 s2[4]; + u32x s2[4]; s2[0] = 0; s2[1] = 0; s2[2] = 0; s2[3] = 0; - u32 s3[4]; + u32x s3[4]; s3[0] = 0; s3[1] = 0; @@ -369,10 +346,10 @@ __kernel void m02410_s04 (__global pw_t *pws, __global kernel_rule_t * rules_bu w1[0] = 0x80; w3[2] = 16 * 8; - u32 a = MD5M_A; - u32 b = MD5M_B; - u32 c = MD5M_C; - u32 d = MD5M_D; + u32x a = MD5M_A; + u32x b = MD5M_B; + u32x c = MD5M_C; + u32x d = MD5M_D; MD5_STEP (MD5_Fo, a, b, c, d, w0[0], MD5C00, MD5S00); MD5_STEP (MD5_Fo, d, a, b, c, w0[1], MD5C01, MD5S01); @@ -439,9 +416,7 @@ __kernel void m02410_s04 (__global pw_t *pws, __global kernel_rule_t * rules_bu MD5_STEP (MD5_I , b, c, d, a, w3[1], MD5C3b, MD5S33); MD5_STEP (MD5_I , a, b, c, d, w1[0], MD5C3c, MD5S30); - bool q_cond = allx ((a & 0x00ffffff) != search[0]); - - if (q_cond) continue; + if (MATCHES_NONE_VS ((a & 0x00ffffff), search[0])) continue; MD5_STEP (MD5_I , d, a, b, c, w2[3], MD5C3d, MD5S31); MD5_STEP (MD5_I , c, d, a, b, w0[2], MD5C3e, MD5S32); @@ -452,12 +427,7 @@ __kernel void m02410_s04 (__global pw_t *pws, __global kernel_rule_t * rules_bu c &= 0x00ffffff; b &= 0x00ffffff; - const u32 r0 = a; - const u32 r1 = d; - const u32 r2 = c; - const u32 r3 = b; - - #include COMPARE_S + COMPARE_S_SIMD (a, d, c, b); } }