X-Git-Url: https://www.flypig.org.uk/git/?a=blobdiff_plain;f=OpenCL%2Fm08300_a0.cl;h=c4fca07c265aab09ba5f6b0c023f15cc6e6f9df5;hb=8702d0e3e155e6a61ca1b0dcdc1ec924d92b8436;hp=9641a07bc51ca934254420cd719417ee1788b9bf;hpb=6893a9ad857a1d4fe63f1a92365802f5d9d3b39e;p=hashcat.git

diff --git a/OpenCL/m08300_a0.cl b/OpenCL/m08300_a0.cl
index 9641a07..c4fca07 100644
--- a/OpenCL/m08300_a0.cl
+++ b/OpenCL/m08300_a0.cl
@@ -5,47 +5,41 @@
 
 #define _SHA1_
 
-#include "include/constants.h"
-#include "include/kernel_vendor.h"
-
-#define DGST_R0 3
-#define DGST_R1 4
-#define DGST_R2 2
-#define DGST_R3 1
-
-#include "include/kernel_functions.c"
-#include "types_ocl.c"
-#include "common.c"
-#include "include/rp_gpu.h"
-#include "rp.c"
-
-#define COMPARE_S "check_single_comp4.c"
-#define COMPARE_M "check_multi_comp4.c"
-
-static void sha1_transform (const u32 w0[4], const u32 w1[4], const u32 w2[4], const u32 w3[4], u32 digest[5])
+#define NEW_SIMD_CODE
+
+#include "inc_vendor.cl"
+#include "inc_hash_constants.h"
+#include "inc_hash_functions.cl"
+#include "inc_types.cl"
+#include "inc_common.cl"
+#include "inc_rp.h"
+#include "inc_rp.cl"
+#include "inc_simd.cl"
+
+void sha1_transform (const u32x w0[4], const u32x w1[4], const u32x w2[4], const u32x w3[4], u32x digest[5])
 {
-  u32 A = digest[0];
-  u32 B = digest[1];
-  u32 C = digest[2];
-  u32 D = digest[3];
-  u32 E = digest[4];
-
-  u32 w0_t = w0[0];
-  u32 w1_t = w0[1];
-  u32 w2_t = w0[2];
-  u32 w3_t = w0[3];
-  u32 w4_t = w1[0];
-  u32 w5_t = w1[1];
-  u32 w6_t = w1[2];
-  u32 w7_t = w1[3];
-  u32 w8_t = w2[0];
-  u32 w9_t = w2[1];
-  u32 wa_t = w2[2];
-  u32 wb_t = w2[3];
-  u32 wc_t = w3[0];
-  u32 wd_t = w3[1];
-  u32 we_t = w3[2];
-  u32 wf_t = w3[3];
+  u32x A = digest[0];
+  u32x B = digest[1];
+  u32x C = digest[2];
+  u32x D = digest[3];
+  u32x E = digest[4];
+
+  u32x w0_t = w0[0];
+  u32x w1_t = w0[1];
+  u32x w2_t = w0[2];
+  u32x w3_t = w0[3];
+  u32x w4_t = w1[0];
+  u32x w5_t = w1[1];
+  u32x w6_t = w1[2];
+  u32x w7_t = w1[3];
+  u32x w8_t = w2[0];
+  u32x w9_t = w2[1];
+  u32x wa_t = w2[2];
+  u32x wb_t = w2[3];
+  u32x wc_t = w3[0];
+  u32x wd_t = w3[1];
+  u32x we_t = w3[2];
+  u32x wf_t = w3[3];
 
   #undef K
   #define K SHA1C00
@@ -150,7 +144,7 @@ static void sha1_transform (const u32 w0[4], const u32 w1[4], const u32 w2[4], c
   digest[4] += E;
 }
 
-__kernel void __attribute__((reqd_work_group_size (64, 1, 1))) m08300_m04 (__global pw_t *pws, __global gpu_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 m08300_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)
 {
   /**
    * modifier
@@ -167,18 +161,16 @@ __kernel void __attribute__((reqd_work_group_size (64, 1, 1))) m08300_m04 (__glo
   if (gid >= gid_max) return;
 
   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_buf1[1] = pws[gid].i[ 5];
-  pw_buf1[2] = pws[gid].i[ 6];
-  pw_buf1[3] = pws[gid].i[ 7];
+  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];
+  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;
 
@@ -189,14 +181,12 @@ __kernel void __attribute__((reqd_work_group_size (64, 1, 1))) m08300_m04 (__glo
   const u32 salt_iter = salt_bufs[salt_pos].salt_iter;
 
   u32 salt_buf0[4];
+  u32 salt_buf1[4];
 
   salt_buf0[0] = salt_bufs[salt_pos].salt_buf[ 0];
   salt_buf0[1] = salt_bufs[salt_pos].salt_buf[ 1];
   salt_buf0[2] = salt_bufs[salt_pos].salt_buf[ 2];
   salt_buf0[3] = salt_bufs[salt_pos].salt_buf[ 3];
-
-  u32 salt_buf1[4];
-
   salt_buf1[0] = salt_bufs[salt_pos].salt_buf[ 4];
   salt_buf1[1] = salt_bufs[salt_pos].salt_buf[ 5];
   salt_buf1[2] = salt_bufs[salt_pos].salt_buf[ 6];
@@ -205,14 +195,12 @@ __kernel void __attribute__((reqd_work_group_size (64, 1, 1))) m08300_m04 (__glo
   const u32 salt_len = salt_bufs[salt_pos].salt_len;
 
   u32 domain_buf0[4];
+  u32 domain_buf1[4];
 
   domain_buf0[0] = salt_bufs[salt_pos].salt_buf_pc[ 0];
   domain_buf0[1] = salt_bufs[salt_pos].salt_buf_pc[ 1];
   domain_buf0[2] = salt_bufs[salt_pos].salt_buf_pc[ 2];
   domain_buf0[3] = salt_bufs[salt_pos].salt_buf_pc[ 3];
-
-  u32 domain_buf1[4];
-
   domain_buf1[0] = salt_bufs[salt_pos].salt_buf_pc[ 4];
   domain_buf1[1] = salt_bufs[salt_pos].salt_buf_pc[ 5];
   domain_buf1[2] = salt_bufs[salt_pos].salt_buf_pc[ 6];
@@ -224,161 +212,145 @@ __kernel void __attribute__((reqd_work_group_size (64, 1, 1))) m08300_m04 (__glo
    * loop
    */
 
-  for (u32 il_pos = 0; il_pos < rules_cnt; il_pos++)
+  for (u32 il_pos = 0; il_pos < il_cnt; il_pos += VECT_SIZE)
   {
-    u32 w0[4];
-    u32 w1[4];
-    u32 w2[4];
-    u32 w3[4];
-
-    w0[0] = pw_buf0[0];
-    w0[1] = pw_buf0[1];
-    w0[2] = pw_buf0[2];
-    w0[3] = pw_buf0[3];
-    w1[0] = pw_buf1[0];
-    w1[1] = pw_buf1[1];
-    w1[2] = pw_buf1[2];
-    w1[3] = pw_buf1[3];
-    w2[0] = 0;
-    w2[1] = 0;
-    w2[2] = 0;
-    w2[3] = 0;
-    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 w0_t[4];
+    u32x w0[4] = { 0 };
+    u32x w1[4] = { 0 };
+    u32x w2[4] = { 0 };
+    u32x w3[4] = { 0 };
+
+    const u32x out_len = apply_rules_vect (pw_buf0, pw_buf1, pw_len, rules_buf, il_pos, w0, w1);
+
+    /**
+     * salt
+     */
+
+    u32x w0_t[4];
+    u32x w1_t[4];
+    u32x w2_t[4];
+    u32x w3_t[4];
 
     w0_t[0] = w0[0];
     w0_t[1] = w0[1];
     w0_t[2] = w0[2];
     w0_t[3] = w0[3];
-
-    u32 w1_t[4];
-
     w1_t[0] = w1[0];
     w1_t[1] = w1[1];
     w1_t[2] = w1[2];
     w1_t[3] = w1[3];
-
-    u32 w2_t[4];
-
     w2_t[0] = w2[0];
     w2_t[1] = w2[1];
     w2_t[2] = w2[2];
     w2_t[3] = w2[3];
-
-    u32 w3_t[4];
-
     w3_t[0] = w3[0];
     w3_t[1] = w3[1];
     w3_t[2] = w3[2];
     w3_t[3] = w3[3];
 
-    switch_buffer_by_offset (w0_t, w1_t, w2_t, w3_t, 1);
+    switch_buffer_by_offset_le (w0_t, w1_t, w2_t, w3_t, 1);
 
-    w0_t[0] |= pw_len & 0xff;
+    w0_t[0] |= out_len & 0xff;
 
-    /**
-     * salt
-     */
+    u32x s0[4];
+    u32x s1[4];
+    u32x s2[4];
+    u32x s3[4];
+
+    s0[0] = domain_buf0[0];
+    s0[1] = domain_buf0[1];
+    s0[2] = domain_buf0[2];
+    s0[3] = domain_buf0[3];
+    s1[0] = domain_buf1[0];
+    s1[1] = domain_buf1[1];
+    s1[2] = domain_buf1[2];
+    s1[3] = domain_buf1[3];
+    s2[0] = 0;
+    s2[1] = 0;
+    s2[2] = 0;
+    s2[3] = 0;
+    s3[0] = 0;
+    s3[1] = 0;
+    s3[2] = 0;
+    s3[3] = 0;
+
+    switch_buffer_by_offset_le_VV (s0, s1, s2, s3, 1 + out_len);
+
+    w0_t[0] |= s0[0];
+    w0_t[1] |= s0[1];
+    w0_t[2] |= s0[2];
+    w0_t[3] |= s0[3];
+    w1_t[0] |= s1[0];
+    w1_t[1] |= s1[1];
+    w1_t[2] |= s1[2];
+    w1_t[3] |= s1[3];
+    w2_t[0] |= s2[0];
+    w2_t[1] |= s2[1];
+    w2_t[2] |= s2[2];
+    w2_t[3] |= s2[3];
+    w3_t[0] |= s3[0];
+    w3_t[1] |= s3[1];
+    w3_t[2] |= s3[2];
+    w3_t[3] |= s3[3];
 
-    u32 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];
-
     s1[0] = salt_buf1[0];
     s1[1] = salt_buf1[1];
     s1[2] = salt_buf1[2];
     s1[3] = salt_buf1[3];
-
-    u32 s2[4];
-
     s2[0] = 0;
     s2[1] = 0;
     s2[2] = 0;
     s2[3] = 0;
-
-    u32 s3[4];
-
     s3[0] = 0;
     s3[1] = 0;
     s3[2] = 0;
     s3[3] = 0;
 
-    switch_buffer_by_offset (s0, s1, s2, s3, 1 + out_len + domain_len + 1);
-
-    u32 d0[4];
-
-    d0[0] = domain_buf0[0];
-    d0[1] = domain_buf0[1];
-    d0[2] = domain_buf0[2];
-    d0[3] = domain_buf0[3];
-
-    u32 d1[4];
-
-    d1[0] = domain_buf1[0];
-    d1[1] = domain_buf1[1];
-    d1[2] = domain_buf1[2];
-    d1[3] = 0;
-
-    u32 d2[4];
-
-    d2[0] = 0;
-    d2[1] = 0;
-    d2[2] = 0;
-    d2[3] = 0;
-
-    u32 d3[4];
-
-    d3[0] = 0;
-    d3[1] = 0;
-    d3[2] = 0;
-    d3[3] = 0;
-
-    switch_buffer_by_offset (d0, d1, d2, d3, 1 + out_len);
+    switch_buffer_by_offset_le_VV (s0, s1, s2, s3, 1 + out_len + domain_len + 1);
+
+    w0_t[0] |= s0[0];
+    w0_t[1] |= s0[1];
+    w0_t[2] |= s0[2];
+    w0_t[3] |= s0[3];
+    w1_t[0] |= s1[0];
+    w1_t[1] |= s1[1];
+    w1_t[2] |= s1[2];
+    w1_t[3] |= s1[3];
+    w2_t[0] |= s2[0];
+    w2_t[1] |= s2[1];
+    w2_t[2] |= s2[2];
+    w2_t[3] |= s2[3];
+    w3_t[0] |= s3[0];
+    w3_t[1] |= s3[1];
+    w3_t[2] |= s3[2];
+    w3_t[3] |= s3[3];
 
     /**
      * sha1
      */
 
-    u32 w0_t2[4];
-
-    w0_t2[0] = swap32 (w0_t[0] | d0[0] | s0[0]);
-    w0_t2[1] = swap32 (w0_t[1] | d0[1] | s0[1]);
-    w0_t2[2] = swap32 (w0_t[2] | d0[2] | s0[2]);
-    w0_t2[3] = swap32 (w0_t[3] | d0[3] | s0[3]);
-
-    u32 w1_t2[4];
-
-    w1_t2[0] = swap32 (w1_t[0] | d1[0] | s1[0]);
-    w1_t2[1] = swap32 (w1_t[1] | d1[1] | s1[1]);
-    w1_t2[2] = swap32 (w1_t[2] | d1[2] | s1[2]);
-    w1_t2[3] = swap32 (w1_t[3] | d1[3] | s1[3]);
-
-    u32 w2_t2[4];
-
-    w2_t2[0] = swap32 (w2_t[0] | d2[0] | s2[0]);
-    w2_t2[1] = swap32 (w2_t[1] | d2[1] | s2[1]);
-    w2_t2[2] = swap32 (w2_t[2] | d2[2] | s2[2]);
-    w2_t2[3] = swap32 (w2_t[3] | d2[3] | s2[3]);
-
-    u32 w3_t2[4];
-
-    w3_t2[0] = swap32 (w3_t[0] | d3[0] | s3[0]);
-    w3_t2[1] = swap32 (w3_t[1] | d3[1] | s3[1]);
-    w3_t2[2] = 0;
-    w3_t2[3] = (1 + out_len + domain_len + 1 + salt_len) * 8;
-
-    u32 digest[5];
+    w0_t[0] = swap32 (w0_t[0]);
+    w0_t[1] = swap32 (w0_t[1]);
+    w0_t[2] = swap32 (w0_t[2]);
+    w0_t[3] = swap32 (w0_t[3]);
+    w1_t[0] = swap32 (w1_t[0]);
+    w1_t[1] = swap32 (w1_t[1]);
+    w1_t[2] = swap32 (w1_t[2]);
+    w1_t[3] = swap32 (w1_t[3]);
+    w2_t[0] = swap32 (w2_t[0]);
+    w2_t[1] = swap32 (w2_t[1]);
+    w2_t[2] = swap32 (w2_t[2]);
+    w2_t[3] = swap32 (w2_t[3]);
+    w3_t[0] = swap32 (w3_t[0]);
+    w3_t[1] = swap32 (w3_t[1]);
+    w3_t[2] = 0;
+    w3_t[3] = (1 + out_len + domain_len + 1 + salt_len) * 8;
+
+    u32x digest[5];
 
     digest[0] = SHA1M_A;
     digest[1] = SHA1M_B;
@@ -386,39 +358,28 @@ __kernel void __attribute__((reqd_work_group_size (64, 1, 1))) m08300_m04 (__glo
     digest[3] = SHA1M_D;
     digest[4] = SHA1M_E;
 
-    sha1_transform (w0_t2, w1_t2, w2_t2, w3_t2, digest);
+    sha1_transform (w0_t, w1_t, w2_t, w3_t, digest);
 
     // iterations
 
     for (u32 i = 0; i < salt_iter; i++)
     {
-      u32 w0_t3[4];
-
-      w0_t3[0] = digest[0];
-      w0_t3[1] = digest[1];
-      w0_t3[2] = digest[2];
-      w0_t3[3] = digest[3];
-
-      u32 w1_t3[4];
-
-      w1_t3[0] = digest[4];
-      w1_t3[1] = swap32 (salt_buf0[0]);
-      w1_t3[2] = swap32 (salt_buf0[1]);
-      w1_t3[3] = swap32 (salt_buf0[2]);
-
-      u32 w2_t3[4];
-
-      w2_t3[0] = swap32 (salt_buf0[3]);
-      w2_t3[1] = swap32 (salt_buf1[0]);
-      w2_t3[2] = swap32 (salt_buf1[1]);
-      w2_t3[3] = swap32 (salt_buf1[2]);
-
-      u32 w3_t3[4];
-
-      w3_t3[0] = swap32 (salt_buf1[3]);
-      w3_t3[1] = 0;
-      w3_t3[2] = 0;
-      w3_t3[3] = (20 + salt_len) * 8;
+      w0_t[0] = digest[0];
+      w0_t[1] = digest[1];
+      w0_t[2] = digest[2];
+      w0_t[3] = digest[3];
+      w1_t[0] = digest[4];
+      w1_t[1] = swap32 (salt_buf0[0]);
+      w1_t[2] = swap32 (salt_buf0[1]);
+      w1_t[3] = swap32 (salt_buf0[2]);
+      w2_t[0] = swap32 (salt_buf0[3]);
+      w2_t[1] = swap32 (salt_buf1[0]);
+      w2_t[2] = swap32 (salt_buf1[1]);
+      w2_t[3] = swap32 (salt_buf1[2]);
+      w3_t[0] = swap32 (salt_buf1[3]);
+      w3_t[1] = 0;
+      w3_t[2] = 0;
+      w3_t[3] = (20 + salt_len) * 8;
 
       digest[0] = SHA1M_A;
       digest[1] = SHA1M_B;
@@ -426,27 +387,22 @@ __kernel void __attribute__((reqd_work_group_size (64, 1, 1))) m08300_m04 (__glo
       digest[3] = SHA1M_D;
       digest[4] = SHA1M_E;
 
-      sha1_transform (w0_t3, w1_t3, w2_t3, w3_t3, digest);
+      sha1_transform (w0_t, w1_t, w2_t, w3_t, digest);
     }
 
-    const u32 r0 = digest[3];
-    const u32 r1 = digest[4];
-    const u32 r2 = digest[2];
-    const u32 r3 = digest[1];
-
-    #include COMPARE_M
+    COMPARE_M_SIMD (digest[3], digest[4], digest[2], digest[1]);
   }
 }
 
-__kernel void __attribute__((reqd_work_group_size (64, 1, 1))) m08300_m08 (__global pw_t *pws, __global gpu_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 m08300_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)
 {
 }
 
-__kernel void __attribute__((reqd_work_group_size (64, 1, 1))) m08300_m16 (__global pw_t *pws, __global gpu_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 m08300_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)
 {
 }
 
-__kernel void __attribute__((reqd_work_group_size (64, 1, 1))) m08300_s04 (__global pw_t *pws, __global gpu_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 m08300_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)
 {
   /**
    * modifier
@@ -463,18 +419,16 @@ __kernel void __attribute__((reqd_work_group_size (64, 1, 1))) m08300_s04 (__glo
   if (gid >= gid_max) return;
 
   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_buf1[1] = pws[gid].i[ 5];
-  pw_buf1[2] = pws[gid].i[ 6];
-  pw_buf1[3] = pws[gid].i[ 7];
+  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];
+  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;
 
@@ -485,14 +439,12 @@ __kernel void __attribute__((reqd_work_group_size (64, 1, 1))) m08300_s04 (__glo
   const u32 salt_iter = salt_bufs[salt_pos].salt_iter;
 
   u32 salt_buf0[4];
+  u32 salt_buf1[4];
 
   salt_buf0[0] = salt_bufs[salt_pos].salt_buf[ 0];
   salt_buf0[1] = salt_bufs[salt_pos].salt_buf[ 1];
   salt_buf0[2] = salt_bufs[salt_pos].salt_buf[ 2];
   salt_buf0[3] = salt_bufs[salt_pos].salt_buf[ 3];
-
-  u32 salt_buf1[4];
-
   salt_buf1[0] = salt_bufs[salt_pos].salt_buf[ 4];
   salt_buf1[1] = salt_bufs[salt_pos].salt_buf[ 5];
   salt_buf1[2] = salt_bufs[salt_pos].salt_buf[ 6];
@@ -501,14 +453,12 @@ __kernel void __attribute__((reqd_work_group_size (64, 1, 1))) m08300_s04 (__glo
   const u32 salt_len = salt_bufs[salt_pos].salt_len;
 
   u32 domain_buf0[4];
+  u32 domain_buf1[4];
 
   domain_buf0[0] = salt_bufs[salt_pos].salt_buf_pc[ 0];
   domain_buf0[1] = salt_bufs[salt_pos].salt_buf_pc[ 1];
   domain_buf0[2] = salt_bufs[salt_pos].salt_buf_pc[ 2];
   domain_buf0[3] = salt_bufs[salt_pos].salt_buf_pc[ 3];
-
-  u32 domain_buf1[4];
-
   domain_buf1[0] = salt_bufs[salt_pos].salt_buf_pc[ 4];
   domain_buf1[1] = salt_bufs[salt_pos].salt_buf_pc[ 5];
   domain_buf1[2] = salt_bufs[salt_pos].salt_buf_pc[ 6];
@@ -532,161 +482,145 @@ __kernel void __attribute__((reqd_work_group_size (64, 1, 1))) m08300_s04 (__glo
    * loop
    */
 
-  for (u32 il_pos = 0; il_pos < rules_cnt; il_pos++)
+  for (u32 il_pos = 0; il_pos < il_cnt; il_pos += VECT_SIZE)
   {
-    u32 w0[4];
-    u32 w1[4];
-    u32 w2[4];
-    u32 w3[4];
-
-    w0[0] = pw_buf0[0];
-    w0[1] = pw_buf0[1];
-    w0[2] = pw_buf0[2];
-    w0[3] = pw_buf0[3];
-    w1[0] = pw_buf1[0];
-    w1[1] = pw_buf1[1];
-    w1[2] = pw_buf1[2];
-    w1[3] = pw_buf1[3];
-    w2[0] = 0;
-    w2[1] = 0;
-    w2[2] = 0;
-    w2[3] = 0;
-    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 w0_t[4];
+    u32x w0[4] = { 0 };
+    u32x w1[4] = { 0 };
+    u32x w2[4] = { 0 };
+    u32x w3[4] = { 0 };
+
+    const u32x out_len = apply_rules_vect (pw_buf0, pw_buf1, pw_len, rules_buf, il_pos, w0, w1);
+
+    /**
+     * salt
+     */
+
+    u32x w0_t[4];
+    u32x w1_t[4];
+    u32x w2_t[4];
+    u32x w3_t[4];
 
     w0_t[0] = w0[0];
     w0_t[1] = w0[1];
     w0_t[2] = w0[2];
     w0_t[3] = w0[3];
-
-    u32 w1_t[4];
-
     w1_t[0] = w1[0];
     w1_t[1] = w1[1];
     w1_t[2] = w1[2];
     w1_t[3] = w1[3];
-
-    u32 w2_t[4];
-
     w2_t[0] = w2[0];
     w2_t[1] = w2[1];
     w2_t[2] = w2[2];
     w2_t[3] = w2[3];
-
-    u32 w3_t[4];
-
     w3_t[0] = w3[0];
     w3_t[1] = w3[1];
     w3_t[2] = w3[2];
     w3_t[3] = w3[3];
 
-    switch_buffer_by_offset (w0_t, w1_t, w2_t, w3_t, 1);
+    switch_buffer_by_offset_le (w0_t, w1_t, w2_t, w3_t, 1);
 
-    w0_t[0] |= pw_len & 0xff;
+    w0_t[0] |= out_len & 0xff;
 
-    /**
-     * salt
-     */
+    u32x s0[4];
+    u32x s1[4];
+    u32x s2[4];
+    u32x s3[4];
+
+    s0[0] = domain_buf0[0];
+    s0[1] = domain_buf0[1];
+    s0[2] = domain_buf0[2];
+    s0[3] = domain_buf0[3];
+    s1[0] = domain_buf1[0];
+    s1[1] = domain_buf1[1];
+    s1[2] = domain_buf1[2];
+    s1[3] = domain_buf1[3];
+    s2[0] = 0;
+    s2[1] = 0;
+    s2[2] = 0;
+    s2[3] = 0;
+    s3[0] = 0;
+    s3[1] = 0;
+    s3[2] = 0;
+    s3[3] = 0;
+
+    switch_buffer_by_offset_le_VV (s0, s1, s2, s3, 1 + out_len);
+
+    w0_t[0] |= s0[0];
+    w0_t[1] |= s0[1];
+    w0_t[2] |= s0[2];
+    w0_t[3] |= s0[3];
+    w1_t[0] |= s1[0];
+    w1_t[1] |= s1[1];
+    w1_t[2] |= s1[2];
+    w1_t[3] |= s1[3];
+    w2_t[0] |= s2[0];
+    w2_t[1] |= s2[1];
+    w2_t[2] |= s2[2];
+    w2_t[3] |= s2[3];
+    w3_t[0] |= s3[0];
+    w3_t[1] |= s3[1];
+    w3_t[2] |= s3[2];
+    w3_t[3] |= s3[3];
 
-    u32 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];
-
     s1[0] = salt_buf1[0];
     s1[1] = salt_buf1[1];
     s1[2] = salt_buf1[2];
     s1[3] = salt_buf1[3];
-
-    u32 s2[4];
-
     s2[0] = 0;
     s2[1] = 0;
     s2[2] = 0;
     s2[3] = 0;
-
-    u32 s3[4];
-
     s3[0] = 0;
     s3[1] = 0;
     s3[2] = 0;
     s3[3] = 0;
 
-    switch_buffer_by_offset (s0, s1, s2, s3, 1 + out_len + domain_len + 1);
-
-    u32 d0[4];
-
-    d0[0] = domain_buf0[0];
-    d0[1] = domain_buf0[1];
-    d0[2] = domain_buf0[2];
-    d0[3] = domain_buf0[3];
-
-    u32 d1[4];
-
-    d1[0] = domain_buf1[0];
-    d1[1] = domain_buf1[1];
-    d1[2] = domain_buf1[2];
-    d1[3] = 0;
-
-    u32 d2[4];
-
-    d2[0] = 0;
-    d2[1] = 0;
-    d2[2] = 0;
-    d2[3] = 0;
-
-    u32 d3[4];
-
-    d3[0] = 0;
-    d3[1] = 0;
-    d3[2] = 0;
-    d3[3] = 0;
-
-    switch_buffer_by_offset (d0, d1, d2, d3, 1 + out_len);
+    switch_buffer_by_offset_le_VV (s0, s1, s2, s3, 1 + out_len + domain_len + 1);
+
+    w0_t[0] |= s0[0];
+    w0_t[1] |= s0[1];
+    w0_t[2] |= s0[2];
+    w0_t[3] |= s0[3];
+    w1_t[0] |= s1[0];
+    w1_t[1] |= s1[1];
+    w1_t[2] |= s1[2];
+    w1_t[3] |= s1[3];
+    w2_t[0] |= s2[0];
+    w2_t[1] |= s2[1];
+    w2_t[2] |= s2[2];
+    w2_t[3] |= s2[3];
+    w3_t[0] |= s3[0];
+    w3_t[1] |= s3[1];
+    w3_t[2] |= s3[2];
+    w3_t[3] |= s3[3];
 
     /**
      * sha1
      */
 
-    u32 w0_t2[4];
-
-    w0_t2[0] = swap32 (w0_t[0] | d0[0] | s0[0]);
-    w0_t2[1] = swap32 (w0_t[1] | d0[1] | s0[1]);
-    w0_t2[2] = swap32 (w0_t[2] | d0[2] | s0[2]);
-    w0_t2[3] = swap32 (w0_t[3] | d0[3] | s0[3]);
-
-    u32 w1_t2[4];
-
-    w1_t2[0] = swap32 (w1_t[0] | d1[0] | s1[0]);
-    w1_t2[1] = swap32 (w1_t[1] | d1[1] | s1[1]);
-    w1_t2[2] = swap32 (w1_t[2] | d1[2] | s1[2]);
-    w1_t2[3] = swap32 (w1_t[3] | d1[3] | s1[3]);
-
-    u32 w2_t2[4];
-
-    w2_t2[0] = swap32 (w2_t[0] | d2[0] | s2[0]);
-    w2_t2[1] = swap32 (w2_t[1] | d2[1] | s2[1]);
-    w2_t2[2] = swap32 (w2_t[2] | d2[2] | s2[2]);
-    w2_t2[3] = swap32 (w2_t[3] | d2[3] | s2[3]);
-
-    u32 w3_t2[4];
-
-    w3_t2[0] = swap32 (w3_t[0] | d3[0] | s3[0]);
-    w3_t2[1] = swap32 (w3_t[1] | d3[1] | s3[1]);
-    w3_t2[2] = 0;
-    w3_t2[3] = (1 + out_len + domain_len + 1 + salt_len) * 8;
-
-    u32 digest[5];
+    w0_t[0] = swap32 (w0_t[0]);
+    w0_t[1] = swap32 (w0_t[1]);
+    w0_t[2] = swap32 (w0_t[2]);
+    w0_t[3] = swap32 (w0_t[3]);
+    w1_t[0] = swap32 (w1_t[0]);
+    w1_t[1] = swap32 (w1_t[1]);
+    w1_t[2] = swap32 (w1_t[2]);
+    w1_t[3] = swap32 (w1_t[3]);
+    w2_t[0] = swap32 (w2_t[0]);
+    w2_t[1] = swap32 (w2_t[1]);
+    w2_t[2] = swap32 (w2_t[2]);
+    w2_t[3] = swap32 (w2_t[3]);
+    w3_t[0] = swap32 (w3_t[0]);
+    w3_t[1] = swap32 (w3_t[1]);
+    w3_t[2] = 0;
+    w3_t[3] = (1 + out_len + domain_len + 1 + salt_len) * 8;
+
+    u32x digest[5];
 
     digest[0] = SHA1M_A;
     digest[1] = SHA1M_B;
@@ -694,39 +628,28 @@ __kernel void __attribute__((reqd_work_group_size (64, 1, 1))) m08300_s04 (__glo
     digest[3] = SHA1M_D;
     digest[4] = SHA1M_E;
 
-    sha1_transform (w0_t2, w1_t2, w2_t2, w3_t2, digest);
+    sha1_transform (w0_t, w1_t, w2_t, w3_t, digest);
 
     // iterations
 
     for (u32 i = 0; i < salt_iter; i++)
     {
-      u32 w0_t3[4];
-
-      w0_t3[0] = digest[0];
-      w0_t3[1] = digest[1];
-      w0_t3[2] = digest[2];
-      w0_t3[3] = digest[3];
-
-      u32 w1_t3[4];
-
-      w1_t3[0] = digest[4];
-      w1_t3[1] = swap32 (salt_buf0[0]);
-      w1_t3[2] = swap32 (salt_buf0[1]);
-      w1_t3[3] = swap32 (salt_buf0[2]);
-
-      u32 w2_t3[4];
-
-      w2_t3[0] = swap32 (salt_buf0[3]);
-      w2_t3[1] = swap32 (salt_buf1[0]);
-      w2_t3[2] = swap32 (salt_buf1[1]);
-      w2_t3[3] = swap32 (salt_buf1[2]);
-
-      u32 w3_t3[4];
-
-      w3_t3[0] = swap32 (salt_buf1[3]);
-      w3_t3[1] = 0;
-      w3_t3[2] = 0;
-      w3_t3[3] = (20 + salt_len) * 8;
+      w0_t[0] = digest[0];
+      w0_t[1] = digest[1];
+      w0_t[2] = digest[2];
+      w0_t[3] = digest[3];
+      w1_t[0] = digest[4];
+      w1_t[1] = swap32 (salt_buf0[0]);
+      w1_t[2] = swap32 (salt_buf0[1]);
+      w1_t[3] = swap32 (salt_buf0[2]);
+      w2_t[0] = swap32 (salt_buf0[3]);
+      w2_t[1] = swap32 (salt_buf1[0]);
+      w2_t[2] = swap32 (salt_buf1[1]);
+      w2_t[3] = swap32 (salt_buf1[2]);
+      w3_t[0] = swap32 (salt_buf1[3]);
+      w3_t[1] = 0;
+      w3_t[2] = 0;
+      w3_t[3] = (20 + salt_len) * 8;
 
       digest[0] = SHA1M_A;
       digest[1] = SHA1M_B;
@@ -734,22 +657,17 @@ __kernel void __attribute__((reqd_work_group_size (64, 1, 1))) m08300_s04 (__glo
       digest[3] = SHA1M_D;
       digest[4] = SHA1M_E;
 
-      sha1_transform (w0_t3, w1_t3, w2_t3, w3_t3, digest);
+      sha1_transform (w0_t, w1_t, w2_t, w3_t, digest);
     }
 
-    const u32 r0 = digest[3];
-    const u32 r1 = digest[4];
-    const u32 r2 = digest[2];
-    const u32 r3 = digest[1];
-
-    #include COMPARE_S
+    COMPARE_S_SIMD (digest[3], digest[4], digest[2], digest[1]);
   }
 }
 
-__kernel void __attribute__((reqd_work_group_size (64, 1, 1))) m08300_s08 (__global pw_t *pws, __global gpu_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 m08300_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)
 {
 }
 
-__kernel void __attribute__((reqd_work_group_size (64, 1, 1))) m08300_s16 (__global pw_t *pws, __global gpu_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 m08300_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)
 {
 }