Upgrade kernel to support dynamic local work sizes

[hashcat.git] / OpenCL / m00160_a1.cl

diff --git a/OpenCL/m00160_a1.cl b/OpenCL/m00160_a1.cl
index f6cee14..ffe13e0 100644 (file)
--- a/OpenCL/m00160_a1.cl
+++ b/OpenCL/m00160_a1.cl
@@ -14,11 +14,11 @@
 #define DGST_R3 1
 
 #include "include/kernel_functions.c"
-#include "types_ocl.c"
-#include "common.c"
+#include "OpenCL/types_ocl.c"
+#include "OpenCL/common.c"
 
-#define COMPARE_S "check_single_comp4.c"
-#define COMPARE_M "check_multi_comp4.c"
+#define COMPARE_S "OpenCL/check_single_comp4.c"
+#define COMPARE_M "OpenCL/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])
 {
@@ -237,7 +237,7 @@ static void hmac_sha1_run (u32 w0[4], u32 w1[4], u32 w2[4], u32 w3[4], u32 ipad[
   sha1_transform (w0, w1, w2, w3, digest);
 }
 
-__kernel void __attribute__((reqd_work_group_size (64, 1, 1))) m00160_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 combs_cnt, const u32 digests_cnt, const u32 digests_offset, const u32 combs_mode, const u32 gid_max)
+__kernel void m00160_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 combs_cnt, const u32 digests_cnt, const u32 digests_offset, const u32 combs_mode, const u32 gid_max)
 {
   /**
    * modifier
@@ -312,17 +312,17 @@ __kernel void __attribute__((reqd_work_group_size (64, 1, 1))) m00160_m04 (__glo
 
   u32 w0_t[4];
 
-  w0_t[0] = swap_workaround (salt_buf0[0]);
-  w0_t[1] = swap_workaround (salt_buf0[1]);
-  w0_t[2] = swap_workaround (salt_buf0[2]);
-  w0_t[3] = swap_workaround (salt_buf0[3]);
+  w0_t[0] = swap32 (salt_buf0[0]);
+  w0_t[1] = swap32 (salt_buf0[1]);
+  w0_t[2] = swap32 (salt_buf0[2]);
+  w0_t[3] = swap32 (salt_buf0[3]);
 
   u32 w1_t[4];
 
-  w1_t[0] = swap_workaround (salt_buf1[0]);
-  w1_t[1] = swap_workaround (salt_buf1[1]);
-  w1_t[2] = swap_workaround (salt_buf1[2]);
-  w1_t[3] = swap_workaround (salt_buf1[3]);
+  w1_t[0] = swap32 (salt_buf1[0]);
+  w1_t[1] = swap32 (salt_buf1[1]);
+  w1_t[2] = swap32 (salt_buf1[2]);
+  w1_t[3] = swap32 (salt_buf1[3]);
 
   u32 w2_t[4];
 
@@ -414,22 +414,22 @@ __kernel void __attribute__((reqd_work_group_size (64, 1, 1))) m00160_m04 (__glo
     w3[2] = 0;
     w3[3] = 0;
 
-    append_0x80_4 (w0, w1, w2, w3, pw_len);
-
-    w0_t[0] = swap_workaround (w0[0]);
-    w0_t[1] = swap_workaround (w0[1]);
-    w0_t[2] = swap_workaround (w0[2]);
-    w0_t[3] = swap_workaround (w0[3]);
-    w1_t[0] = swap_workaround (w1[0]);
-    w1_t[1] = swap_workaround (w1[1]);
-    w1_t[2] = swap_workaround (w1[2]);
-    w1_t[3] = swap_workaround (w1[3]);
-    w2_t[0] = swap_workaround (w2[0]);
-    w2_t[1] = swap_workaround (w2[1]);
-    w2_t[2] = swap_workaround (w2[2]);
-    w2_t[3] = swap_workaround (w2[3]);
-    w3_t[0] = swap_workaround (w3[0]);
-    w3_t[1] = swap_workaround (w3[1]);
+    append_0x80_4x4 (w0, w1, w2, w3, pw_len);
+
+    w0_t[0] = swap32 (w0[0]);
+    w0_t[1] = swap32 (w0[1]);
+    w0_t[2] = swap32 (w0[2]);
+    w0_t[3] = swap32 (w0[3]);
+    w1_t[0] = swap32 (w1[0]);
+    w1_t[1] = swap32 (w1[1]);
+    w1_t[2] = swap32 (w1[2]);
+    w1_t[3] = swap32 (w1[3]);
+    w2_t[0] = swap32 (w2[0]);
+    w2_t[1] = swap32 (w2[1]);
+    w2_t[2] = swap32 (w2[2]);
+    w2_t[3] = swap32 (w2[3]);
+    w3_t[0] = swap32 (w3[0]);
+    w3_t[1] = swap32 (w3[1]);
     w3_t[2] = 0;
     w3_t[3] = (64 + pw_len) * 8;
 
@@ -446,15 +446,15 @@ __kernel void __attribute__((reqd_work_group_size (64, 1, 1))) m00160_m04 (__glo
   }
 }
 
-__kernel void __attribute__((reqd_work_group_size (64, 1, 1))) m00160_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 combs_cnt, const u32 digests_cnt, const u32 digests_offset, const u32 combs_mode, const u32 gid_max)
+__kernel void m00160_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 combs_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))) m00160_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 combs_cnt, const u32 digests_cnt, const u32 digests_offset, const u32 combs_mode, const u32 gid_max)
+__kernel void m00160_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 combs_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))) m00160_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 combs_cnt, const u32 digests_cnt, const u32 digests_offset, const u32 combs_mode, const u32 gid_max)
+__kernel void m00160_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 combs_cnt, const u32 digests_cnt, const u32 digests_offset, const u32 combs_mode, const u32 gid_max)
 {
   /**
    * modifier
@@ -529,17 +529,17 @@ __kernel void __attribute__((reqd_work_group_size (64, 1, 1))) m00160_s04 (__glo
 
   u32 w0_t[4];
 
-  w0_t[0] = swap_workaround (salt_buf0[0]);
-  w0_t[1] = swap_workaround (salt_buf0[1]);
-  w0_t[2] = swap_workaround (salt_buf0[2]);
-  w0_t[3] = swap_workaround (salt_buf0[3]);
+  w0_t[0] = swap32 (salt_buf0[0]);
+  w0_t[1] = swap32 (salt_buf0[1]);
+  w0_t[2] = swap32 (salt_buf0[2]);
+  w0_t[3] = swap32 (salt_buf0[3]);
 
   u32 w1_t[4];
 
-  w1_t[0] = swap_workaround (salt_buf1[0]);
-  w1_t[1] = swap_workaround (salt_buf1[1]);
-  w1_t[2] = swap_workaround (salt_buf1[2]);
-  w1_t[3] = swap_workaround (salt_buf1[3]);
+  w1_t[0] = swap32 (salt_buf1[0]);
+  w1_t[1] = swap32 (salt_buf1[1]);
+  w1_t[2] = swap32 (salt_buf1[2]);
+  w1_t[3] = swap32 (salt_buf1[3]);
 
   u32 w2_t[4];
 
@@ -643,22 +643,22 @@ __kernel void __attribute__((reqd_work_group_size (64, 1, 1))) m00160_s04 (__glo
     w3[2] = 0;
     w3[3] = 0;
 
-    append_0x80_4 (w0, w1, w2, w3, pw_len);
-
-    w0_t[0] = swap_workaround (w0[0]);
-    w0_t[1] = swap_workaround (w0[1]);
-    w0_t[2] = swap_workaround (w0[2]);
-    w0_t[3] = swap_workaround (w0[3]);
-    w1_t[0] = swap_workaround (w1[0]);
-    w1_t[1] = swap_workaround (w1[1]);
-    w1_t[2] = swap_workaround (w1[2]);
-    w1_t[3] = swap_workaround (w1[3]);
-    w2_t[0] = swap_workaround (w2[0]);
-    w2_t[1] = swap_workaround (w2[1]);
-    w2_t[2] = swap_workaround (w2[2]);
-    w2_t[3] = swap_workaround (w2[3]);
-    w3_t[0] = swap_workaround (w3[0]);
-    w3_t[1] = swap_workaround (w3[1]);
+    append_0x80_4x4 (w0, w1, w2, w3, pw_len);
+
+    w0_t[0] = swap32 (w0[0]);
+    w0_t[1] = swap32 (w0[1]);
+    w0_t[2] = swap32 (w0[2]);
+    w0_t[3] = swap32 (w0[3]);
+    w1_t[0] = swap32 (w1[0]);
+    w1_t[1] = swap32 (w1[1]);
+    w1_t[2] = swap32 (w1[2]);
+    w1_t[3] = swap32 (w1[3]);
+    w2_t[0] = swap32 (w2[0]);
+    w2_t[1] = swap32 (w2[1]);
+    w2_t[2] = swap32 (w2[2]);
+    w2_t[3] = swap32 (w2[3]);
+    w3_t[0] = swap32 (w3[0]);
+    w3_t[1] = swap32 (w3[1]);
     w3_t[2] = 0;
     w3_t[3] = (64 + pw_len) * 8;
 
@@ -675,10 +675,10 @@ __kernel void __attribute__((reqd_work_group_size (64, 1, 1))) m00160_s04 (__glo
   }
 }
 
-__kernel void __attribute__((reqd_work_group_size (64, 1, 1))) m00160_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 combs_cnt, const u32 digests_cnt, const u32 digests_offset, const u32 combs_mode, const u32 gid_max)
+__kernel void m00160_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 combs_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))) m00160_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 combs_cnt, const u32 digests_cnt, const u32 digests_offset, const u32 combs_mode, const u32 gid_max)
+__kernel void m00160_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 combs_cnt, const u32 digests_cnt, const u32 digests_offset, const u32 combs_mode, const u32 gid_max)
 {
 }