From d2f49e36683b4a3d04ca98c7a478a09a4ae4c67b Mon Sep 17 00:00:00 2001 From: Jens Steube Date: Fri, 5 Feb 2016 17:43:00 +0100 Subject: [PATCH] Converted to new SIMD: -m 200 -a 0 --- OpenCL/m00200_a0.cl | 118 +++++++++++++------------------------------- 1 file changed, 33 insertions(+), 85 deletions(-) diff --git a/OpenCL/m00200_a0.cl b/OpenCL/m00200_a0.cl index 0ff686c09..31f305a72 100644 --- a/OpenCL/m00200_a0.cl +++ b/OpenCL/m00200_a0.cl @@ -5,6 +5,8 @@ #define _MYSQL323_ +#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 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 */ - 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]; - - 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]; + u32x w_t[16]; w_t[ 0] = w0[0]; 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[15] = 0; - u32 a = MYSQL323_A; - u32 b = MYSQL323_B; + u32x a = MYSQL323_A; + u32x b = MYSQL323_B; + u32x c = 0; + u32x d = 0; - u32 add = 7; + u32x add = 7; #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) { - const u32 wj = w_t[j]; + const u32x wj = w_t[j]; ROUND ((wj >> 0) & 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); } - const u32 wj = w_t[j]; + const u32x wj = w_t[j]; 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; b &= 0x7fffffff; - const u32 r0 = a; - const u32 r1 = b; - const u32 r2 = 0; - const u32 r3 = 0; - - #include COMPARE_M + COMPARE_M_SIMD (a, b, c, d); } } @@ -222,39 +196,16 @@ __kernel void m00200_s04 (__global pw_t *pws, __global kernel_rule_t *rules_buf, * 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]; - - 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]; + u32x w_t[16]; w_t[ 0] = w0[0]; 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[15] = 0; - u32 a = MYSQL323_A; - u32 b = MYSQL323_B; + u32x a = MYSQL323_A; + u32x b = MYSQL323_B; + u32x c = 0; + u32x d = 0; - u32 add = 7; + u32x add = 7; #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) { - const u32 wj = w_t[j]; + const u32x wj = w_t[j]; ROUND ((wj >> 0) & 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); } - const u32 wj = w_t[j]; + const u32x wj = w_t[j]; 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; b &= 0x7fffffff; - const u32 r0 = a; - const u32 r1 = b; - const u32 r2 = 0; - const u32 r3 = 0; - - #include COMPARE_S + COMPARE_S_SIMD (a, b, c, d); } }