Cleanup -m 44xx kernels to latest standard

OpenCL/m04400_a0.cl

@@ -39,7 +39,7 @@
 __kernel void m04400_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 il_cnt, const u32 digests_cnt, const u32 digests_offset, const u32 combs_mode, const u32 gid_max)
 {
   /**
-   * base
+   * modifier
    */
 
   const u32 gid = get_global_id (0);
@@ -70,18 +70,16 @@ __kernel void m04400_m04 (__global pw_t *pws, __global kernel_rule_t *rules_buf,
    */
 
   u32 pw_buf0[4];
-
-  pw_buf0[0] = pws[gid].i[ 0];
-  pw_buf0[1] = pws[gid].i[ 1];
-  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_buf0[0] = pws[gid].i[0];
-  pw_buf1[1] = pws[gid].i[ 5];
+  pw_buf0[1] = pws[gid].i[1];
-  pw_buf1[2] = pws[gid].i[ 6];
+  pw_buf0[2] = pws[gid].i[2];
-  pw_buf1[3] = pws[gid].i[ 7];
+  pw_buf0[3] = pws[gid].i[3];
+  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;
 
@@ -349,7 +347,7 @@ __kernel void m04400_m16 (__global pw_t *pws, __global kernel_rule_t *rules_buf,
 __kernel void m04400_s04 (__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 il_cnt, const u32 digests_cnt, const u32 digests_offset, const u32 combs_mode, const u32 gid_max)
 {
   /**
-   * base
+   * modifier
    */
 
   const u32 gid = get_global_id (0);
@@ -380,18 +378,16 @@ __kernel void m04400_s04 (__global pw_t *pws, __global kernel_rule_t *rules_buf,
    */
 
   u32 pw_buf0[4];
-
-  pw_buf0[0] = pws[gid].i[ 0];
-  pw_buf0[1] = pws[gid].i[ 1];
-  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_buf0[0] = pws[gid].i[0];
-  pw_buf1[1] = pws[gid].i[ 5];
+  pw_buf0[1] = pws[gid].i[1];
-  pw_buf1[2] = pws[gid].i[ 6];
+  pw_buf0[2] = pws[gid].i[2];
-  pw_buf1[3] = pws[gid].i[ 7];
+  pw_buf0[3] = pws[gid].i[3];
+  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;
 
@@ -652,6 +648,9 @@ __kernel void m04400_s04 (__global pw_t *pws, __global kernel_rule_t *rules_buf,
     MD5_STEP (MD5_I , c, d, a, b, w6_t, MD5C3a, MD5S32);
     MD5_STEP (MD5_I , b, c, d, a, wd_t, MD5C3b, MD5S33);
     MD5_STEP (MD5_I , a, b, c, d, w4_t, MD5C3c, MD5S30);
+
+    if (MATCHES_NONE_VS (a, search[0])) continue;
+
     MD5_STEP (MD5_I , d, a, b, c, wb_t, MD5C3d, MD5S31);
     MD5_STEP (MD5_I , c, d, a, b, w2_t, MD5C3e, MD5S32);
     MD5_STEP (MD5_I , b, c, d, a, w9_t, MD5C3f, MD5S33);

OpenCL/m04400_a1.cl

@@ -5,6 +5,8 @@
 
 #define _MD5_SHA1_
 
+#define NEW_SIMD_CODE
+
 #include "include/constants.h"
 #include "include/kernel_vendor.h"
 
@@ -16,16 +18,24 @@
 #include "include/kernel_functions.c"
 #include "OpenCL/types_ocl.c"
 #include "OpenCL/common.c"
-
+#include "OpenCL/simd.c"
-#define COMPARE_S "OpenCL/check_single_comp4.c"
+
-#define COMPARE_M "OpenCL/check_multi_comp4.c"
+#if   VECT_SIZE == 1
-
+#define uint_to_hex_lower8(i) (u32x) (l_bin2asc[(i)])
-#define uint_to_hex_lower8(i) l_bin2asc[(i)]
+#elif VECT_SIZE == 2
+#define uint_to_hex_lower8(i) (u32x) (l_bin2asc[(i).s0], l_bin2asc[(i).s1])
+#elif VECT_SIZE == 4
+#define uint_to_hex_lower8(i) (u32x) (l_bin2asc[(i).s0], l_bin2asc[(i).s1], l_bin2asc[(i).s2], l_bin2asc[(i).s3])
+#elif VECT_SIZE == 8
+#define uint_to_hex_lower8(i) (u32x) (l_bin2asc[(i).s0], l_bin2asc[(i).s1], l_bin2asc[(i).s2], l_bin2asc[(i).s3], l_bin2asc[(i).s4], l_bin2asc[(i).s5], l_bin2asc[(i).s6], l_bin2asc[(i).s7])
+#elif VECT_SIZE == 16
+#define uint_to_hex_lower8(i) (u32x) (l_bin2asc[(i).s0], l_bin2asc[(i).s1], l_bin2asc[(i).s2], l_bin2asc[(i).s3], l_bin2asc[(i).s4], l_bin2asc[(i).s5], l_bin2asc[(i).s6], l_bin2asc[(i).s7], l_bin2asc[(i).s8], l_bin2asc[(i).s9], l_bin2asc[(i).sa], l_bin2asc[(i).sb], l_bin2asc[(i).sc], l_bin2asc[(i).sd], l_bin2asc[(i).se], l_bin2asc[(i).sf])
+#endif
 
 __kernel void m04400_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 il_cnt, const u32 digests_cnt, const u32 digests_offset, const u32 combs_mode, const u32 gid_max)
 {
   /**
-   * base
+   * modifier
    */
 
   const u32 gid = get_global_id (0);
@@ -55,142 +65,119 @@ __kernel void m04400_m04 (__global pw_t *pws, __global kernel_rule_t *rules_buf,
    * base
    */
 
-  u32 wordl0[4];
+  u32 pw_buf0[4];
-
+  u32 pw_buf1[4];
-  wordl0[0] = pws[gid].i[ 0];
-  wordl0[1] = pws[gid].i[ 1];
-  wordl0[2] = pws[gid].i[ 2];
-  wordl0[3] = pws[gid].i[ 3];
-
-  u32 wordl1[4];
-
-  wordl1[0] = pws[gid].i[ 4];
-  wordl1[1] = pws[gid].i[ 5];
-  wordl1[2] = pws[gid].i[ 6];
-  wordl1[3] = pws[gid].i[ 7];
-
-  u32 wordl2[4];
 
-  wordl2[0] = 0;
+  pw_buf0[0] = pws[gid].i[0];
-  wordl2[1] = 0;
+  pw_buf0[1] = pws[gid].i[1];
-  wordl2[2] = 0;
+  pw_buf0[2] = pws[gid].i[2];
-  wordl2[3] = 0;
+  pw_buf0[3] = pws[gid].i[3];
-
+  pw_buf1[0] = pws[gid].i[4];
-  u32 wordl3[4];
+  pw_buf1[1] = pws[gid].i[5];
-
+  pw_buf1[2] = pws[gid].i[6];
-  wordl3[0] = 0;
+  pw_buf1[3] = pws[gid].i[7];
-  wordl3[1] = 0;
-  wordl3[2] = 0;
-  wordl3[3] = 0;
 
   const u32 pw_l_len = pws[gid].pw_len;
 
-  if (combs_mode == COMBINATOR_MODE_BASE_RIGHT)
-  {
-    append_0x80_2x4 (wordl0, wordl1, pw_l_len);
-
-    switch_buffer_by_offset_le (wordl0, wordl1, wordl2, wordl3, combs_buf[0].pw_len);
-  }
-
   /**
    * loop
    */
 
-  for (u32 il_pos = 0; il_pos < il_cnt; il_pos++)
+  for (u32 il_pos = 0; il_pos < il_cnt; il_pos += VECT_SIZE)
   {
-    const u32 pw_r_len = combs_buf[il_pos].pw_len;
+    const u32x pw_r_len = pwlenx_create_combt (combs_buf, il_pos);
-
-    const u32 pw_len = pw_l_len + pw_r_len;
-
-    u32 wordr0[4];
 
-    wordr0[0] = combs_buf[il_pos].i[0];
+    const u32x pw_len = pw_l_len + pw_r_len;
-    wordr0[1] = combs_buf[il_pos].i[1];
-    wordr0[2] = combs_buf[il_pos].i[2];
-    wordr0[3] = combs_buf[il_pos].i[3];
 
-    u32 wordr1[4];
+    /**
-
+     * concat password candidate
-    wordr1[0] = combs_buf[il_pos].i[4];
+     */
-    wordr1[1] = combs_buf[il_pos].i[5];
-    wordr1[2] = combs_buf[il_pos].i[6];
-    wordr1[3] = combs_buf[il_pos].i[7];
-
-    u32 wordr2[4];
-
-    wordr2[0] = 0;
-    wordr2[1] = 0;
-    wordr2[2] = 0;
-    wordr2[3] = 0;
-
-    u32 wordr3[4];
 
-    wordr3[0] = 0;
+    u32x wordl0[4] = { 0 };
-    wordr3[1] = 0;
+    u32x wordl1[4] = { 0 };
-    wordr3[2] = 0;
+    u32x wordl2[4] = { 0 };
-    wordr3[3] = 0;
+    u32x wordl3[4] = { 0 };
+
+    wordl0[0] = pw_buf0[0];
+    wordl0[1] = pw_buf0[1];
+    wordl0[2] = pw_buf0[2];
+    wordl0[3] = pw_buf0[3];
+    wordl1[0] = pw_buf1[0];
+    wordl1[1] = pw_buf1[1];
+    wordl1[2] = pw_buf1[2];
+    wordl1[3] = pw_buf1[3];
+
+    u32x wordr0[4] = { 0 };
+    u32x wordr1[4] = { 0 };
+    u32x wordr2[4] = { 0 };
+    u32x wordr3[4] = { 0 };
+
+    wordr0[0] = ix_create_combt (combs_buf, il_pos, 0);
+    wordr0[1] = ix_create_combt (combs_buf, il_pos, 1);
+    wordr0[2] = ix_create_combt (combs_buf, il_pos, 2);
+    wordr0[3] = ix_create_combt (combs_buf, il_pos, 3);
+    wordr1[0] = ix_create_combt (combs_buf, il_pos, 4);
+    wordr1[1] = ix_create_combt (combs_buf, il_pos, 5);
+    wordr1[2] = ix_create_combt (combs_buf, il_pos, 6);
+    wordr1[3] = ix_create_combt (combs_buf, il_pos, 7);
 
     if (combs_mode == COMBINATOR_MODE_BASE_LEFT)
     {
-      append_0x80_2x4 (wordr0, wordr1, pw_r_len);
+      switch_buffer_by_offset_le_VV (wordr0, wordr1, wordr2, wordr3, pw_l_len);
-
+    }
-      switch_buffer_by_offset_le (wordr0, wordr1, wordr2, wordr3, pw_l_len);
+    else
+    {
+      switch_buffer_by_offset_le_VV (wordl0, wordl1, wordl2, wordl3, pw_r_len);
     }
 
-    u32 w0[4];
+    u32x w0[4];
+    u32x w1[4];
+    u32x w2[4];
+    u32x w3[4];
 
     w0[0] = wordl0[0] | wordr0[0];
     w0[1] = wordl0[1] | wordr0[1];
     w0[2] = wordl0[2] | wordr0[2];
     w0[3] = wordl0[3] | wordr0[3];
-
-    u32 w1[4];
-
     w1[0] = wordl1[0] | wordr1[0];
     w1[1] = wordl1[1] | wordr1[1];
     w1[2] = wordl1[2] | wordr1[2];
     w1[3] = wordl1[3] | wordr1[3];
-
-    u32 w2[4];
-
     w2[0] = wordl2[0] | wordr2[0];
     w2[1] = wordl2[1] | wordr2[1];
     w2[2] = wordl2[2] | wordr2[2];
     w2[3] = wordl2[3] | wordr2[3];
-
-    u32 w3[4];
-
     w3[0] = wordl3[0] | wordr3[0];
     w3[1] = wordl3[1] | wordr3[1];
-    w3[2] = 0;
+    w3[2] = wordl3[2] | wordr3[2];
-    w3[3] = 0;
+    w3[3] = wordl3[3] | wordr3[3];
 
     /**
      * sha1
      */
 
-    u32 w0_t = swap32 (w0[0]);
+    u32x w0_t = swap32 (w0[0]);
-    u32 w1_t = swap32 (w0[1]);
+    u32x w1_t = swap32 (w0[1]);
-    u32 w2_t = swap32 (w0[2]);
+    u32x w2_t = swap32 (w0[2]);
-    u32 w3_t = swap32 (w0[3]);
+    u32x w3_t = swap32 (w0[3]);
-    u32 w4_t = swap32 (w1[0]);
+    u32x w4_t = swap32 (w1[0]);
-    u32 w5_t = swap32 (w1[1]);
+    u32x w5_t = swap32 (w1[1]);
-    u32 w6_t = swap32 (w1[2]);
+    u32x w6_t = swap32 (w1[2]);
-    u32 w7_t = swap32 (w1[3]);
+    u32x w7_t = swap32 (w1[3]);
-    u32 w8_t = swap32 (w2[0]);
+    u32x w8_t = swap32 (w2[0]);
-    u32 w9_t = swap32 (w2[1]);
+    u32x w9_t = swap32 (w2[1]);
-    u32 wa_t = swap32 (w2[2]);
+    u32x wa_t = swap32 (w2[2]);
-    u32 wb_t = swap32 (w2[3]);
+    u32x wb_t = swap32 (w2[3]);
-    u32 wc_t = swap32 (w3[0]);
+    u32x wc_t = swap32 (w3[0]);
-    u32 wd_t = swap32 (w3[1]);
+    u32x wd_t = swap32 (w3[1]);
-    u32 we_t = 0;
+    u32x we_t = 0;
-    u32 wf_t = pw_len * 8;
+    u32x wf_t = pw_len * 8;
-
+
-    u32 a = SHA1M_A;
+    u32x a = SHA1M_A;
-    u32 b = SHA1M_B;
+    u32x b = SHA1M_B;
-    u32 c = SHA1M_C;
+    u32x c = SHA1M_C;
-    u32 d = SHA1M_D;
+    u32x d = SHA1M_D;
-    u32 e = SHA1M_E;
+    u32x e = SHA1M_E;
 
     #undef K
     #define K SHA1C00
@@ -399,12 +386,7 @@ __kernel void m04400_m04 (__global pw_t *pws, __global kernel_rule_t *rules_buf,
     MD5_STEP (MD5_I , c, d, a, b, w2_t, MD5C3e, MD5S32);
     MD5_STEP (MD5_I , b, c, d, a, w9_t, MD5C3f, MD5S33);
 
-    const u32 r0 = a;
+    COMPARE_M_SIMD (a, d, c, b);
-    const u32 r1 = d;
-    const u32 r2 = c;
-    const u32 r3 = b;
-
-    #include COMPARE_M
   }
 }
 
@@ -419,7 +401,7 @@ __kernel void m04400_m16 (__global pw_t *pws, __global kernel_rule_t *rules_buf,
 __kernel void m04400_s04 (__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 il_cnt, const u32 digests_cnt, const u32 digests_offset, const u32 combs_mode, const u32 gid_max)
 {
   /**
-   * base
+   * modifier
    */
 
   const u32 gid = get_global_id (0);
@@ -449,43 +431,20 @@ __kernel void m04400_s04 (__global pw_t *pws, __global kernel_rule_t *rules_buf,
    * base
    */
 
-  u32 wordl0[4];
+  u32 pw_buf0[4];
-
+  u32 pw_buf1[4];
-  wordl0[0] = pws[gid].i[ 0];
-  wordl0[1] = pws[gid].i[ 1];
-  wordl0[2] = pws[gid].i[ 2];
-  wordl0[3] = pws[gid].i[ 3];
-
-  u32 wordl1[4];
-
-  wordl1[0] = pws[gid].i[ 4];
-  wordl1[1] = pws[gid].i[ 5];
-  wordl1[2] = pws[gid].i[ 6];
-  wordl1[3] = pws[gid].i[ 7];
 
-  u32 wordl2[4];
+  pw_buf0[0] = pws[gid].i[0];
-
+  pw_buf0[1] = pws[gid].i[1];
-  wordl2[0] = 0;
+  pw_buf0[2] = pws[gid].i[2];
-  wordl2[1] = 0;
+  pw_buf0[3] = pws[gid].i[3];
-  wordl2[2] = 0;
+  pw_buf1[0] = pws[gid].i[4];
-  wordl2[3] = 0;
+  pw_buf1[1] = pws[gid].i[5];
-
+  pw_buf1[2] = pws[gid].i[6];
-  u32 wordl3[4];
+  pw_buf1[3] = pws[gid].i[7];
-
-  wordl3[0] = 0;
-  wordl3[1] = 0;
-  wordl3[2] = 0;
-  wordl3[3] = 0;
 
   const u32 pw_l_len = pws[gid].pw_len;
 
-  if (combs_mode == COMBINATOR_MODE_BASE_RIGHT)
-  {
-    append_0x80_2x4 (wordl0, wordl1, pw_l_len);
-
-    switch_buffer_by_offset_le (wordl0, wordl1, wordl2, wordl3, combs_buf[0].pw_len);
-  }
-
   /**
    * digest
    */
@@ -502,101 +461,101 @@ __kernel void m04400_s04 (__global pw_t *pws, __global kernel_rule_t *rules_buf,
    * loop
    */
 
-  for (u32 il_pos = 0; il_pos < il_cnt; il_pos++)
+  for (u32 il_pos = 0; il_pos < il_cnt; il_pos += VECT_SIZE)
   {
-    const u32 pw_r_len = combs_buf[il_pos].pw_len;
+    const u32x pw_r_len = pwlenx_create_combt (combs_buf, il_pos);
-
-    const u32 pw_len = pw_l_len + pw_r_len;
-
-    u32 wordr0[4];
-
-    wordr0[0] = combs_buf[il_pos].i[0];
-    wordr0[1] = combs_buf[il_pos].i[1];
-    wordr0[2] = combs_buf[il_pos].i[2];
-    wordr0[3] = combs_buf[il_pos].i[3];
-
-    u32 wordr1[4];
-
-    wordr1[0] = combs_buf[il_pos].i[4];
-    wordr1[1] = combs_buf[il_pos].i[5];
-    wordr1[2] = combs_buf[il_pos].i[6];
-    wordr1[3] = combs_buf[il_pos].i[7];
 
-    u32 wordr2[4];
+    const u32x pw_len = pw_l_len + pw_r_len;
 
-    wordr2[0] = 0;
+    /**
-    wordr2[1] = 0;
+     * concat password candidate
-    wordr2[2] = 0;
+     */
-    wordr2[3] = 0;
-
-    u32 wordr3[4];
 
-    wordr3[0] = 0;
+    u32x wordl0[4] = { 0 };
-    wordr3[1] = 0;
+    u32x wordl1[4] = { 0 };
-    wordr3[2] = 0;
+    u32x wordl2[4] = { 0 };
-    wordr3[3] = 0;
+    u32x wordl3[4] = { 0 };
+
+    wordl0[0] = pw_buf0[0];
+    wordl0[1] = pw_buf0[1];
+    wordl0[2] = pw_buf0[2];
+    wordl0[3] = pw_buf0[3];
+    wordl1[0] = pw_buf1[0];
+    wordl1[1] = pw_buf1[1];
+    wordl1[2] = pw_buf1[2];
+    wordl1[3] = pw_buf1[3];
+
+    u32x wordr0[4] = { 0 };
+    u32x wordr1[4] = { 0 };
+    u32x wordr2[4] = { 0 };
+    u32x wordr3[4] = { 0 };
+
+    wordr0[0] = ix_create_combt (combs_buf, il_pos, 0);
+    wordr0[1] = ix_create_combt (combs_buf, il_pos, 1);
+    wordr0[2] = ix_create_combt (combs_buf, il_pos, 2);
+    wordr0[3] = ix_create_combt (combs_buf, il_pos, 3);
+    wordr1[0] = ix_create_combt (combs_buf, il_pos, 4);
+    wordr1[1] = ix_create_combt (combs_buf, il_pos, 5);
+    wordr1[2] = ix_create_combt (combs_buf, il_pos, 6);
+    wordr1[3] = ix_create_combt (combs_buf, il_pos, 7);
 
     if (combs_mode == COMBINATOR_MODE_BASE_LEFT)
     {
-      append_0x80_2x4 (wordr0, wordr1, pw_r_len);
+      switch_buffer_by_offset_le_VV (wordr0, wordr1, wordr2, wordr3, pw_l_len);
-
+    }
-      switch_buffer_by_offset_le (wordr0, wordr1, wordr2, wordr3, pw_l_len);
+    else
+    {
+      switch_buffer_by_offset_le_VV (wordl0, wordl1, wordl2, wordl3, pw_r_len);
     }
 
-    u32 w0[4];
+    u32x w0[4];
+    u32x w1[4];
+    u32x w2[4];
+    u32x w3[4];
 
     w0[0] = wordl0[0] | wordr0[0];
     w0[1] = wordl0[1] | wordr0[1];
     w0[2] = wordl0[2] | wordr0[2];
     w0[3] = wordl0[3] | wordr0[3];
-
-    u32 w1[4];
-
     w1[0] = wordl1[0] | wordr1[0];
     w1[1] = wordl1[1] | wordr1[1];
     w1[2] = wordl1[2] | wordr1[2];
     w1[3] = wordl1[3] | wordr1[3];
-
-    u32 w2[4];
-
     w2[0] = wordl2[0] | wordr2[0];
     w2[1] = wordl2[1] | wordr2[1];
     w2[2] = wordl2[2] | wordr2[2];
     w2[3] = wordl2[3] | wordr2[3];
-
-    u32 w3[4];
-
     w3[0] = wordl3[0] | wordr3[0];
     w3[1] = wordl3[1] | wordr3[1];
-    w3[2] = 0;
+    w3[2] = wordl3[2] | wordr3[2];
-    w3[3] = 0;
+    w3[3] = wordl3[3] | wordr3[3];
 
     /**
      * sha1
      */
 
-    u32 w0_t = swap32 (w0[0]);
+    u32x w0_t = swap32 (w0[0]);
-    u32 w1_t = swap32 (w0[1]);
+    u32x w1_t = swap32 (w0[1]);
-    u32 w2_t = swap32 (w0[2]);
+    u32x w2_t = swap32 (w0[2]);
-    u32 w3_t = swap32 (w0[3]);
+    u32x w3_t = swap32 (w0[3]);
-    u32 w4_t = swap32 (w1[0]);
+    u32x w4_t = swap32 (w1[0]);
-    u32 w5_t = swap32 (w1[1]);
+    u32x w5_t = swap32 (w1[1]);
-    u32 w6_t = swap32 (w1[2]);
+    u32x w6_t = swap32 (w1[2]);
-    u32 w7_t = swap32 (w1[3]);
+    u32x w7_t = swap32 (w1[3]);
-    u32 w8_t = swap32 (w2[0]);
+    u32x w8_t = swap32 (w2[0]);
-    u32 w9_t = swap32 (w2[1]);
+    u32x w9_t = swap32 (w2[1]);
-    u32 wa_t = swap32 (w2[2]);
+    u32x wa_t = swap32 (w2[2]);
-    u32 wb_t = swap32 (w2[3]);
+    u32x wb_t = swap32 (w2[3]);
-    u32 wc_t = swap32 (w3[0]);
+    u32x wc_t = swap32 (w3[0]);
-    u32 wd_t = swap32 (w3[1]);
+    u32x wd_t = swap32 (w3[1]);
-    u32 we_t = 0;
+    u32x we_t = 0;
-    u32 wf_t = pw_len * 8;
+    u32x wf_t = pw_len * 8;
-
+
-    u32 a = SHA1M_A;
+    u32x a = SHA1M_A;
-    u32 b = SHA1M_B;
+    u32x b = SHA1M_B;
-    u32 c = SHA1M_C;
+    u32x c = SHA1M_C;
-    u32 d = SHA1M_D;
+    u32x d = SHA1M_D;
-    u32 e = SHA1M_E;
+    u32x e = SHA1M_E;
 
     #undef K
     #define K SHA1C00
@@ -801,16 +760,14 @@ __kernel void m04400_s04 (__global pw_t *pws, __global kernel_rule_t *rules_buf,
     MD5_STEP (MD5_I , c, d, a, b, w6_t, MD5C3a, MD5S32);
     MD5_STEP (MD5_I , b, c, d, a, wd_t, MD5C3b, MD5S33);
     MD5_STEP (MD5_I , a, b, c, d, w4_t, MD5C3c, MD5S30);
+
+    if (MATCHES_NONE_VS (a, search[0])) continue;
+
     MD5_STEP (MD5_I , d, a, b, c, wb_t, MD5C3d, MD5S31);
     MD5_STEP (MD5_I , c, d, a, b, w2_t, MD5C3e, MD5S32);
     MD5_STEP (MD5_I , b, c, d, a, w9_t, MD5C3f, MD5S33);
 
-    const u32 r0 = a;
+    COMPARE_S_SIMD (a, d, c, b);
-    const u32 r1 = d;
-    const u32 r2 = c;
-    const u32 r3 = b;
-
-    #include COMPARE_S
   }
 }
 

OpenCL/m04400_a3.cl

@@ -43,10 +43,6 @@ static void m04400m (u32 w0[4], u32 w1[4], u32 w2[4], u32 w3[4], const u32 pw_le
   const u32 gid = get_global_id (0);
   const u32 lid = get_local_id (0);
 
-  /**
-   * digest
-   */
-
   /**
    * loop
    */
@@ -560,6 +556,9 @@ static void m04400s (u32 w0[4], u32 w1[4], u32 w2[4], u32 w3[4], const u32 pw_le
     MD5_STEP (MD5_I , c, d, a, b, w6_t, MD5C3a, MD5S32);
     MD5_STEP (MD5_I , b, c, d, a, wd_t, MD5C3b, MD5S33);
     MD5_STEP (MD5_I , a, b, c, d, w4_t, MD5C3c, MD5S30);
+
+    if (MATCHES_NONE_VS (a, search[0])) continue;
+
     MD5_STEP (MD5_I , d, a, b, c, wb_t, MD5C3d, MD5S31);
     MD5_STEP (MD5_I , c, d, a, b, w2_t, MD5C3e, MD5S32);
     MD5_STEP (MD5_I , b, c, d, a, w9_t, MD5C3f, MD5S33);