X-Git-Url: https://www.flypig.org.uk/git/?a=blobdiff_plain;f=OpenCL%2Fm05100_a3.cl;h=3ef4bbc108e6b4b1a55d4b843aee0d74a7b7ae7e;hb=161a6eb4bc643d8e636e96eda613f5137d30da59;hp=fa2de71fc122f7690192f49ef74d2e9fba7a4bdc;hpb=a62b7ed06e9663a1e330983e29110cfbcf37122a;p=hashcat.git

diff --git a/OpenCL/m05100_a3.cl b/OpenCL/m05100_a3.cl
index fa2de71..3ef4bbc 100644
--- a/OpenCL/m05100_a3.cl
+++ b/OpenCL/m05100_a3.cl
@@ -5,22 +5,16 @@
 
 #define _MD5H_
 
-#include "include/constants.h"
-#include "include/kernel_vendor.h"
+#define NEW_SIMD_CODE
 
-#define DGST_R0 0
-#define DGST_R1 1
-#define DGST_R2 2
-#define DGST_R3 3
+#include "inc_vendor.cl"
+#include "inc_hash_constants.h"
+#include "inc_hash_functions.cl"
+#include "inc_types.cl"
+#include "inc_common.cl"
+#include "inc_simd.cl"
 
-#include "include/kernel_functions.c"
-#include "OpenCL/types_ocl.c"
-#include "OpenCL/common.c"
-
-#define COMPARE_S "OpenCL/check_single_comp4.c"
-#define COMPARE_M "OpenCL/check_multi_comp4.c"
-
-static void m05100m (u32 w0[4], u32 w1[4], u32 w2[4], u32 w3[4], const u32 pw_len, __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 bfs_cnt, const u32 digests_cnt, const u32 digests_offset)
+void m05100m (u32 w0[4], u32 w1[4], u32 w2[4], u32 w3[4], const u32 pw_len, __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_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)
 {
   /**
    * modifier
@@ -29,132 +23,131 @@ static void m05100m (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);
 
-  /**
-   * base
-   */
-
-  w3[2] = pw_len * 8;
-
   /**
    * loop
    */
 
-  u32 w0l = w0[0];
+  const u32 w0l = w0[0];
 
-  for (u32 il_pos = 0; il_pos < bfs_cnt; il_pos++)
+  for (u32 il_pos = 0; il_pos < il_cnt; il_pos += VECT_SIZE)
   {
-    const u32 w0r = bfs_buf[il_pos].i;
-
-    w0[0] = w0l | w0r;
-
-    u32 a = MD5M_A;
-    u32 b = MD5M_B;
-    u32 c = MD5M_C;
-    u32 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);
-    MD5_STEP (MD5_Fo, c, d, a, b, w0[2], MD5C02, MD5S02);
-    MD5_STEP (MD5_Fo, b, c, d, a, w0[3], MD5C03, MD5S03);
-    MD5_STEP (MD5_Fo, a, b, c, d, w1[0], MD5C04, MD5S00);
-    MD5_STEP (MD5_Fo, d, a, b, c, w1[1], MD5C05, MD5S01);
-    MD5_STEP (MD5_Fo, c, d, a, b, w1[2], MD5C06, MD5S02);
-    MD5_STEP (MD5_Fo, b, c, d, a, w1[3], MD5C07, MD5S03);
-    MD5_STEP (MD5_Fo, a, b, c, d, w2[0], MD5C08, MD5S00);
-    MD5_STEP (MD5_Fo, d, a, b, c, w2[1], MD5C09, MD5S01);
-    MD5_STEP (MD5_Fo, c, d, a, b, w2[2], MD5C0a, MD5S02);
-    MD5_STEP (MD5_Fo, b, c, d, a, w2[3], MD5C0b, MD5S03);
-    MD5_STEP (MD5_Fo, a, b, c, d, w3[0], MD5C0c, MD5S00);
-    MD5_STEP (MD5_Fo, d, a, b, c, w3[1], MD5C0d, MD5S01);
-    MD5_STEP (MD5_Fo, c, d, a, b, w3[2], MD5C0e, MD5S02);
-    MD5_STEP (MD5_Fo, b, c, d, a, w3[3], MD5C0f, MD5S03);
-
-    MD5_STEP (MD5_Go, a, b, c, d, w0[1], MD5C10, MD5S10);
-    MD5_STEP (MD5_Go, d, a, b, c, w1[2], MD5C11, MD5S11);
-    MD5_STEP (MD5_Go, c, d, a, b, w2[3], MD5C12, MD5S12);
-    MD5_STEP (MD5_Go, b, c, d, a, w0[0], MD5C13, MD5S13);
-    MD5_STEP (MD5_Go, a, b, c, d, w1[1], MD5C14, MD5S10);
-    MD5_STEP (MD5_Go, d, a, b, c, w2[2], MD5C15, MD5S11);
-    MD5_STEP (MD5_Go, c, d, a, b, w3[3], MD5C16, MD5S12);
-    MD5_STEP (MD5_Go, b, c, d, a, w1[0], MD5C17, MD5S13);
-    MD5_STEP (MD5_Go, a, b, c, d, w2[1], MD5C18, MD5S10);
-    MD5_STEP (MD5_Go, d, a, b, c, w3[2], MD5C19, MD5S11);
-    MD5_STEP (MD5_Go, c, d, a, b, w0[3], MD5C1a, MD5S12);
-    MD5_STEP (MD5_Go, b, c, d, a, w2[0], MD5C1b, MD5S13);
-    MD5_STEP (MD5_Go, a, b, c, d, w3[1], MD5C1c, MD5S10);
-    MD5_STEP (MD5_Go, d, a, b, c, w0[2], MD5C1d, MD5S11);
-    MD5_STEP (MD5_Go, c, d, a, b, w1[3], MD5C1e, MD5S12);
-    MD5_STEP (MD5_Go, b, c, d, a, w3[0], MD5C1f, MD5S13);
-
-    MD5_STEP (MD5_H , a, b, c, d, w1[1], MD5C20, MD5S20);
-    MD5_STEP (MD5_H , d, a, b, c, w2[0], MD5C21, MD5S21);
-    MD5_STEP (MD5_H , c, d, a, b, w2[3], MD5C22, MD5S22);
-    MD5_STEP (MD5_H , b, c, d, a, w3[2], MD5C23, MD5S23);
-    MD5_STEP (MD5_H , a, b, c, d, w0[1], MD5C24, MD5S20);
-    MD5_STEP (MD5_H , d, a, b, c, w1[0], MD5C25, MD5S21);
-    MD5_STEP (MD5_H , c, d, a, b, w1[3], MD5C26, MD5S22);
-    MD5_STEP (MD5_H , b, c, d, a, w2[2], MD5C27, MD5S23);
-    MD5_STEP (MD5_H , a, b, c, d, w3[1], MD5C28, MD5S20);
-    MD5_STEP (MD5_H , d, a, b, c, w0[0], MD5C29, MD5S21);
-    MD5_STEP (MD5_H , c, d, a, b, w0[3], MD5C2a, MD5S22);
-    MD5_STEP (MD5_H , b, c, d, a, w1[2], MD5C2b, MD5S23);
-    MD5_STEP (MD5_H , a, b, c, d, w2[1], MD5C2c, MD5S20);
-    MD5_STEP (MD5_H , d, a, b, c, w3[0], MD5C2d, MD5S21);
-    MD5_STEP (MD5_H , c, d, a, b, w3[3], MD5C2e, MD5S22);
-    MD5_STEP (MD5_H , b, c, d, a, w0[2], MD5C2f, MD5S23);
-
-    MD5_STEP (MD5_I , a, b, c, d, w0[0], MD5C30, MD5S30);
-    MD5_STEP (MD5_I , d, a, b, c, w1[3], MD5C31, MD5S31);
-    MD5_STEP (MD5_I , c, d, a, b, w3[2], MD5C32, MD5S32);
-    MD5_STEP (MD5_I , b, c, d, a, w1[1], MD5C33, MD5S33);
-    MD5_STEP (MD5_I , a, b, c, d, w3[0], MD5C34, MD5S30);
-    MD5_STEP (MD5_I , d, a, b, c, w0[3], MD5C35, MD5S31);
-    MD5_STEP (MD5_I , c, d, a, b, w2[2], MD5C36, MD5S32);
-    MD5_STEP (MD5_I , b, c, d, a, w0[1], MD5C37, MD5S33);
-    MD5_STEP (MD5_I , a, b, c, d, w2[0], MD5C38, MD5S30);
-    MD5_STEP (MD5_I , d, a, b, c, w3[3], MD5C39, MD5S31);
-    MD5_STEP (MD5_I , c, d, a, b, w1[2], MD5C3a, MD5S32);
-    MD5_STEP (MD5_I , b, c, d, a, w3[1], MD5C3b, MD5S33);
-    MD5_STEP (MD5_I , a, b, c, d, w1[0], MD5C3c, MD5S30);
-    MD5_STEP (MD5_I , d, a, b, c, w2[3], MD5C3d, MD5S31);
-    MD5_STEP (MD5_I , c, d, a, b, w0[2], MD5C3e, MD5S32);
-    MD5_STEP (MD5_I , b, c, d, a, w2[1], MD5C3f, MD5S33);
+    const u32x w0r = ix_create_bft (bfs_buf, il_pos);
+
+    const u32x w0lr = w0l | w0r;
+
+    u32x t0[4];
+    u32x t1[4];
+    u32x t2[4];
+    u32x t3[4];
+
+    t0[0] = w0lr;
+    t0[1] = w0[1];
+    t0[2] = w0[2];
+    t0[3] = w0[3];
+    t1[0] = w1[0];
+    t1[1] = w1[1];
+    t1[2] = w1[2];
+    t1[3] = w1[3];
+    t2[0] = w2[0];
+    t2[1] = w2[1];
+    t2[2] = w2[2];
+    t2[3] = w2[3];
+    t3[0] = w3[0];
+    t3[1] = w3[1];
+    t3[2] = pw_len * 8;
+    t3[3] = 0;
+
+    /**
+     * md5
+     */
+
+    u32x a = MD5M_A;
+    u32x b = MD5M_B;
+    u32x c = MD5M_C;
+    u32x d = MD5M_D;
+
+    MD5_STEP (MD5_Fo, a, b, c, d, t0[0], MD5C00, MD5S00);
+    MD5_STEP (MD5_Fo, d, a, b, c, t0[1], MD5C01, MD5S01);
+    MD5_STEP (MD5_Fo, c, d, a, b, t0[2], MD5C02, MD5S02);
+    MD5_STEP (MD5_Fo, b, c, d, a, t0[3], MD5C03, MD5S03);
+    MD5_STEP (MD5_Fo, a, b, c, d, t1[0], MD5C04, MD5S00);
+    MD5_STEP (MD5_Fo, d, a, b, c, t1[1], MD5C05, MD5S01);
+    MD5_STEP (MD5_Fo, c, d, a, b, t1[2], MD5C06, MD5S02);
+    MD5_STEP (MD5_Fo, b, c, d, a, t1[3], MD5C07, MD5S03);
+    MD5_STEP (MD5_Fo, a, b, c, d, t2[0], MD5C08, MD5S00);
+    MD5_STEP (MD5_Fo, d, a, b, c, t2[1], MD5C09, MD5S01);
+    MD5_STEP (MD5_Fo, c, d, a, b, t2[2], MD5C0a, MD5S02);
+    MD5_STEP (MD5_Fo, b, c, d, a, t2[3], MD5C0b, MD5S03);
+    MD5_STEP (MD5_Fo, a, b, c, d, t3[0], MD5C0c, MD5S00);
+    MD5_STEP (MD5_Fo, d, a, b, c, t3[1], MD5C0d, MD5S01);
+    MD5_STEP (MD5_Fo, c, d, a, b, t3[2], MD5C0e, MD5S02);
+    MD5_STEP (MD5_Fo, b, c, d, a, t3[3], MD5C0f, MD5S03);
+
+    MD5_STEP (MD5_Go, a, b, c, d, t0[1], MD5C10, MD5S10);
+    MD5_STEP (MD5_Go, d, a, b, c, t1[2], MD5C11, MD5S11);
+    MD5_STEP (MD5_Go, c, d, a, b, t2[3], MD5C12, MD5S12);
+    MD5_STEP (MD5_Go, b, c, d, a, t0[0], MD5C13, MD5S13);
+    MD5_STEP (MD5_Go, a, b, c, d, t1[1], MD5C14, MD5S10);
+    MD5_STEP (MD5_Go, d, a, b, c, t2[2], MD5C15, MD5S11);
+    MD5_STEP (MD5_Go, c, d, a, b, t3[3], MD5C16, MD5S12);
+    MD5_STEP (MD5_Go, b, c, d, a, t1[0], MD5C17, MD5S13);
+    MD5_STEP (MD5_Go, a, b, c, d, t2[1], MD5C18, MD5S10);
+    MD5_STEP (MD5_Go, d, a, b, c, t3[2], MD5C19, MD5S11);
+    MD5_STEP (MD5_Go, c, d, a, b, t0[3], MD5C1a, MD5S12);
+    MD5_STEP (MD5_Go, b, c, d, a, t2[0], MD5C1b, MD5S13);
+    MD5_STEP (MD5_Go, a, b, c, d, t3[1], MD5C1c, MD5S10);
+    MD5_STEP (MD5_Go, d, a, b, c, t0[2], MD5C1d, MD5S11);
+    MD5_STEP (MD5_Go, c, d, a, b, t1[3], MD5C1e, MD5S12);
+    MD5_STEP (MD5_Go, b, c, d, a, t3[0], MD5C1f, MD5S13);
+
+    MD5_STEP (MD5_H , a, b, c, d, t1[1], MD5C20, MD5S20);
+    MD5_STEP (MD5_H , d, a, b, c, t2[0], MD5C21, MD5S21);
+    MD5_STEP (MD5_H , c, d, a, b, t2[3], MD5C22, MD5S22);
+    MD5_STEP (MD5_H , b, c, d, a, t3[2], MD5C23, MD5S23);
+    MD5_STEP (MD5_H , a, b, c, d, t0[1], MD5C24, MD5S20);
+    MD5_STEP (MD5_H , d, a, b, c, t1[0], MD5C25, MD5S21);
+    MD5_STEP (MD5_H , c, d, a, b, t1[3], MD5C26, MD5S22);
+    MD5_STEP (MD5_H , b, c, d, a, t2[2], MD5C27, MD5S23);
+    MD5_STEP (MD5_H , a, b, c, d, t3[1], MD5C28, MD5S20);
+    MD5_STEP (MD5_H , d, a, b, c, t0[0], MD5C29, MD5S21);
+    MD5_STEP (MD5_H , c, d, a, b, t0[3], MD5C2a, MD5S22);
+    MD5_STEP (MD5_H , b, c, d, a, t1[2], MD5C2b, MD5S23);
+    MD5_STEP (MD5_H , a, b, c, d, t2[1], MD5C2c, MD5S20);
+    MD5_STEP (MD5_H , d, a, b, c, t3[0], MD5C2d, MD5S21);
+    MD5_STEP (MD5_H , c, d, a, b, t3[3], MD5C2e, MD5S22);
+    MD5_STEP (MD5_H , b, c, d, a, t0[2], MD5C2f, MD5S23);
+
+    MD5_STEP (MD5_I , a, b, c, d, t0[0], MD5C30, MD5S30);
+    MD5_STEP (MD5_I , d, a, b, c, t1[3], MD5C31, MD5S31);
+    MD5_STEP (MD5_I , c, d, a, b, t3[2], MD5C32, MD5S32);
+    MD5_STEP (MD5_I , b, c, d, a, t1[1], MD5C33, MD5S33);
+    MD5_STEP (MD5_I , a, b, c, d, t3[0], MD5C34, MD5S30);
+    MD5_STEP (MD5_I , d, a, b, c, t0[3], MD5C35, MD5S31);
+    MD5_STEP (MD5_I , c, d, a, b, t2[2], MD5C36, MD5S32);
+    MD5_STEP (MD5_I , b, c, d, a, t0[1], MD5C37, MD5S33);
+    MD5_STEP (MD5_I , a, b, c, d, t2[0], MD5C38, MD5S30);
+    MD5_STEP (MD5_I , d, a, b, c, t3[3], MD5C39, MD5S31);
+    MD5_STEP (MD5_I , c, d, a, b, t1[2], MD5C3a, MD5S32);
+    MD5_STEP (MD5_I , b, c, d, a, t3[1], MD5C3b, MD5S33);
+    MD5_STEP (MD5_I , a, b, c, d, t1[0], MD5C3c, MD5S30);
+    MD5_STEP (MD5_I , d, a, b, c, t2[3], MD5C3d, MD5S31);
+    MD5_STEP (MD5_I , c, d, a, b, t0[2], MD5C3e, MD5S32);
+    MD5_STEP (MD5_I , b, c, d, a, t2[1], MD5C3f, MD5S33);
 
     a += MD5M_A;
     b += MD5M_B;
     c += MD5M_C;
     d += MD5M_D;
 
-    {
-      const u32 r0 = a;
-      const u32 r1 = b;
-      const u32 r2 = 0;
-      const u32 r3 = 0;
-
-      #include COMPARE_M
-    }
-
-    {
-      const u32 r0 = b;
-      const u32 r1 = c;
-      const u32 r2 = 0;
-      const u32 r3 = 0;
-
-      #include COMPARE_M
-    }
+    u32x z = 0;
 
-    {
-      const u32 r0 = c;
-      const u32 r1 = d;
-      const u32 r2 = 0;
-      const u32 r3 = 0;
-
-      #include COMPARE_M
-    }
+    COMPARE_M_SIMD (a, b, z, z);
+    COMPARE_M_SIMD (b, c, z, z);
+    COMPARE_M_SIMD (c, d, z, z);
   }
 }
 
-static void m05100s (u32 w0[4], u32 w1[4], u32 w2[4], u32 w3[4], const u32 pw_len, __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 bfs_cnt, const u32 digests_cnt, const u32 digests_offset)
+void m05100s (u32 w0[4], u32 w1[4], u32 w2[4], u32 w3[4], const u32 pw_len, __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_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)
 {
   /**
    * modifier
@@ -163,12 +156,6 @@ static void m05100s (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);
 
-  /**
-   * base
-   */
-
-  w3[2] = pw_len * 8;
-
   /**
    * digest
    */
@@ -177,130 +164,135 @@ static void m05100s (u32 w0[4], u32 w1[4], u32 w2[4], u32 w3[4], const u32 pw_le
   {
     digests_buf[digests_offset].digest_buf[DGST_R0],
     digests_buf[digests_offset].digest_buf[DGST_R1],
-    digests_buf[digests_offset].digest_buf[DGST_R2],
-    digests_buf[digests_offset].digest_buf[DGST_R3]
+    0,
+    0
   };
 
   /**
    * loop
    */
 
-  u32 w0l = w0[0];
+  const u32 w0l = w0[0];
 
-  for (u32 il_pos = 0; il_pos < bfs_cnt; il_pos++)
+  for (u32 il_pos = 0; il_pos < il_cnt; il_pos += VECT_SIZE)
   {
-    const u32 w0r = bfs_buf[il_pos].i;
-
-    w0[0] = w0l | w0r;
-
-    u32 a = MD5M_A;
-    u32 b = MD5M_B;
-    u32 c = MD5M_C;
-    u32 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);
-    MD5_STEP (MD5_Fo, c, d, a, b, w0[2], MD5C02, MD5S02);
-    MD5_STEP (MD5_Fo, b, c, d, a, w0[3], MD5C03, MD5S03);
-    MD5_STEP (MD5_Fo, a, b, c, d, w1[0], MD5C04, MD5S00);
-    MD5_STEP (MD5_Fo, d, a, b, c, w1[1], MD5C05, MD5S01);
-    MD5_STEP (MD5_Fo, c, d, a, b, w1[2], MD5C06, MD5S02);
-    MD5_STEP (MD5_Fo, b, c, d, a, w1[3], MD5C07, MD5S03);
-    MD5_STEP (MD5_Fo, a, b, c, d, w2[0], MD5C08, MD5S00);
-    MD5_STEP (MD5_Fo, d, a, b, c, w2[1], MD5C09, MD5S01);
-    MD5_STEP (MD5_Fo, c, d, a, b, w2[2], MD5C0a, MD5S02);
-    MD5_STEP (MD5_Fo, b, c, d, a, w2[3], MD5C0b, MD5S03);
-    MD5_STEP (MD5_Fo, a, b, c, d, w3[0], MD5C0c, MD5S00);
-    MD5_STEP (MD5_Fo, d, a, b, c, w3[1], MD5C0d, MD5S01);
-    MD5_STEP (MD5_Fo, c, d, a, b, w3[2], MD5C0e, MD5S02);
-    MD5_STEP (MD5_Fo, b, c, d, a, w3[3], MD5C0f, MD5S03);
-
-    MD5_STEP (MD5_Go, a, b, c, d, w0[1], MD5C10, MD5S10);
-    MD5_STEP (MD5_Go, d, a, b, c, w1[2], MD5C11, MD5S11);
-    MD5_STEP (MD5_Go, c, d, a, b, w2[3], MD5C12, MD5S12);
-    MD5_STEP (MD5_Go, b, c, d, a, w0[0], MD5C13, MD5S13);
-    MD5_STEP (MD5_Go, a, b, c, d, w1[1], MD5C14, MD5S10);
-    MD5_STEP (MD5_Go, d, a, b, c, w2[2], MD5C15, MD5S11);
-    MD5_STEP (MD5_Go, c, d, a, b, w3[3], MD5C16, MD5S12);
-    MD5_STEP (MD5_Go, b, c, d, a, w1[0], MD5C17, MD5S13);
-    MD5_STEP (MD5_Go, a, b, c, d, w2[1], MD5C18, MD5S10);
-    MD5_STEP (MD5_Go, d, a, b, c, w3[2], MD5C19, MD5S11);
-    MD5_STEP (MD5_Go, c, d, a, b, w0[3], MD5C1a, MD5S12);
-    MD5_STEP (MD5_Go, b, c, d, a, w2[0], MD5C1b, MD5S13);
-    MD5_STEP (MD5_Go, a, b, c, d, w3[1], MD5C1c, MD5S10);
-    MD5_STEP (MD5_Go, d, a, b, c, w0[2], MD5C1d, MD5S11);
-    MD5_STEP (MD5_Go, c, d, a, b, w1[3], MD5C1e, MD5S12);
-    MD5_STEP (MD5_Go, b, c, d, a, w3[0], MD5C1f, MD5S13);
-
-    MD5_STEP (MD5_H , a, b, c, d, w1[1], MD5C20, MD5S20);
-    MD5_STEP (MD5_H , d, a, b, c, w2[0], MD5C21, MD5S21);
-    MD5_STEP (MD5_H , c, d, a, b, w2[3], MD5C22, MD5S22);
-    MD5_STEP (MD5_H , b, c, d, a, w3[2], MD5C23, MD5S23);
-    MD5_STEP (MD5_H , a, b, c, d, w0[1], MD5C24, MD5S20);
-    MD5_STEP (MD5_H , d, a, b, c, w1[0], MD5C25, MD5S21);
-    MD5_STEP (MD5_H , c, d, a, b, w1[3], MD5C26, MD5S22);
-    MD5_STEP (MD5_H , b, c, d, a, w2[2], MD5C27, MD5S23);
-    MD5_STEP (MD5_H , a, b, c, d, w3[1], MD5C28, MD5S20);
-    MD5_STEP (MD5_H , d, a, b, c, w0[0], MD5C29, MD5S21);
-    MD5_STEP (MD5_H , c, d, a, b, w0[3], MD5C2a, MD5S22);
-    MD5_STEP (MD5_H , b, c, d, a, w1[2], MD5C2b, MD5S23);
-    MD5_STEP (MD5_H , a, b, c, d, w2[1], MD5C2c, MD5S20);
-    MD5_STEP (MD5_H , d, a, b, c, w3[0], MD5C2d, MD5S21);
-    MD5_STEP (MD5_H , c, d, a, b, w3[3], MD5C2e, MD5S22);
-    MD5_STEP (MD5_H , b, c, d, a, w0[2], MD5C2f, MD5S23);
-
-    MD5_STEP (MD5_I , a, b, c, d, w0[0], MD5C30, MD5S30);
-    MD5_STEP (MD5_I , d, a, b, c, w1[3], MD5C31, MD5S31);
-    MD5_STEP (MD5_I , c, d, a, b, w3[2], MD5C32, MD5S32);
-    MD5_STEP (MD5_I , b, c, d, a, w1[1], MD5C33, MD5S33);
-    MD5_STEP (MD5_I , a, b, c, d, w3[0], MD5C34, MD5S30);
-    MD5_STEP (MD5_I , d, a, b, c, w0[3], MD5C35, MD5S31);
-    MD5_STEP (MD5_I , c, d, a, b, w2[2], MD5C36, MD5S32);
-    MD5_STEP (MD5_I , b, c, d, a, w0[1], MD5C37, MD5S33);
-    MD5_STEP (MD5_I , a, b, c, d, w2[0], MD5C38, MD5S30);
-    MD5_STEP (MD5_I , d, a, b, c, w3[3], MD5C39, MD5S31);
-    MD5_STEP (MD5_I , c, d, a, b, w1[2], MD5C3a, MD5S32);
-    MD5_STEP (MD5_I , b, c, d, a, w3[1], MD5C3b, MD5S33);
-    MD5_STEP (MD5_I , a, b, c, d, w1[0], MD5C3c, MD5S30);
-    MD5_STEP (MD5_I , d, a, b, c, w2[3], MD5C3d, MD5S31);
-    MD5_STEP (MD5_I , c, d, a, b, w0[2], MD5C3e, MD5S32);
-    MD5_STEP (MD5_I , b, c, d, a, w2[1], MD5C3f, MD5S33);
+    const u32x w0r = ix_create_bft (bfs_buf, il_pos);
+
+    const u32x w0lr = w0l | w0r;
+
+    u32x t0[4];
+    u32x t1[4];
+    u32x t2[4];
+    u32x t3[4];
+
+    t0[0] = w0lr;
+    t0[1] = w0[1];
+    t0[2] = w0[2];
+    t0[3] = w0[3];
+    t1[0] = w1[0];
+    t1[1] = w1[1];
+    t1[2] = w1[2];
+    t1[3] = w1[3];
+    t2[0] = w2[0];
+    t2[1] = w2[1];
+    t2[2] = w2[2];
+    t2[3] = w2[3];
+    t3[0] = w3[0];
+    t3[1] = w3[1];
+    t3[2] = pw_len * 8;
+    t3[3] = 0;
+
+    /**
+     * md5
+     */
+
+    u32x a = MD5M_A;
+    u32x b = MD5M_B;
+    u32x c = MD5M_C;
+    u32x d = MD5M_D;
+
+    MD5_STEP (MD5_Fo, a, b, c, d, t0[0], MD5C00, MD5S00);
+    MD5_STEP (MD5_Fo, d, a, b, c, t0[1], MD5C01, MD5S01);
+    MD5_STEP (MD5_Fo, c, d, a, b, t0[2], MD5C02, MD5S02);
+    MD5_STEP (MD5_Fo, b, c, d, a, t0[3], MD5C03, MD5S03);
+    MD5_STEP (MD5_Fo, a, b, c, d, t1[0], MD5C04, MD5S00);
+    MD5_STEP (MD5_Fo, d, a, b, c, t1[1], MD5C05, MD5S01);
+    MD5_STEP (MD5_Fo, c, d, a, b, t1[2], MD5C06, MD5S02);
+    MD5_STEP (MD5_Fo, b, c, d, a, t1[3], MD5C07, MD5S03);
+    MD5_STEP (MD5_Fo, a, b, c, d, t2[0], MD5C08, MD5S00);
+    MD5_STEP (MD5_Fo, d, a, b, c, t2[1], MD5C09, MD5S01);
+    MD5_STEP (MD5_Fo, c, d, a, b, t2[2], MD5C0a, MD5S02);
+    MD5_STEP (MD5_Fo, b, c, d, a, t2[3], MD5C0b, MD5S03);
+    MD5_STEP (MD5_Fo, a, b, c, d, t3[0], MD5C0c, MD5S00);
+    MD5_STEP (MD5_Fo, d, a, b, c, t3[1], MD5C0d, MD5S01);
+    MD5_STEP (MD5_Fo, c, d, a, b, t3[2], MD5C0e, MD5S02);
+    MD5_STEP (MD5_Fo, b, c, d, a, t3[3], MD5C0f, MD5S03);
+
+    MD5_STEP (MD5_Go, a, b, c, d, t0[1], MD5C10, MD5S10);
+    MD5_STEP (MD5_Go, d, a, b, c, t1[2], MD5C11, MD5S11);
+    MD5_STEP (MD5_Go, c, d, a, b, t2[3], MD5C12, MD5S12);
+    MD5_STEP (MD5_Go, b, c, d, a, t0[0], MD5C13, MD5S13);
+    MD5_STEP (MD5_Go, a, b, c, d, t1[1], MD5C14, MD5S10);
+    MD5_STEP (MD5_Go, d, a, b, c, t2[2], MD5C15, MD5S11);
+    MD5_STEP (MD5_Go, c, d, a, b, t3[3], MD5C16, MD5S12);
+    MD5_STEP (MD5_Go, b, c, d, a, t1[0], MD5C17, MD5S13);
+    MD5_STEP (MD5_Go, a, b, c, d, t2[1], MD5C18, MD5S10);
+    MD5_STEP (MD5_Go, d, a, b, c, t3[2], MD5C19, MD5S11);
+    MD5_STEP (MD5_Go, c, d, a, b, t0[3], MD5C1a, MD5S12);
+    MD5_STEP (MD5_Go, b, c, d, a, t2[0], MD5C1b, MD5S13);
+    MD5_STEP (MD5_Go, a, b, c, d, t3[1], MD5C1c, MD5S10);
+    MD5_STEP (MD5_Go, d, a, b, c, t0[2], MD5C1d, MD5S11);
+    MD5_STEP (MD5_Go, c, d, a, b, t1[3], MD5C1e, MD5S12);
+    MD5_STEP (MD5_Go, b, c, d, a, t3[0], MD5C1f, MD5S13);
+
+    MD5_STEP (MD5_H , a, b, c, d, t1[1], MD5C20, MD5S20);
+    MD5_STEP (MD5_H , d, a, b, c, t2[0], MD5C21, MD5S21);
+    MD5_STEP (MD5_H , c, d, a, b, t2[3], MD5C22, MD5S22);
+    MD5_STEP (MD5_H , b, c, d, a, t3[2], MD5C23, MD5S23);
+    MD5_STEP (MD5_H , a, b, c, d, t0[1], MD5C24, MD5S20);
+    MD5_STEP (MD5_H , d, a, b, c, t1[0], MD5C25, MD5S21);
+    MD5_STEP (MD5_H , c, d, a, b, t1[3], MD5C26, MD5S22);
+    MD5_STEP (MD5_H , b, c, d, a, t2[2], MD5C27, MD5S23);
+    MD5_STEP (MD5_H , a, b, c, d, t3[1], MD5C28, MD5S20);
+    MD5_STEP (MD5_H , d, a, b, c, t0[0], MD5C29, MD5S21);
+    MD5_STEP (MD5_H , c, d, a, b, t0[3], MD5C2a, MD5S22);
+    MD5_STEP (MD5_H , b, c, d, a, t1[2], MD5C2b, MD5S23);
+    MD5_STEP (MD5_H , a, b, c, d, t2[1], MD5C2c, MD5S20);
+    MD5_STEP (MD5_H , d, a, b, c, t3[0], MD5C2d, MD5S21);
+    MD5_STEP (MD5_H , c, d, a, b, t3[3], MD5C2e, MD5S22);
+    MD5_STEP (MD5_H , b, c, d, a, t0[2], MD5C2f, MD5S23);
+
+    MD5_STEP (MD5_I , a, b, c, d, t0[0], MD5C30, MD5S30);
+    MD5_STEP (MD5_I , d, a, b, c, t1[3], MD5C31, MD5S31);
+    MD5_STEP (MD5_I , c, d, a, b, t3[2], MD5C32, MD5S32);
+    MD5_STEP (MD5_I , b, c, d, a, t1[1], MD5C33, MD5S33);
+    MD5_STEP (MD5_I , a, b, c, d, t3[0], MD5C34, MD5S30);
+    MD5_STEP (MD5_I , d, a, b, c, t0[3], MD5C35, MD5S31);
+    MD5_STEP (MD5_I , c, d, a, b, t2[2], MD5C36, MD5S32);
+    MD5_STEP (MD5_I , b, c, d, a, t0[1], MD5C37, MD5S33);
+    MD5_STEP (MD5_I , a, b, c, d, t2[0], MD5C38, MD5S30);
+    MD5_STEP (MD5_I , d, a, b, c, t3[3], MD5C39, MD5S31);
+    MD5_STEP (MD5_I , c, d, a, b, t1[2], MD5C3a, MD5S32);
+    MD5_STEP (MD5_I , b, c, d, a, t3[1], MD5C3b, MD5S33);
+    MD5_STEP (MD5_I , a, b, c, d, t1[0], MD5C3c, MD5S30);
+    MD5_STEP (MD5_I , d, a, b, c, t2[3], MD5C3d, MD5S31);
+    MD5_STEP (MD5_I , c, d, a, b, t0[2], MD5C3e, MD5S32);
+    MD5_STEP (MD5_I , b, c, d, a, t2[1], MD5C3f, MD5S33);
 
     a += MD5M_A;
     b += MD5M_B;
     c += MD5M_C;
     d += MD5M_D;
 
-    {
-      const u32 r0 = a;
-      const u32 r1 = b;
-      const u32 r2 = 0;
-      const u32 r3 = 0;
-
-      #include COMPARE_S
-    }
-
-    {
-      const u32 r0 = b;
-      const u32 r1 = c;
-      const u32 r2 = 0;
-      const u32 r3 = 0;
-
-      #include COMPARE_S
-    }
-
-    {
-      const u32 r0 = c;
-      const u32 r1 = d;
-      const u32 r2 = 0;
-      const u32 r3 = 0;
+    u32x z = 0;
 
-      #include COMPARE_S
-    }
+    COMPARE_S_SIMD (a, b, z, z);
+    COMPARE_S_SIMD (b, c, z, z);
+    COMPARE_S_SIMD (c, d, z, z);
   }
 }
 
-__kernel void m05100_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 bfs_cnt, const u32 digests_cnt, const u32 digests_offset, const u32 combs_mode, const u32 gid_max)
+__kernel void m05100_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_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)
 {
   /**
    * base
@@ -344,10 +336,10 @@ __kernel void m05100_m04 (__global pw_t *pws, __global kernel_rule_t *rules_buf,
    * main
    */
 
-  m05100m (w0, w1, w2, w3, pw_len, pws, rules_buf, combs_buf, bfs_buf, tmps, hooks, bitmaps_buf_s1_a, bitmaps_buf_s1_b, bitmaps_buf_s1_c, bitmaps_buf_s1_d, bitmaps_buf_s2_a, bitmaps_buf_s2_b, bitmaps_buf_s2_c, bitmaps_buf_s2_d, plains_buf, digests_buf, hashes_shown, salt_bufs, esalt_bufs, d_return_buf, d_scryptV_buf, bitmap_mask, bitmap_shift1, bitmap_shift2, salt_pos, loop_pos, loop_cnt, bfs_cnt, digests_cnt, digests_offset);
+  m05100m (w0, w1, w2, w3, pw_len, pws, rules_buf, combs_buf, bfs_buf, tmps, hooks, bitmaps_buf_s1_a, bitmaps_buf_s1_b, bitmaps_buf_s1_c, bitmaps_buf_s1_d, bitmaps_buf_s2_a, bitmaps_buf_s2_b, bitmaps_buf_s2_c, bitmaps_buf_s2_d, plains_buf, digests_buf, hashes_shown, salt_bufs, esalt_bufs, d_return_buf, d_scryptV0_buf, d_scryptV1_buf, d_scryptV2_buf, d_scryptV3_buf, bitmap_mask, bitmap_shift1, bitmap_shift2, salt_pos, loop_pos, loop_cnt, il_cnt, digests_cnt, digests_offset);
 }
 
-__kernel void m05100_m08 (__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 bfs_cnt, const u32 digests_cnt, const u32 digests_offset, const u32 combs_mode, const u32 gid_max)
+__kernel void m05100_m08 (__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_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)
 {
   /**
    * base
@@ -391,10 +383,10 @@ __kernel void m05100_m08 (__global pw_t *pws, __global kernel_rule_t *rules_buf,
    * main
    */
 
-  m05100m (w0, w1, w2, w3, pw_len, pws, rules_buf, combs_buf, bfs_buf, tmps, hooks, bitmaps_buf_s1_a, bitmaps_buf_s1_b, bitmaps_buf_s1_c, bitmaps_buf_s1_d, bitmaps_buf_s2_a, bitmaps_buf_s2_b, bitmaps_buf_s2_c, bitmaps_buf_s2_d, plains_buf, digests_buf, hashes_shown, salt_bufs, esalt_bufs, d_return_buf, d_scryptV_buf, bitmap_mask, bitmap_shift1, bitmap_shift2, salt_pos, loop_pos, loop_cnt, bfs_cnt, digests_cnt, digests_offset);
+  m05100m (w0, w1, w2, w3, pw_len, pws, rules_buf, combs_buf, bfs_buf, tmps, hooks, bitmaps_buf_s1_a, bitmaps_buf_s1_b, bitmaps_buf_s1_c, bitmaps_buf_s1_d, bitmaps_buf_s2_a, bitmaps_buf_s2_b, bitmaps_buf_s2_c, bitmaps_buf_s2_d, plains_buf, digests_buf, hashes_shown, salt_bufs, esalt_bufs, d_return_buf, d_scryptV0_buf, d_scryptV1_buf, d_scryptV2_buf, d_scryptV3_buf, bitmap_mask, bitmap_shift1, bitmap_shift2, salt_pos, loop_pos, loop_cnt, il_cnt, digests_cnt, digests_offset);
 }
 
-__kernel void m05100_m16 (__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 bfs_cnt, const u32 digests_cnt, const u32 digests_offset, const u32 combs_mode, const u32 gid_max)
+__kernel void m05100_m16 (__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_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)
 {
   /**
    * base
@@ -438,10 +430,10 @@ __kernel void m05100_m16 (__global pw_t *pws, __global kernel_rule_t *rules_buf,
    * main
    */
 
-  m05100m (w0, w1, w2, w3, pw_len, pws, rules_buf, combs_buf, bfs_buf, tmps, hooks, bitmaps_buf_s1_a, bitmaps_buf_s1_b, bitmaps_buf_s1_c, bitmaps_buf_s1_d, bitmaps_buf_s2_a, bitmaps_buf_s2_b, bitmaps_buf_s2_c, bitmaps_buf_s2_d, plains_buf, digests_buf, hashes_shown, salt_bufs, esalt_bufs, d_return_buf, d_scryptV_buf, bitmap_mask, bitmap_shift1, bitmap_shift2, salt_pos, loop_pos, loop_cnt, bfs_cnt, digests_cnt, digests_offset);
+  m05100m (w0, w1, w2, w3, pw_len, pws, rules_buf, combs_buf, bfs_buf, tmps, hooks, bitmaps_buf_s1_a, bitmaps_buf_s1_b, bitmaps_buf_s1_c, bitmaps_buf_s1_d, bitmaps_buf_s2_a, bitmaps_buf_s2_b, bitmaps_buf_s2_c, bitmaps_buf_s2_d, plains_buf, digests_buf, hashes_shown, salt_bufs, esalt_bufs, d_return_buf, d_scryptV0_buf, d_scryptV1_buf, d_scryptV2_buf, d_scryptV3_buf, bitmap_mask, bitmap_shift1, bitmap_shift2, salt_pos, loop_pos, loop_cnt, il_cnt, digests_cnt, digests_offset);
 }
 
-__kernel void m05100_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 bfs_cnt, const u32 digests_cnt, const u32 digests_offset, const u32 combs_mode, const u32 gid_max)
+__kernel void m05100_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_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)
 {
   /**
    * base
@@ -485,10 +477,10 @@ __kernel void m05100_s04 (__global pw_t *pws, __global kernel_rule_t *rules_buf,
    * main
    */
 
-  m05100s (w0, w1, w2, w3, pw_len, pws, rules_buf, combs_buf, bfs_buf, tmps, hooks, bitmaps_buf_s1_a, bitmaps_buf_s1_b, bitmaps_buf_s1_c, bitmaps_buf_s1_d, bitmaps_buf_s2_a, bitmaps_buf_s2_b, bitmaps_buf_s2_c, bitmaps_buf_s2_d, plains_buf, digests_buf, hashes_shown, salt_bufs, esalt_bufs, d_return_buf, d_scryptV_buf, bitmap_mask, bitmap_shift1, bitmap_shift2, salt_pos, loop_pos, loop_cnt, bfs_cnt, digests_cnt, digests_offset);
+  m05100s (w0, w1, w2, w3, pw_len, pws, rules_buf, combs_buf, bfs_buf, tmps, hooks, bitmaps_buf_s1_a, bitmaps_buf_s1_b, bitmaps_buf_s1_c, bitmaps_buf_s1_d, bitmaps_buf_s2_a, bitmaps_buf_s2_b, bitmaps_buf_s2_c, bitmaps_buf_s2_d, plains_buf, digests_buf, hashes_shown, salt_bufs, esalt_bufs, d_return_buf, d_scryptV0_buf, d_scryptV1_buf, d_scryptV2_buf, d_scryptV3_buf, bitmap_mask, bitmap_shift1, bitmap_shift2, salt_pos, loop_pos, loop_cnt, il_cnt, digests_cnt, digests_offset);
 }
 
-__kernel void m05100_s08 (__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 bfs_cnt, const u32 digests_cnt, const u32 digests_offset, const u32 combs_mode, const u32 gid_max)
+__kernel void m05100_s08 (__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_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)
 {
   /**
    * base
@@ -532,10 +524,10 @@ __kernel void m05100_s08 (__global pw_t *pws, __global kernel_rule_t *rules_buf,
    * main
    */
 
-  m05100s (w0, w1, w2, w3, pw_len, pws, rules_buf, combs_buf, bfs_buf, tmps, hooks, bitmaps_buf_s1_a, bitmaps_buf_s1_b, bitmaps_buf_s1_c, bitmaps_buf_s1_d, bitmaps_buf_s2_a, bitmaps_buf_s2_b, bitmaps_buf_s2_c, bitmaps_buf_s2_d, plains_buf, digests_buf, hashes_shown, salt_bufs, esalt_bufs, d_return_buf, d_scryptV_buf, bitmap_mask, bitmap_shift1, bitmap_shift2, salt_pos, loop_pos, loop_cnt, bfs_cnt, digests_cnt, digests_offset);
+  m05100s (w0, w1, w2, w3, pw_len, pws, rules_buf, combs_buf, bfs_buf, tmps, hooks, bitmaps_buf_s1_a, bitmaps_buf_s1_b, bitmaps_buf_s1_c, bitmaps_buf_s1_d, bitmaps_buf_s2_a, bitmaps_buf_s2_b, bitmaps_buf_s2_c, bitmaps_buf_s2_d, plains_buf, digests_buf, hashes_shown, salt_bufs, esalt_bufs, d_return_buf, d_scryptV0_buf, d_scryptV1_buf, d_scryptV2_buf, d_scryptV3_buf, bitmap_mask, bitmap_shift1, bitmap_shift2, salt_pos, loop_pos, loop_cnt, il_cnt, digests_cnt, digests_offset);
 }
 
-__kernel void m05100_s16 (__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 bfs_cnt, const u32 digests_cnt, const u32 digests_offset, const u32 combs_mode, const u32 gid_max)
+__kernel void m05100_s16 (__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_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)
 {
   /**
    * base
@@ -579,5 +571,5 @@ __kernel void m05100_s16 (__global pw_t *pws, __global kernel_rule_t *rules_buf,
    * main
    */
 
-  m05100s (w0, w1, w2, w3, pw_len, pws, rules_buf, combs_buf, bfs_buf, tmps, hooks, bitmaps_buf_s1_a, bitmaps_buf_s1_b, bitmaps_buf_s1_c, bitmaps_buf_s1_d, bitmaps_buf_s2_a, bitmaps_buf_s2_b, bitmaps_buf_s2_c, bitmaps_buf_s2_d, plains_buf, digests_buf, hashes_shown, salt_bufs, esalt_bufs, d_return_buf, d_scryptV_buf, bitmap_mask, bitmap_shift1, bitmap_shift2, salt_pos, loop_pos, loop_cnt, bfs_cnt, digests_cnt, digests_offset);
+  m05100s (w0, w1, w2, w3, pw_len, pws, rules_buf, combs_buf, bfs_buf, tmps, hooks, bitmaps_buf_s1_a, bitmaps_buf_s1_b, bitmaps_buf_s1_c, bitmaps_buf_s1_d, bitmaps_buf_s2_a, bitmaps_buf_s2_b, bitmaps_buf_s2_c, bitmaps_buf_s2_d, plains_buf, digests_buf, hashes_shown, salt_bufs, esalt_bufs, d_return_buf, d_scryptV0_buf, d_scryptV1_buf, d_scryptV2_buf, d_scryptV3_buf, bitmap_mask, bitmap_shift1, bitmap_shift2, salt_pos, loop_pos, loop_cnt, il_cnt, digests_cnt, digests_offset);
 }