diff --git a/OpenCL/amp_a0.cl b/OpenCL/amp_a0.cl index bc7a0687e..d82f39002 100644 --- a/OpenCL/amp_a0.cl +++ b/OpenCL/amp_a0.cl @@ -11,7 +11,7 @@ #include "inc_rp.cl" #endif -__kernel void amp (__global pw_t * restrict pws, __global pw_t * restrict pws_amp, __constant const kernel_rule_t * restrict rules_buf, __global const pw_t * restrict combs_buf, __global const bf_t * restrict bfs_buf, const u32 combs_mode, const u64 gid_max) +KERNEL_FQ void amp (GLOBAL_AS pw_t * restrict pws, GLOBAL_AS pw_t * restrict pws_amp, CONSTANT_AS const kernel_rule_t * restrict rules_buf, GLOBAL_AS const pw_t * restrict combs_buf, GLOBAL_AS const bf_t * restrict bfs_buf, const u32 combs_mode, const u64 gid_max) { const u64 gid = get_global_id (0); diff --git a/OpenCL/amp_a1.cl b/OpenCL/amp_a1.cl index dadad2c1f..b34513a6c 100644 --- a/OpenCL/amp_a1.cl +++ b/OpenCL/amp_a1.cl @@ -9,7 +9,7 @@ #include "inc_common.cl" #endif -__kernel void amp (__global pw_t * restrict pws, __global pw_t * restrict pws_amp, __global const kernel_rule_t * restrict rules_buf, __global const pw_t * restrict combs_buf, __global const bf_t * restrict bfs_buf, const u32 combs_mode, const u64 gid_max) +KERNEL_FQ void amp (GLOBAL_AS pw_t * restrict pws, GLOBAL_AS pw_t * restrict pws_amp, GLOBAL_AS const kernel_rule_t * restrict rules_buf, GLOBAL_AS const pw_t * restrict combs_buf, GLOBAL_AS const bf_t * restrict bfs_buf, const u32 combs_mode, const u64 gid_max) { const u64 gid = get_global_id (0); diff --git a/OpenCL/amp_a3.cl b/OpenCL/amp_a3.cl index 891ed3123..e24fe1dca 100644 --- a/OpenCL/amp_a3.cl +++ b/OpenCL/amp_a3.cl @@ -8,7 +8,7 @@ #include "inc_types.h" #endif -__kernel void amp (__global pw_t * restrict pws, __global pw_t * restrict pws_amp, __global const kernel_rule_t * restrict rules_buf, __global const pw_t * restrict combs_buf, __constant const bf_t * restrict bfs_buf, const u32 combs_mode, const u64 gid_max) +KERNEL_FQ void amp (GLOBAL_AS pw_t * restrict pws, GLOBAL_AS pw_t * restrict pws_amp, GLOBAL_AS const kernel_rule_t * restrict rules_buf, GLOBAL_AS const pw_t * restrict combs_buf, CONSTANT_AS const bf_t * restrict bfs_buf, const u32 combs_mode, const u64 gid_max) { const u64 gid = get_global_id (0); diff --git a/OpenCL/inc_cipher_aes.cl b/OpenCL/inc_cipher_aes.cl index 9fa9de0d2..247b7e793 100644 --- a/OpenCL/inc_cipher_aes.cl +++ b/OpenCL/inc_cipher_aes.cl @@ -3,7 +3,7 @@ * License.....: MIT */ -__constant u32a te0[256] = +CONSTANT_AS u32a te0[256] = { 0xc66363a5, 0xf87c7c84, 0xee777799, 0xf67b7b8d, 0xfff2f20d, 0xd66b6bbd, 0xde6f6fb1, 0x91c5c554, @@ -71,7 +71,7 @@ __constant u32a te0[256] = 0x7bb0b0cb, 0xa85454fc, 0x6dbbbbd6, 0x2c16163a, }; -__constant u32a te1[256] = +CONSTANT_AS u32a te1[256] = { 0xa5c66363, 0x84f87c7c, 0x99ee7777, 0x8df67b7b, 0x0dfff2f2, 0xbdd66b6b, 0xb1de6f6f, 0x5491c5c5, @@ -139,7 +139,7 @@ __constant u32a te1[256] = 0xcb7bb0b0, 0xfca85454, 0xd66dbbbb, 0x3a2c1616, }; -__constant u32a te2[256] = +CONSTANT_AS u32a te2[256] = { 0x63a5c663, 0x7c84f87c, 0x7799ee77, 0x7b8df67b, 0xf20dfff2, 0x6bbdd66b, 0x6fb1de6f, 0xc55491c5, @@ -207,7 +207,7 @@ __constant u32a te2[256] = 0xb0cb7bb0, 0x54fca854, 0xbbd66dbb, 0x163a2c16, }; -__constant u32a te3[256] = +CONSTANT_AS u32a te3[256] = { 0x6363a5c6, 0x7c7c84f8, 0x777799ee, 0x7b7b8df6, 0xf2f20dff, 0x6b6bbdd6, 0x6f6fb1de, 0xc5c55491, @@ -275,7 +275,7 @@ __constant u32a te3[256] = 0xb0b0cb7b, 0x5454fca8, 0xbbbbd66d, 0x16163a2c, }; -__constant u32a te4[256] = +CONSTANT_AS u32a te4[256] = { 0x63636363, 0x7c7c7c7c, 0x77777777, 0x7b7b7b7b, 0xf2f2f2f2, 0x6b6b6b6b, 0x6f6f6f6f, 0xc5c5c5c5, @@ -343,7 +343,7 @@ __constant u32a te4[256] = 0xb0b0b0b0, 0x54545454, 0xbbbbbbbb, 0x16161616, }; -__constant u32a td0[256] = +CONSTANT_AS u32a td0[256] = { 0x51f4a750, 0x7e416553, 0x1a17a4c3, 0x3a275e96, 0x3bab6bcb, 0x1f9d45f1, 0xacfa58ab, 0x4be30393, @@ -411,7 +411,7 @@ __constant u32a td0[256] = 0x7bcb8461, 0xd532b670, 0x486c5c74, 0xd0b85742, }; -__constant u32a td1[256] = +CONSTANT_AS u32a td1[256] = { 0x5051f4a7, 0x537e4165, 0xc31a17a4, 0x963a275e, 0xcb3bab6b, 0xf11f9d45, 0xabacfa58, 0x934be303, @@ -479,7 +479,7 @@ __constant u32a td1[256] = 0x617bcb84, 0x70d532b6, 0x74486c5c, 0x42d0b857, }; -__constant u32a td2[256] = +CONSTANT_AS u32a td2[256] = { 0xa75051f4, 0x65537e41, 0xa4c31a17, 0x5e963a27, 0x6bcb3bab, 0x45f11f9d, 0x58abacfa, 0x03934be3, @@ -547,7 +547,7 @@ __constant u32a td2[256] = 0x84617bcb, 0xb670d532, 0x5c74486c, 0x5742d0b8, }; -__constant u32a td3[256] = +CONSTANT_AS u32a td3[256] = { 0xf4a75051, 0x4165537e, 0x17a4c31a, 0x275e963a, 0xab6bcb3b, 0x9d45f11f, 0xfa58abac, 0xe303934b, @@ -615,7 +615,7 @@ __constant u32a td3[256] = 0xcb84617b, 0x32b670d5, 0x6c5c7448, 0xb85742d0, }; -__constant u32a td4[256] = +CONSTANT_AS u32a td4[256] = { 0x52525252, 0x09090909, 0x6a6a6a6a, 0xd5d5d5d5, 0x30303030, 0x36363636, 0xa5a5a5a5, 0x38383838, diff --git a/OpenCL/inc_cipher_aes.h b/OpenCL/inc_cipher_aes.h index ac4ccfbb4..813fa2f08 100644 --- a/OpenCL/inc_cipher_aes.h +++ b/OpenCL/inc_cipher_aes.h @@ -3,23 +3,23 @@ * License.....: MIT */ -DECLSPEC void aes128_ExpandKey (u32 *ks, const u32 *ukey, SHM_TYPE u32 *s_te0, SHM_TYPE u32 *s_te1, SHM_TYPE u32 *s_te2, SHM_TYPE u32 *s_te3, SHM_TYPE u32 *s_te4) -DECLSPEC void aes128_InvertKey (u32 *ks, SHM_TYPE u32 *s_te0, SHM_TYPE u32 *s_te1, SHM_TYPE u32 *s_te2, SHM_TYPE u32 *s_te3, SHM_TYPE u32 *s_te4, SHM_TYPE u32 *s_td0, SHM_TYPE u32 *s_td1, SHM_TYPE u32 *s_td2, SHM_TYPE u32 *s_td3, SHM_TYPE u32 *s_td4) -DECLSPEC void aes128_set_encrypt_key (u32 *ks, const u32 *ukey, SHM_TYPE u32 *s_te0, SHM_TYPE u32 *s_te1, SHM_TYPE u32 *s_te2, SHM_TYPE u32 *s_te3, SHM_TYPE u32 *s_te4) -DECLSPEC void aes128_set_decrypt_key (u32 *ks, const u32 *ukey, SHM_TYPE u32 *s_te0, SHM_TYPE u32 *s_te1, SHM_TYPE u32 *s_te2, SHM_TYPE u32 *s_te3, SHM_TYPE u32 *s_te4, SHM_TYPE u32 *s_td0, SHM_TYPE u32 *s_td1, SHM_TYPE u32 *s_td2, SHM_TYPE u32 *s_td3, SHM_TYPE u32 *s_td4) -DECLSPEC void aes128_encrypt (const u32 *ks, const u32 *in, u32 *out, SHM_TYPE u32 *s_te0, SHM_TYPE u32 *s_te1, SHM_TYPE u32 *s_te2, SHM_TYPE u32 *s_te3, SHM_TYPE u32 *s_te4) -DECLSPEC void aes128_decrypt (const u32 *ks, const u32 *in, u32 *out, SHM_TYPE u32 *s_td0, SHM_TYPE u32 *s_td1, SHM_TYPE u32 *s_td2, SHM_TYPE u32 *s_td3, SHM_TYPE u32 *s_td4) -DECLSPEC void aes256_ExpandKey (u32 *ks, const u32 *ukey, SHM_TYPE u32 *s_te0, SHM_TYPE u32 *s_te1, SHM_TYPE u32 *s_te2, SHM_TYPE u32 *s_te3, SHM_TYPE u32 *s_te4) -DECLSPEC void aes256_InvertKey (u32 *ks, SHM_TYPE u32 *s_te0, SHM_TYPE u32 *s_te1, SHM_TYPE u32 *s_te2, SHM_TYPE u32 *s_te3, SHM_TYPE u32 *s_te4, SHM_TYPE u32 *s_td0, SHM_TYPE u32 *s_td1, SHM_TYPE u32 *s_td2, SHM_TYPE u32 *s_td3, SHM_TYPE u32 *s_td4) -DECLSPEC void aes256_set_encrypt_key (u32 *ks, const u32 *ukey, SHM_TYPE u32 *s_te0, SHM_TYPE u32 *s_te1, SHM_TYPE u32 *s_te2, SHM_TYPE u32 *s_te3, SHM_TYPE u32 *s_te4) -DECLSPEC void aes256_set_decrypt_key (u32 *ks, const u32 *ukey, SHM_TYPE u32 *s_te0, SHM_TYPE u32 *s_te1, SHM_TYPE u32 *s_te2, SHM_TYPE u32 *s_te3, SHM_TYPE u32 *s_te4, SHM_TYPE u32 *s_td0, SHM_TYPE u32 *s_td1, SHM_TYPE u32 *s_td2, SHM_TYPE u32 *s_td3, SHM_TYPE u32 *s_td4) -DECLSPEC void aes256_encrypt (const u32 *ks, const u32 *in, u32 *out, SHM_TYPE u32 *s_te0, SHM_TYPE u32 *s_te1, SHM_TYPE u32 *s_te2, SHM_TYPE u32 *s_te3, SHM_TYPE u32 *s_te4) -DECLSPEC void aes256_decrypt (const u32 *ks, const u32 *in, u32 *out, SHM_TYPE u32 *s_td0, SHM_TYPE u32 *s_td1, SHM_TYPE u32 *s_td2, SHM_TYPE u32 *s_td3, SHM_TYPE u32 *s_td4) -DECLSPEC void AES128_set_encrypt_key (u32 *ks, const u32 *ukey, SHM_TYPE u32 *s_te0, SHM_TYPE u32 *s_te1, SHM_TYPE u32 *s_te2, SHM_TYPE u32 *s_te3, SHM_TYPE u32 *s_te4) -DECLSPEC void AES128_set_decrypt_key (u32 *ks, const u32 *ukey, SHM_TYPE u32 *s_te0, SHM_TYPE u32 *s_te1, SHM_TYPE u32 *s_te2, SHM_TYPE u32 *s_te3, SHM_TYPE u32 *s_te4, SHM_TYPE u32 *s_td0, SHM_TYPE u32 *s_td1, SHM_TYPE u32 *s_td2, SHM_TYPE u32 *s_td3, SHM_TYPE u32 *s_td4) -DECLSPEC void AES128_encrypt (const u32 *ks, const u32 *in, u32 *out, SHM_TYPE u32 *s_te0, SHM_TYPE u32 *s_te1, SHM_TYPE u32 *s_te2, SHM_TYPE u32 *s_te3, SHM_TYPE u32 *s_te4) -DECLSPEC void AES128_decrypt (const u32 *ks, const u32 *in, u32 *out, SHM_TYPE u32 *s_td0, SHM_TYPE u32 *s_td1, SHM_TYPE u32 *s_td2, SHM_TYPE u32 *s_td3, SHM_TYPE u32 *s_td4) -DECLSPEC void AES256_set_encrypt_key (u32 *ks, const u32 *ukey, SHM_TYPE u32 *s_te0, SHM_TYPE u32 *s_te1, SHM_TYPE u32 *s_te2, SHM_TYPE u32 *s_te3, SHM_TYPE u32 *s_te4) -DECLSPEC void AES256_set_decrypt_key (u32 *ks, const u32 *ukey, SHM_TYPE u32 *s_te0, SHM_TYPE u32 *s_te1, SHM_TYPE u32 *s_te2, SHM_TYPE u32 *s_te3, SHM_TYPE u32 *s_te4, SHM_TYPE u32 *s_td0, SHM_TYPE u32 *s_td1, SHM_TYPE u32 *s_td2, SHM_TYPE u32 *s_td3, SHM_TYPE u32 *s_td4) -DECLSPEC void AES256_encrypt (const u32 *ks, const u32 *in, u32 *out, SHM_TYPE u32 *s_te0, SHM_TYPE u32 *s_te1, SHM_TYPE u32 *s_te2, SHM_TYPE u32 *s_te3, SHM_TYPE u32 *s_te4) -DECLSPEC void AES256_decrypt (const u32 *ks, const u32 *in, u32 *out, SHM_TYPE u32 *s_td0, SHM_TYPE u32 *s_td1, SHM_TYPE u32 *s_td2, SHM_TYPE u32 *s_td3, SHM_TYPE u32 *s_td4) +DECLSPEC void aes128_ExpandKey (u32 *ks, const u32 *ukey, SHM_TYPE u32 *s_te0, SHM_TYPE u32 *s_te1, SHM_TYPE u32 *s_te2, SHM_TYPE u32 *s_te3, SHM_TYPE u32 *s_te4); +DECLSPEC void aes128_InvertKey (u32 *ks, SHM_TYPE u32 *s_te0, SHM_TYPE u32 *s_te1, SHM_TYPE u32 *s_te2, SHM_TYPE u32 *s_te3, SHM_TYPE u32 *s_te4, SHM_TYPE u32 *s_td0, SHM_TYPE u32 *s_td1, SHM_TYPE u32 *s_td2, SHM_TYPE u32 *s_td3, SHM_TYPE u32 *s_td4); +DECLSPEC void aes128_set_encrypt_key (u32 *ks, const u32 *ukey, SHM_TYPE u32 *s_te0, SHM_TYPE u32 *s_te1, SHM_TYPE u32 *s_te2, SHM_TYPE u32 *s_te3, SHM_TYPE u32 *s_te4); +DECLSPEC void aes128_set_decrypt_key (u32 *ks, const u32 *ukey, SHM_TYPE u32 *s_te0, SHM_TYPE u32 *s_te1, SHM_TYPE u32 *s_te2, SHM_TYPE u32 *s_te3, SHM_TYPE u32 *s_te4, SHM_TYPE u32 *s_td0, SHM_TYPE u32 *s_td1, SHM_TYPE u32 *s_td2, SHM_TYPE u32 *s_td3, SHM_TYPE u32 *s_td4); +DECLSPEC void aes128_encrypt (const u32 *ks, const u32 *in, u32 *out, SHM_TYPE u32 *s_te0, SHM_TYPE u32 *s_te1, SHM_TYPE u32 *s_te2, SHM_TYPE u32 *s_te3, SHM_TYPE u32 *s_te4); +DECLSPEC void aes128_decrypt (const u32 *ks, const u32 *in, u32 *out, SHM_TYPE u32 *s_td0, SHM_TYPE u32 *s_td1, SHM_TYPE u32 *s_td2, SHM_TYPE u32 *s_td3, SHM_TYPE u32 *s_td4); +DECLSPEC void aes256_ExpandKey (u32 *ks, const u32 *ukey, SHM_TYPE u32 *s_te0, SHM_TYPE u32 *s_te1, SHM_TYPE u32 *s_te2, SHM_TYPE u32 *s_te3, SHM_TYPE u32 *s_te4); +DECLSPEC void aes256_InvertKey (u32 *ks, SHM_TYPE u32 *s_te0, SHM_TYPE u32 *s_te1, SHM_TYPE u32 *s_te2, SHM_TYPE u32 *s_te3, SHM_TYPE u32 *s_te4, SHM_TYPE u32 *s_td0, SHM_TYPE u32 *s_td1, SHM_TYPE u32 *s_td2, SHM_TYPE u32 *s_td3, SHM_TYPE u32 *s_td4); +DECLSPEC void aes256_set_encrypt_key (u32 *ks, const u32 *ukey, SHM_TYPE u32 *s_te0, SHM_TYPE u32 *s_te1, SHM_TYPE u32 *s_te2, SHM_TYPE u32 *s_te3, SHM_TYPE u32 *s_te4); +DECLSPEC void aes256_set_decrypt_key (u32 *ks, const u32 *ukey, SHM_TYPE u32 *s_te0, SHM_TYPE u32 *s_te1, SHM_TYPE u32 *s_te2, SHM_TYPE u32 *s_te3, SHM_TYPE u32 *s_te4, SHM_TYPE u32 *s_td0, SHM_TYPE u32 *s_td1, SHM_TYPE u32 *s_td2, SHM_TYPE u32 *s_td3, SHM_TYPE u32 *s_td4); +DECLSPEC void aes256_encrypt (const u32 *ks, const u32 *in, u32 *out, SHM_TYPE u32 *s_te0, SHM_TYPE u32 *s_te1, SHM_TYPE u32 *s_te2, SHM_TYPE u32 *s_te3, SHM_TYPE u32 *s_te4); +DECLSPEC void aes256_decrypt (const u32 *ks, const u32 *in, u32 *out, SHM_TYPE u32 *s_td0, SHM_TYPE u32 *s_td1, SHM_TYPE u32 *s_td2, SHM_TYPE u32 *s_td3, SHM_TYPE u32 *s_td4); +DECLSPEC void AES128_set_encrypt_key (u32 *ks, const u32 *ukey, SHM_TYPE u32 *s_te0, SHM_TYPE u32 *s_te1, SHM_TYPE u32 *s_te2, SHM_TYPE u32 *s_te3, SHM_TYPE u32 *s_te4); +DECLSPEC void AES128_set_decrypt_key (u32 *ks, const u32 *ukey, SHM_TYPE u32 *s_te0, SHM_TYPE u32 *s_te1, SHM_TYPE u32 *s_te2, SHM_TYPE u32 *s_te3, SHM_TYPE u32 *s_te4, SHM_TYPE u32 *s_td0, SHM_TYPE u32 *s_td1, SHM_TYPE u32 *s_td2, SHM_TYPE u32 *s_td3, SHM_TYPE u32 *s_td4); +DECLSPEC void AES128_encrypt (const u32 *ks, const u32 *in, u32 *out, SHM_TYPE u32 *s_te0, SHM_TYPE u32 *s_te1, SHM_TYPE u32 *s_te2, SHM_TYPE u32 *s_te3, SHM_TYPE u32 *s_te4); +DECLSPEC void AES128_decrypt (const u32 *ks, const u32 *in, u32 *out, SHM_TYPE u32 *s_td0, SHM_TYPE u32 *s_td1, SHM_TYPE u32 *s_td2, SHM_TYPE u32 *s_td3, SHM_TYPE u32 *s_td4); +DECLSPEC void AES256_set_encrypt_key (u32 *ks, const u32 *ukey, SHM_TYPE u32 *s_te0, SHM_TYPE u32 *s_te1, SHM_TYPE u32 *s_te2, SHM_TYPE u32 *s_te3, SHM_TYPE u32 *s_te4); +DECLSPEC void AES256_set_decrypt_key (u32 *ks, const u32 *ukey, SHM_TYPE u32 *s_te0, SHM_TYPE u32 *s_te1, SHM_TYPE u32 *s_te2, SHM_TYPE u32 *s_te3, SHM_TYPE u32 *s_te4, SHM_TYPE u32 *s_td0, SHM_TYPE u32 *s_td1, SHM_TYPE u32 *s_td2, SHM_TYPE u32 *s_td3, SHM_TYPE u32 *s_td4); +DECLSPEC void AES256_encrypt (const u32 *ks, const u32 *in, u32 *out, SHM_TYPE u32 *s_te0, SHM_TYPE u32 *s_te1, SHM_TYPE u32 *s_te2, SHM_TYPE u32 *s_te3, SHM_TYPE u32 *s_te4); +DECLSPEC void AES256_decrypt (const u32 *ks, const u32 *in, u32 *out, SHM_TYPE u32 *s_td0, SHM_TYPE u32 *s_td1, SHM_TYPE u32 *s_td2, SHM_TYPE u32 *s_td3, SHM_TYPE u32 *s_td4); diff --git a/OpenCL/inc_cipher_camellia.cl b/OpenCL/inc_cipher_camellia.cl index 152239441..90f447227 100644 --- a/OpenCL/inc_cipher_camellia.cl +++ b/OpenCL/inc_cipher_camellia.cl @@ -15,7 +15,7 @@ * * */ -__constant const u32a c_sbox[256] = +CONSTANT_AS const u32a c_sbox[256] = { 0x70, 0x82, 0x2c, 0xec, 0xb3, 0x27, 0xc0, 0xe5, 0xe4, 0x85, 0x57, 0x35, 0xea, 0x0c, 0xae, 0x41, diff --git a/OpenCL/inc_cipher_camellia.h b/OpenCL/inc_cipher_camellia.h index a4bb1dcc1..03854304b 100644 --- a/OpenCL/inc_cipher_camellia.h +++ b/OpenCL/inc_cipher_camellia.h @@ -3,8 +3,8 @@ * License.....: MIT */ -DECLSPEC void cam_feistel (const u32 *x, const u32 *k, u32 *y) -DECLSPEC void cam_fl (u32 *x, const u32 *kl, const u32 *kr) -DECLSPEC void camellia256_set_key (u32 *ks, const u32 *ukey) -DECLSPEC void camellia256_encrypt (const u32 *ks, const u32 *in, u32 *out) -DECLSPEC void camellia256_decrypt (const u32 *ks, const u32 *in, u32 *out) +DECLSPEC void cam_feistel (const u32 *x, const u32 *k, u32 *y); +DECLSPEC void cam_fl (u32 *x, const u32 *kl, const u32 *kr); +DECLSPEC void camellia256_set_key (u32 *ks, const u32 *ukey); +DECLSPEC void camellia256_encrypt (const u32 *ks, const u32 *in, u32 *out); +DECLSPEC void camellia256_decrypt (const u32 *ks, const u32 *in, u32 *out); diff --git a/OpenCL/inc_cipher_des.cl b/OpenCL/inc_cipher_des.cl index b60e09132..d0530513a 100644 --- a/OpenCL/inc_cipher_des.cl +++ b/OpenCL/inc_cipher_des.cl @@ -1,5 +1,5 @@ -__constant u32a c_SPtrans[8][64] = +CONSTANT_AS u32a c_SPtrans[8][64] = { { /* nibble 0 */ @@ -155,7 +155,7 @@ __constant u32a c_SPtrans[8][64] = }, }; -__constant u32a c_skb[8][64] = +CONSTANT_AS u32a c_skb[8][64] = { { 0x00000000, 0x00000010, 0x20000000, 0x20000010, diff --git a/OpenCL/inc_cipher_des.h b/OpenCL/inc_cipher_des.h index 17cff5e6f..68c0709e9 100644 --- a/OpenCL/inc_cipher_des.h +++ b/OpenCL/inc_cipher_des.h @@ -3,6 +3,6 @@ * License.....: MIT */ -DECLSPEC void _des_crypt_encrypt (u32x *iv, u32x *data, u32x *Kc, u32x *Kd, SHM_TYPE u32 (*s_SPtrans)[64]) -DECLSPEC void _des_crypt_decrypt (u32x *iv, u32x *data, u32x *Kc, u32x *Kd, SHM_TYPE u32 (*s_SPtrans)[64]) -DECLSPEC void _des_crypt_keysetup (u32x c, u32x d, u32x *Kc, u32x *Kd, SHM_TYPE u32 (*s_skb)[64]) +DECLSPEC void _des_crypt_encrypt (u32x *iv, u32x *data, u32x *Kc, u32x *Kd, SHM_TYPE u32 (*s_SPtrans)[64]); +DECLSPEC void _des_crypt_decrypt (u32x *iv, u32x *data, u32x *Kc, u32x *Kd, SHM_TYPE u32 (*s_SPtrans)[64]); +DECLSPEC void _des_crypt_keysetup (u32x c, u32x d, u32x *Kc, u32x *Kd, SHM_TYPE u32 (*s_skb)[64]); diff --git a/OpenCL/inc_cipher_kuznyechik.cl b/OpenCL/inc_cipher_kuznyechik.cl index 7bbbd119f..4358e931e 100644 --- a/OpenCL/inc_cipher_kuznyechik.cl +++ b/OpenCL/inc_cipher_kuznyechik.cl @@ -12,7 +12,7 @@ * * */ -__constant const u32a k_sbox[256] = +CONSTANT_AS const u32a k_sbox[256] = { 0xfc, 0xee, 0xdd, 0x11, 0xcf, 0x6e, 0x31, 0x16, 0xfb, 0xc4, 0xfa, 0xda, 0x23, 0xc5, 0x04, 0x4d, @@ -48,7 +48,7 @@ __constant const u32a k_sbox[256] = 0xd1, 0x66, 0xaf, 0xc2, 0x39, 0x4b, 0x63, 0xb6 }; -__constant const u32a k_sbox_inv[256] = +CONSTANT_AS const u32a k_sbox_inv[256] = { 0xa5, 0x2d, 0x32, 0x8f, 0x0e, 0x30, 0x38, 0xc0, 0x54, 0xe6, 0x9e, 0x39, 0x55, 0x7e, 0x52, 0x91, diff --git a/OpenCL/inc_cipher_kuznyechik.h b/OpenCL/inc_cipher_kuznyechik.h index dd865a211..992470c5c 100644 --- a/OpenCL/inc_cipher_kuznyechik.h +++ b/OpenCL/inc_cipher_kuznyechik.h @@ -3,8 +3,8 @@ * License.....: MIT */ -DECLSPEC void kuznyechik_linear (u32 *w) -DECLSPEC void kuznyechik_linear_inv (u32 *w) -DECLSPEC void kuznyechik_set_key (u32 *ks, const u32 *ukey) -DECLSPEC void kuznyechik_encrypt (const u32 *ks, const u32 *in, u32 *out) -DECLSPEC void kuznyechik_decrypt (const u32 *ks, const u32 *in, u32 *out) +DECLSPEC void kuznyechik_linear (u32 *w); +DECLSPEC void kuznyechik_linear_inv (u32 *w); +DECLSPEC void kuznyechik_set_key (u32 *ks, const u32 *ukey); +DECLSPEC void kuznyechik_encrypt (const u32 *ks, const u32 *in, u32 *out); +DECLSPEC void kuznyechik_decrypt (const u32 *ks, const u32 *in, u32 *out); diff --git a/OpenCL/inc_cipher_serpent.h b/OpenCL/inc_cipher_serpent.h index b9ddc1f2a..bd5e35454 100644 --- a/OpenCL/inc_cipher_serpent.h +++ b/OpenCL/inc_cipher_serpent.h @@ -3,9 +3,9 @@ * License.....: MIT */ -DECLSPEC void serpent128_set_key (u32 *ks, const u32 *ukey) -DECLSPEC void serpent128_encrypt (const u32 *ks, const u32 *in, u32 *out) -DECLSPEC void serpent128_decrypt (const u32 *ks, const u32 *in, u32 *out) -DECLSPEC void serpent256_set_key (u32 *ks, const u32 *ukey) -DECLSPEC void serpent256_encrypt (const u32 *ks, const u32 *in, u32 *out) -DECLSPEC void serpent256_decrypt (const u32 *ks, const u32 *in, u32 *out) +DECLSPEC void serpent128_set_key (u32 *ks, const u32 *ukey); +DECLSPEC void serpent128_encrypt (const u32 *ks, const u32 *in, u32 *out); +DECLSPEC void serpent128_decrypt (const u32 *ks, const u32 *in, u32 *out); +DECLSPEC void serpent256_set_key (u32 *ks, const u32 *ukey); +DECLSPEC void serpent256_encrypt (const u32 *ks, const u32 *in, u32 *out); +DECLSPEC void serpent256_decrypt (const u32 *ks, const u32 *in, u32 *out); diff --git a/OpenCL/inc_cipher_twofish.cl b/OpenCL/inc_cipher_twofish.cl index 956b5ea7a..a560c0675 100644 --- a/OpenCL/inc_cipher_twofish.cl +++ b/OpenCL/inc_cipher_twofish.cl @@ -21,7 +21,7 @@ #define extract_byte(x,n) (((x) >> (8 * (n))) & 0xff) -__constant u32a q_tab[2][256] = +CONSTANT_AS u32a q_tab[2][256] = { { 0xA9, 0x67, 0xB3, 0xE8, 0x04, 0xFD, 0xA3, 0x76, 0x9A, 0x92, 0x80, 0x78, @@ -75,7 +75,7 @@ __constant u32a q_tab[2][256] = #define q(n,x) q_tab[n][x] -__constant u32a m_tab[4][256] = +CONSTANT_AS u32a m_tab[4][256] = { { 0xBCBC3275, 0xECEC21F3, 0x202043C6, 0xB3B3C9F4, 0xDADA03DB, 0x02028B7B, 0xE2E22BFB, 0x9E9EFAC8, 0xC9C9EC4A, 0xD4D409D3, 0x18186BE6, 0x1E1E9F6B, diff --git a/OpenCL/inc_cipher_twofish.h b/OpenCL/inc_cipher_twofish.h index 523e825d3..0e3b560b8 100644 --- a/OpenCL/inc_cipher_twofish.h +++ b/OpenCL/inc_cipher_twofish.h @@ -3,12 +3,12 @@ * License.....: MIT */ -DECLSPEC u32 mds_rem (u32 p0, u32 p1) -DECLSPEC u32 h_fun128 (u32 *sk, u32 *lk, const u32 x, const u32 *key) -DECLSPEC void twofish128_set_key (u32 *sk, u32 *lk, const u32 *ukey) -DECLSPEC void twofish128_encrypt (const u32 *sk, const u32 *lk, const u32 *in, u32 *out) -DECLSPEC void twofish128_decrypt (const u32 *sk, const u32 *lk, const u32 *in, u32 *out) -DECLSPEC u32 h_fun256 (u32 *sk, u32 *lk, const u32 x, const u32 *key) -DECLSPEC void twofish256_set_key (u32 *sk, u32 *lk, const u32 *ukey) -DECLSPEC void twofish256_encrypt (const u32 *sk, const u32 *lk, const u32 *in, u32 *out) -DECLSPEC void twofish256_decrypt (const u32 *sk, const u32 *lk, const u32 *in, u32 *out) +DECLSPEC u32 mds_rem (u32 p0, u32 p1); +DECLSPEC u32 h_fun128 (u32 *sk, u32 *lk, const u32 x, const u32 *key); +DECLSPEC void twofish128_set_key (u32 *sk, u32 *lk, const u32 *ukey); +DECLSPEC void twofish128_encrypt (const u32 *sk, const u32 *lk, const u32 *in, u32 *out); +DECLSPEC void twofish128_decrypt (const u32 *sk, const u32 *lk, const u32 *in, u32 *out); +DECLSPEC u32 h_fun256 (u32 *sk, u32 *lk, const u32 x, const u32 *key); +DECLSPEC void twofish256_set_key (u32 *sk, u32 *lk, const u32 *ukey); +DECLSPEC void twofish256_encrypt (const u32 *sk, const u32 *lk, const u32 *in, u32 *out); +DECLSPEC void twofish256_decrypt (const u32 *sk, const u32 *lk, const u32 *in, u32 *out); diff --git a/OpenCL/inc_common.cl b/OpenCL/inc_common.cl index e9f18360b..542dc7ec7 100644 --- a/OpenCL/inc_common.cl +++ b/OpenCL/inc_common.cl @@ -9,12 +9,12 @@ * There are four variables where major differences occur: * * - P2: Adress space of kernel_rules_t struct. - * If the kernel uses rules_buf, it will be stored in __constant. - * If it does not, cheaper __global space is used. + * If the kernel uses rules_buf, it will be stored in CONSTANT_AS. + * If it does not, cheaper GLOBAL_AS space is used. * * - P4: Innerloop word buffer: - * Most kernels use a bf_t structure in __global address space (_BASIC). - * Some use u32x pointer to a vector in __constant address space (_VECTOR). + * Most kernels use a bf_t structure in GLOBAL_AS address space (_BASIC). + * Some use u32x pointer to a vector in CONSTANT_AS address space (_VECTOR). * A few use a specific bs_word_t struct (_BITSLICE). * * - P5: Type of the tmps structure with additional data, or void. @@ -23,31 +23,31 @@ * - P19: Type of the esalt_bufs structure with additional data, or void. */ -#define KERN_ATTR(p2,p4,p5,p6,p19) \ - __global pw_t * restrict pws, \ - p2 const kernel_rule_t * restrict rules_buf, \ - __global const pw_t * restrict combs_buf, \ - p4, \ - __global p5 * restrict tmps, \ - __global p6 * restrict hooks, \ - __global const u32 * restrict bitmaps_buf_s1_a, \ - __global const u32 * restrict bitmaps_buf_s1_b, \ - __global const u32 * restrict bitmaps_buf_s1_c, \ - __global const u32 * restrict bitmaps_buf_s1_d, \ - __global const u32 * restrict bitmaps_buf_s2_a, \ - __global const u32 * restrict bitmaps_buf_s2_b, \ - __global const u32 * restrict bitmaps_buf_s2_c, \ - __global const u32 * restrict bitmaps_buf_s2_d, \ - __global plain_t * restrict plains_buf, \ - __global const digest_t * restrict digests_buf, \ - __global u32 * restrict hashes_shown, \ - __global const salt_t * restrict salt_bufs, \ - __global const p19 * restrict esalt_bufs, \ - __global u32 * restrict d_return_buf, \ - __global void * restrict d_extra0_buf, \ - __global void * restrict d_extra1_buf, \ - __global void * restrict d_extra2_buf, \ - __global void * restrict d_extra3_buf, \ +#define KERN_ATTR(p2,p4,p5,p6,p19) \ + GLOBAL_AS pw_t * restrict pws, \ + p2 const kernel_rule_t * restrict rules_buf, \ + GLOBAL_AS const pw_t * restrict combs_buf, \ + p4, \ + GLOBAL_AS p5 * restrict tmps, \ + GLOBAL_AS p6 * restrict hooks, \ + GLOBAL_AS const u32 * restrict bitmaps_buf_s1_a, \ + GLOBAL_AS const u32 * restrict bitmaps_buf_s1_b, \ + GLOBAL_AS const u32 * restrict bitmaps_buf_s1_c, \ + GLOBAL_AS const u32 * restrict bitmaps_buf_s1_d, \ + GLOBAL_AS const u32 * restrict bitmaps_buf_s2_a, \ + GLOBAL_AS const u32 * restrict bitmaps_buf_s2_b, \ + GLOBAL_AS const u32 * restrict bitmaps_buf_s2_c, \ + GLOBAL_AS const u32 * restrict bitmaps_buf_s2_d, \ + GLOBAL_AS plain_t * restrict plains_buf, \ + GLOBAL_AS const digest_t * restrict digests_buf, \ + GLOBAL_AS u32 * restrict hashes_shown, \ + GLOBAL_AS const salt_t * restrict salt_bufs, \ + GLOBAL_AS const p19 * restrict esalt_bufs, \ + GLOBAL_AS u32 * restrict d_return_buf, \ + GLOBAL_AS void * restrict d_extra0_buf, \ + GLOBAL_AS void * restrict d_extra1_buf, \ + GLOBAL_AS void * restrict d_extra2_buf, \ + GLOBAL_AS void * restrict d_extra3_buf, \ const u32 bitmap_mask, \ const u32 bitmap_shift1, \ const u32 bitmap_shift2, \ @@ -68,18 +68,190 @@ * do not use rules or tmps, etc. */ -#define KERN_ATTR_BASIC() KERN_ATTR (__global, __global const bf_t * restrict bfs_buf, void, void, void) -#define KERN_ATTR_BITSLICE() KERN_ATTR (__global, __constant const bs_word_t * restrict words_buf_r, void, void, void) -#define KERN_ATTR_ESALT(e) KERN_ATTR (__global, __global const bf_t * restrict bfs_buf, void, void, e) -#define KERN_ATTR_RULES() KERN_ATTR (__constant, __global const bf_t * restrict bfs_buf, void, void, void) -#define KERN_ATTR_RULES_ESALT(e) KERN_ATTR (__constant, __global const bf_t * restrict bfs_buf, void, void, e) -#define KERN_ATTR_TMPS(t) KERN_ATTR (__global, __global const bf_t * restrict bfs_buf, t, void, void) -#define KERN_ATTR_TMPS_ESALT(t,e) KERN_ATTR (__global, __global const bf_t * restrict bfs_buf, t, void, e) -#define KERN_ATTR_TMPS_HOOKS(t,h) KERN_ATTR (__global, __global const bf_t * restrict bfs_buf, t, h, void) -#define KERN_ATTR_VECTOR() KERN_ATTR (__global, __constant const u32x * restrict words_buf_r, void, void, void) -#define KERN_ATTR_VECTOR_ESALT(e) KERN_ATTR (__global, __constant const u32x * restrict words_buf_r, void, void, e) +#define KERN_ATTR_BASIC() KERN_ATTR (GLOBAL_AS, GLOBAL_AS const bf_t * restrict bfs_buf, void, void, void) +#define KERN_ATTR_BITSLICE() KERN_ATTR (GLOBAL_AS, CONSTANT_AS const bs_word_t * restrict words_buf_r, void, void, void) +#define KERN_ATTR_ESALT(e) KERN_ATTR (GLOBAL_AS, GLOBAL_AS const bf_t * restrict bfs_buf, void, void, e) +#define KERN_ATTR_RULES() KERN_ATTR (CONSTANT_AS, GLOBAL_AS const bf_t * restrict bfs_buf, void, void, void) +#define KERN_ATTR_RULES_ESALT(e) KERN_ATTR (CONSTANT_AS, GLOBAL_AS const bf_t * restrict bfs_buf, void, void, e) +#define KERN_ATTR_TMPS(t) KERN_ATTR (GLOBAL_AS, GLOBAL_AS const bf_t * restrict bfs_buf, t, void, void) +#define KERN_ATTR_TMPS_ESALT(t,e) KERN_ATTR (GLOBAL_AS, GLOBAL_AS const bf_t * restrict bfs_buf, t, void, e) +#define KERN_ATTR_TMPS_HOOKS(t,h) KERN_ATTR (GLOBAL_AS, GLOBAL_AS const bf_t * restrict bfs_buf, t, h, void) +#define KERN_ATTR_VECTOR() KERN_ATTR (GLOBAL_AS, CONSTANT_AS const u32x * restrict words_buf_r, void, void, void) +#define KERN_ATTR_VECTOR_ESALT(e) KERN_ATTR (GLOBAL_AS, CONSTANT_AS const u32x * restrict words_buf_r, void, void, e) -// moved from inc_types.cl +/** + * vendor specific (or generic) functions + */ + +DECLSPEC u8 v8a_from_v32_S (const u32 v32) +{ + vconv32_t v; + + v.v32 = v32; + + return v.v8a; +} + +DECLSPEC u8 v8b_from_v32_S (const u32 v32) +{ + vconv32_t v; + + v.v32 = v32; + + return v.v8b; +} + +DECLSPEC u8 v8c_from_v32_S (const u32 v32) +{ + vconv32_t v; + + v.v32 = v32; + + return v.v8c; +} + +DECLSPEC u8 v8d_from_v32_S (const u32 v32) +{ + vconv32_t v; + + v.v32 = v32; + + return v.v8d; +} + +DECLSPEC u16 v16a_from_v32_S (const u32 v32) +{ + vconv32_t v; + + v.v32 = v32; + + return v.v16a; +} + +DECLSPEC u16 v16b_from_v32_S (const u32 v32) +{ + vconv32_t v; + + v.v32 = v32; + + return v.v16b; +} + +DECLSPEC u32 v32_from_v16ab_S (const u16 v16a, const u16 v16b) +{ + vconv32_t v; + + v.v16a = v16a; + v.v16b = v16b; + + return v.v32; +} + +DECLSPEC u32 v32a_from_v64_S (const u64 v64) +{ + vconv64_t v; + + v.v64 = v64; + + return v.v32a; +} + +DECLSPEC u32 v32b_from_v64_S (const u64 v64) +{ + vconv64_t v; + + v.v64 = v64; + + return v.v32b; +} + +DECLSPEC u64 v64_from_v32ab_S (const u32 v32a, const u32 v32b) +{ + vconv64_t v; + + v.v32a = v32a; + v.v32b = v32b; + + return v.v64; +} + +// unpack function are similar, but always return u32 + +DECLSPEC u32 unpack_v8a_from_v32_S (const u32 v32) +{ + u32 r; + + #if defined IS_NV + asm volatile ("bfe.u32 %0, %1, 0, 8;" : "=r"(r) : "r"(v32)); + #elif defined IS_AMD + #if HAS_VBFE + __asm__ __volatile__ ("V_BFE_U32 %0, %1, 0, 8;" : "=v"(r) : "v"(v32)); + #else + r = (v32 >> 0) & 0xff; + #endif + #else + r = (v32 >> 0) & 0xff; + #endif + + return r; +} + +DECLSPEC u32 unpack_v8b_from_v32_S (const u32 v32) +{ + u32 r; + + #if defined IS_NV + asm volatile ("bfe.u32 %0, %1, 8, 8;" : "=r"(r) : "r"(v32)); + #elif defined IS_AMD + #if HAS_VBFE + __asm__ __volatile__ ("V_BFE_U32 %0, %1, 8, 8;" : "=v"(r) : "v"(v32)); + #else + r = (v32 >> 8) & 0xff; + #endif + #else + r = (v32 >> 8) & 0xff; + #endif + + return r; +} + +DECLSPEC u32 unpack_v8c_from_v32_S (const u32 v32) +{ + u32 r; + + #if defined IS_NV + asm volatile ("bfe.u32 %0, %1, 16, 8;" : "=r"(r) : "r"(v32)); + #elif defined IS_AMD + #if HAS_VBFE + __asm__ __volatile__ ("V_BFE_U32 %0, %1, 16, 8;" : "=v"(r) : "v"(v32)); + #else + r = (v32 >> 16) & 0xff; + #endif + #else + r = (v32 >> 16) & 0xff; + #endif + + return r; +} + +DECLSPEC u32 unpack_v8d_from_v32_S (const u32 v32) +{ + u32 r; + + #if defined IS_NV + asm volatile ("bfe.u32 %0, %1, 24, 8;" : "=r"(r) : "r"(v32)); + #elif defined IS_AMD + #if HAS_VBFE + __asm__ __volatile__ ("V_BFE_U32 %0, %1, 24, 8;" : "=v"(r) : "v"(v32)); + #else + r = (v32 >> 24) & 0xff; + #endif + #else + r = (v32 >> 24) & 0xff; + #endif + + return r; +} DECLSPEC u32 l32_from_64_S (u64 a) { @@ -99,7 +271,7 @@ DECLSPEC u32 h32_from_64_S (u64 a) DECLSPEC u64 hl32_to_64_S (const u32 a, const u32 b) { - return as_ulong ((uint2) (b, a)); + return v64_from_v32ab_S (b, a); } DECLSPEC u32x l32_from_64 (u64x a) @@ -187,35 +359,35 @@ DECLSPEC u64x hl32_to_64 (const u32x a, const u32x b) u64x r; #if VECT_SIZE == 1 - r = as_ulong ((uint2) (b, a)); + r = v64_from_v32ab_S (b , a); #endif #if VECT_SIZE >= 2 - r.s0 = as_ulong ((uint2) (b.s0, a.s0)); - r.s1 = as_ulong ((uint2) (b.s1, a.s1)); + r.s0 = v64_from_v32ab_S (b.s0, a.s0); + r.s1 = v64_from_v32ab_S (b.s1, a.s1); #endif #if VECT_SIZE >= 4 - r.s2 = as_ulong ((uint2) (b.s2, a.s2)); - r.s3 = as_ulong ((uint2) (b.s3, a.s3)); + r.s2 = v64_from_v32ab_S (b.s2, a.s2); + r.s3 = v64_from_v32ab_S (b.s3, a.s3); #endif #if VECT_SIZE >= 8 - r.s4 = as_ulong ((uint2) (b.s4, a.s4)); - r.s5 = as_ulong ((uint2) (b.s5, a.s5)); - r.s6 = as_ulong ((uint2) (b.s6, a.s6)); - r.s7 = as_ulong ((uint2) (b.s7, a.s7)); + r.s4 = v64_from_v32ab_S (b.s4, a.s4); + r.s5 = v64_from_v32ab_S (b.s5, a.s5); + r.s6 = v64_from_v32ab_S (b.s6, a.s6); + r.s7 = v64_from_v32ab_S (b.s7, a.s7); #endif #if VECT_SIZE >= 16 - r.s8 = as_ulong ((uint2) (b.s8, a.s8)); - r.s9 = as_ulong ((uint2) (b.s9, a.s9)); - r.sa = as_ulong ((uint2) (b.sa, a.sa)); - r.sb = as_ulong ((uint2) (b.sb, a.sb)); - r.sc = as_ulong ((uint2) (b.sc, a.sc)); - r.sd = as_ulong ((uint2) (b.sd, a.sd)); - r.se = as_ulong ((uint2) (b.se, a.se)); - r.sf = as_ulong ((uint2) (b.sf, a.sf)); + r.s8 = v64_from_v32ab_S (b.s8, a.s8); + r.s9 = v64_from_v32ab_S (b.s9, a.s9); + r.sa = v64_from_v32ab_S (b.sa, a.sa); + r.sb = v64_from_v32ab_S (b.sb, a.sb); + r.sc = v64_from_v32ab_S (b.sc, a.sc); + r.sd = v64_from_v32ab_S (b.sd, a.sd); + r.se = v64_from_v32ab_S (b.se, a.se); + r.sf = v64_from_v32ab_S (b.sf, a.sf); #endif return r; @@ -1109,32 +1281,56 @@ DECLSPEC u32 hc_lop_0x96_S (const u32 a, const u32 b, const u32 c) #ifdef IS_GENERIC DECLSPEC u32 swap32_S (const u32 v) { + #ifdef _CPU_OPENCL_EMU_H + return emu_byte_swap_32 (v); + #else return (as_uint (as_uchar4 (v).s3210)); + #endif } DECLSPEC u64 swap64_S (const u64 v) { + #ifdef _CPU_OPENCL_EMU_H + return emu_byte_swap_64 (v); + #else return (as_ulong (as_uchar8 (v).s76543210)); + #endif } DECLSPEC u32 rotr32_S (const u32 a, const u32 n) { + #ifdef _CPU_OPENCL_EMU_H + return emu_rotate_32 (a, (32 - n)); + #else return rotate (a, (32 - n)); + #endif } DECLSPEC u32 rotl32_S (const u32 a, const u32 n) { + #ifdef _CPU_OPENCL_EMU_H + return emu_rotate_32 (a, n); + #else return rotate (a, n); + #endif } DECLSPEC u64 rotr64_S (const u64 a, const u32 n) { + #ifdef _CPU_OPENCL_EMU_H + return emu_rotate_64 (a, (u64) (64 - n)); + #else return rotate (a, (u64) (64 - n)); + #endif } DECLSPEC u64 rotl64_S (const u64 a, const u32 n) { + #ifdef _CPU_OPENCL_EMU_H + return emu_rotate_64 (a, (u64) n); + #else return rotate (a, (u64) n); + #endif } DECLSPEC u32x swap32 (const u32x v) @@ -1157,24 +1353,43 @@ DECLSPEC u64x swap64 (const u64x v) | ((v << 56) & 0xff00000000000000); } +// For _CPU_OPENCL_EMU_H we dont need to care about vector functions +// The VECT_SIZE is guaranteed to be set to 1 from cpu_opencl_emu.h + DECLSPEC u32x rotr32 (const u32x a, const u32 n) { + #ifdef _CPU_OPENCL_EMU_H + return emu_rotate_32 (a, (32 - n)); + #else return rotate (a, (32 - n)); + #endif } DECLSPEC u32x rotl32 (const u32x a, const u32 n) { + #ifdef _CPU_OPENCL_EMU_H + return emu_rotate_32 (a, n); + #else return rotate (a, n); + #endif } DECLSPEC u64x rotr64 (const u64x a, const u32 n) { + #ifdef _CPU_OPENCL_EMU_H + return emu_rotate_64 (a, (u64x) (64 - n)); + #else return rotate (a, (u64x) (64 - n)); + #endif } DECLSPEC u64x rotl64 (const u64x a, const u32 n) { + #ifdef _CPU_OPENCL_EMU_H + return emu_rotate_64 (a, (u64x) n); + #else return rotate (a, (u64x) n); + #endif } DECLSPEC u32x hc_bfe (const u32x a, const u32x b, const u32x c) @@ -1285,178 +1500,6 @@ DECLSPEC u32 hc_lop_0x96_S (const u32 a, const u32 b, const u32 c) #endif -// functions - -DECLSPEC u8 v8a_from_v32_S (const u32 v32) -{ - vconv32_t v; - - v.v32 = v32; - - return v.v8a; -} - -DECLSPEC u8 v8b_from_v32_S (const u32 v32) -{ - vconv32_t v; - - v.v32 = v32; - - return v.v8b; -} - -DECLSPEC u8 v8c_from_v32_S (const u32 v32) -{ - vconv32_t v; - - v.v32 = v32; - - return v.v8c; -} - -DECLSPEC u8 v8d_from_v32_S (const u32 v32) -{ - vconv32_t v; - - v.v32 = v32; - - return v.v8d; -} - -DECLSPEC u16 v16a_from_v32_S (const u32 v32) -{ - vconv32_t v; - - v.v32 = v32; - - return v.v16a; -} - -DECLSPEC u16 v16b_from_v32_S (const u32 v32) -{ - vconv32_t v; - - v.v32 = v32; - - return v.v16b; -} - -DECLSPEC u32 v32_from_v16ab_S (const u16 v16a, const u16 v16b) -{ - vconv32_t v; - - v.v16a = v16a; - v.v16b = v16b; - - return v.v32; -} - -DECLSPEC u32 v32a_from_v64_S (const u64 v64) -{ - vconv64_t v; - - v.v64 = v64; - - return v.v32a; -} - -DECLSPEC u32 v32b_from_v64_S (const u64 v64) -{ - vconv64_t v; - - v.v64 = v64; - - return v.v32b; -} - -DECLSPEC u64 v64_from_v32ab_S (const u32 v32a, const u32 v32b) -{ - vconv64_t v; - - v.v32a = v32a; - v.v32b = v32b; - - return v.v64; -} - -// unpack function are similar, but always return u32 - -DECLSPEC u32 unpack_v8a_from_v32_S (const u32 v32) -{ - u32 r; - - #if defined IS_NV - asm volatile ("bfe.u32 %0, %1, 0, 8;" : "=r"(r) : "r"(v32)); - #elif defined IS_AMD - #if HAS_VBFE - __asm__ __volatile__ ("V_BFE_U32 %0, %1, 0, 8;" : "=v"(r) : "v"(v32)); - #else - r = (v32 >> 0) & 0xff; - #endif - #else - r = (v32 >> 0) & 0xff; - #endif - - return r; -} - -DECLSPEC u32 unpack_v8b_from_v32_S (const u32 v32) -{ - u32 r; - - #if defined IS_NV - asm volatile ("bfe.u32 %0, %1, 8, 8;" : "=r"(r) : "r"(v32)); - #elif defined IS_AMD - #if HAS_VBFE - __asm__ __volatile__ ("V_BFE_U32 %0, %1, 8, 8;" : "=v"(r) : "v"(v32)); - #else - r = (v32 >> 8) & 0xff; - #endif - #else - r = (v32 >> 8) & 0xff; - #endif - - return r; -} - -DECLSPEC u32 unpack_v8c_from_v32_S (const u32 v32) -{ - u32 r; - - #if defined IS_NV - asm volatile ("bfe.u32 %0, %1, 16, 8;" : "=r"(r) : "r"(v32)); - #elif defined IS_AMD - #if HAS_VBFE - __asm__ __volatile__ ("V_BFE_U32 %0, %1, 16, 8;" : "=v"(r) : "v"(v32)); - #else - r = (v32 >> 16) & 0xff; - #endif - #else - r = (v32 >> 16) & 0xff; - #endif - - return r; -} - -DECLSPEC u32 unpack_v8d_from_v32_S (const u32 v32) -{ - u32 r; - - #if defined IS_NV - asm volatile ("bfe.u32 %0, %1, 24, 8;" : "=r"(r) : "r"(v32)); - #elif defined IS_AMD - #if HAS_VBFE - __asm__ __volatile__ ("V_BFE_U32 %0, %1, 24, 8;" : "=v"(r) : "v"(v32)); - #else - r = (v32 >> 24) & 0xff; - #endif - #else - r = (v32 >> 24) & 0xff; - #endif - - return r; -} - /** * pure scalar functions */ @@ -1476,7 +1519,7 @@ DECLSPEC int ffz (const u32 v) return -1; } -DECLSPEC int hash_comp (const u32 *d1, __global const u32 *d2) +DECLSPEC int hash_comp (const u32 *d1, GLOBAL_AS const u32 *d2) { if (d1[3] > d2[DGST_R3]) return ( 1); if (d1[3] < d2[DGST_R3]) return (-1); @@ -1490,7 +1533,7 @@ DECLSPEC int hash_comp (const u32 *d1, __global const u32 *d2) return (0); } -DECLSPEC int find_hash (const u32 *digest, const u32 digests_cnt, __global const digest_t *digests_buf) +DECLSPEC int find_hash (const u32 *digest, const u32 digests_cnt, GLOBAL_AS const digest_t *digests_buf) { for (u32 l = 0, r = digests_cnt; r; r >>= 1) { @@ -1513,12 +1556,12 @@ DECLSPEC int find_hash (const u32 *digest, const u32 digests_cnt, __global const return (-1); } -DECLSPEC u32 check_bitmap (__global const u32 *bitmap, const u32 bitmap_mask, const u32 bitmap_shift, const u32 digest) +DECLSPEC u32 check_bitmap (GLOBAL_AS const u32 *bitmap, const u32 bitmap_mask, const u32 bitmap_shift, const u32 digest) { return (bitmap[(digest >> bitmap_shift) & bitmap_mask] & (1 << (digest & 0x1f))); } -DECLSPEC u32 check (const u32 *digest, __global const u32 *bitmap_s1_a, __global const u32 *bitmap_s1_b, __global const u32 *bitmap_s1_c, __global const u32 *bitmap_s1_d, __global const u32 *bitmap_s2_a, __global const u32 *bitmap_s2_b, __global const u32 *bitmap_s2_c, __global const u32 *bitmap_s2_d, const u32 bitmap_mask, const u32 bitmap_shift1, const u32 bitmap_shift2) +DECLSPEC u32 check (const u32 *digest, GLOBAL_AS const u32 *bitmap_s1_a, GLOBAL_AS const u32 *bitmap_s1_b, GLOBAL_AS const u32 *bitmap_s1_c, GLOBAL_AS const u32 *bitmap_s1_d, GLOBAL_AS const u32 *bitmap_s2_a, GLOBAL_AS const u32 *bitmap_s2_b, GLOBAL_AS const u32 *bitmap_s2_c, GLOBAL_AS const u32 *bitmap_s2_d, const u32 bitmap_mask, const u32 bitmap_shift1, const u32 bitmap_shift2) { if (check_bitmap (bitmap_s1_a, bitmap_mask, bitmap_shift1, digest[0]) == 0) return (0); if (check_bitmap (bitmap_s1_b, bitmap_mask, bitmap_shift1, digest[1]) == 0) return (0); @@ -1533,7 +1576,7 @@ DECLSPEC u32 check (const u32 *digest, __global const u32 *bitmap_s1_a, __global return (1); } -DECLSPEC void mark_hash (__global plain_t *plains_buf, __global u32 *d_result, const u32 salt_pos, const u32 digests_cnt, const u32 digest_pos, const u32 hash_pos, const u64 gid, const u32 il_pos, const u32 extra1, const u32 extra2) +DECLSPEC void mark_hash (GLOBAL_AS plain_t *plains_buf, GLOBAL_AS u32 *d_result, const u32 salt_pos, const u32 digests_cnt, const u32 digest_pos, const u32 hash_pos, const u64 gid, const u32 il_pos, const u32 extra1, const u32 extra2) { const u32 idx = atomic_inc (d_result); @@ -1636,7 +1679,7 @@ DECLSPEC int is_valid_base58_32 (const u32 v) return 1; } -DECLSPEC int find_keyboard_layout_map (const u32 search, const int search_len, __local keyboard_layout_mapping_t *s_keyboard_layout_mapping_buf, const int keyboard_layout_mapping_cnt) +DECLSPEC int find_keyboard_layout_map (const u32 search, const int search_len, LOCAL_AS keyboard_layout_mapping_t *s_keyboard_layout_mapping_buf, const int keyboard_layout_mapping_cnt) { for (int idx = 0; idx < keyboard_layout_mapping_cnt; idx++) { @@ -1654,7 +1697,7 @@ DECLSPEC int find_keyboard_layout_map (const u32 search, const int search_len, _ return -1; } -DECLSPEC int execute_keyboard_layout_mapping (u32 w0[4], u32 w1[4], u32 w2[4], u32 w3[4], const int pw_len, __local keyboard_layout_mapping_t *s_keyboard_layout_mapping_buf, const int keyboard_layout_mapping_cnt) +DECLSPEC int execute_keyboard_layout_mapping (u32 w0[4], u32 w1[4], u32 w2[4], u32 w3[4], const int pw_len, LOCAL_AS keyboard_layout_mapping_t *s_keyboard_layout_mapping_buf, const int keyboard_layout_mapping_cnt) { u32 out_buf[16] = { 0 }; @@ -61686,7 +61729,7 @@ DECLSPEC void append_0x80_4x4_VV (u32x *w0, u32x *w1, u32x *w2, u32x *w3, const #endif } -DECLSPEC void gpu_decompress_entry (__global pw_idx_t *pws_idx, __global u32 *pws_comp, pw_t *pw, const u64 gid) +DECLSPEC void gpu_decompress_entry (GLOBAL_AS pw_idx_t *pws_idx, GLOBAL_AS u32 *pws_comp, pw_t *pw, const u64 gid) { const u32 off = pws_idx[gid].off; const u32 cnt = pws_idx[gid].cnt; @@ -61706,7 +61749,7 @@ DECLSPEC void gpu_decompress_entry (__global pw_idx_t *pws_idx, __global u32 *pw pw->pw_len = len; } -__kernel void gpu_decompress (__global pw_idx_t * restrict pws_idx, __global u32 * restrict pws_comp, __global pw_t * restrict pws_buf, const u64 gid_max) +KERNEL_FQ void gpu_decompress (GLOBAL_AS pw_idx_t * restrict pws_idx, GLOBAL_AS u32 * restrict pws_comp, GLOBAL_AS pw_t * restrict pws_buf, const u64 gid_max) { const u64 gid = get_global_id (0); @@ -61719,7 +61762,7 @@ __kernel void gpu_decompress (__global pw_idx_t * restrict pws_idx, __global u32 pws_buf[gid] = pw; } -__kernel void gpu_memset (__global uint4 * restrict buf, const u32 value, const u64 gid_max) +KERNEL_FQ void gpu_memset (GLOBAL_AS uint4 * restrict buf, const u32 value, const u64 gid_max) { const u64 gid = get_global_id (0); @@ -61728,7 +61771,7 @@ __kernel void gpu_memset (__global uint4 * restrict buf, const u32 value, const buf[gid] = (uint4) (value); } -__kernel void gpu_atinit (__global pw_t * restrict buf, const u64 gid_max) +KERNEL_FQ void gpu_atinit (GLOBAL_AS pw_t * restrict buf, const u64 gid_max) { const u64 gid = get_global_id (0); diff --git a/OpenCL/inc_common.h b/OpenCL/inc_common.h index 49ba0d674..e395f5982 100644 --- a/OpenCL/inc_common.h +++ b/OpenCL/inc_common.h @@ -3,169 +3,169 @@ * License.....: MIT */ -DECLSPEC u32 l32_from_64_S (u64 a) -DECLSPEC u32 h32_from_64_S (u64 a) -DECLSPEC u64 hl32_to_64_S (const u32 a, const u32 b) -DECLSPEC u32x l32_from_64 (u64x a) -DECLSPEC u32x h32_from_64 (u64x a) -DECLSPEC u64x hl32_to_64 (const u32x a, const u32x b) -DECLSPEC u32 swap32_S (const u32 v) -DECLSPEC u64 swap64_S (const u64 v) -DECLSPEC u32 swap32_S (const u32 v) -DECLSPEC u64 swap64_S (const u64 v) -DECLSPEC u32 rotr32_S (const u32 a, const u32 n) -DECLSPEC u32 rotl32_S (const u32 a, const u32 n) -DECLSPEC u64 rotr64_S (const u64 a, const u32 n) -DECLSPEC u64 rotl64_S (const u64 a, const u32 n) -DECLSPEC u32x swap32 (const u32x v) -DECLSPEC u64x swap64 (const u64x v) -DECLSPEC u32x swap32 (const u32x v) -DECLSPEC u64x swap64 (const u64x v) -DECLSPEC u32x rotr32 (const u32x a, const u32 n) -DECLSPEC u32x rotl32 (const u32x a, const u32 n) -DECLSPEC u64x rotr64 (const u64x a, const u32 n) -DECLSPEC u64x rotl64 (const u64x a, const u32 n) -DECLSPEC u32x hc_bfe (const u32x a, const u32x b, const u32x c) -DECLSPEC u32 hc_bfe_S (const u32 a, const u32 b, const u32 c) -DECLSPEC u32x hc_bytealign_be (const u32x a, const u32x b, const u32 c) -DECLSPEC u32 hc_bytealign_be_S (const u32 a, const u32 b, const u32 c) -DECLSPEC u32x hc_bytealign (const u32x a, const u32x b, const u32 c) -DECLSPEC u32 hc_bytealign_S (const u32 a, const u32 b, const u32 c) -DECLSPEC u32x hc_byte_perm (const u32x a, const u32x b, const u32x c) -DECLSPEC u32 hc_byte_perm_S (const u32 a, const u32 b, const u32 c) -DECLSPEC u32x hc_add3 (const u32x a, const u32x b, const u32x c) -DECLSPEC u32 hc_add3_S (const u32 a, const u32 b, const u32 c) -DECLSPEC u32x hc_add3 (const u32x a, const u32x b, const u32x c) -DECLSPEC u32 hc_add3_S (const u32 a, const u32 b, const u32 c) -DECLSPEC u32x hc_lop_0x96 (const u32x a, const u32x b, const u32x c) -DECLSPEC u32 hc_lop_0x96_S (const u32 a, const u32 b, const u32 c) -DECLSPEC u32 swap32_S (const u32 v) -DECLSPEC u64 swap64_S (const u64 v) -DECLSPEC u32 rotr32_S (const u32 a, const u32 n) -DECLSPEC u32 rotl32_S (const u32 a, const u32 n) -DECLSPEC u64 rotr64_S (const u64 a, const u32 n) -DECLSPEC u64 rotl64_S (const u64 a, const u32 n) -DECLSPEC u32x swap32 (const u32x v) -DECLSPEC u64x swap64 (const u64x v) -DECLSPEC u32x rotr32 (const u32x a, const u32 n) -DECLSPEC u32x rotl32 (const u32x a, const u32 n) -DECLSPEC u64x rotr64 (const u64x a, const u32 n) -DECLSPEC u64x rotl64 (const u64x a, const u32 n) -DECLSPEC u32x hc_byte_perm (const u32x a, const u32x b, const u32x c) -DECLSPEC u32 hc_byte_perm_S (const u32 a, const u32 b, const u32 c) -DECLSPEC u32x hc_bfe (const u32x a, const u32x b, const u32x c) -DECLSPEC u32 hc_bfe_S (const u32 a, const u32 b, const u32 c) -DECLSPEC u32x hc_bytealign (const u32x a, const u32x b, const u32x c) -DECLSPEC u32 hc_bytealign_S (const u32 a, const u32 b, const u32 c) -DECLSPEC u32x hc_add3 (const u32x a, const u32x b, const u32x c) -DECLSPEC u32 hc_add3_S (const u32 a, const u32 b, const u32 c) -DECLSPEC u32x hc_lop_0x96 (const u32x a, const u32x b, const u32x c) -DECLSPEC u32 hc_lop_0x96_S (const u32 a, const u32 b, const u32 c) -DECLSPEC u32 swap32_S (const u32 v) -DECLSPEC u64 swap64_S (const u64 v) -DECLSPEC u32 rotr32_S (const u32 a, const u32 n) -DECLSPEC u32 rotl32_S (const u32 a, const u32 n) -DECLSPEC u64 rotr64_S (const u64 a, const u32 n) -DECLSPEC u64 rotl64_S (const u64 a, const u32 n) -DECLSPEC u32x swap32 (const u32x v) -DECLSPEC u64x swap64 (const u64x v) -DECLSPEC u32x rotr32 (const u32x a, const u32 n) -DECLSPEC u32x rotl32 (const u32x a, const u32 n) -DECLSPEC u64x rotr64 (const u64x a, const u32 n) -DECLSPEC u64x rotl64 (const u64x a, const u32 n) -DECLSPEC u32x hc_bfe (const u32x a, const u32x b, const u32x c) -DECLSPEC u32 hc_bfe_S (const u32 a, const u32 b, const u32 c) -DECLSPEC u32x hc_bytealign_be (const u32x a, const u32x b, const u32 c) -DECLSPEC u32 hc_bytealign_be_S (const u32 a, const u32 b, const u32 c) -DECLSPEC u32x hc_bytealign (const u32x a, const u32x b, const u32 c) -DECLSPEC u32 hc_bytealign_S (const u32 a, const u32 b, const u32 c) -DECLSPEC u32x hc_add3 (const u32x a, const u32x b, const u32x c) -DECLSPEC u32 hc_add3_S (const u32 a, const u32 b, const u32 c) -DECLSPEC u32x hc_lop_0x96 (const u32x a, const u32x b, const u32x c) -DECLSPEC u32 hc_lop_0x96_S (const u32 a, const u32 b, const u32 c) -DECLSPEC u8 v8a_from_v32_S (const u32 v32) -DECLSPEC u8 v8b_from_v32_S (const u32 v32) -DECLSPEC u8 v8c_from_v32_S (const u32 v32) -DECLSPEC u8 v8d_from_v32_S (const u32 v32) -DECLSPEC u16 v16a_from_v32_S (const u32 v32) -DECLSPEC u16 v16b_from_v32_S (const u32 v32) -DECLSPEC u32 v32_from_v16ab_S (const u16 v16a, const u16 v16b) -DECLSPEC u32 v32a_from_v64_S (const u64 v64) -DECLSPEC u32 v32b_from_v64_S (const u64 v64) -DECLSPEC u64 v64_from_v32ab_S (const u32 v32a, const u32 v32b) -DECLSPEC u32 unpack_v8a_from_v32_S (const u32 v32) -DECLSPEC u32 unpack_v8b_from_v32_S (const u32 v32) -DECLSPEC u32 unpack_v8c_from_v32_S (const u32 v32) -DECLSPEC u32 unpack_v8d_from_v32_S (const u32 v32) -DECLSPEC int ffz (const u32 v) -DECLSPEC int hash_comp (const u32 *d1, __global const u32 *d2) -DECLSPEC int find_hash (const u32 *digest, const u32 digests_cnt, __global const digest_t *digests_buf) -DECLSPEC u32 check_bitmap (__global const u32 *bitmap, const u32 bitmap_mask, const u32 bitmap_shift, const u32 digest) -DECLSPEC u32 check (const u32 *digest, __global const u32 *bitmap_s1_a, __global const u32 *bitmap_s1_b, __global const u32 *bitmap_s1_c, __global const u32 *bitmap_s1_d, __global const u32 *bitmap_s2_a, __global const u32 *bitmap_s2_b, __global const u32 *bitmap_s2_c, __global const u32 *bitmap_s2_d, const u32 bitmap_mask, const u32 bitmap_shift1, const u32 bitmap_shift2) -DECLSPEC void mark_hash (__global plain_t *plains_buf, __global u32 *d_result, const u32 salt_pos, const u32 digests_cnt, const u32 digest_pos, const u32 hash_pos, const u64 gid, const u32 il_pos, const u32 extra1, const u32 extra2) -DECLSPEC int count_char (const u32 *buf, const int elems, const u32 c) -DECLSPEC float get_entropy (const u32 *buf, const int elems) -DECLSPEC int is_valid_hex_8 (const u8 v) -DECLSPEC int is_valid_hex_32 (const u32 v) -DECLSPEC int is_valid_base58_8 (const u8 v) -DECLSPEC int is_valid_base58_32 (const u32 v) -DECLSPEC int find_keyboard_layout_map (const u32 search, const int search_len, __local keyboard_layout_mapping_t *s_keyboard_layout_mapping_buf, const int keyboard_layout_mapping_cnt) -DECLSPEC int execute_keyboard_layout_mapping (u32 w0[4], u32 w1[4], u32 w2[4], u32 w3[4], const int pw_len, __local keyboard_layout_mapping_t *s_keyboard_layout_mapping_buf, const int keyboard_layout_mapping_cnt) -DECLSPEC void make_utf16be (const u32x *in, u32x *out1, u32x *out2) -DECLSPEC void make_utf16beN (const u32x *in, u32x *out1, u32x *out2) -DECLSPEC void make_utf16le (const u32x *in, u32x *out1, u32x *out2) -DECLSPEC void make_utf16leN (const u32x *in, u32x *out1, u32x *out2) -DECLSPEC void undo_utf16be (const u32x *in1, const u32x *in2, u32x *out) -DECLSPEC void undo_utf16le (const u32x *in1, const u32x *in2, u32x *out) -DECLSPEC void set_mark_1x4 (u32 *v, const u32 offset) -DECLSPEC void append_helper_1x4 (u32x *r, const u32 v, const u32 *m) -DECLSPEC void append_0x80_1x4 (u32x *w0, const u32 offset) -DECLSPEC void append_0x80_2x4 (u32x *w0, u32x *w1, const u32 offset) -DECLSPEC void append_0x80_3x4 (u32x *w0, u32x *w1, u32x *w2, const u32 offset) -DECLSPEC void append_0x80_4x4 (u32x *w0, u32x *w1, u32x *w2, u32x *w3, const u32 offset) -DECLSPEC void append_0x80_8x4 (u32x *w0, u32x *w1, u32x *w2, u32x *w3, u32x *w4, u32x *w5, u32x *w6, u32x *w7, const u32 offset) -DECLSPEC void append_0x80_1x16 (u32x *w, const u32 offset) -DECLSPEC void switch_buffer_by_offset_le (u32x *w0, u32x *w1, u32x *w2, u32x *w3, const u32 offset) -DECLSPEC void switch_buffer_by_offset_carry_le (u32x *w0, u32x *w1, u32x *w2, u32x *w3, u32x *c0, u32x *c1, u32x *c2, u32x *c3, const u32 offset) -DECLSPEC void switch_buffer_by_offset_be (u32x *w0, u32x *w1, u32x *w2, u32x *w3, const u32 offset) -DECLSPEC void switch_buffer_by_offset_carry_be (u32x *w0, u32x *w1, u32x *w2, u32x *w3, u32x *c0, u32x *c1, u32x *c2, u32x *c3, const u32 offset) -DECLSPEC void switch_buffer_by_offset_8x4_le (u32x *w0, u32x *w1, u32x *w2, u32x *w3, u32x *w4, u32x *w5, u32x *w6, u32x *w7, const u32 offset) -DECLSPEC void switch_buffer_by_offset_8x4_be (u32x *w0, u32x *w1, u32x *w2, u32x *w3, u32x *w4, u32x *w5, u32x *w6, u32x *w7, const u32 offset) -DECLSPEC void switch_buffer_by_offset_8x4_carry_be (u32x *w0, u32x *w1, u32x *w2, u32x *w3, u32x *w4, u32x *w5, u32x *w6, u32x *w7, u32x *c0, u32x *c1, u32x *c2, u32x *c3, u32x *c4, u32x *c5, u32x *c6, u32x *c7, const u32 offset) -DECLSPEC void switch_buffer_by_offset_1x64_le (u32x *w, const u32 offset) -DECLSPEC void switch_buffer_by_offset_1x64_be (u32x *w, const u32 offset) -DECLSPEC void truncate_block_4x4_le_S (u32 *w0, const u32 len) -DECLSPEC void truncate_block_4x4_be_S (u32 *w0, const u32 len) -DECLSPEC void truncate_block_16x4_le_S (u32 *w0, u32 *w1, u32 *w2, u32 *w3, const u32 len) -DECLSPEC void truncate_block_16x4_be_S (u32 *w0, u32 *w1, u32 *w2, u32 *w3, const u32 len) -DECLSPEC void set_mark_1x4_S (u32 *v, const u32 offset) -DECLSPEC void append_helper_1x4_S (u32 *r, const u32 v, const u32 *m) -DECLSPEC void append_0x01_2x4_S (u32 *w0, u32 *w1, const u32 offset) -DECLSPEC void append_0x06_2x4_S (u32 *w0, u32 *w1, const u32 offset) -DECLSPEC void append_0x01_4x4_S (u32 *w0, u32 *w1, u32 *w2, u32 *w3, const u32 offset) -DECLSPEC void append_0x80_1x4_S (u32 *w0, const u32 offset) -DECLSPEC void append_0x80_2x4_S (u32 *w0, u32 *w1, const u32 offset) -DECLSPEC void append_0x80_3x4_S (u32 *w0, u32 *w1, u32 *w2, const u32 offset) -DECLSPEC void append_0x80_4x4_S (u32 *w0, u32 *w1, u32 *w2, u32 *w3, const u32 offset) -DECLSPEC void append_0x80_8x4_S (u32 *w0, u32 *w1, u32 *w2, u32 *w3, u32 *w4, u32 *w5, u32 *w6, u32 *w7, const u32 offset) -DECLSPEC void make_utf16be_S (const u32 *in, u32 *out1, u32 *out2) -DECLSPEC void make_utf16le_S (const u32 *in, u32 *out1, u32 *out2) -DECLSPEC void undo_utf16be_S (const u32 *in1, const u32 *in2, u32 *out) -DECLSPEC void undo_utf16le_S (const u32 *in1, const u32 *in2, u32 *out) -DECLSPEC void switch_buffer_by_offset_le_S (u32 *w0, u32 *w1, u32 *w2, u32 *w3, const u32 offset) -DECLSPEC void switch_buffer_by_offset_carry_le_S (u32 *w0, u32 *w1, u32 *w2, u32 *w3, u32 *c0, u32 *c1, u32 *c2, u32 *c3, const u32 offset) -DECLSPEC void switch_buffer_by_offset_be_S (u32 *w0, u32 *w1, u32 *w2, u32 *w3, const u32 offset) -DECLSPEC void switch_buffer_by_offset_carry_be_S (u32 *w0, u32 *w1, u32 *w2, u32 *w3, u32 *c0, u32 *c1, u32 *c2, u32 *c3, const u32 offset) -DECLSPEC void switch_buffer_by_offset_8x4_le_S (u32 *w0, u32 *w1, u32 *w2, u32 *w3, u32 *w4, u32 *w5, u32 *w6, u32 *w7, const u32 offset) -DECLSPEC void switch_buffer_by_offset_8x4_be_S (u32 *w0, u32 *w1, u32 *w2, u32 *w3, u32 *w4, u32 *w5, u32 *w6, u32 *w7, const u32 offset) -DECLSPEC void switch_buffer_by_offset_8x4_carry_be_S (u32 *w0, u32 *w1, u32 *w2, u32 *w3, u32 *w4, u32 *w5, u32 *w6, u32 *w7, u32 *c0, u32 *c1, u32 *c2, u32 *c3, u32 *c4, u32 *c5, u32 *c6, u32 *c7, const u32 offset) -DECLSPEC void switch_buffer_by_offset_1x64_le_S (u32 *w, const u32 offset) -DECLSPEC void switch_buffer_by_offset_1x64_be_S (u32 *w, const u32 offset) -DECLSPEC void switch_buffer_by_offset_le_VV (u32x *w0, u32x *w1, u32x *w2, u32x *w3, const u32x offset) -DECLSPEC void switch_buffer_by_offset_8x4_le_VV (u32x *w0, u32x *w1, u32x *w2, u32x *w3, u32x *w4, u32x *w5, u32x *w6, u32x *w7, const u32x offset) -DECLSPEC void append_0x01_2x4_VV (u32x *w0, u32x *w1, const u32x offset) -DECLSPEC void append_0x01_4x4_VV (u32x *w0, u32x *w1, u32x *w2, u32x *w3, const u32x offset) -DECLSPEC void append_0x06_2x4_VV (u32x *w0, u32x *w1, const u32x offset) -DECLSPEC void append_0x80_2x4_VV (u32x *w0, u32x *w1, const u32x offset) -DECLSPEC void append_0x80_4x4_VV (u32x *w0, u32x *w1, u32x *w2, u32x *w3, const u32x offset) -DECLSPEC void gpu_decompress_entry (__global pw_idx_t *pws_idx, __global u32 *pws_comp, pw_t *pw, const u64 gid) +DECLSPEC u32 l32_from_64_S (u64 a); +DECLSPEC u32 h32_from_64_S (u64 a); +DECLSPEC u64 hl32_to_64_S (const u32 a, const u32 b); +DECLSPEC u32x l32_from_64 (u64x a); +DECLSPEC u32x h32_from_64 (u64x a); +DECLSPEC u64x hl32_to_64 (const u32x a, const u32x b); +DECLSPEC u32 swap32_S (const u32 v); +DECLSPEC u64 swap64_S (const u64 v); +DECLSPEC u32 swap32_S (const u32 v); +DECLSPEC u64 swap64_S (const u64 v); +DECLSPEC u32 rotr32_S (const u32 a, const u32 n); +DECLSPEC u32 rotl32_S (const u32 a, const u32 n); +DECLSPEC u64 rotr64_S (const u64 a, const u32 n); +DECLSPEC u64 rotl64_S (const u64 a, const u32 n); +DECLSPEC u32x swap32 (const u32x v); +DECLSPEC u64x swap64 (const u64x v); +DECLSPEC u32x swap32 (const u32x v); +DECLSPEC u64x swap64 (const u64x v); +DECLSPEC u32x rotr32 (const u32x a, const u32 n); +DECLSPEC u32x rotl32 (const u32x a, const u32 n); +DECLSPEC u64x rotr64 (const u64x a, const u32 n); +DECLSPEC u64x rotl64 (const u64x a, const u32 n); +DECLSPEC u32x hc_bfe (const u32x a, const u32x b, const u32x c); +DECLSPEC u32 hc_bfe_S (const u32 a, const u32 b, const u32 c); +DECLSPEC u32x hc_bytealign_be (const u32x a, const u32x b, const u32 c); +DECLSPEC u32 hc_bytealign_be_S (const u32 a, const u32 b, const u32 c); +DECLSPEC u32x hc_bytealign (const u32x a, const u32x b, const u32 c); +DECLSPEC u32 hc_bytealign_S (const u32 a, const u32 b, const u32 c); +DECLSPEC u32x hc_byte_perm (const u32x a, const u32x b, const u32x c); +DECLSPEC u32 hc_byte_perm_S (const u32 a, const u32 b, const u32 c); +DECLSPEC u32x hc_add3 (const u32x a, const u32x b, const u32x c); +DECLSPEC u32 hc_add3_S (const u32 a, const u32 b, const u32 c); +DECLSPEC u32x hc_add3 (const u32x a, const u32x b, const u32x c); +DECLSPEC u32 hc_add3_S (const u32 a, const u32 b, const u32 c); +DECLSPEC u32x hc_lop_0x96 (const u32x a, const u32x b, const u32x c); +DECLSPEC u32 hc_lop_0x96_S (const u32 a, const u32 b, const u32 c); +DECLSPEC u32 swap32_S (const u32 v); +DECLSPEC u64 swap64_S (const u64 v); +DECLSPEC u32 rotr32_S (const u32 a, const u32 n); +DECLSPEC u32 rotl32_S (const u32 a, const u32 n); +DECLSPEC u64 rotr64_S (const u64 a, const u32 n); +DECLSPEC u64 rotl64_S (const u64 a, const u32 n); +DECLSPEC u32x swap32 (const u32x v); +DECLSPEC u64x swap64 (const u64x v); +DECLSPEC u32x rotr32 (const u32x a, const u32 n); +DECLSPEC u32x rotl32 (const u32x a, const u32 n); +DECLSPEC u64x rotr64 (const u64x a, const u32 n); +DECLSPEC u64x rotl64 (const u64x a, const u32 n); +DECLSPEC u32x hc_byte_perm (const u32x a, const u32x b, const u32x c); +DECLSPEC u32 hc_byte_perm_S (const u32 a, const u32 b, const u32 c); +DECLSPEC u32x hc_bfe (const u32x a, const u32x b, const u32x c); +DECLSPEC u32 hc_bfe_S (const u32 a, const u32 b, const u32 c); +DECLSPEC u32x hc_bytealign (const u32x a, const u32x b, const u32x c); +DECLSPEC u32 hc_bytealign_S (const u32 a, const u32 b, const u32 c); +DECLSPEC u32x hc_add3 (const u32x a, const u32x b, const u32x c); +DECLSPEC u32 hc_add3_S (const u32 a, const u32 b, const u32 c); +DECLSPEC u32x hc_lop_0x96 (const u32x a, const u32x b, const u32x c); +DECLSPEC u32 hc_lop_0x96_S (const u32 a, const u32 b, const u32 c); +DECLSPEC u32 swap32_S (const u32 v); +DECLSPEC u64 swap64_S (const u64 v); +DECLSPEC u32 rotr32_S (const u32 a, const u32 n); +DECLSPEC u32 rotl32_S (const u32 a, const u32 n); +DECLSPEC u64 rotr64_S (const u64 a, const u32 n); +DECLSPEC u64 rotl64_S (const u64 a, const u32 n); +DECLSPEC u32x swap32 (const u32x v); +DECLSPEC u64x swap64 (const u64x v); +DECLSPEC u32x rotr32 (const u32x a, const u32 n); +DECLSPEC u32x rotl32 (const u32x a, const u32 n); +DECLSPEC u64x rotr64 (const u64x a, const u32 n); +DECLSPEC u64x rotl64 (const u64x a, const u32 n); +DECLSPEC u32x hc_bfe (const u32x a, const u32x b, const u32x c); +DECLSPEC u32 hc_bfe_S (const u32 a, const u32 b, const u32 c); +DECLSPEC u32x hc_bytealign_be (const u32x a, const u32x b, const u32 c); +DECLSPEC u32 hc_bytealign_be_S (const u32 a, const u32 b, const u32 c); +DECLSPEC u32x hc_bytealign (const u32x a, const u32x b, const u32 c); +DECLSPEC u32 hc_bytealign_S (const u32 a, const u32 b, const u32 c); +DECLSPEC u32x hc_add3 (const u32x a, const u32x b, const u32x c); +DECLSPEC u32 hc_add3_S (const u32 a, const u32 b, const u32 c); +DECLSPEC u32x hc_lop_0x96 (const u32x a, const u32x b, const u32x c); +DECLSPEC u32 hc_lop_0x96_S (const u32 a, const u32 b, const u32 c); +DECLSPEC u8 v8a_from_v32_S (const u32 v32); +DECLSPEC u8 v8b_from_v32_S (const u32 v32); +DECLSPEC u8 v8c_from_v32_S (const u32 v32); +DECLSPEC u8 v8d_from_v32_S (const u32 v32); +DECLSPEC u16 v16a_from_v32_S (const u32 v32); +DECLSPEC u16 v16b_from_v32_S (const u32 v32); +DECLSPEC u32 v32_from_v16ab_S (const u16 v16a, const u16 v16b); +DECLSPEC u32 v32a_from_v64_S (const u64 v64); +DECLSPEC u32 v32b_from_v64_S (const u64 v64); +DECLSPEC u64 v64_from_v32ab_S (const u32 v32a, const u32 v32b); +DECLSPEC u32 unpack_v8a_from_v32_S (const u32 v32); +DECLSPEC u32 unpack_v8b_from_v32_S (const u32 v32); +DECLSPEC u32 unpack_v8c_from_v32_S (const u32 v32); +DECLSPEC u32 unpack_v8d_from_v32_S (const u32 v32); +DECLSPEC int ffz (const u32 v); +DECLSPEC int hash_comp (const u32 *d1, GLOBAL_AS const u32 *d2); +DECLSPEC int find_hash (const u32 *digest, const u32 digests_cnt, GLOBAL_AS const digest_t *digests_buf); +DECLSPEC u32 check_bitmap (GLOBAL_AS const u32 *bitmap, const u32 bitmap_mask, const u32 bitmap_shift, const u32 digest); +DECLSPEC u32 check (const u32 *digest, GLOBAL_AS const u32 *bitmap_s1_a, GLOBAL_AS const u32 *bitmap_s1_b, GLOBAL_AS const u32 *bitmap_s1_c, GLOBAL_AS const u32 *bitmap_s1_d, GLOBAL_AS const u32 *bitmap_s2_a, GLOBAL_AS const u32 *bitmap_s2_b, GLOBAL_AS const u32 *bitmap_s2_c, GLOBAL_AS const u32 *bitmap_s2_d, const u32 bitmap_mask, const u32 bitmap_shift1, const u32 bitmap_shift2); +DECLSPEC void mark_hash (GLOBAL_AS plain_t *plains_buf, GLOBAL_AS u32 *d_result, const u32 salt_pos, const u32 digests_cnt, const u32 digest_pos, const u32 hash_pos, const u64 gid, const u32 il_pos, const u32 extra1, const u32 extra2); +DECLSPEC int count_char (const u32 *buf, const int elems, const u32 c); +DECLSPEC float get_entropy (const u32 *buf, const int elems); +DECLSPEC int is_valid_hex_8 (const u8 v); +DECLSPEC int is_valid_hex_32 (const u32 v); +DECLSPEC int is_valid_base58_8 (const u8 v); +DECLSPEC int is_valid_base58_32 (const u32 v); +DECLSPEC int find_keyboard_layout_map (const u32 search, const int search_len, LOCAL_AS keyboard_layout_mapping_t *s_keyboard_layout_mapping_buf, const int keyboard_layout_mapping_cnt); +DECLSPEC int execute_keyboard_layout_mapping (u32 w0[4], u32 w1[4], u32 w2[4], u32 w3[4], const int pw_len, LOCAL_AS keyboard_layout_mapping_t *s_keyboard_layout_mapping_buf, const int keyboard_layout_mapping_cnt); +DECLSPEC void make_utf16be (const u32x *in, u32x *out1, u32x *out2); +DECLSPEC void make_utf16beN (const u32x *in, u32x *out1, u32x *out2); +DECLSPEC void make_utf16le (const u32x *in, u32x *out1, u32x *out2); +DECLSPEC void make_utf16leN (const u32x *in, u32x *out1, u32x *out2); +DECLSPEC void undo_utf16be (const u32x *in1, const u32x *in2, u32x *out); +DECLSPEC void undo_utf16le (const u32x *in1, const u32x *in2, u32x *out); +DECLSPEC void set_mark_1x4 (u32 *v, const u32 offset); +DECLSPEC void append_helper_1x4 (u32x *r, const u32 v, const u32 *m); +DECLSPEC void append_0x80_1x4 (u32x *w0, const u32 offset); +DECLSPEC void append_0x80_2x4 (u32x *w0, u32x *w1, const u32 offset); +DECLSPEC void append_0x80_3x4 (u32x *w0, u32x *w1, u32x *w2, const u32 offset); +DECLSPEC void append_0x80_4x4 (u32x *w0, u32x *w1, u32x *w2, u32x *w3, const u32 offset); +DECLSPEC void append_0x80_8x4 (u32x *w0, u32x *w1, u32x *w2, u32x *w3, u32x *w4, u32x *w5, u32x *w6, u32x *w7, const u32 offset); +DECLSPEC void append_0x80_1x16 (u32x *w, const u32 offset); +DECLSPEC void switch_buffer_by_offset_le (u32x *w0, u32x *w1, u32x *w2, u32x *w3, const u32 offset); +DECLSPEC void switch_buffer_by_offset_carry_le (u32x *w0, u32x *w1, u32x *w2, u32x *w3, u32x *c0, u32x *c1, u32x *c2, u32x *c3, const u32 offset); +DECLSPEC void switch_buffer_by_offset_be (u32x *w0, u32x *w1, u32x *w2, u32x *w3, const u32 offset); +DECLSPEC void switch_buffer_by_offset_carry_be (u32x *w0, u32x *w1, u32x *w2, u32x *w3, u32x *c0, u32x *c1, u32x *c2, u32x *c3, const u32 offset); +DECLSPEC void switch_buffer_by_offset_8x4_le (u32x *w0, u32x *w1, u32x *w2, u32x *w3, u32x *w4, u32x *w5, u32x *w6, u32x *w7, const u32 offset); +DECLSPEC void switch_buffer_by_offset_8x4_be (u32x *w0, u32x *w1, u32x *w2, u32x *w3, u32x *w4, u32x *w5, u32x *w6, u32x *w7, const u32 offset); +DECLSPEC void switch_buffer_by_offset_8x4_carry_be (u32x *w0, u32x *w1, u32x *w2, u32x *w3, u32x *w4, u32x *w5, u32x *w6, u32x *w7, u32x *c0, u32x *c1, u32x *c2, u32x *c3, u32x *c4, u32x *c5, u32x *c6, u32x *c7, const u32 offset); +DECLSPEC void switch_buffer_by_offset_1x64_le (u32x *w, const u32 offset); +DECLSPEC void switch_buffer_by_offset_1x64_be (u32x *w, const u32 offset); +DECLSPEC void truncate_block_4x4_le_S (u32 *w0, const u32 len); +DECLSPEC void truncate_block_4x4_be_S (u32 *w0, const u32 len); +DECLSPEC void truncate_block_16x4_le_S (u32 *w0, u32 *w1, u32 *w2, u32 *w3, const u32 len); +DECLSPEC void truncate_block_16x4_be_S (u32 *w0, u32 *w1, u32 *w2, u32 *w3, const u32 len); +DECLSPEC void set_mark_1x4_S (u32 *v, const u32 offset); +DECLSPEC void append_helper_1x4_S (u32 *r, const u32 v, const u32 *m); +DECLSPEC void append_0x01_2x4_S (u32 *w0, u32 *w1, const u32 offset); +DECLSPEC void append_0x06_2x4_S (u32 *w0, u32 *w1, const u32 offset); +DECLSPEC void append_0x01_4x4_S (u32 *w0, u32 *w1, u32 *w2, u32 *w3, const u32 offset); +DECLSPEC void append_0x80_1x4_S (u32 *w0, const u32 offset); +DECLSPEC void append_0x80_2x4_S (u32 *w0, u32 *w1, const u32 offset); +DECLSPEC void append_0x80_3x4_S (u32 *w0, u32 *w1, u32 *w2, const u32 offset); +DECLSPEC void append_0x80_4x4_S (u32 *w0, u32 *w1, u32 *w2, u32 *w3, const u32 offset); +DECLSPEC void append_0x80_8x4_S (u32 *w0, u32 *w1, u32 *w2, u32 *w3, u32 *w4, u32 *w5, u32 *w6, u32 *w7, const u32 offset); +DECLSPEC void make_utf16be_S (const u32 *in, u32 *out1, u32 *out2); +DECLSPEC void make_utf16le_S (const u32 *in, u32 *out1, u32 *out2); +DECLSPEC void undo_utf16be_S (const u32 *in1, const u32 *in2, u32 *out); +DECLSPEC void undo_utf16le_S (const u32 *in1, const u32 *in2, u32 *out); +DECLSPEC void switch_buffer_by_offset_le_S (u32 *w0, u32 *w1, u32 *w2, u32 *w3, const u32 offset); +DECLSPEC void switch_buffer_by_offset_carry_le_S (u32 *w0, u32 *w1, u32 *w2, u32 *w3, u32 *c0, u32 *c1, u32 *c2, u32 *c3, const u32 offset); +DECLSPEC void switch_buffer_by_offset_be_S (u32 *w0, u32 *w1, u32 *w2, u32 *w3, const u32 offset); +DECLSPEC void switch_buffer_by_offset_carry_be_S (u32 *w0, u32 *w1, u32 *w2, u32 *w3, u32 *c0, u32 *c1, u32 *c2, u32 *c3, const u32 offset); +DECLSPEC void switch_buffer_by_offset_8x4_le_S (u32 *w0, u32 *w1, u32 *w2, u32 *w3, u32 *w4, u32 *w5, u32 *w6, u32 *w7, const u32 offset); +DECLSPEC void switch_buffer_by_offset_8x4_be_S (u32 *w0, u32 *w1, u32 *w2, u32 *w3, u32 *w4, u32 *w5, u32 *w6, u32 *w7, const u32 offset); +DECLSPEC void switch_buffer_by_offset_8x4_carry_be_S (u32 *w0, u32 *w1, u32 *w2, u32 *w3, u32 *w4, u32 *w5, u32 *w6, u32 *w7, u32 *c0, u32 *c1, u32 *c2, u32 *c3, u32 *c4, u32 *c5, u32 *c6, u32 *c7, const u32 offset); +DECLSPEC void switch_buffer_by_offset_1x64_le_S (u32 *w, const u32 offset); +DECLSPEC void switch_buffer_by_offset_1x64_be_S (u32 *w, const u32 offset); +DECLSPEC void switch_buffer_by_offset_le_VV (u32x *w0, u32x *w1, u32x *w2, u32x *w3, const u32x offset); +DECLSPEC void switch_buffer_by_offset_8x4_le_VV (u32x *w0, u32x *w1, u32x *w2, u32x *w3, u32x *w4, u32x *w5, u32x *w6, u32x *w7, const u32x offset); +DECLSPEC void append_0x01_2x4_VV (u32x *w0, u32x *w1, const u32x offset); +DECLSPEC void append_0x01_4x4_VV (u32x *w0, u32x *w1, u32x *w2, u32x *w3, const u32x offset); +DECLSPEC void append_0x06_2x4_VV (u32x *w0, u32x *w1, const u32x offset); +DECLSPEC void append_0x80_2x4_VV (u32x *w0, u32x *w1, const u32x offset); +DECLSPEC void append_0x80_4x4_VV (u32x *w0, u32x *w1, u32x *w2, u32x *w3, const u32x offset); +DECLSPEC void gpu_decompress_entry (GLOBAL_AS pw_idx_t *pws_idx, GLOBAL_AS u32 *pws_comp, pw_t *pw, const u64 gid); diff --git a/OpenCL/inc_hash_md4.cl b/OpenCL/inc_hash_md4.cl index c93d5a4a1..003c24bbb 100644 --- a/OpenCL/inc_hash_md4.cl +++ b/OpenCL/inc_hash_md4.cl @@ -486,7 +486,7 @@ DECLSPEC void md4_update_utf16le_swap (md4_ctx_t *ctx, const u32 *w, const int l md4_update_64 (ctx, w0, w1, w2, w3, (len - pos1) * 2); } -DECLSPEC void md4_update_global (md4_ctx_t *ctx, const __global u32 *w, const int len) +DECLSPEC void md4_update_global (md4_ctx_t *ctx, const GLOBAL_AS u32 *w, const int len) { u32 w0[4]; u32 w1[4]; @@ -538,7 +538,7 @@ DECLSPEC void md4_update_global (md4_ctx_t *ctx, const __global u32 *w, const in md4_update_64 (ctx, w0, w1, w2, w3, len - pos1); } -DECLSPEC void md4_update_global_swap (md4_ctx_t *ctx, const __global u32 *w, const int len) +DECLSPEC void md4_update_global_swap (md4_ctx_t *ctx, const GLOBAL_AS u32 *w, const int len) { u32 w0[4]; u32 w1[4]; @@ -624,7 +624,7 @@ DECLSPEC void md4_update_global_swap (md4_ctx_t *ctx, const __global u32 *w, con md4_update_64 (ctx, w0, w1, w2, w3, len - pos1); } -DECLSPEC void md4_update_global_utf16le (md4_ctx_t *ctx, const __global u32 *w, const int len) +DECLSPEC void md4_update_global_utf16le (md4_ctx_t *ctx, const GLOBAL_AS u32 *w, const int len) { u32 w0[4]; u32 w1[4]; @@ -666,7 +666,7 @@ DECLSPEC void md4_update_global_utf16le (md4_ctx_t *ctx, const __global u32 *w, md4_update_64 (ctx, w0, w1, w2, w3, (len - pos1) * 2); } -DECLSPEC void md4_update_global_utf16le_swap (md4_ctx_t *ctx, const __global u32 *w, const int len) +DECLSPEC void md4_update_global_utf16le_swap (md4_ctx_t *ctx, const GLOBAL_AS u32 *w, const int len) { u32 w0[4]; u32 w1[4]; @@ -953,7 +953,7 @@ DECLSPEC void md4_hmac_init_swap (md4_hmac_ctx_t *ctx, const u32 *w, const int l md4_hmac_init_64 (ctx, w0, w1, w2, w3); } -DECLSPEC void md4_hmac_init_global (md4_hmac_ctx_t *ctx, __global const u32 *w, const int len) +DECLSPEC void md4_hmac_init_global (md4_hmac_ctx_t *ctx, GLOBAL_AS const u32 *w, const int len) { u32 w0[4]; u32 w1[4]; @@ -1010,7 +1010,7 @@ DECLSPEC void md4_hmac_init_global (md4_hmac_ctx_t *ctx, __global const u32 *w, md4_hmac_init_64 (ctx, w0, w1, w2, w3); } -DECLSPEC void md4_hmac_init_global_swap (md4_hmac_ctx_t *ctx, __global const u32 *w, const int len) +DECLSPEC void md4_hmac_init_global_swap (md4_hmac_ctx_t *ctx, GLOBAL_AS const u32 *w, const int len) { u32 w0[4]; u32 w1[4]; @@ -1092,22 +1092,22 @@ DECLSPEC void md4_hmac_update_utf16le_swap (md4_hmac_ctx_t *ctx, const u32 *w, c md4_update_utf16le_swap (&ctx->ipad, w, len); } -DECLSPEC void md4_hmac_update_global (md4_hmac_ctx_t *ctx, const __global u32 *w, const int len) +DECLSPEC void md4_hmac_update_global (md4_hmac_ctx_t *ctx, const GLOBAL_AS u32 *w, const int len) { md4_update_global (&ctx->ipad, w, len); } -DECLSPEC void md4_hmac_update_global_swap (md4_hmac_ctx_t *ctx, const __global u32 *w, const int len) +DECLSPEC void md4_hmac_update_global_swap (md4_hmac_ctx_t *ctx, const GLOBAL_AS u32 *w, const int len) { md4_update_global_swap (&ctx->ipad, w, len); } -DECLSPEC void md4_hmac_update_global_utf16le (md4_hmac_ctx_t *ctx, const __global u32 *w, const int len) +DECLSPEC void md4_hmac_update_global_utf16le (md4_hmac_ctx_t *ctx, const GLOBAL_AS u32 *w, const int len) { md4_update_global_utf16le (&ctx->ipad, w, len); } -DECLSPEC void md4_hmac_update_global_utf16le_swap (md4_hmac_ctx_t *ctx, const __global u32 *w, const int len) +DECLSPEC void md4_hmac_update_global_utf16le_swap (md4_hmac_ctx_t *ctx, const GLOBAL_AS u32 *w, const int len) { md4_update_global_utf16le_swap (&ctx->ipad, w, len); } diff --git a/OpenCL/inc_hash_md4.h b/OpenCL/inc_hash_md4.h index a944ce54d..34e68de70 100644 --- a/OpenCL/inc_hash_md4.h +++ b/OpenCL/inc_hash_md4.h @@ -3,44 +3,44 @@ * License.....: MIT */ -DECLSPEC void md4_transform (const u32 *w0, const u32 *w1, const u32 *w2, const u32 *w3, u32 *digest) -DECLSPEC void md4_init (md4_ctx_t *ctx) -DECLSPEC void md4_update_64 (md4_ctx_t *ctx, u32 *w0, u32 *w1, u32 *w2, u32 *w3, const int len) -DECLSPEC void md4_update (md4_ctx_t *ctx, const u32 *w, const int len) -DECLSPEC void md4_update_swap (md4_ctx_t *ctx, const u32 *w, const int len) -DECLSPEC void md4_update_utf16le (md4_ctx_t *ctx, const u32 *w, const int len) -DECLSPEC void md4_update_utf16le_swap (md4_ctx_t *ctx, const u32 *w, const int len) -DECLSPEC void md4_update_global (md4_ctx_t *ctx, const __global u32 *w, const int len) -DECLSPEC void md4_update_global_swap (md4_ctx_t *ctx, const __global u32 *w, const int len) -DECLSPEC void md4_update_global_utf16le (md4_ctx_t *ctx, const __global u32 *w, const int len) -DECLSPEC void md4_update_global_utf16le_swap (md4_ctx_t *ctx, const __global u32 *w, const int len) -DECLSPEC void md4_final (md4_ctx_t *ctx) -DECLSPEC void md4_hmac_init_64 (md4_hmac_ctx_t *ctx, const u32 *w0, const u32 *w1, const u32 *w2, const u32 *w3) -DECLSPEC void md4_hmac_init (md4_hmac_ctx_t *ctx, const u32 *w, const int len) -DECLSPEC void md4_hmac_init_swap (md4_hmac_ctx_t *ctx, const u32 *w, const int len) -DECLSPEC void md4_hmac_init_global (md4_hmac_ctx_t *ctx, __global const u32 *w, const int len) -DECLSPEC void md4_hmac_init_global_swap (md4_hmac_ctx_t *ctx, __global const u32 *w, const int len) -DECLSPEC void md4_hmac_update_64 (md4_hmac_ctx_t *ctx, u32 *w0, u32 *w1, u32 *w2, u32 *w3, const int len) -DECLSPEC void md4_hmac_update (md4_hmac_ctx_t *ctx, const u32 *w, const int len) -DECLSPEC void md4_hmac_update_swap (md4_hmac_ctx_t *ctx, const u32 *w, const int len) -DECLSPEC void md4_hmac_update_utf16le (md4_hmac_ctx_t *ctx, const u32 *w, const int len) -DECLSPEC void md4_hmac_update_utf16le_swap (md4_hmac_ctx_t *ctx, const u32 *w, const int len) -DECLSPEC void md4_hmac_update_global (md4_hmac_ctx_t *ctx, const __global u32 *w, const int len) -DECLSPEC void md4_hmac_update_global_swap (md4_hmac_ctx_t *ctx, const __global u32 *w, const int len) -DECLSPEC void md4_hmac_update_global_utf16le (md4_hmac_ctx_t *ctx, const __global u32 *w, const int len) -DECLSPEC void md4_hmac_update_global_utf16le_swap (md4_hmac_ctx_t *ctx, const __global u32 *w, const int len) -DECLSPEC void md4_hmac_final (md4_hmac_ctx_t *ctx) -DECLSPEC void md4_transform_vector (const u32x *w0, const u32x *w1, const u32x *w2, const u32x *w3, u32x *digest) -DECLSPEC void md4_init_vector (md4_ctx_vector_t *ctx) -DECLSPEC void md4_init_vector_from_scalar (md4_ctx_vector_t *ctx, md4_ctx_t *ctx0) -DECLSPEC void md4_update_vector_64 (md4_ctx_vector_t *ctx, u32x *w0, u32x *w1, u32x *w2, u32x *w3, const int len) -DECLSPEC void md4_update_vector (md4_ctx_vector_t *ctx, const u32x *w, const int len) -DECLSPEC void md4_update_vector_swap (md4_ctx_vector_t *ctx, const u32x *w, const int len) -DECLSPEC void md4_update_vector_utf16le (md4_ctx_vector_t *ctx, const u32x *w, const int len) -DECLSPEC void md4_update_vector_utf16le_swap (md4_ctx_vector_t *ctx, const u32x *w, const int len) -DECLSPEC void md4_final_vector (md4_ctx_vector_t *ctx) -DECLSPEC void md4_hmac_init_vector_64 (md4_hmac_ctx_vector_t *ctx, const u32x *w0, const u32x *w1, const u32x *w2, const u32x *w3) -DECLSPEC void md4_hmac_init_vector (md4_hmac_ctx_vector_t *ctx, const u32x *w, const int len) -DECLSPEC void md4_hmac_update_vector_64 (md4_hmac_ctx_vector_t *ctx, u32x *w0, u32x *w1, u32x *w2, u32x *w3, const int len) -DECLSPEC void md4_hmac_update_vector (md4_hmac_ctx_vector_t *ctx, const u32x *w, const int len) -DECLSPEC void md4_hmac_final_vector (md4_hmac_ctx_vector_t *ctx) +DECLSPEC void md4_transform (const u32 *w0, const u32 *w1, const u32 *w2, const u32 *w3, u32 *digest); +DECLSPEC void md4_init (md4_ctx_t *ctx); +DECLSPEC void md4_update_64 (md4_ctx_t *ctx, u32 *w0, u32 *w1, u32 *w2, u32 *w3, const int len); +DECLSPEC void md4_update (md4_ctx_t *ctx, const u32 *w, const int len); +DECLSPEC void md4_update_swap (md4_ctx_t *ctx, const u32 *w, const int len); +DECLSPEC void md4_update_utf16le (md4_ctx_t *ctx, const u32 *w, const int len); +DECLSPEC void md4_update_utf16le_swap (md4_ctx_t *ctx, const u32 *w, const int len); +DECLSPEC void md4_update_global (md4_ctx_t *ctx, const GLOBAL_AS u32 *w, const int len); +DECLSPEC void md4_update_global_swap (md4_ctx_t *ctx, const GLOBAL_AS u32 *w, const int len); +DECLSPEC void md4_update_global_utf16le (md4_ctx_t *ctx, const GLOBAL_AS u32 *w, const int len); +DECLSPEC void md4_update_global_utf16le_swap (md4_ctx_t *ctx, const GLOBAL_AS u32 *w, const int len); +DECLSPEC void md4_final (md4_ctx_t *ctx); +DECLSPEC void md4_hmac_init_64 (md4_hmac_ctx_t *ctx, const u32 *w0, const u32 *w1, const u32 *w2, const u32 *w3); +DECLSPEC void md4_hmac_init (md4_hmac_ctx_t *ctx, const u32 *w, const int len); +DECLSPEC void md4_hmac_init_swap (md4_hmac_ctx_t *ctx, const u32 *w, const int len); +DECLSPEC void md4_hmac_init_global (md4_hmac_ctx_t *ctx, GLOBAL_AS const u32 *w, const int len); +DECLSPEC void md4_hmac_init_global_swap (md4_hmac_ctx_t *ctx, GLOBAL_AS const u32 *w, const int len); +DECLSPEC void md4_hmac_update_64 (md4_hmac_ctx_t *ctx, u32 *w0, u32 *w1, u32 *w2, u32 *w3, const int len); +DECLSPEC void md4_hmac_update (md4_hmac_ctx_t *ctx, const u32 *w, const int len); +DECLSPEC void md4_hmac_update_swap (md4_hmac_ctx_t *ctx, const u32 *w, const int len); +DECLSPEC void md4_hmac_update_utf16le (md4_hmac_ctx_t *ctx, const u32 *w, const int len); +DECLSPEC void md4_hmac_update_utf16le_swap (md4_hmac_ctx_t *ctx, const u32 *w, const int len); +DECLSPEC void md4_hmac_update_global (md4_hmac_ctx_t *ctx, const GLOBAL_AS u32 *w, const int len); +DECLSPEC void md4_hmac_update_global_swap (md4_hmac_ctx_t *ctx, const GLOBAL_AS u32 *w, const int len); +DECLSPEC void md4_hmac_update_global_utf16le (md4_hmac_ctx_t *ctx, const GLOBAL_AS u32 *w, const int len); +DECLSPEC void md4_hmac_update_global_utf16le_swap (md4_hmac_ctx_t *ctx, const GLOBAL_AS u32 *w, const int len); +DECLSPEC void md4_hmac_final (md4_hmac_ctx_t *ctx); +DECLSPEC void md4_transform_vector (const u32x *w0, const u32x *w1, const u32x *w2, const u32x *w3, u32x *digest); +DECLSPEC void md4_init_vector (md4_ctx_vector_t *ctx); +DECLSPEC void md4_init_vector_from_scalar (md4_ctx_vector_t *ctx, md4_ctx_t *ctx0); +DECLSPEC void md4_update_vector_64 (md4_ctx_vector_t *ctx, u32x *w0, u32x *w1, u32x *w2, u32x *w3, const int len); +DECLSPEC void md4_update_vector (md4_ctx_vector_t *ctx, const u32x *w, const int len); +DECLSPEC void md4_update_vector_swap (md4_ctx_vector_t *ctx, const u32x *w, const int len); +DECLSPEC void md4_update_vector_utf16le (md4_ctx_vector_t *ctx, const u32x *w, const int len); +DECLSPEC void md4_update_vector_utf16le_swap (md4_ctx_vector_t *ctx, const u32x *w, const int len); +DECLSPEC void md4_final_vector (md4_ctx_vector_t *ctx); +DECLSPEC void md4_hmac_init_vector_64 (md4_hmac_ctx_vector_t *ctx, const u32x *w0, const u32x *w1, const u32x *w2, const u32x *w3); +DECLSPEC void md4_hmac_init_vector (md4_hmac_ctx_vector_t *ctx, const u32x *w, const int len); +DECLSPEC void md4_hmac_update_vector_64 (md4_hmac_ctx_vector_t *ctx, u32x *w0, u32x *w1, u32x *w2, u32x *w3, const int len); +DECLSPEC void md4_hmac_update_vector (md4_hmac_ctx_vector_t *ctx, const u32x *w, const int len); +DECLSPEC void md4_hmac_final_vector (md4_hmac_ctx_vector_t *ctx); diff --git a/OpenCL/inc_hash_md5.cl b/OpenCL/inc_hash_md5.cl index 1caaa585f..db9495c99 100644 --- a/OpenCL/inc_hash_md5.cl +++ b/OpenCL/inc_hash_md5.cl @@ -535,7 +535,7 @@ DECLSPEC void md5_update_utf16le_swap (md5_ctx_t *ctx, const u32 *w, const int l md5_update_64 (ctx, w0, w1, w2, w3, (len - pos1) * 2); } -DECLSPEC void md5_update_global (md5_ctx_t *ctx, const __global u32 *w, const int len) +DECLSPEC void md5_update_global (md5_ctx_t *ctx, const GLOBAL_AS u32 *w, const int len) { u32 w0[4]; u32 w1[4]; @@ -587,7 +587,7 @@ DECLSPEC void md5_update_global (md5_ctx_t *ctx, const __global u32 *w, const in md5_update_64 (ctx, w0, w1, w2, w3, len - pos1); } -DECLSPEC void md5_update_global_swap (md5_ctx_t *ctx, const __global u32 *w, const int len) +DECLSPEC void md5_update_global_swap (md5_ctx_t *ctx, const GLOBAL_AS u32 *w, const int len) { u32 w0[4]; u32 w1[4]; @@ -673,7 +673,7 @@ DECLSPEC void md5_update_global_swap (md5_ctx_t *ctx, const __global u32 *w, con md5_update_64 (ctx, w0, w1, w2, w3, len - pos1); } -DECLSPEC void md5_update_global_utf16le (md5_ctx_t *ctx, const __global u32 *w, const int len) +DECLSPEC void md5_update_global_utf16le (md5_ctx_t *ctx, const GLOBAL_AS u32 *w, const int len) { u32 w0[4]; u32 w1[4]; @@ -715,7 +715,7 @@ DECLSPEC void md5_update_global_utf16le (md5_ctx_t *ctx, const __global u32 *w, md5_update_64 (ctx, w0, w1, w2, w3, (len - pos1) * 2); } -DECLSPEC void md5_update_global_utf16le_swap (md5_ctx_t *ctx, const __global u32 *w, const int len) +DECLSPEC void md5_update_global_utf16le_swap (md5_ctx_t *ctx, const GLOBAL_AS u32 *w, const int len) { u32 w0[4]; u32 w1[4]; @@ -1002,7 +1002,7 @@ DECLSPEC void md5_hmac_init_swap (md5_hmac_ctx_t *ctx, const u32 *w, const int l md5_hmac_init_64 (ctx, w0, w1, w2, w3); } -DECLSPEC void md5_hmac_init_global (md5_hmac_ctx_t *ctx, __global const u32 *w, const int len) +DECLSPEC void md5_hmac_init_global (md5_hmac_ctx_t *ctx, GLOBAL_AS const u32 *w, const int len) { u32 w0[4]; u32 w1[4]; @@ -1059,7 +1059,7 @@ DECLSPEC void md5_hmac_init_global (md5_hmac_ctx_t *ctx, __global const u32 *w, md5_hmac_init_64 (ctx, w0, w1, w2, w3); } -DECLSPEC void md5_hmac_init_global_swap (md5_hmac_ctx_t *ctx, __global const u32 *w, const int len) +DECLSPEC void md5_hmac_init_global_swap (md5_hmac_ctx_t *ctx, GLOBAL_AS const u32 *w, const int len) { u32 w0[4]; u32 w1[4]; @@ -1141,22 +1141,22 @@ DECLSPEC void md5_hmac_update_utf16le_swap (md5_hmac_ctx_t *ctx, const u32 *w, c md5_update_utf16le_swap (&ctx->ipad, w, len); } -DECLSPEC void md5_hmac_update_global (md5_hmac_ctx_t *ctx, const __global u32 *w, const int len) +DECLSPEC void md5_hmac_update_global (md5_hmac_ctx_t *ctx, const GLOBAL_AS u32 *w, const int len) { md5_update_global (&ctx->ipad, w, len); } -DECLSPEC void md5_hmac_update_global_swap (md5_hmac_ctx_t *ctx, const __global u32 *w, const int len) +DECLSPEC void md5_hmac_update_global_swap (md5_hmac_ctx_t *ctx, const GLOBAL_AS u32 *w, const int len) { md5_update_global_swap (&ctx->ipad, w, len); } -DECLSPEC void md5_hmac_update_global_utf16le (md5_hmac_ctx_t *ctx, const __global u32 *w, const int len) +DECLSPEC void md5_hmac_update_global_utf16le (md5_hmac_ctx_t *ctx, const GLOBAL_AS u32 *w, const int len) { md5_update_global_utf16le (&ctx->ipad, w, len); } -DECLSPEC void md5_hmac_update_global_utf16le_swap (md5_hmac_ctx_t *ctx, const __global u32 *w, const int len) +DECLSPEC void md5_hmac_update_global_utf16le_swap (md5_hmac_ctx_t *ctx, const GLOBAL_AS u32 *w, const int len) { md5_update_global_utf16le_swap (&ctx->ipad, w, len); } diff --git a/OpenCL/inc_hash_md5.h b/OpenCL/inc_hash_md5.h index b7239d965..f04454346 100644 --- a/OpenCL/inc_hash_md5.h +++ b/OpenCL/inc_hash_md5.h @@ -3,44 +3,44 @@ * License.....: MIT */ -DECLSPEC void md5_transform (const u32 *w0, const u32 *w1, const u32 *w2, const u32 *w3, u32 *digest) -DECLSPEC void md5_init (md5_ctx_t *ctx) -DECLSPEC void md5_update_64 (md5_ctx_t *ctx, u32 *w0, u32 *w1, u32 *w2, u32 *w3, const int len) -DECLSPEC void md5_update (md5_ctx_t *ctx, const u32 *w, const int len) -DECLSPEC void md5_update_swap (md5_ctx_t *ctx, const u32 *w, const int len) -DECLSPEC void md5_update_utf16le (md5_ctx_t *ctx, const u32 *w, const int len) -DECLSPEC void md5_update_utf16le_swap (md5_ctx_t *ctx, const u32 *w, const int len) -DECLSPEC void md5_update_global (md5_ctx_t *ctx, const __global u32 *w, const int len) -DECLSPEC void md5_update_global_swap (md5_ctx_t *ctx, const __global u32 *w, const int len) -DECLSPEC void md5_update_global_utf16le (md5_ctx_t *ctx, const __global u32 *w, const int len) -DECLSPEC void md5_update_global_utf16le_swap (md5_ctx_t *ctx, const __global u32 *w, const int len) -DECLSPEC void md5_final (md5_ctx_t *ctx) -DECLSPEC void md5_hmac_init_64 (md5_hmac_ctx_t *ctx, const u32 *w0, const u32 *w1, const u32 *w2, const u32 *w3) -DECLSPEC void md5_hmac_init (md5_hmac_ctx_t *ctx, const u32 *w, const int len) -DECLSPEC void md5_hmac_init_swap (md5_hmac_ctx_t *ctx, const u32 *w, const int len) -DECLSPEC void md5_hmac_init_global (md5_hmac_ctx_t *ctx, __global const u32 *w, const int len) -DECLSPEC void md5_hmac_init_global_swap (md5_hmac_ctx_t *ctx, __global const u32 *w, const int len) -DECLSPEC void md5_hmac_update_64 (md5_hmac_ctx_t *ctx, u32 *w0, u32 *w1, u32 *w2, u32 *w3, const int len) -DECLSPEC void md5_hmac_update (md5_hmac_ctx_t *ctx, const u32 *w, const int len) -DECLSPEC void md5_hmac_update_swap (md5_hmac_ctx_t *ctx, const u32 *w, const int len) -DECLSPEC void md5_hmac_update_utf16le (md5_hmac_ctx_t *ctx, const u32 *w, const int len) -DECLSPEC void md5_hmac_update_utf16le_swap (md5_hmac_ctx_t *ctx, const u32 *w, const int len) -DECLSPEC void md5_hmac_update_global (md5_hmac_ctx_t *ctx, const __global u32 *w, const int len) -DECLSPEC void md5_hmac_update_global_swap (md5_hmac_ctx_t *ctx, const __global u32 *w, const int len) -DECLSPEC void md5_hmac_update_global_utf16le (md5_hmac_ctx_t *ctx, const __global u32 *w, const int len) -DECLSPEC void md5_hmac_update_global_utf16le_swap (md5_hmac_ctx_t *ctx, const __global u32 *w, const int len) -DECLSPEC void md5_hmac_final (md5_hmac_ctx_t *ctx) -DECLSPEC void md5_transform_vector (const u32x *w0, const u32x *w1, const u32x *w2, const u32x *w3, u32x *digest) -DECLSPEC void md5_init_vector (md5_ctx_vector_t *ctx) -DECLSPEC void md5_init_vector_from_scalar (md5_ctx_vector_t *ctx, md5_ctx_t *ctx0) -DECLSPEC void md5_update_vector_64 (md5_ctx_vector_t *ctx, u32x *w0, u32x *w1, u32x *w2, u32x *w3, const int len) -DECLSPEC void md5_update_vector (md5_ctx_vector_t *ctx, const u32x *w, const int len) -DECLSPEC void md5_update_vector_swap (md5_ctx_vector_t *ctx, const u32x *w, const int len) -DECLSPEC void md5_update_vector_utf16le (md5_ctx_vector_t *ctx, const u32x *w, const int len) -DECLSPEC void md5_update_vector_utf16le_swap (md5_ctx_vector_t *ctx, const u32x *w, const int len) -DECLSPEC void md5_final_vector (md5_ctx_vector_t *ctx) -DECLSPEC void md5_hmac_init_vector_64 (md5_hmac_ctx_vector_t *ctx, const u32x *w0, const u32x *w1, const u32x *w2, const u32x *w3) -DECLSPEC void md5_hmac_init_vector (md5_hmac_ctx_vector_t *ctx, const u32x *w, const int len) -DECLSPEC void md5_hmac_update_vector_64 (md5_hmac_ctx_vector_t *ctx, u32x *w0, u32x *w1, u32x *w2, u32x *w3, const int len) -DECLSPEC void md5_hmac_update_vector (md5_hmac_ctx_vector_t *ctx, const u32x *w, const int len) -DECLSPEC void md5_hmac_final_vector (md5_hmac_ctx_vector_t *ctx) +DECLSPEC void md5_transform (const u32 *w0, const u32 *w1, const u32 *w2, const u32 *w3, u32 *digest); +DECLSPEC void md5_init (md5_ctx_t *ctx); +DECLSPEC void md5_update_64 (md5_ctx_t *ctx, u32 *w0, u32 *w1, u32 *w2, u32 *w3, const int len); +DECLSPEC void md5_update (md5_ctx_t *ctx, const u32 *w, const int len); +DECLSPEC void md5_update_swap (md5_ctx_t *ctx, const u32 *w, const int len); +DECLSPEC void md5_update_utf16le (md5_ctx_t *ctx, const u32 *w, const int len); +DECLSPEC void md5_update_utf16le_swap (md5_ctx_t *ctx, const u32 *w, const int len); +DECLSPEC void md5_update_global (md5_ctx_t *ctx, const GLOBAL_AS u32 *w, const int len); +DECLSPEC void md5_update_global_swap (md5_ctx_t *ctx, const GLOBAL_AS u32 *w, const int len); +DECLSPEC void md5_update_global_utf16le (md5_ctx_t *ctx, const GLOBAL_AS u32 *w, const int len); +DECLSPEC void md5_update_global_utf16le_swap (md5_ctx_t *ctx, const GLOBAL_AS u32 *w, const int len); +DECLSPEC void md5_final (md5_ctx_t *ctx); +DECLSPEC void md5_hmac_init_64 (md5_hmac_ctx_t *ctx, const u32 *w0, const u32 *w1, const u32 *w2, const u32 *w3); +DECLSPEC void md5_hmac_init (md5_hmac_ctx_t *ctx, const u32 *w, const int len); +DECLSPEC void md5_hmac_init_swap (md5_hmac_ctx_t *ctx, const u32 *w, const int len); +DECLSPEC void md5_hmac_init_global (md5_hmac_ctx_t *ctx, GLOBAL_AS const u32 *w, const int len); +DECLSPEC void md5_hmac_init_global_swap (md5_hmac_ctx_t *ctx, GLOBAL_AS const u32 *w, const int len); +DECLSPEC void md5_hmac_update_64 (md5_hmac_ctx_t *ctx, u32 *w0, u32 *w1, u32 *w2, u32 *w3, const int len); +DECLSPEC void md5_hmac_update (md5_hmac_ctx_t *ctx, const u32 *w, const int len); +DECLSPEC void md5_hmac_update_swap (md5_hmac_ctx_t *ctx, const u32 *w, const int len); +DECLSPEC void md5_hmac_update_utf16le (md5_hmac_ctx_t *ctx, const u32 *w, const int len); +DECLSPEC void md5_hmac_update_utf16le_swap (md5_hmac_ctx_t *ctx, const u32 *w, const int len); +DECLSPEC void md5_hmac_update_global (md5_hmac_ctx_t *ctx, const GLOBAL_AS u32 *w, const int len); +DECLSPEC void md5_hmac_update_global_swap (md5_hmac_ctx_t *ctx, const GLOBAL_AS u32 *w, const int len); +DECLSPEC void md5_hmac_update_global_utf16le (md5_hmac_ctx_t *ctx, const GLOBAL_AS u32 *w, const int len); +DECLSPEC void md5_hmac_update_global_utf16le_swap (md5_hmac_ctx_t *ctx, const GLOBAL_AS u32 *w, const int len); +DECLSPEC void md5_hmac_final (md5_hmac_ctx_t *ctx); +DECLSPEC void md5_transform_vector (const u32x *w0, const u32x *w1, const u32x *w2, const u32x *w3, u32x *digest); +DECLSPEC void md5_init_vector (md5_ctx_vector_t *ctx); +DECLSPEC void md5_init_vector_from_scalar (md5_ctx_vector_t *ctx, md5_ctx_t *ctx0); +DECLSPEC void md5_update_vector_64 (md5_ctx_vector_t *ctx, u32x *w0, u32x *w1, u32x *w2, u32x *w3, const int len); +DECLSPEC void md5_update_vector (md5_ctx_vector_t *ctx, const u32x *w, const int len); +DECLSPEC void md5_update_vector_swap (md5_ctx_vector_t *ctx, const u32x *w, const int len); +DECLSPEC void md5_update_vector_utf16le (md5_ctx_vector_t *ctx, const u32x *w, const int len); +DECLSPEC void md5_update_vector_utf16le_swap (md5_ctx_vector_t *ctx, const u32x *w, const int len); +DECLSPEC void md5_final_vector (md5_ctx_vector_t *ctx); +DECLSPEC void md5_hmac_init_vector_64 (md5_hmac_ctx_vector_t *ctx, const u32x *w0, const u32x *w1, const u32x *w2, const u32x *w3); +DECLSPEC void md5_hmac_init_vector (md5_hmac_ctx_vector_t *ctx, const u32x *w, const int len); +DECLSPEC void md5_hmac_update_vector_64 (md5_hmac_ctx_vector_t *ctx, u32x *w0, u32x *w1, u32x *w2, u32x *w3, const int len); +DECLSPEC void md5_hmac_update_vector (md5_hmac_ctx_vector_t *ctx, const u32x *w, const int len); +DECLSPEC void md5_hmac_final_vector (md5_hmac_ctx_vector_t *ctx); diff --git a/OpenCL/inc_hash_ripemd160.cl b/OpenCL/inc_hash_ripemd160.cl index c68db8425..fcdeeecbc 100644 --- a/OpenCL/inc_hash_ripemd160.cl +++ b/OpenCL/inc_hash_ripemd160.cl @@ -644,7 +644,7 @@ DECLSPEC void ripemd160_update_utf16le_swap (ripemd160_ctx_t *ctx, const u32 *w, ripemd160_update_64 (ctx, w0, w1, w2, w3, (len - pos1) * 2); } -DECLSPEC void ripemd160_update_global (ripemd160_ctx_t *ctx, const __global u32 *w, const int len) +DECLSPEC void ripemd160_update_global (ripemd160_ctx_t *ctx, const GLOBAL_AS u32 *w, const int len) { u32 w0[4]; u32 w1[4]; @@ -696,7 +696,7 @@ DECLSPEC void ripemd160_update_global (ripemd160_ctx_t *ctx, const __global u32 ripemd160_update_64 (ctx, w0, w1, w2, w3, len - pos1); } -DECLSPEC void ripemd160_update_global_swap (ripemd160_ctx_t *ctx, const __global u32 *w, const int len) +DECLSPEC void ripemd160_update_global_swap (ripemd160_ctx_t *ctx, const GLOBAL_AS u32 *w, const int len) { u32 w0[4]; u32 w1[4]; @@ -782,7 +782,7 @@ DECLSPEC void ripemd160_update_global_swap (ripemd160_ctx_t *ctx, const __global ripemd160_update_64 (ctx, w0, w1, w2, w3, len - pos1); } -DECLSPEC void ripemd160_update_global_utf16le (ripemd160_ctx_t *ctx, const __global u32 *w, const int len) +DECLSPEC void ripemd160_update_global_utf16le (ripemd160_ctx_t *ctx, const GLOBAL_AS u32 *w, const int len) { u32 w0[4]; u32 w1[4]; @@ -824,7 +824,7 @@ DECLSPEC void ripemd160_update_global_utf16le (ripemd160_ctx_t *ctx, const __glo ripemd160_update_64 (ctx, w0, w1, w2, w3, (len - pos1) * 2); } -DECLSPEC void ripemd160_update_global_utf16le_swap (ripemd160_ctx_t *ctx, const __global u32 *w, const int len) +DECLSPEC void ripemd160_update_global_utf16le_swap (ripemd160_ctx_t *ctx, const GLOBAL_AS u32 *w, const int len) { u32 w0[4]; u32 w1[4]; @@ -1111,7 +1111,7 @@ DECLSPEC void ripemd160_hmac_init_swap (ripemd160_hmac_ctx_t *ctx, const u32 *w, ripemd160_hmac_init_64 (ctx, w0, w1, w2, w3); } -DECLSPEC void ripemd160_hmac_init_global (ripemd160_hmac_ctx_t *ctx, __global const u32 *w, const int len) +DECLSPEC void ripemd160_hmac_init_global (ripemd160_hmac_ctx_t *ctx, GLOBAL_AS const u32 *w, const int len) { u32 w0[4]; u32 w1[4]; @@ -1168,7 +1168,7 @@ DECLSPEC void ripemd160_hmac_init_global (ripemd160_hmac_ctx_t *ctx, __global co ripemd160_hmac_init_64 (ctx, w0, w1, w2, w3); } -DECLSPEC void ripemd160_hmac_init_global_swap (ripemd160_hmac_ctx_t *ctx, __global const u32 *w, const int len) +DECLSPEC void ripemd160_hmac_init_global_swap (ripemd160_hmac_ctx_t *ctx, GLOBAL_AS const u32 *w, const int len) { u32 w0[4]; u32 w1[4]; @@ -1250,22 +1250,22 @@ DECLSPEC void ripemd160_hmac_update_utf16le_swap (ripemd160_hmac_ctx_t *ctx, con ripemd160_update_utf16le_swap (&ctx->ipad, w, len); } -DECLSPEC void ripemd160_hmac_update_global (ripemd160_hmac_ctx_t *ctx, const __global u32 *w, const int len) +DECLSPEC void ripemd160_hmac_update_global (ripemd160_hmac_ctx_t *ctx, const GLOBAL_AS u32 *w, const int len) { ripemd160_update_global (&ctx->ipad, w, len); } -DECLSPEC void ripemd160_hmac_update_global_swap (ripemd160_hmac_ctx_t *ctx, const __global u32 *w, const int len) +DECLSPEC void ripemd160_hmac_update_global_swap (ripemd160_hmac_ctx_t *ctx, const GLOBAL_AS u32 *w, const int len) { ripemd160_update_global_swap (&ctx->ipad, w, len); } -DECLSPEC void ripemd160_hmac_update_global_utf16le (ripemd160_hmac_ctx_t *ctx, const __global u32 *w, const int len) +DECLSPEC void ripemd160_hmac_update_global_utf16le (ripemd160_hmac_ctx_t *ctx, const GLOBAL_AS u32 *w, const int len) { ripemd160_update_global_utf16le (&ctx->ipad, w, len); } -DECLSPEC void ripemd160_hmac_update_global_utf16le_swap (ripemd160_hmac_ctx_t *ctx, const __global u32 *w, const int len) +DECLSPEC void ripemd160_hmac_update_global_utf16le_swap (ripemd160_hmac_ctx_t *ctx, const GLOBAL_AS u32 *w, const int len) { ripemd160_update_global_utf16le_swap (&ctx->ipad, w, len); } diff --git a/OpenCL/inc_hash_ripemd160.h b/OpenCL/inc_hash_ripemd160.h index ab2d590e4..87bed30ce 100644 --- a/OpenCL/inc_hash_ripemd160.h +++ b/OpenCL/inc_hash_ripemd160.h @@ -3,44 +3,44 @@ * License.....: MIT */ -DECLSPEC void ripemd160_transform (const u32 *w0, const u32 *w1, const u32 *w2, const u32 *w3, u32 *digest) -DECLSPEC void ripemd160_init (ripemd160_ctx_t *ctx) -DECLSPEC void ripemd160_update_64 (ripemd160_ctx_t *ctx, u32 *w0, u32 *w1, u32 *w2, u32 *w3, const int len) -DECLSPEC void ripemd160_update (ripemd160_ctx_t *ctx, const u32 *w, const int len) -DECLSPEC void ripemd160_update_swap (ripemd160_ctx_t *ctx, const u32 *w, const int len) -DECLSPEC void ripemd160_update_utf16le (ripemd160_ctx_t *ctx, const u32 *w, const int len) -DECLSPEC void ripemd160_update_utf16le_swap (ripemd160_ctx_t *ctx, const u32 *w, const int len) -DECLSPEC void ripemd160_update_global (ripemd160_ctx_t *ctx, const __global u32 *w, const int len) -DECLSPEC void ripemd160_update_global_swap (ripemd160_ctx_t *ctx, const __global u32 *w, const int len) -DECLSPEC void ripemd160_update_global_utf16le (ripemd160_ctx_t *ctx, const __global u32 *w, const int len) -DECLSPEC void ripemd160_update_global_utf16le_swap (ripemd160_ctx_t *ctx, const __global u32 *w, const int len) -DECLSPEC void ripemd160_final (ripemd160_ctx_t *ctx) -DECLSPEC void ripemd160_hmac_init_64 (ripemd160_hmac_ctx_t *ctx, const u32 *w0, const u32 *w1, const u32 *w2, const u32 *w3) -DECLSPEC void ripemd160_hmac_init (ripemd160_hmac_ctx_t *ctx, const u32 *w, const int len) -DECLSPEC void ripemd160_hmac_init_swap (ripemd160_hmac_ctx_t *ctx, const u32 *w, const int len) -DECLSPEC void ripemd160_hmac_init_global (ripemd160_hmac_ctx_t *ctx, __global const u32 *w, const int len) -DECLSPEC void ripemd160_hmac_init_global_swap (ripemd160_hmac_ctx_t *ctx, __global const u32 *w, const int len) -DECLSPEC void ripemd160_hmac_update_64 (ripemd160_hmac_ctx_t *ctx, u32 *w0, u32 *w1, u32 *w2, u32 *w3, const int len) -DECLSPEC void ripemd160_hmac_update (ripemd160_hmac_ctx_t *ctx, const u32 *w, const int len) -DECLSPEC void ripemd160_hmac_update_swap (ripemd160_hmac_ctx_t *ctx, const u32 *w, const int len) -DECLSPEC void ripemd160_hmac_update_utf16le (ripemd160_hmac_ctx_t *ctx, const u32 *w, const int len) -DECLSPEC void ripemd160_hmac_update_utf16le_swap (ripemd160_hmac_ctx_t *ctx, const u32 *w, const int len) -DECLSPEC void ripemd160_hmac_update_global (ripemd160_hmac_ctx_t *ctx, const __global u32 *w, const int len) -DECLSPEC void ripemd160_hmac_update_global_swap (ripemd160_hmac_ctx_t *ctx, const __global u32 *w, const int len) -DECLSPEC void ripemd160_hmac_update_global_utf16le (ripemd160_hmac_ctx_t *ctx, const __global u32 *w, const int len) -DECLSPEC void ripemd160_hmac_update_global_utf16le_swap (ripemd160_hmac_ctx_t *ctx, const __global u32 *w, const int len) -DECLSPEC void ripemd160_hmac_final (ripemd160_hmac_ctx_t *ctx) -DECLSPEC void ripemd160_transform_vector (const u32x *w0, const u32x *w1, const u32x *w2, const u32x *w3, u32x *digest) -DECLSPEC void ripemd160_init_vector (ripemd160_ctx_vector_t *ctx) -DECLSPEC void ripemd160_init_vector_from_scalar (ripemd160_ctx_vector_t *ctx, ripemd160_ctx_t *ctx0) -DECLSPEC void ripemd160_update_vector_64 (ripemd160_ctx_vector_t *ctx, u32x *w0, u32x *w1, u32x *w2, u32x *w3, const int len) -DECLSPEC void ripemd160_update_vector (ripemd160_ctx_vector_t *ctx, const u32x *w, const int len) -DECLSPEC void ripemd160_update_vector_swap (ripemd160_ctx_vector_t *ctx, const u32x *w, const int len) -DECLSPEC void ripemd160_update_vector_utf16le (ripemd160_ctx_vector_t *ctx, const u32x *w, const int len) -DECLSPEC void ripemd160_update_vector_utf16le_swap (ripemd160_ctx_vector_t *ctx, const u32x *w, const int len) -DECLSPEC void ripemd160_final_vector (ripemd160_ctx_vector_t *ctx) -DECLSPEC void ripemd160_hmac_init_vector_64 (ripemd160_hmac_ctx_vector_t *ctx, const u32x *w0, const u32x *w1, const u32x *w2, const u32x *w3) -DECLSPEC void ripemd160_hmac_init_vector (ripemd160_hmac_ctx_vector_t *ctx, const u32x *w, const int len) -DECLSPEC void ripemd160_hmac_update_vector_64 (ripemd160_hmac_ctx_vector_t *ctx, u32x *w0, u32x *w1, u32x *w2, u32x *w3, const int len) -DECLSPEC void ripemd160_hmac_update_vector (ripemd160_hmac_ctx_vector_t *ctx, const u32x *w, const int len) -DECLSPEC void ripemd160_hmac_final_vector (ripemd160_hmac_ctx_vector_t *ctx) +DECLSPEC void ripemd160_transform (const u32 *w0, const u32 *w1, const u32 *w2, const u32 *w3, u32 *digest); +DECLSPEC void ripemd160_init (ripemd160_ctx_t *ctx); +DECLSPEC void ripemd160_update_64 (ripemd160_ctx_t *ctx, u32 *w0, u32 *w1, u32 *w2, u32 *w3, const int len); +DECLSPEC void ripemd160_update (ripemd160_ctx_t *ctx, const u32 *w, const int len); +DECLSPEC void ripemd160_update_swap (ripemd160_ctx_t *ctx, const u32 *w, const int len); +DECLSPEC void ripemd160_update_utf16le (ripemd160_ctx_t *ctx, const u32 *w, const int len); +DECLSPEC void ripemd160_update_utf16le_swap (ripemd160_ctx_t *ctx, const u32 *w, const int len); +DECLSPEC void ripemd160_update_global (ripemd160_ctx_t *ctx, const GLOBAL_AS u32 *w, const int len); +DECLSPEC void ripemd160_update_global_swap (ripemd160_ctx_t *ctx, const GLOBAL_AS u32 *w, const int len); +DECLSPEC void ripemd160_update_global_utf16le (ripemd160_ctx_t *ctx, const GLOBAL_AS u32 *w, const int len); +DECLSPEC void ripemd160_update_global_utf16le_swap (ripemd160_ctx_t *ctx, const GLOBAL_AS u32 *w, const int len); +DECLSPEC void ripemd160_final (ripemd160_ctx_t *ctx); +DECLSPEC void ripemd160_hmac_init_64 (ripemd160_hmac_ctx_t *ctx, const u32 *w0, const u32 *w1, const u32 *w2, const u32 *w3); +DECLSPEC void ripemd160_hmac_init (ripemd160_hmac_ctx_t *ctx, const u32 *w, const int len); +DECLSPEC void ripemd160_hmac_init_swap (ripemd160_hmac_ctx_t *ctx, const u32 *w, const int len); +DECLSPEC void ripemd160_hmac_init_global (ripemd160_hmac_ctx_t *ctx, GLOBAL_AS const u32 *w, const int len); +DECLSPEC void ripemd160_hmac_init_global_swap (ripemd160_hmac_ctx_t *ctx, GLOBAL_AS const u32 *w, const int len); +DECLSPEC void ripemd160_hmac_update_64 (ripemd160_hmac_ctx_t *ctx, u32 *w0, u32 *w1, u32 *w2, u32 *w3, const int len); +DECLSPEC void ripemd160_hmac_update (ripemd160_hmac_ctx_t *ctx, const u32 *w, const int len); +DECLSPEC void ripemd160_hmac_update_swap (ripemd160_hmac_ctx_t *ctx, const u32 *w, const int len); +DECLSPEC void ripemd160_hmac_update_utf16le (ripemd160_hmac_ctx_t *ctx, const u32 *w, const int len); +DECLSPEC void ripemd160_hmac_update_utf16le_swap (ripemd160_hmac_ctx_t *ctx, const u32 *w, const int len); +DECLSPEC void ripemd160_hmac_update_global (ripemd160_hmac_ctx_t *ctx, const GLOBAL_AS u32 *w, const int len); +DECLSPEC void ripemd160_hmac_update_global_swap (ripemd160_hmac_ctx_t *ctx, const GLOBAL_AS u32 *w, const int len); +DECLSPEC void ripemd160_hmac_update_global_utf16le (ripemd160_hmac_ctx_t *ctx, const GLOBAL_AS u32 *w, const int len); +DECLSPEC void ripemd160_hmac_update_global_utf16le_swap (ripemd160_hmac_ctx_t *ctx, const GLOBAL_AS u32 *w, const int len); +DECLSPEC void ripemd160_hmac_final (ripemd160_hmac_ctx_t *ctx); +DECLSPEC void ripemd160_transform_vector (const u32x *w0, const u32x *w1, const u32x *w2, const u32x *w3, u32x *digest); +DECLSPEC void ripemd160_init_vector (ripemd160_ctx_vector_t *ctx); +DECLSPEC void ripemd160_init_vector_from_scalar (ripemd160_ctx_vector_t *ctx, ripemd160_ctx_t *ctx0); +DECLSPEC void ripemd160_update_vector_64 (ripemd160_ctx_vector_t *ctx, u32x *w0, u32x *w1, u32x *w2, u32x *w3, const int len); +DECLSPEC void ripemd160_update_vector (ripemd160_ctx_vector_t *ctx, const u32x *w, const int len); +DECLSPEC void ripemd160_update_vector_swap (ripemd160_ctx_vector_t *ctx, const u32x *w, const int len); +DECLSPEC void ripemd160_update_vector_utf16le (ripemd160_ctx_vector_t *ctx, const u32x *w, const int len); +DECLSPEC void ripemd160_update_vector_utf16le_swap (ripemd160_ctx_vector_t *ctx, const u32x *w, const int len); +DECLSPEC void ripemd160_final_vector (ripemd160_ctx_vector_t *ctx); +DECLSPEC void ripemd160_hmac_init_vector_64 (ripemd160_hmac_ctx_vector_t *ctx, const u32x *w0, const u32x *w1, const u32x *w2, const u32x *w3); +DECLSPEC void ripemd160_hmac_init_vector (ripemd160_hmac_ctx_vector_t *ctx, const u32x *w, const int len); +DECLSPEC void ripemd160_hmac_update_vector_64 (ripemd160_hmac_ctx_vector_t *ctx, u32x *w0, u32x *w1, u32x *w2, u32x *w3, const int len); +DECLSPEC void ripemd160_hmac_update_vector (ripemd160_hmac_ctx_vector_t *ctx, const u32x *w, const int len); +DECLSPEC void ripemd160_hmac_final_vector (ripemd160_hmac_ctx_vector_t *ctx); diff --git a/OpenCL/inc_hash_sha1.cl b/OpenCL/inc_hash_sha1.cl index 5604746d8..05f81a8ce 100644 --- a/OpenCL/inc_hash_sha1.cl +++ b/OpenCL/inc_hash_sha1.cl @@ -678,7 +678,7 @@ DECLSPEC void sha1_update_utf16be_swap (sha1_ctx_t *ctx, const u32 *w, const int sha1_update_64 (ctx, w0, w1, w2, w3, (len - pos1) * 2); } -DECLSPEC void sha1_update_global (sha1_ctx_t *ctx, const __global u32 *w, const int len) +DECLSPEC void sha1_update_global (sha1_ctx_t *ctx, const GLOBAL_AS u32 *w, const int len) { u32 w0[4]; u32 w1[4]; @@ -730,7 +730,7 @@ DECLSPEC void sha1_update_global (sha1_ctx_t *ctx, const __global u32 *w, const sha1_update_64 (ctx, w0, w1, w2, w3, len - pos1); } -DECLSPEC void sha1_update_global_swap (sha1_ctx_t *ctx, const __global u32 *w, const int len) +DECLSPEC void sha1_update_global_swap (sha1_ctx_t *ctx, const GLOBAL_AS u32 *w, const int len) { u32 w0[4]; u32 w1[4]; @@ -816,7 +816,7 @@ DECLSPEC void sha1_update_global_swap (sha1_ctx_t *ctx, const __global u32 *w, c sha1_update_64 (ctx, w0, w1, w2, w3, len - pos1); } -DECLSPEC void sha1_update_global_utf16le (sha1_ctx_t *ctx, const __global u32 *w, const int len) +DECLSPEC void sha1_update_global_utf16le (sha1_ctx_t *ctx, const GLOBAL_AS u32 *w, const int len) { u32 w0[4]; u32 w1[4]; @@ -858,7 +858,7 @@ DECLSPEC void sha1_update_global_utf16le (sha1_ctx_t *ctx, const __global u32 *w sha1_update_64 (ctx, w0, w1, w2, w3, (len - pos1) * 2); } -DECLSPEC void sha1_update_global_utf16le_swap (sha1_ctx_t *ctx, const __global u32 *w, const int len) +DECLSPEC void sha1_update_global_utf16le_swap (sha1_ctx_t *ctx, const GLOBAL_AS u32 *w, const int len) { u32 w0[4]; u32 w1[4]; @@ -934,7 +934,7 @@ DECLSPEC void sha1_update_global_utf16le_swap (sha1_ctx_t *ctx, const __global u sha1_update_64 (ctx, w0, w1, w2, w3, (len - pos1) * 2); } -DECLSPEC void sha1_update_global_utf16be (sha1_ctx_t *ctx, const __global u32 *w, const int len) +DECLSPEC void sha1_update_global_utf16be (sha1_ctx_t *ctx, const GLOBAL_AS u32 *w, const int len) { u32 w0[4]; u32 w1[4]; @@ -976,7 +976,7 @@ DECLSPEC void sha1_update_global_utf16be (sha1_ctx_t *ctx, const __global u32 *w sha1_update_64 (ctx, w0, w1, w2, w3, (len - pos1) * 2); } -DECLSPEC void sha1_update_global_utf16be_swap (sha1_ctx_t *ctx, const __global u32 *w, const int len) +DECLSPEC void sha1_update_global_utf16be_swap (sha1_ctx_t *ctx, const GLOBAL_AS u32 *w, const int len) { u32 w0[4]; u32 w1[4]; @@ -1263,7 +1263,7 @@ DECLSPEC void sha1_hmac_init_swap (sha1_hmac_ctx_t *ctx, const u32 *w, const int sha1_hmac_init_64 (ctx, w0, w1, w2, w3); } -DECLSPEC void sha1_hmac_init_global (sha1_hmac_ctx_t *ctx, __global const u32 *w, const int len) +DECLSPEC void sha1_hmac_init_global (sha1_hmac_ctx_t *ctx, GLOBAL_AS const u32 *w, const int len) { u32 w0[4]; u32 w1[4]; @@ -1320,7 +1320,7 @@ DECLSPEC void sha1_hmac_init_global (sha1_hmac_ctx_t *ctx, __global const u32 *w sha1_hmac_init_64 (ctx, w0, w1, w2, w3); } -DECLSPEC void sha1_hmac_init_global_swap (sha1_hmac_ctx_t *ctx, __global const u32 *w, const int len) +DECLSPEC void sha1_hmac_init_global_swap (sha1_hmac_ctx_t *ctx, GLOBAL_AS const u32 *w, const int len) { u32 w0[4]; u32 w1[4]; @@ -1402,22 +1402,22 @@ DECLSPEC void sha1_hmac_update_utf16le_swap (sha1_hmac_ctx_t *ctx, const u32 *w, sha1_update_utf16le_swap (&ctx->ipad, w, len); } -DECLSPEC void sha1_hmac_update_global (sha1_hmac_ctx_t *ctx, const __global u32 *w, const int len) +DECLSPEC void sha1_hmac_update_global (sha1_hmac_ctx_t *ctx, const GLOBAL_AS u32 *w, const int len) { sha1_update_global (&ctx->ipad, w, len); } -DECLSPEC void sha1_hmac_update_global_swap (sha1_hmac_ctx_t *ctx, const __global u32 *w, const int len) +DECLSPEC void sha1_hmac_update_global_swap (sha1_hmac_ctx_t *ctx, const GLOBAL_AS u32 *w, const int len) { sha1_update_global_swap (&ctx->ipad, w, len); } -DECLSPEC void sha1_hmac_update_global_utf16le (sha1_hmac_ctx_t *ctx, const __global u32 *w, const int len) +DECLSPEC void sha1_hmac_update_global_utf16le (sha1_hmac_ctx_t *ctx, const GLOBAL_AS u32 *w, const int len) { sha1_update_global_utf16le (&ctx->ipad, w, len); } -DECLSPEC void sha1_hmac_update_global_utf16le_swap (sha1_hmac_ctx_t *ctx, const __global u32 *w, const int len) +DECLSPEC void sha1_hmac_update_global_utf16le_swap (sha1_hmac_ctx_t *ctx, const GLOBAL_AS u32 *w, const int len) { sha1_update_global_utf16le_swap (&ctx->ipad, w, len); } diff --git a/OpenCL/inc_hash_sha1.h b/OpenCL/inc_hash_sha1.h index a574c5f60..a60bb5a11 100644 --- a/OpenCL/inc_hash_sha1.h +++ b/OpenCL/inc_hash_sha1.h @@ -3,50 +3,50 @@ * License.....: MIT */ -DECLSPEC void sha1_transform (const u32 *w0, const u32 *w1, const u32 *w2, const u32 *w3, u32 *digest) -DECLSPEC void sha1_init (sha1_ctx_t *ctx) -DECLSPEC void sha1_update_64 (sha1_ctx_t *ctx, u32 *w0, u32 *w1, u32 *w2, u32 *w3, const int len) -DECLSPEC void sha1_update (sha1_ctx_t *ctx, const u32 *w, const int len) -DECLSPEC void sha1_update_swap (sha1_ctx_t *ctx, const u32 *w, const int len) -DECLSPEC void sha1_update_utf16le (sha1_ctx_t *ctx, const u32 *w, const int len) -DECLSPEC void sha1_update_utf16le_swap (sha1_ctx_t *ctx, const u32 *w, const int len) -DECLSPEC void sha1_update_utf16be (sha1_ctx_t *ctx, const u32 *w, const int len) -DECLSPEC void sha1_update_utf16be_swap (sha1_ctx_t *ctx, const u32 *w, const int len) -DECLSPEC void sha1_update_global (sha1_ctx_t *ctx, const __global u32 *w, const int len) -DECLSPEC void sha1_update_global_swap (sha1_ctx_t *ctx, const __global u32 *w, const int len) -DECLSPEC void sha1_update_global_utf16le (sha1_ctx_t *ctx, const __global u32 *w, const int len) -DECLSPEC void sha1_update_global_utf16le_swap (sha1_ctx_t *ctx, const __global u32 *w, const int len) -DECLSPEC void sha1_update_global_utf16be (sha1_ctx_t *ctx, const __global u32 *w, const int len) -DECLSPEC void sha1_update_global_utf16be_swap (sha1_ctx_t *ctx, const __global u32 *w, const int len) -DECLSPEC void sha1_final (sha1_ctx_t *ctx) -DECLSPEC void sha1_hmac_init_64 (sha1_hmac_ctx_t *ctx, const u32 *w0, const u32 *w1, const u32 *w2, const u32 *w3) -DECLSPEC void sha1_hmac_init (sha1_hmac_ctx_t *ctx, const u32 *w, const int len) -DECLSPEC void sha1_hmac_init_swap (sha1_hmac_ctx_t *ctx, const u32 *w, const int len) -DECLSPEC void sha1_hmac_init_global (sha1_hmac_ctx_t *ctx, __global const u32 *w, const int len) -DECLSPEC void sha1_hmac_init_global_swap (sha1_hmac_ctx_t *ctx, __global const u32 *w, const int len) -DECLSPEC void sha1_hmac_update_64 (sha1_hmac_ctx_t *ctx, u32 *w0, u32 *w1, u32 *w2, u32 *w3, const int len) -DECLSPEC void sha1_hmac_update (sha1_hmac_ctx_t *ctx, const u32 *w, const int len) -DECLSPEC void sha1_hmac_update_swap (sha1_hmac_ctx_t *ctx, const u32 *w, const int len) -DECLSPEC void sha1_hmac_update_utf16le (sha1_hmac_ctx_t *ctx, const u32 *w, const int len) -DECLSPEC void sha1_hmac_update_utf16le_swap (sha1_hmac_ctx_t *ctx, const u32 *w, const int len) -DECLSPEC void sha1_hmac_update_global (sha1_hmac_ctx_t *ctx, const __global u32 *w, const int len) -DECLSPEC void sha1_hmac_update_global_swap (sha1_hmac_ctx_t *ctx, const __global u32 *w, const int len) -DECLSPEC void sha1_hmac_update_global_utf16le (sha1_hmac_ctx_t *ctx, const __global u32 *w, const int len) -DECLSPEC void sha1_hmac_update_global_utf16le_swap (sha1_hmac_ctx_t *ctx, const __global u32 *w, const int len) -DECLSPEC void sha1_hmac_final (sha1_hmac_ctx_t *ctx) -DECLSPEC void sha1_transform_vector (const u32x *w0, const u32x *w1, const u32x *w2, const u32x *w3, u32x *digest) -DECLSPEC void sha1_init_vector (sha1_ctx_vector_t *ctx) -DECLSPEC void sha1_init_vector_from_scalar (sha1_ctx_vector_t *ctx, sha1_ctx_t *ctx0) -DECLSPEC void sha1_update_vector_64 (sha1_ctx_vector_t *ctx, u32x *w0, u32x *w1, u32x *w2, u32x *w3, const int len) -DECLSPEC void sha1_update_vector (sha1_ctx_vector_t *ctx, const u32x *w, const int len) -DECLSPEC void sha1_update_vector_swap (sha1_ctx_vector_t *ctx, const u32x *w, const int len) -DECLSPEC void sha1_update_vector_utf16le (sha1_ctx_vector_t *ctx, const u32x *w, const int len) -DECLSPEC void sha1_update_vector_utf16le_swap (sha1_ctx_vector_t *ctx, const u32x *w, const int len) -DECLSPEC void sha1_update_vector_utf16leN (sha1_ctx_vector_t *ctx, const u32x *w, const int len) -DECLSPEC void sha1_update_vector_utf16beN (sha1_ctx_vector_t *ctx, const u32x *w, const int len) -DECLSPEC void sha1_final_vector (sha1_ctx_vector_t *ctx) -DECLSPEC void sha1_hmac_init_vector_64 (sha1_hmac_ctx_vector_t *ctx, const u32x *w0, const u32x *w1, const u32x *w2, const u32x *w3) -DECLSPEC void sha1_hmac_init_vector (sha1_hmac_ctx_vector_t *ctx, const u32x *w, const int len) -DECLSPEC void sha1_hmac_update_vector_64 (sha1_hmac_ctx_vector_t *ctx, u32x *w0, u32x *w1, u32x *w2, u32x *w3, const int len) -DECLSPEC void sha1_hmac_update_vector (sha1_hmac_ctx_vector_t *ctx, const u32x *w, const int len) -DECLSPEC void sha1_hmac_final_vector (sha1_hmac_ctx_vector_t *ctx) +DECLSPEC void sha1_transform (const u32 *w0, const u32 *w1, const u32 *w2, const u32 *w3, u32 *digest); +DECLSPEC void sha1_init (sha1_ctx_t *ctx); +DECLSPEC void sha1_update_64 (sha1_ctx_t *ctx, u32 *w0, u32 *w1, u32 *w2, u32 *w3, const int len); +DECLSPEC void sha1_update (sha1_ctx_t *ctx, const u32 *w, const int len); +DECLSPEC void sha1_update_swap (sha1_ctx_t *ctx, const u32 *w, const int len); +DECLSPEC void sha1_update_utf16le (sha1_ctx_t *ctx, const u32 *w, const int len); +DECLSPEC void sha1_update_utf16le_swap (sha1_ctx_t *ctx, const u32 *w, const int len); +DECLSPEC void sha1_update_utf16be (sha1_ctx_t *ctx, const u32 *w, const int len); +DECLSPEC void sha1_update_utf16be_swap (sha1_ctx_t *ctx, const u32 *w, const int len); +DECLSPEC void sha1_update_global (sha1_ctx_t *ctx, const GLOBAL_AS u32 *w, const int len); +DECLSPEC void sha1_update_global_swap (sha1_ctx_t *ctx, const GLOBAL_AS u32 *w, const int len); +DECLSPEC void sha1_update_global_utf16le (sha1_ctx_t *ctx, const GLOBAL_AS u32 *w, const int len); +DECLSPEC void sha1_update_global_utf16le_swap (sha1_ctx_t *ctx, const GLOBAL_AS u32 *w, const int len); +DECLSPEC void sha1_update_global_utf16be (sha1_ctx_t *ctx, const GLOBAL_AS u32 *w, const int len); +DECLSPEC void sha1_update_global_utf16be_swap (sha1_ctx_t *ctx, const GLOBAL_AS u32 *w, const int len); +DECLSPEC void sha1_final (sha1_ctx_t *ctx); +DECLSPEC void sha1_hmac_init_64 (sha1_hmac_ctx_t *ctx, const u32 *w0, const u32 *w1, const u32 *w2, const u32 *w3); +DECLSPEC void sha1_hmac_init (sha1_hmac_ctx_t *ctx, const u32 *w, const int len); +DECLSPEC void sha1_hmac_init_swap (sha1_hmac_ctx_t *ctx, const u32 *w, const int len); +DECLSPEC void sha1_hmac_init_global (sha1_hmac_ctx_t *ctx, GLOBAL_AS const u32 *w, const int len); +DECLSPEC void sha1_hmac_init_global_swap (sha1_hmac_ctx_t *ctx, GLOBAL_AS const u32 *w, const int len); +DECLSPEC void sha1_hmac_update_64 (sha1_hmac_ctx_t *ctx, u32 *w0, u32 *w1, u32 *w2, u32 *w3, const int len); +DECLSPEC void sha1_hmac_update (sha1_hmac_ctx_t *ctx, const u32 *w, const int len); +DECLSPEC void sha1_hmac_update_swap (sha1_hmac_ctx_t *ctx, const u32 *w, const int len); +DECLSPEC void sha1_hmac_update_utf16le (sha1_hmac_ctx_t *ctx, const u32 *w, const int len); +DECLSPEC void sha1_hmac_update_utf16le_swap (sha1_hmac_ctx_t *ctx, const u32 *w, const int len); +DECLSPEC void sha1_hmac_update_global (sha1_hmac_ctx_t *ctx, const GLOBAL_AS u32 *w, const int len); +DECLSPEC void sha1_hmac_update_global_swap (sha1_hmac_ctx_t *ctx, const GLOBAL_AS u32 *w, const int len); +DECLSPEC void sha1_hmac_update_global_utf16le (sha1_hmac_ctx_t *ctx, const GLOBAL_AS u32 *w, const int len); +DECLSPEC void sha1_hmac_update_global_utf16le_swap (sha1_hmac_ctx_t *ctx, const GLOBAL_AS u32 *w, const int len); +DECLSPEC void sha1_hmac_final (sha1_hmac_ctx_t *ctx); +DECLSPEC void sha1_transform_vector (const u32x *w0, const u32x *w1, const u32x *w2, const u32x *w3, u32x *digest); +DECLSPEC void sha1_init_vector (sha1_ctx_vector_t *ctx); +DECLSPEC void sha1_init_vector_from_scalar (sha1_ctx_vector_t *ctx, sha1_ctx_t *ctx0); +DECLSPEC void sha1_update_vector_64 (sha1_ctx_vector_t *ctx, u32x *w0, u32x *w1, u32x *w2, u32x *w3, const int len); +DECLSPEC void sha1_update_vector (sha1_ctx_vector_t *ctx, const u32x *w, const int len); +DECLSPEC void sha1_update_vector_swap (sha1_ctx_vector_t *ctx, const u32x *w, const int len); +DECLSPEC void sha1_update_vector_utf16le (sha1_ctx_vector_t *ctx, const u32x *w, const int len); +DECLSPEC void sha1_update_vector_utf16le_swap (sha1_ctx_vector_t *ctx, const u32x *w, const int len); +DECLSPEC void sha1_update_vector_utf16leN (sha1_ctx_vector_t *ctx, const u32x *w, const int len); +DECLSPEC void sha1_update_vector_utf16beN (sha1_ctx_vector_t *ctx, const u32x *w, const int len); +DECLSPEC void sha1_final_vector (sha1_ctx_vector_t *ctx); +DECLSPEC void sha1_hmac_init_vector_64 (sha1_hmac_ctx_vector_t *ctx, const u32x *w0, const u32x *w1, const u32x *w2, const u32x *w3); +DECLSPEC void sha1_hmac_init_vector (sha1_hmac_ctx_vector_t *ctx, const u32x *w, const int len); +DECLSPEC void sha1_hmac_update_vector_64 (sha1_hmac_ctx_vector_t *ctx, u32x *w0, u32x *w1, u32x *w2, u32x *w3, const int len); +DECLSPEC void sha1_hmac_update_vector (sha1_hmac_ctx_vector_t *ctx, const u32x *w, const int len); +DECLSPEC void sha1_hmac_final_vector (sha1_hmac_ctx_vector_t *ctx); diff --git a/OpenCL/inc_hash_sha224.cl b/OpenCL/inc_hash_sha224.cl index 66cf223fa..830357a1a 100644 --- a/OpenCL/inc_hash_sha224.cl +++ b/OpenCL/inc_hash_sha224.cl @@ -56,7 +56,7 @@ } #define SHA256_EXPAND(x,y,z,w) (SHA256_S1 (x) + y + SHA256_S0 (z) + w) -__constant u32a k_sha224[64] = +CONSTANT_AS u32a k_sha224[64] = { SHA256C00, SHA256C01, SHA256C02, SHA256C03, SHA256C04, SHA256C05, SHA256C06, SHA256C07, @@ -541,7 +541,7 @@ DECLSPEC void sha224_update_utf16le_swap (sha224_ctx_t *ctx, const u32 *w, const sha224_update_64 (ctx, w0, w1, w2, w3, (len - pos1) * 2); } -DECLSPEC void sha224_update_global (sha224_ctx_t *ctx, const __global u32 *w, const int len) +DECLSPEC void sha224_update_global (sha224_ctx_t *ctx, const GLOBAL_AS u32 *w, const int len) { u32 w0[4]; u32 w1[4]; @@ -593,7 +593,7 @@ DECLSPEC void sha224_update_global (sha224_ctx_t *ctx, const __global u32 *w, co sha224_update_64 (ctx, w0, w1, w2, w3, len - pos1); } -DECLSPEC void sha224_update_global_swap (sha224_ctx_t *ctx, const __global u32 *w, const int len) +DECLSPEC void sha224_update_global_swap (sha224_ctx_t *ctx, const GLOBAL_AS u32 *w, const int len) { u32 w0[4]; u32 w1[4]; @@ -679,7 +679,7 @@ DECLSPEC void sha224_update_global_swap (sha224_ctx_t *ctx, const __global u32 * sha224_update_64 (ctx, w0, w1, w2, w3, len - pos1); } -DECLSPEC void sha224_update_global_utf16le (sha224_ctx_t *ctx, const __global u32 *w, const int len) +DECLSPEC void sha224_update_global_utf16le (sha224_ctx_t *ctx, const GLOBAL_AS u32 *w, const int len) { u32 w0[4]; u32 w1[4]; @@ -721,7 +721,7 @@ DECLSPEC void sha224_update_global_utf16le (sha224_ctx_t *ctx, const __global u3 sha224_update_64 (ctx, w0, w1, w2, w3, (len - pos1) * 2); } -DECLSPEC void sha224_update_global_utf16le_swap (sha224_ctx_t *ctx, const __global u32 *w, const int len) +DECLSPEC void sha224_update_global_utf16le_swap (sha224_ctx_t *ctx, const GLOBAL_AS u32 *w, const int len) { u32 w0[4]; u32 w1[4]; @@ -1008,7 +1008,7 @@ DECLSPEC void sha224_hmac_init_swap (sha224_hmac_ctx_t *ctx, const u32 *w, const sha224_hmac_init_64 (ctx, w0, w1, w2, w3); } -DECLSPEC void sha224_hmac_init_global (sha224_hmac_ctx_t *ctx, __global const u32 *w, const int len) +DECLSPEC void sha224_hmac_init_global (sha224_hmac_ctx_t *ctx, GLOBAL_AS const u32 *w, const int len) { u32 w0[4]; u32 w1[4]; @@ -1065,7 +1065,7 @@ DECLSPEC void sha224_hmac_init_global (sha224_hmac_ctx_t *ctx, __global const u3 sha224_hmac_init_64 (ctx, w0, w1, w2, w3); } -DECLSPEC void sha224_hmac_init_global_swap (sha224_hmac_ctx_t *ctx, __global const u32 *w, const int len) +DECLSPEC void sha224_hmac_init_global_swap (sha224_hmac_ctx_t *ctx, GLOBAL_AS const u32 *w, const int len) { u32 w0[4]; u32 w1[4]; @@ -1147,22 +1147,22 @@ DECLSPEC void sha224_hmac_update_utf16le_swap (sha224_hmac_ctx_t *ctx, const u32 sha224_update_utf16le_swap (&ctx->ipad, w, len); } -DECLSPEC void sha224_hmac_update_global (sha224_hmac_ctx_t *ctx, const __global u32 *w, const int len) +DECLSPEC void sha224_hmac_update_global (sha224_hmac_ctx_t *ctx, const GLOBAL_AS u32 *w, const int len) { sha224_update_global (&ctx->ipad, w, len); } -DECLSPEC void sha224_hmac_update_global_swap (sha224_hmac_ctx_t *ctx, const __global u32 *w, const int len) +DECLSPEC void sha224_hmac_update_global_swap (sha224_hmac_ctx_t *ctx, const GLOBAL_AS u32 *w, const int len) { sha224_update_global_swap (&ctx->ipad, w, len); } -DECLSPEC void sha224_hmac_update_global_utf16le (sha224_hmac_ctx_t *ctx, const __global u32 *w, const int len) +DECLSPEC void sha224_hmac_update_global_utf16le (sha224_hmac_ctx_t *ctx, const GLOBAL_AS u32 *w, const int len) { sha224_update_global_utf16le (&ctx->ipad, w, len); } -DECLSPEC void sha224_hmac_update_global_utf16le_swap (sha224_hmac_ctx_t *ctx, const __global u32 *w, const int len) +DECLSPEC void sha224_hmac_update_global_utf16le_swap (sha224_hmac_ctx_t *ctx, const GLOBAL_AS u32 *w, const int len) { sha224_update_global_utf16le_swap (&ctx->ipad, w, len); } diff --git a/OpenCL/inc_hash_sha224.h b/OpenCL/inc_hash_sha224.h index 42980578f..7c2ffad17 100644 --- a/OpenCL/inc_hash_sha224.h +++ b/OpenCL/inc_hash_sha224.h @@ -3,45 +3,45 @@ * License.....: MIT */ -DECLSPEC void sha224_transform (const u32 *w0, const u32 *w1, const u32 *w2, const u32 *w3, u32 *digest) -DECLSPEC void sha224_init (sha224_ctx_t *ctx) -DECLSPEC void sha224_update_64 (sha224_ctx_t *ctx, u32 *w0, u32 *w1, u32 *w2, u32 *w3, const int len) -DECLSPEC void sha224_update (sha224_ctx_t *ctx, const u32 *w, const int len) -DECLSPEC void sha224_update_swap (sha224_ctx_t *ctx, const u32 *w, const int len) -DECLSPEC void sha224_update_utf16le (sha224_ctx_t *ctx, const u32 *w, const int len) -DECLSPEC void sha224_update_utf16le_swap (sha224_ctx_t *ctx, const u32 *w, const int len) -DECLSPEC void sha224_update_global (sha224_ctx_t *ctx, const __global u32 *w, const int len) -DECLSPEC void sha224_update_global_swap (sha224_ctx_t *ctx, const __global u32 *w, const int len) -DECLSPEC void sha224_update_global_utf16le (sha224_ctx_t *ctx, const __global u32 *w, const int len) -DECLSPEC void sha224_update_global_utf16le_swap (sha224_ctx_t *ctx, const __global u32 *w, const int len) -DECLSPEC void sha224_final (sha224_ctx_t *ctx) -DECLSPEC void sha224_hmac_init_64 (sha224_hmac_ctx_t *ctx, const u32 *w0, const u32 *w1, const u32 *w2, const u32 *w3) -DECLSPEC void sha224_hmac_init (sha224_hmac_ctx_t *ctx, const u32 *w, const int len) -DECLSPEC void sha224_hmac_init_swap (sha224_hmac_ctx_t *ctx, const u32 *w, const int len) -DECLSPEC void sha224_hmac_init_global (sha224_hmac_ctx_t *ctx, __global const u32 *w, const int len) -DECLSPEC void sha224_hmac_init_global_swap (sha224_hmac_ctx_t *ctx, __global const u32 *w, const int len) -DECLSPEC void sha224_hmac_update_64 (sha224_hmac_ctx_t *ctx, u32 *w0, u32 *w1, u32 *w2, u32 *w3, const int len) -DECLSPEC void sha224_hmac_update (sha224_hmac_ctx_t *ctx, const u32 *w, const int len) -DECLSPEC void sha224_hmac_update_swap (sha224_hmac_ctx_t *ctx, const u32 *w, const int len) -DECLSPEC void sha224_hmac_update_utf16le (sha224_hmac_ctx_t *ctx, const u32 *w, const int len) -DECLSPEC void sha224_hmac_update_utf16le_swap (sha224_hmac_ctx_t *ctx, const u32 *w, const int len) -DECLSPEC void sha224_hmac_update_global (sha224_hmac_ctx_t *ctx, const __global u32 *w, const int len) -DECLSPEC void sha224_hmac_update_global_swap (sha224_hmac_ctx_t *ctx, const __global u32 *w, const int len) -DECLSPEC void sha224_hmac_update_global_utf16le (sha224_hmac_ctx_t *ctx, const __global u32 *w, const int len) -DECLSPEC void sha224_hmac_update_global_utf16le_swap (sha224_hmac_ctx_t *ctx, const __global u32 *w, const int len) -DECLSPEC void sha224_hmac_final (sha224_hmac_ctx_t *ctx) -DECLSPEC void sha224_transform_vector (const u32x *w0, const u32x *w1, const u32x *w2, const u32x *w3, u32x *digest) -DECLSPEC void sha224_init_vector (sha224_ctx_vector_t *ctx) -DECLSPEC void sha224_init_vector_from_scalar (sha224_ctx_vector_t *ctx, sha224_ctx_t *ctx0) -DECLSPEC void sha224_update_vector_64 (sha224_ctx_vector_t *ctx, u32x *w0, u32x *w1, u32x *w2, u32x *w3, const int len) -DECLSPEC void sha224_update_vector (sha224_ctx_vector_t *ctx, const u32x *w, const int len) -DECLSPEC void sha224_update_vector_swap (sha224_ctx_vector_t *ctx, const u32x *w, const int len) -DECLSPEC void sha224_update_vector_utf16le (sha224_ctx_vector_t *ctx, const u32x *w, const int len) -DECLSPEC void sha224_update_vector_utf16le_swap (sha224_ctx_vector_t *ctx, const u32x *w, const int len) -DECLSPEC void sha224_update_vector_utf16beN (sha224_ctx_vector_t *ctx, const u32x *w, const int len) -DECLSPEC void sha224_final_vector (sha224_ctx_vector_t *ctx) -DECLSPEC void sha224_hmac_init_vector_64 (sha224_hmac_ctx_vector_t *ctx, const u32x *w0, const u32x *w1, const u32x *w2, const u32x *w3) -DECLSPEC void sha224_hmac_init_vector (sha224_hmac_ctx_vector_t *ctx, const u32x *w, const int len) -DECLSPEC void sha224_hmac_update_vector_64 (sha224_hmac_ctx_vector_t *ctx, u32x *w0, u32x *w1, u32x *w2, u32x *w3, const int len) -DECLSPEC void sha224_hmac_update_vector (sha224_hmac_ctx_vector_t *ctx, const u32x *w, const int len) -DECLSPEC void sha224_hmac_final_vector (sha224_hmac_ctx_vector_t *ctx) +DECLSPEC void sha224_transform (const u32 *w0, const u32 *w1, const u32 *w2, const u32 *w3, u32 *digest); +DECLSPEC void sha224_init (sha224_ctx_t *ctx); +DECLSPEC void sha224_update_64 (sha224_ctx_t *ctx, u32 *w0, u32 *w1, u32 *w2, u32 *w3, const int len); +DECLSPEC void sha224_update (sha224_ctx_t *ctx, const u32 *w, const int len); +DECLSPEC void sha224_update_swap (sha224_ctx_t *ctx, const u32 *w, const int len); +DECLSPEC void sha224_update_utf16le (sha224_ctx_t *ctx, const u32 *w, const int len); +DECLSPEC void sha224_update_utf16le_swap (sha224_ctx_t *ctx, const u32 *w, const int len); +DECLSPEC void sha224_update_global (sha224_ctx_t *ctx, const GLOBAL_AS u32 *w, const int len); +DECLSPEC void sha224_update_global_swap (sha224_ctx_t *ctx, const GLOBAL_AS u32 *w, const int len); +DECLSPEC void sha224_update_global_utf16le (sha224_ctx_t *ctx, const GLOBAL_AS u32 *w, const int len); +DECLSPEC void sha224_update_global_utf16le_swap (sha224_ctx_t *ctx, const GLOBAL_AS u32 *w, const int len); +DECLSPEC void sha224_final (sha224_ctx_t *ctx); +DECLSPEC void sha224_hmac_init_64 (sha224_hmac_ctx_t *ctx, const u32 *w0, const u32 *w1, const u32 *w2, const u32 *w3); +DECLSPEC void sha224_hmac_init (sha224_hmac_ctx_t *ctx, const u32 *w, const int len); +DECLSPEC void sha224_hmac_init_swap (sha224_hmac_ctx_t *ctx, const u32 *w, const int len); +DECLSPEC void sha224_hmac_init_global (sha224_hmac_ctx_t *ctx, GLOBAL_AS const u32 *w, const int len); +DECLSPEC void sha224_hmac_init_global_swap (sha224_hmac_ctx_t *ctx, GLOBAL_AS const u32 *w, const int len); +DECLSPEC void sha224_hmac_update_64 (sha224_hmac_ctx_t *ctx, u32 *w0, u32 *w1, u32 *w2, u32 *w3, const int len); +DECLSPEC void sha224_hmac_update (sha224_hmac_ctx_t *ctx, const u32 *w, const int len); +DECLSPEC void sha224_hmac_update_swap (sha224_hmac_ctx_t *ctx, const u32 *w, const int len); +DECLSPEC void sha224_hmac_update_utf16le (sha224_hmac_ctx_t *ctx, const u32 *w, const int len); +DECLSPEC void sha224_hmac_update_utf16le_swap (sha224_hmac_ctx_t *ctx, const u32 *w, const int len); +DECLSPEC void sha224_hmac_update_global (sha224_hmac_ctx_t *ctx, const GLOBAL_AS u32 *w, const int len); +DECLSPEC void sha224_hmac_update_global_swap (sha224_hmac_ctx_t *ctx, const GLOBAL_AS u32 *w, const int len); +DECLSPEC void sha224_hmac_update_global_utf16le (sha224_hmac_ctx_t *ctx, const GLOBAL_AS u32 *w, const int len); +DECLSPEC void sha224_hmac_update_global_utf16le_swap (sha224_hmac_ctx_t *ctx, const GLOBAL_AS u32 *w, const int len); +DECLSPEC void sha224_hmac_final (sha224_hmac_ctx_t *ctx); +DECLSPEC void sha224_transform_vector (const u32x *w0, const u32x *w1, const u32x *w2, const u32x *w3, u32x *digest); +DECLSPEC void sha224_init_vector (sha224_ctx_vector_t *ctx); +DECLSPEC void sha224_init_vector_from_scalar (sha224_ctx_vector_t *ctx, sha224_ctx_t *ctx0); +DECLSPEC void sha224_update_vector_64 (sha224_ctx_vector_t *ctx, u32x *w0, u32x *w1, u32x *w2, u32x *w3, const int len); +DECLSPEC void sha224_update_vector (sha224_ctx_vector_t *ctx, const u32x *w, const int len); +DECLSPEC void sha224_update_vector_swap (sha224_ctx_vector_t *ctx, const u32x *w, const int len); +DECLSPEC void sha224_update_vector_utf16le (sha224_ctx_vector_t *ctx, const u32x *w, const int len); +DECLSPEC void sha224_update_vector_utf16le_swap (sha224_ctx_vector_t *ctx, const u32x *w, const int len); +DECLSPEC void sha224_update_vector_utf16beN (sha224_ctx_vector_t *ctx, const u32x *w, const int len); +DECLSPEC void sha224_final_vector (sha224_ctx_vector_t *ctx); +DECLSPEC void sha224_hmac_init_vector_64 (sha224_hmac_ctx_vector_t *ctx, const u32x *w0, const u32x *w1, const u32x *w2, const u32x *w3); +DECLSPEC void sha224_hmac_init_vector (sha224_hmac_ctx_vector_t *ctx, const u32x *w, const int len); +DECLSPEC void sha224_hmac_update_vector_64 (sha224_hmac_ctx_vector_t *ctx, u32x *w0, u32x *w1, u32x *w2, u32x *w3, const int len); +DECLSPEC void sha224_hmac_update_vector (sha224_hmac_ctx_vector_t *ctx, const u32x *w, const int len); +DECLSPEC void sha224_hmac_final_vector (sha224_hmac_ctx_vector_t *ctx); diff --git a/OpenCL/inc_hash_sha256.cl b/OpenCL/inc_hash_sha256.cl index 5aa0a7a39..79b8514ef 100644 --- a/OpenCL/inc_hash_sha256.cl +++ b/OpenCL/inc_hash_sha256.cl @@ -57,7 +57,7 @@ #define SHA256_EXPAND(x,y,z,w) (SHA256_S1 (x) + y + SHA256_S0 (z) + w) -__constant u32a k_sha256[64] = +CONSTANT_AS u32a k_sha256[64] = { SHA256C00, SHA256C01, SHA256C02, SHA256C03, SHA256C04, SHA256C05, SHA256C06, SHA256C07, @@ -542,7 +542,7 @@ DECLSPEC void sha256_update_utf16le_swap (sha256_ctx_t *ctx, const u32 *w, const sha256_update_64 (ctx, w0, w1, w2, w3, (len - pos1) * 2); } -DECLSPEC void sha256_update_global (sha256_ctx_t *ctx, const __global u32 *w, const int len) +DECLSPEC void sha256_update_global (sha256_ctx_t *ctx, const GLOBAL_AS u32 *w, const int len) { u32 w0[4]; u32 w1[4]; @@ -594,7 +594,7 @@ DECLSPEC void sha256_update_global (sha256_ctx_t *ctx, const __global u32 *w, co sha256_update_64 (ctx, w0, w1, w2, w3, len - pos1); } -DECLSPEC void sha256_update_global_swap (sha256_ctx_t *ctx, const __global u32 *w, const int len) +DECLSPEC void sha256_update_global_swap (sha256_ctx_t *ctx, const GLOBAL_AS u32 *w, const int len) { u32 w0[4]; u32 w1[4]; @@ -680,7 +680,7 @@ DECLSPEC void sha256_update_global_swap (sha256_ctx_t *ctx, const __global u32 * sha256_update_64 (ctx, w0, w1, w2, w3, len - pos1); } -DECLSPEC void sha256_update_global_utf16le (sha256_ctx_t *ctx, const __global u32 *w, const int len) +DECLSPEC void sha256_update_global_utf16le (sha256_ctx_t *ctx, const GLOBAL_AS u32 *w, const int len) { u32 w0[4]; u32 w1[4]; @@ -722,7 +722,7 @@ DECLSPEC void sha256_update_global_utf16le (sha256_ctx_t *ctx, const __global u3 sha256_update_64 (ctx, w0, w1, w2, w3, (len - pos1) * 2); } -DECLSPEC void sha256_update_global_utf16le_swap (sha256_ctx_t *ctx, const __global u32 *w, const int len) +DECLSPEC void sha256_update_global_utf16le_swap (sha256_ctx_t *ctx, const GLOBAL_AS u32 *w, const int len) { u32 w0[4]; u32 w1[4]; @@ -1009,7 +1009,7 @@ DECLSPEC void sha256_hmac_init_swap (sha256_hmac_ctx_t *ctx, const u32 *w, const sha256_hmac_init_64 (ctx, w0, w1, w2, w3); } -DECLSPEC void sha256_hmac_init_global (sha256_hmac_ctx_t *ctx, __global const u32 *w, const int len) +DECLSPEC void sha256_hmac_init_global (sha256_hmac_ctx_t *ctx, GLOBAL_AS const u32 *w, const int len) { u32 w0[4]; u32 w1[4]; @@ -1066,7 +1066,7 @@ DECLSPEC void sha256_hmac_init_global (sha256_hmac_ctx_t *ctx, __global const u3 sha256_hmac_init_64 (ctx, w0, w1, w2, w3); } -DECLSPEC void sha256_hmac_init_global_swap (sha256_hmac_ctx_t *ctx, __global const u32 *w, const int len) +DECLSPEC void sha256_hmac_init_global_swap (sha256_hmac_ctx_t *ctx, GLOBAL_AS const u32 *w, const int len) { u32 w0[4]; u32 w1[4]; @@ -1148,22 +1148,22 @@ DECLSPEC void sha256_hmac_update_utf16le_swap (sha256_hmac_ctx_t *ctx, const u32 sha256_update_utf16le_swap (&ctx->ipad, w, len); } -DECLSPEC void sha256_hmac_update_global (sha256_hmac_ctx_t *ctx, const __global u32 *w, const int len) +DECLSPEC void sha256_hmac_update_global (sha256_hmac_ctx_t *ctx, const GLOBAL_AS u32 *w, const int len) { sha256_update_global (&ctx->ipad, w, len); } -DECLSPEC void sha256_hmac_update_global_swap (sha256_hmac_ctx_t *ctx, const __global u32 *w, const int len) +DECLSPEC void sha256_hmac_update_global_swap (sha256_hmac_ctx_t *ctx, const GLOBAL_AS u32 *w, const int len) { sha256_update_global_swap (&ctx->ipad, w, len); } -DECLSPEC void sha256_hmac_update_global_utf16le (sha256_hmac_ctx_t *ctx, const __global u32 *w, const int len) +DECLSPEC void sha256_hmac_update_global_utf16le (sha256_hmac_ctx_t *ctx, const GLOBAL_AS u32 *w, const int len) { sha256_update_global_utf16le (&ctx->ipad, w, len); } -DECLSPEC void sha256_hmac_update_global_utf16le_swap (sha256_hmac_ctx_t *ctx, const __global u32 *w, const int len) +DECLSPEC void sha256_hmac_update_global_utf16le_swap (sha256_hmac_ctx_t *ctx, const GLOBAL_AS u32 *w, const int len) { sha256_update_global_utf16le_swap (&ctx->ipad, w, len); } diff --git a/OpenCL/inc_hash_sha256.h b/OpenCL/inc_hash_sha256.h index 8a26ec4ae..a1ca5142e 100644 --- a/OpenCL/inc_hash_sha256.h +++ b/OpenCL/inc_hash_sha256.h @@ -3,45 +3,45 @@ * License.....: MIT */ -DECLSPEC void sha256_transform (const u32 *w0, const u32 *w1, const u32 *w2, const u32 *w3, u32 *digest) -DECLSPEC void sha256_init (sha256_ctx_t *ctx) -DECLSPEC void sha256_update_64 (sha256_ctx_t *ctx, u32 *w0, u32 *w1, u32 *w2, u32 *w3, const int len) -DECLSPEC void sha256_update (sha256_ctx_t *ctx, const u32 *w, const int len) -DECLSPEC void sha256_update_swap (sha256_ctx_t *ctx, const u32 *w, const int len) -DECLSPEC void sha256_update_utf16le (sha256_ctx_t *ctx, const u32 *w, const int len) -DECLSPEC void sha256_update_utf16le_swap (sha256_ctx_t *ctx, const u32 *w, const int len) -DECLSPEC void sha256_update_global (sha256_ctx_t *ctx, const __global u32 *w, const int len) -DECLSPEC void sha256_update_global_swap (sha256_ctx_t *ctx, const __global u32 *w, const int len) -DECLSPEC void sha256_update_global_utf16le (sha256_ctx_t *ctx, const __global u32 *w, const int len) -DECLSPEC void sha256_update_global_utf16le_swap (sha256_ctx_t *ctx, const __global u32 *w, const int len) -DECLSPEC void sha256_final (sha256_ctx_t *ctx) -DECLSPEC void sha256_hmac_init_64 (sha256_hmac_ctx_t *ctx, const u32 *w0, const u32 *w1, const u32 *w2, const u32 *w3) -DECLSPEC void sha256_hmac_init (sha256_hmac_ctx_t *ctx, const u32 *w, const int len) -DECLSPEC void sha256_hmac_init_swap (sha256_hmac_ctx_t *ctx, const u32 *w, const int len) -DECLSPEC void sha256_hmac_init_global (sha256_hmac_ctx_t *ctx, __global const u32 *w, const int len) -DECLSPEC void sha256_hmac_init_global_swap (sha256_hmac_ctx_t *ctx, __global const u32 *w, const int len) -DECLSPEC void sha256_hmac_update_64 (sha256_hmac_ctx_t *ctx, u32 *w0, u32 *w1, u32 *w2, u32 *w3, const int len) -DECLSPEC void sha256_hmac_update (sha256_hmac_ctx_t *ctx, const u32 *w, const int len) -DECLSPEC void sha256_hmac_update_swap (sha256_hmac_ctx_t *ctx, const u32 *w, const int len) -DECLSPEC void sha256_hmac_update_utf16le (sha256_hmac_ctx_t *ctx, const u32 *w, const int len) -DECLSPEC void sha256_hmac_update_utf16le_swap (sha256_hmac_ctx_t *ctx, const u32 *w, const int len) -DECLSPEC void sha256_hmac_update_global (sha256_hmac_ctx_t *ctx, const __global u32 *w, const int len) -DECLSPEC void sha256_hmac_update_global_swap (sha256_hmac_ctx_t *ctx, const __global u32 *w, const int len) -DECLSPEC void sha256_hmac_update_global_utf16le (sha256_hmac_ctx_t *ctx, const __global u32 *w, const int len) -DECLSPEC void sha256_hmac_update_global_utf16le_swap (sha256_hmac_ctx_t *ctx, const __global u32 *w, const int len) -DECLSPEC void sha256_hmac_final (sha256_hmac_ctx_t *ctx) -DECLSPEC void sha256_transform_vector (const u32x *w0, const u32x *w1, const u32x *w2, const u32x *w3, u32x *digest) -DECLSPEC void sha256_init_vector (sha256_ctx_vector_t *ctx) -DECLSPEC void sha256_init_vector_from_scalar (sha256_ctx_vector_t *ctx, sha256_ctx_t *ctx0) -DECLSPEC void sha256_update_vector_64 (sha256_ctx_vector_t *ctx, u32x *w0, u32x *w1, u32x *w2, u32x *w3, const int len) -DECLSPEC void sha256_update_vector (sha256_ctx_vector_t *ctx, const u32x *w, const int len) -DECLSPEC void sha256_update_vector_swap (sha256_ctx_vector_t *ctx, const u32x *w, const int len) -DECLSPEC void sha256_update_vector_utf16le (sha256_ctx_vector_t *ctx, const u32x *w, const int len) -DECLSPEC void sha256_update_vector_utf16le_swap (sha256_ctx_vector_t *ctx, const u32x *w, const int len) -DECLSPEC void sha256_update_vector_utf16beN (sha256_ctx_vector_t *ctx, const u32x *w, const int len) -DECLSPEC void sha256_final_vector (sha256_ctx_vector_t *ctx) -DECLSPEC void sha256_hmac_init_vector_64 (sha256_hmac_ctx_vector_t *ctx, const u32x *w0, const u32x *w1, const u32x *w2, const u32x *w3) -DECLSPEC void sha256_hmac_init_vector (sha256_hmac_ctx_vector_t *ctx, const u32x *w, const int len) -DECLSPEC void sha256_hmac_update_vector_64 (sha256_hmac_ctx_vector_t *ctx, u32x *w0, u32x *w1, u32x *w2, u32x *w3, const int len) -DECLSPEC void sha256_hmac_update_vector (sha256_hmac_ctx_vector_t *ctx, const u32x *w, const int len) -DECLSPEC void sha256_hmac_final_vector (sha256_hmac_ctx_vector_t *ctx) +DECLSPEC void sha256_transform (const u32 *w0, const u32 *w1, const u32 *w2, const u32 *w3, u32 *digest); +DECLSPEC void sha256_init (sha256_ctx_t *ctx); +DECLSPEC void sha256_update_64 (sha256_ctx_t *ctx, u32 *w0, u32 *w1, u32 *w2, u32 *w3, const int len); +DECLSPEC void sha256_update (sha256_ctx_t *ctx, const u32 *w, const int len); +DECLSPEC void sha256_update_swap (sha256_ctx_t *ctx, const u32 *w, const int len); +DECLSPEC void sha256_update_utf16le (sha256_ctx_t *ctx, const u32 *w, const int len); +DECLSPEC void sha256_update_utf16le_swap (sha256_ctx_t *ctx, const u32 *w, const int len); +DECLSPEC void sha256_update_global (sha256_ctx_t *ctx, const GLOBAL_AS u32 *w, const int len); +DECLSPEC void sha256_update_global_swap (sha256_ctx_t *ctx, const GLOBAL_AS u32 *w, const int len); +DECLSPEC void sha256_update_global_utf16le (sha256_ctx_t *ctx, const GLOBAL_AS u32 *w, const int len); +DECLSPEC void sha256_update_global_utf16le_swap (sha256_ctx_t *ctx, const GLOBAL_AS u32 *w, const int len); +DECLSPEC void sha256_final (sha256_ctx_t *ctx); +DECLSPEC void sha256_hmac_init_64 (sha256_hmac_ctx_t *ctx, const u32 *w0, const u32 *w1, const u32 *w2, const u32 *w3); +DECLSPEC void sha256_hmac_init (sha256_hmac_ctx_t *ctx, const u32 *w, const int len); +DECLSPEC void sha256_hmac_init_swap (sha256_hmac_ctx_t *ctx, const u32 *w, const int len); +DECLSPEC void sha256_hmac_init_global (sha256_hmac_ctx_t *ctx, GLOBAL_AS const u32 *w, const int len); +DECLSPEC void sha256_hmac_init_global_swap (sha256_hmac_ctx_t *ctx, GLOBAL_AS const u32 *w, const int len); +DECLSPEC void sha256_hmac_update_64 (sha256_hmac_ctx_t *ctx, u32 *w0, u32 *w1, u32 *w2, u32 *w3, const int len); +DECLSPEC void sha256_hmac_update (sha256_hmac_ctx_t *ctx, const u32 *w, const int len); +DECLSPEC void sha256_hmac_update_swap (sha256_hmac_ctx_t *ctx, const u32 *w, const int len); +DECLSPEC void sha256_hmac_update_utf16le (sha256_hmac_ctx_t *ctx, const u32 *w, const int len); +DECLSPEC void sha256_hmac_update_utf16le_swap (sha256_hmac_ctx_t *ctx, const u32 *w, const int len); +DECLSPEC void sha256_hmac_update_global (sha256_hmac_ctx_t *ctx, const GLOBAL_AS u32 *w, const int len); +DECLSPEC void sha256_hmac_update_global_swap (sha256_hmac_ctx_t *ctx, const GLOBAL_AS u32 *w, const int len); +DECLSPEC void sha256_hmac_update_global_utf16le (sha256_hmac_ctx_t *ctx, const GLOBAL_AS u32 *w, const int len); +DECLSPEC void sha256_hmac_update_global_utf16le_swap (sha256_hmac_ctx_t *ctx, const GLOBAL_AS u32 *w, const int len); +DECLSPEC void sha256_hmac_final (sha256_hmac_ctx_t *ctx); +DECLSPEC void sha256_transform_vector (const u32x *w0, const u32x *w1, const u32x *w2, const u32x *w3, u32x *digest); +DECLSPEC void sha256_init_vector (sha256_ctx_vector_t *ctx); +DECLSPEC void sha256_init_vector_from_scalar (sha256_ctx_vector_t *ctx, sha256_ctx_t *ctx0); +DECLSPEC void sha256_update_vector_64 (sha256_ctx_vector_t *ctx, u32x *w0, u32x *w1, u32x *w2, u32x *w3, const int len); +DECLSPEC void sha256_update_vector (sha256_ctx_vector_t *ctx, const u32x *w, const int len); +DECLSPEC void sha256_update_vector_swap (sha256_ctx_vector_t *ctx, const u32x *w, const int len); +DECLSPEC void sha256_update_vector_utf16le (sha256_ctx_vector_t *ctx, const u32x *w, const int len); +DECLSPEC void sha256_update_vector_utf16le_swap (sha256_ctx_vector_t *ctx, const u32x *w, const int len); +DECLSPEC void sha256_update_vector_utf16beN (sha256_ctx_vector_t *ctx, const u32x *w, const int len); +DECLSPEC void sha256_final_vector (sha256_ctx_vector_t *ctx); +DECLSPEC void sha256_hmac_init_vector_64 (sha256_hmac_ctx_vector_t *ctx, const u32x *w0, const u32x *w1, const u32x *w2, const u32x *w3); +DECLSPEC void sha256_hmac_init_vector (sha256_hmac_ctx_vector_t *ctx, const u32x *w, const int len); +DECLSPEC void sha256_hmac_update_vector_64 (sha256_hmac_ctx_vector_t *ctx, u32x *w0, u32x *w1, u32x *w2, u32x *w3, const int len); +DECLSPEC void sha256_hmac_update_vector (sha256_hmac_ctx_vector_t *ctx, const u32x *w, const int len); +DECLSPEC void sha256_hmac_final_vector (sha256_hmac_ctx_vector_t *ctx); diff --git a/OpenCL/inc_hash_sha384.cl b/OpenCL/inc_hash_sha384.cl index 46bd9a129..dfb3a945d 100644 --- a/OpenCL/inc_hash_sha384.cl +++ b/OpenCL/inc_hash_sha384.cl @@ -60,7 +60,7 @@ #define SHA384_EXPAND(x,y,z,w) (SHA384_S3 (x) + y + SHA384_S2 (z) + w) -__constant u64a k_sha384[80] = +CONSTANT_AS u64a k_sha384[80] = { SHA512C00, SHA512C01, SHA512C02, SHA512C03, SHA512C04, SHA512C05, SHA512C06, SHA512C07, @@ -805,7 +805,7 @@ DECLSPEC void sha384_update_utf16le_swap (sha384_ctx_t *ctx, const u32 *w, const sha384_update_128 (ctx, w0, w1, w2, w3, w4, w5, w6, w7, (len - pos1) * 2); } -DECLSPEC void sha384_update_global (sha384_ctx_t *ctx, const __global u32 *w, const int len) +DECLSPEC void sha384_update_global (sha384_ctx_t *ctx, const GLOBAL_AS u32 *w, const int len) { u32 w0[4]; u32 w1[4]; @@ -893,7 +893,7 @@ DECLSPEC void sha384_update_global (sha384_ctx_t *ctx, const __global u32 *w, co sha384_update_128 (ctx, w0, w1, w2, w3, w4, w5, w6, w7, len - pos1); } -DECLSPEC void sha384_update_global_swap (sha384_ctx_t *ctx, const __global u32 *w, const int len) +DECLSPEC void sha384_update_global_swap (sha384_ctx_t *ctx, const GLOBAL_AS u32 *w, const int len) { u32 w0[4]; u32 w1[4]; @@ -1047,7 +1047,7 @@ DECLSPEC void sha384_update_global_swap (sha384_ctx_t *ctx, const __global u32 * sha384_update_128 (ctx, w0, w1, w2, w3, w4, w5, w6, w7, len - pos1); } -DECLSPEC void sha384_update_global_utf16le (sha384_ctx_t *ctx, const __global u32 *w, const int len) +DECLSPEC void sha384_update_global_utf16le (sha384_ctx_t *ctx, const GLOBAL_AS u32 *w, const int len) { u32 w0[4]; u32 w1[4]; @@ -1113,7 +1113,7 @@ DECLSPEC void sha384_update_global_utf16le (sha384_ctx_t *ctx, const __global u3 sha384_update_128 (ctx, w0, w1, w2, w3, w4, w5, w6, w7, (len - pos1) * 2); } -DECLSPEC void sha384_update_global_utf16le_swap (sha384_ctx_t *ctx, const __global u32 *w, const int len) +DECLSPEC void sha384_update_global_utf16le_swap (sha384_ctx_t *ctx, const GLOBAL_AS u32 *w, const int len) { u32 w0[4]; u32 w1[4]; @@ -1580,7 +1580,7 @@ DECLSPEC void sha384_hmac_init_swap (sha384_hmac_ctx_t *ctx, const u32 *w, const sha384_hmac_init_128 (ctx, w0, w1, w2, w3, w4, w5, w6, w7); } -DECLSPEC void sha384_hmac_init_global (sha384_hmac_ctx_t *ctx, __global const u32 *w, const int len) +DECLSPEC void sha384_hmac_init_global (sha384_hmac_ctx_t *ctx, GLOBAL_AS const u32 *w, const int len) { u32 w0[4]; u32 w1[4]; @@ -1673,7 +1673,7 @@ DECLSPEC void sha384_hmac_init_global (sha384_hmac_ctx_t *ctx, __global const u3 sha384_hmac_init_128 (ctx, w0, w1, w2, w3, w4, w5, w6, w7); } -DECLSPEC void sha384_hmac_init_global_swap (sha384_hmac_ctx_t *ctx, __global const u32 *w, const int len) +DECLSPEC void sha384_hmac_init_global_swap (sha384_hmac_ctx_t *ctx, GLOBAL_AS const u32 *w, const int len) { u32 w0[4]; u32 w1[4]; @@ -1791,22 +1791,22 @@ DECLSPEC void sha384_hmac_update_utf16le_swap (sha384_hmac_ctx_t *ctx, const u32 sha384_update_utf16le_swap (&ctx->ipad, w, len); } -DECLSPEC void sha384_hmac_update_global (sha384_hmac_ctx_t *ctx, const __global u32 *w, const int len) +DECLSPEC void sha384_hmac_update_global (sha384_hmac_ctx_t *ctx, const GLOBAL_AS u32 *w, const int len) { sha384_update_global (&ctx->ipad, w, len); } -DECLSPEC void sha384_hmac_update_global_swap (sha384_hmac_ctx_t *ctx, const __global u32 *w, const int len) +DECLSPEC void sha384_hmac_update_global_swap (sha384_hmac_ctx_t *ctx, const GLOBAL_AS u32 *w, const int len) { sha384_update_global_swap (&ctx->ipad, w, len); } -DECLSPEC void sha384_hmac_update_global_utf16le (sha384_hmac_ctx_t *ctx, const __global u32 *w, const int len) +DECLSPEC void sha384_hmac_update_global_utf16le (sha384_hmac_ctx_t *ctx, const GLOBAL_AS u32 *w, const int len) { sha384_update_global_utf16le (&ctx->ipad, w, len); } -DECLSPEC void sha384_hmac_update_global_utf16le_swap (sha384_hmac_ctx_t *ctx, const __global u32 *w, const int len) +DECLSPEC void sha384_hmac_update_global_utf16le_swap (sha384_hmac_ctx_t *ctx, const GLOBAL_AS u32 *w, const int len) { sha384_update_global_utf16le_swap (&ctx->ipad, w, len); } diff --git a/OpenCL/inc_hash_sha384.h b/OpenCL/inc_hash_sha384.h index f13cbc482..20176e537 100644 --- a/OpenCL/inc_hash_sha384.h +++ b/OpenCL/inc_hash_sha384.h @@ -3,45 +3,45 @@ * License.....: MIT */ -DECLSPEC void sha384_transform (const u32 *w0, const u32 *w1, const u32 *w2, const u32 *w3, const u32 *w4, const u32 *w5, const u32 *w6, const u32 *w7, u64 *digest) -DECLSPEC void sha384_init (sha384_ctx_t *ctx) -DECLSPEC void sha384_update_128 (sha384_ctx_t *ctx, u32 *w0, u32 *w1, u32 *w2, u32 *w3, u32 *w4, u32 *w5, u32 *w6, u32 *w7, const int len) -DECLSPEC void sha384_update (sha384_ctx_t *ctx, const u32 *w, const int len) -DECLSPEC void sha384_update_swap (sha384_ctx_t *ctx, const u32 *w, const int len) -DECLSPEC void sha384_update_utf16le (sha384_ctx_t *ctx, const u32 *w, const int len) -DECLSPEC void sha384_update_utf16le_swap (sha384_ctx_t *ctx, const u32 *w, const int len) -DECLSPEC void sha384_update_global (sha384_ctx_t *ctx, const __global u32 *w, const int len) -DECLSPEC void sha384_update_global_swap (sha384_ctx_t *ctx, const __global u32 *w, const int len) -DECLSPEC void sha384_update_global_utf16le (sha384_ctx_t *ctx, const __global u32 *w, const int len) -DECLSPEC void sha384_update_global_utf16le_swap (sha384_ctx_t *ctx, const __global u32 *w, const int len) -DECLSPEC void sha384_final (sha384_ctx_t *ctx) -DECLSPEC void sha384_hmac_init_128 (sha384_hmac_ctx_t *ctx, const u32 *w0, const u32 *w1, const u32 *w2, const u32 *w3, const u32 *w4, const u32 *w5, const u32 *w6, const u32 *w7) -DECLSPEC void sha384_hmac_init (sha384_hmac_ctx_t *ctx, const u32 *w, const int len) -DECLSPEC void sha384_hmac_init_swap (sha384_hmac_ctx_t *ctx, const u32 *w, const int len) -DECLSPEC void sha384_hmac_init_global (sha384_hmac_ctx_t *ctx, __global const u32 *w, const int len) -DECLSPEC void sha384_hmac_init_global_swap (sha384_hmac_ctx_t *ctx, __global const u32 *w, const int len) -DECLSPEC void sha384_hmac_update_128 (sha384_hmac_ctx_t *ctx, u32 *w0, u32 *w1, u32 *w2, u32 *w3, u32 *w4, u32 *w5, u32 *w6, u32 *w7, const int len) -DECLSPEC void sha384_hmac_update (sha384_hmac_ctx_t *ctx, const u32 *w, const int len) -DECLSPEC void sha384_hmac_update_swap (sha384_hmac_ctx_t *ctx, const u32 *w, const int len) -DECLSPEC void sha384_hmac_update_utf16le (sha384_hmac_ctx_t *ctx, const u32 *w, const int len) -DECLSPEC void sha384_hmac_update_utf16le_swap (sha384_hmac_ctx_t *ctx, const u32 *w, const int len) -DECLSPEC void sha384_hmac_update_global (sha384_hmac_ctx_t *ctx, const __global u32 *w, const int len) -DECLSPEC void sha384_hmac_update_global_swap (sha384_hmac_ctx_t *ctx, const __global u32 *w, const int len) -DECLSPEC void sha384_hmac_update_global_utf16le (sha384_hmac_ctx_t *ctx, const __global u32 *w, const int len) -DECLSPEC void sha384_hmac_update_global_utf16le_swap (sha384_hmac_ctx_t *ctx, const __global u32 *w, const int len) -DECLSPEC void sha384_hmac_final (sha384_hmac_ctx_t *ctx) -DECLSPEC void sha384_transform_vector (const u32x *w0, const u32x *w1, const u32x *w2, const u32x *w3, const u32x *w4, const u32x *w5, const u32x *w6, const u32x *w7, u64x *digest) -DECLSPEC void sha384_init_vector (sha384_ctx_vector_t *ctx) -DECLSPEC void sha384_init_vector_from_scalar (sha384_ctx_vector_t *ctx, sha384_ctx_t *ctx0) -DECLSPEC void sha384_update_vector_128 (sha384_ctx_vector_t *ctx, u32x *w0, u32x *w1, u32x *w2, u32x *w3, u32x *w4, u32x *w5, u32x *w6, u32x *w7, const int len) -DECLSPEC void sha384_update_vector (sha384_ctx_vector_t *ctx, const u32x *w, const int len) -DECLSPEC void sha384_update_vector_swap (sha384_ctx_vector_t *ctx, const u32x *w, const int len) -DECLSPEC void sha384_update_vector_utf16le (sha384_ctx_vector_t *ctx, const u32x *w, const int len) -DECLSPEC void sha384_update_vector_utf16le_swap (sha384_ctx_vector_t *ctx, const u32x *w, const int len) -DECLSPEC void sha384_update_vector_utf16beN (sha384_ctx_vector_t *ctx, const u32x *w, const int len) -DECLSPEC void sha384_final_vector (sha384_ctx_vector_t *ctx) -DECLSPEC void sha384_hmac_init_vector_128 (sha384_hmac_ctx_vector_t *ctx, const u32x *w0, const u32x *w1, const u32x *w2, const u32x *w3, const u32x *w4, const u32x *w5, const u32x *w6, const u32x *w7) -DECLSPEC void sha384_hmac_init_vector (sha384_hmac_ctx_vector_t *ctx, const u32x *w, const int len) -DECLSPEC void sha384_hmac_update_vector_128 (sha384_hmac_ctx_vector_t *ctx, u32x *w0, u32x *w1, u32x *w2, u32x *w3, u32x *w4, u32x *w5, u32x *w6, u32x *w7, const int len) -DECLSPEC void sha384_hmac_update_vector (sha384_hmac_ctx_vector_t *ctx, const u32x *w, const int len) -DECLSPEC void sha384_hmac_final_vector (sha384_hmac_ctx_vector_t *ctx) +DECLSPEC void sha384_transform (const u32 *w0, const u32 *w1, const u32 *w2, const u32 *w3, const u32 *w4, const u32 *w5, const u32 *w6, const u32 *w7, u64 *digest); +DECLSPEC void sha384_init (sha384_ctx_t *ctx); +DECLSPEC void sha384_update_128 (sha384_ctx_t *ctx, u32 *w0, u32 *w1, u32 *w2, u32 *w3, u32 *w4, u32 *w5, u32 *w6, u32 *w7, const int len); +DECLSPEC void sha384_update (sha384_ctx_t *ctx, const u32 *w, const int len); +DECLSPEC void sha384_update_swap (sha384_ctx_t *ctx, const u32 *w, const int len); +DECLSPEC void sha384_update_utf16le (sha384_ctx_t *ctx, const u32 *w, const int len); +DECLSPEC void sha384_update_utf16le_swap (sha384_ctx_t *ctx, const u32 *w, const int len); +DECLSPEC void sha384_update_global (sha384_ctx_t *ctx, const GLOBAL_AS u32 *w, const int len); +DECLSPEC void sha384_update_global_swap (sha384_ctx_t *ctx, const GLOBAL_AS u32 *w, const int len); +DECLSPEC void sha384_update_global_utf16le (sha384_ctx_t *ctx, const GLOBAL_AS u32 *w, const int len); +DECLSPEC void sha384_update_global_utf16le_swap (sha384_ctx_t *ctx, const GLOBAL_AS u32 *w, const int len); +DECLSPEC void sha384_final (sha384_ctx_t *ctx); +DECLSPEC void sha384_hmac_init_128 (sha384_hmac_ctx_t *ctx, const u32 *w0, const u32 *w1, const u32 *w2, const u32 *w3, const u32 *w4, const u32 *w5, const u32 *w6, const u32 *w7); +DECLSPEC void sha384_hmac_init (sha384_hmac_ctx_t *ctx, const u32 *w, const int len); +DECLSPEC void sha384_hmac_init_swap (sha384_hmac_ctx_t *ctx, const u32 *w, const int len); +DECLSPEC void sha384_hmac_init_global (sha384_hmac_ctx_t *ctx, GLOBAL_AS const u32 *w, const int len); +DECLSPEC void sha384_hmac_init_global_swap (sha384_hmac_ctx_t *ctx, GLOBAL_AS const u32 *w, const int len); +DECLSPEC void sha384_hmac_update_128 (sha384_hmac_ctx_t *ctx, u32 *w0, u32 *w1, u32 *w2, u32 *w3, u32 *w4, u32 *w5, u32 *w6, u32 *w7, const int len); +DECLSPEC void sha384_hmac_update (sha384_hmac_ctx_t *ctx, const u32 *w, const int len); +DECLSPEC void sha384_hmac_update_swap (sha384_hmac_ctx_t *ctx, const u32 *w, const int len); +DECLSPEC void sha384_hmac_update_utf16le (sha384_hmac_ctx_t *ctx, const u32 *w, const int len); +DECLSPEC void sha384_hmac_update_utf16le_swap (sha384_hmac_ctx_t *ctx, const u32 *w, const int len); +DECLSPEC void sha384_hmac_update_global (sha384_hmac_ctx_t *ctx, const GLOBAL_AS u32 *w, const int len); +DECLSPEC void sha384_hmac_update_global_swap (sha384_hmac_ctx_t *ctx, const GLOBAL_AS u32 *w, const int len); +DECLSPEC void sha384_hmac_update_global_utf16le (sha384_hmac_ctx_t *ctx, const GLOBAL_AS u32 *w, const int len); +DECLSPEC void sha384_hmac_update_global_utf16le_swap (sha384_hmac_ctx_t *ctx, const GLOBAL_AS u32 *w, const int len); +DECLSPEC void sha384_hmac_final (sha384_hmac_ctx_t *ctx); +DECLSPEC void sha384_transform_vector (const u32x *w0, const u32x *w1, const u32x *w2, const u32x *w3, const u32x *w4, const u32x *w5, const u32x *w6, const u32x *w7, u64x *digest); +DECLSPEC void sha384_init_vector (sha384_ctx_vector_t *ctx); +DECLSPEC void sha384_init_vector_from_scalar (sha384_ctx_vector_t *ctx, sha384_ctx_t *ctx0); +DECLSPEC void sha384_update_vector_128 (sha384_ctx_vector_t *ctx, u32x *w0, u32x *w1, u32x *w2, u32x *w3, u32x *w4, u32x *w5, u32x *w6, u32x *w7, const int len); +DECLSPEC void sha384_update_vector (sha384_ctx_vector_t *ctx, const u32x *w, const int len); +DECLSPEC void sha384_update_vector_swap (sha384_ctx_vector_t *ctx, const u32x *w, const int len); +DECLSPEC void sha384_update_vector_utf16le (sha384_ctx_vector_t *ctx, const u32x *w, const int len); +DECLSPEC void sha384_update_vector_utf16le_swap (sha384_ctx_vector_t *ctx, const u32x *w, const int len); +DECLSPEC void sha384_update_vector_utf16beN (sha384_ctx_vector_t *ctx, const u32x *w, const int len); +DECLSPEC void sha384_final_vector (sha384_ctx_vector_t *ctx); +DECLSPEC void sha384_hmac_init_vector_128 (sha384_hmac_ctx_vector_t *ctx, const u32x *w0, const u32x *w1, const u32x *w2, const u32x *w3, const u32x *w4, const u32x *w5, const u32x *w6, const u32x *w7); +DECLSPEC void sha384_hmac_init_vector (sha384_hmac_ctx_vector_t *ctx, const u32x *w, const int len); +DECLSPEC void sha384_hmac_update_vector_128 (sha384_hmac_ctx_vector_t *ctx, u32x *w0, u32x *w1, u32x *w2, u32x *w3, u32x *w4, u32x *w5, u32x *w6, u32x *w7, const int len); +DECLSPEC void sha384_hmac_update_vector (sha384_hmac_ctx_vector_t *ctx, const u32x *w, const int len); +DECLSPEC void sha384_hmac_final_vector (sha384_hmac_ctx_vector_t *ctx); diff --git a/OpenCL/inc_hash_sha512.cl b/OpenCL/inc_hash_sha512.cl index df8675355..e517353b2 100644 --- a/OpenCL/inc_hash_sha512.cl +++ b/OpenCL/inc_hash_sha512.cl @@ -60,7 +60,7 @@ #define SHA512_EXPAND(x,y,z,w) (SHA512_S3 (x) + y + SHA512_S2 (z) + w) -__constant u64a k_sha512[80] = +CONSTANT_AS u64a k_sha512[80] = { SHA512C00, SHA512C01, SHA512C02, SHA512C03, SHA512C04, SHA512C05, SHA512C06, SHA512C07, @@ -805,7 +805,7 @@ DECLSPEC void sha512_update_utf16le_swap (sha512_ctx_t *ctx, const u32 *w, const sha512_update_128 (ctx, w0, w1, w2, w3, w4, w5, w6, w7, (len - pos1) * 2); } -DECLSPEC void sha512_update_global (sha512_ctx_t *ctx, const __global u32 *w, const int len) +DECLSPEC void sha512_update_global (sha512_ctx_t *ctx, const GLOBAL_AS u32 *w, const int len) { u32 w0[4]; u32 w1[4]; @@ -893,7 +893,7 @@ DECLSPEC void sha512_update_global (sha512_ctx_t *ctx, const __global u32 *w, co sha512_update_128 (ctx, w0, w1, w2, w3, w4, w5, w6, w7, len - pos1); } -DECLSPEC void sha512_update_global_swap (sha512_ctx_t *ctx, const __global u32 *w, const int len) +DECLSPEC void sha512_update_global_swap (sha512_ctx_t *ctx, const GLOBAL_AS u32 *w, const int len) { u32 w0[4]; u32 w1[4]; @@ -1047,7 +1047,7 @@ DECLSPEC void sha512_update_global_swap (sha512_ctx_t *ctx, const __global u32 * sha512_update_128 (ctx, w0, w1, w2, w3, w4, w5, w6, w7, len - pos1); } -DECLSPEC void sha512_update_global_utf16le (sha512_ctx_t *ctx, const __global u32 *w, const int len) +DECLSPEC void sha512_update_global_utf16le (sha512_ctx_t *ctx, const GLOBAL_AS u32 *w, const int len) { u32 w0[4]; u32 w1[4]; @@ -1113,7 +1113,7 @@ DECLSPEC void sha512_update_global_utf16le (sha512_ctx_t *ctx, const __global u3 sha512_update_128 (ctx, w0, w1, w2, w3, w4, w5, w6, w7, (len - pos1) * 2); } -DECLSPEC void sha512_update_global_utf16le_swap (sha512_ctx_t *ctx, const __global u32 *w, const int len) +DECLSPEC void sha512_update_global_utf16le_swap (sha512_ctx_t *ctx, const GLOBAL_AS u32 *w, const int len) { u32 w0[4]; u32 w1[4]; @@ -1580,7 +1580,7 @@ DECLSPEC void sha512_hmac_init_swap (sha512_hmac_ctx_t *ctx, const u32 *w, const sha512_hmac_init_128 (ctx, w0, w1, w2, w3, w4, w5, w6, w7); } -DECLSPEC void sha512_hmac_init_global (sha512_hmac_ctx_t *ctx, __global const u32 *w, const int len) +DECLSPEC void sha512_hmac_init_global (sha512_hmac_ctx_t *ctx, GLOBAL_AS const u32 *w, const int len) { u32 w0[4]; u32 w1[4]; @@ -1673,7 +1673,7 @@ DECLSPEC void sha512_hmac_init_global (sha512_hmac_ctx_t *ctx, __global const u3 sha512_hmac_init_128 (ctx, w0, w1, w2, w3, w4, w5, w6, w7); } -DECLSPEC void sha512_hmac_init_global_swap (sha512_hmac_ctx_t *ctx, __global const u32 *w, const int len) +DECLSPEC void sha512_hmac_init_global_swap (sha512_hmac_ctx_t *ctx, GLOBAL_AS const u32 *w, const int len) { u32 w0[4]; u32 w1[4]; @@ -1791,22 +1791,22 @@ DECLSPEC void sha512_hmac_update_utf16le_swap (sha512_hmac_ctx_t *ctx, const u32 sha512_update_utf16le_swap (&ctx->ipad, w, len); } -DECLSPEC void sha512_hmac_update_global (sha512_hmac_ctx_t *ctx, const __global u32 *w, const int len) +DECLSPEC void sha512_hmac_update_global (sha512_hmac_ctx_t *ctx, const GLOBAL_AS u32 *w, const int len) { sha512_update_global (&ctx->ipad, w, len); } -DECLSPEC void sha512_hmac_update_global_swap (sha512_hmac_ctx_t *ctx, const __global u32 *w, const int len) +DECLSPEC void sha512_hmac_update_global_swap (sha512_hmac_ctx_t *ctx, const GLOBAL_AS u32 *w, const int len) { sha512_update_global_swap (&ctx->ipad, w, len); } -DECLSPEC void sha512_hmac_update_global_utf16le (sha512_hmac_ctx_t *ctx, const __global u32 *w, const int len) +DECLSPEC void sha512_hmac_update_global_utf16le (sha512_hmac_ctx_t *ctx, const GLOBAL_AS u32 *w, const int len) { sha512_update_global_utf16le (&ctx->ipad, w, len); } -DECLSPEC void sha512_hmac_update_global_utf16le_swap (sha512_hmac_ctx_t *ctx, const __global u32 *w, const int len) +DECLSPEC void sha512_hmac_update_global_utf16le_swap (sha512_hmac_ctx_t *ctx, const GLOBAL_AS u32 *w, const int len) { sha512_update_global_utf16le_swap (&ctx->ipad, w, len); } diff --git a/OpenCL/inc_hash_sha512.h b/OpenCL/inc_hash_sha512.h index df37f324c..68dffd58c 100644 --- a/OpenCL/inc_hash_sha512.h +++ b/OpenCL/inc_hash_sha512.h @@ -3,45 +3,45 @@ * License.....: MIT */ -DECLSPEC void sha512_transform (const u32 *w0, const u32 *w1, const u32 *w2, const u32 *w3, const u32 *w4, const u32 *w5, const u32 *w6, const u32 *w7, u64 *digest) -DECLSPEC void sha512_init (sha512_ctx_t *ctx) -DECLSPEC void sha512_update_128 (sha512_ctx_t *ctx, u32 *w0, u32 *w1, u32 *w2, u32 *w3, u32 *w4, u32 *w5, u32 *w6, u32 *w7, const int len) -DECLSPEC void sha512_update (sha512_ctx_t *ctx, const u32 *w, const int len) -DECLSPEC void sha512_update_swap (sha512_ctx_t *ctx, const u32 *w, const int len) -DECLSPEC void sha512_update_utf16le (sha512_ctx_t *ctx, const u32 *w, const int len) -DECLSPEC void sha512_update_utf16le_swap (sha512_ctx_t *ctx, const u32 *w, const int len) -DECLSPEC void sha512_update_global (sha512_ctx_t *ctx, const __global u32 *w, const int len) -DECLSPEC void sha512_update_global_swap (sha512_ctx_t *ctx, const __global u32 *w, const int len) -DECLSPEC void sha512_update_global_utf16le (sha512_ctx_t *ctx, const __global u32 *w, const int len) -DECLSPEC void sha512_update_global_utf16le_swap (sha512_ctx_t *ctx, const __global u32 *w, const int len) -DECLSPEC void sha512_final (sha512_ctx_t *ctx) -DECLSPEC void sha512_hmac_init_128 (sha512_hmac_ctx_t *ctx, const u32 *w0, const u32 *w1, const u32 *w2, const u32 *w3, const u32 *w4, const u32 *w5, const u32 *w6, const u32 *w7) -DECLSPEC void sha512_hmac_init (sha512_hmac_ctx_t *ctx, const u32 *w, const int len) -DECLSPEC void sha512_hmac_init_swap (sha512_hmac_ctx_t *ctx, const u32 *w, const int len) -DECLSPEC void sha512_hmac_init_global (sha512_hmac_ctx_t *ctx, __global const u32 *w, const int len) -DECLSPEC void sha512_hmac_init_global_swap (sha512_hmac_ctx_t *ctx, __global const u32 *w, const int len) -DECLSPEC void sha512_hmac_update_128 (sha512_hmac_ctx_t *ctx, u32 *w0, u32 *w1, u32 *w2, u32 *w3, u32 *w4, u32 *w5, u32 *w6, u32 *w7, const int len) -DECLSPEC void sha512_hmac_update (sha512_hmac_ctx_t *ctx, const u32 *w, const int len) -DECLSPEC void sha512_hmac_update_swap (sha512_hmac_ctx_t *ctx, const u32 *w, const int len) -DECLSPEC void sha512_hmac_update_utf16le (sha512_hmac_ctx_t *ctx, const u32 *w, const int len) -DECLSPEC void sha512_hmac_update_utf16le_swap (sha512_hmac_ctx_t *ctx, const u32 *w, const int len) -DECLSPEC void sha512_hmac_update_global (sha512_hmac_ctx_t *ctx, const __global u32 *w, const int len) -DECLSPEC void sha512_hmac_update_global_swap (sha512_hmac_ctx_t *ctx, const __global u32 *w, const int len) -DECLSPEC void sha512_hmac_update_global_utf16le (sha512_hmac_ctx_t *ctx, const __global u32 *w, const int len) -DECLSPEC void sha512_hmac_update_global_utf16le_swap (sha512_hmac_ctx_t *ctx, const __global u32 *w, const int len) -DECLSPEC void sha512_hmac_final (sha512_hmac_ctx_t *ctx) -DECLSPEC void sha512_transform_vector (const u32x *w0, const u32x *w1, const u32x *w2, const u32x *w3, const u32x *w4, const u32x *w5, const u32x *w6, const u32x *w7, u64x *digest) -DECLSPEC void sha512_init_vector (sha512_ctx_vector_t *ctx) -DECLSPEC void sha512_init_vector_from_scalar (sha512_ctx_vector_t *ctx, sha512_ctx_t *ctx0) -DECLSPEC void sha512_update_vector_128 (sha512_ctx_vector_t *ctx, u32x *w0, u32x *w1, u32x *w2, u32x *w3, u32x *w4, u32x *w5, u32x *w6, u32x *w7, const int len) -DECLSPEC void sha512_update_vector (sha512_ctx_vector_t *ctx, const u32x *w, const int len) -DECLSPEC void sha512_update_vector_swap (sha512_ctx_vector_t *ctx, const u32x *w, const int len) -DECLSPEC void sha512_update_vector_utf16le (sha512_ctx_vector_t *ctx, const u32x *w, const int len) -DECLSPEC void sha512_update_vector_utf16le_swap (sha512_ctx_vector_t *ctx, const u32x *w, const int len) -DECLSPEC void sha512_update_vector_utf16beN (sha512_ctx_vector_t *ctx, const u32x *w, const int len) -DECLSPEC void sha512_final_vector (sha512_ctx_vector_t *ctx) -DECLSPEC void sha512_hmac_init_vector_128 (sha512_hmac_ctx_vector_t *ctx, const u32x *w0, const u32x *w1, const u32x *w2, const u32x *w3, const u32x *w4, const u32x *w5, const u32x *w6, const u32x *w7) -DECLSPEC void sha512_hmac_init_vector (sha512_hmac_ctx_vector_t *ctx, const u32x *w, const int len) -DECLSPEC void sha512_hmac_update_vector_128 (sha512_hmac_ctx_vector_t *ctx, u32x *w0, u32x *w1, u32x *w2, u32x *w3, u32x *w4, u32x *w5, u32x *w6, u32x *w7, const int len) -DECLSPEC void sha512_hmac_update_vector (sha512_hmac_ctx_vector_t *ctx, const u32x *w, const int len) -DECLSPEC void sha512_hmac_final_vector (sha512_hmac_ctx_vector_t *ctx) +DECLSPEC void sha512_transform (const u32 *w0, const u32 *w1, const u32 *w2, const u32 *w3, const u32 *w4, const u32 *w5, const u32 *w6, const u32 *w7, u64 *digest); +DECLSPEC void sha512_init (sha512_ctx_t *ctx); +DECLSPEC void sha512_update_128 (sha512_ctx_t *ctx, u32 *w0, u32 *w1, u32 *w2, u32 *w3, u32 *w4, u32 *w5, u32 *w6, u32 *w7, const int len); +DECLSPEC void sha512_update (sha512_ctx_t *ctx, const u32 *w, const int len); +DECLSPEC void sha512_update_swap (sha512_ctx_t *ctx, const u32 *w, const int len); +DECLSPEC void sha512_update_utf16le (sha512_ctx_t *ctx, const u32 *w, const int len); +DECLSPEC void sha512_update_utf16le_swap (sha512_ctx_t *ctx, const u32 *w, const int len); +DECLSPEC void sha512_update_global (sha512_ctx_t *ctx, const GLOBAL_AS u32 *w, const int len); +DECLSPEC void sha512_update_global_swap (sha512_ctx_t *ctx, const GLOBAL_AS u32 *w, const int len); +DECLSPEC void sha512_update_global_utf16le (sha512_ctx_t *ctx, const GLOBAL_AS u32 *w, const int len); +DECLSPEC void sha512_update_global_utf16le_swap (sha512_ctx_t *ctx, const GLOBAL_AS u32 *w, const int len); +DECLSPEC void sha512_final (sha512_ctx_t *ctx); +DECLSPEC void sha512_hmac_init_128 (sha512_hmac_ctx_t *ctx, const u32 *w0, const u32 *w1, const u32 *w2, const u32 *w3, const u32 *w4, const u32 *w5, const u32 *w6, const u32 *w7); +DECLSPEC void sha512_hmac_init (sha512_hmac_ctx_t *ctx, const u32 *w, const int len); +DECLSPEC void sha512_hmac_init_swap (sha512_hmac_ctx_t *ctx, const u32 *w, const int len); +DECLSPEC void sha512_hmac_init_global (sha512_hmac_ctx_t *ctx, GLOBAL_AS const u32 *w, const int len); +DECLSPEC void sha512_hmac_init_global_swap (sha512_hmac_ctx_t *ctx, GLOBAL_AS const u32 *w, const int len); +DECLSPEC void sha512_hmac_update_128 (sha512_hmac_ctx_t *ctx, u32 *w0, u32 *w1, u32 *w2, u32 *w3, u32 *w4, u32 *w5, u32 *w6, u32 *w7, const int len); +DECLSPEC void sha512_hmac_update (sha512_hmac_ctx_t *ctx, const u32 *w, const int len); +DECLSPEC void sha512_hmac_update_swap (sha512_hmac_ctx_t *ctx, const u32 *w, const int len); +DECLSPEC void sha512_hmac_update_utf16le (sha512_hmac_ctx_t *ctx, const u32 *w, const int len); +DECLSPEC void sha512_hmac_update_utf16le_swap (sha512_hmac_ctx_t *ctx, const u32 *w, const int len); +DECLSPEC void sha512_hmac_update_global (sha512_hmac_ctx_t *ctx, const GLOBAL_AS u32 *w, const int len); +DECLSPEC void sha512_hmac_update_global_swap (sha512_hmac_ctx_t *ctx, const GLOBAL_AS u32 *w, const int len); +DECLSPEC void sha512_hmac_update_global_utf16le (sha512_hmac_ctx_t *ctx, const GLOBAL_AS u32 *w, const int len); +DECLSPEC void sha512_hmac_update_global_utf16le_swap (sha512_hmac_ctx_t *ctx, const GLOBAL_AS u32 *w, const int len); +DECLSPEC void sha512_hmac_final (sha512_hmac_ctx_t *ctx); +DECLSPEC void sha512_transform_vector (const u32x *w0, const u32x *w1, const u32x *w2, const u32x *w3, const u32x *w4, const u32x *w5, const u32x *w6, const u32x *w7, u64x *digest); +DECLSPEC void sha512_init_vector (sha512_ctx_vector_t *ctx); +DECLSPEC void sha512_init_vector_from_scalar (sha512_ctx_vector_t *ctx, sha512_ctx_t *ctx0); +DECLSPEC void sha512_update_vector_128 (sha512_ctx_vector_t *ctx, u32x *w0, u32x *w1, u32x *w2, u32x *w3, u32x *w4, u32x *w5, u32x *w6, u32x *w7, const int len); +DECLSPEC void sha512_update_vector (sha512_ctx_vector_t *ctx, const u32x *w, const int len); +DECLSPEC void sha512_update_vector_swap (sha512_ctx_vector_t *ctx, const u32x *w, const int len); +DECLSPEC void sha512_update_vector_utf16le (sha512_ctx_vector_t *ctx, const u32x *w, const int len); +DECLSPEC void sha512_update_vector_utf16le_swap (sha512_ctx_vector_t *ctx, const u32x *w, const int len); +DECLSPEC void sha512_update_vector_utf16beN (sha512_ctx_vector_t *ctx, const u32x *w, const int len); +DECLSPEC void sha512_final_vector (sha512_ctx_vector_t *ctx); +DECLSPEC void sha512_hmac_init_vector_128 (sha512_hmac_ctx_vector_t *ctx, const u32x *w0, const u32x *w1, const u32x *w2, const u32x *w3, const u32x *w4, const u32x *w5, const u32x *w6, const u32x *w7); +DECLSPEC void sha512_hmac_init_vector (sha512_hmac_ctx_vector_t *ctx, const u32x *w, const int len); +DECLSPEC void sha512_hmac_update_vector_128 (sha512_hmac_ctx_vector_t *ctx, u32x *w0, u32x *w1, u32x *w2, u32x *w3, u32x *w4, u32x *w5, u32x *w6, u32x *w7, const int len); +DECLSPEC void sha512_hmac_update_vector (sha512_hmac_ctx_vector_t *ctx, const u32x *w, const int len); +DECLSPEC void sha512_hmac_final_vector (sha512_hmac_ctx_vector_t *ctx); diff --git a/OpenCL/inc_hash_streebog256.cl b/OpenCL/inc_hash_streebog256.cl index f58be0b09..7297af846 100644 --- a/OpenCL/inc_hash_streebog256.cl +++ b/OpenCL/inc_hash_streebog256.cl @@ -3,7 +3,7 @@ * License.....: MIT */ -__constant u64a sbob_sl64[8][256] = +CONSTANT_AS u64a sbob_sl64[8][256] = { { 0xd031c397ce553fe6, 0x16ba5b01b006b525, 0xa89bade6296e70c8, 0x6a1f525d77d3435b, @@ -535,7 +535,7 @@ __constant u64a sbob_sl64[8][256] = }, }; -__constant u64a sbob_rc64[12][8] = +CONSTANT_AS u64a sbob_rc64[12][8] = { { 0xe9daca1eda5b08b1, 0x1f7c65c0812fcbeb, 0x16d0452e43766a2f, 0xfcc485758db84e71, @@ -987,7 +987,7 @@ DECLSPEC void streebog256_update_swap (streebog256_ctx_t *ctx, const u32 *w, int } } -DECLSPEC void streebog256_update_global_swap (streebog256_ctx_t *ctx, const __global u32 *w, int len) +DECLSPEC void streebog256_update_global_swap (streebog256_ctx_t *ctx, const GLOBAL_AS u32 *w, int len) { u32 w0[4]; u32 w1[4]; @@ -1267,7 +1267,7 @@ DECLSPEC void streebog256_hmac_update_swap (streebog256_hmac_ctx_t *ctx, const u streebog256_update_swap (&ctx->ipad, w, len); } -DECLSPEC void streebog256_hmac_update_global_swap (streebog256_hmac_ctx_t *ctx, const __global u32 *w, const int len) +DECLSPEC void streebog256_hmac_update_global_swap (streebog256_hmac_ctx_t *ctx, const GLOBAL_AS u32 *w, const int len) { streebog256_update_global_swap (&ctx->ipad, w, len); } diff --git a/OpenCL/inc_hash_streebog256.h b/OpenCL/inc_hash_streebog256.h index 6bdb20c78..1fd2ee704 100644 --- a/OpenCL/inc_hash_streebog256.h +++ b/OpenCL/inc_hash_streebog256.h @@ -3,34 +3,34 @@ * License.....: MIT */ -DECLSPEC void streebog256_init (streebog256_ctx_t *ctx, SHM_TYPE u64a (*s_sbob_sl64)[256]) -DECLSPEC void streebog256_add (u64 *x, const u64 *y) -DECLSPEC void streebog256_g (u64 *h, const u64 *n, const u64 *m, SHM_TYPE u64a (*s_sbob_sl64)[256]) -DECLSPEC void streebog256_transform (streebog256_ctx_t *ctx, const u32 *w0, const u32 *w1, const u32 *w2, const u32 *w3) -DECLSPEC void streebog256_update_64 (streebog256_ctx_t *ctx, u32 *w0, u32 *w1, u32 *w2, u32 *w3, const int len) -DECLSPEC void streebog256_update (streebog256_ctx_t *ctx, const u32 *w, int len) -DECLSPEC void streebog256_update_swap (streebog256_ctx_t *ctx, const u32 *w, int len) -DECLSPEC void streebog256_update_global_swap (streebog256_ctx_t *ctx, const __global u32 *w, int len) -DECLSPEC void streebog256_final (streebog256_ctx_t *ctx) -DECLSPEC void streebog256_hmac_init_64 (streebog256_hmac_ctx_t *ctx, const u32 *w0, const u32 *w1, const u32 *w2, const u32 *w3, SHM_TYPE u64a (*s_sbob_sl64)[256]) -DECLSPEC void streebog256_hmac_init (streebog256_hmac_ctx_t *ctx, const u32 *w, const int len, SHM_TYPE u64a (*s_sbob_sl64)[256]) -DECLSPEC void streebog256_hmac_init_swap (streebog256_hmac_ctx_t *ctx, const u32 *w, const int len, SHM_TYPE u64a (*s_sbob_sl64)[256]) -DECLSPEC void streebog256_hmac_update_64 (streebog256_hmac_ctx_t *ctx, u32 *w0, u32 *w1, u32 *w2, u32 *w3, const int len) -DECLSPEC void streebog256_hmac_update (streebog256_hmac_ctx_t *ctx, const u32 *w, const int len) -DECLSPEC void streebog256_hmac_update_swap (streebog256_hmac_ctx_t *ctx, const u32 *w, const int len) -DECLSPEC void streebog256_hmac_update_global_swap (streebog256_hmac_ctx_t *ctx, const __global u32 *w, const int len) -DECLSPEC void streebog256_hmac_final (streebog256_hmac_ctx_t *ctx) -DECLSPEC void streebog256_init_vector (streebog256_ctx_vector_t *ctx, SHM_TYPE u64a (*s_sbob_sl64)[256]) -DECLSPEC void streebog256_add_vector (u64x *x, const u64x *y) -DECLSPEC void streebog256_g_vector (u64x *h, const u64x *n, const u64x *m, SHM_TYPE u64a (*s_sbob_sl64)[256]) -DECLSPEC void streebog256_transform_vector (streebog256_ctx_vector_t *ctx, const u32x *w0, const u32x *w1, const u32x *w2, const u32x *w3) -DECLSPEC void streebog256_update_vector_64 (streebog256_ctx_vector_t *ctx, u32x *w0, u32x *w1, u32x *w2, u32x *w3, const int len) -DECLSPEC void streebog256_update_vector (streebog256_ctx_vector_t *ctx, const u32x *w, int len) -DECLSPEC void streebog256_update_vector_swap (streebog256_ctx_vector_t *ctx, const u32x *w, int len) -DECLSPEC void streebog256_final_vector (streebog256_ctx_vector_t *ctx) -DECLSPEC void streebog256_hmac_init_vector_64 (streebog256_hmac_ctx_vector_t *ctx, const u32x *w0, const u32x *w1, const u32x *w2, const u32x *w3, SHM_TYPE u64a (*s_sbob_sl64)[256]) -DECLSPEC void streebog256_hmac_init_vector (streebog256_hmac_ctx_vector_t *ctx, const u32x *w, const int len, SHM_TYPE u64a (*s_sbob_sl64)[256]) -DECLSPEC void streebog256_hmac_init_vector_swap (streebog256_hmac_ctx_vector_t *ctx, const u32x *w, const int len, SHM_TYPE u64a (*s_sbob_sl64)[256]) -DECLSPEC void streebog256_hmac_update_vector (streebog256_hmac_ctx_vector_t *ctx, const u32x *w, const int len) -DECLSPEC void streebog256_hmac_update_vector_swap (streebog256_hmac_ctx_vector_t *ctx, const u32x *w, const int len) -DECLSPEC void streebog256_hmac_final_vector (streebog256_hmac_ctx_vector_t *ctx) +DECLSPEC void streebog256_init (streebog256_ctx_t *ctx, SHM_TYPE u64a (*s_sbob_sl64)[256]); +DECLSPEC void streebog256_add (u64 *x, const u64 *y); +DECLSPEC void streebog256_g (u64 *h, const u64 *n, const u64 *m, SHM_TYPE u64a (*s_sbob_sl64)[256]); +DECLSPEC void streebog256_transform (streebog256_ctx_t *ctx, const u32 *w0, const u32 *w1, const u32 *w2, const u32 *w3); +DECLSPEC void streebog256_update_64 (streebog256_ctx_t *ctx, u32 *w0, u32 *w1, u32 *w2, u32 *w3, const int len); +DECLSPEC void streebog256_update (streebog256_ctx_t *ctx, const u32 *w, int len); +DECLSPEC void streebog256_update_swap (streebog256_ctx_t *ctx, const u32 *w, int len); +DECLSPEC void streebog256_update_global_swap (streebog256_ctx_t *ctx, const GLOBAL_AS u32 *w, int len); +DECLSPEC void streebog256_final (streebog256_ctx_t *ctx); +DECLSPEC void streebog256_hmac_init_64 (streebog256_hmac_ctx_t *ctx, const u32 *w0, const u32 *w1, const u32 *w2, const u32 *w3, SHM_TYPE u64a (*s_sbob_sl64)[256]); +DECLSPEC void streebog256_hmac_init (streebog256_hmac_ctx_t *ctx, const u32 *w, const int len, SHM_TYPE u64a (*s_sbob_sl64)[256]); +DECLSPEC void streebog256_hmac_init_swap (streebog256_hmac_ctx_t *ctx, const u32 *w, const int len, SHM_TYPE u64a (*s_sbob_sl64)[256]); +DECLSPEC void streebog256_hmac_update_64 (streebog256_hmac_ctx_t *ctx, u32 *w0, u32 *w1, u32 *w2, u32 *w3, const int len); +DECLSPEC void streebog256_hmac_update (streebog256_hmac_ctx_t *ctx, const u32 *w, const int len); +DECLSPEC void streebog256_hmac_update_swap (streebog256_hmac_ctx_t *ctx, const u32 *w, const int len); +DECLSPEC void streebog256_hmac_update_global_swap (streebog256_hmac_ctx_t *ctx, const GLOBAL_AS u32 *w, const int len); +DECLSPEC void streebog256_hmac_final (streebog256_hmac_ctx_t *ctx); +DECLSPEC void streebog256_init_vector (streebog256_ctx_vector_t *ctx, SHM_TYPE u64a (*s_sbob_sl64)[256]); +DECLSPEC void streebog256_add_vector (u64x *x, const u64x *y); +DECLSPEC void streebog256_g_vector (u64x *h, const u64x *n, const u64x *m, SHM_TYPE u64a (*s_sbob_sl64)[256]); +DECLSPEC void streebog256_transform_vector (streebog256_ctx_vector_t *ctx, const u32x *w0, const u32x *w1, const u32x *w2, const u32x *w3); +DECLSPEC void streebog256_update_vector_64 (streebog256_ctx_vector_t *ctx, u32x *w0, u32x *w1, u32x *w2, u32x *w3, const int len); +DECLSPEC void streebog256_update_vector (streebog256_ctx_vector_t *ctx, const u32x *w, int len); +DECLSPEC void streebog256_update_vector_swap (streebog256_ctx_vector_t *ctx, const u32x *w, int len); +DECLSPEC void streebog256_final_vector (streebog256_ctx_vector_t *ctx); +DECLSPEC void streebog256_hmac_init_vector_64 (streebog256_hmac_ctx_vector_t *ctx, const u32x *w0, const u32x *w1, const u32x *w2, const u32x *w3, SHM_TYPE u64a (*s_sbob_sl64)[256]); +DECLSPEC void streebog256_hmac_init_vector (streebog256_hmac_ctx_vector_t *ctx, const u32x *w, const int len, SHM_TYPE u64a (*s_sbob_sl64)[256]); +DECLSPEC void streebog256_hmac_init_vector_swap (streebog256_hmac_ctx_vector_t *ctx, const u32x *w, const int len, SHM_TYPE u64a (*s_sbob_sl64)[256]); +DECLSPEC void streebog256_hmac_update_vector (streebog256_hmac_ctx_vector_t *ctx, const u32x *w, const int len); +DECLSPEC void streebog256_hmac_update_vector_swap (streebog256_hmac_ctx_vector_t *ctx, const u32x *w, const int len); +DECLSPEC void streebog256_hmac_final_vector (streebog256_hmac_ctx_vector_t *ctx); diff --git a/OpenCL/inc_hash_streebog512.cl b/OpenCL/inc_hash_streebog512.cl index 940706d0e..7d076a0f6 100644 --- a/OpenCL/inc_hash_streebog512.cl +++ b/OpenCL/inc_hash_streebog512.cl @@ -3,7 +3,7 @@ * License.....: MIT */ -__constant u64a sbob_sl64[8][256] = +CONSTANT_AS u64a sbob_sl64[8][256] = { { 0xd031c397ce553fe6, 0x16ba5b01b006b525, 0xa89bade6296e70c8, 0x6a1f525d77d3435b, @@ -535,7 +535,7 @@ __constant u64a sbob_sl64[8][256] = }, }; -__constant u64a sbob_rc64[12][8] = +CONSTANT_AS u64a sbob_rc64[12][8] = { { 0xe9daca1eda5b08b1, 0x1f7c65c0812fcbeb, 0x16d0452e43766a2f, 0xfcc485758db84e71, @@ -987,7 +987,7 @@ DECLSPEC void streebog512_update_swap (streebog512_ctx_t *ctx, const u32 *w, int } } -DECLSPEC void streebog512_update_global_swap (streebog512_ctx_t *ctx, const __global u32 *w, int len) +DECLSPEC void streebog512_update_global_swap (streebog512_ctx_t *ctx, const GLOBAL_AS u32 *w, int len) { u32 w0[4]; u32 w1[4]; @@ -1267,7 +1267,7 @@ DECLSPEC void streebog512_hmac_update_swap (streebog512_hmac_ctx_t *ctx, const u streebog512_update_swap (&ctx->ipad, w, len); } -DECLSPEC void streebog512_hmac_update_global_swap (streebog512_hmac_ctx_t *ctx, const __global u32 *w, const int len) +DECLSPEC void streebog512_hmac_update_global_swap (streebog512_hmac_ctx_t *ctx, const GLOBAL_AS u32 *w, const int len) { streebog512_update_global_swap (&ctx->ipad, w, len); } diff --git a/OpenCL/inc_hash_streebog512.h b/OpenCL/inc_hash_streebog512.h index 3df37e8a3..f212a23f6 100644 --- a/OpenCL/inc_hash_streebog512.h +++ b/OpenCL/inc_hash_streebog512.h @@ -3,34 +3,34 @@ * License.....: MIT */ -DECLSPEC void streebog512_init (streebog512_ctx_t *ctx, SHM_TYPE u64a (*s_sbob_sl64)[256]) -DECLSPEC void streebog512_add (u64 *x, const u64 *y) -DECLSPEC void streebog512_g (u64 *h, const u64 *n, const u64 *m, SHM_TYPE u64a (*s_sbob_sl64)[256]) -DECLSPEC void streebog512_transform (streebog512_ctx_t *ctx, const u32 *w0, const u32 *w1, const u32 *w2, const u32 *w3) -DECLSPEC void streebog512_update_64 (streebog512_ctx_t *ctx, u32 *w0, u32 *w1, u32 *w2, u32 *w3, const int len) -DECLSPEC void streebog512_update (streebog512_ctx_t *ctx, const u32 *w, int len) -DECLSPEC void streebog512_update_swap (streebog512_ctx_t *ctx, const u32 *w, int len) -DECLSPEC void streebog512_update_global_swap (streebog512_ctx_t *ctx, const __global u32 *w, int len) -DECLSPEC void streebog512_final (streebog512_ctx_t *ctx) -DECLSPEC void streebog512_hmac_init_64 (streebog512_hmac_ctx_t *ctx, const u32 *w0, const u32 *w1, const u32 *w2, const u32 *w3, SHM_TYPE u64a (*s_sbob_sl64)[256]) -DECLSPEC void streebog512_hmac_init (streebog512_hmac_ctx_t *ctx, const u32 *w, const int len, SHM_TYPE u64a (*s_sbob_sl64)[256]) -DECLSPEC void streebog512_hmac_init_swap (streebog512_hmac_ctx_t *ctx, const u32 *w, const int len, SHM_TYPE u64a (*s_sbob_sl64)[256]) -DECLSPEC void streebog512_hmac_update_64 (streebog512_hmac_ctx_t *ctx, u32 *w0, u32 *w1, u32 *w2, u32 *w3, const int len) -DECLSPEC void streebog512_hmac_update (streebog512_hmac_ctx_t *ctx, const u32 *w, const int len) -DECLSPEC void streebog512_hmac_update_swap (streebog512_hmac_ctx_t *ctx, const u32 *w, const int len) -DECLSPEC void streebog512_hmac_update_global_swap (streebog512_hmac_ctx_t *ctx, const __global u32 *w, const int len) -DECLSPEC void streebog512_hmac_final (streebog512_hmac_ctx_t *ctx) -DECLSPEC void streebog512_init_vector (streebog512_ctx_vector_t *ctx, SHM_TYPE u64a (*s_sbob_sl64)[256]) -DECLSPEC void streebog512_add_vector (u64x *x, const u64x *y) -DECLSPEC void streebog512_g_vector (u64x *h, const u64x *n, const u64x *m, SHM_TYPE u64a (*s_sbob_sl64)[256]) -DECLSPEC void streebog512_transform_vector (streebog512_ctx_vector_t *ctx, const u32x *w0, const u32x *w1, const u32x *w2, const u32x *w3) -DECLSPEC void streebog512_update_vector_64 (streebog512_ctx_vector_t *ctx, u32x *w0, u32x *w1, u32x *w2, u32x *w3, const int len) -DECLSPEC void streebog512_update_vector (streebog512_ctx_vector_t *ctx, const u32x *w, int len) -DECLSPEC void streebog512_update_vector_swap (streebog512_ctx_vector_t *ctx, const u32x *w, int len) -DECLSPEC void streebog512_final_vector (streebog512_ctx_vector_t *ctx) -DECLSPEC void streebog512_hmac_init_vector_64 (streebog512_hmac_ctx_vector_t *ctx, const u32x *w0, const u32x *w1, const u32x *w2, const u32x *w3, SHM_TYPE u64a (*s_sbob_sl64)[256]) -DECLSPEC void streebog512_hmac_init_vector (streebog512_hmac_ctx_vector_t *ctx, const u32x *w, const int len, SHM_TYPE u64a (*s_sbob_sl64)[256]) -DECLSPEC void streebog512_hmac_init_vector_swap (streebog512_hmac_ctx_vector_t *ctx, const u32x *w, const int len, SHM_TYPE u64a (*s_sbob_sl64)[256]) -DECLSPEC void streebog512_hmac_update_vector (streebog512_hmac_ctx_vector_t *ctx, const u32x *w, const int len) -DECLSPEC void streebog512_hmac_update_vector_swap (streebog512_hmac_ctx_vector_t *ctx, const u32x *w, const int len) -DECLSPEC void streebog512_hmac_final_vector (streebog512_hmac_ctx_vector_t *ctx) +DECLSPEC void streebog512_init (streebog512_ctx_t *ctx, SHM_TYPE u64a (*s_sbob_sl64)[256]); +DECLSPEC void streebog512_add (u64 *x, const u64 *y); +DECLSPEC void streebog512_g (u64 *h, const u64 *n, const u64 *m, SHM_TYPE u64a (*s_sbob_sl64)[256]); +DECLSPEC void streebog512_transform (streebog512_ctx_t *ctx, const u32 *w0, const u32 *w1, const u32 *w2, const u32 *w3); +DECLSPEC void streebog512_update_64 (streebog512_ctx_t *ctx, u32 *w0, u32 *w1, u32 *w2, u32 *w3, const int len); +DECLSPEC void streebog512_update (streebog512_ctx_t *ctx, const u32 *w, int len); +DECLSPEC void streebog512_update_swap (streebog512_ctx_t *ctx, const u32 *w, int len); +DECLSPEC void streebog512_update_global_swap (streebog512_ctx_t *ctx, const GLOBAL_AS u32 *w, int len); +DECLSPEC void streebog512_final (streebog512_ctx_t *ctx); +DECLSPEC void streebog512_hmac_init_64 (streebog512_hmac_ctx_t *ctx, const u32 *w0, const u32 *w1, const u32 *w2, const u32 *w3, SHM_TYPE u64a (*s_sbob_sl64)[256]); +DECLSPEC void streebog512_hmac_init (streebog512_hmac_ctx_t *ctx, const u32 *w, const int len, SHM_TYPE u64a (*s_sbob_sl64)[256]); +DECLSPEC void streebog512_hmac_init_swap (streebog512_hmac_ctx_t *ctx, const u32 *w, const int len, SHM_TYPE u64a (*s_sbob_sl64)[256]); +DECLSPEC void streebog512_hmac_update_64 (streebog512_hmac_ctx_t *ctx, u32 *w0, u32 *w1, u32 *w2, u32 *w3, const int len); +DECLSPEC void streebog512_hmac_update (streebog512_hmac_ctx_t *ctx, const u32 *w, const int len); +DECLSPEC void streebog512_hmac_update_swap (streebog512_hmac_ctx_t *ctx, const u32 *w, const int len); +DECLSPEC void streebog512_hmac_update_global_swap (streebog512_hmac_ctx_t *ctx, const GLOBAL_AS u32 *w, const int len); +DECLSPEC void streebog512_hmac_final (streebog512_hmac_ctx_t *ctx); +DECLSPEC void streebog512_init_vector (streebog512_ctx_vector_t *ctx, SHM_TYPE u64a (*s_sbob_sl64)[256]); +DECLSPEC void streebog512_add_vector (u64x *x, const u64x *y); +DECLSPEC void streebog512_g_vector (u64x *h, const u64x *n, const u64x *m, SHM_TYPE u64a (*s_sbob_sl64)[256]); +DECLSPEC void streebog512_transform_vector (streebog512_ctx_vector_t *ctx, const u32x *w0, const u32x *w1, const u32x *w2, const u32x *w3); +DECLSPEC void streebog512_update_vector_64 (streebog512_ctx_vector_t *ctx, u32x *w0, u32x *w1, u32x *w2, u32x *w3, const int len); +DECLSPEC void streebog512_update_vector (streebog512_ctx_vector_t *ctx, const u32x *w, int len); +DECLSPEC void streebog512_update_vector_swap (streebog512_ctx_vector_t *ctx, const u32x *w, int len); +DECLSPEC void streebog512_final_vector (streebog512_ctx_vector_t *ctx); +DECLSPEC void streebog512_hmac_init_vector_64 (streebog512_hmac_ctx_vector_t *ctx, const u32x *w0, const u32x *w1, const u32x *w2, const u32x *w3, SHM_TYPE u64a (*s_sbob_sl64)[256]); +DECLSPEC void streebog512_hmac_init_vector (streebog512_hmac_ctx_vector_t *ctx, const u32x *w, const int len, SHM_TYPE u64a (*s_sbob_sl64)[256]); +DECLSPEC void streebog512_hmac_init_vector_swap (streebog512_hmac_ctx_vector_t *ctx, const u32x *w, const int len, SHM_TYPE u64a (*s_sbob_sl64)[256]); +DECLSPEC void streebog512_hmac_update_vector (streebog512_hmac_ctx_vector_t *ctx, const u32x *w, const int len); +DECLSPEC void streebog512_hmac_update_vector_swap (streebog512_hmac_ctx_vector_t *ctx, const u32x *w, const int len); +DECLSPEC void streebog512_hmac_final_vector (streebog512_hmac_ctx_vector_t *ctx); diff --git a/OpenCL/inc_hash_whirlpool.cl b/OpenCL/inc_hash_whirlpool.cl index f6c59b145..a2450902f 100644 --- a/OpenCL/inc_hash_whirlpool.cl +++ b/OpenCL/inc_hash_whirlpool.cl @@ -6,7 +6,7 @@ #define R 10 -__constant u32a Ch[8][256] = +CONSTANT_AS u32a Ch[8][256] = { { 0x18186018, 0x23238c23, 0xc6c63fc6, 0xe8e887e8, @@ -538,7 +538,7 @@ __constant u32a Ch[8][256] = } }; -__constant u32a Cl[8][256] = +CONSTANT_AS u32a Cl[8][256] = { { 0xc07830d8, 0x05af4626, 0x7ef991b8, 0x136fcdfb, @@ -1070,7 +1070,7 @@ __constant u32a Cl[8][256] = }, }; -__constant u32a rch[R + 1] = +CONSTANT_AS u32a rch[R + 1] = { 0x00000000, 0x1823c6e8, @@ -1085,7 +1085,7 @@ __constant u32a rch[R + 1] = 0xca2dbf07, }; -__constant u32a rcl[R + 1] = +CONSTANT_AS u32a rcl[R + 1] = { 0x00000000, 0x87b8014f, @@ -1672,7 +1672,7 @@ DECLSPEC void whirlpool_update_utf16le_swap (whirlpool_ctx_t *ctx, const u32 *w, whirlpool_update_64 (ctx, w0, w1, w2, w3, (len - pos1) * 2); } -DECLSPEC void whirlpool_update_global (whirlpool_ctx_t *ctx, const __global u32 *w, const int len) +DECLSPEC void whirlpool_update_global (whirlpool_ctx_t *ctx, const GLOBAL_AS u32 *w, const int len) { u32 w0[4]; u32 w1[4]; @@ -1724,7 +1724,7 @@ DECLSPEC void whirlpool_update_global (whirlpool_ctx_t *ctx, const __global u32 whirlpool_update_64 (ctx, w0, w1, w2, w3, len - pos1); } -DECLSPEC void whirlpool_update_global_swap (whirlpool_ctx_t *ctx, const __global u32 *w, const int len) +DECLSPEC void whirlpool_update_global_swap (whirlpool_ctx_t *ctx, const GLOBAL_AS u32 *w, const int len) { u32 w0[4]; u32 w1[4]; @@ -1810,7 +1810,7 @@ DECLSPEC void whirlpool_update_global_swap (whirlpool_ctx_t *ctx, const __global whirlpool_update_64 (ctx, w0, w1, w2, w3, len - pos1); } -DECLSPEC void whirlpool_update_global_utf16le (whirlpool_ctx_t *ctx, const __global u32 *w, const int len) +DECLSPEC void whirlpool_update_global_utf16le (whirlpool_ctx_t *ctx, const GLOBAL_AS u32 *w, const int len) { u32 w0[4]; u32 w1[4]; @@ -1852,7 +1852,7 @@ DECLSPEC void whirlpool_update_global_utf16le (whirlpool_ctx_t *ctx, const __glo whirlpool_update_64 (ctx, w0, w1, w2, w3, (len - pos1) * 2); } -DECLSPEC void whirlpool_update_global_utf16le_swap (whirlpool_ctx_t *ctx, const __global u32 *w, const int len) +DECLSPEC void whirlpool_update_global_utf16le_swap (whirlpool_ctx_t *ctx, const GLOBAL_AS u32 *w, const int len) { u32 w0[4]; u32 w1[4]; @@ -2139,7 +2139,7 @@ DECLSPEC void whirlpool_hmac_init_swap (whirlpool_hmac_ctx_t *ctx, const u32 *w, whirlpool_hmac_init_64 (ctx, w0, w1, w2, w3, s_Ch, s_Cl); } -DECLSPEC void whirlpool_hmac_init_global (whirlpool_hmac_ctx_t *ctx, __global const u32 *w, const int len, SHM_TYPE u32 (*s_Ch)[256], SHM_TYPE u32 (*s_Cl)[256]) +DECLSPEC void whirlpool_hmac_init_global (whirlpool_hmac_ctx_t *ctx, GLOBAL_AS const u32 *w, const int len, SHM_TYPE u32 (*s_Ch)[256], SHM_TYPE u32 (*s_Cl)[256]) { u32 w0[4]; u32 w1[4]; @@ -2196,7 +2196,7 @@ DECLSPEC void whirlpool_hmac_init_global (whirlpool_hmac_ctx_t *ctx, __global co whirlpool_hmac_init_64 (ctx, w0, w1, w2, w3, s_Ch, s_Cl); } -DECLSPEC void whirlpool_hmac_init_global_swap (whirlpool_hmac_ctx_t *ctx, __global const u32 *w, const int len, SHM_TYPE u32 (*s_Ch)[256], SHM_TYPE u32 (*s_Cl)[256]) +DECLSPEC void whirlpool_hmac_init_global_swap (whirlpool_hmac_ctx_t *ctx, GLOBAL_AS const u32 *w, const int len, SHM_TYPE u32 (*s_Ch)[256], SHM_TYPE u32 (*s_Cl)[256]) { u32 w0[4]; u32 w1[4]; @@ -2278,22 +2278,22 @@ DECLSPEC void whirlpool_hmac_update_utf16le_swap (whirlpool_hmac_ctx_t *ctx, con whirlpool_update_utf16le_swap (&ctx->ipad, w, len); } -DECLSPEC void whirlpool_hmac_update_global (whirlpool_hmac_ctx_t *ctx, const __global u32 *w, const int len) +DECLSPEC void whirlpool_hmac_update_global (whirlpool_hmac_ctx_t *ctx, const GLOBAL_AS u32 *w, const int len) { whirlpool_update_global (&ctx->ipad, w, len); } -DECLSPEC void whirlpool_hmac_update_global_swap (whirlpool_hmac_ctx_t *ctx, const __global u32 *w, const int len) +DECLSPEC void whirlpool_hmac_update_global_swap (whirlpool_hmac_ctx_t *ctx, const GLOBAL_AS u32 *w, const int len) { whirlpool_update_global_swap (&ctx->ipad, w, len); } -DECLSPEC void whirlpool_hmac_update_global_utf16le (whirlpool_hmac_ctx_t *ctx, const __global u32 *w, const int len) +DECLSPEC void whirlpool_hmac_update_global_utf16le (whirlpool_hmac_ctx_t *ctx, const GLOBAL_AS u32 *w, const int len) { whirlpool_update_global_utf16le (&ctx->ipad, w, len); } -DECLSPEC void whirlpool_hmac_update_global_utf16le_swap (whirlpool_hmac_ctx_t *ctx, const __global u32 *w, const int len) +DECLSPEC void whirlpool_hmac_update_global_utf16le_swap (whirlpool_hmac_ctx_t *ctx, const GLOBAL_AS u32 *w, const int len) { whirlpool_update_global_utf16le_swap (&ctx->ipad, w, len); } diff --git a/OpenCL/inc_hash_whirlpool.h b/OpenCL/inc_hash_whirlpool.h index fc6dd3a56..e47816ed1 100644 --- a/OpenCL/inc_hash_whirlpool.h +++ b/OpenCL/inc_hash_whirlpool.h @@ -3,44 +3,44 @@ * License.....: MIT */ -DECLSPEC void whirlpool_transform (const u32 *w0, const u32 *w1, const u32 *w2, const u32 *w3, u32 *digest, SHM_TYPE u32 (*s_Ch)[256], SHM_TYPE u32 (*s_Cl)[256]) -DECLSPEC void whirlpool_init (whirlpool_ctx_t *ctx, SHM_TYPE u32 (*s_Ch)[256], SHM_TYPE u32 (*s_Cl)[256]) -DECLSPEC void whirlpool_update_64 (whirlpool_ctx_t *ctx, u32 *w0, u32 *w1, u32 *w2, u32 *w3, const int len) -DECLSPEC void whirlpool_update (whirlpool_ctx_t *ctx, const u32 *w, const int len) -DECLSPEC void whirlpool_update_swap (whirlpool_ctx_t *ctx, const u32 *w, const int len) -DECLSPEC void whirlpool_update_utf16le (whirlpool_ctx_t *ctx, const u32 *w, const int len) -DECLSPEC void whirlpool_update_utf16le_swap (whirlpool_ctx_t *ctx, const u32 *w, const int len) -DECLSPEC void whirlpool_update_global (whirlpool_ctx_t *ctx, const __global u32 *w, const int len) -DECLSPEC void whirlpool_update_global_swap (whirlpool_ctx_t *ctx, const __global u32 *w, const int len) -DECLSPEC void whirlpool_update_global_utf16le (whirlpool_ctx_t *ctx, const __global u32 *w, const int len) -DECLSPEC void whirlpool_update_global_utf16le_swap (whirlpool_ctx_t *ctx, const __global u32 *w, const int len) -DECLSPEC void whirlpool_final (whirlpool_ctx_t *ctx) -DECLSPEC void whirlpool_hmac_init_64 (whirlpool_hmac_ctx_t *ctx, const u32 *w0, const u32 *w1, const u32 *w2, const u32 *w3, SHM_TYPE u32 (*s_Ch)[256], SHM_TYPE u32 (*s_Cl)[256]) -DECLSPEC void whirlpool_hmac_init (whirlpool_hmac_ctx_t *ctx, const u32 *w, const int len, SHM_TYPE u32 (*s_Ch)[256], SHM_TYPE u32 (*s_Cl)[256]) -DECLSPEC void whirlpool_hmac_init_swap (whirlpool_hmac_ctx_t *ctx, const u32 *w, const int len, SHM_TYPE u32 (*s_Ch)[256], SHM_TYPE u32 (*s_Cl)[256]) -DECLSPEC void whirlpool_hmac_init_global (whirlpool_hmac_ctx_t *ctx, __global const u32 *w, const int len, SHM_TYPE u32 (*s_Ch)[256], SHM_TYPE u32 (*s_Cl)[256]) -DECLSPEC void whirlpool_hmac_init_global_swap (whirlpool_hmac_ctx_t *ctx, __global const u32 *w, const int len, SHM_TYPE u32 (*s_Ch)[256], SHM_TYPE u32 (*s_Cl)[256]) -DECLSPEC void whirlpool_hmac_update_64 (whirlpool_hmac_ctx_t *ctx, u32 *w0, u32 *w1, u32 *w2, u32 *w3, const int len) -DECLSPEC void whirlpool_hmac_update (whirlpool_hmac_ctx_t *ctx, const u32 *w, const int len) -DECLSPEC void whirlpool_hmac_update_swap (whirlpool_hmac_ctx_t *ctx, const u32 *w, const int len) -DECLSPEC void whirlpool_hmac_update_utf16le (whirlpool_hmac_ctx_t *ctx, const u32 *w, const int len) -DECLSPEC void whirlpool_hmac_update_utf16le_swap (whirlpool_hmac_ctx_t *ctx, const u32 *w, const int len) -DECLSPEC void whirlpool_hmac_update_global (whirlpool_hmac_ctx_t *ctx, const __global u32 *w, const int len) -DECLSPEC void whirlpool_hmac_update_global_swap (whirlpool_hmac_ctx_t *ctx, const __global u32 *w, const int len) -DECLSPEC void whirlpool_hmac_update_global_utf16le (whirlpool_hmac_ctx_t *ctx, const __global u32 *w, const int len) -DECLSPEC void whirlpool_hmac_update_global_utf16le_swap (whirlpool_hmac_ctx_t *ctx, const __global u32 *w, const int len) -DECLSPEC void whirlpool_hmac_final (whirlpool_hmac_ctx_t *ctx) -DECLSPEC void whirlpool_transform_vector (const u32x *w0, const u32x *w1, const u32x *w2, const u32x *w3, u32x *digest, SHM_TYPE u32 (*s_Ch)[256], SHM_TYPE u32 (*s_Cl)[256]) -DECLSPEC void whirlpool_init_vector (whirlpool_ctx_vector_t *ctx, SHM_TYPE u32 (*s_Ch)[256], SHM_TYPE u32 (*s_Cl)[256]) -DECLSPEC void whirlpool_init_vector_from_scalar (whirlpool_ctx_vector_t *ctx, whirlpool_ctx_t *ctx0) -DECLSPEC void whirlpool_update_vector_64 (whirlpool_ctx_vector_t *ctx, u32x *w0, u32x *w1, u32x *w2, u32x *w3, const int len) -DECLSPEC void whirlpool_update_vector (whirlpool_ctx_vector_t *ctx, const u32x *w, const int len) -DECLSPEC void whirlpool_update_vector_swap (whirlpool_ctx_vector_t *ctx, const u32x *w, const int len) -DECLSPEC void whirlpool_update_vector_utf16le (whirlpool_ctx_vector_t *ctx, const u32x *w, const int len) -DECLSPEC void whirlpool_update_vector_utf16le_swap (whirlpool_ctx_vector_t *ctx, const u32x *w, const int len) -DECLSPEC void whirlpool_final_vector (whirlpool_ctx_vector_t *ctx) -DECLSPEC void whirlpool_hmac_init_vector_64 (whirlpool_hmac_ctx_vector_t *ctx, const u32x *w0, const u32x *w1, const u32x *w2, const u32x *w3, SHM_TYPE u32 (*s_Ch)[256], SHM_TYPE u32 (*s_Cl)[256]) -DECLSPEC void whirlpool_hmac_init_vector (whirlpool_hmac_ctx_vector_t *ctx, const u32x *w, const int len, SHM_TYPE u32 (*s_Ch)[256], SHM_TYPE u32 (*s_Cl)[256]) -DECLSPEC void whirlpool_hmac_update_vector_64 (whirlpool_hmac_ctx_vector_t *ctx, u32x *w0, u32x *w1, u32x *w2, u32x *w3, const int len) -DECLSPEC void whirlpool_hmac_update_vector (whirlpool_hmac_ctx_vector_t *ctx, const u32x *w, const int len) -DECLSPEC void whirlpool_hmac_final_vector (whirlpool_hmac_ctx_vector_t *ctx) +DECLSPEC void whirlpool_transform (const u32 *w0, const u32 *w1, const u32 *w2, const u32 *w3, u32 *digest, SHM_TYPE u32 (*s_Ch)[256], SHM_TYPE u32 (*s_Cl)[256]); +DECLSPEC void whirlpool_init (whirlpool_ctx_t *ctx, SHM_TYPE u32 (*s_Ch)[256], SHM_TYPE u32 (*s_Cl)[256]); +DECLSPEC void whirlpool_update_64 (whirlpool_ctx_t *ctx, u32 *w0, u32 *w1, u32 *w2, u32 *w3, const int len); +DECLSPEC void whirlpool_update (whirlpool_ctx_t *ctx, const u32 *w, const int len); +DECLSPEC void whirlpool_update_swap (whirlpool_ctx_t *ctx, const u32 *w, const int len); +DECLSPEC void whirlpool_update_utf16le (whirlpool_ctx_t *ctx, const u32 *w, const int len); +DECLSPEC void whirlpool_update_utf16le_swap (whirlpool_ctx_t *ctx, const u32 *w, const int len); +DECLSPEC void whirlpool_update_global (whirlpool_ctx_t *ctx, const GLOBAL_AS u32 *w, const int len); +DECLSPEC void whirlpool_update_global_swap (whirlpool_ctx_t *ctx, const GLOBAL_AS u32 *w, const int len); +DECLSPEC void whirlpool_update_global_utf16le (whirlpool_ctx_t *ctx, const GLOBAL_AS u32 *w, const int len); +DECLSPEC void whirlpool_update_global_utf16le_swap (whirlpool_ctx_t *ctx, const GLOBAL_AS u32 *w, const int len); +DECLSPEC void whirlpool_final (whirlpool_ctx_t *ctx); +DECLSPEC void whirlpool_hmac_init_64 (whirlpool_hmac_ctx_t *ctx, const u32 *w0, const u32 *w1, const u32 *w2, const u32 *w3, SHM_TYPE u32 (*s_Ch)[256], SHM_TYPE u32 (*s_Cl)[256]); +DECLSPEC void whirlpool_hmac_init (whirlpool_hmac_ctx_t *ctx, const u32 *w, const int len, SHM_TYPE u32 (*s_Ch)[256], SHM_TYPE u32 (*s_Cl)[256]); +DECLSPEC void whirlpool_hmac_init_swap (whirlpool_hmac_ctx_t *ctx, const u32 *w, const int len, SHM_TYPE u32 (*s_Ch)[256], SHM_TYPE u32 (*s_Cl)[256]); +DECLSPEC void whirlpool_hmac_init_global (whirlpool_hmac_ctx_t *ctx, GLOBAL_AS const u32 *w, const int len, SHM_TYPE u32 (*s_Ch)[256], SHM_TYPE u32 (*s_Cl)[256]); +DECLSPEC void whirlpool_hmac_init_global_swap (whirlpool_hmac_ctx_t *ctx, GLOBAL_AS const u32 *w, const int len, SHM_TYPE u32 (*s_Ch)[256], SHM_TYPE u32 (*s_Cl)[256]); +DECLSPEC void whirlpool_hmac_update_64 (whirlpool_hmac_ctx_t *ctx, u32 *w0, u32 *w1, u32 *w2, u32 *w3, const int len); +DECLSPEC void whirlpool_hmac_update (whirlpool_hmac_ctx_t *ctx, const u32 *w, const int len); +DECLSPEC void whirlpool_hmac_update_swap (whirlpool_hmac_ctx_t *ctx, const u32 *w, const int len); +DECLSPEC void whirlpool_hmac_update_utf16le (whirlpool_hmac_ctx_t *ctx, const u32 *w, const int len); +DECLSPEC void whirlpool_hmac_update_utf16le_swap (whirlpool_hmac_ctx_t *ctx, const u32 *w, const int len); +DECLSPEC void whirlpool_hmac_update_global (whirlpool_hmac_ctx_t *ctx, const GLOBAL_AS u32 *w, const int len); +DECLSPEC void whirlpool_hmac_update_global_swap (whirlpool_hmac_ctx_t *ctx, const GLOBAL_AS u32 *w, const int len); +DECLSPEC void whirlpool_hmac_update_global_utf16le (whirlpool_hmac_ctx_t *ctx, const GLOBAL_AS u32 *w, const int len); +DECLSPEC void whirlpool_hmac_update_global_utf16le_swap (whirlpool_hmac_ctx_t *ctx, const GLOBAL_AS u32 *w, const int len); +DECLSPEC void whirlpool_hmac_final (whirlpool_hmac_ctx_t *ctx); +DECLSPEC void whirlpool_transform_vector (const u32x *w0, const u32x *w1, const u32x *w2, const u32x *w3, u32x *digest, SHM_TYPE u32 (*s_Ch)[256], SHM_TYPE u32 (*s_Cl)[256]); +DECLSPEC void whirlpool_init_vector (whirlpool_ctx_vector_t *ctx, SHM_TYPE u32 (*s_Ch)[256], SHM_TYPE u32 (*s_Cl)[256]); +DECLSPEC void whirlpool_init_vector_from_scalar (whirlpool_ctx_vector_t *ctx, whirlpool_ctx_t *ctx0); +DECLSPEC void whirlpool_update_vector_64 (whirlpool_ctx_vector_t *ctx, u32x *w0, u32x *w1, u32x *w2, u32x *w3, const int len); +DECLSPEC void whirlpool_update_vector (whirlpool_ctx_vector_t *ctx, const u32x *w, const int len); +DECLSPEC void whirlpool_update_vector_swap (whirlpool_ctx_vector_t *ctx, const u32x *w, const int len); +DECLSPEC void whirlpool_update_vector_utf16le (whirlpool_ctx_vector_t *ctx, const u32x *w, const int len); +DECLSPEC void whirlpool_update_vector_utf16le_swap (whirlpool_ctx_vector_t *ctx, const u32x *w, const int len); +DECLSPEC void whirlpool_final_vector (whirlpool_ctx_vector_t *ctx); +DECLSPEC void whirlpool_hmac_init_vector_64 (whirlpool_hmac_ctx_vector_t *ctx, const u32x *w0, const u32x *w1, const u32x *w2, const u32x *w3, SHM_TYPE u32 (*s_Ch)[256], SHM_TYPE u32 (*s_Cl)[256]); +DECLSPEC void whirlpool_hmac_init_vector (whirlpool_hmac_ctx_vector_t *ctx, const u32x *w, const int len, SHM_TYPE u32 (*s_Ch)[256], SHM_TYPE u32 (*s_Cl)[256]); +DECLSPEC void whirlpool_hmac_update_vector_64 (whirlpool_hmac_ctx_vector_t *ctx, u32x *w0, u32x *w1, u32x *w2, u32x *w3, const int len); +DECLSPEC void whirlpool_hmac_update_vector (whirlpool_hmac_ctx_vector_t *ctx, const u32x *w, const int len); +DECLSPEC void whirlpool_hmac_final_vector (whirlpool_hmac_ctx_vector_t *ctx); diff --git a/OpenCL/inc_luks_aes.cl b/OpenCL/inc_luks_aes.cl index d47a9492a..f92d1d0fb 100644 --- a/OpenCL/inc_luks_aes.cl +++ b/OpenCL/inc_luks_aes.cl @@ -31,7 +31,7 @@ DECLSPEC void aes256_decrypt_cbc (const u32 *ks1, const u32 *in, u32 *out, u32 * essiv[3] = in[3]; } -DECLSPEC void luks_decrypt_sector_aes_cbc_essiv128 (__global const u32 *in, u32 *out, const u32 *ks1, const u32 *ks2, const u32 sector, SHM_TYPE u32 *s_te0, SHM_TYPE u32 *s_te1, SHM_TYPE u32 *s_te2, SHM_TYPE u32 *s_te3, SHM_TYPE u32 *s_te4, SHM_TYPE u32 *s_td0, SHM_TYPE u32 *s_td1, SHM_TYPE u32 *s_td2, SHM_TYPE u32 *s_td3, SHM_TYPE u32 *s_td4) +DECLSPEC void luks_decrypt_sector_aes_cbc_essiv128 (GLOBAL_AS const u32 *in, u32 *out, const u32 *ks1, const u32 *ks2, const u32 sector, SHM_TYPE u32 *s_te0, SHM_TYPE u32 *s_te1, SHM_TYPE u32 *s_te2, SHM_TYPE u32 *s_te3, SHM_TYPE u32 *s_te4, SHM_TYPE u32 *s_td0, SHM_TYPE u32 *s_td1, SHM_TYPE u32 *s_td2, SHM_TYPE u32 *s_td3, SHM_TYPE u32 *s_td4) { u32 S[4] = { sector, 0, 0, 0 }; @@ -65,7 +65,7 @@ DECLSPEC void luks_decrypt_sector_aes_cbc_essiv128 (__global const u32 *in, u32 } } -DECLSPEC void luks_decrypt_sector_aes_cbc_essiv128_mk_sha1 (__global const u32 *in, u32 *mk, const u32 *ks1, const u32 *ks2, const u32 sector, SHM_TYPE u32 *s_te0, SHM_TYPE u32 *s_te1, SHM_TYPE u32 *s_te2, SHM_TYPE u32 *s_te3, SHM_TYPE u32 *s_te4, SHM_TYPE u32 *s_td0, SHM_TYPE u32 *s_td1, SHM_TYPE u32 *s_td2, SHM_TYPE u32 *s_td3, SHM_TYPE u32 *s_td4) +DECLSPEC void luks_decrypt_sector_aes_cbc_essiv128_mk_sha1 (GLOBAL_AS const u32 *in, u32 *mk, const u32 *ks1, const u32 *ks2, const u32 sector, SHM_TYPE u32 *s_te0, SHM_TYPE u32 *s_te1, SHM_TYPE u32 *s_te2, SHM_TYPE u32 *s_te3, SHM_TYPE u32 *s_te4, SHM_TYPE u32 *s_td0, SHM_TYPE u32 *s_td1, SHM_TYPE u32 *s_td2, SHM_TYPE u32 *s_td3, SHM_TYPE u32 *s_td4) { u32 S[4] = { sector, 0, 0, 0 }; @@ -102,7 +102,7 @@ DECLSPEC void luks_decrypt_sector_aes_cbc_essiv128_mk_sha1 (__global const u32 * } } -DECLSPEC void luks_decrypt_sector_aes_cbc_essiv128_mk_sha1_final (__global const u32 *in, u32 *mk, const u32 *ks1, const u32 *ks2, const u32 sector, SHM_TYPE u32 *s_te0, SHM_TYPE u32 *s_te1, SHM_TYPE u32 *s_te2, SHM_TYPE u32 *s_te3, SHM_TYPE u32 *s_te4, SHM_TYPE u32 *s_td0, SHM_TYPE u32 *s_td1, SHM_TYPE u32 *s_td2, SHM_TYPE u32 *s_td3, SHM_TYPE u32 *s_td4) +DECLSPEC void luks_decrypt_sector_aes_cbc_essiv128_mk_sha1_final (GLOBAL_AS const u32 *in, u32 *mk, const u32 *ks1, const u32 *ks2, const u32 sector, SHM_TYPE u32 *s_te0, SHM_TYPE u32 *s_te1, SHM_TYPE u32 *s_te2, SHM_TYPE u32 *s_te3, SHM_TYPE u32 *s_te4, SHM_TYPE u32 *s_td0, SHM_TYPE u32 *s_td1, SHM_TYPE u32 *s_td2, SHM_TYPE u32 *s_td3, SHM_TYPE u32 *s_td4) { u32 S[4] = { sector, 0, 0, 0 }; @@ -162,7 +162,7 @@ DECLSPEC void luks_decrypt_sector_aes_cbc_essiv128_mk_sha1_final (__global const } } -DECLSPEC void luks_decrypt_sector_aes_cbc_essiv128_mk_sha256 (__global const u32 *in, u32 *mk, const u32 *ks1, const u32 *ks2, const u32 sector, SHM_TYPE u32 *s_te0, SHM_TYPE u32 *s_te1, SHM_TYPE u32 *s_te2, SHM_TYPE u32 *s_te3, SHM_TYPE u32 *s_te4, SHM_TYPE u32 *s_td0, SHM_TYPE u32 *s_td1, SHM_TYPE u32 *s_td2, SHM_TYPE u32 *s_td3, SHM_TYPE u32 *s_td4) +DECLSPEC void luks_decrypt_sector_aes_cbc_essiv128_mk_sha256 (GLOBAL_AS const u32 *in, u32 *mk, const u32 *ks1, const u32 *ks2, const u32 sector, SHM_TYPE u32 *s_te0, SHM_TYPE u32 *s_te1, SHM_TYPE u32 *s_te2, SHM_TYPE u32 *s_te3, SHM_TYPE u32 *s_te4, SHM_TYPE u32 *s_td0, SHM_TYPE u32 *s_td1, SHM_TYPE u32 *s_td2, SHM_TYPE u32 *s_td3, SHM_TYPE u32 *s_td4) { u32 S[4] = { sector, 0, 0, 0 }; @@ -199,7 +199,7 @@ DECLSPEC void luks_decrypt_sector_aes_cbc_essiv128_mk_sha256 (__global const u32 } } -DECLSPEC void luks_decrypt_sector_aes_cbc_essiv128_mk_sha256_final (__global const u32 *in, u32 *mk, const u32 *ks1, const u32 *ks2, const u32 sector, SHM_TYPE u32 *s_te0, SHM_TYPE u32 *s_te1, SHM_TYPE u32 *s_te2, SHM_TYPE u32 *s_te3, SHM_TYPE u32 *s_te4, SHM_TYPE u32 *s_td0, SHM_TYPE u32 *s_td1, SHM_TYPE u32 *s_td2, SHM_TYPE u32 *s_td3, SHM_TYPE u32 *s_td4) +DECLSPEC void luks_decrypt_sector_aes_cbc_essiv128_mk_sha256_final (GLOBAL_AS const u32 *in, u32 *mk, const u32 *ks1, const u32 *ks2, const u32 sector, SHM_TYPE u32 *s_te0, SHM_TYPE u32 *s_te1, SHM_TYPE u32 *s_te2, SHM_TYPE u32 *s_te3, SHM_TYPE u32 *s_te4, SHM_TYPE u32 *s_td0, SHM_TYPE u32 *s_td1, SHM_TYPE u32 *s_td2, SHM_TYPE u32 *s_td3, SHM_TYPE u32 *s_td4) { u32 S[4] = { sector, 0, 0, 0 }; @@ -259,7 +259,7 @@ DECLSPEC void luks_decrypt_sector_aes_cbc_essiv128_mk_sha256_final (__global con } } -DECLSPEC void luks_decrypt_sector_aes_cbc_essiv128_mk_sha512 (__global const u32 *in, u32 *mk, const u32 *ks1, const u32 *ks2, const u32 sector, SHM_TYPE u32 *s_te0, SHM_TYPE u32 *s_te1, SHM_TYPE u32 *s_te2, SHM_TYPE u32 *s_te3, SHM_TYPE u32 *s_te4, SHM_TYPE u32 *s_td0, SHM_TYPE u32 *s_td1, SHM_TYPE u32 *s_td2, SHM_TYPE u32 *s_td3, SHM_TYPE u32 *s_td4) +DECLSPEC void luks_decrypt_sector_aes_cbc_essiv128_mk_sha512 (GLOBAL_AS const u32 *in, u32 *mk, const u32 *ks1, const u32 *ks2, const u32 sector, SHM_TYPE u32 *s_te0, SHM_TYPE u32 *s_te1, SHM_TYPE u32 *s_te2, SHM_TYPE u32 *s_te3, SHM_TYPE u32 *s_te4, SHM_TYPE u32 *s_td0, SHM_TYPE u32 *s_td1, SHM_TYPE u32 *s_td2, SHM_TYPE u32 *s_td3, SHM_TYPE u32 *s_td4) { u32 S[4] = { sector, 0, 0, 0 }; @@ -296,7 +296,7 @@ DECLSPEC void luks_decrypt_sector_aes_cbc_essiv128_mk_sha512 (__global const u32 } } -DECLSPEC void luks_decrypt_sector_aes_cbc_essiv128_mk_sha512_final (__global const u32 *in, u32 *mk, const u32 *ks1, const u32 *ks2, const u32 sector, SHM_TYPE u32 *s_te0, SHM_TYPE u32 *s_te1, SHM_TYPE u32 *s_te2, SHM_TYPE u32 *s_te3, SHM_TYPE u32 *s_te4, SHM_TYPE u32 *s_td0, SHM_TYPE u32 *s_td1, SHM_TYPE u32 *s_td2, SHM_TYPE u32 *s_td3, SHM_TYPE u32 *s_td4) +DECLSPEC void luks_decrypt_sector_aes_cbc_essiv128_mk_sha512_final (GLOBAL_AS const u32 *in, u32 *mk, const u32 *ks1, const u32 *ks2, const u32 sector, SHM_TYPE u32 *s_te0, SHM_TYPE u32 *s_te1, SHM_TYPE u32 *s_te2, SHM_TYPE u32 *s_te3, SHM_TYPE u32 *s_te4, SHM_TYPE u32 *s_td0, SHM_TYPE u32 *s_td1, SHM_TYPE u32 *s_td2, SHM_TYPE u32 *s_td3, SHM_TYPE u32 *s_td4) { u32 S[4] = { sector, 0, 0, 0 }; @@ -356,7 +356,7 @@ DECLSPEC void luks_decrypt_sector_aes_cbc_essiv128_mk_sha512_final (__global con } } -DECLSPEC void luks_decrypt_sector_aes_cbc_essiv128_mk_ripemd160 (__global const u32 *in, u32 *mk, const u32 *ks1, const u32 *ks2, const u32 sector, SHM_TYPE u32 *s_te0, SHM_TYPE u32 *s_te1, SHM_TYPE u32 *s_te2, SHM_TYPE u32 *s_te3, SHM_TYPE u32 *s_te4, SHM_TYPE u32 *s_td0, SHM_TYPE u32 *s_td1, SHM_TYPE u32 *s_td2, SHM_TYPE u32 *s_td3, SHM_TYPE u32 *s_td4) +DECLSPEC void luks_decrypt_sector_aes_cbc_essiv128_mk_ripemd160 (GLOBAL_AS const u32 *in, u32 *mk, const u32 *ks1, const u32 *ks2, const u32 sector, SHM_TYPE u32 *s_te0, SHM_TYPE u32 *s_te1, SHM_TYPE u32 *s_te2, SHM_TYPE u32 *s_te3, SHM_TYPE u32 *s_te4, SHM_TYPE u32 *s_td0, SHM_TYPE u32 *s_td1, SHM_TYPE u32 *s_td2, SHM_TYPE u32 *s_td3, SHM_TYPE u32 *s_td4) { u32 S[4] = { sector, 0, 0, 0 }; @@ -393,7 +393,7 @@ DECLSPEC void luks_decrypt_sector_aes_cbc_essiv128_mk_ripemd160 (__global const } } -DECLSPEC void luks_decrypt_sector_aes_cbc_essiv128_mk_ripemd160_final (__global const u32 *in, u32 *mk, const u32 *ks1, const u32 *ks2, const u32 sector, SHM_TYPE u32 *s_te0, SHM_TYPE u32 *s_te1, SHM_TYPE u32 *s_te2, SHM_TYPE u32 *s_te3, SHM_TYPE u32 *s_te4, SHM_TYPE u32 *s_td0, SHM_TYPE u32 *s_td1, SHM_TYPE u32 *s_td2, SHM_TYPE u32 *s_td3, SHM_TYPE u32 *s_td4) +DECLSPEC void luks_decrypt_sector_aes_cbc_essiv128_mk_ripemd160_final (GLOBAL_AS const u32 *in, u32 *mk, const u32 *ks1, const u32 *ks2, const u32 sector, SHM_TYPE u32 *s_te0, SHM_TYPE u32 *s_te1, SHM_TYPE u32 *s_te2, SHM_TYPE u32 *s_te3, SHM_TYPE u32 *s_te4, SHM_TYPE u32 *s_td0, SHM_TYPE u32 *s_td1, SHM_TYPE u32 *s_td2, SHM_TYPE u32 *s_td3, SHM_TYPE u32 *s_td4) { u32 S[4] = { sector, 0, 0, 0 }; @@ -453,7 +453,7 @@ DECLSPEC void luks_decrypt_sector_aes_cbc_essiv128_mk_ripemd160_final (__global } } -DECLSPEC void luks_decrypt_sector_aes_cbc_essiv256 (__global const u32 *in, u32 *out, const u32 *ks1, const u32 *ks2, const u32 sector, SHM_TYPE u32 *s_te0, SHM_TYPE u32 *s_te1, SHM_TYPE u32 *s_te2, SHM_TYPE u32 *s_te3, SHM_TYPE u32 *s_te4, SHM_TYPE u32 *s_td0, SHM_TYPE u32 *s_td1, SHM_TYPE u32 *s_td2, SHM_TYPE u32 *s_td3, SHM_TYPE u32 *s_td4) +DECLSPEC void luks_decrypt_sector_aes_cbc_essiv256 (GLOBAL_AS const u32 *in, u32 *out, const u32 *ks1, const u32 *ks2, const u32 sector, SHM_TYPE u32 *s_te0, SHM_TYPE u32 *s_te1, SHM_TYPE u32 *s_te2, SHM_TYPE u32 *s_te3, SHM_TYPE u32 *s_te4, SHM_TYPE u32 *s_td0, SHM_TYPE u32 *s_td1, SHM_TYPE u32 *s_td2, SHM_TYPE u32 *s_td3, SHM_TYPE u32 *s_td4) { u32 S[4] = { sector, 0, 0, 0 }; @@ -487,7 +487,7 @@ DECLSPEC void luks_decrypt_sector_aes_cbc_essiv256 (__global const u32 *in, u32 } } -DECLSPEC void luks_decrypt_sector_aes_cbc_essiv256_mk_sha1 (__global const u32 *in, u32 *mk, const u32 *ks1, const u32 *ks2, const u32 sector, SHM_TYPE u32 *s_te0, SHM_TYPE u32 *s_te1, SHM_TYPE u32 *s_te2, SHM_TYPE u32 *s_te3, SHM_TYPE u32 *s_te4, SHM_TYPE u32 *s_td0, SHM_TYPE u32 *s_td1, SHM_TYPE u32 *s_td2, SHM_TYPE u32 *s_td3, SHM_TYPE u32 *s_td4) +DECLSPEC void luks_decrypt_sector_aes_cbc_essiv256_mk_sha1 (GLOBAL_AS const u32 *in, u32 *mk, const u32 *ks1, const u32 *ks2, const u32 sector, SHM_TYPE u32 *s_te0, SHM_TYPE u32 *s_te1, SHM_TYPE u32 *s_te2, SHM_TYPE u32 *s_te3, SHM_TYPE u32 *s_te4, SHM_TYPE u32 *s_td0, SHM_TYPE u32 *s_td1, SHM_TYPE u32 *s_td2, SHM_TYPE u32 *s_td3, SHM_TYPE u32 *s_td4) { u32 S[4] = { sector, 0, 0, 0 }; @@ -524,7 +524,7 @@ DECLSPEC void luks_decrypt_sector_aes_cbc_essiv256_mk_sha1 (__global const u32 * } } -DECLSPEC void luks_decrypt_sector_aes_cbc_essiv256_mk_sha1_final (__global const u32 *in, u32 *mk, const u32 *ks1, const u32 *ks2, const u32 sector, SHM_TYPE u32 *s_te0, SHM_TYPE u32 *s_te1, SHM_TYPE u32 *s_te2, SHM_TYPE u32 *s_te3, SHM_TYPE u32 *s_te4, SHM_TYPE u32 *s_td0, SHM_TYPE u32 *s_td1, SHM_TYPE u32 *s_td2, SHM_TYPE u32 *s_td3, SHM_TYPE u32 *s_td4) +DECLSPEC void luks_decrypt_sector_aes_cbc_essiv256_mk_sha1_final (GLOBAL_AS const u32 *in, u32 *mk, const u32 *ks1, const u32 *ks2, const u32 sector, SHM_TYPE u32 *s_te0, SHM_TYPE u32 *s_te1, SHM_TYPE u32 *s_te2, SHM_TYPE u32 *s_te3, SHM_TYPE u32 *s_te4, SHM_TYPE u32 *s_td0, SHM_TYPE u32 *s_td1, SHM_TYPE u32 *s_td2, SHM_TYPE u32 *s_td3, SHM_TYPE u32 *s_td4) { u32 S[4] = { sector, 0, 0, 0 }; @@ -584,7 +584,7 @@ DECLSPEC void luks_decrypt_sector_aes_cbc_essiv256_mk_sha1_final (__global const } } -DECLSPEC void luks_decrypt_sector_aes_cbc_essiv256_mk_sha256 (__global const u32 *in, u32 *mk, const u32 *ks1, const u32 *ks2, const u32 sector, SHM_TYPE u32 *s_te0, SHM_TYPE u32 *s_te1, SHM_TYPE u32 *s_te2, SHM_TYPE u32 *s_te3, SHM_TYPE u32 *s_te4, SHM_TYPE u32 *s_td0, SHM_TYPE u32 *s_td1, SHM_TYPE u32 *s_td2, SHM_TYPE u32 *s_td3, SHM_TYPE u32 *s_td4) +DECLSPEC void luks_decrypt_sector_aes_cbc_essiv256_mk_sha256 (GLOBAL_AS const u32 *in, u32 *mk, const u32 *ks1, const u32 *ks2, const u32 sector, SHM_TYPE u32 *s_te0, SHM_TYPE u32 *s_te1, SHM_TYPE u32 *s_te2, SHM_TYPE u32 *s_te3, SHM_TYPE u32 *s_te4, SHM_TYPE u32 *s_td0, SHM_TYPE u32 *s_td1, SHM_TYPE u32 *s_td2, SHM_TYPE u32 *s_td3, SHM_TYPE u32 *s_td4) { u32 S[4] = { sector, 0, 0, 0 }; @@ -621,7 +621,7 @@ DECLSPEC void luks_decrypt_sector_aes_cbc_essiv256_mk_sha256 (__global const u32 } } -DECLSPEC void luks_decrypt_sector_aes_cbc_essiv256_mk_sha256_final (__global const u32 *in, u32 *mk, const u32 *ks1, const u32 *ks2, const u32 sector, SHM_TYPE u32 *s_te0, SHM_TYPE u32 *s_te1, SHM_TYPE u32 *s_te2, SHM_TYPE u32 *s_te3, SHM_TYPE u32 *s_te4, SHM_TYPE u32 *s_td0, SHM_TYPE u32 *s_td1, SHM_TYPE u32 *s_td2, SHM_TYPE u32 *s_td3, SHM_TYPE u32 *s_td4) +DECLSPEC void luks_decrypt_sector_aes_cbc_essiv256_mk_sha256_final (GLOBAL_AS const u32 *in, u32 *mk, const u32 *ks1, const u32 *ks2, const u32 sector, SHM_TYPE u32 *s_te0, SHM_TYPE u32 *s_te1, SHM_TYPE u32 *s_te2, SHM_TYPE u32 *s_te3, SHM_TYPE u32 *s_te4, SHM_TYPE u32 *s_td0, SHM_TYPE u32 *s_td1, SHM_TYPE u32 *s_td2, SHM_TYPE u32 *s_td3, SHM_TYPE u32 *s_td4) { u32 S[4] = { sector, 0, 0, 0 }; @@ -681,7 +681,7 @@ DECLSPEC void luks_decrypt_sector_aes_cbc_essiv256_mk_sha256_final (__global con } } -DECLSPEC void luks_decrypt_sector_aes_cbc_essiv256_mk_sha512 (__global const u32 *in, u32 *mk, const u32 *ks1, const u32 *ks2, const u32 sector, SHM_TYPE u32 *s_te0, SHM_TYPE u32 *s_te1, SHM_TYPE u32 *s_te2, SHM_TYPE u32 *s_te3, SHM_TYPE u32 *s_te4, SHM_TYPE u32 *s_td0, SHM_TYPE u32 *s_td1, SHM_TYPE u32 *s_td2, SHM_TYPE u32 *s_td3, SHM_TYPE u32 *s_td4) +DECLSPEC void luks_decrypt_sector_aes_cbc_essiv256_mk_sha512 (GLOBAL_AS const u32 *in, u32 *mk, const u32 *ks1, const u32 *ks2, const u32 sector, SHM_TYPE u32 *s_te0, SHM_TYPE u32 *s_te1, SHM_TYPE u32 *s_te2, SHM_TYPE u32 *s_te3, SHM_TYPE u32 *s_te4, SHM_TYPE u32 *s_td0, SHM_TYPE u32 *s_td1, SHM_TYPE u32 *s_td2, SHM_TYPE u32 *s_td3, SHM_TYPE u32 *s_td4) { u32 S[4] = { sector, 0, 0, 0 }; @@ -718,7 +718,7 @@ DECLSPEC void luks_decrypt_sector_aes_cbc_essiv256_mk_sha512 (__global const u32 } } -DECLSPEC void luks_decrypt_sector_aes_cbc_essiv256_mk_sha512_final (__global const u32 *in, u32 *mk, const u32 *ks1, const u32 *ks2, const u32 sector, SHM_TYPE u32 *s_te0, SHM_TYPE u32 *s_te1, SHM_TYPE u32 *s_te2, SHM_TYPE u32 *s_te3, SHM_TYPE u32 *s_te4, SHM_TYPE u32 *s_td0, SHM_TYPE u32 *s_td1, SHM_TYPE u32 *s_td2, SHM_TYPE u32 *s_td3, SHM_TYPE u32 *s_td4) +DECLSPEC void luks_decrypt_sector_aes_cbc_essiv256_mk_sha512_final (GLOBAL_AS const u32 *in, u32 *mk, const u32 *ks1, const u32 *ks2, const u32 sector, SHM_TYPE u32 *s_te0, SHM_TYPE u32 *s_te1, SHM_TYPE u32 *s_te2, SHM_TYPE u32 *s_te3, SHM_TYPE u32 *s_te4, SHM_TYPE u32 *s_td0, SHM_TYPE u32 *s_td1, SHM_TYPE u32 *s_td2, SHM_TYPE u32 *s_td3, SHM_TYPE u32 *s_td4) { u32 S[4] = { sector, 0, 0, 0 }; @@ -778,7 +778,7 @@ DECLSPEC void luks_decrypt_sector_aes_cbc_essiv256_mk_sha512_final (__global con } } -DECLSPEC void luks_decrypt_sector_aes_cbc_essiv256_mk_ripemd160 (__global const u32 *in, u32 *mk, const u32 *ks1, const u32 *ks2, const u32 sector, SHM_TYPE u32 *s_te0, SHM_TYPE u32 *s_te1, SHM_TYPE u32 *s_te2, SHM_TYPE u32 *s_te3, SHM_TYPE u32 *s_te4, SHM_TYPE u32 *s_td0, SHM_TYPE u32 *s_td1, SHM_TYPE u32 *s_td2, SHM_TYPE u32 *s_td3, SHM_TYPE u32 *s_td4) +DECLSPEC void luks_decrypt_sector_aes_cbc_essiv256_mk_ripemd160 (GLOBAL_AS const u32 *in, u32 *mk, const u32 *ks1, const u32 *ks2, const u32 sector, SHM_TYPE u32 *s_te0, SHM_TYPE u32 *s_te1, SHM_TYPE u32 *s_te2, SHM_TYPE u32 *s_te3, SHM_TYPE u32 *s_te4, SHM_TYPE u32 *s_td0, SHM_TYPE u32 *s_td1, SHM_TYPE u32 *s_td2, SHM_TYPE u32 *s_td3, SHM_TYPE u32 *s_td4) { u32 S[4] = { sector, 0, 0, 0 }; @@ -815,7 +815,7 @@ DECLSPEC void luks_decrypt_sector_aes_cbc_essiv256_mk_ripemd160 (__global const } } -DECLSPEC void luks_decrypt_sector_aes_cbc_essiv256_mk_ripemd160_final (__global const u32 *in, u32 *mk, const u32 *ks1, const u32 *ks2, const u32 sector, SHM_TYPE u32 *s_te0, SHM_TYPE u32 *s_te1, SHM_TYPE u32 *s_te2, SHM_TYPE u32 *s_te3, SHM_TYPE u32 *s_te4, SHM_TYPE u32 *s_td0, SHM_TYPE u32 *s_td1, SHM_TYPE u32 *s_td2, SHM_TYPE u32 *s_td3, SHM_TYPE u32 *s_td4) +DECLSPEC void luks_decrypt_sector_aes_cbc_essiv256_mk_ripemd160_final (GLOBAL_AS const u32 *in, u32 *mk, const u32 *ks1, const u32 *ks2, const u32 sector, SHM_TYPE u32 *s_te0, SHM_TYPE u32 *s_te1, SHM_TYPE u32 *s_te2, SHM_TYPE u32 *s_te3, SHM_TYPE u32 *s_te4, SHM_TYPE u32 *s_td0, SHM_TYPE u32 *s_td1, SHM_TYPE u32 *s_td2, SHM_TYPE u32 *s_td3, SHM_TYPE u32 *s_td4) { u32 S[4] = { sector, 0, 0, 0 }; @@ -877,7 +877,7 @@ DECLSPEC void luks_decrypt_sector_aes_cbc_essiv256_mk_ripemd160_final (__global // cbc-plain -DECLSPEC void luks_decrypt_sector_aes_cbc_plain128 (__global const u32 *in, u32 *out, const u32 *ks1, const u32 sector, SHM_TYPE u32 *s_te0, SHM_TYPE u32 *s_te1, SHM_TYPE u32 *s_te2, SHM_TYPE u32 *s_te3, SHM_TYPE u32 *s_te4, SHM_TYPE u32 *s_td0, SHM_TYPE u32 *s_td1, SHM_TYPE u32 *s_td2, SHM_TYPE u32 *s_td3, SHM_TYPE u32 *s_td4) +DECLSPEC void luks_decrypt_sector_aes_cbc_plain128 (GLOBAL_AS const u32 *in, u32 *out, const u32 *ks1, const u32 sector, SHM_TYPE u32 *s_te0, SHM_TYPE u32 *s_te1, SHM_TYPE u32 *s_te2, SHM_TYPE u32 *s_te3, SHM_TYPE u32 *s_te4, SHM_TYPE u32 *s_td0, SHM_TYPE u32 *s_td1, SHM_TYPE u32 *s_td2, SHM_TYPE u32 *s_td3, SHM_TYPE u32 *s_td4) { u32 S[4] = { sector, 0, 0, 0 }; @@ -907,7 +907,7 @@ DECLSPEC void luks_decrypt_sector_aes_cbc_plain128 (__global const u32 *in, u32 } } -DECLSPEC void luks_decrypt_sector_aes_cbc_plain128_mk_sha1 (__global const u32 *in, u32 *mk, const u32 *ks1, const u32 sector, SHM_TYPE u32 *s_te0, SHM_TYPE u32 *s_te1, SHM_TYPE u32 *s_te2, SHM_TYPE u32 *s_te3, SHM_TYPE u32 *s_te4, SHM_TYPE u32 *s_td0, SHM_TYPE u32 *s_td1, SHM_TYPE u32 *s_td2, SHM_TYPE u32 *s_td3, SHM_TYPE u32 *s_td4) +DECLSPEC void luks_decrypt_sector_aes_cbc_plain128_mk_sha1 (GLOBAL_AS const u32 *in, u32 *mk, const u32 *ks1, const u32 sector, SHM_TYPE u32 *s_te0, SHM_TYPE u32 *s_te1, SHM_TYPE u32 *s_te2, SHM_TYPE u32 *s_te3, SHM_TYPE u32 *s_te4, SHM_TYPE u32 *s_td0, SHM_TYPE u32 *s_td1, SHM_TYPE u32 *s_td2, SHM_TYPE u32 *s_td3, SHM_TYPE u32 *s_td4) { u32 S[4] = { sector, 0, 0, 0 }; @@ -940,7 +940,7 @@ DECLSPEC void luks_decrypt_sector_aes_cbc_plain128_mk_sha1 (__global const u32 * } } -DECLSPEC void luks_decrypt_sector_aes_cbc_plain128_mk_sha1_final (__global const u32 *in, u32 *mk, const u32 *ks1, const u32 sector, SHM_TYPE u32 *s_te0, SHM_TYPE u32 *s_te1, SHM_TYPE u32 *s_te2, SHM_TYPE u32 *s_te3, SHM_TYPE u32 *s_te4, SHM_TYPE u32 *s_td0, SHM_TYPE u32 *s_td1, SHM_TYPE u32 *s_td2, SHM_TYPE u32 *s_td3, SHM_TYPE u32 *s_td4) +DECLSPEC void luks_decrypt_sector_aes_cbc_plain128_mk_sha1_final (GLOBAL_AS const u32 *in, u32 *mk, const u32 *ks1, const u32 sector, SHM_TYPE u32 *s_te0, SHM_TYPE u32 *s_te1, SHM_TYPE u32 *s_te2, SHM_TYPE u32 *s_te3, SHM_TYPE u32 *s_te4, SHM_TYPE u32 *s_td0, SHM_TYPE u32 *s_td1, SHM_TYPE u32 *s_td2, SHM_TYPE u32 *s_td3, SHM_TYPE u32 *s_td4) { u32 S[4] = { sector, 0, 0, 0 }; @@ -996,7 +996,7 @@ DECLSPEC void luks_decrypt_sector_aes_cbc_plain128_mk_sha1_final (__global const } } -DECLSPEC void luks_decrypt_sector_aes_cbc_plain128_mk_sha256 (__global const u32 *in, u32 *mk, const u32 *ks1, const u32 sector, SHM_TYPE u32 *s_te0, SHM_TYPE u32 *s_te1, SHM_TYPE u32 *s_te2, SHM_TYPE u32 *s_te3, SHM_TYPE u32 *s_te4, SHM_TYPE u32 *s_td0, SHM_TYPE u32 *s_td1, SHM_TYPE u32 *s_td2, SHM_TYPE u32 *s_td3, SHM_TYPE u32 *s_td4) +DECLSPEC void luks_decrypt_sector_aes_cbc_plain128_mk_sha256 (GLOBAL_AS const u32 *in, u32 *mk, const u32 *ks1, const u32 sector, SHM_TYPE u32 *s_te0, SHM_TYPE u32 *s_te1, SHM_TYPE u32 *s_te2, SHM_TYPE u32 *s_te3, SHM_TYPE u32 *s_te4, SHM_TYPE u32 *s_td0, SHM_TYPE u32 *s_td1, SHM_TYPE u32 *s_td2, SHM_TYPE u32 *s_td3, SHM_TYPE u32 *s_td4) { u32 S[4] = { sector, 0, 0, 0 }; @@ -1029,7 +1029,7 @@ DECLSPEC void luks_decrypt_sector_aes_cbc_plain128_mk_sha256 (__global const u32 } } -DECLSPEC void luks_decrypt_sector_aes_cbc_plain128_mk_sha256_final (__global const u32 *in, u32 *mk, const u32 *ks1, const u32 sector, SHM_TYPE u32 *s_te0, SHM_TYPE u32 *s_te1, SHM_TYPE u32 *s_te2, SHM_TYPE u32 *s_te3, SHM_TYPE u32 *s_te4, SHM_TYPE u32 *s_td0, SHM_TYPE u32 *s_td1, SHM_TYPE u32 *s_td2, SHM_TYPE u32 *s_td3, SHM_TYPE u32 *s_td4) +DECLSPEC void luks_decrypt_sector_aes_cbc_plain128_mk_sha256_final (GLOBAL_AS const u32 *in, u32 *mk, const u32 *ks1, const u32 sector, SHM_TYPE u32 *s_te0, SHM_TYPE u32 *s_te1, SHM_TYPE u32 *s_te2, SHM_TYPE u32 *s_te3, SHM_TYPE u32 *s_te4, SHM_TYPE u32 *s_td0, SHM_TYPE u32 *s_td1, SHM_TYPE u32 *s_td2, SHM_TYPE u32 *s_td3, SHM_TYPE u32 *s_td4) { u32 S[4] = { sector, 0, 0, 0 }; @@ -1085,7 +1085,7 @@ DECLSPEC void luks_decrypt_sector_aes_cbc_plain128_mk_sha256_final (__global con } } -DECLSPEC void luks_decrypt_sector_aes_cbc_plain128_mk_sha512 (__global const u32 *in, u32 *mk, const u32 *ks1, const u32 sector, SHM_TYPE u32 *s_te0, SHM_TYPE u32 *s_te1, SHM_TYPE u32 *s_te2, SHM_TYPE u32 *s_te3, SHM_TYPE u32 *s_te4, SHM_TYPE u32 *s_td0, SHM_TYPE u32 *s_td1, SHM_TYPE u32 *s_td2, SHM_TYPE u32 *s_td3, SHM_TYPE u32 *s_td4) +DECLSPEC void luks_decrypt_sector_aes_cbc_plain128_mk_sha512 (GLOBAL_AS const u32 *in, u32 *mk, const u32 *ks1, const u32 sector, SHM_TYPE u32 *s_te0, SHM_TYPE u32 *s_te1, SHM_TYPE u32 *s_te2, SHM_TYPE u32 *s_te3, SHM_TYPE u32 *s_te4, SHM_TYPE u32 *s_td0, SHM_TYPE u32 *s_td1, SHM_TYPE u32 *s_td2, SHM_TYPE u32 *s_td3, SHM_TYPE u32 *s_td4) { u32 S[4] = { sector, 0, 0, 0 }; @@ -1118,7 +1118,7 @@ DECLSPEC void luks_decrypt_sector_aes_cbc_plain128_mk_sha512 (__global const u32 } } -DECLSPEC void luks_decrypt_sector_aes_cbc_plain128_mk_sha512_final (__global const u32 *in, u32 *mk, const u32 *ks1, const u32 sector, SHM_TYPE u32 *s_te0, SHM_TYPE u32 *s_te1, SHM_TYPE u32 *s_te2, SHM_TYPE u32 *s_te3, SHM_TYPE u32 *s_te4, SHM_TYPE u32 *s_td0, SHM_TYPE u32 *s_td1, SHM_TYPE u32 *s_td2, SHM_TYPE u32 *s_td3, SHM_TYPE u32 *s_td4) +DECLSPEC void luks_decrypt_sector_aes_cbc_plain128_mk_sha512_final (GLOBAL_AS const u32 *in, u32 *mk, const u32 *ks1, const u32 sector, SHM_TYPE u32 *s_te0, SHM_TYPE u32 *s_te1, SHM_TYPE u32 *s_te2, SHM_TYPE u32 *s_te3, SHM_TYPE u32 *s_te4, SHM_TYPE u32 *s_td0, SHM_TYPE u32 *s_td1, SHM_TYPE u32 *s_td2, SHM_TYPE u32 *s_td3, SHM_TYPE u32 *s_td4) { u32 S[4] = { sector, 0, 0, 0 }; @@ -1174,7 +1174,7 @@ DECLSPEC void luks_decrypt_sector_aes_cbc_plain128_mk_sha512_final (__global con } } -DECLSPEC void luks_decrypt_sector_aes_cbc_plain128_mk_ripemd160 (__global const u32 *in, u32 *mk, const u32 *ks1, const u32 sector, SHM_TYPE u32 *s_te0, SHM_TYPE u32 *s_te1, SHM_TYPE u32 *s_te2, SHM_TYPE u32 *s_te3, SHM_TYPE u32 *s_te4, SHM_TYPE u32 *s_td0, SHM_TYPE u32 *s_td1, SHM_TYPE u32 *s_td2, SHM_TYPE u32 *s_td3, SHM_TYPE u32 *s_td4) +DECLSPEC void luks_decrypt_sector_aes_cbc_plain128_mk_ripemd160 (GLOBAL_AS const u32 *in, u32 *mk, const u32 *ks1, const u32 sector, SHM_TYPE u32 *s_te0, SHM_TYPE u32 *s_te1, SHM_TYPE u32 *s_te2, SHM_TYPE u32 *s_te3, SHM_TYPE u32 *s_te4, SHM_TYPE u32 *s_td0, SHM_TYPE u32 *s_td1, SHM_TYPE u32 *s_td2, SHM_TYPE u32 *s_td3, SHM_TYPE u32 *s_td4) { u32 S[4] = { sector, 0, 0, 0 }; @@ -1207,7 +1207,7 @@ DECLSPEC void luks_decrypt_sector_aes_cbc_plain128_mk_ripemd160 (__global const } } -DECLSPEC void luks_decrypt_sector_aes_cbc_plain128_mk_ripemd160_final (__global const u32 *in, u32 *mk, const u32 *ks1, const u32 sector, SHM_TYPE u32 *s_te0, SHM_TYPE u32 *s_te1, SHM_TYPE u32 *s_te2, SHM_TYPE u32 *s_te3, SHM_TYPE u32 *s_te4, SHM_TYPE u32 *s_td0, SHM_TYPE u32 *s_td1, SHM_TYPE u32 *s_td2, SHM_TYPE u32 *s_td3, SHM_TYPE u32 *s_td4) +DECLSPEC void luks_decrypt_sector_aes_cbc_plain128_mk_ripemd160_final (GLOBAL_AS const u32 *in, u32 *mk, const u32 *ks1, const u32 sector, SHM_TYPE u32 *s_te0, SHM_TYPE u32 *s_te1, SHM_TYPE u32 *s_te2, SHM_TYPE u32 *s_te3, SHM_TYPE u32 *s_te4, SHM_TYPE u32 *s_td0, SHM_TYPE u32 *s_td1, SHM_TYPE u32 *s_td2, SHM_TYPE u32 *s_td3, SHM_TYPE u32 *s_td4) { u32 S[4] = { sector, 0, 0, 0 }; @@ -1263,7 +1263,7 @@ DECLSPEC void luks_decrypt_sector_aes_cbc_plain128_mk_ripemd160_final (__global } } -DECLSPEC void luks_decrypt_sector_aes_cbc_plain256 (__global const u32 *in, u32 *out, const u32 *ks1, const u32 sector, SHM_TYPE u32 *s_te0, SHM_TYPE u32 *s_te1, SHM_TYPE u32 *s_te2, SHM_TYPE u32 *s_te3, SHM_TYPE u32 *s_te4, SHM_TYPE u32 *s_td0, SHM_TYPE u32 *s_td1, SHM_TYPE u32 *s_td2, SHM_TYPE u32 *s_td3, SHM_TYPE u32 *s_td4) +DECLSPEC void luks_decrypt_sector_aes_cbc_plain256 (GLOBAL_AS const u32 *in, u32 *out, const u32 *ks1, const u32 sector, SHM_TYPE u32 *s_te0, SHM_TYPE u32 *s_te1, SHM_TYPE u32 *s_te2, SHM_TYPE u32 *s_te3, SHM_TYPE u32 *s_te4, SHM_TYPE u32 *s_td0, SHM_TYPE u32 *s_td1, SHM_TYPE u32 *s_td2, SHM_TYPE u32 *s_td3, SHM_TYPE u32 *s_td4) { u32 S[4] = { sector, 0, 0, 0 }; @@ -1293,7 +1293,7 @@ DECLSPEC void luks_decrypt_sector_aes_cbc_plain256 (__global const u32 *in, u32 } } -DECLSPEC void luks_decrypt_sector_aes_cbc_plain256_mk_sha1 (__global const u32 *in, u32 *mk, const u32 *ks1, const u32 sector, SHM_TYPE u32 *s_te0, SHM_TYPE u32 *s_te1, SHM_TYPE u32 *s_te2, SHM_TYPE u32 *s_te3, SHM_TYPE u32 *s_te4, SHM_TYPE u32 *s_td0, SHM_TYPE u32 *s_td1, SHM_TYPE u32 *s_td2, SHM_TYPE u32 *s_td3, SHM_TYPE u32 *s_td4) +DECLSPEC void luks_decrypt_sector_aes_cbc_plain256_mk_sha1 (GLOBAL_AS const u32 *in, u32 *mk, const u32 *ks1, const u32 sector, SHM_TYPE u32 *s_te0, SHM_TYPE u32 *s_te1, SHM_TYPE u32 *s_te2, SHM_TYPE u32 *s_te3, SHM_TYPE u32 *s_te4, SHM_TYPE u32 *s_td0, SHM_TYPE u32 *s_td1, SHM_TYPE u32 *s_td2, SHM_TYPE u32 *s_td3, SHM_TYPE u32 *s_td4) { u32 S[4] = { sector, 0, 0, 0 }; @@ -1326,7 +1326,7 @@ DECLSPEC void luks_decrypt_sector_aes_cbc_plain256_mk_sha1 (__global const u32 * } } -DECLSPEC void luks_decrypt_sector_aes_cbc_plain256_mk_sha1_final (__global const u32 *in, u32 *mk, const u32 *ks1, const u32 sector, SHM_TYPE u32 *s_te0, SHM_TYPE u32 *s_te1, SHM_TYPE u32 *s_te2, SHM_TYPE u32 *s_te3, SHM_TYPE u32 *s_te4, SHM_TYPE u32 *s_td0, SHM_TYPE u32 *s_td1, SHM_TYPE u32 *s_td2, SHM_TYPE u32 *s_td3, SHM_TYPE u32 *s_td4) +DECLSPEC void luks_decrypt_sector_aes_cbc_plain256_mk_sha1_final (GLOBAL_AS const u32 *in, u32 *mk, const u32 *ks1, const u32 sector, SHM_TYPE u32 *s_te0, SHM_TYPE u32 *s_te1, SHM_TYPE u32 *s_te2, SHM_TYPE u32 *s_te3, SHM_TYPE u32 *s_te4, SHM_TYPE u32 *s_td0, SHM_TYPE u32 *s_td1, SHM_TYPE u32 *s_td2, SHM_TYPE u32 *s_td3, SHM_TYPE u32 *s_td4) { u32 S[4] = { sector, 0, 0, 0 }; @@ -1382,7 +1382,7 @@ DECLSPEC void luks_decrypt_sector_aes_cbc_plain256_mk_sha1_final (__global const } } -DECLSPEC void luks_decrypt_sector_aes_cbc_plain256_mk_sha256 (__global const u32 *in, u32 *mk, const u32 *ks1, const u32 sector, SHM_TYPE u32 *s_te0, SHM_TYPE u32 *s_te1, SHM_TYPE u32 *s_te2, SHM_TYPE u32 *s_te3, SHM_TYPE u32 *s_te4, SHM_TYPE u32 *s_td0, SHM_TYPE u32 *s_td1, SHM_TYPE u32 *s_td2, SHM_TYPE u32 *s_td3, SHM_TYPE u32 *s_td4) +DECLSPEC void luks_decrypt_sector_aes_cbc_plain256_mk_sha256 (GLOBAL_AS const u32 *in, u32 *mk, const u32 *ks1, const u32 sector, SHM_TYPE u32 *s_te0, SHM_TYPE u32 *s_te1, SHM_TYPE u32 *s_te2, SHM_TYPE u32 *s_te3, SHM_TYPE u32 *s_te4, SHM_TYPE u32 *s_td0, SHM_TYPE u32 *s_td1, SHM_TYPE u32 *s_td2, SHM_TYPE u32 *s_td3, SHM_TYPE u32 *s_td4) { u32 S[4] = { sector, 0, 0, 0 }; @@ -1415,7 +1415,7 @@ DECLSPEC void luks_decrypt_sector_aes_cbc_plain256_mk_sha256 (__global const u32 } } -DECLSPEC void luks_decrypt_sector_aes_cbc_plain256_mk_sha256_final (__global const u32 *in, u32 *mk, const u32 *ks1, const u32 sector, SHM_TYPE u32 *s_te0, SHM_TYPE u32 *s_te1, SHM_TYPE u32 *s_te2, SHM_TYPE u32 *s_te3, SHM_TYPE u32 *s_te4, SHM_TYPE u32 *s_td0, SHM_TYPE u32 *s_td1, SHM_TYPE u32 *s_td2, SHM_TYPE u32 *s_td3, SHM_TYPE u32 *s_td4) +DECLSPEC void luks_decrypt_sector_aes_cbc_plain256_mk_sha256_final (GLOBAL_AS const u32 *in, u32 *mk, const u32 *ks1, const u32 sector, SHM_TYPE u32 *s_te0, SHM_TYPE u32 *s_te1, SHM_TYPE u32 *s_te2, SHM_TYPE u32 *s_te3, SHM_TYPE u32 *s_te4, SHM_TYPE u32 *s_td0, SHM_TYPE u32 *s_td1, SHM_TYPE u32 *s_td2, SHM_TYPE u32 *s_td3, SHM_TYPE u32 *s_td4) { u32 S[4] = { sector, 0, 0, 0 }; @@ -1471,7 +1471,7 @@ DECLSPEC void luks_decrypt_sector_aes_cbc_plain256_mk_sha256_final (__global con } } -DECLSPEC void luks_decrypt_sector_aes_cbc_plain256_mk_sha512 (__global const u32 *in, u32 *mk, const u32 *ks1, const u32 sector, SHM_TYPE u32 *s_te0, SHM_TYPE u32 *s_te1, SHM_TYPE u32 *s_te2, SHM_TYPE u32 *s_te3, SHM_TYPE u32 *s_te4, SHM_TYPE u32 *s_td0, SHM_TYPE u32 *s_td1, SHM_TYPE u32 *s_td2, SHM_TYPE u32 *s_td3, SHM_TYPE u32 *s_td4) +DECLSPEC void luks_decrypt_sector_aes_cbc_plain256_mk_sha512 (GLOBAL_AS const u32 *in, u32 *mk, const u32 *ks1, const u32 sector, SHM_TYPE u32 *s_te0, SHM_TYPE u32 *s_te1, SHM_TYPE u32 *s_te2, SHM_TYPE u32 *s_te3, SHM_TYPE u32 *s_te4, SHM_TYPE u32 *s_td0, SHM_TYPE u32 *s_td1, SHM_TYPE u32 *s_td2, SHM_TYPE u32 *s_td3, SHM_TYPE u32 *s_td4) { u32 S[4] = { sector, 0, 0, 0 }; @@ -1504,7 +1504,7 @@ DECLSPEC void luks_decrypt_sector_aes_cbc_plain256_mk_sha512 (__global const u32 } } -DECLSPEC void luks_decrypt_sector_aes_cbc_plain256_mk_sha512_final (__global const u32 *in, u32 *mk, const u32 *ks1, const u32 sector, SHM_TYPE u32 *s_te0, SHM_TYPE u32 *s_te1, SHM_TYPE u32 *s_te2, SHM_TYPE u32 *s_te3, SHM_TYPE u32 *s_te4, SHM_TYPE u32 *s_td0, SHM_TYPE u32 *s_td1, SHM_TYPE u32 *s_td2, SHM_TYPE u32 *s_td3, SHM_TYPE u32 *s_td4) +DECLSPEC void luks_decrypt_sector_aes_cbc_plain256_mk_sha512_final (GLOBAL_AS const u32 *in, u32 *mk, const u32 *ks1, const u32 sector, SHM_TYPE u32 *s_te0, SHM_TYPE u32 *s_te1, SHM_TYPE u32 *s_te2, SHM_TYPE u32 *s_te3, SHM_TYPE u32 *s_te4, SHM_TYPE u32 *s_td0, SHM_TYPE u32 *s_td1, SHM_TYPE u32 *s_td2, SHM_TYPE u32 *s_td3, SHM_TYPE u32 *s_td4) { u32 S[4] = { sector, 0, 0, 0 }; @@ -1560,7 +1560,7 @@ DECLSPEC void luks_decrypt_sector_aes_cbc_plain256_mk_sha512_final (__global con } } -DECLSPEC void luks_decrypt_sector_aes_cbc_plain256_mk_ripemd160 (__global const u32 *in, u32 *mk, const u32 *ks1, const u32 sector, SHM_TYPE u32 *s_te0, SHM_TYPE u32 *s_te1, SHM_TYPE u32 *s_te2, SHM_TYPE u32 *s_te3, SHM_TYPE u32 *s_te4, SHM_TYPE u32 *s_td0, SHM_TYPE u32 *s_td1, SHM_TYPE u32 *s_td2, SHM_TYPE u32 *s_td3, SHM_TYPE u32 *s_td4) +DECLSPEC void luks_decrypt_sector_aes_cbc_plain256_mk_ripemd160 (GLOBAL_AS const u32 *in, u32 *mk, const u32 *ks1, const u32 sector, SHM_TYPE u32 *s_te0, SHM_TYPE u32 *s_te1, SHM_TYPE u32 *s_te2, SHM_TYPE u32 *s_te3, SHM_TYPE u32 *s_te4, SHM_TYPE u32 *s_td0, SHM_TYPE u32 *s_td1, SHM_TYPE u32 *s_td2, SHM_TYPE u32 *s_td3, SHM_TYPE u32 *s_td4) { u32 S[4] = { sector, 0, 0, 0 }; @@ -1593,7 +1593,7 @@ DECLSPEC void luks_decrypt_sector_aes_cbc_plain256_mk_ripemd160 (__global const } } -DECLSPEC void luks_decrypt_sector_aes_cbc_plain256_mk_ripemd160_final (__global const u32 *in, u32 *mk, const u32 *ks1, const u32 sector, SHM_TYPE u32 *s_te0, SHM_TYPE u32 *s_te1, SHM_TYPE u32 *s_te2, SHM_TYPE u32 *s_te3, SHM_TYPE u32 *s_te4, SHM_TYPE u32 *s_td0, SHM_TYPE u32 *s_td1, SHM_TYPE u32 *s_td2, SHM_TYPE u32 *s_td3, SHM_TYPE u32 *s_td4) +DECLSPEC void luks_decrypt_sector_aes_cbc_plain256_mk_ripemd160_final (GLOBAL_AS const u32 *in, u32 *mk, const u32 *ks1, const u32 sector, SHM_TYPE u32 *s_te0, SHM_TYPE u32 *s_te1, SHM_TYPE u32 *s_te2, SHM_TYPE u32 *s_te3, SHM_TYPE u32 *s_te4, SHM_TYPE u32 *s_td0, SHM_TYPE u32 *s_td1, SHM_TYPE u32 *s_td2, SHM_TYPE u32 *s_td3, SHM_TYPE u32 *s_td4) { u32 S[4] = { sector, 0, 0, 0 }; @@ -1695,7 +1695,7 @@ DECLSPEC void aes256_decrypt_xts (const u32 *ks1, const u32 *in, u32 *out, u32 * xts_mul2 (T, T); } -DECLSPEC void luks_decrypt_sector_aes_xts_plain256 (__global const u32 *in, u32 *out, const u32 *ks1, const u32 *ks2, const u32 sector, SHM_TYPE u32 *s_te0, SHM_TYPE u32 *s_te1, SHM_TYPE u32 *s_te2, SHM_TYPE u32 *s_te3, SHM_TYPE u32 *s_te4, SHM_TYPE u32 *s_td0, SHM_TYPE u32 *s_td1, SHM_TYPE u32 *s_td2, SHM_TYPE u32 *s_td3, SHM_TYPE u32 *s_td4) +DECLSPEC void luks_decrypt_sector_aes_xts_plain256 (GLOBAL_AS const u32 *in, u32 *out, const u32 *ks1, const u32 *ks2, const u32 sector, SHM_TYPE u32 *s_te0, SHM_TYPE u32 *s_te1, SHM_TYPE u32 *s_te2, SHM_TYPE u32 *s_te3, SHM_TYPE u32 *s_te4, SHM_TYPE u32 *s_td0, SHM_TYPE u32 *s_td1, SHM_TYPE u32 *s_td2, SHM_TYPE u32 *s_td3, SHM_TYPE u32 *s_td4) { u32 S[4] = { sector, 0, 0, 0 }; @@ -1729,7 +1729,7 @@ DECLSPEC void luks_decrypt_sector_aes_xts_plain256 (__global const u32 *in, u32 } } -DECLSPEC void luks_decrypt_sector_aes_xts_plain256_mk_sha1 (__global const u32 *in, u32 *mk, const u32 *ks1, const u32 *ks2, const u32 sector, SHM_TYPE u32 *s_te0, SHM_TYPE u32 *s_te1, SHM_TYPE u32 *s_te2, SHM_TYPE u32 *s_te3, SHM_TYPE u32 *s_te4, SHM_TYPE u32 *s_td0, SHM_TYPE u32 *s_td1, SHM_TYPE u32 *s_td2, SHM_TYPE u32 *s_td3, SHM_TYPE u32 *s_td4) +DECLSPEC void luks_decrypt_sector_aes_xts_plain256_mk_sha1 (GLOBAL_AS const u32 *in, u32 *mk, const u32 *ks1, const u32 *ks2, const u32 sector, SHM_TYPE u32 *s_te0, SHM_TYPE u32 *s_te1, SHM_TYPE u32 *s_te2, SHM_TYPE u32 *s_te3, SHM_TYPE u32 *s_te4, SHM_TYPE u32 *s_td0, SHM_TYPE u32 *s_td1, SHM_TYPE u32 *s_td2, SHM_TYPE u32 *s_td3, SHM_TYPE u32 *s_td4) { u32 S[4] = { sector, 0, 0, 0 }; @@ -1766,7 +1766,7 @@ DECLSPEC void luks_decrypt_sector_aes_xts_plain256_mk_sha1 (__global const u32 * } } -DECLSPEC void luks_decrypt_sector_aes_xts_plain256_mk_sha1_final (__global const u32 *in, u32 *mk, const u32 *ks1, const u32 *ks2, const u32 sector, SHM_TYPE u32 *s_te0, SHM_TYPE u32 *s_te1, SHM_TYPE u32 *s_te2, SHM_TYPE u32 *s_te3, SHM_TYPE u32 *s_te4, SHM_TYPE u32 *s_td0, SHM_TYPE u32 *s_td1, SHM_TYPE u32 *s_td2, SHM_TYPE u32 *s_td3, SHM_TYPE u32 *s_td4) +DECLSPEC void luks_decrypt_sector_aes_xts_plain256_mk_sha1_final (GLOBAL_AS const u32 *in, u32 *mk, const u32 *ks1, const u32 *ks2, const u32 sector, SHM_TYPE u32 *s_te0, SHM_TYPE u32 *s_te1, SHM_TYPE u32 *s_te2, SHM_TYPE u32 *s_te3, SHM_TYPE u32 *s_te4, SHM_TYPE u32 *s_td0, SHM_TYPE u32 *s_td1, SHM_TYPE u32 *s_td2, SHM_TYPE u32 *s_td3, SHM_TYPE u32 *s_td4) { u32 S[4] = { sector, 0, 0, 0 }; @@ -1826,7 +1826,7 @@ DECLSPEC void luks_decrypt_sector_aes_xts_plain256_mk_sha1_final (__global const } } -DECLSPEC void luks_decrypt_sector_aes_xts_plain256_mk_sha256 (__global const u32 *in, u32 *mk, const u32 *ks1, const u32 *ks2, const u32 sector, SHM_TYPE u32 *s_te0, SHM_TYPE u32 *s_te1, SHM_TYPE u32 *s_te2, SHM_TYPE u32 *s_te3, SHM_TYPE u32 *s_te4, SHM_TYPE u32 *s_td0, SHM_TYPE u32 *s_td1, SHM_TYPE u32 *s_td2, SHM_TYPE u32 *s_td3, SHM_TYPE u32 *s_td4) +DECLSPEC void luks_decrypt_sector_aes_xts_plain256_mk_sha256 (GLOBAL_AS const u32 *in, u32 *mk, const u32 *ks1, const u32 *ks2, const u32 sector, SHM_TYPE u32 *s_te0, SHM_TYPE u32 *s_te1, SHM_TYPE u32 *s_te2, SHM_TYPE u32 *s_te3, SHM_TYPE u32 *s_te4, SHM_TYPE u32 *s_td0, SHM_TYPE u32 *s_td1, SHM_TYPE u32 *s_td2, SHM_TYPE u32 *s_td3, SHM_TYPE u32 *s_td4) { u32 S[4] = { sector, 0, 0, 0 }; @@ -1863,7 +1863,7 @@ DECLSPEC void luks_decrypt_sector_aes_xts_plain256_mk_sha256 (__global const u32 } } -DECLSPEC void luks_decrypt_sector_aes_xts_plain256_mk_sha256_final (__global const u32 *in, u32 *mk, const u32 *ks1, const u32 *ks2, const u32 sector, SHM_TYPE u32 *s_te0, SHM_TYPE u32 *s_te1, SHM_TYPE u32 *s_te2, SHM_TYPE u32 *s_te3, SHM_TYPE u32 *s_te4, SHM_TYPE u32 *s_td0, SHM_TYPE u32 *s_td1, SHM_TYPE u32 *s_td2, SHM_TYPE u32 *s_td3, SHM_TYPE u32 *s_td4) +DECLSPEC void luks_decrypt_sector_aes_xts_plain256_mk_sha256_final (GLOBAL_AS const u32 *in, u32 *mk, const u32 *ks1, const u32 *ks2, const u32 sector, SHM_TYPE u32 *s_te0, SHM_TYPE u32 *s_te1, SHM_TYPE u32 *s_te2, SHM_TYPE u32 *s_te3, SHM_TYPE u32 *s_te4, SHM_TYPE u32 *s_td0, SHM_TYPE u32 *s_td1, SHM_TYPE u32 *s_td2, SHM_TYPE u32 *s_td3, SHM_TYPE u32 *s_td4) { u32 S[4] = { sector, 0, 0, 0 }; @@ -1923,7 +1923,7 @@ DECLSPEC void luks_decrypt_sector_aes_xts_plain256_mk_sha256_final (__global con } } -DECLSPEC void luks_decrypt_sector_aes_xts_plain256_mk_sha512 (__global const u32 *in, u32 *mk, const u32 *ks1, const u32 *ks2, const u32 sector, SHM_TYPE u32 *s_te0, SHM_TYPE u32 *s_te1, SHM_TYPE u32 *s_te2, SHM_TYPE u32 *s_te3, SHM_TYPE u32 *s_te4, SHM_TYPE u32 *s_td0, SHM_TYPE u32 *s_td1, SHM_TYPE u32 *s_td2, SHM_TYPE u32 *s_td3, SHM_TYPE u32 *s_td4) +DECLSPEC void luks_decrypt_sector_aes_xts_plain256_mk_sha512 (GLOBAL_AS const u32 *in, u32 *mk, const u32 *ks1, const u32 *ks2, const u32 sector, SHM_TYPE u32 *s_te0, SHM_TYPE u32 *s_te1, SHM_TYPE u32 *s_te2, SHM_TYPE u32 *s_te3, SHM_TYPE u32 *s_te4, SHM_TYPE u32 *s_td0, SHM_TYPE u32 *s_td1, SHM_TYPE u32 *s_td2, SHM_TYPE u32 *s_td3, SHM_TYPE u32 *s_td4) { u32 S[4] = { sector, 0, 0, 0 }; @@ -1960,7 +1960,7 @@ DECLSPEC void luks_decrypt_sector_aes_xts_plain256_mk_sha512 (__global const u32 } } -DECLSPEC void luks_decrypt_sector_aes_xts_plain256_mk_sha512_final (__global const u32 *in, u32 *mk, const u32 *ks1, const u32 *ks2, const u32 sector, SHM_TYPE u32 *s_te0, SHM_TYPE u32 *s_te1, SHM_TYPE u32 *s_te2, SHM_TYPE u32 *s_te3, SHM_TYPE u32 *s_te4, SHM_TYPE u32 *s_td0, SHM_TYPE u32 *s_td1, SHM_TYPE u32 *s_td2, SHM_TYPE u32 *s_td3, SHM_TYPE u32 *s_td4) +DECLSPEC void luks_decrypt_sector_aes_xts_plain256_mk_sha512_final (GLOBAL_AS const u32 *in, u32 *mk, const u32 *ks1, const u32 *ks2, const u32 sector, SHM_TYPE u32 *s_te0, SHM_TYPE u32 *s_te1, SHM_TYPE u32 *s_te2, SHM_TYPE u32 *s_te3, SHM_TYPE u32 *s_te4, SHM_TYPE u32 *s_td0, SHM_TYPE u32 *s_td1, SHM_TYPE u32 *s_td2, SHM_TYPE u32 *s_td3, SHM_TYPE u32 *s_td4) { u32 S[4] = { sector, 0, 0, 0 }; @@ -2020,7 +2020,7 @@ DECLSPEC void luks_decrypt_sector_aes_xts_plain256_mk_sha512_final (__global con } } -DECLSPEC void luks_decrypt_sector_aes_xts_plain256_mk_ripemd160 (__global const u32 *in, u32 *mk, const u32 *ks1, const u32 *ks2, const u32 sector, SHM_TYPE u32 *s_te0, SHM_TYPE u32 *s_te1, SHM_TYPE u32 *s_te2, SHM_TYPE u32 *s_te3, SHM_TYPE u32 *s_te4, SHM_TYPE u32 *s_td0, SHM_TYPE u32 *s_td1, SHM_TYPE u32 *s_td2, SHM_TYPE u32 *s_td3, SHM_TYPE u32 *s_td4) +DECLSPEC void luks_decrypt_sector_aes_xts_plain256_mk_ripemd160 (GLOBAL_AS const u32 *in, u32 *mk, const u32 *ks1, const u32 *ks2, const u32 sector, SHM_TYPE u32 *s_te0, SHM_TYPE u32 *s_te1, SHM_TYPE u32 *s_te2, SHM_TYPE u32 *s_te3, SHM_TYPE u32 *s_te4, SHM_TYPE u32 *s_td0, SHM_TYPE u32 *s_td1, SHM_TYPE u32 *s_td2, SHM_TYPE u32 *s_td3, SHM_TYPE u32 *s_td4) { u32 S[4] = { sector, 0, 0, 0 }; @@ -2057,7 +2057,7 @@ DECLSPEC void luks_decrypt_sector_aes_xts_plain256_mk_ripemd160 (__global const } } -DECLSPEC void luks_decrypt_sector_aes_xts_plain256_mk_ripemd160_final (__global const u32 *in, u32 *mk, const u32 *ks1, const u32 *ks2, const u32 sector, SHM_TYPE u32 *s_te0, SHM_TYPE u32 *s_te1, SHM_TYPE u32 *s_te2, SHM_TYPE u32 *s_te3, SHM_TYPE u32 *s_te4, SHM_TYPE u32 *s_td0, SHM_TYPE u32 *s_td1, SHM_TYPE u32 *s_td2, SHM_TYPE u32 *s_td3, SHM_TYPE u32 *s_td4) +DECLSPEC void luks_decrypt_sector_aes_xts_plain256_mk_ripemd160_final (GLOBAL_AS const u32 *in, u32 *mk, const u32 *ks1, const u32 *ks2, const u32 sector, SHM_TYPE u32 *s_te0, SHM_TYPE u32 *s_te1, SHM_TYPE u32 *s_te2, SHM_TYPE u32 *s_te3, SHM_TYPE u32 *s_te4, SHM_TYPE u32 *s_td0, SHM_TYPE u32 *s_td1, SHM_TYPE u32 *s_td2, SHM_TYPE u32 *s_td3, SHM_TYPE u32 *s_td4) { u32 S[4] = { sector, 0, 0, 0 }; @@ -2117,7 +2117,7 @@ DECLSPEC void luks_decrypt_sector_aes_xts_plain256_mk_ripemd160_final (__global } } -DECLSPEC void luks_decrypt_sector_aes_xts_plain512 (__global const u32 *in, u32 *out, const u32 *ks1, const u32 *ks2, const u32 sector, SHM_TYPE u32 *s_te0, SHM_TYPE u32 *s_te1, SHM_TYPE u32 *s_te2, SHM_TYPE u32 *s_te3, SHM_TYPE u32 *s_te4, SHM_TYPE u32 *s_td0, SHM_TYPE u32 *s_td1, SHM_TYPE u32 *s_td2, SHM_TYPE u32 *s_td3, SHM_TYPE u32 *s_td4) +DECLSPEC void luks_decrypt_sector_aes_xts_plain512 (GLOBAL_AS const u32 *in, u32 *out, const u32 *ks1, const u32 *ks2, const u32 sector, SHM_TYPE u32 *s_te0, SHM_TYPE u32 *s_te1, SHM_TYPE u32 *s_te2, SHM_TYPE u32 *s_te3, SHM_TYPE u32 *s_te4, SHM_TYPE u32 *s_td0, SHM_TYPE u32 *s_td1, SHM_TYPE u32 *s_td2, SHM_TYPE u32 *s_td3, SHM_TYPE u32 *s_td4) { u32 S[4] = { sector, 0, 0, 0 }; @@ -2151,7 +2151,7 @@ DECLSPEC void luks_decrypt_sector_aes_xts_plain512 (__global const u32 *in, u32 } } -DECLSPEC void luks_decrypt_sector_aes_xts_plain512_mk_sha1 (__global const u32 *in, u32 *mk, const u32 *ks1, const u32 *ks2, const u32 sector, SHM_TYPE u32 *s_te0, SHM_TYPE u32 *s_te1, SHM_TYPE u32 *s_te2, SHM_TYPE u32 *s_te3, SHM_TYPE u32 *s_te4, SHM_TYPE u32 *s_td0, SHM_TYPE u32 *s_td1, SHM_TYPE u32 *s_td2, SHM_TYPE u32 *s_td3, SHM_TYPE u32 *s_td4) +DECLSPEC void luks_decrypt_sector_aes_xts_plain512_mk_sha1 (GLOBAL_AS const u32 *in, u32 *mk, const u32 *ks1, const u32 *ks2, const u32 sector, SHM_TYPE u32 *s_te0, SHM_TYPE u32 *s_te1, SHM_TYPE u32 *s_te2, SHM_TYPE u32 *s_te3, SHM_TYPE u32 *s_te4, SHM_TYPE u32 *s_td0, SHM_TYPE u32 *s_td1, SHM_TYPE u32 *s_td2, SHM_TYPE u32 *s_td3, SHM_TYPE u32 *s_td4) { u32 S[4] = { sector, 0, 0, 0 }; @@ -2188,7 +2188,7 @@ DECLSPEC void luks_decrypt_sector_aes_xts_plain512_mk_sha1 (__global const u32 * } } -DECLSPEC void luks_decrypt_sector_aes_xts_plain512_mk_sha1_final (__global const u32 *in, u32 *mk, const u32 *ks1, const u32 *ks2, const u32 sector, SHM_TYPE u32 *s_te0, SHM_TYPE u32 *s_te1, SHM_TYPE u32 *s_te2, SHM_TYPE u32 *s_te3, SHM_TYPE u32 *s_te4, SHM_TYPE u32 *s_td0, SHM_TYPE u32 *s_td1, SHM_TYPE u32 *s_td2, SHM_TYPE u32 *s_td3, SHM_TYPE u32 *s_td4) +DECLSPEC void luks_decrypt_sector_aes_xts_plain512_mk_sha1_final (GLOBAL_AS const u32 *in, u32 *mk, const u32 *ks1, const u32 *ks2, const u32 sector, SHM_TYPE u32 *s_te0, SHM_TYPE u32 *s_te1, SHM_TYPE u32 *s_te2, SHM_TYPE u32 *s_te3, SHM_TYPE u32 *s_te4, SHM_TYPE u32 *s_td0, SHM_TYPE u32 *s_td1, SHM_TYPE u32 *s_td2, SHM_TYPE u32 *s_td3, SHM_TYPE u32 *s_td4) { u32 S[4] = { sector, 0, 0, 0 }; @@ -2248,7 +2248,7 @@ DECLSPEC void luks_decrypt_sector_aes_xts_plain512_mk_sha1_final (__global const } } -DECLSPEC void luks_decrypt_sector_aes_xts_plain512_mk_sha256 (__global const u32 *in, u32 *mk, const u32 *ks1, const u32 *ks2, const u32 sector, SHM_TYPE u32 *s_te0, SHM_TYPE u32 *s_te1, SHM_TYPE u32 *s_te2, SHM_TYPE u32 *s_te3, SHM_TYPE u32 *s_te4, SHM_TYPE u32 *s_td0, SHM_TYPE u32 *s_td1, SHM_TYPE u32 *s_td2, SHM_TYPE u32 *s_td3, SHM_TYPE u32 *s_td4) +DECLSPEC void luks_decrypt_sector_aes_xts_plain512_mk_sha256 (GLOBAL_AS const u32 *in, u32 *mk, const u32 *ks1, const u32 *ks2, const u32 sector, SHM_TYPE u32 *s_te0, SHM_TYPE u32 *s_te1, SHM_TYPE u32 *s_te2, SHM_TYPE u32 *s_te3, SHM_TYPE u32 *s_te4, SHM_TYPE u32 *s_td0, SHM_TYPE u32 *s_td1, SHM_TYPE u32 *s_td2, SHM_TYPE u32 *s_td3, SHM_TYPE u32 *s_td4) { u32 S[4] = { sector, 0, 0, 0 }; @@ -2285,7 +2285,7 @@ DECLSPEC void luks_decrypt_sector_aes_xts_plain512_mk_sha256 (__global const u32 } } -DECLSPEC void luks_decrypt_sector_aes_xts_plain512_mk_sha256_final (__global const u32 *in, u32 *mk, const u32 *ks1, const u32 *ks2, const u32 sector, SHM_TYPE u32 *s_te0, SHM_TYPE u32 *s_te1, SHM_TYPE u32 *s_te2, SHM_TYPE u32 *s_te3, SHM_TYPE u32 *s_te4, SHM_TYPE u32 *s_td0, SHM_TYPE u32 *s_td1, SHM_TYPE u32 *s_td2, SHM_TYPE u32 *s_td3, SHM_TYPE u32 *s_td4) +DECLSPEC void luks_decrypt_sector_aes_xts_plain512_mk_sha256_final (GLOBAL_AS const u32 *in, u32 *mk, const u32 *ks1, const u32 *ks2, const u32 sector, SHM_TYPE u32 *s_te0, SHM_TYPE u32 *s_te1, SHM_TYPE u32 *s_te2, SHM_TYPE u32 *s_te3, SHM_TYPE u32 *s_te4, SHM_TYPE u32 *s_td0, SHM_TYPE u32 *s_td1, SHM_TYPE u32 *s_td2, SHM_TYPE u32 *s_td3, SHM_TYPE u32 *s_td4) { u32 S[4] = { sector, 0, 0, 0 }; @@ -2345,7 +2345,7 @@ DECLSPEC void luks_decrypt_sector_aes_xts_plain512_mk_sha256_final (__global con } } -DECLSPEC void luks_decrypt_sector_aes_xts_plain512_mk_sha512 (__global const u32 *in, u32 *mk, const u32 *ks1, const u32 *ks2, const u32 sector, SHM_TYPE u32 *s_te0, SHM_TYPE u32 *s_te1, SHM_TYPE u32 *s_te2, SHM_TYPE u32 *s_te3, SHM_TYPE u32 *s_te4, SHM_TYPE u32 *s_td0, SHM_TYPE u32 *s_td1, SHM_TYPE u32 *s_td2, SHM_TYPE u32 *s_td3, SHM_TYPE u32 *s_td4) +DECLSPEC void luks_decrypt_sector_aes_xts_plain512_mk_sha512 (GLOBAL_AS const u32 *in, u32 *mk, const u32 *ks1, const u32 *ks2, const u32 sector, SHM_TYPE u32 *s_te0, SHM_TYPE u32 *s_te1, SHM_TYPE u32 *s_te2, SHM_TYPE u32 *s_te3, SHM_TYPE u32 *s_te4, SHM_TYPE u32 *s_td0, SHM_TYPE u32 *s_td1, SHM_TYPE u32 *s_td2, SHM_TYPE u32 *s_td3, SHM_TYPE u32 *s_td4) { u32 S[4] = { sector, 0, 0, 0 }; @@ -2382,7 +2382,7 @@ DECLSPEC void luks_decrypt_sector_aes_xts_plain512_mk_sha512 (__global const u32 } } -DECLSPEC void luks_decrypt_sector_aes_xts_plain512_mk_sha512_final (__global const u32 *in, u32 *mk, const u32 *ks1, const u32 *ks2, const u32 sector, SHM_TYPE u32 *s_te0, SHM_TYPE u32 *s_te1, SHM_TYPE u32 *s_te2, SHM_TYPE u32 *s_te3, SHM_TYPE u32 *s_te4, SHM_TYPE u32 *s_td0, SHM_TYPE u32 *s_td1, SHM_TYPE u32 *s_td2, SHM_TYPE u32 *s_td3, SHM_TYPE u32 *s_td4) +DECLSPEC void luks_decrypt_sector_aes_xts_plain512_mk_sha512_final (GLOBAL_AS const u32 *in, u32 *mk, const u32 *ks1, const u32 *ks2, const u32 sector, SHM_TYPE u32 *s_te0, SHM_TYPE u32 *s_te1, SHM_TYPE u32 *s_te2, SHM_TYPE u32 *s_te3, SHM_TYPE u32 *s_te4, SHM_TYPE u32 *s_td0, SHM_TYPE u32 *s_td1, SHM_TYPE u32 *s_td2, SHM_TYPE u32 *s_td3, SHM_TYPE u32 *s_td4) { u32 S[4] = { sector, 0, 0, 0 }; @@ -2442,7 +2442,7 @@ DECLSPEC void luks_decrypt_sector_aes_xts_plain512_mk_sha512_final (__global con } } -DECLSPEC void luks_decrypt_sector_aes_xts_plain512_mk_ripemd160 (__global const u32 *in, u32 *mk, const u32 *ks1, const u32 *ks2, const u32 sector, SHM_TYPE u32 *s_te0, SHM_TYPE u32 *s_te1, SHM_TYPE u32 *s_te2, SHM_TYPE u32 *s_te3, SHM_TYPE u32 *s_te4, SHM_TYPE u32 *s_td0, SHM_TYPE u32 *s_td1, SHM_TYPE u32 *s_td2, SHM_TYPE u32 *s_td3, SHM_TYPE u32 *s_td4) +DECLSPEC void luks_decrypt_sector_aes_xts_plain512_mk_ripemd160 (GLOBAL_AS const u32 *in, u32 *mk, const u32 *ks1, const u32 *ks2, const u32 sector, SHM_TYPE u32 *s_te0, SHM_TYPE u32 *s_te1, SHM_TYPE u32 *s_te2, SHM_TYPE u32 *s_te3, SHM_TYPE u32 *s_te4, SHM_TYPE u32 *s_td0, SHM_TYPE u32 *s_td1, SHM_TYPE u32 *s_td2, SHM_TYPE u32 *s_td3, SHM_TYPE u32 *s_td4) { u32 S[4] = { sector, 0, 0, 0 }; @@ -2479,7 +2479,7 @@ DECLSPEC void luks_decrypt_sector_aes_xts_plain512_mk_ripemd160 (__global const } } -DECLSPEC void luks_decrypt_sector_aes_xts_plain512_mk_ripemd160_final (__global const u32 *in, u32 *mk, const u32 *ks1, const u32 *ks2, const u32 sector, SHM_TYPE u32 *s_te0, SHM_TYPE u32 *s_te1, SHM_TYPE u32 *s_te2, SHM_TYPE u32 *s_te3, SHM_TYPE u32 *s_te4, SHM_TYPE u32 *s_td0, SHM_TYPE u32 *s_td1, SHM_TYPE u32 *s_td2, SHM_TYPE u32 *s_td3, SHM_TYPE u32 *s_td4) +DECLSPEC void luks_decrypt_sector_aes_xts_plain512_mk_ripemd160_final (GLOBAL_AS const u32 *in, u32 *mk, const u32 *ks1, const u32 *ks2, const u32 sector, SHM_TYPE u32 *s_te0, SHM_TYPE u32 *s_te1, SHM_TYPE u32 *s_te2, SHM_TYPE u32 *s_te3, SHM_TYPE u32 *s_te4, SHM_TYPE u32 *s_td0, SHM_TYPE u32 *s_td1, SHM_TYPE u32 *s_td2, SHM_TYPE u32 *s_td3, SHM_TYPE u32 *s_td4) { u32 S[4] = { sector, 0, 0, 0 }; @@ -2541,7 +2541,7 @@ DECLSPEC void luks_decrypt_sector_aes_xts_plain512_mk_ripemd160_final (__global // luks helper -DECLSPEC void luks_af_sha1_then_aes_decrypt (__global const luks_t *luks_bufs, __global luks_tmp_t *tmps, u32 *pt_buf, SHM_TYPE u32 *s_te0, SHM_TYPE u32 *s_te1, SHM_TYPE u32 *s_te2, SHM_TYPE u32 *s_te3, SHM_TYPE u32 *s_te4, SHM_TYPE u32 *s_td0, SHM_TYPE u32 *s_td1, SHM_TYPE u32 *s_td2, SHM_TYPE u32 *s_td3, SHM_TYPE u32 *s_td4) +DECLSPEC void luks_af_sha1_then_aes_decrypt (GLOBAL_AS const luks_t *luks_bufs, GLOBAL_AS luks_tmp_t *tmps, u32 *pt_buf, SHM_TYPE u32 *s_te0, SHM_TYPE u32 *s_te1, SHM_TYPE u32 *s_te2, SHM_TYPE u32 *s_te3, SHM_TYPE u32 *s_te4, SHM_TYPE u32 *s_td0, SHM_TYPE u32 *s_td1, SHM_TYPE u32 *s_td2, SHM_TYPE u32 *s_td3, SHM_TYPE u32 *s_td4) { const u32 key_size = luks_bufs->key_size; const u32 cipher_mode = luks_bufs->cipher_mode; @@ -2932,7 +2932,7 @@ DECLSPEC void luks_af_sha1_then_aes_decrypt (__global const luks_t *luks_bufs, _ } } -DECLSPEC void luks_af_sha256_then_aes_decrypt (__global const luks_t *luks_bufs, __global luks_tmp_t *tmps, u32 *pt_buf, SHM_TYPE u32 *s_te0, SHM_TYPE u32 *s_te1, SHM_TYPE u32 *s_te2, SHM_TYPE u32 *s_te3, SHM_TYPE u32 *s_te4, SHM_TYPE u32 *s_td0, SHM_TYPE u32 *s_td1, SHM_TYPE u32 *s_td2, SHM_TYPE u32 *s_td3, SHM_TYPE u32 *s_td4) +DECLSPEC void luks_af_sha256_then_aes_decrypt (GLOBAL_AS const luks_t *luks_bufs, GLOBAL_AS luks_tmp_t *tmps, u32 *pt_buf, SHM_TYPE u32 *s_te0, SHM_TYPE u32 *s_te1, SHM_TYPE u32 *s_te2, SHM_TYPE u32 *s_te3, SHM_TYPE u32 *s_te4, SHM_TYPE u32 *s_td0, SHM_TYPE u32 *s_td1, SHM_TYPE u32 *s_td2, SHM_TYPE u32 *s_td3, SHM_TYPE u32 *s_td4) { const u32 key_size = luks_bufs->key_size; const u32 cipher_mode = luks_bufs->cipher_mode; @@ -3291,7 +3291,7 @@ DECLSPEC void luks_af_sha256_then_aes_decrypt (__global const luks_t *luks_bufs, } } -DECLSPEC void luks_af_sha512_then_aes_decrypt (__global const luks_t *luks_bufs, __global luks_tmp_t *tmps, u32 *pt_buf, SHM_TYPE u32 *s_te0, SHM_TYPE u32 *s_te1, SHM_TYPE u32 *s_te2, SHM_TYPE u32 *s_te3, SHM_TYPE u32 *s_te4, SHM_TYPE u32 *s_td0, SHM_TYPE u32 *s_td1, SHM_TYPE u32 *s_td2, SHM_TYPE u32 *s_td3, SHM_TYPE u32 *s_td4) +DECLSPEC void luks_af_sha512_then_aes_decrypt (GLOBAL_AS const luks_t *luks_bufs, GLOBAL_AS luks_tmp_t *tmps, u32 *pt_buf, SHM_TYPE u32 *s_te0, SHM_TYPE u32 *s_te1, SHM_TYPE u32 *s_te2, SHM_TYPE u32 *s_te3, SHM_TYPE u32 *s_te4, SHM_TYPE u32 *s_td0, SHM_TYPE u32 *s_td1, SHM_TYPE u32 *s_td2, SHM_TYPE u32 *s_td3, SHM_TYPE u32 *s_td4) { const u32 key_size = luks_bufs->key_size; const u32 cipher_mode = luks_bufs->cipher_mode; @@ -3669,7 +3669,7 @@ DECLSPEC void luks_af_sha512_then_aes_decrypt (__global const luks_t *luks_bufs, } } -DECLSPEC void luks_af_ripemd160_then_aes_decrypt (__global const luks_t *luks_bufs, __global luks_tmp_t *tmps, u32 *pt_buf, SHM_TYPE u32 *s_te0, SHM_TYPE u32 *s_te1, SHM_TYPE u32 *s_te2, SHM_TYPE u32 *s_te3, SHM_TYPE u32 *s_te4, SHM_TYPE u32 *s_td0, SHM_TYPE u32 *s_td1, SHM_TYPE u32 *s_td2, SHM_TYPE u32 *s_td3, SHM_TYPE u32 *s_td4) +DECLSPEC void luks_af_ripemd160_then_aes_decrypt (GLOBAL_AS const luks_t *luks_bufs, GLOBAL_AS luks_tmp_t *tmps, u32 *pt_buf, SHM_TYPE u32 *s_te0, SHM_TYPE u32 *s_te1, SHM_TYPE u32 *s_te2, SHM_TYPE u32 *s_te3, SHM_TYPE u32 *s_te4, SHM_TYPE u32 *s_td0, SHM_TYPE u32 *s_td1, SHM_TYPE u32 *s_td2, SHM_TYPE u32 *s_td3, SHM_TYPE u32 *s_td4) { const u32 key_size = luks_bufs->key_size; const u32 cipher_mode = luks_bufs->cipher_mode; diff --git a/OpenCL/inc_luks_aes.h b/OpenCL/inc_luks_aes.h index 7822c4020..386b1720a 100644 --- a/OpenCL/inc_luks_aes.h +++ b/OpenCL/inc_luks_aes.h @@ -3,66 +3,66 @@ * License.....: MIT */ -DECLSPEC void aes128_decrypt_cbc (const u32 *ks1, const u32 *in, u32 *out, u32 *essiv, SHM_TYPE u32 *s_td0, SHM_TYPE u32 *s_td1, SHM_TYPE u32 *s_td2, SHM_TYPE u32 *s_td3, SHM_TYPE u32 *s_td4) -DECLSPEC void aes256_decrypt_cbc (const u32 *ks1, const u32 *in, u32 *out, u32 *essiv, SHM_TYPE u32 *s_td0, SHM_TYPE u32 *s_td1, SHM_TYPE u32 *s_td2, SHM_TYPE u32 *s_td3, SHM_TYPE u32 *s_td4) -DECLSPEC void luks_decrypt_sector_aes_cbc_essiv128 (__global const u32 *in, u32 *out, const u32 *ks1, const u32 *ks2, const u32 sector, SHM_TYPE u32 *s_te0, SHM_TYPE u32 *s_te1, SHM_TYPE u32 *s_te2, SHM_TYPE u32 *s_te3, SHM_TYPE u32 *s_te4, SHM_TYPE u32 *s_td0, SHM_TYPE u32 *s_td1, SHM_TYPE u32 *s_td2, SHM_TYPE u32 *s_td3, SHM_TYPE u32 *s_td4) -DECLSPEC void luks_decrypt_sector_aes_cbc_essiv128_mk_sha1 (__global const u32 *in, u32 *mk, const u32 *ks1, const u32 *ks2, const u32 sector, SHM_TYPE u32 *s_te0, SHM_TYPE u32 *s_te1, SHM_TYPE u32 *s_te2, SHM_TYPE u32 *s_te3, SHM_TYPE u32 *s_te4, SHM_TYPE u32 *s_td0, SHM_TYPE u32 *s_td1, SHM_TYPE u32 *s_td2, SHM_TYPE u32 *s_td3, SHM_TYPE u32 *s_td4) -DECLSPEC void luks_decrypt_sector_aes_cbc_essiv128_mk_sha1_final (__global const u32 *in, u32 *mk, const u32 *ks1, const u32 *ks2, const u32 sector, SHM_TYPE u32 *s_te0, SHM_TYPE u32 *s_te1, SHM_TYPE u32 *s_te2, SHM_TYPE u32 *s_te3, SHM_TYPE u32 *s_te4, SHM_TYPE u32 *s_td0, SHM_TYPE u32 *s_td1, SHM_TYPE u32 *s_td2, SHM_TYPE u32 *s_td3, SHM_TYPE u32 *s_td4) -DECLSPEC void luks_decrypt_sector_aes_cbc_essiv128_mk_sha256 (__global const u32 *in, u32 *mk, const u32 *ks1, const u32 *ks2, const u32 sector, SHM_TYPE u32 *s_te0, SHM_TYPE u32 *s_te1, SHM_TYPE u32 *s_te2, SHM_TYPE u32 *s_te3, SHM_TYPE u32 *s_te4, SHM_TYPE u32 *s_td0, SHM_TYPE u32 *s_td1, SHM_TYPE u32 *s_td2, SHM_TYPE u32 *s_td3, SHM_TYPE u32 *s_td4) -DECLSPEC void luks_decrypt_sector_aes_cbc_essiv128_mk_sha256_final (__global const u32 *in, u32 *mk, const u32 *ks1, const u32 *ks2, const u32 sector, SHM_TYPE u32 *s_te0, SHM_TYPE u32 *s_te1, SHM_TYPE u32 *s_te2, SHM_TYPE u32 *s_te3, SHM_TYPE u32 *s_te4, SHM_TYPE u32 *s_td0, SHM_TYPE u32 *s_td1, SHM_TYPE u32 *s_td2, SHM_TYPE u32 *s_td3, SHM_TYPE u32 *s_td4) -DECLSPEC void luks_decrypt_sector_aes_cbc_essiv128_mk_sha512 (__global const u32 *in, u32 *mk, const u32 *ks1, const u32 *ks2, const u32 sector, SHM_TYPE u32 *s_te0, SHM_TYPE u32 *s_te1, SHM_TYPE u32 *s_te2, SHM_TYPE u32 *s_te3, SHM_TYPE u32 *s_te4, SHM_TYPE u32 *s_td0, SHM_TYPE u32 *s_td1, SHM_TYPE u32 *s_td2, SHM_TYPE u32 *s_td3, SHM_TYPE u32 *s_td4) -DECLSPEC void luks_decrypt_sector_aes_cbc_essiv128_mk_sha512_final (__global const u32 *in, u32 *mk, const u32 *ks1, const u32 *ks2, const u32 sector, SHM_TYPE u32 *s_te0, SHM_TYPE u32 *s_te1, SHM_TYPE u32 *s_te2, SHM_TYPE u32 *s_te3, SHM_TYPE u32 *s_te4, SHM_TYPE u32 *s_td0, SHM_TYPE u32 *s_td1, SHM_TYPE u32 *s_td2, SHM_TYPE u32 *s_td3, SHM_TYPE u32 *s_td4) -DECLSPEC void luks_decrypt_sector_aes_cbc_essiv128_mk_ripemd160 (__global const u32 *in, u32 *mk, const u32 *ks1, const u32 *ks2, const u32 sector, SHM_TYPE u32 *s_te0, SHM_TYPE u32 *s_te1, SHM_TYPE u32 *s_te2, SHM_TYPE u32 *s_te3, SHM_TYPE u32 *s_te4, SHM_TYPE u32 *s_td0, SHM_TYPE u32 *s_td1, SHM_TYPE u32 *s_td2, SHM_TYPE u32 *s_td3, SHM_TYPE u32 *s_td4) -DECLSPEC void luks_decrypt_sector_aes_cbc_essiv128_mk_ripemd160_final (__global const u32 *in, u32 *mk, const u32 *ks1, const u32 *ks2, const u32 sector, SHM_TYPE u32 *s_te0, SHM_TYPE u32 *s_te1, SHM_TYPE u32 *s_te2, SHM_TYPE u32 *s_te3, SHM_TYPE u32 *s_te4, SHM_TYPE u32 *s_td0, SHM_TYPE u32 *s_td1, SHM_TYPE u32 *s_td2, SHM_TYPE u32 *s_td3, SHM_TYPE u32 *s_td4) -DECLSPEC void luks_decrypt_sector_aes_cbc_essiv256 (__global const u32 *in, u32 *out, const u32 *ks1, const u32 *ks2, const u32 sector, SHM_TYPE u32 *s_te0, SHM_TYPE u32 *s_te1, SHM_TYPE u32 *s_te2, SHM_TYPE u32 *s_te3, SHM_TYPE u32 *s_te4, SHM_TYPE u32 *s_td0, SHM_TYPE u32 *s_td1, SHM_TYPE u32 *s_td2, SHM_TYPE u32 *s_td3, SHM_TYPE u32 *s_td4) -DECLSPEC void luks_decrypt_sector_aes_cbc_essiv256_mk_sha1 (__global const u32 *in, u32 *mk, const u32 *ks1, const u32 *ks2, const u32 sector, SHM_TYPE u32 *s_te0, SHM_TYPE u32 *s_te1, SHM_TYPE u32 *s_te2, SHM_TYPE u32 *s_te3, SHM_TYPE u32 *s_te4, SHM_TYPE u32 *s_td0, SHM_TYPE u32 *s_td1, SHM_TYPE u32 *s_td2, SHM_TYPE u32 *s_td3, SHM_TYPE u32 *s_td4) -DECLSPEC void luks_decrypt_sector_aes_cbc_essiv256_mk_sha1_final (__global const u32 *in, u32 *mk, const u32 *ks1, const u32 *ks2, const u32 sector, SHM_TYPE u32 *s_te0, SHM_TYPE u32 *s_te1, SHM_TYPE u32 *s_te2, SHM_TYPE u32 *s_te3, SHM_TYPE u32 *s_te4, SHM_TYPE u32 *s_td0, SHM_TYPE u32 *s_td1, SHM_TYPE u32 *s_td2, SHM_TYPE u32 *s_td3, SHM_TYPE u32 *s_td4) -DECLSPEC void luks_decrypt_sector_aes_cbc_essiv256_mk_sha256 (__global const u32 *in, u32 *mk, const u32 *ks1, const u32 *ks2, const u32 sector, SHM_TYPE u32 *s_te0, SHM_TYPE u32 *s_te1, SHM_TYPE u32 *s_te2, SHM_TYPE u32 *s_te3, SHM_TYPE u32 *s_te4, SHM_TYPE u32 *s_td0, SHM_TYPE u32 *s_td1, SHM_TYPE u32 *s_td2, SHM_TYPE u32 *s_td3, SHM_TYPE u32 *s_td4) -DECLSPEC void luks_decrypt_sector_aes_cbc_essiv256_mk_sha256_final (__global const u32 *in, u32 *mk, const u32 *ks1, const u32 *ks2, const u32 sector, SHM_TYPE u32 *s_te0, SHM_TYPE u32 *s_te1, SHM_TYPE u32 *s_te2, SHM_TYPE u32 *s_te3, SHM_TYPE u32 *s_te4, SHM_TYPE u32 *s_td0, SHM_TYPE u32 *s_td1, SHM_TYPE u32 *s_td2, SHM_TYPE u32 *s_td3, SHM_TYPE u32 *s_td4) -DECLSPEC void luks_decrypt_sector_aes_cbc_essiv256_mk_sha512 (__global const u32 *in, u32 *mk, const u32 *ks1, const u32 *ks2, const u32 sector, SHM_TYPE u32 *s_te0, SHM_TYPE u32 *s_te1, SHM_TYPE u32 *s_te2, SHM_TYPE u32 *s_te3, SHM_TYPE u32 *s_te4, SHM_TYPE u32 *s_td0, SHM_TYPE u32 *s_td1, SHM_TYPE u32 *s_td2, SHM_TYPE u32 *s_td3, SHM_TYPE u32 *s_td4) -DECLSPEC void luks_decrypt_sector_aes_cbc_essiv256_mk_sha512_final (__global const u32 *in, u32 *mk, const u32 *ks1, const u32 *ks2, const u32 sector, SHM_TYPE u32 *s_te0, SHM_TYPE u32 *s_te1, SHM_TYPE u32 *s_te2, SHM_TYPE u32 *s_te3, SHM_TYPE u32 *s_te4, SHM_TYPE u32 *s_td0, SHM_TYPE u32 *s_td1, SHM_TYPE u32 *s_td2, SHM_TYPE u32 *s_td3, SHM_TYPE u32 *s_td4) -DECLSPEC void luks_decrypt_sector_aes_cbc_essiv256_mk_ripemd160 (__global const u32 *in, u32 *mk, const u32 *ks1, const u32 *ks2, const u32 sector, SHM_TYPE u32 *s_te0, SHM_TYPE u32 *s_te1, SHM_TYPE u32 *s_te2, SHM_TYPE u32 *s_te3, SHM_TYPE u32 *s_te4, SHM_TYPE u32 *s_td0, SHM_TYPE u32 *s_td1, SHM_TYPE u32 *s_td2, SHM_TYPE u32 *s_td3, SHM_TYPE u32 *s_td4) -DECLSPEC void luks_decrypt_sector_aes_cbc_essiv256_mk_ripemd160_final (__global const u32 *in, u32 *mk, const u32 *ks1, const u32 *ks2, const u32 sector, SHM_TYPE u32 *s_te0, SHM_TYPE u32 *s_te1, SHM_TYPE u32 *s_te2, SHM_TYPE u32 *s_te3, SHM_TYPE u32 *s_te4, SHM_TYPE u32 *s_td0, SHM_TYPE u32 *s_td1, SHM_TYPE u32 *s_td2, SHM_TYPE u32 *s_td3, SHM_TYPE u32 *s_td4) -DECLSPEC void luks_decrypt_sector_aes_cbc_plain128 (__global const u32 *in, u32 *out, const u32 *ks1, const u32 sector, SHM_TYPE u32 *s_te0, SHM_TYPE u32 *s_te1, SHM_TYPE u32 *s_te2, SHM_TYPE u32 *s_te3, SHM_TYPE u32 *s_te4, SHM_TYPE u32 *s_td0, SHM_TYPE u32 *s_td1, SHM_TYPE u32 *s_td2, SHM_TYPE u32 *s_td3, SHM_TYPE u32 *s_td4) -DECLSPEC void luks_decrypt_sector_aes_cbc_plain128_mk_sha1 (__global const u32 *in, u32 *mk, const u32 *ks1, const u32 sector, SHM_TYPE u32 *s_te0, SHM_TYPE u32 *s_te1, SHM_TYPE u32 *s_te2, SHM_TYPE u32 *s_te3, SHM_TYPE u32 *s_te4, SHM_TYPE u32 *s_td0, SHM_TYPE u32 *s_td1, SHM_TYPE u32 *s_td2, SHM_TYPE u32 *s_td3, SHM_TYPE u32 *s_td4) -DECLSPEC void luks_decrypt_sector_aes_cbc_plain128_mk_sha1_final (__global const u32 *in, u32 *mk, const u32 *ks1, const u32 sector, SHM_TYPE u32 *s_te0, SHM_TYPE u32 *s_te1, SHM_TYPE u32 *s_te2, SHM_TYPE u32 *s_te3, SHM_TYPE u32 *s_te4, SHM_TYPE u32 *s_td0, SHM_TYPE u32 *s_td1, SHM_TYPE u32 *s_td2, SHM_TYPE u32 *s_td3, SHM_TYPE u32 *s_td4) -DECLSPEC void luks_decrypt_sector_aes_cbc_plain128_mk_sha256 (__global const u32 *in, u32 *mk, const u32 *ks1, const u32 sector, SHM_TYPE u32 *s_te0, SHM_TYPE u32 *s_te1, SHM_TYPE u32 *s_te2, SHM_TYPE u32 *s_te3, SHM_TYPE u32 *s_te4, SHM_TYPE u32 *s_td0, SHM_TYPE u32 *s_td1, SHM_TYPE u32 *s_td2, SHM_TYPE u32 *s_td3, SHM_TYPE u32 *s_td4) -DECLSPEC void luks_decrypt_sector_aes_cbc_plain128_mk_sha256_final (__global const u32 *in, u32 *mk, const u32 *ks1, const u32 sector, SHM_TYPE u32 *s_te0, SHM_TYPE u32 *s_te1, SHM_TYPE u32 *s_te2, SHM_TYPE u32 *s_te3, SHM_TYPE u32 *s_te4, SHM_TYPE u32 *s_td0, SHM_TYPE u32 *s_td1, SHM_TYPE u32 *s_td2, SHM_TYPE u32 *s_td3, SHM_TYPE u32 *s_td4) -DECLSPEC void luks_decrypt_sector_aes_cbc_plain128_mk_sha512 (__global const u32 *in, u32 *mk, const u32 *ks1, const u32 sector, SHM_TYPE u32 *s_te0, SHM_TYPE u32 *s_te1, SHM_TYPE u32 *s_te2, SHM_TYPE u32 *s_te3, SHM_TYPE u32 *s_te4, SHM_TYPE u32 *s_td0, SHM_TYPE u32 *s_td1, SHM_TYPE u32 *s_td2, SHM_TYPE u32 *s_td3, SHM_TYPE u32 *s_td4) -DECLSPEC void luks_decrypt_sector_aes_cbc_plain128_mk_sha512_final (__global const u32 *in, u32 *mk, const u32 *ks1, const u32 sector, SHM_TYPE u32 *s_te0, SHM_TYPE u32 *s_te1, SHM_TYPE u32 *s_te2, SHM_TYPE u32 *s_te3, SHM_TYPE u32 *s_te4, SHM_TYPE u32 *s_td0, SHM_TYPE u32 *s_td1, SHM_TYPE u32 *s_td2, SHM_TYPE u32 *s_td3, SHM_TYPE u32 *s_td4) -DECLSPEC void luks_decrypt_sector_aes_cbc_plain128_mk_ripemd160 (__global const u32 *in, u32 *mk, const u32 *ks1, const u32 sector, SHM_TYPE u32 *s_te0, SHM_TYPE u32 *s_te1, SHM_TYPE u32 *s_te2, SHM_TYPE u32 *s_te3, SHM_TYPE u32 *s_te4, SHM_TYPE u32 *s_td0, SHM_TYPE u32 *s_td1, SHM_TYPE u32 *s_td2, SHM_TYPE u32 *s_td3, SHM_TYPE u32 *s_td4) -DECLSPEC void luks_decrypt_sector_aes_cbc_plain128_mk_ripemd160_final (__global const u32 *in, u32 *mk, const u32 *ks1, const u32 sector, SHM_TYPE u32 *s_te0, SHM_TYPE u32 *s_te1, SHM_TYPE u32 *s_te2, SHM_TYPE u32 *s_te3, SHM_TYPE u32 *s_te4, SHM_TYPE u32 *s_td0, SHM_TYPE u32 *s_td1, SHM_TYPE u32 *s_td2, SHM_TYPE u32 *s_td3, SHM_TYPE u32 *s_td4) -DECLSPEC void luks_decrypt_sector_aes_cbc_plain256 (__global const u32 *in, u32 *out, const u32 *ks1, const u32 sector, SHM_TYPE u32 *s_te0, SHM_TYPE u32 *s_te1, SHM_TYPE u32 *s_te2, SHM_TYPE u32 *s_te3, SHM_TYPE u32 *s_te4, SHM_TYPE u32 *s_td0, SHM_TYPE u32 *s_td1, SHM_TYPE u32 *s_td2, SHM_TYPE u32 *s_td3, SHM_TYPE u32 *s_td4) -DECLSPEC void luks_decrypt_sector_aes_cbc_plain256_mk_sha1 (__global const u32 *in, u32 *mk, const u32 *ks1, const u32 sector, SHM_TYPE u32 *s_te0, SHM_TYPE u32 *s_te1, SHM_TYPE u32 *s_te2, SHM_TYPE u32 *s_te3, SHM_TYPE u32 *s_te4, SHM_TYPE u32 *s_td0, SHM_TYPE u32 *s_td1, SHM_TYPE u32 *s_td2, SHM_TYPE u32 *s_td3, SHM_TYPE u32 *s_td4) -DECLSPEC void luks_decrypt_sector_aes_cbc_plain256_mk_sha1_final (__global const u32 *in, u32 *mk, const u32 *ks1, const u32 sector, SHM_TYPE u32 *s_te0, SHM_TYPE u32 *s_te1, SHM_TYPE u32 *s_te2, SHM_TYPE u32 *s_te3, SHM_TYPE u32 *s_te4, SHM_TYPE u32 *s_td0, SHM_TYPE u32 *s_td1, SHM_TYPE u32 *s_td2, SHM_TYPE u32 *s_td3, SHM_TYPE u32 *s_td4) -DECLSPEC void luks_decrypt_sector_aes_cbc_plain256_mk_sha256 (__global const u32 *in, u32 *mk, const u32 *ks1, const u32 sector, SHM_TYPE u32 *s_te0, SHM_TYPE u32 *s_te1, SHM_TYPE u32 *s_te2, SHM_TYPE u32 *s_te3, SHM_TYPE u32 *s_te4, SHM_TYPE u32 *s_td0, SHM_TYPE u32 *s_td1, SHM_TYPE u32 *s_td2, SHM_TYPE u32 *s_td3, SHM_TYPE u32 *s_td4) -DECLSPEC void luks_decrypt_sector_aes_cbc_plain256_mk_sha256_final (__global const u32 *in, u32 *mk, const u32 *ks1, const u32 sector, SHM_TYPE u32 *s_te0, SHM_TYPE u32 *s_te1, SHM_TYPE u32 *s_te2, SHM_TYPE u32 *s_te3, SHM_TYPE u32 *s_te4, SHM_TYPE u32 *s_td0, SHM_TYPE u32 *s_td1, SHM_TYPE u32 *s_td2, SHM_TYPE u32 *s_td3, SHM_TYPE u32 *s_td4) -DECLSPEC void luks_decrypt_sector_aes_cbc_plain256_mk_sha512 (__global const u32 *in, u32 *mk, const u32 *ks1, const u32 sector, SHM_TYPE u32 *s_te0, SHM_TYPE u32 *s_te1, SHM_TYPE u32 *s_te2, SHM_TYPE u32 *s_te3, SHM_TYPE u32 *s_te4, SHM_TYPE u32 *s_td0, SHM_TYPE u32 *s_td1, SHM_TYPE u32 *s_td2, SHM_TYPE u32 *s_td3, SHM_TYPE u32 *s_td4) -DECLSPEC void luks_decrypt_sector_aes_cbc_plain256_mk_sha512_final (__global const u32 *in, u32 *mk, const u32 *ks1, const u32 sector, SHM_TYPE u32 *s_te0, SHM_TYPE u32 *s_te1, SHM_TYPE u32 *s_te2, SHM_TYPE u32 *s_te3, SHM_TYPE u32 *s_te4, SHM_TYPE u32 *s_td0, SHM_TYPE u32 *s_td1, SHM_TYPE u32 *s_td2, SHM_TYPE u32 *s_td3, SHM_TYPE u32 *s_td4) -DECLSPEC void luks_decrypt_sector_aes_cbc_plain256_mk_ripemd160 (__global const u32 *in, u32 *mk, const u32 *ks1, const u32 sector, SHM_TYPE u32 *s_te0, SHM_TYPE u32 *s_te1, SHM_TYPE u32 *s_te2, SHM_TYPE u32 *s_te3, SHM_TYPE u32 *s_te4, SHM_TYPE u32 *s_td0, SHM_TYPE u32 *s_td1, SHM_TYPE u32 *s_td2, SHM_TYPE u32 *s_td3, SHM_TYPE u32 *s_td4) -DECLSPEC void luks_decrypt_sector_aes_cbc_plain256_mk_ripemd160_final (__global const u32 *in, u32 *mk, const u32 *ks1, const u32 sector, SHM_TYPE u32 *s_te0, SHM_TYPE u32 *s_te1, SHM_TYPE u32 *s_te2, SHM_TYPE u32 *s_te3, SHM_TYPE u32 *s_te4, SHM_TYPE u32 *s_td0, SHM_TYPE u32 *s_td1, SHM_TYPE u32 *s_td2, SHM_TYPE u32 *s_td3, SHM_TYPE u32 *s_td4) +DECLSPEC void aes128_decrypt_cbc (const u32 *ks1, const u32 *in, u32 *out, u32 *essiv, SHM_TYPE u32 *s_td0, SHM_TYPE u32 *s_td1, SHM_TYPE u32 *s_td2, SHM_TYPE u32 *s_td3, SHM_TYPE u32 *s_td4); +DECLSPEC void aes256_decrypt_cbc (const u32 *ks1, const u32 *in, u32 *out, u32 *essiv, SHM_TYPE u32 *s_td0, SHM_TYPE u32 *s_td1, SHM_TYPE u32 *s_td2, SHM_TYPE u32 *s_td3, SHM_TYPE u32 *s_td4); +DECLSPEC void luks_decrypt_sector_aes_cbc_essiv128 (GLOBAL_AS const u32 *in, u32 *out, const u32 *ks1, const u32 *ks2, const u32 sector, SHM_TYPE u32 *s_te0, SHM_TYPE u32 *s_te1, SHM_TYPE u32 *s_te2, SHM_TYPE u32 *s_te3, SHM_TYPE u32 *s_te4, SHM_TYPE u32 *s_td0, SHM_TYPE u32 *s_td1, SHM_TYPE u32 *s_td2, SHM_TYPE u32 *s_td3, SHM_TYPE u32 *s_td4); +DECLSPEC void luks_decrypt_sector_aes_cbc_essiv128_mk_sha1 (GLOBAL_AS const u32 *in, u32 *mk, const u32 *ks1, const u32 *ks2, const u32 sector, SHM_TYPE u32 *s_te0, SHM_TYPE u32 *s_te1, SHM_TYPE u32 *s_te2, SHM_TYPE u32 *s_te3, SHM_TYPE u32 *s_te4, SHM_TYPE u32 *s_td0, SHM_TYPE u32 *s_td1, SHM_TYPE u32 *s_td2, SHM_TYPE u32 *s_td3, SHM_TYPE u32 *s_td4); +DECLSPEC void luks_decrypt_sector_aes_cbc_essiv128_mk_sha1_final (GLOBAL_AS const u32 *in, u32 *mk, const u32 *ks1, const u32 *ks2, const u32 sector, SHM_TYPE u32 *s_te0, SHM_TYPE u32 *s_te1, SHM_TYPE u32 *s_te2, SHM_TYPE u32 *s_te3, SHM_TYPE u32 *s_te4, SHM_TYPE u32 *s_td0, SHM_TYPE u32 *s_td1, SHM_TYPE u32 *s_td2, SHM_TYPE u32 *s_td3, SHM_TYPE u32 *s_td4); +DECLSPEC void luks_decrypt_sector_aes_cbc_essiv128_mk_sha256 (GLOBAL_AS const u32 *in, u32 *mk, const u32 *ks1, const u32 *ks2, const u32 sector, SHM_TYPE u32 *s_te0, SHM_TYPE u32 *s_te1, SHM_TYPE u32 *s_te2, SHM_TYPE u32 *s_te3, SHM_TYPE u32 *s_te4, SHM_TYPE u32 *s_td0, SHM_TYPE u32 *s_td1, SHM_TYPE u32 *s_td2, SHM_TYPE u32 *s_td3, SHM_TYPE u32 *s_td4); +DECLSPEC void luks_decrypt_sector_aes_cbc_essiv128_mk_sha256_final (GLOBAL_AS const u32 *in, u32 *mk, const u32 *ks1, const u32 *ks2, const u32 sector, SHM_TYPE u32 *s_te0, SHM_TYPE u32 *s_te1, SHM_TYPE u32 *s_te2, SHM_TYPE u32 *s_te3, SHM_TYPE u32 *s_te4, SHM_TYPE u32 *s_td0, SHM_TYPE u32 *s_td1, SHM_TYPE u32 *s_td2, SHM_TYPE u32 *s_td3, SHM_TYPE u32 *s_td4); +DECLSPEC void luks_decrypt_sector_aes_cbc_essiv128_mk_sha512 (GLOBAL_AS const u32 *in, u32 *mk, const u32 *ks1, const u32 *ks2, const u32 sector, SHM_TYPE u32 *s_te0, SHM_TYPE u32 *s_te1, SHM_TYPE u32 *s_te2, SHM_TYPE u32 *s_te3, SHM_TYPE u32 *s_te4, SHM_TYPE u32 *s_td0, SHM_TYPE u32 *s_td1, SHM_TYPE u32 *s_td2, SHM_TYPE u32 *s_td3, SHM_TYPE u32 *s_td4); +DECLSPEC void luks_decrypt_sector_aes_cbc_essiv128_mk_sha512_final (GLOBAL_AS const u32 *in, u32 *mk, const u32 *ks1, const u32 *ks2, const u32 sector, SHM_TYPE u32 *s_te0, SHM_TYPE u32 *s_te1, SHM_TYPE u32 *s_te2, SHM_TYPE u32 *s_te3, SHM_TYPE u32 *s_te4, SHM_TYPE u32 *s_td0, SHM_TYPE u32 *s_td1, SHM_TYPE u32 *s_td2, SHM_TYPE u32 *s_td3, SHM_TYPE u32 *s_td4); +DECLSPEC void luks_decrypt_sector_aes_cbc_essiv128_mk_ripemd160 (GLOBAL_AS const u32 *in, u32 *mk, const u32 *ks1, const u32 *ks2, const u32 sector, SHM_TYPE u32 *s_te0, SHM_TYPE u32 *s_te1, SHM_TYPE u32 *s_te2, SHM_TYPE u32 *s_te3, SHM_TYPE u32 *s_te4, SHM_TYPE u32 *s_td0, SHM_TYPE u32 *s_td1, SHM_TYPE u32 *s_td2, SHM_TYPE u32 *s_td3, SHM_TYPE u32 *s_td4); +DECLSPEC void luks_decrypt_sector_aes_cbc_essiv128_mk_ripemd160_final (GLOBAL_AS const u32 *in, u32 *mk, const u32 *ks1, const u32 *ks2, const u32 sector, SHM_TYPE u32 *s_te0, SHM_TYPE u32 *s_te1, SHM_TYPE u32 *s_te2, SHM_TYPE u32 *s_te3, SHM_TYPE u32 *s_te4, SHM_TYPE u32 *s_td0, SHM_TYPE u32 *s_td1, SHM_TYPE u32 *s_td2, SHM_TYPE u32 *s_td3, SHM_TYPE u32 *s_td4); +DECLSPEC void luks_decrypt_sector_aes_cbc_essiv256 (GLOBAL_AS const u32 *in, u32 *out, const u32 *ks1, const u32 *ks2, const u32 sector, SHM_TYPE u32 *s_te0, SHM_TYPE u32 *s_te1, SHM_TYPE u32 *s_te2, SHM_TYPE u32 *s_te3, SHM_TYPE u32 *s_te4, SHM_TYPE u32 *s_td0, SHM_TYPE u32 *s_td1, SHM_TYPE u32 *s_td2, SHM_TYPE u32 *s_td3, SHM_TYPE u32 *s_td4); +DECLSPEC void luks_decrypt_sector_aes_cbc_essiv256_mk_sha1 (GLOBAL_AS const u32 *in, u32 *mk, const u32 *ks1, const u32 *ks2, const u32 sector, SHM_TYPE u32 *s_te0, SHM_TYPE u32 *s_te1, SHM_TYPE u32 *s_te2, SHM_TYPE u32 *s_te3, SHM_TYPE u32 *s_te4, SHM_TYPE u32 *s_td0, SHM_TYPE u32 *s_td1, SHM_TYPE u32 *s_td2, SHM_TYPE u32 *s_td3, SHM_TYPE u32 *s_td4); +DECLSPEC void luks_decrypt_sector_aes_cbc_essiv256_mk_sha1_final (GLOBAL_AS const u32 *in, u32 *mk, const u32 *ks1, const u32 *ks2, const u32 sector, SHM_TYPE u32 *s_te0, SHM_TYPE u32 *s_te1, SHM_TYPE u32 *s_te2, SHM_TYPE u32 *s_te3, SHM_TYPE u32 *s_te4, SHM_TYPE u32 *s_td0, SHM_TYPE u32 *s_td1, SHM_TYPE u32 *s_td2, SHM_TYPE u32 *s_td3, SHM_TYPE u32 *s_td4); +DECLSPEC void luks_decrypt_sector_aes_cbc_essiv256_mk_sha256 (GLOBAL_AS const u32 *in, u32 *mk, const u32 *ks1, const u32 *ks2, const u32 sector, SHM_TYPE u32 *s_te0, SHM_TYPE u32 *s_te1, SHM_TYPE u32 *s_te2, SHM_TYPE u32 *s_te3, SHM_TYPE u32 *s_te4, SHM_TYPE u32 *s_td0, SHM_TYPE u32 *s_td1, SHM_TYPE u32 *s_td2, SHM_TYPE u32 *s_td3, SHM_TYPE u32 *s_td4); +DECLSPEC void luks_decrypt_sector_aes_cbc_essiv256_mk_sha256_final (GLOBAL_AS const u32 *in, u32 *mk, const u32 *ks1, const u32 *ks2, const u32 sector, SHM_TYPE u32 *s_te0, SHM_TYPE u32 *s_te1, SHM_TYPE u32 *s_te2, SHM_TYPE u32 *s_te3, SHM_TYPE u32 *s_te4, SHM_TYPE u32 *s_td0, SHM_TYPE u32 *s_td1, SHM_TYPE u32 *s_td2, SHM_TYPE u32 *s_td3, SHM_TYPE u32 *s_td4); +DECLSPEC void luks_decrypt_sector_aes_cbc_essiv256_mk_sha512 (GLOBAL_AS const u32 *in, u32 *mk, const u32 *ks1, const u32 *ks2, const u32 sector, SHM_TYPE u32 *s_te0, SHM_TYPE u32 *s_te1, SHM_TYPE u32 *s_te2, SHM_TYPE u32 *s_te3, SHM_TYPE u32 *s_te4, SHM_TYPE u32 *s_td0, SHM_TYPE u32 *s_td1, SHM_TYPE u32 *s_td2, SHM_TYPE u32 *s_td3, SHM_TYPE u32 *s_td4); +DECLSPEC void luks_decrypt_sector_aes_cbc_essiv256_mk_sha512_final (GLOBAL_AS const u32 *in, u32 *mk, const u32 *ks1, const u32 *ks2, const u32 sector, SHM_TYPE u32 *s_te0, SHM_TYPE u32 *s_te1, SHM_TYPE u32 *s_te2, SHM_TYPE u32 *s_te3, SHM_TYPE u32 *s_te4, SHM_TYPE u32 *s_td0, SHM_TYPE u32 *s_td1, SHM_TYPE u32 *s_td2, SHM_TYPE u32 *s_td3, SHM_TYPE u32 *s_td4); +DECLSPEC void luks_decrypt_sector_aes_cbc_essiv256_mk_ripemd160 (GLOBAL_AS const u32 *in, u32 *mk, const u32 *ks1, const u32 *ks2, const u32 sector, SHM_TYPE u32 *s_te0, SHM_TYPE u32 *s_te1, SHM_TYPE u32 *s_te2, SHM_TYPE u32 *s_te3, SHM_TYPE u32 *s_te4, SHM_TYPE u32 *s_td0, SHM_TYPE u32 *s_td1, SHM_TYPE u32 *s_td2, SHM_TYPE u32 *s_td3, SHM_TYPE u32 *s_td4); +DECLSPEC void luks_decrypt_sector_aes_cbc_essiv256_mk_ripemd160_final (GLOBAL_AS const u32 *in, u32 *mk, const u32 *ks1, const u32 *ks2, const u32 sector, SHM_TYPE u32 *s_te0, SHM_TYPE u32 *s_te1, SHM_TYPE u32 *s_te2, SHM_TYPE u32 *s_te3, SHM_TYPE u32 *s_te4, SHM_TYPE u32 *s_td0, SHM_TYPE u32 *s_td1, SHM_TYPE u32 *s_td2, SHM_TYPE u32 *s_td3, SHM_TYPE u32 *s_td4); +DECLSPEC void luks_decrypt_sector_aes_cbc_plain128 (GLOBAL_AS const u32 *in, u32 *out, const u32 *ks1, const u32 sector, SHM_TYPE u32 *s_te0, SHM_TYPE u32 *s_te1, SHM_TYPE u32 *s_te2, SHM_TYPE u32 *s_te3, SHM_TYPE u32 *s_te4, SHM_TYPE u32 *s_td0, SHM_TYPE u32 *s_td1, SHM_TYPE u32 *s_td2, SHM_TYPE u32 *s_td3, SHM_TYPE u32 *s_td4); +DECLSPEC void luks_decrypt_sector_aes_cbc_plain128_mk_sha1 (GLOBAL_AS const u32 *in, u32 *mk, const u32 *ks1, const u32 sector, SHM_TYPE u32 *s_te0, SHM_TYPE u32 *s_te1, SHM_TYPE u32 *s_te2, SHM_TYPE u32 *s_te3, SHM_TYPE u32 *s_te4, SHM_TYPE u32 *s_td0, SHM_TYPE u32 *s_td1, SHM_TYPE u32 *s_td2, SHM_TYPE u32 *s_td3, SHM_TYPE u32 *s_td4); +DECLSPEC void luks_decrypt_sector_aes_cbc_plain128_mk_sha1_final (GLOBAL_AS const u32 *in, u32 *mk, const u32 *ks1, const u32 sector, SHM_TYPE u32 *s_te0, SHM_TYPE u32 *s_te1, SHM_TYPE u32 *s_te2, SHM_TYPE u32 *s_te3, SHM_TYPE u32 *s_te4, SHM_TYPE u32 *s_td0, SHM_TYPE u32 *s_td1, SHM_TYPE u32 *s_td2, SHM_TYPE u32 *s_td3, SHM_TYPE u32 *s_td4); +DECLSPEC void luks_decrypt_sector_aes_cbc_plain128_mk_sha256 (GLOBAL_AS const u32 *in, u32 *mk, const u32 *ks1, const u32 sector, SHM_TYPE u32 *s_te0, SHM_TYPE u32 *s_te1, SHM_TYPE u32 *s_te2, SHM_TYPE u32 *s_te3, SHM_TYPE u32 *s_te4, SHM_TYPE u32 *s_td0, SHM_TYPE u32 *s_td1, SHM_TYPE u32 *s_td2, SHM_TYPE u32 *s_td3, SHM_TYPE u32 *s_td4); +DECLSPEC void luks_decrypt_sector_aes_cbc_plain128_mk_sha256_final (GLOBAL_AS const u32 *in, u32 *mk, const u32 *ks1, const u32 sector, SHM_TYPE u32 *s_te0, SHM_TYPE u32 *s_te1, SHM_TYPE u32 *s_te2, SHM_TYPE u32 *s_te3, SHM_TYPE u32 *s_te4, SHM_TYPE u32 *s_td0, SHM_TYPE u32 *s_td1, SHM_TYPE u32 *s_td2, SHM_TYPE u32 *s_td3, SHM_TYPE u32 *s_td4); +DECLSPEC void luks_decrypt_sector_aes_cbc_plain128_mk_sha512 (GLOBAL_AS const u32 *in, u32 *mk, const u32 *ks1, const u32 sector, SHM_TYPE u32 *s_te0, SHM_TYPE u32 *s_te1, SHM_TYPE u32 *s_te2, SHM_TYPE u32 *s_te3, SHM_TYPE u32 *s_te4, SHM_TYPE u32 *s_td0, SHM_TYPE u32 *s_td1, SHM_TYPE u32 *s_td2, SHM_TYPE u32 *s_td3, SHM_TYPE u32 *s_td4); +DECLSPEC void luks_decrypt_sector_aes_cbc_plain128_mk_sha512_final (GLOBAL_AS const u32 *in, u32 *mk, const u32 *ks1, const u32 sector, SHM_TYPE u32 *s_te0, SHM_TYPE u32 *s_te1, SHM_TYPE u32 *s_te2, SHM_TYPE u32 *s_te3, SHM_TYPE u32 *s_te4, SHM_TYPE u32 *s_td0, SHM_TYPE u32 *s_td1, SHM_TYPE u32 *s_td2, SHM_TYPE u32 *s_td3, SHM_TYPE u32 *s_td4); +DECLSPEC void luks_decrypt_sector_aes_cbc_plain128_mk_ripemd160 (GLOBAL_AS const u32 *in, u32 *mk, const u32 *ks1, const u32 sector, SHM_TYPE u32 *s_te0, SHM_TYPE u32 *s_te1, SHM_TYPE u32 *s_te2, SHM_TYPE u32 *s_te3, SHM_TYPE u32 *s_te4, SHM_TYPE u32 *s_td0, SHM_TYPE u32 *s_td1, SHM_TYPE u32 *s_td2, SHM_TYPE u32 *s_td3, SHM_TYPE u32 *s_td4); +DECLSPEC void luks_decrypt_sector_aes_cbc_plain128_mk_ripemd160_final (GLOBAL_AS const u32 *in, u32 *mk, const u32 *ks1, const u32 sector, SHM_TYPE u32 *s_te0, SHM_TYPE u32 *s_te1, SHM_TYPE u32 *s_te2, SHM_TYPE u32 *s_te3, SHM_TYPE u32 *s_te4, SHM_TYPE u32 *s_td0, SHM_TYPE u32 *s_td1, SHM_TYPE u32 *s_td2, SHM_TYPE u32 *s_td3, SHM_TYPE u32 *s_td4); +DECLSPEC void luks_decrypt_sector_aes_cbc_plain256 (GLOBAL_AS const u32 *in, u32 *out, const u32 *ks1, const u32 sector, SHM_TYPE u32 *s_te0, SHM_TYPE u32 *s_te1, SHM_TYPE u32 *s_te2, SHM_TYPE u32 *s_te3, SHM_TYPE u32 *s_te4, SHM_TYPE u32 *s_td0, SHM_TYPE u32 *s_td1, SHM_TYPE u32 *s_td2, SHM_TYPE u32 *s_td3, SHM_TYPE u32 *s_td4); +DECLSPEC void luks_decrypt_sector_aes_cbc_plain256_mk_sha1 (GLOBAL_AS const u32 *in, u32 *mk, const u32 *ks1, const u32 sector, SHM_TYPE u32 *s_te0, SHM_TYPE u32 *s_te1, SHM_TYPE u32 *s_te2, SHM_TYPE u32 *s_te3, SHM_TYPE u32 *s_te4, SHM_TYPE u32 *s_td0, SHM_TYPE u32 *s_td1, SHM_TYPE u32 *s_td2, SHM_TYPE u32 *s_td3, SHM_TYPE u32 *s_td4); +DECLSPEC void luks_decrypt_sector_aes_cbc_plain256_mk_sha1_final (GLOBAL_AS const u32 *in, u32 *mk, const u32 *ks1, const u32 sector, SHM_TYPE u32 *s_te0, SHM_TYPE u32 *s_te1, SHM_TYPE u32 *s_te2, SHM_TYPE u32 *s_te3, SHM_TYPE u32 *s_te4, SHM_TYPE u32 *s_td0, SHM_TYPE u32 *s_td1, SHM_TYPE u32 *s_td2, SHM_TYPE u32 *s_td3, SHM_TYPE u32 *s_td4); +DECLSPEC void luks_decrypt_sector_aes_cbc_plain256_mk_sha256 (GLOBAL_AS const u32 *in, u32 *mk, const u32 *ks1, const u32 sector, SHM_TYPE u32 *s_te0, SHM_TYPE u32 *s_te1, SHM_TYPE u32 *s_te2, SHM_TYPE u32 *s_te3, SHM_TYPE u32 *s_te4, SHM_TYPE u32 *s_td0, SHM_TYPE u32 *s_td1, SHM_TYPE u32 *s_td2, SHM_TYPE u32 *s_td3, SHM_TYPE u32 *s_td4); +DECLSPEC void luks_decrypt_sector_aes_cbc_plain256_mk_sha256_final (GLOBAL_AS const u32 *in, u32 *mk, const u32 *ks1, const u32 sector, SHM_TYPE u32 *s_te0, SHM_TYPE u32 *s_te1, SHM_TYPE u32 *s_te2, SHM_TYPE u32 *s_te3, SHM_TYPE u32 *s_te4, SHM_TYPE u32 *s_td0, SHM_TYPE u32 *s_td1, SHM_TYPE u32 *s_td2, SHM_TYPE u32 *s_td3, SHM_TYPE u32 *s_td4); +DECLSPEC void luks_decrypt_sector_aes_cbc_plain256_mk_sha512 (GLOBAL_AS const u32 *in, u32 *mk, const u32 *ks1, const u32 sector, SHM_TYPE u32 *s_te0, SHM_TYPE u32 *s_te1, SHM_TYPE u32 *s_te2, SHM_TYPE u32 *s_te3, SHM_TYPE u32 *s_te4, SHM_TYPE u32 *s_td0, SHM_TYPE u32 *s_td1, SHM_TYPE u32 *s_td2, SHM_TYPE u32 *s_td3, SHM_TYPE u32 *s_td4); +DECLSPEC void luks_decrypt_sector_aes_cbc_plain256_mk_sha512_final (GLOBAL_AS const u32 *in, u32 *mk, const u32 *ks1, const u32 sector, SHM_TYPE u32 *s_te0, SHM_TYPE u32 *s_te1, SHM_TYPE u32 *s_te2, SHM_TYPE u32 *s_te3, SHM_TYPE u32 *s_te4, SHM_TYPE u32 *s_td0, SHM_TYPE u32 *s_td1, SHM_TYPE u32 *s_td2, SHM_TYPE u32 *s_td3, SHM_TYPE u32 *s_td4); +DECLSPEC void luks_decrypt_sector_aes_cbc_plain256_mk_ripemd160 (GLOBAL_AS const u32 *in, u32 *mk, const u32 *ks1, const u32 sector, SHM_TYPE u32 *s_te0, SHM_TYPE u32 *s_te1, SHM_TYPE u32 *s_te2, SHM_TYPE u32 *s_te3, SHM_TYPE u32 *s_te4, SHM_TYPE u32 *s_td0, SHM_TYPE u32 *s_td1, SHM_TYPE u32 *s_td2, SHM_TYPE u32 *s_td3, SHM_TYPE u32 *s_td4); +DECLSPEC void luks_decrypt_sector_aes_cbc_plain256_mk_ripemd160_final (GLOBAL_AS const u32 *in, u32 *mk, const u32 *ks1, const u32 sector, SHM_TYPE u32 *s_te0, SHM_TYPE u32 *s_te1, SHM_TYPE u32 *s_te2, SHM_TYPE u32 *s_te3, SHM_TYPE u32 *s_te4, SHM_TYPE u32 *s_td0, SHM_TYPE u32 *s_td1, SHM_TYPE u32 *s_td2, SHM_TYPE u32 *s_td3, SHM_TYPE u32 *s_td4); -DECLSPEC void aes128_decrypt_xts (const u32 *ks1, const u32 *in, u32 *out, u32 *T, SHM_TYPE u32 *s_td0, SHM_TYPE u32 *s_td1, SHM_TYPE u32 *s_td2, SHM_TYPE u32 *s_td3, SHM_TYPE u32 *s_td4) -DECLSPEC void aes256_decrypt_xts (const u32 *ks1, const u32 *in, u32 *out, u32 *T, SHM_TYPE u32 *s_td0, SHM_TYPE u32 *s_td1, SHM_TYPE u32 *s_td2, SHM_TYPE u32 *s_td3, SHM_TYPE u32 *s_td4) -DECLSPEC void luks_decrypt_sector_aes_xts_plain256 (__global const u32 *in, u32 *out, const u32 *ks1, const u32 *ks2, const u32 sector, SHM_TYPE u32 *s_te0, SHM_TYPE u32 *s_te1, SHM_TYPE u32 *s_te2, SHM_TYPE u32 *s_te3, SHM_TYPE u32 *s_te4, SHM_TYPE u32 *s_td0, SHM_TYPE u32 *s_td1, SHM_TYPE u32 *s_td2, SHM_TYPE u32 *s_td3, SHM_TYPE u32 *s_td4) -DECLSPEC void luks_decrypt_sector_aes_xts_plain256_mk_sha1 (__global const u32 *in, u32 *mk, const u32 *ks1, const u32 *ks2, const u32 sector, SHM_TYPE u32 *s_te0, SHM_TYPE u32 *s_te1, SHM_TYPE u32 *s_te2, SHM_TYPE u32 *s_te3, SHM_TYPE u32 *s_te4, SHM_TYPE u32 *s_td0, SHM_TYPE u32 *s_td1, SHM_TYPE u32 *s_td2, SHM_TYPE u32 *s_td3, SHM_TYPE u32 *s_td4) -DECLSPEC void luks_decrypt_sector_aes_xts_plain256_mk_sha1_final (__global const u32 *in, u32 *mk, const u32 *ks1, const u32 *ks2, const u32 sector, SHM_TYPE u32 *s_te0, SHM_TYPE u32 *s_te1, SHM_TYPE u32 *s_te2, SHM_TYPE u32 *s_te3, SHM_TYPE u32 *s_te4, SHM_TYPE u32 *s_td0, SHM_TYPE u32 *s_td1, SHM_TYPE u32 *s_td2, SHM_TYPE u32 *s_td3, SHM_TYPE u32 *s_td4) -DECLSPEC void luks_decrypt_sector_aes_xts_plain256_mk_sha256 (__global const u32 *in, u32 *mk, const u32 *ks1, const u32 *ks2, const u32 sector, SHM_TYPE u32 *s_te0, SHM_TYPE u32 *s_te1, SHM_TYPE u32 *s_te2, SHM_TYPE u32 *s_te3, SHM_TYPE u32 *s_te4, SHM_TYPE u32 *s_td0, SHM_TYPE u32 *s_td1, SHM_TYPE u32 *s_td2, SHM_TYPE u32 *s_td3, SHM_TYPE u32 *s_td4) -DECLSPEC void luks_decrypt_sector_aes_xts_plain256_mk_sha256_final (__global const u32 *in, u32 *mk, const u32 *ks1, const u32 *ks2, const u32 sector, SHM_TYPE u32 *s_te0, SHM_TYPE u32 *s_te1, SHM_TYPE u32 *s_te2, SHM_TYPE u32 *s_te3, SHM_TYPE u32 *s_te4, SHM_TYPE u32 *s_td0, SHM_TYPE u32 *s_td1, SHM_TYPE u32 *s_td2, SHM_TYPE u32 *s_td3, SHM_TYPE u32 *s_td4) -DECLSPEC void luks_decrypt_sector_aes_xts_plain256_mk_sha512 (__global const u32 *in, u32 *mk, const u32 *ks1, const u32 *ks2, const u32 sector, SHM_TYPE u32 *s_te0, SHM_TYPE u32 *s_te1, SHM_TYPE u32 *s_te2, SHM_TYPE u32 *s_te3, SHM_TYPE u32 *s_te4, SHM_TYPE u32 *s_td0, SHM_TYPE u32 *s_td1, SHM_TYPE u32 *s_td2, SHM_TYPE u32 *s_td3, SHM_TYPE u32 *s_td4) -DECLSPEC void luks_decrypt_sector_aes_xts_plain256_mk_sha512_final (__global const u32 *in, u32 *mk, const u32 *ks1, const u32 *ks2, const u32 sector, SHM_TYPE u32 *s_te0, SHM_TYPE u32 *s_te1, SHM_TYPE u32 *s_te2, SHM_TYPE u32 *s_te3, SHM_TYPE u32 *s_te4, SHM_TYPE u32 *s_td0, SHM_TYPE u32 *s_td1, SHM_TYPE u32 *s_td2, SHM_TYPE u32 *s_td3, SHM_TYPE u32 *s_td4) -DECLSPEC void luks_decrypt_sector_aes_xts_plain256_mk_ripemd160 (__global const u32 *in, u32 *mk, const u32 *ks1, const u32 *ks2, const u32 sector, SHM_TYPE u32 *s_te0, SHM_TYPE u32 *s_te1, SHM_TYPE u32 *s_te2, SHM_TYPE u32 *s_te3, SHM_TYPE u32 *s_te4, SHM_TYPE u32 *s_td0, SHM_TYPE u32 *s_td1, SHM_TYPE u32 *s_td2, SHM_TYPE u32 *s_td3, SHM_TYPE u32 *s_td4) -DECLSPEC void luks_decrypt_sector_aes_xts_plain256_mk_ripemd160_final (__global const u32 *in, u32 *mk, const u32 *ks1, const u32 *ks2, const u32 sector, SHM_TYPE u32 *s_te0, SHM_TYPE u32 *s_te1, SHM_TYPE u32 *s_te2, SHM_TYPE u32 *s_te3, SHM_TYPE u32 *s_te4, SHM_TYPE u32 *s_td0, SHM_TYPE u32 *s_td1, SHM_TYPE u32 *s_td2, SHM_TYPE u32 *s_td3, SHM_TYPE u32 *s_td4) -DECLSPEC void luks_decrypt_sector_aes_xts_plain512 (__global const u32 *in, u32 *out, const u32 *ks1, const u32 *ks2, const u32 sector, SHM_TYPE u32 *s_te0, SHM_TYPE u32 *s_te1, SHM_TYPE u32 *s_te2, SHM_TYPE u32 *s_te3, SHM_TYPE u32 *s_te4, SHM_TYPE u32 *s_td0, SHM_TYPE u32 *s_td1, SHM_TYPE u32 *s_td2, SHM_TYPE u32 *s_td3, SHM_TYPE u32 *s_td4) -DECLSPEC void luks_decrypt_sector_aes_xts_plain512_mk_sha1 (__global const u32 *in, u32 *mk, const u32 *ks1, const u32 *ks2, const u32 sector, SHM_TYPE u32 *s_te0, SHM_TYPE u32 *s_te1, SHM_TYPE u32 *s_te2, SHM_TYPE u32 *s_te3, SHM_TYPE u32 *s_te4, SHM_TYPE u32 *s_td0, SHM_TYPE u32 *s_td1, SHM_TYPE u32 *s_td2, SHM_TYPE u32 *s_td3, SHM_TYPE u32 *s_td4) -DECLSPEC void luks_decrypt_sector_aes_xts_plain512_mk_sha1_final (__global const u32 *in, u32 *mk, const u32 *ks1, const u32 *ks2, const u32 sector, SHM_TYPE u32 *s_te0, SHM_TYPE u32 *s_te1, SHM_TYPE u32 *s_te2, SHM_TYPE u32 *s_te3, SHM_TYPE u32 *s_te4, SHM_TYPE u32 *s_td0, SHM_TYPE u32 *s_td1, SHM_TYPE u32 *s_td2, SHM_TYPE u32 *s_td3, SHM_TYPE u32 *s_td4) -DECLSPEC void luks_decrypt_sector_aes_xts_plain512_mk_sha256 (__global const u32 *in, u32 *mk, const u32 *ks1, const u32 *ks2, const u32 sector, SHM_TYPE u32 *s_te0, SHM_TYPE u32 *s_te1, SHM_TYPE u32 *s_te2, SHM_TYPE u32 *s_te3, SHM_TYPE u32 *s_te4, SHM_TYPE u32 *s_td0, SHM_TYPE u32 *s_td1, SHM_TYPE u32 *s_td2, SHM_TYPE u32 *s_td3, SHM_TYPE u32 *s_td4) -DECLSPEC void luks_decrypt_sector_aes_xts_plain512_mk_sha256_final (__global const u32 *in, u32 *mk, const u32 *ks1, const u32 *ks2, const u32 sector, SHM_TYPE u32 *s_te0, SHM_TYPE u32 *s_te1, SHM_TYPE u32 *s_te2, SHM_TYPE u32 *s_te3, SHM_TYPE u32 *s_te4, SHM_TYPE u32 *s_td0, SHM_TYPE u32 *s_td1, SHM_TYPE u32 *s_td2, SHM_TYPE u32 *s_td3, SHM_TYPE u32 *s_td4) -DECLSPEC void luks_decrypt_sector_aes_xts_plain512_mk_sha512 (__global const u32 *in, u32 *mk, const u32 *ks1, const u32 *ks2, const u32 sector, SHM_TYPE u32 *s_te0, SHM_TYPE u32 *s_te1, SHM_TYPE u32 *s_te2, SHM_TYPE u32 *s_te3, SHM_TYPE u32 *s_te4, SHM_TYPE u32 *s_td0, SHM_TYPE u32 *s_td1, SHM_TYPE u32 *s_td2, SHM_TYPE u32 *s_td3, SHM_TYPE u32 *s_td4) -DECLSPEC void luks_decrypt_sector_aes_xts_plain512_mk_sha512_final (__global const u32 *in, u32 *mk, const u32 *ks1, const u32 *ks2, const u32 sector, SHM_TYPE u32 *s_te0, SHM_TYPE u32 *s_te1, SHM_TYPE u32 *s_te2, SHM_TYPE u32 *s_te3, SHM_TYPE u32 *s_te4, SHM_TYPE u32 *s_td0, SHM_TYPE u32 *s_td1, SHM_TYPE u32 *s_td2, SHM_TYPE u32 *s_td3, SHM_TYPE u32 *s_td4) -DECLSPEC void luks_decrypt_sector_aes_xts_plain512_mk_ripemd160 (__global const u32 *in, u32 *mk, const u32 *ks1, const u32 *ks2, const u32 sector, SHM_TYPE u32 *s_te0, SHM_TYPE u32 *s_te1, SHM_TYPE u32 *s_te2, SHM_TYPE u32 *s_te3, SHM_TYPE u32 *s_te4, SHM_TYPE u32 *s_td0, SHM_TYPE u32 *s_td1, SHM_TYPE u32 *s_td2, SHM_TYPE u32 *s_td3, SHM_TYPE u32 *s_td4) -DECLSPEC void luks_decrypt_sector_aes_xts_plain512_mk_ripemd160_final (__global const u32 *in, u32 *mk, const u32 *ks1, const u32 *ks2, const u32 sector, SHM_TYPE u32 *s_te0, SHM_TYPE u32 *s_te1, SHM_TYPE u32 *s_te2, SHM_TYPE u32 *s_te3, SHM_TYPE u32 *s_te4, SHM_TYPE u32 *s_td0, SHM_TYPE u32 *s_td1, SHM_TYPE u32 *s_td2, SHM_TYPE u32 *s_td3, SHM_TYPE u32 *s_td4) -DECLSPEC void luks_af_sha1_then_aes_decrypt (__global const luks_t *luks_bufs, __global luks_tmp_t *tmps, u32 *pt_buf, SHM_TYPE u32 *s_te0, SHM_TYPE u32 *s_te1, SHM_TYPE u32 *s_te2, SHM_TYPE u32 *s_te3, SHM_TYPE u32 *s_te4, SHM_TYPE u32 *s_td0, SHM_TYPE u32 *s_td1, SHM_TYPE u32 *s_td2, SHM_TYPE u32 *s_td3, SHM_TYPE u32 *s_td4) -DECLSPEC void luks_af_sha256_then_aes_decrypt (__global const luks_t *luks_bufs, __global luks_tmp_t *tmps, u32 *pt_buf, SHM_TYPE u32 *s_te0, SHM_TYPE u32 *s_te1, SHM_TYPE u32 *s_te2, SHM_TYPE u32 *s_te3, SHM_TYPE u32 *s_te4, SHM_TYPE u32 *s_td0, SHM_TYPE u32 *s_td1, SHM_TYPE u32 *s_td2, SHM_TYPE u32 *s_td3, SHM_TYPE u32 *s_td4) -DECLSPEC void luks_af_sha512_then_aes_decrypt (__global const luks_t *luks_bufs, __global luks_tmp_t *tmps, u32 *pt_buf, SHM_TYPE u32 *s_te0, SHM_TYPE u32 *s_te1, SHM_TYPE u32 *s_te2, SHM_TYPE u32 *s_te3, SHM_TYPE u32 *s_te4, SHM_TYPE u32 *s_td0, SHM_TYPE u32 *s_td1, SHM_TYPE u32 *s_td2, SHM_TYPE u32 *s_td3, SHM_TYPE u32 *s_td4) -DECLSPEC void luks_af_ripemd160_then_aes_decrypt (__global const luks_t *luks_bufs, __global luks_tmp_t *tmps, u32 *pt_buf, SHM_TYPE u32 *s_te0, SHM_TYPE u32 *s_te1, SHM_TYPE u32 *s_te2, SHM_TYPE u32 *s_te3, SHM_TYPE u32 *s_te4, SHM_TYPE u32 *s_td0, SHM_TYPE u32 *s_td1, SHM_TYPE u32 *s_td2, SHM_TYPE u32 *s_td3, SHM_TYPE u32 *s_td4) +DECLSPEC void aes128_decrypt_xts (const u32 *ks1, const u32 *in, u32 *out, u32 *T, SHM_TYPE u32 *s_td0, SHM_TYPE u32 *s_td1, SHM_TYPE u32 *s_td2, SHM_TYPE u32 *s_td3, SHM_TYPE u32 *s_td4); +DECLSPEC void aes256_decrypt_xts (const u32 *ks1, const u32 *in, u32 *out, u32 *T, SHM_TYPE u32 *s_td0, SHM_TYPE u32 *s_td1, SHM_TYPE u32 *s_td2, SHM_TYPE u32 *s_td3, SHM_TYPE u32 *s_td4); +DECLSPEC void luks_decrypt_sector_aes_xts_plain256 (GLOBAL_AS const u32 *in, u32 *out, const u32 *ks1, const u32 *ks2, const u32 sector, SHM_TYPE u32 *s_te0, SHM_TYPE u32 *s_te1, SHM_TYPE u32 *s_te2, SHM_TYPE u32 *s_te3, SHM_TYPE u32 *s_te4, SHM_TYPE u32 *s_td0, SHM_TYPE u32 *s_td1, SHM_TYPE u32 *s_td2, SHM_TYPE u32 *s_td3, SHM_TYPE u32 *s_td4); +DECLSPEC void luks_decrypt_sector_aes_xts_plain256_mk_sha1 (GLOBAL_AS const u32 *in, u32 *mk, const u32 *ks1, const u32 *ks2, const u32 sector, SHM_TYPE u32 *s_te0, SHM_TYPE u32 *s_te1, SHM_TYPE u32 *s_te2, SHM_TYPE u32 *s_te3, SHM_TYPE u32 *s_te4, SHM_TYPE u32 *s_td0, SHM_TYPE u32 *s_td1, SHM_TYPE u32 *s_td2, SHM_TYPE u32 *s_td3, SHM_TYPE u32 *s_td4); +DECLSPEC void luks_decrypt_sector_aes_xts_plain256_mk_sha1_final (GLOBAL_AS const u32 *in, u32 *mk, const u32 *ks1, const u32 *ks2, const u32 sector, SHM_TYPE u32 *s_te0, SHM_TYPE u32 *s_te1, SHM_TYPE u32 *s_te2, SHM_TYPE u32 *s_te3, SHM_TYPE u32 *s_te4, SHM_TYPE u32 *s_td0, SHM_TYPE u32 *s_td1, SHM_TYPE u32 *s_td2, SHM_TYPE u32 *s_td3, SHM_TYPE u32 *s_td4); +DECLSPEC void luks_decrypt_sector_aes_xts_plain256_mk_sha256 (GLOBAL_AS const u32 *in, u32 *mk, const u32 *ks1, const u32 *ks2, const u32 sector, SHM_TYPE u32 *s_te0, SHM_TYPE u32 *s_te1, SHM_TYPE u32 *s_te2, SHM_TYPE u32 *s_te3, SHM_TYPE u32 *s_te4, SHM_TYPE u32 *s_td0, SHM_TYPE u32 *s_td1, SHM_TYPE u32 *s_td2, SHM_TYPE u32 *s_td3, SHM_TYPE u32 *s_td4); +DECLSPEC void luks_decrypt_sector_aes_xts_plain256_mk_sha256_final (GLOBAL_AS const u32 *in, u32 *mk, const u32 *ks1, const u32 *ks2, const u32 sector, SHM_TYPE u32 *s_te0, SHM_TYPE u32 *s_te1, SHM_TYPE u32 *s_te2, SHM_TYPE u32 *s_te3, SHM_TYPE u32 *s_te4, SHM_TYPE u32 *s_td0, SHM_TYPE u32 *s_td1, SHM_TYPE u32 *s_td2, SHM_TYPE u32 *s_td3, SHM_TYPE u32 *s_td4); +DECLSPEC void luks_decrypt_sector_aes_xts_plain256_mk_sha512 (GLOBAL_AS const u32 *in, u32 *mk, const u32 *ks1, const u32 *ks2, const u32 sector, SHM_TYPE u32 *s_te0, SHM_TYPE u32 *s_te1, SHM_TYPE u32 *s_te2, SHM_TYPE u32 *s_te3, SHM_TYPE u32 *s_te4, SHM_TYPE u32 *s_td0, SHM_TYPE u32 *s_td1, SHM_TYPE u32 *s_td2, SHM_TYPE u32 *s_td3, SHM_TYPE u32 *s_td4); +DECLSPEC void luks_decrypt_sector_aes_xts_plain256_mk_sha512_final (GLOBAL_AS const u32 *in, u32 *mk, const u32 *ks1, const u32 *ks2, const u32 sector, SHM_TYPE u32 *s_te0, SHM_TYPE u32 *s_te1, SHM_TYPE u32 *s_te2, SHM_TYPE u32 *s_te3, SHM_TYPE u32 *s_te4, SHM_TYPE u32 *s_td0, SHM_TYPE u32 *s_td1, SHM_TYPE u32 *s_td2, SHM_TYPE u32 *s_td3, SHM_TYPE u32 *s_td4); +DECLSPEC void luks_decrypt_sector_aes_xts_plain256_mk_ripemd160 (GLOBAL_AS const u32 *in, u32 *mk, const u32 *ks1, const u32 *ks2, const u32 sector, SHM_TYPE u32 *s_te0, SHM_TYPE u32 *s_te1, SHM_TYPE u32 *s_te2, SHM_TYPE u32 *s_te3, SHM_TYPE u32 *s_te4, SHM_TYPE u32 *s_td0, SHM_TYPE u32 *s_td1, SHM_TYPE u32 *s_td2, SHM_TYPE u32 *s_td3, SHM_TYPE u32 *s_td4); +DECLSPEC void luks_decrypt_sector_aes_xts_plain256_mk_ripemd160_final (GLOBAL_AS const u32 *in, u32 *mk, const u32 *ks1, const u32 *ks2, const u32 sector, SHM_TYPE u32 *s_te0, SHM_TYPE u32 *s_te1, SHM_TYPE u32 *s_te2, SHM_TYPE u32 *s_te3, SHM_TYPE u32 *s_te4, SHM_TYPE u32 *s_td0, SHM_TYPE u32 *s_td1, SHM_TYPE u32 *s_td2, SHM_TYPE u32 *s_td3, SHM_TYPE u32 *s_td4); +DECLSPEC void luks_decrypt_sector_aes_xts_plain512 (GLOBAL_AS const u32 *in, u32 *out, const u32 *ks1, const u32 *ks2, const u32 sector, SHM_TYPE u32 *s_te0, SHM_TYPE u32 *s_te1, SHM_TYPE u32 *s_te2, SHM_TYPE u32 *s_te3, SHM_TYPE u32 *s_te4, SHM_TYPE u32 *s_td0, SHM_TYPE u32 *s_td1, SHM_TYPE u32 *s_td2, SHM_TYPE u32 *s_td3, SHM_TYPE u32 *s_td4); +DECLSPEC void luks_decrypt_sector_aes_xts_plain512_mk_sha1 (GLOBAL_AS const u32 *in, u32 *mk, const u32 *ks1, const u32 *ks2, const u32 sector, SHM_TYPE u32 *s_te0, SHM_TYPE u32 *s_te1, SHM_TYPE u32 *s_te2, SHM_TYPE u32 *s_te3, SHM_TYPE u32 *s_te4, SHM_TYPE u32 *s_td0, SHM_TYPE u32 *s_td1, SHM_TYPE u32 *s_td2, SHM_TYPE u32 *s_td3, SHM_TYPE u32 *s_td4); +DECLSPEC void luks_decrypt_sector_aes_xts_plain512_mk_sha1_final (GLOBAL_AS const u32 *in, u32 *mk, const u32 *ks1, const u32 *ks2, const u32 sector, SHM_TYPE u32 *s_te0, SHM_TYPE u32 *s_te1, SHM_TYPE u32 *s_te2, SHM_TYPE u32 *s_te3, SHM_TYPE u32 *s_te4, SHM_TYPE u32 *s_td0, SHM_TYPE u32 *s_td1, SHM_TYPE u32 *s_td2, SHM_TYPE u32 *s_td3, SHM_TYPE u32 *s_td4); +DECLSPEC void luks_decrypt_sector_aes_xts_plain512_mk_sha256 (GLOBAL_AS const u32 *in, u32 *mk, const u32 *ks1, const u32 *ks2, const u32 sector, SHM_TYPE u32 *s_te0, SHM_TYPE u32 *s_te1, SHM_TYPE u32 *s_te2, SHM_TYPE u32 *s_te3, SHM_TYPE u32 *s_te4, SHM_TYPE u32 *s_td0, SHM_TYPE u32 *s_td1, SHM_TYPE u32 *s_td2, SHM_TYPE u32 *s_td3, SHM_TYPE u32 *s_td4); +DECLSPEC void luks_decrypt_sector_aes_xts_plain512_mk_sha256_final (GLOBAL_AS const u32 *in, u32 *mk, const u32 *ks1, const u32 *ks2, const u32 sector, SHM_TYPE u32 *s_te0, SHM_TYPE u32 *s_te1, SHM_TYPE u32 *s_te2, SHM_TYPE u32 *s_te3, SHM_TYPE u32 *s_te4, SHM_TYPE u32 *s_td0, SHM_TYPE u32 *s_td1, SHM_TYPE u32 *s_td2, SHM_TYPE u32 *s_td3, SHM_TYPE u32 *s_td4); +DECLSPEC void luks_decrypt_sector_aes_xts_plain512_mk_sha512 (GLOBAL_AS const u32 *in, u32 *mk, const u32 *ks1, const u32 *ks2, const u32 sector, SHM_TYPE u32 *s_te0, SHM_TYPE u32 *s_te1, SHM_TYPE u32 *s_te2, SHM_TYPE u32 *s_te3, SHM_TYPE u32 *s_te4, SHM_TYPE u32 *s_td0, SHM_TYPE u32 *s_td1, SHM_TYPE u32 *s_td2, SHM_TYPE u32 *s_td3, SHM_TYPE u32 *s_td4); +DECLSPEC void luks_decrypt_sector_aes_xts_plain512_mk_sha512_final (GLOBAL_AS const u32 *in, u32 *mk, const u32 *ks1, const u32 *ks2, const u32 sector, SHM_TYPE u32 *s_te0, SHM_TYPE u32 *s_te1, SHM_TYPE u32 *s_te2, SHM_TYPE u32 *s_te3, SHM_TYPE u32 *s_te4, SHM_TYPE u32 *s_td0, SHM_TYPE u32 *s_td1, SHM_TYPE u32 *s_td2, SHM_TYPE u32 *s_td3, SHM_TYPE u32 *s_td4); +DECLSPEC void luks_decrypt_sector_aes_xts_plain512_mk_ripemd160 (GLOBAL_AS const u32 *in, u32 *mk, const u32 *ks1, const u32 *ks2, const u32 sector, SHM_TYPE u32 *s_te0, SHM_TYPE u32 *s_te1, SHM_TYPE u32 *s_te2, SHM_TYPE u32 *s_te3, SHM_TYPE u32 *s_te4, SHM_TYPE u32 *s_td0, SHM_TYPE u32 *s_td1, SHM_TYPE u32 *s_td2, SHM_TYPE u32 *s_td3, SHM_TYPE u32 *s_td4); +DECLSPEC void luks_decrypt_sector_aes_xts_plain512_mk_ripemd160_final (GLOBAL_AS const u32 *in, u32 *mk, const u32 *ks1, const u32 *ks2, const u32 sector, SHM_TYPE u32 *s_te0, SHM_TYPE u32 *s_te1, SHM_TYPE u32 *s_te2, SHM_TYPE u32 *s_te3, SHM_TYPE u32 *s_te4, SHM_TYPE u32 *s_td0, SHM_TYPE u32 *s_td1, SHM_TYPE u32 *s_td2, SHM_TYPE u32 *s_td3, SHM_TYPE u32 *s_td4); +DECLSPEC void luks_af_sha1_then_aes_decrypt (GLOBAL_AS const luks_t *luks_bufs, GLOBAL_AS luks_tmp_t *tmps, u32 *pt_buf, SHM_TYPE u32 *s_te0, SHM_TYPE u32 *s_te1, SHM_TYPE u32 *s_te2, SHM_TYPE u32 *s_te3, SHM_TYPE u32 *s_te4, SHM_TYPE u32 *s_td0, SHM_TYPE u32 *s_td1, SHM_TYPE u32 *s_td2, SHM_TYPE u32 *s_td3, SHM_TYPE u32 *s_td4); +DECLSPEC void luks_af_sha256_then_aes_decrypt (GLOBAL_AS const luks_t *luks_bufs, GLOBAL_AS luks_tmp_t *tmps, u32 *pt_buf, SHM_TYPE u32 *s_te0, SHM_TYPE u32 *s_te1, SHM_TYPE u32 *s_te2, SHM_TYPE u32 *s_te3, SHM_TYPE u32 *s_te4, SHM_TYPE u32 *s_td0, SHM_TYPE u32 *s_td1, SHM_TYPE u32 *s_td2, SHM_TYPE u32 *s_td3, SHM_TYPE u32 *s_td4); +DECLSPEC void luks_af_sha512_then_aes_decrypt (GLOBAL_AS const luks_t *luks_bufs, GLOBAL_AS luks_tmp_t *tmps, u32 *pt_buf, SHM_TYPE u32 *s_te0, SHM_TYPE u32 *s_te1, SHM_TYPE u32 *s_te2, SHM_TYPE u32 *s_te3, SHM_TYPE u32 *s_te4, SHM_TYPE u32 *s_td0, SHM_TYPE u32 *s_td1, SHM_TYPE u32 *s_td2, SHM_TYPE u32 *s_td3, SHM_TYPE u32 *s_td4); +DECLSPEC void luks_af_ripemd160_then_aes_decrypt (GLOBAL_AS const luks_t *luks_bufs, GLOBAL_AS luks_tmp_t *tmps, u32 *pt_buf, SHM_TYPE u32 *s_te0, SHM_TYPE u32 *s_te1, SHM_TYPE u32 *s_te2, SHM_TYPE u32 *s_te3, SHM_TYPE u32 *s_te4, SHM_TYPE u32 *s_td0, SHM_TYPE u32 *s_td1, SHM_TYPE u32 *s_td2, SHM_TYPE u32 *s_td3, SHM_TYPE u32 *s_td4); diff --git a/OpenCL/inc_luks_af.cl b/OpenCL/inc_luks_af.cl index 441fa2811..37a7015d8 100644 --- a/OpenCL/inc_luks_af.cl +++ b/OpenCL/inc_luks_af.cl @@ -1,7 +1,7 @@ // basically normal XXX_transform() but with a different name to avoid collisions with function nameing -__constant u32a AF_k_sha256[64] = +CONSTANT_AS u32a AF_k_sha256[64] = { SHA256C00, SHA256C01, SHA256C02, SHA256C03, SHA256C04, SHA256C05, SHA256C06, SHA256C07, @@ -21,7 +21,7 @@ __constant u32a AF_k_sha256[64] = SHA256C3c, SHA256C3d, SHA256C3e, SHA256C3f, }; -__constant u64a AF_k_sha512[80] = +CONSTANT_AS u64a AF_k_sha512[80] = { SHA512C00, SHA512C01, SHA512C02, SHA512C03, SHA512C04, SHA512C05, SHA512C06, SHA512C07, diff --git a/OpenCL/inc_luks_af.h b/OpenCL/inc_luks_af.h index 158bf0a36..a8ea3c851 100644 --- a/OpenCL/inc_luks_af.h +++ b/OpenCL/inc_luks_af.h @@ -3,19 +3,19 @@ * License.....: MIT */ -DECLSPEC void AF_sha1_transform_S (const u32 *w0, const u32 *w1, const u32 *w2, const u32 *w3, u32 *digest) -DECLSPEC void AF_sha256_transform_S (const u32 *w0, const u32 *w1, const u32 *w2, const u32 *w3, u32 *digest) -DECLSPEC void AF_sha512_transform_S (const u64 *w0, const u64 *w1, const u64 *w2, const u64 *w3, u64 *digest) -DECLSPEC void AF_ripemd160_transform_S (const u32 *w0, const u32 *w1, const u32 *w2, const u32 *w3, u32 *digest) -DECLSPEC void AF_sha1_diffuse16 (u32 *out) -DECLSPEC void AF_sha1_diffuse32 (u32 *out) -DECLSPEC void AF_sha1_diffuse64 (u32 *out) -DECLSPEC void AF_sha256_diffuse16 (u32 *out) -DECLSPEC void AF_sha256_diffuse32 (u32 *out) -DECLSPEC void AF_sha256_diffuse64 (u32 *out) -DECLSPEC void AF_sha512_diffuse16 (u32 *out) -DECLSPEC void AF_sha512_diffuse32 (u32 *out) -DECLSPEC void AF_sha512_diffuse64 (u32 *out) -DECLSPEC void AF_ripemd160_diffuse16 (u32 *out) -DECLSPEC void AF_ripemd160_diffuse32 (u32 *out) -DECLSPEC void AF_ripemd160_diffuse64 (u32 *out) +DECLSPEC void AF_sha1_transform_S (const u32 *w0, const u32 *w1, const u32 *w2, const u32 *w3, u32 *digest); +DECLSPEC void AF_sha256_transform_S (const u32 *w0, const u32 *w1, const u32 *w2, const u32 *w3, u32 *digest); +DECLSPEC void AF_sha512_transform_S (const u64 *w0, const u64 *w1, const u64 *w2, const u64 *w3, u64 *digest); +DECLSPEC void AF_ripemd160_transform_S (const u32 *w0, const u32 *w1, const u32 *w2, const u32 *w3, u32 *digest); +DECLSPEC void AF_sha1_diffuse16 (u32 *out); +DECLSPEC void AF_sha1_diffuse32 (u32 *out); +DECLSPEC void AF_sha1_diffuse64 (u32 *out); +DECLSPEC void AF_sha256_diffuse16 (u32 *out); +DECLSPEC void AF_sha256_diffuse32 (u32 *out); +DECLSPEC void AF_sha256_diffuse64 (u32 *out); +DECLSPEC void AF_sha512_diffuse16 (u32 *out); +DECLSPEC void AF_sha512_diffuse32 (u32 *out); +DECLSPEC void AF_sha512_diffuse64 (u32 *out); +DECLSPEC void AF_ripemd160_diffuse16 (u32 *out); +DECLSPEC void AF_ripemd160_diffuse32 (u32 *out); +DECLSPEC void AF_ripemd160_diffuse64 (u32 *out); diff --git a/OpenCL/inc_luks_essiv.cl b/OpenCL/inc_luks_essiv.cl index dd08d28a5..ebf817fc4 100644 --- a/OpenCL/inc_luks_essiv.cl +++ b/OpenCL/inc_luks_essiv.cl @@ -1,4 +1,4 @@ -__constant u32a ESSIV_k_sha256[64] = +CONSTANT_AS u32a ESSIV_k_sha256[64] = { SHA256C00, SHA256C01, SHA256C02, SHA256C03, SHA256C04, SHA256C05, SHA256C06, SHA256C07, diff --git a/OpenCL/inc_luks_essiv.h b/OpenCL/inc_luks_essiv.h index 25c854b8a..0defec7b8 100644 --- a/OpenCL/inc_luks_essiv.h +++ b/OpenCL/inc_luks_essiv.h @@ -3,6 +3,6 @@ * License.....: MIT */ -DECLSPEC void ESSIV_sha256_transform_S (const u32 *w0, const u32 *w1, const u32 *w2, const u32 *w3, u32 *digest) -DECLSPEC void ESSIV_sha256_init128 (u32 *key, u32 *essivhash) -DECLSPEC void ESSIV_sha256_init256 (u32 *key, u32 *essivhash) +DECLSPEC void ESSIV_sha256_transform_S (const u32 *w0, const u32 *w1, const u32 *w2, const u32 *w3, u32 *digest); +DECLSPEC void ESSIV_sha256_init128 (u32 *key, u32 *essivhash); +DECLSPEC void ESSIV_sha256_init256 (u32 *key, u32 *essivhash); diff --git a/OpenCL/inc_luks_serpent.cl b/OpenCL/inc_luks_serpent.cl index f2bc56502..a91cf7269 100644 --- a/OpenCL/inc_luks_serpent.cl +++ b/OpenCL/inc_luks_serpent.cl @@ -31,7 +31,7 @@ DECLSPEC void serpent256_decrypt_cbc (const u32 *ks1, const u32 *in, u32 *out, u essiv[3] = in[3]; } -DECLSPEC void luks_decrypt_sector_serpent_cbc_essiv128 (__global const u32 *in, u32 *out, const u32 *ks1, const u32 *ks2, const u32 sector) +DECLSPEC void luks_decrypt_sector_serpent_cbc_essiv128 (GLOBAL_AS const u32 *in, u32 *out, const u32 *ks1, const u32 *ks2, const u32 sector) { u32 S[4] = { sector, 0, 0, 0 }; @@ -65,7 +65,7 @@ DECLSPEC void luks_decrypt_sector_serpent_cbc_essiv128 (__global const u32 *in, } } -DECLSPEC void luks_decrypt_sector_serpent_cbc_essiv128_mk_sha1 (__global const u32 *in, u32 *mk, const u32 *ks1, const u32 *ks2, const u32 sector) +DECLSPEC void luks_decrypt_sector_serpent_cbc_essiv128_mk_sha1 (GLOBAL_AS const u32 *in, u32 *mk, const u32 *ks1, const u32 *ks2, const u32 sector) { u32 S[4] = { sector, 0, 0, 0 }; @@ -102,7 +102,7 @@ DECLSPEC void luks_decrypt_sector_serpent_cbc_essiv128_mk_sha1 (__global const u } } -DECLSPEC void luks_decrypt_sector_serpent_cbc_essiv128_mk_sha1_final (__global const u32 *in, u32 *mk, const u32 *ks1, const u32 *ks2, const u32 sector) +DECLSPEC void luks_decrypt_sector_serpent_cbc_essiv128_mk_sha1_final (GLOBAL_AS const u32 *in, u32 *mk, const u32 *ks1, const u32 *ks2, const u32 sector) { u32 S[4] = { sector, 0, 0, 0 }; @@ -162,7 +162,7 @@ DECLSPEC void luks_decrypt_sector_serpent_cbc_essiv128_mk_sha1_final (__global c } } -DECLSPEC void luks_decrypt_sector_serpent_cbc_essiv128_mk_sha256 (__global const u32 *in, u32 *mk, const u32 *ks1, const u32 *ks2, const u32 sector) +DECLSPEC void luks_decrypt_sector_serpent_cbc_essiv128_mk_sha256 (GLOBAL_AS const u32 *in, u32 *mk, const u32 *ks1, const u32 *ks2, const u32 sector) { u32 S[4] = { sector, 0, 0, 0 }; @@ -199,7 +199,7 @@ DECLSPEC void luks_decrypt_sector_serpent_cbc_essiv128_mk_sha256 (__global const } } -DECLSPEC void luks_decrypt_sector_serpent_cbc_essiv128_mk_sha256_final (__global const u32 *in, u32 *mk, const u32 *ks1, const u32 *ks2, const u32 sector) +DECLSPEC void luks_decrypt_sector_serpent_cbc_essiv128_mk_sha256_final (GLOBAL_AS const u32 *in, u32 *mk, const u32 *ks1, const u32 *ks2, const u32 sector) { u32 S[4] = { sector, 0, 0, 0 }; @@ -259,7 +259,7 @@ DECLSPEC void luks_decrypt_sector_serpent_cbc_essiv128_mk_sha256_final (__global } } -DECLSPEC void luks_decrypt_sector_serpent_cbc_essiv128_mk_sha512 (__global const u32 *in, u32 *mk, const u32 *ks1, const u32 *ks2, const u32 sector) +DECLSPEC void luks_decrypt_sector_serpent_cbc_essiv128_mk_sha512 (GLOBAL_AS const u32 *in, u32 *mk, const u32 *ks1, const u32 *ks2, const u32 sector) { u32 S[4] = { sector, 0, 0, 0 }; @@ -296,7 +296,7 @@ DECLSPEC void luks_decrypt_sector_serpent_cbc_essiv128_mk_sha512 (__global const } } -DECLSPEC void luks_decrypt_sector_serpent_cbc_essiv128_mk_sha512_final (__global const u32 *in, u32 *mk, const u32 *ks1, const u32 *ks2, const u32 sector) +DECLSPEC void luks_decrypt_sector_serpent_cbc_essiv128_mk_sha512_final (GLOBAL_AS const u32 *in, u32 *mk, const u32 *ks1, const u32 *ks2, const u32 sector) { u32 S[4] = { sector, 0, 0, 0 }; @@ -356,7 +356,7 @@ DECLSPEC void luks_decrypt_sector_serpent_cbc_essiv128_mk_sha512_final (__global } } -DECLSPEC void luks_decrypt_sector_serpent_cbc_essiv128_mk_ripemd160 (__global const u32 *in, u32 *mk, const u32 *ks1, const u32 *ks2, const u32 sector) +DECLSPEC void luks_decrypt_sector_serpent_cbc_essiv128_mk_ripemd160 (GLOBAL_AS const u32 *in, u32 *mk, const u32 *ks1, const u32 *ks2, const u32 sector) { u32 S[4] = { sector, 0, 0, 0 }; @@ -393,7 +393,7 @@ DECLSPEC void luks_decrypt_sector_serpent_cbc_essiv128_mk_ripemd160 (__global co } } -DECLSPEC void luks_decrypt_sector_serpent_cbc_essiv128_mk_ripemd160_final (__global const u32 *in, u32 *mk, const u32 *ks1, const u32 *ks2, const u32 sector) +DECLSPEC void luks_decrypt_sector_serpent_cbc_essiv128_mk_ripemd160_final (GLOBAL_AS const u32 *in, u32 *mk, const u32 *ks1, const u32 *ks2, const u32 sector) { u32 S[4] = { sector, 0, 0, 0 }; @@ -453,7 +453,7 @@ DECLSPEC void luks_decrypt_sector_serpent_cbc_essiv128_mk_ripemd160_final (__glo } } -DECLSPEC void luks_decrypt_sector_serpent_cbc_essiv256 (__global const u32 *in, u32 *out, const u32 *ks1, const u32 *ks2, const u32 sector) +DECLSPEC void luks_decrypt_sector_serpent_cbc_essiv256 (GLOBAL_AS const u32 *in, u32 *out, const u32 *ks1, const u32 *ks2, const u32 sector) { u32 S[4] = { sector, 0, 0, 0 }; @@ -487,7 +487,7 @@ DECLSPEC void luks_decrypt_sector_serpent_cbc_essiv256 (__global const u32 *in, } } -DECLSPEC void luks_decrypt_sector_serpent_cbc_essiv256_mk_sha1 (__global const u32 *in, u32 *mk, const u32 *ks1, const u32 *ks2, const u32 sector) +DECLSPEC void luks_decrypt_sector_serpent_cbc_essiv256_mk_sha1 (GLOBAL_AS const u32 *in, u32 *mk, const u32 *ks1, const u32 *ks2, const u32 sector) { u32 S[4] = { sector, 0, 0, 0 }; @@ -524,7 +524,7 @@ DECLSPEC void luks_decrypt_sector_serpent_cbc_essiv256_mk_sha1 (__global const u } } -DECLSPEC void luks_decrypt_sector_serpent_cbc_essiv256_mk_sha1_final (__global const u32 *in, u32 *mk, const u32 *ks1, const u32 *ks2, const u32 sector) +DECLSPEC void luks_decrypt_sector_serpent_cbc_essiv256_mk_sha1_final (GLOBAL_AS const u32 *in, u32 *mk, const u32 *ks1, const u32 *ks2, const u32 sector) { u32 S[4] = { sector, 0, 0, 0 }; @@ -584,7 +584,7 @@ DECLSPEC void luks_decrypt_sector_serpent_cbc_essiv256_mk_sha1_final (__global c } } -DECLSPEC void luks_decrypt_sector_serpent_cbc_essiv256_mk_sha256 (__global const u32 *in, u32 *mk, const u32 *ks1, const u32 *ks2, const u32 sector) +DECLSPEC void luks_decrypt_sector_serpent_cbc_essiv256_mk_sha256 (GLOBAL_AS const u32 *in, u32 *mk, const u32 *ks1, const u32 *ks2, const u32 sector) { u32 S[4] = { sector, 0, 0, 0 }; @@ -621,7 +621,7 @@ DECLSPEC void luks_decrypt_sector_serpent_cbc_essiv256_mk_sha256 (__global const } } -DECLSPEC void luks_decrypt_sector_serpent_cbc_essiv256_mk_sha256_final (__global const u32 *in, u32 *mk, const u32 *ks1, const u32 *ks2, const u32 sector) +DECLSPEC void luks_decrypt_sector_serpent_cbc_essiv256_mk_sha256_final (GLOBAL_AS const u32 *in, u32 *mk, const u32 *ks1, const u32 *ks2, const u32 sector) { u32 S[4] = { sector, 0, 0, 0 }; @@ -681,7 +681,7 @@ DECLSPEC void luks_decrypt_sector_serpent_cbc_essiv256_mk_sha256_final (__global } } -DECLSPEC void luks_decrypt_sector_serpent_cbc_essiv256_mk_sha512 (__global const u32 *in, u32 *mk, const u32 *ks1, const u32 *ks2, const u32 sector) +DECLSPEC void luks_decrypt_sector_serpent_cbc_essiv256_mk_sha512 (GLOBAL_AS const u32 *in, u32 *mk, const u32 *ks1, const u32 *ks2, const u32 sector) { u32 S[4] = { sector, 0, 0, 0 }; @@ -718,7 +718,7 @@ DECLSPEC void luks_decrypt_sector_serpent_cbc_essiv256_mk_sha512 (__global const } } -DECLSPEC void luks_decrypt_sector_serpent_cbc_essiv256_mk_sha512_final (__global const u32 *in, u32 *mk, const u32 *ks1, const u32 *ks2, const u32 sector) +DECLSPEC void luks_decrypt_sector_serpent_cbc_essiv256_mk_sha512_final (GLOBAL_AS const u32 *in, u32 *mk, const u32 *ks1, const u32 *ks2, const u32 sector) { u32 S[4] = { sector, 0, 0, 0 }; @@ -778,7 +778,7 @@ DECLSPEC void luks_decrypt_sector_serpent_cbc_essiv256_mk_sha512_final (__global } } -DECLSPEC void luks_decrypt_sector_serpent_cbc_essiv256_mk_ripemd160 (__global const u32 *in, u32 *mk, const u32 *ks1, const u32 *ks2, const u32 sector) +DECLSPEC void luks_decrypt_sector_serpent_cbc_essiv256_mk_ripemd160 (GLOBAL_AS const u32 *in, u32 *mk, const u32 *ks1, const u32 *ks2, const u32 sector) { u32 S[4] = { sector, 0, 0, 0 }; @@ -815,7 +815,7 @@ DECLSPEC void luks_decrypt_sector_serpent_cbc_essiv256_mk_ripemd160 (__global co } } -DECLSPEC void luks_decrypt_sector_serpent_cbc_essiv256_mk_ripemd160_final (__global const u32 *in, u32 *mk, const u32 *ks1, const u32 *ks2, const u32 sector) +DECLSPEC void luks_decrypt_sector_serpent_cbc_essiv256_mk_ripemd160_final (GLOBAL_AS const u32 *in, u32 *mk, const u32 *ks1, const u32 *ks2, const u32 sector) { u32 S[4] = { sector, 0, 0, 0 }; @@ -877,7 +877,7 @@ DECLSPEC void luks_decrypt_sector_serpent_cbc_essiv256_mk_ripemd160_final (__glo // cbc-plain -DECLSPEC void luks_decrypt_sector_serpent_cbc_plain128 (__global const u32 *in, u32 *out, const u32 *ks1, const u32 sector) +DECLSPEC void luks_decrypt_sector_serpent_cbc_plain128 (GLOBAL_AS const u32 *in, u32 *out, const u32 *ks1, const u32 sector) { u32 S[4] = { sector, 0, 0, 0 }; @@ -907,7 +907,7 @@ DECLSPEC void luks_decrypt_sector_serpent_cbc_plain128 (__global const u32 *in, } } -DECLSPEC void luks_decrypt_sector_serpent_cbc_plain128_mk_sha1 (__global const u32 *in, u32 *mk, const u32 *ks1, const u32 sector) +DECLSPEC void luks_decrypt_sector_serpent_cbc_plain128_mk_sha1 (GLOBAL_AS const u32 *in, u32 *mk, const u32 *ks1, const u32 sector) { u32 S[4] = { sector, 0, 0, 0 }; @@ -940,7 +940,7 @@ DECLSPEC void luks_decrypt_sector_serpent_cbc_plain128_mk_sha1 (__global const u } } -DECLSPEC void luks_decrypt_sector_serpent_cbc_plain128_mk_sha1_final (__global const u32 *in, u32 *mk, const u32 *ks1, const u32 sector) +DECLSPEC void luks_decrypt_sector_serpent_cbc_plain128_mk_sha1_final (GLOBAL_AS const u32 *in, u32 *mk, const u32 *ks1, const u32 sector) { u32 S[4] = { sector, 0, 0, 0 }; @@ -996,7 +996,7 @@ DECLSPEC void luks_decrypt_sector_serpent_cbc_plain128_mk_sha1_final (__global c } } -DECLSPEC void luks_decrypt_sector_serpent_cbc_plain128_mk_sha256 (__global const u32 *in, u32 *mk, const u32 *ks1, const u32 sector) +DECLSPEC void luks_decrypt_sector_serpent_cbc_plain128_mk_sha256 (GLOBAL_AS const u32 *in, u32 *mk, const u32 *ks1, const u32 sector) { u32 S[4] = { sector, 0, 0, 0 }; @@ -1029,7 +1029,7 @@ DECLSPEC void luks_decrypt_sector_serpent_cbc_plain128_mk_sha256 (__global const } } -DECLSPEC void luks_decrypt_sector_serpent_cbc_plain128_mk_sha256_final (__global const u32 *in, u32 *mk, const u32 *ks1, const u32 sector) +DECLSPEC void luks_decrypt_sector_serpent_cbc_plain128_mk_sha256_final (GLOBAL_AS const u32 *in, u32 *mk, const u32 *ks1, const u32 sector) { u32 S[4] = { sector, 0, 0, 0 }; @@ -1085,7 +1085,7 @@ DECLSPEC void luks_decrypt_sector_serpent_cbc_plain128_mk_sha256_final (__global } } -DECLSPEC void luks_decrypt_sector_serpent_cbc_plain128_mk_sha512 (__global const u32 *in, u32 *mk, const u32 *ks1, const u32 sector) +DECLSPEC void luks_decrypt_sector_serpent_cbc_plain128_mk_sha512 (GLOBAL_AS const u32 *in, u32 *mk, const u32 *ks1, const u32 sector) { u32 S[4] = { sector, 0, 0, 0 }; @@ -1118,7 +1118,7 @@ DECLSPEC void luks_decrypt_sector_serpent_cbc_plain128_mk_sha512 (__global const } } -DECLSPEC void luks_decrypt_sector_serpent_cbc_plain128_mk_sha512_final (__global const u32 *in, u32 *mk, const u32 *ks1, const u32 sector) +DECLSPEC void luks_decrypt_sector_serpent_cbc_plain128_mk_sha512_final (GLOBAL_AS const u32 *in, u32 *mk, const u32 *ks1, const u32 sector) { u32 S[4] = { sector, 0, 0, 0 }; @@ -1174,7 +1174,7 @@ DECLSPEC void luks_decrypt_sector_serpent_cbc_plain128_mk_sha512_final (__global } } -DECLSPEC void luks_decrypt_sector_serpent_cbc_plain128_mk_ripemd160 (__global const u32 *in, u32 *mk, const u32 *ks1, const u32 sector) +DECLSPEC void luks_decrypt_sector_serpent_cbc_plain128_mk_ripemd160 (GLOBAL_AS const u32 *in, u32 *mk, const u32 *ks1, const u32 sector) { u32 S[4] = { sector, 0, 0, 0 }; @@ -1207,7 +1207,7 @@ DECLSPEC void luks_decrypt_sector_serpent_cbc_plain128_mk_ripemd160 (__global co } } -DECLSPEC void luks_decrypt_sector_serpent_cbc_plain128_mk_ripemd160_final (__global const u32 *in, u32 *mk, const u32 *ks1, const u32 sector) +DECLSPEC void luks_decrypt_sector_serpent_cbc_plain128_mk_ripemd160_final (GLOBAL_AS const u32 *in, u32 *mk, const u32 *ks1, const u32 sector) { u32 S[4] = { sector, 0, 0, 0 }; @@ -1263,7 +1263,7 @@ DECLSPEC void luks_decrypt_sector_serpent_cbc_plain128_mk_ripemd160_final (__glo } } -DECLSPEC void luks_decrypt_sector_serpent_cbc_plain256 (__global const u32 *in, u32 *out, const u32 *ks1, const u32 sector) +DECLSPEC void luks_decrypt_sector_serpent_cbc_plain256 (GLOBAL_AS const u32 *in, u32 *out, const u32 *ks1, const u32 sector) { u32 S[4] = { sector, 0, 0, 0 }; @@ -1293,7 +1293,7 @@ DECLSPEC void luks_decrypt_sector_serpent_cbc_plain256 (__global const u32 *in, } } -DECLSPEC void luks_decrypt_sector_serpent_cbc_plain256_mk_sha1 (__global const u32 *in, u32 *mk, const u32 *ks1, const u32 sector) +DECLSPEC void luks_decrypt_sector_serpent_cbc_plain256_mk_sha1 (GLOBAL_AS const u32 *in, u32 *mk, const u32 *ks1, const u32 sector) { u32 S[4] = { sector, 0, 0, 0 }; @@ -1326,7 +1326,7 @@ DECLSPEC void luks_decrypt_sector_serpent_cbc_plain256_mk_sha1 (__global const u } } -DECLSPEC void luks_decrypt_sector_serpent_cbc_plain256_mk_sha1_final (__global const u32 *in, u32 *mk, const u32 *ks1, const u32 sector) +DECLSPEC void luks_decrypt_sector_serpent_cbc_plain256_mk_sha1_final (GLOBAL_AS const u32 *in, u32 *mk, const u32 *ks1, const u32 sector) { u32 S[4] = { sector, 0, 0, 0 }; @@ -1382,7 +1382,7 @@ DECLSPEC void luks_decrypt_sector_serpent_cbc_plain256_mk_sha1_final (__global c } } -DECLSPEC void luks_decrypt_sector_serpent_cbc_plain256_mk_sha256 (__global const u32 *in, u32 *mk, const u32 *ks1, const u32 sector) +DECLSPEC void luks_decrypt_sector_serpent_cbc_plain256_mk_sha256 (GLOBAL_AS const u32 *in, u32 *mk, const u32 *ks1, const u32 sector) { u32 S[4] = { sector, 0, 0, 0 }; @@ -1415,7 +1415,7 @@ DECLSPEC void luks_decrypt_sector_serpent_cbc_plain256_mk_sha256 (__global const } } -DECLSPEC void luks_decrypt_sector_serpent_cbc_plain256_mk_sha256_final (__global const u32 *in, u32 *mk, const u32 *ks1, const u32 sector) +DECLSPEC void luks_decrypt_sector_serpent_cbc_plain256_mk_sha256_final (GLOBAL_AS const u32 *in, u32 *mk, const u32 *ks1, const u32 sector) { u32 S[4] = { sector, 0, 0, 0 }; @@ -1471,7 +1471,7 @@ DECLSPEC void luks_decrypt_sector_serpent_cbc_plain256_mk_sha256_final (__global } } -DECLSPEC void luks_decrypt_sector_serpent_cbc_plain256_mk_sha512 (__global const u32 *in, u32 *mk, const u32 *ks1, const u32 sector) +DECLSPEC void luks_decrypt_sector_serpent_cbc_plain256_mk_sha512 (GLOBAL_AS const u32 *in, u32 *mk, const u32 *ks1, const u32 sector) { u32 S[4] = { sector, 0, 0, 0 }; @@ -1504,7 +1504,7 @@ DECLSPEC void luks_decrypt_sector_serpent_cbc_plain256_mk_sha512 (__global const } } -DECLSPEC void luks_decrypt_sector_serpent_cbc_plain256_mk_sha512_final (__global const u32 *in, u32 *mk, const u32 *ks1, const u32 sector) +DECLSPEC void luks_decrypt_sector_serpent_cbc_plain256_mk_sha512_final (GLOBAL_AS const u32 *in, u32 *mk, const u32 *ks1, const u32 sector) { u32 S[4] = { sector, 0, 0, 0 }; @@ -1560,7 +1560,7 @@ DECLSPEC void luks_decrypt_sector_serpent_cbc_plain256_mk_sha512_final (__global } } -DECLSPEC void luks_decrypt_sector_serpent_cbc_plain256_mk_ripemd160 (__global const u32 *in, u32 *mk, const u32 *ks1, const u32 sector) +DECLSPEC void luks_decrypt_sector_serpent_cbc_plain256_mk_ripemd160 (GLOBAL_AS const u32 *in, u32 *mk, const u32 *ks1, const u32 sector) { u32 S[4] = { sector, 0, 0, 0 }; @@ -1593,7 +1593,7 @@ DECLSPEC void luks_decrypt_sector_serpent_cbc_plain256_mk_ripemd160 (__global co } } -DECLSPEC void luks_decrypt_sector_serpent_cbc_plain256_mk_ripemd160_final (__global const u32 *in, u32 *mk, const u32 *ks1, const u32 sector) +DECLSPEC void luks_decrypt_sector_serpent_cbc_plain256_mk_ripemd160_final (GLOBAL_AS const u32 *in, u32 *mk, const u32 *ks1, const u32 sector) { u32 S[4] = { sector, 0, 0, 0 }; @@ -1695,7 +1695,7 @@ DECLSPEC void serpent256_decrypt_xts (const u32 *ks1, const u32 *in, u32 *out, u xts_mul2 (T, T); } -DECLSPEC void luks_decrypt_sector_serpent_xts_plain256 (__global const u32 *in, u32 *out, const u32 *ks1, const u32 *ks2, const u32 sector) +DECLSPEC void luks_decrypt_sector_serpent_xts_plain256 (GLOBAL_AS const u32 *in, u32 *out, const u32 *ks1, const u32 *ks2, const u32 sector) { u32 S[4] = { sector, 0, 0, 0 }; @@ -1729,7 +1729,7 @@ DECLSPEC void luks_decrypt_sector_serpent_xts_plain256 (__global const u32 *in, } } -DECLSPEC void luks_decrypt_sector_serpent_xts_plain256_mk_sha1 (__global const u32 *in, u32 *mk, const u32 *ks1, const u32 *ks2, const u32 sector) +DECLSPEC void luks_decrypt_sector_serpent_xts_plain256_mk_sha1 (GLOBAL_AS const u32 *in, u32 *mk, const u32 *ks1, const u32 *ks2, const u32 sector) { u32 S[4] = { sector, 0, 0, 0 }; @@ -1766,7 +1766,7 @@ DECLSPEC void luks_decrypt_sector_serpent_xts_plain256_mk_sha1 (__global const u } } -DECLSPEC void luks_decrypt_sector_serpent_xts_plain256_mk_sha1_final (__global const u32 *in, u32 *mk, const u32 *ks1, const u32 *ks2, const u32 sector) +DECLSPEC void luks_decrypt_sector_serpent_xts_plain256_mk_sha1_final (GLOBAL_AS const u32 *in, u32 *mk, const u32 *ks1, const u32 *ks2, const u32 sector) { u32 S[4] = { sector, 0, 0, 0 }; @@ -1826,7 +1826,7 @@ DECLSPEC void luks_decrypt_sector_serpent_xts_plain256_mk_sha1_final (__global c } } -DECLSPEC void luks_decrypt_sector_serpent_xts_plain256_mk_sha256 (__global const u32 *in, u32 *mk, const u32 *ks1, const u32 *ks2, const u32 sector) +DECLSPEC void luks_decrypt_sector_serpent_xts_plain256_mk_sha256 (GLOBAL_AS const u32 *in, u32 *mk, const u32 *ks1, const u32 *ks2, const u32 sector) { u32 S[4] = { sector, 0, 0, 0 }; @@ -1863,7 +1863,7 @@ DECLSPEC void luks_decrypt_sector_serpent_xts_plain256_mk_sha256 (__global const } } -DECLSPEC void luks_decrypt_sector_serpent_xts_plain256_mk_sha256_final (__global const u32 *in, u32 *mk, const u32 *ks1, const u32 *ks2, const u32 sector) +DECLSPEC void luks_decrypt_sector_serpent_xts_plain256_mk_sha256_final (GLOBAL_AS const u32 *in, u32 *mk, const u32 *ks1, const u32 *ks2, const u32 sector) { u32 S[4] = { sector, 0, 0, 0 }; @@ -1923,7 +1923,7 @@ DECLSPEC void luks_decrypt_sector_serpent_xts_plain256_mk_sha256_final (__global } } -DECLSPEC void luks_decrypt_sector_serpent_xts_plain256_mk_sha512 (__global const u32 *in, u32 *mk, const u32 *ks1, const u32 *ks2, const u32 sector) +DECLSPEC void luks_decrypt_sector_serpent_xts_plain256_mk_sha512 (GLOBAL_AS const u32 *in, u32 *mk, const u32 *ks1, const u32 *ks2, const u32 sector) { u32 S[4] = { sector, 0, 0, 0 }; @@ -1960,7 +1960,7 @@ DECLSPEC void luks_decrypt_sector_serpent_xts_plain256_mk_sha512 (__global const } } -DECLSPEC void luks_decrypt_sector_serpent_xts_plain256_mk_sha512_final (__global const u32 *in, u32 *mk, const u32 *ks1, const u32 *ks2, const u32 sector) +DECLSPEC void luks_decrypt_sector_serpent_xts_plain256_mk_sha512_final (GLOBAL_AS const u32 *in, u32 *mk, const u32 *ks1, const u32 *ks2, const u32 sector) { u32 S[4] = { sector, 0, 0, 0 }; @@ -2020,7 +2020,7 @@ DECLSPEC void luks_decrypt_sector_serpent_xts_plain256_mk_sha512_final (__global } } -DECLSPEC void luks_decrypt_sector_serpent_xts_plain256_mk_ripemd160 (__global const u32 *in, u32 *mk, const u32 *ks1, const u32 *ks2, const u32 sector) +DECLSPEC void luks_decrypt_sector_serpent_xts_plain256_mk_ripemd160 (GLOBAL_AS const u32 *in, u32 *mk, const u32 *ks1, const u32 *ks2, const u32 sector) { u32 S[4] = { sector, 0, 0, 0 }; @@ -2057,7 +2057,7 @@ DECLSPEC void luks_decrypt_sector_serpent_xts_plain256_mk_ripemd160 (__global co } } -DECLSPEC void luks_decrypt_sector_serpent_xts_plain256_mk_ripemd160_final (__global const u32 *in, u32 *mk, const u32 *ks1, const u32 *ks2, const u32 sector) +DECLSPEC void luks_decrypt_sector_serpent_xts_plain256_mk_ripemd160_final (GLOBAL_AS const u32 *in, u32 *mk, const u32 *ks1, const u32 *ks2, const u32 sector) { u32 S[4] = { sector, 0, 0, 0 }; @@ -2117,7 +2117,7 @@ DECLSPEC void luks_decrypt_sector_serpent_xts_plain256_mk_ripemd160_final (__glo } } -DECLSPEC void luks_decrypt_sector_serpent_xts_plain512 (__global const u32 *in, u32 *out, const u32 *ks1, const u32 *ks2, const u32 sector) +DECLSPEC void luks_decrypt_sector_serpent_xts_plain512 (GLOBAL_AS const u32 *in, u32 *out, const u32 *ks1, const u32 *ks2, const u32 sector) { u32 S[4] = { sector, 0, 0, 0 }; @@ -2151,7 +2151,7 @@ DECLSPEC void luks_decrypt_sector_serpent_xts_plain512 (__global const u32 *in, } } -DECLSPEC void luks_decrypt_sector_serpent_xts_plain512_mk_sha1 (__global const u32 *in, u32 *mk, const u32 *ks1, const u32 *ks2, const u32 sector) +DECLSPEC void luks_decrypt_sector_serpent_xts_plain512_mk_sha1 (GLOBAL_AS const u32 *in, u32 *mk, const u32 *ks1, const u32 *ks2, const u32 sector) { u32 S[4] = { sector, 0, 0, 0 }; @@ -2188,7 +2188,7 @@ DECLSPEC void luks_decrypt_sector_serpent_xts_plain512_mk_sha1 (__global const u } } -DECLSPEC void luks_decrypt_sector_serpent_xts_plain512_mk_sha1_final (__global const u32 *in, u32 *mk, const u32 *ks1, const u32 *ks2, const u32 sector) +DECLSPEC void luks_decrypt_sector_serpent_xts_plain512_mk_sha1_final (GLOBAL_AS const u32 *in, u32 *mk, const u32 *ks1, const u32 *ks2, const u32 sector) { u32 S[4] = { sector, 0, 0, 0 }; @@ -2248,7 +2248,7 @@ DECLSPEC void luks_decrypt_sector_serpent_xts_plain512_mk_sha1_final (__global c } } -DECLSPEC void luks_decrypt_sector_serpent_xts_plain512_mk_sha256 (__global const u32 *in, u32 *mk, const u32 *ks1, const u32 *ks2, const u32 sector) +DECLSPEC void luks_decrypt_sector_serpent_xts_plain512_mk_sha256 (GLOBAL_AS const u32 *in, u32 *mk, const u32 *ks1, const u32 *ks2, const u32 sector) { u32 S[4] = { sector, 0, 0, 0 }; @@ -2285,7 +2285,7 @@ DECLSPEC void luks_decrypt_sector_serpent_xts_plain512_mk_sha256 (__global const } } -DECLSPEC void luks_decrypt_sector_serpent_xts_plain512_mk_sha256_final (__global const u32 *in, u32 *mk, const u32 *ks1, const u32 *ks2, const u32 sector) +DECLSPEC void luks_decrypt_sector_serpent_xts_plain512_mk_sha256_final (GLOBAL_AS const u32 *in, u32 *mk, const u32 *ks1, const u32 *ks2, const u32 sector) { u32 S[4] = { sector, 0, 0, 0 }; @@ -2345,7 +2345,7 @@ DECLSPEC void luks_decrypt_sector_serpent_xts_plain512_mk_sha256_final (__global } } -DECLSPEC void luks_decrypt_sector_serpent_xts_plain512_mk_sha512 (__global const u32 *in, u32 *mk, const u32 *ks1, const u32 *ks2, const u32 sector) +DECLSPEC void luks_decrypt_sector_serpent_xts_plain512_mk_sha512 (GLOBAL_AS const u32 *in, u32 *mk, const u32 *ks1, const u32 *ks2, const u32 sector) { u32 S[4] = { sector, 0, 0, 0 }; @@ -2382,7 +2382,7 @@ DECLSPEC void luks_decrypt_sector_serpent_xts_plain512_mk_sha512 (__global const } } -DECLSPEC void luks_decrypt_sector_serpent_xts_plain512_mk_sha512_final (__global const u32 *in, u32 *mk, const u32 *ks1, const u32 *ks2, const u32 sector) +DECLSPEC void luks_decrypt_sector_serpent_xts_plain512_mk_sha512_final (GLOBAL_AS const u32 *in, u32 *mk, const u32 *ks1, const u32 *ks2, const u32 sector) { u32 S[4] = { sector, 0, 0, 0 }; @@ -2442,7 +2442,7 @@ DECLSPEC void luks_decrypt_sector_serpent_xts_plain512_mk_sha512_final (__global } } -DECLSPEC void luks_decrypt_sector_serpent_xts_plain512_mk_ripemd160 (__global const u32 *in, u32 *mk, const u32 *ks1, const u32 *ks2, const u32 sector) +DECLSPEC void luks_decrypt_sector_serpent_xts_plain512_mk_ripemd160 (GLOBAL_AS const u32 *in, u32 *mk, const u32 *ks1, const u32 *ks2, const u32 sector) { u32 S[4] = { sector, 0, 0, 0 }; @@ -2479,7 +2479,7 @@ DECLSPEC void luks_decrypt_sector_serpent_xts_plain512_mk_ripemd160 (__global co } } -DECLSPEC void luks_decrypt_sector_serpent_xts_plain512_mk_ripemd160_final (__global const u32 *in, u32 *mk, const u32 *ks1, const u32 *ks2, const u32 sector) +DECLSPEC void luks_decrypt_sector_serpent_xts_plain512_mk_ripemd160_final (GLOBAL_AS const u32 *in, u32 *mk, const u32 *ks1, const u32 *ks2, const u32 sector) { u32 S[4] = { sector, 0, 0, 0 }; @@ -2541,7 +2541,7 @@ DECLSPEC void luks_decrypt_sector_serpent_xts_plain512_mk_ripemd160_final (__glo // luks helper -DECLSPEC void luks_af_sha1_then_serpent_decrypt (__global const luks_t *luks_bufs, __global luks_tmp_t *tmps, u32 *pt_buf) +DECLSPEC void luks_af_sha1_then_serpent_decrypt (GLOBAL_AS const luks_t *luks_bufs, GLOBAL_AS luks_tmp_t *tmps, u32 *pt_buf) { const u32 key_size = luks_bufs->key_size; const u32 cipher_mode = luks_bufs->cipher_mode; @@ -2900,7 +2900,7 @@ DECLSPEC void luks_af_sha1_then_serpent_decrypt (__global const luks_t *luks_buf } } -DECLSPEC void luks_af_sha256_then_serpent_decrypt (__global const luks_t *luks_bufs, __global luks_tmp_t *tmps, u32 *pt_buf) +DECLSPEC void luks_af_sha256_then_serpent_decrypt (GLOBAL_AS const luks_t *luks_bufs, GLOBAL_AS luks_tmp_t *tmps, u32 *pt_buf) { const u32 key_size = luks_bufs->key_size; const u32 cipher_mode = luks_bufs->cipher_mode; @@ -3259,7 +3259,7 @@ DECLSPEC void luks_af_sha256_then_serpent_decrypt (__global const luks_t *luks_b } } -DECLSPEC void luks_af_sha512_then_serpent_decrypt (__global const luks_t *luks_bufs, __global luks_tmp_t *tmps, u32 *pt_buf) +DECLSPEC void luks_af_sha512_then_serpent_decrypt (GLOBAL_AS const luks_t *luks_bufs, GLOBAL_AS luks_tmp_t *tmps, u32 *pt_buf) { const u32 key_size = luks_bufs->key_size; const u32 cipher_mode = luks_bufs->cipher_mode; @@ -3637,7 +3637,7 @@ DECLSPEC void luks_af_sha512_then_serpent_decrypt (__global const luks_t *luks_b } } -DECLSPEC void luks_af_ripemd160_then_serpent_decrypt (__global const luks_t *luks_bufs, __global luks_tmp_t *tmps, u32 *pt_buf) +DECLSPEC void luks_af_ripemd160_then_serpent_decrypt (GLOBAL_AS const luks_t *luks_bufs, GLOBAL_AS luks_tmp_t *tmps, u32 *pt_buf) { const u32 key_size = luks_bufs->key_size; const u32 cipher_mode = luks_bufs->cipher_mode; diff --git a/OpenCL/inc_luks_serpent.h b/OpenCL/inc_luks_serpent.h index 1890a9b8e..0bb5ce68b 100644 --- a/OpenCL/inc_luks_serpent.h +++ b/OpenCL/inc_luks_serpent.h @@ -3,66 +3,66 @@ * License.....: MIT */ -DECLSPEC void serpent128_decrypt_cbc (const u32 *ks1, const u32 *in, u32 *out, u32 *essiv) -DECLSPEC void serpent256_decrypt_cbc (const u32 *ks1, const u32 *in, u32 *out, u32 *essiv) -DECLSPEC void luks_decrypt_sector_serpent_cbc_essiv128 (__global const u32 *in, u32 *out, const u32 *ks1, const u32 *ks2, const u32 sector) -DECLSPEC void luks_decrypt_sector_serpent_cbc_essiv128_mk_sha1 (__global const u32 *in, u32 *mk, const u32 *ks1, const u32 *ks2, const u32 sector) -DECLSPEC void luks_decrypt_sector_serpent_cbc_essiv128_mk_sha1_final (__global const u32 *in, u32 *mk, const u32 *ks1, const u32 *ks2, const u32 sector) -DECLSPEC void luks_decrypt_sector_serpent_cbc_essiv128_mk_sha256 (__global const u32 *in, u32 *mk, const u32 *ks1, const u32 *ks2, const u32 sector) -DECLSPEC void luks_decrypt_sector_serpent_cbc_essiv128_mk_sha256_final (__global const u32 *in, u32 *mk, const u32 *ks1, const u32 *ks2, const u32 sector) -DECLSPEC void luks_decrypt_sector_serpent_cbc_essiv128_mk_sha512 (__global const u32 *in, u32 *mk, const u32 *ks1, const u32 *ks2, const u32 sector) -DECLSPEC void luks_decrypt_sector_serpent_cbc_essiv128_mk_sha512_final (__global const u32 *in, u32 *mk, const u32 *ks1, const u32 *ks2, const u32 sector) -DECLSPEC void luks_decrypt_sector_serpent_cbc_essiv128_mk_ripemd160 (__global const u32 *in, u32 *mk, const u32 *ks1, const u32 *ks2, const u32 sector) -DECLSPEC void luks_decrypt_sector_serpent_cbc_essiv128_mk_ripemd160_final (__global const u32 *in, u32 *mk, const u32 *ks1, const u32 *ks2, const u32 sector) -DECLSPEC void luks_decrypt_sector_serpent_cbc_essiv256 (__global const u32 *in, u32 *out, const u32 *ks1, const u32 *ks2, const u32 sector) -DECLSPEC void luks_decrypt_sector_serpent_cbc_essiv256_mk_sha1 (__global const u32 *in, u32 *mk, const u32 *ks1, const u32 *ks2, const u32 sector) -DECLSPEC void luks_decrypt_sector_serpent_cbc_essiv256_mk_sha1_final (__global const u32 *in, u32 *mk, const u32 *ks1, const u32 *ks2, const u32 sector) -DECLSPEC void luks_decrypt_sector_serpent_cbc_essiv256_mk_sha256 (__global const u32 *in, u32 *mk, const u32 *ks1, const u32 *ks2, const u32 sector) -DECLSPEC void luks_decrypt_sector_serpent_cbc_essiv256_mk_sha256_final (__global const u32 *in, u32 *mk, const u32 *ks1, const u32 *ks2, const u32 sector) -DECLSPEC void luks_decrypt_sector_serpent_cbc_essiv256_mk_sha512 (__global const u32 *in, u32 *mk, const u32 *ks1, const u32 *ks2, const u32 sector) -DECLSPEC void luks_decrypt_sector_serpent_cbc_essiv256_mk_sha512_final (__global const u32 *in, u32 *mk, const u32 *ks1, const u32 *ks2, const u32 sector) -DECLSPEC void luks_decrypt_sector_serpent_cbc_essiv256_mk_ripemd160 (__global const u32 *in, u32 *mk, const u32 *ks1, const u32 *ks2, const u32 sector) -DECLSPEC void luks_decrypt_sector_serpent_cbc_essiv256_mk_ripemd160_final (__global const u32 *in, u32 *mk, const u32 *ks1, const u32 *ks2, const u32 sector) -DECLSPEC void luks_decrypt_sector_serpent_cbc_plain128 (__global const u32 *in, u32 *out, const u32 *ks1, const u32 sector) -DECLSPEC void luks_decrypt_sector_serpent_cbc_plain128_mk_sha1 (__global const u32 *in, u32 *mk, const u32 *ks1, const u32 sector) -DECLSPEC void luks_decrypt_sector_serpent_cbc_plain128_mk_sha1_final (__global const u32 *in, u32 *mk, const u32 *ks1, const u32 sector) -DECLSPEC void luks_decrypt_sector_serpent_cbc_plain128_mk_sha256 (__global const u32 *in, u32 *mk, const u32 *ks1, const u32 sector) -DECLSPEC void luks_decrypt_sector_serpent_cbc_plain128_mk_sha256_final (__global const u32 *in, u32 *mk, const u32 *ks1, const u32 sector) -DECLSPEC void luks_decrypt_sector_serpent_cbc_plain128_mk_sha512 (__global const u32 *in, u32 *mk, const u32 *ks1, const u32 sector) -DECLSPEC void luks_decrypt_sector_serpent_cbc_plain128_mk_sha512_final (__global const u32 *in, u32 *mk, const u32 *ks1, const u32 sector) -DECLSPEC void luks_decrypt_sector_serpent_cbc_plain128_mk_ripemd160 (__global const u32 *in, u32 *mk, const u32 *ks1, const u32 sector) -DECLSPEC void luks_decrypt_sector_serpent_cbc_plain128_mk_ripemd160_final (__global const u32 *in, u32 *mk, const u32 *ks1, const u32 sector) -DECLSPEC void luks_decrypt_sector_serpent_cbc_plain256 (__global const u32 *in, u32 *out, const u32 *ks1, const u32 sector) -DECLSPEC void luks_decrypt_sector_serpent_cbc_plain256_mk_sha1 (__global const u32 *in, u32 *mk, const u32 *ks1, const u32 sector) -DECLSPEC void luks_decrypt_sector_serpent_cbc_plain256_mk_sha1_final (__global const u32 *in, u32 *mk, const u32 *ks1, const u32 sector) -DECLSPEC void luks_decrypt_sector_serpent_cbc_plain256_mk_sha256 (__global const u32 *in, u32 *mk, const u32 *ks1, const u32 sector) -DECLSPEC void luks_decrypt_sector_serpent_cbc_plain256_mk_sha256_final (__global const u32 *in, u32 *mk, const u32 *ks1, const u32 sector) -DECLSPEC void luks_decrypt_sector_serpent_cbc_plain256_mk_sha512 (__global const u32 *in, u32 *mk, const u32 *ks1, const u32 sector) -DECLSPEC void luks_decrypt_sector_serpent_cbc_plain256_mk_sha512_final (__global const u32 *in, u32 *mk, const u32 *ks1, const u32 sector) -DECLSPEC void luks_decrypt_sector_serpent_cbc_plain256_mk_ripemd160 (__global const u32 *in, u32 *mk, const u32 *ks1, const u32 sector) -DECLSPEC void luks_decrypt_sector_serpent_cbc_plain256_mk_ripemd160_final (__global const u32 *in, u32 *mk, const u32 *ks1, const u32 sector) +DECLSPEC void serpent128_decrypt_cbc (const u32 *ks1, const u32 *in, u32 *out, u32 *essiv); +DECLSPEC void serpent256_decrypt_cbc (const u32 *ks1, const u32 *in, u32 *out, u32 *essiv); +DECLSPEC void luks_decrypt_sector_serpent_cbc_essiv128 (GLOBAL_AS const u32 *in, u32 *out, const u32 *ks1, const u32 *ks2, const u32 sector); +DECLSPEC void luks_decrypt_sector_serpent_cbc_essiv128_mk_sha1 (GLOBAL_AS const u32 *in, u32 *mk, const u32 *ks1, const u32 *ks2, const u32 sector); +DECLSPEC void luks_decrypt_sector_serpent_cbc_essiv128_mk_sha1_final (GLOBAL_AS const u32 *in, u32 *mk, const u32 *ks1, const u32 *ks2, const u32 sector); +DECLSPEC void luks_decrypt_sector_serpent_cbc_essiv128_mk_sha256 (GLOBAL_AS const u32 *in, u32 *mk, const u32 *ks1, const u32 *ks2, const u32 sector); +DECLSPEC void luks_decrypt_sector_serpent_cbc_essiv128_mk_sha256_final (GLOBAL_AS const u32 *in, u32 *mk, const u32 *ks1, const u32 *ks2, const u32 sector); +DECLSPEC void luks_decrypt_sector_serpent_cbc_essiv128_mk_sha512 (GLOBAL_AS const u32 *in, u32 *mk, const u32 *ks1, const u32 *ks2, const u32 sector); +DECLSPEC void luks_decrypt_sector_serpent_cbc_essiv128_mk_sha512_final (GLOBAL_AS const u32 *in, u32 *mk, const u32 *ks1, const u32 *ks2, const u32 sector); +DECLSPEC void luks_decrypt_sector_serpent_cbc_essiv128_mk_ripemd160 (GLOBAL_AS const u32 *in, u32 *mk, const u32 *ks1, const u32 *ks2, const u32 sector); +DECLSPEC void luks_decrypt_sector_serpent_cbc_essiv128_mk_ripemd160_final (GLOBAL_AS const u32 *in, u32 *mk, const u32 *ks1, const u32 *ks2, const u32 sector); +DECLSPEC void luks_decrypt_sector_serpent_cbc_essiv256 (GLOBAL_AS const u32 *in, u32 *out, const u32 *ks1, const u32 *ks2, const u32 sector); +DECLSPEC void luks_decrypt_sector_serpent_cbc_essiv256_mk_sha1 (GLOBAL_AS const u32 *in, u32 *mk, const u32 *ks1, const u32 *ks2, const u32 sector); +DECLSPEC void luks_decrypt_sector_serpent_cbc_essiv256_mk_sha1_final (GLOBAL_AS const u32 *in, u32 *mk, const u32 *ks1, const u32 *ks2, const u32 sector); +DECLSPEC void luks_decrypt_sector_serpent_cbc_essiv256_mk_sha256 (GLOBAL_AS const u32 *in, u32 *mk, const u32 *ks1, const u32 *ks2, const u32 sector); +DECLSPEC void luks_decrypt_sector_serpent_cbc_essiv256_mk_sha256_final (GLOBAL_AS const u32 *in, u32 *mk, const u32 *ks1, const u32 *ks2, const u32 sector); +DECLSPEC void luks_decrypt_sector_serpent_cbc_essiv256_mk_sha512 (GLOBAL_AS const u32 *in, u32 *mk, const u32 *ks1, const u32 *ks2, const u32 sector); +DECLSPEC void luks_decrypt_sector_serpent_cbc_essiv256_mk_sha512_final (GLOBAL_AS const u32 *in, u32 *mk, const u32 *ks1, const u32 *ks2, const u32 sector); +DECLSPEC void luks_decrypt_sector_serpent_cbc_essiv256_mk_ripemd160 (GLOBAL_AS const u32 *in, u32 *mk, const u32 *ks1, const u32 *ks2, const u32 sector); +DECLSPEC void luks_decrypt_sector_serpent_cbc_essiv256_mk_ripemd160_final (GLOBAL_AS const u32 *in, u32 *mk, const u32 *ks1, const u32 *ks2, const u32 sector); +DECLSPEC void luks_decrypt_sector_serpent_cbc_plain128 (GLOBAL_AS const u32 *in, u32 *out, const u32 *ks1, const u32 sector); +DECLSPEC void luks_decrypt_sector_serpent_cbc_plain128_mk_sha1 (GLOBAL_AS const u32 *in, u32 *mk, const u32 *ks1, const u32 sector); +DECLSPEC void luks_decrypt_sector_serpent_cbc_plain128_mk_sha1_final (GLOBAL_AS const u32 *in, u32 *mk, const u32 *ks1, const u32 sector); +DECLSPEC void luks_decrypt_sector_serpent_cbc_plain128_mk_sha256 (GLOBAL_AS const u32 *in, u32 *mk, const u32 *ks1, const u32 sector); +DECLSPEC void luks_decrypt_sector_serpent_cbc_plain128_mk_sha256_final (GLOBAL_AS const u32 *in, u32 *mk, const u32 *ks1, const u32 sector); +DECLSPEC void luks_decrypt_sector_serpent_cbc_plain128_mk_sha512 (GLOBAL_AS const u32 *in, u32 *mk, const u32 *ks1, const u32 sector); +DECLSPEC void luks_decrypt_sector_serpent_cbc_plain128_mk_sha512_final (GLOBAL_AS const u32 *in, u32 *mk, const u32 *ks1, const u32 sector); +DECLSPEC void luks_decrypt_sector_serpent_cbc_plain128_mk_ripemd160 (GLOBAL_AS const u32 *in, u32 *mk, const u32 *ks1, const u32 sector); +DECLSPEC void luks_decrypt_sector_serpent_cbc_plain128_mk_ripemd160_final (GLOBAL_AS const u32 *in, u32 *mk, const u32 *ks1, const u32 sector); +DECLSPEC void luks_decrypt_sector_serpent_cbc_plain256 (GLOBAL_AS const u32 *in, u32 *out, const u32 *ks1, const u32 sector); +DECLSPEC void luks_decrypt_sector_serpent_cbc_plain256_mk_sha1 (GLOBAL_AS const u32 *in, u32 *mk, const u32 *ks1, const u32 sector); +DECLSPEC void luks_decrypt_sector_serpent_cbc_plain256_mk_sha1_final (GLOBAL_AS const u32 *in, u32 *mk, const u32 *ks1, const u32 sector); +DECLSPEC void luks_decrypt_sector_serpent_cbc_plain256_mk_sha256 (GLOBAL_AS const u32 *in, u32 *mk, const u32 *ks1, const u32 sector); +DECLSPEC void luks_decrypt_sector_serpent_cbc_plain256_mk_sha256_final (GLOBAL_AS const u32 *in, u32 *mk, const u32 *ks1, const u32 sector); +DECLSPEC void luks_decrypt_sector_serpent_cbc_plain256_mk_sha512 (GLOBAL_AS const u32 *in, u32 *mk, const u32 *ks1, const u32 sector); +DECLSPEC void luks_decrypt_sector_serpent_cbc_plain256_mk_sha512_final (GLOBAL_AS const u32 *in, u32 *mk, const u32 *ks1, const u32 sector); +DECLSPEC void luks_decrypt_sector_serpent_cbc_plain256_mk_ripemd160 (GLOBAL_AS const u32 *in, u32 *mk, const u32 *ks1, const u32 sector); +DECLSPEC void luks_decrypt_sector_serpent_cbc_plain256_mk_ripemd160_final (GLOBAL_AS const u32 *in, u32 *mk, const u32 *ks1, const u32 sector); -DECLSPEC void serpent128_decrypt_xts (const u32 *ks1, const u32 *in, u32 *out, u32 *T) -DECLSPEC void serpent256_decrypt_xts (const u32 *ks1, const u32 *in, u32 *out, u32 *T) -DECLSPEC void luks_decrypt_sector_serpent_xts_plain256 (__global const u32 *in, u32 *out, const u32 *ks1, const u32 *ks2, const u32 sector) -DECLSPEC void luks_decrypt_sector_serpent_xts_plain256_mk_sha1 (__global const u32 *in, u32 *mk, const u32 *ks1, const u32 *ks2, const u32 sector) -DECLSPEC void luks_decrypt_sector_serpent_xts_plain256_mk_sha1_final (__global const u32 *in, u32 *mk, const u32 *ks1, const u32 *ks2, const u32 sector) -DECLSPEC void luks_decrypt_sector_serpent_xts_plain256_mk_sha256 (__global const u32 *in, u32 *mk, const u32 *ks1, const u32 *ks2, const u32 sector) -DECLSPEC void luks_decrypt_sector_serpent_xts_plain256_mk_sha256_final (__global const u32 *in, u32 *mk, const u32 *ks1, const u32 *ks2, const u32 sector) -DECLSPEC void luks_decrypt_sector_serpent_xts_plain256_mk_sha512 (__global const u32 *in, u32 *mk, const u32 *ks1, const u32 *ks2, const u32 sector) -DECLSPEC void luks_decrypt_sector_serpent_xts_plain256_mk_sha512_final (__global const u32 *in, u32 *mk, const u32 *ks1, const u32 *ks2, const u32 sector) -DECLSPEC void luks_decrypt_sector_serpent_xts_plain256_mk_ripemd160 (__global const u32 *in, u32 *mk, const u32 *ks1, const u32 *ks2, const u32 sector) -DECLSPEC void luks_decrypt_sector_serpent_xts_plain256_mk_ripemd160_final (__global const u32 *in, u32 *mk, const u32 *ks1, const u32 *ks2, const u32 sector) -DECLSPEC void luks_decrypt_sector_serpent_xts_plain512 (__global const u32 *in, u32 *out, const u32 *ks1, const u32 *ks2, const u32 sector) -DECLSPEC void luks_decrypt_sector_serpent_xts_plain512_mk_sha1 (__global const u32 *in, u32 *mk, const u32 *ks1, const u32 *ks2, const u32 sector) -DECLSPEC void luks_decrypt_sector_serpent_xts_plain512_mk_sha1_final (__global const u32 *in, u32 *mk, const u32 *ks1, const u32 *ks2, const u32 sector) -DECLSPEC void luks_decrypt_sector_serpent_xts_plain512_mk_sha256 (__global const u32 *in, u32 *mk, const u32 *ks1, const u32 *ks2, const u32 sector) -DECLSPEC void luks_decrypt_sector_serpent_xts_plain512_mk_sha256_final (__global const u32 *in, u32 *mk, const u32 *ks1, const u32 *ks2, const u32 sector) -DECLSPEC void luks_decrypt_sector_serpent_xts_plain512_mk_sha512 (__global const u32 *in, u32 *mk, const u32 *ks1, const u32 *ks2, const u32 sector) -DECLSPEC void luks_decrypt_sector_serpent_xts_plain512_mk_sha512_final (__global const u32 *in, u32 *mk, const u32 *ks1, const u32 *ks2, const u32 sector) -DECLSPEC void luks_decrypt_sector_serpent_xts_plain512_mk_ripemd160 (__global const u32 *in, u32 *mk, const u32 *ks1, const u32 *ks2, const u32 sector) -DECLSPEC void luks_decrypt_sector_serpent_xts_plain512_mk_ripemd160_final (__global const u32 *in, u32 *mk, const u32 *ks1, const u32 *ks2, const u32 sector) -DECLSPEC void luks_af_sha1_then_serpent_decrypt (__global const luks_t *luks_bufs, __global luks_tmp_t *tmps, u32 *pt_buf) -DECLSPEC void luks_af_sha256_then_serpent_decrypt (__global const luks_t *luks_bufs, __global luks_tmp_t *tmps, u32 *pt_buf) -DECLSPEC void luks_af_sha512_then_serpent_decrypt (__global const luks_t *luks_bufs, __global luks_tmp_t *tmps, u32 *pt_buf) -DECLSPEC void luks_af_ripemd160_then_serpent_decrypt (__global const luks_t *luks_bufs, __global luks_tmp_t *tmps, u32 *pt_buf) +DECLSPEC void serpent128_decrypt_xts (const u32 *ks1, const u32 *in, u32 *out, u32 *T); +DECLSPEC void serpent256_decrypt_xts (const u32 *ks1, const u32 *in, u32 *out, u32 *T); +DECLSPEC void luks_decrypt_sector_serpent_xts_plain256 (GLOBAL_AS const u32 *in, u32 *out, const u32 *ks1, const u32 *ks2, const u32 sector); +DECLSPEC void luks_decrypt_sector_serpent_xts_plain256_mk_sha1 (GLOBAL_AS const u32 *in, u32 *mk, const u32 *ks1, const u32 *ks2, const u32 sector); +DECLSPEC void luks_decrypt_sector_serpent_xts_plain256_mk_sha1_final (GLOBAL_AS const u32 *in, u32 *mk, const u32 *ks1, const u32 *ks2, const u32 sector); +DECLSPEC void luks_decrypt_sector_serpent_xts_plain256_mk_sha256 (GLOBAL_AS const u32 *in, u32 *mk, const u32 *ks1, const u32 *ks2, const u32 sector); +DECLSPEC void luks_decrypt_sector_serpent_xts_plain256_mk_sha256_final (GLOBAL_AS const u32 *in, u32 *mk, const u32 *ks1, const u32 *ks2, const u32 sector); +DECLSPEC void luks_decrypt_sector_serpent_xts_plain256_mk_sha512 (GLOBAL_AS const u32 *in, u32 *mk, const u32 *ks1, const u32 *ks2, const u32 sector); +DECLSPEC void luks_decrypt_sector_serpent_xts_plain256_mk_sha512_final (GLOBAL_AS const u32 *in, u32 *mk, const u32 *ks1, const u32 *ks2, const u32 sector); +DECLSPEC void luks_decrypt_sector_serpent_xts_plain256_mk_ripemd160 (GLOBAL_AS const u32 *in, u32 *mk, const u32 *ks1, const u32 *ks2, const u32 sector); +DECLSPEC void luks_decrypt_sector_serpent_xts_plain256_mk_ripemd160_final (GLOBAL_AS const u32 *in, u32 *mk, const u32 *ks1, const u32 *ks2, const u32 sector); +DECLSPEC void luks_decrypt_sector_serpent_xts_plain512 (GLOBAL_AS const u32 *in, u32 *out, const u32 *ks1, const u32 *ks2, const u32 sector); +DECLSPEC void luks_decrypt_sector_serpent_xts_plain512_mk_sha1 (GLOBAL_AS const u32 *in, u32 *mk, const u32 *ks1, const u32 *ks2, const u32 sector); +DECLSPEC void luks_decrypt_sector_serpent_xts_plain512_mk_sha1_final (GLOBAL_AS const u32 *in, u32 *mk, const u32 *ks1, const u32 *ks2, const u32 sector); +DECLSPEC void luks_decrypt_sector_serpent_xts_plain512_mk_sha256 (GLOBAL_AS const u32 *in, u32 *mk, const u32 *ks1, const u32 *ks2, const u32 sector); +DECLSPEC void luks_decrypt_sector_serpent_xts_plain512_mk_sha256_final (GLOBAL_AS const u32 *in, u32 *mk, const u32 *ks1, const u32 *ks2, const u32 sector); +DECLSPEC void luks_decrypt_sector_serpent_xts_plain512_mk_sha512 (GLOBAL_AS const u32 *in, u32 *mk, const u32 *ks1, const u32 *ks2, const u32 sector); +DECLSPEC void luks_decrypt_sector_serpent_xts_plain512_mk_sha512_final (GLOBAL_AS const u32 *in, u32 *mk, const u32 *ks1, const u32 *ks2, const u32 sector); +DECLSPEC void luks_decrypt_sector_serpent_xts_plain512_mk_ripemd160 (GLOBAL_AS const u32 *in, u32 *mk, const u32 *ks1, const u32 *ks2, const u32 sector); +DECLSPEC void luks_decrypt_sector_serpent_xts_plain512_mk_ripemd160_final (GLOBAL_AS const u32 *in, u32 *mk, const u32 *ks1, const u32 *ks2, const u32 sector); +DECLSPEC void luks_af_sha1_then_serpent_decrypt (GLOBAL_AS const luks_t *luks_bufs, GLOBAL_AS luks_tmp_t *tmps, u32 *pt_buf); +DECLSPEC void luks_af_sha256_then_serpent_decrypt (GLOBAL_AS const luks_t *luks_bufs, GLOBAL_AS luks_tmp_t *tmps, u32 *pt_buf); +DECLSPEC void luks_af_sha512_then_serpent_decrypt (GLOBAL_AS const luks_t *luks_bufs, GLOBAL_AS luks_tmp_t *tmps, u32 *pt_buf); +DECLSPEC void luks_af_ripemd160_then_serpent_decrypt (GLOBAL_AS const luks_t *luks_bufs, GLOBAL_AS luks_tmp_t *tmps, u32 *pt_buf); diff --git a/OpenCL/inc_luks_twofish.cl b/OpenCL/inc_luks_twofish.cl index e8349c87e..e71730caa 100644 --- a/OpenCL/inc_luks_twofish.cl +++ b/OpenCL/inc_luks_twofish.cl @@ -31,7 +31,7 @@ DECLSPEC void twofish256_decrypt_cbc (const u32 *sk1, const u32 *lk1, const u32 essiv[3] = in[3]; } -DECLSPEC void luks_decrypt_sector_twofish_cbc_essiv128 (__global const u32 *in, u32 *out, const u32 *sk1, const u32 *lk1, const u32 *sk2, const u32 *lk2, const u32 sector) +DECLSPEC void luks_decrypt_sector_twofish_cbc_essiv128 (GLOBAL_AS const u32 *in, u32 *out, const u32 *sk1, const u32 *lk1, const u32 *sk2, const u32 *lk2, const u32 sector) { u32 S[4] = { sector, 0, 0, 0 }; @@ -65,7 +65,7 @@ DECLSPEC void luks_decrypt_sector_twofish_cbc_essiv128 (__global const u32 *in, } } -DECLSPEC void luks_decrypt_sector_twofish_cbc_essiv128_mk_sha1 (__global const u32 *in, u32 *mk, const u32 *sk1, const u32 *lk1, const u32 *sk2, const u32 *lk2, const u32 sector) +DECLSPEC void luks_decrypt_sector_twofish_cbc_essiv128_mk_sha1 (GLOBAL_AS const u32 *in, u32 *mk, const u32 *sk1, const u32 *lk1, const u32 *sk2, const u32 *lk2, const u32 sector) { u32 S[4] = { sector, 0, 0, 0 }; @@ -102,7 +102,7 @@ DECLSPEC void luks_decrypt_sector_twofish_cbc_essiv128_mk_sha1 (__global const u } } -DECLSPEC void luks_decrypt_sector_twofish_cbc_essiv128_mk_sha1_final (__global const u32 *in, u32 *mk, const u32 *sk1, const u32 *lk1, const u32 *sk2, const u32 *lk2, const u32 sector) +DECLSPEC void luks_decrypt_sector_twofish_cbc_essiv128_mk_sha1_final (GLOBAL_AS const u32 *in, u32 *mk, const u32 *sk1, const u32 *lk1, const u32 *sk2, const u32 *lk2, const u32 sector) { u32 S[4] = { sector, 0, 0, 0 }; @@ -162,7 +162,7 @@ DECLSPEC void luks_decrypt_sector_twofish_cbc_essiv128_mk_sha1_final (__global c } } -DECLSPEC void luks_decrypt_sector_twofish_cbc_essiv128_mk_sha256 (__global const u32 *in, u32 *mk, const u32 *sk1, const u32 *lk1, const u32 *sk2, const u32 *lk2, const u32 sector) +DECLSPEC void luks_decrypt_sector_twofish_cbc_essiv128_mk_sha256 (GLOBAL_AS const u32 *in, u32 *mk, const u32 *sk1, const u32 *lk1, const u32 *sk2, const u32 *lk2, const u32 sector) { u32 S[4] = { sector, 0, 0, 0 }; @@ -199,7 +199,7 @@ DECLSPEC void luks_decrypt_sector_twofish_cbc_essiv128_mk_sha256 (__global const } } -DECLSPEC void luks_decrypt_sector_twofish_cbc_essiv128_mk_sha256_final (__global const u32 *in, u32 *mk, const u32 *sk1, const u32 *lk1, const u32 *sk2, const u32 *lk2, const u32 sector) +DECLSPEC void luks_decrypt_sector_twofish_cbc_essiv128_mk_sha256_final (GLOBAL_AS const u32 *in, u32 *mk, const u32 *sk1, const u32 *lk1, const u32 *sk2, const u32 *lk2, const u32 sector) { u32 S[4] = { sector, 0, 0, 0 }; @@ -259,7 +259,7 @@ DECLSPEC void luks_decrypt_sector_twofish_cbc_essiv128_mk_sha256_final (__global } } -DECLSPEC void luks_decrypt_sector_twofish_cbc_essiv128_mk_sha512 (__global const u32 *in, u32 *mk, const u32 *sk1, const u32 *lk1, const u32 *sk2, const u32 *lk2, const u32 sector) +DECLSPEC void luks_decrypt_sector_twofish_cbc_essiv128_mk_sha512 (GLOBAL_AS const u32 *in, u32 *mk, const u32 *sk1, const u32 *lk1, const u32 *sk2, const u32 *lk2, const u32 sector) { u32 S[4] = { sector, 0, 0, 0 }; @@ -296,7 +296,7 @@ DECLSPEC void luks_decrypt_sector_twofish_cbc_essiv128_mk_sha512 (__global const } } -DECLSPEC void luks_decrypt_sector_twofish_cbc_essiv128_mk_sha512_final (__global const u32 *in, u32 *mk, const u32 *sk1, const u32 *lk1, const u32 *sk2, const u32 *lk2, const u32 sector) +DECLSPEC void luks_decrypt_sector_twofish_cbc_essiv128_mk_sha512_final (GLOBAL_AS const u32 *in, u32 *mk, const u32 *sk1, const u32 *lk1, const u32 *sk2, const u32 *lk2, const u32 sector) { u32 S[4] = { sector, 0, 0, 0 }; @@ -356,7 +356,7 @@ DECLSPEC void luks_decrypt_sector_twofish_cbc_essiv128_mk_sha512_final (__global } } -DECLSPEC void luks_decrypt_sector_twofish_cbc_essiv128_mk_ripemd160 (__global const u32 *in, u32 *mk, const u32 *sk1, const u32 *lk1, const u32 *sk2, const u32 *lk2, const u32 sector) +DECLSPEC void luks_decrypt_sector_twofish_cbc_essiv128_mk_ripemd160 (GLOBAL_AS const u32 *in, u32 *mk, const u32 *sk1, const u32 *lk1, const u32 *sk2, const u32 *lk2, const u32 sector) { u32 S[4] = { sector, 0, 0, 0 }; @@ -393,7 +393,7 @@ DECLSPEC void luks_decrypt_sector_twofish_cbc_essiv128_mk_ripemd160 (__global co } } -DECLSPEC void luks_decrypt_sector_twofish_cbc_essiv128_mk_ripemd160_final (__global const u32 *in, u32 *mk, const u32 *sk1, const u32 *lk1, const u32 *sk2, const u32 *lk2, const u32 sector) +DECLSPEC void luks_decrypt_sector_twofish_cbc_essiv128_mk_ripemd160_final (GLOBAL_AS const u32 *in, u32 *mk, const u32 *sk1, const u32 *lk1, const u32 *sk2, const u32 *lk2, const u32 sector) { u32 S[4] = { sector, 0, 0, 0 }; @@ -453,7 +453,7 @@ DECLSPEC void luks_decrypt_sector_twofish_cbc_essiv128_mk_ripemd160_final (__glo } } -DECLSPEC void luks_decrypt_sector_twofish_cbc_essiv256 (__global const u32 *in, u32 *out, const u32 *sk1, const u32 *lk1, const u32 *sk2, const u32 *lk2, const u32 sector) +DECLSPEC void luks_decrypt_sector_twofish_cbc_essiv256 (GLOBAL_AS const u32 *in, u32 *out, const u32 *sk1, const u32 *lk1, const u32 *sk2, const u32 *lk2, const u32 sector) { u32 S[4] = { sector, 0, 0, 0 }; @@ -487,7 +487,7 @@ DECLSPEC void luks_decrypt_sector_twofish_cbc_essiv256 (__global const u32 *in, } } -DECLSPEC void luks_decrypt_sector_twofish_cbc_essiv256_mk_sha1 (__global const u32 *in, u32 *mk, const u32 *sk1, const u32 *lk1, const u32 *sk2, const u32 *lk2, const u32 sector) +DECLSPEC void luks_decrypt_sector_twofish_cbc_essiv256_mk_sha1 (GLOBAL_AS const u32 *in, u32 *mk, const u32 *sk1, const u32 *lk1, const u32 *sk2, const u32 *lk2, const u32 sector) { u32 S[4] = { sector, 0, 0, 0 }; @@ -524,7 +524,7 @@ DECLSPEC void luks_decrypt_sector_twofish_cbc_essiv256_mk_sha1 (__global const u } } -DECLSPEC void luks_decrypt_sector_twofish_cbc_essiv256_mk_sha1_final (__global const u32 *in, u32 *mk, const u32 *sk1, const u32 *lk1, const u32 *sk2, const u32 *lk2, const u32 sector) +DECLSPEC void luks_decrypt_sector_twofish_cbc_essiv256_mk_sha1_final (GLOBAL_AS const u32 *in, u32 *mk, const u32 *sk1, const u32 *lk1, const u32 *sk2, const u32 *lk2, const u32 sector) { u32 S[4] = { sector, 0, 0, 0 }; @@ -584,7 +584,7 @@ DECLSPEC void luks_decrypt_sector_twofish_cbc_essiv256_mk_sha1_final (__global c } } -DECLSPEC void luks_decrypt_sector_twofish_cbc_essiv256_mk_sha256 (__global const u32 *in, u32 *mk, const u32 *sk1, const u32 *lk1, const u32 *sk2, const u32 *lk2, const u32 sector) +DECLSPEC void luks_decrypt_sector_twofish_cbc_essiv256_mk_sha256 (GLOBAL_AS const u32 *in, u32 *mk, const u32 *sk1, const u32 *lk1, const u32 *sk2, const u32 *lk2, const u32 sector) { u32 S[4] = { sector, 0, 0, 0 }; @@ -621,7 +621,7 @@ DECLSPEC void luks_decrypt_sector_twofish_cbc_essiv256_mk_sha256 (__global const } } -DECLSPEC void luks_decrypt_sector_twofish_cbc_essiv256_mk_sha256_final (__global const u32 *in, u32 *mk, const u32 *sk1, const u32 *lk1, const u32 *sk2, const u32 *lk2, const u32 sector) +DECLSPEC void luks_decrypt_sector_twofish_cbc_essiv256_mk_sha256_final (GLOBAL_AS const u32 *in, u32 *mk, const u32 *sk1, const u32 *lk1, const u32 *sk2, const u32 *lk2, const u32 sector) { u32 S[4] = { sector, 0, 0, 0 }; @@ -681,7 +681,7 @@ DECLSPEC void luks_decrypt_sector_twofish_cbc_essiv256_mk_sha256_final (__global } } -DECLSPEC void luks_decrypt_sector_twofish_cbc_essiv256_mk_sha512 (__global const u32 *in, u32 *mk, const u32 *sk1, const u32 *lk1, const u32 *sk2, const u32 *lk2, const u32 sector) +DECLSPEC void luks_decrypt_sector_twofish_cbc_essiv256_mk_sha512 (GLOBAL_AS const u32 *in, u32 *mk, const u32 *sk1, const u32 *lk1, const u32 *sk2, const u32 *lk2, const u32 sector) { u32 S[4] = { sector, 0, 0, 0 }; @@ -718,7 +718,7 @@ DECLSPEC void luks_decrypt_sector_twofish_cbc_essiv256_mk_sha512 (__global const } } -DECLSPEC void luks_decrypt_sector_twofish_cbc_essiv256_mk_sha512_final (__global const u32 *in, u32 *mk, const u32 *sk1, const u32 *lk1, const u32 *sk2, const u32 *lk2, const u32 sector) +DECLSPEC void luks_decrypt_sector_twofish_cbc_essiv256_mk_sha512_final (GLOBAL_AS const u32 *in, u32 *mk, const u32 *sk1, const u32 *lk1, const u32 *sk2, const u32 *lk2, const u32 sector) { u32 S[4] = { sector, 0, 0, 0 }; @@ -778,7 +778,7 @@ DECLSPEC void luks_decrypt_sector_twofish_cbc_essiv256_mk_sha512_final (__global } } -DECLSPEC void luks_decrypt_sector_twofish_cbc_essiv256_mk_ripemd160 (__global const u32 *in, u32 *mk, const u32 *sk1, const u32 *lk1, const u32 *sk2, const u32 *lk2, const u32 sector) +DECLSPEC void luks_decrypt_sector_twofish_cbc_essiv256_mk_ripemd160 (GLOBAL_AS const u32 *in, u32 *mk, const u32 *sk1, const u32 *lk1, const u32 *sk2, const u32 *lk2, const u32 sector) { u32 S[4] = { sector, 0, 0, 0 }; @@ -815,7 +815,7 @@ DECLSPEC void luks_decrypt_sector_twofish_cbc_essiv256_mk_ripemd160 (__global co } } -DECLSPEC void luks_decrypt_sector_twofish_cbc_essiv256_mk_ripemd160_final (__global const u32 *in, u32 *mk, const u32 *sk1, const u32 *lk1, const u32 *sk2, const u32 *lk2, const u32 sector) +DECLSPEC void luks_decrypt_sector_twofish_cbc_essiv256_mk_ripemd160_final (GLOBAL_AS const u32 *in, u32 *mk, const u32 *sk1, const u32 *lk1, const u32 *sk2, const u32 *lk2, const u32 sector) { u32 S[4] = { sector, 0, 0, 0 }; @@ -877,7 +877,7 @@ DECLSPEC void luks_decrypt_sector_twofish_cbc_essiv256_mk_ripemd160_final (__glo // cbc-plain -DECLSPEC void luks_decrypt_sector_twofish_cbc_plain128 (__global const u32 *in, u32 *out, const u32 *sk1, const u32 *lk1, const u32 sector) +DECLSPEC void luks_decrypt_sector_twofish_cbc_plain128 (GLOBAL_AS const u32 *in, u32 *out, const u32 *sk1, const u32 *lk1, const u32 sector) { u32 S[4] = { sector, 0, 0, 0 }; @@ -907,7 +907,7 @@ DECLSPEC void luks_decrypt_sector_twofish_cbc_plain128 (__global const u32 *in, } } -DECLSPEC void luks_decrypt_sector_twofish_cbc_plain128_mk_sha1 (__global const u32 *in, u32 *mk, const u32 *sk1, const u32 *lk1, const u32 sector) +DECLSPEC void luks_decrypt_sector_twofish_cbc_plain128_mk_sha1 (GLOBAL_AS const u32 *in, u32 *mk, const u32 *sk1, const u32 *lk1, const u32 sector) { u32 S[4] = { sector, 0, 0, 0 }; @@ -940,7 +940,7 @@ DECLSPEC void luks_decrypt_sector_twofish_cbc_plain128_mk_sha1 (__global const u } } -DECLSPEC void luks_decrypt_sector_twofish_cbc_plain128_mk_sha1_final (__global const u32 *in, u32 *mk, const u32 *sk1, const u32 *lk1, const u32 sector) +DECLSPEC void luks_decrypt_sector_twofish_cbc_plain128_mk_sha1_final (GLOBAL_AS const u32 *in, u32 *mk, const u32 *sk1, const u32 *lk1, const u32 sector) { u32 S[4] = { sector, 0, 0, 0 }; @@ -996,7 +996,7 @@ DECLSPEC void luks_decrypt_sector_twofish_cbc_plain128_mk_sha1_final (__global c } } -DECLSPEC void luks_decrypt_sector_twofish_cbc_plain128_mk_sha256 (__global const u32 *in, u32 *mk, const u32 *sk1, const u32 *lk1, const u32 sector) +DECLSPEC void luks_decrypt_sector_twofish_cbc_plain128_mk_sha256 (GLOBAL_AS const u32 *in, u32 *mk, const u32 *sk1, const u32 *lk1, const u32 sector) { u32 S[4] = { sector, 0, 0, 0 }; @@ -1029,7 +1029,7 @@ DECLSPEC void luks_decrypt_sector_twofish_cbc_plain128_mk_sha256 (__global const } } -DECLSPEC void luks_decrypt_sector_twofish_cbc_plain128_mk_sha256_final (__global const u32 *in, u32 *mk, const u32 *sk1, const u32 *lk1, const u32 sector) +DECLSPEC void luks_decrypt_sector_twofish_cbc_plain128_mk_sha256_final (GLOBAL_AS const u32 *in, u32 *mk, const u32 *sk1, const u32 *lk1, const u32 sector) { u32 S[4] = { sector, 0, 0, 0 }; @@ -1085,7 +1085,7 @@ DECLSPEC void luks_decrypt_sector_twofish_cbc_plain128_mk_sha256_final (__global } } -DECLSPEC void luks_decrypt_sector_twofish_cbc_plain128_mk_sha512 (__global const u32 *in, u32 *mk, const u32 *sk1, const u32 *lk1, const u32 sector) +DECLSPEC void luks_decrypt_sector_twofish_cbc_plain128_mk_sha512 (GLOBAL_AS const u32 *in, u32 *mk, const u32 *sk1, const u32 *lk1, const u32 sector) { u32 S[4] = { sector, 0, 0, 0 }; @@ -1118,7 +1118,7 @@ DECLSPEC void luks_decrypt_sector_twofish_cbc_plain128_mk_sha512 (__global const } } -DECLSPEC void luks_decrypt_sector_twofish_cbc_plain128_mk_sha512_final (__global const u32 *in, u32 *mk, const u32 *sk1, const u32 *lk1, const u32 sector) +DECLSPEC void luks_decrypt_sector_twofish_cbc_plain128_mk_sha512_final (GLOBAL_AS const u32 *in, u32 *mk, const u32 *sk1, const u32 *lk1, const u32 sector) { u32 S[4] = { sector, 0, 0, 0 }; @@ -1174,7 +1174,7 @@ DECLSPEC void luks_decrypt_sector_twofish_cbc_plain128_mk_sha512_final (__global } } -DECLSPEC void luks_decrypt_sector_twofish_cbc_plain128_mk_ripemd160 (__global const u32 *in, u32 *mk, const u32 *sk1, const u32 *lk1, const u32 sector) +DECLSPEC void luks_decrypt_sector_twofish_cbc_plain128_mk_ripemd160 (GLOBAL_AS const u32 *in, u32 *mk, const u32 *sk1, const u32 *lk1, const u32 sector) { u32 S[4] = { sector, 0, 0, 0 }; @@ -1207,7 +1207,7 @@ DECLSPEC void luks_decrypt_sector_twofish_cbc_plain128_mk_ripemd160 (__global co } } -DECLSPEC void luks_decrypt_sector_twofish_cbc_plain128_mk_ripemd160_final (__global const u32 *in, u32 *mk, const u32 *sk1, const u32 *lk1, const u32 sector) +DECLSPEC void luks_decrypt_sector_twofish_cbc_plain128_mk_ripemd160_final (GLOBAL_AS const u32 *in, u32 *mk, const u32 *sk1, const u32 *lk1, const u32 sector) { u32 S[4] = { sector, 0, 0, 0 }; @@ -1263,7 +1263,7 @@ DECLSPEC void luks_decrypt_sector_twofish_cbc_plain128_mk_ripemd160_final (__glo } } -DECLSPEC void luks_decrypt_sector_twofish_cbc_plain256 (__global const u32 *in, u32 *out, const u32 *sk1, const u32 *lk1, const u32 sector) +DECLSPEC void luks_decrypt_sector_twofish_cbc_plain256 (GLOBAL_AS const u32 *in, u32 *out, const u32 *sk1, const u32 *lk1, const u32 sector) { u32 S[4] = { sector, 0, 0, 0 }; @@ -1293,7 +1293,7 @@ DECLSPEC void luks_decrypt_sector_twofish_cbc_plain256 (__global const u32 *in, } } -DECLSPEC void luks_decrypt_sector_twofish_cbc_plain256_mk_sha1 (__global const u32 *in, u32 *mk, const u32 *sk1, const u32 *lk1, const u32 sector) +DECLSPEC void luks_decrypt_sector_twofish_cbc_plain256_mk_sha1 (GLOBAL_AS const u32 *in, u32 *mk, const u32 *sk1, const u32 *lk1, const u32 sector) { u32 S[4] = { sector, 0, 0, 0 }; @@ -1326,7 +1326,7 @@ DECLSPEC void luks_decrypt_sector_twofish_cbc_plain256_mk_sha1 (__global const u } } -DECLSPEC void luks_decrypt_sector_twofish_cbc_plain256_mk_sha1_final (__global const u32 *in, u32 *mk, const u32 *sk1, const u32 *lk1, const u32 sector) +DECLSPEC void luks_decrypt_sector_twofish_cbc_plain256_mk_sha1_final (GLOBAL_AS const u32 *in, u32 *mk, const u32 *sk1, const u32 *lk1, const u32 sector) { u32 S[4] = { sector, 0, 0, 0 }; @@ -1382,7 +1382,7 @@ DECLSPEC void luks_decrypt_sector_twofish_cbc_plain256_mk_sha1_final (__global c } } -DECLSPEC void luks_decrypt_sector_twofish_cbc_plain256_mk_sha256 (__global const u32 *in, u32 *mk, const u32 *sk1, const u32 *lk1, const u32 sector) +DECLSPEC void luks_decrypt_sector_twofish_cbc_plain256_mk_sha256 (GLOBAL_AS const u32 *in, u32 *mk, const u32 *sk1, const u32 *lk1, const u32 sector) { u32 S[4] = { sector, 0, 0, 0 }; @@ -1415,7 +1415,7 @@ DECLSPEC void luks_decrypt_sector_twofish_cbc_plain256_mk_sha256 (__global const } } -DECLSPEC void luks_decrypt_sector_twofish_cbc_plain256_mk_sha256_final (__global const u32 *in, u32 *mk, const u32 *sk1, const u32 *lk1, const u32 sector) +DECLSPEC void luks_decrypt_sector_twofish_cbc_plain256_mk_sha256_final (GLOBAL_AS const u32 *in, u32 *mk, const u32 *sk1, const u32 *lk1, const u32 sector) { u32 S[4] = { sector, 0, 0, 0 }; @@ -1471,7 +1471,7 @@ DECLSPEC void luks_decrypt_sector_twofish_cbc_plain256_mk_sha256_final (__global } } -DECLSPEC void luks_decrypt_sector_twofish_cbc_plain256_mk_sha512 (__global const u32 *in, u32 *mk, const u32 *sk1, const u32 *lk1, const u32 sector) +DECLSPEC void luks_decrypt_sector_twofish_cbc_plain256_mk_sha512 (GLOBAL_AS const u32 *in, u32 *mk, const u32 *sk1, const u32 *lk1, const u32 sector) { u32 S[4] = { sector, 0, 0, 0 }; @@ -1504,7 +1504,7 @@ DECLSPEC void luks_decrypt_sector_twofish_cbc_plain256_mk_sha512 (__global const } } -DECLSPEC void luks_decrypt_sector_twofish_cbc_plain256_mk_sha512_final (__global const u32 *in, u32 *mk, const u32 *sk1, const u32 *lk1, const u32 sector) +DECLSPEC void luks_decrypt_sector_twofish_cbc_plain256_mk_sha512_final (GLOBAL_AS const u32 *in, u32 *mk, const u32 *sk1, const u32 *lk1, const u32 sector) { u32 S[4] = { sector, 0, 0, 0 }; @@ -1560,7 +1560,7 @@ DECLSPEC void luks_decrypt_sector_twofish_cbc_plain256_mk_sha512_final (__global } } -DECLSPEC void luks_decrypt_sector_twofish_cbc_plain256_mk_ripemd160 (__global const u32 *in, u32 *mk, const u32 *sk1, const u32 *lk1, const u32 sector) +DECLSPEC void luks_decrypt_sector_twofish_cbc_plain256_mk_ripemd160 (GLOBAL_AS const u32 *in, u32 *mk, const u32 *sk1, const u32 *lk1, const u32 sector) { u32 S[4] = { sector, 0, 0, 0 }; @@ -1593,7 +1593,7 @@ DECLSPEC void luks_decrypt_sector_twofish_cbc_plain256_mk_ripemd160 (__global co } } -DECLSPEC void luks_decrypt_sector_twofish_cbc_plain256_mk_ripemd160_final (__global const u32 *in, u32 *mk, const u32 *sk1, const u32 *lk1, const u32 sector) +DECLSPEC void luks_decrypt_sector_twofish_cbc_plain256_mk_ripemd160_final (GLOBAL_AS const u32 *in, u32 *mk, const u32 *sk1, const u32 *lk1, const u32 sector) { u32 S[4] = { sector, 0, 0, 0 }; @@ -1695,7 +1695,7 @@ DECLSPEC void twofish256_decrypt_xts (const u32 *sk1, const u32 *lk1, const u32 xts_mul2 (T, T); } -DECLSPEC void luks_decrypt_sector_twofish_xts_plain256 (__global const u32 *in, u32 *out, const u32 *sk1, const u32 *lk1, const u32 *sk2, const u32 *lk2, const u32 sector) +DECLSPEC void luks_decrypt_sector_twofish_xts_plain256 (GLOBAL_AS const u32 *in, u32 *out, const u32 *sk1, const u32 *lk1, const u32 *sk2, const u32 *lk2, const u32 sector) { u32 S[4] = { sector, 0, 0, 0 }; @@ -1729,7 +1729,7 @@ DECLSPEC void luks_decrypt_sector_twofish_xts_plain256 (__global const u32 *in, } } -DECLSPEC void luks_decrypt_sector_twofish_xts_plain256_mk_sha1 (__global const u32 *in, u32 *mk, const u32 *sk1, const u32 *lk1, const u32 *sk2, const u32 *lk2, const u32 sector) +DECLSPEC void luks_decrypt_sector_twofish_xts_plain256_mk_sha1 (GLOBAL_AS const u32 *in, u32 *mk, const u32 *sk1, const u32 *lk1, const u32 *sk2, const u32 *lk2, const u32 sector) { u32 S[4] = { sector, 0, 0, 0 }; @@ -1766,7 +1766,7 @@ DECLSPEC void luks_decrypt_sector_twofish_xts_plain256_mk_sha1 (__global const u } } -DECLSPEC void luks_decrypt_sector_twofish_xts_plain256_mk_sha1_final (__global const u32 *in, u32 *mk, const u32 *sk1, const u32 *lk1, const u32 *sk2, const u32 *lk2, const u32 sector) +DECLSPEC void luks_decrypt_sector_twofish_xts_plain256_mk_sha1_final (GLOBAL_AS const u32 *in, u32 *mk, const u32 *sk1, const u32 *lk1, const u32 *sk2, const u32 *lk2, const u32 sector) { u32 S[4] = { sector, 0, 0, 0 }; @@ -1826,7 +1826,7 @@ DECLSPEC void luks_decrypt_sector_twofish_xts_plain256_mk_sha1_final (__global c } } -DECLSPEC void luks_decrypt_sector_twofish_xts_plain256_mk_sha256 (__global const u32 *in, u32 *mk, const u32 *sk1, const u32 *lk1, const u32 *sk2, const u32 *lk2, const u32 sector) +DECLSPEC void luks_decrypt_sector_twofish_xts_plain256_mk_sha256 (GLOBAL_AS const u32 *in, u32 *mk, const u32 *sk1, const u32 *lk1, const u32 *sk2, const u32 *lk2, const u32 sector) { u32 S[4] = { sector, 0, 0, 0 }; @@ -1863,7 +1863,7 @@ DECLSPEC void luks_decrypt_sector_twofish_xts_plain256_mk_sha256 (__global const } } -DECLSPEC void luks_decrypt_sector_twofish_xts_plain256_mk_sha256_final (__global const u32 *in, u32 *mk, const u32 *sk1, const u32 *lk1, const u32 *sk2, const u32 *lk2, const u32 sector) +DECLSPEC void luks_decrypt_sector_twofish_xts_plain256_mk_sha256_final (GLOBAL_AS const u32 *in, u32 *mk, const u32 *sk1, const u32 *lk1, const u32 *sk2, const u32 *lk2, const u32 sector) { u32 S[4] = { sector, 0, 0, 0 }; @@ -1923,7 +1923,7 @@ DECLSPEC void luks_decrypt_sector_twofish_xts_plain256_mk_sha256_final (__global } } -DECLSPEC void luks_decrypt_sector_twofish_xts_plain256_mk_sha512 (__global const u32 *in, u32 *mk, const u32 *sk1, const u32 *lk1, const u32 *sk2, const u32 *lk2, const u32 sector) +DECLSPEC void luks_decrypt_sector_twofish_xts_plain256_mk_sha512 (GLOBAL_AS const u32 *in, u32 *mk, const u32 *sk1, const u32 *lk1, const u32 *sk2, const u32 *lk2, const u32 sector) { u32 S[4] = { sector, 0, 0, 0 }; @@ -1960,7 +1960,7 @@ DECLSPEC void luks_decrypt_sector_twofish_xts_plain256_mk_sha512 (__global const } } -DECLSPEC void luks_decrypt_sector_twofish_xts_plain256_mk_sha512_final (__global const u32 *in, u32 *mk, const u32 *sk1, const u32 *lk1, const u32 *sk2, const u32 *lk2, const u32 sector) +DECLSPEC void luks_decrypt_sector_twofish_xts_plain256_mk_sha512_final (GLOBAL_AS const u32 *in, u32 *mk, const u32 *sk1, const u32 *lk1, const u32 *sk2, const u32 *lk2, const u32 sector) { u32 S[4] = { sector, 0, 0, 0 }; @@ -2020,7 +2020,7 @@ DECLSPEC void luks_decrypt_sector_twofish_xts_plain256_mk_sha512_final (__global } } -DECLSPEC void luks_decrypt_sector_twofish_xts_plain256_mk_ripemd160 (__global const u32 *in, u32 *mk, const u32 *sk1, const u32 *lk1, const u32 *sk2, const u32 *lk2, const u32 sector) +DECLSPEC void luks_decrypt_sector_twofish_xts_plain256_mk_ripemd160 (GLOBAL_AS const u32 *in, u32 *mk, const u32 *sk1, const u32 *lk1, const u32 *sk2, const u32 *lk2, const u32 sector) { u32 S[4] = { sector, 0, 0, 0 }; @@ -2057,7 +2057,7 @@ DECLSPEC void luks_decrypt_sector_twofish_xts_plain256_mk_ripemd160 (__global co } } -DECLSPEC void luks_decrypt_sector_twofish_xts_plain256_mk_ripemd160_final (__global const u32 *in, u32 *mk, const u32 *sk1, const u32 *lk1, const u32 *sk2, const u32 *lk2, const u32 sector) +DECLSPEC void luks_decrypt_sector_twofish_xts_plain256_mk_ripemd160_final (GLOBAL_AS const u32 *in, u32 *mk, const u32 *sk1, const u32 *lk1, const u32 *sk2, const u32 *lk2, const u32 sector) { u32 S[4] = { sector, 0, 0, 0 }; @@ -2117,7 +2117,7 @@ DECLSPEC void luks_decrypt_sector_twofish_xts_plain256_mk_ripemd160_final (__glo } } -DECLSPEC void luks_decrypt_sector_twofish_xts_plain512 (__global const u32 *in, u32 *out, const u32 *sk1, const u32 *lk1, const u32 *sk2, const u32 *lk2, const u32 sector) +DECLSPEC void luks_decrypt_sector_twofish_xts_plain512 (GLOBAL_AS const u32 *in, u32 *out, const u32 *sk1, const u32 *lk1, const u32 *sk2, const u32 *lk2, const u32 sector) { u32 S[4] = { sector, 0, 0, 0 }; @@ -2151,7 +2151,7 @@ DECLSPEC void luks_decrypt_sector_twofish_xts_plain512 (__global const u32 *in, } } -DECLSPEC void luks_decrypt_sector_twofish_xts_plain512_mk_sha1 (__global const u32 *in, u32 *mk, const u32 *sk1, const u32 *lk1, const u32 *sk2, const u32 *lk2, const u32 sector) +DECLSPEC void luks_decrypt_sector_twofish_xts_plain512_mk_sha1 (GLOBAL_AS const u32 *in, u32 *mk, const u32 *sk1, const u32 *lk1, const u32 *sk2, const u32 *lk2, const u32 sector) { u32 S[4] = { sector, 0, 0, 0 }; @@ -2188,7 +2188,7 @@ DECLSPEC void luks_decrypt_sector_twofish_xts_plain512_mk_sha1 (__global const u } } -DECLSPEC void luks_decrypt_sector_twofish_xts_plain512_mk_sha1_final (__global const u32 *in, u32 *mk, const u32 *sk1, const u32 *lk1, const u32 *sk2, const u32 *lk2, const u32 sector) +DECLSPEC void luks_decrypt_sector_twofish_xts_plain512_mk_sha1_final (GLOBAL_AS const u32 *in, u32 *mk, const u32 *sk1, const u32 *lk1, const u32 *sk2, const u32 *lk2, const u32 sector) { u32 S[4] = { sector, 0, 0, 0 }; @@ -2248,7 +2248,7 @@ DECLSPEC void luks_decrypt_sector_twofish_xts_plain512_mk_sha1_final (__global c } } -DECLSPEC void luks_decrypt_sector_twofish_xts_plain512_mk_sha256 (__global const u32 *in, u32 *mk, const u32 *sk1, const u32 *lk1, const u32 *sk2, const u32 *lk2, const u32 sector) +DECLSPEC void luks_decrypt_sector_twofish_xts_plain512_mk_sha256 (GLOBAL_AS const u32 *in, u32 *mk, const u32 *sk1, const u32 *lk1, const u32 *sk2, const u32 *lk2, const u32 sector) { u32 S[4] = { sector, 0, 0, 0 }; @@ -2285,7 +2285,7 @@ DECLSPEC void luks_decrypt_sector_twofish_xts_plain512_mk_sha256 (__global const } } -DECLSPEC void luks_decrypt_sector_twofish_xts_plain512_mk_sha256_final (__global const u32 *in, u32 *mk, const u32 *sk1, const u32 *lk1, const u32 *sk2, const u32 *lk2, const u32 sector) +DECLSPEC void luks_decrypt_sector_twofish_xts_plain512_mk_sha256_final (GLOBAL_AS const u32 *in, u32 *mk, const u32 *sk1, const u32 *lk1, const u32 *sk2, const u32 *lk2, const u32 sector) { u32 S[4] = { sector, 0, 0, 0 }; @@ -2345,7 +2345,7 @@ DECLSPEC void luks_decrypt_sector_twofish_xts_plain512_mk_sha256_final (__global } } -DECLSPEC void luks_decrypt_sector_twofish_xts_plain512_mk_sha512 (__global const u32 *in, u32 *mk, const u32 *sk1, const u32 *lk1, const u32 *sk2, const u32 *lk2, const u32 sector) +DECLSPEC void luks_decrypt_sector_twofish_xts_plain512_mk_sha512 (GLOBAL_AS const u32 *in, u32 *mk, const u32 *sk1, const u32 *lk1, const u32 *sk2, const u32 *lk2, const u32 sector) { u32 S[4] = { sector, 0, 0, 0 }; @@ -2382,7 +2382,7 @@ DECLSPEC void luks_decrypt_sector_twofish_xts_plain512_mk_sha512 (__global const } } -DECLSPEC void luks_decrypt_sector_twofish_xts_plain512_mk_sha512_final (__global const u32 *in, u32 *mk, const u32 *sk1, const u32 *lk1, const u32 *sk2, const u32 *lk2, const u32 sector) +DECLSPEC void luks_decrypt_sector_twofish_xts_plain512_mk_sha512_final (GLOBAL_AS const u32 *in, u32 *mk, const u32 *sk1, const u32 *lk1, const u32 *sk2, const u32 *lk2, const u32 sector) { u32 S[4] = { sector, 0, 0, 0 }; @@ -2442,7 +2442,7 @@ DECLSPEC void luks_decrypt_sector_twofish_xts_plain512_mk_sha512_final (__global } } -DECLSPEC void luks_decrypt_sector_twofish_xts_plain512_mk_ripemd160 (__global const u32 *in, u32 *mk, const u32 *sk1, const u32 *lk1, const u32 *sk2, const u32 *lk2, const u32 sector) +DECLSPEC void luks_decrypt_sector_twofish_xts_plain512_mk_ripemd160 (GLOBAL_AS const u32 *in, u32 *mk, const u32 *sk1, const u32 *lk1, const u32 *sk2, const u32 *lk2, const u32 sector) { u32 S[4] = { sector, 0, 0, 0 }; @@ -2479,7 +2479,7 @@ DECLSPEC void luks_decrypt_sector_twofish_xts_plain512_mk_ripemd160 (__global co } } -DECLSPEC void luks_decrypt_sector_twofish_xts_plain512_mk_ripemd160_final (__global const u32 *in, u32 *mk, const u32 *sk1, const u32 *lk1, const u32 *sk2, const u32 *lk2, const u32 sector) +DECLSPEC void luks_decrypt_sector_twofish_xts_plain512_mk_ripemd160_final (GLOBAL_AS const u32 *in, u32 *mk, const u32 *sk1, const u32 *lk1, const u32 *sk2, const u32 *lk2, const u32 sector) { u32 S[4] = { sector, 0, 0, 0 }; @@ -2541,7 +2541,7 @@ DECLSPEC void luks_decrypt_sector_twofish_xts_plain512_mk_ripemd160_final (__glo // luks helper -DECLSPEC void luks_af_sha1_then_twofish_decrypt (__global const luks_t *luks_bufs, __global luks_tmp_t *tmps, u32 *pt_buf) +DECLSPEC void luks_af_sha1_then_twofish_decrypt (GLOBAL_AS const luks_t *luks_bufs, GLOBAL_AS luks_tmp_t *tmps, u32 *pt_buf) { const u32 key_size = luks_bufs->key_size; const u32 cipher_mode = luks_bufs->cipher_mode; @@ -2900,7 +2900,7 @@ DECLSPEC void luks_af_sha1_then_twofish_decrypt (__global const luks_t *luks_buf } } -DECLSPEC void luks_af_sha256_then_twofish_decrypt (__global const luks_t *luks_bufs, __global luks_tmp_t *tmps, u32 *pt_buf) +DECLSPEC void luks_af_sha256_then_twofish_decrypt (GLOBAL_AS const luks_t *luks_bufs, GLOBAL_AS luks_tmp_t *tmps, u32 *pt_buf) { const u32 key_size = luks_bufs->key_size; const u32 cipher_mode = luks_bufs->cipher_mode; @@ -3259,7 +3259,7 @@ DECLSPEC void luks_af_sha256_then_twofish_decrypt (__global const luks_t *luks_b } } -DECLSPEC void luks_af_sha512_then_twofish_decrypt (__global const luks_t *luks_bufs, __global luks_tmp_t *tmps, u32 *pt_buf) +DECLSPEC void luks_af_sha512_then_twofish_decrypt (GLOBAL_AS const luks_t *luks_bufs, GLOBAL_AS luks_tmp_t *tmps, u32 *pt_buf) { const u32 key_size = luks_bufs->key_size; const u32 cipher_mode = luks_bufs->cipher_mode; @@ -3637,7 +3637,7 @@ DECLSPEC void luks_af_sha512_then_twofish_decrypt (__global const luks_t *luks_b } } -DECLSPEC void luks_af_ripemd160_then_twofish_decrypt (__global const luks_t *luks_bufs, __global luks_tmp_t *tmps, u32 *pt_buf) +DECLSPEC void luks_af_ripemd160_then_twofish_decrypt (GLOBAL_AS const luks_t *luks_bufs, GLOBAL_AS luks_tmp_t *tmps, u32 *pt_buf) { const u32 key_size = luks_bufs->key_size; const u32 cipher_mode = luks_bufs->cipher_mode; diff --git a/OpenCL/inc_luks_twofish.h b/OpenCL/inc_luks_twofish.h index f758c9e2b..07a56addf 100644 --- a/OpenCL/inc_luks_twofish.h +++ b/OpenCL/inc_luks_twofish.h @@ -3,66 +3,66 @@ * License.....: MIT */ -DECLSPEC void twofish128_decrypt_cbc (const u32 *sk1, const u32 *lk1, const u32 *in, u32 *out, u32 *essiv) -DECLSPEC void twofish256_decrypt_cbc (const u32 *sk1, const u32 *lk1, const u32 *in, u32 *out, u32 *essiv) -DECLSPEC void luks_decrypt_sector_twofish_cbc_essiv128 (__global const u32 *in, u32 *out, const u32 *sk1, const u32 *lk1, const u32 *sk2, const u32 *lk2, const u32 sector) -DECLSPEC void luks_decrypt_sector_twofish_cbc_essiv128_mk_sha1 (__global const u32 *in, u32 *mk, const u32 *sk1, const u32 *lk1, const u32 *sk2, const u32 *lk2, const u32 sector) -DECLSPEC void luks_decrypt_sector_twofish_cbc_essiv128_mk_sha1_final (__global const u32 *in, u32 *mk, const u32 *sk1, const u32 *lk1, const u32 *sk2, const u32 *lk2, const u32 sector) -DECLSPEC void luks_decrypt_sector_twofish_cbc_essiv128_mk_sha256 (__global const u32 *in, u32 *mk, const u32 *sk1, const u32 *lk1, const u32 *sk2, const u32 *lk2, const u32 sector) -DECLSPEC void luks_decrypt_sector_twofish_cbc_essiv128_mk_sha256_final (__global const u32 *in, u32 *mk, const u32 *sk1, const u32 *lk1, const u32 *sk2, const u32 *lk2, const u32 sector) -DECLSPEC void luks_decrypt_sector_twofish_cbc_essiv128_mk_sha512 (__global const u32 *in, u32 *mk, const u32 *sk1, const u32 *lk1, const u32 *sk2, const u32 *lk2, const u32 sector) -DECLSPEC void luks_decrypt_sector_twofish_cbc_essiv128_mk_sha512_final (__global const u32 *in, u32 *mk, const u32 *sk1, const u32 *lk1, const u32 *sk2, const u32 *lk2, const u32 sector) -DECLSPEC void luks_decrypt_sector_twofish_cbc_essiv128_mk_ripemd160 (__global const u32 *in, u32 *mk, const u32 *sk1, const u32 *lk1, const u32 *sk2, const u32 *lk2, const u32 sector) -DECLSPEC void luks_decrypt_sector_twofish_cbc_essiv128_mk_ripemd160_final (__global const u32 *in, u32 *mk, const u32 *sk1, const u32 *lk1, const u32 *sk2, const u32 *lk2, const u32 sector) -DECLSPEC void luks_decrypt_sector_twofish_cbc_essiv256 (__global const u32 *in, u32 *out, const u32 *sk1, const u32 *lk1, const u32 *sk2, const u32 *lk2, const u32 sector) -DECLSPEC void luks_decrypt_sector_twofish_cbc_essiv256_mk_sha1 (__global const u32 *in, u32 *mk, const u32 *sk1, const u32 *lk1, const u32 *sk2, const u32 *lk2, const u32 sector) -DECLSPEC void luks_decrypt_sector_twofish_cbc_essiv256_mk_sha1_final (__global const u32 *in, u32 *mk, const u32 *sk1, const u32 *lk1, const u32 *sk2, const u32 *lk2, const u32 sector) -DECLSPEC void luks_decrypt_sector_twofish_cbc_essiv256_mk_sha256 (__global const u32 *in, u32 *mk, const u32 *sk1, const u32 *lk1, const u32 *sk2, const u32 *lk2, const u32 sector) -DECLSPEC void luks_decrypt_sector_twofish_cbc_essiv256_mk_sha256_final (__global const u32 *in, u32 *mk, const u32 *sk1, const u32 *lk1, const u32 *sk2, const u32 *lk2, const u32 sector) -DECLSPEC void luks_decrypt_sector_twofish_cbc_essiv256_mk_sha512 (__global const u32 *in, u32 *mk, const u32 *sk1, const u32 *lk1, const u32 *sk2, const u32 *lk2, const u32 sector) -DECLSPEC void luks_decrypt_sector_twofish_cbc_essiv256_mk_sha512_final (__global const u32 *in, u32 *mk, const u32 *sk1, const u32 *lk1, const u32 *sk2, const u32 *lk2, const u32 sector) -DECLSPEC void luks_decrypt_sector_twofish_cbc_essiv256_mk_ripemd160 (__global const u32 *in, u32 *mk, const u32 *sk1, const u32 *lk1, const u32 *sk2, const u32 *lk2, const u32 sector) -DECLSPEC void luks_decrypt_sector_twofish_cbc_essiv256_mk_ripemd160_final (__global const u32 *in, u32 *mk, const u32 *sk1, const u32 *lk1, const u32 *sk2, const u32 *lk2, const u32 sector) -DECLSPEC void luks_decrypt_sector_twofish_cbc_plain128 (__global const u32 *in, u32 *out, const u32 *sk1, const u32 *lk1, const u32 sector) -DECLSPEC void luks_decrypt_sector_twofish_cbc_plain128_mk_sha1 (__global const u32 *in, u32 *mk, const u32 *sk1, const u32 *lk1, const u32 sector) -DECLSPEC void luks_decrypt_sector_twofish_cbc_plain128_mk_sha1_final (__global const u32 *in, u32 *mk, const u32 *sk1, const u32 *lk1, const u32 sector) -DECLSPEC void luks_decrypt_sector_twofish_cbc_plain128_mk_sha256 (__global const u32 *in, u32 *mk, const u32 *sk1, const u32 *lk1, const u32 sector) -DECLSPEC void luks_decrypt_sector_twofish_cbc_plain128_mk_sha256_final (__global const u32 *in, u32 *mk, const u32 *sk1, const u32 *lk1, const u32 sector) -DECLSPEC void luks_decrypt_sector_twofish_cbc_plain128_mk_sha512 (__global const u32 *in, u32 *mk, const u32 *sk1, const u32 *lk1, const u32 sector) -DECLSPEC void luks_decrypt_sector_twofish_cbc_plain128_mk_sha512_final (__global const u32 *in, u32 *mk, const u32 *sk1, const u32 *lk1, const u32 sector) -DECLSPEC void luks_decrypt_sector_twofish_cbc_plain128_mk_ripemd160 (__global const u32 *in, u32 *mk, const u32 *sk1, const u32 *lk1, const u32 sector) -DECLSPEC void luks_decrypt_sector_twofish_cbc_plain128_mk_ripemd160_final (__global const u32 *in, u32 *mk, const u32 *sk1, const u32 *lk1, const u32 sector) -DECLSPEC void luks_decrypt_sector_twofish_cbc_plain256 (__global const u32 *in, u32 *out, const u32 *sk1, const u32 *lk1, const u32 sector) -DECLSPEC void luks_decrypt_sector_twofish_cbc_plain256_mk_sha1 (__global const u32 *in, u32 *mk, const u32 *sk1, const u32 *lk1, const u32 sector) -DECLSPEC void luks_decrypt_sector_twofish_cbc_plain256_mk_sha1_final (__global const u32 *in, u32 *mk, const u32 *sk1, const u32 *lk1, const u32 sector) -DECLSPEC void luks_decrypt_sector_twofish_cbc_plain256_mk_sha256 (__global const u32 *in, u32 *mk, const u32 *sk1, const u32 *lk1, const u32 sector) -DECLSPEC void luks_decrypt_sector_twofish_cbc_plain256_mk_sha256_final (__global const u32 *in, u32 *mk, const u32 *sk1, const u32 *lk1, const u32 sector) -DECLSPEC void luks_decrypt_sector_twofish_cbc_plain256_mk_sha512 (__global const u32 *in, u32 *mk, const u32 *sk1, const u32 *lk1, const u32 sector) -DECLSPEC void luks_decrypt_sector_twofish_cbc_plain256_mk_sha512_final (__global const u32 *in, u32 *mk, const u32 *sk1, const u32 *lk1, const u32 sector) -DECLSPEC void luks_decrypt_sector_twofish_cbc_plain256_mk_ripemd160 (__global const u32 *in, u32 *mk, const u32 *sk1, const u32 *lk1, const u32 sector) -DECLSPEC void luks_decrypt_sector_twofish_cbc_plain256_mk_ripemd160_final (__global const u32 *in, u32 *mk, const u32 *sk1, const u32 *lk1, const u32 sector) +DECLSPEC void twofish128_decrypt_cbc (const u32 *sk1, const u32 *lk1, const u32 *in, u32 *out, u32 *essiv); +DECLSPEC void twofish256_decrypt_cbc (const u32 *sk1, const u32 *lk1, const u32 *in, u32 *out, u32 *essiv); +DECLSPEC void luks_decrypt_sector_twofish_cbc_essiv128 (GLOBAL_AS const u32 *in, u32 *out, const u32 *sk1, const u32 *lk1, const u32 *sk2, const u32 *lk2, const u32 sector); +DECLSPEC void luks_decrypt_sector_twofish_cbc_essiv128_mk_sha1 (GLOBAL_AS const u32 *in, u32 *mk, const u32 *sk1, const u32 *lk1, const u32 *sk2, const u32 *lk2, const u32 sector); +DECLSPEC void luks_decrypt_sector_twofish_cbc_essiv128_mk_sha1_final (GLOBAL_AS const u32 *in, u32 *mk, const u32 *sk1, const u32 *lk1, const u32 *sk2, const u32 *lk2, const u32 sector); +DECLSPEC void luks_decrypt_sector_twofish_cbc_essiv128_mk_sha256 (GLOBAL_AS const u32 *in, u32 *mk, const u32 *sk1, const u32 *lk1, const u32 *sk2, const u32 *lk2, const u32 sector); +DECLSPEC void luks_decrypt_sector_twofish_cbc_essiv128_mk_sha256_final (GLOBAL_AS const u32 *in, u32 *mk, const u32 *sk1, const u32 *lk1, const u32 *sk2, const u32 *lk2, const u32 sector); +DECLSPEC void luks_decrypt_sector_twofish_cbc_essiv128_mk_sha512 (GLOBAL_AS const u32 *in, u32 *mk, const u32 *sk1, const u32 *lk1, const u32 *sk2, const u32 *lk2, const u32 sector); +DECLSPEC void luks_decrypt_sector_twofish_cbc_essiv128_mk_sha512_final (GLOBAL_AS const u32 *in, u32 *mk, const u32 *sk1, const u32 *lk1, const u32 *sk2, const u32 *lk2, const u32 sector); +DECLSPEC void luks_decrypt_sector_twofish_cbc_essiv128_mk_ripemd160 (GLOBAL_AS const u32 *in, u32 *mk, const u32 *sk1, const u32 *lk1, const u32 *sk2, const u32 *lk2, const u32 sector); +DECLSPEC void luks_decrypt_sector_twofish_cbc_essiv128_mk_ripemd160_final (GLOBAL_AS const u32 *in, u32 *mk, const u32 *sk1, const u32 *lk1, const u32 *sk2, const u32 *lk2, const u32 sector); +DECLSPEC void luks_decrypt_sector_twofish_cbc_essiv256 (GLOBAL_AS const u32 *in, u32 *out, const u32 *sk1, const u32 *lk1, const u32 *sk2, const u32 *lk2, const u32 sector); +DECLSPEC void luks_decrypt_sector_twofish_cbc_essiv256_mk_sha1 (GLOBAL_AS const u32 *in, u32 *mk, const u32 *sk1, const u32 *lk1, const u32 *sk2, const u32 *lk2, const u32 sector); +DECLSPEC void luks_decrypt_sector_twofish_cbc_essiv256_mk_sha1_final (GLOBAL_AS const u32 *in, u32 *mk, const u32 *sk1, const u32 *lk1, const u32 *sk2, const u32 *lk2, const u32 sector); +DECLSPEC void luks_decrypt_sector_twofish_cbc_essiv256_mk_sha256 (GLOBAL_AS const u32 *in, u32 *mk, const u32 *sk1, const u32 *lk1, const u32 *sk2, const u32 *lk2, const u32 sector); +DECLSPEC void luks_decrypt_sector_twofish_cbc_essiv256_mk_sha256_final (GLOBAL_AS const u32 *in, u32 *mk, const u32 *sk1, const u32 *lk1, const u32 *sk2, const u32 *lk2, const u32 sector); +DECLSPEC void luks_decrypt_sector_twofish_cbc_essiv256_mk_sha512 (GLOBAL_AS const u32 *in, u32 *mk, const u32 *sk1, const u32 *lk1, const u32 *sk2, const u32 *lk2, const u32 sector); +DECLSPEC void luks_decrypt_sector_twofish_cbc_essiv256_mk_sha512_final (GLOBAL_AS const u32 *in, u32 *mk, const u32 *sk1, const u32 *lk1, const u32 *sk2, const u32 *lk2, const u32 sector); +DECLSPEC void luks_decrypt_sector_twofish_cbc_essiv256_mk_ripemd160 (GLOBAL_AS const u32 *in, u32 *mk, const u32 *sk1, const u32 *lk1, const u32 *sk2, const u32 *lk2, const u32 sector); +DECLSPEC void luks_decrypt_sector_twofish_cbc_essiv256_mk_ripemd160_final (GLOBAL_AS const u32 *in, u32 *mk, const u32 *sk1, const u32 *lk1, const u32 *sk2, const u32 *lk2, const u32 sector); +DECLSPEC void luks_decrypt_sector_twofish_cbc_plain128 (GLOBAL_AS const u32 *in, u32 *out, const u32 *sk1, const u32 *lk1, const u32 sector); +DECLSPEC void luks_decrypt_sector_twofish_cbc_plain128_mk_sha1 (GLOBAL_AS const u32 *in, u32 *mk, const u32 *sk1, const u32 *lk1, const u32 sector); +DECLSPEC void luks_decrypt_sector_twofish_cbc_plain128_mk_sha1_final (GLOBAL_AS const u32 *in, u32 *mk, const u32 *sk1, const u32 *lk1, const u32 sector); +DECLSPEC void luks_decrypt_sector_twofish_cbc_plain128_mk_sha256 (GLOBAL_AS const u32 *in, u32 *mk, const u32 *sk1, const u32 *lk1, const u32 sector); +DECLSPEC void luks_decrypt_sector_twofish_cbc_plain128_mk_sha256_final (GLOBAL_AS const u32 *in, u32 *mk, const u32 *sk1, const u32 *lk1, const u32 sector); +DECLSPEC void luks_decrypt_sector_twofish_cbc_plain128_mk_sha512 (GLOBAL_AS const u32 *in, u32 *mk, const u32 *sk1, const u32 *lk1, const u32 sector); +DECLSPEC void luks_decrypt_sector_twofish_cbc_plain128_mk_sha512_final (GLOBAL_AS const u32 *in, u32 *mk, const u32 *sk1, const u32 *lk1, const u32 sector); +DECLSPEC void luks_decrypt_sector_twofish_cbc_plain128_mk_ripemd160 (GLOBAL_AS const u32 *in, u32 *mk, const u32 *sk1, const u32 *lk1, const u32 sector); +DECLSPEC void luks_decrypt_sector_twofish_cbc_plain128_mk_ripemd160_final (GLOBAL_AS const u32 *in, u32 *mk, const u32 *sk1, const u32 *lk1, const u32 sector); +DECLSPEC void luks_decrypt_sector_twofish_cbc_plain256 (GLOBAL_AS const u32 *in, u32 *out, const u32 *sk1, const u32 *lk1, const u32 sector); +DECLSPEC void luks_decrypt_sector_twofish_cbc_plain256_mk_sha1 (GLOBAL_AS const u32 *in, u32 *mk, const u32 *sk1, const u32 *lk1, const u32 sector); +DECLSPEC void luks_decrypt_sector_twofish_cbc_plain256_mk_sha1_final (GLOBAL_AS const u32 *in, u32 *mk, const u32 *sk1, const u32 *lk1, const u32 sector); +DECLSPEC void luks_decrypt_sector_twofish_cbc_plain256_mk_sha256 (GLOBAL_AS const u32 *in, u32 *mk, const u32 *sk1, const u32 *lk1, const u32 sector); +DECLSPEC void luks_decrypt_sector_twofish_cbc_plain256_mk_sha256_final (GLOBAL_AS const u32 *in, u32 *mk, const u32 *sk1, const u32 *lk1, const u32 sector); +DECLSPEC void luks_decrypt_sector_twofish_cbc_plain256_mk_sha512 (GLOBAL_AS const u32 *in, u32 *mk, const u32 *sk1, const u32 *lk1, const u32 sector); +DECLSPEC void luks_decrypt_sector_twofish_cbc_plain256_mk_sha512_final (GLOBAL_AS const u32 *in, u32 *mk, const u32 *sk1, const u32 *lk1, const u32 sector); +DECLSPEC void luks_decrypt_sector_twofish_cbc_plain256_mk_ripemd160 (GLOBAL_AS const u32 *in, u32 *mk, const u32 *sk1, const u32 *lk1, const u32 sector); +DECLSPEC void luks_decrypt_sector_twofish_cbc_plain256_mk_ripemd160_final (GLOBAL_AS const u32 *in, u32 *mk, const u32 *sk1, const u32 *lk1, const u32 sector); -DECLSPEC void twofish128_decrypt_xts (const u32 *sk1, const u32 *lk1, const u32 *in, u32 *out, u32 *T) -DECLSPEC void twofish256_decrypt_xts (const u32 *sk1, const u32 *lk1, const u32 *in, u32 *out, u32 *T) -DECLSPEC void luks_decrypt_sector_twofish_xts_plain256 (__global const u32 *in, u32 *out, const u32 *sk1, const u32 *lk1, const u32 *sk2, const u32 *lk2, const u32 sector) -DECLSPEC void luks_decrypt_sector_twofish_xts_plain256_mk_sha1 (__global const u32 *in, u32 *mk, const u32 *sk1, const u32 *lk1, const u32 *sk2, const u32 *lk2, const u32 sector) -DECLSPEC void luks_decrypt_sector_twofish_xts_plain256_mk_sha1_final (__global const u32 *in, u32 *mk, const u32 *sk1, const u32 *lk1, const u32 *sk2, const u32 *lk2, const u32 sector) -DECLSPEC void luks_decrypt_sector_twofish_xts_plain256_mk_sha256 (__global const u32 *in, u32 *mk, const u32 *sk1, const u32 *lk1, const u32 *sk2, const u32 *lk2, const u32 sector) -DECLSPEC void luks_decrypt_sector_twofish_xts_plain256_mk_sha256_final (__global const u32 *in, u32 *mk, const u32 *sk1, const u32 *lk1, const u32 *sk2, const u32 *lk2, const u32 sector) -DECLSPEC void luks_decrypt_sector_twofish_xts_plain256_mk_sha512 (__global const u32 *in, u32 *mk, const u32 *sk1, const u32 *lk1, const u32 *sk2, const u32 *lk2, const u32 sector) -DECLSPEC void luks_decrypt_sector_twofish_xts_plain256_mk_sha512_final (__global const u32 *in, u32 *mk, const u32 *sk1, const u32 *lk1, const u32 *sk2, const u32 *lk2, const u32 sector) -DECLSPEC void luks_decrypt_sector_twofish_xts_plain256_mk_ripemd160 (__global const u32 *in, u32 *mk, const u32 *sk1, const u32 *lk1, const u32 *sk2, const u32 *lk2, const u32 sector) -DECLSPEC void luks_decrypt_sector_twofish_xts_plain256_mk_ripemd160_final (__global const u32 *in, u32 *mk, const u32 *sk1, const u32 *lk1, const u32 *sk2, const u32 *lk2, const u32 sector) -DECLSPEC void luks_decrypt_sector_twofish_xts_plain512 (__global const u32 *in, u32 *out, const u32 *sk1, const u32 *lk1, const u32 *sk2, const u32 *lk2, const u32 sector) -DECLSPEC void luks_decrypt_sector_twofish_xts_plain512_mk_sha1 (__global const u32 *in, u32 *mk, const u32 *sk1, const u32 *lk1, const u32 *sk2, const u32 *lk2, const u32 sector) -DECLSPEC void luks_decrypt_sector_twofish_xts_plain512_mk_sha1_final (__global const u32 *in, u32 *mk, const u32 *sk1, const u32 *lk1, const u32 *sk2, const u32 *lk2, const u32 sector) -DECLSPEC void luks_decrypt_sector_twofish_xts_plain512_mk_sha256 (__global const u32 *in, u32 *mk, const u32 *sk1, const u32 *lk1, const u32 *sk2, const u32 *lk2, const u32 sector) -DECLSPEC void luks_decrypt_sector_twofish_xts_plain512_mk_sha256_final (__global const u32 *in, u32 *mk, const u32 *sk1, const u32 *lk1, const u32 *sk2, const u32 *lk2, const u32 sector) -DECLSPEC void luks_decrypt_sector_twofish_xts_plain512_mk_sha512 (__global const u32 *in, u32 *mk, const u32 *sk1, const u32 *lk1, const u32 *sk2, const u32 *lk2, const u32 sector) -DECLSPEC void luks_decrypt_sector_twofish_xts_plain512_mk_sha512_final (__global const u32 *in, u32 *mk, const u32 *sk1, const u32 *lk1, const u32 *sk2, const u32 *lk2, const u32 sector) -DECLSPEC void luks_decrypt_sector_twofish_xts_plain512_mk_ripemd160 (__global const u32 *in, u32 *mk, const u32 *sk1, const u32 *lk1, const u32 *sk2, const u32 *lk2, const u32 sector) -DECLSPEC void luks_decrypt_sector_twofish_xts_plain512_mk_ripemd160_final (__global const u32 *in, u32 *mk, const u32 *sk1, const u32 *lk1, const u32 *sk2, const u32 *lk2, const u32 sector) -DECLSPEC void luks_af_sha1_then_twofish_decrypt (__global const luks_t *luks_bufs, __global luks_tmp_t *tmps, u32 *pt_buf) -DECLSPEC void luks_af_sha256_then_twofish_decrypt (__global const luks_t *luks_bufs, __global luks_tmp_t *tmps, u32 *pt_buf) -DECLSPEC void luks_af_sha512_then_twofish_decrypt (__global const luks_t *luks_bufs, __global luks_tmp_t *tmps, u32 *pt_buf) -DECLSPEC void luks_af_ripemd160_then_twofish_decrypt (__global const luks_t *luks_bufs, __global luks_tmp_t *tmps, u32 *pt_buf) +DECLSPEC void twofish128_decrypt_xts (const u32 *sk1, const u32 *lk1, const u32 *in, u32 *out, u32 *T); +DECLSPEC void twofish256_decrypt_xts (const u32 *sk1, const u32 *lk1, const u32 *in, u32 *out, u32 *T); +DECLSPEC void luks_decrypt_sector_twofish_xts_plain256 (GLOBAL_AS const u32 *in, u32 *out, const u32 *sk1, const u32 *lk1, const u32 *sk2, const u32 *lk2, const u32 sector); +DECLSPEC void luks_decrypt_sector_twofish_xts_plain256_mk_sha1 (GLOBAL_AS const u32 *in, u32 *mk, const u32 *sk1, const u32 *lk1, const u32 *sk2, const u32 *lk2, const u32 sector); +DECLSPEC void luks_decrypt_sector_twofish_xts_plain256_mk_sha1_final (GLOBAL_AS const u32 *in, u32 *mk, const u32 *sk1, const u32 *lk1, const u32 *sk2, const u32 *lk2, const u32 sector); +DECLSPEC void luks_decrypt_sector_twofish_xts_plain256_mk_sha256 (GLOBAL_AS const u32 *in, u32 *mk, const u32 *sk1, const u32 *lk1, const u32 *sk2, const u32 *lk2, const u32 sector); +DECLSPEC void luks_decrypt_sector_twofish_xts_plain256_mk_sha256_final (GLOBAL_AS const u32 *in, u32 *mk, const u32 *sk1, const u32 *lk1, const u32 *sk2, const u32 *lk2, const u32 sector); +DECLSPEC void luks_decrypt_sector_twofish_xts_plain256_mk_sha512 (GLOBAL_AS const u32 *in, u32 *mk, const u32 *sk1, const u32 *lk1, const u32 *sk2, const u32 *lk2, const u32 sector); +DECLSPEC void luks_decrypt_sector_twofish_xts_plain256_mk_sha512_final (GLOBAL_AS const u32 *in, u32 *mk, const u32 *sk1, const u32 *lk1, const u32 *sk2, const u32 *lk2, const u32 sector); +DECLSPEC void luks_decrypt_sector_twofish_xts_plain256_mk_ripemd160 (GLOBAL_AS const u32 *in, u32 *mk, const u32 *sk1, const u32 *lk1, const u32 *sk2, const u32 *lk2, const u32 sector); +DECLSPEC void luks_decrypt_sector_twofish_xts_plain256_mk_ripemd160_final (GLOBAL_AS const u32 *in, u32 *mk, const u32 *sk1, const u32 *lk1, const u32 *sk2, const u32 *lk2, const u32 sector); +DECLSPEC void luks_decrypt_sector_twofish_xts_plain512 (GLOBAL_AS const u32 *in, u32 *out, const u32 *sk1, const u32 *lk1, const u32 *sk2, const u32 *lk2, const u32 sector); +DECLSPEC void luks_decrypt_sector_twofish_xts_plain512_mk_sha1 (GLOBAL_AS const u32 *in, u32 *mk, const u32 *sk1, const u32 *lk1, const u32 *sk2, const u32 *lk2, const u32 sector); +DECLSPEC void luks_decrypt_sector_twofish_xts_plain512_mk_sha1_final (GLOBAL_AS const u32 *in, u32 *mk, const u32 *sk1, const u32 *lk1, const u32 *sk2, const u32 *lk2, const u32 sector); +DECLSPEC void luks_decrypt_sector_twofish_xts_plain512_mk_sha256 (GLOBAL_AS const u32 *in, u32 *mk, const u32 *sk1, const u32 *lk1, const u32 *sk2, const u32 *lk2, const u32 sector); +DECLSPEC void luks_decrypt_sector_twofish_xts_plain512_mk_sha256_final (GLOBAL_AS const u32 *in, u32 *mk, const u32 *sk1, const u32 *lk1, const u32 *sk2, const u32 *lk2, const u32 sector); +DECLSPEC void luks_decrypt_sector_twofish_xts_plain512_mk_sha512 (GLOBAL_AS const u32 *in, u32 *mk, const u32 *sk1, const u32 *lk1, const u32 *sk2, const u32 *lk2, const u32 sector); +DECLSPEC void luks_decrypt_sector_twofish_xts_plain512_mk_sha512_final (GLOBAL_AS const u32 *in, u32 *mk, const u32 *sk1, const u32 *lk1, const u32 *sk2, const u32 *lk2, const u32 sector); +DECLSPEC void luks_decrypt_sector_twofish_xts_plain512_mk_ripemd160 (GLOBAL_AS const u32 *in, u32 *mk, const u32 *sk1, const u32 *lk1, const u32 *sk2, const u32 *lk2, const u32 sector); +DECLSPEC void luks_decrypt_sector_twofish_xts_plain512_mk_ripemd160_final (GLOBAL_AS const u32 *in, u32 *mk, const u32 *sk1, const u32 *lk1, const u32 *sk2, const u32 *lk2, const u32 sector); +DECLSPEC void luks_af_sha1_then_twofish_decrypt (GLOBAL_AS const luks_t *luks_bufs, GLOBAL_AS luks_tmp_t *tmps, u32 *pt_buf); +DECLSPEC void luks_af_sha256_then_twofish_decrypt (GLOBAL_AS const luks_t *luks_bufs, GLOBAL_AS luks_tmp_t *tmps, u32 *pt_buf); +DECLSPEC void luks_af_sha512_then_twofish_decrypt (GLOBAL_AS const luks_t *luks_bufs, GLOBAL_AS luks_tmp_t *tmps, u32 *pt_buf); +DECLSPEC void luks_af_ripemd160_then_twofish_decrypt (GLOBAL_AS const luks_t *luks_bufs, GLOBAL_AS luks_tmp_t *tmps, u32 *pt_buf); diff --git a/OpenCL/inc_luks_xts.h b/OpenCL/inc_luks_xts.h index 93b4289c5..cd9da167c 100644 --- a/OpenCL/inc_luks_xts.h +++ b/OpenCL/inc_luks_xts.h @@ -3,4 +3,4 @@ * License.....: MIT */ -DECLSPEC void xts_mul2 (u32 *in, u32 *out) +DECLSPEC void xts_mul2 (u32 *in, u32 *out); diff --git a/OpenCL/inc_rp.cl b/OpenCL/inc_rp.cl index 43e820269..d8a557ff1 100644 --- a/OpenCL/inc_rp.cl +++ b/OpenCL/inc_rp.cl @@ -9,7 +9,7 @@ #ifdef REAL_SHM #define COPY_PW(x) \ - __local pw_t s_pws[64]; \ + LOCAL_AS pw_t s_pws[64]; \ s_pws[get_local_id (0)] = (x); #else #define COPY_PW(x) \ @@ -747,7 +747,7 @@ DECLSPEC int apply_rule (const u32 name, MAYBE_UNUSED const u8 p0, MAYBE_UNUSED return out_len; } -DECLSPEC int apply_rules (__constant const u32 *cmds, u32 *buf, const int in_len) +DECLSPEC int apply_rules (CONSTANT_AS const u32 *cmds, u32 *buf, const int in_len) { int out_len = in_len; diff --git a/OpenCL/inc_rp.h b/OpenCL/inc_rp.h index 768af2dd0..4ca6be353 100644 --- a/OpenCL/inc_rp.h +++ b/OpenCL/inc_rp.h @@ -59,51 +59,51 @@ #define RP_PASSWORD_SIZE 256 -DECLSPEC u32 generate_cmask (const u32 value) -DECLSPEC void append_four_byte (const u32 *buf_src, const int off_src, u32 *buf_dst, const int off_dst) -DECLSPEC void append_three_byte (const u32 *buf_src, const int off_src, u32 *buf_dst, const int off_dst) -DECLSPEC void append_two_byte (const u32 *buf_src, const int off_src, u32 *buf_dst, const int off_dst) -DECLSPEC void append_one_byte (const u32 *buf_src, const int off_src, u32 *buf_dst, const int off_dst) -DECLSPEC void append_block (const u32 *buf_src, const int off_src, u32 *buf_dst, const int off_dst, const int len) -DECLSPEC void exchange_byte (u32 *buf, const int off_src, const int off_dst) -DECLSPEC int mangle_lrest (MAYBE_UNUSED const u8 p0, MAYBE_UNUSED const u8 p1, u32 *buf, const int len) -DECLSPEC int mangle_lrest_ufirst (MAYBE_UNUSED const u8 p0, MAYBE_UNUSED const u8 p1, u32 *buf, const int len) -DECLSPEC int mangle_urest (MAYBE_UNUSED const u8 p0, MAYBE_UNUSED const u8 p1, u32 *buf, const int len) -DECLSPEC int mangle_urest_lfirst (MAYBE_UNUSED const u8 p0, MAYBE_UNUSED const u8 p1, u32 *buf, const int len) -DECLSPEC int mangle_trest (MAYBE_UNUSED const u8 p0, MAYBE_UNUSED const u8 p1, u32 *buf, const int len) -DECLSPEC int mangle_toggle_at (MAYBE_UNUSED const u8 p0, MAYBE_UNUSED const u8 p1, u32 *buf, const int len) -DECLSPEC int mangle_reverse (MAYBE_UNUSED const u8 p0, MAYBE_UNUSED const u8 p1, u32 *buf, const int len) -DECLSPEC int mangle_dupeword (MAYBE_UNUSED const u8 p0, MAYBE_UNUSED const u8 p1, u32 *buf, const int len) -DECLSPEC int mangle_dupeword_times (MAYBE_UNUSED const u8 p0, MAYBE_UNUSED const u8 p1, u8 *buf, const int len) -DECLSPEC int mangle_reflect (MAYBE_UNUSED const u8 p0, MAYBE_UNUSED const u8 p1, u32 *buf, const int len) -DECLSPEC int mangle_append (MAYBE_UNUSED const u8 p0, MAYBE_UNUSED const u8 p1, u8 *buf, const int len) -DECLSPEC int mangle_prepend (MAYBE_UNUSED const u8 p0, MAYBE_UNUSED const u8 p1, u8 *buf, const int len) -DECLSPEC int mangle_rotate_left (MAYBE_UNUSED const u8 p0, MAYBE_UNUSED const u8 p1, u32 *buf, const int len) -DECLSPEC int mangle_rotate_right (MAYBE_UNUSED const u8 p0, MAYBE_UNUSED const u8 p1, u32 *buf, const int len) -DECLSPEC int mangle_delete_at (MAYBE_UNUSED const u8 p0, MAYBE_UNUSED const u8 p1, u8 *buf, const int len) -DECLSPEC int mangle_delete_first (MAYBE_UNUSED const u8 p0, MAYBE_UNUSED const u8 p1, u8 *buf, const int len) -DECLSPEC int mangle_delete_last (MAYBE_UNUSED const u8 p0, MAYBE_UNUSED const u8 p1, u8 *buf, const int len) -DECLSPEC int mangle_extract (MAYBE_UNUSED const u8 p0, MAYBE_UNUSED const u8 p1, u8 *buf, const int len) -DECLSPEC int mangle_omit (MAYBE_UNUSED const u8 p0, MAYBE_UNUSED const u8 p1, u8 *buf, const int len) -DECLSPEC int mangle_insert (MAYBE_UNUSED const u8 p0, MAYBE_UNUSED const u8 p1, u8 *buf, const int len) -DECLSPEC int mangle_overstrike (MAYBE_UNUSED const u8 p0, MAYBE_UNUSED const u8 p1, u8 *buf, const int len) -DECLSPEC int mangle_truncate_at (MAYBE_UNUSED const u8 p0, MAYBE_UNUSED const u8 p1, u8 *buf, const int len) -DECLSPEC int mangle_replace (MAYBE_UNUSED const u8 p0, MAYBE_UNUSED const u8 p1, u8 *buf, const int len) -DECLSPEC int mangle_purgechar (MAYBE_UNUSED const u8 p0, MAYBE_UNUSED const u8 p1, u8 *buf, const int len) -DECLSPEC int mangle_dupechar_first (MAYBE_UNUSED const u8 p0, MAYBE_UNUSED const u8 p1, u8 *buf, const int len) -DECLSPEC int mangle_dupechar_last (MAYBE_UNUSED const u8 p0, MAYBE_UNUSED const u8 p1, u8 *buf, const int len) -DECLSPEC int mangle_dupechar_all (MAYBE_UNUSED const u8 p0, MAYBE_UNUSED const u8 p1, u8 *buf, const int len) -DECLSPEC int mangle_switch_first (MAYBE_UNUSED const u8 p0, MAYBE_UNUSED const u8 p1, u32 *buf, const int len) -DECLSPEC int mangle_switch_last (MAYBE_UNUSED const u8 p0, MAYBE_UNUSED const u8 p1, u32 *buf, const int len) -DECLSPEC int mangle_switch_at (MAYBE_UNUSED const u8 p0, MAYBE_UNUSED const u8 p1, u32 *buf, const int len) -DECLSPEC int mangle_chr_shiftl (MAYBE_UNUSED const u8 p0, MAYBE_UNUSED const u8 p1, u8 *buf, const int len) -DECLSPEC int mangle_chr_shiftr (MAYBE_UNUSED const u8 p0, MAYBE_UNUSED const u8 p1, u8 *buf, const int len) -DECLSPEC int mangle_chr_incr (MAYBE_UNUSED const u8 p0, MAYBE_UNUSED const u8 p1, u8 *buf, const int len) -DECLSPEC int mangle_chr_decr (MAYBE_UNUSED const u8 p0, MAYBE_UNUSED const u8 p1, u8 *buf, const int len) -DECLSPEC int mangle_replace_np1 (MAYBE_UNUSED const u8 p0, MAYBE_UNUSED const u8 p1, u8 *buf, const int len) -DECLSPEC int mangle_replace_nm1 (MAYBE_UNUSED const u8 p0, MAYBE_UNUSED const u8 p1, u8 *buf, const int len) -DECLSPEC int mangle_dupeblock_first (MAYBE_UNUSED const u8 p0, MAYBE_UNUSED const u8 p1, u8 *buf, const int len) -DECLSPEC int mangle_dupeblock_last (MAYBE_UNUSED const u8 p0, MAYBE_UNUSED const u8 p1, u8 *buf, const int len) -DECLSPEC int mangle_title_sep (MAYBE_UNUSED const u8 p0, MAYBE_UNUSED const u8 p1, u32 *buf, const int len) -DECLSPEC int apply_rule (const u32 name, MAYBE_UNUSED const u8 p0, MAYBE_UNUSED const u8 p1, u32 *buf, const int in_len) -DECLSPEC int apply_rules (__constant const u32 *cmds, u32 *buf, const int in_len) +DECLSPEC u32 generate_cmask (const u32 value); +DECLSPEC void append_four_byte (const u32 *buf_src, const int off_src, u32 *buf_dst, const int off_dst); +DECLSPEC void append_three_byte (const u32 *buf_src, const int off_src, u32 *buf_dst, const int off_dst); +DECLSPEC void append_two_byte (const u32 *buf_src, const int off_src, u32 *buf_dst, const int off_dst); +DECLSPEC void append_one_byte (const u32 *buf_src, const int off_src, u32 *buf_dst, const int off_dst); +DECLSPEC void append_block (const u32 *buf_src, const int off_src, u32 *buf_dst, const int off_dst, const int len); +DECLSPEC void exchange_byte (u32 *buf, const int off_src, const int off_dst); +DECLSPEC int mangle_lrest (MAYBE_UNUSED const u8 p0, MAYBE_UNUSED const u8 p1, u32 *buf, const int len); +DECLSPEC int mangle_lrest_ufirst (MAYBE_UNUSED const u8 p0, MAYBE_UNUSED const u8 p1, u32 *buf, const int len); +DECLSPEC int mangle_urest (MAYBE_UNUSED const u8 p0, MAYBE_UNUSED const u8 p1, u32 *buf, const int len); +DECLSPEC int mangle_urest_lfirst (MAYBE_UNUSED const u8 p0, MAYBE_UNUSED const u8 p1, u32 *buf, const int len); +DECLSPEC int mangle_trest (MAYBE_UNUSED const u8 p0, MAYBE_UNUSED const u8 p1, u32 *buf, const int len); +DECLSPEC int mangle_toggle_at (MAYBE_UNUSED const u8 p0, MAYBE_UNUSED const u8 p1, u32 *buf, const int len); +DECLSPEC int mangle_reverse (MAYBE_UNUSED const u8 p0, MAYBE_UNUSED const u8 p1, u32 *buf, const int len); +DECLSPEC int mangle_dupeword (MAYBE_UNUSED const u8 p0, MAYBE_UNUSED const u8 p1, u32 *buf, const int len); +DECLSPEC int mangle_dupeword_times (MAYBE_UNUSED const u8 p0, MAYBE_UNUSED const u8 p1, u8 *buf, const int len); +DECLSPEC int mangle_reflect (MAYBE_UNUSED const u8 p0, MAYBE_UNUSED const u8 p1, u32 *buf, const int len); +DECLSPEC int mangle_append (MAYBE_UNUSED const u8 p0, MAYBE_UNUSED const u8 p1, u8 *buf, const int len); +DECLSPEC int mangle_prepend (MAYBE_UNUSED const u8 p0, MAYBE_UNUSED const u8 p1, u8 *buf, const int len); +DECLSPEC int mangle_rotate_left (MAYBE_UNUSED const u8 p0, MAYBE_UNUSED const u8 p1, u32 *buf, const int len); +DECLSPEC int mangle_rotate_right (MAYBE_UNUSED const u8 p0, MAYBE_UNUSED const u8 p1, u32 *buf, const int len); +DECLSPEC int mangle_delete_at (MAYBE_UNUSED const u8 p0, MAYBE_UNUSED const u8 p1, u8 *buf, const int len); +DECLSPEC int mangle_delete_first (MAYBE_UNUSED const u8 p0, MAYBE_UNUSED const u8 p1, u8 *buf, const int len); +DECLSPEC int mangle_delete_last (MAYBE_UNUSED const u8 p0, MAYBE_UNUSED const u8 p1, u8 *buf, const int len); +DECLSPEC int mangle_extract (MAYBE_UNUSED const u8 p0, MAYBE_UNUSED const u8 p1, u8 *buf, const int len); +DECLSPEC int mangle_omit (MAYBE_UNUSED const u8 p0, MAYBE_UNUSED const u8 p1, u8 *buf, const int len); +DECLSPEC int mangle_insert (MAYBE_UNUSED const u8 p0, MAYBE_UNUSED const u8 p1, u8 *buf, const int len); +DECLSPEC int mangle_overstrike (MAYBE_UNUSED const u8 p0, MAYBE_UNUSED const u8 p1, u8 *buf, const int len); +DECLSPEC int mangle_truncate_at (MAYBE_UNUSED const u8 p0, MAYBE_UNUSED const u8 p1, u8 *buf, const int len); +DECLSPEC int mangle_replace (MAYBE_UNUSED const u8 p0, MAYBE_UNUSED const u8 p1, u8 *buf, const int len); +DECLSPEC int mangle_purgechar (MAYBE_UNUSED const u8 p0, MAYBE_UNUSED const u8 p1, u8 *buf, const int len); +DECLSPEC int mangle_dupechar_first (MAYBE_UNUSED const u8 p0, MAYBE_UNUSED const u8 p1, u8 *buf, const int len); +DECLSPEC int mangle_dupechar_last (MAYBE_UNUSED const u8 p0, MAYBE_UNUSED const u8 p1, u8 *buf, const int len); +DECLSPEC int mangle_dupechar_all (MAYBE_UNUSED const u8 p0, MAYBE_UNUSED const u8 p1, u8 *buf, const int len); +DECLSPEC int mangle_switch_first (MAYBE_UNUSED const u8 p0, MAYBE_UNUSED const u8 p1, u32 *buf, const int len); +DECLSPEC int mangle_switch_last (MAYBE_UNUSED const u8 p0, MAYBE_UNUSED const u8 p1, u32 *buf, const int len); +DECLSPEC int mangle_switch_at (MAYBE_UNUSED const u8 p0, MAYBE_UNUSED const u8 p1, u32 *buf, const int len); +DECLSPEC int mangle_chr_shiftl (MAYBE_UNUSED const u8 p0, MAYBE_UNUSED const u8 p1, u8 *buf, const int len); +DECLSPEC int mangle_chr_shiftr (MAYBE_UNUSED const u8 p0, MAYBE_UNUSED const u8 p1, u8 *buf, const int len); +DECLSPEC int mangle_chr_incr (MAYBE_UNUSED const u8 p0, MAYBE_UNUSED const u8 p1, u8 *buf, const int len); +DECLSPEC int mangle_chr_decr (MAYBE_UNUSED const u8 p0, MAYBE_UNUSED const u8 p1, u8 *buf, const int len); +DECLSPEC int mangle_replace_np1 (MAYBE_UNUSED const u8 p0, MAYBE_UNUSED const u8 p1, u8 *buf, const int len); +DECLSPEC int mangle_replace_nm1 (MAYBE_UNUSED const u8 p0, MAYBE_UNUSED const u8 p1, u8 *buf, const int len); +DECLSPEC int mangle_dupeblock_first (MAYBE_UNUSED const u8 p0, MAYBE_UNUSED const u8 p1, u8 *buf, const int len); +DECLSPEC int mangle_dupeblock_last (MAYBE_UNUSED const u8 p0, MAYBE_UNUSED const u8 p1, u8 *buf, const int len); +DECLSPEC int mangle_title_sep (MAYBE_UNUSED const u8 p0, MAYBE_UNUSED const u8 p1, u32 *buf, const int len); +DECLSPEC int apply_rule (const u32 name, MAYBE_UNUSED const u8 p0, MAYBE_UNUSED const u8 p1, u32 *buf, const int in_len); +DECLSPEC int apply_rules (CONSTANT_AS const u32 *cmds, u32 *buf, const int in_len); diff --git a/OpenCL/inc_rp_optimized.cl b/OpenCL/inc_rp_optimized.cl index f36149ea3..9dae2e5cb 100644 --- a/OpenCL/inc_rp_optimized.cl +++ b/OpenCL/inc_rp_optimized.cl @@ -2352,7 +2352,7 @@ DECLSPEC u32 apply_rule (const u32 name, const u32 p0, const u32 p1, u32 *buf0, return out_len; } -DECLSPEC u32 apply_rules (__constant const u32 *cmds, u32 *buf0, u32 *buf1, const u32 len) +DECLSPEC u32 apply_rules (CONSTANT_AS const u32 *cmds, u32 *buf0, u32 *buf1, const u32 len) { u32 out_len = len; @@ -2370,7 +2370,7 @@ DECLSPEC u32 apply_rules (__constant const u32 *cmds, u32 *buf0, u32 *buf1, cons return out_len; } -DECLSPEC u32x apply_rules_vect (const u32 *pw_buf0, const u32 *pw_buf1, const u32 pw_len, __constant const kernel_rule_t *rules_buf, const u32 il_pos, u32x *buf0, u32x *buf1) +DECLSPEC u32x apply_rules_vect (const u32 *pw_buf0, const u32 *pw_buf1, const u32 pw_len, CONSTANT_AS const kernel_rule_t *rules_buf, const u32 il_pos, u32x *buf0, u32x *buf1) { #if VECT_SIZE == 1 diff --git a/OpenCL/inc_rp_optimized.h b/OpenCL/inc_rp_optimized.h index bf916c611..280f6f273 100644 --- a/OpenCL/inc_rp_optimized.h +++ b/OpenCL/inc_rp_optimized.h @@ -57,59 +57,59 @@ #define RULE_OP_MANGLE_DUPEBLOCK_LAST 'Y' #define RULE_OP_MANGLE_TITLE 'E' -DECLSPEC u32 generate_cmask (const u32 value) -DECLSPEC void truncate_right (u32 *buf0, u32 *buf1, const u32 offset) -DECLSPEC void truncate_left (u32 *buf0, u32 *buf1, const u32 offset) -DECLSPEC void lshift_block (const u32 *in0, const u32 *in1, u32 *out0, u32 *out1) -DECLSPEC void rshift_block (const u32 *in0, const u32 *in1, u32 *out0, u32 *out1) -DECLSPEC void lshift_block_N (const u32 *in0, const u32 *in1, u32 *out0, u32 *out1, const u32 num) -DECLSPEC void rshift_block_N (const u32 *in0, const u32 *in1, u32 *out0, u32 *out1, const u32 num) -DECLSPEC void append_block1 (const u32 offset, u32 *buf0, u32 *buf1, const u32 src_r0) -DECLSPEC void append_block8 (const u32 offset, u32 *buf0, u32 *buf1, const u32 *src_l0, const u32 *src_l1, const u32 *src_r0, const u32 *src_r1) -DECLSPEC void reverse_block (u32 *in0, u32 *in1, u32 *out0, u32 *out1, const u32 len) -DECLSPEC void exchange_byte (u32 *buf, const int off_src, const int off_dst) -DECLSPEC u32 rule_op_mangle_lrest (MAYBE_UNUSED const u32 p0, MAYBE_UNUSED const u32 p1, MAYBE_UNUSED u32 *buf0, MAYBE_UNUSED u32 *buf1, const u32 in_len) -DECLSPEC u32 rule_op_mangle_urest (MAYBE_UNUSED const u32 p0, MAYBE_UNUSED const u32 p1, MAYBE_UNUSED u32 *buf0, MAYBE_UNUSED u32 *buf1, const u32 in_len) -DECLSPEC u32 rule_op_mangle_lrest_ufirst (MAYBE_UNUSED const u32 p0, MAYBE_UNUSED const u32 p1, MAYBE_UNUSED u32 *buf0, MAYBE_UNUSED u32 *buf1, const u32 in_len) -DECLSPEC u32 rule_op_mangle_urest_lfirst (MAYBE_UNUSED const u32 p0, MAYBE_UNUSED const u32 p1, MAYBE_UNUSED u32 *buf0, MAYBE_UNUSED u32 *buf1, const u32 in_len) -DECLSPEC u32 rule_op_mangle_trest (MAYBE_UNUSED const u32 p0, MAYBE_UNUSED const u32 p1, MAYBE_UNUSED u32 *buf0, MAYBE_UNUSED u32 *buf1, const u32 in_len) -DECLSPEC u32 rule_op_mangle_toggle_at (MAYBE_UNUSED const u32 p0, MAYBE_UNUSED const u32 p1, MAYBE_UNUSED u32 *buf0, MAYBE_UNUSED u32 *buf1, const u32 in_len) -DECLSPEC u32 rule_op_mangle_reverse (MAYBE_UNUSED const u32 p0, MAYBE_UNUSED const u32 p1, MAYBE_UNUSED u32 *buf0, MAYBE_UNUSED u32 *buf1, const u32 in_len) -DECLSPEC u32 rule_op_mangle_dupeword (MAYBE_UNUSED const u32 p0, MAYBE_UNUSED const u32 p1, MAYBE_UNUSED u32 *buf0, MAYBE_UNUSED u32 *buf1, const u32 in_len) -DECLSPEC u32 rule_op_mangle_dupeword_times (MAYBE_UNUSED const u32 p0, MAYBE_UNUSED const u32 p1, MAYBE_UNUSED u32 *buf0, MAYBE_UNUSED u32 *buf1, const u32 in_len) -DECLSPEC u32 rule_op_mangle_reflect (MAYBE_UNUSED const u32 p0, MAYBE_UNUSED const u32 p1, MAYBE_UNUSED u32 *buf0, MAYBE_UNUSED u32 *buf1, const u32 in_len) -DECLSPEC u32 rule_op_mangle_append (MAYBE_UNUSED const u32 p0, MAYBE_UNUSED const u32 p1, MAYBE_UNUSED u32 *buf0, MAYBE_UNUSED u32 *buf1, const u32 in_len) -DECLSPEC u32 rule_op_mangle_prepend (MAYBE_UNUSED const u32 p0, MAYBE_UNUSED const u32 p1, MAYBE_UNUSED u32 *buf0, MAYBE_UNUSED u32 *buf1, const u32 in_len) -DECLSPEC u32 rule_op_mangle_rotate_left (MAYBE_UNUSED const u32 p0, MAYBE_UNUSED const u32 p1, MAYBE_UNUSED u32 *buf0, MAYBE_UNUSED u32 *buf1, const u32 in_len) -DECLSPEC u32 rule_op_mangle_rotate_right (MAYBE_UNUSED const u32 p0, MAYBE_UNUSED const u32 p1, MAYBE_UNUSED u32 *buf0, MAYBE_UNUSED u32 *buf1, const u32 in_len) -DECLSPEC u32 rule_op_mangle_delete_first (MAYBE_UNUSED const u32 p0, MAYBE_UNUSED const u32 p1, MAYBE_UNUSED u32 *buf0, MAYBE_UNUSED u32 *buf1, const u32 in_len) -DECLSPEC u32 rule_op_mangle_delete_last (MAYBE_UNUSED const u32 p0, MAYBE_UNUSED const u32 p1, MAYBE_UNUSED u32 *buf0, MAYBE_UNUSED u32 *buf1, const u32 in_len) -DECLSPEC u32 rule_op_mangle_delete_at (MAYBE_UNUSED const u32 p0, MAYBE_UNUSED const u32 p1, MAYBE_UNUSED u32 *buf0, MAYBE_UNUSED u32 *buf1, const u32 in_len) -DECLSPEC u32 rule_op_mangle_extract (MAYBE_UNUSED const u32 p0, MAYBE_UNUSED const u32 p1, MAYBE_UNUSED u32 *buf0, MAYBE_UNUSED u32 *buf1, const u32 in_len) -DECLSPEC u32 rule_op_mangle_omit (MAYBE_UNUSED const u32 p0, MAYBE_UNUSED const u32 p1, MAYBE_UNUSED u32 *buf0, MAYBE_UNUSED u32 *buf1, const u32 in_len) -DECLSPEC u32 rule_op_mangle_insert (MAYBE_UNUSED const u32 p0, MAYBE_UNUSED const u32 p1, MAYBE_UNUSED u32 *buf0, MAYBE_UNUSED u32 *buf1, const u32 in_len) -DECLSPEC u32 rule_op_mangle_overstrike (MAYBE_UNUSED const u32 p0, MAYBE_UNUSED const u32 p1, MAYBE_UNUSED u32 *buf0, MAYBE_UNUSED u32 *buf1, const u32 in_len) -DECLSPEC u32 rule_op_mangle_truncate_at (MAYBE_UNUSED const u32 p0, MAYBE_UNUSED const u32 p1, MAYBE_UNUSED u32 *buf0, MAYBE_UNUSED u32 *buf1, const u32 in_len) -DECLSPEC u32 search_on_register (const u32 in, const u32 p0) -DECLSPEC u32 replace_on_register (const u32 in, const u32 r, const u32 p1) -DECLSPEC u32 rule_op_mangle_replace (MAYBE_UNUSED const u32 p0, MAYBE_UNUSED const u32 p1, MAYBE_UNUSED u32 *buf0, MAYBE_UNUSED u32 *buf1, const u32 in_len) -DECLSPEC u32 rule_op_mangle_purgechar (MAYBE_UNUSED const u32 p0, MAYBE_UNUSED const u32 p1, MAYBE_UNUSED u32 *buf0, MAYBE_UNUSED u32 *buf1, const u32 in_len) -DECLSPEC u32 rule_op_mangle_dupechar_first (MAYBE_UNUSED const u32 p0, MAYBE_UNUSED const u32 p1, MAYBE_UNUSED u32 *buf0, MAYBE_UNUSED u32 *buf1, const u32 in_len) -DECLSPEC u32 rule_op_mangle_dupechar_last (MAYBE_UNUSED const u32 p0, MAYBE_UNUSED const u32 p1, MAYBE_UNUSED u32 *buf0, MAYBE_UNUSED u32 *buf1, const u32 in_len) -DECLSPEC u32 rule_op_mangle_dupechar_all (MAYBE_UNUSED const u32 p0, MAYBE_UNUSED const u32 p1, MAYBE_UNUSED u32 *buf0, MAYBE_UNUSED u32 *buf1, const u32 in_len) -DECLSPEC u32 rule_op_mangle_switch_first (MAYBE_UNUSED const u32 p0, MAYBE_UNUSED const u32 p1, MAYBE_UNUSED u32 *buf0, MAYBE_UNUSED u32 *buf1, const u32 in_len) -DECLSPEC u32 rule_op_mangle_switch_last (MAYBE_UNUSED const u32 p0, MAYBE_UNUSED const u32 p1, MAYBE_UNUSED u32 *buf0, MAYBE_UNUSED u32 *buf1, const u32 in_len) -DECLSPEC u32 rule_op_mangle_switch_at (MAYBE_UNUSED const u32 p0, MAYBE_UNUSED const u32 p1, MAYBE_UNUSED u32 *buf0, MAYBE_UNUSED u32 *buf1, const u32 in_len) -DECLSPEC u32 rule_op_mangle_chr_shiftl (MAYBE_UNUSED const u32 p0, MAYBE_UNUSED const u32 p1, MAYBE_UNUSED u32 *buf0, MAYBE_UNUSED u32 *buf1, const u32 in_len) -DECLSPEC u32 rule_op_mangle_chr_shiftr (MAYBE_UNUSED const u32 p0, MAYBE_UNUSED const u32 p1, MAYBE_UNUSED u32 *buf0, MAYBE_UNUSED u32 *buf1, const u32 in_len) -DECLSPEC u32 rule_op_mangle_chr_incr (MAYBE_UNUSED const u32 p0, MAYBE_UNUSED const u32 p1, MAYBE_UNUSED u32 *buf0, MAYBE_UNUSED u32 *buf1, const u32 in_len) -DECLSPEC u32 rule_op_mangle_chr_decr (MAYBE_UNUSED const u32 p0, MAYBE_UNUSED const u32 p1, MAYBE_UNUSED u32 *buf0, MAYBE_UNUSED u32 *buf1, const u32 in_len) -DECLSPEC u32 rule_op_mangle_replace_np1 (MAYBE_UNUSED const u32 p0, MAYBE_UNUSED const u32 p1, MAYBE_UNUSED u32 *buf0, MAYBE_UNUSED u32 *buf1, const u32 in_len) -DECLSPEC u32 rule_op_mangle_replace_nm1 (MAYBE_UNUSED const u32 p0, MAYBE_UNUSED const u32 p1, MAYBE_UNUSED u32 *buf0, MAYBE_UNUSED u32 *buf1, const u32 in_len) -DECLSPEC u32 rule_op_mangle_dupeblock_first (MAYBE_UNUSED const u32 p0, MAYBE_UNUSED const u32 p1, MAYBE_UNUSED u32 *buf0, MAYBE_UNUSED u32 *buf1, const u32 in_len) -DECLSPEC u32 rule_op_mangle_dupeblock_last (MAYBE_UNUSED const u32 p0, MAYBE_UNUSED const u32 p1, MAYBE_UNUSED u32 *buf0, MAYBE_UNUSED u32 *buf1, const u32 in_len) -DECLSPEC u32 toggle_on_register (const u32 in, const u32 r) -DECLSPEC u32 rule_op_mangle_title_sep (MAYBE_UNUSED const u32 p0, MAYBE_UNUSED const u32 p1, MAYBE_UNUSED u32 *buf0, MAYBE_UNUSED u32 *buf1, const u32 in_len) -DECLSPEC u32 apply_rule (const u32 name, const u32 p0, const u32 p1, u32 *buf0, u32 *buf1, const u32 in_len) -DECLSPEC u32 apply_rules (__constant const u32 *cmds, u32 *buf0, u32 *buf1, const u32 len) -DECLSPEC u32x apply_rules_vect (const u32 *pw_buf0, const u32 *pw_buf1, const u32 pw_len, __constant const kernel_rule_t *rules_buf, const u32 il_pos, u32x *buf0, u32x *buf1) +DECLSPEC u32 generate_cmask (const u32 value); +DECLSPEC void truncate_right (u32 *buf0, u32 *buf1, const u32 offset); +DECLSPEC void truncate_left (u32 *buf0, u32 *buf1, const u32 offset); +DECLSPEC void lshift_block (const u32 *in0, const u32 *in1, u32 *out0, u32 *out1); +DECLSPEC void rshift_block (const u32 *in0, const u32 *in1, u32 *out0, u32 *out1); +DECLSPEC void lshift_block_N (const u32 *in0, const u32 *in1, u32 *out0, u32 *out1, const u32 num); +DECLSPEC void rshift_block_N (const u32 *in0, const u32 *in1, u32 *out0, u32 *out1, const u32 num); +DECLSPEC void append_block1 (const u32 offset, u32 *buf0, u32 *buf1, const u32 src_r0); +DECLSPEC void append_block8 (const u32 offset, u32 *buf0, u32 *buf1, const u32 *src_l0, const u32 *src_l1, const u32 *src_r0, const u32 *src_r1); +DECLSPEC void reverse_block (u32 *in0, u32 *in1, u32 *out0, u32 *out1, const u32 len); +DECLSPEC void exchange_byte (u32 *buf, const int off_src, const int off_dst); +DECLSPEC u32 rule_op_mangle_lrest (MAYBE_UNUSED const u32 p0, MAYBE_UNUSED const u32 p1, MAYBE_UNUSED u32 *buf0, MAYBE_UNUSED u32 *buf1, const u32 in_len); +DECLSPEC u32 rule_op_mangle_urest (MAYBE_UNUSED const u32 p0, MAYBE_UNUSED const u32 p1, MAYBE_UNUSED u32 *buf0, MAYBE_UNUSED u32 *buf1, const u32 in_len); +DECLSPEC u32 rule_op_mangle_lrest_ufirst (MAYBE_UNUSED const u32 p0, MAYBE_UNUSED const u32 p1, MAYBE_UNUSED u32 *buf0, MAYBE_UNUSED u32 *buf1, const u32 in_len); +DECLSPEC u32 rule_op_mangle_urest_lfirst (MAYBE_UNUSED const u32 p0, MAYBE_UNUSED const u32 p1, MAYBE_UNUSED u32 *buf0, MAYBE_UNUSED u32 *buf1, const u32 in_len); +DECLSPEC u32 rule_op_mangle_trest (MAYBE_UNUSED const u32 p0, MAYBE_UNUSED const u32 p1, MAYBE_UNUSED u32 *buf0, MAYBE_UNUSED u32 *buf1, const u32 in_len); +DECLSPEC u32 rule_op_mangle_toggle_at (MAYBE_UNUSED const u32 p0, MAYBE_UNUSED const u32 p1, MAYBE_UNUSED u32 *buf0, MAYBE_UNUSED u32 *buf1, const u32 in_len); +DECLSPEC u32 rule_op_mangle_reverse (MAYBE_UNUSED const u32 p0, MAYBE_UNUSED const u32 p1, MAYBE_UNUSED u32 *buf0, MAYBE_UNUSED u32 *buf1, const u32 in_len); +DECLSPEC u32 rule_op_mangle_dupeword (MAYBE_UNUSED const u32 p0, MAYBE_UNUSED const u32 p1, MAYBE_UNUSED u32 *buf0, MAYBE_UNUSED u32 *buf1, const u32 in_len); +DECLSPEC u32 rule_op_mangle_dupeword_times (MAYBE_UNUSED const u32 p0, MAYBE_UNUSED const u32 p1, MAYBE_UNUSED u32 *buf0, MAYBE_UNUSED u32 *buf1, const u32 in_len); +DECLSPEC u32 rule_op_mangle_reflect (MAYBE_UNUSED const u32 p0, MAYBE_UNUSED const u32 p1, MAYBE_UNUSED u32 *buf0, MAYBE_UNUSED u32 *buf1, const u32 in_len); +DECLSPEC u32 rule_op_mangle_append (MAYBE_UNUSED const u32 p0, MAYBE_UNUSED const u32 p1, MAYBE_UNUSED u32 *buf0, MAYBE_UNUSED u32 *buf1, const u32 in_len); +DECLSPEC u32 rule_op_mangle_prepend (MAYBE_UNUSED const u32 p0, MAYBE_UNUSED const u32 p1, MAYBE_UNUSED u32 *buf0, MAYBE_UNUSED u32 *buf1, const u32 in_len); +DECLSPEC u32 rule_op_mangle_rotate_left (MAYBE_UNUSED const u32 p0, MAYBE_UNUSED const u32 p1, MAYBE_UNUSED u32 *buf0, MAYBE_UNUSED u32 *buf1, const u32 in_len); +DECLSPEC u32 rule_op_mangle_rotate_right (MAYBE_UNUSED const u32 p0, MAYBE_UNUSED const u32 p1, MAYBE_UNUSED u32 *buf0, MAYBE_UNUSED u32 *buf1, const u32 in_len); +DECLSPEC u32 rule_op_mangle_delete_first (MAYBE_UNUSED const u32 p0, MAYBE_UNUSED const u32 p1, MAYBE_UNUSED u32 *buf0, MAYBE_UNUSED u32 *buf1, const u32 in_len); +DECLSPEC u32 rule_op_mangle_delete_last (MAYBE_UNUSED const u32 p0, MAYBE_UNUSED const u32 p1, MAYBE_UNUSED u32 *buf0, MAYBE_UNUSED u32 *buf1, const u32 in_len); +DECLSPEC u32 rule_op_mangle_delete_at (MAYBE_UNUSED const u32 p0, MAYBE_UNUSED const u32 p1, MAYBE_UNUSED u32 *buf0, MAYBE_UNUSED u32 *buf1, const u32 in_len); +DECLSPEC u32 rule_op_mangle_extract (MAYBE_UNUSED const u32 p0, MAYBE_UNUSED const u32 p1, MAYBE_UNUSED u32 *buf0, MAYBE_UNUSED u32 *buf1, const u32 in_len); +DECLSPEC u32 rule_op_mangle_omit (MAYBE_UNUSED const u32 p0, MAYBE_UNUSED const u32 p1, MAYBE_UNUSED u32 *buf0, MAYBE_UNUSED u32 *buf1, const u32 in_len); +DECLSPEC u32 rule_op_mangle_insert (MAYBE_UNUSED const u32 p0, MAYBE_UNUSED const u32 p1, MAYBE_UNUSED u32 *buf0, MAYBE_UNUSED u32 *buf1, const u32 in_len); +DECLSPEC u32 rule_op_mangle_overstrike (MAYBE_UNUSED const u32 p0, MAYBE_UNUSED const u32 p1, MAYBE_UNUSED u32 *buf0, MAYBE_UNUSED u32 *buf1, const u32 in_len); +DECLSPEC u32 rule_op_mangle_truncate_at (MAYBE_UNUSED const u32 p0, MAYBE_UNUSED const u32 p1, MAYBE_UNUSED u32 *buf0, MAYBE_UNUSED u32 *buf1, const u32 in_len); +DECLSPEC u32 search_on_register (const u32 in, const u32 p0); +DECLSPEC u32 replace_on_register (const u32 in, const u32 r, const u32 p1); +DECLSPEC u32 rule_op_mangle_replace (MAYBE_UNUSED const u32 p0, MAYBE_UNUSED const u32 p1, MAYBE_UNUSED u32 *buf0, MAYBE_UNUSED u32 *buf1, const u32 in_len); +DECLSPEC u32 rule_op_mangle_purgechar (MAYBE_UNUSED const u32 p0, MAYBE_UNUSED const u32 p1, MAYBE_UNUSED u32 *buf0, MAYBE_UNUSED u32 *buf1, const u32 in_len); +DECLSPEC u32 rule_op_mangle_dupechar_first (MAYBE_UNUSED const u32 p0, MAYBE_UNUSED const u32 p1, MAYBE_UNUSED u32 *buf0, MAYBE_UNUSED u32 *buf1, const u32 in_len); +DECLSPEC u32 rule_op_mangle_dupechar_last (MAYBE_UNUSED const u32 p0, MAYBE_UNUSED const u32 p1, MAYBE_UNUSED u32 *buf0, MAYBE_UNUSED u32 *buf1, const u32 in_len); +DECLSPEC u32 rule_op_mangle_dupechar_all (MAYBE_UNUSED const u32 p0, MAYBE_UNUSED const u32 p1, MAYBE_UNUSED u32 *buf0, MAYBE_UNUSED u32 *buf1, const u32 in_len); +DECLSPEC u32 rule_op_mangle_switch_first (MAYBE_UNUSED const u32 p0, MAYBE_UNUSED const u32 p1, MAYBE_UNUSED u32 *buf0, MAYBE_UNUSED u32 *buf1, const u32 in_len); +DECLSPEC u32 rule_op_mangle_switch_last (MAYBE_UNUSED const u32 p0, MAYBE_UNUSED const u32 p1, MAYBE_UNUSED u32 *buf0, MAYBE_UNUSED u32 *buf1, const u32 in_len); +DECLSPEC u32 rule_op_mangle_switch_at (MAYBE_UNUSED const u32 p0, MAYBE_UNUSED const u32 p1, MAYBE_UNUSED u32 *buf0, MAYBE_UNUSED u32 *buf1, const u32 in_len); +DECLSPEC u32 rule_op_mangle_chr_shiftl (MAYBE_UNUSED const u32 p0, MAYBE_UNUSED const u32 p1, MAYBE_UNUSED u32 *buf0, MAYBE_UNUSED u32 *buf1, const u32 in_len); +DECLSPEC u32 rule_op_mangle_chr_shiftr (MAYBE_UNUSED const u32 p0, MAYBE_UNUSED const u32 p1, MAYBE_UNUSED u32 *buf0, MAYBE_UNUSED u32 *buf1, const u32 in_len); +DECLSPEC u32 rule_op_mangle_chr_incr (MAYBE_UNUSED const u32 p0, MAYBE_UNUSED const u32 p1, MAYBE_UNUSED u32 *buf0, MAYBE_UNUSED u32 *buf1, const u32 in_len); +DECLSPEC u32 rule_op_mangle_chr_decr (MAYBE_UNUSED const u32 p0, MAYBE_UNUSED const u32 p1, MAYBE_UNUSED u32 *buf0, MAYBE_UNUSED u32 *buf1, const u32 in_len); +DECLSPEC u32 rule_op_mangle_replace_np1 (MAYBE_UNUSED const u32 p0, MAYBE_UNUSED const u32 p1, MAYBE_UNUSED u32 *buf0, MAYBE_UNUSED u32 *buf1, const u32 in_len); +DECLSPEC u32 rule_op_mangle_replace_nm1 (MAYBE_UNUSED const u32 p0, MAYBE_UNUSED const u32 p1, MAYBE_UNUSED u32 *buf0, MAYBE_UNUSED u32 *buf1, const u32 in_len); +DECLSPEC u32 rule_op_mangle_dupeblock_first (MAYBE_UNUSED const u32 p0, MAYBE_UNUSED const u32 p1, MAYBE_UNUSED u32 *buf0, MAYBE_UNUSED u32 *buf1, const u32 in_len); +DECLSPEC u32 rule_op_mangle_dupeblock_last (MAYBE_UNUSED const u32 p0, MAYBE_UNUSED const u32 p1, MAYBE_UNUSED u32 *buf0, MAYBE_UNUSED u32 *buf1, const u32 in_len); +DECLSPEC u32 toggle_on_register (const u32 in, const u32 r); +DECLSPEC u32 rule_op_mangle_title_sep (MAYBE_UNUSED const u32 p0, MAYBE_UNUSED const u32 p1, MAYBE_UNUSED u32 *buf0, MAYBE_UNUSED u32 *buf1, const u32 in_len); +DECLSPEC u32 apply_rule (const u32 name, const u32 p0, const u32 p1, u32 *buf0, u32 *buf1, const u32 in_len); +DECLSPEC u32 apply_rules (CONSTANT_AS const u32 *cmds, u32 *buf0, u32 *buf1, const u32 len); +DECLSPEC u32x apply_rules_vect (const u32 *pw_buf0, const u32 *pw_buf1, const u32 pw_len, CONSTANT_AS const kernel_rule_t *rules_buf, const u32 il_pos, u32x *buf0, u32x *buf1); diff --git a/OpenCL/inc_simd.cl b/OpenCL/inc_simd.cl index 43a57c5a3..a085c5508 100644 --- a/OpenCL/inc_simd.cl +++ b/OpenCL/inc_simd.cl @@ -1048,7 +1048,7 @@ // attack-mode 0 -DECLSPEC u32x ix_create_bft (__global const bf_t *bfs_buf, const u32 il_pos) +DECLSPEC u32x ix_create_bft (GLOBAL_AS const bf_t *bfs_buf, const u32 il_pos) { #if VECT_SIZE == 1 const u32x ix = (u32x) (bfs_buf[il_pos + 0].i); @@ -1067,7 +1067,7 @@ DECLSPEC u32x ix_create_bft (__global const bf_t *bfs_buf, const u32 il_pos) // attack-mode 1 -DECLSPEC u32x pwlenx_create_combt (__global const pw_t *combs_buf, const u32 il_pos) +DECLSPEC u32x pwlenx_create_combt (GLOBAL_AS const pw_t *combs_buf, const u32 il_pos) { #if VECT_SIZE == 1 const u32x pw_lenx = (u32x) (combs_buf[il_pos + 0].pw_len); @@ -1084,7 +1084,7 @@ DECLSPEC u32x pwlenx_create_combt (__global const pw_t *combs_buf, const u32 il_ return pw_lenx; } -DECLSPEC u32x ix_create_combt (__global const pw_t *combs_buf, const u32 il_pos, const int idx) +DECLSPEC u32x ix_create_combt (GLOBAL_AS const pw_t *combs_buf, const u32 il_pos, const int idx) { #if VECT_SIZE == 1 const u32x ix = (u32x) (combs_buf[il_pos + 0].i[idx]); diff --git a/OpenCL/inc_simd.h b/OpenCL/inc_simd.h index fc92c5bc1..bb688841b 100644 --- a/OpenCL/inc_simd.h +++ b/OpenCL/inc_simd.h @@ -1,3 +1,3 @@ -DECLSPEC u32x ix_create_bft (__global const bf_t *bfs_buf, const u32 il_pos) -DECLSPEC u32x pwlenx_create_combt (__global const pw_t *combs_buf, const u32 il_pos) -DECLSPEC u32x ix_create_combt (__global const pw_t *combs_buf, const u32 il_pos, const int idx) +DECLSPEC u32x ix_create_bft (GLOBAL_AS const bf_t *bfs_buf, const u32 il_pos); +DECLSPEC u32x pwlenx_create_combt (GLOBAL_AS const pw_t *combs_buf, const u32 il_pos); +DECLSPEC u32x ix_create_combt (GLOBAL_AS const pw_t *combs_buf, const u32 il_pos, const int idx); diff --git a/OpenCL/inc_truecrypt_crc32.cl b/OpenCL/inc_truecrypt_crc32.cl index ccec03d16..7f8eb2039 100644 --- a/OpenCL/inc_truecrypt_crc32.cl +++ b/OpenCL/inc_truecrypt_crc32.cl @@ -1,4 +1,4 @@ -__constant u32a crc32tab[0x100] = +CONSTANT_AS u32a crc32tab[0x100] = { 0x00000000, 0x77073096, 0xee0e612c, 0x990951ba, 0x076dc419, 0x706af48f, 0xe963a535, 0x9e6495a3, diff --git a/OpenCL/inc_truecrypt_crc32.h b/OpenCL/inc_truecrypt_crc32.h index 3e36315b5..46b47198b 100644 --- a/OpenCL/inc_truecrypt_crc32.h +++ b/OpenCL/inc_truecrypt_crc32.h @@ -1,2 +1,2 @@ -DECLSPEC u32 round_crc32 (u32 a, const u32 v) -DECLSPEC u32 round_crc32_4 (const u32 w, const u32 iv) +DECLSPEC u32 round_crc32 (u32 a, const u32 v); +DECLSPEC u32 round_crc32_4 (const u32 w, const u32 iv); diff --git a/OpenCL/inc_truecrypt_keyfile.h b/OpenCL/inc_truecrypt_keyfile.h index 3fae01126..a9bcb7d51 100644 --- a/OpenCL/inc_truecrypt_keyfile.h +++ b/OpenCL/inc_truecrypt_keyfile.h @@ -1 +1 @@ -DECLSPEC u32 u8add (const u32 a, const u32 b) +DECLSPEC u32 u8add (const u32 a, const u32 b); diff --git a/OpenCL/inc_truecrypt_xts.cl b/OpenCL/inc_truecrypt_xts.cl index 2ec644eeb..9cc6a5332 100644 --- a/OpenCL/inc_truecrypt_xts.cl +++ b/OpenCL/inc_truecrypt_xts.cl @@ -150,7 +150,7 @@ DECLSPEC void twofish256_decrypt_xts_next (const u32 *in, u32 *out, u32 *T, u32 // 512 bit -DECLSPEC int verify_header_aes (__global const u32 *data_buf, const u32 signature, const u32 *ukey1, const u32 *ukey2, SHM_TYPE u32 *s_te0, SHM_TYPE u32 *s_te1, SHM_TYPE u32 *s_te2, SHM_TYPE u32 *s_te3, SHM_TYPE u32 *s_te4, SHM_TYPE u32 *s_td0, SHM_TYPE u32 *s_td1, SHM_TYPE u32 *s_td2, SHM_TYPE u32 *s_td3, SHM_TYPE u32 *s_td4) +DECLSPEC int verify_header_aes (GLOBAL_AS const u32 *data_buf, const u32 signature, const u32 *ukey1, const u32 *ukey2, SHM_TYPE u32 *s_te0, SHM_TYPE u32 *s_te1, SHM_TYPE u32 *s_te2, SHM_TYPE u32 *s_te3, SHM_TYPE u32 *s_te4, SHM_TYPE u32 *s_td0, SHM_TYPE u32 *s_td1, SHM_TYPE u32 *s_td2, SHM_TYPE u32 *s_td3, SHM_TYPE u32 *s_td4) { u32 ks_aes[60]; @@ -204,7 +204,7 @@ DECLSPEC int verify_header_aes (__global const u32 *data_buf, const u32 signatur return 1; } -DECLSPEC int verify_header_serpent (__global const u32 *data_buf, const u32 signature, const u32 *ukey1, const u32 *ukey2) +DECLSPEC int verify_header_serpent (GLOBAL_AS const u32 *data_buf, const u32 signature, const u32 *ukey1, const u32 *ukey2) { u32 ks_serpent[140]; @@ -258,7 +258,7 @@ DECLSPEC int verify_header_serpent (__global const u32 *data_buf, const u32 sign return 1; } -DECLSPEC int verify_header_twofish (__global const u32 *data_buf, const u32 signature, const u32 *ukey1, const u32 *ukey2) +DECLSPEC int verify_header_twofish (GLOBAL_AS const u32 *data_buf, const u32 signature, const u32 *ukey1, const u32 *ukey2) { u32 sk_twofish[4]; u32 lk_twofish[40]; @@ -315,7 +315,7 @@ DECLSPEC int verify_header_twofish (__global const u32 *data_buf, const u32 sign // 1024 bit -DECLSPEC int verify_header_aes_twofish (__global const u32 *data_buf, const u32 signature, const u32 *ukey1, const u32 *ukey2, const u32 *ukey3, const u32 *ukey4, SHM_TYPE u32 *s_te0, SHM_TYPE u32 *s_te1, SHM_TYPE u32 *s_te2, SHM_TYPE u32 *s_te3, SHM_TYPE u32 *s_te4, SHM_TYPE u32 *s_td0, SHM_TYPE u32 *s_td1, SHM_TYPE u32 *s_td2, SHM_TYPE u32 *s_td3, SHM_TYPE u32 *s_td4) +DECLSPEC int verify_header_aes_twofish (GLOBAL_AS const u32 *data_buf, const u32 signature, const u32 *ukey1, const u32 *ukey2, const u32 *ukey3, const u32 *ukey4, SHM_TYPE u32 *s_te0, SHM_TYPE u32 *s_te1, SHM_TYPE u32 *s_te2, SHM_TYPE u32 *s_te3, SHM_TYPE u32 *s_te4, SHM_TYPE u32 *s_td0, SHM_TYPE u32 *s_td1, SHM_TYPE u32 *s_td2, SHM_TYPE u32 *s_td3, SHM_TYPE u32 *s_td4) { u32 ks_aes[60]; @@ -376,7 +376,7 @@ DECLSPEC int verify_header_aes_twofish (__global const u32 *data_buf, const u32 return 1; } -DECLSPEC int verify_header_serpent_aes (__global const u32 *data_buf, const u32 signature, const u32 *ukey1, const u32 *ukey2, const u32 *ukey3, const u32 *ukey4, SHM_TYPE u32 *s_te0, SHM_TYPE u32 *s_te1, SHM_TYPE u32 *s_te2, SHM_TYPE u32 *s_te3, SHM_TYPE u32 *s_te4, SHM_TYPE u32 *s_td0, SHM_TYPE u32 *s_td1, SHM_TYPE u32 *s_td2, SHM_TYPE u32 *s_td3, SHM_TYPE u32 *s_td4) +DECLSPEC int verify_header_serpent_aes (GLOBAL_AS const u32 *data_buf, const u32 signature, const u32 *ukey1, const u32 *ukey2, const u32 *ukey3, const u32 *ukey4, SHM_TYPE u32 *s_te0, SHM_TYPE u32 *s_te1, SHM_TYPE u32 *s_te2, SHM_TYPE u32 *s_te3, SHM_TYPE u32 *s_te4, SHM_TYPE u32 *s_td0, SHM_TYPE u32 *s_td1, SHM_TYPE u32 *s_td2, SHM_TYPE u32 *s_td3, SHM_TYPE u32 *s_td4) { u32 ks_serpent[140]; u32 ks_aes[60]; @@ -435,7 +435,7 @@ DECLSPEC int verify_header_serpent_aes (__global const u32 *data_buf, const u32 return 1; } -DECLSPEC int verify_header_twofish_serpent (__global const u32 *data_buf, const u32 signature, const u32 *ukey1, const u32 *ukey2, const u32 *ukey3, const u32 *ukey4) +DECLSPEC int verify_header_twofish_serpent (GLOBAL_AS const u32 *data_buf, const u32 signature, const u32 *ukey1, const u32 *ukey2, const u32 *ukey3, const u32 *ukey4) { u32 sk_twofish[4]; u32 lk_twofish[40]; @@ -498,7 +498,7 @@ DECLSPEC int verify_header_twofish_serpent (__global const u32 *data_buf, const // 1536 bit -DECLSPEC int verify_header_aes_twofish_serpent (__global const u32 *data_buf, const u32 signature, const u32 *ukey1, const u32 *ukey2, const u32 *ukey3, const u32 *ukey4, const u32 *ukey5, const u32 *ukey6, SHM_TYPE u32 *s_te0, SHM_TYPE u32 *s_te1, SHM_TYPE u32 *s_te2, SHM_TYPE u32 *s_te3, SHM_TYPE u32 *s_te4, SHM_TYPE u32 *s_td0, SHM_TYPE u32 *s_td1, SHM_TYPE u32 *s_td2, SHM_TYPE u32 *s_td3, SHM_TYPE u32 *s_td4) +DECLSPEC int verify_header_aes_twofish_serpent (GLOBAL_AS const u32 *data_buf, const u32 signature, const u32 *ukey1, const u32 *ukey2, const u32 *ukey3, const u32 *ukey4, const u32 *ukey5, const u32 *ukey6, SHM_TYPE u32 *s_te0, SHM_TYPE u32 *s_te1, SHM_TYPE u32 *s_te2, SHM_TYPE u32 *s_te3, SHM_TYPE u32 *s_te4, SHM_TYPE u32 *s_td0, SHM_TYPE u32 *s_td1, SHM_TYPE u32 *s_td2, SHM_TYPE u32 *s_td3, SHM_TYPE u32 *s_td4) { u32 ks_aes[60]; @@ -565,7 +565,7 @@ DECLSPEC int verify_header_aes_twofish_serpent (__global const u32 *data_buf, co return 1; } -DECLSPEC int verify_header_serpent_twofish_aes (__global const u32 *data_buf, const u32 signature, const u32 *ukey1, const u32 *ukey2, const u32 *ukey3, const u32 *ukey4, const u32 *ukey5, const u32 *ukey6, SHM_TYPE u32 *s_te0, SHM_TYPE u32 *s_te1, SHM_TYPE u32 *s_te2, SHM_TYPE u32 *s_te3, SHM_TYPE u32 *s_te4, SHM_TYPE u32 *s_td0, SHM_TYPE u32 *s_td1, SHM_TYPE u32 *s_td2, SHM_TYPE u32 *s_td3, SHM_TYPE u32 *s_td4) +DECLSPEC int verify_header_serpent_twofish_aes (GLOBAL_AS const u32 *data_buf, const u32 signature, const u32 *ukey1, const u32 *ukey2, const u32 *ukey3, const u32 *ukey4, const u32 *ukey5, const u32 *ukey6, SHM_TYPE u32 *s_te0, SHM_TYPE u32 *s_te1, SHM_TYPE u32 *s_te2, SHM_TYPE u32 *s_te3, SHM_TYPE u32 *s_te4, SHM_TYPE u32 *s_td0, SHM_TYPE u32 *s_td1, SHM_TYPE u32 *s_td2, SHM_TYPE u32 *s_td3, SHM_TYPE u32 *s_td4) { u32 ks_serpent[140]; diff --git a/OpenCL/inc_truecrypt_xts.h b/OpenCL/inc_truecrypt_xts.h index 5f0e867ee..3e943d5aa 100644 --- a/OpenCL/inc_truecrypt_xts.h +++ b/OpenCL/inc_truecrypt_xts.h @@ -1,15 +1,15 @@ -DECLSPEC void xts_mul2 (u32 *in, u32 *out) -DECLSPEC void aes256_decrypt_xts_first (const u32 *ukey1, const u32 *ukey2, const u32 *in, u32 *out, u32 *S, u32 *T, u32 *ks, SHM_TYPE u32 *s_te0, SHM_TYPE u32 *s_te1, SHM_TYPE u32 *s_te2, SHM_TYPE u32 *s_te3, SHM_TYPE u32 *s_te4, SHM_TYPE u32 *s_td0, SHM_TYPE u32 *s_td1, SHM_TYPE u32 *s_td2, SHM_TYPE u32 *s_td3, SHM_TYPE u32 *s_td4) -DECLSPEC void aes256_decrypt_xts_next (const u32 *in, u32 *out, u32 *T, u32 *ks, SHM_TYPE u32 *s_td0, SHM_TYPE u32 *s_td1, SHM_TYPE u32 *s_td2, SHM_TYPE u32 *s_td3, SHM_TYPE u32 *s_td4) -DECLSPEC void serpent256_decrypt_xts_first (const u32 *ukey1, const u32 *ukey2, const u32 *in, u32 *out, u32 *S, u32 *T, u32 *ks) -DECLSPEC void serpent256_decrypt_xts_next (const u32 *in, u32 *out, u32 *T, u32 *ks) -DECLSPEC void twofish256_decrypt_xts_first (const u32 *ukey1, const u32 *ukey2, const u32 *in, u32 *out, u32 *S, u32 *T, u32 *sk, u32 *lk) -DECLSPEC void twofish256_decrypt_xts_next (const u32 *in, u32 *out, u32 *T, u32 *sk, u32 *lk) -DECLSPEC int verify_header_aes (__global const u32 *data_buf, const u32 signature, const u32 *ukey1, const u32 *ukey2, SHM_TYPE u32 *s_te0, SHM_TYPE u32 *s_te1, SHM_TYPE u32 *s_te2, SHM_TYPE u32 *s_te3, SHM_TYPE u32 *s_te4, SHM_TYPE u32 *s_td0, SHM_TYPE u32 *s_td1, SHM_TYPE u32 *s_td2, SHM_TYPE u32 *s_td3, SHM_TYPE u32 *s_td4) -DECLSPEC int verify_header_serpent (__global const u32 *data_buf, const u32 signature, const u32 *ukey1, const u32 *ukey2) -DECLSPEC int verify_header_twofish (__global const u32 *data_buf, const u32 signature, const u32 *ukey1, const u32 *ukey2) -DECLSPEC int verify_header_aes_twofish (__global const u32 *data_buf, const u32 signature, const u32 *ukey1, const u32 *ukey2, const u32 *ukey3, const u32 *ukey4, SHM_TYPE u32 *s_te0, SHM_TYPE u32 *s_te1, SHM_TYPE u32 *s_te2, SHM_TYPE u32 *s_te3, SHM_TYPE u32 *s_te4, SHM_TYPE u32 *s_td0, SHM_TYPE u32 *s_td1, SHM_TYPE u32 *s_td2, SHM_TYPE u32 *s_td3, SHM_TYPE u32 *s_td4) -DECLSPEC int verify_header_serpent_aes (__global const u32 *data_buf, const u32 signature, const u32 *ukey1, const u32 *ukey2, const u32 *ukey3, const u32 *ukey4, SHM_TYPE u32 *s_te0, SHM_TYPE u32 *s_te1, SHM_TYPE u32 *s_te2, SHM_TYPE u32 *s_te3, SHM_TYPE u32 *s_te4, SHM_TYPE u32 *s_td0, SHM_TYPE u32 *s_td1, SHM_TYPE u32 *s_td2, SHM_TYPE u32 *s_td3, SHM_TYPE u32 *s_td4) -DECLSPEC int verify_header_twofish_serpent (__global const u32 *data_buf, const u32 signature, const u32 *ukey1, const u32 *ukey2, const u32 *ukey3, const u32 *ukey4) -DECLSPEC int verify_header_aes_twofish_serpent (__global const u32 *data_buf, const u32 signature, const u32 *ukey1, const u32 *ukey2, const u32 *ukey3, const u32 *ukey4, const u32 *ukey5, const u32 *ukey6, SHM_TYPE u32 *s_te0, SHM_TYPE u32 *s_te1, SHM_TYPE u32 *s_te2, SHM_TYPE u32 *s_te3, SHM_TYPE u32 *s_te4, SHM_TYPE u32 *s_td0, SHM_TYPE u32 *s_td1, SHM_TYPE u32 *s_td2, SHM_TYPE u32 *s_td3, SHM_TYPE u32 *s_td4) -DECLSPEC int verify_header_serpent_twofish_aes (__global const u32 *data_buf, const u32 signature, const u32 *ukey1, const u32 *ukey2, const u32 *ukey3, const u32 *ukey4, const u32 *ukey5, const u32 *ukey6, SHM_TYPE u32 *s_te0, SHM_TYPE u32 *s_te1, SHM_TYPE u32 *s_te2, SHM_TYPE u32 *s_te3, SHM_TYPE u32 *s_te4, SHM_TYPE u32 *s_td0, SHM_TYPE u32 *s_td1, SHM_TYPE u32 *s_td2, SHM_TYPE u32 *s_td3, SHM_TYPE u32 *s_td4) +DECLSPEC void xts_mul2 (u32 *in, u32 *out); +DECLSPEC void aes256_decrypt_xts_first (const u32 *ukey1, const u32 *ukey2, const u32 *in, u32 *out, u32 *S, u32 *T, u32 *ks, SHM_TYPE u32 *s_te0, SHM_TYPE u32 *s_te1, SHM_TYPE u32 *s_te2, SHM_TYPE u32 *s_te3, SHM_TYPE u32 *s_te4, SHM_TYPE u32 *s_td0, SHM_TYPE u32 *s_td1, SHM_TYPE u32 *s_td2, SHM_TYPE u32 *s_td3, SHM_TYPE u32 *s_td4); +DECLSPEC void aes256_decrypt_xts_next (const u32 *in, u32 *out, u32 *T, u32 *ks, SHM_TYPE u32 *s_td0, SHM_TYPE u32 *s_td1, SHM_TYPE u32 *s_td2, SHM_TYPE u32 *s_td3, SHM_TYPE u32 *s_td4); +DECLSPEC void serpent256_decrypt_xts_first (const u32 *ukey1, const u32 *ukey2, const u32 *in, u32 *out, u32 *S, u32 *T, u32 *ks); +DECLSPEC void serpent256_decrypt_xts_next (const u32 *in, u32 *out, u32 *T, u32 *ks); +DECLSPEC void twofish256_decrypt_xts_first (const u32 *ukey1, const u32 *ukey2, const u32 *in, u32 *out, u32 *S, u32 *T, u32 *sk, u32 *lk); +DECLSPEC void twofish256_decrypt_xts_next (const u32 *in, u32 *out, u32 *T, u32 *sk, u32 *lk); +DECLSPEC int verify_header_aes (GLOBAL_AS const u32 *data_buf, const u32 signature, const u32 *ukey1, const u32 *ukey2, SHM_TYPE u32 *s_te0, SHM_TYPE u32 *s_te1, SHM_TYPE u32 *s_te2, SHM_TYPE u32 *s_te3, SHM_TYPE u32 *s_te4, SHM_TYPE u32 *s_td0, SHM_TYPE u32 *s_td1, SHM_TYPE u32 *s_td2, SHM_TYPE u32 *s_td3, SHM_TYPE u32 *s_td4); +DECLSPEC int verify_header_serpent (GLOBAL_AS const u32 *data_buf, const u32 signature, const u32 *ukey1, const u32 *ukey2); +DECLSPEC int verify_header_twofish (GLOBAL_AS const u32 *data_buf, const u32 signature, const u32 *ukey1, const u32 *ukey2); +DECLSPEC int verify_header_aes_twofish (GLOBAL_AS const u32 *data_buf, const u32 signature, const u32 *ukey1, const u32 *ukey2, const u32 *ukey3, const u32 *ukey4, SHM_TYPE u32 *s_te0, SHM_TYPE u32 *s_te1, SHM_TYPE u32 *s_te2, SHM_TYPE u32 *s_te3, SHM_TYPE u32 *s_te4, SHM_TYPE u32 *s_td0, SHM_TYPE u32 *s_td1, SHM_TYPE u32 *s_td2, SHM_TYPE u32 *s_td3, SHM_TYPE u32 *s_td4); +DECLSPEC int verify_header_serpent_aes (GLOBAL_AS const u32 *data_buf, const u32 signature, const u32 *ukey1, const u32 *ukey2, const u32 *ukey3, const u32 *ukey4, SHM_TYPE u32 *s_te0, SHM_TYPE u32 *s_te1, SHM_TYPE u32 *s_te2, SHM_TYPE u32 *s_te3, SHM_TYPE u32 *s_te4, SHM_TYPE u32 *s_td0, SHM_TYPE u32 *s_td1, SHM_TYPE u32 *s_td2, SHM_TYPE u32 *s_td3, SHM_TYPE u32 *s_td4); +DECLSPEC int verify_header_twofish_serpent (GLOBAL_AS const u32 *data_buf, const u32 signature, const u32 *ukey1, const u32 *ukey2, const u32 *ukey3, const u32 *ukey4); +DECLSPEC int verify_header_aes_twofish_serpent (GLOBAL_AS const u32 *data_buf, const u32 signature, const u32 *ukey1, const u32 *ukey2, const u32 *ukey3, const u32 *ukey4, const u32 *ukey5, const u32 *ukey6, SHM_TYPE u32 *s_te0, SHM_TYPE u32 *s_te1, SHM_TYPE u32 *s_te2, SHM_TYPE u32 *s_te3, SHM_TYPE u32 *s_te4, SHM_TYPE u32 *s_td0, SHM_TYPE u32 *s_td1, SHM_TYPE u32 *s_td2, SHM_TYPE u32 *s_td3, SHM_TYPE u32 *s_td4); +DECLSPEC int verify_header_serpent_twofish_aes (GLOBAL_AS const u32 *data_buf, const u32 signature, const u32 *ukey1, const u32 *ukey2, const u32 *ukey3, const u32 *ukey4, const u32 *ukey5, const u32 *ukey6, SHM_TYPE u32 *s_te0, SHM_TYPE u32 *s_te1, SHM_TYPE u32 *s_te2, SHM_TYPE u32 *s_te3, SHM_TYPE u32 *s_te4, SHM_TYPE u32 *s_td0, SHM_TYPE u32 *s_td1, SHM_TYPE u32 *s_td2, SHM_TYPE u32 *s_td3, SHM_TYPE u32 *s_td4); diff --git a/OpenCL/inc_vendor.h b/OpenCL/inc_vendor.h index 8fc58a19f..1270de21c 100644 --- a/OpenCL/inc_vendor.h +++ b/OpenCL/inc_vendor.h @@ -3,6 +3,18 @@ * License.....: MIT */ +#ifdef _CPU_OPENCL_EMU_H +#define CONSTANT_AS +#define GLOBAL_AS +#define LOCAL_AS +#define KERNEL_FQ +#else +#define CONSTANT_AS __constant +#define GLOBAL_AS __global +#define LOCAL_AS __local +#define KERNEL_FQ __kernel +#endif + /** * device type */ @@ -54,9 +66,9 @@ #endif #ifdef REAL_SHM -#define SHM_TYPE __local +#define SHM_TYPE LOCAL_AS #else -#define SHM_TYPE __constant +#define SHM_TYPE CONSTANT_AS #endif /** diff --git a/OpenCL/inc_veracrypt_xts.cl b/OpenCL/inc_veracrypt_xts.cl index 512ac110f..21dd6a849 100644 --- a/OpenCL/inc_veracrypt_xts.cl +++ b/OpenCL/inc_veracrypt_xts.cl @@ -92,7 +92,7 @@ DECLSPEC void kuznyechik_decrypt_xts_next (const u32 *in, u32 *out, u32 *T, u32 // 512 bit -DECLSPEC int verify_header_camellia (__global const u32 *data_buf, const u32 signature, const u32 *ukey1, const u32 *ukey2) +DECLSPEC int verify_header_camellia (GLOBAL_AS const u32 *data_buf, const u32 signature, const u32 *ukey1, const u32 *ukey2) { u32 ks_camellia[68]; @@ -146,7 +146,7 @@ DECLSPEC int verify_header_camellia (__global const u32 *data_buf, const u32 sig return 1; } -DECLSPEC int verify_header_kuznyechik (__global const u32 *data_buf, const u32 signature, const u32 *ukey1, const u32 *ukey2) +DECLSPEC int verify_header_kuznyechik (GLOBAL_AS const u32 *data_buf, const u32 signature, const u32 *ukey1, const u32 *ukey2) { u32 ks_kuznyechik[40]; @@ -202,7 +202,7 @@ DECLSPEC int verify_header_kuznyechik (__global const u32 *data_buf, const u32 s // 1024 bit -DECLSPEC int verify_header_camellia_kuznyechik (__global const u32 *data_buf, const u32 signature, const u32 *ukey1, const u32 *ukey2, const u32 *ukey3, const u32 *ukey4) +DECLSPEC int verify_header_camellia_kuznyechik (GLOBAL_AS const u32 *data_buf, const u32 signature, const u32 *ukey1, const u32 *ukey2, const u32 *ukey3, const u32 *ukey4) { u32 ks_camellia[68]; u32 ks_kuznyechik[40]; @@ -261,7 +261,7 @@ DECLSPEC int verify_header_camellia_kuznyechik (__global const u32 *data_buf, co return 1; } -DECLSPEC int verify_header_camellia_serpent (__global const u32 *data_buf, const u32 signature, const u32 *ukey1, const u32 *ukey2, const u32 *ukey3, const u32 *ukey4) +DECLSPEC int verify_header_camellia_serpent (GLOBAL_AS const u32 *data_buf, const u32 signature, const u32 *ukey1, const u32 *ukey2, const u32 *ukey3, const u32 *ukey4) { u32 ks_camellia[68]; u32 ks_serpent[140]; @@ -320,7 +320,7 @@ DECLSPEC int verify_header_camellia_serpent (__global const u32 *data_buf, const return 1; } -DECLSPEC int verify_header_kuznyechik_aes (__global const u32 *data_buf, const u32 signature, const u32 *ukey1, const u32 *ukey2, const u32 *ukey3, const u32 *ukey4, SHM_TYPE u32 *s_te0, SHM_TYPE u32 *s_te1, SHM_TYPE u32 *s_te2, SHM_TYPE u32 *s_te3, SHM_TYPE u32 *s_te4, SHM_TYPE u32 *s_td0, SHM_TYPE u32 *s_td1, SHM_TYPE u32 *s_td2, SHM_TYPE u32 *s_td3, SHM_TYPE u32 *s_td4) +DECLSPEC int verify_header_kuznyechik_aes (GLOBAL_AS const u32 *data_buf, const u32 signature, const u32 *ukey1, const u32 *ukey2, const u32 *ukey3, const u32 *ukey4, SHM_TYPE u32 *s_te0, SHM_TYPE u32 *s_te1, SHM_TYPE u32 *s_te2, SHM_TYPE u32 *s_te3, SHM_TYPE u32 *s_te4, SHM_TYPE u32 *s_td0, SHM_TYPE u32 *s_td1, SHM_TYPE u32 *s_td2, SHM_TYPE u32 *s_td3, SHM_TYPE u32 *s_td4) { u32 ks_kuznyechik[40]; u32 ks_aes[60]; @@ -379,7 +379,7 @@ DECLSPEC int verify_header_kuznyechik_aes (__global const u32 *data_buf, const u return 1; } -DECLSPEC int verify_header_kuznyechik_twofish (__global const u32 *data_buf, const u32 signature, const u32 *ukey1, const u32 *ukey2, const u32 *ukey3, const u32 *ukey4) +DECLSPEC int verify_header_kuznyechik_twofish (GLOBAL_AS const u32 *data_buf, const u32 signature, const u32 *ukey1, const u32 *ukey2, const u32 *ukey3, const u32 *ukey4) { u32 ks_kuznyechik[40]; @@ -442,7 +442,7 @@ DECLSPEC int verify_header_kuznyechik_twofish (__global const u32 *data_buf, con // 1536 bit -DECLSPEC int verify_header_kuznyechik_serpent_camellia (__global const u32 *data_buf, const u32 signature, const u32 *ukey1, const u32 *ukey2, const u32 *ukey3, const u32 *ukey4, const u32 *ukey5, const u32 *ukey6) +DECLSPEC int verify_header_kuznyechik_serpent_camellia (GLOBAL_AS const u32 *data_buf, const u32 signature, const u32 *ukey1, const u32 *ukey2, const u32 *ukey3, const u32 *ukey4, const u32 *ukey5, const u32 *ukey6) { u32 ks_kuznyechik[40]; u32 ks_serpent[140]; diff --git a/OpenCL/inc_veracrypt_xts.h b/OpenCL/inc_veracrypt_xts.h index ea67e2ff9..dc1195945 100644 --- a/OpenCL/inc_veracrypt_xts.h +++ b/OpenCL/inc_veracrypt_xts.h @@ -1,11 +1,11 @@ -DECLSPEC void camellia256_decrypt_xts_first (const u32 *ukey1, const u32 *ukey2, const u32 *in, u32 *out, u32 *S, u32 *T, u32 *ks) -DECLSPEC void camellia256_decrypt_xts_next (const u32 *in, u32 *out, u32 *T, u32 *ks) -DECLSPEC void kuznyechik_decrypt_xts_first (const u32 *ukey1, const u32 *ukey2, const u32 *in, u32 *out, u32 *S, u32 *T, u32 *ks) -DECLSPEC void kuznyechik_decrypt_xts_next (const u32 *in, u32 *out, u32 *T, u32 *ks) -DECLSPEC int verify_header_camellia (__global const u32 *data_buf, const u32 signature, const u32 *ukey1, const u32 *ukey2) -DECLSPEC int verify_header_kuznyechik (__global const u32 *data_buf, const u32 signature, const u32 *ukey1, const u32 *ukey2) -DECLSPEC int verify_header_camellia_kuznyechik (__global const u32 *data_buf, const u32 signature, const u32 *ukey1, const u32 *ukey2, const u32 *ukey3, const u32 *ukey4) -DECLSPEC int verify_header_camellia_serpent (__global const u32 *data_buf, const u32 signature, const u32 *ukey1, const u32 *ukey2, const u32 *ukey3, const u32 *ukey4) -DECLSPEC int verify_header_kuznyechik_aes (__global const u32 *data_buf, const u32 signature, const u32 *ukey1, const u32 *ukey2, const u32 *ukey3, const u32 *ukey4, SHM_TYPE u32 *s_te0, SHM_TYPE u32 *s_te1, SHM_TYPE u32 *s_te2, SHM_TYPE u32 *s_te3, SHM_TYPE u32 *s_te4, SHM_TYPE u32 *s_td0, SHM_TYPE u32 *s_td1, SHM_TYPE u32 *s_td2, SHM_TYPE u32 *s_td3, SHM_TYPE u32 *s_td4) -DECLSPEC int verify_header_kuznyechik_twofish (__global const u32 *data_buf, const u32 signature, const u32 *ukey1, const u32 *ukey2, const u32 *ukey3, const u32 *ukey4) -DECLSPEC int verify_header_kuznyechik_serpent_camellia (__global const u32 *data_buf, const u32 signature, const u32 *ukey1, const u32 *ukey2, const u32 *ukey3, const u32 *ukey4, const u32 *ukey5, const u32 *ukey6) +DECLSPEC void camellia256_decrypt_xts_first (const u32 *ukey1, const u32 *ukey2, const u32 *in, u32 *out, u32 *S, u32 *T, u32 *ks); +DECLSPEC void camellia256_decrypt_xts_next (const u32 *in, u32 *out, u32 *T, u32 *ks); +DECLSPEC void kuznyechik_decrypt_xts_first (const u32 *ukey1, const u32 *ukey2, const u32 *in, u32 *out, u32 *S, u32 *T, u32 *ks); +DECLSPEC void kuznyechik_decrypt_xts_next (const u32 *in, u32 *out, u32 *T, u32 *ks); +DECLSPEC int verify_header_camellia (GLOBAL_AS const u32 *data_buf, const u32 signature, const u32 *ukey1, const u32 *ukey2); +DECLSPEC int verify_header_kuznyechik (GLOBAL_AS const u32 *data_buf, const u32 signature, const u32 *ukey1, const u32 *ukey2); +DECLSPEC int verify_header_camellia_kuznyechik (GLOBAL_AS const u32 *data_buf, const u32 signature, const u32 *ukey1, const u32 *ukey2, const u32 *ukey3, const u32 *ukey4); +DECLSPEC int verify_header_camellia_serpent (GLOBAL_AS const u32 *data_buf, const u32 signature, const u32 *ukey1, const u32 *ukey2, const u32 *ukey3, const u32 *ukey4); +DECLSPEC int verify_header_kuznyechik_aes (GLOBAL_AS const u32 *data_buf, const u32 signature, const u32 *ukey1, const u32 *ukey2, const u32 *ukey3, const u32 *ukey4, SHM_TYPE u32 *s_te0, SHM_TYPE u32 *s_te1, SHM_TYPE u32 *s_te2, SHM_TYPE u32 *s_te3, SHM_TYPE u32 *s_te4, SHM_TYPE u32 *s_td0, SHM_TYPE u32 *s_td1, SHM_TYPE u32 *s_td2, SHM_TYPE u32 *s_td3, SHM_TYPE u32 *s_td4); +DECLSPEC int verify_header_kuznyechik_twofish (GLOBAL_AS const u32 *data_buf, const u32 signature, const u32 *ukey1, const u32 *ukey2, const u32 *ukey3, const u32 *ukey4); +DECLSPEC int verify_header_kuznyechik_serpent_camellia (GLOBAL_AS const u32 *data_buf, const u32 signature, const u32 *ukey1, const u32 *ukey2, const u32 *ukey3, const u32 *ukey4, const u32 *ukey5, const u32 *ukey6); diff --git a/OpenCL/m00000_a0-optimized.cl b/OpenCL/m00000_a0-optimized.cl index 0682538b6..42bf33228 100644 --- a/OpenCL/m00000_a0-optimized.cl +++ b/OpenCL/m00000_a0-optimized.cl @@ -15,7 +15,7 @@ #include "inc_hash_md5.cl" #endif -__kernel void m00000_m04 (KERN_ATTR_RULES ()) +KERNEL_FQ void m00000_m04 (KERN_ATTR_RULES ()) { /** * modifier @@ -142,15 +142,15 @@ __kernel void m00000_m04 (KERN_ATTR_RULES ()) } } -__kernel void m00000_m08 (KERN_ATTR_RULES ()) +KERNEL_FQ void m00000_m08 (KERN_ATTR_RULES ()) { } -__kernel void m00000_m16 (KERN_ATTR_RULES ()) +KERNEL_FQ void m00000_m16 (KERN_ATTR_RULES ()) { } -__kernel void m00000_s04 (KERN_ATTR_RULES ()) +KERNEL_FQ void m00000_s04 (KERN_ATTR_RULES ()) { /** * modifier @@ -292,10 +292,10 @@ __kernel void m00000_s04 (KERN_ATTR_RULES ()) } } -__kernel void m00000_s08 (KERN_ATTR_RULES ()) +KERNEL_FQ void m00000_s08 (KERN_ATTR_RULES ()) { } -__kernel void m00000_s16 (KERN_ATTR_RULES ()) +KERNEL_FQ void m00000_s16 (KERN_ATTR_RULES ()) { } diff --git a/OpenCL/m00000_a0-pure.cl b/OpenCL/m00000_a0-pure.cl index ad678287b..2ed90f5c1 100644 --- a/OpenCL/m00000_a0-pure.cl +++ b/OpenCL/m00000_a0-pure.cl @@ -15,7 +15,7 @@ #include "inc_hash_md5.cl" #endif -__kernel void m00000_mxx (KERN_ATTR_RULES ()) +KERNEL_FQ void m00000_mxx (KERN_ATTR_RULES ()) { /** * modifier @@ -59,7 +59,7 @@ __kernel void m00000_mxx (KERN_ATTR_RULES ()) } } -__kernel void m00000_sxx (KERN_ATTR_RULES ()) +KERNEL_FQ void m00000_sxx (KERN_ATTR_RULES ()) { /** * modifier diff --git a/OpenCL/m00000_a1-optimized.cl b/OpenCL/m00000_a1-optimized.cl index 4f2200c7c..50fa4a568 100644 --- a/OpenCL/m00000_a1-optimized.cl +++ b/OpenCL/m00000_a1-optimized.cl @@ -14,7 +14,7 @@ #include "inc_hash_md5.cl" #endif -__kernel void m00000_m04 (KERN_ATTR_BASIC ()) +KERNEL_FQ void m00000_m04 (KERN_ATTR_BASIC ()) { /** * modifier @@ -200,15 +200,15 @@ __kernel void m00000_m04 (KERN_ATTR_BASIC ()) } } -__kernel void m00000_m08 (KERN_ATTR_BASIC ()) +KERNEL_FQ void m00000_m08 (KERN_ATTR_BASIC ()) { } -__kernel void m00000_m16 (KERN_ATTR_BASIC ()) +KERNEL_FQ void m00000_m16 (KERN_ATTR_BASIC ()) { } -__kernel void m00000_s04 (KERN_ATTR_BASIC ()) +KERNEL_FQ void m00000_s04 (KERN_ATTR_BASIC ()) { /** * modifier @@ -409,10 +409,10 @@ __kernel void m00000_s04 (KERN_ATTR_BASIC ()) } } -__kernel void m00000_s08 (KERN_ATTR_BASIC ()) +KERNEL_FQ void m00000_s08 (KERN_ATTR_BASIC ()) { } -__kernel void m00000_s16 (KERN_ATTR_BASIC ()) +KERNEL_FQ void m00000_s16 (KERN_ATTR_BASIC ()) { } diff --git a/OpenCL/m00000_a1-pure.cl b/OpenCL/m00000_a1-pure.cl index 47ca869c0..eacb3910d 100644 --- a/OpenCL/m00000_a1-pure.cl +++ b/OpenCL/m00000_a1-pure.cl @@ -13,7 +13,7 @@ #include "inc_hash_md5.cl" #endif -__kernel void m00000_mxx (KERN_ATTR_BASIC ()) +KERNEL_FQ void m00000_mxx (KERN_ATTR_BASIC ()) { /** * modifier @@ -55,7 +55,7 @@ __kernel void m00000_mxx (KERN_ATTR_BASIC ()) } } -__kernel void m00000_sxx (KERN_ATTR_BASIC ()) +KERNEL_FQ void m00000_sxx (KERN_ATTR_BASIC ()) { /** * modifier diff --git a/OpenCL/m00000_a3-optimized.cl b/OpenCL/m00000_a3-optimized.cl index 642949038..b6a529bb8 100644 --- a/OpenCL/m00000_a3-optimized.cl +++ b/OpenCL/m00000_a3-optimized.cl @@ -428,7 +428,7 @@ DECLSPEC void m00000s (u32 *w, const u32 pw_len, KERN_ATTR_VECTOR ()) } } -__kernel void m00000_m04 (KERN_ATTR_VECTOR ()) +KERNEL_FQ void m00000_m04 (KERN_ATTR_VECTOR ()) { /** * base @@ -466,7 +466,7 @@ __kernel void m00000_m04 (KERN_ATTR_VECTOR ()) m00000m (w, pw_len, pws, rules_buf, combs_buf, words_buf_r, 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_extra0_buf, d_extra1_buf, d_extra2_buf, d_extra3_buf, bitmap_mask, bitmap_shift1, bitmap_shift2, salt_pos, loop_pos, loop_cnt, il_cnt, digests_cnt, digests_offset, combs_mode, gid_max); } -__kernel void m00000_m08 (KERN_ATTR_VECTOR ()) +KERNEL_FQ void m00000_m08 (KERN_ATTR_VECTOR ()) { /** * base @@ -504,7 +504,7 @@ __kernel void m00000_m08 (KERN_ATTR_VECTOR ()) m00000m (w, pw_len, pws, rules_buf, combs_buf, words_buf_r, 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_extra0_buf, d_extra1_buf, d_extra2_buf, d_extra3_buf, bitmap_mask, bitmap_shift1, bitmap_shift2, salt_pos, loop_pos, loop_cnt, il_cnt, digests_cnt, digests_offset, combs_mode, gid_max); } -__kernel void m00000_m16 (KERN_ATTR_VECTOR ()) +KERNEL_FQ void m00000_m16 (KERN_ATTR_VECTOR ()) { /** * base @@ -542,7 +542,7 @@ __kernel void m00000_m16 (KERN_ATTR_VECTOR ()) m00000m (w, pw_len, pws, rules_buf, combs_buf, words_buf_r, 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_extra0_buf, d_extra1_buf, d_extra2_buf, d_extra3_buf, bitmap_mask, bitmap_shift1, bitmap_shift2, salt_pos, loop_pos, loop_cnt, il_cnt, digests_cnt, digests_offset, combs_mode, gid_max); } -__kernel void m00000_s04 (KERN_ATTR_VECTOR ()) +KERNEL_FQ void m00000_s04 (KERN_ATTR_VECTOR ()) { /** * base @@ -580,7 +580,7 @@ __kernel void m00000_s04 (KERN_ATTR_VECTOR ()) m00000s (w, pw_len, pws, rules_buf, combs_buf, words_buf_r, 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_extra0_buf, d_extra1_buf, d_extra2_buf, d_extra3_buf, bitmap_mask, bitmap_shift1, bitmap_shift2, salt_pos, loop_pos, loop_cnt, il_cnt, digests_cnt, digests_offset, combs_mode, gid_max); } -__kernel void m00000_s08 (KERN_ATTR_VECTOR ()) +KERNEL_FQ void m00000_s08 (KERN_ATTR_VECTOR ()) { /** * base @@ -618,7 +618,7 @@ __kernel void m00000_s08 (KERN_ATTR_VECTOR ()) m00000s (w, pw_len, pws, rules_buf, combs_buf, words_buf_r, 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_extra0_buf, d_extra1_buf, d_extra2_buf, d_extra3_buf, bitmap_mask, bitmap_shift1, bitmap_shift2, salt_pos, loop_pos, loop_cnt, il_cnt, digests_cnt, digests_offset, combs_mode, gid_max); } -__kernel void m00000_s16 (KERN_ATTR_VECTOR ()) +KERNEL_FQ void m00000_s16 (KERN_ATTR_VECTOR ()) { /** * base diff --git a/OpenCL/m00000_a3-pure.cl b/OpenCL/m00000_a3-pure.cl index 0ccae7df5..11f74142d 100644 --- a/OpenCL/m00000_a3-pure.cl +++ b/OpenCL/m00000_a3-pure.cl @@ -13,7 +13,7 @@ #include "inc_hash_md5.cl" #endif -__kernel void m00000_mxx (KERN_ATTR_VECTOR ()) +KERNEL_FQ void m00000_mxx (KERN_ATTR_VECTOR ()) { /** * modifier @@ -68,7 +68,7 @@ __kernel void m00000_mxx (KERN_ATTR_VECTOR ()) } } -__kernel void m00000_sxx (KERN_ATTR_VECTOR ()) +KERNEL_FQ void m00000_sxx (KERN_ATTR_VECTOR ()) { /** * modifier diff --git a/OpenCL/m00010_a0-optimized.cl b/OpenCL/m00010_a0-optimized.cl index b02b3fcd3..9596a4f2f 100644 --- a/OpenCL/m00010_a0-optimized.cl +++ b/OpenCL/m00010_a0-optimized.cl @@ -15,7 +15,7 @@ #include "inc_hash_md5.cl" #endif -__kernel void m00010_m04 (KERN_ATTR_RULES ()) +KERNEL_FQ void m00010_m04 (KERN_ATTR_RULES ()) { /** * modifier @@ -216,15 +216,15 @@ __kernel void m00010_m04 (KERN_ATTR_RULES ()) } } -__kernel void m00010_m08 (KERN_ATTR_RULES ()) +KERNEL_FQ void m00010_m08 (KERN_ATTR_RULES ()) { } -__kernel void m00010_m16 (KERN_ATTR_RULES ()) +KERNEL_FQ void m00010_m16 (KERN_ATTR_RULES ()) { } -__kernel void m00010_s04 (KERN_ATTR_RULES ()) +KERNEL_FQ void m00010_s04 (KERN_ATTR_RULES ()) { /** * modifier @@ -440,10 +440,10 @@ __kernel void m00010_s04 (KERN_ATTR_RULES ()) } } -__kernel void m00010_s08 (KERN_ATTR_RULES ()) +KERNEL_FQ void m00010_s08 (KERN_ATTR_RULES ()) { } -__kernel void m00010_s16 (KERN_ATTR_RULES ()) +KERNEL_FQ void m00010_s16 (KERN_ATTR_RULES ()) { } diff --git a/OpenCL/m00010_a0-pure.cl b/OpenCL/m00010_a0-pure.cl index 2f5338bce..4b0790e91 100644 --- a/OpenCL/m00010_a0-pure.cl +++ b/OpenCL/m00010_a0-pure.cl @@ -15,7 +15,7 @@ #include "inc_hash_md5.cl" #endif -__kernel void m00010_mxx (KERN_ATTR_RULES ()) +KERNEL_FQ void m00010_mxx (KERN_ATTR_RULES ()) { /** * modifier @@ -70,7 +70,7 @@ __kernel void m00010_mxx (KERN_ATTR_RULES ()) } } -__kernel void m00010_sxx (KERN_ATTR_RULES ()) +KERNEL_FQ void m00010_sxx (KERN_ATTR_RULES ()) { /** * modifier diff --git a/OpenCL/m00010_a1-optimized.cl b/OpenCL/m00010_a1-optimized.cl index f4b7ee78d..14e5ab986 100644 --- a/OpenCL/m00010_a1-optimized.cl +++ b/OpenCL/m00010_a1-optimized.cl @@ -13,7 +13,7 @@ #include "inc_hash_md5.cl" #endif -__kernel void m00010_m04 (KERN_ATTR_BASIC ()) +KERNEL_FQ void m00010_m04 (KERN_ATTR_BASIC ()) { /** * modifier @@ -274,15 +274,15 @@ __kernel void m00010_m04 (KERN_ATTR_BASIC ()) } } -__kernel void m00010_m08 (KERN_ATTR_BASIC ()) +KERNEL_FQ void m00010_m08 (KERN_ATTR_BASIC ()) { } -__kernel void m00010_m16 (KERN_ATTR_BASIC ()) +KERNEL_FQ void m00010_m16 (KERN_ATTR_BASIC ()) { } -__kernel void m00010_s04 (KERN_ATTR_BASIC ()) +KERNEL_FQ void m00010_s04 (KERN_ATTR_BASIC ()) { /** * modifier @@ -558,10 +558,10 @@ __kernel void m00010_s04 (KERN_ATTR_BASIC ()) } } -__kernel void m00010_s08 (KERN_ATTR_BASIC ()) +KERNEL_FQ void m00010_s08 (KERN_ATTR_BASIC ()) { } -__kernel void m00010_s16 (KERN_ATTR_BASIC ()) +KERNEL_FQ void m00010_s16 (KERN_ATTR_BASIC ()) { } diff --git a/OpenCL/m00010_a1-pure.cl b/OpenCL/m00010_a1-pure.cl index 22ef57cf9..e28624755 100644 --- a/OpenCL/m00010_a1-pure.cl +++ b/OpenCL/m00010_a1-pure.cl @@ -13,7 +13,7 @@ #include "inc_hash_md5.cl" #endif -__kernel void m00010_mxx (KERN_ATTR_BASIC ()) +KERNEL_FQ void m00010_mxx (KERN_ATTR_BASIC ()) { /** * modifier @@ -66,7 +66,7 @@ __kernel void m00010_mxx (KERN_ATTR_BASIC ()) } } -__kernel void m00010_sxx (KERN_ATTR_BASIC ()) +KERNEL_FQ void m00010_sxx (KERN_ATTR_BASIC ()) { /** * modifier diff --git a/OpenCL/m00010_a3-optimized.cl b/OpenCL/m00010_a3-optimized.cl index aa819aec4..458de8868 100644 --- a/OpenCL/m00010_a3-optimized.cl +++ b/OpenCL/m00010_a3-optimized.cl @@ -477,7 +477,7 @@ DECLSPEC void m00010s (u32 *w, const u32 pw_len, KERN_ATTR_VECTOR ()) } } -__kernel void m00010_m04 (KERN_ATTR_VECTOR ()) +KERNEL_FQ void m00010_m04 (KERN_ATTR_VECTOR ()) { /** * base @@ -515,7 +515,7 @@ __kernel void m00010_m04 (KERN_ATTR_VECTOR ()) m00010m (w, pw_len, pws, rules_buf, combs_buf, words_buf_r, 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_extra0_buf, d_extra1_buf, d_extra2_buf, d_extra3_buf, bitmap_mask, bitmap_shift1, bitmap_shift2, salt_pos, loop_pos, loop_cnt, il_cnt, digests_cnt, digests_offset, combs_mode, gid_max); } -__kernel void m00010_m08 (KERN_ATTR_VECTOR ()) +KERNEL_FQ void m00010_m08 (KERN_ATTR_VECTOR ()) { /** * base @@ -553,7 +553,7 @@ __kernel void m00010_m08 (KERN_ATTR_VECTOR ()) m00010m (w, pw_len, pws, rules_buf, combs_buf, words_buf_r, 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_extra0_buf, d_extra1_buf, d_extra2_buf, d_extra3_buf, bitmap_mask, bitmap_shift1, bitmap_shift2, salt_pos, loop_pos, loop_cnt, il_cnt, digests_cnt, digests_offset, combs_mode, gid_max); } -__kernel void m00010_m16 (KERN_ATTR_VECTOR ()) +KERNEL_FQ void m00010_m16 (KERN_ATTR_VECTOR ()) { /** * base @@ -591,7 +591,7 @@ __kernel void m00010_m16 (KERN_ATTR_VECTOR ()) m00010m (w, pw_len, pws, rules_buf, combs_buf, words_buf_r, 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_extra0_buf, d_extra1_buf, d_extra2_buf, d_extra3_buf, bitmap_mask, bitmap_shift1, bitmap_shift2, salt_pos, loop_pos, loop_cnt, il_cnt, digests_cnt, digests_offset, combs_mode, gid_max); } -__kernel void m00010_s04 (KERN_ATTR_VECTOR ()) +KERNEL_FQ void m00010_s04 (KERN_ATTR_VECTOR ()) { /** * base @@ -629,7 +629,7 @@ __kernel void m00010_s04 (KERN_ATTR_VECTOR ()) m00010s (w, pw_len, pws, rules_buf, combs_buf, words_buf_r, 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_extra0_buf, d_extra1_buf, d_extra2_buf, d_extra3_buf, bitmap_mask, bitmap_shift1, bitmap_shift2, salt_pos, loop_pos, loop_cnt, il_cnt, digests_cnt, digests_offset, combs_mode, gid_max); } -__kernel void m00010_s08 (KERN_ATTR_VECTOR ()) +KERNEL_FQ void m00010_s08 (KERN_ATTR_VECTOR ()) { /** * base @@ -667,7 +667,7 @@ __kernel void m00010_s08 (KERN_ATTR_VECTOR ()) m00010s (w, pw_len, pws, rules_buf, combs_buf, words_buf_r, 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_extra0_buf, d_extra1_buf, d_extra2_buf, d_extra3_buf, bitmap_mask, bitmap_shift1, bitmap_shift2, salt_pos, loop_pos, loop_cnt, il_cnt, digests_cnt, digests_offset, combs_mode, gid_max); } -__kernel void m00010_s16 (KERN_ATTR_VECTOR ()) +KERNEL_FQ void m00010_s16 (KERN_ATTR_VECTOR ()) { /** * base diff --git a/OpenCL/m00010_a3-pure.cl b/OpenCL/m00010_a3-pure.cl index 73139e19f..c415b3422 100644 --- a/OpenCL/m00010_a3-pure.cl +++ b/OpenCL/m00010_a3-pure.cl @@ -13,7 +13,7 @@ #include "inc_hash_md5.cl" #endif -__kernel void m00010_mxx (KERN_ATTR_VECTOR ()) +KERNEL_FQ void m00010_mxx (KERN_ATTR_VECTOR ()) { /** * modifier @@ -79,7 +79,7 @@ __kernel void m00010_mxx (KERN_ATTR_VECTOR ()) } } -__kernel void m00010_sxx (KERN_ATTR_VECTOR ()) +KERNEL_FQ void m00010_sxx (KERN_ATTR_VECTOR ()) { /** * modifier diff --git a/OpenCL/m00020_a0-optimized.cl b/OpenCL/m00020_a0-optimized.cl index c9bcbe669..924489454 100644 --- a/OpenCL/m00020_a0-optimized.cl +++ b/OpenCL/m00020_a0-optimized.cl @@ -15,7 +15,7 @@ #include "inc_hash_md5.cl" #endif -__kernel void m00020_m04 (KERN_ATTR_RULES ()) +KERNEL_FQ void m00020_m04 (KERN_ATTR_RULES ()) { /** * modifier @@ -196,15 +196,15 @@ __kernel void m00020_m04 (KERN_ATTR_RULES ()) } } -__kernel void m00020_m08 (KERN_ATTR_RULES ()) +KERNEL_FQ void m00020_m08 (KERN_ATTR_RULES ()) { } -__kernel void m00020_m16 (KERN_ATTR_RULES ()) +KERNEL_FQ void m00020_m16 (KERN_ATTR_RULES ()) { } -__kernel void m00020_s04 (KERN_ATTR_RULES ()) +KERNEL_FQ void m00020_s04 (KERN_ATTR_RULES ()) { /** * modifier @@ -400,10 +400,10 @@ __kernel void m00020_s04 (KERN_ATTR_RULES ()) } } -__kernel void m00020_s08 (KERN_ATTR_RULES ()) +KERNEL_FQ void m00020_s08 (KERN_ATTR_RULES ()) { } -__kernel void m00020_s16 (KERN_ATTR_RULES ()) +KERNEL_FQ void m00020_s16 (KERN_ATTR_RULES ()) { } diff --git a/OpenCL/m00020_a0-pure.cl b/OpenCL/m00020_a0-pure.cl index 0b5b4d8bf..ee18c5f6b 100644 --- a/OpenCL/m00020_a0-pure.cl +++ b/OpenCL/m00020_a0-pure.cl @@ -15,7 +15,7 @@ #include "inc_hash_md5.cl" #endif -__kernel void m00020_mxx (KERN_ATTR_RULES ()) +KERNEL_FQ void m00020_mxx (KERN_ATTR_RULES ()) { /** * modifier @@ -63,7 +63,7 @@ __kernel void m00020_mxx (KERN_ATTR_RULES ()) } } -__kernel void m00020_sxx (KERN_ATTR_RULES ()) +KERNEL_FQ void m00020_sxx (KERN_ATTR_RULES ()) { /** * modifier diff --git a/OpenCL/m00020_a1-optimized.cl b/OpenCL/m00020_a1-optimized.cl index 4c95f02bb..dc37febfd 100644 --- a/OpenCL/m00020_a1-optimized.cl +++ b/OpenCL/m00020_a1-optimized.cl @@ -13,7 +13,7 @@ #include "inc_hash_md5.cl" #endif -__kernel void m00020_m04 (KERN_ATTR_BASIC ()) +KERNEL_FQ void m00020_m04 (KERN_ATTR_BASIC ()) { /** * modifier @@ -252,15 +252,15 @@ __kernel void m00020_m04 (KERN_ATTR_BASIC ()) } } -__kernel void m00020_m08 (KERN_ATTR_BASIC ()) +KERNEL_FQ void m00020_m08 (KERN_ATTR_BASIC ()) { } -__kernel void m00020_m16 (KERN_ATTR_BASIC ()) +KERNEL_FQ void m00020_m16 (KERN_ATTR_BASIC ()) { } -__kernel void m00020_s04 (KERN_ATTR_BASIC ()) +KERNEL_FQ void m00020_s04 (KERN_ATTR_BASIC ()) { /** * modifier @@ -514,10 +514,10 @@ __kernel void m00020_s04 (KERN_ATTR_BASIC ()) } } -__kernel void m00020_s08 (KERN_ATTR_BASIC ()) +KERNEL_FQ void m00020_s08 (KERN_ATTR_BASIC ()) { } -__kernel void m00020_s16 (KERN_ATTR_BASIC ()) +KERNEL_FQ void m00020_s16 (KERN_ATTR_BASIC ()) { } diff --git a/OpenCL/m00020_a1-pure.cl b/OpenCL/m00020_a1-pure.cl index e35f2d4b9..10b96807d 100644 --- a/OpenCL/m00020_a1-pure.cl +++ b/OpenCL/m00020_a1-pure.cl @@ -13,7 +13,7 @@ #include "inc_hash_md5.cl" #endif -__kernel void m00020_mxx (KERN_ATTR_BASIC ()) +KERNEL_FQ void m00020_mxx (KERN_ATTR_BASIC ()) { /** * modifier @@ -57,7 +57,7 @@ __kernel void m00020_mxx (KERN_ATTR_BASIC ()) } } -__kernel void m00020_sxx (KERN_ATTR_BASIC ()) +KERNEL_FQ void m00020_sxx (KERN_ATTR_BASIC ()) { /** * modifier diff --git a/OpenCL/m00020_a3-optimized.cl b/OpenCL/m00020_a3-optimized.cl index 126b73bf3..1dc9be105 100644 --- a/OpenCL/m00020_a3-optimized.cl +++ b/OpenCL/m00020_a3-optimized.cl @@ -378,7 +378,7 @@ DECLSPEC void m00020s (u32 *w0, u32 *w1, u32 *w2, u32 *w3, const u32 pw_len, KER } } -__kernel void m00020_m04 (KERN_ATTR_BASIC ()) +KERNEL_FQ void m00020_m04 (KERN_ATTR_BASIC ()) { /** * base @@ -425,7 +425,7 @@ __kernel void m00020_m04 (KERN_ATTR_BASIC ()) m00020m (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_extra0_buf, d_extra1_buf, d_extra2_buf, d_extra3_buf, bitmap_mask, bitmap_shift1, bitmap_shift2, salt_pos, loop_pos, loop_cnt, il_cnt, digests_cnt, digests_offset, combs_mode, gid_max); } -__kernel void m00020_m08 (KERN_ATTR_BASIC ()) +KERNEL_FQ void m00020_m08 (KERN_ATTR_BASIC ()) { /** * base @@ -472,7 +472,7 @@ __kernel void m00020_m08 (KERN_ATTR_BASIC ()) m00020m (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_extra0_buf, d_extra1_buf, d_extra2_buf, d_extra3_buf, bitmap_mask, bitmap_shift1, bitmap_shift2, salt_pos, loop_pos, loop_cnt, il_cnt, digests_cnt, digests_offset, combs_mode, gid_max); } -__kernel void m00020_m16 (KERN_ATTR_BASIC ()) +KERNEL_FQ void m00020_m16 (KERN_ATTR_BASIC ()) { /** * base @@ -519,7 +519,7 @@ __kernel void m00020_m16 (KERN_ATTR_BASIC ()) m00020m (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_extra0_buf, d_extra1_buf, d_extra2_buf, d_extra3_buf, bitmap_mask, bitmap_shift1, bitmap_shift2, salt_pos, loop_pos, loop_cnt, il_cnt, digests_cnt, digests_offset, combs_mode, gid_max); } -__kernel void m00020_s04 (KERN_ATTR_BASIC ()) +KERNEL_FQ void m00020_s04 (KERN_ATTR_BASIC ()) { /** * base @@ -566,7 +566,7 @@ __kernel void m00020_s04 (KERN_ATTR_BASIC ()) m00020s (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_extra0_buf, d_extra1_buf, d_extra2_buf, d_extra3_buf, bitmap_mask, bitmap_shift1, bitmap_shift2, salt_pos, loop_pos, loop_cnt, il_cnt, digests_cnt, digests_offset, combs_mode, gid_max); } -__kernel void m00020_s08 (KERN_ATTR_BASIC ()) +KERNEL_FQ void m00020_s08 (KERN_ATTR_BASIC ()) { /** * base @@ -613,7 +613,7 @@ __kernel void m00020_s08 (KERN_ATTR_BASIC ()) m00020s (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_extra0_buf, d_extra1_buf, d_extra2_buf, d_extra3_buf, bitmap_mask, bitmap_shift1, bitmap_shift2, salt_pos, loop_pos, loop_cnt, il_cnt, digests_cnt, digests_offset, combs_mode, gid_max); } -__kernel void m00020_s16 (KERN_ATTR_BASIC ()) +KERNEL_FQ void m00020_s16 (KERN_ATTR_BASIC ()) { /** * base diff --git a/OpenCL/m00020_a3-pure.cl b/OpenCL/m00020_a3-pure.cl index cd51f6c87..61c585cbe 100644 --- a/OpenCL/m00020_a3-pure.cl +++ b/OpenCL/m00020_a3-pure.cl @@ -13,7 +13,7 @@ #include "inc_hash_md5.cl" #endif -__kernel void m00020_mxx (KERN_ATTR_VECTOR ()) +KERNEL_FQ void m00020_mxx (KERN_ATTR_VECTOR ()) { /** * modifier @@ -74,7 +74,7 @@ __kernel void m00020_mxx (KERN_ATTR_VECTOR ()) } } -__kernel void m00020_sxx (KERN_ATTR_VECTOR ()) +KERNEL_FQ void m00020_sxx (KERN_ATTR_VECTOR ()) { /** * modifier diff --git a/OpenCL/m00030_a0-optimized.cl b/OpenCL/m00030_a0-optimized.cl index 9c1b9aa76..61ba25007 100644 --- a/OpenCL/m00030_a0-optimized.cl +++ b/OpenCL/m00030_a0-optimized.cl @@ -15,7 +15,7 @@ #include "inc_hash_md5.cl" #endif -__kernel void m00030_m04 (KERN_ATTR_RULES ()) +KERNEL_FQ void m00030_m04 (KERN_ATTR_RULES ()) { /** * modifier @@ -221,15 +221,15 @@ __kernel void m00030_m04 (KERN_ATTR_RULES ()) } } -__kernel void m00030_m08 (KERN_ATTR_RULES ()) +KERNEL_FQ void m00030_m08 (KERN_ATTR_RULES ()) { } -__kernel void m00030_m16 (KERN_ATTR_RULES ()) +KERNEL_FQ void m00030_m16 (KERN_ATTR_RULES ()) { } -__kernel void m00030_s04 (KERN_ATTR_RULES ()) +KERNEL_FQ void m00030_s04 (KERN_ATTR_RULES ()) { /** * modifier @@ -450,10 +450,10 @@ __kernel void m00030_s04 (KERN_ATTR_RULES ()) } } -__kernel void m00030_s08 (KERN_ATTR_RULES ()) +KERNEL_FQ void m00030_s08 (KERN_ATTR_RULES ()) { } -__kernel void m00030_s16 (KERN_ATTR_RULES ()) +KERNEL_FQ void m00030_s16 (KERN_ATTR_RULES ()) { } diff --git a/OpenCL/m00030_a0-pure.cl b/OpenCL/m00030_a0-pure.cl index ad8926b37..4c86b7f69 100644 --- a/OpenCL/m00030_a0-pure.cl +++ b/OpenCL/m00030_a0-pure.cl @@ -15,7 +15,7 @@ #include "inc_hash_md5.cl" #endif -__kernel void m00030_mxx (KERN_ATTR_RULES ()) +KERNEL_FQ void m00030_mxx (KERN_ATTR_RULES ()) { /** * modifier @@ -70,7 +70,7 @@ __kernel void m00030_mxx (KERN_ATTR_RULES ()) } } -__kernel void m00030_sxx (KERN_ATTR_RULES ()) +KERNEL_FQ void m00030_sxx (KERN_ATTR_RULES ()) { /** * modifier diff --git a/OpenCL/m00030_a1-optimized.cl b/OpenCL/m00030_a1-optimized.cl index 1b488d38d..f67c54811 100644 --- a/OpenCL/m00030_a1-optimized.cl +++ b/OpenCL/m00030_a1-optimized.cl @@ -13,7 +13,7 @@ #include "inc_hash_md5.cl" #endif -__kernel void m00030_m04 (KERN_ATTR_BASIC ()) +KERNEL_FQ void m00030_m04 (KERN_ATTR_BASIC ()) { /** * modifier @@ -279,15 +279,15 @@ __kernel void m00030_m04 (KERN_ATTR_BASIC ()) } } -__kernel void m00030_m08 (KERN_ATTR_BASIC ()) +KERNEL_FQ void m00030_m08 (KERN_ATTR_BASIC ()) { } -__kernel void m00030_m16 (KERN_ATTR_BASIC ()) +KERNEL_FQ void m00030_m16 (KERN_ATTR_BASIC ()) { } -__kernel void m00030_s04 (KERN_ATTR_BASIC ()) +KERNEL_FQ void m00030_s04 (KERN_ATTR_BASIC ()) { /** * modifier @@ -568,10 +568,10 @@ __kernel void m00030_s04 (KERN_ATTR_BASIC ()) } } -__kernel void m00030_s08 (KERN_ATTR_BASIC ()) +KERNEL_FQ void m00030_s08 (KERN_ATTR_BASIC ()) { } -__kernel void m00030_s16 (KERN_ATTR_BASIC ()) +KERNEL_FQ void m00030_s16 (KERN_ATTR_BASIC ()) { } diff --git a/OpenCL/m00030_a1-pure.cl b/OpenCL/m00030_a1-pure.cl index 33f97db3f..306721186 100644 --- a/OpenCL/m00030_a1-pure.cl +++ b/OpenCL/m00030_a1-pure.cl @@ -13,7 +13,7 @@ #include "inc_hash_md5.cl" #endif -__kernel void m00030_mxx (KERN_ATTR_BASIC ()) +KERNEL_FQ void m00030_mxx (KERN_ATTR_BASIC ()) { /** * modifier @@ -66,7 +66,7 @@ __kernel void m00030_mxx (KERN_ATTR_BASIC ()) } } -__kernel void m00030_sxx (KERN_ATTR_BASIC ()) +KERNEL_FQ void m00030_sxx (KERN_ATTR_BASIC ()) { /** * modifier diff --git a/OpenCL/m00030_a3-optimized.cl b/OpenCL/m00030_a3-optimized.cl index 7439dd2ea..68f897c83 100644 --- a/OpenCL/m00030_a3-optimized.cl +++ b/OpenCL/m00030_a3-optimized.cl @@ -477,7 +477,7 @@ DECLSPEC void m00030s (u32 *w, const u32 pw_len, KERN_ATTR_VECTOR ()) } } -__kernel void m00030_m04 (KERN_ATTR_VECTOR ()) +KERNEL_FQ void m00030_m04 (KERN_ATTR_VECTOR ()) { /** * base @@ -515,7 +515,7 @@ __kernel void m00030_m04 (KERN_ATTR_VECTOR ()) m00030m (w, pw_len, pws, rules_buf, combs_buf, words_buf_r, 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_extra0_buf, d_extra1_buf, d_extra2_buf, d_extra3_buf, bitmap_mask, bitmap_shift1, bitmap_shift2, salt_pos, loop_pos, loop_cnt, il_cnt, digests_cnt, digests_offset, combs_mode, gid_max); } -__kernel void m00030_m08 (KERN_ATTR_VECTOR ()) +KERNEL_FQ void m00030_m08 (KERN_ATTR_VECTOR ()) { /** * base @@ -553,7 +553,7 @@ __kernel void m00030_m08 (KERN_ATTR_VECTOR ()) m00030m (w, pw_len, pws, rules_buf, combs_buf, words_buf_r, 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_extra0_buf, d_extra1_buf, d_extra2_buf, d_extra3_buf, bitmap_mask, bitmap_shift1, bitmap_shift2, salt_pos, loop_pos, loop_cnt, il_cnt, digests_cnt, digests_offset, combs_mode, gid_max); } -__kernel void m00030_m16 (KERN_ATTR_VECTOR ()) +KERNEL_FQ void m00030_m16 (KERN_ATTR_VECTOR ()) { /** * base @@ -591,7 +591,7 @@ __kernel void m00030_m16 (KERN_ATTR_VECTOR ()) m00030m (w, pw_len, pws, rules_buf, combs_buf, words_buf_r, 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_extra0_buf, d_extra1_buf, d_extra2_buf, d_extra3_buf, bitmap_mask, bitmap_shift1, bitmap_shift2, salt_pos, loop_pos, loop_cnt, il_cnt, digests_cnt, digests_offset, combs_mode, gid_max); } -__kernel void m00030_s04 (KERN_ATTR_VECTOR ()) +KERNEL_FQ void m00030_s04 (KERN_ATTR_VECTOR ()) { /** * base @@ -629,7 +629,7 @@ __kernel void m00030_s04 (KERN_ATTR_VECTOR ()) m00030s (w, pw_len, pws, rules_buf, combs_buf, words_buf_r, 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_extra0_buf, d_extra1_buf, d_extra2_buf, d_extra3_buf, bitmap_mask, bitmap_shift1, bitmap_shift2, salt_pos, loop_pos, loop_cnt, il_cnt, digests_cnt, digests_offset, combs_mode, gid_max); } -__kernel void m00030_s08 (KERN_ATTR_VECTOR ()) +KERNEL_FQ void m00030_s08 (KERN_ATTR_VECTOR ()) { /** * base @@ -667,7 +667,7 @@ __kernel void m00030_s08 (KERN_ATTR_VECTOR ()) m00030s (w, pw_len, pws, rules_buf, combs_buf, words_buf_r, 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_extra0_buf, d_extra1_buf, d_extra2_buf, d_extra3_buf, bitmap_mask, bitmap_shift1, bitmap_shift2, salt_pos, loop_pos, loop_cnt, il_cnt, digests_cnt, digests_offset, combs_mode, gid_max); } -__kernel void m00030_s16 (KERN_ATTR_VECTOR ()) +KERNEL_FQ void m00030_s16 (KERN_ATTR_VECTOR ()) { /** * base diff --git a/OpenCL/m00030_a3-pure.cl b/OpenCL/m00030_a3-pure.cl index 2387dfdc6..182f7e444 100644 --- a/OpenCL/m00030_a3-pure.cl +++ b/OpenCL/m00030_a3-pure.cl @@ -13,7 +13,7 @@ #include "inc_hash_md5.cl" #endif -__kernel void m00030_mxx (KERN_ATTR_VECTOR ()) +KERNEL_FQ void m00030_mxx (KERN_ATTR_VECTOR ()) { /** * modifier @@ -79,7 +79,7 @@ __kernel void m00030_mxx (KERN_ATTR_VECTOR ()) } } -__kernel void m00030_sxx (KERN_ATTR_VECTOR ()) +KERNEL_FQ void m00030_sxx (KERN_ATTR_VECTOR ()) { /** * modifier diff --git a/OpenCL/m00040_a0-optimized.cl b/OpenCL/m00040_a0-optimized.cl index 4c298cc8e..a6c8b9bda 100644 --- a/OpenCL/m00040_a0-optimized.cl +++ b/OpenCL/m00040_a0-optimized.cl @@ -15,7 +15,7 @@ #include "inc_hash_md5.cl" #endif -__kernel void m00040_m04 (KERN_ATTR_RULES ()) +KERNEL_FQ void m00040_m04 (KERN_ATTR_RULES ()) { /** * modifier @@ -201,15 +201,15 @@ __kernel void m00040_m04 (KERN_ATTR_RULES ()) } } -__kernel void m00040_m08 (KERN_ATTR_RULES ()) +KERNEL_FQ void m00040_m08 (KERN_ATTR_RULES ()) { } -__kernel void m00040_m16 (KERN_ATTR_RULES ()) +KERNEL_FQ void m00040_m16 (KERN_ATTR_RULES ()) { } -__kernel void m00040_s04 (KERN_ATTR_RULES ()) +KERNEL_FQ void m00040_s04 (KERN_ATTR_RULES ()) { /** * modifier @@ -410,10 +410,10 @@ __kernel void m00040_s04 (KERN_ATTR_RULES ()) } } -__kernel void m00040_s08 (KERN_ATTR_RULES ()) +KERNEL_FQ void m00040_s08 (KERN_ATTR_RULES ()) { } -__kernel void m00040_s16 (KERN_ATTR_RULES ()) +KERNEL_FQ void m00040_s16 (KERN_ATTR_RULES ()) { } diff --git a/OpenCL/m00040_a0-pure.cl b/OpenCL/m00040_a0-pure.cl index e629937c9..d13e699e0 100644 --- a/OpenCL/m00040_a0-pure.cl +++ b/OpenCL/m00040_a0-pure.cl @@ -15,7 +15,7 @@ #include "inc_hash_md5.cl" #endif -__kernel void m00040_mxx (KERN_ATTR_RULES ()) +KERNEL_FQ void m00040_mxx (KERN_ATTR_RULES ()) { /** * modifier @@ -63,7 +63,7 @@ __kernel void m00040_mxx (KERN_ATTR_RULES ()) } } -__kernel void m00040_sxx (KERN_ATTR_RULES ()) +KERNEL_FQ void m00040_sxx (KERN_ATTR_RULES ()) { /** * modifier diff --git a/OpenCL/m00040_a1-optimized.cl b/OpenCL/m00040_a1-optimized.cl index 1e79c37ed..10031fee8 100644 --- a/OpenCL/m00040_a1-optimized.cl +++ b/OpenCL/m00040_a1-optimized.cl @@ -13,7 +13,7 @@ #include "inc_hash_md5.cl" #endif -__kernel void m00040_m04 (KERN_ATTR_BASIC ()) +KERNEL_FQ void m00040_m04 (KERN_ATTR_BASIC ()) { /** * modifier @@ -257,15 +257,15 @@ __kernel void m00040_m04 (KERN_ATTR_BASIC ()) } } -__kernel void m00040_m08 (KERN_ATTR_BASIC ()) +KERNEL_FQ void m00040_m08 (KERN_ATTR_BASIC ()) { } -__kernel void m00040_m16 (KERN_ATTR_BASIC ()) +KERNEL_FQ void m00040_m16 (KERN_ATTR_BASIC ()) { } -__kernel void m00040_s04 (KERN_ATTR_BASIC ()) +KERNEL_FQ void m00040_s04 (KERN_ATTR_BASIC ()) { /** * modifier @@ -524,10 +524,10 @@ __kernel void m00040_s04 (KERN_ATTR_BASIC ()) } } -__kernel void m00040_s08 (KERN_ATTR_BASIC ()) +KERNEL_FQ void m00040_s08 (KERN_ATTR_BASIC ()) { } -__kernel void m00040_s16 (KERN_ATTR_BASIC ()) +KERNEL_FQ void m00040_s16 (KERN_ATTR_BASIC ()) { } diff --git a/OpenCL/m00040_a1-pure.cl b/OpenCL/m00040_a1-pure.cl index ffb6c7d69..e32823a40 100644 --- a/OpenCL/m00040_a1-pure.cl +++ b/OpenCL/m00040_a1-pure.cl @@ -13,7 +13,7 @@ #include "inc_hash_md5.cl" #endif -__kernel void m00040_mxx (KERN_ATTR_BASIC ()) +KERNEL_FQ void m00040_mxx (KERN_ATTR_BASIC ()) { /** * modifier @@ -57,7 +57,7 @@ __kernel void m00040_mxx (KERN_ATTR_BASIC ()) } } -__kernel void m00040_sxx (KERN_ATTR_BASIC ()) +KERNEL_FQ void m00040_sxx (KERN_ATTR_BASIC ()) { /** * modifier diff --git a/OpenCL/m00040_a3-optimized.cl b/OpenCL/m00040_a3-optimized.cl index 6e817b1ab..bdfa5f16c 100644 --- a/OpenCL/m00040_a3-optimized.cl +++ b/OpenCL/m00040_a3-optimized.cl @@ -378,7 +378,7 @@ DECLSPEC void m00040s (u32 *w0, u32 *w1, u32 *w2, u32 *w3, const u32 pw_len, KER } } -__kernel void m00040_m04 (KERN_ATTR_BASIC ()) +KERNEL_FQ void m00040_m04 (KERN_ATTR_BASIC ()) { /** * base @@ -425,7 +425,7 @@ __kernel void m00040_m04 (KERN_ATTR_BASIC ()) m00040m (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_extra0_buf, d_extra1_buf, d_extra2_buf, d_extra3_buf, bitmap_mask, bitmap_shift1, bitmap_shift2, salt_pos, loop_pos, loop_cnt, il_cnt, digests_cnt, digests_offset, combs_mode, gid_max); } -__kernel void m00040_m08 (KERN_ATTR_BASIC ()) +KERNEL_FQ void m00040_m08 (KERN_ATTR_BASIC ()) { /** * base @@ -472,7 +472,7 @@ __kernel void m00040_m08 (KERN_ATTR_BASIC ()) m00040m (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_extra0_buf, d_extra1_buf, d_extra2_buf, d_extra3_buf, bitmap_mask, bitmap_shift1, bitmap_shift2, salt_pos, loop_pos, loop_cnt, il_cnt, digests_cnt, digests_offset, combs_mode, gid_max); } -__kernel void m00040_m16 (KERN_ATTR_BASIC ()) +KERNEL_FQ void m00040_m16 (KERN_ATTR_BASIC ()) { /** * base @@ -519,7 +519,7 @@ __kernel void m00040_m16 (KERN_ATTR_BASIC ()) m00040m (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_extra0_buf, d_extra1_buf, d_extra2_buf, d_extra3_buf, bitmap_mask, bitmap_shift1, bitmap_shift2, salt_pos, loop_pos, loop_cnt, il_cnt, digests_cnt, digests_offset, combs_mode, gid_max); } -__kernel void m00040_s04 (KERN_ATTR_BASIC ()) +KERNEL_FQ void m00040_s04 (KERN_ATTR_BASIC ()) { /** * base @@ -566,7 +566,7 @@ __kernel void m00040_s04 (KERN_ATTR_BASIC ()) m00040s (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_extra0_buf, d_extra1_buf, d_extra2_buf, d_extra3_buf, bitmap_mask, bitmap_shift1, bitmap_shift2, salt_pos, loop_pos, loop_cnt, il_cnt, digests_cnt, digests_offset, combs_mode, gid_max); } -__kernel void m00040_s08 (KERN_ATTR_BASIC ()) +KERNEL_FQ void m00040_s08 (KERN_ATTR_BASIC ()) { /** * base @@ -613,7 +613,7 @@ __kernel void m00040_s08 (KERN_ATTR_BASIC ()) m00040s (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_extra0_buf, d_extra1_buf, d_extra2_buf, d_extra3_buf, bitmap_mask, bitmap_shift1, bitmap_shift2, salt_pos, loop_pos, loop_cnt, il_cnt, digests_cnt, digests_offset, combs_mode, gid_max); } -__kernel void m00040_s16 (KERN_ATTR_BASIC ()) +KERNEL_FQ void m00040_s16 (KERN_ATTR_BASIC ()) { /** * base diff --git a/OpenCL/m00040_a3-pure.cl b/OpenCL/m00040_a3-pure.cl index 29f6338c2..f2783cba4 100644 --- a/OpenCL/m00040_a3-pure.cl +++ b/OpenCL/m00040_a3-pure.cl @@ -13,7 +13,7 @@ #include "inc_hash_md5.cl" #endif -__kernel void m00040_mxx (KERN_ATTR_VECTOR ()) +KERNEL_FQ void m00040_mxx (KERN_ATTR_VECTOR ()) { /** * modifier @@ -74,7 +74,7 @@ __kernel void m00040_mxx (KERN_ATTR_VECTOR ()) } } -__kernel void m00040_sxx (KERN_ATTR_VECTOR ()) +KERNEL_FQ void m00040_sxx (KERN_ATTR_VECTOR ()) { /** * modifier diff --git a/OpenCL/m00050_a0-optimized.cl b/OpenCL/m00050_a0-optimized.cl index 76896167b..39b8609dd 100644 --- a/OpenCL/m00050_a0-optimized.cl +++ b/OpenCL/m00050_a0-optimized.cl @@ -100,7 +100,7 @@ DECLSPEC void hmac_md5_run (u32x *w0, u32x *w1, u32x *w2, u32x *w3, u32x *ipad, md5_transform_vector (w0, w1, w2, w3, digest); } -__kernel void m00050_m04 (KERN_ATTR_RULES ()) +KERNEL_FQ void m00050_m04 (KERN_ATTR_RULES ()) { /** * modifier @@ -205,15 +205,15 @@ __kernel void m00050_m04 (KERN_ATTR_RULES ()) } } -__kernel void m00050_m08 (KERN_ATTR_RULES ()) +KERNEL_FQ void m00050_m08 (KERN_ATTR_RULES ()) { } -__kernel void m00050_m16 (KERN_ATTR_RULES ()) +KERNEL_FQ void m00050_m16 (KERN_ATTR_RULES ()) { } -__kernel void m00050_s04 (KERN_ATTR_RULES ()) +KERNEL_FQ void m00050_s04 (KERN_ATTR_RULES ()) { /** * modifier @@ -330,10 +330,10 @@ __kernel void m00050_s04 (KERN_ATTR_RULES ()) } } -__kernel void m00050_s08 (KERN_ATTR_RULES ()) +KERNEL_FQ void m00050_s08 (KERN_ATTR_RULES ()) { } -__kernel void m00050_s16 (KERN_ATTR_RULES ()) +KERNEL_FQ void m00050_s16 (KERN_ATTR_RULES ()) { } diff --git a/OpenCL/m00050_a0-pure.cl b/OpenCL/m00050_a0-pure.cl index dca86167a..6ebd9762a 100644 --- a/OpenCL/m00050_a0-pure.cl +++ b/OpenCL/m00050_a0-pure.cl @@ -15,7 +15,7 @@ #include "inc_hash_md5.cl" #endif -__kernel void m00050_mxx (KERN_ATTR_RULES ()) +KERNEL_FQ void m00050_mxx (KERN_ATTR_RULES ()) { /** * modifier @@ -68,7 +68,7 @@ __kernel void m00050_mxx (KERN_ATTR_RULES ()) } } -__kernel void m00050_sxx (KERN_ATTR_RULES ()) +KERNEL_FQ void m00050_sxx (KERN_ATTR_RULES ()) { /** * modifier diff --git a/OpenCL/m00050_a1-optimized.cl b/OpenCL/m00050_a1-optimized.cl index e142a361d..6cebd87a4 100644 --- a/OpenCL/m00050_a1-optimized.cl +++ b/OpenCL/m00050_a1-optimized.cl @@ -98,7 +98,7 @@ DECLSPEC void hmac_md5_run (u32x *w0, u32x *w1, u32x *w2, u32x *w3, u32x *ipad, md5_transform_vector (w0, w1, w2, w3, digest); } -__kernel void m00050_m04 (KERN_ATTR_BASIC ()) +KERNEL_FQ void m00050_m04 (KERN_ATTR_BASIC ()) { /** * modifier @@ -263,15 +263,15 @@ __kernel void m00050_m04 (KERN_ATTR_BASIC ()) } } -__kernel void m00050_m08 (KERN_ATTR_BASIC ()) +KERNEL_FQ void m00050_m08 (KERN_ATTR_BASIC ()) { } -__kernel void m00050_m16 (KERN_ATTR_BASIC ()) +KERNEL_FQ void m00050_m16 (KERN_ATTR_BASIC ()) { } -__kernel void m00050_s04 (KERN_ATTR_BASIC ()) +KERNEL_FQ void m00050_s04 (KERN_ATTR_BASIC ()) { /** * modifier @@ -448,10 +448,10 @@ __kernel void m00050_s04 (KERN_ATTR_BASIC ()) } } -__kernel void m00050_s08 (KERN_ATTR_BASIC ()) +KERNEL_FQ void m00050_s08 (KERN_ATTR_BASIC ()) { } -__kernel void m00050_s16 (KERN_ATTR_BASIC ()) +KERNEL_FQ void m00050_s16 (KERN_ATTR_BASIC ()) { } diff --git a/OpenCL/m00050_a1-pure.cl b/OpenCL/m00050_a1-pure.cl index bd99496d7..b0c11af36 100644 --- a/OpenCL/m00050_a1-pure.cl +++ b/OpenCL/m00050_a1-pure.cl @@ -13,7 +13,7 @@ #include "inc_hash_md5.cl" #endif -__kernel void m00050_mxx (KERN_ATTR_BASIC ()) +KERNEL_FQ void m00050_mxx (KERN_ATTR_BASIC ()) { /** * modifier @@ -91,7 +91,7 @@ __kernel void m00050_mxx (KERN_ATTR_BASIC ()) } } -__kernel void m00050_sxx (KERN_ATTR_BASIC ()) +KERNEL_FQ void m00050_sxx (KERN_ATTR_BASIC ()) { /** * modifier diff --git a/OpenCL/m00050_a3-optimized.cl b/OpenCL/m00050_a3-optimized.cl index 659e14ad3..a19259f1f 100644 --- a/OpenCL/m00050_a3-optimized.cl +++ b/OpenCL/m00050_a3-optimized.cl @@ -320,7 +320,7 @@ DECLSPEC void m00050s (u32 *w0, u32 *w1, u32 *w2, u32 *w3, const u32 pw_len, KER } } -__kernel void m00050_m04 (KERN_ATTR_BASIC ()) +KERNEL_FQ void m00050_m04 (KERN_ATTR_BASIC ()) { /** * base @@ -367,7 +367,7 @@ __kernel void m00050_m04 (KERN_ATTR_BASIC ()) m00050m (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_extra0_buf, d_extra1_buf, d_extra2_buf, d_extra3_buf, bitmap_mask, bitmap_shift1, bitmap_shift2, salt_pos, loop_pos, loop_cnt, il_cnt, digests_cnt, digests_offset, combs_mode, gid_max); } -__kernel void m00050_m08 (KERN_ATTR_BASIC ()) +KERNEL_FQ void m00050_m08 (KERN_ATTR_BASIC ()) { /** * base @@ -414,7 +414,7 @@ __kernel void m00050_m08 (KERN_ATTR_BASIC ()) m00050m (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_extra0_buf, d_extra1_buf, d_extra2_buf, d_extra3_buf, bitmap_mask, bitmap_shift1, bitmap_shift2, salt_pos, loop_pos, loop_cnt, il_cnt, digests_cnt, digests_offset, combs_mode, gid_max); } -__kernel void m00050_m16 (KERN_ATTR_BASIC ()) +KERNEL_FQ void m00050_m16 (KERN_ATTR_BASIC ()) { /** * base @@ -461,7 +461,7 @@ __kernel void m00050_m16 (KERN_ATTR_BASIC ()) m00050m (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_extra0_buf, d_extra1_buf, d_extra2_buf, d_extra3_buf, bitmap_mask, bitmap_shift1, bitmap_shift2, salt_pos, loop_pos, loop_cnt, il_cnt, digests_cnt, digests_offset, combs_mode, gid_max); } -__kernel void m00050_s04 (KERN_ATTR_BASIC ()) +KERNEL_FQ void m00050_s04 (KERN_ATTR_BASIC ()) { /** * base @@ -508,7 +508,7 @@ __kernel void m00050_s04 (KERN_ATTR_BASIC ()) m00050s (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_extra0_buf, d_extra1_buf, d_extra2_buf, d_extra3_buf, bitmap_mask, bitmap_shift1, bitmap_shift2, salt_pos, loop_pos, loop_cnt, il_cnt, digests_cnt, digests_offset, combs_mode, gid_max); } -__kernel void m00050_s08 (KERN_ATTR_BASIC ()) +KERNEL_FQ void m00050_s08 (KERN_ATTR_BASIC ()) { /** * base @@ -555,7 +555,7 @@ __kernel void m00050_s08 (KERN_ATTR_BASIC ()) m00050s (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_extra0_buf, d_extra1_buf, d_extra2_buf, d_extra3_buf, bitmap_mask, bitmap_shift1, bitmap_shift2, salt_pos, loop_pos, loop_cnt, il_cnt, digests_cnt, digests_offset, combs_mode, gid_max); } -__kernel void m00050_s16 (KERN_ATTR_BASIC ()) +KERNEL_FQ void m00050_s16 (KERN_ATTR_BASIC ()) { /** * base diff --git a/OpenCL/m00050_a3-pure.cl b/OpenCL/m00050_a3-pure.cl index f9189ac50..f21066750 100644 --- a/OpenCL/m00050_a3-pure.cl +++ b/OpenCL/m00050_a3-pure.cl @@ -13,7 +13,7 @@ #include "inc_hash_md5.cl" #endif -__kernel void m00050_mxx (KERN_ATTR_VECTOR ()) +KERNEL_FQ void m00050_mxx (KERN_ATTR_VECTOR ()) { /** * modifier @@ -77,7 +77,7 @@ __kernel void m00050_mxx (KERN_ATTR_VECTOR ()) } } -__kernel void m00050_sxx (KERN_ATTR_VECTOR ()) +KERNEL_FQ void m00050_sxx (KERN_ATTR_VECTOR ()) { /** * modifier diff --git a/OpenCL/m00060_a0-optimized.cl b/OpenCL/m00060_a0-optimized.cl index 79d44e8f4..b229735cf 100644 --- a/OpenCL/m00060_a0-optimized.cl +++ b/OpenCL/m00060_a0-optimized.cl @@ -100,7 +100,7 @@ DECLSPEC void hmac_md5_run (u32x *w0, u32x *w1, u32x *w2, u32x *w3, u32x *ipad, md5_transform_vector (w0, w1, w2, w3, digest); } -__kernel void m00060_m04 (KERN_ATTR_RULES ()) +KERNEL_FQ void m00060_m04 (KERN_ATTR_RULES ()) { /** * modifier @@ -229,15 +229,15 @@ __kernel void m00060_m04 (KERN_ATTR_RULES ()) } } -__kernel void m00060_m08 (KERN_ATTR_RULES ()) +KERNEL_FQ void m00060_m08 (KERN_ATTR_RULES ()) { } -__kernel void m00060_m16 (KERN_ATTR_RULES ()) +KERNEL_FQ void m00060_m16 (KERN_ATTR_RULES ()) { } -__kernel void m00060_s04 (KERN_ATTR_RULES ()) +KERNEL_FQ void m00060_s04 (KERN_ATTR_RULES ()) { /** * modifier @@ -378,10 +378,10 @@ __kernel void m00060_s04 (KERN_ATTR_RULES ()) } } -__kernel void m00060_s08 (KERN_ATTR_RULES ()) +KERNEL_FQ void m00060_s08 (KERN_ATTR_RULES ()) { } -__kernel void m00060_s16 (KERN_ATTR_RULES ()) +KERNEL_FQ void m00060_s16 (KERN_ATTR_RULES ()) { } diff --git a/OpenCL/m00060_a0-pure.cl b/OpenCL/m00060_a0-pure.cl index 5db08dad5..d46ad0ce8 100644 --- a/OpenCL/m00060_a0-pure.cl +++ b/OpenCL/m00060_a0-pure.cl @@ -15,7 +15,7 @@ #include "inc_hash_md5.cl" #endif -__kernel void m00060_mxx (KERN_ATTR_RULES ()) +KERNEL_FQ void m00060_mxx (KERN_ATTR_RULES ()) { /** * modifier @@ -70,7 +70,7 @@ __kernel void m00060_mxx (KERN_ATTR_RULES ()) } } -__kernel void m00060_sxx (KERN_ATTR_RULES ()) +KERNEL_FQ void m00060_sxx (KERN_ATTR_RULES ()) { /** * modifier diff --git a/OpenCL/m00060_a1-optimized.cl b/OpenCL/m00060_a1-optimized.cl index 3ac733254..27c4b9b6c 100644 --- a/OpenCL/m00060_a1-optimized.cl +++ b/OpenCL/m00060_a1-optimized.cl @@ -98,7 +98,7 @@ DECLSPEC void hmac_md5_run (u32x *w0, u32x *w1, u32x *w2, u32x *w3, u32x *ipad, md5_transform_vector (w0, w1, w2, w3, digest); } -__kernel void m00060_m04 (KERN_ATTR_BASIC ()) +KERNEL_FQ void m00060_m04 (KERN_ATTR_BASIC ()) { /** * modifier @@ -268,15 +268,15 @@ __kernel void m00060_m04 (KERN_ATTR_BASIC ()) } } -__kernel void m00060_m08 (KERN_ATTR_BASIC ()) +KERNEL_FQ void m00060_m08 (KERN_ATTR_BASIC ()) { } -__kernel void m00060_m16 (KERN_ATTR_BASIC ()) +KERNEL_FQ void m00060_m16 (KERN_ATTR_BASIC ()) { } -__kernel void m00060_s04 (KERN_ATTR_BASIC ()) +KERNEL_FQ void m00060_s04 (KERN_ATTR_BASIC ()) { /** * modifier @@ -458,10 +458,10 @@ __kernel void m00060_s04 (KERN_ATTR_BASIC ()) } } -__kernel void m00060_s08 (KERN_ATTR_BASIC ()) +KERNEL_FQ void m00060_s08 (KERN_ATTR_BASIC ()) { } -__kernel void m00060_s16 (KERN_ATTR_BASIC ()) +KERNEL_FQ void m00060_s16 (KERN_ATTR_BASIC ()) { } diff --git a/OpenCL/m00060_a1-pure.cl b/OpenCL/m00060_a1-pure.cl index 45cd5568b..2019e8fe9 100644 --- a/OpenCL/m00060_a1-pure.cl +++ b/OpenCL/m00060_a1-pure.cl @@ -13,7 +13,7 @@ #include "inc_hash_md5.cl" #endif -__kernel void m00060_mxx (KERN_ATTR_BASIC ()) +KERNEL_FQ void m00060_mxx (KERN_ATTR_BASIC ()) { /** * modifier @@ -93,7 +93,7 @@ __kernel void m00060_mxx (KERN_ATTR_BASIC ()) } } -__kernel void m00060_sxx (KERN_ATTR_BASIC ()) +KERNEL_FQ void m00060_sxx (KERN_ATTR_BASIC ()) { /** * modifier diff --git a/OpenCL/m00060_a3-optimized.cl b/OpenCL/m00060_a3-optimized.cl index 766eb7650..1e06d6573 100644 --- a/OpenCL/m00060_a3-optimized.cl +++ b/OpenCL/m00060_a3-optimized.cl @@ -320,7 +320,7 @@ DECLSPEC void m00060s (u32 *w0, u32 *w1, u32 *w2, u32 *w3, const u32 pw_len, KER } } -__kernel void m00060_m04 (KERN_ATTR_BASIC ()) +KERNEL_FQ void m00060_m04 (KERN_ATTR_BASIC ()) { /** * base @@ -367,7 +367,7 @@ __kernel void m00060_m04 (KERN_ATTR_BASIC ()) m00060m (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_extra0_buf, d_extra1_buf, d_extra2_buf, d_extra3_buf, bitmap_mask, bitmap_shift1, bitmap_shift2, salt_pos, loop_pos, loop_cnt, il_cnt, digests_cnt, digests_offset, combs_mode, gid_max); } -__kernel void m00060_m08 (KERN_ATTR_BASIC ()) +KERNEL_FQ void m00060_m08 (KERN_ATTR_BASIC ()) { /** * base @@ -414,7 +414,7 @@ __kernel void m00060_m08 (KERN_ATTR_BASIC ()) m00060m (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_extra0_buf, d_extra1_buf, d_extra2_buf, d_extra3_buf, bitmap_mask, bitmap_shift1, bitmap_shift2, salt_pos, loop_pos, loop_cnt, il_cnt, digests_cnt, digests_offset, combs_mode, gid_max); } -__kernel void m00060_m16 (KERN_ATTR_BASIC ()) +KERNEL_FQ void m00060_m16 (KERN_ATTR_BASIC ()) { /** * base @@ -461,7 +461,7 @@ __kernel void m00060_m16 (KERN_ATTR_BASIC ()) m00060m (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_extra0_buf, d_extra1_buf, d_extra2_buf, d_extra3_buf, bitmap_mask, bitmap_shift1, bitmap_shift2, salt_pos, loop_pos, loop_cnt, il_cnt, digests_cnt, digests_offset, combs_mode, gid_max); } -__kernel void m00060_s04 (KERN_ATTR_BASIC ()) +KERNEL_FQ void m00060_s04 (KERN_ATTR_BASIC ()) { /** * base @@ -508,7 +508,7 @@ __kernel void m00060_s04 (KERN_ATTR_BASIC ()) m00060s (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_extra0_buf, d_extra1_buf, d_extra2_buf, d_extra3_buf, bitmap_mask, bitmap_shift1, bitmap_shift2, salt_pos, loop_pos, loop_cnt, il_cnt, digests_cnt, digests_offset, combs_mode, gid_max); } -__kernel void m00060_s08 (KERN_ATTR_BASIC ()) +KERNEL_FQ void m00060_s08 (KERN_ATTR_BASIC ()) { /** * base @@ -555,7 +555,7 @@ __kernel void m00060_s08 (KERN_ATTR_BASIC ()) m00060s (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_extra0_buf, d_extra1_buf, d_extra2_buf, d_extra3_buf, bitmap_mask, bitmap_shift1, bitmap_shift2, salt_pos, loop_pos, loop_cnt, il_cnt, digests_cnt, digests_offset, combs_mode, gid_max); } -__kernel void m00060_s16 (KERN_ATTR_BASIC ()) +KERNEL_FQ void m00060_s16 (KERN_ATTR_BASIC ()) { /** * base diff --git a/OpenCL/m00060_a3-pure.cl b/OpenCL/m00060_a3-pure.cl index 51bd3c93d..16d00ab57 100644 --- a/OpenCL/m00060_a3-pure.cl +++ b/OpenCL/m00060_a3-pure.cl @@ -13,7 +13,7 @@ #include "inc_hash_md5.cl" #endif -__kernel void m00060_mxx (KERN_ATTR_VECTOR ()) +KERNEL_FQ void m00060_mxx (KERN_ATTR_VECTOR ()) { /** * modifier @@ -79,7 +79,7 @@ __kernel void m00060_mxx (KERN_ATTR_VECTOR ()) } } -__kernel void m00060_sxx (KERN_ATTR_VECTOR ()) +KERNEL_FQ void m00060_sxx (KERN_ATTR_VECTOR ()) { /** * modifier diff --git a/OpenCL/m00100_a0-optimized.cl b/OpenCL/m00100_a0-optimized.cl index a11ba0633..1048908c1 100644 --- a/OpenCL/m00100_a0-optimized.cl +++ b/OpenCL/m00100_a0-optimized.cl @@ -15,7 +15,7 @@ #include "inc_hash_sha1.cl" #endif -__kernel void m00100_m04 (KERN_ATTR_RULES ()) +KERNEL_FQ void m00100_m04 (KERN_ATTR_RULES ()) { /** * modifier @@ -187,15 +187,15 @@ __kernel void m00100_m04 (KERN_ATTR_RULES ()) } } -__kernel void m00100_m08 (KERN_ATTR_RULES ()) +KERNEL_FQ void m00100_m08 (KERN_ATTR_RULES ()) { } -__kernel void m00100_m16 (KERN_ATTR_RULES ()) +KERNEL_FQ void m00100_m16 (KERN_ATTR_RULES ()) { } -__kernel void m00100_s04 (KERN_ATTR_RULES ()) +KERNEL_FQ void m00100_s04 (KERN_ATTR_RULES ()) { /** * modifier @@ -388,10 +388,10 @@ __kernel void m00100_s04 (KERN_ATTR_RULES ()) } } -__kernel void m00100_s08 (KERN_ATTR_RULES ()) +KERNEL_FQ void m00100_s08 (KERN_ATTR_RULES ()) { } -__kernel void m00100_s16 (KERN_ATTR_RULES ()) +KERNEL_FQ void m00100_s16 (KERN_ATTR_RULES ()) { } diff --git a/OpenCL/m00100_a0-pure.cl b/OpenCL/m00100_a0-pure.cl index 6120d9631..3b6068af9 100644 --- a/OpenCL/m00100_a0-pure.cl +++ b/OpenCL/m00100_a0-pure.cl @@ -15,7 +15,7 @@ #include "inc_hash_sha1.cl" #endif -__kernel void m00100_mxx (KERN_ATTR_RULES ()) +KERNEL_FQ void m00100_mxx (KERN_ATTR_RULES ()) { /** * modifier @@ -59,7 +59,7 @@ __kernel void m00100_mxx (KERN_ATTR_RULES ()) } } -__kernel void m00100_sxx (KERN_ATTR_RULES ()) +KERNEL_FQ void m00100_sxx (KERN_ATTR_RULES ()) { /** * modifier diff --git a/OpenCL/m00100_a1-optimized.cl b/OpenCL/m00100_a1-optimized.cl index 75c52ca7e..67b68185e 100644 --- a/OpenCL/m00100_a1-optimized.cl +++ b/OpenCL/m00100_a1-optimized.cl @@ -13,7 +13,7 @@ #include "inc_hash_sha1.cl" #endif -__kernel void m00100_m04 (KERN_ATTR_BASIC ()) +KERNEL_FQ void m00100_m04 (KERN_ATTR_BASIC ()) { /** * modifier @@ -243,15 +243,15 @@ __kernel void m00100_m04 (KERN_ATTR_BASIC ()) } } -__kernel void m00100_m08 (KERN_ATTR_BASIC ()) +KERNEL_FQ void m00100_m08 (KERN_ATTR_BASIC ()) { } -__kernel void m00100_m16 (KERN_ATTR_BASIC ()) +KERNEL_FQ void m00100_m16 (KERN_ATTR_BASIC ()) { } -__kernel void m00100_s04 (KERN_ATTR_BASIC ()) +KERNEL_FQ void m00100_s04 (KERN_ATTR_BASIC ()) { /** * modifier @@ -502,10 +502,10 @@ __kernel void m00100_s04 (KERN_ATTR_BASIC ()) } } -__kernel void m00100_s08 (KERN_ATTR_BASIC ()) +KERNEL_FQ void m00100_s08 (KERN_ATTR_BASIC ()) { } -__kernel void m00100_s16 (KERN_ATTR_BASIC ()) +KERNEL_FQ void m00100_s16 (KERN_ATTR_BASIC ()) { } diff --git a/OpenCL/m00100_a1-pure.cl b/OpenCL/m00100_a1-pure.cl index beaf57fd9..2f0114d61 100644 --- a/OpenCL/m00100_a1-pure.cl +++ b/OpenCL/m00100_a1-pure.cl @@ -13,7 +13,7 @@ #include "inc_hash_sha1.cl" #endif -__kernel void m00100_mxx (KERN_ATTR_BASIC ()) +KERNEL_FQ void m00100_mxx (KERN_ATTR_BASIC ()) { /** * modifier @@ -55,7 +55,7 @@ __kernel void m00100_mxx (KERN_ATTR_BASIC ()) } } -__kernel void m00100_sxx (KERN_ATTR_BASIC ()) +KERNEL_FQ void m00100_sxx (KERN_ATTR_BASIC ()) { /** * modifier diff --git a/OpenCL/m00100_a3-optimized.cl b/OpenCL/m00100_a3-optimized.cl index ac599e687..653b3a294 100644 --- a/OpenCL/m00100_a3-optimized.cl +++ b/OpenCL/m00100_a3-optimized.cl @@ -521,7 +521,7 @@ DECLSPEC void m00100s (u32 *w, const u32 pw_len, KERN_ATTR_VECTOR ()) } } -__kernel void m00100_m04 (KERN_ATTR_VECTOR ()) +KERNEL_FQ void m00100_m04 (KERN_ATTR_VECTOR ()) { /** * base @@ -559,7 +559,7 @@ __kernel void m00100_m04 (KERN_ATTR_VECTOR ()) m00100m (w, pw_len, pws, rules_buf, combs_buf, words_buf_r, 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_extra0_buf, d_extra1_buf, d_extra2_buf, d_extra3_buf, bitmap_mask, bitmap_shift1, bitmap_shift2, salt_pos, loop_pos, loop_cnt, il_cnt, digests_cnt, digests_offset, combs_mode, gid_max); } -__kernel void m00100_m08 (KERN_ATTR_VECTOR ()) +KERNEL_FQ void m00100_m08 (KERN_ATTR_VECTOR ()) { /** * base @@ -597,7 +597,7 @@ __kernel void m00100_m08 (KERN_ATTR_VECTOR ()) m00100m (w, pw_len, pws, rules_buf, combs_buf, words_buf_r, 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_extra0_buf, d_extra1_buf, d_extra2_buf, d_extra3_buf, bitmap_mask, bitmap_shift1, bitmap_shift2, salt_pos, loop_pos, loop_cnt, il_cnt, digests_cnt, digests_offset, combs_mode, gid_max); } -__kernel void m00100_m16 (KERN_ATTR_VECTOR ()) +KERNEL_FQ void m00100_m16 (KERN_ATTR_VECTOR ()) { /** * base @@ -635,7 +635,7 @@ __kernel void m00100_m16 (KERN_ATTR_VECTOR ()) m00100m (w, pw_len, pws, rules_buf, combs_buf, words_buf_r, 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_extra0_buf, d_extra1_buf, d_extra2_buf, d_extra3_buf, bitmap_mask, bitmap_shift1, bitmap_shift2, salt_pos, loop_pos, loop_cnt, il_cnt, digests_cnt, digests_offset, combs_mode, gid_max); } -__kernel void m00100_s04 (KERN_ATTR_VECTOR ()) +KERNEL_FQ void m00100_s04 (KERN_ATTR_VECTOR ()) { /** * base @@ -673,7 +673,7 @@ __kernel void m00100_s04 (KERN_ATTR_VECTOR ()) m00100s (w, pw_len, pws, rules_buf, combs_buf, words_buf_r, 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_extra0_buf, d_extra1_buf, d_extra2_buf, d_extra3_buf, bitmap_mask, bitmap_shift1, bitmap_shift2, salt_pos, loop_pos, loop_cnt, il_cnt, digests_cnt, digests_offset, combs_mode, gid_max); } -__kernel void m00100_s08 (KERN_ATTR_VECTOR ()) +KERNEL_FQ void m00100_s08 (KERN_ATTR_VECTOR ()) { /** * base @@ -711,7 +711,7 @@ __kernel void m00100_s08 (KERN_ATTR_VECTOR ()) m00100s (w, pw_len, pws, rules_buf, combs_buf, words_buf_r, 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_extra0_buf, d_extra1_buf, d_extra2_buf, d_extra3_buf, bitmap_mask, bitmap_shift1, bitmap_shift2, salt_pos, loop_pos, loop_cnt, il_cnt, digests_cnt, digests_offset, combs_mode, gid_max); } -__kernel void m00100_s16 (KERN_ATTR_VECTOR ()) +KERNEL_FQ void m00100_s16 (KERN_ATTR_VECTOR ()) { /** * base diff --git a/OpenCL/m00100_a3-pure.cl b/OpenCL/m00100_a3-pure.cl index 2532f8c1c..4134eca49 100644 --- a/OpenCL/m00100_a3-pure.cl +++ b/OpenCL/m00100_a3-pure.cl @@ -13,7 +13,7 @@ #include "inc_hash_sha1.cl" #endif -__kernel void m00100_mxx (KERN_ATTR_VECTOR ()) +KERNEL_FQ void m00100_mxx (KERN_ATTR_VECTOR ()) { /** * modifier @@ -68,7 +68,7 @@ __kernel void m00100_mxx (KERN_ATTR_VECTOR ()) } } -__kernel void m00100_sxx (KERN_ATTR_VECTOR ()) +KERNEL_FQ void m00100_sxx (KERN_ATTR_VECTOR ()) { /** * modifier diff --git a/OpenCL/m00110_a0-optimized.cl b/OpenCL/m00110_a0-optimized.cl index 8d8eb3a68..6fd0094aa 100644 --- a/OpenCL/m00110_a0-optimized.cl +++ b/OpenCL/m00110_a0-optimized.cl @@ -15,7 +15,7 @@ #include "inc_hash_sha1.cl" #endif -__kernel void m00110_m04 (KERN_ATTR_RULES ()) +KERNEL_FQ void m00110_m04 (KERN_ATTR_RULES ()) { /** * modifier @@ -260,15 +260,15 @@ __kernel void m00110_m04 (KERN_ATTR_RULES ()) } } -__kernel void m00110_m08 (KERN_ATTR_RULES ()) +KERNEL_FQ void m00110_m08 (KERN_ATTR_RULES ()) { } -__kernel void m00110_m16 (KERN_ATTR_RULES ()) +KERNEL_FQ void m00110_m16 (KERN_ATTR_RULES ()) { } -__kernel void m00110_s04 (KERN_ATTR_RULES ()) +KERNEL_FQ void m00110_s04 (KERN_ATTR_RULES ()) { /** * modifier @@ -534,10 +534,10 @@ __kernel void m00110_s04 (KERN_ATTR_RULES ()) } } -__kernel void m00110_s08 (KERN_ATTR_RULES ()) +KERNEL_FQ void m00110_s08 (KERN_ATTR_RULES ()) { } -__kernel void m00110_s16 (KERN_ATTR_RULES ()) +KERNEL_FQ void m00110_s16 (KERN_ATTR_RULES ()) { } diff --git a/OpenCL/m00110_a0-pure.cl b/OpenCL/m00110_a0-pure.cl index 34ab7d3dc..173b04ca0 100644 --- a/OpenCL/m00110_a0-pure.cl +++ b/OpenCL/m00110_a0-pure.cl @@ -15,7 +15,7 @@ #include "inc_hash_sha1.cl" #endif -__kernel void m00110_mxx (KERN_ATTR_RULES ()) +KERNEL_FQ void m00110_mxx (KERN_ATTR_RULES ()) { /** * modifier @@ -70,7 +70,7 @@ __kernel void m00110_mxx (KERN_ATTR_RULES ()) } } -__kernel void m00110_sxx (KERN_ATTR_RULES ()) +KERNEL_FQ void m00110_sxx (KERN_ATTR_RULES ()) { /** * modifier diff --git a/OpenCL/m00110_a1-optimized.cl b/OpenCL/m00110_a1-optimized.cl index 73030a3e8..d29ed49f2 100644 --- a/OpenCL/m00110_a1-optimized.cl +++ b/OpenCL/m00110_a1-optimized.cl @@ -13,7 +13,7 @@ #include "inc_hash_sha1.cl" #endif -__kernel void m00110_m04 (KERN_ATTR_BASIC ()) +KERNEL_FQ void m00110_m04 (KERN_ATTR_BASIC ()) { /** * modifier @@ -318,15 +318,15 @@ __kernel void m00110_m04 (KERN_ATTR_BASIC ()) } } -__kernel void m00110_m08 (KERN_ATTR_BASIC ()) +KERNEL_FQ void m00110_m08 (KERN_ATTR_BASIC ()) { } -__kernel void m00110_m16 (KERN_ATTR_BASIC ()) +KERNEL_FQ void m00110_m16 (KERN_ATTR_BASIC ()) { } -__kernel void m00110_s04 (KERN_ATTR_BASIC ()) +KERNEL_FQ void m00110_s04 (KERN_ATTR_BASIC ()) { /** * modifier @@ -652,10 +652,10 @@ __kernel void m00110_s04 (KERN_ATTR_BASIC ()) } } -__kernel void m00110_s08 (KERN_ATTR_BASIC ()) +KERNEL_FQ void m00110_s08 (KERN_ATTR_BASIC ()) { } -__kernel void m00110_s16 (KERN_ATTR_BASIC ()) +KERNEL_FQ void m00110_s16 (KERN_ATTR_BASIC ()) { } diff --git a/OpenCL/m00110_a1-pure.cl b/OpenCL/m00110_a1-pure.cl index d12baebbc..da6f2f412 100644 --- a/OpenCL/m00110_a1-pure.cl +++ b/OpenCL/m00110_a1-pure.cl @@ -13,7 +13,7 @@ #include "inc_hash_sha1.cl" #endif -__kernel void m00110_mxx (KERN_ATTR_BASIC ()) +KERNEL_FQ void m00110_mxx (KERN_ATTR_BASIC ()) { /** * modifier @@ -66,7 +66,7 @@ __kernel void m00110_mxx (KERN_ATTR_BASIC ()) } } -__kernel void m00110_sxx (KERN_ATTR_BASIC ()) +KERNEL_FQ void m00110_sxx (KERN_ATTR_BASIC ()) { /** * modifier diff --git a/OpenCL/m00110_a3-optimized.cl b/OpenCL/m00110_a3-optimized.cl index 1b76bc7a4..aba0221be 100644 --- a/OpenCL/m00110_a3-optimized.cl +++ b/OpenCL/m00110_a3-optimized.cl @@ -569,7 +569,7 @@ DECLSPEC void m00110s (u32 *w, const u32 pw_len, KERN_ATTR_VECTOR ()) } } -__kernel void m00110_m04 (KERN_ATTR_VECTOR ()) +KERNEL_FQ void m00110_m04 (KERN_ATTR_VECTOR ()) { /** * base @@ -607,7 +607,7 @@ __kernel void m00110_m04 (KERN_ATTR_VECTOR ()) m00110m (w, pw_len, pws, rules_buf, combs_buf, words_buf_r, 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_extra0_buf, d_extra1_buf, d_extra2_buf, d_extra3_buf, bitmap_mask, bitmap_shift1, bitmap_shift2, salt_pos, loop_pos, loop_cnt, il_cnt, digests_cnt, digests_offset, combs_mode, gid_max); } -__kernel void m00110_m08 (KERN_ATTR_VECTOR ()) +KERNEL_FQ void m00110_m08 (KERN_ATTR_VECTOR ()) { /** * base @@ -645,7 +645,7 @@ __kernel void m00110_m08 (KERN_ATTR_VECTOR ()) m00110m (w, pw_len, pws, rules_buf, combs_buf, words_buf_r, 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_extra0_buf, d_extra1_buf, d_extra2_buf, d_extra3_buf, bitmap_mask, bitmap_shift1, bitmap_shift2, salt_pos, loop_pos, loop_cnt, il_cnt, digests_cnt, digests_offset, combs_mode, gid_max); } -__kernel void m00110_m16 (KERN_ATTR_VECTOR ()) +KERNEL_FQ void m00110_m16 (KERN_ATTR_VECTOR ()) { /** * base @@ -683,7 +683,7 @@ __kernel void m00110_m16 (KERN_ATTR_VECTOR ()) m00110m (w, pw_len, pws, rules_buf, combs_buf, words_buf_r, 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_extra0_buf, d_extra1_buf, d_extra2_buf, d_extra3_buf, bitmap_mask, bitmap_shift1, bitmap_shift2, salt_pos, loop_pos, loop_cnt, il_cnt, digests_cnt, digests_offset, combs_mode, gid_max); } -__kernel void m00110_s04 (KERN_ATTR_VECTOR ()) +KERNEL_FQ void m00110_s04 (KERN_ATTR_VECTOR ()) { /** * base @@ -721,7 +721,7 @@ __kernel void m00110_s04 (KERN_ATTR_VECTOR ()) m00110s (w, pw_len, pws, rules_buf, combs_buf, words_buf_r, 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_extra0_buf, d_extra1_buf, d_extra2_buf, d_extra3_buf, bitmap_mask, bitmap_shift1, bitmap_shift2, salt_pos, loop_pos, loop_cnt, il_cnt, digests_cnt, digests_offset, combs_mode, gid_max); } -__kernel void m00110_s08 (KERN_ATTR_VECTOR ()) +KERNEL_FQ void m00110_s08 (KERN_ATTR_VECTOR ()) { /** * base @@ -759,7 +759,7 @@ __kernel void m00110_s08 (KERN_ATTR_VECTOR ()) m00110s (w, pw_len, pws, rules_buf, combs_buf, words_buf_r, 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_extra0_buf, d_extra1_buf, d_extra2_buf, d_extra3_buf, bitmap_mask, bitmap_shift1, bitmap_shift2, salt_pos, loop_pos, loop_cnt, il_cnt, digests_cnt, digests_offset, combs_mode, gid_max); } -__kernel void m00110_s16 (KERN_ATTR_VECTOR ()) +KERNEL_FQ void m00110_s16 (KERN_ATTR_VECTOR ()) { /** * base diff --git a/OpenCL/m00110_a3-pure.cl b/OpenCL/m00110_a3-pure.cl index dbe6e6ab1..0ef58edb4 100644 --- a/OpenCL/m00110_a3-pure.cl +++ b/OpenCL/m00110_a3-pure.cl @@ -13,7 +13,7 @@ #include "inc_hash_sha1.cl" #endif -__kernel void m00110_mxx (KERN_ATTR_VECTOR ()) +KERNEL_FQ void m00110_mxx (KERN_ATTR_VECTOR ()) { /** * modifier @@ -79,7 +79,7 @@ __kernel void m00110_mxx (KERN_ATTR_VECTOR ()) } } -__kernel void m00110_sxx (KERN_ATTR_VECTOR ()) +KERNEL_FQ void m00110_sxx (KERN_ATTR_VECTOR ()) { /** * modifier diff --git a/OpenCL/m00120_a0-optimized.cl b/OpenCL/m00120_a0-optimized.cl index 25dd47ae9..09b167c74 100644 --- a/OpenCL/m00120_a0-optimized.cl +++ b/OpenCL/m00120_a0-optimized.cl @@ -15,7 +15,7 @@ #include "inc_hash_sha1.cl" #endif -__kernel void m00120_m04 (KERN_ATTR_RULES ()) +KERNEL_FQ void m00120_m04 (KERN_ATTR_RULES ()) { /** * modifier @@ -252,15 +252,15 @@ __kernel void m00120_m04 (KERN_ATTR_RULES ()) } } -__kernel void m00120_m08 (KERN_ATTR_RULES ()) +KERNEL_FQ void m00120_m08 (KERN_ATTR_RULES ()) { } -__kernel void m00120_m16 (KERN_ATTR_RULES ()) +KERNEL_FQ void m00120_m16 (KERN_ATTR_RULES ()) { } -__kernel void m00120_s04 (KERN_ATTR_RULES ()) +KERNEL_FQ void m00120_s04 (KERN_ATTR_RULES ()) { /** * modifier @@ -506,10 +506,10 @@ __kernel void m00120_s04 (KERN_ATTR_RULES ()) } } -__kernel void m00120_s08 (KERN_ATTR_RULES ()) +KERNEL_FQ void m00120_s08 (KERN_ATTR_RULES ()) { } -__kernel void m00120_s16 (KERN_ATTR_RULES ()) +KERNEL_FQ void m00120_s16 (KERN_ATTR_RULES ()) { } diff --git a/OpenCL/m00120_a0-pure.cl b/OpenCL/m00120_a0-pure.cl index c56460911..653e2d0f8 100644 --- a/OpenCL/m00120_a0-pure.cl +++ b/OpenCL/m00120_a0-pure.cl @@ -15,7 +15,7 @@ #include "inc_hash_sha1.cl" #endif -__kernel void m00120_mxx (KERN_ATTR_RULES ()) +KERNEL_FQ void m00120_mxx (KERN_ATTR_RULES ()) { /** * modifier @@ -63,7 +63,7 @@ __kernel void m00120_mxx (KERN_ATTR_RULES ()) } } -__kernel void m00120_sxx (KERN_ATTR_RULES ()) +KERNEL_FQ void m00120_sxx (KERN_ATTR_RULES ()) { /** * modifier diff --git a/OpenCL/m00120_a1-optimized.cl b/OpenCL/m00120_a1-optimized.cl index a8bf4008a..62039bbb3 100644 --- a/OpenCL/m00120_a1-optimized.cl +++ b/OpenCL/m00120_a1-optimized.cl @@ -13,7 +13,7 @@ #include "inc_hash_sha1.cl" #endif -__kernel void m00120_m04 (KERN_ATTR_BASIC ()) +KERNEL_FQ void m00120_m04 (KERN_ATTR_BASIC ()) { /** * modifier @@ -308,15 +308,15 @@ __kernel void m00120_m04 (KERN_ATTR_BASIC ()) } } -__kernel void m00120_m08 (KERN_ATTR_BASIC ()) +KERNEL_FQ void m00120_m08 (KERN_ATTR_BASIC ()) { } -__kernel void m00120_m16 (KERN_ATTR_BASIC ()) +KERNEL_FQ void m00120_m16 (KERN_ATTR_BASIC ()) { } -__kernel void m00120_s04 (KERN_ATTR_BASIC ()) +KERNEL_FQ void m00120_s04 (KERN_ATTR_BASIC ()) { /** * modifier @@ -620,10 +620,10 @@ __kernel void m00120_s04 (KERN_ATTR_BASIC ()) } } -__kernel void m00120_s08 (KERN_ATTR_BASIC ()) +KERNEL_FQ void m00120_s08 (KERN_ATTR_BASIC ()) { } -__kernel void m00120_s16 (KERN_ATTR_BASIC ()) +KERNEL_FQ void m00120_s16 (KERN_ATTR_BASIC ()) { } diff --git a/OpenCL/m00120_a1-pure.cl b/OpenCL/m00120_a1-pure.cl index 4683d66e2..c2c5d1f59 100644 --- a/OpenCL/m00120_a1-pure.cl +++ b/OpenCL/m00120_a1-pure.cl @@ -13,7 +13,7 @@ #include "inc_hash_sha1.cl" #endif -__kernel void m00120_mxx (KERN_ATTR_BASIC ()) +KERNEL_FQ void m00120_mxx (KERN_ATTR_BASIC ()) { /** * modifier @@ -57,7 +57,7 @@ __kernel void m00120_mxx (KERN_ATTR_BASIC ()) } } -__kernel void m00120_sxx (KERN_ATTR_BASIC ()) +KERNEL_FQ void m00120_sxx (KERN_ATTR_BASIC ()) { /** * modifier diff --git a/OpenCL/m00120_a3-optimized.cl b/OpenCL/m00120_a3-optimized.cl index 3aa410c73..ead33eee7 100644 --- a/OpenCL/m00120_a3-optimized.cl +++ b/OpenCL/m00120_a3-optimized.cl @@ -472,7 +472,7 @@ DECLSPEC void m00120s (u32 *w0, u32 *w1, u32 *w2, u32 *w3, const u32 pw_len, KER } } -__kernel void m00120_m04 (KERN_ATTR_BASIC ()) +KERNEL_FQ void m00120_m04 (KERN_ATTR_BASIC ()) { /** * base @@ -519,7 +519,7 @@ __kernel void m00120_m04 (KERN_ATTR_BASIC ()) m00120m (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_extra0_buf, d_extra1_buf, d_extra2_buf, d_extra3_buf, bitmap_mask, bitmap_shift1, bitmap_shift2, salt_pos, loop_pos, loop_cnt, il_cnt, digests_cnt, digests_offset, combs_mode, gid_max); } -__kernel void m00120_m08 (KERN_ATTR_BASIC ()) +KERNEL_FQ void m00120_m08 (KERN_ATTR_BASIC ()) { /** * base @@ -566,7 +566,7 @@ __kernel void m00120_m08 (KERN_ATTR_BASIC ()) m00120m (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_extra0_buf, d_extra1_buf, d_extra2_buf, d_extra3_buf, bitmap_mask, bitmap_shift1, bitmap_shift2, salt_pos, loop_pos, loop_cnt, il_cnt, digests_cnt, digests_offset, combs_mode, gid_max); } -__kernel void m00120_m16 (KERN_ATTR_BASIC ()) +KERNEL_FQ void m00120_m16 (KERN_ATTR_BASIC ()) { /** * base @@ -613,7 +613,7 @@ __kernel void m00120_m16 (KERN_ATTR_BASIC ()) m00120m (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_extra0_buf, d_extra1_buf, d_extra2_buf, d_extra3_buf, bitmap_mask, bitmap_shift1, bitmap_shift2, salt_pos, loop_pos, loop_cnt, il_cnt, digests_cnt, digests_offset, combs_mode, gid_max); } -__kernel void m00120_s04 (KERN_ATTR_BASIC ()) +KERNEL_FQ void m00120_s04 (KERN_ATTR_BASIC ()) { /** * base @@ -660,7 +660,7 @@ __kernel void m00120_s04 (KERN_ATTR_BASIC ()) m00120s (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_extra0_buf, d_extra1_buf, d_extra2_buf, d_extra3_buf, bitmap_mask, bitmap_shift1, bitmap_shift2, salt_pos, loop_pos, loop_cnt, il_cnt, digests_cnt, digests_offset, combs_mode, gid_max); } -__kernel void m00120_s08 (KERN_ATTR_BASIC ()) +KERNEL_FQ void m00120_s08 (KERN_ATTR_BASIC ()) { /** * base @@ -707,7 +707,7 @@ __kernel void m00120_s08 (KERN_ATTR_BASIC ()) m00120s (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_extra0_buf, d_extra1_buf, d_extra2_buf, d_extra3_buf, bitmap_mask, bitmap_shift1, bitmap_shift2, salt_pos, loop_pos, loop_cnt, il_cnt, digests_cnt, digests_offset, combs_mode, gid_max); } -__kernel void m00120_s16 (KERN_ATTR_BASIC ()) +KERNEL_FQ void m00120_s16 (KERN_ATTR_BASIC ()) { /** * base diff --git a/OpenCL/m00120_a3-pure.cl b/OpenCL/m00120_a3-pure.cl index 605317bc4..65c6b070a 100644 --- a/OpenCL/m00120_a3-pure.cl +++ b/OpenCL/m00120_a3-pure.cl @@ -13,7 +13,7 @@ #include "inc_hash_sha1.cl" #endif -__kernel void m00120_mxx (KERN_ATTR_VECTOR ()) +KERNEL_FQ void m00120_mxx (KERN_ATTR_VECTOR ()) { /** * modifier @@ -74,7 +74,7 @@ __kernel void m00120_mxx (KERN_ATTR_VECTOR ()) } } -__kernel void m00120_sxx (KERN_ATTR_VECTOR ()) +KERNEL_FQ void m00120_sxx (KERN_ATTR_VECTOR ()) { /** * modifier diff --git a/OpenCL/m00130_a0-optimized.cl b/OpenCL/m00130_a0-optimized.cl index 2de86f9bd..4c472bdbb 100644 --- a/OpenCL/m00130_a0-optimized.cl +++ b/OpenCL/m00130_a0-optimized.cl @@ -15,7 +15,7 @@ #include "inc_hash_sha1.cl" #endif -__kernel void m00130_m04 (KERN_ATTR_RULES ()) +KERNEL_FQ void m00130_m04 (KERN_ATTR_RULES ()) { /** * modifier @@ -265,15 +265,15 @@ __kernel void m00130_m04 (KERN_ATTR_RULES ()) } } -__kernel void m00130_m08 (KERN_ATTR_RULES ()) +KERNEL_FQ void m00130_m08 (KERN_ATTR_RULES ()) { } -__kernel void m00130_m16 (KERN_ATTR_RULES ()) +KERNEL_FQ void m00130_m16 (KERN_ATTR_RULES ()) { } -__kernel void m00130_s04 (KERN_ATTR_RULES ()) +KERNEL_FQ void m00130_s04 (KERN_ATTR_RULES ()) { /** * modifier @@ -544,10 +544,10 @@ __kernel void m00130_s04 (KERN_ATTR_RULES ()) } } -__kernel void m00130_s08 (KERN_ATTR_RULES ()) +KERNEL_FQ void m00130_s08 (KERN_ATTR_RULES ()) { } -__kernel void m00130_s16 (KERN_ATTR_RULES ()) +KERNEL_FQ void m00130_s16 (KERN_ATTR_RULES ()) { } diff --git a/OpenCL/m00130_a0-pure.cl b/OpenCL/m00130_a0-pure.cl index f4412381a..300f2875b 100644 --- a/OpenCL/m00130_a0-pure.cl +++ b/OpenCL/m00130_a0-pure.cl @@ -15,7 +15,7 @@ #include "inc_hash_sha1.cl" #endif -__kernel void m00130_mxx (KERN_ATTR_RULES ()) +KERNEL_FQ void m00130_mxx (KERN_ATTR_RULES ()) { /** * modifier @@ -70,7 +70,7 @@ __kernel void m00130_mxx (KERN_ATTR_RULES ()) } } -__kernel void m00130_sxx (KERN_ATTR_RULES ()) +KERNEL_FQ void m00130_sxx (KERN_ATTR_RULES ()) { /** * modifier diff --git a/OpenCL/m00130_a1-optimized.cl b/OpenCL/m00130_a1-optimized.cl index 382f89fbf..078c6e358 100644 --- a/OpenCL/m00130_a1-optimized.cl +++ b/OpenCL/m00130_a1-optimized.cl @@ -13,7 +13,7 @@ #include "inc_hash_sha1.cl" #endif -__kernel void m00130_m04 (KERN_ATTR_BASIC ()) +KERNEL_FQ void m00130_m04 (KERN_ATTR_BASIC ()) { /** * modifier @@ -323,15 +323,15 @@ __kernel void m00130_m04 (KERN_ATTR_BASIC ()) } } -__kernel void m00130_m08 (KERN_ATTR_BASIC ()) +KERNEL_FQ void m00130_m08 (KERN_ATTR_BASIC ()) { } -__kernel void m00130_m16 (KERN_ATTR_BASIC ()) +KERNEL_FQ void m00130_m16 (KERN_ATTR_BASIC ()) { } -__kernel void m00130_s04 (KERN_ATTR_BASIC ()) +KERNEL_FQ void m00130_s04 (KERN_ATTR_BASIC ()) { /** * modifier @@ -662,10 +662,10 @@ __kernel void m00130_s04 (KERN_ATTR_BASIC ()) } } -__kernel void m00130_s08 (KERN_ATTR_BASIC ()) +KERNEL_FQ void m00130_s08 (KERN_ATTR_BASIC ()) { } -__kernel void m00130_s16 (KERN_ATTR_BASIC ()) +KERNEL_FQ void m00130_s16 (KERN_ATTR_BASIC ()) { } diff --git a/OpenCL/m00130_a1-pure.cl b/OpenCL/m00130_a1-pure.cl index 0fe3a9b2e..f8365580c 100644 --- a/OpenCL/m00130_a1-pure.cl +++ b/OpenCL/m00130_a1-pure.cl @@ -13,7 +13,7 @@ #include "inc_hash_sha1.cl" #endif -__kernel void m00130_mxx (KERN_ATTR_BASIC ()) +KERNEL_FQ void m00130_mxx (KERN_ATTR_BASIC ()) { /** * modifier @@ -66,7 +66,7 @@ __kernel void m00130_mxx (KERN_ATTR_BASIC ()) } } -__kernel void m00130_sxx (KERN_ATTR_BASIC ()) +KERNEL_FQ void m00130_sxx (KERN_ATTR_BASIC ()) { /** * modifier diff --git a/OpenCL/m00130_a3-optimized.cl b/OpenCL/m00130_a3-optimized.cl index 9c4ea31e0..5990831b5 100644 --- a/OpenCL/m00130_a3-optimized.cl +++ b/OpenCL/m00130_a3-optimized.cl @@ -569,7 +569,7 @@ DECLSPEC void m00130s (u32 *w, const u32 pw_len, KERN_ATTR_VECTOR ()) } } -__kernel void m00130_m04 (KERN_ATTR_VECTOR ()) +KERNEL_FQ void m00130_m04 (KERN_ATTR_VECTOR ()) { /** * base @@ -607,7 +607,7 @@ __kernel void m00130_m04 (KERN_ATTR_VECTOR ()) m00130m (w, pw_len, pws, rules_buf, combs_buf, words_buf_r, 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_extra0_buf, d_extra1_buf, d_extra2_buf, d_extra3_buf, bitmap_mask, bitmap_shift1, bitmap_shift2, salt_pos, loop_pos, loop_cnt, il_cnt, digests_cnt, digests_offset, combs_mode, gid_max); } -__kernel void m00130_m08 (KERN_ATTR_VECTOR ()) +KERNEL_FQ void m00130_m08 (KERN_ATTR_VECTOR ()) { /** * base @@ -645,7 +645,7 @@ __kernel void m00130_m08 (KERN_ATTR_VECTOR ()) m00130m (w, pw_len, pws, rules_buf, combs_buf, words_buf_r, 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_extra0_buf, d_extra1_buf, d_extra2_buf, d_extra3_buf, bitmap_mask, bitmap_shift1, bitmap_shift2, salt_pos, loop_pos, loop_cnt, il_cnt, digests_cnt, digests_offset, combs_mode, gid_max); } -__kernel void m00130_m16 (KERN_ATTR_VECTOR ()) +KERNEL_FQ void m00130_m16 (KERN_ATTR_VECTOR ()) { /** * base @@ -683,7 +683,7 @@ __kernel void m00130_m16 (KERN_ATTR_VECTOR ()) m00130m (w, pw_len, pws, rules_buf, combs_buf, words_buf_r, 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_extra0_buf, d_extra1_buf, d_extra2_buf, d_extra3_buf, bitmap_mask, bitmap_shift1, bitmap_shift2, salt_pos, loop_pos, loop_cnt, il_cnt, digests_cnt, digests_offset, combs_mode, gid_max); } -__kernel void m00130_s04 (KERN_ATTR_VECTOR ()) +KERNEL_FQ void m00130_s04 (KERN_ATTR_VECTOR ()) { /** * base @@ -721,7 +721,7 @@ __kernel void m00130_s04 (KERN_ATTR_VECTOR ()) m00130s (w, pw_len, pws, rules_buf, combs_buf, words_buf_r, 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_extra0_buf, d_extra1_buf, d_extra2_buf, d_extra3_buf, bitmap_mask, bitmap_shift1, bitmap_shift2, salt_pos, loop_pos, loop_cnt, il_cnt, digests_cnt, digests_offset, combs_mode, gid_max); } -__kernel void m00130_s08 (KERN_ATTR_VECTOR ()) +KERNEL_FQ void m00130_s08 (KERN_ATTR_VECTOR ()) { /** * base @@ -759,7 +759,7 @@ __kernel void m00130_s08 (KERN_ATTR_VECTOR ()) m00130s (w, pw_len, pws, rules_buf, combs_buf, words_buf_r, 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_extra0_buf, d_extra1_buf, d_extra2_buf, d_extra3_buf, bitmap_mask, bitmap_shift1, bitmap_shift2, salt_pos, loop_pos, loop_cnt, il_cnt, digests_cnt, digests_offset, combs_mode, gid_max); } -__kernel void m00130_s16 (KERN_ATTR_VECTOR ()) +KERNEL_FQ void m00130_s16 (KERN_ATTR_VECTOR ()) { /** * base diff --git a/OpenCL/m00130_a3-pure.cl b/OpenCL/m00130_a3-pure.cl index 0f45a56d4..b439996a1 100644 --- a/OpenCL/m00130_a3-pure.cl +++ b/OpenCL/m00130_a3-pure.cl @@ -13,7 +13,7 @@ #include "inc_hash_sha1.cl" #endif -__kernel void m00130_mxx (KERN_ATTR_VECTOR ()) +KERNEL_FQ void m00130_mxx (KERN_ATTR_VECTOR ()) { /** * modifier @@ -79,7 +79,7 @@ __kernel void m00130_mxx (KERN_ATTR_VECTOR ()) } } -__kernel void m00130_sxx (KERN_ATTR_VECTOR ()) +KERNEL_FQ void m00130_sxx (KERN_ATTR_VECTOR ()) { /** * modifier diff --git a/OpenCL/m00140_a0-optimized.cl b/OpenCL/m00140_a0-optimized.cl index 7773c5470..d9ecae30d 100644 --- a/OpenCL/m00140_a0-optimized.cl +++ b/OpenCL/m00140_a0-optimized.cl @@ -15,7 +15,7 @@ #include "inc_hash_sha1.cl" #endif -__kernel void m00140_m04 (KERN_ATTR_RULES ()) +KERNEL_FQ void m00140_m04 (KERN_ATTR_RULES ()) { /** * modifier @@ -245,15 +245,15 @@ __kernel void m00140_m04 (KERN_ATTR_RULES ()) } } -__kernel void m00140_m08 (KERN_ATTR_RULES ()) +KERNEL_FQ void m00140_m08 (KERN_ATTR_RULES ()) { } -__kernel void m00140_m16 (KERN_ATTR_RULES ()) +KERNEL_FQ void m00140_m16 (KERN_ATTR_RULES ()) { } -__kernel void m00140_s04 (KERN_ATTR_RULES ()) +KERNEL_FQ void m00140_s04 (KERN_ATTR_RULES ()) { /** * modifier @@ -504,10 +504,10 @@ __kernel void m00140_s04 (KERN_ATTR_RULES ()) } } -__kernel void m00140_s08 (KERN_ATTR_RULES ()) +KERNEL_FQ void m00140_s08 (KERN_ATTR_RULES ()) { } -__kernel void m00140_s16 (KERN_ATTR_RULES ()) +KERNEL_FQ void m00140_s16 (KERN_ATTR_RULES ()) { } diff --git a/OpenCL/m00140_a0-pure.cl b/OpenCL/m00140_a0-pure.cl index 4bc160261..d1a14354f 100644 --- a/OpenCL/m00140_a0-pure.cl +++ b/OpenCL/m00140_a0-pure.cl @@ -15,7 +15,7 @@ #include "inc_hash_sha1.cl" #endif -__kernel void m00140_mxx (KERN_ATTR_RULES ()) +KERNEL_FQ void m00140_mxx (KERN_ATTR_RULES ()) { /** * modifier @@ -63,7 +63,7 @@ __kernel void m00140_mxx (KERN_ATTR_RULES ()) } } -__kernel void m00140_sxx (KERN_ATTR_RULES ()) +KERNEL_FQ void m00140_sxx (KERN_ATTR_RULES ()) { /** * modifier diff --git a/OpenCL/m00140_a1-optimized.cl b/OpenCL/m00140_a1-optimized.cl index 562c3997e..277b77551 100644 --- a/OpenCL/m00140_a1-optimized.cl +++ b/OpenCL/m00140_a1-optimized.cl @@ -13,7 +13,7 @@ #include "inc_hash_sha1.cl" #endif -__kernel void m00140_m04 (KERN_ATTR_BASIC ()) +KERNEL_FQ void m00140_m04 (KERN_ATTR_BASIC ()) { /** * modifier @@ -301,15 +301,15 @@ __kernel void m00140_m04 (KERN_ATTR_BASIC ()) } } -__kernel void m00140_m08 (KERN_ATTR_BASIC ()) +KERNEL_FQ void m00140_m08 (KERN_ATTR_BASIC ()) { } -__kernel void m00140_m16 (KERN_ATTR_BASIC ()) +KERNEL_FQ void m00140_m16 (KERN_ATTR_BASIC ()) { } -__kernel void m00140_s04 (KERN_ATTR_BASIC ()) +KERNEL_FQ void m00140_s04 (KERN_ATTR_BASIC ()) { /** * modifier @@ -618,10 +618,10 @@ __kernel void m00140_s04 (KERN_ATTR_BASIC ()) } } -__kernel void m00140_s08 (KERN_ATTR_BASIC ()) +KERNEL_FQ void m00140_s08 (KERN_ATTR_BASIC ()) { } -__kernel void m00140_s16 (KERN_ATTR_BASIC ()) +KERNEL_FQ void m00140_s16 (KERN_ATTR_BASIC ()) { } diff --git a/OpenCL/m00140_a1-pure.cl b/OpenCL/m00140_a1-pure.cl index 7e8b7d366..902636b85 100644 --- a/OpenCL/m00140_a1-pure.cl +++ b/OpenCL/m00140_a1-pure.cl @@ -13,7 +13,7 @@ #include "inc_hash_sha1.cl" #endif -__kernel void m00140_mxx (KERN_ATTR_BASIC ()) +KERNEL_FQ void m00140_mxx (KERN_ATTR_BASIC ()) { /** * modifier @@ -57,7 +57,7 @@ __kernel void m00140_mxx (KERN_ATTR_BASIC ()) } } -__kernel void m00140_sxx (KERN_ATTR_BASIC ()) +KERNEL_FQ void m00140_sxx (KERN_ATTR_BASIC ()) { /** * modifier diff --git a/OpenCL/m00140_a3-optimized.cl b/OpenCL/m00140_a3-optimized.cl index ea15507cf..8f17d2afb 100644 --- a/OpenCL/m00140_a3-optimized.cl +++ b/OpenCL/m00140_a3-optimized.cl @@ -472,7 +472,7 @@ DECLSPEC void m00140s (u32 *w0, u32 *w1, u32 *w2, u32 *w3, const u32 pw_len, KER } } -__kernel void m00140_m04 (KERN_ATTR_BASIC ()) +KERNEL_FQ void m00140_m04 (KERN_ATTR_BASIC ()) { /** * base @@ -519,7 +519,7 @@ __kernel void m00140_m04 (KERN_ATTR_BASIC ()) m00140m (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_extra0_buf, d_extra1_buf, d_extra2_buf, d_extra3_buf, bitmap_mask, bitmap_shift1, bitmap_shift2, salt_pos, loop_pos, loop_cnt, il_cnt, digests_cnt, digests_offset, combs_mode, gid_max); } -__kernel void m00140_m08 (KERN_ATTR_BASIC ()) +KERNEL_FQ void m00140_m08 (KERN_ATTR_BASIC ()) { /** * base @@ -566,7 +566,7 @@ __kernel void m00140_m08 (KERN_ATTR_BASIC ()) m00140m (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_extra0_buf, d_extra1_buf, d_extra2_buf, d_extra3_buf, bitmap_mask, bitmap_shift1, bitmap_shift2, salt_pos, loop_pos, loop_cnt, il_cnt, digests_cnt, digests_offset, combs_mode, gid_max); } -__kernel void m00140_m16 (KERN_ATTR_BASIC ()) +KERNEL_FQ void m00140_m16 (KERN_ATTR_BASIC ()) { /** * base @@ -613,7 +613,7 @@ __kernel void m00140_m16 (KERN_ATTR_BASIC ()) m00140m (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_extra0_buf, d_extra1_buf, d_extra2_buf, d_extra3_buf, bitmap_mask, bitmap_shift1, bitmap_shift2, salt_pos, loop_pos, loop_cnt, il_cnt, digests_cnt, digests_offset, combs_mode, gid_max); } -__kernel void m00140_s04 (KERN_ATTR_BASIC ()) +KERNEL_FQ void m00140_s04 (KERN_ATTR_BASIC ()) { /** * base @@ -660,7 +660,7 @@ __kernel void m00140_s04 (KERN_ATTR_BASIC ()) m00140s (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_extra0_buf, d_extra1_buf, d_extra2_buf, d_extra3_buf, bitmap_mask, bitmap_shift1, bitmap_shift2, salt_pos, loop_pos, loop_cnt, il_cnt, digests_cnt, digests_offset, combs_mode, gid_max); } -__kernel void m00140_s08 (KERN_ATTR_BASIC ()) +KERNEL_FQ void m00140_s08 (KERN_ATTR_BASIC ()) { /** * base @@ -707,7 +707,7 @@ __kernel void m00140_s08 (KERN_ATTR_BASIC ()) m00140s (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_extra0_buf, d_extra1_buf, d_extra2_buf, d_extra3_buf, bitmap_mask, bitmap_shift1, bitmap_shift2, salt_pos, loop_pos, loop_cnt, il_cnt, digests_cnt, digests_offset, combs_mode, gid_max); } -__kernel void m00140_s16 (KERN_ATTR_BASIC ()) +KERNEL_FQ void m00140_s16 (KERN_ATTR_BASIC ()) { /** * base diff --git a/OpenCL/m00140_a3-pure.cl b/OpenCL/m00140_a3-pure.cl index b1a996bd5..a1e087445 100644 --- a/OpenCL/m00140_a3-pure.cl +++ b/OpenCL/m00140_a3-pure.cl @@ -13,7 +13,7 @@ #include "inc_hash_sha1.cl" #endif -__kernel void m00140_mxx (KERN_ATTR_VECTOR ()) +KERNEL_FQ void m00140_mxx (KERN_ATTR_VECTOR ()) { /** * modifier @@ -74,7 +74,7 @@ __kernel void m00140_mxx (KERN_ATTR_VECTOR ()) } } -__kernel void m00140_sxx (KERN_ATTR_VECTOR ()) +KERNEL_FQ void m00140_sxx (KERN_ATTR_VECTOR ()) { /** * modifier diff --git a/OpenCL/m00150_a0-optimized.cl b/OpenCL/m00150_a0-optimized.cl index f620410bb..82c63978c 100644 --- a/OpenCL/m00150_a0-optimized.cl +++ b/OpenCL/m00150_a0-optimized.cl @@ -104,7 +104,7 @@ DECLSPEC void hmac_sha1_run (u32x *w0, u32x *w1, u32x *w2, u32x *w3, u32x *ipad, sha1_transform_vector (w0, w1, w2, w3, digest); } -__kernel void m00150_m04 (KERN_ATTR_RULES ()) +KERNEL_FQ void m00150_m04 (KERN_ATTR_RULES ()) { /** * modifier @@ -218,15 +218,15 @@ __kernel void m00150_m04 (KERN_ATTR_RULES ()) } } -__kernel void m00150_m08 (KERN_ATTR_RULES ()) +KERNEL_FQ void m00150_m08 (KERN_ATTR_RULES ()) { } -__kernel void m00150_m16 (KERN_ATTR_RULES ()) +KERNEL_FQ void m00150_m16 (KERN_ATTR_RULES ()) { } -__kernel void m00150_s04 (KERN_ATTR_RULES ()) +KERNEL_FQ void m00150_s04 (KERN_ATTR_RULES ()) { /** * modifier @@ -352,10 +352,10 @@ __kernel void m00150_s04 (KERN_ATTR_RULES ()) } } -__kernel void m00150_s08 (KERN_ATTR_RULES ()) +KERNEL_FQ void m00150_s08 (KERN_ATTR_RULES ()) { } -__kernel void m00150_s16 (KERN_ATTR_RULES ()) +KERNEL_FQ void m00150_s16 (KERN_ATTR_RULES ()) { } diff --git a/OpenCL/m00150_a0-pure.cl b/OpenCL/m00150_a0-pure.cl index ca32106bd..8b351084b 100644 --- a/OpenCL/m00150_a0-pure.cl +++ b/OpenCL/m00150_a0-pure.cl @@ -15,7 +15,7 @@ #include "inc_hash_sha1.cl" #endif -__kernel void m00150_mxx (KERN_ATTR_RULES ()) +KERNEL_FQ void m00150_mxx (KERN_ATTR_RULES ()) { /** * modifier @@ -68,7 +68,7 @@ __kernel void m00150_mxx (KERN_ATTR_RULES ()) } } -__kernel void m00150_sxx (KERN_ATTR_RULES ()) +KERNEL_FQ void m00150_sxx (KERN_ATTR_RULES ()) { /** * modifier diff --git a/OpenCL/m00150_a1-optimized.cl b/OpenCL/m00150_a1-optimized.cl index d72ef4fa5..fab7cdadf 100644 --- a/OpenCL/m00150_a1-optimized.cl +++ b/OpenCL/m00150_a1-optimized.cl @@ -102,7 +102,7 @@ DECLSPEC void hmac_sha1_run (u32x *w0, u32x *w1, u32x *w2, u32x *w3, u32x *ipad, sha1_transform_vector (w0, w1, w2, w3, digest); } -__kernel void m00150_m04 (KERN_ATTR_BASIC ()) +KERNEL_FQ void m00150_m04 (KERN_ATTR_BASIC ()) { /** * modifier @@ -284,15 +284,15 @@ __kernel void m00150_m04 (KERN_ATTR_BASIC ()) } } -__kernel void m00150_m08 (KERN_ATTR_BASIC ()) +KERNEL_FQ void m00150_m08 (KERN_ATTR_BASIC ()) { } -__kernel void m00150_m16 (KERN_ATTR_BASIC ()) +KERNEL_FQ void m00150_m16 (KERN_ATTR_BASIC ()) { } -__kernel void m00150_s04 (KERN_ATTR_BASIC ()) +KERNEL_FQ void m00150_s04 (KERN_ATTR_BASIC ()) { /** * modifier @@ -486,10 +486,10 @@ __kernel void m00150_s04 (KERN_ATTR_BASIC ()) } } -__kernel void m00150_s08 (KERN_ATTR_BASIC ()) +KERNEL_FQ void m00150_s08 (KERN_ATTR_BASIC ()) { } -__kernel void m00150_s16 (KERN_ATTR_BASIC ()) +KERNEL_FQ void m00150_s16 (KERN_ATTR_BASIC ()) { } diff --git a/OpenCL/m00150_a1-pure.cl b/OpenCL/m00150_a1-pure.cl index 1f3ef85ef..5866835c6 100644 --- a/OpenCL/m00150_a1-pure.cl +++ b/OpenCL/m00150_a1-pure.cl @@ -13,7 +13,7 @@ #include "inc_hash_sha1.cl" #endif -__kernel void m00150_mxx (KERN_ATTR_BASIC ()) +KERNEL_FQ void m00150_mxx (KERN_ATTR_BASIC ()) { /** * modifier @@ -91,7 +91,7 @@ __kernel void m00150_mxx (KERN_ATTR_BASIC ()) } } -__kernel void m00150_sxx (KERN_ATTR_BASIC ()) +KERNEL_FQ void m00150_sxx (KERN_ATTR_BASIC ()) { /** * modifier diff --git a/OpenCL/m00150_a3-optimized.cl b/OpenCL/m00150_a3-optimized.cl index 3e78b85af..9740c8c54 100644 --- a/OpenCL/m00150_a3-optimized.cl +++ b/OpenCL/m00150_a3-optimized.cl @@ -324,7 +324,7 @@ DECLSPEC void m00150s (u32 *w0, u32 *w1, u32 *w2, u32 *w3, const u32 pw_len, KER } } -__kernel void m00150_m04 (KERN_ATTR_BASIC ()) +KERNEL_FQ void m00150_m04 (KERN_ATTR_BASIC ()) { /** * base @@ -371,7 +371,7 @@ __kernel void m00150_m04 (KERN_ATTR_BASIC ()) m00150m (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_extra0_buf, d_extra1_buf, d_extra2_buf, d_extra3_buf, bitmap_mask, bitmap_shift1, bitmap_shift2, salt_pos, loop_pos, loop_cnt, il_cnt, digests_cnt, digests_offset, combs_mode, gid_max); } -__kernel void m00150_m08 (KERN_ATTR_BASIC ()) +KERNEL_FQ void m00150_m08 (KERN_ATTR_BASIC ()) { /** * base @@ -418,7 +418,7 @@ __kernel void m00150_m08 (KERN_ATTR_BASIC ()) m00150m (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_extra0_buf, d_extra1_buf, d_extra2_buf, d_extra3_buf, bitmap_mask, bitmap_shift1, bitmap_shift2, salt_pos, loop_pos, loop_cnt, il_cnt, digests_cnt, digests_offset, combs_mode, gid_max); } -__kernel void m00150_m16 (KERN_ATTR_BASIC ()) +KERNEL_FQ void m00150_m16 (KERN_ATTR_BASIC ()) { /** * base @@ -465,7 +465,7 @@ __kernel void m00150_m16 (KERN_ATTR_BASIC ()) m00150m (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_extra0_buf, d_extra1_buf, d_extra2_buf, d_extra3_buf, bitmap_mask, bitmap_shift1, bitmap_shift2, salt_pos, loop_pos, loop_cnt, il_cnt, digests_cnt, digests_offset, combs_mode, gid_max); } -__kernel void m00150_s04 (KERN_ATTR_BASIC ()) +KERNEL_FQ void m00150_s04 (KERN_ATTR_BASIC ()) { /** * base @@ -512,7 +512,7 @@ __kernel void m00150_s04 (KERN_ATTR_BASIC ()) m00150s (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_extra0_buf, d_extra1_buf, d_extra2_buf, d_extra3_buf, bitmap_mask, bitmap_shift1, bitmap_shift2, salt_pos, loop_pos, loop_cnt, il_cnt, digests_cnt, digests_offset, combs_mode, gid_max); } -__kernel void m00150_s08 (KERN_ATTR_BASIC ()) +KERNEL_FQ void m00150_s08 (KERN_ATTR_BASIC ()) { /** * base @@ -559,7 +559,7 @@ __kernel void m00150_s08 (KERN_ATTR_BASIC ()) m00150s (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_extra0_buf, d_extra1_buf, d_extra2_buf, d_extra3_buf, bitmap_mask, bitmap_shift1, bitmap_shift2, salt_pos, loop_pos, loop_cnt, il_cnt, digests_cnt, digests_offset, combs_mode, gid_max); } -__kernel void m00150_s16 (KERN_ATTR_BASIC ()) +KERNEL_FQ void m00150_s16 (KERN_ATTR_BASIC ()) { /** * base diff --git a/OpenCL/m00150_a3-pure.cl b/OpenCL/m00150_a3-pure.cl index 794c5437c..ef48762b3 100644 --- a/OpenCL/m00150_a3-pure.cl +++ b/OpenCL/m00150_a3-pure.cl @@ -13,7 +13,7 @@ #include "inc_hash_sha1.cl" #endif -__kernel void m00150_mxx (KERN_ATTR_VECTOR ()) +KERNEL_FQ void m00150_mxx (KERN_ATTR_VECTOR ()) { /** * modifier @@ -77,7 +77,7 @@ __kernel void m00150_mxx (KERN_ATTR_VECTOR ()) } } -__kernel void m00150_sxx (KERN_ATTR_VECTOR ()) +KERNEL_FQ void m00150_sxx (KERN_ATTR_VECTOR ()) { /** * modifier diff --git a/OpenCL/m00160_a0-optimized.cl b/OpenCL/m00160_a0-optimized.cl index 55a0b4f61..f8fa7734b 100644 --- a/OpenCL/m00160_a0-optimized.cl +++ b/OpenCL/m00160_a0-optimized.cl @@ -104,7 +104,7 @@ DECLSPEC void hmac_sha1_run (u32x *w0, u32x *w1, u32x *w2, u32x *w3, u32x *ipad, sha1_transform_vector (w0, w1, w2, w3, digest); } -__kernel void m00160_m04 (KERN_ATTR_RULES ()) +KERNEL_FQ void m00160_m04 (KERN_ATTR_RULES ()) { /** * modifier @@ -233,15 +233,15 @@ __kernel void m00160_m04 (KERN_ATTR_RULES ()) } } -__kernel void m00160_m08 (KERN_ATTR_RULES ()) +KERNEL_FQ void m00160_m08 (KERN_ATTR_RULES ()) { } -__kernel void m00160_m16 (KERN_ATTR_RULES ()) +KERNEL_FQ void m00160_m16 (KERN_ATTR_RULES ()) { } -__kernel void m00160_s04 (KERN_ATTR_RULES ()) +KERNEL_FQ void m00160_s04 (KERN_ATTR_RULES ()) { /** * modifier @@ -382,10 +382,10 @@ __kernel void m00160_s04 (KERN_ATTR_RULES ()) } } -__kernel void m00160_s08 (KERN_ATTR_RULES ()) +KERNEL_FQ void m00160_s08 (KERN_ATTR_RULES ()) { } -__kernel void m00160_s16 (KERN_ATTR_RULES ()) +KERNEL_FQ void m00160_s16 (KERN_ATTR_RULES ()) { } diff --git a/OpenCL/m00160_a0-pure.cl b/OpenCL/m00160_a0-pure.cl index 90850882b..a77f809ba 100644 --- a/OpenCL/m00160_a0-pure.cl +++ b/OpenCL/m00160_a0-pure.cl @@ -15,7 +15,7 @@ #include "inc_hash_sha1.cl" #endif -__kernel void m00160_mxx (KERN_ATTR_RULES ()) +KERNEL_FQ void m00160_mxx (KERN_ATTR_RULES ()) { /** * modifier @@ -70,7 +70,7 @@ __kernel void m00160_mxx (KERN_ATTR_RULES ()) } } -__kernel void m00160_sxx (KERN_ATTR_RULES ()) +KERNEL_FQ void m00160_sxx (KERN_ATTR_RULES ()) { /** * modifier diff --git a/OpenCL/m00160_a1-optimized.cl b/OpenCL/m00160_a1-optimized.cl index 0f9269927..ff8502672 100644 --- a/OpenCL/m00160_a1-optimized.cl +++ b/OpenCL/m00160_a1-optimized.cl @@ -102,7 +102,7 @@ DECLSPEC void hmac_sha1_run (u32x *w0, u32x *w1, u32x *w2, u32x *w3, u32x *ipad, sha1_transform_vector (w0, w1, w2, w3, digest); } -__kernel void m00160_m04 (KERN_ATTR_BASIC ()) +KERNEL_FQ void m00160_m04 (KERN_ATTR_BASIC ()) { /** * modifier @@ -291,15 +291,15 @@ __kernel void m00160_m04 (KERN_ATTR_BASIC ()) } } -__kernel void m00160_m08 (KERN_ATTR_BASIC ()) +KERNEL_FQ void m00160_m08 (KERN_ATTR_BASIC ()) { } -__kernel void m00160_m16 (KERN_ATTR_BASIC ()) +KERNEL_FQ void m00160_m16 (KERN_ATTR_BASIC ()) { } -__kernel void m00160_s04 (KERN_ATTR_BASIC ()) +KERNEL_FQ void m00160_s04 (KERN_ATTR_BASIC ()) { /** * modifier @@ -500,10 +500,10 @@ __kernel void m00160_s04 (KERN_ATTR_BASIC ()) } } -__kernel void m00160_s08 (KERN_ATTR_BASIC ()) +KERNEL_FQ void m00160_s08 (KERN_ATTR_BASIC ()) { } -__kernel void m00160_s16 (KERN_ATTR_BASIC ()) +KERNEL_FQ void m00160_s16 (KERN_ATTR_BASIC ()) { } diff --git a/OpenCL/m00160_a1-pure.cl b/OpenCL/m00160_a1-pure.cl index f247394e0..2280a1252 100644 --- a/OpenCL/m00160_a1-pure.cl +++ b/OpenCL/m00160_a1-pure.cl @@ -13,7 +13,7 @@ #include "inc_hash_sha1.cl" #endif -__kernel void m00160_mxx (KERN_ATTR_BASIC ()) +KERNEL_FQ void m00160_mxx (KERN_ATTR_BASIC ()) { /** * modifier @@ -93,7 +93,7 @@ __kernel void m00160_mxx (KERN_ATTR_BASIC ()) } } -__kernel void m00160_sxx (KERN_ATTR_BASIC ()) +KERNEL_FQ void m00160_sxx (KERN_ATTR_BASIC ()) { /** * modifier diff --git a/OpenCL/m00160_a3-optimized.cl b/OpenCL/m00160_a3-optimized.cl index f14416b5a..b1beb12ba 100644 --- a/OpenCL/m00160_a3-optimized.cl +++ b/OpenCL/m00160_a3-optimized.cl @@ -324,7 +324,7 @@ DECLSPEC void m00160s (u32 *w0, u32 *w1, u32 *w2, u32 *w3, const u32 pw_len, KER } } -__kernel void m00160_m04 (KERN_ATTR_BASIC ()) +KERNEL_FQ void m00160_m04 (KERN_ATTR_BASIC ()) { /** * base @@ -371,7 +371,7 @@ __kernel void m00160_m04 (KERN_ATTR_BASIC ()) m00160m (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_extra0_buf, d_extra1_buf, d_extra2_buf, d_extra3_buf, bitmap_mask, bitmap_shift1, bitmap_shift2, salt_pos, loop_pos, loop_cnt, il_cnt, digests_cnt, digests_offset, combs_mode, gid_max); } -__kernel void m00160_m08 (KERN_ATTR_BASIC ()) +KERNEL_FQ void m00160_m08 (KERN_ATTR_BASIC ()) { /** * base @@ -418,7 +418,7 @@ __kernel void m00160_m08 (KERN_ATTR_BASIC ()) m00160m (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_extra0_buf, d_extra1_buf, d_extra2_buf, d_extra3_buf, bitmap_mask, bitmap_shift1, bitmap_shift2, salt_pos, loop_pos, loop_cnt, il_cnt, digests_cnt, digests_offset, combs_mode, gid_max); } -__kernel void m00160_m16 (KERN_ATTR_BASIC ()) +KERNEL_FQ void m00160_m16 (KERN_ATTR_BASIC ()) { /** * base @@ -465,7 +465,7 @@ __kernel void m00160_m16 (KERN_ATTR_BASIC ()) m00160m (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_extra0_buf, d_extra1_buf, d_extra2_buf, d_extra3_buf, bitmap_mask, bitmap_shift1, bitmap_shift2, salt_pos, loop_pos, loop_cnt, il_cnt, digests_cnt, digests_offset, combs_mode, gid_max); } -__kernel void m00160_s04 (KERN_ATTR_BASIC ()) +KERNEL_FQ void m00160_s04 (KERN_ATTR_BASIC ()) { /** * base @@ -512,7 +512,7 @@ __kernel void m00160_s04 (KERN_ATTR_BASIC ()) m00160s (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_extra0_buf, d_extra1_buf, d_extra2_buf, d_extra3_buf, bitmap_mask, bitmap_shift1, bitmap_shift2, salt_pos, loop_pos, loop_cnt, il_cnt, digests_cnt, digests_offset, combs_mode, gid_max); } -__kernel void m00160_s08 (KERN_ATTR_BASIC ()) +KERNEL_FQ void m00160_s08 (KERN_ATTR_BASIC ()) { /** * base @@ -559,7 +559,7 @@ __kernel void m00160_s08 (KERN_ATTR_BASIC ()) m00160s (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_extra0_buf, d_extra1_buf, d_extra2_buf, d_extra3_buf, bitmap_mask, bitmap_shift1, bitmap_shift2, salt_pos, loop_pos, loop_cnt, il_cnt, digests_cnt, digests_offset, combs_mode, gid_max); } -__kernel void m00160_s16 (KERN_ATTR_BASIC ()) +KERNEL_FQ void m00160_s16 (KERN_ATTR_BASIC ()) { /** * base diff --git a/OpenCL/m00160_a3-pure.cl b/OpenCL/m00160_a3-pure.cl index 8d5df8ffe..8d0844523 100644 --- a/OpenCL/m00160_a3-pure.cl +++ b/OpenCL/m00160_a3-pure.cl @@ -13,7 +13,7 @@ #include "inc_hash_sha1.cl" #endif -__kernel void m00160_mxx (KERN_ATTR_VECTOR ()) +KERNEL_FQ void m00160_mxx (KERN_ATTR_VECTOR ()) { /** * modifier @@ -79,7 +79,7 @@ __kernel void m00160_mxx (KERN_ATTR_VECTOR ()) } } -__kernel void m00160_sxx (KERN_ATTR_VECTOR ()) +KERNEL_FQ void m00160_sxx (KERN_ATTR_VECTOR ()) { /** * modifier diff --git a/OpenCL/m00200_a0-optimized.cl b/OpenCL/m00200_a0-optimized.cl index 9ee6af687..3b431d867 100644 --- a/OpenCL/m00200_a0-optimized.cl +++ b/OpenCL/m00200_a0-optimized.cl @@ -15,7 +15,7 @@ #include "inc_simd.cl" #endif -__kernel void m00200_m04 (KERN_ATTR_RULES ()) +KERNEL_FQ void m00200_m04 (KERN_ATTR_RULES ()) { /** * modifier @@ -133,15 +133,15 @@ __kernel void m00200_m04 (KERN_ATTR_RULES ()) } } -__kernel void m00200_m08 (KERN_ATTR_RULES ()) +KERNEL_FQ void m00200_m08 (KERN_ATTR_RULES ()) { } -__kernel void m00200_m16 (KERN_ATTR_RULES ()) +KERNEL_FQ void m00200_m16 (KERN_ATTR_RULES ()) { } -__kernel void m00200_s04 (KERN_ATTR_RULES ()) +KERNEL_FQ void m00200_s04 (KERN_ATTR_RULES ()) { /** * modifier @@ -271,10 +271,10 @@ __kernel void m00200_s04 (KERN_ATTR_RULES ()) } } -__kernel void m00200_s08 (KERN_ATTR_RULES ()) +KERNEL_FQ void m00200_s08 (KERN_ATTR_RULES ()) { } -__kernel void m00200_s16 (KERN_ATTR_RULES ()) +KERNEL_FQ void m00200_s16 (KERN_ATTR_RULES ()) { } diff --git a/OpenCL/m00200_a1-optimized.cl b/OpenCL/m00200_a1-optimized.cl index 3fa631d04..0d907e343 100644 --- a/OpenCL/m00200_a1-optimized.cl +++ b/OpenCL/m00200_a1-optimized.cl @@ -13,7 +13,7 @@ #include "inc_simd.cl" #endif -__kernel void m00200_m04 (KERN_ATTR_BASIC ()) +KERNEL_FQ void m00200_m04 (KERN_ATTR_BASIC ()) { /** * modifier @@ -193,15 +193,15 @@ __kernel void m00200_m04 (KERN_ATTR_BASIC ()) } } -__kernel void m00200_m08 (KERN_ATTR_BASIC ()) +KERNEL_FQ void m00200_m08 (KERN_ATTR_BASIC ()) { } -__kernel void m00200_m16 (KERN_ATTR_BASIC ()) +KERNEL_FQ void m00200_m16 (KERN_ATTR_BASIC ()) { } -__kernel void m00200_s04 (KERN_ATTR_BASIC ()) +KERNEL_FQ void m00200_s04 (KERN_ATTR_BASIC ()) { /** * modifier @@ -395,10 +395,10 @@ __kernel void m00200_s04 (KERN_ATTR_BASIC ()) } } -__kernel void m00200_s08 (KERN_ATTR_BASIC ()) +KERNEL_FQ void m00200_s08 (KERN_ATTR_BASIC ()) { } -__kernel void m00200_s16 (KERN_ATTR_BASIC ()) +KERNEL_FQ void m00200_s16 (KERN_ATTR_BASIC ()) { } diff --git a/OpenCL/m00200_a3-optimized.cl b/OpenCL/m00200_a3-optimized.cl index 0830abf51..61481aa69 100644 --- a/OpenCL/m00200_a3-optimized.cl +++ b/OpenCL/m00200_a3-optimized.cl @@ -393,7 +393,7 @@ DECLSPEC void m00200s (u32 *w, const u32 pw_len, KERN_ATTR_VECTOR ()) } } -__kernel void m00200_m04 (KERN_ATTR_VECTOR ()) +KERNEL_FQ void m00200_m04 (KERN_ATTR_VECTOR ()) { /** * base @@ -431,7 +431,7 @@ __kernel void m00200_m04 (KERN_ATTR_VECTOR ()) m00200m (w, pw_len, pws, rules_buf, combs_buf, words_buf_r, 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_extra0_buf, d_extra1_buf, d_extra2_buf, d_extra3_buf, bitmap_mask, bitmap_shift1, bitmap_shift2, salt_pos, loop_pos, loop_cnt, il_cnt, digests_cnt, digests_offset, combs_mode, gid_max); } -__kernel void m00200_m08 (KERN_ATTR_VECTOR ()) +KERNEL_FQ void m00200_m08 (KERN_ATTR_VECTOR ()) { /** * base @@ -469,7 +469,7 @@ __kernel void m00200_m08 (KERN_ATTR_VECTOR ()) m00200m (w, pw_len, pws, rules_buf, combs_buf, words_buf_r, 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_extra0_buf, d_extra1_buf, d_extra2_buf, d_extra3_buf, bitmap_mask, bitmap_shift1, bitmap_shift2, salt_pos, loop_pos, loop_cnt, il_cnt, digests_cnt, digests_offset, combs_mode, gid_max); } -__kernel void m00200_m16 (KERN_ATTR_VECTOR ()) +KERNEL_FQ void m00200_m16 (KERN_ATTR_VECTOR ()) { /** * base @@ -507,7 +507,7 @@ __kernel void m00200_m16 (KERN_ATTR_VECTOR ()) m00200m (w, pw_len, pws, rules_buf, combs_buf, words_buf_r, 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_extra0_buf, d_extra1_buf, d_extra2_buf, d_extra3_buf, bitmap_mask, bitmap_shift1, bitmap_shift2, salt_pos, loop_pos, loop_cnt, il_cnt, digests_cnt, digests_offset, combs_mode, gid_max); } -__kernel void m00200_s04 (KERN_ATTR_VECTOR ()) +KERNEL_FQ void m00200_s04 (KERN_ATTR_VECTOR ()) { /** * base @@ -545,7 +545,7 @@ __kernel void m00200_s04 (KERN_ATTR_VECTOR ()) m00200s (w, pw_len, pws, rules_buf, combs_buf, words_buf_r, 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_extra0_buf, d_extra1_buf, d_extra2_buf, d_extra3_buf, bitmap_mask, bitmap_shift1, bitmap_shift2, salt_pos, loop_pos, loop_cnt, il_cnt, digests_cnt, digests_offset, combs_mode, gid_max); } -__kernel void m00200_s08 (KERN_ATTR_VECTOR ()) +KERNEL_FQ void m00200_s08 (KERN_ATTR_VECTOR ()) { /** * base @@ -583,7 +583,7 @@ __kernel void m00200_s08 (KERN_ATTR_VECTOR ()) m00200s (w, pw_len, pws, rules_buf, combs_buf, words_buf_r, 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_extra0_buf, d_extra1_buf, d_extra2_buf, d_extra3_buf, bitmap_mask, bitmap_shift1, bitmap_shift2, salt_pos, loop_pos, loop_cnt, il_cnt, digests_cnt, digests_offset, combs_mode, gid_max); } -__kernel void m00200_s16 (KERN_ATTR_VECTOR ()) +KERNEL_FQ void m00200_s16 (KERN_ATTR_VECTOR ()) { /** * base diff --git a/OpenCL/m00300_a0-optimized.cl b/OpenCL/m00300_a0-optimized.cl index 253cf8ae8..20d972d17 100644 --- a/OpenCL/m00300_a0-optimized.cl +++ b/OpenCL/m00300_a0-optimized.cl @@ -15,7 +15,7 @@ #include "inc_hash_sha1.cl" #endif -__kernel void m00300_m04 (KERN_ATTR_RULES ()) +KERNEL_FQ void m00300_m04 (KERN_ATTR_RULES ()) { /** * modifier @@ -312,15 +312,15 @@ __kernel void m00300_m04 (KERN_ATTR_RULES ()) } } -__kernel void m00300_m08 (KERN_ATTR_RULES ()) +KERNEL_FQ void m00300_m08 (KERN_ATTR_RULES ()) { } -__kernel void m00300_m16 (KERN_ATTR_RULES ()) +KERNEL_FQ void m00300_m16 (KERN_ATTR_RULES ()) { } -__kernel void m00300_s04 (KERN_ATTR_RULES ()) +KERNEL_FQ void m00300_s04 (KERN_ATTR_RULES ()) { /** * modifier @@ -638,10 +638,10 @@ __kernel void m00300_s04 (KERN_ATTR_RULES ()) } } -__kernel void m00300_s08 (KERN_ATTR_RULES ()) +KERNEL_FQ void m00300_s08 (KERN_ATTR_RULES ()) { } -__kernel void m00300_s16 (KERN_ATTR_RULES ()) +KERNEL_FQ void m00300_s16 (KERN_ATTR_RULES ()) { } diff --git a/OpenCL/m00300_a0-pure.cl b/OpenCL/m00300_a0-pure.cl index aac7eddfe..65209c666 100644 --- a/OpenCL/m00300_a0-pure.cl +++ b/OpenCL/m00300_a0-pure.cl @@ -15,7 +15,7 @@ #include "inc_hash_sha1.cl" #endif -__kernel void m00300_mxx (KERN_ATTR_RULES ()) +KERNEL_FQ void m00300_mxx (KERN_ATTR_RULES ()) { /** * modifier @@ -82,7 +82,7 @@ __kernel void m00300_mxx (KERN_ATTR_RULES ()) } } -__kernel void m00300_sxx (KERN_ATTR_RULES ()) +KERNEL_FQ void m00300_sxx (KERN_ATTR_RULES ()) { /** * modifier diff --git a/OpenCL/m00300_a1-optimized.cl b/OpenCL/m00300_a1-optimized.cl index 7b47830f6..f8db40b82 100644 --- a/OpenCL/m00300_a1-optimized.cl +++ b/OpenCL/m00300_a1-optimized.cl @@ -13,7 +13,7 @@ #include "inc_hash_sha1.cl" #endif -__kernel void m00300_m04 (KERN_ATTR_BASIC ()) +KERNEL_FQ void m00300_m04 (KERN_ATTR_BASIC ()) { /** * modifier @@ -368,15 +368,15 @@ __kernel void m00300_m04 (KERN_ATTR_BASIC ()) } } -__kernel void m00300_m08 (KERN_ATTR_BASIC ()) +KERNEL_FQ void m00300_m08 (KERN_ATTR_BASIC ()) { } -__kernel void m00300_m16 (KERN_ATTR_BASIC ()) +KERNEL_FQ void m00300_m16 (KERN_ATTR_BASIC ()) { } -__kernel void m00300_s04 (KERN_ATTR_BASIC ()) +KERNEL_FQ void m00300_s04 (KERN_ATTR_BASIC ()) { /** * modifier @@ -752,10 +752,10 @@ __kernel void m00300_s04 (KERN_ATTR_BASIC ()) } } -__kernel void m00300_s08 (KERN_ATTR_BASIC ()) +KERNEL_FQ void m00300_s08 (KERN_ATTR_BASIC ()) { } -__kernel void m00300_s16 (KERN_ATTR_BASIC ()) +KERNEL_FQ void m00300_s16 (KERN_ATTR_BASIC ()) { } diff --git a/OpenCL/m00300_a1-pure.cl b/OpenCL/m00300_a1-pure.cl index f71a43c1d..0d0614358 100644 --- a/OpenCL/m00300_a1-pure.cl +++ b/OpenCL/m00300_a1-pure.cl @@ -13,7 +13,7 @@ #include "inc_hash_sha1.cl" #endif -__kernel void m00300_mxx (KERN_ATTR_BASIC ()) +KERNEL_FQ void m00300_mxx (KERN_ATTR_BASIC ()) { /** * modifier @@ -78,7 +78,7 @@ __kernel void m00300_mxx (KERN_ATTR_BASIC ()) } } -__kernel void m00300_sxx (KERN_ATTR_BASIC ()) +KERNEL_FQ void m00300_sxx (KERN_ATTR_BASIC ()) { /** * modifier diff --git a/OpenCL/m00300_a3-optimized.cl b/OpenCL/m00300_a3-optimized.cl index 7a61e23f2..7b34c715e 100644 --- a/OpenCL/m00300_a3-optimized.cl +++ b/OpenCL/m00300_a3-optimized.cl @@ -772,7 +772,7 @@ DECLSPEC void m00300s (u32 *w, const u32 pw_len, KERN_ATTR_VECTOR ()) } } -__kernel void m00300_m04 (KERN_ATTR_VECTOR ()) +KERNEL_FQ void m00300_m04 (KERN_ATTR_VECTOR ()) { /** * base @@ -810,7 +810,7 @@ __kernel void m00300_m04 (KERN_ATTR_VECTOR ()) m00300m (w, pw_len, pws, rules_buf, combs_buf, words_buf_r, 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_extra0_buf, d_extra1_buf, d_extra2_buf, d_extra3_buf, bitmap_mask, bitmap_shift1, bitmap_shift2, salt_pos, loop_pos, loop_cnt, il_cnt, digests_cnt, digests_offset, combs_mode, gid_max); } -__kernel void m00300_m08 (KERN_ATTR_VECTOR ()) +KERNEL_FQ void m00300_m08 (KERN_ATTR_VECTOR ()) { /** * base @@ -848,7 +848,7 @@ __kernel void m00300_m08 (KERN_ATTR_VECTOR ()) m00300m (w, pw_len, pws, rules_buf, combs_buf, words_buf_r, 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_extra0_buf, d_extra1_buf, d_extra2_buf, d_extra3_buf, bitmap_mask, bitmap_shift1, bitmap_shift2, salt_pos, loop_pos, loop_cnt, il_cnt, digests_cnt, digests_offset, combs_mode, gid_max); } -__kernel void m00300_m16 (KERN_ATTR_VECTOR ()) +KERNEL_FQ void m00300_m16 (KERN_ATTR_VECTOR ()) { /** * base @@ -886,7 +886,7 @@ __kernel void m00300_m16 (KERN_ATTR_VECTOR ()) m00300m (w, pw_len, pws, rules_buf, combs_buf, words_buf_r, 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_extra0_buf, d_extra1_buf, d_extra2_buf, d_extra3_buf, bitmap_mask, bitmap_shift1, bitmap_shift2, salt_pos, loop_pos, loop_cnt, il_cnt, digests_cnt, digests_offset, combs_mode, gid_max); } -__kernel void m00300_s04 (KERN_ATTR_VECTOR ()) +KERNEL_FQ void m00300_s04 (KERN_ATTR_VECTOR ()) { /** * base @@ -924,7 +924,7 @@ __kernel void m00300_s04 (KERN_ATTR_VECTOR ()) m00300s (w, pw_len, pws, rules_buf, combs_buf, words_buf_r, 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_extra0_buf, d_extra1_buf, d_extra2_buf, d_extra3_buf, bitmap_mask, bitmap_shift1, bitmap_shift2, salt_pos, loop_pos, loop_cnt, il_cnt, digests_cnt, digests_offset, combs_mode, gid_max); } -__kernel void m00300_s08 (KERN_ATTR_VECTOR ()) +KERNEL_FQ void m00300_s08 (KERN_ATTR_VECTOR ()) { /** * base @@ -962,7 +962,7 @@ __kernel void m00300_s08 (KERN_ATTR_VECTOR ()) m00300s (w, pw_len, pws, rules_buf, combs_buf, words_buf_r, 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_extra0_buf, d_extra1_buf, d_extra2_buf, d_extra3_buf, bitmap_mask, bitmap_shift1, bitmap_shift2, salt_pos, loop_pos, loop_cnt, il_cnt, digests_cnt, digests_offset, combs_mode, gid_max); } -__kernel void m00300_s16 (KERN_ATTR_VECTOR ()) +KERNEL_FQ void m00300_s16 (KERN_ATTR_VECTOR ()) { /** * base diff --git a/OpenCL/m00300_a3-pure.cl b/OpenCL/m00300_a3-pure.cl index 7290673f9..a94d806c5 100644 --- a/OpenCL/m00300_a3-pure.cl +++ b/OpenCL/m00300_a3-pure.cl @@ -13,7 +13,7 @@ #include "inc_hash_sha1.cl" #endif -__kernel void m00300_mxx (KERN_ATTR_VECTOR ()) +KERNEL_FQ void m00300_mxx (KERN_ATTR_VECTOR ()) { /** * modifier @@ -91,7 +91,7 @@ __kernel void m00300_mxx (KERN_ATTR_VECTOR ()) } } -__kernel void m00300_sxx (KERN_ATTR_VECTOR ()) +KERNEL_FQ void m00300_sxx (KERN_ATTR_VECTOR ()) { /** * modifier diff --git a/OpenCL/m00400-optimized.cl b/OpenCL/m00400-optimized.cl index 85d41e865..56c4c3956 100644 --- a/OpenCL/m00400-optimized.cl +++ b/OpenCL/m00400-optimized.cl @@ -22,7 +22,7 @@ typedef struct phpass_tmp } phpass_tmp_t; -__kernel void m00400_init (KERN_ATTR_TMPS (phpass_tmp_t)) +KERNEL_FQ void m00400_init (KERN_ATTR_TMPS (phpass_tmp_t)) { /** * base @@ -119,7 +119,7 @@ __kernel void m00400_init (KERN_ATTR_TMPS (phpass_tmp_t)) tmps[gid].digest_buf[3] = digest[3]; } -__kernel void m00400_loop (KERN_ATTR_TMPS (phpass_tmp_t)) +KERNEL_FQ void m00400_loop (KERN_ATTR_TMPS (phpass_tmp_t)) { /** * base @@ -210,7 +210,7 @@ __kernel void m00400_loop (KERN_ATTR_TMPS (phpass_tmp_t)) unpackv (tmps, digest_buf, gid, 3, digest[3]); } -__kernel void m00400_comp (KERN_ATTR_TMPS (phpass_tmp_t)) +KERNEL_FQ void m00400_comp (KERN_ATTR_TMPS (phpass_tmp_t)) { /** * modifier diff --git a/OpenCL/m00400-pure.cl b/OpenCL/m00400-pure.cl index 306857133..4446e046e 100644 --- a/OpenCL/m00400-pure.cl +++ b/OpenCL/m00400-pure.cl @@ -22,7 +22,7 @@ typedef struct phpass_tmp } phpass_tmp_t; -__kernel void m00400_init (KERN_ATTR_TMPS (phpass_tmp_t)) +KERNEL_FQ void m00400_init (KERN_ATTR_TMPS (phpass_tmp_t)) { /** * base @@ -59,7 +59,7 @@ __kernel void m00400_init (KERN_ATTR_TMPS (phpass_tmp_t)) tmps[gid].digest_buf[3] = digest[3]; } -__kernel void m00400_loop (KERN_ATTR_TMPS (phpass_tmp_t)) +KERNEL_FQ void m00400_loop (KERN_ATTR_TMPS (phpass_tmp_t)) { /** * base @@ -160,7 +160,7 @@ __kernel void m00400_loop (KERN_ATTR_TMPS (phpass_tmp_t)) tmps[gid].digest_buf[3] = digest[3]; } -__kernel void m00400_comp (KERN_ATTR_TMPS (phpass_tmp_t)) +KERNEL_FQ void m00400_comp (KERN_ATTR_TMPS (phpass_tmp_t)) { /** * modifier diff --git a/OpenCL/m00500-optimized.cl b/OpenCL/m00500-optimized.cl index 7b9994262..b7e8919a8 100644 --- a/OpenCL/m00500-optimized.cl +++ b/OpenCL/m00500-optimized.cl @@ -640,7 +640,7 @@ DECLSPEC void append_1st (u32 *block0, u32 *block1, u32 *block2, u32 *block3, co } } -__kernel void m00500_init (KERN_ATTR_TMPS (md5crypt_tmp_t)) +KERNEL_FQ void m00500_init (KERN_ATTR_TMPS (md5crypt_tmp_t)) { /** * base @@ -803,7 +803,7 @@ __kernel void m00500_init (KERN_ATTR_TMPS (md5crypt_tmp_t)) tmps[gid].digest_buf[3] = digest[3]; } -__kernel void m00500_loop (KERN_ATTR_TMPS (md5crypt_tmp_t)) +KERNEL_FQ void m00500_loop (KERN_ATTR_TMPS (md5crypt_tmp_t)) { /** * base @@ -991,7 +991,7 @@ __kernel void m00500_loop (KERN_ATTR_TMPS (md5crypt_tmp_t)) tmps[gid].digest_buf[3] = digest[3]; } -__kernel void m00500_comp (KERN_ATTR_TMPS (md5crypt_tmp_t)) +KERNEL_FQ void m00500_comp (KERN_ATTR_TMPS (md5crypt_tmp_t)) { /** * modifier diff --git a/OpenCL/m00500-pure.cl b/OpenCL/m00500-pure.cl index 7c69d9333..d609e341c 100644 --- a/OpenCL/m00500-pure.cl +++ b/OpenCL/m00500-pure.cl @@ -23,7 +23,7 @@ typedef struct md5crypt_tmp #define md5crypt_magic 0x00243124u -__kernel void m00500_init (KERN_ATTR_TMPS (md5crypt_tmp_t)) +KERNEL_FQ void m00500_init (KERN_ATTR_TMPS (md5crypt_tmp_t)) { /** * base @@ -129,7 +129,7 @@ __kernel void m00500_init (KERN_ATTR_TMPS (md5crypt_tmp_t)) tmps[gid].digest_buf[3] = md5_ctx.h[3]; } -__kernel void m00500_loop (KERN_ATTR_TMPS (md5crypt_tmp_t)) +KERNEL_FQ void m00500_loop (KERN_ATTR_TMPS (md5crypt_tmp_t)) { /** * base @@ -224,7 +224,7 @@ __kernel void m00500_loop (KERN_ATTR_TMPS (md5crypt_tmp_t)) tmps[gid].digest_buf[3] = digest[3]; } -__kernel void m00500_comp (KERN_ATTR_TMPS (md5crypt_tmp_t)) +KERNEL_FQ void m00500_comp (KERN_ATTR_TMPS (md5crypt_tmp_t)) { /** * modifier diff --git a/OpenCL/m00600_a0-optimized.cl b/OpenCL/m00600_a0-optimized.cl index 3819cd522..2784452a2 100644 --- a/OpenCL/m00600_a0-optimized.cl +++ b/OpenCL/m00600_a0-optimized.cl @@ -131,7 +131,7 @@ DECLSPEC void blake2b_transform (u64x *h, u64x *t, u64x *f, u64x *m, u64x *v, co h[7] = h[7] ^ v[7] ^ v[15]; } -__kernel void m00600_m04 (KERN_ATTR_RULES_ESALT (blake2_t)) +KERNEL_FQ void m00600_m04 (KERN_ATTR_RULES_ESALT (blake2_t)) { /** * modifier @@ -228,15 +228,15 @@ __kernel void m00600_m04 (KERN_ATTR_RULES_ESALT (blake2_t)) } } -__kernel void m00600_m08 (KERN_ATTR_RULES_ESALT (blake2_t)) +KERNEL_FQ void m00600_m08 (KERN_ATTR_RULES_ESALT (blake2_t)) { } -__kernel void m00600_m16 (KERN_ATTR_RULES_ESALT (blake2_t)) +KERNEL_FQ void m00600_m16 (KERN_ATTR_RULES_ESALT (blake2_t)) { } -__kernel void m00600_s04 (KERN_ATTR_RULES_ESALT (blake2_t)) +KERNEL_FQ void m00600_s04 (KERN_ATTR_RULES_ESALT (blake2_t)) { /** * modifier @@ -347,10 +347,10 @@ __kernel void m00600_s04 (KERN_ATTR_RULES_ESALT (blake2_t)) } } -__kernel void m00600_s08 (KERN_ATTR_RULES_ESALT (blake2_t)) +KERNEL_FQ void m00600_s08 (KERN_ATTR_RULES_ESALT (blake2_t)) { } -__kernel void m00600_s16 (KERN_ATTR_RULES_ESALT (blake2_t)) +KERNEL_FQ void m00600_s16 (KERN_ATTR_RULES_ESALT (blake2_t)) { } diff --git a/OpenCL/m00600_a1-optimized.cl b/OpenCL/m00600_a1-optimized.cl index 5b6c8ed55..4b241483d 100644 --- a/OpenCL/m00600_a1-optimized.cl +++ b/OpenCL/m00600_a1-optimized.cl @@ -131,7 +131,7 @@ DECLSPEC void blake2b_transform (u64x *h, u64x *t, u64x *f, u64x *m, u64x *v, co h[7] = h[7] ^ v[7] ^ v[15]; } -__kernel void m00600_m04 (KERN_ATTR_ESALT (blake2_t)) +KERNEL_FQ void m00600_m04 (KERN_ATTR_ESALT (blake2_t)) { /** * modifier @@ -287,15 +287,15 @@ __kernel void m00600_m04 (KERN_ATTR_ESALT (blake2_t)) } } -__kernel void m00600_m08 (KERN_ATTR_ESALT (blake2_t)) +KERNEL_FQ void m00600_m08 (KERN_ATTR_ESALT (blake2_t)) { } -__kernel void m00600_m16 (KERN_ATTR_ESALT (blake2_t)) +KERNEL_FQ void m00600_m16 (KERN_ATTR_ESALT (blake2_t)) { } -__kernel void m00600_s04 (KERN_ATTR_ESALT (blake2_t)) +KERNEL_FQ void m00600_s04 (KERN_ATTR_ESALT (blake2_t)) { /** * modifier @@ -466,10 +466,10 @@ __kernel void m00600_s04 (KERN_ATTR_ESALT (blake2_t)) } } -__kernel void m00600_s08 (KERN_ATTR_ESALT (blake2_t)) +KERNEL_FQ void m00600_s08 (KERN_ATTR_ESALT (blake2_t)) { } -__kernel void m00600_s16 (KERN_ATTR_ESALT (blake2_t)) +KERNEL_FQ void m00600_s16 (KERN_ATTR_ESALT (blake2_t)) { } diff --git a/OpenCL/m00600_a3-optimized.cl b/OpenCL/m00600_a3-optimized.cl index cd089505d..74984a962 100644 --- a/OpenCL/m00600_a3-optimized.cl +++ b/OpenCL/m00600_a3-optimized.cl @@ -129,7 +129,7 @@ DECLSPEC void blake2b_transform (u64x *h, u64x *t, u64x *f, u64x *m, u64x *v, co h[7] = h[7] ^ v[7] ^ v[15]; } -__kernel void m00600_m04 (KERN_ATTR_VECTOR_ESALT (blake2_t)) +KERNEL_FQ void m00600_m04 (KERN_ATTR_VECTOR_ESALT (blake2_t)) { /** * modifier @@ -233,7 +233,7 @@ __kernel void m00600_m04 (KERN_ATTR_VECTOR_ESALT (blake2_t)) } } -__kernel void m00600_m08 (KERN_ATTR_VECTOR_ESALT (blake2_t)) +KERNEL_FQ void m00600_m08 (KERN_ATTR_VECTOR_ESALT (blake2_t)) { /** * modifier @@ -337,7 +337,7 @@ __kernel void m00600_m08 (KERN_ATTR_VECTOR_ESALT (blake2_t)) } } -__kernel void m00600_m16 (KERN_ATTR_VECTOR_ESALT (blake2_t)) +KERNEL_FQ void m00600_m16 (KERN_ATTR_VECTOR_ESALT (blake2_t)) { /** * modifier @@ -441,7 +441,7 @@ __kernel void m00600_m16 (KERN_ATTR_VECTOR_ESALT (blake2_t)) } } -__kernel void m00600_s04 (KERN_ATTR_VECTOR_ESALT (blake2_t)) +KERNEL_FQ void m00600_s04 (KERN_ATTR_VECTOR_ESALT (blake2_t)) { /** * modifier @@ -557,7 +557,7 @@ __kernel void m00600_s04 (KERN_ATTR_VECTOR_ESALT (blake2_t)) } } -__kernel void m00600_s08 (KERN_ATTR_VECTOR_ESALT (blake2_t)) +KERNEL_FQ void m00600_s08 (KERN_ATTR_VECTOR_ESALT (blake2_t)) { /** * modifier @@ -673,7 +673,7 @@ __kernel void m00600_s08 (KERN_ATTR_VECTOR_ESALT (blake2_t)) } } -__kernel void m00600_s16 (KERN_ATTR_VECTOR_ESALT (blake2_t)) +KERNEL_FQ void m00600_s16 (KERN_ATTR_VECTOR_ESALT (blake2_t)) { /** * modifier diff --git a/OpenCL/m00900_a0-optimized.cl b/OpenCL/m00900_a0-optimized.cl index 218097d89..cf2760c41 100644 --- a/OpenCL/m00900_a0-optimized.cl +++ b/OpenCL/m00900_a0-optimized.cl @@ -15,7 +15,7 @@ #include "inc_hash_md4.cl" #endif -__kernel void m00900_m04 (KERN_ATTR_RULES ()) +KERNEL_FQ void m00900_m04 (KERN_ATTR_RULES ()) { /** * modifier @@ -123,15 +123,15 @@ __kernel void m00900_m04 (KERN_ATTR_RULES ()) } } -__kernel void m00900_m08 (KERN_ATTR_RULES ()) +KERNEL_FQ void m00900_m08 (KERN_ATTR_RULES ()) { } -__kernel void m00900_m16 (KERN_ATTR_RULES ()) +KERNEL_FQ void m00900_m16 (KERN_ATTR_RULES ()) { } -__kernel void m00900_s04 (KERN_ATTR_RULES ()) +KERNEL_FQ void m00900_s04 (KERN_ATTR_RULES ()) { /** * modifier @@ -254,10 +254,10 @@ __kernel void m00900_s04 (KERN_ATTR_RULES ()) } } -__kernel void m00900_s08 (KERN_ATTR_RULES ()) +KERNEL_FQ void m00900_s08 (KERN_ATTR_RULES ()) { } -__kernel void m00900_s16 (KERN_ATTR_RULES ()) +KERNEL_FQ void m00900_s16 (KERN_ATTR_RULES ()) { } diff --git a/OpenCL/m00900_a0-pure.cl b/OpenCL/m00900_a0-pure.cl index 3f5164e9e..a3d36f1f0 100644 --- a/OpenCL/m00900_a0-pure.cl +++ b/OpenCL/m00900_a0-pure.cl @@ -15,7 +15,7 @@ #include "inc_hash_md4.cl" #endif -__kernel void m00900_mxx (KERN_ATTR_RULES ()) +KERNEL_FQ void m00900_mxx (KERN_ATTR_RULES ()) { /** * modifier @@ -59,7 +59,7 @@ __kernel void m00900_mxx (KERN_ATTR_RULES ()) } } -__kernel void m00900_sxx (KERN_ATTR_RULES ()) +KERNEL_FQ void m00900_sxx (KERN_ATTR_RULES ()) { /** * modifier diff --git a/OpenCL/m00900_a1-optimized.cl b/OpenCL/m00900_a1-optimized.cl index 8064703e7..759fe7d42 100644 --- a/OpenCL/m00900_a1-optimized.cl +++ b/OpenCL/m00900_a1-optimized.cl @@ -13,7 +13,7 @@ #include "inc_hash_md4.cl" #endif -__kernel void m00900_m04 (KERN_ATTR_BASIC ()) +KERNEL_FQ void m00900_m04 (KERN_ATTR_BASIC ()) { /** * modifier @@ -180,15 +180,15 @@ __kernel void m00900_m04 (KERN_ATTR_BASIC ()) } } -__kernel void m00900_m08 (KERN_ATTR_BASIC ()) +KERNEL_FQ void m00900_m08 (KERN_ATTR_BASIC ()) { } -__kernel void m00900_m16 (KERN_ATTR_BASIC ()) +KERNEL_FQ void m00900_m16 (KERN_ATTR_BASIC ()) { } -__kernel void m00900_s04 (KERN_ATTR_BASIC ()) +KERNEL_FQ void m00900_s04 (KERN_ATTR_BASIC ()) { /** * modifier @@ -370,10 +370,10 @@ __kernel void m00900_s04 (KERN_ATTR_BASIC ()) } } -__kernel void m00900_s08 (KERN_ATTR_BASIC ()) +KERNEL_FQ void m00900_s08 (KERN_ATTR_BASIC ()) { } -__kernel void m00900_s16 (KERN_ATTR_BASIC ()) +KERNEL_FQ void m00900_s16 (KERN_ATTR_BASIC ()) { } diff --git a/OpenCL/m00900_a1-pure.cl b/OpenCL/m00900_a1-pure.cl index 2e19383a0..b7c4d13c7 100644 --- a/OpenCL/m00900_a1-pure.cl +++ b/OpenCL/m00900_a1-pure.cl @@ -13,7 +13,7 @@ #include "inc_hash_md4.cl" #endif -__kernel void m00900_mxx (KERN_ATTR_BASIC ()) +KERNEL_FQ void m00900_mxx (KERN_ATTR_BASIC ()) { /** * modifier @@ -55,7 +55,7 @@ __kernel void m00900_mxx (KERN_ATTR_BASIC ()) } } -__kernel void m00900_sxx (KERN_ATTR_BASIC ()) +KERNEL_FQ void m00900_sxx (KERN_ATTR_BASIC ()) { /** * modifier diff --git a/OpenCL/m00900_a3-optimized.cl b/OpenCL/m00900_a3-optimized.cl index c41d0d735..4970e5669 100644 --- a/OpenCL/m00900_a3-optimized.cl +++ b/OpenCL/m00900_a3-optimized.cl @@ -352,7 +352,7 @@ DECLSPEC void m00900s (u32 *w, const u32 pw_len, KERN_ATTR_VECTOR ()) } } -__kernel void m00900_m04 (KERN_ATTR_VECTOR ()) +KERNEL_FQ void m00900_m04 (KERN_ATTR_VECTOR ()) { /** * base @@ -390,7 +390,7 @@ __kernel void m00900_m04 (KERN_ATTR_VECTOR ()) m00900m (w, pw_len, pws, rules_buf, combs_buf, words_buf_r, 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_extra0_buf, d_extra1_buf, d_extra2_buf, d_extra3_buf, bitmap_mask, bitmap_shift1, bitmap_shift2, salt_pos, loop_pos, loop_cnt, il_cnt, digests_cnt, digests_offset, combs_mode, gid_max); } -__kernel void m00900_m08 (KERN_ATTR_VECTOR ()) +KERNEL_FQ void m00900_m08 (KERN_ATTR_VECTOR ()) { /** * base @@ -428,7 +428,7 @@ __kernel void m00900_m08 (KERN_ATTR_VECTOR ()) m00900m (w, pw_len, pws, rules_buf, combs_buf, words_buf_r, 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_extra0_buf, d_extra1_buf, d_extra2_buf, d_extra3_buf, bitmap_mask, bitmap_shift1, bitmap_shift2, salt_pos, loop_pos, loop_cnt, il_cnt, digests_cnt, digests_offset, combs_mode, gid_max); } -__kernel void m00900_m16 (KERN_ATTR_VECTOR ()) +KERNEL_FQ void m00900_m16 (KERN_ATTR_VECTOR ()) { /** * base @@ -466,7 +466,7 @@ __kernel void m00900_m16 (KERN_ATTR_VECTOR ()) m00900m (w, pw_len, pws, rules_buf, combs_buf, words_buf_r, 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_extra0_buf, d_extra1_buf, d_extra2_buf, d_extra3_buf, bitmap_mask, bitmap_shift1, bitmap_shift2, salt_pos, loop_pos, loop_cnt, il_cnt, digests_cnt, digests_offset, combs_mode, gid_max); } -__kernel void m00900_s04 (KERN_ATTR_VECTOR ()) +KERNEL_FQ void m00900_s04 (KERN_ATTR_VECTOR ()) { /** * base @@ -504,7 +504,7 @@ __kernel void m00900_s04 (KERN_ATTR_VECTOR ()) m00900s (w, pw_len, pws, rules_buf, combs_buf, words_buf_r, 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_extra0_buf, d_extra1_buf, d_extra2_buf, d_extra3_buf, bitmap_mask, bitmap_shift1, bitmap_shift2, salt_pos, loop_pos, loop_cnt, il_cnt, digests_cnt, digests_offset, combs_mode, gid_max); } -__kernel void m00900_s08 (KERN_ATTR_VECTOR ()) +KERNEL_FQ void m00900_s08 (KERN_ATTR_VECTOR ()) { /** * base @@ -542,7 +542,7 @@ __kernel void m00900_s08 (KERN_ATTR_VECTOR ()) m00900s (w, pw_len, pws, rules_buf, combs_buf, words_buf_r, 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_extra0_buf, d_extra1_buf, d_extra2_buf, d_extra3_buf, bitmap_mask, bitmap_shift1, bitmap_shift2, salt_pos, loop_pos, loop_cnt, il_cnt, digests_cnt, digests_offset, combs_mode, gid_max); } -__kernel void m00900_s16 (KERN_ATTR_VECTOR ()) +KERNEL_FQ void m00900_s16 (KERN_ATTR_VECTOR ()) { /** * base diff --git a/OpenCL/m00900_a3-pure.cl b/OpenCL/m00900_a3-pure.cl index a154851e8..80620f987 100644 --- a/OpenCL/m00900_a3-pure.cl +++ b/OpenCL/m00900_a3-pure.cl @@ -13,7 +13,7 @@ #include "inc_hash_md4.cl" #endif -__kernel void m00900_mxx (KERN_ATTR_VECTOR ()) +KERNEL_FQ void m00900_mxx (KERN_ATTR_VECTOR ()) { /** * modifier @@ -68,7 +68,7 @@ __kernel void m00900_mxx (KERN_ATTR_VECTOR ()) } } -__kernel void m00900_sxx (KERN_ATTR_VECTOR ()) +KERNEL_FQ void m00900_sxx (KERN_ATTR_VECTOR ()) { /** * modifier diff --git a/OpenCL/m01000_a0-optimized.cl b/OpenCL/m01000_a0-optimized.cl index 7cc9ca6fa..71d80fdd0 100644 --- a/OpenCL/m01000_a0-optimized.cl +++ b/OpenCL/m01000_a0-optimized.cl @@ -15,7 +15,7 @@ #include "inc_hash_md4.cl" #endif -__kernel void m01000_m04 (KERN_ATTR_RULES ()) +KERNEL_FQ void m01000_m04 (KERN_ATTR_RULES ()) { /** * modifier @@ -126,15 +126,15 @@ __kernel void m01000_m04 (KERN_ATTR_RULES ()) } } -__kernel void m01000_m08 (KERN_ATTR_RULES ()) +KERNEL_FQ void m01000_m08 (KERN_ATTR_RULES ()) { } -__kernel void m01000_m16 (KERN_ATTR_RULES ()) +KERNEL_FQ void m01000_m16 (KERN_ATTR_RULES ()) { } -__kernel void m01000_s04 (KERN_ATTR_RULES ()) +KERNEL_FQ void m01000_s04 (KERN_ATTR_RULES ()) { /** * modifier @@ -260,10 +260,10 @@ __kernel void m01000_s04 (KERN_ATTR_RULES ()) } } -__kernel void m01000_s08 (KERN_ATTR_RULES ()) +KERNEL_FQ void m01000_s08 (KERN_ATTR_RULES ()) { } -__kernel void m01000_s16 (KERN_ATTR_RULES ()) +KERNEL_FQ void m01000_s16 (KERN_ATTR_RULES ()) { } diff --git a/OpenCL/m01000_a0-pure.cl b/OpenCL/m01000_a0-pure.cl index 65e245de7..1dbdab60d 100644 --- a/OpenCL/m01000_a0-pure.cl +++ b/OpenCL/m01000_a0-pure.cl @@ -15,7 +15,7 @@ #include "inc_hash_md4.cl" #endif -__kernel void m01000_mxx (KERN_ATTR_RULES ()) +KERNEL_FQ void m01000_mxx (KERN_ATTR_RULES ()) { /** * modifier @@ -59,7 +59,7 @@ __kernel void m01000_mxx (KERN_ATTR_RULES ()) } } -__kernel void m01000_sxx (KERN_ATTR_RULES ()) +KERNEL_FQ void m01000_sxx (KERN_ATTR_RULES ()) { /** * modifier diff --git a/OpenCL/m01000_a1-optimized.cl b/OpenCL/m01000_a1-optimized.cl index 7f981e215..eef1852e8 100644 --- a/OpenCL/m01000_a1-optimized.cl +++ b/OpenCL/m01000_a1-optimized.cl @@ -13,7 +13,7 @@ #include "inc_hash_md4.cl" #endif -__kernel void m01000_m04 (KERN_ATTR_BASIC ()) +KERNEL_FQ void m01000_m04 (KERN_ATTR_BASIC ()) { /** * modifier @@ -186,15 +186,15 @@ __kernel void m01000_m04 (KERN_ATTR_BASIC ()) } } -__kernel void m01000_m08 (KERN_ATTR_BASIC ()) +KERNEL_FQ void m01000_m08 (KERN_ATTR_BASIC ()) { } -__kernel void m01000_m16 (KERN_ATTR_BASIC ()) +KERNEL_FQ void m01000_m16 (KERN_ATTR_BASIC ()) { } -__kernel void m01000_s04 (KERN_ATTR_BASIC ()) +KERNEL_FQ void m01000_s04 (KERN_ATTR_BASIC ()) { /** * modifier @@ -382,10 +382,10 @@ __kernel void m01000_s04 (KERN_ATTR_BASIC ()) } } -__kernel void m01000_s08 (KERN_ATTR_BASIC ()) +KERNEL_FQ void m01000_s08 (KERN_ATTR_BASIC ()) { } -__kernel void m01000_s16 (KERN_ATTR_BASIC ()) +KERNEL_FQ void m01000_s16 (KERN_ATTR_BASIC ()) { } diff --git a/OpenCL/m01000_a1-pure.cl b/OpenCL/m01000_a1-pure.cl index 3e979b722..71b2ab2e4 100644 --- a/OpenCL/m01000_a1-pure.cl +++ b/OpenCL/m01000_a1-pure.cl @@ -13,7 +13,7 @@ #include "inc_hash_md4.cl" #endif -__kernel void m01000_mxx (KERN_ATTR_BASIC ()) +KERNEL_FQ void m01000_mxx (KERN_ATTR_BASIC ()) { /** * modifier @@ -55,7 +55,7 @@ __kernel void m01000_mxx (KERN_ATTR_BASIC ()) } } -__kernel void m01000_sxx (KERN_ATTR_BASIC ()) +KERNEL_FQ void m01000_sxx (KERN_ATTR_BASIC ()) { /** * modifier diff --git a/OpenCL/m01000_a3-optimized.cl b/OpenCL/m01000_a3-optimized.cl index c6093a070..ee59a23ff 100644 --- a/OpenCL/m01000_a3-optimized.cl +++ b/OpenCL/m01000_a3-optimized.cl @@ -352,7 +352,7 @@ DECLSPEC void m01000s (u32 *w, const u32 pw_len, KERN_ATTR_VECTOR ()) } } -__kernel void m01000_m04 (KERN_ATTR_VECTOR ()) +KERNEL_FQ void m01000_m04 (KERN_ATTR_VECTOR ()) { /** * base @@ -390,7 +390,7 @@ __kernel void m01000_m04 (KERN_ATTR_VECTOR ()) m01000m (w, pw_len, pws, rules_buf, combs_buf, words_buf_r, 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_extra0_buf, d_extra1_buf, d_extra2_buf, d_extra3_buf, bitmap_mask, bitmap_shift1, bitmap_shift2, salt_pos, loop_pos, loop_cnt, il_cnt, digests_cnt, digests_offset, combs_mode, gid_max); } -__kernel void m01000_m08 (KERN_ATTR_VECTOR ()) +KERNEL_FQ void m01000_m08 (KERN_ATTR_VECTOR ()) { /** * base @@ -428,7 +428,7 @@ __kernel void m01000_m08 (KERN_ATTR_VECTOR ()) m01000m (w, pw_len, pws, rules_buf, combs_buf, words_buf_r, 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_extra0_buf, d_extra1_buf, d_extra2_buf, d_extra3_buf, bitmap_mask, bitmap_shift1, bitmap_shift2, salt_pos, loop_pos, loop_cnt, il_cnt, digests_cnt, digests_offset, combs_mode, gid_max); } -__kernel void m01000_m16 (KERN_ATTR_VECTOR ()) +KERNEL_FQ void m01000_m16 (KERN_ATTR_VECTOR ()) { /** * base @@ -466,7 +466,7 @@ __kernel void m01000_m16 (KERN_ATTR_VECTOR ()) m01000m (w, pw_len, pws, rules_buf, combs_buf, words_buf_r, 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_extra0_buf, d_extra1_buf, d_extra2_buf, d_extra3_buf, bitmap_mask, bitmap_shift1, bitmap_shift2, salt_pos, loop_pos, loop_cnt, il_cnt, digests_cnt, digests_offset, combs_mode, gid_max); } -__kernel void m01000_s04 (KERN_ATTR_VECTOR ()) +KERNEL_FQ void m01000_s04 (KERN_ATTR_VECTOR ()) { /** * base @@ -504,7 +504,7 @@ __kernel void m01000_s04 (KERN_ATTR_VECTOR ()) m01000s (w, pw_len, pws, rules_buf, combs_buf, words_buf_r, 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_extra0_buf, d_extra1_buf, d_extra2_buf, d_extra3_buf, bitmap_mask, bitmap_shift1, bitmap_shift2, salt_pos, loop_pos, loop_cnt, il_cnt, digests_cnt, digests_offset, combs_mode, gid_max); } -__kernel void m01000_s08 (KERN_ATTR_VECTOR ()) +KERNEL_FQ void m01000_s08 (KERN_ATTR_VECTOR ()) { /** * base @@ -542,7 +542,7 @@ __kernel void m01000_s08 (KERN_ATTR_VECTOR ()) m01000s (w, pw_len, pws, rules_buf, combs_buf, words_buf_r, 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_extra0_buf, d_extra1_buf, d_extra2_buf, d_extra3_buf, bitmap_mask, bitmap_shift1, bitmap_shift2, salt_pos, loop_pos, loop_cnt, il_cnt, digests_cnt, digests_offset, combs_mode, gid_max); } -__kernel void m01000_s16 (KERN_ATTR_VECTOR ()) +KERNEL_FQ void m01000_s16 (KERN_ATTR_VECTOR ()) { /** * base diff --git a/OpenCL/m01000_a3-pure.cl b/OpenCL/m01000_a3-pure.cl index 50db936c4..19d0421b5 100644 --- a/OpenCL/m01000_a3-pure.cl +++ b/OpenCL/m01000_a3-pure.cl @@ -13,7 +13,7 @@ #include "inc_hash_md4.cl" #endif -__kernel void m01000_mxx (KERN_ATTR_VECTOR ()) +KERNEL_FQ void m01000_mxx (KERN_ATTR_VECTOR ()) { /** * modifier @@ -68,7 +68,7 @@ __kernel void m01000_mxx (KERN_ATTR_VECTOR ()) } } -__kernel void m01000_sxx (KERN_ATTR_VECTOR ()) +KERNEL_FQ void m01000_sxx (KERN_ATTR_VECTOR ()) { /** * modifier diff --git a/OpenCL/m01100_a0-optimized.cl b/OpenCL/m01100_a0-optimized.cl index 2e3a007c8..0f24a17d5 100644 --- a/OpenCL/m01100_a0-optimized.cl +++ b/OpenCL/m01100_a0-optimized.cl @@ -14,7 +14,7 @@ #include "inc_simd.cl" #endif -__kernel void m01100_m04 (KERN_ATTR_RULES ()) +KERNEL_FQ void m01100_m04 (KERN_ATTR_RULES ()) { /** * base @@ -41,7 +41,7 @@ __kernel void m01100_m04 (KERN_ATTR_RULES ()) * salt */ - __local salt_t s_salt_buf[1]; + LOCAL_AS salt_t s_salt_buf[1]; if (lid == 0) { @@ -225,15 +225,15 @@ __kernel void m01100_m04 (KERN_ATTR_RULES ()) } } -__kernel void m01100_m08 (KERN_ATTR_RULES ()) +KERNEL_FQ void m01100_m08 (KERN_ATTR_RULES ()) { } -__kernel void m01100_m16 (KERN_ATTR_RULES ()) +KERNEL_FQ void m01100_m16 (KERN_ATTR_RULES ()) { } -__kernel void m01100_s04 (KERN_ATTR_RULES ()) +KERNEL_FQ void m01100_s04 (KERN_ATTR_RULES ()) { /** * base @@ -260,7 +260,7 @@ __kernel void m01100_s04 (KERN_ATTR_RULES ()) * salt */ - __local salt_t s_salt_buf[1]; + LOCAL_AS salt_t s_salt_buf[1]; if (lid == 0) { @@ -459,10 +459,10 @@ __kernel void m01100_s04 (KERN_ATTR_RULES ()) } } -__kernel void m01100_s08 (KERN_ATTR_RULES ()) +KERNEL_FQ void m01100_s08 (KERN_ATTR_RULES ()) { } -__kernel void m01100_s16 (KERN_ATTR_RULES ()) +KERNEL_FQ void m01100_s16 (KERN_ATTR_RULES ()) { } diff --git a/OpenCL/m01100_a0-pure.cl b/OpenCL/m01100_a0-pure.cl index 1e58bd1e6..226206ee6 100644 --- a/OpenCL/m01100_a0-pure.cl +++ b/OpenCL/m01100_a0-pure.cl @@ -15,7 +15,7 @@ #include "inc_hash_md4.cl" #endif -__kernel void m01100_mxx (KERN_ATTR_RULES ()) +KERNEL_FQ void m01100_mxx (KERN_ATTR_RULES ()) { /** * modifier @@ -83,7 +83,7 @@ __kernel void m01100_mxx (KERN_ATTR_RULES ()) } } -__kernel void m01100_sxx (KERN_ATTR_RULES ()) +KERNEL_FQ void m01100_sxx (KERN_ATTR_RULES ()) { /** * modifier diff --git a/OpenCL/m01100_a1-optimized.cl b/OpenCL/m01100_a1-optimized.cl index a12dca944..64a69d4b1 100644 --- a/OpenCL/m01100_a1-optimized.cl +++ b/OpenCL/m01100_a1-optimized.cl @@ -13,7 +13,7 @@ #include "inc_hash_md4.cl" #endif -__kernel void m01100_m04 (KERN_ATTR_BASIC ()) +KERNEL_FQ void m01100_m04 (KERN_ATTR_BASIC ()) { /** * base @@ -40,7 +40,7 @@ __kernel void m01100_m04 (KERN_ATTR_BASIC ()) * salt */ - __local salt_t s_salt_buf[1]; + LOCAL_AS salt_t s_salt_buf[1]; if (lid == 0) { @@ -286,15 +286,15 @@ __kernel void m01100_m04 (KERN_ATTR_BASIC ()) } } -__kernel void m01100_m08 (KERN_ATTR_BASIC ()) +KERNEL_FQ void m01100_m08 (KERN_ATTR_BASIC ()) { } -__kernel void m01100_m16 (KERN_ATTR_BASIC ()) +KERNEL_FQ void m01100_m16 (KERN_ATTR_BASIC ()) { } -__kernel void m01100_s04 (KERN_ATTR_BASIC ()) +KERNEL_FQ void m01100_s04 (KERN_ATTR_BASIC ()) { /** * base @@ -321,7 +321,7 @@ __kernel void m01100_s04 (KERN_ATTR_BASIC ()) * salt */ - __local salt_t s_salt_buf[1]; + LOCAL_AS salt_t s_salt_buf[1]; if (lid == 0) { @@ -582,10 +582,10 @@ __kernel void m01100_s04 (KERN_ATTR_BASIC ()) } } -__kernel void m01100_s08 (KERN_ATTR_BASIC ()) +KERNEL_FQ void m01100_s08 (KERN_ATTR_BASIC ()) { } -__kernel void m01100_s16 (KERN_ATTR_BASIC ()) +KERNEL_FQ void m01100_s16 (KERN_ATTR_BASIC ()) { } diff --git a/OpenCL/m01100_a1-pure.cl b/OpenCL/m01100_a1-pure.cl index 1850917dd..b39c60882 100644 --- a/OpenCL/m01100_a1-pure.cl +++ b/OpenCL/m01100_a1-pure.cl @@ -13,7 +13,7 @@ #include "inc_hash_md4.cl" #endif -__kernel void m01100_mxx (KERN_ATTR_BASIC ()) +KERNEL_FQ void m01100_mxx (KERN_ATTR_BASIC ()) { /** * modifier @@ -79,7 +79,7 @@ __kernel void m01100_mxx (KERN_ATTR_BASIC ()) } } -__kernel void m01100_sxx (KERN_ATTR_BASIC ()) +KERNEL_FQ void m01100_sxx (KERN_ATTR_BASIC ()) { /** * modifier diff --git a/OpenCL/m01100_a3-optimized.cl b/OpenCL/m01100_a3-optimized.cl index 5151d0454..73d1b826d 100644 --- a/OpenCL/m01100_a3-optimized.cl +++ b/OpenCL/m01100_a3-optimized.cl @@ -13,7 +13,7 @@ #include "inc_hash_md4.cl" #endif -DECLSPEC void m01100m (__local salt_t *s_salt_buf, u32 *w, const u32 pw_len, KERN_ATTR_VECTOR ()) +DECLSPEC void m01100m (LOCAL_AS salt_t *s_salt_buf, u32 *w, const u32 pw_len, KERN_ATTR_VECTOR ()) { /** * modifier @@ -248,7 +248,7 @@ DECLSPEC void m01100m (__local salt_t *s_salt_buf, u32 *w, const u32 pw_len, KER } } -DECLSPEC void m01100s (__local salt_t *s_salt_buf, u32 *w, const u32 pw_len, KERN_ATTR_VECTOR ()) +DECLSPEC void m01100s (LOCAL_AS salt_t *s_salt_buf, u32 *w, const u32 pw_len, KERN_ATTR_VECTOR ()) { /** * modifier @@ -498,7 +498,7 @@ DECLSPEC void m01100s (__local salt_t *s_salt_buf, u32 *w, const u32 pw_len, KER } } -__kernel void m01100_m04 (KERN_ATTR_VECTOR ()) +KERNEL_FQ void m01100_m04 (KERN_ATTR_VECTOR ()) { /** * base @@ -532,7 +532,7 @@ __kernel void m01100_m04 (KERN_ATTR_VECTOR ()) * salt */ - __local salt_t s_salt_buf[1]; + LOCAL_AS salt_t s_salt_buf[1]; if (lid == 0) { @@ -552,7 +552,7 @@ __kernel void m01100_m04 (KERN_ATTR_VECTOR ()) m01100m (s_salt_buf, w, pw_len, pws, rules_buf, combs_buf, words_buf_r, 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_extra0_buf, d_extra1_buf, d_extra2_buf, d_extra3_buf, bitmap_mask, bitmap_shift1, bitmap_shift2, salt_pos, loop_pos, loop_cnt, il_cnt, digests_cnt, digests_offset, combs_mode, gid_max); } -__kernel void m01100_m08 (KERN_ATTR_VECTOR ()) +KERNEL_FQ void m01100_m08 (KERN_ATTR_VECTOR ()) { /** * base @@ -586,7 +586,7 @@ __kernel void m01100_m08 (KERN_ATTR_VECTOR ()) * salt */ - __local salt_t s_salt_buf[1]; + LOCAL_AS salt_t s_salt_buf[1]; if (lid == 0) { @@ -606,7 +606,7 @@ __kernel void m01100_m08 (KERN_ATTR_VECTOR ()) m01100m (s_salt_buf, w, pw_len, pws, rules_buf, combs_buf, words_buf_r, 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_extra0_buf, d_extra1_buf, d_extra2_buf, d_extra3_buf, bitmap_mask, bitmap_shift1, bitmap_shift2, salt_pos, loop_pos, loop_cnt, il_cnt, digests_cnt, digests_offset, combs_mode, gid_max); } -__kernel void m01100_m16 (KERN_ATTR_VECTOR ()) +KERNEL_FQ void m01100_m16 (KERN_ATTR_VECTOR ()) { /** * base @@ -640,7 +640,7 @@ __kernel void m01100_m16 (KERN_ATTR_VECTOR ()) * salt */ - __local salt_t s_salt_buf[1]; + LOCAL_AS salt_t s_salt_buf[1]; if (lid == 0) { @@ -660,7 +660,7 @@ __kernel void m01100_m16 (KERN_ATTR_VECTOR ()) m01100m (s_salt_buf, w, pw_len, pws, rules_buf, combs_buf, words_buf_r, 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_extra0_buf, d_extra1_buf, d_extra2_buf, d_extra3_buf, bitmap_mask, bitmap_shift1, bitmap_shift2, salt_pos, loop_pos, loop_cnt, il_cnt, digests_cnt, digests_offset, combs_mode, gid_max); } -__kernel void m01100_s04 (KERN_ATTR_VECTOR ()) +KERNEL_FQ void m01100_s04 (KERN_ATTR_VECTOR ()) { /** * base @@ -694,7 +694,7 @@ __kernel void m01100_s04 (KERN_ATTR_VECTOR ()) * salt */ - __local salt_t s_salt_buf[1]; + LOCAL_AS salt_t s_salt_buf[1]; if (lid == 0) { @@ -714,7 +714,7 @@ __kernel void m01100_s04 (KERN_ATTR_VECTOR ()) m01100s (s_salt_buf, w, pw_len, pws, rules_buf, combs_buf, words_buf_r, 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_extra0_buf, d_extra1_buf, d_extra2_buf, d_extra3_buf, bitmap_mask, bitmap_shift1, bitmap_shift2, salt_pos, loop_pos, loop_cnt, il_cnt, digests_cnt, digests_offset, combs_mode, gid_max); } -__kernel void m01100_s08 (KERN_ATTR_VECTOR ()) +KERNEL_FQ void m01100_s08 (KERN_ATTR_VECTOR ()) { /** * base @@ -748,7 +748,7 @@ __kernel void m01100_s08 (KERN_ATTR_VECTOR ()) * salt */ - __local salt_t s_salt_buf[1]; + LOCAL_AS salt_t s_salt_buf[1]; if (lid == 0) { @@ -768,7 +768,7 @@ __kernel void m01100_s08 (KERN_ATTR_VECTOR ()) m01100s (s_salt_buf, w, pw_len, pws, rules_buf, combs_buf, words_buf_r, 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_extra0_buf, d_extra1_buf, d_extra2_buf, d_extra3_buf, bitmap_mask, bitmap_shift1, bitmap_shift2, salt_pos, loop_pos, loop_cnt, il_cnt, digests_cnt, digests_offset, combs_mode, gid_max); } -__kernel void m01100_s16 (KERN_ATTR_VECTOR ()) +KERNEL_FQ void m01100_s16 (KERN_ATTR_VECTOR ()) { /** * base @@ -802,7 +802,7 @@ __kernel void m01100_s16 (KERN_ATTR_VECTOR ()) * salt */ - __local salt_t s_salt_buf[1]; + LOCAL_AS salt_t s_salt_buf[1]; if (lid == 0) { diff --git a/OpenCL/m01100_a3-pure.cl b/OpenCL/m01100_a3-pure.cl index 1b775199c..9355bc825 100644 --- a/OpenCL/m01100_a3-pure.cl +++ b/OpenCL/m01100_a3-pure.cl @@ -13,7 +13,7 @@ #include "inc_hash_md4.cl" #endif -__kernel void m01100_mxx (KERN_ATTR_VECTOR ()) +KERNEL_FQ void m01100_mxx (KERN_ATTR_VECTOR ()) { /** * modifier @@ -92,7 +92,7 @@ __kernel void m01100_mxx (KERN_ATTR_VECTOR ()) } } -__kernel void m01100_sxx (KERN_ATTR_VECTOR ()) +KERNEL_FQ void m01100_sxx (KERN_ATTR_VECTOR ()) { /** * modifier diff --git a/OpenCL/m01300_a0-optimized.cl b/OpenCL/m01300_a0-optimized.cl index 6ff1b31fc..e548cb502 100644 --- a/OpenCL/m01300_a0-optimized.cl +++ b/OpenCL/m01300_a0-optimized.cl @@ -28,7 +28,7 @@ g = 0; \ } -__kernel void m01300_m04 (KERN_ATTR_RULES ()) +KERNEL_FQ void m01300_m04 (KERN_ATTR_RULES ()) { /** * modifier @@ -175,15 +175,15 @@ __kernel void m01300_m04 (KERN_ATTR_RULES ()) } } -__kernel void m01300_m08 (KERN_ATTR_RULES ()) +KERNEL_FQ void m01300_m08 (KERN_ATTR_RULES ()) { } -__kernel void m01300_m16 (KERN_ATTR_RULES ()) +KERNEL_FQ void m01300_m16 (KERN_ATTR_RULES ()) { } -__kernel void m01300_s04 (KERN_ATTR_RULES ()) +KERNEL_FQ void m01300_s04 (KERN_ATTR_RULES ()) { /** * modifier @@ -361,10 +361,10 @@ __kernel void m01300_s04 (KERN_ATTR_RULES ()) } } -__kernel void m01300_s08 (KERN_ATTR_RULES ()) +KERNEL_FQ void m01300_s08 (KERN_ATTR_RULES ()) { } -__kernel void m01300_s16 (KERN_ATTR_RULES ()) +KERNEL_FQ void m01300_s16 (KERN_ATTR_RULES ()) { } diff --git a/OpenCL/m01300_a0-pure.cl b/OpenCL/m01300_a0-pure.cl index b7747d5ac..c837946b9 100644 --- a/OpenCL/m01300_a0-pure.cl +++ b/OpenCL/m01300_a0-pure.cl @@ -15,7 +15,7 @@ #include "inc_hash_sha224.cl" #endif -__kernel void m01300_mxx (KERN_ATTR_RULES ()) +KERNEL_FQ void m01300_mxx (KERN_ATTR_RULES ()) { /** * modifier @@ -59,7 +59,7 @@ __kernel void m01300_mxx (KERN_ATTR_RULES ()) } } -__kernel void m01300_sxx (KERN_ATTR_RULES ()) +KERNEL_FQ void m01300_sxx (KERN_ATTR_RULES ()) { /** * modifier diff --git a/OpenCL/m01300_a1-optimized.cl b/OpenCL/m01300_a1-optimized.cl index df8ea58ac..fd477b15c 100644 --- a/OpenCL/m01300_a1-optimized.cl +++ b/OpenCL/m01300_a1-optimized.cl @@ -26,7 +26,7 @@ g = 0; \ } -__kernel void m01300_m04 (KERN_ATTR_BASIC ()) +KERNEL_FQ void m01300_m04 (KERN_ATTR_BASIC ()) { /** * modifier @@ -231,15 +231,15 @@ __kernel void m01300_m04 (KERN_ATTR_BASIC ()) } } -__kernel void m01300_m08 (KERN_ATTR_BASIC ()) +KERNEL_FQ void m01300_m08 (KERN_ATTR_BASIC ()) { } -__kernel void m01300_m16 (KERN_ATTR_BASIC ()) +KERNEL_FQ void m01300_m16 (KERN_ATTR_BASIC ()) { } -__kernel void m01300_s04 (KERN_ATTR_BASIC ()) +KERNEL_FQ void m01300_s04 (KERN_ATTR_BASIC ()) { /** * modifier @@ -475,10 +475,10 @@ __kernel void m01300_s04 (KERN_ATTR_BASIC ()) } } -__kernel void m01300_s08 (KERN_ATTR_BASIC ()) +KERNEL_FQ void m01300_s08 (KERN_ATTR_BASIC ()) { } -__kernel void m01300_s16 (KERN_ATTR_BASIC ()) +KERNEL_FQ void m01300_s16 (KERN_ATTR_BASIC ()) { } diff --git a/OpenCL/m01300_a1-pure.cl b/OpenCL/m01300_a1-pure.cl index e9bb74321..54f9ecbf2 100644 --- a/OpenCL/m01300_a1-pure.cl +++ b/OpenCL/m01300_a1-pure.cl @@ -13,7 +13,7 @@ #include "inc_hash_sha224.cl" #endif -__kernel void m01300_mxx (KERN_ATTR_BASIC ()) +KERNEL_FQ void m01300_mxx (KERN_ATTR_BASIC ()) { /** * modifier @@ -55,7 +55,7 @@ __kernel void m01300_mxx (KERN_ATTR_BASIC ()) } } -__kernel void m01300_sxx (KERN_ATTR_BASIC ()) +KERNEL_FQ void m01300_sxx (KERN_ATTR_BASIC ()) { /** * modifier diff --git a/OpenCL/m01300_a3-optimized.cl b/OpenCL/m01300_a3-optimized.cl index 60283a08a..4ee8522db 100644 --- a/OpenCL/m01300_a3-optimized.cl +++ b/OpenCL/m01300_a3-optimized.cl @@ -295,7 +295,7 @@ DECLSPEC void m01300s (u32 *w, const u32 pw_len, KERN_ATTR_VECTOR ()) } } -__kernel void m01300_m04 (KERN_ATTR_VECTOR ()) +KERNEL_FQ void m01300_m04 (KERN_ATTR_VECTOR ()) { /** * base @@ -333,7 +333,7 @@ __kernel void m01300_m04 (KERN_ATTR_VECTOR ()) m01300m (w, pw_len, pws, rules_buf, combs_buf, words_buf_r, 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_extra0_buf, d_extra1_buf, d_extra2_buf, d_extra3_buf, bitmap_mask, bitmap_shift1, bitmap_shift2, salt_pos, loop_pos, loop_cnt, il_cnt, digests_cnt, digests_offset, combs_mode, gid_max); } -__kernel void m01300_m08 (KERN_ATTR_VECTOR ()) +KERNEL_FQ void m01300_m08 (KERN_ATTR_VECTOR ()) { /** * base @@ -371,7 +371,7 @@ __kernel void m01300_m08 (KERN_ATTR_VECTOR ()) m01300m (w, pw_len, pws, rules_buf, combs_buf, words_buf_r, 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_extra0_buf, d_extra1_buf, d_extra2_buf, d_extra3_buf, bitmap_mask, bitmap_shift1, bitmap_shift2, salt_pos, loop_pos, loop_cnt, il_cnt, digests_cnt, digests_offset, combs_mode, gid_max); } -__kernel void m01300_m16 (KERN_ATTR_VECTOR ()) +KERNEL_FQ void m01300_m16 (KERN_ATTR_VECTOR ()) { /** * base @@ -409,7 +409,7 @@ __kernel void m01300_m16 (KERN_ATTR_VECTOR ()) m01300m (w, pw_len, pws, rules_buf, combs_buf, words_buf_r, 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_extra0_buf, d_extra1_buf, d_extra2_buf, d_extra3_buf, bitmap_mask, bitmap_shift1, bitmap_shift2, salt_pos, loop_pos, loop_cnt, il_cnt, digests_cnt, digests_offset, combs_mode, gid_max); } -__kernel void m01300_s04 (KERN_ATTR_VECTOR ()) +KERNEL_FQ void m01300_s04 (KERN_ATTR_VECTOR ()) { /** * base @@ -447,7 +447,7 @@ __kernel void m01300_s04 (KERN_ATTR_VECTOR ()) m01300s (w, pw_len, pws, rules_buf, combs_buf, words_buf_r, 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_extra0_buf, d_extra1_buf, d_extra2_buf, d_extra3_buf, bitmap_mask, bitmap_shift1, bitmap_shift2, salt_pos, loop_pos, loop_cnt, il_cnt, digests_cnt, digests_offset, combs_mode, gid_max); } -__kernel void m01300_s08 (KERN_ATTR_VECTOR ()) +KERNEL_FQ void m01300_s08 (KERN_ATTR_VECTOR ()) { /** * base @@ -485,7 +485,7 @@ __kernel void m01300_s08 (KERN_ATTR_VECTOR ()) m01300s (w, pw_len, pws, rules_buf, combs_buf, words_buf_r, 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_extra0_buf, d_extra1_buf, d_extra2_buf, d_extra3_buf, bitmap_mask, bitmap_shift1, bitmap_shift2, salt_pos, loop_pos, loop_cnt, il_cnt, digests_cnt, digests_offset, combs_mode, gid_max); } -__kernel void m01300_s16 (KERN_ATTR_VECTOR ()) +KERNEL_FQ void m01300_s16 (KERN_ATTR_VECTOR ()) { /** * base diff --git a/OpenCL/m01300_a3-pure.cl b/OpenCL/m01300_a3-pure.cl index 43653f701..7fc2d9688 100644 --- a/OpenCL/m01300_a3-pure.cl +++ b/OpenCL/m01300_a3-pure.cl @@ -13,7 +13,7 @@ #include "inc_hash_sha224.cl" #endif -__kernel void m01300_mxx (KERN_ATTR_VECTOR ()) +KERNEL_FQ void m01300_mxx (KERN_ATTR_VECTOR ()) { /** * modifier @@ -68,7 +68,7 @@ __kernel void m01300_mxx (KERN_ATTR_VECTOR ()) } } -__kernel void m01300_sxx (KERN_ATTR_VECTOR ()) +KERNEL_FQ void m01300_sxx (KERN_ATTR_VECTOR ()) { /** * modifier diff --git a/OpenCL/m01400_a0-optimized.cl b/OpenCL/m01400_a0-optimized.cl index 6fa712478..5cf54fe16 100644 --- a/OpenCL/m01400_a0-optimized.cl +++ b/OpenCL/m01400_a0-optimized.cl @@ -29,7 +29,7 @@ h = 0; \ } -__kernel void m01400_m04 (KERN_ATTR_RULES ()) +KERNEL_FQ void m01400_m04 (KERN_ATTR_RULES ()) { /** * modifier @@ -176,15 +176,15 @@ __kernel void m01400_m04 (KERN_ATTR_RULES ()) } } -__kernel void m01400_m08 (KERN_ATTR_RULES ()) +KERNEL_FQ void m01400_m08 (KERN_ATTR_RULES ()) { } -__kernel void m01400_m16 (KERN_ATTR_RULES ()) +KERNEL_FQ void m01400_m16 (KERN_ATTR_RULES ()) { } -__kernel void m01400_s04 (KERN_ATTR_RULES ()) +KERNEL_FQ void m01400_s04 (KERN_ATTR_RULES ()) { /** * modifier @@ -364,10 +364,10 @@ __kernel void m01400_s04 (KERN_ATTR_RULES ()) } } -__kernel void m01400_s08 (KERN_ATTR_RULES ()) +KERNEL_FQ void m01400_s08 (KERN_ATTR_RULES ()) { } -__kernel void m01400_s16 (KERN_ATTR_RULES ()) +KERNEL_FQ void m01400_s16 (KERN_ATTR_RULES ()) { } diff --git a/OpenCL/m01400_a0-pure.cl b/OpenCL/m01400_a0-pure.cl index b0cff3938..f591ac0a6 100644 --- a/OpenCL/m01400_a0-pure.cl +++ b/OpenCL/m01400_a0-pure.cl @@ -15,7 +15,7 @@ #include "inc_hash_sha256.cl" #endif -__kernel void m01400_mxx (KERN_ATTR_RULES ()) +KERNEL_FQ void m01400_mxx (KERN_ATTR_RULES ()) { /** * modifier @@ -59,7 +59,7 @@ __kernel void m01400_mxx (KERN_ATTR_RULES ()) } } -__kernel void m01400_sxx (KERN_ATTR_RULES ()) +KERNEL_FQ void m01400_sxx (KERN_ATTR_RULES ()) { /** * modifier diff --git a/OpenCL/m01400_a1-optimized.cl b/OpenCL/m01400_a1-optimized.cl index 2a194d66a..a4bdd8009 100644 --- a/OpenCL/m01400_a1-optimized.cl +++ b/OpenCL/m01400_a1-optimized.cl @@ -27,7 +27,7 @@ h = 0; \ } -__kernel void m01400_m04 (KERN_ATTR_BASIC ()) +KERNEL_FQ void m01400_m04 (KERN_ATTR_BASIC ()) { /** * modifier @@ -232,15 +232,15 @@ __kernel void m01400_m04 (KERN_ATTR_BASIC ()) } } -__kernel void m01400_m08 (KERN_ATTR_BASIC ()) +KERNEL_FQ void m01400_m08 (KERN_ATTR_BASIC ()) { } -__kernel void m01400_m16 (KERN_ATTR_BASIC ()) +KERNEL_FQ void m01400_m16 (KERN_ATTR_BASIC ()) { } -__kernel void m01400_s04 (KERN_ATTR_BASIC ()) +KERNEL_FQ void m01400_s04 (KERN_ATTR_BASIC ()) { /** * modifier @@ -478,10 +478,10 @@ __kernel void m01400_s04 (KERN_ATTR_BASIC ()) } } -__kernel void m01400_s08 (KERN_ATTR_BASIC ()) +KERNEL_FQ void m01400_s08 (KERN_ATTR_BASIC ()) { } -__kernel void m01400_s16 (KERN_ATTR_BASIC ()) +KERNEL_FQ void m01400_s16 (KERN_ATTR_BASIC ()) { } diff --git a/OpenCL/m01400_a1-pure.cl b/OpenCL/m01400_a1-pure.cl index ea461048b..2f29bfeaa 100644 --- a/OpenCL/m01400_a1-pure.cl +++ b/OpenCL/m01400_a1-pure.cl @@ -13,7 +13,7 @@ #include "inc_hash_sha256.cl" #endif -__kernel void m01400_mxx (KERN_ATTR_BASIC ()) +KERNEL_FQ void m01400_mxx (KERN_ATTR_BASIC ()) { /** * modifier @@ -55,7 +55,7 @@ __kernel void m01400_mxx (KERN_ATTR_BASIC ()) } } -__kernel void m01400_sxx (KERN_ATTR_BASIC ()) +KERNEL_FQ void m01400_sxx (KERN_ATTR_BASIC ()) { /** * modifier diff --git a/OpenCL/m01400_a3-optimized.cl b/OpenCL/m01400_a3-optimized.cl index f0dac447b..e2a3694f4 100644 --- a/OpenCL/m01400_a3-optimized.cl +++ b/OpenCL/m01400_a3-optimized.cl @@ -298,7 +298,7 @@ DECLSPEC void m01400s (u32 *w, const u32 pw_len, KERN_ATTR_VECTOR ()) } } -__kernel void m01400_m04 (KERN_ATTR_VECTOR ()) +KERNEL_FQ void m01400_m04 (KERN_ATTR_VECTOR ()) { /** * base @@ -336,7 +336,7 @@ __kernel void m01400_m04 (KERN_ATTR_VECTOR ()) m01400m (w, pw_len, pws, rules_buf, combs_buf, words_buf_r, 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_extra0_buf, d_extra1_buf, d_extra2_buf, d_extra3_buf, bitmap_mask, bitmap_shift1, bitmap_shift2, salt_pos, loop_pos, loop_cnt, il_cnt, digests_cnt, digests_offset, combs_mode, gid_max); } -__kernel void m01400_m08 (KERN_ATTR_VECTOR ()) +KERNEL_FQ void m01400_m08 (KERN_ATTR_VECTOR ()) { /** * base @@ -374,7 +374,7 @@ __kernel void m01400_m08 (KERN_ATTR_VECTOR ()) m01400m (w, pw_len, pws, rules_buf, combs_buf, words_buf_r, 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_extra0_buf, d_extra1_buf, d_extra2_buf, d_extra3_buf, bitmap_mask, bitmap_shift1, bitmap_shift2, salt_pos, loop_pos, loop_cnt, il_cnt, digests_cnt, digests_offset, combs_mode, gid_max); } -__kernel void m01400_m16 (KERN_ATTR_VECTOR ()) +KERNEL_FQ void m01400_m16 (KERN_ATTR_VECTOR ()) { /** * base @@ -412,7 +412,7 @@ __kernel void m01400_m16 (KERN_ATTR_VECTOR ()) m01400m (w, pw_len, pws, rules_buf, combs_buf, words_buf_r, 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_extra0_buf, d_extra1_buf, d_extra2_buf, d_extra3_buf, bitmap_mask, bitmap_shift1, bitmap_shift2, salt_pos, loop_pos, loop_cnt, il_cnt, digests_cnt, digests_offset, combs_mode, gid_max); } -__kernel void m01400_s04 (KERN_ATTR_VECTOR ()) +KERNEL_FQ void m01400_s04 (KERN_ATTR_VECTOR ()) { /** * base @@ -450,7 +450,7 @@ __kernel void m01400_s04 (KERN_ATTR_VECTOR ()) m01400s (w, pw_len, pws, rules_buf, combs_buf, words_buf_r, 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_extra0_buf, d_extra1_buf, d_extra2_buf, d_extra3_buf, bitmap_mask, bitmap_shift1, bitmap_shift2, salt_pos, loop_pos, loop_cnt, il_cnt, digests_cnt, digests_offset, combs_mode, gid_max); } -__kernel void m01400_s08 (KERN_ATTR_VECTOR ()) +KERNEL_FQ void m01400_s08 (KERN_ATTR_VECTOR ()) { /** * base @@ -488,7 +488,7 @@ __kernel void m01400_s08 (KERN_ATTR_VECTOR ()) m01400s (w, pw_len, pws, rules_buf, combs_buf, words_buf_r, 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_extra0_buf, d_extra1_buf, d_extra2_buf, d_extra3_buf, bitmap_mask, bitmap_shift1, bitmap_shift2, salt_pos, loop_pos, loop_cnt, il_cnt, digests_cnt, digests_offset, combs_mode, gid_max); } -__kernel void m01400_s16 (KERN_ATTR_VECTOR ()) +KERNEL_FQ void m01400_s16 (KERN_ATTR_VECTOR ()) { /** * base diff --git a/OpenCL/m01400_a3-pure.cl b/OpenCL/m01400_a3-pure.cl index c21fd0efa..ea2876f55 100644 --- a/OpenCL/m01400_a3-pure.cl +++ b/OpenCL/m01400_a3-pure.cl @@ -13,7 +13,7 @@ #include "inc_hash_sha256.cl" #endif -__kernel void m01400_mxx (KERN_ATTR_VECTOR ()) +KERNEL_FQ void m01400_mxx (KERN_ATTR_VECTOR ()) { /** * modifier @@ -68,7 +68,7 @@ __kernel void m01400_mxx (KERN_ATTR_VECTOR ()) } } -__kernel void m01400_sxx (KERN_ATTR_VECTOR ()) +KERNEL_FQ void m01400_sxx (KERN_ATTR_VECTOR ()) { /** * modifier diff --git a/OpenCL/m01410_a0-optimized.cl b/OpenCL/m01410_a0-optimized.cl index f23351a9e..1bc091747 100644 --- a/OpenCL/m01410_a0-optimized.cl +++ b/OpenCL/m01410_a0-optimized.cl @@ -29,7 +29,7 @@ h = 0; \ } -__kernel void m01410_m04 (KERN_ATTR_RULES ()) +KERNEL_FQ void m01410_m04 (KERN_ATTR_RULES ()) { /** * modifier @@ -249,15 +249,15 @@ __kernel void m01410_m04 (KERN_ATTR_RULES ()) } } -__kernel void m01410_m08 (KERN_ATTR_RULES ()) +KERNEL_FQ void m01410_m08 (KERN_ATTR_RULES ()) { } -__kernel void m01410_m16 (KERN_ATTR_RULES ()) +KERNEL_FQ void m01410_m16 (KERN_ATTR_RULES ()) { } -__kernel void m01410_s04 (KERN_ATTR_RULES ()) +KERNEL_FQ void m01410_s04 (KERN_ATTR_RULES ()) { /** * modifier @@ -510,10 +510,10 @@ __kernel void m01410_s04 (KERN_ATTR_RULES ()) } } -__kernel void m01410_s08 (KERN_ATTR_RULES ()) +KERNEL_FQ void m01410_s08 (KERN_ATTR_RULES ()) { } -__kernel void m01410_s16 (KERN_ATTR_RULES ()) +KERNEL_FQ void m01410_s16 (KERN_ATTR_RULES ()) { } diff --git a/OpenCL/m01410_a0-pure.cl b/OpenCL/m01410_a0-pure.cl index eb8db7066..5ca85d51e 100644 --- a/OpenCL/m01410_a0-pure.cl +++ b/OpenCL/m01410_a0-pure.cl @@ -15,7 +15,7 @@ #include "inc_hash_sha256.cl" #endif -__kernel void m01410_mxx (KERN_ATTR_RULES ()) +KERNEL_FQ void m01410_mxx (KERN_ATTR_RULES ()) { /** * modifier @@ -70,7 +70,7 @@ __kernel void m01410_mxx (KERN_ATTR_RULES ()) } } -__kernel void m01410_sxx (KERN_ATTR_RULES ()) +KERNEL_FQ void m01410_sxx (KERN_ATTR_RULES ()) { /** * modifier diff --git a/OpenCL/m01410_a1-optimized.cl b/OpenCL/m01410_a1-optimized.cl index 70fb73833..b72199b09 100644 --- a/OpenCL/m01410_a1-optimized.cl +++ b/OpenCL/m01410_a1-optimized.cl @@ -27,7 +27,7 @@ h = 0; \ } -__kernel void m01410_m04 (KERN_ATTR_BASIC ()) +KERNEL_FQ void m01410_m04 (KERN_ATTR_BASIC ()) { /** * modifier @@ -307,15 +307,15 @@ __kernel void m01410_m04 (KERN_ATTR_BASIC ()) } } -__kernel void m01410_m08 (KERN_ATTR_BASIC ()) +KERNEL_FQ void m01410_m08 (KERN_ATTR_BASIC ()) { } -__kernel void m01410_m16 (KERN_ATTR_BASIC ()) +KERNEL_FQ void m01410_m16 (KERN_ATTR_BASIC ()) { } -__kernel void m01410_s04 (KERN_ATTR_BASIC ()) +KERNEL_FQ void m01410_s04 (KERN_ATTR_BASIC ()) { /** * modifier @@ -628,10 +628,10 @@ __kernel void m01410_s04 (KERN_ATTR_BASIC ()) } } -__kernel void m01410_s08 (KERN_ATTR_BASIC ()) +KERNEL_FQ void m01410_s08 (KERN_ATTR_BASIC ()) { } -__kernel void m01410_s16 (KERN_ATTR_BASIC ()) +KERNEL_FQ void m01410_s16 (KERN_ATTR_BASIC ()) { } diff --git a/OpenCL/m01410_a1-pure.cl b/OpenCL/m01410_a1-pure.cl index 7d068f4ea..3ee5205a7 100644 --- a/OpenCL/m01410_a1-pure.cl +++ b/OpenCL/m01410_a1-pure.cl @@ -13,7 +13,7 @@ #include "inc_hash_sha256.cl" #endif -__kernel void m01410_mxx (KERN_ATTR_BASIC ()) +KERNEL_FQ void m01410_mxx (KERN_ATTR_BASIC ()) { /** * modifier @@ -66,7 +66,7 @@ __kernel void m01410_mxx (KERN_ATTR_BASIC ()) } } -__kernel void m01410_sxx (KERN_ATTR_BASIC ()) +KERNEL_FQ void m01410_sxx (KERN_ATTR_BASIC ()) { /** * modifier diff --git a/OpenCL/m01410_a3-optimized.cl b/OpenCL/m01410_a3-optimized.cl index 694a86e87..dafbafc80 100644 --- a/OpenCL/m01410_a3-optimized.cl +++ b/OpenCL/m01410_a3-optimized.cl @@ -349,7 +349,7 @@ DECLSPEC void m01410s (u32 *w, const u32 pw_len, KERN_ATTR_VECTOR ()) } } -__kernel void m01410_m04 (KERN_ATTR_VECTOR ()) +KERNEL_FQ void m01410_m04 (KERN_ATTR_VECTOR ()) { /** * base @@ -387,7 +387,7 @@ __kernel void m01410_m04 (KERN_ATTR_VECTOR ()) m01410m (w, pw_len, pws, rules_buf, combs_buf, words_buf_r, 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_extra0_buf, d_extra1_buf, d_extra2_buf, d_extra3_buf, bitmap_mask, bitmap_shift1, bitmap_shift2, salt_pos, loop_pos, loop_cnt, il_cnt, digests_cnt, digests_offset, combs_mode, gid_max); } -__kernel void m01410_m08 (KERN_ATTR_VECTOR ()) +KERNEL_FQ void m01410_m08 (KERN_ATTR_VECTOR ()) { /** * base @@ -425,7 +425,7 @@ __kernel void m01410_m08 (KERN_ATTR_VECTOR ()) m01410m (w, pw_len, pws, rules_buf, combs_buf, words_buf_r, 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_extra0_buf, d_extra1_buf, d_extra2_buf, d_extra3_buf, bitmap_mask, bitmap_shift1, bitmap_shift2, salt_pos, loop_pos, loop_cnt, il_cnt, digests_cnt, digests_offset, combs_mode, gid_max); } -__kernel void m01410_m16 (KERN_ATTR_VECTOR ()) +KERNEL_FQ void m01410_m16 (KERN_ATTR_VECTOR ()) { /** * base @@ -463,7 +463,7 @@ __kernel void m01410_m16 (KERN_ATTR_VECTOR ()) m01410m (w, pw_len, pws, rules_buf, combs_buf, words_buf_r, 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_extra0_buf, d_extra1_buf, d_extra2_buf, d_extra3_buf, bitmap_mask, bitmap_shift1, bitmap_shift2, salt_pos, loop_pos, loop_cnt, il_cnt, digests_cnt, digests_offset, combs_mode, gid_max); } -__kernel void m01410_s04 (KERN_ATTR_VECTOR ()) +KERNEL_FQ void m01410_s04 (KERN_ATTR_VECTOR ()) { /** * base @@ -501,7 +501,7 @@ __kernel void m01410_s04 (KERN_ATTR_VECTOR ()) m01410s (w, pw_len, pws, rules_buf, combs_buf, words_buf_r, 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_extra0_buf, d_extra1_buf, d_extra2_buf, d_extra3_buf, bitmap_mask, bitmap_shift1, bitmap_shift2, salt_pos, loop_pos, loop_cnt, il_cnt, digests_cnt, digests_offset, combs_mode, gid_max); } -__kernel void m01410_s08 (KERN_ATTR_VECTOR ()) +KERNEL_FQ void m01410_s08 (KERN_ATTR_VECTOR ()) { /** * base @@ -539,7 +539,7 @@ __kernel void m01410_s08 (KERN_ATTR_VECTOR ()) m01410s (w, pw_len, pws, rules_buf, combs_buf, words_buf_r, 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_extra0_buf, d_extra1_buf, d_extra2_buf, d_extra3_buf, bitmap_mask, bitmap_shift1, bitmap_shift2, salt_pos, loop_pos, loop_cnt, il_cnt, digests_cnt, digests_offset, combs_mode, gid_max); } -__kernel void m01410_s16 (KERN_ATTR_VECTOR ()) +KERNEL_FQ void m01410_s16 (KERN_ATTR_VECTOR ()) { /** * base diff --git a/OpenCL/m01410_a3-pure.cl b/OpenCL/m01410_a3-pure.cl index 49fc431b8..8fb2695f6 100644 --- a/OpenCL/m01410_a3-pure.cl +++ b/OpenCL/m01410_a3-pure.cl @@ -13,7 +13,7 @@ #include "inc_hash_sha256.cl" #endif -__kernel void m01410_mxx (KERN_ATTR_VECTOR ()) +KERNEL_FQ void m01410_mxx (KERN_ATTR_VECTOR ()) { /** * modifier @@ -79,7 +79,7 @@ __kernel void m01410_mxx (KERN_ATTR_VECTOR ()) } } -__kernel void m01410_sxx (KERN_ATTR_VECTOR ()) +KERNEL_FQ void m01410_sxx (KERN_ATTR_VECTOR ()) { /** * modifier diff --git a/OpenCL/m01420_a0-optimized.cl b/OpenCL/m01420_a0-optimized.cl index 4ae15b997..f8fb78256 100644 --- a/OpenCL/m01420_a0-optimized.cl +++ b/OpenCL/m01420_a0-optimized.cl @@ -29,7 +29,7 @@ h = 0; \ } -__kernel void m01420_m04 (KERN_ATTR_RULES ()) +KERNEL_FQ void m01420_m04 (KERN_ATTR_RULES ()) { /** * modifier @@ -229,15 +229,15 @@ __kernel void m01420_m04 (KERN_ATTR_RULES ()) } } -__kernel void m01420_m08 (KERN_ATTR_RULES ()) +KERNEL_FQ void m01420_m08 (KERN_ATTR_RULES ()) { } -__kernel void m01420_m16 (KERN_ATTR_RULES ()) +KERNEL_FQ void m01420_m16 (KERN_ATTR_RULES ()) { } -__kernel void m01420_s04 (KERN_ATTR_RULES ()) +KERNEL_FQ void m01420_s04 (KERN_ATTR_RULES ()) { /** * modifier @@ -470,10 +470,10 @@ __kernel void m01420_s04 (KERN_ATTR_RULES ()) } } -__kernel void m01420_s08 (KERN_ATTR_RULES ()) +KERNEL_FQ void m01420_s08 (KERN_ATTR_RULES ()) { } -__kernel void m01420_s16 (KERN_ATTR_RULES ()) +KERNEL_FQ void m01420_s16 (KERN_ATTR_RULES ()) { } diff --git a/OpenCL/m01420_a0-pure.cl b/OpenCL/m01420_a0-pure.cl index 565af9242..975487ae7 100644 --- a/OpenCL/m01420_a0-pure.cl +++ b/OpenCL/m01420_a0-pure.cl @@ -15,7 +15,7 @@ #include "inc_hash_sha256.cl" #endif -__kernel void m01420_mxx (KERN_ATTR_RULES ()) +KERNEL_FQ void m01420_mxx (KERN_ATTR_RULES ()) { /** * modifier @@ -63,7 +63,7 @@ __kernel void m01420_mxx (KERN_ATTR_RULES ()) } } -__kernel void m01420_sxx (KERN_ATTR_RULES ()) +KERNEL_FQ void m01420_sxx (KERN_ATTR_RULES ()) { /** * modifier diff --git a/OpenCL/m01420_a1-optimized.cl b/OpenCL/m01420_a1-optimized.cl index 90d7251d4..4fda62de3 100644 --- a/OpenCL/m01420_a1-optimized.cl +++ b/OpenCL/m01420_a1-optimized.cl @@ -27,7 +27,7 @@ h = 0; \ } -__kernel void m01420_m04 (KERN_ATTR_BASIC ()) +KERNEL_FQ void m01420_m04 (KERN_ATTR_BASIC ()) { /** * modifier @@ -285,15 +285,15 @@ __kernel void m01420_m04 (KERN_ATTR_BASIC ()) } } -__kernel void m01420_m08 (KERN_ATTR_BASIC ()) +KERNEL_FQ void m01420_m08 (KERN_ATTR_BASIC ()) { } -__kernel void m01420_m16 (KERN_ATTR_BASIC ()) +KERNEL_FQ void m01420_m16 (KERN_ATTR_BASIC ()) { } -__kernel void m01420_s04 (KERN_ATTR_BASIC ()) +KERNEL_FQ void m01420_s04 (KERN_ATTR_BASIC ()) { /** * modifier @@ -584,10 +584,10 @@ __kernel void m01420_s04 (KERN_ATTR_BASIC ()) } } -__kernel void m01420_s08 (KERN_ATTR_BASIC ()) +KERNEL_FQ void m01420_s08 (KERN_ATTR_BASIC ()) { } -__kernel void m01420_s16 (KERN_ATTR_BASIC ()) +KERNEL_FQ void m01420_s16 (KERN_ATTR_BASIC ()) { } diff --git a/OpenCL/m01420_a1-pure.cl b/OpenCL/m01420_a1-pure.cl index bdee99ed6..6a0b7747b 100644 --- a/OpenCL/m01420_a1-pure.cl +++ b/OpenCL/m01420_a1-pure.cl @@ -13,7 +13,7 @@ #include "inc_hash_sha256.cl" #endif -__kernel void m01420_mxx (KERN_ATTR_BASIC ()) +KERNEL_FQ void m01420_mxx (KERN_ATTR_BASIC ()) { /** * modifier @@ -57,7 +57,7 @@ __kernel void m01420_mxx (KERN_ATTR_BASIC ()) } } -__kernel void m01420_sxx (KERN_ATTR_BASIC ()) +KERNEL_FQ void m01420_sxx (KERN_ATTR_BASIC ()) { /** * modifier diff --git a/OpenCL/m01420_a3-optimized.cl b/OpenCL/m01420_a3-optimized.cl index c5be4488d..e4c36b7df 100644 --- a/OpenCL/m01420_a3-optimized.cl +++ b/OpenCL/m01420_a3-optimized.cl @@ -448,7 +448,7 @@ DECLSPEC void m01420s (u32 *w0, u32 *w1, u32 *w2, u32 *w3, const u32 pw_len, KER } } -__kernel void m01420_m04 (KERN_ATTR_BASIC ()) +KERNEL_FQ void m01420_m04 (KERN_ATTR_BASIC ()) { /** * base @@ -495,7 +495,7 @@ __kernel void m01420_m04 (KERN_ATTR_BASIC ()) m01420m (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_extra0_buf, d_extra1_buf, d_extra2_buf, d_extra3_buf, bitmap_mask, bitmap_shift1, bitmap_shift2, salt_pos, loop_pos, loop_cnt, il_cnt, digests_cnt, digests_offset, combs_mode, gid_max); } -__kernel void m01420_m08 (KERN_ATTR_BASIC ()) +KERNEL_FQ void m01420_m08 (KERN_ATTR_BASIC ()) { /** * base @@ -542,7 +542,7 @@ __kernel void m01420_m08 (KERN_ATTR_BASIC ()) m01420m (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_extra0_buf, d_extra1_buf, d_extra2_buf, d_extra3_buf, bitmap_mask, bitmap_shift1, bitmap_shift2, salt_pos, loop_pos, loop_cnt, il_cnt, digests_cnt, digests_offset, combs_mode, gid_max); } -__kernel void m01420_m16 (KERN_ATTR_BASIC ()) +KERNEL_FQ void m01420_m16 (KERN_ATTR_BASIC ()) { /** * base @@ -589,7 +589,7 @@ __kernel void m01420_m16 (KERN_ATTR_BASIC ()) m01420m (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_extra0_buf, d_extra1_buf, d_extra2_buf, d_extra3_buf, bitmap_mask, bitmap_shift1, bitmap_shift2, salt_pos, loop_pos, loop_cnt, il_cnt, digests_cnt, digests_offset, combs_mode, gid_max); } -__kernel void m01420_s04 (KERN_ATTR_BASIC ()) +KERNEL_FQ void m01420_s04 (KERN_ATTR_BASIC ()) { /** * base @@ -636,7 +636,7 @@ __kernel void m01420_s04 (KERN_ATTR_BASIC ()) m01420s (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_extra0_buf, d_extra1_buf, d_extra2_buf, d_extra3_buf, bitmap_mask, bitmap_shift1, bitmap_shift2, salt_pos, loop_pos, loop_cnt, il_cnt, digests_cnt, digests_offset, combs_mode, gid_max); } -__kernel void m01420_s08 (KERN_ATTR_BASIC ()) +KERNEL_FQ void m01420_s08 (KERN_ATTR_BASIC ()) { /** * base @@ -683,7 +683,7 @@ __kernel void m01420_s08 (KERN_ATTR_BASIC ()) m01420s (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_extra0_buf, d_extra1_buf, d_extra2_buf, d_extra3_buf, bitmap_mask, bitmap_shift1, bitmap_shift2, salt_pos, loop_pos, loop_cnt, il_cnt, digests_cnt, digests_offset, combs_mode, gid_max); } -__kernel void m01420_s16 (KERN_ATTR_BASIC ()) +KERNEL_FQ void m01420_s16 (KERN_ATTR_BASIC ()) { /** * base diff --git a/OpenCL/m01420_a3-pure.cl b/OpenCL/m01420_a3-pure.cl index 4915fc961..70463fcc7 100644 --- a/OpenCL/m01420_a3-pure.cl +++ b/OpenCL/m01420_a3-pure.cl @@ -13,7 +13,7 @@ #include "inc_hash_sha256.cl" #endif -__kernel void m01420_mxx (KERN_ATTR_VECTOR ()) +KERNEL_FQ void m01420_mxx (KERN_ATTR_VECTOR ()) { /** * modifier @@ -74,7 +74,7 @@ __kernel void m01420_mxx (KERN_ATTR_VECTOR ()) } } -__kernel void m01420_sxx (KERN_ATTR_VECTOR ()) +KERNEL_FQ void m01420_sxx (KERN_ATTR_VECTOR ()) { /** * modifier diff --git a/OpenCL/m01430_a0-optimized.cl b/OpenCL/m01430_a0-optimized.cl index b5c667ee3..4f76c9b43 100644 --- a/OpenCL/m01430_a0-optimized.cl +++ b/OpenCL/m01430_a0-optimized.cl @@ -29,7 +29,7 @@ h = 0; \ } -__kernel void m01430_m04 (KERN_ATTR_RULES ()) +KERNEL_FQ void m01430_m04 (KERN_ATTR_RULES ()) { /** * modifier @@ -254,15 +254,15 @@ __kernel void m01430_m04 (KERN_ATTR_RULES ()) } } -__kernel void m01430_m08 (KERN_ATTR_RULES ()) +KERNEL_FQ void m01430_m08 (KERN_ATTR_RULES ()) { } -__kernel void m01430_m16 (KERN_ATTR_RULES ()) +KERNEL_FQ void m01430_m16 (KERN_ATTR_RULES ()) { } -__kernel void m01430_s04 (KERN_ATTR_RULES ()) +KERNEL_FQ void m01430_s04 (KERN_ATTR_RULES ()) { /** * modifier @@ -520,10 +520,10 @@ __kernel void m01430_s04 (KERN_ATTR_RULES ()) } } -__kernel void m01430_s08 (KERN_ATTR_RULES ()) +KERNEL_FQ void m01430_s08 (KERN_ATTR_RULES ()) { } -__kernel void m01430_s16 (KERN_ATTR_RULES ()) +KERNEL_FQ void m01430_s16 (KERN_ATTR_RULES ()) { } diff --git a/OpenCL/m01430_a0-pure.cl b/OpenCL/m01430_a0-pure.cl index b96aaa2b9..d799d902e 100644 --- a/OpenCL/m01430_a0-pure.cl +++ b/OpenCL/m01430_a0-pure.cl @@ -15,7 +15,7 @@ #include "inc_hash_sha256.cl" #endif -__kernel void m01430_mxx (KERN_ATTR_RULES ()) +KERNEL_FQ void m01430_mxx (KERN_ATTR_RULES ()) { /** * modifier @@ -70,7 +70,7 @@ __kernel void m01430_mxx (KERN_ATTR_RULES ()) } } -__kernel void m01430_sxx (KERN_ATTR_RULES ()) +KERNEL_FQ void m01430_sxx (KERN_ATTR_RULES ()) { /** * modifier diff --git a/OpenCL/m01430_a1-optimized.cl b/OpenCL/m01430_a1-optimized.cl index 4f9194498..4ad305121 100644 --- a/OpenCL/m01430_a1-optimized.cl +++ b/OpenCL/m01430_a1-optimized.cl @@ -27,7 +27,7 @@ h = 0; \ } -__kernel void m01430_m04 (KERN_ATTR_BASIC ()) +KERNEL_FQ void m01430_m04 (KERN_ATTR_BASIC ()) { /** * modifier @@ -312,15 +312,15 @@ __kernel void m01430_m04 (KERN_ATTR_BASIC ()) } } -__kernel void m01430_m08 (KERN_ATTR_BASIC ()) +KERNEL_FQ void m01430_m08 (KERN_ATTR_BASIC ()) { } -__kernel void m01430_m16 (KERN_ATTR_BASIC ()) +KERNEL_FQ void m01430_m16 (KERN_ATTR_BASIC ()) { } -__kernel void m01430_s04 (KERN_ATTR_BASIC ()) +KERNEL_FQ void m01430_s04 (KERN_ATTR_BASIC ()) { /** * modifier @@ -638,10 +638,10 @@ __kernel void m01430_s04 (KERN_ATTR_BASIC ()) } } -__kernel void m01430_s08 (KERN_ATTR_BASIC ()) +KERNEL_FQ void m01430_s08 (KERN_ATTR_BASIC ()) { } -__kernel void m01430_s16 (KERN_ATTR_BASIC ()) +KERNEL_FQ void m01430_s16 (KERN_ATTR_BASIC ()) { } diff --git a/OpenCL/m01430_a1-pure.cl b/OpenCL/m01430_a1-pure.cl index eb7c5d45f..dfc57d5ff 100644 --- a/OpenCL/m01430_a1-pure.cl +++ b/OpenCL/m01430_a1-pure.cl @@ -13,7 +13,7 @@ #include "inc_hash_sha256.cl" #endif -__kernel void m01430_mxx (KERN_ATTR_BASIC ()) +KERNEL_FQ void m01430_mxx (KERN_ATTR_BASIC ()) { /** * modifier @@ -66,7 +66,7 @@ __kernel void m01430_mxx (KERN_ATTR_BASIC ()) } } -__kernel void m01430_sxx (KERN_ATTR_BASIC ()) +KERNEL_FQ void m01430_sxx (KERN_ATTR_BASIC ()) { /** * modifier diff --git a/OpenCL/m01430_a3-optimized.cl b/OpenCL/m01430_a3-optimized.cl index 674079e24..4bc78cee8 100644 --- a/OpenCL/m01430_a3-optimized.cl +++ b/OpenCL/m01430_a3-optimized.cl @@ -349,7 +349,7 @@ DECLSPEC void m01430s (u32 *w, const u32 pw_len, KERN_ATTR_VECTOR ()) } } -__kernel void m01430_m04 (KERN_ATTR_VECTOR ()) +KERNEL_FQ void m01430_m04 (KERN_ATTR_VECTOR ()) { /** * base @@ -387,7 +387,7 @@ __kernel void m01430_m04 (KERN_ATTR_VECTOR ()) m01430m (w, pw_len, pws, rules_buf, combs_buf, words_buf_r, 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_extra0_buf, d_extra1_buf, d_extra2_buf, d_extra3_buf, bitmap_mask, bitmap_shift1, bitmap_shift2, salt_pos, loop_pos, loop_cnt, il_cnt, digests_cnt, digests_offset, combs_mode, gid_max); } -__kernel void m01430_m08 (KERN_ATTR_VECTOR ()) +KERNEL_FQ void m01430_m08 (KERN_ATTR_VECTOR ()) { /** * base @@ -425,7 +425,7 @@ __kernel void m01430_m08 (KERN_ATTR_VECTOR ()) m01430m (w, pw_len, pws, rules_buf, combs_buf, words_buf_r, 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_extra0_buf, d_extra1_buf, d_extra2_buf, d_extra3_buf, bitmap_mask, bitmap_shift1, bitmap_shift2, salt_pos, loop_pos, loop_cnt, il_cnt, digests_cnt, digests_offset, combs_mode, gid_max); } -__kernel void m01430_m16 (KERN_ATTR_VECTOR ()) +KERNEL_FQ void m01430_m16 (KERN_ATTR_VECTOR ()) { /** * base @@ -463,7 +463,7 @@ __kernel void m01430_m16 (KERN_ATTR_VECTOR ()) m01430m (w, pw_len, pws, rules_buf, combs_buf, words_buf_r, 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_extra0_buf, d_extra1_buf, d_extra2_buf, d_extra3_buf, bitmap_mask, bitmap_shift1, bitmap_shift2, salt_pos, loop_pos, loop_cnt, il_cnt, digests_cnt, digests_offset, combs_mode, gid_max); } -__kernel void m01430_s04 (KERN_ATTR_VECTOR ()) +KERNEL_FQ void m01430_s04 (KERN_ATTR_VECTOR ()) { /** * base @@ -501,7 +501,7 @@ __kernel void m01430_s04 (KERN_ATTR_VECTOR ()) m01430s (w, pw_len, pws, rules_buf, combs_buf, words_buf_r, 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_extra0_buf, d_extra1_buf, d_extra2_buf, d_extra3_buf, bitmap_mask, bitmap_shift1, bitmap_shift2, salt_pos, loop_pos, loop_cnt, il_cnt, digests_cnt, digests_offset, combs_mode, gid_max); } -__kernel void m01430_s08 (KERN_ATTR_VECTOR ()) +KERNEL_FQ void m01430_s08 (KERN_ATTR_VECTOR ()) { /** * base @@ -539,7 +539,7 @@ __kernel void m01430_s08 (KERN_ATTR_VECTOR ()) m01430s (w, pw_len, pws, rules_buf, combs_buf, words_buf_r, 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_extra0_buf, d_extra1_buf, d_extra2_buf, d_extra3_buf, bitmap_mask, bitmap_shift1, bitmap_shift2, salt_pos, loop_pos, loop_cnt, il_cnt, digests_cnt, digests_offset, combs_mode, gid_max); } -__kernel void m01430_s16 (KERN_ATTR_VECTOR ()) +KERNEL_FQ void m01430_s16 (KERN_ATTR_VECTOR ()) { /** * base diff --git a/OpenCL/m01430_a3-pure.cl b/OpenCL/m01430_a3-pure.cl index 8cdf7ed18..066be48ac 100644 --- a/OpenCL/m01430_a3-pure.cl +++ b/OpenCL/m01430_a3-pure.cl @@ -13,7 +13,7 @@ #include "inc_hash_sha256.cl" #endif -__kernel void m01430_mxx (KERN_ATTR_VECTOR ()) +KERNEL_FQ void m01430_mxx (KERN_ATTR_VECTOR ()) { /** * modifier @@ -79,7 +79,7 @@ __kernel void m01430_mxx (KERN_ATTR_VECTOR ()) } } -__kernel void m01430_sxx (KERN_ATTR_VECTOR ()) +KERNEL_FQ void m01430_sxx (KERN_ATTR_VECTOR ()) { /** * modifier diff --git a/OpenCL/m01440_a0-optimized.cl b/OpenCL/m01440_a0-optimized.cl index 487fd731a..5ecee71a7 100644 --- a/OpenCL/m01440_a0-optimized.cl +++ b/OpenCL/m01440_a0-optimized.cl @@ -29,7 +29,7 @@ h = 0; \ } -__kernel void m01440_m04 (KERN_ATTR_RULES ()) +KERNEL_FQ void m01440_m04 (KERN_ATTR_RULES ()) { /** * modifier @@ -234,15 +234,15 @@ __kernel void m01440_m04 (KERN_ATTR_RULES ()) } } -__kernel void m01440_m08 (KERN_ATTR_RULES ()) +KERNEL_FQ void m01440_m08 (KERN_ATTR_RULES ()) { } -__kernel void m01440_m16 (KERN_ATTR_RULES ()) +KERNEL_FQ void m01440_m16 (KERN_ATTR_RULES ()) { } -__kernel void m01440_s04 (KERN_ATTR_RULES ()) +KERNEL_FQ void m01440_s04 (KERN_ATTR_RULES ()) { /** * modifier @@ -480,10 +480,10 @@ __kernel void m01440_s04 (KERN_ATTR_RULES ()) } } -__kernel void m01440_s08 (KERN_ATTR_RULES ()) +KERNEL_FQ void m01440_s08 (KERN_ATTR_RULES ()) { } -__kernel void m01440_s16 (KERN_ATTR_RULES ()) +KERNEL_FQ void m01440_s16 (KERN_ATTR_RULES ()) { } diff --git a/OpenCL/m01440_a0-pure.cl b/OpenCL/m01440_a0-pure.cl index 68de284cc..1140dd0b3 100644 --- a/OpenCL/m01440_a0-pure.cl +++ b/OpenCL/m01440_a0-pure.cl @@ -15,7 +15,7 @@ #include "inc_hash_sha256.cl" #endif -__kernel void m01440_mxx (KERN_ATTR_RULES ()) +KERNEL_FQ void m01440_mxx (KERN_ATTR_RULES ()) { /** * modifier @@ -63,7 +63,7 @@ __kernel void m01440_mxx (KERN_ATTR_RULES ()) } } -__kernel void m01440_sxx (KERN_ATTR_RULES ()) +KERNEL_FQ void m01440_sxx (KERN_ATTR_RULES ()) { /** * modifier diff --git a/OpenCL/m01440_a1-optimized.cl b/OpenCL/m01440_a1-optimized.cl index a6a16fc98..55322c7ee 100644 --- a/OpenCL/m01440_a1-optimized.cl +++ b/OpenCL/m01440_a1-optimized.cl @@ -27,7 +27,7 @@ h = 0; \ } -__kernel void m01440_m04 (KERN_ATTR_BASIC ()) +KERNEL_FQ void m01440_m04 (KERN_ATTR_BASIC ()) { /** * modifier @@ -290,15 +290,15 @@ __kernel void m01440_m04 (KERN_ATTR_BASIC ()) } } -__kernel void m01440_m08 (KERN_ATTR_BASIC ()) +KERNEL_FQ void m01440_m08 (KERN_ATTR_BASIC ()) { } -__kernel void m01440_m16 (KERN_ATTR_BASIC ()) +KERNEL_FQ void m01440_m16 (KERN_ATTR_BASIC ()) { } -__kernel void m01440_s04 (KERN_ATTR_BASIC ()) +KERNEL_FQ void m01440_s04 (KERN_ATTR_BASIC ()) { /** * modifier @@ -594,10 +594,10 @@ __kernel void m01440_s04 (KERN_ATTR_BASIC ()) } } -__kernel void m01440_s08 (KERN_ATTR_BASIC ()) +KERNEL_FQ void m01440_s08 (KERN_ATTR_BASIC ()) { } -__kernel void m01440_s16 (KERN_ATTR_BASIC ()) +KERNEL_FQ void m01440_s16 (KERN_ATTR_BASIC ()) { } diff --git a/OpenCL/m01440_a1-pure.cl b/OpenCL/m01440_a1-pure.cl index 0874df12a..31b96ac18 100644 --- a/OpenCL/m01440_a1-pure.cl +++ b/OpenCL/m01440_a1-pure.cl @@ -13,7 +13,7 @@ #include "inc_hash_sha256.cl" #endif -__kernel void m01440_mxx (KERN_ATTR_BASIC ()) +KERNEL_FQ void m01440_mxx (KERN_ATTR_BASIC ()) { /** * modifier @@ -57,7 +57,7 @@ __kernel void m01440_mxx (KERN_ATTR_BASIC ()) } } -__kernel void m01440_sxx (KERN_ATTR_BASIC ()) +KERNEL_FQ void m01440_sxx (KERN_ATTR_BASIC ()) { /** * modifier diff --git a/OpenCL/m01440_a3-optimized.cl b/OpenCL/m01440_a3-optimized.cl index 2f62909a9..1274b0b89 100644 --- a/OpenCL/m01440_a3-optimized.cl +++ b/OpenCL/m01440_a3-optimized.cl @@ -448,7 +448,7 @@ DECLSPEC void m01440s (u32 *w0, u32 *w1, u32 *w2, u32 *w3, const u32 pw_len, KER } } -__kernel void m01440_m04 (KERN_ATTR_BASIC ()) +KERNEL_FQ void m01440_m04 (KERN_ATTR_BASIC ()) { /** * base @@ -495,7 +495,7 @@ __kernel void m01440_m04 (KERN_ATTR_BASIC ()) m01440m (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_extra0_buf, d_extra1_buf, d_extra2_buf, d_extra3_buf, bitmap_mask, bitmap_shift1, bitmap_shift2, salt_pos, loop_pos, loop_cnt, il_cnt, digests_cnt, digests_offset, combs_mode, gid_max); } -__kernel void m01440_m08 (KERN_ATTR_BASIC ()) +KERNEL_FQ void m01440_m08 (KERN_ATTR_BASIC ()) { /** * base @@ -542,7 +542,7 @@ __kernel void m01440_m08 (KERN_ATTR_BASIC ()) m01440m (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_extra0_buf, d_extra1_buf, d_extra2_buf, d_extra3_buf, bitmap_mask, bitmap_shift1, bitmap_shift2, salt_pos, loop_pos, loop_cnt, il_cnt, digests_cnt, digests_offset, combs_mode, gid_max); } -__kernel void m01440_m16 (KERN_ATTR_BASIC ()) +KERNEL_FQ void m01440_m16 (KERN_ATTR_BASIC ()) { /** * base @@ -589,7 +589,7 @@ __kernel void m01440_m16 (KERN_ATTR_BASIC ()) m01440m (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_extra0_buf, d_extra1_buf, d_extra2_buf, d_extra3_buf, bitmap_mask, bitmap_shift1, bitmap_shift2, salt_pos, loop_pos, loop_cnt, il_cnt, digests_cnt, digests_offset, combs_mode, gid_max); } -__kernel void m01440_s04 (KERN_ATTR_BASIC ()) +KERNEL_FQ void m01440_s04 (KERN_ATTR_BASIC ()) { /** * base @@ -636,7 +636,7 @@ __kernel void m01440_s04 (KERN_ATTR_BASIC ()) m01440s (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_extra0_buf, d_extra1_buf, d_extra2_buf, d_extra3_buf, bitmap_mask, bitmap_shift1, bitmap_shift2, salt_pos, loop_pos, loop_cnt, il_cnt, digests_cnt, digests_offset, combs_mode, gid_max); } -__kernel void m01440_s08 (KERN_ATTR_BASIC ()) +KERNEL_FQ void m01440_s08 (KERN_ATTR_BASIC ()) { /** * base @@ -683,7 +683,7 @@ __kernel void m01440_s08 (KERN_ATTR_BASIC ()) m01440s (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_extra0_buf, d_extra1_buf, d_extra2_buf, d_extra3_buf, bitmap_mask, bitmap_shift1, bitmap_shift2, salt_pos, loop_pos, loop_cnt, il_cnt, digests_cnt, digests_offset, combs_mode, gid_max); } -__kernel void m01440_s16 (KERN_ATTR_BASIC ()) +KERNEL_FQ void m01440_s16 (KERN_ATTR_BASIC ()) { /** * base diff --git a/OpenCL/m01440_a3-pure.cl b/OpenCL/m01440_a3-pure.cl index 90d2f44e4..874f31160 100644 --- a/OpenCL/m01440_a3-pure.cl +++ b/OpenCL/m01440_a3-pure.cl @@ -13,7 +13,7 @@ #include "inc_hash_sha256.cl" #endif -__kernel void m01440_mxx (KERN_ATTR_VECTOR ()) +KERNEL_FQ void m01440_mxx (KERN_ATTR_VECTOR ()) { /** * modifier @@ -74,7 +74,7 @@ __kernel void m01440_mxx (KERN_ATTR_VECTOR ()) } } -__kernel void m01440_sxx (KERN_ATTR_VECTOR ()) +KERNEL_FQ void m01440_sxx (KERN_ATTR_VECTOR ()) { /** * modifier diff --git a/OpenCL/m01450_a0-optimized.cl b/OpenCL/m01450_a0-optimized.cl index 2d451f5f8..15b746b1b 100644 --- a/OpenCL/m01450_a0-optimized.cl +++ b/OpenCL/m01450_a0-optimized.cl @@ -116,7 +116,7 @@ DECLSPEC void hmac_sha256_run (u32x *w0, u32x *w1, u32x *w2, u32x *w3, u32x *ipa sha256_transform_vector (w0, w1, w2, w3, digest); } -__kernel void m01450_m04 (KERN_ATTR_RULES ()) +KERNEL_FQ void m01450_m04 (KERN_ATTR_RULES ()) { /** * modifier @@ -230,15 +230,15 @@ __kernel void m01450_m04 (KERN_ATTR_RULES ()) } } -__kernel void m01450_m08 (KERN_ATTR_RULES ()) +KERNEL_FQ void m01450_m08 (KERN_ATTR_RULES ()) { } -__kernel void m01450_m16 (KERN_ATTR_RULES ()) +KERNEL_FQ void m01450_m16 (KERN_ATTR_RULES ()) { } -__kernel void m01450_s04 (KERN_ATTR_RULES ()) +KERNEL_FQ void m01450_s04 (KERN_ATTR_RULES ()) { /** * modifier @@ -364,10 +364,10 @@ __kernel void m01450_s04 (KERN_ATTR_RULES ()) } } -__kernel void m01450_s08 (KERN_ATTR_RULES ()) +KERNEL_FQ void m01450_s08 (KERN_ATTR_RULES ()) { } -__kernel void m01450_s16 (KERN_ATTR_RULES ()) +KERNEL_FQ void m01450_s16 (KERN_ATTR_RULES ()) { } diff --git a/OpenCL/m01450_a0-pure.cl b/OpenCL/m01450_a0-pure.cl index 44d3c97cf..c6f93a1a0 100644 --- a/OpenCL/m01450_a0-pure.cl +++ b/OpenCL/m01450_a0-pure.cl @@ -15,7 +15,7 @@ #include "inc_hash_sha256.cl" #endif -__kernel void m01450_mxx (KERN_ATTR_RULES ()) +KERNEL_FQ void m01450_mxx (KERN_ATTR_RULES ()) { /** * modifier @@ -68,7 +68,7 @@ __kernel void m01450_mxx (KERN_ATTR_RULES ()) } } -__kernel void m01450_sxx (KERN_ATTR_RULES ()) +KERNEL_FQ void m01450_sxx (KERN_ATTR_RULES ()) { /** * modifier diff --git a/OpenCL/m01450_a1-optimized.cl b/OpenCL/m01450_a1-optimized.cl index 46f04f0cb..2237c343a 100644 --- a/OpenCL/m01450_a1-optimized.cl +++ b/OpenCL/m01450_a1-optimized.cl @@ -114,7 +114,7 @@ DECLSPEC void hmac_sha256_run (u32x *w0, u32x *w1, u32x *w2, u32x *w3, u32x *ipa sha256_transform_vector (w0, w1, w2, w3, digest); } -__kernel void m01450_m04 (KERN_ATTR_BASIC ()) +KERNEL_FQ void m01450_m04 (KERN_ATTR_BASIC ()) { /** * modifier @@ -296,15 +296,15 @@ __kernel void m01450_m04 (KERN_ATTR_BASIC ()) } } -__kernel void m01450_m08 (KERN_ATTR_BASIC ()) +KERNEL_FQ void m01450_m08 (KERN_ATTR_BASIC ()) { } -__kernel void m01450_m16 (KERN_ATTR_BASIC ()) +KERNEL_FQ void m01450_m16 (KERN_ATTR_BASIC ()) { } -__kernel void m01450_s04 (KERN_ATTR_BASIC ()) +KERNEL_FQ void m01450_s04 (KERN_ATTR_BASIC ()) { /** * modifier @@ -498,10 +498,10 @@ __kernel void m01450_s04 (KERN_ATTR_BASIC ()) } } -__kernel void m01450_s08 (KERN_ATTR_BASIC ()) +KERNEL_FQ void m01450_s08 (KERN_ATTR_BASIC ()) { } -__kernel void m01450_s16 (KERN_ATTR_BASIC ()) +KERNEL_FQ void m01450_s16 (KERN_ATTR_BASIC ()) { } diff --git a/OpenCL/m01450_a1-pure.cl b/OpenCL/m01450_a1-pure.cl index ffd4ccee2..d667dd460 100644 --- a/OpenCL/m01450_a1-pure.cl +++ b/OpenCL/m01450_a1-pure.cl @@ -13,7 +13,7 @@ #include "inc_hash_sha256.cl" #endif -__kernel void m01450_mxx (KERN_ATTR_BASIC ()) +KERNEL_FQ void m01450_mxx (KERN_ATTR_BASIC ()) { /** * modifier @@ -91,7 +91,7 @@ __kernel void m01450_mxx (KERN_ATTR_BASIC ()) } } -__kernel void m01450_sxx (KERN_ATTR_BASIC ()) +KERNEL_FQ void m01450_sxx (KERN_ATTR_BASIC ()) { /** * modifier diff --git a/OpenCL/m01450_a3-optimized.cl b/OpenCL/m01450_a3-optimized.cl index a9f342e21..5ec476308 100644 --- a/OpenCL/m01450_a3-optimized.cl +++ b/OpenCL/m01450_a3-optimized.cl @@ -336,7 +336,7 @@ DECLSPEC void m01450s (u32 *w0, u32 *w1, u32 *w2, u32 *w3, const u32 pw_len, KER } } -__kernel void m01450_m04 (KERN_ATTR_BASIC ()) +KERNEL_FQ void m01450_m04 (KERN_ATTR_BASIC ()) { /** * base @@ -383,7 +383,7 @@ __kernel void m01450_m04 (KERN_ATTR_BASIC ()) m01450m (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_extra0_buf, d_extra1_buf, d_extra2_buf, d_extra3_buf, bitmap_mask, bitmap_shift1, bitmap_shift2, salt_pos, loop_pos, loop_cnt, il_cnt, digests_cnt, digests_offset, combs_mode, gid_max); } -__kernel void m01450_m08 (KERN_ATTR_BASIC ()) +KERNEL_FQ void m01450_m08 (KERN_ATTR_BASIC ()) { /** * base @@ -430,7 +430,7 @@ __kernel void m01450_m08 (KERN_ATTR_BASIC ()) m01450m (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_extra0_buf, d_extra1_buf, d_extra2_buf, d_extra3_buf, bitmap_mask, bitmap_shift1, bitmap_shift2, salt_pos, loop_pos, loop_cnt, il_cnt, digests_cnt, digests_offset, combs_mode, gid_max); } -__kernel void m01450_m16 (KERN_ATTR_BASIC ()) +KERNEL_FQ void m01450_m16 (KERN_ATTR_BASIC ()) { /** * base @@ -477,7 +477,7 @@ __kernel void m01450_m16 (KERN_ATTR_BASIC ()) m01450m (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_extra0_buf, d_extra1_buf, d_extra2_buf, d_extra3_buf, bitmap_mask, bitmap_shift1, bitmap_shift2, salt_pos, loop_pos, loop_cnt, il_cnt, digests_cnt, digests_offset, combs_mode, gid_max); } -__kernel void m01450_s04 (KERN_ATTR_BASIC ()) +KERNEL_FQ void m01450_s04 (KERN_ATTR_BASIC ()) { /** * base @@ -524,7 +524,7 @@ __kernel void m01450_s04 (KERN_ATTR_BASIC ()) m01450s (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_extra0_buf, d_extra1_buf, d_extra2_buf, d_extra3_buf, bitmap_mask, bitmap_shift1, bitmap_shift2, salt_pos, loop_pos, loop_cnt, il_cnt, digests_cnt, digests_offset, combs_mode, gid_max); } -__kernel void m01450_s08 (KERN_ATTR_BASIC ()) +KERNEL_FQ void m01450_s08 (KERN_ATTR_BASIC ()) { /** * base @@ -571,7 +571,7 @@ __kernel void m01450_s08 (KERN_ATTR_BASIC ()) m01450s (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_extra0_buf, d_extra1_buf, d_extra2_buf, d_extra3_buf, bitmap_mask, bitmap_shift1, bitmap_shift2, salt_pos, loop_pos, loop_cnt, il_cnt, digests_cnt, digests_offset, combs_mode, gid_max); } -__kernel void m01450_s16 (KERN_ATTR_BASIC ()) +KERNEL_FQ void m01450_s16 (KERN_ATTR_BASIC ()) { /** * base diff --git a/OpenCL/m01450_a3-pure.cl b/OpenCL/m01450_a3-pure.cl index f690c82c2..35f05ac94 100644 --- a/OpenCL/m01450_a3-pure.cl +++ b/OpenCL/m01450_a3-pure.cl @@ -13,7 +13,7 @@ #include "inc_hash_sha256.cl" #endif -__kernel void m01450_mxx (KERN_ATTR_VECTOR ()) +KERNEL_FQ void m01450_mxx (KERN_ATTR_VECTOR ()) { /** * modifier @@ -77,7 +77,7 @@ __kernel void m01450_mxx (KERN_ATTR_VECTOR ()) } } -__kernel void m01450_sxx (KERN_ATTR_VECTOR ()) +KERNEL_FQ void m01450_sxx (KERN_ATTR_VECTOR ()) { /** * modifier diff --git a/OpenCL/m01460_a0-optimized.cl b/OpenCL/m01460_a0-optimized.cl index a08cdb322..e053b4652 100644 --- a/OpenCL/m01460_a0-optimized.cl +++ b/OpenCL/m01460_a0-optimized.cl @@ -116,7 +116,7 @@ DECLSPEC void hmac_sha256_run (u32x *w0, u32x *w1, u32x *w2, u32x *w3, u32x *ipa sha256_transform_vector (w0, w1, w2, w3, digest); } -__kernel void m01460_m04 (KERN_ATTR_RULES ()) +KERNEL_FQ void m01460_m04 (KERN_ATTR_RULES ()) { /** * modifier @@ -245,15 +245,15 @@ __kernel void m01460_m04 (KERN_ATTR_RULES ()) } } -__kernel void m01460_m08 (KERN_ATTR_RULES ()) +KERNEL_FQ void m01460_m08 (KERN_ATTR_RULES ()) { } -__kernel void m01460_m16 (KERN_ATTR_RULES ()) +KERNEL_FQ void m01460_m16 (KERN_ATTR_RULES ()) { } -__kernel void m01460_s04 (KERN_ATTR_RULES ()) +KERNEL_FQ void m01460_s04 (KERN_ATTR_RULES ()) { /** * modifier @@ -394,10 +394,10 @@ __kernel void m01460_s04 (KERN_ATTR_RULES ()) } } -__kernel void m01460_s08 (KERN_ATTR_RULES ()) +KERNEL_FQ void m01460_s08 (KERN_ATTR_RULES ()) { } -__kernel void m01460_s16 (KERN_ATTR_RULES ()) +KERNEL_FQ void m01460_s16 (KERN_ATTR_RULES ()) { } diff --git a/OpenCL/m01460_a0-pure.cl b/OpenCL/m01460_a0-pure.cl index ba505ad52..f80a8d9c9 100644 --- a/OpenCL/m01460_a0-pure.cl +++ b/OpenCL/m01460_a0-pure.cl @@ -15,7 +15,7 @@ #include "inc_hash_sha256.cl" #endif -__kernel void m01460_mxx (KERN_ATTR_RULES ()) +KERNEL_FQ void m01460_mxx (KERN_ATTR_RULES ()) { /** * modifier @@ -70,7 +70,7 @@ __kernel void m01460_mxx (KERN_ATTR_RULES ()) } } -__kernel void m01460_sxx (KERN_ATTR_RULES ()) +KERNEL_FQ void m01460_sxx (KERN_ATTR_RULES ()) { /** * modifier diff --git a/OpenCL/m01460_a1-optimized.cl b/OpenCL/m01460_a1-optimized.cl index 264b2f861..72e64ddb7 100644 --- a/OpenCL/m01460_a1-optimized.cl +++ b/OpenCL/m01460_a1-optimized.cl @@ -114,7 +114,7 @@ DECLSPEC void hmac_sha256_run (u32x *w0, u32x *w1, u32x *w2, u32x *w3, u32x *ipa sha256_transform_vector (w0, w1, w2, w3, digest); } -__kernel void m01460_m04 (KERN_ATTR_BASIC ()) +KERNEL_FQ void m01460_m04 (KERN_ATTR_BASIC ()) { /** * modifier @@ -303,15 +303,15 @@ __kernel void m01460_m04 (KERN_ATTR_BASIC ()) } } -__kernel void m01460_m08 (KERN_ATTR_BASIC ()) +KERNEL_FQ void m01460_m08 (KERN_ATTR_BASIC ()) { } -__kernel void m01460_m16 (KERN_ATTR_BASIC ()) +KERNEL_FQ void m01460_m16 (KERN_ATTR_BASIC ()) { } -__kernel void m01460_s04 (KERN_ATTR_BASIC ()) +KERNEL_FQ void m01460_s04 (KERN_ATTR_BASIC ()) { /** * modifier @@ -512,10 +512,10 @@ __kernel void m01460_s04 (KERN_ATTR_BASIC ()) } } -__kernel void m01460_s08 (KERN_ATTR_BASIC ()) +KERNEL_FQ void m01460_s08 (KERN_ATTR_BASIC ()) { } -__kernel void m01460_s16 (KERN_ATTR_BASIC ()) +KERNEL_FQ void m01460_s16 (KERN_ATTR_BASIC ()) { } diff --git a/OpenCL/m01460_a1-pure.cl b/OpenCL/m01460_a1-pure.cl index 24b3ba1ca..3054e9c61 100644 --- a/OpenCL/m01460_a1-pure.cl +++ b/OpenCL/m01460_a1-pure.cl @@ -13,7 +13,7 @@ #include "inc_hash_sha256.cl" #endif -__kernel void m01460_mxx (KERN_ATTR_BASIC ()) +KERNEL_FQ void m01460_mxx (KERN_ATTR_BASIC ()) { /** * modifier @@ -93,7 +93,7 @@ __kernel void m01460_mxx (KERN_ATTR_BASIC ()) } } -__kernel void m01460_sxx (KERN_ATTR_BASIC ()) +KERNEL_FQ void m01460_sxx (KERN_ATTR_BASIC ()) { /** * modifier diff --git a/OpenCL/m01460_a3-optimized.cl b/OpenCL/m01460_a3-optimized.cl index 2efd78f96..7f36e515a 100644 --- a/OpenCL/m01460_a3-optimized.cl +++ b/OpenCL/m01460_a3-optimized.cl @@ -336,7 +336,7 @@ DECLSPEC void m01460s (u32 *w0, u32 *w1, u32 *w2, u32 *w3, const u32 pw_len, KER } } -__kernel void m01460_m04 (KERN_ATTR_BASIC ()) +KERNEL_FQ void m01460_m04 (KERN_ATTR_BASIC ()) { /** * base @@ -383,7 +383,7 @@ __kernel void m01460_m04 (KERN_ATTR_BASIC ()) m01460m (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_extra0_buf, d_extra1_buf, d_extra2_buf, d_extra3_buf, bitmap_mask, bitmap_shift1, bitmap_shift2, salt_pos, loop_pos, loop_cnt, il_cnt, digests_cnt, digests_offset, combs_mode, gid_max); } -__kernel void m01460_m08 (KERN_ATTR_BASIC ()) +KERNEL_FQ void m01460_m08 (KERN_ATTR_BASIC ()) { /** * base @@ -430,7 +430,7 @@ __kernel void m01460_m08 (KERN_ATTR_BASIC ()) m01460m (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_extra0_buf, d_extra1_buf, d_extra2_buf, d_extra3_buf, bitmap_mask, bitmap_shift1, bitmap_shift2, salt_pos, loop_pos, loop_cnt, il_cnt, digests_cnt, digests_offset, combs_mode, gid_max); } -__kernel void m01460_m16 (KERN_ATTR_BASIC ()) +KERNEL_FQ void m01460_m16 (KERN_ATTR_BASIC ()) { /** * base @@ -477,7 +477,7 @@ __kernel void m01460_m16 (KERN_ATTR_BASIC ()) m01460m (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_extra0_buf, d_extra1_buf, d_extra2_buf, d_extra3_buf, bitmap_mask, bitmap_shift1, bitmap_shift2, salt_pos, loop_pos, loop_cnt, il_cnt, digests_cnt, digests_offset, combs_mode, gid_max); } -__kernel void m01460_s04 (KERN_ATTR_BASIC ()) +KERNEL_FQ void m01460_s04 (KERN_ATTR_BASIC ()) { /** * base @@ -524,7 +524,7 @@ __kernel void m01460_s04 (KERN_ATTR_BASIC ()) m01460s (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_extra0_buf, d_extra1_buf, d_extra2_buf, d_extra3_buf, bitmap_mask, bitmap_shift1, bitmap_shift2, salt_pos, loop_pos, loop_cnt, il_cnt, digests_cnt, digests_offset, combs_mode, gid_max); } -__kernel void m01460_s08 (KERN_ATTR_BASIC ()) +KERNEL_FQ void m01460_s08 (KERN_ATTR_BASIC ()) { /** * base @@ -571,7 +571,7 @@ __kernel void m01460_s08 (KERN_ATTR_BASIC ()) m01460s (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_extra0_buf, d_extra1_buf, d_extra2_buf, d_extra3_buf, bitmap_mask, bitmap_shift1, bitmap_shift2, salt_pos, loop_pos, loop_cnt, il_cnt, digests_cnt, digests_offset, combs_mode, gid_max); } -__kernel void m01460_s16 (KERN_ATTR_BASIC ()) +KERNEL_FQ void m01460_s16 (KERN_ATTR_BASIC ()) { /** * base diff --git a/OpenCL/m01460_a3-pure.cl b/OpenCL/m01460_a3-pure.cl index dd1ccd36e..f2eb90be3 100644 --- a/OpenCL/m01460_a3-pure.cl +++ b/OpenCL/m01460_a3-pure.cl @@ -13,7 +13,7 @@ #include "inc_hash_sha256.cl" #endif -__kernel void m01460_mxx (KERN_ATTR_VECTOR ()) +KERNEL_FQ void m01460_mxx (KERN_ATTR_VECTOR ()) { /** * modifier @@ -79,7 +79,7 @@ __kernel void m01460_mxx (KERN_ATTR_VECTOR ()) } } -__kernel void m01460_sxx (KERN_ATTR_VECTOR ()) +KERNEL_FQ void m01460_sxx (KERN_ATTR_VECTOR ()) { /** * modifier diff --git a/OpenCL/m01500_a0-pure.cl b/OpenCL/m01500_a0-pure.cl index 59a4742c1..a053211ee 100644 --- a/OpenCL/m01500_a0-pure.cl +++ b/OpenCL/m01500_a0-pure.cl @@ -34,7 +34,7 @@ a = a ^ tt; \ } -__constant u32a c_SPtrans[8][64] = +CONSTANT_AS u32a c_SPtrans[8][64] = { { 0x00820200, 0x00020000, 0x80800000, 0x80820200, @@ -182,7 +182,7 @@ __constant u32a c_SPtrans[8][64] = }, }; -__constant u32a c_skb[8][64] = +CONSTANT_AS u32a c_skb[8][64] = { { 0x00000000, 0x00000010, 0x20000000, 0x20000010, @@ -342,7 +342,7 @@ __constant u32a c_skb[8][64] = #define BOX(i,n,S) (u32x) ((S)[(n)][(i).s0], (S)[(n)][(i).s1], (S)[(n)][(i).s2], (S)[(n)][(i).s3], (S)[(n)][(i).s4], (S)[(n)][(i).s5], (S)[(n)][(i).s6], (S)[(n)][(i).s7], (S)[(n)][(i).s8], (S)[(n)][(i).s9], (S)[(n)][(i).sa], (S)[(n)][(i).sb], (S)[(n)][(i).sc], (S)[(n)][(i).sd], (S)[(n)][(i).se], (S)[(n)][(i).sf]) #endif -DECLSPEC void _des_crypt_keysetup (u32 c, u32x d, u32x *Kc, u32x *Kd, __local u32 (*s_skb)[64]) +DECLSPEC void _des_crypt_keysetup (u32 c, u32x d, u32x *Kc, u32x *Kd, LOCAL_AS u32 (*s_skb)[64]) { u32 tt; @@ -411,7 +411,7 @@ DECLSPEC void _des_crypt_keysetup (u32 c, u32x d, u32x *Kc, u32x *Kd, __local u3 } } -DECLSPEC void _des_crypt_encrypt (u32 *iv, u32 mask, u32x *Kc, u32x *Kd, __local u32 (*s_SPtrans)[64]) +DECLSPEC void _des_crypt_encrypt (u32 *iv, u32 mask, u32x *Kc, u32x *Kd, LOCAL_AS u32 (*s_SPtrans)[64]) { const u32 E1 = (mask >> 2) & 0x3f0; const u32 E0 = mask & 0x3f; @@ -481,7 +481,7 @@ DECLSPEC void _des_crypt_encrypt (u32 *iv, u32 mask, u32x *Kc, u32x *Kd, __local iv[1] = rotl32 (l, 31); } -__kernel void m01500_mxx (KERN_ATTR_RULES ()) +KERNEL_FQ void m01500_mxx (KERN_ATTR_RULES ()) { /** * modifier @@ -495,8 +495,8 @@ __kernel void m01500_mxx (KERN_ATTR_RULES ()) * sbox, kbox */ - __local u32 s_SPtrans[8][64]; - __local u32 s_skb[8][64]; + LOCAL_AS u32 s_SPtrans[8][64]; + LOCAL_AS u32 s_skb[8][64]; for (u32 i = lid; i < 64; i += lsz) { @@ -565,7 +565,7 @@ __kernel void m01500_mxx (KERN_ATTR_RULES ()) } } -__kernel void m01500_sxx (KERN_ATTR_RULES ()) +KERNEL_FQ void m01500_sxx (KERN_ATTR_RULES ()) { /** * modifier @@ -579,8 +579,8 @@ __kernel void m01500_sxx (KERN_ATTR_RULES ()) * sbox, kbox */ - __local u32 s_SPtrans[8][64]; - __local u32 s_skb[8][64]; + LOCAL_AS u32 s_SPtrans[8][64]; + LOCAL_AS u32 s_skb[8][64]; for (u32 i = lid; i < 64; i += lsz) { diff --git a/OpenCL/m01500_a1-pure.cl b/OpenCL/m01500_a1-pure.cl index 14ae2224c..213392499 100644 --- a/OpenCL/m01500_a1-pure.cl +++ b/OpenCL/m01500_a1-pure.cl @@ -32,7 +32,7 @@ a = a ^ tt; \ } -__constant u32a c_SPtrans[8][64] = +CONSTANT_AS u32a c_SPtrans[8][64] = { { 0x00820200, 0x00020000, 0x80800000, 0x80820200, @@ -180,7 +180,7 @@ __constant u32a c_SPtrans[8][64] = }, }; -__constant u32a c_skb[8][64] = +CONSTANT_AS u32a c_skb[8][64] = { { 0x00000000, 0x00000010, 0x20000000, 0x20000010, @@ -340,7 +340,7 @@ __constant u32a c_skb[8][64] = #define BOX(i,n,S) (u32x) ((S)[(n)][(i).s0], (S)[(n)][(i).s1], (S)[(n)][(i).s2], (S)[(n)][(i).s3], (S)[(n)][(i).s4], (S)[(n)][(i).s5], (S)[(n)][(i).s6], (S)[(n)][(i).s7], (S)[(n)][(i).s8], (S)[(n)][(i).s9], (S)[(n)][(i).sa], (S)[(n)][(i).sb], (S)[(n)][(i).sc], (S)[(n)][(i).sd], (S)[(n)][(i).se], (S)[(n)][(i).sf]) #endif -DECLSPEC void _des_crypt_keysetup (u32 c, u32x d, u32x *Kc, u32x *Kd, __local u32 (*s_skb)[64]) +DECLSPEC void _des_crypt_keysetup (u32 c, u32x d, u32x *Kc, u32x *Kd, LOCAL_AS u32 (*s_skb)[64]) { u32 tt; @@ -409,7 +409,7 @@ DECLSPEC void _des_crypt_keysetup (u32 c, u32x d, u32x *Kc, u32x *Kd, __local u3 } } -DECLSPEC void _des_crypt_encrypt (u32 *iv, u32 mask, u32x *Kc, u32x *Kd, __local u32 (*s_SPtrans)[64]) +DECLSPEC void _des_crypt_encrypt (u32 *iv, u32 mask, u32x *Kc, u32x *Kd, LOCAL_AS u32 (*s_SPtrans)[64]) { const u32 E1 = (mask >> 2) & 0x3f0; const u32 E0 = mask & 0x3f; @@ -479,7 +479,7 @@ DECLSPEC void _des_crypt_encrypt (u32 *iv, u32 mask, u32x *Kc, u32x *Kd, __local iv[1] = rotl32 (l, 31); } -__kernel void m01500_mxx (KERN_ATTR_BASIC ()) +KERNEL_FQ void m01500_mxx (KERN_ATTR_BASIC ()) { /** * modifier @@ -493,8 +493,8 @@ __kernel void m01500_mxx (KERN_ATTR_BASIC ()) * sbox, kbox */ - __local u32 s_SPtrans[8][64]; - __local u32 s_skb[8][64]; + LOCAL_AS u32 s_SPtrans[8][64]; + LOCAL_AS u32 s_skb[8][64]; for (u32 i = lid; i < 64; i += lsz) { @@ -642,7 +642,7 @@ __kernel void m01500_mxx (KERN_ATTR_BASIC ()) } } -__kernel void m01500_sxx (KERN_ATTR_BASIC ()) +KERNEL_FQ void m01500_sxx (KERN_ATTR_BASIC ()) { /** * modifier @@ -656,8 +656,8 @@ __kernel void m01500_sxx (KERN_ATTR_BASIC ()) * sbox, kbox */ - __local u32 s_SPtrans[8][64]; - __local u32 s_skb[8][64]; + LOCAL_AS u32 s_SPtrans[8][64]; + LOCAL_AS u32 s_skb[8][64]; for (u32 i = lid; i < 64; i += lsz) { diff --git a/OpenCL/m01500_a3-pure.cl b/OpenCL/m01500_a3-pure.cl index 8cd39ded7..9d5de4622 100644 --- a/OpenCL/m01500_a3-pure.cl +++ b/OpenCL/m01500_a3-pure.cl @@ -1885,7 +1885,7 @@ DECLSPEC void transpose32c (u32 *data) // transpose bitslice mod : attention race conditions, need different buffers for *in and *out // -__kernel void m01500_tm (__global u32 * restrict mod, __global bs_word_t * restrict words_buf_r) +KERNEL_FQ void m01500_tm (GLOBAL_AS u32 * restrict mod, GLOBAL_AS bs_word_t * restrict words_buf_r) { const u64 gid = get_global_id (0); @@ -1911,7 +1911,7 @@ __kernel void m01500_tm (__global u32 * restrict mod, __global bs_word_t * restr } } -__kernel void m01500_mxx (KERN_ATTR_BITSLICE ()) +KERNEL_FQ void m01500_mxx (KERN_ATTR_BITSLICE ()) { /** * base @@ -2287,7 +2287,7 @@ __kernel void m01500_mxx (KERN_ATTR_BITSLICE ()) } } -__kernel void m01500_sxx (KERN_ATTR_BITSLICE ()) +KERNEL_FQ void m01500_sxx (KERN_ATTR_BITSLICE ()) { /** * base diff --git a/OpenCL/m01600-optimized.cl b/OpenCL/m01600-optimized.cl index a15c290ec..d272e8cf7 100644 --- a/OpenCL/m01600-optimized.cl +++ b/OpenCL/m01600-optimized.cl @@ -655,7 +655,7 @@ DECLSPEC void append_1st (u32 *block0, u32 *block1, u32 *block2, u32 *block3, co } } -__kernel void m01600_init (KERN_ATTR_TMPS (md5crypt_tmp_t)) +KERNEL_FQ void m01600_init (KERN_ATTR_TMPS (md5crypt_tmp_t)) { /** * base @@ -818,7 +818,7 @@ __kernel void m01600_init (KERN_ATTR_TMPS (md5crypt_tmp_t)) tmps[gid].digest_buf[3] = digest[3]; } -__kernel void m01600_loop (KERN_ATTR_TMPS (md5crypt_tmp_t)) +KERNEL_FQ void m01600_loop (KERN_ATTR_TMPS (md5crypt_tmp_t)) { /** * base @@ -1006,7 +1006,7 @@ __kernel void m01600_loop (KERN_ATTR_TMPS (md5crypt_tmp_t)) tmps[gid].digest_buf[3] = digest[3]; } -__kernel void m01600_comp (KERN_ATTR_TMPS (md5crypt_tmp_t)) +KERNEL_FQ void m01600_comp (KERN_ATTR_TMPS (md5crypt_tmp_t)) { /** * modifier diff --git a/OpenCL/m01600-pure.cl b/OpenCL/m01600-pure.cl index 3e209a049..ed29631e5 100644 --- a/OpenCL/m01600-pure.cl +++ b/OpenCL/m01600-pure.cl @@ -27,7 +27,7 @@ typedef struct md5crypt_tmp #define md5apr1_magic0 0x72706124u #define md5apr1_magic1 0x00002431u -__kernel void m01600_init (KERN_ATTR_TMPS (md5crypt_tmp_t)) +KERNEL_FQ void m01600_init (KERN_ATTR_TMPS (md5crypt_tmp_t)) { /** * base @@ -134,7 +134,7 @@ __kernel void m01600_init (KERN_ATTR_TMPS (md5crypt_tmp_t)) tmps[gid].digest_buf[3] = md5_ctx.h[3]; } -__kernel void m01600_loop (KERN_ATTR_TMPS (md5crypt_tmp_t)) +KERNEL_FQ void m01600_loop (KERN_ATTR_TMPS (md5crypt_tmp_t)) { /** * base @@ -331,7 +331,7 @@ __kernel void m01600_loop (KERN_ATTR_TMPS (md5crypt_tmp_t)) tmps[gid].digest_buf[3] = digest[3]; } -__kernel void m01600_comp (KERN_ATTR_TMPS (md5crypt_tmp_t)) +KERNEL_FQ void m01600_comp (KERN_ATTR_TMPS (md5crypt_tmp_t)) { /** * modifier diff --git a/OpenCL/m01700_a0-optimized.cl b/OpenCL/m01700_a0-optimized.cl index 812d22420..62e5f757d 100644 --- a/OpenCL/m01700_a0-optimized.cl +++ b/OpenCL/m01700_a0-optimized.cl @@ -114,7 +114,7 @@ DECLSPEC void sha512_transform_intern (const u32x *w0, const u32x *w1, const u32 digest[7] = h; } -__kernel void m01700_m04 (KERN_ATTR_RULES ()) +KERNEL_FQ void m01700_m04 (KERN_ATTR_RULES ()) { /** * modifier @@ -207,15 +207,15 @@ __kernel void m01700_m04 (KERN_ATTR_RULES ()) } } -__kernel void m01700_m08 (KERN_ATTR_RULES ()) +KERNEL_FQ void m01700_m08 (KERN_ATTR_RULES ()) { } -__kernel void m01700_m16 (KERN_ATTR_RULES ()) +KERNEL_FQ void m01700_m16 (KERN_ATTR_RULES ()) { } -__kernel void m01700_s04 (KERN_ATTR_RULES ()) +KERNEL_FQ void m01700_s04 (KERN_ATTR_RULES ()) { /** * modifier @@ -320,10 +320,10 @@ __kernel void m01700_s04 (KERN_ATTR_RULES ()) } } -__kernel void m01700_s08 (KERN_ATTR_RULES ()) +KERNEL_FQ void m01700_s08 (KERN_ATTR_RULES ()) { } -__kernel void m01700_s16 (KERN_ATTR_RULES ()) +KERNEL_FQ void m01700_s16 (KERN_ATTR_RULES ()) { } diff --git a/OpenCL/m01700_a0-pure.cl b/OpenCL/m01700_a0-pure.cl index a075a46da..d6a1f5323 100644 --- a/OpenCL/m01700_a0-pure.cl +++ b/OpenCL/m01700_a0-pure.cl @@ -15,7 +15,7 @@ #include "inc_hash_sha512.cl" #endif -__kernel void m01700_mxx (KERN_ATTR_RULES ()) +KERNEL_FQ void m01700_mxx (KERN_ATTR_RULES ()) { /** * modifier @@ -59,7 +59,7 @@ __kernel void m01700_mxx (KERN_ATTR_RULES ()) } } -__kernel void m01700_sxx (KERN_ATTR_RULES ()) +KERNEL_FQ void m01700_sxx (KERN_ATTR_RULES ()) { /** * modifier diff --git a/OpenCL/m01700_a1-optimized.cl b/OpenCL/m01700_a1-optimized.cl index 1afaffa3a..aa4d0fbc4 100644 --- a/OpenCL/m01700_a1-optimized.cl +++ b/OpenCL/m01700_a1-optimized.cl @@ -112,7 +112,7 @@ DECLSPEC void sha512_transform_intern (const u32x *w0, const u32x *w1, const u32 digest[7] = h; } -__kernel void m01700_m04 (KERN_ATTR_BASIC ()) +KERNEL_FQ void m01700_m04 (KERN_ATTR_BASIC ()) { /** * modifier @@ -263,15 +263,15 @@ __kernel void m01700_m04 (KERN_ATTR_BASIC ()) } } -__kernel void m01700_m08 (KERN_ATTR_BASIC ()) +KERNEL_FQ void m01700_m08 (KERN_ATTR_BASIC ()) { } -__kernel void m01700_m16 (KERN_ATTR_BASIC ()) +KERNEL_FQ void m01700_m16 (KERN_ATTR_BASIC ()) { } -__kernel void m01700_s04 (KERN_ATTR_BASIC ()) +KERNEL_FQ void m01700_s04 (KERN_ATTR_BASIC ()) { /** * modifier @@ -434,10 +434,10 @@ __kernel void m01700_s04 (KERN_ATTR_BASIC ()) } } -__kernel void m01700_s08 (KERN_ATTR_BASIC ()) +KERNEL_FQ void m01700_s08 (KERN_ATTR_BASIC ()) { } -__kernel void m01700_s16 (KERN_ATTR_BASIC ()) +KERNEL_FQ void m01700_s16 (KERN_ATTR_BASIC ()) { } diff --git a/OpenCL/m01700_a1-pure.cl b/OpenCL/m01700_a1-pure.cl index 55e0299dd..0a5b46d6d 100644 --- a/OpenCL/m01700_a1-pure.cl +++ b/OpenCL/m01700_a1-pure.cl @@ -13,7 +13,7 @@ #include "inc_hash_sha512.cl" #endif -__kernel void m01700_mxx (KERN_ATTR_BASIC ()) +KERNEL_FQ void m01700_mxx (KERN_ATTR_BASIC ()) { /** * modifier @@ -55,7 +55,7 @@ __kernel void m01700_mxx (KERN_ATTR_BASIC ()) } } -__kernel void m01700_sxx (KERN_ATTR_BASIC ()) +KERNEL_FQ void m01700_sxx (KERN_ATTR_BASIC ()) { /** * modifier diff --git a/OpenCL/m01700_a3-optimized.cl b/OpenCL/m01700_a3-optimized.cl index fd53e1d57..e56c00969 100644 --- a/OpenCL/m01700_a3-optimized.cl +++ b/OpenCL/m01700_a3-optimized.cl @@ -254,7 +254,7 @@ DECLSPEC void m01700s (u32 *w, const u32 pw_len, KERN_ATTR_VECTOR ()) } } -__kernel void m01700_m04 (KERN_ATTR_VECTOR ()) +KERNEL_FQ void m01700_m04 (KERN_ATTR_VECTOR ()) { /** * base @@ -292,7 +292,7 @@ __kernel void m01700_m04 (KERN_ATTR_VECTOR ()) m01700m (w, pw_len, pws, rules_buf, combs_buf, words_buf_r, 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_extra0_buf, d_extra1_buf, d_extra2_buf, d_extra3_buf, bitmap_mask, bitmap_shift1, bitmap_shift2, salt_pos, loop_pos, loop_cnt, il_cnt, digests_cnt, digests_offset, combs_mode, gid_max); } -__kernel void m01700_m08 (KERN_ATTR_VECTOR ()) +KERNEL_FQ void m01700_m08 (KERN_ATTR_VECTOR ()) { /** * base @@ -330,7 +330,7 @@ __kernel void m01700_m08 (KERN_ATTR_VECTOR ()) m01700m (w, pw_len, pws, rules_buf, combs_buf, words_buf_r, 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_extra0_buf, d_extra1_buf, d_extra2_buf, d_extra3_buf, bitmap_mask, bitmap_shift1, bitmap_shift2, salt_pos, loop_pos, loop_cnt, il_cnt, digests_cnt, digests_offset, combs_mode, gid_max); } -__kernel void m01700_m16 (KERN_ATTR_VECTOR ()) +KERNEL_FQ void m01700_m16 (KERN_ATTR_VECTOR ()) { /** * base @@ -368,7 +368,7 @@ __kernel void m01700_m16 (KERN_ATTR_VECTOR ()) m01700m (w, pw_len, pws, rules_buf, combs_buf, words_buf_r, 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_extra0_buf, d_extra1_buf, d_extra2_buf, d_extra3_buf, bitmap_mask, bitmap_shift1, bitmap_shift2, salt_pos, loop_pos, loop_cnt, il_cnt, digests_cnt, digests_offset, combs_mode, gid_max); } -__kernel void m01700_s04 (KERN_ATTR_VECTOR ()) +KERNEL_FQ void m01700_s04 (KERN_ATTR_VECTOR ()) { /** * base @@ -406,7 +406,7 @@ __kernel void m01700_s04 (KERN_ATTR_VECTOR ()) m01700s (w, pw_len, pws, rules_buf, combs_buf, words_buf_r, 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_extra0_buf, d_extra1_buf, d_extra2_buf, d_extra3_buf, bitmap_mask, bitmap_shift1, bitmap_shift2, salt_pos, loop_pos, loop_cnt, il_cnt, digests_cnt, digests_offset, combs_mode, gid_max); } -__kernel void m01700_s08 (KERN_ATTR_VECTOR ()) +KERNEL_FQ void m01700_s08 (KERN_ATTR_VECTOR ()) { /** * base @@ -444,7 +444,7 @@ __kernel void m01700_s08 (KERN_ATTR_VECTOR ()) m01700s (w, pw_len, pws, rules_buf, combs_buf, words_buf_r, 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_extra0_buf, d_extra1_buf, d_extra2_buf, d_extra3_buf, bitmap_mask, bitmap_shift1, bitmap_shift2, salt_pos, loop_pos, loop_cnt, il_cnt, digests_cnt, digests_offset, combs_mode, gid_max); } -__kernel void m01700_s16 (KERN_ATTR_VECTOR ()) +KERNEL_FQ void m01700_s16 (KERN_ATTR_VECTOR ()) { /** * base diff --git a/OpenCL/m01700_a3-pure.cl b/OpenCL/m01700_a3-pure.cl index 3caf2086d..4eae8ab89 100644 --- a/OpenCL/m01700_a3-pure.cl +++ b/OpenCL/m01700_a3-pure.cl @@ -13,7 +13,7 @@ #include "inc_hash_sha512.cl" #endif -__kernel void m01700_mxx (KERN_ATTR_VECTOR ()) +KERNEL_FQ void m01700_mxx (KERN_ATTR_VECTOR ()) { /** * modifier @@ -68,7 +68,7 @@ __kernel void m01700_mxx (KERN_ATTR_VECTOR ()) } } -__kernel void m01700_sxx (KERN_ATTR_VECTOR ()) +KERNEL_FQ void m01700_sxx (KERN_ATTR_VECTOR ()) { /** * modifier diff --git a/OpenCL/m01710_a0-optimized.cl b/OpenCL/m01710_a0-optimized.cl index ab91a8e99..5d1f7761d 100644 --- a/OpenCL/m01710_a0-optimized.cl +++ b/OpenCL/m01710_a0-optimized.cl @@ -114,7 +114,7 @@ DECLSPEC void sha512_transform_intern (const u32x *w0, const u32x *w1, const u32 digest[7] = h; } -__kernel void m01710_m04 (KERN_ATTR_RULES ()) +KERNEL_FQ void m01710_m04 (KERN_ATTR_RULES ()) { /** * modifier @@ -280,15 +280,15 @@ __kernel void m01710_m04 (KERN_ATTR_RULES ()) } } -__kernel void m01710_m08 (KERN_ATTR_RULES ()) +KERNEL_FQ void m01710_m08 (KERN_ATTR_RULES ()) { } -__kernel void m01710_m16 (KERN_ATTR_RULES ()) +KERNEL_FQ void m01710_m16 (KERN_ATTR_RULES ()) { } -__kernel void m01710_s04 (KERN_ATTR_RULES ()) +KERNEL_FQ void m01710_s04 (KERN_ATTR_RULES ()) { /** * modifier @@ -466,10 +466,10 @@ __kernel void m01710_s04 (KERN_ATTR_RULES ()) } } -__kernel void m01710_s08 (KERN_ATTR_RULES ()) +KERNEL_FQ void m01710_s08 (KERN_ATTR_RULES ()) { } -__kernel void m01710_s16 (KERN_ATTR_RULES ()) +KERNEL_FQ void m01710_s16 (KERN_ATTR_RULES ()) { } diff --git a/OpenCL/m01710_a0-pure.cl b/OpenCL/m01710_a0-pure.cl index 701c89dc2..ef4a297ba 100644 --- a/OpenCL/m01710_a0-pure.cl +++ b/OpenCL/m01710_a0-pure.cl @@ -15,7 +15,7 @@ #include "inc_hash_sha512.cl" #endif -__kernel void m01710_mxx (KERN_ATTR_RULES ()) +KERNEL_FQ void m01710_mxx (KERN_ATTR_RULES ()) { /** * modifier @@ -70,7 +70,7 @@ __kernel void m01710_mxx (KERN_ATTR_RULES ()) } } -__kernel void m01710_sxx (KERN_ATTR_RULES ()) +KERNEL_FQ void m01710_sxx (KERN_ATTR_RULES ()) { /** * modifier diff --git a/OpenCL/m01710_a1-optimized.cl b/OpenCL/m01710_a1-optimized.cl index 380bd0c04..882fb7b64 100644 --- a/OpenCL/m01710_a1-optimized.cl +++ b/OpenCL/m01710_a1-optimized.cl @@ -112,7 +112,7 @@ DECLSPEC void sha512_transform_intern (const u32x *w0, const u32x *w1, const u32 digest[7] = h; } -__kernel void m01710_m04 (KERN_ATTR_BASIC ()) +KERNEL_FQ void m01710_m04 (KERN_ATTR_BASIC ()) { /** * modifier @@ -338,15 +338,15 @@ __kernel void m01710_m04 (KERN_ATTR_BASIC ()) } } -__kernel void m01710_m08 (KERN_ATTR_BASIC ()) +KERNEL_FQ void m01710_m08 (KERN_ATTR_BASIC ()) { } -__kernel void m01710_m16 (KERN_ATTR_BASIC ()) +KERNEL_FQ void m01710_m16 (KERN_ATTR_BASIC ()) { } -__kernel void m01710_s04 (KERN_ATTR_BASIC ()) +KERNEL_FQ void m01710_s04 (KERN_ATTR_BASIC ()) { /** * modifier @@ -584,10 +584,10 @@ __kernel void m01710_s04 (KERN_ATTR_BASIC ()) } } -__kernel void m01710_s08 (KERN_ATTR_BASIC ()) +KERNEL_FQ void m01710_s08 (KERN_ATTR_BASIC ()) { } -__kernel void m01710_s16 (KERN_ATTR_BASIC ()) +KERNEL_FQ void m01710_s16 (KERN_ATTR_BASIC ()) { } diff --git a/OpenCL/m01710_a1-pure.cl b/OpenCL/m01710_a1-pure.cl index 2d1aa4faf..4efffffa6 100644 --- a/OpenCL/m01710_a1-pure.cl +++ b/OpenCL/m01710_a1-pure.cl @@ -13,7 +13,7 @@ #include "inc_hash_sha512.cl" #endif -__kernel void m01710_mxx (KERN_ATTR_BASIC ()) +KERNEL_FQ void m01710_mxx (KERN_ATTR_BASIC ()) { /** * modifier @@ -66,7 +66,7 @@ __kernel void m01710_mxx (KERN_ATTR_BASIC ()) } } -__kernel void m01710_sxx (KERN_ATTR_BASIC ()) +KERNEL_FQ void m01710_sxx (KERN_ATTR_BASIC ()) { /** * modifier diff --git a/OpenCL/m01710_a3-optimized.cl b/OpenCL/m01710_a3-optimized.cl index abacade88..e99be1eae 100644 --- a/OpenCL/m01710_a3-optimized.cl +++ b/OpenCL/m01710_a3-optimized.cl @@ -305,7 +305,7 @@ DECLSPEC void m01710s (u32 *w, const u32 pw_len, KERN_ATTR_VECTOR ()) } } -__kernel void m01710_m04 (KERN_ATTR_VECTOR ()) +KERNEL_FQ void m01710_m04 (KERN_ATTR_VECTOR ()) { /** * base @@ -343,7 +343,7 @@ __kernel void m01710_m04 (KERN_ATTR_VECTOR ()) m01710m (w, pw_len, pws, rules_buf, combs_buf, words_buf_r, 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_extra0_buf, d_extra1_buf, d_extra2_buf, d_extra3_buf, bitmap_mask, bitmap_shift1, bitmap_shift2, salt_pos, loop_pos, loop_cnt, il_cnt, digests_cnt, digests_offset, combs_mode, gid_max); } -__kernel void m01710_m08 (KERN_ATTR_VECTOR ()) +KERNEL_FQ void m01710_m08 (KERN_ATTR_VECTOR ()) { /** * base @@ -381,7 +381,7 @@ __kernel void m01710_m08 (KERN_ATTR_VECTOR ()) m01710m (w, pw_len, pws, rules_buf, combs_buf, words_buf_r, 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_extra0_buf, d_extra1_buf, d_extra2_buf, d_extra3_buf, bitmap_mask, bitmap_shift1, bitmap_shift2, salt_pos, loop_pos, loop_cnt, il_cnt, digests_cnt, digests_offset, combs_mode, gid_max); } -__kernel void m01710_m16 (KERN_ATTR_VECTOR ()) +KERNEL_FQ void m01710_m16 (KERN_ATTR_VECTOR ()) { /** * base @@ -419,7 +419,7 @@ __kernel void m01710_m16 (KERN_ATTR_VECTOR ()) m01710m (w, pw_len, pws, rules_buf, combs_buf, words_buf_r, 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_extra0_buf, d_extra1_buf, d_extra2_buf, d_extra3_buf, bitmap_mask, bitmap_shift1, bitmap_shift2, salt_pos, loop_pos, loop_cnt, il_cnt, digests_cnt, digests_offset, combs_mode, gid_max); } -__kernel void m01710_s04 (KERN_ATTR_VECTOR ()) +KERNEL_FQ void m01710_s04 (KERN_ATTR_VECTOR ()) { /** * base @@ -457,7 +457,7 @@ __kernel void m01710_s04 (KERN_ATTR_VECTOR ()) m01710s (w, pw_len, pws, rules_buf, combs_buf, words_buf_r, 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_extra0_buf, d_extra1_buf, d_extra2_buf, d_extra3_buf, bitmap_mask, bitmap_shift1, bitmap_shift2, salt_pos, loop_pos, loop_cnt, il_cnt, digests_cnt, digests_offset, combs_mode, gid_max); } -__kernel void m01710_s08 (KERN_ATTR_VECTOR ()) +KERNEL_FQ void m01710_s08 (KERN_ATTR_VECTOR ()) { /** * base @@ -495,7 +495,7 @@ __kernel void m01710_s08 (KERN_ATTR_VECTOR ()) m01710s (w, pw_len, pws, rules_buf, combs_buf, words_buf_r, 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_extra0_buf, d_extra1_buf, d_extra2_buf, d_extra3_buf, bitmap_mask, bitmap_shift1, bitmap_shift2, salt_pos, loop_pos, loop_cnt, il_cnt, digests_cnt, digests_offset, combs_mode, gid_max); } -__kernel void m01710_s16 (KERN_ATTR_VECTOR ()) +KERNEL_FQ void m01710_s16 (KERN_ATTR_VECTOR ()) { /** * base diff --git a/OpenCL/m01710_a3-pure.cl b/OpenCL/m01710_a3-pure.cl index eb8f442b7..62ba8368d 100644 --- a/OpenCL/m01710_a3-pure.cl +++ b/OpenCL/m01710_a3-pure.cl @@ -13,7 +13,7 @@ #include "inc_hash_sha512.cl" #endif -__kernel void m01710_mxx (KERN_ATTR_VECTOR ()) +KERNEL_FQ void m01710_mxx (KERN_ATTR_VECTOR ()) { /** * modifier @@ -79,7 +79,7 @@ __kernel void m01710_mxx (KERN_ATTR_VECTOR ()) } } -__kernel void m01710_sxx (KERN_ATTR_VECTOR ()) +KERNEL_FQ void m01710_sxx (KERN_ATTR_VECTOR ()) { /** * modifier diff --git a/OpenCL/m01720_a0-optimized.cl b/OpenCL/m01720_a0-optimized.cl index 6a0290027..6b690033f 100644 --- a/OpenCL/m01720_a0-optimized.cl +++ b/OpenCL/m01720_a0-optimized.cl @@ -114,7 +114,7 @@ DECLSPEC void sha512_transform_intern (const u32x *w0, const u32x *w1, const u32 digest[7] = h; } -__kernel void m01720_m04 (KERN_ATTR_RULES ()) +KERNEL_FQ void m01720_m04 (KERN_ATTR_RULES ()) { /** * modifier @@ -260,15 +260,15 @@ __kernel void m01720_m04 (KERN_ATTR_RULES ()) } } -__kernel void m01720_m08 (KERN_ATTR_RULES ()) +KERNEL_FQ void m01720_m08 (KERN_ATTR_RULES ()) { } -__kernel void m01720_m16 (KERN_ATTR_RULES ()) +KERNEL_FQ void m01720_m16 (KERN_ATTR_RULES ()) { } -__kernel void m01720_s04 (KERN_ATTR_RULES ()) +KERNEL_FQ void m01720_s04 (KERN_ATTR_RULES ()) { /** * modifier @@ -426,10 +426,10 @@ __kernel void m01720_s04 (KERN_ATTR_RULES ()) } } -__kernel void m01720_s08 (KERN_ATTR_RULES ()) +KERNEL_FQ void m01720_s08 (KERN_ATTR_RULES ()) { } -__kernel void m01720_s16 (KERN_ATTR_RULES ()) +KERNEL_FQ void m01720_s16 (KERN_ATTR_RULES ()) { } diff --git a/OpenCL/m01720_a0-pure.cl b/OpenCL/m01720_a0-pure.cl index eaca91836..8744ac81a 100644 --- a/OpenCL/m01720_a0-pure.cl +++ b/OpenCL/m01720_a0-pure.cl @@ -15,7 +15,7 @@ #include "inc_hash_sha512.cl" #endif -__kernel void m01720_mxx (KERN_ATTR_RULES ()) +KERNEL_FQ void m01720_mxx (KERN_ATTR_RULES ()) { /** * modifier @@ -63,7 +63,7 @@ __kernel void m01720_mxx (KERN_ATTR_RULES ()) } } -__kernel void m01720_sxx (KERN_ATTR_RULES ()) +KERNEL_FQ void m01720_sxx (KERN_ATTR_RULES ()) { /** * modifier diff --git a/OpenCL/m01720_a1-optimized.cl b/OpenCL/m01720_a1-optimized.cl index 2ebc95fb4..fd3ac32e4 100644 --- a/OpenCL/m01720_a1-optimized.cl +++ b/OpenCL/m01720_a1-optimized.cl @@ -112,7 +112,7 @@ DECLSPEC void sha512_transform_intern (const u32x *w0, const u32x *w1, const u32 digest[7] = h; } -__kernel void m01720_m04 (KERN_ATTR_BASIC ()) +KERNEL_FQ void m01720_m04 (KERN_ATTR_BASIC ()) { /** * modifier @@ -316,15 +316,15 @@ __kernel void m01720_m04 (KERN_ATTR_BASIC ()) } } -__kernel void m01720_m08 (KERN_ATTR_BASIC ()) +KERNEL_FQ void m01720_m08 (KERN_ATTR_BASIC ()) { } -__kernel void m01720_m16 (KERN_ATTR_BASIC ()) +KERNEL_FQ void m01720_m16 (KERN_ATTR_BASIC ()) { } -__kernel void m01720_s04 (KERN_ATTR_BASIC ()) +KERNEL_FQ void m01720_s04 (KERN_ATTR_BASIC ()) { /** * modifier @@ -540,10 +540,10 @@ __kernel void m01720_s04 (KERN_ATTR_BASIC ()) } } -__kernel void m01720_s08 (KERN_ATTR_BASIC ()) +KERNEL_FQ void m01720_s08 (KERN_ATTR_BASIC ()) { } -__kernel void m01720_s16 (KERN_ATTR_BASIC ()) +KERNEL_FQ void m01720_s16 (KERN_ATTR_BASIC ()) { } diff --git a/OpenCL/m01720_a1-pure.cl b/OpenCL/m01720_a1-pure.cl index 979a825f1..895635e2d 100644 --- a/OpenCL/m01720_a1-pure.cl +++ b/OpenCL/m01720_a1-pure.cl @@ -13,7 +13,7 @@ #include "inc_hash_sha512.cl" #endif -__kernel void m01720_mxx (KERN_ATTR_BASIC ()) +KERNEL_FQ void m01720_mxx (KERN_ATTR_BASIC ()) { /** * modifier @@ -57,7 +57,7 @@ __kernel void m01720_mxx (KERN_ATTR_BASIC ()) } } -__kernel void m01720_sxx (KERN_ATTR_BASIC ()) +KERNEL_FQ void m01720_sxx (KERN_ATTR_BASIC ()) { /** * modifier diff --git a/OpenCL/m01720_a3-optimized.cl b/OpenCL/m01720_a3-optimized.cl index a28b7b425..74f8a79a9 100644 --- a/OpenCL/m01720_a3-optimized.cl +++ b/OpenCL/m01720_a3-optimized.cl @@ -360,7 +360,7 @@ DECLSPEC void m01720s (u32 *w0, u32 *w1, u32 *w2, u32 *w3, const u32 pw_len, KER } } -__kernel void m01720_m04 (KERN_ATTR_BASIC ()) +KERNEL_FQ void m01720_m04 (KERN_ATTR_BASIC ()) { /** * base @@ -407,7 +407,7 @@ __kernel void m01720_m04 (KERN_ATTR_BASIC ()) m01720m (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_extra0_buf, d_extra1_buf, d_extra2_buf, d_extra3_buf, bitmap_mask, bitmap_shift1, bitmap_shift2, salt_pos, loop_pos, loop_cnt, il_cnt, digests_cnt, digests_offset, combs_mode, gid_max); } -__kernel void m01720_m08 (KERN_ATTR_BASIC ()) +KERNEL_FQ void m01720_m08 (KERN_ATTR_BASIC ()) { /** * base @@ -454,7 +454,7 @@ __kernel void m01720_m08 (KERN_ATTR_BASIC ()) m01720m (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_extra0_buf, d_extra1_buf, d_extra2_buf, d_extra3_buf, bitmap_mask, bitmap_shift1, bitmap_shift2, salt_pos, loop_pos, loop_cnt, il_cnt, digests_cnt, digests_offset, combs_mode, gid_max); } -__kernel void m01720_m16 (KERN_ATTR_BASIC ()) +KERNEL_FQ void m01720_m16 (KERN_ATTR_BASIC ()) { /** * base @@ -501,7 +501,7 @@ __kernel void m01720_m16 (KERN_ATTR_BASIC ()) m01720m (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_extra0_buf, d_extra1_buf, d_extra2_buf, d_extra3_buf, bitmap_mask, bitmap_shift1, bitmap_shift2, salt_pos, loop_pos, loop_cnt, il_cnt, digests_cnt, digests_offset, combs_mode, gid_max); } -__kernel void m01720_s04 (KERN_ATTR_BASIC ()) +KERNEL_FQ void m01720_s04 (KERN_ATTR_BASIC ()) { /** * base @@ -548,7 +548,7 @@ __kernel void m01720_s04 (KERN_ATTR_BASIC ()) m01720s (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_extra0_buf, d_extra1_buf, d_extra2_buf, d_extra3_buf, bitmap_mask, bitmap_shift1, bitmap_shift2, salt_pos, loop_pos, loop_cnt, il_cnt, digests_cnt, digests_offset, combs_mode, gid_max); } -__kernel void m01720_s08 (KERN_ATTR_BASIC ()) +KERNEL_FQ void m01720_s08 (KERN_ATTR_BASIC ()) { /** * base @@ -595,7 +595,7 @@ __kernel void m01720_s08 (KERN_ATTR_BASIC ()) m01720s (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_extra0_buf, d_extra1_buf, d_extra2_buf, d_extra3_buf, bitmap_mask, bitmap_shift1, bitmap_shift2, salt_pos, loop_pos, loop_cnt, il_cnt, digests_cnt, digests_offset, combs_mode, gid_max); } -__kernel void m01720_s16 (KERN_ATTR_BASIC ()) +KERNEL_FQ void m01720_s16 (KERN_ATTR_BASIC ()) { /** * base diff --git a/OpenCL/m01720_a3-pure.cl b/OpenCL/m01720_a3-pure.cl index e6eee406d..8a143c538 100644 --- a/OpenCL/m01720_a3-pure.cl +++ b/OpenCL/m01720_a3-pure.cl @@ -13,7 +13,7 @@ #include "inc_hash_sha512.cl" #endif -__kernel void m01720_mxx (KERN_ATTR_VECTOR ()) +KERNEL_FQ void m01720_mxx (KERN_ATTR_VECTOR ()) { /** * modifier @@ -74,7 +74,7 @@ __kernel void m01720_mxx (KERN_ATTR_VECTOR ()) } } -__kernel void m01720_sxx (KERN_ATTR_VECTOR ()) +KERNEL_FQ void m01720_sxx (KERN_ATTR_VECTOR ()) { /** * modifier diff --git a/OpenCL/m01730_a0-optimized.cl b/OpenCL/m01730_a0-optimized.cl index 36b32641f..ddaca0597 100644 --- a/OpenCL/m01730_a0-optimized.cl +++ b/OpenCL/m01730_a0-optimized.cl @@ -114,7 +114,7 @@ DECLSPEC void sha512_transform_intern (const u32x *w0, const u32x *w1, const u32 digest[7] = h; } -__kernel void m01730_m04 (KERN_ATTR_RULES ()) +KERNEL_FQ void m01730_m04 (KERN_ATTR_RULES ()) { /** * modifier @@ -285,15 +285,15 @@ __kernel void m01730_m04 (KERN_ATTR_RULES ()) } } -__kernel void m01730_m08 (KERN_ATTR_RULES ()) +KERNEL_FQ void m01730_m08 (KERN_ATTR_RULES ()) { } -__kernel void m01730_m16 (KERN_ATTR_RULES ()) +KERNEL_FQ void m01730_m16 (KERN_ATTR_RULES ()) { } -__kernel void m01730_s04 (KERN_ATTR_RULES ()) +KERNEL_FQ void m01730_s04 (KERN_ATTR_RULES ()) { /** * modifier @@ -476,10 +476,10 @@ __kernel void m01730_s04 (KERN_ATTR_RULES ()) } } -__kernel void m01730_s08 (KERN_ATTR_RULES ()) +KERNEL_FQ void m01730_s08 (KERN_ATTR_RULES ()) { } -__kernel void m01730_s16 (KERN_ATTR_RULES ()) +KERNEL_FQ void m01730_s16 (KERN_ATTR_RULES ()) { } diff --git a/OpenCL/m01730_a0-pure.cl b/OpenCL/m01730_a0-pure.cl index 5d0dff961..39ed5d23d 100644 --- a/OpenCL/m01730_a0-pure.cl +++ b/OpenCL/m01730_a0-pure.cl @@ -15,7 +15,7 @@ #include "inc_hash_sha512.cl" #endif -__kernel void m01730_mxx (KERN_ATTR_RULES ()) +KERNEL_FQ void m01730_mxx (KERN_ATTR_RULES ()) { /** * modifier @@ -70,7 +70,7 @@ __kernel void m01730_mxx (KERN_ATTR_RULES ()) } } -__kernel void m01730_sxx (KERN_ATTR_RULES ()) +KERNEL_FQ void m01730_sxx (KERN_ATTR_RULES ()) { /** * modifier diff --git a/OpenCL/m01730_a1-optimized.cl b/OpenCL/m01730_a1-optimized.cl index ef214361e..e1b46a669 100644 --- a/OpenCL/m01730_a1-optimized.cl +++ b/OpenCL/m01730_a1-optimized.cl @@ -112,7 +112,7 @@ DECLSPEC void sha512_transform_intern (const u32x *w0, const u32x *w1, const u32 digest[7] = h; } -__kernel void m01730_m04 (KERN_ATTR_BASIC ()) +KERNEL_FQ void m01730_m04 (KERN_ATTR_BASIC ()) { /** * modifier @@ -343,15 +343,15 @@ __kernel void m01730_m04 (KERN_ATTR_BASIC ()) } } -__kernel void m01730_m08 (KERN_ATTR_BASIC ()) +KERNEL_FQ void m01730_m08 (KERN_ATTR_BASIC ()) { } -__kernel void m01730_m16 (KERN_ATTR_BASIC ()) +KERNEL_FQ void m01730_m16 (KERN_ATTR_BASIC ()) { } -__kernel void m01730_s04 (KERN_ATTR_BASIC ()) +KERNEL_FQ void m01730_s04 (KERN_ATTR_BASIC ()) { /** * modifier @@ -594,10 +594,10 @@ __kernel void m01730_s04 (KERN_ATTR_BASIC ()) } } -__kernel void m01730_s08 (KERN_ATTR_BASIC ()) +KERNEL_FQ void m01730_s08 (KERN_ATTR_BASIC ()) { } -__kernel void m01730_s16 (KERN_ATTR_BASIC ()) +KERNEL_FQ void m01730_s16 (KERN_ATTR_BASIC ()) { } diff --git a/OpenCL/m01730_a1-pure.cl b/OpenCL/m01730_a1-pure.cl index a1b179bd3..fb67e2ca5 100644 --- a/OpenCL/m01730_a1-pure.cl +++ b/OpenCL/m01730_a1-pure.cl @@ -13,7 +13,7 @@ #include "inc_hash_sha512.cl" #endif -__kernel void m01730_mxx (KERN_ATTR_BASIC ()) +KERNEL_FQ void m01730_mxx (KERN_ATTR_BASIC ()) { /** * modifier @@ -66,7 +66,7 @@ __kernel void m01730_mxx (KERN_ATTR_BASIC ()) } } -__kernel void m01730_sxx (KERN_ATTR_BASIC ()) +KERNEL_FQ void m01730_sxx (KERN_ATTR_BASIC ()) { /** * modifier diff --git a/OpenCL/m01730_a3-optimized.cl b/OpenCL/m01730_a3-optimized.cl index 4b761d33e..6769d912c 100644 --- a/OpenCL/m01730_a3-optimized.cl +++ b/OpenCL/m01730_a3-optimized.cl @@ -305,7 +305,7 @@ DECLSPEC void m01730s (u32 *w, const u32 pw_len, KERN_ATTR_VECTOR ()) } } -__kernel void m01730_m04 (KERN_ATTR_VECTOR ()) +KERNEL_FQ void m01730_m04 (KERN_ATTR_VECTOR ()) { /** * base @@ -343,7 +343,7 @@ __kernel void m01730_m04 (KERN_ATTR_VECTOR ()) m01730m (w, pw_len, pws, rules_buf, combs_buf, words_buf_r, 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_extra0_buf, d_extra1_buf, d_extra2_buf, d_extra3_buf, bitmap_mask, bitmap_shift1, bitmap_shift2, salt_pos, loop_pos, loop_cnt, il_cnt, digests_cnt, digests_offset, combs_mode, gid_max); } -__kernel void m01730_m08 (KERN_ATTR_VECTOR ()) +KERNEL_FQ void m01730_m08 (KERN_ATTR_VECTOR ()) { /** * base @@ -381,7 +381,7 @@ __kernel void m01730_m08 (KERN_ATTR_VECTOR ()) m01730m (w, pw_len, pws, rules_buf, combs_buf, words_buf_r, 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_extra0_buf, d_extra1_buf, d_extra2_buf, d_extra3_buf, bitmap_mask, bitmap_shift1, bitmap_shift2, salt_pos, loop_pos, loop_cnt, il_cnt, digests_cnt, digests_offset, combs_mode, gid_max); } -__kernel void m01730_m16 (KERN_ATTR_VECTOR ()) +KERNEL_FQ void m01730_m16 (KERN_ATTR_VECTOR ()) { /** * base @@ -419,7 +419,7 @@ __kernel void m01730_m16 (KERN_ATTR_VECTOR ()) m01730m (w, pw_len, pws, rules_buf, combs_buf, words_buf_r, 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_extra0_buf, d_extra1_buf, d_extra2_buf, d_extra3_buf, bitmap_mask, bitmap_shift1, bitmap_shift2, salt_pos, loop_pos, loop_cnt, il_cnt, digests_cnt, digests_offset, combs_mode, gid_max); } -__kernel void m01730_s04 (KERN_ATTR_VECTOR ()) +KERNEL_FQ void m01730_s04 (KERN_ATTR_VECTOR ()) { /** * base @@ -457,7 +457,7 @@ __kernel void m01730_s04 (KERN_ATTR_VECTOR ()) m01730s (w, pw_len, pws, rules_buf, combs_buf, words_buf_r, 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_extra0_buf, d_extra1_buf, d_extra2_buf, d_extra3_buf, bitmap_mask, bitmap_shift1, bitmap_shift2, salt_pos, loop_pos, loop_cnt, il_cnt, digests_cnt, digests_offset, combs_mode, gid_max); } -__kernel void m01730_s08 (KERN_ATTR_VECTOR ()) +KERNEL_FQ void m01730_s08 (KERN_ATTR_VECTOR ()) { /** * base @@ -495,7 +495,7 @@ __kernel void m01730_s08 (KERN_ATTR_VECTOR ()) m01730s (w, pw_len, pws, rules_buf, combs_buf, words_buf_r, 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_extra0_buf, d_extra1_buf, d_extra2_buf, d_extra3_buf, bitmap_mask, bitmap_shift1, bitmap_shift2, salt_pos, loop_pos, loop_cnt, il_cnt, digests_cnt, digests_offset, combs_mode, gid_max); } -__kernel void m01730_s16 (KERN_ATTR_VECTOR ()) +KERNEL_FQ void m01730_s16 (KERN_ATTR_VECTOR ()) { /** * base diff --git a/OpenCL/m01730_a3-pure.cl b/OpenCL/m01730_a3-pure.cl index 7a69a8ec8..442955f16 100644 --- a/OpenCL/m01730_a3-pure.cl +++ b/OpenCL/m01730_a3-pure.cl @@ -13,7 +13,7 @@ #include "inc_hash_sha512.cl" #endif -__kernel void m01730_mxx (KERN_ATTR_VECTOR ()) +KERNEL_FQ void m01730_mxx (KERN_ATTR_VECTOR ()) { /** * modifier @@ -79,7 +79,7 @@ __kernel void m01730_mxx (KERN_ATTR_VECTOR ()) } } -__kernel void m01730_sxx (KERN_ATTR_VECTOR ()) +KERNEL_FQ void m01730_sxx (KERN_ATTR_VECTOR ()) { /** * modifier diff --git a/OpenCL/m01740_a0-optimized.cl b/OpenCL/m01740_a0-optimized.cl index 4b1701d68..afadc9a7e 100644 --- a/OpenCL/m01740_a0-optimized.cl +++ b/OpenCL/m01740_a0-optimized.cl @@ -114,7 +114,7 @@ DECLSPEC void sha512_transform (const u32x *w0, const u32x *w1, const u32x *w2, digest[7] = h; } -__kernel void m01740_m04 (KERN_ATTR_RULES ()) +KERNEL_FQ void m01740_m04 (KERN_ATTR_RULES ()) { /** * modifier @@ -265,15 +265,15 @@ __kernel void m01740_m04 (KERN_ATTR_RULES ()) } } -__kernel void m01740_m08 (KERN_ATTR_RULES ()) +KERNEL_FQ void m01740_m08 (KERN_ATTR_RULES ()) { } -__kernel void m01740_m16 (KERN_ATTR_RULES ()) +KERNEL_FQ void m01740_m16 (KERN_ATTR_RULES ()) { } -__kernel void m01740_s04 (KERN_ATTR_RULES ()) +KERNEL_FQ void m01740_s04 (KERN_ATTR_RULES ()) { /** * modifier @@ -436,10 +436,10 @@ __kernel void m01740_s04 (KERN_ATTR_RULES ()) } } -__kernel void m01740_s08 (KERN_ATTR_RULES ()) +KERNEL_FQ void m01740_s08 (KERN_ATTR_RULES ()) { } -__kernel void m01740_s16 (KERN_ATTR_RULES ()) +KERNEL_FQ void m01740_s16 (KERN_ATTR_RULES ()) { } diff --git a/OpenCL/m01740_a0-pure.cl b/OpenCL/m01740_a0-pure.cl index 43d684902..90626bed5 100644 --- a/OpenCL/m01740_a0-pure.cl +++ b/OpenCL/m01740_a0-pure.cl @@ -15,7 +15,7 @@ #include "inc_hash_sha512.cl" #endif -__kernel void m01740_mxx (KERN_ATTR_RULES ()) +KERNEL_FQ void m01740_mxx (KERN_ATTR_RULES ()) { /** * modifier @@ -63,7 +63,7 @@ __kernel void m01740_mxx (KERN_ATTR_RULES ()) } } -__kernel void m01740_sxx (KERN_ATTR_RULES ()) +KERNEL_FQ void m01740_sxx (KERN_ATTR_RULES ()) { /** * modifier diff --git a/OpenCL/m01740_a1-optimized.cl b/OpenCL/m01740_a1-optimized.cl index a8c6f82fa..db40d273f 100644 --- a/OpenCL/m01740_a1-optimized.cl +++ b/OpenCL/m01740_a1-optimized.cl @@ -112,7 +112,7 @@ DECLSPEC void sha512_transform_intern (const u32x *w0, const u32x *w1, const u32 digest[7] = h; } -__kernel void m01740_m04 (KERN_ATTR_BASIC ()) +KERNEL_FQ void m01740_m04 (KERN_ATTR_BASIC ()) { /** * modifier @@ -321,15 +321,15 @@ __kernel void m01740_m04 (KERN_ATTR_BASIC ()) } } -__kernel void m01740_m08 (KERN_ATTR_BASIC ()) +KERNEL_FQ void m01740_m08 (KERN_ATTR_BASIC ()) { } -__kernel void m01740_m16 (KERN_ATTR_BASIC ()) +KERNEL_FQ void m01740_m16 (KERN_ATTR_BASIC ()) { } -__kernel void m01740_s04 (KERN_ATTR_BASIC ()) +KERNEL_FQ void m01740_s04 (KERN_ATTR_BASIC ()) { /** * modifier @@ -550,10 +550,10 @@ __kernel void m01740_s04 (KERN_ATTR_BASIC ()) } } -__kernel void m01740_s08 (KERN_ATTR_BASIC ()) +KERNEL_FQ void m01740_s08 (KERN_ATTR_BASIC ()) { } -__kernel void m01740_s16 (KERN_ATTR_BASIC ()) +KERNEL_FQ void m01740_s16 (KERN_ATTR_BASIC ()) { } diff --git a/OpenCL/m01740_a1-pure.cl b/OpenCL/m01740_a1-pure.cl index 06bec90f4..2c1f2fd91 100644 --- a/OpenCL/m01740_a1-pure.cl +++ b/OpenCL/m01740_a1-pure.cl @@ -13,7 +13,7 @@ #include "inc_hash_sha512.cl" #endif -__kernel void m01740_mxx (KERN_ATTR_BASIC ()) +KERNEL_FQ void m01740_mxx (KERN_ATTR_BASIC ()) { /** * modifier @@ -57,7 +57,7 @@ __kernel void m01740_mxx (KERN_ATTR_BASIC ()) } } -__kernel void m01740_sxx (KERN_ATTR_BASIC ()) +KERNEL_FQ void m01740_sxx (KERN_ATTR_BASIC ()) { /** * modifier diff --git a/OpenCL/m01740_a3-optimized.cl b/OpenCL/m01740_a3-optimized.cl index 6c4d10832..3a583d10b 100644 --- a/OpenCL/m01740_a3-optimized.cl +++ b/OpenCL/m01740_a3-optimized.cl @@ -360,7 +360,7 @@ DECLSPEC void m01740s (u32 *w0, u32 *w1, u32 *w2, u32 *w3, const u32 pw_len, KER } } -__kernel void m01740_m04 (KERN_ATTR_BASIC ()) +KERNEL_FQ void m01740_m04 (KERN_ATTR_BASIC ()) { /** * base @@ -407,7 +407,7 @@ __kernel void m01740_m04 (KERN_ATTR_BASIC ()) m01740m (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_extra0_buf, d_extra1_buf, d_extra2_buf, d_extra3_buf, bitmap_mask, bitmap_shift1, bitmap_shift2, salt_pos, loop_pos, loop_cnt, il_cnt, digests_cnt, digests_offset, combs_mode, gid_max); } -__kernel void m01740_m08 (KERN_ATTR_BASIC ()) +KERNEL_FQ void m01740_m08 (KERN_ATTR_BASIC ()) { /** * base @@ -454,7 +454,7 @@ __kernel void m01740_m08 (KERN_ATTR_BASIC ()) m01740m (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_extra0_buf, d_extra1_buf, d_extra2_buf, d_extra3_buf, bitmap_mask, bitmap_shift1, bitmap_shift2, salt_pos, loop_pos, loop_cnt, il_cnt, digests_cnt, digests_offset, combs_mode, gid_max); } -__kernel void m01740_m16 (KERN_ATTR_BASIC ()) +KERNEL_FQ void m01740_m16 (KERN_ATTR_BASIC ()) { /** * base @@ -501,7 +501,7 @@ __kernel void m01740_m16 (KERN_ATTR_BASIC ()) m01740m (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_extra0_buf, d_extra1_buf, d_extra2_buf, d_extra3_buf, bitmap_mask, bitmap_shift1, bitmap_shift2, salt_pos, loop_pos, loop_cnt, il_cnt, digests_cnt, digests_offset, combs_mode, gid_max); } -__kernel void m01740_s04 (KERN_ATTR_BASIC ()) +KERNEL_FQ void m01740_s04 (KERN_ATTR_BASIC ()) { /** * base @@ -548,7 +548,7 @@ __kernel void m01740_s04 (KERN_ATTR_BASIC ()) m01740s (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_extra0_buf, d_extra1_buf, d_extra2_buf, d_extra3_buf, bitmap_mask, bitmap_shift1, bitmap_shift2, salt_pos, loop_pos, loop_cnt, il_cnt, digests_cnt, digests_offset, combs_mode, gid_max); } -__kernel void m01740_s08 (KERN_ATTR_BASIC ()) +KERNEL_FQ void m01740_s08 (KERN_ATTR_BASIC ()) { /** * base @@ -595,7 +595,7 @@ __kernel void m01740_s08 (KERN_ATTR_BASIC ()) m01740s (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_extra0_buf, d_extra1_buf, d_extra2_buf, d_extra3_buf, bitmap_mask, bitmap_shift1, bitmap_shift2, salt_pos, loop_pos, loop_cnt, il_cnt, digests_cnt, digests_offset, combs_mode, gid_max); } -__kernel void m01740_s16 (KERN_ATTR_BASIC ()) +KERNEL_FQ void m01740_s16 (KERN_ATTR_BASIC ()) { /** * base diff --git a/OpenCL/m01740_a3-pure.cl b/OpenCL/m01740_a3-pure.cl index c489ac3b7..2aee6cac0 100644 --- a/OpenCL/m01740_a3-pure.cl +++ b/OpenCL/m01740_a3-pure.cl @@ -13,7 +13,7 @@ #include "inc_hash_sha512.cl" #endif -__kernel void m01740_mxx (KERN_ATTR_VECTOR ()) +KERNEL_FQ void m01740_mxx (KERN_ATTR_VECTOR ()) { /** * modifier @@ -74,7 +74,7 @@ __kernel void m01740_mxx (KERN_ATTR_VECTOR ()) } } -__kernel void m01740_sxx (KERN_ATTR_VECTOR ()) +KERNEL_FQ void m01740_sxx (KERN_ATTR_VECTOR ()) { /** * modifier diff --git a/OpenCL/m01750_a0-optimized.cl b/OpenCL/m01750_a0-optimized.cl index a210ddfb0..d89a938af 100644 --- a/OpenCL/m01750_a0-optimized.cl +++ b/OpenCL/m01750_a0-optimized.cl @@ -190,7 +190,7 @@ DECLSPEC void hmac_sha512_run (u32x *w0, u32x *w1, u32x *w2, u32x *w3, u64x *ipa sha512_transform_intern_transport_vector (w0_t, w1_t, w2_t, w3_t, digest); } -__kernel void m01750_m04 (KERN_ATTR_RULES ()) +KERNEL_FQ void m01750_m04 (KERN_ATTR_RULES ()) { /** * modifier @@ -309,15 +309,15 @@ __kernel void m01750_m04 (KERN_ATTR_RULES ()) } } -__kernel void m01750_m08 (KERN_ATTR_RULES ()) +KERNEL_FQ void m01750_m08 (KERN_ATTR_RULES ()) { } -__kernel void m01750_m16 (KERN_ATTR_RULES ()) +KERNEL_FQ void m01750_m16 (KERN_ATTR_RULES ()) { } -__kernel void m01750_s04 (KERN_ATTR_RULES ()) +KERNEL_FQ void m01750_s04 (KERN_ATTR_RULES ()) { /** * modifier @@ -448,10 +448,10 @@ __kernel void m01750_s04 (KERN_ATTR_RULES ()) } } -__kernel void m01750_s08 (KERN_ATTR_RULES ()) +KERNEL_FQ void m01750_s08 (KERN_ATTR_RULES ()) { } -__kernel void m01750_s16 (KERN_ATTR_RULES ()) +KERNEL_FQ void m01750_s16 (KERN_ATTR_RULES ()) { } diff --git a/OpenCL/m01750_a0-pure.cl b/OpenCL/m01750_a0-pure.cl index 39a482d04..0b3771028 100644 --- a/OpenCL/m01750_a0-pure.cl +++ b/OpenCL/m01750_a0-pure.cl @@ -15,7 +15,7 @@ #include "inc_hash_sha512.cl" #endif -__kernel void m01750_mxx (KERN_ATTR_RULES ()) +KERNEL_FQ void m01750_mxx (KERN_ATTR_RULES ()) { /** * modifier @@ -68,7 +68,7 @@ __kernel void m01750_mxx (KERN_ATTR_RULES ()) } } -__kernel void m01750_sxx (KERN_ATTR_RULES ()) +KERNEL_FQ void m01750_sxx (KERN_ATTR_RULES ()) { /** * modifier diff --git a/OpenCL/m01750_a1-optimized.cl b/OpenCL/m01750_a1-optimized.cl index 4d28ed131..4ef57b6f4 100644 --- a/OpenCL/m01750_a1-optimized.cl +++ b/OpenCL/m01750_a1-optimized.cl @@ -188,7 +188,7 @@ DECLSPEC void hmac_sha512_run (u32x *w0, u32x *w1, u32x *w2, u32x *w3, u64x *ipa sha512_transform_transport_vector (w0_t, w1_t, w2_t, w3_t, digest); } -__kernel void m01750_m04 (KERN_ATTR_BASIC ()) +KERNEL_FQ void m01750_m04 (KERN_ATTR_BASIC ()) { /** * modifier @@ -375,15 +375,15 @@ __kernel void m01750_m04 (KERN_ATTR_BASIC ()) } } -__kernel void m01750_m08 (KERN_ATTR_BASIC ()) +KERNEL_FQ void m01750_m08 (KERN_ATTR_BASIC ()) { } -__kernel void m01750_m16 (KERN_ATTR_BASIC ()) +KERNEL_FQ void m01750_m16 (KERN_ATTR_BASIC ()) { } -__kernel void m01750_s04 (KERN_ATTR_BASIC ()) +KERNEL_FQ void m01750_s04 (KERN_ATTR_BASIC ()) { /** * modifier @@ -582,10 +582,10 @@ __kernel void m01750_s04 (KERN_ATTR_BASIC ()) } } -__kernel void m01750_s08 (KERN_ATTR_BASIC ()) +KERNEL_FQ void m01750_s08 (KERN_ATTR_BASIC ()) { } -__kernel void m01750_s16 (KERN_ATTR_BASIC ()) +KERNEL_FQ void m01750_s16 (KERN_ATTR_BASIC ()) { } diff --git a/OpenCL/m01750_a1-pure.cl b/OpenCL/m01750_a1-pure.cl index a0a525859..86dac0602 100644 --- a/OpenCL/m01750_a1-pure.cl +++ b/OpenCL/m01750_a1-pure.cl @@ -13,7 +13,7 @@ #include "inc_hash_sha512.cl" #endif -__kernel void m01750_mxx (KERN_ATTR_BASIC ()) +KERNEL_FQ void m01750_mxx (KERN_ATTR_BASIC ()) { /** * modifier @@ -91,7 +91,7 @@ __kernel void m01750_mxx (KERN_ATTR_BASIC ()) } } -__kernel void m01750_sxx (KERN_ATTR_BASIC ()) +KERNEL_FQ void m01750_sxx (KERN_ATTR_BASIC ()) { /** * modifier diff --git a/OpenCL/m01750_a3-optimized.cl b/OpenCL/m01750_a3-optimized.cl index a9669084e..b2fce691d 100644 --- a/OpenCL/m01750_a3-optimized.cl +++ b/OpenCL/m01750_a3-optimized.cl @@ -420,7 +420,7 @@ DECLSPEC void m01750s (u32 *w0, u32 *w1, u32 *w2, u32 *w3, const u32 pw_len, KER } } -__kernel void m01750_m04 (KERN_ATTR_BASIC ()) +KERNEL_FQ void m01750_m04 (KERN_ATTR_BASIC ()) { /** * base @@ -467,7 +467,7 @@ __kernel void m01750_m04 (KERN_ATTR_BASIC ()) m01750m (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_extra0_buf, d_extra1_buf, d_extra2_buf, d_extra3_buf, bitmap_mask, bitmap_shift1, bitmap_shift2, salt_pos, loop_pos, loop_cnt, il_cnt, digests_cnt, digests_offset, combs_mode, gid_max); } -__kernel void m01750_m08 (KERN_ATTR_BASIC ()) +KERNEL_FQ void m01750_m08 (KERN_ATTR_BASIC ()) { /** * base @@ -514,7 +514,7 @@ __kernel void m01750_m08 (KERN_ATTR_BASIC ()) m01750m (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_extra0_buf, d_extra1_buf, d_extra2_buf, d_extra3_buf, bitmap_mask, bitmap_shift1, bitmap_shift2, salt_pos, loop_pos, loop_cnt, il_cnt, digests_cnt, digests_offset, combs_mode, gid_max); } -__kernel void m01750_m16 (KERN_ATTR_BASIC ()) +KERNEL_FQ void m01750_m16 (KERN_ATTR_BASIC ()) { /** * base @@ -561,7 +561,7 @@ __kernel void m01750_m16 (KERN_ATTR_BASIC ()) m01750m (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_extra0_buf, d_extra1_buf, d_extra2_buf, d_extra3_buf, bitmap_mask, bitmap_shift1, bitmap_shift2, salt_pos, loop_pos, loop_cnt, il_cnt, digests_cnt, digests_offset, combs_mode, gid_max); } -__kernel void m01750_s04 (KERN_ATTR_BASIC ()) +KERNEL_FQ void m01750_s04 (KERN_ATTR_BASIC ()) { /** * base @@ -608,7 +608,7 @@ __kernel void m01750_s04 (KERN_ATTR_BASIC ()) m01750s (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_extra0_buf, d_extra1_buf, d_extra2_buf, d_extra3_buf, bitmap_mask, bitmap_shift1, bitmap_shift2, salt_pos, loop_pos, loop_cnt, il_cnt, digests_cnt, digests_offset, combs_mode, gid_max); } -__kernel void m01750_s08 (KERN_ATTR_BASIC ()) +KERNEL_FQ void m01750_s08 (KERN_ATTR_BASIC ()) { /** * base @@ -655,7 +655,7 @@ __kernel void m01750_s08 (KERN_ATTR_BASIC ()) m01750s (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_extra0_buf, d_extra1_buf, d_extra2_buf, d_extra3_buf, bitmap_mask, bitmap_shift1, bitmap_shift2, salt_pos, loop_pos, loop_cnt, il_cnt, digests_cnt, digests_offset, combs_mode, gid_max); } -__kernel void m01750_s16 (KERN_ATTR_BASIC ()) +KERNEL_FQ void m01750_s16 (KERN_ATTR_BASIC ()) { /** * base diff --git a/OpenCL/m01750_a3-pure.cl b/OpenCL/m01750_a3-pure.cl index 9e53c0f42..a3b8bc485 100644 --- a/OpenCL/m01750_a3-pure.cl +++ b/OpenCL/m01750_a3-pure.cl @@ -13,7 +13,7 @@ #include "inc_hash_sha512.cl" #endif -__kernel void m01750_mxx (KERN_ATTR_VECTOR ()) +KERNEL_FQ void m01750_mxx (KERN_ATTR_VECTOR ()) { /** * modifier @@ -77,7 +77,7 @@ __kernel void m01750_mxx (KERN_ATTR_VECTOR ()) } } -__kernel void m01750_sxx (KERN_ATTR_VECTOR ()) +KERNEL_FQ void m01750_sxx (KERN_ATTR_VECTOR ()) { /** * modifier diff --git a/OpenCL/m01760_a0-optimized.cl b/OpenCL/m01760_a0-optimized.cl index 9117fc862..6152118f9 100644 --- a/OpenCL/m01760_a0-optimized.cl +++ b/OpenCL/m01760_a0-optimized.cl @@ -190,7 +190,7 @@ DECLSPEC void hmac_sha512_run (u32x *w0, u32x *w1, u32x *w2, u32x *w3, u64x *ipa sha512_transform_transport_vector (w0_t, w1_t, w2_t, w3_t, digest); } -__kernel void m01760_m04 (KERN_ATTR_RULES ()) +KERNEL_FQ void m01760_m04 (KERN_ATTR_RULES ()) { /** * modifier @@ -324,15 +324,15 @@ __kernel void m01760_m04 (KERN_ATTR_RULES ()) } } -__kernel void m01760_m08 (KERN_ATTR_RULES ()) +KERNEL_FQ void m01760_m08 (KERN_ATTR_RULES ()) { } -__kernel void m01760_m16 (KERN_ATTR_RULES ()) +KERNEL_FQ void m01760_m16 (KERN_ATTR_RULES ()) { } -__kernel void m01760_s04 (KERN_ATTR_RULES ()) +KERNEL_FQ void m01760_s04 (KERN_ATTR_RULES ()) { /** * modifier @@ -478,10 +478,10 @@ __kernel void m01760_s04 (KERN_ATTR_RULES ()) } } -__kernel void m01760_s08 (KERN_ATTR_RULES ()) +KERNEL_FQ void m01760_s08 (KERN_ATTR_RULES ()) { } -__kernel void m01760_s16 (KERN_ATTR_RULES ()) +KERNEL_FQ void m01760_s16 (KERN_ATTR_RULES ()) { } diff --git a/OpenCL/m01760_a0-pure.cl b/OpenCL/m01760_a0-pure.cl index e706cdf9c..dd61c3918 100644 --- a/OpenCL/m01760_a0-pure.cl +++ b/OpenCL/m01760_a0-pure.cl @@ -15,7 +15,7 @@ #include "inc_hash_sha512.cl" #endif -__kernel void m01760_mxx (KERN_ATTR_RULES ()) +KERNEL_FQ void m01760_mxx (KERN_ATTR_RULES ()) { /** * modifier @@ -70,7 +70,7 @@ __kernel void m01760_mxx (KERN_ATTR_RULES ()) } } -__kernel void m01760_sxx (KERN_ATTR_RULES ()) +KERNEL_FQ void m01760_sxx (KERN_ATTR_RULES ()) { /** * modifier diff --git a/OpenCL/m01760_a1-optimized.cl b/OpenCL/m01760_a1-optimized.cl index b0a9d7dff..41b0dbb72 100644 --- a/OpenCL/m01760_a1-optimized.cl +++ b/OpenCL/m01760_a1-optimized.cl @@ -188,7 +188,7 @@ DECLSPEC void hmac_sha512_run (u32x *w0, u32x *w1, u32x *w2, u32x *w3, u64x *ipa sha512_transform_transport_vector (w0_t, w1_t, w2_t, w3_t, digest); } -__kernel void m01760_m04 (KERN_ATTR_BASIC ()) +KERNEL_FQ void m01760_m04 (KERN_ATTR_BASIC ()) { /** * modifier @@ -382,15 +382,15 @@ __kernel void m01760_m04 (KERN_ATTR_BASIC ()) } } -__kernel void m01760_m08 (KERN_ATTR_BASIC ()) +KERNEL_FQ void m01760_m08 (KERN_ATTR_BASIC ()) { } -__kernel void m01760_m16 (KERN_ATTR_BASIC ()) +KERNEL_FQ void m01760_m16 (KERN_ATTR_BASIC ()) { } -__kernel void m01760_s04 (KERN_ATTR_BASIC ()) +KERNEL_FQ void m01760_s04 (KERN_ATTR_BASIC ()) { /** * modifier @@ -596,10 +596,10 @@ __kernel void m01760_s04 (KERN_ATTR_BASIC ()) } } -__kernel void m01760_s08 (KERN_ATTR_BASIC ()) +KERNEL_FQ void m01760_s08 (KERN_ATTR_BASIC ()) { } -__kernel void m01760_s16 (KERN_ATTR_BASIC ()) +KERNEL_FQ void m01760_s16 (KERN_ATTR_BASIC ()) { } diff --git a/OpenCL/m01760_a1-pure.cl b/OpenCL/m01760_a1-pure.cl index c36ae49fe..359f4fe69 100644 --- a/OpenCL/m01760_a1-pure.cl +++ b/OpenCL/m01760_a1-pure.cl @@ -13,7 +13,7 @@ #include "inc_hash_sha512.cl" #endif -__kernel void m01760_mxx (KERN_ATTR_BASIC ()) +KERNEL_FQ void m01760_mxx (KERN_ATTR_BASIC ()) { /** * modifier @@ -93,7 +93,7 @@ __kernel void m01760_mxx (KERN_ATTR_BASIC ()) } } -__kernel void m01760_sxx (KERN_ATTR_BASIC ()) +KERNEL_FQ void m01760_sxx (KERN_ATTR_BASIC ()) { /** * modifier diff --git a/OpenCL/m01760_a3-optimized.cl b/OpenCL/m01760_a3-optimized.cl index e95250b0f..c410bd1a9 100644 --- a/OpenCL/m01760_a3-optimized.cl +++ b/OpenCL/m01760_a3-optimized.cl @@ -420,7 +420,7 @@ DECLSPEC void m01760s (u32 *w0, u32 *w1, u32 *w2, u32 *w3, const u32 pw_len, KER } } -__kernel void m01760_m04 (KERN_ATTR_BASIC ()) +KERNEL_FQ void m01760_m04 (KERN_ATTR_BASIC ()) { /** * base @@ -467,7 +467,7 @@ __kernel void m01760_m04 (KERN_ATTR_BASIC ()) m01760m (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_extra0_buf, d_extra1_buf, d_extra2_buf, d_extra3_buf, bitmap_mask, bitmap_shift1, bitmap_shift2, salt_pos, loop_pos, loop_cnt, il_cnt, digests_cnt, digests_offset, combs_mode, gid_max); } -__kernel void m01760_m08 (KERN_ATTR_BASIC ()) +KERNEL_FQ void m01760_m08 (KERN_ATTR_BASIC ()) { /** * base @@ -514,7 +514,7 @@ __kernel void m01760_m08 (KERN_ATTR_BASIC ()) m01760m (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_extra0_buf, d_extra1_buf, d_extra2_buf, d_extra3_buf, bitmap_mask, bitmap_shift1, bitmap_shift2, salt_pos, loop_pos, loop_cnt, il_cnt, digests_cnt, digests_offset, combs_mode, gid_max); } -__kernel void m01760_m16 (KERN_ATTR_BASIC ()) +KERNEL_FQ void m01760_m16 (KERN_ATTR_BASIC ()) { /** * base @@ -561,7 +561,7 @@ __kernel void m01760_m16 (KERN_ATTR_BASIC ()) m01760m (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_extra0_buf, d_extra1_buf, d_extra2_buf, d_extra3_buf, bitmap_mask, bitmap_shift1, bitmap_shift2, salt_pos, loop_pos, loop_cnt, il_cnt, digests_cnt, digests_offset, combs_mode, gid_max); } -__kernel void m01760_s04 (KERN_ATTR_BASIC ()) +KERNEL_FQ void m01760_s04 (KERN_ATTR_BASIC ()) { /** * base @@ -608,7 +608,7 @@ __kernel void m01760_s04 (KERN_ATTR_BASIC ()) m01760s (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_extra0_buf, d_extra1_buf, d_extra2_buf, d_extra3_buf, bitmap_mask, bitmap_shift1, bitmap_shift2, salt_pos, loop_pos, loop_cnt, il_cnt, digests_cnt, digests_offset, combs_mode, gid_max); } -__kernel void m01760_s08 (KERN_ATTR_BASIC ()) +KERNEL_FQ void m01760_s08 (KERN_ATTR_BASIC ()) { /** * base @@ -655,7 +655,7 @@ __kernel void m01760_s08 (KERN_ATTR_BASIC ()) m01760s (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_extra0_buf, d_extra1_buf, d_extra2_buf, d_extra3_buf, bitmap_mask, bitmap_shift1, bitmap_shift2, salt_pos, loop_pos, loop_cnt, il_cnt, digests_cnt, digests_offset, combs_mode, gid_max); } -__kernel void m01760_s16 (KERN_ATTR_BASIC ()) +KERNEL_FQ void m01760_s16 (KERN_ATTR_BASIC ()) { /** * base diff --git a/OpenCL/m01760_a3-pure.cl b/OpenCL/m01760_a3-pure.cl index 4171c6928..cf57a09ed 100644 --- a/OpenCL/m01760_a3-pure.cl +++ b/OpenCL/m01760_a3-pure.cl @@ -13,7 +13,7 @@ #include "inc_hash_sha512.cl" #endif -__kernel void m01760_mxx (KERN_ATTR_VECTOR ()) +KERNEL_FQ void m01760_mxx (KERN_ATTR_VECTOR ()) { /** * modifier @@ -79,7 +79,7 @@ __kernel void m01760_mxx (KERN_ATTR_VECTOR ()) } } -__kernel void m01760_sxx (KERN_ATTR_VECTOR ()) +KERNEL_FQ void m01760_sxx (KERN_ATTR_VECTOR ()) { /** * modifier diff --git a/OpenCL/m01800-optimized.cl b/OpenCL/m01800-optimized.cl index 96317b480..5029e1d64 100644 --- a/OpenCL/m01800-optimized.cl +++ b/OpenCL/m01800-optimized.cl @@ -170,7 +170,7 @@ DECLSPEC void orig_sha512_final (orig_sha512_ctx_t *sha512_ctx) sha512_transform_transport (sha512_ctx->buf, sha512_ctx->state); } -__kernel void m01800_init (KERN_ATTR_TMPS (sha512crypt_tmp_t)) +KERNEL_FQ void m01800_init (KERN_ATTR_TMPS (sha512crypt_tmp_t)) { /** * base @@ -299,7 +299,7 @@ __kernel void m01800_init (KERN_ATTR_TMPS (sha512crypt_tmp_t)) tmps[gid].l_s_bytes[1] = sha512_ctx.state[1]; } -__kernel void m01800_loop (KERN_ATTR_TMPS (sha512crypt_tmp_t)) +KERNEL_FQ void m01800_loop (KERN_ATTR_TMPS (sha512crypt_tmp_t)) { /** * base @@ -476,7 +476,7 @@ __kernel void m01800_loop (KERN_ATTR_TMPS (sha512crypt_tmp_t)) tmps[gid].l_alt_result[7] = l_alt_result[7]; } -__kernel void m01800_comp (KERN_ATTR_TMPS (sha512crypt_tmp_t)) +KERNEL_FQ void m01800_comp (KERN_ATTR_TMPS (sha512crypt_tmp_t)) { /** * base diff --git a/OpenCL/m01800-pure.cl b/OpenCL/m01800-pure.cl index 1e6a837ec..494c1f6a5 100644 --- a/OpenCL/m01800-pure.cl +++ b/OpenCL/m01800-pure.cl @@ -27,7 +27,7 @@ typedef struct sha512crypt_tmp } sha512crypt_tmp_t; -__kernel void m01800_init (KERN_ATTR_TMPS (sha512crypt_tmp_t)) +KERNEL_FQ void m01800_init (KERN_ATTR_TMPS (sha512crypt_tmp_t)) { /** * base @@ -312,7 +312,7 @@ __kernel void m01800_init (KERN_ATTR_TMPS (sha512crypt_tmp_t)) for (int i = 0; i < 64; i++) tmps[gid].s_bytes[i] = s_final[i]; } -__kernel void m01800_loop (KERN_ATTR_TMPS (sha512crypt_tmp_t)) +KERNEL_FQ void m01800_loop (KERN_ATTR_TMPS (sha512crypt_tmp_t)) { /** * base @@ -396,7 +396,7 @@ __kernel void m01800_loop (KERN_ATTR_TMPS (sha512crypt_tmp_t)) for (int i = 0; i < 16; i++) tmps[gid].alt_result[i] = alt_result[i]; } -__kernel void m01800_comp (KERN_ATTR_TMPS (sha512crypt_tmp_t)) +KERNEL_FQ void m01800_comp (KERN_ATTR_TMPS (sha512crypt_tmp_t)) { /** * base diff --git a/OpenCL/m02000_a0-pure.cl b/OpenCL/m02000_a0-pure.cl index 1cdd3f75f..fe5c937a3 100644 --- a/OpenCL/m02000_a0-pure.cl +++ b/OpenCL/m02000_a0-pure.cl @@ -9,10 +9,10 @@ #include "inc_common.cl" #endif -__kernel void m02000_mxx (KERN_ATTR_BASIC ()) +KERNEL_FQ void m02000_mxx (KERN_ATTR_BASIC ()) { } -__kernel void m02000_sxx (KERN_ATTR_BASIC ()) +KERNEL_FQ void m02000_sxx (KERN_ATTR_BASIC ()) { } diff --git a/OpenCL/m02000_a1-pure.cl b/OpenCL/m02000_a1-pure.cl index 1cdd3f75f..fe5c937a3 100644 --- a/OpenCL/m02000_a1-pure.cl +++ b/OpenCL/m02000_a1-pure.cl @@ -9,10 +9,10 @@ #include "inc_common.cl" #endif -__kernel void m02000_mxx (KERN_ATTR_BASIC ()) +KERNEL_FQ void m02000_mxx (KERN_ATTR_BASIC ()) { } -__kernel void m02000_sxx (KERN_ATTR_BASIC ()) +KERNEL_FQ void m02000_sxx (KERN_ATTR_BASIC ()) { } diff --git a/OpenCL/m02000_a3-pure.cl b/OpenCL/m02000_a3-pure.cl index 1cdd3f75f..fe5c937a3 100644 --- a/OpenCL/m02000_a3-pure.cl +++ b/OpenCL/m02000_a3-pure.cl @@ -9,10 +9,10 @@ #include "inc_common.cl" #endif -__kernel void m02000_mxx (KERN_ATTR_BASIC ()) +KERNEL_FQ void m02000_mxx (KERN_ATTR_BASIC ()) { } -__kernel void m02000_sxx (KERN_ATTR_BASIC ()) +KERNEL_FQ void m02000_sxx (KERN_ATTR_BASIC ()) { } diff --git a/OpenCL/m02100-pure.cl b/OpenCL/m02100-pure.cl index 71a87e03c..8564e86ec 100644 --- a/OpenCL/m02100-pure.cl +++ b/OpenCL/m02100-pure.cl @@ -63,7 +63,7 @@ DECLSPEC void hmac_sha1_run_V (u32x *w0, u32x *w1, u32x *w2, u32x *w3, u32x *ipa sha1_transform_vector (w0, w1, w2, w3, digest); } -__kernel void m02100_init (KERN_ATTR_TMPS (dcc2_tmp_t)) +KERNEL_FQ void m02100_init (KERN_ATTR_TMPS (dcc2_tmp_t)) { /** * base @@ -178,7 +178,7 @@ __kernel void m02100_init (KERN_ATTR_TMPS (dcc2_tmp_t)) tmps[gid].out[3] = tmps[gid].dgst[3]; } -__kernel void m02100_loop (KERN_ATTR_TMPS (dcc2_tmp_t)) +KERNEL_FQ void m02100_loop (KERN_ATTR_TMPS (dcc2_tmp_t)) { /** * base @@ -265,7 +265,7 @@ __kernel void m02100_loop (KERN_ATTR_TMPS (dcc2_tmp_t)) unpackv (tmps, out, gid, 3, out[3]); } -__kernel void m02100_comp (KERN_ATTR_TMPS (dcc2_tmp_t)) +KERNEL_FQ void m02100_comp (KERN_ATTR_TMPS (dcc2_tmp_t)) { /** * base diff --git a/OpenCL/m02400_a0-optimized.cl b/OpenCL/m02400_a0-optimized.cl index 16fec9757..662659944 100644 --- a/OpenCL/m02400_a0-optimized.cl +++ b/OpenCL/m02400_a0-optimized.cl @@ -15,7 +15,7 @@ #include "inc_hash_md5.cl" #endif -__kernel void m02400_m04 (KERN_ATTR_RULES ()) +KERNEL_FQ void m02400_m04 (KERN_ATTR_RULES ()) { /** * modifier @@ -176,15 +176,15 @@ __kernel void m02400_m04 (KERN_ATTR_RULES ()) } } -__kernel void m02400_m08 (KERN_ATTR_RULES ()) +KERNEL_FQ void m02400_m08 (KERN_ATTR_RULES ()) { } -__kernel void m02400_m16 (KERN_ATTR_RULES ()) +KERNEL_FQ void m02400_m16 (KERN_ATTR_RULES ()) { } -__kernel void m02400_s04 (KERN_ATTR_RULES ()) +KERNEL_FQ void m02400_s04 (KERN_ATTR_RULES ()) { /** * modifier @@ -360,10 +360,10 @@ __kernel void m02400_s04 (KERN_ATTR_RULES ()) } } -__kernel void m02400_s08 (KERN_ATTR_RULES ()) +KERNEL_FQ void m02400_s08 (KERN_ATTR_RULES ()) { } -__kernel void m02400_s16 (KERN_ATTR_RULES ()) +KERNEL_FQ void m02400_s16 (KERN_ATTR_RULES ()) { } diff --git a/OpenCL/m02400_a1-optimized.cl b/OpenCL/m02400_a1-optimized.cl index 0822a17ea..286efdaba 100644 --- a/OpenCL/m02400_a1-optimized.cl +++ b/OpenCL/m02400_a1-optimized.cl @@ -13,7 +13,7 @@ #include "inc_hash_md5.cl" #endif -__kernel void m02400_m04 (KERN_ATTR_BASIC ()) +KERNEL_FQ void m02400_m04 (KERN_ATTR_BASIC ()) { /** * modifier @@ -238,15 +238,15 @@ __kernel void m02400_m04 (KERN_ATTR_BASIC ()) } } -__kernel void m02400_m08 (KERN_ATTR_BASIC ()) +KERNEL_FQ void m02400_m08 (KERN_ATTR_BASIC ()) { } -__kernel void m02400_m16 (KERN_ATTR_BASIC ()) +KERNEL_FQ void m02400_m16 (KERN_ATTR_BASIC ()) { } -__kernel void m02400_s04 (KERN_ATTR_BASIC ()) +KERNEL_FQ void m02400_s04 (KERN_ATTR_BASIC ()) { /** * modifier @@ -486,10 +486,10 @@ __kernel void m02400_s04 (KERN_ATTR_BASIC ()) } } -__kernel void m02400_s08 (KERN_ATTR_BASIC ()) +KERNEL_FQ void m02400_s08 (KERN_ATTR_BASIC ()) { } -__kernel void m02400_s16 (KERN_ATTR_BASIC ()) +KERNEL_FQ void m02400_s16 (KERN_ATTR_BASIC ()) { } diff --git a/OpenCL/m02400_a3-optimized.cl b/OpenCL/m02400_a3-optimized.cl index 432187222..66fa42907 100644 --- a/OpenCL/m02400_a3-optimized.cl +++ b/OpenCL/m02400_a3-optimized.cl @@ -458,7 +458,7 @@ DECLSPEC void m02400s (u32 *w, const u32 pw_len, KERN_ATTR_VECTOR ()) } } -__kernel void m02400_m04 (KERN_ATTR_VECTOR ()) +KERNEL_FQ void m02400_m04 (KERN_ATTR_VECTOR ()) { /** * base @@ -496,7 +496,7 @@ __kernel void m02400_m04 (KERN_ATTR_VECTOR ()) m02400m (w, pw_len, pws, rules_buf, combs_buf, words_buf_r, 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_extra0_buf, d_extra1_buf, d_extra2_buf, d_extra3_buf, bitmap_mask, bitmap_shift1, bitmap_shift2, salt_pos, loop_pos, loop_cnt, il_cnt, digests_cnt, digests_offset, combs_mode, gid_max); } -__kernel void m02400_m08 (KERN_ATTR_VECTOR ()) +KERNEL_FQ void m02400_m08 (KERN_ATTR_VECTOR ()) { /** * base @@ -534,7 +534,7 @@ __kernel void m02400_m08 (KERN_ATTR_VECTOR ()) m02400m (w, pw_len, pws, rules_buf, combs_buf, words_buf_r, 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_extra0_buf, d_extra1_buf, d_extra2_buf, d_extra3_buf, bitmap_mask, bitmap_shift1, bitmap_shift2, salt_pos, loop_pos, loop_cnt, il_cnt, digests_cnt, digests_offset, combs_mode, gid_max); } -__kernel void m02400_m16 (KERN_ATTR_VECTOR ()) +KERNEL_FQ void m02400_m16 (KERN_ATTR_VECTOR ()) { /** * base @@ -572,7 +572,7 @@ __kernel void m02400_m16 (KERN_ATTR_VECTOR ()) m02400m (w, pw_len, pws, rules_buf, combs_buf, words_buf_r, 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_extra0_buf, d_extra1_buf, d_extra2_buf, d_extra3_buf, bitmap_mask, bitmap_shift1, bitmap_shift2, salt_pos, loop_pos, loop_cnt, il_cnt, digests_cnt, digests_offset, combs_mode, gid_max); } -__kernel void m02400_s04 (KERN_ATTR_VECTOR ()) +KERNEL_FQ void m02400_s04 (KERN_ATTR_VECTOR ()) { /** * base @@ -610,7 +610,7 @@ __kernel void m02400_s04 (KERN_ATTR_VECTOR ()) m02400s (w, pw_len, pws, rules_buf, combs_buf, words_buf_r, 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_extra0_buf, d_extra1_buf, d_extra2_buf, d_extra3_buf, bitmap_mask, bitmap_shift1, bitmap_shift2, salt_pos, loop_pos, loop_cnt, il_cnt, digests_cnt, digests_offset, combs_mode, gid_max); } -__kernel void m02400_s08 (KERN_ATTR_VECTOR ()) +KERNEL_FQ void m02400_s08 (KERN_ATTR_VECTOR ()) { /** * base @@ -648,7 +648,7 @@ __kernel void m02400_s08 (KERN_ATTR_VECTOR ()) m02400s (w, pw_len, pws, rules_buf, combs_buf, words_buf_r, 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_extra0_buf, d_extra1_buf, d_extra2_buf, d_extra3_buf, bitmap_mask, bitmap_shift1, bitmap_shift2, salt_pos, loop_pos, loop_cnt, il_cnt, digests_cnt, digests_offset, combs_mode, gid_max); } -__kernel void m02400_s16 (KERN_ATTR_VECTOR ()) +KERNEL_FQ void m02400_s16 (KERN_ATTR_VECTOR ()) { /** * base diff --git a/OpenCL/m02410_a0-optimized.cl b/OpenCL/m02410_a0-optimized.cl index 75cfa39c4..18dc15094 100644 --- a/OpenCL/m02410_a0-optimized.cl +++ b/OpenCL/m02410_a0-optimized.cl @@ -15,7 +15,7 @@ #include "inc_hash_md5.cl" #endif -__kernel void m02410_m04 (KERN_ATTR_RULES ()) +KERNEL_FQ void m02410_m04 (KERN_ATTR_RULES ()) { /** * modifier @@ -255,15 +255,15 @@ __kernel void m02410_m04 (KERN_ATTR_RULES ()) } } -__kernel void m02410_m08 (KERN_ATTR_RULES ()) +KERNEL_FQ void m02410_m08 (KERN_ATTR_RULES ()) { } -__kernel void m02410_m16 (KERN_ATTR_RULES ()) +KERNEL_FQ void m02410_m16 (KERN_ATTR_RULES ()) { } -__kernel void m02410_s04 (KERN_ATTR_RULES ()) +KERNEL_FQ void m02410_s04 (KERN_ATTR_RULES ()) { /** * modifier @@ -518,10 +518,10 @@ __kernel void m02410_s04 (KERN_ATTR_RULES ()) } } -__kernel void m02410_s08 (KERN_ATTR_RULES ()) +KERNEL_FQ void m02410_s08 (KERN_ATTR_RULES ()) { } -__kernel void m02410_s16 (KERN_ATTR_RULES ()) +KERNEL_FQ void m02410_s16 (KERN_ATTR_RULES ()) { } diff --git a/OpenCL/m02410_a1-optimized.cl b/OpenCL/m02410_a1-optimized.cl index 2fcf292a7..753461bef 100644 --- a/OpenCL/m02410_a1-optimized.cl +++ b/OpenCL/m02410_a1-optimized.cl @@ -13,7 +13,7 @@ #include "inc_hash_md5.cl" #endif -__kernel void m02410_m04 (KERN_ATTR_BASIC ()) +KERNEL_FQ void m02410_m04 (KERN_ATTR_BASIC ()) { /** * modifier @@ -313,15 +313,15 @@ __kernel void m02410_m04 (KERN_ATTR_BASIC ()) } } -__kernel void m02410_m08 (KERN_ATTR_BASIC ()) +KERNEL_FQ void m02410_m08 (KERN_ATTR_BASIC ()) { } -__kernel void m02410_m16 (KERN_ATTR_BASIC ()) +KERNEL_FQ void m02410_m16 (KERN_ATTR_BASIC ()) { } -__kernel void m02410_s04 (KERN_ATTR_BASIC ()) +KERNEL_FQ void m02410_s04 (KERN_ATTR_BASIC ()) { /** * modifier @@ -636,10 +636,10 @@ __kernel void m02410_s04 (KERN_ATTR_BASIC ()) } } -__kernel void m02410_s08 (KERN_ATTR_BASIC ()) +KERNEL_FQ void m02410_s08 (KERN_ATTR_BASIC ()) { } -__kernel void m02410_s16 (KERN_ATTR_BASIC ()) +KERNEL_FQ void m02410_s16 (KERN_ATTR_BASIC ()) { } diff --git a/OpenCL/m02410_a3-optimized.cl b/OpenCL/m02410_a3-optimized.cl index 2586ccf04..76b7eb086 100644 --- a/OpenCL/m02410_a3-optimized.cl +++ b/OpenCL/m02410_a3-optimized.cl @@ -556,7 +556,7 @@ DECLSPEC void m02410s (u32 *w, const u32 pw_len, KERN_ATTR_VECTOR ()) } } -__kernel void m02410_m04 (KERN_ATTR_VECTOR ()) +KERNEL_FQ void m02410_m04 (KERN_ATTR_VECTOR ()) { /** * base @@ -594,7 +594,7 @@ __kernel void m02410_m04 (KERN_ATTR_VECTOR ()) m02410m (w, pw_len, pws, rules_buf, combs_buf, words_buf_r, 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_extra0_buf, d_extra1_buf, d_extra2_buf, d_extra3_buf, bitmap_mask, bitmap_shift1, bitmap_shift2, salt_pos, loop_pos, loop_cnt, il_cnt, digests_cnt, digests_offset, combs_mode, gid_max); } -__kernel void m02410_m08 (KERN_ATTR_VECTOR ()) +KERNEL_FQ void m02410_m08 (KERN_ATTR_VECTOR ()) { /** * base @@ -632,7 +632,7 @@ __kernel void m02410_m08 (KERN_ATTR_VECTOR ()) m02410m (w, pw_len, pws, rules_buf, combs_buf, words_buf_r, 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_extra0_buf, d_extra1_buf, d_extra2_buf, d_extra3_buf, bitmap_mask, bitmap_shift1, bitmap_shift2, salt_pos, loop_pos, loop_cnt, il_cnt, digests_cnt, digests_offset, combs_mode, gid_max); } -__kernel void m02410_m16 (KERN_ATTR_VECTOR ()) +KERNEL_FQ void m02410_m16 (KERN_ATTR_VECTOR ()) { /** * base @@ -670,7 +670,7 @@ __kernel void m02410_m16 (KERN_ATTR_VECTOR ()) m02410m (w, pw_len, pws, rules_buf, combs_buf, words_buf_r, 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_extra0_buf, d_extra1_buf, d_extra2_buf, d_extra3_buf, bitmap_mask, bitmap_shift1, bitmap_shift2, salt_pos, loop_pos, loop_cnt, il_cnt, digests_cnt, digests_offset, combs_mode, gid_max); } -__kernel void m02410_s04 (KERN_ATTR_VECTOR ()) +KERNEL_FQ void m02410_s04 (KERN_ATTR_VECTOR ()) { /** * base @@ -708,7 +708,7 @@ __kernel void m02410_s04 (KERN_ATTR_VECTOR ()) m02410s (w, pw_len, pws, rules_buf, combs_buf, words_buf_r, 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_extra0_buf, d_extra1_buf, d_extra2_buf, d_extra3_buf, bitmap_mask, bitmap_shift1, bitmap_shift2, salt_pos, loop_pos, loop_cnt, il_cnt, digests_cnt, digests_offset, combs_mode, gid_max); } -__kernel void m02410_s08 (KERN_ATTR_VECTOR ()) +KERNEL_FQ void m02410_s08 (KERN_ATTR_VECTOR ()) { /** * base @@ -746,7 +746,7 @@ __kernel void m02410_s08 (KERN_ATTR_VECTOR ()) m02410s (w, pw_len, pws, rules_buf, combs_buf, words_buf_r, 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_extra0_buf, d_extra1_buf, d_extra2_buf, d_extra3_buf, bitmap_mask, bitmap_shift1, bitmap_shift2, salt_pos, loop_pos, loop_cnt, il_cnt, digests_cnt, digests_offset, combs_mode, gid_max); } -__kernel void m02410_s16 (KERN_ATTR_VECTOR ()) +KERNEL_FQ void m02410_s16 (KERN_ATTR_VECTOR ()) { /** * base diff --git a/OpenCL/m02500-pure.cl b/OpenCL/m02500-pure.cl index 7052a02b2..ec0705527 100644 --- a/OpenCL/m02500-pure.cl +++ b/OpenCL/m02500-pure.cl @@ -118,7 +118,7 @@ DECLSPEC void hmac_sha1_run_V (u32x *w0, u32x *w1, u32x *w2, u32x *w3, u32x *ipa sha1_transform_vector (w0, w1, w2, w3, digest); } -__kernel void m02500_init (KERN_ATTR_TMPS_ESALT (wpa_pbkdf2_tmp_t, wpa_eapol_t)) +KERNEL_FQ void m02500_init (KERN_ATTR_TMPS_ESALT (wpa_pbkdf2_tmp_t, wpa_eapol_t)) { /** * base @@ -190,7 +190,7 @@ __kernel void m02500_init (KERN_ATTR_TMPS_ESALT (wpa_pbkdf2_tmp_t, wpa_eapol_t)) } } -__kernel void m02500_loop (KERN_ATTR_TMPS_ESALT (wpa_pbkdf2_tmp_t, wpa_eapol_t)) +KERNEL_FQ void m02500_loop (KERN_ATTR_TMPS_ESALT (wpa_pbkdf2_tmp_t, wpa_eapol_t)) { const u64 gid = get_global_id (0); @@ -275,12 +275,12 @@ __kernel void m02500_loop (KERN_ATTR_TMPS_ESALT (wpa_pbkdf2_tmp_t, wpa_eapol_t)) } } -__kernel void m02500_comp (KERN_ATTR_TMPS_ESALT (wpa_pbkdf2_tmp_t, wpa_eapol_t)) +KERNEL_FQ void m02500_comp (KERN_ATTR_TMPS_ESALT (wpa_pbkdf2_tmp_t, wpa_eapol_t)) { // not in use here, special case... } -__kernel void m02500_aux1 (KERN_ATTR_TMPS_ESALT (wpa_pbkdf2_tmp_t, wpa_eapol_t)) +KERNEL_FQ void m02500_aux1 (KERN_ATTR_TMPS_ESALT (wpa_pbkdf2_tmp_t, wpa_eapol_t)) { const u64 gid = get_global_id (0); const u64 lid = get_local_id (0); @@ -302,7 +302,7 @@ __kernel void m02500_aux1 (KERN_ATTR_TMPS_ESALT (wpa_pbkdf2_tmp_t, wpa_eapol_t)) const u32 digest_cur = digests_offset + digest_pos; - __global const wpa_eapol_t *wpa_eapol = &esalt_bufs[digest_cur]; + GLOBAL_AS const wpa_eapol_t *wpa_eapol = &esalt_bufs[digest_cur]; u32 pke[32]; @@ -591,7 +591,7 @@ __kernel void m02500_aux1 (KERN_ATTR_TMPS_ESALT (wpa_pbkdf2_tmp_t, wpa_eapol_t)) } } -__kernel void m02500_aux2 (KERN_ATTR_TMPS_ESALT (wpa_pbkdf2_tmp_t, wpa_eapol_t)) +KERNEL_FQ void m02500_aux2 (KERN_ATTR_TMPS_ESALT (wpa_pbkdf2_tmp_t, wpa_eapol_t)) { const u64 gid = get_global_id (0); const u64 lid = get_local_id (0); @@ -613,7 +613,7 @@ __kernel void m02500_aux2 (KERN_ATTR_TMPS_ESALT (wpa_pbkdf2_tmp_t, wpa_eapol_t)) const u32 digest_cur = digests_offset + digest_pos; - __global const wpa_eapol_t *wpa_eapol = &esalt_bufs[digest_cur]; + GLOBAL_AS const wpa_eapol_t *wpa_eapol = &esalt_bufs[digest_cur]; u32 pke[32]; @@ -902,7 +902,7 @@ __kernel void m02500_aux2 (KERN_ATTR_TMPS_ESALT (wpa_pbkdf2_tmp_t, wpa_eapol_t)) } } -__kernel void m02500_aux3 (KERN_ATTR_TMPS_ESALT (wpa_pbkdf2_tmp_t, wpa_eapol_t)) +KERNEL_FQ void m02500_aux3 (KERN_ATTR_TMPS_ESALT (wpa_pbkdf2_tmp_t, wpa_eapol_t)) { const u64 gid = get_global_id (0); const u64 lid = get_local_id (0); @@ -914,17 +914,17 @@ __kernel void m02500_aux3 (KERN_ATTR_TMPS_ESALT (wpa_pbkdf2_tmp_t, wpa_eapol_t)) #ifdef REAL_SHM - __local u32 s_td0[256]; - __local u32 s_td1[256]; - __local u32 s_td2[256]; - __local u32 s_td3[256]; - __local u32 s_td4[256]; + LOCAL_AS u32 s_td0[256]; + LOCAL_AS u32 s_td1[256]; + LOCAL_AS u32 s_td2[256]; + LOCAL_AS u32 s_td3[256]; + LOCAL_AS u32 s_td4[256]; - __local u32 s_te0[256]; - __local u32 s_te1[256]; - __local u32 s_te2[256]; - __local u32 s_te3[256]; - __local u32 s_te4[256]; + LOCAL_AS u32 s_te0[256]; + LOCAL_AS u32 s_te1[256]; + LOCAL_AS u32 s_te2[256]; + LOCAL_AS u32 s_te3[256]; + LOCAL_AS u32 s_te4[256]; for (u32 i = lid; i < 256; i += lsz) { @@ -945,17 +945,17 @@ __kernel void m02500_aux3 (KERN_ATTR_TMPS_ESALT (wpa_pbkdf2_tmp_t, wpa_eapol_t)) #else - __constant u32a *s_td0 = td0; - __constant u32a *s_td1 = td1; - __constant u32a *s_td2 = td2; - __constant u32a *s_td3 = td3; - __constant u32a *s_td4 = td4; + CONSTANT_AS u32a *s_td0 = td0; + CONSTANT_AS u32a *s_td1 = td1; + CONSTANT_AS u32a *s_td2 = td2; + CONSTANT_AS u32a *s_td3 = td3; + CONSTANT_AS u32a *s_td4 = td4; - __constant u32a *s_te0 = te0; - __constant u32a *s_te1 = te1; - __constant u32a *s_te2 = te2; - __constant u32a *s_te3 = te3; - __constant u32a *s_te4 = te4; + CONSTANT_AS u32a *s_te0 = te0; + CONSTANT_AS u32a *s_te1 = te1; + CONSTANT_AS u32a *s_te2 = te2; + CONSTANT_AS u32a *s_te3 = te3; + CONSTANT_AS u32a *s_te4 = te4; #endif @@ -976,7 +976,7 @@ __kernel void m02500_aux3 (KERN_ATTR_TMPS_ESALT (wpa_pbkdf2_tmp_t, wpa_eapol_t)) const u32 digest_cur = digests_offset + digest_pos; - __global const wpa_eapol_t *wpa_eapol = &esalt_bufs[digest_cur]; + GLOBAL_AS const wpa_eapol_t *wpa_eapol = &esalt_bufs[digest_cur]; u32 pke[32]; diff --git a/OpenCL/m02501-pure.cl b/OpenCL/m02501-pure.cl index ab5dceb65..b636615c1 100644 --- a/OpenCL/m02501-pure.cl +++ b/OpenCL/m02501-pure.cl @@ -93,7 +93,7 @@ DECLSPEC void make_kn (u32 *k) k[3] ^= c * 0x87000000; } -__kernel void m02501_init (KERN_ATTR_TMPS_ESALT (wpa_pmk_tmp_t, wpa_eapol_t)) +KERNEL_FQ void m02501_init (KERN_ATTR_TMPS_ESALT (wpa_pmk_tmp_t, wpa_eapol_t)) { const u64 gid = get_global_id (0); @@ -139,19 +139,19 @@ __kernel void m02501_init (KERN_ATTR_TMPS_ESALT (wpa_pmk_tmp_t, wpa_eapol_t)) tmps[gid].out[7] = swap32_S (out[7]); } -__kernel void m02501_loop (KERN_ATTR_TMPS_ESALT (wpa_pmk_tmp_t, wpa_eapol_t)) +KERNEL_FQ void m02501_loop (KERN_ATTR_TMPS_ESALT (wpa_pmk_tmp_t, wpa_eapol_t)) { const u64 gid = get_global_id (0); if (gid >= gid_max) return; } -__kernel void m02501_comp (KERN_ATTR_TMPS_ESALT (wpa_pmk_tmp_t, wpa_eapol_t)) +KERNEL_FQ void m02501_comp (KERN_ATTR_TMPS_ESALT (wpa_pmk_tmp_t, wpa_eapol_t)) { // not in use here, special case... } -__kernel void m02501_aux1 (KERN_ATTR_TMPS_ESALT (wpa_pmk_tmp_t, wpa_eapol_t)) +KERNEL_FQ void m02501_aux1 (KERN_ATTR_TMPS_ESALT (wpa_pmk_tmp_t, wpa_eapol_t)) { const u64 gid = get_global_id (0); const u64 lid = get_local_id (0); @@ -173,7 +173,7 @@ __kernel void m02501_aux1 (KERN_ATTR_TMPS_ESALT (wpa_pmk_tmp_t, wpa_eapol_t)) const u32 digest_cur = digests_offset + digest_pos; - __global const wpa_eapol_t *wpa_eapol = &esalt_bufs[digest_cur]; + GLOBAL_AS const wpa_eapol_t *wpa_eapol = &esalt_bufs[digest_cur]; u32 pke[32]; @@ -462,7 +462,7 @@ __kernel void m02501_aux1 (KERN_ATTR_TMPS_ESALT (wpa_pmk_tmp_t, wpa_eapol_t)) } } -__kernel void m02501_aux2 (KERN_ATTR_TMPS_ESALT (wpa_pmk_tmp_t, wpa_eapol_t)) +KERNEL_FQ void m02501_aux2 (KERN_ATTR_TMPS_ESALT (wpa_pmk_tmp_t, wpa_eapol_t)) { const u64 gid = get_global_id (0); const u64 lid = get_local_id (0); @@ -484,7 +484,7 @@ __kernel void m02501_aux2 (KERN_ATTR_TMPS_ESALT (wpa_pmk_tmp_t, wpa_eapol_t)) const u32 digest_cur = digests_offset + digest_pos; - __global const wpa_eapol_t *wpa_eapol = &esalt_bufs[digest_cur]; + GLOBAL_AS const wpa_eapol_t *wpa_eapol = &esalt_bufs[digest_cur]; u32 pke[32]; @@ -773,7 +773,7 @@ __kernel void m02501_aux2 (KERN_ATTR_TMPS_ESALT (wpa_pmk_tmp_t, wpa_eapol_t)) } } -__kernel void m02501_aux3 (KERN_ATTR_TMPS_ESALT (wpa_pmk_tmp_t, wpa_eapol_t)) +KERNEL_FQ void m02501_aux3 (KERN_ATTR_TMPS_ESALT (wpa_pmk_tmp_t, wpa_eapol_t)) { const u64 gid = get_global_id (0); const u64 lid = get_local_id (0); @@ -785,17 +785,17 @@ __kernel void m02501_aux3 (KERN_ATTR_TMPS_ESALT (wpa_pmk_tmp_t, wpa_eapol_t)) #ifdef REAL_SHM - __local u32 s_td0[256]; - __local u32 s_td1[256]; - __local u32 s_td2[256]; - __local u32 s_td3[256]; - __local u32 s_td4[256]; + LOCAL_AS u32 s_td0[256]; + LOCAL_AS u32 s_td1[256]; + LOCAL_AS u32 s_td2[256]; + LOCAL_AS u32 s_td3[256]; + LOCAL_AS u32 s_td4[256]; - __local u32 s_te0[256]; - __local u32 s_te1[256]; - __local u32 s_te2[256]; - __local u32 s_te3[256]; - __local u32 s_te4[256]; + LOCAL_AS u32 s_te0[256]; + LOCAL_AS u32 s_te1[256]; + LOCAL_AS u32 s_te2[256]; + LOCAL_AS u32 s_te3[256]; + LOCAL_AS u32 s_te4[256]; for (u32 i = lid; i < 256; i += lsz) { @@ -816,17 +816,17 @@ __kernel void m02501_aux3 (KERN_ATTR_TMPS_ESALT (wpa_pmk_tmp_t, wpa_eapol_t)) #else - __constant u32a *s_td0 = td0; - __constant u32a *s_td1 = td1; - __constant u32a *s_td2 = td2; - __constant u32a *s_td3 = td3; - __constant u32a *s_td4 = td4; + CONSTANT_AS u32a *s_td0 = td0; + CONSTANT_AS u32a *s_td1 = td1; + CONSTANT_AS u32a *s_td2 = td2; + CONSTANT_AS u32a *s_td3 = td3; + CONSTANT_AS u32a *s_td4 = td4; - __constant u32a *s_te0 = te0; - __constant u32a *s_te1 = te1; - __constant u32a *s_te2 = te2; - __constant u32a *s_te3 = te3; - __constant u32a *s_te4 = te4; + CONSTANT_AS u32a *s_te0 = te0; + CONSTANT_AS u32a *s_te1 = te1; + CONSTANT_AS u32a *s_te2 = te2; + CONSTANT_AS u32a *s_te3 = te3; + CONSTANT_AS u32a *s_te4 = te4; #endif @@ -847,7 +847,7 @@ __kernel void m02501_aux3 (KERN_ATTR_TMPS_ESALT (wpa_pmk_tmp_t, wpa_eapol_t)) const u32 digest_cur = digests_offset + digest_pos; - __global const wpa_eapol_t *wpa_eapol = &esalt_bufs[digest_cur]; + GLOBAL_AS const wpa_eapol_t *wpa_eapol = &esalt_bufs[digest_cur]; u32 pke[32]; diff --git a/OpenCL/m02610_a0-optimized.cl b/OpenCL/m02610_a0-optimized.cl index 4697314fa..e99da7a5f 100644 --- a/OpenCL/m02610_a0-optimized.cl +++ b/OpenCL/m02610_a0-optimized.cl @@ -27,7 +27,7 @@ #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 m02610_m04 (KERN_ATTR_RULES ()) +KERNEL_FQ void m02610_m04 (KERN_ATTR_RULES ()) { /** * modifier @@ -41,7 +41,7 @@ __kernel void m02610_m04 (KERN_ATTR_RULES ()) * bin2asc table */ - __local u32 l_bin2asc[256]; + LOCAL_AS u32 l_bin2asc[256]; for (u32 i = lid; i < 256; i += lsz) { @@ -303,15 +303,15 @@ __kernel void m02610_m04 (KERN_ATTR_RULES ()) } } -__kernel void m02610_m08 (KERN_ATTR_RULES ()) +KERNEL_FQ void m02610_m08 (KERN_ATTR_RULES ()) { } -__kernel void m02610_m16 (KERN_ATTR_RULES ()) +KERNEL_FQ void m02610_m16 (KERN_ATTR_RULES ()) { } -__kernel void m02610_s04 (KERN_ATTR_RULES ()) +KERNEL_FQ void m02610_s04 (KERN_ATTR_RULES ()) { /** * modifier @@ -325,7 +325,7 @@ __kernel void m02610_s04 (KERN_ATTR_RULES ()) * bin2asc table */ - __local u32 l_bin2asc[256]; + LOCAL_AS u32 l_bin2asc[256]; for (u32 i = lid; i < 256; i += lsz) { @@ -602,10 +602,10 @@ __kernel void m02610_s04 (KERN_ATTR_RULES ()) } } -__kernel void m02610_s08 (KERN_ATTR_RULES ()) +KERNEL_FQ void m02610_s08 (KERN_ATTR_RULES ()) { } -__kernel void m02610_s16 (KERN_ATTR_RULES ()) +KERNEL_FQ void m02610_s16 (KERN_ATTR_RULES ()) { } diff --git a/OpenCL/m02610_a0-pure.cl b/OpenCL/m02610_a0-pure.cl index 507d9c47f..143f32f28 100644 --- a/OpenCL/m02610_a0-pure.cl +++ b/OpenCL/m02610_a0-pure.cl @@ -27,7 +27,7 @@ #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 m02610_mxx (KERN_ATTR_RULES ()) +KERNEL_FQ void m02610_mxx (KERN_ATTR_RULES ()) { /** * modifier @@ -41,7 +41,7 @@ __kernel void m02610_mxx (KERN_ATTR_RULES ()) * bin2asc table */ - __local u32 l_bin2asc[256]; + LOCAL_AS u32 l_bin2asc[256]; for (u32 i = lid; i < 256; i += lsz) { @@ -130,7 +130,7 @@ __kernel void m02610_mxx (KERN_ATTR_RULES ()) } } -__kernel void m02610_sxx (KERN_ATTR_RULES ()) +KERNEL_FQ void m02610_sxx (KERN_ATTR_RULES ()) { /** * modifier @@ -144,7 +144,7 @@ __kernel void m02610_sxx (KERN_ATTR_RULES ()) * bin2asc table */ - __local u32 l_bin2asc[256]; + LOCAL_AS u32 l_bin2asc[256]; for (u32 i = lid; i < 256; i += lsz) { diff --git a/OpenCL/m02610_a1-optimized.cl b/OpenCL/m02610_a1-optimized.cl index 5d86d2e83..ad323f53e 100644 --- a/OpenCL/m02610_a1-optimized.cl +++ b/OpenCL/m02610_a1-optimized.cl @@ -25,7 +25,7 @@ #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 m02610_m04 (KERN_ATTR_BASIC ()) +KERNEL_FQ void m02610_m04 (KERN_ATTR_BASIC ()) { /** * modifier @@ -39,7 +39,7 @@ __kernel void m02610_m04 (KERN_ATTR_BASIC ()) * bin2asc table */ - __local u32 l_bin2asc[256]; + LOCAL_AS u32 l_bin2asc[256]; for (u32 i = lid; i < 256; i += lsz) { @@ -360,15 +360,15 @@ __kernel void m02610_m04 (KERN_ATTR_BASIC ()) } } -__kernel void m02610_m08 (KERN_ATTR_BASIC ()) +KERNEL_FQ void m02610_m08 (KERN_ATTR_BASIC ()) { } -__kernel void m02610_m16 (KERN_ATTR_BASIC ()) +KERNEL_FQ void m02610_m16 (KERN_ATTR_BASIC ()) { } -__kernel void m02610_s04 (KERN_ATTR_BASIC ()) +KERNEL_FQ void m02610_s04 (KERN_ATTR_BASIC ()) { /** * modifier @@ -382,7 +382,7 @@ __kernel void m02610_s04 (KERN_ATTR_BASIC ()) * bin2asc table */ - __local u32 l_bin2asc[256]; + LOCAL_AS u32 l_bin2asc[256]; for (u32 i = lid; i < 256; i += lsz) { @@ -718,10 +718,10 @@ __kernel void m02610_s04 (KERN_ATTR_BASIC ()) } } -__kernel void m02610_s08 (KERN_ATTR_BASIC ()) +KERNEL_FQ void m02610_s08 (KERN_ATTR_BASIC ()) { } -__kernel void m02610_s16 (KERN_ATTR_BASIC ()) +KERNEL_FQ void m02610_s16 (KERN_ATTR_BASIC ()) { } diff --git a/OpenCL/m02610_a1-pure.cl b/OpenCL/m02610_a1-pure.cl index 2522d870d..c4b97e3c8 100644 --- a/OpenCL/m02610_a1-pure.cl +++ b/OpenCL/m02610_a1-pure.cl @@ -25,7 +25,7 @@ #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 m02610_mxx (KERN_ATTR_BASIC ()) +KERNEL_FQ void m02610_mxx (KERN_ATTR_BASIC ()) { /** * modifier @@ -39,7 +39,7 @@ __kernel void m02610_mxx (KERN_ATTR_BASIC ()) * bin2asc table */ - __local u32 l_bin2asc[256]; + LOCAL_AS u32 l_bin2asc[256]; for (u32 i = lid; i < 256; i += lsz) { @@ -126,7 +126,7 @@ __kernel void m02610_mxx (KERN_ATTR_BASIC ()) } } -__kernel void m02610_sxx (KERN_ATTR_BASIC ()) +KERNEL_FQ void m02610_sxx (KERN_ATTR_BASIC ()) { /** * modifier @@ -140,7 +140,7 @@ __kernel void m02610_sxx (KERN_ATTR_BASIC ()) * bin2asc table */ - __local u32 l_bin2asc[256]; + LOCAL_AS u32 l_bin2asc[256]; for (u32 i = lid; i < 256; i += lsz) { diff --git a/OpenCL/m02610_a3-optimized.cl b/OpenCL/m02610_a3-optimized.cl index 8bdfb7c9d..73af945f8 100644 --- a/OpenCL/m02610_a3-optimized.cl +++ b/OpenCL/m02610_a3-optimized.cl @@ -25,7 +25,7 @@ #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 -DECLSPEC void m02610m (u32 *w0, u32 *w1, u32 *w2, u32 *w3, const u32 pw_len, KERN_ATTR_BASIC (), __local u32 *l_bin2asc) +DECLSPEC void m02610m (u32 *w0, u32 *w1, u32 *w2, u32 *w3, const u32 pw_len, KERN_ATTR_BASIC (), LOCAL_AS u32 *l_bin2asc) { /** * modifier @@ -283,7 +283,7 @@ DECLSPEC void m02610m (u32 *w0, u32 *w1, u32 *w2, u32 *w3, const u32 pw_len, KER } } -DECLSPEC void m02610s (u32 *w0, u32 *w1, u32 *w2, u32 *w3, const u32 pw_len, KERN_ATTR_BASIC (), __local u32 *l_bin2asc) +DECLSPEC void m02610s (u32 *w0, u32 *w1, u32 *w2, u32 *w3, const u32 pw_len, KERN_ATTR_BASIC (), LOCAL_AS u32 *l_bin2asc) { /** * modifier @@ -557,7 +557,7 @@ DECLSPEC void m02610s (u32 *w0, u32 *w1, u32 *w2, u32 *w3, const u32 pw_len, KER } } -__kernel void m02610_m04 (KERN_ATTR_BASIC ()) +KERNEL_FQ void m02610_m04 (KERN_ATTR_BASIC ()) { /** * base @@ -605,7 +605,7 @@ __kernel void m02610_m04 (KERN_ATTR_BASIC ()) * bin2asc table */ - __local u32 l_bin2asc[256]; + LOCAL_AS u32 l_bin2asc[256]; for (u32 i = lid; i < 256; i += lsz) { @@ -627,7 +627,7 @@ __kernel void m02610_m04 (KERN_ATTR_BASIC ()) m02610m (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_extra0_buf, d_extra1_buf, d_extra2_buf, d_extra3_buf, bitmap_mask, bitmap_shift1, bitmap_shift2, salt_pos, loop_pos, loop_cnt, il_cnt, digests_cnt, digests_offset, combs_mode, gid_max, l_bin2asc); } -__kernel void m02610_m08 (KERN_ATTR_BASIC ()) +KERNEL_FQ void m02610_m08 (KERN_ATTR_BASIC ()) { /** * base @@ -675,7 +675,7 @@ __kernel void m02610_m08 (KERN_ATTR_BASIC ()) * bin2asc table */ - __local u32 l_bin2asc[256]; + LOCAL_AS u32 l_bin2asc[256]; for (u32 i = lid; i < 256; i += lsz) { @@ -697,7 +697,7 @@ __kernel void m02610_m08 (KERN_ATTR_BASIC ()) m02610m (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_extra0_buf, d_extra1_buf, d_extra2_buf, d_extra3_buf, bitmap_mask, bitmap_shift1, bitmap_shift2, salt_pos, loop_pos, loop_cnt, il_cnt, digests_cnt, digests_offset, combs_mode, gid_max, l_bin2asc); } -__kernel void m02610_m16 (KERN_ATTR_BASIC ()) +KERNEL_FQ void m02610_m16 (KERN_ATTR_BASIC ()) { /** * base @@ -745,7 +745,7 @@ __kernel void m02610_m16 (KERN_ATTR_BASIC ()) * bin2asc table */ - __local u32 l_bin2asc[256]; + LOCAL_AS u32 l_bin2asc[256]; for (u32 i = lid; i < 256; i += lsz) { @@ -767,7 +767,7 @@ __kernel void m02610_m16 (KERN_ATTR_BASIC ()) m02610m (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_extra0_buf, d_extra1_buf, d_extra2_buf, d_extra3_buf, bitmap_mask, bitmap_shift1, bitmap_shift2, salt_pos, loop_pos, loop_cnt, il_cnt, digests_cnt, digests_offset, combs_mode, gid_max, l_bin2asc); } -__kernel void m02610_s04 (KERN_ATTR_BASIC ()) +KERNEL_FQ void m02610_s04 (KERN_ATTR_BASIC ()) { /** * base @@ -815,7 +815,7 @@ __kernel void m02610_s04 (KERN_ATTR_BASIC ()) * bin2asc table */ - __local u32 l_bin2asc[256]; + LOCAL_AS u32 l_bin2asc[256]; for (u32 i = lid; i < 256; i += lsz) { @@ -837,7 +837,7 @@ __kernel void m02610_s04 (KERN_ATTR_BASIC ()) m02610s (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_extra0_buf, d_extra1_buf, d_extra2_buf, d_extra3_buf, bitmap_mask, bitmap_shift1, bitmap_shift2, salt_pos, loop_pos, loop_cnt, il_cnt, digests_cnt, digests_offset, combs_mode, gid_max, l_bin2asc); } -__kernel void m02610_s08 (KERN_ATTR_BASIC ()) +KERNEL_FQ void m02610_s08 (KERN_ATTR_BASIC ()) { /** * base @@ -885,7 +885,7 @@ __kernel void m02610_s08 (KERN_ATTR_BASIC ()) * bin2asc table */ - __local u32 l_bin2asc[256]; + LOCAL_AS u32 l_bin2asc[256]; for (u32 i = lid; i < 256; i += lsz) { @@ -907,7 +907,7 @@ __kernel void m02610_s08 (KERN_ATTR_BASIC ()) m02610s (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_extra0_buf, d_extra1_buf, d_extra2_buf, d_extra3_buf, bitmap_mask, bitmap_shift1, bitmap_shift2, salt_pos, loop_pos, loop_cnt, il_cnt, digests_cnt, digests_offset, combs_mode, gid_max, l_bin2asc); } -__kernel void m02610_s16 (KERN_ATTR_BASIC ()) +KERNEL_FQ void m02610_s16 (KERN_ATTR_BASIC ()) { /** * base @@ -955,7 +955,7 @@ __kernel void m02610_s16 (KERN_ATTR_BASIC ()) * bin2asc table */ - __local u32 l_bin2asc[256]; + LOCAL_AS u32 l_bin2asc[256]; for (u32 i = lid; i < 256; i += lsz) { diff --git a/OpenCL/m02610_a3-pure.cl b/OpenCL/m02610_a3-pure.cl index e7e66688f..448bdddcf 100644 --- a/OpenCL/m02610_a3-pure.cl +++ b/OpenCL/m02610_a3-pure.cl @@ -25,7 +25,7 @@ #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 m02610_mxx (KERN_ATTR_VECTOR ()) +KERNEL_FQ void m02610_mxx (KERN_ATTR_VECTOR ()) { /** * modifier @@ -39,7 +39,7 @@ __kernel void m02610_mxx (KERN_ATTR_VECTOR ()) * bin2asc table */ - __local u32 l_bin2asc[256]; + LOCAL_AS u32 l_bin2asc[256]; for (u32 i = lid; i < 256; i += lsz) { @@ -139,7 +139,7 @@ __kernel void m02610_mxx (KERN_ATTR_VECTOR ()) } } -__kernel void m02610_sxx (KERN_ATTR_VECTOR ()) +KERNEL_FQ void m02610_sxx (KERN_ATTR_VECTOR ()) { /** * modifier @@ -153,7 +153,7 @@ __kernel void m02610_sxx (KERN_ATTR_VECTOR ()) * bin2asc table */ - __local u32 l_bin2asc[256]; + LOCAL_AS u32 l_bin2asc[256]; for (u32 i = lid; i < 256; i += lsz) { diff --git a/OpenCL/m02710_a0-optimized.cl b/OpenCL/m02710_a0-optimized.cl index 314af2ab7..914d1ae9b 100644 --- a/OpenCL/m02710_a0-optimized.cl +++ b/OpenCL/m02710_a0-optimized.cl @@ -27,7 +27,7 @@ #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 m02710_m04 (KERN_ATTR_RULES ()) +KERNEL_FQ void m02710_m04 (KERN_ATTR_RULES ()) { /** * modifier @@ -41,7 +41,7 @@ __kernel void m02710_m04 (KERN_ATTR_RULES ()) * bin2asc table */ - __local u32 l_bin2asc[256]; + LOCAL_AS u32 l_bin2asc[256]; for (u32 i = lid; i < 256; i += lsz) { @@ -388,15 +388,15 @@ __kernel void m02710_m04 (KERN_ATTR_RULES ()) } } -__kernel void m02710_m08 (KERN_ATTR_RULES ()) +KERNEL_FQ void m02710_m08 (KERN_ATTR_RULES ()) { } -__kernel void m02710_m16 (KERN_ATTR_RULES ()) +KERNEL_FQ void m02710_m16 (KERN_ATTR_RULES ()) { } -__kernel void m02710_s04 (KERN_ATTR_RULES ()) +KERNEL_FQ void m02710_s04 (KERN_ATTR_RULES ()) { /** * modifier @@ -410,7 +410,7 @@ __kernel void m02710_s04 (KERN_ATTR_RULES ()) * bin2asc table */ - __local u32 l_bin2asc[256]; + LOCAL_AS u32 l_bin2asc[256]; for (u32 i = lid; i < 256; i += lsz) { @@ -772,10 +772,10 @@ __kernel void m02710_s04 (KERN_ATTR_RULES ()) } } -__kernel void m02710_s08 (KERN_ATTR_RULES ()) +KERNEL_FQ void m02710_s08 (KERN_ATTR_RULES ()) { } -__kernel void m02710_s16 (KERN_ATTR_RULES ()) +KERNEL_FQ void m02710_s16 (KERN_ATTR_RULES ()) { } diff --git a/OpenCL/m02710_a1-optimized.cl b/OpenCL/m02710_a1-optimized.cl index 126039df9..89927efc9 100644 --- a/OpenCL/m02710_a1-optimized.cl +++ b/OpenCL/m02710_a1-optimized.cl @@ -25,7 +25,7 @@ #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 m02710_m04 (KERN_ATTR_BASIC ()) +KERNEL_FQ void m02710_m04 (KERN_ATTR_BASIC ()) { /** * modifier @@ -39,7 +39,7 @@ __kernel void m02710_m04 (KERN_ATTR_BASIC ()) * bin2asc table */ - __local u32 l_bin2asc[256]; + LOCAL_AS u32 l_bin2asc[256]; for (u32 i = lid; i < 256; i += lsz) { @@ -445,15 +445,15 @@ __kernel void m02710_m04 (KERN_ATTR_BASIC ()) } } -__kernel void m02710_m08 (KERN_ATTR_BASIC ()) +KERNEL_FQ void m02710_m08 (KERN_ATTR_BASIC ()) { } -__kernel void m02710_m16 (KERN_ATTR_BASIC ()) +KERNEL_FQ void m02710_m16 (KERN_ATTR_BASIC ()) { } -__kernel void m02710_s04 (KERN_ATTR_BASIC ()) +KERNEL_FQ void m02710_s04 (KERN_ATTR_BASIC ()) { /** * modifier @@ -467,7 +467,7 @@ __kernel void m02710_s04 (KERN_ATTR_BASIC ()) * bin2asc table */ - __local u32 l_bin2asc[256]; + LOCAL_AS u32 l_bin2asc[256]; for (u32 i = lid; i < 256; i += lsz) { @@ -888,10 +888,10 @@ __kernel void m02710_s04 (KERN_ATTR_BASIC ()) } } -__kernel void m02710_s08 (KERN_ATTR_BASIC ()) +KERNEL_FQ void m02710_s08 (KERN_ATTR_BASIC ()) { } -__kernel void m02710_s16 (KERN_ATTR_BASIC ()) +KERNEL_FQ void m02710_s16 (KERN_ATTR_BASIC ()) { } diff --git a/OpenCL/m02710_a3-optimized.cl b/OpenCL/m02710_a3-optimized.cl index 1b47cbfff..a02f67260 100644 --- a/OpenCL/m02710_a3-optimized.cl +++ b/OpenCL/m02710_a3-optimized.cl @@ -25,7 +25,7 @@ #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 -DECLSPEC void m02710m (u32 *w0, u32 *w1, u32 *w2, u32 *w3, const u32 pw_len, KERN_ATTR_BASIC (), __local u32 *l_bin2asc) +DECLSPEC void m02710m (u32 *w0, u32 *w1, u32 *w2, u32 *w3, const u32 pw_len, KERN_ATTR_BASIC (), LOCAL_AS u32 *l_bin2asc) { /** * modifier @@ -368,7 +368,7 @@ DECLSPEC void m02710m (u32 *w0, u32 *w1, u32 *w2, u32 *w3, const u32 pw_len, KER } } -DECLSPEC void m02710s (u32 *w0, u32 *w1, u32 *w2, u32 *w3, const u32 pw_len, KERN_ATTR_BASIC (), __local u32 *l_bin2asc) +DECLSPEC void m02710s (u32 *w0, u32 *w1, u32 *w2, u32 *w3, const u32 pw_len, KERN_ATTR_BASIC (), LOCAL_AS u32 *l_bin2asc) { /** * modifier @@ -726,7 +726,7 @@ DECLSPEC void m02710s (u32 *w0, u32 *w1, u32 *w2, u32 *w3, const u32 pw_len, KER } } -__kernel void m02710_m04 (KERN_ATTR_BASIC ()) +KERNEL_FQ void m02710_m04 (KERN_ATTR_BASIC ()) { /** * base @@ -774,7 +774,7 @@ __kernel void m02710_m04 (KERN_ATTR_BASIC ()) * bin2asc table */ - __local u32 l_bin2asc[256]; + LOCAL_AS u32 l_bin2asc[256]; for (u32 i = lid; i < 256; i += lsz) { @@ -796,7 +796,7 @@ __kernel void m02710_m04 (KERN_ATTR_BASIC ()) m02710m (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_extra0_buf, d_extra1_buf, d_extra2_buf, d_extra3_buf, bitmap_mask, bitmap_shift1, bitmap_shift2, salt_pos, loop_pos, loop_cnt, il_cnt, digests_cnt, digests_offset, combs_mode, gid_max, l_bin2asc); } -__kernel void m02710_m08 (KERN_ATTR_BASIC ()) +KERNEL_FQ void m02710_m08 (KERN_ATTR_BASIC ()) { /** * base @@ -844,7 +844,7 @@ __kernel void m02710_m08 (KERN_ATTR_BASIC ()) * bin2asc table */ - __local u32 l_bin2asc[256]; + LOCAL_AS u32 l_bin2asc[256]; for (u32 i = lid; i < 256; i += lsz) { @@ -866,7 +866,7 @@ __kernel void m02710_m08 (KERN_ATTR_BASIC ()) m02710m (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_extra0_buf, d_extra1_buf, d_extra2_buf, d_extra3_buf, bitmap_mask, bitmap_shift1, bitmap_shift2, salt_pos, loop_pos, loop_cnt, il_cnt, digests_cnt, digests_offset, combs_mode, gid_max, l_bin2asc); } -__kernel void m02710_m16 (KERN_ATTR_BASIC ()) +KERNEL_FQ void m02710_m16 (KERN_ATTR_BASIC ()) { /** * base @@ -914,7 +914,7 @@ __kernel void m02710_m16 (KERN_ATTR_BASIC ()) * bin2asc table */ - __local u32 l_bin2asc[256]; + LOCAL_AS u32 l_bin2asc[256]; for (u32 i = lid; i < 256; i += lsz) { @@ -936,7 +936,7 @@ __kernel void m02710_m16 (KERN_ATTR_BASIC ()) m02710m (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_extra0_buf, d_extra1_buf, d_extra2_buf, d_extra3_buf, bitmap_mask, bitmap_shift1, bitmap_shift2, salt_pos, loop_pos, loop_cnt, il_cnt, digests_cnt, digests_offset, combs_mode, gid_max, l_bin2asc); } -__kernel void m02710_s04 (KERN_ATTR_BASIC ()) +KERNEL_FQ void m02710_s04 (KERN_ATTR_BASIC ()) { /** * base @@ -984,7 +984,7 @@ __kernel void m02710_s04 (KERN_ATTR_BASIC ()) * bin2asc table */ - __local u32 l_bin2asc[256]; + LOCAL_AS u32 l_bin2asc[256]; for (u32 i = lid; i < 256; i += lsz) { @@ -1006,7 +1006,7 @@ __kernel void m02710_s04 (KERN_ATTR_BASIC ()) m02710s (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_extra0_buf, d_extra1_buf, d_extra2_buf, d_extra3_buf, bitmap_mask, bitmap_shift1, bitmap_shift2, salt_pos, loop_pos, loop_cnt, il_cnt, digests_cnt, digests_offset, combs_mode, gid_max, l_bin2asc); } -__kernel void m02710_s08 (KERN_ATTR_BASIC ()) +KERNEL_FQ void m02710_s08 (KERN_ATTR_BASIC ()) { /** * base @@ -1054,7 +1054,7 @@ __kernel void m02710_s08 (KERN_ATTR_BASIC ()) * bin2asc table */ - __local u32 l_bin2asc[256]; + LOCAL_AS u32 l_bin2asc[256]; for (u32 i = lid; i < 256; i += lsz) { @@ -1076,7 +1076,7 @@ __kernel void m02710_s08 (KERN_ATTR_BASIC ()) m02710s (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_extra0_buf, d_extra1_buf, d_extra2_buf, d_extra3_buf, bitmap_mask, bitmap_shift1, bitmap_shift2, salt_pos, loop_pos, loop_cnt, il_cnt, digests_cnt, digests_offset, combs_mode, gid_max, l_bin2asc); } -__kernel void m02710_s16 (KERN_ATTR_BASIC ()) +KERNEL_FQ void m02710_s16 (KERN_ATTR_BASIC ()) { /** * base @@ -1124,7 +1124,7 @@ __kernel void m02710_s16 (KERN_ATTR_BASIC ()) * bin2asc table */ - __local u32 l_bin2asc[256]; + LOCAL_AS u32 l_bin2asc[256]; for (u32 i = lid; i < 256; i += lsz) { diff --git a/OpenCL/m02810_a0-optimized.cl b/OpenCL/m02810_a0-optimized.cl index 1345829f8..0a224edc5 100644 --- a/OpenCL/m02810_a0-optimized.cl +++ b/OpenCL/m02810_a0-optimized.cl @@ -27,7 +27,7 @@ #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 m02810_m04 (KERN_ATTR_RULES ()) +KERNEL_FQ void m02810_m04 (KERN_ATTR_RULES ()) { /** * modifier @@ -41,7 +41,7 @@ __kernel void m02810_m04 (KERN_ATTR_RULES ()) * bin2asc table */ - __local u32 l_bin2asc[256]; + LOCAL_AS u32 l_bin2asc[256]; for (u32 i = lid; i < 256; i += lsz) { @@ -389,15 +389,15 @@ __kernel void m02810_m04 (KERN_ATTR_RULES ()) } } -__kernel void m02810_m08 (KERN_ATTR_RULES ()) +KERNEL_FQ void m02810_m08 (KERN_ATTR_RULES ()) { } -__kernel void m02810_m16 (KERN_ATTR_RULES ()) +KERNEL_FQ void m02810_m16 (KERN_ATTR_RULES ()) { } -__kernel void m02810_s04 (KERN_ATTR_RULES ()) +KERNEL_FQ void m02810_s04 (KERN_ATTR_RULES ()) { /** * modifier @@ -411,7 +411,7 @@ __kernel void m02810_s04 (KERN_ATTR_RULES ()) * bin2asc table */ - __local u32 l_bin2asc[256]; + LOCAL_AS u32 l_bin2asc[256]; for (u32 i = lid; i < 256; i += lsz) { @@ -774,10 +774,10 @@ __kernel void m02810_s04 (KERN_ATTR_RULES ()) } } -__kernel void m02810_s08 (KERN_ATTR_RULES ()) +KERNEL_FQ void m02810_s08 (KERN_ATTR_RULES ()) { } -__kernel void m02810_s16 (KERN_ATTR_RULES ()) +KERNEL_FQ void m02810_s16 (KERN_ATTR_RULES ()) { } diff --git a/OpenCL/m02810_a0-pure.cl b/OpenCL/m02810_a0-pure.cl index ec64b07e2..e12a17728 100644 --- a/OpenCL/m02810_a0-pure.cl +++ b/OpenCL/m02810_a0-pure.cl @@ -27,7 +27,7 @@ #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 m02810_mxx (KERN_ATTR_RULES ()) +KERNEL_FQ void m02810_mxx (KERN_ATTR_RULES ()) { /** * modifier @@ -41,7 +41,7 @@ __kernel void m02810_mxx (KERN_ATTR_RULES ()) * bin2asc table */ - __local u32 l_bin2asc[256]; + LOCAL_AS u32 l_bin2asc[256]; for (u32 i = lid; i < 256; i += lsz) { @@ -153,7 +153,7 @@ __kernel void m02810_mxx (KERN_ATTR_RULES ()) } } -__kernel void m02810_sxx (KERN_ATTR_RULES ()) +KERNEL_FQ void m02810_sxx (KERN_ATTR_RULES ()) { /** * modifier @@ -167,7 +167,7 @@ __kernel void m02810_sxx (KERN_ATTR_RULES ()) * bin2asc table */ - __local u32 l_bin2asc[256]; + LOCAL_AS u32 l_bin2asc[256]; for (u32 i = lid; i < 256; i += lsz) { diff --git a/OpenCL/m02810_a1-optimized.cl b/OpenCL/m02810_a1-optimized.cl index 17c034926..f8d95a707 100644 --- a/OpenCL/m02810_a1-optimized.cl +++ b/OpenCL/m02810_a1-optimized.cl @@ -25,7 +25,7 @@ #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 m02810_m04 (KERN_ATTR_BASIC ()) +KERNEL_FQ void m02810_m04 (KERN_ATTR_BASIC ()) { /** * modifier @@ -39,7 +39,7 @@ __kernel void m02810_m04 (KERN_ATTR_BASIC ()) * bin2asc table */ - __local u32 l_bin2asc[256]; + LOCAL_AS u32 l_bin2asc[256]; for (u32 i = lid; i < 256; i += lsz) { @@ -446,15 +446,15 @@ __kernel void m02810_m04 (KERN_ATTR_BASIC ()) } } -__kernel void m02810_m08 (KERN_ATTR_BASIC ()) +KERNEL_FQ void m02810_m08 (KERN_ATTR_BASIC ()) { } -__kernel void m02810_m16 (KERN_ATTR_BASIC ()) +KERNEL_FQ void m02810_m16 (KERN_ATTR_BASIC ()) { } -__kernel void m02810_s04 (KERN_ATTR_BASIC ()) +KERNEL_FQ void m02810_s04 (KERN_ATTR_BASIC ()) { /** * modifier @@ -468,7 +468,7 @@ __kernel void m02810_s04 (KERN_ATTR_BASIC ()) * bin2asc table */ - __local u32 l_bin2asc[256]; + LOCAL_AS u32 l_bin2asc[256]; for (u32 i = lid; i < 256; i += lsz) { @@ -890,10 +890,10 @@ __kernel void m02810_s04 (KERN_ATTR_BASIC ()) } } -__kernel void m02810_s08 (KERN_ATTR_BASIC ()) +KERNEL_FQ void m02810_s08 (KERN_ATTR_BASIC ()) { } -__kernel void m02810_s16 (KERN_ATTR_BASIC ()) +KERNEL_FQ void m02810_s16 (KERN_ATTR_BASIC ()) { } diff --git a/OpenCL/m02810_a1-pure.cl b/OpenCL/m02810_a1-pure.cl index 16607694e..64209484b 100644 --- a/OpenCL/m02810_a1-pure.cl +++ b/OpenCL/m02810_a1-pure.cl @@ -25,7 +25,7 @@ #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 m02810_mxx (KERN_ATTR_BASIC ()) +KERNEL_FQ void m02810_mxx (KERN_ATTR_BASIC ()) { /** * modifier @@ -39,7 +39,7 @@ __kernel void m02810_mxx (KERN_ATTR_BASIC ()) * bin2asc table */ - __local u32 l_bin2asc[256]; + LOCAL_AS u32 l_bin2asc[256]; for (u32 i = lid; i < 256; i += lsz) { @@ -149,7 +149,7 @@ __kernel void m02810_mxx (KERN_ATTR_BASIC ()) } } -__kernel void m02810_sxx (KERN_ATTR_BASIC ()) +KERNEL_FQ void m02810_sxx (KERN_ATTR_BASIC ()) { /** * modifier @@ -163,7 +163,7 @@ __kernel void m02810_sxx (KERN_ATTR_BASIC ()) * bin2asc table */ - __local u32 l_bin2asc[256]; + LOCAL_AS u32 l_bin2asc[256]; for (u32 i = lid; i < 256; i += lsz) { diff --git a/OpenCL/m02810_a3-optimized.cl b/OpenCL/m02810_a3-optimized.cl index fd3860d2e..8f9d772b5 100644 --- a/OpenCL/m02810_a3-optimized.cl +++ b/OpenCL/m02810_a3-optimized.cl @@ -25,7 +25,7 @@ #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 -DECLSPEC void m02810m (u32 *w0, u32 *w1, u32 *w2, u32 *w3, const u32 pw_len, KERN_ATTR_BASIC (), __local u32 *l_bin2asc) +DECLSPEC void m02810m (u32 *w0, u32 *w1, u32 *w2, u32 *w3, const u32 pw_len, KERN_ATTR_BASIC (), LOCAL_AS u32 *l_bin2asc) { /** * modifier @@ -369,7 +369,7 @@ DECLSPEC void m02810m (u32 *w0, u32 *w1, u32 *w2, u32 *w3, const u32 pw_len, KER } } -DECLSPEC void m02810s (u32 *w0, u32 *w1, u32 *w2, u32 *w3, const u32 pw_len, KERN_ATTR_BASIC (), __local u32 *l_bin2asc) +DECLSPEC void m02810s (u32 *w0, u32 *w1, u32 *w2, u32 *w3, const u32 pw_len, KERN_ATTR_BASIC (), LOCAL_AS u32 *l_bin2asc) { /** * modifier @@ -728,7 +728,7 @@ DECLSPEC void m02810s (u32 *w0, u32 *w1, u32 *w2, u32 *w3, const u32 pw_len, KER } } -__kernel void m02810_m04 (KERN_ATTR_BASIC ()) +KERNEL_FQ void m02810_m04 (KERN_ATTR_BASIC ()) { /** * base @@ -776,7 +776,7 @@ __kernel void m02810_m04 (KERN_ATTR_BASIC ()) * bin2asc table */ - __local u32 l_bin2asc[256]; + LOCAL_AS u32 l_bin2asc[256]; for (u32 i = lid; i < 256; i += lsz) { @@ -798,7 +798,7 @@ __kernel void m02810_m04 (KERN_ATTR_BASIC ()) m02810m (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_extra0_buf, d_extra1_buf, d_extra2_buf, d_extra3_buf, bitmap_mask, bitmap_shift1, bitmap_shift2, salt_pos, loop_pos, loop_cnt, il_cnt, digests_cnt, digests_offset, combs_mode, gid_max, l_bin2asc); } -__kernel void m02810_m08 (KERN_ATTR_BASIC ()) +KERNEL_FQ void m02810_m08 (KERN_ATTR_BASIC ()) { /** * base @@ -846,7 +846,7 @@ __kernel void m02810_m08 (KERN_ATTR_BASIC ()) * bin2asc table */ - __local u32 l_bin2asc[256]; + LOCAL_AS u32 l_bin2asc[256]; for (u32 i = lid; i < 256; i += lsz) { @@ -868,7 +868,7 @@ __kernel void m02810_m08 (KERN_ATTR_BASIC ()) m02810m (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_extra0_buf, d_extra1_buf, d_extra2_buf, d_extra3_buf, bitmap_mask, bitmap_shift1, bitmap_shift2, salt_pos, loop_pos, loop_cnt, il_cnt, digests_cnt, digests_offset, combs_mode, gid_max, l_bin2asc); } -__kernel void m02810_m16 (KERN_ATTR_BASIC ()) +KERNEL_FQ void m02810_m16 (KERN_ATTR_BASIC ()) { /** * base @@ -916,7 +916,7 @@ __kernel void m02810_m16 (KERN_ATTR_BASIC ()) * bin2asc table */ - __local u32 l_bin2asc[256]; + LOCAL_AS u32 l_bin2asc[256]; for (u32 i = lid; i < 256; i += lsz) { @@ -938,7 +938,7 @@ __kernel void m02810_m16 (KERN_ATTR_BASIC ()) m02810m (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_extra0_buf, d_extra1_buf, d_extra2_buf, d_extra3_buf, bitmap_mask, bitmap_shift1, bitmap_shift2, salt_pos, loop_pos, loop_cnt, il_cnt, digests_cnt, digests_offset, combs_mode, gid_max, l_bin2asc); } -__kernel void m02810_s04 (KERN_ATTR_BASIC ()) +KERNEL_FQ void m02810_s04 (KERN_ATTR_BASIC ()) { /** * base @@ -986,7 +986,7 @@ __kernel void m02810_s04 (KERN_ATTR_BASIC ()) * bin2asc table */ - __local u32 l_bin2asc[256]; + LOCAL_AS u32 l_bin2asc[256]; for (u32 i = lid; i < 256; i += lsz) { @@ -1008,7 +1008,7 @@ __kernel void m02810_s04 (KERN_ATTR_BASIC ()) m02810s (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_extra0_buf, d_extra1_buf, d_extra2_buf, d_extra3_buf, bitmap_mask, bitmap_shift1, bitmap_shift2, salt_pos, loop_pos, loop_cnt, il_cnt, digests_cnt, digests_offset, combs_mode, gid_max, l_bin2asc); } -__kernel void m02810_s08 (KERN_ATTR_BASIC ()) +KERNEL_FQ void m02810_s08 (KERN_ATTR_BASIC ()) { /** * base @@ -1056,7 +1056,7 @@ __kernel void m02810_s08 (KERN_ATTR_BASIC ()) * bin2asc table */ - __local u32 l_bin2asc[256]; + LOCAL_AS u32 l_bin2asc[256]; for (u32 i = lid; i < 256; i += lsz) { @@ -1078,7 +1078,7 @@ __kernel void m02810_s08 (KERN_ATTR_BASIC ()) m02810s (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_extra0_buf, d_extra1_buf, d_extra2_buf, d_extra3_buf, bitmap_mask, bitmap_shift1, bitmap_shift2, salt_pos, loop_pos, loop_cnt, il_cnt, digests_cnt, digests_offset, combs_mode, gid_max, l_bin2asc); } -__kernel void m02810_s16 (KERN_ATTR_BASIC ()) +KERNEL_FQ void m02810_s16 (KERN_ATTR_BASIC ()) { /** * base @@ -1126,7 +1126,7 @@ __kernel void m02810_s16 (KERN_ATTR_BASIC ()) * bin2asc table */ - __local u32 l_bin2asc[256]; + LOCAL_AS u32 l_bin2asc[256]; for (u32 i = lid; i < 256; i += lsz) { diff --git a/OpenCL/m02810_a3-pure.cl b/OpenCL/m02810_a3-pure.cl index 636b9c9e4..bc7178999 100644 --- a/OpenCL/m02810_a3-pure.cl +++ b/OpenCL/m02810_a3-pure.cl @@ -25,7 +25,7 @@ #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 m02810_mxx (KERN_ATTR_VECTOR ()) +KERNEL_FQ void m02810_mxx (KERN_ATTR_VECTOR ()) { /** * modifier @@ -39,7 +39,7 @@ __kernel void m02810_mxx (KERN_ATTR_VECTOR ()) * bin2asc table */ - __local u32 l_bin2asc[256]; + LOCAL_AS u32 l_bin2asc[256]; for (u32 i = lid; i < 256; i += lsz) { @@ -162,7 +162,7 @@ __kernel void m02810_mxx (KERN_ATTR_VECTOR ()) } } -__kernel void m02810_sxx (KERN_ATTR_VECTOR ()) +KERNEL_FQ void m02810_sxx (KERN_ATTR_VECTOR ()) { /** * modifier @@ -176,7 +176,7 @@ __kernel void m02810_sxx (KERN_ATTR_VECTOR ()) * bin2asc table */ - __local u32 l_bin2asc[256]; + LOCAL_AS u32 l_bin2asc[256]; for (u32 i = lid; i < 256; i += lsz) { diff --git a/OpenCL/m03000_a0-pure.cl b/OpenCL/m03000_a0-pure.cl index 48acd8dca..6be53c0fb 100644 --- a/OpenCL/m03000_a0-pure.cl +++ b/OpenCL/m03000_a0-pure.cl @@ -34,7 +34,7 @@ a = a ^ tt; \ } -__constant u32a c_SPtrans[8][64] = +CONSTANT_AS u32a c_SPtrans[8][64] = { { 0x02080800, 0x00080000, 0x02000002, 0x02080802, @@ -182,7 +182,7 @@ __constant u32a c_SPtrans[8][64] = } }; -__constant u32a c_skb[8][64] = +CONSTANT_AS u32a c_skb[8][64] = { { 0x00000000, 0x00000010, 0x20000000, 0x20000010, @@ -345,7 +345,7 @@ __constant u32a c_skb[8][64] = #define BOX(i,n,S) (u32x) ((S)[(n)][(i).s0], (S)[(n)][(i).s1], (S)[(n)][(i).s2], (S)[(n)][(i).s3], (S)[(n)][(i).s4], (S)[(n)][(i).s5], (S)[(n)][(i).s6], (S)[(n)][(i).s7], (S)[(n)][(i).s8], (S)[(n)][(i).s9], (S)[(n)][(i).sa], (S)[(n)][(i).sb], (S)[(n)][(i).sc], (S)[(n)][(i).sd], (S)[(n)][(i).se], (S)[(n)][(i).sf]) #endif -DECLSPEC void _des_crypt_encrypt (u32 *iv, u32x *data, u32x *Kc, u32x *Kd, __local u32 (*s_SPtrans)[64]) +DECLSPEC void _des_crypt_encrypt (u32 *iv, u32x *data, u32x *Kc, u32x *Kd, LOCAL_AS u32 (*s_SPtrans)[64]) { u32 r = data[0]; u32 l = data[1]; @@ -387,7 +387,7 @@ DECLSPEC void _des_crypt_encrypt (u32 *iv, u32x *data, u32x *Kc, u32x *Kd, __loc iv[1] = rotl32 (r, 29); } -DECLSPEC void _des_crypt_keysetup (u32 c, u32x d, u32x *Kc, u32x *Kd, __local u32 (*s_skb)[64]) +DECLSPEC void _des_crypt_keysetup (u32 c, u32x d, u32x *Kc, u32x *Kd, LOCAL_AS u32 (*s_skb)[64]) { u32 tt; @@ -491,7 +491,7 @@ DECLSPEC void transform_netntlmv1_key (const u32 w0, const u32x w1, u32x *out) | ((k[7] & 0xff) << 24); } -__kernel void m03000_mxx (KERN_ATTR_RULES ()) +KERNEL_FQ void m03000_mxx (KERN_ATTR_RULES ()) { /** * modifier @@ -505,8 +505,8 @@ __kernel void m03000_mxx (KERN_ATTR_RULES ()) * sbox, kbox */ - __local u32 s_SPtrans[8][64]; - __local u32 s_skb[8][64]; + LOCAL_AS u32 s_SPtrans[8][64]; + LOCAL_AS u32 s_skb[8][64]; for (u32 i = lid; i < 64; i += lsz) { @@ -576,7 +576,7 @@ __kernel void m03000_mxx (KERN_ATTR_RULES ()) } } -__kernel void m03000_sxx (KERN_ATTR_RULES ()) +KERNEL_FQ void m03000_sxx (KERN_ATTR_RULES ()) { /** * modifier @@ -590,8 +590,8 @@ __kernel void m03000_sxx (KERN_ATTR_RULES ()) * sbox, kbox */ - __local u32 s_SPtrans[8][64]; - __local u32 s_skb[8][64]; + LOCAL_AS u32 s_SPtrans[8][64]; + LOCAL_AS u32 s_skb[8][64]; for (u32 i = lid; i < 64; i += lsz) { diff --git a/OpenCL/m03000_a1-pure.cl b/OpenCL/m03000_a1-pure.cl index 0649cdb38..fb4fc3125 100644 --- a/OpenCL/m03000_a1-pure.cl +++ b/OpenCL/m03000_a1-pure.cl @@ -32,7 +32,7 @@ a = a ^ tt; \ } -__constant u32a c_SPtrans[8][64] = +CONSTANT_AS u32a c_SPtrans[8][64] = { { 0x02080800, 0x00080000, 0x02000002, 0x02080802, @@ -180,7 +180,7 @@ __constant u32a c_SPtrans[8][64] = } }; -__constant u32a c_skb[8][64] = +CONSTANT_AS u32a c_skb[8][64] = { { 0x00000000, 0x00000010, 0x20000000, 0x20000010, @@ -343,7 +343,7 @@ __constant u32a c_skb[8][64] = #define BOX(i,n,S) (u32x) ((S)[(n)][(i).s0], (S)[(n)][(i).s1], (S)[(n)][(i).s2], (S)[(n)][(i).s3], (S)[(n)][(i).s4], (S)[(n)][(i).s5], (S)[(n)][(i).s6], (S)[(n)][(i).s7], (S)[(n)][(i).s8], (S)[(n)][(i).s9], (S)[(n)][(i).sa], (S)[(n)][(i).sb], (S)[(n)][(i).sc], (S)[(n)][(i).sd], (S)[(n)][(i).se], (S)[(n)][(i).sf]) #endif -DECLSPEC void _des_crypt_encrypt (u32 *iv, u32x *data, u32x *Kc, u32x *Kd, __local u32 (*s_SPtrans)[64]) +DECLSPEC void _des_crypt_encrypt (u32 *iv, u32x *data, u32x *Kc, u32x *Kd, LOCAL_AS u32 (*s_SPtrans)[64]) { u32 r = data[0]; u32 l = data[1]; @@ -385,7 +385,7 @@ DECLSPEC void _des_crypt_encrypt (u32 *iv, u32x *data, u32x *Kc, u32x *Kd, __loc iv[1] = rotl32 (r, 29); } -DECLSPEC void _des_crypt_keysetup (u32 c, u32x d, u32x *Kc, u32x *Kd, __local u32 (*s_skb)[64]) +DECLSPEC void _des_crypt_keysetup (u32 c, u32x d, u32x *Kc, u32x *Kd, LOCAL_AS u32 (*s_skb)[64]) { u32 tt; @@ -489,7 +489,7 @@ DECLSPEC void transform_netntlmv1_key (const u32 w0, const u32x w1, u32x *out) | ((k[7] & 0xff) << 24); } -__kernel void m03000_mxx (KERN_ATTR_BASIC ()) +KERNEL_FQ void m03000_mxx (KERN_ATTR_BASIC ()) { /** * modifier @@ -503,8 +503,8 @@ __kernel void m03000_mxx (KERN_ATTR_BASIC ()) * sbox, kbox */ - __local u32 s_SPtrans[8][64]; - __local u32 s_skb[8][64]; + LOCAL_AS u32 s_SPtrans[8][64]; + LOCAL_AS u32 s_skb[8][64]; for (u32 i = lid; i < 64; i += lsz) { @@ -653,7 +653,7 @@ __kernel void m03000_mxx (KERN_ATTR_BASIC ()) } } -__kernel void m03000_sxx (KERN_ATTR_BASIC ()) +KERNEL_FQ void m03000_sxx (KERN_ATTR_BASIC ()) { /** * modifier @@ -667,8 +667,8 @@ __kernel void m03000_sxx (KERN_ATTR_BASIC ()) * sbox, kbox */ - __local u32 s_SPtrans[8][64]; - __local u32 s_skb[8][64]; + LOCAL_AS u32 s_SPtrans[8][64]; + LOCAL_AS u32 s_skb[8][64]; for (u32 i = lid; i < 64; i += lsz) { diff --git a/OpenCL/m03000_a3-pure.cl b/OpenCL/m03000_a3-pure.cl index e4f751e52..a239bea0b 100644 --- a/OpenCL/m03000_a3-pure.cl +++ b/OpenCL/m03000_a3-pure.cl @@ -1730,7 +1730,7 @@ DECLSPEC void transpose32c (u32 *data) // transpose bitslice mod : attention race conditions, need different buffers for *in and *out // -__kernel void m03000_tm (__global u32 * restrict mod, __global bs_word_t * restrict words_buf_r) +KERNEL_FQ void m03000_tm (GLOBAL_AS u32 * restrict mod, GLOBAL_AS bs_word_t * restrict words_buf_r) { const u64 gid = get_global_id (0); @@ -1752,7 +1752,7 @@ __kernel void m03000_tm (__global u32 * restrict mod, __global bs_word_t * restr } } -__kernel void m03000_mxx (KERN_ATTR_BITSLICE ()) +KERNEL_FQ void m03000_mxx (KERN_ATTR_BITSLICE ()) { /** * base @@ -2128,7 +2128,7 @@ __kernel void m03000_mxx (KERN_ATTR_BITSLICE ()) } } -__kernel void m03000_sxx (KERN_ATTR_BITSLICE ()) +KERNEL_FQ void m03000_sxx (KERN_ATTR_BITSLICE ()) { /** * base diff --git a/OpenCL/m03100_a0-optimized.cl b/OpenCL/m03100_a0-optimized.cl index 2c18fc332..2acb723a7 100644 --- a/OpenCL/m03100_a0-optimized.cl +++ b/OpenCL/m03100_a0-optimized.cl @@ -16,7 +16,7 @@ #include "inc_cipher_des.cl" #endif -__kernel void m03100_m04 (KERN_ATTR_RULES ()) +KERNEL_FQ void m03100_m04 (KERN_ATTR_RULES ()) { /** * modifier @@ -32,8 +32,8 @@ __kernel void m03100_m04 (KERN_ATTR_RULES ()) #ifdef REAL_SHM - __local u32 s_SPtrans[8][64]; - __local u32 s_skb[8][64]; + LOCAL_AS u32 s_SPtrans[8][64]; + LOCAL_AS u32 s_skb[8][64]; for (u32 i = lid; i < 64; i += lsz) { @@ -60,8 +60,8 @@ __kernel void m03100_m04 (KERN_ATTR_RULES ()) #else - __constant u32a (*s_SPtrans)[64] = c_SPtrans; - __constant u32a (*s_skb)[64] = c_skb; + CONSTANT_AS u32a (*s_SPtrans)[64] = c_SPtrans; + CONSTANT_AS u32a (*s_skb)[64] = c_skb; #endif @@ -240,15 +240,15 @@ __kernel void m03100_m04 (KERN_ATTR_RULES ()) } } -__kernel void m03100_m08 (KERN_ATTR_RULES ()) +KERNEL_FQ void m03100_m08 (KERN_ATTR_RULES ()) { } -__kernel void m03100_m16 (KERN_ATTR_RULES ()) +KERNEL_FQ void m03100_m16 (KERN_ATTR_RULES ()) { } -__kernel void m03100_s04 (KERN_ATTR_RULES ()) +KERNEL_FQ void m03100_s04 (KERN_ATTR_RULES ()) { /** * modifier @@ -264,8 +264,8 @@ __kernel void m03100_s04 (KERN_ATTR_RULES ()) #ifdef REAL_SHM - __local u32 s_SPtrans[8][64]; - __local u32 s_skb[8][64]; + LOCAL_AS u32 s_SPtrans[8][64]; + LOCAL_AS u32 s_skb[8][64]; for (u32 i = lid; i < 64; i += lsz) { @@ -292,8 +292,8 @@ __kernel void m03100_s04 (KERN_ATTR_RULES ()) #else - __constant u32a (*s_SPtrans)[64] = c_SPtrans; - __constant u32a (*s_skb)[64] = c_skb; + CONSTANT_AS u32a (*s_SPtrans)[64] = c_SPtrans; + CONSTANT_AS u32a (*s_skb)[64] = c_skb; #endif @@ -484,10 +484,10 @@ __kernel void m03100_s04 (KERN_ATTR_RULES ()) } } -__kernel void m03100_s08 (KERN_ATTR_RULES ()) +KERNEL_FQ void m03100_s08 (KERN_ATTR_RULES ()) { } -__kernel void m03100_s16 (KERN_ATTR_RULES ()) +KERNEL_FQ void m03100_s16 (KERN_ATTR_RULES ()) { } diff --git a/OpenCL/m03100_a1-optimized.cl b/OpenCL/m03100_a1-optimized.cl index edbfd0cad..d565e1530 100644 --- a/OpenCL/m03100_a1-optimized.cl +++ b/OpenCL/m03100_a1-optimized.cl @@ -14,7 +14,7 @@ #include "inc_cipher_des.cl" #endif -__kernel void m03100_m04 (KERN_ATTR_BASIC ()) +KERNEL_FQ void m03100_m04 (KERN_ATTR_BASIC ()) { /** * modifier @@ -30,8 +30,8 @@ __kernel void m03100_m04 (KERN_ATTR_BASIC ()) #ifdef REAL_SHM - __local u32 s_SPtrans[8][64]; - __local u32 s_skb[8][64]; + LOCAL_AS u32 s_SPtrans[8][64]; + LOCAL_AS u32 s_skb[8][64]; for (u32 i = lid; i < 64; i += lsz) { @@ -58,8 +58,8 @@ __kernel void m03100_m04 (KERN_ATTR_BASIC ()) #else - __constant u32a (*s_SPtrans)[64] = c_SPtrans; - __constant u32a (*s_skb)[64] = c_skb; + CONSTANT_AS u32a (*s_SPtrans)[64] = c_SPtrans; + CONSTANT_AS u32a (*s_skb)[64] = c_skb; #endif @@ -298,15 +298,15 @@ __kernel void m03100_m04 (KERN_ATTR_BASIC ()) } } -__kernel void m03100_m08 (KERN_ATTR_BASIC ()) +KERNEL_FQ void m03100_m08 (KERN_ATTR_BASIC ()) { } -__kernel void m03100_m16 (KERN_ATTR_BASIC ()) +KERNEL_FQ void m03100_m16 (KERN_ATTR_BASIC ()) { } -__kernel void m03100_s04 (KERN_ATTR_BASIC ()) +KERNEL_FQ void m03100_s04 (KERN_ATTR_BASIC ()) { /** * modifier @@ -322,8 +322,8 @@ __kernel void m03100_s04 (KERN_ATTR_BASIC ()) #ifdef REAL_SHM - __local u32 s_SPtrans[8][64]; - __local u32 s_skb[8][64]; + LOCAL_AS u32 s_SPtrans[8][64]; + LOCAL_AS u32 s_skb[8][64]; for (u32 i = lid; i < 64; i += lsz) { @@ -350,8 +350,8 @@ __kernel void m03100_s04 (KERN_ATTR_BASIC ()) #else - __constant u32a (*s_SPtrans)[64] = c_SPtrans; - __constant u32a (*s_skb)[64] = c_skb; + CONSTANT_AS u32a (*s_SPtrans)[64] = c_SPtrans; + CONSTANT_AS u32a (*s_skb)[64] = c_skb; #endif @@ -602,10 +602,10 @@ __kernel void m03100_s04 (KERN_ATTR_BASIC ()) } } -__kernel void m03100_s08 (KERN_ATTR_BASIC ()) +KERNEL_FQ void m03100_s08 (KERN_ATTR_BASIC ()) { } -__kernel void m03100_s16 (KERN_ATTR_BASIC ()) +KERNEL_FQ void m03100_s16 (KERN_ATTR_BASIC ()) { } diff --git a/OpenCL/m03100_a3-optimized.cl b/OpenCL/m03100_a3-optimized.cl index a076f8503..c5c4b98a5 100644 --- a/OpenCL/m03100_a3-optimized.cl +++ b/OpenCL/m03100_a3-optimized.cl @@ -387,7 +387,7 @@ DECLSPEC void m03100s (SHM_TYPE u32 (*s_SPtrans)[64], SHM_TYPE u32 (*s_skb)[64], } } -__kernel void m03100_m04 (KERN_ATTR_VECTOR ()) +KERNEL_FQ void m03100_m04 (KERN_ATTR_VECTOR ()) { /** * modifier @@ -428,8 +428,8 @@ __kernel void m03100_m04 (KERN_ATTR_VECTOR ()) #ifdef REAL_SHM - __local u32 s_SPtrans[8][64]; - __local u32 s_skb[8][64]; + LOCAL_AS u32 s_SPtrans[8][64]; + LOCAL_AS u32 s_skb[8][64]; for (u32 i = lid; i < 64; i += lsz) { @@ -456,8 +456,8 @@ __kernel void m03100_m04 (KERN_ATTR_VECTOR ()) #else - __constant u32a (*s_SPtrans)[64] = c_SPtrans; - __constant u32a (*s_skb)[64] = c_skb; + CONSTANT_AS u32a (*s_SPtrans)[64] = c_SPtrans; + CONSTANT_AS u32a (*s_skb)[64] = c_skb; #endif @@ -470,7 +470,7 @@ __kernel void m03100_m04 (KERN_ATTR_VECTOR ()) m03100m (s_SPtrans, s_skb, w, pw_len, pws, rules_buf, combs_buf, words_buf_r, 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_extra0_buf, d_extra1_buf, d_extra2_buf, d_extra3_buf, bitmap_mask, bitmap_shift1, bitmap_shift2, salt_pos, loop_pos, loop_cnt, il_cnt, digests_cnt, digests_offset, combs_mode, gid_max); } -__kernel void m03100_m08 (KERN_ATTR_VECTOR ()) +KERNEL_FQ void m03100_m08 (KERN_ATTR_VECTOR ()) { /** * modifier @@ -511,8 +511,8 @@ __kernel void m03100_m08 (KERN_ATTR_VECTOR ()) #ifdef REAL_SHM - __local u32 s_SPtrans[8][64]; - __local u32 s_skb[8][64]; + LOCAL_AS u32 s_SPtrans[8][64]; + LOCAL_AS u32 s_skb[8][64]; for (u32 i = lid; i < 64; i += lsz) { @@ -539,8 +539,8 @@ __kernel void m03100_m08 (KERN_ATTR_VECTOR ()) #else - __constant u32a (*s_SPtrans)[64] = c_SPtrans; - __constant u32a (*s_skb)[64] = c_skb; + CONSTANT_AS u32a (*s_SPtrans)[64] = c_SPtrans; + CONSTANT_AS u32a (*s_skb)[64] = c_skb; #endif @@ -553,11 +553,11 @@ __kernel void m03100_m08 (KERN_ATTR_VECTOR ()) m03100m (s_SPtrans, s_skb, w, pw_len, pws, rules_buf, combs_buf, words_buf_r, 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_extra0_buf, d_extra1_buf, d_extra2_buf, d_extra3_buf, bitmap_mask, bitmap_shift1, bitmap_shift2, salt_pos, loop_pos, loop_cnt, il_cnt, digests_cnt, digests_offset, combs_mode, gid_max); } -__kernel void m03100_m16 (KERN_ATTR_VECTOR ()) +KERNEL_FQ void m03100_m16 (KERN_ATTR_VECTOR ()) { } -__kernel void m03100_s04 (KERN_ATTR_VECTOR ()) +KERNEL_FQ void m03100_s04 (KERN_ATTR_VECTOR ()) { /** * modifier @@ -598,8 +598,8 @@ __kernel void m03100_s04 (KERN_ATTR_VECTOR ()) #ifdef REAL_SHM - __local u32 s_SPtrans[8][64]; - __local u32 s_skb[8][64]; + LOCAL_AS u32 s_SPtrans[8][64]; + LOCAL_AS u32 s_skb[8][64]; for (u32 i = lid; i < 64; i += lsz) { @@ -626,8 +626,8 @@ __kernel void m03100_s04 (KERN_ATTR_VECTOR ()) #else - __constant u32a (*s_SPtrans)[64] = c_SPtrans; - __constant u32a (*s_skb)[64] = c_skb; + CONSTANT_AS u32a (*s_SPtrans)[64] = c_SPtrans; + CONSTANT_AS u32a (*s_skb)[64] = c_skb; #endif @@ -640,7 +640,7 @@ __kernel void m03100_s04 (KERN_ATTR_VECTOR ()) m03100s (s_SPtrans, s_skb, w, pw_len, pws, rules_buf, combs_buf, words_buf_r, 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_extra0_buf, d_extra1_buf, d_extra2_buf, d_extra3_buf, bitmap_mask, bitmap_shift1, bitmap_shift2, salt_pos, loop_pos, loop_cnt, il_cnt, digests_cnt, digests_offset, combs_mode, gid_max); } -__kernel void m03100_s08 (KERN_ATTR_VECTOR ()) +KERNEL_FQ void m03100_s08 (KERN_ATTR_VECTOR ()) { /** * modifier @@ -681,8 +681,8 @@ __kernel void m03100_s08 (KERN_ATTR_VECTOR ()) #ifdef REAL_SHM - __local u32 s_SPtrans[8][64]; - __local u32 s_skb[8][64]; + LOCAL_AS u32 s_SPtrans[8][64]; + LOCAL_AS u32 s_skb[8][64]; for (u32 i = lid; i < 64; i += lsz) { @@ -709,8 +709,8 @@ __kernel void m03100_s08 (KERN_ATTR_VECTOR ()) #else - __constant u32a (*s_SPtrans)[64] = c_SPtrans; - __constant u32a (*s_skb)[64] = c_skb; + CONSTANT_AS u32a (*s_SPtrans)[64] = c_SPtrans; + CONSTANT_AS u32a (*s_skb)[64] = c_skb; #endif @@ -723,6 +723,6 @@ __kernel void m03100_s08 (KERN_ATTR_VECTOR ()) m03100s (s_SPtrans, s_skb, w, pw_len, pws, rules_buf, combs_buf, words_buf_r, 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_extra0_buf, d_extra1_buf, d_extra2_buf, d_extra3_buf, bitmap_mask, bitmap_shift1, bitmap_shift2, salt_pos, loop_pos, loop_cnt, il_cnt, digests_cnt, digests_offset, combs_mode, gid_max); } -__kernel void m03100_s16 (KERN_ATTR_VECTOR ()) +KERNEL_FQ void m03100_s16 (KERN_ATTR_VECTOR ()) { } diff --git a/OpenCL/m03200-pure.cl b/OpenCL/m03200-pure.cl index 47c9b4bda..e36855262 100644 --- a/OpenCL/m03200-pure.cl +++ b/OpenCL/m03200-pure.cl @@ -27,7 +27,7 @@ typedef struct bcrypt_tmp // http://www.schneier.com/code/constants.txt -__constant u32a c_sbox0[256] = +CONSTANT_AS u32a c_sbox0[256] = { 0xd1310ba6, 0x98dfb5ac, 0x2ffd72db, 0xd01adfb7, 0xb8e1afed, 0x6a267e96, 0xba7c9045, 0xf12c7f99, @@ -95,7 +95,7 @@ __constant u32a c_sbox0[256] = 0x53b02d5d, 0xa99f8fa1, 0x08ba4799, 0x6e85076a }; -__constant u32a c_sbox1[256] = +CONSTANT_AS u32a c_sbox1[256] = { 0x4b7a70e9, 0xb5b32944, 0xdb75092e, 0xc4192623, 0xad6ea6b0, 0x49a7df7d, 0x9cee60b8, 0x8fedb266, @@ -163,7 +163,7 @@ __constant u32a c_sbox1[256] = 0x153e21e7, 0x8fb03d4a, 0xe6e39f2b, 0xdb83adf7 }; -__constant u32a c_sbox2[256] = +CONSTANT_AS u32a c_sbox2[256] = { 0xe93d5a68, 0x948140f7, 0xf64c261c, 0x94692934, 0x411520f7, 0x7602d4f7, 0xbcf46b2e, 0xd4a20068, @@ -231,7 +231,7 @@ __constant u32a c_sbox2[256] = 0xd79a3234, 0x92638212, 0x670efa8e, 0x406000e0 }; -__constant u32a c_sbox3[256] = +CONSTANT_AS u32a c_sbox3[256] = { 0x3a39ce37, 0xd3faf5cf, 0xabc27737, 0x5ac52d1b, 0x5cb0679e, 0x4fa33742, 0xd3822740, 0x99bc9bbe, @@ -366,7 +366,7 @@ DECLSPEC void expand_key (u32 *E, u32 *W, const int len) } } -__kernel void __attribute__((reqd_work_group_size(FIXED_LOCAL_SIZE, 1, 1))) m03200_init (KERN_ATTR_TMPS (bcrypt_tmp_t)) +KERNEL_FQ void __attribute__((reqd_work_group_size(FIXED_LOCAL_SIZE, 1, 1))) m03200_init (KERN_ATTR_TMPS (bcrypt_tmp_t)) { /** * base @@ -443,15 +443,15 @@ __kernel void __attribute__((reqd_work_group_size(FIXED_LOCAL_SIZE, 1, 1))) m032 * do the key setup */ - __local u32 S0_all[FIXED_LOCAL_SIZE][256]; - __local u32 S1_all[FIXED_LOCAL_SIZE][256]; - __local u32 S2_all[FIXED_LOCAL_SIZE][256]; - __local u32 S3_all[FIXED_LOCAL_SIZE][256]; + LOCAL_AS u32 S0_all[FIXED_LOCAL_SIZE][256]; + LOCAL_AS u32 S1_all[FIXED_LOCAL_SIZE][256]; + LOCAL_AS u32 S2_all[FIXED_LOCAL_SIZE][256]; + LOCAL_AS u32 S3_all[FIXED_LOCAL_SIZE][256]; - __local u32 *S0 = S0_all[lid]; - __local u32 *S1 = S1_all[lid]; - __local u32 *S2 = S2_all[lid]; - __local u32 *S3 = S3_all[lid]; + LOCAL_AS u32 *S0 = S0_all[lid]; + LOCAL_AS u32 *S1 = S1_all[lid]; + LOCAL_AS u32 *S2 = S2_all[lid]; + LOCAL_AS u32 *S3 = S3_all[lid]; // initstate @@ -585,7 +585,7 @@ __kernel void __attribute__((reqd_work_group_size(FIXED_LOCAL_SIZE, 1, 1))) m032 } } -__kernel void __attribute__((reqd_work_group_size(FIXED_LOCAL_SIZE, 1, 1))) m03200_loop (KERN_ATTR_TMPS (bcrypt_tmp_t)) +KERNEL_FQ void __attribute__((reqd_work_group_size(FIXED_LOCAL_SIZE, 1, 1))) m03200_loop (KERN_ATTR_TMPS (bcrypt_tmp_t)) { /** * base @@ -612,15 +612,15 @@ __kernel void __attribute__((reqd_work_group_size(FIXED_LOCAL_SIZE, 1, 1))) m032 P[i] = tmps[gid].P[i]; } - __local u32 S0_all[FIXED_LOCAL_SIZE][256]; - __local u32 S1_all[FIXED_LOCAL_SIZE][256]; - __local u32 S2_all[FIXED_LOCAL_SIZE][256]; - __local u32 S3_all[FIXED_LOCAL_SIZE][256]; + LOCAL_AS u32 S0_all[FIXED_LOCAL_SIZE][256]; + LOCAL_AS u32 S1_all[FIXED_LOCAL_SIZE][256]; + LOCAL_AS u32 S2_all[FIXED_LOCAL_SIZE][256]; + LOCAL_AS u32 S3_all[FIXED_LOCAL_SIZE][256]; - __local u32 *S0 = S0_all[lid]; - __local u32 *S1 = S1_all[lid]; - __local u32 *S2 = S2_all[lid]; - __local u32 *S3 = S3_all[lid]; + LOCAL_AS u32 *S0 = S0_all[lid]; + LOCAL_AS u32 *S1 = S1_all[lid]; + LOCAL_AS u32 *S2 = S2_all[lid]; + LOCAL_AS u32 *S3 = S3_all[lid]; for (u32 i = 0; i < 256; i++) { @@ -777,7 +777,7 @@ __kernel void __attribute__((reqd_work_group_size(FIXED_LOCAL_SIZE, 1, 1))) m032 } } -__kernel void __attribute__((reqd_work_group_size(FIXED_LOCAL_SIZE, 1, 1))) m03200_comp (KERN_ATTR_TMPS (bcrypt_tmp_t)) +KERNEL_FQ void __attribute__((reqd_work_group_size(FIXED_LOCAL_SIZE, 1, 1))) m03200_comp (KERN_ATTR_TMPS (bcrypt_tmp_t)) { /** * base @@ -797,15 +797,15 @@ __kernel void __attribute__((reqd_work_group_size(FIXED_LOCAL_SIZE, 1, 1))) m032 P[i] = tmps[gid].P[i]; } - __local u32 S0_all[FIXED_LOCAL_SIZE][256]; - __local u32 S1_all[FIXED_LOCAL_SIZE][256]; - __local u32 S2_all[FIXED_LOCAL_SIZE][256]; - __local u32 S3_all[FIXED_LOCAL_SIZE][256]; + LOCAL_AS u32 S0_all[FIXED_LOCAL_SIZE][256]; + LOCAL_AS u32 S1_all[FIXED_LOCAL_SIZE][256]; + LOCAL_AS u32 S2_all[FIXED_LOCAL_SIZE][256]; + LOCAL_AS u32 S3_all[FIXED_LOCAL_SIZE][256]; - __local u32 *S0 = S0_all[lid]; - __local u32 *S1 = S1_all[lid]; - __local u32 *S2 = S2_all[lid]; - __local u32 *S3 = S3_all[lid]; + LOCAL_AS u32 *S0 = S0_all[lid]; + LOCAL_AS u32 *S1 = S1_all[lid]; + LOCAL_AS u32 *S2 = S2_all[lid]; + LOCAL_AS u32 *S3 = S3_all[lid]; for (u32 i = 0; i < 256; i++) { diff --git a/OpenCL/m03710_a0-optimized.cl b/OpenCL/m03710_a0-optimized.cl index 7f9e67c28..f1d9ec1c3 100644 --- a/OpenCL/m03710_a0-optimized.cl +++ b/OpenCL/m03710_a0-optimized.cl @@ -27,7 +27,7 @@ #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 m03710_m04 (KERN_ATTR_RULES ()) +KERNEL_FQ void m03710_m04 (KERN_ATTR_RULES ()) { /** * modifier @@ -41,7 +41,7 @@ __kernel void m03710_m04 (KERN_ATTR_RULES ()) * bin2asc table */ - __local u32 l_bin2asc[256]; + LOCAL_AS u32 l_bin2asc[256]; for (u32 i = lid; i < 256; i += lsz) { @@ -334,15 +334,15 @@ __kernel void m03710_m04 (KERN_ATTR_RULES ()) } } -__kernel void m03710_m08 (KERN_ATTR_RULES ()) +KERNEL_FQ void m03710_m08 (KERN_ATTR_RULES ()) { } -__kernel void m03710_m16 (KERN_ATTR_RULES ()) +KERNEL_FQ void m03710_m16 (KERN_ATTR_RULES ()) { } -__kernel void m03710_s04 (KERN_ATTR_RULES ()) +KERNEL_FQ void m03710_s04 (KERN_ATTR_RULES ()) { /** * modifier @@ -356,7 +356,7 @@ __kernel void m03710_s04 (KERN_ATTR_RULES ()) * bin2asc table */ - __local u32 l_bin2asc[256]; + LOCAL_AS u32 l_bin2asc[256]; for (u32 i = lid; i < 256; i += lsz) { @@ -664,10 +664,10 @@ __kernel void m03710_s04 (KERN_ATTR_RULES ()) } } -__kernel void m03710_s08 (KERN_ATTR_RULES ()) +KERNEL_FQ void m03710_s08 (KERN_ATTR_RULES ()) { } -__kernel void m03710_s16 (KERN_ATTR_RULES ()) +KERNEL_FQ void m03710_s16 (KERN_ATTR_RULES ()) { } diff --git a/OpenCL/m03710_a0-pure.cl b/OpenCL/m03710_a0-pure.cl index 3a038550a..1968820c7 100644 --- a/OpenCL/m03710_a0-pure.cl +++ b/OpenCL/m03710_a0-pure.cl @@ -27,7 +27,7 @@ #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 m03710_mxx (KERN_ATTR_RULES ()) +KERNEL_FQ void m03710_mxx (KERN_ATTR_RULES ()) { /** * modifier @@ -41,7 +41,7 @@ __kernel void m03710_mxx (KERN_ATTR_RULES ()) * bin2asc table */ - __local u32 l_bin2asc[256]; + LOCAL_AS u32 l_bin2asc[256]; for (u32 i = lid; i < 256; i += lsz) { @@ -143,7 +143,7 @@ __kernel void m03710_mxx (KERN_ATTR_RULES ()) } } -__kernel void m03710_sxx (KERN_ATTR_RULES ()) +KERNEL_FQ void m03710_sxx (KERN_ATTR_RULES ()) { /** * modifier @@ -157,7 +157,7 @@ __kernel void m03710_sxx (KERN_ATTR_RULES ()) * bin2asc table */ - __local u32 l_bin2asc[256]; + LOCAL_AS u32 l_bin2asc[256]; for (u32 i = lid; i < 256; i += lsz) { diff --git a/OpenCL/m03710_a1-optimized.cl b/OpenCL/m03710_a1-optimized.cl index 7c8272612..6a09adc8d 100644 --- a/OpenCL/m03710_a1-optimized.cl +++ b/OpenCL/m03710_a1-optimized.cl @@ -25,7 +25,7 @@ #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 m03710_m04 (KERN_ATTR_BASIC ()) +KERNEL_FQ void m03710_m04 (KERN_ATTR_BASIC ()) { /** * modifier @@ -39,7 +39,7 @@ __kernel void m03710_m04 (KERN_ATTR_BASIC ()) * bin2asc table */ - __local u32 l_bin2asc[256]; + LOCAL_AS u32 l_bin2asc[256]; for (u32 i = lid; i < 256; i += lsz) { @@ -391,15 +391,15 @@ __kernel void m03710_m04 (KERN_ATTR_BASIC ()) } } -__kernel void m03710_m08 (KERN_ATTR_BASIC ()) +KERNEL_FQ void m03710_m08 (KERN_ATTR_BASIC ()) { } -__kernel void m03710_m16 (KERN_ATTR_BASIC ()) +KERNEL_FQ void m03710_m16 (KERN_ATTR_BASIC ()) { } -__kernel void m03710_s04 (KERN_ATTR_BASIC ()) +KERNEL_FQ void m03710_s04 (KERN_ATTR_BASIC ()) { /** * modifier @@ -413,7 +413,7 @@ __kernel void m03710_s04 (KERN_ATTR_BASIC ()) * bin2asc table */ - __local u32 l_bin2asc[256]; + LOCAL_AS u32 l_bin2asc[256]; for (u32 i = lid; i < 256; i += lsz) { @@ -780,10 +780,10 @@ __kernel void m03710_s04 (KERN_ATTR_BASIC ()) } } -__kernel void m03710_s08 (KERN_ATTR_BASIC ()) +KERNEL_FQ void m03710_s08 (KERN_ATTR_BASIC ()) { } -__kernel void m03710_s16 (KERN_ATTR_BASIC ()) +KERNEL_FQ void m03710_s16 (KERN_ATTR_BASIC ()) { } diff --git a/OpenCL/m03710_a1-pure.cl b/OpenCL/m03710_a1-pure.cl index fe791c484..8f45d0522 100644 --- a/OpenCL/m03710_a1-pure.cl +++ b/OpenCL/m03710_a1-pure.cl @@ -25,7 +25,7 @@ #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 m03710_mxx (KERN_ATTR_BASIC ()) +KERNEL_FQ void m03710_mxx (KERN_ATTR_BASIC ()) { /** * modifier @@ -39,7 +39,7 @@ __kernel void m03710_mxx (KERN_ATTR_BASIC ()) * bin2asc table */ - __local u32 l_bin2asc[256]; + LOCAL_AS u32 l_bin2asc[256]; for (u32 i = lid; i < 256; i += lsz) { @@ -139,7 +139,7 @@ __kernel void m03710_mxx (KERN_ATTR_BASIC ()) } } -__kernel void m03710_sxx (KERN_ATTR_BASIC ()) +KERNEL_FQ void m03710_sxx (KERN_ATTR_BASIC ()) { /** * modifier @@ -153,7 +153,7 @@ __kernel void m03710_sxx (KERN_ATTR_BASIC ()) * bin2asc table */ - __local u32 l_bin2asc[256]; + LOCAL_AS u32 l_bin2asc[256]; for (u32 i = lid; i < 256; i += lsz) { diff --git a/OpenCL/m03710_a3-optimized.cl b/OpenCL/m03710_a3-optimized.cl index f7d3426fc..6feff2427 100644 --- a/OpenCL/m03710_a3-optimized.cl +++ b/OpenCL/m03710_a3-optimized.cl @@ -25,7 +25,7 @@ #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 -DECLSPEC void m03710m (u32 *w0, u32 *w1, u32 *w2, u32 *w3, const u32 pw_len, KERN_ATTR_BASIC (), __local u32 *l_bin2asc) +DECLSPEC void m03710m (u32 *w0, u32 *w1, u32 *w2, u32 *w3, const u32 pw_len, KERN_ATTR_BASIC (), LOCAL_AS u32 *l_bin2asc) { /** * modifier @@ -314,7 +314,7 @@ DECLSPEC void m03710m (u32 *w0, u32 *w1, u32 *w2, u32 *w3, const u32 pw_len, KER } } -DECLSPEC void m03710s (u32 *w0, u32 *w1, u32 *w2, u32 *w3, const u32 pw_len, KERN_ATTR_BASIC (), __local u32 *l_bin2asc) +DECLSPEC void m03710s (u32 *w0, u32 *w1, u32 *w2, u32 *w3, const u32 pw_len, KERN_ATTR_BASIC (), LOCAL_AS u32 *l_bin2asc) { /** * modifier @@ -618,7 +618,7 @@ DECLSPEC void m03710s (u32 *w0, u32 *w1, u32 *w2, u32 *w3, const u32 pw_len, KER } } -__kernel void m03710_m04 (KERN_ATTR_BASIC ()) +KERNEL_FQ void m03710_m04 (KERN_ATTR_BASIC ()) { /** * base @@ -632,7 +632,7 @@ __kernel void m03710_m04 (KERN_ATTR_BASIC ()) * bin2asc table */ - __local u32 l_bin2asc[256]; + LOCAL_AS u32 l_bin2asc[256]; for (u32 i = lid; i < 256; i += lsz) { @@ -688,7 +688,7 @@ __kernel void m03710_m04 (KERN_ATTR_BASIC ()) m03710m (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_extra0_buf, d_extra1_buf, d_extra2_buf, d_extra3_buf, bitmap_mask, bitmap_shift1, bitmap_shift2, salt_pos, loop_pos, loop_cnt, il_cnt, digests_cnt, digests_offset, combs_mode, gid_max, l_bin2asc); } -__kernel void m03710_m08 (KERN_ATTR_BASIC ()) +KERNEL_FQ void m03710_m08 (KERN_ATTR_BASIC ()) { /** * base @@ -736,7 +736,7 @@ __kernel void m03710_m08 (KERN_ATTR_BASIC ()) * bin2asc table */ - __local u32 l_bin2asc[256]; + LOCAL_AS u32 l_bin2asc[256]; for (u32 i = lid; i < 256; i += lsz) { @@ -758,7 +758,7 @@ __kernel void m03710_m08 (KERN_ATTR_BASIC ()) m03710m (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_extra0_buf, d_extra1_buf, d_extra2_buf, d_extra3_buf, bitmap_mask, bitmap_shift1, bitmap_shift2, salt_pos, loop_pos, loop_cnt, il_cnt, digests_cnt, digests_offset, combs_mode, gid_max, l_bin2asc); } -__kernel void m03710_m16 (KERN_ATTR_BASIC ()) +KERNEL_FQ void m03710_m16 (KERN_ATTR_BASIC ()) { /** * base @@ -806,7 +806,7 @@ __kernel void m03710_m16 (KERN_ATTR_BASIC ()) * bin2asc table */ - __local u32 l_bin2asc[256]; + LOCAL_AS u32 l_bin2asc[256]; for (u32 i = lid; i < 256; i += lsz) { @@ -828,7 +828,7 @@ __kernel void m03710_m16 (KERN_ATTR_BASIC ()) m03710m (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_extra0_buf, d_extra1_buf, d_extra2_buf, d_extra3_buf, bitmap_mask, bitmap_shift1, bitmap_shift2, salt_pos, loop_pos, loop_cnt, il_cnt, digests_cnt, digests_offset, combs_mode, gid_max, l_bin2asc); } -__kernel void m03710_s04 (KERN_ATTR_BASIC ()) +KERNEL_FQ void m03710_s04 (KERN_ATTR_BASIC ()) { /** * base @@ -876,7 +876,7 @@ __kernel void m03710_s04 (KERN_ATTR_BASIC ()) * bin2asc table */ - __local u32 l_bin2asc[256]; + LOCAL_AS u32 l_bin2asc[256]; for (u32 i = lid; i < 256; i += lsz) { @@ -898,7 +898,7 @@ __kernel void m03710_s04 (KERN_ATTR_BASIC ()) m03710s (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_extra0_buf, d_extra1_buf, d_extra2_buf, d_extra3_buf, bitmap_mask, bitmap_shift1, bitmap_shift2, salt_pos, loop_pos, loop_cnt, il_cnt, digests_cnt, digests_offset, combs_mode, gid_max, l_bin2asc); } -__kernel void m03710_s08 (KERN_ATTR_BASIC ()) +KERNEL_FQ void m03710_s08 (KERN_ATTR_BASIC ()) { /** * base @@ -946,7 +946,7 @@ __kernel void m03710_s08 (KERN_ATTR_BASIC ()) * bin2asc table */ - __local u32 l_bin2asc[256]; + LOCAL_AS u32 l_bin2asc[256]; for (u32 i = lid; i < 256; i += lsz) { @@ -968,7 +968,7 @@ __kernel void m03710_s08 (KERN_ATTR_BASIC ()) m03710s (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_extra0_buf, d_extra1_buf, d_extra2_buf, d_extra3_buf, bitmap_mask, bitmap_shift1, bitmap_shift2, salt_pos, loop_pos, loop_cnt, il_cnt, digests_cnt, digests_offset, combs_mode, gid_max, l_bin2asc); } -__kernel void m03710_s16 (KERN_ATTR_BASIC ()) +KERNEL_FQ void m03710_s16 (KERN_ATTR_BASIC ()) { /** * base @@ -982,7 +982,7 @@ __kernel void m03710_s16 (KERN_ATTR_BASIC ()) * bin2asc table */ - __local u32 l_bin2asc[256]; + LOCAL_AS u32 l_bin2asc[256]; for (u32 i = lid; i < 256; i += lsz) { diff --git a/OpenCL/m03710_a3-pure.cl b/OpenCL/m03710_a3-pure.cl index def23af1f..342a13974 100644 --- a/OpenCL/m03710_a3-pure.cl +++ b/OpenCL/m03710_a3-pure.cl @@ -25,7 +25,7 @@ #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 m03710_mxx (KERN_ATTR_VECTOR ()) +KERNEL_FQ void m03710_mxx (KERN_ATTR_VECTOR ()) { /** * modifier @@ -39,7 +39,7 @@ __kernel void m03710_mxx (KERN_ATTR_VECTOR ()) * bin2asc table */ - __local u32 l_bin2asc[256]; + LOCAL_AS u32 l_bin2asc[256]; for (u32 i = lid; i < 256; i += lsz) { @@ -152,7 +152,7 @@ __kernel void m03710_mxx (KERN_ATTR_VECTOR ()) } } -__kernel void m03710_sxx (KERN_ATTR_VECTOR ()) +KERNEL_FQ void m03710_sxx (KERN_ATTR_VECTOR ()) { /** * modifier @@ -166,7 +166,7 @@ __kernel void m03710_sxx (KERN_ATTR_VECTOR ()) * bin2asc table */ - __local u32 l_bin2asc[256]; + LOCAL_AS u32 l_bin2asc[256]; for (u32 i = lid; i < 256; i += lsz) { diff --git a/OpenCL/m03800_a0-optimized.cl b/OpenCL/m03800_a0-optimized.cl index 5e670574a..bfc503119 100644 --- a/OpenCL/m03800_a0-optimized.cl +++ b/OpenCL/m03800_a0-optimized.cl @@ -15,7 +15,7 @@ #include "inc_hash_md5.cl" #endif -__kernel void m03800_m04 (KERN_ATTR_RULES ()) +KERNEL_FQ void m03800_m04 (KERN_ATTR_RULES ()) { /** * modifier @@ -246,15 +246,15 @@ __kernel void m03800_m04 (KERN_ATTR_RULES ()) } } -__kernel void m03800_m08 (KERN_ATTR_RULES ()) +KERNEL_FQ void m03800_m08 (KERN_ATTR_RULES ()) { } -__kernel void m03800_m16 (KERN_ATTR_RULES ()) +KERNEL_FQ void m03800_m16 (KERN_ATTR_RULES ()) { } -__kernel void m03800_s04 (KERN_ATTR_RULES ()) +KERNEL_FQ void m03800_s04 (KERN_ATTR_RULES ()) { /** * modifier @@ -500,10 +500,10 @@ __kernel void m03800_s04 (KERN_ATTR_RULES ()) } } -__kernel void m03800_s08 (KERN_ATTR_RULES ()) +KERNEL_FQ void m03800_s08 (KERN_ATTR_RULES ()) { } -__kernel void m03800_s16 (KERN_ATTR_RULES ()) +KERNEL_FQ void m03800_s16 (KERN_ATTR_RULES ()) { } diff --git a/OpenCL/m03800_a0-pure.cl b/OpenCL/m03800_a0-pure.cl index d7350ef67..df14818f5 100644 --- a/OpenCL/m03800_a0-pure.cl +++ b/OpenCL/m03800_a0-pure.cl @@ -15,7 +15,7 @@ #include "inc_hash_md5.cl" #endif -__kernel void m03800_mxx (KERN_ATTR_RULES ()) +KERNEL_FQ void m03800_mxx (KERN_ATTR_RULES ()) { /** * modifier @@ -74,7 +74,7 @@ __kernel void m03800_mxx (KERN_ATTR_RULES ()) } } -__kernel void m03800_sxx (KERN_ATTR_RULES ()) +KERNEL_FQ void m03800_sxx (KERN_ATTR_RULES ()) { /** * modifier diff --git a/OpenCL/m03800_a1-optimized.cl b/OpenCL/m03800_a1-optimized.cl index 00c103966..274f3e35d 100644 --- a/OpenCL/m03800_a1-optimized.cl +++ b/OpenCL/m03800_a1-optimized.cl @@ -13,7 +13,7 @@ #include "inc_hash_md5.cl" #endif -__kernel void m03800_m04 (KERN_ATTR_BASIC ()) +KERNEL_FQ void m03800_m04 (KERN_ATTR_BASIC ()) { /** * modifier @@ -304,15 +304,15 @@ __kernel void m03800_m04 (KERN_ATTR_BASIC ()) } } -__kernel void m03800_m08 (KERN_ATTR_BASIC ()) +KERNEL_FQ void m03800_m08 (KERN_ATTR_BASIC ()) { } -__kernel void m03800_m16 (KERN_ATTR_BASIC ()) +KERNEL_FQ void m03800_m16 (KERN_ATTR_BASIC ()) { } -__kernel void m03800_s04 (KERN_ATTR_BASIC ()) +KERNEL_FQ void m03800_s04 (KERN_ATTR_BASIC ()) { /** * modifier @@ -618,10 +618,10 @@ __kernel void m03800_s04 (KERN_ATTR_BASIC ()) } } -__kernel void m03800_s08 (KERN_ATTR_BASIC ()) +KERNEL_FQ void m03800_s08 (KERN_ATTR_BASIC ()) { } -__kernel void m03800_s16 (KERN_ATTR_BASIC ()) +KERNEL_FQ void m03800_s16 (KERN_ATTR_BASIC ()) { } diff --git a/OpenCL/m03800_a1-pure.cl b/OpenCL/m03800_a1-pure.cl index 824d03034..d63de7d0d 100644 --- a/OpenCL/m03800_a1-pure.cl +++ b/OpenCL/m03800_a1-pure.cl @@ -13,7 +13,7 @@ #include "inc_hash_md5.cl" #endif -__kernel void m03800_mxx (KERN_ATTR_BASIC ()) +KERNEL_FQ void m03800_mxx (KERN_ATTR_BASIC ()) { /** * modifier @@ -68,7 +68,7 @@ __kernel void m03800_mxx (KERN_ATTR_BASIC ()) } } -__kernel void m03800_sxx (KERN_ATTR_BASIC ()) +KERNEL_FQ void m03800_sxx (KERN_ATTR_BASIC ()) { /** * modifier diff --git a/OpenCL/m03800_a3-optimized.cl b/OpenCL/m03800_a3-optimized.cl index c46ed57b0..5fbcffba0 100644 --- a/OpenCL/m03800_a3-optimized.cl +++ b/OpenCL/m03800_a3-optimized.cl @@ -476,7 +476,7 @@ DECLSPEC void m03800s (u32 *w0, u32 *w1, u32 *w2, u32 *w3, const u32 pw_len, KER } } -__kernel void m03800_m04 (KERN_ATTR_BASIC ()) +KERNEL_FQ void m03800_m04 (KERN_ATTR_BASIC ()) { /** * base @@ -529,7 +529,7 @@ __kernel void m03800_m04 (KERN_ATTR_BASIC ()) m03800m (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_extra0_buf, d_extra1_buf, d_extra2_buf, d_extra3_buf, bitmap_mask, bitmap_shift1, bitmap_shift2, salt_pos, loop_pos, loop_cnt, il_cnt, digests_cnt, digests_offset, combs_mode, gid_max); } -__kernel void m03800_m08 (KERN_ATTR_BASIC ()) +KERNEL_FQ void m03800_m08 (KERN_ATTR_BASIC ()) { /** * base @@ -582,7 +582,7 @@ __kernel void m03800_m08 (KERN_ATTR_BASIC ()) m03800m (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_extra0_buf, d_extra1_buf, d_extra2_buf, d_extra3_buf, bitmap_mask, bitmap_shift1, bitmap_shift2, salt_pos, loop_pos, loop_cnt, il_cnt, digests_cnt, digests_offset, combs_mode, gid_max); } -__kernel void m03800_m16 (KERN_ATTR_BASIC ()) +KERNEL_FQ void m03800_m16 (KERN_ATTR_BASIC ()) { /** * base @@ -635,7 +635,7 @@ __kernel void m03800_m16 (KERN_ATTR_BASIC ()) m03800m (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_extra0_buf, d_extra1_buf, d_extra2_buf, d_extra3_buf, bitmap_mask, bitmap_shift1, bitmap_shift2, salt_pos, loop_pos, loop_cnt, il_cnt, digests_cnt, digests_offset, combs_mode, gid_max); } -__kernel void m03800_s04 (KERN_ATTR_BASIC ()) +KERNEL_FQ void m03800_s04 (KERN_ATTR_BASIC ()) { /** * base @@ -688,7 +688,7 @@ __kernel void m03800_s04 (KERN_ATTR_BASIC ()) m03800s (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_extra0_buf, d_extra1_buf, d_extra2_buf, d_extra3_buf, bitmap_mask, bitmap_shift1, bitmap_shift2, salt_pos, loop_pos, loop_cnt, il_cnt, digests_cnt, digests_offset, combs_mode, gid_max); } -__kernel void m03800_s08 (KERN_ATTR_BASIC ()) +KERNEL_FQ void m03800_s08 (KERN_ATTR_BASIC ()) { /** * base @@ -741,7 +741,7 @@ __kernel void m03800_s08 (KERN_ATTR_BASIC ()) m03800s (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_extra0_buf, d_extra1_buf, d_extra2_buf, d_extra3_buf, bitmap_mask, bitmap_shift1, bitmap_shift2, salt_pos, loop_pos, loop_cnt, il_cnt, digests_cnt, digests_offset, combs_mode, gid_max); } -__kernel void m03800_s16 (KERN_ATTR_BASIC ()) +KERNEL_FQ void m03800_s16 (KERN_ATTR_BASIC ()) { /** * base diff --git a/OpenCL/m03800_a3-pure.cl b/OpenCL/m03800_a3-pure.cl index 709e5dd3a..f45ff5b8e 100644 --- a/OpenCL/m03800_a3-pure.cl +++ b/OpenCL/m03800_a3-pure.cl @@ -13,7 +13,7 @@ #include "inc_hash_md5.cl" #endif -__kernel void m03800_mxx (KERN_ATTR_VECTOR ()) +KERNEL_FQ void m03800_mxx (KERN_ATTR_VECTOR ()) { /** * modifier @@ -85,7 +85,7 @@ __kernel void m03800_mxx (KERN_ATTR_VECTOR ()) } } -__kernel void m03800_sxx (KERN_ATTR_VECTOR ()) +KERNEL_FQ void m03800_sxx (KERN_ATTR_VECTOR ()) { /** * modifier diff --git a/OpenCL/m03910_a0-optimized.cl b/OpenCL/m03910_a0-optimized.cl index ce2320047..30462282a 100644 --- a/OpenCL/m03910_a0-optimized.cl +++ b/OpenCL/m03910_a0-optimized.cl @@ -27,7 +27,7 @@ #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 m03910_m04 (KERN_ATTR_RULES ()) +KERNEL_FQ void m03910_m04 (KERN_ATTR_RULES ()) { /** * modifier @@ -41,7 +41,7 @@ __kernel void m03910_m04 (KERN_ATTR_RULES ()) * bin2asc table */ - __local u32 l_bin2asc[256]; + LOCAL_AS u32 l_bin2asc[256]; for (u32 i = lid; i < 256; i += lsz) { @@ -389,15 +389,15 @@ __kernel void m03910_m04 (KERN_ATTR_RULES ()) } } -__kernel void m03910_m08 (KERN_ATTR_RULES ()) +KERNEL_FQ void m03910_m08 (KERN_ATTR_RULES ()) { } -__kernel void m03910_m16 (KERN_ATTR_RULES ()) +KERNEL_FQ void m03910_m16 (KERN_ATTR_RULES ()) { } -__kernel void m03910_s04 (KERN_ATTR_RULES ()) +KERNEL_FQ void m03910_s04 (KERN_ATTR_RULES ()) { /** * modifier @@ -411,7 +411,7 @@ __kernel void m03910_s04 (KERN_ATTR_RULES ()) * bin2asc table */ - __local u32 l_bin2asc[256]; + LOCAL_AS u32 l_bin2asc[256]; for (u32 i = lid; i < 256; i += lsz) { @@ -774,10 +774,10 @@ __kernel void m03910_s04 (KERN_ATTR_RULES ()) } } -__kernel void m03910_s08 (KERN_ATTR_RULES ()) +KERNEL_FQ void m03910_s08 (KERN_ATTR_RULES ()) { } -__kernel void m03910_s16 (KERN_ATTR_RULES ()) +KERNEL_FQ void m03910_s16 (KERN_ATTR_RULES ()) { } diff --git a/OpenCL/m03910_a0-pure.cl b/OpenCL/m03910_a0-pure.cl index 2ee648879..3b7a85d3b 100644 --- a/OpenCL/m03910_a0-pure.cl +++ b/OpenCL/m03910_a0-pure.cl @@ -27,7 +27,7 @@ #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 m03910_mxx (KERN_ATTR_RULES ()) +KERNEL_FQ void m03910_mxx (KERN_ATTR_RULES ()) { /** * modifier @@ -41,7 +41,7 @@ __kernel void m03910_mxx (KERN_ATTR_RULES ()) * bin2asc table */ - __local u32 l_bin2asc[256]; + LOCAL_AS u32 l_bin2asc[256]; for (u32 i = lid; i < 256; i += lsz) { @@ -153,7 +153,7 @@ __kernel void m03910_mxx (KERN_ATTR_RULES ()) } } -__kernel void m03910_sxx (KERN_ATTR_RULES ()) +KERNEL_FQ void m03910_sxx (KERN_ATTR_RULES ()) { /** * modifier @@ -167,7 +167,7 @@ __kernel void m03910_sxx (KERN_ATTR_RULES ()) * bin2asc table */ - __local u32 l_bin2asc[256]; + LOCAL_AS u32 l_bin2asc[256]; for (u32 i = lid; i < 256; i += lsz) { diff --git a/OpenCL/m03910_a1-optimized.cl b/OpenCL/m03910_a1-optimized.cl index 3e6858b99..9e0a4b377 100644 --- a/OpenCL/m03910_a1-optimized.cl +++ b/OpenCL/m03910_a1-optimized.cl @@ -25,7 +25,7 @@ #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 m03910_m04 (KERN_ATTR_BASIC ()) +KERNEL_FQ void m03910_m04 (KERN_ATTR_BASIC ()) { /** * modifier @@ -39,7 +39,7 @@ __kernel void m03910_m04 (KERN_ATTR_BASIC ()) * bin2asc table */ - __local u32 l_bin2asc[256]; + LOCAL_AS u32 l_bin2asc[256]; for (u32 i = lid; i < 256; i += lsz) { @@ -446,15 +446,15 @@ __kernel void m03910_m04 (KERN_ATTR_BASIC ()) } } -__kernel void m03910_m08 (KERN_ATTR_BASIC ()) +KERNEL_FQ void m03910_m08 (KERN_ATTR_BASIC ()) { } -__kernel void m03910_m16 (KERN_ATTR_BASIC ()) +KERNEL_FQ void m03910_m16 (KERN_ATTR_BASIC ()) { } -__kernel void m03910_s04 (KERN_ATTR_BASIC ()) +KERNEL_FQ void m03910_s04 (KERN_ATTR_BASIC ()) { /** * modifier @@ -468,7 +468,7 @@ __kernel void m03910_s04 (KERN_ATTR_BASIC ()) * bin2asc table */ - __local u32 l_bin2asc[256]; + LOCAL_AS u32 l_bin2asc[256]; for (u32 i = lid; i < 256; i += lsz) { @@ -890,10 +890,10 @@ __kernel void m03910_s04 (KERN_ATTR_BASIC ()) } } -__kernel void m03910_s08 (KERN_ATTR_BASIC ()) +KERNEL_FQ void m03910_s08 (KERN_ATTR_BASIC ()) { } -__kernel void m03910_s16 (KERN_ATTR_BASIC ()) +KERNEL_FQ void m03910_s16 (KERN_ATTR_BASIC ()) { } diff --git a/OpenCL/m03910_a1-pure.cl b/OpenCL/m03910_a1-pure.cl index d2b021663..104fe563e 100644 --- a/OpenCL/m03910_a1-pure.cl +++ b/OpenCL/m03910_a1-pure.cl @@ -25,7 +25,7 @@ #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 m03910_mxx (KERN_ATTR_BASIC ()) +KERNEL_FQ void m03910_mxx (KERN_ATTR_BASIC ()) { /** * modifier @@ -39,7 +39,7 @@ __kernel void m03910_mxx (KERN_ATTR_BASIC ()) * bin2asc table */ - __local u32 l_bin2asc[256]; + LOCAL_AS u32 l_bin2asc[256]; for (u32 i = lid; i < 256; i += lsz) { @@ -149,7 +149,7 @@ __kernel void m03910_mxx (KERN_ATTR_BASIC ()) } } -__kernel void m03910_sxx (KERN_ATTR_BASIC ()) +KERNEL_FQ void m03910_sxx (KERN_ATTR_BASIC ()) { /** * modifier @@ -163,7 +163,7 @@ __kernel void m03910_sxx (KERN_ATTR_BASIC ()) * bin2asc table */ - __local u32 l_bin2asc[256]; + LOCAL_AS u32 l_bin2asc[256]; for (u32 i = lid; i < 256; i += lsz) { diff --git a/OpenCL/m03910_a3-optimized.cl b/OpenCL/m03910_a3-optimized.cl index ebcb15b9c..f38c31f54 100644 --- a/OpenCL/m03910_a3-optimized.cl +++ b/OpenCL/m03910_a3-optimized.cl @@ -25,7 +25,7 @@ #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 -DECLSPEC void m03910m (u32 *w0, u32 *w1, u32 *w2, u32 *w3, const u32 pw_len, KERN_ATTR_BASIC (), __local u32 *l_bin2asc) +DECLSPEC void m03910m (u32 *w0, u32 *w1, u32 *w2, u32 *w3, const u32 pw_len, KERN_ATTR_BASIC (), LOCAL_AS u32 *l_bin2asc) { /** * modifier @@ -369,7 +369,7 @@ DECLSPEC void m03910m (u32 *w0, u32 *w1, u32 *w2, u32 *w3, const u32 pw_len, KER } } -DECLSPEC void m03910s (u32 *w0, u32 *w1, u32 *w2, u32 *w3, const u32 pw_len, KERN_ATTR_BASIC (), __local u32 *l_bin2asc) +DECLSPEC void m03910s (u32 *w0, u32 *w1, u32 *w2, u32 *w3, const u32 pw_len, KERN_ATTR_BASIC (), LOCAL_AS u32 *l_bin2asc) { /** * modifier @@ -728,7 +728,7 @@ DECLSPEC void m03910s (u32 *w0, u32 *w1, u32 *w2, u32 *w3, const u32 pw_len, KER } } -__kernel void m03910_m04 (KERN_ATTR_BASIC ()) +KERNEL_FQ void m03910_m04 (KERN_ATTR_BASIC ()) { /** * base @@ -776,7 +776,7 @@ __kernel void m03910_m04 (KERN_ATTR_BASIC ()) * bin2asc table */ - __local u32 l_bin2asc[256]; + LOCAL_AS u32 l_bin2asc[256]; for (u32 i = lid; i < 256; i += lsz) { @@ -798,7 +798,7 @@ __kernel void m03910_m04 (KERN_ATTR_BASIC ()) m03910m (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_extra0_buf, d_extra1_buf, d_extra2_buf, d_extra3_buf, bitmap_mask, bitmap_shift1, bitmap_shift2, salt_pos, loop_pos, loop_cnt, il_cnt, digests_cnt, digests_offset, combs_mode, gid_max, l_bin2asc); } -__kernel void m03910_m08 (KERN_ATTR_BASIC ()) +KERNEL_FQ void m03910_m08 (KERN_ATTR_BASIC ()) { /** * base @@ -846,7 +846,7 @@ __kernel void m03910_m08 (KERN_ATTR_BASIC ()) * bin2asc table */ - __local u32 l_bin2asc[256]; + LOCAL_AS u32 l_bin2asc[256]; for (u32 i = lid; i < 256; i += lsz) { @@ -868,7 +868,7 @@ __kernel void m03910_m08 (KERN_ATTR_BASIC ()) m03910m (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_extra0_buf, d_extra1_buf, d_extra2_buf, d_extra3_buf, bitmap_mask, bitmap_shift1, bitmap_shift2, salt_pos, loop_pos, loop_cnt, il_cnt, digests_cnt, digests_offset, combs_mode, gid_max, l_bin2asc); } -__kernel void m03910_m16 (KERN_ATTR_BASIC ()) +KERNEL_FQ void m03910_m16 (KERN_ATTR_BASIC ()) { /** * base @@ -916,7 +916,7 @@ __kernel void m03910_m16 (KERN_ATTR_BASIC ()) * bin2asc table */ - __local u32 l_bin2asc[256]; + LOCAL_AS u32 l_bin2asc[256]; for (u32 i = lid; i < 256; i += lsz) { @@ -938,7 +938,7 @@ __kernel void m03910_m16 (KERN_ATTR_BASIC ()) m03910m (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_extra0_buf, d_extra1_buf, d_extra2_buf, d_extra3_buf, bitmap_mask, bitmap_shift1, bitmap_shift2, salt_pos, loop_pos, loop_cnt, il_cnt, digests_cnt, digests_offset, combs_mode, gid_max, l_bin2asc); } -__kernel void m03910_s04 (KERN_ATTR_BASIC ()) +KERNEL_FQ void m03910_s04 (KERN_ATTR_BASIC ()) { /** * base @@ -986,7 +986,7 @@ __kernel void m03910_s04 (KERN_ATTR_BASIC ()) * bin2asc table */ - __local u32 l_bin2asc[256]; + LOCAL_AS u32 l_bin2asc[256]; for (u32 i = lid; i < 256; i += lsz) { @@ -1008,7 +1008,7 @@ __kernel void m03910_s04 (KERN_ATTR_BASIC ()) m03910s (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_extra0_buf, d_extra1_buf, d_extra2_buf, d_extra3_buf, bitmap_mask, bitmap_shift1, bitmap_shift2, salt_pos, loop_pos, loop_cnt, il_cnt, digests_cnt, digests_offset, combs_mode, gid_max, l_bin2asc); } -__kernel void m03910_s08 (KERN_ATTR_BASIC ()) +KERNEL_FQ void m03910_s08 (KERN_ATTR_BASIC ()) { /** * base @@ -1056,7 +1056,7 @@ __kernel void m03910_s08 (KERN_ATTR_BASIC ()) * bin2asc table */ - __local u32 l_bin2asc[256]; + LOCAL_AS u32 l_bin2asc[256]; for (u32 i = lid; i < 256; i += lsz) { @@ -1078,7 +1078,7 @@ __kernel void m03910_s08 (KERN_ATTR_BASIC ()) m03910s (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_extra0_buf, d_extra1_buf, d_extra2_buf, d_extra3_buf, bitmap_mask, bitmap_shift1, bitmap_shift2, salt_pos, loop_pos, loop_cnt, il_cnt, digests_cnt, digests_offset, combs_mode, gid_max, l_bin2asc); } -__kernel void m03910_s16 (KERN_ATTR_BASIC ()) +KERNEL_FQ void m03910_s16 (KERN_ATTR_BASIC ()) { /** * base @@ -1126,7 +1126,7 @@ __kernel void m03910_s16 (KERN_ATTR_BASIC ()) * bin2asc table */ - __local u32 l_bin2asc[256]; + LOCAL_AS u32 l_bin2asc[256]; for (u32 i = lid; i < 256; i += lsz) { diff --git a/OpenCL/m03910_a3-pure.cl b/OpenCL/m03910_a3-pure.cl index e6bb8cdf2..5b583f2d2 100644 --- a/OpenCL/m03910_a3-pure.cl +++ b/OpenCL/m03910_a3-pure.cl @@ -25,7 +25,7 @@ #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 m03910_mxx (KERN_ATTR_VECTOR ()) +KERNEL_FQ void m03910_mxx (KERN_ATTR_VECTOR ()) { /** * modifier @@ -39,7 +39,7 @@ __kernel void m03910_mxx (KERN_ATTR_VECTOR ()) * bin2asc table */ - __local u32 l_bin2asc[256]; + LOCAL_AS u32 l_bin2asc[256]; for (u32 i = lid; i < 256; i += lsz) { @@ -162,7 +162,7 @@ __kernel void m03910_mxx (KERN_ATTR_VECTOR ()) } } -__kernel void m03910_sxx (KERN_ATTR_VECTOR ()) +KERNEL_FQ void m03910_sxx (KERN_ATTR_VECTOR ()) { /** * modifier @@ -176,7 +176,7 @@ __kernel void m03910_sxx (KERN_ATTR_VECTOR ()) * bin2asc table */ - __local u32 l_bin2asc[256]; + LOCAL_AS u32 l_bin2asc[256]; for (u32 i = lid; i < 256; i += lsz) { diff --git a/OpenCL/m04010_a0-optimized.cl b/OpenCL/m04010_a0-optimized.cl index 73598613c..9d8c97819 100644 --- a/OpenCL/m04010_a0-optimized.cl +++ b/OpenCL/m04010_a0-optimized.cl @@ -27,7 +27,7 @@ #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 m04010_m04 (KERN_ATTR_RULES ()) +KERNEL_FQ void m04010_m04 (KERN_ATTR_RULES ()) { /** * modifier @@ -41,7 +41,7 @@ __kernel void m04010_m04 (KERN_ATTR_RULES ()) * bin2asc table */ - __local u32 l_bin2asc[256]; + LOCAL_AS u32 l_bin2asc[256]; for (u32 i = lid; i < 256; i += lsz) { @@ -360,15 +360,15 @@ __kernel void m04010_m04 (KERN_ATTR_RULES ()) } } -__kernel void m04010_m08 (KERN_ATTR_RULES ()) +KERNEL_FQ void m04010_m08 (KERN_ATTR_RULES ()) { } -__kernel void m04010_m16 (KERN_ATTR_RULES ()) +KERNEL_FQ void m04010_m16 (KERN_ATTR_RULES ()) { } -__kernel void m04010_s04 (KERN_ATTR_RULES ()) +KERNEL_FQ void m04010_s04 (KERN_ATTR_RULES ()) { /** * modifier @@ -382,7 +382,7 @@ __kernel void m04010_s04 (KERN_ATTR_RULES ()) * bin2asc table */ - __local u32 l_bin2asc[256]; + LOCAL_AS u32 l_bin2asc[256]; for (u32 i = lid; i < 256; i += lsz) { @@ -716,10 +716,10 @@ __kernel void m04010_s04 (KERN_ATTR_RULES ()) } } -__kernel void m04010_s08 (KERN_ATTR_RULES ()) +KERNEL_FQ void m04010_s08 (KERN_ATTR_RULES ()) { } -__kernel void m04010_s16 (KERN_ATTR_RULES ()) +KERNEL_FQ void m04010_s16 (KERN_ATTR_RULES ()) { } diff --git a/OpenCL/m04010_a0-pure.cl b/OpenCL/m04010_a0-pure.cl index 7999b8241..0eab0a63b 100644 --- a/OpenCL/m04010_a0-pure.cl +++ b/OpenCL/m04010_a0-pure.cl @@ -27,7 +27,7 @@ #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 m04010_mxx (KERN_ATTR_RULES ()) +KERNEL_FQ void m04010_mxx (KERN_ATTR_RULES ()) { /** * modifier @@ -41,7 +41,7 @@ __kernel void m04010_mxx (KERN_ATTR_RULES ()) * bin2asc table */ - __local u32 l_bin2asc[256]; + LOCAL_AS u32 l_bin2asc[256]; for (u32 i = lid; i < 256; i += lsz) { @@ -134,7 +134,7 @@ __kernel void m04010_mxx (KERN_ATTR_RULES ()) } } -__kernel void m04010_sxx (KERN_ATTR_RULES ()) +KERNEL_FQ void m04010_sxx (KERN_ATTR_RULES ()) { /** * modifier @@ -148,7 +148,7 @@ __kernel void m04010_sxx (KERN_ATTR_RULES ()) * bin2asc table */ - __local u32 l_bin2asc[256]; + LOCAL_AS u32 l_bin2asc[256]; for (u32 i = lid; i < 256; i += lsz) { diff --git a/OpenCL/m04010_a1-optimized.cl b/OpenCL/m04010_a1-optimized.cl index c122168e1..2d9d5ac11 100644 --- a/OpenCL/m04010_a1-optimized.cl +++ b/OpenCL/m04010_a1-optimized.cl @@ -25,7 +25,7 @@ #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 m04010_m04 (KERN_ATTR_BASIC ()) +KERNEL_FQ void m04010_m04 (KERN_ATTR_BASIC ()) { /** * modifier @@ -39,7 +39,7 @@ __kernel void m04010_m04 (KERN_ATTR_BASIC ()) * bin2asc table */ - __local u32 l_bin2asc[256]; + LOCAL_AS u32 l_bin2asc[256]; for (u32 i = lid; i < 256; i += lsz) { @@ -416,15 +416,15 @@ __kernel void m04010_m04 (KERN_ATTR_BASIC ()) } } -__kernel void m04010_m08 (KERN_ATTR_BASIC ()) +KERNEL_FQ void m04010_m08 (KERN_ATTR_BASIC ()) { } -__kernel void m04010_m16 (KERN_ATTR_BASIC ()) +KERNEL_FQ void m04010_m16 (KERN_ATTR_BASIC ()) { } -__kernel void m04010_s04 (KERN_ATTR_BASIC ()) +KERNEL_FQ void m04010_s04 (KERN_ATTR_BASIC ()) { /** * modifier @@ -438,7 +438,7 @@ __kernel void m04010_s04 (KERN_ATTR_BASIC ()) * bin2asc table */ - __local u32 l_bin2asc[256]; + LOCAL_AS u32 l_bin2asc[256]; for (u32 i = lid; i < 256; i += lsz) { @@ -830,10 +830,10 @@ __kernel void m04010_s04 (KERN_ATTR_BASIC ()) } } -__kernel void m04010_s08 (KERN_ATTR_BASIC ()) +KERNEL_FQ void m04010_s08 (KERN_ATTR_BASIC ()) { } -__kernel void m04010_s16 (KERN_ATTR_BASIC ()) +KERNEL_FQ void m04010_s16 (KERN_ATTR_BASIC ()) { } diff --git a/OpenCL/m04010_a1-pure.cl b/OpenCL/m04010_a1-pure.cl index 671c852b6..66d5c9f55 100644 --- a/OpenCL/m04010_a1-pure.cl +++ b/OpenCL/m04010_a1-pure.cl @@ -25,7 +25,7 @@ #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 m04010_mxx (KERN_ATTR_BASIC ()) +KERNEL_FQ void m04010_mxx (KERN_ATTR_BASIC ()) { /** * modifier @@ -39,7 +39,7 @@ __kernel void m04010_mxx (KERN_ATTR_BASIC ()) * bin2asc table */ - __local u32 l_bin2asc[256]; + LOCAL_AS u32 l_bin2asc[256]; for (u32 i = lid; i < 256; i += lsz) { @@ -130,7 +130,7 @@ __kernel void m04010_mxx (KERN_ATTR_BASIC ()) } } -__kernel void m04010_sxx (KERN_ATTR_BASIC ()) +KERNEL_FQ void m04010_sxx (KERN_ATTR_BASIC ()) { /** * modifier @@ -144,7 +144,7 @@ __kernel void m04010_sxx (KERN_ATTR_BASIC ()) * bin2asc table */ - __local u32 l_bin2asc[256]; + LOCAL_AS u32 l_bin2asc[256]; for (u32 i = lid; i < 256; i += lsz) { diff --git a/OpenCL/m04010_a3-optimized.cl b/OpenCL/m04010_a3-optimized.cl index 79d2b28e8..34d678766 100644 --- a/OpenCL/m04010_a3-optimized.cl +++ b/OpenCL/m04010_a3-optimized.cl @@ -25,7 +25,7 @@ #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 -DECLSPEC void m04010m (u32 *w0, u32 *w1, u32 *w2, u32 *w3, const u32 pw_len, KERN_ATTR_BASIC (), __local u32 *l_bin2asc) +DECLSPEC void m04010m (u32 *w0, u32 *w1, u32 *w2, u32 *w3, const u32 pw_len, KERN_ATTR_BASIC (), LOCAL_AS u32 *l_bin2asc) { /** * modifier @@ -334,7 +334,7 @@ DECLSPEC void m04010m (u32 *w0, u32 *w1, u32 *w2, u32 *w3, const u32 pw_len, KER } } -DECLSPEC void m04010s (u32 *w0, u32 *w1, u32 *w2, u32 *w3, const u32 pw_len, KERN_ATTR_BASIC (), __local u32 *l_bin2asc) +DECLSPEC void m04010s (u32 *w0, u32 *w1, u32 *w2, u32 *w3, const u32 pw_len, KERN_ATTR_BASIC (), LOCAL_AS u32 *l_bin2asc) { /** * modifier @@ -658,7 +658,7 @@ DECLSPEC void m04010s (u32 *w0, u32 *w1, u32 *w2, u32 *w3, const u32 pw_len, KER } } -__kernel void m04010_m04 (KERN_ATTR_BASIC ()) +KERNEL_FQ void m04010_m04 (KERN_ATTR_BASIC ()) { /** * base @@ -672,7 +672,7 @@ __kernel void m04010_m04 (KERN_ATTR_BASIC ()) * bin2asc table */ - __local u32 l_bin2asc[256]; + LOCAL_AS u32 l_bin2asc[256]; for (u32 i = lid; i < 256; i += lsz) { @@ -728,7 +728,7 @@ __kernel void m04010_m04 (KERN_ATTR_BASIC ()) m04010m (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_extra0_buf, d_extra1_buf, d_extra2_buf, d_extra3_buf, bitmap_mask, bitmap_shift1, bitmap_shift2, salt_pos, loop_pos, loop_cnt, il_cnt, digests_cnt, digests_offset, combs_mode, gid_max, l_bin2asc); } -__kernel void m04010_m08 (KERN_ATTR_BASIC ()) +KERNEL_FQ void m04010_m08 (KERN_ATTR_BASIC ()) { /** * base @@ -776,7 +776,7 @@ __kernel void m04010_m08 (KERN_ATTR_BASIC ()) * bin2asc table */ - __local u32 l_bin2asc[256]; + LOCAL_AS u32 l_bin2asc[256]; for (u32 i = lid; i < 256; i += lsz) { @@ -798,7 +798,7 @@ __kernel void m04010_m08 (KERN_ATTR_BASIC ()) m04010m (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_extra0_buf, d_extra1_buf, d_extra2_buf, d_extra3_buf, bitmap_mask, bitmap_shift1, bitmap_shift2, salt_pos, loop_pos, loop_cnt, il_cnt, digests_cnt, digests_offset, combs_mode, gid_max, l_bin2asc); } -__kernel void m04010_m16 (KERN_ATTR_BASIC ()) +KERNEL_FQ void m04010_m16 (KERN_ATTR_BASIC ()) { /** * base @@ -846,7 +846,7 @@ __kernel void m04010_m16 (KERN_ATTR_BASIC ()) * bin2asc table */ - __local u32 l_bin2asc[256]; + LOCAL_AS u32 l_bin2asc[256]; for (u32 i = lid; i < 256; i += lsz) { @@ -868,7 +868,7 @@ __kernel void m04010_m16 (KERN_ATTR_BASIC ()) m04010m (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_extra0_buf, d_extra1_buf, d_extra2_buf, d_extra3_buf, bitmap_mask, bitmap_shift1, bitmap_shift2, salt_pos, loop_pos, loop_cnt, il_cnt, digests_cnt, digests_offset, combs_mode, gid_max, l_bin2asc); } -__kernel void m04010_s04 (KERN_ATTR_BASIC ()) +KERNEL_FQ void m04010_s04 (KERN_ATTR_BASIC ()) { /** * base @@ -916,7 +916,7 @@ __kernel void m04010_s04 (KERN_ATTR_BASIC ()) * bin2asc table */ - __local u32 l_bin2asc[256]; + LOCAL_AS u32 l_bin2asc[256]; for (u32 i = lid; i < 256; i += lsz) { @@ -938,7 +938,7 @@ __kernel void m04010_s04 (KERN_ATTR_BASIC ()) m04010s (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_extra0_buf, d_extra1_buf, d_extra2_buf, d_extra3_buf, bitmap_mask, bitmap_shift1, bitmap_shift2, salt_pos, loop_pos, loop_cnt, il_cnt, digests_cnt, digests_offset, combs_mode, gid_max, l_bin2asc); } -__kernel void m04010_s08 (KERN_ATTR_BASIC ()) +KERNEL_FQ void m04010_s08 (KERN_ATTR_BASIC ()) { /** * base @@ -986,7 +986,7 @@ __kernel void m04010_s08 (KERN_ATTR_BASIC ()) * bin2asc table */ - __local u32 l_bin2asc[256]; + LOCAL_AS u32 l_bin2asc[256]; for (u32 i = lid; i < 256; i += lsz) { @@ -1008,7 +1008,7 @@ __kernel void m04010_s08 (KERN_ATTR_BASIC ()) m04010s (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_extra0_buf, d_extra1_buf, d_extra2_buf, d_extra3_buf, bitmap_mask, bitmap_shift1, bitmap_shift2, salt_pos, loop_pos, loop_cnt, il_cnt, digests_cnt, digests_offset, combs_mode, gid_max, l_bin2asc); } -__kernel void m04010_s16 (KERN_ATTR_BASIC ()) +KERNEL_FQ void m04010_s16 (KERN_ATTR_BASIC ()) { /** * base @@ -1022,7 +1022,7 @@ __kernel void m04010_s16 (KERN_ATTR_BASIC ()) * bin2asc table */ - __local u32 l_bin2asc[256]; + LOCAL_AS u32 l_bin2asc[256]; for (u32 i = lid; i < 256; i += lsz) { diff --git a/OpenCL/m04010_a3-pure.cl b/OpenCL/m04010_a3-pure.cl index 366a36b9d..be45c592f 100644 --- a/OpenCL/m04010_a3-pure.cl +++ b/OpenCL/m04010_a3-pure.cl @@ -25,7 +25,7 @@ #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 m04010_mxx (KERN_ATTR_VECTOR ()) +KERNEL_FQ void m04010_mxx (KERN_ATTR_VECTOR ()) { /** * modifier @@ -39,7 +39,7 @@ __kernel void m04010_mxx (KERN_ATTR_VECTOR ()) * bin2asc table */ - __local u32 l_bin2asc[256]; + LOCAL_AS u32 l_bin2asc[256]; for (u32 i = lid; i < 256; i += lsz) { @@ -147,7 +147,7 @@ __kernel void m04010_mxx (KERN_ATTR_VECTOR ()) } } -__kernel void m04010_sxx (KERN_ATTR_VECTOR ()) +KERNEL_FQ void m04010_sxx (KERN_ATTR_VECTOR ()) { /** * modifier @@ -161,7 +161,7 @@ __kernel void m04010_sxx (KERN_ATTR_VECTOR ()) * bin2asc table */ - __local u32 l_bin2asc[256]; + LOCAL_AS u32 l_bin2asc[256]; for (u32 i = lid; i < 256; i += lsz) { diff --git a/OpenCL/m04110_a0-optimized.cl b/OpenCL/m04110_a0-optimized.cl index dd8cafe1d..e23175f52 100644 --- a/OpenCL/m04110_a0-optimized.cl +++ b/OpenCL/m04110_a0-optimized.cl @@ -27,7 +27,7 @@ #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 m04110_m04 (KERN_ATTR_RULES ()) +KERNEL_FQ void m04110_m04 (KERN_ATTR_RULES ()) { /** * modifier @@ -41,7 +41,7 @@ __kernel void m04110_m04 (KERN_ATTR_RULES ()) * bin2asc table */ - __local u32 l_bin2asc[256]; + LOCAL_AS u32 l_bin2asc[256]; for (u32 i = lid; i < 256; i += lsz) { @@ -405,15 +405,15 @@ __kernel void m04110_m04 (KERN_ATTR_RULES ()) } } -__kernel void m04110_m08 (KERN_ATTR_RULES ()) +KERNEL_FQ void m04110_m08 (KERN_ATTR_RULES ()) { } -__kernel void m04110_m16 (KERN_ATTR_RULES ()) +KERNEL_FQ void m04110_m16 (KERN_ATTR_RULES ()) { } -__kernel void m04110_s04 (KERN_ATTR_RULES ()) +KERNEL_FQ void m04110_s04 (KERN_ATTR_RULES ()) { /** * modifier @@ -427,7 +427,7 @@ __kernel void m04110_s04 (KERN_ATTR_RULES ()) * bin2asc table */ - __local u32 l_bin2asc[256]; + LOCAL_AS u32 l_bin2asc[256]; for (u32 i = lid; i < 256; i += lsz) { @@ -806,10 +806,10 @@ __kernel void m04110_s04 (KERN_ATTR_RULES ()) } } -__kernel void m04110_s08 (KERN_ATTR_RULES ()) +KERNEL_FQ void m04110_s08 (KERN_ATTR_RULES ()) { } -__kernel void m04110_s16 (KERN_ATTR_RULES ()) +KERNEL_FQ void m04110_s16 (KERN_ATTR_RULES ()) { } diff --git a/OpenCL/m04110_a0-pure.cl b/OpenCL/m04110_a0-pure.cl index ca2b5c47a..f62bb7614 100644 --- a/OpenCL/m04110_a0-pure.cl +++ b/OpenCL/m04110_a0-pure.cl @@ -27,7 +27,7 @@ #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 m04110_mxx (KERN_ATTR_RULES ()) +KERNEL_FQ void m04110_mxx (KERN_ATTR_RULES ()) { /** * modifier @@ -41,7 +41,7 @@ __kernel void m04110_mxx (KERN_ATTR_RULES ()) * bin2asc table */ - __local u32 l_bin2asc[256]; + LOCAL_AS u32 l_bin2asc[256]; for (u32 i = lid; i < 256; i += lsz) { @@ -147,7 +147,7 @@ __kernel void m04110_mxx (KERN_ATTR_RULES ()) } } -__kernel void m04110_sxx (KERN_ATTR_RULES ()) +KERNEL_FQ void m04110_sxx (KERN_ATTR_RULES ()) { /** * modifier @@ -161,7 +161,7 @@ __kernel void m04110_sxx (KERN_ATTR_RULES ()) * bin2asc table */ - __local u32 l_bin2asc[256]; + LOCAL_AS u32 l_bin2asc[256]; for (u32 i = lid; i < 256; i += lsz) { diff --git a/OpenCL/m04110_a1-optimized.cl b/OpenCL/m04110_a1-optimized.cl index a452b5d09..36bb2b2db 100644 --- a/OpenCL/m04110_a1-optimized.cl +++ b/OpenCL/m04110_a1-optimized.cl @@ -25,7 +25,7 @@ #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 m04110_m04 (KERN_ATTR_BASIC ()) +KERNEL_FQ void m04110_m04 (KERN_ATTR_BASIC ()) { /** * modifier @@ -39,7 +39,7 @@ __kernel void m04110_m04 (KERN_ATTR_BASIC ()) * bin2asc table */ - __local u32 l_bin2asc[256]; + LOCAL_AS u32 l_bin2asc[256]; for (u32 i = lid; i < 256; i += lsz) { @@ -463,15 +463,15 @@ __kernel void m04110_m04 (KERN_ATTR_BASIC ()) } } -__kernel void m04110_m08 (KERN_ATTR_BASIC ()) +KERNEL_FQ void m04110_m08 (KERN_ATTR_BASIC ()) { } -__kernel void m04110_m16 (KERN_ATTR_BASIC ()) +KERNEL_FQ void m04110_m16 (KERN_ATTR_BASIC ()) { } -__kernel void m04110_s04 (KERN_ATTR_BASIC ()) +KERNEL_FQ void m04110_s04 (KERN_ATTR_BASIC ()) { /** * modifier @@ -485,7 +485,7 @@ __kernel void m04110_s04 (KERN_ATTR_BASIC ()) * bin2asc table */ - __local u32 l_bin2asc[256]; + LOCAL_AS u32 l_bin2asc[256]; for (u32 i = lid; i < 256; i += lsz) { @@ -924,10 +924,10 @@ __kernel void m04110_s04 (KERN_ATTR_BASIC ()) } } -__kernel void m04110_s08 (KERN_ATTR_BASIC ()) +KERNEL_FQ void m04110_s08 (KERN_ATTR_BASIC ()) { } -__kernel void m04110_s16 (KERN_ATTR_BASIC ()) +KERNEL_FQ void m04110_s16 (KERN_ATTR_BASIC ()) { } diff --git a/OpenCL/m04110_a1-pure.cl b/OpenCL/m04110_a1-pure.cl index a5e9367e5..d3b34b792 100644 --- a/OpenCL/m04110_a1-pure.cl +++ b/OpenCL/m04110_a1-pure.cl @@ -25,7 +25,7 @@ #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 m04110_mxx (KERN_ATTR_BASIC ()) +KERNEL_FQ void m04110_mxx (KERN_ATTR_BASIC ()) { /** * modifier @@ -39,7 +39,7 @@ __kernel void m04110_mxx (KERN_ATTR_BASIC ()) * bin2asc table */ - __local u32 l_bin2asc[256]; + LOCAL_AS u32 l_bin2asc[256]; for (u32 i = lid; i < 256; i += lsz) { @@ -143,7 +143,7 @@ __kernel void m04110_mxx (KERN_ATTR_BASIC ()) } } -__kernel void m04110_sxx (KERN_ATTR_BASIC ()) +KERNEL_FQ void m04110_sxx (KERN_ATTR_BASIC ()) { /** * modifier @@ -157,7 +157,7 @@ __kernel void m04110_sxx (KERN_ATTR_BASIC ()) * bin2asc table */ - __local u32 l_bin2asc[256]; + LOCAL_AS u32 l_bin2asc[256]; for (u32 i = lid; i < 256; i += lsz) { diff --git a/OpenCL/m04110_a3-optimized.cl b/OpenCL/m04110_a3-optimized.cl index 0efa1c78c..c9dd1fcc5 100644 --- a/OpenCL/m04110_a3-optimized.cl +++ b/OpenCL/m04110_a3-optimized.cl @@ -25,7 +25,7 @@ #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 -DECLSPEC void m04110m (u32 *w0, u32 *w1, u32 *w2, u32 *w3, const u32 pw_len, KERN_ATTR_BASIC (), __local u32 *l_bin2asc) +DECLSPEC void m04110m (u32 *w0, u32 *w1, u32 *w2, u32 *w3, const u32 pw_len, KERN_ATTR_BASIC (), LOCAL_AS u32 *l_bin2asc) { /** * modifier @@ -362,7 +362,7 @@ DECLSPEC void m04110m (u32 *w0, u32 *w1, u32 *w2, u32 *w3, const u32 pw_len, KER } } -DECLSPEC void m04110s (u32 *w0, u32 *w1, u32 *w2, u32 *w3, const u32 pw_len, KERN_ATTR_BASIC (), __local u32 *l_bin2asc) +DECLSPEC void m04110s (u32 *w0, u32 *w1, u32 *w2, u32 *w3, const u32 pw_len, KERN_ATTR_BASIC (), LOCAL_AS u32 *l_bin2asc) { /** * modifier @@ -714,7 +714,7 @@ DECLSPEC void m04110s (u32 *w0, u32 *w1, u32 *w2, u32 *w3, const u32 pw_len, KER } } -__kernel void m04110_m04 (KERN_ATTR_BASIC ()) +KERNEL_FQ void m04110_m04 (KERN_ATTR_BASIC ()) { /** * base @@ -728,7 +728,7 @@ __kernel void m04110_m04 (KERN_ATTR_BASIC ()) * bin2asc table */ - __local u32 l_bin2asc[256]; + LOCAL_AS u32 l_bin2asc[256]; for (u32 i = lid; i < 256; i += lsz) { @@ -784,7 +784,7 @@ __kernel void m04110_m04 (KERN_ATTR_BASIC ()) m04110m (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_extra0_buf, d_extra1_buf, d_extra2_buf, d_extra3_buf, bitmap_mask, bitmap_shift1, bitmap_shift2, salt_pos, loop_pos, loop_cnt, il_cnt, digests_cnt, digests_offset, combs_mode, gid_max, l_bin2asc); } -__kernel void m04110_m08 (KERN_ATTR_BASIC ()) +KERNEL_FQ void m04110_m08 (KERN_ATTR_BASIC ()) { /** * base @@ -832,7 +832,7 @@ __kernel void m04110_m08 (KERN_ATTR_BASIC ()) * bin2asc table */ - __local u32 l_bin2asc[256]; + LOCAL_AS u32 l_bin2asc[256]; for (u32 i = lid; i < 256; i += lsz) { @@ -854,7 +854,7 @@ __kernel void m04110_m08 (KERN_ATTR_BASIC ()) m04110m (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_extra0_buf, d_extra1_buf, d_extra2_buf, d_extra3_buf, bitmap_mask, bitmap_shift1, bitmap_shift2, salt_pos, loop_pos, loop_cnt, il_cnt, digests_cnt, digests_offset, combs_mode, gid_max, l_bin2asc); } -__kernel void m04110_m16 (KERN_ATTR_BASIC ()) +KERNEL_FQ void m04110_m16 (KERN_ATTR_BASIC ()) { /** * base @@ -902,7 +902,7 @@ __kernel void m04110_m16 (KERN_ATTR_BASIC ()) * bin2asc table */ - __local u32 l_bin2asc[256]; + LOCAL_AS u32 l_bin2asc[256]; for (u32 i = lid; i < 256; i += lsz) { @@ -924,7 +924,7 @@ __kernel void m04110_m16 (KERN_ATTR_BASIC ()) m04110m (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_extra0_buf, d_extra1_buf, d_extra2_buf, d_extra3_buf, bitmap_mask, bitmap_shift1, bitmap_shift2, salt_pos, loop_pos, loop_cnt, il_cnt, digests_cnt, digests_offset, combs_mode, gid_max, l_bin2asc); } -__kernel void m04110_s04 (KERN_ATTR_BASIC ()) +KERNEL_FQ void m04110_s04 (KERN_ATTR_BASIC ()) { /** * base @@ -972,7 +972,7 @@ __kernel void m04110_s04 (KERN_ATTR_BASIC ()) * bin2asc table */ - __local u32 l_bin2asc[256]; + LOCAL_AS u32 l_bin2asc[256]; for (u32 i = lid; i < 256; i += lsz) { @@ -994,7 +994,7 @@ __kernel void m04110_s04 (KERN_ATTR_BASIC ()) m04110s (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_extra0_buf, d_extra1_buf, d_extra2_buf, d_extra3_buf, bitmap_mask, bitmap_shift1, bitmap_shift2, salt_pos, loop_pos, loop_cnt, il_cnt, digests_cnt, digests_offset, combs_mode, gid_max, l_bin2asc); } -__kernel void m04110_s08 (KERN_ATTR_BASIC ()) +KERNEL_FQ void m04110_s08 (KERN_ATTR_BASIC ()) { /** * base @@ -1042,7 +1042,7 @@ __kernel void m04110_s08 (KERN_ATTR_BASIC ()) * bin2asc table */ - __local u32 l_bin2asc[256]; + LOCAL_AS u32 l_bin2asc[256]; for (u32 i = lid; i < 256; i += lsz) { @@ -1064,7 +1064,7 @@ __kernel void m04110_s08 (KERN_ATTR_BASIC ()) m04110s (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_extra0_buf, d_extra1_buf, d_extra2_buf, d_extra3_buf, bitmap_mask, bitmap_shift1, bitmap_shift2, salt_pos, loop_pos, loop_cnt, il_cnt, digests_cnt, digests_offset, combs_mode, gid_max, l_bin2asc); } -__kernel void m04110_s16 (KERN_ATTR_BASIC ()) +KERNEL_FQ void m04110_s16 (KERN_ATTR_BASIC ()) { /** * base @@ -1078,7 +1078,7 @@ __kernel void m04110_s16 (KERN_ATTR_BASIC ()) * bin2asc table */ - __local u32 l_bin2asc[256]; + LOCAL_AS u32 l_bin2asc[256]; for (u32 i = lid; i < 256; i += lsz) { diff --git a/OpenCL/m04110_a3-pure.cl b/OpenCL/m04110_a3-pure.cl index 19ce10f95..c8b6c635a 100644 --- a/OpenCL/m04110_a3-pure.cl +++ b/OpenCL/m04110_a3-pure.cl @@ -25,7 +25,7 @@ #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 m04110_mxx (KERN_ATTR_VECTOR ()) +KERNEL_FQ void m04110_mxx (KERN_ATTR_VECTOR ()) { /** * modifier @@ -39,7 +39,7 @@ __kernel void m04110_mxx (KERN_ATTR_VECTOR ()) * bin2asc table */ - __local u32 l_bin2asc[256]; + LOCAL_AS u32 l_bin2asc[256]; for (u32 i = lid; i < 256; i += lsz) { @@ -158,7 +158,7 @@ __kernel void m04110_mxx (KERN_ATTR_VECTOR ()) } } -__kernel void m04110_sxx (KERN_ATTR_VECTOR ()) +KERNEL_FQ void m04110_sxx (KERN_ATTR_VECTOR ()) { /** * modifier @@ -172,7 +172,7 @@ __kernel void m04110_sxx (KERN_ATTR_VECTOR ()) * bin2asc table */ - __local u32 l_bin2asc[256]; + LOCAL_AS u32 l_bin2asc[256]; for (u32 i = lid; i < 256; i += lsz) { diff --git a/OpenCL/m04310_a0-optimized.cl b/OpenCL/m04310_a0-optimized.cl index 707baea57..79099b09c 100644 --- a/OpenCL/m04310_a0-optimized.cl +++ b/OpenCL/m04310_a0-optimized.cl @@ -27,7 +27,7 @@ #define uint_to_hex_upper8(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 m04310_m04 (KERN_ATTR_RULES ()) +KERNEL_FQ void m04310_m04 (KERN_ATTR_RULES ()) { /** * modifier @@ -41,7 +41,7 @@ __kernel void m04310_m04 (KERN_ATTR_RULES ()) * bin2asc table */ - __local u32 l_bin2asc[256]; + LOCAL_AS u32 l_bin2asc[256]; for (u32 i = lid; i < 256; i += lsz) { @@ -303,15 +303,15 @@ __kernel void m04310_m04 (KERN_ATTR_RULES ()) } } -__kernel void m04310_m08 (KERN_ATTR_RULES ()) +KERNEL_FQ void m04310_m08 (KERN_ATTR_RULES ()) { } -__kernel void m04310_m16 (KERN_ATTR_RULES ()) +KERNEL_FQ void m04310_m16 (KERN_ATTR_RULES ()) { } -__kernel void m04310_s04 (KERN_ATTR_RULES ()) +KERNEL_FQ void m04310_s04 (KERN_ATTR_RULES ()) { /** * modifier @@ -325,7 +325,7 @@ __kernel void m04310_s04 (KERN_ATTR_RULES ()) * bin2asc table */ - __local u32 l_bin2asc[256]; + LOCAL_AS u32 l_bin2asc[256]; for (u32 i = lid; i < 256; i += lsz) { @@ -602,10 +602,10 @@ __kernel void m04310_s04 (KERN_ATTR_RULES ()) } } -__kernel void m04310_s08 (KERN_ATTR_RULES ()) +KERNEL_FQ void m04310_s08 (KERN_ATTR_RULES ()) { } -__kernel void m04310_s16 (KERN_ATTR_RULES ()) +KERNEL_FQ void m04310_s16 (KERN_ATTR_RULES ()) { } diff --git a/OpenCL/m04310_a0-pure.cl b/OpenCL/m04310_a0-pure.cl index b7661f4ce..61e2f7200 100644 --- a/OpenCL/m04310_a0-pure.cl +++ b/OpenCL/m04310_a0-pure.cl @@ -27,7 +27,7 @@ #define uint_to_hex_upper8(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 m04310_mxx (KERN_ATTR_RULES ()) +KERNEL_FQ void m04310_mxx (KERN_ATTR_RULES ()) { /** * modifier @@ -41,7 +41,7 @@ __kernel void m04310_mxx (KERN_ATTR_RULES ()) * bin2asc table */ - __local u32 l_bin2asc[256]; + LOCAL_AS u32 l_bin2asc[256]; for (u32 i = lid; i < 256; i += lsz) { @@ -130,7 +130,7 @@ __kernel void m04310_mxx (KERN_ATTR_RULES ()) } } -__kernel void m04310_sxx (KERN_ATTR_RULES ()) +KERNEL_FQ void m04310_sxx (KERN_ATTR_RULES ()) { /** * modifier @@ -144,7 +144,7 @@ __kernel void m04310_sxx (KERN_ATTR_RULES ()) * bin2asc table */ - __local u32 l_bin2asc[256]; + LOCAL_AS u32 l_bin2asc[256]; for (u32 i = lid; i < 256; i += lsz) { diff --git a/OpenCL/m04310_a1-optimized.cl b/OpenCL/m04310_a1-optimized.cl index 7fde51367..cc0b41619 100644 --- a/OpenCL/m04310_a1-optimized.cl +++ b/OpenCL/m04310_a1-optimized.cl @@ -25,7 +25,7 @@ #define uint_to_hex_upper8(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 m04310_m04 (KERN_ATTR_BASIC ()) +KERNEL_FQ void m04310_m04 (KERN_ATTR_BASIC ()) { /** * modifier @@ -39,7 +39,7 @@ __kernel void m04310_m04 (KERN_ATTR_BASIC ()) * bin2asc table */ - __local u32 l_bin2asc[256]; + LOCAL_AS u32 l_bin2asc[256]; for (u32 i = lid; i < 256; i += lsz) { @@ -360,15 +360,15 @@ __kernel void m04310_m04 (KERN_ATTR_BASIC ()) } } -__kernel void m04310_m08 (KERN_ATTR_BASIC ()) +KERNEL_FQ void m04310_m08 (KERN_ATTR_BASIC ()) { } -__kernel void m04310_m16 (KERN_ATTR_BASIC ()) +KERNEL_FQ void m04310_m16 (KERN_ATTR_BASIC ()) { } -__kernel void m04310_s04 (KERN_ATTR_BASIC ()) +KERNEL_FQ void m04310_s04 (KERN_ATTR_BASIC ()) { /** * modifier @@ -382,7 +382,7 @@ __kernel void m04310_s04 (KERN_ATTR_BASIC ()) * bin2asc table */ - __local u32 l_bin2asc[256]; + LOCAL_AS u32 l_bin2asc[256]; for (u32 i = lid; i < 256; i += lsz) { @@ -718,10 +718,10 @@ __kernel void m04310_s04 (KERN_ATTR_BASIC ()) } } -__kernel void m04310_s08 (KERN_ATTR_BASIC ()) +KERNEL_FQ void m04310_s08 (KERN_ATTR_BASIC ()) { } -__kernel void m04310_s16 (KERN_ATTR_BASIC ()) +KERNEL_FQ void m04310_s16 (KERN_ATTR_BASIC ()) { } diff --git a/OpenCL/m04310_a1-pure.cl b/OpenCL/m04310_a1-pure.cl index bb6cd3945..8e0db955e 100644 --- a/OpenCL/m04310_a1-pure.cl +++ b/OpenCL/m04310_a1-pure.cl @@ -25,7 +25,7 @@ #define uint_to_hex_upper8(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 m04310_mxx (KERN_ATTR_BASIC ()) +KERNEL_FQ void m04310_mxx (KERN_ATTR_BASIC ()) { /** * modifier @@ -39,7 +39,7 @@ __kernel void m04310_mxx (KERN_ATTR_BASIC ()) * bin2asc table */ - __local u32 l_bin2asc[256]; + LOCAL_AS u32 l_bin2asc[256]; for (u32 i = lid; i < 256; i += lsz) { @@ -126,7 +126,7 @@ __kernel void m04310_mxx (KERN_ATTR_BASIC ()) } } -__kernel void m04310_sxx (KERN_ATTR_BASIC ()) +KERNEL_FQ void m04310_sxx (KERN_ATTR_BASIC ()) { /** * modifier @@ -140,7 +140,7 @@ __kernel void m04310_sxx (KERN_ATTR_BASIC ()) * bin2asc table */ - __local u32 l_bin2asc[256]; + LOCAL_AS u32 l_bin2asc[256]; for (u32 i = lid; i < 256; i += lsz) { diff --git a/OpenCL/m04310_a3-optimized.cl b/OpenCL/m04310_a3-optimized.cl index c5b0f2df9..159bf0f4a 100644 --- a/OpenCL/m04310_a3-optimized.cl +++ b/OpenCL/m04310_a3-optimized.cl @@ -25,7 +25,7 @@ #define uint_to_hex_upper8(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 -DECLSPEC void m04310m (u32 *w0, u32 *w1, u32 *w2, u32 *w3, const u32 pw_len, KERN_ATTR_BASIC (), __local u32 *l_bin2asc) +DECLSPEC void m04310m (u32 *w0, u32 *w1, u32 *w2, u32 *w3, const u32 pw_len, KERN_ATTR_BASIC (), LOCAL_AS u32 *l_bin2asc) { /** * modifier @@ -283,7 +283,7 @@ DECLSPEC void m04310m (u32 *w0, u32 *w1, u32 *w2, u32 *w3, const u32 pw_len, KER } } -DECLSPEC void m04310s (u32 *w0, u32 *w1, u32 *w2, u32 *w3, const u32 pw_len, KERN_ATTR_BASIC (), __local u32 *l_bin2asc) +DECLSPEC void m04310s (u32 *w0, u32 *w1, u32 *w2, u32 *w3, const u32 pw_len, KERN_ATTR_BASIC (), LOCAL_AS u32 *l_bin2asc) { /** * modifier @@ -557,7 +557,7 @@ DECLSPEC void m04310s (u32 *w0, u32 *w1, u32 *w2, u32 *w3, const u32 pw_len, KER } } -__kernel void m04310_m04 (KERN_ATTR_BASIC ()) +KERNEL_FQ void m04310_m04 (KERN_ATTR_BASIC ()) { /** * base @@ -605,7 +605,7 @@ __kernel void m04310_m04 (KERN_ATTR_BASIC ()) * bin2asc table */ - __local u32 l_bin2asc[256]; + LOCAL_AS u32 l_bin2asc[256]; for (u32 i = lid; i < 256; i += lsz) { @@ -627,7 +627,7 @@ __kernel void m04310_m04 (KERN_ATTR_BASIC ()) m04310m (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_extra0_buf, d_extra1_buf, d_extra2_buf, d_extra3_buf, bitmap_mask, bitmap_shift1, bitmap_shift2, salt_pos, loop_pos, loop_cnt, il_cnt, digests_cnt, digests_offset, combs_mode, gid_max, l_bin2asc); } -__kernel void m04310_m08 (KERN_ATTR_BASIC ()) +KERNEL_FQ void m04310_m08 (KERN_ATTR_BASIC ()) { /** * base @@ -675,7 +675,7 @@ __kernel void m04310_m08 (KERN_ATTR_BASIC ()) * bin2asc table */ - __local u32 l_bin2asc[256]; + LOCAL_AS u32 l_bin2asc[256]; for (u32 i = lid; i < 256; i += lsz) { @@ -697,7 +697,7 @@ __kernel void m04310_m08 (KERN_ATTR_BASIC ()) m04310m (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_extra0_buf, d_extra1_buf, d_extra2_buf, d_extra3_buf, bitmap_mask, bitmap_shift1, bitmap_shift2, salt_pos, loop_pos, loop_cnt, il_cnt, digests_cnt, digests_offset, combs_mode, gid_max, l_bin2asc); } -__kernel void m04310_m16 (KERN_ATTR_BASIC ()) +KERNEL_FQ void m04310_m16 (KERN_ATTR_BASIC ()) { /** * base @@ -745,7 +745,7 @@ __kernel void m04310_m16 (KERN_ATTR_BASIC ()) * bin2asc table */ - __local u32 l_bin2asc[256]; + LOCAL_AS u32 l_bin2asc[256]; for (u32 i = lid; i < 256; i += lsz) { @@ -767,7 +767,7 @@ __kernel void m04310_m16 (KERN_ATTR_BASIC ()) m04310m (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_extra0_buf, d_extra1_buf, d_extra2_buf, d_extra3_buf, bitmap_mask, bitmap_shift1, bitmap_shift2, salt_pos, loop_pos, loop_cnt, il_cnt, digests_cnt, digests_offset, combs_mode, gid_max, l_bin2asc); } -__kernel void m04310_s04 (KERN_ATTR_BASIC ()) +KERNEL_FQ void m04310_s04 (KERN_ATTR_BASIC ()) { /** * base @@ -815,7 +815,7 @@ __kernel void m04310_s04 (KERN_ATTR_BASIC ()) * bin2asc table */ - __local u32 l_bin2asc[256]; + LOCAL_AS u32 l_bin2asc[256]; for (u32 i = lid; i < 256; i += lsz) { @@ -837,7 +837,7 @@ __kernel void m04310_s04 (KERN_ATTR_BASIC ()) m04310s (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_extra0_buf, d_extra1_buf, d_extra2_buf, d_extra3_buf, bitmap_mask, bitmap_shift1, bitmap_shift2, salt_pos, loop_pos, loop_cnt, il_cnt, digests_cnt, digests_offset, combs_mode, gid_max, l_bin2asc); } -__kernel void m04310_s08 (KERN_ATTR_BASIC ()) +KERNEL_FQ void m04310_s08 (KERN_ATTR_BASIC ()) { /** * base @@ -885,7 +885,7 @@ __kernel void m04310_s08 (KERN_ATTR_BASIC ()) * bin2asc table */ - __local u32 l_bin2asc[256]; + LOCAL_AS u32 l_bin2asc[256]; for (u32 i = lid; i < 256; i += lsz) { @@ -907,7 +907,7 @@ __kernel void m04310_s08 (KERN_ATTR_BASIC ()) m04310s (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_extra0_buf, d_extra1_buf, d_extra2_buf, d_extra3_buf, bitmap_mask, bitmap_shift1, bitmap_shift2, salt_pos, loop_pos, loop_cnt, il_cnt, digests_cnt, digests_offset, combs_mode, gid_max, l_bin2asc); } -__kernel void m04310_s16 (KERN_ATTR_BASIC ()) +KERNEL_FQ void m04310_s16 (KERN_ATTR_BASIC ()) { /** * base @@ -955,7 +955,7 @@ __kernel void m04310_s16 (KERN_ATTR_BASIC ()) * bin2asc table */ - __local u32 l_bin2asc[256]; + LOCAL_AS u32 l_bin2asc[256]; for (u32 i = lid; i < 256; i += lsz) { diff --git a/OpenCL/m04310_a3-pure.cl b/OpenCL/m04310_a3-pure.cl index 7bfd0daa7..1fa18591c 100644 --- a/OpenCL/m04310_a3-pure.cl +++ b/OpenCL/m04310_a3-pure.cl @@ -25,7 +25,7 @@ #define uint_to_hex_upper8(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 m04310_mxx (KERN_ATTR_VECTOR ()) +KERNEL_FQ void m04310_mxx (KERN_ATTR_VECTOR ()) { /** * modifier @@ -39,7 +39,7 @@ __kernel void m04310_mxx (KERN_ATTR_VECTOR ()) * bin2asc table */ - __local u32 l_bin2asc[256]; + LOCAL_AS u32 l_bin2asc[256]; for (u32 i = lid; i < 256; i += lsz) { @@ -139,7 +139,7 @@ __kernel void m04310_mxx (KERN_ATTR_VECTOR ()) } } -__kernel void m04310_sxx (KERN_ATTR_VECTOR ()) +KERNEL_FQ void m04310_sxx (KERN_ATTR_VECTOR ()) { /** * modifier @@ -153,7 +153,7 @@ __kernel void m04310_sxx (KERN_ATTR_VECTOR ()) * bin2asc table */ - __local u32 l_bin2asc[256]; + LOCAL_AS u32 l_bin2asc[256]; for (u32 i = lid; i < 256; i += lsz) { diff --git a/OpenCL/m04400_a0-optimized.cl b/OpenCL/m04400_a0-optimized.cl index 49688814c..8947ebf76 100644 --- a/OpenCL/m04400_a0-optimized.cl +++ b/OpenCL/m04400_a0-optimized.cl @@ -28,7 +28,7 @@ #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 (KERN_ATTR_RULES ()) +KERNEL_FQ void m04400_m04 (KERN_ATTR_RULES ()) { /** * modifier @@ -42,7 +42,7 @@ __kernel void m04400_m04 (KERN_ATTR_RULES ()) * bin2asc table */ - __local u32 l_bin2asc[256]; + LOCAL_AS u32 l_bin2asc[256]; for (u32 i = lid; i < 256; i += lsz) { @@ -330,15 +330,15 @@ __kernel void m04400_m04 (KERN_ATTR_RULES ()) } } -__kernel void m04400_m08 (KERN_ATTR_RULES ()) +KERNEL_FQ void m04400_m08 (KERN_ATTR_RULES ()) { } -__kernel void m04400_m16 (KERN_ATTR_RULES ()) +KERNEL_FQ void m04400_m16 (KERN_ATTR_RULES ()) { } -__kernel void m04400_s04 (KERN_ATTR_RULES ()) +KERNEL_FQ void m04400_s04 (KERN_ATTR_RULES ()) { /** * modifier @@ -352,7 +352,7 @@ __kernel void m04400_s04 (KERN_ATTR_RULES ()) * bin2asc table */ - __local u32 l_bin2asc[256]; + LOCAL_AS u32 l_bin2asc[256]; for (u32 i = lid; i < 256; i += lsz) { @@ -655,10 +655,10 @@ __kernel void m04400_s04 (KERN_ATTR_RULES ()) } } -__kernel void m04400_s08 (KERN_ATTR_RULES ()) +KERNEL_FQ void m04400_s08 (KERN_ATTR_RULES ()) { } -__kernel void m04400_s16 (KERN_ATTR_RULES ()) +KERNEL_FQ void m04400_s16 (KERN_ATTR_RULES ()) { } diff --git a/OpenCL/m04400_a0-pure.cl b/OpenCL/m04400_a0-pure.cl index 36d6e1c71..72718568e 100644 --- a/OpenCL/m04400_a0-pure.cl +++ b/OpenCL/m04400_a0-pure.cl @@ -28,7 +28,7 @@ #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_mxx (KERN_ATTR_RULES ()) +KERNEL_FQ void m04400_mxx (KERN_ATTR_RULES ()) { /** * modifier @@ -42,7 +42,7 @@ __kernel void m04400_mxx (KERN_ATTR_RULES ()) * bin2asc table */ - __local u32 l_bin2asc[256]; + LOCAL_AS u32 l_bin2asc[256]; for (u32 i = lid; i < 256; i += lsz) { @@ -125,7 +125,7 @@ __kernel void m04400_mxx (KERN_ATTR_RULES ()) } } -__kernel void m04400_sxx (KERN_ATTR_RULES ()) +KERNEL_FQ void m04400_sxx (KERN_ATTR_RULES ()) { /** * modifier @@ -139,7 +139,7 @@ __kernel void m04400_sxx (KERN_ATTR_RULES ()) * bin2asc table */ - __local u32 l_bin2asc[256]; + LOCAL_AS u32 l_bin2asc[256]; for (u32 i = lid; i < 256; i += lsz) { diff --git a/OpenCL/m04400_a1-optimized.cl b/OpenCL/m04400_a1-optimized.cl index 410f9c081..3503a1d93 100644 --- a/OpenCL/m04400_a1-optimized.cl +++ b/OpenCL/m04400_a1-optimized.cl @@ -26,7 +26,7 @@ #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 (KERN_ATTR_BASIC ()) +KERNEL_FQ void m04400_m04 (KERN_ATTR_BASIC ()) { /** * modifier @@ -40,7 +40,7 @@ __kernel void m04400_m04 (KERN_ATTR_BASIC ()) * bin2asc table */ - __local u32 l_bin2asc[256]; + LOCAL_AS u32 l_bin2asc[256]; for (u32 i = lid; i < 256; i += lsz) { @@ -386,15 +386,15 @@ __kernel void m04400_m04 (KERN_ATTR_BASIC ()) } } -__kernel void m04400_m08 (KERN_ATTR_BASIC ()) +KERNEL_FQ void m04400_m08 (KERN_ATTR_BASIC ()) { } -__kernel void m04400_m16 (KERN_ATTR_BASIC ()) +KERNEL_FQ void m04400_m16 (KERN_ATTR_BASIC ()) { } -__kernel void m04400_s04 (KERN_ATTR_BASIC ()) +KERNEL_FQ void m04400_s04 (KERN_ATTR_BASIC ()) { /** * modifier @@ -408,7 +408,7 @@ __kernel void m04400_s04 (KERN_ATTR_BASIC ()) * bin2asc table */ - __local u32 l_bin2asc[256]; + LOCAL_AS u32 l_bin2asc[256]; for (u32 i = lid; i < 256; i += lsz) { @@ -769,10 +769,10 @@ __kernel void m04400_s04 (KERN_ATTR_BASIC ()) } } -__kernel void m04400_s08 (KERN_ATTR_BASIC ()) +KERNEL_FQ void m04400_s08 (KERN_ATTR_BASIC ()) { } -__kernel void m04400_s16 (KERN_ATTR_BASIC ()) +KERNEL_FQ void m04400_s16 (KERN_ATTR_BASIC ()) { } diff --git a/OpenCL/m04400_a1-pure.cl b/OpenCL/m04400_a1-pure.cl index 639acc6fa..9404b95fc 100644 --- a/OpenCL/m04400_a1-pure.cl +++ b/OpenCL/m04400_a1-pure.cl @@ -26,7 +26,7 @@ #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_mxx (KERN_ATTR_BASIC ()) +KERNEL_FQ void m04400_mxx (KERN_ATTR_BASIC ()) { /** * modifier @@ -40,7 +40,7 @@ __kernel void m04400_mxx (KERN_ATTR_BASIC ()) * bin2asc table */ - __local u32 l_bin2asc[256]; + LOCAL_AS u32 l_bin2asc[256]; for (u32 i = lid; i < 256; i += lsz) { @@ -121,7 +121,7 @@ __kernel void m04400_mxx (KERN_ATTR_BASIC ()) } } -__kernel void m04400_sxx (KERN_ATTR_BASIC ()) +KERNEL_FQ void m04400_sxx (KERN_ATTR_BASIC ()) { /** * modifier @@ -135,7 +135,7 @@ __kernel void m04400_sxx (KERN_ATTR_BASIC ()) * bin2asc table */ - __local u32 l_bin2asc[256]; + LOCAL_AS u32 l_bin2asc[256]; for (u32 i = lid; i < 256; i += lsz) { diff --git a/OpenCL/m04400_a3-optimized.cl b/OpenCL/m04400_a3-optimized.cl index d89381d5d..30dddca7c 100644 --- a/OpenCL/m04400_a3-optimized.cl +++ b/OpenCL/m04400_a3-optimized.cl @@ -26,7 +26,7 @@ #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 -DECLSPEC void m04400m (u32 *w0, u32 *w1, u32 *w2, u32 *w3, const u32 pw_len, KERN_ATTR_BASIC (), __local u32 *l_bin2asc) +DECLSPEC void m04400m (u32 *w0, u32 *w1, u32 *w2, u32 *w3, const u32 pw_len, KERN_ATTR_BASIC (), LOCAL_AS u32 *l_bin2asc) { /** * modifier @@ -287,7 +287,7 @@ DECLSPEC void m04400m (u32 *w0, u32 *w1, u32 *w2, u32 *w3, const u32 pw_len, KER } } -DECLSPEC void m04400s (u32 *w0, u32 *w1, u32 *w2, u32 *w3, const u32 pw_len, KERN_ATTR_BASIC (), __local u32 *l_bin2asc) +DECLSPEC void m04400s (u32 *w0, u32 *w1, u32 *w2, u32 *w3, const u32 pw_len, KERN_ATTR_BASIC (), LOCAL_AS u32 *l_bin2asc) { /** * modifier @@ -563,7 +563,7 @@ DECLSPEC void m04400s (u32 *w0, u32 *w1, u32 *w2, u32 *w3, const u32 pw_len, KER } } -__kernel void m04400_m04 (KERN_ATTR_BASIC ()) +KERNEL_FQ void m04400_m04 (KERN_ATTR_BASIC ()) { /** * base @@ -577,7 +577,7 @@ __kernel void m04400_m04 (KERN_ATTR_BASIC ()) * bin2asc table */ - __local u32 l_bin2asc[256]; + LOCAL_AS u32 l_bin2asc[256]; for (u32 i = lid; i < 256; i += lsz) { @@ -633,7 +633,7 @@ __kernel void m04400_m04 (KERN_ATTR_BASIC ()) m04400m (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_extra0_buf, d_extra1_buf, d_extra2_buf, d_extra3_buf, bitmap_mask, bitmap_shift1, bitmap_shift2, salt_pos, loop_pos, loop_cnt, il_cnt, digests_cnt, digests_offset, combs_mode, gid_max, l_bin2asc); } -__kernel void m04400_m08 (KERN_ATTR_BASIC ()) +KERNEL_FQ void m04400_m08 (KERN_ATTR_BASIC ()) { /** * base @@ -647,7 +647,7 @@ __kernel void m04400_m08 (KERN_ATTR_BASIC ()) * bin2asc table */ - __local u32 l_bin2asc[256]; + LOCAL_AS u32 l_bin2asc[256]; for (u32 i = lid; i < 256; i += lsz) { @@ -703,7 +703,7 @@ __kernel void m04400_m08 (KERN_ATTR_BASIC ()) m04400m (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_extra0_buf, d_extra1_buf, d_extra2_buf, d_extra3_buf, bitmap_mask, bitmap_shift1, bitmap_shift2, salt_pos, loop_pos, loop_cnt, il_cnt, digests_cnt, digests_offset, combs_mode, gid_max, l_bin2asc); } -__kernel void m04400_m16 (KERN_ATTR_BASIC ()) +KERNEL_FQ void m04400_m16 (KERN_ATTR_BASIC ()) { /** * base @@ -717,7 +717,7 @@ __kernel void m04400_m16 (KERN_ATTR_BASIC ()) * bin2asc table */ - __local u32 l_bin2asc[256]; + LOCAL_AS u32 l_bin2asc[256]; for (u32 i = lid; i < 256; i += lsz) { @@ -773,7 +773,7 @@ __kernel void m04400_m16 (KERN_ATTR_BASIC ()) m04400m (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_extra0_buf, d_extra1_buf, d_extra2_buf, d_extra3_buf, bitmap_mask, bitmap_shift1, bitmap_shift2, salt_pos, loop_pos, loop_cnt, il_cnt, digests_cnt, digests_offset, combs_mode, gid_max, l_bin2asc); } -__kernel void m04400_s04 (KERN_ATTR_BASIC ()) +KERNEL_FQ void m04400_s04 (KERN_ATTR_BASIC ()) { /** * base @@ -787,7 +787,7 @@ __kernel void m04400_s04 (KERN_ATTR_BASIC ()) * bin2asc table */ - __local u32 l_bin2asc[256]; + LOCAL_AS u32 l_bin2asc[256]; for (u32 i = lid; i < 256; i += lsz) { @@ -843,7 +843,7 @@ __kernel void m04400_s04 (KERN_ATTR_BASIC ()) m04400s (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_extra0_buf, d_extra1_buf, d_extra2_buf, d_extra3_buf, bitmap_mask, bitmap_shift1, bitmap_shift2, salt_pos, loop_pos, loop_cnt, il_cnt, digests_cnt, digests_offset, combs_mode, gid_max, l_bin2asc); } -__kernel void m04400_s08 (KERN_ATTR_BASIC ()) +KERNEL_FQ void m04400_s08 (KERN_ATTR_BASIC ()) { /** * base @@ -857,7 +857,7 @@ __kernel void m04400_s08 (KERN_ATTR_BASIC ()) * bin2asc table */ - __local u32 l_bin2asc[256]; + LOCAL_AS u32 l_bin2asc[256]; for (u32 i = lid; i < 256; i += lsz) { @@ -913,7 +913,7 @@ __kernel void m04400_s08 (KERN_ATTR_BASIC ()) m04400s (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_extra0_buf, d_extra1_buf, d_extra2_buf, d_extra3_buf, bitmap_mask, bitmap_shift1, bitmap_shift2, salt_pos, loop_pos, loop_cnt, il_cnt, digests_cnt, digests_offset, combs_mode, gid_max, l_bin2asc); } -__kernel void m04400_s16 (KERN_ATTR_BASIC ()) +KERNEL_FQ void m04400_s16 (KERN_ATTR_BASIC ()) { /** * base @@ -927,7 +927,7 @@ __kernel void m04400_s16 (KERN_ATTR_BASIC ()) * bin2asc table */ - __local u32 l_bin2asc[256]; + LOCAL_AS u32 l_bin2asc[256]; for (u32 i = lid; i < 256; i += lsz) { diff --git a/OpenCL/m04400_a3-pure.cl b/OpenCL/m04400_a3-pure.cl index 7467c078a..091fc60ce 100644 --- a/OpenCL/m04400_a3-pure.cl +++ b/OpenCL/m04400_a3-pure.cl @@ -26,7 +26,7 @@ #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_mxx (KERN_ATTR_VECTOR ()) +KERNEL_FQ void m04400_mxx (KERN_ATTR_VECTOR ()) { /** * modifier @@ -40,7 +40,7 @@ __kernel void m04400_mxx (KERN_ATTR_VECTOR ()) * bin2asc table */ - __local u32 l_bin2asc[256]; + LOCAL_AS u32 l_bin2asc[256]; for (u32 i = lid; i < 256; i += lsz) { @@ -134,7 +134,7 @@ __kernel void m04400_mxx (KERN_ATTR_VECTOR ()) } } -__kernel void m04400_sxx (KERN_ATTR_VECTOR ()) +KERNEL_FQ void m04400_sxx (KERN_ATTR_VECTOR ()) { /** * modifier @@ -148,7 +148,7 @@ __kernel void m04400_sxx (KERN_ATTR_VECTOR ()) * bin2asc table */ - __local u32 l_bin2asc[256]; + LOCAL_AS u32 l_bin2asc[256]; for (u32 i = lid; i < 256; i += lsz) { diff --git a/OpenCL/m04500_a0-optimized.cl b/OpenCL/m04500_a0-optimized.cl index 1bda23482..e2a83c5d2 100644 --- a/OpenCL/m04500_a0-optimized.cl +++ b/OpenCL/m04500_a0-optimized.cl @@ -27,7 +27,7 @@ #define uint_to_hex_lower8_le(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 m04500_m04 (KERN_ATTR_RULES ()) +KERNEL_FQ void m04500_m04 (KERN_ATTR_RULES ()) { /** * modifier @@ -41,7 +41,7 @@ __kernel void m04500_m04 (KERN_ATTR_RULES ()) * bin2asc table */ - __local u32 l_bin2asc[256]; + LOCAL_AS u32 l_bin2asc[256]; for (u32 i = lid; i < 256; i += lsz) { @@ -356,15 +356,15 @@ __kernel void m04500_m04 (KERN_ATTR_RULES ()) } } -__kernel void m04500_m08 (KERN_ATTR_RULES ()) +KERNEL_FQ void m04500_m08 (KERN_ATTR_RULES ()) { } -__kernel void m04500_m16 (KERN_ATTR_RULES ()) +KERNEL_FQ void m04500_m16 (KERN_ATTR_RULES ()) { } -__kernel void m04500_s04 (KERN_ATTR_RULES ()) +KERNEL_FQ void m04500_s04 (KERN_ATTR_RULES ()) { /** * modifier @@ -378,7 +378,7 @@ __kernel void m04500_s04 (KERN_ATTR_RULES ()) * bin2asc table */ - __local u32 l_bin2asc[256]; + LOCAL_AS u32 l_bin2asc[256]; for (u32 i = lid; i < 256; i += lsz) { @@ -714,10 +714,10 @@ __kernel void m04500_s04 (KERN_ATTR_RULES ()) } } -__kernel void m04500_s08 (KERN_ATTR_RULES ()) +KERNEL_FQ void m04500_s08 (KERN_ATTR_RULES ()) { } -__kernel void m04500_s16 (KERN_ATTR_RULES ()) +KERNEL_FQ void m04500_s16 (KERN_ATTR_RULES ()) { } diff --git a/OpenCL/m04500_a0-pure.cl b/OpenCL/m04500_a0-pure.cl index 3ce4a27bb..1dfa8b061 100644 --- a/OpenCL/m04500_a0-pure.cl +++ b/OpenCL/m04500_a0-pure.cl @@ -27,7 +27,7 @@ #define uint_to_hex_lower8_le(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 m04500_mxx (KERN_ATTR_RULES ()) +KERNEL_FQ void m04500_mxx (KERN_ATTR_RULES ()) { /** * modifier @@ -41,7 +41,7 @@ __kernel void m04500_mxx (KERN_ATTR_RULES ()) * bin2asc table */ - __local u32 l_bin2asc[256]; + LOCAL_AS u32 l_bin2asc[256]; for (u32 i = lid; i < 256; i += lsz) { @@ -124,7 +124,7 @@ __kernel void m04500_mxx (KERN_ATTR_RULES ()) } } -__kernel void m04500_sxx (KERN_ATTR_RULES ()) +KERNEL_FQ void m04500_sxx (KERN_ATTR_RULES ()) { /** * modifier @@ -138,7 +138,7 @@ __kernel void m04500_sxx (KERN_ATTR_RULES ()) * bin2asc table */ - __local u32 l_bin2asc[256]; + LOCAL_AS u32 l_bin2asc[256]; for (u32 i = lid; i < 256; i += lsz) { diff --git a/OpenCL/m04500_a1-optimized.cl b/OpenCL/m04500_a1-optimized.cl index ed5c7bac7..c3f8f9475 100644 --- a/OpenCL/m04500_a1-optimized.cl +++ b/OpenCL/m04500_a1-optimized.cl @@ -25,7 +25,7 @@ #define uint_to_hex_lower8_le(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 m04500_m04 (KERN_ATTR_BASIC ()) +KERNEL_FQ void m04500_m04 (KERN_ATTR_BASIC ()) { /** * modifier @@ -39,7 +39,7 @@ __kernel void m04500_m04 (KERN_ATTR_BASIC ()) * bin2asc table */ - __local u32 l_bin2asc[256]; + LOCAL_AS u32 l_bin2asc[256]; for (u32 i = lid; i < 256; i += lsz) { @@ -412,15 +412,15 @@ __kernel void m04500_m04 (KERN_ATTR_BASIC ()) } } -__kernel void m04500_m08 (KERN_ATTR_BASIC ()) +KERNEL_FQ void m04500_m08 (KERN_ATTR_BASIC ()) { } -__kernel void m04500_m16 (KERN_ATTR_BASIC ()) +KERNEL_FQ void m04500_m16 (KERN_ATTR_BASIC ()) { } -__kernel void m04500_s04 (KERN_ATTR_BASIC ()) +KERNEL_FQ void m04500_s04 (KERN_ATTR_BASIC ()) { /** * modifier @@ -434,7 +434,7 @@ __kernel void m04500_s04 (KERN_ATTR_BASIC ()) * bin2asc table */ - __local u32 l_bin2asc[256]; + LOCAL_AS u32 l_bin2asc[256]; for (u32 i = lid; i < 256; i += lsz) { @@ -828,10 +828,10 @@ __kernel void m04500_s04 (KERN_ATTR_BASIC ()) } } -__kernel void m04500_s08 (KERN_ATTR_BASIC ()) +KERNEL_FQ void m04500_s08 (KERN_ATTR_BASIC ()) { } -__kernel void m04500_s16 (KERN_ATTR_BASIC ()) +KERNEL_FQ void m04500_s16 (KERN_ATTR_BASIC ()) { } diff --git a/OpenCL/m04500_a1-pure.cl b/OpenCL/m04500_a1-pure.cl index 5583d05cc..32db391dd 100644 --- a/OpenCL/m04500_a1-pure.cl +++ b/OpenCL/m04500_a1-pure.cl @@ -25,7 +25,7 @@ #define uint_to_hex_lower8_le(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 m04500_mxx (KERN_ATTR_BASIC ()) +KERNEL_FQ void m04500_mxx (KERN_ATTR_BASIC ()) { /** * modifier @@ -39,7 +39,7 @@ __kernel void m04500_mxx (KERN_ATTR_BASIC ()) * bin2asc table */ - __local u32 l_bin2asc[256]; + LOCAL_AS u32 l_bin2asc[256]; for (u32 i = lid; i < 256; i += lsz) { @@ -120,7 +120,7 @@ __kernel void m04500_mxx (KERN_ATTR_BASIC ()) } } -__kernel void m04500_sxx (KERN_ATTR_BASIC ()) +KERNEL_FQ void m04500_sxx (KERN_ATTR_BASIC ()) { /** * modifier @@ -134,7 +134,7 @@ __kernel void m04500_sxx (KERN_ATTR_BASIC ()) * bin2asc table */ - __local u32 l_bin2asc[256]; + LOCAL_AS u32 l_bin2asc[256]; for (u32 i = lid; i < 256; i += lsz) { diff --git a/OpenCL/m04500_a3-optimized.cl b/OpenCL/m04500_a3-optimized.cl index a3b711962..b232e35cc 100644 --- a/OpenCL/m04500_a3-optimized.cl +++ b/OpenCL/m04500_a3-optimized.cl @@ -25,7 +25,7 @@ #define uint_to_hex_lower8_le(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 -DECLSPEC void m04500m (u32 *w0, u32 *w1, u32 *w2, u32 *w3, const u32 pw_len, KERN_ATTR_BASIC (), __local u32 *l_bin2asc) +DECLSPEC void m04500m (u32 *w0, u32 *w1, u32 *w2, u32 *w3, const u32 pw_len, KERN_ATTR_BASIC (), LOCAL_AS u32 *l_bin2asc) { /** * modifier @@ -313,7 +313,7 @@ DECLSPEC void m04500m (u32 *w0, u32 *w1, u32 *w2, u32 *w3, const u32 pw_len, KER } } -DECLSPEC void m04500s (u32 *w0, u32 *w1, u32 *w2, u32 *w3, const u32 pw_len, KERN_ATTR_BASIC (), __local u32 *l_bin2asc) +DECLSPEC void m04500s (u32 *w0, u32 *w1, u32 *w2, u32 *w3, const u32 pw_len, KERN_ATTR_BASIC (), LOCAL_AS u32 *l_bin2asc) { /** * modifier @@ -622,7 +622,7 @@ DECLSPEC void m04500s (u32 *w0, u32 *w1, u32 *w2, u32 *w3, const u32 pw_len, KER } } -__kernel void m04500_m04 (KERN_ATTR_BASIC ()) +KERNEL_FQ void m04500_m04 (KERN_ATTR_BASIC ()) { /** * base @@ -636,7 +636,7 @@ __kernel void m04500_m04 (KERN_ATTR_BASIC ()) * bin2asc table */ - __local u32 l_bin2asc[256]; + LOCAL_AS u32 l_bin2asc[256]; for (u32 i = lid; i < 256; i += lsz) { @@ -692,7 +692,7 @@ __kernel void m04500_m04 (KERN_ATTR_BASIC ()) m04500m (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_extra0_buf, d_extra1_buf, d_extra2_buf, d_extra3_buf, bitmap_mask, bitmap_shift1, bitmap_shift2, salt_pos, loop_pos, loop_cnt, il_cnt, digests_cnt, digests_offset, combs_mode, gid_max, l_bin2asc); } -__kernel void m04500_m08 (KERN_ATTR_BASIC ()) +KERNEL_FQ void m04500_m08 (KERN_ATTR_BASIC ()) { /** * base @@ -706,7 +706,7 @@ __kernel void m04500_m08 (KERN_ATTR_BASIC ()) * bin2asc table */ - __local u32 l_bin2asc[256]; + LOCAL_AS u32 l_bin2asc[256]; for (u32 i = lid; i < 256; i += lsz) { @@ -762,7 +762,7 @@ __kernel void m04500_m08 (KERN_ATTR_BASIC ()) m04500m (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_extra0_buf, d_extra1_buf, d_extra2_buf, d_extra3_buf, bitmap_mask, bitmap_shift1, bitmap_shift2, salt_pos, loop_pos, loop_cnt, il_cnt, digests_cnt, digests_offset, combs_mode, gid_max, l_bin2asc); } -__kernel void m04500_m16 (KERN_ATTR_BASIC ()) +KERNEL_FQ void m04500_m16 (KERN_ATTR_BASIC ()) { /** * base @@ -776,7 +776,7 @@ __kernel void m04500_m16 (KERN_ATTR_BASIC ()) * bin2asc table */ - __local u32 l_bin2asc[256]; + LOCAL_AS u32 l_bin2asc[256]; for (u32 i = lid; i < 256; i += lsz) { @@ -832,7 +832,7 @@ __kernel void m04500_m16 (KERN_ATTR_BASIC ()) m04500m (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_extra0_buf, d_extra1_buf, d_extra2_buf, d_extra3_buf, bitmap_mask, bitmap_shift1, bitmap_shift2, salt_pos, loop_pos, loop_cnt, il_cnt, digests_cnt, digests_offset, combs_mode, gid_max, l_bin2asc); } -__kernel void m04500_s04 (KERN_ATTR_BASIC ()) +KERNEL_FQ void m04500_s04 (KERN_ATTR_BASIC ()) { /** * base @@ -846,7 +846,7 @@ __kernel void m04500_s04 (KERN_ATTR_BASIC ()) * bin2asc table */ - __local u32 l_bin2asc[256]; + LOCAL_AS u32 l_bin2asc[256]; for (u32 i = lid; i < 256; i += lsz) { @@ -902,7 +902,7 @@ __kernel void m04500_s04 (KERN_ATTR_BASIC ()) m04500s (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_extra0_buf, d_extra1_buf, d_extra2_buf, d_extra3_buf, bitmap_mask, bitmap_shift1, bitmap_shift2, salt_pos, loop_pos, loop_cnt, il_cnt, digests_cnt, digests_offset, combs_mode, gid_max, l_bin2asc); } -__kernel void m04500_s08 (KERN_ATTR_BASIC ()) +KERNEL_FQ void m04500_s08 (KERN_ATTR_BASIC ()) { /** * base @@ -916,7 +916,7 @@ __kernel void m04500_s08 (KERN_ATTR_BASIC ()) * bin2asc table */ - __local u32 l_bin2asc[256]; + LOCAL_AS u32 l_bin2asc[256]; for (u32 i = lid; i < 256; i += lsz) { @@ -972,7 +972,7 @@ __kernel void m04500_s08 (KERN_ATTR_BASIC ()) m04500s (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_extra0_buf, d_extra1_buf, d_extra2_buf, d_extra3_buf, bitmap_mask, bitmap_shift1, bitmap_shift2, salt_pos, loop_pos, loop_cnt, il_cnt, digests_cnt, digests_offset, combs_mode, gid_max, l_bin2asc); } -__kernel void m04500_s16 (KERN_ATTR_BASIC ()) +KERNEL_FQ void m04500_s16 (KERN_ATTR_BASIC ()) { /** * base @@ -986,7 +986,7 @@ __kernel void m04500_s16 (KERN_ATTR_BASIC ()) * bin2asc table */ - __local u32 l_bin2asc[256]; + LOCAL_AS u32 l_bin2asc[256]; for (u32 i = lid; i < 256; i += lsz) { diff --git a/OpenCL/m04500_a3-pure.cl b/OpenCL/m04500_a3-pure.cl index 15b0cbe12..268e86b75 100644 --- a/OpenCL/m04500_a3-pure.cl +++ b/OpenCL/m04500_a3-pure.cl @@ -25,7 +25,7 @@ #define uint_to_hex_lower8_le(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 m04500_mxx (KERN_ATTR_VECTOR ()) +KERNEL_FQ void m04500_mxx (KERN_ATTR_VECTOR ()) { /** * modifier @@ -39,7 +39,7 @@ __kernel void m04500_mxx (KERN_ATTR_VECTOR ()) * bin2asc table */ - __local u32 l_bin2asc[256]; + LOCAL_AS u32 l_bin2asc[256]; for (u32 i = lid; i < 256; i += lsz) { @@ -133,7 +133,7 @@ __kernel void m04500_mxx (KERN_ATTR_VECTOR ()) } } -__kernel void m04500_sxx (KERN_ATTR_VECTOR ()) +KERNEL_FQ void m04500_sxx (KERN_ATTR_VECTOR ()) { /** * modifier @@ -147,7 +147,7 @@ __kernel void m04500_sxx (KERN_ATTR_VECTOR ()) * bin2asc table */ - __local u32 l_bin2asc[256]; + LOCAL_AS u32 l_bin2asc[256]; for (u32 i = lid; i < 256; i += lsz) { diff --git a/OpenCL/m04520_a0-optimized.cl b/OpenCL/m04520_a0-optimized.cl index e6569d86b..277b44d75 100644 --- a/OpenCL/m04520_a0-optimized.cl +++ b/OpenCL/m04520_a0-optimized.cl @@ -27,7 +27,7 @@ #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 m04520_m04 (KERN_ATTR_RULES ()) +KERNEL_FQ void m04520_m04 (KERN_ATTR_RULES ()) { /** * base @@ -41,7 +41,7 @@ __kernel void m04520_m04 (KERN_ATTR_RULES ()) * shared */ - __local u32 l_bin2asc[256]; + LOCAL_AS u32 l_bin2asc[256]; for (u32 i = lid; i < 256; i += lsz) { @@ -587,15 +587,15 @@ __kernel void m04520_m04 (KERN_ATTR_RULES ()) } } -__kernel void m04520_m08 (KERN_ATTR_RULES ()) +KERNEL_FQ void m04520_m08 (KERN_ATTR_RULES ()) { } -__kernel void m04520_m16 (KERN_ATTR_RULES ()) +KERNEL_FQ void m04520_m16 (KERN_ATTR_RULES ()) { } -__kernel void m04520_s04 (KERN_ATTR_RULES ()) +KERNEL_FQ void m04520_s04 (KERN_ATTR_RULES ()) { /** * base @@ -609,7 +609,7 @@ __kernel void m04520_s04 (KERN_ATTR_RULES ()) * shared */ - __local u32 l_bin2asc[256]; + LOCAL_AS u32 l_bin2asc[256]; for (u32 i = lid; i < 256; i += lsz) { @@ -1167,10 +1167,10 @@ __kernel void m04520_s04 (KERN_ATTR_RULES ()) } } -__kernel void m04520_s08 (KERN_ATTR_RULES ()) +KERNEL_FQ void m04520_s08 (KERN_ATTR_RULES ()) { } -__kernel void m04520_s16 (KERN_ATTR_RULES ()) +KERNEL_FQ void m04520_s16 (KERN_ATTR_RULES ()) { } diff --git a/OpenCL/m04520_a0-pure.cl b/OpenCL/m04520_a0-pure.cl index c6fd1b96c..b53826e38 100644 --- a/OpenCL/m04520_a0-pure.cl +++ b/OpenCL/m04520_a0-pure.cl @@ -27,7 +27,7 @@ #define uint_to_hex_lower8_le(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 m04520_mxx (KERN_ATTR_RULES ()) +KERNEL_FQ void m04520_mxx (KERN_ATTR_RULES ()) { /** * modifier @@ -41,7 +41,7 @@ __kernel void m04520_mxx (KERN_ATTR_RULES ()) * bin2asc table */ - __local u32 l_bin2asc[256]; + LOCAL_AS u32 l_bin2asc[256]; for (u32 i = lid; i < 256; i += lsz) { @@ -139,7 +139,7 @@ __kernel void m04520_mxx (KERN_ATTR_RULES ()) } } -__kernel void m04520_sxx (KERN_ATTR_RULES ()) +KERNEL_FQ void m04520_sxx (KERN_ATTR_RULES ()) { /** * modifier @@ -153,7 +153,7 @@ __kernel void m04520_sxx (KERN_ATTR_RULES ()) * bin2asc table */ - __local u32 l_bin2asc[256]; + LOCAL_AS u32 l_bin2asc[256]; for (u32 i = lid; i < 256; i += lsz) { diff --git a/OpenCL/m04520_a1-optimized.cl b/OpenCL/m04520_a1-optimized.cl index 1ff340a97..59ee15c97 100644 --- a/OpenCL/m04520_a1-optimized.cl +++ b/OpenCL/m04520_a1-optimized.cl @@ -25,7 +25,7 @@ #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 m04520_m04 (KERN_ATTR_BASIC ()) +KERNEL_FQ void m04520_m04 (KERN_ATTR_BASIC ()) { /** * base @@ -39,7 +39,7 @@ __kernel void m04520_m04 (KERN_ATTR_BASIC ()) * shared */ - __local u32 l_bin2asc[256]; + LOCAL_AS u32 l_bin2asc[256]; for (u32 i = lid; i < 256; i += lsz) { @@ -643,15 +643,15 @@ __kernel void m04520_m04 (KERN_ATTR_BASIC ()) } } -__kernel void m04520_m08 (KERN_ATTR_BASIC ()) +KERNEL_FQ void m04520_m08 (KERN_ATTR_BASIC ()) { } -__kernel void m04520_m16 (KERN_ATTR_BASIC ()) +KERNEL_FQ void m04520_m16 (KERN_ATTR_BASIC ()) { } -__kernel void m04520_s04 (KERN_ATTR_BASIC ()) +KERNEL_FQ void m04520_s04 (KERN_ATTR_BASIC ()) { /** * base @@ -665,7 +665,7 @@ __kernel void m04520_s04 (KERN_ATTR_BASIC ()) * shared */ - __local u32 l_bin2asc[256]; + LOCAL_AS u32 l_bin2asc[256]; for (u32 i = lid; i < 256; i += lsz) { @@ -1281,10 +1281,10 @@ __kernel void m04520_s04 (KERN_ATTR_BASIC ()) } } -__kernel void m04520_s08 (KERN_ATTR_BASIC ()) +KERNEL_FQ void m04520_s08 (KERN_ATTR_BASIC ()) { } -__kernel void m04520_s16 (KERN_ATTR_BASIC ()) +KERNEL_FQ void m04520_s16 (KERN_ATTR_BASIC ()) { } diff --git a/OpenCL/m04520_a1-pure.cl b/OpenCL/m04520_a1-pure.cl index dfa325e04..54179adab 100644 --- a/OpenCL/m04520_a1-pure.cl +++ b/OpenCL/m04520_a1-pure.cl @@ -25,7 +25,7 @@ #define uint_to_hex_lower8_le(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 m04520_mxx (KERN_ATTR_BASIC ()) +KERNEL_FQ void m04520_mxx (KERN_ATTR_BASIC ()) { /** * modifier @@ -39,7 +39,7 @@ __kernel void m04520_mxx (KERN_ATTR_BASIC ()) * bin2asc table */ - __local u32 l_bin2asc[256]; + LOCAL_AS u32 l_bin2asc[256]; for (u32 i = lid; i < 256; i += lsz) { @@ -135,7 +135,7 @@ __kernel void m04520_mxx (KERN_ATTR_BASIC ()) } } -__kernel void m04520_sxx (KERN_ATTR_BASIC ()) +KERNEL_FQ void m04520_sxx (KERN_ATTR_BASIC ()) { /** * modifier @@ -149,7 +149,7 @@ __kernel void m04520_sxx (KERN_ATTR_BASIC ()) * bin2asc table */ - __local u32 l_bin2asc[256]; + LOCAL_AS u32 l_bin2asc[256]; for (u32 i = lid; i < 256; i += lsz) { diff --git a/OpenCL/m04520_a3-optimized.cl b/OpenCL/m04520_a3-optimized.cl index fe4eb7509..ce3261375 100644 --- a/OpenCL/m04520_a3-optimized.cl +++ b/OpenCL/m04520_a3-optimized.cl @@ -25,7 +25,7 @@ #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 -DECLSPEC void m04520m (u32 *w0, u32 *w1, u32 *w2, u32 *w3, const u32 pw_len, KERN_ATTR_BASIC (), __local u32 *l_bin2asc) +DECLSPEC void m04520m (u32 *w0, u32 *w1, u32 *w2, u32 *w3, const u32 pw_len, KERN_ATTR_BASIC (), LOCAL_AS u32 *l_bin2asc) { /** * modifier @@ -544,7 +544,7 @@ DECLSPEC void m04520m (u32 *w0, u32 *w1, u32 *w2, u32 *w3, const u32 pw_len, KER } } -DECLSPEC void m04520s (u32 *w0, u32 *w1, u32 *w2, u32 *w3, const u32 pw_len, KERN_ATTR_BASIC (), __local u32 *l_bin2asc) +DECLSPEC void m04520s (u32 *w0, u32 *w1, u32 *w2, u32 *w3, const u32 pw_len, KERN_ATTR_BASIC (), LOCAL_AS u32 *l_bin2asc) { /** * modifier @@ -1075,7 +1075,7 @@ DECLSPEC void m04520s (u32 *w0, u32 *w1, u32 *w2, u32 *w3, const u32 pw_len, KER } } -__kernel void m04520_m04 (KERN_ATTR_BASIC ()) +KERNEL_FQ void m04520_m04 (KERN_ATTR_BASIC ()) { /** * base @@ -1089,7 +1089,7 @@ __kernel void m04520_m04 (KERN_ATTR_BASIC ()) * shared */ - __local u32 l_bin2asc[256]; + LOCAL_AS u32 l_bin2asc[256]; for (u32 i = lid; i < 256; i += lsz) { @@ -1145,7 +1145,7 @@ __kernel void m04520_m04 (KERN_ATTR_BASIC ()) m04520m (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_extra0_buf, d_extra1_buf, d_extra2_buf, d_extra3_buf, bitmap_mask, bitmap_shift1, bitmap_shift2, salt_pos, loop_pos, loop_cnt, il_cnt, digests_cnt, digests_offset, combs_mode, gid_max, l_bin2asc); } -__kernel void m04520_m08 (KERN_ATTR_BASIC ()) +KERNEL_FQ void m04520_m08 (KERN_ATTR_BASIC ()) { /** * base @@ -1159,7 +1159,7 @@ __kernel void m04520_m08 (KERN_ATTR_BASIC ()) * shared */ - __local u32 l_bin2asc[256]; + LOCAL_AS u32 l_bin2asc[256]; for (u32 i = lid; i < 256; i += lsz) { @@ -1215,7 +1215,7 @@ __kernel void m04520_m08 (KERN_ATTR_BASIC ()) m04520m (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_extra0_buf, d_extra1_buf, d_extra2_buf, d_extra3_buf, bitmap_mask, bitmap_shift1, bitmap_shift2, salt_pos, loop_pos, loop_cnt, il_cnt, digests_cnt, digests_offset, combs_mode, gid_max, l_bin2asc); } -__kernel void m04520_m16 (KERN_ATTR_BASIC ()) +KERNEL_FQ void m04520_m16 (KERN_ATTR_BASIC ()) { /** * base @@ -1229,7 +1229,7 @@ __kernel void m04520_m16 (KERN_ATTR_BASIC ()) * shared */ - __local u32 l_bin2asc[256]; + LOCAL_AS u32 l_bin2asc[256]; for (u32 i = lid; i < 256; i += lsz) { @@ -1285,7 +1285,7 @@ __kernel void m04520_m16 (KERN_ATTR_BASIC ()) m04520m (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_extra0_buf, d_extra1_buf, d_extra2_buf, d_extra3_buf, bitmap_mask, bitmap_shift1, bitmap_shift2, salt_pos, loop_pos, loop_cnt, il_cnt, digests_cnt, digests_offset, combs_mode, gid_max, l_bin2asc); } -__kernel void m04520_s04 (KERN_ATTR_BASIC ()) +KERNEL_FQ void m04520_s04 (KERN_ATTR_BASIC ()) { /** * base @@ -1299,7 +1299,7 @@ __kernel void m04520_s04 (KERN_ATTR_BASIC ()) * shared */ - __local u32 l_bin2asc[256]; + LOCAL_AS u32 l_bin2asc[256]; for (u32 i = lid; i < 256; i += lsz) { @@ -1355,7 +1355,7 @@ __kernel void m04520_s04 (KERN_ATTR_BASIC ()) m04520s (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_extra0_buf, d_extra1_buf, d_extra2_buf, d_extra3_buf, bitmap_mask, bitmap_shift1, bitmap_shift2, salt_pos, loop_pos, loop_cnt, il_cnt, digests_cnt, digests_offset, combs_mode, gid_max, l_bin2asc); } -__kernel void m04520_s08 (KERN_ATTR_BASIC ()) +KERNEL_FQ void m04520_s08 (KERN_ATTR_BASIC ()) { /** * base @@ -1369,7 +1369,7 @@ __kernel void m04520_s08 (KERN_ATTR_BASIC ()) * shared */ - __local u32 l_bin2asc[256]; + LOCAL_AS u32 l_bin2asc[256]; for (u32 i = lid; i < 256; i += lsz) { @@ -1425,7 +1425,7 @@ __kernel void m04520_s08 (KERN_ATTR_BASIC ()) m04520s (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_extra0_buf, d_extra1_buf, d_extra2_buf, d_extra3_buf, bitmap_mask, bitmap_shift1, bitmap_shift2, salt_pos, loop_pos, loop_cnt, il_cnt, digests_cnt, digests_offset, combs_mode, gid_max, l_bin2asc); } -__kernel void m04520_s16 (KERN_ATTR_BASIC ()) +KERNEL_FQ void m04520_s16 (KERN_ATTR_BASIC ()) { /** * base @@ -1439,7 +1439,7 @@ __kernel void m04520_s16 (KERN_ATTR_BASIC ()) * shared */ - __local u32 l_bin2asc[256]; + LOCAL_AS u32 l_bin2asc[256]; for (u32 i = lid; i < 256; i += lsz) { diff --git a/OpenCL/m04520_a3-pure.cl b/OpenCL/m04520_a3-pure.cl index 5b86f9977..20f479c53 100644 --- a/OpenCL/m04520_a3-pure.cl +++ b/OpenCL/m04520_a3-pure.cl @@ -25,7 +25,7 @@ #define uint_to_hex_lower8_le(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 m04520_mxx (KERN_ATTR_VECTOR ()) +KERNEL_FQ void m04520_mxx (KERN_ATTR_VECTOR ()) { /** * modifier @@ -39,7 +39,7 @@ __kernel void m04520_mxx (KERN_ATTR_VECTOR ()) * bin2asc table */ - __local u32 l_bin2asc[256]; + LOCAL_AS u32 l_bin2asc[256]; for (u32 i = lid; i < 256; i += lsz) { @@ -150,7 +150,7 @@ __kernel void m04520_mxx (KERN_ATTR_VECTOR ()) } } -__kernel void m04520_sxx (KERN_ATTR_VECTOR ()) +KERNEL_FQ void m04520_sxx (KERN_ATTR_VECTOR ()) { /** * modifier @@ -164,7 +164,7 @@ __kernel void m04520_sxx (KERN_ATTR_VECTOR ()) * bin2asc table */ - __local u32 l_bin2asc[256]; + LOCAL_AS u32 l_bin2asc[256]; for (u32 i = lid; i < 256; i += lsz) { diff --git a/OpenCL/m04700_a0-optimized.cl b/OpenCL/m04700_a0-optimized.cl index f1ab10919..7d46170fb 100644 --- a/OpenCL/m04700_a0-optimized.cl +++ b/OpenCL/m04700_a0-optimized.cl @@ -28,7 +28,7 @@ #define uint_to_hex_lower8_le(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 m04700_m04 (KERN_ATTR_RULES ()) +KERNEL_FQ void m04700_m04 (KERN_ATTR_RULES ()) { /** * modifier @@ -42,7 +42,7 @@ __kernel void m04700_m04 (KERN_ATTR_RULES ()) * bin2asc table */ - __local u32 l_bin2asc[256]; + LOCAL_AS u32 l_bin2asc[256]; for (u32 i = lid; i < 256; i += lsz) { @@ -313,15 +313,15 @@ __kernel void m04700_m04 (KERN_ATTR_RULES ()) } } -__kernel void m04700_m08 (KERN_ATTR_RULES ()) +KERNEL_FQ void m04700_m08 (KERN_ATTR_RULES ()) { } -__kernel void m04700_m16 (KERN_ATTR_RULES ()) +KERNEL_FQ void m04700_m16 (KERN_ATTR_RULES ()) { } -__kernel void m04700_s04 (KERN_ATTR_RULES ()) +KERNEL_FQ void m04700_s04 (KERN_ATTR_RULES ()) { /** * modifier @@ -335,7 +335,7 @@ __kernel void m04700_s04 (KERN_ATTR_RULES ()) * bin2asc table */ - __local u32 l_bin2asc[256]; + LOCAL_AS u32 l_bin2asc[256]; for (u32 i = lid; i < 256; i += lsz) { @@ -627,10 +627,10 @@ __kernel void m04700_s04 (KERN_ATTR_RULES ()) } } -__kernel void m04700_s08 (KERN_ATTR_RULES ()) +KERNEL_FQ void m04700_s08 (KERN_ATTR_RULES ()) { } -__kernel void m04700_s16 (KERN_ATTR_RULES ()) +KERNEL_FQ void m04700_s16 (KERN_ATTR_RULES ()) { } diff --git a/OpenCL/m04700_a0-pure.cl b/OpenCL/m04700_a0-pure.cl index 6fdd54c9c..056a4bab3 100644 --- a/OpenCL/m04700_a0-pure.cl +++ b/OpenCL/m04700_a0-pure.cl @@ -28,7 +28,7 @@ #define uint_to_hex_lower8_le(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 m04700_mxx (KERN_ATTR_RULES ()) +KERNEL_FQ void m04700_mxx (KERN_ATTR_RULES ()) { /** * modifier @@ -42,7 +42,7 @@ __kernel void m04700_mxx (KERN_ATTR_RULES ()) * bin2asc table */ - __local u32 l_bin2asc[256]; + LOCAL_AS u32 l_bin2asc[256]; for (u32 i = lid; i < 256; i += lsz) { @@ -120,7 +120,7 @@ __kernel void m04700_mxx (KERN_ATTR_RULES ()) } } -__kernel void m04700_sxx (KERN_ATTR_RULES ()) +KERNEL_FQ void m04700_sxx (KERN_ATTR_RULES ()) { /** * modifier @@ -134,7 +134,7 @@ __kernel void m04700_sxx (KERN_ATTR_RULES ()) * bin2asc table */ - __local u32 l_bin2asc[256]; + LOCAL_AS u32 l_bin2asc[256]; for (u32 i = lid; i < 256; i += lsz) { diff --git a/OpenCL/m04700_a1-optimized.cl b/OpenCL/m04700_a1-optimized.cl index 2ad62a46a..f34a8ba88 100644 --- a/OpenCL/m04700_a1-optimized.cl +++ b/OpenCL/m04700_a1-optimized.cl @@ -26,7 +26,7 @@ #define uint_to_hex_lower8_le(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 m04700_m04 (KERN_ATTR_BASIC ()) +KERNEL_FQ void m04700_m04 (KERN_ATTR_BASIC ()) { /** * modifier @@ -40,7 +40,7 @@ __kernel void m04700_m04 (KERN_ATTR_BASIC ()) * bin2asc table */ - __local u32 l_bin2asc[256]; + LOCAL_AS u32 l_bin2asc[256]; for (u32 i = lid; i < 256; i += lsz) { @@ -366,15 +366,15 @@ __kernel void m04700_m04 (KERN_ATTR_BASIC ()) } } -__kernel void m04700_m08 (KERN_ATTR_BASIC ()) +KERNEL_FQ void m04700_m08 (KERN_ATTR_BASIC ()) { } -__kernel void m04700_m16 (KERN_ATTR_BASIC ()) +KERNEL_FQ void m04700_m16 (KERN_ATTR_BASIC ()) { } -__kernel void m04700_s04 (KERN_ATTR_BASIC ()) +KERNEL_FQ void m04700_s04 (KERN_ATTR_BASIC ()) { /** * modifier @@ -388,7 +388,7 @@ __kernel void m04700_s04 (KERN_ATTR_BASIC ()) * bin2asc table */ - __local u32 l_bin2asc[256]; + LOCAL_AS u32 l_bin2asc[256]; for (u32 i = lid; i < 256; i += lsz) { @@ -735,10 +735,10 @@ __kernel void m04700_s04 (KERN_ATTR_BASIC ()) } } -__kernel void m04700_s08 (KERN_ATTR_BASIC ()) +KERNEL_FQ void m04700_s08 (KERN_ATTR_BASIC ()) { } -__kernel void m04700_s16 (KERN_ATTR_BASIC ()) +KERNEL_FQ void m04700_s16 (KERN_ATTR_BASIC ()) { } diff --git a/OpenCL/m04700_a1-pure.cl b/OpenCL/m04700_a1-pure.cl index c33480df9..357bf7a78 100644 --- a/OpenCL/m04700_a1-pure.cl +++ b/OpenCL/m04700_a1-pure.cl @@ -26,7 +26,7 @@ #define uint_to_hex_lower8_le(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 m04700_mxx (KERN_ATTR_BASIC ()) +KERNEL_FQ void m04700_mxx (KERN_ATTR_BASIC ()) { /** * modifier @@ -40,7 +40,7 @@ __kernel void m04700_mxx (KERN_ATTR_BASIC ()) * bin2asc table */ - __local u32 l_bin2asc[256]; + LOCAL_AS u32 l_bin2asc[256]; for (u32 i = lid; i < 256; i += lsz) { @@ -116,7 +116,7 @@ __kernel void m04700_mxx (KERN_ATTR_BASIC ()) } } -__kernel void m04700_sxx (KERN_ATTR_BASIC ()) +KERNEL_FQ void m04700_sxx (KERN_ATTR_BASIC ()) { /** * modifier @@ -130,7 +130,7 @@ __kernel void m04700_sxx (KERN_ATTR_BASIC ()) * bin2asc table */ - __local u32 l_bin2asc[256]; + LOCAL_AS u32 l_bin2asc[256]; for (u32 i = lid; i < 256; i += lsz) { diff --git a/OpenCL/m04700_a3-optimized.cl b/OpenCL/m04700_a3-optimized.cl index 96ebb71e6..1cfe8d85c 100644 --- a/OpenCL/m04700_a3-optimized.cl +++ b/OpenCL/m04700_a3-optimized.cl @@ -26,7 +26,7 @@ #define uint_to_hex_lower8_le(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 -DECLSPEC void m04700m (u32 *w0, u32 *w1, u32 *w2, u32 *w3, const u32 pw_len, KERN_ATTR_BASIC (), __local u32 *l_bin2asc) +DECLSPEC void m04700m (u32 *w0, u32 *w1, u32 *w2, u32 *w3, const u32 pw_len, KERN_ATTR_BASIC (), LOCAL_AS u32 *l_bin2asc) { /** * modifier @@ -284,7 +284,7 @@ DECLSPEC void m04700m (u32 *w0, u32 *w1, u32 *w2, u32 *w3, const u32 pw_len, KER } } -DECLSPEC void m04700s (u32 *w0, u32 *w1, u32 *w2, u32 *w3, const u32 pw_len, KERN_ATTR_BASIC (), __local u32 *l_bin2asc) +DECLSPEC void m04700s (u32 *w0, u32 *w1, u32 *w2, u32 *w3, const u32 pw_len, KERN_ATTR_BASIC (), LOCAL_AS u32 *l_bin2asc) { /** * modifier @@ -563,7 +563,7 @@ DECLSPEC void m04700s (u32 *w0, u32 *w1, u32 *w2, u32 *w3, const u32 pw_len, KER } } -__kernel void m04700_m04 (KERN_ATTR_BASIC ()) +KERNEL_FQ void m04700_m04 (KERN_ATTR_BASIC ()) { /** * base @@ -577,7 +577,7 @@ __kernel void m04700_m04 (KERN_ATTR_BASIC ()) * bin2asc table */ - __local u32 l_bin2asc[256]; + LOCAL_AS u32 l_bin2asc[256]; for (u32 i = lid; i < 256; i += lsz) { @@ -633,7 +633,7 @@ __kernel void m04700_m04 (KERN_ATTR_BASIC ()) m04700m (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_extra0_buf, d_extra1_buf, d_extra2_buf, d_extra3_buf, bitmap_mask, bitmap_shift1, bitmap_shift2, salt_pos, loop_pos, loop_cnt, il_cnt, digests_cnt, digests_offset, combs_mode, gid_max, l_bin2asc); } -__kernel void m04700_m08 (KERN_ATTR_BASIC ()) +KERNEL_FQ void m04700_m08 (KERN_ATTR_BASIC ()) { /** * base @@ -647,7 +647,7 @@ __kernel void m04700_m08 (KERN_ATTR_BASIC ()) * bin2asc table */ - __local u32 l_bin2asc[256]; + LOCAL_AS u32 l_bin2asc[256]; for (u32 i = lid; i < 256; i += lsz) { @@ -703,7 +703,7 @@ __kernel void m04700_m08 (KERN_ATTR_BASIC ()) m04700m (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_extra0_buf, d_extra1_buf, d_extra2_buf, d_extra3_buf, bitmap_mask, bitmap_shift1, bitmap_shift2, salt_pos, loop_pos, loop_cnt, il_cnt, digests_cnt, digests_offset, combs_mode, gid_max, l_bin2asc); } -__kernel void m04700_m16 (KERN_ATTR_BASIC ()) +KERNEL_FQ void m04700_m16 (KERN_ATTR_BASIC ()) { /** * base @@ -717,7 +717,7 @@ __kernel void m04700_m16 (KERN_ATTR_BASIC ()) * bin2asc table */ - __local u32 l_bin2asc[256]; + LOCAL_AS u32 l_bin2asc[256]; for (u32 i = lid; i < 256; i += lsz) { @@ -773,7 +773,7 @@ __kernel void m04700_m16 (KERN_ATTR_BASIC ()) m04700m (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_extra0_buf, d_extra1_buf, d_extra2_buf, d_extra3_buf, bitmap_mask, bitmap_shift1, bitmap_shift2, salt_pos, loop_pos, loop_cnt, il_cnt, digests_cnt, digests_offset, combs_mode, gid_max, l_bin2asc); } -__kernel void m04700_s04 (KERN_ATTR_BASIC ()) +KERNEL_FQ void m04700_s04 (KERN_ATTR_BASIC ()) { /** * base @@ -787,7 +787,7 @@ __kernel void m04700_s04 (KERN_ATTR_BASIC ()) * bin2asc table */ - __local u32 l_bin2asc[256]; + LOCAL_AS u32 l_bin2asc[256]; for (u32 i = lid; i < 256; i += lsz) { @@ -843,7 +843,7 @@ __kernel void m04700_s04 (KERN_ATTR_BASIC ()) m04700s (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_extra0_buf, d_extra1_buf, d_extra2_buf, d_extra3_buf, bitmap_mask, bitmap_shift1, bitmap_shift2, salt_pos, loop_pos, loop_cnt, il_cnt, digests_cnt, digests_offset, combs_mode, gid_max, l_bin2asc); } -__kernel void m04700_s08 (KERN_ATTR_BASIC ()) +KERNEL_FQ void m04700_s08 (KERN_ATTR_BASIC ()) { /** * base @@ -857,7 +857,7 @@ __kernel void m04700_s08 (KERN_ATTR_BASIC ()) * bin2asc table */ - __local u32 l_bin2asc[256]; + LOCAL_AS u32 l_bin2asc[256]; for (u32 i = lid; i < 256; i += lsz) { @@ -913,7 +913,7 @@ __kernel void m04700_s08 (KERN_ATTR_BASIC ()) m04700s (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_extra0_buf, d_extra1_buf, d_extra2_buf, d_extra3_buf, bitmap_mask, bitmap_shift1, bitmap_shift2, salt_pos, loop_pos, loop_cnt, il_cnt, digests_cnt, digests_offset, combs_mode, gid_max, l_bin2asc); } -__kernel void m04700_s16 (KERN_ATTR_BASIC ()) +KERNEL_FQ void m04700_s16 (KERN_ATTR_BASIC ()) { /** * base @@ -927,7 +927,7 @@ __kernel void m04700_s16 (KERN_ATTR_BASIC ()) * bin2asc table */ - __local u32 l_bin2asc[256]; + LOCAL_AS u32 l_bin2asc[256]; for (u32 i = lid; i < 256; i += lsz) { diff --git a/OpenCL/m04700_a3-pure.cl b/OpenCL/m04700_a3-pure.cl index 08a4a000a..9a5fce196 100644 --- a/OpenCL/m04700_a3-pure.cl +++ b/OpenCL/m04700_a3-pure.cl @@ -26,7 +26,7 @@ #define uint_to_hex_lower8_le(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 m04700_mxx (KERN_ATTR_VECTOR ()) +KERNEL_FQ void m04700_mxx (KERN_ATTR_VECTOR ()) { /** * modifier @@ -40,7 +40,7 @@ __kernel void m04700_mxx (KERN_ATTR_VECTOR ()) * bin2asc table */ - __local u32 l_bin2asc[256]; + LOCAL_AS u32 l_bin2asc[256]; for (u32 i = lid; i < 256; i += lsz) { @@ -129,7 +129,7 @@ __kernel void m04700_mxx (KERN_ATTR_VECTOR ()) } } -__kernel void m04700_sxx (KERN_ATTR_VECTOR ()) +KERNEL_FQ void m04700_sxx (KERN_ATTR_VECTOR ()) { /** * modifier @@ -143,7 +143,7 @@ __kernel void m04700_sxx (KERN_ATTR_VECTOR ()) * bin2asc table */ - __local u32 l_bin2asc[256]; + LOCAL_AS u32 l_bin2asc[256]; for (u32 i = lid; i < 256; i += lsz) { diff --git a/OpenCL/m04800_a0-optimized.cl b/OpenCL/m04800_a0-optimized.cl index 68f2b176c..9f6ce1abc 100644 --- a/OpenCL/m04800_a0-optimized.cl +++ b/OpenCL/m04800_a0-optimized.cl @@ -15,7 +15,7 @@ #include "inc_hash_md5.cl" #endif -__kernel void m04800_m04 (KERN_ATTR_RULES ()) +KERNEL_FQ void m04800_m04 (KERN_ATTR_RULES ()) { /** * modifier @@ -212,15 +212,15 @@ __kernel void m04800_m04 (KERN_ATTR_RULES ()) } } -__kernel void m04800_m08 (KERN_ATTR_RULES ()) +KERNEL_FQ void m04800_m08 (KERN_ATTR_RULES ()) { } -__kernel void m04800_m16 (KERN_ATTR_RULES ()) +KERNEL_FQ void m04800_m16 (KERN_ATTR_RULES ()) { } -__kernel void m04800_s04 (KERN_ATTR_RULES ()) +KERNEL_FQ void m04800_s04 (KERN_ATTR_RULES ()) { /** * modifier @@ -432,10 +432,10 @@ __kernel void m04800_s04 (KERN_ATTR_RULES ()) } } -__kernel void m04800_s08 (KERN_ATTR_RULES ()) +KERNEL_FQ void m04800_s08 (KERN_ATTR_RULES ()) { } -__kernel void m04800_s16 (KERN_ATTR_RULES ()) +KERNEL_FQ void m04800_s16 (KERN_ATTR_RULES ()) { } diff --git a/OpenCL/m04800_a0-pure.cl b/OpenCL/m04800_a0-pure.cl index 9b46a8e22..f3c7646f0 100644 --- a/OpenCL/m04800_a0-pure.cl +++ b/OpenCL/m04800_a0-pure.cl @@ -15,7 +15,7 @@ #include "inc_hash_md5.cl" #endif -__kernel void m04800_mxx (KERN_ATTR_RULES ()) +KERNEL_FQ void m04800_mxx (KERN_ATTR_RULES ()) { /** * modifier @@ -76,7 +76,7 @@ __kernel void m04800_mxx (KERN_ATTR_RULES ()) } } -__kernel void m04800_sxx (KERN_ATTR_RULES ()) +KERNEL_FQ void m04800_sxx (KERN_ATTR_RULES ()) { /** * modifier diff --git a/OpenCL/m04800_a1-optimized.cl b/OpenCL/m04800_a1-optimized.cl index 08a0b90a5..b31486ccc 100644 --- a/OpenCL/m04800_a1-optimized.cl +++ b/OpenCL/m04800_a1-optimized.cl @@ -25,7 +25,7 @@ #define uint_to_hex_lower8_le(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 m04800_m04 (KERN_ATTR_BASIC ()) +KERNEL_FQ void m04800_m04 (KERN_ATTR_BASIC ()) { /** * modifier @@ -282,15 +282,15 @@ __kernel void m04800_m04 (KERN_ATTR_BASIC ()) } } -__kernel void m04800_m08 (KERN_ATTR_BASIC ()) +KERNEL_FQ void m04800_m08 (KERN_ATTR_BASIC ()) { } -__kernel void m04800_m16 (KERN_ATTR_BASIC ()) +KERNEL_FQ void m04800_m16 (KERN_ATTR_BASIC ()) { } -__kernel void m04800_s04 (KERN_ATTR_BASIC ()) +KERNEL_FQ void m04800_s04 (KERN_ATTR_BASIC ()) { /** * modifier @@ -562,10 +562,10 @@ __kernel void m04800_s04 (KERN_ATTR_BASIC ()) } } -__kernel void m04800_s08 (KERN_ATTR_BASIC ()) +KERNEL_FQ void m04800_s08 (KERN_ATTR_BASIC ()) { } -__kernel void m04800_s16 (KERN_ATTR_BASIC ()) +KERNEL_FQ void m04800_s16 (KERN_ATTR_BASIC ()) { } diff --git a/OpenCL/m04800_a1-pure.cl b/OpenCL/m04800_a1-pure.cl index 80fe39f3e..75f493f7a 100644 --- a/OpenCL/m04800_a1-pure.cl +++ b/OpenCL/m04800_a1-pure.cl @@ -13,7 +13,7 @@ #include "inc_hash_md5.cl" #endif -__kernel void m04800_mxx (KERN_ATTR_BASIC ()) +KERNEL_FQ void m04800_mxx (KERN_ATTR_BASIC ()) { /** * modifier @@ -70,7 +70,7 @@ __kernel void m04800_mxx (KERN_ATTR_BASIC ()) } } -__kernel void m04800_sxx (KERN_ATTR_BASIC ()) +KERNEL_FQ void m04800_sxx (KERN_ATTR_BASIC ()) { /** * modifier diff --git a/OpenCL/m04800_a3-optimized.cl b/OpenCL/m04800_a3-optimized.cl index 782f8caa0..b4e796a0f 100644 --- a/OpenCL/m04800_a3-optimized.cl +++ b/OpenCL/m04800_a3-optimized.cl @@ -400,7 +400,7 @@ DECLSPEC void m04800s (u32 *w0, u32 *w1, u32 *w2, u32 *w3, const u32 pw_len, KER } } -__kernel void m04800_m04 (KERN_ATTR_BASIC ()) +KERNEL_FQ void m04800_m04 (KERN_ATTR_BASIC ()) { /** * base @@ -453,7 +453,7 @@ __kernel void m04800_m04 (KERN_ATTR_BASIC ()) m04800m (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_extra0_buf, d_extra1_buf, d_extra2_buf, d_extra3_buf, bitmap_mask, bitmap_shift1, bitmap_shift2, salt_pos, loop_pos, loop_cnt, il_cnt, digests_cnt, digests_offset, combs_mode, gid_max); } -__kernel void m04800_m08 (KERN_ATTR_BASIC ()) +KERNEL_FQ void m04800_m08 (KERN_ATTR_BASIC ()) { /** * base @@ -506,7 +506,7 @@ __kernel void m04800_m08 (KERN_ATTR_BASIC ()) m04800m (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_extra0_buf, d_extra1_buf, d_extra2_buf, d_extra3_buf, bitmap_mask, bitmap_shift1, bitmap_shift2, salt_pos, loop_pos, loop_cnt, il_cnt, digests_cnt, digests_offset, combs_mode, gid_max); } -__kernel void m04800_m16 (KERN_ATTR_BASIC ()) +KERNEL_FQ void m04800_m16 (KERN_ATTR_BASIC ()) { /** * base @@ -559,7 +559,7 @@ __kernel void m04800_m16 (KERN_ATTR_BASIC ()) m04800m (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_extra0_buf, d_extra1_buf, d_extra2_buf, d_extra3_buf, bitmap_mask, bitmap_shift1, bitmap_shift2, salt_pos, loop_pos, loop_cnt, il_cnt, digests_cnt, digests_offset, combs_mode, gid_max); } -__kernel void m04800_s04 (KERN_ATTR_BASIC ()) +KERNEL_FQ void m04800_s04 (KERN_ATTR_BASIC ()) { /** * base @@ -612,7 +612,7 @@ __kernel void m04800_s04 (KERN_ATTR_BASIC ()) m04800s (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_extra0_buf, d_extra1_buf, d_extra2_buf, d_extra3_buf, bitmap_mask, bitmap_shift1, bitmap_shift2, salt_pos, loop_pos, loop_cnt, il_cnt, digests_cnt, digests_offset, combs_mode, gid_max); } -__kernel void m04800_s08 (KERN_ATTR_BASIC ()) +KERNEL_FQ void m04800_s08 (KERN_ATTR_BASIC ()) { /** * base @@ -665,7 +665,7 @@ __kernel void m04800_s08 (KERN_ATTR_BASIC ()) m04800s (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_extra0_buf, d_extra1_buf, d_extra2_buf, d_extra3_buf, bitmap_mask, bitmap_shift1, bitmap_shift2, salt_pos, loop_pos, loop_cnt, il_cnt, digests_cnt, digests_offset, combs_mode, gid_max); } -__kernel void m04800_s16 (KERN_ATTR_BASIC ()) +KERNEL_FQ void m04800_s16 (KERN_ATTR_BASIC ()) { /** * base diff --git a/OpenCL/m04800_a3-pure.cl b/OpenCL/m04800_a3-pure.cl index 71d0bf58f..aa4b26b98 100644 --- a/OpenCL/m04800_a3-pure.cl +++ b/OpenCL/m04800_a3-pure.cl @@ -13,7 +13,7 @@ #include "inc_hash_md5.cl" #endif -__kernel void m04800_mxx (KERN_ATTR_VECTOR ()) +KERNEL_FQ void m04800_mxx (KERN_ATTR_VECTOR ()) { /** * modifier @@ -87,7 +87,7 @@ __kernel void m04800_mxx (KERN_ATTR_VECTOR ()) } } -__kernel void m04800_sxx (KERN_ATTR_VECTOR ()) +KERNEL_FQ void m04800_sxx (KERN_ATTR_VECTOR ()) { /** * modifier diff --git a/OpenCL/m04900_a0-optimized.cl b/OpenCL/m04900_a0-optimized.cl index 2ecff69c6..215657852 100644 --- a/OpenCL/m04900_a0-optimized.cl +++ b/OpenCL/m04900_a0-optimized.cl @@ -15,7 +15,7 @@ #include "inc_hash_sha1.cl" #endif -__kernel void m04900_m04 (KERN_ATTR_RULES ()) +KERNEL_FQ void m04900_m04 (KERN_ATTR_RULES ()) { /** * modifier @@ -287,15 +287,15 @@ __kernel void m04900_m04 (KERN_ATTR_RULES ()) } } -__kernel void m04900_m08 (KERN_ATTR_RULES ()) +KERNEL_FQ void m04900_m08 (KERN_ATTR_RULES ()) { } -__kernel void m04900_m16 (KERN_ATTR_RULES ()) +KERNEL_FQ void m04900_m16 (KERN_ATTR_RULES ()) { } -__kernel void m04900_s04 (KERN_ATTR_RULES ()) +KERNEL_FQ void m04900_s04 (KERN_ATTR_RULES ()) { /** * modifier @@ -588,10 +588,10 @@ __kernel void m04900_s04 (KERN_ATTR_RULES ()) } } -__kernel void m04900_s08 (KERN_ATTR_RULES ()) +KERNEL_FQ void m04900_s08 (KERN_ATTR_RULES ()) { } -__kernel void m04900_s16 (KERN_ATTR_RULES ()) +KERNEL_FQ void m04900_s16 (KERN_ATTR_RULES ()) { } diff --git a/OpenCL/m04900_a0-pure.cl b/OpenCL/m04900_a0-pure.cl index e071a5bcd..f75cb4418 100644 --- a/OpenCL/m04900_a0-pure.cl +++ b/OpenCL/m04900_a0-pure.cl @@ -15,7 +15,7 @@ #include "inc_hash_sha1.cl" #endif -__kernel void m04900_mxx (KERN_ATTR_RULES ()) +KERNEL_FQ void m04900_mxx (KERN_ATTR_RULES ()) { /** * modifier @@ -74,7 +74,7 @@ __kernel void m04900_mxx (KERN_ATTR_RULES ()) } } -__kernel void m04900_sxx (KERN_ATTR_RULES ()) +KERNEL_FQ void m04900_sxx (KERN_ATTR_RULES ()) { /** * modifier diff --git a/OpenCL/m04900_a1-optimized.cl b/OpenCL/m04900_a1-optimized.cl index 1fe4b5414..e9fdfb2fe 100644 --- a/OpenCL/m04900_a1-optimized.cl +++ b/OpenCL/m04900_a1-optimized.cl @@ -13,7 +13,7 @@ #include "inc_hash_sha1.cl" #endif -__kernel void m04900_m04 (KERN_ATTR_BASIC ()) +KERNEL_FQ void m04900_m04 (KERN_ATTR_BASIC ()) { /** * modifier @@ -345,15 +345,15 @@ __kernel void m04900_m04 (KERN_ATTR_BASIC ()) } } -__kernel void m04900_m08 (KERN_ATTR_BASIC ()) +KERNEL_FQ void m04900_m08 (KERN_ATTR_BASIC ()) { } -__kernel void m04900_m16 (KERN_ATTR_BASIC ()) +KERNEL_FQ void m04900_m16 (KERN_ATTR_BASIC ()) { } -__kernel void m04900_s04 (KERN_ATTR_BASIC ()) +KERNEL_FQ void m04900_s04 (KERN_ATTR_BASIC ()) { /** * modifier @@ -706,10 +706,10 @@ __kernel void m04900_s04 (KERN_ATTR_BASIC ()) } } -__kernel void m04900_s08 (KERN_ATTR_BASIC ()) +KERNEL_FQ void m04900_s08 (KERN_ATTR_BASIC ()) { } -__kernel void m04900_s16 (KERN_ATTR_BASIC ()) +KERNEL_FQ void m04900_s16 (KERN_ATTR_BASIC ()) { } diff --git a/OpenCL/m04900_a1-pure.cl b/OpenCL/m04900_a1-pure.cl index 5c73b40a7..19a21165f 100644 --- a/OpenCL/m04900_a1-pure.cl +++ b/OpenCL/m04900_a1-pure.cl @@ -13,7 +13,7 @@ #include "inc_hash_sha1.cl" #endif -__kernel void m04900_mxx (KERN_ATTR_BASIC ()) +KERNEL_FQ void m04900_mxx (KERN_ATTR_BASIC ()) { /** * modifier @@ -68,7 +68,7 @@ __kernel void m04900_mxx (KERN_ATTR_BASIC ()) } } -__kernel void m04900_sxx (KERN_ATTR_BASIC ()) +KERNEL_FQ void m04900_sxx (KERN_ATTR_BASIC ()) { /** * modifier diff --git a/OpenCL/m04900_a3-optimized.cl b/OpenCL/m04900_a3-optimized.cl index a10cc4475..73313861c 100644 --- a/OpenCL/m04900_a3-optimized.cl +++ b/OpenCL/m04900_a3-optimized.cl @@ -568,7 +568,7 @@ DECLSPEC void m04900s (u32 *w0, u32 *w1, u32 *w2, u32 *w3, const u32 pw_len, KER } } -__kernel void m04900_m04 (KERN_ATTR_BASIC ()) +KERNEL_FQ void m04900_m04 (KERN_ATTR_BASIC ()) { /** * base @@ -621,7 +621,7 @@ __kernel void m04900_m04 (KERN_ATTR_BASIC ()) m04900m (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_extra0_buf, d_extra1_buf, d_extra2_buf, d_extra3_buf, bitmap_mask, bitmap_shift1, bitmap_shift2, salt_pos, loop_pos, loop_cnt, il_cnt, digests_cnt, digests_offset, combs_mode, gid_max); } -__kernel void m04900_m08 (KERN_ATTR_BASIC ()) +KERNEL_FQ void m04900_m08 (KERN_ATTR_BASIC ()) { /** * base @@ -674,7 +674,7 @@ __kernel void m04900_m08 (KERN_ATTR_BASIC ()) m04900m (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_extra0_buf, d_extra1_buf, d_extra2_buf, d_extra3_buf, bitmap_mask, bitmap_shift1, bitmap_shift2, salt_pos, loop_pos, loop_cnt, il_cnt, digests_cnt, digests_offset, combs_mode, gid_max); } -__kernel void m04900_m16 (KERN_ATTR_BASIC ()) +KERNEL_FQ void m04900_m16 (KERN_ATTR_BASIC ()) { /** * base @@ -727,7 +727,7 @@ __kernel void m04900_m16 (KERN_ATTR_BASIC ()) m04900m (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_extra0_buf, d_extra1_buf, d_extra2_buf, d_extra3_buf, bitmap_mask, bitmap_shift1, bitmap_shift2, salt_pos, loop_pos, loop_cnt, il_cnt, digests_cnt, digests_offset, combs_mode, gid_max); } -__kernel void m04900_s04 (KERN_ATTR_BASIC ()) +KERNEL_FQ void m04900_s04 (KERN_ATTR_BASIC ()) { /** * base @@ -780,7 +780,7 @@ __kernel void m04900_s04 (KERN_ATTR_BASIC ()) m04900s (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_extra0_buf, d_extra1_buf, d_extra2_buf, d_extra3_buf, bitmap_mask, bitmap_shift1, bitmap_shift2, salt_pos, loop_pos, loop_cnt, il_cnt, digests_cnt, digests_offset, combs_mode, gid_max); } -__kernel void m04900_s08 (KERN_ATTR_BASIC ()) +KERNEL_FQ void m04900_s08 (KERN_ATTR_BASIC ()) { /** * base @@ -833,7 +833,7 @@ __kernel void m04900_s08 (KERN_ATTR_BASIC ()) m04900s (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_extra0_buf, d_extra1_buf, d_extra2_buf, d_extra3_buf, bitmap_mask, bitmap_shift1, bitmap_shift2, salt_pos, loop_pos, loop_cnt, il_cnt, digests_cnt, digests_offset, combs_mode, gid_max); } -__kernel void m04900_s16 (KERN_ATTR_BASIC ()) +KERNEL_FQ void m04900_s16 (KERN_ATTR_BASIC ()) { /** * base diff --git a/OpenCL/m04900_a3-pure.cl b/OpenCL/m04900_a3-pure.cl index ef23e9605..0ddab75c9 100644 --- a/OpenCL/m04900_a3-pure.cl +++ b/OpenCL/m04900_a3-pure.cl @@ -13,7 +13,7 @@ #include "inc_hash_sha1.cl" #endif -__kernel void m04900_mxx (KERN_ATTR_VECTOR ()) +KERNEL_FQ void m04900_mxx (KERN_ATTR_VECTOR ()) { /** * modifier @@ -85,7 +85,7 @@ __kernel void m04900_mxx (KERN_ATTR_VECTOR ()) } } -__kernel void m04900_sxx (KERN_ATTR_VECTOR ()) +KERNEL_FQ void m04900_sxx (KERN_ATTR_VECTOR ()) { /** * modifier diff --git a/OpenCL/m05100_a0-optimized.cl b/OpenCL/m05100_a0-optimized.cl index a90dbc5d8..170235ae8 100644 --- a/OpenCL/m05100_a0-optimized.cl +++ b/OpenCL/m05100_a0-optimized.cl @@ -15,7 +15,7 @@ #include "inc_hash_md5.cl" #endif -__kernel void m05100_m04 (KERN_ATTR_RULES ()) +KERNEL_FQ void m05100_m04 (KERN_ATTR_RULES ()) { /** * modifier @@ -155,15 +155,15 @@ __kernel void m05100_m04 (KERN_ATTR_RULES ()) } } -__kernel void m05100_m08 (KERN_ATTR_RULES ()) +KERNEL_FQ void m05100_m08 (KERN_ATTR_RULES ()) { } -__kernel void m05100_m16 (KERN_ATTR_RULES ()) +KERNEL_FQ void m05100_m16 (KERN_ATTR_RULES ()) { } -__kernel void m05100_s04 (KERN_ATTR_RULES ()) +KERNEL_FQ void m05100_s04 (KERN_ATTR_RULES ()) { /** * modifier @@ -315,10 +315,10 @@ __kernel void m05100_s04 (KERN_ATTR_RULES ()) } } -__kernel void m05100_s08 (KERN_ATTR_RULES ()) +KERNEL_FQ void m05100_s08 (KERN_ATTR_RULES ()) { } -__kernel void m05100_s16 (KERN_ATTR_RULES ()) +KERNEL_FQ void m05100_s16 (KERN_ATTR_RULES ()) { } diff --git a/OpenCL/m05100_a0-pure.cl b/OpenCL/m05100_a0-pure.cl index 47b4a916c..f71d763b9 100644 --- a/OpenCL/m05100_a0-pure.cl +++ b/OpenCL/m05100_a0-pure.cl @@ -15,7 +15,7 @@ #include "inc_hash_md5.cl" #endif -__kernel void m05100_mxx (KERN_ATTR_RULES ()) +KERNEL_FQ void m05100_mxx (KERN_ATTR_RULES ()) { /** * modifier @@ -63,7 +63,7 @@ __kernel void m05100_mxx (KERN_ATTR_RULES ()) } } -__kernel void m05100_sxx (KERN_ATTR_RULES ()) +KERNEL_FQ void m05100_sxx (KERN_ATTR_RULES ()) { /** * modifier diff --git a/OpenCL/m05100_a1-optimized.cl b/OpenCL/m05100_a1-optimized.cl index 2dd1a50b4..efa881b95 100644 --- a/OpenCL/m05100_a1-optimized.cl +++ b/OpenCL/m05100_a1-optimized.cl @@ -13,7 +13,7 @@ #include "inc_hash_md5.cl" #endif -__kernel void m05100_m04 (KERN_ATTR_BASIC ()) +KERNEL_FQ void m05100_m04 (KERN_ATTR_BASIC ()) { /** * modifier @@ -208,15 +208,15 @@ __kernel void m05100_m04 (KERN_ATTR_BASIC ()) } } -__kernel void m05100_m08 (KERN_ATTR_BASIC ()) +KERNEL_FQ void m05100_m08 (KERN_ATTR_BASIC ()) { } -__kernel void m05100_m16 (KERN_ATTR_BASIC ()) +KERNEL_FQ void m05100_m16 (KERN_ATTR_BASIC ()) { } -__kernel void m05100_s04 (KERN_ATTR_BASIC ()) +KERNEL_FQ void m05100_s04 (KERN_ATTR_BASIC ()) { /** * modifier @@ -423,10 +423,10 @@ __kernel void m05100_s04 (KERN_ATTR_BASIC ()) } } -__kernel void m05100_s08 (KERN_ATTR_BASIC ()) +KERNEL_FQ void m05100_s08 (KERN_ATTR_BASIC ()) { } -__kernel void m05100_s16 (KERN_ATTR_BASIC ()) +KERNEL_FQ void m05100_s16 (KERN_ATTR_BASIC ()) { } diff --git a/OpenCL/m05100_a1-pure.cl b/OpenCL/m05100_a1-pure.cl index 02f154e7e..3e8e8c153 100644 --- a/OpenCL/m05100_a1-pure.cl +++ b/OpenCL/m05100_a1-pure.cl @@ -13,7 +13,7 @@ #include "inc_hash_md5.cl" #endif -__kernel void m05100_mxx (KERN_ATTR_BASIC ()) +KERNEL_FQ void m05100_mxx (KERN_ATTR_BASIC ()) { /** * modifier @@ -59,7 +59,7 @@ __kernel void m05100_mxx (KERN_ATTR_BASIC ()) } } -__kernel void m05100_sxx (KERN_ATTR_BASIC ()) +KERNEL_FQ void m05100_sxx (KERN_ATTR_BASIC ()) { /** * modifier diff --git a/OpenCL/m05100_a3-optimized.cl b/OpenCL/m05100_a3-optimized.cl index bb9437db1..f4be1c794 100644 --- a/OpenCL/m05100_a3-optimized.cl +++ b/OpenCL/m05100_a3-optimized.cl @@ -295,7 +295,7 @@ DECLSPEC void m05100s (u32 *w0, u32 *w1, u32 *w2, u32 *w3, const u32 pw_len, KER } } -__kernel void m05100_m04 (KERN_ATTR_BASIC ()) +KERNEL_FQ void m05100_m04 (KERN_ATTR_BASIC ()) { /** * base @@ -342,7 +342,7 @@ __kernel void m05100_m04 (KERN_ATTR_BASIC ()) 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_extra0_buf, d_extra1_buf, d_extra2_buf, d_extra3_buf, bitmap_mask, bitmap_shift1, bitmap_shift2, salt_pos, loop_pos, loop_cnt, il_cnt, digests_cnt, digests_offset, combs_mode, gid_max); } -__kernel void m05100_m08 (KERN_ATTR_BASIC ()) +KERNEL_FQ void m05100_m08 (KERN_ATTR_BASIC ()) { /** * base @@ -389,7 +389,7 @@ __kernel void m05100_m08 (KERN_ATTR_BASIC ()) 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_extra0_buf, d_extra1_buf, d_extra2_buf, d_extra3_buf, bitmap_mask, bitmap_shift1, bitmap_shift2, salt_pos, loop_pos, loop_cnt, il_cnt, digests_cnt, digests_offset, combs_mode, gid_max); } -__kernel void m05100_m16 (KERN_ATTR_BASIC ()) +KERNEL_FQ void m05100_m16 (KERN_ATTR_BASIC ()) { /** * base @@ -436,7 +436,7 @@ __kernel void m05100_m16 (KERN_ATTR_BASIC ()) 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_extra0_buf, d_extra1_buf, d_extra2_buf, d_extra3_buf, bitmap_mask, bitmap_shift1, bitmap_shift2, salt_pos, loop_pos, loop_cnt, il_cnt, digests_cnt, digests_offset, combs_mode, gid_max); } -__kernel void m05100_s04 (KERN_ATTR_BASIC ()) +KERNEL_FQ void m05100_s04 (KERN_ATTR_BASIC ()) { /** * base @@ -483,7 +483,7 @@ __kernel void m05100_s04 (KERN_ATTR_BASIC ()) 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_extra0_buf, d_extra1_buf, d_extra2_buf, d_extra3_buf, bitmap_mask, bitmap_shift1, bitmap_shift2, salt_pos, loop_pos, loop_cnt, il_cnt, digests_cnt, digests_offset, combs_mode, gid_max); } -__kernel void m05100_s08 (KERN_ATTR_BASIC ()) +KERNEL_FQ void m05100_s08 (KERN_ATTR_BASIC ()) { /** * base @@ -530,7 +530,7 @@ __kernel void m05100_s08 (KERN_ATTR_BASIC ()) 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_extra0_buf, d_extra1_buf, d_extra2_buf, d_extra3_buf, bitmap_mask, bitmap_shift1, bitmap_shift2, salt_pos, loop_pos, loop_cnt, il_cnt, digests_cnt, digests_offset, combs_mode, gid_max); } -__kernel void m05100_s16 (KERN_ATTR_BASIC ()) +KERNEL_FQ void m05100_s16 (KERN_ATTR_BASIC ()) { /** * base diff --git a/OpenCL/m05100_a3-pure.cl b/OpenCL/m05100_a3-pure.cl index d383df8d8..3ba6e6712 100644 --- a/OpenCL/m05100_a3-pure.cl +++ b/OpenCL/m05100_a3-pure.cl @@ -13,7 +13,7 @@ #include "inc_hash_md5.cl" #endif -__kernel void m05100_mxx (KERN_ATTR_VECTOR ()) +KERNEL_FQ void m05100_mxx (KERN_ATTR_VECTOR ()) { /** * modifier @@ -72,7 +72,7 @@ __kernel void m05100_mxx (KERN_ATTR_VECTOR ()) } } -__kernel void m05100_sxx (KERN_ATTR_VECTOR ()) +KERNEL_FQ void m05100_sxx (KERN_ATTR_VECTOR ()) { /** * modifier diff --git a/OpenCL/m05200-pure.cl b/OpenCL/m05200-pure.cl index e7afddc84..8edf41a04 100644 --- a/OpenCL/m05200-pure.cl +++ b/OpenCL/m05200-pure.cl @@ -22,7 +22,7 @@ typedef struct pwsafe3_tmp } pwsafe3_tmp_t; -__kernel void m05200_init (KERN_ATTR_TMPS (pwsafe3_tmp_t)) +KERNEL_FQ void m05200_init (KERN_ATTR_TMPS (pwsafe3_tmp_t)) { /** * base @@ -52,7 +52,7 @@ __kernel void m05200_init (KERN_ATTR_TMPS (pwsafe3_tmp_t)) tmps[gid].digest_buf[7] = ctx.h[7]; } -__kernel void m05200_loop (KERN_ATTR_TMPS (pwsafe3_tmp_t)) +KERNEL_FQ void m05200_loop (KERN_ATTR_TMPS (pwsafe3_tmp_t)) { const u64 gid = get_global_id (0); @@ -119,7 +119,7 @@ __kernel void m05200_loop (KERN_ATTR_TMPS (pwsafe3_tmp_t)) unpackv (tmps, digest_buf, gid, 7, digest[7]); } -__kernel void m05200_comp (KERN_ATTR_TMPS (pwsafe3_tmp_t)) +KERNEL_FQ void m05200_comp (KERN_ATTR_TMPS (pwsafe3_tmp_t)) { /** * modifier diff --git a/OpenCL/m05300_a0-optimized.cl b/OpenCL/m05300_a0-optimized.cl index c4c38ede4..b61a778d3 100644 --- a/OpenCL/m05300_a0-optimized.cl +++ b/OpenCL/m05300_a0-optimized.cl @@ -110,7 +110,7 @@ DECLSPEC void hmac_md5_run (u32x *w0, u32x *w1, u32x *w2, u32x *w3, u32x *ipad, md5_transform_vector (w0, w1, w2, w3, digest); } -__kernel void m05300_m04 (KERN_ATTR_RULES_ESALT (ikepsk_t)) +KERNEL_FQ void m05300_m04 (KERN_ATTR_RULES_ESALT (ikepsk_t)) { /** * modifier @@ -124,14 +124,14 @@ __kernel void m05300_m04 (KERN_ATTR_RULES_ESALT (ikepsk_t)) * s_msg */ - __local u32 s_nr_buf[16]; + LOCAL_AS u32 s_nr_buf[16]; for (u32 i = lid; i < 16; i += lsz) { s_nr_buf[i] = esalt_bufs[digests_offset].nr_buf[i]; } - __local u32 s_msg_buf[128]; + LOCAL_AS u32 s_msg_buf[128]; for (u32 i = lid; i < 128; i += lsz) { @@ -277,15 +277,15 @@ __kernel void m05300_m04 (KERN_ATTR_RULES_ESALT (ikepsk_t)) } } -__kernel void m05300_m08 (KERN_ATTR_RULES_ESALT (ikepsk_t)) +KERNEL_FQ void m05300_m08 (KERN_ATTR_RULES_ESALT (ikepsk_t)) { } -__kernel void m05300_m16 (KERN_ATTR_RULES_ESALT (ikepsk_t)) +KERNEL_FQ void m05300_m16 (KERN_ATTR_RULES_ESALT (ikepsk_t)) { } -__kernel void m05300_s04 (KERN_ATTR_RULES_ESALT (ikepsk_t)) +KERNEL_FQ void m05300_s04 (KERN_ATTR_RULES_ESALT (ikepsk_t)) { /** * modifier @@ -299,14 +299,14 @@ __kernel void m05300_s04 (KERN_ATTR_RULES_ESALT (ikepsk_t)) * s_msg */ - __local u32 s_nr_buf[16]; + LOCAL_AS u32 s_nr_buf[16]; for (u32 i = lid; i < 16; i += lsz) { s_nr_buf[i] = esalt_bufs[digests_offset].nr_buf[i]; } - __local u32 s_msg_buf[128]; + LOCAL_AS u32 s_msg_buf[128]; for (u32 i = lid; i < 128; i += lsz) { @@ -464,10 +464,10 @@ __kernel void m05300_s04 (KERN_ATTR_RULES_ESALT (ikepsk_t)) } } -__kernel void m05300_s08 (KERN_ATTR_RULES_ESALT (ikepsk_t)) +KERNEL_FQ void m05300_s08 (KERN_ATTR_RULES_ESALT (ikepsk_t)) { } -__kernel void m05300_s16 (KERN_ATTR_RULES_ESALT (ikepsk_t)) +KERNEL_FQ void m05300_s16 (KERN_ATTR_RULES_ESALT (ikepsk_t)) { } diff --git a/OpenCL/m05300_a0-pure.cl b/OpenCL/m05300_a0-pure.cl index f91a90984..8337daff1 100644 --- a/OpenCL/m05300_a0-pure.cl +++ b/OpenCL/m05300_a0-pure.cl @@ -25,7 +25,7 @@ typedef struct ikepsk } ikepsk_t; -__kernel void m05300_mxx (KERN_ATTR_RULES_ESALT (ikepsk_t)) +KERNEL_FQ void m05300_mxx (KERN_ATTR_RULES_ESALT (ikepsk_t)) { /** * modifier @@ -99,7 +99,7 @@ __kernel void m05300_mxx (KERN_ATTR_RULES_ESALT (ikepsk_t)) } } -__kernel void m05300_sxx (KERN_ATTR_RULES_ESALT (ikepsk_t)) +KERNEL_FQ void m05300_sxx (KERN_ATTR_RULES_ESALT (ikepsk_t)) { /** * modifier diff --git a/OpenCL/m05300_a1-optimized.cl b/OpenCL/m05300_a1-optimized.cl index 4080f38de..290f60a35 100644 --- a/OpenCL/m05300_a1-optimized.cl +++ b/OpenCL/m05300_a1-optimized.cl @@ -108,7 +108,7 @@ DECLSPEC void hmac_md5_run (u32x *w0, u32x *w1, u32x *w2, u32x *w3, u32x *ipad, md5_transform_vector (w0, w1, w2, w3, digest); } -__kernel void m05300_m04 (KERN_ATTR_ESALT (ikepsk_t)) +KERNEL_FQ void m05300_m04 (KERN_ATTR_ESALT (ikepsk_t)) { /** * modifier @@ -122,14 +122,14 @@ __kernel void m05300_m04 (KERN_ATTR_ESALT (ikepsk_t)) * s_msg */ - __local u32 s_nr_buf[16]; + LOCAL_AS u32 s_nr_buf[16]; for (u32 i = lid; i < 16; i += lsz) { s_nr_buf[i] = esalt_bufs[digests_offset].nr_buf[i]; } - __local u32 s_msg_buf[128]; + LOCAL_AS u32 s_msg_buf[128]; for (u32 i = lid; i < 128; i += lsz) { @@ -335,15 +335,15 @@ __kernel void m05300_m04 (KERN_ATTR_ESALT (ikepsk_t)) } } -__kernel void m05300_m08 (KERN_ATTR_ESALT (ikepsk_t)) +KERNEL_FQ void m05300_m08 (KERN_ATTR_ESALT (ikepsk_t)) { } -__kernel void m05300_m16 (KERN_ATTR_ESALT (ikepsk_t)) +KERNEL_FQ void m05300_m16 (KERN_ATTR_ESALT (ikepsk_t)) { } -__kernel void m05300_s04 (KERN_ATTR_ESALT (ikepsk_t)) +KERNEL_FQ void m05300_s04 (KERN_ATTR_ESALT (ikepsk_t)) { /** * modifier @@ -357,14 +357,14 @@ __kernel void m05300_s04 (KERN_ATTR_ESALT (ikepsk_t)) * s_msg */ - __local u32 s_nr_buf[16]; + LOCAL_AS u32 s_nr_buf[16]; for (u32 i = lid; i < 16; i += lsz) { s_nr_buf[i] = esalt_bufs[digests_offset].nr_buf[i]; } - __local u32 s_msg_buf[128]; + LOCAL_AS u32 s_msg_buf[128]; for (u32 i = lid; i < 128; i += lsz) { @@ -582,10 +582,10 @@ __kernel void m05300_s04 (KERN_ATTR_ESALT (ikepsk_t)) } } -__kernel void m05300_s08 (KERN_ATTR_ESALT (ikepsk_t)) +KERNEL_FQ void m05300_s08 (KERN_ATTR_ESALT (ikepsk_t)) { } -__kernel void m05300_s16 (KERN_ATTR_ESALT (ikepsk_t)) +KERNEL_FQ void m05300_s16 (KERN_ATTR_ESALT (ikepsk_t)) { } diff --git a/OpenCL/m05300_a1-pure.cl b/OpenCL/m05300_a1-pure.cl index e04043729..a854741b1 100644 --- a/OpenCL/m05300_a1-pure.cl +++ b/OpenCL/m05300_a1-pure.cl @@ -23,7 +23,7 @@ typedef struct ikepsk } ikepsk_t; -__kernel void m05300_mxx (KERN_ATTR_ESALT (ikepsk_t)) +KERNEL_FQ void m05300_mxx (KERN_ATTR_ESALT (ikepsk_t)) { /** * modifier @@ -122,7 +122,7 @@ __kernel void m05300_mxx (KERN_ATTR_ESALT (ikepsk_t)) } } -__kernel void m05300_sxx (KERN_ATTR_ESALT (ikepsk_t)) +KERNEL_FQ void m05300_sxx (KERN_ATTR_ESALT (ikepsk_t)) { /** * modifier diff --git a/OpenCL/m05300_a3-optimized.cl b/OpenCL/m05300_a3-optimized.cl index 88a62ff38..c228edc09 100644 --- a/OpenCL/m05300_a3-optimized.cl +++ b/OpenCL/m05300_a3-optimized.cl @@ -108,7 +108,7 @@ DECLSPEC void hmac_md5_run (u32x *w0, u32x *w1, u32x *w2, u32x *w3, u32x *ipad, md5_transform_vector (w0, w1, w2, w3, digest); } -DECLSPEC void m05300m (u32 *w0, u32 *w1, u32 *w2, u32 *w3, const u32 pw_len, KERN_ATTR_ESALT (ikepsk_t), __local u32 *s_msg_buf, __local u32 *s_nr_buf) +DECLSPEC void m05300m (u32 *w0, u32 *w1, u32 *w2, u32 *w3, const u32 pw_len, KERN_ATTR_ESALT (ikepsk_t), LOCAL_AS u32 *s_msg_buf, LOCAL_AS u32 *s_nr_buf) { /** * modifier @@ -255,7 +255,7 @@ DECLSPEC void m05300m (u32 *w0, u32 *w1, u32 *w2, u32 *w3, const u32 pw_len, KER } } -DECLSPEC void m05300s (u32 *w0, u32 *w1, u32 *w2, u32 *w3, const u32 pw_len, KERN_ATTR_ESALT (ikepsk_t), __local u32 *s_msg_buf, __local u32 *s_nr_buf) +DECLSPEC void m05300s (u32 *w0, u32 *w1, u32 *w2, u32 *w3, const u32 pw_len, KERN_ATTR_ESALT (ikepsk_t), LOCAL_AS u32 *s_msg_buf, LOCAL_AS u32 *s_nr_buf) { /** * modifier @@ -414,7 +414,7 @@ DECLSPEC void m05300s (u32 *w0, u32 *w1, u32 *w2, u32 *w3, const u32 pw_len, KER } } -__kernel void m05300_m04 (KERN_ATTR_ESALT (ikepsk_t)) +KERNEL_FQ void m05300_m04 (KERN_ATTR_ESALT (ikepsk_t)) { /** * modifier @@ -428,14 +428,14 @@ __kernel void m05300_m04 (KERN_ATTR_ESALT (ikepsk_t)) * s_msg */ - __local u32 s_nr_buf[16]; + LOCAL_AS u32 s_nr_buf[16]; for (u32 i = lid; i < 16; i += lsz) { s_nr_buf[i] = esalt_bufs[digests_offset].nr_buf[i]; } - __local u32 s_msg_buf[128]; + LOCAL_AS u32 s_msg_buf[128]; for (u32 i = lid; i < 128; i += lsz) { @@ -487,7 +487,7 @@ __kernel void m05300_m04 (KERN_ATTR_ESALT (ikepsk_t)) m05300m (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_extra0_buf, d_extra1_buf, d_extra2_buf, d_extra3_buf, bitmap_mask, bitmap_shift1, bitmap_shift2, salt_pos, loop_pos, loop_cnt, il_cnt, digests_cnt, digests_offset, combs_mode, gid_max, s_msg_buf, s_nr_buf); } -__kernel void m05300_m08 (KERN_ATTR_ESALT (ikepsk_t)) +KERNEL_FQ void m05300_m08 (KERN_ATTR_ESALT (ikepsk_t)) { /** * modifier @@ -501,14 +501,14 @@ __kernel void m05300_m08 (KERN_ATTR_ESALT (ikepsk_t)) * s_msg */ - __local u32 s_nr_buf[16]; + LOCAL_AS u32 s_nr_buf[16]; for (u32 i = lid; i < 16; i += lsz) { s_nr_buf[i] = esalt_bufs[digests_offset].nr_buf[i]; } - __local u32 s_msg_buf[128]; + LOCAL_AS u32 s_msg_buf[128]; for (u32 i = lid; i < 128; i += lsz) { @@ -560,7 +560,7 @@ __kernel void m05300_m08 (KERN_ATTR_ESALT (ikepsk_t)) m05300m (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_extra0_buf, d_extra1_buf, d_extra2_buf, d_extra3_buf, bitmap_mask, bitmap_shift1, bitmap_shift2, salt_pos, loop_pos, loop_cnt, il_cnt, digests_cnt, digests_offset, combs_mode, gid_max, s_msg_buf, s_nr_buf); } -__kernel void m05300_m16 (KERN_ATTR_ESALT (ikepsk_t)) +KERNEL_FQ void m05300_m16 (KERN_ATTR_ESALT (ikepsk_t)) { /** * modifier @@ -574,14 +574,14 @@ __kernel void m05300_m16 (KERN_ATTR_ESALT (ikepsk_t)) * s_msg */ - __local u32 s_nr_buf[16]; + LOCAL_AS u32 s_nr_buf[16]; for (u32 i = lid; i < 16; i += lsz) { s_nr_buf[i] = esalt_bufs[digests_offset].nr_buf[i]; } - __local u32 s_msg_buf[128]; + LOCAL_AS u32 s_msg_buf[128]; for (u32 i = lid; i < 128; i += lsz) { @@ -633,7 +633,7 @@ __kernel void m05300_m16 (KERN_ATTR_ESALT (ikepsk_t)) m05300m (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_extra0_buf, d_extra1_buf, d_extra2_buf, d_extra3_buf, bitmap_mask, bitmap_shift1, bitmap_shift2, salt_pos, loop_pos, loop_cnt, il_cnt, digests_cnt, digests_offset, combs_mode, gid_max, s_msg_buf, s_nr_buf); } -__kernel void m05300_s04 (KERN_ATTR_ESALT (ikepsk_t)) +KERNEL_FQ void m05300_s04 (KERN_ATTR_ESALT (ikepsk_t)) { /** * modifier @@ -647,14 +647,14 @@ __kernel void m05300_s04 (KERN_ATTR_ESALT (ikepsk_t)) * s_msg */ - __local u32 s_nr_buf[16]; + LOCAL_AS u32 s_nr_buf[16]; for (u32 i = lid; i < 16; i += lsz) { s_nr_buf[i] = esalt_bufs[digests_offset].nr_buf[i]; } - __local u32 s_msg_buf[128]; + LOCAL_AS u32 s_msg_buf[128]; for (u32 i = lid; i < 128; i += lsz) { @@ -706,7 +706,7 @@ __kernel void m05300_s04 (KERN_ATTR_ESALT (ikepsk_t)) m05300s (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_extra0_buf, d_extra1_buf, d_extra2_buf, d_extra3_buf, bitmap_mask, bitmap_shift1, bitmap_shift2, salt_pos, loop_pos, loop_cnt, il_cnt, digests_cnt, digests_offset, combs_mode, gid_max, s_msg_buf, s_nr_buf); } -__kernel void m05300_s08 (KERN_ATTR_ESALT (ikepsk_t)) +KERNEL_FQ void m05300_s08 (KERN_ATTR_ESALT (ikepsk_t)) { /** * modifier @@ -720,14 +720,14 @@ __kernel void m05300_s08 (KERN_ATTR_ESALT (ikepsk_t)) * s_msg */ - __local u32 s_nr_buf[16]; + LOCAL_AS u32 s_nr_buf[16]; for (u32 i = lid; i < 16; i += lsz) { s_nr_buf[i] = esalt_bufs[digests_offset].nr_buf[i]; } - __local u32 s_msg_buf[128]; + LOCAL_AS u32 s_msg_buf[128]; for (u32 i = lid; i < 128; i += lsz) { @@ -779,7 +779,7 @@ __kernel void m05300_s08 (KERN_ATTR_ESALT (ikepsk_t)) m05300s (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_extra0_buf, d_extra1_buf, d_extra2_buf, d_extra3_buf, bitmap_mask, bitmap_shift1, bitmap_shift2, salt_pos, loop_pos, loop_cnt, il_cnt, digests_cnt, digests_offset, combs_mode, gid_max, s_msg_buf, s_nr_buf); } -__kernel void m05300_s16 (KERN_ATTR_ESALT (ikepsk_t)) +KERNEL_FQ void m05300_s16 (KERN_ATTR_ESALT (ikepsk_t)) { /** * modifier @@ -793,14 +793,14 @@ __kernel void m05300_s16 (KERN_ATTR_ESALT (ikepsk_t)) * s_msg */ - __local u32 s_nr_buf[16]; + LOCAL_AS u32 s_nr_buf[16]; for (u32 i = lid; i < 16; i += lsz) { s_nr_buf[i] = esalt_bufs[digests_offset].nr_buf[i]; } - __local u32 s_msg_buf[128]; + LOCAL_AS u32 s_msg_buf[128]; for (u32 i = lid; i < 128; i += lsz) { diff --git a/OpenCL/m05300_a3-pure.cl b/OpenCL/m05300_a3-pure.cl index c10efad8a..450d8b3eb 100644 --- a/OpenCL/m05300_a3-pure.cl +++ b/OpenCL/m05300_a3-pure.cl @@ -23,7 +23,7 @@ typedef struct ikepsk } ikepsk_t; -__kernel void m05300_mxx (KERN_ATTR_VECTOR_ESALT (ikepsk_t)) +KERNEL_FQ void m05300_mxx (KERN_ATTR_VECTOR_ESALT (ikepsk_t)) { /** * modifier @@ -108,7 +108,7 @@ __kernel void m05300_mxx (KERN_ATTR_VECTOR_ESALT (ikepsk_t)) } } -__kernel void m05300_sxx (KERN_ATTR_VECTOR_ESALT (ikepsk_t)) +KERNEL_FQ void m05300_sxx (KERN_ATTR_VECTOR_ESALT (ikepsk_t)) { /** * modifier diff --git a/OpenCL/m05400_a0-optimized.cl b/OpenCL/m05400_a0-optimized.cl index 684a39c3d..eadb95242 100644 --- a/OpenCL/m05400_a0-optimized.cl +++ b/OpenCL/m05400_a0-optimized.cl @@ -114,7 +114,7 @@ DECLSPEC void hmac_sha1_run (u32x *w0, u32x *w1, u32x *w2, u32x *w3, u32x *ipad, sha1_transform_vector (w0, w1, w2, w3, digest); } -__kernel void m05400_m04 (KERN_ATTR_RULES_ESALT (ikepsk_t)) +KERNEL_FQ void m05400_m04 (KERN_ATTR_RULES_ESALT (ikepsk_t)) { /** * modifier @@ -128,14 +128,14 @@ __kernel void m05400_m04 (KERN_ATTR_RULES_ESALT (ikepsk_t)) * s_msg */ - __local u32 s_nr_buf[16]; + LOCAL_AS u32 s_nr_buf[16]; for (u32 i = lid; i < 16; i += lsz) { s_nr_buf[i] = swap32_S (esalt_bufs[digests_offset].nr_buf[i]); } - __local u32 s_msg_buf[128]; + LOCAL_AS u32 s_msg_buf[128]; for (u32 i = lid; i < 128; i += lsz) { @@ -290,15 +290,15 @@ __kernel void m05400_m04 (KERN_ATTR_RULES_ESALT (ikepsk_t)) } } -__kernel void m05400_m08 (KERN_ATTR_RULES_ESALT (ikepsk_t)) +KERNEL_FQ void m05400_m08 (KERN_ATTR_RULES_ESALT (ikepsk_t)) { } -__kernel void m05400_m16 (KERN_ATTR_RULES_ESALT (ikepsk_t)) +KERNEL_FQ void m05400_m16 (KERN_ATTR_RULES_ESALT (ikepsk_t)) { } -__kernel void m05400_s04 (KERN_ATTR_RULES_ESALT (ikepsk_t)) +KERNEL_FQ void m05400_s04 (KERN_ATTR_RULES_ESALT (ikepsk_t)) { /** * modifier @@ -312,14 +312,14 @@ __kernel void m05400_s04 (KERN_ATTR_RULES_ESALT (ikepsk_t)) * s_msg */ - __local u32 s_nr_buf[16]; + LOCAL_AS u32 s_nr_buf[16]; for (u32 i = lid; i < 16; i += lsz) { s_nr_buf[i] = swap32_S (esalt_bufs[digests_offset].nr_buf[i]); } - __local u32 s_msg_buf[128]; + LOCAL_AS u32 s_msg_buf[128]; for (u32 i = lid; i < 128; i += lsz) { @@ -486,10 +486,10 @@ __kernel void m05400_s04 (KERN_ATTR_RULES_ESALT (ikepsk_t)) } } -__kernel void m05400_s08 (KERN_ATTR_RULES_ESALT (ikepsk_t)) +KERNEL_FQ void m05400_s08 (KERN_ATTR_RULES_ESALT (ikepsk_t)) { } -__kernel void m05400_s16 (KERN_ATTR_RULES_ESALT (ikepsk_t)) +KERNEL_FQ void m05400_s16 (KERN_ATTR_RULES_ESALT (ikepsk_t)) { } diff --git a/OpenCL/m05400_a0-pure.cl b/OpenCL/m05400_a0-pure.cl index 5a5f55899..de3dee4bf 100644 --- a/OpenCL/m05400_a0-pure.cl +++ b/OpenCL/m05400_a0-pure.cl @@ -25,7 +25,7 @@ typedef struct ikepsk } ikepsk_t; -__kernel void m05400_mxx (KERN_ATTR_RULES_ESALT (ikepsk_t)) +KERNEL_FQ void m05400_mxx (KERN_ATTR_RULES_ESALT (ikepsk_t)) { /** * modifier @@ -99,7 +99,7 @@ __kernel void m05400_mxx (KERN_ATTR_RULES_ESALT (ikepsk_t)) } } -__kernel void m05400_sxx (KERN_ATTR_RULES_ESALT (ikepsk_t)) +KERNEL_FQ void m05400_sxx (KERN_ATTR_RULES_ESALT (ikepsk_t)) { /** * modifier diff --git a/OpenCL/m05400_a1-optimized.cl b/OpenCL/m05400_a1-optimized.cl index b2fbea59e..1116e0a3c 100644 --- a/OpenCL/m05400_a1-optimized.cl +++ b/OpenCL/m05400_a1-optimized.cl @@ -112,7 +112,7 @@ DECLSPEC void hmac_sha1_run (u32x *w0, u32x *w1, u32x *w2, u32x *w3, u32x *ipad, sha1_transform_vector (w0, w1, w2, w3, digest); } -__kernel void m05400_m04 (KERN_ATTR_ESALT (ikepsk_t)) +KERNEL_FQ void m05400_m04 (KERN_ATTR_ESALT (ikepsk_t)) { /** * modifier @@ -126,14 +126,14 @@ __kernel void m05400_m04 (KERN_ATTR_ESALT (ikepsk_t)) * s_msg */ - __local u32 s_nr_buf[16]; + LOCAL_AS u32 s_nr_buf[16]; for (u32 i = lid; i < 16; i += lsz) { s_nr_buf[i] = swap32_S (esalt_bufs[digests_offset].nr_buf[i]); } - __local u32 s_msg_buf[128]; + LOCAL_AS u32 s_msg_buf[128]; for (u32 i = lid; i < 128; i += lsz) { @@ -356,15 +356,15 @@ __kernel void m05400_m04 (KERN_ATTR_ESALT (ikepsk_t)) } } -__kernel void m05400_m08 (KERN_ATTR_ESALT (ikepsk_t)) +KERNEL_FQ void m05400_m08 (KERN_ATTR_ESALT (ikepsk_t)) { } -__kernel void m05400_m16 (KERN_ATTR_ESALT (ikepsk_t)) +KERNEL_FQ void m05400_m16 (KERN_ATTR_ESALT (ikepsk_t)) { } -__kernel void m05400_s04 (KERN_ATTR_ESALT (ikepsk_t)) +KERNEL_FQ void m05400_s04 (KERN_ATTR_ESALT (ikepsk_t)) { /** * modifier @@ -378,14 +378,14 @@ __kernel void m05400_s04 (KERN_ATTR_ESALT (ikepsk_t)) * s_msg */ - __local u32 s_nr_buf[16]; + LOCAL_AS u32 s_nr_buf[16]; for (u32 i = lid; i < 16; i += lsz) { s_nr_buf[i] = swap32_S (esalt_bufs[digests_offset].nr_buf[i]); } - __local u32 s_msg_buf[128]; + LOCAL_AS u32 s_msg_buf[128]; for (u32 i = lid; i < 128; i += lsz) { @@ -620,10 +620,10 @@ __kernel void m05400_s04 (KERN_ATTR_ESALT (ikepsk_t)) } } -__kernel void m05400_s08 (KERN_ATTR_ESALT (ikepsk_t)) +KERNEL_FQ void m05400_s08 (KERN_ATTR_ESALT (ikepsk_t)) { } -__kernel void m05400_s16 (KERN_ATTR_ESALT (ikepsk_t)) +KERNEL_FQ void m05400_s16 (KERN_ATTR_ESALT (ikepsk_t)) { } diff --git a/OpenCL/m05400_a1-pure.cl b/OpenCL/m05400_a1-pure.cl index 0fd1e0607..9181448f2 100644 --- a/OpenCL/m05400_a1-pure.cl +++ b/OpenCL/m05400_a1-pure.cl @@ -23,7 +23,7 @@ typedef struct ikepsk } ikepsk_t; -__kernel void m05400_mxx (KERN_ATTR_ESALT (ikepsk_t)) +KERNEL_FQ void m05400_mxx (KERN_ATTR_ESALT (ikepsk_t)) { /** * modifier @@ -122,7 +122,7 @@ __kernel void m05400_mxx (KERN_ATTR_ESALT (ikepsk_t)) } } -__kernel void m05400_sxx (KERN_ATTR_ESALT (ikepsk_t)) +KERNEL_FQ void m05400_sxx (KERN_ATTR_ESALT (ikepsk_t)) { /** * modifier diff --git a/OpenCL/m05400_a3-optimized.cl b/OpenCL/m05400_a3-optimized.cl index cf1f15f3a..549e92b3f 100644 --- a/OpenCL/m05400_a3-optimized.cl +++ b/OpenCL/m05400_a3-optimized.cl @@ -112,7 +112,7 @@ DECLSPEC void hmac_sha1_run (u32x *w0, u32x *w1, u32x *w2, u32x *w3, u32x *ipad, sha1_transform_vector (w0, w1, w2, w3, digest); } -DECLSPEC void m05400m (u32 *w0, u32 *w1, u32 *w2, u32 *w3, const u32 pw_len, KERN_ATTR_ESALT (ikepsk_t), __local u32 *s_msg_buf, __local u32 *s_nr_buf) +DECLSPEC void m05400m (u32 *w0, u32 *w1, u32 *w2, u32 *w3, const u32 pw_len, KERN_ATTR_ESALT (ikepsk_t), LOCAL_AS u32 *s_msg_buf, LOCAL_AS u32 *s_nr_buf) { /** * modifier @@ -259,7 +259,7 @@ DECLSPEC void m05400m (u32 *w0, u32 *w1, u32 *w2, u32 *w3, const u32 pw_len, KER } } -DECLSPEC void m05400s (u32 *w0, u32 *w1, u32 *w2, u32 *w3, const u32 pw_len, KERN_ATTR_ESALT (ikepsk_t), __local u32 *s_msg_buf, __local u32 *s_nr_buf) +DECLSPEC void m05400s (u32 *w0, u32 *w1, u32 *w2, u32 *w3, const u32 pw_len, KERN_ATTR_ESALT (ikepsk_t), LOCAL_AS u32 *s_msg_buf, LOCAL_AS u32 *s_nr_buf) { /** * modifier @@ -418,7 +418,7 @@ DECLSPEC void m05400s (u32 *w0, u32 *w1, u32 *w2, u32 *w3, const u32 pw_len, KER } } -__kernel void m05400_m04 (KERN_ATTR_ESALT (ikepsk_t)) +KERNEL_FQ void m05400_m04 (KERN_ATTR_ESALT (ikepsk_t)) { /** * modifier @@ -432,14 +432,14 @@ __kernel void m05400_m04 (KERN_ATTR_ESALT (ikepsk_t)) * s_msg */ - __local u32 s_nr_buf[16]; + LOCAL_AS u32 s_nr_buf[16]; for (u32 i = lid; i < 16; i += lsz) { s_nr_buf[i] = swap32_S (esalt_bufs[digests_offset].nr_buf[i]); } - __local u32 s_msg_buf[128]; + LOCAL_AS u32 s_msg_buf[128]; for (u32 i = lid; i < 128; i += lsz) { @@ -491,7 +491,7 @@ __kernel void m05400_m04 (KERN_ATTR_ESALT (ikepsk_t)) m05400m (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_extra0_buf, d_extra1_buf, d_extra2_buf, d_extra3_buf, bitmap_mask, bitmap_shift1, bitmap_shift2, salt_pos, loop_pos, loop_cnt, il_cnt, digests_cnt, digests_offset, combs_mode, gid_max, s_msg_buf, s_nr_buf); } -__kernel void m05400_m08 (KERN_ATTR_ESALT (ikepsk_t)) +KERNEL_FQ void m05400_m08 (KERN_ATTR_ESALT (ikepsk_t)) { /** * modifier @@ -505,14 +505,14 @@ __kernel void m05400_m08 (KERN_ATTR_ESALT (ikepsk_t)) * s_msg */ - __local u32 s_nr_buf[16]; + LOCAL_AS u32 s_nr_buf[16]; for (u32 i = lid; i < 16; i += lsz) { s_nr_buf[i] = swap32_S (esalt_bufs[digests_offset].nr_buf[i]); } - __local u32 s_msg_buf[128]; + LOCAL_AS u32 s_msg_buf[128]; for (u32 i = lid; i < 128; i += lsz) { @@ -564,7 +564,7 @@ __kernel void m05400_m08 (KERN_ATTR_ESALT (ikepsk_t)) m05400m (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_extra0_buf, d_extra1_buf, d_extra2_buf, d_extra3_buf, bitmap_mask, bitmap_shift1, bitmap_shift2, salt_pos, loop_pos, loop_cnt, il_cnt, digests_cnt, digests_offset, combs_mode, gid_max, s_msg_buf, s_nr_buf); } -__kernel void m05400_m16 (KERN_ATTR_ESALT (ikepsk_t)) +KERNEL_FQ void m05400_m16 (KERN_ATTR_ESALT (ikepsk_t)) { /** * modifier @@ -578,14 +578,14 @@ __kernel void m05400_m16 (KERN_ATTR_ESALT (ikepsk_t)) * s_msg */ - __local u32 s_nr_buf[16]; + LOCAL_AS u32 s_nr_buf[16]; for (u32 i = lid; i < 16; i += lsz) { s_nr_buf[i] = swap32_S (esalt_bufs[digests_offset].nr_buf[i]); } - __local u32 s_msg_buf[128]; + LOCAL_AS u32 s_msg_buf[128]; for (u32 i = lid; i < 128; i += lsz) { @@ -637,7 +637,7 @@ __kernel void m05400_m16 (KERN_ATTR_ESALT (ikepsk_t)) m05400m (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_extra0_buf, d_extra1_buf, d_extra2_buf, d_extra3_buf, bitmap_mask, bitmap_shift1, bitmap_shift2, salt_pos, loop_pos, loop_cnt, il_cnt, digests_cnt, digests_offset, combs_mode, gid_max, s_msg_buf, s_nr_buf); } -__kernel void m05400_s04 (KERN_ATTR_ESALT (ikepsk_t)) +KERNEL_FQ void m05400_s04 (KERN_ATTR_ESALT (ikepsk_t)) { /** * modifier @@ -651,14 +651,14 @@ __kernel void m05400_s04 (KERN_ATTR_ESALT (ikepsk_t)) * s_msg */ - __local u32 s_nr_buf[16]; + LOCAL_AS u32 s_nr_buf[16]; for (u32 i = lid; i < 16; i += lsz) { s_nr_buf[i] = swap32_S (esalt_bufs[digests_offset].nr_buf[i]); } - __local u32 s_msg_buf[128]; + LOCAL_AS u32 s_msg_buf[128]; for (u32 i = lid; i < 128; i += lsz) { @@ -710,7 +710,7 @@ __kernel void m05400_s04 (KERN_ATTR_ESALT (ikepsk_t)) m05400s (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_extra0_buf, d_extra1_buf, d_extra2_buf, d_extra3_buf, bitmap_mask, bitmap_shift1, bitmap_shift2, salt_pos, loop_pos, loop_cnt, il_cnt, digests_cnt, digests_offset, combs_mode, gid_max, s_msg_buf, s_nr_buf); } -__kernel void m05400_s08 (KERN_ATTR_ESALT (ikepsk_t)) +KERNEL_FQ void m05400_s08 (KERN_ATTR_ESALT (ikepsk_t)) { /** * modifier @@ -724,14 +724,14 @@ __kernel void m05400_s08 (KERN_ATTR_ESALT (ikepsk_t)) * s_msg */ - __local u32 s_nr_buf[16]; + LOCAL_AS u32 s_nr_buf[16]; for (u32 i = lid; i < 16; i += lsz) { s_nr_buf[i] = swap32_S (esalt_bufs[digests_offset].nr_buf[i]); } - __local u32 s_msg_buf[128]; + LOCAL_AS u32 s_msg_buf[128]; for (u32 i = lid; i < 128; i += lsz) { @@ -783,7 +783,7 @@ __kernel void m05400_s08 (KERN_ATTR_ESALT (ikepsk_t)) m05400s (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_extra0_buf, d_extra1_buf, d_extra2_buf, d_extra3_buf, bitmap_mask, bitmap_shift1, bitmap_shift2, salt_pos, loop_pos, loop_cnt, il_cnt, digests_cnt, digests_offset, combs_mode, gid_max, s_msg_buf, s_nr_buf); } -__kernel void m05400_s16 (KERN_ATTR_ESALT (ikepsk_t)) +KERNEL_FQ void m05400_s16 (KERN_ATTR_ESALT (ikepsk_t)) { /** * modifier @@ -797,14 +797,14 @@ __kernel void m05400_s16 (KERN_ATTR_ESALT (ikepsk_t)) * s_msg */ - __local u32 s_nr_buf[16]; + LOCAL_AS u32 s_nr_buf[16]; for (u32 i = lid; i < 16; i += lsz) { s_nr_buf[i] = swap32_S (esalt_bufs[digests_offset].nr_buf[i]); } - __local u32 s_msg_buf[128]; + LOCAL_AS u32 s_msg_buf[128]; for (u32 i = lid; i < 128; i += lsz) { diff --git a/OpenCL/m05400_a3-pure.cl b/OpenCL/m05400_a3-pure.cl index c93576159..af1773d6c 100644 --- a/OpenCL/m05400_a3-pure.cl +++ b/OpenCL/m05400_a3-pure.cl @@ -23,7 +23,7 @@ typedef struct ikepsk } ikepsk_t; -__kernel void m05400_mxx (KERN_ATTR_VECTOR_ESALT (ikepsk_t)) +KERNEL_FQ void m05400_mxx (KERN_ATTR_VECTOR_ESALT (ikepsk_t)) { /** * modifier @@ -108,7 +108,7 @@ __kernel void m05400_mxx (KERN_ATTR_VECTOR_ESALT (ikepsk_t)) } } -__kernel void m05400_sxx (KERN_ATTR_VECTOR_ESALT (ikepsk_t)) +KERNEL_FQ void m05400_sxx (KERN_ATTR_VECTOR_ESALT (ikepsk_t)) { /** * modifier diff --git a/OpenCL/m05500_a0-optimized.cl b/OpenCL/m05500_a0-optimized.cl index 199e59dc3..f7e55245c 100644 --- a/OpenCL/m05500_a0-optimized.cl +++ b/OpenCL/m05500_a0-optimized.cl @@ -47,7 +47,7 @@ typedef struct netntlm a = a ^ tt; \ } -__constant u32a c_SPtrans[8][64] = +CONSTANT_AS u32a c_SPtrans[8][64] = { { 0x02080800, 0x00080000, 0x02000002, 0x02080802, @@ -195,7 +195,7 @@ __constant u32a c_SPtrans[8][64] = } }; -__constant u32a c_skb[8][64] = +CONSTANT_AS u32a c_skb[8][64] = { { 0x00000000, 0x00000010, 0x20000000, 0x20000010, @@ -355,7 +355,7 @@ __constant u32a c_skb[8][64] = #define BOX(i,n,S) (u32x) ((S)[(n)][(i).s0], (S)[(n)][(i).s1], (S)[(n)][(i).s2], (S)[(n)][(i).s3], (S)[(n)][(i).s4], (S)[(n)][(i).s5], (S)[(n)][(i).s6], (S)[(n)][(i).s7], (S)[(n)][(i).s8], (S)[(n)][(i).s9], (S)[(n)][(i).sa], (S)[(n)][(i).sb], (S)[(n)][(i).sc], (S)[(n)][(i).sd], (S)[(n)][(i).se], (S)[(n)][(i).sf]) #endif -DECLSPEC void _des_crypt_encrypt (u32x *iv, u32x *data, u32x *Kc, u32x *Kd, __local u32 (*s_SPtrans)[64]) +DECLSPEC void _des_crypt_encrypt (u32x *iv, u32x *data, u32x *Kc, u32x *Kd, LOCAL_AS u32 (*s_SPtrans)[64]) { u32x r = data[0]; u32x l = data[1]; @@ -397,7 +397,7 @@ DECLSPEC void _des_crypt_encrypt (u32x *iv, u32x *data, u32x *Kc, u32x *Kd, __lo iv[1] = r; } -DECLSPEC void _des_crypt_keysetup (u32x c, u32x d, u32x *Kc, u32x *Kd, __local u32 (*s_skb)[64]) +DECLSPEC void _des_crypt_keysetup (u32x c, u32x d, u32x *Kc, u32x *Kd, LOCAL_AS u32 (*s_skb)[64]) { u32x tt; @@ -501,7 +501,7 @@ DECLSPEC void transform_netntlmv1_key (const u32x w0, const u32x w1, u32x *out) | ((k[7] & 0xff) << 24); } -__kernel void m05500_m04 (KERN_ATTR_RULES ()) +KERNEL_FQ void m05500_m04 (KERN_ATTR_RULES ()) { /** * modifier @@ -515,8 +515,8 @@ __kernel void m05500_m04 (KERN_ATTR_RULES ()) * sbox, kbox */ - __local u32 s_SPtrans[8][64]; - __local u32 s_skb[8][64]; + LOCAL_AS u32 s_SPtrans[8][64]; + LOCAL_AS u32 s_skb[8][64]; for (u32 i = lid; i < 64; i += lsz) { @@ -706,15 +706,15 @@ __kernel void m05500_m04 (KERN_ATTR_RULES ()) } } -__kernel void m05500_m08 (KERN_ATTR_RULES ()) +KERNEL_FQ void m05500_m08 (KERN_ATTR_RULES ()) { } -__kernel void m05500_m16 (KERN_ATTR_RULES ()) +KERNEL_FQ void m05500_m16 (KERN_ATTR_RULES ()) { } -__kernel void m05500_s04 (KERN_ATTR_RULES ()) +KERNEL_FQ void m05500_s04 (KERN_ATTR_RULES ()) { /** * modifier @@ -728,8 +728,8 @@ __kernel void m05500_s04 (KERN_ATTR_RULES ()) * sbox, kbox */ - __local u32 s_SPtrans[8][64]; - __local u32 s_skb[8][64]; + LOCAL_AS u32 s_SPtrans[8][64]; + LOCAL_AS u32 s_skb[8][64]; for (u32 i = lid; i < 64; i += lsz) { @@ -933,10 +933,10 @@ __kernel void m05500_s04 (KERN_ATTR_RULES ()) } } -__kernel void m05500_s08 (KERN_ATTR_RULES ()) +KERNEL_FQ void m05500_s08 (KERN_ATTR_RULES ()) { } -__kernel void m05500_s16 (KERN_ATTR_RULES ()) +KERNEL_FQ void m05500_s16 (KERN_ATTR_RULES ()) { } diff --git a/OpenCL/m05500_a0-pure.cl b/OpenCL/m05500_a0-pure.cl index 0a6f0dfba..535fcaf8d 100644 --- a/OpenCL/m05500_a0-pure.cl +++ b/OpenCL/m05500_a0-pure.cl @@ -47,7 +47,7 @@ typedef struct netntlm a = a ^ tt; \ } -__constant u32a c_SPtrans[8][64] = +CONSTANT_AS u32a c_SPtrans[8][64] = { { 0x02080800, 0x00080000, 0x02000002, 0x02080802, @@ -195,7 +195,7 @@ __constant u32a c_SPtrans[8][64] = } }; -__constant u32a c_skb[8][64] = +CONSTANT_AS u32a c_skb[8][64] = { { 0x00000000, 0x00000010, 0x20000000, 0x20000010, @@ -355,7 +355,7 @@ __constant u32a c_skb[8][64] = #define BOX(i,n,S) (u32x) ((S)[(n)][(i).s0], (S)[(n)][(i).s1], (S)[(n)][(i).s2], (S)[(n)][(i).s3], (S)[(n)][(i).s4], (S)[(n)][(i).s5], (S)[(n)][(i).s6], (S)[(n)][(i).s7], (S)[(n)][(i).s8], (S)[(n)][(i).s9], (S)[(n)][(i).sa], (S)[(n)][(i).sb], (S)[(n)][(i).sc], (S)[(n)][(i).sd], (S)[(n)][(i).se], (S)[(n)][(i).sf]) #endif -DECLSPEC void _des_crypt_encrypt (u32 *iv, u32 *data, u32 *Kc, u32 *Kd, __local u32 (*s_SPtrans)[64]) +DECLSPEC void _des_crypt_encrypt (u32 *iv, u32 *data, u32 *Kc, u32 *Kd, LOCAL_AS u32 (*s_SPtrans)[64]) { u32 r = data[0]; u32 l = data[1]; @@ -397,7 +397,7 @@ DECLSPEC void _des_crypt_encrypt (u32 *iv, u32 *data, u32 *Kc, u32 *Kd, __local iv[1] = r; } -DECLSPEC void _des_crypt_keysetup (u32 c, u32 d, u32 *Kc, u32 *Kd, __local u32 (*s_skb)[64]) +DECLSPEC void _des_crypt_keysetup (u32 c, u32 d, u32 *Kc, u32 *Kd, LOCAL_AS u32 (*s_skb)[64]) { u32 tt; @@ -501,7 +501,7 @@ DECLSPEC void transform_netntlmv1_key (const u32 w0, const u32 w1, u32 *out) | ((k[7] & 0xff) << 24); } -__kernel void m05500_mxx (KERN_ATTR_RULES ()) +KERNEL_FQ void m05500_mxx (KERN_ATTR_RULES ()) { /** * modifier @@ -515,8 +515,8 @@ __kernel void m05500_mxx (KERN_ATTR_RULES ()) * sbox, kbox */ - __local u32 s_SPtrans[8][64]; - __local u32 s_skb[8][64]; + LOCAL_AS u32 s_SPtrans[8][64]; + LOCAL_AS u32 s_skb[8][64]; for (u32 i = lid; i < 64; i += lsz) { @@ -625,7 +625,7 @@ __kernel void m05500_mxx (KERN_ATTR_RULES ()) } } -__kernel void m05500_sxx (KERN_ATTR_RULES ()) +KERNEL_FQ void m05500_sxx (KERN_ATTR_RULES ()) { /** * modifier @@ -639,8 +639,8 @@ __kernel void m05500_sxx (KERN_ATTR_RULES ()) * sbox, kbox */ - __local u32 s_SPtrans[8][64]; - __local u32 s_skb[8][64]; + LOCAL_AS u32 s_SPtrans[8][64]; + LOCAL_AS u32 s_skb[8][64]; for (u32 i = lid; i < 64; i += lsz) { diff --git a/OpenCL/m05500_a1-optimized.cl b/OpenCL/m05500_a1-optimized.cl index 139300359..43f90bbaa 100644 --- a/OpenCL/m05500_a1-optimized.cl +++ b/OpenCL/m05500_a1-optimized.cl @@ -45,7 +45,7 @@ typedef struct netntlm a = a ^ tt; \ } -__constant u32a c_SPtrans[8][64] = +CONSTANT_AS u32a c_SPtrans[8][64] = { { 0x02080800, 0x00080000, 0x02000002, 0x02080802, @@ -193,7 +193,7 @@ __constant u32a c_SPtrans[8][64] = } }; -__constant u32a c_skb[8][64] = +CONSTANT_AS u32a c_skb[8][64] = { { 0x00000000, 0x00000010, 0x20000000, 0x20000010, @@ -353,7 +353,7 @@ __constant u32a c_skb[8][64] = #define BOX(i,n,S) (u32x) ((S)[(n)][(i).s0], (S)[(n)][(i).s1], (S)[(n)][(i).s2], (S)[(n)][(i).s3], (S)[(n)][(i).s4], (S)[(n)][(i).s5], (S)[(n)][(i).s6], (S)[(n)][(i).s7], (S)[(n)][(i).s8], (S)[(n)][(i).s9], (S)[(n)][(i).sa], (S)[(n)][(i).sb], (S)[(n)][(i).sc], (S)[(n)][(i).sd], (S)[(n)][(i).se], (S)[(n)][(i).sf]) #endif -DECLSPEC void _des_crypt_encrypt (u32x *iv, u32x *data, u32x *Kc, u32x *Kd, __local u32 (*s_SPtrans)[64]) +DECLSPEC void _des_crypt_encrypt (u32x *iv, u32x *data, u32x *Kc, u32x *Kd, LOCAL_AS u32 (*s_SPtrans)[64]) { u32x r = data[0]; u32x l = data[1]; @@ -395,7 +395,7 @@ DECLSPEC void _des_crypt_encrypt (u32x *iv, u32x *data, u32x *Kc, u32x *Kd, __lo iv[1] = r; } -DECLSPEC void _des_crypt_keysetup (u32x c, u32x d, u32x *Kc, u32x *Kd, __local u32 (*s_skb)[64]) +DECLSPEC void _des_crypt_keysetup (u32x c, u32x d, u32x *Kc, u32x *Kd, LOCAL_AS u32 (*s_skb)[64]) { u32x tt; @@ -499,7 +499,7 @@ DECLSPEC void transform_netntlmv1_key (const u32x w0, const u32x w1, u32x *out) | ((k[7] & 0xff) << 24); } -__kernel void m05500_m04 (KERN_ATTR_BASIC ()) +KERNEL_FQ void m05500_m04 (KERN_ATTR_BASIC ()) { /** * modifier @@ -513,8 +513,8 @@ __kernel void m05500_m04 (KERN_ATTR_BASIC ()) * sbox, kbox */ - __local u32 s_SPtrans[8][64]; - __local u32 s_skb[8][64]; + LOCAL_AS u32 s_SPtrans[8][64]; + LOCAL_AS u32 s_skb[8][64]; for (u32 i = lid; i < 64; i += lsz) { @@ -757,15 +757,15 @@ __kernel void m05500_m04 (KERN_ATTR_BASIC ()) } } -__kernel void m05500_m08 (KERN_ATTR_BASIC ()) +KERNEL_FQ void m05500_m08 (KERN_ATTR_BASIC ()) { } -__kernel void m05500_m16 (KERN_ATTR_BASIC ()) +KERNEL_FQ void m05500_m16 (KERN_ATTR_BASIC ()) { } -__kernel void m05500_s04 (KERN_ATTR_BASIC ()) +KERNEL_FQ void m05500_s04 (KERN_ATTR_BASIC ()) { /** * modifier @@ -779,8 +779,8 @@ __kernel void m05500_s04 (KERN_ATTR_BASIC ()) * sbox, kbox */ - __local u32 s_SPtrans[8][64]; - __local u32 s_skb[8][64]; + LOCAL_AS u32 s_SPtrans[8][64]; + LOCAL_AS u32 s_skb[8][64]; for (u32 i = lid; i < 64; i += lsz) { @@ -1042,10 +1042,10 @@ __kernel void m05500_s04 (KERN_ATTR_BASIC ()) } } -__kernel void m05500_s08 (KERN_ATTR_BASIC ()) +KERNEL_FQ void m05500_s08 (KERN_ATTR_BASIC ()) { } -__kernel void m05500_s16 (KERN_ATTR_BASIC ()) +KERNEL_FQ void m05500_s16 (KERN_ATTR_BASIC ()) { } diff --git a/OpenCL/m05500_a1-pure.cl b/OpenCL/m05500_a1-pure.cl index 86e00e3a1..115079f80 100644 --- a/OpenCL/m05500_a1-pure.cl +++ b/OpenCL/m05500_a1-pure.cl @@ -45,7 +45,7 @@ typedef struct netntlm a = a ^ tt; \ } -__constant u32a c_SPtrans[8][64] = +CONSTANT_AS u32a c_SPtrans[8][64] = { { 0x02080800, 0x00080000, 0x02000002, 0x02080802, @@ -193,7 +193,7 @@ __constant u32a c_SPtrans[8][64] = } }; -__constant u32a c_skb[8][64] = +CONSTANT_AS u32a c_skb[8][64] = { { 0x00000000, 0x00000010, 0x20000000, 0x20000010, @@ -353,7 +353,7 @@ __constant u32a c_skb[8][64] = #define BOX(i,n,S) (u32x) ((S)[(n)][(i).s0], (S)[(n)][(i).s1], (S)[(n)][(i).s2], (S)[(n)][(i).s3], (S)[(n)][(i).s4], (S)[(n)][(i).s5], (S)[(n)][(i).s6], (S)[(n)][(i).s7], (S)[(n)][(i).s8], (S)[(n)][(i).s9], (S)[(n)][(i).sa], (S)[(n)][(i).sb], (S)[(n)][(i).sc], (S)[(n)][(i).sd], (S)[(n)][(i).se], (S)[(n)][(i).sf]) #endif -DECLSPEC void _des_crypt_encrypt (u32 *iv, u32 *data, u32 *Kc, u32 *Kd, __local u32 (*s_SPtrans)[64]) +DECLSPEC void _des_crypt_encrypt (u32 *iv, u32 *data, u32 *Kc, u32 *Kd, LOCAL_AS u32 (*s_SPtrans)[64]) { u32 r = data[0]; u32 l = data[1]; @@ -395,7 +395,7 @@ DECLSPEC void _des_crypt_encrypt (u32 *iv, u32 *data, u32 *Kc, u32 *Kd, __local iv[1] = r; } -DECLSPEC void _des_crypt_keysetup (u32 c, u32 d, u32 *Kc, u32 *Kd, __local u32 (*s_skb)[64]) +DECLSPEC void _des_crypt_keysetup (u32 c, u32 d, u32 *Kc, u32 *Kd, LOCAL_AS u32 (*s_skb)[64]) { u32 tt; @@ -499,7 +499,7 @@ DECLSPEC void transform_netntlmv1_key (const u32 w0, const u32 w1, u32 *out) | ((k[7] & 0xff) << 24); } -__kernel void m05500_mxx (KERN_ATTR_BASIC ()) +KERNEL_FQ void m05500_mxx (KERN_ATTR_BASIC ()) { /** * modifier @@ -513,8 +513,8 @@ __kernel void m05500_mxx (KERN_ATTR_BASIC ()) * sbox, kbox */ - __local u32 s_SPtrans[8][64]; - __local u32 s_skb[8][64]; + LOCAL_AS u32 s_SPtrans[8][64]; + LOCAL_AS u32 s_skb[8][64]; for (u32 i = lid; i < 64; i += lsz) { @@ -621,7 +621,7 @@ __kernel void m05500_mxx (KERN_ATTR_BASIC ()) } } -__kernel void m05500_sxx (KERN_ATTR_BASIC ()) +KERNEL_FQ void m05500_sxx (KERN_ATTR_BASIC ()) { /** * modifier @@ -635,8 +635,8 @@ __kernel void m05500_sxx (KERN_ATTR_BASIC ()) * sbox, kbox */ - __local u32 s_SPtrans[8][64]; - __local u32 s_skb[8][64]; + LOCAL_AS u32 s_SPtrans[8][64]; + LOCAL_AS u32 s_skb[8][64]; for (u32 i = lid; i < 64; i += lsz) { diff --git a/OpenCL/m05500_a3-optimized.cl b/OpenCL/m05500_a3-optimized.cl index 6676806d8..f9271c891 100644 --- a/OpenCL/m05500_a3-optimized.cl +++ b/OpenCL/m05500_a3-optimized.cl @@ -45,7 +45,7 @@ typedef struct netntlm a = a ^ tt; \ } -__constant u32a c_SPtrans[8][64] = +CONSTANT_AS u32a c_SPtrans[8][64] = { { 0x02080800, 0x00080000, 0x02000002, 0x02080802, @@ -193,7 +193,7 @@ __constant u32a c_SPtrans[8][64] = } }; -__constant u32a c_skb[8][64] = +CONSTANT_AS u32a c_skb[8][64] = { { 0x00000000, 0x00000010, 0x20000000, 0x20000010, @@ -353,7 +353,7 @@ __constant u32a c_skb[8][64] = #define BOX(i,n,S) (u32x) ((S)[(n)][(i).s0], (S)[(n)][(i).s1], (S)[(n)][(i).s2], (S)[(n)][(i).s3], (S)[(n)][(i).s4], (S)[(n)][(i).s5], (S)[(n)][(i).s6], (S)[(n)][(i).s7], (S)[(n)][(i).s8], (S)[(n)][(i).s9], (S)[(n)][(i).sa], (S)[(n)][(i).sb], (S)[(n)][(i).sc], (S)[(n)][(i).sd], (S)[(n)][(i).se], (S)[(n)][(i).sf]) #endif -DECLSPEC void _des_crypt_encrypt (u32x *iv, u32x *data, u32x *Kc, u32x *Kd, __local u32 (*s_SPtrans)[64]) +DECLSPEC void _des_crypt_encrypt (u32x *iv, u32x *data, u32x *Kc, u32x *Kd, LOCAL_AS u32 (*s_SPtrans)[64]) { u32x r = data[0]; u32x l = data[1]; @@ -395,7 +395,7 @@ DECLSPEC void _des_crypt_encrypt (u32x *iv, u32x *data, u32x *Kc, u32x *Kd, __lo iv[1] = r; } -DECLSPEC void _des_crypt_keysetup (u32x c, u32x d, u32x *Kc, u32x *Kd, __local u32 (*s_skb)[64]) +DECLSPEC void _des_crypt_keysetup (u32x c, u32x d, u32x *Kc, u32x *Kd, LOCAL_AS u32 (*s_skb)[64]) { u32x tt; @@ -499,7 +499,7 @@ DECLSPEC void transform_netntlmv1_key (const u32x w0, const u32x w1, u32x *out) | ((k[7] & 0xff) << 24); } -DECLSPEC void m05500m (__local u32 (*s_SPtrans)[64], __local u32 (*s_skb)[64], u32 *w, const u32 pw_len, KERN_ATTR_VECTOR ()) +DECLSPEC void m05500m (LOCAL_AS u32 (*s_SPtrans)[64], LOCAL_AS u32 (*s_skb)[64], u32 *w, const u32 pw_len, KERN_ATTR_VECTOR ()) { /** * modifier @@ -656,7 +656,7 @@ DECLSPEC void m05500m (__local u32 (*s_SPtrans)[64], __local u32 (*s_skb)[64], u } } -DECLSPEC void m05500s (__local u32 (*s_SPtrans)[64], __local u32 (*s_skb)[64], u32 *w, const u32 pw_len, KERN_ATTR_VECTOR ()) +DECLSPEC void m05500s (LOCAL_AS u32 (*s_SPtrans)[64], LOCAL_AS u32 (*s_skb)[64], u32 *w, const u32 pw_len, KERN_ATTR_VECTOR ()) { /** * modifier @@ -832,7 +832,7 @@ DECLSPEC void m05500s (__local u32 (*s_SPtrans)[64], __local u32 (*s_skb)[64], u } } -__kernel void m05500_m04 (KERN_ATTR_VECTOR ()) +KERNEL_FQ void m05500_m04 (KERN_ATTR_VECTOR ()) { /** * modifier @@ -846,8 +846,8 @@ __kernel void m05500_m04 (KERN_ATTR_VECTOR ()) * sbox, kbox */ - __local u32 s_SPtrans[8][64]; - __local u32 s_skb[8][64]; + LOCAL_AS u32 s_SPtrans[8][64]; + LOCAL_AS u32 s_skb[8][64]; for (u32 i = lid; i < 64; i += lsz) { @@ -906,7 +906,7 @@ __kernel void m05500_m04 (KERN_ATTR_VECTOR ()) m05500m (s_SPtrans, s_skb, w, pw_len, pws, rules_buf, combs_buf, words_buf_r, 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_extra0_buf, d_extra1_buf, d_extra2_buf, d_extra3_buf, bitmap_mask, bitmap_shift1, bitmap_shift2, salt_pos, loop_pos, loop_cnt, il_cnt, digests_cnt, digests_offset, combs_mode, gid_max); } -__kernel void m05500_m08 (KERN_ATTR_VECTOR ()) +KERNEL_FQ void m05500_m08 (KERN_ATTR_VECTOR ()) { /** * modifier @@ -920,8 +920,8 @@ __kernel void m05500_m08 (KERN_ATTR_VECTOR ()) * sbox, kbox */ - __local u32 s_SPtrans[8][64]; - __local u32 s_skb[8][64]; + LOCAL_AS u32 s_SPtrans[8][64]; + LOCAL_AS u32 s_skb[8][64]; for (u32 i = lid; i < 64; i += lsz) { @@ -980,7 +980,7 @@ __kernel void m05500_m08 (KERN_ATTR_VECTOR ()) m05500m (s_SPtrans, s_skb, w, pw_len, pws, rules_buf, combs_buf, words_buf_r, 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_extra0_buf, d_extra1_buf, d_extra2_buf, d_extra3_buf, bitmap_mask, bitmap_shift1, bitmap_shift2, salt_pos, loop_pos, loop_cnt, il_cnt, digests_cnt, digests_offset, combs_mode, gid_max); } -__kernel void m05500_m16 (KERN_ATTR_VECTOR ()) +KERNEL_FQ void m05500_m16 (KERN_ATTR_VECTOR ()) { /** * modifier @@ -994,8 +994,8 @@ __kernel void m05500_m16 (KERN_ATTR_VECTOR ()) * sbox, kbox */ - __local u32 s_SPtrans[8][64]; - __local u32 s_skb[8][64]; + LOCAL_AS u32 s_SPtrans[8][64]; + LOCAL_AS u32 s_skb[8][64]; for (u32 i = lid; i < 64; i += lsz) { @@ -1054,7 +1054,7 @@ __kernel void m05500_m16 (KERN_ATTR_VECTOR ()) m05500m (s_SPtrans, s_skb, w, pw_len, pws, rules_buf, combs_buf, words_buf_r, 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_extra0_buf, d_extra1_buf, d_extra2_buf, d_extra3_buf, bitmap_mask, bitmap_shift1, bitmap_shift2, salt_pos, loop_pos, loop_cnt, il_cnt, digests_cnt, digests_offset, combs_mode, gid_max); } -__kernel void m05500_s04 (KERN_ATTR_VECTOR ()) +KERNEL_FQ void m05500_s04 (KERN_ATTR_VECTOR ()) { /** * modifier @@ -1068,8 +1068,8 @@ __kernel void m05500_s04 (KERN_ATTR_VECTOR ()) * sbox, kbox */ - __local u32 s_SPtrans[8][64]; - __local u32 s_skb[8][64]; + LOCAL_AS u32 s_SPtrans[8][64]; + LOCAL_AS u32 s_skb[8][64]; for (u32 i = lid; i < 64; i += lsz) { @@ -1128,7 +1128,7 @@ __kernel void m05500_s04 (KERN_ATTR_VECTOR ()) m05500s (s_SPtrans, s_skb, w, pw_len, pws, rules_buf, combs_buf, words_buf_r, 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_extra0_buf, d_extra1_buf, d_extra2_buf, d_extra3_buf, bitmap_mask, bitmap_shift1, bitmap_shift2, salt_pos, loop_pos, loop_cnt, il_cnt, digests_cnt, digests_offset, combs_mode, gid_max); } -__kernel void m05500_s08 (KERN_ATTR_VECTOR ()) +KERNEL_FQ void m05500_s08 (KERN_ATTR_VECTOR ()) { /** * modifier @@ -1142,8 +1142,8 @@ __kernel void m05500_s08 (KERN_ATTR_VECTOR ()) * sbox, kbox */ - __local u32 s_SPtrans[8][64]; - __local u32 s_skb[8][64]; + LOCAL_AS u32 s_SPtrans[8][64]; + LOCAL_AS u32 s_skb[8][64]; for (u32 i = lid; i < 64; i += lsz) { @@ -1202,7 +1202,7 @@ __kernel void m05500_s08 (KERN_ATTR_VECTOR ()) m05500s (s_SPtrans, s_skb, w, pw_len, pws, rules_buf, combs_buf, words_buf_r, 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_extra0_buf, d_extra1_buf, d_extra2_buf, d_extra3_buf, bitmap_mask, bitmap_shift1, bitmap_shift2, salt_pos, loop_pos, loop_cnt, il_cnt, digests_cnt, digests_offset, combs_mode, gid_max); } -__kernel void m05500_s16 (KERN_ATTR_VECTOR ()) +KERNEL_FQ void m05500_s16 (KERN_ATTR_VECTOR ()) { /** * modifier @@ -1216,8 +1216,8 @@ __kernel void m05500_s16 (KERN_ATTR_VECTOR ()) * sbox, kbox */ - __local u32 s_SPtrans[8][64]; - __local u32 s_skb[8][64]; + LOCAL_AS u32 s_SPtrans[8][64]; + LOCAL_AS u32 s_skb[8][64]; for (u32 i = lid; i < 64; i += lsz) { diff --git a/OpenCL/m05500_a3-pure.cl b/OpenCL/m05500_a3-pure.cl index 9af1148d8..093de8531 100644 --- a/OpenCL/m05500_a3-pure.cl +++ b/OpenCL/m05500_a3-pure.cl @@ -45,7 +45,7 @@ typedef struct netntlm a = a ^ tt; \ } -__constant u32a c_SPtrans[8][64] = +CONSTANT_AS u32a c_SPtrans[8][64] = { { 0x02080800, 0x00080000, 0x02000002, 0x02080802, @@ -193,7 +193,7 @@ __constant u32a c_SPtrans[8][64] = } }; -__constant u32a c_skb[8][64] = +CONSTANT_AS u32a c_skb[8][64] = { { 0x00000000, 0x00000010, 0x20000000, 0x20000010, @@ -353,7 +353,7 @@ __constant u32a c_skb[8][64] = #define BOX(i,n,S) (u32x) ((S)[(n)][(i).s0], (S)[(n)][(i).s1], (S)[(n)][(i).s2], (S)[(n)][(i).s3], (S)[(n)][(i).s4], (S)[(n)][(i).s5], (S)[(n)][(i).s6], (S)[(n)][(i).s7], (S)[(n)][(i).s8], (S)[(n)][(i).s9], (S)[(n)][(i).sa], (S)[(n)][(i).sb], (S)[(n)][(i).sc], (S)[(n)][(i).sd], (S)[(n)][(i).se], (S)[(n)][(i).sf]) #endif -DECLSPEC void _des_crypt_encrypt (u32x *iv, u32x *data, u32x *Kc, u32x *Kd, __local u32 (*s_SPtrans)[64]) +DECLSPEC void _des_crypt_encrypt (u32x *iv, u32x *data, u32x *Kc, u32x *Kd, LOCAL_AS u32 (*s_SPtrans)[64]) { u32x r = data[0]; u32x l = data[1]; @@ -395,7 +395,7 @@ DECLSPEC void _des_crypt_encrypt (u32x *iv, u32x *data, u32x *Kc, u32x *Kd, __lo iv[1] = r; } -DECLSPEC void _des_crypt_keysetup (u32x c, u32x d, u32x *Kc, u32x *Kd, __local u32 (*s_skb)[64]) +DECLSPEC void _des_crypt_keysetup (u32x c, u32x d, u32x *Kc, u32x *Kd, LOCAL_AS u32 (*s_skb)[64]) { u32x tt; @@ -499,7 +499,7 @@ DECLSPEC void transform_netntlmv1_key (const u32x w0, const u32x w1, u32x *out) | ((k[7] & 0xff) << 24); } -__kernel void m05500_mxx (KERN_ATTR_VECTOR ()) +KERNEL_FQ void m05500_mxx (KERN_ATTR_VECTOR ()) { /** * modifier @@ -513,8 +513,8 @@ __kernel void m05500_mxx (KERN_ATTR_VECTOR ()) * sbox, kbox */ - __local u32 s_SPtrans[8][64]; - __local u32 s_skb[8][64]; + LOCAL_AS u32 s_SPtrans[8][64]; + LOCAL_AS u32 s_skb[8][64]; for (u32 i = lid; i < 64; i += lsz) { @@ -634,7 +634,7 @@ __kernel void m05500_mxx (KERN_ATTR_VECTOR ()) } } -__kernel void m05500_sxx (KERN_ATTR_VECTOR ()) +KERNEL_FQ void m05500_sxx (KERN_ATTR_VECTOR ()) { /** * modifier @@ -648,8 +648,8 @@ __kernel void m05500_sxx (KERN_ATTR_VECTOR ()) * sbox, kbox */ - __local u32 s_SPtrans[8][64]; - __local u32 s_skb[8][64]; + LOCAL_AS u32 s_SPtrans[8][64]; + LOCAL_AS u32 s_skb[8][64]; for (u32 i = lid; i < 64; i += lsz) { diff --git a/OpenCL/m05600_a0-optimized.cl b/OpenCL/m05600_a0-optimized.cl index a83b8639d..d77a0c86b 100644 --- a/OpenCL/m05600_a0-optimized.cl +++ b/OpenCL/m05600_a0-optimized.cl @@ -113,7 +113,7 @@ DECLSPEC void hmac_md5_run (u32x *w0, u32x *w1, u32x *w2, u32x *w3, u32x *ipad, md5_transform_vector (w0, w1, w2, w3, digest); } -__kernel void m05600_m04 (KERN_ATTR_RULES_ESALT (netntlm_t)) +KERNEL_FQ void m05600_m04 (KERN_ATTR_RULES_ESALT (netntlm_t)) { /** * modifier @@ -127,14 +127,14 @@ __kernel void m05600_m04 (KERN_ATTR_RULES_ESALT (netntlm_t)) * salt */ - __local u32 s_userdomain_buf[64]; + LOCAL_AS u32 s_userdomain_buf[64]; for (u32 i = lid; i < 64; i += lsz) { s_userdomain_buf[i] = esalt_bufs[digests_offset].userdomain_buf[i]; } - __local u32 s_chall_buf[256]; + LOCAL_AS u32 s_chall_buf[256]; for (u32 i = lid; i < 256; i += lsz) { @@ -344,15 +344,15 @@ __kernel void m05600_m04 (KERN_ATTR_RULES_ESALT (netntlm_t)) } } -__kernel void m05600_m08 (KERN_ATTR_RULES_ESALT (netntlm_t)) +KERNEL_FQ void m05600_m08 (KERN_ATTR_RULES_ESALT (netntlm_t)) { } -__kernel void m05600_m16 (KERN_ATTR_RULES_ESALT (netntlm_t)) +KERNEL_FQ void m05600_m16 (KERN_ATTR_RULES_ESALT (netntlm_t)) { } -__kernel void m05600_s04 (KERN_ATTR_RULES_ESALT (netntlm_t)) +KERNEL_FQ void m05600_s04 (KERN_ATTR_RULES_ESALT (netntlm_t)) { /** * modifier @@ -366,14 +366,14 @@ __kernel void m05600_s04 (KERN_ATTR_RULES_ESALT (netntlm_t)) * salt */ - __local u32 s_userdomain_buf[64]; + LOCAL_AS u32 s_userdomain_buf[64]; for (u32 i = lid; i < 64; i += lsz) { s_userdomain_buf[i] = esalt_bufs[digests_offset].userdomain_buf[i]; } - __local u32 s_chall_buf[256]; + LOCAL_AS u32 s_chall_buf[256]; for (u32 i = lid; i < 256; i += lsz) { @@ -595,10 +595,10 @@ __kernel void m05600_s04 (KERN_ATTR_RULES_ESALT (netntlm_t)) } } -__kernel void m05600_s08 (KERN_ATTR_RULES_ESALT (netntlm_t)) +KERNEL_FQ void m05600_s08 (KERN_ATTR_RULES_ESALT (netntlm_t)) { } -__kernel void m05600_s16 (KERN_ATTR_RULES_ESALT (netntlm_t)) +KERNEL_FQ void m05600_s16 (KERN_ATTR_RULES_ESALT (netntlm_t)) { } diff --git a/OpenCL/m05600_a0-pure.cl b/OpenCL/m05600_a0-pure.cl index 56f9333a6..699e5e2df 100644 --- a/OpenCL/m05600_a0-pure.cl +++ b/OpenCL/m05600_a0-pure.cl @@ -28,7 +28,7 @@ typedef struct netntlm } netntlm_t; -__kernel void m05600_mxx (KERN_ATTR_RULES_ESALT (netntlm_t)) +KERNEL_FQ void m05600_mxx (KERN_ATTR_RULES_ESALT (netntlm_t)) { /** * modifier @@ -127,7 +127,7 @@ __kernel void m05600_mxx (KERN_ATTR_RULES_ESALT (netntlm_t)) } } -__kernel void m05600_sxx (KERN_ATTR_RULES_ESALT (netntlm_t)) +KERNEL_FQ void m05600_sxx (KERN_ATTR_RULES_ESALT (netntlm_t)) { /** * modifier diff --git a/OpenCL/m05600_a1-optimized.cl b/OpenCL/m05600_a1-optimized.cl index fe32f2668..16af9bf75 100644 --- a/OpenCL/m05600_a1-optimized.cl +++ b/OpenCL/m05600_a1-optimized.cl @@ -111,7 +111,7 @@ DECLSPEC void hmac_md5_run (u32x *w0, u32x *w1, u32x *w2, u32x *w3, u32x *ipad, md5_transform_vector (w0, w1, w2, w3, digest); } -__kernel void m05600_m04 (KERN_ATTR_ESALT (netntlm_t)) +KERNEL_FQ void m05600_m04 (KERN_ATTR_ESALT (netntlm_t)) { /** * modifier @@ -125,14 +125,14 @@ __kernel void m05600_m04 (KERN_ATTR_ESALT (netntlm_t)) * salt */ - __local u32 s_userdomain_buf[64]; + LOCAL_AS u32 s_userdomain_buf[64]; for (u32 i = lid; i < 64; i += lsz) { s_userdomain_buf[i] = esalt_bufs[digests_offset].userdomain_buf[i]; } - __local u32 s_chall_buf[256]; + LOCAL_AS u32 s_chall_buf[256]; for (u32 i = lid; i < 256; i += lsz) { @@ -400,15 +400,15 @@ __kernel void m05600_m04 (KERN_ATTR_ESALT (netntlm_t)) } } -__kernel void m05600_m08 (KERN_ATTR_ESALT (netntlm_t)) +KERNEL_FQ void m05600_m08 (KERN_ATTR_ESALT (netntlm_t)) { } -__kernel void m05600_m16 (KERN_ATTR_ESALT (netntlm_t)) +KERNEL_FQ void m05600_m16 (KERN_ATTR_ESALT (netntlm_t)) { } -__kernel void m05600_s04 (KERN_ATTR_ESALT (netntlm_t)) +KERNEL_FQ void m05600_s04 (KERN_ATTR_ESALT (netntlm_t)) { /** * modifier @@ -422,14 +422,14 @@ __kernel void m05600_s04 (KERN_ATTR_ESALT (netntlm_t)) * salt */ - __local u32 s_userdomain_buf[64]; + LOCAL_AS u32 s_userdomain_buf[64]; for (u32 i = lid; i < 64; i += lsz) { s_userdomain_buf[i] = esalt_bufs[digests_offset].userdomain_buf[i]; } - __local u32 s_chall_buf[256]; + LOCAL_AS u32 s_chall_buf[256]; for (u32 i = lid; i < 256; i += lsz) { @@ -709,10 +709,10 @@ __kernel void m05600_s04 (KERN_ATTR_ESALT (netntlm_t)) } } -__kernel void m05600_s08 (KERN_ATTR_ESALT (netntlm_t)) +KERNEL_FQ void m05600_s08 (KERN_ATTR_ESALT (netntlm_t)) { } -__kernel void m05600_s16 (KERN_ATTR_ESALT (netntlm_t)) +KERNEL_FQ void m05600_s16 (KERN_ATTR_ESALT (netntlm_t)) { } diff --git a/OpenCL/m05600_a1-pure.cl b/OpenCL/m05600_a1-pure.cl index 2e2d38ac4..aefa8323c 100644 --- a/OpenCL/m05600_a1-pure.cl +++ b/OpenCL/m05600_a1-pure.cl @@ -26,7 +26,7 @@ typedef struct netntlm } netntlm_t; -__kernel void m05600_mxx (KERN_ATTR_ESALT (netntlm_t)) +KERNEL_FQ void m05600_mxx (KERN_ATTR_ESALT (netntlm_t)) { /** * modifier @@ -123,7 +123,7 @@ __kernel void m05600_mxx (KERN_ATTR_ESALT (netntlm_t)) } } -__kernel void m05600_sxx (KERN_ATTR_ESALT (netntlm_t)) +KERNEL_FQ void m05600_sxx (KERN_ATTR_ESALT (netntlm_t)) { /** * modifier diff --git a/OpenCL/m05600_a3-optimized.cl b/OpenCL/m05600_a3-optimized.cl index 69948d742..ba42483e9 100644 --- a/OpenCL/m05600_a3-optimized.cl +++ b/OpenCL/m05600_a3-optimized.cl @@ -111,7 +111,7 @@ DECLSPEC void hmac_md5_run (u32x *w0, u32x *w1, u32x *w2, u32x *w3, u32x *ipad, md5_transform_vector (w0, w1, w2, w3, digest); } -DECLSPEC void m05600m (u32 *w0, u32 *w1, u32 *w2, u32 *w3, const u32 pw_len, KERN_ATTR_ESALT (netntlm_t), __local u32 *s_userdomain_buf, __local u32 *s_chall_buf) +DECLSPEC void m05600m (u32 *w0, u32 *w1, u32 *w2, u32 *w3, const u32 pw_len, KERN_ATTR_ESALT (netntlm_t), LOCAL_AS u32 *s_userdomain_buf, LOCAL_AS u32 *s_chall_buf) { /** * modifier @@ -317,7 +317,7 @@ DECLSPEC void m05600m (u32 *w0, u32 *w1, u32 *w2, u32 *w3, const u32 pw_len, KER } } -DECLSPEC void m05600s (u32 *w0, u32 *w1, u32 *w2, u32 *w3, const u32 pw_len, KERN_ATTR_ESALT (netntlm_t), __local u32 *s_userdomain_buf, __local u32 *s_chall_buf) +DECLSPEC void m05600s (u32 *w0, u32 *w1, u32 *w2, u32 *w3, const u32 pw_len, KERN_ATTR_ESALT (netntlm_t), LOCAL_AS u32 *s_userdomain_buf, LOCAL_AS u32 *s_chall_buf) { /** * modifier @@ -535,7 +535,7 @@ DECLSPEC void m05600s (u32 *w0, u32 *w1, u32 *w2, u32 *w3, const u32 pw_len, KER } } -__kernel void m05600_m04 (KERN_ATTR_ESALT (netntlm_t)) +KERNEL_FQ void m05600_m04 (KERN_ATTR_ESALT (netntlm_t)) { /** * modifier @@ -549,14 +549,14 @@ __kernel void m05600_m04 (KERN_ATTR_ESALT (netntlm_t)) * salt */ - __local u32 s_userdomain_buf[64]; + LOCAL_AS u32 s_userdomain_buf[64]; for (u32 i = lid; i < 64; i += lsz) { s_userdomain_buf[i] = esalt_bufs[digests_offset].userdomain_buf[i]; } - __local u32 s_chall_buf[256]; + LOCAL_AS u32 s_chall_buf[256]; for (u32 i = lid; i < 256; i += lsz) { @@ -608,7 +608,7 @@ __kernel void m05600_m04 (KERN_ATTR_ESALT (netntlm_t)) m05600m (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_extra0_buf, d_extra1_buf, d_extra2_buf, d_extra3_buf, bitmap_mask, bitmap_shift1, bitmap_shift2, salt_pos, loop_pos, loop_cnt, il_cnt, digests_cnt, digests_offset, combs_mode, gid_max, s_userdomain_buf, s_chall_buf); } -__kernel void m05600_m08 (KERN_ATTR_ESALT (netntlm_t)) +KERNEL_FQ void m05600_m08 (KERN_ATTR_ESALT (netntlm_t)) { /** * modifier @@ -622,14 +622,14 @@ __kernel void m05600_m08 (KERN_ATTR_ESALT (netntlm_t)) * salt */ - __local u32 s_userdomain_buf[64]; + LOCAL_AS u32 s_userdomain_buf[64]; for (u32 i = lid; i < 64; i += lsz) { s_userdomain_buf[i] = esalt_bufs[digests_offset].userdomain_buf[i]; } - __local u32 s_chall_buf[256]; + LOCAL_AS u32 s_chall_buf[256]; for (u32 i = lid; i < 256; i += lsz) { @@ -681,7 +681,7 @@ __kernel void m05600_m08 (KERN_ATTR_ESALT (netntlm_t)) m05600m (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_extra0_buf, d_extra1_buf, d_extra2_buf, d_extra3_buf, bitmap_mask, bitmap_shift1, bitmap_shift2, salt_pos, loop_pos, loop_cnt, il_cnt, digests_cnt, digests_offset, combs_mode, gid_max, s_userdomain_buf, s_chall_buf); } -__kernel void m05600_m16 (KERN_ATTR_ESALT (netntlm_t)) +KERNEL_FQ void m05600_m16 (KERN_ATTR_ESALT (netntlm_t)) { /** * modifier @@ -695,14 +695,14 @@ __kernel void m05600_m16 (KERN_ATTR_ESALT (netntlm_t)) * salt */ - __local u32 s_userdomain_buf[64]; + LOCAL_AS u32 s_userdomain_buf[64]; for (u32 i = lid; i < 64; i += lsz) { s_userdomain_buf[i] = esalt_bufs[digests_offset].userdomain_buf[i]; } - __local u32 s_chall_buf[256]; + LOCAL_AS u32 s_chall_buf[256]; for (u32 i = lid; i < 256; i += lsz) { @@ -754,7 +754,7 @@ __kernel void m05600_m16 (KERN_ATTR_ESALT (netntlm_t)) m05600m (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_extra0_buf, d_extra1_buf, d_extra2_buf, d_extra3_buf, bitmap_mask, bitmap_shift1, bitmap_shift2, salt_pos, loop_pos, loop_cnt, il_cnt, digests_cnt, digests_offset, combs_mode, gid_max, s_userdomain_buf, s_chall_buf); } -__kernel void m05600_s04 (KERN_ATTR_ESALT (netntlm_t)) +KERNEL_FQ void m05600_s04 (KERN_ATTR_ESALT (netntlm_t)) { /** * modifier @@ -768,14 +768,14 @@ __kernel void m05600_s04 (KERN_ATTR_ESALT (netntlm_t)) * salt */ - __local u32 s_userdomain_buf[64]; + LOCAL_AS u32 s_userdomain_buf[64]; for (u32 i = lid; i < 64; i += lsz) { s_userdomain_buf[i] = esalt_bufs[digests_offset].userdomain_buf[i]; } - __local u32 s_chall_buf[256]; + LOCAL_AS u32 s_chall_buf[256]; for (u32 i = lid; i < 256; i += lsz) { @@ -827,7 +827,7 @@ __kernel void m05600_s04 (KERN_ATTR_ESALT (netntlm_t)) m05600s (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_extra0_buf, d_extra1_buf, d_extra2_buf, d_extra3_buf, bitmap_mask, bitmap_shift1, bitmap_shift2, salt_pos, loop_pos, loop_cnt, il_cnt, digests_cnt, digests_offset, combs_mode, gid_max, s_userdomain_buf, s_chall_buf); } -__kernel void m05600_s08 (KERN_ATTR_ESALT (netntlm_t)) +KERNEL_FQ void m05600_s08 (KERN_ATTR_ESALT (netntlm_t)) { /** * modifier @@ -841,14 +841,14 @@ __kernel void m05600_s08 (KERN_ATTR_ESALT (netntlm_t)) * salt */ - __local u32 s_userdomain_buf[64]; + LOCAL_AS u32 s_userdomain_buf[64]; for (u32 i = lid; i < 64; i += lsz) { s_userdomain_buf[i] = esalt_bufs[digests_offset].userdomain_buf[i]; } - __local u32 s_chall_buf[256]; + LOCAL_AS u32 s_chall_buf[256]; for (u32 i = lid; i < 256; i += lsz) { @@ -900,7 +900,7 @@ __kernel void m05600_s08 (KERN_ATTR_ESALT (netntlm_t)) m05600s (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_extra0_buf, d_extra1_buf, d_extra2_buf, d_extra3_buf, bitmap_mask, bitmap_shift1, bitmap_shift2, salt_pos, loop_pos, loop_cnt, il_cnt, digests_cnt, digests_offset, combs_mode, gid_max, s_userdomain_buf, s_chall_buf); } -__kernel void m05600_s16 (KERN_ATTR_ESALT (netntlm_t)) +KERNEL_FQ void m05600_s16 (KERN_ATTR_ESALT (netntlm_t)) { /** * modifier @@ -914,14 +914,14 @@ __kernel void m05600_s16 (KERN_ATTR_ESALT (netntlm_t)) * salt */ - __local u32 s_userdomain_buf[64]; + LOCAL_AS u32 s_userdomain_buf[64]; for (u32 i = lid; i < 64; i += lsz) { s_userdomain_buf[i] = esalt_bufs[digests_offset].userdomain_buf[i]; } - __local u32 s_chall_buf[256]; + LOCAL_AS u32 s_chall_buf[256]; for (u32 i = lid; i < 256; i += lsz) { diff --git a/OpenCL/m05600_a3-pure.cl b/OpenCL/m05600_a3-pure.cl index fc65ab0e1..192430399 100644 --- a/OpenCL/m05600_a3-pure.cl +++ b/OpenCL/m05600_a3-pure.cl @@ -26,7 +26,7 @@ typedef struct netntlm } netntlm_t; -__kernel void m05600_mxx (KERN_ATTR_VECTOR_ESALT (netntlm_t)) +KERNEL_FQ void m05600_mxx (KERN_ATTR_VECTOR_ESALT (netntlm_t)) { /** * modifier @@ -136,7 +136,7 @@ __kernel void m05600_mxx (KERN_ATTR_VECTOR_ESALT (netntlm_t)) } } -__kernel void m05600_sxx (KERN_ATTR_VECTOR_ESALT (netntlm_t)) +KERNEL_FQ void m05600_sxx (KERN_ATTR_VECTOR_ESALT (netntlm_t)) { /** * modifier diff --git a/OpenCL/m05800-optimized.cl b/OpenCL/m05800-optimized.cl index 80becc1d0..1b500a93b 100644 --- a/OpenCL/m05800-optimized.cl +++ b/OpenCL/m05800-optimized.cl @@ -19,7 +19,7 @@ typedef struct androidpin_tmp } androidpin_tmp_t; -__constant u32a c_pc_dec[1024] = +CONSTANT_AS u32a c_pc_dec[1024] = { 0x00000030, 0x00000031, @@ -1047,7 +1047,7 @@ __constant u32a c_pc_dec[1024] = 0x33323031, }; -__constant u32a c_pc_len[1024] = +CONSTANT_AS u32a c_pc_len[1024] = { 1, 1, @@ -2196,7 +2196,7 @@ DECLSPEC void append_salt (u32 *w0, u32 *w1, u32 *w2, const u32 *append, const u } } -__kernel void m05800_init (KERN_ATTR_TMPS (androidpin_tmp_t)) +KERNEL_FQ void m05800_init (KERN_ATTR_TMPS (androidpin_tmp_t)) { /** * base @@ -2285,7 +2285,7 @@ __kernel void m05800_init (KERN_ATTR_TMPS (androidpin_tmp_t)) tmps[gid].digest_buf[4] = digest[4]; } -__kernel void m05800_loop (KERN_ATTR_TMPS (androidpin_tmp_t)) +KERNEL_FQ void m05800_loop (KERN_ATTR_TMPS (androidpin_tmp_t)) { /** * base @@ -2299,8 +2299,8 @@ __kernel void m05800_loop (KERN_ATTR_TMPS (androidpin_tmp_t)) * cache precomputed conversion table in shared memory */ - __local u32 s_pc_dec[1024]; - __local u32 s_pc_len[1024]; + LOCAL_AS u32 s_pc_dec[1024]; + LOCAL_AS u32 s_pc_len[1024]; for (u32 i = lid; i < 1024; i += lsz) { @@ -2404,7 +2404,7 @@ __kernel void m05800_loop (KERN_ATTR_TMPS (androidpin_tmp_t)) tmps[gid].digest_buf[4] = digest[4]; } -__kernel void m05800_comp (KERN_ATTR_TMPS (androidpin_tmp_t)) +KERNEL_FQ void m05800_comp (KERN_ATTR_TMPS (androidpin_tmp_t)) { /** * modifier diff --git a/OpenCL/m05800-pure.cl b/OpenCL/m05800-pure.cl index 4be1ae24e..48bc5c41e 100644 --- a/OpenCL/m05800-pure.cl +++ b/OpenCL/m05800-pure.cl @@ -19,7 +19,7 @@ typedef struct androidpin_tmp } androidpin_tmp_t; -__constant u32a c_pc_dec[1024] = +CONSTANT_AS u32a c_pc_dec[1024] = { 0x00000030, 0x00000031, @@ -1047,7 +1047,7 @@ __constant u32a c_pc_dec[1024] = 0x33323031, }; -__constant u32a c_pc_len[1024] = +CONSTANT_AS u32a c_pc_len[1024] = { 1, 1, @@ -2075,7 +2075,7 @@ __constant u32a c_pc_len[1024] = 4 }; -__kernel void m05800_init (KERN_ATTR_TMPS (androidpin_tmp_t)) +KERNEL_FQ void m05800_init (KERN_ATTR_TMPS (androidpin_tmp_t)) { const u64 gid = get_global_id (0); @@ -2105,7 +2105,7 @@ __kernel void m05800_init (KERN_ATTR_TMPS (androidpin_tmp_t)) tmps[gid].digest_buf[4] = ctx.h[4]; } -__kernel void m05800_loop (KERN_ATTR_TMPS (androidpin_tmp_t)) +KERNEL_FQ void m05800_loop (KERN_ATTR_TMPS (androidpin_tmp_t)) { /** * base @@ -2119,8 +2119,8 @@ __kernel void m05800_loop (KERN_ATTR_TMPS (androidpin_tmp_t)) * cache precomputed conversion table in shared memory */ - __local u32 s_pc_dec[1024]; - __local u32 s_pc_len[1024]; + LOCAL_AS u32 s_pc_dec[1024]; + LOCAL_AS u32 s_pc_len[1024]; for (u32 i = lid; i < 1024; i += lsz) { @@ -2204,7 +2204,7 @@ __kernel void m05800_loop (KERN_ATTR_TMPS (androidpin_tmp_t)) tmps[gid].digest_buf[4] = digest[4]; } -__kernel void m05800_comp (KERN_ATTR_TMPS (androidpin_tmp_t)) +KERNEL_FQ void m05800_comp (KERN_ATTR_TMPS (androidpin_tmp_t)) { /** * modifier diff --git a/OpenCL/m06000_a0-optimized.cl b/OpenCL/m06000_a0-optimized.cl index bf97dead1..6ceef4f26 100644 --- a/OpenCL/m06000_a0-optimized.cl +++ b/OpenCL/m06000_a0-optimized.cl @@ -20,7 +20,7 @@ DECLSPEC void ripemd160_transform_transport_vector (const u32x *w, u32x *dgst) ripemd160_transform_vector (w + 0, w + 4, w + 8, w + 12, dgst); } -__kernel void m06000_m04 (KERN_ATTR_RULES ()) +KERNEL_FQ void m06000_m04 (KERN_ATTR_RULES ()) { /** * modifier @@ -102,15 +102,15 @@ __kernel void m06000_m04 (KERN_ATTR_RULES ()) } } -__kernel void m06000_m08 (KERN_ATTR_RULES ()) +KERNEL_FQ void m06000_m08 (KERN_ATTR_RULES ()) { } -__kernel void m06000_m16 (KERN_ATTR_RULES ()) +KERNEL_FQ void m06000_m16 (KERN_ATTR_RULES ()) { } -__kernel void m06000_s04 (KERN_ATTR_RULES ()) +KERNEL_FQ void m06000_s04 (KERN_ATTR_RULES ()) { /** * modifier @@ -204,10 +204,10 @@ __kernel void m06000_s04 (KERN_ATTR_RULES ()) } } -__kernel void m06000_s08 (KERN_ATTR_RULES ()) +KERNEL_FQ void m06000_s08 (KERN_ATTR_RULES ()) { } -__kernel void m06000_s16 (KERN_ATTR_RULES ()) +KERNEL_FQ void m06000_s16 (KERN_ATTR_RULES ()) { } diff --git a/OpenCL/m06000_a0-pure.cl b/OpenCL/m06000_a0-pure.cl index c7d2d08e0..0573efd7d 100644 --- a/OpenCL/m06000_a0-pure.cl +++ b/OpenCL/m06000_a0-pure.cl @@ -15,7 +15,7 @@ #include "inc_hash_ripemd160.cl" #endif -__kernel void m06000_mxx (KERN_ATTR_RULES ()) +KERNEL_FQ void m06000_mxx (KERN_ATTR_RULES ()) { /** * modifier @@ -59,7 +59,7 @@ __kernel void m06000_mxx (KERN_ATTR_RULES ()) } } -__kernel void m06000_sxx (KERN_ATTR_RULES ()) +KERNEL_FQ void m06000_sxx (KERN_ATTR_RULES ()) { /** * modifier diff --git a/OpenCL/m06000_a1-optimized.cl b/OpenCL/m06000_a1-optimized.cl index 764855562..640132315 100644 --- a/OpenCL/m06000_a1-optimized.cl +++ b/OpenCL/m06000_a1-optimized.cl @@ -18,7 +18,7 @@ DECLSPEC void ripemd160_transform_transport_vector (const u32x *w, u32x *dgst) ripemd160_transform_vector (w + 0, w + 4, w + 8, w + 12, dgst); } -__kernel void m06000_m04 (KERN_ATTR_BASIC ()) +KERNEL_FQ void m06000_m04 (KERN_ATTR_BASIC ()) { /** * modifier @@ -158,15 +158,15 @@ __kernel void m06000_m04 (KERN_ATTR_BASIC ()) } } -__kernel void m06000_m08 (KERN_ATTR_BASIC ()) +KERNEL_FQ void m06000_m08 (KERN_ATTR_BASIC ()) { } -__kernel void m06000_m16 (KERN_ATTR_BASIC ()) +KERNEL_FQ void m06000_m16 (KERN_ATTR_BASIC ()) { } -__kernel void m06000_s04 (KERN_ATTR_BASIC ()) +KERNEL_FQ void m06000_s04 (KERN_ATTR_BASIC ()) { /** * modifier @@ -318,10 +318,10 @@ __kernel void m06000_s04 (KERN_ATTR_BASIC ()) } } -__kernel void m06000_s08 (KERN_ATTR_BASIC ()) +KERNEL_FQ void m06000_s08 (KERN_ATTR_BASIC ()) { } -__kernel void m06000_s16 (KERN_ATTR_BASIC ()) +KERNEL_FQ void m06000_s16 (KERN_ATTR_BASIC ()) { } diff --git a/OpenCL/m06000_a1-pure.cl b/OpenCL/m06000_a1-pure.cl index 1a79009d3..fbbea68ad 100644 --- a/OpenCL/m06000_a1-pure.cl +++ b/OpenCL/m06000_a1-pure.cl @@ -13,7 +13,7 @@ #include "inc_hash_ripemd160.cl" #endif -__kernel void m06000_mxx (KERN_ATTR_BASIC ()) +KERNEL_FQ void m06000_mxx (KERN_ATTR_BASIC ()) { /** * modifier @@ -55,7 +55,7 @@ __kernel void m06000_mxx (KERN_ATTR_BASIC ()) } } -__kernel void m06000_sxx (KERN_ATTR_BASIC ()) +KERNEL_FQ void m06000_sxx (KERN_ATTR_BASIC ()) { /** * modifier diff --git a/OpenCL/m06000_a3-optimized.cl b/OpenCL/m06000_a3-optimized.cl index be9776696..966fcf15f 100644 --- a/OpenCL/m06000_a3-optimized.cl +++ b/OpenCL/m06000_a3-optimized.cl @@ -146,7 +146,7 @@ DECLSPEC void m06000s (u32 *w0, u32 *w1, u32 *w2, u32 *w3, const u32 pw_len, KER } } -__kernel void m06000_m04 (KERN_ATTR_BASIC ()) +KERNEL_FQ void m06000_m04 (KERN_ATTR_BASIC ()) { /** * base @@ -193,7 +193,7 @@ __kernel void m06000_m04 (KERN_ATTR_BASIC ()) m06000m (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_extra0_buf, d_extra1_buf, d_extra2_buf, d_extra3_buf, bitmap_mask, bitmap_shift1, bitmap_shift2, salt_pos, loop_pos, loop_cnt, il_cnt, digests_cnt, digests_offset, combs_mode, gid_max); } -__kernel void m06000_m08 (KERN_ATTR_BASIC ()) +KERNEL_FQ void m06000_m08 (KERN_ATTR_BASIC ()) { /** * base @@ -240,7 +240,7 @@ __kernel void m06000_m08 (KERN_ATTR_BASIC ()) m06000m (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_extra0_buf, d_extra1_buf, d_extra2_buf, d_extra3_buf, bitmap_mask, bitmap_shift1, bitmap_shift2, salt_pos, loop_pos, loop_cnt, il_cnt, digests_cnt, digests_offset, combs_mode, gid_max); } -__kernel void m06000_m16 (KERN_ATTR_BASIC ()) +KERNEL_FQ void m06000_m16 (KERN_ATTR_BASIC ()) { /** * base @@ -287,7 +287,7 @@ __kernel void m06000_m16 (KERN_ATTR_BASIC ()) m06000m (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_extra0_buf, d_extra1_buf, d_extra2_buf, d_extra3_buf, bitmap_mask, bitmap_shift1, bitmap_shift2, salt_pos, loop_pos, loop_cnt, il_cnt, digests_cnt, digests_offset, combs_mode, gid_max); } -__kernel void m06000_s04 (KERN_ATTR_BASIC ()) +KERNEL_FQ void m06000_s04 (KERN_ATTR_BASIC ()) { /** * base @@ -334,7 +334,7 @@ __kernel void m06000_s04 (KERN_ATTR_BASIC ()) m06000s (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_extra0_buf, d_extra1_buf, d_extra2_buf, d_extra3_buf, bitmap_mask, bitmap_shift1, bitmap_shift2, salt_pos, loop_pos, loop_cnt, il_cnt, digests_cnt, digests_offset, combs_mode, gid_max); } -__kernel void m06000_s08 (KERN_ATTR_BASIC ()) +KERNEL_FQ void m06000_s08 (KERN_ATTR_BASIC ()) { /** * base @@ -381,7 +381,7 @@ __kernel void m06000_s08 (KERN_ATTR_BASIC ()) m06000s (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_extra0_buf, d_extra1_buf, d_extra2_buf, d_extra3_buf, bitmap_mask, bitmap_shift1, bitmap_shift2, salt_pos, loop_pos, loop_cnt, il_cnt, digests_cnt, digests_offset, combs_mode, gid_max); } -__kernel void m06000_s16 (KERN_ATTR_BASIC ()) +KERNEL_FQ void m06000_s16 (KERN_ATTR_BASIC ()) { /** * base diff --git a/OpenCL/m06000_a3-pure.cl b/OpenCL/m06000_a3-pure.cl index 22d256ab2..c30b40113 100644 --- a/OpenCL/m06000_a3-pure.cl +++ b/OpenCL/m06000_a3-pure.cl @@ -13,7 +13,7 @@ #include "inc_hash_ripemd160.cl" #endif -__kernel void m06000_mxx (KERN_ATTR_VECTOR ()) +KERNEL_FQ void m06000_mxx (KERN_ATTR_VECTOR ()) { /** * modifier @@ -68,7 +68,7 @@ __kernel void m06000_mxx (KERN_ATTR_VECTOR ()) } } -__kernel void m06000_sxx (KERN_ATTR_VECTOR ()) +KERNEL_FQ void m06000_sxx (KERN_ATTR_VECTOR ()) { /** * modifier diff --git a/OpenCL/m06100_a0-optimized.cl b/OpenCL/m06100_a0-optimized.cl index 578f177f6..fa7127daf 100644 --- a/OpenCL/m06100_a0-optimized.cl +++ b/OpenCL/m06100_a0-optimized.cl @@ -20,7 +20,7 @@ DECLSPEC void whirlpool_transform_transport_vector (const u32x *w, u32x *digest, whirlpool_transform_vector (w + 0, w + 4, w + 8, w + 12, digest, s_Ch, s_Cl); } -__kernel void m06100_m04 (KERN_ATTR_RULES ()) +KERNEL_FQ void m06100_m04 (KERN_ATTR_RULES ()) { /** * modifier @@ -36,8 +36,8 @@ __kernel void m06100_m04 (KERN_ATTR_RULES ()) #ifdef REAL_SHM - __local u32 s_Ch[8][256]; - __local u32 s_Cl[8][256]; + LOCAL_AS u32 s_Ch[8][256]; + LOCAL_AS u32 s_Cl[8][256]; for (u32 i = lid; i < 256; i += lsz) { @@ -64,8 +64,8 @@ __kernel void m06100_m04 (KERN_ATTR_RULES ()) #else - __constant u32a (*s_Ch)[256] = Ch; - __constant u32a (*s_Cl)[256] = Cl; + CONSTANT_AS u32a (*s_Ch)[256] = Ch; + CONSTANT_AS u32a (*s_Cl)[256] = Cl; #endif @@ -152,15 +152,15 @@ __kernel void m06100_m04 (KERN_ATTR_RULES ()) } } -__kernel void m06100_m08 (KERN_ATTR_RULES ()) +KERNEL_FQ void m06100_m08 (KERN_ATTR_RULES ()) { } -__kernel void m06100_m16 (KERN_ATTR_RULES ()) +KERNEL_FQ void m06100_m16 (KERN_ATTR_RULES ()) { } -__kernel void m06100_s04 (KERN_ATTR_RULES ()) +KERNEL_FQ void m06100_s04 (KERN_ATTR_RULES ()) { /** * modifier @@ -176,8 +176,8 @@ __kernel void m06100_s04 (KERN_ATTR_RULES ()) #ifdef REAL_SHM - __local u32 s_Ch[8][256]; - __local u32 s_Cl[8][256]; + LOCAL_AS u32 s_Ch[8][256]; + LOCAL_AS u32 s_Cl[8][256]; for (u32 i = lid; i < 256; i += lsz) { @@ -204,8 +204,8 @@ __kernel void m06100_s04 (KERN_ATTR_RULES ()) #else - __constant u32a (*s_Ch)[256] = Ch; - __constant u32a (*s_Cl)[256] = Cl; + CONSTANT_AS u32a (*s_Ch)[256] = Ch; + CONSTANT_AS u32a (*s_Cl)[256] = Cl; #endif @@ -304,10 +304,10 @@ __kernel void m06100_s04 (KERN_ATTR_RULES ()) } } -__kernel void m06100_s08 (KERN_ATTR_RULES ()) +KERNEL_FQ void m06100_s08 (KERN_ATTR_RULES ()) { } -__kernel void m06100_s16 (KERN_ATTR_RULES ()) +KERNEL_FQ void m06100_s16 (KERN_ATTR_RULES ()) { } diff --git a/OpenCL/m06100_a0-pure.cl b/OpenCL/m06100_a0-pure.cl index 5c0f0b7e8..deca7a8ba 100644 --- a/OpenCL/m06100_a0-pure.cl +++ b/OpenCL/m06100_a0-pure.cl @@ -15,7 +15,7 @@ #include "inc_hash_whirlpool.cl" #endif -__kernel void m06100_mxx (KERN_ATTR_RULES ()) +KERNEL_FQ void m06100_mxx (KERN_ATTR_RULES ()) { /** * modifier @@ -31,8 +31,8 @@ __kernel void m06100_mxx (KERN_ATTR_RULES ()) #ifdef REAL_SHM - __local u32 s_Ch[8][256]; - __local u32 s_Cl[8][256]; + LOCAL_AS u32 s_Ch[8][256]; + LOCAL_AS u32 s_Cl[8][256]; for (u32 i = lid; i < 256; i += lsz) { @@ -59,8 +59,8 @@ __kernel void m06100_mxx (KERN_ATTR_RULES ()) #else - __constant u32a (*s_Ch)[256] = Ch; - __constant u32a (*s_Cl)[256] = Cl; + CONSTANT_AS u32a (*s_Ch)[256] = Ch; + CONSTANT_AS u32a (*s_Cl)[256] = Cl; #endif @@ -99,7 +99,7 @@ __kernel void m06100_mxx (KERN_ATTR_RULES ()) } } -__kernel void m06100_sxx (KERN_ATTR_RULES ()) +KERNEL_FQ void m06100_sxx (KERN_ATTR_RULES ()) { /** * modifier @@ -115,8 +115,8 @@ __kernel void m06100_sxx (KERN_ATTR_RULES ()) #ifdef REAL_SHM - __local u32 s_Ch[8][256]; - __local u32 s_Cl[8][256]; + LOCAL_AS u32 s_Ch[8][256]; + LOCAL_AS u32 s_Cl[8][256]; for (u32 i = lid; i < 256; i += lsz) { @@ -143,8 +143,8 @@ __kernel void m06100_sxx (KERN_ATTR_RULES ()) #else - __constant u32a (*s_Ch)[256] = Ch; - __constant u32a (*s_Cl)[256] = Cl; + CONSTANT_AS u32a (*s_Ch)[256] = Ch; + CONSTANT_AS u32a (*s_Cl)[256] = Cl; #endif diff --git a/OpenCL/m06100_a1-optimized.cl b/OpenCL/m06100_a1-optimized.cl index ef0fb5954..4b8e709d3 100644 --- a/OpenCL/m06100_a1-optimized.cl +++ b/OpenCL/m06100_a1-optimized.cl @@ -18,7 +18,7 @@ DECLSPEC void whirlpool_transform_transport_vector (const u32x *w, u32x *digest, whirlpool_transform_vector (w + 0, w + 4, w + 8, w + 12, digest, s_Ch, s_Cl); } -__kernel void m06100_m04 (KERN_ATTR_BASIC ()) +KERNEL_FQ void m06100_m04 (KERN_ATTR_BASIC ()) { /** * modifier @@ -34,8 +34,8 @@ __kernel void m06100_m04 (KERN_ATTR_BASIC ()) #ifdef REAL_SHM - __local u32 s_Ch[8][256]; - __local u32 s_Cl[8][256]; + LOCAL_AS u32 s_Ch[8][256]; + LOCAL_AS u32 s_Cl[8][256]; for (u32 i = lid; i < 256; i += lsz) { @@ -62,8 +62,8 @@ __kernel void m06100_m04 (KERN_ATTR_BASIC ()) #else - __constant u32a (*s_Ch)[256] = Ch; - __constant u32a (*s_Cl)[256] = Cl; + CONSTANT_AS u32a (*s_Ch)[256] = Ch; + CONSTANT_AS u32a (*s_Cl)[256] = Cl; #endif @@ -208,15 +208,15 @@ __kernel void m06100_m04 (KERN_ATTR_BASIC ()) } } -__kernel void m06100_m08 (KERN_ATTR_BASIC ()) +KERNEL_FQ void m06100_m08 (KERN_ATTR_BASIC ()) { } -__kernel void m06100_m16 (KERN_ATTR_BASIC ()) +KERNEL_FQ void m06100_m16 (KERN_ATTR_BASIC ()) { } -__kernel void m06100_s04 (KERN_ATTR_BASIC ()) +KERNEL_FQ void m06100_s04 (KERN_ATTR_BASIC ()) { /** * modifier @@ -232,8 +232,8 @@ __kernel void m06100_s04 (KERN_ATTR_BASIC ()) #ifdef REAL_SHM - __local u32 s_Ch[8][256]; - __local u32 s_Cl[8][256]; + LOCAL_AS u32 s_Ch[8][256]; + LOCAL_AS u32 s_Cl[8][256]; for (u32 i = lid; i < 256; i += lsz) { @@ -260,8 +260,8 @@ __kernel void m06100_s04 (KERN_ATTR_BASIC ()) #else - __constant u32a (*s_Ch)[256] = Ch; - __constant u32a (*s_Cl)[256] = Cl; + CONSTANT_AS u32a (*s_Ch)[256] = Ch; + CONSTANT_AS u32a (*s_Cl)[256] = Cl; #endif @@ -418,10 +418,10 @@ __kernel void m06100_s04 (KERN_ATTR_BASIC ()) } } -__kernel void m06100_s08 (KERN_ATTR_BASIC ()) +KERNEL_FQ void m06100_s08 (KERN_ATTR_BASIC ()) { } -__kernel void m06100_s16 (KERN_ATTR_BASIC ()) +KERNEL_FQ void m06100_s16 (KERN_ATTR_BASIC ()) { } diff --git a/OpenCL/m06100_a1-pure.cl b/OpenCL/m06100_a1-pure.cl index d87690a2d..611927094 100644 --- a/OpenCL/m06100_a1-pure.cl +++ b/OpenCL/m06100_a1-pure.cl @@ -13,7 +13,7 @@ #include "inc_hash_whirlpool.cl" #endif -__kernel void m06100_mxx (KERN_ATTR_BASIC ()) +KERNEL_FQ void m06100_mxx (KERN_ATTR_BASIC ()) { /** * modifier @@ -29,8 +29,8 @@ __kernel void m06100_mxx (KERN_ATTR_BASIC ()) #ifdef REAL_SHM - __local u32 s_Ch[8][256]; - __local u32 s_Cl[8][256]; + LOCAL_AS u32 s_Ch[8][256]; + LOCAL_AS u32 s_Cl[8][256]; for (u32 i = lid; i < 256; i += lsz) { @@ -57,8 +57,8 @@ __kernel void m06100_mxx (KERN_ATTR_BASIC ()) #else - __constant u32a (*s_Ch)[256] = Ch; - __constant u32a (*s_Cl)[256] = Cl; + CONSTANT_AS u32a (*s_Ch)[256] = Ch; + CONSTANT_AS u32a (*s_Cl)[256] = Cl; #endif @@ -95,7 +95,7 @@ __kernel void m06100_mxx (KERN_ATTR_BASIC ()) } } -__kernel void m06100_sxx (KERN_ATTR_BASIC ()) +KERNEL_FQ void m06100_sxx (KERN_ATTR_BASIC ()) { /** * modifier @@ -111,8 +111,8 @@ __kernel void m06100_sxx (KERN_ATTR_BASIC ()) #ifdef REAL_SHM - __local u32 s_Ch[8][256]; - __local u32 s_Cl[8][256]; + LOCAL_AS u32 s_Ch[8][256]; + LOCAL_AS u32 s_Cl[8][256]; for (u32 i = lid; i < 256; i += lsz) { @@ -139,8 +139,8 @@ __kernel void m06100_sxx (KERN_ATTR_BASIC ()) #else - __constant u32a (*s_Ch)[256] = Ch; - __constant u32a (*s_Cl)[256] = Cl; + CONSTANT_AS u32a (*s_Ch)[256] = Ch; + CONSTANT_AS u32a (*s_Cl)[256] = Cl; #endif diff --git a/OpenCL/m06100_a3-optimized.cl b/OpenCL/m06100_a3-optimized.cl index 24fd15bb5..da2d8745e 100644 --- a/OpenCL/m06100_a3-optimized.cl +++ b/OpenCL/m06100_a3-optimized.cl @@ -168,7 +168,7 @@ DECLSPEC void m06100s (u32 *w0, u32 *w1, u32 *w2, u32 *w3, const u32 pw_len, KER } } -__kernel void m06100_m04 (KERN_ATTR_BASIC ()) +KERNEL_FQ void m06100_m04 (KERN_ATTR_BASIC ()) { /** * modifier @@ -184,8 +184,8 @@ __kernel void m06100_m04 (KERN_ATTR_BASIC ()) #ifdef REAL_SHM - __local u32 s_Ch[8][256]; - __local u32 s_Cl[8][256]; + LOCAL_AS u32 s_Ch[8][256]; + LOCAL_AS u32 s_Cl[8][256]; for (u32 i = lid; i < 256; i += lsz) { @@ -212,8 +212,8 @@ __kernel void m06100_m04 (KERN_ATTR_BASIC ()) #else - __constant u32a (*s_Ch)[256] = Ch; - __constant u32a (*s_Cl)[256] = Cl; + CONSTANT_AS u32a (*s_Ch)[256] = Ch; + CONSTANT_AS u32a (*s_Cl)[256] = Cl; #endif @@ -260,7 +260,7 @@ __kernel void m06100_m04 (KERN_ATTR_BASIC ()) m06100m (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_extra0_buf, d_extra1_buf, d_extra2_buf, d_extra3_buf, bitmap_mask, bitmap_shift1, bitmap_shift2, salt_pos, loop_pos, loop_cnt, il_cnt, digests_cnt, digests_offset, combs_mode, gid_max, s_Cl, s_Ch); } -__kernel void m06100_m08 (KERN_ATTR_BASIC ()) +KERNEL_FQ void m06100_m08 (KERN_ATTR_BASIC ()) { /** * modifier @@ -276,8 +276,8 @@ __kernel void m06100_m08 (KERN_ATTR_BASIC ()) #ifdef REAL_SHM - __local u32 s_Ch[8][256]; - __local u32 s_Cl[8][256]; + LOCAL_AS u32 s_Ch[8][256]; + LOCAL_AS u32 s_Cl[8][256]; for (u32 i = lid; i < 256; i += lsz) { @@ -304,8 +304,8 @@ __kernel void m06100_m08 (KERN_ATTR_BASIC ()) #else - __constant u32a (*s_Ch)[256] = Ch; - __constant u32a (*s_Cl)[256] = Cl; + CONSTANT_AS u32a (*s_Ch)[256] = Ch; + CONSTANT_AS u32a (*s_Cl)[256] = Cl; #endif @@ -352,11 +352,11 @@ __kernel void m06100_m08 (KERN_ATTR_BASIC ()) m06100m (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_extra0_buf, d_extra1_buf, d_extra2_buf, d_extra3_buf, bitmap_mask, bitmap_shift1, bitmap_shift2, salt_pos, loop_pos, loop_cnt, il_cnt, digests_cnt, digests_offset, combs_mode, gid_max, s_Cl, s_Ch); } -__kernel void m06100_m16 (KERN_ATTR_BASIC ()) +KERNEL_FQ void m06100_m16 (KERN_ATTR_BASIC ()) { } -__kernel void m06100_s04 (KERN_ATTR_BASIC ()) +KERNEL_FQ void m06100_s04 (KERN_ATTR_BASIC ()) { /** * modifier @@ -372,8 +372,8 @@ __kernel void m06100_s04 (KERN_ATTR_BASIC ()) #ifdef REAL_SHM - __local u32 s_Ch[8][256]; - __local u32 s_Cl[8][256]; + LOCAL_AS u32 s_Ch[8][256]; + LOCAL_AS u32 s_Cl[8][256]; for (u32 i = lid; i < 256; i += lsz) { @@ -400,8 +400,8 @@ __kernel void m06100_s04 (KERN_ATTR_BASIC ()) #else - __constant u32a (*s_Ch)[256] = Ch; - __constant u32a (*s_Cl)[256] = Cl; + CONSTANT_AS u32a (*s_Ch)[256] = Ch; + CONSTANT_AS u32a (*s_Cl)[256] = Cl; #endif @@ -448,7 +448,7 @@ __kernel void m06100_s04 (KERN_ATTR_BASIC ()) m06100s (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_extra0_buf, d_extra1_buf, d_extra2_buf, d_extra3_buf, bitmap_mask, bitmap_shift1, bitmap_shift2, salt_pos, loop_pos, loop_cnt, il_cnt, digests_cnt, digests_offset, combs_mode, gid_max, s_Cl, s_Ch); } -__kernel void m06100_s08 (KERN_ATTR_BASIC ()) +KERNEL_FQ void m06100_s08 (KERN_ATTR_BASIC ()) { /** * modifier @@ -464,8 +464,8 @@ __kernel void m06100_s08 (KERN_ATTR_BASIC ()) #ifdef REAL_SHM - __local u32 s_Ch[8][256]; - __local u32 s_Cl[8][256]; + LOCAL_AS u32 s_Ch[8][256]; + LOCAL_AS u32 s_Cl[8][256]; for (u32 i = lid; i < 256; i += lsz) { @@ -492,8 +492,8 @@ __kernel void m06100_s08 (KERN_ATTR_BASIC ()) #else - __constant u32a (*s_Ch)[256] = Ch; - __constant u32a (*s_Cl)[256] = Cl; + CONSTANT_AS u32a (*s_Ch)[256] = Ch; + CONSTANT_AS u32a (*s_Cl)[256] = Cl; #endif @@ -540,6 +540,6 @@ __kernel void m06100_s08 (KERN_ATTR_BASIC ()) m06100s (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_extra0_buf, d_extra1_buf, d_extra2_buf, d_extra3_buf, bitmap_mask, bitmap_shift1, bitmap_shift2, salt_pos, loop_pos, loop_cnt, il_cnt, digests_cnt, digests_offset, combs_mode, gid_max, s_Cl, s_Ch); } -__kernel void m06100_s16 (KERN_ATTR_BASIC ()) +KERNEL_FQ void m06100_s16 (KERN_ATTR_BASIC ()) { } diff --git a/OpenCL/m06100_a3-pure.cl b/OpenCL/m06100_a3-pure.cl index 4b1dab8b5..eb1ef32da 100644 --- a/OpenCL/m06100_a3-pure.cl +++ b/OpenCL/m06100_a3-pure.cl @@ -13,7 +13,7 @@ #include "inc_hash_whirlpool.cl" #endif -__kernel void m06100_mxx (KERN_ATTR_VECTOR ()) +KERNEL_FQ void m06100_mxx (KERN_ATTR_VECTOR ()) { /** * modifier @@ -29,8 +29,8 @@ __kernel void m06100_mxx (KERN_ATTR_VECTOR ()) #ifdef REAL_SHM - __local u32 s_Ch[8][256]; - __local u32 s_Cl[8][256]; + LOCAL_AS u32 s_Ch[8][256]; + LOCAL_AS u32 s_Cl[8][256]; for (u32 i = lid; i < 256; i += lsz) { @@ -57,8 +57,8 @@ __kernel void m06100_mxx (KERN_ATTR_VECTOR ()) #else - __constant u32a (*s_Ch)[256] = Ch; - __constant u32a (*s_Cl)[256] = Cl; + CONSTANT_AS u32a (*s_Ch)[256] = Ch; + CONSTANT_AS u32a (*s_Cl)[256] = Cl; #endif @@ -108,7 +108,7 @@ __kernel void m06100_mxx (KERN_ATTR_VECTOR ()) } } -__kernel void m06100_sxx (KERN_ATTR_VECTOR ()) +KERNEL_FQ void m06100_sxx (KERN_ATTR_VECTOR ()) { /** * modifier @@ -124,8 +124,8 @@ __kernel void m06100_sxx (KERN_ATTR_VECTOR ()) #ifdef REAL_SHM - __local u32 s_Ch[8][256]; - __local u32 s_Cl[8][256]; + LOCAL_AS u32 s_Ch[8][256]; + LOCAL_AS u32 s_Cl[8][256]; for (u32 i = lid; i < 256; i += lsz) { @@ -152,8 +152,8 @@ __kernel void m06100_sxx (KERN_ATTR_VECTOR ()) #else - __constant u32a (*s_Ch)[256] = Ch; - __constant u32a (*s_Cl)[256] = Cl; + CONSTANT_AS u32a (*s_Ch)[256] = Ch; + CONSTANT_AS u32a (*s_Cl)[256] = Cl; #endif diff --git a/OpenCL/m06211-pure.cl b/OpenCL/m06211-pure.cl index f73411f30..1177082c8 100644 --- a/OpenCL/m06211-pure.cl +++ b/OpenCL/m06211-pure.cl @@ -80,7 +80,7 @@ DECLSPEC void hmac_ripemd160_run_V (u32x *w0, u32x *w1, u32x *w2, u32x *w3, u32x ripemd160_transform_vector (w0, w1, w2, w3, digest); } -__kernel void m06211_init (KERN_ATTR_TMPS_ESALT (tc_tmp_t, tc_t)) +KERNEL_FQ void m06211_init (KERN_ATTR_TMPS_ESALT (tc_tmp_t, tc_t)) { const u64 gid = get_global_id (0); const u64 lid = get_local_id (0); @@ -92,7 +92,7 @@ __kernel void m06211_init (KERN_ATTR_TMPS_ESALT (tc_tmp_t, tc_t)) const int keyboard_layout_mapping_cnt = esalt_bufs[digests_offset].keyboard_layout_mapping_cnt; - __local keyboard_layout_mapping_t s_keyboard_layout_mapping_buf[256]; + LOCAL_AS keyboard_layout_mapping_t s_keyboard_layout_mapping_buf[256]; for (u32 i = lid; i < 256; i += lsz) { @@ -207,7 +207,7 @@ __kernel void m06211_init (KERN_ATTR_TMPS_ESALT (tc_tmp_t, tc_t)) } } -__kernel void m06211_loop (KERN_ATTR_TMPS_ESALT (tc_tmp_t, tc_t)) +KERNEL_FQ void m06211_loop (KERN_ATTR_TMPS_ESALT (tc_tmp_t, tc_t)) { const u64 gid = get_global_id (0); @@ -292,7 +292,7 @@ __kernel void m06211_loop (KERN_ATTR_TMPS_ESALT (tc_tmp_t, tc_t)) } } -__kernel void m06211_comp (KERN_ATTR_TMPS_ESALT (tc_tmp_t, tc_t)) +KERNEL_FQ void m06211_comp (KERN_ATTR_TMPS_ESALT (tc_tmp_t, tc_t)) { const u64 gid = get_global_id (0); const u64 lid = get_local_id (0); @@ -304,17 +304,17 @@ __kernel void m06211_comp (KERN_ATTR_TMPS_ESALT (tc_tmp_t, tc_t)) #ifdef REAL_SHM - __local u32 s_td0[256]; - __local u32 s_td1[256]; - __local u32 s_td2[256]; - __local u32 s_td3[256]; - __local u32 s_td4[256]; + LOCAL_AS u32 s_td0[256]; + LOCAL_AS u32 s_td1[256]; + LOCAL_AS u32 s_td2[256]; + LOCAL_AS u32 s_td3[256]; + LOCAL_AS u32 s_td4[256]; - __local u32 s_te0[256]; - __local u32 s_te1[256]; - __local u32 s_te2[256]; - __local u32 s_te3[256]; - __local u32 s_te4[256]; + LOCAL_AS u32 s_te0[256]; + LOCAL_AS u32 s_te1[256]; + LOCAL_AS u32 s_te2[256]; + LOCAL_AS u32 s_te3[256]; + LOCAL_AS u32 s_te4[256]; for (u32 i = lid; i < 256; i += lsz) { @@ -335,17 +335,17 @@ __kernel void m06211_comp (KERN_ATTR_TMPS_ESALT (tc_tmp_t, tc_t)) #else - __constant u32a *s_td0 = td0; - __constant u32a *s_td1 = td1; - __constant u32a *s_td2 = td2; - __constant u32a *s_td3 = td3; - __constant u32a *s_td4 = td4; + CONSTANT_AS u32a *s_td0 = td0; + CONSTANT_AS u32a *s_td1 = td1; + CONSTANT_AS u32a *s_td2 = td2; + CONSTANT_AS u32a *s_td3 = td3; + CONSTANT_AS u32a *s_td4 = td4; - __constant u32a *s_te0 = te0; - __constant u32a *s_te1 = te1; - __constant u32a *s_te2 = te2; - __constant u32a *s_te3 = te3; - __constant u32a *s_te4 = te4; + CONSTANT_AS u32a *s_te0 = te0; + CONSTANT_AS u32a *s_te1 = te1; + CONSTANT_AS u32a *s_te2 = te2; + CONSTANT_AS u32a *s_te3 = te3; + CONSTANT_AS u32a *s_te4 = te4; #endif diff --git a/OpenCL/m06212-pure.cl b/OpenCL/m06212-pure.cl index 551025185..10e54135c 100644 --- a/OpenCL/m06212-pure.cl +++ b/OpenCL/m06212-pure.cl @@ -80,7 +80,7 @@ DECLSPEC void hmac_ripemd160_run_V (u32x *w0, u32x *w1, u32x *w2, u32x *w3, u32x ripemd160_transform_vector (w0, w1, w2, w3, digest); } -__kernel void m06212_init (KERN_ATTR_TMPS_ESALT (tc_tmp_t, tc_t)) +KERNEL_FQ void m06212_init (KERN_ATTR_TMPS_ESALT (tc_tmp_t, tc_t)) { const u64 gid = get_global_id (0); const u64 lid = get_local_id (0); @@ -92,7 +92,7 @@ __kernel void m06212_init (KERN_ATTR_TMPS_ESALT (tc_tmp_t, tc_t)) const int keyboard_layout_mapping_cnt = esalt_bufs[digests_offset].keyboard_layout_mapping_cnt; - __local keyboard_layout_mapping_t s_keyboard_layout_mapping_buf[256]; + LOCAL_AS keyboard_layout_mapping_t s_keyboard_layout_mapping_buf[256]; for (u32 i = lid; i < 256; i += lsz) { @@ -207,7 +207,7 @@ __kernel void m06212_init (KERN_ATTR_TMPS_ESALT (tc_tmp_t, tc_t)) } } -__kernel void m06212_loop (KERN_ATTR_TMPS_ESALT (tc_tmp_t, tc_t)) +KERNEL_FQ void m06212_loop (KERN_ATTR_TMPS_ESALT (tc_tmp_t, tc_t)) { const u64 gid = get_global_id (0); @@ -292,7 +292,7 @@ __kernel void m06212_loop (KERN_ATTR_TMPS_ESALT (tc_tmp_t, tc_t)) } } -__kernel void m06212_comp (KERN_ATTR_TMPS_ESALT (tc_tmp_t, tc_t)) +KERNEL_FQ void m06212_comp (KERN_ATTR_TMPS_ESALT (tc_tmp_t, tc_t)) { const u64 gid = get_global_id (0); const u64 lid = get_local_id (0); @@ -304,17 +304,17 @@ __kernel void m06212_comp (KERN_ATTR_TMPS_ESALT (tc_tmp_t, tc_t)) #ifdef REAL_SHM - __local u32 s_td0[256]; - __local u32 s_td1[256]; - __local u32 s_td2[256]; - __local u32 s_td3[256]; - __local u32 s_td4[256]; + LOCAL_AS u32 s_td0[256]; + LOCAL_AS u32 s_td1[256]; + LOCAL_AS u32 s_td2[256]; + LOCAL_AS u32 s_td3[256]; + LOCAL_AS u32 s_td4[256]; - __local u32 s_te0[256]; - __local u32 s_te1[256]; - __local u32 s_te2[256]; - __local u32 s_te3[256]; - __local u32 s_te4[256]; + LOCAL_AS u32 s_te0[256]; + LOCAL_AS u32 s_te1[256]; + LOCAL_AS u32 s_te2[256]; + LOCAL_AS u32 s_te3[256]; + LOCAL_AS u32 s_te4[256]; for (u32 i = lid; i < 256; i += lsz) { @@ -335,17 +335,17 @@ __kernel void m06212_comp (KERN_ATTR_TMPS_ESALT (tc_tmp_t, tc_t)) #else - __constant u32a *s_td0 = td0; - __constant u32a *s_td1 = td1; - __constant u32a *s_td2 = td2; - __constant u32a *s_td3 = td3; - __constant u32a *s_td4 = td4; + CONSTANT_AS u32a *s_td0 = td0; + CONSTANT_AS u32a *s_td1 = td1; + CONSTANT_AS u32a *s_td2 = td2; + CONSTANT_AS u32a *s_td3 = td3; + CONSTANT_AS u32a *s_td4 = td4; - __constant u32a *s_te0 = te0; - __constant u32a *s_te1 = te1; - __constant u32a *s_te2 = te2; - __constant u32a *s_te3 = te3; - __constant u32a *s_te4 = te4; + CONSTANT_AS u32a *s_te0 = te0; + CONSTANT_AS u32a *s_te1 = te1; + CONSTANT_AS u32a *s_te2 = te2; + CONSTANT_AS u32a *s_te3 = te3; + CONSTANT_AS u32a *s_te4 = te4; #endif diff --git a/OpenCL/m06213-pure.cl b/OpenCL/m06213-pure.cl index abb61bcbf..b8c6634ad 100644 --- a/OpenCL/m06213-pure.cl +++ b/OpenCL/m06213-pure.cl @@ -80,7 +80,7 @@ DECLSPEC void hmac_ripemd160_run_V (u32x *w0, u32x *w1, u32x *w2, u32x *w3, u32x ripemd160_transform_vector (w0, w1, w2, w3, digest); } -__kernel void m06213_init (KERN_ATTR_TMPS_ESALT (tc_tmp_t, tc_t)) +KERNEL_FQ void m06213_init (KERN_ATTR_TMPS_ESALT (tc_tmp_t, tc_t)) { const u64 gid = get_global_id (0); const u64 lid = get_local_id (0); @@ -92,7 +92,7 @@ __kernel void m06213_init (KERN_ATTR_TMPS_ESALT (tc_tmp_t, tc_t)) const int keyboard_layout_mapping_cnt = esalt_bufs[digests_offset].keyboard_layout_mapping_cnt; - __local keyboard_layout_mapping_t s_keyboard_layout_mapping_buf[256]; + LOCAL_AS keyboard_layout_mapping_t s_keyboard_layout_mapping_buf[256]; for (u32 i = lid; i < 256; i += lsz) { @@ -207,7 +207,7 @@ __kernel void m06213_init (KERN_ATTR_TMPS_ESALT (tc_tmp_t, tc_t)) } } -__kernel void m06213_loop (KERN_ATTR_TMPS_ESALT (tc_tmp_t, tc_t)) +KERNEL_FQ void m06213_loop (KERN_ATTR_TMPS_ESALT (tc_tmp_t, tc_t)) { const u64 gid = get_global_id (0); @@ -292,7 +292,7 @@ __kernel void m06213_loop (KERN_ATTR_TMPS_ESALT (tc_tmp_t, tc_t)) } } -__kernel void m06213_comp (KERN_ATTR_TMPS_ESALT (tc_tmp_t, tc_t)) +KERNEL_FQ void m06213_comp (KERN_ATTR_TMPS_ESALT (tc_tmp_t, tc_t)) { const u64 gid = get_global_id (0); const u64 lid = get_local_id (0); @@ -304,17 +304,17 @@ __kernel void m06213_comp (KERN_ATTR_TMPS_ESALT (tc_tmp_t, tc_t)) #ifdef REAL_SHM - __local u32 s_td0[256]; - __local u32 s_td1[256]; - __local u32 s_td2[256]; - __local u32 s_td3[256]; - __local u32 s_td4[256]; + LOCAL_AS u32 s_td0[256]; + LOCAL_AS u32 s_td1[256]; + LOCAL_AS u32 s_td2[256]; + LOCAL_AS u32 s_td3[256]; + LOCAL_AS u32 s_td4[256]; - __local u32 s_te0[256]; - __local u32 s_te1[256]; - __local u32 s_te2[256]; - __local u32 s_te3[256]; - __local u32 s_te4[256]; + LOCAL_AS u32 s_te0[256]; + LOCAL_AS u32 s_te1[256]; + LOCAL_AS u32 s_te2[256]; + LOCAL_AS u32 s_te3[256]; + LOCAL_AS u32 s_te4[256]; for (u32 i = lid; i < 256; i += lsz) { @@ -335,17 +335,17 @@ __kernel void m06213_comp (KERN_ATTR_TMPS_ESALT (tc_tmp_t, tc_t)) #else - __constant u32a *s_td0 = td0; - __constant u32a *s_td1 = td1; - __constant u32a *s_td2 = td2; - __constant u32a *s_td3 = td3; - __constant u32a *s_td4 = td4; + CONSTANT_AS u32a *s_td0 = td0; + CONSTANT_AS u32a *s_td1 = td1; + CONSTANT_AS u32a *s_td2 = td2; + CONSTANT_AS u32a *s_td3 = td3; + CONSTANT_AS u32a *s_td4 = td4; - __constant u32a *s_te0 = te0; - __constant u32a *s_te1 = te1; - __constant u32a *s_te2 = te2; - __constant u32a *s_te3 = te3; - __constant u32a *s_te4 = te4; + CONSTANT_AS u32a *s_te0 = te0; + CONSTANT_AS u32a *s_te1 = te1; + CONSTANT_AS u32a *s_te2 = te2; + CONSTANT_AS u32a *s_te3 = te3; + CONSTANT_AS u32a *s_te4 = te4; #endif diff --git a/OpenCL/m06221-pure.cl b/OpenCL/m06221-pure.cl index 685d05c4c..7aaccbe08 100644 --- a/OpenCL/m06221-pure.cl +++ b/OpenCL/m06221-pure.cl @@ -102,7 +102,7 @@ DECLSPEC void hmac_sha512_run_V (u32x *w0, u32x *w1, u32x *w2, u32x *w3, u32x *w sha512_transform_vector (w0, w1, w2, w3, w4, w5, w6, w7, digest); } -__kernel void m06221_init (KERN_ATTR_TMPS_ESALT (tc64_tmp_t, tc_t)) +KERNEL_FQ void m06221_init (KERN_ATTR_TMPS_ESALT (tc64_tmp_t, tc_t)) { const u64 gid = get_global_id (0); const u64 lid = get_local_id (0); @@ -114,7 +114,7 @@ __kernel void m06221_init (KERN_ATTR_TMPS_ESALT (tc64_tmp_t, tc_t)) const int keyboard_layout_mapping_cnt = esalt_bufs[digests_offset].keyboard_layout_mapping_cnt; - __local keyboard_layout_mapping_t s_keyboard_layout_mapping_buf[256]; + LOCAL_AS keyboard_layout_mapping_t s_keyboard_layout_mapping_buf[256]; for (u32 i = lid; i < 256; i += lsz) { @@ -310,7 +310,7 @@ __kernel void m06221_init (KERN_ATTR_TMPS_ESALT (tc64_tmp_t, tc_t)) } } -__kernel void m06221_loop (KERN_ATTR_TMPS_ESALT (tc64_tmp_t, tc_t)) +KERNEL_FQ void m06221_loop (KERN_ATTR_TMPS_ESALT (tc64_tmp_t, tc_t)) { const u64 gid = get_global_id (0); @@ -436,7 +436,7 @@ __kernel void m06221_loop (KERN_ATTR_TMPS_ESALT (tc64_tmp_t, tc_t)) } } -__kernel void m06221_comp (KERN_ATTR_TMPS_ESALT (tc64_tmp_t, tc_t)) +KERNEL_FQ void m06221_comp (KERN_ATTR_TMPS_ESALT (tc64_tmp_t, tc_t)) { const u64 gid = get_global_id (0); const u64 lid = get_local_id (0); @@ -448,17 +448,17 @@ __kernel void m06221_comp (KERN_ATTR_TMPS_ESALT (tc64_tmp_t, tc_t)) #ifdef REAL_SHM - __local u32 s_td0[256]; - __local u32 s_td1[256]; - __local u32 s_td2[256]; - __local u32 s_td3[256]; - __local u32 s_td4[256]; + LOCAL_AS u32 s_td0[256]; + LOCAL_AS u32 s_td1[256]; + LOCAL_AS u32 s_td2[256]; + LOCAL_AS u32 s_td3[256]; + LOCAL_AS u32 s_td4[256]; - __local u32 s_te0[256]; - __local u32 s_te1[256]; - __local u32 s_te2[256]; - __local u32 s_te3[256]; - __local u32 s_te4[256]; + LOCAL_AS u32 s_te0[256]; + LOCAL_AS u32 s_te1[256]; + LOCAL_AS u32 s_te2[256]; + LOCAL_AS u32 s_te3[256]; + LOCAL_AS u32 s_te4[256]; for (u32 i = lid; i < 256; i += lsz) { @@ -479,17 +479,17 @@ __kernel void m06221_comp (KERN_ATTR_TMPS_ESALT (tc64_tmp_t, tc_t)) #else - __constant u32a *s_td0 = td0; - __constant u32a *s_td1 = td1; - __constant u32a *s_td2 = td2; - __constant u32a *s_td3 = td3; - __constant u32a *s_td4 = td4; + CONSTANT_AS u32a *s_td0 = td0; + CONSTANT_AS u32a *s_td1 = td1; + CONSTANT_AS u32a *s_td2 = td2; + CONSTANT_AS u32a *s_td3 = td3; + CONSTANT_AS u32a *s_td4 = td4; - __constant u32a *s_te0 = te0; - __constant u32a *s_te1 = te1; - __constant u32a *s_te2 = te2; - __constant u32a *s_te3 = te3; - __constant u32a *s_te4 = te4; + CONSTANT_AS u32a *s_te0 = te0; + CONSTANT_AS u32a *s_te1 = te1; + CONSTANT_AS u32a *s_te2 = te2; + CONSTANT_AS u32a *s_te3 = te3; + CONSTANT_AS u32a *s_te4 = te4; #endif diff --git a/OpenCL/m06222-pure.cl b/OpenCL/m06222-pure.cl index 9717de020..7f08bd47c 100644 --- a/OpenCL/m06222-pure.cl +++ b/OpenCL/m06222-pure.cl @@ -102,7 +102,7 @@ DECLSPEC void hmac_sha512_run_V (u32x *w0, u32x *w1, u32x *w2, u32x *w3, u32x *w sha512_transform_vector (w0, w1, w2, w3, w4, w5, w6, w7, digest); } -__kernel void m06222_init (KERN_ATTR_TMPS_ESALT (tc64_tmp_t, tc_t)) +KERNEL_FQ void m06222_init (KERN_ATTR_TMPS_ESALT (tc64_tmp_t, tc_t)) { const u64 gid = get_global_id (0); const u64 lid = get_local_id (0); @@ -114,7 +114,7 @@ __kernel void m06222_init (KERN_ATTR_TMPS_ESALT (tc64_tmp_t, tc_t)) const int keyboard_layout_mapping_cnt = esalt_bufs[digests_offset].keyboard_layout_mapping_cnt; - __local keyboard_layout_mapping_t s_keyboard_layout_mapping_buf[256]; + LOCAL_AS keyboard_layout_mapping_t s_keyboard_layout_mapping_buf[256]; for (u32 i = lid; i < 256; i += lsz) { @@ -310,7 +310,7 @@ __kernel void m06222_init (KERN_ATTR_TMPS_ESALT (tc64_tmp_t, tc_t)) } } -__kernel void m06222_loop (KERN_ATTR_TMPS_ESALT (tc64_tmp_t, tc_t)) +KERNEL_FQ void m06222_loop (KERN_ATTR_TMPS_ESALT (tc64_tmp_t, tc_t)) { const u64 gid = get_global_id (0); @@ -436,7 +436,7 @@ __kernel void m06222_loop (KERN_ATTR_TMPS_ESALT (tc64_tmp_t, tc_t)) } } -__kernel void m06222_comp (KERN_ATTR_TMPS_ESALT (tc64_tmp_t, tc_t)) +KERNEL_FQ void m06222_comp (KERN_ATTR_TMPS_ESALT (tc64_tmp_t, tc_t)) { const u64 gid = get_global_id (0); const u64 lid = get_local_id (0); @@ -448,17 +448,17 @@ __kernel void m06222_comp (KERN_ATTR_TMPS_ESALT (tc64_tmp_t, tc_t)) #ifdef REAL_SHM - __local u32 s_td0[256]; - __local u32 s_td1[256]; - __local u32 s_td2[256]; - __local u32 s_td3[256]; - __local u32 s_td4[256]; + LOCAL_AS u32 s_td0[256]; + LOCAL_AS u32 s_td1[256]; + LOCAL_AS u32 s_td2[256]; + LOCAL_AS u32 s_td3[256]; + LOCAL_AS u32 s_td4[256]; - __local u32 s_te0[256]; - __local u32 s_te1[256]; - __local u32 s_te2[256]; - __local u32 s_te3[256]; - __local u32 s_te4[256]; + LOCAL_AS u32 s_te0[256]; + LOCAL_AS u32 s_te1[256]; + LOCAL_AS u32 s_te2[256]; + LOCAL_AS u32 s_te3[256]; + LOCAL_AS u32 s_te4[256]; for (u32 i = lid; i < 256; i += lsz) { @@ -479,17 +479,17 @@ __kernel void m06222_comp (KERN_ATTR_TMPS_ESALT (tc64_tmp_t, tc_t)) #else - __constant u32a *s_td0 = td0; - __constant u32a *s_td1 = td1; - __constant u32a *s_td2 = td2; - __constant u32a *s_td3 = td3; - __constant u32a *s_td4 = td4; + CONSTANT_AS u32a *s_td0 = td0; + CONSTANT_AS u32a *s_td1 = td1; + CONSTANT_AS u32a *s_td2 = td2; + CONSTANT_AS u32a *s_td3 = td3; + CONSTANT_AS u32a *s_td4 = td4; - __constant u32a *s_te0 = te0; - __constant u32a *s_te1 = te1; - __constant u32a *s_te2 = te2; - __constant u32a *s_te3 = te3; - __constant u32a *s_te4 = te4; + CONSTANT_AS u32a *s_te0 = te0; + CONSTANT_AS u32a *s_te1 = te1; + CONSTANT_AS u32a *s_te2 = te2; + CONSTANT_AS u32a *s_te3 = te3; + CONSTANT_AS u32a *s_te4 = te4; #endif diff --git a/OpenCL/m06223-pure.cl b/OpenCL/m06223-pure.cl index 89e7cbb8c..df676bb80 100644 --- a/OpenCL/m06223-pure.cl +++ b/OpenCL/m06223-pure.cl @@ -102,7 +102,7 @@ DECLSPEC void hmac_sha512_run_V (u32x *w0, u32x *w1, u32x *w2, u32x *w3, u32x *w sha512_transform_vector (w0, w1, w2, w3, w4, w5, w6, w7, digest); } -__kernel void m06223_init (KERN_ATTR_TMPS_ESALT (tc64_tmp_t, tc_t)) +KERNEL_FQ void m06223_init (KERN_ATTR_TMPS_ESALT (tc64_tmp_t, tc_t)) { const u64 gid = get_global_id (0); const u64 lid = get_local_id (0); @@ -114,7 +114,7 @@ __kernel void m06223_init (KERN_ATTR_TMPS_ESALT (tc64_tmp_t, tc_t)) const int keyboard_layout_mapping_cnt = esalt_bufs[digests_offset].keyboard_layout_mapping_cnt; - __local keyboard_layout_mapping_t s_keyboard_layout_mapping_buf[256]; + LOCAL_AS keyboard_layout_mapping_t s_keyboard_layout_mapping_buf[256]; for (u32 i = lid; i < 256; i += lsz) { @@ -310,7 +310,7 @@ __kernel void m06223_init (KERN_ATTR_TMPS_ESALT (tc64_tmp_t, tc_t)) } } -__kernel void m06223_loop (KERN_ATTR_TMPS_ESALT (tc64_tmp_t, tc_t)) +KERNEL_FQ void m06223_loop (KERN_ATTR_TMPS_ESALT (tc64_tmp_t, tc_t)) { const u64 gid = get_global_id (0); @@ -436,7 +436,7 @@ __kernel void m06223_loop (KERN_ATTR_TMPS_ESALT (tc64_tmp_t, tc_t)) } } -__kernel void m06223_comp (KERN_ATTR_TMPS_ESALT (tc64_tmp_t, tc_t)) +KERNEL_FQ void m06223_comp (KERN_ATTR_TMPS_ESALT (tc64_tmp_t, tc_t)) { const u64 gid = get_global_id (0); const u64 lid = get_local_id (0); @@ -448,17 +448,17 @@ __kernel void m06223_comp (KERN_ATTR_TMPS_ESALT (tc64_tmp_t, tc_t)) #ifdef REAL_SHM - __local u32 s_td0[256]; - __local u32 s_td1[256]; - __local u32 s_td2[256]; - __local u32 s_td3[256]; - __local u32 s_td4[256]; + LOCAL_AS u32 s_td0[256]; + LOCAL_AS u32 s_td1[256]; + LOCAL_AS u32 s_td2[256]; + LOCAL_AS u32 s_td3[256]; + LOCAL_AS u32 s_td4[256]; - __local u32 s_te0[256]; - __local u32 s_te1[256]; - __local u32 s_te2[256]; - __local u32 s_te3[256]; - __local u32 s_te4[256]; + LOCAL_AS u32 s_te0[256]; + LOCAL_AS u32 s_te1[256]; + LOCAL_AS u32 s_te2[256]; + LOCAL_AS u32 s_te3[256]; + LOCAL_AS u32 s_te4[256]; for (u32 i = lid; i < 256; i += lsz) { @@ -479,17 +479,17 @@ __kernel void m06223_comp (KERN_ATTR_TMPS_ESALT (tc64_tmp_t, tc_t)) #else - __constant u32a *s_td0 = td0; - __constant u32a *s_td1 = td1; - __constant u32a *s_td2 = td2; - __constant u32a *s_td3 = td3; - __constant u32a *s_td4 = td4; + CONSTANT_AS u32a *s_td0 = td0; + CONSTANT_AS u32a *s_td1 = td1; + CONSTANT_AS u32a *s_td2 = td2; + CONSTANT_AS u32a *s_td3 = td3; + CONSTANT_AS u32a *s_td4 = td4; - __constant u32a *s_te0 = te0; - __constant u32a *s_te1 = te1; - __constant u32a *s_te2 = te2; - __constant u32a *s_te3 = te3; - __constant u32a *s_te4 = te4; + CONSTANT_AS u32a *s_te0 = te0; + CONSTANT_AS u32a *s_te1 = te1; + CONSTANT_AS u32a *s_te2 = te2; + CONSTANT_AS u32a *s_te3 = te3; + CONSTANT_AS u32a *s_te4 = te4; #endif diff --git a/OpenCL/m06231-pure.cl b/OpenCL/m06231-pure.cl index c78b65241..cac3a8873 100644 --- a/OpenCL/m06231-pure.cl +++ b/OpenCL/m06231-pure.cl @@ -140,7 +140,7 @@ DECLSPEC void hmac_whirlpool_run_V (u32x *w0, u32x *w1, u32x *w2, u32x *w3, u32x whirlpool_transform_vector (w0, w1, w2, w3, digest, s_Ch, s_Cl); } -__kernel void m06231_init (KERN_ATTR_TMPS_ESALT (tc_tmp_t, tc_t)) +KERNEL_FQ void m06231_init (KERN_ATTR_TMPS_ESALT (tc_tmp_t, tc_t)) { const u64 gid = get_global_id (0); const u64 lid = get_local_id (0); @@ -152,7 +152,7 @@ __kernel void m06231_init (KERN_ATTR_TMPS_ESALT (tc_tmp_t, tc_t)) const int keyboard_layout_mapping_cnt = esalt_bufs[digests_offset].keyboard_layout_mapping_cnt; - __local keyboard_layout_mapping_t s_keyboard_layout_mapping_buf[256]; + LOCAL_AS keyboard_layout_mapping_t s_keyboard_layout_mapping_buf[256]; for (u32 i = lid; i < 256; i += lsz) { @@ -167,8 +167,8 @@ __kernel void m06231_init (KERN_ATTR_TMPS_ESALT (tc_tmp_t, tc_t)) #ifdef REAL_SHM - __local u32 s_Ch[8][256]; - __local u32 s_Cl[8][256]; + LOCAL_AS u32 s_Ch[8][256]; + LOCAL_AS u32 s_Cl[8][256]; for (u32 i = lid; i < 256; i += lsz) { @@ -195,8 +195,8 @@ __kernel void m06231_init (KERN_ATTR_TMPS_ESALT (tc_tmp_t, tc_t)) #else - __constant u32a (*s_Ch)[256] = Ch; - __constant u32a (*s_Cl)[256] = Cl; + CONSTANT_AS u32a (*s_Ch)[256] = Ch; + CONSTANT_AS u32a (*s_Cl)[256] = Cl; #endif @@ -367,7 +367,7 @@ __kernel void m06231_init (KERN_ATTR_TMPS_ESALT (tc_tmp_t, tc_t)) } } -__kernel void m06231_loop (KERN_ATTR_TMPS_ESALT (tc_tmp_t, tc_t)) +KERNEL_FQ void m06231_loop (KERN_ATTR_TMPS_ESALT (tc_tmp_t, tc_t)) { /** * Whirlpool shared @@ -379,8 +379,8 @@ __kernel void m06231_loop (KERN_ATTR_TMPS_ESALT (tc_tmp_t, tc_t)) #ifdef REAL_SHM - __local u32 s_Ch[8][256]; - __local u32 s_Cl[8][256]; + LOCAL_AS u32 s_Ch[8][256]; + LOCAL_AS u32 s_Cl[8][256]; for (u32 i = lid; i < 256; i += lsz) { @@ -407,8 +407,8 @@ __kernel void m06231_loop (KERN_ATTR_TMPS_ESALT (tc_tmp_t, tc_t)) #else - __constant u32a (*s_Ch)[256] = Ch; - __constant u32a (*s_Cl)[256] = Cl; + CONSTANT_AS u32a (*s_Ch)[256] = Ch; + CONSTANT_AS u32a (*s_Cl)[256] = Cl; #endif @@ -570,7 +570,7 @@ __kernel void m06231_loop (KERN_ATTR_TMPS_ESALT (tc_tmp_t, tc_t)) } } -__kernel void m06231_comp (KERN_ATTR_TMPS_ESALT (tc_tmp_t, tc_t)) +KERNEL_FQ void m06231_comp (KERN_ATTR_TMPS_ESALT (tc_tmp_t, tc_t)) { const u64 gid = get_global_id (0); const u64 lid = get_local_id (0); @@ -582,17 +582,17 @@ __kernel void m06231_comp (KERN_ATTR_TMPS_ESALT (tc_tmp_t, tc_t)) #ifdef REAL_SHM - __local u32 s_td0[256]; - __local u32 s_td1[256]; - __local u32 s_td2[256]; - __local u32 s_td3[256]; - __local u32 s_td4[256]; + LOCAL_AS u32 s_td0[256]; + LOCAL_AS u32 s_td1[256]; + LOCAL_AS u32 s_td2[256]; + LOCAL_AS u32 s_td3[256]; + LOCAL_AS u32 s_td4[256]; - __local u32 s_te0[256]; - __local u32 s_te1[256]; - __local u32 s_te2[256]; - __local u32 s_te3[256]; - __local u32 s_te4[256]; + LOCAL_AS u32 s_te0[256]; + LOCAL_AS u32 s_te1[256]; + LOCAL_AS u32 s_te2[256]; + LOCAL_AS u32 s_te3[256]; + LOCAL_AS u32 s_te4[256]; for (u32 i = lid; i < 256; i += lsz) { @@ -613,17 +613,17 @@ __kernel void m06231_comp (KERN_ATTR_TMPS_ESALT (tc_tmp_t, tc_t)) #else - __constant u32a *s_td0 = td0; - __constant u32a *s_td1 = td1; - __constant u32a *s_td2 = td2; - __constant u32a *s_td3 = td3; - __constant u32a *s_td4 = td4; + CONSTANT_AS u32a *s_td0 = td0; + CONSTANT_AS u32a *s_td1 = td1; + CONSTANT_AS u32a *s_td2 = td2; + CONSTANT_AS u32a *s_td3 = td3; + CONSTANT_AS u32a *s_td4 = td4; - __constant u32a *s_te0 = te0; - __constant u32a *s_te1 = te1; - __constant u32a *s_te2 = te2; - __constant u32a *s_te3 = te3; - __constant u32a *s_te4 = te4; + CONSTANT_AS u32a *s_te0 = te0; + CONSTANT_AS u32a *s_te1 = te1; + CONSTANT_AS u32a *s_te2 = te2; + CONSTANT_AS u32a *s_te3 = te3; + CONSTANT_AS u32a *s_te4 = te4; #endif @@ -633,8 +633,8 @@ __kernel void m06231_comp (KERN_ATTR_TMPS_ESALT (tc_tmp_t, tc_t)) #ifdef REAL_SHM - __local u32 s_Ch[8][256]; - __local u32 s_Cl[8][256]; + LOCAL_AS u32 s_Ch[8][256]; + LOCAL_AS u32 s_Cl[8][256]; for (u32 i = lid; i < 256; i += lsz) { @@ -661,8 +661,8 @@ __kernel void m06231_comp (KERN_ATTR_TMPS_ESALT (tc_tmp_t, tc_t)) #else - __constant u32a (*s_Ch)[256] = Ch; - __constant u32a (*s_Cl)[256] = Cl; + CONSTANT_AS u32a (*s_Ch)[256] = Ch; + CONSTANT_AS u32a (*s_Cl)[256] = Cl; #endif diff --git a/OpenCL/m06232-pure.cl b/OpenCL/m06232-pure.cl index 49d54949e..f830bf48d 100644 --- a/OpenCL/m06232-pure.cl +++ b/OpenCL/m06232-pure.cl @@ -140,7 +140,7 @@ DECLSPEC void hmac_whirlpool_run_V (u32x *w0, u32x *w1, u32x *w2, u32x *w3, u32x whirlpool_transform_vector (w0, w1, w2, w3, digest, s_Ch, s_Cl); } -__kernel void m06232_init (KERN_ATTR_TMPS_ESALT (tc_tmp_t, tc_t)) +KERNEL_FQ void m06232_init (KERN_ATTR_TMPS_ESALT (tc_tmp_t, tc_t)) { const u64 gid = get_global_id (0); const u64 lid = get_local_id (0); @@ -152,7 +152,7 @@ __kernel void m06232_init (KERN_ATTR_TMPS_ESALT (tc_tmp_t, tc_t)) const int keyboard_layout_mapping_cnt = esalt_bufs[digests_offset].keyboard_layout_mapping_cnt; - __local keyboard_layout_mapping_t s_keyboard_layout_mapping_buf[256]; + LOCAL_AS keyboard_layout_mapping_t s_keyboard_layout_mapping_buf[256]; for (u32 i = lid; i < 256; i += lsz) { @@ -167,8 +167,8 @@ __kernel void m06232_init (KERN_ATTR_TMPS_ESALT (tc_tmp_t, tc_t)) #ifdef REAL_SHM - __local u32 s_Ch[8][256]; - __local u32 s_Cl[8][256]; + LOCAL_AS u32 s_Ch[8][256]; + LOCAL_AS u32 s_Cl[8][256]; for (u32 i = lid; i < 256; i += lsz) { @@ -195,8 +195,8 @@ __kernel void m06232_init (KERN_ATTR_TMPS_ESALT (tc_tmp_t, tc_t)) #else - __constant u32a (*s_Ch)[256] = Ch; - __constant u32a (*s_Cl)[256] = Cl; + CONSTANT_AS u32a (*s_Ch)[256] = Ch; + CONSTANT_AS u32a (*s_Cl)[256] = Cl; #endif @@ -367,7 +367,7 @@ __kernel void m06232_init (KERN_ATTR_TMPS_ESALT (tc_tmp_t, tc_t)) } } -__kernel void m06232_loop (KERN_ATTR_TMPS_ESALT (tc_tmp_t, tc_t)) +KERNEL_FQ void m06232_loop (KERN_ATTR_TMPS_ESALT (tc_tmp_t, tc_t)) { /** * Whirlpool shared @@ -379,8 +379,8 @@ __kernel void m06232_loop (KERN_ATTR_TMPS_ESALT (tc_tmp_t, tc_t)) #ifdef REAL_SHM - __local u32 s_Ch[8][256]; - __local u32 s_Cl[8][256]; + LOCAL_AS u32 s_Ch[8][256]; + LOCAL_AS u32 s_Cl[8][256]; for (u32 i = lid; i < 256; i += lsz) { @@ -407,8 +407,8 @@ __kernel void m06232_loop (KERN_ATTR_TMPS_ESALT (tc_tmp_t, tc_t)) #else - __constant u32a (*s_Ch)[256] = Ch; - __constant u32a (*s_Cl)[256] = Cl; + CONSTANT_AS u32a (*s_Ch)[256] = Ch; + CONSTANT_AS u32a (*s_Cl)[256] = Cl; #endif @@ -570,7 +570,7 @@ __kernel void m06232_loop (KERN_ATTR_TMPS_ESALT (tc_tmp_t, tc_t)) } } -__kernel void m06232_comp (KERN_ATTR_TMPS_ESALT (tc_tmp_t, tc_t)) +KERNEL_FQ void m06232_comp (KERN_ATTR_TMPS_ESALT (tc_tmp_t, tc_t)) { const u64 gid = get_global_id (0); const u64 lid = get_local_id (0); @@ -582,17 +582,17 @@ __kernel void m06232_comp (KERN_ATTR_TMPS_ESALT (tc_tmp_t, tc_t)) #ifdef REAL_SHM - __local u32 s_td0[256]; - __local u32 s_td1[256]; - __local u32 s_td2[256]; - __local u32 s_td3[256]; - __local u32 s_td4[256]; + LOCAL_AS u32 s_td0[256]; + LOCAL_AS u32 s_td1[256]; + LOCAL_AS u32 s_td2[256]; + LOCAL_AS u32 s_td3[256]; + LOCAL_AS u32 s_td4[256]; - __local u32 s_te0[256]; - __local u32 s_te1[256]; - __local u32 s_te2[256]; - __local u32 s_te3[256]; - __local u32 s_te4[256]; + LOCAL_AS u32 s_te0[256]; + LOCAL_AS u32 s_te1[256]; + LOCAL_AS u32 s_te2[256]; + LOCAL_AS u32 s_te3[256]; + LOCAL_AS u32 s_te4[256]; for (u32 i = lid; i < 256; i += lsz) { @@ -613,17 +613,17 @@ __kernel void m06232_comp (KERN_ATTR_TMPS_ESALT (tc_tmp_t, tc_t)) #else - __constant u32a *s_td0 = td0; - __constant u32a *s_td1 = td1; - __constant u32a *s_td2 = td2; - __constant u32a *s_td3 = td3; - __constant u32a *s_td4 = td4; + CONSTANT_AS u32a *s_td0 = td0; + CONSTANT_AS u32a *s_td1 = td1; + CONSTANT_AS u32a *s_td2 = td2; + CONSTANT_AS u32a *s_td3 = td3; + CONSTANT_AS u32a *s_td4 = td4; - __constant u32a *s_te0 = te0; - __constant u32a *s_te1 = te1; - __constant u32a *s_te2 = te2; - __constant u32a *s_te3 = te3; - __constant u32a *s_te4 = te4; + CONSTANT_AS u32a *s_te0 = te0; + CONSTANT_AS u32a *s_te1 = te1; + CONSTANT_AS u32a *s_te2 = te2; + CONSTANT_AS u32a *s_te3 = te3; + CONSTANT_AS u32a *s_te4 = te4; #endif @@ -633,8 +633,8 @@ __kernel void m06232_comp (KERN_ATTR_TMPS_ESALT (tc_tmp_t, tc_t)) #ifdef REAL_SHM - __local u32 s_Ch[8][256]; - __local u32 s_Cl[8][256]; + LOCAL_AS u32 s_Ch[8][256]; + LOCAL_AS u32 s_Cl[8][256]; for (u32 i = lid; i < 256; i += lsz) { @@ -661,8 +661,8 @@ __kernel void m06232_comp (KERN_ATTR_TMPS_ESALT (tc_tmp_t, tc_t)) #else - __constant u32a (*s_Ch)[256] = Ch; - __constant u32a (*s_Cl)[256] = Cl; + CONSTANT_AS u32a (*s_Ch)[256] = Ch; + CONSTANT_AS u32a (*s_Cl)[256] = Cl; #endif diff --git a/OpenCL/m06233-pure.cl b/OpenCL/m06233-pure.cl index 1abe5bcf7..870fda083 100644 --- a/OpenCL/m06233-pure.cl +++ b/OpenCL/m06233-pure.cl @@ -140,7 +140,7 @@ DECLSPEC void hmac_whirlpool_run_V (u32x *w0, u32x *w1, u32x *w2, u32x *w3, u32x whirlpool_transform_vector (w0, w1, w2, w3, digest, s_Ch, s_Cl); } -__kernel void m06233_init (KERN_ATTR_TMPS_ESALT (tc_tmp_t, tc_t)) +KERNEL_FQ void m06233_init (KERN_ATTR_TMPS_ESALT (tc_tmp_t, tc_t)) { const u64 gid = get_global_id (0); const u64 lid = get_local_id (0); @@ -152,7 +152,7 @@ __kernel void m06233_init (KERN_ATTR_TMPS_ESALT (tc_tmp_t, tc_t)) const int keyboard_layout_mapping_cnt = esalt_bufs[digests_offset].keyboard_layout_mapping_cnt; - __local keyboard_layout_mapping_t s_keyboard_layout_mapping_buf[256]; + LOCAL_AS keyboard_layout_mapping_t s_keyboard_layout_mapping_buf[256]; for (u32 i = lid; i < 256; i += lsz) { @@ -167,8 +167,8 @@ __kernel void m06233_init (KERN_ATTR_TMPS_ESALT (tc_tmp_t, tc_t)) #ifdef REAL_SHM - __local u32 s_Ch[8][256]; - __local u32 s_Cl[8][256]; + LOCAL_AS u32 s_Ch[8][256]; + LOCAL_AS u32 s_Cl[8][256]; for (u32 i = lid; i < 256; i += lsz) { @@ -195,8 +195,8 @@ __kernel void m06233_init (KERN_ATTR_TMPS_ESALT (tc_tmp_t, tc_t)) #else - __constant u32a (*s_Ch)[256] = Ch; - __constant u32a (*s_Cl)[256] = Cl; + CONSTANT_AS u32a (*s_Ch)[256] = Ch; + CONSTANT_AS u32a (*s_Cl)[256] = Cl; #endif @@ -367,7 +367,7 @@ __kernel void m06233_init (KERN_ATTR_TMPS_ESALT (tc_tmp_t, tc_t)) } } -__kernel void m06233_loop (KERN_ATTR_TMPS_ESALT (tc_tmp_t, tc_t)) +KERNEL_FQ void m06233_loop (KERN_ATTR_TMPS_ESALT (tc_tmp_t, tc_t)) { /** * Whirlpool shared @@ -379,8 +379,8 @@ __kernel void m06233_loop (KERN_ATTR_TMPS_ESALT (tc_tmp_t, tc_t)) #ifdef REAL_SHM - __local u32 s_Ch[8][256]; - __local u32 s_Cl[8][256]; + LOCAL_AS u32 s_Ch[8][256]; + LOCAL_AS u32 s_Cl[8][256]; for (u32 i = lid; i < 256; i += lsz) { @@ -407,8 +407,8 @@ __kernel void m06233_loop (KERN_ATTR_TMPS_ESALT (tc_tmp_t, tc_t)) #else - __constant u32a (*s_Ch)[256] = Ch; - __constant u32a (*s_Cl)[256] = Cl; + CONSTANT_AS u32a (*s_Ch)[256] = Ch; + CONSTANT_AS u32a (*s_Cl)[256] = Cl; #endif @@ -570,7 +570,7 @@ __kernel void m06233_loop (KERN_ATTR_TMPS_ESALT (tc_tmp_t, tc_t)) } } -__kernel void m06233_comp (KERN_ATTR_TMPS_ESALT (tc_tmp_t, tc_t)) +KERNEL_FQ void m06233_comp (KERN_ATTR_TMPS_ESALT (tc_tmp_t, tc_t)) { const u64 gid = get_global_id (0); const u64 lid = get_local_id (0); @@ -582,17 +582,17 @@ __kernel void m06233_comp (KERN_ATTR_TMPS_ESALT (tc_tmp_t, tc_t)) #ifdef REAL_SHM - __local u32 s_td0[256]; - __local u32 s_td1[256]; - __local u32 s_td2[256]; - __local u32 s_td3[256]; - __local u32 s_td4[256]; + LOCAL_AS u32 s_td0[256]; + LOCAL_AS u32 s_td1[256]; + LOCAL_AS u32 s_td2[256]; + LOCAL_AS u32 s_td3[256]; + LOCAL_AS u32 s_td4[256]; - __local u32 s_te0[256]; - __local u32 s_te1[256]; - __local u32 s_te2[256]; - __local u32 s_te3[256]; - __local u32 s_te4[256]; + LOCAL_AS u32 s_te0[256]; + LOCAL_AS u32 s_te1[256]; + LOCAL_AS u32 s_te2[256]; + LOCAL_AS u32 s_te3[256]; + LOCAL_AS u32 s_te4[256]; for (u32 i = lid; i < 256; i += lsz) { @@ -613,17 +613,17 @@ __kernel void m06233_comp (KERN_ATTR_TMPS_ESALT (tc_tmp_t, tc_t)) #else - __constant u32a *s_td0 = td0; - __constant u32a *s_td1 = td1; - __constant u32a *s_td2 = td2; - __constant u32a *s_td3 = td3; - __constant u32a *s_td4 = td4; + CONSTANT_AS u32a *s_td0 = td0; + CONSTANT_AS u32a *s_td1 = td1; + CONSTANT_AS u32a *s_td2 = td2; + CONSTANT_AS u32a *s_td3 = td3; + CONSTANT_AS u32a *s_td4 = td4; - __constant u32a *s_te0 = te0; - __constant u32a *s_te1 = te1; - __constant u32a *s_te2 = te2; - __constant u32a *s_te3 = te3; - __constant u32a *s_te4 = te4; + CONSTANT_AS u32a *s_te0 = te0; + CONSTANT_AS u32a *s_te1 = te1; + CONSTANT_AS u32a *s_te2 = te2; + CONSTANT_AS u32a *s_te3 = te3; + CONSTANT_AS u32a *s_te4 = te4; #endif @@ -633,8 +633,8 @@ __kernel void m06233_comp (KERN_ATTR_TMPS_ESALT (tc_tmp_t, tc_t)) #ifdef REAL_SHM - __local u32 s_Ch[8][256]; - __local u32 s_Cl[8][256]; + LOCAL_AS u32 s_Ch[8][256]; + LOCAL_AS u32 s_Cl[8][256]; for (u32 i = lid; i < 256; i += lsz) { @@ -661,8 +661,8 @@ __kernel void m06233_comp (KERN_ATTR_TMPS_ESALT (tc_tmp_t, tc_t)) #else - __constant u32a (*s_Ch)[256] = Ch; - __constant u32a (*s_Cl)[256] = Cl; + CONSTANT_AS u32a (*s_Ch)[256] = Ch; + CONSTANT_AS u32a (*s_Cl)[256] = Cl; #endif diff --git a/OpenCL/m06300-optimized.cl b/OpenCL/m06300-optimized.cl index d66972f21..cffe89afd 100644 --- a/OpenCL/m06300-optimized.cl +++ b/OpenCL/m06300-optimized.cl @@ -554,7 +554,7 @@ DECLSPEC void append_1st (u32 *block0, u32 *block1, u32 *block2, u32 *block3, co } } -__kernel void m06300_init (KERN_ATTR_TMPS (md5crypt_tmp_t)) +KERNEL_FQ void m06300_init (KERN_ATTR_TMPS (md5crypt_tmp_t)) { /** * base @@ -712,7 +712,7 @@ __kernel void m06300_init (KERN_ATTR_TMPS (md5crypt_tmp_t)) tmps[gid].digest_buf[3] = digest[3]; } -__kernel void m06300_loop (KERN_ATTR_TMPS (md5crypt_tmp_t)) +KERNEL_FQ void m06300_loop (KERN_ATTR_TMPS (md5crypt_tmp_t)) { /** * base @@ -900,7 +900,7 @@ __kernel void m06300_loop (KERN_ATTR_TMPS (md5crypt_tmp_t)) tmps[gid].digest_buf[3] = digest[3]; } -__kernel void m06300_comp (KERN_ATTR_TMPS (md5crypt_tmp_t)) +KERNEL_FQ void m06300_comp (KERN_ATTR_TMPS (md5crypt_tmp_t)) { /** * modifier diff --git a/OpenCL/m06300-pure.cl b/OpenCL/m06300-pure.cl index 88bfdf6d9..dcdc3a9cd 100644 --- a/OpenCL/m06300-pure.cl +++ b/OpenCL/m06300-pure.cl @@ -24,7 +24,7 @@ typedef struct md5crypt_tmp } md5crypt_tmp_t; -__kernel void m06300_init (KERN_ATTR_TMPS (md5crypt_tmp_t)) +KERNEL_FQ void m06300_init (KERN_ATTR_TMPS (md5crypt_tmp_t)) { /** * base @@ -124,7 +124,7 @@ __kernel void m06300_init (KERN_ATTR_TMPS (md5crypt_tmp_t)) tmps[gid].digest_buf[3] = md5_ctx.h[3]; } -__kernel void m06300_loop (KERN_ATTR_TMPS (md5crypt_tmp_t)) +KERNEL_FQ void m06300_loop (KERN_ATTR_TMPS (md5crypt_tmp_t)) { /** * base @@ -321,7 +321,7 @@ __kernel void m06300_loop (KERN_ATTR_TMPS (md5crypt_tmp_t)) tmps[gid].digest_buf[3] = digest[3]; } -__kernel void m06300_comp (KERN_ATTR_TMPS (md5crypt_tmp_t)) +KERNEL_FQ void m06300_comp (KERN_ATTR_TMPS (md5crypt_tmp_t)) { /** * modifier diff --git a/OpenCL/m06400-pure.cl b/OpenCL/m06400-pure.cl index 6769aaefe..0b7ba781e 100644 --- a/OpenCL/m06400-pure.cl +++ b/OpenCL/m06400-pure.cl @@ -68,7 +68,7 @@ DECLSPEC void hmac_sha256_run_V (u32x *w0, u32x *w1, u32x *w2, u32x *w3, u32x *i sha256_transform_vector (w0, w1, w2, w3, digest); } -__kernel void m06400_init (KERN_ATTR_TMPS (sha256aix_tmp_t)) +KERNEL_FQ void m06400_init (KERN_ATTR_TMPS (sha256aix_tmp_t)) { /** * base @@ -152,7 +152,7 @@ __kernel void m06400_init (KERN_ATTR_TMPS (sha256aix_tmp_t)) } } -__kernel void m06400_loop (KERN_ATTR_TMPS (sha256aix_tmp_t)) +KERNEL_FQ void m06400_loop (KERN_ATTR_TMPS (sha256aix_tmp_t)) { const u64 gid = get_global_id (0); @@ -258,7 +258,7 @@ __kernel void m06400_loop (KERN_ATTR_TMPS (sha256aix_tmp_t)) } } -__kernel void m06400_comp (KERN_ATTR_TMPS (sha256aix_tmp_t)) +KERNEL_FQ void m06400_comp (KERN_ATTR_TMPS (sha256aix_tmp_t)) { /** * base diff --git a/OpenCL/m06500-pure.cl b/OpenCL/m06500-pure.cl index 9fd5aa0d8..4a4a5b449 100644 --- a/OpenCL/m06500-pure.cl +++ b/OpenCL/m06500-pure.cl @@ -84,7 +84,7 @@ DECLSPEC void hmac_sha512_run_V (u32x *w0, u32x *w1, u32x *w2, u32x *w3, u32x *w sha512_transform_vector (w0, w1, w2, w3, w4, w5, w6, w7, digest); } -__kernel void m06500_init (KERN_ATTR_TMPS (sha512aix_tmp_t)) +KERNEL_FQ void m06500_init (KERN_ATTR_TMPS (sha512aix_tmp_t)) { /** * base @@ -188,7 +188,7 @@ __kernel void m06500_init (KERN_ATTR_TMPS (sha512aix_tmp_t)) } } -__kernel void m06500_loop (KERN_ATTR_TMPS (sha512aix_tmp_t)) +KERNEL_FQ void m06500_loop (KERN_ATTR_TMPS (sha512aix_tmp_t)) { const u64 gid = get_global_id (0); @@ -314,7 +314,7 @@ __kernel void m06500_loop (KERN_ATTR_TMPS (sha512aix_tmp_t)) } } -__kernel void m06500_comp (KERN_ATTR_TMPS (sha512aix_tmp_t)) +KERNEL_FQ void m06500_comp (KERN_ATTR_TMPS (sha512aix_tmp_t)) { /** * base diff --git a/OpenCL/m06600-pure.cl b/OpenCL/m06600-pure.cl index a9bdcd714..f52838b6c 100644 --- a/OpenCL/m06600-pure.cl +++ b/OpenCL/m06600-pure.cl @@ -63,7 +63,7 @@ DECLSPEC void hmac_sha1_run_V (u32x *w0, u32x *w1, u32x *w2, u32x *w3, u32x *ipa sha1_transform_vector (w0, w1, w2, w3, digest); } -__kernel void m06600_init (KERN_ATTR_TMPS (agilekey_tmp_t)) +KERNEL_FQ void m06600_init (KERN_ATTR_TMPS (agilekey_tmp_t)) { /** * base @@ -143,7 +143,7 @@ __kernel void m06600_init (KERN_ATTR_TMPS (agilekey_tmp_t)) } } -__kernel void m06600_loop (KERN_ATTR_TMPS (agilekey_tmp_t)) +KERNEL_FQ void m06600_loop (KERN_ATTR_TMPS (agilekey_tmp_t)) { const u64 gid = get_global_id (0); @@ -228,7 +228,7 @@ __kernel void m06600_loop (KERN_ATTR_TMPS (agilekey_tmp_t)) } } -__kernel void m06600_comp (KERN_ATTR_TMPS (agilekey_tmp_t)) +KERNEL_FQ void m06600_comp (KERN_ATTR_TMPS (agilekey_tmp_t)) { const u64 gid = get_global_id (0); const u64 lid = get_local_id (0); @@ -240,17 +240,17 @@ __kernel void m06600_comp (KERN_ATTR_TMPS (agilekey_tmp_t)) #ifdef REAL_SHM - __local u32 s_td0[256]; - __local u32 s_td1[256]; - __local u32 s_td2[256]; - __local u32 s_td3[256]; - __local u32 s_td4[256]; + LOCAL_AS u32 s_td0[256]; + LOCAL_AS u32 s_td1[256]; + LOCAL_AS u32 s_td2[256]; + LOCAL_AS u32 s_td3[256]; + LOCAL_AS u32 s_td4[256]; - __local u32 s_te0[256]; - __local u32 s_te1[256]; - __local u32 s_te2[256]; - __local u32 s_te3[256]; - __local u32 s_te4[256]; + LOCAL_AS u32 s_te0[256]; + LOCAL_AS u32 s_te1[256]; + LOCAL_AS u32 s_te2[256]; + LOCAL_AS u32 s_te3[256]; + LOCAL_AS u32 s_te4[256]; for (u32 i = lid; i < 256; i += lsz) { @@ -271,17 +271,17 @@ __kernel void m06600_comp (KERN_ATTR_TMPS (agilekey_tmp_t)) #else - __constant u32a *s_td0 = td0; - __constant u32a *s_td1 = td1; - __constant u32a *s_td2 = td2; - __constant u32a *s_td3 = td3; - __constant u32a *s_td4 = td4; + CONSTANT_AS u32a *s_td0 = td0; + CONSTANT_AS u32a *s_td1 = td1; + CONSTANT_AS u32a *s_td2 = td2; + CONSTANT_AS u32a *s_td3 = td3; + CONSTANT_AS u32a *s_td4 = td4; - __constant u32a *s_te0 = te0; - __constant u32a *s_te1 = te1; - __constant u32a *s_te2 = te2; - __constant u32a *s_te3 = te3; - __constant u32a *s_te4 = te4; + CONSTANT_AS u32a *s_te0 = te0; + CONSTANT_AS u32a *s_te1 = te1; + CONSTANT_AS u32a *s_te2 = te2; + CONSTANT_AS u32a *s_te3 = te3; + CONSTANT_AS u32a *s_te4 = te4; #endif diff --git a/OpenCL/m06700-pure.cl b/OpenCL/m06700-pure.cl index 83329c68d..9c9edafc2 100644 --- a/OpenCL/m06700-pure.cl +++ b/OpenCL/m06700-pure.cl @@ -62,7 +62,7 @@ DECLSPEC void hmac_sha1_run_V (u32x *w0, u32x *w1, u32x *w2, u32x *w3, u32x *ipa sha1_transform_vector (w0, w1, w2, w3, digest); } -__kernel void m06700_init (KERN_ATTR_TMPS (sha1aix_tmp_t)) +KERNEL_FQ void m06700_init (KERN_ATTR_TMPS (sha1aix_tmp_t)) { /** * base @@ -134,7 +134,7 @@ __kernel void m06700_init (KERN_ATTR_TMPS (sha1aix_tmp_t)) } } -__kernel void m06700_loop (KERN_ATTR_TMPS (sha1aix_tmp_t)) +KERNEL_FQ void m06700_loop (KERN_ATTR_TMPS (sha1aix_tmp_t)) { const u64 gid = get_global_id (0); @@ -219,7 +219,7 @@ __kernel void m06700_loop (KERN_ATTR_TMPS (sha1aix_tmp_t)) } } -__kernel void m06700_comp (KERN_ATTR_TMPS (sha1aix_tmp_t)) +KERNEL_FQ void m06700_comp (KERN_ATTR_TMPS (sha1aix_tmp_t)) { /** * base diff --git a/OpenCL/m06800-pure.cl b/OpenCL/m06800-pure.cl index 513632756..61fc9813a 100644 --- a/OpenCL/m06800-pure.cl +++ b/OpenCL/m06800-pure.cl @@ -69,7 +69,7 @@ DECLSPEC void hmac_sha256_run_V (u32x *w0, u32x *w1, u32x *w2, u32x *w3, u32x *i sha256_transform_vector (w0, w1, w2, w3, digest); } -__kernel void m06800_init (KERN_ATTR_TMPS (lastpass_tmp_t)) +KERNEL_FQ void m06800_init (KERN_ATTR_TMPS (lastpass_tmp_t)) { /** * base @@ -153,7 +153,7 @@ __kernel void m06800_init (KERN_ATTR_TMPS (lastpass_tmp_t)) } } -__kernel void m06800_loop (KERN_ATTR_TMPS (lastpass_tmp_t)) +KERNEL_FQ void m06800_loop (KERN_ATTR_TMPS (lastpass_tmp_t)) { const u64 gid = get_global_id (0); @@ -259,7 +259,7 @@ __kernel void m06800_loop (KERN_ATTR_TMPS (lastpass_tmp_t)) } } -__kernel void m06800_comp (KERN_ATTR_TMPS (lastpass_tmp_t)) +KERNEL_FQ void m06800_comp (KERN_ATTR_TMPS (lastpass_tmp_t)) { const u64 gid = get_global_id (0); const u64 lid = get_local_id (0); @@ -271,17 +271,17 @@ __kernel void m06800_comp (KERN_ATTR_TMPS (lastpass_tmp_t)) #ifdef REAL_SHM - __local u32 s_td0[256]; - __local u32 s_td1[256]; - __local u32 s_td2[256]; - __local u32 s_td3[256]; - __local u32 s_td4[256]; + LOCAL_AS u32 s_td0[256]; + LOCAL_AS u32 s_td1[256]; + LOCAL_AS u32 s_td2[256]; + LOCAL_AS u32 s_td3[256]; + LOCAL_AS u32 s_td4[256]; - __local u32 s_te0[256]; - __local u32 s_te1[256]; - __local u32 s_te2[256]; - __local u32 s_te3[256]; - __local u32 s_te4[256]; + LOCAL_AS u32 s_te0[256]; + LOCAL_AS u32 s_te1[256]; + LOCAL_AS u32 s_te2[256]; + LOCAL_AS u32 s_te3[256]; + LOCAL_AS u32 s_te4[256]; for (u32 i = lid; i < 256; i += lsz) { @@ -302,17 +302,17 @@ __kernel void m06800_comp (KERN_ATTR_TMPS (lastpass_tmp_t)) #else - __constant u32a *s_td0 = td0; - __constant u32a *s_td1 = td1; - __constant u32a *s_td2 = td2; - __constant u32a *s_td3 = td3; - __constant u32a *s_td4 = td4; + CONSTANT_AS u32a *s_td0 = td0; + CONSTANT_AS u32a *s_td1 = td1; + CONSTANT_AS u32a *s_td2 = td2; + CONSTANT_AS u32a *s_td3 = td3; + CONSTANT_AS u32a *s_td4 = td4; - __constant u32a *s_te0 = te0; - __constant u32a *s_te1 = te1; - __constant u32a *s_te2 = te2; - __constant u32a *s_te3 = te3; - __constant u32a *s_te4 = te4; + CONSTANT_AS u32a *s_te0 = te0; + CONSTANT_AS u32a *s_te1 = te1; + CONSTANT_AS u32a *s_te2 = te2; + CONSTANT_AS u32a *s_te3 = te3; + CONSTANT_AS u32a *s_te4 = te4; #endif diff --git a/OpenCL/m06900_a0-optimized.cl b/OpenCL/m06900_a0-optimized.cl index 58a1046b7..ae468ee70 100644 --- a/OpenCL/m06900_a0-optimized.cl +++ b/OpenCL/m06900_a0-optimized.cl @@ -14,7 +14,7 @@ #include "inc_simd.cl" #endif -__constant u32a c_tables[4][256] = +CONSTANT_AS u32a c_tables[4][256] = { { 0x00072000, 0x00075000, 0x00074800, 0x00071000, @@ -697,7 +697,7 @@ __constant u32a c_tables[4][256] = R (k, h, s, 6, t); \ } -__kernel void m06900_m04 (KERN_ATTR_RULES ()) +KERNEL_FQ void m06900_m04 (KERN_ATTR_RULES ()) { /** * base @@ -711,7 +711,7 @@ __kernel void m06900_m04 (KERN_ATTR_RULES ()) * sbox */ - __local u32 s_tables[4][256]; + LOCAL_AS u32 s_tables[4][256]; for (u32 i = lid; i < 256; i += lsz) { @@ -905,15 +905,15 @@ __kernel void m06900_m04 (KERN_ATTR_RULES ()) } } -__kernel void m06900_m08 (KERN_ATTR_RULES ()) +KERNEL_FQ void m06900_m08 (KERN_ATTR_RULES ()) { } -__kernel void m06900_m16 (KERN_ATTR_RULES ()) +KERNEL_FQ void m06900_m16 (KERN_ATTR_RULES ()) { } -__kernel void m06900_s04 (KERN_ATTR_RULES ()) +KERNEL_FQ void m06900_s04 (KERN_ATTR_RULES ()) { /** * base @@ -927,7 +927,7 @@ __kernel void m06900_s04 (KERN_ATTR_RULES ()) * sbox */ - __local u32 s_tables[4][256]; + LOCAL_AS u32 s_tables[4][256]; for (u32 i = lid; i < 256; i += lsz) { @@ -1137,10 +1137,10 @@ __kernel void m06900_s04 (KERN_ATTR_RULES ()) } } -__kernel void m06900_s08 (KERN_ATTR_RULES ()) +KERNEL_FQ void m06900_s08 (KERN_ATTR_RULES ()) { } -__kernel void m06900_s16 (KERN_ATTR_RULES ()) +KERNEL_FQ void m06900_s16 (KERN_ATTR_RULES ()) { } diff --git a/OpenCL/m06900_a1-optimized.cl b/OpenCL/m06900_a1-optimized.cl index 08a143c80..a6ca9bb5d 100644 --- a/OpenCL/m06900_a1-optimized.cl +++ b/OpenCL/m06900_a1-optimized.cl @@ -12,7 +12,7 @@ #include "inc_simd.cl" #endif -__constant u32a c_tables[4][256] = +CONSTANT_AS u32a c_tables[4][256] = { { 0x00072000, 0x00075000, 0x00074800, 0x00071000, @@ -695,7 +695,7 @@ __constant u32a c_tables[4][256] = R (k, h, s, 6, t); \ } -__kernel void m06900_m04 (KERN_ATTR_BASIC ()) +KERNEL_FQ void m06900_m04 (KERN_ATTR_BASIC ()) { /** * base @@ -709,7 +709,7 @@ __kernel void m06900_m04 (KERN_ATTR_BASIC ()) * sbox */ - __local u32 s_tables[4][256]; + LOCAL_AS u32 s_tables[4][256]; for (u32 i = lid; i < 256; i += lsz) { @@ -957,15 +957,15 @@ __kernel void m06900_m04 (KERN_ATTR_BASIC ()) } } -__kernel void m06900_m08 (KERN_ATTR_BASIC ()) +KERNEL_FQ void m06900_m08 (KERN_ATTR_BASIC ()) { } -__kernel void m06900_m16 (KERN_ATTR_BASIC ()) +KERNEL_FQ void m06900_m16 (KERN_ATTR_BASIC ()) { } -__kernel void m06900_s04 (KERN_ATTR_BASIC ()) +KERNEL_FQ void m06900_s04 (KERN_ATTR_BASIC ()) { /** * base @@ -979,7 +979,7 @@ __kernel void m06900_s04 (KERN_ATTR_BASIC ()) * sbox */ - __local u32 s_tables[4][256]; + LOCAL_AS u32 s_tables[4][256]; for (u32 i = lid; i < 256; i += lsz) { @@ -1239,10 +1239,10 @@ __kernel void m06900_s04 (KERN_ATTR_BASIC ()) } } -__kernel void m06900_s08 (KERN_ATTR_BASIC ()) +KERNEL_FQ void m06900_s08 (KERN_ATTR_BASIC ()) { } -__kernel void m06900_s16 (KERN_ATTR_BASIC ()) +KERNEL_FQ void m06900_s16 (KERN_ATTR_BASIC ()) { } diff --git a/OpenCL/m06900_a3-optimized.cl b/OpenCL/m06900_a3-optimized.cl index 39015df3e..5d9996777 100644 --- a/OpenCL/m06900_a3-optimized.cl +++ b/OpenCL/m06900_a3-optimized.cl @@ -12,7 +12,7 @@ #include "inc_simd.cl" #endif -__constant u32a c_tables[4][256] = +CONSTANT_AS u32a c_tables[4][256] = { { 0x00072000, 0x00075000, 0x00074800, 0x00071000, @@ -695,7 +695,7 @@ __constant u32a c_tables[4][256] = R (k, h, s, 6, t); \ } -DECLSPEC void m06900m (u32 *w0, u32 *w1, u32 *w2, u32 *w3, const u32 pw_len, KERN_ATTR_BASIC (), __local u32 (*s_tables)[256]) +DECLSPEC void m06900m (u32 *w0, u32 *w1, u32 *w2, u32 *w3, const u32 pw_len, KERN_ATTR_BASIC (), LOCAL_AS u32 (*s_tables)[256]) { /** * modifier @@ -869,7 +869,7 @@ DECLSPEC void m06900m (u32 *w0, u32 *w1, u32 *w2, u32 *w3, const u32 pw_len, KER } } -DECLSPEC void m06900s (u32 *w0, u32 *w1, u32 *w2, u32 *w3, const u32 pw_len, KERN_ATTR_BASIC (), __local u32 (*s_tables)[256]) +DECLSPEC void m06900s (u32 *w0, u32 *w1, u32 *w2, u32 *w3, const u32 pw_len, KERN_ATTR_BASIC (), LOCAL_AS u32 (*s_tables)[256]) { /** * modifier @@ -1055,7 +1055,7 @@ DECLSPEC void m06900s (u32 *w0, u32 *w1, u32 *w2, u32 *w3, const u32 pw_len, KER } } -__kernel void m06900_m04 (KERN_ATTR_BASIC ()) +KERNEL_FQ void m06900_m04 (KERN_ATTR_BASIC ()) { /** * base @@ -1069,7 +1069,7 @@ __kernel void m06900_m04 (KERN_ATTR_BASIC ()) * sbox */ - __local u32 s_tables[4][256]; + LOCAL_AS u32 s_tables[4][256]; for (u32 i = lid; i < 256; i += lsz) { @@ -1124,7 +1124,7 @@ __kernel void m06900_m04 (KERN_ATTR_BASIC ()) m06900m (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_extra0_buf, d_extra1_buf, d_extra2_buf, d_extra3_buf, bitmap_mask, bitmap_shift1, bitmap_shift2, salt_pos, loop_pos, loop_cnt, il_cnt, digests_cnt, digests_offset, combs_mode, gid_max, s_tables); } -__kernel void m06900_m08 (KERN_ATTR_BASIC ()) +KERNEL_FQ void m06900_m08 (KERN_ATTR_BASIC ()) { /** * base @@ -1138,7 +1138,7 @@ __kernel void m06900_m08 (KERN_ATTR_BASIC ()) * sbox */ - __local u32 s_tables[4][256]; + LOCAL_AS u32 s_tables[4][256]; for (u32 i = lid; i < 256; i += lsz) { @@ -1193,11 +1193,11 @@ __kernel void m06900_m08 (KERN_ATTR_BASIC ()) m06900m (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_extra0_buf, d_extra1_buf, d_extra2_buf, d_extra3_buf, bitmap_mask, bitmap_shift1, bitmap_shift2, salt_pos, loop_pos, loop_cnt, il_cnt, digests_cnt, digests_offset, combs_mode, gid_max, s_tables); } -__kernel void m06900_m16 (KERN_ATTR_BASIC ()) +KERNEL_FQ void m06900_m16 (KERN_ATTR_BASIC ()) { } -__kernel void m06900_s04 (KERN_ATTR_BASIC ()) +KERNEL_FQ void m06900_s04 (KERN_ATTR_BASIC ()) { /** * base @@ -1211,7 +1211,7 @@ __kernel void m06900_s04 (KERN_ATTR_BASIC ()) * sbox */ - __local u32 s_tables[4][256]; + LOCAL_AS u32 s_tables[4][256]; for (u32 i = lid; i < 256; i += lsz) { @@ -1266,7 +1266,7 @@ __kernel void m06900_s04 (KERN_ATTR_BASIC ()) m06900s (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_extra0_buf, d_extra1_buf, d_extra2_buf, d_extra3_buf, bitmap_mask, bitmap_shift1, bitmap_shift2, salt_pos, loop_pos, loop_cnt, il_cnt, digests_cnt, digests_offset, combs_mode, gid_max, s_tables); } -__kernel void m06900_s08 (KERN_ATTR_BASIC ()) +KERNEL_FQ void m06900_s08 (KERN_ATTR_BASIC ()) { /** * base @@ -1280,7 +1280,7 @@ __kernel void m06900_s08 (KERN_ATTR_BASIC ()) * sbox */ - __local u32 s_tables[4][256]; + LOCAL_AS u32 s_tables[4][256]; for (u32 i = lid; i < 256; i += lsz) { @@ -1335,6 +1335,6 @@ __kernel void m06900_s08 (KERN_ATTR_BASIC ()) m06900s (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_extra0_buf, d_extra1_buf, d_extra2_buf, d_extra3_buf, bitmap_mask, bitmap_shift1, bitmap_shift2, salt_pos, loop_pos, loop_cnt, il_cnt, digests_cnt, digests_offset, combs_mode, gid_max, s_tables); } -__kernel void m06900_s16 (KERN_ATTR_BASIC ()) +KERNEL_FQ void m06900_s16 (KERN_ATTR_BASIC ()) { } diff --git a/OpenCL/m07000_a0-optimized.cl b/OpenCL/m07000_a0-optimized.cl index 570726262..cc8fad265 100644 --- a/OpenCL/m07000_a0-optimized.cl +++ b/OpenCL/m07000_a0-optimized.cl @@ -15,7 +15,7 @@ #include "inc_hash_sha1.cl" #endif -__kernel void m07000_m04 (KERN_ATTR_RULES ()) +KERNEL_FQ void m07000_m04 (KERN_ATTR_RULES ()) { /** * modifier @@ -269,15 +269,15 @@ __kernel void m07000_m04 (KERN_ATTR_RULES ()) } } -__kernel void m07000_m08 (KERN_ATTR_RULES ()) +KERNEL_FQ void m07000_m08 (KERN_ATTR_RULES ()) { } -__kernel void m07000_m16 (KERN_ATTR_RULES ()) +KERNEL_FQ void m07000_m16 (KERN_ATTR_RULES ()) { } -__kernel void m07000_s04 (KERN_ATTR_RULES ()) +KERNEL_FQ void m07000_s04 (KERN_ATTR_RULES ()) { /** * modifier @@ -552,10 +552,10 @@ __kernel void m07000_s04 (KERN_ATTR_RULES ()) } } -__kernel void m07000_s08 (KERN_ATTR_RULES ()) +KERNEL_FQ void m07000_s08 (KERN_ATTR_RULES ()) { } -__kernel void m07000_s16 (KERN_ATTR_RULES ()) +KERNEL_FQ void m07000_s16 (KERN_ATTR_RULES ()) { } diff --git a/OpenCL/m07000_a0-pure.cl b/OpenCL/m07000_a0-pure.cl index 926522145..d0c2dfde2 100644 --- a/OpenCL/m07000_a0-pure.cl +++ b/OpenCL/m07000_a0-pure.cl @@ -15,7 +15,7 @@ #include "inc_hash_sha1.cl" #endif -__kernel void m07000_mxx (KERN_ATTR_RULES ()) +KERNEL_FQ void m07000_mxx (KERN_ATTR_RULES ()) { /** * modifier @@ -91,7 +91,7 @@ __kernel void m07000_mxx (KERN_ATTR_RULES ()) } } -__kernel void m07000_sxx (KERN_ATTR_RULES ()) +KERNEL_FQ void m07000_sxx (KERN_ATTR_RULES ()) { /** * modifier diff --git a/OpenCL/m07000_a1-optimized.cl b/OpenCL/m07000_a1-optimized.cl index 9a17b66a0..52161ed14 100644 --- a/OpenCL/m07000_a1-optimized.cl +++ b/OpenCL/m07000_a1-optimized.cl @@ -13,7 +13,7 @@ #include "inc_hash_sha1.cl" #endif -__kernel void m07000_m04 (KERN_ATTR_BASIC ()) +KERNEL_FQ void m07000_m04 (KERN_ATTR_BASIC ()) { /** * modifier @@ -327,15 +327,15 @@ __kernel void m07000_m04 (KERN_ATTR_BASIC ()) } } -__kernel void m07000_m08 (KERN_ATTR_BASIC ()) +KERNEL_FQ void m07000_m08 (KERN_ATTR_BASIC ()) { } -__kernel void m07000_m16 (KERN_ATTR_BASIC ()) +KERNEL_FQ void m07000_m16 (KERN_ATTR_BASIC ()) { } -__kernel void m07000_s04 (KERN_ATTR_BASIC ()) +KERNEL_FQ void m07000_s04 (KERN_ATTR_BASIC ()) { /** * modifier @@ -670,10 +670,10 @@ __kernel void m07000_s04 (KERN_ATTR_BASIC ()) } } -__kernel void m07000_s08 (KERN_ATTR_BASIC ()) +KERNEL_FQ void m07000_s08 (KERN_ATTR_BASIC ()) { } -__kernel void m07000_s16 (KERN_ATTR_BASIC ()) +KERNEL_FQ void m07000_s16 (KERN_ATTR_BASIC ()) { } diff --git a/OpenCL/m07000_a1-pure.cl b/OpenCL/m07000_a1-pure.cl index 48989bf23..841a8189c 100644 --- a/OpenCL/m07000_a1-pure.cl +++ b/OpenCL/m07000_a1-pure.cl @@ -13,7 +13,7 @@ #include "inc_hash_sha1.cl" #endif -__kernel void m07000_mxx (KERN_ATTR_BASIC ()) +KERNEL_FQ void m07000_mxx (KERN_ATTR_BASIC ()) { /** * modifier @@ -85,7 +85,7 @@ __kernel void m07000_mxx (KERN_ATTR_BASIC ()) } } -__kernel void m07000_sxx (KERN_ATTR_BASIC ()) +KERNEL_FQ void m07000_sxx (KERN_ATTR_BASIC ()) { /** * modifier diff --git a/OpenCL/m07000_a3-optimized.cl b/OpenCL/m07000_a3-optimized.cl index f12be4c7c..8682658ea 100644 --- a/OpenCL/m07000_a3-optimized.cl +++ b/OpenCL/m07000_a3-optimized.cl @@ -568,7 +568,7 @@ DECLSPEC void m07000s (u32 *w0, u32 *w1, u32 *w2, u32 *w3, const u32 pw_len, KER } } -__kernel void m07000_m04 (KERN_ATTR_BASIC ()) +KERNEL_FQ void m07000_m04 (KERN_ATTR_BASIC ()) { /** * base @@ -621,7 +621,7 @@ __kernel void m07000_m04 (KERN_ATTR_BASIC ()) m07000m (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_extra0_buf, d_extra1_buf, d_extra2_buf, d_extra3_buf, bitmap_mask, bitmap_shift1, bitmap_shift2, salt_pos, loop_pos, loop_cnt, il_cnt, digests_cnt, digests_offset, combs_mode, gid_max); } -__kernel void m07000_m08 (KERN_ATTR_BASIC ()) +KERNEL_FQ void m07000_m08 (KERN_ATTR_BASIC ()) { /** * base @@ -674,7 +674,7 @@ __kernel void m07000_m08 (KERN_ATTR_BASIC ()) m07000m (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_extra0_buf, d_extra1_buf, d_extra2_buf, d_extra3_buf, bitmap_mask, bitmap_shift1, bitmap_shift2, salt_pos, loop_pos, loop_cnt, il_cnt, digests_cnt, digests_offset, combs_mode, gid_max); } -__kernel void m07000_m16 (KERN_ATTR_BASIC ()) +KERNEL_FQ void m07000_m16 (KERN_ATTR_BASIC ()) { /** * base @@ -727,7 +727,7 @@ __kernel void m07000_m16 (KERN_ATTR_BASIC ()) m07000m (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_extra0_buf, d_extra1_buf, d_extra2_buf, d_extra3_buf, bitmap_mask, bitmap_shift1, bitmap_shift2, salt_pos, loop_pos, loop_cnt, il_cnt, digests_cnt, digests_offset, combs_mode, gid_max); } -__kernel void m07000_s04 (KERN_ATTR_BASIC ()) +KERNEL_FQ void m07000_s04 (KERN_ATTR_BASIC ()) { /** * base @@ -780,7 +780,7 @@ __kernel void m07000_s04 (KERN_ATTR_BASIC ()) m07000s (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_extra0_buf, d_extra1_buf, d_extra2_buf, d_extra3_buf, bitmap_mask, bitmap_shift1, bitmap_shift2, salt_pos, loop_pos, loop_cnt, il_cnt, digests_cnt, digests_offset, combs_mode, gid_max); } -__kernel void m07000_s08 (KERN_ATTR_BASIC ()) +KERNEL_FQ void m07000_s08 (KERN_ATTR_BASIC ()) { /** * base @@ -833,7 +833,7 @@ __kernel void m07000_s08 (KERN_ATTR_BASIC ()) m07000s (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_extra0_buf, d_extra1_buf, d_extra2_buf, d_extra3_buf, bitmap_mask, bitmap_shift1, bitmap_shift2, salt_pos, loop_pos, loop_cnt, il_cnt, digests_cnt, digests_offset, combs_mode, gid_max); } -__kernel void m07000_s16 (KERN_ATTR_BASIC ()) +KERNEL_FQ void m07000_s16 (KERN_ATTR_BASIC ()) { /** * base diff --git a/OpenCL/m07000_a3-pure.cl b/OpenCL/m07000_a3-pure.cl index 41ff3792d..8c7e6bcbc 100644 --- a/OpenCL/m07000_a3-pure.cl +++ b/OpenCL/m07000_a3-pure.cl @@ -13,7 +13,7 @@ #include "inc_hash_sha1.cl" #endif -__kernel void m07000_mxx (KERN_ATTR_VECTOR ()) +KERNEL_FQ void m07000_mxx (KERN_ATTR_VECTOR ()) { /** * modifier @@ -102,7 +102,7 @@ __kernel void m07000_mxx (KERN_ATTR_VECTOR ()) } } -__kernel void m07000_sxx (KERN_ATTR_VECTOR ()) +KERNEL_FQ void m07000_sxx (KERN_ATTR_VECTOR ()) { /** * modifier diff --git a/OpenCL/m07100-pure.cl b/OpenCL/m07100-pure.cl index d59171ccf..9426ceb2f 100644 --- a/OpenCL/m07100-pure.cl +++ b/OpenCL/m07100-pure.cl @@ -90,7 +90,7 @@ DECLSPEC void hmac_sha512_run_V (u32x *w0, u32x *w1, u32x *w2, u32x *w3, u32x *w sha512_transform_vector (w0, w1, w2, w3, w4, w5, w6, w7, digest); } -__kernel void m07100_init (KERN_ATTR_TMPS_ESALT (pbkdf2_sha512_tmp_t, pbkdf2_sha512_t)) +KERNEL_FQ void m07100_init (KERN_ATTR_TMPS_ESALT (pbkdf2_sha512_tmp_t, pbkdf2_sha512_t)) { /** * base @@ -194,7 +194,7 @@ __kernel void m07100_init (KERN_ATTR_TMPS_ESALT (pbkdf2_sha512_tmp_t, pbkdf2_sha } } -__kernel void m07100_loop (KERN_ATTR_TMPS_ESALT (pbkdf2_sha512_tmp_t, pbkdf2_sha512_t)) +KERNEL_FQ void m07100_loop (KERN_ATTR_TMPS_ESALT (pbkdf2_sha512_tmp_t, pbkdf2_sha512_t)) { const u64 gid = get_global_id (0); @@ -320,7 +320,7 @@ __kernel void m07100_loop (KERN_ATTR_TMPS_ESALT (pbkdf2_sha512_tmp_t, pbkdf2_sha } } -__kernel void m07100_comp (KERN_ATTR_TMPS_ESALT (pbkdf2_sha512_tmp_t, pbkdf2_sha512_t)) +KERNEL_FQ void m07100_comp (KERN_ATTR_TMPS_ESALT (pbkdf2_sha512_tmp_t, pbkdf2_sha512_t)) { /** * base diff --git a/OpenCL/m07300_a0-optimized.cl b/OpenCL/m07300_a0-optimized.cl index 0955f056a..8f9fb79c1 100644 --- a/OpenCL/m07300_a0-optimized.cl +++ b/OpenCL/m07300_a0-optimized.cl @@ -111,7 +111,7 @@ DECLSPEC void hmac_sha1_run (u32x *w0, u32x *w1, u32x *w2, u32x *w3, u32x *ipad, sha1_transform_vector (w0, w1, w2, w3, digest); } -__kernel void m07300_m04 (KERN_ATTR_RULES_ESALT (rakp_t)) +KERNEL_FQ void m07300_m04 (KERN_ATTR_RULES_ESALT (rakp_t)) { /** * modifier @@ -230,15 +230,15 @@ __kernel void m07300_m04 (KERN_ATTR_RULES_ESALT (rakp_t)) } } -__kernel void m07300_m08 (KERN_ATTR_RULES_ESALT (rakp_t)) +KERNEL_FQ void m07300_m08 (KERN_ATTR_RULES_ESALT (rakp_t)) { } -__kernel void m07300_m16 (KERN_ATTR_RULES_ESALT (rakp_t)) +KERNEL_FQ void m07300_m16 (KERN_ATTR_RULES_ESALT (rakp_t)) { } -__kernel void m07300_s04 (KERN_ATTR_RULES_ESALT (rakp_t)) +KERNEL_FQ void m07300_s04 (KERN_ATTR_RULES_ESALT (rakp_t)) { /** * modifier @@ -369,10 +369,10 @@ __kernel void m07300_s04 (KERN_ATTR_RULES_ESALT (rakp_t)) } } -__kernel void m07300_s08 (KERN_ATTR_RULES_ESALT (rakp_t)) +KERNEL_FQ void m07300_s08 (KERN_ATTR_RULES_ESALT (rakp_t)) { } -__kernel void m07300_s16 (KERN_ATTR_RULES_ESALT (rakp_t)) +KERNEL_FQ void m07300_s16 (KERN_ATTR_RULES_ESALT (rakp_t)) { } diff --git a/OpenCL/m07300_a0-pure.cl b/OpenCL/m07300_a0-pure.cl index 56c9722c0..879fbaa5b 100644 --- a/OpenCL/m07300_a0-pure.cl +++ b/OpenCL/m07300_a0-pure.cl @@ -22,7 +22,7 @@ typedef struct rakp } rakp_t; -__kernel void m07300_mxx (KERN_ATTR_RULES_ESALT (rakp_t)) +KERNEL_FQ void m07300_mxx (KERN_ATTR_RULES_ESALT (rakp_t)) { /** * modifier @@ -66,7 +66,7 @@ __kernel void m07300_mxx (KERN_ATTR_RULES_ESALT (rakp_t)) } } -__kernel void m07300_sxx (KERN_ATTR_RULES_ESALT (rakp_t)) +KERNEL_FQ void m07300_sxx (KERN_ATTR_RULES_ESALT (rakp_t)) { /** * modifier diff --git a/OpenCL/m07300_a1-optimized.cl b/OpenCL/m07300_a1-optimized.cl index 3929ff987..6ff695075 100644 --- a/OpenCL/m07300_a1-optimized.cl +++ b/OpenCL/m07300_a1-optimized.cl @@ -109,7 +109,7 @@ DECLSPEC void hmac_sha1_run (u32x *w0, u32x *w1, u32x *w2, u32x *w3, u32x *ipad, sha1_transform_vector (w0, w1, w2, w3, digest); } -__kernel void m07300_m04 (KERN_ATTR_ESALT (rakp_t)) +KERNEL_FQ void m07300_m04 (KERN_ATTR_ESALT (rakp_t)) { /** * modifier @@ -296,15 +296,15 @@ __kernel void m07300_m04 (KERN_ATTR_ESALT (rakp_t)) } } -__kernel void m07300_m08 (KERN_ATTR_ESALT (rakp_t)) +KERNEL_FQ void m07300_m08 (KERN_ATTR_ESALT (rakp_t)) { } -__kernel void m07300_m16 (KERN_ATTR_ESALT (rakp_t)) +KERNEL_FQ void m07300_m16 (KERN_ATTR_ESALT (rakp_t)) { } -__kernel void m07300_s04 (KERN_ATTR_ESALT (rakp_t)) +KERNEL_FQ void m07300_s04 (KERN_ATTR_ESALT (rakp_t)) { /** * modifier @@ -503,10 +503,10 @@ __kernel void m07300_s04 (KERN_ATTR_ESALT (rakp_t)) } } -__kernel void m07300_s08 (KERN_ATTR_ESALT (rakp_t)) +KERNEL_FQ void m07300_s08 (KERN_ATTR_ESALT (rakp_t)) { } -__kernel void m07300_s16 (KERN_ATTR_ESALT (rakp_t)) +KERNEL_FQ void m07300_s16 (KERN_ATTR_ESALT (rakp_t)) { } diff --git a/OpenCL/m07300_a1-pure.cl b/OpenCL/m07300_a1-pure.cl index 103e1745f..467585e82 100644 --- a/OpenCL/m07300_a1-pure.cl +++ b/OpenCL/m07300_a1-pure.cl @@ -20,7 +20,7 @@ typedef struct rakp } rakp_t; -__kernel void m07300_mxx (KERN_ATTR_ESALT (rakp_t)) +KERNEL_FQ void m07300_mxx (KERN_ATTR_ESALT (rakp_t)) { /** * modifier @@ -89,7 +89,7 @@ __kernel void m07300_mxx (KERN_ATTR_ESALT (rakp_t)) } } -__kernel void m07300_sxx (KERN_ATTR_ESALT (rakp_t)) +KERNEL_FQ void m07300_sxx (KERN_ATTR_ESALT (rakp_t)) { /** * modifier diff --git a/OpenCL/m07300_a3-optimized.cl b/OpenCL/m07300_a3-optimized.cl index d6d0387e9..7b9e7a78d 100644 --- a/OpenCL/m07300_a3-optimized.cl +++ b/OpenCL/m07300_a3-optimized.cl @@ -341,7 +341,7 @@ DECLSPEC void m07300s (u32 *w0, u32 *w1, u32 *w2, u32 *w3, const u32 pw_len, KER } } -__kernel void m07300_m04 (KERN_ATTR_ESALT (rakp_t)) +KERNEL_FQ void m07300_m04 (KERN_ATTR_ESALT (rakp_t)) { /** * base @@ -388,7 +388,7 @@ __kernel void m07300_m04 (KERN_ATTR_ESALT (rakp_t)) m07300m (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_extra0_buf, d_extra1_buf, d_extra2_buf, d_extra3_buf, bitmap_mask, bitmap_shift1, bitmap_shift2, salt_pos, loop_pos, loop_cnt, il_cnt, digests_cnt, digests_offset, combs_mode, gid_max); } -__kernel void m07300_m08 (KERN_ATTR_ESALT (rakp_t)) +KERNEL_FQ void m07300_m08 (KERN_ATTR_ESALT (rakp_t)) { /** * base @@ -435,7 +435,7 @@ __kernel void m07300_m08 (KERN_ATTR_ESALT (rakp_t)) m07300m (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_extra0_buf, d_extra1_buf, d_extra2_buf, d_extra3_buf, bitmap_mask, bitmap_shift1, bitmap_shift2, salt_pos, loop_pos, loop_cnt, il_cnt, digests_cnt, digests_offset, combs_mode, gid_max); } -__kernel void m07300_m16 (KERN_ATTR_ESALT (rakp_t)) +KERNEL_FQ void m07300_m16 (KERN_ATTR_ESALT (rakp_t)) { /** * base @@ -482,7 +482,7 @@ __kernel void m07300_m16 (KERN_ATTR_ESALT (rakp_t)) m07300m (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_extra0_buf, d_extra1_buf, d_extra2_buf, d_extra3_buf, bitmap_mask, bitmap_shift1, bitmap_shift2, salt_pos, loop_pos, loop_cnt, il_cnt, digests_cnt, digests_offset, combs_mode, gid_max); } -__kernel void m07300_s04 (KERN_ATTR_ESALT (rakp_t)) +KERNEL_FQ void m07300_s04 (KERN_ATTR_ESALT (rakp_t)) { /** * base @@ -529,7 +529,7 @@ __kernel void m07300_s04 (KERN_ATTR_ESALT (rakp_t)) m07300s (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_extra0_buf, d_extra1_buf, d_extra2_buf, d_extra3_buf, bitmap_mask, bitmap_shift1, bitmap_shift2, salt_pos, loop_pos, loop_cnt, il_cnt, digests_cnt, digests_offset, combs_mode, gid_max); } -__kernel void m07300_s08 (KERN_ATTR_ESALT (rakp_t)) +KERNEL_FQ void m07300_s08 (KERN_ATTR_ESALT (rakp_t)) { /** * base @@ -576,7 +576,7 @@ __kernel void m07300_s08 (KERN_ATTR_ESALT (rakp_t)) m07300s (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_extra0_buf, d_extra1_buf, d_extra2_buf, d_extra3_buf, bitmap_mask, bitmap_shift1, bitmap_shift2, salt_pos, loop_pos, loop_cnt, il_cnt, digests_cnt, digests_offset, combs_mode, gid_max); } -__kernel void m07300_s16 (KERN_ATTR_ESALT (rakp_t)) +KERNEL_FQ void m07300_s16 (KERN_ATTR_ESALT (rakp_t)) { /** * base diff --git a/OpenCL/m07300_a3-pure.cl b/OpenCL/m07300_a3-pure.cl index d6d209205..46237c1ee 100644 --- a/OpenCL/m07300_a3-pure.cl +++ b/OpenCL/m07300_a3-pure.cl @@ -20,7 +20,7 @@ typedef struct rakp } rakp_t; -__kernel void m07300_mxx (KERN_ATTR_VECTOR_ESALT (rakp_t)) +KERNEL_FQ void m07300_mxx (KERN_ATTR_VECTOR_ESALT (rakp_t)) { /** * modifier @@ -75,7 +75,7 @@ __kernel void m07300_mxx (KERN_ATTR_VECTOR_ESALT (rakp_t)) } } -__kernel void m07300_sxx (KERN_ATTR_VECTOR_ESALT (rakp_t)) +KERNEL_FQ void m07300_sxx (KERN_ATTR_VECTOR_ESALT (rakp_t)) { /** * modifier diff --git a/OpenCL/m07400-optimized.cl b/OpenCL/m07400-optimized.cl index 7bf302bc4..dfecb3486 100644 --- a/OpenCL/m07400-optimized.cl +++ b/OpenCL/m07400-optimized.cl @@ -678,7 +678,7 @@ DECLSPEC u32 memcat20_x80 (u32 *block, const u32 offset, const u32 *append, cons return offset + append_len; } -__kernel void m07400_init (KERN_ATTR_TMPS (sha256crypt_tmp_t)) +KERNEL_FQ void m07400_init (KERN_ATTR_TMPS (sha256crypt_tmp_t)) { /** * base @@ -927,7 +927,7 @@ __kernel void m07400_init (KERN_ATTR_TMPS (sha256crypt_tmp_t)) tmps[gid].s_bytes[3] = s_bytes[3]; } -__kernel void m07400_loop (KERN_ATTR_TMPS (sha256crypt_tmp_t)) +KERNEL_FQ void m07400_loop (KERN_ATTR_TMPS (sha256crypt_tmp_t)) { /** * base @@ -1090,7 +1090,7 @@ __kernel void m07400_loop (KERN_ATTR_TMPS (sha256crypt_tmp_t)) tmps[gid].alt_result[7] = alt_result[7]; } -__kernel void m07400_comp (KERN_ATTR_TMPS (sha256crypt_tmp_t)) +KERNEL_FQ void m07400_comp (KERN_ATTR_TMPS (sha256crypt_tmp_t)) { /** * base diff --git a/OpenCL/m07400-pure.cl b/OpenCL/m07400-pure.cl index 83db96f0a..d82e155c3 100644 --- a/OpenCL/m07400-pure.cl +++ b/OpenCL/m07400-pure.cl @@ -23,7 +23,7 @@ typedef struct sha256crypt_tmp } sha256crypt_tmp_t; -__kernel void m07400_init (KERN_ATTR_TMPS (sha256crypt_tmp_t)) +KERNEL_FQ void m07400_init (KERN_ATTR_TMPS (sha256crypt_tmp_t)) { /** * base @@ -260,7 +260,7 @@ __kernel void m07400_init (KERN_ATTR_TMPS (sha256crypt_tmp_t)) for (int i = 0; i < 64; i++) tmps[gid].s_bytes[i] = s_final[i]; } -__kernel void m07400_loop (KERN_ATTR_TMPS (sha256crypt_tmp_t)) +KERNEL_FQ void m07400_loop (KERN_ATTR_TMPS (sha256crypt_tmp_t)) { /** * base @@ -344,7 +344,7 @@ __kernel void m07400_loop (KERN_ATTR_TMPS (sha256crypt_tmp_t)) tmps[gid].alt_result[7] = alt_result[7]; } -__kernel void m07400_comp (KERN_ATTR_TMPS (sha256crypt_tmp_t)) +KERNEL_FQ void m07400_comp (KERN_ATTR_TMPS (sha256crypt_tmp_t)) { /** * base diff --git a/OpenCL/m07500_a0-optimized.cl b/OpenCL/m07500_a0-optimized.cl index 588948995..9640178fd 100644 --- a/OpenCL/m07500_a0-optimized.cl +++ b/OpenCL/m07500_a0-optimized.cl @@ -35,7 +35,7 @@ typedef struct } RC4_KEY; -DECLSPEC void swap (__local RC4_KEY *rc4_key, const u8 i, const u8 j) +DECLSPEC void swap (LOCAL_AS RC4_KEY *rc4_key, const u8 i, const u8 j) { u8 tmp; @@ -44,12 +44,12 @@ DECLSPEC void swap (__local RC4_KEY *rc4_key, const u8 i, const u8 j) rc4_key->S[j] = tmp; } -DECLSPEC void rc4_init_16 (__local RC4_KEY *rc4_key, const u32 *data) +DECLSPEC void rc4_init_16 (LOCAL_AS RC4_KEY *rc4_key, const u32 *data) { u32 v = 0x03020100; u32 a = 0x04040404; - __local u32 *ptr = (__local u32 *) rc4_key->S; + LOCAL_AS u32 *ptr = (LOCAL_AS u32 *) rc4_key->S; #ifdef _unroll #pragma unroll @@ -97,7 +97,7 @@ DECLSPEC void rc4_init_16 (__local RC4_KEY *rc4_key, const u32 *data) } } -DECLSPEC u8 rc4_next_16 (__local RC4_KEY *rc4_key, u8 i, u8 j, const u32 *in, u32 *out) +DECLSPEC u8 rc4_next_16 (LOCAL_AS RC4_KEY *rc4_key, u8 i, u8 j, const u32 *in, u32 *out) { #ifdef _unroll #pragma unroll @@ -150,7 +150,7 @@ DECLSPEC u8 rc4_next_16 (__local RC4_KEY *rc4_key, u8 i, u8 j, const u32 *in, u3 return j; } -DECLSPEC int decrypt_and_check (__local RC4_KEY *rc4_key, u32 *data, u32 *timestamp_ct) +DECLSPEC int decrypt_and_check (LOCAL_AS RC4_KEY *rc4_key, u32 *data, u32 *timestamp_ct) { rc4_init_16 (rc4_key, data); @@ -394,7 +394,7 @@ DECLSPEC void kerb_prepare (const u32 *w0, const u32 *w1, const u32 pw_len, cons hmac_md5_run (w0_t, w1_t, w2_t, w3_t, ipad, opad, digest); } -__kernel void m07500_m04 (KERN_ATTR_RULES_ESALT (krb5pa_t)) +KERNEL_FQ void m07500_m04 (KERN_ATTR_RULES_ESALT (krb5pa_t)) { /** * modifier @@ -450,9 +450,9 @@ __kernel void m07500_m04 (KERN_ATTR_RULES_ESALT (krb5pa_t)) * shared */ - __local RC4_KEY rc4_keys[64]; + LOCAL_AS RC4_KEY rc4_keys[64]; - __local RC4_KEY *rc4_key = &rc4_keys[lid]; + LOCAL_AS RC4_KEY *rc4_key = &rc4_keys[lid]; /** * loop @@ -492,15 +492,15 @@ __kernel void m07500_m04 (KERN_ATTR_RULES_ESALT (krb5pa_t)) } } -__kernel void m07500_m08 (KERN_ATTR_RULES_ESALT (krb5pa_t)) +KERNEL_FQ void m07500_m08 (KERN_ATTR_RULES_ESALT (krb5pa_t)) { } -__kernel void m07500_m16 (KERN_ATTR_RULES_ESALT (krb5pa_t)) +KERNEL_FQ void m07500_m16 (KERN_ATTR_RULES_ESALT (krb5pa_t)) { } -__kernel void m07500_s04 (KERN_ATTR_RULES_ESALT (krb5pa_t)) +KERNEL_FQ void m07500_s04 (KERN_ATTR_RULES_ESALT (krb5pa_t)) { /** * modifier @@ -556,9 +556,9 @@ __kernel void m07500_s04 (KERN_ATTR_RULES_ESALT (krb5pa_t)) * shared */ - __local RC4_KEY rc4_keys[64]; + LOCAL_AS RC4_KEY rc4_keys[64]; - __local RC4_KEY *rc4_key = &rc4_keys[lid]; + LOCAL_AS RC4_KEY *rc4_key = &rc4_keys[lid]; /** * loop @@ -598,10 +598,10 @@ __kernel void m07500_s04 (KERN_ATTR_RULES_ESALT (krb5pa_t)) } } -__kernel void m07500_s08 (KERN_ATTR_RULES_ESALT (krb5pa_t)) +KERNEL_FQ void m07500_s08 (KERN_ATTR_RULES_ESALT (krb5pa_t)) { } -__kernel void m07500_s16 (KERN_ATTR_RULES_ESALT (krb5pa_t)) +KERNEL_FQ void m07500_s16 (KERN_ATTR_RULES_ESALT (krb5pa_t)) { } diff --git a/OpenCL/m07500_a0-pure.cl b/OpenCL/m07500_a0-pure.cl index aabd80e7a..5540ccde5 100644 --- a/OpenCL/m07500_a0-pure.cl +++ b/OpenCL/m07500_a0-pure.cl @@ -34,7 +34,7 @@ typedef struct } RC4_KEY; -DECLSPEC void swap (__local RC4_KEY *rc4_key, const u8 i, const u8 j) +DECLSPEC void swap (LOCAL_AS RC4_KEY *rc4_key, const u8 i, const u8 j) { u8 tmp; @@ -43,12 +43,12 @@ DECLSPEC void swap (__local RC4_KEY *rc4_key, const u8 i, const u8 j) rc4_key->S[j] = tmp; } -DECLSPEC void rc4_init_16 (__local RC4_KEY *rc4_key, const u32 *data) +DECLSPEC void rc4_init_16 (LOCAL_AS RC4_KEY *rc4_key, const u32 *data) { u32 v = 0x03020100; u32 a = 0x04040404; - __local u32 *ptr = (__local u32 *) rc4_key->S; + LOCAL_AS u32 *ptr = (LOCAL_AS u32 *) rc4_key->S; #ifdef _unroll #pragma unroll @@ -96,7 +96,7 @@ DECLSPEC void rc4_init_16 (__local RC4_KEY *rc4_key, const u32 *data) } } -DECLSPEC u8 rc4_next_16 (__local RC4_KEY *rc4_key, u8 i, u8 j, const u32 *in, u32 *out) +DECLSPEC u8 rc4_next_16 (LOCAL_AS RC4_KEY *rc4_key, u8 i, u8 j, const u32 *in, u32 *out) { #ifdef _unroll #pragma unroll @@ -149,7 +149,7 @@ DECLSPEC u8 rc4_next_16 (__local RC4_KEY *rc4_key, u8 i, u8 j, const u32 *in, u3 return j; } -DECLSPEC int decrypt_and_check (__local RC4_KEY *rc4_key, u32 *data, u32 *timestamp_ct) +DECLSPEC int decrypt_and_check (LOCAL_AS RC4_KEY *rc4_key, u32 *data, u32 *timestamp_ct) { rc4_init_16 (rc4_key, data); @@ -278,7 +278,7 @@ DECLSPEC void kerb_prepare (const u32 *K, const u32 *checksum, u32 *digest) digest[3] = ctx.opad.h[3]; } -__kernel void m07500_mxx (KERN_ATTR_RULES_ESALT (krb5pa_t)) +KERNEL_FQ void m07500_mxx (KERN_ATTR_RULES_ESALT (krb5pa_t)) { /** * modifier @@ -295,9 +295,9 @@ __kernel void m07500_mxx (KERN_ATTR_RULES_ESALT (krb5pa_t)) COPY_PW (pws[gid]); - __local RC4_KEY rc4_keys[64]; + LOCAL_AS RC4_KEY rc4_keys[64]; - __local RC4_KEY *rc4_key = &rc4_keys[lid]; + LOCAL_AS RC4_KEY *rc4_key = &rc4_keys[lid]; u32 checksum[4]; @@ -349,7 +349,7 @@ __kernel void m07500_mxx (KERN_ATTR_RULES_ESALT (krb5pa_t)) } } -__kernel void m07500_sxx (KERN_ATTR_RULES_ESALT (krb5pa_t)) +KERNEL_FQ void m07500_sxx (KERN_ATTR_RULES_ESALT (krb5pa_t)) { /** * modifier @@ -366,9 +366,9 @@ __kernel void m07500_sxx (KERN_ATTR_RULES_ESALT (krb5pa_t)) COPY_PW (pws[gid]); - __local RC4_KEY rc4_keys[64]; + LOCAL_AS RC4_KEY rc4_keys[64]; - __local RC4_KEY *rc4_key = &rc4_keys[lid]; + LOCAL_AS RC4_KEY *rc4_key = &rc4_keys[lid]; u32 checksum[4]; diff --git a/OpenCL/m07500_a1-optimized.cl b/OpenCL/m07500_a1-optimized.cl index 6b48a6adb..7b0746d91 100644 --- a/OpenCL/m07500_a1-optimized.cl +++ b/OpenCL/m07500_a1-optimized.cl @@ -33,7 +33,7 @@ typedef struct } RC4_KEY; -DECLSPEC void swap (__local RC4_KEY *rc4_key, const u8 i, const u8 j) +DECLSPEC void swap (LOCAL_AS RC4_KEY *rc4_key, const u8 i, const u8 j) { u8 tmp; @@ -42,12 +42,12 @@ DECLSPEC void swap (__local RC4_KEY *rc4_key, const u8 i, const u8 j) rc4_key->S[j] = tmp; } -DECLSPEC void rc4_init_16 (__local RC4_KEY *rc4_key, const u32 *data) +DECLSPEC void rc4_init_16 (LOCAL_AS RC4_KEY *rc4_key, const u32 *data) { u32 v = 0x03020100; u32 a = 0x04040404; - __local u32 *ptr = (__local u32 *) rc4_key->S; + LOCAL_AS u32 *ptr = (LOCAL_AS u32 *) rc4_key->S; #ifdef _unroll #pragma unroll @@ -95,7 +95,7 @@ DECLSPEC void rc4_init_16 (__local RC4_KEY *rc4_key, const u32 *data) } } -DECLSPEC u8 rc4_next_16 (__local RC4_KEY *rc4_key, u8 i, u8 j, const u32 *in, u32 *out) +DECLSPEC u8 rc4_next_16 (LOCAL_AS RC4_KEY *rc4_key, u8 i, u8 j, const u32 *in, u32 *out) { #ifdef _unroll #pragma unroll @@ -148,7 +148,7 @@ DECLSPEC u8 rc4_next_16 (__local RC4_KEY *rc4_key, u8 i, u8 j, const u32 *in, u3 return j; } -DECLSPEC int decrypt_and_check (__local RC4_KEY *rc4_key, u32 *data, u32 *timestamp_ct) +DECLSPEC int decrypt_and_check (LOCAL_AS RC4_KEY *rc4_key, u32 *data, u32 *timestamp_ct) { rc4_init_16 (rc4_key, data); @@ -392,7 +392,7 @@ DECLSPEC void kerb_prepare (const u32 *w0, const u32 *w1, const u32 pw_len, cons hmac_md5_run (w0_t, w1_t, w2_t, w3_t, ipad, opad, digest); } -__kernel void m07500_m04 (KERN_ATTR_ESALT (krb5pa_t)) +KERNEL_FQ void m07500_m04 (KERN_ATTR_ESALT (krb5pa_t)) { /** * modifier @@ -448,9 +448,9 @@ __kernel void m07500_m04 (KERN_ATTR_ESALT (krb5pa_t)) * shared */ - __local RC4_KEY rc4_keys[64]; + LOCAL_AS RC4_KEY rc4_keys[64]; - __local RC4_KEY *rc4_key = &rc4_keys[lid]; + LOCAL_AS RC4_KEY *rc4_key = &rc4_keys[lid]; /** * loop @@ -540,15 +540,15 @@ __kernel void m07500_m04 (KERN_ATTR_ESALT (krb5pa_t)) } } -__kernel void m07500_m08 (KERN_ATTR_ESALT (krb5pa_t)) +KERNEL_FQ void m07500_m08 (KERN_ATTR_ESALT (krb5pa_t)) { } -__kernel void m07500_m16 (KERN_ATTR_ESALT (krb5pa_t)) +KERNEL_FQ void m07500_m16 (KERN_ATTR_ESALT (krb5pa_t)) { } -__kernel void m07500_s04 (KERN_ATTR_ESALT (krb5pa_t)) +KERNEL_FQ void m07500_s04 (KERN_ATTR_ESALT (krb5pa_t)) { /** * modifier @@ -604,9 +604,9 @@ __kernel void m07500_s04 (KERN_ATTR_ESALT (krb5pa_t)) * shared */ - __local RC4_KEY rc4_keys[64]; + LOCAL_AS RC4_KEY rc4_keys[64]; - __local RC4_KEY *rc4_key = &rc4_keys[lid]; + LOCAL_AS RC4_KEY *rc4_key = &rc4_keys[lid]; /** * loop @@ -696,10 +696,10 @@ __kernel void m07500_s04 (KERN_ATTR_ESALT (krb5pa_t)) } } -__kernel void m07500_s08 (KERN_ATTR_ESALT (krb5pa_t)) +KERNEL_FQ void m07500_s08 (KERN_ATTR_ESALT (krb5pa_t)) { } -__kernel void m07500_s16 (KERN_ATTR_ESALT (krb5pa_t)) +KERNEL_FQ void m07500_s16 (KERN_ATTR_ESALT (krb5pa_t)) { } diff --git a/OpenCL/m07500_a1-pure.cl b/OpenCL/m07500_a1-pure.cl index ae1bbe0c0..6ec806490 100644 --- a/OpenCL/m07500_a1-pure.cl +++ b/OpenCL/m07500_a1-pure.cl @@ -32,7 +32,7 @@ typedef struct } RC4_KEY; -DECLSPEC void swap (__local RC4_KEY *rc4_key, const u8 i, const u8 j) +DECLSPEC void swap (LOCAL_AS RC4_KEY *rc4_key, const u8 i, const u8 j) { u8 tmp; @@ -41,12 +41,12 @@ DECLSPEC void swap (__local RC4_KEY *rc4_key, const u8 i, const u8 j) rc4_key->S[j] = tmp; } -DECLSPEC void rc4_init_16 (__local RC4_KEY *rc4_key, const u32 *data) +DECLSPEC void rc4_init_16 (LOCAL_AS RC4_KEY *rc4_key, const u32 *data) { u32 v = 0x03020100; u32 a = 0x04040404; - __local u32 *ptr = (__local u32 *) rc4_key->S; + LOCAL_AS u32 *ptr = (LOCAL_AS u32 *) rc4_key->S; #ifdef _unroll #pragma unroll @@ -94,7 +94,7 @@ DECLSPEC void rc4_init_16 (__local RC4_KEY *rc4_key, const u32 *data) } } -DECLSPEC u8 rc4_next_16 (__local RC4_KEY *rc4_key, u8 i, u8 j, const u32 *in, u32 *out) +DECLSPEC u8 rc4_next_16 (LOCAL_AS RC4_KEY *rc4_key, u8 i, u8 j, const u32 *in, u32 *out) { #ifdef _unroll #pragma unroll @@ -147,7 +147,7 @@ DECLSPEC u8 rc4_next_16 (__local RC4_KEY *rc4_key, u8 i, u8 j, const u32 *in, u3 return j; } -DECLSPEC int decrypt_and_check (__local RC4_KEY *rc4_key, u32 *data, u32 *timestamp_ct) +DECLSPEC int decrypt_and_check (LOCAL_AS RC4_KEY *rc4_key, u32 *data, u32 *timestamp_ct) { rc4_init_16 (rc4_key, data); @@ -276,7 +276,7 @@ DECLSPEC void kerb_prepare (const u32 *K, const u32 *checksum, u32 *digest) digest[3] = ctx.opad.h[3]; } -__kernel void m07500_mxx (KERN_ATTR_ESALT (krb5pa_t)) +KERNEL_FQ void m07500_mxx (KERN_ATTR_ESALT (krb5pa_t)) { /** * modifier @@ -291,9 +291,9 @@ __kernel void m07500_mxx (KERN_ATTR_ESALT (krb5pa_t)) * base */ - __local RC4_KEY rc4_keys[64]; + LOCAL_AS RC4_KEY rc4_keys[64]; - __local RC4_KEY *rc4_key = &rc4_keys[lid]; + LOCAL_AS RC4_KEY *rc4_key = &rc4_keys[lid]; u32 checksum[4]; @@ -345,7 +345,7 @@ __kernel void m07500_mxx (KERN_ATTR_ESALT (krb5pa_t)) } } -__kernel void m07500_sxx (KERN_ATTR_ESALT (krb5pa_t)) +KERNEL_FQ void m07500_sxx (KERN_ATTR_ESALT (krb5pa_t)) { /** * modifier @@ -360,9 +360,9 @@ __kernel void m07500_sxx (KERN_ATTR_ESALT (krb5pa_t)) * base */ - __local RC4_KEY rc4_keys[64]; + LOCAL_AS RC4_KEY rc4_keys[64]; - __local RC4_KEY *rc4_key = &rc4_keys[lid]; + LOCAL_AS RC4_KEY *rc4_key = &rc4_keys[lid]; u32 checksum[4]; diff --git a/OpenCL/m07500_a3-optimized.cl b/OpenCL/m07500_a3-optimized.cl index 89cbf3b30..5f51f887e 100644 --- a/OpenCL/m07500_a3-optimized.cl +++ b/OpenCL/m07500_a3-optimized.cl @@ -33,7 +33,7 @@ typedef struct } RC4_KEY; -DECLSPEC void swap (__local RC4_KEY *rc4_key, const u8 i, const u8 j) +DECLSPEC void swap (LOCAL_AS RC4_KEY *rc4_key, const u8 i, const u8 j) { u8 tmp; @@ -42,12 +42,12 @@ DECLSPEC void swap (__local RC4_KEY *rc4_key, const u8 i, const u8 j) rc4_key->S[j] = tmp; } -DECLSPEC void rc4_init_16 (__local RC4_KEY *rc4_key, const u32 *data) +DECLSPEC void rc4_init_16 (LOCAL_AS RC4_KEY *rc4_key, const u32 *data) { u32 v = 0x03020100; u32 a = 0x04040404; - __local u32 *ptr = (__local u32 *) rc4_key->S; + LOCAL_AS u32 *ptr = (LOCAL_AS u32 *) rc4_key->S; #ifdef _unroll #pragma unroll @@ -95,7 +95,7 @@ DECLSPEC void rc4_init_16 (__local RC4_KEY *rc4_key, const u32 *data) } } -DECLSPEC u8 rc4_next_16 (__local RC4_KEY *rc4_key, u8 i, u8 j, const u32 *in, u32 *out) +DECLSPEC u8 rc4_next_16 (LOCAL_AS RC4_KEY *rc4_key, u8 i, u8 j, const u32 *in, u32 *out) { #ifdef _unroll #pragma unroll @@ -148,7 +148,7 @@ DECLSPEC u8 rc4_next_16 (__local RC4_KEY *rc4_key, u8 i, u8 j, const u32 *in, u3 return j; } -DECLSPEC int decrypt_and_check (__local RC4_KEY *rc4_key, u32 *data, u32 *timestamp_ct) +DECLSPEC int decrypt_and_check (LOCAL_AS RC4_KEY *rc4_key, u32 *data, u32 *timestamp_ct) { rc4_init_16 (rc4_key, data); @@ -392,7 +392,7 @@ DECLSPEC void kerb_prepare (const u32 *w0, const u32 *w1, const u32 pw_len, cons hmac_md5_run (w0_t, w1_t, w2_t, w3_t, ipad, opad, digest); } -DECLSPEC void m07500 (__local RC4_KEY *rc4_key, u32 *w0, u32 *w1, u32 *w2, u32 *w3, const u32 pw_len, KERN_ATTR_ESALT (krb5pa_t)) +DECLSPEC void m07500 (LOCAL_AS RC4_KEY *rc4_key, u32 *w0, u32 *w1, u32 *w2, u32 *w3, const u32 pw_len, KERN_ATTR_ESALT (krb5pa_t)) { /** * modifier @@ -482,7 +482,7 @@ DECLSPEC void m07500 (__local RC4_KEY *rc4_key, u32 *w0, u32 *w1, u32 *w2, u32 * } } -__kernel void m07500_m04 (KERN_ATTR_ESALT (krb5pa_t)) +KERNEL_FQ void m07500_m04 (KERN_ATTR_ESALT (krb5pa_t)) { /** * base @@ -527,14 +527,14 @@ __kernel void m07500_m04 (KERN_ATTR_ESALT (krb5pa_t)) * main */ - __local RC4_KEY rc4_keys[64]; + LOCAL_AS RC4_KEY rc4_keys[64]; - __local RC4_KEY *rc4_key = &rc4_keys[lid]; + LOCAL_AS RC4_KEY *rc4_key = &rc4_keys[lid]; m07500 (rc4_key, 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_extra0_buf, d_extra1_buf, d_extra2_buf, d_extra3_buf, bitmap_mask, bitmap_shift1, bitmap_shift2, salt_pos, loop_pos, loop_cnt, il_cnt, digests_cnt, digests_offset, combs_mode, gid_max); } -__kernel void m07500_m08 (KERN_ATTR_ESALT (krb5pa_t)) +KERNEL_FQ void m07500_m08 (KERN_ATTR_ESALT (krb5pa_t)) { /** * base @@ -579,18 +579,18 @@ __kernel void m07500_m08 (KERN_ATTR_ESALT (krb5pa_t)) * main */ - __local RC4_KEY rc4_keys[64]; + LOCAL_AS RC4_KEY rc4_keys[64]; - __local RC4_KEY *rc4_key = &rc4_keys[lid]; + LOCAL_AS RC4_KEY *rc4_key = &rc4_keys[lid]; m07500 (rc4_key, 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_extra0_buf, d_extra1_buf, d_extra2_buf, d_extra3_buf, bitmap_mask, bitmap_shift1, bitmap_shift2, salt_pos, loop_pos, loop_cnt, il_cnt, digests_cnt, digests_offset, combs_mode, gid_max); } -__kernel void m07500_m16 (KERN_ATTR_ESALT (krb5pa_t)) +KERNEL_FQ void m07500_m16 (KERN_ATTR_ESALT (krb5pa_t)) { } -__kernel void m07500_s04 (KERN_ATTR_ESALT (krb5pa_t)) +KERNEL_FQ void m07500_s04 (KERN_ATTR_ESALT (krb5pa_t)) { /** * base @@ -635,14 +635,14 @@ __kernel void m07500_s04 (KERN_ATTR_ESALT (krb5pa_t)) * main */ - __local RC4_KEY rc4_keys[64]; + LOCAL_AS RC4_KEY rc4_keys[64]; - __local RC4_KEY *rc4_key = &rc4_keys[lid]; + LOCAL_AS RC4_KEY *rc4_key = &rc4_keys[lid]; m07500 (rc4_key, 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_extra0_buf, d_extra1_buf, d_extra2_buf, d_extra3_buf, bitmap_mask, bitmap_shift1, bitmap_shift2, salt_pos, loop_pos, loop_cnt, il_cnt, digests_cnt, digests_offset, combs_mode, gid_max); } -__kernel void m07500_s08 (KERN_ATTR_ESALT (krb5pa_t)) +KERNEL_FQ void m07500_s08 (KERN_ATTR_ESALT (krb5pa_t)) { /** * base @@ -687,13 +687,13 @@ __kernel void m07500_s08 (KERN_ATTR_ESALT (krb5pa_t)) * main */ - __local RC4_KEY rc4_keys[64]; + LOCAL_AS RC4_KEY rc4_keys[64]; - __local RC4_KEY *rc4_key = &rc4_keys[lid]; + LOCAL_AS RC4_KEY *rc4_key = &rc4_keys[lid]; m07500 (rc4_key, 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_extra0_buf, d_extra1_buf, d_extra2_buf, d_extra3_buf, bitmap_mask, bitmap_shift1, bitmap_shift2, salt_pos, loop_pos, loop_cnt, il_cnt, digests_cnt, digests_offset, combs_mode, gid_max); } -__kernel void m07500_s16 (KERN_ATTR_ESALT (krb5pa_t)) +KERNEL_FQ void m07500_s16 (KERN_ATTR_ESALT (krb5pa_t)) { } diff --git a/OpenCL/m07500_a3-pure.cl b/OpenCL/m07500_a3-pure.cl index ad3bdfac0..48a5035f0 100644 --- a/OpenCL/m07500_a3-pure.cl +++ b/OpenCL/m07500_a3-pure.cl @@ -32,7 +32,7 @@ typedef struct } RC4_KEY; -DECLSPEC void swap (__local RC4_KEY *rc4_key, const u8 i, const u8 j) +DECLSPEC void swap (LOCAL_AS RC4_KEY *rc4_key, const u8 i, const u8 j) { u8 tmp; @@ -41,12 +41,12 @@ DECLSPEC void swap (__local RC4_KEY *rc4_key, const u8 i, const u8 j) rc4_key->S[j] = tmp; } -DECLSPEC void rc4_init_16 (__local RC4_KEY *rc4_key, const u32 *data) +DECLSPEC void rc4_init_16 (LOCAL_AS RC4_KEY *rc4_key, const u32 *data) { u32 v = 0x03020100; u32 a = 0x04040404; - __local u32 *ptr = (__local u32 *) rc4_key->S; + LOCAL_AS u32 *ptr = (LOCAL_AS u32 *) rc4_key->S; #ifdef _unroll #pragma unroll @@ -94,7 +94,7 @@ DECLSPEC void rc4_init_16 (__local RC4_KEY *rc4_key, const u32 *data) } } -DECLSPEC u8 rc4_next_16 (__local RC4_KEY *rc4_key, u8 i, u8 j, const u32 *in, u32 *out) +DECLSPEC u8 rc4_next_16 (LOCAL_AS RC4_KEY *rc4_key, u8 i, u8 j, const u32 *in, u32 *out) { #ifdef _unroll #pragma unroll @@ -147,7 +147,7 @@ DECLSPEC u8 rc4_next_16 (__local RC4_KEY *rc4_key, u8 i, u8 j, const u32 *in, u3 return j; } -DECLSPEC int decrypt_and_check (__local RC4_KEY *rc4_key, u32 *data, u32 *timestamp_ct) +DECLSPEC int decrypt_and_check (LOCAL_AS RC4_KEY *rc4_key, u32 *data, u32 *timestamp_ct) { rc4_init_16 (rc4_key, data); @@ -276,7 +276,7 @@ DECLSPEC void kerb_prepare (const u32 *K, const u32 *checksum, u32 *digest) digest[3] = ctx.opad.h[3]; } -__kernel void m07500_mxx (KERN_ATTR_VECTOR_ESALT (krb5pa_t)) +KERNEL_FQ void m07500_mxx (KERN_ATTR_VECTOR_ESALT (krb5pa_t)) { /** * modifier @@ -312,9 +312,9 @@ __kernel void m07500_mxx (KERN_ATTR_VECTOR_ESALT (krb5pa_t)) w[idx] = pws[gid].i[idx]; } - __local RC4_KEY rc4_keys[64]; + LOCAL_AS RC4_KEY rc4_keys[64]; - __local RC4_KEY *rc4_key = &rc4_keys[lid]; + LOCAL_AS RC4_KEY *rc4_key = &rc4_keys[lid]; u32 checksum[4]; @@ -370,7 +370,7 @@ __kernel void m07500_mxx (KERN_ATTR_VECTOR_ESALT (krb5pa_t)) } } -__kernel void m07500_sxx (KERN_ATTR_VECTOR_ESALT (krb5pa_t)) +KERNEL_FQ void m07500_sxx (KERN_ATTR_VECTOR_ESALT (krb5pa_t)) { /** * modifier @@ -406,9 +406,9 @@ __kernel void m07500_sxx (KERN_ATTR_VECTOR_ESALT (krb5pa_t)) w[idx] = pws[gid].i[idx]; } - __local RC4_KEY rc4_keys[64]; + LOCAL_AS RC4_KEY rc4_keys[64]; - __local RC4_KEY *rc4_key = &rc4_keys[lid]; + LOCAL_AS RC4_KEY *rc4_key = &rc4_keys[lid]; u32 checksum[4]; diff --git a/OpenCL/m07700_a0-optimized.cl b/OpenCL/m07700_a0-optimized.cl index bf24c1ac6..063ff6659 100644 --- a/OpenCL/m07700_a0-optimized.cl +++ b/OpenCL/m07700_a0-optimized.cl @@ -28,7 +28,7 @@ (a)[((n)/4)+1] = x >> 32; \ } -__constant u32a sapb_trans_tbl[256] = +CONSTANT_AS u32a sapb_trans_tbl[256] = { // first value hack for 0 byte as part of an optimization 0x00, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, @@ -49,7 +49,7 @@ __constant u32a sapb_trans_tbl[256] = 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff }; -__constant u32a bcodeArray[48] = +CONSTANT_AS u32a bcodeArray[48] = { 0x14, 0x77, 0xf3, 0xd4, 0xbb, 0x71, 0x23, 0xd0, 0x03, 0xff, 0x47, 0x93, 0x55, 0xaa, 0x66, 0x91, 0xf2, 0x88, 0x6b, 0x99, 0xbf, 0xcb, 0x32, 0x1a, 0x19, 0xd9, 0xa7, 0x82, 0x22, 0x49, 0xa2, 0x51, @@ -147,7 +147,7 @@ DECLSPEC u32 walld0rf_magic (const u32 *w0, const u32 pw_len, const u32 *salt_bu return sum20; } -__kernel void m07700_m04 (KERN_ATTR_RULES ()) +KERNEL_FQ void m07700_m04 (KERN_ATTR_RULES ()) { /** * modifier @@ -303,15 +303,15 @@ __kernel void m07700_m04 (KERN_ATTR_RULES ()) } } -__kernel void m07700_m08 (KERN_ATTR_RULES ()) +KERNEL_FQ void m07700_m08 (KERN_ATTR_RULES ()) { } -__kernel void m07700_m16 (KERN_ATTR_RULES ()) +KERNEL_FQ void m07700_m16 (KERN_ATTR_RULES ()) { } -__kernel void m07700_s04 (KERN_ATTR_RULES ()) +KERNEL_FQ void m07700_s04 (KERN_ATTR_RULES ()) { /** * modifier @@ -479,10 +479,10 @@ __kernel void m07700_s04 (KERN_ATTR_RULES ()) } } -__kernel void m07700_s08 (KERN_ATTR_RULES ()) +KERNEL_FQ void m07700_s08 (KERN_ATTR_RULES ()) { } -__kernel void m07700_s16 (KERN_ATTR_RULES ()) +KERNEL_FQ void m07700_s16 (KERN_ATTR_RULES ()) { } diff --git a/OpenCL/m07700_a1-optimized.cl b/OpenCL/m07700_a1-optimized.cl index 0b7de13a8..86dd31267 100644 --- a/OpenCL/m07700_a1-optimized.cl +++ b/OpenCL/m07700_a1-optimized.cl @@ -26,7 +26,7 @@ (a)[((n)/4)+1] = x >> 32; \ } -__constant u32a sapb_trans_tbl[256] = +CONSTANT_AS u32a sapb_trans_tbl[256] = { // first value hack for 0 byte as part of an optimization 0x00, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, @@ -47,7 +47,7 @@ __constant u32a sapb_trans_tbl[256] = 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff }; -__constant u32a bcodeArray[48] = +CONSTANT_AS u32a bcodeArray[48] = { 0x14, 0x77, 0xf3, 0xd4, 0xbb, 0x71, 0x23, 0xd0, 0x03, 0xff, 0x47, 0x93, 0x55, 0xaa, 0x66, 0x91, 0xf2, 0x88, 0x6b, 0x99, 0xbf, 0xcb, 0x32, 0x1a, 0x19, 0xd9, 0xa7, 0x82, 0x22, 0x49, 0xa2, 0x51, @@ -145,7 +145,7 @@ DECLSPEC u32 walld0rf_magic (const u32 *w0, const u32 pw_len, const u32 *salt_bu return sum20; } -__kernel void m07700_m04 (KERN_ATTR_BASIC ()) +KERNEL_FQ void m07700_m04 (KERN_ATTR_BASIC ()) { /** * modifier @@ -344,15 +344,15 @@ __kernel void m07700_m04 (KERN_ATTR_BASIC ()) } } -__kernel void m07700_m08 (KERN_ATTR_BASIC ()) +KERNEL_FQ void m07700_m08 (KERN_ATTR_BASIC ()) { } -__kernel void m07700_m16 (KERN_ATTR_BASIC ()) +KERNEL_FQ void m07700_m16 (KERN_ATTR_BASIC ()) { } -__kernel void m07700_s04 (KERN_ATTR_BASIC ()) +KERNEL_FQ void m07700_s04 (KERN_ATTR_BASIC ()) { /** * modifier @@ -563,10 +563,10 @@ __kernel void m07700_s04 (KERN_ATTR_BASIC ()) } } -__kernel void m07700_s08 (KERN_ATTR_BASIC ()) +KERNEL_FQ void m07700_s08 (KERN_ATTR_BASIC ()) { } -__kernel void m07700_s16 (KERN_ATTR_BASIC ()) +KERNEL_FQ void m07700_s16 (KERN_ATTR_BASIC ()) { } diff --git a/OpenCL/m07700_a3-optimized.cl b/OpenCL/m07700_a3-optimized.cl index bbc87f477..a3f3d7a62 100644 --- a/OpenCL/m07700_a3-optimized.cl +++ b/OpenCL/m07700_a3-optimized.cl @@ -17,7 +17,7 @@ #define GETCHAR(a,p) (((a)[(p) / 4] >> (((p) & 3) * 8)) & 0xff) #define PUTCHAR(a,p,c) ((a)[(p) / 4] = (((a)[(p) / 4] & ~(0xff << (((p) & 3) * 8))) | ((c) << (((p) & 3) * 8)))) -__constant u32a sapb_trans_tbl[256] = +CONSTANT_AS u32a sapb_trans_tbl[256] = { // first value hack for 0 byte as part of an optimization 0x00, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, @@ -38,7 +38,7 @@ __constant u32a sapb_trans_tbl[256] = 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff }; -__constant u32a bcodeArray[48] = +CONSTANT_AS u32a bcodeArray[48] = { 0x14, 0x77, 0xf3, 0xd4, 0xbb, 0x71, 0x23, 0xd0, 0x03, 0xff, 0x47, 0x93, 0x55, 0xaa, 0x66, 0x91, 0xf2, 0x88, 0x6b, 0x99, 0xbf, 0xcb, 0x32, 0x1a, 0x19, 0xd9, 0xa7, 0x82, 0x22, 0x49, 0xa2, 0x51, @@ -398,7 +398,7 @@ DECLSPEC void m07700s (u32 *w0, u32 *w1, u32 *w2, u32 *w3, const u32 pw_len, KER } } -__kernel void m07700_m04 (KERN_ATTR_BASIC ()) +KERNEL_FQ void m07700_m04 (KERN_ATTR_BASIC ()) { /** * base @@ -451,7 +451,7 @@ __kernel void m07700_m04 (KERN_ATTR_BASIC ()) m07700m (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_extra0_buf, d_extra1_buf, d_extra2_buf, d_extra3_buf, bitmap_mask, bitmap_shift1, bitmap_shift2, salt_pos, loop_pos, loop_cnt, il_cnt, digests_cnt, digests_offset, combs_mode, gid_max); } -__kernel void m07700_m08 (KERN_ATTR_BASIC ()) +KERNEL_FQ void m07700_m08 (KERN_ATTR_BASIC ()) { /** * base @@ -504,11 +504,11 @@ __kernel void m07700_m08 (KERN_ATTR_BASIC ()) m07700m (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_extra0_buf, d_extra1_buf, d_extra2_buf, d_extra3_buf, bitmap_mask, bitmap_shift1, bitmap_shift2, salt_pos, loop_pos, loop_cnt, il_cnt, digests_cnt, digests_offset, combs_mode, gid_max); } -__kernel void m07700_m16 (KERN_ATTR_BASIC ()) +KERNEL_FQ void m07700_m16 (KERN_ATTR_BASIC ()) { } -__kernel void m07700_s04 (KERN_ATTR_BASIC ()) +KERNEL_FQ void m07700_s04 (KERN_ATTR_BASIC ()) { /** * base @@ -561,7 +561,7 @@ __kernel void m07700_s04 (KERN_ATTR_BASIC ()) m07700s (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_extra0_buf, d_extra1_buf, d_extra2_buf, d_extra3_buf, bitmap_mask, bitmap_shift1, bitmap_shift2, salt_pos, loop_pos, loop_cnt, il_cnt, digests_cnt, digests_offset, combs_mode, gid_max); } -__kernel void m07700_s08 (KERN_ATTR_BASIC ()) +KERNEL_FQ void m07700_s08 (KERN_ATTR_BASIC ()) { /** * base @@ -614,6 +614,6 @@ __kernel void m07700_s08 (KERN_ATTR_BASIC ()) m07700s (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_extra0_buf, d_extra1_buf, d_extra2_buf, d_extra3_buf, bitmap_mask, bitmap_shift1, bitmap_shift2, salt_pos, loop_pos, loop_cnt, il_cnt, digests_cnt, digests_offset, combs_mode, gid_max); } -__kernel void m07700_s16 (KERN_ATTR_BASIC ()) +KERNEL_FQ void m07700_s16 (KERN_ATTR_BASIC ()) { } diff --git a/OpenCL/m07701_a0-optimized.cl b/OpenCL/m07701_a0-optimized.cl index f7393b769..45a13677e 100644 --- a/OpenCL/m07701_a0-optimized.cl +++ b/OpenCL/m07701_a0-optimized.cl @@ -28,7 +28,7 @@ (a)[((n)/4)+1] = x >> 32; \ } -__constant u32a sapb_trans_tbl[256] = +CONSTANT_AS u32a sapb_trans_tbl[256] = { // first value hack for 0 byte as part of an optimization 0x00, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, @@ -49,7 +49,7 @@ __constant u32a sapb_trans_tbl[256] = 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff }; -__constant u32a bcodeArray[48] = +CONSTANT_AS u32a bcodeArray[48] = { 0x14, 0x77, 0xf3, 0xd4, 0xbb, 0x71, 0x23, 0xd0, 0x03, 0xff, 0x47, 0x93, 0x55, 0xaa, 0x66, 0x91, 0xf2, 0x88, 0x6b, 0x99, 0xbf, 0xcb, 0x32, 0x1a, 0x19, 0xd9, 0xa7, 0x82, 0x22, 0x49, 0xa2, 0x51, @@ -147,7 +147,7 @@ DECLSPEC u32 walld0rf_magic (const u32 *w0, const u32 pw_len, const u32 *salt_bu return sum20; } -__kernel void m07701_m04 (KERN_ATTR_RULES ()) +KERNEL_FQ void m07701_m04 (KERN_ATTR_RULES ()) { /** * modifier @@ -303,15 +303,15 @@ __kernel void m07701_m04 (KERN_ATTR_RULES ()) } } -__kernel void m07701_m08 (KERN_ATTR_RULES ()) +KERNEL_FQ void m07701_m08 (KERN_ATTR_RULES ()) { } -__kernel void m07701_m16 (KERN_ATTR_RULES ()) +KERNEL_FQ void m07701_m16 (KERN_ATTR_RULES ()) { } -__kernel void m07701_s04 (KERN_ATTR_RULES ()) +KERNEL_FQ void m07701_s04 (KERN_ATTR_RULES ()) { /** * modifier @@ -479,10 +479,10 @@ __kernel void m07701_s04 (KERN_ATTR_RULES ()) } } -__kernel void m07701_s08 (KERN_ATTR_RULES ()) +KERNEL_FQ void m07701_s08 (KERN_ATTR_RULES ()) { } -__kernel void m07701_s16 (KERN_ATTR_RULES ()) +KERNEL_FQ void m07701_s16 (KERN_ATTR_RULES ()) { } diff --git a/OpenCL/m07701_a1-optimized.cl b/OpenCL/m07701_a1-optimized.cl index b6194b9a3..f73364987 100644 --- a/OpenCL/m07701_a1-optimized.cl +++ b/OpenCL/m07701_a1-optimized.cl @@ -26,7 +26,7 @@ (a)[((n)/4)+1] = x >> 32; \ } -__constant u32a sapb_trans_tbl[256] = +CONSTANT_AS u32a sapb_trans_tbl[256] = { // first value hack for 0 byte as part of an optimization 0x00, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, @@ -47,7 +47,7 @@ __constant u32a sapb_trans_tbl[256] = 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff }; -__constant u32a bcodeArray[48] = +CONSTANT_AS u32a bcodeArray[48] = { 0x14, 0x77, 0xf3, 0xd4, 0xbb, 0x71, 0x23, 0xd0, 0x03, 0xff, 0x47, 0x93, 0x55, 0xaa, 0x66, 0x91, 0xf2, 0x88, 0x6b, 0x99, 0xbf, 0xcb, 0x32, 0x1a, 0x19, 0xd9, 0xa7, 0x82, 0x22, 0x49, 0xa2, 0x51, @@ -145,7 +145,7 @@ DECLSPEC u32 walld0rf_magic (const u32 *w0, const u32 pw_len, const u32 *salt_bu return sum20; } -__kernel void m07701_m04 (KERN_ATTR_BASIC ()) +KERNEL_FQ void m07701_m04 (KERN_ATTR_BASIC ()) { /** * modifier @@ -344,15 +344,15 @@ __kernel void m07701_m04 (KERN_ATTR_BASIC ()) } } -__kernel void m07701_m08 (KERN_ATTR_BASIC ()) +KERNEL_FQ void m07701_m08 (KERN_ATTR_BASIC ()) { } -__kernel void m07701_m16 (KERN_ATTR_BASIC ()) +KERNEL_FQ void m07701_m16 (KERN_ATTR_BASIC ()) { } -__kernel void m07701_s04 (KERN_ATTR_BASIC ()) +KERNEL_FQ void m07701_s04 (KERN_ATTR_BASIC ()) { /** * modifier @@ -563,10 +563,10 @@ __kernel void m07701_s04 (KERN_ATTR_BASIC ()) } } -__kernel void m07701_s08 (KERN_ATTR_BASIC ()) +KERNEL_FQ void m07701_s08 (KERN_ATTR_BASIC ()) { } -__kernel void m07701_s16 (KERN_ATTR_BASIC ()) +KERNEL_FQ void m07701_s16 (KERN_ATTR_BASIC ()) { } diff --git a/OpenCL/m07701_a3-optimized.cl b/OpenCL/m07701_a3-optimized.cl index 0550d781d..b32c65f24 100644 --- a/OpenCL/m07701_a3-optimized.cl +++ b/OpenCL/m07701_a3-optimized.cl @@ -17,7 +17,7 @@ #define GETCHAR(a,p) (((a)[(p) / 4] >> (((p) & 3) * 8)) & 0xff) #define PUTCHAR(a,p,c) ((a)[(p) / 4] = (((a)[(p) / 4] & ~(0xff << (((p) & 3) * 8))) | ((c) << (((p) & 3) * 8)))) -__constant u32a sapb_trans_tbl[256] = +CONSTANT_AS u32a sapb_trans_tbl[256] = { // first value hack for 0 byte as part of an optimization 0x00, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, @@ -38,7 +38,7 @@ __constant u32a sapb_trans_tbl[256] = 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff }; -__constant u32a bcodeArray[48] = +CONSTANT_AS u32a bcodeArray[48] = { 0x14, 0x77, 0xf3, 0xd4, 0xbb, 0x71, 0x23, 0xd0, 0x03, 0xff, 0x47, 0x93, 0x55, 0xaa, 0x66, 0x91, 0xf2, 0x88, 0x6b, 0x99, 0xbf, 0xcb, 0x32, 0x1a, 0x19, 0xd9, 0xa7, 0x82, 0x22, 0x49, 0xa2, 0x51, @@ -398,7 +398,7 @@ DECLSPEC void m07701s (u32 *w0, u32 *w1, u32 *w2, u32 *w3, const u32 pw_len, KER } } -__kernel void m07701_m04 (KERN_ATTR_BASIC ()) +KERNEL_FQ void m07701_m04 (KERN_ATTR_BASIC ()) { /** * base @@ -451,7 +451,7 @@ __kernel void m07701_m04 (KERN_ATTR_BASIC ()) m07701m (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_extra0_buf, d_extra1_buf, d_extra2_buf, d_extra3_buf, bitmap_mask, bitmap_shift1, bitmap_shift2, salt_pos, loop_pos, loop_cnt, il_cnt, digests_cnt, digests_offset, combs_mode, gid_max); } -__kernel void m07701_m08 (KERN_ATTR_BASIC ()) +KERNEL_FQ void m07701_m08 (KERN_ATTR_BASIC ()) { /** * base @@ -504,11 +504,11 @@ __kernel void m07701_m08 (KERN_ATTR_BASIC ()) m07701m (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_extra0_buf, d_extra1_buf, d_extra2_buf, d_extra3_buf, bitmap_mask, bitmap_shift1, bitmap_shift2, salt_pos, loop_pos, loop_cnt, il_cnt, digests_cnt, digests_offset, combs_mode, gid_max); } -__kernel void m07701_m16 (KERN_ATTR_BASIC ()) +KERNEL_FQ void m07701_m16 (KERN_ATTR_BASIC ()) { } -__kernel void m07701_s04 (KERN_ATTR_BASIC ()) +KERNEL_FQ void m07701_s04 (KERN_ATTR_BASIC ()) { /** * base @@ -561,7 +561,7 @@ __kernel void m07701_s04 (KERN_ATTR_BASIC ()) m07701s (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_extra0_buf, d_extra1_buf, d_extra2_buf, d_extra3_buf, bitmap_mask, bitmap_shift1, bitmap_shift2, salt_pos, loop_pos, loop_cnt, il_cnt, digests_cnt, digests_offset, combs_mode, gid_max); } -__kernel void m07701_s08 (KERN_ATTR_BASIC ()) +KERNEL_FQ void m07701_s08 (KERN_ATTR_BASIC ()) { /** * base @@ -614,6 +614,6 @@ __kernel void m07701_s08 (KERN_ATTR_BASIC ()) m07701s (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_extra0_buf, d_extra1_buf, d_extra2_buf, d_extra3_buf, bitmap_mask, bitmap_shift1, bitmap_shift2, salt_pos, loop_pos, loop_cnt, il_cnt, digests_cnt, digests_offset, combs_mode, gid_max); } -__kernel void m07701_s16 (KERN_ATTR_BASIC ()) +KERNEL_FQ void m07701_s16 (KERN_ATTR_BASIC ()) { } diff --git a/OpenCL/m07800_a0-optimized.cl b/OpenCL/m07800_a0-optimized.cl index c68100907..0aecce5d5 100644 --- a/OpenCL/m07800_a0-optimized.cl +++ b/OpenCL/m07800_a0-optimized.cl @@ -16,7 +16,7 @@ #include "inc_hash_sha1.cl" #endif -__constant u32a theMagicArray[64] = +CONSTANT_AS u32a theMagicArray[64] = { 0x91ac5114, 0x9f675443, 0x24e73be0, 0x28747bc2, 0x863313eb, 0x5a4fcb5c, 0x080a7337, 0x0e5d1c2f, 0x338fe6e5, 0xf89baedd, 0x16f24b8d, 0x2ce1d4dc, 0xb0cbdf9d, 0xd4706d17, 0xf94d423f, 0x9b1b1194, @@ -28,7 +28,7 @@ __constant u32a theMagicArray[64] = 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, }; -DECLSPEC u32 GETSHIFTEDINT_CONST (__constant u32 *a, const int n) +DECLSPEC u32 GETSHIFTEDINT_CONST (CONSTANT_AS u32 *a, const int n) { const int d = n / 4; const int m = n & 3; @@ -53,7 +53,7 @@ DECLSPEC void SETSHIFTEDINT (u32 *a, const int n, const u32 v) a[d + 1] = l32_from_64_S (tmp); } -__kernel void m07800_m04 (KERN_ATTR_RULES ()) +KERNEL_FQ void m07800_m04 (KERN_ATTR_RULES ()) { /** * modifier @@ -293,15 +293,15 @@ __kernel void m07800_m04 (KERN_ATTR_RULES ()) } } -__kernel void m07800_m08 (KERN_ATTR_RULES ()) +KERNEL_FQ void m07800_m08 (KERN_ATTR_RULES ()) { } -__kernel void m07800_m16 (KERN_ATTR_RULES ()) +KERNEL_FQ void m07800_m16 (KERN_ATTR_RULES ()) { } -__kernel void m07800_s04 (KERN_ATTR_RULES ()) +KERNEL_FQ void m07800_s04 (KERN_ATTR_RULES ()) { /** * modifier @@ -553,10 +553,10 @@ __kernel void m07800_s04 (KERN_ATTR_RULES ()) } } -__kernel void m07800_s08 (KERN_ATTR_RULES ()) +KERNEL_FQ void m07800_s08 (KERN_ATTR_RULES ()) { } -__kernel void m07800_s16 (KERN_ATTR_RULES ()) +KERNEL_FQ void m07800_s16 (KERN_ATTR_RULES ()) { } diff --git a/OpenCL/m07800_a1-optimized.cl b/OpenCL/m07800_a1-optimized.cl index 7b349656e..e4836e03a 100644 --- a/OpenCL/m07800_a1-optimized.cl +++ b/OpenCL/m07800_a1-optimized.cl @@ -14,7 +14,7 @@ #include "inc_hash_sha1.cl" #endif -__constant u32a theMagicArray[64] = +CONSTANT_AS u32a theMagicArray[64] = { 0x91ac5114, 0x9f675443, 0x24e73be0, 0x28747bc2, 0x863313eb, 0x5a4fcb5c, 0x080a7337, 0x0e5d1c2f, 0x338fe6e5, 0xf89baedd, 0x16f24b8d, 0x2ce1d4dc, 0xb0cbdf9d, 0xd4706d17, 0xf94d423f, 0x9b1b1194, @@ -26,7 +26,7 @@ __constant u32a theMagicArray[64] = 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, }; -DECLSPEC u32 GETSHIFTEDINT_CONST (__constant u32 *a, const int n) +DECLSPEC u32 GETSHIFTEDINT_CONST (CONSTANT_AS u32 *a, const int n) { const int d = n / 4; const int m = n & 3; @@ -51,7 +51,7 @@ DECLSPEC void SETSHIFTEDINT (u32 *a, const int n, const u32 v) a[d + 1] = l32_from_64_S (tmp); } -__kernel void m07800_m04 (KERN_ATTR_BASIC ()) +KERNEL_FQ void m07800_m04 (KERN_ATTR_BASIC ()) { /** * modifier @@ -351,15 +351,15 @@ __kernel void m07800_m04 (KERN_ATTR_BASIC ()) } } -__kernel void m07800_m08 (KERN_ATTR_BASIC ()) +KERNEL_FQ void m07800_m08 (KERN_ATTR_BASIC ()) { } -__kernel void m07800_m16 (KERN_ATTR_BASIC ()) +KERNEL_FQ void m07800_m16 (KERN_ATTR_BASIC ()) { } -__kernel void m07800_s04 (KERN_ATTR_BASIC ()) +KERNEL_FQ void m07800_s04 (KERN_ATTR_BASIC ()) { /** * modifier @@ -671,10 +671,10 @@ __kernel void m07800_s04 (KERN_ATTR_BASIC ()) } } -__kernel void m07800_s08 (KERN_ATTR_BASIC ()) +KERNEL_FQ void m07800_s08 (KERN_ATTR_BASIC ()) { } -__kernel void m07800_s16 (KERN_ATTR_BASIC ()) +KERNEL_FQ void m07800_s16 (KERN_ATTR_BASIC ()) { } diff --git a/OpenCL/m07800_a3-optimized.cl b/OpenCL/m07800_a3-optimized.cl index 5c07ce01f..d6d61272e 100644 --- a/OpenCL/m07800_a3-optimized.cl +++ b/OpenCL/m07800_a3-optimized.cl @@ -14,7 +14,7 @@ #include "inc_hash_sha1.cl" #endif -__constant u32a theMagicArray[64] = +CONSTANT_AS u32a theMagicArray[64] = { 0x91ac5114, 0x9f675443, 0x24e73be0, 0x28747bc2, 0x863313eb, 0x5a4fcb5c, 0x080a7337, 0x0e5d1c2f, 0x338fe6e5, 0xf89baedd, 0x16f24b8d, 0x2ce1d4dc, 0xb0cbdf9d, 0xd4706d17, 0xf94d423f, 0x9b1b1194, @@ -26,7 +26,7 @@ __constant u32a theMagicArray[64] = 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, }; -DECLSPEC u32 GETSHIFTEDINT_CONST (__constant u32 *a, const int n) +DECLSPEC u32 GETSHIFTEDINT_CONST (CONSTANT_AS u32 *a, const int n) { const int d = n / 4; const int m = n & 3; @@ -495,7 +495,7 @@ DECLSPEC void m07800s (u32 *w0, u32 *w1, u32 *w2, u32 *w3, const u32 pw_len, KER } } -__kernel void m07800_m04 (KERN_ATTR_BASIC ()) +KERNEL_FQ void m07800_m04 (KERN_ATTR_BASIC ()) { /** * base @@ -548,7 +548,7 @@ __kernel void m07800_m04 (KERN_ATTR_BASIC ()) m07800m (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_extra0_buf, d_extra1_buf, d_extra2_buf, d_extra3_buf, bitmap_mask, bitmap_shift1, bitmap_shift2, salt_pos, loop_pos, loop_cnt, il_cnt, digests_cnt, digests_offset, combs_mode, gid_max); } -__kernel void m07800_m08 (KERN_ATTR_BASIC ()) +KERNEL_FQ void m07800_m08 (KERN_ATTR_BASIC ()) { /** * base @@ -601,11 +601,11 @@ __kernel void m07800_m08 (KERN_ATTR_BASIC ()) m07800m (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_extra0_buf, d_extra1_buf, d_extra2_buf, d_extra3_buf, bitmap_mask, bitmap_shift1, bitmap_shift2, salt_pos, loop_pos, loop_cnt, il_cnt, digests_cnt, digests_offset, combs_mode, gid_max); } -__kernel void m07800_m16 (KERN_ATTR_BASIC ()) +KERNEL_FQ void m07800_m16 (KERN_ATTR_BASIC ()) { } -__kernel void m07800_s04 (KERN_ATTR_BASIC ()) +KERNEL_FQ void m07800_s04 (KERN_ATTR_BASIC ()) { /** * base @@ -658,7 +658,7 @@ __kernel void m07800_s04 (KERN_ATTR_BASIC ()) m07800s (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_extra0_buf, d_extra1_buf, d_extra2_buf, d_extra3_buf, bitmap_mask, bitmap_shift1, bitmap_shift2, salt_pos, loop_pos, loop_cnt, il_cnt, digests_cnt, digests_offset, combs_mode, gid_max); } -__kernel void m07800_s08 (KERN_ATTR_BASIC ()) +KERNEL_FQ void m07800_s08 (KERN_ATTR_BASIC ()) { /** * base @@ -711,6 +711,6 @@ __kernel void m07800_s08 (KERN_ATTR_BASIC ()) m07800s (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_extra0_buf, d_extra1_buf, d_extra2_buf, d_extra3_buf, bitmap_mask, bitmap_shift1, bitmap_shift2, salt_pos, loop_pos, loop_cnt, il_cnt, digests_cnt, digests_offset, combs_mode, gid_max); } -__kernel void m07800_s16 (KERN_ATTR_BASIC ()) +KERNEL_FQ void m07800_s16 (KERN_ATTR_BASIC ()) { } diff --git a/OpenCL/m07801_a0-optimized.cl b/OpenCL/m07801_a0-optimized.cl index 3d0912ced..740982e07 100644 --- a/OpenCL/m07801_a0-optimized.cl +++ b/OpenCL/m07801_a0-optimized.cl @@ -16,7 +16,7 @@ #include "inc_hash_sha1.cl" #endif -__constant u32a theMagicArray[64] = +CONSTANT_AS u32a theMagicArray[64] = { 0x91ac5114, 0x9f675443, 0x24e73be0, 0x28747bc2, 0x863313eb, 0x5a4fcb5c, 0x080a7337, 0x0e5d1c2f, 0x338fe6e5, 0xf89baedd, 0x16f24b8d, 0x2ce1d4dc, 0xb0cbdf9d, 0xd4706d17, 0xf94d423f, 0x9b1b1194, @@ -28,7 +28,7 @@ __constant u32a theMagicArray[64] = 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, }; -DECLSPEC u32 GETSHIFTEDINT_CONST (__constant u32 *a, const int n) +DECLSPEC u32 GETSHIFTEDINT_CONST (CONSTANT_AS u32 *a, const int n) { const int d = n / 4; const int m = n & 3; @@ -53,7 +53,7 @@ DECLSPEC void SETSHIFTEDINT (u32 *a, const int n, const u32 v) a[d + 1] = l32_from_64_S (tmp); } -__kernel void m07801_m04 (KERN_ATTR_RULES ()) +KERNEL_FQ void m07801_m04 (KERN_ATTR_RULES ()) { /** * modifier @@ -293,15 +293,15 @@ __kernel void m07801_m04 (KERN_ATTR_RULES ()) } } -__kernel void m07801_m08 (KERN_ATTR_RULES ()) +KERNEL_FQ void m07801_m08 (KERN_ATTR_RULES ()) { } -__kernel void m07801_m16 (KERN_ATTR_RULES ()) +KERNEL_FQ void m07801_m16 (KERN_ATTR_RULES ()) { } -__kernel void m07801_s04 (KERN_ATTR_RULES ()) +KERNEL_FQ void m07801_s04 (KERN_ATTR_RULES ()) { /** * modifier @@ -553,10 +553,10 @@ __kernel void m07801_s04 (KERN_ATTR_RULES ()) } } -__kernel void m07801_s08 (KERN_ATTR_RULES ()) +KERNEL_FQ void m07801_s08 (KERN_ATTR_RULES ()) { } -__kernel void m07801_s16 (KERN_ATTR_RULES ()) +KERNEL_FQ void m07801_s16 (KERN_ATTR_RULES ()) { } diff --git a/OpenCL/m07801_a1-optimized.cl b/OpenCL/m07801_a1-optimized.cl index f6f3426f3..1e9f163fa 100644 --- a/OpenCL/m07801_a1-optimized.cl +++ b/OpenCL/m07801_a1-optimized.cl @@ -14,7 +14,7 @@ #include "inc_hash_sha1.cl" #endif -__constant u32a theMagicArray[64] = +CONSTANT_AS u32a theMagicArray[64] = { 0x91ac5114, 0x9f675443, 0x24e73be0, 0x28747bc2, 0x863313eb, 0x5a4fcb5c, 0x080a7337, 0x0e5d1c2f, 0x338fe6e5, 0xf89baedd, 0x16f24b8d, 0x2ce1d4dc, 0xb0cbdf9d, 0xd4706d17, 0xf94d423f, 0x9b1b1194, @@ -26,7 +26,7 @@ __constant u32a theMagicArray[64] = 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, }; -DECLSPEC u32 GETSHIFTEDINT_CONST (__constant u32 *a, const int n) +DECLSPEC u32 GETSHIFTEDINT_CONST (CONSTANT_AS u32 *a, const int n) { const int d = n / 4; const int m = n & 3; @@ -51,7 +51,7 @@ DECLSPEC void SETSHIFTEDINT (u32 *a, const int n, const u32 v) a[d + 1] = l32_from_64_S (tmp); } -__kernel void m07801_m04 (KERN_ATTR_BASIC ()) +KERNEL_FQ void m07801_m04 (KERN_ATTR_BASIC ()) { /** * modifier @@ -351,15 +351,15 @@ __kernel void m07801_m04 (KERN_ATTR_BASIC ()) } } -__kernel void m07801_m08 (KERN_ATTR_BASIC ()) +KERNEL_FQ void m07801_m08 (KERN_ATTR_BASIC ()) { } -__kernel void m07801_m16 (KERN_ATTR_BASIC ()) +KERNEL_FQ void m07801_m16 (KERN_ATTR_BASIC ()) { } -__kernel void m07801_s04 (KERN_ATTR_BASIC ()) +KERNEL_FQ void m07801_s04 (KERN_ATTR_BASIC ()) { /** * modifier @@ -671,10 +671,10 @@ __kernel void m07801_s04 (KERN_ATTR_BASIC ()) } } -__kernel void m07801_s08 (KERN_ATTR_BASIC ()) +KERNEL_FQ void m07801_s08 (KERN_ATTR_BASIC ()) { } -__kernel void m07801_s16 (KERN_ATTR_BASIC ()) +KERNEL_FQ void m07801_s16 (KERN_ATTR_BASIC ()) { } diff --git a/OpenCL/m07801_a3-optimized.cl b/OpenCL/m07801_a3-optimized.cl index a37597375..56be27778 100644 --- a/OpenCL/m07801_a3-optimized.cl +++ b/OpenCL/m07801_a3-optimized.cl @@ -14,7 +14,7 @@ #include "inc_hash_sha1.cl" #endif -__constant u32a theMagicArray[64] = +CONSTANT_AS u32a theMagicArray[64] = { 0x91ac5114, 0x9f675443, 0x24e73be0, 0x28747bc2, 0x863313eb, 0x5a4fcb5c, 0x080a7337, 0x0e5d1c2f, 0x338fe6e5, 0xf89baedd, 0x16f24b8d, 0x2ce1d4dc, 0xb0cbdf9d, 0xd4706d17, 0xf94d423f, 0x9b1b1194, @@ -26,7 +26,7 @@ __constant u32a theMagicArray[64] = 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, }; -DECLSPEC u32 GETSHIFTEDINT_CONST (__constant u32 *a, const int n) +DECLSPEC u32 GETSHIFTEDINT_CONST (CONSTANT_AS u32 *a, const int n) { const int d = n / 4; const int m = n & 3; @@ -495,7 +495,7 @@ DECLSPEC void m07801s (u32 *w0, u32 *w1, u32 *w2, u32 *w3, const u32 pw_len, KER } } -__kernel void m07801_m04 (KERN_ATTR_BASIC ()) +KERNEL_FQ void m07801_m04 (KERN_ATTR_BASIC ()) { /** * base @@ -548,7 +548,7 @@ __kernel void m07801_m04 (KERN_ATTR_BASIC ()) m07801m (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_extra0_buf, d_extra1_buf, d_extra2_buf, d_extra3_buf, bitmap_mask, bitmap_shift1, bitmap_shift2, salt_pos, loop_pos, loop_cnt, il_cnt, digests_cnt, digests_offset, combs_mode, gid_max); } -__kernel void m07801_m08 (KERN_ATTR_BASIC ()) +KERNEL_FQ void m07801_m08 (KERN_ATTR_BASIC ()) { /** * base @@ -601,11 +601,11 @@ __kernel void m07801_m08 (KERN_ATTR_BASIC ()) m07801m (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_extra0_buf, d_extra1_buf, d_extra2_buf, d_extra3_buf, bitmap_mask, bitmap_shift1, bitmap_shift2, salt_pos, loop_pos, loop_cnt, il_cnt, digests_cnt, digests_offset, combs_mode, gid_max); } -__kernel void m07801_m16 (KERN_ATTR_BASIC ()) +KERNEL_FQ void m07801_m16 (KERN_ATTR_BASIC ()) { } -__kernel void m07801_s04 (KERN_ATTR_BASIC ()) +KERNEL_FQ void m07801_s04 (KERN_ATTR_BASIC ()) { /** * base @@ -658,7 +658,7 @@ __kernel void m07801_s04 (KERN_ATTR_BASIC ()) m07801s (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_extra0_buf, d_extra1_buf, d_extra2_buf, d_extra3_buf, bitmap_mask, bitmap_shift1, bitmap_shift2, salt_pos, loop_pos, loop_cnt, il_cnt, digests_cnt, digests_offset, combs_mode, gid_max); } -__kernel void m07801_s08 (KERN_ATTR_BASIC ()) +KERNEL_FQ void m07801_s08 (KERN_ATTR_BASIC ()) { /** * base @@ -711,6 +711,6 @@ __kernel void m07801_s08 (KERN_ATTR_BASIC ()) m07801s (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_extra0_buf, d_extra1_buf, d_extra2_buf, d_extra3_buf, bitmap_mask, bitmap_shift1, bitmap_shift2, salt_pos, loop_pos, loop_cnt, il_cnt, digests_cnt, digests_offset, combs_mode, gid_max); } -__kernel void m07801_s16 (KERN_ATTR_BASIC ()) +KERNEL_FQ void m07801_s16 (KERN_ATTR_BASIC ()) { } diff --git a/OpenCL/m07900-pure.cl b/OpenCL/m07900-pure.cl index b0a428d79..b599e3385 100644 --- a/OpenCL/m07900-pure.cl +++ b/OpenCL/m07900-pure.cl @@ -19,7 +19,7 @@ typedef struct drupal7_tmp } drupal7_tmp_t; -__kernel void m07900_init (KERN_ATTR_TMPS (drupal7_tmp_t)) +KERNEL_FQ void m07900_init (KERN_ATTR_TMPS (drupal7_tmp_t)) { /** * base @@ -49,7 +49,7 @@ __kernel void m07900_init (KERN_ATTR_TMPS (drupal7_tmp_t)) tmps[gid].digest_buf[7] = ctx.h[7]; } -__kernel void m07900_loop (KERN_ATTR_TMPS (drupal7_tmp_t)) +KERNEL_FQ void m07900_loop (KERN_ATTR_TMPS (drupal7_tmp_t)) { /** * base @@ -215,7 +215,7 @@ __kernel void m07900_loop (KERN_ATTR_TMPS (drupal7_tmp_t)) tmps[gid].digest_buf[7] = digest[7]; } -__kernel void m07900_comp (KERN_ATTR_TMPS (drupal7_tmp_t)) +KERNEL_FQ void m07900_comp (KERN_ATTR_TMPS (drupal7_tmp_t)) { /** * modifier diff --git a/OpenCL/m08000_a0-optimized.cl b/OpenCL/m08000_a0-optimized.cl index b3dcac0f4..fa5f1cf7b 100644 --- a/OpenCL/m08000_a0-optimized.cl +++ b/OpenCL/m08000_a0-optimized.cl @@ -154,7 +154,7 @@ DECLSPEC void sha256_transform_z (u32x *digest) digest[7] += h; } -DECLSPEC void sha256_transform_s (u32x *digest, __local u32 *w) +DECLSPEC void sha256_transform_s (u32x *digest, LOCAL_AS u32 *w) { u32x a = digest[0]; u32x b = digest[1]; @@ -205,7 +205,7 @@ DECLSPEC void sha256_transform_s (u32x *digest, __local u32 *w) digest[7] += h; } -__kernel void m08000_m04 (KERN_ATTR_RULES ()) +KERNEL_FQ void m08000_m04 (KERN_ATTR_RULES ()) { /** * modifier @@ -227,8 +227,8 @@ __kernel void m08000_m04 (KERN_ATTR_RULES ()) * precompute final msg blocks */ - __local u32 w_s1[64]; - __local u32 w_s2[64]; + LOCAL_AS u32 w_s1[64]; + LOCAL_AS u32 w_s2[64]; for (u32 i = lid; i < 64; i += lsz) { @@ -368,15 +368,15 @@ __kernel void m08000_m04 (KERN_ATTR_RULES ()) } } -__kernel void m08000_m08 (KERN_ATTR_RULES ()) +KERNEL_FQ void m08000_m08 (KERN_ATTR_RULES ()) { } -__kernel void m08000_m16 (KERN_ATTR_RULES ()) +KERNEL_FQ void m08000_m16 (KERN_ATTR_RULES ()) { } -__kernel void m08000_s04 (KERN_ATTR_RULES ()) +KERNEL_FQ void m08000_s04 (KERN_ATTR_RULES ()) { /** * modifier @@ -398,8 +398,8 @@ __kernel void m08000_s04 (KERN_ATTR_RULES ()) * precompute final msg blocks */ - __local u32 w_s1[64]; - __local u32 w_s2[64]; + LOCAL_AS u32 w_s1[64]; + LOCAL_AS u32 w_s2[64]; for (u32 i = lid; i < 64; i += lsz) { @@ -551,10 +551,10 @@ __kernel void m08000_s04 (KERN_ATTR_RULES ()) } } -__kernel void m08000_s08 (KERN_ATTR_RULES ()) +KERNEL_FQ void m08000_s08 (KERN_ATTR_RULES ()) { } -__kernel void m08000_s16 (KERN_ATTR_RULES ()) +KERNEL_FQ void m08000_s16 (KERN_ATTR_RULES ()) { } diff --git a/OpenCL/m08000_a1-optimized.cl b/OpenCL/m08000_a1-optimized.cl index 379e8a2c2..84f7767a3 100644 --- a/OpenCL/m08000_a1-optimized.cl +++ b/OpenCL/m08000_a1-optimized.cl @@ -152,7 +152,7 @@ DECLSPEC void sha256_transform_z (u32x *digest) digest[7] += h; } -DECLSPEC void sha256_transform_s (u32x *digest, __local u32 *w) +DECLSPEC void sha256_transform_s (u32x *digest, LOCAL_AS u32 *w) { u32x a = digest[0]; u32x b = digest[1]; @@ -203,7 +203,7 @@ DECLSPEC void sha256_transform_s (u32x *digest, __local u32 *w) digest[7] += h; } -__kernel void m08000_m04 (KERN_ATTR_BASIC ()) +KERNEL_FQ void m08000_m04 (KERN_ATTR_BASIC ()) { /** * modifier @@ -225,8 +225,8 @@ __kernel void m08000_m04 (KERN_ATTR_BASIC ()) * precompute final msg blocks */ - __local u32 w_s1[64]; - __local u32 w_s2[64]; + LOCAL_AS u32 w_s1[64]; + LOCAL_AS u32 w_s2[64]; for (u32 i = lid; i < 64; i += lsz) { @@ -420,15 +420,15 @@ __kernel void m08000_m04 (KERN_ATTR_BASIC ()) } } -__kernel void m08000_m08 (KERN_ATTR_BASIC ()) +KERNEL_FQ void m08000_m08 (KERN_ATTR_BASIC ()) { } -__kernel void m08000_m16 (KERN_ATTR_BASIC ()) +KERNEL_FQ void m08000_m16 (KERN_ATTR_BASIC ()) { } -__kernel void m08000_s04 (KERN_ATTR_BASIC ()) +KERNEL_FQ void m08000_s04 (KERN_ATTR_BASIC ()) { /** * modifier @@ -450,8 +450,8 @@ __kernel void m08000_s04 (KERN_ATTR_BASIC ()) * precompute final msg blocks */ - __local u32 w_s1[64]; - __local u32 w_s2[64]; + LOCAL_AS u32 w_s1[64]; + LOCAL_AS u32 w_s2[64]; for (u32 i = lid; i < 64; i += lsz) { @@ -657,10 +657,10 @@ __kernel void m08000_s04 (KERN_ATTR_BASIC ()) } } -__kernel void m08000_s08 (KERN_ATTR_BASIC ()) +KERNEL_FQ void m08000_s08 (KERN_ATTR_BASIC ()) { } -__kernel void m08000_s16 (KERN_ATTR_BASIC ()) +KERNEL_FQ void m08000_s16 (KERN_ATTR_BASIC ()) { } diff --git a/OpenCL/m08000_a3-optimized.cl b/OpenCL/m08000_a3-optimized.cl index 617f72e88..15f2d3251 100644 --- a/OpenCL/m08000_a3-optimized.cl +++ b/OpenCL/m08000_a3-optimized.cl @@ -152,7 +152,7 @@ DECLSPEC void sha256_transform_z (u32x *digest) digest[7] += h; } -DECLSPEC void sha256_transform_s (u32x *digest, __local u32 *w) +DECLSPEC void sha256_transform_s (u32x *digest, LOCAL_AS u32 *w) { u32x a = digest[0]; u32x b = digest[1]; @@ -203,7 +203,7 @@ DECLSPEC void sha256_transform_s (u32x *digest, __local u32 *w) digest[7] += h; } -DECLSPEC void m08000m (__local u32 *w_s1, __local u32 *w_s2, u32 *w, const u32 pw_len, KERN_ATTR_VECTOR ()) +DECLSPEC void m08000m (LOCAL_AS u32 *w_s1, LOCAL_AS u32 *w_s2, u32 *w, const u32 pw_len, KERN_ATTR_VECTOR ()) { /** * modifier @@ -325,7 +325,7 @@ DECLSPEC void m08000m (__local u32 *w_s1, __local u32 *w_s2, u32 *w, const u32 p } } -DECLSPEC void m08000s (__local u32 *w_s1, __local u32 *w_s2, u32 *w, const u32 pw_len, KERN_ATTR_VECTOR ()) +DECLSPEC void m08000s (LOCAL_AS u32 *w_s1, LOCAL_AS u32 *w_s2, u32 *w, const u32 pw_len, KERN_ATTR_VECTOR ()) { /** * modifier @@ -459,7 +459,7 @@ DECLSPEC void m08000s (__local u32 *w_s1, __local u32 *w_s2, u32 *w, const u32 p } } -__kernel void m08000_m04 (KERN_ATTR_VECTOR ()) +KERNEL_FQ void m08000_m04 (KERN_ATTR_VECTOR ()) { /** * base @@ -488,8 +488,8 @@ __kernel void m08000_m04 (KERN_ATTR_VECTOR ()) const u32 pw_len = pws[gid].pw_len & 63; - __local u32 w_s1[64]; - __local u32 w_s2[64]; + LOCAL_AS u32 w_s1[64]; + LOCAL_AS u32 w_s2[64]; /** * main @@ -498,7 +498,7 @@ __kernel void m08000_m04 (KERN_ATTR_VECTOR ()) m08000m (w_s1, w_s2, w, pw_len, pws, rules_buf, combs_buf, words_buf_r, 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_extra0_buf, d_extra1_buf, d_extra2_buf, d_extra3_buf, bitmap_mask, bitmap_shift1, bitmap_shift2, salt_pos, loop_pos, loop_cnt, il_cnt, digests_cnt, digests_offset, combs_mode, gid_max); } -__kernel void m08000_m08 (KERN_ATTR_VECTOR ()) +KERNEL_FQ void m08000_m08 (KERN_ATTR_VECTOR ()) { /** * base @@ -527,8 +527,8 @@ __kernel void m08000_m08 (KERN_ATTR_VECTOR ()) const u32 pw_len = pws[gid].pw_len & 63; - __local u32 w_s1[64]; - __local u32 w_s2[64]; + LOCAL_AS u32 w_s1[64]; + LOCAL_AS u32 w_s2[64]; /** * main @@ -537,7 +537,7 @@ __kernel void m08000_m08 (KERN_ATTR_VECTOR ()) m08000m (w_s1, w_s2, w, pw_len, pws, rules_buf, combs_buf, words_buf_r, 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_extra0_buf, d_extra1_buf, d_extra2_buf, d_extra3_buf, bitmap_mask, bitmap_shift1, bitmap_shift2, salt_pos, loop_pos, loop_cnt, il_cnt, digests_cnt, digests_offset, combs_mode, gid_max); } -__kernel void m08000_m16 (KERN_ATTR_VECTOR ()) +KERNEL_FQ void m08000_m16 (KERN_ATTR_VECTOR ()) { /** * base @@ -566,8 +566,8 @@ __kernel void m08000_m16 (KERN_ATTR_VECTOR ()) const u32 pw_len = pws[gid].pw_len & 63; - __local u32 w_s1[64]; - __local u32 w_s2[64]; + LOCAL_AS u32 w_s1[64]; + LOCAL_AS u32 w_s2[64]; /** * main @@ -576,7 +576,7 @@ __kernel void m08000_m16 (KERN_ATTR_VECTOR ()) m08000m (w_s1, w_s2, w, pw_len, pws, rules_buf, combs_buf, words_buf_r, 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_extra0_buf, d_extra1_buf, d_extra2_buf, d_extra3_buf, bitmap_mask, bitmap_shift1, bitmap_shift2, salt_pos, loop_pos, loop_cnt, il_cnt, digests_cnt, digests_offset, combs_mode, gid_max); } -__kernel void m08000_s04 (KERN_ATTR_VECTOR ()) +KERNEL_FQ void m08000_s04 (KERN_ATTR_VECTOR ()) { /** * base @@ -605,8 +605,8 @@ __kernel void m08000_s04 (KERN_ATTR_VECTOR ()) const u32 pw_len = pws[gid].pw_len & 63; - __local u32 w_s1[64]; - __local u32 w_s2[64]; + LOCAL_AS u32 w_s1[64]; + LOCAL_AS u32 w_s2[64]; /** * main @@ -615,7 +615,7 @@ __kernel void m08000_s04 (KERN_ATTR_VECTOR ()) m08000s (w_s1, w_s2, w, pw_len, pws, rules_buf, combs_buf, words_buf_r, 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_extra0_buf, d_extra1_buf, d_extra2_buf, d_extra3_buf, bitmap_mask, bitmap_shift1, bitmap_shift2, salt_pos, loop_pos, loop_cnt, il_cnt, digests_cnt, digests_offset, combs_mode, gid_max); } -__kernel void m08000_s08 (KERN_ATTR_VECTOR ()) +KERNEL_FQ void m08000_s08 (KERN_ATTR_VECTOR ()) { /** * base @@ -644,8 +644,8 @@ __kernel void m08000_s08 (KERN_ATTR_VECTOR ()) const u32 pw_len = pws[gid].pw_len & 63; - __local u32 w_s1[64]; - __local u32 w_s2[64]; + LOCAL_AS u32 w_s1[64]; + LOCAL_AS u32 w_s2[64]; /** * main @@ -654,7 +654,7 @@ __kernel void m08000_s08 (KERN_ATTR_VECTOR ()) m08000s (w_s1, w_s2, w, pw_len, pws, rules_buf, combs_buf, words_buf_r, 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_extra0_buf, d_extra1_buf, d_extra2_buf, d_extra3_buf, bitmap_mask, bitmap_shift1, bitmap_shift2, salt_pos, loop_pos, loop_cnt, il_cnt, digests_cnt, digests_offset, combs_mode, gid_max); } -__kernel void m08000_s16 (KERN_ATTR_VECTOR ()) +KERNEL_FQ void m08000_s16 (KERN_ATTR_VECTOR ()) { /** * base @@ -683,8 +683,8 @@ __kernel void m08000_s16 (KERN_ATTR_VECTOR ()) const u32 pw_len = pws[gid].pw_len & 63; - __local u32 w_s1[64]; - __local u32 w_s2[64]; + LOCAL_AS u32 w_s1[64]; + LOCAL_AS u32 w_s2[64]; /** * main diff --git a/OpenCL/m08100_a0-optimized.cl b/OpenCL/m08100_a0-optimized.cl index a91c2a793..4ce5b80a5 100644 --- a/OpenCL/m08100_a0-optimized.cl +++ b/OpenCL/m08100_a0-optimized.cl @@ -15,7 +15,7 @@ #include "inc_hash_sha1.cl" #endif -__kernel void m08100_m04 (KERN_ATTR_RULES ()) +KERNEL_FQ void m08100_m04 (KERN_ATTR_RULES ()) { /** * modifier @@ -219,15 +219,15 @@ __kernel void m08100_m04 (KERN_ATTR_RULES ()) } } -__kernel void m08100_m08 (KERN_ATTR_RULES ()) +KERNEL_FQ void m08100_m08 (KERN_ATTR_RULES ()) { } -__kernel void m08100_m16 (KERN_ATTR_RULES ()) +KERNEL_FQ void m08100_m16 (KERN_ATTR_RULES ()) { } -__kernel void m08100_s04 (KERN_ATTR_RULES ()) +KERNEL_FQ void m08100_s04 (KERN_ATTR_RULES ()) { /** * modifier @@ -452,10 +452,10 @@ __kernel void m08100_s04 (KERN_ATTR_RULES ()) } } -__kernel void m08100_s08 (KERN_ATTR_RULES ()) +KERNEL_FQ void m08100_s08 (KERN_ATTR_RULES ()) { } -__kernel void m08100_s16 (KERN_ATTR_RULES ()) +KERNEL_FQ void m08100_s16 (KERN_ATTR_RULES ()) { } diff --git a/OpenCL/m08100_a0-pure.cl b/OpenCL/m08100_a0-pure.cl index 2276447fa..09dfa8c41 100644 --- a/OpenCL/m08100_a0-pure.cl +++ b/OpenCL/m08100_a0-pure.cl @@ -15,7 +15,7 @@ #include "inc_hash_sha1.cl" #endif -__kernel void m08100_mxx (KERN_ATTR_RULES ()) +KERNEL_FQ void m08100_mxx (KERN_ATTR_RULES ()) { /** * modifier @@ -67,7 +67,7 @@ __kernel void m08100_mxx (KERN_ATTR_RULES ()) } } -__kernel void m08100_sxx (KERN_ATTR_RULES ()) +KERNEL_FQ void m08100_sxx (KERN_ATTR_RULES ()) { /** * modifier diff --git a/OpenCL/m08100_a1-optimized.cl b/OpenCL/m08100_a1-optimized.cl index e72c2ee7c..252d1deb5 100644 --- a/OpenCL/m08100_a1-optimized.cl +++ b/OpenCL/m08100_a1-optimized.cl @@ -13,7 +13,7 @@ #include "inc_hash_sha1.cl" #endif -__kernel void m08100_m04 (KERN_ATTR_BASIC ()) +KERNEL_FQ void m08100_m04 (KERN_ATTR_BASIC ()) { /** * modifier @@ -288,15 +288,15 @@ __kernel void m08100_m04 (KERN_ATTR_BASIC ()) } } -__kernel void m08100_m08 (KERN_ATTR_BASIC ()) +KERNEL_FQ void m08100_m08 (KERN_ATTR_BASIC ()) { } -__kernel void m08100_m16 (KERN_ATTR_BASIC ()) +KERNEL_FQ void m08100_m16 (KERN_ATTR_BASIC ()) { } -__kernel void m08100_s04 (KERN_ATTR_BASIC ()) +KERNEL_FQ void m08100_s04 (KERN_ATTR_BASIC ()) { /** * modifier @@ -580,10 +580,10 @@ __kernel void m08100_s04 (KERN_ATTR_BASIC ()) } } -__kernel void m08100_s08 (KERN_ATTR_BASIC ()) +KERNEL_FQ void m08100_s08 (KERN_ATTR_BASIC ()) { } -__kernel void m08100_s16 (KERN_ATTR_BASIC ()) +KERNEL_FQ void m08100_s16 (KERN_ATTR_BASIC ()) { } diff --git a/OpenCL/m08100_a1-pure.cl b/OpenCL/m08100_a1-pure.cl index 1b969834f..041171d16 100644 --- a/OpenCL/m08100_a1-pure.cl +++ b/OpenCL/m08100_a1-pure.cl @@ -13,7 +13,7 @@ #include "inc_hash_sha1.cl" #endif -__kernel void m08100_mxx (KERN_ATTR_BASIC ()) +KERNEL_FQ void m08100_mxx (KERN_ATTR_BASIC ()) { /** * modifier @@ -62,7 +62,7 @@ __kernel void m08100_mxx (KERN_ATTR_BASIC ()) } -__kernel void m08100_sxx (KERN_ATTR_BASIC ()) +KERNEL_FQ void m08100_sxx (KERN_ATTR_BASIC ()) { /** * modifier diff --git a/OpenCL/m08100_a3-optimized.cl b/OpenCL/m08100_a3-optimized.cl index 8ffaef5ef..2d6b0162e 100644 --- a/OpenCL/m08100_a3-optimized.cl +++ b/OpenCL/m08100_a3-optimized.cl @@ -356,7 +356,7 @@ DECLSPEC void m08100s (u32 *w0, u32 *w1, u32 *w2, u32 *w3, const u32 pw_len, KER } } -__kernel void m08100_m04 (KERN_ATTR_BASIC ()) +KERNEL_FQ void m08100_m04 (KERN_ATTR_BASIC ()) { /** * base @@ -420,7 +420,7 @@ __kernel void m08100_m04 (KERN_ATTR_BASIC ()) m08100m (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_extra0_buf, d_extra1_buf, d_extra2_buf, d_extra3_buf, bitmap_mask, bitmap_shift1, bitmap_shift2, salt_pos, loop_pos, loop_cnt, il_cnt, digests_cnt, digests_offset, combs_mode, gid_max); } -__kernel void m08100_m08 (KERN_ATTR_BASIC ()) +KERNEL_FQ void m08100_m08 (KERN_ATTR_BASIC ()) { /** * base @@ -492,7 +492,7 @@ __kernel void m08100_m08 (KERN_ATTR_BASIC ()) m08100m (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_extra0_buf, d_extra1_buf, d_extra2_buf, d_extra3_buf, bitmap_mask, bitmap_shift1, bitmap_shift2, salt_pos, loop_pos, loop_cnt, il_cnt, digests_cnt, digests_offset, combs_mode, gid_max); } -__kernel void m08100_m16 (KERN_ATTR_BASIC ()) +KERNEL_FQ void m08100_m16 (KERN_ATTR_BASIC ()) { /** * base @@ -579,7 +579,7 @@ __kernel void m08100_m16 (KERN_ATTR_BASIC ()) m08100m (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_extra0_buf, d_extra1_buf, d_extra2_buf, d_extra3_buf, bitmap_mask, bitmap_shift1, bitmap_shift2, salt_pos, loop_pos, loop_cnt, il_cnt, digests_cnt, digests_offset, combs_mode, gid_max); } -__kernel void m08100_s04 (KERN_ATTR_BASIC ()) +KERNEL_FQ void m08100_s04 (KERN_ATTR_BASIC ()) { /** * base @@ -643,7 +643,7 @@ __kernel void m08100_s04 (KERN_ATTR_BASIC ()) m08100s (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_extra0_buf, d_extra1_buf, d_extra2_buf, d_extra3_buf, bitmap_mask, bitmap_shift1, bitmap_shift2, salt_pos, loop_pos, loop_cnt, il_cnt, digests_cnt, digests_offset, combs_mode, gid_max); } -__kernel void m08100_s08 (KERN_ATTR_BASIC ()) +KERNEL_FQ void m08100_s08 (KERN_ATTR_BASIC ()) { /** * base @@ -715,7 +715,7 @@ __kernel void m08100_s08 (KERN_ATTR_BASIC ()) m08100s (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_extra0_buf, d_extra1_buf, d_extra2_buf, d_extra3_buf, bitmap_mask, bitmap_shift1, bitmap_shift2, salt_pos, loop_pos, loop_cnt, il_cnt, digests_cnt, digests_offset, combs_mode, gid_max); } -__kernel void m08100_s16 (KERN_ATTR_BASIC ()) +KERNEL_FQ void m08100_s16 (KERN_ATTR_BASIC ()) { /** * base diff --git a/OpenCL/m08100_a3-pure.cl b/OpenCL/m08100_a3-pure.cl index c4cdc633d..0e1e2e7ba 100644 --- a/OpenCL/m08100_a3-pure.cl +++ b/OpenCL/m08100_a3-pure.cl @@ -13,7 +13,7 @@ #include "inc_hash_sha1.cl" #endif -__kernel void m08100_mxx (KERN_ATTR_VECTOR ()) +KERNEL_FQ void m08100_mxx (KERN_ATTR_VECTOR ()) { /** * modifier @@ -78,7 +78,7 @@ __kernel void m08100_mxx (KERN_ATTR_VECTOR ()) } } -__kernel void m08100_sxx (KERN_ATTR_VECTOR ()) +KERNEL_FQ void m08100_sxx (KERN_ATTR_VECTOR ()) { /** * modifier diff --git a/OpenCL/m08200-pure.cl b/OpenCL/m08200-pure.cl index e583aea11..9106b0d7d 100644 --- a/OpenCL/m08200-pure.cl +++ b/OpenCL/m08200-pure.cl @@ -92,7 +92,7 @@ DECLSPEC void hmac_sha512_run_V (u32x *w0, u32x *w1, u32x *w2, u32x *w3, u32x *w sha512_transform_vector (w0, w1, w2, w3, w4, w5, w6, w7, digest); } -__kernel void m08200_init (KERN_ATTR_TMPS_ESALT (pbkdf2_sha512_tmp_t, cloudkey_t)) +KERNEL_FQ void m08200_init (KERN_ATTR_TMPS_ESALT (pbkdf2_sha512_tmp_t, cloudkey_t)) { /** * base @@ -196,7 +196,7 @@ __kernel void m08200_init (KERN_ATTR_TMPS_ESALT (pbkdf2_sha512_tmp_t, cloudkey_t } } -__kernel void m08200_loop (KERN_ATTR_TMPS_ESALT (pbkdf2_sha512_tmp_t, cloudkey_t)) +KERNEL_FQ void m08200_loop (KERN_ATTR_TMPS_ESALT (pbkdf2_sha512_tmp_t, cloudkey_t)) { const u64 gid = get_global_id (0); @@ -322,7 +322,7 @@ __kernel void m08200_loop (KERN_ATTR_TMPS_ESALT (pbkdf2_sha512_tmp_t, cloudkey_t } } -__kernel void m08200_comp (KERN_ATTR_TMPS_ESALT (pbkdf2_sha512_tmp_t, cloudkey_t)) +KERNEL_FQ void m08200_comp (KERN_ATTR_TMPS_ESALT (pbkdf2_sha512_tmp_t, cloudkey_t)) { /** * base diff --git a/OpenCL/m08300_a0-optimized.cl b/OpenCL/m08300_a0-optimized.cl index 38cc40e13..f5227fc2f 100644 --- a/OpenCL/m08300_a0-optimized.cl +++ b/OpenCL/m08300_a0-optimized.cl @@ -15,7 +15,7 @@ #include "inc_hash_sha1.cl" #endif -__kernel void m08300_m04 (KERN_ATTR_RULES ()) +KERNEL_FQ void m08300_m04 (KERN_ATTR_RULES ()) { /** * modifier @@ -264,15 +264,15 @@ __kernel void m08300_m04 (KERN_ATTR_RULES ()) } } -__kernel void m08300_m08 (KERN_ATTR_RULES ()) +KERNEL_FQ void m08300_m08 (KERN_ATTR_RULES ()) { } -__kernel void m08300_m16 (KERN_ATTR_RULES ()) +KERNEL_FQ void m08300_m16 (KERN_ATTR_RULES ()) { } -__kernel void m08300_s04 (KERN_ATTR_RULES ()) +KERNEL_FQ void m08300_s04 (KERN_ATTR_RULES ()) { /** * modifier @@ -533,10 +533,10 @@ __kernel void m08300_s04 (KERN_ATTR_RULES ()) } } -__kernel void m08300_s08 (KERN_ATTR_RULES ()) +KERNEL_FQ void m08300_s08 (KERN_ATTR_RULES ()) { } -__kernel void m08300_s16 (KERN_ATTR_RULES ()) +KERNEL_FQ void m08300_s16 (KERN_ATTR_RULES ()) { } diff --git a/OpenCL/m08300_a0-pure.cl b/OpenCL/m08300_a0-pure.cl index bca2508ff..75b0b46a8 100644 --- a/OpenCL/m08300_a0-pure.cl +++ b/OpenCL/m08300_a0-pure.cl @@ -15,7 +15,7 @@ #include "inc_hash_sha1.cl" #endif -__kernel void m08300_mxx (KERN_ATTR_RULES ()) +KERNEL_FQ void m08300_mxx (KERN_ATTR_RULES ()) { /** * modifier @@ -122,7 +122,7 @@ __kernel void m08300_mxx (KERN_ATTR_RULES ()) } } -__kernel void m08300_sxx (KERN_ATTR_RULES ()) +KERNEL_FQ void m08300_sxx (KERN_ATTR_RULES ()) { /** * modifier diff --git a/OpenCL/m08300_a1-optimized.cl b/OpenCL/m08300_a1-optimized.cl index 940a5aba3..1659fefc2 100644 --- a/OpenCL/m08300_a1-optimized.cl +++ b/OpenCL/m08300_a1-optimized.cl @@ -13,7 +13,7 @@ #include "inc_hash_sha1.cl" #endif -__kernel void m08300_m04 (KERN_ATTR_BASIC ()) +KERNEL_FQ void m08300_m04 (KERN_ATTR_BASIC ()) { /** * modifier @@ -322,15 +322,15 @@ __kernel void m08300_m04 (KERN_ATTR_BASIC ()) } } -__kernel void m08300_m08 (KERN_ATTR_BASIC ()) +KERNEL_FQ void m08300_m08 (KERN_ATTR_BASIC ()) { } -__kernel void m08300_m16 (KERN_ATTR_BASIC ()) +KERNEL_FQ void m08300_m16 (KERN_ATTR_BASIC ()) { } -__kernel void m08300_s04 (KERN_ATTR_BASIC ()) +KERNEL_FQ void m08300_s04 (KERN_ATTR_BASIC ()) { /** * modifier @@ -651,10 +651,10 @@ __kernel void m08300_s04 (KERN_ATTR_BASIC ()) } } -__kernel void m08300_s08 (KERN_ATTR_BASIC ()) +KERNEL_FQ void m08300_s08 (KERN_ATTR_BASIC ()) { } -__kernel void m08300_s16 (KERN_ATTR_BASIC ()) +KERNEL_FQ void m08300_s16 (KERN_ATTR_BASIC ()) { } diff --git a/OpenCL/m08300_a1-pure.cl b/OpenCL/m08300_a1-pure.cl index d17cc98e4..51bd71191 100644 --- a/OpenCL/m08300_a1-pure.cl +++ b/OpenCL/m08300_a1-pure.cl @@ -13,7 +13,7 @@ #include "inc_hash_sha1.cl" #endif -__kernel void m08300_mxx (KERN_ATTR_BASIC ()) +KERNEL_FQ void m08300_mxx (KERN_ATTR_BASIC ()) { /** * modifier @@ -116,7 +116,7 @@ __kernel void m08300_mxx (KERN_ATTR_BASIC ()) } } -__kernel void m08300_sxx (KERN_ATTR_BASIC ()) +KERNEL_FQ void m08300_sxx (KERN_ATTR_BASIC ()) { /** * modifier diff --git a/OpenCL/m08300_a3-optimized.cl b/OpenCL/m08300_a3-optimized.cl index 16e483d4e..46c7195f9 100644 --- a/OpenCL/m08300_a3-optimized.cl +++ b/OpenCL/m08300_a3-optimized.cl @@ -441,7 +441,7 @@ DECLSPEC void m08300s (u32 *w0, u32 *w1, u32 *w2, u32 *w3, const u32 pw_len, KER } } -__kernel void m08300_m04 (KERN_ATTR_BASIC ()) +KERNEL_FQ void m08300_m04 (KERN_ATTR_BASIC ()) { /** * base @@ -488,7 +488,7 @@ __kernel void m08300_m04 (KERN_ATTR_BASIC ()) m08300m (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_extra0_buf, d_extra1_buf, d_extra2_buf, d_extra3_buf, bitmap_mask, bitmap_shift1, bitmap_shift2, salt_pos, loop_pos, loop_cnt, il_cnt, digests_cnt, digests_offset, combs_mode, gid_max); } -__kernel void m08300_m08 (KERN_ATTR_BASIC ()) +KERNEL_FQ void m08300_m08 (KERN_ATTR_BASIC ()) { /** * base @@ -535,7 +535,7 @@ __kernel void m08300_m08 (KERN_ATTR_BASIC ()) m08300m (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_extra0_buf, d_extra1_buf, d_extra2_buf, d_extra3_buf, bitmap_mask, bitmap_shift1, bitmap_shift2, salt_pos, loop_pos, loop_cnt, il_cnt, digests_cnt, digests_offset, combs_mode, gid_max); } -__kernel void m08300_m16 (KERN_ATTR_BASIC ()) +KERNEL_FQ void m08300_m16 (KERN_ATTR_BASIC ()) { /** * base @@ -582,7 +582,7 @@ __kernel void m08300_m16 (KERN_ATTR_BASIC ()) m08300m (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_extra0_buf, d_extra1_buf, d_extra2_buf, d_extra3_buf, bitmap_mask, bitmap_shift1, bitmap_shift2, salt_pos, loop_pos, loop_cnt, il_cnt, digests_cnt, digests_offset, combs_mode, gid_max); } -__kernel void m08300_s04 (KERN_ATTR_BASIC ()) +KERNEL_FQ void m08300_s04 (KERN_ATTR_BASIC ()) { /** * base @@ -629,7 +629,7 @@ __kernel void m08300_s04 (KERN_ATTR_BASIC ()) m08300s (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_extra0_buf, d_extra1_buf, d_extra2_buf, d_extra3_buf, bitmap_mask, bitmap_shift1, bitmap_shift2, salt_pos, loop_pos, loop_cnt, il_cnt, digests_cnt, digests_offset, combs_mode, gid_max); } -__kernel void m08300_s08 (KERN_ATTR_BASIC ()) +KERNEL_FQ void m08300_s08 (KERN_ATTR_BASIC ()) { /** * base @@ -676,7 +676,7 @@ __kernel void m08300_s08 (KERN_ATTR_BASIC ()) m08300s (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_extra0_buf, d_extra1_buf, d_extra2_buf, d_extra3_buf, bitmap_mask, bitmap_shift1, bitmap_shift2, salt_pos, loop_pos, loop_cnt, il_cnt, digests_cnt, digests_offset, combs_mode, gid_max); } -__kernel void m08300_s16 (KERN_ATTR_BASIC ()) +KERNEL_FQ void m08300_s16 (KERN_ATTR_BASIC ()) { /** * base diff --git a/OpenCL/m08300_a3-pure.cl b/OpenCL/m08300_a3-pure.cl index 19961afd7..63c4c3cca 100644 --- a/OpenCL/m08300_a3-pure.cl +++ b/OpenCL/m08300_a3-pure.cl @@ -13,7 +13,7 @@ #include "inc_hash_sha1.cl" #endif -__kernel void m08300_mxx (KERN_ATTR_VECTOR ()) +KERNEL_FQ void m08300_mxx (KERN_ATTR_VECTOR ()) { /** * modifier @@ -131,7 +131,7 @@ __kernel void m08300_mxx (KERN_ATTR_VECTOR ()) } } -__kernel void m08300_sxx (KERN_ATTR_VECTOR ()) +KERNEL_FQ void m08300_sxx (KERN_ATTR_VECTOR ()) { /** * modifier diff --git a/OpenCL/m08400_a0-optimized.cl b/OpenCL/m08400_a0-optimized.cl index 7e2f58200..f222c73a8 100644 --- a/OpenCL/m08400_a0-optimized.cl +++ b/OpenCL/m08400_a0-optimized.cl @@ -27,7 +27,7 @@ #define uint_to_hex_lower8_le(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 m08400_m04 (KERN_ATTR_RULES ()) +KERNEL_FQ void m08400_m04 (KERN_ATTR_RULES ()) { /** * modifier @@ -41,7 +41,7 @@ __kernel void m08400_m04 (KERN_ATTR_RULES ()) * shared */ - __local u32 l_bin2asc[256]; + LOCAL_AS u32 l_bin2asc[256]; for (u32 i = lid; i < 256; i += lsz) { @@ -273,15 +273,15 @@ __kernel void m08400_m04 (KERN_ATTR_RULES ()) } } -__kernel void m08400_m08 (KERN_ATTR_RULES ()) +KERNEL_FQ void m08400_m08 (KERN_ATTR_RULES ()) { } -__kernel void m08400_m16 (KERN_ATTR_RULES ()) +KERNEL_FQ void m08400_m16 (KERN_ATTR_RULES ()) { } -__kernel void m08400_s04 (KERN_ATTR_RULES ()) +KERNEL_FQ void m08400_s04 (KERN_ATTR_RULES ()) { /** * modifier @@ -295,7 +295,7 @@ __kernel void m08400_s04 (KERN_ATTR_RULES ()) * shared */ - __local u32 l_bin2asc[256]; + LOCAL_AS u32 l_bin2asc[256]; for (u32 i = lid; i < 256; i += lsz) { @@ -539,10 +539,10 @@ __kernel void m08400_s04 (KERN_ATTR_RULES ()) } } -__kernel void m08400_s08 (KERN_ATTR_RULES ()) +KERNEL_FQ void m08400_s08 (KERN_ATTR_RULES ()) { } -__kernel void m08400_s16 (KERN_ATTR_RULES ()) +KERNEL_FQ void m08400_s16 (KERN_ATTR_RULES ()) { } diff --git a/OpenCL/m08400_a0-pure.cl b/OpenCL/m08400_a0-pure.cl index 58c1c53bc..eb3ac3cae 100644 --- a/OpenCL/m08400_a0-pure.cl +++ b/OpenCL/m08400_a0-pure.cl @@ -27,7 +27,7 @@ #define uint_to_hex_lower8_le(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 m08400_mxx (KERN_ATTR_RULES ()) +KERNEL_FQ void m08400_mxx (KERN_ATTR_RULES ()) { /** * modifier @@ -41,7 +41,7 @@ __kernel void m08400_mxx (KERN_ATTR_RULES ()) * bin2asc table */ - __local u32 l_bin2asc[256]; + LOCAL_AS u32 l_bin2asc[256]; for (u32 i = lid; i < 256; i += lsz) { @@ -178,7 +178,7 @@ __kernel void m08400_mxx (KERN_ATTR_RULES ()) } } -__kernel void m08400_sxx (KERN_ATTR_RULES ()) +KERNEL_FQ void m08400_sxx (KERN_ATTR_RULES ()) { /** * modifier @@ -192,7 +192,7 @@ __kernel void m08400_sxx (KERN_ATTR_RULES ()) * bin2asc table */ - __local u32 l_bin2asc[256]; + LOCAL_AS u32 l_bin2asc[256]; for (u32 i = lid; i < 256; i += lsz) { diff --git a/OpenCL/m08400_a1-optimized.cl b/OpenCL/m08400_a1-optimized.cl index 8475cb8b3..2f0fd98d3 100644 --- a/OpenCL/m08400_a1-optimized.cl +++ b/OpenCL/m08400_a1-optimized.cl @@ -25,7 +25,7 @@ #define uint_to_hex_lower8_le(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 m08400_m04 (KERN_ATTR_BASIC ()) +KERNEL_FQ void m08400_m04 (KERN_ATTR_BASIC ()) { /** * modifier @@ -39,7 +39,7 @@ __kernel void m08400_m04 (KERN_ATTR_BASIC ()) * shared */ - __local u32 l_bin2asc[256]; + LOCAL_AS u32 l_bin2asc[256]; for (u32 i = lid; i < 256; i += lsz) { @@ -329,15 +329,15 @@ __kernel void m08400_m04 (KERN_ATTR_BASIC ()) } } -__kernel void m08400_m08 (KERN_ATTR_BASIC ()) +KERNEL_FQ void m08400_m08 (KERN_ATTR_BASIC ()) { } -__kernel void m08400_m16 (KERN_ATTR_BASIC ()) +KERNEL_FQ void m08400_m16 (KERN_ATTR_BASIC ()) { } -__kernel void m08400_s04 (KERN_ATTR_BASIC ()) +KERNEL_FQ void m08400_s04 (KERN_ATTR_BASIC ()) { /** * modifier @@ -351,7 +351,7 @@ __kernel void m08400_s04 (KERN_ATTR_BASIC ()) * shared */ - __local u32 l_bin2asc[256]; + LOCAL_AS u32 l_bin2asc[256]; for (u32 i = lid; i < 256; i += lsz) { @@ -653,10 +653,10 @@ __kernel void m08400_s04 (KERN_ATTR_BASIC ()) } } -__kernel void m08400_s08 (KERN_ATTR_BASIC ()) +KERNEL_FQ void m08400_s08 (KERN_ATTR_BASIC ()) { } -__kernel void m08400_s16 (KERN_ATTR_BASIC ()) +KERNEL_FQ void m08400_s16 (KERN_ATTR_BASIC ()) { } diff --git a/OpenCL/m08400_a1-pure.cl b/OpenCL/m08400_a1-pure.cl index 031a5667f..67e3cb552 100644 --- a/OpenCL/m08400_a1-pure.cl +++ b/OpenCL/m08400_a1-pure.cl @@ -25,7 +25,7 @@ #define uint_to_hex_lower8_le(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 m08400_mxx (KERN_ATTR_BASIC ()) +KERNEL_FQ void m08400_mxx (KERN_ATTR_BASIC ()) { /** * modifier @@ -39,7 +39,7 @@ __kernel void m08400_mxx (KERN_ATTR_BASIC ()) * bin2asc table */ - __local u32 l_bin2asc[256]; + LOCAL_AS u32 l_bin2asc[256]; for (u32 i = lid; i < 256; i += lsz) { @@ -174,7 +174,7 @@ __kernel void m08400_mxx (KERN_ATTR_BASIC ()) } } -__kernel void m08400_sxx (KERN_ATTR_BASIC ()) +KERNEL_FQ void m08400_sxx (KERN_ATTR_BASIC ()) { /** * modifier @@ -188,7 +188,7 @@ __kernel void m08400_sxx (KERN_ATTR_BASIC ()) * bin2asc table */ - __local u32 l_bin2asc[256]; + LOCAL_AS u32 l_bin2asc[256]; for (u32 i = lid; i < 256; i += lsz) { diff --git a/OpenCL/m08400_a3-optimized.cl b/OpenCL/m08400_a3-optimized.cl index aa0a04b8a..91efc6121 100644 --- a/OpenCL/m08400_a3-optimized.cl +++ b/OpenCL/m08400_a3-optimized.cl @@ -25,7 +25,7 @@ #define uint_to_hex_lower8_le(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 -DECLSPEC void m08400m (u32 *w0, u32 *w1, u32 *w2, u32 *w3, const u32 pw_len, KERN_ATTR_BASIC (), __local u32 *l_bin2asc) +DECLSPEC void m08400m (u32 *w0, u32 *w1, u32 *w2, u32 *w3, const u32 pw_len, KERN_ATTR_BASIC (), LOCAL_AS u32 *l_bin2asc) { /** * modifier @@ -235,7 +235,7 @@ DECLSPEC void m08400m (u32 *w0, u32 *w1, u32 *w2, u32 *w3, const u32 pw_len, KER } } -DECLSPEC void m08400s (u32 *w0, u32 *w1, u32 *w2, u32 *w3, const u32 pw_len, KERN_ATTR_BASIC (), __local u32 *l_bin2asc) +DECLSPEC void m08400s (u32 *w0, u32 *w1, u32 *w2, u32 *w3, const u32 pw_len, KERN_ATTR_BASIC (), LOCAL_AS u32 *l_bin2asc) { /** * modifier @@ -457,7 +457,7 @@ DECLSPEC void m08400s (u32 *w0, u32 *w1, u32 *w2, u32 *w3, const u32 pw_len, KER } } -__kernel void m08400_m04 (KERN_ATTR_BASIC ()) +KERNEL_FQ void m08400_m04 (KERN_ATTR_BASIC ()) { /** * modifier @@ -471,7 +471,7 @@ __kernel void m08400_m04 (KERN_ATTR_BASIC ()) * shared */ - __local u32 l_bin2asc[256]; + LOCAL_AS u32 l_bin2asc[256]; for (u32 i = lid; i < 256; i += lsz) { @@ -527,7 +527,7 @@ __kernel void m08400_m04 (KERN_ATTR_BASIC ()) m08400m (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_extra0_buf, d_extra1_buf, d_extra2_buf, d_extra3_buf, bitmap_mask, bitmap_shift1, bitmap_shift2, salt_pos, loop_pos, loop_cnt, il_cnt, digests_cnt, digests_offset, combs_mode, gid_max, l_bin2asc); } -__kernel void m08400_m08 (KERN_ATTR_BASIC ()) +KERNEL_FQ void m08400_m08 (KERN_ATTR_BASIC ()) { /** * modifier @@ -541,7 +541,7 @@ __kernel void m08400_m08 (KERN_ATTR_BASIC ()) * shared */ - __local u32 l_bin2asc[256]; + LOCAL_AS u32 l_bin2asc[256]; for (u32 i = lid; i < 256; i += lsz) { @@ -597,7 +597,7 @@ __kernel void m08400_m08 (KERN_ATTR_BASIC ()) m08400m (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_extra0_buf, d_extra1_buf, d_extra2_buf, d_extra3_buf, bitmap_mask, bitmap_shift1, bitmap_shift2, salt_pos, loop_pos, loop_cnt, il_cnt, digests_cnt, digests_offset, combs_mode, gid_max, l_bin2asc); } -__kernel void m08400_m16 (KERN_ATTR_BASIC ()) +KERNEL_FQ void m08400_m16 (KERN_ATTR_BASIC ()) { /** * modifier @@ -611,7 +611,7 @@ __kernel void m08400_m16 (KERN_ATTR_BASIC ()) * shared */ - __local u32 l_bin2asc[256]; + LOCAL_AS u32 l_bin2asc[256]; for (u32 i = lid; i < 256; i += lsz) { @@ -667,7 +667,7 @@ __kernel void m08400_m16 (KERN_ATTR_BASIC ()) m08400m (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_extra0_buf, d_extra1_buf, d_extra2_buf, d_extra3_buf, bitmap_mask, bitmap_shift1, bitmap_shift2, salt_pos, loop_pos, loop_cnt, il_cnt, digests_cnt, digests_offset, combs_mode, gid_max, l_bin2asc); } -__kernel void m08400_s04 (KERN_ATTR_BASIC ()) +KERNEL_FQ void m08400_s04 (KERN_ATTR_BASIC ()) { /** * modifier @@ -681,7 +681,7 @@ __kernel void m08400_s04 (KERN_ATTR_BASIC ()) * shared */ - __local u32 l_bin2asc[256]; + LOCAL_AS u32 l_bin2asc[256]; for (u32 i = lid; i < 256; i += lsz) { @@ -737,7 +737,7 @@ __kernel void m08400_s04 (KERN_ATTR_BASIC ()) m08400s (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_extra0_buf, d_extra1_buf, d_extra2_buf, d_extra3_buf, bitmap_mask, bitmap_shift1, bitmap_shift2, salt_pos, loop_pos, loop_cnt, il_cnt, digests_cnt, digests_offset, combs_mode, gid_max, l_bin2asc); } -__kernel void m08400_s08 (KERN_ATTR_BASIC ()) +KERNEL_FQ void m08400_s08 (KERN_ATTR_BASIC ()) { /** * modifier @@ -751,7 +751,7 @@ __kernel void m08400_s08 (KERN_ATTR_BASIC ()) * shared */ - __local u32 l_bin2asc[256]; + LOCAL_AS u32 l_bin2asc[256]; for (u32 i = lid; i < 256; i += lsz) { @@ -807,7 +807,7 @@ __kernel void m08400_s08 (KERN_ATTR_BASIC ()) m08400s (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_extra0_buf, d_extra1_buf, d_extra2_buf, d_extra3_buf, bitmap_mask, bitmap_shift1, bitmap_shift2, salt_pos, loop_pos, loop_cnt, il_cnt, digests_cnt, digests_offset, combs_mode, gid_max, l_bin2asc); } -__kernel void m08400_s16 (KERN_ATTR_BASIC ()) +KERNEL_FQ void m08400_s16 (KERN_ATTR_BASIC ()) { /** * modifier @@ -821,7 +821,7 @@ __kernel void m08400_s16 (KERN_ATTR_BASIC ()) * shared */ - __local u32 l_bin2asc[256]; + LOCAL_AS u32 l_bin2asc[256]; for (u32 i = lid; i < 256; i += lsz) { diff --git a/OpenCL/m08400_a3-pure.cl b/OpenCL/m08400_a3-pure.cl index bf66eb80b..e5243270d 100644 --- a/OpenCL/m08400_a3-pure.cl +++ b/OpenCL/m08400_a3-pure.cl @@ -25,7 +25,7 @@ #define uint_to_hex_lower8_le(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 m08400_mxx (KERN_ATTR_VECTOR ()) +KERNEL_FQ void m08400_mxx (KERN_ATTR_VECTOR ()) { /** * modifier @@ -39,7 +39,7 @@ __kernel void m08400_mxx (KERN_ATTR_VECTOR ()) * bin2asc table */ - __local u32 l_bin2asc[256]; + LOCAL_AS u32 l_bin2asc[256]; for (u32 i = lid; i < 256; i += lsz) { @@ -191,7 +191,7 @@ __kernel void m08400_mxx (KERN_ATTR_VECTOR ()) } } -__kernel void m08400_sxx (KERN_ATTR_VECTOR ()) +KERNEL_FQ void m08400_sxx (KERN_ATTR_VECTOR ()) { /** * modifier @@ -205,7 +205,7 @@ __kernel void m08400_sxx (KERN_ATTR_VECTOR ()) * bin2asc table */ - __local u32 l_bin2asc[256]; + LOCAL_AS u32 l_bin2asc[256]; for (u32 i = lid; i < 256; i += lsz) { diff --git a/OpenCL/m08500_a0-pure.cl b/OpenCL/m08500_a0-pure.cl index 6a63c9790..49a80b8f7 100644 --- a/OpenCL/m08500_a0-pure.cl +++ b/OpenCL/m08500_a0-pure.cl @@ -52,7 +52,7 @@ PERM_OP (l, r, tt, 4, 0x0f0f0f0f); \ } -__constant u32a c_ascii_to_ebcdic_pc[256] = +CONSTANT_AS u32a c_ascii_to_ebcdic_pc[256] = { // little hack, can't crack 0-bytes in password, but who cares // 0xab, 0xa8, 0xae, 0xad, 0xc4, 0xf1, 0xf7, 0xf4, 0x86, 0xa1, 0xe0, 0xbc, 0xb3, 0xb0, 0xb6, 0xb5, @@ -74,7 +74,7 @@ __constant u32a c_ascii_to_ebcdic_pc[256] = 0x13, 0x10, 0x16, 0x15, 0x7f, 0x7c, 0x73, 0x70, 0x76, 0x75, 0x5e, 0x5d, 0x52, 0x51, 0x57, 0x54, }; -__constant u32a c_SPtrans[8][64] = +CONSTANT_AS u32a c_SPtrans[8][64] = { { 0x02080800, 0x00080000, 0x02000002, 0x02080802, @@ -222,7 +222,7 @@ __constant u32a c_SPtrans[8][64] = } }; -__constant u32a c_skb[8][64] = +CONSTANT_AS u32a c_skb[8][64] = { { 0x00000000, 0x00000010, 0x20000000, 0x20000010, @@ -394,7 +394,7 @@ __constant u32a c_skb[8][64] = #define BOX1(i,S) (u32x) ((S)[(i).s0], (S)[(i).s1], (S)[(i).s2], (S)[(i).s3], (S)[(i).s4], (S)[(i).s5], (S)[(i).s6], (S)[(i).s7], (S)[(i).s8], (S)[(i).s9], (S)[(i).sa], (S)[(i).sb], (S)[(i).sc], (S)[(i).sd], (S)[(i).se], (S)[(i).sf]) #endif -DECLSPEC void _des_crypt_encrypt (u32 *iv, u32x *data, u32x *Kc, u32x *Kd, __local u32 (*s_SPtrans)[64]) +DECLSPEC void _des_crypt_encrypt (u32 *iv, u32x *data, u32x *Kc, u32x *Kd, LOCAL_AS u32 (*s_SPtrans)[64]) { u32 r = data[0]; u32 l = data[1]; @@ -436,7 +436,7 @@ DECLSPEC void _des_crypt_encrypt (u32 *iv, u32x *data, u32x *Kc, u32x *Kd, __loc iv[1] = r; } -DECLSPEC void _des_crypt_keysetup (u32 c, u32x d, u32x *Kc, u32x *Kd, __local u32 (*s_skb)[64]) +DECLSPEC void _des_crypt_keysetup (u32 c, u32x d, u32x *Kc, u32x *Kd, LOCAL_AS u32 (*s_skb)[64]) { u32 tt; @@ -521,7 +521,7 @@ DECLSPEC void transform_racf_key (const u32 w0, const u32x w1, u32x *key) | BOX1 (((w1 >> 24) & 0xff), c_ascii_to_ebcdic_pc) << 24; } -__kernel void m08500_mxx (KERN_ATTR_RULES ()) +KERNEL_FQ void m08500_mxx (KERN_ATTR_RULES ()) { /** * base @@ -535,8 +535,8 @@ __kernel void m08500_mxx (KERN_ATTR_RULES ()) * shared */ - __local u32 s_SPtrans[8][64]; - __local u32 s_skb[8][64]; + LOCAL_AS u32 s_SPtrans[8][64]; + LOCAL_AS u32 s_skb[8][64]; for (u32 i = lid; i < 64; i += lsz) { @@ -619,7 +619,7 @@ __kernel void m08500_mxx (KERN_ATTR_RULES ()) } } -__kernel void m08500_sxx (KERN_ATTR_RULES ()) +KERNEL_FQ void m08500_sxx (KERN_ATTR_RULES ()) { /** * base @@ -633,8 +633,8 @@ __kernel void m08500_sxx (KERN_ATTR_RULES ()) * shared */ - __local u32 s_SPtrans[8][64]; - __local u32 s_skb[8][64]; + LOCAL_AS u32 s_SPtrans[8][64]; + LOCAL_AS u32 s_skb[8][64]; for (u32 i = lid; i < 64; i += lsz) { diff --git a/OpenCL/m08500_a1-pure.cl b/OpenCL/m08500_a1-pure.cl index 7e2730808..df5ec56d0 100644 --- a/OpenCL/m08500_a1-pure.cl +++ b/OpenCL/m08500_a1-pure.cl @@ -50,7 +50,7 @@ PERM_OP (l, r, tt, 4, 0x0f0f0f0f); \ } -__constant u32a c_ascii_to_ebcdic_pc[256] = +CONSTANT_AS u32a c_ascii_to_ebcdic_pc[256] = { // little hack, can't crack 0-bytes in password, but who cares // 0xab, 0xa8, 0xae, 0xad, 0xc4, 0xf1, 0xf7, 0xf4, 0x86, 0xa1, 0xe0, 0xbc, 0xb3, 0xb0, 0xb6, 0xb5, @@ -72,7 +72,7 @@ __constant u32a c_ascii_to_ebcdic_pc[256] = 0x13, 0x10, 0x16, 0x15, 0x7f, 0x7c, 0x73, 0x70, 0x76, 0x75, 0x5e, 0x5d, 0x52, 0x51, 0x57, 0x54, }; -__constant u32a c_SPtrans[8][64] = +CONSTANT_AS u32a c_SPtrans[8][64] = { { 0x02080800, 0x00080000, 0x02000002, 0x02080802, @@ -220,7 +220,7 @@ __constant u32a c_SPtrans[8][64] = } }; -__constant u32a c_skb[8][64] = +CONSTANT_AS u32a c_skb[8][64] = { { 0x00000000, 0x00000010, 0x20000000, 0x20000010, @@ -392,7 +392,7 @@ __constant u32a c_skb[8][64] = #define BOX1(i,S) (u32x) ((S)[(i).s0], (S)[(i).s1], (S)[(i).s2], (S)[(i).s3], (S)[(i).s4], (S)[(i).s5], (S)[(i).s6], (S)[(i).s7], (S)[(i).s8], (S)[(i).s9], (S)[(i).sa], (S)[(i).sb], (S)[(i).sc], (S)[(i).sd], (S)[(i).se], (S)[(i).sf]) #endif -DECLSPEC void _des_crypt_encrypt (u32 *iv, u32x *data, u32x *Kc, u32x *Kd, __local u32 (*s_SPtrans)[64]) +DECLSPEC void _des_crypt_encrypt (u32 *iv, u32x *data, u32x *Kc, u32x *Kd, LOCAL_AS u32 (*s_SPtrans)[64]) { u32 r = data[0]; u32 l = data[1]; @@ -434,7 +434,7 @@ DECLSPEC void _des_crypt_encrypt (u32 *iv, u32x *data, u32x *Kc, u32x *Kd, __loc iv[1] = r; } -DECLSPEC void _des_crypt_keysetup (u32 c, u32x d, u32x *Kc, u32x *Kd, __local u32 (*s_skb)[64]) +DECLSPEC void _des_crypt_keysetup (u32 c, u32x d, u32x *Kc, u32x *Kd, LOCAL_AS u32 (*s_skb)[64]) { u32 tt; @@ -519,7 +519,7 @@ DECLSPEC void transform_racf_key (const u32 w0, const u32x w1, u32x *key) | BOX1 (((w1 >> 24) & 0xff), c_ascii_to_ebcdic_pc) << 24; } -__kernel void m08500_mxx (KERN_ATTR_BASIC ()) +KERNEL_FQ void m08500_mxx (KERN_ATTR_BASIC ()) { /** * base @@ -533,8 +533,8 @@ __kernel void m08500_mxx (KERN_ATTR_BASIC ()) * shared */ - __local u32 s_SPtrans[8][64]; - __local u32 s_skb[8][64]; + LOCAL_AS u32 s_SPtrans[8][64]; + LOCAL_AS u32 s_skb[8][64]; for (u32 i = lid; i < 64; i += lsz) { @@ -675,7 +675,7 @@ __kernel void m08500_mxx (KERN_ATTR_BASIC ()) } } -__kernel void m08500_sxx (KERN_ATTR_BASIC ()) +KERNEL_FQ void m08500_sxx (KERN_ATTR_BASIC ()) { /** * base @@ -689,8 +689,8 @@ __kernel void m08500_sxx (KERN_ATTR_BASIC ()) * shared */ - __local u32 s_SPtrans[8][64]; - __local u32 s_skb[8][64]; + LOCAL_AS u32 s_SPtrans[8][64]; + LOCAL_AS u32 s_skb[8][64]; for (u32 i = lid; i < 64; i += lsz) { diff --git a/OpenCL/m08500_a3-pure.cl b/OpenCL/m08500_a3-pure.cl index 616e6555b..65dff1235 100644 --- a/OpenCL/m08500_a3-pure.cl +++ b/OpenCL/m08500_a3-pure.cl @@ -50,7 +50,7 @@ PERM_OP (l, r, tt, 4, 0x0f0f0f0f); \ } -__constant u32a c_ascii_to_ebcdic_pc[256] = +CONSTANT_AS u32a c_ascii_to_ebcdic_pc[256] = { // little hack, can't crack 0-bytes in password, but who cares // 0xab, 0xa8, 0xae, 0xad, 0xc4, 0xf1, 0xf7, 0xf4, 0x86, 0xa1, 0xe0, 0xbc, 0xb3, 0xb0, 0xb6, 0xb5, @@ -72,7 +72,7 @@ __constant u32a c_ascii_to_ebcdic_pc[256] = 0x13, 0x10, 0x16, 0x15, 0x7f, 0x7c, 0x73, 0x70, 0x76, 0x75, 0x5e, 0x5d, 0x52, 0x51, 0x57, 0x54, }; -__constant u32a c_SPtrans[8][64] = +CONSTANT_AS u32a c_SPtrans[8][64] = { { 0x02080800, 0x00080000, 0x02000002, 0x02080802, @@ -220,7 +220,7 @@ __constant u32a c_SPtrans[8][64] = } }; -__constant u32a c_skb[8][64] = +CONSTANT_AS u32a c_skb[8][64] = { { 0x00000000, 0x00000010, 0x20000000, 0x20000010, @@ -392,7 +392,7 @@ __constant u32a c_skb[8][64] = #define BOX1(i,S) (u32x) ((S)[(i).s0], (S)[(i).s1], (S)[(i).s2], (S)[(i).s3], (S)[(i).s4], (S)[(i).s5], (S)[(i).s6], (S)[(i).s7], (S)[(i).s8], (S)[(i).s9], (S)[(i).sa], (S)[(i).sb], (S)[(i).sc], (S)[(i).sd], (S)[(i).se], (S)[(i).sf]) #endif -DECLSPEC void _des_crypt_encrypt (u32x *iv, u32x *data, u32x *Kc, u32x *Kd, __local u32 (*s_SPtrans)[64]) +DECLSPEC void _des_crypt_encrypt (u32x *iv, u32x *data, u32x *Kc, u32x *Kd, LOCAL_AS u32 (*s_SPtrans)[64]) { u32x r = data[0]; u32x l = data[1]; @@ -434,7 +434,7 @@ DECLSPEC void _des_crypt_encrypt (u32x *iv, u32x *data, u32x *Kc, u32x *Kd, __lo iv[1] = r; } -DECLSPEC void _des_crypt_keysetup (u32x c, u32x d, u32x *Kc, u32x *Kd, __local u32 (*s_skb)[64]) +DECLSPEC void _des_crypt_keysetup (u32x c, u32x d, u32x *Kc, u32x *Kd, LOCAL_AS u32 (*s_skb)[64]) { u32x tt; @@ -519,7 +519,7 @@ DECLSPEC void transform_racf_key (const u32x w0, const u32x w1, u32x *key) | BOX1 (((w1 >> 24) & 0xff), c_ascii_to_ebcdic_pc) << 24; } -DECLSPEC void m08500m (__local u32 (*s_SPtrans)[64], __local u32 (*s_skb)[64], u32 *w, const u32 pw_len, KERN_ATTR_VECTOR ()) +DECLSPEC void m08500m (LOCAL_AS u32 (*s_SPtrans)[64], LOCAL_AS u32 (*s_skb)[64], u32 *w, const u32 pw_len, KERN_ATTR_VECTOR ()) { /** * modifier @@ -582,7 +582,7 @@ DECLSPEC void m08500m (__local u32 (*s_SPtrans)[64], __local u32 (*s_skb)[64], u } } -DECLSPEC void m08500s (__local u32 (*s_SPtrans)[64], __local u32 (*s_skb)[64], u32 *w, const u32 pw_len, KERN_ATTR_VECTOR ()) +DECLSPEC void m08500s (LOCAL_AS u32 (*s_SPtrans)[64], LOCAL_AS u32 (*s_skb)[64], u32 *w, const u32 pw_len, KERN_ATTR_VECTOR ()) { /** * modifier @@ -657,7 +657,7 @@ DECLSPEC void m08500s (__local u32 (*s_SPtrans)[64], __local u32 (*s_skb)[64], u } } -__kernel void m08500_mxx (KERN_ATTR_VECTOR ()) +KERNEL_FQ void m08500_mxx (KERN_ATTR_VECTOR ()) { /** * base @@ -671,8 +671,8 @@ __kernel void m08500_mxx (KERN_ATTR_VECTOR ()) * shared */ - __local u32 s_SPtrans[8][64]; - __local u32 s_skb[8][64]; + LOCAL_AS u32 s_SPtrans[8][64]; + LOCAL_AS u32 s_skb[8][64]; for (u32 i = lid; i < 64; i += lsz) { @@ -731,7 +731,7 @@ __kernel void m08500_mxx (KERN_ATTR_VECTOR ()) m08500m (s_SPtrans, s_skb, w, pw_len, pws, rules_buf, combs_buf, words_buf_r, 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_extra0_buf, d_extra1_buf, d_extra2_buf, d_extra3_buf, bitmap_mask, bitmap_shift1, bitmap_shift2, salt_pos, loop_pos, loop_cnt, il_cnt, digests_cnt, digests_offset, combs_mode, gid_max); } -__kernel void m08500_sxx (KERN_ATTR_VECTOR ()) +KERNEL_FQ void m08500_sxx (KERN_ATTR_VECTOR ()) { /** * base @@ -745,8 +745,8 @@ __kernel void m08500_sxx (KERN_ATTR_VECTOR ()) * shared */ - __local u32 s_SPtrans[8][64]; - __local u32 s_skb[8][64]; + LOCAL_AS u32 s_SPtrans[8][64]; + LOCAL_AS u32 s_skb[8][64]; for (u32 i = lid; i < 64; i += lsz) { diff --git a/OpenCL/m08600_a0-pure.cl b/OpenCL/m08600_a0-pure.cl index 0223051fa..c88b30787 100644 --- a/OpenCL/m08600_a0-pure.cl +++ b/OpenCL/m08600_a0-pure.cl @@ -15,7 +15,7 @@ #include "inc_simd.cl" #endif -__constant u32a lotus_magic_table[256] = +CONSTANT_AS u32a lotus_magic_table[256] = { 0xbd, 0x56, 0xea, 0xf2, 0xa2, 0xf1, 0xac, 0x2a, 0xb0, 0x93, 0xd1, 0x9c, 0x1b, 0x33, 0xfd, 0xd0, @@ -63,7 +63,7 @@ __constant u32a lotus_magic_table[256] = #define BOX1(S,i) (u32x) ((S)[(i).s0], (S)[(i).s1], (S)[(i).s2], (S)[(i).s3], (S)[(i).s4], (S)[(i).s5], (S)[(i).s6], (S)[(i).s7], (S)[(i).s8], (S)[(i).s9], (S)[(i).sa], (S)[(i).sb], (S)[(i).sc], (S)[(i).sd], (S)[(i).se], (S)[(i).sf]) #endif -DECLSPEC void lotus_mix (u32 *in, __local u32 *s_lotus_magic_table) +DECLSPEC void lotus_mix (u32 *in, LOCAL_AS u32 *s_lotus_magic_table) { u32 p = 0; @@ -86,7 +86,7 @@ DECLSPEC void lotus_mix (u32 *in, __local u32 *s_lotus_magic_table) } } -DECLSPEC void lotus_transform_password (const u32 *in, u32x *out, __local u32 *s_lotus_magic_table) +DECLSPEC void lotus_transform_password (const u32 *in, u32x *out, LOCAL_AS u32 *s_lotus_magic_table) { u32 t = out[3] >> 24; @@ -183,7 +183,7 @@ DECLSPEC void pad (u32 *w, const u32 len) } } -DECLSPEC void mdtransform_norecalc (u32 *state, const u32x *block, __local u32 *s_lotus_magic_table) +DECLSPEC void mdtransform_norecalc (u32 *state, const u32x *block, LOCAL_AS u32 *s_lotus_magic_table) { u32 x[12]; @@ -208,14 +208,14 @@ DECLSPEC void mdtransform_norecalc (u32 *state, const u32x *block, __local u32 * state[3] = x[3]; } -DECLSPEC void mdtransform (u32 *state, u32x *checksum, const u32x *block, __local u32 *s_lotus_magic_table) +DECLSPEC void mdtransform (u32 *state, u32x *checksum, const u32x *block, LOCAL_AS u32 *s_lotus_magic_table) { mdtransform_norecalc (state, block, s_lotus_magic_table); lotus_transform_password (block, checksum, s_lotus_magic_table); } -DECLSPEC void domino_big_md (const u32 *saved_key, const u32 size, u32x *state, __local u32 *s_lotus_magic_table) +DECLSPEC void domino_big_md (const u32 *saved_key, const u32 size, u32x *state, LOCAL_AS u32 *s_lotus_magic_table) { u32 checksum[4]; @@ -229,7 +229,7 @@ DECLSPEC void domino_big_md (const u32 *saved_key, const u32 size, u32x *state, mdtransform_norecalc (state, checksum, s_lotus_magic_table); } -__kernel void m08600_mxx (KERN_ATTR_RULES ()) +KERNEL_FQ void m08600_mxx (KERN_ATTR_RULES ()) { /** * base @@ -243,7 +243,7 @@ __kernel void m08600_mxx (KERN_ATTR_RULES ()) * sbox */ - __local u32 s_lotus_magic_table[256]; + LOCAL_AS u32 s_lotus_magic_table[256]; for (u32 i = lid; i < 256; i += lsz) { @@ -293,7 +293,7 @@ __kernel void m08600_mxx (KERN_ATTR_RULES ()) } } -__kernel void m08600_sxx (KERN_ATTR_RULES ()) +KERNEL_FQ void m08600_sxx (KERN_ATTR_RULES ()) { /** * base @@ -307,7 +307,7 @@ __kernel void m08600_sxx (KERN_ATTR_RULES ()) * sbox */ - __local u32 s_lotus_magic_table[256]; + LOCAL_AS u32 s_lotus_magic_table[256]; for (u32 i = lid; i < 256; i += lsz) { diff --git a/OpenCL/m08600_a1-pure.cl b/OpenCL/m08600_a1-pure.cl index 6d1138ed8..5253d21dd 100644 --- a/OpenCL/m08600_a1-pure.cl +++ b/OpenCL/m08600_a1-pure.cl @@ -13,7 +13,7 @@ #include "inc_simd.cl" #endif -__constant u32a lotus_magic_table[256] = +CONSTANT_AS u32a lotus_magic_table[256] = { 0xbd, 0x56, 0xea, 0xf2, 0xa2, 0xf1, 0xac, 0x2a, 0xb0, 0x93, 0xd1, 0x9c, 0x1b, 0x33, 0xfd, 0xd0, @@ -61,7 +61,7 @@ __constant u32a lotus_magic_table[256] = #define BOX1(S,i) (u32x) ((S)[(i).s0], (S)[(i).s1], (S)[(i).s2], (S)[(i).s3], (S)[(i).s4], (S)[(i).s5], (S)[(i).s6], (S)[(i).s7], (S)[(i).s8], (S)[(i).s9], (S)[(i).sa], (S)[(i).sb], (S)[(i).sc], (S)[(i).sd], (S)[(i).se], (S)[(i).sf]) #endif -DECLSPEC void lotus_mix (u32 *in, __local u32 *s_lotus_magic_table) +DECLSPEC void lotus_mix (u32 *in, LOCAL_AS u32 *s_lotus_magic_table) { u32 p = 0; @@ -84,7 +84,7 @@ DECLSPEC void lotus_mix (u32 *in, __local u32 *s_lotus_magic_table) } } -DECLSPEC void lotus_transform_password (const u32 *in, u32x *out, __local u32 *s_lotus_magic_table) +DECLSPEC void lotus_transform_password (const u32 *in, u32x *out, LOCAL_AS u32 *s_lotus_magic_table) { u32 t = out[3] >> 24; @@ -181,7 +181,7 @@ DECLSPEC void pad (u32 *w, const u32 len) } } -DECLSPEC void mdtransform_norecalc (u32 *state, const u32x *block, __local u32 *s_lotus_magic_table) +DECLSPEC void mdtransform_norecalc (u32 *state, const u32x *block, LOCAL_AS u32 *s_lotus_magic_table) { u32 x[12]; @@ -206,14 +206,14 @@ DECLSPEC void mdtransform_norecalc (u32 *state, const u32x *block, __local u32 * state[3] = x[3]; } -DECLSPEC void mdtransform (u32 *state, u32x *checksum, const u32x *block, __local u32 *s_lotus_magic_table) +DECLSPEC void mdtransform (u32 *state, u32x *checksum, const u32x *block, LOCAL_AS u32 *s_lotus_magic_table) { mdtransform_norecalc (state, block, s_lotus_magic_table); lotus_transform_password (block, checksum, s_lotus_magic_table); } -DECLSPEC void domino_big_md (const u32 *saved_key, const u32 size, u32x *state, __local u32 *s_lotus_magic_table) +DECLSPEC void domino_big_md (const u32 *saved_key, const u32 size, u32x *state, LOCAL_AS u32 *s_lotus_magic_table) { u32 checksum[4]; @@ -227,7 +227,7 @@ DECLSPEC void domino_big_md (const u32 *saved_key, const u32 size, u32x *state, mdtransform_norecalc (state, checksum, s_lotus_magic_table); } -__kernel void m08600_mxx (KERN_ATTR_BASIC ()) +KERNEL_FQ void m08600_mxx (KERN_ATTR_BASIC ()) { /** * base @@ -241,7 +241,7 @@ __kernel void m08600_mxx (KERN_ATTR_BASIC ()) * sbox */ - __local u32 s_lotus_magic_table[256]; + LOCAL_AS u32 s_lotus_magic_table[256]; for (u32 i = lid; i < 256; i += lsz) { @@ -351,7 +351,7 @@ __kernel void m08600_mxx (KERN_ATTR_BASIC ()) } } -__kernel void m08600_sxx (KERN_ATTR_BASIC ()) +KERNEL_FQ void m08600_sxx (KERN_ATTR_BASIC ()) { /** * base @@ -365,7 +365,7 @@ __kernel void m08600_sxx (KERN_ATTR_BASIC ()) * sbox */ - __local u32 s_lotus_magic_table[256]; + LOCAL_AS u32 s_lotus_magic_table[256]; for (u32 i = lid; i < 256; i += lsz) { diff --git a/OpenCL/m08600_a3-pure.cl b/OpenCL/m08600_a3-pure.cl index 090c30368..cd596b5c0 100644 --- a/OpenCL/m08600_a3-pure.cl +++ b/OpenCL/m08600_a3-pure.cl @@ -12,7 +12,7 @@ #include "inc_simd.cl" #endif -__constant u32a lotus_magic_table[256] = +CONSTANT_AS u32a lotus_magic_table[256] = { 0xbd, 0x56, 0xea, 0xf2, 0xa2, 0xf1, 0xac, 0x2a, 0xb0, 0x93, 0xd1, 0x9c, 0x1b, 0x33, 0xfd, 0xd0, @@ -60,7 +60,7 @@ __constant u32a lotus_magic_table[256] = #define BOX1(S,i) (u32x) ((S)[(i).s0], (S)[(i).s1], (S)[(i).s2], (S)[(i).s3], (S)[(i).s4], (S)[(i).s5], (S)[(i).s6], (S)[(i).s7], (S)[(i).s8], (S)[(i).s9], (S)[(i).sa], (S)[(i).sb], (S)[(i).sc], (S)[(i).sd], (S)[(i).se], (S)[(i).sf]) #endif -DECLSPEC void lotus_mix (u32x *in, __local u32 *s_lotus_magic_table) +DECLSPEC void lotus_mix (u32x *in, LOCAL_AS u32 *s_lotus_magic_table) { u32x p = 0; @@ -83,7 +83,7 @@ DECLSPEC void lotus_mix (u32x *in, __local u32 *s_lotus_magic_table) } } -DECLSPEC void lotus_transform_password (const u32x *in, u32x *out, __local u32 *s_lotus_magic_table) +DECLSPEC void lotus_transform_password (const u32x *in, u32x *out, LOCAL_AS u32 *s_lotus_magic_table) { u32x t = out[3] >> 24; @@ -180,7 +180,7 @@ DECLSPEC void pad (u32 *w, const u32 len) } } -DECLSPEC void mdtransform_norecalc (u32x *state, const u32x *block, __local u32 *s_lotus_magic_table) +DECLSPEC void mdtransform_norecalc (u32x *state, const u32x *block, LOCAL_AS u32 *s_lotus_magic_table) { u32x x[12]; @@ -205,14 +205,14 @@ DECLSPEC void mdtransform_norecalc (u32x *state, const u32x *block, __local u32 state[3] = x[3]; } -DECLSPEC void mdtransform (u32x *state, u32x *checksum, const u32x *block, __local u32 *s_lotus_magic_table) +DECLSPEC void mdtransform (u32x *state, u32x *checksum, const u32x *block, LOCAL_AS u32 *s_lotus_magic_table) { mdtransform_norecalc (state, block, s_lotus_magic_table); lotus_transform_password (block, checksum, s_lotus_magic_table); } -DECLSPEC void domino_big_md (const u32x *saved_key, const u32 size, u32x *state, __local u32 *s_lotus_magic_table) +DECLSPEC void domino_big_md (const u32x *saved_key, const u32 size, u32x *state, LOCAL_AS u32 *s_lotus_magic_table) { u32x checksum[4]; @@ -226,7 +226,7 @@ DECLSPEC void domino_big_md (const u32x *saved_key, const u32 size, u32x *state, mdtransform_norecalc (state, checksum, s_lotus_magic_table); } -DECLSPEC void m08600m (__local u32 *s_lotus_magic_table, u32 *w, const u32 pw_len, KERN_ATTR_VECTOR ()) +DECLSPEC void m08600m (LOCAL_AS u32 *s_lotus_magic_table, u32 *w, const u32 pw_len, KERN_ATTR_VECTOR ()) { /** * modifier @@ -273,7 +273,7 @@ DECLSPEC void m08600m (__local u32 *s_lotus_magic_table, u32 *w, const u32 pw_le } } -DECLSPEC void m08600s (__local u32 *s_lotus_magic_table, u32 *w, const u32 pw_len, KERN_ATTR_VECTOR ()) +DECLSPEC void m08600s (LOCAL_AS u32 *s_lotus_magic_table, u32 *w, const u32 pw_len, KERN_ATTR_VECTOR ()) { /** * modifier @@ -332,7 +332,7 @@ DECLSPEC void m08600s (__local u32 *s_lotus_magic_table, u32 *w, const u32 pw_le } } -__kernel void m08600_mxx (KERN_ATTR_VECTOR ()) +KERNEL_FQ void m08600_mxx (KERN_ATTR_VECTOR ()) { /** * base @@ -346,7 +346,7 @@ __kernel void m08600_mxx (KERN_ATTR_VECTOR ()) * sbox */ - __local u32 s_lotus_magic_table[256]; + LOCAL_AS u32 s_lotus_magic_table[256]; for (u32 i = lid; i < 256; i += lsz) { @@ -389,7 +389,7 @@ __kernel void m08600_mxx (KERN_ATTR_VECTOR ()) m08600m (s_lotus_magic_table, w, pw_len, pws, rules_buf, combs_buf, words_buf_r, 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_extra0_buf, d_extra1_buf, d_extra2_buf, d_extra3_buf, bitmap_mask, bitmap_shift1, bitmap_shift2, salt_pos, loop_pos, loop_cnt, il_cnt, digests_cnt, digests_offset, combs_mode, gid_max); } -__kernel void m08600_sxx (KERN_ATTR_VECTOR ()) +KERNEL_FQ void m08600_sxx (KERN_ATTR_VECTOR ()) { /** * base @@ -403,7 +403,7 @@ __kernel void m08600_sxx (KERN_ATTR_VECTOR ()) * sbox */ - __local u32 s_lotus_magic_table[256]; + LOCAL_AS u32 s_lotus_magic_table[256]; for (u32 i = lid; i < 256; i += lsz) { diff --git a/OpenCL/m08700_a0-optimized.cl b/OpenCL/m08700_a0-optimized.cl index 7f7083437..a27ea84fe 100644 --- a/OpenCL/m08700_a0-optimized.cl +++ b/OpenCL/m08700_a0-optimized.cl @@ -15,7 +15,7 @@ #include "inc_simd.cl" #endif -__constant u32a lotus_magic_table[256] = +CONSTANT_AS u32a lotus_magic_table[256] = { 0xbd, 0x56, 0xea, 0xf2, 0xa2, 0xf1, 0xac, 0x2a, 0xb0, 0x93, 0xd1, 0x9c, 0x1b, 0x33, 0xfd, 0xd0, @@ -75,7 +75,7 @@ __constant u32a lotus_magic_table[256] = #define BOX1(S,i) (u32x) ((S)[(i).s0], (S)[(i).s1], (S)[(i).s2], (S)[(i).s3], (S)[(i).s4], (S)[(i).s5], (S)[(i).s6], (S)[(i).s7], (S)[(i).s8], (S)[(i).s9], (S)[(i).sa], (S)[(i).sb], (S)[(i).sc], (S)[(i).sd], (S)[(i).se], (S)[(i).sf]) #endif -DECLSPEC void lotus_mix (u32x *in, __local u32 *s_lotus_magic_table) +DECLSPEC void lotus_mix (u32x *in, LOCAL_AS u32 *s_lotus_magic_table) { u32x p = 0; @@ -98,7 +98,7 @@ DECLSPEC void lotus_mix (u32x *in, __local u32 *s_lotus_magic_table) } } -DECLSPEC void lotus_transform_password (u32x *in, u32x *out, __local u32 *s_lotus_magic_table) +DECLSPEC void lotus_transform_password (u32x *in, u32x *out, LOCAL_AS u32 *s_lotus_magic_table) { u32x t = out[3] >> 24; @@ -195,7 +195,7 @@ DECLSPEC void pad (u32 *w, const u32 len) } } -DECLSPEC void mdtransform_norecalc (u32x *state, u32x *block, __local u32 *s_lotus_magic_table) +DECLSPEC void mdtransform_norecalc (u32x *state, u32x *block, LOCAL_AS u32 *s_lotus_magic_table) { u32x x[12]; @@ -220,14 +220,14 @@ DECLSPEC void mdtransform_norecalc (u32x *state, u32x *block, __local u32 *s_lot state[3] = x[3]; } -DECLSPEC void mdtransform (u32x *state, u32x *checksum, u32x *block, __local u32 *s_lotus_magic_table) +DECLSPEC void mdtransform (u32x *state, u32x *checksum, u32x *block, LOCAL_AS u32 *s_lotus_magic_table) { mdtransform_norecalc (state, block, s_lotus_magic_table); lotus_transform_password (block, checksum, s_lotus_magic_table); } -DECLSPEC void domino_big_md (const u32x *saved_key, const u32 size, u32x *state, __local u32 *s_lotus_magic_table) +DECLSPEC void domino_big_md (const u32x *saved_key, const u32 size, u32x *state, LOCAL_AS u32 *s_lotus_magic_table) { u32x checksum[4]; @@ -266,7 +266,7 @@ DECLSPEC void domino_big_md (const u32x *saved_key, const u32 size, u32x *state, mdtransform_norecalc (state, checksum, s_lotus_magic_table); } -__kernel void m08700_m04 (KERN_ATTR_RULES ()) +KERNEL_FQ void m08700_m04 (KERN_ATTR_RULES ()) { /** * base @@ -280,14 +280,14 @@ __kernel void m08700_m04 (KERN_ATTR_RULES ()) * sbox */ - __local u32 s_lotus_magic_table[256]; + LOCAL_AS u32 s_lotus_magic_table[256]; for (u32 i = lid; i < 256; i += lsz) { s_lotus_magic_table[i] = lotus_magic_table[i]; } - __local u32 l_bin2asc[256]; + LOCAL_AS u32 l_bin2asc[256]; for (u32 i = lid; i < 256; i += lsz) { @@ -445,15 +445,15 @@ __kernel void m08700_m04 (KERN_ATTR_RULES ()) } } -__kernel void m08700_m08 (KERN_ATTR_RULES ()) +KERNEL_FQ void m08700_m08 (KERN_ATTR_RULES ()) { } -__kernel void m08700_m16 (KERN_ATTR_RULES ()) +KERNEL_FQ void m08700_m16 (KERN_ATTR_RULES ()) { } -__kernel void m08700_s04 (KERN_ATTR_RULES ()) +KERNEL_FQ void m08700_s04 (KERN_ATTR_RULES ()) { /** * base @@ -467,14 +467,14 @@ __kernel void m08700_s04 (KERN_ATTR_RULES ()) * sbox */ - __local u32 s_lotus_magic_table[256]; + LOCAL_AS u32 s_lotus_magic_table[256]; for (u32 i = lid; i < 256; i += lsz) { s_lotus_magic_table[i] = lotus_magic_table[i]; } - __local u32 l_bin2asc[256]; + LOCAL_AS u32 l_bin2asc[256]; for (u32 i = lid; i < 256; i += lsz) { @@ -644,10 +644,10 @@ __kernel void m08700_s04 (KERN_ATTR_RULES ()) } } -__kernel void m08700_s08 (KERN_ATTR_RULES ()) +KERNEL_FQ void m08700_s08 (KERN_ATTR_RULES ()) { } -__kernel void m08700_s16 (KERN_ATTR_RULES ()) +KERNEL_FQ void m08700_s16 (KERN_ATTR_RULES ()) { } diff --git a/OpenCL/m08700_a1-optimized.cl b/OpenCL/m08700_a1-optimized.cl index 771fa617c..2041e3f5d 100644 --- a/OpenCL/m08700_a1-optimized.cl +++ b/OpenCL/m08700_a1-optimized.cl @@ -13,7 +13,7 @@ #include "inc_simd.cl" #endif -__constant u32a lotus_magic_table[256] = +CONSTANT_AS u32a lotus_magic_table[256] = { 0xbd, 0x56, 0xea, 0xf2, 0xa2, 0xf1, 0xac, 0x2a, 0xb0, 0x93, 0xd1, 0x9c, 0x1b, 0x33, 0xfd, 0xd0, @@ -73,7 +73,7 @@ __constant u32a lotus_magic_table[256] = #define BOX1(S,i) (u32x) ((S)[(i).s0], (S)[(i).s1], (S)[(i).s2], (S)[(i).s3], (S)[(i).s4], (S)[(i).s5], (S)[(i).s6], (S)[(i).s7], (S)[(i).s8], (S)[(i).s9], (S)[(i).sa], (S)[(i).sb], (S)[(i).sc], (S)[(i).sd], (S)[(i).se], (S)[(i).sf]) #endif -DECLSPEC void lotus_mix (u32x *in, __local u32 *s_lotus_magic_table) +DECLSPEC void lotus_mix (u32x *in, LOCAL_AS u32 *s_lotus_magic_table) { u32x p = 0; @@ -96,7 +96,7 @@ DECLSPEC void lotus_mix (u32x *in, __local u32 *s_lotus_magic_table) } } -DECLSPEC void lotus_transform_password (u32x *in, u32x *out, __local u32 *s_lotus_magic_table) +DECLSPEC void lotus_transform_password (u32x *in, u32x *out, LOCAL_AS u32 *s_lotus_magic_table) { u32x t = out[3] >> 24; @@ -193,7 +193,7 @@ DECLSPEC void pad (u32 *w, const u32 len) } } -DECLSPEC void mdtransform_norecalc (u32x *state, u32x *block, __local u32 *s_lotus_magic_table) +DECLSPEC void mdtransform_norecalc (u32x *state, u32x *block, LOCAL_AS u32 *s_lotus_magic_table) { u32x x[12]; @@ -218,14 +218,14 @@ DECLSPEC void mdtransform_norecalc (u32x *state, u32x *block, __local u32 *s_lot state[3] = x[3]; } -DECLSPEC void mdtransform (u32x *state, u32x *checksum, u32x *block, __local u32 *s_lotus_magic_table) +DECLSPEC void mdtransform (u32x *state, u32x *checksum, u32x *block, LOCAL_AS u32 *s_lotus_magic_table) { mdtransform_norecalc (state, block, s_lotus_magic_table); lotus_transform_password (block, checksum, s_lotus_magic_table); } -DECLSPEC void domino_big_md (const u32x *saved_key, const u32 size, u32x *state, __local u32 *s_lotus_magic_table) +DECLSPEC void domino_big_md (const u32x *saved_key, const u32 size, u32x *state, LOCAL_AS u32 *s_lotus_magic_table) { u32x checksum[4]; @@ -264,7 +264,7 @@ DECLSPEC void domino_big_md (const u32x *saved_key, const u32 size, u32x *state, mdtransform_norecalc (state, checksum, s_lotus_magic_table); } -__kernel void m08700_m04 (KERN_ATTR_BASIC ()) +KERNEL_FQ void m08700_m04 (KERN_ATTR_BASIC ()) { /** * base @@ -278,14 +278,14 @@ __kernel void m08700_m04 (KERN_ATTR_BASIC ()) * sbox */ - __local u32 s_lotus_magic_table[256]; + LOCAL_AS u32 s_lotus_magic_table[256]; for (u32 i = lid; i < 256; i += lsz) { s_lotus_magic_table[i] = lotus_magic_table[i]; } - __local u32 l_bin2asc[256]; + LOCAL_AS u32 l_bin2asc[256]; for (u32 i = lid; i < 256; i += lsz) { @@ -503,15 +503,15 @@ __kernel void m08700_m04 (KERN_ATTR_BASIC ()) } } -__kernel void m08700_m08 (KERN_ATTR_BASIC ()) +KERNEL_FQ void m08700_m08 (KERN_ATTR_BASIC ()) { } -__kernel void m08700_m16 (KERN_ATTR_BASIC ()) +KERNEL_FQ void m08700_m16 (KERN_ATTR_BASIC ()) { } -__kernel void m08700_s04 (KERN_ATTR_BASIC ()) +KERNEL_FQ void m08700_s04 (KERN_ATTR_BASIC ()) { /** * base @@ -525,14 +525,14 @@ __kernel void m08700_s04 (KERN_ATTR_BASIC ()) * sbox */ - __local u32 s_lotus_magic_table[256]; + LOCAL_AS u32 s_lotus_magic_table[256]; for (u32 i = lid; i < 256; i += lsz) { s_lotus_magic_table[i] = lotus_magic_table[i]; } - __local u32 l_bin2asc[256]; + LOCAL_AS u32 l_bin2asc[256]; for (u32 i = lid; i < 256; i += lsz) { @@ -762,10 +762,10 @@ __kernel void m08700_s04 (KERN_ATTR_BASIC ()) } } -__kernel void m08700_s08 (KERN_ATTR_BASIC ()) +KERNEL_FQ void m08700_s08 (KERN_ATTR_BASIC ()) { } -__kernel void m08700_s16 (KERN_ATTR_BASIC ()) +KERNEL_FQ void m08700_s16 (KERN_ATTR_BASIC ()) { } diff --git a/OpenCL/m08700_a3-optimized.cl b/OpenCL/m08700_a3-optimized.cl index c554f1ef0..897bc16c5 100644 --- a/OpenCL/m08700_a3-optimized.cl +++ b/OpenCL/m08700_a3-optimized.cl @@ -12,7 +12,7 @@ #include "inc_simd.cl" #endif -__constant u32a lotus_magic_table[256] = +CONSTANT_AS u32a lotus_magic_table[256] = { 0xbd, 0x56, 0xea, 0xf2, 0xa2, 0xf1, 0xac, 0x2a, 0xb0, 0x93, 0xd1, 0x9c, 0x1b, 0x33, 0xfd, 0xd0, @@ -74,7 +74,7 @@ __constant u32a lotus_magic_table[256] = #define BOX1(S,i) (u32x) ((S)[(i).s0], (S)[(i).s1], (S)[(i).s2], (S)[(i).s3], (S)[(i).s4], (S)[(i).s5], (S)[(i).s6], (S)[(i).s7], (S)[(i).s8], (S)[(i).s9], (S)[(i).sa], (S)[(i).sb], (S)[(i).sc], (S)[(i).sd], (S)[(i).se], (S)[(i).sf]) #endif -DECLSPEC void lotus_mix (u32x *in, __local u32 *s_lotus_magic_table) +DECLSPEC void lotus_mix (u32x *in, LOCAL_AS u32 *s_lotus_magic_table) { u32x p = 0; @@ -97,7 +97,7 @@ DECLSPEC void lotus_mix (u32x *in, __local u32 *s_lotus_magic_table) } } -DECLSPEC void lotus_transform_password (u32x *in, u32x *out, __local u32 *s_lotus_magic_table) +DECLSPEC void lotus_transform_password (u32x *in, u32x *out, LOCAL_AS u32 *s_lotus_magic_table) { u32x t = out[3] >> 24; @@ -194,7 +194,7 @@ DECLSPEC void pad (u32 *w, const u32 len) } } -DECLSPEC void mdtransform_norecalc (u32x *state, u32x *block, __local u32 *s_lotus_magic_table) +DECLSPEC void mdtransform_norecalc (u32x *state, u32x *block, LOCAL_AS u32 *s_lotus_magic_table) { u32x x[12]; @@ -219,14 +219,14 @@ DECLSPEC void mdtransform_norecalc (u32x *state, u32x *block, __local u32 *s_lot state[3] = x[3]; } -DECLSPEC void mdtransform (u32x *state, u32x *checksum, u32x *block, __local u32 *s_lotus_magic_table) +DECLSPEC void mdtransform (u32x *state, u32x *checksum, u32x *block, LOCAL_AS u32 *s_lotus_magic_table) { mdtransform_norecalc (state, block, s_lotus_magic_table); lotus_transform_password (block, checksum, s_lotus_magic_table); } -DECLSPEC void domino_big_md (const u32x *saved_key, const u32 size, u32x *state, __local u32 *s_lotus_magic_table) +DECLSPEC void domino_big_md (const u32x *saved_key, const u32 size, u32x *state, LOCAL_AS u32 *s_lotus_magic_table) { u32x checksum[4]; @@ -265,7 +265,7 @@ DECLSPEC void domino_big_md (const u32x *saved_key, const u32 size, u32x *state, mdtransform_norecalc (state, checksum, s_lotus_magic_table); } -DECLSPEC void m08700m (__local u32 *s_lotus_magic_table, __local u32 *l_bin2asc, u32 *w, const u32 pw_len, KERN_ATTR_VECTOR ()) +DECLSPEC void m08700m (LOCAL_AS u32 *s_lotus_magic_table, LOCAL_AS u32 *l_bin2asc, u32 *w, const u32 pw_len, KERN_ATTR_VECTOR ()) { /** * modifier @@ -398,7 +398,7 @@ DECLSPEC void m08700m (__local u32 *s_lotus_magic_table, __local u32 *l_bin2asc, } } -DECLSPEC void m08700s (__local u32 *s_lotus_magic_table, __local u32 *l_bin2asc, u32 *w, const u32 pw_len, KERN_ATTR_VECTOR ()) +DECLSPEC void m08700s (LOCAL_AS u32 *s_lotus_magic_table, LOCAL_AS u32 *l_bin2asc, u32 *w, const u32 pw_len, KERN_ATTR_VECTOR ()) { /** * modifier @@ -543,7 +543,7 @@ DECLSPEC void m08700s (__local u32 *s_lotus_magic_table, __local u32 *l_bin2asc, } } -__kernel void m08700_m04 (KERN_ATTR_VECTOR ()) +KERNEL_FQ void m08700_m04 (KERN_ATTR_VECTOR ()) { /** * base @@ -557,14 +557,14 @@ __kernel void m08700_m04 (KERN_ATTR_VECTOR ()) * sbox */ - __local u32 s_lotus_magic_table[256]; + LOCAL_AS u32 s_lotus_magic_table[256]; for (u32 i = lid; i < 256; i += lsz) { s_lotus_magic_table[i] = lotus_magic_table[i]; } - __local u32 l_bin2asc[256]; + LOCAL_AS u32 l_bin2asc[256]; for (u32 i = lid; i < 256; i += lsz) { @@ -611,7 +611,7 @@ __kernel void m08700_m04 (KERN_ATTR_VECTOR ()) m08700m (s_lotus_magic_table, l_bin2asc, w, pw_len, pws, rules_buf, combs_buf, words_buf_r, 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_extra0_buf, d_extra1_buf, d_extra2_buf, d_extra3_buf, bitmap_mask, bitmap_shift1, bitmap_shift2, salt_pos, loop_pos, loop_cnt, il_cnt, digests_cnt, digests_offset, combs_mode, gid_max); } -__kernel void m08700_m08 (KERN_ATTR_VECTOR ()) +KERNEL_FQ void m08700_m08 (KERN_ATTR_VECTOR ()) { /** * base @@ -625,14 +625,14 @@ __kernel void m08700_m08 (KERN_ATTR_VECTOR ()) * sbox */ - __local u32 s_lotus_magic_table[256]; + LOCAL_AS u32 s_lotus_magic_table[256]; for (u32 i = lid; i < 256; i += lsz) { s_lotus_magic_table[i] = lotus_magic_table[i]; } - __local u32 l_bin2asc[256]; + LOCAL_AS u32 l_bin2asc[256]; for (u32 i = lid; i < 256; i += lsz) { @@ -679,7 +679,7 @@ __kernel void m08700_m08 (KERN_ATTR_VECTOR ()) m08700m (s_lotus_magic_table, l_bin2asc, w, pw_len, pws, rules_buf, combs_buf, words_buf_r, 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_extra0_buf, d_extra1_buf, d_extra2_buf, d_extra3_buf, bitmap_mask, bitmap_shift1, bitmap_shift2, salt_pos, loop_pos, loop_cnt, il_cnt, digests_cnt, digests_offset, combs_mode, gid_max); } -__kernel void m08700_m16 (KERN_ATTR_VECTOR ()) +KERNEL_FQ void m08700_m16 (KERN_ATTR_VECTOR ()) { /** * base @@ -693,14 +693,14 @@ __kernel void m08700_m16 (KERN_ATTR_VECTOR ()) * sbox */ - __local u32 s_lotus_magic_table[256]; + LOCAL_AS u32 s_lotus_magic_table[256]; for (u32 i = lid; i < 256; i += lsz) { s_lotus_magic_table[i] = lotus_magic_table[i]; } - __local u32 l_bin2asc[256]; + LOCAL_AS u32 l_bin2asc[256]; for (u32 i = lid; i < 256; i += lsz) { @@ -747,7 +747,7 @@ __kernel void m08700_m16 (KERN_ATTR_VECTOR ()) m08700m (s_lotus_magic_table, l_bin2asc, w, pw_len, pws, rules_buf, combs_buf, words_buf_r, 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_extra0_buf, d_extra1_buf, d_extra2_buf, d_extra3_buf, bitmap_mask, bitmap_shift1, bitmap_shift2, salt_pos, loop_pos, loop_cnt, il_cnt, digests_cnt, digests_offset, combs_mode, gid_max); } -__kernel void m08700_s04 (KERN_ATTR_VECTOR ()) +KERNEL_FQ void m08700_s04 (KERN_ATTR_VECTOR ()) { /** * base @@ -761,14 +761,14 @@ __kernel void m08700_s04 (KERN_ATTR_VECTOR ()) * sbox */ - __local u32 s_lotus_magic_table[256]; + LOCAL_AS u32 s_lotus_magic_table[256]; for (u32 i = lid; i < 256; i += lsz) { s_lotus_magic_table[i] = lotus_magic_table[i]; } - __local u32 l_bin2asc[256]; + LOCAL_AS u32 l_bin2asc[256]; for (u32 i = lid; i < 256; i += lsz) { @@ -815,7 +815,7 @@ __kernel void m08700_s04 (KERN_ATTR_VECTOR ()) m08700s (s_lotus_magic_table, l_bin2asc, w, pw_len, pws, rules_buf, combs_buf, words_buf_r, 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_extra0_buf, d_extra1_buf, d_extra2_buf, d_extra3_buf, bitmap_mask, bitmap_shift1, bitmap_shift2, salt_pos, loop_pos, loop_cnt, il_cnt, digests_cnt, digests_offset, combs_mode, gid_max); } -__kernel void m08700_s08 (KERN_ATTR_VECTOR ()) +KERNEL_FQ void m08700_s08 (KERN_ATTR_VECTOR ()) { /** * base @@ -829,14 +829,14 @@ __kernel void m08700_s08 (KERN_ATTR_VECTOR ()) * sbox */ - __local u32 s_lotus_magic_table[256]; + LOCAL_AS u32 s_lotus_magic_table[256]; for (u32 i = lid; i < 256; i += lsz) { s_lotus_magic_table[i] = lotus_magic_table[i]; } - __local u32 l_bin2asc[256]; + LOCAL_AS u32 l_bin2asc[256]; for (u32 i = lid; i < 256; i += lsz) { @@ -883,7 +883,7 @@ __kernel void m08700_s08 (KERN_ATTR_VECTOR ()) m08700s (s_lotus_magic_table, l_bin2asc, w, pw_len, pws, rules_buf, combs_buf, words_buf_r, 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_extra0_buf, d_extra1_buf, d_extra2_buf, d_extra3_buf, bitmap_mask, bitmap_shift1, bitmap_shift2, salt_pos, loop_pos, loop_cnt, il_cnt, digests_cnt, digests_offset, combs_mode, gid_max); } -__kernel void m08700_s16 (KERN_ATTR_VECTOR ()) +KERNEL_FQ void m08700_s16 (KERN_ATTR_VECTOR ()) { /** * base @@ -897,14 +897,14 @@ __kernel void m08700_s16 (KERN_ATTR_VECTOR ()) * sbox */ - __local u32 s_lotus_magic_table[256]; + LOCAL_AS u32 s_lotus_magic_table[256]; for (u32 i = lid; i < 256; i += lsz) { s_lotus_magic_table[i] = lotus_magic_table[i]; } - __local u32 l_bin2asc[256]; + LOCAL_AS u32 l_bin2asc[256]; for (u32 i = lid; i < 256; i += lsz) { diff --git a/OpenCL/m08800-pure.cl b/OpenCL/m08800-pure.cl index 1ea3f1eeb..2e1ad9687 100644 --- a/OpenCL/m08800-pure.cl +++ b/OpenCL/m08800-pure.cl @@ -67,7 +67,7 @@ DECLSPEC void hmac_sha1_run_V (u32x *w0, u32x *w1, u32x *w2, u32x *w3, u32x *ipa sha1_transform_vector (w0, w1, w2, w3, digest); } -__kernel void m08800_init (KERN_ATTR_TMPS_ESALT (androidfde_tmp_t, androidfde_t)) +KERNEL_FQ void m08800_init (KERN_ATTR_TMPS_ESALT (androidfde_tmp_t, androidfde_t)) { /** * base @@ -139,7 +139,7 @@ __kernel void m08800_init (KERN_ATTR_TMPS_ESALT (androidfde_tmp_t, androidfde_t) } } -__kernel void m08800_loop (KERN_ATTR_TMPS_ESALT (androidfde_tmp_t, androidfde_t)) +KERNEL_FQ void m08800_loop (KERN_ATTR_TMPS_ESALT (androidfde_tmp_t, androidfde_t)) { const u64 gid = get_global_id (0); @@ -224,7 +224,7 @@ __kernel void m08800_loop (KERN_ATTR_TMPS_ESALT (androidfde_tmp_t, androidfde_t) } } -__kernel void m08800_comp (KERN_ATTR_TMPS_ESALT (androidfde_tmp_t, androidfde_t)) +KERNEL_FQ void m08800_comp (KERN_ATTR_TMPS_ESALT (androidfde_tmp_t, androidfde_t)) { const u64 gid = get_global_id (0); const u64 lid = get_local_id (0); @@ -236,17 +236,17 @@ __kernel void m08800_comp (KERN_ATTR_TMPS_ESALT (androidfde_tmp_t, androidfde_t) #ifdef REAL_SHM - __local u32 s_td0[256]; - __local u32 s_td1[256]; - __local u32 s_td2[256]; - __local u32 s_td3[256]; - __local u32 s_td4[256]; + LOCAL_AS u32 s_td0[256]; + LOCAL_AS u32 s_td1[256]; + LOCAL_AS u32 s_td2[256]; + LOCAL_AS u32 s_td3[256]; + LOCAL_AS u32 s_td4[256]; - __local u32 s_te0[256]; - __local u32 s_te1[256]; - __local u32 s_te2[256]; - __local u32 s_te3[256]; - __local u32 s_te4[256]; + LOCAL_AS u32 s_te0[256]; + LOCAL_AS u32 s_te1[256]; + LOCAL_AS u32 s_te2[256]; + LOCAL_AS u32 s_te3[256]; + LOCAL_AS u32 s_te4[256]; for (u32 i = lid; i < 256; i += lsz) { @@ -267,17 +267,17 @@ __kernel void m08800_comp (KERN_ATTR_TMPS_ESALT (androidfde_tmp_t, androidfde_t) #else - __constant u32a *s_td0 = td0; - __constant u32a *s_td1 = td1; - __constant u32a *s_td2 = td2; - __constant u32a *s_td3 = td3; - __constant u32a *s_td4 = td4; + CONSTANT_AS u32a *s_td0 = td0; + CONSTANT_AS u32a *s_td1 = td1; + CONSTANT_AS u32a *s_td2 = td2; + CONSTANT_AS u32a *s_td3 = td3; + CONSTANT_AS u32a *s_td4 = td4; - __constant u32a *s_te0 = te0; - __constant u32a *s_te1 = te1; - __constant u32a *s_te2 = te2; - __constant u32a *s_te3 = te3; - __constant u32a *s_te4 = te4; + CONSTANT_AS u32a *s_te0 = te0; + CONSTANT_AS u32a *s_te1 = te1; + CONSTANT_AS u32a *s_te2 = te2; + CONSTANT_AS u32a *s_te3 = te3; + CONSTANT_AS u32a *s_te4 = te4; #endif diff --git a/OpenCL/m08900-pure.cl b/OpenCL/m08900-pure.cl index 14cddaa86..bdd145a0b 100644 --- a/OpenCL/m08900-pure.cl +++ b/OpenCL/m08900-pure.cl @@ -135,7 +135,7 @@ DECLSPEC void salsa_r (uint4 *TI) } } -DECLSPEC void scrypt_smix (uint4 *X, uint4 *T, __global uint4 * restrict V0, __global uint4 * restrict V1, __global uint4 * restrict V2, __global uint4 * restrict V3) +DECLSPEC void scrypt_smix (uint4 *X, uint4 *T, GLOBAL_AS uint4 * restrict V0, GLOBAL_AS uint4 * restrict V1, GLOBAL_AS uint4 * restrict V2, GLOBAL_AS uint4 * restrict V3) { #define Coord(xd4,y,z) (((xd4) * ySIZE * zSIZE) + ((y) * zSIZE) + (z)) #define CO Coord(xd4,y,z) @@ -148,7 +148,7 @@ DECLSPEC void scrypt_smix (uint4 *X, uint4 *T, __global uint4 * restrict V0, __g const u32 xd4 = x / 4; const u32 xm4 = x & 3; - __global uint4 * restrict V; + GLOBAL_AS uint4 * restrict V; switch (xm4) { @@ -215,7 +215,7 @@ DECLSPEC void scrypt_smix (uint4 *X, uint4 *T, __global uint4 * restrict V0, __g } } -__kernel void m08900_init (KERN_ATTR_TMPS (scrypt_tmp_t)) +KERNEL_FQ void m08900_init (KERN_ATTR_TMPS (scrypt_tmp_t)) { /** * base @@ -280,16 +280,16 @@ __kernel void m08900_init (KERN_ATTR_TMPS (scrypt_tmp_t)) } } -__kernel void m08900_loop (KERN_ATTR_TMPS (scrypt_tmp_t)) +KERNEL_FQ void m08900_loop (KERN_ATTR_TMPS (scrypt_tmp_t)) { const u64 gid = get_global_id (0); if (gid >= gid_max) return; - __global uint4 * restrict d_scrypt0_buf = d_extra0_buf; - __global uint4 * restrict d_scrypt1_buf = d_extra1_buf; - __global uint4 * restrict d_scrypt2_buf = d_extra2_buf; - __global uint4 * restrict d_scrypt3_buf = d_extra3_buf; + GLOBAL_AS uint4 * restrict d_scrypt0_buf = d_extra0_buf; + GLOBAL_AS uint4 * restrict d_scrypt1_buf = d_extra1_buf; + GLOBAL_AS uint4 * restrict d_scrypt2_buf = d_extra2_buf; + GLOBAL_AS uint4 * restrict d_scrypt3_buf = d_extra3_buf; uint4 X[STATE_CNT4]; uint4 T[STATE_CNT4]; @@ -318,7 +318,7 @@ __kernel void m08900_loop (KERN_ATTR_TMPS (scrypt_tmp_t)) #endif } -__kernel void m08900_comp (KERN_ATTR_TMPS (scrypt_tmp_t)) +KERNEL_FQ void m08900_comp (KERN_ATTR_TMPS (scrypt_tmp_t)) { /** * base diff --git a/OpenCL/m09000-pure.cl b/OpenCL/m09000-pure.cl index 380313c6d..89aa6847c 100644 --- a/OpenCL/m09000-pure.cl +++ b/OpenCL/m09000-pure.cl @@ -28,7 +28,7 @@ typedef struct pwsafe2_tmp // http://www.schneier.com/code/constants.txt -__constant u32a c_sbox0[256] = +CONSTANT_AS u32a c_sbox0[256] = { 0xd1310ba6, 0x98dfb5ac, 0x2ffd72db, 0xd01adfb7, 0xb8e1afed, 0x6a267e96, 0xba7c9045, 0xf12c7f99, @@ -96,7 +96,7 @@ __constant u32a c_sbox0[256] = 0x53b02d5d, 0xa99f8fa1, 0x08ba4799, 0x6e85076a }; -__constant u32a c_sbox1[256] = +CONSTANT_AS u32a c_sbox1[256] = { 0x4b7a70e9, 0xb5b32944, 0xdb75092e, 0xc4192623, 0xad6ea6b0, 0x49a7df7d, 0x9cee60b8, 0x8fedb266, @@ -164,7 +164,7 @@ __constant u32a c_sbox1[256] = 0x153e21e7, 0x8fb03d4a, 0xe6e39f2b, 0xdb83adf7 }; -__constant u32a c_sbox2[256] = +CONSTANT_AS u32a c_sbox2[256] = { 0xe93d5a68, 0x948140f7, 0xf64c261c, 0x94692934, 0x411520f7, 0x7602d4f7, 0xbcf46b2e, 0xd4a20068, @@ -232,7 +232,7 @@ __constant u32a c_sbox2[256] = 0xd79a3234, 0x92638212, 0x670efa8e, 0x406000e0 }; -__constant u32a c_sbox3[256] = +CONSTANT_AS u32a c_sbox3[256] = { 0x3a39ce37, 0xd3faf5cf, 0xabc27737, 0x5ac52d1b, 0x5cb0679e, 0x4fa33742, 0xd3822740, 0x99bc9bbe, @@ -300,7 +300,7 @@ __constant u32a c_sbox3[256] = 0xb74e6132, 0xce77e25b, 0x578fdfe3, 0x3ac372e6 }; -__constant u32a c_pbox[18] = +CONSTANT_AS u32a c_pbox[18] = { 0x243f6a88, 0x85a308d3, 0x13198a2e, 0x03707344, 0xa4093822, 0x299f31d0, 0x082efa98, 0xec4e6c89, @@ -356,7 +356,7 @@ __constant u32a c_pbox[18] = L ^= P[17]; \ } -__kernel void __attribute__((reqd_work_group_size(FIXED_LOCAL_SIZE, 1, 1))) m09000_init (KERN_ATTR_TMPS (pwsafe2_tmp_t)) +KERNEL_FQ void __attribute__((reqd_work_group_size(FIXED_LOCAL_SIZE, 1, 1))) m09000_init (KERN_ATTR_TMPS (pwsafe2_tmp_t)) { /** * base @@ -470,15 +470,15 @@ __kernel void __attribute__((reqd_work_group_size(FIXED_LOCAL_SIZE, 1, 1))) m090 P[i] = c_pbox[i]; } - __local u32 S0_all[FIXED_LOCAL_SIZE][256]; - __local u32 S1_all[FIXED_LOCAL_SIZE][256]; - __local u32 S2_all[FIXED_LOCAL_SIZE][256]; - __local u32 S3_all[FIXED_LOCAL_SIZE][256]; + LOCAL_AS u32 S0_all[FIXED_LOCAL_SIZE][256]; + LOCAL_AS u32 S1_all[FIXED_LOCAL_SIZE][256]; + LOCAL_AS u32 S2_all[FIXED_LOCAL_SIZE][256]; + LOCAL_AS u32 S3_all[FIXED_LOCAL_SIZE][256]; - __local u32 *S0 = S0_all[lid]; - __local u32 *S1 = S1_all[lid]; - __local u32 *S2 = S2_all[lid]; - __local u32 *S3 = S3_all[lid]; + LOCAL_AS u32 *S0 = S0_all[lid]; + LOCAL_AS u32 *S1 = S1_all[lid]; + LOCAL_AS u32 *S2 = S2_all[lid]; + LOCAL_AS u32 *S3 = S3_all[lid]; for (u32 i = 0; i < 256; i++) { @@ -575,7 +575,7 @@ __kernel void __attribute__((reqd_work_group_size(FIXED_LOCAL_SIZE, 1, 1))) m090 } } -__kernel void __attribute__((reqd_work_group_size(FIXED_LOCAL_SIZE, 1, 1))) m09000_loop (KERN_ATTR_TMPS (pwsafe2_tmp_t)) +KERNEL_FQ void __attribute__((reqd_work_group_size(FIXED_LOCAL_SIZE, 1, 1))) m09000_loop (KERN_ATTR_TMPS (pwsafe2_tmp_t)) { /** * base @@ -601,15 +601,15 @@ __kernel void __attribute__((reqd_work_group_size(FIXED_LOCAL_SIZE, 1, 1))) m090 P[i] = tmps[gid].P[i]; } - __local u32 S0_all[FIXED_LOCAL_SIZE][256]; - __local u32 S1_all[FIXED_LOCAL_SIZE][256]; - __local u32 S2_all[FIXED_LOCAL_SIZE][256]; - __local u32 S3_all[FIXED_LOCAL_SIZE][256]; + LOCAL_AS u32 S0_all[FIXED_LOCAL_SIZE][256]; + LOCAL_AS u32 S1_all[FIXED_LOCAL_SIZE][256]; + LOCAL_AS u32 S2_all[FIXED_LOCAL_SIZE][256]; + LOCAL_AS u32 S3_all[FIXED_LOCAL_SIZE][256]; - __local u32 *S0 = S0_all[lid]; - __local u32 *S1 = S1_all[lid]; - __local u32 *S2 = S2_all[lid]; - __local u32 *S3 = S3_all[lid]; + LOCAL_AS u32 *S0 = S0_all[lid]; + LOCAL_AS u32 *S1 = S1_all[lid]; + LOCAL_AS u32 *S2 = S2_all[lid]; + LOCAL_AS u32 *S3 = S3_all[lid]; for (u32 i = 0; i < 256; i++) { @@ -635,7 +635,7 @@ __kernel void __attribute__((reqd_work_group_size(FIXED_LOCAL_SIZE, 1, 1))) m090 tmps[gid].digest[1] = R0; } -__kernel void m09000_comp (KERN_ATTR_TMPS (pwsafe2_tmp_t)) +KERNEL_FQ void m09000_comp (KERN_ATTR_TMPS (pwsafe2_tmp_t)) { /** * base diff --git a/OpenCL/m09100-pure.cl b/OpenCL/m09100-pure.cl index 241eb9dbb..6c10b90ff 100644 --- a/OpenCL/m09100-pure.cl +++ b/OpenCL/m09100-pure.cl @@ -26,7 +26,7 @@ typedef struct lotus8_tmp } lotus8_tmp_t; -__constant u32 lotus64_table[64] = +CONSTANT_AS u32 lotus64_table[64] = { '0', '1', '2', '3', '4', '5', '6', '7', '8', '9', 'A', 'B', 'C', 'D', 'E', 'F', @@ -38,7 +38,7 @@ __constant u32 lotus64_table[64] = 'u', 'v', 'w', 'x', 'y', 'z', '+', '/', }; -__constant u32 lotus_magic_table[256] = +CONSTANT_AS u32 lotus_magic_table[256] = { 0xbd, 0x56, 0xea, 0xf2, 0xa2, 0xf1, 0xac, 0x2a, 0xb0, 0x93, 0xd1, 0x9c, 0x1b, 0x33, 0xfd, 0xd0, @@ -78,7 +78,7 @@ __constant u32 lotus_magic_table[256] = #define BOX1(S,i) (S)[(i)] -DECLSPEC void lotus_mix (u32 *in, const __local u32 *s_lotus_magic_table) +DECLSPEC void lotus_mix (u32 *in, const LOCAL_AS u32 *s_lotus_magic_table) { u8 p = 0; @@ -101,7 +101,7 @@ DECLSPEC void lotus_mix (u32 *in, const __local u32 *s_lotus_magic_table) } } -DECLSPEC void lotus_transform_password (const u32 *in, u32 *out, const __local u32 *s_lotus_magic_table) +DECLSPEC void lotus_transform_password (const u32 *in, u32 *out, const LOCAL_AS u32 *s_lotus_magic_table) { u8 t = (u8) (out[3] >> 24); @@ -198,7 +198,7 @@ DECLSPEC void pad (u32 *w, const u32 len) } } -DECLSPEC void mdtransform_norecalc (u32 *state, const u32 *block, const __local u32 *s_lotus_magic_table) +DECLSPEC void mdtransform_norecalc (u32 *state, const u32 *block, const LOCAL_AS u32 *s_lotus_magic_table) { u32 x[12]; @@ -223,14 +223,14 @@ DECLSPEC void mdtransform_norecalc (u32 *state, const u32 *block, const __local state[3] = x[3]; } -DECLSPEC void mdtransform (u32 *state, u32 *checksum, const u32 *block, const __local u32 *s_lotus_magic_table) +DECLSPEC void mdtransform (u32 *state, u32 *checksum, const u32 *block, const LOCAL_AS u32 *s_lotus_magic_table) { mdtransform_norecalc (state, block, s_lotus_magic_table); lotus_transform_password (block, checksum, s_lotus_magic_table); } -DECLSPEC void domino_big_md (const u32 *saved_key, const u32 size, u32 *state, const __local u32 *s_lotus_magic_table) +DECLSPEC void domino_big_md (const u32 *saved_key, const u32 size, u32 *state, const LOCAL_AS u32 *s_lotus_magic_table) { u32 checksum[4]; @@ -394,7 +394,7 @@ DECLSPEC void hmac_sha1_run_V (u32x *w0, u32x *w1, u32x *w2, u32x *w3, u32x *ipa sha1_transform_vector (w0, w1, w2, w3, digest); } -__kernel void m09100_init (KERN_ATTR_TMPS (lotus8_tmp_t)) +KERNEL_FQ void m09100_init (KERN_ATTR_TMPS (lotus8_tmp_t)) { /** * base @@ -408,14 +408,14 @@ __kernel void m09100_init (KERN_ATTR_TMPS (lotus8_tmp_t)) * sbox */ - __local u32 s_lotus_magic_table[256]; + LOCAL_AS u32 s_lotus_magic_table[256]; for (u32 i = lid; i < 256; i += lsz) { s_lotus_magic_table[i] = lotus_magic_table[i]; } - __local u32 l_bin2asc[256]; + LOCAL_AS u32 l_bin2asc[256]; for (u32 i = lid; i < 256; i += lsz) { @@ -660,7 +660,7 @@ __kernel void m09100_init (KERN_ATTR_TMPS (lotus8_tmp_t)) } } -__kernel void m09100_loop (KERN_ATTR_TMPS (lotus8_tmp_t)) +KERNEL_FQ void m09100_loop (KERN_ATTR_TMPS (lotus8_tmp_t)) { const u64 gid = get_global_id (0); @@ -745,7 +745,7 @@ __kernel void m09100_loop (KERN_ATTR_TMPS (lotus8_tmp_t)) } } -__kernel void m09100_comp (KERN_ATTR_TMPS (lotus8_tmp_t)) +KERNEL_FQ void m09100_comp (KERN_ATTR_TMPS (lotus8_tmp_t)) { /** * base diff --git a/OpenCL/m09400-pure.cl b/OpenCL/m09400-pure.cl index 3316f87ca..59f43a6cd 100644 --- a/OpenCL/m09400-pure.cl +++ b/OpenCL/m09400-pure.cl @@ -32,7 +32,7 @@ typedef struct office2007 } office2007_t; -__kernel void m09400_init (KERN_ATTR_TMPS_ESALT (office2007_tmp_t, office2007_t)) +KERNEL_FQ void m09400_init (KERN_ATTR_TMPS_ESALT (office2007_tmp_t, office2007_t)) { /** * base @@ -59,7 +59,7 @@ __kernel void m09400_init (KERN_ATTR_TMPS_ESALT (office2007_tmp_t, office2007_t) tmps[gid].out[4] = ctx.h[4]; } -__kernel void m09400_loop (KERN_ATTR_TMPS_ESALT (office2007_tmp_t, office2007_t)) +KERNEL_FQ void m09400_loop (KERN_ATTR_TMPS_ESALT (office2007_tmp_t, office2007_t)) { const u64 gid = get_global_id (0); @@ -126,7 +126,7 @@ __kernel void m09400_loop (KERN_ATTR_TMPS_ESALT (office2007_tmp_t, office2007_t) unpackv (tmps, out, gid, 4, t4); } -__kernel void m09400_comp (KERN_ATTR_TMPS_ESALT (office2007_tmp_t, office2007_t)) +KERNEL_FQ void m09400_comp (KERN_ATTR_TMPS_ESALT (office2007_tmp_t, office2007_t)) { const u64 gid = get_global_id (0); const u64 lid = get_local_id (0); @@ -138,17 +138,17 @@ __kernel void m09400_comp (KERN_ATTR_TMPS_ESALT (office2007_tmp_t, office2007_t) #ifdef REAL_SHM - __local u32 s_td0[256]; - __local u32 s_td1[256]; - __local u32 s_td2[256]; - __local u32 s_td3[256]; - __local u32 s_td4[256]; + LOCAL_AS u32 s_td0[256]; + LOCAL_AS u32 s_td1[256]; + LOCAL_AS u32 s_td2[256]; + LOCAL_AS u32 s_td3[256]; + LOCAL_AS u32 s_td4[256]; - __local u32 s_te0[256]; - __local u32 s_te1[256]; - __local u32 s_te2[256]; - __local u32 s_te3[256]; - __local u32 s_te4[256]; + LOCAL_AS u32 s_te0[256]; + LOCAL_AS u32 s_te1[256]; + LOCAL_AS u32 s_te2[256]; + LOCAL_AS u32 s_te3[256]; + LOCAL_AS u32 s_te4[256]; for (u32 i = lid; i < 256; i += lsz) { @@ -169,17 +169,17 @@ __kernel void m09400_comp (KERN_ATTR_TMPS_ESALT (office2007_tmp_t, office2007_t) #else - __constant u32a *s_td0 = td0; - __constant u32a *s_td1 = td1; - __constant u32a *s_td2 = td2; - __constant u32a *s_td3 = td3; - __constant u32a *s_td4 = td4; + CONSTANT_AS u32a *s_td0 = td0; + CONSTANT_AS u32a *s_td1 = td1; + CONSTANT_AS u32a *s_td2 = td2; + CONSTANT_AS u32a *s_td3 = td3; + CONSTANT_AS u32a *s_td4 = td4; - __constant u32a *s_te0 = te0; - __constant u32a *s_te1 = te1; - __constant u32a *s_te2 = te2; - __constant u32a *s_te3 = te3; - __constant u32a *s_te4 = te4; + CONSTANT_AS u32a *s_te0 = te0; + CONSTANT_AS u32a *s_te1 = te1; + CONSTANT_AS u32a *s_te2 = te2; + CONSTANT_AS u32a *s_te3 = te3; + CONSTANT_AS u32a *s_te4 = te4; #endif diff --git a/OpenCL/m09500-pure.cl b/OpenCL/m09500-pure.cl index 86b9caccd..09f3701cd 100644 --- a/OpenCL/m09500-pure.cl +++ b/OpenCL/m09500-pure.cl @@ -30,7 +30,7 @@ typedef struct office2010_tmp } office2010_tmp_t; -__kernel void m09500_init (KERN_ATTR_TMPS_ESALT (office2010_tmp_t, office2010_t)) +KERNEL_FQ void m09500_init (KERN_ATTR_TMPS_ESALT (office2010_tmp_t, office2010_t)) { /** * base @@ -57,7 +57,7 @@ __kernel void m09500_init (KERN_ATTR_TMPS_ESALT (office2010_tmp_t, office2010_t) tmps[gid].out[4] = ctx.h[4]; } -__kernel void m09500_loop (KERN_ATTR_TMPS_ESALT (office2010_tmp_t, office2010_t)) +KERNEL_FQ void m09500_loop (KERN_ATTR_TMPS_ESALT (office2010_tmp_t, office2010_t)) { const u64 gid = get_global_id (0); @@ -124,7 +124,7 @@ __kernel void m09500_loop (KERN_ATTR_TMPS_ESALT (office2010_tmp_t, office2010_t) unpackv (tmps, out, gid, 4, t4); } -__kernel void m09500_comp (KERN_ATTR_TMPS_ESALT (office2010_tmp_t, office2010_t)) +KERNEL_FQ void m09500_comp (KERN_ATTR_TMPS_ESALT (office2010_tmp_t, office2010_t)) { const u64 gid = get_global_id (0); const u64 lid = get_local_id (0); @@ -136,17 +136,17 @@ __kernel void m09500_comp (KERN_ATTR_TMPS_ESALT (office2010_tmp_t, office2010_t) #ifdef REAL_SHM - __local u32 s_td0[256]; - __local u32 s_td1[256]; - __local u32 s_td2[256]; - __local u32 s_td3[256]; - __local u32 s_td4[256]; + LOCAL_AS u32 s_td0[256]; + LOCAL_AS u32 s_td1[256]; + LOCAL_AS u32 s_td2[256]; + LOCAL_AS u32 s_td3[256]; + LOCAL_AS u32 s_td4[256]; - __local u32 s_te0[256]; - __local u32 s_te1[256]; - __local u32 s_te2[256]; - __local u32 s_te3[256]; - __local u32 s_te4[256]; + LOCAL_AS u32 s_te0[256]; + LOCAL_AS u32 s_te1[256]; + LOCAL_AS u32 s_te2[256]; + LOCAL_AS u32 s_te3[256]; + LOCAL_AS u32 s_te4[256]; for (u32 i = lid; i < 256; i += lsz) { @@ -167,17 +167,17 @@ __kernel void m09500_comp (KERN_ATTR_TMPS_ESALT (office2010_tmp_t, office2010_t) #else - __constant u32a *s_td0 = td0; - __constant u32a *s_td1 = td1; - __constant u32a *s_td2 = td2; - __constant u32a *s_td3 = td3; - __constant u32a *s_td4 = td4; + CONSTANT_AS u32a *s_td0 = td0; + CONSTANT_AS u32a *s_td1 = td1; + CONSTANT_AS u32a *s_td2 = td2; + CONSTANT_AS u32a *s_td3 = td3; + CONSTANT_AS u32a *s_td4 = td4; - __constant u32a *s_te0 = te0; - __constant u32a *s_te1 = te1; - __constant u32a *s_te2 = te2; - __constant u32a *s_te3 = te3; - __constant u32a *s_te4 = te4; + CONSTANT_AS u32a *s_te0 = te0; + CONSTANT_AS u32a *s_te1 = te1; + CONSTANT_AS u32a *s_te2 = te2; + CONSTANT_AS u32a *s_te3 = te3; + CONSTANT_AS u32a *s_te4 = te4; #endif diff --git a/OpenCL/m09600-pure.cl b/OpenCL/m09600-pure.cl index a081ede63..3c6ab4c3f 100644 --- a/OpenCL/m09600-pure.cl +++ b/OpenCL/m09600-pure.cl @@ -30,7 +30,7 @@ typedef struct office2013 } office2013_t; -__kernel void m09600_init (KERN_ATTR_TMPS_ESALT (office2013_tmp_t, office2013_t)) +KERNEL_FQ void m09600_init (KERN_ATTR_TMPS_ESALT (office2013_tmp_t, office2013_t)) { /** * base @@ -60,7 +60,7 @@ __kernel void m09600_init (KERN_ATTR_TMPS_ESALT (office2013_tmp_t, office2013_t) tmps[gid].out[7] = ctx.h[7]; } -__kernel void m09600_loop (KERN_ATTR_TMPS_ESALT (office2013_tmp_t, office2013_t)) +KERNEL_FQ void m09600_loop (KERN_ATTR_TMPS_ESALT (office2013_tmp_t, office2013_t)) { const u64 gid = get_global_id (0); @@ -170,7 +170,7 @@ __kernel void m09600_loop (KERN_ATTR_TMPS_ESALT (office2013_tmp_t, office2013_t) unpack64v (tmps, out, gid, 7, t7); } -__kernel void m09600_comp (KERN_ATTR_TMPS_ESALT (office2013_tmp_t, office2013_t)) +KERNEL_FQ void m09600_comp (KERN_ATTR_TMPS_ESALT (office2013_tmp_t, office2013_t)) { const u64 gid = get_global_id (0); const u64 lid = get_local_id (0); @@ -182,17 +182,17 @@ __kernel void m09600_comp (KERN_ATTR_TMPS_ESALT (office2013_tmp_t, office2013_t) #ifdef REAL_SHM - __local u32 s_td0[256]; - __local u32 s_td1[256]; - __local u32 s_td2[256]; - __local u32 s_td3[256]; - __local u32 s_td4[256]; + LOCAL_AS u32 s_td0[256]; + LOCAL_AS u32 s_td1[256]; + LOCAL_AS u32 s_td2[256]; + LOCAL_AS u32 s_td3[256]; + LOCAL_AS u32 s_td4[256]; - __local u32 s_te0[256]; - __local u32 s_te1[256]; - __local u32 s_te2[256]; - __local u32 s_te3[256]; - __local u32 s_te4[256]; + LOCAL_AS u32 s_te0[256]; + LOCAL_AS u32 s_te1[256]; + LOCAL_AS u32 s_te2[256]; + LOCAL_AS u32 s_te3[256]; + LOCAL_AS u32 s_te4[256]; for (u32 i = lid; i < 256; i += lsz) { @@ -213,17 +213,17 @@ __kernel void m09600_comp (KERN_ATTR_TMPS_ESALT (office2013_tmp_t, office2013_t) #else - __constant u32a *s_td0 = td0; - __constant u32a *s_td1 = td1; - __constant u32a *s_td2 = td2; - __constant u32a *s_td3 = td3; - __constant u32a *s_td4 = td4; + CONSTANT_AS u32a *s_td0 = td0; + CONSTANT_AS u32a *s_td1 = td1; + CONSTANT_AS u32a *s_td2 = td2; + CONSTANT_AS u32a *s_td3 = td3; + CONSTANT_AS u32a *s_td4 = td4; - __constant u32a *s_te0 = te0; - __constant u32a *s_te1 = te1; - __constant u32a *s_te2 = te2; - __constant u32a *s_te3 = te3; - __constant u32a *s_te4 = te4; + CONSTANT_AS u32a *s_te0 = te0; + CONSTANT_AS u32a *s_te1 = te1; + CONSTANT_AS u32a *s_te2 = te2; + CONSTANT_AS u32a *s_te3 = te3; + CONSTANT_AS u32a *s_te4 = te4; #endif diff --git a/OpenCL/m09700_a0-optimized.cl b/OpenCL/m09700_a0-optimized.cl index de4085a90..b759df41e 100644 --- a/OpenCL/m09700_a0-optimized.cl +++ b/OpenCL/m09700_a0-optimized.cl @@ -33,7 +33,7 @@ typedef struct } RC4_KEY; -DECLSPEC void swap (__local RC4_KEY *rc4_key, const u8 i, const u8 j) +DECLSPEC void swap (LOCAL_AS RC4_KEY *rc4_key, const u8 i, const u8 j) { u8 tmp; @@ -42,12 +42,12 @@ DECLSPEC void swap (__local RC4_KEY *rc4_key, const u8 i, const u8 j) rc4_key->S[j] = tmp; } -DECLSPEC void rc4_init_16 (__local RC4_KEY *rc4_key, const u32 *data) +DECLSPEC void rc4_init_16 (LOCAL_AS RC4_KEY *rc4_key, const u32 *data) { u32 v = 0x03020100; u32 a = 0x04040404; - __local u32 *ptr = (__local u32 *) rc4_key->S; + LOCAL_AS u32 *ptr = (LOCAL_AS u32 *) rc4_key->S; #ifdef _unroll #pragma unroll @@ -95,7 +95,7 @@ DECLSPEC void rc4_init_16 (__local RC4_KEY *rc4_key, const u32 *data) } } -DECLSPEC u8 rc4_next_16 (__local RC4_KEY *rc4_key, u8 i, u8 j, const u32 *in, u32 *out) +DECLSPEC u8 rc4_next_16 (LOCAL_AS RC4_KEY *rc4_key, u8 i, u8 j, const u32 *in, u32 *out) { #ifdef _unroll #pragma unroll @@ -492,7 +492,7 @@ DECLSPEC void gen336 (u32 *digest_pre, u32 *salt_buf, u32 *digest) md5_transform (w0_t, w1_t, w2_t, w3_t, digest); } -__kernel void m09700_m04 (KERN_ATTR_RULES_ESALT (oldoffice01_t)) +KERNEL_FQ void m09700_m04 (KERN_ATTR_RULES_ESALT (oldoffice01_t)) { /** * modifier @@ -526,9 +526,9 @@ __kernel void m09700_m04 (KERN_ATTR_RULES_ESALT (oldoffice01_t)) * shared */ - __local RC4_KEY rc4_keys[64]; + LOCAL_AS RC4_KEY rc4_keys[64]; - __local RC4_KEY *rc4_key = &rc4_keys[lid]; + LOCAL_AS RC4_KEY *rc4_key = &rc4_keys[lid]; /** * salt @@ -673,15 +673,15 @@ __kernel void m09700_m04 (KERN_ATTR_RULES_ESALT (oldoffice01_t)) } } -__kernel void m09700_m08 (KERN_ATTR_RULES_ESALT (oldoffice01_t)) +KERNEL_FQ void m09700_m08 (KERN_ATTR_RULES_ESALT (oldoffice01_t)) { } -__kernel void m09700_m16 (KERN_ATTR_RULES_ESALT (oldoffice01_t)) +KERNEL_FQ void m09700_m16 (KERN_ATTR_RULES_ESALT (oldoffice01_t)) { } -__kernel void m09700_s04 (KERN_ATTR_RULES_ESALT (oldoffice01_t)) +KERNEL_FQ void m09700_s04 (KERN_ATTR_RULES_ESALT (oldoffice01_t)) { /** * modifier @@ -715,9 +715,9 @@ __kernel void m09700_s04 (KERN_ATTR_RULES_ESALT (oldoffice01_t)) * shared */ - __local RC4_KEY rc4_keys[64]; + LOCAL_AS RC4_KEY rc4_keys[64]; - __local RC4_KEY *rc4_key = &rc4_keys[lid]; + LOCAL_AS RC4_KEY *rc4_key = &rc4_keys[lid]; /** * salt @@ -874,10 +874,10 @@ __kernel void m09700_s04 (KERN_ATTR_RULES_ESALT (oldoffice01_t)) } } -__kernel void m09700_s08 (KERN_ATTR_RULES_ESALT (oldoffice01_t)) +KERNEL_FQ void m09700_s08 (KERN_ATTR_RULES_ESALT (oldoffice01_t)) { } -__kernel void m09700_s16 (KERN_ATTR_RULES_ESALT (oldoffice01_t)) +KERNEL_FQ void m09700_s16 (KERN_ATTR_RULES_ESALT (oldoffice01_t)) { } diff --git a/OpenCL/m09700_a1-optimized.cl b/OpenCL/m09700_a1-optimized.cl index d0f3e150f..3978178cf 100644 --- a/OpenCL/m09700_a1-optimized.cl +++ b/OpenCL/m09700_a1-optimized.cl @@ -31,7 +31,7 @@ typedef struct } RC4_KEY; -DECLSPEC void swap (__local RC4_KEY *rc4_key, const u8 i, const u8 j) +DECLSPEC void swap (LOCAL_AS RC4_KEY *rc4_key, const u8 i, const u8 j) { u8 tmp; @@ -40,12 +40,12 @@ DECLSPEC void swap (__local RC4_KEY *rc4_key, const u8 i, const u8 j) rc4_key->S[j] = tmp; } -DECLSPEC void rc4_init_16 (__local RC4_KEY *rc4_key, const u32 *data) +DECLSPEC void rc4_init_16 (LOCAL_AS RC4_KEY *rc4_key, const u32 *data) { u32 v = 0x03020100; u32 a = 0x04040404; - __local u32 *ptr = (__local u32 *) rc4_key->S; + LOCAL_AS u32 *ptr = (LOCAL_AS u32 *) rc4_key->S; #ifdef _unroll #pragma unroll @@ -93,7 +93,7 @@ DECLSPEC void rc4_init_16 (__local RC4_KEY *rc4_key, const u32 *data) } } -DECLSPEC u8 rc4_next_16 (__local RC4_KEY *rc4_key, u8 i, u8 j, const u32 *in, u32 *out) +DECLSPEC u8 rc4_next_16 (LOCAL_AS RC4_KEY *rc4_key, u8 i, u8 j, const u32 *in, u32 *out) { #ifdef _unroll #pragma unroll @@ -490,7 +490,7 @@ DECLSPEC void gen336 (u32 *digest_pre, u32 *salt_buf, u32 *digest) md5_transform (w0_t, w1_t, w2_t, w3_t, digest); } -__kernel void m09700_m04 (KERN_ATTR_ESALT (oldoffice01_t)) +KERNEL_FQ void m09700_m04 (KERN_ATTR_ESALT (oldoffice01_t)) { /** * modifier @@ -524,9 +524,9 @@ __kernel void m09700_m04 (KERN_ATTR_ESALT (oldoffice01_t)) * shared */ - __local RC4_KEY rc4_keys[64]; + LOCAL_AS RC4_KEY rc4_keys[64]; - __local RC4_KEY *rc4_key = &rc4_keys[lid]; + LOCAL_AS RC4_KEY *rc4_key = &rc4_keys[lid]; /** * salt @@ -729,15 +729,15 @@ __kernel void m09700_m04 (KERN_ATTR_ESALT (oldoffice01_t)) } } -__kernel void m09700_m08 (KERN_ATTR_ESALT (oldoffice01_t)) +KERNEL_FQ void m09700_m08 (KERN_ATTR_ESALT (oldoffice01_t)) { } -__kernel void m09700_m16 (KERN_ATTR_ESALT (oldoffice01_t)) +KERNEL_FQ void m09700_m16 (KERN_ATTR_ESALT (oldoffice01_t)) { } -__kernel void m09700_s04 (KERN_ATTR_ESALT (oldoffice01_t)) +KERNEL_FQ void m09700_s04 (KERN_ATTR_ESALT (oldoffice01_t)) { /** * modifier @@ -771,9 +771,9 @@ __kernel void m09700_s04 (KERN_ATTR_ESALT (oldoffice01_t)) * shared */ - __local RC4_KEY rc4_keys[64]; + LOCAL_AS RC4_KEY rc4_keys[64]; - __local RC4_KEY *rc4_key = &rc4_keys[lid]; + LOCAL_AS RC4_KEY *rc4_key = &rc4_keys[lid]; /** * salt @@ -988,10 +988,10 @@ __kernel void m09700_s04 (KERN_ATTR_ESALT (oldoffice01_t)) } } -__kernel void m09700_s08 (KERN_ATTR_ESALT (oldoffice01_t)) +KERNEL_FQ void m09700_s08 (KERN_ATTR_ESALT (oldoffice01_t)) { } -__kernel void m09700_s16 (KERN_ATTR_ESALT (oldoffice01_t)) +KERNEL_FQ void m09700_s16 (KERN_ATTR_ESALT (oldoffice01_t)) { } diff --git a/OpenCL/m09700_a3-optimized.cl b/OpenCL/m09700_a3-optimized.cl index 6378688a6..b31e53c66 100644 --- a/OpenCL/m09700_a3-optimized.cl +++ b/OpenCL/m09700_a3-optimized.cl @@ -28,7 +28,7 @@ typedef struct } RC4_KEY; -DECLSPEC void swap (__local RC4_KEY *rc4_key, const u8 i, const u8 j) +DECLSPEC void swap (LOCAL_AS RC4_KEY *rc4_key, const u8 i, const u8 j) { u8 tmp; @@ -37,12 +37,12 @@ DECLSPEC void swap (__local RC4_KEY *rc4_key, const u8 i, const u8 j) rc4_key->S[j] = tmp; } -DECLSPEC void rc4_init_16 (__local RC4_KEY *rc4_key, const u32 *data) +DECLSPEC void rc4_init_16 (LOCAL_AS RC4_KEY *rc4_key, const u32 *data) { u32 v = 0x03020100; u32 a = 0x04040404; - __local u32 *ptr = (__local u32 *) rc4_key->S; + LOCAL_AS u32 *ptr = (LOCAL_AS u32 *) rc4_key->S; #ifdef _unroll #pragma unroll @@ -90,7 +90,7 @@ DECLSPEC void rc4_init_16 (__local RC4_KEY *rc4_key, const u32 *data) } } -DECLSPEC u8 rc4_next_16 (__local RC4_KEY *rc4_key, u8 i, u8 j, const u32 *in, u32 *out) +DECLSPEC u8 rc4_next_16 (LOCAL_AS RC4_KEY *rc4_key, u8 i, u8 j, const u32 *in, u32 *out) { #ifdef _unroll #pragma unroll @@ -143,7 +143,7 @@ DECLSPEC u8 rc4_next_16 (__local RC4_KEY *rc4_key, u8 i, u8 j, const u32 *in, u3 return j; } -DECLSPEC void m09700m (__local RC4_KEY *rc4_keys, u32 *w0, u32 *w1, u32 *w2, u32 *w3, const u32 pw_len, KERN_ATTR_ESALT (oldoffice01_t)) +DECLSPEC void m09700m (LOCAL_AS RC4_KEY *rc4_keys, u32 *w0, u32 *w1, u32 *w2, u32 *w3, const u32 pw_len, KERN_ATTR_ESALT (oldoffice01_t)) { /** * modifier @@ -156,7 +156,7 @@ DECLSPEC void m09700m (__local RC4_KEY *rc4_keys, u32 *w0, u32 *w1, u32 *w2, u32 * shared */ - __local RC4_KEY *rc4_key = &rc4_keys[lid]; + LOCAL_AS RC4_KEY *rc4_key = &rc4_keys[lid]; /** * salt @@ -553,7 +553,7 @@ DECLSPEC void m09700m (__local RC4_KEY *rc4_keys, u32 *w0, u32 *w1, u32 *w2, u32 } } -DECLSPEC void m09700s (__local RC4_KEY *rc4_keys, u32 *w0, u32 *w1, u32 *w2, u32 *w3, const u32 pw_len, KERN_ATTR_ESALT (oldoffice01_t)) +DECLSPEC void m09700s (LOCAL_AS RC4_KEY *rc4_keys, u32 *w0, u32 *w1, u32 *w2, u32 *w3, const u32 pw_len, KERN_ATTR_ESALT (oldoffice01_t)) { /** * modifier @@ -566,7 +566,7 @@ DECLSPEC void m09700s (__local RC4_KEY *rc4_keys, u32 *w0, u32 *w1, u32 *w2, u32 * shared */ - __local RC4_KEY *rc4_key = &rc4_keys[lid]; + LOCAL_AS RC4_KEY *rc4_key = &rc4_keys[lid]; /** * salt @@ -975,7 +975,7 @@ DECLSPEC void m09700s (__local RC4_KEY *rc4_keys, u32 *w0, u32 *w1, u32 *w2, u32 } } -__kernel void m09700_m04 (KERN_ATTR_ESALT (oldoffice01_t)) +KERNEL_FQ void m09700_m04 (KERN_ATTR_ESALT (oldoffice01_t)) { /** * base @@ -1019,12 +1019,12 @@ __kernel void m09700_m04 (KERN_ATTR_ESALT (oldoffice01_t)) * main */ - __local RC4_KEY rc4_keys[64]; + LOCAL_AS RC4_KEY rc4_keys[64]; m09700m (rc4_keys, 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_extra0_buf, d_extra1_buf, d_extra2_buf, d_extra3_buf, bitmap_mask, bitmap_shift1, bitmap_shift2, salt_pos, loop_pos, loop_cnt, il_cnt, digests_cnt, digests_offset, combs_mode, gid_max); } -__kernel void m09700_m08 (KERN_ATTR_ESALT (oldoffice01_t)) +KERNEL_FQ void m09700_m08 (KERN_ATTR_ESALT (oldoffice01_t)) { /** * base @@ -1068,12 +1068,12 @@ __kernel void m09700_m08 (KERN_ATTR_ESALT (oldoffice01_t)) * main */ - __local RC4_KEY rc4_keys[64]; + LOCAL_AS RC4_KEY rc4_keys[64]; m09700m (rc4_keys, 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_extra0_buf, d_extra1_buf, d_extra2_buf, d_extra3_buf, bitmap_mask, bitmap_shift1, bitmap_shift2, salt_pos, loop_pos, loop_cnt, il_cnt, digests_cnt, digests_offset, combs_mode, gid_max); } -__kernel void m09700_m16 (KERN_ATTR_ESALT (oldoffice01_t)) +KERNEL_FQ void m09700_m16 (KERN_ATTR_ESALT (oldoffice01_t)) { /** * base @@ -1117,12 +1117,12 @@ __kernel void m09700_m16 (KERN_ATTR_ESALT (oldoffice01_t)) * main */ - __local RC4_KEY rc4_keys[64]; + LOCAL_AS RC4_KEY rc4_keys[64]; m09700m (rc4_keys, 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_extra0_buf, d_extra1_buf, d_extra2_buf, d_extra3_buf, bitmap_mask, bitmap_shift1, bitmap_shift2, salt_pos, loop_pos, loop_cnt, il_cnt, digests_cnt, digests_offset, combs_mode, gid_max); } -__kernel void m09700_s04 (KERN_ATTR_ESALT (oldoffice01_t)) +KERNEL_FQ void m09700_s04 (KERN_ATTR_ESALT (oldoffice01_t)) { /** * base @@ -1166,12 +1166,12 @@ __kernel void m09700_s04 (KERN_ATTR_ESALT (oldoffice01_t)) * main */ - __local RC4_KEY rc4_keys[64]; + LOCAL_AS RC4_KEY rc4_keys[64]; m09700s (rc4_keys, 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_extra0_buf, d_extra1_buf, d_extra2_buf, d_extra3_buf, bitmap_mask, bitmap_shift1, bitmap_shift2, salt_pos, loop_pos, loop_cnt, il_cnt, digests_cnt, digests_offset, combs_mode, gid_max); } -__kernel void m09700_s08 (KERN_ATTR_ESALT (oldoffice01_t)) +KERNEL_FQ void m09700_s08 (KERN_ATTR_ESALT (oldoffice01_t)) { /** * base @@ -1215,12 +1215,12 @@ __kernel void m09700_s08 (KERN_ATTR_ESALT (oldoffice01_t)) * main */ - __local RC4_KEY rc4_keys[64]; + LOCAL_AS RC4_KEY rc4_keys[64]; m09700s (rc4_keys, 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_extra0_buf, d_extra1_buf, d_extra2_buf, d_extra3_buf, bitmap_mask, bitmap_shift1, bitmap_shift2, salt_pos, loop_pos, loop_cnt, il_cnt, digests_cnt, digests_offset, combs_mode, gid_max); } -__kernel void m09700_s16 (KERN_ATTR_ESALT (oldoffice01_t)) +KERNEL_FQ void m09700_s16 (KERN_ATTR_ESALT (oldoffice01_t)) { /** * base @@ -1264,7 +1264,7 @@ __kernel void m09700_s16 (KERN_ATTR_ESALT (oldoffice01_t)) * main */ - __local RC4_KEY rc4_keys[64]; + LOCAL_AS RC4_KEY rc4_keys[64]; m09700s (rc4_keys, 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_extra0_buf, d_extra1_buf, d_extra2_buf, d_extra3_buf, bitmap_mask, bitmap_shift1, bitmap_shift2, salt_pos, loop_pos, loop_cnt, il_cnt, digests_cnt, digests_offset, combs_mode, gid_max); } diff --git a/OpenCL/m09710_a0-optimized.cl b/OpenCL/m09710_a0-optimized.cl index 638e697a3..bf826d3fc 100644 --- a/OpenCL/m09710_a0-optimized.cl +++ b/OpenCL/m09710_a0-optimized.cl @@ -33,7 +33,7 @@ typedef struct } RC4_KEY; -DECLSPEC void swap (__local RC4_KEY *rc4_key, const u8 i, const u8 j) +DECLSPEC void swap (LOCAL_AS RC4_KEY *rc4_key, const u8 i, const u8 j) { u8 tmp; @@ -42,12 +42,12 @@ DECLSPEC void swap (__local RC4_KEY *rc4_key, const u8 i, const u8 j) rc4_key->S[j] = tmp; } -DECLSPEC void rc4_init_16 (__local RC4_KEY *rc4_key, const u32 *data) +DECLSPEC void rc4_init_16 (LOCAL_AS RC4_KEY *rc4_key, const u32 *data) { u32 v = 0x03020100; u32 a = 0x04040404; - __local u32 *ptr = (__local u32 *) rc4_key->S; + LOCAL_AS u32 *ptr = (LOCAL_AS u32 *) rc4_key->S; #ifdef _unroll #pragma unroll @@ -95,7 +95,7 @@ DECLSPEC void rc4_init_16 (__local RC4_KEY *rc4_key, const u32 *data) } } -DECLSPEC u8 rc4_next_16 (__local RC4_KEY *rc4_key, u8 i, u8 j, const u32 *in, u32 *out) +DECLSPEC u8 rc4_next_16 (LOCAL_AS RC4_KEY *rc4_key, u8 i, u8 j, const u32 *in, u32 *out) { #ifdef _unroll #pragma unroll @@ -148,7 +148,7 @@ DECLSPEC u8 rc4_next_16 (__local RC4_KEY *rc4_key, u8 i, u8 j, const u32 *in, u3 return j; } -__kernel void m09710_m04 (KERN_ATTR_RULES_ESALT (oldoffice01_t)) +KERNEL_FQ void m09710_m04 (KERN_ATTR_RULES_ESALT (oldoffice01_t)) { /** * modifier @@ -182,9 +182,9 @@ __kernel void m09710_m04 (KERN_ATTR_RULES_ESALT (oldoffice01_t)) * shared */ - __local RC4_KEY rc4_keys[64]; + LOCAL_AS RC4_KEY rc4_keys[64]; - __local RC4_KEY *rc4_key = &rc4_keys[lid]; + LOCAL_AS RC4_KEY *rc4_key = &rc4_keys[lid]; /** * esalt @@ -280,15 +280,15 @@ __kernel void m09710_m04 (KERN_ATTR_RULES_ESALT (oldoffice01_t)) } } -__kernel void m09710_m08 (KERN_ATTR_RULES_ESALT (oldoffice01_t)) +KERNEL_FQ void m09710_m08 (KERN_ATTR_RULES_ESALT (oldoffice01_t)) { } -__kernel void m09710_m16 (KERN_ATTR_RULES_ESALT (oldoffice01_t)) +KERNEL_FQ void m09710_m16 (KERN_ATTR_RULES_ESALT (oldoffice01_t)) { } -__kernel void m09710_s04 (KERN_ATTR_RULES_ESALT (oldoffice01_t)) +KERNEL_FQ void m09710_s04 (KERN_ATTR_RULES_ESALT (oldoffice01_t)) { /** * modifier @@ -322,9 +322,9 @@ __kernel void m09710_s04 (KERN_ATTR_RULES_ESALT (oldoffice01_t)) * shared */ - __local RC4_KEY rc4_keys[64]; + LOCAL_AS RC4_KEY rc4_keys[64]; - __local RC4_KEY *rc4_key = &rc4_keys[lid]; + LOCAL_AS RC4_KEY *rc4_key = &rc4_keys[lid]; /** * esalt @@ -432,10 +432,10 @@ __kernel void m09710_s04 (KERN_ATTR_RULES_ESALT (oldoffice01_t)) } } -__kernel void m09710_s08 (KERN_ATTR_RULES_ESALT (oldoffice01_t)) +KERNEL_FQ void m09710_s08 (KERN_ATTR_RULES_ESALT (oldoffice01_t)) { } -__kernel void m09710_s16 (KERN_ATTR_RULES_ESALT (oldoffice01_t)) +KERNEL_FQ void m09710_s16 (KERN_ATTR_RULES_ESALT (oldoffice01_t)) { } diff --git a/OpenCL/m09710_a1-optimized.cl b/OpenCL/m09710_a1-optimized.cl index 29cb342ef..6d8a6796d 100644 --- a/OpenCL/m09710_a1-optimized.cl +++ b/OpenCL/m09710_a1-optimized.cl @@ -31,7 +31,7 @@ typedef struct } RC4_KEY; -DECLSPEC void swap (__local RC4_KEY *rc4_key, const u8 i, const u8 j) +DECLSPEC void swap (LOCAL_AS RC4_KEY *rc4_key, const u8 i, const u8 j) { u8 tmp; @@ -40,12 +40,12 @@ DECLSPEC void swap (__local RC4_KEY *rc4_key, const u8 i, const u8 j) rc4_key->S[j] = tmp; } -DECLSPEC void rc4_init_16 (__local RC4_KEY *rc4_key, const u32 *data) +DECLSPEC void rc4_init_16 (LOCAL_AS RC4_KEY *rc4_key, const u32 *data) { u32 v = 0x03020100; u32 a = 0x04040404; - __local u32 *ptr = (__local u32 *) rc4_key->S; + LOCAL_AS u32 *ptr = (LOCAL_AS u32 *) rc4_key->S; #ifdef _unroll #pragma unroll @@ -93,7 +93,7 @@ DECLSPEC void rc4_init_16 (__local RC4_KEY *rc4_key, const u32 *data) } } -DECLSPEC u8 rc4_next_16 (__local RC4_KEY *rc4_key, u8 i, u8 j, const u32 *in, u32 *out) +DECLSPEC u8 rc4_next_16 (LOCAL_AS RC4_KEY *rc4_key, u8 i, u8 j, const u32 *in, u32 *out) { #ifdef _unroll #pragma unroll @@ -146,7 +146,7 @@ DECLSPEC u8 rc4_next_16 (__local RC4_KEY *rc4_key, u8 i, u8 j, const u32 *in, u3 return j; } -__kernel void m09710_m04 (KERN_ATTR_ESALT (oldoffice01_t)) +KERNEL_FQ void m09710_m04 (KERN_ATTR_ESALT (oldoffice01_t)) { /** * modifier @@ -180,9 +180,9 @@ __kernel void m09710_m04 (KERN_ATTR_ESALT (oldoffice01_t)) * shared */ - __local RC4_KEY rc4_keys[64]; + LOCAL_AS RC4_KEY rc4_keys[64]; - __local RC4_KEY *rc4_key = &rc4_keys[lid]; + LOCAL_AS RC4_KEY *rc4_key = &rc4_keys[lid]; /** * esalt @@ -324,15 +324,15 @@ __kernel void m09710_m04 (KERN_ATTR_ESALT (oldoffice01_t)) } } -__kernel void m09710_m08 (KERN_ATTR_ESALT (oldoffice01_t)) +KERNEL_FQ void m09710_m08 (KERN_ATTR_ESALT (oldoffice01_t)) { } -__kernel void m09710_m16 (KERN_ATTR_ESALT (oldoffice01_t)) +KERNEL_FQ void m09710_m16 (KERN_ATTR_ESALT (oldoffice01_t)) { } -__kernel void m09710_s04 (KERN_ATTR_ESALT (oldoffice01_t)) +KERNEL_FQ void m09710_s04 (KERN_ATTR_ESALT (oldoffice01_t)) { /** * modifier @@ -366,9 +366,9 @@ __kernel void m09710_s04 (KERN_ATTR_ESALT (oldoffice01_t)) * shared */ - __local RC4_KEY rc4_keys[64]; + LOCAL_AS RC4_KEY rc4_keys[64]; - __local RC4_KEY *rc4_key = &rc4_keys[lid]; + LOCAL_AS RC4_KEY *rc4_key = &rc4_keys[lid]; /** * esalt @@ -522,10 +522,10 @@ __kernel void m09710_s04 (KERN_ATTR_ESALT (oldoffice01_t)) } } -__kernel void m09710_s08 (KERN_ATTR_ESALT (oldoffice01_t)) +KERNEL_FQ void m09710_s08 (KERN_ATTR_ESALT (oldoffice01_t)) { } -__kernel void m09710_s16 (KERN_ATTR_ESALT (oldoffice01_t)) +KERNEL_FQ void m09710_s16 (KERN_ATTR_ESALT (oldoffice01_t)) { } diff --git a/OpenCL/m09710_a3-optimized.cl b/OpenCL/m09710_a3-optimized.cl index dff28cfa7..d1b75a452 100644 --- a/OpenCL/m09710_a3-optimized.cl +++ b/OpenCL/m09710_a3-optimized.cl @@ -31,7 +31,7 @@ typedef struct } RC4_KEY; -DECLSPEC void swap (__local RC4_KEY *rc4_key, const u8 i, const u8 j) +DECLSPEC void swap (LOCAL_AS RC4_KEY *rc4_key, const u8 i, const u8 j) { u8 tmp; @@ -40,12 +40,12 @@ DECLSPEC void swap (__local RC4_KEY *rc4_key, const u8 i, const u8 j) rc4_key->S[j] = tmp; } -DECLSPEC void rc4_init_16 (__local RC4_KEY *rc4_key, const u32 *data) +DECLSPEC void rc4_init_16 (LOCAL_AS RC4_KEY *rc4_key, const u32 *data) { u32 v = 0x03020100; u32 a = 0x04040404; - __local u32 *ptr = (__local u32 *) rc4_key->S; + LOCAL_AS u32 *ptr = (LOCAL_AS u32 *) rc4_key->S; #ifdef _unroll #pragma unroll @@ -93,7 +93,7 @@ DECLSPEC void rc4_init_16 (__local RC4_KEY *rc4_key, const u32 *data) } } -DECLSPEC u8 rc4_next_16 (__local RC4_KEY *rc4_key, u8 i, u8 j, const u32 *in, u32 *out) +DECLSPEC u8 rc4_next_16 (LOCAL_AS RC4_KEY *rc4_key, u8 i, u8 j, const u32 *in, u32 *out) { #ifdef _unroll #pragma unroll @@ -146,7 +146,7 @@ DECLSPEC u8 rc4_next_16 (__local RC4_KEY *rc4_key, u8 i, u8 j, const u32 *in, u3 return j; } -DECLSPEC void m09710m (__local RC4_KEY *rc4_keys, u32 *w0, u32 *w1, u32 *w2, u32 *w3, const u32 pw_len, KERN_ATTR_ESALT (oldoffice01_t)) +DECLSPEC void m09710m (LOCAL_AS RC4_KEY *rc4_keys, u32 *w0, u32 *w1, u32 *w2, u32 *w3, const u32 pw_len, KERN_ATTR_ESALT (oldoffice01_t)) { /** * modifier @@ -159,7 +159,7 @@ DECLSPEC void m09710m (__local RC4_KEY *rc4_keys, u32 *w0, u32 *w1, u32 *w2, u32 * shared */ - __local RC4_KEY *rc4_key = &rc4_keys[lid]; + LOCAL_AS RC4_KEY *rc4_key = &rc4_keys[lid]; /** * esalt @@ -257,7 +257,7 @@ DECLSPEC void m09710m (__local RC4_KEY *rc4_keys, u32 *w0, u32 *w1, u32 *w2, u32 } } -DECLSPEC void m09710s (__local RC4_KEY *rc4_keys, u32 *w0, u32 *w1, u32 *w2, u32 *w3, const u32 pw_len, KERN_ATTR_ESALT (oldoffice01_t)) +DECLSPEC void m09710s (LOCAL_AS RC4_KEY *rc4_keys, u32 *w0, u32 *w1, u32 *w2, u32 *w3, const u32 pw_len, KERN_ATTR_ESALT (oldoffice01_t)) { /** * modifier @@ -270,7 +270,7 @@ DECLSPEC void m09710s (__local RC4_KEY *rc4_keys, u32 *w0, u32 *w1, u32 *w2, u32 * shared */ - __local RC4_KEY *rc4_key = &rc4_keys[lid]; + LOCAL_AS RC4_KEY *rc4_key = &rc4_keys[lid]; /** * esalt @@ -380,7 +380,7 @@ DECLSPEC void m09710s (__local RC4_KEY *rc4_keys, u32 *w0, u32 *w1, u32 *w2, u32 } } -__kernel void m09710_m04 (KERN_ATTR_ESALT (oldoffice01_t)) +KERNEL_FQ void m09710_m04 (KERN_ATTR_ESALT (oldoffice01_t)) { /** * base @@ -424,20 +424,20 @@ __kernel void m09710_m04 (KERN_ATTR_ESALT (oldoffice01_t)) * main */ - __local RC4_KEY rc4_keys[64]; + LOCAL_AS RC4_KEY rc4_keys[64]; m09710m (rc4_keys, 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_extra0_buf, d_extra1_buf, d_extra2_buf, d_extra3_buf, bitmap_mask, bitmap_shift1, bitmap_shift2, salt_pos, loop_pos, loop_cnt, il_cnt, digests_cnt, digests_offset, combs_mode, gid_max); } -__kernel void m09710_m08 (KERN_ATTR_ESALT (oldoffice01_t)) +KERNEL_FQ void m09710_m08 (KERN_ATTR_ESALT (oldoffice01_t)) { } -__kernel void m09710_m16 (KERN_ATTR_ESALT (oldoffice01_t)) +KERNEL_FQ void m09710_m16 (KERN_ATTR_ESALT (oldoffice01_t)) { } -__kernel void m09710_s04 (KERN_ATTR_ESALT (oldoffice01_t)) +KERNEL_FQ void m09710_s04 (KERN_ATTR_ESALT (oldoffice01_t)) { /** * base @@ -481,15 +481,15 @@ __kernel void m09710_s04 (KERN_ATTR_ESALT (oldoffice01_t)) * main */ - __local RC4_KEY rc4_keys[64]; + LOCAL_AS RC4_KEY rc4_keys[64]; m09710s (rc4_keys, 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_extra0_buf, d_extra1_buf, d_extra2_buf, d_extra3_buf, bitmap_mask, bitmap_shift1, bitmap_shift2, salt_pos, loop_pos, loop_cnt, il_cnt, digests_cnt, digests_offset, combs_mode, gid_max); } -__kernel void m09710_s08 (KERN_ATTR_ESALT (oldoffice01_t)) +KERNEL_FQ void m09710_s08 (KERN_ATTR_ESALT (oldoffice01_t)) { } -__kernel void m09710_s16 (KERN_ATTR_ESALT (oldoffice01_t)) +KERNEL_FQ void m09710_s16 (KERN_ATTR_ESALT (oldoffice01_t)) { } diff --git a/OpenCL/m09720_a0-optimized.cl b/OpenCL/m09720_a0-optimized.cl index a7764d152..dfd3f6b3f 100644 --- a/OpenCL/m09720_a0-optimized.cl +++ b/OpenCL/m09720_a0-optimized.cl @@ -368,7 +368,7 @@ DECLSPEC void gen336 (u32x *digest_pre, u32 *salt_buf, u32x *digest) md5_transform_vector (w0_t, w1_t, w2_t, w3_t, digest); } -__kernel void m09720_m04 (KERN_ATTR_RULES_ESALT (oldoffice01_t)) +KERNEL_FQ void m09720_m04 (KERN_ATTR_RULES_ESALT (oldoffice01_t)) { /** * modifier @@ -466,15 +466,15 @@ __kernel void m09720_m04 (KERN_ATTR_RULES_ESALT (oldoffice01_t)) } } -__kernel void m09720_m08 (KERN_ATTR_RULES_ESALT (oldoffice01_t)) +KERNEL_FQ void m09720_m08 (KERN_ATTR_RULES_ESALT (oldoffice01_t)) { } -__kernel void m09720_m16 (KERN_ATTR_RULES_ESALT (oldoffice01_t)) +KERNEL_FQ void m09720_m16 (KERN_ATTR_RULES_ESALT (oldoffice01_t)) { } -__kernel void m09720_s04 (KERN_ATTR_RULES_ESALT (oldoffice01_t)) +KERNEL_FQ void m09720_s04 (KERN_ATTR_RULES_ESALT (oldoffice01_t)) { /** * modifier @@ -584,10 +584,10 @@ __kernel void m09720_s04 (KERN_ATTR_RULES_ESALT (oldoffice01_t)) } } -__kernel void m09720_s08 (KERN_ATTR_RULES_ESALT (oldoffice01_t)) +KERNEL_FQ void m09720_s08 (KERN_ATTR_RULES_ESALT (oldoffice01_t)) { } -__kernel void m09720_s16 (KERN_ATTR_RULES_ESALT (oldoffice01_t)) +KERNEL_FQ void m09720_s16 (KERN_ATTR_RULES_ESALT (oldoffice01_t)) { } diff --git a/OpenCL/m09720_a1-optimized.cl b/OpenCL/m09720_a1-optimized.cl index 6ada235a0..a1a58e9a5 100644 --- a/OpenCL/m09720_a1-optimized.cl +++ b/OpenCL/m09720_a1-optimized.cl @@ -366,7 +366,7 @@ DECLSPEC void gen336 (u32x *digest_pre, u32 *salt_buf, u32x *digest) md5_transform_vector (w0_t, w1_t, w2_t, w3_t, digest); } -__kernel void m09720_m04 (KERN_ATTR_ESALT (oldoffice01_t)) +KERNEL_FQ void m09720_m04 (KERN_ATTR_ESALT (oldoffice01_t)) { /** * modifier @@ -514,15 +514,15 @@ __kernel void m09720_m04 (KERN_ATTR_ESALT (oldoffice01_t)) } } -__kernel void m09720_m08 (KERN_ATTR_ESALT (oldoffice01_t)) +KERNEL_FQ void m09720_m08 (KERN_ATTR_ESALT (oldoffice01_t)) { } -__kernel void m09720_m16 (KERN_ATTR_ESALT (oldoffice01_t)) +KERNEL_FQ void m09720_m16 (KERN_ATTR_ESALT (oldoffice01_t)) { } -__kernel void m09720_s04 (KERN_ATTR_ESALT (oldoffice01_t)) +KERNEL_FQ void m09720_s04 (KERN_ATTR_ESALT (oldoffice01_t)) { /** * modifier @@ -682,10 +682,10 @@ __kernel void m09720_s04 (KERN_ATTR_ESALT (oldoffice01_t)) } } -__kernel void m09720_s08 (KERN_ATTR_ESALT (oldoffice01_t)) +KERNEL_FQ void m09720_s08 (KERN_ATTR_ESALT (oldoffice01_t)) { } -__kernel void m09720_s16 (KERN_ATTR_ESALT (oldoffice01_t)) +KERNEL_FQ void m09720_s16 (KERN_ATTR_ESALT (oldoffice01_t)) { } diff --git a/OpenCL/m09720_a3-optimized.cl b/OpenCL/m09720_a3-optimized.cl index 3662850ff..57c39df18 100644 --- a/OpenCL/m09720_a3-optimized.cl +++ b/OpenCL/m09720_a3-optimized.cl @@ -558,7 +558,7 @@ DECLSPEC void m09720s (u32 *w0, u32 *w1, u32 *w2, u32 *w3, const u32 pw_len, KER } } -__kernel void m09720_m04 (KERN_ATTR_ESALT (oldoffice01_t)) +KERNEL_FQ void m09720_m04 (KERN_ATTR_ESALT (oldoffice01_t)) { /** * base @@ -605,7 +605,7 @@ __kernel void m09720_m04 (KERN_ATTR_ESALT (oldoffice01_t)) m09720m (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_extra0_buf, d_extra1_buf, d_extra2_buf, d_extra3_buf, bitmap_mask, bitmap_shift1, bitmap_shift2, salt_pos, loop_pos, loop_cnt, il_cnt, digests_cnt, digests_offset, combs_mode, gid_max); } -__kernel void m09720_m08 (KERN_ATTR_ESALT (oldoffice01_t)) +KERNEL_FQ void m09720_m08 (KERN_ATTR_ESALT (oldoffice01_t)) { /** * base @@ -652,7 +652,7 @@ __kernel void m09720_m08 (KERN_ATTR_ESALT (oldoffice01_t)) m09720m (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_extra0_buf, d_extra1_buf, d_extra2_buf, d_extra3_buf, bitmap_mask, bitmap_shift1, bitmap_shift2, salt_pos, loop_pos, loop_cnt, il_cnt, digests_cnt, digests_offset, combs_mode, gid_max); } -__kernel void m09720_m16 (KERN_ATTR_ESALT (oldoffice01_t)) +KERNEL_FQ void m09720_m16 (KERN_ATTR_ESALT (oldoffice01_t)) { /** * base @@ -699,7 +699,7 @@ __kernel void m09720_m16 (KERN_ATTR_ESALT (oldoffice01_t)) m09720m (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_extra0_buf, d_extra1_buf, d_extra2_buf, d_extra3_buf, bitmap_mask, bitmap_shift1, bitmap_shift2, salt_pos, loop_pos, loop_cnt, il_cnt, digests_cnt, digests_offset, combs_mode, gid_max); } -__kernel void m09720_s04 (KERN_ATTR_ESALT (oldoffice01_t)) +KERNEL_FQ void m09720_s04 (KERN_ATTR_ESALT (oldoffice01_t)) { /** * base @@ -746,7 +746,7 @@ __kernel void m09720_s04 (KERN_ATTR_ESALT (oldoffice01_t)) m09720s (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_extra0_buf, d_extra1_buf, d_extra2_buf, d_extra3_buf, bitmap_mask, bitmap_shift1, bitmap_shift2, salt_pos, loop_pos, loop_cnt, il_cnt, digests_cnt, digests_offset, combs_mode, gid_max); } -__kernel void m09720_s08 (KERN_ATTR_ESALT (oldoffice01_t)) +KERNEL_FQ void m09720_s08 (KERN_ATTR_ESALT (oldoffice01_t)) { /** * base @@ -793,7 +793,7 @@ __kernel void m09720_s08 (KERN_ATTR_ESALT (oldoffice01_t)) m09720s (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_extra0_buf, d_extra1_buf, d_extra2_buf, d_extra3_buf, bitmap_mask, bitmap_shift1, bitmap_shift2, salt_pos, loop_pos, loop_cnt, il_cnt, digests_cnt, digests_offset, combs_mode, gid_max); } -__kernel void m09720_s16 (KERN_ATTR_ESALT (oldoffice01_t)) +KERNEL_FQ void m09720_s16 (KERN_ATTR_ESALT (oldoffice01_t)) { /** * base diff --git a/OpenCL/m09800_a0-optimized.cl b/OpenCL/m09800_a0-optimized.cl index 9cbf439aa..d89d4a29d 100644 --- a/OpenCL/m09800_a0-optimized.cl +++ b/OpenCL/m09800_a0-optimized.cl @@ -33,7 +33,7 @@ typedef struct } RC4_KEY; -DECLSPEC void swap (__local RC4_KEY *rc4_key, const u8 i, const u8 j) +DECLSPEC void swap (LOCAL_AS RC4_KEY *rc4_key, const u8 i, const u8 j) { u8 tmp; @@ -42,12 +42,12 @@ DECLSPEC void swap (__local RC4_KEY *rc4_key, const u8 i, const u8 j) rc4_key->S[j] = tmp; } -DECLSPEC void rc4_init_16 (__local RC4_KEY *rc4_key, const u32 *data) +DECLSPEC void rc4_init_16 (LOCAL_AS RC4_KEY *rc4_key, const u32 *data) { u32 v = 0x03020100; u32 a = 0x04040404; - __local u32 *ptr = (__local u32 *) rc4_key->S; + LOCAL_AS u32 *ptr = (LOCAL_AS u32 *) rc4_key->S; #ifdef _unroll #pragma unroll @@ -95,7 +95,7 @@ DECLSPEC void rc4_init_16 (__local RC4_KEY *rc4_key, const u32 *data) } } -DECLSPEC u8 rc4_next_16 (__local RC4_KEY *rc4_key, u8 i, u8 j, const u32 *in, u32 *out) +DECLSPEC u8 rc4_next_16 (LOCAL_AS RC4_KEY *rc4_key, u8 i, u8 j, const u32 *in, u32 *out) { #ifdef _unroll #pragma unroll @@ -148,7 +148,7 @@ DECLSPEC u8 rc4_next_16 (__local RC4_KEY *rc4_key, u8 i, u8 j, const u32 *in, u3 return j; } -__kernel void m09800_m04 (KERN_ATTR_RULES_ESALT (oldoffice34_t)) +KERNEL_FQ void m09800_m04 (KERN_ATTR_RULES_ESALT (oldoffice34_t)) { /** * modifier @@ -182,9 +182,9 @@ __kernel void m09800_m04 (KERN_ATTR_RULES_ESALT (oldoffice34_t)) * shared */ - __local RC4_KEY rc4_keys[64]; + LOCAL_AS RC4_KEY rc4_keys[64]; - __local RC4_KEY *rc4_key = &rc4_keys[lid]; + LOCAL_AS RC4_KEY *rc4_key = &rc4_keys[lid]; /** * salt @@ -340,15 +340,15 @@ __kernel void m09800_m04 (KERN_ATTR_RULES_ESALT (oldoffice34_t)) } } -__kernel void m09800_m08 (KERN_ATTR_RULES_ESALT (oldoffice34_t)) +KERNEL_FQ void m09800_m08 (KERN_ATTR_RULES_ESALT (oldoffice34_t)) { } -__kernel void m09800_m16 (KERN_ATTR_RULES_ESALT (oldoffice34_t)) +KERNEL_FQ void m09800_m16 (KERN_ATTR_RULES_ESALT (oldoffice34_t)) { } -__kernel void m09800_s04 (KERN_ATTR_RULES_ESALT (oldoffice34_t)) +KERNEL_FQ void m09800_s04 (KERN_ATTR_RULES_ESALT (oldoffice34_t)) { /** * modifier @@ -382,9 +382,9 @@ __kernel void m09800_s04 (KERN_ATTR_RULES_ESALT (oldoffice34_t)) * shared */ - __local RC4_KEY rc4_keys[64]; + LOCAL_AS RC4_KEY rc4_keys[64]; - __local RC4_KEY *rc4_key = &rc4_keys[lid]; + LOCAL_AS RC4_KEY *rc4_key = &rc4_keys[lid]; /** * salt @@ -552,10 +552,10 @@ __kernel void m09800_s04 (KERN_ATTR_RULES_ESALT (oldoffice34_t)) } } -__kernel void m09800_s08 (KERN_ATTR_RULES_ESALT (oldoffice34_t)) +KERNEL_FQ void m09800_s08 (KERN_ATTR_RULES_ESALT (oldoffice34_t)) { } -__kernel void m09800_s16 (KERN_ATTR_RULES_ESALT (oldoffice34_t)) +KERNEL_FQ void m09800_s16 (KERN_ATTR_RULES_ESALT (oldoffice34_t)) { } diff --git a/OpenCL/m09800_a1-optimized.cl b/OpenCL/m09800_a1-optimized.cl index b15d3b8ff..96b9c04f0 100644 --- a/OpenCL/m09800_a1-optimized.cl +++ b/OpenCL/m09800_a1-optimized.cl @@ -31,7 +31,7 @@ typedef struct } RC4_KEY; -DECLSPEC void swap (__local RC4_KEY *rc4_key, const u8 i, const u8 j) +DECLSPEC void swap (LOCAL_AS RC4_KEY *rc4_key, const u8 i, const u8 j) { u8 tmp; @@ -40,12 +40,12 @@ DECLSPEC void swap (__local RC4_KEY *rc4_key, const u8 i, const u8 j) rc4_key->S[j] = tmp; } -DECLSPEC void rc4_init_16 (__local RC4_KEY *rc4_key, const u32 *data) +DECLSPEC void rc4_init_16 (LOCAL_AS RC4_KEY *rc4_key, const u32 *data) { u32 v = 0x03020100; u32 a = 0x04040404; - __local u32 *ptr = (__local u32 *) rc4_key->S; + LOCAL_AS u32 *ptr = (LOCAL_AS u32 *) rc4_key->S; #ifdef _unroll #pragma unroll @@ -93,7 +93,7 @@ DECLSPEC void rc4_init_16 (__local RC4_KEY *rc4_key, const u32 *data) } } -DECLSPEC u8 rc4_next_16 (__local RC4_KEY *rc4_key, u8 i, u8 j, const u32 *in, u32 *out) +DECLSPEC u8 rc4_next_16 (LOCAL_AS RC4_KEY *rc4_key, u8 i, u8 j, const u32 *in, u32 *out) { #ifdef _unroll #pragma unroll @@ -146,7 +146,7 @@ DECLSPEC u8 rc4_next_16 (__local RC4_KEY *rc4_key, u8 i, u8 j, const u32 *in, u3 return j; } -__kernel void m09800_m04 (KERN_ATTR_ESALT (oldoffice34_t)) +KERNEL_FQ void m09800_m04 (KERN_ATTR_ESALT (oldoffice34_t)) { /** * modifier @@ -180,9 +180,9 @@ __kernel void m09800_m04 (KERN_ATTR_ESALT (oldoffice34_t)) * shared */ - __local RC4_KEY rc4_keys[64]; + LOCAL_AS RC4_KEY rc4_keys[64]; - __local RC4_KEY *rc4_key = &rc4_keys[lid]; + LOCAL_AS RC4_KEY *rc4_key = &rc4_keys[lid]; /** * salt @@ -388,15 +388,15 @@ __kernel void m09800_m04 (KERN_ATTR_ESALT (oldoffice34_t)) } } -__kernel void m09800_m08 (KERN_ATTR_ESALT (oldoffice34_t)) +KERNEL_FQ void m09800_m08 (KERN_ATTR_ESALT (oldoffice34_t)) { } -__kernel void m09800_m16 (KERN_ATTR_ESALT (oldoffice34_t)) +KERNEL_FQ void m09800_m16 (KERN_ATTR_ESALT (oldoffice34_t)) { } -__kernel void m09800_s04 (KERN_ATTR_ESALT (oldoffice34_t)) +KERNEL_FQ void m09800_s04 (KERN_ATTR_ESALT (oldoffice34_t)) { /** * modifier @@ -430,9 +430,9 @@ __kernel void m09800_s04 (KERN_ATTR_ESALT (oldoffice34_t)) * shared */ - __local RC4_KEY rc4_keys[64]; + LOCAL_AS RC4_KEY rc4_keys[64]; - __local RC4_KEY *rc4_key = &rc4_keys[lid]; + LOCAL_AS RC4_KEY *rc4_key = &rc4_keys[lid]; /** * salt @@ -650,10 +650,10 @@ __kernel void m09800_s04 (KERN_ATTR_ESALT (oldoffice34_t)) } } -__kernel void m09800_s08 (KERN_ATTR_ESALT (oldoffice34_t)) +KERNEL_FQ void m09800_s08 (KERN_ATTR_ESALT (oldoffice34_t)) { } -__kernel void m09800_s16 (KERN_ATTR_ESALT (oldoffice34_t)) +KERNEL_FQ void m09800_s16 (KERN_ATTR_ESALT (oldoffice34_t)) { } diff --git a/OpenCL/m09800_a3-optimized.cl b/OpenCL/m09800_a3-optimized.cl index 359873112..456b04dd2 100644 --- a/OpenCL/m09800_a3-optimized.cl +++ b/OpenCL/m09800_a3-optimized.cl @@ -28,7 +28,7 @@ typedef struct } RC4_KEY; -DECLSPEC void swap (__local RC4_KEY *rc4_key, const u8 i, const u8 j) +DECLSPEC void swap (LOCAL_AS RC4_KEY *rc4_key, const u8 i, const u8 j) { u8 tmp; @@ -37,12 +37,12 @@ DECLSPEC void swap (__local RC4_KEY *rc4_key, const u8 i, const u8 j) rc4_key->S[j] = tmp; } -DECLSPEC void rc4_init_16 (__local RC4_KEY *rc4_key, const u32 *data) +DECLSPEC void rc4_init_16 (LOCAL_AS RC4_KEY *rc4_key, const u32 *data) { u32 v = 0x03020100; u32 a = 0x04040404; - __local u32 *ptr = (__local u32 *) rc4_key->S; + LOCAL_AS u32 *ptr = (LOCAL_AS u32 *) rc4_key->S; #ifdef _unroll #pragma unroll @@ -90,7 +90,7 @@ DECLSPEC void rc4_init_16 (__local RC4_KEY *rc4_key, const u32 *data) } } -DECLSPEC u8 rc4_next_16 (__local RC4_KEY *rc4_key, u8 i, u8 j, const u32 *in, u32 *out) +DECLSPEC u8 rc4_next_16 (LOCAL_AS RC4_KEY *rc4_key, u8 i, u8 j, const u32 *in, u32 *out) { #ifdef _unroll #pragma unroll @@ -143,7 +143,7 @@ DECLSPEC u8 rc4_next_16 (__local RC4_KEY *rc4_key, u8 i, u8 j, const u32 *in, u3 return j; } -DECLSPEC void m09800m (__local RC4_KEY *rc4_keys, u32 *w0, u32 *w1, u32 *w2, u32 *w3, const u32 pw_len, KERN_ATTR_ESALT (oldoffice34_t)) +DECLSPEC void m09800m (LOCAL_AS RC4_KEY *rc4_keys, u32 *w0, u32 *w1, u32 *w2, u32 *w3, const u32 pw_len, KERN_ATTR_ESALT (oldoffice34_t)) { /** * modifier @@ -156,7 +156,7 @@ DECLSPEC void m09800m (__local RC4_KEY *rc4_keys, u32 *w0, u32 *w1, u32 *w2, u32 * shared */ - __local RC4_KEY *rc4_key = &rc4_keys[lid]; + LOCAL_AS RC4_KEY *rc4_key = &rc4_keys[lid]; /** * salt @@ -311,7 +311,7 @@ DECLSPEC void m09800m (__local RC4_KEY *rc4_keys, u32 *w0, u32 *w1, u32 *w2, u32 } } -DECLSPEC void m09800s (__local RC4_KEY *rc4_keys, u32 *w0, u32 *w1, u32 *w2, u32 *w3, const u32 pw_len, KERN_ATTR_ESALT (oldoffice34_t)) +DECLSPEC void m09800s (LOCAL_AS RC4_KEY *rc4_keys, u32 *w0, u32 *w1, u32 *w2, u32 *w3, const u32 pw_len, KERN_ATTR_ESALT (oldoffice34_t)) { /** * modifier @@ -324,7 +324,7 @@ DECLSPEC void m09800s (__local RC4_KEY *rc4_keys, u32 *w0, u32 *w1, u32 *w2, u32 * shared */ - __local RC4_KEY *rc4_key = &rc4_keys[lid]; + LOCAL_AS RC4_KEY *rc4_key = &rc4_keys[lid]; /** * salt @@ -491,7 +491,7 @@ DECLSPEC void m09800s (__local RC4_KEY *rc4_keys, u32 *w0, u32 *w1, u32 *w2, u32 } } -__kernel void m09800_m04 (KERN_ATTR_ESALT (oldoffice34_t)) +KERNEL_FQ void m09800_m04 (KERN_ATTR_ESALT (oldoffice34_t)) { /** * base @@ -535,12 +535,12 @@ __kernel void m09800_m04 (KERN_ATTR_ESALT (oldoffice34_t)) * main */ - __local RC4_KEY rc4_keys[64]; + LOCAL_AS RC4_KEY rc4_keys[64]; m09800m (rc4_keys, 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_extra0_buf, d_extra1_buf, d_extra2_buf, d_extra3_buf, bitmap_mask, bitmap_shift1, bitmap_shift2, salt_pos, loop_pos, loop_cnt, il_cnt, digests_cnt, digests_offset, combs_mode, gid_max); } -__kernel void m09800_m08 (KERN_ATTR_ESALT (oldoffice34_t)) +KERNEL_FQ void m09800_m08 (KERN_ATTR_ESALT (oldoffice34_t)) { /** * base @@ -584,12 +584,12 @@ __kernel void m09800_m08 (KERN_ATTR_ESALT (oldoffice34_t)) * main */ - __local RC4_KEY rc4_keys[64]; + LOCAL_AS RC4_KEY rc4_keys[64]; m09800m (rc4_keys, 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_extra0_buf, d_extra1_buf, d_extra2_buf, d_extra3_buf, bitmap_mask, bitmap_shift1, bitmap_shift2, salt_pos, loop_pos, loop_cnt, il_cnt, digests_cnt, digests_offset, combs_mode, gid_max); } -__kernel void m09800_m16 (KERN_ATTR_ESALT (oldoffice34_t)) +KERNEL_FQ void m09800_m16 (KERN_ATTR_ESALT (oldoffice34_t)) { /** * base @@ -633,12 +633,12 @@ __kernel void m09800_m16 (KERN_ATTR_ESALT (oldoffice34_t)) * main */ - __local RC4_KEY rc4_keys[64]; + LOCAL_AS RC4_KEY rc4_keys[64]; m09800m (rc4_keys, 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_extra0_buf, d_extra1_buf, d_extra2_buf, d_extra3_buf, bitmap_mask, bitmap_shift1, bitmap_shift2, salt_pos, loop_pos, loop_cnt, il_cnt, digests_cnt, digests_offset, combs_mode, gid_max); } -__kernel void m09800_s04 (KERN_ATTR_ESALT (oldoffice34_t)) +KERNEL_FQ void m09800_s04 (KERN_ATTR_ESALT (oldoffice34_t)) { /** * base @@ -682,12 +682,12 @@ __kernel void m09800_s04 (KERN_ATTR_ESALT (oldoffice34_t)) * main */ - __local RC4_KEY rc4_keys[64]; + LOCAL_AS RC4_KEY rc4_keys[64]; m09800s (rc4_keys, 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_extra0_buf, d_extra1_buf, d_extra2_buf, d_extra3_buf, bitmap_mask, bitmap_shift1, bitmap_shift2, salt_pos, loop_pos, loop_cnt, il_cnt, digests_cnt, digests_offset, combs_mode, gid_max); } -__kernel void m09800_s08 (KERN_ATTR_ESALT (oldoffice34_t)) +KERNEL_FQ void m09800_s08 (KERN_ATTR_ESALT (oldoffice34_t)) { /** * base @@ -731,12 +731,12 @@ __kernel void m09800_s08 (KERN_ATTR_ESALT (oldoffice34_t)) * main */ - __local RC4_KEY rc4_keys[64]; + LOCAL_AS RC4_KEY rc4_keys[64]; m09800s (rc4_keys, 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_extra0_buf, d_extra1_buf, d_extra2_buf, d_extra3_buf, bitmap_mask, bitmap_shift1, bitmap_shift2, salt_pos, loop_pos, loop_cnt, il_cnt, digests_cnt, digests_offset, combs_mode, gid_max); } -__kernel void m09800_s16 (KERN_ATTR_ESALT (oldoffice34_t)) +KERNEL_FQ void m09800_s16 (KERN_ATTR_ESALT (oldoffice34_t)) { /** * base @@ -780,7 +780,7 @@ __kernel void m09800_s16 (KERN_ATTR_ESALT (oldoffice34_t)) * main */ - __local RC4_KEY rc4_keys[64]; + LOCAL_AS RC4_KEY rc4_keys[64]; m09800s (rc4_keys, 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_extra0_buf, d_extra1_buf, d_extra2_buf, d_extra3_buf, bitmap_mask, bitmap_shift1, bitmap_shift2, salt_pos, loop_pos, loop_cnt, il_cnt, digests_cnt, digests_offset, combs_mode, gid_max); } diff --git a/OpenCL/m09810_a0-optimized.cl b/OpenCL/m09810_a0-optimized.cl index f29aa09f0..c51433cef 100644 --- a/OpenCL/m09810_a0-optimized.cl +++ b/OpenCL/m09810_a0-optimized.cl @@ -33,7 +33,7 @@ typedef struct } RC4_KEY; -DECLSPEC void swap (__local RC4_KEY *rc4_key, const u8 i, const u8 j) +DECLSPEC void swap (LOCAL_AS RC4_KEY *rc4_key, const u8 i, const u8 j) { u8 tmp; @@ -42,12 +42,12 @@ DECLSPEC void swap (__local RC4_KEY *rc4_key, const u8 i, const u8 j) rc4_key->S[j] = tmp; } -DECLSPEC void rc4_init_16 (__local RC4_KEY *rc4_key, const u32 *data) +DECLSPEC void rc4_init_16 (LOCAL_AS RC4_KEY *rc4_key, const u32 *data) { u32 v = 0x03020100; u32 a = 0x04040404; - __local u32 *ptr = (__local u32 *) rc4_key->S; + LOCAL_AS u32 *ptr = (LOCAL_AS u32 *) rc4_key->S; #ifdef _unroll #pragma unroll @@ -95,7 +95,7 @@ DECLSPEC void rc4_init_16 (__local RC4_KEY *rc4_key, const u32 *data) } } -DECLSPEC u8 rc4_next_16 (__local RC4_KEY *rc4_key, u8 i, u8 j, const u32 *in, u32 *out) +DECLSPEC u8 rc4_next_16 (LOCAL_AS RC4_KEY *rc4_key, u8 i, u8 j, const u32 *in, u32 *out) { #ifdef _unroll #pragma unroll @@ -148,7 +148,7 @@ DECLSPEC u8 rc4_next_16 (__local RC4_KEY *rc4_key, u8 i, u8 j, const u32 *in, u3 return j; } -__kernel void m09810_m04 (KERN_ATTR_RULES_ESALT (oldoffice34_t)) +KERNEL_FQ void m09810_m04 (KERN_ATTR_RULES_ESALT (oldoffice34_t)) { /** * modifier @@ -182,9 +182,9 @@ __kernel void m09810_m04 (KERN_ATTR_RULES_ESALT (oldoffice34_t)) * shared */ - __local RC4_KEY rc4_keys[64]; + LOCAL_AS RC4_KEY rc4_keys[64]; - __local RC4_KEY *rc4_key = &rc4_keys[lid]; + LOCAL_AS RC4_KEY *rc4_key = &rc4_keys[lid]; /** * esalt @@ -267,15 +267,15 @@ __kernel void m09810_m04 (KERN_ATTR_RULES_ESALT (oldoffice34_t)) } } -__kernel void m09810_m08 (KERN_ATTR_RULES_ESALT (oldoffice34_t)) +KERNEL_FQ void m09810_m08 (KERN_ATTR_RULES_ESALT (oldoffice34_t)) { } -__kernel void m09810_m16 (KERN_ATTR_RULES_ESALT (oldoffice34_t)) +KERNEL_FQ void m09810_m16 (KERN_ATTR_RULES_ESALT (oldoffice34_t)) { } -__kernel void m09810_s04 (KERN_ATTR_RULES_ESALT (oldoffice34_t)) +KERNEL_FQ void m09810_s04 (KERN_ATTR_RULES_ESALT (oldoffice34_t)) { /** * modifier @@ -309,9 +309,9 @@ __kernel void m09810_s04 (KERN_ATTR_RULES_ESALT (oldoffice34_t)) * shared */ - __local RC4_KEY rc4_keys[64]; + LOCAL_AS RC4_KEY rc4_keys[64]; - __local RC4_KEY *rc4_key = &rc4_keys[lid]; + LOCAL_AS RC4_KEY *rc4_key = &rc4_keys[lid]; /** * esalt @@ -406,10 +406,10 @@ __kernel void m09810_s04 (KERN_ATTR_RULES_ESALT (oldoffice34_t)) } } -__kernel void m09810_s08 (KERN_ATTR_RULES_ESALT (oldoffice34_t)) +KERNEL_FQ void m09810_s08 (KERN_ATTR_RULES_ESALT (oldoffice34_t)) { } -__kernel void m09810_s16 (KERN_ATTR_RULES_ESALT (oldoffice34_t)) +KERNEL_FQ void m09810_s16 (KERN_ATTR_RULES_ESALT (oldoffice34_t)) { } diff --git a/OpenCL/m09810_a1-optimized.cl b/OpenCL/m09810_a1-optimized.cl index 8216745f3..f21fcce83 100644 --- a/OpenCL/m09810_a1-optimized.cl +++ b/OpenCL/m09810_a1-optimized.cl @@ -31,7 +31,7 @@ typedef struct } RC4_KEY; -DECLSPEC void swap (__local RC4_KEY *rc4_key, const u8 i, const u8 j) +DECLSPEC void swap (LOCAL_AS RC4_KEY *rc4_key, const u8 i, const u8 j) { u8 tmp; @@ -40,12 +40,12 @@ DECLSPEC void swap (__local RC4_KEY *rc4_key, const u8 i, const u8 j) rc4_key->S[j] = tmp; } -DECLSPEC void rc4_init_16 (__local RC4_KEY *rc4_key, const u32 *data) +DECLSPEC void rc4_init_16 (LOCAL_AS RC4_KEY *rc4_key, const u32 *data) { u32 v = 0x03020100; u32 a = 0x04040404; - __local u32 *ptr = (__local u32 *) rc4_key->S; + LOCAL_AS u32 *ptr = (LOCAL_AS u32 *) rc4_key->S; #ifdef _unroll #pragma unroll @@ -93,7 +93,7 @@ DECLSPEC void rc4_init_16 (__local RC4_KEY *rc4_key, const u32 *data) } } -DECLSPEC u8 rc4_next_16 (__local RC4_KEY *rc4_key, u8 i, u8 j, const u32 *in, u32 *out) +DECLSPEC u8 rc4_next_16 (LOCAL_AS RC4_KEY *rc4_key, u8 i, u8 j, const u32 *in, u32 *out) { #ifdef _unroll #pragma unroll @@ -146,7 +146,7 @@ DECLSPEC u8 rc4_next_16 (__local RC4_KEY *rc4_key, u8 i, u8 j, const u32 *in, u3 return j; } -__kernel void m09810_m04 (KERN_ATTR_ESALT (oldoffice34_t)) +KERNEL_FQ void m09810_m04 (KERN_ATTR_ESALT (oldoffice34_t)) { /** * modifier @@ -180,9 +180,9 @@ __kernel void m09810_m04 (KERN_ATTR_ESALT (oldoffice34_t)) * shared */ - __local RC4_KEY rc4_keys[64]; + LOCAL_AS RC4_KEY rc4_keys[64]; - __local RC4_KEY *rc4_key = &rc4_keys[lid]; + LOCAL_AS RC4_KEY *rc4_key = &rc4_keys[lid]; /** * esalt @@ -311,15 +311,15 @@ __kernel void m09810_m04 (KERN_ATTR_ESALT (oldoffice34_t)) } } -__kernel void m09810_m08 (KERN_ATTR_ESALT (oldoffice34_t)) +KERNEL_FQ void m09810_m08 (KERN_ATTR_ESALT (oldoffice34_t)) { } -__kernel void m09810_m16 (KERN_ATTR_ESALT (oldoffice34_t)) +KERNEL_FQ void m09810_m16 (KERN_ATTR_ESALT (oldoffice34_t)) { } -__kernel void m09810_s04 (KERN_ATTR_ESALT (oldoffice34_t)) +KERNEL_FQ void m09810_s04 (KERN_ATTR_ESALT (oldoffice34_t)) { /** * modifier @@ -353,9 +353,9 @@ __kernel void m09810_s04 (KERN_ATTR_ESALT (oldoffice34_t)) * shared */ - __local RC4_KEY rc4_keys[64]; + LOCAL_AS RC4_KEY rc4_keys[64]; - __local RC4_KEY *rc4_key = &rc4_keys[lid]; + LOCAL_AS RC4_KEY *rc4_key = &rc4_keys[lid]; /** * esalt @@ -496,10 +496,10 @@ __kernel void m09810_s04 (KERN_ATTR_ESALT (oldoffice34_t)) } } -__kernel void m09810_s08 (KERN_ATTR_ESALT (oldoffice34_t)) +KERNEL_FQ void m09810_s08 (KERN_ATTR_ESALT (oldoffice34_t)) { } -__kernel void m09810_s16 (KERN_ATTR_ESALT (oldoffice34_t)) +KERNEL_FQ void m09810_s16 (KERN_ATTR_ESALT (oldoffice34_t)) { } diff --git a/OpenCL/m09810_a3-optimized.cl b/OpenCL/m09810_a3-optimized.cl index c88e8e6b0..1d5cee8a0 100644 --- a/OpenCL/m09810_a3-optimized.cl +++ b/OpenCL/m09810_a3-optimized.cl @@ -31,7 +31,7 @@ typedef struct } RC4_KEY; -DECLSPEC void swap (__local RC4_KEY *rc4_key, const u8 i, const u8 j) +DECLSPEC void swap (LOCAL_AS RC4_KEY *rc4_key, const u8 i, const u8 j) { u8 tmp; @@ -40,12 +40,12 @@ DECLSPEC void swap (__local RC4_KEY *rc4_key, const u8 i, const u8 j) rc4_key->S[j] = tmp; } -DECLSPEC void rc4_init_16 (__local RC4_KEY *rc4_key, const u32 *data) +DECLSPEC void rc4_init_16 (LOCAL_AS RC4_KEY *rc4_key, const u32 *data) { u32 v = 0x03020100; u32 a = 0x04040404; - __local u32 *ptr = (__local u32 *) rc4_key->S; + LOCAL_AS u32 *ptr = (LOCAL_AS u32 *) rc4_key->S; #ifdef _unroll #pragma unroll @@ -93,7 +93,7 @@ DECLSPEC void rc4_init_16 (__local RC4_KEY *rc4_key, const u32 *data) } } -DECLSPEC u8 rc4_next_16 (__local RC4_KEY *rc4_key, u8 i, u8 j, const u32 *in, u32 *out) +DECLSPEC u8 rc4_next_16 (LOCAL_AS RC4_KEY *rc4_key, u8 i, u8 j, const u32 *in, u32 *out) { #ifdef _unroll #pragma unroll @@ -146,7 +146,7 @@ DECLSPEC u8 rc4_next_16 (__local RC4_KEY *rc4_key, u8 i, u8 j, const u32 *in, u3 return j; } -DECLSPEC void m09810m (__local RC4_KEY *rc4_keys, u32 *w0, u32 *w1, u32 *w2, u32 *w3, const u32 pw_len, KERN_ATTR_ESALT (oldoffice34_t)) +DECLSPEC void m09810m (LOCAL_AS RC4_KEY *rc4_keys, u32 *w0, u32 *w1, u32 *w2, u32 *w3, const u32 pw_len, KERN_ATTR_ESALT (oldoffice34_t)) { /** * modifier @@ -159,7 +159,7 @@ DECLSPEC void m09810m (__local RC4_KEY *rc4_keys, u32 *w0, u32 *w1, u32 *w2, u32 * shared */ - __local RC4_KEY *rc4_key = &rc4_keys[lid]; + LOCAL_AS RC4_KEY *rc4_key = &rc4_keys[lid]; /** * esalt @@ -242,7 +242,7 @@ DECLSPEC void m09810m (__local RC4_KEY *rc4_keys, u32 *w0, u32 *w1, u32 *w2, u32 } } -DECLSPEC void m09810s (__local RC4_KEY *rc4_keys, u32 *w0, u32 *w1, u32 *w2, u32 *w3, const u32 pw_len, KERN_ATTR_ESALT (oldoffice34_t)) +DECLSPEC void m09810s (LOCAL_AS RC4_KEY *rc4_keys, u32 *w0, u32 *w1, u32 *w2, u32 *w3, const u32 pw_len, KERN_ATTR_ESALT (oldoffice34_t)) { /** * modifier @@ -255,7 +255,7 @@ DECLSPEC void m09810s (__local RC4_KEY *rc4_keys, u32 *w0, u32 *w1, u32 *w2, u32 * shared */ - __local RC4_KEY *rc4_key = &rc4_keys[lid]; + LOCAL_AS RC4_KEY *rc4_key = &rc4_keys[lid]; /** * esalt @@ -350,7 +350,7 @@ DECLSPEC void m09810s (__local RC4_KEY *rc4_keys, u32 *w0, u32 *w1, u32 *w2, u32 } } -__kernel void m09810_m04 (KERN_ATTR_ESALT (oldoffice34_t)) +KERNEL_FQ void m09810_m04 (KERN_ATTR_ESALT (oldoffice34_t)) { /** * base @@ -394,12 +394,12 @@ __kernel void m09810_m04 (KERN_ATTR_ESALT (oldoffice34_t)) * main */ - __local RC4_KEY rc4_keys[64]; + LOCAL_AS RC4_KEY rc4_keys[64]; m09810m (rc4_keys, 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_extra0_buf, d_extra1_buf, d_extra2_buf, d_extra3_buf, bitmap_mask, bitmap_shift1, bitmap_shift2, salt_pos, loop_pos, loop_cnt, il_cnt, digests_cnt, digests_offset, combs_mode, gid_max); } -__kernel void m09810_m08 (KERN_ATTR_ESALT (oldoffice34_t)) +KERNEL_FQ void m09810_m08 (KERN_ATTR_ESALT (oldoffice34_t)) { /** * base @@ -443,12 +443,12 @@ __kernel void m09810_m08 (KERN_ATTR_ESALT (oldoffice34_t)) * main */ - __local RC4_KEY rc4_keys[64]; + LOCAL_AS RC4_KEY rc4_keys[64]; m09810m (rc4_keys, 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_extra0_buf, d_extra1_buf, d_extra2_buf, d_extra3_buf, bitmap_mask, bitmap_shift1, bitmap_shift2, salt_pos, loop_pos, loop_cnt, il_cnt, digests_cnt, digests_offset, combs_mode, gid_max); } -__kernel void m09810_m16 (KERN_ATTR_ESALT (oldoffice34_t)) +KERNEL_FQ void m09810_m16 (KERN_ATTR_ESALT (oldoffice34_t)) { /** * base @@ -492,12 +492,12 @@ __kernel void m09810_m16 (KERN_ATTR_ESALT (oldoffice34_t)) * main */ - __local RC4_KEY rc4_keys[64]; + LOCAL_AS RC4_KEY rc4_keys[64]; m09810m (rc4_keys, 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_extra0_buf, d_extra1_buf, d_extra2_buf, d_extra3_buf, bitmap_mask, bitmap_shift1, bitmap_shift2, salt_pos, loop_pos, loop_cnt, il_cnt, digests_cnt, digests_offset, combs_mode, gid_max); } -__kernel void m09810_s04 (KERN_ATTR_ESALT (oldoffice34_t)) +KERNEL_FQ void m09810_s04 (KERN_ATTR_ESALT (oldoffice34_t)) { /** * base @@ -541,12 +541,12 @@ __kernel void m09810_s04 (KERN_ATTR_ESALT (oldoffice34_t)) * main */ - __local RC4_KEY rc4_keys[64]; + LOCAL_AS RC4_KEY rc4_keys[64]; m09810s (rc4_keys, 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_extra0_buf, d_extra1_buf, d_extra2_buf, d_extra3_buf, bitmap_mask, bitmap_shift1, bitmap_shift2, salt_pos, loop_pos, loop_cnt, il_cnt, digests_cnt, digests_offset, combs_mode, gid_max); } -__kernel void m09810_s08 (KERN_ATTR_ESALT (oldoffice34_t)) +KERNEL_FQ void m09810_s08 (KERN_ATTR_ESALT (oldoffice34_t)) { /** * base @@ -590,12 +590,12 @@ __kernel void m09810_s08 (KERN_ATTR_ESALT (oldoffice34_t)) * main */ - __local RC4_KEY rc4_keys[64]; + LOCAL_AS RC4_KEY rc4_keys[64]; m09810s (rc4_keys, 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_extra0_buf, d_extra1_buf, d_extra2_buf, d_extra3_buf, bitmap_mask, bitmap_shift1, bitmap_shift2, salt_pos, loop_pos, loop_cnt, il_cnt, digests_cnt, digests_offset, combs_mode, gid_max); } -__kernel void m09810_s16 (KERN_ATTR_ESALT (oldoffice34_t)) +KERNEL_FQ void m09810_s16 (KERN_ATTR_ESALT (oldoffice34_t)) { /** * base @@ -639,7 +639,7 @@ __kernel void m09810_s16 (KERN_ATTR_ESALT (oldoffice34_t)) * main */ - __local RC4_KEY rc4_keys[64]; + LOCAL_AS RC4_KEY rc4_keys[64]; m09810s (rc4_keys, 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_extra0_buf, d_extra1_buf, d_extra2_buf, d_extra3_buf, bitmap_mask, bitmap_shift1, bitmap_shift2, salt_pos, loop_pos, loop_cnt, il_cnt, digests_cnt, digests_offset, combs_mode, gid_max); } diff --git a/OpenCL/m09820_a0-optimized.cl b/OpenCL/m09820_a0-optimized.cl index 76febadfb..dd3294059 100644 --- a/OpenCL/m09820_a0-optimized.cl +++ b/OpenCL/m09820_a0-optimized.cl @@ -24,7 +24,7 @@ typedef struct oldoffice34 } oldoffice34_t; -__kernel void m09820_m04 (KERN_ATTR_RULES_ESALT (oldoffice34_t)) +KERNEL_FQ void m09820_m04 (KERN_ATTR_RULES_ESALT (oldoffice34_t)) { /** * modifier @@ -150,15 +150,15 @@ __kernel void m09820_m04 (KERN_ATTR_RULES_ESALT (oldoffice34_t)) } } -__kernel void m09820_m08 (KERN_ATTR_RULES_ESALT (oldoffice34_t)) +KERNEL_FQ void m09820_m08 (KERN_ATTR_RULES_ESALT (oldoffice34_t)) { } -__kernel void m09820_m16 (KERN_ATTR_RULES_ESALT (oldoffice34_t)) +KERNEL_FQ void m09820_m16 (KERN_ATTR_RULES_ESALT (oldoffice34_t)) { } -__kernel void m09820_s04 (KERN_ATTR_RULES_ESALT (oldoffice34_t)) +KERNEL_FQ void m09820_s04 (KERN_ATTR_RULES_ESALT (oldoffice34_t)) { /** * modifier @@ -296,10 +296,10 @@ __kernel void m09820_s04 (KERN_ATTR_RULES_ESALT (oldoffice34_t)) } } -__kernel void m09820_s08 (KERN_ATTR_RULES_ESALT (oldoffice34_t)) +KERNEL_FQ void m09820_s08 (KERN_ATTR_RULES_ESALT (oldoffice34_t)) { } -__kernel void m09820_s16 (KERN_ATTR_RULES_ESALT (oldoffice34_t)) +KERNEL_FQ void m09820_s16 (KERN_ATTR_RULES_ESALT (oldoffice34_t)) { } diff --git a/OpenCL/m09820_a1-optimized.cl b/OpenCL/m09820_a1-optimized.cl index 48b424ac4..1932663df 100644 --- a/OpenCL/m09820_a1-optimized.cl +++ b/OpenCL/m09820_a1-optimized.cl @@ -22,7 +22,7 @@ typedef struct oldoffice34 } oldoffice34_t; -__kernel void m09820_m04 (KERN_ATTR_ESALT (oldoffice34_t)) +KERNEL_FQ void m09820_m04 (KERN_ATTR_ESALT (oldoffice34_t)) { /** * modifier @@ -198,15 +198,15 @@ __kernel void m09820_m04 (KERN_ATTR_ESALT (oldoffice34_t)) } } -__kernel void m09820_m08 (KERN_ATTR_ESALT (oldoffice34_t)) +KERNEL_FQ void m09820_m08 (KERN_ATTR_ESALT (oldoffice34_t)) { } -__kernel void m09820_m16 (KERN_ATTR_ESALT (oldoffice34_t)) +KERNEL_FQ void m09820_m16 (KERN_ATTR_ESALT (oldoffice34_t)) { } -__kernel void m09820_s04 (KERN_ATTR_ESALT (oldoffice34_t)) +KERNEL_FQ void m09820_s04 (KERN_ATTR_ESALT (oldoffice34_t)) { /** * modifier @@ -394,10 +394,10 @@ __kernel void m09820_s04 (KERN_ATTR_ESALT (oldoffice34_t)) } } -__kernel void m09820_s08 (KERN_ATTR_ESALT (oldoffice34_t)) +KERNEL_FQ void m09820_s08 (KERN_ATTR_ESALT (oldoffice34_t)) { } -__kernel void m09820_s16 (KERN_ATTR_ESALT (oldoffice34_t)) +KERNEL_FQ void m09820_s16 (KERN_ATTR_ESALT (oldoffice34_t)) { } diff --git a/OpenCL/m09820_a3-optimized.cl b/OpenCL/m09820_a3-optimized.cl index ecb6fa4d6..564d2ec53 100644 --- a/OpenCL/m09820_a3-optimized.cl +++ b/OpenCL/m09820_a3-optimized.cl @@ -238,7 +238,7 @@ DECLSPEC void m09820s (u32 *w0, u32 *w1, u32 *w2, u32 *w3, const u32 pw_len, KER } } -__kernel void m09820_m04 (KERN_ATTR_ESALT (oldoffice34_t)) +KERNEL_FQ void m09820_m04 (KERN_ATTR_ESALT (oldoffice34_t)) { /** * base @@ -281,7 +281,7 @@ __kernel void m09820_m04 (KERN_ATTR_ESALT (oldoffice34_t)) m09820m (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_extra0_buf, d_extra1_buf, d_extra2_buf, d_extra3_buf, bitmap_mask, bitmap_shift1, bitmap_shift2, salt_pos, loop_pos, loop_cnt, il_cnt, digests_cnt, digests_offset, combs_mode, gid_max); } -__kernel void m09820_m08 (KERN_ATTR_ESALT (oldoffice34_t)) +KERNEL_FQ void m09820_m08 (KERN_ATTR_ESALT (oldoffice34_t)) { /** * base @@ -324,7 +324,7 @@ __kernel void m09820_m08 (KERN_ATTR_ESALT (oldoffice34_t)) m09820m (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_extra0_buf, d_extra1_buf, d_extra2_buf, d_extra3_buf, bitmap_mask, bitmap_shift1, bitmap_shift2, salt_pos, loop_pos, loop_cnt, il_cnt, digests_cnt, digests_offset, combs_mode, gid_max); } -__kernel void m09820_m16 (KERN_ATTR_ESALT (oldoffice34_t)) +KERNEL_FQ void m09820_m16 (KERN_ATTR_ESALT (oldoffice34_t)) { /** * base @@ -367,7 +367,7 @@ __kernel void m09820_m16 (KERN_ATTR_ESALT (oldoffice34_t)) m09820m (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_extra0_buf, d_extra1_buf, d_extra2_buf, d_extra3_buf, bitmap_mask, bitmap_shift1, bitmap_shift2, salt_pos, loop_pos, loop_cnt, il_cnt, digests_cnt, digests_offset, combs_mode, gid_max); } -__kernel void m09820_s04 (KERN_ATTR_ESALT (oldoffice34_t)) +KERNEL_FQ void m09820_s04 (KERN_ATTR_ESALT (oldoffice34_t)) { /** * base @@ -410,7 +410,7 @@ __kernel void m09820_s04 (KERN_ATTR_ESALT (oldoffice34_t)) m09820s (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_extra0_buf, d_extra1_buf, d_extra2_buf, d_extra3_buf, bitmap_mask, bitmap_shift1, bitmap_shift2, salt_pos, loop_pos, loop_cnt, il_cnt, digests_cnt, digests_offset, combs_mode, gid_max); } -__kernel void m09820_s08 (KERN_ATTR_ESALT (oldoffice34_t)) +KERNEL_FQ void m09820_s08 (KERN_ATTR_ESALT (oldoffice34_t)) { /** * base @@ -453,7 +453,7 @@ __kernel void m09820_s08 (KERN_ATTR_ESALT (oldoffice34_t)) m09820s (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_extra0_buf, d_extra1_buf, d_extra2_buf, d_extra3_buf, bitmap_mask, bitmap_shift1, bitmap_shift2, salt_pos, loop_pos, loop_cnt, il_cnt, digests_cnt, digests_offset, combs_mode, gid_max); } -__kernel void m09820_s16 (KERN_ATTR_ESALT (oldoffice34_t)) +KERNEL_FQ void m09820_s16 (KERN_ATTR_ESALT (oldoffice34_t)) { /** * base diff --git a/OpenCL/m09900_a0-optimized.cl b/OpenCL/m09900_a0-optimized.cl index f20dd95c5..a8a8a1d6a 100644 --- a/OpenCL/m09900_a0-optimized.cl +++ b/OpenCL/m09900_a0-optimized.cl @@ -15,7 +15,7 @@ #include "inc_hash_md5.cl" #endif -__kernel void m09900_m04 (KERN_ATTR_RULES ()) +KERNEL_FQ void m09900_m04 (KERN_ATTR_RULES ()) { /** * modifier @@ -241,15 +241,15 @@ __kernel void m09900_m04 (KERN_ATTR_RULES ()) } } -__kernel void m09900_m08 (KERN_ATTR_RULES ()) +KERNEL_FQ void m09900_m08 (KERN_ATTR_RULES ()) { } -__kernel void m09900_m16 (KERN_ATTR_RULES ()) +KERNEL_FQ void m09900_m16 (KERN_ATTR_RULES ()) { } -__kernel void m09900_s04 (KERN_ATTR_RULES ()) +KERNEL_FQ void m09900_s04 (KERN_ATTR_RULES ()) { /** * modifier @@ -490,10 +490,10 @@ __kernel void m09900_s04 (KERN_ATTR_RULES ()) } } -__kernel void m09900_s08 (KERN_ATTR_RULES ()) +KERNEL_FQ void m09900_s08 (KERN_ATTR_RULES ()) { } -__kernel void m09900_s16 (KERN_ATTR_RULES ()) +KERNEL_FQ void m09900_s16 (KERN_ATTR_RULES ()) { } diff --git a/OpenCL/m09900_a0-pure.cl b/OpenCL/m09900_a0-pure.cl index 37482f661..64976e835 100644 --- a/OpenCL/m09900_a0-pure.cl +++ b/OpenCL/m09900_a0-pure.cl @@ -15,7 +15,7 @@ #include "inc_hash_md5.cl" #endif -__kernel void m09900_mxx (KERN_ATTR_RULES ()) +KERNEL_FQ void m09900_mxx (KERN_ATTR_RULES ()) { /** * modifier @@ -59,7 +59,7 @@ __kernel void m09900_mxx (KERN_ATTR_RULES ()) } } -__kernel void m09900_sxx (KERN_ATTR_RULES ()) +KERNEL_FQ void m09900_sxx (KERN_ATTR_RULES ()) { /** * modifier diff --git a/OpenCL/m09900_a1-optimized.cl b/OpenCL/m09900_a1-optimized.cl index 0c2b2e447..bdac4c177 100644 --- a/OpenCL/m09900_a1-optimized.cl +++ b/OpenCL/m09900_a1-optimized.cl @@ -13,7 +13,7 @@ #include "inc_hash_md5.cl" #endif -__kernel void m09900_m04 (KERN_ATTR_BASIC ()) +KERNEL_FQ void m09900_m04 (KERN_ATTR_BASIC ()) { /** * modifier @@ -299,15 +299,15 @@ __kernel void m09900_m04 (KERN_ATTR_BASIC ()) } } -__kernel void m09900_m08 (KERN_ATTR_BASIC ()) +KERNEL_FQ void m09900_m08 (KERN_ATTR_BASIC ()) { } -__kernel void m09900_m16 (KERN_ATTR_BASIC ()) +KERNEL_FQ void m09900_m16 (KERN_ATTR_BASIC ()) { } -__kernel void m09900_s04 (KERN_ATTR_BASIC ()) +KERNEL_FQ void m09900_s04 (KERN_ATTR_BASIC ()) { /** * modifier @@ -608,10 +608,10 @@ __kernel void m09900_s04 (KERN_ATTR_BASIC ()) } } -__kernel void m09900_s08 (KERN_ATTR_BASIC ()) +KERNEL_FQ void m09900_s08 (KERN_ATTR_BASIC ()) { } -__kernel void m09900_s16 (KERN_ATTR_BASIC ()) +KERNEL_FQ void m09900_s16 (KERN_ATTR_BASIC ()) { } diff --git a/OpenCL/m09900_a1-pure.cl b/OpenCL/m09900_a1-pure.cl index 941b0d7b2..2313b9bf9 100644 --- a/OpenCL/m09900_a1-pure.cl +++ b/OpenCL/m09900_a1-pure.cl @@ -13,7 +13,7 @@ #include "inc_hash_md5.cl" #endif -__kernel void m09900_mxx (KERN_ATTR_BASIC ()) +KERNEL_FQ void m09900_mxx (KERN_ATTR_BASIC ()) { /** * modifier @@ -55,7 +55,7 @@ __kernel void m09900_mxx (KERN_ATTR_BASIC ()) } } -__kernel void m09900_sxx (KERN_ATTR_BASIC ()) +KERNEL_FQ void m09900_sxx (KERN_ATTR_BASIC ()) { /** * modifier diff --git a/OpenCL/m09900_a3-optimized.cl b/OpenCL/m09900_a3-optimized.cl index 5b0c6a634..6f56f1703 100644 --- a/OpenCL/m09900_a3-optimized.cl +++ b/OpenCL/m09900_a3-optimized.cl @@ -590,7 +590,7 @@ DECLSPEC void m09900s (u32 *w, const u32 pw_len, KERN_ATTR_VECTOR ()) } } -__kernel void m09900_m04 (KERN_ATTR_VECTOR ()) +KERNEL_FQ void m09900_m04 (KERN_ATTR_VECTOR ()) { /** * base @@ -628,7 +628,7 @@ __kernel void m09900_m04 (KERN_ATTR_VECTOR ()) m09900m (w, pw_len, pws, rules_buf, combs_buf, words_buf_r, 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_extra0_buf, d_extra1_buf, d_extra2_buf, d_extra3_buf, bitmap_mask, bitmap_shift1, bitmap_shift2, salt_pos, loop_pos, loop_cnt, il_cnt, digests_cnt, digests_offset, combs_mode, gid_max); } -__kernel void m09900_m08 (KERN_ATTR_VECTOR ()) +KERNEL_FQ void m09900_m08 (KERN_ATTR_VECTOR ()) { /** * base @@ -666,7 +666,7 @@ __kernel void m09900_m08 (KERN_ATTR_VECTOR ()) m09900m (w, pw_len, pws, rules_buf, combs_buf, words_buf_r, 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_extra0_buf, d_extra1_buf, d_extra2_buf, d_extra3_buf, bitmap_mask, bitmap_shift1, bitmap_shift2, salt_pos, loop_pos, loop_cnt, il_cnt, digests_cnt, digests_offset, combs_mode, gid_max); } -__kernel void m09900_m16 (KERN_ATTR_VECTOR ()) +KERNEL_FQ void m09900_m16 (KERN_ATTR_VECTOR ()) { /** * base @@ -704,7 +704,7 @@ __kernel void m09900_m16 (KERN_ATTR_VECTOR ()) m09900m (w, pw_len, pws, rules_buf, combs_buf, words_buf_r, 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_extra0_buf, d_extra1_buf, d_extra2_buf, d_extra3_buf, bitmap_mask, bitmap_shift1, bitmap_shift2, salt_pos, loop_pos, loop_cnt, il_cnt, digests_cnt, digests_offset, combs_mode, gid_max); } -__kernel void m09900_s04 (KERN_ATTR_VECTOR ()) +KERNEL_FQ void m09900_s04 (KERN_ATTR_VECTOR ()) { /** * base @@ -742,7 +742,7 @@ __kernel void m09900_s04 (KERN_ATTR_VECTOR ()) m09900s (w, pw_len, pws, rules_buf, combs_buf, words_buf_r, 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_extra0_buf, d_extra1_buf, d_extra2_buf, d_extra3_buf, bitmap_mask, bitmap_shift1, bitmap_shift2, salt_pos, loop_pos, loop_cnt, il_cnt, digests_cnt, digests_offset, combs_mode, gid_max); } -__kernel void m09900_s08 (KERN_ATTR_VECTOR ()) +KERNEL_FQ void m09900_s08 (KERN_ATTR_VECTOR ()) { /** * base @@ -780,7 +780,7 @@ __kernel void m09900_s08 (KERN_ATTR_VECTOR ()) m09900s (w, pw_len, pws, rules_buf, combs_buf, words_buf_r, 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_extra0_buf, d_extra1_buf, d_extra2_buf, d_extra3_buf, bitmap_mask, bitmap_shift1, bitmap_shift2, salt_pos, loop_pos, loop_cnt, il_cnt, digests_cnt, digests_offset, combs_mode, gid_max); } -__kernel void m09900_s16 (KERN_ATTR_VECTOR ()) +KERNEL_FQ void m09900_s16 (KERN_ATTR_VECTOR ()) { /** * base diff --git a/OpenCL/m09900_a3-pure.cl b/OpenCL/m09900_a3-pure.cl index 1f243072e..bb8f174e8 100644 --- a/OpenCL/m09900_a3-pure.cl +++ b/OpenCL/m09900_a3-pure.cl @@ -13,7 +13,7 @@ #include "inc_hash_md5.cl" #endif -__kernel void m09900_mxx (KERN_ATTR_VECTOR ()) +KERNEL_FQ void m09900_mxx (KERN_ATTR_VECTOR ()) { /** * modifier @@ -68,7 +68,7 @@ __kernel void m09900_mxx (KERN_ATTR_VECTOR ()) } } -__kernel void m09900_sxx (KERN_ATTR_VECTOR ()) +KERNEL_FQ void m09900_sxx (KERN_ATTR_VECTOR ()) { /** * modifier diff --git a/OpenCL/m10100_a0-optimized.cl b/OpenCL/m10100_a0-optimized.cl index 63847175e..393330d8e 100644 --- a/OpenCL/m10100_a0-optimized.cl +++ b/OpenCL/m10100_a0-optimized.cl @@ -31,7 +31,7 @@ (v1) ^= (v2); \ (v2) = rotl64 ((v2), 32) -__kernel void m10100_m04 (KERN_ATTR_RULES ()) +KERNEL_FQ void m10100_m04 (KERN_ATTR_RULES ()) { /** * modifier @@ -150,15 +150,15 @@ __kernel void m10100_m04 (KERN_ATTR_RULES ()) } } -__kernel void m10100_m08 (KERN_ATTR_RULES ()) +KERNEL_FQ void m10100_m08 (KERN_ATTR_RULES ()) { } -__kernel void m10100_m16 (KERN_ATTR_RULES ()) +KERNEL_FQ void m10100_m16 (KERN_ATTR_RULES ()) { } -__kernel void m10100_s04 (KERN_ATTR_RULES ()) +KERNEL_FQ void m10100_s04 (KERN_ATTR_RULES ()) { /** * modifier @@ -289,10 +289,10 @@ __kernel void m10100_s04 (KERN_ATTR_RULES ()) } } -__kernel void m10100_s08 (KERN_ATTR_RULES ()) +KERNEL_FQ void m10100_s08 (KERN_ATTR_RULES ()) { } -__kernel void m10100_s16 (KERN_ATTR_RULES ()) +KERNEL_FQ void m10100_s16 (KERN_ATTR_RULES ()) { } diff --git a/OpenCL/m10100_a1-optimized.cl b/OpenCL/m10100_a1-optimized.cl index 3037d1815..8e6bc33de 100644 --- a/OpenCL/m10100_a1-optimized.cl +++ b/OpenCL/m10100_a1-optimized.cl @@ -29,7 +29,7 @@ (v1) ^= (v2); \ (v2) = rotl64 ((v2), 32) -__kernel void m10100_m04 (KERN_ATTR_BASIC ()) +KERNEL_FQ void m10100_m04 (KERN_ATTR_BASIC ()) { /** * modifier @@ -208,15 +208,15 @@ __kernel void m10100_m04 (KERN_ATTR_BASIC ()) } } -__kernel void m10100_m08 (KERN_ATTR_BASIC ()) +KERNEL_FQ void m10100_m08 (KERN_ATTR_BASIC ()) { } -__kernel void m10100_m16 (KERN_ATTR_BASIC ()) +KERNEL_FQ void m10100_m16 (KERN_ATTR_BASIC ()) { } -__kernel void m10100_s04 (KERN_ATTR_BASIC ()) +KERNEL_FQ void m10100_s04 (KERN_ATTR_BASIC ()) { /** * modifier @@ -407,10 +407,10 @@ __kernel void m10100_s04 (KERN_ATTR_BASIC ()) } } -__kernel void m10100_s08 (KERN_ATTR_BASIC ()) +KERNEL_FQ void m10100_s08 (KERN_ATTR_BASIC ()) { } -__kernel void m10100_s16 (KERN_ATTR_BASIC ()) +KERNEL_FQ void m10100_s16 (KERN_ATTR_BASIC ()) { } diff --git a/OpenCL/m10100_a3-optimized.cl b/OpenCL/m10100_a3-optimized.cl index 3a834c85d..577c4618d 100644 --- a/OpenCL/m10100_a3-optimized.cl +++ b/OpenCL/m10100_a3-optimized.cl @@ -220,7 +220,7 @@ DECLSPEC void m10100s (u32 *w, const u32 pw_len, KERN_ATTR_VECTOR ()) } } -__kernel void m10100_m04 (KERN_ATTR_VECTOR ()) +KERNEL_FQ void m10100_m04 (KERN_ATTR_VECTOR ()) { /** * base @@ -258,7 +258,7 @@ __kernel void m10100_m04 (KERN_ATTR_VECTOR ()) m10100m (w, pw_len, pws, rules_buf, combs_buf, words_buf_r, 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_extra0_buf, d_extra1_buf, d_extra2_buf, d_extra3_buf, bitmap_mask, bitmap_shift1, bitmap_shift2, salt_pos, loop_pos, loop_cnt, il_cnt, digests_cnt, digests_offset, combs_mode, gid_max); } -__kernel void m10100_m08 (KERN_ATTR_VECTOR ()) +KERNEL_FQ void m10100_m08 (KERN_ATTR_VECTOR ()) { /** * base @@ -296,7 +296,7 @@ __kernel void m10100_m08 (KERN_ATTR_VECTOR ()) m10100m (w, pw_len, pws, rules_buf, combs_buf, words_buf_r, 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_extra0_buf, d_extra1_buf, d_extra2_buf, d_extra3_buf, bitmap_mask, bitmap_shift1, bitmap_shift2, salt_pos, loop_pos, loop_cnt, il_cnt, digests_cnt, digests_offset, combs_mode, gid_max); } -__kernel void m10100_m16 (KERN_ATTR_VECTOR ()) +KERNEL_FQ void m10100_m16 (KERN_ATTR_VECTOR ()) { /** * base @@ -334,7 +334,7 @@ __kernel void m10100_m16 (KERN_ATTR_VECTOR ()) m10100m (w, pw_len, pws, rules_buf, combs_buf, words_buf_r, 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_extra0_buf, d_extra1_buf, d_extra2_buf, d_extra3_buf, bitmap_mask, bitmap_shift1, bitmap_shift2, salt_pos, loop_pos, loop_cnt, il_cnt, digests_cnt, digests_offset, combs_mode, gid_max); } -__kernel void m10100_s04 (KERN_ATTR_VECTOR ()) +KERNEL_FQ void m10100_s04 (KERN_ATTR_VECTOR ()) { /** * base @@ -372,7 +372,7 @@ __kernel void m10100_s04 (KERN_ATTR_VECTOR ()) m10100s (w, pw_len, pws, rules_buf, combs_buf, words_buf_r, 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_extra0_buf, d_extra1_buf, d_extra2_buf, d_extra3_buf, bitmap_mask, bitmap_shift1, bitmap_shift2, salt_pos, loop_pos, loop_cnt, il_cnt, digests_cnt, digests_offset, combs_mode, gid_max); } -__kernel void m10100_s08 (KERN_ATTR_VECTOR ()) +KERNEL_FQ void m10100_s08 (KERN_ATTR_VECTOR ()) { /** * base @@ -410,7 +410,7 @@ __kernel void m10100_s08 (KERN_ATTR_VECTOR ()) m10100s (w, pw_len, pws, rules_buf, combs_buf, words_buf_r, 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_extra0_buf, d_extra1_buf, d_extra2_buf, d_extra3_buf, bitmap_mask, bitmap_shift1, bitmap_shift2, salt_pos, loop_pos, loop_cnt, il_cnt, digests_cnt, digests_offset, combs_mode, gid_max); } -__kernel void m10100_s16 (KERN_ATTR_VECTOR ()) +KERNEL_FQ void m10100_s16 (KERN_ATTR_VECTOR ()) { /** * base diff --git a/OpenCL/m10300-pure.cl b/OpenCL/m10300-pure.cl index 60bb8a3c1..6c3b254ee 100644 --- a/OpenCL/m10300-pure.cl +++ b/OpenCL/m10300-pure.cl @@ -19,7 +19,7 @@ typedef struct saph_sha1_tmp } saph_sha1_tmp_t; -__kernel void m10300_init (KERN_ATTR_TMPS (saph_sha1_tmp_t)) +KERNEL_FQ void m10300_init (KERN_ATTR_TMPS (saph_sha1_tmp_t)) { /** * base @@ -46,7 +46,7 @@ __kernel void m10300_init (KERN_ATTR_TMPS (saph_sha1_tmp_t)) tmps[gid].digest_buf[4] = ctx.h[4]; } -__kernel void m10300_loop (KERN_ATTR_TMPS (saph_sha1_tmp_t)) +KERNEL_FQ void m10300_loop (KERN_ATTR_TMPS (saph_sha1_tmp_t)) { /** * base @@ -126,7 +126,7 @@ __kernel void m10300_loop (KERN_ATTR_TMPS (saph_sha1_tmp_t)) tmps[gid].digest_buf[4] = digest[4]; } -__kernel void m10300_comp (KERN_ATTR_TMPS (saph_sha1_tmp_t)) +KERNEL_FQ void m10300_comp (KERN_ATTR_TMPS (saph_sha1_tmp_t)) { /** * modifier diff --git a/OpenCL/m10400_a0-optimized.cl b/OpenCL/m10400_a0-optimized.cl index 03986059b..04b911c2c 100644 --- a/OpenCL/m10400_a0-optimized.cl +++ b/OpenCL/m10400_a0-optimized.cl @@ -16,7 +16,7 @@ #include "inc_hash_md5.cl" #endif -__constant u32a padding[8] = +CONSTANT_AS u32a padding[8] = { 0x5e4ebf28, 0x418a754e, @@ -57,7 +57,7 @@ typedef struct } RC4_KEY; -DECLSPEC void swap (__local RC4_KEY *rc4_key, const u8 i, const u8 j) +DECLSPEC void swap (LOCAL_AS RC4_KEY *rc4_key, const u8 i, const u8 j) { u8 tmp; @@ -66,12 +66,12 @@ DECLSPEC void swap (__local RC4_KEY *rc4_key, const u8 i, const u8 j) rc4_key->S[j] = tmp; } -DECLSPEC void rc4_init_16 (__local RC4_KEY *rc4_key, const u32 *data) +DECLSPEC void rc4_init_16 (LOCAL_AS RC4_KEY *rc4_key, const u32 *data) { u32 v = 0x03020100; u32 a = 0x04040404; - __local u32 *ptr = (__local u32 *) rc4_key->S; + LOCAL_AS u32 *ptr = (LOCAL_AS u32 *) rc4_key->S; #ifdef _unroll #pragma unroll @@ -104,7 +104,7 @@ DECLSPEC void rc4_init_16 (__local RC4_KEY *rc4_key, const u32 *data) j += rc4_key->S[255] + d0; swap (rc4_key, 255, j); } -DECLSPEC u8 rc4_next_16 (__local RC4_KEY *rc4_key, u8 i, u8 j, __constant u32 *in, u32 *out) +DECLSPEC u8 rc4_next_16 (LOCAL_AS RC4_KEY *rc4_key, u8 i, u8 j, CONSTANT_AS u32 *in, u32 *out) { #ifdef _unroll #pragma unroll @@ -157,7 +157,7 @@ DECLSPEC u8 rc4_next_16 (__local RC4_KEY *rc4_key, u8 i, u8 j, __constant u32 *i return j; } -__kernel void m10400_m04 (KERN_ATTR_RULES_ESALT (pdf_t)) +KERNEL_FQ void m10400_m04 (KERN_ATTR_RULES_ESALT (pdf_t)) { /** * modifier @@ -191,9 +191,9 @@ __kernel void m10400_m04 (KERN_ATTR_RULES_ESALT (pdf_t)) * shared */ - __local RC4_KEY rc4_keys[64]; + LOCAL_AS RC4_KEY rc4_keys[64]; - __local RC4_KEY *rc4_key = &rc4_keys[lid]; + LOCAL_AS RC4_KEY *rc4_key = &rc4_keys[lid]; /** * U_buf @@ -325,15 +325,15 @@ __kernel void m10400_m04 (KERN_ATTR_RULES_ESALT (pdf_t)) } } -__kernel void m10400_m08 (KERN_ATTR_RULES_ESALT (pdf_t)) +KERNEL_FQ void m10400_m08 (KERN_ATTR_RULES_ESALT (pdf_t)) { } -__kernel void m10400_m16 (KERN_ATTR_RULES_ESALT (pdf_t)) +KERNEL_FQ void m10400_m16 (KERN_ATTR_RULES_ESALT (pdf_t)) { } -__kernel void m10400_s04 (KERN_ATTR_RULES_ESALT (pdf_t)) +KERNEL_FQ void m10400_s04 (KERN_ATTR_RULES_ESALT (pdf_t)) { /** * modifier @@ -367,9 +367,9 @@ __kernel void m10400_s04 (KERN_ATTR_RULES_ESALT (pdf_t)) * shared */ - __local RC4_KEY rc4_keys[64]; + LOCAL_AS RC4_KEY rc4_keys[64]; - __local RC4_KEY *rc4_key = &rc4_keys[lid]; + LOCAL_AS RC4_KEY *rc4_key = &rc4_keys[lid]; /** * U_buf @@ -513,10 +513,10 @@ __kernel void m10400_s04 (KERN_ATTR_RULES_ESALT (pdf_t)) } } -__kernel void m10400_s08 (KERN_ATTR_RULES_ESALT (pdf_t)) +KERNEL_FQ void m10400_s08 (KERN_ATTR_RULES_ESALT (pdf_t)) { } -__kernel void m10400_s16 (KERN_ATTR_RULES_ESALT (pdf_t)) +KERNEL_FQ void m10400_s16 (KERN_ATTR_RULES_ESALT (pdf_t)) { } diff --git a/OpenCL/m10400_a1-optimized.cl b/OpenCL/m10400_a1-optimized.cl index f3fab8059..b1a1f2dfa 100644 --- a/OpenCL/m10400_a1-optimized.cl +++ b/OpenCL/m10400_a1-optimized.cl @@ -14,7 +14,7 @@ #include "inc_hash_md5.cl" #endif -__constant u32a padding[8] = +CONSTANT_AS u32a padding[8] = { 0x5e4ebf28, 0x418a754e, @@ -55,7 +55,7 @@ typedef struct } RC4_KEY; -DECLSPEC void swap (__local RC4_KEY *rc4_key, const u8 i, const u8 j) +DECLSPEC void swap (LOCAL_AS RC4_KEY *rc4_key, const u8 i, const u8 j) { u8 tmp; @@ -64,12 +64,12 @@ DECLSPEC void swap (__local RC4_KEY *rc4_key, const u8 i, const u8 j) rc4_key->S[j] = tmp; } -DECLSPEC void rc4_init_16 (__local RC4_KEY *rc4_key, const u32 *data) +DECLSPEC void rc4_init_16 (LOCAL_AS RC4_KEY *rc4_key, const u32 *data) { u32 v = 0x03020100; u32 a = 0x04040404; - __local u32 *ptr = (__local u32 *) rc4_key->S; + LOCAL_AS u32 *ptr = (LOCAL_AS u32 *) rc4_key->S; #ifdef _unroll #pragma unroll @@ -102,7 +102,7 @@ DECLSPEC void rc4_init_16 (__local RC4_KEY *rc4_key, const u32 *data) j += rc4_key->S[255] + d0; swap (rc4_key, 255, j); } -DECLSPEC u8 rc4_next_16 (__local RC4_KEY *rc4_key, u8 i, u8 j, __constant u32 *in, u32 *out) +DECLSPEC u8 rc4_next_16 (LOCAL_AS RC4_KEY *rc4_key, u8 i, u8 j, CONSTANT_AS u32 *in, u32 *out) { #ifdef _unroll #pragma unroll @@ -155,7 +155,7 @@ DECLSPEC u8 rc4_next_16 (__local RC4_KEY *rc4_key, u8 i, u8 j, __constant u32 *i return j; } -__kernel void m10400_m04 (KERN_ATTR_ESALT (pdf_t)) +KERNEL_FQ void m10400_m04 (KERN_ATTR_ESALT (pdf_t)) { /** * modifier @@ -189,9 +189,9 @@ __kernel void m10400_m04 (KERN_ATTR_ESALT (pdf_t)) * shared */ - __local RC4_KEY rc4_keys[64]; + LOCAL_AS RC4_KEY rc4_keys[64]; - __local RC4_KEY *rc4_key = &rc4_keys[lid]; + LOCAL_AS RC4_KEY *rc4_key = &rc4_keys[lid]; /** * U_buf @@ -383,15 +383,15 @@ __kernel void m10400_m04 (KERN_ATTR_ESALT (pdf_t)) } } -__kernel void m10400_m08 (KERN_ATTR_ESALT (pdf_t)) +KERNEL_FQ void m10400_m08 (KERN_ATTR_ESALT (pdf_t)) { } -__kernel void m10400_m16 (KERN_ATTR_ESALT (pdf_t)) +KERNEL_FQ void m10400_m16 (KERN_ATTR_ESALT (pdf_t)) { } -__kernel void m10400_s04 (KERN_ATTR_ESALT (pdf_t)) +KERNEL_FQ void m10400_s04 (KERN_ATTR_ESALT (pdf_t)) { /** * modifier @@ -425,9 +425,9 @@ __kernel void m10400_s04 (KERN_ATTR_ESALT (pdf_t)) * shared */ - __local RC4_KEY rc4_keys[64]; + LOCAL_AS RC4_KEY rc4_keys[64]; - __local RC4_KEY *rc4_key = &rc4_keys[lid]; + LOCAL_AS RC4_KEY *rc4_key = &rc4_keys[lid]; /** * U_buf @@ -631,10 +631,10 @@ __kernel void m10400_s04 (KERN_ATTR_ESALT (pdf_t)) } } -__kernel void m10400_s08 (KERN_ATTR_ESALT (pdf_t)) +KERNEL_FQ void m10400_s08 (KERN_ATTR_ESALT (pdf_t)) { } -__kernel void m10400_s16 (KERN_ATTR_ESALT (pdf_t)) +KERNEL_FQ void m10400_s16 (KERN_ATTR_ESALT (pdf_t)) { } diff --git a/OpenCL/m10400_a3-optimized.cl b/OpenCL/m10400_a3-optimized.cl index cad8ecfbc..8d07529a0 100644 --- a/OpenCL/m10400_a3-optimized.cl +++ b/OpenCL/m10400_a3-optimized.cl @@ -14,7 +14,7 @@ #include "inc_hash_md5.cl" #endif -__constant u32a padding[8] = +CONSTANT_AS u32a padding[8] = { 0x5e4ebf28, 0x418a754e, @@ -55,7 +55,7 @@ typedef struct } RC4_KEY; -DECLSPEC void swap (__local RC4_KEY *rc4_key, const u8 i, const u8 j) +DECLSPEC void swap (LOCAL_AS RC4_KEY *rc4_key, const u8 i, const u8 j) { u8 tmp; @@ -64,12 +64,12 @@ DECLSPEC void swap (__local RC4_KEY *rc4_key, const u8 i, const u8 j) rc4_key->S[j] = tmp; } -DECLSPEC void rc4_init_16 (__local RC4_KEY *rc4_key, const u32 *data) +DECLSPEC void rc4_init_16 (LOCAL_AS RC4_KEY *rc4_key, const u32 *data) { u32 v = 0x03020100; u32 a = 0x04040404; - __local u32 *ptr = (__local u32 *) rc4_key->S; + LOCAL_AS u32 *ptr = (LOCAL_AS u32 *) rc4_key->S; #ifdef _unroll #pragma unroll @@ -102,7 +102,7 @@ DECLSPEC void rc4_init_16 (__local RC4_KEY *rc4_key, const u32 *data) j += rc4_key->S[255] + d0; swap (rc4_key, 255, j); } -DECLSPEC u8 rc4_next_16 (__local RC4_KEY *rc4_key, u8 i, u8 j, __constant u32 *in, u32 *out) +DECLSPEC u8 rc4_next_16 (LOCAL_AS RC4_KEY *rc4_key, u8 i, u8 j, CONSTANT_AS u32 *in, u32 *out) { #ifdef _unroll #pragma unroll @@ -155,7 +155,7 @@ DECLSPEC u8 rc4_next_16 (__local RC4_KEY *rc4_key, u8 i, u8 j, __constant u32 *i return j; } -DECLSPEC void m10400m (__local RC4_KEY *rc4_keys, u32 *w0, u32 *w1, u32 *w2, u32 *w3, const u32 pw_len, KERN_ATTR_ESALT (pdf_t)) +DECLSPEC void m10400m (LOCAL_AS RC4_KEY *rc4_keys, u32 *w0, u32 *w1, u32 *w2, u32 *w3, const u32 pw_len, KERN_ATTR_ESALT (pdf_t)) { /** * modifier @@ -168,7 +168,7 @@ DECLSPEC void m10400m (__local RC4_KEY *rc4_keys, u32 *w0, u32 *w1, u32 *w2, u32 * shared */ - __local RC4_KEY *rc4_key = &rc4_keys[lid]; + LOCAL_AS RC4_KEY *rc4_key = &rc4_keys[lid]; /** * U_buf @@ -321,7 +321,7 @@ DECLSPEC void m10400m (__local RC4_KEY *rc4_keys, u32 *w0, u32 *w1, u32 *w2, u32 } } -DECLSPEC void m10400s (__local RC4_KEY *rc4_keys, u32 *w0, u32 *w1, u32 *w2, u32 *w3, const u32 pw_len, KERN_ATTR_ESALT (pdf_t)) +DECLSPEC void m10400s (LOCAL_AS RC4_KEY *rc4_keys, u32 *w0, u32 *w1, u32 *w2, u32 *w3, const u32 pw_len, KERN_ATTR_ESALT (pdf_t)) { /** * modifier @@ -334,7 +334,7 @@ DECLSPEC void m10400s (__local RC4_KEY *rc4_keys, u32 *w0, u32 *w1, u32 *w2, u32 * shared */ - __local RC4_KEY *rc4_key = &rc4_keys[lid]; + LOCAL_AS RC4_KEY *rc4_key = &rc4_keys[lid]; /** * U_buf @@ -499,7 +499,7 @@ DECLSPEC void m10400s (__local RC4_KEY *rc4_keys, u32 *w0, u32 *w1, u32 *w2, u32 } } -__kernel void m10400_m04 (KERN_ATTR_ESALT (pdf_t)) +KERNEL_FQ void m10400_m04 (KERN_ATTR_ESALT (pdf_t)) { /** * base @@ -543,12 +543,12 @@ __kernel void m10400_m04 (KERN_ATTR_ESALT (pdf_t)) * main */ - __local RC4_KEY rc4_keys[64]; + LOCAL_AS RC4_KEY rc4_keys[64]; m10400m (rc4_keys, 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_extra0_buf, d_extra1_buf, d_extra2_buf, d_extra3_buf, bitmap_mask, bitmap_shift1, bitmap_shift2, salt_pos, loop_pos, loop_cnt, il_cnt, digests_cnt, digests_offset, combs_mode, gid_max); } -__kernel void m10400_m08 (KERN_ATTR_ESALT (pdf_t)) +KERNEL_FQ void m10400_m08 (KERN_ATTR_ESALT (pdf_t)) { /** * base @@ -592,12 +592,12 @@ __kernel void m10400_m08 (KERN_ATTR_ESALT (pdf_t)) * main */ - __local RC4_KEY rc4_keys[64]; + LOCAL_AS RC4_KEY rc4_keys[64]; m10400m (rc4_keys, 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_extra0_buf, d_extra1_buf, d_extra2_buf, d_extra3_buf, bitmap_mask, bitmap_shift1, bitmap_shift2, salt_pos, loop_pos, loop_cnt, il_cnt, digests_cnt, digests_offset, combs_mode, gid_max); } -__kernel void m10400_m16 (KERN_ATTR_ESALT (pdf_t)) +KERNEL_FQ void m10400_m16 (KERN_ATTR_ESALT (pdf_t)) { /** * base @@ -641,12 +641,12 @@ __kernel void m10400_m16 (KERN_ATTR_ESALT (pdf_t)) * main */ - __local RC4_KEY rc4_keys[64]; + LOCAL_AS RC4_KEY rc4_keys[64]; m10400m (rc4_keys, 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_extra0_buf, d_extra1_buf, d_extra2_buf, d_extra3_buf, bitmap_mask, bitmap_shift1, bitmap_shift2, salt_pos, loop_pos, loop_cnt, il_cnt, digests_cnt, digests_offset, combs_mode, gid_max); } -__kernel void m10400_s04 (KERN_ATTR_ESALT (pdf_t)) +KERNEL_FQ void m10400_s04 (KERN_ATTR_ESALT (pdf_t)) { /** * base @@ -690,12 +690,12 @@ __kernel void m10400_s04 (KERN_ATTR_ESALT (pdf_t)) * main */ - __local RC4_KEY rc4_keys[64]; + LOCAL_AS RC4_KEY rc4_keys[64]; m10400s (rc4_keys, 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_extra0_buf, d_extra1_buf, d_extra2_buf, d_extra3_buf, bitmap_mask, bitmap_shift1, bitmap_shift2, salt_pos, loop_pos, loop_cnt, il_cnt, digests_cnt, digests_offset, combs_mode, gid_max); } -__kernel void m10400_s08 (KERN_ATTR_ESALT (pdf_t)) +KERNEL_FQ void m10400_s08 (KERN_ATTR_ESALT (pdf_t)) { /** * base @@ -739,12 +739,12 @@ __kernel void m10400_s08 (KERN_ATTR_ESALT (pdf_t)) * main */ - __local RC4_KEY rc4_keys[64]; + LOCAL_AS RC4_KEY rc4_keys[64]; m10400s (rc4_keys, 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_extra0_buf, d_extra1_buf, d_extra2_buf, d_extra3_buf, bitmap_mask, bitmap_shift1, bitmap_shift2, salt_pos, loop_pos, loop_cnt, il_cnt, digests_cnt, digests_offset, combs_mode, gid_max); } -__kernel void m10400_s16 (KERN_ATTR_ESALT (pdf_t)) +KERNEL_FQ void m10400_s16 (KERN_ATTR_ESALT (pdf_t)) { /** * base @@ -788,7 +788,7 @@ __kernel void m10400_s16 (KERN_ATTR_ESALT (pdf_t)) * main */ - __local RC4_KEY rc4_keys[64]; + LOCAL_AS RC4_KEY rc4_keys[64]; m10400s (rc4_keys, 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_extra0_buf, d_extra1_buf, d_extra2_buf, d_extra3_buf, bitmap_mask, bitmap_shift1, bitmap_shift2, salt_pos, loop_pos, loop_cnt, il_cnt, digests_cnt, digests_offset, combs_mode, gid_max); } diff --git a/OpenCL/m10410_a0-optimized.cl b/OpenCL/m10410_a0-optimized.cl index 97f5f3523..c75fb1193 100644 --- a/OpenCL/m10410_a0-optimized.cl +++ b/OpenCL/m10410_a0-optimized.cl @@ -16,7 +16,7 @@ #include "inc_hash_md5.cl" #endif -__constant u32a padding[8] = +CONSTANT_AS u32a padding[8] = { 0x5e4ebf28, 0x418a754e, @@ -57,7 +57,7 @@ typedef struct } RC4_KEY; -DECLSPEC void swap (__local RC4_KEY *rc4_key, const u8 i, const u8 j) +DECLSPEC void swap (LOCAL_AS RC4_KEY *rc4_key, const u8 i, const u8 j) { u8 tmp; @@ -66,12 +66,12 @@ DECLSPEC void swap (__local RC4_KEY *rc4_key, const u8 i, const u8 j) rc4_key->S[j] = tmp; } -DECLSPEC void rc4_init_16 (__local RC4_KEY *rc4_key, const u32 *data) +DECLSPEC void rc4_init_16 (LOCAL_AS RC4_KEY *rc4_key, const u32 *data) { u32 v = 0x03020100; u32 a = 0x04040404; - __local u32 *ptr = (__local u32 *) rc4_key->S; + LOCAL_AS u32 *ptr = (LOCAL_AS u32 *) rc4_key->S; #ifdef _unroll #pragma unroll @@ -104,7 +104,7 @@ DECLSPEC void rc4_init_16 (__local RC4_KEY *rc4_key, const u32 *data) j += rc4_key->S[255] + d0; swap (rc4_key, 255, j); } -DECLSPEC u8 rc4_next_16 (__local RC4_KEY *rc4_key, u8 i, u8 j, __constant u32 *in, u32 *out) +DECLSPEC u8 rc4_next_16 (LOCAL_AS RC4_KEY *rc4_key, u8 i, u8 j, CONSTANT_AS u32 *in, u32 *out) { #ifdef _unroll #pragma unroll @@ -157,7 +157,7 @@ DECLSPEC u8 rc4_next_16 (__local RC4_KEY *rc4_key, u8 i, u8 j, __constant u32 *i return j; } -__kernel void m10410_m04 (KERN_ATTR_RULES_ESALT (pdf_t)) +KERNEL_FQ void m10410_m04 (KERN_ATTR_RULES_ESALT (pdf_t)) { /** * modifier @@ -191,8 +191,8 @@ __kernel void m10410_m04 (KERN_ATTR_RULES_ESALT (pdf_t)) * shared */ - __local RC4_KEY rc4_keys[64]; - __local RC4_KEY *rc4_key = &rc4_keys[lid]; + LOCAL_AS RC4_KEY rc4_keys[64]; + LOCAL_AS RC4_KEY *rc4_key = &rc4_keys[lid]; /** * loop @@ -221,15 +221,15 @@ __kernel void m10410_m04 (KERN_ATTR_RULES_ESALT (pdf_t)) } } -__kernel void m10410_m08 (KERN_ATTR_RULES_ESALT (pdf_t)) +KERNEL_FQ void m10410_m08 (KERN_ATTR_RULES_ESALT (pdf_t)) { } -__kernel void m10410_m16 (KERN_ATTR_RULES_ESALT (pdf_t)) +KERNEL_FQ void m10410_m16 (KERN_ATTR_RULES_ESALT (pdf_t)) { } -__kernel void m10410_s04 (KERN_ATTR_RULES_ESALT (pdf_t)) +KERNEL_FQ void m10410_s04 (KERN_ATTR_RULES_ESALT (pdf_t)) { /** * modifier @@ -263,8 +263,8 @@ __kernel void m10410_s04 (KERN_ATTR_RULES_ESALT (pdf_t)) * shared */ - __local RC4_KEY rc4_keys[64]; - __local RC4_KEY *rc4_key = &rc4_keys[lid]; + LOCAL_AS RC4_KEY rc4_keys[64]; + LOCAL_AS RC4_KEY *rc4_key = &rc4_keys[lid]; /** * digest @@ -305,10 +305,10 @@ __kernel void m10410_s04 (KERN_ATTR_RULES_ESALT (pdf_t)) } } -__kernel void m10410_s08 (KERN_ATTR_RULES_ESALT (pdf_t)) +KERNEL_FQ void m10410_s08 (KERN_ATTR_RULES_ESALT (pdf_t)) { } -__kernel void m10410_s16 (KERN_ATTR_RULES_ESALT (pdf_t)) +KERNEL_FQ void m10410_s16 (KERN_ATTR_RULES_ESALT (pdf_t)) { } diff --git a/OpenCL/m10410_a1-optimized.cl b/OpenCL/m10410_a1-optimized.cl index 61fcb8231..4cd413f14 100644 --- a/OpenCL/m10410_a1-optimized.cl +++ b/OpenCL/m10410_a1-optimized.cl @@ -14,7 +14,7 @@ #include "inc_hash_md5.cl" #endif -__constant u32a padding[8] = +CONSTANT_AS u32a padding[8] = { 0x5e4ebf28, 0x418a754e, @@ -55,7 +55,7 @@ typedef struct } RC4_KEY; -DECLSPEC void swap (__local RC4_KEY *rc4_key, const u8 i, const u8 j) +DECLSPEC void swap (LOCAL_AS RC4_KEY *rc4_key, const u8 i, const u8 j) { u8 tmp; @@ -64,12 +64,12 @@ DECLSPEC void swap (__local RC4_KEY *rc4_key, const u8 i, const u8 j) rc4_key->S[j] = tmp; } -DECLSPEC void rc4_init_16 (__local RC4_KEY *rc4_key, const u32 *data) +DECLSPEC void rc4_init_16 (LOCAL_AS RC4_KEY *rc4_key, const u32 *data) { u32 v = 0x03020100; u32 a = 0x04040404; - __local u32 *ptr = (__local u32 *) rc4_key->S; + LOCAL_AS u32 *ptr = (LOCAL_AS u32 *) rc4_key->S; #ifdef _unroll #pragma unroll @@ -102,7 +102,7 @@ DECLSPEC void rc4_init_16 (__local RC4_KEY *rc4_key, const u32 *data) j += rc4_key->S[255] + d0; swap (rc4_key, 255, j); } -DECLSPEC u8 rc4_next_16 (__local RC4_KEY *rc4_key, u8 i, u8 j, __constant u32 *in, u32 *out) +DECLSPEC u8 rc4_next_16 (LOCAL_AS RC4_KEY *rc4_key, u8 i, u8 j, CONSTANT_AS u32 *in, u32 *out) { #ifdef _unroll #pragma unroll @@ -155,7 +155,7 @@ DECLSPEC u8 rc4_next_16 (__local RC4_KEY *rc4_key, u8 i, u8 j, __constant u32 *i return j; } -__kernel void m10410_m04 (KERN_ATTR_ESALT (pdf_t)) +KERNEL_FQ void m10410_m04 (KERN_ATTR_ESALT (pdf_t)) { /** * modifier @@ -189,9 +189,9 @@ __kernel void m10410_m04 (KERN_ATTR_ESALT (pdf_t)) * shared */ - __local RC4_KEY rc4_keys[64]; + LOCAL_AS RC4_KEY rc4_keys[64]; - __local RC4_KEY *rc4_key = &rc4_keys[lid]; + LOCAL_AS RC4_KEY *rc4_key = &rc4_keys[lid]; /** * U_buf @@ -289,15 +289,15 @@ __kernel void m10410_m04 (KERN_ATTR_ESALT (pdf_t)) } } -__kernel void m10410_m08 (KERN_ATTR_ESALT (pdf_t)) +KERNEL_FQ void m10410_m08 (KERN_ATTR_ESALT (pdf_t)) { } -__kernel void m10410_m16 (KERN_ATTR_ESALT (pdf_t)) +KERNEL_FQ void m10410_m16 (KERN_ATTR_ESALT (pdf_t)) { } -__kernel void m10410_s04 (KERN_ATTR_ESALT (pdf_t)) +KERNEL_FQ void m10410_s04 (KERN_ATTR_ESALT (pdf_t)) { /** * modifier @@ -331,9 +331,9 @@ __kernel void m10410_s04 (KERN_ATTR_ESALT (pdf_t)) * shared */ - __local RC4_KEY rc4_keys[64]; + LOCAL_AS RC4_KEY rc4_keys[64]; - __local RC4_KEY *rc4_key = &rc4_keys[lid]; + LOCAL_AS RC4_KEY *rc4_key = &rc4_keys[lid]; /** * U_buf @@ -443,10 +443,10 @@ __kernel void m10410_s04 (KERN_ATTR_ESALT (pdf_t)) } } -__kernel void m10410_s08 (KERN_ATTR_ESALT (pdf_t)) +KERNEL_FQ void m10410_s08 (KERN_ATTR_ESALT (pdf_t)) { } -__kernel void m10410_s16 (KERN_ATTR_ESALT (pdf_t)) +KERNEL_FQ void m10410_s16 (KERN_ATTR_ESALT (pdf_t)) { } diff --git a/OpenCL/m10410_a3-optimized.cl b/OpenCL/m10410_a3-optimized.cl index e62051043..c8897bbed 100644 --- a/OpenCL/m10410_a3-optimized.cl +++ b/OpenCL/m10410_a3-optimized.cl @@ -14,7 +14,7 @@ #include "inc_hash_md5.cl" #endif -__constant u32a padding[8] = +CONSTANT_AS u32a padding[8] = { 0x5e4ebf28, 0x418a754e, @@ -55,7 +55,7 @@ typedef struct } RC4_KEY; -DECLSPEC void swap (__local RC4_KEY *rc4_key, const u8 i, const u8 j) +DECLSPEC void swap (LOCAL_AS RC4_KEY *rc4_key, const u8 i, const u8 j) { u8 tmp; @@ -64,12 +64,12 @@ DECLSPEC void swap (__local RC4_KEY *rc4_key, const u8 i, const u8 j) rc4_key->S[j] = tmp; } -DECLSPEC void rc4_init_16 (__local RC4_KEY *rc4_key, const u32 *data) +DECLSPEC void rc4_init_16 (LOCAL_AS RC4_KEY *rc4_key, const u32 *data) { u32 v = 0x03020100; u32 a = 0x04040404; - __local u32 *ptr = (__local u32 *) rc4_key->S; + LOCAL_AS u32 *ptr = (LOCAL_AS u32 *) rc4_key->S; #ifdef _unroll #pragma unroll @@ -102,7 +102,7 @@ DECLSPEC void rc4_init_16 (__local RC4_KEY *rc4_key, const u32 *data) j += rc4_key->S[255] + d0; swap (rc4_key, 255, j); } -DECLSPEC u8 rc4_next_16 (__local RC4_KEY *rc4_key, u8 i, u8 j, __constant u32 *in, u32 *out) +DECLSPEC u8 rc4_next_16 (LOCAL_AS RC4_KEY *rc4_key, u8 i, u8 j, CONSTANT_AS u32 *in, u32 *out) { #ifdef _unroll #pragma unroll @@ -155,7 +155,7 @@ DECLSPEC u8 rc4_next_16 (__local RC4_KEY *rc4_key, u8 i, u8 j, __constant u32 *i return j; } -DECLSPEC void m10410m (__local RC4_KEY *rc4_keys, u32 *w0, u32 *w1, u32 *w2, u32 *w3, const u32 pw_len, KERN_ATTR_ESALT (pdf_t)) +DECLSPEC void m10410m (LOCAL_AS RC4_KEY *rc4_keys, u32 *w0, u32 *w1, u32 *w2, u32 *w3, const u32 pw_len, KERN_ATTR_ESALT (pdf_t)) { /** * modifier @@ -168,7 +168,7 @@ DECLSPEC void m10410m (__local RC4_KEY *rc4_keys, u32 *w0, u32 *w1, u32 *w2, u32 * shared */ - __local RC4_KEY *rc4_key = &rc4_keys[lid]; + LOCAL_AS RC4_KEY *rc4_key = &rc4_keys[lid]; /** * loop @@ -198,7 +198,7 @@ DECLSPEC void m10410m (__local RC4_KEY *rc4_keys, u32 *w0, u32 *w1, u32 *w2, u32 } } -DECLSPEC void m10410s (__local RC4_KEY *rc4_keys, u32 *w0, u32 *w1, u32 *w2, u32 *w3, const u32 pw_len, KERN_ATTR_ESALT (pdf_t)) +DECLSPEC void m10410s (LOCAL_AS RC4_KEY *rc4_keys, u32 *w0, u32 *w1, u32 *w2, u32 *w3, const u32 pw_len, KERN_ATTR_ESALT (pdf_t)) { /** * modifier @@ -211,7 +211,7 @@ DECLSPEC void m10410s (__local RC4_KEY *rc4_keys, u32 *w0, u32 *w1, u32 *w2, u32 * shared */ - __local RC4_KEY *rc4_key = &rc4_keys[lid]; + LOCAL_AS RC4_KEY *rc4_key = &rc4_keys[lid]; /** * digest @@ -253,7 +253,7 @@ DECLSPEC void m10410s (__local RC4_KEY *rc4_keys, u32 *w0, u32 *w1, u32 *w2, u32 } } -__kernel void m10410_m04 (KERN_ATTR_ESALT (pdf_t)) +KERNEL_FQ void m10410_m04 (KERN_ATTR_ESALT (pdf_t)) { /** * base @@ -297,12 +297,12 @@ __kernel void m10410_m04 (KERN_ATTR_ESALT (pdf_t)) * main */ - __local RC4_KEY rc4_keys[64]; + LOCAL_AS RC4_KEY rc4_keys[64]; m10410m (rc4_keys, 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_extra0_buf, d_extra1_buf, d_extra2_buf, d_extra3_buf, bitmap_mask, bitmap_shift1, bitmap_shift2, salt_pos, loop_pos, loop_cnt, il_cnt, digests_cnt, digests_offset, combs_mode, gid_max); } -__kernel void m10410_m08 (KERN_ATTR_ESALT (pdf_t)) +KERNEL_FQ void m10410_m08 (KERN_ATTR_ESALT (pdf_t)) { /** * base @@ -346,12 +346,12 @@ __kernel void m10410_m08 (KERN_ATTR_ESALT (pdf_t)) * main */ - __local RC4_KEY rc4_keys[64]; + LOCAL_AS RC4_KEY rc4_keys[64]; m10410m (rc4_keys, 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_extra0_buf, d_extra1_buf, d_extra2_buf, d_extra3_buf, bitmap_mask, bitmap_shift1, bitmap_shift2, salt_pos, loop_pos, loop_cnt, il_cnt, digests_cnt, digests_offset, combs_mode, gid_max); } -__kernel void m10410_m16 (KERN_ATTR_ESALT (pdf_t)) +KERNEL_FQ void m10410_m16 (KERN_ATTR_ESALT (pdf_t)) { /** * base @@ -395,12 +395,12 @@ __kernel void m10410_m16 (KERN_ATTR_ESALT (pdf_t)) * main */ - __local RC4_KEY rc4_keys[64]; + LOCAL_AS RC4_KEY rc4_keys[64]; m10410m (rc4_keys, 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_extra0_buf, d_extra1_buf, d_extra2_buf, d_extra3_buf, bitmap_mask, bitmap_shift1, bitmap_shift2, salt_pos, loop_pos, loop_cnt, il_cnt, digests_cnt, digests_offset, combs_mode, gid_max); } -__kernel void m10410_s04 (KERN_ATTR_ESALT (pdf_t)) +KERNEL_FQ void m10410_s04 (KERN_ATTR_ESALT (pdf_t)) { /** * base @@ -444,12 +444,12 @@ __kernel void m10410_s04 (KERN_ATTR_ESALT (pdf_t)) * main */ - __local RC4_KEY rc4_keys[64]; + LOCAL_AS RC4_KEY rc4_keys[64]; m10410s (rc4_keys, 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_extra0_buf, d_extra1_buf, d_extra2_buf, d_extra3_buf, bitmap_mask, bitmap_shift1, bitmap_shift2, salt_pos, loop_pos, loop_cnt, il_cnt, digests_cnt, digests_offset, combs_mode, gid_max); } -__kernel void m10410_s08 (KERN_ATTR_ESALT (pdf_t)) +KERNEL_FQ void m10410_s08 (KERN_ATTR_ESALT (pdf_t)) { /** * base @@ -493,12 +493,12 @@ __kernel void m10410_s08 (KERN_ATTR_ESALT (pdf_t)) * main */ - __local RC4_KEY rc4_keys[64]; + LOCAL_AS RC4_KEY rc4_keys[64]; m10410s (rc4_keys, 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_extra0_buf, d_extra1_buf, d_extra2_buf, d_extra3_buf, bitmap_mask, bitmap_shift1, bitmap_shift2, salt_pos, loop_pos, loop_cnt, il_cnt, digests_cnt, digests_offset, combs_mode, gid_max); } -__kernel void m10410_s16 (KERN_ATTR_ESALT (pdf_t)) +KERNEL_FQ void m10410_s16 (KERN_ATTR_ESALT (pdf_t)) { /** * base @@ -542,7 +542,7 @@ __kernel void m10410_s16 (KERN_ATTR_ESALT (pdf_t)) * main */ - __local RC4_KEY rc4_keys[64]; + LOCAL_AS RC4_KEY rc4_keys[64]; m10410s (rc4_keys, 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_extra0_buf, d_extra1_buf, d_extra2_buf, d_extra3_buf, bitmap_mask, bitmap_shift1, bitmap_shift2, salt_pos, loop_pos, loop_cnt, il_cnt, digests_cnt, digests_offset, combs_mode, gid_max); } diff --git a/OpenCL/m10420_a0-optimized.cl b/OpenCL/m10420_a0-optimized.cl index 97d91e064..b1f8a6ef4 100644 --- a/OpenCL/m10420_a0-optimized.cl +++ b/OpenCL/m10420_a0-optimized.cl @@ -15,7 +15,7 @@ #include "inc_hash_md5.cl" #endif -__constant u32a padding[8] = +CONSTANT_AS u32a padding[8] = { 0x5e4ebf28, 0x418a754e, @@ -48,7 +48,7 @@ typedef struct pdf } pdf_t; -__kernel void m10420_m04 (KERN_ATTR_RULES_ESALT (pdf_t)) +KERNEL_FQ void m10420_m04 (KERN_ATTR_RULES_ESALT (pdf_t)) { /** * modifier @@ -201,15 +201,15 @@ __kernel void m10420_m04 (KERN_ATTR_RULES_ESALT (pdf_t)) } } -__kernel void m10420_m08 (KERN_ATTR_RULES_ESALT (pdf_t)) +KERNEL_FQ void m10420_m08 (KERN_ATTR_RULES_ESALT (pdf_t)) { } -__kernel void m10420_m16 (KERN_ATTR_RULES_ESALT (pdf_t)) +KERNEL_FQ void m10420_m16 (KERN_ATTR_RULES_ESALT (pdf_t)) { } -__kernel void m10420_s04 (KERN_ATTR_RULES_ESALT (pdf_t)) +KERNEL_FQ void m10420_s04 (KERN_ATTR_RULES_ESALT (pdf_t)) { /** * modifier @@ -374,10 +374,10 @@ __kernel void m10420_s04 (KERN_ATTR_RULES_ESALT (pdf_t)) } } -__kernel void m10420_s08 (KERN_ATTR_RULES_ESALT (pdf_t)) +KERNEL_FQ void m10420_s08 (KERN_ATTR_RULES_ESALT (pdf_t)) { } -__kernel void m10420_s16 (KERN_ATTR_RULES_ESALT (pdf_t)) +KERNEL_FQ void m10420_s16 (KERN_ATTR_RULES_ESALT (pdf_t)) { } diff --git a/OpenCL/m10420_a1-optimized.cl b/OpenCL/m10420_a1-optimized.cl index 56f670b7b..cbde1f143 100644 --- a/OpenCL/m10420_a1-optimized.cl +++ b/OpenCL/m10420_a1-optimized.cl @@ -13,7 +13,7 @@ #include "inc_hash_md5.cl" #endif -__constant u32a padding[8] = +CONSTANT_AS u32a padding[8] = { 0x5e4ebf28, 0x418a754e, @@ -46,7 +46,7 @@ typedef struct pdf } pdf_t; -__kernel void m10420_m04 (KERN_ATTR_ESALT (pdf_t)) +KERNEL_FQ void m10420_m04 (KERN_ATTR_ESALT (pdf_t)) { /** * modifier @@ -259,15 +259,15 @@ __kernel void m10420_m04 (KERN_ATTR_ESALT (pdf_t)) } } -__kernel void m10420_m08 (KERN_ATTR_ESALT (pdf_t)) +KERNEL_FQ void m10420_m08 (KERN_ATTR_ESALT (pdf_t)) { } -__kernel void m10420_m16 (KERN_ATTR_ESALT (pdf_t)) +KERNEL_FQ void m10420_m16 (KERN_ATTR_ESALT (pdf_t)) { } -__kernel void m10420_s04 (KERN_ATTR_ESALT (pdf_t)) +KERNEL_FQ void m10420_s04 (KERN_ATTR_ESALT (pdf_t)) { /** * modifier @@ -492,10 +492,10 @@ __kernel void m10420_s04 (KERN_ATTR_ESALT (pdf_t)) } } -__kernel void m10420_s08 (KERN_ATTR_ESALT (pdf_t)) +KERNEL_FQ void m10420_s08 (KERN_ATTR_ESALT (pdf_t)) { } -__kernel void m10420_s16 (KERN_ATTR_ESALT (pdf_t)) +KERNEL_FQ void m10420_s16 (KERN_ATTR_ESALT (pdf_t)) { } diff --git a/OpenCL/m10420_a3-optimized.cl b/OpenCL/m10420_a3-optimized.cl index 65449e879..815e59a15 100644 --- a/OpenCL/m10420_a3-optimized.cl +++ b/OpenCL/m10420_a3-optimized.cl @@ -13,7 +13,7 @@ #include "inc_hash_md5.cl" #endif -__constant u32a padding[8] = +CONSTANT_AS u32a padding[8] = { 0x5e4ebf28, 0x418a754e, @@ -364,7 +364,7 @@ DECLSPEC void m10420s (u32 *w0, u32 *w1, u32 *w2, u32 *w3, const u32 pw_len, KER } } -__kernel void m10420_m04 (KERN_ATTR_ESALT (pdf_t)) +KERNEL_FQ void m10420_m04 (KERN_ATTR_ESALT (pdf_t)) { /** * base @@ -411,7 +411,7 @@ __kernel void m10420_m04 (KERN_ATTR_ESALT (pdf_t)) m10420m (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_extra0_buf, d_extra1_buf, d_extra2_buf, d_extra3_buf, bitmap_mask, bitmap_shift1, bitmap_shift2, salt_pos, loop_pos, loop_cnt, il_cnt, digests_cnt, digests_offset, combs_mode, gid_max); } -__kernel void m10420_m08 (KERN_ATTR_ESALT (pdf_t)) +KERNEL_FQ void m10420_m08 (KERN_ATTR_ESALT (pdf_t)) { /** * base @@ -458,7 +458,7 @@ __kernel void m10420_m08 (KERN_ATTR_ESALT (pdf_t)) m10420m (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_extra0_buf, d_extra1_buf, d_extra2_buf, d_extra3_buf, bitmap_mask, bitmap_shift1, bitmap_shift2, salt_pos, loop_pos, loop_cnt, il_cnt, digests_cnt, digests_offset, combs_mode, gid_max); } -__kernel void m10420_m16 (KERN_ATTR_ESALT (pdf_t)) +KERNEL_FQ void m10420_m16 (KERN_ATTR_ESALT (pdf_t)) { /** * base @@ -505,7 +505,7 @@ __kernel void m10420_m16 (KERN_ATTR_ESALT (pdf_t)) m10420m (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_extra0_buf, d_extra1_buf, d_extra2_buf, d_extra3_buf, bitmap_mask, bitmap_shift1, bitmap_shift2, salt_pos, loop_pos, loop_cnt, il_cnt, digests_cnt, digests_offset, combs_mode, gid_max); } -__kernel void m10420_s04 (KERN_ATTR_ESALT (pdf_t)) +KERNEL_FQ void m10420_s04 (KERN_ATTR_ESALT (pdf_t)) { /** * base @@ -552,7 +552,7 @@ __kernel void m10420_s04 (KERN_ATTR_ESALT (pdf_t)) m10420s (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_extra0_buf, d_extra1_buf, d_extra2_buf, d_extra3_buf, bitmap_mask, bitmap_shift1, bitmap_shift2, salt_pos, loop_pos, loop_cnt, il_cnt, digests_cnt, digests_offset, combs_mode, gid_max); } -__kernel void m10420_s08 (KERN_ATTR_ESALT (pdf_t)) +KERNEL_FQ void m10420_s08 (KERN_ATTR_ESALT (pdf_t)) { /** * base @@ -599,7 +599,7 @@ __kernel void m10420_s08 (KERN_ATTR_ESALT (pdf_t)) m10420s (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_extra0_buf, d_extra1_buf, d_extra2_buf, d_extra3_buf, bitmap_mask, bitmap_shift1, bitmap_shift2, salt_pos, loop_pos, loop_cnt, il_cnt, digests_cnt, digests_offset, combs_mode, gid_max); } -__kernel void m10420_s16 (KERN_ATTR_ESALT (pdf_t)) +KERNEL_FQ void m10420_s16 (KERN_ATTR_ESALT (pdf_t)) { /** * base diff --git a/OpenCL/m10500-pure.cl b/OpenCL/m10500-pure.cl index 073c0b917..3ba4e85a4 100644 --- a/OpenCL/m10500-pure.cl +++ b/OpenCL/m10500-pure.cl @@ -13,7 +13,7 @@ #define COMPARE_S "inc_comp_single.cl" #define COMPARE_M "inc_comp_multi.cl" -__constant u32a padding[8] = +CONSTANT_AS u32a padding[8] = { 0x5e4ebf28, 0x418a754e, @@ -61,7 +61,7 @@ typedef struct } RC4_KEY; -DECLSPEC void swap (__local RC4_KEY *rc4_key, const u8 i, const u8 j) +DECLSPEC void swap (LOCAL_AS RC4_KEY *rc4_key, const u8 i, const u8 j) { u8 tmp; @@ -70,12 +70,12 @@ DECLSPEC void swap (__local RC4_KEY *rc4_key, const u8 i, const u8 j) rc4_key->S[j] = tmp; } -DECLSPEC void rc4_init_16 (__local RC4_KEY *rc4_key, const u32 *data) +DECLSPEC void rc4_init_16 (LOCAL_AS RC4_KEY *rc4_key, const u32 *data) { u32 v = 0x03020100; u32 a = 0x04040404; - __local u32 *ptr = (__local u32 *) rc4_key->S; + LOCAL_AS u32 *ptr = (LOCAL_AS u32 *) rc4_key->S; #ifdef _unroll #pragma unroll @@ -126,7 +126,7 @@ DECLSPEC void rc4_init_16 (__local RC4_KEY *rc4_key, const u32 *data) } } -DECLSPEC u8 rc4_next_16 (__local RC4_KEY *rc4_key, u8 i, u8 j, const u32 *in, u32 *out) +DECLSPEC u8 rc4_next_16 (LOCAL_AS RC4_KEY *rc4_key, u8 i, u8 j, const u32 *in, u32 *out) { #ifdef _unroll #pragma unroll @@ -179,7 +179,7 @@ DECLSPEC u8 rc4_next_16 (__local RC4_KEY *rc4_key, u8 i, u8 j, const u32 *in, u3 return j; } -__kernel void m10500_init (KERN_ATTR_TMPS_ESALT (pdf14_tmp_t, pdf_t)) +KERNEL_FQ void m10500_init (KERN_ATTR_TMPS_ESALT (pdf14_tmp_t, pdf_t)) { /** * base @@ -210,8 +210,8 @@ __kernel void m10500_init (KERN_ATTR_TMPS_ESALT (pdf14_tmp_t, pdf_t)) * shared */ - //__local RC4_KEY rc4_keys[64]; - //__local RC4_KEY *rc4_key = &rc4_keys[lid]; + //LOCAL_AS RC4_KEY rc4_keys[64]; + //LOCAL_AS RC4_KEY *rc4_key = &rc4_keys[lid]; /** * U_buf @@ -361,7 +361,7 @@ __kernel void m10500_init (KERN_ATTR_TMPS_ESALT (pdf14_tmp_t, pdf_t)) tmps[gid].out[3] = 0; } -__kernel void m10500_loop (KERN_ATTR_TMPS_ESALT (pdf14_tmp_t, pdf_t)) +KERNEL_FQ void m10500_loop (KERN_ATTR_TMPS_ESALT (pdf14_tmp_t, pdf_t)) { /** * base @@ -376,9 +376,9 @@ __kernel void m10500_loop (KERN_ATTR_TMPS_ESALT (pdf14_tmp_t, pdf_t)) * shared */ - __local RC4_KEY rc4_keys[64]; + LOCAL_AS RC4_KEY rc4_keys[64]; - __local RC4_KEY *rc4_key = &rc4_keys[lid]; + LOCAL_AS RC4_KEY *rc4_key = &rc4_keys[lid]; /** * loop @@ -464,7 +464,7 @@ __kernel void m10500_loop (KERN_ATTR_TMPS_ESALT (pdf14_tmp_t, pdf_t)) tmps[gid].out[3] = out[3]; } -__kernel void m10500_comp (KERN_ATTR_TMPS_ESALT (pdf14_tmp_t, pdf_t)) +KERNEL_FQ void m10500_comp (KERN_ATTR_TMPS_ESALT (pdf14_tmp_t, pdf_t)) { /** * modifier diff --git a/OpenCL/m10700-optimized.cl b/OpenCL/m10700-optimized.cl index 0cec176e6..0433c24ad 100644 --- a/OpenCL/m10700-optimized.cl +++ b/OpenCL/m10700-optimized.cl @@ -549,7 +549,7 @@ DECLSPEC u32 do_round (const u32 *pw, const u32 pw_len, ctx_t *ctx, SHM_TYPE u32 return ex; } -__kernel void m10700_init (KERN_ATTR_TMPS_ESALT (pdf17l8_tmp_t, pdf_t)) +KERNEL_FQ void m10700_init (KERN_ATTR_TMPS_ESALT (pdf17l8_tmp_t, pdf_t)) { /** * base @@ -581,7 +581,7 @@ __kernel void m10700_init (KERN_ATTR_TMPS_ESALT (pdf17l8_tmp_t, pdf_t)) tmps[gid].W_len = WORDSZ256; } -__kernel void m10700_loop (KERN_ATTR_TMPS_ESALT (pdf17l8_tmp_t, pdf_t)) +KERNEL_FQ void m10700_loop (KERN_ATTR_TMPS_ESALT (pdf17l8_tmp_t, pdf_t)) { const u64 gid = get_global_id (0); const u64 lid = get_local_id (0); @@ -593,11 +593,11 @@ __kernel void m10700_loop (KERN_ATTR_TMPS_ESALT (pdf17l8_tmp_t, pdf_t)) #ifdef REAL_SHM - __local u32 s_te0[256]; - __local u32 s_te1[256]; - __local u32 s_te2[256]; - __local u32 s_te3[256]; - __local u32 s_te4[256]; + LOCAL_AS u32 s_te0[256]; + LOCAL_AS u32 s_te1[256]; + LOCAL_AS u32 s_te2[256]; + LOCAL_AS u32 s_te3[256]; + LOCAL_AS u32 s_te4[256]; for (u32 i = lid; i < 256; i += lsz) { @@ -612,11 +612,11 @@ __kernel void m10700_loop (KERN_ATTR_TMPS_ESALT (pdf17l8_tmp_t, pdf_t)) #else - __constant u32a *s_te0 = te0; - __constant u32a *s_te1 = te1; - __constant u32a *s_te2 = te2; - __constant u32a *s_te3 = te3; - __constant u32a *s_te4 = te4; + CONSTANT_AS u32a *s_te0 = te0; + CONSTANT_AS u32a *s_te1 = te1; + CONSTANT_AS u32a *s_te2 = te2; + CONSTANT_AS u32a *s_te3 = te3; + CONSTANT_AS u32a *s_te4 = te4; #endif @@ -681,7 +681,7 @@ __kernel void m10700_loop (KERN_ATTR_TMPS_ESALT (pdf17l8_tmp_t, pdf_t)) tmps[gid].W_len = ctx.W_len; } -__kernel void m10700_comp (KERN_ATTR_TMPS_ESALT (pdf17l8_tmp_t, pdf_t)) +KERNEL_FQ void m10700_comp (KERN_ATTR_TMPS_ESALT (pdf17l8_tmp_t, pdf_t)) { /** * modifier diff --git a/OpenCL/m10700-pure.cl b/OpenCL/m10700-pure.cl index 8be2fa8d1..595ffe52f 100644 --- a/OpenCL/m10700-pure.cl +++ b/OpenCL/m10700-pure.cl @@ -1138,7 +1138,7 @@ DECLSPEC u32 do_round (const u32 *w, const u32 pw_len, pdf17l8_tmp_t *tmp, SHM_T return ex; } -__kernel void m10700_init (KERN_ATTR_TMPS_ESALT (pdf17l8_tmp_t, pdf_t)) +KERNEL_FQ void m10700_init (KERN_ATTR_TMPS_ESALT (pdf17l8_tmp_t, pdf_t)) { /** * base @@ -1182,7 +1182,7 @@ __kernel void m10700_init (KERN_ATTR_TMPS_ESALT (pdf17l8_tmp_t, pdf_t)) tmps[gid] = tmp; } -__kernel void m10700_loop (KERN_ATTR_TMPS_ESALT (pdf17l8_tmp_t, pdf_t)) +KERNEL_FQ void m10700_loop (KERN_ATTR_TMPS_ESALT (pdf17l8_tmp_t, pdf_t)) { const u64 gid = get_global_id (0); const u64 lid = get_local_id (0); @@ -1194,11 +1194,11 @@ __kernel void m10700_loop (KERN_ATTR_TMPS_ESALT (pdf17l8_tmp_t, pdf_t)) #ifdef REAL_SHM - __local u32 s_te0[256]; - __local u32 s_te1[256]; - __local u32 s_te2[256]; - __local u32 s_te3[256]; - __local u32 s_te4[256]; + LOCAL_AS u32 s_te0[256]; + LOCAL_AS u32 s_te1[256]; + LOCAL_AS u32 s_te2[256]; + LOCAL_AS u32 s_te3[256]; + LOCAL_AS u32 s_te4[256]; for (u32 i = lid; i < 256; i += lsz) { @@ -1213,11 +1213,11 @@ __kernel void m10700_loop (KERN_ATTR_TMPS_ESALT (pdf17l8_tmp_t, pdf_t)) #else - __constant u32a *s_te0 = te0; - __constant u32a *s_te1 = te1; - __constant u32a *s_te2 = te2; - __constant u32a *s_te3 = te3; - __constant u32a *s_te4 = te4; + CONSTANT_AS u32a *s_te0 = te0; + CONSTANT_AS u32a *s_te1 = te1; + CONSTANT_AS u32a *s_te2 = te2; + CONSTANT_AS u32a *s_te3 = te3; + CONSTANT_AS u32a *s_te4 = te4; #endif @@ -1260,7 +1260,7 @@ __kernel void m10700_loop (KERN_ATTR_TMPS_ESALT (pdf17l8_tmp_t, pdf_t)) tmps[gid] = tmp; } -__kernel void m10700_comp (KERN_ATTR_TMPS_ESALT (pdf17l8_tmp_t, pdf_t)) +KERNEL_FQ void m10700_comp (KERN_ATTR_TMPS_ESALT (pdf17l8_tmp_t, pdf_t)) { /** * modifier diff --git a/OpenCL/m10800_a0-optimized.cl b/OpenCL/m10800_a0-optimized.cl index 7385f6986..4d6491c34 100644 --- a/OpenCL/m10800_a0-optimized.cl +++ b/OpenCL/m10800_a0-optimized.cl @@ -114,7 +114,7 @@ DECLSPEC void sha384_transform_intern (const u32x *w0, const u32x *w1, const u32 digest[7] = 0; } -__kernel void m10800_m04 (KERN_ATTR_RULES ()) +KERNEL_FQ void m10800_m04 (KERN_ATTR_RULES ()) { /** * modifier @@ -207,15 +207,15 @@ __kernel void m10800_m04 (KERN_ATTR_RULES ()) } } -__kernel void m10800_m08 (KERN_ATTR_RULES ()) +KERNEL_FQ void m10800_m08 (KERN_ATTR_RULES ()) { } -__kernel void m10800_m16 (KERN_ATTR_RULES ()) +KERNEL_FQ void m10800_m16 (KERN_ATTR_RULES ()) { } -__kernel void m10800_s04 (KERN_ATTR_RULES ()) +KERNEL_FQ void m10800_s04 (KERN_ATTR_RULES ()) { /** * modifier @@ -320,10 +320,10 @@ __kernel void m10800_s04 (KERN_ATTR_RULES ()) } } -__kernel void m10800_s08 (KERN_ATTR_RULES ()) +KERNEL_FQ void m10800_s08 (KERN_ATTR_RULES ()) { } -__kernel void m10800_s16 (KERN_ATTR_RULES ()) +KERNEL_FQ void m10800_s16 (KERN_ATTR_RULES ()) { } diff --git a/OpenCL/m10800_a0-pure.cl b/OpenCL/m10800_a0-pure.cl index 9fcaf782a..023bb9b50 100644 --- a/OpenCL/m10800_a0-pure.cl +++ b/OpenCL/m10800_a0-pure.cl @@ -15,7 +15,7 @@ #include "inc_hash_sha384.cl" #endif -__kernel void m10800_mxx (KERN_ATTR_RULES ()) +KERNEL_FQ void m10800_mxx (KERN_ATTR_RULES ()) { /** * modifier @@ -59,7 +59,7 @@ __kernel void m10800_mxx (KERN_ATTR_RULES ()) } } -__kernel void m10800_sxx (KERN_ATTR_RULES ()) +KERNEL_FQ void m10800_sxx (KERN_ATTR_RULES ()) { /** * modifier diff --git a/OpenCL/m10800_a1-optimized.cl b/OpenCL/m10800_a1-optimized.cl index 2c8c07f63..002f7de7c 100644 --- a/OpenCL/m10800_a1-optimized.cl +++ b/OpenCL/m10800_a1-optimized.cl @@ -112,7 +112,7 @@ DECLSPEC void sha384_transform_intern (const u32x *w0, const u32x *w1, const u32 digest[7] = 0; } -__kernel void m10800_m04 (KERN_ATTR_BASIC ()) +KERNEL_FQ void m10800_m04 (KERN_ATTR_BASIC ()) { /** * modifier @@ -263,15 +263,15 @@ __kernel void m10800_m04 (KERN_ATTR_BASIC ()) } } -__kernel void m10800_m08 (KERN_ATTR_BASIC ()) +KERNEL_FQ void m10800_m08 (KERN_ATTR_BASIC ()) { } -__kernel void m10800_m16 (KERN_ATTR_BASIC ()) +KERNEL_FQ void m10800_m16 (KERN_ATTR_BASIC ()) { } -__kernel void m10800_s04 (KERN_ATTR_BASIC ()) +KERNEL_FQ void m10800_s04 (KERN_ATTR_BASIC ()) { /** * modifier @@ -434,10 +434,10 @@ __kernel void m10800_s04 (KERN_ATTR_BASIC ()) } } -__kernel void m10800_s08 (KERN_ATTR_BASIC ()) +KERNEL_FQ void m10800_s08 (KERN_ATTR_BASIC ()) { } -__kernel void m10800_s16 (KERN_ATTR_BASIC ()) +KERNEL_FQ void m10800_s16 (KERN_ATTR_BASIC ()) { } diff --git a/OpenCL/m10800_a1-pure.cl b/OpenCL/m10800_a1-pure.cl index 8dda4d801..5a8a1c2a2 100644 --- a/OpenCL/m10800_a1-pure.cl +++ b/OpenCL/m10800_a1-pure.cl @@ -13,7 +13,7 @@ #include "inc_hash_sha384.cl" #endif -__kernel void m10800_mxx (KERN_ATTR_BASIC ()) +KERNEL_FQ void m10800_mxx (KERN_ATTR_BASIC ()) { /** * modifier @@ -55,7 +55,7 @@ __kernel void m10800_mxx (KERN_ATTR_BASIC ()) } } -__kernel void m10800_sxx (KERN_ATTR_BASIC ()) +KERNEL_FQ void m10800_sxx (KERN_ATTR_BASIC ()) { /** * modifier diff --git a/OpenCL/m10800_a3-optimized.cl b/OpenCL/m10800_a3-optimized.cl index 3e475e4a6..e2291000c 100644 --- a/OpenCL/m10800_a3-optimized.cl +++ b/OpenCL/m10800_a3-optimized.cl @@ -254,7 +254,7 @@ DECLSPEC void m10800s (u32 *w, const u32 pw_len, KERN_ATTR_VECTOR ()) } } -__kernel void m10800_m04 (KERN_ATTR_VECTOR ()) +KERNEL_FQ void m10800_m04 (KERN_ATTR_VECTOR ()) { /** * base @@ -292,7 +292,7 @@ __kernel void m10800_m04 (KERN_ATTR_VECTOR ()) m10800m (w, pw_len, pws, rules_buf, combs_buf, words_buf_r, 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_extra0_buf, d_extra1_buf, d_extra2_buf, d_extra3_buf, bitmap_mask, bitmap_shift1, bitmap_shift2, salt_pos, loop_pos, loop_cnt, il_cnt, digests_cnt, digests_offset, combs_mode, gid_max); } -__kernel void m10800_m08 (KERN_ATTR_VECTOR ()) +KERNEL_FQ void m10800_m08 (KERN_ATTR_VECTOR ()) { /** * base @@ -330,7 +330,7 @@ __kernel void m10800_m08 (KERN_ATTR_VECTOR ()) m10800m (w, pw_len, pws, rules_buf, combs_buf, words_buf_r, 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_extra0_buf, d_extra1_buf, d_extra2_buf, d_extra3_buf, bitmap_mask, bitmap_shift1, bitmap_shift2, salt_pos, loop_pos, loop_cnt, il_cnt, digests_cnt, digests_offset, combs_mode, gid_max); } -__kernel void m10800_m16 (KERN_ATTR_VECTOR ()) +KERNEL_FQ void m10800_m16 (KERN_ATTR_VECTOR ()) { /** * base @@ -368,7 +368,7 @@ __kernel void m10800_m16 (KERN_ATTR_VECTOR ()) m10800m (w, pw_len, pws, rules_buf, combs_buf, words_buf_r, 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_extra0_buf, d_extra1_buf, d_extra2_buf, d_extra3_buf, bitmap_mask, bitmap_shift1, bitmap_shift2, salt_pos, loop_pos, loop_cnt, il_cnt, digests_cnt, digests_offset, combs_mode, gid_max); } -__kernel void m10800_s04 (KERN_ATTR_VECTOR ()) +KERNEL_FQ void m10800_s04 (KERN_ATTR_VECTOR ()) { /** * base @@ -406,7 +406,7 @@ __kernel void m10800_s04 (KERN_ATTR_VECTOR ()) m10800s (w, pw_len, pws, rules_buf, combs_buf, words_buf_r, 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_extra0_buf, d_extra1_buf, d_extra2_buf, d_extra3_buf, bitmap_mask, bitmap_shift1, bitmap_shift2, salt_pos, loop_pos, loop_cnt, il_cnt, digests_cnt, digests_offset, combs_mode, gid_max); } -__kernel void m10800_s08 (KERN_ATTR_VECTOR ()) +KERNEL_FQ void m10800_s08 (KERN_ATTR_VECTOR ()) { /** * base @@ -444,7 +444,7 @@ __kernel void m10800_s08 (KERN_ATTR_VECTOR ()) m10800s (w, pw_len, pws, rules_buf, combs_buf, words_buf_r, 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_extra0_buf, d_extra1_buf, d_extra2_buf, d_extra3_buf, bitmap_mask, bitmap_shift1, bitmap_shift2, salt_pos, loop_pos, loop_cnt, il_cnt, digests_cnt, digests_offset, combs_mode, gid_max); } -__kernel void m10800_s16 (KERN_ATTR_VECTOR ()) +KERNEL_FQ void m10800_s16 (KERN_ATTR_VECTOR ()) { /** * base diff --git a/OpenCL/m10800_a3-pure.cl b/OpenCL/m10800_a3-pure.cl index f52d4d82d..0ee6ca2b4 100644 --- a/OpenCL/m10800_a3-pure.cl +++ b/OpenCL/m10800_a3-pure.cl @@ -13,7 +13,7 @@ #include "inc_hash_sha384.cl" #endif -__kernel void m10800_mxx (KERN_ATTR_VECTOR ()) +KERNEL_FQ void m10800_mxx (KERN_ATTR_VECTOR ()) { /** * modifier @@ -68,7 +68,7 @@ __kernel void m10800_mxx (KERN_ATTR_VECTOR ()) } } -__kernel void m10800_sxx (KERN_ATTR_VECTOR ()) +KERNEL_FQ void m10800_sxx (KERN_ATTR_VECTOR ()) { /** * modifier diff --git a/OpenCL/m10900-pure.cl b/OpenCL/m10900-pure.cl index 2a0a7c5ee..19613c2ca 100644 --- a/OpenCL/m10900-pure.cl +++ b/OpenCL/m10900-pure.cl @@ -74,7 +74,7 @@ DECLSPEC void hmac_sha256_run_V (u32x *w0, u32x *w1, u32x *w2, u32x *w3, u32x *i sha256_transform_vector (w0, w1, w2, w3, digest); } -__kernel void m10900_init (KERN_ATTR_TMPS_ESALT (pbkdf2_sha256_tmp_t, pbkdf2_sha256_t)) +KERNEL_FQ void m10900_init (KERN_ATTR_TMPS_ESALT (pbkdf2_sha256_tmp_t, pbkdf2_sha256_t)) { /** * base @@ -158,7 +158,7 @@ __kernel void m10900_init (KERN_ATTR_TMPS_ESALT (pbkdf2_sha256_tmp_t, pbkdf2_sha } } -__kernel void m10900_loop (KERN_ATTR_TMPS_ESALT (pbkdf2_sha256_tmp_t, pbkdf2_sha256_t)) +KERNEL_FQ void m10900_loop (KERN_ATTR_TMPS_ESALT (pbkdf2_sha256_tmp_t, pbkdf2_sha256_t)) { const u64 gid = get_global_id (0); @@ -264,7 +264,7 @@ __kernel void m10900_loop (KERN_ATTR_TMPS_ESALT (pbkdf2_sha256_tmp_t, pbkdf2_sha } } -__kernel void m10900_comp (KERN_ATTR_TMPS_ESALT (pbkdf2_sha256_tmp_t, pbkdf2_sha256_t)) +KERNEL_FQ void m10900_comp (KERN_ATTR_TMPS_ESALT (pbkdf2_sha256_tmp_t, pbkdf2_sha256_t)) { /** * base diff --git a/OpenCL/m11000_a0-optimized.cl b/OpenCL/m11000_a0-optimized.cl index 3764d45c4..017a09b0e 100644 --- a/OpenCL/m11000_a0-optimized.cl +++ b/OpenCL/m11000_a0-optimized.cl @@ -15,7 +15,7 @@ #include "inc_hash_md5.cl" #endif -__kernel void m11000_m04 (KERN_ATTR_RULES ()) +KERNEL_FQ void m11000_m04 (KERN_ATTR_RULES ()) { /** * modifier @@ -304,15 +304,15 @@ __kernel void m11000_m04 (KERN_ATTR_RULES ()) } } -__kernel void m11000_m08 (KERN_ATTR_RULES ()) +KERNEL_FQ void m11000_m08 (KERN_ATTR_RULES ()) { } -__kernel void m11000_m16 (KERN_ATTR_RULES ()) +KERNEL_FQ void m11000_m16 (KERN_ATTR_RULES ()) { } -__kernel void m11000_s04 (KERN_ATTR_RULES ()) +KERNEL_FQ void m11000_s04 (KERN_ATTR_RULES ()) { /** * modifier @@ -613,10 +613,10 @@ __kernel void m11000_s04 (KERN_ATTR_RULES ()) } } -__kernel void m11000_s08 (KERN_ATTR_RULES ()) +KERNEL_FQ void m11000_s08 (KERN_ATTR_RULES ()) { } -__kernel void m11000_s16 (KERN_ATTR_RULES ()) +KERNEL_FQ void m11000_s16 (KERN_ATTR_RULES ()) { } diff --git a/OpenCL/m11000_a0-pure.cl b/OpenCL/m11000_a0-pure.cl index 18585ff4c..89af491eb 100644 --- a/OpenCL/m11000_a0-pure.cl +++ b/OpenCL/m11000_a0-pure.cl @@ -15,7 +15,7 @@ #include "inc_hash_md5.cl" #endif -__kernel void m11000_mxx (KERN_ATTR_RULES ()) +KERNEL_FQ void m11000_mxx (KERN_ATTR_RULES ()) { /** * modifier @@ -63,7 +63,7 @@ __kernel void m11000_mxx (KERN_ATTR_RULES ()) } } -__kernel void m11000_sxx (KERN_ATTR_RULES ()) +KERNEL_FQ void m11000_sxx (KERN_ATTR_RULES ()) { /** * modifier diff --git a/OpenCL/m11000_a1-optimized.cl b/OpenCL/m11000_a1-optimized.cl index 439a5592c..e0672c0be 100644 --- a/OpenCL/m11000_a1-optimized.cl +++ b/OpenCL/m11000_a1-optimized.cl @@ -13,7 +13,7 @@ #include "inc_hash_md5.cl" #endif -__kernel void m11000_m04 (KERN_ATTR_BASIC ()) +KERNEL_FQ void m11000_m04 (KERN_ATTR_BASIC ()) { /** * modifier @@ -360,15 +360,15 @@ __kernel void m11000_m04 (KERN_ATTR_BASIC ()) } } -__kernel void m11000_m08 (KERN_ATTR_BASIC ()) +KERNEL_FQ void m11000_m08 (KERN_ATTR_BASIC ()) { } -__kernel void m11000_m16 (KERN_ATTR_BASIC ()) +KERNEL_FQ void m11000_m16 (KERN_ATTR_BASIC ()) { } -__kernel void m11000_s04 (KERN_ATTR_BASIC ()) +KERNEL_FQ void m11000_s04 (KERN_ATTR_BASIC ()) { /** * modifier @@ -727,10 +727,10 @@ __kernel void m11000_s04 (KERN_ATTR_BASIC ()) } } -__kernel void m11000_s08 (KERN_ATTR_BASIC ()) +KERNEL_FQ void m11000_s08 (KERN_ATTR_BASIC ()) { } -__kernel void m11000_s16 (KERN_ATTR_BASIC ()) +KERNEL_FQ void m11000_s16 (KERN_ATTR_BASIC ()) { } diff --git a/OpenCL/m11000_a1-pure.cl b/OpenCL/m11000_a1-pure.cl index f42321914..e5c5edb2e 100644 --- a/OpenCL/m11000_a1-pure.cl +++ b/OpenCL/m11000_a1-pure.cl @@ -13,7 +13,7 @@ #include "inc_hash_md5.cl" #endif -__kernel void m11000_mxx (KERN_ATTR_BASIC ()) +KERNEL_FQ void m11000_mxx (KERN_ATTR_BASIC ()) { /** * modifier @@ -57,7 +57,7 @@ __kernel void m11000_mxx (KERN_ATTR_BASIC ()) } } -__kernel void m11000_sxx (KERN_ATTR_BASIC ()) +KERNEL_FQ void m11000_sxx (KERN_ATTR_BASIC ()) { /** * modifier diff --git a/OpenCL/m11000_a3-optimized.cl b/OpenCL/m11000_a3-optimized.cl index c9ea6b74f..9ac1f844d 100644 --- a/OpenCL/m11000_a3-optimized.cl +++ b/OpenCL/m11000_a3-optimized.cl @@ -555,7 +555,7 @@ DECLSPEC void m11000s (u32 *w0, u32 *w1, u32 *w2, u32 *w3, const u32 pw_len, KER } } -__kernel void m11000_m04 (KERN_ATTR_BASIC ()) +KERNEL_FQ void m11000_m04 (KERN_ATTR_BASIC ()) { /** * base @@ -602,7 +602,7 @@ __kernel void m11000_m04 (KERN_ATTR_BASIC ()) m11000m (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_extra0_buf, d_extra1_buf, d_extra2_buf, d_extra3_buf, bitmap_mask, bitmap_shift1, bitmap_shift2, salt_pos, loop_pos, loop_cnt, il_cnt, digests_cnt, digests_offset, combs_mode, gid_max); } -__kernel void m11000_m08 (KERN_ATTR_BASIC ()) +KERNEL_FQ void m11000_m08 (KERN_ATTR_BASIC ()) { /** * base @@ -649,7 +649,7 @@ __kernel void m11000_m08 (KERN_ATTR_BASIC ()) m11000m (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_extra0_buf, d_extra1_buf, d_extra2_buf, d_extra3_buf, bitmap_mask, bitmap_shift1, bitmap_shift2, salt_pos, loop_pos, loop_cnt, il_cnt, digests_cnt, digests_offset, combs_mode, gid_max); } -__kernel void m11000_m16 (KERN_ATTR_BASIC ()) +KERNEL_FQ void m11000_m16 (KERN_ATTR_BASIC ()) { /** * base @@ -696,7 +696,7 @@ __kernel void m11000_m16 (KERN_ATTR_BASIC ()) m11000m (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_extra0_buf, d_extra1_buf, d_extra2_buf, d_extra3_buf, bitmap_mask, bitmap_shift1, bitmap_shift2, salt_pos, loop_pos, loop_cnt, il_cnt, digests_cnt, digests_offset, combs_mode, gid_max); } -__kernel void m11000_s04 (KERN_ATTR_BASIC ()) +KERNEL_FQ void m11000_s04 (KERN_ATTR_BASIC ()) { /** * base @@ -743,7 +743,7 @@ __kernel void m11000_s04 (KERN_ATTR_BASIC ()) m11000s (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_extra0_buf, d_extra1_buf, d_extra2_buf, d_extra3_buf, bitmap_mask, bitmap_shift1, bitmap_shift2, salt_pos, loop_pos, loop_cnt, il_cnt, digests_cnt, digests_offset, combs_mode, gid_max); } -__kernel void m11000_s08 (KERN_ATTR_BASIC ()) +KERNEL_FQ void m11000_s08 (KERN_ATTR_BASIC ()) { /** * base @@ -790,7 +790,7 @@ __kernel void m11000_s08 (KERN_ATTR_BASIC ()) m11000s (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_extra0_buf, d_extra1_buf, d_extra2_buf, d_extra3_buf, bitmap_mask, bitmap_shift1, bitmap_shift2, salt_pos, loop_pos, loop_cnt, il_cnt, digests_cnt, digests_offset, combs_mode, gid_max); } -__kernel void m11000_s16 (KERN_ATTR_BASIC ()) +KERNEL_FQ void m11000_s16 (KERN_ATTR_BASIC ()) { /** * base diff --git a/OpenCL/m11000_a3-pure.cl b/OpenCL/m11000_a3-pure.cl index b3a46eb84..e815aa209 100644 --- a/OpenCL/m11000_a3-pure.cl +++ b/OpenCL/m11000_a3-pure.cl @@ -13,7 +13,7 @@ #include "inc_hash_md5.cl" #endif -__kernel void m11000_mxx (KERN_ATTR_VECTOR ()) +KERNEL_FQ void m11000_mxx (KERN_ATTR_VECTOR ()) { /** * modifier @@ -74,7 +74,7 @@ __kernel void m11000_mxx (KERN_ATTR_VECTOR ()) } } -__kernel void m11000_sxx (KERN_ATTR_VECTOR ()) +KERNEL_FQ void m11000_sxx (KERN_ATTR_VECTOR ()) { /** * modifier diff --git a/OpenCL/m11100_a0-optimized.cl b/OpenCL/m11100_a0-optimized.cl index 4f4e328cf..7316a8865 100644 --- a/OpenCL/m11100_a0-optimized.cl +++ b/OpenCL/m11100_a0-optimized.cl @@ -27,7 +27,7 @@ #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 m11100_m04 (KERN_ATTR_RULES ()) +KERNEL_FQ void m11100_m04 (KERN_ATTR_RULES ()) { /** * base @@ -41,7 +41,7 @@ __kernel void m11100_m04 (KERN_ATTR_RULES ()) * bin2asc table */ - __local u32 l_bin2asc[256]; + LOCAL_AS u32 l_bin2asc[256]; for (u32 i = lid; i < 256; i += lsz) { @@ -353,15 +353,15 @@ __kernel void m11100_m04 (KERN_ATTR_RULES ()) } } -__kernel void m11100_m08 (KERN_ATTR_RULES ()) +KERNEL_FQ void m11100_m08 (KERN_ATTR_RULES ()) { } -__kernel void m11100_m16 (KERN_ATTR_RULES ()) +KERNEL_FQ void m11100_m16 (KERN_ATTR_RULES ()) { } -__kernel void m11100_s04 (KERN_ATTR_RULES ()) +KERNEL_FQ void m11100_s04 (KERN_ATTR_RULES ()) { /** * base @@ -375,7 +375,7 @@ __kernel void m11100_s04 (KERN_ATTR_RULES ()) * bin2asc table */ - __local u32 l_bin2asc[256]; + LOCAL_AS u32 l_bin2asc[256]; for (u32 i = lid; i < 256; i += lsz) { @@ -702,10 +702,10 @@ __kernel void m11100_s04 (KERN_ATTR_RULES ()) } } -__kernel void m11100_s08 (KERN_ATTR_RULES ()) +KERNEL_FQ void m11100_s08 (KERN_ATTR_RULES ()) { } -__kernel void m11100_s16 (KERN_ATTR_RULES ()) +KERNEL_FQ void m11100_s16 (KERN_ATTR_RULES ()) { } diff --git a/OpenCL/m11100_a0-pure.cl b/OpenCL/m11100_a0-pure.cl index c13cc7eed..821f39c07 100644 --- a/OpenCL/m11100_a0-pure.cl +++ b/OpenCL/m11100_a0-pure.cl @@ -27,7 +27,7 @@ #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 m11100_mxx (KERN_ATTR_RULES ()) +KERNEL_FQ void m11100_mxx (KERN_ATTR_RULES ()) { /** * modifier @@ -41,7 +41,7 @@ __kernel void m11100_mxx (KERN_ATTR_RULES ()) * bin2asc table */ - __local u32 l_bin2asc[256]; + LOCAL_AS u32 l_bin2asc[256]; for (u32 i = lid; i < 256; i += lsz) { @@ -173,7 +173,7 @@ __kernel void m11100_mxx (KERN_ATTR_RULES ()) } } -__kernel void m11100_sxx (KERN_ATTR_RULES ()) +KERNEL_FQ void m11100_sxx (KERN_ATTR_RULES ()) { /** * modifier @@ -187,7 +187,7 @@ __kernel void m11100_sxx (KERN_ATTR_RULES ()) * bin2asc table */ - __local u32 l_bin2asc[256]; + LOCAL_AS u32 l_bin2asc[256]; for (u32 i = lid; i < 256; i += lsz) { diff --git a/OpenCL/m11100_a1-optimized.cl b/OpenCL/m11100_a1-optimized.cl index 0a9c38c9d..d378ff025 100644 --- a/OpenCL/m11100_a1-optimized.cl +++ b/OpenCL/m11100_a1-optimized.cl @@ -25,7 +25,7 @@ #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 m11100_m04 (KERN_ATTR_BASIC ()) +KERNEL_FQ void m11100_m04 (KERN_ATTR_BASIC ()) { /** * base @@ -39,7 +39,7 @@ __kernel void m11100_m04 (KERN_ATTR_BASIC ()) * bin2asc table */ - __local u32 l_bin2asc[256]; + LOCAL_AS u32 l_bin2asc[256]; for (u32 i = lid; i < 256; i += lsz) { @@ -411,15 +411,15 @@ __kernel void m11100_m04 (KERN_ATTR_BASIC ()) } } -__kernel void m11100_m08 (KERN_ATTR_BASIC ()) +KERNEL_FQ void m11100_m08 (KERN_ATTR_BASIC ()) { } -__kernel void m11100_m16 (KERN_ATTR_BASIC ()) +KERNEL_FQ void m11100_m16 (KERN_ATTR_BASIC ()) { } -__kernel void m11100_s04 (KERN_ATTR_BASIC ()) +KERNEL_FQ void m11100_s04 (KERN_ATTR_BASIC ()) { /** * base @@ -433,7 +433,7 @@ __kernel void m11100_s04 (KERN_ATTR_BASIC ()) * bin2asc table */ - __local u32 l_bin2asc[256]; + LOCAL_AS u32 l_bin2asc[256]; for (u32 i = lid; i < 256; i += lsz) { @@ -820,10 +820,10 @@ __kernel void m11100_s04 (KERN_ATTR_BASIC ()) } } -__kernel void m11100_s08 (KERN_ATTR_BASIC ()) +KERNEL_FQ void m11100_s08 (KERN_ATTR_BASIC ()) { } -__kernel void m11100_s16 (KERN_ATTR_BASIC ()) +KERNEL_FQ void m11100_s16 (KERN_ATTR_BASIC ()) { } diff --git a/OpenCL/m11100_a1-pure.cl b/OpenCL/m11100_a1-pure.cl index e39eb283b..92bdbac02 100644 --- a/OpenCL/m11100_a1-pure.cl +++ b/OpenCL/m11100_a1-pure.cl @@ -25,7 +25,7 @@ #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 m11100_mxx (KERN_ATTR_BASIC ()) +KERNEL_FQ void m11100_mxx (KERN_ATTR_BASIC ()) { /** * modifier @@ -39,7 +39,7 @@ __kernel void m11100_mxx (KERN_ATTR_BASIC ()) * bin2asc table */ - __local u32 l_bin2asc[256]; + LOCAL_AS u32 l_bin2asc[256]; for (u32 i = lid; i < 256; i += lsz) { @@ -169,7 +169,7 @@ __kernel void m11100_mxx (KERN_ATTR_BASIC ()) } } -__kernel void m11100_sxx (KERN_ATTR_BASIC ()) +KERNEL_FQ void m11100_sxx (KERN_ATTR_BASIC ()) { /** * modifier @@ -183,7 +183,7 @@ __kernel void m11100_sxx (KERN_ATTR_BASIC ()) * bin2asc table */ - __local u32 l_bin2asc[256]; + LOCAL_AS u32 l_bin2asc[256]; for (u32 i = lid; i < 256; i += lsz) { diff --git a/OpenCL/m11100_a3-optimized.cl b/OpenCL/m11100_a3-optimized.cl index 04e352b51..76f4dab57 100644 --- a/OpenCL/m11100_a3-optimized.cl +++ b/OpenCL/m11100_a3-optimized.cl @@ -25,7 +25,7 @@ #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 -DECLSPEC void m11100m (u32 *w0, u32 *w1, u32 *w2, u32 *w3, const u32 pw_len, KERN_ATTR_BASIC (), __local u32 *l_bin2asc) +DECLSPEC void m11100m (u32 *w0, u32 *w1, u32 *w2, u32 *w3, const u32 pw_len, KERN_ATTR_BASIC (), LOCAL_AS u32 *l_bin2asc) { /** * modifier @@ -330,7 +330,7 @@ DECLSPEC void m11100m (u32 *w0, u32 *w1, u32 *w2, u32 *w3, const u32 pw_len, KER } } -DECLSPEC void m11100s (u32 *w0, u32 *w1, u32 *w2, u32 *w3, const u32 pw_len, KERN_ATTR_BASIC (), __local u32 *l_bin2asc) +DECLSPEC void m11100s (u32 *w0, u32 *w1, u32 *w2, u32 *w3, const u32 pw_len, KERN_ATTR_BASIC (), LOCAL_AS u32 *l_bin2asc) { /** * modifier @@ -650,7 +650,7 @@ DECLSPEC void m11100s (u32 *w0, u32 *w1, u32 *w2, u32 *w3, const u32 pw_len, KER } } -__kernel void m11100_m04 (KERN_ATTR_BASIC ()) +KERNEL_FQ void m11100_m04 (KERN_ATTR_BASIC ()) { /** * base @@ -664,7 +664,7 @@ __kernel void m11100_m04 (KERN_ATTR_BASIC ()) * bin2asc table */ - __local u32 l_bin2asc[256]; + LOCAL_AS u32 l_bin2asc[256]; for (u32 i = lid; i < 256; i += lsz) { @@ -720,7 +720,7 @@ __kernel void m11100_m04 (KERN_ATTR_BASIC ()) m11100m (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_extra0_buf, d_extra1_buf, d_extra2_buf, d_extra3_buf, bitmap_mask, bitmap_shift1, bitmap_shift2, salt_pos, loop_pos, loop_cnt, il_cnt, digests_cnt, digests_offset, combs_mode, gid_max, l_bin2asc); } -__kernel void m11100_m08 (KERN_ATTR_BASIC ()) +KERNEL_FQ void m11100_m08 (KERN_ATTR_BASIC ()) { /** * base @@ -734,7 +734,7 @@ __kernel void m11100_m08 (KERN_ATTR_BASIC ()) * bin2asc table */ - __local u32 l_bin2asc[256]; + LOCAL_AS u32 l_bin2asc[256]; for (u32 i = lid; i < 256; i += lsz) { @@ -790,7 +790,7 @@ __kernel void m11100_m08 (KERN_ATTR_BASIC ()) m11100m (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_extra0_buf, d_extra1_buf, d_extra2_buf, d_extra3_buf, bitmap_mask, bitmap_shift1, bitmap_shift2, salt_pos, loop_pos, loop_cnt, il_cnt, digests_cnt, digests_offset, combs_mode, gid_max, l_bin2asc); } -__kernel void m11100_m16 (KERN_ATTR_BASIC ()) +KERNEL_FQ void m11100_m16 (KERN_ATTR_BASIC ()) { /** * base @@ -804,7 +804,7 @@ __kernel void m11100_m16 (KERN_ATTR_BASIC ()) * bin2asc table */ - __local u32 l_bin2asc[256]; + LOCAL_AS u32 l_bin2asc[256]; for (u32 i = lid; i < 256; i += lsz) { @@ -860,7 +860,7 @@ __kernel void m11100_m16 (KERN_ATTR_BASIC ()) m11100m (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_extra0_buf, d_extra1_buf, d_extra2_buf, d_extra3_buf, bitmap_mask, bitmap_shift1, bitmap_shift2, salt_pos, loop_pos, loop_cnt, il_cnt, digests_cnt, digests_offset, combs_mode, gid_max, l_bin2asc); } -__kernel void m11100_s04 (KERN_ATTR_BASIC ()) +KERNEL_FQ void m11100_s04 (KERN_ATTR_BASIC ()) { /** * base @@ -874,7 +874,7 @@ __kernel void m11100_s04 (KERN_ATTR_BASIC ()) * bin2asc table */ - __local u32 l_bin2asc[256]; + LOCAL_AS u32 l_bin2asc[256]; for (u32 i = lid; i < 256; i += lsz) { @@ -930,7 +930,7 @@ __kernel void m11100_s04 (KERN_ATTR_BASIC ()) m11100s (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_extra0_buf, d_extra1_buf, d_extra2_buf, d_extra3_buf, bitmap_mask, bitmap_shift1, bitmap_shift2, salt_pos, loop_pos, loop_cnt, il_cnt, digests_cnt, digests_offset, combs_mode, gid_max, l_bin2asc); } -__kernel void m11100_s08 (KERN_ATTR_BASIC ()) +KERNEL_FQ void m11100_s08 (KERN_ATTR_BASIC ()) { /** * base @@ -944,7 +944,7 @@ __kernel void m11100_s08 (KERN_ATTR_BASIC ()) * bin2asc table */ - __local u32 l_bin2asc[256]; + LOCAL_AS u32 l_bin2asc[256]; for (u32 i = lid; i < 256; i += lsz) { @@ -1000,7 +1000,7 @@ __kernel void m11100_s08 (KERN_ATTR_BASIC ()) m11100s (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_extra0_buf, d_extra1_buf, d_extra2_buf, d_extra3_buf, bitmap_mask, bitmap_shift1, bitmap_shift2, salt_pos, loop_pos, loop_cnt, il_cnt, digests_cnt, digests_offset, combs_mode, gid_max, l_bin2asc); } -__kernel void m11100_s16 (KERN_ATTR_BASIC ()) +KERNEL_FQ void m11100_s16 (KERN_ATTR_BASIC ()) { /** * base @@ -1014,7 +1014,7 @@ __kernel void m11100_s16 (KERN_ATTR_BASIC ()) * bin2asc table */ - __local u32 l_bin2asc[256]; + LOCAL_AS u32 l_bin2asc[256]; for (u32 i = lid; i < 256; i += lsz) { diff --git a/OpenCL/m11100_a3-pure.cl b/OpenCL/m11100_a3-pure.cl index b9e0c931e..5835990cd 100644 --- a/OpenCL/m11100_a3-pure.cl +++ b/OpenCL/m11100_a3-pure.cl @@ -25,7 +25,7 @@ #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 m11100_mxx (KERN_ATTR_VECTOR ()) +KERNEL_FQ void m11100_mxx (KERN_ATTR_VECTOR ()) { /** * modifier @@ -39,7 +39,7 @@ __kernel void m11100_mxx (KERN_ATTR_VECTOR ()) * bin2asc table */ - __local u32 l_bin2asc[256]; + LOCAL_AS u32 l_bin2asc[256]; for (u32 i = lid; i < 256; i += lsz) { @@ -212,7 +212,7 @@ __kernel void m11100_mxx (KERN_ATTR_VECTOR ()) } } -__kernel void m11100_sxx (KERN_ATTR_VECTOR ()) +KERNEL_FQ void m11100_sxx (KERN_ATTR_VECTOR ()) { /** * modifier @@ -226,7 +226,7 @@ __kernel void m11100_sxx (KERN_ATTR_VECTOR ()) * bin2asc table */ - __local u32 l_bin2asc[256]; + LOCAL_AS u32 l_bin2asc[256]; for (u32 i = lid; i < 256; i += lsz) { diff --git a/OpenCL/m11200_a0-optimized.cl b/OpenCL/m11200_a0-optimized.cl index 6f7bd60d0..b38a75dd4 100644 --- a/OpenCL/m11200_a0-optimized.cl +++ b/OpenCL/m11200_a0-optimized.cl @@ -15,7 +15,7 @@ #include "inc_hash_sha1.cl" #endif -__kernel void m11200_m04 (KERN_ATTR_RULES ()) +KERNEL_FQ void m11200_m04 (KERN_ATTR_RULES ()) { /** * modifier @@ -469,15 +469,15 @@ __kernel void m11200_m04 (KERN_ATTR_RULES ()) } } -__kernel void m11200_m08 (KERN_ATTR_RULES ()) +KERNEL_FQ void m11200_m08 (KERN_ATTR_RULES ()) { } -__kernel void m11200_m16 (KERN_ATTR_RULES ()) +KERNEL_FQ void m11200_m16 (KERN_ATTR_RULES ()) { } -__kernel void m11200_s04 (KERN_ATTR_RULES ()) +KERNEL_FQ void m11200_s04 (KERN_ATTR_RULES ()) { /** * modifier @@ -943,10 +943,10 @@ __kernel void m11200_s04 (KERN_ATTR_RULES ()) } } -__kernel void m11200_s08 (KERN_ATTR_RULES ()) +KERNEL_FQ void m11200_s08 (KERN_ATTR_RULES ()) { } -__kernel void m11200_s16 (KERN_ATTR_RULES ()) +KERNEL_FQ void m11200_s16 (KERN_ATTR_RULES ()) { } diff --git a/OpenCL/m11200_a0-pure.cl b/OpenCL/m11200_a0-pure.cl index 273351b3e..71e247607 100644 --- a/OpenCL/m11200_a0-pure.cl +++ b/OpenCL/m11200_a0-pure.cl @@ -15,7 +15,7 @@ #include "inc_hash_sha1.cl" #endif -__kernel void m11200_mxx (KERN_ATTR_RULES ()) +KERNEL_FQ void m11200_mxx (KERN_ATTR_RULES ()) { /** * modifier @@ -131,7 +131,7 @@ __kernel void m11200_mxx (KERN_ATTR_RULES ()) } } -__kernel void m11200_sxx (KERN_ATTR_RULES ()) +KERNEL_FQ void m11200_sxx (KERN_ATTR_RULES ()) { /** * modifier diff --git a/OpenCL/m11200_a1-optimized.cl b/OpenCL/m11200_a1-optimized.cl index 9d5dd59f7..66cfb4905 100644 --- a/OpenCL/m11200_a1-optimized.cl +++ b/OpenCL/m11200_a1-optimized.cl @@ -13,7 +13,7 @@ #include "inc_hash_sha1.cl" #endif -__kernel void m11200_m04 (KERN_ATTR_BASIC ()) +KERNEL_FQ void m11200_m04 (KERN_ATTR_BASIC ()) { /** * modifier @@ -525,15 +525,15 @@ __kernel void m11200_m04 (KERN_ATTR_BASIC ()) } } -__kernel void m11200_m08 (KERN_ATTR_BASIC ()) +KERNEL_FQ void m11200_m08 (KERN_ATTR_BASIC ()) { } -__kernel void m11200_m16 (KERN_ATTR_BASIC ()) +KERNEL_FQ void m11200_m16 (KERN_ATTR_BASIC ()) { } -__kernel void m11200_s04 (KERN_ATTR_BASIC ()) +KERNEL_FQ void m11200_s04 (KERN_ATTR_BASIC ()) { /** * modifier @@ -1057,10 +1057,10 @@ __kernel void m11200_s04 (KERN_ATTR_BASIC ()) } } -__kernel void m11200_s08 (KERN_ATTR_BASIC ()) +KERNEL_FQ void m11200_s08 (KERN_ATTR_BASIC ()) { } -__kernel void m11200_s16 (KERN_ATTR_BASIC ()) +KERNEL_FQ void m11200_s16 (KERN_ATTR_BASIC ()) { } diff --git a/OpenCL/m11200_a1-pure.cl b/OpenCL/m11200_a1-pure.cl index 520e5071a..12ac6b1ff 100644 --- a/OpenCL/m11200_a1-pure.cl +++ b/OpenCL/m11200_a1-pure.cl @@ -13,7 +13,7 @@ #include "inc_hash_sha1.cl" #endif -__kernel void m11200_mxx (KERN_ATTR_BASIC ()) +KERNEL_FQ void m11200_mxx (KERN_ATTR_BASIC ()) { /** * modifier @@ -127,7 +127,7 @@ __kernel void m11200_mxx (KERN_ATTR_BASIC ()) } } -__kernel void m11200_sxx (KERN_ATTR_BASIC ()) +KERNEL_FQ void m11200_sxx (KERN_ATTR_BASIC ()) { /** * modifier diff --git a/OpenCL/m11200_a3-optimized.cl b/OpenCL/m11200_a3-optimized.cl index e5ac0c38f..18a6eea37 100644 --- a/OpenCL/m11200_a3-optimized.cl +++ b/OpenCL/m11200_a3-optimized.cl @@ -885,7 +885,7 @@ DECLSPEC void m11200s (u32 *w0, u32 *w1, u32 *w2, u32 *w3, const u32 pw_len, KER } } -__kernel void m11200_m04 (KERN_ATTR_BASIC ()) +KERNEL_FQ void m11200_m04 (KERN_ATTR_BASIC ()) { /** * base @@ -936,7 +936,7 @@ __kernel void m11200_m04 (KERN_ATTR_BASIC ()) m11200m (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_extra0_buf, d_extra1_buf, d_extra2_buf, d_extra3_buf, bitmap_mask, bitmap_shift1, bitmap_shift2, salt_pos, loop_pos, loop_cnt, il_cnt, digests_cnt, digests_offset, combs_mode, gid_max); } -__kernel void m11200_m08 (KERN_ATTR_BASIC ()) +KERNEL_FQ void m11200_m08 (KERN_ATTR_BASIC ()) { /** * base @@ -987,7 +987,7 @@ __kernel void m11200_m08 (KERN_ATTR_BASIC ()) m11200m (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_extra0_buf, d_extra1_buf, d_extra2_buf, d_extra3_buf, bitmap_mask, bitmap_shift1, bitmap_shift2, salt_pos, loop_pos, loop_cnt, il_cnt, digests_cnt, digests_offset, combs_mode, gid_max); } -__kernel void m11200_m16 (KERN_ATTR_BASIC ()) +KERNEL_FQ void m11200_m16 (KERN_ATTR_BASIC ()) { /** * base @@ -1038,7 +1038,7 @@ __kernel void m11200_m16 (KERN_ATTR_BASIC ()) m11200m (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_extra0_buf, d_extra1_buf, d_extra2_buf, d_extra3_buf, bitmap_mask, bitmap_shift1, bitmap_shift2, salt_pos, loop_pos, loop_cnt, il_cnt, digests_cnt, digests_offset, combs_mode, gid_max); } -__kernel void m11200_s04 (KERN_ATTR_BASIC ()) +KERNEL_FQ void m11200_s04 (KERN_ATTR_BASIC ()) { /** * base @@ -1089,7 +1089,7 @@ __kernel void m11200_s04 (KERN_ATTR_BASIC ()) m11200s (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_extra0_buf, d_extra1_buf, d_extra2_buf, d_extra3_buf, bitmap_mask, bitmap_shift1, bitmap_shift2, salt_pos, loop_pos, loop_cnt, il_cnt, digests_cnt, digests_offset, combs_mode, gid_max); } -__kernel void m11200_s08 (KERN_ATTR_BASIC ()) +KERNEL_FQ void m11200_s08 (KERN_ATTR_BASIC ()) { /** * base @@ -1140,7 +1140,7 @@ __kernel void m11200_s08 (KERN_ATTR_BASIC ()) m11200s (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_extra0_buf, d_extra1_buf, d_extra2_buf, d_extra3_buf, bitmap_mask, bitmap_shift1, bitmap_shift2, salt_pos, loop_pos, loop_cnt, il_cnt, digests_cnt, digests_offset, combs_mode, gid_max); } -__kernel void m11200_s16 (KERN_ATTR_BASIC ()) +KERNEL_FQ void m11200_s16 (KERN_ATTR_BASIC ()) { /** * base diff --git a/OpenCL/m11200_a3-pure.cl b/OpenCL/m11200_a3-pure.cl index 4cccad9de..b4c321c18 100644 --- a/OpenCL/m11200_a3-pure.cl +++ b/OpenCL/m11200_a3-pure.cl @@ -25,7 +25,7 @@ #define uint_to_hex_lower8_le(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 m11200_mxx (KERN_ATTR_VECTOR ()) +KERNEL_FQ void m11200_mxx (KERN_ATTR_VECTOR ()) { /** * modifier @@ -154,7 +154,7 @@ __kernel void m11200_mxx (KERN_ATTR_VECTOR ()) } } -__kernel void m11200_sxx (KERN_ATTR_VECTOR ()) +KERNEL_FQ void m11200_sxx (KERN_ATTR_VECTOR ()) { /** * modifier diff --git a/OpenCL/m11300-pure.cl b/OpenCL/m11300-pure.cl index 85780ceac..29bbb5abe 100644 --- a/OpenCL/m11300-pure.cl +++ b/OpenCL/m11300-pure.cl @@ -85,7 +85,7 @@ DECLSPEC void hmac_sha512_run_V (u32x *w0, u32x *w1, u32x *w2, u32x *w3, u32x *w sha512_transform_vector (w0, w1, w2, w3, w4, w5, w6, w7, digest); } -__kernel void m11300_init (KERN_ATTR_TMPS_ESALT (bitcoin_wallet_tmp_t, bitcoin_wallet_t)) +KERNEL_FQ void m11300_init (KERN_ATTR_TMPS_ESALT (bitcoin_wallet_tmp_t, bitcoin_wallet_t)) { /** * base @@ -115,7 +115,7 @@ __kernel void m11300_init (KERN_ATTR_TMPS_ESALT (bitcoin_wallet_tmp_t, bitcoin_w tmps[gid].dgst[7] = ctx.h[7]; } -__kernel void m11300_loop (KERN_ATTR_TMPS_ESALT (bitcoin_wallet_tmp_t, bitcoin_wallet_t)) +KERNEL_FQ void m11300_loop (KERN_ATTR_TMPS_ESALT (bitcoin_wallet_tmp_t, bitcoin_wallet_t)) { const u64 gid = get_global_id (0); @@ -224,7 +224,7 @@ __kernel void m11300_loop (KERN_ATTR_TMPS_ESALT (bitcoin_wallet_tmp_t, bitcoin_w unpack64v (tmps, dgst, gid, 7, t7); } -__kernel void m11300_comp (KERN_ATTR_TMPS_ESALT (bitcoin_wallet_tmp_t, bitcoin_wallet_t)) +KERNEL_FQ void m11300_comp (KERN_ATTR_TMPS_ESALT (bitcoin_wallet_tmp_t, bitcoin_wallet_t)) { const u64 gid = get_global_id (0); const u64 lid = get_local_id (0); @@ -236,17 +236,17 @@ __kernel void m11300_comp (KERN_ATTR_TMPS_ESALT (bitcoin_wallet_tmp_t, bitcoin_w #ifdef REAL_SHM - __local u32 s_td0[256]; - __local u32 s_td1[256]; - __local u32 s_td2[256]; - __local u32 s_td3[256]; - __local u32 s_td4[256]; + LOCAL_AS u32 s_td0[256]; + LOCAL_AS u32 s_td1[256]; + LOCAL_AS u32 s_td2[256]; + LOCAL_AS u32 s_td3[256]; + LOCAL_AS u32 s_td4[256]; - __local u32 s_te0[256]; - __local u32 s_te1[256]; - __local u32 s_te2[256]; - __local u32 s_te3[256]; - __local u32 s_te4[256]; + LOCAL_AS u32 s_te0[256]; + LOCAL_AS u32 s_te1[256]; + LOCAL_AS u32 s_te2[256]; + LOCAL_AS u32 s_te3[256]; + LOCAL_AS u32 s_te4[256]; for (u32 i = lid; i < 256; i += lsz) { @@ -267,17 +267,17 @@ __kernel void m11300_comp (KERN_ATTR_TMPS_ESALT (bitcoin_wallet_tmp_t, bitcoin_w #else - __constant u32a *s_td0 = td0; - __constant u32a *s_td1 = td1; - __constant u32a *s_td2 = td2; - __constant u32a *s_td3 = td3; - __constant u32a *s_td4 = td4; + CONSTANT_AS u32a *s_td0 = td0; + CONSTANT_AS u32a *s_td1 = td1; + CONSTANT_AS u32a *s_td2 = td2; + CONSTANT_AS u32a *s_td3 = td3; + CONSTANT_AS u32a *s_td4 = td4; - __constant u32a *s_te0 = te0; - __constant u32a *s_te1 = te1; - __constant u32a *s_te2 = te2; - __constant u32a *s_te3 = te3; - __constant u32a *s_te4 = te4; + CONSTANT_AS u32a *s_te0 = te0; + CONSTANT_AS u32a *s_te1 = te1; + CONSTANT_AS u32a *s_te2 = te2; + CONSTANT_AS u32a *s_te3 = te3; + CONSTANT_AS u32a *s_te4 = te4; #endif diff --git a/OpenCL/m11400_a0-pure.cl b/OpenCL/m11400_a0-pure.cl index 9d9505c1c..28d917d9e 100644 --- a/OpenCL/m11400_a0-pure.cl +++ b/OpenCL/m11400_a0-pure.cl @@ -37,7 +37,7 @@ typedef struct sip #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 m11400_mxx (KERN_ATTR_RULES_ESALT (sip_t)) +KERNEL_FQ void m11400_mxx (KERN_ATTR_RULES_ESALT (sip_t)) { /** * modifier @@ -51,7 +51,7 @@ __kernel void m11400_mxx (KERN_ATTR_RULES_ESALT (sip_t)) * bin2asc table */ - __local u32 l_bin2asc[256]; + LOCAL_AS u32 l_bin2asc[256]; for (u32 i = lid; i < 256; i += lsz) { @@ -135,7 +135,7 @@ __kernel void m11400_mxx (KERN_ATTR_RULES_ESALT (sip_t)) } } -__kernel void m11400_sxx (KERN_ATTR_RULES_ESALT (sip_t)) +KERNEL_FQ void m11400_sxx (KERN_ATTR_RULES_ESALT (sip_t)) { /** * modifier @@ -149,7 +149,7 @@ __kernel void m11400_sxx (KERN_ATTR_RULES_ESALT (sip_t)) * bin2asc table */ - __local u32 l_bin2asc[256]; + LOCAL_AS u32 l_bin2asc[256]; for (u32 i = lid; i < 256; i += lsz) { diff --git a/OpenCL/m11400_a1-pure.cl b/OpenCL/m11400_a1-pure.cl index 7674b62cc..92ac1c8fd 100644 --- a/OpenCL/m11400_a1-pure.cl +++ b/OpenCL/m11400_a1-pure.cl @@ -35,7 +35,7 @@ typedef struct sip #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 m11400_mxx (KERN_ATTR_ESALT (sip_t)) +KERNEL_FQ void m11400_mxx (KERN_ATTR_ESALT (sip_t)) { /** * modifier @@ -49,7 +49,7 @@ __kernel void m11400_mxx (KERN_ATTR_ESALT (sip_t)) * bin2asc table */ - __local u32 l_bin2asc[256]; + LOCAL_AS u32 l_bin2asc[256]; for (u32 i = lid; i < 256; i += lsz) { @@ -129,7 +129,7 @@ __kernel void m11400_mxx (KERN_ATTR_ESALT (sip_t)) } } -__kernel void m11400_sxx (KERN_ATTR_ESALT (sip_t)) +KERNEL_FQ void m11400_sxx (KERN_ATTR_ESALT (sip_t)) { /** * modifier @@ -143,7 +143,7 @@ __kernel void m11400_sxx (KERN_ATTR_ESALT (sip_t)) * bin2asc table */ - __local u32 l_bin2asc[256]; + LOCAL_AS u32 l_bin2asc[256]; for (u32 i = lid; i < 256; i += lsz) { diff --git a/OpenCL/m11400_a3-pure.cl b/OpenCL/m11400_a3-pure.cl index 2ed0eac80..809181cea 100644 --- a/OpenCL/m11400_a3-pure.cl +++ b/OpenCL/m11400_a3-pure.cl @@ -35,7 +35,7 @@ typedef struct sip #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 m11400_mxx (KERN_ATTR_VECTOR_ESALT (sip_t)) +KERNEL_FQ void m11400_mxx (KERN_ATTR_VECTOR_ESALT (sip_t)) { /** * modifier @@ -49,7 +49,7 @@ __kernel void m11400_mxx (KERN_ATTR_VECTOR_ESALT (sip_t)) * bin2asc table */ - __local u32 l_bin2asc[256]; + LOCAL_AS u32 l_bin2asc[256]; for (u32 i = lid; i < 256; i += lsz) { @@ -155,7 +155,7 @@ __kernel void m11400_mxx (KERN_ATTR_VECTOR_ESALT (sip_t)) } } -__kernel void m11400_sxx (KERN_ATTR_VECTOR_ESALT (sip_t)) +KERNEL_FQ void m11400_sxx (KERN_ATTR_VECTOR_ESALT (sip_t)) { /** * modifier @@ -169,7 +169,7 @@ __kernel void m11400_sxx (KERN_ATTR_VECTOR_ESALT (sip_t)) * bin2asc table */ - __local u32 l_bin2asc[256]; + LOCAL_AS u32 l_bin2asc[256]; for (u32 i = lid; i < 256; i += lsz) { diff --git a/OpenCL/m11500_a0-optimized.cl b/OpenCL/m11500_a0-optimized.cl index 1300781f7..ca35a931c 100644 --- a/OpenCL/m11500_a0-optimized.cl +++ b/OpenCL/m11500_a0-optimized.cl @@ -15,7 +15,7 @@ #include "inc_simd.cl" #endif -__constant u32a crc32tab[0x100] = +CONSTANT_AS u32a crc32tab[0x100] = { 0x00000000, 0x77073096, 0xee0e612c, 0x990951ba, 0x076dc419, 0x706af48f, 0xe963a535, 0x9e6495a3, @@ -126,7 +126,7 @@ DECLSPEC u32x crc32 (const u32x *w, const u32 pw_len, const u32 iv) return ~a; } -__kernel void m11500_m04 (KERN_ATTR_RULES ()) +KERNEL_FQ void m11500_m04 (KERN_ATTR_RULES ()) { /** * modifier @@ -206,15 +206,15 @@ __kernel void m11500_m04 (KERN_ATTR_RULES ()) } } -__kernel void m11500_m08 (KERN_ATTR_RULES ()) +KERNEL_FQ void m11500_m08 (KERN_ATTR_RULES ()) { } -__kernel void m11500_m16 (KERN_ATTR_RULES ()) +KERNEL_FQ void m11500_m16 (KERN_ATTR_RULES ()) { } -__kernel void m11500_s04 (KERN_ATTR_RULES ()) +KERNEL_FQ void m11500_s04 (KERN_ATTR_RULES ()) { /** * modifier @@ -306,10 +306,10 @@ __kernel void m11500_s04 (KERN_ATTR_RULES ()) } } -__kernel void m11500_s08 (KERN_ATTR_RULES ()) +KERNEL_FQ void m11500_s08 (KERN_ATTR_RULES ()) { } -__kernel void m11500_s16 (KERN_ATTR_RULES ()) +KERNEL_FQ void m11500_s16 (KERN_ATTR_RULES ()) { } diff --git a/OpenCL/m11500_a1-optimized.cl b/OpenCL/m11500_a1-optimized.cl index 8d15bb809..bede0d4f1 100644 --- a/OpenCL/m11500_a1-optimized.cl +++ b/OpenCL/m11500_a1-optimized.cl @@ -13,7 +13,7 @@ #include "inc_simd.cl" #endif -__constant u32a crc32tab[0x100] = +CONSTANT_AS u32a crc32tab[0x100] = { 0x00000000, 0x77073096, 0xee0e612c, 0x990951ba, 0x076dc419, 0x706af48f, 0xe963a535, 0x9e6495a3, @@ -124,7 +124,7 @@ DECLSPEC u32x crc32 (const u32x *w, const u32 pw_len, const u32 iv) return ~a; } -__kernel void m11500_m04 (KERN_ATTR_BASIC ()) +KERNEL_FQ void m11500_m04 (KERN_ATTR_BASIC ()) { /** * modifier @@ -264,15 +264,15 @@ __kernel void m11500_m04 (KERN_ATTR_BASIC ()) } } -__kernel void m11500_m08 (KERN_ATTR_BASIC ()) +KERNEL_FQ void m11500_m08 (KERN_ATTR_BASIC ()) { } -__kernel void m11500_m16 (KERN_ATTR_BASIC ()) +KERNEL_FQ void m11500_m16 (KERN_ATTR_BASIC ()) { } -__kernel void m11500_s04 (KERN_ATTR_BASIC ()) +KERNEL_FQ void m11500_s04 (KERN_ATTR_BASIC ()) { /** * modifier @@ -424,10 +424,10 @@ __kernel void m11500_s04 (KERN_ATTR_BASIC ()) } } -__kernel void m11500_s08 (KERN_ATTR_BASIC ()) +KERNEL_FQ void m11500_s08 (KERN_ATTR_BASIC ()) { } -__kernel void m11500_s16 (KERN_ATTR_BASIC ()) +KERNEL_FQ void m11500_s16 (KERN_ATTR_BASIC ()) { } diff --git a/OpenCL/m11500_a3-optimized.cl b/OpenCL/m11500_a3-optimized.cl index 2074d2e9f..70af7777a 100644 --- a/OpenCL/m11500_a3-optimized.cl +++ b/OpenCL/m11500_a3-optimized.cl @@ -13,7 +13,7 @@ #include "inc_simd.cl" #endif -__constant u32a crc32tab[0x100] = +CONSTANT_AS u32a crc32tab[0x100] = { 0x00000000, 0x77073096, 0xee0e612c, 0x990951ba, 0x076dc419, 0x706af48f, 0xe963a535, 0x9e6495a3, @@ -252,7 +252,7 @@ DECLSPEC void m11500s (u32 *w, const u32 pw_len, KERN_ATTR_BASIC ()) } } -__kernel void m11500_m04 (KERN_ATTR_BASIC ()) +KERNEL_FQ void m11500_m04 (KERN_ATTR_BASIC ()) { /** * base @@ -290,7 +290,7 @@ __kernel void m11500_m04 (KERN_ATTR_BASIC ()) m11500m (w, 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_extra0_buf, d_extra1_buf, d_extra2_buf, d_extra3_buf, bitmap_mask, bitmap_shift1, bitmap_shift2, salt_pos, loop_pos, loop_cnt, il_cnt, digests_cnt, digests_offset, combs_mode, gid_max); } -__kernel void m11500_m08 (KERN_ATTR_BASIC ()) +KERNEL_FQ void m11500_m08 (KERN_ATTR_BASIC ()) { /** * base @@ -328,7 +328,7 @@ __kernel void m11500_m08 (KERN_ATTR_BASIC ()) m11500m (w, 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_extra0_buf, d_extra1_buf, d_extra2_buf, d_extra3_buf, bitmap_mask, bitmap_shift1, bitmap_shift2, salt_pos, loop_pos, loop_cnt, il_cnt, digests_cnt, digests_offset, combs_mode, gid_max); } -__kernel void m11500_m16 (KERN_ATTR_BASIC ()) +KERNEL_FQ void m11500_m16 (KERN_ATTR_BASIC ()) { /** * base @@ -366,7 +366,7 @@ __kernel void m11500_m16 (KERN_ATTR_BASIC ()) m11500m (w, 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_extra0_buf, d_extra1_buf, d_extra2_buf, d_extra3_buf, bitmap_mask, bitmap_shift1, bitmap_shift2, salt_pos, loop_pos, loop_cnt, il_cnt, digests_cnt, digests_offset, combs_mode, gid_max); } -__kernel void m11500_s04 (KERN_ATTR_BASIC ()) +KERNEL_FQ void m11500_s04 (KERN_ATTR_BASIC ()) { /** * base @@ -404,7 +404,7 @@ __kernel void m11500_s04 (KERN_ATTR_BASIC ()) m11500s (w, 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_extra0_buf, d_extra1_buf, d_extra2_buf, d_extra3_buf, bitmap_mask, bitmap_shift1, bitmap_shift2, salt_pos, loop_pos, loop_cnt, il_cnt, digests_cnt, digests_offset, combs_mode, gid_max); } -__kernel void m11500_s08 (KERN_ATTR_BASIC ()) +KERNEL_FQ void m11500_s08 (KERN_ATTR_BASIC ()) { /** * base @@ -442,7 +442,7 @@ __kernel void m11500_s08 (KERN_ATTR_BASIC ()) m11500s (w, 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_extra0_buf, d_extra1_buf, d_extra2_buf, d_extra3_buf, bitmap_mask, bitmap_shift1, bitmap_shift2, salt_pos, loop_pos, loop_cnt, il_cnt, digests_cnt, digests_offset, combs_mode, gid_max); } -__kernel void m11500_s16 (KERN_ATTR_BASIC ()) +KERNEL_FQ void m11500_s16 (KERN_ATTR_BASIC ()) { /** * base diff --git a/OpenCL/m11600-pure.cl b/OpenCL/m11600-pure.cl index 364798993..610b86687 100644 --- a/OpenCL/m11600-pure.cl +++ b/OpenCL/m11600-pure.cl @@ -132,7 +132,7 @@ DECLSPEC void memcat8c_be (u32 *w0, u32 *w1, u32 *w2, u32 *w3, const u32 len, co } } -__kernel void m11600_init (KERN_ATTR_TMPS_HOOKS (seven_zip_tmp_t, seven_zip_hook_t)) +KERNEL_FQ void m11600_init (KERN_ATTR_TMPS_HOOKS (seven_zip_tmp_t, seven_zip_hook_t)) { /** * base @@ -179,7 +179,7 @@ __kernel void m11600_init (KERN_ATTR_TMPS_HOOKS (seven_zip_tmp_t, seven_zip_hook tmps[gid].len = ctx.len; } -__kernel void m11600_loop (KERN_ATTR_TMPS_HOOKS (seven_zip_tmp_t, seven_zip_hook_t)) +KERNEL_FQ void m11600_loop (KERN_ATTR_TMPS_HOOKS (seven_zip_tmp_t, seven_zip_hook_t)) { /** * base @@ -278,7 +278,7 @@ __kernel void m11600_loop (KERN_ATTR_TMPS_HOOKS (seven_zip_tmp_t, seven_zip_hook tmps[gid].len = ctx.len; } -__kernel void m11600_hook23 (KERN_ATTR_TMPS_HOOKS (seven_zip_tmp_t, seven_zip_hook_t)) +KERNEL_FQ void m11600_hook23 (KERN_ATTR_TMPS_HOOKS (seven_zip_tmp_t, seven_zip_hook_t)) { const u64 gid = get_global_id (0); const u64 lid = get_local_id (0); @@ -332,7 +332,7 @@ __kernel void m11600_hook23 (KERN_ATTR_TMPS_HOOKS (seven_zip_tmp_t, seven_zip_ho hooks[gid].ukey[7] = swap32_S (ctx.h[7]); } -__kernel void m11600_comp (KERN_ATTR_TMPS_HOOKS (seven_zip_tmp_t, seven_zip_hook_t)) +KERNEL_FQ void m11600_comp (KERN_ATTR_TMPS_HOOKS (seven_zip_tmp_t, seven_zip_hook_t)) { /** * base diff --git a/OpenCL/m11700_a0-optimized.cl b/OpenCL/m11700_a0-optimized.cl index ff09b0ac0..680256afd 100644 --- a/OpenCL/m11700_a0-optimized.cl +++ b/OpenCL/m11700_a0-optimized.cl @@ -18,7 +18,7 @@ #define INITVAL 0x0101010101010101 -DECLSPEC void streebog_g (u64x *h, const u64x *m, __local u64 (*s_sbob_sl64)[256]) +DECLSPEC void streebog_g (u64x *h, const u64x *m, LOCAL_AS u64 (*s_sbob_sl64)[256]) { u64x k[8]; u64x s[8]; @@ -86,7 +86,7 @@ DECLSPEC void streebog_g (u64x *h, const u64x *m, __local u64 (*s_sbob_sl64)[256 } } -__kernel void m11700_m04 (KERN_ATTR_RULES ()) +KERNEL_FQ void m11700_m04 (KERN_ATTR_RULES ()) { /** * modifier @@ -100,7 +100,7 @@ __kernel void m11700_m04 (KERN_ATTR_RULES ()) * shared lookup table */ - __local u64 s_sbob_sl64[8][256]; + LOCAL_AS u64 s_sbob_sl64[8][256]; for (u32 i = lid; i < 256; i += lsz) { @@ -236,15 +236,15 @@ __kernel void m11700_m04 (KERN_ATTR_RULES ()) } } -__kernel void m11700_m08 (KERN_ATTR_RULES ()) +KERNEL_FQ void m11700_m08 (KERN_ATTR_RULES ()) { } -__kernel void m11700_m16 (KERN_ATTR_RULES ()) +KERNEL_FQ void m11700_m16 (KERN_ATTR_RULES ()) { } -__kernel void m11700_s04 (KERN_ATTR_RULES ()) +KERNEL_FQ void m11700_s04 (KERN_ATTR_RULES ()) { /** * modifier @@ -258,7 +258,7 @@ __kernel void m11700_s04 (KERN_ATTR_RULES ()) * shared lookup table */ - __local u64 s_sbob_sl64[8][256]; + LOCAL_AS u64 s_sbob_sl64[8][256]; for (u32 i = lid; i < 256; i += lsz) { @@ -406,10 +406,10 @@ __kernel void m11700_s04 (KERN_ATTR_RULES ()) } } -__kernel void m11700_s08 (KERN_ATTR_RULES ()) +KERNEL_FQ void m11700_s08 (KERN_ATTR_RULES ()) { } -__kernel void m11700_s16 (KERN_ATTR_RULES ()) +KERNEL_FQ void m11700_s16 (KERN_ATTR_RULES ()) { } diff --git a/OpenCL/m11700_a0-pure.cl b/OpenCL/m11700_a0-pure.cl index 6ccb7a607..f5e4c187b 100644 --- a/OpenCL/m11700_a0-pure.cl +++ b/OpenCL/m11700_a0-pure.cl @@ -15,7 +15,7 @@ #include "inc_hash_streebog256.cl" #endif -__kernel void m11700_mxx (KERN_ATTR_RULES ()) +KERNEL_FQ void m11700_mxx (KERN_ATTR_RULES ()) { /** * modifier @@ -31,7 +31,7 @@ __kernel void m11700_mxx (KERN_ATTR_RULES ()) #ifdef REAL_SHM - __local u64a s_sbob_sl64[8][256]; + LOCAL_AS u64a s_sbob_sl64[8][256]; for (u32 i = lid; i < 256; i += lsz) { @@ -49,7 +49,7 @@ __kernel void m11700_mxx (KERN_ATTR_RULES ()) #else - __constant u64a (*s_sbob_sl64)[256] = sbob_sl64; + CONSTANT_AS u64a (*s_sbob_sl64)[256] = sbob_sl64; #endif @@ -88,7 +88,7 @@ __kernel void m11700_mxx (KERN_ATTR_RULES ()) } } -__kernel void m11700_sxx (KERN_ATTR_RULES ()) +KERNEL_FQ void m11700_sxx (KERN_ATTR_RULES ()) { /** * modifier @@ -104,7 +104,7 @@ __kernel void m11700_sxx (KERN_ATTR_RULES ()) #ifdef REAL_SHM - __local u64a s_sbob_sl64[8][256]; + LOCAL_AS u64a s_sbob_sl64[8][256]; for (u32 i = lid; i < 256; i += lsz) { @@ -122,7 +122,7 @@ __kernel void m11700_sxx (KERN_ATTR_RULES ()) #else - __constant u64a (*s_sbob_sl64)[256] = sbob_sl64; + CONSTANT_AS u64a (*s_sbob_sl64)[256] = sbob_sl64; #endif diff --git a/OpenCL/m11700_a1-optimized.cl b/OpenCL/m11700_a1-optimized.cl index e61aaf51e..759a4384c 100644 --- a/OpenCL/m11700_a1-optimized.cl +++ b/OpenCL/m11700_a1-optimized.cl @@ -16,7 +16,7 @@ #define INITVAL 0x0101010101010101 -DECLSPEC void streebog_g (u64x *h, const u64x *m, __local u64 (*s_sbob_sl64)[256]) +DECLSPEC void streebog_g (u64x *h, const u64x *m, LOCAL_AS u64 (*s_sbob_sl64)[256]) { u64x k[8]; u64x s[8]; @@ -84,7 +84,7 @@ DECLSPEC void streebog_g (u64x *h, const u64x *m, __local u64 (*s_sbob_sl64)[256 } } -__kernel void m11700_m04 (KERN_ATTR_BASIC ()) +KERNEL_FQ void m11700_m04 (KERN_ATTR_BASIC ()) { /** * modifier @@ -98,7 +98,7 @@ __kernel void m11700_m04 (KERN_ATTR_BASIC ()) * shared lookup table */ - __local u64 s_sbob_sl64[8][256]; + LOCAL_AS u64 s_sbob_sl64[8][256]; for (u32 i = lid; i < 256; i += lsz) { @@ -292,15 +292,15 @@ __kernel void m11700_m04 (KERN_ATTR_BASIC ()) } } -__kernel void m11700_m08 (KERN_ATTR_BASIC ()) +KERNEL_FQ void m11700_m08 (KERN_ATTR_BASIC ()) { } -__kernel void m11700_m16 (KERN_ATTR_BASIC ()) +KERNEL_FQ void m11700_m16 (KERN_ATTR_BASIC ()) { } -__kernel void m11700_s04 (KERN_ATTR_BASIC ()) +KERNEL_FQ void m11700_s04 (KERN_ATTR_BASIC ()) { /** * modifier @@ -314,7 +314,7 @@ __kernel void m11700_s04 (KERN_ATTR_BASIC ()) * shared lookup table */ - __local u64 s_sbob_sl64[8][256]; + LOCAL_AS u64 s_sbob_sl64[8][256]; for (u32 i = lid; i < 256; i += lsz) { @@ -520,10 +520,10 @@ __kernel void m11700_s04 (KERN_ATTR_BASIC ()) } } -__kernel void m11700_s08 (KERN_ATTR_BASIC ()) +KERNEL_FQ void m11700_s08 (KERN_ATTR_BASIC ()) { } -__kernel void m11700_s16 (KERN_ATTR_BASIC ()) +KERNEL_FQ void m11700_s16 (KERN_ATTR_BASIC ()) { } diff --git a/OpenCL/m11700_a1-pure.cl b/OpenCL/m11700_a1-pure.cl index 6273dd821..589580e7f 100644 --- a/OpenCL/m11700_a1-pure.cl +++ b/OpenCL/m11700_a1-pure.cl @@ -13,7 +13,7 @@ #include "inc_hash_streebog256.cl" #endif -__kernel void m11700_mxx (KERN_ATTR_BASIC ()) +KERNEL_FQ void m11700_mxx (KERN_ATTR_BASIC ()) { /** * modifier @@ -29,7 +29,7 @@ __kernel void m11700_mxx (KERN_ATTR_BASIC ()) #ifdef REAL_SHM - __local u64a s_sbob_sl64[8][256]; + LOCAL_AS u64a s_sbob_sl64[8][256]; for (u32 i = lid; i < 256; i += lsz) { @@ -47,7 +47,7 @@ __kernel void m11700_mxx (KERN_ATTR_BASIC ()) #else - __constant u64a (*s_sbob_sl64)[256] = sbob_sl64; + CONSTANT_AS u64a (*s_sbob_sl64)[256] = sbob_sl64; #endif @@ -84,7 +84,7 @@ __kernel void m11700_mxx (KERN_ATTR_BASIC ()) } } -__kernel void m11700_sxx (KERN_ATTR_BASIC ()) +KERNEL_FQ void m11700_sxx (KERN_ATTR_BASIC ()) { /** * modifier @@ -100,7 +100,7 @@ __kernel void m11700_sxx (KERN_ATTR_BASIC ()) #ifdef REAL_SHM - __local u64a s_sbob_sl64[8][256]; + LOCAL_AS u64a s_sbob_sl64[8][256]; for (u32 i = lid; i < 256; i += lsz) { @@ -118,7 +118,7 @@ __kernel void m11700_sxx (KERN_ATTR_BASIC ()) #else - __constant u64a (*s_sbob_sl64)[256] = sbob_sl64; + CONSTANT_AS u64a (*s_sbob_sl64)[256] = sbob_sl64; #endif diff --git a/OpenCL/m11700_a3-optimized.cl b/OpenCL/m11700_a3-optimized.cl index 4d7137af0..b4d4a5b47 100644 --- a/OpenCL/m11700_a3-optimized.cl +++ b/OpenCL/m11700_a3-optimized.cl @@ -16,7 +16,7 @@ #define INITVAL 0x0101010101010101 -DECLSPEC void streebog_g (u64x *h, const u64x *m, __local u64 (*s_sbob_sl64)[256]) +DECLSPEC void streebog_g (u64x *h, const u64x *m, LOCAL_AS u64 (*s_sbob_sl64)[256]) { u64x k[8]; u64x s[8]; @@ -75,7 +75,7 @@ DECLSPEC void streebog_g (u64x *h, const u64x *m, __local u64 (*s_sbob_sl64)[256 } } -DECLSPEC void m11700m (__local u64 (*s_sbob_sl64)[256], u32 *w, const u32 pw_len, KERN_ATTR_BASIC ()) +DECLSPEC void m11700m (LOCAL_AS u64 (*s_sbob_sl64)[256], u32 *w, const u32 pw_len, KERN_ATTR_BASIC ()) { /** * modifier @@ -158,7 +158,7 @@ DECLSPEC void m11700m (__local u64 (*s_sbob_sl64)[256], u32 *w, const u32 pw_len } } -DECLSPEC void m11700s (__local u64 (*s_sbob_sl64)[256], u32 *w, const u32 pw_len, KERN_ATTR_BASIC ()) +DECLSPEC void m11700s (LOCAL_AS u64 (*s_sbob_sl64)[256], u32 *w, const u32 pw_len, KERN_ATTR_BASIC ()) { /** * modifier @@ -253,7 +253,7 @@ DECLSPEC void m11700s (__local u64 (*s_sbob_sl64)[256], u32 *w, const u32 pw_len } } -__kernel void m11700_m04 (KERN_ATTR_BASIC ()) +KERNEL_FQ void m11700_m04 (KERN_ATTR_BASIC ()) { /** * modifier @@ -267,7 +267,7 @@ __kernel void m11700_m04 (KERN_ATTR_BASIC ()) * shared lookup table */ - __local u64 s_sbob_sl64[8][256]; + LOCAL_AS u64 s_sbob_sl64[8][256]; for (u32 i = lid; i < 256; i += lsz) { @@ -317,7 +317,7 @@ __kernel void m11700_m04 (KERN_ATTR_BASIC ()) m11700m (s_sbob_sl64, w, 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_extra0_buf, d_extra1_buf, d_extra2_buf, d_extra3_buf, bitmap_mask, bitmap_shift1, bitmap_shift2, salt_pos, loop_pos, loop_cnt, il_cnt, digests_cnt, digests_offset, combs_mode, gid_max); } -__kernel void m11700_m08 (KERN_ATTR_BASIC ()) +KERNEL_FQ void m11700_m08 (KERN_ATTR_BASIC ()) { /** * modifier @@ -331,7 +331,7 @@ __kernel void m11700_m08 (KERN_ATTR_BASIC ()) * shared lookup table */ - __local u64 s_sbob_sl64[8][256]; + LOCAL_AS u64 s_sbob_sl64[8][256]; for (u32 i = lid; i < 256; i += lsz) { @@ -381,7 +381,7 @@ __kernel void m11700_m08 (KERN_ATTR_BASIC ()) m11700m (s_sbob_sl64, w, 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_extra0_buf, d_extra1_buf, d_extra2_buf, d_extra3_buf, bitmap_mask, bitmap_shift1, bitmap_shift2, salt_pos, loop_pos, loop_cnt, il_cnt, digests_cnt, digests_offset, combs_mode, gid_max); } -__kernel void m11700_m16 (KERN_ATTR_BASIC ()) +KERNEL_FQ void m11700_m16 (KERN_ATTR_BASIC ()) { /** * modifier @@ -395,7 +395,7 @@ __kernel void m11700_m16 (KERN_ATTR_BASIC ()) * shared lookup table */ - __local u64 s_sbob_sl64[8][256]; + LOCAL_AS u64 s_sbob_sl64[8][256]; for (u32 i = lid; i < 256; i += lsz) { @@ -445,7 +445,7 @@ __kernel void m11700_m16 (KERN_ATTR_BASIC ()) m11700m (s_sbob_sl64, w, 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_extra0_buf, d_extra1_buf, d_extra2_buf, d_extra3_buf, bitmap_mask, bitmap_shift1, bitmap_shift2, salt_pos, loop_pos, loop_cnt, il_cnt, digests_cnt, digests_offset, combs_mode, gid_max); } -__kernel void m11700_s04 (KERN_ATTR_BASIC ()) +KERNEL_FQ void m11700_s04 (KERN_ATTR_BASIC ()) { /** * modifier @@ -459,7 +459,7 @@ __kernel void m11700_s04 (KERN_ATTR_BASIC ()) * shared lookup table */ - __local u64 s_sbob_sl64[8][256]; + LOCAL_AS u64 s_sbob_sl64[8][256]; for (u32 i = lid; i < 256; i += lsz) { @@ -509,7 +509,7 @@ __kernel void m11700_s04 (KERN_ATTR_BASIC ()) m11700s (s_sbob_sl64, w, 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_extra0_buf, d_extra1_buf, d_extra2_buf, d_extra3_buf, bitmap_mask, bitmap_shift1, bitmap_shift2, salt_pos, loop_pos, loop_cnt, il_cnt, digests_cnt, digests_offset, combs_mode, gid_max); } -__kernel void m11700_s08 (KERN_ATTR_BASIC ()) +KERNEL_FQ void m11700_s08 (KERN_ATTR_BASIC ()) { /** * modifier @@ -523,7 +523,7 @@ __kernel void m11700_s08 (KERN_ATTR_BASIC ()) * shared lookup table */ - __local u64 s_sbob_sl64[8][256]; + LOCAL_AS u64 s_sbob_sl64[8][256]; for (u32 i = lid; i < 256; i += lsz) { @@ -573,7 +573,7 @@ __kernel void m11700_s08 (KERN_ATTR_BASIC ()) m11700s (s_sbob_sl64, w, 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_extra0_buf, d_extra1_buf, d_extra2_buf, d_extra3_buf, bitmap_mask, bitmap_shift1, bitmap_shift2, salt_pos, loop_pos, loop_cnt, il_cnt, digests_cnt, digests_offset, combs_mode, gid_max); } -__kernel void m11700_s16 (KERN_ATTR_BASIC ()) +KERNEL_FQ void m11700_s16 (KERN_ATTR_BASIC ()) { /** * modifier @@ -587,7 +587,7 @@ __kernel void m11700_s16 (KERN_ATTR_BASIC ()) * shared lookup table */ - __local u64 s_sbob_sl64[8][256]; + LOCAL_AS u64 s_sbob_sl64[8][256]; for (u32 i = lid; i < 256; i += lsz) { diff --git a/OpenCL/m11700_a3-pure.cl b/OpenCL/m11700_a3-pure.cl index c7c4364c7..84fe6a558 100644 --- a/OpenCL/m11700_a3-pure.cl +++ b/OpenCL/m11700_a3-pure.cl @@ -13,7 +13,7 @@ #include "inc_hash_streebog256.cl" #endif -__kernel void m11700_mxx (KERN_ATTR_VECTOR ()) +KERNEL_FQ void m11700_mxx (KERN_ATTR_VECTOR ()) { /** * modifier @@ -29,7 +29,7 @@ __kernel void m11700_mxx (KERN_ATTR_VECTOR ()) #ifdef REAL_SHM - __local u64a s_sbob_sl64[8][256]; + LOCAL_AS u64a s_sbob_sl64[8][256]; for (u32 i = lid; i < 256; i += lsz) { @@ -47,7 +47,7 @@ __kernel void m11700_mxx (KERN_ATTR_VECTOR ()) #else - __constant u64a (*s_sbob_sl64)[256] = sbob_sl64; + CONSTANT_AS u64a (*s_sbob_sl64)[256] = sbob_sl64; #endif @@ -97,7 +97,7 @@ __kernel void m11700_mxx (KERN_ATTR_VECTOR ()) } } -__kernel void m11700_sxx (KERN_ATTR_VECTOR ()) +KERNEL_FQ void m11700_sxx (KERN_ATTR_VECTOR ()) { /** * modifier @@ -113,7 +113,7 @@ __kernel void m11700_sxx (KERN_ATTR_VECTOR ()) #ifdef REAL_SHM - __local u64a s_sbob_sl64[8][256]; + LOCAL_AS u64a s_sbob_sl64[8][256]; for (u32 i = lid; i < 256; i += lsz) { @@ -131,7 +131,7 @@ __kernel void m11700_sxx (KERN_ATTR_VECTOR ()) #else - __constant u64a (*s_sbob_sl64)[256] = sbob_sl64; + CONSTANT_AS u64a (*s_sbob_sl64)[256] = sbob_sl64; #endif diff --git a/OpenCL/m11750_a0-pure.cl b/OpenCL/m11750_a0-pure.cl index db7a3f5f7..d57713a3e 100644 --- a/OpenCL/m11750_a0-pure.cl +++ b/OpenCL/m11750_a0-pure.cl @@ -15,7 +15,7 @@ #include "inc_hash_streebog256.cl" #endif -__kernel void m11750_mxx (KERN_ATTR_RULES ()) +KERNEL_FQ void m11750_mxx (KERN_ATTR_RULES ()) { /** * modifier @@ -31,7 +31,7 @@ __kernel void m11750_mxx (KERN_ATTR_RULES ()) #ifdef REAL_SHM - __local u64a s_sbob_sl64[8][256]; + LOCAL_AS u64a s_sbob_sl64[8][256]; for (u32 i = lid; i < 256; i += lsz) { @@ -49,7 +49,7 @@ __kernel void m11750_mxx (KERN_ATTR_RULES ()) #else - __constant u64a (*s_sbob_sl64)[256] = sbob_sl64; + CONSTANT_AS u64a (*s_sbob_sl64)[256] = sbob_sl64; #endif @@ -97,7 +97,7 @@ __kernel void m11750_mxx (KERN_ATTR_RULES ()) } } -__kernel void m11750_sxx (KERN_ATTR_RULES ()) +KERNEL_FQ void m11750_sxx (KERN_ATTR_RULES ()) { /** * modifier @@ -113,7 +113,7 @@ __kernel void m11750_sxx (KERN_ATTR_RULES ()) #ifdef REAL_SHM - __local u64a s_sbob_sl64[8][256]; + LOCAL_AS u64a s_sbob_sl64[8][256]; for (u32 i = lid; i < 256; i += lsz) { @@ -131,7 +131,7 @@ __kernel void m11750_sxx (KERN_ATTR_RULES ()) #else - __constant u64a (*s_sbob_sl64)[256] = sbob_sl64; + CONSTANT_AS u64a (*s_sbob_sl64)[256] = sbob_sl64; #endif diff --git a/OpenCL/m11750_a1-pure.cl b/OpenCL/m11750_a1-pure.cl index a7badd2d1..59715eed1 100644 --- a/OpenCL/m11750_a1-pure.cl +++ b/OpenCL/m11750_a1-pure.cl @@ -13,7 +13,7 @@ #include "inc_hash_streebog256.cl" #endif -__kernel void m11750_mxx (KERN_ATTR_BASIC ()) +KERNEL_FQ void m11750_mxx (KERN_ATTR_BASIC ()) { /** * modifier @@ -29,7 +29,7 @@ __kernel void m11750_mxx (KERN_ATTR_BASIC ()) #ifdef REAL_SHM - __local u64a s_sbob_sl64[8][256]; + LOCAL_AS u64a s_sbob_sl64[8][256]; for (u32 i = lid; i < 256; i += lsz) { @@ -47,7 +47,7 @@ __kernel void m11750_mxx (KERN_ATTR_BASIC ()) #else - __constant u64a (*s_sbob_sl64)[256] = sbob_sl64; + CONSTANT_AS u64a (*s_sbob_sl64)[256] = sbob_sl64; #endif @@ -120,7 +120,7 @@ __kernel void m11750_mxx (KERN_ATTR_BASIC ()) } } -__kernel void m11750_sxx (KERN_ATTR_BASIC ()) +KERNEL_FQ void m11750_sxx (KERN_ATTR_BASIC ()) { /** * modifier @@ -136,7 +136,7 @@ __kernel void m11750_sxx (KERN_ATTR_BASIC ()) #ifdef REAL_SHM - __local u64a s_sbob_sl64[8][256]; + LOCAL_AS u64a s_sbob_sl64[8][256]; for (u32 i = lid; i < 256; i += lsz) { @@ -154,7 +154,7 @@ __kernel void m11750_sxx (KERN_ATTR_BASIC ()) #else - __constant u64a (*s_sbob_sl64)[256] = sbob_sl64; + CONSTANT_AS u64a (*s_sbob_sl64)[256] = sbob_sl64; #endif diff --git a/OpenCL/m11750_a3-pure.cl b/OpenCL/m11750_a3-pure.cl index 4e3f2ec6b..92b64d33e 100644 --- a/OpenCL/m11750_a3-pure.cl +++ b/OpenCL/m11750_a3-pure.cl @@ -13,7 +13,7 @@ #include "inc_hash_streebog256.cl" #endif -__kernel void m11750_mxx (KERN_ATTR_VECTOR ()) +KERNEL_FQ void m11750_mxx (KERN_ATTR_VECTOR ()) { /** * modifier @@ -29,7 +29,7 @@ __kernel void m11750_mxx (KERN_ATTR_VECTOR ()) #ifdef REAL_SHM - __local u64a s_sbob_sl64[8][256]; + LOCAL_AS u64a s_sbob_sl64[8][256]; for (u32 i = lid; i < 256; i += lsz) { @@ -47,7 +47,7 @@ __kernel void m11750_mxx (KERN_ATTR_VECTOR ()) #else - __constant u64a (*s_sbob_sl64)[256] = sbob_sl64; + CONSTANT_AS u64a (*s_sbob_sl64)[256] = sbob_sl64; #endif @@ -106,7 +106,7 @@ __kernel void m11750_mxx (KERN_ATTR_VECTOR ()) } } -__kernel void m11750_sxx (KERN_ATTR_VECTOR ()) +KERNEL_FQ void m11750_sxx (KERN_ATTR_VECTOR ()) { /** * modifier @@ -122,7 +122,7 @@ __kernel void m11750_sxx (KERN_ATTR_VECTOR ()) #ifdef REAL_SHM - __local u64a s_sbob_sl64[8][256]; + LOCAL_AS u64a s_sbob_sl64[8][256]; for (u32 i = lid; i < 256; i += lsz) { @@ -140,7 +140,7 @@ __kernel void m11750_sxx (KERN_ATTR_VECTOR ()) #else - __constant u64a (*s_sbob_sl64)[256] = sbob_sl64; + CONSTANT_AS u64a (*s_sbob_sl64)[256] = sbob_sl64; #endif diff --git a/OpenCL/m11760_a0-pure.cl b/OpenCL/m11760_a0-pure.cl index fa9539193..189a49753 100644 --- a/OpenCL/m11760_a0-pure.cl +++ b/OpenCL/m11760_a0-pure.cl @@ -15,7 +15,7 @@ #include "inc_hash_streebog256.cl" #endif -__kernel void m11760_mxx (KERN_ATTR_RULES ()) +KERNEL_FQ void m11760_mxx (KERN_ATTR_RULES ()) { /** * modifier @@ -31,7 +31,7 @@ __kernel void m11760_mxx (KERN_ATTR_RULES ()) #ifdef REAL_SHM - __local u64a s_sbob_sl64[8][256]; + LOCAL_AS u64a s_sbob_sl64[8][256]; for (u32 i = lid; i < 256; i += lsz) { @@ -49,7 +49,7 @@ __kernel void m11760_mxx (KERN_ATTR_RULES ()) #else - __constant u64a (*s_sbob_sl64)[256] = sbob_sl64; + CONSTANT_AS u64a (*s_sbob_sl64)[256] = sbob_sl64; #endif @@ -99,7 +99,7 @@ __kernel void m11760_mxx (KERN_ATTR_RULES ()) } } -__kernel void m11760_sxx (KERN_ATTR_RULES ()) +KERNEL_FQ void m11760_sxx (KERN_ATTR_RULES ()) { /** * modifier @@ -115,7 +115,7 @@ __kernel void m11760_sxx (KERN_ATTR_RULES ()) #ifdef REAL_SHM - __local u64a s_sbob_sl64[8][256]; + LOCAL_AS u64a s_sbob_sl64[8][256]; for (u32 i = lid; i < 256; i += lsz) { @@ -133,7 +133,7 @@ __kernel void m11760_sxx (KERN_ATTR_RULES ()) #else - __constant u64a (*s_sbob_sl64)[256] = sbob_sl64; + CONSTANT_AS u64a (*s_sbob_sl64)[256] = sbob_sl64; #endif diff --git a/OpenCL/m11760_a1-pure.cl b/OpenCL/m11760_a1-pure.cl index 4329d064a..49c0099a5 100644 --- a/OpenCL/m11760_a1-pure.cl +++ b/OpenCL/m11760_a1-pure.cl @@ -13,7 +13,7 @@ #include "inc_hash_streebog256.cl" #endif -__kernel void m11760_mxx (KERN_ATTR_BASIC ()) +KERNEL_FQ void m11760_mxx (KERN_ATTR_BASIC ()) { /** * modifier @@ -29,7 +29,7 @@ __kernel void m11760_mxx (KERN_ATTR_BASIC ()) #ifdef REAL_SHM - __local u64a s_sbob_sl64[8][256]; + LOCAL_AS u64a s_sbob_sl64[8][256]; for (u32 i = lid; i < 256; i += lsz) { @@ -47,7 +47,7 @@ __kernel void m11760_mxx (KERN_ATTR_BASIC ()) #else - __constant u64a (*s_sbob_sl64)[256] = sbob_sl64; + CONSTANT_AS u64a (*s_sbob_sl64)[256] = sbob_sl64; #endif @@ -122,7 +122,7 @@ __kernel void m11760_mxx (KERN_ATTR_BASIC ()) } } -__kernel void m11760_sxx (KERN_ATTR_BASIC ()) +KERNEL_FQ void m11760_sxx (KERN_ATTR_BASIC ()) { /** * modifier @@ -138,7 +138,7 @@ __kernel void m11760_sxx (KERN_ATTR_BASIC ()) #ifdef REAL_SHM - __local u64a s_sbob_sl64[8][256]; + LOCAL_AS u64a s_sbob_sl64[8][256]; for (u32 i = lid; i < 256; i += lsz) { @@ -156,7 +156,7 @@ __kernel void m11760_sxx (KERN_ATTR_BASIC ()) #else - __constant u64a (*s_sbob_sl64)[256] = sbob_sl64; + CONSTANT_AS u64a (*s_sbob_sl64)[256] = sbob_sl64; #endif diff --git a/OpenCL/m11760_a3-pure.cl b/OpenCL/m11760_a3-pure.cl index 0830a5b69..e4cd941d8 100644 --- a/OpenCL/m11760_a3-pure.cl +++ b/OpenCL/m11760_a3-pure.cl @@ -13,7 +13,7 @@ #include "inc_hash_streebog256.cl" #endif -__kernel void m11760_mxx (KERN_ATTR_VECTOR ()) +KERNEL_FQ void m11760_mxx (KERN_ATTR_VECTOR ()) { /** * modifier @@ -29,7 +29,7 @@ __kernel void m11760_mxx (KERN_ATTR_VECTOR ()) #ifdef REAL_SHM - __local u64a s_sbob_sl64[8][256]; + LOCAL_AS u64a s_sbob_sl64[8][256]; for (u32 i = lid; i < 256; i += lsz) { @@ -47,7 +47,7 @@ __kernel void m11760_mxx (KERN_ATTR_VECTOR ()) #else - __constant u64a (*s_sbob_sl64)[256] = sbob_sl64; + CONSTANT_AS u64a (*s_sbob_sl64)[256] = sbob_sl64; #endif @@ -108,7 +108,7 @@ __kernel void m11760_mxx (KERN_ATTR_VECTOR ()) } } -__kernel void m11760_sxx (KERN_ATTR_VECTOR ()) +KERNEL_FQ void m11760_sxx (KERN_ATTR_VECTOR ()) { /** * modifier @@ -124,7 +124,7 @@ __kernel void m11760_sxx (KERN_ATTR_VECTOR ()) #ifdef REAL_SHM - __local u64a s_sbob_sl64[8][256]; + LOCAL_AS u64a s_sbob_sl64[8][256]; for (u32 i = lid; i < 256; i += lsz) { @@ -142,7 +142,7 @@ __kernel void m11760_sxx (KERN_ATTR_VECTOR ()) #else - __constant u64a (*s_sbob_sl64)[256] = sbob_sl64; + CONSTANT_AS u64a (*s_sbob_sl64)[256] = sbob_sl64; #endif diff --git a/OpenCL/m11800_a0-optimized.cl b/OpenCL/m11800_a0-optimized.cl index 9db4eeb74..1f58c6f78 100644 --- a/OpenCL/m11800_a0-optimized.cl +++ b/OpenCL/m11800_a0-optimized.cl @@ -18,7 +18,7 @@ #define INITVAL 0 -DECLSPEC void streebog_g (u64x *h, const u64x *m, __local u64 (*s_sbob_sl64)[256]) +DECLSPEC void streebog_g (u64x *h, const u64x *m, LOCAL_AS u64 (*s_sbob_sl64)[256]) { u64x k[8]; u64x s[8]; @@ -86,7 +86,7 @@ DECLSPEC void streebog_g (u64x *h, const u64x *m, __local u64 (*s_sbob_sl64)[256 } } -__kernel void m11800_m04 (KERN_ATTR_RULES ()) +KERNEL_FQ void m11800_m04 (KERN_ATTR_RULES ()) { /** * modifier @@ -100,7 +100,7 @@ __kernel void m11800_m04 (KERN_ATTR_RULES ()) * shared lookup table */ - __local u64 s_sbob_sl64[8][256]; + LOCAL_AS u64 s_sbob_sl64[8][256]; for (u32 i = lid; i < 256; i += lsz) { @@ -236,15 +236,15 @@ __kernel void m11800_m04 (KERN_ATTR_RULES ()) } } -__kernel void m11800_m08 (KERN_ATTR_RULES ()) +KERNEL_FQ void m11800_m08 (KERN_ATTR_RULES ()) { } -__kernel void m11800_m16 (KERN_ATTR_RULES ()) +KERNEL_FQ void m11800_m16 (KERN_ATTR_RULES ()) { } -__kernel void m11800_s04 (KERN_ATTR_RULES ()) +KERNEL_FQ void m11800_s04 (KERN_ATTR_RULES ()) { /** * modifier @@ -258,7 +258,7 @@ __kernel void m11800_s04 (KERN_ATTR_RULES ()) * shared lookup table */ - __local u64 s_sbob_sl64[8][256]; + LOCAL_AS u64 s_sbob_sl64[8][256]; for (u32 i = lid; i < 256; i += lsz) { @@ -406,10 +406,10 @@ __kernel void m11800_s04 (KERN_ATTR_RULES ()) } } -__kernel void m11800_s08 (KERN_ATTR_RULES ()) +KERNEL_FQ void m11800_s08 (KERN_ATTR_RULES ()) { } -__kernel void m11800_s16 (KERN_ATTR_RULES ()) +KERNEL_FQ void m11800_s16 (KERN_ATTR_RULES ()) { } diff --git a/OpenCL/m11800_a0-pure.cl b/OpenCL/m11800_a0-pure.cl index f50a82b9e..13bfd7714 100644 --- a/OpenCL/m11800_a0-pure.cl +++ b/OpenCL/m11800_a0-pure.cl @@ -15,7 +15,7 @@ #include "inc_hash_streebog512.cl" #endif -__kernel void m11800_mxx (KERN_ATTR_RULES ()) +KERNEL_FQ void m11800_mxx (KERN_ATTR_RULES ()) { /** * modifier @@ -31,7 +31,7 @@ __kernel void m11800_mxx (KERN_ATTR_RULES ()) #ifdef REAL_SHM - __local u64a s_sbob_sl64[8][256]; + LOCAL_AS u64a s_sbob_sl64[8][256]; for (u32 i = lid; i < 256; i += lsz) { @@ -49,7 +49,7 @@ __kernel void m11800_mxx (KERN_ATTR_RULES ()) #else - __constant u64a (*s_sbob_sl64)[256] = sbob_sl64; + CONSTANT_AS u64a (*s_sbob_sl64)[256] = sbob_sl64; #endif @@ -88,7 +88,7 @@ __kernel void m11800_mxx (KERN_ATTR_RULES ()) } } -__kernel void m11800_sxx (KERN_ATTR_RULES ()) +KERNEL_FQ void m11800_sxx (KERN_ATTR_RULES ()) { /** * modifier @@ -104,7 +104,7 @@ __kernel void m11800_sxx (KERN_ATTR_RULES ()) #ifdef REAL_SHM - __local u64a s_sbob_sl64[8][256]; + LOCAL_AS u64a s_sbob_sl64[8][256]; for (u32 i = lid; i < 256; i += lsz) { @@ -122,7 +122,7 @@ __kernel void m11800_sxx (KERN_ATTR_RULES ()) #else - __constant u64a (*s_sbob_sl64)[256] = sbob_sl64; + CONSTANT_AS u64a (*s_sbob_sl64)[256] = sbob_sl64; #endif diff --git a/OpenCL/m11800_a1-optimized.cl b/OpenCL/m11800_a1-optimized.cl index 0faaae549..a138a1485 100644 --- a/OpenCL/m11800_a1-optimized.cl +++ b/OpenCL/m11800_a1-optimized.cl @@ -16,7 +16,7 @@ #define INITVAL 0 -DECLSPEC void streebog_g (u64x *h, const u64x *m, __local u64 (*s_sbob_sl64)[256]) +DECLSPEC void streebog_g (u64x *h, const u64x *m, LOCAL_AS u64 (*s_sbob_sl64)[256]) { u64x k[8]; u64x s[8]; @@ -84,7 +84,7 @@ DECLSPEC void streebog_g (u64x *h, const u64x *m, __local u64 (*s_sbob_sl64)[256 } } -__kernel void m11800_m04 (KERN_ATTR_BASIC ()) +KERNEL_FQ void m11800_m04 (KERN_ATTR_BASIC ()) { /** * modifier @@ -98,7 +98,7 @@ __kernel void m11800_m04 (KERN_ATTR_BASIC ()) * shared lookup table */ - __local u64 s_sbob_sl64[8][256]; + LOCAL_AS u64 s_sbob_sl64[8][256]; for (u32 i = lid; i < 256; i += lsz) { @@ -292,15 +292,15 @@ __kernel void m11800_m04 (KERN_ATTR_BASIC ()) } } -__kernel void m11800_m08 (KERN_ATTR_BASIC ()) +KERNEL_FQ void m11800_m08 (KERN_ATTR_BASIC ()) { } -__kernel void m11800_m16 (KERN_ATTR_BASIC ()) +KERNEL_FQ void m11800_m16 (KERN_ATTR_BASIC ()) { } -__kernel void m11800_s04 (KERN_ATTR_BASIC ()) +KERNEL_FQ void m11800_s04 (KERN_ATTR_BASIC ()) { /** * modifier @@ -314,7 +314,7 @@ __kernel void m11800_s04 (KERN_ATTR_BASIC ()) * shared lookup table */ - __local u64 s_sbob_sl64[8][256]; + LOCAL_AS u64 s_sbob_sl64[8][256]; for (u32 i = lid; i < 256; i += lsz) { @@ -520,10 +520,10 @@ __kernel void m11800_s04 (KERN_ATTR_BASIC ()) } } -__kernel void m11800_s08 (KERN_ATTR_BASIC ()) +KERNEL_FQ void m11800_s08 (KERN_ATTR_BASIC ()) { } -__kernel void m11800_s16 (KERN_ATTR_BASIC ()) +KERNEL_FQ void m11800_s16 (KERN_ATTR_BASIC ()) { } diff --git a/OpenCL/m11800_a1-pure.cl b/OpenCL/m11800_a1-pure.cl index 02a175ce8..8d8be54b9 100644 --- a/OpenCL/m11800_a1-pure.cl +++ b/OpenCL/m11800_a1-pure.cl @@ -13,7 +13,7 @@ #include "inc_hash_streebog512.cl" #endif -__kernel void m11800_mxx (KERN_ATTR_BASIC ()) +KERNEL_FQ void m11800_mxx (KERN_ATTR_BASIC ()) { /** * modifier @@ -29,7 +29,7 @@ __kernel void m11800_mxx (KERN_ATTR_BASIC ()) #ifdef REAL_SHM - __local u64a s_sbob_sl64[8][256]; + LOCAL_AS u64a s_sbob_sl64[8][256]; for (u32 i = lid; i < 256; i += lsz) { @@ -47,7 +47,7 @@ __kernel void m11800_mxx (KERN_ATTR_BASIC ()) #else - __constant u64a (*s_sbob_sl64)[256] = sbob_sl64; + CONSTANT_AS u64a (*s_sbob_sl64)[256] = sbob_sl64; #endif @@ -84,7 +84,7 @@ __kernel void m11800_mxx (KERN_ATTR_BASIC ()) } } -__kernel void m11800_sxx (KERN_ATTR_BASIC ()) +KERNEL_FQ void m11800_sxx (KERN_ATTR_BASIC ()) { /** * modifier @@ -100,7 +100,7 @@ __kernel void m11800_sxx (KERN_ATTR_BASIC ()) #ifdef REAL_SHM - __local u64a s_sbob_sl64[8][256]; + LOCAL_AS u64a s_sbob_sl64[8][256]; for (u32 i = lid; i < 256; i += lsz) { @@ -118,7 +118,7 @@ __kernel void m11800_sxx (KERN_ATTR_BASIC ()) #else - __constant u64a (*s_sbob_sl64)[256] = sbob_sl64; + CONSTANT_AS u64a (*s_sbob_sl64)[256] = sbob_sl64; #endif diff --git a/OpenCL/m11800_a3-optimized.cl b/OpenCL/m11800_a3-optimized.cl index fe0441343..9409894c7 100644 --- a/OpenCL/m11800_a3-optimized.cl +++ b/OpenCL/m11800_a3-optimized.cl @@ -16,7 +16,7 @@ #define INITVAL 0 -DECLSPEC void streebog_g (u64x *h, const u64x *m, __local u64 (*s_sbob_sl64)[256]) +DECLSPEC void streebog_g (u64x *h, const u64x *m, LOCAL_AS u64 (*s_sbob_sl64)[256]) { u64x k[8]; u64x s[8]; @@ -75,7 +75,7 @@ DECLSPEC void streebog_g (u64x *h, const u64x *m, __local u64 (*s_sbob_sl64)[256 } } -DECLSPEC void m11800m (__local u64 (*s_sbob_sl64)[256], u32 *w, const u32 pw_len, KERN_ATTR_BASIC ()) +DECLSPEC void m11800m (LOCAL_AS u64 (*s_sbob_sl64)[256], u32 *w, const u32 pw_len, KERN_ATTR_BASIC ()) { /** * modifier @@ -158,7 +158,7 @@ DECLSPEC void m11800m (__local u64 (*s_sbob_sl64)[256], u32 *w, const u32 pw_len } } -DECLSPEC void m11800s (__local u64 (*s_sbob_sl64)[256], u32 *w, const u32 pw_len, KERN_ATTR_BASIC ()) +DECLSPEC void m11800s (LOCAL_AS u64 (*s_sbob_sl64)[256], u32 *w, const u32 pw_len, KERN_ATTR_BASIC ()) { /** * modifier @@ -253,7 +253,7 @@ DECLSPEC void m11800s (__local u64 (*s_sbob_sl64)[256], u32 *w, const u32 pw_len } } -__kernel void m11800_m04 (KERN_ATTR_BASIC ()) +KERNEL_FQ void m11800_m04 (KERN_ATTR_BASIC ()) { /** * modifier @@ -267,7 +267,7 @@ __kernel void m11800_m04 (KERN_ATTR_BASIC ()) * shared lookup table */ - __local u64 s_sbob_sl64[8][256]; + LOCAL_AS u64 s_sbob_sl64[8][256]; for (u32 i = lid; i < 256; i += lsz) { @@ -317,7 +317,7 @@ __kernel void m11800_m04 (KERN_ATTR_BASIC ()) m11800m (s_sbob_sl64, w, 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_extra0_buf, d_extra1_buf, d_extra2_buf, d_extra3_buf, bitmap_mask, bitmap_shift1, bitmap_shift2, salt_pos, loop_pos, loop_cnt, il_cnt, digests_cnt, digests_offset, combs_mode, gid_max); } -__kernel void m11800_m08 (KERN_ATTR_BASIC ()) +KERNEL_FQ void m11800_m08 (KERN_ATTR_BASIC ()) { /** * modifier @@ -331,7 +331,7 @@ __kernel void m11800_m08 (KERN_ATTR_BASIC ()) * shared lookup table */ - __local u64 s_sbob_sl64[8][256]; + LOCAL_AS u64 s_sbob_sl64[8][256]; for (u32 i = lid; i < 256; i += lsz) { @@ -381,7 +381,7 @@ __kernel void m11800_m08 (KERN_ATTR_BASIC ()) m11800m (s_sbob_sl64, w, 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_extra0_buf, d_extra1_buf, d_extra2_buf, d_extra3_buf, bitmap_mask, bitmap_shift1, bitmap_shift2, salt_pos, loop_pos, loop_cnt, il_cnt, digests_cnt, digests_offset, combs_mode, gid_max); } -__kernel void m11800_m16 (KERN_ATTR_BASIC ()) +KERNEL_FQ void m11800_m16 (KERN_ATTR_BASIC ()) { /** * modifier @@ -395,7 +395,7 @@ __kernel void m11800_m16 (KERN_ATTR_BASIC ()) * shared lookup table */ - __local u64 s_sbob_sl64[8][256]; + LOCAL_AS u64 s_sbob_sl64[8][256]; for (u32 i = lid; i < 256; i += lsz) { @@ -445,7 +445,7 @@ __kernel void m11800_m16 (KERN_ATTR_BASIC ()) m11800m (s_sbob_sl64, w, 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_extra0_buf, d_extra1_buf, d_extra2_buf, d_extra3_buf, bitmap_mask, bitmap_shift1, bitmap_shift2, salt_pos, loop_pos, loop_cnt, il_cnt, digests_cnt, digests_offset, combs_mode, gid_max); } -__kernel void m11800_s04 (KERN_ATTR_BASIC ()) +KERNEL_FQ void m11800_s04 (KERN_ATTR_BASIC ()) { /** * modifier @@ -459,7 +459,7 @@ __kernel void m11800_s04 (KERN_ATTR_BASIC ()) * shared lookup table */ - __local u64 s_sbob_sl64[8][256]; + LOCAL_AS u64 s_sbob_sl64[8][256]; for (u32 i = lid; i < 256; i += lsz) { @@ -509,7 +509,7 @@ __kernel void m11800_s04 (KERN_ATTR_BASIC ()) m11800s (s_sbob_sl64, w, 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_extra0_buf, d_extra1_buf, d_extra2_buf, d_extra3_buf, bitmap_mask, bitmap_shift1, bitmap_shift2, salt_pos, loop_pos, loop_cnt, il_cnt, digests_cnt, digests_offset, combs_mode, gid_max); } -__kernel void m11800_s08 (KERN_ATTR_BASIC ()) +KERNEL_FQ void m11800_s08 (KERN_ATTR_BASIC ()) { /** * modifier @@ -523,7 +523,7 @@ __kernel void m11800_s08 (KERN_ATTR_BASIC ()) * shared lookup table */ - __local u64 s_sbob_sl64[8][256]; + LOCAL_AS u64 s_sbob_sl64[8][256]; for (u32 i = lid; i < 256; i += lsz) { @@ -573,7 +573,7 @@ __kernel void m11800_s08 (KERN_ATTR_BASIC ()) m11800s (s_sbob_sl64, w, 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_extra0_buf, d_extra1_buf, d_extra2_buf, d_extra3_buf, bitmap_mask, bitmap_shift1, bitmap_shift2, salt_pos, loop_pos, loop_cnt, il_cnt, digests_cnt, digests_offset, combs_mode, gid_max); } -__kernel void m11800_s16 (KERN_ATTR_BASIC ()) +KERNEL_FQ void m11800_s16 (KERN_ATTR_BASIC ()) { /** * modifier @@ -587,7 +587,7 @@ __kernel void m11800_s16 (KERN_ATTR_BASIC ()) * shared lookup table */ - __local u64 s_sbob_sl64[8][256]; + LOCAL_AS u64 s_sbob_sl64[8][256]; for (u32 i = lid; i < 256; i += lsz) { diff --git a/OpenCL/m11800_a3-pure.cl b/OpenCL/m11800_a3-pure.cl index edbdd78cb..d4d0b8a4e 100644 --- a/OpenCL/m11800_a3-pure.cl +++ b/OpenCL/m11800_a3-pure.cl @@ -13,7 +13,7 @@ #include "inc_hash_streebog512.cl" #endif -__kernel void m11800_mxx (KERN_ATTR_VECTOR ()) +KERNEL_FQ void m11800_mxx (KERN_ATTR_VECTOR ()) { /** * modifier @@ -29,7 +29,7 @@ __kernel void m11800_mxx (KERN_ATTR_VECTOR ()) #ifdef REAL_SHM - __local u64a s_sbob_sl64[8][256]; + LOCAL_AS u64a s_sbob_sl64[8][256]; for (u32 i = lid; i < 256; i += lsz) { @@ -47,7 +47,7 @@ __kernel void m11800_mxx (KERN_ATTR_VECTOR ()) #else - __constant u64a (*s_sbob_sl64)[256] = sbob_sl64; + CONSTANT_AS u64a (*s_sbob_sl64)[256] = sbob_sl64; #endif @@ -97,7 +97,7 @@ __kernel void m11800_mxx (KERN_ATTR_VECTOR ()) } } -__kernel void m11800_sxx (KERN_ATTR_VECTOR ()) +KERNEL_FQ void m11800_sxx (KERN_ATTR_VECTOR ()) { /** * modifier @@ -113,7 +113,7 @@ __kernel void m11800_sxx (KERN_ATTR_VECTOR ()) #ifdef REAL_SHM - __local u64a s_sbob_sl64[8][256]; + LOCAL_AS u64a s_sbob_sl64[8][256]; for (u32 i = lid; i < 256; i += lsz) { @@ -131,7 +131,7 @@ __kernel void m11800_sxx (KERN_ATTR_VECTOR ()) #else - __constant u64a (*s_sbob_sl64)[256] = sbob_sl64; + CONSTANT_AS u64a (*s_sbob_sl64)[256] = sbob_sl64; #endif diff --git a/OpenCL/m11850_a0-pure.cl b/OpenCL/m11850_a0-pure.cl index 11d9d252c..dacce5e22 100644 --- a/OpenCL/m11850_a0-pure.cl +++ b/OpenCL/m11850_a0-pure.cl @@ -15,7 +15,7 @@ #include "inc_hash_streebog512.cl" #endif -__kernel void m11850_mxx (KERN_ATTR_RULES ()) +KERNEL_FQ void m11850_mxx (KERN_ATTR_RULES ()) { /** * modifier @@ -31,7 +31,7 @@ __kernel void m11850_mxx (KERN_ATTR_RULES ()) #ifdef REAL_SHM - __local u64a s_sbob_sl64[8][256]; + LOCAL_AS u64a s_sbob_sl64[8][256]; for (u32 i = lid; i < 256; i += lsz) { @@ -49,7 +49,7 @@ __kernel void m11850_mxx (KERN_ATTR_RULES ()) #else - __constant u64a (*s_sbob_sl64)[256] = sbob_sl64; + CONSTANT_AS u64a (*s_sbob_sl64)[256] = sbob_sl64; #endif @@ -97,7 +97,7 @@ __kernel void m11850_mxx (KERN_ATTR_RULES ()) } } -__kernel void m11850_sxx (KERN_ATTR_RULES ()) +KERNEL_FQ void m11850_sxx (KERN_ATTR_RULES ()) { /** * modifier @@ -113,7 +113,7 @@ __kernel void m11850_sxx (KERN_ATTR_RULES ()) #ifdef REAL_SHM - __local u64a s_sbob_sl64[8][256]; + LOCAL_AS u64a s_sbob_sl64[8][256]; for (u32 i = lid; i < 256; i += lsz) { @@ -131,7 +131,7 @@ __kernel void m11850_sxx (KERN_ATTR_RULES ()) #else - __constant u64a (*s_sbob_sl64)[256] = sbob_sl64; + CONSTANT_AS u64a (*s_sbob_sl64)[256] = sbob_sl64; #endif diff --git a/OpenCL/m11850_a1-pure.cl b/OpenCL/m11850_a1-pure.cl index 006fb1c5a..092f95a34 100644 --- a/OpenCL/m11850_a1-pure.cl +++ b/OpenCL/m11850_a1-pure.cl @@ -13,7 +13,7 @@ #include "inc_hash_streebog512.cl" #endif -__kernel void m11850_mxx (KERN_ATTR_BASIC ()) +KERNEL_FQ void m11850_mxx (KERN_ATTR_BASIC ()) { /** * modifier @@ -29,7 +29,7 @@ __kernel void m11850_mxx (KERN_ATTR_BASIC ()) #ifdef REAL_SHM - __local u64a s_sbob_sl64[8][256]; + LOCAL_AS u64a s_sbob_sl64[8][256]; for (u32 i = lid; i < 256; i += lsz) { @@ -47,7 +47,7 @@ __kernel void m11850_mxx (KERN_ATTR_BASIC ()) #else - __constant u64a (*s_sbob_sl64)[256] = sbob_sl64; + CONSTANT_AS u64a (*s_sbob_sl64)[256] = sbob_sl64; #endif @@ -120,7 +120,7 @@ __kernel void m11850_mxx (KERN_ATTR_BASIC ()) } } -__kernel void m11850_sxx (KERN_ATTR_BASIC ()) +KERNEL_FQ void m11850_sxx (KERN_ATTR_BASIC ()) { /** * modifier @@ -136,7 +136,7 @@ __kernel void m11850_sxx (KERN_ATTR_BASIC ()) #ifdef REAL_SHM - __local u64a s_sbob_sl64[8][256]; + LOCAL_AS u64a s_sbob_sl64[8][256]; for (u32 i = lid; i < 256; i += lsz) { @@ -154,7 +154,7 @@ __kernel void m11850_sxx (KERN_ATTR_BASIC ()) #else - __constant u64a (*s_sbob_sl64)[256] = sbob_sl64; + CONSTANT_AS u64a (*s_sbob_sl64)[256] = sbob_sl64; #endif diff --git a/OpenCL/m11850_a3-pure.cl b/OpenCL/m11850_a3-pure.cl index 4479a590f..54549ec6e 100644 --- a/OpenCL/m11850_a3-pure.cl +++ b/OpenCL/m11850_a3-pure.cl @@ -13,7 +13,7 @@ #include "inc_hash_streebog512.cl" #endif -__kernel void m11850_mxx (KERN_ATTR_VECTOR ()) +KERNEL_FQ void m11850_mxx (KERN_ATTR_VECTOR ()) { /** * modifier @@ -29,7 +29,7 @@ __kernel void m11850_mxx (KERN_ATTR_VECTOR ()) #ifdef REAL_SHM - __local u64a s_sbob_sl64[8][256]; + LOCAL_AS u64a s_sbob_sl64[8][256]; for (u32 i = lid; i < 256; i += lsz) { @@ -47,7 +47,7 @@ __kernel void m11850_mxx (KERN_ATTR_VECTOR ()) #else - __constant u64a (*s_sbob_sl64)[256] = sbob_sl64; + CONSTANT_AS u64a (*s_sbob_sl64)[256] = sbob_sl64; #endif @@ -106,7 +106,7 @@ __kernel void m11850_mxx (KERN_ATTR_VECTOR ()) } } -__kernel void m11850_sxx (KERN_ATTR_VECTOR ()) +KERNEL_FQ void m11850_sxx (KERN_ATTR_VECTOR ()) { /** * modifier @@ -122,7 +122,7 @@ __kernel void m11850_sxx (KERN_ATTR_VECTOR ()) #ifdef REAL_SHM - __local u64a s_sbob_sl64[8][256]; + LOCAL_AS u64a s_sbob_sl64[8][256]; for (u32 i = lid; i < 256; i += lsz) { @@ -140,7 +140,7 @@ __kernel void m11850_sxx (KERN_ATTR_VECTOR ()) #else - __constant u64a (*s_sbob_sl64)[256] = sbob_sl64; + CONSTANT_AS u64a (*s_sbob_sl64)[256] = sbob_sl64; #endif diff --git a/OpenCL/m11860_a0-pure.cl b/OpenCL/m11860_a0-pure.cl index 9d76e79ae..0231cf88c 100644 --- a/OpenCL/m11860_a0-pure.cl +++ b/OpenCL/m11860_a0-pure.cl @@ -15,7 +15,7 @@ #include "inc_hash_streebog512.cl" #endif -__kernel void m11860_mxx (KERN_ATTR_RULES ()) +KERNEL_FQ void m11860_mxx (KERN_ATTR_RULES ()) { /** * modifier @@ -31,7 +31,7 @@ __kernel void m11860_mxx (KERN_ATTR_RULES ()) #ifdef REAL_SHM - __local u64a s_sbob_sl64[8][256]; + LOCAL_AS u64a s_sbob_sl64[8][256]; for (u32 i = lid; i < 256; i += lsz) { @@ -49,7 +49,7 @@ __kernel void m11860_mxx (KERN_ATTR_RULES ()) #else - __constant u64a (*s_sbob_sl64)[256] = sbob_sl64; + CONSTANT_AS u64a (*s_sbob_sl64)[256] = sbob_sl64; #endif @@ -99,7 +99,7 @@ __kernel void m11860_mxx (KERN_ATTR_RULES ()) } } -__kernel void m11860_sxx (KERN_ATTR_RULES ()) +KERNEL_FQ void m11860_sxx (KERN_ATTR_RULES ()) { /** * modifier @@ -115,7 +115,7 @@ __kernel void m11860_sxx (KERN_ATTR_RULES ()) #ifdef REAL_SHM - __local u64a s_sbob_sl64[8][256]; + LOCAL_AS u64a s_sbob_sl64[8][256]; for (u32 i = lid; i < 256; i += lsz) { @@ -133,7 +133,7 @@ __kernel void m11860_sxx (KERN_ATTR_RULES ()) #else - __constant u64a (*s_sbob_sl64)[256] = sbob_sl64; + CONSTANT_AS u64a (*s_sbob_sl64)[256] = sbob_sl64; #endif diff --git a/OpenCL/m11860_a1-pure.cl b/OpenCL/m11860_a1-pure.cl index 0ced7b79c..f73c27017 100644 --- a/OpenCL/m11860_a1-pure.cl +++ b/OpenCL/m11860_a1-pure.cl @@ -13,7 +13,7 @@ #include "inc_hash_streebog512.cl" #endif -__kernel void m11860_mxx (KERN_ATTR_BASIC ()) +KERNEL_FQ void m11860_mxx (KERN_ATTR_BASIC ()) { /** * modifier @@ -29,7 +29,7 @@ __kernel void m11860_mxx (KERN_ATTR_BASIC ()) #ifdef REAL_SHM - __local u64a s_sbob_sl64[8][256]; + LOCAL_AS u64a s_sbob_sl64[8][256]; for (u32 i = lid; i < 256; i += lsz) { @@ -47,7 +47,7 @@ __kernel void m11860_mxx (KERN_ATTR_BASIC ()) #else - __constant u64a (*s_sbob_sl64)[256] = sbob_sl64; + CONSTANT_AS u64a (*s_sbob_sl64)[256] = sbob_sl64; #endif @@ -122,7 +122,7 @@ __kernel void m11860_mxx (KERN_ATTR_BASIC ()) } } -__kernel void m11860_sxx (KERN_ATTR_BASIC ()) +KERNEL_FQ void m11860_sxx (KERN_ATTR_BASIC ()) { /** * modifier @@ -138,7 +138,7 @@ __kernel void m11860_sxx (KERN_ATTR_BASIC ()) #ifdef REAL_SHM - __local u64a s_sbob_sl64[8][256]; + LOCAL_AS u64a s_sbob_sl64[8][256]; for (u32 i = lid; i < 256; i += lsz) { @@ -156,7 +156,7 @@ __kernel void m11860_sxx (KERN_ATTR_BASIC ()) #else - __constant u64a (*s_sbob_sl64)[256] = sbob_sl64; + CONSTANT_AS u64a (*s_sbob_sl64)[256] = sbob_sl64; #endif diff --git a/OpenCL/m11860_a3-pure.cl b/OpenCL/m11860_a3-pure.cl index b0cff7e7a..942d2c0e6 100644 --- a/OpenCL/m11860_a3-pure.cl +++ b/OpenCL/m11860_a3-pure.cl @@ -13,7 +13,7 @@ #include "inc_hash_streebog512.cl" #endif -__kernel void m11860_mxx (KERN_ATTR_VECTOR ()) +KERNEL_FQ void m11860_mxx (KERN_ATTR_VECTOR ()) { /** * modifier @@ -29,7 +29,7 @@ __kernel void m11860_mxx (KERN_ATTR_VECTOR ()) #ifdef REAL_SHM - __local u64a s_sbob_sl64[8][256]; + LOCAL_AS u64a s_sbob_sl64[8][256]; for (u32 i = lid; i < 256; i += lsz) { @@ -47,7 +47,7 @@ __kernel void m11860_mxx (KERN_ATTR_VECTOR ()) #else - __constant u64a (*s_sbob_sl64)[256] = sbob_sl64; + CONSTANT_AS u64a (*s_sbob_sl64)[256] = sbob_sl64; #endif @@ -108,7 +108,7 @@ __kernel void m11860_mxx (KERN_ATTR_VECTOR ()) } } -__kernel void m11860_sxx (KERN_ATTR_VECTOR ()) +KERNEL_FQ void m11860_sxx (KERN_ATTR_VECTOR ()) { /** * modifier @@ -124,7 +124,7 @@ __kernel void m11860_sxx (KERN_ATTR_VECTOR ()) #ifdef REAL_SHM - __local u64a s_sbob_sl64[8][256]; + LOCAL_AS u64a s_sbob_sl64[8][256]; for (u32 i = lid; i < 256; i += lsz) { @@ -142,7 +142,7 @@ __kernel void m11860_sxx (KERN_ATTR_VECTOR ()) #else - __constant u64a (*s_sbob_sl64)[256] = sbob_sl64; + CONSTANT_AS u64a (*s_sbob_sl64)[256] = sbob_sl64; #endif diff --git a/OpenCL/m11900-pure.cl b/OpenCL/m11900-pure.cl index 7c4bf887f..b46cca1cb 100644 --- a/OpenCL/m11900-pure.cl +++ b/OpenCL/m11900-pure.cl @@ -66,7 +66,7 @@ DECLSPEC void hmac_md5_run_V (u32x *w0, u32x *w1, u32x *w2, u32x *w3, u32x *ipad md5_transform_vector (w0, w1, w2, w3, digest); } -__kernel void m11900_init (KERN_ATTR_TMPS_ESALT (pbkdf2_md5_tmp_t, pbkdf2_md5_t)) +KERNEL_FQ void m11900_init (KERN_ATTR_TMPS_ESALT (pbkdf2_md5_tmp_t, pbkdf2_md5_t)) { /** * base @@ -134,7 +134,7 @@ __kernel void m11900_init (KERN_ATTR_TMPS_ESALT (pbkdf2_md5_tmp_t, pbkdf2_md5_t) } } -__kernel void m11900_loop (KERN_ATTR_TMPS_ESALT (pbkdf2_md5_tmp_t, pbkdf2_md5_t)) +KERNEL_FQ void m11900_loop (KERN_ATTR_TMPS_ESALT (pbkdf2_md5_tmp_t, pbkdf2_md5_t)) { const u64 gid = get_global_id (0); @@ -212,7 +212,7 @@ __kernel void m11900_loop (KERN_ATTR_TMPS_ESALT (pbkdf2_md5_tmp_t, pbkdf2_md5_t) } } -__kernel void m11900_comp (KERN_ATTR_TMPS_ESALT (pbkdf2_md5_tmp_t, pbkdf2_md5_t)) +KERNEL_FQ void m11900_comp (KERN_ATTR_TMPS_ESALT (pbkdf2_md5_tmp_t, pbkdf2_md5_t)) { /** * base diff --git a/OpenCL/m12000-pure.cl b/OpenCL/m12000-pure.cl index 4e922809c..43fc2ac54 100644 --- a/OpenCL/m12000-pure.cl +++ b/OpenCL/m12000-pure.cl @@ -68,7 +68,7 @@ DECLSPEC void hmac_sha1_run_V (u32x *w0, u32x *w1, u32x *w2, u32x *w3, u32x *ipa sha1_transform_vector (w0, w1, w2, w3, digest); } -__kernel void m12000_init (KERN_ATTR_TMPS_ESALT (pbkdf2_sha1_tmp_t, pbkdf2_sha1_t)) +KERNEL_FQ void m12000_init (KERN_ATTR_TMPS_ESALT (pbkdf2_sha1_tmp_t, pbkdf2_sha1_t)) { /** * base @@ -140,7 +140,7 @@ __kernel void m12000_init (KERN_ATTR_TMPS_ESALT (pbkdf2_sha1_tmp_t, pbkdf2_sha1_ } } -__kernel void m12000_loop (KERN_ATTR_TMPS_ESALT (pbkdf2_sha1_tmp_t, pbkdf2_sha1_t)) +KERNEL_FQ void m12000_loop (KERN_ATTR_TMPS_ESALT (pbkdf2_sha1_tmp_t, pbkdf2_sha1_t)) { const u64 gid = get_global_id (0); @@ -225,7 +225,7 @@ __kernel void m12000_loop (KERN_ATTR_TMPS_ESALT (pbkdf2_sha1_tmp_t, pbkdf2_sha1_ } } -__kernel void m12000_comp (KERN_ATTR_TMPS_ESALT (pbkdf2_sha1_tmp_t, pbkdf2_sha1_t)) +KERNEL_FQ void m12000_comp (KERN_ATTR_TMPS_ESALT (pbkdf2_sha1_tmp_t, pbkdf2_sha1_t)) { /** * base diff --git a/OpenCL/m12200-pure.cl b/OpenCL/m12200-pure.cl index 595e51ca6..3aee89aa0 100644 --- a/OpenCL/m12200-pure.cl +++ b/OpenCL/m12200-pure.cl @@ -22,7 +22,7 @@ typedef struct ecryptfs_tmp } ecryptfs_tmp_t; -__kernel void m12200_init (KERN_ATTR_TMPS (ecryptfs_tmp_t)) +KERNEL_FQ void m12200_init (KERN_ATTR_TMPS (ecryptfs_tmp_t)) { /** * base @@ -52,7 +52,7 @@ __kernel void m12200_init (KERN_ATTR_TMPS (ecryptfs_tmp_t)) tmps[gid].out[7] = ctx.h[7]; } -__kernel void m12200_loop (KERN_ATTR_TMPS (ecryptfs_tmp_t)) +KERNEL_FQ void m12200_loop (KERN_ATTR_TMPS (ecryptfs_tmp_t)) { const u64 gid = get_global_id (0); @@ -161,7 +161,7 @@ __kernel void m12200_loop (KERN_ATTR_TMPS (ecryptfs_tmp_t)) unpack64v (tmps, out, gid, 7, t7); } -__kernel void m12200_comp (KERN_ATTR_TMPS (ecryptfs_tmp_t)) +KERNEL_FQ void m12200_comp (KERN_ATTR_TMPS (ecryptfs_tmp_t)) { /** * base diff --git a/OpenCL/m12300-pure.cl b/OpenCL/m12300-pure.cl index 71bfbffc0..4b84dcab0 100644 --- a/OpenCL/m12300-pure.cl +++ b/OpenCL/m12300-pure.cl @@ -84,7 +84,7 @@ DECLSPEC void hmac_sha512_run_V (u32x *w0, u32x *w1, u32x *w2, u32x *w3, u32x *w sha512_transform_vector (w0, w1, w2, w3, w4, w5, w6, w7, digest); } -__kernel void m12300_init (KERN_ATTR_TMPS (oraclet_tmp_t)) +KERNEL_FQ void m12300_init (KERN_ATTR_TMPS (oraclet_tmp_t)) { /** * base @@ -223,7 +223,7 @@ __kernel void m12300_init (KERN_ATTR_TMPS (oraclet_tmp_t)) } } -__kernel void m12300_loop (KERN_ATTR_TMPS (oraclet_tmp_t)) +KERNEL_FQ void m12300_loop (KERN_ATTR_TMPS (oraclet_tmp_t)) { const u64 gid = get_global_id (0); @@ -349,7 +349,7 @@ __kernel void m12300_loop (KERN_ATTR_TMPS (oraclet_tmp_t)) } } -__kernel void m12300_comp (KERN_ATTR_TMPS (oraclet_tmp_t)) +KERNEL_FQ void m12300_comp (KERN_ATTR_TMPS (oraclet_tmp_t)) { /** * base diff --git a/OpenCL/m12400-pure.cl b/OpenCL/m12400-pure.cl index baa46cb08..222c0b6e8 100644 --- a/OpenCL/m12400-pure.cl +++ b/OpenCL/m12400-pure.cl @@ -59,7 +59,7 @@ typedef struct bsdicrypt_tmp PERM_OP (l, r, tt, 4, 0x0f0f0f0f); \ } -__constant u32a c_SPtrans[8][64] = +CONSTANT_AS u32a c_SPtrans[8][64] = { { 0x00820200, 0x00020000, 0x80800000, 0x80820200, @@ -207,7 +207,7 @@ __constant u32a c_SPtrans[8][64] = }, }; -__constant u32a c_skb[8][64] = +CONSTANT_AS u32a c_skb[8][64] = { { 0x00000000, 0x00000010, 0x20000000, 0x20000010, @@ -357,7 +357,7 @@ __constant u32a c_skb[8][64] = #define BOX(i,n,S) (S)[(n)][(i)] -DECLSPEC void _des_crypt_keysetup (u32 c, u32 d, u32 *Kc, u32 *Kd, __local u32 (*s_skb)[64]) +DECLSPEC void _des_crypt_keysetup (u32 c, u32 d, u32 *Kc, u32 *Kd, LOCAL_AS u32 (*s_skb)[64]) { u32 tt; @@ -426,7 +426,7 @@ DECLSPEC void _des_crypt_keysetup (u32 c, u32 d, u32 *Kc, u32 *Kd, __local u32 ( } } -DECLSPEC void _des_crypt_encrypt (u32 *iv, u32 mask, u32 rounds, u32 *Kc, u32 *Kd, __local u32 (*s_SPtrans)[64]) +DECLSPEC void _des_crypt_encrypt (u32 *iv, u32 mask, u32 rounds, u32 *Kc, u32 *Kd, LOCAL_AS u32 (*s_SPtrans)[64]) { u32 tt; @@ -498,7 +498,7 @@ DECLSPEC void _des_crypt_encrypt (u32 *iv, u32 mask, u32 rounds, u32 *Kc, u32 *K iv[1] = l; } -__kernel void m12400_init (KERN_ATTR_TMPS (bsdicrypt_tmp_t)) +KERNEL_FQ void m12400_init (KERN_ATTR_TMPS (bsdicrypt_tmp_t)) { /** * base @@ -512,8 +512,8 @@ __kernel void m12400_init (KERN_ATTR_TMPS (bsdicrypt_tmp_t)) * sbox */ - __local u32 s_SPtrans[8][64]; - __local u32 s_skb[8][64]; + LOCAL_AS u32 s_SPtrans[8][64]; + LOCAL_AS u32 s_skb[8][64]; for (u32 i = lid; i < 64; i += lsz) { @@ -634,7 +634,7 @@ __kernel void m12400_init (KERN_ATTR_TMPS (bsdicrypt_tmp_t)) tmps[gid].iv[1] = 0; } -__kernel void m12400_loop (KERN_ATTR_TMPS (bsdicrypt_tmp_t)) +KERNEL_FQ void m12400_loop (KERN_ATTR_TMPS (bsdicrypt_tmp_t)) { /** * base @@ -648,8 +648,8 @@ __kernel void m12400_loop (KERN_ATTR_TMPS (bsdicrypt_tmp_t)) * sbox */ - __local u32 s_SPtrans[8][64]; - __local u32 s_skb[8][64]; + LOCAL_AS u32 s_SPtrans[8][64]; + LOCAL_AS u32 s_skb[8][64]; for (u32 i = lid; i < 64; i += lsz) { @@ -765,7 +765,7 @@ __kernel void m12400_loop (KERN_ATTR_TMPS (bsdicrypt_tmp_t)) tmps[gid].iv[1] = iv[1]; } -__kernel void m12400_comp (KERN_ATTR_TMPS (bsdicrypt_tmp_t)) +KERNEL_FQ void m12400_comp (KERN_ATTR_TMPS (bsdicrypt_tmp_t)) { /** * base diff --git a/OpenCL/m12500-pure.cl b/OpenCL/m12500-pure.cl index ddffa58de..086afb9b7 100644 --- a/OpenCL/m12500-pure.cl +++ b/OpenCL/m12500-pure.cl @@ -164,7 +164,7 @@ DECLSPEC void sha1_transform_intern (const u32 *w, u32 *digest) digest[4] += E; } -__kernel void m12500_init (KERN_ATTR_TMPS_ESALT (rar3_tmp_t, pbkdf2_sha1_t)) +KERNEL_FQ void m12500_init (KERN_ATTR_TMPS_ESALT (rar3_tmp_t, pbkdf2_sha1_t)) { /** * base @@ -181,7 +181,7 @@ __kernel void m12500_init (KERN_ATTR_TMPS_ESALT (rar3_tmp_t, pbkdf2_sha1_t)) tmps[gid].dgst[0][4] = SHA1M_E; } -__kernel void m12500_loop (KERN_ATTR_TMPS_ESALT (rar3_tmp_t, pbkdf2_sha1_t)) +KERNEL_FQ void m12500_loop (KERN_ATTR_TMPS_ESALT (rar3_tmp_t, pbkdf2_sha1_t)) { const u64 gid = get_global_id (0); @@ -279,7 +279,7 @@ __kernel void m12500_loop (KERN_ATTR_TMPS_ESALT (rar3_tmp_t, pbkdf2_sha1_t)) tmps[gid].dgst[init_pos + 1][4] = dgst[4]; } -__kernel void m12500_comp (KERN_ATTR_TMPS_ESALT (rar3_tmp_t, pbkdf2_sha1_t)) +KERNEL_FQ void m12500_comp (KERN_ATTR_TMPS_ESALT (rar3_tmp_t, pbkdf2_sha1_t)) { const u64 gid = get_global_id (0); const u64 lid = get_local_id (0); @@ -291,17 +291,17 @@ __kernel void m12500_comp (KERN_ATTR_TMPS_ESALT (rar3_tmp_t, pbkdf2_sha1_t)) #ifdef REAL_SHM - __local u32 s_td0[256]; - __local u32 s_td1[256]; - __local u32 s_td2[256]; - __local u32 s_td3[256]; - __local u32 s_td4[256]; + LOCAL_AS u32 s_td0[256]; + LOCAL_AS u32 s_td1[256]; + LOCAL_AS u32 s_td2[256]; + LOCAL_AS u32 s_td3[256]; + LOCAL_AS u32 s_td4[256]; - __local u32 s_te0[256]; - __local u32 s_te1[256]; - __local u32 s_te2[256]; - __local u32 s_te3[256]; - __local u32 s_te4[256]; + LOCAL_AS u32 s_te0[256]; + LOCAL_AS u32 s_te1[256]; + LOCAL_AS u32 s_te2[256]; + LOCAL_AS u32 s_te3[256]; + LOCAL_AS u32 s_te4[256]; for (u32 i = lid; i < 256; i += lsz) { @@ -322,17 +322,17 @@ __kernel void m12500_comp (KERN_ATTR_TMPS_ESALT (rar3_tmp_t, pbkdf2_sha1_t)) #else - __constant u32a *s_td0 = td0; - __constant u32a *s_td1 = td1; - __constant u32a *s_td2 = td2; - __constant u32a *s_td3 = td3; - __constant u32a *s_td4 = td4; + CONSTANT_AS u32a *s_td0 = td0; + CONSTANT_AS u32a *s_td1 = td1; + CONSTANT_AS u32a *s_td2 = td2; + CONSTANT_AS u32a *s_td3 = td3; + CONSTANT_AS u32a *s_td4 = td4; - __constant u32a *s_te0 = te0; - __constant u32a *s_te1 = te1; - __constant u32a *s_te2 = te2; - __constant u32a *s_te3 = te3; - __constant u32a *s_te4 = te4; + CONSTANT_AS u32a *s_te0 = te0; + CONSTANT_AS u32a *s_te1 = te1; + CONSTANT_AS u32a *s_te2 = te2; + CONSTANT_AS u32a *s_te3 = te3; + CONSTANT_AS u32a *s_te4 = te4; #endif diff --git a/OpenCL/m12600_a0-optimized.cl b/OpenCL/m12600_a0-optimized.cl index eadb9400d..b963595b4 100644 --- a/OpenCL/m12600_a0-optimized.cl +++ b/OpenCL/m12600_a0-optimized.cl @@ -28,7 +28,7 @@ #define uint_to_hex_upper8(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 m12600_m04 (KERN_ATTR_RULES ()) +KERNEL_FQ void m12600_m04 (KERN_ATTR_RULES ()) { /** * modifier @@ -42,7 +42,7 @@ __kernel void m12600_m04 (KERN_ATTR_RULES ()) * bin2asc table */ - __local u32 l_bin2asc[256]; + LOCAL_AS u32 l_bin2asc[256]; for (u32 i = lid; i < 256; i += lsz) { @@ -360,15 +360,15 @@ __kernel void m12600_m04 (KERN_ATTR_RULES ()) } } -__kernel void m12600_m08 (KERN_ATTR_RULES ()) +KERNEL_FQ void m12600_m08 (KERN_ATTR_RULES ()) { } -__kernel void m12600_m16 (KERN_ATTR_RULES ()) +KERNEL_FQ void m12600_m16 (KERN_ATTR_RULES ()) { } -__kernel void m12600_s04 (KERN_ATTR_RULES ()) +KERNEL_FQ void m12600_s04 (KERN_ATTR_RULES ()) { /** * modifier @@ -382,7 +382,7 @@ __kernel void m12600_s04 (KERN_ATTR_RULES ()) * bin2asc table */ - __local u32 l_bin2asc[256]; + LOCAL_AS u32 l_bin2asc[256]; for (u32 i = lid; i < 256; i += lsz) { @@ -715,10 +715,10 @@ __kernel void m12600_s04 (KERN_ATTR_RULES ()) } } -__kernel void m12600_s08 (KERN_ATTR_RULES ()) +KERNEL_FQ void m12600_s08 (KERN_ATTR_RULES ()) { } -__kernel void m12600_s16 (KERN_ATTR_RULES ()) +KERNEL_FQ void m12600_s16 (KERN_ATTR_RULES ()) { } diff --git a/OpenCL/m12600_a0-pure.cl b/OpenCL/m12600_a0-pure.cl index 84cd09854..d2f8fb7b3 100644 --- a/OpenCL/m12600_a0-pure.cl +++ b/OpenCL/m12600_a0-pure.cl @@ -28,7 +28,7 @@ #define uint_to_hex_lower8_le(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 m12600_mxx (KERN_ATTR_RULES ()) +KERNEL_FQ void m12600_mxx (KERN_ATTR_RULES ()) { /** * modifier @@ -42,7 +42,7 @@ __kernel void m12600_mxx (KERN_ATTR_RULES ()) * bin2asc table */ - __local u32 l_bin2asc[256]; + LOCAL_AS u32 l_bin2asc[256]; for (u32 i = lid; i < 256; i += lsz) { @@ -164,7 +164,7 @@ __kernel void m12600_mxx (KERN_ATTR_RULES ()) } } -__kernel void m12600_sxx (KERN_ATTR_RULES ()) +KERNEL_FQ void m12600_sxx (KERN_ATTR_RULES ()) { /** * modifier @@ -178,7 +178,7 @@ __kernel void m12600_sxx (KERN_ATTR_RULES ()) * bin2asc table */ - __local u32 l_bin2asc[256]; + LOCAL_AS u32 l_bin2asc[256]; for (u32 i = lid; i < 256; i += lsz) { diff --git a/OpenCL/m12600_a1-optimized.cl b/OpenCL/m12600_a1-optimized.cl index 8cc0f2139..27ec5dc68 100644 --- a/OpenCL/m12600_a1-optimized.cl +++ b/OpenCL/m12600_a1-optimized.cl @@ -26,7 +26,7 @@ #define uint_to_hex_upper8(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 m12600_m04 (KERN_ATTR_BASIC ()) +KERNEL_FQ void m12600_m04 (KERN_ATTR_BASIC ()) { /** * modifier @@ -40,7 +40,7 @@ __kernel void m12600_m04 (KERN_ATTR_BASIC ()) * bin2asc table */ - __local u32 l_bin2asc[256]; + LOCAL_AS u32 l_bin2asc[256]; for (u32 i = lid; i < 256; i += lsz) { @@ -416,15 +416,15 @@ __kernel void m12600_m04 (KERN_ATTR_BASIC ()) } } -__kernel void m12600_m08 (KERN_ATTR_BASIC ()) +KERNEL_FQ void m12600_m08 (KERN_ATTR_BASIC ()) { } -__kernel void m12600_m16 (KERN_ATTR_BASIC ()) +KERNEL_FQ void m12600_m16 (KERN_ATTR_BASIC ()) { } -__kernel void m12600_s04 (KERN_ATTR_BASIC ()) +KERNEL_FQ void m12600_s04 (KERN_ATTR_BASIC ()) { /** * modifier @@ -438,7 +438,7 @@ __kernel void m12600_s04 (KERN_ATTR_BASIC ()) * bin2asc table */ - __local u32 l_bin2asc[256]; + LOCAL_AS u32 l_bin2asc[256]; for (u32 i = lid; i < 256; i += lsz) { @@ -829,10 +829,10 @@ __kernel void m12600_s04 (KERN_ATTR_BASIC ()) } } -__kernel void m12600_s08 (KERN_ATTR_BASIC ()) +KERNEL_FQ void m12600_s08 (KERN_ATTR_BASIC ()) { } -__kernel void m12600_s16 (KERN_ATTR_BASIC ()) +KERNEL_FQ void m12600_s16 (KERN_ATTR_BASIC ()) { } diff --git a/OpenCL/m12600_a1-pure.cl b/OpenCL/m12600_a1-pure.cl index d08146784..6518aaca0 100644 --- a/OpenCL/m12600_a1-pure.cl +++ b/OpenCL/m12600_a1-pure.cl @@ -26,7 +26,7 @@ #define uint_to_hex_lower8_le(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 m12600_mxx (KERN_ATTR_BASIC ()) +KERNEL_FQ void m12600_mxx (KERN_ATTR_BASIC ()) { /** * modifier @@ -40,7 +40,7 @@ __kernel void m12600_mxx (KERN_ATTR_BASIC ()) * bin2asc table */ - __local u32 l_bin2asc[256]; + LOCAL_AS u32 l_bin2asc[256]; for (u32 i = lid; i < 256; i += lsz) { @@ -160,7 +160,7 @@ __kernel void m12600_mxx (KERN_ATTR_BASIC ()) } } -__kernel void m12600_sxx (KERN_ATTR_BASIC ()) +KERNEL_FQ void m12600_sxx (KERN_ATTR_BASIC ()) { /** * modifier @@ -174,7 +174,7 @@ __kernel void m12600_sxx (KERN_ATTR_BASIC ()) * bin2asc table */ - __local u32 l_bin2asc[256]; + LOCAL_AS u32 l_bin2asc[256]; for (u32 i = lid; i < 256; i += lsz) { diff --git a/OpenCL/m12600_a3-optimized.cl b/OpenCL/m12600_a3-optimized.cl index e9eccd863..cdfe4f73c 100644 --- a/OpenCL/m12600_a3-optimized.cl +++ b/OpenCL/m12600_a3-optimized.cl @@ -26,7 +26,7 @@ #define uint_to_hex_upper8(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 -DECLSPEC void m12600m (u32 *w0, u32 *w1, u32 *w2, u32 *w3, const u32 pw_len, KERN_ATTR_BASIC (), __local u32 *l_bin2asc) +DECLSPEC void m12600m (u32 *w0, u32 *w1, u32 *w2, u32 *w3, const u32 pw_len, KERN_ATTR_BASIC (), LOCAL_AS u32 *l_bin2asc) { /** * modifier @@ -317,7 +317,7 @@ DECLSPEC void m12600m (u32 *w0, u32 *w1, u32 *w2, u32 *w3, const u32 pw_len, KER } } -DECLSPEC void m12600s (u32 *w0, u32 *w1, u32 *w2, u32 *w3, const u32 pw_len, KERN_ATTR_BASIC (), __local u32 *l_bin2asc) +DECLSPEC void m12600s (u32 *w0, u32 *w1, u32 *w2, u32 *w3, const u32 pw_len, KERN_ATTR_BASIC (), LOCAL_AS u32 *l_bin2asc) { /** * modifier @@ -623,7 +623,7 @@ DECLSPEC void m12600s (u32 *w0, u32 *w1, u32 *w2, u32 *w3, const u32 pw_len, KER } } -__kernel void m12600_m04 (KERN_ATTR_BASIC ()) +KERNEL_FQ void m12600_m04 (KERN_ATTR_BASIC ()) { /** * modifier @@ -637,7 +637,7 @@ __kernel void m12600_m04 (KERN_ATTR_BASIC ()) * bin2asc table */ - __local u32 l_bin2asc[256]; + LOCAL_AS u32 l_bin2asc[256]; for (u32 i = lid; i < 256; i += lsz) { @@ -693,7 +693,7 @@ __kernel void m12600_m04 (KERN_ATTR_BASIC ()) m12600m (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_extra0_buf, d_extra1_buf, d_extra2_buf, d_extra3_buf, bitmap_mask, bitmap_shift1, bitmap_shift2, salt_pos, loop_pos, loop_cnt, il_cnt, digests_cnt, digests_offset, combs_mode, gid_max, l_bin2asc); } -__kernel void m12600_m08 (KERN_ATTR_BASIC ()) +KERNEL_FQ void m12600_m08 (KERN_ATTR_BASIC ()) { /** * modifier @@ -707,7 +707,7 @@ __kernel void m12600_m08 (KERN_ATTR_BASIC ()) * bin2asc table */ - __local u32 l_bin2asc[256]; + LOCAL_AS u32 l_bin2asc[256]; for (u32 i = lid; i < 256; i += lsz) { @@ -763,7 +763,7 @@ __kernel void m12600_m08 (KERN_ATTR_BASIC ()) m12600m (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_extra0_buf, d_extra1_buf, d_extra2_buf, d_extra3_buf, bitmap_mask, bitmap_shift1, bitmap_shift2, salt_pos, loop_pos, loop_cnt, il_cnt, digests_cnt, digests_offset, combs_mode, gid_max, l_bin2asc); } -__kernel void m12600_m16 (KERN_ATTR_BASIC ()) +KERNEL_FQ void m12600_m16 (KERN_ATTR_BASIC ()) { /** * modifier @@ -777,7 +777,7 @@ __kernel void m12600_m16 (KERN_ATTR_BASIC ()) * bin2asc table */ - __local u32 l_bin2asc[256]; + LOCAL_AS u32 l_bin2asc[256]; for (u32 i = lid; i < 256; i += lsz) { @@ -833,7 +833,7 @@ __kernel void m12600_m16 (KERN_ATTR_BASIC ()) m12600m (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_extra0_buf, d_extra1_buf, d_extra2_buf, d_extra3_buf, bitmap_mask, bitmap_shift1, bitmap_shift2, salt_pos, loop_pos, loop_cnt, il_cnt, digests_cnt, digests_offset, combs_mode, gid_max, l_bin2asc); } -__kernel void m12600_s04 (KERN_ATTR_BASIC ()) +KERNEL_FQ void m12600_s04 (KERN_ATTR_BASIC ()) { /** * modifier @@ -847,7 +847,7 @@ __kernel void m12600_s04 (KERN_ATTR_BASIC ()) * bin2asc table */ - __local u32 l_bin2asc[256]; + LOCAL_AS u32 l_bin2asc[256]; for (u32 i = lid; i < 256; i += lsz) { @@ -903,7 +903,7 @@ __kernel void m12600_s04 (KERN_ATTR_BASIC ()) m12600s (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_extra0_buf, d_extra1_buf, d_extra2_buf, d_extra3_buf, bitmap_mask, bitmap_shift1, bitmap_shift2, salt_pos, loop_pos, loop_cnt, il_cnt, digests_cnt, digests_offset, combs_mode, gid_max, l_bin2asc); } -__kernel void m12600_s08 (KERN_ATTR_BASIC ()) +KERNEL_FQ void m12600_s08 (KERN_ATTR_BASIC ()) { /** * modifier @@ -917,7 +917,7 @@ __kernel void m12600_s08 (KERN_ATTR_BASIC ()) * bin2asc table */ - __local u32 l_bin2asc[256]; + LOCAL_AS u32 l_bin2asc[256]; for (u32 i = lid; i < 256; i += lsz) { @@ -973,7 +973,7 @@ __kernel void m12600_s08 (KERN_ATTR_BASIC ()) m12600s (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_extra0_buf, d_extra1_buf, d_extra2_buf, d_extra3_buf, bitmap_mask, bitmap_shift1, bitmap_shift2, salt_pos, loop_pos, loop_cnt, il_cnt, digests_cnt, digests_offset, combs_mode, gid_max, l_bin2asc); } -__kernel void m12600_s16 (KERN_ATTR_BASIC ()) +KERNEL_FQ void m12600_s16 (KERN_ATTR_BASIC ()) { /** * modifier @@ -987,7 +987,7 @@ __kernel void m12600_s16 (KERN_ATTR_BASIC ()) * bin2asc table */ - __local u32 l_bin2asc[256]; + LOCAL_AS u32 l_bin2asc[256]; for (u32 i = lid; i < 256; i += lsz) { diff --git a/OpenCL/m12600_a3-pure.cl b/OpenCL/m12600_a3-pure.cl index c25117d82..4299f28fc 100644 --- a/OpenCL/m12600_a3-pure.cl +++ b/OpenCL/m12600_a3-pure.cl @@ -26,7 +26,7 @@ #define uint_to_hex_lower8_le(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 m12600_mxx (KERN_ATTR_VECTOR ()) +KERNEL_FQ void m12600_mxx (KERN_ATTR_VECTOR ()) { /** * modifier @@ -40,7 +40,7 @@ __kernel void m12600_mxx (KERN_ATTR_VECTOR ()) * bin2asc table */ - __local u32 l_bin2asc[256]; + LOCAL_AS u32 l_bin2asc[256]; for (u32 i = lid; i < 256; i += lsz) { @@ -173,7 +173,7 @@ __kernel void m12600_mxx (KERN_ATTR_VECTOR ()) } } -__kernel void m12600_sxx (KERN_ATTR_VECTOR ()) +KERNEL_FQ void m12600_sxx (KERN_ATTR_VECTOR ()) { /** * modifier @@ -187,7 +187,7 @@ __kernel void m12600_sxx (KERN_ATTR_VECTOR ()) * bin2asc table */ - __local u32 l_bin2asc[256]; + LOCAL_AS u32 l_bin2asc[256]; for (u32 i = lid; i < 256; i += lsz) { diff --git a/OpenCL/m12700-pure.cl b/OpenCL/m12700-pure.cl index ec946b09e..dd5b4d9e0 100644 --- a/OpenCL/m12700-pure.cl +++ b/OpenCL/m12700-pure.cl @@ -63,7 +63,7 @@ DECLSPEC void hmac_sha1_run_V (u32x *w0, u32x *w1, u32x *w2, u32x *w3, u32x *ipa sha1_transform_vector (w0, w1, w2, w3, digest); } -__kernel void m12700_init (KERN_ATTR_TMPS (mywallet_tmp_t)) +KERNEL_FQ void m12700_init (KERN_ATTR_TMPS (mywallet_tmp_t)) { /** * base @@ -152,7 +152,7 @@ __kernel void m12700_init (KERN_ATTR_TMPS (mywallet_tmp_t)) } } -__kernel void m12700_loop (KERN_ATTR_TMPS (mywallet_tmp_t)) +KERNEL_FQ void m12700_loop (KERN_ATTR_TMPS (mywallet_tmp_t)) { const u64 gid = get_global_id (0); @@ -237,7 +237,7 @@ __kernel void m12700_loop (KERN_ATTR_TMPS (mywallet_tmp_t)) } } -__kernel void m12700_comp (KERN_ATTR_TMPS (mywallet_tmp_t)) +KERNEL_FQ void m12700_comp (KERN_ATTR_TMPS (mywallet_tmp_t)) { const u64 gid = get_global_id (0); const u64 lid = get_local_id (0); @@ -249,17 +249,17 @@ __kernel void m12700_comp (KERN_ATTR_TMPS (mywallet_tmp_t)) #ifdef REAL_SHM - __local u32 s_td0[256]; - __local u32 s_td1[256]; - __local u32 s_td2[256]; - __local u32 s_td3[256]; - __local u32 s_td4[256]; + LOCAL_AS u32 s_td0[256]; + LOCAL_AS u32 s_td1[256]; + LOCAL_AS u32 s_td2[256]; + LOCAL_AS u32 s_td3[256]; + LOCAL_AS u32 s_td4[256]; - __local u32 s_te0[256]; - __local u32 s_te1[256]; - __local u32 s_te2[256]; - __local u32 s_te3[256]; - __local u32 s_te4[256]; + LOCAL_AS u32 s_te0[256]; + LOCAL_AS u32 s_te1[256]; + LOCAL_AS u32 s_te2[256]; + LOCAL_AS u32 s_te3[256]; + LOCAL_AS u32 s_te4[256]; for (u32 i = lid; i < 256; i += lsz) { @@ -280,17 +280,17 @@ __kernel void m12700_comp (KERN_ATTR_TMPS (mywallet_tmp_t)) #else - __constant u32a *s_td0 = td0; - __constant u32a *s_td1 = td1; - __constant u32a *s_td2 = td2; - __constant u32a *s_td3 = td3; - __constant u32a *s_td4 = td4; + CONSTANT_AS u32a *s_td0 = td0; + CONSTANT_AS u32a *s_td1 = td1; + CONSTANT_AS u32a *s_td2 = td2; + CONSTANT_AS u32a *s_td3 = td3; + CONSTANT_AS u32a *s_td4 = td4; - __constant u32a *s_te0 = te0; - __constant u32a *s_te1 = te1; - __constant u32a *s_te2 = te2; - __constant u32a *s_te3 = te3; - __constant u32a *s_te4 = te4; + CONSTANT_AS u32a *s_te0 = te0; + CONSTANT_AS u32a *s_te1 = te1; + CONSTANT_AS u32a *s_te2 = te2; + CONSTANT_AS u32a *s_te3 = te3; + CONSTANT_AS u32a *s_te4 = te4; #endif diff --git a/OpenCL/m12800-pure.cl b/OpenCL/m12800-pure.cl index 9d018bb48..dc9ff164f 100644 --- a/OpenCL/m12800-pure.cl +++ b/OpenCL/m12800-pure.cl @@ -75,7 +75,7 @@ DECLSPEC void hmac_sha256_run_V (u32x *w0, u32x *w1, u32x *w2, u32x *w3, u32x *i sha256_transform_vector (w0, w1, w2, w3, digest); } -__kernel void m12800_init (KERN_ATTR_TMPS_ESALT (pbkdf2_sha256_tmp_t, pbkdf2_sha256_t)) +KERNEL_FQ void m12800_init (KERN_ATTR_TMPS_ESALT (pbkdf2_sha256_tmp_t, pbkdf2_sha256_t)) { /** * base @@ -89,7 +89,7 @@ __kernel void m12800_init (KERN_ATTR_TMPS_ESALT (pbkdf2_sha256_tmp_t, pbkdf2_sha * lookup ascii table */ - __local u32 l_bin2asc[256]; + LOCAL_AS u32 l_bin2asc[256]; for (u32 i = lid; i < 256; i += lsz) { @@ -242,7 +242,7 @@ __kernel void m12800_init (KERN_ATTR_TMPS_ESALT (pbkdf2_sha256_tmp_t, pbkdf2_sha } } -__kernel void m12800_loop (KERN_ATTR_TMPS_ESALT (pbkdf2_sha256_tmp_t, pbkdf2_sha256_t)) +KERNEL_FQ void m12800_loop (KERN_ATTR_TMPS_ESALT (pbkdf2_sha256_tmp_t, pbkdf2_sha256_t)) { const u64 gid = get_global_id (0); @@ -348,7 +348,7 @@ __kernel void m12800_loop (KERN_ATTR_TMPS_ESALT (pbkdf2_sha256_tmp_t, pbkdf2_sha } } -__kernel void m12800_comp (KERN_ATTR_TMPS_ESALT (pbkdf2_sha256_tmp_t, pbkdf2_sha256_t)) +KERNEL_FQ void m12800_comp (KERN_ATTR_TMPS_ESALT (pbkdf2_sha256_tmp_t, pbkdf2_sha256_t)) { /** * base diff --git a/OpenCL/m12900-pure.cl b/OpenCL/m12900-pure.cl index 070e87462..095eaae52 100644 --- a/OpenCL/m12900-pure.cl +++ b/OpenCL/m12900-pure.cl @@ -74,7 +74,7 @@ DECLSPEC void hmac_sha256_run_V (u32x *w0, u32x *w1, u32x *w2, u32x *w3, u32x *i sha256_transform_vector (w0, w1, w2, w3, digest); } -__kernel void m12900_init (KERN_ATTR_TMPS_ESALT (pbkdf2_sha256_tmp_t, pbkdf2_sha256_t)) +KERNEL_FQ void m12900_init (KERN_ATTR_TMPS_ESALT (pbkdf2_sha256_tmp_t, pbkdf2_sha256_t)) { /** * base @@ -175,7 +175,7 @@ __kernel void m12900_init (KERN_ATTR_TMPS_ESALT (pbkdf2_sha256_tmp_t, pbkdf2_sha } } -__kernel void m12900_loop (KERN_ATTR_TMPS_ESALT (pbkdf2_sha256_tmp_t, pbkdf2_sha256_t)) +KERNEL_FQ void m12900_loop (KERN_ATTR_TMPS_ESALT (pbkdf2_sha256_tmp_t, pbkdf2_sha256_t)) { const u64 gid = get_global_id (0); @@ -281,7 +281,7 @@ __kernel void m12900_loop (KERN_ATTR_TMPS_ESALT (pbkdf2_sha256_tmp_t, pbkdf2_sha } } -__kernel void m12900_comp (KERN_ATTR_TMPS_ESALT (pbkdf2_sha256_tmp_t, pbkdf2_sha256_t)) +KERNEL_FQ void m12900_comp (KERN_ATTR_TMPS_ESALT (pbkdf2_sha256_tmp_t, pbkdf2_sha256_t)) { /** * base diff --git a/OpenCL/m13000-pure.cl b/OpenCL/m13000-pure.cl index 319e73265..a9b56c1c4 100644 --- a/OpenCL/m13000-pure.cl +++ b/OpenCL/m13000-pure.cl @@ -68,7 +68,7 @@ DECLSPEC void hmac_sha256_run_V (u32x *w0, u32x *w1, u32x *w2, u32x *w3, u32x *i sha256_transform_vector (w0, w1, w2, w3, digest); } -__kernel void m13000_init (KERN_ATTR_TMPS (pbkdf2_sha256_tmp_t)) +KERNEL_FQ void m13000_init (KERN_ATTR_TMPS (pbkdf2_sha256_tmp_t)) { /** * base @@ -152,7 +152,7 @@ __kernel void m13000_init (KERN_ATTR_TMPS (pbkdf2_sha256_tmp_t)) } } -__kernel void m13000_loop (KERN_ATTR_TMPS (pbkdf2_sha256_tmp_t)) +KERNEL_FQ void m13000_loop (KERN_ATTR_TMPS (pbkdf2_sha256_tmp_t)) { const u64 gid = get_global_id (0); @@ -258,7 +258,7 @@ __kernel void m13000_loop (KERN_ATTR_TMPS (pbkdf2_sha256_tmp_t)) } } -__kernel void m13000_comp (KERN_ATTR_TMPS (pbkdf2_sha256_tmp_t)) +KERNEL_FQ void m13000_comp (KERN_ATTR_TMPS (pbkdf2_sha256_tmp_t)) { /** * base diff --git a/OpenCL/m13100_a0-optimized.cl b/OpenCL/m13100_a0-optimized.cl index 7851e82e5..43c313317 100644 --- a/OpenCL/m13100_a0-optimized.cl +++ b/OpenCL/m13100_a0-optimized.cl @@ -34,7 +34,7 @@ typedef struct } RC4_KEY; -DECLSPEC void swap (__local RC4_KEY *rc4_key, const u8 i, const u8 j) +DECLSPEC void swap (LOCAL_AS RC4_KEY *rc4_key, const u8 i, const u8 j) { u8 tmp; @@ -43,12 +43,12 @@ DECLSPEC void swap (__local RC4_KEY *rc4_key, const u8 i, const u8 j) rc4_key->S[j] = tmp; } -DECLSPEC void rc4_init_16 (__local RC4_KEY *rc4_key, const u32 *data) +DECLSPEC void rc4_init_16 (LOCAL_AS RC4_KEY *rc4_key, const u32 *data) { u32 v = 0x03020100; u32 a = 0x04040404; - __local u32 *ptr = (__local u32 *) rc4_key->S; + LOCAL_AS u32 *ptr = (LOCAL_AS u32 *) rc4_key->S; #ifdef _unroll #pragma unroll @@ -96,7 +96,7 @@ DECLSPEC void rc4_init_16 (__local RC4_KEY *rc4_key, const u32 *data) } } -DECLSPEC u8 rc4_next_16 (__local RC4_KEY *rc4_key, u8 i, u8 j, const __global u32 *in, u32 *out) +DECLSPEC u8 rc4_next_16 (LOCAL_AS RC4_KEY *rc4_key, u8 i, u8 j, const GLOBAL_AS u32 *in, u32 *out) { #ifdef _unroll #pragma unroll @@ -234,7 +234,7 @@ DECLSPEC void hmac_md5_run (u32 *w0, u32 *w1, u32 *w2, u32 *w3, u32 *ipad, u32 * md5_transform (w0, w1, w2, w3, digest); } -DECLSPEC int decrypt_and_check (__local RC4_KEY *rc4_key, u32 *data, __global const u32 *edata2, const u32 edata2_len, const u32 *K2, const u32 *checksum) +DECLSPEC int decrypt_and_check (LOCAL_AS RC4_KEY *rc4_key, u32 *data, GLOBAL_AS const u32 *edata2, const u32 edata2_len, const u32 *K2, const u32 *checksum) { rc4_init_16 (rc4_key, data); @@ -574,7 +574,7 @@ DECLSPEC void kerb_prepare (const u32 *w0, const u32 *w1, const u32 pw_len, cons hmac_md5_run (w0_t, w1_t, w2_t, w3_t, ipad, opad, digest); } -__kernel void m13100_m04 (KERN_ATTR_RULES_ESALT (krb5tgs_t)) +KERNEL_FQ void m13100_m04 (KERN_ATTR_RULES_ESALT (krb5tgs_t)) { /** * modifier @@ -609,9 +609,9 @@ __kernel void m13100_m04 (KERN_ATTR_RULES_ESALT (krb5tgs_t)) * shared */ - __local RC4_KEY rc4_keys[64]; + LOCAL_AS RC4_KEY rc4_keys[64]; - __local RC4_KEY *rc4_key = &rc4_keys[lid]; + LOCAL_AS RC4_KEY *rc4_key = &rc4_keys[lid]; /** * salt @@ -664,15 +664,15 @@ __kernel void m13100_m04 (KERN_ATTR_RULES_ESALT (krb5tgs_t)) } } -__kernel void m13100_m08 (KERN_ATTR_RULES_ESALT (krb5tgs_t)) +KERNEL_FQ void m13100_m08 (KERN_ATTR_RULES_ESALT (krb5tgs_t)) { } -__kernel void m13100_m16 (KERN_ATTR_RULES_ESALT (krb5tgs_t)) +KERNEL_FQ void m13100_m16 (KERN_ATTR_RULES_ESALT (krb5tgs_t)) { } -__kernel void m13100_s04 (KERN_ATTR_RULES_ESALT (krb5tgs_t)) +KERNEL_FQ void m13100_s04 (KERN_ATTR_RULES_ESALT (krb5tgs_t)) { /** * modifier @@ -707,9 +707,9 @@ __kernel void m13100_s04 (KERN_ATTR_RULES_ESALT (krb5tgs_t)) * shared */ - __local RC4_KEY rc4_keys[64]; + LOCAL_AS RC4_KEY rc4_keys[64]; - __local RC4_KEY *rc4_key = &rc4_keys[lid]; + LOCAL_AS RC4_KEY *rc4_key = &rc4_keys[lid]; /** * salt @@ -762,10 +762,10 @@ __kernel void m13100_s04 (KERN_ATTR_RULES_ESALT (krb5tgs_t)) } } -__kernel void m13100_s08 (KERN_ATTR_RULES_ESALT (krb5tgs_t)) +KERNEL_FQ void m13100_s08 (KERN_ATTR_RULES_ESALT (krb5tgs_t)) { } -__kernel void m13100_s16 (KERN_ATTR_RULES_ESALT (krb5tgs_t)) +KERNEL_FQ void m13100_s16 (KERN_ATTR_RULES_ESALT (krb5tgs_t)) { } diff --git a/OpenCL/m13100_a0-pure.cl b/OpenCL/m13100_a0-pure.cl index acf3fe4f7..d33a7b3e6 100644 --- a/OpenCL/m13100_a0-pure.cl +++ b/OpenCL/m13100_a0-pure.cl @@ -33,7 +33,7 @@ typedef struct } RC4_KEY; -DECLSPEC void swap (__local RC4_KEY *rc4_key, const u8 i, const u8 j) +DECLSPEC void swap (LOCAL_AS RC4_KEY *rc4_key, const u8 i, const u8 j) { u8 tmp; @@ -42,12 +42,12 @@ DECLSPEC void swap (__local RC4_KEY *rc4_key, const u8 i, const u8 j) rc4_key->S[j] = tmp; } -DECLSPEC void rc4_init_16 (__local RC4_KEY *rc4_key, const u32 *data) +DECLSPEC void rc4_init_16 (LOCAL_AS RC4_KEY *rc4_key, const u32 *data) { u32 v = 0x03020100; u32 a = 0x04040404; - __local u32 *ptr = (__local u32 *) rc4_key->S; + LOCAL_AS u32 *ptr = (LOCAL_AS u32 *) rc4_key->S; #ifdef _unroll #pragma unroll @@ -95,7 +95,7 @@ DECLSPEC void rc4_init_16 (__local RC4_KEY *rc4_key, const u32 *data) } } -DECLSPEC u8 rc4_next_16 (__local RC4_KEY *rc4_key, u8 i, u8 j, const __global u32 *in, u32 *out) +DECLSPEC u8 rc4_next_16 (LOCAL_AS RC4_KEY *rc4_key, u8 i, u8 j, const GLOBAL_AS u32 *in, u32 *out) { #ifdef _unroll #pragma unroll @@ -148,7 +148,7 @@ DECLSPEC u8 rc4_next_16 (__local RC4_KEY *rc4_key, u8 i, u8 j, const __global u3 return j; } -DECLSPEC int decrypt_and_check (__local RC4_KEY *rc4_key, u32 *data, __global const u32 *edata2, const u32 edata2_len, const u32 *K2, const u32 *checksum) +DECLSPEC int decrypt_and_check (LOCAL_AS RC4_KEY *rc4_key, u32 *data, GLOBAL_AS const u32 *edata2, const u32 edata2_len, const u32 *K2, const u32 *checksum) { rc4_init_16 (rc4_key, data); @@ -386,7 +386,7 @@ DECLSPEC void kerb_prepare (const u32 *K, const u32 *checksum, u32 *digest, u32 K2[3] = ctx1.opad.h[3]; } -__kernel void m13100_mxx (KERN_ATTR_RULES_ESALT (krb5tgs_t)) +KERNEL_FQ void m13100_mxx (KERN_ATTR_RULES_ESALT (krb5tgs_t)) { /** * modifier @@ -403,9 +403,9 @@ __kernel void m13100_mxx (KERN_ATTR_RULES_ESALT (krb5tgs_t)) COPY_PW (pws[gid]); - __local RC4_KEY rc4_keys[64]; + LOCAL_AS RC4_KEY rc4_keys[64]; - __local RC4_KEY *rc4_key = &rc4_keys[lid]; + LOCAL_AS RC4_KEY *rc4_key = &rc4_keys[lid]; u32 checksum[4]; @@ -448,7 +448,7 @@ __kernel void m13100_mxx (KERN_ATTR_RULES_ESALT (krb5tgs_t)) } } -__kernel void m13100_sxx (KERN_ATTR_RULES_ESALT (krb5tgs_t)) +KERNEL_FQ void m13100_sxx (KERN_ATTR_RULES_ESALT (krb5tgs_t)) { /** * modifier @@ -465,9 +465,9 @@ __kernel void m13100_sxx (KERN_ATTR_RULES_ESALT (krb5tgs_t)) COPY_PW (pws[gid]); - __local RC4_KEY rc4_keys[64]; + LOCAL_AS RC4_KEY rc4_keys[64]; - __local RC4_KEY *rc4_key = &rc4_keys[lid]; + LOCAL_AS RC4_KEY *rc4_key = &rc4_keys[lid]; u32 checksum[4]; diff --git a/OpenCL/m13100_a1-optimized.cl b/OpenCL/m13100_a1-optimized.cl index c64da8db2..0b384800f 100644 --- a/OpenCL/m13100_a1-optimized.cl +++ b/OpenCL/m13100_a1-optimized.cl @@ -32,7 +32,7 @@ typedef struct } RC4_KEY; -DECLSPEC void swap (__local RC4_KEY *rc4_key, const u8 i, const u8 j) +DECLSPEC void swap (LOCAL_AS RC4_KEY *rc4_key, const u8 i, const u8 j) { u8 tmp; @@ -41,12 +41,12 @@ DECLSPEC void swap (__local RC4_KEY *rc4_key, const u8 i, const u8 j) rc4_key->S[j] = tmp; } -DECLSPEC void rc4_init_16 (__local RC4_KEY *rc4_key, const u32 *data) +DECLSPEC void rc4_init_16 (LOCAL_AS RC4_KEY *rc4_key, const u32 *data) { u32 v = 0x03020100; u32 a = 0x04040404; - __local u32 *ptr = (__local u32 *) rc4_key->S; + LOCAL_AS u32 *ptr = (LOCAL_AS u32 *) rc4_key->S; #ifdef _unroll #pragma unroll @@ -94,7 +94,7 @@ DECLSPEC void rc4_init_16 (__local RC4_KEY *rc4_key, const u32 *data) } } -DECLSPEC u8 rc4_next_16 (__local RC4_KEY *rc4_key, u8 i, u8 j, const __global u32 *in, u32 *out) +DECLSPEC u8 rc4_next_16 (LOCAL_AS RC4_KEY *rc4_key, u8 i, u8 j, const GLOBAL_AS u32 *in, u32 *out) { #ifdef _unroll #pragma unroll @@ -232,7 +232,7 @@ DECLSPEC void hmac_md5_run (u32 *w0, u32 *w1, u32 *w2, u32 *w3, u32 *ipad, u32 * md5_transform (w0, w1, w2, w3, digest); } -DECLSPEC int decrypt_and_check (__local RC4_KEY *rc4_key, u32 *data, __global const u32 *edata2, const u32 edata2_len, const u32 *K2, const u32 *checksum) +DECLSPEC int decrypt_and_check (LOCAL_AS RC4_KEY *rc4_key, u32 *data, GLOBAL_AS const u32 *edata2, const u32 edata2_len, const u32 *K2, const u32 *checksum) { rc4_init_16 (rc4_key, data); @@ -572,7 +572,7 @@ DECLSPEC void kerb_prepare (const u32 *w0, const u32 *w1, const u32 pw_len, cons hmac_md5_run (w0_t, w1_t, w2_t, w3_t, ipad, opad, digest); } -__kernel void m13100_m04 (KERN_ATTR_ESALT (krb5tgs_t)) +KERNEL_FQ void m13100_m04 (KERN_ATTR_ESALT (krb5tgs_t)) { /** * modifier @@ -606,9 +606,9 @@ __kernel void m13100_m04 (KERN_ATTR_ESALT (krb5tgs_t)) * shared */ - __local RC4_KEY rc4_keys[64]; + LOCAL_AS RC4_KEY rc4_keys[64]; - __local RC4_KEY *rc4_key = &rc4_keys[lid]; + LOCAL_AS RC4_KEY *rc4_key = &rc4_keys[lid]; /** * salt @@ -711,15 +711,15 @@ __kernel void m13100_m04 (KERN_ATTR_ESALT (krb5tgs_t)) } } -__kernel void m13100_m08 (KERN_ATTR_ESALT (krb5tgs_t)) +KERNEL_FQ void m13100_m08 (KERN_ATTR_ESALT (krb5tgs_t)) { } -__kernel void m13100_m16 (KERN_ATTR_ESALT (krb5tgs_t)) +KERNEL_FQ void m13100_m16 (KERN_ATTR_ESALT (krb5tgs_t)) { } -__kernel void m13100_s04 (KERN_ATTR_ESALT (krb5tgs_t)) +KERNEL_FQ void m13100_s04 (KERN_ATTR_ESALT (krb5tgs_t)) { /** * modifier @@ -753,9 +753,9 @@ __kernel void m13100_s04 (KERN_ATTR_ESALT (krb5tgs_t)) * shared */ - __local RC4_KEY rc4_keys[64]; + LOCAL_AS RC4_KEY rc4_keys[64]; - __local RC4_KEY *rc4_key = &rc4_keys[lid]; + LOCAL_AS RC4_KEY *rc4_key = &rc4_keys[lid]; /** * salt @@ -858,10 +858,10 @@ __kernel void m13100_s04 (KERN_ATTR_ESALT (krb5tgs_t)) } } -__kernel void m13100_s08 (KERN_ATTR_ESALT (krb5tgs_t)) +KERNEL_FQ void m13100_s08 (KERN_ATTR_ESALT (krb5tgs_t)) { } -__kernel void m13100_s16 (KERN_ATTR_ESALT (krb5tgs_t)) +KERNEL_FQ void m13100_s16 (KERN_ATTR_ESALT (krb5tgs_t)) { } diff --git a/OpenCL/m13100_a1-pure.cl b/OpenCL/m13100_a1-pure.cl index afe866c3d..e6ec0315a 100644 --- a/OpenCL/m13100_a1-pure.cl +++ b/OpenCL/m13100_a1-pure.cl @@ -31,7 +31,7 @@ typedef struct } RC4_KEY; -DECLSPEC void swap (__local RC4_KEY *rc4_key, const u8 i, const u8 j) +DECLSPEC void swap (LOCAL_AS RC4_KEY *rc4_key, const u8 i, const u8 j) { u8 tmp; @@ -40,12 +40,12 @@ DECLSPEC void swap (__local RC4_KEY *rc4_key, const u8 i, const u8 j) rc4_key->S[j] = tmp; } -DECLSPEC void rc4_init_16 (__local RC4_KEY *rc4_key, const u32 *data) +DECLSPEC void rc4_init_16 (LOCAL_AS RC4_KEY *rc4_key, const u32 *data) { u32 v = 0x03020100; u32 a = 0x04040404; - __local u32 *ptr = (__local u32 *) rc4_key->S; + LOCAL_AS u32 *ptr = (LOCAL_AS u32 *) rc4_key->S; #ifdef _unroll #pragma unroll @@ -93,7 +93,7 @@ DECLSPEC void rc4_init_16 (__local RC4_KEY *rc4_key, const u32 *data) } } -DECLSPEC u8 rc4_next_16 (__local RC4_KEY *rc4_key, u8 i, u8 j, const __global u32 *in, u32 *out) +DECLSPEC u8 rc4_next_16 (LOCAL_AS RC4_KEY *rc4_key, u8 i, u8 j, const GLOBAL_AS u32 *in, u32 *out) { #ifdef _unroll #pragma unroll @@ -146,7 +146,7 @@ DECLSPEC u8 rc4_next_16 (__local RC4_KEY *rc4_key, u8 i, u8 j, const __global u3 return j; } -DECLSPEC int decrypt_and_check (__local RC4_KEY *rc4_key, u32 *data, __global const u32 *edata2, const u32 edata2_len, const u32 *K2, const u32 *checksum) +DECLSPEC int decrypt_and_check (LOCAL_AS RC4_KEY *rc4_key, u32 *data, GLOBAL_AS const u32 *edata2, const u32 edata2_len, const u32 *K2, const u32 *checksum) { rc4_init_16 (rc4_key, data); @@ -384,7 +384,7 @@ DECLSPEC void kerb_prepare (const u32 *K, const u32 *checksum, u32 *digest, u32 K2[3] = ctx1.opad.h[3]; } -__kernel void m13100_mxx (KERN_ATTR_ESALT (krb5tgs_t)) +KERNEL_FQ void m13100_mxx (KERN_ATTR_ESALT (krb5tgs_t)) { /** * modifier @@ -399,9 +399,9 @@ __kernel void m13100_mxx (KERN_ATTR_ESALT (krb5tgs_t)) * base */ - __local RC4_KEY rc4_keys[64]; + LOCAL_AS RC4_KEY rc4_keys[64]; - __local RC4_KEY *rc4_key = &rc4_keys[lid]; + LOCAL_AS RC4_KEY *rc4_key = &rc4_keys[lid]; u32 checksum[4]; @@ -444,7 +444,7 @@ __kernel void m13100_mxx (KERN_ATTR_ESALT (krb5tgs_t)) } } -__kernel void m13100_sxx (KERN_ATTR_ESALT (krb5tgs_t)) +KERNEL_FQ void m13100_sxx (KERN_ATTR_ESALT (krb5tgs_t)) { /** * modifier @@ -459,9 +459,9 @@ __kernel void m13100_sxx (KERN_ATTR_ESALT (krb5tgs_t)) * base */ - __local RC4_KEY rc4_keys[64]; + LOCAL_AS RC4_KEY rc4_keys[64]; - __local RC4_KEY *rc4_key = &rc4_keys[lid]; + LOCAL_AS RC4_KEY *rc4_key = &rc4_keys[lid]; u32 checksum[4]; diff --git a/OpenCL/m13100_a3-optimized.cl b/OpenCL/m13100_a3-optimized.cl index 60fa57490..7526a7459 100644 --- a/OpenCL/m13100_a3-optimized.cl +++ b/OpenCL/m13100_a3-optimized.cl @@ -32,7 +32,7 @@ typedef struct } RC4_KEY; -DECLSPEC void swap (__local RC4_KEY *rc4_key, const u8 i, const u8 j) +DECLSPEC void swap (LOCAL_AS RC4_KEY *rc4_key, const u8 i, const u8 j) { u8 tmp; @@ -41,12 +41,12 @@ DECLSPEC void swap (__local RC4_KEY *rc4_key, const u8 i, const u8 j) rc4_key->S[j] = tmp; } -DECLSPEC void rc4_init_16 (__local RC4_KEY *rc4_key, const u32 *data) +DECLSPEC void rc4_init_16 (LOCAL_AS RC4_KEY *rc4_key, const u32 *data) { u32 v = 0x03020100; u32 a = 0x04040404; - __local u32 *ptr = (__local u32 *) rc4_key->S; + LOCAL_AS u32 *ptr = (LOCAL_AS u32 *) rc4_key->S; #ifdef _unroll #pragma unroll @@ -94,7 +94,7 @@ DECLSPEC void rc4_init_16 (__local RC4_KEY *rc4_key, const u32 *data) } } -DECLSPEC u8 rc4_next_16 (__local RC4_KEY *rc4_key, u8 i, u8 j, const __global u32 *in, u32 *out) +DECLSPEC u8 rc4_next_16 (LOCAL_AS RC4_KEY *rc4_key, u8 i, u8 j, const GLOBAL_AS u32 *in, u32 *out) { #ifdef _unroll #pragma unroll @@ -232,7 +232,7 @@ DECLSPEC void hmac_md5_run (u32 *w0, u32 *w1, u32 *w2, u32 *w3, u32 *ipad, u32 * md5_transform (w0, w1, w2, w3, digest); } -DECLSPEC int decrypt_and_check (__local RC4_KEY *rc4_key, u32 *data, __global const u32 *edata2, const u32 edata2_len, const u32 *K2, const u32 *checksum) +DECLSPEC int decrypt_and_check (LOCAL_AS RC4_KEY *rc4_key, u32 *data, GLOBAL_AS const u32 *edata2, const u32 edata2_len, const u32 *K2, const u32 *checksum) { rc4_init_16 (rc4_key, data); @@ -572,7 +572,7 @@ DECLSPEC void kerb_prepare (const u32 *w0, const u32 *w1, const u32 pw_len, cons hmac_md5_run (w0_t, w1_t, w2_t, w3_t, ipad, opad, digest); } -DECLSPEC void m13100 (__local RC4_KEY *rc4_key, u32 *w0, u32 *w1, u32 *w2, u32 *w3, const u32 pw_len, KERN_ATTR_ESALT (krb5tgs_t)) +DECLSPEC void m13100 (LOCAL_AS RC4_KEY *rc4_key, u32 *w0, u32 *w1, u32 *w2, u32 *w3, const u32 pw_len, KERN_ATTR_ESALT (krb5tgs_t)) { /** * modifier @@ -631,7 +631,7 @@ DECLSPEC void m13100 (__local RC4_KEY *rc4_key, u32 *w0, u32 *w1, u32 *w2, u32 * } } -__kernel void m13100_m04 (KERN_ATTR_ESALT (krb5tgs_t)) +KERNEL_FQ void m13100_m04 (KERN_ATTR_ESALT (krb5tgs_t)) { /** * base @@ -676,14 +676,14 @@ __kernel void m13100_m04 (KERN_ATTR_ESALT (krb5tgs_t)) * main */ - __local RC4_KEY rc4_keys[64]; + LOCAL_AS RC4_KEY rc4_keys[64]; - __local RC4_KEY *rc4_key = &rc4_keys[lid]; + LOCAL_AS RC4_KEY *rc4_key = &rc4_keys[lid]; m13100 (rc4_key, 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_extra0_buf, d_extra1_buf, d_extra2_buf, d_extra3_buf, bitmap_mask, bitmap_shift1, bitmap_shift2, salt_pos, loop_pos, loop_cnt, il_cnt, digests_cnt, digests_offset, combs_mode, gid_max); } -__kernel void m13100_m08 (KERN_ATTR_ESALT (krb5tgs_t)) +KERNEL_FQ void m13100_m08 (KERN_ATTR_ESALT (krb5tgs_t)) { /** * base @@ -728,18 +728,18 @@ __kernel void m13100_m08 (KERN_ATTR_ESALT (krb5tgs_t)) * main */ - __local RC4_KEY rc4_keys[64]; + LOCAL_AS RC4_KEY rc4_keys[64]; - __local RC4_KEY *rc4_key = &rc4_keys[lid]; + LOCAL_AS RC4_KEY *rc4_key = &rc4_keys[lid]; m13100 (rc4_key, 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_extra0_buf, d_extra1_buf, d_extra2_buf, d_extra3_buf, bitmap_mask, bitmap_shift1, bitmap_shift2, salt_pos, loop_pos, loop_cnt, il_cnt, digests_cnt, digests_offset, combs_mode, gid_max); } -__kernel void m13100_m16 (KERN_ATTR_ESALT (krb5tgs_t)) +KERNEL_FQ void m13100_m16 (KERN_ATTR_ESALT (krb5tgs_t)) { } -__kernel void m13100_s04 (KERN_ATTR_ESALT (krb5tgs_t)) +KERNEL_FQ void m13100_s04 (KERN_ATTR_ESALT (krb5tgs_t)) { /** * base @@ -784,14 +784,14 @@ __kernel void m13100_s04 (KERN_ATTR_ESALT (krb5tgs_t)) * main */ - __local RC4_KEY rc4_keys[64]; + LOCAL_AS RC4_KEY rc4_keys[64]; - __local RC4_KEY *rc4_key = &rc4_keys[lid]; + LOCAL_AS RC4_KEY *rc4_key = &rc4_keys[lid]; m13100 (rc4_key, 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_extra0_buf, d_extra1_buf, d_extra2_buf, d_extra3_buf, bitmap_mask, bitmap_shift1, bitmap_shift2, salt_pos, loop_pos, loop_cnt, il_cnt, digests_cnt, digests_offset, combs_mode, gid_max); } -__kernel void m13100_s08 (KERN_ATTR_ESALT (krb5tgs_t)) +KERNEL_FQ void m13100_s08 (KERN_ATTR_ESALT (krb5tgs_t)) { /** * base @@ -836,13 +836,13 @@ __kernel void m13100_s08 (KERN_ATTR_ESALT (krb5tgs_t)) * main */ - __local RC4_KEY rc4_keys[64]; + LOCAL_AS RC4_KEY rc4_keys[64]; - __local RC4_KEY *rc4_key = &rc4_keys[lid]; + LOCAL_AS RC4_KEY *rc4_key = &rc4_keys[lid]; m13100 (rc4_key, 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_extra0_buf, d_extra1_buf, d_extra2_buf, d_extra3_buf, bitmap_mask, bitmap_shift1, bitmap_shift2, salt_pos, loop_pos, loop_cnt, il_cnt, digests_cnt, digests_offset, combs_mode, gid_max); } -__kernel void m13100_s16 (KERN_ATTR_ESALT (krb5tgs_t)) +KERNEL_FQ void m13100_s16 (KERN_ATTR_ESALT (krb5tgs_t)) { } diff --git a/OpenCL/m13100_a3-pure.cl b/OpenCL/m13100_a3-pure.cl index dbbba29ac..f12b3d244 100644 --- a/OpenCL/m13100_a3-pure.cl +++ b/OpenCL/m13100_a3-pure.cl @@ -31,7 +31,7 @@ typedef struct } RC4_KEY; -DECLSPEC void swap (__local RC4_KEY *rc4_key, const u8 i, const u8 j) +DECLSPEC void swap (LOCAL_AS RC4_KEY *rc4_key, const u8 i, const u8 j) { u8 tmp; @@ -40,12 +40,12 @@ DECLSPEC void swap (__local RC4_KEY *rc4_key, const u8 i, const u8 j) rc4_key->S[j] = tmp; } -DECLSPEC void rc4_init_16 (__local RC4_KEY *rc4_key, const u32 *data) +DECLSPEC void rc4_init_16 (LOCAL_AS RC4_KEY *rc4_key, const u32 *data) { u32 v = 0x03020100; u32 a = 0x04040404; - __local u32 *ptr = (__local u32 *) rc4_key->S; + LOCAL_AS u32 *ptr = (LOCAL_AS u32 *) rc4_key->S; #ifdef _unroll #pragma unroll @@ -93,7 +93,7 @@ DECLSPEC void rc4_init_16 (__local RC4_KEY *rc4_key, const u32 *data) } } -DECLSPEC u8 rc4_next_16 (__local RC4_KEY *rc4_key, u8 i, u8 j, const __global u32 *in, u32 *out) +DECLSPEC u8 rc4_next_16 (LOCAL_AS RC4_KEY *rc4_key, u8 i, u8 j, const GLOBAL_AS u32 *in, u32 *out) { #ifdef _unroll #pragma unroll @@ -146,7 +146,7 @@ DECLSPEC u8 rc4_next_16 (__local RC4_KEY *rc4_key, u8 i, u8 j, const __global u3 return j; } -DECLSPEC int decrypt_and_check (__local RC4_KEY *rc4_key, u32 *data, __global const u32 *edata2, const u32 edata2_len, const u32 *K2, const u32 *checksum) +DECLSPEC int decrypt_and_check (LOCAL_AS RC4_KEY *rc4_key, u32 *data, GLOBAL_AS const u32 *edata2, const u32 edata2_len, const u32 *K2, const u32 *checksum) { rc4_init_16 (rc4_key, data); @@ -384,7 +384,7 @@ DECLSPEC void kerb_prepare (const u32 *K, const u32 *checksum, u32 *digest, u32 K2[3] = ctx1.opad.h[3]; } -__kernel void m13100_mxx (KERN_ATTR_VECTOR_ESALT (krb5tgs_t)) +KERNEL_FQ void m13100_mxx (KERN_ATTR_VECTOR_ESALT (krb5tgs_t)) { /** * modifier @@ -408,9 +408,9 @@ __kernel void m13100_mxx (KERN_ATTR_VECTOR_ESALT (krb5tgs_t)) w[idx] = pws[gid].i[idx]; } - __local RC4_KEY rc4_keys[64]; + LOCAL_AS RC4_KEY rc4_keys[64]; - __local RC4_KEY *rc4_key = &rc4_keys[lid]; + LOCAL_AS RC4_KEY *rc4_key = &rc4_keys[lid]; u32 checksum[4]; @@ -457,7 +457,7 @@ __kernel void m13100_mxx (KERN_ATTR_VECTOR_ESALT (krb5tgs_t)) } } -__kernel void m13100_sxx (KERN_ATTR_VECTOR_ESALT (krb5tgs_t)) +KERNEL_FQ void m13100_sxx (KERN_ATTR_VECTOR_ESALT (krb5tgs_t)) { /** * modifier @@ -481,9 +481,9 @@ __kernel void m13100_sxx (KERN_ATTR_VECTOR_ESALT (krb5tgs_t)) w[idx] = pws[gid].i[idx]; } - __local RC4_KEY rc4_keys[64]; + LOCAL_AS RC4_KEY rc4_keys[64]; - __local RC4_KEY *rc4_key = &rc4_keys[lid]; + LOCAL_AS RC4_KEY *rc4_key = &rc4_keys[lid]; u32 checksum[4]; diff --git a/OpenCL/m13200-pure.cl b/OpenCL/m13200-pure.cl index f48107322..6b344bd2c 100644 --- a/OpenCL/m13200-pure.cl +++ b/OpenCL/m13200-pure.cl @@ -19,7 +19,7 @@ typedef struct axcrypt_tmp } axcrypt_tmp_t; -__kernel void m13200_init (KERN_ATTR_TMPS (axcrypt_tmp_t)) +KERNEL_FQ void m13200_init (KERN_ATTR_TMPS (axcrypt_tmp_t)) { /** * base @@ -73,7 +73,7 @@ __kernel void m13200_init (KERN_ATTR_TMPS (axcrypt_tmp_t)) tmps[gid].cipher[3] = 0; } -__kernel void m13200_loop (KERN_ATTR_TMPS (axcrypt_tmp_t)) +KERNEL_FQ void m13200_loop (KERN_ATTR_TMPS (axcrypt_tmp_t)) { const u64 gid = get_global_id (0); const u64 lid = get_local_id (0); @@ -85,17 +85,17 @@ __kernel void m13200_loop (KERN_ATTR_TMPS (axcrypt_tmp_t)) #ifdef REAL_SHM - __local u32 s_td0[256]; - __local u32 s_td1[256]; - __local u32 s_td2[256]; - __local u32 s_td3[256]; - __local u32 s_td4[256]; + LOCAL_AS u32 s_td0[256]; + LOCAL_AS u32 s_td1[256]; + LOCAL_AS u32 s_td2[256]; + LOCAL_AS u32 s_td3[256]; + LOCAL_AS u32 s_td4[256]; - __local u32 s_te0[256]; - __local u32 s_te1[256]; - __local u32 s_te2[256]; - __local u32 s_te3[256]; - __local u32 s_te4[256]; + LOCAL_AS u32 s_te0[256]; + LOCAL_AS u32 s_te1[256]; + LOCAL_AS u32 s_te2[256]; + LOCAL_AS u32 s_te3[256]; + LOCAL_AS u32 s_te4[256]; for (u32 i = lid; i < 256; i += lsz) { @@ -116,17 +116,17 @@ __kernel void m13200_loop (KERN_ATTR_TMPS (axcrypt_tmp_t)) #else - __constant u32a *s_td0 = td0; - __constant u32a *s_td1 = td1; - __constant u32a *s_td2 = td2; - __constant u32a *s_td3 = td3; - __constant u32a *s_td4 = td4; + CONSTANT_AS u32a *s_td0 = td0; + CONSTANT_AS u32a *s_td1 = td1; + CONSTANT_AS u32a *s_td2 = td2; + CONSTANT_AS u32a *s_td3 = td3; + CONSTANT_AS u32a *s_td4 = td4; - __constant u32a *s_te0 = te0; - __constant u32a *s_te1 = te1; - __constant u32a *s_te2 = te2; - __constant u32a *s_te3 = te3; - __constant u32a *s_te4 = te4; + CONSTANT_AS u32a *s_te0 = te0; + CONSTANT_AS u32a *s_te1 = te1; + CONSTANT_AS u32a *s_te2 = te2; + CONSTANT_AS u32a *s_te3 = te3; + CONSTANT_AS u32a *s_te4 = te4; #endif @@ -210,7 +210,7 @@ __kernel void m13200_loop (KERN_ATTR_TMPS (axcrypt_tmp_t)) tmps[gid].cipher[3] = cipher[3]; } -__kernel void m13200_comp (KERN_ATTR_TMPS (axcrypt_tmp_t)) +KERNEL_FQ void m13200_comp (KERN_ATTR_TMPS (axcrypt_tmp_t)) { /** * base diff --git a/OpenCL/m13300_a0-optimized.cl b/OpenCL/m13300_a0-optimized.cl index 2560129f0..797a4ec5a 100644 --- a/OpenCL/m13300_a0-optimized.cl +++ b/OpenCL/m13300_a0-optimized.cl @@ -15,7 +15,7 @@ #include "inc_hash_sha1.cl" #endif -__kernel void m13300_m04 (KERN_ATTR_RULES ()) +KERNEL_FQ void m13300_m04 (KERN_ATTR_RULES ()) { /** * modifier @@ -194,15 +194,15 @@ __kernel void m13300_m04 (KERN_ATTR_RULES ()) } } -__kernel void m13300_m08 (KERN_ATTR_RULES ()) +KERNEL_FQ void m13300_m08 (KERN_ATTR_RULES ()) { } -__kernel void m13300_m16 (KERN_ATTR_RULES ()) +KERNEL_FQ void m13300_m16 (KERN_ATTR_RULES ()) { } -__kernel void m13300_s04 (KERN_ATTR_RULES ()) +KERNEL_FQ void m13300_s04 (KERN_ATTR_RULES ()) { /** * modifier @@ -393,10 +393,10 @@ __kernel void m13300_s04 (KERN_ATTR_RULES ()) } } -__kernel void m13300_s08 (KERN_ATTR_RULES ()) +KERNEL_FQ void m13300_s08 (KERN_ATTR_RULES ()) { } -__kernel void m13300_s16 (KERN_ATTR_RULES ()) +KERNEL_FQ void m13300_s16 (KERN_ATTR_RULES ()) { } diff --git a/OpenCL/m13300_a0-pure.cl b/OpenCL/m13300_a0-pure.cl index 7ca0849a3..9a35265d6 100644 --- a/OpenCL/m13300_a0-pure.cl +++ b/OpenCL/m13300_a0-pure.cl @@ -15,7 +15,7 @@ #include "inc_hash_sha1.cl" #endif -__kernel void m13300_mxx (KERN_ATTR_RULES ()) +KERNEL_FQ void m13300_mxx (KERN_ATTR_RULES ()) { /** * modifier @@ -61,7 +61,7 @@ __kernel void m13300_mxx (KERN_ATTR_RULES ()) } } -__kernel void m13300_sxx (KERN_ATTR_RULES ()) +KERNEL_FQ void m13300_sxx (KERN_ATTR_RULES ()) { /** * modifier diff --git a/OpenCL/m13300_a1-optimized.cl b/OpenCL/m13300_a1-optimized.cl index f067e2923..d415ee62e 100644 --- a/OpenCL/m13300_a1-optimized.cl +++ b/OpenCL/m13300_a1-optimized.cl @@ -13,7 +13,7 @@ #include "inc_hash_sha1.cl" #endif -__kernel void m13300_m04 (KERN_ATTR_BASIC ()) +KERNEL_FQ void m13300_m04 (KERN_ATTR_BASIC ()) { /** * modifier @@ -250,15 +250,15 @@ __kernel void m13300_m04 (KERN_ATTR_BASIC ()) } } -__kernel void m13300_m08 (KERN_ATTR_BASIC ()) +KERNEL_FQ void m13300_m08 (KERN_ATTR_BASIC ()) { } -__kernel void m13300_m16 (KERN_ATTR_BASIC ()) +KERNEL_FQ void m13300_m16 (KERN_ATTR_BASIC ()) { } -__kernel void m13300_s04 (KERN_ATTR_BASIC ()) +KERNEL_FQ void m13300_s04 (KERN_ATTR_BASIC ()) { /** * modifier @@ -507,10 +507,10 @@ __kernel void m13300_s04 (KERN_ATTR_BASIC ()) } } -__kernel void m13300_s08 (KERN_ATTR_BASIC ()) +KERNEL_FQ void m13300_s08 (KERN_ATTR_BASIC ()) { } -__kernel void m13300_s16 (KERN_ATTR_BASIC ()) +KERNEL_FQ void m13300_s16 (KERN_ATTR_BASIC ()) { } diff --git a/OpenCL/m13300_a1-pure.cl b/OpenCL/m13300_a1-pure.cl index 71cb3aae5..a8e24f994 100644 --- a/OpenCL/m13300_a1-pure.cl +++ b/OpenCL/m13300_a1-pure.cl @@ -13,7 +13,7 @@ #include "inc_hash_sha1.cl" #endif -__kernel void m13300_mxx (KERN_ATTR_BASIC ()) +KERNEL_FQ void m13300_mxx (KERN_ATTR_BASIC ()) { /** * modifier @@ -57,7 +57,7 @@ __kernel void m13300_mxx (KERN_ATTR_BASIC ()) } } -__kernel void m13300_sxx (KERN_ATTR_BASIC ()) +KERNEL_FQ void m13300_sxx (KERN_ATTR_BASIC ()) { /** * modifier diff --git a/OpenCL/m13300_a3-optimized.cl b/OpenCL/m13300_a3-optimized.cl index d7e764af7..100412755 100644 --- a/OpenCL/m13300_a3-optimized.cl +++ b/OpenCL/m13300_a3-optimized.cl @@ -527,7 +527,7 @@ DECLSPEC void m13300s (u32 *w, const u32 pw_len, KERN_ATTR_VECTOR ()) } } -__kernel void m13300_m04 (KERN_ATTR_VECTOR ()) +KERNEL_FQ void m13300_m04 (KERN_ATTR_VECTOR ()) { /** * base @@ -565,7 +565,7 @@ __kernel void m13300_m04 (KERN_ATTR_VECTOR ()) m13300m (w, pw_len, pws, rules_buf, combs_buf, words_buf_r, 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_extra0_buf, d_extra1_buf, d_extra2_buf, d_extra3_buf, bitmap_mask, bitmap_shift1, bitmap_shift2, salt_pos, loop_pos, loop_cnt, il_cnt, digests_cnt, digests_offset, combs_mode, gid_max); } -__kernel void m13300_m08 (KERN_ATTR_VECTOR ()) +KERNEL_FQ void m13300_m08 (KERN_ATTR_VECTOR ()) { /** * base @@ -603,7 +603,7 @@ __kernel void m13300_m08 (KERN_ATTR_VECTOR ()) m13300m (w, pw_len, pws, rules_buf, combs_buf, words_buf_r, 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_extra0_buf, d_extra1_buf, d_extra2_buf, d_extra3_buf, bitmap_mask, bitmap_shift1, bitmap_shift2, salt_pos, loop_pos, loop_cnt, il_cnt, digests_cnt, digests_offset, combs_mode, gid_max); } -__kernel void m13300_m16 (KERN_ATTR_VECTOR ()) +KERNEL_FQ void m13300_m16 (KERN_ATTR_VECTOR ()) { /** * base @@ -641,7 +641,7 @@ __kernel void m13300_m16 (KERN_ATTR_VECTOR ()) m13300m (w, pw_len, pws, rules_buf, combs_buf, words_buf_r, 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_extra0_buf, d_extra1_buf, d_extra2_buf, d_extra3_buf, bitmap_mask, bitmap_shift1, bitmap_shift2, salt_pos, loop_pos, loop_cnt, il_cnt, digests_cnt, digests_offset, combs_mode, gid_max); } -__kernel void m13300_s04 (KERN_ATTR_VECTOR ()) +KERNEL_FQ void m13300_s04 (KERN_ATTR_VECTOR ()) { /** * base @@ -679,7 +679,7 @@ __kernel void m13300_s04 (KERN_ATTR_VECTOR ()) m13300s (w, pw_len, pws, rules_buf, combs_buf, words_buf_r, 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_extra0_buf, d_extra1_buf, d_extra2_buf, d_extra3_buf, bitmap_mask, bitmap_shift1, bitmap_shift2, salt_pos, loop_pos, loop_cnt, il_cnt, digests_cnt, digests_offset, combs_mode, gid_max); } -__kernel void m13300_s08 (KERN_ATTR_VECTOR ()) +KERNEL_FQ void m13300_s08 (KERN_ATTR_VECTOR ()) { /** * base @@ -717,7 +717,7 @@ __kernel void m13300_s08 (KERN_ATTR_VECTOR ()) m13300s (w, pw_len, pws, rules_buf, combs_buf, words_buf_r, 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_extra0_buf, d_extra1_buf, d_extra2_buf, d_extra3_buf, bitmap_mask, bitmap_shift1, bitmap_shift2, salt_pos, loop_pos, loop_cnt, il_cnt, digests_cnt, digests_offset, combs_mode, gid_max); } -__kernel void m13300_s16 (KERN_ATTR_VECTOR ()) +KERNEL_FQ void m13300_s16 (KERN_ATTR_VECTOR ()) { /** * base diff --git a/OpenCL/m13300_a3-pure.cl b/OpenCL/m13300_a3-pure.cl index d7400de5a..734d897f0 100644 --- a/OpenCL/m13300_a3-pure.cl +++ b/OpenCL/m13300_a3-pure.cl @@ -13,7 +13,7 @@ #include "inc_hash_sha1.cl" #endif -__kernel void m13300_mxx (KERN_ATTR_VECTOR ()) +KERNEL_FQ void m13300_mxx (KERN_ATTR_VECTOR ()) { /** * modifier @@ -70,7 +70,7 @@ __kernel void m13300_mxx (KERN_ATTR_VECTOR ()) } } -__kernel void m13300_sxx (KERN_ATTR_VECTOR ()) +KERNEL_FQ void m13300_sxx (KERN_ATTR_VECTOR ()) { /** * modifier diff --git a/OpenCL/m13400-pure.cl b/OpenCL/m13400-pure.cl index 380a4c016..35afbeedc 100644 --- a/OpenCL/m13400-pure.cl +++ b/OpenCL/m13400-pure.cl @@ -44,7 +44,7 @@ typedef struct keepass } keepass_t; -__kernel void m13400_init (KERN_ATTR_TMPS_ESALT (keepass_tmp_t, keepass_t)) +KERNEL_FQ void m13400_init (KERN_ATTR_TMPS_ESALT (keepass_tmp_t, keepass_t)) { /** * base @@ -163,7 +163,7 @@ __kernel void m13400_init (KERN_ATTR_TMPS_ESALT (keepass_tmp_t, keepass_t)) tmps[gid].tmp_digest[7] = digest[7]; } -__kernel void m13400_loop (KERN_ATTR_TMPS_ESALT (keepass_tmp_t, keepass_t)) +KERNEL_FQ void m13400_loop (KERN_ATTR_TMPS_ESALT (keepass_tmp_t, keepass_t)) { const u64 gid = get_global_id (0); const u64 lid = get_local_id (0); @@ -175,11 +175,11 @@ __kernel void m13400_loop (KERN_ATTR_TMPS_ESALT (keepass_tmp_t, keepass_t)) #ifdef REAL_SHM - __local u32 s_te0[256]; - __local u32 s_te1[256]; - __local u32 s_te2[256]; - __local u32 s_te3[256]; - __local u32 s_te4[256]; + LOCAL_AS u32 s_te0[256]; + LOCAL_AS u32 s_te1[256]; + LOCAL_AS u32 s_te2[256]; + LOCAL_AS u32 s_te3[256]; + LOCAL_AS u32 s_te4[256]; for (u32 i = lid; i < 256; i += lsz) { @@ -194,11 +194,11 @@ __kernel void m13400_loop (KERN_ATTR_TMPS_ESALT (keepass_tmp_t, keepass_t)) #else - __constant u32a *s_te0 = te0; - __constant u32a *s_te1 = te1; - __constant u32a *s_te2 = te2; - __constant u32a *s_te3 = te3; - __constant u32a *s_te4 = te4; + CONSTANT_AS u32a *s_te0 = te0; + CONSTANT_AS u32a *s_te1 = te1; + CONSTANT_AS u32a *s_te2 = te2; + CONSTANT_AS u32a *s_te3 = te3; + CONSTANT_AS u32a *s_te4 = te4; #endif @@ -251,7 +251,7 @@ __kernel void m13400_loop (KERN_ATTR_TMPS_ESALT (keepass_tmp_t, keepass_t)) tmps[gid].tmp_digest[7] = data1[3]; } -__kernel void m13400_comp (KERN_ATTR_TMPS_ESALT (keepass_tmp_t, keepass_t)) +KERNEL_FQ void m13400_comp (KERN_ATTR_TMPS_ESALT (keepass_tmp_t, keepass_t)) { const u64 gid = get_global_id (0); const u64 lid = get_local_id (0); @@ -263,17 +263,17 @@ __kernel void m13400_comp (KERN_ATTR_TMPS_ESALT (keepass_tmp_t, keepass_t)) #ifdef REAL_SHM - __local u32 s_td0[256]; - __local u32 s_td1[256]; - __local u32 s_td2[256]; - __local u32 s_td3[256]; - __local u32 s_td4[256]; + LOCAL_AS u32 s_td0[256]; + LOCAL_AS u32 s_td1[256]; + LOCAL_AS u32 s_td2[256]; + LOCAL_AS u32 s_td3[256]; + LOCAL_AS u32 s_td4[256]; - __local u32 s_te0[256]; - __local u32 s_te1[256]; - __local u32 s_te2[256]; - __local u32 s_te3[256]; - __local u32 s_te4[256]; + LOCAL_AS u32 s_te0[256]; + LOCAL_AS u32 s_te1[256]; + LOCAL_AS u32 s_te2[256]; + LOCAL_AS u32 s_te3[256]; + LOCAL_AS u32 s_te4[256]; for (u32 i = lid; i < 256; i += lsz) { @@ -294,17 +294,17 @@ __kernel void m13400_comp (KERN_ATTR_TMPS_ESALT (keepass_tmp_t, keepass_t)) #else - __constant u32a *s_td0 = td0; - __constant u32a *s_td1 = td1; - __constant u32a *s_td2 = td2; - __constant u32a *s_td3 = td3; - __constant u32a *s_td4 = td4; + CONSTANT_AS u32a *s_td0 = td0; + CONSTANT_AS u32a *s_td1 = td1; + CONSTANT_AS u32a *s_td2 = td2; + CONSTANT_AS u32a *s_td3 = td3; + CONSTANT_AS u32a *s_td4 = td4; - __constant u32a *s_te0 = te0; - __constant u32a *s_te1 = te1; - __constant u32a *s_te2 = te2; - __constant u32a *s_te3 = te3; - __constant u32a *s_te4 = te4; + CONSTANT_AS u32a *s_te0 = te0; + CONSTANT_AS u32a *s_te1 = te1; + CONSTANT_AS u32a *s_te2 = te2; + CONSTANT_AS u32a *s_te3 = te3; + CONSTANT_AS u32a *s_te4 = te4; #endif diff --git a/OpenCL/m13500_a0-optimized.cl b/OpenCL/m13500_a0-optimized.cl index e35ec1643..d63e680bb 100644 --- a/OpenCL/m13500_a0-optimized.cl +++ b/OpenCL/m13500_a0-optimized.cl @@ -26,7 +26,7 @@ typedef struct pstoken } pstoken_t; -__kernel void m13500_m04 (KERN_ATTR_RULES_ESALT (pstoken_t)) +KERNEL_FQ void m13500_m04 (KERN_ATTR_RULES_ESALT (pstoken_t)) { /** * modifier @@ -443,15 +443,15 @@ __kernel void m13500_m04 (KERN_ATTR_RULES_ESALT (pstoken_t)) } } -__kernel void m13500_m08 (KERN_ATTR_RULES_ESALT (pstoken_t)) +KERNEL_FQ void m13500_m08 (KERN_ATTR_RULES_ESALT (pstoken_t)) { } -__kernel void m13500_m16 (KERN_ATTR_RULES_ESALT (pstoken_t)) +KERNEL_FQ void m13500_m16 (KERN_ATTR_RULES_ESALT (pstoken_t)) { } -__kernel void m13500_s04 (KERN_ATTR_RULES_ESALT (pstoken_t)) +KERNEL_FQ void m13500_s04 (KERN_ATTR_RULES_ESALT (pstoken_t)) { /** * modifier @@ -880,10 +880,10 @@ __kernel void m13500_s04 (KERN_ATTR_RULES_ESALT (pstoken_t)) } } -__kernel void m13500_s08 (KERN_ATTR_RULES_ESALT (pstoken_t)) +KERNEL_FQ void m13500_s08 (KERN_ATTR_RULES_ESALT (pstoken_t)) { } -__kernel void m13500_s16 (KERN_ATTR_RULES_ESALT (pstoken_t)) +KERNEL_FQ void m13500_s16 (KERN_ATTR_RULES_ESALT (pstoken_t)) { } diff --git a/OpenCL/m13500_a0-pure.cl b/OpenCL/m13500_a0-pure.cl index 38a1daa2e..67b3c856a 100644 --- a/OpenCL/m13500_a0-pure.cl +++ b/OpenCL/m13500_a0-pure.cl @@ -25,7 +25,7 @@ typedef struct pstoken } pstoken_t; -__kernel void m13500_mxx (KERN_ATTR_RULES_ESALT (pstoken_t)) +KERNEL_FQ void m13500_mxx (KERN_ATTR_RULES_ESALT (pstoken_t)) { /** * modifier @@ -100,7 +100,7 @@ __kernel void m13500_mxx (KERN_ATTR_RULES_ESALT (pstoken_t)) } } -__kernel void m13500_sxx (KERN_ATTR_RULES_ESALT (pstoken_t)) +KERNEL_FQ void m13500_sxx (KERN_ATTR_RULES_ESALT (pstoken_t)) { /** * modifier diff --git a/OpenCL/m13500_a1-optimized.cl b/OpenCL/m13500_a1-optimized.cl index ce7d3e706..3a9c60449 100644 --- a/OpenCL/m13500_a1-optimized.cl +++ b/OpenCL/m13500_a1-optimized.cl @@ -24,7 +24,7 @@ typedef struct pstoken } pstoken_t; -__kernel void m13500_m04 (KERN_ATTR_ESALT (pstoken_t)) +KERNEL_FQ void m13500_m04 (KERN_ATTR_ESALT (pstoken_t)) { /** * modifier @@ -493,15 +493,15 @@ __kernel void m13500_m04 (KERN_ATTR_ESALT (pstoken_t)) } } -__kernel void m13500_m08 (KERN_ATTR_ESALT (pstoken_t)) +KERNEL_FQ void m13500_m08 (KERN_ATTR_ESALT (pstoken_t)) { } -__kernel void m13500_m16 (KERN_ATTR_ESALT (pstoken_t)) +KERNEL_FQ void m13500_m16 (KERN_ATTR_ESALT (pstoken_t)) { } -__kernel void m13500_s04 (KERN_ATTR_ESALT (pstoken_t)) +KERNEL_FQ void m13500_s04 (KERN_ATTR_ESALT (pstoken_t)) { /** * modifier @@ -982,10 +982,10 @@ __kernel void m13500_s04 (KERN_ATTR_ESALT (pstoken_t)) } } -__kernel void m13500_s08 (KERN_ATTR_ESALT (pstoken_t)) +KERNEL_FQ void m13500_s08 (KERN_ATTR_ESALT (pstoken_t)) { } -__kernel void m13500_s16 (KERN_ATTR_ESALT (pstoken_t)) +KERNEL_FQ void m13500_s16 (KERN_ATTR_ESALT (pstoken_t)) { } diff --git a/OpenCL/m13500_a1-pure.cl b/OpenCL/m13500_a1-pure.cl index ecd7630a2..613b062f8 100644 --- a/OpenCL/m13500_a1-pure.cl +++ b/OpenCL/m13500_a1-pure.cl @@ -23,7 +23,7 @@ typedef struct pstoken } pstoken_t; -__kernel void m13500_mxx (KERN_ATTR_ESALT (pstoken_t)) +KERNEL_FQ void m13500_mxx (KERN_ATTR_ESALT (pstoken_t)) { /** * modifier @@ -94,7 +94,7 @@ __kernel void m13500_mxx (KERN_ATTR_ESALT (pstoken_t)) } } -__kernel void m13500_sxx (KERN_ATTR_ESALT (pstoken_t)) +KERNEL_FQ void m13500_sxx (KERN_ATTR_ESALT (pstoken_t)) { /** * modifier diff --git a/OpenCL/m13500_a3-optimized.cl b/OpenCL/m13500_a3-optimized.cl index 92dcbabda..fe5dddd94 100644 --- a/OpenCL/m13500_a3-optimized.cl +++ b/OpenCL/m13500_a3-optimized.cl @@ -822,7 +822,7 @@ DECLSPEC void m13500s (u32 *w0, u32 *w1, u32 *w2, u32 *w3, const u32 pw_len, KER } } -__kernel void m13500_m04 (KERN_ATTR_ESALT (pstoken_t)) +KERNEL_FQ void m13500_m04 (KERN_ATTR_ESALT (pstoken_t)) { /** * base @@ -869,7 +869,7 @@ __kernel void m13500_m04 (KERN_ATTR_ESALT (pstoken_t)) m13500m (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_extra0_buf, d_extra1_buf, d_extra2_buf, d_extra3_buf, bitmap_mask, bitmap_shift1, bitmap_shift2, salt_pos, loop_pos, loop_cnt, il_cnt, digests_cnt, digests_offset, combs_mode, gid_max); } -__kernel void m13500_m08 (KERN_ATTR_ESALT (pstoken_t)) +KERNEL_FQ void m13500_m08 (KERN_ATTR_ESALT (pstoken_t)) { /** * base @@ -916,7 +916,7 @@ __kernel void m13500_m08 (KERN_ATTR_ESALT (pstoken_t)) m13500m (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_extra0_buf, d_extra1_buf, d_extra2_buf, d_extra3_buf, bitmap_mask, bitmap_shift1, bitmap_shift2, salt_pos, loop_pos, loop_cnt, il_cnt, digests_cnt, digests_offset, combs_mode, gid_max); } -__kernel void m13500_m16 (KERN_ATTR_ESALT (pstoken_t)) +KERNEL_FQ void m13500_m16 (KERN_ATTR_ESALT (pstoken_t)) { /** * base @@ -963,7 +963,7 @@ __kernel void m13500_m16 (KERN_ATTR_ESALT (pstoken_t)) m13500m (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_extra0_buf, d_extra1_buf, d_extra2_buf, d_extra3_buf, bitmap_mask, bitmap_shift1, bitmap_shift2, salt_pos, loop_pos, loop_cnt, il_cnt, digests_cnt, digests_offset, combs_mode, gid_max); } -__kernel void m13500_s04 (KERN_ATTR_ESALT (pstoken_t)) +KERNEL_FQ void m13500_s04 (KERN_ATTR_ESALT (pstoken_t)) { /** * base @@ -1010,7 +1010,7 @@ __kernel void m13500_s04 (KERN_ATTR_ESALT (pstoken_t)) m13500s (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_extra0_buf, d_extra1_buf, d_extra2_buf, d_extra3_buf, bitmap_mask, bitmap_shift1, bitmap_shift2, salt_pos, loop_pos, loop_cnt, il_cnt, digests_cnt, digests_offset, combs_mode, gid_max); } -__kernel void m13500_s08 (KERN_ATTR_ESALT (pstoken_t)) +KERNEL_FQ void m13500_s08 (KERN_ATTR_ESALT (pstoken_t)) { /** * base @@ -1057,7 +1057,7 @@ __kernel void m13500_s08 (KERN_ATTR_ESALT (pstoken_t)) m13500s (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_extra0_buf, d_extra1_buf, d_extra2_buf, d_extra3_buf, bitmap_mask, bitmap_shift1, bitmap_shift2, salt_pos, loop_pos, loop_cnt, il_cnt, digests_cnt, digests_offset, combs_mode, gid_max); } -__kernel void m13500_s16 (KERN_ATTR_ESALT (pstoken_t)) +KERNEL_FQ void m13500_s16 (KERN_ATTR_ESALT (pstoken_t)) { /** * base diff --git a/OpenCL/m13500_a3-pure.cl b/OpenCL/m13500_a3-pure.cl index bf6fb4585..8295b0d17 100644 --- a/OpenCL/m13500_a3-pure.cl +++ b/OpenCL/m13500_a3-pure.cl @@ -23,7 +23,7 @@ typedef struct pstoken } pstoken_t; -__kernel void m13500_mxx (KERN_ATTR_VECTOR_ESALT (pstoken_t)) +KERNEL_FQ void m13500_mxx (KERN_ATTR_VECTOR_ESALT (pstoken_t)) { /** * modifier @@ -111,7 +111,7 @@ __kernel void m13500_mxx (KERN_ATTR_VECTOR_ESALT (pstoken_t)) } } -__kernel void m13500_sxx (KERN_ATTR_VECTOR_ESALT (pstoken_t)) +KERNEL_FQ void m13500_sxx (KERN_ATTR_VECTOR_ESALT (pstoken_t)) { /** * modifier diff --git a/OpenCL/m13600-pure.cl b/OpenCL/m13600-pure.cl index f7470da67..49e986631 100644 --- a/OpenCL/m13600-pure.cl +++ b/OpenCL/m13600-pure.cl @@ -78,7 +78,7 @@ DECLSPEC void hmac_sha1_run_V (u32x *w0, u32x *w1, u32x *w2, u32x *w3, u32x *ipa sha1_transform_vector (w0, w1, w2, w3, digest); } -__kernel void m13600_init (KERN_ATTR_TMPS_ESALT (pbkdf2_sha1_tmp_t, zip2_t)) +KERNEL_FQ void m13600_init (KERN_ATTR_TMPS_ESALT (pbkdf2_sha1_tmp_t, zip2_t)) { /** * base @@ -191,7 +191,7 @@ __kernel void m13600_init (KERN_ATTR_TMPS_ESALT (pbkdf2_sha1_tmp_t, zip2_t)) } } -__kernel void m13600_loop (KERN_ATTR_TMPS_ESALT (pbkdf2_sha1_tmp_t, zip2_t)) +KERNEL_FQ void m13600_loop (KERN_ATTR_TMPS_ESALT (pbkdf2_sha1_tmp_t, zip2_t)) { const u64 gid = get_global_id (0); @@ -300,7 +300,7 @@ __kernel void m13600_loop (KERN_ATTR_TMPS_ESALT (pbkdf2_sha1_tmp_t, zip2_t)) } } -__kernel void m13600_comp (KERN_ATTR_TMPS_ESALT (pbkdf2_sha1_tmp_t, zip2_t)) +KERNEL_FQ void m13600_comp (KERN_ATTR_TMPS_ESALT (pbkdf2_sha1_tmp_t, zip2_t)) { /** * base diff --git a/OpenCL/m13711-pure.cl b/OpenCL/m13711-pure.cl index e2b3f76cf..8079fd207 100644 --- a/OpenCL/m13711-pure.cl +++ b/OpenCL/m13711-pure.cl @@ -57,7 +57,7 @@ typedef struct vc_tmp } vc_tmp_t; -DECLSPEC int check_header_0512 (__global const vc_t *esalt_bufs, __global u32 *key, SHM_TYPE u32 *s_te0, SHM_TYPE u32 *s_te1, SHM_TYPE u32 *s_te2, SHM_TYPE u32 *s_te3, SHM_TYPE u32 *s_te4, SHM_TYPE u32 *s_td0, SHM_TYPE u32 *s_td1, SHM_TYPE u32 *s_td2, SHM_TYPE u32 *s_td3, SHM_TYPE u32 *s_td4) +DECLSPEC int check_header_0512 (GLOBAL_AS const vc_t *esalt_bufs, GLOBAL_AS u32 *key, SHM_TYPE u32 *s_te0, SHM_TYPE u32 *s_te1, SHM_TYPE u32 *s_te2, SHM_TYPE u32 *s_te3, SHM_TYPE u32 *s_te4, SHM_TYPE u32 *s_td0, SHM_TYPE u32 *s_td1, SHM_TYPE u32 *s_td2, SHM_TYPE u32 *s_td3, SHM_TYPE u32 *s_td4) { u32 key1[8]; u32 key2[8]; @@ -124,7 +124,7 @@ DECLSPEC void hmac_ripemd160_run_V (u32x *w0, u32x *w1, u32x *w2, u32x *w3, u32x ripemd160_transform_vector (w0, w1, w2, w3, digest); } -__kernel void m13711_init (KERN_ATTR_TMPS_ESALT (vc_tmp_t, vc_t)) +KERNEL_FQ void m13711_init (KERN_ATTR_TMPS_ESALT (vc_tmp_t, vc_t)) { const u64 gid = get_global_id (0); const u64 lid = get_local_id (0); @@ -136,7 +136,7 @@ __kernel void m13711_init (KERN_ATTR_TMPS_ESALT (vc_tmp_t, vc_t)) const int keyboard_layout_mapping_cnt = esalt_bufs[digests_offset].keyboard_layout_mapping_cnt; - __local keyboard_layout_mapping_t s_keyboard_layout_mapping_buf[256]; + LOCAL_AS keyboard_layout_mapping_t s_keyboard_layout_mapping_buf[256]; for (u32 i = lid; i < 256; i += lsz) { @@ -251,7 +251,7 @@ __kernel void m13711_init (KERN_ATTR_TMPS_ESALT (vc_tmp_t, vc_t)) } } -__kernel void m13711_loop (KERN_ATTR_TMPS_ESALT (vc_tmp_t, vc_t)) +KERNEL_FQ void m13711_loop (KERN_ATTR_TMPS_ESALT (vc_tmp_t, vc_t)) { const u64 gid = get_global_id (0); const u64 lid = get_local_id (0); @@ -263,17 +263,17 @@ __kernel void m13711_loop (KERN_ATTR_TMPS_ESALT (vc_tmp_t, vc_t)) #ifdef REAL_SHM - __local u32 s_td0[256]; - __local u32 s_td1[256]; - __local u32 s_td2[256]; - __local u32 s_td3[256]; - __local u32 s_td4[256]; + LOCAL_AS u32 s_td0[256]; + LOCAL_AS u32 s_td1[256]; + LOCAL_AS u32 s_td2[256]; + LOCAL_AS u32 s_td3[256]; + LOCAL_AS u32 s_td4[256]; - __local u32 s_te0[256]; - __local u32 s_te1[256]; - __local u32 s_te2[256]; - __local u32 s_te3[256]; - __local u32 s_te4[256]; + LOCAL_AS u32 s_te0[256]; + LOCAL_AS u32 s_te1[256]; + LOCAL_AS u32 s_te2[256]; + LOCAL_AS u32 s_te3[256]; + LOCAL_AS u32 s_te4[256]; for (u32 i = lid; i < 256; i += lsz) { @@ -294,17 +294,17 @@ __kernel void m13711_loop (KERN_ATTR_TMPS_ESALT (vc_tmp_t, vc_t)) #else - __constant u32a *s_td0 = td0; - __constant u32a *s_td1 = td1; - __constant u32a *s_td2 = td2; - __constant u32a *s_td3 = td3; - __constant u32a *s_td4 = td4; + CONSTANT_AS u32a *s_td0 = td0; + CONSTANT_AS u32a *s_td1 = td1; + CONSTANT_AS u32a *s_td2 = td2; + CONSTANT_AS u32a *s_td3 = td3; + CONSTANT_AS u32a *s_td4 = td4; - __constant u32a *s_te0 = te0; - __constant u32a *s_te1 = te1; - __constant u32a *s_te2 = te2; - __constant u32a *s_te3 = te3; - __constant u32a *s_te4 = te4; + CONSTANT_AS u32a *s_te0 = te0; + CONSTANT_AS u32a *s_te1 = te1; + CONSTANT_AS u32a *s_te2 = te2; + CONSTANT_AS u32a *s_te3 = te3; + CONSTANT_AS u32a *s_te4 = te4; #endif @@ -435,7 +435,7 @@ __kernel void m13711_loop (KERN_ATTR_TMPS_ESALT (vc_tmp_t, vc_t)) if (check_header_0512 (esalt_bufs, tmps[gid].pim_key, s_te0, s_te1, s_te2, s_te3, s_te4, s_td0, s_td1, s_td2, s_td3, s_td4) != -1) tmps[gid].pim = pim; } -__kernel void m13711_comp (KERN_ATTR_TMPS_ESALT (vc_tmp_t, vc_t)) +KERNEL_FQ void m13711_comp (KERN_ATTR_TMPS_ESALT (vc_tmp_t, vc_t)) { const u64 gid = get_global_id (0); const u64 lid = get_local_id (0); @@ -447,17 +447,17 @@ __kernel void m13711_comp (KERN_ATTR_TMPS_ESALT (vc_tmp_t, vc_t)) #ifdef REAL_SHM - __local u32 s_td0[256]; - __local u32 s_td1[256]; - __local u32 s_td2[256]; - __local u32 s_td3[256]; - __local u32 s_td4[256]; + LOCAL_AS u32 s_td0[256]; + LOCAL_AS u32 s_td1[256]; + LOCAL_AS u32 s_td2[256]; + LOCAL_AS u32 s_td3[256]; + LOCAL_AS u32 s_td4[256]; - __local u32 s_te0[256]; - __local u32 s_te1[256]; - __local u32 s_te2[256]; - __local u32 s_te3[256]; - __local u32 s_te4[256]; + LOCAL_AS u32 s_te0[256]; + LOCAL_AS u32 s_te1[256]; + LOCAL_AS u32 s_te2[256]; + LOCAL_AS u32 s_te3[256]; + LOCAL_AS u32 s_te4[256]; for (u32 i = lid; i < 256; i += lsz) { @@ -478,17 +478,17 @@ __kernel void m13711_comp (KERN_ATTR_TMPS_ESALT (vc_tmp_t, vc_t)) #else - __constant u32a *s_td0 = td0; - __constant u32a *s_td1 = td1; - __constant u32a *s_td2 = td2; - __constant u32a *s_td3 = td3; - __constant u32a *s_td4 = td4; + CONSTANT_AS u32a *s_td0 = td0; + CONSTANT_AS u32a *s_td1 = td1; + CONSTANT_AS u32a *s_td2 = td2; + CONSTANT_AS u32a *s_td3 = td3; + CONSTANT_AS u32a *s_td4 = td4; - __constant u32a *s_te0 = te0; - __constant u32a *s_te1 = te1; - __constant u32a *s_te2 = te2; - __constant u32a *s_te3 = te3; - __constant u32a *s_te4 = te4; + CONSTANT_AS u32a *s_te0 = te0; + CONSTANT_AS u32a *s_te1 = te1; + CONSTANT_AS u32a *s_te2 = te2; + CONSTANT_AS u32a *s_te3 = te3; + CONSTANT_AS u32a *s_te4 = te4; #endif diff --git a/OpenCL/m13712-pure.cl b/OpenCL/m13712-pure.cl index 03e5ecda2..21ab4be43 100644 --- a/OpenCL/m13712-pure.cl +++ b/OpenCL/m13712-pure.cl @@ -57,7 +57,7 @@ typedef struct vc_tmp } vc_tmp_t; -DECLSPEC int check_header_0512 (__global const vc_t *esalt_bufs, __global u32 *key, SHM_TYPE u32 *s_te0, SHM_TYPE u32 *s_te1, SHM_TYPE u32 *s_te2, SHM_TYPE u32 *s_te3, SHM_TYPE u32 *s_te4, SHM_TYPE u32 *s_td0, SHM_TYPE u32 *s_td1, SHM_TYPE u32 *s_td2, SHM_TYPE u32 *s_td3, SHM_TYPE u32 *s_td4) +DECLSPEC int check_header_0512 (GLOBAL_AS const vc_t *esalt_bufs, GLOBAL_AS u32 *key, SHM_TYPE u32 *s_te0, SHM_TYPE u32 *s_te1, SHM_TYPE u32 *s_te2, SHM_TYPE u32 *s_te3, SHM_TYPE u32 *s_te4, SHM_TYPE u32 *s_td0, SHM_TYPE u32 *s_td1, SHM_TYPE u32 *s_td2, SHM_TYPE u32 *s_td3, SHM_TYPE u32 *s_td4) { u32 key1[8]; u32 key2[8]; @@ -88,7 +88,7 @@ DECLSPEC int check_header_0512 (__global const vc_t *esalt_bufs, __global u32 *k return -1; } -DECLSPEC int check_header_1024 (__global const vc_t *esalt_bufs, __global u32 *key, SHM_TYPE u32 *s_te0, SHM_TYPE u32 *s_te1, SHM_TYPE u32 *s_te2, SHM_TYPE u32 *s_te3, SHM_TYPE u32 *s_te4, SHM_TYPE u32 *s_td0, SHM_TYPE u32 *s_td1, SHM_TYPE u32 *s_td2, SHM_TYPE u32 *s_td3, SHM_TYPE u32 *s_td4) +DECLSPEC int check_header_1024 (GLOBAL_AS const vc_t *esalt_bufs, GLOBAL_AS u32 *key, SHM_TYPE u32 *s_te0, SHM_TYPE u32 *s_te1, SHM_TYPE u32 *s_te2, SHM_TYPE u32 *s_te3, SHM_TYPE u32 *s_te4, SHM_TYPE u32 *s_td0, SHM_TYPE u32 *s_td1, SHM_TYPE u32 *s_td2, SHM_TYPE u32 *s_td3, SHM_TYPE u32 *s_td4) { u32 key1[8]; u32 key2[8]; @@ -175,7 +175,7 @@ DECLSPEC void hmac_ripemd160_run_V (u32x *w0, u32x *w1, u32x *w2, u32x *w3, u32x ripemd160_transform_vector (w0, w1, w2, w3, digest); } -__kernel void m13712_init (KERN_ATTR_TMPS_ESALT (vc_tmp_t, vc_t)) +KERNEL_FQ void m13712_init (KERN_ATTR_TMPS_ESALT (vc_tmp_t, vc_t)) { const u64 gid = get_global_id (0); const u64 lid = get_local_id (0); @@ -187,7 +187,7 @@ __kernel void m13712_init (KERN_ATTR_TMPS_ESALT (vc_tmp_t, vc_t)) const int keyboard_layout_mapping_cnt = esalt_bufs[digests_offset].keyboard_layout_mapping_cnt; - __local keyboard_layout_mapping_t s_keyboard_layout_mapping_buf[256]; + LOCAL_AS keyboard_layout_mapping_t s_keyboard_layout_mapping_buf[256]; for (u32 i = lid; i < 256; i += lsz) { @@ -302,7 +302,7 @@ __kernel void m13712_init (KERN_ATTR_TMPS_ESALT (vc_tmp_t, vc_t)) } } -__kernel void m13712_loop (KERN_ATTR_TMPS_ESALT (vc_tmp_t, vc_t)) +KERNEL_FQ void m13712_loop (KERN_ATTR_TMPS_ESALT (vc_tmp_t, vc_t)) { const u64 gid = get_global_id (0); const u64 lid = get_local_id (0); @@ -314,17 +314,17 @@ __kernel void m13712_loop (KERN_ATTR_TMPS_ESALT (vc_tmp_t, vc_t)) #ifdef REAL_SHM - __local u32 s_td0[256]; - __local u32 s_td1[256]; - __local u32 s_td2[256]; - __local u32 s_td3[256]; - __local u32 s_td4[256]; + LOCAL_AS u32 s_td0[256]; + LOCAL_AS u32 s_td1[256]; + LOCAL_AS u32 s_td2[256]; + LOCAL_AS u32 s_td3[256]; + LOCAL_AS u32 s_td4[256]; - __local u32 s_te0[256]; - __local u32 s_te1[256]; - __local u32 s_te2[256]; - __local u32 s_te3[256]; - __local u32 s_te4[256]; + LOCAL_AS u32 s_te0[256]; + LOCAL_AS u32 s_te1[256]; + LOCAL_AS u32 s_te2[256]; + LOCAL_AS u32 s_te3[256]; + LOCAL_AS u32 s_te4[256]; for (u32 i = lid; i < 256; i += lsz) { @@ -345,17 +345,17 @@ __kernel void m13712_loop (KERN_ATTR_TMPS_ESALT (vc_tmp_t, vc_t)) #else - __constant u32a *s_td0 = td0; - __constant u32a *s_td1 = td1; - __constant u32a *s_td2 = td2; - __constant u32a *s_td3 = td3; - __constant u32a *s_td4 = td4; + CONSTANT_AS u32a *s_td0 = td0; + CONSTANT_AS u32a *s_td1 = td1; + CONSTANT_AS u32a *s_td2 = td2; + CONSTANT_AS u32a *s_td3 = td3; + CONSTANT_AS u32a *s_td4 = td4; - __constant u32a *s_te0 = te0; - __constant u32a *s_te1 = te1; - __constant u32a *s_te2 = te2; - __constant u32a *s_te3 = te3; - __constant u32a *s_te4 = te4; + CONSTANT_AS u32a *s_te0 = te0; + CONSTANT_AS u32a *s_te1 = te1; + CONSTANT_AS u32a *s_te2 = te2; + CONSTANT_AS u32a *s_te3 = te3; + CONSTANT_AS u32a *s_te4 = te4; #endif @@ -487,7 +487,7 @@ __kernel void m13712_loop (KERN_ATTR_TMPS_ESALT (vc_tmp_t, vc_t)) if (check_header_1024 (esalt_bufs, tmps[gid].pim_key, s_te0, s_te1, s_te2, s_te3, s_te4, s_td0, s_td1, s_td2, s_td3, s_td4) != -1) tmps[gid].pim = pim; } -__kernel void m13712_comp (KERN_ATTR_TMPS_ESALT (vc_tmp_t, vc_t)) +KERNEL_FQ void m13712_comp (KERN_ATTR_TMPS_ESALT (vc_tmp_t, vc_t)) { const u64 gid = get_global_id (0); const u64 lid = get_local_id (0); @@ -499,17 +499,17 @@ __kernel void m13712_comp (KERN_ATTR_TMPS_ESALT (vc_tmp_t, vc_t)) #ifdef REAL_SHM - __local u32 s_td0[256]; - __local u32 s_td1[256]; - __local u32 s_td2[256]; - __local u32 s_td3[256]; - __local u32 s_td4[256]; + LOCAL_AS u32 s_td0[256]; + LOCAL_AS u32 s_td1[256]; + LOCAL_AS u32 s_td2[256]; + LOCAL_AS u32 s_td3[256]; + LOCAL_AS u32 s_td4[256]; - __local u32 s_te0[256]; - __local u32 s_te1[256]; - __local u32 s_te2[256]; - __local u32 s_te3[256]; - __local u32 s_te4[256]; + LOCAL_AS u32 s_te0[256]; + LOCAL_AS u32 s_te1[256]; + LOCAL_AS u32 s_te2[256]; + LOCAL_AS u32 s_te3[256]; + LOCAL_AS u32 s_te4[256]; for (u32 i = lid; i < 256; i += lsz) { @@ -530,17 +530,17 @@ __kernel void m13712_comp (KERN_ATTR_TMPS_ESALT (vc_tmp_t, vc_t)) #else - __constant u32a *s_td0 = td0; - __constant u32a *s_td1 = td1; - __constant u32a *s_td2 = td2; - __constant u32a *s_td3 = td3; - __constant u32a *s_td4 = td4; + CONSTANT_AS u32a *s_td0 = td0; + CONSTANT_AS u32a *s_td1 = td1; + CONSTANT_AS u32a *s_td2 = td2; + CONSTANT_AS u32a *s_td3 = td3; + CONSTANT_AS u32a *s_td4 = td4; - __constant u32a *s_te0 = te0; - __constant u32a *s_te1 = te1; - __constant u32a *s_te2 = te2; - __constant u32a *s_te3 = te3; - __constant u32a *s_te4 = te4; + CONSTANT_AS u32a *s_te0 = te0; + CONSTANT_AS u32a *s_te1 = te1; + CONSTANT_AS u32a *s_te2 = te2; + CONSTANT_AS u32a *s_te3 = te3; + CONSTANT_AS u32a *s_te4 = te4; #endif diff --git a/OpenCL/m13713-pure.cl b/OpenCL/m13713-pure.cl index 230b667c5..cb1729fc9 100644 --- a/OpenCL/m13713-pure.cl +++ b/OpenCL/m13713-pure.cl @@ -57,7 +57,7 @@ typedef struct vc_tmp } vc_tmp_t; -DECLSPEC int check_header_0512 (__global const vc_t *esalt_bufs, __global u32 *key, SHM_TYPE u32 *s_te0, SHM_TYPE u32 *s_te1, SHM_TYPE u32 *s_te2, SHM_TYPE u32 *s_te3, SHM_TYPE u32 *s_te4, SHM_TYPE u32 *s_td0, SHM_TYPE u32 *s_td1, SHM_TYPE u32 *s_td2, SHM_TYPE u32 *s_td3, SHM_TYPE u32 *s_td4) +DECLSPEC int check_header_0512 (GLOBAL_AS const vc_t *esalt_bufs, GLOBAL_AS u32 *key, SHM_TYPE u32 *s_te0, SHM_TYPE u32 *s_te1, SHM_TYPE u32 *s_te2, SHM_TYPE u32 *s_te3, SHM_TYPE u32 *s_te4, SHM_TYPE u32 *s_td0, SHM_TYPE u32 *s_td1, SHM_TYPE u32 *s_td2, SHM_TYPE u32 *s_td3, SHM_TYPE u32 *s_td4) { u32 key1[8]; u32 key2[8]; @@ -88,7 +88,7 @@ DECLSPEC int check_header_0512 (__global const vc_t *esalt_bufs, __global u32 *k return -1; } -DECLSPEC int check_header_1024 (__global const vc_t *esalt_bufs, __global u32 *key, SHM_TYPE u32 *s_te0, SHM_TYPE u32 *s_te1, SHM_TYPE u32 *s_te2, SHM_TYPE u32 *s_te3, SHM_TYPE u32 *s_te4, SHM_TYPE u32 *s_td0, SHM_TYPE u32 *s_td1, SHM_TYPE u32 *s_td2, SHM_TYPE u32 *s_td3, SHM_TYPE u32 *s_td4) +DECLSPEC int check_header_1024 (GLOBAL_AS const vc_t *esalt_bufs, GLOBAL_AS u32 *key, SHM_TYPE u32 *s_te0, SHM_TYPE u32 *s_te1, SHM_TYPE u32 *s_te2, SHM_TYPE u32 *s_te3, SHM_TYPE u32 *s_te4, SHM_TYPE u32 *s_td0, SHM_TYPE u32 *s_td1, SHM_TYPE u32 *s_td2, SHM_TYPE u32 *s_td3, SHM_TYPE u32 *s_td4) { u32 key1[8]; u32 key2[8]; @@ -139,7 +139,7 @@ DECLSPEC int check_header_1024 (__global const vc_t *esalt_bufs, __global u32 *k return -1; } -DECLSPEC int check_header_1536 (__global const vc_t *esalt_bufs, __global u32 *key, SHM_TYPE u32 *s_te0, SHM_TYPE u32 *s_te1, SHM_TYPE u32 *s_te2, SHM_TYPE u32 *s_te3, SHM_TYPE u32 *s_te4, SHM_TYPE u32 *s_td0, SHM_TYPE u32 *s_td1, SHM_TYPE u32 *s_td2, SHM_TYPE u32 *s_td3, SHM_TYPE u32 *s_td4) +DECLSPEC int check_header_1536 (GLOBAL_AS const vc_t *esalt_bufs, GLOBAL_AS u32 *key, SHM_TYPE u32 *s_te0, SHM_TYPE u32 *s_te1, SHM_TYPE u32 *s_te2, SHM_TYPE u32 *s_te3, SHM_TYPE u32 *s_te4, SHM_TYPE u32 *s_td0, SHM_TYPE u32 *s_td1, SHM_TYPE u32 *s_td2, SHM_TYPE u32 *s_td3, SHM_TYPE u32 *s_td4) { u32 key1[8]; u32 key2[8]; @@ -240,7 +240,7 @@ DECLSPEC void hmac_ripemd160_run_V (u32x *w0, u32x *w1, u32x *w2, u32x *w3, u32x ripemd160_transform_vector (w0, w1, w2, w3, digest); } -__kernel void m13713_init (KERN_ATTR_TMPS_ESALT (vc_tmp_t, vc_t)) +KERNEL_FQ void m13713_init (KERN_ATTR_TMPS_ESALT (vc_tmp_t, vc_t)) { const u64 gid = get_global_id (0); const u64 lid = get_local_id (0); @@ -252,7 +252,7 @@ __kernel void m13713_init (KERN_ATTR_TMPS_ESALT (vc_tmp_t, vc_t)) const int keyboard_layout_mapping_cnt = esalt_bufs[digests_offset].keyboard_layout_mapping_cnt; - __local keyboard_layout_mapping_t s_keyboard_layout_mapping_buf[256]; + LOCAL_AS keyboard_layout_mapping_t s_keyboard_layout_mapping_buf[256]; for (u32 i = lid; i < 256; i += lsz) { @@ -367,7 +367,7 @@ __kernel void m13713_init (KERN_ATTR_TMPS_ESALT (vc_tmp_t, vc_t)) } } -__kernel void m13713_loop (KERN_ATTR_TMPS_ESALT (vc_tmp_t, vc_t)) +KERNEL_FQ void m13713_loop (KERN_ATTR_TMPS_ESALT (vc_tmp_t, vc_t)) { const u64 gid = get_global_id (0); const u64 lid = get_local_id (0); @@ -379,17 +379,17 @@ __kernel void m13713_loop (KERN_ATTR_TMPS_ESALT (vc_tmp_t, vc_t)) #ifdef REAL_SHM - __local u32 s_td0[256]; - __local u32 s_td1[256]; - __local u32 s_td2[256]; - __local u32 s_td3[256]; - __local u32 s_td4[256]; + LOCAL_AS u32 s_td0[256]; + LOCAL_AS u32 s_td1[256]; + LOCAL_AS u32 s_td2[256]; + LOCAL_AS u32 s_td3[256]; + LOCAL_AS u32 s_td4[256]; - __local u32 s_te0[256]; - __local u32 s_te1[256]; - __local u32 s_te2[256]; - __local u32 s_te3[256]; - __local u32 s_te4[256]; + LOCAL_AS u32 s_te0[256]; + LOCAL_AS u32 s_te1[256]; + LOCAL_AS u32 s_te2[256]; + LOCAL_AS u32 s_te3[256]; + LOCAL_AS u32 s_te4[256]; for (u32 i = lid; i < 256; i += lsz) { @@ -410,17 +410,17 @@ __kernel void m13713_loop (KERN_ATTR_TMPS_ESALT (vc_tmp_t, vc_t)) #else - __constant u32a *s_td0 = td0; - __constant u32a *s_td1 = td1; - __constant u32a *s_td2 = td2; - __constant u32a *s_td3 = td3; - __constant u32a *s_td4 = td4; + CONSTANT_AS u32a *s_td0 = td0; + CONSTANT_AS u32a *s_td1 = td1; + CONSTANT_AS u32a *s_td2 = td2; + CONSTANT_AS u32a *s_td3 = td3; + CONSTANT_AS u32a *s_td4 = td4; - __constant u32a *s_te0 = te0; - __constant u32a *s_te1 = te1; - __constant u32a *s_te2 = te2; - __constant u32a *s_te3 = te3; - __constant u32a *s_te4 = te4; + CONSTANT_AS u32a *s_te0 = te0; + CONSTANT_AS u32a *s_te1 = te1; + CONSTANT_AS u32a *s_te2 = te2; + CONSTANT_AS u32a *s_te3 = te3; + CONSTANT_AS u32a *s_te4 = te4; #endif @@ -553,7 +553,7 @@ __kernel void m13713_loop (KERN_ATTR_TMPS_ESALT (vc_tmp_t, vc_t)) if (check_header_1536 (esalt_bufs, tmps[gid].pim_key, s_te0, s_te1, s_te2, s_te3, s_te4, s_td0, s_td1, s_td2, s_td3, s_td4) != -1) tmps[gid].pim = pim; } -__kernel void m13713_comp (KERN_ATTR_TMPS_ESALT (vc_tmp_t, vc_t)) +KERNEL_FQ void m13713_comp (KERN_ATTR_TMPS_ESALT (vc_tmp_t, vc_t)) { const u64 gid = get_global_id (0); const u64 lid = get_local_id (0); @@ -565,17 +565,17 @@ __kernel void m13713_comp (KERN_ATTR_TMPS_ESALT (vc_tmp_t, vc_t)) #ifdef REAL_SHM - __local u32 s_td0[256]; - __local u32 s_td1[256]; - __local u32 s_td2[256]; - __local u32 s_td3[256]; - __local u32 s_td4[256]; + LOCAL_AS u32 s_td0[256]; + LOCAL_AS u32 s_td1[256]; + LOCAL_AS u32 s_td2[256]; + LOCAL_AS u32 s_td3[256]; + LOCAL_AS u32 s_td4[256]; - __local u32 s_te0[256]; - __local u32 s_te1[256]; - __local u32 s_te2[256]; - __local u32 s_te3[256]; - __local u32 s_te4[256]; + LOCAL_AS u32 s_te0[256]; + LOCAL_AS u32 s_te1[256]; + LOCAL_AS u32 s_te2[256]; + LOCAL_AS u32 s_te3[256]; + LOCAL_AS u32 s_te4[256]; for (u32 i = lid; i < 256; i += lsz) { @@ -596,17 +596,17 @@ __kernel void m13713_comp (KERN_ATTR_TMPS_ESALT (vc_tmp_t, vc_t)) #else - __constant u32a *s_td0 = td0; - __constant u32a *s_td1 = td1; - __constant u32a *s_td2 = td2; - __constant u32a *s_td3 = td3; - __constant u32a *s_td4 = td4; + CONSTANT_AS u32a *s_td0 = td0; + CONSTANT_AS u32a *s_td1 = td1; + CONSTANT_AS u32a *s_td2 = td2; + CONSTANT_AS u32a *s_td3 = td3; + CONSTANT_AS u32a *s_td4 = td4; - __constant u32a *s_te0 = te0; - __constant u32a *s_te1 = te1; - __constant u32a *s_te2 = te2; - __constant u32a *s_te3 = te3; - __constant u32a *s_te4 = te4; + CONSTANT_AS u32a *s_te0 = te0; + CONSTANT_AS u32a *s_te1 = te1; + CONSTANT_AS u32a *s_te2 = te2; + CONSTANT_AS u32a *s_te3 = te3; + CONSTANT_AS u32a *s_te4 = te4; #endif diff --git a/OpenCL/m13721-pure.cl b/OpenCL/m13721-pure.cl index 0cfed382e..c5b0f54cf 100644 --- a/OpenCL/m13721-pure.cl +++ b/OpenCL/m13721-pure.cl @@ -57,7 +57,7 @@ typedef struct vc64_tmp } vc64_tmp_t; -DECLSPEC int check_header_0512 (__global const vc_t *esalt_bufs, __global u64 *key, SHM_TYPE u32 *s_te0, SHM_TYPE u32 *s_te1, SHM_TYPE u32 *s_te2, SHM_TYPE u32 *s_te3, SHM_TYPE u32 *s_te4, SHM_TYPE u32 *s_td0, SHM_TYPE u32 *s_td1, SHM_TYPE u32 *s_td2, SHM_TYPE u32 *s_td3, SHM_TYPE u32 *s_td4) +DECLSPEC int check_header_0512 (GLOBAL_AS const vc_t *esalt_bufs, GLOBAL_AS u64 *key, SHM_TYPE u32 *s_te0, SHM_TYPE u32 *s_te1, SHM_TYPE u32 *s_te2, SHM_TYPE u32 *s_te3, SHM_TYPE u32 *s_te4, SHM_TYPE u32 *s_td0, SHM_TYPE u32 *s_td1, SHM_TYPE u32 *s_td2, SHM_TYPE u32 *s_td3, SHM_TYPE u32 *s_td4) { u32 key1[8]; u32 key2[8]; @@ -146,7 +146,7 @@ DECLSPEC void hmac_sha512_run_V (u32x *w0, u32x *w1, u32x *w2, u32x *w3, u32x *w sha512_transform_vector (w0, w1, w2, w3, w4, w5, w6, w7, digest); } -__kernel void m13721_init (KERN_ATTR_TMPS_ESALT (vc64_tmp_t, vc_t)) +KERNEL_FQ void m13721_init (KERN_ATTR_TMPS_ESALT (vc64_tmp_t, vc_t)) { const u64 gid = get_global_id (0); const u64 lid = get_local_id (0); @@ -158,7 +158,7 @@ __kernel void m13721_init (KERN_ATTR_TMPS_ESALT (vc64_tmp_t, vc_t)) const int keyboard_layout_mapping_cnt = esalt_bufs[digests_offset].keyboard_layout_mapping_cnt; - __local keyboard_layout_mapping_t s_keyboard_layout_mapping_buf[256]; + LOCAL_AS keyboard_layout_mapping_t s_keyboard_layout_mapping_buf[256]; for (u32 i = lid; i < 256; i += lsz) { @@ -354,7 +354,7 @@ __kernel void m13721_init (KERN_ATTR_TMPS_ESALT (vc64_tmp_t, vc_t)) } } -__kernel void m13721_loop (KERN_ATTR_TMPS_ESALT (vc64_tmp_t, vc_t)) +KERNEL_FQ void m13721_loop (KERN_ATTR_TMPS_ESALT (vc64_tmp_t, vc_t)) { const u64 gid = get_global_id (0); const u64 lid = get_local_id (0); @@ -366,17 +366,17 @@ __kernel void m13721_loop (KERN_ATTR_TMPS_ESALT (vc64_tmp_t, vc_t)) #ifdef REAL_SHM - __local u32 s_td0[256]; - __local u32 s_td1[256]; - __local u32 s_td2[256]; - __local u32 s_td3[256]; - __local u32 s_td4[256]; + LOCAL_AS u32 s_td0[256]; + LOCAL_AS u32 s_td1[256]; + LOCAL_AS u32 s_td2[256]; + LOCAL_AS u32 s_td3[256]; + LOCAL_AS u32 s_td4[256]; - __local u32 s_te0[256]; - __local u32 s_te1[256]; - __local u32 s_te2[256]; - __local u32 s_te3[256]; - __local u32 s_te4[256]; + LOCAL_AS u32 s_te0[256]; + LOCAL_AS u32 s_te1[256]; + LOCAL_AS u32 s_te2[256]; + LOCAL_AS u32 s_te3[256]; + LOCAL_AS u32 s_te4[256]; for (u32 i = lid; i < 256; i += lsz) { @@ -397,17 +397,17 @@ __kernel void m13721_loop (KERN_ATTR_TMPS_ESALT (vc64_tmp_t, vc_t)) #else - __constant u32a *s_td0 = td0; - __constant u32a *s_td1 = td1; - __constant u32a *s_td2 = td2; - __constant u32a *s_td3 = td3; - __constant u32a *s_td4 = td4; + CONSTANT_AS u32a *s_td0 = td0; + CONSTANT_AS u32a *s_td1 = td1; + CONSTANT_AS u32a *s_td2 = td2; + CONSTANT_AS u32a *s_td3 = td3; + CONSTANT_AS u32a *s_td4 = td4; - __constant u32a *s_te0 = te0; - __constant u32a *s_te1 = te1; - __constant u32a *s_te2 = te2; - __constant u32a *s_te3 = te3; - __constant u32a *s_te4 = te4; + CONSTANT_AS u32a *s_te0 = te0; + CONSTANT_AS u32a *s_te1 = te1; + CONSTANT_AS u32a *s_te2 = te2; + CONSTANT_AS u32a *s_te3 = te3; + CONSTANT_AS u32a *s_te4 = te4; #endif @@ -582,7 +582,7 @@ __kernel void m13721_loop (KERN_ATTR_TMPS_ESALT (vc64_tmp_t, vc_t)) if (check_header_0512 (esalt_bufs, tmps[gid].pim_key, s_te0, s_te1, s_te2, s_te3, s_te4, s_td0, s_td1, s_td2, s_td3, s_td4) != -1) tmps[gid].pim = pim; } -__kernel void m13721_comp (KERN_ATTR_TMPS_ESALT (vc64_tmp_t, vc_t)) +KERNEL_FQ void m13721_comp (KERN_ATTR_TMPS_ESALT (vc64_tmp_t, vc_t)) { const u64 gid = get_global_id (0); const u64 lid = get_local_id (0); @@ -594,17 +594,17 @@ __kernel void m13721_comp (KERN_ATTR_TMPS_ESALT (vc64_tmp_t, vc_t)) #ifdef REAL_SHM - __local u32 s_td0[256]; - __local u32 s_td1[256]; - __local u32 s_td2[256]; - __local u32 s_td3[256]; - __local u32 s_td4[256]; + LOCAL_AS u32 s_td0[256]; + LOCAL_AS u32 s_td1[256]; + LOCAL_AS u32 s_td2[256]; + LOCAL_AS u32 s_td3[256]; + LOCAL_AS u32 s_td4[256]; - __local u32 s_te0[256]; - __local u32 s_te1[256]; - __local u32 s_te2[256]; - __local u32 s_te3[256]; - __local u32 s_te4[256]; + LOCAL_AS u32 s_te0[256]; + LOCAL_AS u32 s_te1[256]; + LOCAL_AS u32 s_te2[256]; + LOCAL_AS u32 s_te3[256]; + LOCAL_AS u32 s_te4[256]; for (u32 i = lid; i < 256; i += lsz) { @@ -625,17 +625,17 @@ __kernel void m13721_comp (KERN_ATTR_TMPS_ESALT (vc64_tmp_t, vc_t)) #else - __constant u32a *s_td0 = td0; - __constant u32a *s_td1 = td1; - __constant u32a *s_td2 = td2; - __constant u32a *s_td3 = td3; - __constant u32a *s_td4 = td4; + CONSTANT_AS u32a *s_td0 = td0; + CONSTANT_AS u32a *s_td1 = td1; + CONSTANT_AS u32a *s_td2 = td2; + CONSTANT_AS u32a *s_td3 = td3; + CONSTANT_AS u32a *s_td4 = td4; - __constant u32a *s_te0 = te0; - __constant u32a *s_te1 = te1; - __constant u32a *s_te2 = te2; - __constant u32a *s_te3 = te3; - __constant u32a *s_te4 = te4; + CONSTANT_AS u32a *s_te0 = te0; + CONSTANT_AS u32a *s_te1 = te1; + CONSTANT_AS u32a *s_te2 = te2; + CONSTANT_AS u32a *s_te3 = te3; + CONSTANT_AS u32a *s_te4 = te4; #endif diff --git a/OpenCL/m13722-pure.cl b/OpenCL/m13722-pure.cl index d0370a2d4..53c5ebc93 100644 --- a/OpenCL/m13722-pure.cl +++ b/OpenCL/m13722-pure.cl @@ -57,7 +57,7 @@ typedef struct vc64_tmp } vc64_tmp_t; -DECLSPEC int check_header_0512 (__global const vc_t *esalt_bufs, __global u64 *key, SHM_TYPE u32 *s_te0, SHM_TYPE u32 *s_te1, SHM_TYPE u32 *s_te2, SHM_TYPE u32 *s_te3, SHM_TYPE u32 *s_te4, SHM_TYPE u32 *s_td0, SHM_TYPE u32 *s_td1, SHM_TYPE u32 *s_td2, SHM_TYPE u32 *s_td3, SHM_TYPE u32 *s_td4) +DECLSPEC int check_header_0512 (GLOBAL_AS const vc_t *esalt_bufs, GLOBAL_AS u64 *key, SHM_TYPE u32 *s_te0, SHM_TYPE u32 *s_te1, SHM_TYPE u32 *s_te2, SHM_TYPE u32 *s_te3, SHM_TYPE u32 *s_te4, SHM_TYPE u32 *s_td0, SHM_TYPE u32 *s_td1, SHM_TYPE u32 *s_td2, SHM_TYPE u32 *s_td3, SHM_TYPE u32 *s_td4) { u32 key1[8]; u32 key2[8]; @@ -88,7 +88,7 @@ DECLSPEC int check_header_0512 (__global const vc_t *esalt_bufs, __global u64 *k return -1; } -DECLSPEC int check_header_1024 (__global const vc_t *esalt_bufs, __global u64 *key, SHM_TYPE u32 *s_te0, SHM_TYPE u32 *s_te1, SHM_TYPE u32 *s_te2, SHM_TYPE u32 *s_te3, SHM_TYPE u32 *s_te4, SHM_TYPE u32 *s_td0, SHM_TYPE u32 *s_td1, SHM_TYPE u32 *s_td2, SHM_TYPE u32 *s_td3, SHM_TYPE u32 *s_td4) +DECLSPEC int check_header_1024 (GLOBAL_AS const vc_t *esalt_bufs, GLOBAL_AS u64 *key, SHM_TYPE u32 *s_te0, SHM_TYPE u32 *s_te1, SHM_TYPE u32 *s_te2, SHM_TYPE u32 *s_te3, SHM_TYPE u32 *s_te4, SHM_TYPE u32 *s_td0, SHM_TYPE u32 *s_td1, SHM_TYPE u32 *s_td2, SHM_TYPE u32 *s_td3, SHM_TYPE u32 *s_td4) { u32 key1[8]; u32 key2[8]; @@ -197,7 +197,7 @@ DECLSPEC void hmac_sha512_run_V (u32x *w0, u32x *w1, u32x *w2, u32x *w3, u32x *w sha512_transform_vector (w0, w1, w2, w3, w4, w5, w6, w7, digest); } -__kernel void m13722_init (KERN_ATTR_TMPS_ESALT (vc64_tmp_t, vc_t)) +KERNEL_FQ void m13722_init (KERN_ATTR_TMPS_ESALT (vc64_tmp_t, vc_t)) { const u64 gid = get_global_id (0); const u64 lid = get_local_id (0); @@ -209,7 +209,7 @@ __kernel void m13722_init (KERN_ATTR_TMPS_ESALT (vc64_tmp_t, vc_t)) const int keyboard_layout_mapping_cnt = esalt_bufs[digests_offset].keyboard_layout_mapping_cnt; - __local keyboard_layout_mapping_t s_keyboard_layout_mapping_buf[256]; + LOCAL_AS keyboard_layout_mapping_t s_keyboard_layout_mapping_buf[256]; for (u32 i = lid; i < 256; i += lsz) { @@ -405,7 +405,7 @@ __kernel void m13722_init (KERN_ATTR_TMPS_ESALT (vc64_tmp_t, vc_t)) } } -__kernel void m13722_loop (KERN_ATTR_TMPS_ESALT (vc64_tmp_t, vc_t)) +KERNEL_FQ void m13722_loop (KERN_ATTR_TMPS_ESALT (vc64_tmp_t, vc_t)) { const u64 gid = get_global_id (0); const u64 lid = get_local_id (0); @@ -417,17 +417,17 @@ __kernel void m13722_loop (KERN_ATTR_TMPS_ESALT (vc64_tmp_t, vc_t)) #ifdef REAL_SHM - __local u32 s_td0[256]; - __local u32 s_td1[256]; - __local u32 s_td2[256]; - __local u32 s_td3[256]; - __local u32 s_td4[256]; + LOCAL_AS u32 s_td0[256]; + LOCAL_AS u32 s_td1[256]; + LOCAL_AS u32 s_td2[256]; + LOCAL_AS u32 s_td3[256]; + LOCAL_AS u32 s_td4[256]; - __local u32 s_te0[256]; - __local u32 s_te1[256]; - __local u32 s_te2[256]; - __local u32 s_te3[256]; - __local u32 s_te4[256]; + LOCAL_AS u32 s_te0[256]; + LOCAL_AS u32 s_te1[256]; + LOCAL_AS u32 s_te2[256]; + LOCAL_AS u32 s_te3[256]; + LOCAL_AS u32 s_te4[256]; for (u32 i = lid; i < 256; i += lsz) { @@ -448,17 +448,17 @@ __kernel void m13722_loop (KERN_ATTR_TMPS_ESALT (vc64_tmp_t, vc_t)) #else - __constant u32a *s_td0 = td0; - __constant u32a *s_td1 = td1; - __constant u32a *s_td2 = td2; - __constant u32a *s_td3 = td3; - __constant u32a *s_td4 = td4; + CONSTANT_AS u32a *s_td0 = td0; + CONSTANT_AS u32a *s_td1 = td1; + CONSTANT_AS u32a *s_td2 = td2; + CONSTANT_AS u32a *s_td3 = td3; + CONSTANT_AS u32a *s_td4 = td4; - __constant u32a *s_te0 = te0; - __constant u32a *s_te1 = te1; - __constant u32a *s_te2 = te2; - __constant u32a *s_te3 = te3; - __constant u32a *s_te4 = te4; + CONSTANT_AS u32a *s_te0 = te0; + CONSTANT_AS u32a *s_te1 = te1; + CONSTANT_AS u32a *s_te2 = te2; + CONSTANT_AS u32a *s_te3 = te3; + CONSTANT_AS u32a *s_te4 = te4; #endif @@ -634,7 +634,7 @@ __kernel void m13722_loop (KERN_ATTR_TMPS_ESALT (vc64_tmp_t, vc_t)) if (check_header_1024 (esalt_bufs, tmps[gid].pim_key, s_te0, s_te1, s_te2, s_te3, s_te4, s_td0, s_td1, s_td2, s_td3, s_td4) != -1) tmps[gid].pim = pim; } -__kernel void m13722_comp (KERN_ATTR_TMPS_ESALT (vc64_tmp_t, vc_t)) +KERNEL_FQ void m13722_comp (KERN_ATTR_TMPS_ESALT (vc64_tmp_t, vc_t)) { const u64 gid = get_global_id (0); const u64 lid = get_local_id (0); @@ -646,17 +646,17 @@ __kernel void m13722_comp (KERN_ATTR_TMPS_ESALT (vc64_tmp_t, vc_t)) #ifdef REAL_SHM - __local u32 s_td0[256]; - __local u32 s_td1[256]; - __local u32 s_td2[256]; - __local u32 s_td3[256]; - __local u32 s_td4[256]; + LOCAL_AS u32 s_td0[256]; + LOCAL_AS u32 s_td1[256]; + LOCAL_AS u32 s_td2[256]; + LOCAL_AS u32 s_td3[256]; + LOCAL_AS u32 s_td4[256]; - __local u32 s_te0[256]; - __local u32 s_te1[256]; - __local u32 s_te2[256]; - __local u32 s_te3[256]; - __local u32 s_te4[256]; + LOCAL_AS u32 s_te0[256]; + LOCAL_AS u32 s_te1[256]; + LOCAL_AS u32 s_te2[256]; + LOCAL_AS u32 s_te3[256]; + LOCAL_AS u32 s_te4[256]; for (u32 i = lid; i < 256; i += lsz) { @@ -677,17 +677,17 @@ __kernel void m13722_comp (KERN_ATTR_TMPS_ESALT (vc64_tmp_t, vc_t)) #else - __constant u32a *s_td0 = td0; - __constant u32a *s_td1 = td1; - __constant u32a *s_td2 = td2; - __constant u32a *s_td3 = td3; - __constant u32a *s_td4 = td4; + CONSTANT_AS u32a *s_td0 = td0; + CONSTANT_AS u32a *s_td1 = td1; + CONSTANT_AS u32a *s_td2 = td2; + CONSTANT_AS u32a *s_td3 = td3; + CONSTANT_AS u32a *s_td4 = td4; - __constant u32a *s_te0 = te0; - __constant u32a *s_te1 = te1; - __constant u32a *s_te2 = te2; - __constant u32a *s_te3 = te3; - __constant u32a *s_te4 = te4; + CONSTANT_AS u32a *s_te0 = te0; + CONSTANT_AS u32a *s_te1 = te1; + CONSTANT_AS u32a *s_te2 = te2; + CONSTANT_AS u32a *s_te3 = te3; + CONSTANT_AS u32a *s_te4 = te4; #endif diff --git a/OpenCL/m13723-pure.cl b/OpenCL/m13723-pure.cl index a44c1acc0..cc365601e 100644 --- a/OpenCL/m13723-pure.cl +++ b/OpenCL/m13723-pure.cl @@ -57,7 +57,7 @@ typedef struct vc64_tmp } vc64_tmp_t; -DECLSPEC int check_header_0512 (__global const vc_t *esalt_bufs, __global u64 *key, SHM_TYPE u32 *s_te0, SHM_TYPE u32 *s_te1, SHM_TYPE u32 *s_te2, SHM_TYPE u32 *s_te3, SHM_TYPE u32 *s_te4, SHM_TYPE u32 *s_td0, SHM_TYPE u32 *s_td1, SHM_TYPE u32 *s_td2, SHM_TYPE u32 *s_td3, SHM_TYPE u32 *s_td4) +DECLSPEC int check_header_0512 (GLOBAL_AS const vc_t *esalt_bufs, GLOBAL_AS u64 *key, SHM_TYPE u32 *s_te0, SHM_TYPE u32 *s_te1, SHM_TYPE u32 *s_te2, SHM_TYPE u32 *s_te3, SHM_TYPE u32 *s_te4, SHM_TYPE u32 *s_td0, SHM_TYPE u32 *s_td1, SHM_TYPE u32 *s_td2, SHM_TYPE u32 *s_td3, SHM_TYPE u32 *s_td4) { u32 key1[8]; u32 key2[8]; @@ -88,7 +88,7 @@ DECLSPEC int check_header_0512 (__global const vc_t *esalt_bufs, __global u64 *k return -1; } -DECLSPEC int check_header_1024 (__global const vc_t *esalt_bufs, __global u64 *key, SHM_TYPE u32 *s_te0, SHM_TYPE u32 *s_te1, SHM_TYPE u32 *s_te2, SHM_TYPE u32 *s_te3, SHM_TYPE u32 *s_te4, SHM_TYPE u32 *s_td0, SHM_TYPE u32 *s_td1, SHM_TYPE u32 *s_td2, SHM_TYPE u32 *s_td3, SHM_TYPE u32 *s_td4) +DECLSPEC int check_header_1024 (GLOBAL_AS const vc_t *esalt_bufs, GLOBAL_AS u64 *key, SHM_TYPE u32 *s_te0, SHM_TYPE u32 *s_te1, SHM_TYPE u32 *s_te2, SHM_TYPE u32 *s_te3, SHM_TYPE u32 *s_te4, SHM_TYPE u32 *s_td0, SHM_TYPE u32 *s_td1, SHM_TYPE u32 *s_td2, SHM_TYPE u32 *s_td3, SHM_TYPE u32 *s_td4) { u32 key1[8]; u32 key2[8]; @@ -139,7 +139,7 @@ DECLSPEC int check_header_1024 (__global const vc_t *esalt_bufs, __global u64 *k return -1; } -DECLSPEC int check_header_1536 (__global const vc_t *esalt_bufs, __global u64 *key, SHM_TYPE u32 *s_te0, SHM_TYPE u32 *s_te1, SHM_TYPE u32 *s_te2, SHM_TYPE u32 *s_te3, SHM_TYPE u32 *s_te4, SHM_TYPE u32 *s_td0, SHM_TYPE u32 *s_td1, SHM_TYPE u32 *s_td2, SHM_TYPE u32 *s_td3, SHM_TYPE u32 *s_td4) +DECLSPEC int check_header_1536 (GLOBAL_AS const vc_t *esalt_bufs, GLOBAL_AS u64 *key, SHM_TYPE u32 *s_te0, SHM_TYPE u32 *s_te1, SHM_TYPE u32 *s_te2, SHM_TYPE u32 *s_te3, SHM_TYPE u32 *s_te4, SHM_TYPE u32 *s_td0, SHM_TYPE u32 *s_td1, SHM_TYPE u32 *s_td2, SHM_TYPE u32 *s_td3, SHM_TYPE u32 *s_td4) { u32 key1[8]; u32 key2[8]; @@ -262,7 +262,7 @@ DECLSPEC void hmac_sha512_run_V (u32x *w0, u32x *w1, u32x *w2, u32x *w3, u32x *w sha512_transform_vector (w0, w1, w2, w3, w4, w5, w6, w7, digest); } -__kernel void m13723_init (KERN_ATTR_TMPS_ESALT (vc64_tmp_t, vc_t)) +KERNEL_FQ void m13723_init (KERN_ATTR_TMPS_ESALT (vc64_tmp_t, vc_t)) { const u64 gid = get_global_id (0); const u64 lid = get_local_id (0); @@ -274,7 +274,7 @@ __kernel void m13723_init (KERN_ATTR_TMPS_ESALT (vc64_tmp_t, vc_t)) const int keyboard_layout_mapping_cnt = esalt_bufs[digests_offset].keyboard_layout_mapping_cnt; - __local keyboard_layout_mapping_t s_keyboard_layout_mapping_buf[256]; + LOCAL_AS keyboard_layout_mapping_t s_keyboard_layout_mapping_buf[256]; for (u32 i = lid; i < 256; i += lsz) { @@ -470,7 +470,7 @@ __kernel void m13723_init (KERN_ATTR_TMPS_ESALT (vc64_tmp_t, vc_t)) } } -__kernel void m13723_loop (KERN_ATTR_TMPS_ESALT (vc64_tmp_t, vc_t)) +KERNEL_FQ void m13723_loop (KERN_ATTR_TMPS_ESALT (vc64_tmp_t, vc_t)) { const u64 gid = get_global_id (0); const u64 lid = get_local_id (0); @@ -482,17 +482,17 @@ __kernel void m13723_loop (KERN_ATTR_TMPS_ESALT (vc64_tmp_t, vc_t)) #ifdef REAL_SHM - __local u32 s_td0[256]; - __local u32 s_td1[256]; - __local u32 s_td2[256]; - __local u32 s_td3[256]; - __local u32 s_td4[256]; + LOCAL_AS u32 s_td0[256]; + LOCAL_AS u32 s_td1[256]; + LOCAL_AS u32 s_td2[256]; + LOCAL_AS u32 s_td3[256]; + LOCAL_AS u32 s_td4[256]; - __local u32 s_te0[256]; - __local u32 s_te1[256]; - __local u32 s_te2[256]; - __local u32 s_te3[256]; - __local u32 s_te4[256]; + LOCAL_AS u32 s_te0[256]; + LOCAL_AS u32 s_te1[256]; + LOCAL_AS u32 s_te2[256]; + LOCAL_AS u32 s_te3[256]; + LOCAL_AS u32 s_te4[256]; for (u32 i = lid; i < 256; i += lsz) { @@ -513,17 +513,17 @@ __kernel void m13723_loop (KERN_ATTR_TMPS_ESALT (vc64_tmp_t, vc_t)) #else - __constant u32a *s_td0 = td0; - __constant u32a *s_td1 = td1; - __constant u32a *s_td2 = td2; - __constant u32a *s_td3 = td3; - __constant u32a *s_td4 = td4; + CONSTANT_AS u32a *s_td0 = td0; + CONSTANT_AS u32a *s_td1 = td1; + CONSTANT_AS u32a *s_td2 = td2; + CONSTANT_AS u32a *s_td3 = td3; + CONSTANT_AS u32a *s_td4 = td4; - __constant u32a *s_te0 = te0; - __constant u32a *s_te1 = te1; - __constant u32a *s_te2 = te2; - __constant u32a *s_te3 = te3; - __constant u32a *s_te4 = te4; + CONSTANT_AS u32a *s_te0 = te0; + CONSTANT_AS u32a *s_te1 = te1; + CONSTANT_AS u32a *s_te2 = te2; + CONSTANT_AS u32a *s_te3 = te3; + CONSTANT_AS u32a *s_te4 = te4; #endif @@ -700,7 +700,7 @@ __kernel void m13723_loop (KERN_ATTR_TMPS_ESALT (vc64_tmp_t, vc_t)) if (check_header_1536 (esalt_bufs, tmps[gid].pim_key, s_te0, s_te1, s_te2, s_te3, s_te4, s_td0, s_td1, s_td2, s_td3, s_td4) != -1) tmps[gid].pim = pim; } -__kernel void m13723_comp (KERN_ATTR_TMPS_ESALT (vc64_tmp_t, vc_t)) +KERNEL_FQ void m13723_comp (KERN_ATTR_TMPS_ESALT (vc64_tmp_t, vc_t)) { const u64 gid = get_global_id (0); const u64 lid = get_local_id (0); @@ -712,17 +712,17 @@ __kernel void m13723_comp (KERN_ATTR_TMPS_ESALT (vc64_tmp_t, vc_t)) #ifdef REAL_SHM - __local u32 s_td0[256]; - __local u32 s_td1[256]; - __local u32 s_td2[256]; - __local u32 s_td3[256]; - __local u32 s_td4[256]; + LOCAL_AS u32 s_td0[256]; + LOCAL_AS u32 s_td1[256]; + LOCAL_AS u32 s_td2[256]; + LOCAL_AS u32 s_td3[256]; + LOCAL_AS u32 s_td4[256]; - __local u32 s_te0[256]; - __local u32 s_te1[256]; - __local u32 s_te2[256]; - __local u32 s_te3[256]; - __local u32 s_te4[256]; + LOCAL_AS u32 s_te0[256]; + LOCAL_AS u32 s_te1[256]; + LOCAL_AS u32 s_te2[256]; + LOCAL_AS u32 s_te3[256]; + LOCAL_AS u32 s_te4[256]; for (u32 i = lid; i < 256; i += lsz) { @@ -743,17 +743,17 @@ __kernel void m13723_comp (KERN_ATTR_TMPS_ESALT (vc64_tmp_t, vc_t)) #else - __constant u32a *s_td0 = td0; - __constant u32a *s_td1 = td1; - __constant u32a *s_td2 = td2; - __constant u32a *s_td3 = td3; - __constant u32a *s_td4 = td4; + CONSTANT_AS u32a *s_td0 = td0; + CONSTANT_AS u32a *s_td1 = td1; + CONSTANT_AS u32a *s_td2 = td2; + CONSTANT_AS u32a *s_td3 = td3; + CONSTANT_AS u32a *s_td4 = td4; - __constant u32a *s_te0 = te0; - __constant u32a *s_te1 = te1; - __constant u32a *s_te2 = te2; - __constant u32a *s_te3 = te3; - __constant u32a *s_te4 = te4; + CONSTANT_AS u32a *s_te0 = te0; + CONSTANT_AS u32a *s_te1 = te1; + CONSTANT_AS u32a *s_te2 = te2; + CONSTANT_AS u32a *s_te3 = te3; + CONSTANT_AS u32a *s_te4 = te4; #endif diff --git a/OpenCL/m13731-pure.cl b/OpenCL/m13731-pure.cl index f150a723f..bea67c0cc 100644 --- a/OpenCL/m13731-pure.cl +++ b/OpenCL/m13731-pure.cl @@ -57,7 +57,7 @@ typedef struct vc_tmp } vc_tmp_t; -DECLSPEC int check_header_0512 (__global const vc_t *esalt_bufs, __global u32 *key, SHM_TYPE u32 *s_te0, SHM_TYPE u32 *s_te1, SHM_TYPE u32 *s_te2, SHM_TYPE u32 *s_te3, SHM_TYPE u32 *s_te4, SHM_TYPE u32 *s_td0, SHM_TYPE u32 *s_td1, SHM_TYPE u32 *s_td2, SHM_TYPE u32 *s_td3, SHM_TYPE u32 *s_td4) +DECLSPEC int check_header_0512 (GLOBAL_AS const vc_t *esalt_bufs, GLOBAL_AS u32 *key, SHM_TYPE u32 *s_te0, SHM_TYPE u32 *s_te1, SHM_TYPE u32 *s_te2, SHM_TYPE u32 *s_te3, SHM_TYPE u32 *s_te4, SHM_TYPE u32 *s_td0, SHM_TYPE u32 *s_td1, SHM_TYPE u32 *s_td2, SHM_TYPE u32 *s_td3, SHM_TYPE u32 *s_td4) { u32 key1[8]; u32 key2[8]; @@ -184,7 +184,7 @@ DECLSPEC void hmac_whirlpool_run_V (u32x *w0, u32x *w1, u32x *w2, u32x *w3, u32x whirlpool_transform_vector (w0, w1, w2, w3, digest, s_Ch, s_Cl); } -__kernel void m13731_init (KERN_ATTR_TMPS_ESALT (vc_tmp_t, vc_t)) +KERNEL_FQ void m13731_init (KERN_ATTR_TMPS_ESALT (vc_tmp_t, vc_t)) { const u64 gid = get_global_id (0); const u64 lid = get_local_id (0); @@ -196,7 +196,7 @@ __kernel void m13731_init (KERN_ATTR_TMPS_ESALT (vc_tmp_t, vc_t)) const int keyboard_layout_mapping_cnt = esalt_bufs[digests_offset].keyboard_layout_mapping_cnt; - __local keyboard_layout_mapping_t s_keyboard_layout_mapping_buf[256]; + LOCAL_AS keyboard_layout_mapping_t s_keyboard_layout_mapping_buf[256]; for (u32 i = lid; i < 256; i += lsz) { @@ -211,8 +211,8 @@ __kernel void m13731_init (KERN_ATTR_TMPS_ESALT (vc_tmp_t, vc_t)) #ifdef REAL_SHM - __local u32 s_Ch[8][256]; - __local u32 s_Cl[8][256]; + LOCAL_AS u32 s_Ch[8][256]; + LOCAL_AS u32 s_Cl[8][256]; for (u32 i = lid; i < 256; i += lsz) { @@ -239,8 +239,8 @@ __kernel void m13731_init (KERN_ATTR_TMPS_ESALT (vc_tmp_t, vc_t)) #else - __constant u32a (*s_Ch)[256] = Ch; - __constant u32a (*s_Cl)[256] = Cl; + CONSTANT_AS u32a (*s_Ch)[256] = Ch; + CONSTANT_AS u32a (*s_Cl)[256] = Cl; #endif @@ -411,7 +411,7 @@ __kernel void m13731_init (KERN_ATTR_TMPS_ESALT (vc_tmp_t, vc_t)) } } -__kernel void m13731_loop (KERN_ATTR_TMPS_ESALT (vc_tmp_t, vc_t)) +KERNEL_FQ void m13731_loop (KERN_ATTR_TMPS_ESALT (vc_tmp_t, vc_t)) { const u64 gid = get_global_id (0); const u64 lid = get_local_id (0); @@ -423,17 +423,17 @@ __kernel void m13731_loop (KERN_ATTR_TMPS_ESALT (vc_tmp_t, vc_t)) #ifdef REAL_SHM - __local u32 s_td0[256]; - __local u32 s_td1[256]; - __local u32 s_td2[256]; - __local u32 s_td3[256]; - __local u32 s_td4[256]; + LOCAL_AS u32 s_td0[256]; + LOCAL_AS u32 s_td1[256]; + LOCAL_AS u32 s_td2[256]; + LOCAL_AS u32 s_td3[256]; + LOCAL_AS u32 s_td4[256]; - __local u32 s_te0[256]; - __local u32 s_te1[256]; - __local u32 s_te2[256]; - __local u32 s_te3[256]; - __local u32 s_te4[256]; + LOCAL_AS u32 s_te0[256]; + LOCAL_AS u32 s_te1[256]; + LOCAL_AS u32 s_te2[256]; + LOCAL_AS u32 s_te3[256]; + LOCAL_AS u32 s_te4[256]; for (u32 i = lid; i < 256; i += lsz) { @@ -454,17 +454,17 @@ __kernel void m13731_loop (KERN_ATTR_TMPS_ESALT (vc_tmp_t, vc_t)) #else - __constant u32a *s_td0 = td0; - __constant u32a *s_td1 = td1; - __constant u32a *s_td2 = td2; - __constant u32a *s_td3 = td3; - __constant u32a *s_td4 = td4; + CONSTANT_AS u32a *s_td0 = td0; + CONSTANT_AS u32a *s_td1 = td1; + CONSTANT_AS u32a *s_td2 = td2; + CONSTANT_AS u32a *s_td3 = td3; + CONSTANT_AS u32a *s_td4 = td4; - __constant u32a *s_te0 = te0; - __constant u32a *s_te1 = te1; - __constant u32a *s_te2 = te2; - __constant u32a *s_te3 = te3; - __constant u32a *s_te4 = te4; + CONSTANT_AS u32a *s_te0 = te0; + CONSTANT_AS u32a *s_te1 = te1; + CONSTANT_AS u32a *s_te2 = te2; + CONSTANT_AS u32a *s_te3 = te3; + CONSTANT_AS u32a *s_te4 = te4; #endif @@ -474,8 +474,8 @@ __kernel void m13731_loop (KERN_ATTR_TMPS_ESALT (vc_tmp_t, vc_t)) #ifdef REAL_SHM - __local u32 s_Ch[8][256]; - __local u32 s_Cl[8][256]; + LOCAL_AS u32 s_Ch[8][256]; + LOCAL_AS u32 s_Cl[8][256]; for (u32 i = lid; i < 256; i += lsz) { @@ -502,8 +502,8 @@ __kernel void m13731_loop (KERN_ATTR_TMPS_ESALT (vc_tmp_t, vc_t)) #else - __constant u32a (*s_Ch)[256] = Ch; - __constant u32a (*s_Cl)[256] = Cl; + CONSTANT_AS u32a (*s_Ch)[256] = Ch; + CONSTANT_AS u32a (*s_Cl)[256] = Cl; #endif @@ -722,7 +722,7 @@ __kernel void m13731_loop (KERN_ATTR_TMPS_ESALT (vc_tmp_t, vc_t)) if (check_header_0512 (esalt_bufs, tmps[gid].pim_key, s_te0, s_te1, s_te2, s_te3, s_te4, s_td0, s_td1, s_td2, s_td3, s_td4) != -1) tmps[gid].pim = pim; } -__kernel void m13731_comp (KERN_ATTR_TMPS_ESALT (vc_tmp_t, vc_t)) +KERNEL_FQ void m13731_comp (KERN_ATTR_TMPS_ESALT (vc_tmp_t, vc_t)) { const u64 gid = get_global_id (0); const u64 lid = get_local_id (0); @@ -734,17 +734,17 @@ __kernel void m13731_comp (KERN_ATTR_TMPS_ESALT (vc_tmp_t, vc_t)) #ifdef REAL_SHM - __local u32 s_td0[256]; - __local u32 s_td1[256]; - __local u32 s_td2[256]; - __local u32 s_td3[256]; - __local u32 s_td4[256]; + LOCAL_AS u32 s_td0[256]; + LOCAL_AS u32 s_td1[256]; + LOCAL_AS u32 s_td2[256]; + LOCAL_AS u32 s_td3[256]; + LOCAL_AS u32 s_td4[256]; - __local u32 s_te0[256]; - __local u32 s_te1[256]; - __local u32 s_te2[256]; - __local u32 s_te3[256]; - __local u32 s_te4[256]; + LOCAL_AS u32 s_te0[256]; + LOCAL_AS u32 s_te1[256]; + LOCAL_AS u32 s_te2[256]; + LOCAL_AS u32 s_te3[256]; + LOCAL_AS u32 s_te4[256]; for (u32 i = lid; i < 256; i += lsz) { @@ -765,17 +765,17 @@ __kernel void m13731_comp (KERN_ATTR_TMPS_ESALT (vc_tmp_t, vc_t)) #else - __constant u32a *s_td0 = td0; - __constant u32a *s_td1 = td1; - __constant u32a *s_td2 = td2; - __constant u32a *s_td3 = td3; - __constant u32a *s_td4 = td4; + CONSTANT_AS u32a *s_td0 = td0; + CONSTANT_AS u32a *s_td1 = td1; + CONSTANT_AS u32a *s_td2 = td2; + CONSTANT_AS u32a *s_td3 = td3; + CONSTANT_AS u32a *s_td4 = td4; - __constant u32a *s_te0 = te0; - __constant u32a *s_te1 = te1; - __constant u32a *s_te2 = te2; - __constant u32a *s_te3 = te3; - __constant u32a *s_te4 = te4; + CONSTANT_AS u32a *s_te0 = te0; + CONSTANT_AS u32a *s_te1 = te1; + CONSTANT_AS u32a *s_te2 = te2; + CONSTANT_AS u32a *s_te3 = te3; + CONSTANT_AS u32a *s_te4 = te4; #endif @@ -785,8 +785,8 @@ __kernel void m13731_comp (KERN_ATTR_TMPS_ESALT (vc_tmp_t, vc_t)) #ifdef REAL_SHM - __local u32 s_Ch[8][256]; - __local u32 s_Cl[8][256]; + LOCAL_AS u32 s_Ch[8][256]; + LOCAL_AS u32 s_Cl[8][256]; for (u32 i = lid; i < 256; i += lsz) { @@ -813,8 +813,8 @@ __kernel void m13731_comp (KERN_ATTR_TMPS_ESALT (vc_tmp_t, vc_t)) #else - __constant u32a (*s_Ch)[256] = Ch; - __constant u32a (*s_Cl)[256] = Cl; + CONSTANT_AS u32a (*s_Ch)[256] = Ch; + CONSTANT_AS u32a (*s_Cl)[256] = Cl; #endif diff --git a/OpenCL/m13732-pure.cl b/OpenCL/m13732-pure.cl index c4f6e7433..225ac3ba8 100644 --- a/OpenCL/m13732-pure.cl +++ b/OpenCL/m13732-pure.cl @@ -57,7 +57,7 @@ typedef struct vc_tmp } vc_tmp_t; -DECLSPEC int check_header_0512 (__global const vc_t *esalt_bufs, __global u32 *key, SHM_TYPE u32 *s_te0, SHM_TYPE u32 *s_te1, SHM_TYPE u32 *s_te2, SHM_TYPE u32 *s_te3, SHM_TYPE u32 *s_te4, SHM_TYPE u32 *s_td0, SHM_TYPE u32 *s_td1, SHM_TYPE u32 *s_td2, SHM_TYPE u32 *s_td3, SHM_TYPE u32 *s_td4) +DECLSPEC int check_header_0512 (GLOBAL_AS const vc_t *esalt_bufs, GLOBAL_AS u32 *key, SHM_TYPE u32 *s_te0, SHM_TYPE u32 *s_te1, SHM_TYPE u32 *s_te2, SHM_TYPE u32 *s_te3, SHM_TYPE u32 *s_te4, SHM_TYPE u32 *s_td0, SHM_TYPE u32 *s_td1, SHM_TYPE u32 *s_td2, SHM_TYPE u32 *s_td3, SHM_TYPE u32 *s_td4) { u32 key1[8]; u32 key2[8]; @@ -88,7 +88,7 @@ DECLSPEC int check_header_0512 (__global const vc_t *esalt_bufs, __global u32 *k return -1; } -DECLSPEC int check_header_1024 (__global const vc_t *esalt_bufs, __global u32 *key, SHM_TYPE u32 *s_te0, SHM_TYPE u32 *s_te1, SHM_TYPE u32 *s_te2, SHM_TYPE u32 *s_te3, SHM_TYPE u32 *s_te4, SHM_TYPE u32 *s_td0, SHM_TYPE u32 *s_td1, SHM_TYPE u32 *s_td2, SHM_TYPE u32 *s_td3, SHM_TYPE u32 *s_td4) +DECLSPEC int check_header_1024 (GLOBAL_AS const vc_t *esalt_bufs, GLOBAL_AS u32 *key, SHM_TYPE u32 *s_te0, SHM_TYPE u32 *s_te1, SHM_TYPE u32 *s_te2, SHM_TYPE u32 *s_te3, SHM_TYPE u32 *s_te4, SHM_TYPE u32 *s_td0, SHM_TYPE u32 *s_td1, SHM_TYPE u32 *s_td2, SHM_TYPE u32 *s_td3, SHM_TYPE u32 *s_td4) { u32 key1[8]; u32 key2[8]; @@ -235,7 +235,7 @@ DECLSPEC void hmac_whirlpool_run_V (u32x *w0, u32x *w1, u32x *w2, u32x *w3, u32x whirlpool_transform_vector (w0, w1, w2, w3, digest, s_Ch, s_Cl); } -__kernel void m13732_init (KERN_ATTR_TMPS_ESALT (vc_tmp_t, vc_t)) +KERNEL_FQ void m13732_init (KERN_ATTR_TMPS_ESALT (vc_tmp_t, vc_t)) { const u64 gid = get_global_id (0); const u64 lid = get_local_id (0); @@ -247,7 +247,7 @@ __kernel void m13732_init (KERN_ATTR_TMPS_ESALT (vc_tmp_t, vc_t)) const int keyboard_layout_mapping_cnt = esalt_bufs[digests_offset].keyboard_layout_mapping_cnt; - __local keyboard_layout_mapping_t s_keyboard_layout_mapping_buf[256]; + LOCAL_AS keyboard_layout_mapping_t s_keyboard_layout_mapping_buf[256]; for (u32 i = lid; i < 256; i += lsz) { @@ -262,8 +262,8 @@ __kernel void m13732_init (KERN_ATTR_TMPS_ESALT (vc_tmp_t, vc_t)) #ifdef REAL_SHM - __local u32 s_Ch[8][256]; - __local u32 s_Cl[8][256]; + LOCAL_AS u32 s_Ch[8][256]; + LOCAL_AS u32 s_Cl[8][256]; for (u32 i = lid; i < 256; i += lsz) { @@ -290,8 +290,8 @@ __kernel void m13732_init (KERN_ATTR_TMPS_ESALT (vc_tmp_t, vc_t)) #else - __constant u32a (*s_Ch)[256] = Ch; - __constant u32a (*s_Cl)[256] = Cl; + CONSTANT_AS u32a (*s_Ch)[256] = Ch; + CONSTANT_AS u32a (*s_Cl)[256] = Cl; #endif @@ -462,7 +462,7 @@ __kernel void m13732_init (KERN_ATTR_TMPS_ESALT (vc_tmp_t, vc_t)) } } -__kernel void m13732_loop (KERN_ATTR_TMPS_ESALT (vc_tmp_t, vc_t)) +KERNEL_FQ void m13732_loop (KERN_ATTR_TMPS_ESALT (vc_tmp_t, vc_t)) { const u64 gid = get_global_id (0); const u64 lid = get_local_id (0); @@ -474,17 +474,17 @@ __kernel void m13732_loop (KERN_ATTR_TMPS_ESALT (vc_tmp_t, vc_t)) #ifdef REAL_SHM - __local u32 s_td0[256]; - __local u32 s_td1[256]; - __local u32 s_td2[256]; - __local u32 s_td3[256]; - __local u32 s_td4[256]; + LOCAL_AS u32 s_td0[256]; + LOCAL_AS u32 s_td1[256]; + LOCAL_AS u32 s_td2[256]; + LOCAL_AS u32 s_td3[256]; + LOCAL_AS u32 s_td4[256]; - __local u32 s_te0[256]; - __local u32 s_te1[256]; - __local u32 s_te2[256]; - __local u32 s_te3[256]; - __local u32 s_te4[256]; + LOCAL_AS u32 s_te0[256]; + LOCAL_AS u32 s_te1[256]; + LOCAL_AS u32 s_te2[256]; + LOCAL_AS u32 s_te3[256]; + LOCAL_AS u32 s_te4[256]; for (u32 i = lid; i < 256; i += lsz) { @@ -505,17 +505,17 @@ __kernel void m13732_loop (KERN_ATTR_TMPS_ESALT (vc_tmp_t, vc_t)) #else - __constant u32a *s_td0 = td0; - __constant u32a *s_td1 = td1; - __constant u32a *s_td2 = td2; - __constant u32a *s_td3 = td3; - __constant u32a *s_td4 = td4; + CONSTANT_AS u32a *s_td0 = td0; + CONSTANT_AS u32a *s_td1 = td1; + CONSTANT_AS u32a *s_td2 = td2; + CONSTANT_AS u32a *s_td3 = td3; + CONSTANT_AS u32a *s_td4 = td4; - __constant u32a *s_te0 = te0; - __constant u32a *s_te1 = te1; - __constant u32a *s_te2 = te2; - __constant u32a *s_te3 = te3; - __constant u32a *s_te4 = te4; + CONSTANT_AS u32a *s_te0 = te0; + CONSTANT_AS u32a *s_te1 = te1; + CONSTANT_AS u32a *s_te2 = te2; + CONSTANT_AS u32a *s_te3 = te3; + CONSTANT_AS u32a *s_te4 = te4; #endif @@ -525,8 +525,8 @@ __kernel void m13732_loop (KERN_ATTR_TMPS_ESALT (vc_tmp_t, vc_t)) #ifdef REAL_SHM - __local u32 s_Ch[8][256]; - __local u32 s_Cl[8][256]; + LOCAL_AS u32 s_Ch[8][256]; + LOCAL_AS u32 s_Cl[8][256]; for (u32 i = lid; i < 256; i += lsz) { @@ -553,8 +553,8 @@ __kernel void m13732_loop (KERN_ATTR_TMPS_ESALT (vc_tmp_t, vc_t)) #else - __constant u32a (*s_Ch)[256] = Ch; - __constant u32a (*s_Cl)[256] = Cl; + CONSTANT_AS u32a (*s_Ch)[256] = Ch; + CONSTANT_AS u32a (*s_Cl)[256] = Cl; #endif @@ -774,7 +774,7 @@ __kernel void m13732_loop (KERN_ATTR_TMPS_ESALT (vc_tmp_t, vc_t)) if (check_header_1024 (esalt_bufs, tmps[gid].pim_key, s_te0, s_te1, s_te2, s_te3, s_te4, s_td0, s_td1, s_td2, s_td3, s_td4) != -1) tmps[gid].pim = pim; } -__kernel void m13732_comp (KERN_ATTR_TMPS_ESALT (vc_tmp_t, vc_t)) +KERNEL_FQ void m13732_comp (KERN_ATTR_TMPS_ESALT (vc_tmp_t, vc_t)) { const u64 gid = get_global_id (0); const u64 lid = get_local_id (0); @@ -786,17 +786,17 @@ __kernel void m13732_comp (KERN_ATTR_TMPS_ESALT (vc_tmp_t, vc_t)) #ifdef REAL_SHM - __local u32 s_td0[256]; - __local u32 s_td1[256]; - __local u32 s_td2[256]; - __local u32 s_td3[256]; - __local u32 s_td4[256]; + LOCAL_AS u32 s_td0[256]; + LOCAL_AS u32 s_td1[256]; + LOCAL_AS u32 s_td2[256]; + LOCAL_AS u32 s_td3[256]; + LOCAL_AS u32 s_td4[256]; - __local u32 s_te0[256]; - __local u32 s_te1[256]; - __local u32 s_te2[256]; - __local u32 s_te3[256]; - __local u32 s_te4[256]; + LOCAL_AS u32 s_te0[256]; + LOCAL_AS u32 s_te1[256]; + LOCAL_AS u32 s_te2[256]; + LOCAL_AS u32 s_te3[256]; + LOCAL_AS u32 s_te4[256]; for (u32 i = lid; i < 256; i += lsz) { @@ -817,17 +817,17 @@ __kernel void m13732_comp (KERN_ATTR_TMPS_ESALT (vc_tmp_t, vc_t)) #else - __constant u32a *s_td0 = td0; - __constant u32a *s_td1 = td1; - __constant u32a *s_td2 = td2; - __constant u32a *s_td3 = td3; - __constant u32a *s_td4 = td4; + CONSTANT_AS u32a *s_td0 = td0; + CONSTANT_AS u32a *s_td1 = td1; + CONSTANT_AS u32a *s_td2 = td2; + CONSTANT_AS u32a *s_td3 = td3; + CONSTANT_AS u32a *s_td4 = td4; - __constant u32a *s_te0 = te0; - __constant u32a *s_te1 = te1; - __constant u32a *s_te2 = te2; - __constant u32a *s_te3 = te3; - __constant u32a *s_te4 = te4; + CONSTANT_AS u32a *s_te0 = te0; + CONSTANT_AS u32a *s_te1 = te1; + CONSTANT_AS u32a *s_te2 = te2; + CONSTANT_AS u32a *s_te3 = te3; + CONSTANT_AS u32a *s_te4 = te4; #endif @@ -837,8 +837,8 @@ __kernel void m13732_comp (KERN_ATTR_TMPS_ESALT (vc_tmp_t, vc_t)) #ifdef REAL_SHM - __local u32 s_Ch[8][256]; - __local u32 s_Cl[8][256]; + LOCAL_AS u32 s_Ch[8][256]; + LOCAL_AS u32 s_Cl[8][256]; for (u32 i = lid; i < 256; i += lsz) { @@ -865,8 +865,8 @@ __kernel void m13732_comp (KERN_ATTR_TMPS_ESALT (vc_tmp_t, vc_t)) #else - __constant u32a (*s_Ch)[256] = Ch; - __constant u32a (*s_Cl)[256] = Cl; + CONSTANT_AS u32a (*s_Ch)[256] = Ch; + CONSTANT_AS u32a (*s_Cl)[256] = Cl; #endif diff --git a/OpenCL/m13733-pure.cl b/OpenCL/m13733-pure.cl index d9482075c..7a793a0b4 100644 --- a/OpenCL/m13733-pure.cl +++ b/OpenCL/m13733-pure.cl @@ -57,7 +57,7 @@ typedef struct vc_tmp } vc_tmp_t; -DECLSPEC int check_header_0512 (__global const vc_t *esalt_bufs, __global u32 *key, SHM_TYPE u32 *s_te0, SHM_TYPE u32 *s_te1, SHM_TYPE u32 *s_te2, SHM_TYPE u32 *s_te3, SHM_TYPE u32 *s_te4, SHM_TYPE u32 *s_td0, SHM_TYPE u32 *s_td1, SHM_TYPE u32 *s_td2, SHM_TYPE u32 *s_td3, SHM_TYPE u32 *s_td4) +DECLSPEC int check_header_0512 (GLOBAL_AS const vc_t *esalt_bufs, GLOBAL_AS u32 *key, SHM_TYPE u32 *s_te0, SHM_TYPE u32 *s_te1, SHM_TYPE u32 *s_te2, SHM_TYPE u32 *s_te3, SHM_TYPE u32 *s_te4, SHM_TYPE u32 *s_td0, SHM_TYPE u32 *s_td1, SHM_TYPE u32 *s_td2, SHM_TYPE u32 *s_td3, SHM_TYPE u32 *s_td4) { u32 key1[8]; u32 key2[8]; @@ -88,7 +88,7 @@ DECLSPEC int check_header_0512 (__global const vc_t *esalt_bufs, __global u32 *k return -1; } -DECLSPEC int check_header_1024 (__global const vc_t *esalt_bufs, __global u32 *key, SHM_TYPE u32 *s_te0, SHM_TYPE u32 *s_te1, SHM_TYPE u32 *s_te2, SHM_TYPE u32 *s_te3, SHM_TYPE u32 *s_te4, SHM_TYPE u32 *s_td0, SHM_TYPE u32 *s_td1, SHM_TYPE u32 *s_td2, SHM_TYPE u32 *s_td3, SHM_TYPE u32 *s_td4) +DECLSPEC int check_header_1024 (GLOBAL_AS const vc_t *esalt_bufs, GLOBAL_AS u32 *key, SHM_TYPE u32 *s_te0, SHM_TYPE u32 *s_te1, SHM_TYPE u32 *s_te2, SHM_TYPE u32 *s_te3, SHM_TYPE u32 *s_te4, SHM_TYPE u32 *s_td0, SHM_TYPE u32 *s_td1, SHM_TYPE u32 *s_td2, SHM_TYPE u32 *s_td3, SHM_TYPE u32 *s_td4) { u32 key1[8]; u32 key2[8]; @@ -139,7 +139,7 @@ DECLSPEC int check_header_1024 (__global const vc_t *esalt_bufs, __global u32 *k return -1; } -DECLSPEC int check_header_1536 (__global const vc_t *esalt_bufs, __global u32 *key, SHM_TYPE u32 *s_te0, SHM_TYPE u32 *s_te1, SHM_TYPE u32 *s_te2, SHM_TYPE u32 *s_te3, SHM_TYPE u32 *s_te4, SHM_TYPE u32 *s_td0, SHM_TYPE u32 *s_td1, SHM_TYPE u32 *s_td2, SHM_TYPE u32 *s_td3, SHM_TYPE u32 *s_td4) +DECLSPEC int check_header_1536 (GLOBAL_AS const vc_t *esalt_bufs, GLOBAL_AS u32 *key, SHM_TYPE u32 *s_te0, SHM_TYPE u32 *s_te1, SHM_TYPE u32 *s_te2, SHM_TYPE u32 *s_te3, SHM_TYPE u32 *s_te4, SHM_TYPE u32 *s_td0, SHM_TYPE u32 *s_td1, SHM_TYPE u32 *s_td2, SHM_TYPE u32 *s_td3, SHM_TYPE u32 *s_td4) { u32 key1[8]; u32 key2[8]; @@ -300,7 +300,7 @@ DECLSPEC void hmac_whirlpool_run_V (u32x *w0, u32x *w1, u32x *w2, u32x *w3, u32x whirlpool_transform_vector (w0, w1, w2, w3, digest, s_Ch, s_Cl); } -__kernel void m13733_init (KERN_ATTR_TMPS_ESALT (vc_tmp_t, vc_t)) +KERNEL_FQ void m13733_init (KERN_ATTR_TMPS_ESALT (vc_tmp_t, vc_t)) { const u64 gid = get_global_id (0); const u64 lid = get_local_id (0); @@ -312,7 +312,7 @@ __kernel void m13733_init (KERN_ATTR_TMPS_ESALT (vc_tmp_t, vc_t)) const int keyboard_layout_mapping_cnt = esalt_bufs[digests_offset].keyboard_layout_mapping_cnt; - __local keyboard_layout_mapping_t s_keyboard_layout_mapping_buf[256]; + LOCAL_AS keyboard_layout_mapping_t s_keyboard_layout_mapping_buf[256]; for (u32 i = lid; i < 256; i += lsz) { @@ -327,8 +327,8 @@ __kernel void m13733_init (KERN_ATTR_TMPS_ESALT (vc_tmp_t, vc_t)) #ifdef REAL_SHM - __local u32 s_Ch[8][256]; - __local u32 s_Cl[8][256]; + LOCAL_AS u32 s_Ch[8][256]; + LOCAL_AS u32 s_Cl[8][256]; for (u32 i = lid; i < 256; i += lsz) { @@ -355,8 +355,8 @@ __kernel void m13733_init (KERN_ATTR_TMPS_ESALT (vc_tmp_t, vc_t)) #else - __constant u32a (*s_Ch)[256] = Ch; - __constant u32a (*s_Cl)[256] = Cl; + CONSTANT_AS u32a (*s_Ch)[256] = Ch; + CONSTANT_AS u32a (*s_Cl)[256] = Cl; #endif @@ -527,7 +527,7 @@ __kernel void m13733_init (KERN_ATTR_TMPS_ESALT (vc_tmp_t, vc_t)) } } -__kernel void m13733_loop (KERN_ATTR_TMPS_ESALT (vc_tmp_t, vc_t)) +KERNEL_FQ void m13733_loop (KERN_ATTR_TMPS_ESALT (vc_tmp_t, vc_t)) { const u64 gid = get_global_id (0); const u64 lid = get_local_id (0); @@ -539,17 +539,17 @@ __kernel void m13733_loop (KERN_ATTR_TMPS_ESALT (vc_tmp_t, vc_t)) #ifdef REAL_SHM - __local u32 s_td0[256]; - __local u32 s_td1[256]; - __local u32 s_td2[256]; - __local u32 s_td3[256]; - __local u32 s_td4[256]; + LOCAL_AS u32 s_td0[256]; + LOCAL_AS u32 s_td1[256]; + LOCAL_AS u32 s_td2[256]; + LOCAL_AS u32 s_td3[256]; + LOCAL_AS u32 s_td4[256]; - __local u32 s_te0[256]; - __local u32 s_te1[256]; - __local u32 s_te2[256]; - __local u32 s_te3[256]; - __local u32 s_te4[256]; + LOCAL_AS u32 s_te0[256]; + LOCAL_AS u32 s_te1[256]; + LOCAL_AS u32 s_te2[256]; + LOCAL_AS u32 s_te3[256]; + LOCAL_AS u32 s_te4[256]; for (u32 i = lid; i < 256; i += lsz) { @@ -570,17 +570,17 @@ __kernel void m13733_loop (KERN_ATTR_TMPS_ESALT (vc_tmp_t, vc_t)) #else - __constant u32a *s_td0 = td0; - __constant u32a *s_td1 = td1; - __constant u32a *s_td2 = td2; - __constant u32a *s_td3 = td3; - __constant u32a *s_td4 = td4; + CONSTANT_AS u32a *s_td0 = td0; + CONSTANT_AS u32a *s_td1 = td1; + CONSTANT_AS u32a *s_td2 = td2; + CONSTANT_AS u32a *s_td3 = td3; + CONSTANT_AS u32a *s_td4 = td4; - __constant u32a *s_te0 = te0; - __constant u32a *s_te1 = te1; - __constant u32a *s_te2 = te2; - __constant u32a *s_te3 = te3; - __constant u32a *s_te4 = te4; + CONSTANT_AS u32a *s_te0 = te0; + CONSTANT_AS u32a *s_te1 = te1; + CONSTANT_AS u32a *s_te2 = te2; + CONSTANT_AS u32a *s_te3 = te3; + CONSTANT_AS u32a *s_te4 = te4; #endif @@ -590,8 +590,8 @@ __kernel void m13733_loop (KERN_ATTR_TMPS_ESALT (vc_tmp_t, vc_t)) #ifdef REAL_SHM - __local u32 s_Ch[8][256]; - __local u32 s_Cl[8][256]; + LOCAL_AS u32 s_Ch[8][256]; + LOCAL_AS u32 s_Cl[8][256]; for (u32 i = lid; i < 256; i += lsz) { @@ -618,8 +618,8 @@ __kernel void m13733_loop (KERN_ATTR_TMPS_ESALT (vc_tmp_t, vc_t)) #else - __constant u32a (*s_Ch)[256] = Ch; - __constant u32a (*s_Cl)[256] = Cl; + CONSTANT_AS u32a (*s_Ch)[256] = Ch; + CONSTANT_AS u32a (*s_Cl)[256] = Cl; #endif @@ -840,7 +840,7 @@ __kernel void m13733_loop (KERN_ATTR_TMPS_ESALT (vc_tmp_t, vc_t)) if (check_header_1536 (esalt_bufs, tmps[gid].pim_key, s_te0, s_te1, s_te2, s_te3, s_te4, s_td0, s_td1, s_td2, s_td3, s_td4) != -1) tmps[gid].pim = pim; } -__kernel void m13733_comp (KERN_ATTR_TMPS_ESALT (vc_tmp_t, vc_t)) +KERNEL_FQ void m13733_comp (KERN_ATTR_TMPS_ESALT (vc_tmp_t, vc_t)) { const u64 gid = get_global_id (0); const u64 lid = get_local_id (0); @@ -852,17 +852,17 @@ __kernel void m13733_comp (KERN_ATTR_TMPS_ESALT (vc_tmp_t, vc_t)) #ifdef REAL_SHM - __local u32 s_td0[256]; - __local u32 s_td1[256]; - __local u32 s_td2[256]; - __local u32 s_td3[256]; - __local u32 s_td4[256]; + LOCAL_AS u32 s_td0[256]; + LOCAL_AS u32 s_td1[256]; + LOCAL_AS u32 s_td2[256]; + LOCAL_AS u32 s_td3[256]; + LOCAL_AS u32 s_td4[256]; - __local u32 s_te0[256]; - __local u32 s_te1[256]; - __local u32 s_te2[256]; - __local u32 s_te3[256]; - __local u32 s_te4[256]; + LOCAL_AS u32 s_te0[256]; + LOCAL_AS u32 s_te1[256]; + LOCAL_AS u32 s_te2[256]; + LOCAL_AS u32 s_te3[256]; + LOCAL_AS u32 s_te4[256]; for (u32 i = lid; i < 256; i += lsz) { @@ -883,17 +883,17 @@ __kernel void m13733_comp (KERN_ATTR_TMPS_ESALT (vc_tmp_t, vc_t)) #else - __constant u32a *s_td0 = td0; - __constant u32a *s_td1 = td1; - __constant u32a *s_td2 = td2; - __constant u32a *s_td3 = td3; - __constant u32a *s_td4 = td4; + CONSTANT_AS u32a *s_td0 = td0; + CONSTANT_AS u32a *s_td1 = td1; + CONSTANT_AS u32a *s_td2 = td2; + CONSTANT_AS u32a *s_td3 = td3; + CONSTANT_AS u32a *s_td4 = td4; - __constant u32a *s_te0 = te0; - __constant u32a *s_te1 = te1; - __constant u32a *s_te2 = te2; - __constant u32a *s_te3 = te3; - __constant u32a *s_te4 = te4; + CONSTANT_AS u32a *s_te0 = te0; + CONSTANT_AS u32a *s_te1 = te1; + CONSTANT_AS u32a *s_te2 = te2; + CONSTANT_AS u32a *s_te3 = te3; + CONSTANT_AS u32a *s_te4 = te4; #endif @@ -903,8 +903,8 @@ __kernel void m13733_comp (KERN_ATTR_TMPS_ESALT (vc_tmp_t, vc_t)) #ifdef REAL_SHM - __local u32 s_Ch[8][256]; - __local u32 s_Cl[8][256]; + LOCAL_AS u32 s_Ch[8][256]; + LOCAL_AS u32 s_Cl[8][256]; for (u32 i = lid; i < 256; i += lsz) { @@ -931,8 +931,8 @@ __kernel void m13733_comp (KERN_ATTR_TMPS_ESALT (vc_tmp_t, vc_t)) #else - __constant u32a (*s_Ch)[256] = Ch; - __constant u32a (*s_Cl)[256] = Cl; + CONSTANT_AS u32a (*s_Ch)[256] = Ch; + CONSTANT_AS u32a (*s_Cl)[256] = Cl; #endif diff --git a/OpenCL/m13751-pure.cl b/OpenCL/m13751-pure.cl index 3292c39b7..cff02d645 100644 --- a/OpenCL/m13751-pure.cl +++ b/OpenCL/m13751-pure.cl @@ -57,7 +57,7 @@ typedef struct vc_tmp } vc_tmp_t; -DECLSPEC int check_header_0512 (__global const vc_t *esalt_bufs, __global u32 *key, SHM_TYPE u32 *s_te0, SHM_TYPE u32 *s_te1, SHM_TYPE u32 *s_te2, SHM_TYPE u32 *s_te3, SHM_TYPE u32 *s_te4, SHM_TYPE u32 *s_td0, SHM_TYPE u32 *s_td1, SHM_TYPE u32 *s_td2, SHM_TYPE u32 *s_td3, SHM_TYPE u32 *s_td4) +DECLSPEC int check_header_0512 (GLOBAL_AS const vc_t *esalt_bufs, GLOBAL_AS u32 *key, SHM_TYPE u32 *s_te0, SHM_TYPE u32 *s_te1, SHM_TYPE u32 *s_te2, SHM_TYPE u32 *s_te3, SHM_TYPE u32 *s_te4, SHM_TYPE u32 *s_td0, SHM_TYPE u32 *s_td1, SHM_TYPE u32 *s_td2, SHM_TYPE u32 *s_td3, SHM_TYPE u32 *s_td4) { u32 key1[8]; u32 key2[8]; @@ -130,7 +130,7 @@ DECLSPEC void hmac_sha256_run_V (u32x *w0, u32x *w1, u32x *w2, u32x *w3, u32x *i sha256_transform_vector (w0, w1, w2, w3, digest); } -__kernel void m13751_init (KERN_ATTR_TMPS_ESALT (vc_tmp_t, vc_t)) +KERNEL_FQ void m13751_init (KERN_ATTR_TMPS_ESALT (vc_tmp_t, vc_t)) { const u64 gid = get_global_id (0); const u64 lid = get_local_id (0); @@ -142,7 +142,7 @@ __kernel void m13751_init (KERN_ATTR_TMPS_ESALT (vc_tmp_t, vc_t)) const int keyboard_layout_mapping_cnt = esalt_bufs[digests_offset].keyboard_layout_mapping_cnt; - __local keyboard_layout_mapping_t s_keyboard_layout_mapping_buf[256]; + LOCAL_AS keyboard_layout_mapping_t s_keyboard_layout_mapping_buf[256]; for (u32 i = lid; i < 256; i += lsz) { @@ -286,7 +286,7 @@ __kernel void m13751_init (KERN_ATTR_TMPS_ESALT (vc_tmp_t, vc_t)) } } -__kernel void m13751_loop (KERN_ATTR_TMPS_ESALT (vc_tmp_t, vc_t)) +KERNEL_FQ void m13751_loop (KERN_ATTR_TMPS_ESALT (vc_tmp_t, vc_t)) { const u64 gid = get_global_id (0); const u64 lid = get_local_id (0); @@ -298,17 +298,17 @@ __kernel void m13751_loop (KERN_ATTR_TMPS_ESALT (vc_tmp_t, vc_t)) #ifdef REAL_SHM - __local u32 s_td0[256]; - __local u32 s_td1[256]; - __local u32 s_td2[256]; - __local u32 s_td3[256]; - __local u32 s_td4[256]; + LOCAL_AS u32 s_td0[256]; + LOCAL_AS u32 s_td1[256]; + LOCAL_AS u32 s_td2[256]; + LOCAL_AS u32 s_td3[256]; + LOCAL_AS u32 s_td4[256]; - __local u32 s_te0[256]; - __local u32 s_te1[256]; - __local u32 s_te2[256]; - __local u32 s_te3[256]; - __local u32 s_te4[256]; + LOCAL_AS u32 s_te0[256]; + LOCAL_AS u32 s_te1[256]; + LOCAL_AS u32 s_te2[256]; + LOCAL_AS u32 s_te3[256]; + LOCAL_AS u32 s_te4[256]; for (u32 i = lid; i < 256; i += lsz) { @@ -329,17 +329,17 @@ __kernel void m13751_loop (KERN_ATTR_TMPS_ESALT (vc_tmp_t, vc_t)) #else - __constant u32a *s_td0 = td0; - __constant u32a *s_td1 = td1; - __constant u32a *s_td2 = td2; - __constant u32a *s_td3 = td3; - __constant u32a *s_td4 = td4; + CONSTANT_AS u32a *s_td0 = td0; + CONSTANT_AS u32a *s_td1 = td1; + CONSTANT_AS u32a *s_td2 = td2; + CONSTANT_AS u32a *s_td3 = td3; + CONSTANT_AS u32a *s_td4 = td4; - __constant u32a *s_te0 = te0; - __constant u32a *s_te1 = te1; - __constant u32a *s_te2 = te2; - __constant u32a *s_te3 = te3; - __constant u32a *s_te4 = te4; + CONSTANT_AS u32a *s_te0 = te0; + CONSTANT_AS u32a *s_te1 = te1; + CONSTANT_AS u32a *s_te2 = te2; + CONSTANT_AS u32a *s_te3 = te3; + CONSTANT_AS u32a *s_te4 = te4; #endif @@ -523,7 +523,7 @@ __kernel void m13751_loop (KERN_ATTR_TMPS_ESALT (vc_tmp_t, vc_t)) if (check_header_0512 (esalt_bufs, tmps[gid].pim_key, s_te0, s_te1, s_te2, s_te3, s_te4, s_td0, s_td1, s_td2, s_td3, s_td4) != -1) tmps[gid].pim = pim; } -__kernel void m13751_comp (KERN_ATTR_TMPS_ESALT (vc_tmp_t, vc_t)) +KERNEL_FQ void m13751_comp (KERN_ATTR_TMPS_ESALT (vc_tmp_t, vc_t)) { const u64 gid = get_global_id (0); const u64 lid = get_local_id (0); @@ -535,17 +535,17 @@ __kernel void m13751_comp (KERN_ATTR_TMPS_ESALT (vc_tmp_t, vc_t)) #ifdef REAL_SHM - __local u32 s_td0[256]; - __local u32 s_td1[256]; - __local u32 s_td2[256]; - __local u32 s_td3[256]; - __local u32 s_td4[256]; + LOCAL_AS u32 s_td0[256]; + LOCAL_AS u32 s_td1[256]; + LOCAL_AS u32 s_td2[256]; + LOCAL_AS u32 s_td3[256]; + LOCAL_AS u32 s_td4[256]; - __local u32 s_te0[256]; - __local u32 s_te1[256]; - __local u32 s_te2[256]; - __local u32 s_te3[256]; - __local u32 s_te4[256]; + LOCAL_AS u32 s_te0[256]; + LOCAL_AS u32 s_te1[256]; + LOCAL_AS u32 s_te2[256]; + LOCAL_AS u32 s_te3[256]; + LOCAL_AS u32 s_te4[256]; for (u32 i = lid; i < 256; i += lsz) { @@ -566,17 +566,17 @@ __kernel void m13751_comp (KERN_ATTR_TMPS_ESALT (vc_tmp_t, vc_t)) #else - __constant u32a *s_td0 = td0; - __constant u32a *s_td1 = td1; - __constant u32a *s_td2 = td2; - __constant u32a *s_td3 = td3; - __constant u32a *s_td4 = td4; + CONSTANT_AS u32a *s_td0 = td0; + CONSTANT_AS u32a *s_td1 = td1; + CONSTANT_AS u32a *s_td2 = td2; + CONSTANT_AS u32a *s_td3 = td3; + CONSTANT_AS u32a *s_td4 = td4; - __constant u32a *s_te0 = te0; - __constant u32a *s_te1 = te1; - __constant u32a *s_te2 = te2; - __constant u32a *s_te3 = te3; - __constant u32a *s_te4 = te4; + CONSTANT_AS u32a *s_te0 = te0; + CONSTANT_AS u32a *s_te1 = te1; + CONSTANT_AS u32a *s_te2 = te2; + CONSTANT_AS u32a *s_te3 = te3; + CONSTANT_AS u32a *s_te4 = te4; #endif diff --git a/OpenCL/m13752-pure.cl b/OpenCL/m13752-pure.cl index c10cfcffd..39d864ce0 100644 --- a/OpenCL/m13752-pure.cl +++ b/OpenCL/m13752-pure.cl @@ -57,7 +57,7 @@ typedef struct vc_tmp } vc_tmp_t; -DECLSPEC int check_header_0512 (__global const vc_t *esalt_bufs, __global u32 *key, SHM_TYPE u32 *s_te0, SHM_TYPE u32 *s_te1, SHM_TYPE u32 *s_te2, SHM_TYPE u32 *s_te3, SHM_TYPE u32 *s_te4, SHM_TYPE u32 *s_td0, SHM_TYPE u32 *s_td1, SHM_TYPE u32 *s_td2, SHM_TYPE u32 *s_td3, SHM_TYPE u32 *s_td4) +DECLSPEC int check_header_0512 (GLOBAL_AS const vc_t *esalt_bufs, GLOBAL_AS u32 *key, SHM_TYPE u32 *s_te0, SHM_TYPE u32 *s_te1, SHM_TYPE u32 *s_te2, SHM_TYPE u32 *s_te3, SHM_TYPE u32 *s_te4, SHM_TYPE u32 *s_td0, SHM_TYPE u32 *s_td1, SHM_TYPE u32 *s_td2, SHM_TYPE u32 *s_td3, SHM_TYPE u32 *s_td4) { u32 key1[8]; u32 key2[8]; @@ -88,7 +88,7 @@ DECLSPEC int check_header_0512 (__global const vc_t *esalt_bufs, __global u32 *k return -1; } -DECLSPEC int check_header_1024 (__global const vc_t *esalt_bufs, __global u32 *key, SHM_TYPE u32 *s_te0, SHM_TYPE u32 *s_te1, SHM_TYPE u32 *s_te2, SHM_TYPE u32 *s_te3, SHM_TYPE u32 *s_te4, SHM_TYPE u32 *s_td0, SHM_TYPE u32 *s_td1, SHM_TYPE u32 *s_td2, SHM_TYPE u32 *s_td3, SHM_TYPE u32 *s_td4) +DECLSPEC int check_header_1024 (GLOBAL_AS const vc_t *esalt_bufs, GLOBAL_AS u32 *key, SHM_TYPE u32 *s_te0, SHM_TYPE u32 *s_te1, SHM_TYPE u32 *s_te2, SHM_TYPE u32 *s_te3, SHM_TYPE u32 *s_te4, SHM_TYPE u32 *s_td0, SHM_TYPE u32 *s_td1, SHM_TYPE u32 *s_td2, SHM_TYPE u32 *s_td3, SHM_TYPE u32 *s_td4) { u32 key1[8]; u32 key2[8]; @@ -181,7 +181,7 @@ DECLSPEC void hmac_sha256_run_V (u32x *w0, u32x *w1, u32x *w2, u32x *w3, u32x *i sha256_transform_vector (w0, w1, w2, w3, digest); } -__kernel void m13752_init (KERN_ATTR_TMPS_ESALT (vc_tmp_t, vc_t)) +KERNEL_FQ void m13752_init (KERN_ATTR_TMPS_ESALT (vc_tmp_t, vc_t)) { const u64 gid = get_global_id (0); const u64 lid = get_local_id (0); @@ -193,7 +193,7 @@ __kernel void m13752_init (KERN_ATTR_TMPS_ESALT (vc_tmp_t, vc_t)) const int keyboard_layout_mapping_cnt = esalt_bufs[digests_offset].keyboard_layout_mapping_cnt; - __local keyboard_layout_mapping_t s_keyboard_layout_mapping_buf[256]; + LOCAL_AS keyboard_layout_mapping_t s_keyboard_layout_mapping_buf[256]; for (u32 i = lid; i < 256; i += lsz) { @@ -337,7 +337,7 @@ __kernel void m13752_init (KERN_ATTR_TMPS_ESALT (vc_tmp_t, vc_t)) } } -__kernel void m13752_loop (KERN_ATTR_TMPS_ESALT (vc_tmp_t, vc_t)) +KERNEL_FQ void m13752_loop (KERN_ATTR_TMPS_ESALT (vc_tmp_t, vc_t)) { const u64 gid = get_global_id (0); const u64 lid = get_local_id (0); @@ -349,17 +349,17 @@ __kernel void m13752_loop (KERN_ATTR_TMPS_ESALT (vc_tmp_t, vc_t)) #ifdef REAL_SHM - __local u32 s_td0[256]; - __local u32 s_td1[256]; - __local u32 s_td2[256]; - __local u32 s_td3[256]; - __local u32 s_td4[256]; + LOCAL_AS u32 s_td0[256]; + LOCAL_AS u32 s_td1[256]; + LOCAL_AS u32 s_td2[256]; + LOCAL_AS u32 s_td3[256]; + LOCAL_AS u32 s_td4[256]; - __local u32 s_te0[256]; - __local u32 s_te1[256]; - __local u32 s_te2[256]; - __local u32 s_te3[256]; - __local u32 s_te4[256]; + LOCAL_AS u32 s_te0[256]; + LOCAL_AS u32 s_te1[256]; + LOCAL_AS u32 s_te2[256]; + LOCAL_AS u32 s_te3[256]; + LOCAL_AS u32 s_te4[256]; for (u32 i = lid; i < 256; i += lsz) { @@ -380,17 +380,17 @@ __kernel void m13752_loop (KERN_ATTR_TMPS_ESALT (vc_tmp_t, vc_t)) #else - __constant u32a *s_td0 = td0; - __constant u32a *s_td1 = td1; - __constant u32a *s_td2 = td2; - __constant u32a *s_td3 = td3; - __constant u32a *s_td4 = td4; + CONSTANT_AS u32a *s_td0 = td0; + CONSTANT_AS u32a *s_td1 = td1; + CONSTANT_AS u32a *s_td2 = td2; + CONSTANT_AS u32a *s_td3 = td3; + CONSTANT_AS u32a *s_td4 = td4; - __constant u32a *s_te0 = te0; - __constant u32a *s_te1 = te1; - __constant u32a *s_te2 = te2; - __constant u32a *s_te3 = te3; - __constant u32a *s_te4 = te4; + CONSTANT_AS u32a *s_te0 = te0; + CONSTANT_AS u32a *s_te1 = te1; + CONSTANT_AS u32a *s_te2 = te2; + CONSTANT_AS u32a *s_te3 = te3; + CONSTANT_AS u32a *s_te4 = te4; #endif @@ -546,7 +546,7 @@ __kernel void m13752_loop (KERN_ATTR_TMPS_ESALT (vc_tmp_t, vc_t)) if (check_header_1024 (esalt_bufs, tmps[gid].pim_key, s_te0, s_te1, s_te2, s_te3, s_te4, s_td0, s_td1, s_td2, s_td3, s_td4) != -1) tmps[gid].pim = pim; } -__kernel void m13752_comp (KERN_ATTR_TMPS_ESALT (vc_tmp_t, vc_t)) +KERNEL_FQ void m13752_comp (KERN_ATTR_TMPS_ESALT (vc_tmp_t, vc_t)) { const u64 gid = get_global_id (0); const u64 lid = get_local_id (0); @@ -558,17 +558,17 @@ __kernel void m13752_comp (KERN_ATTR_TMPS_ESALT (vc_tmp_t, vc_t)) #ifdef REAL_SHM - __local u32 s_td0[256]; - __local u32 s_td1[256]; - __local u32 s_td2[256]; - __local u32 s_td3[256]; - __local u32 s_td4[256]; + LOCAL_AS u32 s_td0[256]; + LOCAL_AS u32 s_td1[256]; + LOCAL_AS u32 s_td2[256]; + LOCAL_AS u32 s_td3[256]; + LOCAL_AS u32 s_td4[256]; - __local u32 s_te0[256]; - __local u32 s_te1[256]; - __local u32 s_te2[256]; - __local u32 s_te3[256]; - __local u32 s_te4[256]; + LOCAL_AS u32 s_te0[256]; + LOCAL_AS u32 s_te1[256]; + LOCAL_AS u32 s_te2[256]; + LOCAL_AS u32 s_te3[256]; + LOCAL_AS u32 s_te4[256]; for (u32 i = lid; i < 256; i += lsz) { @@ -589,17 +589,17 @@ __kernel void m13752_comp (KERN_ATTR_TMPS_ESALT (vc_tmp_t, vc_t)) #else - __constant u32a *s_td0 = td0; - __constant u32a *s_td1 = td1; - __constant u32a *s_td2 = td2; - __constant u32a *s_td3 = td3; - __constant u32a *s_td4 = td4; + CONSTANT_AS u32a *s_td0 = td0; + CONSTANT_AS u32a *s_td1 = td1; + CONSTANT_AS u32a *s_td2 = td2; + CONSTANT_AS u32a *s_td3 = td3; + CONSTANT_AS u32a *s_td4 = td4; - __constant u32a *s_te0 = te0; - __constant u32a *s_te1 = te1; - __constant u32a *s_te2 = te2; - __constant u32a *s_te3 = te3; - __constant u32a *s_te4 = te4; + CONSTANT_AS u32a *s_te0 = te0; + CONSTANT_AS u32a *s_te1 = te1; + CONSTANT_AS u32a *s_te2 = te2; + CONSTANT_AS u32a *s_te3 = te3; + CONSTANT_AS u32a *s_te4 = te4; #endif diff --git a/OpenCL/m13753-pure.cl b/OpenCL/m13753-pure.cl index 9e57010f9..d85656e3f 100644 --- a/OpenCL/m13753-pure.cl +++ b/OpenCL/m13753-pure.cl @@ -57,7 +57,7 @@ typedef struct vc_tmp } vc_tmp_t; -DECLSPEC int check_header_0512 (__global const vc_t *esalt_bufs, __global u32 *key, SHM_TYPE u32 *s_te0, SHM_TYPE u32 *s_te1, SHM_TYPE u32 *s_te2, SHM_TYPE u32 *s_te3, SHM_TYPE u32 *s_te4, SHM_TYPE u32 *s_td0, SHM_TYPE u32 *s_td1, SHM_TYPE u32 *s_td2, SHM_TYPE u32 *s_td3, SHM_TYPE u32 *s_td4) +DECLSPEC int check_header_0512 (GLOBAL_AS const vc_t *esalt_bufs, GLOBAL_AS u32 *key, SHM_TYPE u32 *s_te0, SHM_TYPE u32 *s_te1, SHM_TYPE u32 *s_te2, SHM_TYPE u32 *s_te3, SHM_TYPE u32 *s_te4, SHM_TYPE u32 *s_td0, SHM_TYPE u32 *s_td1, SHM_TYPE u32 *s_td2, SHM_TYPE u32 *s_td3, SHM_TYPE u32 *s_td4) { u32 key1[8]; u32 key2[8]; @@ -88,7 +88,7 @@ DECLSPEC int check_header_0512 (__global const vc_t *esalt_bufs, __global u32 *k return -1; } -DECLSPEC int check_header_1024 (__global const vc_t *esalt_bufs, __global u32 *key, SHM_TYPE u32 *s_te0, SHM_TYPE u32 *s_te1, SHM_TYPE u32 *s_te2, SHM_TYPE u32 *s_te3, SHM_TYPE u32 *s_te4, SHM_TYPE u32 *s_td0, SHM_TYPE u32 *s_td1, SHM_TYPE u32 *s_td2, SHM_TYPE u32 *s_td3, SHM_TYPE u32 *s_td4) +DECLSPEC int check_header_1024 (GLOBAL_AS const vc_t *esalt_bufs, GLOBAL_AS u32 *key, SHM_TYPE u32 *s_te0, SHM_TYPE u32 *s_te1, SHM_TYPE u32 *s_te2, SHM_TYPE u32 *s_te3, SHM_TYPE u32 *s_te4, SHM_TYPE u32 *s_td0, SHM_TYPE u32 *s_td1, SHM_TYPE u32 *s_td2, SHM_TYPE u32 *s_td3, SHM_TYPE u32 *s_td4) { u32 key1[8]; u32 key2[8]; @@ -139,7 +139,7 @@ DECLSPEC int check_header_1024 (__global const vc_t *esalt_bufs, __global u32 *k return -1; } -DECLSPEC int check_header_1536 (__global const vc_t *esalt_bufs, __global u32 *key, SHM_TYPE u32 *s_te0, SHM_TYPE u32 *s_te1, SHM_TYPE u32 *s_te2, SHM_TYPE u32 *s_te3, SHM_TYPE u32 *s_te4, SHM_TYPE u32 *s_td0, SHM_TYPE u32 *s_td1, SHM_TYPE u32 *s_td2, SHM_TYPE u32 *s_td3, SHM_TYPE u32 *s_td4) +DECLSPEC int check_header_1536 (GLOBAL_AS const vc_t *esalt_bufs, GLOBAL_AS u32 *key, SHM_TYPE u32 *s_te0, SHM_TYPE u32 *s_te1, SHM_TYPE u32 *s_te2, SHM_TYPE u32 *s_te3, SHM_TYPE u32 *s_te4, SHM_TYPE u32 *s_td0, SHM_TYPE u32 *s_td1, SHM_TYPE u32 *s_td2, SHM_TYPE u32 *s_td3, SHM_TYPE u32 *s_td4) { u32 key1[8]; u32 key2[8]; @@ -246,7 +246,7 @@ DECLSPEC void hmac_sha256_run_V (u32x *w0, u32x *w1, u32x *w2, u32x *w3, u32x *i sha256_transform_vector (w0, w1, w2, w3, digest); } -__kernel void m13753_init (KERN_ATTR_TMPS_ESALT (vc_tmp_t, vc_t)) +KERNEL_FQ void m13753_init (KERN_ATTR_TMPS_ESALT (vc_tmp_t, vc_t)) { const u64 gid = get_global_id (0); const u64 lid = get_local_id (0); @@ -258,7 +258,7 @@ __kernel void m13753_init (KERN_ATTR_TMPS_ESALT (vc_tmp_t, vc_t)) const int keyboard_layout_mapping_cnt = esalt_bufs[digests_offset].keyboard_layout_mapping_cnt; - __local keyboard_layout_mapping_t s_keyboard_layout_mapping_buf[256]; + LOCAL_AS keyboard_layout_mapping_t s_keyboard_layout_mapping_buf[256]; for (u32 i = lid; i < 256; i += lsz) { @@ -402,7 +402,7 @@ __kernel void m13753_init (KERN_ATTR_TMPS_ESALT (vc_tmp_t, vc_t)) } } -__kernel void m13753_loop (KERN_ATTR_TMPS_ESALT (vc_tmp_t, vc_t)) +KERNEL_FQ void m13753_loop (KERN_ATTR_TMPS_ESALT (vc_tmp_t, vc_t)) { const u64 gid = get_global_id (0); const u64 lid = get_local_id (0); @@ -414,17 +414,17 @@ __kernel void m13753_loop (KERN_ATTR_TMPS_ESALT (vc_tmp_t, vc_t)) #ifdef REAL_SHM - __local u32 s_td0[256]; - __local u32 s_td1[256]; - __local u32 s_td2[256]; - __local u32 s_td3[256]; - __local u32 s_td4[256]; + LOCAL_AS u32 s_td0[256]; + LOCAL_AS u32 s_td1[256]; + LOCAL_AS u32 s_td2[256]; + LOCAL_AS u32 s_td3[256]; + LOCAL_AS u32 s_td4[256]; - __local u32 s_te0[256]; - __local u32 s_te1[256]; - __local u32 s_te2[256]; - __local u32 s_te3[256]; - __local u32 s_te4[256]; + LOCAL_AS u32 s_te0[256]; + LOCAL_AS u32 s_te1[256]; + LOCAL_AS u32 s_te2[256]; + LOCAL_AS u32 s_te3[256]; + LOCAL_AS u32 s_te4[256]; for (u32 i = lid; i < 256; i += lsz) { @@ -445,17 +445,17 @@ __kernel void m13753_loop (KERN_ATTR_TMPS_ESALT (vc_tmp_t, vc_t)) #else - __constant u32a *s_td0 = td0; - __constant u32a *s_td1 = td1; - __constant u32a *s_td2 = td2; - __constant u32a *s_td3 = td3; - __constant u32a *s_td4 = td4; + CONSTANT_AS u32a *s_td0 = td0; + CONSTANT_AS u32a *s_td1 = td1; + CONSTANT_AS u32a *s_td2 = td2; + CONSTANT_AS u32a *s_td3 = td3; + CONSTANT_AS u32a *s_td4 = td4; - __constant u32a *s_te0 = te0; - __constant u32a *s_te1 = te1; - __constant u32a *s_te2 = te2; - __constant u32a *s_te3 = te3; - __constant u32a *s_te4 = te4; + CONSTANT_AS u32a *s_te0 = te0; + CONSTANT_AS u32a *s_te1 = te1; + CONSTANT_AS u32a *s_te2 = te2; + CONSTANT_AS u32a *s_te3 = te3; + CONSTANT_AS u32a *s_te4 = te4; #endif @@ -612,7 +612,7 @@ __kernel void m13753_loop (KERN_ATTR_TMPS_ESALT (vc_tmp_t, vc_t)) if (check_header_1536 (esalt_bufs, tmps[gid].pim_key, s_te0, s_te1, s_te2, s_te3, s_te4, s_td0, s_td1, s_td2, s_td3, s_td4) != -1) tmps[gid].pim = pim; } -__kernel void m13753_comp (KERN_ATTR_TMPS_ESALT (vc_tmp_t, vc_t)) +KERNEL_FQ void m13753_comp (KERN_ATTR_TMPS_ESALT (vc_tmp_t, vc_t)) { const u64 gid = get_global_id (0); const u64 lid = get_local_id (0); @@ -624,17 +624,17 @@ __kernel void m13753_comp (KERN_ATTR_TMPS_ESALT (vc_tmp_t, vc_t)) #ifdef REAL_SHM - __local u32 s_td0[256]; - __local u32 s_td1[256]; - __local u32 s_td2[256]; - __local u32 s_td3[256]; - __local u32 s_td4[256]; + LOCAL_AS u32 s_td0[256]; + LOCAL_AS u32 s_td1[256]; + LOCAL_AS u32 s_td2[256]; + LOCAL_AS u32 s_td3[256]; + LOCAL_AS u32 s_td4[256]; - __local u32 s_te0[256]; - __local u32 s_te1[256]; - __local u32 s_te2[256]; - __local u32 s_te3[256]; - __local u32 s_te4[256]; + LOCAL_AS u32 s_te0[256]; + LOCAL_AS u32 s_te1[256]; + LOCAL_AS u32 s_te2[256]; + LOCAL_AS u32 s_te3[256]; + LOCAL_AS u32 s_te4[256]; for (u32 i = lid; i < 256; i += lsz) { @@ -655,17 +655,17 @@ __kernel void m13753_comp (KERN_ATTR_TMPS_ESALT (vc_tmp_t, vc_t)) #else - __constant u32a *s_td0 = td0; - __constant u32a *s_td1 = td1; - __constant u32a *s_td2 = td2; - __constant u32a *s_td3 = td3; - __constant u32a *s_td4 = td4; + CONSTANT_AS u32a *s_td0 = td0; + CONSTANT_AS u32a *s_td1 = td1; + CONSTANT_AS u32a *s_td2 = td2; + CONSTANT_AS u32a *s_td3 = td3; + CONSTANT_AS u32a *s_td4 = td4; - __constant u32a *s_te0 = te0; - __constant u32a *s_te1 = te1; - __constant u32a *s_te2 = te2; - __constant u32a *s_te3 = te3; - __constant u32a *s_te4 = te4; + CONSTANT_AS u32a *s_te0 = te0; + CONSTANT_AS u32a *s_te1 = te1; + CONSTANT_AS u32a *s_te2 = te2; + CONSTANT_AS u32a *s_te3 = te3; + CONSTANT_AS u32a *s_te4 = te4; #endif diff --git a/OpenCL/m13771-pure.cl b/OpenCL/m13771-pure.cl index d05e2984a..d333e578e 100644 --- a/OpenCL/m13771-pure.cl +++ b/OpenCL/m13771-pure.cl @@ -60,7 +60,7 @@ typedef struct vc64_sbog_tmp } vc64_sbog_tmp_t; -DECLSPEC int check_header_0512 (__global const vc_t *esalt_bufs, __global u64 *key, SHM_TYPE u32 *s_te0, SHM_TYPE u32 *s_te1, SHM_TYPE u32 *s_te2, SHM_TYPE u32 *s_te3, SHM_TYPE u32 *s_te4, SHM_TYPE u32 *s_td0, SHM_TYPE u32 *s_td1, SHM_TYPE u32 *s_td2, SHM_TYPE u32 *s_td3, SHM_TYPE u32 *s_td4) +DECLSPEC int check_header_0512 (GLOBAL_AS const vc_t *esalt_bufs, GLOBAL_AS u64 *key, SHM_TYPE u32 *s_te0, SHM_TYPE u32 *s_te1, SHM_TYPE u32 *s_te2, SHM_TYPE u32 *s_te3, SHM_TYPE u32 *s_te4, SHM_TYPE u32 *s_td0, SHM_TYPE u32 *s_td1, SHM_TYPE u32 *s_td2, SHM_TYPE u32 *s_td3, SHM_TYPE u32 *s_td4) { u32 key1[8]; u32 key2[8]; @@ -176,7 +176,7 @@ DECLSPEC void hmac_streebog512_run_V (u32x *w0, u32x *w1, u32x *w2, u32x *w3, u6 streebog512_g_vector (digest, nullbuf, message, s_sbob_sl64); } -__kernel void m13771_init (KERN_ATTR_TMPS_ESALT (vc64_sbog_tmp_t, vc_t)) +KERNEL_FQ void m13771_init (KERN_ATTR_TMPS_ESALT (vc64_sbog_tmp_t, vc_t)) { const u64 gid = get_global_id (0); const u64 lid = get_local_id (0); @@ -184,7 +184,7 @@ __kernel void m13771_init (KERN_ATTR_TMPS_ESALT (vc64_sbog_tmp_t, vc_t)) const int keyboard_layout_mapping_cnt = esalt_bufs[digests_offset].keyboard_layout_mapping_cnt; - __local keyboard_layout_mapping_t s_keyboard_layout_mapping_buf[256]; + LOCAL_AS keyboard_layout_mapping_t s_keyboard_layout_mapping_buf[256]; for (u32 i = lid; i < 256; i += lsz) { @@ -195,7 +195,7 @@ __kernel void m13771_init (KERN_ATTR_TMPS_ESALT (vc64_sbog_tmp_t, vc_t)) #ifdef REAL_SHM - __local u64a s_sbob_sl64[8][256]; + LOCAL_AS u64a s_sbob_sl64[8][256]; for (u32 i = lid; i < 256; i += lsz) { @@ -213,7 +213,7 @@ __kernel void m13771_init (KERN_ATTR_TMPS_ESALT (vc64_sbog_tmp_t, vc_t)) #else - __constant u64a (*s_sbob_sl64)[256] = sbob_sl64; + CONSTANT_AS u64a (*s_sbob_sl64)[256] = sbob_sl64; #endif @@ -370,7 +370,7 @@ __kernel void m13771_init (KERN_ATTR_TMPS_ESALT (vc64_sbog_tmp_t, vc_t)) } } -__kernel void m13771_loop (KERN_ATTR_TMPS_ESALT (vc64_sbog_tmp_t, vc_t)) +KERNEL_FQ void m13771_loop (KERN_ATTR_TMPS_ESALT (vc64_sbog_tmp_t, vc_t)) { const u64 gid = get_global_id (0); const u64 lid = get_local_id (0); @@ -382,17 +382,17 @@ __kernel void m13771_loop (KERN_ATTR_TMPS_ESALT (vc64_sbog_tmp_t, vc_t)) #ifdef REAL_SHM - __local u32 s_td0[256]; - __local u32 s_td1[256]; - __local u32 s_td2[256]; - __local u32 s_td3[256]; - __local u32 s_td4[256]; + LOCAL_AS u32 s_td0[256]; + LOCAL_AS u32 s_td1[256]; + LOCAL_AS u32 s_td2[256]; + LOCAL_AS u32 s_td3[256]; + LOCAL_AS u32 s_td4[256]; - __local u32 s_te0[256]; - __local u32 s_te1[256]; - __local u32 s_te2[256]; - __local u32 s_te3[256]; - __local u32 s_te4[256]; + LOCAL_AS u32 s_te0[256]; + LOCAL_AS u32 s_te1[256]; + LOCAL_AS u32 s_te2[256]; + LOCAL_AS u32 s_te3[256]; + LOCAL_AS u32 s_te4[256]; for (u32 i = lid; i < 256; i += lsz) { @@ -409,7 +409,7 @@ __kernel void m13771_loop (KERN_ATTR_TMPS_ESALT (vc64_sbog_tmp_t, vc_t)) s_te4[i] = te4[i]; } - __local u64a s_sbob_sl64[8][256]; + LOCAL_AS u64a s_sbob_sl64[8][256]; for (u32 i = lid; i < 256; i += lsz) { @@ -427,19 +427,19 @@ __kernel void m13771_loop (KERN_ATTR_TMPS_ESALT (vc64_sbog_tmp_t, vc_t)) #else - __constant u32a *s_td0 = td0; - __constant u32a *s_td1 = td1; - __constant u32a *s_td2 = td2; - __constant u32a *s_td3 = td3; - __constant u32a *s_td4 = td4; + CONSTANT_AS u32a *s_td0 = td0; + CONSTANT_AS u32a *s_td1 = td1; + CONSTANT_AS u32a *s_td2 = td2; + CONSTANT_AS u32a *s_td3 = td3; + CONSTANT_AS u32a *s_td4 = td4; - __constant u32a *s_te0 = te0; - __constant u32a *s_te1 = te1; - __constant u32a *s_te2 = te2; - __constant u32a *s_te3 = te3; - __constant u32a *s_te4 = te4; + CONSTANT_AS u32a *s_te0 = te0; + CONSTANT_AS u32a *s_te1 = te1; + CONSTANT_AS u32a *s_te2 = te2; + CONSTANT_AS u32a *s_te3 = te3; + CONSTANT_AS u32a *s_te4 = te4; - __constant u64a (*s_sbob_sl64)[256] = sbob_sl64; + CONSTANT_AS u64a (*s_sbob_sl64)[256] = sbob_sl64; #endif @@ -615,7 +615,7 @@ __kernel void m13771_loop (KERN_ATTR_TMPS_ESALT (vc64_sbog_tmp_t, vc_t)) if (check_header_0512 (esalt_bufs, tmps[gid].pim_key, s_te0, s_te1, s_te2, s_te3, s_te4, s_td0, s_td1, s_td2, s_td3, s_td4) != -1) tmps[gid].pim = pim; } -__kernel void m13771_comp (KERN_ATTR_TMPS_ESALT (vc64_sbog_tmp_t, vc_t)) +KERNEL_FQ void m13771_comp (KERN_ATTR_TMPS_ESALT (vc64_sbog_tmp_t, vc_t)) { const u64 gid = get_global_id (0); const u64 lid = get_local_id (0); @@ -627,17 +627,17 @@ __kernel void m13771_comp (KERN_ATTR_TMPS_ESALT (vc64_sbog_tmp_t, vc_t)) #ifdef REAL_SHM - __local u32 s_td0[256]; - __local u32 s_td1[256]; - __local u32 s_td2[256]; - __local u32 s_td3[256]; - __local u32 s_td4[256]; + LOCAL_AS u32 s_td0[256]; + LOCAL_AS u32 s_td1[256]; + LOCAL_AS u32 s_td2[256]; + LOCAL_AS u32 s_td3[256]; + LOCAL_AS u32 s_td4[256]; - __local u32 s_te0[256]; - __local u32 s_te1[256]; - __local u32 s_te2[256]; - __local u32 s_te3[256]; - __local u32 s_te4[256]; + LOCAL_AS u32 s_te0[256]; + LOCAL_AS u32 s_te1[256]; + LOCAL_AS u32 s_te2[256]; + LOCAL_AS u32 s_te3[256]; + LOCAL_AS u32 s_te4[256]; for (u32 i = lid; i < 256; i += lsz) { @@ -658,17 +658,17 @@ __kernel void m13771_comp (KERN_ATTR_TMPS_ESALT (vc64_sbog_tmp_t, vc_t)) #else - __constant u32a *s_td0 = td0; - __constant u32a *s_td1 = td1; - __constant u32a *s_td2 = td2; - __constant u32a *s_td3 = td3; - __constant u32a *s_td4 = td4; + CONSTANT_AS u32a *s_td0 = td0; + CONSTANT_AS u32a *s_td1 = td1; + CONSTANT_AS u32a *s_td2 = td2; + CONSTANT_AS u32a *s_td3 = td3; + CONSTANT_AS u32a *s_td4 = td4; - __constant u32a *s_te0 = te0; - __constant u32a *s_te1 = te1; - __constant u32a *s_te2 = te2; - __constant u32a *s_te3 = te3; - __constant u32a *s_te4 = te4; + CONSTANT_AS u32a *s_te0 = te0; + CONSTANT_AS u32a *s_te1 = te1; + CONSTANT_AS u32a *s_te2 = te2; + CONSTANT_AS u32a *s_te3 = te3; + CONSTANT_AS u32a *s_te4 = te4; #endif diff --git a/OpenCL/m13772-pure.cl b/OpenCL/m13772-pure.cl index 958fc9845..5f24a3c14 100644 --- a/OpenCL/m13772-pure.cl +++ b/OpenCL/m13772-pure.cl @@ -60,7 +60,7 @@ typedef struct vc64_sbog_tmp } vc64_sbog_tmp_t; -DECLSPEC int check_header_0512 (__global const vc_t *esalt_bufs, __global u64 *key, SHM_TYPE u32 *s_te0, SHM_TYPE u32 *s_te1, SHM_TYPE u32 *s_te2, SHM_TYPE u32 *s_te3, SHM_TYPE u32 *s_te4, SHM_TYPE u32 *s_td0, SHM_TYPE u32 *s_td1, SHM_TYPE u32 *s_td2, SHM_TYPE u32 *s_td3, SHM_TYPE u32 *s_td4) +DECLSPEC int check_header_0512 (GLOBAL_AS const vc_t *esalt_bufs, GLOBAL_AS u64 *key, SHM_TYPE u32 *s_te0, SHM_TYPE u32 *s_te1, SHM_TYPE u32 *s_te2, SHM_TYPE u32 *s_te3, SHM_TYPE u32 *s_te4, SHM_TYPE u32 *s_td0, SHM_TYPE u32 *s_td1, SHM_TYPE u32 *s_td2, SHM_TYPE u32 *s_td3, SHM_TYPE u32 *s_td4) { u32 key1[8]; u32 key2[8]; @@ -91,7 +91,7 @@ DECLSPEC int check_header_0512 (__global const vc_t *esalt_bufs, __global u64 *k return -1; } -DECLSPEC int check_header_1024 (__global const vc_t *esalt_bufs, __global u64 *key, SHM_TYPE u32 *s_te0, SHM_TYPE u32 *s_te1, SHM_TYPE u32 *s_te2, SHM_TYPE u32 *s_te3, SHM_TYPE u32 *s_te4, SHM_TYPE u32 *s_td0, SHM_TYPE u32 *s_td1, SHM_TYPE u32 *s_td2, SHM_TYPE u32 *s_td3, SHM_TYPE u32 *s_td4) +DECLSPEC int check_header_1024 (GLOBAL_AS const vc_t *esalt_bufs, GLOBAL_AS u64 *key, SHM_TYPE u32 *s_te0, SHM_TYPE u32 *s_te1, SHM_TYPE u32 *s_te2, SHM_TYPE u32 *s_te3, SHM_TYPE u32 *s_te4, SHM_TYPE u32 *s_td0, SHM_TYPE u32 *s_td1, SHM_TYPE u32 *s_td2, SHM_TYPE u32 *s_td3, SHM_TYPE u32 *s_td4) { u32 key1[8]; u32 key2[8]; @@ -227,7 +227,7 @@ DECLSPEC void hmac_streebog512_run_V (u32x *w0, u32x *w1, u32x *w2, u32x *w3, u6 streebog512_g_vector (digest, nullbuf, message, s_sbob_sl64); } -__kernel void m13772_init (KERN_ATTR_TMPS_ESALT (vc64_sbog_tmp_t, vc_t)) +KERNEL_FQ void m13772_init (KERN_ATTR_TMPS_ESALT (vc64_sbog_tmp_t, vc_t)) { const u64 gid = get_global_id (0); const u64 lid = get_local_id (0); @@ -235,7 +235,7 @@ __kernel void m13772_init (KERN_ATTR_TMPS_ESALT (vc64_sbog_tmp_t, vc_t)) const int keyboard_layout_mapping_cnt = esalt_bufs[digests_offset].keyboard_layout_mapping_cnt; - __local keyboard_layout_mapping_t s_keyboard_layout_mapping_buf[256]; + LOCAL_AS keyboard_layout_mapping_t s_keyboard_layout_mapping_buf[256]; for (u32 i = lid; i < 256; i += lsz) { @@ -246,7 +246,7 @@ __kernel void m13772_init (KERN_ATTR_TMPS_ESALT (vc64_sbog_tmp_t, vc_t)) #ifdef REAL_SHM - __local u64a s_sbob_sl64[8][256]; + LOCAL_AS u64a s_sbob_sl64[8][256]; for (u32 i = lid; i < 256; i += lsz) { @@ -264,7 +264,7 @@ __kernel void m13772_init (KERN_ATTR_TMPS_ESALT (vc64_sbog_tmp_t, vc_t)) #else - __constant u64a (*s_sbob_sl64)[256] = sbob_sl64; + CONSTANT_AS u64a (*s_sbob_sl64)[256] = sbob_sl64; #endif @@ -421,7 +421,7 @@ __kernel void m13772_init (KERN_ATTR_TMPS_ESALT (vc64_sbog_tmp_t, vc_t)) } } -__kernel void m13772_loop (KERN_ATTR_TMPS_ESALT (vc64_sbog_tmp_t, vc_t)) +KERNEL_FQ void m13772_loop (KERN_ATTR_TMPS_ESALT (vc64_sbog_tmp_t, vc_t)) { const u64 gid = get_global_id (0); const u64 lid = get_local_id (0); @@ -433,17 +433,17 @@ __kernel void m13772_loop (KERN_ATTR_TMPS_ESALT (vc64_sbog_tmp_t, vc_t)) #ifdef REAL_SHM - __local u32 s_td0[256]; - __local u32 s_td1[256]; - __local u32 s_td2[256]; - __local u32 s_td3[256]; - __local u32 s_td4[256]; + LOCAL_AS u32 s_td0[256]; + LOCAL_AS u32 s_td1[256]; + LOCAL_AS u32 s_td2[256]; + LOCAL_AS u32 s_td3[256]; + LOCAL_AS u32 s_td4[256]; - __local u32 s_te0[256]; - __local u32 s_te1[256]; - __local u32 s_te2[256]; - __local u32 s_te3[256]; - __local u32 s_te4[256]; + LOCAL_AS u32 s_te0[256]; + LOCAL_AS u32 s_te1[256]; + LOCAL_AS u32 s_te2[256]; + LOCAL_AS u32 s_te3[256]; + LOCAL_AS u32 s_te4[256]; for (u32 i = lid; i < 256; i += lsz) { @@ -460,7 +460,7 @@ __kernel void m13772_loop (KERN_ATTR_TMPS_ESALT (vc64_sbog_tmp_t, vc_t)) s_te4[i] = te4[i]; } - __local u64a s_sbob_sl64[8][256]; + LOCAL_AS u64a s_sbob_sl64[8][256]; for (u32 i = lid; i < 256; i += lsz) { @@ -478,19 +478,19 @@ __kernel void m13772_loop (KERN_ATTR_TMPS_ESALT (vc64_sbog_tmp_t, vc_t)) #else - __constant u32a *s_td0 = td0; - __constant u32a *s_td1 = td1; - __constant u32a *s_td2 = td2; - __constant u32a *s_td3 = td3; - __constant u32a *s_td4 = td4; + CONSTANT_AS u32a *s_td0 = td0; + CONSTANT_AS u32a *s_td1 = td1; + CONSTANT_AS u32a *s_td2 = td2; + CONSTANT_AS u32a *s_td3 = td3; + CONSTANT_AS u32a *s_td4 = td4; - __constant u32a *s_te0 = te0; - __constant u32a *s_te1 = te1; - __constant u32a *s_te2 = te2; - __constant u32a *s_te3 = te3; - __constant u32a *s_te4 = te4; + CONSTANT_AS u32a *s_te0 = te0; + CONSTANT_AS u32a *s_te1 = te1; + CONSTANT_AS u32a *s_te2 = te2; + CONSTANT_AS u32a *s_te3 = te3; + CONSTANT_AS u32a *s_te4 = te4; - __constant u64a (*s_sbob_sl64)[256] = sbob_sl64; + CONSTANT_AS u64a (*s_sbob_sl64)[256] = sbob_sl64; #endif @@ -667,7 +667,7 @@ __kernel void m13772_loop (KERN_ATTR_TMPS_ESALT (vc64_sbog_tmp_t, vc_t)) if (check_header_1024 (esalt_bufs, tmps[gid].pim_key, s_te0, s_te1, s_te2, s_te3, s_te4, s_td0, s_td1, s_td2, s_td3, s_td4) != -1) tmps[gid].pim = pim; } -__kernel void m13772_comp (KERN_ATTR_TMPS_ESALT (vc64_sbog_tmp_t, vc_t)) +KERNEL_FQ void m13772_comp (KERN_ATTR_TMPS_ESALT (vc64_sbog_tmp_t, vc_t)) { const u64 gid = get_global_id (0); const u64 lid = get_local_id (0); @@ -679,17 +679,17 @@ __kernel void m13772_comp (KERN_ATTR_TMPS_ESALT (vc64_sbog_tmp_t, vc_t)) #ifdef REAL_SHM - __local u32 s_td0[256]; - __local u32 s_td1[256]; - __local u32 s_td2[256]; - __local u32 s_td3[256]; - __local u32 s_td4[256]; + LOCAL_AS u32 s_td0[256]; + LOCAL_AS u32 s_td1[256]; + LOCAL_AS u32 s_td2[256]; + LOCAL_AS u32 s_td3[256]; + LOCAL_AS u32 s_td4[256]; - __local u32 s_te0[256]; - __local u32 s_te1[256]; - __local u32 s_te2[256]; - __local u32 s_te3[256]; - __local u32 s_te4[256]; + LOCAL_AS u32 s_te0[256]; + LOCAL_AS u32 s_te1[256]; + LOCAL_AS u32 s_te2[256]; + LOCAL_AS u32 s_te3[256]; + LOCAL_AS u32 s_te4[256]; for (u32 i = lid; i < 256; i += lsz) { @@ -710,17 +710,17 @@ __kernel void m13772_comp (KERN_ATTR_TMPS_ESALT (vc64_sbog_tmp_t, vc_t)) #else - __constant u32a *s_td0 = td0; - __constant u32a *s_td1 = td1; - __constant u32a *s_td2 = td2; - __constant u32a *s_td3 = td3; - __constant u32a *s_td4 = td4; + CONSTANT_AS u32a *s_td0 = td0; + CONSTANT_AS u32a *s_td1 = td1; + CONSTANT_AS u32a *s_td2 = td2; + CONSTANT_AS u32a *s_td3 = td3; + CONSTANT_AS u32a *s_td4 = td4; - __constant u32a *s_te0 = te0; - __constant u32a *s_te1 = te1; - __constant u32a *s_te2 = te2; - __constant u32a *s_te3 = te3; - __constant u32a *s_te4 = te4; + CONSTANT_AS u32a *s_te0 = te0; + CONSTANT_AS u32a *s_te1 = te1; + CONSTANT_AS u32a *s_te2 = te2; + CONSTANT_AS u32a *s_te3 = te3; + CONSTANT_AS u32a *s_te4 = te4; #endif diff --git a/OpenCL/m13773-pure.cl b/OpenCL/m13773-pure.cl index 52c6d894a..64d85cdce 100644 --- a/OpenCL/m13773-pure.cl +++ b/OpenCL/m13773-pure.cl @@ -60,7 +60,7 @@ typedef struct vc64_sbog_tmp } vc64_sbog_tmp_t; -DECLSPEC int check_header_0512 (__global const vc_t *esalt_bufs, __global u64 *key, SHM_TYPE u32 *s_te0, SHM_TYPE u32 *s_te1, SHM_TYPE u32 *s_te2, SHM_TYPE u32 *s_te3, SHM_TYPE u32 *s_te4, SHM_TYPE u32 *s_td0, SHM_TYPE u32 *s_td1, SHM_TYPE u32 *s_td2, SHM_TYPE u32 *s_td3, SHM_TYPE u32 *s_td4) +DECLSPEC int check_header_0512 (GLOBAL_AS const vc_t *esalt_bufs, GLOBAL_AS u64 *key, SHM_TYPE u32 *s_te0, SHM_TYPE u32 *s_te1, SHM_TYPE u32 *s_te2, SHM_TYPE u32 *s_te3, SHM_TYPE u32 *s_te4, SHM_TYPE u32 *s_td0, SHM_TYPE u32 *s_td1, SHM_TYPE u32 *s_td2, SHM_TYPE u32 *s_td3, SHM_TYPE u32 *s_td4) { u32 key1[8]; u32 key2[8]; @@ -91,7 +91,7 @@ DECLSPEC int check_header_0512 (__global const vc_t *esalt_bufs, __global u64 *k return -1; } -DECLSPEC int check_header_1024 (__global const vc_t *esalt_bufs, __global u64 *key, SHM_TYPE u32 *s_te0, SHM_TYPE u32 *s_te1, SHM_TYPE u32 *s_te2, SHM_TYPE u32 *s_te3, SHM_TYPE u32 *s_te4, SHM_TYPE u32 *s_td0, SHM_TYPE u32 *s_td1, SHM_TYPE u32 *s_td2, SHM_TYPE u32 *s_td3, SHM_TYPE u32 *s_td4) +DECLSPEC int check_header_1024 (GLOBAL_AS const vc_t *esalt_bufs, GLOBAL_AS u64 *key, SHM_TYPE u32 *s_te0, SHM_TYPE u32 *s_te1, SHM_TYPE u32 *s_te2, SHM_TYPE u32 *s_te3, SHM_TYPE u32 *s_te4, SHM_TYPE u32 *s_td0, SHM_TYPE u32 *s_td1, SHM_TYPE u32 *s_td2, SHM_TYPE u32 *s_td3, SHM_TYPE u32 *s_td4) { u32 key1[8]; u32 key2[8]; @@ -142,7 +142,7 @@ DECLSPEC int check_header_1024 (__global const vc_t *esalt_bufs, __global u64 *k return -1; } -DECLSPEC int check_header_1536 (__global const vc_t *esalt_bufs, __global u64 *key, SHM_TYPE u32 *s_te0, SHM_TYPE u32 *s_te1, SHM_TYPE u32 *s_te2, SHM_TYPE u32 *s_te3, SHM_TYPE u32 *s_te4, SHM_TYPE u32 *s_td0, SHM_TYPE u32 *s_td1, SHM_TYPE u32 *s_td2, SHM_TYPE u32 *s_td3, SHM_TYPE u32 *s_td4) +DECLSPEC int check_header_1536 (GLOBAL_AS const vc_t *esalt_bufs, GLOBAL_AS u64 *key, SHM_TYPE u32 *s_te0, SHM_TYPE u32 *s_te1, SHM_TYPE u32 *s_te2, SHM_TYPE u32 *s_te3, SHM_TYPE u32 *s_te4, SHM_TYPE u32 *s_td0, SHM_TYPE u32 *s_td1, SHM_TYPE u32 *s_td2, SHM_TYPE u32 *s_td3, SHM_TYPE u32 *s_td4) { u32 key1[8]; u32 key2[8]; @@ -292,7 +292,7 @@ DECLSPEC void hmac_streebog512_run_V (u32x *w0, u32x *w1, u32x *w2, u32x *w3, u6 streebog512_g_vector (digest, nullbuf, message, s_sbob_sl64); } -__kernel void m13773_init (KERN_ATTR_TMPS_ESALT (vc64_sbog_tmp_t, vc_t)) +KERNEL_FQ void m13773_init (KERN_ATTR_TMPS_ESALT (vc64_sbog_tmp_t, vc_t)) { const u64 gid = get_global_id (0); const u64 lid = get_local_id (0); @@ -300,7 +300,7 @@ __kernel void m13773_init (KERN_ATTR_TMPS_ESALT (vc64_sbog_tmp_t, vc_t)) const int keyboard_layout_mapping_cnt = esalt_bufs[digests_offset].keyboard_layout_mapping_cnt; - __local keyboard_layout_mapping_t s_keyboard_layout_mapping_buf[256]; + LOCAL_AS keyboard_layout_mapping_t s_keyboard_layout_mapping_buf[256]; for (u32 i = lid; i < 256; i += lsz) { @@ -311,7 +311,7 @@ __kernel void m13773_init (KERN_ATTR_TMPS_ESALT (vc64_sbog_tmp_t, vc_t)) #ifdef REAL_SHM - __local u64a s_sbob_sl64[8][256]; + LOCAL_AS u64a s_sbob_sl64[8][256]; for (u32 i = lid; i < 256; i += lsz) { @@ -329,7 +329,7 @@ __kernel void m13773_init (KERN_ATTR_TMPS_ESALT (vc64_sbog_tmp_t, vc_t)) #else - __constant u64a (*s_sbob_sl64)[256] = sbob_sl64; + CONSTANT_AS u64a (*s_sbob_sl64)[256] = sbob_sl64; #endif @@ -486,7 +486,7 @@ __kernel void m13773_init (KERN_ATTR_TMPS_ESALT (vc64_sbog_tmp_t, vc_t)) } } -__kernel void m13773_loop (KERN_ATTR_TMPS_ESALT (vc64_sbog_tmp_t, vc_t)) +KERNEL_FQ void m13773_loop (KERN_ATTR_TMPS_ESALT (vc64_sbog_tmp_t, vc_t)) { const u64 gid = get_global_id (0); const u64 lid = get_local_id (0); @@ -498,17 +498,17 @@ __kernel void m13773_loop (KERN_ATTR_TMPS_ESALT (vc64_sbog_tmp_t, vc_t)) #ifdef REAL_SHM - __local u32 s_td0[256]; - __local u32 s_td1[256]; - __local u32 s_td2[256]; - __local u32 s_td3[256]; - __local u32 s_td4[256]; + LOCAL_AS u32 s_td0[256]; + LOCAL_AS u32 s_td1[256]; + LOCAL_AS u32 s_td2[256]; + LOCAL_AS u32 s_td3[256]; + LOCAL_AS u32 s_td4[256]; - __local u32 s_te0[256]; - __local u32 s_te1[256]; - __local u32 s_te2[256]; - __local u32 s_te3[256]; - __local u32 s_te4[256]; + LOCAL_AS u32 s_te0[256]; + LOCAL_AS u32 s_te1[256]; + LOCAL_AS u32 s_te2[256]; + LOCAL_AS u32 s_te3[256]; + LOCAL_AS u32 s_te4[256]; for (u32 i = lid; i < 256; i += lsz) { @@ -525,7 +525,7 @@ __kernel void m13773_loop (KERN_ATTR_TMPS_ESALT (vc64_sbog_tmp_t, vc_t)) s_te4[i] = te4[i]; } - __local u64a s_sbob_sl64[8][256]; + LOCAL_AS u64a s_sbob_sl64[8][256]; for (u32 i = lid; i < 256; i += lsz) { @@ -543,19 +543,19 @@ __kernel void m13773_loop (KERN_ATTR_TMPS_ESALT (vc64_sbog_tmp_t, vc_t)) #else - __constant u32a *s_td0 = td0; - __constant u32a *s_td1 = td1; - __constant u32a *s_td2 = td2; - __constant u32a *s_td3 = td3; - __constant u32a *s_td4 = td4; + CONSTANT_AS u32a *s_td0 = td0; + CONSTANT_AS u32a *s_td1 = td1; + CONSTANT_AS u32a *s_td2 = td2; + CONSTANT_AS u32a *s_td3 = td3; + CONSTANT_AS u32a *s_td4 = td4; - __constant u32a *s_te0 = te0; - __constant u32a *s_te1 = te1; - __constant u32a *s_te2 = te2; - __constant u32a *s_te3 = te3; - __constant u32a *s_te4 = te4; + CONSTANT_AS u32a *s_te0 = te0; + CONSTANT_AS u32a *s_te1 = te1; + CONSTANT_AS u32a *s_te2 = te2; + CONSTANT_AS u32a *s_te3 = te3; + CONSTANT_AS u32a *s_te4 = te4; - __constant u64a (*s_sbob_sl64)[256] = sbob_sl64; + CONSTANT_AS u64a (*s_sbob_sl64)[256] = sbob_sl64; #endif @@ -733,7 +733,7 @@ __kernel void m13773_loop (KERN_ATTR_TMPS_ESALT (vc64_sbog_tmp_t, vc_t)) if (check_header_1536 (esalt_bufs, tmps[gid].pim_key, s_te0, s_te1, s_te2, s_te3, s_te4, s_td0, s_td1, s_td2, s_td3, s_td4) != -1) tmps[gid].pim = pim; } -__kernel void m13773_comp (KERN_ATTR_TMPS_ESALT (vc64_sbog_tmp_t, vc_t)) +KERNEL_FQ void m13773_comp (KERN_ATTR_TMPS_ESALT (vc64_sbog_tmp_t, vc_t)) { const u64 gid = get_global_id (0); const u64 lid = get_local_id (0); @@ -745,17 +745,17 @@ __kernel void m13773_comp (KERN_ATTR_TMPS_ESALT (vc64_sbog_tmp_t, vc_t)) #ifdef REAL_SHM - __local u32 s_td0[256]; - __local u32 s_td1[256]; - __local u32 s_td2[256]; - __local u32 s_td3[256]; - __local u32 s_td4[256]; + LOCAL_AS u32 s_td0[256]; + LOCAL_AS u32 s_td1[256]; + LOCAL_AS u32 s_td2[256]; + LOCAL_AS u32 s_td3[256]; + LOCAL_AS u32 s_td4[256]; - __local u32 s_te0[256]; - __local u32 s_te1[256]; - __local u32 s_te2[256]; - __local u32 s_te3[256]; - __local u32 s_te4[256]; + LOCAL_AS u32 s_te0[256]; + LOCAL_AS u32 s_te1[256]; + LOCAL_AS u32 s_te2[256]; + LOCAL_AS u32 s_te3[256]; + LOCAL_AS u32 s_te4[256]; for (u32 i = lid; i < 256; i += lsz) { @@ -776,17 +776,17 @@ __kernel void m13773_comp (KERN_ATTR_TMPS_ESALT (vc64_sbog_tmp_t, vc_t)) #else - __constant u32a *s_td0 = td0; - __constant u32a *s_td1 = td1; - __constant u32a *s_td2 = td2; - __constant u32a *s_td3 = td3; - __constant u32a *s_td4 = td4; + CONSTANT_AS u32a *s_td0 = td0; + CONSTANT_AS u32a *s_td1 = td1; + CONSTANT_AS u32a *s_td2 = td2; + CONSTANT_AS u32a *s_td3 = td3; + CONSTANT_AS u32a *s_td4 = td4; - __constant u32a *s_te0 = te0; - __constant u32a *s_te1 = te1; - __constant u32a *s_te2 = te2; - __constant u32a *s_te3 = te3; - __constant u32a *s_te4 = te4; + CONSTANT_AS u32a *s_te0 = te0; + CONSTANT_AS u32a *s_te1 = te1; + CONSTANT_AS u32a *s_te2 = te2; + CONSTANT_AS u32a *s_te3 = te3; + CONSTANT_AS u32a *s_te4 = te4; #endif diff --git a/OpenCL/m13800_a0-optimized.cl b/OpenCL/m13800_a0-optimized.cl index 865cb8a21..9eac9478d 100644 --- a/OpenCL/m13800_a0-optimized.cl +++ b/OpenCL/m13800_a0-optimized.cl @@ -402,7 +402,7 @@ DECLSPEC void memcat64c_be (u32x *block, const u32 offset, u32x *carry) } } -__kernel void m13800_m04 (KERN_ATTR_RULES_ESALT (win8phone_t)) +KERNEL_FQ void m13800_m04 (KERN_ATTR_RULES_ESALT (win8phone_t)) { /** * modifier @@ -434,7 +434,7 @@ __kernel void m13800_m04 (KERN_ATTR_RULES_ESALT (win8phone_t)) * shared */ - __local u32 s_esalt[32]; + LOCAL_AS u32 s_esalt[32]; for (u32 i = lid; i < 32; i += lsz) { @@ -590,15 +590,15 @@ __kernel void m13800_m04 (KERN_ATTR_RULES_ESALT (win8phone_t)) } } -__kernel void m13800_m08 (KERN_ATTR_RULES_ESALT (win8phone_t)) +KERNEL_FQ void m13800_m08 (KERN_ATTR_RULES_ESALT (win8phone_t)) { } -__kernel void m13800_m16 (KERN_ATTR_RULES_ESALT (win8phone_t)) +KERNEL_FQ void m13800_m16 (KERN_ATTR_RULES_ESALT (win8phone_t)) { } -__kernel void m13800_s04 (KERN_ATTR_RULES_ESALT (win8phone_t)) +KERNEL_FQ void m13800_s04 (KERN_ATTR_RULES_ESALT (win8phone_t)) { /** * modifier @@ -630,7 +630,7 @@ __kernel void m13800_s04 (KERN_ATTR_RULES_ESALT (win8phone_t)) * shared */ - __local u32 s_esalt[32]; + LOCAL_AS u32 s_esalt[32]; for (u32 i = lid; i < 32; i += lsz) { @@ -798,10 +798,10 @@ __kernel void m13800_s04 (KERN_ATTR_RULES_ESALT (win8phone_t)) } } -__kernel void m13800_s08 (KERN_ATTR_RULES_ESALT (win8phone_t)) +KERNEL_FQ void m13800_s08 (KERN_ATTR_RULES_ESALT (win8phone_t)) { } -__kernel void m13800_s16 (KERN_ATTR_RULES_ESALT (win8phone_t)) +KERNEL_FQ void m13800_s16 (KERN_ATTR_RULES_ESALT (win8phone_t)) { } diff --git a/OpenCL/m13800_a0-pure.cl b/OpenCL/m13800_a0-pure.cl index 96132e6c1..3546c04ef 100644 --- a/OpenCL/m13800_a0-pure.cl +++ b/OpenCL/m13800_a0-pure.cl @@ -21,7 +21,7 @@ typedef struct win8phone } win8phone_t; -__kernel void m13800_mxx (KERN_ATTR_RULES_ESALT (win8phone_t)) +KERNEL_FQ void m13800_mxx (KERN_ATTR_RULES_ESALT (win8phone_t)) { /** * modifier @@ -67,7 +67,7 @@ __kernel void m13800_mxx (KERN_ATTR_RULES_ESALT (win8phone_t)) } } -__kernel void m13800_sxx (KERN_ATTR_RULES_ESALT (win8phone_t)) +KERNEL_FQ void m13800_sxx (KERN_ATTR_RULES_ESALT (win8phone_t)) { /** * modifier diff --git a/OpenCL/m13800_a1-optimized.cl b/OpenCL/m13800_a1-optimized.cl index 934ec8d43..79e622b54 100644 --- a/OpenCL/m13800_a1-optimized.cl +++ b/OpenCL/m13800_a1-optimized.cl @@ -400,7 +400,7 @@ DECLSPEC void memcat64c_be (u32x *block, const u32 offset, u32x *carry) } } -__kernel void m13800_m04 (KERN_ATTR_ESALT (win8phone_t)) +KERNEL_FQ void m13800_m04 (KERN_ATTR_ESALT (win8phone_t)) { /** * modifier @@ -432,7 +432,7 @@ __kernel void m13800_m04 (KERN_ATTR_ESALT (win8phone_t)) * shared */ - __local u32 s_esalt[32]; + LOCAL_AS u32 s_esalt[32]; for (u32 i = lid; i < 32; i += lsz) { @@ -644,15 +644,15 @@ __kernel void m13800_m04 (KERN_ATTR_ESALT (win8phone_t)) } } -__kernel void m13800_m08 (KERN_ATTR_ESALT (win8phone_t)) +KERNEL_FQ void m13800_m08 (KERN_ATTR_ESALT (win8phone_t)) { } -__kernel void m13800_m16 (KERN_ATTR_ESALT (win8phone_t)) +KERNEL_FQ void m13800_m16 (KERN_ATTR_ESALT (win8phone_t)) { } -__kernel void m13800_s04 (KERN_ATTR_ESALT (win8phone_t)) +KERNEL_FQ void m13800_s04 (KERN_ATTR_ESALT (win8phone_t)) { /** * modifier @@ -684,7 +684,7 @@ __kernel void m13800_s04 (KERN_ATTR_ESALT (win8phone_t)) * shared */ - __local u32 s_esalt[32]; + LOCAL_AS u32 s_esalt[32]; for (u32 i = lid; i < 32; i += lsz) { @@ -908,10 +908,10 @@ __kernel void m13800_s04 (KERN_ATTR_ESALT (win8phone_t)) } } -__kernel void m13800_s08 (KERN_ATTR_ESALT (win8phone_t)) +KERNEL_FQ void m13800_s08 (KERN_ATTR_ESALT (win8phone_t)) { } -__kernel void m13800_s16 (KERN_ATTR_ESALT (win8phone_t)) +KERNEL_FQ void m13800_s16 (KERN_ATTR_ESALT (win8phone_t)) { } diff --git a/OpenCL/m13800_a1-pure.cl b/OpenCL/m13800_a1-pure.cl index cbd0c6a4c..7e042d817 100644 --- a/OpenCL/m13800_a1-pure.cl +++ b/OpenCL/m13800_a1-pure.cl @@ -19,7 +19,7 @@ typedef struct win8phone } win8phone_t; -__kernel void m13800_mxx (KERN_ATTR_ESALT (win8phone_t)) +KERNEL_FQ void m13800_mxx (KERN_ATTR_ESALT (win8phone_t)) { /** * modifier @@ -63,7 +63,7 @@ __kernel void m13800_mxx (KERN_ATTR_ESALT (win8phone_t)) } } -__kernel void m13800_sxx (KERN_ATTR_ESALT (win8phone_t)) +KERNEL_FQ void m13800_sxx (KERN_ATTR_ESALT (win8phone_t)) { /** * modifier diff --git a/OpenCL/m13800_a3-optimized.cl b/OpenCL/m13800_a3-optimized.cl index 628485509..46e422df4 100644 --- a/OpenCL/m13800_a3-optimized.cl +++ b/OpenCL/m13800_a3-optimized.cl @@ -399,7 +399,7 @@ DECLSPEC void memcat64c_be (u32x *block, const u32 offset, u32x *carry) } } -DECLSPEC void m13800m (__local u32 *s_esalt, u32 *w, const u32 pw_len, KERN_ATTR_VECTOR_ESALT (win8phone_t)) +DECLSPEC void m13800m (LOCAL_AS u32 *s_esalt, u32 *w, const u32 pw_len, KERN_ATTR_VECTOR_ESALT (win8phone_t)) { /** * modifier @@ -547,7 +547,7 @@ DECLSPEC void m13800m (__local u32 *s_esalt, u32 *w, const u32 pw_len, KERN_ATTR } } -DECLSPEC void m13800s (__local u32 *s_esalt, u32 *w, const u32 pw_len, KERN_ATTR_VECTOR_ESALT (win8phone_t)) +DECLSPEC void m13800s (LOCAL_AS u32 *s_esalt, u32 *w, const u32 pw_len, KERN_ATTR_VECTOR_ESALT (win8phone_t)) { /** * modifier @@ -707,7 +707,7 @@ DECLSPEC void m13800s (__local u32 *s_esalt, u32 *w, const u32 pw_len, KERN_ATTR } } -__kernel void m13800_m04 (KERN_ATTR_VECTOR_ESALT (win8phone_t)) +KERNEL_FQ void m13800_m04 (KERN_ATTR_VECTOR_ESALT (win8phone_t)) { /** * modifier @@ -746,7 +746,7 @@ __kernel void m13800_m04 (KERN_ATTR_VECTOR_ESALT (win8phone_t)) * shared */ - __local u32 s_esalt[32]; + LOCAL_AS u32 s_esalt[32]; for (u32 i = lid; i < 32; i += lsz) { @@ -764,7 +764,7 @@ __kernel void m13800_m04 (KERN_ATTR_VECTOR_ESALT (win8phone_t)) m13800m (s_esalt, w, pw_len, pws, rules_buf, combs_buf, words_buf_r, 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_extra0_buf, d_extra1_buf, d_extra2_buf, d_extra3_buf, bitmap_mask, bitmap_shift1, bitmap_shift2, salt_pos, loop_pos, loop_cnt, il_cnt, digests_cnt, digests_offset, combs_mode, gid_max); } -__kernel void m13800_m08 (KERN_ATTR_VECTOR_ESALT (win8phone_t)) +KERNEL_FQ void m13800_m08 (KERN_ATTR_VECTOR_ESALT (win8phone_t)) { /** * modifier @@ -803,7 +803,7 @@ __kernel void m13800_m08 (KERN_ATTR_VECTOR_ESALT (win8phone_t)) * shared */ - __local u32 s_esalt[32]; + LOCAL_AS u32 s_esalt[32]; for (u32 i = lid; i < 32; i += lsz) { @@ -821,7 +821,7 @@ __kernel void m13800_m08 (KERN_ATTR_VECTOR_ESALT (win8phone_t)) m13800m (s_esalt, w, pw_len, pws, rules_buf, combs_buf, words_buf_r, 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_extra0_buf, d_extra1_buf, d_extra2_buf, d_extra3_buf, bitmap_mask, bitmap_shift1, bitmap_shift2, salt_pos, loop_pos, loop_cnt, il_cnt, digests_cnt, digests_offset, combs_mode, gid_max); } -__kernel void m13800_m16 (KERN_ATTR_VECTOR_ESALT (win8phone_t)) +KERNEL_FQ void m13800_m16 (KERN_ATTR_VECTOR_ESALT (win8phone_t)) { /** * modifier @@ -860,7 +860,7 @@ __kernel void m13800_m16 (KERN_ATTR_VECTOR_ESALT (win8phone_t)) * shared */ - __local u32 s_esalt[32]; + LOCAL_AS u32 s_esalt[32]; for (u32 i = lid; i < 32; i += lsz) { @@ -878,7 +878,7 @@ __kernel void m13800_m16 (KERN_ATTR_VECTOR_ESALT (win8phone_t)) m13800m (s_esalt, w, pw_len, pws, rules_buf, combs_buf, words_buf_r, 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_extra0_buf, d_extra1_buf, d_extra2_buf, d_extra3_buf, bitmap_mask, bitmap_shift1, bitmap_shift2, salt_pos, loop_pos, loop_cnt, il_cnt, digests_cnt, digests_offset, combs_mode, gid_max); } -__kernel void m13800_s04 (KERN_ATTR_VECTOR_ESALT (win8phone_t)) +KERNEL_FQ void m13800_s04 (KERN_ATTR_VECTOR_ESALT (win8phone_t)) { /** * modifier @@ -917,7 +917,7 @@ __kernel void m13800_s04 (KERN_ATTR_VECTOR_ESALT (win8phone_t)) * shared */ - __local u32 s_esalt[32]; + LOCAL_AS u32 s_esalt[32]; for (u32 i = lid; i < 32; i += lsz) { @@ -935,7 +935,7 @@ __kernel void m13800_s04 (KERN_ATTR_VECTOR_ESALT (win8phone_t)) m13800s (s_esalt, w, pw_len, pws, rules_buf, combs_buf, words_buf_r, 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_extra0_buf, d_extra1_buf, d_extra2_buf, d_extra3_buf, bitmap_mask, bitmap_shift1, bitmap_shift2, salt_pos, loop_pos, loop_cnt, il_cnt, digests_cnt, digests_offset, combs_mode, gid_max); } -__kernel void m13800_s08 (KERN_ATTR_VECTOR_ESALT (win8phone_t)) +KERNEL_FQ void m13800_s08 (KERN_ATTR_VECTOR_ESALT (win8phone_t)) { /** * modifier @@ -974,7 +974,7 @@ __kernel void m13800_s08 (KERN_ATTR_VECTOR_ESALT (win8phone_t)) * shared */ - __local u32 s_esalt[32]; + LOCAL_AS u32 s_esalt[32]; for (u32 i = lid; i < 32; i += lsz) { @@ -992,7 +992,7 @@ __kernel void m13800_s08 (KERN_ATTR_VECTOR_ESALT (win8phone_t)) m13800s (s_esalt, w, pw_len, pws, rules_buf, combs_buf, words_buf_r, 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_extra0_buf, d_extra1_buf, d_extra2_buf, d_extra3_buf, bitmap_mask, bitmap_shift1, bitmap_shift2, salt_pos, loop_pos, loop_cnt, il_cnt, digests_cnt, digests_offset, combs_mode, gid_max); } -__kernel void m13800_s16 (KERN_ATTR_VECTOR_ESALT (win8phone_t)) +KERNEL_FQ void m13800_s16 (KERN_ATTR_VECTOR_ESALT (win8phone_t)) { /** * modifier @@ -1031,7 +1031,7 @@ __kernel void m13800_s16 (KERN_ATTR_VECTOR_ESALT (win8phone_t)) * shared */ - __local u32 s_esalt[32]; + LOCAL_AS u32 s_esalt[32]; for (u32 i = lid; i < 32; i += lsz) { diff --git a/OpenCL/m13800_a3-pure.cl b/OpenCL/m13800_a3-pure.cl index 276fc9d03..0a0ca4277 100644 --- a/OpenCL/m13800_a3-pure.cl +++ b/OpenCL/m13800_a3-pure.cl @@ -19,7 +19,7 @@ typedef struct win8phone } win8phone_t; -__kernel void m13800_mxx (KERN_ATTR_VECTOR_ESALT (win8phone_t)) +KERNEL_FQ void m13800_mxx (KERN_ATTR_VECTOR_ESALT (win8phone_t)) { /** * modifier @@ -85,7 +85,7 @@ __kernel void m13800_mxx (KERN_ATTR_VECTOR_ESALT (win8phone_t)) } } -__kernel void m13800_sxx (KERN_ATTR_VECTOR_ESALT (win8phone_t)) +KERNEL_FQ void m13800_sxx (KERN_ATTR_VECTOR_ESALT (win8phone_t)) { /** * modifier diff --git a/OpenCL/m13900_a0-optimized.cl b/OpenCL/m13900_a0-optimized.cl index 0c42ac5b4..652f22e8f 100644 --- a/OpenCL/m13900_a0-optimized.cl +++ b/OpenCL/m13900_a0-optimized.cl @@ -27,7 +27,7 @@ #define uint_to_hex_lower8_le(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 m13900_m04 (KERN_ATTR_RULES ()) +KERNEL_FQ void m13900_m04 (KERN_ATTR_RULES ()) { /** * modifier @@ -41,7 +41,7 @@ __kernel void m13900_m04 (KERN_ATTR_RULES ()) * shared */ - __local u32 l_bin2asc[256]; + LOCAL_AS u32 l_bin2asc[256]; for (u32 i = lid; i < 256; i += lsz) { @@ -246,15 +246,15 @@ __kernel void m13900_m04 (KERN_ATTR_RULES ()) } } -__kernel void m13900_m08 (KERN_ATTR_RULES ()) +KERNEL_FQ void m13900_m08 (KERN_ATTR_RULES ()) { } -__kernel void m13900_m16 (KERN_ATTR_RULES ()) +KERNEL_FQ void m13900_m16 (KERN_ATTR_RULES ()) { } -__kernel void m13900_s04 (KERN_ATTR_RULES ()) +KERNEL_FQ void m13900_s04 (KERN_ATTR_RULES ()) { /** * modifier @@ -268,7 +268,7 @@ __kernel void m13900_s04 (KERN_ATTR_RULES ()) * shared */ - __local u32 l_bin2asc[256]; + LOCAL_AS u32 l_bin2asc[256]; for (u32 i = lid; i < 256; i += lsz) { @@ -485,10 +485,10 @@ __kernel void m13900_s04 (KERN_ATTR_RULES ()) } } -__kernel void m13900_s08 (KERN_ATTR_RULES ()) +KERNEL_FQ void m13900_s08 (KERN_ATTR_RULES ()) { } -__kernel void m13900_s16 (KERN_ATTR_RULES ()) +KERNEL_FQ void m13900_s16 (KERN_ATTR_RULES ()) { } diff --git a/OpenCL/m13900_a0-pure.cl b/OpenCL/m13900_a0-pure.cl index eb7ccb010..81ac9fe94 100644 --- a/OpenCL/m13900_a0-pure.cl +++ b/OpenCL/m13900_a0-pure.cl @@ -27,7 +27,7 @@ #define uint_to_hex_lower8_le(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 m13900_mxx (KERN_ATTR_RULES ()) +KERNEL_FQ void m13900_mxx (KERN_ATTR_RULES ()) { /** * modifier @@ -41,7 +41,7 @@ __kernel void m13900_mxx (KERN_ATTR_RULES ()) * shared */ - __local u32 l_bin2asc[256]; + LOCAL_AS u32 l_bin2asc[256]; for (u32 i = lid; i < 256; i += lsz) { @@ -178,7 +178,7 @@ __kernel void m13900_mxx (KERN_ATTR_RULES ()) } } -__kernel void m13900_sxx (KERN_ATTR_RULES ()) +KERNEL_FQ void m13900_sxx (KERN_ATTR_RULES ()) { /** * modifier @@ -192,7 +192,7 @@ __kernel void m13900_sxx (KERN_ATTR_RULES ()) * shared */ - __local u32 l_bin2asc[256]; + LOCAL_AS u32 l_bin2asc[256]; for (u32 i = lid; i < 256; i += lsz) { diff --git a/OpenCL/m13900_a1-optimized.cl b/OpenCL/m13900_a1-optimized.cl index 4a42886d2..d15184fe6 100644 --- a/OpenCL/m13900_a1-optimized.cl +++ b/OpenCL/m13900_a1-optimized.cl @@ -25,7 +25,7 @@ #define uint_to_hex_lower8_le(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 m13900_m04 (KERN_ATTR_BASIC ()) +KERNEL_FQ void m13900_m04 (KERN_ATTR_BASIC ()) { /** * modifier @@ -39,7 +39,7 @@ __kernel void m13900_m04 (KERN_ATTR_BASIC ()) * shared */ - __local u32 l_bin2asc[256]; + LOCAL_AS u32 l_bin2asc[256]; for (u32 i = lid; i < 256; i += lsz) { @@ -302,15 +302,15 @@ __kernel void m13900_m04 (KERN_ATTR_BASIC ()) } } -__kernel void m13900_m08 (KERN_ATTR_BASIC ()) +KERNEL_FQ void m13900_m08 (KERN_ATTR_BASIC ()) { } -__kernel void m13900_m16 (KERN_ATTR_BASIC ()) +KERNEL_FQ void m13900_m16 (KERN_ATTR_BASIC ()) { } -__kernel void m13900_s04 (KERN_ATTR_BASIC ()) +KERNEL_FQ void m13900_s04 (KERN_ATTR_BASIC ()) { /** * modifier @@ -324,7 +324,7 @@ __kernel void m13900_s04 (KERN_ATTR_BASIC ()) * shared */ - __local u32 l_bin2asc[256]; + LOCAL_AS u32 l_bin2asc[256]; for (u32 i = lid; i < 256; i += lsz) { @@ -599,10 +599,10 @@ __kernel void m13900_s04 (KERN_ATTR_BASIC ()) } } -__kernel void m13900_s08 (KERN_ATTR_BASIC ()) +KERNEL_FQ void m13900_s08 (KERN_ATTR_BASIC ()) { } -__kernel void m13900_s16 (KERN_ATTR_BASIC ()) +KERNEL_FQ void m13900_s16 (KERN_ATTR_BASIC ()) { } diff --git a/OpenCL/m13900_a1-pure.cl b/OpenCL/m13900_a1-pure.cl index 80f7cfa5d..92d5eb003 100644 --- a/OpenCL/m13900_a1-pure.cl +++ b/OpenCL/m13900_a1-pure.cl @@ -25,7 +25,7 @@ #define uint_to_hex_lower8_le(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 m13900_mxx (KERN_ATTR_BASIC ()) +KERNEL_FQ void m13900_mxx (KERN_ATTR_BASIC ()) { /** * modifier @@ -39,7 +39,7 @@ __kernel void m13900_mxx (KERN_ATTR_BASIC ()) * shared */ - __local u32 l_bin2asc[256]; + LOCAL_AS u32 l_bin2asc[256]; for (u32 i = lid; i < 256; i += lsz) { @@ -174,7 +174,7 @@ __kernel void m13900_mxx (KERN_ATTR_BASIC ()) } } -__kernel void m13900_sxx (KERN_ATTR_BASIC ()) +KERNEL_FQ void m13900_sxx (KERN_ATTR_BASIC ()) { /** * modifier @@ -188,7 +188,7 @@ __kernel void m13900_sxx (KERN_ATTR_BASIC ()) * shared */ - __local u32 l_bin2asc[256]; + LOCAL_AS u32 l_bin2asc[256]; for (u32 i = lid; i < 256; i += lsz) { diff --git a/OpenCL/m13900_a3-optimized.cl b/OpenCL/m13900_a3-optimized.cl index 47c47da20..0811c2cae 100644 --- a/OpenCL/m13900_a3-optimized.cl +++ b/OpenCL/m13900_a3-optimized.cl @@ -25,7 +25,7 @@ #define uint_to_hex_lower8_le(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 -DECLSPEC void m13900m (u32 *w0, u32 *w1, u32 *w2, u32 *w3, const u32 pw_len, KERN_ATTR_BASIC (), __local u32 *l_bin2asc) +DECLSPEC void m13900m (u32 *w0, u32 *w1, u32 *w2, u32 *w3, const u32 pw_len, KERN_ATTR_BASIC (), LOCAL_AS u32 *l_bin2asc) { /** * modifier @@ -208,7 +208,7 @@ DECLSPEC void m13900m (u32 *w0, u32 *w1, u32 *w2, u32 *w3, const u32 pw_len, KER } } -DECLSPEC void m13900s (u32 *w0, u32 *w1, u32 *w2, u32 *w3, const u32 pw_len, KERN_ATTR_BASIC (), __local u32 *l_bin2asc) +DECLSPEC void m13900s (u32 *w0, u32 *w1, u32 *w2, u32 *w3, const u32 pw_len, KERN_ATTR_BASIC (), LOCAL_AS u32 *l_bin2asc) { /** * modifier @@ -414,7 +414,7 @@ DECLSPEC void m13900s (u32 *w0, u32 *w1, u32 *w2, u32 *w3, const u32 pw_len, KER } } -__kernel void m13900_m04 (KERN_ATTR_BASIC ()) +KERNEL_FQ void m13900_m04 (KERN_ATTR_BASIC ()) { /** * modifier @@ -428,7 +428,7 @@ __kernel void m13900_m04 (KERN_ATTR_BASIC ()) * shared */ - __local u32 l_bin2asc[256]; + LOCAL_AS u32 l_bin2asc[256]; for (u32 i = lid; i < 256; i += lsz) { @@ -484,7 +484,7 @@ __kernel void m13900_m04 (KERN_ATTR_BASIC ()) m13900m (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_extra0_buf, d_extra1_buf, d_extra2_buf, d_extra3_buf, bitmap_mask, bitmap_shift1, bitmap_shift2, salt_pos, loop_pos, loop_cnt, il_cnt, digests_cnt, digests_offset, combs_mode, gid_max, l_bin2asc); } -__kernel void m13900_m08 (KERN_ATTR_BASIC ()) +KERNEL_FQ void m13900_m08 (KERN_ATTR_BASIC ()) { /** * modifier @@ -498,7 +498,7 @@ __kernel void m13900_m08 (KERN_ATTR_BASIC ()) * shared */ - __local u32 l_bin2asc[256]; + LOCAL_AS u32 l_bin2asc[256]; for (u32 i = lid; i < 256; i += lsz) { @@ -554,7 +554,7 @@ __kernel void m13900_m08 (KERN_ATTR_BASIC ()) m13900m (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_extra0_buf, d_extra1_buf, d_extra2_buf, d_extra3_buf, bitmap_mask, bitmap_shift1, bitmap_shift2, salt_pos, loop_pos, loop_cnt, il_cnt, digests_cnt, digests_offset, combs_mode, gid_max, l_bin2asc); } -__kernel void m13900_m16 (KERN_ATTR_BASIC ()) +KERNEL_FQ void m13900_m16 (KERN_ATTR_BASIC ()) { /** * modifier @@ -568,7 +568,7 @@ __kernel void m13900_m16 (KERN_ATTR_BASIC ()) * shared */ - __local u32 l_bin2asc[256]; + LOCAL_AS u32 l_bin2asc[256]; for (u32 i = lid; i < 256; i += lsz) { @@ -624,7 +624,7 @@ __kernel void m13900_m16 (KERN_ATTR_BASIC ()) m13900m (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_extra0_buf, d_extra1_buf, d_extra2_buf, d_extra3_buf, bitmap_mask, bitmap_shift1, bitmap_shift2, salt_pos, loop_pos, loop_cnt, il_cnt, digests_cnt, digests_offset, combs_mode, gid_max, l_bin2asc); } -__kernel void m13900_s04 (KERN_ATTR_BASIC ()) +KERNEL_FQ void m13900_s04 (KERN_ATTR_BASIC ()) { /** * modifier @@ -638,7 +638,7 @@ __kernel void m13900_s04 (KERN_ATTR_BASIC ()) * shared */ - __local u32 l_bin2asc[256]; + LOCAL_AS u32 l_bin2asc[256]; for (u32 i = lid; i < 256; i += lsz) { @@ -694,7 +694,7 @@ __kernel void m13900_s04 (KERN_ATTR_BASIC ()) m13900s (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_extra0_buf, d_extra1_buf, d_extra2_buf, d_extra3_buf, bitmap_mask, bitmap_shift1, bitmap_shift2, salt_pos, loop_pos, loop_cnt, il_cnt, digests_cnt, digests_offset, combs_mode, gid_max, l_bin2asc); } -__kernel void m13900_s08 (KERN_ATTR_BASIC ()) +KERNEL_FQ void m13900_s08 (KERN_ATTR_BASIC ()) { /** * modifier @@ -708,7 +708,7 @@ __kernel void m13900_s08 (KERN_ATTR_BASIC ()) * shared */ - __local u32 l_bin2asc[256]; + LOCAL_AS u32 l_bin2asc[256]; for (u32 i = lid; i < 256; i += lsz) { @@ -764,7 +764,7 @@ __kernel void m13900_s08 (KERN_ATTR_BASIC ()) m13900s (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_extra0_buf, d_extra1_buf, d_extra2_buf, d_extra3_buf, bitmap_mask, bitmap_shift1, bitmap_shift2, salt_pos, loop_pos, loop_cnt, il_cnt, digests_cnt, digests_offset, combs_mode, gid_max, l_bin2asc); } -__kernel void m13900_s16 (KERN_ATTR_BASIC ()) +KERNEL_FQ void m13900_s16 (KERN_ATTR_BASIC ()) { /** * modifier @@ -778,7 +778,7 @@ __kernel void m13900_s16 (KERN_ATTR_BASIC ()) * shared */ - __local u32 l_bin2asc[256]; + LOCAL_AS u32 l_bin2asc[256]; for (u32 i = lid; i < 256; i += lsz) { diff --git a/OpenCL/m13900_a3-pure.cl b/OpenCL/m13900_a3-pure.cl index 9b5bbdb25..3dbea052f 100644 --- a/OpenCL/m13900_a3-pure.cl +++ b/OpenCL/m13900_a3-pure.cl @@ -25,7 +25,7 @@ #define uint_to_hex_lower8_le(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 m13900_mxx (KERN_ATTR_VECTOR ()) +KERNEL_FQ void m13900_mxx (KERN_ATTR_VECTOR ()) { /** * modifier @@ -39,7 +39,7 @@ __kernel void m13900_mxx (KERN_ATTR_VECTOR ()) * shared */ - __local u32 l_bin2asc[256]; + LOCAL_AS u32 l_bin2asc[256]; for (u32 i = lid; i < 256; i += lsz) { @@ -191,7 +191,7 @@ __kernel void m13900_mxx (KERN_ATTR_VECTOR ()) } } -__kernel void m13900_sxx (KERN_ATTR_VECTOR ()) +KERNEL_FQ void m13900_sxx (KERN_ATTR_VECTOR ()) { /** * modifier @@ -205,7 +205,7 @@ __kernel void m13900_sxx (KERN_ATTR_VECTOR ()) * shared */ - __local u32 l_bin2asc[256]; + LOCAL_AS u32 l_bin2asc[256]; for (u32 i = lid; i < 256; i += lsz) { diff --git a/OpenCL/m14000_a0-pure.cl b/OpenCL/m14000_a0-pure.cl index 28218680f..25dc96458 100644 --- a/OpenCL/m14000_a0-pure.cl +++ b/OpenCL/m14000_a0-pure.cl @@ -52,7 +52,7 @@ PERM_OP (l, r, tt, 4, 0x0f0f0f0f); \ } -__constant u32a c_SPtrans[8][64] = +CONSTANT_AS u32a c_SPtrans[8][64] = { { /* nibble 0 */ @@ -208,7 +208,7 @@ __constant u32a c_SPtrans[8][64] = }, }; -__constant u32a c_skb[8][64] = +CONSTANT_AS u32a c_skb[8][64] = { { 0x00000000, 0x00000010, 0x20000000, 0x20000010, @@ -380,7 +380,7 @@ __constant u32a c_skb[8][64] = #define BOX1(i,S) (u32x) ((S)[(i).s0], (S)[(i).s1], (S)[(i).s2], (S)[(i).s3], (S)[(i).s4], (S)[(i).s5], (S)[(i).s6], (S)[(i).s7], (S)[(i).s8], (S)[(i).s9], (S)[(i).sa], (S)[(i).sb], (S)[(i).sc], (S)[(i).sd], (S)[(i).se], (S)[(i).sf]) #endif -DECLSPEC void _des_crypt_encrypt (u32 *iv, u32 *data, u32 *Kc, u32 *Kd, __local u32 (*s_SPtrans)[64]) +DECLSPEC void _des_crypt_encrypt (u32 *iv, u32 *data, u32 *Kc, u32 *Kd, LOCAL_AS u32 (*s_SPtrans)[64]) { u32 r = rotl32_S (data[0], 3u); u32 l = rotl32_S (data[1], 3u); @@ -424,7 +424,7 @@ DECLSPEC void _des_crypt_encrypt (u32 *iv, u32 *data, u32 *Kc, u32 *Kd, __local iv[1] = rotl32_S (r, 29u); } -DECLSPEC void _des_crypt_keysetup (u32 c, u32 d, u32 *Kc, u32 *Kd, __local u32 (*s_skb)[64]) +DECLSPEC void _des_crypt_keysetup (u32 c, u32 d, u32 *Kc, u32 *Kd, LOCAL_AS u32 (*s_skb)[64]) { u32 tt; @@ -496,7 +496,7 @@ DECLSPEC void _des_crypt_keysetup (u32 c, u32 d, u32 *Kc, u32 *Kd, __local u32 ( } } -__kernel void m14000_mxx (KERN_ATTR_RULES ()) +KERNEL_FQ void m14000_mxx (KERN_ATTR_RULES ()) { /** * base @@ -510,8 +510,8 @@ __kernel void m14000_mxx (KERN_ATTR_RULES ()) * shared */ - __local u32 s_SPtrans[8][64]; - __local u32 s_skb[8][64]; + LOCAL_AS u32 s_SPtrans[8][64]; + LOCAL_AS u32 s_skb[8][64]; for (u32 i = lid; i < 64; i += lsz) { @@ -601,7 +601,7 @@ __kernel void m14000_mxx (KERN_ATTR_RULES ()) } } -__kernel void m14000_sxx (KERN_ATTR_RULES ()) +KERNEL_FQ void m14000_sxx (KERN_ATTR_RULES ()) { /** * base @@ -615,8 +615,8 @@ __kernel void m14000_sxx (KERN_ATTR_RULES ()) * shared */ - __local u32 s_SPtrans[8][64]; - __local u32 s_skb[8][64]; + LOCAL_AS u32 s_SPtrans[8][64]; + LOCAL_AS u32 s_skb[8][64]; for (u32 i = lid; i < 64; i += lsz) { diff --git a/OpenCL/m14000_a1-pure.cl b/OpenCL/m14000_a1-pure.cl index 63f3f0463..985a68b75 100644 --- a/OpenCL/m14000_a1-pure.cl +++ b/OpenCL/m14000_a1-pure.cl @@ -50,7 +50,7 @@ PERM_OP (l, r, tt, 4, 0x0f0f0f0f); \ } -__constant u32a c_SPtrans[8][64] = +CONSTANT_AS u32a c_SPtrans[8][64] = { { 0x02080800, 0x00080000, 0x02000002, 0x02080802, @@ -198,7 +198,7 @@ __constant u32a c_SPtrans[8][64] = } }; -__constant u32a c_skb[8][64] = +CONSTANT_AS u32a c_skb[8][64] = { { 0x00000000, 0x00000010, 0x20000000, 0x20000010, @@ -370,7 +370,7 @@ __constant u32a c_skb[8][64] = #define BOX1(i,S) (u32x) ((S)[(i).s0], (S)[(i).s1], (S)[(i).s2], (S)[(i).s3], (S)[(i).s4], (S)[(i).s5], (S)[(i).s6], (S)[(i).s7], (S)[(i).s8], (S)[(i).s9], (S)[(i).sa], (S)[(i).sb], (S)[(i).sc], (S)[(i).sd], (S)[(i).se], (S)[(i).sf]) #endif -DECLSPEC void _des_crypt_encrypt (u32 *iv, u32 *data, u32 *Kc, u32 *Kd, __local u32 (*s_SPtrans)[64]) +DECLSPEC void _des_crypt_encrypt (u32 *iv, u32 *data, u32 *Kc, u32 *Kd, LOCAL_AS u32 (*s_SPtrans)[64]) { u32 r = rotl32_S (data[0], 3u); u32 l = rotl32_S (data[1], 3u); @@ -414,7 +414,7 @@ DECLSPEC void _des_crypt_encrypt (u32 *iv, u32 *data, u32 *Kc, u32 *Kd, __local iv[1] = rotl32_S (r, 29u); } -DECLSPEC void _des_crypt_keysetup (u32 c, u32 d, u32 *Kc, u32 *Kd, __local u32 (*s_skb)[64]) +DECLSPEC void _des_crypt_keysetup (u32 c, u32 d, u32 *Kc, u32 *Kd, LOCAL_AS u32 (*s_skb)[64]) { u32 tt; @@ -486,7 +486,7 @@ DECLSPEC void _des_crypt_keysetup (u32 c, u32 d, u32 *Kc, u32 *Kd, __local u32 ( } } -__kernel void m14000_mxx (KERN_ATTR_BASIC ()) +KERNEL_FQ void m14000_mxx (KERN_ATTR_BASIC ()) { /** * base @@ -500,8 +500,8 @@ __kernel void m14000_mxx (KERN_ATTR_BASIC ()) * shared */ - __local u32 s_SPtrans[8][64]; - __local u32 s_skb[8][64]; + LOCAL_AS u32 s_SPtrans[8][64]; + LOCAL_AS u32 s_skb[8][64]; for (u32 i = lid; i < 64; i += lsz) { @@ -634,7 +634,7 @@ __kernel void m14000_mxx (KERN_ATTR_BASIC ()) } } -__kernel void m14000_sxx (KERN_ATTR_BASIC ()) +KERNEL_FQ void m14000_sxx (KERN_ATTR_BASIC ()) { /** * base @@ -648,8 +648,8 @@ __kernel void m14000_sxx (KERN_ATTR_BASIC ()) * shared */ - __local u32 s_SPtrans[8][64]; - __local u32 s_skb[8][64]; + LOCAL_AS u32 s_SPtrans[8][64]; + LOCAL_AS u32 s_skb[8][64]; for (u32 i = lid; i < 64; i += lsz) { diff --git a/OpenCL/m14000_a3-pure.cl b/OpenCL/m14000_a3-pure.cl index a92c806d6..dd7ce2b51 100644 --- a/OpenCL/m14000_a3-pure.cl +++ b/OpenCL/m14000_a3-pure.cl @@ -1730,7 +1730,7 @@ DECLSPEC void transpose32c (u32 *data) // transpose bitslice mod : attention race conditions, need different buffers for *in and *out // -__kernel void m14000_tm (__global u32 * restrict mod, __global bs_word_t * restrict words_buf_r) +KERNEL_FQ void m14000_tm (GLOBAL_AS u32 * restrict mod, GLOBAL_AS bs_word_t * restrict words_buf_r) { const u64 gid = get_global_id (0); @@ -1754,7 +1754,7 @@ __kernel void m14000_tm (__global u32 * restrict mod, __global bs_word_t * restr } } -__kernel void m14000_mxx (KERN_ATTR_BITSLICE ()) +KERNEL_FQ void m14000_mxx (KERN_ATTR_BITSLICE ()) { /** * base @@ -2266,7 +2266,7 @@ __kernel void m14000_mxx (KERN_ATTR_BITSLICE ()) } } -__kernel void m14000_sxx (KERN_ATTR_BITSLICE ()) +KERNEL_FQ void m14000_sxx (KERN_ATTR_BITSLICE ()) { /** * base diff --git a/OpenCL/m14100_a0-pure.cl b/OpenCL/m14100_a0-pure.cl index 3db95dab8..4b37f5bd5 100644 --- a/OpenCL/m14100_a0-pure.cl +++ b/OpenCL/m14100_a0-pure.cl @@ -52,7 +52,7 @@ PERM_OP (l, r, tt, 4, 0x0f0f0f0f); \ } -__constant u32a c_SPtrans[8][64] = +CONSTANT_AS u32a c_SPtrans[8][64] = { { /* nibble 0 */ @@ -208,7 +208,7 @@ __constant u32a c_SPtrans[8][64] = }, }; -__constant u32a c_skb[8][64] = +CONSTANT_AS u32a c_skb[8][64] = { { 0x00000000, 0x00000010, 0x20000000, 0x20000010, @@ -380,7 +380,7 @@ __constant u32a c_skb[8][64] = #define BOX1(i,S) (u32x) ((S)[(i).s0], (S)[(i).s1], (S)[(i).s2], (S)[(i).s3], (S)[(i).s4], (S)[(i).s5], (S)[(i).s6], (S)[(i).s7], (S)[(i).s8], (S)[(i).s9], (S)[(i).sa], (S)[(i).sb], (S)[(i).sc], (S)[(i).sd], (S)[(i).se], (S)[(i).sf]) #endif -DECLSPEC void _des_crypt_encrypt (u32 *iv, u32 *data, u32 *Kc, u32 *Kd, __local u32 (*s_SPtrans)[64]) +DECLSPEC void _des_crypt_encrypt (u32 *iv, u32 *data, u32 *Kc, u32 *Kd, LOCAL_AS u32 (*s_SPtrans)[64]) { u32 r = rotl32_S (data[0], 3u); u32 l = rotl32_S (data[1], 3u); @@ -424,7 +424,7 @@ DECLSPEC void _des_crypt_encrypt (u32 *iv, u32 *data, u32 *Kc, u32 *Kd, __local iv[1] = rotl32_S (r, 29u); } -DECLSPEC void _des_crypt_decrypt (u32 *iv, u32 *data, u32 *Kc, u32 *Kd, __local u32 (*s_SPtrans)[64]) +DECLSPEC void _des_crypt_decrypt (u32 *iv, u32 *data, u32 *Kc, u32 *Kd, LOCAL_AS u32 (*s_SPtrans)[64]) { u32 r = rotl32_S (data[0], 3u); u32 l = rotl32_S (data[1], 3u); @@ -468,7 +468,7 @@ DECLSPEC void _des_crypt_decrypt (u32 *iv, u32 *data, u32 *Kc, u32 *Kd, __local iv[1] = rotl32_S (r, 29u); } -DECLSPEC void _des_crypt_keysetup (u32 c, u32 d, u32 *Kc, u32 *Kd, __local u32 (*s_skb)[64]) +DECLSPEC void _des_crypt_keysetup (u32 c, u32 d, u32 *Kc, u32 *Kd, LOCAL_AS u32 (*s_skb)[64]) { u32 tt; @@ -540,7 +540,7 @@ DECLSPEC void _des_crypt_keysetup (u32 c, u32 d, u32 *Kc, u32 *Kd, __local u32 ( } } -__kernel void m14100_mxx (KERN_ATTR_RULES ()) +KERNEL_FQ void m14100_mxx (KERN_ATTR_RULES ()) { /** * base @@ -554,8 +554,8 @@ __kernel void m14100_mxx (KERN_ATTR_RULES ()) * shared */ - __local u32 s_SPtrans[8][64]; - __local u32 s_skb[8][64]; + LOCAL_AS u32 s_SPtrans[8][64]; + LOCAL_AS u32 s_skb[8][64]; for (u32 i = lid; i < 64; i += lsz) { @@ -675,7 +675,7 @@ __kernel void m14100_mxx (KERN_ATTR_RULES ()) } } -__kernel void m14100_sxx (KERN_ATTR_RULES ()) +KERNEL_FQ void m14100_sxx (KERN_ATTR_RULES ()) { /** * base @@ -689,8 +689,8 @@ __kernel void m14100_sxx (KERN_ATTR_RULES ()) * shared */ - __local u32 s_SPtrans[8][64]; - __local u32 s_skb[8][64]; + LOCAL_AS u32 s_SPtrans[8][64]; + LOCAL_AS u32 s_skb[8][64]; for (u32 i = lid; i < 64; i += lsz) { diff --git a/OpenCL/m14100_a1-pure.cl b/OpenCL/m14100_a1-pure.cl index 7c4c2228f..996a26aa1 100644 --- a/OpenCL/m14100_a1-pure.cl +++ b/OpenCL/m14100_a1-pure.cl @@ -50,7 +50,7 @@ PERM_OP (l, r, tt, 4, 0x0f0f0f0f); \ } -__constant u32a c_SPtrans[8][64] = +CONSTANT_AS u32a c_SPtrans[8][64] = { { 0x02080800, 0x00080000, 0x02000002, 0x02080802, @@ -198,7 +198,7 @@ __constant u32a c_SPtrans[8][64] = } }; -__constant u32a c_skb[8][64] = +CONSTANT_AS u32a c_skb[8][64] = { { 0x00000000, 0x00000010, 0x20000000, 0x20000010, @@ -370,7 +370,7 @@ __constant u32a c_skb[8][64] = #define BOX1(i,S) (u32x) ((S)[(i).s0], (S)[(i).s1], (S)[(i).s2], (S)[(i).s3], (S)[(i).s4], (S)[(i).s5], (S)[(i).s6], (S)[(i).s7], (S)[(i).s8], (S)[(i).s9], (S)[(i).sa], (S)[(i).sb], (S)[(i).sc], (S)[(i).sd], (S)[(i).se], (S)[(i).sf]) #endif -DECLSPEC void _des_crypt_encrypt (u32 *iv, u32 *data, u32 *Kc, u32 *Kd, __local u32 (*s_SPtrans)[64]) +DECLSPEC void _des_crypt_encrypt (u32 *iv, u32 *data, u32 *Kc, u32 *Kd, LOCAL_AS u32 (*s_SPtrans)[64]) { u32 r = rotl32_S (data[0], 3u); u32 l = rotl32_S (data[1], 3u); @@ -414,7 +414,7 @@ DECLSPEC void _des_crypt_encrypt (u32 *iv, u32 *data, u32 *Kc, u32 *Kd, __local iv[1] = rotl32_S (r, 29u); } -DECLSPEC void _des_crypt_decrypt (u32 *iv, u32 *data, u32 *Kc, u32 *Kd, __local u32 (*s_SPtrans)[64]) +DECLSPEC void _des_crypt_decrypt (u32 *iv, u32 *data, u32 *Kc, u32 *Kd, LOCAL_AS u32 (*s_SPtrans)[64]) { u32 r = rotl32_S (data[0], 3u); u32 l = rotl32_S (data[1], 3u); @@ -458,7 +458,7 @@ DECLSPEC void _des_crypt_decrypt (u32 *iv, u32 *data, u32 *Kc, u32 *Kd, __local iv[1] = rotl32_S (r, 29u); } -DECLSPEC void _des_crypt_keysetup (u32 c, u32 d, u32 *Kc, u32 *Kd, __local u32 (*s_skb)[64]) +DECLSPEC void _des_crypt_keysetup (u32 c, u32 d, u32 *Kc, u32 *Kd, LOCAL_AS u32 (*s_skb)[64]) { u32 tt; @@ -530,7 +530,7 @@ DECLSPEC void _des_crypt_keysetup (u32 c, u32 d, u32 *Kc, u32 *Kd, __local u32 ( } } -__kernel void m14100_mxx (KERN_ATTR_BASIC ()) +KERNEL_FQ void m14100_mxx (KERN_ATTR_BASIC ()) { /** * base @@ -544,8 +544,8 @@ __kernel void m14100_mxx (KERN_ATTR_BASIC ()) * shared */ - __local u32 s_SPtrans[8][64]; - __local u32 s_skb[8][64]; + LOCAL_AS u32 s_SPtrans[8][64]; + LOCAL_AS u32 s_skb[8][64]; for (u32 i = lid; i < 64; i += lsz) { @@ -713,7 +713,7 @@ __kernel void m14100_mxx (KERN_ATTR_BASIC ()) } } -__kernel void m14100_sxx (KERN_ATTR_BASIC ()) +KERNEL_FQ void m14100_sxx (KERN_ATTR_BASIC ()) { /** * base @@ -727,8 +727,8 @@ __kernel void m14100_sxx (KERN_ATTR_BASIC ()) * shared */ - __local u32 s_SPtrans[8][64]; - __local u32 s_skb[8][64]; + LOCAL_AS u32 s_SPtrans[8][64]; + LOCAL_AS u32 s_skb[8][64]; for (u32 i = lid; i < 64; i += lsz) { diff --git a/OpenCL/m14100_a3-pure.cl b/OpenCL/m14100_a3-pure.cl index f01488bab..1e5332067 100644 --- a/OpenCL/m14100_a3-pure.cl +++ b/OpenCL/m14100_a3-pure.cl @@ -50,7 +50,7 @@ PERM_OP (l, r, tt, 4, 0x0f0f0f0f); \ } -__constant u32a c_SPtrans[8][64] = +CONSTANT_AS u32a c_SPtrans[8][64] = { { 0x02080800, 0x00080000, 0x02000002, 0x02080802, @@ -198,7 +198,7 @@ __constant u32a c_SPtrans[8][64] = } }; -__constant u32a c_skb[8][64] = +CONSTANT_AS u32a c_skb[8][64] = { { 0x00000000, 0x00000010, 0x20000000, 0x20000010, @@ -370,7 +370,7 @@ __constant u32a c_skb[8][64] = #define BOX1(i,S) (u32x) ((S)[(i).s0], (S)[(i).s1], (S)[(i).s2], (S)[(i).s3], (S)[(i).s4], (S)[(i).s5], (S)[(i).s6], (S)[(i).s7], (S)[(i).s8], (S)[(i).s9], (S)[(i).sa], (S)[(i).sb], (S)[(i).sc], (S)[(i).sd], (S)[(i).se], (S)[(i).sf]) #endif -DECLSPEC void _des_crypt_encrypt (u32x *iv, u32x *data, u32x *Kc, u32x *Kd, __local u32 (*s_SPtrans)[64]) +DECLSPEC void _des_crypt_encrypt (u32x *iv, u32x *data, u32x *Kc, u32x *Kd, LOCAL_AS u32 (*s_SPtrans)[64]) { u32x r = rotl32 (data[0], 3u); u32x l = rotl32 (data[1], 3u); @@ -414,7 +414,7 @@ DECLSPEC void _des_crypt_encrypt (u32x *iv, u32x *data, u32x *Kc, u32x *Kd, __lo iv[1] = rotl32 (r, 29u); } -DECLSPEC void _des_crypt_decrypt (u32x *iv, u32x *data, u32x *Kc, u32x *Kd, __local u32 (*s_SPtrans)[64]) +DECLSPEC void _des_crypt_decrypt (u32x *iv, u32x *data, u32x *Kc, u32x *Kd, LOCAL_AS u32 (*s_SPtrans)[64]) { u32x r = rotl32 (data[0], 3u); u32x l = rotl32 (data[1], 3u); @@ -458,7 +458,7 @@ DECLSPEC void _des_crypt_decrypt (u32x *iv, u32x *data, u32x *Kc, u32x *Kd, __lo iv[1] = rotl32 (r, 29u); } -DECLSPEC void _des_crypt_keysetup (u32x c, u32x d, u32x *Kc, u32x *Kd, __local u32 (*s_skb)[64]) +DECLSPEC void _des_crypt_keysetup (u32x c, u32x d, u32x *Kc, u32x *Kd, LOCAL_AS u32 (*s_skb)[64]) { u32x tt; @@ -530,7 +530,7 @@ DECLSPEC void _des_crypt_keysetup (u32x c, u32x d, u32x *Kc, u32x *Kd, __local u } } -DECLSPEC void m14100m (__local u32 (*s_SPtrans)[64], __local u32 (*s_skb)[64], u32 *w, const u32 pw_len, KERN_ATTR_BASIC ()) +DECLSPEC void m14100m (LOCAL_AS u32 (*s_SPtrans)[64], LOCAL_AS u32 (*s_skb)[64], u32 *w, const u32 pw_len, KERN_ATTR_BASIC ()) { /** * modifier @@ -615,7 +615,7 @@ DECLSPEC void m14100m (__local u32 (*s_SPtrans)[64], __local u32 (*s_skb)[64], u } } -DECLSPEC void m14100s (__local u32 (*s_SPtrans)[64], __local u32 (*s_skb)[64], u32 *w, const u32 pw_len, KERN_ATTR_BASIC ()) +DECLSPEC void m14100s (LOCAL_AS u32 (*s_SPtrans)[64], LOCAL_AS u32 (*s_skb)[64], u32 *w, const u32 pw_len, KERN_ATTR_BASIC ()) { /** * modifier @@ -712,7 +712,7 @@ DECLSPEC void m14100s (__local u32 (*s_SPtrans)[64], __local u32 (*s_skb)[64], u } } -__kernel void m14100_mxx (KERN_ATTR_BASIC ()) +KERNEL_FQ void m14100_mxx (KERN_ATTR_BASIC ()) { /** * base @@ -726,8 +726,8 @@ __kernel void m14100_mxx (KERN_ATTR_BASIC ()) * shared */ - __local u32 s_SPtrans[8][64]; - __local u32 s_skb[8][64]; + LOCAL_AS u32 s_SPtrans[8][64]; + LOCAL_AS u32 s_skb[8][64]; for (u32 i = lid; i < 64; i += lsz) { @@ -786,7 +786,7 @@ __kernel void m14100_mxx (KERN_ATTR_BASIC ()) m14100m (s_SPtrans, s_skb, w, 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_extra0_buf, d_extra1_buf, d_extra2_buf, d_extra3_buf, bitmap_mask, bitmap_shift1, bitmap_shift2, salt_pos, loop_pos, loop_cnt, il_cnt, digests_cnt, digests_offset, combs_mode, gid_max); } -__kernel void m14100_sxx (KERN_ATTR_BASIC ()) +KERNEL_FQ void m14100_sxx (KERN_ATTR_BASIC ()) { /** * base @@ -800,8 +800,8 @@ __kernel void m14100_sxx (KERN_ATTR_BASIC ()) * shared */ - __local u32 s_SPtrans[8][64]; - __local u32 s_skb[8][64]; + LOCAL_AS u32 s_SPtrans[8][64]; + LOCAL_AS u32 s_skb[8][64]; for (u32 i = lid; i < 64; i += lsz) { diff --git a/OpenCL/m14400_a0-optimized.cl b/OpenCL/m14400_a0-optimized.cl index c5fe2d196..eaba45770 100644 --- a/OpenCL/m14400_a0-optimized.cl +++ b/OpenCL/m14400_a0-optimized.cl @@ -117,7 +117,7 @@ DECLSPEC void shift_2 (u32 *w0, u32 *w1, u32 *w2, u32 *w3) w0[0] = 0 | w0[0] << 16; } -__kernel void m14400_m04 (KERN_ATTR_RULES ()) +KERNEL_FQ void m14400_m04 (KERN_ATTR_RULES ()) { /** * modifier @@ -131,7 +131,7 @@ __kernel void m14400_m04 (KERN_ATTR_RULES ()) * bin2asc table */ - __local u32 l_bin2asc[256]; + LOCAL_AS u32 l_bin2asc[256]; for (u32 i = lid; i < 256; i += lsz) { @@ -380,15 +380,15 @@ __kernel void m14400_m04 (KERN_ATTR_RULES ()) } } -__kernel void m14400_m08 (KERN_ATTR_RULES ()) +KERNEL_FQ void m14400_m08 (KERN_ATTR_RULES ()) { } -__kernel void m14400_m16 (KERN_ATTR_RULES ()) +KERNEL_FQ void m14400_m16 (KERN_ATTR_RULES ()) { } -__kernel void m14400_s04 (KERN_ATTR_RULES ()) +KERNEL_FQ void m14400_s04 (KERN_ATTR_RULES ()) { /** * modifier @@ -402,7 +402,7 @@ __kernel void m14400_s04 (KERN_ATTR_RULES ()) * bin2asc table */ - __local u32 l_bin2asc[256]; + LOCAL_AS u32 l_bin2asc[256]; for (u32 i = lid; i < 256; i += lsz) { @@ -663,10 +663,10 @@ __kernel void m14400_s04 (KERN_ATTR_RULES ()) } } -__kernel void m14400_s08 (KERN_ATTR_RULES ()) +KERNEL_FQ void m14400_s08 (KERN_ATTR_RULES ()) { } -__kernel void m14400_s16 (KERN_ATTR_RULES ()) +KERNEL_FQ void m14400_s16 (KERN_ATTR_RULES ()) { } diff --git a/OpenCL/m14400_a0-pure.cl b/OpenCL/m14400_a0-pure.cl index 9bbb6c163..9271e5ae0 100644 --- a/OpenCL/m14400_a0-pure.cl +++ b/OpenCL/m14400_a0-pure.cl @@ -27,7 +27,7 @@ #define uint_to_hex_lower8_le(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 m14400_mxx (KERN_ATTR_RULES ()) +KERNEL_FQ void m14400_mxx (KERN_ATTR_RULES ()) { /** * modifier @@ -41,7 +41,7 @@ __kernel void m14400_mxx (KERN_ATTR_RULES ()) * bin2asc table */ - __local u32 l_bin2asc[256]; + LOCAL_AS u32 l_bin2asc[256]; for (u32 i = lid; i < 256; i += lsz) { @@ -274,7 +274,7 @@ __kernel void m14400_mxx (KERN_ATTR_RULES ()) } } -__kernel void m14400_sxx (KERN_ATTR_RULES ()) +KERNEL_FQ void m14400_sxx (KERN_ATTR_RULES ()) { /** * modifier @@ -288,7 +288,7 @@ __kernel void m14400_sxx (KERN_ATTR_RULES ()) * bin2asc table */ - __local u32 l_bin2asc[256]; + LOCAL_AS u32 l_bin2asc[256]; for (u32 i = lid; i < 256; i += lsz) { diff --git a/OpenCL/m14400_a1-optimized.cl b/OpenCL/m14400_a1-optimized.cl index fc4789ffe..6f9d13ce7 100644 --- a/OpenCL/m14400_a1-optimized.cl +++ b/OpenCL/m14400_a1-optimized.cl @@ -117,7 +117,7 @@ DECLSPEC void shift_2 (u32 *w0, u32 *w1, u32 *w2, u32 *w3) w0[0] = 0 | w0[0] << 16; } -__kernel void m14400_m04 (KERN_ATTR_BASIC ()) +KERNEL_FQ void m14400_m04 (KERN_ATTR_BASIC ()) { /** * modifier @@ -131,7 +131,7 @@ __kernel void m14400_m04 (KERN_ATTR_BASIC ()) * bin2asc table */ - __local u32 l_bin2asc[256]; + LOCAL_AS u32 l_bin2asc[256]; for (u32 i = lid; i < 256; i += lsz) { @@ -444,15 +444,15 @@ __kernel void m14400_m04 (KERN_ATTR_BASIC ()) } } -__kernel void m14400_m08 (KERN_ATTR_BASIC ()) +KERNEL_FQ void m14400_m08 (KERN_ATTR_BASIC ()) { } -__kernel void m14400_m16 (KERN_ATTR_BASIC ()) +KERNEL_FQ void m14400_m16 (KERN_ATTR_BASIC ()) { } -__kernel void m14400_s04 (KERN_ATTR_BASIC ()) +KERNEL_FQ void m14400_s04 (KERN_ATTR_BASIC ()) { /** * modifier @@ -466,7 +466,7 @@ __kernel void m14400_s04 (KERN_ATTR_BASIC ()) * bin2asc table */ - __local u32 l_bin2asc[256]; + LOCAL_AS u32 l_bin2asc[256]; for (u32 i = lid; i < 256; i += lsz) { @@ -791,10 +791,10 @@ __kernel void m14400_s04 (KERN_ATTR_BASIC ()) } } -__kernel void m14400_s08 (KERN_ATTR_BASIC ()) +KERNEL_FQ void m14400_s08 (KERN_ATTR_BASIC ()) { } -__kernel void m14400_s16 (KERN_ATTR_BASIC ()) +KERNEL_FQ void m14400_s16 (KERN_ATTR_BASIC ()) { } diff --git a/OpenCL/m14400_a1-pure.cl b/OpenCL/m14400_a1-pure.cl index e6d9b7663..88bf46bad 100644 --- a/OpenCL/m14400_a1-pure.cl +++ b/OpenCL/m14400_a1-pure.cl @@ -25,7 +25,7 @@ #define uint_to_hex_lower8_le(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 m14400_mxx (KERN_ATTR_BASIC ()) +KERNEL_FQ void m14400_mxx (KERN_ATTR_BASIC ()) { /** * modifier @@ -39,7 +39,7 @@ __kernel void m14400_mxx (KERN_ATTR_BASIC ()) * bin2asc table */ - __local u32 l_bin2asc[256]; + LOCAL_AS u32 l_bin2asc[256]; for (u32 i = lid; i < 256; i += lsz) { @@ -270,7 +270,7 @@ __kernel void m14400_mxx (KERN_ATTR_BASIC ()) } } -__kernel void m14400_sxx (KERN_ATTR_BASIC ()) +KERNEL_FQ void m14400_sxx (KERN_ATTR_BASIC ()) { /** * modifier @@ -284,7 +284,7 @@ __kernel void m14400_sxx (KERN_ATTR_BASIC ()) * bin2asc table */ - __local u32 l_bin2asc[256]; + LOCAL_AS u32 l_bin2asc[256]; for (u32 i = lid; i < 256; i += lsz) { diff --git a/OpenCL/m14400_a3-optimized.cl b/OpenCL/m14400_a3-optimized.cl index ba5e189f4..f662df022 100644 --- a/OpenCL/m14400_a3-optimized.cl +++ b/OpenCL/m14400_a3-optimized.cl @@ -117,7 +117,7 @@ DECLSPEC void shift_2 (u32 *w0, u32 *w1, u32 *w2, u32 *w3) w0[0] = 0 | w0[0] << 16; } -DECLSPEC void m14400m (u32 *w0, u32 *w1, u32 *w2, u32 *w3, const u32 pw_len, KERN_ATTR_BASIC (), __local u32 *l_bin2asc) +DECLSPEC void m14400m (u32 *w0, u32 *w1, u32 *w2, u32 *w3, const u32 pw_len, KERN_ATTR_BASIC (), LOCAL_AS u32 *l_bin2asc) { /** * modifier @@ -366,7 +366,7 @@ DECLSPEC void m14400m (u32 *w0, u32 *w1, u32 *w2, u32 *w3, const u32 pw_len, KER } } -DECLSPEC void m14400s (u32 *w0, u32 *w1, u32 *w2, u32 *w3, const u32 pw_len, KERN_ATTR_BASIC (), __local u32 *l_bin2asc) +DECLSPEC void m14400s (u32 *w0, u32 *w1, u32 *w2, u32 *w3, const u32 pw_len, KERN_ATTR_BASIC (), LOCAL_AS u32 *l_bin2asc) { /** * modifier @@ -627,7 +627,7 @@ DECLSPEC void m14400s (u32 *w0, u32 *w1, u32 *w2, u32 *w3, const u32 pw_len, KER } } -__kernel void m14400_m04 (KERN_ATTR_BASIC ()) +KERNEL_FQ void m14400_m04 (KERN_ATTR_BASIC ()) { /** * base @@ -641,7 +641,7 @@ __kernel void m14400_m04 (KERN_ATTR_BASIC ()) * bin2asc table */ - __local u32 l_bin2asc[256]; + LOCAL_AS u32 l_bin2asc[256]; for (u32 i = lid; i < 256; i += lsz) { @@ -697,7 +697,7 @@ __kernel void m14400_m04 (KERN_ATTR_BASIC ()) m14400m (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_extra0_buf, d_extra1_buf, d_extra2_buf, d_extra3_buf, bitmap_mask, bitmap_shift1, bitmap_shift2, salt_pos, loop_pos, loop_cnt, il_cnt, digests_cnt, digests_offset, combs_mode, gid_max, l_bin2asc); } -__kernel void m14400_m08 (KERN_ATTR_BASIC ()) +KERNEL_FQ void m14400_m08 (KERN_ATTR_BASIC ()) { /** * base @@ -711,7 +711,7 @@ __kernel void m14400_m08 (KERN_ATTR_BASIC ()) * bin2asc table */ - __local u32 l_bin2asc[256]; + LOCAL_AS u32 l_bin2asc[256]; for (u32 i = lid; i < 256; i += lsz) { @@ -767,7 +767,7 @@ __kernel void m14400_m08 (KERN_ATTR_BASIC ()) m14400m (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_extra0_buf, d_extra1_buf, d_extra2_buf, d_extra3_buf, bitmap_mask, bitmap_shift1, bitmap_shift2, salt_pos, loop_pos, loop_cnt, il_cnt, digests_cnt, digests_offset, combs_mode, gid_max, l_bin2asc); } -__kernel void m14400_m16 (KERN_ATTR_BASIC ()) +KERNEL_FQ void m14400_m16 (KERN_ATTR_BASIC ()) { /** * base @@ -781,7 +781,7 @@ __kernel void m14400_m16 (KERN_ATTR_BASIC ()) * bin2asc table */ - __local u32 l_bin2asc[256]; + LOCAL_AS u32 l_bin2asc[256]; for (u32 i = lid; i < 256; i += lsz) { @@ -837,7 +837,7 @@ __kernel void m14400_m16 (KERN_ATTR_BASIC ()) m14400m (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_extra0_buf, d_extra1_buf, d_extra2_buf, d_extra3_buf, bitmap_mask, bitmap_shift1, bitmap_shift2, salt_pos, loop_pos, loop_cnt, il_cnt, digests_cnt, digests_offset, combs_mode, gid_max, l_bin2asc); } -__kernel void m14400_s04 (KERN_ATTR_BASIC ()) +KERNEL_FQ void m14400_s04 (KERN_ATTR_BASIC ()) { /** * base @@ -851,7 +851,7 @@ __kernel void m14400_s04 (KERN_ATTR_BASIC ()) * bin2asc table */ - __local u32 l_bin2asc[256]; + LOCAL_AS u32 l_bin2asc[256]; for (u32 i = lid; i < 256; i += lsz) { @@ -907,7 +907,7 @@ __kernel void m14400_s04 (KERN_ATTR_BASIC ()) m14400s (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_extra0_buf, d_extra1_buf, d_extra2_buf, d_extra3_buf, bitmap_mask, bitmap_shift1, bitmap_shift2, salt_pos, loop_pos, loop_cnt, il_cnt, digests_cnt, digests_offset, combs_mode, gid_max, l_bin2asc); } -__kernel void m14400_s08 (KERN_ATTR_BASIC ()) +KERNEL_FQ void m14400_s08 (KERN_ATTR_BASIC ()) { /** * base @@ -921,7 +921,7 @@ __kernel void m14400_s08 (KERN_ATTR_BASIC ()) * bin2asc table */ - __local u32 l_bin2asc[256]; + LOCAL_AS u32 l_bin2asc[256]; for (u32 i = lid; i < 256; i += lsz) { @@ -977,7 +977,7 @@ __kernel void m14400_s08 (KERN_ATTR_BASIC ()) m14400s (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_extra0_buf, d_extra1_buf, d_extra2_buf, d_extra3_buf, bitmap_mask, bitmap_shift1, bitmap_shift2, salt_pos, loop_pos, loop_cnt, il_cnt, digests_cnt, digests_offset, combs_mode, gid_max, l_bin2asc); } -__kernel void m14400_s16 (KERN_ATTR_BASIC ()) +KERNEL_FQ void m14400_s16 (KERN_ATTR_BASIC ()) { /** * base @@ -991,7 +991,7 @@ __kernel void m14400_s16 (KERN_ATTR_BASIC ()) * bin2asc table */ - __local u32 l_bin2asc[256]; + LOCAL_AS u32 l_bin2asc[256]; for (u32 i = lid; i < 256; i += lsz) { diff --git a/OpenCL/m14400_a3-pure.cl b/OpenCL/m14400_a3-pure.cl index fbc240010..6df4818c8 100644 --- a/OpenCL/m14400_a3-pure.cl +++ b/OpenCL/m14400_a3-pure.cl @@ -25,7 +25,7 @@ #define uint_to_hex_lower8_le(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 m14400_mxx (KERN_ATTR_VECTOR ()) +KERNEL_FQ void m14400_mxx (KERN_ATTR_VECTOR ()) { /** * modifier @@ -39,7 +39,7 @@ __kernel void m14400_mxx (KERN_ATTR_VECTOR ()) * bin2asc table */ - __local u32 l_bin2asc[256]; + LOCAL_AS u32 l_bin2asc[256]; for (u32 i = lid; i < 256; i += lsz) { @@ -295,7 +295,7 @@ __kernel void m14400_mxx (KERN_ATTR_VECTOR ()) } } -__kernel void m14400_sxx (KERN_ATTR_VECTOR ()) +KERNEL_FQ void m14400_sxx (KERN_ATTR_VECTOR ()) { /** * modifier @@ -309,7 +309,7 @@ __kernel void m14400_sxx (KERN_ATTR_VECTOR ()) * bin2asc table */ - __local u32 l_bin2asc[256]; + LOCAL_AS u32 l_bin2asc[256]; for (u32 i = lid; i < 256; i += lsz) { diff --git a/OpenCL/m14611-pure.cl b/OpenCL/m14611-pure.cl index b1c3a554a..ef2512f90 100644 --- a/OpenCL/m14611-pure.cl +++ b/OpenCL/m14611-pure.cl @@ -130,7 +130,7 @@ DECLSPEC void hmac_sha1_run_V (u32x *w0, u32x *w1, u32x *w2, u32x *w3, u32x *ipa sha1_transform_vector (w0, w1, w2, w3, digest); } -__kernel void m14611_init (KERN_ATTR_TMPS_ESALT (luks_tmp_t, luks_t)) +KERNEL_FQ void m14611_init (KERN_ATTR_TMPS_ESALT (luks_tmp_t, luks_t)) { /** * base @@ -204,7 +204,7 @@ __kernel void m14611_init (KERN_ATTR_TMPS_ESALT (luks_tmp_t, luks_t)) } } -__kernel void m14611_loop (KERN_ATTR_TMPS_ESALT (luks_tmp_t, luks_t)) +KERNEL_FQ void m14611_loop (KERN_ATTR_TMPS_ESALT (luks_tmp_t, luks_t)) { const u64 gid = get_global_id (0); @@ -291,7 +291,7 @@ __kernel void m14611_loop (KERN_ATTR_TMPS_ESALT (luks_tmp_t, luks_t)) } } -__kernel void m14611_comp (KERN_ATTR_TMPS_ESALT (luks_tmp_t, luks_t)) +KERNEL_FQ void m14611_comp (KERN_ATTR_TMPS_ESALT (luks_tmp_t, luks_t)) { const u64 gid = get_global_id (0); const u64 lid = get_local_id (0); @@ -303,17 +303,17 @@ __kernel void m14611_comp (KERN_ATTR_TMPS_ESALT (luks_tmp_t, luks_t)) #ifdef REAL_SHM - __local u32 s_td0[256]; - __local u32 s_td1[256]; - __local u32 s_td2[256]; - __local u32 s_td3[256]; - __local u32 s_td4[256]; + LOCAL_AS u32 s_td0[256]; + LOCAL_AS u32 s_td1[256]; + LOCAL_AS u32 s_td2[256]; + LOCAL_AS u32 s_td3[256]; + LOCAL_AS u32 s_td4[256]; - __local u32 s_te0[256]; - __local u32 s_te1[256]; - __local u32 s_te2[256]; - __local u32 s_te3[256]; - __local u32 s_te4[256]; + LOCAL_AS u32 s_te0[256]; + LOCAL_AS u32 s_te1[256]; + LOCAL_AS u32 s_te2[256]; + LOCAL_AS u32 s_te3[256]; + LOCAL_AS u32 s_te4[256]; for (u32 i = lid; i < 256; i += lsz) { @@ -334,17 +334,17 @@ __kernel void m14611_comp (KERN_ATTR_TMPS_ESALT (luks_tmp_t, luks_t)) #else - __constant u32a *s_td0 = td0; - __constant u32a *s_td1 = td1; - __constant u32a *s_td2 = td2; - __constant u32a *s_td3 = td3; - __constant u32a *s_td4 = td4; + CONSTANT_AS u32a *s_td0 = td0; + CONSTANT_AS u32a *s_td1 = td1; + CONSTANT_AS u32a *s_td2 = td2; + CONSTANT_AS u32a *s_td3 = td3; + CONSTANT_AS u32a *s_td4 = td4; - __constant u32a *s_te0 = te0; - __constant u32a *s_te1 = te1; - __constant u32a *s_te2 = te2; - __constant u32a *s_te3 = te3; - __constant u32a *s_te4 = te4; + CONSTANT_AS u32a *s_te0 = te0; + CONSTANT_AS u32a *s_te1 = te1; + CONSTANT_AS u32a *s_te2 = te2; + CONSTANT_AS u32a *s_te3 = te3; + CONSTANT_AS u32a *s_te4 = te4; #endif diff --git a/OpenCL/m14612-pure.cl b/OpenCL/m14612-pure.cl index d101bf5ba..78c019af5 100644 --- a/OpenCL/m14612-pure.cl +++ b/OpenCL/m14612-pure.cl @@ -130,7 +130,7 @@ DECLSPEC void hmac_sha1_run_V (u32x *w0, u32x *w1, u32x *w2, u32x *w3, u32x *ipa sha1_transform_vector (w0, w1, w2, w3, digest); } -__kernel void m14612_init (KERN_ATTR_TMPS_ESALT (luks_tmp_t, luks_t)) +KERNEL_FQ void m14612_init (KERN_ATTR_TMPS_ESALT (luks_tmp_t, luks_t)) { /** * base @@ -204,7 +204,7 @@ __kernel void m14612_init (KERN_ATTR_TMPS_ESALT (luks_tmp_t, luks_t)) } } -__kernel void m14612_loop (KERN_ATTR_TMPS_ESALT (luks_tmp_t, luks_t)) +KERNEL_FQ void m14612_loop (KERN_ATTR_TMPS_ESALT (luks_tmp_t, luks_t)) { const u64 gid = get_global_id (0); @@ -291,7 +291,7 @@ __kernel void m14612_loop (KERN_ATTR_TMPS_ESALT (luks_tmp_t, luks_t)) } } -__kernel void m14612_comp (KERN_ATTR_TMPS_ESALT (luks_tmp_t, luks_t)) +KERNEL_FQ void m14612_comp (KERN_ATTR_TMPS_ESALT (luks_tmp_t, luks_t)) { const u64 gid = get_global_id (0); diff --git a/OpenCL/m14613-pure.cl b/OpenCL/m14613-pure.cl index 1c61d9a64..495ad3b11 100644 --- a/OpenCL/m14613-pure.cl +++ b/OpenCL/m14613-pure.cl @@ -130,7 +130,7 @@ DECLSPEC void hmac_sha1_run_V (u32x *w0, u32x *w1, u32x *w2, u32x *w3, u32x *ipa sha1_transform_vector (w0, w1, w2, w3, digest); } -__kernel void m14613_init (KERN_ATTR_TMPS_ESALT (luks_tmp_t, luks_t)) +KERNEL_FQ void m14613_init (KERN_ATTR_TMPS_ESALT (luks_tmp_t, luks_t)) { /** * base @@ -204,7 +204,7 @@ __kernel void m14613_init (KERN_ATTR_TMPS_ESALT (luks_tmp_t, luks_t)) } } -__kernel void m14613_loop (KERN_ATTR_TMPS_ESALT (luks_tmp_t, luks_t)) +KERNEL_FQ void m14613_loop (KERN_ATTR_TMPS_ESALT (luks_tmp_t, luks_t)) { const u64 gid = get_global_id (0); @@ -291,7 +291,7 @@ __kernel void m14613_loop (KERN_ATTR_TMPS_ESALT (luks_tmp_t, luks_t)) } } -__kernel void m14613_comp (KERN_ATTR_TMPS_ESALT (luks_tmp_t, luks_t)) +KERNEL_FQ void m14613_comp (KERN_ATTR_TMPS_ESALT (luks_tmp_t, luks_t)) { const u64 gid = get_global_id (0); diff --git a/OpenCL/m14621-pure.cl b/OpenCL/m14621-pure.cl index 4896f88bc..d6adff94d 100644 --- a/OpenCL/m14621-pure.cl +++ b/OpenCL/m14621-pure.cl @@ -135,7 +135,7 @@ DECLSPEC void hmac_sha256_run_V (u32x *w0, u32x *w1, u32x *w2, u32x *w3, u32x *i sha256_transform_vector (w0, w1, w2, w3, digest); } -__kernel void m14621_init (KERN_ATTR_TMPS_ESALT (luks_tmp_t, luks_t)) +KERNEL_FQ void m14621_init (KERN_ATTR_TMPS_ESALT (luks_tmp_t, luks_t)) { /** * base @@ -221,7 +221,7 @@ __kernel void m14621_init (KERN_ATTR_TMPS_ESALT (luks_tmp_t, luks_t)) } } -__kernel void m14621_loop (KERN_ATTR_TMPS_ESALT (luks_tmp_t, luks_t)) +KERNEL_FQ void m14621_loop (KERN_ATTR_TMPS_ESALT (luks_tmp_t, luks_t)) { const u64 gid = get_global_id (0); @@ -329,7 +329,7 @@ __kernel void m14621_loop (KERN_ATTR_TMPS_ESALT (luks_tmp_t, luks_t)) } } -__kernel void m14621_comp (KERN_ATTR_TMPS_ESALT (luks_tmp_t, luks_t)) +KERNEL_FQ void m14621_comp (KERN_ATTR_TMPS_ESALT (luks_tmp_t, luks_t)) { const u64 gid = get_global_id (0); const u64 lid = get_local_id (0); @@ -341,17 +341,17 @@ __kernel void m14621_comp (KERN_ATTR_TMPS_ESALT (luks_tmp_t, luks_t)) #ifdef REAL_SHM - __local u32 s_td0[256]; - __local u32 s_td1[256]; - __local u32 s_td2[256]; - __local u32 s_td3[256]; - __local u32 s_td4[256]; + LOCAL_AS u32 s_td0[256]; + LOCAL_AS u32 s_td1[256]; + LOCAL_AS u32 s_td2[256]; + LOCAL_AS u32 s_td3[256]; + LOCAL_AS u32 s_td4[256]; - __local u32 s_te0[256]; - __local u32 s_te1[256]; - __local u32 s_te2[256]; - __local u32 s_te3[256]; - __local u32 s_te4[256]; + LOCAL_AS u32 s_te0[256]; + LOCAL_AS u32 s_te1[256]; + LOCAL_AS u32 s_te2[256]; + LOCAL_AS u32 s_te3[256]; + LOCAL_AS u32 s_te4[256]; for (u32 i = lid; i < 256; i += lsz) { @@ -372,17 +372,17 @@ __kernel void m14621_comp (KERN_ATTR_TMPS_ESALT (luks_tmp_t, luks_t)) #else - __constant u32a *s_td0 = td0; - __constant u32a *s_td1 = td1; - __constant u32a *s_td2 = td2; - __constant u32a *s_td3 = td3; - __constant u32a *s_td4 = td4; + CONSTANT_AS u32a *s_td0 = td0; + CONSTANT_AS u32a *s_td1 = td1; + CONSTANT_AS u32a *s_td2 = td2; + CONSTANT_AS u32a *s_td3 = td3; + CONSTANT_AS u32a *s_td4 = td4; - __constant u32a *s_te0 = te0; - __constant u32a *s_te1 = te1; - __constant u32a *s_te2 = te2; - __constant u32a *s_te3 = te3; - __constant u32a *s_te4 = te4; + CONSTANT_AS u32a *s_te0 = te0; + CONSTANT_AS u32a *s_te1 = te1; + CONSTANT_AS u32a *s_te2 = te2; + CONSTANT_AS u32a *s_te3 = te3; + CONSTANT_AS u32a *s_te4 = te4; #endif diff --git a/OpenCL/m14622-pure.cl b/OpenCL/m14622-pure.cl index 54f737336..93c38ed52 100644 --- a/OpenCL/m14622-pure.cl +++ b/OpenCL/m14622-pure.cl @@ -135,7 +135,7 @@ DECLSPEC void hmac_sha256_run_V (u32x *w0, u32x *w1, u32x *w2, u32x *w3, u32x *i sha256_transform_vector (w0, w1, w2, w3, digest); } -__kernel void m14622_init (KERN_ATTR_TMPS_ESALT (luks_tmp_t, luks_t)) +KERNEL_FQ void m14622_init (KERN_ATTR_TMPS_ESALT (luks_tmp_t, luks_t)) { /** * base @@ -221,7 +221,7 @@ __kernel void m14622_init (KERN_ATTR_TMPS_ESALT (luks_tmp_t, luks_t)) } } -__kernel void m14622_loop (KERN_ATTR_TMPS_ESALT (luks_tmp_t, luks_t)) +KERNEL_FQ void m14622_loop (KERN_ATTR_TMPS_ESALT (luks_tmp_t, luks_t)) { const u64 gid = get_global_id (0); @@ -329,7 +329,7 @@ __kernel void m14622_loop (KERN_ATTR_TMPS_ESALT (luks_tmp_t, luks_t)) } } -__kernel void m14622_comp (KERN_ATTR_TMPS_ESALT (luks_tmp_t, luks_t)) +KERNEL_FQ void m14622_comp (KERN_ATTR_TMPS_ESALT (luks_tmp_t, luks_t)) { const u64 gid = get_global_id (0); diff --git a/OpenCL/m14623-pure.cl b/OpenCL/m14623-pure.cl index 97274d694..71503118c 100644 --- a/OpenCL/m14623-pure.cl +++ b/OpenCL/m14623-pure.cl @@ -135,7 +135,7 @@ DECLSPEC void hmac_sha256_run_V (u32x *w0, u32x *w1, u32x *w2, u32x *w3, u32x *i sha256_transform_vector (w0, w1, w2, w3, digest); } -__kernel void m14623_init (KERN_ATTR_TMPS_ESALT (luks_tmp_t, luks_t)) +KERNEL_FQ void m14623_init (KERN_ATTR_TMPS_ESALT (luks_tmp_t, luks_t)) { /** * base @@ -221,7 +221,7 @@ __kernel void m14623_init (KERN_ATTR_TMPS_ESALT (luks_tmp_t, luks_t)) } } -__kernel void m14623_loop (KERN_ATTR_TMPS_ESALT (luks_tmp_t, luks_t)) +KERNEL_FQ void m14623_loop (KERN_ATTR_TMPS_ESALT (luks_tmp_t, luks_t)) { const u64 gid = get_global_id (0); @@ -329,7 +329,7 @@ __kernel void m14623_loop (KERN_ATTR_TMPS_ESALT (luks_tmp_t, luks_t)) } } -__kernel void m14623_comp (KERN_ATTR_TMPS_ESALT (luks_tmp_t, luks_t)) +KERNEL_FQ void m14623_comp (KERN_ATTR_TMPS_ESALT (luks_tmp_t, luks_t)) { const u64 gid = get_global_id (0); diff --git a/OpenCL/m14631-pure.cl b/OpenCL/m14631-pure.cl index ae5cc6678..f6877abbc 100644 --- a/OpenCL/m14631-pure.cl +++ b/OpenCL/m14631-pure.cl @@ -151,7 +151,7 @@ DECLSPEC void hmac_sha512_run_V (u32x *w0, u32x *w1, u32x *w2, u32x *w3, u32x *w sha512_transform_vector (w0, w1, w2, w3, w4, w5, w6, w7, digest); } -__kernel void m14631_init (KERN_ATTR_TMPS_ESALT (luks_tmp_t, luks_t)) +KERNEL_FQ void m14631_init (KERN_ATTR_TMPS_ESALT (luks_tmp_t, luks_t)) { /** * base @@ -257,7 +257,7 @@ __kernel void m14631_init (KERN_ATTR_TMPS_ESALT (luks_tmp_t, luks_t)) } } -__kernel void m14631_loop (KERN_ATTR_TMPS_ESALT (luks_tmp_t, luks_t)) +KERNEL_FQ void m14631_loop (KERN_ATTR_TMPS_ESALT (luks_tmp_t, luks_t)) { const u64 gid = get_global_id (0); @@ -385,7 +385,7 @@ __kernel void m14631_loop (KERN_ATTR_TMPS_ESALT (luks_tmp_t, luks_t)) } } -__kernel void m14631_comp (KERN_ATTR_TMPS_ESALT (luks_tmp_t, luks_t)) +KERNEL_FQ void m14631_comp (KERN_ATTR_TMPS_ESALT (luks_tmp_t, luks_t)) { const u64 gid = get_global_id (0); const u64 lid = get_local_id (0); @@ -397,17 +397,17 @@ __kernel void m14631_comp (KERN_ATTR_TMPS_ESALT (luks_tmp_t, luks_t)) #ifdef REAL_SHM - __local u32 s_td0[256]; - __local u32 s_td1[256]; - __local u32 s_td2[256]; - __local u32 s_td3[256]; - __local u32 s_td4[256]; + LOCAL_AS u32 s_td0[256]; + LOCAL_AS u32 s_td1[256]; + LOCAL_AS u32 s_td2[256]; + LOCAL_AS u32 s_td3[256]; + LOCAL_AS u32 s_td4[256]; - __local u32 s_te0[256]; - __local u32 s_te1[256]; - __local u32 s_te2[256]; - __local u32 s_te3[256]; - __local u32 s_te4[256]; + LOCAL_AS u32 s_te0[256]; + LOCAL_AS u32 s_te1[256]; + LOCAL_AS u32 s_te2[256]; + LOCAL_AS u32 s_te3[256]; + LOCAL_AS u32 s_te4[256]; for (u32 i = lid; i < 256; i += lsz) { @@ -428,17 +428,17 @@ __kernel void m14631_comp (KERN_ATTR_TMPS_ESALT (luks_tmp_t, luks_t)) #else - __constant u32a *s_td0 = td0; - __constant u32a *s_td1 = td1; - __constant u32a *s_td2 = td2; - __constant u32a *s_td3 = td3; - __constant u32a *s_td4 = td4; + CONSTANT_AS u32a *s_td0 = td0; + CONSTANT_AS u32a *s_td1 = td1; + CONSTANT_AS u32a *s_td2 = td2; + CONSTANT_AS u32a *s_td3 = td3; + CONSTANT_AS u32a *s_td4 = td4; - __constant u32a *s_te0 = te0; - __constant u32a *s_te1 = te1; - __constant u32a *s_te2 = te2; - __constant u32a *s_te3 = te3; - __constant u32a *s_te4 = te4; + CONSTANT_AS u32a *s_te0 = te0; + CONSTANT_AS u32a *s_te1 = te1; + CONSTANT_AS u32a *s_te2 = te2; + CONSTANT_AS u32a *s_te3 = te3; + CONSTANT_AS u32a *s_te4 = te4; #endif diff --git a/OpenCL/m14632-pure.cl b/OpenCL/m14632-pure.cl index 7c95fe502..3dd5dbe7d 100644 --- a/OpenCL/m14632-pure.cl +++ b/OpenCL/m14632-pure.cl @@ -151,7 +151,7 @@ DECLSPEC void hmac_sha512_run_V (u32x *w0, u32x *w1, u32x *w2, u32x *w3, u32x *w sha512_transform_vector (w0, w1, w2, w3, w4, w5, w6, w7, digest); } -__kernel void m14632_init (KERN_ATTR_TMPS_ESALT (luks_tmp_t, luks_t)) +KERNEL_FQ void m14632_init (KERN_ATTR_TMPS_ESALT (luks_tmp_t, luks_t)) { /** * base @@ -257,7 +257,7 @@ __kernel void m14632_init (KERN_ATTR_TMPS_ESALT (luks_tmp_t, luks_t)) } } -__kernel void m14632_loop (KERN_ATTR_TMPS_ESALT (luks_tmp_t, luks_t)) +KERNEL_FQ void m14632_loop (KERN_ATTR_TMPS_ESALT (luks_tmp_t, luks_t)) { const u64 gid = get_global_id (0); @@ -385,7 +385,7 @@ __kernel void m14632_loop (KERN_ATTR_TMPS_ESALT (luks_tmp_t, luks_t)) } } -__kernel void m14632_comp (KERN_ATTR_TMPS_ESALT (luks_tmp_t, luks_t)) +KERNEL_FQ void m14632_comp (KERN_ATTR_TMPS_ESALT (luks_tmp_t, luks_t)) { const u64 gid = get_global_id (0); diff --git a/OpenCL/m14633-pure.cl b/OpenCL/m14633-pure.cl index 6cd5628f7..7bc00dce8 100644 --- a/OpenCL/m14633-pure.cl +++ b/OpenCL/m14633-pure.cl @@ -151,7 +151,7 @@ DECLSPEC void hmac_sha512_run_V (u32x *w0, u32x *w1, u32x *w2, u32x *w3, u32x *w sha512_transform_vector (w0, w1, w2, w3, w4, w5, w6, w7, digest); } -__kernel void m14633_init (KERN_ATTR_TMPS_ESALT (luks_tmp_t, luks_t)) +KERNEL_FQ void m14633_init (KERN_ATTR_TMPS_ESALT (luks_tmp_t, luks_t)) { /** * base @@ -257,7 +257,7 @@ __kernel void m14633_init (KERN_ATTR_TMPS_ESALT (luks_tmp_t, luks_t)) } } -__kernel void m14633_loop (KERN_ATTR_TMPS_ESALT (luks_tmp_t, luks_t)) +KERNEL_FQ void m14633_loop (KERN_ATTR_TMPS_ESALT (luks_tmp_t, luks_t)) { const u64 gid = get_global_id (0); @@ -385,7 +385,7 @@ __kernel void m14633_loop (KERN_ATTR_TMPS_ESALT (luks_tmp_t, luks_t)) } } -__kernel void m14633_comp (KERN_ATTR_TMPS_ESALT (luks_tmp_t, luks_t)) +KERNEL_FQ void m14633_comp (KERN_ATTR_TMPS_ESALT (luks_tmp_t, luks_t)) { const u64 gid = get_global_id (0); diff --git a/OpenCL/m14641-pure.cl b/OpenCL/m14641-pure.cl index 1a53b65ef..89725595a 100644 --- a/OpenCL/m14641-pure.cl +++ b/OpenCL/m14641-pure.cl @@ -129,7 +129,7 @@ DECLSPEC void hmac_ripemd160_run_V (u32x *w0, u32x *w1, u32x *w2, u32x *w3, u32x ripemd160_transform_vector (w0, w1, w2, w3, digest); } -__kernel void m14641_init (KERN_ATTR_TMPS_ESALT (luks_tmp_t, luks_t)) +KERNEL_FQ void m14641_init (KERN_ATTR_TMPS_ESALT (luks_tmp_t, luks_t)) { /** * base @@ -203,7 +203,7 @@ __kernel void m14641_init (KERN_ATTR_TMPS_ESALT (luks_tmp_t, luks_t)) } } -__kernel void m14641_loop (KERN_ATTR_TMPS_ESALT (luks_tmp_t, luks_t)) +KERNEL_FQ void m14641_loop (KERN_ATTR_TMPS_ESALT (luks_tmp_t, luks_t)) { const u64 gid = get_global_id (0); @@ -290,7 +290,7 @@ __kernel void m14641_loop (KERN_ATTR_TMPS_ESALT (luks_tmp_t, luks_t)) } } -__kernel void m14641_comp (KERN_ATTR_TMPS_ESALT (luks_tmp_t, luks_t)) +KERNEL_FQ void m14641_comp (KERN_ATTR_TMPS_ESALT (luks_tmp_t, luks_t)) { const u64 gid = get_global_id (0); const u64 lid = get_local_id (0); @@ -302,17 +302,17 @@ __kernel void m14641_comp (KERN_ATTR_TMPS_ESALT (luks_tmp_t, luks_t)) #ifdef REAL_SHM - __local u32 s_td0[256]; - __local u32 s_td1[256]; - __local u32 s_td2[256]; - __local u32 s_td3[256]; - __local u32 s_td4[256]; + LOCAL_AS u32 s_td0[256]; + LOCAL_AS u32 s_td1[256]; + LOCAL_AS u32 s_td2[256]; + LOCAL_AS u32 s_td3[256]; + LOCAL_AS u32 s_td4[256]; - __local u32 s_te0[256]; - __local u32 s_te1[256]; - __local u32 s_te2[256]; - __local u32 s_te3[256]; - __local u32 s_te4[256]; + LOCAL_AS u32 s_te0[256]; + LOCAL_AS u32 s_te1[256]; + LOCAL_AS u32 s_te2[256]; + LOCAL_AS u32 s_te3[256]; + LOCAL_AS u32 s_te4[256]; for (u32 i = lid; i < 256; i += lsz) { @@ -333,17 +333,17 @@ __kernel void m14641_comp (KERN_ATTR_TMPS_ESALT (luks_tmp_t, luks_t)) #else - __constant u32a *s_td0 = td0; - __constant u32a *s_td1 = td1; - __constant u32a *s_td2 = td2; - __constant u32a *s_td3 = td3; - __constant u32a *s_td4 = td4; + CONSTANT_AS u32a *s_td0 = td0; + CONSTANT_AS u32a *s_td1 = td1; + CONSTANT_AS u32a *s_td2 = td2; + CONSTANT_AS u32a *s_td3 = td3; + CONSTANT_AS u32a *s_td4 = td4; - __constant u32a *s_te0 = te0; - __constant u32a *s_te1 = te1; - __constant u32a *s_te2 = te2; - __constant u32a *s_te3 = te3; - __constant u32a *s_te4 = te4; + CONSTANT_AS u32a *s_te0 = te0; + CONSTANT_AS u32a *s_te1 = te1; + CONSTANT_AS u32a *s_te2 = te2; + CONSTANT_AS u32a *s_te3 = te3; + CONSTANT_AS u32a *s_te4 = te4; #endif diff --git a/OpenCL/m14642-pure.cl b/OpenCL/m14642-pure.cl index d08023e9a..11a2d694f 100644 --- a/OpenCL/m14642-pure.cl +++ b/OpenCL/m14642-pure.cl @@ -129,7 +129,7 @@ DECLSPEC void hmac_ripemd160_run_V (u32x *w0, u32x *w1, u32x *w2, u32x *w3, u32x ripemd160_transform_vector (w0, w1, w2, w3, digest); } -__kernel void m14642_init (KERN_ATTR_TMPS_ESALT (luks_tmp_t, luks_t)) +KERNEL_FQ void m14642_init (KERN_ATTR_TMPS_ESALT (luks_tmp_t, luks_t)) { /** * base @@ -203,7 +203,7 @@ __kernel void m14642_init (KERN_ATTR_TMPS_ESALT (luks_tmp_t, luks_t)) } } -__kernel void m14642_loop (KERN_ATTR_TMPS_ESALT (luks_tmp_t, luks_t)) +KERNEL_FQ void m14642_loop (KERN_ATTR_TMPS_ESALT (luks_tmp_t, luks_t)) { const u64 gid = get_global_id (0); @@ -290,7 +290,7 @@ __kernel void m14642_loop (KERN_ATTR_TMPS_ESALT (luks_tmp_t, luks_t)) } } -__kernel void m14642_comp (KERN_ATTR_TMPS_ESALT (luks_tmp_t, luks_t)) +KERNEL_FQ void m14642_comp (KERN_ATTR_TMPS_ESALT (luks_tmp_t, luks_t)) { const u64 gid = get_global_id (0); diff --git a/OpenCL/m14643-pure.cl b/OpenCL/m14643-pure.cl index 7a8a57d6a..a357925d5 100644 --- a/OpenCL/m14643-pure.cl +++ b/OpenCL/m14643-pure.cl @@ -129,7 +129,7 @@ DECLSPEC void hmac_ripemd160_run_V (u32x *w0, u32x *w1, u32x *w2, u32x *w3, u32x ripemd160_transform_vector (w0, w1, w2, w3, digest); } -__kernel void m14643_init (KERN_ATTR_TMPS_ESALT (luks_tmp_t, luks_t)) +KERNEL_FQ void m14643_init (KERN_ATTR_TMPS_ESALT (luks_tmp_t, luks_t)) { /** * base @@ -203,7 +203,7 @@ __kernel void m14643_init (KERN_ATTR_TMPS_ESALT (luks_tmp_t, luks_t)) } } -__kernel void m14643_loop (KERN_ATTR_TMPS_ESALT (luks_tmp_t, luks_t)) +KERNEL_FQ void m14643_loop (KERN_ATTR_TMPS_ESALT (luks_tmp_t, luks_t)) { const u64 gid = get_global_id (0); @@ -290,7 +290,7 @@ __kernel void m14643_loop (KERN_ATTR_TMPS_ESALT (luks_tmp_t, luks_t)) } } -__kernel void m14643_comp (KERN_ATTR_TMPS_ESALT (luks_tmp_t, luks_t)) +KERNEL_FQ void m14643_comp (KERN_ATTR_TMPS_ESALT (luks_tmp_t, luks_t)) { const u64 gid = get_global_id (0); diff --git a/OpenCL/m14700-pure.cl b/OpenCL/m14700-pure.cl index 974e24bdf..49c0c0bbc 100644 --- a/OpenCL/m14700-pure.cl +++ b/OpenCL/m14700-pure.cl @@ -70,7 +70,7 @@ DECLSPEC void hmac_sha1_run_V (u32x *w0, u32x *w1, u32x *w2, u32x *w3, u32x *ipa sha1_transform_vector (w0, w1, w2, w3, digest); } -__kernel void m14700_init (KERN_ATTR_TMPS_ESALT (pbkdf2_sha1_tmp_t, itunes_backup_t)) +KERNEL_FQ void m14700_init (KERN_ATTR_TMPS_ESALT (pbkdf2_sha1_tmp_t, itunes_backup_t)) { /** * base @@ -142,7 +142,7 @@ __kernel void m14700_init (KERN_ATTR_TMPS_ESALT (pbkdf2_sha1_tmp_t, itunes_backu } } -__kernel void m14700_loop (KERN_ATTR_TMPS_ESALT (pbkdf2_sha1_tmp_t, itunes_backup_t)) +KERNEL_FQ void m14700_loop (KERN_ATTR_TMPS_ESALT (pbkdf2_sha1_tmp_t, itunes_backup_t)) { const u64 gid = get_global_id (0); @@ -227,7 +227,7 @@ __kernel void m14700_loop (KERN_ATTR_TMPS_ESALT (pbkdf2_sha1_tmp_t, itunes_backu } } -__kernel void m14700_comp (KERN_ATTR_TMPS_ESALT (pbkdf2_sha1_tmp_t, itunes_backup_t)) +KERNEL_FQ void m14700_comp (KERN_ATTR_TMPS_ESALT (pbkdf2_sha1_tmp_t, itunes_backup_t)) { const u64 gid = get_global_id (0); const u64 lid = get_local_id (0); @@ -239,17 +239,17 @@ __kernel void m14700_comp (KERN_ATTR_TMPS_ESALT (pbkdf2_sha1_tmp_t, itunes_backu #ifdef REAL_SHM - __local u32 s_td0[256]; - __local u32 s_td1[256]; - __local u32 s_td2[256]; - __local u32 s_td3[256]; - __local u32 s_td4[256]; + LOCAL_AS u32 s_td0[256]; + LOCAL_AS u32 s_td1[256]; + LOCAL_AS u32 s_td2[256]; + LOCAL_AS u32 s_td3[256]; + LOCAL_AS u32 s_td4[256]; - __local u32 s_te0[256]; - __local u32 s_te1[256]; - __local u32 s_te2[256]; - __local u32 s_te3[256]; - __local u32 s_te4[256]; + LOCAL_AS u32 s_te0[256]; + LOCAL_AS u32 s_te1[256]; + LOCAL_AS u32 s_te2[256]; + LOCAL_AS u32 s_te3[256]; + LOCAL_AS u32 s_te4[256]; for (u32 i = lid; i < 256; i += lsz) { @@ -270,17 +270,17 @@ __kernel void m14700_comp (KERN_ATTR_TMPS_ESALT (pbkdf2_sha1_tmp_t, itunes_backu #else - __constant u32a *s_td0 = td0; - __constant u32a *s_td1 = td1; - __constant u32a *s_td2 = td2; - __constant u32a *s_td3 = td3; - __constant u32a *s_td4 = td4; + CONSTANT_AS u32a *s_td0 = td0; + CONSTANT_AS u32a *s_td1 = td1; + CONSTANT_AS u32a *s_td2 = td2; + CONSTANT_AS u32a *s_td3 = td3; + CONSTANT_AS u32a *s_td4 = td4; - __constant u32a *s_te0 = te0; - __constant u32a *s_te1 = te1; - __constant u32a *s_te2 = te2; - __constant u32a *s_te3 = te3; - __constant u32a *s_te4 = te4; + CONSTANT_AS u32a *s_te0 = te0; + CONSTANT_AS u32a *s_te1 = te1; + CONSTANT_AS u32a *s_te2 = te2; + CONSTANT_AS u32a *s_te3 = te3; + CONSTANT_AS u32a *s_te4 = te4; #endif diff --git a/OpenCL/m14800-pure.cl b/OpenCL/m14800-pure.cl index 042cb9455..d06261ad6 100644 --- a/OpenCL/m14800-pure.cl +++ b/OpenCL/m14800-pure.cl @@ -110,7 +110,7 @@ DECLSPEC void hmac_sha256_run_V (u32x *w0, u32x *w1, u32x *w2, u32x *w3, u32x *i sha256_transform_vector (w0, w1, w2, w3, digest); } -__kernel void m14800_init (KERN_ATTR_TMPS_ESALT (pbkdf2_sha256_tmp_t, itunes_backup_t)) +KERNEL_FQ void m14800_init (KERN_ATTR_TMPS_ESALT (pbkdf2_sha256_tmp_t, itunes_backup_t)) { /** * base @@ -211,7 +211,7 @@ __kernel void m14800_init (KERN_ATTR_TMPS_ESALT (pbkdf2_sha256_tmp_t, itunes_bac } } -__kernel void m14800_loop (KERN_ATTR_TMPS_ESALT (pbkdf2_sha256_tmp_t, itunes_backup_t)) +KERNEL_FQ void m14800_loop (KERN_ATTR_TMPS_ESALT (pbkdf2_sha256_tmp_t, itunes_backup_t)) { const u64 gid = get_global_id (0); @@ -317,7 +317,7 @@ __kernel void m14800_loop (KERN_ATTR_TMPS_ESALT (pbkdf2_sha256_tmp_t, itunes_bac } } -__kernel void m14800_init2 (KERN_ATTR_TMPS_ESALT (pbkdf2_sha256_tmp_t, itunes_backup_t)) +KERNEL_FQ void m14800_init2 (KERN_ATTR_TMPS_ESALT (pbkdf2_sha256_tmp_t, itunes_backup_t)) { /** * base @@ -406,7 +406,7 @@ __kernel void m14800_init2 (KERN_ATTR_TMPS_ESALT (pbkdf2_sha256_tmp_t, itunes_ba } } -__kernel void m14800_loop2 (KERN_ATTR_TMPS_ESALT (pbkdf2_sha256_tmp_t, itunes_backup_t)) +KERNEL_FQ void m14800_loop2 (KERN_ATTR_TMPS_ESALT (pbkdf2_sha256_tmp_t, itunes_backup_t)) { const u64 gid = get_global_id (0); @@ -491,7 +491,7 @@ __kernel void m14800_loop2 (KERN_ATTR_TMPS_ESALT (pbkdf2_sha256_tmp_t, itunes_ba } } -__kernel void m14800_comp (KERN_ATTR_TMPS_ESALT (pbkdf2_sha256_tmp_t, itunes_backup_t)) +KERNEL_FQ void m14800_comp (KERN_ATTR_TMPS_ESALT (pbkdf2_sha256_tmp_t, itunes_backup_t)) { const u64 gid = get_global_id (0); const u64 lid = get_local_id (0); @@ -503,17 +503,17 @@ __kernel void m14800_comp (KERN_ATTR_TMPS_ESALT (pbkdf2_sha256_tmp_t, itunes_bac #ifdef REAL_SHM - __local u32 s_td0[256]; - __local u32 s_td1[256]; - __local u32 s_td2[256]; - __local u32 s_td3[256]; - __local u32 s_td4[256]; + LOCAL_AS u32 s_td0[256]; + LOCAL_AS u32 s_td1[256]; + LOCAL_AS u32 s_td2[256]; + LOCAL_AS u32 s_td3[256]; + LOCAL_AS u32 s_td4[256]; - __local u32 s_te0[256]; - __local u32 s_te1[256]; - __local u32 s_te2[256]; - __local u32 s_te3[256]; - __local u32 s_te4[256]; + LOCAL_AS u32 s_te0[256]; + LOCAL_AS u32 s_te1[256]; + LOCAL_AS u32 s_te2[256]; + LOCAL_AS u32 s_te3[256]; + LOCAL_AS u32 s_te4[256]; for (u32 i = lid; i < 256; i += lsz) { @@ -534,17 +534,17 @@ __kernel void m14800_comp (KERN_ATTR_TMPS_ESALT (pbkdf2_sha256_tmp_t, itunes_bac #else - __constant u32a *s_td0 = td0; - __constant u32a *s_td1 = td1; - __constant u32a *s_td2 = td2; - __constant u32a *s_td3 = td3; - __constant u32a *s_td4 = td4; + CONSTANT_AS u32a *s_td0 = td0; + CONSTANT_AS u32a *s_td1 = td1; + CONSTANT_AS u32a *s_td2 = td2; + CONSTANT_AS u32a *s_td3 = td3; + CONSTANT_AS u32a *s_td4 = td4; - __constant u32a *s_te0 = te0; - __constant u32a *s_te1 = te1; - __constant u32a *s_te2 = te2; - __constant u32a *s_te3 = te3; - __constant u32a *s_te4 = te4; + CONSTANT_AS u32a *s_te0 = te0; + CONSTANT_AS u32a *s_te1 = te1; + CONSTANT_AS u32a *s_te2 = te2; + CONSTANT_AS u32a *s_te3 = te3; + CONSTANT_AS u32a *s_te4 = te4; #endif diff --git a/OpenCL/m14900_a0-optimized.cl b/OpenCL/m14900_a0-optimized.cl index a09996f16..03c5c27a9 100644 --- a/OpenCL/m14900_a0-optimized.cl +++ b/OpenCL/m14900_a0-optimized.cl @@ -15,7 +15,7 @@ #include "inc_simd.cl" #endif -__constant u8a c_ftable[256] = +CONSTANT_AS u8a c_ftable[256] = { 0xa3, 0xd7, 0x09, 0x83, 0xf8, 0x48, 0xf6, 0xf4, 0xb3, 0x21, 0x15, 0x78, 0x99, 0xb1, 0xaf, 0xf9, @@ -51,7 +51,7 @@ __constant u8a c_ftable[256] = 0xbd, 0xa8, 0x3a, 0x01, 0x05, 0x59, 0x2a, 0x46 }; -DECLSPEC void g (__local u8 *s_ftable, const u32 *key, const int k, const u32 *wx, u32 *out) +DECLSPEC void g (LOCAL_AS u8 *s_ftable, const u32 *key, const int k, const u32 *wx, u32 *out) { const u32 g1 = wx[1]; const u32 g2 = wx[0]; @@ -64,7 +64,7 @@ DECLSPEC void g (__local u8 *s_ftable, const u32 *key, const int k, const u32 *w out[1] = g5; } -DECLSPEC u32 skip32 (__local u8 *s_ftable, const u32 KP, const u32 *key) +DECLSPEC u32 skip32 (LOCAL_AS u8 *s_ftable, const u32 KP, const u32 *key) { u32 wl[2]; u32 wr[2]; @@ -104,7 +104,7 @@ DECLSPEC u32 skip32 (__local u8 *s_ftable, const u32 KP, const u32 *key) return r; } -__kernel void m14900_m04 (KERN_ATTR_RULES ()) +KERNEL_FQ void m14900_m04 (KERN_ATTR_RULES ()) { /** * modifier @@ -118,7 +118,7 @@ __kernel void m14900_m04 (KERN_ATTR_RULES ()) * s_ftable */ - __local u8 s_ftable[256]; + LOCAL_AS u8 s_ftable[256]; for (u32 i = lid; i < 256; i += lsz) { @@ -187,15 +187,15 @@ __kernel void m14900_m04 (KERN_ATTR_RULES ()) } } -__kernel void m14900_m08 (KERN_ATTR_RULES ()) +KERNEL_FQ void m14900_m08 (KERN_ATTR_RULES ()) { } -__kernel void m14900_m16 (KERN_ATTR_RULES ()) +KERNEL_FQ void m14900_m16 (KERN_ATTR_RULES ()) { } -__kernel void m14900_s04 (KERN_ATTR_RULES ()) +KERNEL_FQ void m14900_s04 (KERN_ATTR_RULES ()) { /** * modifier @@ -209,7 +209,7 @@ __kernel void m14900_s04 (KERN_ATTR_RULES ()) * s_ftable */ - __local u8 s_ftable[256]; + LOCAL_AS u8 s_ftable[256]; for (u32 i = lid; i < 256; i += lsz) { @@ -290,10 +290,10 @@ __kernel void m14900_s04 (KERN_ATTR_RULES ()) } } -__kernel void m14900_s08 (KERN_ATTR_RULES ()) +KERNEL_FQ void m14900_s08 (KERN_ATTR_RULES ()) { } -__kernel void m14900_s16 (KERN_ATTR_RULES ()) +KERNEL_FQ void m14900_s16 (KERN_ATTR_RULES ()) { } diff --git a/OpenCL/m14900_a1-optimized.cl b/OpenCL/m14900_a1-optimized.cl index 98b37a526..42c7dd6c9 100644 --- a/OpenCL/m14900_a1-optimized.cl +++ b/OpenCL/m14900_a1-optimized.cl @@ -13,7 +13,7 @@ #include "inc_simd.cl" #endif -__constant u8a c_ftable[256] = +CONSTANT_AS u8a c_ftable[256] = { 0xa3, 0xd7, 0x09, 0x83, 0xf8, 0x48, 0xf6, 0xf4, 0xb3, 0x21, 0x15, 0x78, 0x99, 0xb1, 0xaf, 0xf9, @@ -49,7 +49,7 @@ __constant u8a c_ftable[256] = 0xbd, 0xa8, 0x3a, 0x01, 0x05, 0x59, 0x2a, 0x46 }; -DECLSPEC void g (__local u8 *s_ftable, const u32 *key, const int k, const u32 *wx, u32 *out) +DECLSPEC void g (LOCAL_AS u8 *s_ftable, const u32 *key, const int k, const u32 *wx, u32 *out) { const u32 g1 = wx[1]; const u32 g2 = wx[0]; @@ -62,7 +62,7 @@ DECLSPEC void g (__local u8 *s_ftable, const u32 *key, const int k, const u32 *w out[1] = g5; } -DECLSPEC u32 skip32 (__local u8 *s_ftable, const u32 KP, const u32 *key) +DECLSPEC u32 skip32 (LOCAL_AS u8 *s_ftable, const u32 KP, const u32 *key) { u32 wl[2]; u32 wr[2]; @@ -102,7 +102,7 @@ DECLSPEC u32 skip32 (__local u8 *s_ftable, const u32 KP, const u32 *key) return r; } -__kernel void m14900_m04 (KERN_ATTR_BASIC ()) +KERNEL_FQ void m14900_m04 (KERN_ATTR_BASIC ()) { /** * modifier @@ -116,7 +116,7 @@ __kernel void m14900_m04 (KERN_ATTR_BASIC ()) * s_ftable */ - __local u8 s_ftable[256]; + LOCAL_AS u8 s_ftable[256]; for (u32 i = lid; i < 256; i += lsz) { @@ -249,15 +249,15 @@ __kernel void m14900_m04 (KERN_ATTR_BASIC ()) } } -__kernel void m14900_m08 (KERN_ATTR_BASIC ()) +KERNEL_FQ void m14900_m08 (KERN_ATTR_BASIC ()) { } -__kernel void m14900_m16 (KERN_ATTR_BASIC ()) +KERNEL_FQ void m14900_m16 (KERN_ATTR_BASIC ()) { } -__kernel void m14900_s04 (KERN_ATTR_BASIC ()) +KERNEL_FQ void m14900_s04 (KERN_ATTR_BASIC ()) { /** * modifier @@ -271,7 +271,7 @@ __kernel void m14900_s04 (KERN_ATTR_BASIC ()) * s_ftable */ - __local u8 s_ftable[256]; + LOCAL_AS u8 s_ftable[256]; for (u32 i = lid; i < 256; i += lsz) { @@ -416,10 +416,10 @@ __kernel void m14900_s04 (KERN_ATTR_BASIC ()) } } -__kernel void m14900_s08 (KERN_ATTR_BASIC ()) +KERNEL_FQ void m14900_s08 (KERN_ATTR_BASIC ()) { } -__kernel void m14900_s16 (KERN_ATTR_BASIC ()) +KERNEL_FQ void m14900_s16 (KERN_ATTR_BASIC ()) { } diff --git a/OpenCL/m14900_a3-optimized.cl b/OpenCL/m14900_a3-optimized.cl index 41533554f..b8a7ce4b1 100644 --- a/OpenCL/m14900_a3-optimized.cl +++ b/OpenCL/m14900_a3-optimized.cl @@ -13,7 +13,7 @@ #include "inc_simd.cl" #endif -__constant u8a c_ftable[256] = +CONSTANT_AS u8a c_ftable[256] = { 0xa3, 0xd7, 0x09, 0x83, 0xf8, 0x48, 0xf6, 0xf4, 0xb3, 0x21, 0x15, 0x78, 0x99, 0xb1, 0xaf, 0xf9, @@ -49,7 +49,7 @@ __constant u8a c_ftable[256] = 0xbd, 0xa8, 0x3a, 0x01, 0x05, 0x59, 0x2a, 0x46 }; -DECLSPEC void g (__local u8 *s_ftable, const u32 *key, const int k, const u32 *wx, u32 *out) +DECLSPEC void g (LOCAL_AS u8 *s_ftable, const u32 *key, const int k, const u32 *wx, u32 *out) { const u32 g1 = wx[1]; const u32 g2 = wx[0]; @@ -62,7 +62,7 @@ DECLSPEC void g (__local u8 *s_ftable, const u32 *key, const int k, const u32 *w out[1] = g5; } -DECLSPEC u32 skip32 (__local u8 *s_ftable, const u32 KP, const u32 *key) +DECLSPEC u32 skip32 (LOCAL_AS u8 *s_ftable, const u32 KP, const u32 *key) { u32 wl[2]; u32 wr[2]; @@ -102,7 +102,7 @@ DECLSPEC u32 skip32 (__local u8 *s_ftable, const u32 KP, const u32 *key) return r; } -DECLSPEC void m14900m (__local u8 *s_ftable, u32 *w0, u32 *w1, u32 *w2, u32 *w3, const u32 pw_len, KERN_ATTR_BASIC ()) +DECLSPEC void m14900m (LOCAL_AS u8 *s_ftable, u32 *w0, u32 *w1, u32 *w2, u32 *w3, const u32 pw_len, KERN_ATTR_BASIC ()) { /** * modifier @@ -150,7 +150,7 @@ DECLSPEC void m14900m (__local u8 *s_ftable, u32 *w0, u32 *w1, u32 *w2, u32 *w3, } } -DECLSPEC void m14900s (__local u8 *s_ftable, u32 *w0, u32 *w1, u32 *w2, u32 *w3, const u32 pw_len, KERN_ATTR_BASIC ()) +DECLSPEC void m14900s (LOCAL_AS u8 *s_ftable, u32 *w0, u32 *w1, u32 *w2, u32 *w3, const u32 pw_len, KERN_ATTR_BASIC ()) { /** * modifier @@ -210,7 +210,7 @@ DECLSPEC void m14900s (__local u8 *s_ftable, u32 *w0, u32 *w1, u32 *w2, u32 *w3, } } -__kernel void m14900_m04 (KERN_ATTR_BASIC ()) +KERNEL_FQ void m14900_m04 (KERN_ATTR_BASIC ()) { /** * modifier @@ -224,7 +224,7 @@ __kernel void m14900_m04 (KERN_ATTR_BASIC ()) * sbox, kbox */ - __local u8 s_ftable[256]; + LOCAL_AS u8 s_ftable[256]; for (u32 i = lid; i < 256; i += lsz) { @@ -276,15 +276,15 @@ __kernel void m14900_m04 (KERN_ATTR_BASIC ()) m14900m (s_ftable, 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_extra0_buf, d_extra1_buf, d_extra2_buf, d_extra3_buf, bitmap_mask, bitmap_shift1, bitmap_shift2, salt_pos, loop_pos, loop_cnt, il_cnt, digests_cnt, digests_offset, combs_mode, gid_max); } -__kernel void m14900_m08 (KERN_ATTR_BASIC ()) +KERNEL_FQ void m14900_m08 (KERN_ATTR_BASIC ()) { } -__kernel void m14900_m16 (KERN_ATTR_BASIC ()) +KERNEL_FQ void m14900_m16 (KERN_ATTR_BASIC ()) { } -__kernel void m14900_s04 (KERN_ATTR_BASIC ()) +KERNEL_FQ void m14900_s04 (KERN_ATTR_BASIC ()) { /** * modifier @@ -298,7 +298,7 @@ __kernel void m14900_s04 (KERN_ATTR_BASIC ()) * sbox, kbox */ - __local u8 s_ftable[256]; + LOCAL_AS u8 s_ftable[256]; for (u32 i = lid; i < 256; i += lsz) { @@ -350,10 +350,10 @@ __kernel void m14900_s04 (KERN_ATTR_BASIC ()) m14900s (s_ftable, 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_extra0_buf, d_extra1_buf, d_extra2_buf, d_extra3_buf, bitmap_mask, bitmap_shift1, bitmap_shift2, salt_pos, loop_pos, loop_cnt, il_cnt, digests_cnt, digests_offset, combs_mode, gid_max); } -__kernel void m14900_s08 (KERN_ATTR_BASIC ()) +KERNEL_FQ void m14900_s08 (KERN_ATTR_BASIC ()) { } -__kernel void m14900_s16 (KERN_ATTR_BASIC ()) +KERNEL_FQ void m14900_s16 (KERN_ATTR_BASIC ()) { } diff --git a/OpenCL/m15000_a0-optimized.cl b/OpenCL/m15000_a0-optimized.cl index fc3655781..7731d9601 100644 --- a/OpenCL/m15000_a0-optimized.cl +++ b/OpenCL/m15000_a0-optimized.cl @@ -114,7 +114,7 @@ DECLSPEC void sha512_transform_intern (const u32x *w0, const u32x *w1, const u32 digest[7] = h; } -__kernel void m15000_m04 (KERN_ATTR_RULES ()) +KERNEL_FQ void m15000_m04 (KERN_ATTR_RULES ()) { /** * modifier @@ -311,15 +311,15 @@ __kernel void m15000_m04 (KERN_ATTR_RULES ()) } } -__kernel void m15000_m08 (KERN_ATTR_RULES ()) +KERNEL_FQ void m15000_m08 (KERN_ATTR_RULES ()) { } -__kernel void m15000_m16 (KERN_ATTR_RULES ()) +KERNEL_FQ void m15000_m16 (KERN_ATTR_RULES ()) { } -__kernel void m15000_s04 (KERN_ATTR_RULES ()) +KERNEL_FQ void m15000_s04 (KERN_ATTR_RULES ()) { /** * modifier @@ -528,10 +528,10 @@ __kernel void m15000_s04 (KERN_ATTR_RULES ()) } } -__kernel void m15000_s08 (KERN_ATTR_RULES ()) +KERNEL_FQ void m15000_s08 (KERN_ATTR_RULES ()) { } -__kernel void m15000_s16 (KERN_ATTR_RULES ()) +KERNEL_FQ void m15000_s16 (KERN_ATTR_RULES ()) { } diff --git a/OpenCL/m15000_a0-pure.cl b/OpenCL/m15000_a0-pure.cl index e7f5b40c4..5c9cfc673 100644 --- a/OpenCL/m15000_a0-pure.cl +++ b/OpenCL/m15000_a0-pure.cl @@ -15,7 +15,7 @@ #include "inc_hash_sha512.cl" #endif -__kernel void m15000_mxx (KERN_ATTR_RULES ()) +KERNEL_FQ void m15000_mxx (KERN_ATTR_RULES ()) { /** * modifier @@ -70,7 +70,7 @@ __kernel void m15000_mxx (KERN_ATTR_RULES ()) } } -__kernel void m15000_sxx (KERN_ATTR_RULES ()) +KERNEL_FQ void m15000_sxx (KERN_ATTR_RULES ()) { /** * modifier diff --git a/OpenCL/m15000_a1-optimized.cl b/OpenCL/m15000_a1-optimized.cl index 7c6746bee..f9fd5b787 100644 --- a/OpenCL/m15000_a1-optimized.cl +++ b/OpenCL/m15000_a1-optimized.cl @@ -112,7 +112,7 @@ DECLSPEC void sha512_transform_intern (const u32x *w0, const u32x *w1, const u32 digest[7] = h; } -__kernel void m15000_m04 (KERN_ATTR_BASIC ()) +KERNEL_FQ void m15000_m04 (KERN_ATTR_BASIC ()) { /** * modifier @@ -369,15 +369,15 @@ __kernel void m15000_m04 (KERN_ATTR_BASIC ()) } } -__kernel void m15000_m08 (KERN_ATTR_BASIC ()) +KERNEL_FQ void m15000_m08 (KERN_ATTR_BASIC ()) { } -__kernel void m15000_m16 (KERN_ATTR_BASIC ()) +KERNEL_FQ void m15000_m16 (KERN_ATTR_BASIC ()) { } -__kernel void m15000_s04 (KERN_ATTR_BASIC ()) +KERNEL_FQ void m15000_s04 (KERN_ATTR_BASIC ()) { /** * modifier @@ -646,10 +646,10 @@ __kernel void m15000_s04 (KERN_ATTR_BASIC ()) } } -__kernel void m15000_s08 (KERN_ATTR_BASIC ()) +KERNEL_FQ void m15000_s08 (KERN_ATTR_BASIC ()) { } -__kernel void m15000_s16 (KERN_ATTR_BASIC ()) +KERNEL_FQ void m15000_s16 (KERN_ATTR_BASIC ()) { } diff --git a/OpenCL/m15000_a1-pure.cl b/OpenCL/m15000_a1-pure.cl index 63b5ef56b..9beb27c8a 100644 --- a/OpenCL/m15000_a1-pure.cl +++ b/OpenCL/m15000_a1-pure.cl @@ -13,7 +13,7 @@ #include "inc_hash_sha512.cl" #endif -__kernel void m15000_mxx (KERN_ATTR_BASIC ()) +KERNEL_FQ void m15000_mxx (KERN_ATTR_BASIC ()) { /** * modifier @@ -66,7 +66,7 @@ __kernel void m15000_mxx (KERN_ATTR_BASIC ()) } } -__kernel void m15000_sxx (KERN_ATTR_BASIC ()) +KERNEL_FQ void m15000_sxx (KERN_ATTR_BASIC ()) { /** * modifier diff --git a/OpenCL/m15000_a3-optimized.cl b/OpenCL/m15000_a3-optimized.cl index cae2645b7..6e5285f95 100644 --- a/OpenCL/m15000_a3-optimized.cl +++ b/OpenCL/m15000_a3-optimized.cl @@ -446,7 +446,7 @@ DECLSPEC void m15000s (u32 *w, const u32 pw_len, KERN_ATTR_VECTOR ()) } } -__kernel void m15000_m04 (KERN_ATTR_VECTOR ()) +KERNEL_FQ void m15000_m04 (KERN_ATTR_VECTOR ()) { /** * base @@ -484,7 +484,7 @@ __kernel void m15000_m04 (KERN_ATTR_VECTOR ()) m15000m (w, pw_len, pws, rules_buf, combs_buf, words_buf_r, 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_extra0_buf, d_extra1_buf, d_extra2_buf, d_extra3_buf, bitmap_mask, bitmap_shift1, bitmap_shift2, salt_pos, loop_pos, loop_cnt, il_cnt, digests_cnt, digests_offset, combs_mode, gid_max); } -__kernel void m15000_m08 (KERN_ATTR_VECTOR ()) +KERNEL_FQ void m15000_m08 (KERN_ATTR_VECTOR ()) { /** * base @@ -522,7 +522,7 @@ __kernel void m15000_m08 (KERN_ATTR_VECTOR ()) m15000m (w, pw_len, pws, rules_buf, combs_buf, words_buf_r, 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_extra0_buf, d_extra1_buf, d_extra2_buf, d_extra3_buf, bitmap_mask, bitmap_shift1, bitmap_shift2, salt_pos, loop_pos, loop_cnt, il_cnt, digests_cnt, digests_offset, combs_mode, gid_max); } -__kernel void m15000_m16 (KERN_ATTR_VECTOR ()) +KERNEL_FQ void m15000_m16 (KERN_ATTR_VECTOR ()) { /** * base @@ -560,7 +560,7 @@ __kernel void m15000_m16 (KERN_ATTR_VECTOR ()) m15000m (w, pw_len, pws, rules_buf, combs_buf, words_buf_r, 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_extra0_buf, d_extra1_buf, d_extra2_buf, d_extra3_buf, bitmap_mask, bitmap_shift1, bitmap_shift2, salt_pos, loop_pos, loop_cnt, il_cnt, digests_cnt, digests_offset, combs_mode, gid_max); } -__kernel void m15000_s04 (KERN_ATTR_VECTOR ()) +KERNEL_FQ void m15000_s04 (KERN_ATTR_VECTOR ()) { /** * base @@ -598,7 +598,7 @@ __kernel void m15000_s04 (KERN_ATTR_VECTOR ()) m15000s (w, pw_len, pws, rules_buf, combs_buf, words_buf_r, 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_extra0_buf, d_extra1_buf, d_extra2_buf, d_extra3_buf, bitmap_mask, bitmap_shift1, bitmap_shift2, salt_pos, loop_pos, loop_cnt, il_cnt, digests_cnt, digests_offset, combs_mode, gid_max); } -__kernel void m15000_s08 (KERN_ATTR_VECTOR ()) +KERNEL_FQ void m15000_s08 (KERN_ATTR_VECTOR ()) { /** * base @@ -636,7 +636,7 @@ __kernel void m15000_s08 (KERN_ATTR_VECTOR ()) m15000s (w, pw_len, pws, rules_buf, combs_buf, words_buf_r, 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_extra0_buf, d_extra1_buf, d_extra2_buf, d_extra3_buf, bitmap_mask, bitmap_shift1, bitmap_shift2, salt_pos, loop_pos, loop_cnt, il_cnt, digests_cnt, digests_offset, combs_mode, gid_max); } -__kernel void m15000_s16 (KERN_ATTR_VECTOR ()) +KERNEL_FQ void m15000_s16 (KERN_ATTR_VECTOR ()) { /** * base diff --git a/OpenCL/m15000_a3-pure.cl b/OpenCL/m15000_a3-pure.cl index c27289742..29511bca5 100644 --- a/OpenCL/m15000_a3-pure.cl +++ b/OpenCL/m15000_a3-pure.cl @@ -13,7 +13,7 @@ #include "inc_hash_sha512.cl" #endif -__kernel void m15000_mxx (KERN_ATTR_VECTOR ()) +KERNEL_FQ void m15000_mxx (KERN_ATTR_VECTOR ()) { /** * modifier @@ -79,7 +79,7 @@ __kernel void m15000_mxx (KERN_ATTR_VECTOR ()) } } -__kernel void m15000_sxx (KERN_ATTR_VECTOR ()) +KERNEL_FQ void m15000_sxx (KERN_ATTR_VECTOR ()) { /** * modifier diff --git a/OpenCL/m15100-pure.cl b/OpenCL/m15100-pure.cl index 6c3be4bb8..18756cfa4 100644 --- a/OpenCL/m15100-pure.cl +++ b/OpenCL/m15100-pure.cl @@ -63,7 +63,7 @@ DECLSPEC void hmac_sha1_run_V (u32x *w0, u32x *w1, u32x *w2, u32x *w3, u32x *ipa sha1_transform_vector (w0, w1, w2, w3, digest); } -__kernel void m15100_init (KERN_ATTR_TMPS (pbkdf1_sha1_tmp_t)) +KERNEL_FQ void m15100_init (KERN_ATTR_TMPS (pbkdf1_sha1_tmp_t)) { /** * base @@ -100,7 +100,7 @@ __kernel void m15100_init (KERN_ATTR_TMPS (pbkdf1_sha1_tmp_t)) tmps[gid].out[4] = sha1_hmac_ctx.opad.h[4]; } -__kernel void m15100_loop (KERN_ATTR_TMPS (pbkdf1_sha1_tmp_t)) +KERNEL_FQ void m15100_loop (KERN_ATTR_TMPS (pbkdf1_sha1_tmp_t)) { const u64 gid = get_global_id (0); @@ -163,7 +163,7 @@ __kernel void m15100_loop (KERN_ATTR_TMPS (pbkdf1_sha1_tmp_t)) unpackv (tmps, out, gid, 4, out[4]); } -__kernel void m15100_comp (KERN_ATTR_TMPS (pbkdf1_sha1_tmp_t)) +KERNEL_FQ void m15100_comp (KERN_ATTR_TMPS (pbkdf1_sha1_tmp_t)) { /** * base diff --git a/OpenCL/m15300-pure.cl b/OpenCL/m15300-pure.cl index d2f1c023f..a99d2f0ad 100644 --- a/OpenCL/m15300-pure.cl +++ b/OpenCL/m15300-pure.cl @@ -91,7 +91,7 @@ DECLSPEC void hmac_sha1_run_V (u32x *w0, u32x *w1, u32x *w2, u32x *w3, u32x *ipa sha1_transform_vector (w0, w1, w2, w3, digest); } -__kernel void m15300_init (KERN_ATTR_TMPS_ESALT (dpapimk_tmp_v1_t, dpapimk_t)) +KERNEL_FQ void m15300_init (KERN_ATTR_TMPS_ESALT (dpapimk_tmp_v1_t, dpapimk_t)) { /** * base @@ -288,7 +288,7 @@ __kernel void m15300_init (KERN_ATTR_TMPS_ESALT (dpapimk_tmp_v1_t, dpapimk_t)) } } -__kernel void m15300_loop (KERN_ATTR_TMPS_ESALT (dpapimk_tmp_v1_t, dpapimk_t)) +KERNEL_FQ void m15300_loop (KERN_ATTR_TMPS_ESALT (dpapimk_tmp_v1_t, dpapimk_t)) { /** * base @@ -377,7 +377,7 @@ __kernel void m15300_loop (KERN_ATTR_TMPS_ESALT (dpapimk_tmp_v1_t, dpapimk_t)) } } -__kernel void m15300_comp (KERN_ATTR_TMPS_ESALT (dpapimk_tmp_v1_t, dpapimk_t)) +KERNEL_FQ void m15300_comp (KERN_ATTR_TMPS_ESALT (dpapimk_tmp_v1_t, dpapimk_t)) { const u64 gid = get_global_id (0); const u64 lid = get_local_id (0); @@ -389,8 +389,8 @@ __kernel void m15300_comp (KERN_ATTR_TMPS_ESALT (dpapimk_tmp_v1_t, dpapimk_t)) #ifdef REAL_SHM - __local u32 s_SPtrans[8][64]; - __local u32 s_skb[8][64]; + LOCAL_AS u32 s_SPtrans[8][64]; + LOCAL_AS u32 s_skb[8][64]; for (u32 i = lid; i < 64; i += lsz) { @@ -417,8 +417,8 @@ __kernel void m15300_comp (KERN_ATTR_TMPS_ESALT (dpapimk_tmp_v1_t, dpapimk_t)) #else - __constant u32a (*s_SPtrans)[64] = c_SPtrans; - __constant u32a (*s_skb)[64] = c_skb; + CONSTANT_AS u32a (*s_SPtrans)[64] = c_SPtrans; + CONSTANT_AS u32a (*s_skb)[64] = c_skb; #endif diff --git a/OpenCL/m15400_a0-optimized.cl b/OpenCL/m15400_a0-optimized.cl index 5e1d1335c..736e377da 100644 --- a/OpenCL/m15400_a0-optimized.cl +++ b/OpenCL/m15400_a0-optimized.cl @@ -207,7 +207,7 @@ DECLSPEC void chacha20_transform (const u32x *w0, const u32x *w1, const u32 *pos } } -__kernel void m15400_m04 (KERN_ATTR_RULES_ESALT (chacha20_t)) +KERNEL_FQ void m15400_m04 (KERN_ATTR_RULES_ESALT (chacha20_t)) { /** * modifier @@ -274,15 +274,15 @@ __kernel void m15400_m04 (KERN_ATTR_RULES_ESALT (chacha20_t)) } } -__kernel void m15400_m08 (KERN_ATTR_RULES_ESALT (chacha20_t)) +KERNEL_FQ void m15400_m08 (KERN_ATTR_RULES_ESALT (chacha20_t)) { } -__kernel void m15400_m16 (KERN_ATTR_RULES_ESALT (chacha20_t)) +KERNEL_FQ void m15400_m16 (KERN_ATTR_RULES_ESALT (chacha20_t)) { } -__kernel void m15400_s04 (KERN_ATTR_RULES_ESALT (chacha20_t)) +KERNEL_FQ void m15400_s04 (KERN_ATTR_RULES_ESALT (chacha20_t)) { /** * modifier @@ -364,10 +364,10 @@ __kernel void m15400_s04 (KERN_ATTR_RULES_ESALT (chacha20_t)) } } -__kernel void m15400_s08 (KERN_ATTR_RULES_ESALT (chacha20_t)) +KERNEL_FQ void m15400_s08 (KERN_ATTR_RULES_ESALT (chacha20_t)) { } -__kernel void m15400_s16 (KERN_ATTR_RULES_ESALT (chacha20_t)) +KERNEL_FQ void m15400_s16 (KERN_ATTR_RULES_ESALT (chacha20_t)) { } diff --git a/OpenCL/m15400_a1-optimized.cl b/OpenCL/m15400_a1-optimized.cl index 10d2c22e5..47b76a1a8 100644 --- a/OpenCL/m15400_a1-optimized.cl +++ b/OpenCL/m15400_a1-optimized.cl @@ -207,7 +207,7 @@ DECLSPEC void chacha20_transform (const u32x *w0, const u32x *w1, const u32 *pos } } -__kernel void m15400_m04 (KERN_ATTR_ESALT (chacha20_t)) +KERNEL_FQ void m15400_m04 (KERN_ATTR_ESALT (chacha20_t)) { /** * modifier @@ -326,15 +326,15 @@ __kernel void m15400_m04 (KERN_ATTR_ESALT (chacha20_t)) } } -__kernel void m15400_m08 (KERN_ATTR_ESALT (chacha20_t)) +KERNEL_FQ void m15400_m08 (KERN_ATTR_ESALT (chacha20_t)) { } -__kernel void m15400_m16 (KERN_ATTR_ESALT (chacha20_t)) +KERNEL_FQ void m15400_m16 (KERN_ATTR_ESALT (chacha20_t)) { } -__kernel void m15400_s04 (KERN_ATTR_ESALT (chacha20_t)) +KERNEL_FQ void m15400_s04 (KERN_ATTR_ESALT (chacha20_t)) { /** * modifier @@ -468,10 +468,10 @@ __kernel void m15400_s04 (KERN_ATTR_ESALT (chacha20_t)) } } -__kernel void m15400_s08 (KERN_ATTR_ESALT (chacha20_t)) +KERNEL_FQ void m15400_s08 (KERN_ATTR_ESALT (chacha20_t)) { } -__kernel void m15400_s16 (KERN_ATTR_ESALT (chacha20_t)) +KERNEL_FQ void m15400_s16 (KERN_ATTR_ESALT (chacha20_t)) { } diff --git a/OpenCL/m15400_a3-optimized.cl b/OpenCL/m15400_a3-optimized.cl index 57c08fc49..c45903803 100644 --- a/OpenCL/m15400_a3-optimized.cl +++ b/OpenCL/m15400_a3-optimized.cl @@ -205,7 +205,7 @@ DECLSPEC void chacha20_transform (const u32x *w0, const u32x *w1, const u32 *pos } } -__kernel void m15400_m04 (KERN_ATTR_VECTOR_ESALT (chacha20_t)) +KERNEL_FQ void m15400_m04 (KERN_ATTR_VECTOR_ESALT (chacha20_t)) { /** * modifier @@ -284,15 +284,15 @@ __kernel void m15400_m04 (KERN_ATTR_VECTOR_ESALT (chacha20_t)) } } -__kernel void m15400_m08 (KERN_ATTR_ESALT (chacha20_t)) +KERNEL_FQ void m15400_m08 (KERN_ATTR_ESALT (chacha20_t)) { } -__kernel void m15400_m16 (KERN_ATTR_ESALT (chacha20_t)) +KERNEL_FQ void m15400_m16 (KERN_ATTR_ESALT (chacha20_t)) { } -__kernel void m15400_s04 (KERN_ATTR_VECTOR_ESALT (chacha20_t)) +KERNEL_FQ void m15400_s04 (KERN_ATTR_VECTOR_ESALT (chacha20_t)) { /** * modifier @@ -383,10 +383,10 @@ __kernel void m15400_s04 (KERN_ATTR_VECTOR_ESALT (chacha20_t)) } } -__kernel void m15400_s08 (KERN_ATTR_ESALT (chacha20_t)) +KERNEL_FQ void m15400_s08 (KERN_ATTR_ESALT (chacha20_t)) { } -__kernel void m15400_s16 (KERN_ATTR_ESALT (chacha20_t)) +KERNEL_FQ void m15400_s16 (KERN_ATTR_ESALT (chacha20_t)) { } diff --git a/OpenCL/m15500_a0-optimized.cl b/OpenCL/m15500_a0-optimized.cl index 15eaebf8a..345101b44 100644 --- a/OpenCL/m15500_a0-optimized.cl +++ b/OpenCL/m15500_a0-optimized.cl @@ -15,7 +15,7 @@ #include "inc_hash_sha1.cl" #endif -__kernel void m15500_m04 (KERN_ATTR_RULES ()) +KERNEL_FQ void m15500_m04 (KERN_ATTR_RULES ()) { /** * modifier @@ -263,15 +263,15 @@ __kernel void m15500_m04 (KERN_ATTR_RULES ()) } } -__kernel void m15500_m08 (KERN_ATTR_RULES ()) +KERNEL_FQ void m15500_m08 (KERN_ATTR_RULES ()) { } -__kernel void m15500_m16 (KERN_ATTR_RULES ()) +KERNEL_FQ void m15500_m16 (KERN_ATTR_RULES ()) { } -__kernel void m15500_s04 (KERN_ATTR_RULES ()) +KERNEL_FQ void m15500_s04 (KERN_ATTR_RULES ()) { /** * modifier @@ -531,10 +531,10 @@ __kernel void m15500_s04 (KERN_ATTR_RULES ()) } } -__kernel void m15500_s08 (KERN_ATTR_RULES ()) +KERNEL_FQ void m15500_s08 (KERN_ATTR_RULES ()) { } -__kernel void m15500_s16 (KERN_ATTR_RULES ()) +KERNEL_FQ void m15500_s16 (KERN_ATTR_RULES ()) { } diff --git a/OpenCL/m15500_a0-pure.cl b/OpenCL/m15500_a0-pure.cl index cb87d526c..7b3c2bfe6 100644 --- a/OpenCL/m15500_a0-pure.cl +++ b/OpenCL/m15500_a0-pure.cl @@ -15,7 +15,7 @@ #include "inc_hash_sha1.cl" #endif -__kernel void m15500_mxx (KERN_ATTR_RULES ()) +KERNEL_FQ void m15500_mxx (KERN_ATTR_RULES ()) { /** * modifier @@ -76,7 +76,7 @@ __kernel void m15500_mxx (KERN_ATTR_RULES ()) } } -__kernel void m15500_sxx (KERN_ATTR_RULES ()) +KERNEL_FQ void m15500_sxx (KERN_ATTR_RULES ()) { /** * modifier diff --git a/OpenCL/m15500_a1-optimized.cl b/OpenCL/m15500_a1-optimized.cl index 561f72717..3c0969f1c 100644 --- a/OpenCL/m15500_a1-optimized.cl +++ b/OpenCL/m15500_a1-optimized.cl @@ -13,7 +13,7 @@ #include "inc_hash_sha1.cl" #endif -__kernel void m15500_m04 (KERN_ATTR_BASIC ()) +KERNEL_FQ void m15500_m04 (KERN_ATTR_BASIC ()) { /** * modifier @@ -321,15 +321,15 @@ __kernel void m15500_m04 (KERN_ATTR_BASIC ()) } } -__kernel void m15500_m08 (KERN_ATTR_BASIC ()) +KERNEL_FQ void m15500_m08 (KERN_ATTR_BASIC ()) { } -__kernel void m15500_m16 (KERN_ATTR_BASIC ()) +KERNEL_FQ void m15500_m16 (KERN_ATTR_BASIC ()) { } -__kernel void m15500_s04 (KERN_ATTR_BASIC ()) +KERNEL_FQ void m15500_s04 (KERN_ATTR_BASIC ()) { /** * modifier @@ -649,10 +649,10 @@ __kernel void m15500_s04 (KERN_ATTR_BASIC ()) } } -__kernel void m15500_s08 (KERN_ATTR_BASIC ()) +KERNEL_FQ void m15500_s08 (KERN_ATTR_BASIC ()) { } -__kernel void m15500_s16 (KERN_ATTR_BASIC ()) +KERNEL_FQ void m15500_s16 (KERN_ATTR_BASIC ()) { } diff --git a/OpenCL/m15500_a1-pure.cl b/OpenCL/m15500_a1-pure.cl index e85c44a5a..73dced6a0 100644 --- a/OpenCL/m15500_a1-pure.cl +++ b/OpenCL/m15500_a1-pure.cl @@ -13,7 +13,7 @@ #include "inc_hash_sha1.cl" #endif -__kernel void m15500_mxx (KERN_ATTR_BASIC ()) +KERNEL_FQ void m15500_mxx (KERN_ATTR_BASIC ()) { /** * modifier @@ -72,7 +72,7 @@ __kernel void m15500_mxx (KERN_ATTR_BASIC ()) } } -__kernel void m15500_sxx (KERN_ATTR_BASIC ()) +KERNEL_FQ void m15500_sxx (KERN_ATTR_BASIC ()) { /** * modifier diff --git a/OpenCL/m15500_a3-optimized.cl b/OpenCL/m15500_a3-optimized.cl index 3db066bb7..e0ed6a10f 100644 --- a/OpenCL/m15500_a3-optimized.cl +++ b/OpenCL/m15500_a3-optimized.cl @@ -585,7 +585,7 @@ DECLSPEC void m15500s (u32 *w, const u32 pw_len, KERN_ATTR_VECTOR ()) } } -__kernel void m15500_m04 (KERN_ATTR_VECTOR ()) +KERNEL_FQ void m15500_m04 (KERN_ATTR_VECTOR ()) { /** * base @@ -623,7 +623,7 @@ __kernel void m15500_m04 (KERN_ATTR_VECTOR ()) m15500m (w, pw_len, pws, rules_buf, combs_buf, words_buf_r, 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_extra0_buf, d_extra1_buf, d_extra2_buf, d_extra3_buf, bitmap_mask, bitmap_shift1, bitmap_shift2, salt_pos, loop_pos, loop_cnt, il_cnt, digests_cnt, digests_offset, combs_mode, gid_max); } -__kernel void m15500_m08 (KERN_ATTR_VECTOR ()) +KERNEL_FQ void m15500_m08 (KERN_ATTR_VECTOR ()) { /** * base @@ -661,7 +661,7 @@ __kernel void m15500_m08 (KERN_ATTR_VECTOR ()) m15500m (w, pw_len, pws, rules_buf, combs_buf, words_buf_r, 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_extra0_buf, d_extra1_buf, d_extra2_buf, d_extra3_buf, bitmap_mask, bitmap_shift1, bitmap_shift2, salt_pos, loop_pos, loop_cnt, il_cnt, digests_cnt, digests_offset, combs_mode, gid_max); } -__kernel void m15500_m16 (KERN_ATTR_VECTOR ()) +KERNEL_FQ void m15500_m16 (KERN_ATTR_VECTOR ()) { /** * base @@ -699,7 +699,7 @@ __kernel void m15500_m16 (KERN_ATTR_VECTOR ()) m15500m (w, pw_len, pws, rules_buf, combs_buf, words_buf_r, 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_extra0_buf, d_extra1_buf, d_extra2_buf, d_extra3_buf, bitmap_mask, bitmap_shift1, bitmap_shift2, salt_pos, loop_pos, loop_cnt, il_cnt, digests_cnt, digests_offset, combs_mode, gid_max); } -__kernel void m15500_s04 (KERN_ATTR_VECTOR ()) +KERNEL_FQ void m15500_s04 (KERN_ATTR_VECTOR ()) { /** * base @@ -737,7 +737,7 @@ __kernel void m15500_s04 (KERN_ATTR_VECTOR ()) m15500s (w, pw_len, pws, rules_buf, combs_buf, words_buf_r, 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_extra0_buf, d_extra1_buf, d_extra2_buf, d_extra3_buf, bitmap_mask, bitmap_shift1, bitmap_shift2, salt_pos, loop_pos, loop_cnt, il_cnt, digests_cnt, digests_offset, combs_mode, gid_max); } -__kernel void m15500_s08 (KERN_ATTR_VECTOR ()) +KERNEL_FQ void m15500_s08 (KERN_ATTR_VECTOR ()) { /** * base @@ -775,7 +775,7 @@ __kernel void m15500_s08 (KERN_ATTR_VECTOR ()) m15500s (w, pw_len, pws, rules_buf, combs_buf, words_buf_r, 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_extra0_buf, d_extra1_buf, d_extra2_buf, d_extra3_buf, bitmap_mask, bitmap_shift1, bitmap_shift2, salt_pos, loop_pos, loop_cnt, il_cnt, digests_cnt, digests_offset, combs_mode, gid_max); } -__kernel void m15500_s16 (KERN_ATTR_VECTOR ()) +KERNEL_FQ void m15500_s16 (KERN_ATTR_VECTOR ()) { /** * base diff --git a/OpenCL/m15500_a3-pure.cl b/OpenCL/m15500_a3-pure.cl index 24302f852..3b0ce6601 100644 --- a/OpenCL/m15500_a3-pure.cl +++ b/OpenCL/m15500_a3-pure.cl @@ -13,7 +13,7 @@ #include "inc_hash_sha1.cl" #endif -__kernel void m15500_mxx (KERN_ATTR_VECTOR ()) +KERNEL_FQ void m15500_mxx (KERN_ATTR_VECTOR ()) { /** * modifier @@ -85,7 +85,7 @@ __kernel void m15500_mxx (KERN_ATTR_VECTOR ()) } } -__kernel void m15500_sxx (KERN_ATTR_VECTOR ()) +KERNEL_FQ void m15500_sxx (KERN_ATTR_VECTOR ()) { /** * modifier diff --git a/OpenCL/m15600-pure.cl b/OpenCL/m15600-pure.cl index bc2edf2af..9a46bfeed 100644 --- a/OpenCL/m15600-pure.cl +++ b/OpenCL/m15600-pure.cl @@ -33,7 +33,7 @@ typedef struct ethereum_pbkdf2 #define COMPARE_S "inc_comp_single.cl" #define COMPARE_M "inc_comp_multi.cl" -__constant u64a keccakf_rndc[24] = +CONSTANT_AS u64a keccakf_rndc[24] = { 0x0000000000000001, 0x0000000000008082, 0x800000000000808a, 0x8000000080008000, 0x000000000000808b, 0x0000000080000001, @@ -206,7 +206,7 @@ DECLSPEC void hmac_sha256_run_V (u32x *w0, u32x *w1, u32x *w2, u32x *w3, u32x *i sha256_transform_vector (w0, w1, w2, w3, digest); } -__kernel void m15600_init (KERN_ATTR_TMPS_ESALT (pbkdf2_sha256_tmp_t, ethereum_pbkdf2_t)) +KERNEL_FQ void m15600_init (KERN_ATTR_TMPS_ESALT (pbkdf2_sha256_tmp_t, ethereum_pbkdf2_t)) { /** * base @@ -290,7 +290,7 @@ __kernel void m15600_init (KERN_ATTR_TMPS_ESALT (pbkdf2_sha256_tmp_t, ethereum_p } } -__kernel void m15600_loop (KERN_ATTR_TMPS_ESALT (pbkdf2_sha256_tmp_t, ethereum_pbkdf2_t)) +KERNEL_FQ void m15600_loop (KERN_ATTR_TMPS_ESALT (pbkdf2_sha256_tmp_t, ethereum_pbkdf2_t)) { const u64 gid = get_global_id (0); @@ -396,7 +396,7 @@ __kernel void m15600_loop (KERN_ATTR_TMPS_ESALT (pbkdf2_sha256_tmp_t, ethereum_p } } -__kernel void m15600_comp (KERN_ATTR_TMPS_ESALT (pbkdf2_sha256_tmp_t, ethereum_pbkdf2_t)) +KERNEL_FQ void m15600_comp (KERN_ATTR_TMPS_ESALT (pbkdf2_sha256_tmp_t, ethereum_pbkdf2_t)) { /** * base diff --git a/OpenCL/m15700-pure.cl b/OpenCL/m15700-pure.cl index e263e124d..496b24638 100644 --- a/OpenCL/m15700-pure.cl +++ b/OpenCL/m15700-pure.cl @@ -142,7 +142,7 @@ DECLSPEC void salsa_r (uint4 *TI) } } -DECLSPEC void scrypt_smix (uint4 *X, uint4 *T, __global uint4 * restrict V0, __global uint4 * restrict V1, __global uint4 * restrict V2, __global uint4 * restrict V3) +DECLSPEC void scrypt_smix (uint4 *X, uint4 *T, GLOBAL_AS uint4 * restrict V0, GLOBAL_AS uint4 * restrict V1, GLOBAL_AS uint4 * restrict V2, GLOBAL_AS uint4 * restrict V3) { #define Coord(xd4,y,z) (((xd4) * ySIZE * zSIZE) + ((y) * zSIZE) + (z)) #define CO Coord(xd4,y,z) @@ -155,7 +155,7 @@ DECLSPEC void scrypt_smix (uint4 *X, uint4 *T, __global uint4 * restrict V0, __g const u32 xd4 = x / 4; const u32 xm4 = x & 3; - __global uint4 * restrict V; + GLOBAL_AS uint4 * restrict V; switch (xm4) { @@ -260,7 +260,7 @@ DECLSPEC void scrypt_smix (uint4 *X, uint4 *T, __global uint4 * restrict V0, __g st[4 + s] ^= ~bc0 & bc1; \ } -__constant u64a keccakf_rndc[24] = +CONSTANT_AS u64a keccakf_rndc[24] = { 0x0000000000000001, 0x0000000000008082, 0x800000000000808a, 0x8000000080008000, 0x000000000000808b, 0x0000000080000001, @@ -353,7 +353,7 @@ DECLSPEC void keccak_transform_S (u64 *st) } } -__kernel void m15700_init (KERN_ATTR_TMPS_ESALT (scrypt_tmp_t, ethereum_scrypt_t)) +KERNEL_FQ void m15700_init (KERN_ATTR_TMPS_ESALT (scrypt_tmp_t, ethereum_scrypt_t)) { /** * base @@ -418,16 +418,16 @@ __kernel void m15700_init (KERN_ATTR_TMPS_ESALT (scrypt_tmp_t, ethereum_scrypt_t } } -__kernel void m15700_loop (KERN_ATTR_TMPS_ESALT (scrypt_tmp_t, ethereum_scrypt_t)) +KERNEL_FQ void m15700_loop (KERN_ATTR_TMPS_ESALT (scrypt_tmp_t, ethereum_scrypt_t)) { const u64 gid = get_global_id (0); if (gid >= gid_max) return; - __global uint4 * restrict d_scrypt0_buf = d_extra0_buf; - __global uint4 * restrict d_scrypt1_buf = d_extra1_buf; - __global uint4 * restrict d_scrypt2_buf = d_extra2_buf; - __global uint4 * restrict d_scrypt3_buf = d_extra3_buf; + GLOBAL_AS uint4 * restrict d_scrypt0_buf = d_extra0_buf; + GLOBAL_AS uint4 * restrict d_scrypt1_buf = d_extra1_buf; + GLOBAL_AS uint4 * restrict d_scrypt2_buf = d_extra2_buf; + GLOBAL_AS uint4 * restrict d_scrypt3_buf = d_extra3_buf; uint4 X[STATE_CNT4]; uint4 T[STATE_CNT4]; @@ -456,7 +456,7 @@ __kernel void m15700_loop (KERN_ATTR_TMPS_ESALT (scrypt_tmp_t, ethereum_scrypt_t #endif } -__kernel void m15700_comp (KERN_ATTR_TMPS_ESALT (scrypt_tmp_t, ethereum_scrypt_t)) +KERNEL_FQ void m15700_comp (KERN_ATTR_TMPS_ESALT (scrypt_tmp_t, ethereum_scrypt_t)) { /** * base diff --git a/OpenCL/m15900-pure.cl b/OpenCL/m15900-pure.cl index 7e037e914..ddd784bcc 100644 --- a/OpenCL/m15900-pure.cl +++ b/OpenCL/m15900-pure.cl @@ -108,7 +108,7 @@ DECLSPEC void hmac_sha512_run_V (u32x *w0, u32x *w1, u32x *w2, u32x *w3, u32x *w sha512_transform_vector (w0, w1, w2, w3, w4, w5, w6, w7, digest); } -__kernel void m15900_init (KERN_ATTR_TMPS_ESALT (dpapimk_tmp_v2_t, dpapimk_t)) +KERNEL_FQ void m15900_init (KERN_ATTR_TMPS_ESALT (dpapimk_tmp_v2_t, dpapimk_t)) { /** * base @@ -370,7 +370,7 @@ __kernel void m15900_init (KERN_ATTR_TMPS_ESALT (dpapimk_tmp_v2_t, dpapimk_t)) } } -__kernel void m15900_loop (KERN_ATTR_TMPS_ESALT (dpapimk_tmp_v2_t, dpapimk_t)) +KERNEL_FQ void m15900_loop (KERN_ATTR_TMPS_ESALT (dpapimk_tmp_v2_t, dpapimk_t)) { /** * base @@ -500,7 +500,7 @@ __kernel void m15900_loop (KERN_ATTR_TMPS_ESALT (dpapimk_tmp_v2_t, dpapimk_t)) } } -__kernel void m15900_comp (KERN_ATTR_TMPS_ESALT (dpapimk_tmp_v2_t, dpapimk_t)) +KERNEL_FQ void m15900_comp (KERN_ATTR_TMPS_ESALT (dpapimk_tmp_v2_t, dpapimk_t)) { const u64 gid = get_global_id (0); const u64 lid = get_local_id (0); @@ -512,17 +512,17 @@ __kernel void m15900_comp (KERN_ATTR_TMPS_ESALT (dpapimk_tmp_v2_t, dpapimk_t)) #ifdef REAL_SHM - __local u32 s_td0[256]; - __local u32 s_td1[256]; - __local u32 s_td2[256]; - __local u32 s_td3[256]; - __local u32 s_td4[256]; + LOCAL_AS u32 s_td0[256]; + LOCAL_AS u32 s_td1[256]; + LOCAL_AS u32 s_td2[256]; + LOCAL_AS u32 s_td3[256]; + LOCAL_AS u32 s_td4[256]; - __local u32 s_te0[256]; - __local u32 s_te1[256]; - __local u32 s_te2[256]; - __local u32 s_te3[256]; - __local u32 s_te4[256]; + LOCAL_AS u32 s_te0[256]; + LOCAL_AS u32 s_te1[256]; + LOCAL_AS u32 s_te2[256]; + LOCAL_AS u32 s_te3[256]; + LOCAL_AS u32 s_te4[256]; for (u32 i = lid; i < 256; i += lsz) { @@ -543,17 +543,17 @@ __kernel void m15900_comp (KERN_ATTR_TMPS_ESALT (dpapimk_tmp_v2_t, dpapimk_t)) #else - __constant u32a *s_td0 = td0; - __constant u32a *s_td1 = td1; - __constant u32a *s_td2 = td2; - __constant u32a *s_td3 = td3; - __constant u32a *s_td4 = td4; + CONSTANT_AS u32a *s_td0 = td0; + CONSTANT_AS u32a *s_td1 = td1; + CONSTANT_AS u32a *s_td2 = td2; + CONSTANT_AS u32a *s_td3 = td3; + CONSTANT_AS u32a *s_td4 = td4; - __constant u32a *s_te0 = te0; - __constant u32a *s_te1 = te1; - __constant u32a *s_te2 = te2; - __constant u32a *s_te3 = te3; - __constant u32a *s_te4 = te4; + CONSTANT_AS u32a *s_te0 = te0; + CONSTANT_AS u32a *s_te1 = te1; + CONSTANT_AS u32a *s_te2 = te2; + CONSTANT_AS u32a *s_te3 = te3; + CONSTANT_AS u32a *s_te4 = te4; #endif diff --git a/OpenCL/m16000_a0-pure.cl b/OpenCL/m16000_a0-pure.cl index 2a7e175c2..11fb75066 100644 --- a/OpenCL/m16000_a0-pure.cl +++ b/OpenCL/m16000_a0-pure.cl @@ -34,7 +34,7 @@ a = a ^ tt; \ } -__constant u32a c_SPtrans[8][64] = +CONSTANT_AS u32a c_SPtrans[8][64] = { { 0x00820200, 0x00020000, 0x80800000, 0x80820200, @@ -182,7 +182,7 @@ __constant u32a c_SPtrans[8][64] = }, }; -__constant u32a c_skb[8][64] = +CONSTANT_AS u32a c_skb[8][64] = { { 0x00000000, 0x00000010, 0x20000000, 0x20000010, @@ -330,7 +330,7 @@ __constant u32a c_skb[8][64] = }, }; -__constant u32a c_tripcode_salt[128] = +CONSTANT_AS u32a c_tripcode_salt[128] = { 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, @@ -354,7 +354,7 @@ __constant u32a c_tripcode_salt[128] = #define BOX(i,n,S) (u32x) ((S)[(n)][(i).s0], (S)[(n)][(i).s1], (S)[(n)][(i).s2], (S)[(n)][(i).s3], (S)[(n)][(i).s4], (S)[(n)][(i).s5], (S)[(n)][(i).s6], (S)[(n)][(i).s7], (S)[(n)][(i).s8], (S)[(n)][(i).s9], (S)[(n)][(i).sa], (S)[(n)][(i).sb], (S)[(n)][(i).sc], (S)[(n)][(i).sd], (S)[(n)][(i).se], (S)[(n)][(i).sf]) #endif -DECLSPEC void _des_crypt_keysetup (u32 c, u32x d, u32x *Kc, u32x *Kd, __local u32 (*s_skb)[64]) +DECLSPEC void _des_crypt_keysetup (u32 c, u32x d, u32x *Kc, u32x *Kd, LOCAL_AS u32 (*s_skb)[64]) { u32 tt; @@ -423,7 +423,7 @@ DECLSPEC void _des_crypt_keysetup (u32 c, u32x d, u32x *Kc, u32x *Kd, __local u3 } } -DECLSPEC void _des_crypt_encrypt (u32 *iv, u32 mask, u32x *Kc, u32x *Kd, __local u32 (*s_SPtrans)[64]) +DECLSPEC void _des_crypt_encrypt (u32 *iv, u32 mask, u32x *Kc, u32x *Kd, LOCAL_AS u32 (*s_SPtrans)[64]) { const u32 E1 = (mask >> 2) & 0x3f0; const u32 E0 = mask & 0x3f; @@ -493,7 +493,7 @@ DECLSPEC void _des_crypt_encrypt (u32 *iv, u32 mask, u32x *Kc, u32x *Kd, __local iv[1] = rotl32 (l, 31); } -__kernel void m16000_mxx (KERN_ATTR_RULES ()) +KERNEL_FQ void m16000_mxx (KERN_ATTR_RULES ()) { /** * modifier @@ -507,8 +507,8 @@ __kernel void m16000_mxx (KERN_ATTR_RULES ()) * sbox, kbox */ - __local u32 s_SPtrans[8][64]; - __local u32 s_skb[8][64]; + LOCAL_AS u32 s_SPtrans[8][64]; + LOCAL_AS u32 s_skb[8][64]; for (u32 i = lid; i < 64; i += lsz) { @@ -531,7 +531,7 @@ __kernel void m16000_mxx (KERN_ATTR_RULES ()) s_skb[7][i] = c_skb[7][i]; } - __local u32 s_tripcode_salt[128]; + LOCAL_AS u32 s_tripcode_salt[128]; for (u32 i = lid; i < 128; i += lsz) { @@ -586,7 +586,7 @@ __kernel void m16000_mxx (KERN_ATTR_RULES ()) } } -__kernel void m16000_sxx (KERN_ATTR_RULES ()) +KERNEL_FQ void m16000_sxx (KERN_ATTR_RULES ()) { /** * modifier @@ -600,8 +600,8 @@ __kernel void m16000_sxx (KERN_ATTR_RULES ()) * sbox, kbox */ - __local u32 s_SPtrans[8][64]; - __local u32 s_skb[8][64]; + LOCAL_AS u32 s_SPtrans[8][64]; + LOCAL_AS u32 s_skb[8][64]; for (u32 i = lid; i < 64; i += lsz) { @@ -624,7 +624,7 @@ __kernel void m16000_sxx (KERN_ATTR_RULES ()) s_skb[7][i] = c_skb[7][i]; } - __local u32 s_tripcode_salt[128]; + LOCAL_AS u32 s_tripcode_salt[128]; for (u32 i = lid; i < 128; i += lsz) { diff --git a/OpenCL/m16000_a1-pure.cl b/OpenCL/m16000_a1-pure.cl index 8c0c2ebbb..f57aad8f0 100644 --- a/OpenCL/m16000_a1-pure.cl +++ b/OpenCL/m16000_a1-pure.cl @@ -32,7 +32,7 @@ a = a ^ tt; \ } -__constant u32a c_SPtrans[8][64] = +CONSTANT_AS u32a c_SPtrans[8][64] = { { 0x00820200, 0x00020000, 0x80800000, 0x80820200, @@ -180,7 +180,7 @@ __constant u32a c_SPtrans[8][64] = }, }; -__constant u32a c_skb[8][64] = +CONSTANT_AS u32a c_skb[8][64] = { { 0x00000000, 0x00000010, 0x20000000, 0x20000010, @@ -328,7 +328,7 @@ __constant u32a c_skb[8][64] = }, }; -__constant u32a c_tripcode_salt[128] = +CONSTANT_AS u32a c_tripcode_salt[128] = { 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, @@ -352,7 +352,7 @@ __constant u32a c_tripcode_salt[128] = #define BOX(i,n,S) (u32x) ((S)[(n)][(i).s0], (S)[(n)][(i).s1], (S)[(n)][(i).s2], (S)[(n)][(i).s3], (S)[(n)][(i).s4], (S)[(n)][(i).s5], (S)[(n)][(i).s6], (S)[(n)][(i).s7], (S)[(n)][(i).s8], (S)[(n)][(i).s9], (S)[(n)][(i).sa], (S)[(n)][(i).sb], (S)[(n)][(i).sc], (S)[(n)][(i).sd], (S)[(n)][(i).se], (S)[(n)][(i).sf]) #endif -DECLSPEC void _des_crypt_keysetup (u32 c, u32x d, u32x *Kc, u32x *Kd, __local u32 (*s_skb)[64]) +DECLSPEC void _des_crypt_keysetup (u32 c, u32x d, u32x *Kc, u32x *Kd, LOCAL_AS u32 (*s_skb)[64]) { u32 tt; @@ -421,7 +421,7 @@ DECLSPEC void _des_crypt_keysetup (u32 c, u32x d, u32x *Kc, u32x *Kd, __local u3 } } -DECLSPEC void _des_crypt_encrypt (u32 *iv, u32 mask, u32x *Kc, u32x *Kd, __local u32 (*s_SPtrans)[64]) +DECLSPEC void _des_crypt_encrypt (u32 *iv, u32 mask, u32x *Kc, u32x *Kd, LOCAL_AS u32 (*s_SPtrans)[64]) { const u32 E1 = (mask >> 2) & 0x3f0; const u32 E0 = mask & 0x3f; @@ -491,7 +491,7 @@ DECLSPEC void _des_crypt_encrypt (u32 *iv, u32 mask, u32x *Kc, u32x *Kd, __local iv[1] = rotl32 (l, 31); } -__kernel void m16000_mxx (KERN_ATTR_BASIC ()) +KERNEL_FQ void m16000_mxx (KERN_ATTR_BASIC ()) { /** * modifier @@ -505,8 +505,8 @@ __kernel void m16000_mxx (KERN_ATTR_BASIC ()) * sbox, kbox */ - __local u32 s_SPtrans[8][64]; - __local u32 s_skb[8][64]; + LOCAL_AS u32 s_SPtrans[8][64]; + LOCAL_AS u32 s_skb[8][64]; for (u32 i = lid; i < 64; i += lsz) { @@ -529,7 +529,7 @@ __kernel void m16000_mxx (KERN_ATTR_BASIC ()) s_skb[7][i] = c_skb[7][i]; } - __local u32 s_tripcode_salt[128]; + LOCAL_AS u32 s_tripcode_salt[128]; for (u32 i = lid; i < 128; i += lsz) { @@ -663,7 +663,7 @@ __kernel void m16000_mxx (KERN_ATTR_BASIC ()) } } -__kernel void m16000_sxx (KERN_ATTR_BASIC ()) +KERNEL_FQ void m16000_sxx (KERN_ATTR_BASIC ()) { /** * modifier @@ -677,8 +677,8 @@ __kernel void m16000_sxx (KERN_ATTR_BASIC ()) * sbox, kbox */ - __local u32 s_SPtrans[8][64]; - __local u32 s_skb[8][64]; + LOCAL_AS u32 s_SPtrans[8][64]; + LOCAL_AS u32 s_skb[8][64]; for (u32 i = lid; i < 64; i += lsz) { @@ -701,7 +701,7 @@ __kernel void m16000_sxx (KERN_ATTR_BASIC ()) s_skb[7][i] = c_skb[7][i]; } - __local u32 s_tripcode_salt[128]; + LOCAL_AS u32 s_tripcode_salt[128]; for (u32 i = lid; i < 128; i += lsz) { diff --git a/OpenCL/m16000_a3-pure.cl b/OpenCL/m16000_a3-pure.cl index 0bc1d2830..64bc5e37d 100644 --- a/OpenCL/m16000_a3-pure.cl +++ b/OpenCL/m16000_a3-pure.cl @@ -32,7 +32,7 @@ a = a ^ tt; \ } -__constant u32a c_SPtrans[8][64] = +CONSTANT_AS u32a c_SPtrans[8][64] = { { 0x00820200, 0x00020000, 0x80800000, 0x80820200, @@ -180,7 +180,7 @@ __constant u32a c_SPtrans[8][64] = }, }; -__constant u32a c_skb[8][64] = +CONSTANT_AS u32a c_skb[8][64] = { { 0x00000000, 0x00000010, 0x20000000, 0x20000010, @@ -328,7 +328,7 @@ __constant u32a c_skb[8][64] = }, }; -__constant u32a c_tripcode_salt[128] = +CONSTANT_AS u32a c_tripcode_salt[128] = { 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, @@ -352,7 +352,7 @@ __constant u32a c_tripcode_salt[128] = #define BOX(i,n,S) (u32x) ((S)[(n)][(i).s0], (S)[(n)][(i).s1], (S)[(n)][(i).s2], (S)[(n)][(i).s3], (S)[(n)][(i).s4], (S)[(n)][(i).s5], (S)[(n)][(i).s6], (S)[(n)][(i).s7], (S)[(n)][(i).s8], (S)[(n)][(i).s9], (S)[(n)][(i).sa], (S)[(n)][(i).sb], (S)[(n)][(i).sc], (S)[(n)][(i).sd], (S)[(n)][(i).se], (S)[(n)][(i).sf]) #endif -DECLSPEC void _des_crypt_keysetup (u32 c, u32x d, u32x *Kc, u32x *Kd, __local u32 (*s_skb)[64]) +DECLSPEC void _des_crypt_keysetup (u32 c, u32x d, u32x *Kc, u32x *Kd, LOCAL_AS u32 (*s_skb)[64]) { u32 tt; @@ -421,7 +421,7 @@ DECLSPEC void _des_crypt_keysetup (u32 c, u32x d, u32x *Kc, u32x *Kd, __local u3 } } -DECLSPEC void _des_crypt_encrypt (u32 *iv, u32 mask, u32x *Kc, u32x *Kd, __local u32 (*s_SPtrans)[64]) +DECLSPEC void _des_crypt_encrypt (u32 *iv, u32 mask, u32x *Kc, u32x *Kd, LOCAL_AS u32 (*s_SPtrans)[64]) { const u32 E1 = (mask >> 2) & 0x3f0; const u32 E0 = mask & 0x3f; @@ -491,7 +491,7 @@ DECLSPEC void _des_crypt_encrypt (u32 *iv, u32 mask, u32x *Kc, u32x *Kd, __local iv[1] = rotl32 (l, 31); } -__kernel void m16000_mxx (KERN_ATTR_VECTOR ()) +KERNEL_FQ void m16000_mxx (KERN_ATTR_VECTOR ()) { /** * modifier @@ -505,8 +505,8 @@ __kernel void m16000_mxx (KERN_ATTR_VECTOR ()) * sbox, kbox */ - __local u32 s_SPtrans[8][64]; - __local u32 s_skb[8][64]; + LOCAL_AS u32 s_SPtrans[8][64]; + LOCAL_AS u32 s_skb[8][64]; for (u32 i = lid; i < 64; i += lsz) { @@ -529,7 +529,7 @@ __kernel void m16000_mxx (KERN_ATTR_VECTOR ()) s_skb[7][i] = c_skb[7][i]; } - __local u32 s_tripcode_salt[128]; + LOCAL_AS u32 s_tripcode_salt[128]; for (u32 i = lid; i < 128; i += lsz) { @@ -612,7 +612,7 @@ __kernel void m16000_mxx (KERN_ATTR_VECTOR ()) } } -__kernel void m16000_sxx (KERN_ATTR_VECTOR ()) +KERNEL_FQ void m16000_sxx (KERN_ATTR_VECTOR ()) { /** * modifier @@ -626,8 +626,8 @@ __kernel void m16000_sxx (KERN_ATTR_VECTOR ()) * sbox, kbox */ - __local u32 s_SPtrans[8][64]; - __local u32 s_skb[8][64]; + LOCAL_AS u32 s_SPtrans[8][64]; + LOCAL_AS u32 s_skb[8][64]; for (u32 i = lid; i < 64; i += lsz) { @@ -650,7 +650,7 @@ __kernel void m16000_sxx (KERN_ATTR_VECTOR ()) s_skb[7][i] = c_skb[7][i]; } - __local u32 s_tripcode_salt[128]; + LOCAL_AS u32 s_tripcode_salt[128]; for (u32 i = lid; i < 128; i += lsz) { diff --git a/OpenCL/m16100_a0-optimized.cl b/OpenCL/m16100_a0-optimized.cl index f83ae2060..0bcbfcbfe 100644 --- a/OpenCL/m16100_a0-optimized.cl +++ b/OpenCL/m16100_a0-optimized.cl @@ -26,7 +26,7 @@ typedef struct tacacs_plus } tacacs_plus_t; -__kernel void m16100_m04 (KERN_ATTR_RULES_ESALT (tacacs_plus_t)) +KERNEL_FQ void m16100_m04 (KERN_ATTR_RULES_ESALT (tacacs_plus_t)) { /** * modifier @@ -303,15 +303,15 @@ __kernel void m16100_m04 (KERN_ATTR_RULES_ESALT (tacacs_plus_t)) } } -__kernel void m16100_m08 (KERN_ATTR_RULES_ESALT (tacacs_plus_t)) +KERNEL_FQ void m16100_m08 (KERN_ATTR_RULES_ESALT (tacacs_plus_t)) { } -__kernel void m16100_m16 (KERN_ATTR_RULES_ESALT (tacacs_plus_t)) +KERNEL_FQ void m16100_m16 (KERN_ATTR_RULES_ESALT (tacacs_plus_t)) { } -__kernel void m16100_s04 (KERN_ATTR_RULES_ESALT (tacacs_plus_t)) +KERNEL_FQ void m16100_s04 (KERN_ATTR_RULES_ESALT (tacacs_plus_t)) { /** * modifier @@ -588,10 +588,10 @@ __kernel void m16100_s04 (KERN_ATTR_RULES_ESALT (tacacs_plus_t)) } } -__kernel void m16100_s08 (KERN_ATTR_RULES_ESALT (tacacs_plus_t)) +KERNEL_FQ void m16100_s08 (KERN_ATTR_RULES_ESALT (tacacs_plus_t)) { } -__kernel void m16100_s16 (KERN_ATTR_RULES_ESALT (tacacs_plus_t)) +KERNEL_FQ void m16100_s16 (KERN_ATTR_RULES_ESALT (tacacs_plus_t)) { } diff --git a/OpenCL/m16100_a0-pure.cl b/OpenCL/m16100_a0-pure.cl index a5949a70b..f6aa82060 100644 --- a/OpenCL/m16100_a0-pure.cl +++ b/OpenCL/m16100_a0-pure.cl @@ -26,7 +26,7 @@ typedef struct tacacs_plus } tacacs_plus_t; -__kernel void m16100_mxx (KERN_ATTR_RULES_ESALT (tacacs_plus_t)) +KERNEL_FQ void m16100_mxx (KERN_ATTR_RULES_ESALT (tacacs_plus_t)) { /** * modifier @@ -188,7 +188,7 @@ __kernel void m16100_mxx (KERN_ATTR_RULES_ESALT (tacacs_plus_t)) } } -__kernel void m16100_sxx (KERN_ATTR_RULES_ESALT (tacacs_plus_t)) +KERNEL_FQ void m16100_sxx (KERN_ATTR_RULES_ESALT (tacacs_plus_t)) { /** * modifier diff --git a/OpenCL/m16100_a1-optimized.cl b/OpenCL/m16100_a1-optimized.cl index e17acc6ac..2c3cece99 100644 --- a/OpenCL/m16100_a1-optimized.cl +++ b/OpenCL/m16100_a1-optimized.cl @@ -24,7 +24,7 @@ typedef struct tacacs_plus } tacacs_plus_t; -__kernel void m16100_m04 (KERN_ATTR_ESALT (tacacs_plus_t)) +KERNEL_FQ void m16100_m04 (KERN_ATTR_ESALT (tacacs_plus_t)) { /** * modifier @@ -362,15 +362,15 @@ __kernel void m16100_m04 (KERN_ATTR_ESALT (tacacs_plus_t)) } } -__kernel void m16100_m08 (KERN_ATTR_ESALT (tacacs_plus_t)) +KERNEL_FQ void m16100_m08 (KERN_ATTR_ESALT (tacacs_plus_t)) { } -__kernel void m16100_m16 (KERN_ATTR_ESALT (tacacs_plus_t)) +KERNEL_FQ void m16100_m16 (KERN_ATTR_ESALT (tacacs_plus_t)) { } -__kernel void m16100_s04 (KERN_ATTR_ESALT (tacacs_plus_t)) +KERNEL_FQ void m16100_s04 (KERN_ATTR_ESALT (tacacs_plus_t)) { /** * modifier @@ -708,10 +708,10 @@ __kernel void m16100_s04 (KERN_ATTR_ESALT (tacacs_plus_t)) } } -__kernel void m16100_s08 (KERN_ATTR_ESALT (tacacs_plus_t)) +KERNEL_FQ void m16100_s08 (KERN_ATTR_ESALT (tacacs_plus_t)) { } -__kernel void m16100_s16 (KERN_ATTR_ESALT (tacacs_plus_t)) +KERNEL_FQ void m16100_s16 (KERN_ATTR_ESALT (tacacs_plus_t)) { } diff --git a/OpenCL/m16100_a1-pure.cl b/OpenCL/m16100_a1-pure.cl index 5520e108c..04f5d8a57 100644 --- a/OpenCL/m16100_a1-pure.cl +++ b/OpenCL/m16100_a1-pure.cl @@ -23,7 +23,7 @@ typedef struct tacacs_plus } tacacs_plus_t; -__kernel void m16100_mxx (KERN_ATTR_ESALT (tacacs_plus_t)) +KERNEL_FQ void m16100_mxx (KERN_ATTR_ESALT (tacacs_plus_t)) { /** * modifier @@ -181,7 +181,7 @@ __kernel void m16100_mxx (KERN_ATTR_ESALT (tacacs_plus_t)) } } -__kernel void m16100_sxx (KERN_ATTR_ESALT (tacacs_plus_t)) +KERNEL_FQ void m16100_sxx (KERN_ATTR_ESALT (tacacs_plus_t)) { /** * modifier diff --git a/OpenCL/m16100_a3-optimized.cl b/OpenCL/m16100_a3-optimized.cl index 715a4d3cb..ba96def6b 100644 --- a/OpenCL/m16100_a3-optimized.cl +++ b/OpenCL/m16100_a3-optimized.cl @@ -530,7 +530,7 @@ DECLSPEC void m16100s (u32 *w0, u32 *w1, u32 *w2, u32 *w3, const u32 pw_len, KER } } -__kernel void m16100_m04 (KERN_ATTR_ESALT (tacacs_plus_t)) +KERNEL_FQ void m16100_m04 (KERN_ATTR_ESALT (tacacs_plus_t)) { /** * base @@ -577,7 +577,7 @@ __kernel void m16100_m04 (KERN_ATTR_ESALT (tacacs_plus_t)) m16100m (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_extra0_buf, d_extra1_buf, d_extra2_buf, d_extra3_buf, bitmap_mask, bitmap_shift1, bitmap_shift2, salt_pos, loop_pos, loop_cnt, il_cnt, digests_cnt, digests_offset, combs_mode, gid_max); } -__kernel void m16100_m08 (KERN_ATTR_ESALT (tacacs_plus_t)) +KERNEL_FQ void m16100_m08 (KERN_ATTR_ESALT (tacacs_plus_t)) { /** * base @@ -624,7 +624,7 @@ __kernel void m16100_m08 (KERN_ATTR_ESALT (tacacs_plus_t)) m16100m (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_extra0_buf, d_extra1_buf, d_extra2_buf, d_extra3_buf, bitmap_mask, bitmap_shift1, bitmap_shift2, salt_pos, loop_pos, loop_cnt, il_cnt, digests_cnt, digests_offset, combs_mode, gid_max); } -__kernel void m16100_m16 (KERN_ATTR_ESALT (tacacs_plus_t)) +KERNEL_FQ void m16100_m16 (KERN_ATTR_ESALT (tacacs_plus_t)) { /** * base @@ -671,7 +671,7 @@ __kernel void m16100_m16 (KERN_ATTR_ESALT (tacacs_plus_t)) m16100m (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_extra0_buf, d_extra1_buf, d_extra2_buf, d_extra3_buf, bitmap_mask, bitmap_shift1, bitmap_shift2, salt_pos, loop_pos, loop_cnt, il_cnt, digests_cnt, digests_offset, combs_mode, gid_max); } -__kernel void m16100_s04 (KERN_ATTR_ESALT (tacacs_plus_t)) +KERNEL_FQ void m16100_s04 (KERN_ATTR_ESALT (tacacs_plus_t)) { /** * base @@ -718,7 +718,7 @@ __kernel void m16100_s04 (KERN_ATTR_ESALT (tacacs_plus_t)) m16100s (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_extra0_buf, d_extra1_buf, d_extra2_buf, d_extra3_buf, bitmap_mask, bitmap_shift1, bitmap_shift2, salt_pos, loop_pos, loop_cnt, il_cnt, digests_cnt, digests_offset, combs_mode, gid_max); } -__kernel void m16100_s08 (KERN_ATTR_ESALT (tacacs_plus_t)) +KERNEL_FQ void m16100_s08 (KERN_ATTR_ESALT (tacacs_plus_t)) { /** * base @@ -765,7 +765,7 @@ __kernel void m16100_s08 (KERN_ATTR_ESALT (tacacs_plus_t)) m16100s (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_extra0_buf, d_extra1_buf, d_extra2_buf, d_extra3_buf, bitmap_mask, bitmap_shift1, bitmap_shift2, salt_pos, loop_pos, loop_cnt, il_cnt, digests_cnt, digests_offset, combs_mode, gid_max); } -__kernel void m16100_s16 (KERN_ATTR_ESALT (tacacs_plus_t)) +KERNEL_FQ void m16100_s16 (KERN_ATTR_ESALT (tacacs_plus_t)) { /** * base diff --git a/OpenCL/m16100_a3-pure.cl b/OpenCL/m16100_a3-pure.cl index 5e21877d5..b56106574 100644 --- a/OpenCL/m16100_a3-pure.cl +++ b/OpenCL/m16100_a3-pure.cl @@ -23,7 +23,7 @@ typedef struct tacacs_plus } tacacs_plus_t; -__kernel void m16100_mxx (KERN_ATTR_VECTOR_ESALT (tacacs_plus_t)) +KERNEL_FQ void m16100_mxx (KERN_ATTR_VECTOR_ESALT (tacacs_plus_t)) { /** * modifier @@ -198,7 +198,7 @@ __kernel void m16100_mxx (KERN_ATTR_VECTOR_ESALT (tacacs_plus_t)) } } -__kernel void m16100_sxx (KERN_ATTR_VECTOR_ESALT (tacacs_plus_t)) +KERNEL_FQ void m16100_sxx (KERN_ATTR_VECTOR_ESALT (tacacs_plus_t)) { /** * modifier diff --git a/OpenCL/m16200-pure.cl b/OpenCL/m16200-pure.cl index 69a985a3a..3b78d31db 100644 --- a/OpenCL/m16200-pure.cl +++ b/OpenCL/m16200-pure.cl @@ -78,7 +78,7 @@ DECLSPEC void hmac_sha256_run_V (u32x *w0, u32x *w1, u32x *w2, u32x *w3, u32x *i sha256_transform_vector (w0, w1, w2, w3, digest); } -__kernel void m16200_init (KERN_ATTR_TMPS_ESALT (apple_secure_notes_tmp_t, apple_secure_notes_t)) +KERNEL_FQ void m16200_init (KERN_ATTR_TMPS_ESALT (apple_secure_notes_tmp_t, apple_secure_notes_t)) { /** * base @@ -162,7 +162,7 @@ __kernel void m16200_init (KERN_ATTR_TMPS_ESALT (apple_secure_notes_tmp_t, apple } } -__kernel void m16200_loop (KERN_ATTR_TMPS_ESALT (apple_secure_notes_tmp_t, apple_secure_notes_t)) +KERNEL_FQ void m16200_loop (KERN_ATTR_TMPS_ESALT (apple_secure_notes_tmp_t, apple_secure_notes_t)) { const u64 gid = get_global_id (0); @@ -268,7 +268,7 @@ __kernel void m16200_loop (KERN_ATTR_TMPS_ESALT (apple_secure_notes_tmp_t, apple } } -__kernel void m16200_comp (KERN_ATTR_TMPS_ESALT (apple_secure_notes_tmp_t, apple_secure_notes_t)) +KERNEL_FQ void m16200_comp (KERN_ATTR_TMPS_ESALT (apple_secure_notes_tmp_t, apple_secure_notes_t)) { const u64 gid = get_global_id (0); const u64 lid = get_local_id (0); @@ -280,17 +280,17 @@ __kernel void m16200_comp (KERN_ATTR_TMPS_ESALT (apple_secure_notes_tmp_t, apple #ifdef REAL_SHM - __local u32 s_td0[256]; - __local u32 s_td1[256]; - __local u32 s_td2[256]; - __local u32 s_td3[256]; - __local u32 s_td4[256]; + LOCAL_AS u32 s_td0[256]; + LOCAL_AS u32 s_td1[256]; + LOCAL_AS u32 s_td2[256]; + LOCAL_AS u32 s_td3[256]; + LOCAL_AS u32 s_td4[256]; - __local u32 s_te0[256]; - __local u32 s_te1[256]; - __local u32 s_te2[256]; - __local u32 s_te3[256]; - __local u32 s_te4[256]; + LOCAL_AS u32 s_te0[256]; + LOCAL_AS u32 s_te1[256]; + LOCAL_AS u32 s_te2[256]; + LOCAL_AS u32 s_te3[256]; + LOCAL_AS u32 s_te4[256]; for (u32 i = lid; i < 256; i += lsz) { @@ -311,17 +311,17 @@ __kernel void m16200_comp (KERN_ATTR_TMPS_ESALT (apple_secure_notes_tmp_t, apple #else - __constant u32a *s_td0 = td0; - __constant u32a *s_td1 = td1; - __constant u32a *s_td2 = td2; - __constant u32a *s_td3 = td3; - __constant u32a *s_td4 = td4; + CONSTANT_AS u32a *s_td0 = td0; + CONSTANT_AS u32a *s_td1 = td1; + CONSTANT_AS u32a *s_td2 = td2; + CONSTANT_AS u32a *s_td3 = td3; + CONSTANT_AS u32a *s_td4 = td4; - __constant u32a *s_te0 = te0; - __constant u32a *s_te1 = te1; - __constant u32a *s_te2 = te2; - __constant u32a *s_te3 = te3; - __constant u32a *s_te4 = te4; + CONSTANT_AS u32a *s_te0 = te0; + CONSTANT_AS u32a *s_te1 = te1; + CONSTANT_AS u32a *s_te2 = te2; + CONSTANT_AS u32a *s_te3 = te3; + CONSTANT_AS u32a *s_te4 = te4; #endif diff --git a/OpenCL/m16300-pure.cl b/OpenCL/m16300-pure.cl index 86b4ed2eb..b8685e539 100644 --- a/OpenCL/m16300-pure.cl +++ b/OpenCL/m16300-pure.cl @@ -35,7 +35,7 @@ typedef struct pbkdf2_sha256_tmp } pbkdf2_sha256_tmp_t; -__constant u64a keccakf_rndc[24] = +CONSTANT_AS u64a keccakf_rndc[24] = { 0x0000000000000001, 0x0000000000008082, 0x800000000000808a, 0x8000000080008000, 0x000000000000808b, 0x0000000080000001, @@ -208,7 +208,7 @@ DECLSPEC void hmac_sha256_run_V (u32x *w0, u32x *w1, u32x *w2, u32x *w3, u32x *i sha256_transform_vector (w0, w1, w2, w3, digest); } -__kernel void m16300_init (KERN_ATTR_TMPS_ESALT (pbkdf2_sha256_tmp_t, ethereum_presale_t)) +KERNEL_FQ void m16300_init (KERN_ATTR_TMPS_ESALT (pbkdf2_sha256_tmp_t, ethereum_presale_t)) { /** * base @@ -292,7 +292,7 @@ __kernel void m16300_init (KERN_ATTR_TMPS_ESALT (pbkdf2_sha256_tmp_t, ethereum_p } } -__kernel void m16300_loop (KERN_ATTR_TMPS_ESALT (pbkdf2_sha256_tmp_t, ethereum_presale_t)) +KERNEL_FQ void m16300_loop (KERN_ATTR_TMPS_ESALT (pbkdf2_sha256_tmp_t, ethereum_presale_t)) { const u64 gid = get_global_id (0); @@ -398,7 +398,7 @@ __kernel void m16300_loop (KERN_ATTR_TMPS_ESALT (pbkdf2_sha256_tmp_t, ethereum_p } } -__kernel void m16300_comp (KERN_ATTR_TMPS_ESALT (pbkdf2_sha256_tmp_t, ethereum_presale_t)) +KERNEL_FQ void m16300_comp (KERN_ATTR_TMPS_ESALT (pbkdf2_sha256_tmp_t, ethereum_presale_t)) { /** * base @@ -414,17 +414,17 @@ __kernel void m16300_comp (KERN_ATTR_TMPS_ESALT (pbkdf2_sha256_tmp_t, ethereum_p #ifdef REAL_SHM - __local u32 s_td0[256]; - __local u32 s_td1[256]; - __local u32 s_td2[256]; - __local u32 s_td3[256]; - __local u32 s_td4[256]; + LOCAL_AS u32 s_td0[256]; + LOCAL_AS u32 s_td1[256]; + LOCAL_AS u32 s_td2[256]; + LOCAL_AS u32 s_td3[256]; + LOCAL_AS u32 s_td4[256]; - __local u32 s_te0[256]; - __local u32 s_te1[256]; - __local u32 s_te2[256]; - __local u32 s_te3[256]; - __local u32 s_te4[256]; + LOCAL_AS u32 s_te0[256]; + LOCAL_AS u32 s_te1[256]; + LOCAL_AS u32 s_te2[256]; + LOCAL_AS u32 s_te3[256]; + LOCAL_AS u32 s_te4[256]; for (u32 i = lid; i < 256; i += lsz) { @@ -445,17 +445,17 @@ __kernel void m16300_comp (KERN_ATTR_TMPS_ESALT (pbkdf2_sha256_tmp_t, ethereum_p #else - __constant u32a *s_td0 = td0; - __constant u32a *s_td1 = td1; - __constant u32a *s_td2 = td2; - __constant u32a *s_td3 = td3; - __constant u32a *s_td4 = td4; + CONSTANT_AS u32a *s_td0 = td0; + CONSTANT_AS u32a *s_td1 = td1; + CONSTANT_AS u32a *s_td2 = td2; + CONSTANT_AS u32a *s_td3 = td3; + CONSTANT_AS u32a *s_td4 = td4; - __constant u32a *s_te0 = te0; - __constant u32a *s_te1 = te1; - __constant u32a *s_te2 = te2; - __constant u32a *s_te3 = te3; - __constant u32a *s_te4 = te4; + CONSTANT_AS u32a *s_te0 = te0; + CONSTANT_AS u32a *s_te1 = te1; + CONSTANT_AS u32a *s_te2 = te2; + CONSTANT_AS u32a *s_te3 = te3; + CONSTANT_AS u32a *s_te4 = te4; #endif diff --git a/OpenCL/m16400_a0-optimized.cl b/OpenCL/m16400_a0-optimized.cl index 03aacf74a..669ed52b4 100644 --- a/OpenCL/m16400_a0-optimized.cl +++ b/OpenCL/m16400_a0-optimized.cl @@ -15,7 +15,7 @@ #include "inc_hash_md5.cl" #endif -__kernel void m16400_m04 (KERN_ATTR_RULES ()) +KERNEL_FQ void m16400_m04 (KERN_ATTR_RULES ()) { /** * modifier @@ -154,15 +154,15 @@ __kernel void m16400_m04 (KERN_ATTR_RULES ()) } } -__kernel void m16400_m08 (KERN_ATTR_RULES ()) +KERNEL_FQ void m16400_m08 (KERN_ATTR_RULES ()) { } -__kernel void m16400_m16 (KERN_ATTR_RULES ()) +KERNEL_FQ void m16400_m16 (KERN_ATTR_RULES ()) { } -__kernel void m16400_s04 (KERN_ATTR_RULES ()) +KERNEL_FQ void m16400_s04 (KERN_ATTR_RULES ()) { /** * modifier @@ -316,10 +316,10 @@ __kernel void m16400_s04 (KERN_ATTR_RULES ()) } } -__kernel void m16400_s08 (KERN_ATTR_RULES ()) +KERNEL_FQ void m16400_s08 (KERN_ATTR_RULES ()) { } -__kernel void m16400_s16 (KERN_ATTR_RULES ()) +KERNEL_FQ void m16400_s16 (KERN_ATTR_RULES ()) { } diff --git a/OpenCL/m16400_a0-pure.cl b/OpenCL/m16400_a0-pure.cl index 2f821b761..b75f2d144 100644 --- a/OpenCL/m16400_a0-pure.cl +++ b/OpenCL/m16400_a0-pure.cl @@ -177,7 +177,7 @@ DECLSPEC void cram_md5_final (md5_ctx_t *ctx) cram_md5_transform (ctx->w0, ctx->w1, ctx->w2, ctx->w3, ctx->h); } -__kernel void m16400_mxx (KERN_ATTR_RULES ()) +KERNEL_FQ void m16400_mxx (KERN_ATTR_RULES ()) { /** * modifier @@ -221,7 +221,7 @@ __kernel void m16400_mxx (KERN_ATTR_RULES ()) } } -__kernel void m16400_sxx (KERN_ATTR_RULES ()) +KERNEL_FQ void m16400_sxx (KERN_ATTR_RULES ()) { /** * modifier diff --git a/OpenCL/m16400_a1-optimized.cl b/OpenCL/m16400_a1-optimized.cl index 9c196d6eb..674a6016e 100644 --- a/OpenCL/m16400_a1-optimized.cl +++ b/OpenCL/m16400_a1-optimized.cl @@ -14,7 +14,7 @@ #include "inc_hash_md5.cl" #endif -__kernel void m16400_m04 (KERN_ATTR_BASIC ()) +KERNEL_FQ void m16400_m04 (KERN_ATTR_BASIC ()) { /** * modifier @@ -200,15 +200,15 @@ __kernel void m16400_m04 (KERN_ATTR_BASIC ()) } } -__kernel void m16400_m08 (KERN_ATTR_BASIC ()) +KERNEL_FQ void m16400_m08 (KERN_ATTR_BASIC ()) { } -__kernel void m16400_m16 (KERN_ATTR_BASIC ()) +KERNEL_FQ void m16400_m16 (KERN_ATTR_BASIC ()) { } -__kernel void m16400_s04 (KERN_ATTR_BASIC ()) +KERNEL_FQ void m16400_s04 (KERN_ATTR_BASIC ()) { /** * modifier @@ -409,10 +409,10 @@ __kernel void m16400_s04 (KERN_ATTR_BASIC ()) } } -__kernel void m16400_s08 (KERN_ATTR_BASIC ()) +KERNEL_FQ void m16400_s08 (KERN_ATTR_BASIC ()) { } -__kernel void m16400_s16 (KERN_ATTR_BASIC ()) +KERNEL_FQ void m16400_s16 (KERN_ATTR_BASIC ()) { } diff --git a/OpenCL/m16400_a1-pure.cl b/OpenCL/m16400_a1-pure.cl index 59bea3282..16c67fcdd 100644 --- a/OpenCL/m16400_a1-pure.cl +++ b/OpenCL/m16400_a1-pure.cl @@ -143,7 +143,7 @@ DECLSPEC void cram_md5_update_64 (md5_ctx_t *ctx, u32 *w0, u32 *w1, u32 *w2, u32 ctx->w3[3] |= w3[3]; } -DECLSPEC void cram_md5_update_global (md5_ctx_t *ctx, const __global u32 *w, const int len) +DECLSPEC void cram_md5_update_global (md5_ctx_t *ctx, const GLOBAL_AS u32 *w, const int len) { u32 w0[4]; u32 w1[4]; @@ -175,7 +175,7 @@ DECLSPEC void cram_md5_final (md5_ctx_t *ctx) cram_md5_transform (ctx->w0, ctx->w1, ctx->w2, ctx->w3, ctx->h); } -__kernel void m16400_mxx (KERN_ATTR_BASIC ()) +KERNEL_FQ void m16400_mxx (KERN_ATTR_BASIC ()) { /** * modifier @@ -217,7 +217,7 @@ __kernel void m16400_mxx (KERN_ATTR_BASIC ()) } } -__kernel void m16400_sxx (KERN_ATTR_BASIC ()) +KERNEL_FQ void m16400_sxx (KERN_ATTR_BASIC ()) { /** * modifier diff --git a/OpenCL/m16400_a3-optimized.cl b/OpenCL/m16400_a3-optimized.cl index 9fac67bcc..a040bdff8 100644 --- a/OpenCL/m16400_a3-optimized.cl +++ b/OpenCL/m16400_a3-optimized.cl @@ -468,7 +468,7 @@ DECLSPEC void m16400s (u32 *w, const u32 pw_len, KERN_ATTR_VECTOR ()) } } -__kernel void m16400_m04 (KERN_ATTR_VECTOR ()) +KERNEL_FQ void m16400_m04 (KERN_ATTR_VECTOR ()) { /** * base @@ -506,7 +506,7 @@ __kernel void m16400_m04 (KERN_ATTR_VECTOR ()) m16400m (w, pw_len, pws, rules_buf, combs_buf, words_buf_r, 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_extra0_buf, d_extra1_buf, d_extra2_buf, d_extra3_buf, bitmap_mask, bitmap_shift1, bitmap_shift2, salt_pos, loop_pos, loop_cnt, il_cnt, digests_cnt, digests_offset, combs_mode, gid_max); } -__kernel void m16400_m08 (KERN_ATTR_VECTOR ()) +KERNEL_FQ void m16400_m08 (KERN_ATTR_VECTOR ()) { /** * base @@ -544,7 +544,7 @@ __kernel void m16400_m08 (KERN_ATTR_VECTOR ()) m16400m (w, pw_len, pws, rules_buf, combs_buf, words_buf_r, 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_extra0_buf, d_extra1_buf, d_extra2_buf, d_extra3_buf, bitmap_mask, bitmap_shift1, bitmap_shift2, salt_pos, loop_pos, loop_cnt, il_cnt, digests_cnt, digests_offset, combs_mode, gid_max); } -__kernel void m16400_m16 (KERN_ATTR_VECTOR ()) +KERNEL_FQ void m16400_m16 (KERN_ATTR_VECTOR ()) { /** * base @@ -582,7 +582,7 @@ __kernel void m16400_m16 (KERN_ATTR_VECTOR ()) m16400m (w, pw_len, pws, rules_buf, combs_buf, words_buf_r, 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_extra0_buf, d_extra1_buf, d_extra2_buf, d_extra3_buf, bitmap_mask, bitmap_shift1, bitmap_shift2, salt_pos, loop_pos, loop_cnt, il_cnt, digests_cnt, digests_offset, combs_mode, gid_max); } -__kernel void m16400_s04 (KERN_ATTR_VECTOR ()) +KERNEL_FQ void m16400_s04 (KERN_ATTR_VECTOR ()) { /** * base @@ -620,7 +620,7 @@ __kernel void m16400_s04 (KERN_ATTR_VECTOR ()) m16400s (w, pw_len, pws, rules_buf, combs_buf, words_buf_r, 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_extra0_buf, d_extra1_buf, d_extra2_buf, d_extra3_buf, bitmap_mask, bitmap_shift1, bitmap_shift2, salt_pos, loop_pos, loop_cnt, il_cnt, digests_cnt, digests_offset, combs_mode, gid_max); } -__kernel void m16400_s08 (KERN_ATTR_VECTOR ()) +KERNEL_FQ void m16400_s08 (KERN_ATTR_VECTOR ()) { /** * base @@ -658,7 +658,7 @@ __kernel void m16400_s08 (KERN_ATTR_VECTOR ()) m16400s (w, pw_len, pws, rules_buf, combs_buf, words_buf_r, 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_extra0_buf, d_extra1_buf, d_extra2_buf, d_extra3_buf, bitmap_mask, bitmap_shift1, bitmap_shift2, salt_pos, loop_pos, loop_cnt, il_cnt, digests_cnt, digests_offset, combs_mode, gid_max); } -__kernel void m16400_s16 (KERN_ATTR_VECTOR ()) +KERNEL_FQ void m16400_s16 (KERN_ATTR_VECTOR ()) { /** * base diff --git a/OpenCL/m16400_a3-pure.cl b/OpenCL/m16400_a3-pure.cl index 927b1a981..be36a1172 100644 --- a/OpenCL/m16400_a3-pure.cl +++ b/OpenCL/m16400_a3-pure.cl @@ -176,7 +176,7 @@ DECLSPEC void cram_md5_final_vector (md5_ctx_vector_t *ctx) cram_md5_transform_vector (ctx->w0, ctx->w1, ctx->w2, ctx->w3, ctx->h); } -__kernel void m16400_mxx (KERN_ATTR_VECTOR ()) +KERNEL_FQ void m16400_mxx (KERN_ATTR_VECTOR ()) { /** * modifier @@ -231,7 +231,7 @@ __kernel void m16400_mxx (KERN_ATTR_VECTOR ()) } } -__kernel void m16400_sxx (KERN_ATTR_VECTOR ()) +KERNEL_FQ void m16400_sxx (KERN_ATTR_VECTOR ()) { /** * modifier diff --git a/OpenCL/m16511_a0-pure.cl b/OpenCL/m16511_a0-pure.cl index cb8885996..cb742d0f6 100644 --- a/OpenCL/m16511_a0-pure.cl +++ b/OpenCL/m16511_a0-pure.cl @@ -24,7 +24,7 @@ typedef struct jwt } jwt_t; -__kernel void m16511_mxx (KERN_ATTR_RULES_ESALT (jwt_t)) +KERNEL_FQ void m16511_mxx (KERN_ATTR_RULES_ESALT (jwt_t)) { /** * modifier @@ -68,7 +68,7 @@ __kernel void m16511_mxx (KERN_ATTR_RULES_ESALT (jwt_t)) } } -__kernel void m16511_sxx (KERN_ATTR_RULES_ESALT (jwt_t)) +KERNEL_FQ void m16511_sxx (KERN_ATTR_RULES_ESALT (jwt_t)) { /** * modifier diff --git a/OpenCL/m16511_a1-pure.cl b/OpenCL/m16511_a1-pure.cl index 9a530d4fc..139282226 100644 --- a/OpenCL/m16511_a1-pure.cl +++ b/OpenCL/m16511_a1-pure.cl @@ -22,7 +22,7 @@ typedef struct jwt } jwt_t; -__kernel void m16511_mxx (KERN_ATTR_ESALT (jwt_t)) +KERNEL_FQ void m16511_mxx (KERN_ATTR_ESALT (jwt_t)) { /** * modifier @@ -91,7 +91,7 @@ __kernel void m16511_mxx (KERN_ATTR_ESALT (jwt_t)) } } -__kernel void m16511_sxx (KERN_ATTR_ESALT (jwt_t)) +KERNEL_FQ void m16511_sxx (KERN_ATTR_ESALT (jwt_t)) { /** * modifier diff --git a/OpenCL/m16511_a3-pure.cl b/OpenCL/m16511_a3-pure.cl index cf4199e5c..df4378cad 100644 --- a/OpenCL/m16511_a3-pure.cl +++ b/OpenCL/m16511_a3-pure.cl @@ -22,7 +22,7 @@ typedef struct jwt } jwt_t; -__kernel void m16511_mxx (KERN_ATTR_VECTOR_ESALT (jwt_t)) +KERNEL_FQ void m16511_mxx (KERN_ATTR_VECTOR_ESALT (jwt_t)) { /** * modifier @@ -77,7 +77,7 @@ __kernel void m16511_mxx (KERN_ATTR_VECTOR_ESALT (jwt_t)) } } -__kernel void m16511_sxx (KERN_ATTR_VECTOR_ESALT (jwt_t)) +KERNEL_FQ void m16511_sxx (KERN_ATTR_VECTOR_ESALT (jwt_t)) { /** * modifier diff --git a/OpenCL/m16512_a0-pure.cl b/OpenCL/m16512_a0-pure.cl index f2b68c57b..121d7c1bf 100644 --- a/OpenCL/m16512_a0-pure.cl +++ b/OpenCL/m16512_a0-pure.cl @@ -24,7 +24,7 @@ typedef struct jwt } jwt_t; -__kernel void m16512_mxx (KERN_ATTR_RULES_ESALT (jwt_t)) +KERNEL_FQ void m16512_mxx (KERN_ATTR_RULES_ESALT (jwt_t)) { /** * modifier @@ -68,7 +68,7 @@ __kernel void m16512_mxx (KERN_ATTR_RULES_ESALT (jwt_t)) } } -__kernel void m16512_sxx (KERN_ATTR_RULES_ESALT (jwt_t)) +KERNEL_FQ void m16512_sxx (KERN_ATTR_RULES_ESALT (jwt_t)) { /** * modifier diff --git a/OpenCL/m16512_a1-pure.cl b/OpenCL/m16512_a1-pure.cl index 5e0b693e9..09ab18ee1 100644 --- a/OpenCL/m16512_a1-pure.cl +++ b/OpenCL/m16512_a1-pure.cl @@ -22,7 +22,7 @@ typedef struct jwt } jwt_t; -__kernel void m16512_mxx (KERN_ATTR_ESALT (jwt_t)) +KERNEL_FQ void m16512_mxx (KERN_ATTR_ESALT (jwt_t)) { /** * modifier @@ -91,7 +91,7 @@ __kernel void m16512_mxx (KERN_ATTR_ESALT (jwt_t)) } } -__kernel void m16512_sxx (KERN_ATTR_ESALT (jwt_t)) +KERNEL_FQ void m16512_sxx (KERN_ATTR_ESALT (jwt_t)) { /** * modifier diff --git a/OpenCL/m16512_a3-pure.cl b/OpenCL/m16512_a3-pure.cl index b7db02107..d60e618c1 100644 --- a/OpenCL/m16512_a3-pure.cl +++ b/OpenCL/m16512_a3-pure.cl @@ -22,7 +22,7 @@ typedef struct jwt } jwt_t; -__kernel void m16512_mxx (KERN_ATTR_VECTOR_ESALT (jwt_t)) +KERNEL_FQ void m16512_mxx (KERN_ATTR_VECTOR_ESALT (jwt_t)) { /** * modifier @@ -77,7 +77,7 @@ __kernel void m16512_mxx (KERN_ATTR_VECTOR_ESALT (jwt_t)) } } -__kernel void m16512_sxx (KERN_ATTR_VECTOR_ESALT (jwt_t)) +KERNEL_FQ void m16512_sxx (KERN_ATTR_VECTOR_ESALT (jwt_t)) { /** * modifier diff --git a/OpenCL/m16513_a0-pure.cl b/OpenCL/m16513_a0-pure.cl index 00cb81c03..4940297bc 100644 --- a/OpenCL/m16513_a0-pure.cl +++ b/OpenCL/m16513_a0-pure.cl @@ -24,7 +24,7 @@ typedef struct jwt } jwt_t; -__kernel void m16513_mxx (KERN_ATTR_RULES_ESALT (jwt_t)) +KERNEL_FQ void m16513_mxx (KERN_ATTR_RULES_ESALT (jwt_t)) { /** * modifier @@ -68,7 +68,7 @@ __kernel void m16513_mxx (KERN_ATTR_RULES_ESALT (jwt_t)) } } -__kernel void m16513_sxx (KERN_ATTR_RULES_ESALT (jwt_t)) +KERNEL_FQ void m16513_sxx (KERN_ATTR_RULES_ESALT (jwt_t)) { /** * modifier diff --git a/OpenCL/m16513_a1-pure.cl b/OpenCL/m16513_a1-pure.cl index 6acbfaf27..d78d8f056 100644 --- a/OpenCL/m16513_a1-pure.cl +++ b/OpenCL/m16513_a1-pure.cl @@ -22,7 +22,7 @@ typedef struct jwt } jwt_t; -__kernel void m16513_mxx (KERN_ATTR_ESALT (jwt_t)) +KERNEL_FQ void m16513_mxx (KERN_ATTR_ESALT (jwt_t)) { /** * modifier @@ -91,7 +91,7 @@ __kernel void m16513_mxx (KERN_ATTR_ESALT (jwt_t)) } } -__kernel void m16513_sxx (KERN_ATTR_ESALT (jwt_t)) +KERNEL_FQ void m16513_sxx (KERN_ATTR_ESALT (jwt_t)) { /** * modifier diff --git a/OpenCL/m16513_a3-pure.cl b/OpenCL/m16513_a3-pure.cl index 34b1d518d..b46a2e1c8 100644 --- a/OpenCL/m16513_a3-pure.cl +++ b/OpenCL/m16513_a3-pure.cl @@ -22,7 +22,7 @@ typedef struct jwt } jwt_t; -__kernel void m16513_mxx (KERN_ATTR_VECTOR_ESALT (jwt_t)) +KERNEL_FQ void m16513_mxx (KERN_ATTR_VECTOR_ESALT (jwt_t)) { /** * modifier @@ -77,7 +77,7 @@ __kernel void m16513_mxx (KERN_ATTR_VECTOR_ESALT (jwt_t)) } } -__kernel void m16513_sxx (KERN_ATTR_VECTOR_ESALT (jwt_t)) +KERNEL_FQ void m16513_sxx (KERN_ATTR_VECTOR_ESALT (jwt_t)) { /** * modifier diff --git a/OpenCL/m16600_a0-optimized.cl b/OpenCL/m16600_a0-optimized.cl index eea99b907..0d428be06 100644 --- a/OpenCL/m16600_a0-optimized.cl +++ b/OpenCL/m16600_a0-optimized.cl @@ -24,7 +24,7 @@ typedef struct electrum_wallet } electrum_wallet_t; -__kernel void m16600_m04 (KERN_ATTR_RULES_ESALT (electrum_wallet_t)) +KERNEL_FQ void m16600_m04 (KERN_ATTR_RULES_ESALT (electrum_wallet_t)) { /** * base @@ -40,17 +40,17 @@ __kernel void m16600_m04 (KERN_ATTR_RULES_ESALT (electrum_wallet_t)) #ifdef REAL_SHM - __local u32 s_td0[256]; - __local u32 s_td1[256]; - __local u32 s_td2[256]; - __local u32 s_td3[256]; - __local u32 s_td4[256]; + LOCAL_AS u32 s_td0[256]; + LOCAL_AS u32 s_td1[256]; + LOCAL_AS u32 s_td2[256]; + LOCAL_AS u32 s_td3[256]; + LOCAL_AS u32 s_td4[256]; - __local u32 s_te0[256]; - __local u32 s_te1[256]; - __local u32 s_te2[256]; - __local u32 s_te3[256]; - __local u32 s_te4[256]; + LOCAL_AS u32 s_te0[256]; + LOCAL_AS u32 s_te1[256]; + LOCAL_AS u32 s_te2[256]; + LOCAL_AS u32 s_te3[256]; + LOCAL_AS u32 s_te4[256]; for (u32 i = lid; i < 256; i += lsz) { @@ -71,17 +71,17 @@ __kernel void m16600_m04 (KERN_ATTR_RULES_ESALT (electrum_wallet_t)) #else - __constant u32a *s_td0 = td0; - __constant u32a *s_td1 = td1; - __constant u32a *s_td2 = td2; - __constant u32a *s_td3 = td3; - __constant u32a *s_td4 = td4; + CONSTANT_AS u32a *s_td0 = td0; + CONSTANT_AS u32a *s_td1 = td1; + CONSTANT_AS u32a *s_td2 = td2; + CONSTANT_AS u32a *s_td3 = td3; + CONSTANT_AS u32a *s_td4 = td4; - __constant u32a *s_te0 = te0; - __constant u32a *s_te1 = te1; - __constant u32a *s_te2 = te2; - __constant u32a *s_te3 = te3; - __constant u32a *s_te4 = te4; + CONSTANT_AS u32a *s_te0 = te0; + CONSTANT_AS u32a *s_te1 = te1; + CONSTANT_AS u32a *s_te2 = te2; + CONSTANT_AS u32a *s_te3 = te3; + CONSTANT_AS u32a *s_te4 = te4; #endif @@ -401,15 +401,15 @@ __kernel void m16600_m04 (KERN_ATTR_RULES_ESALT (electrum_wallet_t)) } } -__kernel void m16600_m08 (KERN_ATTR_RULES_ESALT (electrum_wallet_t)) +KERNEL_FQ void m16600_m08 (KERN_ATTR_RULES_ESALT (electrum_wallet_t)) { } -__kernel void m16600_m16 (KERN_ATTR_RULES_ESALT (electrum_wallet_t)) +KERNEL_FQ void m16600_m16 (KERN_ATTR_RULES_ESALT (electrum_wallet_t)) { } -__kernel void m16600_s04 (KERN_ATTR_RULES_ESALT (electrum_wallet_t)) +KERNEL_FQ void m16600_s04 (KERN_ATTR_RULES_ESALT (electrum_wallet_t)) { /** * base @@ -425,17 +425,17 @@ __kernel void m16600_s04 (KERN_ATTR_RULES_ESALT (electrum_wallet_t)) #ifdef REAL_SHM - __local u32 s_td0[256]; - __local u32 s_td1[256]; - __local u32 s_td2[256]; - __local u32 s_td3[256]; - __local u32 s_td4[256]; + LOCAL_AS u32 s_td0[256]; + LOCAL_AS u32 s_td1[256]; + LOCAL_AS u32 s_td2[256]; + LOCAL_AS u32 s_td3[256]; + LOCAL_AS u32 s_td4[256]; - __local u32 s_te0[256]; - __local u32 s_te1[256]; - __local u32 s_te2[256]; - __local u32 s_te3[256]; - __local u32 s_te4[256]; + LOCAL_AS u32 s_te0[256]; + LOCAL_AS u32 s_te1[256]; + LOCAL_AS u32 s_te2[256]; + LOCAL_AS u32 s_te3[256]; + LOCAL_AS u32 s_te4[256]; for (u32 i = lid; i < 256; i += lsz) { @@ -456,17 +456,17 @@ __kernel void m16600_s04 (KERN_ATTR_RULES_ESALT (electrum_wallet_t)) #else - __constant u32a *s_td0 = td0; - __constant u32a *s_td1 = td1; - __constant u32a *s_td2 = td2; - __constant u32a *s_td3 = td3; - __constant u32a *s_td4 = td4; + CONSTANT_AS u32a *s_td0 = td0; + CONSTANT_AS u32a *s_td1 = td1; + CONSTANT_AS u32a *s_td2 = td2; + CONSTANT_AS u32a *s_td3 = td3; + CONSTANT_AS u32a *s_td4 = td4; - __constant u32a *s_te0 = te0; - __constant u32a *s_te1 = te1; - __constant u32a *s_te2 = te2; - __constant u32a *s_te3 = te3; - __constant u32a *s_te4 = te4; + CONSTANT_AS u32a *s_te0 = te0; + CONSTANT_AS u32a *s_te1 = te1; + CONSTANT_AS u32a *s_te2 = te2; + CONSTANT_AS u32a *s_te3 = te3; + CONSTANT_AS u32a *s_te4 = te4; #endif @@ -786,10 +786,10 @@ __kernel void m16600_s04 (KERN_ATTR_RULES_ESALT (electrum_wallet_t)) } } -__kernel void m16600_s08 (KERN_ATTR_RULES_ESALT (electrum_wallet_t)) +KERNEL_FQ void m16600_s08 (KERN_ATTR_RULES_ESALT (electrum_wallet_t)) { } -__kernel void m16600_s16 (KERN_ATTR_RULES_ESALT (electrum_wallet_t)) +KERNEL_FQ void m16600_s16 (KERN_ATTR_RULES_ESALT (electrum_wallet_t)) { } diff --git a/OpenCL/m16600_a0-pure.cl b/OpenCL/m16600_a0-pure.cl index 0244cc3f9..75697dcaa 100644 --- a/OpenCL/m16600_a0-pure.cl +++ b/OpenCL/m16600_a0-pure.cl @@ -24,7 +24,7 @@ typedef struct electrum_wallet } electrum_wallet_t; -__kernel void m16600_mxx (KERN_ATTR_RULES_ESALT (electrum_wallet_t)) +KERNEL_FQ void m16600_mxx (KERN_ATTR_RULES_ESALT (electrum_wallet_t)) { /** * base @@ -40,17 +40,17 @@ __kernel void m16600_mxx (KERN_ATTR_RULES_ESALT (electrum_wallet_t)) #ifdef REAL_SHM - __local u32 s_td0[256]; - __local u32 s_td1[256]; - __local u32 s_td2[256]; - __local u32 s_td3[256]; - __local u32 s_td4[256]; + LOCAL_AS u32 s_td0[256]; + LOCAL_AS u32 s_td1[256]; + LOCAL_AS u32 s_td2[256]; + LOCAL_AS u32 s_td3[256]; + LOCAL_AS u32 s_td4[256]; - __local u32 s_te0[256]; - __local u32 s_te1[256]; - __local u32 s_te2[256]; - __local u32 s_te3[256]; - __local u32 s_te4[256]; + LOCAL_AS u32 s_te0[256]; + LOCAL_AS u32 s_te1[256]; + LOCAL_AS u32 s_te2[256]; + LOCAL_AS u32 s_te3[256]; + LOCAL_AS u32 s_te4[256]; for (u32 i = lid; i < 256; i += lsz) { @@ -71,17 +71,17 @@ __kernel void m16600_mxx (KERN_ATTR_RULES_ESALT (electrum_wallet_t)) #else - __constant u32a *s_td0 = td0; - __constant u32a *s_td1 = td1; - __constant u32a *s_td2 = td2; - __constant u32a *s_td3 = td3; - __constant u32a *s_td4 = td4; + CONSTANT_AS u32a *s_td0 = td0; + CONSTANT_AS u32a *s_td1 = td1; + CONSTANT_AS u32a *s_td2 = td2; + CONSTANT_AS u32a *s_td3 = td3; + CONSTANT_AS u32a *s_td4 = td4; - __constant u32a *s_te0 = te0; - __constant u32a *s_te1 = te1; - __constant u32a *s_te2 = te2; - __constant u32a *s_te3 = te3; - __constant u32a *s_te4 = te4; + CONSTANT_AS u32a *s_te0 = te0; + CONSTANT_AS u32a *s_te1 = te1; + CONSTANT_AS u32a *s_te2 = te2; + CONSTANT_AS u32a *s_te3 = te3; + CONSTANT_AS u32a *s_te4 = te4; #endif @@ -215,7 +215,7 @@ __kernel void m16600_mxx (KERN_ATTR_RULES_ESALT (electrum_wallet_t)) } } -__kernel void m16600_sxx (KERN_ATTR_RULES_ESALT (electrum_wallet_t)) +KERNEL_FQ void m16600_sxx (KERN_ATTR_RULES_ESALT (electrum_wallet_t)) { /** * base @@ -231,17 +231,17 @@ __kernel void m16600_sxx (KERN_ATTR_RULES_ESALT (electrum_wallet_t)) #ifdef REAL_SHM - __local u32 s_td0[256]; - __local u32 s_td1[256]; - __local u32 s_td2[256]; - __local u32 s_td3[256]; - __local u32 s_td4[256]; + LOCAL_AS u32 s_td0[256]; + LOCAL_AS u32 s_td1[256]; + LOCAL_AS u32 s_td2[256]; + LOCAL_AS u32 s_td3[256]; + LOCAL_AS u32 s_td4[256]; - __local u32 s_te0[256]; - __local u32 s_te1[256]; - __local u32 s_te2[256]; - __local u32 s_te3[256]; - __local u32 s_te4[256]; + LOCAL_AS u32 s_te0[256]; + LOCAL_AS u32 s_te1[256]; + LOCAL_AS u32 s_te2[256]; + LOCAL_AS u32 s_te3[256]; + LOCAL_AS u32 s_te4[256]; for (u32 i = lid; i < 256; i += lsz) { @@ -262,17 +262,17 @@ __kernel void m16600_sxx (KERN_ATTR_RULES_ESALT (electrum_wallet_t)) #else - __constant u32a *s_td0 = td0; - __constant u32a *s_td1 = td1; - __constant u32a *s_td2 = td2; - __constant u32a *s_td3 = td3; - __constant u32a *s_td4 = td4; + CONSTANT_AS u32a *s_td0 = td0; + CONSTANT_AS u32a *s_td1 = td1; + CONSTANT_AS u32a *s_td2 = td2; + CONSTANT_AS u32a *s_td3 = td3; + CONSTANT_AS u32a *s_td4 = td4; - __constant u32a *s_te0 = te0; - __constant u32a *s_te1 = te1; - __constant u32a *s_te2 = te2; - __constant u32a *s_te3 = te3; - __constant u32a *s_te4 = te4; + CONSTANT_AS u32a *s_te0 = te0; + CONSTANT_AS u32a *s_te1 = te1; + CONSTANT_AS u32a *s_te2 = te2; + CONSTANT_AS u32a *s_te3 = te3; + CONSTANT_AS u32a *s_te4 = te4; #endif diff --git a/OpenCL/m16600_a1-optimized.cl b/OpenCL/m16600_a1-optimized.cl index 91726187a..9504f1481 100644 --- a/OpenCL/m16600_a1-optimized.cl +++ b/OpenCL/m16600_a1-optimized.cl @@ -22,7 +22,7 @@ typedef struct electrum_wallet } electrum_wallet_t; -__kernel void m16600_m04 (KERN_ATTR_ESALT (electrum_wallet_t)) +KERNEL_FQ void m16600_m04 (KERN_ATTR_ESALT (electrum_wallet_t)) { /** * base @@ -38,17 +38,17 @@ __kernel void m16600_m04 (KERN_ATTR_ESALT (electrum_wallet_t)) #ifdef REAL_SHM - __local u32 s_td0[256]; - __local u32 s_td1[256]; - __local u32 s_td2[256]; - __local u32 s_td3[256]; - __local u32 s_td4[256]; + LOCAL_AS u32 s_td0[256]; + LOCAL_AS u32 s_td1[256]; + LOCAL_AS u32 s_td2[256]; + LOCAL_AS u32 s_td3[256]; + LOCAL_AS u32 s_td4[256]; - __local u32 s_te0[256]; - __local u32 s_te1[256]; - __local u32 s_te2[256]; - __local u32 s_te3[256]; - __local u32 s_te4[256]; + LOCAL_AS u32 s_te0[256]; + LOCAL_AS u32 s_te1[256]; + LOCAL_AS u32 s_te2[256]; + LOCAL_AS u32 s_te3[256]; + LOCAL_AS u32 s_te4[256]; for (u32 i = lid; i < 256; i += lsz) { @@ -69,17 +69,17 @@ __kernel void m16600_m04 (KERN_ATTR_ESALT (electrum_wallet_t)) #else - __constant u32a *s_td0 = td0; - __constant u32a *s_td1 = td1; - __constant u32a *s_td2 = td2; - __constant u32a *s_td3 = td3; - __constant u32a *s_td4 = td4; + CONSTANT_AS u32a *s_td0 = td0; + CONSTANT_AS u32a *s_td1 = td1; + CONSTANT_AS u32a *s_td2 = td2; + CONSTANT_AS u32a *s_td3 = td3; + CONSTANT_AS u32a *s_td4 = td4; - __constant u32a *s_te0 = te0; - __constant u32a *s_te1 = te1; - __constant u32a *s_te2 = te2; - __constant u32a *s_te3 = te3; - __constant u32a *s_te4 = te4; + CONSTANT_AS u32a *s_te0 = te0; + CONSTANT_AS u32a *s_te1 = te1; + CONSTANT_AS u32a *s_te2 = te2; + CONSTANT_AS u32a *s_te3 = te3; + CONSTANT_AS u32a *s_te4 = te4; #endif @@ -457,15 +457,15 @@ __kernel void m16600_m04 (KERN_ATTR_ESALT (electrum_wallet_t)) } } -__kernel void m16600_m08 (KERN_ATTR_ESALT (electrum_wallet_t)) +KERNEL_FQ void m16600_m08 (KERN_ATTR_ESALT (electrum_wallet_t)) { } -__kernel void m16600_m16 (KERN_ATTR_ESALT (electrum_wallet_t)) +KERNEL_FQ void m16600_m16 (KERN_ATTR_ESALT (electrum_wallet_t)) { } -__kernel void m16600_s04 (KERN_ATTR_ESALT (electrum_wallet_t)) +KERNEL_FQ void m16600_s04 (KERN_ATTR_ESALT (electrum_wallet_t)) { /** * base @@ -481,17 +481,17 @@ __kernel void m16600_s04 (KERN_ATTR_ESALT (electrum_wallet_t)) #ifdef REAL_SHM - __local u32 s_td0[256]; - __local u32 s_td1[256]; - __local u32 s_td2[256]; - __local u32 s_td3[256]; - __local u32 s_td4[256]; + LOCAL_AS u32 s_td0[256]; + LOCAL_AS u32 s_td1[256]; + LOCAL_AS u32 s_td2[256]; + LOCAL_AS u32 s_td3[256]; + LOCAL_AS u32 s_td4[256]; - __local u32 s_te0[256]; - __local u32 s_te1[256]; - __local u32 s_te2[256]; - __local u32 s_te3[256]; - __local u32 s_te4[256]; + LOCAL_AS u32 s_te0[256]; + LOCAL_AS u32 s_te1[256]; + LOCAL_AS u32 s_te2[256]; + LOCAL_AS u32 s_te3[256]; + LOCAL_AS u32 s_te4[256]; for (u32 i = lid; i < 256; i += lsz) { @@ -512,17 +512,17 @@ __kernel void m16600_s04 (KERN_ATTR_ESALT (electrum_wallet_t)) #else - __constant u32a *s_td0 = td0; - __constant u32a *s_td1 = td1; - __constant u32a *s_td2 = td2; - __constant u32a *s_td3 = td3; - __constant u32a *s_td4 = td4; + CONSTANT_AS u32a *s_td0 = td0; + CONSTANT_AS u32a *s_td1 = td1; + CONSTANT_AS u32a *s_td2 = td2; + CONSTANT_AS u32a *s_td3 = td3; + CONSTANT_AS u32a *s_td4 = td4; - __constant u32a *s_te0 = te0; - __constant u32a *s_te1 = te1; - __constant u32a *s_te2 = te2; - __constant u32a *s_te3 = te3; - __constant u32a *s_te4 = te4; + CONSTANT_AS u32a *s_te0 = te0; + CONSTANT_AS u32a *s_te1 = te1; + CONSTANT_AS u32a *s_te2 = te2; + CONSTANT_AS u32a *s_te3 = te3; + CONSTANT_AS u32a *s_te4 = te4; #endif @@ -900,10 +900,10 @@ __kernel void m16600_s04 (KERN_ATTR_ESALT (electrum_wallet_t)) } } -__kernel void m16600_s08 (KERN_ATTR_ESALT (electrum_wallet_t)) +KERNEL_FQ void m16600_s08 (KERN_ATTR_ESALT (electrum_wallet_t)) { } -__kernel void m16600_s16 (KERN_ATTR_ESALT (electrum_wallet_t)) +KERNEL_FQ void m16600_s16 (KERN_ATTR_ESALT (electrum_wallet_t)) { } diff --git a/OpenCL/m16600_a1-pure.cl b/OpenCL/m16600_a1-pure.cl index 32aec90e6..f86561e7c 100644 --- a/OpenCL/m16600_a1-pure.cl +++ b/OpenCL/m16600_a1-pure.cl @@ -22,7 +22,7 @@ typedef struct electrum_wallet } electrum_wallet_t; -__kernel void m16600_mxx (KERN_ATTR_ESALT (electrum_wallet_t)) +KERNEL_FQ void m16600_mxx (KERN_ATTR_ESALT (electrum_wallet_t)) { /** * base @@ -38,17 +38,17 @@ __kernel void m16600_mxx (KERN_ATTR_ESALT (electrum_wallet_t)) #ifdef REAL_SHM - __local u32 s_td0[256]; - __local u32 s_td1[256]; - __local u32 s_td2[256]; - __local u32 s_td3[256]; - __local u32 s_td4[256]; + LOCAL_AS u32 s_td0[256]; + LOCAL_AS u32 s_td1[256]; + LOCAL_AS u32 s_td2[256]; + LOCAL_AS u32 s_td3[256]; + LOCAL_AS u32 s_td4[256]; - __local u32 s_te0[256]; - __local u32 s_te1[256]; - __local u32 s_te2[256]; - __local u32 s_te3[256]; - __local u32 s_te4[256]; + LOCAL_AS u32 s_te0[256]; + LOCAL_AS u32 s_te1[256]; + LOCAL_AS u32 s_te2[256]; + LOCAL_AS u32 s_te3[256]; + LOCAL_AS u32 s_te4[256]; for (u32 i = lid; i < 256; i += lsz) { @@ -69,17 +69,17 @@ __kernel void m16600_mxx (KERN_ATTR_ESALT (electrum_wallet_t)) #else - __constant u32a *s_td0 = td0; - __constant u32a *s_td1 = td1; - __constant u32a *s_td2 = td2; - __constant u32a *s_td3 = td3; - __constant u32a *s_td4 = td4; + CONSTANT_AS u32a *s_td0 = td0; + CONSTANT_AS u32a *s_td1 = td1; + CONSTANT_AS u32a *s_td2 = td2; + CONSTANT_AS u32a *s_td3 = td3; + CONSTANT_AS u32a *s_td4 = td4; - __constant u32a *s_te0 = te0; - __constant u32a *s_te1 = te1; - __constant u32a *s_te2 = te2; - __constant u32a *s_te3 = te3; - __constant u32a *s_te4 = te4; + CONSTANT_AS u32a *s_te0 = te0; + CONSTANT_AS u32a *s_te1 = te1; + CONSTANT_AS u32a *s_te2 = te2; + CONSTANT_AS u32a *s_te3 = te3; + CONSTANT_AS u32a *s_te4 = te4; #endif @@ -211,7 +211,7 @@ __kernel void m16600_mxx (KERN_ATTR_ESALT (electrum_wallet_t)) } } -__kernel void m16600_sxx (KERN_ATTR_ESALT (electrum_wallet_t)) +KERNEL_FQ void m16600_sxx (KERN_ATTR_ESALT (electrum_wallet_t)) { /** * base @@ -227,17 +227,17 @@ __kernel void m16600_sxx (KERN_ATTR_ESALT (electrum_wallet_t)) #ifdef REAL_SHM - __local u32 s_td0[256]; - __local u32 s_td1[256]; - __local u32 s_td2[256]; - __local u32 s_td3[256]; - __local u32 s_td4[256]; + LOCAL_AS u32 s_td0[256]; + LOCAL_AS u32 s_td1[256]; + LOCAL_AS u32 s_td2[256]; + LOCAL_AS u32 s_td3[256]; + LOCAL_AS u32 s_td4[256]; - __local u32 s_te0[256]; - __local u32 s_te1[256]; - __local u32 s_te2[256]; - __local u32 s_te3[256]; - __local u32 s_te4[256]; + LOCAL_AS u32 s_te0[256]; + LOCAL_AS u32 s_te1[256]; + LOCAL_AS u32 s_te2[256]; + LOCAL_AS u32 s_te3[256]; + LOCAL_AS u32 s_te4[256]; for (u32 i = lid; i < 256; i += lsz) { @@ -258,17 +258,17 @@ __kernel void m16600_sxx (KERN_ATTR_ESALT (electrum_wallet_t)) #else - __constant u32a *s_td0 = td0; - __constant u32a *s_td1 = td1; - __constant u32a *s_td2 = td2; - __constant u32a *s_td3 = td3; - __constant u32a *s_td4 = td4; + CONSTANT_AS u32a *s_td0 = td0; + CONSTANT_AS u32a *s_td1 = td1; + CONSTANT_AS u32a *s_td2 = td2; + CONSTANT_AS u32a *s_td3 = td3; + CONSTANT_AS u32a *s_td4 = td4; - __constant u32a *s_te0 = te0; - __constant u32a *s_te1 = te1; - __constant u32a *s_te2 = te2; - __constant u32a *s_te3 = te3; - __constant u32a *s_te4 = te4; + CONSTANT_AS u32a *s_te0 = te0; + CONSTANT_AS u32a *s_te1 = te1; + CONSTANT_AS u32a *s_te2 = te2; + CONSTANT_AS u32a *s_te3 = te3; + CONSTANT_AS u32a *s_te4 = te4; #endif diff --git a/OpenCL/m16600_a3-optimized.cl b/OpenCL/m16600_a3-optimized.cl index 78f6fd207..5c453cd38 100644 --- a/OpenCL/m16600_a3-optimized.cl +++ b/OpenCL/m16600_a3-optimized.cl @@ -319,7 +319,7 @@ DECLSPEC void m16600 (SHM_TYPE u32a *s_te0, SHM_TYPE u32a *s_te1, SHM_TYPE u32a } } -__kernel void m16600_m04 (KERN_ATTR_ESALT (electrum_wallet_t)) +KERNEL_FQ void m16600_m04 (KERN_ATTR_ESALT (electrum_wallet_t)) { /** * base @@ -335,17 +335,17 @@ __kernel void m16600_m04 (KERN_ATTR_ESALT (electrum_wallet_t)) #ifdef REAL_SHM - __local u32 s_td0[256]; - __local u32 s_td1[256]; - __local u32 s_td2[256]; - __local u32 s_td3[256]; - __local u32 s_td4[256]; + LOCAL_AS u32 s_td0[256]; + LOCAL_AS u32 s_td1[256]; + LOCAL_AS u32 s_td2[256]; + LOCAL_AS u32 s_td3[256]; + LOCAL_AS u32 s_td4[256]; - __local u32 s_te0[256]; - __local u32 s_te1[256]; - __local u32 s_te2[256]; - __local u32 s_te3[256]; - __local u32 s_te4[256]; + LOCAL_AS u32 s_te0[256]; + LOCAL_AS u32 s_te1[256]; + LOCAL_AS u32 s_te2[256]; + LOCAL_AS u32 s_te3[256]; + LOCAL_AS u32 s_te4[256]; for (u32 i = lid; i < 256; i += lsz) { @@ -366,17 +366,17 @@ __kernel void m16600_m04 (KERN_ATTR_ESALT (electrum_wallet_t)) #else - __constant u32a *s_td0 = td0; - __constant u32a *s_td1 = td1; - __constant u32a *s_td2 = td2; - __constant u32a *s_td3 = td3; - __constant u32a *s_td4 = td4; + CONSTANT_AS u32a *s_td0 = td0; + CONSTANT_AS u32a *s_td1 = td1; + CONSTANT_AS u32a *s_td2 = td2; + CONSTANT_AS u32a *s_td3 = td3; + CONSTANT_AS u32a *s_td4 = td4; - __constant u32a *s_te0 = te0; - __constant u32a *s_te1 = te1; - __constant u32a *s_te2 = te2; - __constant u32a *s_te3 = te3; - __constant u32a *s_te4 = te4; + CONSTANT_AS u32a *s_te0 = te0; + CONSTANT_AS u32a *s_te1 = te1; + CONSTANT_AS u32a *s_te2 = te2; + CONSTANT_AS u32a *s_te3 = te3; + CONSTANT_AS u32a *s_te4 = te4; #endif @@ -414,7 +414,7 @@ __kernel void m16600_m04 (KERN_ATTR_ESALT (electrum_wallet_t)) m16600 (s_te0, s_te1, s_te2, s_te3, s_te4, s_td0, s_td1, s_td2, s_td3, s_td4, w, 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_extra0_buf, d_extra1_buf, d_extra2_buf, d_extra3_buf, bitmap_mask, bitmap_shift1, bitmap_shift2, salt_pos, loop_pos, loop_cnt, il_cnt, digests_cnt, digests_offset, combs_mode, gid_max); } -__kernel void m16600_m08 (KERN_ATTR_ESALT (electrum_wallet_t)) +KERNEL_FQ void m16600_m08 (KERN_ATTR_ESALT (electrum_wallet_t)) { /** * base @@ -430,17 +430,17 @@ __kernel void m16600_m08 (KERN_ATTR_ESALT (electrum_wallet_t)) #ifdef REAL_SHM - __local u32 s_td0[256]; - __local u32 s_td1[256]; - __local u32 s_td2[256]; - __local u32 s_td3[256]; - __local u32 s_td4[256]; + LOCAL_AS u32 s_td0[256]; + LOCAL_AS u32 s_td1[256]; + LOCAL_AS u32 s_td2[256]; + LOCAL_AS u32 s_td3[256]; + LOCAL_AS u32 s_td4[256]; - __local u32 s_te0[256]; - __local u32 s_te1[256]; - __local u32 s_te2[256]; - __local u32 s_te3[256]; - __local u32 s_te4[256]; + LOCAL_AS u32 s_te0[256]; + LOCAL_AS u32 s_te1[256]; + LOCAL_AS u32 s_te2[256]; + LOCAL_AS u32 s_te3[256]; + LOCAL_AS u32 s_te4[256]; for (u32 i = lid; i < 256; i += lsz) { @@ -461,17 +461,17 @@ __kernel void m16600_m08 (KERN_ATTR_ESALT (electrum_wallet_t)) #else - __constant u32a *s_td0 = td0; - __constant u32a *s_td1 = td1; - __constant u32a *s_td2 = td2; - __constant u32a *s_td3 = td3; - __constant u32a *s_td4 = td4; + CONSTANT_AS u32a *s_td0 = td0; + CONSTANT_AS u32a *s_td1 = td1; + CONSTANT_AS u32a *s_td2 = td2; + CONSTANT_AS u32a *s_td3 = td3; + CONSTANT_AS u32a *s_td4 = td4; - __constant u32a *s_te0 = te0; - __constant u32a *s_te1 = te1; - __constant u32a *s_te2 = te2; - __constant u32a *s_te3 = te3; - __constant u32a *s_te4 = te4; + CONSTANT_AS u32a *s_te0 = te0; + CONSTANT_AS u32a *s_te1 = te1; + CONSTANT_AS u32a *s_te2 = te2; + CONSTANT_AS u32a *s_te3 = te3; + CONSTANT_AS u32a *s_te4 = te4; #endif @@ -509,7 +509,7 @@ __kernel void m16600_m08 (KERN_ATTR_ESALT (electrum_wallet_t)) m16600 (s_te0, s_te1, s_te2, s_te3, s_te4, s_td0, s_td1, s_td2, s_td3, s_td4, w, 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_extra0_buf, d_extra1_buf, d_extra2_buf, d_extra3_buf, bitmap_mask, bitmap_shift1, bitmap_shift2, salt_pos, loop_pos, loop_cnt, il_cnt, digests_cnt, digests_offset, combs_mode, gid_max); } -__kernel void m16600_m16 (KERN_ATTR_ESALT (electrum_wallet_t)) +KERNEL_FQ void m16600_m16 (KERN_ATTR_ESALT (electrum_wallet_t)) { /** * base @@ -525,17 +525,17 @@ __kernel void m16600_m16 (KERN_ATTR_ESALT (electrum_wallet_t)) #ifdef REAL_SHM - __local u32 s_td0[256]; - __local u32 s_td1[256]; - __local u32 s_td2[256]; - __local u32 s_td3[256]; - __local u32 s_td4[256]; + LOCAL_AS u32 s_td0[256]; + LOCAL_AS u32 s_td1[256]; + LOCAL_AS u32 s_td2[256]; + LOCAL_AS u32 s_td3[256]; + LOCAL_AS u32 s_td4[256]; - __local u32 s_te0[256]; - __local u32 s_te1[256]; - __local u32 s_te2[256]; - __local u32 s_te3[256]; - __local u32 s_te4[256]; + LOCAL_AS u32 s_te0[256]; + LOCAL_AS u32 s_te1[256]; + LOCAL_AS u32 s_te2[256]; + LOCAL_AS u32 s_te3[256]; + LOCAL_AS u32 s_te4[256]; for (u32 i = lid; i < 256; i += lsz) { @@ -556,17 +556,17 @@ __kernel void m16600_m16 (KERN_ATTR_ESALT (electrum_wallet_t)) #else - __constant u32a *s_td0 = td0; - __constant u32a *s_td1 = td1; - __constant u32a *s_td2 = td2; - __constant u32a *s_td3 = td3; - __constant u32a *s_td4 = td4; + CONSTANT_AS u32a *s_td0 = td0; + CONSTANT_AS u32a *s_td1 = td1; + CONSTANT_AS u32a *s_td2 = td2; + CONSTANT_AS u32a *s_td3 = td3; + CONSTANT_AS u32a *s_td4 = td4; - __constant u32a *s_te0 = te0; - __constant u32a *s_te1 = te1; - __constant u32a *s_te2 = te2; - __constant u32a *s_te3 = te3; - __constant u32a *s_te4 = te4; + CONSTANT_AS u32a *s_te0 = te0; + CONSTANT_AS u32a *s_te1 = te1; + CONSTANT_AS u32a *s_te2 = te2; + CONSTANT_AS u32a *s_te3 = te3; + CONSTANT_AS u32a *s_te4 = te4; #endif @@ -604,7 +604,7 @@ __kernel void m16600_m16 (KERN_ATTR_ESALT (electrum_wallet_t)) m16600 (s_te0, s_te1, s_te2, s_te3, s_te4, s_td0, s_td1, s_td2, s_td3, s_td4, w, 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_extra0_buf, d_extra1_buf, d_extra2_buf, d_extra3_buf, bitmap_mask, bitmap_shift1, bitmap_shift2, salt_pos, loop_pos, loop_cnt, il_cnt, digests_cnt, digests_offset, combs_mode, gid_max); } -__kernel void m16600_s04 (KERN_ATTR_ESALT (electrum_wallet_t)) +KERNEL_FQ void m16600_s04 (KERN_ATTR_ESALT (electrum_wallet_t)) { /** * base @@ -620,17 +620,17 @@ __kernel void m16600_s04 (KERN_ATTR_ESALT (electrum_wallet_t)) #ifdef REAL_SHM - __local u32 s_td0[256]; - __local u32 s_td1[256]; - __local u32 s_td2[256]; - __local u32 s_td3[256]; - __local u32 s_td4[256]; + LOCAL_AS u32 s_td0[256]; + LOCAL_AS u32 s_td1[256]; + LOCAL_AS u32 s_td2[256]; + LOCAL_AS u32 s_td3[256]; + LOCAL_AS u32 s_td4[256]; - __local u32 s_te0[256]; - __local u32 s_te1[256]; - __local u32 s_te2[256]; - __local u32 s_te3[256]; - __local u32 s_te4[256]; + LOCAL_AS u32 s_te0[256]; + LOCAL_AS u32 s_te1[256]; + LOCAL_AS u32 s_te2[256]; + LOCAL_AS u32 s_te3[256]; + LOCAL_AS u32 s_te4[256]; for (u32 i = lid; i < 256; i += lsz) { @@ -651,17 +651,17 @@ __kernel void m16600_s04 (KERN_ATTR_ESALT (electrum_wallet_t)) #else - __constant u32a *s_td0 = td0; - __constant u32a *s_td1 = td1; - __constant u32a *s_td2 = td2; - __constant u32a *s_td3 = td3; - __constant u32a *s_td4 = td4; + CONSTANT_AS u32a *s_td0 = td0; + CONSTANT_AS u32a *s_td1 = td1; + CONSTANT_AS u32a *s_td2 = td2; + CONSTANT_AS u32a *s_td3 = td3; + CONSTANT_AS u32a *s_td4 = td4; - __constant u32a *s_te0 = te0; - __constant u32a *s_te1 = te1; - __constant u32a *s_te2 = te2; - __constant u32a *s_te3 = te3; - __constant u32a *s_te4 = te4; + CONSTANT_AS u32a *s_te0 = te0; + CONSTANT_AS u32a *s_te1 = te1; + CONSTANT_AS u32a *s_te2 = te2; + CONSTANT_AS u32a *s_te3 = te3; + CONSTANT_AS u32a *s_te4 = te4; #endif @@ -699,7 +699,7 @@ __kernel void m16600_s04 (KERN_ATTR_ESALT (electrum_wallet_t)) m16600 (s_te0, s_te1, s_te2, s_te3, s_te4, s_td0, s_td1, s_td2, s_td3, s_td4, w, 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_extra0_buf, d_extra1_buf, d_extra2_buf, d_extra3_buf, bitmap_mask, bitmap_shift1, bitmap_shift2, salt_pos, loop_pos, loop_cnt, il_cnt, digests_cnt, digests_offset, combs_mode, gid_max); } -__kernel void m16600_s08 (KERN_ATTR_ESALT (electrum_wallet_t)) +KERNEL_FQ void m16600_s08 (KERN_ATTR_ESALT (electrum_wallet_t)) { /** * base @@ -715,17 +715,17 @@ __kernel void m16600_s08 (KERN_ATTR_ESALT (electrum_wallet_t)) #ifdef REAL_SHM - __local u32 s_td0[256]; - __local u32 s_td1[256]; - __local u32 s_td2[256]; - __local u32 s_td3[256]; - __local u32 s_td4[256]; + LOCAL_AS u32 s_td0[256]; + LOCAL_AS u32 s_td1[256]; + LOCAL_AS u32 s_td2[256]; + LOCAL_AS u32 s_td3[256]; + LOCAL_AS u32 s_td4[256]; - __local u32 s_te0[256]; - __local u32 s_te1[256]; - __local u32 s_te2[256]; - __local u32 s_te3[256]; - __local u32 s_te4[256]; + LOCAL_AS u32 s_te0[256]; + LOCAL_AS u32 s_te1[256]; + LOCAL_AS u32 s_te2[256]; + LOCAL_AS u32 s_te3[256]; + LOCAL_AS u32 s_te4[256]; for (u32 i = lid; i < 256; i += lsz) { @@ -746,17 +746,17 @@ __kernel void m16600_s08 (KERN_ATTR_ESALT (electrum_wallet_t)) #else - __constant u32a *s_td0 = td0; - __constant u32a *s_td1 = td1; - __constant u32a *s_td2 = td2; - __constant u32a *s_td3 = td3; - __constant u32a *s_td4 = td4; + CONSTANT_AS u32a *s_td0 = td0; + CONSTANT_AS u32a *s_td1 = td1; + CONSTANT_AS u32a *s_td2 = td2; + CONSTANT_AS u32a *s_td3 = td3; + CONSTANT_AS u32a *s_td4 = td4; - __constant u32a *s_te0 = te0; - __constant u32a *s_te1 = te1; - __constant u32a *s_te2 = te2; - __constant u32a *s_te3 = te3; - __constant u32a *s_te4 = te4; + CONSTANT_AS u32a *s_te0 = te0; + CONSTANT_AS u32a *s_te1 = te1; + CONSTANT_AS u32a *s_te2 = te2; + CONSTANT_AS u32a *s_te3 = te3; + CONSTANT_AS u32a *s_te4 = te4; #endif @@ -794,7 +794,7 @@ __kernel void m16600_s08 (KERN_ATTR_ESALT (electrum_wallet_t)) m16600 (s_te0, s_te1, s_te2, s_te3, s_te4, s_td0, s_td1, s_td2, s_td3, s_td4, w, 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_extra0_buf, d_extra1_buf, d_extra2_buf, d_extra3_buf, bitmap_mask, bitmap_shift1, bitmap_shift2, salt_pos, loop_pos, loop_cnt, il_cnt, digests_cnt, digests_offset, combs_mode, gid_max); } -__kernel void m16600_s16 (KERN_ATTR_ESALT (electrum_wallet_t)) +KERNEL_FQ void m16600_s16 (KERN_ATTR_ESALT (electrum_wallet_t)) { /** * base @@ -810,17 +810,17 @@ __kernel void m16600_s16 (KERN_ATTR_ESALT (electrum_wallet_t)) #ifdef REAL_SHM - __local u32 s_td0[256]; - __local u32 s_td1[256]; - __local u32 s_td2[256]; - __local u32 s_td3[256]; - __local u32 s_td4[256]; + LOCAL_AS u32 s_td0[256]; + LOCAL_AS u32 s_td1[256]; + LOCAL_AS u32 s_td2[256]; + LOCAL_AS u32 s_td3[256]; + LOCAL_AS u32 s_td4[256]; - __local u32 s_te0[256]; - __local u32 s_te1[256]; - __local u32 s_te2[256]; - __local u32 s_te3[256]; - __local u32 s_te4[256]; + LOCAL_AS u32 s_te0[256]; + LOCAL_AS u32 s_te1[256]; + LOCAL_AS u32 s_te2[256]; + LOCAL_AS u32 s_te3[256]; + LOCAL_AS u32 s_te4[256]; for (u32 i = lid; i < 256; i += lsz) { @@ -841,17 +841,17 @@ __kernel void m16600_s16 (KERN_ATTR_ESALT (electrum_wallet_t)) #else - __constant u32a *s_td0 = td0; - __constant u32a *s_td1 = td1; - __constant u32a *s_td2 = td2; - __constant u32a *s_td3 = td3; - __constant u32a *s_td4 = td4; + CONSTANT_AS u32a *s_td0 = td0; + CONSTANT_AS u32a *s_td1 = td1; + CONSTANT_AS u32a *s_td2 = td2; + CONSTANT_AS u32a *s_td3 = td3; + CONSTANT_AS u32a *s_td4 = td4; - __constant u32a *s_te0 = te0; - __constant u32a *s_te1 = te1; - __constant u32a *s_te2 = te2; - __constant u32a *s_te3 = te3; - __constant u32a *s_te4 = te4; + CONSTANT_AS u32a *s_te0 = te0; + CONSTANT_AS u32a *s_te1 = te1; + CONSTANT_AS u32a *s_te2 = te2; + CONSTANT_AS u32a *s_te3 = te3; + CONSTANT_AS u32a *s_te4 = te4; #endif diff --git a/OpenCL/m16600_a3-pure.cl b/OpenCL/m16600_a3-pure.cl index 71b95f21d..0b63b2beb 100644 --- a/OpenCL/m16600_a3-pure.cl +++ b/OpenCL/m16600_a3-pure.cl @@ -22,7 +22,7 @@ typedef struct electrum_wallet } electrum_wallet_t; -__kernel void m16600_mxx (KERN_ATTR_VECTOR_ESALT (electrum_wallet_t)) +KERNEL_FQ void m16600_mxx (KERN_ATTR_VECTOR_ESALT (electrum_wallet_t)) { /** * base @@ -38,17 +38,17 @@ __kernel void m16600_mxx (KERN_ATTR_VECTOR_ESALT (electrum_wallet_t)) #ifdef REAL_SHM - __local u32 s_td0[256]; - __local u32 s_td1[256]; - __local u32 s_td2[256]; - __local u32 s_td3[256]; - __local u32 s_td4[256]; + LOCAL_AS u32 s_td0[256]; + LOCAL_AS u32 s_td1[256]; + LOCAL_AS u32 s_td2[256]; + LOCAL_AS u32 s_td3[256]; + LOCAL_AS u32 s_td4[256]; - __local u32 s_te0[256]; - __local u32 s_te1[256]; - __local u32 s_te2[256]; - __local u32 s_te3[256]; - __local u32 s_te4[256]; + LOCAL_AS u32 s_te0[256]; + LOCAL_AS u32 s_te1[256]; + LOCAL_AS u32 s_te2[256]; + LOCAL_AS u32 s_te3[256]; + LOCAL_AS u32 s_te4[256]; for (u32 i = lid; i < 256; i += lsz) { @@ -69,17 +69,17 @@ __kernel void m16600_mxx (KERN_ATTR_VECTOR_ESALT (electrum_wallet_t)) #else - __constant u32a *s_td0 = td0; - __constant u32a *s_td1 = td1; - __constant u32a *s_td2 = td2; - __constant u32a *s_td3 = td3; - __constant u32a *s_td4 = td4; + CONSTANT_AS u32a *s_td0 = td0; + CONSTANT_AS u32a *s_td1 = td1; + CONSTANT_AS u32a *s_td2 = td2; + CONSTANT_AS u32a *s_td3 = td3; + CONSTANT_AS u32a *s_td4 = td4; - __constant u32a *s_te0 = te0; - __constant u32a *s_te1 = te1; - __constant u32a *s_te2 = te2; - __constant u32a *s_te3 = te3; - __constant u32a *s_te4 = te4; + CONSTANT_AS u32a *s_te0 = te0; + CONSTANT_AS u32a *s_te1 = te1; + CONSTANT_AS u32a *s_te2 = te2; + CONSTANT_AS u32a *s_te3 = te3; + CONSTANT_AS u32a *s_te4 = te4; #endif @@ -224,7 +224,7 @@ __kernel void m16600_mxx (KERN_ATTR_VECTOR_ESALT (electrum_wallet_t)) } } -__kernel void m16600_sxx (KERN_ATTR_VECTOR_ESALT (electrum_wallet_t)) +KERNEL_FQ void m16600_sxx (KERN_ATTR_VECTOR_ESALT (electrum_wallet_t)) { /** * base @@ -240,17 +240,17 @@ __kernel void m16600_sxx (KERN_ATTR_VECTOR_ESALT (electrum_wallet_t)) #ifdef REAL_SHM - __local u32 s_td0[256]; - __local u32 s_td1[256]; - __local u32 s_td2[256]; - __local u32 s_td3[256]; - __local u32 s_td4[256]; + LOCAL_AS u32 s_td0[256]; + LOCAL_AS u32 s_td1[256]; + LOCAL_AS u32 s_td2[256]; + LOCAL_AS u32 s_td3[256]; + LOCAL_AS u32 s_td4[256]; - __local u32 s_te0[256]; - __local u32 s_te1[256]; - __local u32 s_te2[256]; - __local u32 s_te3[256]; - __local u32 s_te4[256]; + LOCAL_AS u32 s_te0[256]; + LOCAL_AS u32 s_te1[256]; + LOCAL_AS u32 s_te2[256]; + LOCAL_AS u32 s_te3[256]; + LOCAL_AS u32 s_te4[256]; for (u32 i = lid; i < 256; i += lsz) { @@ -271,17 +271,17 @@ __kernel void m16600_sxx (KERN_ATTR_VECTOR_ESALT (electrum_wallet_t)) #else - __constant u32a *s_td0 = td0; - __constant u32a *s_td1 = td1; - __constant u32a *s_td2 = td2; - __constant u32a *s_td3 = td3; - __constant u32a *s_td4 = td4; + CONSTANT_AS u32a *s_td0 = td0; + CONSTANT_AS u32a *s_td1 = td1; + CONSTANT_AS u32a *s_td2 = td2; + CONSTANT_AS u32a *s_td3 = td3; + CONSTANT_AS u32a *s_td4 = td4; - __constant u32a *s_te0 = te0; - __constant u32a *s_te1 = te1; - __constant u32a *s_te2 = te2; - __constant u32a *s_te3 = te3; - __constant u32a *s_te4 = te4; + CONSTANT_AS u32a *s_te0 = te0; + CONSTANT_AS u32a *s_te1 = te1; + CONSTANT_AS u32a *s_te2 = te2; + CONSTANT_AS u32a *s_te3 = te3; + CONSTANT_AS u32a *s_te4 = te4; #endif diff --git a/OpenCL/m16800-pure.cl b/OpenCL/m16800-pure.cl index 4fc3c235b..c204d6b6e 100644 --- a/OpenCL/m16800-pure.cl +++ b/OpenCL/m16800-pure.cl @@ -73,7 +73,7 @@ DECLSPEC void hmac_sha1_run_V (u32x *w0, u32x *w1, u32x *w2, u32x *w3, u32x *ipa sha1_transform_vector (w0, w1, w2, w3, digest); } -__kernel void m16800_init (KERN_ATTR_TMPS_ESALT (wpa_pbkdf2_tmp_t, wpa_pmkid_t)) +KERNEL_FQ void m16800_init (KERN_ATTR_TMPS_ESALT (wpa_pbkdf2_tmp_t, wpa_pmkid_t)) { /** * base @@ -145,7 +145,7 @@ __kernel void m16800_init (KERN_ATTR_TMPS_ESALT (wpa_pbkdf2_tmp_t, wpa_pmkid_t)) } } -__kernel void m16800_loop (KERN_ATTR_TMPS_ESALT (wpa_pbkdf2_tmp_t, wpa_pmkid_t)) +KERNEL_FQ void m16800_loop (KERN_ATTR_TMPS_ESALT (wpa_pbkdf2_tmp_t, wpa_pmkid_t)) { const u64 gid = get_global_id (0); @@ -230,12 +230,12 @@ __kernel void m16800_loop (KERN_ATTR_TMPS_ESALT (wpa_pbkdf2_tmp_t, wpa_pmkid_t)) } } -__kernel void m16800_comp (KERN_ATTR_TMPS_ESALT (wpa_pbkdf2_tmp_t, wpa_pmkid_t)) +KERNEL_FQ void m16800_comp (KERN_ATTR_TMPS_ESALT (wpa_pbkdf2_tmp_t, wpa_pmkid_t)) { // not in use here, special case... } -__kernel void m16800_aux1 (KERN_ATTR_TMPS_ESALT (wpa_pbkdf2_tmp_t, wpa_pmkid_t)) +KERNEL_FQ void m16800_aux1 (KERN_ATTR_TMPS_ESALT (wpa_pbkdf2_tmp_t, wpa_pmkid_t)) { const u64 gid = get_global_id (0); const u64 lid = get_local_id (0); @@ -265,7 +265,7 @@ __kernel void m16800_aux1 (KERN_ATTR_TMPS_ESALT (wpa_pbkdf2_tmp_t, wpa_pmkid_t)) const u32 digest_cur = digests_offset + digest_pos; - __global const wpa_pmkid_t *wpa_pmkid = &esalt_bufs[digest_cur]; + GLOBAL_AS const wpa_pmkid_t *wpa_pmkid = &esalt_bufs[digest_cur]; sha1_hmac_ctx_t sha1_hmac_ctx; diff --git a/OpenCL/m16801-pure.cl b/OpenCL/m16801-pure.cl index 5beac4b72..3afbefa1d 100644 --- a/OpenCL/m16801-pure.cl +++ b/OpenCL/m16801-pure.cl @@ -48,7 +48,7 @@ DECLSPEC u8 hex_to_u8 (const u8 *hex) return (v); } -__kernel void m16801_init (KERN_ATTR_TMPS_ESALT (wpa_pmk_tmp_t, wpa_pmkid_t)) +KERNEL_FQ void m16801_init (KERN_ATTR_TMPS_ESALT (wpa_pmk_tmp_t, wpa_pmkid_t)) { const u64 gid = get_global_id (0); @@ -94,19 +94,19 @@ __kernel void m16801_init (KERN_ATTR_TMPS_ESALT (wpa_pmk_tmp_t, wpa_pmkid_t)) tmps[gid].out[7] = swap32_S (out[7]); } -__kernel void m16801_loop (KERN_ATTR_TMPS_ESALT (wpa_pmk_tmp_t, wpa_pmkid_t)) +KERNEL_FQ void m16801_loop (KERN_ATTR_TMPS_ESALT (wpa_pmk_tmp_t, wpa_pmkid_t)) { const u64 gid = get_global_id (0); if (gid >= gid_max) return; } -__kernel void m16801_comp (KERN_ATTR_TMPS_ESALT (wpa_pmk_tmp_t, wpa_pmkid_t)) +KERNEL_FQ void m16801_comp (KERN_ATTR_TMPS_ESALT (wpa_pmk_tmp_t, wpa_pmkid_t)) { // not in use here, special case... } -__kernel void m16801_aux1 (KERN_ATTR_TMPS_ESALT (wpa_pmk_tmp_t, wpa_pmkid_t)) +KERNEL_FQ void m16801_aux1 (KERN_ATTR_TMPS_ESALT (wpa_pmk_tmp_t, wpa_pmkid_t)) { const u64 gid = get_global_id (0); const u64 lid = get_local_id (0); @@ -136,7 +136,7 @@ __kernel void m16801_aux1 (KERN_ATTR_TMPS_ESALT (wpa_pmk_tmp_t, wpa_pmkid_t)) const u32 digest_cur = digests_offset + digest_pos; - __global const wpa_pmkid_t *wpa_pmkid = &esalt_bufs[digest_cur]; + GLOBAL_AS const wpa_pmkid_t *wpa_pmkid = &esalt_bufs[digest_cur]; sha1_hmac_ctx_t sha1_hmac_ctx; diff --git a/OpenCL/m16900-pure.cl b/OpenCL/m16900-pure.cl index f28580de8..649a16b2e 100644 --- a/OpenCL/m16900-pure.cl +++ b/OpenCL/m16900-pure.cl @@ -77,7 +77,7 @@ DECLSPEC void hmac_sha256_run_V (u32x *w0, u32x *w1, u32x *w2, u32x *w3, u32x *i sha256_transform_vector (w0, w1, w2, w3, digest); } -__kernel void m16900_init (KERN_ATTR_TMPS_ESALT (pbkdf2_sha256_tmp_t, ansible_vault_t)) +KERNEL_FQ void m16900_init (KERN_ATTR_TMPS_ESALT (pbkdf2_sha256_tmp_t, ansible_vault_t)) { /** * base @@ -161,7 +161,7 @@ __kernel void m16900_init (KERN_ATTR_TMPS_ESALT (pbkdf2_sha256_tmp_t, ansible_va } } -__kernel void m16900_loop (KERN_ATTR_TMPS_ESALT (pbkdf2_sha256_tmp_t, ansible_vault_t)) +KERNEL_FQ void m16900_loop (KERN_ATTR_TMPS_ESALT (pbkdf2_sha256_tmp_t, ansible_vault_t)) { const u64 gid = get_global_id (0); @@ -267,7 +267,7 @@ __kernel void m16900_loop (KERN_ATTR_TMPS_ESALT (pbkdf2_sha256_tmp_t, ansible_va } } -__kernel void m16900_comp (KERN_ATTR_TMPS_ESALT (pbkdf2_sha256_tmp_t, ansible_vault_t)) +KERNEL_FQ void m16900_comp (KERN_ATTR_TMPS_ESALT (pbkdf2_sha256_tmp_t, ansible_vault_t)) { /** * base diff --git a/OpenCL/m17300_a0-optimized.cl b/OpenCL/m17300_a0-optimized.cl index 5a9d2d615..e3056e578 100644 --- a/OpenCL/m17300_a0-optimized.cl +++ b/OpenCL/m17300_a0-optimized.cl @@ -14,7 +14,7 @@ #include "inc_simd.cl" #endif -__constant u64a keccakf_rndc[24] = +CONSTANT_AS u64a keccakf_rndc[24] = { 0x0000000000000001, 0x0000000000008082, 0x800000000000808a, 0x8000000080008000, 0x000000000000808b, 0x0000000080000001, @@ -30,7 +30,7 @@ __constant u64a keccakf_rndc[24] = #define KECCAK_ROUNDS 24 #endif -__kernel void m17300_m04 (KERN_ATTR_RULES ()) +KERNEL_FQ void m17300_m04 (KERN_ATTR_RULES ()) { /** * modifier @@ -240,15 +240,15 @@ __kernel void m17300_m04 (KERN_ATTR_RULES ()) } } -__kernel void m17300_m08 (KERN_ATTR_RULES ()) +KERNEL_FQ void m17300_m08 (KERN_ATTR_RULES ()) { } -__kernel void m17300_m16 (KERN_ATTR_RULES ()) +KERNEL_FQ void m17300_m16 (KERN_ATTR_RULES ()) { } -__kernel void m17300_s04 (KERN_ATTR_RULES ()) +KERNEL_FQ void m17300_s04 (KERN_ATTR_RULES ()) { /** * modifier @@ -470,10 +470,10 @@ __kernel void m17300_s04 (KERN_ATTR_RULES ()) } } -__kernel void m17300_s08 (KERN_ATTR_RULES ()) +KERNEL_FQ void m17300_s08 (KERN_ATTR_RULES ()) { } -__kernel void m17300_s16 (KERN_ATTR_RULES ()) +KERNEL_FQ void m17300_s16 (KERN_ATTR_RULES ()) { } diff --git a/OpenCL/m17300_a1-optimized.cl b/OpenCL/m17300_a1-optimized.cl index 84268a223..21bab3544 100644 --- a/OpenCL/m17300_a1-optimized.cl +++ b/OpenCL/m17300_a1-optimized.cl @@ -12,7 +12,7 @@ #include "inc_simd.cl" #endif -__constant u64a keccakf_rndc[24] = +CONSTANT_AS u64a keccakf_rndc[24] = { 0x0000000000000001, 0x0000000000008082, 0x800000000000808a, 0x8000000080008000, 0x000000000000808b, 0x0000000080000001, @@ -28,7 +28,7 @@ __constant u64a keccakf_rndc[24] = #define KECCAK_ROUNDS 24 #endif -__kernel void m17300_m04 (KERN_ATTR_BASIC ()) +KERNEL_FQ void m17300_m04 (KERN_ATTR_BASIC ()) { /** * modifier @@ -297,15 +297,15 @@ __kernel void m17300_m04 (KERN_ATTR_BASIC ()) } -__kernel void m17300_m08 (KERN_ATTR_BASIC ()) +KERNEL_FQ void m17300_m08 (KERN_ATTR_BASIC ()) { } -__kernel void m17300_m16 (KERN_ATTR_BASIC ()) +KERNEL_FQ void m17300_m16 (KERN_ATTR_BASIC ()) { } -__kernel void m17300_s04 (KERN_ATTR_BASIC ()) +KERNEL_FQ void m17300_s04 (KERN_ATTR_BASIC ()) { /** * modifier @@ -585,10 +585,10 @@ __kernel void m17300_s04 (KERN_ATTR_BASIC ()) } } -__kernel void m17300_s08 (KERN_ATTR_BASIC ()) +KERNEL_FQ void m17300_s08 (KERN_ATTR_BASIC ()) { } -__kernel void m17300_s16 (KERN_ATTR_BASIC ()) +KERNEL_FQ void m17300_s16 (KERN_ATTR_BASIC ()) { } diff --git a/OpenCL/m17300_a3-optimized.cl b/OpenCL/m17300_a3-optimized.cl index f97a10011..ecc22c8c4 100644 --- a/OpenCL/m17300_a3-optimized.cl +++ b/OpenCL/m17300_a3-optimized.cl @@ -12,7 +12,7 @@ #include "inc_simd.cl" #endif -__constant u64a keccakf_rndc[24] = +CONSTANT_AS u64a keccakf_rndc[24] = { 0x0000000000000001, 0x0000000000008082, 0x800000000000808a, 0x8000000080008000, 0x000000000000808b, 0x0000000080000001, @@ -412,7 +412,7 @@ DECLSPEC void m17300s (u32 *w0, u32 *w1, u32 *w2, u32 *w3, const u32 pw_len, KER } } -__kernel void m17300_m04 (KERN_ATTR_BASIC ()) +KERNEL_FQ void m17300_m04 (KERN_ATTR_BASIC ()) { /** * base @@ -459,7 +459,7 @@ __kernel void m17300_m04 (KERN_ATTR_BASIC ()) m17300m (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_extra0_buf, d_extra1_buf, d_extra2_buf, d_extra3_buf, bitmap_mask, bitmap_shift1, bitmap_shift2, salt_pos, loop_pos, loop_cnt, il_cnt, digests_cnt, digests_offset, combs_mode, gid_max); } -__kernel void m17300_m08 (KERN_ATTR_BASIC ()) +KERNEL_FQ void m17300_m08 (KERN_ATTR_BASIC ()) { /** * base @@ -506,7 +506,7 @@ __kernel void m17300_m08 (KERN_ATTR_BASIC ()) m17300m (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_extra0_buf, d_extra1_buf, d_extra2_buf, d_extra3_buf, bitmap_mask, bitmap_shift1, bitmap_shift2, salt_pos, loop_pos, loop_cnt, il_cnt, digests_cnt, digests_offset, combs_mode, gid_max); } -__kernel void m17300_m16 (KERN_ATTR_BASIC ()) +KERNEL_FQ void m17300_m16 (KERN_ATTR_BASIC ()) { /** * base @@ -553,7 +553,7 @@ __kernel void m17300_m16 (KERN_ATTR_BASIC ()) m17300m (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_extra0_buf, d_extra1_buf, d_extra2_buf, d_extra3_buf, bitmap_mask, bitmap_shift1, bitmap_shift2, salt_pos, loop_pos, loop_cnt, il_cnt, digests_cnt, digests_offset, combs_mode, gid_max); } -__kernel void m17300_s04 (KERN_ATTR_BASIC ()) +KERNEL_FQ void m17300_s04 (KERN_ATTR_BASIC ()) { /** * base @@ -600,7 +600,7 @@ __kernel void m17300_s04 (KERN_ATTR_BASIC ()) m17300s (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_extra0_buf, d_extra1_buf, d_extra2_buf, d_extra3_buf, bitmap_mask, bitmap_shift1, bitmap_shift2, salt_pos, loop_pos, loop_cnt, il_cnt, digests_cnt, digests_offset, combs_mode, gid_max); } -__kernel void m17300_s08 (KERN_ATTR_BASIC ()) +KERNEL_FQ void m17300_s08 (KERN_ATTR_BASIC ()) { /** * base @@ -647,7 +647,7 @@ __kernel void m17300_s08 (KERN_ATTR_BASIC ()) m17300s (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_extra0_buf, d_extra1_buf, d_extra2_buf, d_extra3_buf, bitmap_mask, bitmap_shift1, bitmap_shift2, salt_pos, loop_pos, loop_cnt, il_cnt, digests_cnt, digests_offset, combs_mode, gid_max); } -__kernel void m17300_s16 (KERN_ATTR_BASIC ()) +KERNEL_FQ void m17300_s16 (KERN_ATTR_BASIC ()) { /** * base diff --git a/OpenCL/m17400_a0-optimized.cl b/OpenCL/m17400_a0-optimized.cl index 491b77230..401f52507 100644 --- a/OpenCL/m17400_a0-optimized.cl +++ b/OpenCL/m17400_a0-optimized.cl @@ -14,7 +14,7 @@ #include "inc_simd.cl" #endif -__constant u64a keccakf_rndc[24] = +CONSTANT_AS u64a keccakf_rndc[24] = { 0x0000000000000001, 0x0000000000008082, 0x800000000000808a, 0x8000000080008000, 0x000000000000808b, 0x0000000080000001, @@ -30,7 +30,7 @@ __constant u64a keccakf_rndc[24] = #define KECCAK_ROUNDS 24 #endif -__kernel void m17400_m04 (KERN_ATTR_RULES ()) +KERNEL_FQ void m17400_m04 (KERN_ATTR_RULES ()) { /** * modifier @@ -240,15 +240,15 @@ __kernel void m17400_m04 (KERN_ATTR_RULES ()) } } -__kernel void m17400_m08 (KERN_ATTR_RULES ()) +KERNEL_FQ void m17400_m08 (KERN_ATTR_RULES ()) { } -__kernel void m17400_m16 (KERN_ATTR_RULES ()) +KERNEL_FQ void m17400_m16 (KERN_ATTR_RULES ()) { } -__kernel void m17400_s04 (KERN_ATTR_RULES ()) +KERNEL_FQ void m17400_s04 (KERN_ATTR_RULES ()) { /** * modifier @@ -470,10 +470,10 @@ __kernel void m17400_s04 (KERN_ATTR_RULES ()) } } -__kernel void m17400_s08 (KERN_ATTR_RULES ()) +KERNEL_FQ void m17400_s08 (KERN_ATTR_RULES ()) { } -__kernel void m17400_s16 (KERN_ATTR_RULES ()) +KERNEL_FQ void m17400_s16 (KERN_ATTR_RULES ()) { } diff --git a/OpenCL/m17400_a1-optimized.cl b/OpenCL/m17400_a1-optimized.cl index b412eabd6..ec847361e 100644 --- a/OpenCL/m17400_a1-optimized.cl +++ b/OpenCL/m17400_a1-optimized.cl @@ -12,7 +12,7 @@ #include "inc_simd.cl" #endif -__constant u64a keccakf_rndc[24] = +CONSTANT_AS u64a keccakf_rndc[24] = { 0x0000000000000001, 0x0000000000008082, 0x800000000000808a, 0x8000000080008000, 0x000000000000808b, 0x0000000080000001, @@ -28,7 +28,7 @@ __constant u64a keccakf_rndc[24] = #define KECCAK_ROUNDS 24 #endif -__kernel void m17400_m04 (KERN_ATTR_BASIC ()) +KERNEL_FQ void m17400_m04 (KERN_ATTR_BASIC ()) { /** * modifier @@ -297,15 +297,15 @@ __kernel void m17400_m04 (KERN_ATTR_BASIC ()) } -__kernel void m17400_m08 (KERN_ATTR_BASIC ()) +KERNEL_FQ void m17400_m08 (KERN_ATTR_BASIC ()) { } -__kernel void m17400_m16 (KERN_ATTR_BASIC ()) +KERNEL_FQ void m17400_m16 (KERN_ATTR_BASIC ()) { } -__kernel void m17400_s04 (KERN_ATTR_BASIC ()) +KERNEL_FQ void m17400_s04 (KERN_ATTR_BASIC ()) { /** * modifier @@ -585,10 +585,10 @@ __kernel void m17400_s04 (KERN_ATTR_BASIC ()) } } -__kernel void m17400_s08 (KERN_ATTR_BASIC ()) +KERNEL_FQ void m17400_s08 (KERN_ATTR_BASIC ()) { } -__kernel void m17400_s16 (KERN_ATTR_BASIC ()) +KERNEL_FQ void m17400_s16 (KERN_ATTR_BASIC ()) { } diff --git a/OpenCL/m17400_a3-optimized.cl b/OpenCL/m17400_a3-optimized.cl index ea4b40714..190c4cc59 100644 --- a/OpenCL/m17400_a3-optimized.cl +++ b/OpenCL/m17400_a3-optimized.cl @@ -12,7 +12,7 @@ #include "inc_simd.cl" #endif -__constant u64a keccakf_rndc[24] = +CONSTANT_AS u64a keccakf_rndc[24] = { 0x0000000000000001, 0x0000000000008082, 0x800000000000808a, 0x8000000080008000, 0x000000000000808b, 0x0000000080000001, @@ -413,7 +413,7 @@ DECLSPEC void m17400s (u32 *w0, u32 *w1, u32 *w2, u32 *w3, const u32 pw_len, KER } } -__kernel void m17400_m04 (KERN_ATTR_BASIC ()) +KERNEL_FQ void m17400_m04 (KERN_ATTR_BASIC ()) { /** * base @@ -460,7 +460,7 @@ __kernel void m17400_m04 (KERN_ATTR_BASIC ()) m17400m (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_extra0_buf, d_extra1_buf, d_extra2_buf, d_extra3_buf, bitmap_mask, bitmap_shift1, bitmap_shift2, salt_pos, loop_pos, loop_cnt, il_cnt, digests_cnt, digests_offset, combs_mode, gid_max); } -__kernel void m17400_m08 (KERN_ATTR_BASIC ()) +KERNEL_FQ void m17400_m08 (KERN_ATTR_BASIC ()) { /** * base @@ -507,7 +507,7 @@ __kernel void m17400_m08 (KERN_ATTR_BASIC ()) m17400m (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_extra0_buf, d_extra1_buf, d_extra2_buf, d_extra3_buf, bitmap_mask, bitmap_shift1, bitmap_shift2, salt_pos, loop_pos, loop_cnt, il_cnt, digests_cnt, digests_offset, combs_mode, gid_max); } -__kernel void m17400_m16 (KERN_ATTR_BASIC ()) +KERNEL_FQ void m17400_m16 (KERN_ATTR_BASIC ()) { /** * base @@ -554,7 +554,7 @@ __kernel void m17400_m16 (KERN_ATTR_BASIC ()) m17400m (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_extra0_buf, d_extra1_buf, d_extra2_buf, d_extra3_buf, bitmap_mask, bitmap_shift1, bitmap_shift2, salt_pos, loop_pos, loop_cnt, il_cnt, digests_cnt, digests_offset, combs_mode, gid_max); } -__kernel void m17400_s04 (KERN_ATTR_BASIC ()) +KERNEL_FQ void m17400_s04 (KERN_ATTR_BASIC ()) { /** * base @@ -601,7 +601,7 @@ __kernel void m17400_s04 (KERN_ATTR_BASIC ()) m17400s (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_extra0_buf, d_extra1_buf, d_extra2_buf, d_extra3_buf, bitmap_mask, bitmap_shift1, bitmap_shift2, salt_pos, loop_pos, loop_cnt, il_cnt, digests_cnt, digests_offset, combs_mode, gid_max); } -__kernel void m17400_s08 (KERN_ATTR_BASIC ()) +KERNEL_FQ void m17400_s08 (KERN_ATTR_BASIC ()) { /** * base @@ -648,7 +648,7 @@ __kernel void m17400_s08 (KERN_ATTR_BASIC ()) m17400s (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_extra0_buf, d_extra1_buf, d_extra2_buf, d_extra3_buf, bitmap_mask, bitmap_shift1, bitmap_shift2, salt_pos, loop_pos, loop_cnt, il_cnt, digests_cnt, digests_offset, combs_mode, gid_max); } -__kernel void m17400_s16 (KERN_ATTR_BASIC ()) +KERNEL_FQ void m17400_s16 (KERN_ATTR_BASIC ()) { /** * base diff --git a/OpenCL/m17500_a0-optimized.cl b/OpenCL/m17500_a0-optimized.cl index de3d21e03..d6c03103f 100644 --- a/OpenCL/m17500_a0-optimized.cl +++ b/OpenCL/m17500_a0-optimized.cl @@ -14,7 +14,7 @@ #include "inc_simd.cl" #endif -__constant u64a keccakf_rndc[24] = +CONSTANT_AS u64a keccakf_rndc[24] = { 0x0000000000000001, 0x0000000000008082, 0x800000000000808a, 0x8000000080008000, 0x000000000000808b, 0x0000000080000001, @@ -30,7 +30,7 @@ __constant u64a keccakf_rndc[24] = #define KECCAK_ROUNDS 24 #endif -__kernel void m17500_m04 (KERN_ATTR_RULES ()) +KERNEL_FQ void m17500_m04 (KERN_ATTR_RULES ()) { /** * modifier @@ -240,15 +240,15 @@ __kernel void m17500_m04 (KERN_ATTR_RULES ()) } } -__kernel void m17500_m08 (KERN_ATTR_RULES ()) +KERNEL_FQ void m17500_m08 (KERN_ATTR_RULES ()) { } -__kernel void m17500_m16 (KERN_ATTR_RULES ()) +KERNEL_FQ void m17500_m16 (KERN_ATTR_RULES ()) { } -__kernel void m17500_s04 (KERN_ATTR_RULES ()) +KERNEL_FQ void m17500_s04 (KERN_ATTR_RULES ()) { /** * modifier @@ -470,10 +470,10 @@ __kernel void m17500_s04 (KERN_ATTR_RULES ()) } } -__kernel void m17500_s08 (KERN_ATTR_RULES ()) +KERNEL_FQ void m17500_s08 (KERN_ATTR_RULES ()) { } -__kernel void m17500_s16 (KERN_ATTR_RULES ()) +KERNEL_FQ void m17500_s16 (KERN_ATTR_RULES ()) { } diff --git a/OpenCL/m17500_a1-optimized.cl b/OpenCL/m17500_a1-optimized.cl index d62db0cfa..902c34312 100644 --- a/OpenCL/m17500_a1-optimized.cl +++ b/OpenCL/m17500_a1-optimized.cl @@ -12,7 +12,7 @@ #include "inc_simd.cl" #endif -__constant u64a keccakf_rndc[24] = +CONSTANT_AS u64a keccakf_rndc[24] = { 0x0000000000000001, 0x0000000000008082, 0x800000000000808a, 0x8000000080008000, 0x000000000000808b, 0x0000000080000001, @@ -28,7 +28,7 @@ __constant u64a keccakf_rndc[24] = #define KECCAK_ROUNDS 24 #endif -__kernel void m17500_m04 (KERN_ATTR_BASIC ()) +KERNEL_FQ void m17500_m04 (KERN_ATTR_BASIC ()) { /** * modifier @@ -297,15 +297,15 @@ __kernel void m17500_m04 (KERN_ATTR_BASIC ()) } -__kernel void m17500_m08 (KERN_ATTR_BASIC ()) +KERNEL_FQ void m17500_m08 (KERN_ATTR_BASIC ()) { } -__kernel void m17500_m16 (KERN_ATTR_BASIC ()) +KERNEL_FQ void m17500_m16 (KERN_ATTR_BASIC ()) { } -__kernel void m17500_s04 (KERN_ATTR_BASIC ()) +KERNEL_FQ void m17500_s04 (KERN_ATTR_BASIC ()) { /** * modifier @@ -585,10 +585,10 @@ __kernel void m17500_s04 (KERN_ATTR_BASIC ()) } } -__kernel void m17500_s08 (KERN_ATTR_BASIC ()) +KERNEL_FQ void m17500_s08 (KERN_ATTR_BASIC ()) { } -__kernel void m17500_s16 (KERN_ATTR_BASIC ()) +KERNEL_FQ void m17500_s16 (KERN_ATTR_BASIC ()) { } diff --git a/OpenCL/m17500_a3-optimized.cl b/OpenCL/m17500_a3-optimized.cl index 39ebc1f7d..21bb8b50d 100644 --- a/OpenCL/m17500_a3-optimized.cl +++ b/OpenCL/m17500_a3-optimized.cl @@ -12,7 +12,7 @@ #include "inc_simd.cl" #endif -__constant u64a keccakf_rndc[24] = +CONSTANT_AS u64a keccakf_rndc[24] = { 0x0000000000000001, 0x0000000000008082, 0x800000000000808a, 0x8000000080008000, 0x000000000000808b, 0x0000000080000001, @@ -412,7 +412,7 @@ DECLSPEC void m17500s (u32 *w0, u32 *w1, u32 *w2, u32 *w3, const u32 pw_len, KER } } -__kernel void m17500_m04 (KERN_ATTR_BASIC ()) +KERNEL_FQ void m17500_m04 (KERN_ATTR_BASIC ()) { /** * base @@ -459,7 +459,7 @@ __kernel void m17500_m04 (KERN_ATTR_BASIC ()) m17500m (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_extra0_buf, d_extra1_buf, d_extra2_buf, d_extra3_buf, bitmap_mask, bitmap_shift1, bitmap_shift2, salt_pos, loop_pos, loop_cnt, il_cnt, digests_cnt, digests_offset, combs_mode, gid_max); } -__kernel void m17500_m08 (KERN_ATTR_BASIC ()) +KERNEL_FQ void m17500_m08 (KERN_ATTR_BASIC ()) { /** * base @@ -506,7 +506,7 @@ __kernel void m17500_m08 (KERN_ATTR_BASIC ()) m17500m (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_extra0_buf, d_extra1_buf, d_extra2_buf, d_extra3_buf, bitmap_mask, bitmap_shift1, bitmap_shift2, salt_pos, loop_pos, loop_cnt, il_cnt, digests_cnt, digests_offset, combs_mode, gid_max); } -__kernel void m17500_m16 (KERN_ATTR_BASIC ()) +KERNEL_FQ void m17500_m16 (KERN_ATTR_BASIC ()) { /** * base @@ -553,7 +553,7 @@ __kernel void m17500_m16 (KERN_ATTR_BASIC ()) m17500m (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_extra0_buf, d_extra1_buf, d_extra2_buf, d_extra3_buf, bitmap_mask, bitmap_shift1, bitmap_shift2, salt_pos, loop_pos, loop_cnt, il_cnt, digests_cnt, digests_offset, combs_mode, gid_max); } -__kernel void m17500_s04 (KERN_ATTR_BASIC ()) +KERNEL_FQ void m17500_s04 (KERN_ATTR_BASIC ()) { /** * base @@ -600,7 +600,7 @@ __kernel void m17500_s04 (KERN_ATTR_BASIC ()) m17500s (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_extra0_buf, d_extra1_buf, d_extra2_buf, d_extra3_buf, bitmap_mask, bitmap_shift1, bitmap_shift2, salt_pos, loop_pos, loop_cnt, il_cnt, digests_cnt, digests_offset, combs_mode, gid_max); } -__kernel void m17500_s08 (KERN_ATTR_BASIC ()) +KERNEL_FQ void m17500_s08 (KERN_ATTR_BASIC ()) { /** * base @@ -647,7 +647,7 @@ __kernel void m17500_s08 (KERN_ATTR_BASIC ()) m17500s (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_extra0_buf, d_extra1_buf, d_extra2_buf, d_extra3_buf, bitmap_mask, bitmap_shift1, bitmap_shift2, salt_pos, loop_pos, loop_cnt, il_cnt, digests_cnt, digests_offset, combs_mode, gid_max); } -__kernel void m17500_s16 (KERN_ATTR_BASIC ()) +KERNEL_FQ void m17500_s16 (KERN_ATTR_BASIC ()) { /** * base diff --git a/OpenCL/m17600_a0-optimized.cl b/OpenCL/m17600_a0-optimized.cl index 48d711eac..bd8492007 100644 --- a/OpenCL/m17600_a0-optimized.cl +++ b/OpenCL/m17600_a0-optimized.cl @@ -14,7 +14,7 @@ #include "inc_simd.cl" #endif -__constant u64a keccakf_rndc[24] = +CONSTANT_AS u64a keccakf_rndc[24] = { 0x0000000000000001, 0x0000000000008082, 0x800000000000808a, 0x8000000080008000, 0x000000000000808b, 0x0000000080000001, @@ -30,7 +30,7 @@ __constant u64a keccakf_rndc[24] = #define KECCAK_ROUNDS 24 #endif -__kernel void m17600_m04 (KERN_ATTR_RULES ()) +KERNEL_FQ void m17600_m04 (KERN_ATTR_RULES ()) { /** * modifier @@ -240,15 +240,15 @@ __kernel void m17600_m04 (KERN_ATTR_RULES ()) } } -__kernel void m17600_m08 (KERN_ATTR_RULES ()) +KERNEL_FQ void m17600_m08 (KERN_ATTR_RULES ()) { } -__kernel void m17600_m16 (KERN_ATTR_RULES ()) +KERNEL_FQ void m17600_m16 (KERN_ATTR_RULES ()) { } -__kernel void m17600_s04 (KERN_ATTR_RULES ()) +KERNEL_FQ void m17600_s04 (KERN_ATTR_RULES ()) { /** * modifier @@ -470,10 +470,10 @@ __kernel void m17600_s04 (KERN_ATTR_RULES ()) } } -__kernel void m17600_s08 (KERN_ATTR_RULES ()) +KERNEL_FQ void m17600_s08 (KERN_ATTR_RULES ()) { } -__kernel void m17600_s16 (KERN_ATTR_RULES ()) +KERNEL_FQ void m17600_s16 (KERN_ATTR_RULES ()) { } diff --git a/OpenCL/m17600_a1-optimized.cl b/OpenCL/m17600_a1-optimized.cl index c24e8f0dc..fce658b0f 100644 --- a/OpenCL/m17600_a1-optimized.cl +++ b/OpenCL/m17600_a1-optimized.cl @@ -12,7 +12,7 @@ #include "inc_simd.cl" #endif -__constant u64a keccakf_rndc[24] = +CONSTANT_AS u64a keccakf_rndc[24] = { 0x0000000000000001, 0x0000000000008082, 0x800000000000808a, 0x8000000080008000, 0x000000000000808b, 0x0000000080000001, @@ -28,7 +28,7 @@ __constant u64a keccakf_rndc[24] = #define KECCAK_ROUNDS 24 #endif -__kernel void m17600_m04 (KERN_ATTR_BASIC ()) +KERNEL_FQ void m17600_m04 (KERN_ATTR_BASIC ()) { /** * modifier @@ -297,15 +297,15 @@ __kernel void m17600_m04 (KERN_ATTR_BASIC ()) } -__kernel void m17600_m08 (KERN_ATTR_BASIC ()) +KERNEL_FQ void m17600_m08 (KERN_ATTR_BASIC ()) { } -__kernel void m17600_m16 (KERN_ATTR_BASIC ()) +KERNEL_FQ void m17600_m16 (KERN_ATTR_BASIC ()) { } -__kernel void m17600_s04 (KERN_ATTR_BASIC ()) +KERNEL_FQ void m17600_s04 (KERN_ATTR_BASIC ()) { /** * modifier @@ -585,10 +585,10 @@ __kernel void m17600_s04 (KERN_ATTR_BASIC ()) } } -__kernel void m17600_s08 (KERN_ATTR_BASIC ()) +KERNEL_FQ void m17600_s08 (KERN_ATTR_BASIC ()) { } -__kernel void m17600_s16 (KERN_ATTR_BASIC ()) +KERNEL_FQ void m17600_s16 (KERN_ATTR_BASIC ()) { } diff --git a/OpenCL/m17600_a3-optimized.cl b/OpenCL/m17600_a3-optimized.cl index b3f7ce45a..390beaea9 100644 --- a/OpenCL/m17600_a3-optimized.cl +++ b/OpenCL/m17600_a3-optimized.cl @@ -12,7 +12,7 @@ #include "inc_simd.cl" #endif -__constant u64a keccakf_rndc[24] = +CONSTANT_AS u64a keccakf_rndc[24] = { 0x0000000000000001, 0x0000000000008082, 0x800000000000808a, 0x8000000080008000, 0x000000000000808b, 0x0000000080000001, @@ -413,7 +413,7 @@ DECLSPEC void m17600s (u32 *w0, u32 *w1, u32 *w2, u32 *w3, const u32 pw_len, KER } } -__kernel void m17600_m04 (KERN_ATTR_BASIC ()) +KERNEL_FQ void m17600_m04 (KERN_ATTR_BASIC ()) { /** * base @@ -460,7 +460,7 @@ __kernel void m17600_m04 (KERN_ATTR_BASIC ()) m17600m (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_extra0_buf, d_extra1_buf, d_extra2_buf, d_extra3_buf, bitmap_mask, bitmap_shift1, bitmap_shift2, salt_pos, loop_pos, loop_cnt, il_cnt, digests_cnt, digests_offset, combs_mode, gid_max); } -__kernel void m17600_m08 (KERN_ATTR_BASIC ()) +KERNEL_FQ void m17600_m08 (KERN_ATTR_BASIC ()) { /** * base @@ -507,7 +507,7 @@ __kernel void m17600_m08 (KERN_ATTR_BASIC ()) m17600m (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_extra0_buf, d_extra1_buf, d_extra2_buf, d_extra3_buf, bitmap_mask, bitmap_shift1, bitmap_shift2, salt_pos, loop_pos, loop_cnt, il_cnt, digests_cnt, digests_offset, combs_mode, gid_max); } -__kernel void m17600_m16 (KERN_ATTR_BASIC ()) +KERNEL_FQ void m17600_m16 (KERN_ATTR_BASIC ()) { /** * base @@ -554,7 +554,7 @@ __kernel void m17600_m16 (KERN_ATTR_BASIC ()) m17600m (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_extra0_buf, d_extra1_buf, d_extra2_buf, d_extra3_buf, bitmap_mask, bitmap_shift1, bitmap_shift2, salt_pos, loop_pos, loop_cnt, il_cnt, digests_cnt, digests_offset, combs_mode, gid_max); } -__kernel void m17600_s04 (KERN_ATTR_BASIC ()) +KERNEL_FQ void m17600_s04 (KERN_ATTR_BASIC ()) { /** * base @@ -601,7 +601,7 @@ __kernel void m17600_s04 (KERN_ATTR_BASIC ()) m17600s (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_extra0_buf, d_extra1_buf, d_extra2_buf, d_extra3_buf, bitmap_mask, bitmap_shift1, bitmap_shift2, salt_pos, loop_pos, loop_cnt, il_cnt, digests_cnt, digests_offset, combs_mode, gid_max); } -__kernel void m17600_s08 (KERN_ATTR_BASIC ()) +KERNEL_FQ void m17600_s08 (KERN_ATTR_BASIC ()) { /** * base @@ -648,7 +648,7 @@ __kernel void m17600_s08 (KERN_ATTR_BASIC ()) m17600s (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_extra0_buf, d_extra1_buf, d_extra2_buf, d_extra3_buf, bitmap_mask, bitmap_shift1, bitmap_shift2, salt_pos, loop_pos, loop_cnt, il_cnt, digests_cnt, digests_offset, combs_mode, gid_max); } -__kernel void m17600_s16 (KERN_ATTR_BASIC ()) +KERNEL_FQ void m17600_s16 (KERN_ATTR_BASIC ()) { /** * base diff --git a/OpenCL/m17700_a0-optimized.cl b/OpenCL/m17700_a0-optimized.cl index e3ab85fd9..c1969f67f 100644 --- a/OpenCL/m17700_a0-optimized.cl +++ b/OpenCL/m17700_a0-optimized.cl @@ -14,7 +14,7 @@ #include "inc_simd.cl" #endif -__constant u64a keccakf_rndc[24] = +CONSTANT_AS u64a keccakf_rndc[24] = { 0x0000000000000001, 0x0000000000008082, 0x800000000000808a, 0x8000000080008000, 0x000000000000808b, 0x0000000080000001, @@ -30,7 +30,7 @@ __constant u64a keccakf_rndc[24] = #define KECCAK_ROUNDS 24 #endif -__kernel void m17700_m04 (KERN_ATTR_RULES ()) +KERNEL_FQ void m17700_m04 (KERN_ATTR_RULES ()) { /** * modifier @@ -240,15 +240,15 @@ __kernel void m17700_m04 (KERN_ATTR_RULES ()) } } -__kernel void m17700_m08 (KERN_ATTR_RULES ()) +KERNEL_FQ void m17700_m08 (KERN_ATTR_RULES ()) { } -__kernel void m17700_m16 (KERN_ATTR_RULES ()) +KERNEL_FQ void m17700_m16 (KERN_ATTR_RULES ()) { } -__kernel void m17700_s04 (KERN_ATTR_RULES ()) +KERNEL_FQ void m17700_s04 (KERN_ATTR_RULES ()) { /** * modifier @@ -470,10 +470,10 @@ __kernel void m17700_s04 (KERN_ATTR_RULES ()) } } -__kernel void m17700_s08 (KERN_ATTR_RULES ()) +KERNEL_FQ void m17700_s08 (KERN_ATTR_RULES ()) { } -__kernel void m17700_s16 (KERN_ATTR_RULES ()) +KERNEL_FQ void m17700_s16 (KERN_ATTR_RULES ()) { } diff --git a/OpenCL/m17700_a1-optimized.cl b/OpenCL/m17700_a1-optimized.cl index 4bda1d9b4..a52d10f99 100644 --- a/OpenCL/m17700_a1-optimized.cl +++ b/OpenCL/m17700_a1-optimized.cl @@ -12,7 +12,7 @@ #include "inc_simd.cl" #endif -__constant u64a keccakf_rndc[24] = +CONSTANT_AS u64a keccakf_rndc[24] = { 0x0000000000000001, 0x0000000000008082, 0x800000000000808a, 0x8000000080008000, 0x000000000000808b, 0x0000000080000001, @@ -28,7 +28,7 @@ __constant u64a keccakf_rndc[24] = #define KECCAK_ROUNDS 24 #endif -__kernel void m17700_m04 (KERN_ATTR_BASIC ()) +KERNEL_FQ void m17700_m04 (KERN_ATTR_BASIC ()) { /** * modifier @@ -297,15 +297,15 @@ __kernel void m17700_m04 (KERN_ATTR_BASIC ()) } -__kernel void m17700_m08 (KERN_ATTR_BASIC ()) +KERNEL_FQ void m17700_m08 (KERN_ATTR_BASIC ()) { } -__kernel void m17700_m16 (KERN_ATTR_BASIC ()) +KERNEL_FQ void m17700_m16 (KERN_ATTR_BASIC ()) { } -__kernel void m17700_s04 (KERN_ATTR_BASIC ()) +KERNEL_FQ void m17700_s04 (KERN_ATTR_BASIC ()) { /** * modifier @@ -585,10 +585,10 @@ __kernel void m17700_s04 (KERN_ATTR_BASIC ()) } } -__kernel void m17700_s08 (KERN_ATTR_BASIC ()) +KERNEL_FQ void m17700_s08 (KERN_ATTR_BASIC ()) { } -__kernel void m17700_s16 (KERN_ATTR_BASIC ()) +KERNEL_FQ void m17700_s16 (KERN_ATTR_BASIC ()) { } diff --git a/OpenCL/m17700_a3-optimized.cl b/OpenCL/m17700_a3-optimized.cl index 77ecf40fe..945478dfe 100644 --- a/OpenCL/m17700_a3-optimized.cl +++ b/OpenCL/m17700_a3-optimized.cl @@ -12,7 +12,7 @@ #include "inc_simd.cl" #endif -__constant u64a keccakf_rndc[24] = +CONSTANT_AS u64a keccakf_rndc[24] = { 0x0000000000000001, 0x0000000000008082, 0x800000000000808a, 0x8000000080008000, 0x000000000000808b, 0x0000000080000001, @@ -412,7 +412,7 @@ DECLSPEC void m17300s (u32 *w0, u32 *w1, u32 *w2, u32 *w3, const u32 pw_len, KER } } -__kernel void m17700_m04 (KERN_ATTR_BASIC ()) +KERNEL_FQ void m17700_m04 (KERN_ATTR_BASIC ()) { /** * base @@ -459,7 +459,7 @@ __kernel void m17700_m04 (KERN_ATTR_BASIC ()) m17300m (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_extra0_buf, d_extra1_buf, d_extra2_buf, d_extra3_buf, bitmap_mask, bitmap_shift1, bitmap_shift2, salt_pos, loop_pos, loop_cnt, il_cnt, digests_cnt, digests_offset, combs_mode, gid_max); } -__kernel void m17700_m08 (KERN_ATTR_BASIC ()) +KERNEL_FQ void m17700_m08 (KERN_ATTR_BASIC ()) { /** * base @@ -506,7 +506,7 @@ __kernel void m17700_m08 (KERN_ATTR_BASIC ()) m17300m (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_extra0_buf, d_extra1_buf, d_extra2_buf, d_extra3_buf, bitmap_mask, bitmap_shift1, bitmap_shift2, salt_pos, loop_pos, loop_cnt, il_cnt, digests_cnt, digests_offset, combs_mode, gid_max); } -__kernel void m17700_m16 (KERN_ATTR_BASIC ()) +KERNEL_FQ void m17700_m16 (KERN_ATTR_BASIC ()) { /** * base @@ -553,7 +553,7 @@ __kernel void m17700_m16 (KERN_ATTR_BASIC ()) m17300m (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_extra0_buf, d_extra1_buf, d_extra2_buf, d_extra3_buf, bitmap_mask, bitmap_shift1, bitmap_shift2, salt_pos, loop_pos, loop_cnt, il_cnt, digests_cnt, digests_offset, combs_mode, gid_max); } -__kernel void m17700_s04 (KERN_ATTR_BASIC ()) +KERNEL_FQ void m17700_s04 (KERN_ATTR_BASIC ()) { /** * base @@ -600,7 +600,7 @@ __kernel void m17700_s04 (KERN_ATTR_BASIC ()) m17300s (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_extra0_buf, d_extra1_buf, d_extra2_buf, d_extra3_buf, bitmap_mask, bitmap_shift1, bitmap_shift2, salt_pos, loop_pos, loop_cnt, il_cnt, digests_cnt, digests_offset, combs_mode, gid_max); } -__kernel void m17700_s08 (KERN_ATTR_BASIC ()) +KERNEL_FQ void m17700_s08 (KERN_ATTR_BASIC ()) { /** * base @@ -647,7 +647,7 @@ __kernel void m17700_s08 (KERN_ATTR_BASIC ()) m17300s (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_extra0_buf, d_extra1_buf, d_extra2_buf, d_extra3_buf, bitmap_mask, bitmap_shift1, bitmap_shift2, salt_pos, loop_pos, loop_cnt, il_cnt, digests_cnt, digests_offset, combs_mode, gid_max); } -__kernel void m17700_s16 (KERN_ATTR_BASIC ()) +KERNEL_FQ void m17700_s16 (KERN_ATTR_BASIC ()) { /** * base diff --git a/OpenCL/m17800_a0-optimized.cl b/OpenCL/m17800_a0-optimized.cl index 877206757..a6ec3644b 100644 --- a/OpenCL/m17800_a0-optimized.cl +++ b/OpenCL/m17800_a0-optimized.cl @@ -14,7 +14,7 @@ #include "inc_simd.cl" #endif -__constant u64a keccakf_rndc[24] = +CONSTANT_AS u64a keccakf_rndc[24] = { 0x0000000000000001, 0x0000000000008082, 0x800000000000808a, 0x8000000080008000, 0x000000000000808b, 0x0000000080000001, @@ -30,7 +30,7 @@ __constant u64a keccakf_rndc[24] = #define KECCAK_ROUNDS 24 #endif -__kernel void m17800_m04 (KERN_ATTR_RULES ()) +KERNEL_FQ void m17800_m04 (KERN_ATTR_RULES ()) { /** * modifier @@ -240,15 +240,15 @@ __kernel void m17800_m04 (KERN_ATTR_RULES ()) } } -__kernel void m17800_m08 (KERN_ATTR_RULES ()) +KERNEL_FQ void m17800_m08 (KERN_ATTR_RULES ()) { } -__kernel void m17800_m16 (KERN_ATTR_RULES ()) +KERNEL_FQ void m17800_m16 (KERN_ATTR_RULES ()) { } -__kernel void m17800_s04 (KERN_ATTR_RULES ()) +KERNEL_FQ void m17800_s04 (KERN_ATTR_RULES ()) { /** * modifier @@ -470,10 +470,10 @@ __kernel void m17800_s04 (KERN_ATTR_RULES ()) } } -__kernel void m17800_s08 (KERN_ATTR_RULES ()) +KERNEL_FQ void m17800_s08 (KERN_ATTR_RULES ()) { } -__kernel void m17800_s16 (KERN_ATTR_RULES ()) +KERNEL_FQ void m17800_s16 (KERN_ATTR_RULES ()) { } diff --git a/OpenCL/m17800_a1-optimized.cl b/OpenCL/m17800_a1-optimized.cl index 26e53c921..96053cd40 100644 --- a/OpenCL/m17800_a1-optimized.cl +++ b/OpenCL/m17800_a1-optimized.cl @@ -12,7 +12,7 @@ #include "inc_simd.cl" #endif -__constant u64a keccakf_rndc[24] = +CONSTANT_AS u64a keccakf_rndc[24] = { 0x0000000000000001, 0x0000000000008082, 0x800000000000808a, 0x8000000080008000, 0x000000000000808b, 0x0000000080000001, @@ -28,7 +28,7 @@ __constant u64a keccakf_rndc[24] = #define KECCAK_ROUNDS 24 #endif -__kernel void m17800_m04 (KERN_ATTR_BASIC ()) +KERNEL_FQ void m17800_m04 (KERN_ATTR_BASIC ()) { /** * modifier @@ -297,15 +297,15 @@ __kernel void m17800_m04 (KERN_ATTR_BASIC ()) } -__kernel void m17800_m08 (KERN_ATTR_BASIC ()) +KERNEL_FQ void m17800_m08 (KERN_ATTR_BASIC ()) { } -__kernel void m17800_m16 (KERN_ATTR_BASIC ()) +KERNEL_FQ void m17800_m16 (KERN_ATTR_BASIC ()) { } -__kernel void m17800_s04 (KERN_ATTR_BASIC ()) +KERNEL_FQ void m17800_s04 (KERN_ATTR_BASIC ()) { /** * modifier @@ -585,10 +585,10 @@ __kernel void m17800_s04 (KERN_ATTR_BASIC ()) } } -__kernel void m17800_s08 (KERN_ATTR_BASIC ()) +KERNEL_FQ void m17800_s08 (KERN_ATTR_BASIC ()) { } -__kernel void m17800_s16 (KERN_ATTR_BASIC ()) +KERNEL_FQ void m17800_s16 (KERN_ATTR_BASIC ()) { } diff --git a/OpenCL/m17800_a3-optimized.cl b/OpenCL/m17800_a3-optimized.cl index 8ee2055b8..5e3f12b95 100644 --- a/OpenCL/m17800_a3-optimized.cl +++ b/OpenCL/m17800_a3-optimized.cl @@ -12,7 +12,7 @@ #include "inc_simd.cl" #endif -__constant u64a keccakf_rndc[24] = +CONSTANT_AS u64a keccakf_rndc[24] = { 0x0000000000000001, 0x0000000000008082, 0x800000000000808a, 0x8000000080008000, 0x000000000000808b, 0x0000000080000001, @@ -412,7 +412,7 @@ DECLSPEC void m17400s (u32 *w0, u32 *w1, u32 *w2, u32 *w3, const u32 pw_len, KER } } -__kernel void m17800_m04 (KERN_ATTR_BASIC ()) +KERNEL_FQ void m17800_m04 (KERN_ATTR_BASIC ()) { /** * base @@ -459,7 +459,7 @@ __kernel void m17800_m04 (KERN_ATTR_BASIC ()) m17400m (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_extra0_buf, d_extra1_buf, d_extra2_buf, d_extra3_buf, bitmap_mask, bitmap_shift1, bitmap_shift2, salt_pos, loop_pos, loop_cnt, il_cnt, digests_cnt, digests_offset, combs_mode, gid_max); } -__kernel void m17800_m08 (KERN_ATTR_BASIC ()) +KERNEL_FQ void m17800_m08 (KERN_ATTR_BASIC ()) { /** * base @@ -506,7 +506,7 @@ __kernel void m17800_m08 (KERN_ATTR_BASIC ()) m17400m (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_extra0_buf, d_extra1_buf, d_extra2_buf, d_extra3_buf, bitmap_mask, bitmap_shift1, bitmap_shift2, salt_pos, loop_pos, loop_cnt, il_cnt, digests_cnt, digests_offset, combs_mode, gid_max); } -__kernel void m17800_m16 (KERN_ATTR_BASIC ()) +KERNEL_FQ void m17800_m16 (KERN_ATTR_BASIC ()) { /** * base @@ -553,7 +553,7 @@ __kernel void m17800_m16 (KERN_ATTR_BASIC ()) m17400m (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_extra0_buf, d_extra1_buf, d_extra2_buf, d_extra3_buf, bitmap_mask, bitmap_shift1, bitmap_shift2, salt_pos, loop_pos, loop_cnt, il_cnt, digests_cnt, digests_offset, combs_mode, gid_max); } -__kernel void m17800_s04 (KERN_ATTR_BASIC ()) +KERNEL_FQ void m17800_s04 (KERN_ATTR_BASIC ()) { /** * base @@ -600,7 +600,7 @@ __kernel void m17800_s04 (KERN_ATTR_BASIC ()) m17400s (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_extra0_buf, d_extra1_buf, d_extra2_buf, d_extra3_buf, bitmap_mask, bitmap_shift1, bitmap_shift2, salt_pos, loop_pos, loop_cnt, il_cnt, digests_cnt, digests_offset, combs_mode, gid_max); } -__kernel void m17800_s08 (KERN_ATTR_BASIC ()) +KERNEL_FQ void m17800_s08 (KERN_ATTR_BASIC ()) { /** * base @@ -647,7 +647,7 @@ __kernel void m17800_s08 (KERN_ATTR_BASIC ()) m17400s (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_extra0_buf, d_extra1_buf, d_extra2_buf, d_extra3_buf, bitmap_mask, bitmap_shift1, bitmap_shift2, salt_pos, loop_pos, loop_cnt, il_cnt, digests_cnt, digests_offset, combs_mode, gid_max); } -__kernel void m17800_s16 (KERN_ATTR_BASIC ()) +KERNEL_FQ void m17800_s16 (KERN_ATTR_BASIC ()) { /** * base diff --git a/OpenCL/m17900_a0-optimized.cl b/OpenCL/m17900_a0-optimized.cl index ac0a4dc1a..6da461329 100644 --- a/OpenCL/m17900_a0-optimized.cl +++ b/OpenCL/m17900_a0-optimized.cl @@ -14,7 +14,7 @@ #include "inc_simd.cl" #endif -__constant u64a keccakf_rndc[24] = +CONSTANT_AS u64a keccakf_rndc[24] = { 0x0000000000000001, 0x0000000000008082, 0x800000000000808a, 0x8000000080008000, 0x000000000000808b, 0x0000000080000001, @@ -30,7 +30,7 @@ __constant u64a keccakf_rndc[24] = #define KECCAK_ROUNDS 24 #endif -__kernel void m17900_m04 (KERN_ATTR_RULES ()) +KERNEL_FQ void m17900_m04 (KERN_ATTR_RULES ()) { /** * modifier @@ -240,15 +240,15 @@ __kernel void m17900_m04 (KERN_ATTR_RULES ()) } } -__kernel void m17900_m08 (KERN_ATTR_RULES ()) +KERNEL_FQ void m17900_m08 (KERN_ATTR_RULES ()) { } -__kernel void m17900_m16 (KERN_ATTR_RULES ()) +KERNEL_FQ void m17900_m16 (KERN_ATTR_RULES ()) { } -__kernel void m17900_s04 (KERN_ATTR_RULES ()) +KERNEL_FQ void m17900_s04 (KERN_ATTR_RULES ()) { /** * modifier @@ -470,10 +470,10 @@ __kernel void m17900_s04 (KERN_ATTR_RULES ()) } } -__kernel void m17900_s08 (KERN_ATTR_RULES ()) +KERNEL_FQ void m17900_s08 (KERN_ATTR_RULES ()) { } -__kernel void m17900_s16 (KERN_ATTR_RULES ()) +KERNEL_FQ void m17900_s16 (KERN_ATTR_RULES ()) { } diff --git a/OpenCL/m17900_a1-optimized.cl b/OpenCL/m17900_a1-optimized.cl index f8c92f6e7..0c7b4f4f4 100644 --- a/OpenCL/m17900_a1-optimized.cl +++ b/OpenCL/m17900_a1-optimized.cl @@ -12,7 +12,7 @@ #include "inc_simd.cl" #endif -__constant u64a keccakf_rndc[24] = +CONSTANT_AS u64a keccakf_rndc[24] = { 0x0000000000000001, 0x0000000000008082, 0x800000000000808a, 0x8000000080008000, 0x000000000000808b, 0x0000000080000001, @@ -28,7 +28,7 @@ __constant u64a keccakf_rndc[24] = #define KECCAK_ROUNDS 24 #endif -__kernel void m17900_m04 (KERN_ATTR_BASIC ()) +KERNEL_FQ void m17900_m04 (KERN_ATTR_BASIC ()) { /** * modifier @@ -297,15 +297,15 @@ __kernel void m17900_m04 (KERN_ATTR_BASIC ()) } -__kernel void m17900_m08 (KERN_ATTR_BASIC ()) +KERNEL_FQ void m17900_m08 (KERN_ATTR_BASIC ()) { } -__kernel void m17900_m16 (KERN_ATTR_BASIC ()) +KERNEL_FQ void m17900_m16 (KERN_ATTR_BASIC ()) { } -__kernel void m17900_s04 (KERN_ATTR_BASIC ()) +KERNEL_FQ void m17900_s04 (KERN_ATTR_BASIC ()) { /** * modifier @@ -585,10 +585,10 @@ __kernel void m17900_s04 (KERN_ATTR_BASIC ()) } } -__kernel void m17900_s08 (KERN_ATTR_BASIC ()) +KERNEL_FQ void m17900_s08 (KERN_ATTR_BASIC ()) { } -__kernel void m17900_s16 (KERN_ATTR_BASIC ()) +KERNEL_FQ void m17900_s16 (KERN_ATTR_BASIC ()) { } diff --git a/OpenCL/m17900_a3-optimized.cl b/OpenCL/m17900_a3-optimized.cl index 0cb85e708..37731b28f 100644 --- a/OpenCL/m17900_a3-optimized.cl +++ b/OpenCL/m17900_a3-optimized.cl @@ -12,7 +12,7 @@ #include "inc_simd.cl" #endif -__constant u64a keccakf_rndc[24] = +CONSTANT_AS u64a keccakf_rndc[24] = { 0x0000000000000001, 0x0000000000008082, 0x800000000000808a, 0x8000000080008000, 0x000000000000808b, 0x0000000080000001, @@ -412,7 +412,7 @@ DECLSPEC void m17500s (u32 *w0, u32 *w1, u32 *w2, u32 *w3, const u32 pw_len, KER } } -__kernel void m17900_m04 (KERN_ATTR_BASIC ()) +KERNEL_FQ void m17900_m04 (KERN_ATTR_BASIC ()) { /** * base @@ -459,7 +459,7 @@ __kernel void m17900_m04 (KERN_ATTR_BASIC ()) m17500m (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_extra0_buf, d_extra1_buf, d_extra2_buf, d_extra3_buf, bitmap_mask, bitmap_shift1, bitmap_shift2, salt_pos, loop_pos, loop_cnt, il_cnt, digests_cnt, digests_offset, combs_mode, gid_max); } -__kernel void m17900_m08 (KERN_ATTR_BASIC ()) +KERNEL_FQ void m17900_m08 (KERN_ATTR_BASIC ()) { /** * base @@ -506,7 +506,7 @@ __kernel void m17900_m08 (KERN_ATTR_BASIC ()) m17500m (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_extra0_buf, d_extra1_buf, d_extra2_buf, d_extra3_buf, bitmap_mask, bitmap_shift1, bitmap_shift2, salt_pos, loop_pos, loop_cnt, il_cnt, digests_cnt, digests_offset, combs_mode, gid_max); } -__kernel void m17900_m16 (KERN_ATTR_BASIC ()) +KERNEL_FQ void m17900_m16 (KERN_ATTR_BASIC ()) { /** * base @@ -553,7 +553,7 @@ __kernel void m17900_m16 (KERN_ATTR_BASIC ()) m17500m (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_extra0_buf, d_extra1_buf, d_extra2_buf, d_extra3_buf, bitmap_mask, bitmap_shift1, bitmap_shift2, salt_pos, loop_pos, loop_cnt, il_cnt, digests_cnt, digests_offset, combs_mode, gid_max); } -__kernel void m17900_s04 (KERN_ATTR_BASIC ()) +KERNEL_FQ void m17900_s04 (KERN_ATTR_BASIC ()) { /** * base @@ -600,7 +600,7 @@ __kernel void m17900_s04 (KERN_ATTR_BASIC ()) m17500s (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_extra0_buf, d_extra1_buf, d_extra2_buf, d_extra3_buf, bitmap_mask, bitmap_shift1, bitmap_shift2, salt_pos, loop_pos, loop_cnt, il_cnt, digests_cnt, digests_offset, combs_mode, gid_max); } -__kernel void m17900_s08 (KERN_ATTR_BASIC ()) +KERNEL_FQ void m17900_s08 (KERN_ATTR_BASIC ()) { /** * base @@ -647,7 +647,7 @@ __kernel void m17900_s08 (KERN_ATTR_BASIC ()) m17500s (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_extra0_buf, d_extra1_buf, d_extra2_buf, d_extra3_buf, bitmap_mask, bitmap_shift1, bitmap_shift2, salt_pos, loop_pos, loop_cnt, il_cnt, digests_cnt, digests_offset, combs_mode, gid_max); } -__kernel void m17900_s16 (KERN_ATTR_BASIC ()) +KERNEL_FQ void m17900_s16 (KERN_ATTR_BASIC ()) { /** * base diff --git a/OpenCL/m18000_a0-optimized.cl b/OpenCL/m18000_a0-optimized.cl index 5588eae0c..1aba5d856 100644 --- a/OpenCL/m18000_a0-optimized.cl +++ b/OpenCL/m18000_a0-optimized.cl @@ -14,7 +14,7 @@ #include "inc_simd.cl" #endif -__constant u64a keccakf_rndc[24] = +CONSTANT_AS u64a keccakf_rndc[24] = { 0x0000000000000001, 0x0000000000008082, 0x800000000000808a, 0x8000000080008000, 0x000000000000808b, 0x0000000080000001, @@ -30,7 +30,7 @@ __constant u64a keccakf_rndc[24] = #define KECCAK_ROUNDS 24 #endif -__kernel void m18000_m04 (KERN_ATTR_RULES ()) +KERNEL_FQ void m18000_m04 (KERN_ATTR_RULES ()) { /** * modifier @@ -240,15 +240,15 @@ __kernel void m18000_m04 (KERN_ATTR_RULES ()) } } -__kernel void m18000_m08 (KERN_ATTR_RULES ()) +KERNEL_FQ void m18000_m08 (KERN_ATTR_RULES ()) { } -__kernel void m18000_m16 (KERN_ATTR_RULES ()) +KERNEL_FQ void m18000_m16 (KERN_ATTR_RULES ()) { } -__kernel void m18000_s04 (KERN_ATTR_RULES ()) +KERNEL_FQ void m18000_s04 (KERN_ATTR_RULES ()) { /** * modifier @@ -470,10 +470,10 @@ __kernel void m18000_s04 (KERN_ATTR_RULES ()) } } -__kernel void m18000_s08 (KERN_ATTR_RULES ()) +KERNEL_FQ void m18000_s08 (KERN_ATTR_RULES ()) { } -__kernel void m18000_s16 (KERN_ATTR_RULES ()) +KERNEL_FQ void m18000_s16 (KERN_ATTR_RULES ()) { } diff --git a/OpenCL/m18000_a1-optimized.cl b/OpenCL/m18000_a1-optimized.cl index 265384f66..c5a76575d 100644 --- a/OpenCL/m18000_a1-optimized.cl +++ b/OpenCL/m18000_a1-optimized.cl @@ -12,7 +12,7 @@ #include "inc_simd.cl" #endif -__constant u64a keccakf_rndc[24] = +CONSTANT_AS u64a keccakf_rndc[24] = { 0x0000000000000001, 0x0000000000008082, 0x800000000000808a, 0x8000000080008000, 0x000000000000808b, 0x0000000080000001, @@ -28,7 +28,7 @@ __constant u64a keccakf_rndc[24] = #define KECCAK_ROUNDS 24 #endif -__kernel void m18000_m04 (KERN_ATTR_BASIC ()) +KERNEL_FQ void m18000_m04 (KERN_ATTR_BASIC ()) { /** * modifier @@ -297,15 +297,15 @@ __kernel void m18000_m04 (KERN_ATTR_BASIC ()) } -__kernel void m18000_m08 (KERN_ATTR_BASIC ()) +KERNEL_FQ void m18000_m08 (KERN_ATTR_BASIC ()) { } -__kernel void m18000_m16 (KERN_ATTR_BASIC ()) +KERNEL_FQ void m18000_m16 (KERN_ATTR_BASIC ()) { } -__kernel void m18000_s04 (KERN_ATTR_BASIC ()) +KERNEL_FQ void m18000_s04 (KERN_ATTR_BASIC ()) { /** * modifier @@ -585,10 +585,10 @@ __kernel void m18000_s04 (KERN_ATTR_BASIC ()) } } -__kernel void m18000_s08 (KERN_ATTR_BASIC ()) +KERNEL_FQ void m18000_s08 (KERN_ATTR_BASIC ()) { } -__kernel void m18000_s16 (KERN_ATTR_BASIC ()) +KERNEL_FQ void m18000_s16 (KERN_ATTR_BASIC ()) { } diff --git a/OpenCL/m18000_a3-optimized.cl b/OpenCL/m18000_a3-optimized.cl index 77e137cfc..8daede07e 100644 --- a/OpenCL/m18000_a3-optimized.cl +++ b/OpenCL/m18000_a3-optimized.cl @@ -12,7 +12,7 @@ #include "inc_simd.cl" #endif -__constant u64a keccakf_rndc[24] = +CONSTANT_AS u64a keccakf_rndc[24] = { 0x0000000000000001, 0x0000000000008082, 0x800000000000808a, 0x8000000080008000, 0x000000000000808b, 0x0000000080000001, @@ -412,7 +412,7 @@ DECLSPEC void m17600s (u32 *w0, u32 *w1, u32 *w2, u32 *w3, const u32 pw_len, KER } } -__kernel void m18000_m04 (KERN_ATTR_BASIC ()) +KERNEL_FQ void m18000_m04 (KERN_ATTR_BASIC ()) { /** * base @@ -459,7 +459,7 @@ __kernel void m18000_m04 (KERN_ATTR_BASIC ()) m17600m (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_extra0_buf, d_extra1_buf, d_extra2_buf, d_extra3_buf, bitmap_mask, bitmap_shift1, bitmap_shift2, salt_pos, loop_pos, loop_cnt, il_cnt, digests_cnt, digests_offset, combs_mode, gid_max); } -__kernel void m18000_m08 (KERN_ATTR_BASIC ()) +KERNEL_FQ void m18000_m08 (KERN_ATTR_BASIC ()) { /** * base @@ -506,7 +506,7 @@ __kernel void m18000_m08 (KERN_ATTR_BASIC ()) m17600m (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_extra0_buf, d_extra1_buf, d_extra2_buf, d_extra3_buf, bitmap_mask, bitmap_shift1, bitmap_shift2, salt_pos, loop_pos, loop_cnt, il_cnt, digests_cnt, digests_offset, combs_mode, gid_max); } -__kernel void m18000_m16 (KERN_ATTR_BASIC ()) +KERNEL_FQ void m18000_m16 (KERN_ATTR_BASIC ()) { /** * base @@ -553,7 +553,7 @@ __kernel void m18000_m16 (KERN_ATTR_BASIC ()) m17600m (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_extra0_buf, d_extra1_buf, d_extra2_buf, d_extra3_buf, bitmap_mask, bitmap_shift1, bitmap_shift2, salt_pos, loop_pos, loop_cnt, il_cnt, digests_cnt, digests_offset, combs_mode, gid_max); } -__kernel void m18000_s04 (KERN_ATTR_BASIC ()) +KERNEL_FQ void m18000_s04 (KERN_ATTR_BASIC ()) { /** * base @@ -600,7 +600,7 @@ __kernel void m18000_s04 (KERN_ATTR_BASIC ()) m17600s (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_extra0_buf, d_extra1_buf, d_extra2_buf, d_extra3_buf, bitmap_mask, bitmap_shift1, bitmap_shift2, salt_pos, loop_pos, loop_cnt, il_cnt, digests_cnt, digests_offset, combs_mode, gid_max); } -__kernel void m18000_s08 (KERN_ATTR_BASIC ()) +KERNEL_FQ void m18000_s08 (KERN_ATTR_BASIC ()) { /** * base @@ -647,7 +647,7 @@ __kernel void m18000_s08 (KERN_ATTR_BASIC ()) m17600s (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_extra0_buf, d_extra1_buf, d_extra2_buf, d_extra3_buf, bitmap_mask, bitmap_shift1, bitmap_shift2, salt_pos, loop_pos, loop_cnt, il_cnt, digests_cnt, digests_offset, combs_mode, gid_max); } -__kernel void m18000_s16 (KERN_ATTR_BASIC ()) +KERNEL_FQ void m18000_s16 (KERN_ATTR_BASIC ()) { /** * base diff --git a/OpenCL/m18100_a0-pure.cl b/OpenCL/m18100_a0-pure.cl index 8dd349b3a..0960e2bb0 100644 --- a/OpenCL/m18100_a0-pure.cl +++ b/OpenCL/m18100_a0-pure.cl @@ -15,7 +15,7 @@ #include "inc_hash_sha1.cl" #endif -__kernel void m18100_mxx (KERN_ATTR_RULES ()) +KERNEL_FQ void m18100_mxx (KERN_ATTR_RULES ()) { /** * modifier @@ -92,7 +92,7 @@ __kernel void m18100_mxx (KERN_ATTR_RULES ()) } } -__kernel void m18100_sxx (KERN_ATTR_RULES ()) +KERNEL_FQ void m18100_sxx (KERN_ATTR_RULES ()) { /** * modifier diff --git a/OpenCL/m18100_a1-pure.cl b/OpenCL/m18100_a1-pure.cl index 8dc5b14c0..eac3f05a2 100644 --- a/OpenCL/m18100_a1-pure.cl +++ b/OpenCL/m18100_a1-pure.cl @@ -13,7 +13,7 @@ #include "inc_hash_sha1.cl" #endif -__kernel void m18100_mxx (KERN_ATTR_BASIC ()) +KERNEL_FQ void m18100_mxx (KERN_ATTR_BASIC ()) { /** * modifier @@ -115,7 +115,7 @@ __kernel void m18100_mxx (KERN_ATTR_BASIC ()) } } -__kernel void m18100_sxx (KERN_ATTR_BASIC ()) +KERNEL_FQ void m18100_sxx (KERN_ATTR_BASIC ()) { /** * modifier diff --git a/OpenCL/m18100_a3-pure.cl b/OpenCL/m18100_a3-pure.cl index 6e73e1ec0..c35188b23 100644 --- a/OpenCL/m18100_a3-pure.cl +++ b/OpenCL/m18100_a3-pure.cl @@ -13,7 +13,7 @@ #include "inc_hash_sha1.cl" #endif -__kernel void m18100_mxx (KERN_ATTR_VECTOR ()) +KERNEL_FQ void m18100_mxx (KERN_ATTR_VECTOR ()) { /** * modifier @@ -102,7 +102,7 @@ __kernel void m18100_mxx (KERN_ATTR_VECTOR ()) } } -__kernel void m18100_sxx (KERN_ATTR_VECTOR ()) +KERNEL_FQ void m18100_sxx (KERN_ATTR_VECTOR ()) { /** * modifier diff --git a/OpenCL/m18200_a0-optimized.cl b/OpenCL/m18200_a0-optimized.cl index ac767827c..3cb61066d 100644 --- a/OpenCL/m18200_a0-optimized.cl +++ b/OpenCL/m18200_a0-optimized.cl @@ -34,7 +34,7 @@ typedef struct } RC4_KEY; -DECLSPEC void swap (__local RC4_KEY *rc4_key, const u8 i, const u8 j) +DECLSPEC void swap (LOCAL_AS RC4_KEY *rc4_key, const u8 i, const u8 j) { u8 tmp; @@ -43,12 +43,12 @@ DECLSPEC void swap (__local RC4_KEY *rc4_key, const u8 i, const u8 j) rc4_key->S[j] = tmp; } -DECLSPEC void rc4_init_16 (__local RC4_KEY *rc4_key, const u32 *data) +DECLSPEC void rc4_init_16 (LOCAL_AS RC4_KEY *rc4_key, const u32 *data) { u32 v = 0x03020100; u32 a = 0x04040404; - __local u32 *ptr = (__local u32 *) rc4_key->S; + LOCAL_AS u32 *ptr = (LOCAL_AS u32 *) rc4_key->S; #ifdef _unroll #pragma unroll @@ -96,7 +96,7 @@ DECLSPEC void rc4_init_16 (__local RC4_KEY *rc4_key, const u32 *data) } } -DECLSPEC u8 rc4_next_16 (__local RC4_KEY *rc4_key, u8 i, u8 j, const __global u32 *in, u32 *out) +DECLSPEC u8 rc4_next_16 (LOCAL_AS RC4_KEY *rc4_key, u8 i, u8 j, const GLOBAL_AS u32 *in, u32 *out) { #ifdef _unroll #pragma unroll @@ -234,7 +234,7 @@ DECLSPEC void hmac_md5_run (u32 *w0, u32 *w1, u32 *w2, u32 *w3, u32 *ipad, u32 * md5_transform (w0, w1, w2, w3, digest); } -DECLSPEC int decrypt_and_check (__local RC4_KEY *rc4_key, u32 *data, __global const u32 *edata2, const u32 edata2_len, const u32 *K2, const u32 *checksum) +DECLSPEC int decrypt_and_check (LOCAL_AS RC4_KEY *rc4_key, u32 *data, GLOBAL_AS const u32 *edata2, const u32 edata2_len, const u32 *K2, const u32 *checksum) { rc4_init_16 (rc4_key, data); @@ -572,7 +572,7 @@ DECLSPEC void kerb_prepare (const u32 *w0, const u32 *w1, const u32 pw_len, cons hmac_md5_run (w0_t, w1_t, w2_t, w3_t, ipad, opad, digest); } -__kernel void m18200_m04 (KERN_ATTR_RULES_ESALT (krb5asrep_t)) +KERNEL_FQ void m18200_m04 (KERN_ATTR_RULES_ESALT (krb5asrep_t)) { /** * modifier @@ -607,9 +607,9 @@ __kernel void m18200_m04 (KERN_ATTR_RULES_ESALT (krb5asrep_t)) * shared */ - __local RC4_KEY rc4_keys[64]; + LOCAL_AS RC4_KEY rc4_keys[64]; - __local RC4_KEY *rc4_key = &rc4_keys[lid]; + LOCAL_AS RC4_KEY *rc4_key = &rc4_keys[lid]; /** * salt @@ -662,15 +662,15 @@ __kernel void m18200_m04 (KERN_ATTR_RULES_ESALT (krb5asrep_t)) } } -__kernel void m18200_m08 (KERN_ATTR_RULES_ESALT (krb5asrep_t)) +KERNEL_FQ void m18200_m08 (KERN_ATTR_RULES_ESALT (krb5asrep_t)) { } -__kernel void m18200_m16 (KERN_ATTR_RULES_ESALT (krb5asrep_t)) +KERNEL_FQ void m18200_m16 (KERN_ATTR_RULES_ESALT (krb5asrep_t)) { } -__kernel void m18200_s04 (KERN_ATTR_RULES_ESALT (krb5asrep_t)) +KERNEL_FQ void m18200_s04 (KERN_ATTR_RULES_ESALT (krb5asrep_t)) { /** * modifier @@ -705,9 +705,9 @@ __kernel void m18200_s04 (KERN_ATTR_RULES_ESALT (krb5asrep_t)) * shared */ - __local RC4_KEY rc4_keys[64]; + LOCAL_AS RC4_KEY rc4_keys[64]; - __local RC4_KEY *rc4_key = &rc4_keys[lid]; + LOCAL_AS RC4_KEY *rc4_key = &rc4_keys[lid]; /** * salt @@ -760,10 +760,10 @@ __kernel void m18200_s04 (KERN_ATTR_RULES_ESALT (krb5asrep_t)) } } -__kernel void m18200_s08 (KERN_ATTR_RULES_ESALT (krb5asrep_t)) +KERNEL_FQ void m18200_s08 (KERN_ATTR_RULES_ESALT (krb5asrep_t)) { } -__kernel void m18200_s16 (KERN_ATTR_RULES_ESALT (krb5asrep_t)) +KERNEL_FQ void m18200_s16 (KERN_ATTR_RULES_ESALT (krb5asrep_t)) { } diff --git a/OpenCL/m18200_a0-pure.cl b/OpenCL/m18200_a0-pure.cl index d845a893d..61a10749c 100644 --- a/OpenCL/m18200_a0-pure.cl +++ b/OpenCL/m18200_a0-pure.cl @@ -33,7 +33,7 @@ typedef struct } RC4_KEY; -DECLSPEC void swap (__local RC4_KEY *rc4_key, const u8 i, const u8 j) +DECLSPEC void swap (LOCAL_AS RC4_KEY *rc4_key, const u8 i, const u8 j) { u8 tmp; @@ -42,12 +42,12 @@ DECLSPEC void swap (__local RC4_KEY *rc4_key, const u8 i, const u8 j) rc4_key->S[j] = tmp; } -DECLSPEC void rc4_init_16 (__local RC4_KEY *rc4_key, const u32 *data) +DECLSPEC void rc4_init_16 (LOCAL_AS RC4_KEY *rc4_key, const u32 *data) { u32 v = 0x03020100; u32 a = 0x04040404; - __local u32 *ptr = (__local u32 *) rc4_key->S; + LOCAL_AS u32 *ptr = (LOCAL_AS u32 *) rc4_key->S; #ifdef _unroll #pragma unroll @@ -95,7 +95,7 @@ DECLSPEC void rc4_init_16 (__local RC4_KEY *rc4_key, const u32 *data) } } -DECLSPEC u8 rc4_next_16 (__local RC4_KEY *rc4_key, u8 i, u8 j, const __global u32 *in, u32 *out) +DECLSPEC u8 rc4_next_16 (LOCAL_AS RC4_KEY *rc4_key, u8 i, u8 j, const GLOBAL_AS u32 *in, u32 *out) { #ifdef _unroll #pragma unroll @@ -148,7 +148,7 @@ DECLSPEC u8 rc4_next_16 (__local RC4_KEY *rc4_key, u8 i, u8 j, const __global u3 return j; } -DECLSPEC int decrypt_and_check (__local RC4_KEY *rc4_key, u32 *data, __global const u32 *edata2, const u32 edata2_len, const u32 *K2, const u32 *checksum) +DECLSPEC int decrypt_and_check (LOCAL_AS RC4_KEY *rc4_key, u32 *data, GLOBAL_AS const u32 *edata2, const u32 edata2_len, const u32 *K2, const u32 *checksum) { rc4_init_16 (rc4_key, data); @@ -384,7 +384,7 @@ DECLSPEC void kerb_prepare (const u32 *K, const u32 *checksum, u32 *digest, u32 K2[3] = ctx1.opad.h[3]; } -__kernel void m18200_mxx (KERN_ATTR_RULES_ESALT (krb5asrep_t)) +KERNEL_FQ void m18200_mxx (KERN_ATTR_RULES_ESALT (krb5asrep_t)) { /** * modifier @@ -401,9 +401,9 @@ __kernel void m18200_mxx (KERN_ATTR_RULES_ESALT (krb5asrep_t)) COPY_PW (pws[gid]); - __local RC4_KEY rc4_keys[64]; + LOCAL_AS RC4_KEY rc4_keys[64]; - __local RC4_KEY *rc4_key = &rc4_keys[lid]; + LOCAL_AS RC4_KEY *rc4_key = &rc4_keys[lid]; u32 checksum[4]; @@ -446,7 +446,7 @@ __kernel void m18200_mxx (KERN_ATTR_RULES_ESALT (krb5asrep_t)) } } -__kernel void m18200_sxx (KERN_ATTR_RULES_ESALT (krb5asrep_t)) +KERNEL_FQ void m18200_sxx (KERN_ATTR_RULES_ESALT (krb5asrep_t)) { /** * modifier @@ -463,9 +463,9 @@ __kernel void m18200_sxx (KERN_ATTR_RULES_ESALT (krb5asrep_t)) COPY_PW (pws[gid]); - __local RC4_KEY rc4_keys[64]; + LOCAL_AS RC4_KEY rc4_keys[64]; - __local RC4_KEY *rc4_key = &rc4_keys[lid]; + LOCAL_AS RC4_KEY *rc4_key = &rc4_keys[lid]; u32 checksum[4]; diff --git a/OpenCL/m18200_a1-optimized.cl b/OpenCL/m18200_a1-optimized.cl index 5cd961bae..77c6c0264 100644 --- a/OpenCL/m18200_a1-optimized.cl +++ b/OpenCL/m18200_a1-optimized.cl @@ -32,7 +32,7 @@ typedef struct } RC4_KEY; -DECLSPEC void swap (__local RC4_KEY *rc4_key, const u8 i, const u8 j) +DECLSPEC void swap (LOCAL_AS RC4_KEY *rc4_key, const u8 i, const u8 j) { u8 tmp; @@ -41,12 +41,12 @@ DECLSPEC void swap (__local RC4_KEY *rc4_key, const u8 i, const u8 j) rc4_key->S[j] = tmp; } -DECLSPEC void rc4_init_16 (__local RC4_KEY *rc4_key, const u32 *data) +DECLSPEC void rc4_init_16 (LOCAL_AS RC4_KEY *rc4_key, const u32 *data) { u32 v = 0x03020100; u32 a = 0x04040404; - __local u32 *ptr = (__local u32 *) rc4_key->S; + LOCAL_AS u32 *ptr = (LOCAL_AS u32 *) rc4_key->S; #ifdef _unroll #pragma unroll @@ -94,7 +94,7 @@ DECLSPEC void rc4_init_16 (__local RC4_KEY *rc4_key, const u32 *data) } } -DECLSPEC u8 rc4_next_16 (__local RC4_KEY *rc4_key, u8 i, u8 j, const __global u32 *in, u32 *out) +DECLSPEC u8 rc4_next_16 (LOCAL_AS RC4_KEY *rc4_key, u8 i, u8 j, const GLOBAL_AS u32 *in, u32 *out) { #ifdef _unroll #pragma unroll @@ -232,7 +232,7 @@ DECLSPEC void hmac_md5_run (u32 *w0, u32 *w1, u32 *w2, u32 *w3, u32 *ipad, u32 * md5_transform (w0, w1, w2, w3, digest); } -DECLSPEC int decrypt_and_check (__local RC4_KEY *rc4_key, u32 *data, __global const u32 *edata2, const u32 edata2_len, const u32 *K2, const u32 *checksum) +DECLSPEC int decrypt_and_check (LOCAL_AS RC4_KEY *rc4_key, u32 *data, GLOBAL_AS const u32 *edata2, const u32 edata2_len, const u32 *K2, const u32 *checksum) { rc4_init_16 (rc4_key, data); @@ -570,7 +570,7 @@ DECLSPEC void kerb_prepare (const u32 *w0, const u32 *w1, const u32 pw_len, cons hmac_md5_run (w0_t, w1_t, w2_t, w3_t, ipad, opad, digest); } -__kernel void m18200_m04 (KERN_ATTR_ESALT (krb5asrep_t)) +KERNEL_FQ void m18200_m04 (KERN_ATTR_ESALT (krb5asrep_t)) { /** * modifier @@ -604,9 +604,9 @@ __kernel void m18200_m04 (KERN_ATTR_ESALT (krb5asrep_t)) * shared */ - __local RC4_KEY rc4_keys[64]; + LOCAL_AS RC4_KEY rc4_keys[64]; - __local RC4_KEY *rc4_key = &rc4_keys[lid]; + LOCAL_AS RC4_KEY *rc4_key = &rc4_keys[lid]; /** * salt @@ -709,15 +709,15 @@ __kernel void m18200_m04 (KERN_ATTR_ESALT (krb5asrep_t)) } } -__kernel void m18200_m08 (KERN_ATTR_ESALT (krb5asrep_t)) +KERNEL_FQ void m18200_m08 (KERN_ATTR_ESALT (krb5asrep_t)) { } -__kernel void m18200_m16 (KERN_ATTR_ESALT (krb5asrep_t)) +KERNEL_FQ void m18200_m16 (KERN_ATTR_ESALT (krb5asrep_t)) { } -__kernel void m18200_s04 (KERN_ATTR_ESALT (krb5asrep_t)) +KERNEL_FQ void m18200_s04 (KERN_ATTR_ESALT (krb5asrep_t)) { /** * modifier @@ -751,9 +751,9 @@ __kernel void m18200_s04 (KERN_ATTR_ESALT (krb5asrep_t)) * shared */ - __local RC4_KEY rc4_keys[64]; + LOCAL_AS RC4_KEY rc4_keys[64]; - __local RC4_KEY *rc4_key = &rc4_keys[lid]; + LOCAL_AS RC4_KEY *rc4_key = &rc4_keys[lid]; /** * salt @@ -856,10 +856,10 @@ __kernel void m18200_s04 (KERN_ATTR_ESALT (krb5asrep_t)) } } -__kernel void m18200_s08 (KERN_ATTR_ESALT (krb5asrep_t)) +KERNEL_FQ void m18200_s08 (KERN_ATTR_ESALT (krb5asrep_t)) { } -__kernel void m18200_s16 (KERN_ATTR_ESALT (krb5asrep_t)) +KERNEL_FQ void m18200_s16 (KERN_ATTR_ESALT (krb5asrep_t)) { } diff --git a/OpenCL/m18200_a1-pure.cl b/OpenCL/m18200_a1-pure.cl index a8af74c5c..658da9ddd 100644 --- a/OpenCL/m18200_a1-pure.cl +++ b/OpenCL/m18200_a1-pure.cl @@ -31,7 +31,7 @@ typedef struct } RC4_KEY; -DECLSPEC void swap (__local RC4_KEY *rc4_key, const u8 i, const u8 j) +DECLSPEC void swap (LOCAL_AS RC4_KEY *rc4_key, const u8 i, const u8 j) { u8 tmp; @@ -40,12 +40,12 @@ DECLSPEC void swap (__local RC4_KEY *rc4_key, const u8 i, const u8 j) rc4_key->S[j] = tmp; } -DECLSPEC void rc4_init_16 (__local RC4_KEY *rc4_key, const u32 *data) +DECLSPEC void rc4_init_16 (LOCAL_AS RC4_KEY *rc4_key, const u32 *data) { u32 v = 0x03020100; u32 a = 0x04040404; - __local u32 *ptr = (__local u32 *) rc4_key->S; + LOCAL_AS u32 *ptr = (LOCAL_AS u32 *) rc4_key->S; #ifdef _unroll #pragma unroll @@ -93,7 +93,7 @@ DECLSPEC void rc4_init_16 (__local RC4_KEY *rc4_key, const u32 *data) } } -DECLSPEC u8 rc4_next_16 (__local RC4_KEY *rc4_key, u8 i, u8 j, const __global u32 *in, u32 *out) +DECLSPEC u8 rc4_next_16 (LOCAL_AS RC4_KEY *rc4_key, u8 i, u8 j, const GLOBAL_AS u32 *in, u32 *out) { #ifdef _unroll #pragma unroll @@ -146,7 +146,7 @@ DECLSPEC u8 rc4_next_16 (__local RC4_KEY *rc4_key, u8 i, u8 j, const __global u3 return j; } -DECLSPEC int decrypt_and_check (__local RC4_KEY *rc4_key, u32 *data, __global const u32 *edata2, const u32 edata2_len, const u32 *K2, const u32 *checksum) +DECLSPEC int decrypt_and_check (LOCAL_AS RC4_KEY *rc4_key, u32 *data, GLOBAL_AS const u32 *edata2, const u32 edata2_len, const u32 *K2, const u32 *checksum) { rc4_init_16 (rc4_key, data); @@ -382,7 +382,7 @@ DECLSPEC void kerb_prepare (const u32 *K, const u32 *checksum, u32 *digest, u32 K2[3] = ctx1.opad.h[3]; } -__kernel void m18200_mxx (KERN_ATTR_ESALT (krb5asrep_t)) +KERNEL_FQ void m18200_mxx (KERN_ATTR_ESALT (krb5asrep_t)) { /** * modifier @@ -397,9 +397,9 @@ __kernel void m18200_mxx (KERN_ATTR_ESALT (krb5asrep_t)) * base */ - __local RC4_KEY rc4_keys[64]; + LOCAL_AS RC4_KEY rc4_keys[64]; - __local RC4_KEY *rc4_key = &rc4_keys[lid]; + LOCAL_AS RC4_KEY *rc4_key = &rc4_keys[lid]; u32 checksum[4]; @@ -442,7 +442,7 @@ __kernel void m18200_mxx (KERN_ATTR_ESALT (krb5asrep_t)) } } -__kernel void m18200_sxx (KERN_ATTR_ESALT (krb5asrep_t)) +KERNEL_FQ void m18200_sxx (KERN_ATTR_ESALT (krb5asrep_t)) { /** * modifier @@ -457,9 +457,9 @@ __kernel void m18200_sxx (KERN_ATTR_ESALT (krb5asrep_t)) * base */ - __local RC4_KEY rc4_keys[64]; + LOCAL_AS RC4_KEY rc4_keys[64]; - __local RC4_KEY *rc4_key = &rc4_keys[lid]; + LOCAL_AS RC4_KEY *rc4_key = &rc4_keys[lid]; u32 checksum[4]; diff --git a/OpenCL/m18200_a3-optimized.cl b/OpenCL/m18200_a3-optimized.cl index 82c25972c..725e79507 100644 --- a/OpenCL/m18200_a3-optimized.cl +++ b/OpenCL/m18200_a3-optimized.cl @@ -32,7 +32,7 @@ typedef struct } RC4_KEY; -DECLSPEC void swap (__local RC4_KEY *rc4_key, const u8 i, const u8 j) +DECLSPEC void swap (LOCAL_AS RC4_KEY *rc4_key, const u8 i, const u8 j) { u8 tmp; @@ -41,12 +41,12 @@ DECLSPEC void swap (__local RC4_KEY *rc4_key, const u8 i, const u8 j) rc4_key->S[j] = tmp; } -DECLSPEC void rc4_init_16 (__local RC4_KEY *rc4_key, const u32 *data) +DECLSPEC void rc4_init_16 (LOCAL_AS RC4_KEY *rc4_key, const u32 *data) { u32 v = 0x03020100; u32 a = 0x04040404; - __local u32 *ptr = (__local u32 *) rc4_key->S; + LOCAL_AS u32 *ptr = (LOCAL_AS u32 *) rc4_key->S; #ifdef _unroll #pragma unroll @@ -94,7 +94,7 @@ DECLSPEC void rc4_init_16 (__local RC4_KEY *rc4_key, const u32 *data) } } -DECLSPEC u8 rc4_next_16 (__local RC4_KEY *rc4_key, u8 i, u8 j, const __global u32 *in, u32 *out) +DECLSPEC u8 rc4_next_16 (LOCAL_AS RC4_KEY *rc4_key, u8 i, u8 j, const GLOBAL_AS u32 *in, u32 *out) { #ifdef _unroll #pragma unroll @@ -232,7 +232,7 @@ DECLSPEC void hmac_md5_run (u32 *w0, u32 *w1, u32 *w2, u32 *w3, u32 *ipad, u32 * md5_transform (w0, w1, w2, w3, digest); } -DECLSPEC int decrypt_and_check (__local RC4_KEY *rc4_key, u32 *data, __global const u32 *edata2, const u32 edata2_len, const u32 *K2, const u32 *checksum) +DECLSPEC int decrypt_and_check (LOCAL_AS RC4_KEY *rc4_key, u32 *data, GLOBAL_AS const u32 *edata2, const u32 edata2_len, const u32 *K2, const u32 *checksum) { rc4_init_16 (rc4_key, data); @@ -570,7 +570,7 @@ DECLSPEC void kerb_prepare (const u32 *w0, const u32 *w1, const u32 pw_len, cons hmac_md5_run (w0_t, w1_t, w2_t, w3_t, ipad, opad, digest); } -DECLSPEC void m18200 (__local RC4_KEY *rc4_key, u32 *w0, u32 *w1, u32 *w2, u32 *w3, const u32 pw_len, KERN_ATTR_ESALT (krb5asrep_t)) +DECLSPEC void m18200 (LOCAL_AS RC4_KEY *rc4_key, u32 *w0, u32 *w1, u32 *w2, u32 *w3, const u32 pw_len, KERN_ATTR_ESALT (krb5asrep_t)) { /** * modifier @@ -629,7 +629,7 @@ DECLSPEC void m18200 (__local RC4_KEY *rc4_key, u32 *w0, u32 *w1, u32 *w2, u32 * } } -__kernel void m18200_m04 (KERN_ATTR_ESALT (krb5asrep_t)) +KERNEL_FQ void m18200_m04 (KERN_ATTR_ESALT (krb5asrep_t)) { /** * base @@ -674,14 +674,14 @@ __kernel void m18200_m04 (KERN_ATTR_ESALT (krb5asrep_t)) * main */ - __local RC4_KEY rc4_keys[64]; + LOCAL_AS RC4_KEY rc4_keys[64]; - __local RC4_KEY *rc4_key = &rc4_keys[lid]; + LOCAL_AS RC4_KEY *rc4_key = &rc4_keys[lid]; m18200 (rc4_key, 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_extra0_buf, d_extra1_buf, d_extra2_buf, d_extra3_buf, bitmap_mask, bitmap_shift1, bitmap_shift2, salt_pos, loop_pos, loop_cnt, il_cnt, digests_cnt, digests_offset, combs_mode, gid_max); } -__kernel void m18200_m08 (KERN_ATTR_ESALT (krb5asrep_t)) +KERNEL_FQ void m18200_m08 (KERN_ATTR_ESALT (krb5asrep_t)) { /** * base @@ -726,18 +726,18 @@ __kernel void m18200_m08 (KERN_ATTR_ESALT (krb5asrep_t)) * main */ - __local RC4_KEY rc4_keys[64]; + LOCAL_AS RC4_KEY rc4_keys[64]; - __local RC4_KEY *rc4_key = &rc4_keys[lid]; + LOCAL_AS RC4_KEY *rc4_key = &rc4_keys[lid]; m18200 (rc4_key, 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_extra0_buf, d_extra1_buf, d_extra2_buf, d_extra3_buf, bitmap_mask, bitmap_shift1, bitmap_shift2, salt_pos, loop_pos, loop_cnt, il_cnt, digests_cnt, digests_offset, combs_mode, gid_max); } -__kernel void m18200_m16 (KERN_ATTR_ESALT (krb5asrep_t)) +KERNEL_FQ void m18200_m16 (KERN_ATTR_ESALT (krb5asrep_t)) { } -__kernel void m18200_s04 (KERN_ATTR_ESALT (krb5asrep_t)) +KERNEL_FQ void m18200_s04 (KERN_ATTR_ESALT (krb5asrep_t)) { /** * base @@ -782,14 +782,14 @@ __kernel void m18200_s04 (KERN_ATTR_ESALT (krb5asrep_t)) * main */ - __local RC4_KEY rc4_keys[64]; + LOCAL_AS RC4_KEY rc4_keys[64]; - __local RC4_KEY *rc4_key = &rc4_keys[lid]; + LOCAL_AS RC4_KEY *rc4_key = &rc4_keys[lid]; m18200 (rc4_key, 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_extra0_buf, d_extra1_buf, d_extra2_buf, d_extra3_buf, bitmap_mask, bitmap_shift1, bitmap_shift2, salt_pos, loop_pos, loop_cnt, il_cnt, digests_cnt, digests_offset, combs_mode, gid_max); } -__kernel void m18200_s08 (KERN_ATTR_ESALT (krb5asrep_t)) +KERNEL_FQ void m18200_s08 (KERN_ATTR_ESALT (krb5asrep_t)) { /** * base @@ -834,13 +834,13 @@ __kernel void m18200_s08 (KERN_ATTR_ESALT (krb5asrep_t)) * main */ - __local RC4_KEY rc4_keys[64]; + LOCAL_AS RC4_KEY rc4_keys[64]; - __local RC4_KEY *rc4_key = &rc4_keys[lid]; + LOCAL_AS RC4_KEY *rc4_key = &rc4_keys[lid]; m18200 (rc4_key, 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_extra0_buf, d_extra1_buf, d_extra2_buf, d_extra3_buf, bitmap_mask, bitmap_shift1, bitmap_shift2, salt_pos, loop_pos, loop_cnt, il_cnt, digests_cnt, digests_offset, combs_mode, gid_max); } -__kernel void m18200_s16 (KERN_ATTR_ESALT (krb5asrep_t)) +KERNEL_FQ void m18200_s16 (KERN_ATTR_ESALT (krb5asrep_t)) { } diff --git a/OpenCL/m18200_a3-pure.cl b/OpenCL/m18200_a3-pure.cl index e6c19f0b0..b9d47e170 100644 --- a/OpenCL/m18200_a3-pure.cl +++ b/OpenCL/m18200_a3-pure.cl @@ -31,7 +31,7 @@ typedef struct } RC4_KEY; -DECLSPEC void swap (__local RC4_KEY *rc4_key, const u8 i, const u8 j) +DECLSPEC void swap (LOCAL_AS RC4_KEY *rc4_key, const u8 i, const u8 j) { u8 tmp; @@ -40,12 +40,12 @@ DECLSPEC void swap (__local RC4_KEY *rc4_key, const u8 i, const u8 j) rc4_key->S[j] = tmp; } -DECLSPEC void rc4_init_16 (__local RC4_KEY *rc4_key, const u32 *data) +DECLSPEC void rc4_init_16 (LOCAL_AS RC4_KEY *rc4_key, const u32 *data) { u32 v = 0x03020100; u32 a = 0x04040404; - __local u32 *ptr = (__local u32 *) rc4_key->S; + LOCAL_AS u32 *ptr = (LOCAL_AS u32 *) rc4_key->S; #ifdef _unroll #pragma unroll @@ -93,7 +93,7 @@ DECLSPEC void rc4_init_16 (__local RC4_KEY *rc4_key, const u32 *data) } } -DECLSPEC u8 rc4_next_16 (__local RC4_KEY *rc4_key, u8 i, u8 j, const __global u32 *in, u32 *out) +DECLSPEC u8 rc4_next_16 (LOCAL_AS RC4_KEY *rc4_key, u8 i, u8 j, const GLOBAL_AS u32 *in, u32 *out) { #ifdef _unroll #pragma unroll @@ -146,7 +146,7 @@ DECLSPEC u8 rc4_next_16 (__local RC4_KEY *rc4_key, u8 i, u8 j, const __global u3 return j; } -DECLSPEC int decrypt_and_check (__local RC4_KEY *rc4_key, u32 *data, __global const u32 *edata2, const u32 edata2_len, const u32 *K2, const u32 *checksum) +DECLSPEC int decrypt_and_check (LOCAL_AS RC4_KEY *rc4_key, u32 *data, GLOBAL_AS const u32 *edata2, const u32 edata2_len, const u32 *K2, const u32 *checksum) { rc4_init_16 (rc4_key, data); @@ -382,7 +382,7 @@ DECLSPEC void kerb_prepare (const u32 *K, const u32 *checksum, u32 *digest, u32 K2[3] = ctx1.opad.h[3]; } -__kernel void m18200_mxx (KERN_ATTR_VECTOR_ESALT (krb5asrep_t)) +KERNEL_FQ void m18200_mxx (KERN_ATTR_VECTOR_ESALT (krb5asrep_t)) { /** * modifier @@ -406,9 +406,9 @@ __kernel void m18200_mxx (KERN_ATTR_VECTOR_ESALT (krb5asrep_t)) w[idx] = pws[gid].i[idx]; } - __local RC4_KEY rc4_keys[64]; + LOCAL_AS RC4_KEY rc4_keys[64]; - __local RC4_KEY *rc4_key = &rc4_keys[lid]; + LOCAL_AS RC4_KEY *rc4_key = &rc4_keys[lid]; u32 checksum[4]; @@ -455,7 +455,7 @@ __kernel void m18200_mxx (KERN_ATTR_VECTOR_ESALT (krb5asrep_t)) } } -__kernel void m18200_sxx (KERN_ATTR_VECTOR_ESALT (krb5asrep_t)) +KERNEL_FQ void m18200_sxx (KERN_ATTR_VECTOR_ESALT (krb5asrep_t)) { /** * modifier @@ -479,9 +479,9 @@ __kernel void m18200_sxx (KERN_ATTR_VECTOR_ESALT (krb5asrep_t)) w[idx] = pws[gid].i[idx]; } - __local RC4_KEY rc4_keys[64]; + LOCAL_AS RC4_KEY rc4_keys[64]; - __local RC4_KEY *rc4_key = &rc4_keys[lid]; + LOCAL_AS RC4_KEY *rc4_key = &rc4_keys[lid]; u32 checksum[4]; diff --git a/OpenCL/m18300-pure.cl b/OpenCL/m18300-pure.cl index 0790759e4..600e4ef24 100644 --- a/OpenCL/m18300-pure.cl +++ b/OpenCL/m18300-pure.cl @@ -78,7 +78,7 @@ DECLSPEC void hmac_sha256_run_V (u32x *w0, u32x *w1, u32x *w2, u32x *w3, u32x *i sha256_transform_vector (w0, w1, w2, w3, digest); } -__kernel void m18300_init (KERN_ATTR_TMPS_ESALT (apple_secure_notes_tmp_t, apple_secure_notes_t)) +KERNEL_FQ void m18300_init (KERN_ATTR_TMPS_ESALT (apple_secure_notes_tmp_t, apple_secure_notes_t)) { /** * base @@ -162,7 +162,7 @@ __kernel void m18300_init (KERN_ATTR_TMPS_ESALT (apple_secure_notes_tmp_t, apple } } -__kernel void m18300_loop (KERN_ATTR_TMPS_ESALT (apple_secure_notes_tmp_t, apple_secure_notes_t)) +KERNEL_FQ void m18300_loop (KERN_ATTR_TMPS_ESALT (apple_secure_notes_tmp_t, apple_secure_notes_t)) { const u64 gid = get_global_id (0); @@ -268,7 +268,7 @@ __kernel void m18300_loop (KERN_ATTR_TMPS_ESALT (apple_secure_notes_tmp_t, apple } } -__kernel void m18300_comp (KERN_ATTR_TMPS_ESALT (apple_secure_notes_tmp_t, apple_secure_notes_t)) +KERNEL_FQ void m18300_comp (KERN_ATTR_TMPS_ESALT (apple_secure_notes_tmp_t, apple_secure_notes_t)) { const u64 gid = get_global_id (0); const u64 lid = get_local_id (0); @@ -280,17 +280,17 @@ __kernel void m18300_comp (KERN_ATTR_TMPS_ESALT (apple_secure_notes_tmp_t, apple #ifdef REAL_SHM - __local u32 s_td0[256]; - __local u32 s_td1[256]; - __local u32 s_td2[256]; - __local u32 s_td3[256]; - __local u32 s_td4[256]; + LOCAL_AS u32 s_td0[256]; + LOCAL_AS u32 s_td1[256]; + LOCAL_AS u32 s_td2[256]; + LOCAL_AS u32 s_td3[256]; + LOCAL_AS u32 s_td4[256]; - __local u32 s_te0[256]; - __local u32 s_te1[256]; - __local u32 s_te2[256]; - __local u32 s_te3[256]; - __local u32 s_te4[256]; + LOCAL_AS u32 s_te0[256]; + LOCAL_AS u32 s_te1[256]; + LOCAL_AS u32 s_te2[256]; + LOCAL_AS u32 s_te3[256]; + LOCAL_AS u32 s_te4[256]; for (u32 i = lid; i < 256; i += lsz) { @@ -311,17 +311,17 @@ __kernel void m18300_comp (KERN_ATTR_TMPS_ESALT (apple_secure_notes_tmp_t, apple #else - __constant u32a *s_td0 = td0; - __constant u32a *s_td1 = td1; - __constant u32a *s_td2 = td2; - __constant u32a *s_td3 = td3; - __constant u32a *s_td4 = td4; + CONSTANT_AS u32a *s_td0 = td0; + CONSTANT_AS u32a *s_td1 = td1; + CONSTANT_AS u32a *s_td2 = td2; + CONSTANT_AS u32a *s_td3 = td3; + CONSTANT_AS u32a *s_td4 = td4; - __constant u32a *s_te0 = te0; - __constant u32a *s_te1 = te1; - __constant u32a *s_te2 = te2; - __constant u32a *s_te3 = te3; - __constant u32a *s_te4 = te4; + CONSTANT_AS u32a *s_te0 = te0; + CONSTANT_AS u32a *s_te1 = te1; + CONSTANT_AS u32a *s_te2 = te2; + CONSTANT_AS u32a *s_te3 = te3; + CONSTANT_AS u32a *s_te4 = te4; #endif diff --git a/OpenCL/m18400-pure.cl b/OpenCL/m18400-pure.cl index 73fd018a2..c7d3aa9ae 100644 --- a/OpenCL/m18400-pure.cl +++ b/OpenCL/m18400-pure.cl @@ -73,7 +73,7 @@ DECLSPEC void hmac_sha1_run_V (u32x *w0, u32x *w1, u32x *w2, u32x *w3, u32x *ipa sha1_transform_vector (w0, w1, w2, w3, digest); } -__kernel void m18400_init (KERN_ATTR_TMPS_ESALT (odf12_tmp_t, odf12_t)) +KERNEL_FQ void m18400_init (KERN_ATTR_TMPS_ESALT (odf12_tmp_t, odf12_t)) { /** * base @@ -178,7 +178,7 @@ __kernel void m18400_init (KERN_ATTR_TMPS_ESALT (odf12_tmp_t, odf12_t)) } } -__kernel void m18400_loop (KERN_ATTR_TMPS_ESALT (odf12_tmp_t, odf12_t)) +KERNEL_FQ void m18400_loop (KERN_ATTR_TMPS_ESALT (odf12_tmp_t, odf12_t)) { const u64 gid = get_global_id (0); @@ -264,7 +264,7 @@ __kernel void m18400_loop (KERN_ATTR_TMPS_ESALT (odf12_tmp_t, odf12_t)) } } -__kernel void m18400_comp (KERN_ATTR_TMPS_ESALT (odf12_tmp_t, odf12_t)) +KERNEL_FQ void m18400_comp (KERN_ATTR_TMPS_ESALT (odf12_tmp_t, odf12_t)) { const u64 gid = get_global_id (0); const u64 lid = get_local_id (0); @@ -276,17 +276,17 @@ __kernel void m18400_comp (KERN_ATTR_TMPS_ESALT (odf12_tmp_t, odf12_t)) #ifdef REAL_SHM - __local u32 s_td0[256]; - __local u32 s_td1[256]; - __local u32 s_td2[256]; - __local u32 s_td3[256]; - __local u32 s_td4[256]; + LOCAL_AS u32 s_td0[256]; + LOCAL_AS u32 s_td1[256]; + LOCAL_AS u32 s_td2[256]; + LOCAL_AS u32 s_td3[256]; + LOCAL_AS u32 s_td4[256]; - __local u32 s_te0[256]; - __local u32 s_te1[256]; - __local u32 s_te2[256]; - __local u32 s_te3[256]; - __local u32 s_te4[256]; + LOCAL_AS u32 s_te0[256]; + LOCAL_AS u32 s_te1[256]; + LOCAL_AS u32 s_te2[256]; + LOCAL_AS u32 s_te3[256]; + LOCAL_AS u32 s_te4[256]; for (u32 i = lid; i < 256; i += lsz) { @@ -307,17 +307,17 @@ __kernel void m18400_comp (KERN_ATTR_TMPS_ESALT (odf12_tmp_t, odf12_t)) #else - __constant u32a *s_td0 = td0; - __constant u32a *s_td1 = td1; - __constant u32a *s_td2 = td2; - __constant u32a *s_td3 = td3; - __constant u32a *s_td4 = td4; + CONSTANT_AS u32a *s_td0 = td0; + CONSTANT_AS u32a *s_td1 = td1; + CONSTANT_AS u32a *s_td2 = td2; + CONSTANT_AS u32a *s_td3 = td3; + CONSTANT_AS u32a *s_td4 = td4; - __constant u32a *s_te0 = te0; - __constant u32a *s_te1 = te1; - __constant u32a *s_te2 = te2; - __constant u32a *s_te3 = te3; - __constant u32a *s_te4 = te4; + CONSTANT_AS u32a *s_te0 = te0; + CONSTANT_AS u32a *s_te1 = te1; + CONSTANT_AS u32a *s_te2 = te2; + CONSTANT_AS u32a *s_te3 = te3; + CONSTANT_AS u32a *s_te4 = te4; #endif @@ -342,7 +342,7 @@ __kernel void m18400_comp (KERN_ATTR_TMPS_ESALT (odf12_tmp_t, odf12_t)) aes256_set_decrypt_key (ks, ukey, s_te0, s_te1, s_te2, s_te3, s_te4, s_td0, s_td1, s_td2, s_td3, s_td4); - __global const odf12_t *es = &esalt_bufs[digests_offset]; + GLOBAL_AS const odf12_t *es = &esalt_bufs[digests_offset]; u32 iv[4]; diff --git a/OpenCL/m18500_a0-pure.cl b/OpenCL/m18500_a0-pure.cl index eb2aa4b6b..e137f7a55 100644 --- a/OpenCL/m18500_a0-pure.cl +++ b/OpenCL/m18500_a0-pure.cl @@ -28,7 +28,7 @@ #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 m18500_mxx (KERN_ATTR_RULES ()) +KERNEL_FQ void m18500_mxx (KERN_ATTR_RULES ()) { /** * modifier @@ -38,7 +38,7 @@ __kernel void m18500_mxx (KERN_ATTR_RULES ()) const u64 gid = get_global_id (0); const u64 lsz = get_local_size (0); - __local u32 l_bin2asc[256]; + LOCAL_AS u32 l_bin2asc[256]; for (u32 i = lid; i < 256; i += lsz) { @@ -144,7 +144,7 @@ __kernel void m18500_mxx (KERN_ATTR_RULES ()) } } -__kernel void m18500_sxx (KERN_ATTR_RULES ()) +KERNEL_FQ void m18500_sxx (KERN_ATTR_RULES ()) { /** * modifier @@ -154,7 +154,7 @@ __kernel void m18500_sxx (KERN_ATTR_RULES ()) const u64 gid = get_global_id (0); const u64 lsz = get_local_size (0); - __local u32 l_bin2asc[256]; + LOCAL_AS u32 l_bin2asc[256]; for (u32 i = lid; i < 256; i += lsz) { diff --git a/OpenCL/m18500_a1-pure.cl b/OpenCL/m18500_a1-pure.cl index 00a594e14..883ed71b3 100644 --- a/OpenCL/m18500_a1-pure.cl +++ b/OpenCL/m18500_a1-pure.cl @@ -28,7 +28,7 @@ #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 m18500_mxx (KERN_ATTR_RULES ()) +KERNEL_FQ void m18500_mxx (KERN_ATTR_RULES ()) { /** * modifier @@ -38,7 +38,7 @@ __kernel void m18500_mxx (KERN_ATTR_RULES ()) const u64 gid = get_global_id (0); const u64 lsz = get_local_size (0); - __local u32 l_bin2asc[256]; + LOCAL_AS u32 l_bin2asc[256]; for (u32 i = lid; i < 256; i += lsz) { @@ -143,7 +143,7 @@ __kernel void m18500_mxx (KERN_ATTR_RULES ()) } } -__kernel void m18500_sxx (KERN_ATTR_RULES ()) +KERNEL_FQ void m18500_sxx (KERN_ATTR_RULES ()) { /** * modifier @@ -153,7 +153,7 @@ __kernel void m18500_sxx (KERN_ATTR_RULES ()) const u64 gid = get_global_id (0); const u64 lsz = get_local_size (0); - __local u32 l_bin2asc[256]; + LOCAL_AS u32 l_bin2asc[256]; for (u32 i = lid; i < 256; i += lsz) { diff --git a/OpenCL/m18500_a3-pure.cl b/OpenCL/m18500_a3-pure.cl index 333354ebf..3de2ffdb3 100644 --- a/OpenCL/m18500_a3-pure.cl +++ b/OpenCL/m18500_a3-pure.cl @@ -26,7 +26,7 @@ #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 m18500_mxx (KERN_ATTR_VECTOR ()) +KERNEL_FQ void m18500_mxx (KERN_ATTR_VECTOR ()) { /** * modifier @@ -36,7 +36,7 @@ __kernel void m18500_mxx (KERN_ATTR_VECTOR ()) const u64 gid = get_global_id (0); const u64 lsz = get_local_size (0); - __local u32 l_bin2asc[256]; + LOCAL_AS u32 l_bin2asc[256]; for (u32 i = lid; i < 256; i += lsz) { @@ -153,7 +153,7 @@ __kernel void m18500_mxx (KERN_ATTR_VECTOR ()) } } -__kernel void m18500_sxx (KERN_ATTR_VECTOR ()) +KERNEL_FQ void m18500_sxx (KERN_ATTR_VECTOR ()) { /** * modifier @@ -163,7 +163,7 @@ __kernel void m18500_sxx (KERN_ATTR_VECTOR ()) const u64 gid = get_global_id (0); const u64 lsz = get_local_size (0); - __local u32 l_bin2asc[256]; + LOCAL_AS u32 l_bin2asc[256]; for (u32 i = lid; i < 256; i += lsz) { diff --git a/OpenCL/m18600-pure.cl b/OpenCL/m18600-pure.cl index 34f6fda7d..b939a4381 100644 --- a/OpenCL/m18600-pure.cl +++ b/OpenCL/m18600-pure.cl @@ -37,7 +37,7 @@ typedef struct odf11 // http://www.schneier.com/code/constants.txt -__constant u32a c_sbox0[256] = +CONSTANT_AS u32a c_sbox0[256] = { 0xd1310ba6, 0x98dfb5ac, 0x2ffd72db, 0xd01adfb7, 0xb8e1afed, 0x6a267e96, 0xba7c9045, 0xf12c7f99, @@ -105,7 +105,7 @@ __constant u32a c_sbox0[256] = 0x53b02d5d, 0xa99f8fa1, 0x08ba4799, 0x6e85076a }; -__constant u32a c_sbox1[256] = +CONSTANT_AS u32a c_sbox1[256] = { 0x4b7a70e9, 0xb5b32944, 0xdb75092e, 0xc4192623, 0xad6ea6b0, 0x49a7df7d, 0x9cee60b8, 0x8fedb266, @@ -173,7 +173,7 @@ __constant u32a c_sbox1[256] = 0x153e21e7, 0x8fb03d4a, 0xe6e39f2b, 0xdb83adf7 }; -__constant u32a c_sbox2[256] = +CONSTANT_AS u32a c_sbox2[256] = { 0xe93d5a68, 0x948140f7, 0xf64c261c, 0x94692934, 0x411520f7, 0x7602d4f7, 0xbcf46b2e, 0xd4a20068, @@ -241,7 +241,7 @@ __constant u32a c_sbox2[256] = 0xd79a3234, 0x92638212, 0x670efa8e, 0x406000e0 }; -__constant u32a c_sbox3[256] = +CONSTANT_AS u32a c_sbox3[256] = { 0x3a39ce37, 0xd3faf5cf, 0xabc27737, 0x5ac52d1b, 0x5cb0679e, 0x4fa33742, 0xd3822740, 0x99bc9bbe, @@ -309,7 +309,7 @@ __constant u32a c_sbox3[256] = 0xb74e6132, 0xce77e25b, 0x578fdfe3, 0x3ac372e6 }; -__constant u32a c_pbox[18] = +CONSTANT_AS u32a c_pbox[18] = { 0x243f6a88, 0x85a308d3, 0x13198a2e, 0x03707344, 0xa4093822, 0x299f31d0, 0x082efa98, 0xec4e6c89, @@ -401,7 +401,7 @@ DECLSPEC void hmac_sha1_run_V (u32x *w0, u32x *w1, u32x *w2, u32x *w3, u32x *ipa sha1_transform_vector (w0, w1, w2, w3, digest); } -__kernel void m18600_init (KERN_ATTR_TMPS_ESALT (odf11_tmp_t, odf11_t)) +KERNEL_FQ void m18600_init (KERN_ATTR_TMPS_ESALT (odf11_tmp_t, odf11_t)) { /** * base @@ -503,7 +503,7 @@ __kernel void m18600_init (KERN_ATTR_TMPS_ESALT (odf11_tmp_t, odf11_t)) tmps[gid].out[4] = tmps[gid].dgst[4]; } -__kernel void m18600_loop (KERN_ATTR_TMPS_ESALT (odf11_tmp_t, odf11_t)) +KERNEL_FQ void m18600_loop (KERN_ATTR_TMPS_ESALT (odf11_tmp_t, odf11_t)) { const u64 gid = get_global_id (0); @@ -585,7 +585,7 @@ __kernel void m18600_loop (KERN_ATTR_TMPS_ESALT (odf11_tmp_t, odf11_t)) } } -__kernel void __attribute__((reqd_work_group_size(FIXED_LOCAL_SIZE, 1, 1))) m18600_comp (KERN_ATTR_TMPS_ESALT (odf11_tmp_t, odf11_t)) +KERNEL_FQ void __attribute__((reqd_work_group_size(FIXED_LOCAL_SIZE, 1, 1))) m18600_comp (KERN_ATTR_TMPS_ESALT (odf11_tmp_t, odf11_t)) { const u64 gid = get_global_id (0); const u64 lid = get_local_id (0); @@ -615,15 +615,15 @@ __kernel void __attribute__((reqd_work_group_size(FIXED_LOCAL_SIZE, 1, 1))) m186 P[i] = c_pbox[i] ^ ukey[i % 4]; } - __local u32 S0_all[FIXED_LOCAL_SIZE][256]; - __local u32 S1_all[FIXED_LOCAL_SIZE][256]; - __local u32 S2_all[FIXED_LOCAL_SIZE][256]; - __local u32 S3_all[FIXED_LOCAL_SIZE][256]; + LOCAL_AS u32 S0_all[FIXED_LOCAL_SIZE][256]; + LOCAL_AS u32 S1_all[FIXED_LOCAL_SIZE][256]; + LOCAL_AS u32 S2_all[FIXED_LOCAL_SIZE][256]; + LOCAL_AS u32 S3_all[FIXED_LOCAL_SIZE][256]; - __local u32 *S0 = S0_all[lid]; - __local u32 *S1 = S1_all[lid]; - __local u32 *S2 = S2_all[lid]; - __local u32 *S3 = S3_all[lid]; + LOCAL_AS u32 *S0 = S0_all[lid]; + LOCAL_AS u32 *S1 = S1_all[lid]; + LOCAL_AS u32 *S2 = S2_all[lid]; + LOCAL_AS u32 *S3 = S3_all[lid]; for (u32 i = 0; i < 256; i++) { @@ -696,7 +696,7 @@ __kernel void __attribute__((reqd_work_group_size(FIXED_LOCAL_SIZE, 1, 1))) m186 S3[i + 3] = R0; } - __global const odf11_t *es = &esalt_bufs[digests_offset]; + GLOBAL_AS const odf11_t *es = &esalt_bufs[digests_offset]; u32 ct[2]; diff --git a/OpenCL/m18700_a0-optimized.cl b/OpenCL/m18700_a0-optimized.cl index 24b860c2a..d64a971ac 100644 --- a/OpenCL/m18700_a0-optimized.cl +++ b/OpenCL/m18700_a0-optimized.cl @@ -52,7 +52,7 @@ DECLSPEC u32 hashCode (const u32 init, const u32 *w, const u32 pw_len) return hash; } -__kernel void m18700_m04 (KERN_ATTR_RULES ()) +KERNEL_FQ void m18700_m04 (KERN_ATTR_RULES ()) { /** * modifier @@ -103,15 +103,15 @@ __kernel void m18700_m04 (KERN_ATTR_RULES ()) } } -__kernel void m18700_m08 (KERN_ATTR_RULES ()) +KERNEL_FQ void m18700_m08 (KERN_ATTR_RULES ()) { } -__kernel void m18700_m16 (KERN_ATTR_RULES ()) +KERNEL_FQ void m18700_m16 (KERN_ATTR_RULES ()) { } -__kernel void m18700_s04 (KERN_ATTR_RULES ()) +KERNEL_FQ void m18700_s04 (KERN_ATTR_RULES ()) { /** * modifier @@ -174,10 +174,10 @@ __kernel void m18700_s04 (KERN_ATTR_RULES ()) } } -__kernel void m18700_s08 (KERN_ATTR_RULES ()) +KERNEL_FQ void m18700_s08 (KERN_ATTR_RULES ()) { } -__kernel void m18700_s16 (KERN_ATTR_RULES ()) +KERNEL_FQ void m18700_s16 (KERN_ATTR_RULES ()) { } diff --git a/OpenCL/m18700_a0-pure.cl b/OpenCL/m18700_a0-pure.cl index 7dd4072ef..a7276b9eb 100644 --- a/OpenCL/m18700_a0-pure.cl +++ b/OpenCL/m18700_a0-pure.cl @@ -53,7 +53,7 @@ DECLSPEC u32 hashCode (const u32 init, const u32 *w, const u32 pw_len) return hash; } -__kernel void m18700_mxx (KERN_ATTR_RULES ()) +KERNEL_FQ void m18700_mxx (KERN_ATTR_RULES ()) { /** * modifier @@ -91,7 +91,7 @@ __kernel void m18700_mxx (KERN_ATTR_RULES ()) } } -__kernel void m18700_sxx (KERN_ATTR_RULES ()) +KERNEL_FQ void m18700_sxx (KERN_ATTR_RULES ()) { /** * modifier diff --git a/OpenCL/m18700_a1-optimized.cl b/OpenCL/m18700_a1-optimized.cl index b3aa1614a..41919bd83 100644 --- a/OpenCL/m18700_a1-optimized.cl +++ b/OpenCL/m18700_a1-optimized.cl @@ -14,7 +14,7 @@ #include "inc_hash_md5.cl" #endif -DECLSPEC u32 hashCode_g (const u32 init, __global u32 * restrict w, const u32 pw_len) +DECLSPEC u32 hashCode_g (const u32 init, GLOBAL_AS u32 * restrict w, const u32 pw_len) { u32 hash = init; @@ -52,7 +52,7 @@ DECLSPEC u32 hashCode_g (const u32 init, __global u32 * restrict w, const u32 pw return hash; } -__kernel void m18700_m04 (KERN_ATTR_BASIC ()) +KERNEL_FQ void m18700_m04 (KERN_ATTR_BASIC ()) { /** * modifier @@ -96,15 +96,15 @@ __kernel void m18700_m04 (KERN_ATTR_BASIC ()) } } -__kernel void m18700_m08 (KERN_ATTR_BASIC ()) +KERNEL_FQ void m18700_m08 (KERN_ATTR_BASIC ()) { } -__kernel void m18700_m16 (KERN_ATTR_BASIC ()) +KERNEL_FQ void m18700_m16 (KERN_ATTR_BASIC ()) { } -__kernel void m18700_s04 (KERN_ATTR_BASIC ()) +KERNEL_FQ void m18700_s04 (KERN_ATTR_BASIC ()) { /** * modifier @@ -160,10 +160,10 @@ __kernel void m18700_s04 (KERN_ATTR_BASIC ()) } } -__kernel void m18700_s08 (KERN_ATTR_BASIC ()) +KERNEL_FQ void m18700_s08 (KERN_ATTR_BASIC ()) { } -__kernel void m18700_s16 (KERN_ATTR_BASIC ()) +KERNEL_FQ void m18700_s16 (KERN_ATTR_BASIC ()) { } diff --git a/OpenCL/m18700_a1-pure.cl b/OpenCL/m18700_a1-pure.cl index 7b619baa1..923363ab0 100644 --- a/OpenCL/m18700_a1-pure.cl +++ b/OpenCL/m18700_a1-pure.cl @@ -13,7 +13,7 @@ #include "inc_hash_md5.cl" #endif -DECLSPEC u32 hashCode_g (const u32 init, __global u32 * restrict w, const u32 pw_len) +DECLSPEC u32 hashCode_g (const u32 init, GLOBAL_AS u32 * restrict w, const u32 pw_len) { u32 hash = init; @@ -51,7 +51,7 @@ DECLSPEC u32 hashCode_g (const u32 init, __global u32 * restrict w, const u32 pw return hash; } -__kernel void m18700_mxx (KERN_ATTR_BASIC ()) +KERNEL_FQ void m18700_mxx (KERN_ATTR_BASIC ()) { /** * modifier @@ -90,7 +90,7 @@ __kernel void m18700_mxx (KERN_ATTR_BASIC ()) } } -__kernel void m18700_sxx (KERN_ATTR_BASIC ()) +KERNEL_FQ void m18700_sxx (KERN_ATTR_BASIC ()) { /** * modifier diff --git a/OpenCL/m18700_a3-optimized.cl b/OpenCL/m18700_a3-optimized.cl index ba8c0182b..0df5cb0cc 100644 --- a/OpenCL/m18700_a3-optimized.cl +++ b/OpenCL/m18700_a3-optimized.cl @@ -145,7 +145,7 @@ DECLSPEC void m18700s (const u32 *w, const u32 pw_len, KERN_ATTR_VECTOR ()) } } -__kernel void m18700_m04 (KERN_ATTR_VECTOR ()) +KERNEL_FQ void m18700_m04 (KERN_ATTR_VECTOR ()) { /** * base @@ -183,7 +183,7 @@ __kernel void m18700_m04 (KERN_ATTR_VECTOR ()) m18700m (w, pw_len, pws, rules_buf, combs_buf, words_buf_r, 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_extra0_buf, d_extra1_buf, d_extra2_buf, d_extra3_buf, bitmap_mask, bitmap_shift1, bitmap_shift2, salt_pos, loop_pos, loop_cnt, il_cnt, digests_cnt, digests_offset, combs_mode, gid_max); } -__kernel void m18700_m08 (KERN_ATTR_VECTOR ()) +KERNEL_FQ void m18700_m08 (KERN_ATTR_VECTOR ()) { /** * base @@ -221,7 +221,7 @@ __kernel void m18700_m08 (KERN_ATTR_VECTOR ()) m18700m (w, pw_len, pws, rules_buf, combs_buf, words_buf_r, 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_extra0_buf, d_extra1_buf, d_extra2_buf, d_extra3_buf, bitmap_mask, bitmap_shift1, bitmap_shift2, salt_pos, loop_pos, loop_cnt, il_cnt, digests_cnt, digests_offset, combs_mode, gid_max); } -__kernel void m18700_m16 (KERN_ATTR_VECTOR ()) +KERNEL_FQ void m18700_m16 (KERN_ATTR_VECTOR ()) { /** * base @@ -259,7 +259,7 @@ __kernel void m18700_m16 (KERN_ATTR_VECTOR ()) m18700m (w, pw_len, pws, rules_buf, combs_buf, words_buf_r, 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_extra0_buf, d_extra1_buf, d_extra2_buf, d_extra3_buf, bitmap_mask, bitmap_shift1, bitmap_shift2, salt_pos, loop_pos, loop_cnt, il_cnt, digests_cnt, digests_offset, combs_mode, gid_max); } -__kernel void m18700_s04 (KERN_ATTR_VECTOR ()) +KERNEL_FQ void m18700_s04 (KERN_ATTR_VECTOR ()) { /** * base @@ -297,7 +297,7 @@ __kernel void m18700_s04 (KERN_ATTR_VECTOR ()) m18700s (w, pw_len, pws, rules_buf, combs_buf, words_buf_r, 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_extra0_buf, d_extra1_buf, d_extra2_buf, d_extra3_buf, bitmap_mask, bitmap_shift1, bitmap_shift2, salt_pos, loop_pos, loop_cnt, il_cnt, digests_cnt, digests_offset, combs_mode, gid_max); } -__kernel void m18700_s08 (KERN_ATTR_VECTOR ()) +KERNEL_FQ void m18700_s08 (KERN_ATTR_VECTOR ()) { /** * base @@ -335,7 +335,7 @@ __kernel void m18700_s08 (KERN_ATTR_VECTOR ()) m18700s (w, pw_len, pws, rules_buf, combs_buf, words_buf_r, 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_extra0_buf, d_extra1_buf, d_extra2_buf, d_extra3_buf, bitmap_mask, bitmap_shift1, bitmap_shift2, salt_pos, loop_pos, loop_cnt, il_cnt, digests_cnt, digests_offset, combs_mode, gid_max); } -__kernel void m18700_s16 (KERN_ATTR_VECTOR ()) +KERNEL_FQ void m18700_s16 (KERN_ATTR_VECTOR ()) { /** * base diff --git a/OpenCL/m18700_a3-pure.cl b/OpenCL/m18700_a3-pure.cl index ed0bcf2de..71c06b4f6 100644 --- a/OpenCL/m18700_a3-pure.cl +++ b/OpenCL/m18700_a3-pure.cl @@ -69,7 +69,7 @@ DECLSPEC u32x hashCode_w0 (const u32x init, const u32x w0, const u32 *w, const u return hash; } -__kernel void m18700_mxx (KERN_ATTR_VECTOR ()) +KERNEL_FQ void m18700_mxx (KERN_ATTR_VECTOR ()) { /** * modifier @@ -116,7 +116,7 @@ __kernel void m18700_mxx (KERN_ATTR_VECTOR ()) } } -__kernel void m18700_sxx (KERN_ATTR_VECTOR ()) +KERNEL_FQ void m18700_sxx (KERN_ATTR_VECTOR ()) { /** * modifier diff --git a/OpenCL/m18800-pure.cl b/OpenCL/m18800-pure.cl index 2a8df5c5e..8dfd54c30 100644 --- a/OpenCL/m18800-pure.cl +++ b/OpenCL/m18800-pure.cl @@ -22,7 +22,7 @@ typedef struct bsp_tmp } bsp_tmp_t; -__kernel void m18800_init (KERN_ATTR_TMPS (bsp_tmp_t)) +KERNEL_FQ void m18800_init (KERN_ATTR_TMPS (bsp_tmp_t)) { /** * base @@ -52,7 +52,7 @@ __kernel void m18800_init (KERN_ATTR_TMPS (bsp_tmp_t)) tmps[gid].hash[7] = ctx.h[7]; } -__kernel void m18800_loop (KERN_ATTR_TMPS (bsp_tmp_t)) +KERNEL_FQ void m18800_loop (KERN_ATTR_TMPS (bsp_tmp_t)) { const u64 gid = get_global_id (0); @@ -115,7 +115,7 @@ __kernel void m18800_loop (KERN_ATTR_TMPS (bsp_tmp_t)) unpackv (tmps, hash, gid, 7, digest[7]); } -__kernel void m18800_comp (KERN_ATTR_TMPS (bsp_tmp_t)) +KERNEL_FQ void m18800_comp (KERN_ATTR_TMPS (bsp_tmp_t)) { /** * modifier diff --git a/OpenCL/m18900-pure.cl b/OpenCL/m18900-pure.cl index 274be7c6a..6a866f2e4 100644 --- a/OpenCL/m18900-pure.cl +++ b/OpenCL/m18900-pure.cl @@ -75,7 +75,7 @@ DECLSPEC void hmac_sha1_run_V (u32x *w0, u32x *w1, u32x *w2, u32x *w3, u32x *ipa sha1_transform_vector (w0, w1, w2, w3, digest); } -__kernel void m18900_init (KERN_ATTR_TMPS_ESALT (android_backup_tmp_t, android_backup_t)) +KERNEL_FQ void m18900_init (KERN_ATTR_TMPS_ESALT (android_backup_tmp_t, android_backup_t)) { /** * base @@ -147,7 +147,7 @@ __kernel void m18900_init (KERN_ATTR_TMPS_ESALT (android_backup_tmp_t, android_b } } -__kernel void m18900_loop (KERN_ATTR_TMPS_ESALT (android_backup_tmp_t, android_backup_t)) +KERNEL_FQ void m18900_loop (KERN_ATTR_TMPS_ESALT (android_backup_tmp_t, android_backup_t)) { const u64 gid = get_global_id (0); @@ -232,7 +232,7 @@ __kernel void m18900_loop (KERN_ATTR_TMPS_ESALT (android_backup_tmp_t, android_b } } -__kernel void m18900_comp (KERN_ATTR_TMPS_ESALT (android_backup_tmp_t, android_backup_t)) +KERNEL_FQ void m18900_comp (KERN_ATTR_TMPS_ESALT (android_backup_tmp_t, android_backup_t)) { const u64 gid = get_global_id (0); const u64 lid = get_local_id (0); @@ -244,17 +244,17 @@ __kernel void m18900_comp (KERN_ATTR_TMPS_ESALT (android_backup_tmp_t, android_b #ifdef REAL_SHM - __local u32 s_td0[256]; - __local u32 s_td1[256]; - __local u32 s_td2[256]; - __local u32 s_td3[256]; - __local u32 s_td4[256]; + LOCAL_AS u32 s_td0[256]; + LOCAL_AS u32 s_td1[256]; + LOCAL_AS u32 s_td2[256]; + LOCAL_AS u32 s_td3[256]; + LOCAL_AS u32 s_td4[256]; - __local u32 s_te0[256]; - __local u32 s_te1[256]; - __local u32 s_te2[256]; - __local u32 s_te3[256]; - __local u32 s_te4[256]; + LOCAL_AS u32 s_te0[256]; + LOCAL_AS u32 s_te1[256]; + LOCAL_AS u32 s_te2[256]; + LOCAL_AS u32 s_te3[256]; + LOCAL_AS u32 s_te4[256]; for (u32 i = lid; i < 256; i += lsz) { @@ -275,17 +275,17 @@ __kernel void m18900_comp (KERN_ATTR_TMPS_ESALT (android_backup_tmp_t, android_b #else - __constant u32a *s_td0 = td0; - __constant u32a *s_td1 = td1; - __constant u32a *s_td2 = td2; - __constant u32a *s_td3 = td3; - __constant u32a *s_td4 = td4; + CONSTANT_AS u32a *s_td0 = td0; + CONSTANT_AS u32a *s_td1 = td1; + CONSTANT_AS u32a *s_td2 = td2; + CONSTANT_AS u32a *s_td3 = td3; + CONSTANT_AS u32a *s_td4 = td4; - __constant u32a *s_te0 = te0; - __constant u32a *s_te1 = te1; - __constant u32a *s_te2 = te2; - __constant u32a *s_te3 = te3; - __constant u32a *s_te4 = te4; + CONSTANT_AS u32a *s_te0 = te0; + CONSTANT_AS u32a *s_te1 = te1; + CONSTANT_AS u32a *s_te2 = te2; + CONSTANT_AS u32a *s_te3 = te3; + CONSTANT_AS u32a *s_te4 = te4; #endif diff --git a/OpenCL/m19000-pure.cl b/OpenCL/m19000-pure.cl index e79bce4e7..499f5a458 100644 --- a/OpenCL/m19000-pure.cl +++ b/OpenCL/m19000-pure.cl @@ -22,7 +22,7 @@ typedef struct qnx_md5_tmp } qnx_md5_tmp_t; -__kernel void m19000_init (KERN_ATTR_TMPS (qnx_md5_tmp_t)) +KERNEL_FQ void m19000_init (KERN_ATTR_TMPS (qnx_md5_tmp_t)) { /** * base @@ -47,7 +47,7 @@ __kernel void m19000_init (KERN_ATTR_TMPS (qnx_md5_tmp_t)) tmps[gid].md5_ctx = md5_ctx; } -__kernel void m19000_loop (KERN_ATTR_TMPS (qnx_md5_tmp_t)) +KERNEL_FQ void m19000_loop (KERN_ATTR_TMPS (qnx_md5_tmp_t)) { /** * base @@ -67,7 +67,7 @@ __kernel void m19000_loop (KERN_ATTR_TMPS (qnx_md5_tmp_t)) tmps[gid].md5_ctx = md5_ctx; } -__kernel void m19000_comp (KERN_ATTR_TMPS (qnx_md5_tmp_t)) +KERNEL_FQ void m19000_comp (KERN_ATTR_TMPS (qnx_md5_tmp_t)) { /** * modifier diff --git a/OpenCL/m19100-pure.cl b/OpenCL/m19100-pure.cl index f91d26778..9b2c9c734 100644 --- a/OpenCL/m19100-pure.cl +++ b/OpenCL/m19100-pure.cl @@ -22,7 +22,7 @@ typedef struct qnx_sha256_tmp } qnx_sha256_tmp_t; -__kernel void m19100_init (KERN_ATTR_TMPS (qnx_sha256_tmp_t)) +KERNEL_FQ void m19100_init (KERN_ATTR_TMPS (qnx_sha256_tmp_t)) { /** * base @@ -47,7 +47,7 @@ __kernel void m19100_init (KERN_ATTR_TMPS (qnx_sha256_tmp_t)) tmps[gid].sha256_ctx = sha256_ctx; } -__kernel void m19100_loop (KERN_ATTR_TMPS (qnx_sha256_tmp_t)) +KERNEL_FQ void m19100_loop (KERN_ATTR_TMPS (qnx_sha256_tmp_t)) { /** * base @@ -67,7 +67,7 @@ __kernel void m19100_loop (KERN_ATTR_TMPS (qnx_sha256_tmp_t)) tmps[gid].sha256_ctx = sha256_ctx; } -__kernel void m19100_comp (KERN_ATTR_TMPS (qnx_sha256_tmp_t)) +KERNEL_FQ void m19100_comp (KERN_ATTR_TMPS (qnx_sha256_tmp_t)) { /** * modifier diff --git a/OpenCL/m19200-pure.cl b/OpenCL/m19200-pure.cl index 2ed165a24..cf52fbc39 100644 --- a/OpenCL/m19200-pure.cl +++ b/OpenCL/m19200-pure.cl @@ -154,7 +154,7 @@ DECLSPEC u32 sha512_update_128_qnxbug (sha512_ctx_t *ctx, u32 *w0, u32 *w1, u32 return sav; } -DECLSPEC u32 sha512_update_global_swap_qnxbug (sha512_ctx_t *ctx, const __global u32 *w, const int len, u32 sav) +DECLSPEC u32 sha512_update_global_swap_qnxbug (sha512_ctx_t *ctx, const GLOBAL_AS u32 *w, const int len, u32 sav) { u32 w0[4]; u32 w1[4]; @@ -363,7 +363,7 @@ DECLSPEC void sha512_final_qnxbug (sha512_ctx_t *ctx, u32 sav) sha512_transform (ctx->w0, ctx->w1, ctx->w2, ctx->w3, ctx->w4, ctx->w5, ctx->w6, ctx->w7, ctx->h); } -__kernel void m19200_init (KERN_ATTR_TMPS (qnx_sha512_tmp_t)) +KERNEL_FQ void m19200_init (KERN_ATTR_TMPS (qnx_sha512_tmp_t)) { /** * base @@ -389,7 +389,7 @@ __kernel void m19200_init (KERN_ATTR_TMPS (qnx_sha512_tmp_t)) tmps[gid].sav = 0; } -__kernel void m19200_loop (KERN_ATTR_TMPS (qnx_sha512_tmp_t)) +KERNEL_FQ void m19200_loop (KERN_ATTR_TMPS (qnx_sha512_tmp_t)) { /** * base @@ -411,7 +411,7 @@ __kernel void m19200_loop (KERN_ATTR_TMPS (qnx_sha512_tmp_t)) tmps[gid].sav = sav; } -__kernel void m19200_comp (KERN_ATTR_TMPS (qnx_sha512_tmp_t)) +KERNEL_FQ void m19200_comp (KERN_ATTR_TMPS (qnx_sha512_tmp_t)) { /** * modifier diff --git a/OpenCL/m19300_a0-pure.cl b/OpenCL/m19300_a0-pure.cl index e1684b6b5..1088e3b71 100644 --- a/OpenCL/m19300_a0-pure.cl +++ b/OpenCL/m19300_a0-pure.cl @@ -25,7 +25,7 @@ typedef struct sha1_double_salt } sha1_double_salt_t; -__kernel void m19300_mxx (KERN_ATTR_RULES_ESALT (sha1_double_salt_t)) +KERNEL_FQ void m19300_mxx (KERN_ATTR_RULES_ESALT (sha1_double_salt_t)) { /** * modifier @@ -89,7 +89,7 @@ __kernel void m19300_mxx (KERN_ATTR_RULES_ESALT (sha1_double_salt_t)) } } -__kernel void m19300_sxx (KERN_ATTR_RULES_ESALT (sha1_double_salt_t)) +KERNEL_FQ void m19300_sxx (KERN_ATTR_RULES_ESALT (sha1_double_salt_t)) { /** * modifier diff --git a/OpenCL/m19300_a1-pure.cl b/OpenCL/m19300_a1-pure.cl index 55d1f0247..b6efe8a58 100644 --- a/OpenCL/m19300_a1-pure.cl +++ b/OpenCL/m19300_a1-pure.cl @@ -23,7 +23,7 @@ typedef struct sha1_double_salt } sha1_double_salt_t; -__kernel void m19300_mxx (KERN_ATTR_ESALT (sha1_double_salt_t)) +KERNEL_FQ void m19300_mxx (KERN_ATTR_ESALT (sha1_double_salt_t)) { /** * modifier @@ -87,7 +87,7 @@ __kernel void m19300_mxx (KERN_ATTR_ESALT (sha1_double_salt_t)) } } -__kernel void m19300_sxx (KERN_ATTR_ESALT (sha1_double_salt_t)) +KERNEL_FQ void m19300_sxx (KERN_ATTR_ESALT (sha1_double_salt_t)) { /** * modifier diff --git a/OpenCL/m19300_a3-pure.cl b/OpenCL/m19300_a3-pure.cl index e8b40742a..c97f79565 100644 --- a/OpenCL/m19300_a3-pure.cl +++ b/OpenCL/m19300_a3-pure.cl @@ -23,7 +23,7 @@ typedef struct sha1_double_salt } sha1_double_salt_t; -__kernel void m19300_mxx (KERN_ATTR_VECTOR_ESALT (sha1_double_salt_t)) +KERNEL_FQ void m19300_mxx (KERN_ATTR_VECTOR_ESALT (sha1_double_salt_t)) { /** * modifier @@ -98,7 +98,7 @@ __kernel void m19300_mxx (KERN_ATTR_VECTOR_ESALT (sha1_double_salt_t)) } } -__kernel void m19300_sxx (KERN_ATTR_VECTOR_ESALT (sha1_double_salt_t)) +KERNEL_FQ void m19300_sxx (KERN_ATTR_VECTOR_ESALT (sha1_double_salt_t)) { /** * modifier diff --git a/OpenCL/m19500_a0-pure.cl b/OpenCL/m19500_a0-pure.cl index 1a37691cc..ea67c86f8 100644 --- a/OpenCL/m19500_a0-pure.cl +++ b/OpenCL/m19500_a0-pure.cl @@ -37,7 +37,7 @@ typedef struct devise_hash #define uint_to_hex_lower8_le(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 m19500_mxx (KERN_ATTR_RULES_ESALT (devise_hash_t)) +KERNEL_FQ void m19500_mxx (KERN_ATTR_RULES_ESALT (devise_hash_t)) { /** * modifier @@ -51,7 +51,7 @@ __kernel void m19500_mxx (KERN_ATTR_RULES_ESALT (devise_hash_t)) * bin2asc table */ - __local u32 l_bin2asc[256]; + LOCAL_AS u32 l_bin2asc[256]; for (u32 i = lid; i < 256; i += lsz) { @@ -172,7 +172,7 @@ __kernel void m19500_mxx (KERN_ATTR_RULES_ESALT (devise_hash_t)) } } -__kernel void m19500_sxx (KERN_ATTR_RULES_ESALT (devise_hash_t)) +KERNEL_FQ void m19500_sxx (KERN_ATTR_RULES_ESALT (devise_hash_t)) { /** * modifier @@ -186,7 +186,7 @@ __kernel void m19500_sxx (KERN_ATTR_RULES_ESALT (devise_hash_t)) * bin2asc table */ - __local u32 l_bin2asc[256]; + LOCAL_AS u32 l_bin2asc[256]; for (u32 i = lid; i < 256; i += lsz) { diff --git a/OpenCL/m19500_a1-pure.cl b/OpenCL/m19500_a1-pure.cl index 651c26305..1dcafda1e 100644 --- a/OpenCL/m19500_a1-pure.cl +++ b/OpenCL/m19500_a1-pure.cl @@ -35,7 +35,7 @@ typedef struct devise_hash #define uint_to_hex_lower8_le(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 m19500_mxx (KERN_ATTR_ESALT (devise_hash_t)) +KERNEL_FQ void m19500_mxx (KERN_ATTR_ESALT (devise_hash_t)) { /** * modifier @@ -49,7 +49,7 @@ __kernel void m19500_mxx (KERN_ATTR_ESALT (devise_hash_t)) * bin2asc table */ - __local u32 l_bin2asc[256]; + LOCAL_AS u32 l_bin2asc[256]; for (u32 i = lid; i < 256; i += lsz) { @@ -166,7 +166,7 @@ __kernel void m19500_mxx (KERN_ATTR_ESALT (devise_hash_t)) } } -__kernel void m19500_sxx (KERN_ATTR_ESALT (devise_hash_t)) +KERNEL_FQ void m19500_sxx (KERN_ATTR_ESALT (devise_hash_t)) { /** * modifier @@ -180,7 +180,7 @@ __kernel void m19500_sxx (KERN_ATTR_ESALT (devise_hash_t)) * bin2asc table */ - __local u32 l_bin2asc[256]; + LOCAL_AS u32 l_bin2asc[256]; for (u32 i = lid; i < 256; i += lsz) { diff --git a/OpenCL/m19500_a3-pure.cl b/OpenCL/m19500_a3-pure.cl index 780d33cdd..c5ba23820 100644 --- a/OpenCL/m19500_a3-pure.cl +++ b/OpenCL/m19500_a3-pure.cl @@ -35,7 +35,7 @@ typedef struct devise_hash #define uint_to_hex_lower8_le(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 m19500_mxx (KERN_ATTR_VECTOR_ESALT (devise_hash_t)) +KERNEL_FQ void m19500_mxx (KERN_ATTR_VECTOR_ESALT (devise_hash_t)) { /** * modifier @@ -49,7 +49,7 @@ __kernel void m19500_mxx (KERN_ATTR_VECTOR_ESALT (devise_hash_t)) * bin2asc table */ - __local u32 l_bin2asc[256]; + LOCAL_AS u32 l_bin2asc[256]; for (u32 i = lid; i < 256; i += lsz) { @@ -181,7 +181,7 @@ __kernel void m19500_mxx (KERN_ATTR_VECTOR_ESALT (devise_hash_t)) } } -__kernel void m19500_sxx (KERN_ATTR_VECTOR_ESALT (devise_hash_t)) +KERNEL_FQ void m19500_sxx (KERN_ATTR_VECTOR_ESALT (devise_hash_t)) { /** * modifier @@ -195,7 +195,7 @@ __kernel void m19500_sxx (KERN_ATTR_VECTOR_ESALT (devise_hash_t)) * bin2asc table */ - __local u32 l_bin2asc[256]; + LOCAL_AS u32 l_bin2asc[256]; for (u32 i = lid; i < 256; i += lsz) { diff --git a/OpenCL/m19600-pure.cl b/OpenCL/m19600-pure.cl index 0ad89c663..38f33c531 100644 --- a/OpenCL/m19600-pure.cl +++ b/OpenCL/m19600-pure.cl @@ -114,7 +114,7 @@ DECLSPEC void hmac_sha1_run_V (u32x *w0, u32x *w1, u32x *w2, u32x *w3, u32x *ipa sha1_transform_vector (w0, w1, w2, w3, digest); } -__kernel void m19600_init (KERN_ATTR_TMPS_ESALT (krb5tgs_17_tmp_t, krb5tgs_17_t)) +KERNEL_FQ void m19600_init (KERN_ATTR_TMPS_ESALT (krb5tgs_17_tmp_t, krb5tgs_17_t)) { /** * base @@ -192,7 +192,7 @@ __kernel void m19600_init (KERN_ATTR_TMPS_ESALT (krb5tgs_17_tmp_t, krb5tgs_17_t) } } -__kernel void m19600_loop (KERN_ATTR_TMPS_ESALT (krb5tgs_17_tmp_t, krb5tgs_17_t)) +KERNEL_FQ void m19600_loop (KERN_ATTR_TMPS_ESALT (krb5tgs_17_tmp_t, krb5tgs_17_t)) { /** * base @@ -280,7 +280,7 @@ __kernel void m19600_loop (KERN_ATTR_TMPS_ESALT (krb5tgs_17_tmp_t, krb5tgs_17_t) } } -__kernel void m19600_comp (KERN_ATTR_TMPS_ESALT (krb5tgs_17_tmp_t, krb5tgs_17_t)) +KERNEL_FQ void m19600_comp (KERN_ATTR_TMPS_ESALT (krb5tgs_17_tmp_t, krb5tgs_17_t)) { /** * base @@ -296,17 +296,17 @@ __kernel void m19600_comp (KERN_ATTR_TMPS_ESALT (krb5tgs_17_tmp_t, krb5tgs_17_t) #ifdef REAL_SHM - __local u32 s_te0[256]; - __local u32 s_te1[256]; - __local u32 s_te2[256]; - __local u32 s_te3[256]; - __local u32 s_te4[256]; + LOCAL_AS u32 s_te0[256]; + LOCAL_AS u32 s_te1[256]; + LOCAL_AS u32 s_te2[256]; + LOCAL_AS u32 s_te3[256]; + LOCAL_AS u32 s_te4[256]; - __local u32 s_td0[256]; - __local u32 s_td1[256]; - __local u32 s_td2[256]; - __local u32 s_td3[256]; - __local u32 s_td4[256]; + LOCAL_AS u32 s_td0[256]; + LOCAL_AS u32 s_td1[256]; + LOCAL_AS u32 s_td2[256]; + LOCAL_AS u32 s_td3[256]; + LOCAL_AS u32 s_td4[256]; for (u32 i = lid; i < 256; i += lsz) { @@ -327,17 +327,17 @@ __kernel void m19600_comp (KERN_ATTR_TMPS_ESALT (krb5tgs_17_tmp_t, krb5tgs_17_t) #else - __constant u32a *s_te0 = te0; - __constant u32a *s_te1 = te1; - __constant u32a *s_te2 = te2; - __constant u32a *s_te3 = te3; - __constant u32a *s_te4 = te4; + CONSTANT_AS u32a *s_te0 = te0; + CONSTANT_AS u32a *s_te1 = te1; + CONSTANT_AS u32a *s_te2 = te2; + CONSTANT_AS u32a *s_te3 = te3; + CONSTANT_AS u32a *s_te4 = te4; - __constant u32a *s_td0 = td0; - __constant u32a *s_td1 = td1; - __constant u32a *s_td2 = td2; - __constant u32a *s_td3 = td3; - __constant u32a *s_td4 = td4; + CONSTANT_AS u32a *s_td0 = td0; + CONSTANT_AS u32a *s_td1 = td1; + CONSTANT_AS u32a *s_td2 = td2; + CONSTANT_AS u32a *s_td3 = td3; + CONSTANT_AS u32a *s_td4 = td4; #endif diff --git a/OpenCL/m19700-pure.cl b/OpenCL/m19700-pure.cl index eec42571d..defde0f4a 100644 --- a/OpenCL/m19700-pure.cl +++ b/OpenCL/m19700-pure.cl @@ -114,7 +114,7 @@ DECLSPEC void hmac_sha1_run_V (u32x *w0, u32x *w1, u32x *w2, u32x *w3, u32x *ipa sha1_transform_vector (w0, w1, w2, w3, digest); } -__kernel void m19700_init (KERN_ATTR_TMPS_ESALT (krb5tgs_18_tmp_t, krb5tgs_18_t)) +KERNEL_FQ void m19700_init (KERN_ATTR_TMPS_ESALT (krb5tgs_18_tmp_t, krb5tgs_18_t)) { /** * base @@ -192,7 +192,7 @@ __kernel void m19700_init (KERN_ATTR_TMPS_ESALT (krb5tgs_18_tmp_t, krb5tgs_18_t) } } -__kernel void m19700_loop (KERN_ATTR_TMPS_ESALT (krb5tgs_18_tmp_t, krb5tgs_18_t)) +KERNEL_FQ void m19700_loop (KERN_ATTR_TMPS_ESALT (krb5tgs_18_tmp_t, krb5tgs_18_t)) { /** * base @@ -280,7 +280,7 @@ __kernel void m19700_loop (KERN_ATTR_TMPS_ESALT (krb5tgs_18_tmp_t, krb5tgs_18_t) } } -__kernel void m19700_comp (KERN_ATTR_TMPS_ESALT (krb5tgs_18_tmp_t, krb5tgs_18_t)) +KERNEL_FQ void m19700_comp (KERN_ATTR_TMPS_ESALT (krb5tgs_18_tmp_t, krb5tgs_18_t)) { /** * base @@ -296,17 +296,17 @@ __kernel void m19700_comp (KERN_ATTR_TMPS_ESALT (krb5tgs_18_tmp_t, krb5tgs_18_t) #ifdef REAL_SHM - __local u32 s_td0[256]; - __local u32 s_td1[256]; - __local u32 s_td2[256]; - __local u32 s_td3[256]; - __local u32 s_td4[256]; + LOCAL_AS u32 s_td0[256]; + LOCAL_AS u32 s_td1[256]; + LOCAL_AS u32 s_td2[256]; + LOCAL_AS u32 s_td3[256]; + LOCAL_AS u32 s_td4[256]; - __local u32 s_te0[256]; - __local u32 s_te1[256]; - __local u32 s_te2[256]; - __local u32 s_te3[256]; - __local u32 s_te4[256]; + LOCAL_AS u32 s_te0[256]; + LOCAL_AS u32 s_te1[256]; + LOCAL_AS u32 s_te2[256]; + LOCAL_AS u32 s_te3[256]; + LOCAL_AS u32 s_te4[256]; for (u32 i = lid; i < 256; i += lsz) { @@ -327,17 +327,17 @@ __kernel void m19700_comp (KERN_ATTR_TMPS_ESALT (krb5tgs_18_tmp_t, krb5tgs_18_t) #else - __constant u32a *s_td0 = td0; - __constant u32a *s_td1 = td1; - __constant u32a *s_td2 = td2; - __constant u32a *s_td3 = td3; - __constant u32a *s_td4 = td4; + CONSTANT_AS u32a *s_td0 = td0; + CONSTANT_AS u32a *s_td1 = td1; + CONSTANT_AS u32a *s_td2 = td2; + CONSTANT_AS u32a *s_td3 = td3; + CONSTANT_AS u32a *s_td4 = td4; - __constant u32a *s_te0 = te0; - __constant u32a *s_te1 = te1; - __constant u32a *s_te2 = te2; - __constant u32a *s_te3 = te3; - __constant u32a *s_te4 = te4; + CONSTANT_AS u32a *s_te0 = te0; + CONSTANT_AS u32a *s_te1 = te1; + CONSTANT_AS u32a *s_te2 = te2; + CONSTANT_AS u32a *s_te3 = te3; + CONSTANT_AS u32a *s_te4 = te4; #endif diff --git a/OpenCL/markov_be.cl b/OpenCL/markov_be.cl index 0518ae634..a40478a2c 100644 --- a/OpenCL/markov_be.cl +++ b/OpenCL/markov_be.cl @@ -10,9 +10,9 @@ #define CHARSIZ 256 -DECLSPEC void generate_pw (u32 *pw_buf, __global const cs_t *root_css_buf, __global const cs_t *markov_css_buf, const u32 pw_l_len, const u32 pw_r_len, const u32 mask80, const u32 bits14, const u32 bits15, u64 val) +DECLSPEC void generate_pw (u32 *pw_buf, GLOBAL_AS const cs_t *root_css_buf, GLOBAL_AS const cs_t *markov_css_buf, const u32 pw_l_len, const u32 pw_r_len, const u32 mask80, const u32 bits14, const u32 bits15, u64 val) { - __global const cs_t *cs = &root_css_buf[pw_r_len]; + GLOBAL_AS const cs_t *cs = &root_css_buf[pw_r_len]; u32 i; u32 j; @@ -45,7 +45,7 @@ DECLSPEC void generate_pw (u32 *pw_buf, __global const cs_t *root_css_buf, __glo if (bits15) pw_buf[15] = (pw_l_len + pw_r_len) * 8; } -__kernel void l_markov (__global pw_t * restrict pws_buf_l, __global const cs_t * restrict root_css_buf, __global const cs_t * restrict markov_css_buf, const u64 off, const u32 pw_l_len, const u32 pw_r_len, const u32 mask80, const u32 bits14, const u32 bits15, const u64 gid_max) +KERNEL_FQ void l_markov (GLOBAL_AS pw_t * restrict pws_buf_l, GLOBAL_AS const cs_t * restrict root_css_buf, GLOBAL_AS const cs_t * restrict markov_css_buf, const u64 off, const u32 pw_l_len, const u32 pw_r_len, const u32 mask80, const u32 bits14, const u32 bits15, const u64 gid_max) { const u64 gid = get_global_id (0); @@ -64,7 +64,7 @@ __kernel void l_markov (__global pw_t * restrict pws_buf_l, __global const cs_t pws_buf_l[gid].pw_len = pw_l_len + pw_r_len; } -__kernel void r_markov (__global bf_t * restrict pws_buf_r, __global const cs_t * restrict root_css_buf, __global const cs_t * restrict markov_css_buf, const u64 off, const u32 pw_r_len, const u32 mask80, const u32 bits14, const u32 bits15, const u64 gid_max) +KERNEL_FQ void r_markov (GLOBAL_AS bf_t * restrict pws_buf_r, GLOBAL_AS const cs_t * restrict root_css_buf, GLOBAL_AS const cs_t * restrict markov_css_buf, const u64 off, const u32 pw_r_len, const u32 mask80, const u32 bits14, const u32 bits15, const u64 gid_max) { const u64 gid = get_global_id (0); @@ -77,7 +77,7 @@ __kernel void r_markov (__global bf_t * restrict pws_buf_r, __global const cs_t pws_buf_r[gid].i = pw_buf[0]; } -__kernel void C_markov (__global pw_t * restrict pws_buf, __global const cs_t * restrict root_css_buf, __global const cs_t * restrict markov_css_buf, const u64 off, const u32 pw_len, const u32 mask80, const u32 bits14, const u32 bits15, const u64 gid_max) +KERNEL_FQ void C_markov (GLOBAL_AS pw_t * restrict pws_buf, GLOBAL_AS const cs_t * restrict root_css_buf, GLOBAL_AS const cs_t * restrict markov_css_buf, const u64 off, const u32 pw_len, const u32 mask80, const u32 bits14, const u32 bits15, const u64 gid_max) { const u64 gid = get_global_id (0); diff --git a/OpenCL/markov_le.cl b/OpenCL/markov_le.cl index 96dc453ab..21ad5de9d 100644 --- a/OpenCL/markov_le.cl +++ b/OpenCL/markov_le.cl @@ -10,9 +10,9 @@ #define CHARSIZ 256 -DECLSPEC void generate_pw (u32 *pw_buf, __global const cs_t *root_css_buf, __global const cs_t *markov_css_buf, const u32 pw_l_len, const u32 pw_r_len, const u32 mask80, const u32 bits14, const u32 bits15, u64 val) +DECLSPEC void generate_pw (u32 *pw_buf, GLOBAL_AS const cs_t *root_css_buf, GLOBAL_AS const cs_t *markov_css_buf, const u32 pw_l_len, const u32 pw_r_len, const u32 mask80, const u32 bits14, const u32 bits15, u64 val) { - __global const cs_t *cs = &root_css_buf[pw_r_len]; + GLOBAL_AS const cs_t *cs = &root_css_buf[pw_r_len]; u32 i; u32 j; @@ -45,7 +45,7 @@ DECLSPEC void generate_pw (u32 *pw_buf, __global const cs_t *root_css_buf, __glo if (bits15) pw_buf[15] = (pw_l_len + pw_r_len) * 8; } -__kernel void l_markov (__global pw_t * restrict pws_buf_l, __global const cs_t * restrict root_css_buf, __global const cs_t * restrict markov_css_buf, const u64 off, const u32 pw_l_len, const u32 pw_r_len, const u32 mask80, const u32 bits14, const u32 bits15, const u64 gid_max) +KERNEL_FQ void l_markov (GLOBAL_AS pw_t * restrict pws_buf_l, GLOBAL_AS const cs_t * restrict root_css_buf, GLOBAL_AS const cs_t * restrict markov_css_buf, const u64 off, const u32 pw_l_len, const u32 pw_r_len, const u32 mask80, const u32 bits14, const u32 bits15, const u64 gid_max) { const u64 gid = get_global_id (0); @@ -64,7 +64,7 @@ __kernel void l_markov (__global pw_t * restrict pws_buf_l, __global const cs_t pws_buf_l[gid].pw_len = pw_l_len + pw_r_len; } -__kernel void r_markov (__global bf_t * restrict pws_buf_r, __global const cs_t * restrict root_css_buf, __global const cs_t * restrict markov_css_buf, const u64 off, const u32 pw_r_len, const u32 mask80, const u32 bits14, const u32 bits15, const u64 gid_max) +KERNEL_FQ void r_markov (GLOBAL_AS bf_t * restrict pws_buf_r, GLOBAL_AS const cs_t * restrict root_css_buf, GLOBAL_AS const cs_t * restrict markov_css_buf, const u64 off, const u32 pw_r_len, const u32 mask80, const u32 bits14, const u32 bits15, const u64 gid_max) { const u64 gid = get_global_id (0); @@ -77,7 +77,7 @@ __kernel void r_markov (__global bf_t * restrict pws_buf_r, __global const cs_t pws_buf_r[gid].i = pw_buf[0]; } -__kernel void C_markov (__global pw_t * restrict pws_buf, __global const cs_t * restrict root_css_buf, __global const cs_t * restrict markov_css_buf, const u64 off, const u32 pw_len, const u32 mask80, const u32 bits14, const u32 bits15, const u64 gid_max) +KERNEL_FQ void C_markov (GLOBAL_AS pw_t * restrict pws_buf, GLOBAL_AS const cs_t * restrict root_css_buf, GLOBAL_AS const cs_t * restrict markov_css_buf, const u64 off, const u32 pw_len, const u32 mask80, const u32 bits14, const u32 bits15, const u64 gid_max) { const u64 gid = get_global_id (0);