From 2899f53a1570aa14f55fc07fcaabb0476d707679 Mon Sep 17 00:00:00 2001 From: Jens Steube Date: Wed, 25 May 2016 23:04:26 +0200 Subject: [PATCH] Move files from include/ to OpenCL/ if they are used within kernels Rename includes in OpenCL so that it's easier to recognize them as such --- OpenCL/amp_a0.cl | 10 +++++----- OpenCL/amp_a1.cl | 6 +++--- OpenCL/amp_a3.cl | 6 +++--- .../{kernel_aes256.c => inc_cipher_aes256.cl} | 0 ...l_serpent256.c => inc_cipher_serpent256.cl} | 0 ...l_twofish256.c => inc_cipher_twofish256.cl} | 0 OpenCL/{common.c => inc_common.cl} | 0 .../{check_multi_comp4.c => inc_comp_multi.cl} | 0 ...k_multi_comp4_bs.c => inc_comp_multi_bs.cl} | 0 ...check_single_comp4.c => inc_comp_single.cl} | 0 ...single_comp4_bs.c => inc_comp_single_bs.cl} | 0 .../constants.h => OpenCL/inc_hash_constants.h | 0 .../inc_hash_functions.cl | 0 OpenCL/{rp.c => inc_rp.cl} | 0 include/rp_kernel.h => OpenCL/inc_rp.h | 0 OpenCL/{simd.c => inc_simd.cl} | 0 OpenCL/{types_ocl.c => inc_types.cl} | 0 .../kernel_vendor.h => OpenCL/inc_vendor.cl | 0 OpenCL/m00000_a0.cl | 16 ++++++++-------- OpenCL/m00000_a1.cl | 12 ++++++------ OpenCL/m00000_a3.cl | 12 ++++++------ OpenCL/m00010_a0.cl | 16 ++++++++-------- OpenCL/m00010_a1.cl | 12 ++++++------ OpenCL/m00010_a3.cl | 12 ++++++------ OpenCL/m00020_a0.cl | 16 ++++++++-------- OpenCL/m00020_a1.cl | 12 ++++++------ OpenCL/m00020_a3.cl | 12 ++++++------ OpenCL/m00030_a0.cl | 16 ++++++++-------- OpenCL/m00030_a1.cl | 12 ++++++------ OpenCL/m00030_a3.cl | 12 ++++++------ OpenCL/m00040_a0.cl | 16 ++++++++-------- OpenCL/m00040_a1.cl | 12 ++++++------ OpenCL/m00040_a3.cl | 12 ++++++------ OpenCL/m00050_a0.cl | 16 ++++++++-------- OpenCL/m00050_a1.cl | 12 ++++++------ OpenCL/m00050_a3.cl | 12 ++++++------ OpenCL/m00060_a0.cl | 16 ++++++++-------- OpenCL/m00060_a1.cl | 12 ++++++------ OpenCL/m00060_a3.cl | 12 ++++++------ OpenCL/m00100_a0.cl | 16 ++++++++-------- OpenCL/m00100_a1.cl | 12 ++++++------ OpenCL/m00100_a3.cl | 12 ++++++------ OpenCL/m00110_a0.cl | 16 ++++++++-------- OpenCL/m00110_a1.cl | 12 ++++++------ OpenCL/m00110_a3.cl | 12 ++++++------ OpenCL/m00120_a0.cl | 16 ++++++++-------- OpenCL/m00120_a1.cl | 12 ++++++------ OpenCL/m00120_a3.cl | 12 ++++++------ OpenCL/m00130_a0.cl | 16 ++++++++-------- OpenCL/m00130_a1.cl | 12 ++++++------ OpenCL/m00130_a3.cl | 12 ++++++------ OpenCL/m00140_a0.cl | 16 ++++++++-------- OpenCL/m00140_a1.cl | 12 ++++++------ OpenCL/m00140_a3.cl | 12 ++++++------ OpenCL/m00150_a0.cl | 16 ++++++++-------- OpenCL/m00150_a1.cl | 12 ++++++------ OpenCL/m00150_a3.cl | 12 ++++++------ OpenCL/m00160_a0.cl | 16 ++++++++-------- OpenCL/m00160_a1.cl | 12 ++++++------ OpenCL/m00160_a3.cl | 12 ++++++------ OpenCL/m00190_a0.cl | 16 ++++++++-------- OpenCL/m00190_a1.cl | 12 ++++++------ OpenCL/m00190_a3.cl | 12 ++++++------ OpenCL/m00200_a0.cl | 16 ++++++++-------- OpenCL/m00200_a1.cl | 12 ++++++------ OpenCL/m00200_a3.cl | 12 ++++++------ OpenCL/m00300_a0.cl | 16 ++++++++-------- OpenCL/m00300_a1.cl | 12 ++++++------ OpenCL/m00300_a3.cl | 12 ++++++------ OpenCL/m00400.cl | 16 ++++++++-------- OpenCL/m00500.cl | 14 +++++++------- OpenCL/m00900_a0.cl | 16 ++++++++-------- OpenCL/m00900_a1.cl | 12 ++++++------ OpenCL/m00900_a3.cl | 12 ++++++------ OpenCL/m01000_a0.cl | 16 ++++++++-------- OpenCL/m01000_a1.cl | 12 ++++++------ OpenCL/m01000_a3.cl | 12 ++++++------ OpenCL/m01100_a0.cl | 16 ++++++++-------- OpenCL/m01100_a1.cl | 12 ++++++------ OpenCL/m01100_a3.cl | 12 ++++++------ OpenCL/m01400_a0.cl | 16 ++++++++-------- OpenCL/m01400_a1.cl | 12 ++++++------ OpenCL/m01400_a3.cl | 12 ++++++------ OpenCL/m01410_a0.cl | 16 ++++++++-------- OpenCL/m01410_a1.cl | 12 ++++++------ OpenCL/m01410_a3.cl | 12 ++++++------ OpenCL/m01420_a0.cl | 16 ++++++++-------- OpenCL/m01420_a1.cl | 12 ++++++------ OpenCL/m01420_a3.cl | 12 ++++++------ OpenCL/m01430_a0.cl | 16 ++++++++-------- OpenCL/m01430_a1.cl | 12 ++++++------ OpenCL/m01430_a3.cl | 12 ++++++------ OpenCL/m01440_a0.cl | 16 ++++++++-------- OpenCL/m01440_a1.cl | 12 ++++++------ OpenCL/m01440_a3.cl | 12 ++++++------ OpenCL/m01450_a0.cl | 16 ++++++++-------- OpenCL/m01450_a1.cl | 12 ++++++------ OpenCL/m01450_a3.cl | 12 ++++++------ OpenCL/m01460_a0.cl | 16 ++++++++-------- OpenCL/m01460_a1.cl | 12 ++++++------ OpenCL/m01460_a3.cl | 12 ++++++------ OpenCL/m01500_a0.cl | 16 ++++++++-------- OpenCL/m01500_a1.cl | 12 ++++++------ OpenCL/m01500_a3.cl | 14 +++++++------- OpenCL/m01600.cl | 14 +++++++------- OpenCL/m01700_a0.cl | 16 ++++++++-------- OpenCL/m01700_a1.cl | 12 ++++++------ OpenCL/m01700_a3.cl | 12 ++++++------ OpenCL/m01710_a0.cl | 16 ++++++++-------- OpenCL/m01710_a1.cl | 12 ++++++------ OpenCL/m01710_a3.cl | 12 ++++++------ OpenCL/m01720_a0.cl | 16 ++++++++-------- OpenCL/m01720_a1.cl | 12 ++++++------ OpenCL/m01720_a3.cl | 12 ++++++------ OpenCL/m01730_a0.cl | 16 ++++++++-------- OpenCL/m01730_a1.cl | 12 ++++++------ OpenCL/m01730_a3.cl | 12 ++++++------ OpenCL/m01740_a0.cl | 16 ++++++++-------- OpenCL/m01740_a1.cl | 12 ++++++------ OpenCL/m01740_a3.cl | 12 ++++++------ OpenCL/m01750_a0.cl | 16 ++++++++-------- OpenCL/m01750_a1.cl | 12 ++++++------ OpenCL/m01750_a3.cl | 12 ++++++------ OpenCL/m01760_a0.cl | 16 ++++++++-------- OpenCL/m01760_a1.cl | 12 ++++++------ OpenCL/m01760_a3.cl | 12 ++++++------ OpenCL/m01800.cl | 14 +++++++------- OpenCL/m02100.cl | 16 ++++++++-------- OpenCL/m02400_a0.cl | 16 ++++++++-------- OpenCL/m02400_a1.cl | 12 ++++++------ OpenCL/m02400_a3.cl | 12 ++++++------ OpenCL/m02410_a0.cl | 16 ++++++++-------- OpenCL/m02410_a1.cl | 12 ++++++------ OpenCL/m02410_a3.cl | 12 ++++++------ OpenCL/m02500.cl | 16 ++++++++-------- OpenCL/m02610_a0.cl | 16 ++++++++-------- OpenCL/m02610_a1.cl | 12 ++++++------ OpenCL/m02610_a3.cl | 12 ++++++------ OpenCL/m02710_a0.cl | 16 ++++++++-------- OpenCL/m02710_a1.cl | 12 ++++++------ OpenCL/m02710_a3.cl | 12 ++++++------ OpenCL/m02810_a0.cl | 16 ++++++++-------- OpenCL/m02810_a1.cl | 12 ++++++------ OpenCL/m02810_a3.cl | 12 ++++++------ OpenCL/m03000_a0.cl | 16 ++++++++-------- OpenCL/m03000_a1.cl | 12 ++++++------ OpenCL/m03000_a3.cl | 14 +++++++------- OpenCL/m03100_a0.cl | 16 ++++++++-------- OpenCL/m03100_a1.cl | 12 ++++++------ OpenCL/m03100_a3.cl | 12 ++++++------ OpenCL/m03200.cl | 14 +++++++------- OpenCL/m03710_a0.cl | 16 ++++++++-------- OpenCL/m03710_a1.cl | 12 ++++++------ OpenCL/m03710_a3.cl | 12 ++++++------ OpenCL/m03800_a0.cl | 16 ++++++++-------- OpenCL/m03800_a1.cl | 12 ++++++------ OpenCL/m03800_a3.cl | 12 ++++++------ OpenCL/m04310_a0.cl | 16 ++++++++-------- OpenCL/m04310_a1.cl | 12 ++++++------ OpenCL/m04310_a3.cl | 12 ++++++------ OpenCL/m04400_a0.cl | 16 ++++++++-------- OpenCL/m04400_a1.cl | 12 ++++++------ OpenCL/m04400_a3.cl | 12 ++++++------ OpenCL/m04500_a0.cl | 16 ++++++++-------- OpenCL/m04500_a1.cl | 12 ++++++------ OpenCL/m04500_a3.cl | 12 ++++++------ OpenCL/m04700_a0.cl | 16 ++++++++-------- OpenCL/m04700_a1.cl | 12 ++++++------ OpenCL/m04700_a3.cl | 12 ++++++------ OpenCL/m04800_a0.cl | 16 ++++++++-------- OpenCL/m04800_a1.cl | 12 ++++++------ OpenCL/m04800_a3.cl | 12 ++++++------ OpenCL/m04900_a0.cl | 16 ++++++++-------- OpenCL/m04900_a1.cl | 12 ++++++------ OpenCL/m04900_a3.cl | 12 ++++++------ OpenCL/m05000_a0.cl | 16 ++++++++-------- OpenCL/m05000_a1.cl | 12 ++++++------ OpenCL/m05000_a3.cl | 12 ++++++------ OpenCL/m05100_a0.cl | 16 ++++++++-------- OpenCL/m05100_a1.cl | 12 ++++++------ OpenCL/m05100_a3.cl | 12 ++++++------ OpenCL/m05200.cl | 14 +++++++------- OpenCL/m05300_a0.cl | 16 ++++++++-------- OpenCL/m05300_a1.cl | 12 ++++++------ OpenCL/m05300_a3.cl | 12 ++++++------ OpenCL/m05400_a0.cl | 16 ++++++++-------- OpenCL/m05400_a1.cl | 12 ++++++------ OpenCL/m05400_a3.cl | 12 ++++++------ OpenCL/m05500_a0.cl | 16 ++++++++-------- OpenCL/m05500_a1.cl | 12 ++++++------ OpenCL/m05500_a3.cl | 12 ++++++------ OpenCL/m05600_a0.cl | 16 ++++++++-------- OpenCL/m05600_a1.cl | 12 ++++++------ OpenCL/m05600_a3.cl | 12 ++++++------ OpenCL/m05800.cl | 14 +++++++------- OpenCL/m06000_a0.cl | 16 ++++++++-------- OpenCL/m06000_a1.cl | 12 ++++++------ OpenCL/m06000_a3.cl | 12 ++++++------ OpenCL/m06100_a0.cl | 16 ++++++++-------- OpenCL/m06100_a1.cl | 12 ++++++------ OpenCL/m06100_a3.cl | 12 ++++++------ OpenCL/m06211.cl | 16 ++++++++-------- OpenCL/m06212.cl | 16 ++++++++-------- OpenCL/m06213.cl | 16 ++++++++-------- OpenCL/m06221.cl | 16 ++++++++-------- OpenCL/m06222.cl | 16 ++++++++-------- OpenCL/m06223.cl | 16 ++++++++-------- OpenCL/m06231.cl | 16 ++++++++-------- OpenCL/m06232.cl | 16 ++++++++-------- OpenCL/m06233.cl | 16 ++++++++-------- OpenCL/m06300.cl | 14 +++++++------- OpenCL/m06400.cl | 14 +++++++------- OpenCL/m06500.cl | 14 +++++++------- OpenCL/m06600.cl | 14 +++++++------- OpenCL/m06700.cl | 14 +++++++------- OpenCL/m06800.cl | 14 +++++++------- OpenCL/m06900_a0.cl | 16 ++++++++-------- OpenCL/m06900_a1.cl | 12 ++++++------ OpenCL/m06900_a3.cl | 12 ++++++------ OpenCL/m07100.cl | 16 ++++++++-------- OpenCL/m07300_a0.cl | 16 ++++++++-------- OpenCL/m07300_a1.cl | 12 ++++++------ OpenCL/m07300_a3.cl | 12 ++++++------ OpenCL/m07400.cl | 14 +++++++------- OpenCL/m07500_a0.cl | 16 ++++++++-------- OpenCL/m07500_a1.cl | 12 ++++++------ OpenCL/m07500_a3.cl | 12 ++++++------ OpenCL/m07600_a0.cl | 16 ++++++++-------- OpenCL/m07600_a1.cl | 12 ++++++------ OpenCL/m07600_a3.cl | 12 ++++++------ OpenCL/m07700_a0.cl | 16 ++++++++-------- OpenCL/m07700_a1.cl | 12 ++++++------ OpenCL/m07700_a3.cl | 12 ++++++------ OpenCL/m07800_a0.cl | 16 ++++++++-------- OpenCL/m07800_a1.cl | 12 ++++++------ OpenCL/m07800_a3.cl | 12 ++++++------ OpenCL/m07900.cl | 14 +++++++------- OpenCL/m08000_a0.cl | 16 ++++++++-------- OpenCL/m08000_a1.cl | 12 ++++++------ OpenCL/m08000_a3.cl | 12 ++++++------ OpenCL/m08100_a0.cl | 16 ++++++++-------- OpenCL/m08100_a1.cl | 12 ++++++------ OpenCL/m08100_a3.cl | 12 ++++++------ OpenCL/m08200.cl | 14 +++++++------- OpenCL/m08300_a0.cl | 16 ++++++++-------- OpenCL/m08300_a1.cl | 12 ++++++------ OpenCL/m08300_a3.cl | 12 ++++++------ OpenCL/m08400_a0.cl | 16 ++++++++-------- OpenCL/m08400_a1.cl | 12 ++++++------ OpenCL/m08400_a3.cl | 12 ++++++------ OpenCL/m08500_a0.cl | 16 ++++++++-------- OpenCL/m08500_a1.cl | 12 ++++++------ OpenCL/m08500_a3.cl | 12 ++++++------ OpenCL/m08600_a0.cl | 16 ++++++++-------- OpenCL/m08600_a1.cl | 12 ++++++------ OpenCL/m08600_a3.cl | 12 ++++++------ OpenCL/m08700_a0.cl | 16 ++++++++-------- OpenCL/m08700_a1.cl | 12 ++++++------ OpenCL/m08700_a3.cl | 12 ++++++------ OpenCL/m08800.cl | 10 +++++----- OpenCL/m08900.cl | 14 +++++++------- OpenCL/m09000.cl | 14 +++++++------- OpenCL/m09100.cl | 14 +++++++------- OpenCL/m09400.cl | 14 +++++++------- OpenCL/m09500.cl | 14 +++++++------- OpenCL/m09600.cl | 14 +++++++------- OpenCL/m09700_a0.cl | 16 ++++++++-------- OpenCL/m09700_a1.cl | 12 ++++++------ OpenCL/m09700_a3.cl | 12 ++++++------ OpenCL/m09710_a0.cl | 16 ++++++++-------- OpenCL/m09710_a1.cl | 12 ++++++------ OpenCL/m09710_a3.cl | 12 ++++++------ OpenCL/m09720_a0.cl | 16 ++++++++-------- OpenCL/m09720_a1.cl | 12 ++++++------ OpenCL/m09720_a3.cl | 12 ++++++------ OpenCL/m09800_a0.cl | 16 ++++++++-------- OpenCL/m09800_a1.cl | 12 ++++++------ OpenCL/m09800_a3.cl | 12 ++++++------ OpenCL/m09810_a0.cl | 16 ++++++++-------- OpenCL/m09810_a1.cl | 12 ++++++------ OpenCL/m09810_a3.cl | 12 ++++++------ OpenCL/m09820_a0.cl | 16 ++++++++-------- OpenCL/m09820_a1.cl | 12 ++++++------ OpenCL/m09820_a3.cl | 12 ++++++------ OpenCL/m09900_a0.cl | 16 ++++++++-------- OpenCL/m09900_a1.cl | 12 ++++++------ OpenCL/m09900_a3.cl | 12 ++++++------ OpenCL/m10100_a0.cl | 16 ++++++++-------- OpenCL/m10100_a1.cl | 12 ++++++------ OpenCL/m10100_a3.cl | 12 ++++++------ OpenCL/m10300.cl | 14 +++++++------- OpenCL/m10400_a0.cl | 16 ++++++++-------- OpenCL/m10400_a1.cl | 12 ++++++------ OpenCL/m10400_a3.cl | 12 ++++++------ OpenCL/m10410_a0.cl | 16 ++++++++-------- OpenCL/m10410_a1.cl | 12 ++++++------ OpenCL/m10410_a3.cl | 12 ++++++------ OpenCL/m10420_a0.cl | 16 ++++++++-------- OpenCL/m10420_a1.cl | 12 ++++++------ OpenCL/m10420_a3.cl | 12 ++++++------ OpenCL/m10500.cl | 14 +++++++------- OpenCL/m10700.cl | 14 +++++++------- OpenCL/m10800_a0.cl | 16 ++++++++-------- OpenCL/m10800_a1.cl | 12 ++++++------ OpenCL/m10800_a3.cl | 12 ++++++------ OpenCL/m10900.cl | 16 ++++++++-------- OpenCL/m11000_a0.cl | 16 ++++++++-------- OpenCL/m11000_a1.cl | 12 ++++++------ OpenCL/m11000_a3.cl | 12 ++++++------ OpenCL/m11100_a0.cl | 16 ++++++++-------- OpenCL/m11100_a1.cl | 12 ++++++------ OpenCL/m11100_a3.cl | 12 ++++++------ OpenCL/m11200_a0.cl | 16 ++++++++-------- OpenCL/m11200_a1.cl | 12 ++++++------ OpenCL/m11200_a3.cl | 12 ++++++------ OpenCL/m11300.cl | 10 +++++----- OpenCL/m11400_a0.cl | 16 ++++++++-------- OpenCL/m11400_a1.cl | 12 ++++++------ OpenCL/m11400_a3.cl | 12 ++++++------ OpenCL/m11500_a0.cl | 16 ++++++++-------- OpenCL/m11500_a1.cl | 12 ++++++------ OpenCL/m11500_a3.cl | 12 ++++++------ OpenCL/m11600.cl | 14 +++++++------- OpenCL/m11700_a0.cl | 16 ++++++++-------- OpenCL/m11700_a1.cl | 12 ++++++------ OpenCL/m11700_a3.cl | 12 ++++++------ OpenCL/m11800_a0.cl | 16 ++++++++-------- OpenCL/m11800_a1.cl | 12 ++++++------ OpenCL/m11800_a3.cl | 12 ++++++------ OpenCL/m11900.cl | 16 ++++++++-------- OpenCL/m12000.cl | 16 ++++++++-------- OpenCL/m12200.cl | 14 +++++++------- OpenCL/m12300.cl | 14 +++++++------- OpenCL/m12400.cl | 14 +++++++------- OpenCL/m12500.cl | 14 +++++++------- OpenCL/m12600_a0.cl | 16 ++++++++-------- OpenCL/m12600_a1.cl | 12 ++++++------ OpenCL/m12600_a3.cl | 12 ++++++------ OpenCL/m12700.cl | 14 +++++++------- OpenCL/m12800.cl | 14 +++++++------- OpenCL/m12900.cl | 14 +++++++------- OpenCL/m13000.cl | 14 +++++++------- OpenCL/m13100_a0.cl | 16 ++++++++-------- OpenCL/m13100_a1.cl | 12 ++++++------ OpenCL/m13100_a3.cl | 12 ++++++------ OpenCL/m13200.cl | 10 +++++----- OpenCL/m13300_a0.cl | 16 ++++++++-------- OpenCL/m13300_a1.cl | 12 ++++++------ OpenCL/m13300_a3.cl | 12 ++++++------ OpenCL/m13400.cl | 12 ++++++------ OpenCL/m13500_a0.cl | 16 ++++++++-------- OpenCL/m13500_a1.cl | 12 ++++++------ OpenCL/m13500_a3.cl | 12 ++++++------ OpenCL/m13600.cl | 14 +++++++------- OpenCL/m13751.cl | 16 ++++++++-------- OpenCL/m13752.cl | 16 ++++++++-------- OpenCL/m13753.cl | 16 ++++++++-------- OpenCL/markov_be.cl | 4 ++-- OpenCL/markov_le.cl | 4 ++-- include/rp_kernel_on_cpu.h | 2 +- include/shared.h | 18 +++++++++--------- src/Makefile | 2 +- src/hashcat.c | 2 +- tools/package_bin.sh | 8 -------- 364 files changed, 2320 insertions(+), 2328 deletions(-) rename OpenCL/{kernel_aes256.c => inc_cipher_aes256.cl} (100%) rename OpenCL/{kernel_serpent256.c => inc_cipher_serpent256.cl} (100%) rename OpenCL/{kernel_twofish256.c => inc_cipher_twofish256.cl} (100%) rename OpenCL/{common.c => inc_common.cl} (100%) rename OpenCL/{check_multi_comp4.c => inc_comp_multi.cl} (100%) rename OpenCL/{check_multi_comp4_bs.c => inc_comp_multi_bs.cl} (100%) rename OpenCL/{check_single_comp4.c => inc_comp_single.cl} (100%) rename OpenCL/{check_single_comp4_bs.c => inc_comp_single_bs.cl} (100%) rename include/constants.h => OpenCL/inc_hash_constants.h (100%) rename include/kernel_functions.c => OpenCL/inc_hash_functions.cl (100%) rename OpenCL/{rp.c => inc_rp.cl} (100%) rename include/rp_kernel.h => OpenCL/inc_rp.h (100%) rename OpenCL/{simd.c => inc_simd.cl} (100%) rename OpenCL/{types_ocl.c => inc_types.cl} (100%) rename include/kernel_vendor.h => OpenCL/inc_vendor.cl (100%) diff --git a/OpenCL/amp_a0.cl b/OpenCL/amp_a0.cl index dbc4ad8..821c7ce 100644 --- a/OpenCL/amp_a0.cl +++ b/OpenCL/amp_a0.cl @@ -3,12 +3,12 @@ * License.....: MIT */ -#include "include/constants.h" -#include "include/kernel_vendor.h" -#include "OpenCL/types_ocl.c" +#include "inc_hash_constants.h" +#include "inc_vendor.cl" +#include "inc_types.cl" -#include "include/rp_kernel.h" -#include "OpenCL/rp.c" +#include "inc_rp.h" +#include "inc_rp.cl" __kernel void amp (__global pw_t *pws, __global pw_t *pws_amp, __global kernel_rule_t *rules_buf, __global comb_t *combs_buf, __global bf_t *bfs_buf, const u32 combs_mode, const u32 gid_max) { diff --git a/OpenCL/amp_a1.cl b/OpenCL/amp_a1.cl index 553b1f6..d18e37c 100644 --- a/OpenCL/amp_a1.cl +++ b/OpenCL/amp_a1.cl @@ -3,9 +3,9 @@ * License.....: MIT */ -#include "include/constants.h" -#include "include/kernel_vendor.h" -#include "OpenCL/types_ocl.c" +#include "inc_hash_constants.h" +#include "inc_vendor.cl" +#include "inc_types.cl" inline void switch_buffer_by_offset_le (u32 w0[4], u32 w1[4], u32 w2[4], u32 w3[4], const u32 offset) { diff --git a/OpenCL/amp_a3.cl b/OpenCL/amp_a3.cl index 370958b..f1b1b04 100644 --- a/OpenCL/amp_a3.cl +++ b/OpenCL/amp_a3.cl @@ -3,9 +3,9 @@ * License.....: MIT */ -#include "include/constants.h" -#include "include/kernel_vendor.h" -#include "OpenCL/types_ocl.c" +#include "inc_hash_constants.h" +#include "inc_vendor.cl" +#include "inc_types.cl" __kernel void amp (__global pw_t *pws, __global pw_t *pws_amp, __global kernel_rule_t *rules_buf, __global comb_t *combs_buf, __global bf_t *bfs_buf, const u32 combs_mode, const u32 gid_max) { diff --git a/OpenCL/kernel_aes256.c b/OpenCL/inc_cipher_aes256.cl similarity index 100% rename from OpenCL/kernel_aes256.c rename to OpenCL/inc_cipher_aes256.cl diff --git a/OpenCL/kernel_serpent256.c b/OpenCL/inc_cipher_serpent256.cl similarity index 100% rename from OpenCL/kernel_serpent256.c rename to OpenCL/inc_cipher_serpent256.cl diff --git a/OpenCL/kernel_twofish256.c b/OpenCL/inc_cipher_twofish256.cl similarity index 100% rename from OpenCL/kernel_twofish256.c rename to OpenCL/inc_cipher_twofish256.cl diff --git a/OpenCL/common.c b/OpenCL/inc_common.cl similarity index 100% rename from OpenCL/common.c rename to OpenCL/inc_common.cl diff --git a/OpenCL/check_multi_comp4.c b/OpenCL/inc_comp_multi.cl similarity index 100% rename from OpenCL/check_multi_comp4.c rename to OpenCL/inc_comp_multi.cl diff --git a/OpenCL/check_multi_comp4_bs.c b/OpenCL/inc_comp_multi_bs.cl similarity index 100% rename from OpenCL/check_multi_comp4_bs.c rename to OpenCL/inc_comp_multi_bs.cl diff --git a/OpenCL/check_single_comp4.c b/OpenCL/inc_comp_single.cl similarity index 100% rename from OpenCL/check_single_comp4.c rename to OpenCL/inc_comp_single.cl diff --git a/OpenCL/check_single_comp4_bs.c b/OpenCL/inc_comp_single_bs.cl similarity index 100% rename from OpenCL/check_single_comp4_bs.c rename to OpenCL/inc_comp_single_bs.cl diff --git a/include/constants.h b/OpenCL/inc_hash_constants.h similarity index 100% rename from include/constants.h rename to OpenCL/inc_hash_constants.h diff --git a/include/kernel_functions.c b/OpenCL/inc_hash_functions.cl similarity index 100% rename from include/kernel_functions.c rename to OpenCL/inc_hash_functions.cl diff --git a/OpenCL/rp.c b/OpenCL/inc_rp.cl similarity index 100% rename from OpenCL/rp.c rename to OpenCL/inc_rp.cl diff --git a/include/rp_kernel.h b/OpenCL/inc_rp.h similarity index 100% rename from include/rp_kernel.h rename to OpenCL/inc_rp.h diff --git a/OpenCL/simd.c b/OpenCL/inc_simd.cl similarity index 100% rename from OpenCL/simd.c rename to OpenCL/inc_simd.cl diff --git a/OpenCL/types_ocl.c b/OpenCL/inc_types.cl similarity index 100% rename from OpenCL/types_ocl.c rename to OpenCL/inc_types.cl diff --git a/include/kernel_vendor.h b/OpenCL/inc_vendor.cl similarity index 100% rename from include/kernel_vendor.h rename to OpenCL/inc_vendor.cl diff --git a/OpenCL/m00000_a0.cl b/OpenCL/m00000_a0.cl index 08e5923..cdc550a 100644 --- a/OpenCL/m00000_a0.cl +++ b/OpenCL/m00000_a0.cl @@ -7,20 +7,20 @@ #define NEW_SIMD_CODE -#include "include/constants.h" -#include "include/kernel_vendor.h" +#include "inc_hash_constants.h" +#include "inc_vendor.cl" #define DGST_R0 0 #define DGST_R1 3 #define DGST_R2 2 #define DGST_R3 1 -#include "include/kernel_functions.c" -#include "OpenCL/types_ocl.c" -#include "OpenCL/common.c" -#include "include/rp_kernel.h" -#include "OpenCL/rp.c" -#include "OpenCL/simd.c" +#include "inc_hash_functions.cl" +#include "inc_types.cl" +#include "inc_common.cl" +#include "inc_rp.h" +#include "inc_rp.cl" +#include "inc_simd.cl" __kernel void m00000_m04 (__global pw_t *pws, __global kernel_rule_t *rules_buf, __global comb_t *combs_buf, __global bf_t *bfs_buf, __global void *tmps, __global void *hooks, __global u32 *bitmaps_buf_s1_a, __global u32 *bitmaps_buf_s1_b, __global u32 *bitmaps_buf_s1_c, __global u32 *bitmaps_buf_s1_d, __global u32 *bitmaps_buf_s2_a, __global u32 *bitmaps_buf_s2_b, __global u32 *bitmaps_buf_s2_c, __global u32 *bitmaps_buf_s2_d, __global plain_t *plains_buf, __global digest_t *digests_buf, __global u32 *hashes_shown, __global salt_t *salt_bufs, __global void *esalt_bufs, __global u32 *d_return_buf, __global u32 *d_scryptV_buf, const u32 bitmap_mask, const u32 bitmap_shift1, const u32 bitmap_shift2, const u32 salt_pos, const u32 loop_pos, const u32 loop_cnt, const u32 il_cnt, const u32 digests_cnt, const u32 digests_offset, const u32 combs_mode, const u32 gid_max) { diff --git a/OpenCL/m00000_a1.cl b/OpenCL/m00000_a1.cl index c89d6f2..a5df408 100644 --- a/OpenCL/m00000_a1.cl +++ b/OpenCL/m00000_a1.cl @@ -7,18 +7,18 @@ #define NEW_SIMD_CODE -#include "include/constants.h" -#include "include/kernel_vendor.h" +#include "inc_hash_constants.h" +#include "inc_vendor.cl" #define DGST_R0 0 #define DGST_R1 3 #define DGST_R2 2 #define DGST_R3 1 -#include "include/kernel_functions.c" -#include "OpenCL/types_ocl.c" -#include "OpenCL/common.c" -#include "OpenCL/simd.c" +#include "inc_hash_functions.cl" +#include "inc_types.cl" +#include "inc_common.cl" +#include "inc_simd.cl" __kernel void m00000_m04 (__global pw_t *pws, __global kernel_rule_t *rules_buf, __global comb_t *combs_buf, __global bf_t *bfs_buf, __global void *tmps, __global void *hooks, __global u32 *bitmaps_buf_s1_a, __global u32 *bitmaps_buf_s1_b, __global u32 *bitmaps_buf_s1_c, __global u32 *bitmaps_buf_s1_d, __global u32 *bitmaps_buf_s2_a, __global u32 *bitmaps_buf_s2_b, __global u32 *bitmaps_buf_s2_c, __global u32 *bitmaps_buf_s2_d, __global plain_t *plains_buf, __global digest_t *digests_buf, __global u32 *hashes_shown, __global salt_t *salt_bufs, __global void *esalt_bufs, __global u32 *d_return_buf, __global u32 *d_scryptV_buf, const u32 bitmap_mask, const u32 bitmap_shift1, const u32 bitmap_shift2, const u32 salt_pos, const u32 loop_pos, const u32 loop_cnt, const u32 il_cnt, const u32 digests_cnt, const u32 digests_offset, const u32 combs_mode, const u32 gid_max) { diff --git a/OpenCL/m00000_a3.cl b/OpenCL/m00000_a3.cl index 09b4665..e4d86bd 100644 --- a/OpenCL/m00000_a3.cl +++ b/OpenCL/m00000_a3.cl @@ -7,18 +7,18 @@ #define NEW_SIMD_CODE -#include "include/constants.h" -#include "include/kernel_vendor.h" +#include "inc_hash_constants.h" +#include "inc_vendor.cl" #define DGST_R0 0 #define DGST_R1 3 #define DGST_R2 2 #define DGST_R3 1 -#include "include/kernel_functions.c" -#include "OpenCL/types_ocl.c" -#include "OpenCL/common.c" -#include "OpenCL/simd.c" +#include "inc_hash_functions.cl" +#include "inc_types.cl" +#include "inc_common.cl" +#include "inc_simd.cl" #define MD5_STEP_REV(f,a,b,c,d,x,t,s) \ { \ diff --git a/OpenCL/m00010_a0.cl b/OpenCL/m00010_a0.cl index d2beb72..416dc30 100644 --- a/OpenCL/m00010_a0.cl +++ b/OpenCL/m00010_a0.cl @@ -7,20 +7,20 @@ #define NEW_SIMD_CODE -#include "include/constants.h" -#include "include/kernel_vendor.h" +#include "inc_hash_constants.h" +#include "inc_vendor.cl" #define DGST_R0 0 #define DGST_R1 3 #define DGST_R2 2 #define DGST_R3 1 -#include "include/kernel_functions.c" -#include "OpenCL/types_ocl.c" -#include "OpenCL/common.c" -#include "include/rp_kernel.h" -#include "OpenCL/rp.c" -#include "OpenCL/simd.c" +#include "inc_hash_functions.cl" +#include "inc_types.cl" +#include "inc_common.cl" +#include "inc_rp.h" +#include "inc_rp.cl" +#include "inc_simd.cl" __kernel void m00010_m04 (__global pw_t *pws, __global kernel_rule_t *rules_buf, __global comb_t *combs_buf, __global bf_t *bfs_buf, __global void *tmps, __global void *hooks, __global u32 *bitmaps_buf_s1_a, __global u32 *bitmaps_buf_s1_b, __global u32 *bitmaps_buf_s1_c, __global u32 *bitmaps_buf_s1_d, __global u32 *bitmaps_buf_s2_a, __global u32 *bitmaps_buf_s2_b, __global u32 *bitmaps_buf_s2_c, __global u32 *bitmaps_buf_s2_d, __global plain_t *plains_buf, __global digest_t *digests_buf, __global u32 *hashes_shown, __global salt_t *salt_bufs, __global void *esalt_bufs, __global u32 *d_return_buf, __global u32 *d_scryptV_buf, const u32 bitmap_mask, const u32 bitmap_shift1, const u32 bitmap_shift2, const u32 salt_pos, const u32 loop_pos, const u32 loop_cnt, const u32 il_cnt, const u32 digests_cnt, const u32 digests_offset, const u32 combs_mode, const u32 gid_max) { diff --git a/OpenCL/m00010_a1.cl b/OpenCL/m00010_a1.cl index a1424c9..e3ffd36 100644 --- a/OpenCL/m00010_a1.cl +++ b/OpenCL/m00010_a1.cl @@ -7,18 +7,18 @@ #define NEW_SIMD_CODE -#include "include/constants.h" -#include "include/kernel_vendor.h" +#include "inc_hash_constants.h" +#include "inc_vendor.cl" #define DGST_R0 0 #define DGST_R1 3 #define DGST_R2 2 #define DGST_R3 1 -#include "include/kernel_functions.c" -#include "OpenCL/types_ocl.c" -#include "OpenCL/common.c" -#include "OpenCL/simd.c" +#include "inc_hash_functions.cl" +#include "inc_types.cl" +#include "inc_common.cl" +#include "inc_simd.cl" __kernel void m00010_m04 (__global pw_t *pws, __global kernel_rule_t *rules_buf, __global comb_t *combs_buf, __global bf_t *bfs_buf, __global void *tmps, __global void *hooks, __global u32 *bitmaps_buf_s1_a, __global u32 *bitmaps_buf_s1_b, __global u32 *bitmaps_buf_s1_c, __global u32 *bitmaps_buf_s1_d, __global u32 *bitmaps_buf_s2_a, __global u32 *bitmaps_buf_s2_b, __global u32 *bitmaps_buf_s2_c, __global u32 *bitmaps_buf_s2_d, __global plain_t *plains_buf, __global digest_t *digests_buf, __global u32 *hashes_shown, __global salt_t *salt_bufs, __global void *esalt_bufs, __global u32 *d_return_buf, __global u32 *d_scryptV_buf, const u32 bitmap_mask, const u32 bitmap_shift1, const u32 bitmap_shift2, const u32 salt_pos, const u32 loop_pos, const u32 loop_cnt, const u32 il_cnt, const u32 digests_cnt, const u32 digests_offset, const u32 combs_mode, const u32 gid_max) { diff --git a/OpenCL/m00010_a3.cl b/OpenCL/m00010_a3.cl index 38ef98f..d923bd3 100644 --- a/OpenCL/m00010_a3.cl +++ b/OpenCL/m00010_a3.cl @@ -7,18 +7,18 @@ #define NEW_SIMD_CODE -#include "include/constants.h" -#include "include/kernel_vendor.h" +#include "inc_hash_constants.h" +#include "inc_vendor.cl" #define DGST_R0 0 #define DGST_R1 3 #define DGST_R2 2 #define DGST_R3 1 -#include "include/kernel_functions.c" -#include "OpenCL/types_ocl.c" -#include "OpenCL/common.c" -#include "OpenCL/simd.c" +#include "inc_hash_functions.cl" +#include "inc_types.cl" +#include "inc_common.cl" +#include "inc_simd.cl" #define MD5_STEP_REV(f,a,b,c,d,x,t,s) \ { \ diff --git a/OpenCL/m00020_a0.cl b/OpenCL/m00020_a0.cl index 99fc13a..db3d526 100644 --- a/OpenCL/m00020_a0.cl +++ b/OpenCL/m00020_a0.cl @@ -7,20 +7,20 @@ #define NEW_SIMD_CODE -#include "include/constants.h" -#include "include/kernel_vendor.h" +#include "inc_hash_constants.h" +#include "inc_vendor.cl" #define DGST_R0 0 #define DGST_R1 3 #define DGST_R2 2 #define DGST_R3 1 -#include "include/kernel_functions.c" -#include "OpenCL/types_ocl.c" -#include "OpenCL/common.c" -#include "include/rp_kernel.h" -#include "OpenCL/rp.c" -#include "OpenCL/simd.c" +#include "inc_hash_functions.cl" +#include "inc_types.cl" +#include "inc_common.cl" +#include "inc_rp.h" +#include "inc_rp.cl" +#include "inc_simd.cl" __kernel void m00020_m04 (__global pw_t *pws, __global kernel_rule_t *rules_buf, __global comb_t *combs_buf, __global bf_t *bfs_buf, __global void *tmps, __global void *hooks, __global u32 *bitmaps_buf_s1_a, __global u32 *bitmaps_buf_s1_b, __global u32 *bitmaps_buf_s1_c, __global u32 *bitmaps_buf_s1_d, __global u32 *bitmaps_buf_s2_a, __global u32 *bitmaps_buf_s2_b, __global u32 *bitmaps_buf_s2_c, __global u32 *bitmaps_buf_s2_d, __global plain_t *plains_buf, __global digest_t *digests_buf, __global u32 *hashes_shown, __global salt_t *salt_bufs, __global void *esalt_bufs, __global u32 *d_return_buf, __global u32 *d_scryptV_buf, const u32 bitmap_mask, const u32 bitmap_shift1, const u32 bitmap_shift2, const u32 salt_pos, const u32 loop_pos, const u32 loop_cnt, const u32 il_cnt, const u32 digests_cnt, const u32 digests_offset, const u32 combs_mode, const u32 gid_max) { diff --git a/OpenCL/m00020_a1.cl b/OpenCL/m00020_a1.cl index 3e5d995..8318aa2 100644 --- a/OpenCL/m00020_a1.cl +++ b/OpenCL/m00020_a1.cl @@ -7,18 +7,18 @@ #define NEW_SIMD_CODE -#include "include/constants.h" -#include "include/kernel_vendor.h" +#include "inc_hash_constants.h" +#include "inc_vendor.cl" #define DGST_R0 0 #define DGST_R1 3 #define DGST_R2 2 #define DGST_R3 1 -#include "include/kernel_functions.c" -#include "OpenCL/types_ocl.c" -#include "OpenCL/common.c" -#include "OpenCL/simd.c" +#include "inc_hash_functions.cl" +#include "inc_types.cl" +#include "inc_common.cl" +#include "inc_simd.cl" __kernel void m00020_m04 (__global pw_t *pws, __global kernel_rule_t *rules_buf, __global comb_t *combs_buf, __global bf_t *bfs_buf, __global void *tmps, __global void *hooks, __global u32 *bitmaps_buf_s1_a, __global u32 *bitmaps_buf_s1_b, __global u32 *bitmaps_buf_s1_c, __global u32 *bitmaps_buf_s1_d, __global u32 *bitmaps_buf_s2_a, __global u32 *bitmaps_buf_s2_b, __global u32 *bitmaps_buf_s2_c, __global u32 *bitmaps_buf_s2_d, __global plain_t *plains_buf, __global digest_t *digests_buf, __global u32 *hashes_shown, __global salt_t *salt_bufs, __global void *esalt_bufs, __global u32 *d_return_buf, __global u32 *d_scryptV_buf, const u32 bitmap_mask, const u32 bitmap_shift1, const u32 bitmap_shift2, const u32 salt_pos, const u32 loop_pos, const u32 loop_cnt, const u32 il_cnt, const u32 digests_cnt, const u32 digests_offset, const u32 combs_mode, const u32 gid_max) { diff --git a/OpenCL/m00020_a3.cl b/OpenCL/m00020_a3.cl index 13d0651..d4098f9 100644 --- a/OpenCL/m00020_a3.cl +++ b/OpenCL/m00020_a3.cl @@ -7,18 +7,18 @@ #define NEW_SIMD_CODE -#include "include/constants.h" -#include "include/kernel_vendor.h" +#include "inc_hash_constants.h" +#include "inc_vendor.cl" #define DGST_R0 0 #define DGST_R1 3 #define DGST_R2 2 #define DGST_R3 1 -#include "include/kernel_functions.c" -#include "OpenCL/types_ocl.c" -#include "OpenCL/common.c" -#include "OpenCL/simd.c" +#include "inc_hash_functions.cl" +#include "inc_types.cl" +#include "inc_common.cl" +#include "inc_simd.cl" void m00020m (u32 w0[4], u32 w1[4], u32 w2[4], u32 w3[4], const u32 pw_len, __global pw_t *pws, __global kernel_rule_t *rules_buf, __global comb_t *combs_buf, __global bf_t *bfs_buf, __global void *tmps, __global void *hooks, __global u32 *bitmaps_buf_s1_a, __global u32 *bitmaps_buf_s1_b, __global u32 *bitmaps_buf_s1_c, __global u32 *bitmaps_buf_s1_d, __global u32 *bitmaps_buf_s2_a, __global u32 *bitmaps_buf_s2_b, __global u32 *bitmaps_buf_s2_c, __global u32 *bitmaps_buf_s2_d, __global plain_t *plains_buf, __global digest_t *digests_buf, __global u32 *hashes_shown, __global salt_t *salt_bufs, __global void *esalt_bufs, __global u32 *d_return_buf, __global u32 *d_scryptV_buf, const u32 bitmap_mask, const u32 bitmap_shift1, const u32 bitmap_shift2, const u32 salt_pos, const u32 loop_pos, const u32 loop_cnt, const u32 il_cnt, const u32 digests_cnt, const u32 digests_offset) { diff --git a/OpenCL/m00030_a0.cl b/OpenCL/m00030_a0.cl index 9309e30..cd86c4c 100644 --- a/OpenCL/m00030_a0.cl +++ b/OpenCL/m00030_a0.cl @@ -7,20 +7,20 @@ #define NEW_SIMD_CODE -#include "include/constants.h" -#include "include/kernel_vendor.h" +#include "inc_hash_constants.h" +#include "inc_vendor.cl" #define DGST_R0 0 #define DGST_R1 3 #define DGST_R2 2 #define DGST_R3 1 -#include "include/kernel_functions.c" -#include "OpenCL/types_ocl.c" -#include "OpenCL/common.c" -#include "include/rp_kernel.h" -#include "OpenCL/rp.c" -#include "OpenCL/simd.c" +#include "inc_hash_functions.cl" +#include "inc_types.cl" +#include "inc_common.cl" +#include "inc_rp.h" +#include "inc_rp.cl" +#include "inc_simd.cl" // no unicode yet diff --git a/OpenCL/m00030_a1.cl b/OpenCL/m00030_a1.cl index 329c8c1..3ae93f4 100644 --- a/OpenCL/m00030_a1.cl +++ b/OpenCL/m00030_a1.cl @@ -7,18 +7,18 @@ #define NEW_SIMD_CODE -#include "include/constants.h" -#include "include/kernel_vendor.h" +#include "inc_hash_constants.h" +#include "inc_vendor.cl" #define DGST_R0 0 #define DGST_R1 3 #define DGST_R2 2 #define DGST_R3 1 -#include "include/kernel_functions.c" -#include "OpenCL/types_ocl.c" -#include "OpenCL/common.c" -#include "OpenCL/simd.c" +#include "inc_hash_functions.cl" +#include "inc_types.cl" +#include "inc_common.cl" +#include "inc_simd.cl" // no unicode yet diff --git a/OpenCL/m00030_a3.cl b/OpenCL/m00030_a3.cl index 05001ed..4b26384 100644 --- a/OpenCL/m00030_a3.cl +++ b/OpenCL/m00030_a3.cl @@ -7,18 +7,18 @@ #define NEW_SIMD_CODE -#include "include/constants.h" -#include "include/kernel_vendor.h" +#include "inc_hash_constants.h" +#include "inc_vendor.cl" #define DGST_R0 0 #define DGST_R1 3 #define DGST_R2 2 #define DGST_R3 1 -#include "include/kernel_functions.c" -#include "OpenCL/types_ocl.c" -#include "OpenCL/common.c" -#include "OpenCL/simd.c" +#include "inc_hash_functions.cl" +#include "inc_types.cl" +#include "inc_common.cl" +#include "inc_simd.cl" #define MD5_STEP_REV(f,a,b,c,d,x,t,s) \ { \ diff --git a/OpenCL/m00040_a0.cl b/OpenCL/m00040_a0.cl index f888f52..9521b8d 100644 --- a/OpenCL/m00040_a0.cl +++ b/OpenCL/m00040_a0.cl @@ -7,20 +7,20 @@ #define NEW_SIMD_CODE -#include "include/constants.h" -#include "include/kernel_vendor.h" +#include "inc_hash_constants.h" +#include "inc_vendor.cl" #define DGST_R0 0 #define DGST_R1 3 #define DGST_R2 2 #define DGST_R3 1 -#include "include/kernel_functions.c" -#include "OpenCL/types_ocl.c" -#include "OpenCL/common.c" -#include "include/rp_kernel.h" -#include "OpenCL/rp.c" -#include "OpenCL/simd.c" +#include "inc_hash_functions.cl" +#include "inc_types.cl" +#include "inc_common.cl" +#include "inc_rp.h" +#include "inc_rp.cl" +#include "inc_simd.cl" __kernel void m00040_m04 (__global pw_t *pws, __global kernel_rule_t *rules_buf, __global comb_t *combs_buf, __global bf_t *bfs_buf, __global void *tmps, __global void *hooks, __global u32 *bitmaps_buf_s1_a, __global u32 *bitmaps_buf_s1_b, __global u32 *bitmaps_buf_s1_c, __global u32 *bitmaps_buf_s1_d, __global u32 *bitmaps_buf_s2_a, __global u32 *bitmaps_buf_s2_b, __global u32 *bitmaps_buf_s2_c, __global u32 *bitmaps_buf_s2_d, __global plain_t *plains_buf, __global digest_t *digests_buf, __global u32 *hashes_shown, __global salt_t *salt_bufs, __global void *esalt_bufs, __global u32 *d_return_buf, __global u32 *d_scryptV_buf, const u32 bitmap_mask, const u32 bitmap_shift1, const u32 bitmap_shift2, const u32 salt_pos, const u32 loop_pos, const u32 loop_cnt, const u32 il_cnt, const u32 digests_cnt, const u32 digests_offset, const u32 combs_mode, const u32 gid_max) { diff --git a/OpenCL/m00040_a1.cl b/OpenCL/m00040_a1.cl index 2996c90..49c6046 100644 --- a/OpenCL/m00040_a1.cl +++ b/OpenCL/m00040_a1.cl @@ -7,18 +7,18 @@ #define NEW_SIMD_CODE -#include "include/constants.h" -#include "include/kernel_vendor.h" +#include "inc_hash_constants.h" +#include "inc_vendor.cl" #define DGST_R0 0 #define DGST_R1 3 #define DGST_R2 2 #define DGST_R3 1 -#include "include/kernel_functions.c" -#include "OpenCL/types_ocl.c" -#include "OpenCL/common.c" -#include "OpenCL/simd.c" +#include "inc_hash_functions.cl" +#include "inc_types.cl" +#include "inc_common.cl" +#include "inc_simd.cl" // no unicode yet diff --git a/OpenCL/m00040_a3.cl b/OpenCL/m00040_a3.cl index ee4ef2e..abb8c30 100644 --- a/OpenCL/m00040_a3.cl +++ b/OpenCL/m00040_a3.cl @@ -7,18 +7,18 @@ #define NEW_SIMD_CODE -#include "include/constants.h" -#include "include/kernel_vendor.h" +#include "inc_hash_constants.h" +#include "inc_vendor.cl" #define DGST_R0 0 #define DGST_R1 3 #define DGST_R2 2 #define DGST_R3 1 -#include "include/kernel_functions.c" -#include "OpenCL/types_ocl.c" -#include "OpenCL/common.c" -#include "OpenCL/simd.c" +#include "inc_hash_functions.cl" +#include "inc_types.cl" +#include "inc_common.cl" +#include "inc_simd.cl" void m00040m (u32 w0[4], u32 w1[4], u32 w2[4], u32 w3[4], const u32 pw_len, __global pw_t *pws, __global kernel_rule_t *rules_buf, __global comb_t *combs_buf, __global bf_t *bfs_buf, __global void *tmps, __global void *hooks, __global u32 *bitmaps_buf_s1_a, __global u32 *bitmaps_buf_s1_b, __global u32 *bitmaps_buf_s1_c, __global u32 *bitmaps_buf_s1_d, __global u32 *bitmaps_buf_s2_a, __global u32 *bitmaps_buf_s2_b, __global u32 *bitmaps_buf_s2_c, __global u32 *bitmaps_buf_s2_d, __global plain_t *plains_buf, __global digest_t *digests_buf, __global u32 *hashes_shown, __global salt_t *salt_bufs, __global void *esalt_bufs, __global u32 *d_return_buf, __global u32 *d_scryptV_buf, const u32 bitmap_mask, const u32 bitmap_shift1, const u32 bitmap_shift2, const u32 salt_pos, const u32 loop_pos, const u32 loop_cnt, const u32 il_cnt, const u32 digests_cnt, const u32 digests_offset) { diff --git a/OpenCL/m00050_a0.cl b/OpenCL/m00050_a0.cl index eb34668..9fc1533 100644 --- a/OpenCL/m00050_a0.cl +++ b/OpenCL/m00050_a0.cl @@ -7,20 +7,20 @@ #define NEW_SIMD_CODE -#include "include/constants.h" -#include "include/kernel_vendor.h" +#include "inc_hash_constants.h" +#include "inc_vendor.cl" #define DGST_R0 0 #define DGST_R1 3 #define DGST_R2 2 #define DGST_R3 1 -#include "include/kernel_functions.c" -#include "OpenCL/types_ocl.c" -#include "OpenCL/common.c" -#include "include/rp_kernel.h" -#include "OpenCL/rp.c" -#include "OpenCL/simd.c" +#include "inc_hash_functions.cl" +#include "inc_types.cl" +#include "inc_common.cl" +#include "inc_rp.h" +#include "inc_rp.cl" +#include "inc_simd.cl" void md5_transform (const u32x w0[4], const u32x w1[4], const u32x w2[4], const u32x w3[4], u32x digest[4]) { diff --git a/OpenCL/m00050_a1.cl b/OpenCL/m00050_a1.cl index ec578f1..b269ad0 100644 --- a/OpenCL/m00050_a1.cl +++ b/OpenCL/m00050_a1.cl @@ -7,18 +7,18 @@ #define NEW_SIMD_CODE -#include "include/constants.h" -#include "include/kernel_vendor.h" +#include "inc_hash_constants.h" +#include "inc_vendor.cl" #define DGST_R0 0 #define DGST_R1 3 #define DGST_R2 2 #define DGST_R3 1 -#include "include/kernel_functions.c" -#include "OpenCL/types_ocl.c" -#include "OpenCL/common.c" -#include "OpenCL/simd.c" +#include "inc_hash_functions.cl" +#include "inc_types.cl" +#include "inc_common.cl" +#include "inc_simd.cl" void md5_transform (const u32x w0[4], const u32x w1[4], const u32x w2[4], const u32x w3[4], u32x digest[4]) { diff --git a/OpenCL/m00050_a3.cl b/OpenCL/m00050_a3.cl index 1e93f46..f08226e 100644 --- a/OpenCL/m00050_a3.cl +++ b/OpenCL/m00050_a3.cl @@ -7,18 +7,18 @@ #define NEW_SIMD_CODE -#include "include/constants.h" -#include "include/kernel_vendor.h" +#include "inc_hash_constants.h" +#include "inc_vendor.cl" #define DGST_R0 0 #define DGST_R1 3 #define DGST_R2 2 #define DGST_R3 1 -#include "include/kernel_functions.c" -#include "OpenCL/types_ocl.c" -#include "OpenCL/common.c" -#include "OpenCL/simd.c" +#include "inc_hash_functions.cl" +#include "inc_types.cl" +#include "inc_common.cl" +#include "inc_simd.cl" void md5_transform (const u32x w0[4], const u32x w1[4], const u32x w2[4], const u32x w3[4], u32x digest[4]) { diff --git a/OpenCL/m00060_a0.cl b/OpenCL/m00060_a0.cl index 687738c..e2eeddb 100644 --- a/OpenCL/m00060_a0.cl +++ b/OpenCL/m00060_a0.cl @@ -7,20 +7,20 @@ #define NEW_SIMD_CODE -#include "include/constants.h" -#include "include/kernel_vendor.h" +#include "inc_hash_constants.h" +#include "inc_vendor.cl" #define DGST_R0 0 #define DGST_R1 3 #define DGST_R2 2 #define DGST_R3 1 -#include "include/kernel_functions.c" -#include "OpenCL/types_ocl.c" -#include "OpenCL/common.c" -#include "include/rp_kernel.h" -#include "OpenCL/rp.c" -#include "OpenCL/simd.c" +#include "inc_hash_functions.cl" +#include "inc_types.cl" +#include "inc_common.cl" +#include "inc_rp.h" +#include "inc_rp.cl" +#include "inc_simd.cl" void md5_transform (const u32x w0[4], const u32x w1[4], const u32x w2[4], const u32x w3[4], u32x digest[4]) { diff --git a/OpenCL/m00060_a1.cl b/OpenCL/m00060_a1.cl index 85604b8..635b081 100644 --- a/OpenCL/m00060_a1.cl +++ b/OpenCL/m00060_a1.cl @@ -7,18 +7,18 @@ #define NEW_SIMD_CODE -#include "include/constants.h" -#include "include/kernel_vendor.h" +#include "inc_hash_constants.h" +#include "inc_vendor.cl" #define DGST_R0 0 #define DGST_R1 3 #define DGST_R2 2 #define DGST_R3 1 -#include "include/kernel_functions.c" -#include "OpenCL/types_ocl.c" -#include "OpenCL/common.c" -#include "OpenCL/simd.c" +#include "inc_hash_functions.cl" +#include "inc_types.cl" +#include "inc_common.cl" +#include "inc_simd.cl" void md5_transform (const u32x w0[4], const u32x w1[4], const u32x w2[4], const u32x w3[4], u32x digest[4]) { diff --git a/OpenCL/m00060_a3.cl b/OpenCL/m00060_a3.cl index 2863aef..fc636d2 100644 --- a/OpenCL/m00060_a3.cl +++ b/OpenCL/m00060_a3.cl @@ -7,18 +7,18 @@ #define NEW_SIMD_CODE -#include "include/constants.h" -#include "include/kernel_vendor.h" +#include "inc_hash_constants.h" +#include "inc_vendor.cl" #define DGST_R0 0 #define DGST_R1 3 #define DGST_R2 2 #define DGST_R3 1 -#include "include/kernel_functions.c" -#include "OpenCL/types_ocl.c" -#include "OpenCL/common.c" -#include "OpenCL/simd.c" +#include "inc_hash_functions.cl" +#include "inc_types.cl" +#include "inc_common.cl" +#include "inc_simd.cl" void md5_transform (const u32x w0[4], const u32x w1[4], const u32x w2[4], const u32x w3[4], u32x digest[4]) { diff --git a/OpenCL/m00100_a0.cl b/OpenCL/m00100_a0.cl index 4faa35e..7cc5b2b 100644 --- a/OpenCL/m00100_a0.cl +++ b/OpenCL/m00100_a0.cl @@ -7,20 +7,20 @@ #define NEW_SIMD_CODE -#include "include/constants.h" -#include "include/kernel_vendor.h" +#include "inc_hash_constants.h" +#include "inc_vendor.cl" #define DGST_R0 3 #define DGST_R1 4 #define DGST_R2 2 #define DGST_R3 1 -#include "include/kernel_functions.c" -#include "OpenCL/types_ocl.c" -#include "OpenCL/common.c" -#include "include/rp_kernel.h" -#include "OpenCL/rp.c" -#include "OpenCL/simd.c" +#include "inc_hash_functions.cl" +#include "inc_types.cl" +#include "inc_common.cl" +#include "inc_rp.h" +#include "inc_rp.cl" +#include "inc_simd.cl" __kernel void m00100_m04 (__global pw_t *pws, __global kernel_rule_t *rules_buf, __global comb_t *combs_buf, __global bf_t *bfs_buf, __global void *tmps, __global void *hooks, __global u32 *bitmaps_buf_s1_a, __global u32 *bitmaps_buf_s1_b, __global u32 *bitmaps_buf_s1_c, __global u32 *bitmaps_buf_s1_d, __global u32 *bitmaps_buf_s2_a, __global u32 *bitmaps_buf_s2_b, __global u32 *bitmaps_buf_s2_c, __global u32 *bitmaps_buf_s2_d, __global plain_t *plains_buf, __global digest_t *digests_buf, __global u32 *hashes_shown, __global salt_t *salt_bufs, __global void *esalt_bufs, __global u32 *d_return_buf, __global u32 *d_scryptV_buf, const u32 bitmap_mask, const u32 bitmap_shift1, const u32 bitmap_shift2, const u32 salt_pos, const u32 loop_pos, const u32 loop_cnt, const u32 il_cnt, const u32 digests_cnt, const u32 digests_offset, const u32 combs_mode, const u32 gid_max) { diff --git a/OpenCL/m00100_a1.cl b/OpenCL/m00100_a1.cl index 51be262..39c2177 100644 --- a/OpenCL/m00100_a1.cl +++ b/OpenCL/m00100_a1.cl @@ -7,18 +7,18 @@ #define NEW_SIMD_CODE -#include "include/constants.h" -#include "include/kernel_vendor.h" +#include "inc_hash_constants.h" +#include "inc_vendor.cl" #define DGST_R0 3 #define DGST_R1 4 #define DGST_R2 2 #define DGST_R3 1 -#include "include/kernel_functions.c" -#include "OpenCL/types_ocl.c" -#include "OpenCL/common.c" -#include "OpenCL/simd.c" +#include "inc_hash_functions.cl" +#include "inc_types.cl" +#include "inc_common.cl" +#include "inc_simd.cl" __kernel void m00100_m04 (__global pw_t *pws, __global kernel_rule_t *rules_buf, __global comb_t *combs_buf, __global bf_t *bfs_buf, __global void *tmps, __global void *hooks, __global u32 *bitmaps_buf_s1_a, __global u32 *bitmaps_buf_s1_b, __global u32 *bitmaps_buf_s1_c, __global u32 *bitmaps_buf_s1_d, __global u32 *bitmaps_buf_s2_a, __global u32 *bitmaps_buf_s2_b, __global u32 *bitmaps_buf_s2_c, __global u32 *bitmaps_buf_s2_d, __global plain_t *plains_buf, __global digest_t *digests_buf, __global u32 *hashes_shown, __global salt_t *salt_bufs, __global void *esalt_bufs, __global u32 *d_return_buf, __global u32 *d_scryptV_buf, const u32 bitmap_mask, const u32 bitmap_shift1, const u32 bitmap_shift2, const u32 salt_pos, const u32 loop_pos, const u32 loop_cnt, const u32 il_cnt, const u32 digests_cnt, const u32 digests_offset, const u32 combs_mode, const u32 gid_max) { diff --git a/OpenCL/m00100_a3.cl b/OpenCL/m00100_a3.cl index c78f744..455b840 100644 --- a/OpenCL/m00100_a3.cl +++ b/OpenCL/m00100_a3.cl @@ -7,18 +7,18 @@ #define NEW_SIMD_CODE -#include "include/constants.h" -#include "include/kernel_vendor.h" +#include "inc_hash_constants.h" +#include "inc_vendor.cl" #define DGST_R0 3 #define DGST_R1 4 #define DGST_R2 2 #define DGST_R3 1 -#include "include/kernel_functions.c" -#include "OpenCL/types_ocl.c" -#include "OpenCL/common.c" -#include "OpenCL/simd.c" +#include "inc_hash_functions.cl" +#include "inc_types.cl" +#include "inc_common.cl" +#include "inc_simd.cl" void m00100m (u32 w[16], const u32 pw_len, __global pw_t *pws, __global kernel_rule_t *rules_buf, __global comb_t *combs_buf, __constant u32x * words_buf_r, __global void *tmps, __global void *hooks, __global u32 *bitmaps_buf_s1_a, __global u32 *bitmaps_buf_s1_b, __global u32 *bitmaps_buf_s1_c, __global u32 *bitmaps_buf_s1_d, __global u32 *bitmaps_buf_s2_a, __global u32 *bitmaps_buf_s2_b, __global u32 *bitmaps_buf_s2_c, __global u32 *bitmaps_buf_s2_d, __global plain_t *plains_buf, __global digest_t *digests_buf, __global u32 *hashes_shown, __global salt_t *salt_bufs, __global void *esalt_bufs, __global u32 *d_return_buf, __global u32 *d_scryptV_buf, const u32 bitmap_mask, const u32 bitmap_shift1, const u32 bitmap_shift2, const u32 salt_pos, const u32 loop_pos, const u32 loop_cnt, const u32 il_cnt, const u32 digests_cnt, const u32 digests_offset) { diff --git a/OpenCL/m00110_a0.cl b/OpenCL/m00110_a0.cl index e8ce8d9..09dac89 100644 --- a/OpenCL/m00110_a0.cl +++ b/OpenCL/m00110_a0.cl @@ -7,20 +7,20 @@ #define NEW_SIMD_CODE -#include "include/constants.h" -#include "include/kernel_vendor.h" +#include "inc_hash_constants.h" +#include "inc_vendor.cl" #define DGST_R0 3 #define DGST_R1 4 #define DGST_R2 2 #define DGST_R3 1 -#include "include/kernel_functions.c" -#include "OpenCL/types_ocl.c" -#include "OpenCL/common.c" -#include "include/rp_kernel.h" -#include "OpenCL/rp.c" -#include "OpenCL/simd.c" +#include "inc_hash_functions.cl" +#include "inc_types.cl" +#include "inc_common.cl" +#include "inc_rp.h" +#include "inc_rp.cl" +#include "inc_simd.cl" __kernel void m00110_m04 (__global pw_t *pws, __global kernel_rule_t *rules_buf, __global comb_t *combs_buf, __global bf_t *bfs_buf, __global void *tmps, __global void *hooks, __global u32 *bitmaps_buf_s1_a, __global u32 *bitmaps_buf_s1_b, __global u32 *bitmaps_buf_s1_c, __global u32 *bitmaps_buf_s1_d, __global u32 *bitmaps_buf_s2_a, __global u32 *bitmaps_buf_s2_b, __global u32 *bitmaps_buf_s2_c, __global u32 *bitmaps_buf_s2_d, __global plain_t *plains_buf, __global digest_t *digests_buf, __global u32 *hashes_shown, __global salt_t *salt_bufs, __global void *esalt_bufs, __global u32 *d_return_buf, __global u32 *d_scryptV_buf, const u32 bitmap_mask, const u32 bitmap_shift1, const u32 bitmap_shift2, const u32 salt_pos, const u32 loop_pos, const u32 loop_cnt, const u32 il_cnt, const u32 digests_cnt, const u32 digests_offset, const u32 combs_mode, const u32 gid_max) { diff --git a/OpenCL/m00110_a1.cl b/OpenCL/m00110_a1.cl index af0af26..c92ed52 100644 --- a/OpenCL/m00110_a1.cl +++ b/OpenCL/m00110_a1.cl @@ -7,18 +7,18 @@ #define NEW_SIMD_CODE -#include "include/constants.h" -#include "include/kernel_vendor.h" +#include "inc_hash_constants.h" +#include "inc_vendor.cl" #define DGST_R0 3 #define DGST_R1 4 #define DGST_R2 2 #define DGST_R3 1 -#include "include/kernel_functions.c" -#include "OpenCL/types_ocl.c" -#include "OpenCL/common.c" -#include "OpenCL/simd.c" +#include "inc_hash_functions.cl" +#include "inc_types.cl" +#include "inc_common.cl" +#include "inc_simd.cl" __kernel void m00110_m04 (__global pw_t *pws, __global kernel_rule_t *rules_buf, __global comb_t *combs_buf, __global bf_t *bfs_buf, __global void *tmps, __global void *hooks, __global u32 *bitmaps_buf_s1_a, __global u32 *bitmaps_buf_s1_b, __global u32 *bitmaps_buf_s1_c, __global u32 *bitmaps_buf_s1_d, __global u32 *bitmaps_buf_s2_a, __global u32 *bitmaps_buf_s2_b, __global u32 *bitmaps_buf_s2_c, __global u32 *bitmaps_buf_s2_d, __global plain_t *plains_buf, __global digest_t *digests_buf, __global u32 *hashes_shown, __global salt_t *salt_bufs, __global void *esalt_bufs, __global u32 *d_return_buf, __global u32 *d_scryptV_buf, const u32 bitmap_mask, const u32 bitmap_shift1, const u32 bitmap_shift2, const u32 salt_pos, const u32 loop_pos, const u32 loop_cnt, const u32 il_cnt, const u32 digests_cnt, const u32 digests_offset, const u32 combs_mode, const u32 gid_max) { diff --git a/OpenCL/m00110_a3.cl b/OpenCL/m00110_a3.cl index b5d3fb0..b316a68 100644 --- a/OpenCL/m00110_a3.cl +++ b/OpenCL/m00110_a3.cl @@ -7,18 +7,18 @@ #define NEW_SIMD_CODE -#include "include/constants.h" -#include "include/kernel_vendor.h" +#include "inc_hash_constants.h" +#include "inc_vendor.cl" #define DGST_R0 3 #define DGST_R1 4 #define DGST_R2 2 #define DGST_R3 1 -#include "include/kernel_functions.c" -#include "OpenCL/types_ocl.c" -#include "OpenCL/common.c" -#include "OpenCL/simd.c" +#include "inc_hash_functions.cl" +#include "inc_types.cl" +#include "inc_common.cl" +#include "inc_simd.cl" void m00110m (u32 w[16], const u32 pw_len, __global pw_t *pws, __global kernel_rule_t *rules_buf, __global comb_t *combs_buf, __constant u32x * words_buf_r, __global void *tmps, __global void *hooks, __global u32 *bitmaps_buf_s1_a, __global u32 *bitmaps_buf_s1_b, __global u32 *bitmaps_buf_s1_c, __global u32 *bitmaps_buf_s1_d, __global u32 *bitmaps_buf_s2_a, __global u32 *bitmaps_buf_s2_b, __global u32 *bitmaps_buf_s2_c, __global u32 *bitmaps_buf_s2_d, __global plain_t *plains_buf, __global digest_t *digests_buf, __global u32 *hashes_shown, __global salt_t *salt_bufs, __global void *esalt_bufs, __global u32 *d_return_buf, __global u32 *d_scryptV_buf, const u32 bitmap_mask, const u32 bitmap_shift1, const u32 bitmap_shift2, const u32 salt_pos, const u32 loop_pos, const u32 loop_cnt, const u32 il_cnt, const u32 digests_cnt, const u32 digests_offset) { diff --git a/OpenCL/m00120_a0.cl b/OpenCL/m00120_a0.cl index 61286b5..0123ccc 100644 --- a/OpenCL/m00120_a0.cl +++ b/OpenCL/m00120_a0.cl @@ -7,20 +7,20 @@ #define NEW_SIMD_CODE -#include "include/constants.h" -#include "include/kernel_vendor.h" +#include "inc_hash_constants.h" +#include "inc_vendor.cl" #define DGST_R0 3 #define DGST_R1 4 #define DGST_R2 2 #define DGST_R3 1 -#include "include/kernel_functions.c" -#include "OpenCL/types_ocl.c" -#include "OpenCL/common.c" -#include "include/rp_kernel.h" -#include "OpenCL/rp.c" -#include "OpenCL/simd.c" +#include "inc_hash_functions.cl" +#include "inc_types.cl" +#include "inc_common.cl" +#include "inc_rp.h" +#include "inc_rp.cl" +#include "inc_simd.cl" __kernel void m00120_m04 (__global pw_t *pws, __global kernel_rule_t *rules_buf, __global comb_t *combs_buf, __global bf_t *bfs_buf, __global void *tmps, __global void *hooks, __global u32 *bitmaps_buf_s1_a, __global u32 *bitmaps_buf_s1_b, __global u32 *bitmaps_buf_s1_c, __global u32 *bitmaps_buf_s1_d, __global u32 *bitmaps_buf_s2_a, __global u32 *bitmaps_buf_s2_b, __global u32 *bitmaps_buf_s2_c, __global u32 *bitmaps_buf_s2_d, __global plain_t *plains_buf, __global digest_t *digests_buf, __global u32 *hashes_shown, __global salt_t *salt_bufs, __global void *esalt_bufs, __global u32 *d_return_buf, __global u32 *d_scryptV_buf, const u32 bitmap_mask, const u32 bitmap_shift1, const u32 bitmap_shift2, const u32 salt_pos, const u32 loop_pos, const u32 loop_cnt, const u32 il_cnt, const u32 digests_cnt, const u32 digests_offset, const u32 combs_mode, const u32 gid_max) { diff --git a/OpenCL/m00120_a1.cl b/OpenCL/m00120_a1.cl index 1c282b9..a31c629 100644 --- a/OpenCL/m00120_a1.cl +++ b/OpenCL/m00120_a1.cl @@ -7,18 +7,18 @@ #define NEW_SIMD_CODE -#include "include/constants.h" -#include "include/kernel_vendor.h" +#include "inc_hash_constants.h" +#include "inc_vendor.cl" #define DGST_R0 3 #define DGST_R1 4 #define DGST_R2 2 #define DGST_R3 1 -#include "include/kernel_functions.c" -#include "OpenCL/types_ocl.c" -#include "OpenCL/common.c" -#include "OpenCL/simd.c" +#include "inc_hash_functions.cl" +#include "inc_types.cl" +#include "inc_common.cl" +#include "inc_simd.cl" __kernel void m00120_m04 (__global pw_t *pws, __global kernel_rule_t *rules_buf, __global comb_t *combs_buf, __global bf_t *bfs_buf, __global void *tmps, __global void *hooks, __global u32 *bitmaps_buf_s1_a, __global u32 *bitmaps_buf_s1_b, __global u32 *bitmaps_buf_s1_c, __global u32 *bitmaps_buf_s1_d, __global u32 *bitmaps_buf_s2_a, __global u32 *bitmaps_buf_s2_b, __global u32 *bitmaps_buf_s2_c, __global u32 *bitmaps_buf_s2_d, __global plain_t *plains_buf, __global digest_t *digests_buf, __global u32 *hashes_shown, __global salt_t *salt_bufs, __global void *esalt_bufs, __global u32 *d_return_buf, __global u32 *d_scryptV_buf, const u32 bitmap_mask, const u32 bitmap_shift1, const u32 bitmap_shift2, const u32 salt_pos, const u32 loop_pos, const u32 loop_cnt, const u32 il_cnt, const u32 digests_cnt, const u32 digests_offset, const u32 combs_mode, const u32 gid_max) { diff --git a/OpenCL/m00120_a3.cl b/OpenCL/m00120_a3.cl index 98f8c02..080c497 100644 --- a/OpenCL/m00120_a3.cl +++ b/OpenCL/m00120_a3.cl @@ -7,18 +7,18 @@ #define NEW_SIMD_CODE -#include "include/constants.h" -#include "include/kernel_vendor.h" +#include "inc_hash_constants.h" +#include "inc_vendor.cl" #define DGST_R0 3 #define DGST_R1 4 #define DGST_R2 2 #define DGST_R3 1 -#include "include/kernel_functions.c" -#include "OpenCL/types_ocl.c" -#include "OpenCL/common.c" -#include "OpenCL/simd.c" +#include "inc_hash_functions.cl" +#include "inc_types.cl" +#include "inc_common.cl" +#include "inc_simd.cl" void m00120m (u32 w0[4], u32 w1[4], u32 w2[4], u32 w3[4], const u32 pw_len, __global pw_t *pws, __global kernel_rule_t *rules_buf, __global comb_t *combs_buf, __global bf_t *bfs_buf, __global void *tmps, __global void *hooks, __global u32 *bitmaps_buf_s1_a, __global u32 *bitmaps_buf_s1_b, __global u32 *bitmaps_buf_s1_c, __global u32 *bitmaps_buf_s1_d, __global u32 *bitmaps_buf_s2_a, __global u32 *bitmaps_buf_s2_b, __global u32 *bitmaps_buf_s2_c, __global u32 *bitmaps_buf_s2_d, __global plain_t *plains_buf, __global digest_t *digests_buf, __global u32 *hashes_shown, __global salt_t *salt_bufs, __global void *esalt_bufs, __global u32 *d_return_buf, __global u32 *d_scryptV_buf, const u32 bitmap_mask, const u32 bitmap_shift1, const u32 bitmap_shift2, const u32 salt_pos, const u32 loop_pos, const u32 loop_cnt, const u32 il_cnt, const u32 digests_cnt, const u32 digests_offset) { diff --git a/OpenCL/m00130_a0.cl b/OpenCL/m00130_a0.cl index c62f198..a92db01 100644 --- a/OpenCL/m00130_a0.cl +++ b/OpenCL/m00130_a0.cl @@ -7,20 +7,20 @@ #define NEW_SIMD_CODE -#include "include/constants.h" -#include "include/kernel_vendor.h" +#include "inc_hash_constants.h" +#include "inc_vendor.cl" #define DGST_R0 3 #define DGST_R1 4 #define DGST_R2 2 #define DGST_R3 1 -#include "include/kernel_functions.c" -#include "OpenCL/types_ocl.c" -#include "OpenCL/common.c" -#include "include/rp_kernel.h" -#include "OpenCL/rp.c" -#include "OpenCL/simd.c" +#include "inc_hash_functions.cl" +#include "inc_types.cl" +#include "inc_common.cl" +#include "inc_rp.h" +#include "inc_rp.cl" +#include "inc_simd.cl" // no unicode yet diff --git a/OpenCL/m00130_a1.cl b/OpenCL/m00130_a1.cl index d766c06..6f216c5 100644 --- a/OpenCL/m00130_a1.cl +++ b/OpenCL/m00130_a1.cl @@ -7,18 +7,18 @@ #define NEW_SIMD_CODE -#include "include/constants.h" -#include "include/kernel_vendor.h" +#include "inc_hash_constants.h" +#include "inc_vendor.cl" #define DGST_R0 3 #define DGST_R1 4 #define DGST_R2 2 #define DGST_R3 1 -#include "include/kernel_functions.c" -#include "OpenCL/types_ocl.c" -#include "OpenCL/common.c" -#include "OpenCL/simd.c" +#include "inc_hash_functions.cl" +#include "inc_types.cl" +#include "inc_common.cl" +#include "inc_simd.cl" // no unicode yet diff --git a/OpenCL/m00130_a3.cl b/OpenCL/m00130_a3.cl index a9689b0..96fe640 100644 --- a/OpenCL/m00130_a3.cl +++ b/OpenCL/m00130_a3.cl @@ -7,18 +7,18 @@ #define NEW_SIMD_CODE -#include "include/constants.h" -#include "include/kernel_vendor.h" +#include "inc_hash_constants.h" +#include "inc_vendor.cl" #define DGST_R0 3 #define DGST_R1 4 #define DGST_R2 2 #define DGST_R3 1 -#include "include/kernel_functions.c" -#include "OpenCL/types_ocl.c" -#include "OpenCL/common.c" -#include "OpenCL/simd.c" +#include "inc_hash_functions.cl" +#include "inc_types.cl" +#include "inc_common.cl" +#include "inc_simd.cl" void m00130m (u32 w[16], const u32 pw_len, __global pw_t *pws, __global kernel_rule_t *rules_buf, __global comb_t *combs_buf, __constant u32x * words_buf_r, __global void *tmps, __global void *hooks, __global u32 *bitmaps_buf_s1_a, __global u32 *bitmaps_buf_s1_b, __global u32 *bitmaps_buf_s1_c, __global u32 *bitmaps_buf_s1_d, __global u32 *bitmaps_buf_s2_a, __global u32 *bitmaps_buf_s2_b, __global u32 *bitmaps_buf_s2_c, __global u32 *bitmaps_buf_s2_d, __global plain_t *plains_buf, __global digest_t *digests_buf, __global u32 *hashes_shown, __global salt_t *salt_bufs, __global void *esalt_bufs, __global u32 *d_return_buf, __global u32 *d_scryptV_buf, const u32 bitmap_mask, const u32 bitmap_shift1, const u32 bitmap_shift2, const u32 salt_pos, const u32 loop_pos, const u32 loop_cnt, const u32 il_cnt, const u32 digests_cnt, const u32 digests_offset) { diff --git a/OpenCL/m00140_a0.cl b/OpenCL/m00140_a0.cl index f92ccb6..066f9bf 100644 --- a/OpenCL/m00140_a0.cl +++ b/OpenCL/m00140_a0.cl @@ -7,20 +7,20 @@ #define NEW_SIMD_CODE -#include "include/constants.h" -#include "include/kernel_vendor.h" +#include "inc_hash_constants.h" +#include "inc_vendor.cl" #define DGST_R0 3 #define DGST_R1 4 #define DGST_R2 2 #define DGST_R3 1 -#include "include/kernel_functions.c" -#include "OpenCL/types_ocl.c" -#include "OpenCL/common.c" -#include "include/rp_kernel.h" -#include "OpenCL/rp.c" -#include "OpenCL/simd.c" +#include "inc_hash_functions.cl" +#include "inc_types.cl" +#include "inc_common.cl" +#include "inc_rp.h" +#include "inc_rp.cl" +#include "inc_simd.cl" // no unicode yet diff --git a/OpenCL/m00140_a1.cl b/OpenCL/m00140_a1.cl index 50cef28..36a0f92 100644 --- a/OpenCL/m00140_a1.cl +++ b/OpenCL/m00140_a1.cl @@ -7,18 +7,18 @@ #define NEW_SIMD_CODE -#include "include/constants.h" -#include "include/kernel_vendor.h" +#include "inc_hash_constants.h" +#include "inc_vendor.cl" #define DGST_R0 3 #define DGST_R1 4 #define DGST_R2 2 #define DGST_R3 1 -#include "include/kernel_functions.c" -#include "OpenCL/types_ocl.c" -#include "OpenCL/common.c" -#include "OpenCL/simd.c" +#include "inc_hash_functions.cl" +#include "inc_types.cl" +#include "inc_common.cl" +#include "inc_simd.cl" // no unicode yet diff --git a/OpenCL/m00140_a3.cl b/OpenCL/m00140_a3.cl index 0dd5758..3439437 100644 --- a/OpenCL/m00140_a3.cl +++ b/OpenCL/m00140_a3.cl @@ -7,18 +7,18 @@ #define NEW_SIMD_CODE -#include "include/constants.h" -#include "include/kernel_vendor.h" +#include "inc_hash_constants.h" +#include "inc_vendor.cl" #define DGST_R0 3 #define DGST_R1 4 #define DGST_R2 2 #define DGST_R3 1 -#include "include/kernel_functions.c" -#include "OpenCL/types_ocl.c" -#include "OpenCL/common.c" -#include "OpenCL/simd.c" +#include "inc_hash_functions.cl" +#include "inc_types.cl" +#include "inc_common.cl" +#include "inc_simd.cl" void m00140m (u32 w0[4], u32 w1[4], u32 w2[4], u32 w3[4], const u32 pw_len, __global pw_t *pws, __global kernel_rule_t *rules_buf, __global comb_t *combs_buf, __global bf_t *bfs_buf, __global void *tmps, __global void *hooks, __global u32 *bitmaps_buf_s1_a, __global u32 *bitmaps_buf_s1_b, __global u32 *bitmaps_buf_s1_c, __global u32 *bitmaps_buf_s1_d, __global u32 *bitmaps_buf_s2_a, __global u32 *bitmaps_buf_s2_b, __global u32 *bitmaps_buf_s2_c, __global u32 *bitmaps_buf_s2_d, __global plain_t *plains_buf, __global digest_t *digests_buf, __global u32 *hashes_shown, __global salt_t *salt_bufs, __global void *esalt_bufs, __global u32 *d_return_buf, __global u32 *d_scryptV_buf, const u32 bitmap_mask, const u32 bitmap_shift1, const u32 bitmap_shift2, const u32 salt_pos, const u32 loop_pos, const u32 loop_cnt, const u32 il_cnt, const u32 digests_cnt, const u32 digests_offset) { diff --git a/OpenCL/m00150_a0.cl b/OpenCL/m00150_a0.cl index 68df4b4..022208a 100644 --- a/OpenCL/m00150_a0.cl +++ b/OpenCL/m00150_a0.cl @@ -7,20 +7,20 @@ #define NEW_SIMD_CODE -#include "include/constants.h" -#include "include/kernel_vendor.h" +#include "inc_hash_constants.h" +#include "inc_vendor.cl" #define DGST_R0 3 #define DGST_R1 4 #define DGST_R2 2 #define DGST_R3 1 -#include "include/kernel_functions.c" -#include "OpenCL/types_ocl.c" -#include "OpenCL/common.c" -#include "include/rp_kernel.h" -#include "OpenCL/rp.c" -#include "OpenCL/simd.c" +#include "inc_hash_functions.cl" +#include "inc_types.cl" +#include "inc_common.cl" +#include "inc_rp.h" +#include "inc_rp.cl" +#include "inc_simd.cl" void sha1_transform (const u32x w0[4], const u32x w1[4], const u32x w2[4], const u32x w3[4], u32x digest[5]) { diff --git a/OpenCL/m00150_a1.cl b/OpenCL/m00150_a1.cl index 22ecebb..9a0e150 100644 --- a/OpenCL/m00150_a1.cl +++ b/OpenCL/m00150_a1.cl @@ -7,18 +7,18 @@ #define NEW_SIMD_CODE -#include "include/constants.h" -#include "include/kernel_vendor.h" +#include "inc_hash_constants.h" +#include "inc_vendor.cl" #define DGST_R0 3 #define DGST_R1 4 #define DGST_R2 2 #define DGST_R3 1 -#include "include/kernel_functions.c" -#include "OpenCL/types_ocl.c" -#include "OpenCL/common.c" -#include "OpenCL/simd.c" +#include "inc_hash_functions.cl" +#include "inc_types.cl" +#include "inc_common.cl" +#include "inc_simd.cl" void sha1_transform (const u32x w0[4], const u32x w1[4], const u32x w2[4], const u32x w3[4], u32x digest[5]) { diff --git a/OpenCL/m00150_a3.cl b/OpenCL/m00150_a3.cl index 1e9c5ec..35d1790 100644 --- a/OpenCL/m00150_a3.cl +++ b/OpenCL/m00150_a3.cl @@ -7,18 +7,18 @@ #define NEW_SIMD_CODE -#include "include/constants.h" -#include "include/kernel_vendor.h" +#include "inc_hash_constants.h" +#include "inc_vendor.cl" #define DGST_R0 3 #define DGST_R1 4 #define DGST_R2 2 #define DGST_R3 1 -#include "include/kernel_functions.c" -#include "OpenCL/types_ocl.c" -#include "OpenCL/common.c" -#include "OpenCL/simd.c" +#include "inc_hash_functions.cl" +#include "inc_types.cl" +#include "inc_common.cl" +#include "inc_simd.cl" void sha1_transform (const u32x w0[4], const u32x w1[4], const u32x w2[4], const u32x w3[4], u32x digest[5]) { diff --git a/OpenCL/m00160_a0.cl b/OpenCL/m00160_a0.cl index e5d8bcf..a3c0813 100644 --- a/OpenCL/m00160_a0.cl +++ b/OpenCL/m00160_a0.cl @@ -7,20 +7,20 @@ #define NEW_SIMD_CODE -#include "include/constants.h" -#include "include/kernel_vendor.h" +#include "inc_hash_constants.h" +#include "inc_vendor.cl" #define DGST_R0 3 #define DGST_R1 4 #define DGST_R2 2 #define DGST_R3 1 -#include "include/kernel_functions.c" -#include "OpenCL/types_ocl.c" -#include "OpenCL/common.c" -#include "include/rp_kernel.h" -#include "OpenCL/rp.c" -#include "OpenCL/simd.c" +#include "inc_hash_functions.cl" +#include "inc_types.cl" +#include "inc_common.cl" +#include "inc_rp.h" +#include "inc_rp.cl" +#include "inc_simd.cl" void sha1_transform (const u32x w0[4], const u32x w1[4], const u32x w2[4], const u32x w3[4], u32x digest[5]) { diff --git a/OpenCL/m00160_a1.cl b/OpenCL/m00160_a1.cl index 8427e86..370a7a0 100644 --- a/OpenCL/m00160_a1.cl +++ b/OpenCL/m00160_a1.cl @@ -7,18 +7,18 @@ #define NEW_SIMD_CODE -#include "include/constants.h" -#include "include/kernel_vendor.h" +#include "inc_hash_constants.h" +#include "inc_vendor.cl" #define DGST_R0 3 #define DGST_R1 4 #define DGST_R2 2 #define DGST_R3 1 -#include "include/kernel_functions.c" -#include "OpenCL/types_ocl.c" -#include "OpenCL/common.c" -#include "OpenCL/simd.c" +#include "inc_hash_functions.cl" +#include "inc_types.cl" +#include "inc_common.cl" +#include "inc_simd.cl" void sha1_transform (const u32x w0[4], const u32x w1[4], const u32x w2[4], const u32x w3[4], u32x digest[5]) { diff --git a/OpenCL/m00160_a3.cl b/OpenCL/m00160_a3.cl index c7afc3f..4bb85c7 100644 --- a/OpenCL/m00160_a3.cl +++ b/OpenCL/m00160_a3.cl @@ -7,18 +7,18 @@ #define NEW_SIMD_CODE -#include "include/constants.h" -#include "include/kernel_vendor.h" +#include "inc_hash_constants.h" +#include "inc_vendor.cl" #define DGST_R0 3 #define DGST_R1 4 #define DGST_R2 2 #define DGST_R3 1 -#include "include/kernel_functions.c" -#include "OpenCL/types_ocl.c" -#include "OpenCL/common.c" -#include "OpenCL/simd.c" +#include "inc_hash_functions.cl" +#include "inc_types.cl" +#include "inc_common.cl" +#include "inc_simd.cl" void sha1_transform (const u32x w0[4], const u32x w1[4], const u32x w2[4], const u32x w3[4], u32x digest[5]) { diff --git a/OpenCL/m00190_a0.cl b/OpenCL/m00190_a0.cl index 2929228..bc88d6f 100644 --- a/OpenCL/m00190_a0.cl +++ b/OpenCL/m00190_a0.cl @@ -7,20 +7,20 @@ #define NEW_SIMD_CODE -#include "include/constants.h" -#include "include/kernel_vendor.h" +#include "inc_hash_constants.h" +#include "inc_vendor.cl" #define DGST_R0 0 #define DGST_R1 4 #define DGST_R2 3 #define DGST_R3 2 -#include "include/kernel_functions.c" -#include "OpenCL/types_ocl.c" -#include "OpenCL/common.c" -#include "include/rp_kernel.h" -#include "OpenCL/rp.c" -#include "OpenCL/simd.c" +#include "inc_hash_functions.cl" +#include "inc_types.cl" +#include "inc_common.cl" +#include "inc_rp.h" +#include "inc_rp.cl" +#include "inc_simd.cl" __kernel void m00190_m04 (__global pw_t *pws, __global kernel_rule_t *rules_buf, __global comb_t *combs_buf, __global bf_t *bfs_buf, __global void *tmps, __global void *hooks, __global u32 *bitmaps_buf_s1_a, __global u32 *bitmaps_buf_s1_b, __global u32 *bitmaps_buf_s1_c, __global u32 *bitmaps_buf_s1_d, __global u32 *bitmaps_buf_s2_a, __global u32 *bitmaps_buf_s2_b, __global u32 *bitmaps_buf_s2_c, __global u32 *bitmaps_buf_s2_d, __global plain_t *plains_buf, __global digest_t *digests_buf, __global u32 *hashes_shown, __global salt_t *salt_bufs, __global void *esalt_bufs, __global u32 *d_return_buf, __global u32 *d_scryptV_buf, const u32 bitmap_mask, const u32 bitmap_shift1, const u32 bitmap_shift2, const u32 salt_pos, const u32 loop_pos, const u32 loop_cnt, const u32 il_cnt, const u32 digests_cnt, const u32 digests_offset, const u32 combs_mode, const u32 gid_max) { diff --git a/OpenCL/m00190_a1.cl b/OpenCL/m00190_a1.cl index db57ca0..ac60807 100644 --- a/OpenCL/m00190_a1.cl +++ b/OpenCL/m00190_a1.cl @@ -7,18 +7,18 @@ #define NEW_SIMD_CODE -#include "include/constants.h" -#include "include/kernel_vendor.h" +#include "inc_hash_constants.h" +#include "inc_vendor.cl" #define DGST_R0 0 #define DGST_R1 4 #define DGST_R2 3 #define DGST_R3 2 -#include "include/kernel_functions.c" -#include "OpenCL/types_ocl.c" -#include "OpenCL/common.c" -#include "OpenCL/simd.c" +#include "inc_hash_functions.cl" +#include "inc_types.cl" +#include "inc_common.cl" +#include "inc_simd.cl" __kernel void m00190_m04 (__global pw_t *pws, __global kernel_rule_t *rules_buf, __global comb_t *combs_buf, __global bf_t *bfs_buf, __global void *tmps, __global void *hooks, __global u32 *bitmaps_buf_s1_a, __global u32 *bitmaps_buf_s1_b, __global u32 *bitmaps_buf_s1_c, __global u32 *bitmaps_buf_s1_d, __global u32 *bitmaps_buf_s2_a, __global u32 *bitmaps_buf_s2_b, __global u32 *bitmaps_buf_s2_c, __global u32 *bitmaps_buf_s2_d, __global plain_t *plains_buf, __global digest_t *digests_buf, __global u32 *hashes_shown, __global salt_t *salt_bufs, __global void *esalt_bufs, __global u32 *d_return_buf, __global u32 *d_scryptV_buf, const u32 bitmap_mask, const u32 bitmap_shift1, const u32 bitmap_shift2, const u32 salt_pos, const u32 loop_pos, const u32 loop_cnt, const u32 il_cnt, const u32 digests_cnt, const u32 digests_offset, const u32 combs_mode, const u32 gid_max) { diff --git a/OpenCL/m00190_a3.cl b/OpenCL/m00190_a3.cl index 15716ed..61d8ece 100644 --- a/OpenCL/m00190_a3.cl +++ b/OpenCL/m00190_a3.cl @@ -7,18 +7,18 @@ #define NEW_SIMD_CODE -#include "include/constants.h" -#include "include/kernel_vendor.h" +#include "inc_hash_constants.h" +#include "inc_vendor.cl" #define DGST_R0 0 #define DGST_R1 4 #define DGST_R2 3 #define DGST_R3 2 -#include "include/kernel_functions.c" -#include "OpenCL/types_ocl.c" -#include "OpenCL/common.c" -#include "OpenCL/simd.c" +#include "inc_hash_functions.cl" +#include "inc_types.cl" +#include "inc_common.cl" +#include "inc_simd.cl" void m00190m (u32 w[16], const u32 pw_len, __global pw_t *pws, __global kernel_rule_t *rules_buf, __global comb_t *combs_buf, __constant u32x * words_buf_r, __global void *tmps, __global void *hooks, __global u32 *bitmaps_buf_s1_a, __global u32 *bitmaps_buf_s1_b, __global u32 *bitmaps_buf_s1_c, __global u32 *bitmaps_buf_s1_d, __global u32 *bitmaps_buf_s2_a, __global u32 *bitmaps_buf_s2_b, __global u32 *bitmaps_buf_s2_c, __global u32 *bitmaps_buf_s2_d, __global plain_t *plains_buf, __global digest_t *digests_buf, __global u32 *hashes_shown, __global salt_t *salt_bufs, __global void *esalt_bufs, __global u32 *d_return_buf, __global u32 *d_scryptV_buf, const u32 bitmap_mask, const u32 bitmap_shift1, const u32 bitmap_shift2, const u32 salt_pos, const u32 loop_pos, const u32 loop_cnt, const u32 il_cnt, const u32 digests_cnt, const u32 digests_offset) { diff --git a/OpenCL/m00200_a0.cl b/OpenCL/m00200_a0.cl index 8f58b40..febb350 100644 --- a/OpenCL/m00200_a0.cl +++ b/OpenCL/m00200_a0.cl @@ -8,20 +8,20 @@ //incompatible //#define NEW_SIMD_CODE -#include "include/constants.h" -#include "include/kernel_vendor.h" +#include "inc_hash_constants.h" +#include "inc_vendor.cl" #define DGST_R0 0 #define DGST_R1 1 #define DGST_R2 2 #define DGST_R3 3 -#include "include/kernel_functions.c" -#include "OpenCL/types_ocl.c" -#include "OpenCL/common.c" -#include "include/rp_kernel.h" -#include "OpenCL/rp.c" -#include "OpenCL/simd.c" +#include "inc_hash_functions.cl" +#include "inc_types.cl" +#include "inc_common.cl" +#include "inc_rp.h" +#include "inc_rp.cl" +#include "inc_simd.cl" __kernel void m00200_m04 (__global pw_t *pws, __global kernel_rule_t *rules_buf, __global comb_t *combs_buf, __global bf_t *bfs_buf, __global void *tmps, __global void *hooks, __global u32 *bitmaps_buf_s1_a, __global u32 *bitmaps_buf_s1_b, __global u32 *bitmaps_buf_s1_c, __global u32 *bitmaps_buf_s1_d, __global u32 *bitmaps_buf_s2_a, __global u32 *bitmaps_buf_s2_b, __global u32 *bitmaps_buf_s2_c, __global u32 *bitmaps_buf_s2_d, __global plain_t *plains_buf, __global digest_t *digests_buf, __global u32 *hashes_shown, __global salt_t *salt_bufs, __global void *esalt_bufs, __global u32 *d_return_buf, __global u32 *d_scryptV_buf, const u32 bitmap_mask, const u32 bitmap_shift1, const u32 bitmap_shift2, const u32 salt_pos, const u32 loop_pos, const u32 loop_cnt, const u32 il_cnt, const u32 digests_cnt, const u32 digests_offset, const u32 combs_mode, const u32 gid_max) { diff --git a/OpenCL/m00200_a1.cl b/OpenCL/m00200_a1.cl index 8ce0b86..390d182 100644 --- a/OpenCL/m00200_a1.cl +++ b/OpenCL/m00200_a1.cl @@ -8,18 +8,18 @@ //incompatible //#define NEW_SIMD_CODE -#include "include/constants.h" -#include "include/kernel_vendor.h" +#include "inc_hash_constants.h" +#include "inc_vendor.cl" #define DGST_R0 0 #define DGST_R1 1 #define DGST_R2 2 #define DGST_R3 3 -#include "include/kernel_functions.c" -#include "OpenCL/types_ocl.c" -#include "OpenCL/common.c" -#include "OpenCL/simd.c" +#include "inc_hash_functions.cl" +#include "inc_types.cl" +#include "inc_common.cl" +#include "inc_simd.cl" __kernel void m00200_m04 (__global pw_t *pws, __global kernel_rule_t *rules_buf, __global comb_t *combs_buf, __global bf_t *bfs_buf, __global void *tmps, __global void *hooks, __global u32 *bitmaps_buf_s1_a, __global u32 *bitmaps_buf_s1_b, __global u32 *bitmaps_buf_s1_c, __global u32 *bitmaps_buf_s1_d, __global u32 *bitmaps_buf_s2_a, __global u32 *bitmaps_buf_s2_b, __global u32 *bitmaps_buf_s2_c, __global u32 *bitmaps_buf_s2_d, __global plain_t *plains_buf, __global digest_t *digests_buf, __global u32 *hashes_shown, __global salt_t *salt_bufs, __global void *esalt_bufs, __global u32 *d_return_buf, __global u32 *d_scryptV_buf, const u32 bitmap_mask, const u32 bitmap_shift1, const u32 bitmap_shift2, const u32 salt_pos, const u32 loop_pos, const u32 loop_cnt, const u32 il_cnt, const u32 digests_cnt, const u32 digests_offset, const u32 combs_mode, const u32 gid_max) { diff --git a/OpenCL/m00200_a3.cl b/OpenCL/m00200_a3.cl index 27a10c5..7605dd8 100644 --- a/OpenCL/m00200_a3.cl +++ b/OpenCL/m00200_a3.cl @@ -7,18 +7,18 @@ #define NEW_SIMD_CODE -#include "include/constants.h" -#include "include/kernel_vendor.h" +#include "inc_hash_constants.h" +#include "inc_vendor.cl" #define DGST_R0 0 #define DGST_R1 1 #define DGST_R2 2 #define DGST_R3 3 -#include "include/kernel_functions.c" -#include "OpenCL/types_ocl.c" -#include "OpenCL/common.c" -#include "OpenCL/simd.c" +#include "inc_hash_functions.cl" +#include "inc_types.cl" +#include "inc_common.cl" +#include "inc_simd.cl" #define ROUND(v) \ { \ diff --git a/OpenCL/m00300_a0.cl b/OpenCL/m00300_a0.cl index c083b02..c202bbc 100644 --- a/OpenCL/m00300_a0.cl +++ b/OpenCL/m00300_a0.cl @@ -7,20 +7,20 @@ #define NEW_SIMD_CODE -#include "include/constants.h" -#include "include/kernel_vendor.h" +#include "inc_hash_constants.h" +#include "inc_vendor.cl" #define DGST_R0 3 #define DGST_R1 4 #define DGST_R2 2 #define DGST_R3 1 -#include "include/kernel_functions.c" -#include "OpenCL/types_ocl.c" -#include "OpenCL/common.c" -#include "include/rp_kernel.h" -#include "OpenCL/rp.c" -#include "OpenCL/simd.c" +#include "inc_hash_functions.cl" +#include "inc_types.cl" +#include "inc_common.cl" +#include "inc_rp.h" +#include "inc_rp.cl" +#include "inc_simd.cl" __kernel void m00300_m04 (__global pw_t *pws, __global kernel_rule_t *rules_buf, __global comb_t *combs_buf, __global bf_t *bfs_buf, __global void *tmps, __global void *hooks, __global u32 *bitmaps_buf_s1_a, __global u32 *bitmaps_buf_s1_b, __global u32 *bitmaps_buf_s1_c, __global u32 *bitmaps_buf_s1_d, __global u32 *bitmaps_buf_s2_a, __global u32 *bitmaps_buf_s2_b, __global u32 *bitmaps_buf_s2_c, __global u32 *bitmaps_buf_s2_d, __global plain_t *plains_buf, __global digest_t *digests_buf, __global u32 *hashes_shown, __global salt_t *salt_bufs, __global void *esalt_bufs, __global u32 *d_return_buf, __global u32 *d_scryptV_buf, const u32 bitmap_mask, const u32 bitmap_shift1, const u32 bitmap_shift2, const u32 salt_pos, const u32 loop_pos, const u32 loop_cnt, const u32 il_cnt, const u32 digests_cnt, const u32 digests_offset, const u32 combs_mode, const u32 gid_max) { diff --git a/OpenCL/m00300_a1.cl b/OpenCL/m00300_a1.cl index 2af68fe..367751e 100644 --- a/OpenCL/m00300_a1.cl +++ b/OpenCL/m00300_a1.cl @@ -7,18 +7,18 @@ #define NEW_SIMD_CODE -#include "include/constants.h" -#include "include/kernel_vendor.h" +#include "inc_hash_constants.h" +#include "inc_vendor.cl" #define DGST_R0 3 #define DGST_R1 4 #define DGST_R2 2 #define DGST_R3 1 -#include "include/kernel_functions.c" -#include "OpenCL/types_ocl.c" -#include "OpenCL/common.c" -#include "OpenCL/simd.c" +#include "inc_hash_functions.cl" +#include "inc_types.cl" +#include "inc_common.cl" +#include "inc_simd.cl" __kernel void m00300_m04 (__global pw_t *pws, __global kernel_rule_t *rules_buf, __global comb_t *combs_buf, __global bf_t *bfs_buf, __global void *tmps, __global void *hooks, __global u32 *bitmaps_buf_s1_a, __global u32 *bitmaps_buf_s1_b, __global u32 *bitmaps_buf_s1_c, __global u32 *bitmaps_buf_s1_d, __global u32 *bitmaps_buf_s2_a, __global u32 *bitmaps_buf_s2_b, __global u32 *bitmaps_buf_s2_c, __global u32 *bitmaps_buf_s2_d, __global plain_t *plains_buf, __global digest_t *digests_buf, __global u32 *hashes_shown, __global salt_t *salt_bufs, __global void *esalt_bufs, __global u32 *d_return_buf, __global u32 *d_scryptV_buf, const u32 bitmap_mask, const u32 bitmap_shift1, const u32 bitmap_shift2, const u32 salt_pos, const u32 loop_pos, const u32 loop_cnt, const u32 il_cnt, const u32 digests_cnt, const u32 digests_offset, const u32 combs_mode, const u32 gid_max) { diff --git a/OpenCL/m00300_a3.cl b/OpenCL/m00300_a3.cl index b722c7a..0f1cfce 100644 --- a/OpenCL/m00300_a3.cl +++ b/OpenCL/m00300_a3.cl @@ -7,18 +7,18 @@ #define NEW_SIMD_CODE -#include "include/constants.h" -#include "include/kernel_vendor.h" +#include "inc_hash_constants.h" +#include "inc_vendor.cl" #define DGST_R0 3 #define DGST_R1 4 #define DGST_R2 2 #define DGST_R3 1 -#include "include/kernel_functions.c" -#include "OpenCL/types_ocl.c" -#include "OpenCL/common.c" -#include "OpenCL/simd.c" +#include "inc_hash_functions.cl" +#include "inc_types.cl" +#include "inc_common.cl" +#include "inc_simd.cl" void m00300m (u32 w[16], const u32 pw_len, __global pw_t *pws, __global kernel_rule_t *rules_buf, __global comb_t *combs_buf, __constant u32x * words_buf_r, __global void *tmps, __global void *hooks, __global u32 *bitmaps_buf_s1_a, __global u32 *bitmaps_buf_s1_b, __global u32 *bitmaps_buf_s1_c, __global u32 *bitmaps_buf_s1_d, __global u32 *bitmaps_buf_s2_a, __global u32 *bitmaps_buf_s2_b, __global u32 *bitmaps_buf_s2_c, __global u32 *bitmaps_buf_s2_d, __global plain_t *plains_buf, __global digest_t *digests_buf, __global u32 *hashes_shown, __global salt_t *salt_bufs, __global void *esalt_bufs, __global u32 *d_return_buf, __global u32 *d_scryptV_buf, const u32 bitmap_mask, const u32 bitmap_shift1, const u32 bitmap_shift2, const u32 salt_pos, const u32 loop_pos, const u32 loop_cnt, const u32 il_cnt, const u32 digests_cnt, const u32 digests_offset) { diff --git a/OpenCL/m00400.cl b/OpenCL/m00400.cl index d8edbcb..c220977 100644 --- a/OpenCL/m00400.cl +++ b/OpenCL/m00400.cl @@ -7,21 +7,21 @@ #define NEW_SIMD_CODE -#include "include/constants.h" -#include "include/kernel_vendor.h" +#include "inc_hash_constants.h" +#include "inc_vendor.cl" #define DGST_R0 0 #define DGST_R1 1 #define DGST_R2 2 #define DGST_R3 3 -#include "include/kernel_functions.c" -#include "OpenCL/types_ocl.c" -#include "OpenCL/common.c" -#include "OpenCL/simd.c" +#include "inc_hash_functions.cl" +#include "inc_types.cl" +#include "inc_common.cl" +#include "inc_simd.cl" -#define COMPARE_S "OpenCL/check_single_comp4.c" -#define COMPARE_M "OpenCL/check_multi_comp4.c" +#define COMPARE_S "inc_comp_single.cl" +#define COMPARE_M "inc_comp_multi.cl" void md5_transform_S (const u32 w0[4], const u32 w1[4], const u32 w2[4], const u32 w3[4], u32 digest[4]) { diff --git a/OpenCL/m00500.cl b/OpenCL/m00500.cl index 6fbc6d3..462e4ee 100644 --- a/OpenCL/m00500.cl +++ b/OpenCL/m00500.cl @@ -5,20 +5,20 @@ #define _MD5_ -#include "include/constants.h" -#include "include/kernel_vendor.h" +#include "inc_hash_constants.h" +#include "inc_vendor.cl" #define DGST_R0 0 #define DGST_R1 1 #define DGST_R2 2 #define DGST_R3 3 -#include "include/kernel_functions.c" -#include "OpenCL/types_ocl.c" -#include "OpenCL/common.c" +#include "inc_hash_functions.cl" +#include "inc_types.cl" +#include "inc_common.cl" -#define COMPARE_S "OpenCL/check_single_comp4.c" -#define COMPARE_M "OpenCL/check_multi_comp4.c" +#define COMPARE_S "inc_comp_single.cl" +#define COMPARE_M "inc_comp_multi.cl" #define md5crypt_magic 0x00243124u diff --git a/OpenCL/m00900_a0.cl b/OpenCL/m00900_a0.cl index 376b83e..2cb123c 100644 --- a/OpenCL/m00900_a0.cl +++ b/OpenCL/m00900_a0.cl @@ -7,20 +7,20 @@ #define NEW_SIMD_CODE -#include "include/constants.h" -#include "include/kernel_vendor.h" +#include "inc_hash_constants.h" +#include "inc_vendor.cl" #define DGST_R0 0 #define DGST_R1 3 #define DGST_R2 2 #define DGST_R3 1 -#include "include/kernel_functions.c" -#include "OpenCL/types_ocl.c" -#include "OpenCL/common.c" -#include "include/rp_kernel.h" -#include "OpenCL/rp.c" -#include "OpenCL/simd.c" +#include "inc_hash_functions.cl" +#include "inc_types.cl" +#include "inc_common.cl" +#include "inc_rp.h" +#include "inc_rp.cl" +#include "inc_simd.cl" __kernel void m00900_m04 (__global pw_t *pws, __global kernel_rule_t *rules_buf, __global comb_t *combs_buf, __global bf_t *bfs_buf, __global void *tmps, __global void *hooks, __global u32 *bitmaps_buf_s1_a, __global u32 *bitmaps_buf_s1_b, __global u32 *bitmaps_buf_s1_c, __global u32 *bitmaps_buf_s1_d, __global u32 *bitmaps_buf_s2_a, __global u32 *bitmaps_buf_s2_b, __global u32 *bitmaps_buf_s2_c, __global u32 *bitmaps_buf_s2_d, __global plain_t *plains_buf, __global digest_t *digests_buf, __global u32 *hashes_shown, __global salt_t *salt_bufs, __global void *esalt_bufs, __global u32 *d_return_buf, __global u32 *d_scryptV_buf, const u32 bitmap_mask, const u32 bitmap_shift1, const u32 bitmap_shift2, const u32 salt_pos, const u32 loop_pos, const u32 loop_cnt, const u32 il_cnt, const u32 digests_cnt, const u32 digests_offset, const u32 combs_mode, const u32 gid_max) { diff --git a/OpenCL/m00900_a1.cl b/OpenCL/m00900_a1.cl index d7d26f5..26b2119 100644 --- a/OpenCL/m00900_a1.cl +++ b/OpenCL/m00900_a1.cl @@ -7,18 +7,18 @@ #define NEW_SIMD_CODE -#include "include/constants.h" -#include "include/kernel_vendor.h" +#include "inc_hash_constants.h" +#include "inc_vendor.cl" #define DGST_R0 0 #define DGST_R1 3 #define DGST_R2 2 #define DGST_R3 1 -#include "include/kernel_functions.c" -#include "OpenCL/types_ocl.c" -#include "OpenCL/common.c" -#include "OpenCL/simd.c" +#include "inc_hash_functions.cl" +#include "inc_types.cl" +#include "inc_common.cl" +#include "inc_simd.cl" __kernel void m00900_m04 (__global pw_t *pws, __global kernel_rule_t *rules_buf, __global comb_t *combs_buf, __global bf_t *bfs_buf, __global void *tmps, __global void *hooks, __global u32 *bitmaps_buf_s1_a, __global u32 *bitmaps_buf_s1_b, __global u32 *bitmaps_buf_s1_c, __global u32 *bitmaps_buf_s1_d, __global u32 *bitmaps_buf_s2_a, __global u32 *bitmaps_buf_s2_b, __global u32 *bitmaps_buf_s2_c, __global u32 *bitmaps_buf_s2_d, __global plain_t *plains_buf, __global digest_t *digests_buf, __global u32 *hashes_shown, __global salt_t *salt_bufs, __global void *esalt_bufs, __global u32 *d_return_buf, __global u32 *d_scryptV_buf, const u32 bitmap_mask, const u32 bitmap_shift1, const u32 bitmap_shift2, const u32 salt_pos, const u32 loop_pos, const u32 loop_cnt, const u32 il_cnt, const u32 digests_cnt, const u32 digests_offset, const u32 combs_mode, const u32 gid_max) { diff --git a/OpenCL/m00900_a3.cl b/OpenCL/m00900_a3.cl index 5170c0e..2bbf306 100644 --- a/OpenCL/m00900_a3.cl +++ b/OpenCL/m00900_a3.cl @@ -7,18 +7,18 @@ #define NEW_SIMD_CODE -#include "include/constants.h" -#include "include/kernel_vendor.h" +#include "inc_hash_constants.h" +#include "inc_vendor.cl" #define DGST_R0 0 #define DGST_R1 3 #define DGST_R2 2 #define DGST_R3 1 -#include "include/kernel_functions.c" -#include "OpenCL/types_ocl.c" -#include "OpenCL/common.c" -#include "OpenCL/simd.c" +#include "inc_hash_functions.cl" +#include "inc_types.cl" +#include "inc_common.cl" +#include "inc_simd.cl" #define MD4_STEP_REV(f,a,b,c,d,x,t,s) \ { \ diff --git a/OpenCL/m01000_a0.cl b/OpenCL/m01000_a0.cl index 70fc825..1355f15 100644 --- a/OpenCL/m01000_a0.cl +++ b/OpenCL/m01000_a0.cl @@ -7,20 +7,20 @@ #define NEW_SIMD_CODE -#include "include/constants.h" -#include "include/kernel_vendor.h" +#include "inc_hash_constants.h" +#include "inc_vendor.cl" #define DGST_R0 0 #define DGST_R1 3 #define DGST_R2 2 #define DGST_R3 1 -#include "include/kernel_functions.c" -#include "OpenCL/types_ocl.c" -#include "OpenCL/common.c" -#include "include/rp_kernel.h" -#include "OpenCL/rp.c" -#include "OpenCL/simd.c" +#include "inc_hash_functions.cl" +#include "inc_types.cl" +#include "inc_common.cl" +#include "inc_rp.h" +#include "inc_rp.cl" +#include "inc_simd.cl" __kernel void m01000_m04 (__global pw_t *pws, __global kernel_rule_t *rules_buf, __global comb_t *combs_buf, __global bf_t *bfs_buf, __global void *tmps, __global void *hooks, __global u32 *bitmaps_buf_s1_a, __global u32 *bitmaps_buf_s1_b, __global u32 *bitmaps_buf_s1_c, __global u32 *bitmaps_buf_s1_d, __global u32 *bitmaps_buf_s2_a, __global u32 *bitmaps_buf_s2_b, __global u32 *bitmaps_buf_s2_c, __global u32 *bitmaps_buf_s2_d, __global plain_t *plains_buf, __global digest_t *digests_buf, __global u32 *hashes_shown, __global salt_t *salt_bufs, __global void *esalt_bufs, __global u32 *d_return_buf, __global u32 *d_scryptV_buf, const u32 bitmap_mask, const u32 bitmap_shift1, const u32 bitmap_shift2, const u32 salt_pos, const u32 loop_pos, const u32 loop_cnt, const u32 il_cnt, const u32 digests_cnt, const u32 digests_offset, const u32 combs_mode, const u32 gid_max) { diff --git a/OpenCL/m01000_a1.cl b/OpenCL/m01000_a1.cl index d5455aa..2c0fcf0 100644 --- a/OpenCL/m01000_a1.cl +++ b/OpenCL/m01000_a1.cl @@ -7,18 +7,18 @@ #define NEW_SIMD_CODE -#include "include/constants.h" -#include "include/kernel_vendor.h" +#include "inc_hash_constants.h" +#include "inc_vendor.cl" #define DGST_R0 0 #define DGST_R1 3 #define DGST_R2 2 #define DGST_R3 1 -#include "include/kernel_functions.c" -#include "OpenCL/types_ocl.c" -#include "OpenCL/common.c" -#include "OpenCL/simd.c" +#include "inc_hash_functions.cl" +#include "inc_types.cl" +#include "inc_common.cl" +#include "inc_simd.cl" __kernel void m01000_m04 (__global pw_t *pws, __global kernel_rule_t *rules_buf, __global comb_t *combs_buf, __global bf_t *bfs_buf, __global void *tmps, __global void *hooks, __global u32 *bitmaps_buf_s1_a, __global u32 *bitmaps_buf_s1_b, __global u32 *bitmaps_buf_s1_c, __global u32 *bitmaps_buf_s1_d, __global u32 *bitmaps_buf_s2_a, __global u32 *bitmaps_buf_s2_b, __global u32 *bitmaps_buf_s2_c, __global u32 *bitmaps_buf_s2_d, __global plain_t *plains_buf, __global digest_t *digests_buf, __global u32 *hashes_shown, __global salt_t *salt_bufs, __global void *esalt_bufs, __global u32 *d_return_buf, __global u32 *d_scryptV_buf, const u32 bitmap_mask, const u32 bitmap_shift1, const u32 bitmap_shift2, const u32 salt_pos, const u32 loop_pos, const u32 loop_cnt, const u32 il_cnt, const u32 digests_cnt, const u32 digests_offset, const u32 combs_mode, const u32 gid_max) { diff --git a/OpenCL/m01000_a3.cl b/OpenCL/m01000_a3.cl index f8de4c9..02dffee 100644 --- a/OpenCL/m01000_a3.cl +++ b/OpenCL/m01000_a3.cl @@ -7,18 +7,18 @@ #define NEW_SIMD_CODE -#include "include/constants.h" -#include "include/kernel_vendor.h" +#include "inc_hash_constants.h" +#include "inc_vendor.cl" #define DGST_R0 0 #define DGST_R1 3 #define DGST_R2 2 #define DGST_R3 1 -#include "include/kernel_functions.c" -#include "OpenCL/types_ocl.c" -#include "OpenCL/common.c" -#include "OpenCL/simd.c" +#include "inc_hash_functions.cl" +#include "inc_types.cl" +#include "inc_common.cl" +#include "inc_simd.cl" #define MD4_STEP_REV(f,a,b,c,d,x,t,s) \ { \ diff --git a/OpenCL/m01100_a0.cl b/OpenCL/m01100_a0.cl index 1cdce45..e13d20f 100644 --- a/OpenCL/m01100_a0.cl +++ b/OpenCL/m01100_a0.cl @@ -7,20 +7,20 @@ #define NEW_SIMD_CODE -#include "include/constants.h" -#include "include/kernel_vendor.h" +#include "inc_hash_constants.h" +#include "inc_vendor.cl" #define DGST_R0 0 #define DGST_R1 3 #define DGST_R2 2 #define DGST_R3 1 -#include "include/kernel_functions.c" -#include "OpenCL/types_ocl.c" -#include "OpenCL/common.c" -#include "include/rp_kernel.h" -#include "OpenCL/rp.c" -#include "OpenCL/simd.c" +#include "inc_hash_functions.cl" +#include "inc_types.cl" +#include "inc_common.cl" +#include "inc_rp.h" +#include "inc_rp.cl" +#include "inc_simd.cl" __kernel void m01100_m04 (__global pw_t *pws, __global kernel_rule_t *rules_buf, __global comb_t *combs_buf, __global bf_t *bfs_buf, __global void *tmps, __global void *hooks, __global u32 *bitmaps_buf_s1_a, __global u32 *bitmaps_buf_s1_b, __global u32 *bitmaps_buf_s1_c, __global u32 *bitmaps_buf_s1_d, __global u32 *bitmaps_buf_s2_a, __global u32 *bitmaps_buf_s2_b, __global u32 *bitmaps_buf_s2_c, __global u32 *bitmaps_buf_s2_d, __global plain_t *plains_buf, __global digest_t *digests_buf, __global u32 *hashes_shown, __global salt_t *salt_bufs, __global void *esalt_bufs, __global u32 *d_return_buf, __global u32 *d_scryptV_buf, const u32 bitmap_mask, const u32 bitmap_shift1, const u32 bitmap_shift2, const u32 salt_pos, const u32 loop_pos, const u32 loop_cnt, const u32 il_cnt, const u32 digests_cnt, const u32 digests_offset, const u32 combs_mode, const u32 gid_max) { diff --git a/OpenCL/m01100_a1.cl b/OpenCL/m01100_a1.cl index ebde581..fbaba9b 100644 --- a/OpenCL/m01100_a1.cl +++ b/OpenCL/m01100_a1.cl @@ -7,18 +7,18 @@ #define NEW_SIMD_CODE -#include "include/constants.h" -#include "include/kernel_vendor.h" +#include "inc_hash_constants.h" +#include "inc_vendor.cl" #define DGST_R0 0 #define DGST_R1 3 #define DGST_R2 2 #define DGST_R3 1 -#include "include/kernel_functions.c" -#include "OpenCL/types_ocl.c" -#include "OpenCL/common.c" -#include "OpenCL/simd.c" +#include "inc_hash_functions.cl" +#include "inc_types.cl" +#include "inc_common.cl" +#include "inc_simd.cl" __kernel void m01100_m04 (__global pw_t *pws, __global kernel_rule_t *rules_buf, __global comb_t *combs_buf, __global bf_t *bfs_buf, __global void *tmps, __global void *hooks, __global u32 *bitmaps_buf_s1_a, __global u32 *bitmaps_buf_s1_b, __global u32 *bitmaps_buf_s1_c, __global u32 *bitmaps_buf_s1_d, __global u32 *bitmaps_buf_s2_a, __global u32 *bitmaps_buf_s2_b, __global u32 *bitmaps_buf_s2_c, __global u32 *bitmaps_buf_s2_d, __global plain_t *plains_buf, __global digest_t *digests_buf, __global u32 *hashes_shown, __global salt_t *salt_bufs, __global void *esalt_bufs, __global u32 *d_return_buf, __global u32 *d_scryptV_buf, const u32 bitmap_mask, const u32 bitmap_shift1, const u32 bitmap_shift2, const u32 salt_pos, const u32 loop_pos, const u32 loop_cnt, const u32 il_cnt, const u32 digests_cnt, const u32 digests_offset, const u32 combs_mode, const u32 gid_max) { diff --git a/OpenCL/m01100_a3.cl b/OpenCL/m01100_a3.cl index b1f010a..53d62d1 100644 --- a/OpenCL/m01100_a3.cl +++ b/OpenCL/m01100_a3.cl @@ -7,18 +7,18 @@ #define NEW_SIMD_CODE -#include "include/constants.h" -#include "include/kernel_vendor.h" +#include "inc_hash_constants.h" +#include "inc_vendor.cl" #define DGST_R0 0 #define DGST_R1 3 #define DGST_R2 2 #define DGST_R3 1 -#include "include/kernel_functions.c" -#include "OpenCL/types_ocl.c" -#include "OpenCL/common.c" -#include "OpenCL/simd.c" +#include "inc_hash_functions.cl" +#include "inc_types.cl" +#include "inc_common.cl" +#include "inc_simd.cl" void m01100m (u32 w[16], const u32 pw_len, __global pw_t *pws, __global kernel_rule_t *rules_buf, __global comb_t *combs_buf, __constant u32x * words_buf_r, __global void *tmps, __global void *hooks, __global u32 *bitmaps_buf_s1_a, __global u32 *bitmaps_buf_s1_b, __global u32 *bitmaps_buf_s1_c, __global u32 *bitmaps_buf_s1_d, __global u32 *bitmaps_buf_s2_a, __global u32 *bitmaps_buf_s2_b, __global u32 *bitmaps_buf_s2_c, __global u32 *bitmaps_buf_s2_d, __global plain_t *plains_buf, __global digest_t *digests_buf, __global u32 *hashes_shown, __global salt_t *salt_bufs, __global void *esalt_bufs, __global u32 *d_return_buf, __global u32 *d_scryptV_buf, const u32 bitmap_mask, const u32 bitmap_shift1, const u32 bitmap_shift2, const u32 salt_pos, const u32 loop_pos, const u32 loop_cnt, const u32 il_cnt, const u32 digests_cnt, const u32 digests_offset) { diff --git a/OpenCL/m01400_a0.cl b/OpenCL/m01400_a0.cl index 32f694b..3c26ad6 100644 --- a/OpenCL/m01400_a0.cl +++ b/OpenCL/m01400_a0.cl @@ -7,20 +7,20 @@ #define NEW_SIMD_CODE -#include "include/constants.h" -#include "include/kernel_vendor.h" +#include "inc_hash_constants.h" +#include "inc_vendor.cl" #define DGST_R0 3 #define DGST_R1 7 #define DGST_R2 2 #define DGST_R3 6 -#include "include/kernel_functions.c" -#include "OpenCL/types_ocl.c" -#include "OpenCL/common.c" -#include "include/rp_kernel.h" -#include "OpenCL/rp.c" -#include "OpenCL/simd.c" +#include "inc_hash_functions.cl" +#include "inc_types.cl" +#include "inc_common.cl" +#include "inc_rp.h" +#include "inc_rp.cl" +#include "inc_simd.cl" __kernel void m01400_m04 (__global pw_t *pws, __global kernel_rule_t *rules_buf, __global comb_t *combs_buf, __global bf_t *bfs_buf, __global void *tmps, __global void *hooks, __global u32 *bitmaps_buf_s1_a, __global u32 *bitmaps_buf_s1_b, __global u32 *bitmaps_buf_s1_c, __global u32 *bitmaps_buf_s1_d, __global u32 *bitmaps_buf_s2_a, __global u32 *bitmaps_buf_s2_b, __global u32 *bitmaps_buf_s2_c, __global u32 *bitmaps_buf_s2_d, __global plain_t *plains_buf, __global digest_t *digests_buf, __global u32 *hashes_shown, __global salt_t *salt_bufs, __global void *esalt_bufs, __global u32 *d_return_buf, __global u32 *d_scryptV_buf, const u32 bitmap_mask, const u32 bitmap_shift1, const u32 bitmap_shift2, const u32 salt_pos, const u32 loop_pos, const u32 loop_cnt, const u32 il_cnt, const u32 digests_cnt, const u32 digests_offset, const u32 combs_mode, const u32 gid_max) { diff --git a/OpenCL/m01400_a1.cl b/OpenCL/m01400_a1.cl index cc4285a..392ebf3 100644 --- a/OpenCL/m01400_a1.cl +++ b/OpenCL/m01400_a1.cl @@ -7,18 +7,18 @@ #define NEW_SIMD_CODE -#include "include/constants.h" -#include "include/kernel_vendor.h" +#include "inc_hash_constants.h" +#include "inc_vendor.cl" #define DGST_R0 3 #define DGST_R1 7 #define DGST_R2 2 #define DGST_R3 6 -#include "include/kernel_functions.c" -#include "OpenCL/types_ocl.c" -#include "OpenCL/common.c" -#include "OpenCL/simd.c" +#include "inc_hash_functions.cl" +#include "inc_types.cl" +#include "inc_common.cl" +#include "inc_simd.cl" __kernel void m01400_m04 (__global pw_t *pws, __global kernel_rule_t *rules_buf, __global comb_t *combs_buf, __global bf_t *bfs_buf, __global void *tmps, __global void *hooks, __global u32 *bitmaps_buf_s1_a, __global u32 *bitmaps_buf_s1_b, __global u32 *bitmaps_buf_s1_c, __global u32 *bitmaps_buf_s1_d, __global u32 *bitmaps_buf_s2_a, __global u32 *bitmaps_buf_s2_b, __global u32 *bitmaps_buf_s2_c, __global u32 *bitmaps_buf_s2_d, __global plain_t *plains_buf, __global digest_t *digests_buf, __global u32 *hashes_shown, __global salt_t *salt_bufs, __global void *esalt_bufs, __global u32 *d_return_buf, __global u32 *d_scryptV_buf, const u32 bitmap_mask, const u32 bitmap_shift1, const u32 bitmap_shift2, const u32 salt_pos, const u32 loop_pos, const u32 loop_cnt, const u32 il_cnt, const u32 digests_cnt, const u32 digests_offset, const u32 combs_mode, const u32 gid_max) { diff --git a/OpenCL/m01400_a3.cl b/OpenCL/m01400_a3.cl index 2e6b3a4..da17856 100644 --- a/OpenCL/m01400_a3.cl +++ b/OpenCL/m01400_a3.cl @@ -7,18 +7,18 @@ #define NEW_SIMD_CODE -#include "include/constants.h" -#include "include/kernel_vendor.h" +#include "inc_hash_constants.h" +#include "inc_vendor.cl" #define DGST_R0 3 #define DGST_R1 7 #define DGST_R2 2 #define DGST_R3 6 -#include "include/kernel_functions.c" -#include "OpenCL/types_ocl.c" -#include "OpenCL/common.c" -#include "OpenCL/simd.c" +#include "inc_hash_functions.cl" +#include "inc_types.cl" +#include "inc_common.cl" +#include "inc_simd.cl" void m01400m (u32 w[16], const u32 pw_len, __global pw_t *pws, __global kernel_rule_t *rules_buf, __global comb_t *combs_buf, __constant u32x * words_buf_r, __global void *tmps, __global void *hooks, __global u32 *bitmaps_buf_s1_a, __global u32 *bitmaps_buf_s1_b, __global u32 *bitmaps_buf_s1_c, __global u32 *bitmaps_buf_s1_d, __global u32 *bitmaps_buf_s2_a, __global u32 *bitmaps_buf_s2_b, __global u32 *bitmaps_buf_s2_c, __global u32 *bitmaps_buf_s2_d, __global plain_t *plains_buf, __global digest_t *digests_buf, __global u32 *hashes_shown, __global salt_t *salt_bufs, __global void *esalt_bufs, __global u32 *d_return_buf, __global u32 *d_scryptV_buf, const u32 bitmap_mask, const u32 bitmap_shift1, const u32 bitmap_shift2, const u32 salt_pos, const u32 loop_pos, const u32 loop_cnt, const u32 il_cnt, const u32 digests_cnt, const u32 digests_offset) { diff --git a/OpenCL/m01410_a0.cl b/OpenCL/m01410_a0.cl index 2da15b8..1eb855d 100644 --- a/OpenCL/m01410_a0.cl +++ b/OpenCL/m01410_a0.cl @@ -7,20 +7,20 @@ #define NEW_SIMD_CODE -#include "include/constants.h" -#include "include/kernel_vendor.h" +#include "inc_hash_constants.h" +#include "inc_vendor.cl" #define DGST_R0 3 #define DGST_R1 7 #define DGST_R2 2 #define DGST_R3 6 -#include "include/kernel_functions.c" -#include "OpenCL/types_ocl.c" -#include "OpenCL/common.c" -#include "include/rp_kernel.h" -#include "OpenCL/rp.c" -#include "OpenCL/simd.c" +#include "inc_hash_functions.cl" +#include "inc_types.cl" +#include "inc_common.cl" +#include "inc_rp.h" +#include "inc_rp.cl" +#include "inc_simd.cl" __kernel void m01410_m04 (__global pw_t *pws, __global kernel_rule_t *rules_buf, __global comb_t *combs_buf, __global bf_t *bfs_buf, __global void *tmps, __global void *hooks, __global u32 *bitmaps_buf_s1_a, __global u32 *bitmaps_buf_s1_b, __global u32 *bitmaps_buf_s1_c, __global u32 *bitmaps_buf_s1_d, __global u32 *bitmaps_buf_s2_a, __global u32 *bitmaps_buf_s2_b, __global u32 *bitmaps_buf_s2_c, __global u32 *bitmaps_buf_s2_d, __global plain_t *plains_buf, __global digest_t *digests_buf, __global u32 *hashes_shown, __global salt_t *salt_bufs, __global void *esalt_bufs, __global u32 *d_return_buf, __global u32 *d_scryptV_buf, const u32 bitmap_mask, const u32 bitmap_shift1, const u32 bitmap_shift2, const u32 salt_pos, const u32 loop_pos, const u32 loop_cnt, const u32 il_cnt, const u32 digests_cnt, const u32 digests_offset, const u32 combs_mode, const u32 gid_max) { diff --git a/OpenCL/m01410_a1.cl b/OpenCL/m01410_a1.cl index 751be42..ef9a0ce 100644 --- a/OpenCL/m01410_a1.cl +++ b/OpenCL/m01410_a1.cl @@ -7,18 +7,18 @@ #define NEW_SIMD_CODE -#include "include/constants.h" -#include "include/kernel_vendor.h" +#include "inc_hash_constants.h" +#include "inc_vendor.cl" #define DGST_R0 3 #define DGST_R1 7 #define DGST_R2 2 #define DGST_R3 6 -#include "include/kernel_functions.c" -#include "OpenCL/types_ocl.c" -#include "OpenCL/common.c" -#include "OpenCL/simd.c" +#include "inc_hash_functions.cl" +#include "inc_types.cl" +#include "inc_common.cl" +#include "inc_simd.cl" __kernel void m01410_m04 (__global pw_t *pws, __global kernel_rule_t *rules_buf, __global comb_t *combs_buf, __global bf_t *bfs_buf, __global void *tmps, __global void *hooks, __global u32 *bitmaps_buf_s1_a, __global u32 *bitmaps_buf_s1_b, __global u32 *bitmaps_buf_s1_c, __global u32 *bitmaps_buf_s1_d, __global u32 *bitmaps_buf_s2_a, __global u32 *bitmaps_buf_s2_b, __global u32 *bitmaps_buf_s2_c, __global u32 *bitmaps_buf_s2_d, __global plain_t *plains_buf, __global digest_t *digests_buf, __global u32 *hashes_shown, __global salt_t *salt_bufs, __global void *esalt_bufs, __global u32 *d_return_buf, __global u32 *d_scryptV_buf, const u32 bitmap_mask, const u32 bitmap_shift1, const u32 bitmap_shift2, const u32 salt_pos, const u32 loop_pos, const u32 loop_cnt, const u32 il_cnt, const u32 digests_cnt, const u32 digests_offset, const u32 combs_mode, const u32 gid_max) { diff --git a/OpenCL/m01410_a3.cl b/OpenCL/m01410_a3.cl index 13e9027..bfbc8ad 100644 --- a/OpenCL/m01410_a3.cl +++ b/OpenCL/m01410_a3.cl @@ -7,18 +7,18 @@ #define NEW_SIMD_CODE -#include "include/constants.h" -#include "include/kernel_vendor.h" +#include "inc_hash_constants.h" +#include "inc_vendor.cl" #define DGST_R0 3 #define DGST_R1 7 #define DGST_R2 2 #define DGST_R3 6 -#include "include/kernel_functions.c" -#include "OpenCL/types_ocl.c" -#include "OpenCL/common.c" -#include "OpenCL/simd.c" +#include "inc_hash_functions.cl" +#include "inc_types.cl" +#include "inc_common.cl" +#include "inc_simd.cl" void m01410m (u32 w[16], const u32 pw_len, __global pw_t *pws, __global kernel_rule_t *rules_buf, __global comb_t *combs_buf, __constant u32x * words_buf_r, __global void *tmps, __global void *hooks, __global u32 *bitmaps_buf_s1_a, __global u32 *bitmaps_buf_s1_b, __global u32 *bitmaps_buf_s1_c, __global u32 *bitmaps_buf_s1_d, __global u32 *bitmaps_buf_s2_a, __global u32 *bitmaps_buf_s2_b, __global u32 *bitmaps_buf_s2_c, __global u32 *bitmaps_buf_s2_d, __global plain_t *plains_buf, __global digest_t *digests_buf, __global u32 *hashes_shown, __global salt_t *salt_bufs, __global void *esalt_bufs, __global u32 *d_return_buf, __global u32 *d_scryptV_buf, const u32 bitmap_mask, const u32 bitmap_shift1, const u32 bitmap_shift2, const u32 salt_pos, const u32 loop_pos, const u32 loop_cnt, const u32 il_cnt, const u32 digests_cnt, const u32 digests_offset) { diff --git a/OpenCL/m01420_a0.cl b/OpenCL/m01420_a0.cl index 5676003..13406c7 100644 --- a/OpenCL/m01420_a0.cl +++ b/OpenCL/m01420_a0.cl @@ -7,20 +7,20 @@ #define NEW_SIMD_CODE -#include "include/constants.h" -#include "include/kernel_vendor.h" +#include "inc_hash_constants.h" +#include "inc_vendor.cl" #define DGST_R0 3 #define DGST_R1 7 #define DGST_R2 2 #define DGST_R3 6 -#include "include/kernel_functions.c" -#include "OpenCL/types_ocl.c" -#include "OpenCL/common.c" -#include "include/rp_kernel.h" -#include "OpenCL/rp.c" -#include "OpenCL/simd.c" +#include "inc_hash_functions.cl" +#include "inc_types.cl" +#include "inc_common.cl" +#include "inc_rp.h" +#include "inc_rp.cl" +#include "inc_simd.cl" __kernel void m01420_m04 (__global pw_t *pws, __global kernel_rule_t *rules_buf, __global comb_t *combs_buf, __global bf_t *bfs_buf, __global void *tmps, __global void *hooks, __global u32 *bitmaps_buf_s1_a, __global u32 *bitmaps_buf_s1_b, __global u32 *bitmaps_buf_s1_c, __global u32 *bitmaps_buf_s1_d, __global u32 *bitmaps_buf_s2_a, __global u32 *bitmaps_buf_s2_b, __global u32 *bitmaps_buf_s2_c, __global u32 *bitmaps_buf_s2_d, __global plain_t *plains_buf, __global digest_t *digests_buf, __global u32 *hashes_shown, __global salt_t *salt_bufs, __global void *esalt_bufs, __global u32 *d_return_buf, __global u32 *d_scryptV_buf, const u32 bitmap_mask, const u32 bitmap_shift1, const u32 bitmap_shift2, const u32 salt_pos, const u32 loop_pos, const u32 loop_cnt, const u32 il_cnt, const u32 digests_cnt, const u32 digests_offset, const u32 combs_mode, const u32 gid_max) { diff --git a/OpenCL/m01420_a1.cl b/OpenCL/m01420_a1.cl index d0a0ace..0bfed86 100644 --- a/OpenCL/m01420_a1.cl +++ b/OpenCL/m01420_a1.cl @@ -7,18 +7,18 @@ #define NEW_SIMD_CODE -#include "include/constants.h" -#include "include/kernel_vendor.h" +#include "inc_hash_constants.h" +#include "inc_vendor.cl" #define DGST_R0 3 #define DGST_R1 7 #define DGST_R2 2 #define DGST_R3 6 -#include "include/kernel_functions.c" -#include "OpenCL/types_ocl.c" -#include "OpenCL/common.c" -#include "OpenCL/simd.c" +#include "inc_hash_functions.cl" +#include "inc_types.cl" +#include "inc_common.cl" +#include "inc_simd.cl" __kernel void m01420_m04 (__global pw_t *pws, __global kernel_rule_t *rules_buf, __global comb_t *combs_buf, __global bf_t *bfs_buf, __global void *tmps, __global void *hooks, __global u32 *bitmaps_buf_s1_a, __global u32 *bitmaps_buf_s1_b, __global u32 *bitmaps_buf_s1_c, __global u32 *bitmaps_buf_s1_d, __global u32 *bitmaps_buf_s2_a, __global u32 *bitmaps_buf_s2_b, __global u32 *bitmaps_buf_s2_c, __global u32 *bitmaps_buf_s2_d, __global plain_t *plains_buf, __global digest_t *digests_buf, __global u32 *hashes_shown, __global salt_t *salt_bufs, __global void *esalt_bufs, __global u32 *d_return_buf, __global u32 *d_scryptV_buf, const u32 bitmap_mask, const u32 bitmap_shift1, const u32 bitmap_shift2, const u32 salt_pos, const u32 loop_pos, const u32 loop_cnt, const u32 il_cnt, const u32 digests_cnt, const u32 digests_offset, const u32 combs_mode, const u32 gid_max) { diff --git a/OpenCL/m01420_a3.cl b/OpenCL/m01420_a3.cl index a95d0c2..4f55994 100644 --- a/OpenCL/m01420_a3.cl +++ b/OpenCL/m01420_a3.cl @@ -7,18 +7,18 @@ #define NEW_SIMD_CODE -#include "include/constants.h" -#include "include/kernel_vendor.h" +#include "inc_hash_constants.h" +#include "inc_vendor.cl" #define DGST_R0 3 #define DGST_R1 7 #define DGST_R2 2 #define DGST_R3 6 -#include "include/kernel_functions.c" -#include "OpenCL/types_ocl.c" -#include "OpenCL/common.c" -#include "OpenCL/simd.c" +#include "inc_hash_functions.cl" +#include "inc_types.cl" +#include "inc_common.cl" +#include "inc_simd.cl" void m01420m (u32 w0[4], u32 w1[4], u32 w2[4], u32 w3[4], const u32 pw_len, __global pw_t *pws, __global kernel_rule_t *rules_buf, __global comb_t *combs_buf, __global bf_t *bfs_buf, __global void *tmps, __global void *hooks, __global u32 *bitmaps_buf_s1_a, __global u32 *bitmaps_buf_s1_b, __global u32 *bitmaps_buf_s1_c, __global u32 *bitmaps_buf_s1_d, __global u32 *bitmaps_buf_s2_a, __global u32 *bitmaps_buf_s2_b, __global u32 *bitmaps_buf_s2_c, __global u32 *bitmaps_buf_s2_d, __global plain_t *plains_buf, __global digest_t *digests_buf, __global u32 *hashes_shown, __global salt_t *salt_bufs, __global void *esalt_bufs, __global u32 *d_return_buf, __global u32 *d_scryptV_buf, const u32 bitmap_mask, const u32 bitmap_shift1, const u32 bitmap_shift2, const u32 salt_pos, const u32 loop_pos, const u32 loop_cnt, const u32 il_cnt, const u32 digests_cnt, const u32 digests_offset) { diff --git a/OpenCL/m01430_a0.cl b/OpenCL/m01430_a0.cl index 905beed..faa387e 100644 --- a/OpenCL/m01430_a0.cl +++ b/OpenCL/m01430_a0.cl @@ -7,20 +7,20 @@ #define NEW_SIMD_CODE -#include "include/constants.h" -#include "include/kernel_vendor.h" +#include "inc_hash_constants.h" +#include "inc_vendor.cl" #define DGST_R0 3 #define DGST_R1 7 #define DGST_R2 2 #define DGST_R3 6 -#include "include/kernel_functions.c" -#include "OpenCL/types_ocl.c" -#include "OpenCL/common.c" -#include "include/rp_kernel.h" -#include "OpenCL/rp.c" -#include "OpenCL/simd.c" +#include "inc_hash_functions.cl" +#include "inc_types.cl" +#include "inc_common.cl" +#include "inc_rp.h" +#include "inc_rp.cl" +#include "inc_simd.cl" __kernel void m01430_m04 (__global pw_t *pws, __global kernel_rule_t *rules_buf, __global comb_t *combs_buf, __global bf_t *bfs_buf, __global void *tmps, __global void *hooks, __global u32 *bitmaps_buf_s1_a, __global u32 *bitmaps_buf_s1_b, __global u32 *bitmaps_buf_s1_c, __global u32 *bitmaps_buf_s1_d, __global u32 *bitmaps_buf_s2_a, __global u32 *bitmaps_buf_s2_b, __global u32 *bitmaps_buf_s2_c, __global u32 *bitmaps_buf_s2_d, __global plain_t *plains_buf, __global digest_t *digests_buf, __global u32 *hashes_shown, __global salt_t *salt_bufs, __global void *esalt_bufs, __global u32 *d_return_buf, __global u32 *d_scryptV_buf, const u32 bitmap_mask, const u32 bitmap_shift1, const u32 bitmap_shift2, const u32 salt_pos, const u32 loop_pos, const u32 loop_cnt, const u32 il_cnt, const u32 digests_cnt, const u32 digests_offset, const u32 combs_mode, const u32 gid_max) { diff --git a/OpenCL/m01430_a1.cl b/OpenCL/m01430_a1.cl index 897878f..d74da25 100644 --- a/OpenCL/m01430_a1.cl +++ b/OpenCL/m01430_a1.cl @@ -7,18 +7,18 @@ #define NEW_SIMD_CODE -#include "include/constants.h" -#include "include/kernel_vendor.h" +#include "inc_hash_constants.h" +#include "inc_vendor.cl" #define DGST_R0 3 #define DGST_R1 7 #define DGST_R2 2 #define DGST_R3 6 -#include "include/kernel_functions.c" -#include "OpenCL/types_ocl.c" -#include "OpenCL/common.c" -#include "OpenCL/simd.c" +#include "inc_hash_functions.cl" +#include "inc_types.cl" +#include "inc_common.cl" +#include "inc_simd.cl" __kernel void m01430_m04 (__global pw_t *pws, __global kernel_rule_t *rules_buf, __global comb_t *combs_buf, __global bf_t *bfs_buf, __global void *tmps, __global void *hooks, __global u32 *bitmaps_buf_s1_a, __global u32 *bitmaps_buf_s1_b, __global u32 *bitmaps_buf_s1_c, __global u32 *bitmaps_buf_s1_d, __global u32 *bitmaps_buf_s2_a, __global u32 *bitmaps_buf_s2_b, __global u32 *bitmaps_buf_s2_c, __global u32 *bitmaps_buf_s2_d, __global plain_t *plains_buf, __global digest_t *digests_buf, __global u32 *hashes_shown, __global salt_t *salt_bufs, __global void *esalt_bufs, __global u32 *d_return_buf, __global u32 *d_scryptV_buf, const u32 bitmap_mask, const u32 bitmap_shift1, const u32 bitmap_shift2, const u32 salt_pos, const u32 loop_pos, const u32 loop_cnt, const u32 il_cnt, const u32 digests_cnt, const u32 digests_offset, const u32 combs_mode, const u32 gid_max) { diff --git a/OpenCL/m01430_a3.cl b/OpenCL/m01430_a3.cl index a2cd4a5..cca9aa6 100644 --- a/OpenCL/m01430_a3.cl +++ b/OpenCL/m01430_a3.cl @@ -7,18 +7,18 @@ #define NEW_SIMD_CODE -#include "include/constants.h" -#include "include/kernel_vendor.h" +#include "inc_hash_constants.h" +#include "inc_vendor.cl" #define DGST_R0 3 #define DGST_R1 7 #define DGST_R2 2 #define DGST_R3 6 -#include "include/kernel_functions.c" -#include "OpenCL/types_ocl.c" -#include "OpenCL/common.c" -#include "OpenCL/simd.c" +#include "inc_hash_functions.cl" +#include "inc_types.cl" +#include "inc_common.cl" +#include "inc_simd.cl" void m01430m (u32 w[16], const u32 pw_len, __global pw_t *pws, __global kernel_rule_t *rules_buf, __global comb_t *combs_buf, __constant u32x * words_buf_r, __global void *tmps, __global void *hooks, __global u32 *bitmaps_buf_s1_a, __global u32 *bitmaps_buf_s1_b, __global u32 *bitmaps_buf_s1_c, __global u32 *bitmaps_buf_s1_d, __global u32 *bitmaps_buf_s2_a, __global u32 *bitmaps_buf_s2_b, __global u32 *bitmaps_buf_s2_c, __global u32 *bitmaps_buf_s2_d, __global plain_t *plains_buf, __global digest_t *digests_buf, __global u32 *hashes_shown, __global salt_t *salt_bufs, __global void *esalt_bufs, __global u32 *d_return_buf, __global u32 *d_scryptV_buf, const u32 bitmap_mask, const u32 bitmap_shift1, const u32 bitmap_shift2, const u32 salt_pos, const u32 loop_pos, const u32 loop_cnt, const u32 il_cnt, const u32 digests_cnt, const u32 digests_offset) { diff --git a/OpenCL/m01440_a0.cl b/OpenCL/m01440_a0.cl index 7e38628..30b7c8a 100644 --- a/OpenCL/m01440_a0.cl +++ b/OpenCL/m01440_a0.cl @@ -7,20 +7,20 @@ #define NEW_SIMD_CODE -#include "include/constants.h" -#include "include/kernel_vendor.h" +#include "inc_hash_constants.h" +#include "inc_vendor.cl" #define DGST_R0 3 #define DGST_R1 7 #define DGST_R2 2 #define DGST_R3 6 -#include "include/kernel_functions.c" -#include "OpenCL/types_ocl.c" -#include "OpenCL/common.c" -#include "include/rp_kernel.h" -#include "OpenCL/rp.c" -#include "OpenCL/simd.c" +#include "inc_hash_functions.cl" +#include "inc_types.cl" +#include "inc_common.cl" +#include "inc_rp.h" +#include "inc_rp.cl" +#include "inc_simd.cl" __kernel void m01440_m04 (__global pw_t *pws, __global kernel_rule_t *rules_buf, __global comb_t *combs_buf, __global bf_t *bfs_buf, __global void *tmps, __global void *hooks, __global u32 *bitmaps_buf_s1_a, __global u32 *bitmaps_buf_s1_b, __global u32 *bitmaps_buf_s1_c, __global u32 *bitmaps_buf_s1_d, __global u32 *bitmaps_buf_s2_a, __global u32 *bitmaps_buf_s2_b, __global u32 *bitmaps_buf_s2_c, __global u32 *bitmaps_buf_s2_d, __global plain_t *plains_buf, __global digest_t *digests_buf, __global u32 *hashes_shown, __global salt_t *salt_bufs, __global void *esalt_bufs, __global u32 *d_return_buf, __global u32 *d_scryptV_buf, const u32 bitmap_mask, const u32 bitmap_shift1, const u32 bitmap_shift2, const u32 salt_pos, const u32 loop_pos, const u32 loop_cnt, const u32 il_cnt, const u32 digests_cnt, const u32 digests_offset, const u32 combs_mode, const u32 gid_max) { diff --git a/OpenCL/m01440_a1.cl b/OpenCL/m01440_a1.cl index 8cf5364..40944ba 100644 --- a/OpenCL/m01440_a1.cl +++ b/OpenCL/m01440_a1.cl @@ -7,18 +7,18 @@ #define NEW_SIMD_CODE -#include "include/constants.h" -#include "include/kernel_vendor.h" +#include "inc_hash_constants.h" +#include "inc_vendor.cl" #define DGST_R0 3 #define DGST_R1 7 #define DGST_R2 2 #define DGST_R3 6 -#include "include/kernel_functions.c" -#include "OpenCL/types_ocl.c" -#include "OpenCL/common.c" -#include "OpenCL/simd.c" +#include "inc_hash_functions.cl" +#include "inc_types.cl" +#include "inc_common.cl" +#include "inc_simd.cl" __kernel void m01440_m04 (__global pw_t *pws, __global kernel_rule_t *rules_buf, __global comb_t *combs_buf, __global bf_t *bfs_buf, __global void *tmps, __global void *hooks, __global u32 *bitmaps_buf_s1_a, __global u32 *bitmaps_buf_s1_b, __global u32 *bitmaps_buf_s1_c, __global u32 *bitmaps_buf_s1_d, __global u32 *bitmaps_buf_s2_a, __global u32 *bitmaps_buf_s2_b, __global u32 *bitmaps_buf_s2_c, __global u32 *bitmaps_buf_s2_d, __global plain_t *plains_buf, __global digest_t *digests_buf, __global u32 *hashes_shown, __global salt_t *salt_bufs, __global void *esalt_bufs, __global u32 *d_return_buf, __global u32 *d_scryptV_buf, const u32 bitmap_mask, const u32 bitmap_shift1, const u32 bitmap_shift2, const u32 salt_pos, const u32 loop_pos, const u32 loop_cnt, const u32 il_cnt, const u32 digests_cnt, const u32 digests_offset, const u32 combs_mode, const u32 gid_max) { diff --git a/OpenCL/m01440_a3.cl b/OpenCL/m01440_a3.cl index 69363a2..3e945af 100644 --- a/OpenCL/m01440_a3.cl +++ b/OpenCL/m01440_a3.cl @@ -7,18 +7,18 @@ #define NEW_SIMD_CODE -#include "include/constants.h" -#include "include/kernel_vendor.h" +#include "inc_hash_constants.h" +#include "inc_vendor.cl" #define DGST_R0 3 #define DGST_R1 7 #define DGST_R2 2 #define DGST_R3 6 -#include "include/kernel_functions.c" -#include "OpenCL/types_ocl.c" -#include "OpenCL/common.c" -#include "OpenCL/simd.c" +#include "inc_hash_functions.cl" +#include "inc_types.cl" +#include "inc_common.cl" +#include "inc_simd.cl" void m01440m (u32 w0[4], u32 w1[4], u32 w2[4], u32 w3[4], const u32 pw_len, __global pw_t *pws, __global kernel_rule_t *rules_buf, __global comb_t *combs_buf, __global bf_t *bfs_buf, __global void *tmps, __global void *hooks, __global u32 *bitmaps_buf_s1_a, __global u32 *bitmaps_buf_s1_b, __global u32 *bitmaps_buf_s1_c, __global u32 *bitmaps_buf_s1_d, __global u32 *bitmaps_buf_s2_a, __global u32 *bitmaps_buf_s2_b, __global u32 *bitmaps_buf_s2_c, __global u32 *bitmaps_buf_s2_d, __global plain_t *plains_buf, __global digest_t *digests_buf, __global u32 *hashes_shown, __global salt_t *salt_bufs, __global void *esalt_bufs, __global u32 *d_return_buf, __global u32 *d_scryptV_buf, const u32 bitmap_mask, const u32 bitmap_shift1, const u32 bitmap_shift2, const u32 salt_pos, const u32 loop_pos, const u32 loop_cnt, const u32 il_cnt, const u32 digests_cnt, const u32 digests_offset) { diff --git a/OpenCL/m01450_a0.cl b/OpenCL/m01450_a0.cl index 7e12d30..4b5a534 100644 --- a/OpenCL/m01450_a0.cl +++ b/OpenCL/m01450_a0.cl @@ -7,20 +7,20 @@ #define NEW_SIMD_CODE -#include "include/constants.h" -#include "include/kernel_vendor.h" +#include "inc_hash_constants.h" +#include "inc_vendor.cl" #define DGST_R0 3 #define DGST_R1 7 #define DGST_R2 2 #define DGST_R3 6 -#include "include/kernel_functions.c" -#include "OpenCL/types_ocl.c" -#include "OpenCL/common.c" -#include "include/rp_kernel.h" -#include "OpenCL/rp.c" -#include "OpenCL/simd.c" +#include "inc_hash_functions.cl" +#include "inc_types.cl" +#include "inc_common.cl" +#include "inc_rp.h" +#include "inc_rp.cl" +#include "inc_simd.cl" __constant u32 k_sha256[64] = { diff --git a/OpenCL/m01450_a1.cl b/OpenCL/m01450_a1.cl index ab683cf..207b8e0 100644 --- a/OpenCL/m01450_a1.cl +++ b/OpenCL/m01450_a1.cl @@ -7,18 +7,18 @@ #define NEW_SIMD_CODE -#include "include/constants.h" -#include "include/kernel_vendor.h" +#include "inc_hash_constants.h" +#include "inc_vendor.cl" #define DGST_R0 3 #define DGST_R1 7 #define DGST_R2 2 #define DGST_R3 6 -#include "include/kernel_functions.c" -#include "OpenCL/types_ocl.c" -#include "OpenCL/common.c" -#include "OpenCL/simd.c" +#include "inc_hash_functions.cl" +#include "inc_types.cl" +#include "inc_common.cl" +#include "inc_simd.cl" __constant u32 k_sha256[64] = { diff --git a/OpenCL/m01450_a3.cl b/OpenCL/m01450_a3.cl index 6756571..2f2ac61 100644 --- a/OpenCL/m01450_a3.cl +++ b/OpenCL/m01450_a3.cl @@ -7,18 +7,18 @@ #define NEW_SIMD_CODE -#include "include/constants.h" -#include "include/kernel_vendor.h" +#include "inc_hash_constants.h" +#include "inc_vendor.cl" #define DGST_R0 3 #define DGST_R1 7 #define DGST_R2 2 #define DGST_R3 6 -#include "include/kernel_functions.c" -#include "OpenCL/types_ocl.c" -#include "OpenCL/common.c" -#include "OpenCL/simd.c" +#include "inc_hash_functions.cl" +#include "inc_types.cl" +#include "inc_common.cl" +#include "inc_simd.cl" __constant u32 k_sha256[64] = { diff --git a/OpenCL/m01460_a0.cl b/OpenCL/m01460_a0.cl index 3824c2c..6f973a3 100644 --- a/OpenCL/m01460_a0.cl +++ b/OpenCL/m01460_a0.cl @@ -7,20 +7,20 @@ #define NEW_SIMD_CODE -#include "include/constants.h" -#include "include/kernel_vendor.h" +#include "inc_hash_constants.h" +#include "inc_vendor.cl" #define DGST_R0 3 #define DGST_R1 7 #define DGST_R2 2 #define DGST_R3 6 -#include "include/kernel_functions.c" -#include "OpenCL/types_ocl.c" -#include "OpenCL/common.c" -#include "include/rp_kernel.h" -#include "OpenCL/rp.c" -#include "OpenCL/simd.c" +#include "inc_hash_functions.cl" +#include "inc_types.cl" +#include "inc_common.cl" +#include "inc_rp.h" +#include "inc_rp.cl" +#include "inc_simd.cl" __constant u32 k_sha256[64] = { diff --git a/OpenCL/m01460_a1.cl b/OpenCL/m01460_a1.cl index 6081ef6..042753e 100644 --- a/OpenCL/m01460_a1.cl +++ b/OpenCL/m01460_a1.cl @@ -7,18 +7,18 @@ #define NEW_SIMD_CODE -#include "include/constants.h" -#include "include/kernel_vendor.h" +#include "inc_hash_constants.h" +#include "inc_vendor.cl" #define DGST_R0 3 #define DGST_R1 7 #define DGST_R2 2 #define DGST_R3 6 -#include "include/kernel_functions.c" -#include "OpenCL/types_ocl.c" -#include "OpenCL/common.c" -#include "OpenCL/simd.c" +#include "inc_hash_functions.cl" +#include "inc_types.cl" +#include "inc_common.cl" +#include "inc_simd.cl" __constant u32 k_sha256[64] = { diff --git a/OpenCL/m01460_a3.cl b/OpenCL/m01460_a3.cl index 64c0df5..2ddda1b 100644 --- a/OpenCL/m01460_a3.cl +++ b/OpenCL/m01460_a3.cl @@ -7,18 +7,18 @@ #define NEW_SIMD_CODE -#include "include/constants.h" -#include "include/kernel_vendor.h" +#include "inc_hash_constants.h" +#include "inc_vendor.cl" #define DGST_R0 3 #define DGST_R1 7 #define DGST_R2 2 #define DGST_R3 6 -#include "include/kernel_functions.c" -#include "OpenCL/types_ocl.c" -#include "OpenCL/common.c" -#include "OpenCL/simd.c" +#include "inc_hash_functions.cl" +#include "inc_types.cl" +#include "inc_common.cl" +#include "inc_simd.cl" __constant u32 k_sha256[64] = { diff --git a/OpenCL/m01500_a0.cl b/OpenCL/m01500_a0.cl index 0007970..041b35b 100644 --- a/OpenCL/m01500_a0.cl +++ b/OpenCL/m01500_a0.cl @@ -10,20 +10,20 @@ #define NEW_SIMD_CODE -#include "include/constants.h" -#include "include/kernel_vendor.h" +#include "inc_hash_constants.h" +#include "inc_vendor.cl" #define DGST_R0 0 #define DGST_R1 1 #define DGST_R2 2 #define DGST_R3 3 -#include "include/kernel_functions.c" -#include "OpenCL/types_ocl.c" -#include "OpenCL/common.c" -#include "include/rp_kernel.h" -#include "OpenCL/rp.c" -#include "OpenCL/simd.c" +#include "inc_hash_functions.cl" +#include "inc_types.cl" +#include "inc_common.cl" +#include "inc_rp.h" +#include "inc_rp.cl" +#include "inc_simd.cl" #define PERM_OP(a,b,tt,n,m) \ { \ diff --git a/OpenCL/m01500_a1.cl b/OpenCL/m01500_a1.cl index 135cf96..7cdc7fb 100644 --- a/OpenCL/m01500_a1.cl +++ b/OpenCL/m01500_a1.cl @@ -9,18 +9,18 @@ #define NEW_SIMD_CODE -#include "include/constants.h" -#include "include/kernel_vendor.h" +#include "inc_hash_constants.h" +#include "inc_vendor.cl" #define DGST_R0 0 #define DGST_R1 1 #define DGST_R2 2 #define DGST_R3 3 -#include "include/kernel_functions.c" -#include "OpenCL/types_ocl.c" -#include "OpenCL/common.c" -#include "OpenCL/simd.c" +#include "inc_hash_functions.cl" +#include "inc_types.cl" +#include "inc_common.cl" +#include "inc_simd.cl" #define PERM_OP(a,b,tt,n,m) \ { \ diff --git a/OpenCL/m01500_a3.cl b/OpenCL/m01500_a3.cl index 2585829..2d2e94e 100644 --- a/OpenCL/m01500_a3.cl +++ b/OpenCL/m01500_a3.cl @@ -7,20 +7,20 @@ #define _DES_ -#include "include/constants.h" -#include "include/kernel_vendor.h" +#include "inc_hash_constants.h" +#include "inc_vendor.cl" #define DGST_R0 0 #define DGST_R1 1 #define DGST_R2 2 #define DGST_R3 3 -#include "include/kernel_functions.c" -#include "OpenCL/types_ocl.c" -#include "OpenCL/common.c" +#include "inc_hash_functions.cl" +#include "inc_types.cl" +#include "inc_common.cl" -#define COMPARE_S "OpenCL/check_single_comp4_bs.c" -#define COMPARE_M "OpenCL/check_multi_comp4_bs.c" +#define COMPARE_S "inc_comp_single_bs.cl" +#define COMPARE_M "inc_comp_multi_bs.cl" #define myselx(a,b,c) ((c) ? (b) : (a)) diff --git a/OpenCL/m01600.cl b/OpenCL/m01600.cl index 8389cee..1b33d2a 100644 --- a/OpenCL/m01600.cl +++ b/OpenCL/m01600.cl @@ -5,20 +5,20 @@ #define _MD5_ -#include "include/constants.h" -#include "include/kernel_vendor.h" +#include "inc_hash_constants.h" +#include "inc_vendor.cl" #define DGST_R0 0 #define DGST_R1 1 #define DGST_R2 2 #define DGST_R3 3 -#include "include/kernel_functions.c" -#include "OpenCL/types_ocl.c" -#include "OpenCL/common.c" +#include "inc_hash_functions.cl" +#include "inc_types.cl" +#include "inc_common.cl" -#define COMPARE_S "OpenCL/check_single_comp4.c" -#define COMPARE_M "OpenCL/check_multi_comp4.c" +#define COMPARE_S "inc_comp_single.cl" +#define COMPARE_M "inc_comp_multi.cl" #define md5apr1_magic0 0x72706124u #define md5apr1_magic1 0x00002431u diff --git a/OpenCL/m01700_a0.cl b/OpenCL/m01700_a0.cl index 5324cb0..c37ed85 100644 --- a/OpenCL/m01700_a0.cl +++ b/OpenCL/m01700_a0.cl @@ -7,20 +7,20 @@ #define NEW_SIMD_CODE -#include "include/constants.h" -#include "include/kernel_vendor.h" +#include "inc_hash_constants.h" +#include "inc_vendor.cl" #define DGST_R0 14 #define DGST_R1 15 #define DGST_R2 6 #define DGST_R3 7 -#include "include/kernel_functions.c" -#include "OpenCL/types_ocl.c" -#include "OpenCL/common.c" -#include "include/rp_kernel.h" -#include "OpenCL/rp.c" -#include "OpenCL/simd.c" +#include "inc_hash_functions.cl" +#include "inc_types.cl" +#include "inc_common.cl" +#include "inc_rp.h" +#include "inc_rp.cl" +#include "inc_simd.cl" __constant u64 k_sha512[80] = { diff --git a/OpenCL/m01700_a1.cl b/OpenCL/m01700_a1.cl index 57adc4f..94486f4 100644 --- a/OpenCL/m01700_a1.cl +++ b/OpenCL/m01700_a1.cl @@ -7,18 +7,18 @@ #define NEW_SIMD_CODE -#include "include/constants.h" -#include "include/kernel_vendor.h" +#include "inc_hash_constants.h" +#include "inc_vendor.cl" #define DGST_R0 14 #define DGST_R1 15 #define DGST_R2 6 #define DGST_R3 7 -#include "include/kernel_functions.c" -#include "OpenCL/types_ocl.c" -#include "OpenCL/common.c" -#include "OpenCL/simd.c" +#include "inc_hash_functions.cl" +#include "inc_types.cl" +#include "inc_common.cl" +#include "inc_simd.cl" __constant u64 k_sha512[80] = { diff --git a/OpenCL/m01700_a3.cl b/OpenCL/m01700_a3.cl index c7df44e..55f94f6 100644 --- a/OpenCL/m01700_a3.cl +++ b/OpenCL/m01700_a3.cl @@ -7,18 +7,18 @@ #define NEW_SIMD_CODE -#include "include/constants.h" -#include "include/kernel_vendor.h" +#include "inc_hash_constants.h" +#include "inc_vendor.cl" #define DGST_R0 14 #define DGST_R1 15 #define DGST_R2 6 #define DGST_R3 7 -#include "include/kernel_functions.c" -#include "OpenCL/types_ocl.c" -#include "OpenCL/common.c" -#include "OpenCL/simd.c" +#include "inc_hash_functions.cl" +#include "inc_types.cl" +#include "inc_common.cl" +#include "inc_simd.cl" __constant u64 k_sha512[80] = { diff --git a/OpenCL/m01710_a0.cl b/OpenCL/m01710_a0.cl index e2172f0..7bc0941 100644 --- a/OpenCL/m01710_a0.cl +++ b/OpenCL/m01710_a0.cl @@ -7,20 +7,20 @@ #define NEW_SIMD_CODE -#include "include/constants.h" -#include "include/kernel_vendor.h" +#include "inc_hash_constants.h" +#include "inc_vendor.cl" #define DGST_R0 14 #define DGST_R1 15 #define DGST_R2 6 #define DGST_R3 7 -#include "include/kernel_functions.c" -#include "OpenCL/types_ocl.c" -#include "OpenCL/common.c" -#include "include/rp_kernel.h" -#include "OpenCL/rp.c" -#include "OpenCL/simd.c" +#include "inc_hash_functions.cl" +#include "inc_types.cl" +#include "inc_common.cl" +#include "inc_rp.h" +#include "inc_rp.cl" +#include "inc_simd.cl" __constant u64 k_sha512[80] = { diff --git a/OpenCL/m01710_a1.cl b/OpenCL/m01710_a1.cl index 794c00f..6ea7861 100644 --- a/OpenCL/m01710_a1.cl +++ b/OpenCL/m01710_a1.cl @@ -7,18 +7,18 @@ #define NEW_SIMD_CODE -#include "include/constants.h" -#include "include/kernel_vendor.h" +#include "inc_hash_constants.h" +#include "inc_vendor.cl" #define DGST_R0 14 #define DGST_R1 15 #define DGST_R2 6 #define DGST_R3 7 -#include "include/kernel_functions.c" -#include "OpenCL/types_ocl.c" -#include "OpenCL/common.c" -#include "OpenCL/simd.c" +#include "inc_hash_functions.cl" +#include "inc_types.cl" +#include "inc_common.cl" +#include "inc_simd.cl" __constant u64 k_sha512[80] = { diff --git a/OpenCL/m01710_a3.cl b/OpenCL/m01710_a3.cl index 794b9b3..44309b7 100644 --- a/OpenCL/m01710_a3.cl +++ b/OpenCL/m01710_a3.cl @@ -7,18 +7,18 @@ #define NEW_SIMD_CODE -#include "include/constants.h" -#include "include/kernel_vendor.h" +#include "inc_hash_constants.h" +#include "inc_vendor.cl" #define DGST_R0 14 #define DGST_R1 15 #define DGST_R2 6 #define DGST_R3 7 -#include "include/kernel_functions.c" -#include "OpenCL/types_ocl.c" -#include "OpenCL/common.c" -#include "OpenCL/simd.c" +#include "inc_hash_functions.cl" +#include "inc_types.cl" +#include "inc_common.cl" +#include "inc_simd.cl" __constant u64 k_sha512[80] = { diff --git a/OpenCL/m01720_a0.cl b/OpenCL/m01720_a0.cl index 52eb80c..a065011 100644 --- a/OpenCL/m01720_a0.cl +++ b/OpenCL/m01720_a0.cl @@ -7,20 +7,20 @@ #define NEW_SIMD_CODE -#include "include/constants.h" -#include "include/kernel_vendor.h" +#include "inc_hash_constants.h" +#include "inc_vendor.cl" #define DGST_R0 14 #define DGST_R1 15 #define DGST_R2 6 #define DGST_R3 7 -#include "include/kernel_functions.c" -#include "OpenCL/types_ocl.c" -#include "OpenCL/common.c" -#include "include/rp_kernel.h" -#include "OpenCL/rp.c" -#include "OpenCL/simd.c" +#include "inc_hash_functions.cl" +#include "inc_types.cl" +#include "inc_common.cl" +#include "inc_rp.h" +#include "inc_rp.cl" +#include "inc_simd.cl" __constant u64 k_sha512[80] = { diff --git a/OpenCL/m01720_a1.cl b/OpenCL/m01720_a1.cl index 0ed7984..9e721e4 100644 --- a/OpenCL/m01720_a1.cl +++ b/OpenCL/m01720_a1.cl @@ -7,18 +7,18 @@ #define NEW_SIMD_CODE -#include "include/constants.h" -#include "include/kernel_vendor.h" +#include "inc_hash_constants.h" +#include "inc_vendor.cl" #define DGST_R0 14 #define DGST_R1 15 #define DGST_R2 6 #define DGST_R3 7 -#include "include/kernel_functions.c" -#include "OpenCL/types_ocl.c" -#include "OpenCL/common.c" -#include "OpenCL/simd.c" +#include "inc_hash_functions.cl" +#include "inc_types.cl" +#include "inc_common.cl" +#include "inc_simd.cl" __constant u64 k_sha512[80] = { diff --git a/OpenCL/m01720_a3.cl b/OpenCL/m01720_a3.cl index 12c1552..b2f5b9d 100644 --- a/OpenCL/m01720_a3.cl +++ b/OpenCL/m01720_a3.cl @@ -7,18 +7,18 @@ #define NEW_SIMD_CODE -#include "include/constants.h" -#include "include/kernel_vendor.h" +#include "inc_hash_constants.h" +#include "inc_vendor.cl" #define DGST_R0 14 #define DGST_R1 15 #define DGST_R2 6 #define DGST_R3 7 -#include "include/kernel_functions.c" -#include "OpenCL/types_ocl.c" -#include "OpenCL/common.c" -#include "OpenCL/simd.c" +#include "inc_hash_functions.cl" +#include "inc_types.cl" +#include "inc_common.cl" +#include "inc_simd.cl" __constant u64 k_sha512[80] = { diff --git a/OpenCL/m01730_a0.cl b/OpenCL/m01730_a0.cl index 2dd7473..7abf875 100644 --- a/OpenCL/m01730_a0.cl +++ b/OpenCL/m01730_a0.cl @@ -7,20 +7,20 @@ #define NEW_SIMD_CODE -#include "include/constants.h" -#include "include/kernel_vendor.h" +#include "inc_hash_constants.h" +#include "inc_vendor.cl" #define DGST_R0 14 #define DGST_R1 15 #define DGST_R2 6 #define DGST_R3 7 -#include "include/kernel_functions.c" -#include "OpenCL/types_ocl.c" -#include "OpenCL/common.c" -#include "include/rp_kernel.h" -#include "OpenCL/rp.c" -#include "OpenCL/simd.c" +#include "inc_hash_functions.cl" +#include "inc_types.cl" +#include "inc_common.cl" +#include "inc_rp.h" +#include "inc_rp.cl" +#include "inc_simd.cl" __constant u64 k_sha512[80] = { diff --git a/OpenCL/m01730_a1.cl b/OpenCL/m01730_a1.cl index e2a0557..d6c8fe5 100644 --- a/OpenCL/m01730_a1.cl +++ b/OpenCL/m01730_a1.cl @@ -7,18 +7,18 @@ #define NEW_SIMD_CODE -#include "include/constants.h" -#include "include/kernel_vendor.h" +#include "inc_hash_constants.h" +#include "inc_vendor.cl" #define DGST_R0 14 #define DGST_R1 15 #define DGST_R2 6 #define DGST_R3 7 -#include "include/kernel_functions.c" -#include "OpenCL/types_ocl.c" -#include "OpenCL/common.c" -#include "OpenCL/simd.c" +#include "inc_hash_functions.cl" +#include "inc_types.cl" +#include "inc_common.cl" +#include "inc_simd.cl" __constant u64 k_sha512[80] = { diff --git a/OpenCL/m01730_a3.cl b/OpenCL/m01730_a3.cl index 517822b..0506776 100644 --- a/OpenCL/m01730_a3.cl +++ b/OpenCL/m01730_a3.cl @@ -7,18 +7,18 @@ #define NEW_SIMD_CODE -#include "include/constants.h" -#include "include/kernel_vendor.h" +#include "inc_hash_constants.h" +#include "inc_vendor.cl" #define DGST_R0 14 #define DGST_R1 15 #define DGST_R2 6 #define DGST_R3 7 -#include "include/kernel_functions.c" -#include "OpenCL/types_ocl.c" -#include "OpenCL/common.c" -#include "OpenCL/simd.c" +#include "inc_hash_functions.cl" +#include "inc_types.cl" +#include "inc_common.cl" +#include "inc_simd.cl" __constant u64 k_sha512[80] = { diff --git a/OpenCL/m01740_a0.cl b/OpenCL/m01740_a0.cl index d6574ce..98d49fe 100644 --- a/OpenCL/m01740_a0.cl +++ b/OpenCL/m01740_a0.cl @@ -7,20 +7,20 @@ #define NEW_SIMD_CODE -#include "include/constants.h" -#include "include/kernel_vendor.h" +#include "inc_hash_constants.h" +#include "inc_vendor.cl" #define DGST_R0 14 #define DGST_R1 15 #define DGST_R2 6 #define DGST_R3 7 -#include "include/kernel_functions.c" -#include "OpenCL/types_ocl.c" -#include "OpenCL/common.c" -#include "include/rp_kernel.h" -#include "OpenCL/rp.c" -#include "OpenCL/simd.c" +#include "inc_hash_functions.cl" +#include "inc_types.cl" +#include "inc_common.cl" +#include "inc_rp.h" +#include "inc_rp.cl" +#include "inc_simd.cl" __constant u64 k_sha512[80] = { diff --git a/OpenCL/m01740_a1.cl b/OpenCL/m01740_a1.cl index c859c41..cd3c8af 100644 --- a/OpenCL/m01740_a1.cl +++ b/OpenCL/m01740_a1.cl @@ -7,18 +7,18 @@ #define NEW_SIMD_CODE -#include "include/constants.h" -#include "include/kernel_vendor.h" +#include "inc_hash_constants.h" +#include "inc_vendor.cl" #define DGST_R0 14 #define DGST_R1 15 #define DGST_R2 6 #define DGST_R3 7 -#include "include/kernel_functions.c" -#include "OpenCL/types_ocl.c" -#include "OpenCL/common.c" -#include "OpenCL/simd.c" +#include "inc_hash_functions.cl" +#include "inc_types.cl" +#include "inc_common.cl" +#include "inc_simd.cl" __constant u64 k_sha512[80] = { diff --git a/OpenCL/m01740_a3.cl b/OpenCL/m01740_a3.cl index 97a98d3..84d0c72 100644 --- a/OpenCL/m01740_a3.cl +++ b/OpenCL/m01740_a3.cl @@ -7,18 +7,18 @@ #define NEW_SIMD_CODE -#include "include/constants.h" -#include "include/kernel_vendor.h" +#include "inc_hash_constants.h" +#include "inc_vendor.cl" #define DGST_R0 14 #define DGST_R1 15 #define DGST_R2 6 #define DGST_R3 7 -#include "include/kernel_functions.c" -#include "OpenCL/types_ocl.c" -#include "OpenCL/common.c" -#include "OpenCL/simd.c" +#include "inc_hash_functions.cl" +#include "inc_types.cl" +#include "inc_common.cl" +#include "inc_simd.cl" __constant u64 k_sha512[80] = { diff --git a/OpenCL/m01750_a0.cl b/OpenCL/m01750_a0.cl index 4ba5ea2..c72482b 100644 --- a/OpenCL/m01750_a0.cl +++ b/OpenCL/m01750_a0.cl @@ -7,20 +7,20 @@ #define NEW_SIMD_CODE -#include "include/constants.h" -#include "include/kernel_vendor.h" +#include "inc_hash_constants.h" +#include "inc_vendor.cl" #define DGST_R0 14 #define DGST_R1 15 #define DGST_R2 6 #define DGST_R3 7 -#include "include/kernel_functions.c" -#include "OpenCL/types_ocl.c" -#include "OpenCL/common.c" -#include "include/rp_kernel.h" -#include "OpenCL/rp.c" -#include "OpenCL/simd.c" +#include "inc_hash_functions.cl" +#include "inc_types.cl" +#include "inc_common.cl" +#include "inc_rp.h" +#include "inc_rp.cl" +#include "inc_simd.cl" __constant u64 k_sha512[80] = { diff --git a/OpenCL/m01750_a1.cl b/OpenCL/m01750_a1.cl index 65112a3..b35a789 100644 --- a/OpenCL/m01750_a1.cl +++ b/OpenCL/m01750_a1.cl @@ -7,18 +7,18 @@ #define NEW_SIMD_CODE -#include "include/constants.h" -#include "include/kernel_vendor.h" +#include "inc_hash_constants.h" +#include "inc_vendor.cl" #define DGST_R0 14 #define DGST_R1 15 #define DGST_R2 6 #define DGST_R3 7 -#include "include/kernel_functions.c" -#include "OpenCL/types_ocl.c" -#include "OpenCL/common.c" -#include "OpenCL/simd.c" +#include "inc_hash_functions.cl" +#include "inc_types.cl" +#include "inc_common.cl" +#include "inc_simd.cl" __constant u64 k_sha512[80] = { diff --git a/OpenCL/m01750_a3.cl b/OpenCL/m01750_a3.cl index aff816f..3de7878 100644 --- a/OpenCL/m01750_a3.cl +++ b/OpenCL/m01750_a3.cl @@ -7,18 +7,18 @@ #define NEW_SIMD_CODE -#include "include/constants.h" -#include "include/kernel_vendor.h" +#include "inc_hash_constants.h" +#include "inc_vendor.cl" #define DGST_R0 14 #define DGST_R1 15 #define DGST_R2 6 #define DGST_R3 7 -#include "include/kernel_functions.c" -#include "OpenCL/types_ocl.c" -#include "OpenCL/common.c" -#include "OpenCL/simd.c" +#include "inc_hash_functions.cl" +#include "inc_types.cl" +#include "inc_common.cl" +#include "inc_simd.cl" __constant u64 k_sha512[80] = { diff --git a/OpenCL/m01760_a0.cl b/OpenCL/m01760_a0.cl index 8883d47..ed2c409 100644 --- a/OpenCL/m01760_a0.cl +++ b/OpenCL/m01760_a0.cl @@ -7,20 +7,20 @@ #define NEW_SIMD_CODE -#include "include/constants.h" -#include "include/kernel_vendor.h" +#include "inc_hash_constants.h" +#include "inc_vendor.cl" #define DGST_R0 14 #define DGST_R1 15 #define DGST_R2 6 #define DGST_R3 7 -#include "include/kernel_functions.c" -#include "OpenCL/types_ocl.c" -#include "OpenCL/common.c" -#include "include/rp_kernel.h" -#include "OpenCL/rp.c" -#include "OpenCL/simd.c" +#include "inc_hash_functions.cl" +#include "inc_types.cl" +#include "inc_common.cl" +#include "inc_rp.h" +#include "inc_rp.cl" +#include "inc_simd.cl" __constant u64 k_sha512[80] = { diff --git a/OpenCL/m01760_a1.cl b/OpenCL/m01760_a1.cl index 1d7895f..eaa8624 100644 --- a/OpenCL/m01760_a1.cl +++ b/OpenCL/m01760_a1.cl @@ -7,18 +7,18 @@ #define NEW_SIMD_CODE -#include "include/constants.h" -#include "include/kernel_vendor.h" +#include "inc_hash_constants.h" +#include "inc_vendor.cl" #define DGST_R0 14 #define DGST_R1 15 #define DGST_R2 6 #define DGST_R3 7 -#include "include/kernel_functions.c" -#include "OpenCL/types_ocl.c" -#include "OpenCL/common.c" -#include "OpenCL/simd.c" +#include "inc_hash_functions.cl" +#include "inc_types.cl" +#include "inc_common.cl" +#include "inc_simd.cl" __constant u64 k_sha512[80] = { diff --git a/OpenCL/m01760_a3.cl b/OpenCL/m01760_a3.cl index 61bb6d7..5bf5380 100644 --- a/OpenCL/m01760_a3.cl +++ b/OpenCL/m01760_a3.cl @@ -7,18 +7,18 @@ #define NEW_SIMD_CODE -#include "include/constants.h" -#include "include/kernel_vendor.h" +#include "inc_hash_constants.h" +#include "inc_vendor.cl" #define DGST_R0 14 #define DGST_R1 15 #define DGST_R2 6 #define DGST_R3 7 -#include "include/kernel_functions.c" -#include "OpenCL/types_ocl.c" -#include "OpenCL/common.c" -#include "OpenCL/simd.c" +#include "inc_hash_functions.cl" +#include "inc_types.cl" +#include "inc_common.cl" +#include "inc_simd.cl" __constant u64 k_sha512[80] = { diff --git a/OpenCL/m01800.cl b/OpenCL/m01800.cl index 21b1685..4af9eb6 100644 --- a/OpenCL/m01800.cl +++ b/OpenCL/m01800.cl @@ -5,20 +5,20 @@ #define _SHA512_ -#include "include/constants.h" -#include "include/kernel_vendor.h" +#include "inc_hash_constants.h" +#include "inc_vendor.cl" #define DGST_R0 0 #define DGST_R1 1 #define DGST_R2 2 #define DGST_R3 3 -#include "include/kernel_functions.c" -#include "OpenCL/types_ocl.c" -#include "OpenCL/common.c" +#include "inc_hash_functions.cl" +#include "inc_types.cl" +#include "inc_common.cl" -#define COMPARE_S "OpenCL/check_single_comp4.c" -#define COMPARE_M "OpenCL/check_multi_comp4.c" +#define COMPARE_S "inc_comp_single.cl" +#define COMPARE_M "inc_comp_multi.cl" // Buggy drivers... diff --git a/OpenCL/m02100.cl b/OpenCL/m02100.cl index 2e2a8d2..89e45f8 100644 --- a/OpenCL/m02100.cl +++ b/OpenCL/m02100.cl @@ -7,21 +7,21 @@ #define NEW_SIMD_CODE -#include "include/constants.h" -#include "include/kernel_vendor.h" +#include "inc_hash_constants.h" +#include "inc_vendor.cl" #define DGST_R0 0 #define DGST_R1 1 #define DGST_R2 2 #define DGST_R3 3 -#include "include/kernel_functions.c" -#include "OpenCL/types_ocl.c" -#include "OpenCL/common.c" -#include "OpenCL/simd.c" +#include "inc_hash_functions.cl" +#include "inc_types.cl" +#include "inc_common.cl" +#include "inc_simd.cl" -#define COMPARE_S "OpenCL/check_single_comp4.c" -#define COMPARE_M "OpenCL/check_multi_comp4.c" +#define COMPARE_S "inc_comp_single.cl" +#define COMPARE_M "inc_comp_multi.cl" void md4_transform_S (const u32 w0[4], const u32 w1[4], const u32 w2[4], const u32 w3[4], u32 digest[4]) { diff --git a/OpenCL/m02400_a0.cl b/OpenCL/m02400_a0.cl index 0d8dc34..592c3e9 100644 --- a/OpenCL/m02400_a0.cl +++ b/OpenCL/m02400_a0.cl @@ -7,20 +7,20 @@ #define NEW_SIMD_CODE -#include "include/constants.h" -#include "include/kernel_vendor.h" +#include "inc_hash_constants.h" +#include "inc_vendor.cl" #define DGST_R0 0 #define DGST_R1 3 #define DGST_R2 2 #define DGST_R3 1 -#include "include/kernel_functions.c" -#include "OpenCL/types_ocl.c" -#include "OpenCL/common.c" -#include "include/rp_kernel.h" -#include "OpenCL/rp.c" -#include "OpenCL/simd.c" +#include "inc_hash_functions.cl" +#include "inc_types.cl" +#include "inc_common.cl" +#include "inc_rp.h" +#include "inc_rp.cl" +#include "inc_simd.cl" __kernel void m02400_m04 (__global pw_t *pws, __global kernel_rule_t * rules_buf, __global comb_t *combs_buf, __global bf_t *bfs_buf, __global void *tmps, __global void *hooks, __global u32 *bitmaps_buf_s1_a, __global u32 *bitmaps_buf_s1_b, __global u32 *bitmaps_buf_s1_c, __global u32 *bitmaps_buf_s1_d, __global u32 *bitmaps_buf_s2_a, __global u32 *bitmaps_buf_s2_b, __global u32 *bitmaps_buf_s2_c, __global u32 *bitmaps_buf_s2_d, __global plain_t *plains_buf, __global digest_t *digests_buf, __global u32 *hashes_shown, __global salt_t *salt_bufs, __global void *esalt_bufs, __global u32 *d_return_buf, __global u32 *d_scryptV_buf, const u32 bitmap_mask, const u32 bitmap_shift1, const u32 bitmap_shift2, const u32 salt_pos, const u32 loop_pos, const u32 loop_cnt, const u32 il_cnt, const u32 digests_cnt, const u32 digests_offset, const u32 combs_mode, const u32 gid_max) { diff --git a/OpenCL/m02400_a1.cl b/OpenCL/m02400_a1.cl index f434286..452ddb7 100644 --- a/OpenCL/m02400_a1.cl +++ b/OpenCL/m02400_a1.cl @@ -7,18 +7,18 @@ #define NEW_SIMD_CODE -#include "include/constants.h" -#include "include/kernel_vendor.h" +#include "inc_hash_constants.h" +#include "inc_vendor.cl" #define DGST_R0 0 #define DGST_R1 3 #define DGST_R2 2 #define DGST_R3 1 -#include "include/kernel_functions.c" -#include "OpenCL/types_ocl.c" -#include "OpenCL/common.c" -#include "OpenCL/simd.c" +#include "inc_hash_functions.cl" +#include "inc_types.cl" +#include "inc_common.cl" +#include "inc_simd.cl" __kernel void m02400_m04 (__global pw_t *pws, __global kernel_rule_t *rules_buf, __global comb_t *combs_buf, __global bf_t *bfs_buf, __global void *tmps, __global void *hooks, __global u32 *bitmaps_buf_s1_a, __global u32 *bitmaps_buf_s1_b, __global u32 *bitmaps_buf_s1_c, __global u32 *bitmaps_buf_s1_d, __global u32 *bitmaps_buf_s2_a, __global u32 *bitmaps_buf_s2_b, __global u32 *bitmaps_buf_s2_c, __global u32 *bitmaps_buf_s2_d, __global plain_t *plains_buf, __global digest_t *digests_buf, __global u32 *hashes_shown, __global salt_t *salt_bufs, __global void *esalt_bufs, __global u32 *d_return_buf, __global u32 *d_scryptV_buf, const u32 bitmap_mask, const u32 bitmap_shift1, const u32 bitmap_shift2, const u32 salt_pos, const u32 loop_pos, const u32 loop_cnt, const u32 il_cnt, const u32 digests_cnt, const u32 digests_offset, const u32 combs_mode, const u32 gid_max) { diff --git a/OpenCL/m02400_a3.cl b/OpenCL/m02400_a3.cl index 243bd9c..937bd30 100644 --- a/OpenCL/m02400_a3.cl +++ b/OpenCL/m02400_a3.cl @@ -7,18 +7,18 @@ #define NEW_SIMD_CODE -#include "include/constants.h" -#include "include/kernel_vendor.h" +#include "inc_hash_constants.h" +#include "inc_vendor.cl" #define DGST_R0 0 #define DGST_R1 3 #define DGST_R2 2 #define DGST_R3 1 -#include "include/kernel_functions.c" -#include "OpenCL/types_ocl.c" -#include "OpenCL/common.c" -#include "OpenCL/simd.c" +#include "inc_hash_functions.cl" +#include "inc_types.cl" +#include "inc_common.cl" +#include "inc_simd.cl" void m02400m (u32 w[16], const u32 pw_len, __global pw_t *pws, __global kernel_rule_t *rules_buf, __global comb_t *combs_buf, __constant u32x * words_buf_r, __global void *tmps, __global void *hooks, __global u32 *bitmaps_buf_s1_a, __global u32 *bitmaps_buf_s1_b, __global u32 *bitmaps_buf_s1_c, __global u32 *bitmaps_buf_s1_d, __global u32 *bitmaps_buf_s2_a, __global u32 *bitmaps_buf_s2_b, __global u32 *bitmaps_buf_s2_c, __global u32 *bitmaps_buf_s2_d, __global plain_t *plains_buf, __global digest_t *digests_buf, __global u32 *hashes_shown, __global salt_t *salt_bufs, __global void *esalt_bufs, __global u32 *d_return_buf, __global u32 *d_scryptV_buf, const u32 bitmap_mask, const u32 bitmap_shift1, const u32 bitmap_shift2, const u32 salt_pos, const u32 loop_pos, const u32 loop_cnt, const u32 il_cnt, const u32 digests_cnt, const u32 digests_offset) { diff --git a/OpenCL/m02410_a0.cl b/OpenCL/m02410_a0.cl index bb1ce35..c9d37a8 100644 --- a/OpenCL/m02410_a0.cl +++ b/OpenCL/m02410_a0.cl @@ -7,20 +7,20 @@ #define NEW_SIMD_CODE -#include "include/constants.h" -#include "include/kernel_vendor.h" +#include "inc_hash_constants.h" +#include "inc_vendor.cl" #define DGST_R0 0 #define DGST_R1 3 #define DGST_R2 2 #define DGST_R3 1 -#include "include/kernel_functions.c" -#include "OpenCL/types_ocl.c" -#include "OpenCL/common.c" -#include "include/rp_kernel.h" -#include "OpenCL/rp.c" -#include "OpenCL/simd.c" +#include "inc_hash_functions.cl" +#include "inc_types.cl" +#include "inc_common.cl" +#include "inc_rp.h" +#include "inc_rp.cl" +#include "inc_simd.cl" __kernel void m02410_m04 (__global pw_t *pws, __global kernel_rule_t * rules_buf, __global comb_t *combs_buf, __global bf_t *bfs_buf, __global void *tmps, __global void *hooks, __global u32 *bitmaps_buf_s1_a, __global u32 *bitmaps_buf_s1_b, __global u32 *bitmaps_buf_s1_c, __global u32 *bitmaps_buf_s1_d, __global u32 *bitmaps_buf_s2_a, __global u32 *bitmaps_buf_s2_b, __global u32 *bitmaps_buf_s2_c, __global u32 *bitmaps_buf_s2_d, __global plain_t *plains_buf, __global digest_t *digests_buf, __global u32 *hashes_shown, __global salt_t *salt_bufs, __global void *esalt_bufs, __global u32 *d_return_buf, __global u32 *d_scryptV_buf, const u32 bitmap_mask, const u32 bitmap_shift1, const u32 bitmap_shift2, const u32 salt_pos, const u32 loop_pos, const u32 loop_cnt, const u32 il_cnt, const u32 digests_cnt, const u32 digests_offset, const u32 combs_mode, const u32 gid_max) { diff --git a/OpenCL/m02410_a1.cl b/OpenCL/m02410_a1.cl index a6b0a59..4e3974f 100644 --- a/OpenCL/m02410_a1.cl +++ b/OpenCL/m02410_a1.cl @@ -7,18 +7,18 @@ #define NEW_SIMD_CODE -#include "include/constants.h" -#include "include/kernel_vendor.h" +#include "inc_hash_constants.h" +#include "inc_vendor.cl" #define DGST_R0 0 #define DGST_R1 3 #define DGST_R2 2 #define DGST_R3 1 -#include "include/kernel_functions.c" -#include "OpenCL/types_ocl.c" -#include "OpenCL/common.c" -#include "OpenCL/simd.c" +#include "inc_hash_functions.cl" +#include "inc_types.cl" +#include "inc_common.cl" +#include "inc_simd.cl" __kernel void m02410_m04 (__global pw_t *pws, __global kernel_rule_t *rules_buf, __global comb_t *combs_buf, __global bf_t *bfs_buf, __global void *tmps, __global void *hooks, __global u32 *bitmaps_buf_s1_a, __global u32 *bitmaps_buf_s1_b, __global u32 *bitmaps_buf_s1_c, __global u32 *bitmaps_buf_s1_d, __global u32 *bitmaps_buf_s2_a, __global u32 *bitmaps_buf_s2_b, __global u32 *bitmaps_buf_s2_c, __global u32 *bitmaps_buf_s2_d, __global plain_t *plains_buf, __global digest_t *digests_buf, __global u32 *hashes_shown, __global salt_t *salt_bufs, __global void *esalt_bufs, __global u32 *d_return_buf, __global u32 *d_scryptV_buf, const u32 bitmap_mask, const u32 bitmap_shift1, const u32 bitmap_shift2, const u32 salt_pos, const u32 loop_pos, const u32 loop_cnt, const u32 il_cnt, const u32 digests_cnt, const u32 digests_offset, const u32 combs_mode, const u32 gid_max) { diff --git a/OpenCL/m02410_a3.cl b/OpenCL/m02410_a3.cl index d1e0679..4aedaef 100644 --- a/OpenCL/m02410_a3.cl +++ b/OpenCL/m02410_a3.cl @@ -7,18 +7,18 @@ #define NEW_SIMD_CODE -#include "include/constants.h" -#include "include/kernel_vendor.h" +#include "inc_hash_constants.h" +#include "inc_vendor.cl" #define DGST_R0 0 #define DGST_R1 3 #define DGST_R2 2 #define DGST_R3 1 -#include "include/kernel_functions.c" -#include "OpenCL/types_ocl.c" -#include "OpenCL/common.c" -#include "OpenCL/simd.c" +#include "inc_hash_functions.cl" +#include "inc_types.cl" +#include "inc_common.cl" +#include "inc_simd.cl" void m02410m (u32 w[16], const u32 pw_len, __global pw_t *pws, __global kernel_rule_t *rules_buf, __global comb_t *combs_buf, __constant u32x * words_buf_r, __global void *tmps, __global void *hooks, __global u32 *bitmaps_buf_s1_a, __global u32 *bitmaps_buf_s1_b, __global u32 *bitmaps_buf_s1_c, __global u32 *bitmaps_buf_s1_d, __global u32 *bitmaps_buf_s2_a, __global u32 *bitmaps_buf_s2_b, __global u32 *bitmaps_buf_s2_c, __global u32 *bitmaps_buf_s2_d, __global plain_t *plains_buf, __global digest_t *digests_buf, __global u32 *hashes_shown, __global salt_t *salt_bufs, __global void *esalt_bufs, __global u32 *d_return_buf, __global u32 *d_scryptV_buf, const u32 bitmap_mask, const u32 bitmap_shift1, const u32 bitmap_shift2, const u32 salt_pos, const u32 loop_pos, const u32 loop_cnt, const u32 il_cnt, const u32 digests_cnt, const u32 digests_offset) { diff --git a/OpenCL/m02500.cl b/OpenCL/m02500.cl index 78999f6..9f90c54 100644 --- a/OpenCL/m02500.cl +++ b/OpenCL/m02500.cl @@ -7,21 +7,21 @@ #define NEW_SIMD_CODE -#include "include/constants.h" -#include "include/kernel_vendor.h" +#include "inc_hash_constants.h" +#include "inc_vendor.cl" #define DGST_R0 0 #define DGST_R1 1 #define DGST_R2 2 #define DGST_R3 3 -#include "include/kernel_functions.c" -#include "OpenCL/types_ocl.c" -#include "OpenCL/common.c" -#include "OpenCL/simd.c" +#include "inc_hash_functions.cl" +#include "inc_types.cl" +#include "inc_common.cl" +#include "inc_simd.cl" -#define COMPARE_S "OpenCL/check_single_comp4.c" -#define COMPARE_M "OpenCL/check_multi_comp4.c" +#define COMPARE_S "inc_comp_single.cl" +#define COMPARE_M "inc_comp_multi.cl" void md5_transform_S (const u32 w0[4], const u32 w1[4], const u32 w2[4], const u32 w3[4], u32 digest[4]) { diff --git a/OpenCL/m02610_a0.cl b/OpenCL/m02610_a0.cl index 57c7afc..ab4eaf1 100644 --- a/OpenCL/m02610_a0.cl +++ b/OpenCL/m02610_a0.cl @@ -9,20 +9,20 @@ #define NEW_SIMD_CODE -#include "include/constants.h" -#include "include/kernel_vendor.h" +#include "inc_hash_constants.h" +#include "inc_vendor.cl" #define DGST_R0 0 #define DGST_R1 3 #define DGST_R2 2 #define DGST_R3 1 -#include "include/kernel_functions.c" -#include "OpenCL/types_ocl.c" -#include "OpenCL/common.c" -#include "include/rp_kernel.h" -#include "OpenCL/rp.c" -#include "OpenCL/simd.c" +#include "inc_hash_functions.cl" +#include "inc_types.cl" +#include "inc_common.cl" +#include "inc_rp.h" +#include "inc_rp.cl" +#include "inc_simd.cl" #if VECT_SIZE == 1 #define uint_to_hex_lower8(i) (u32x) (l_bin2asc[(i)]) diff --git a/OpenCL/m02610_a1.cl b/OpenCL/m02610_a1.cl index 54e90e9..eac506d 100644 --- a/OpenCL/m02610_a1.cl +++ b/OpenCL/m02610_a1.cl @@ -7,18 +7,18 @@ #define NEW_SIMD_CODE -#include "include/constants.h" -#include "include/kernel_vendor.h" +#include "inc_hash_constants.h" +#include "inc_vendor.cl" #define DGST_R0 0 #define DGST_R1 3 #define DGST_R2 2 #define DGST_R3 1 -#include "include/kernel_functions.c" -#include "OpenCL/types_ocl.c" -#include "OpenCL/common.c" -#include "OpenCL/simd.c" +#include "inc_hash_functions.cl" +#include "inc_types.cl" +#include "inc_common.cl" +#include "inc_simd.cl" #if VECT_SIZE == 1 #define uint_to_hex_lower8(i) (u32x) (l_bin2asc[(i)]) diff --git a/OpenCL/m02610_a3.cl b/OpenCL/m02610_a3.cl index a7a3c81..677d69c 100644 --- a/OpenCL/m02610_a3.cl +++ b/OpenCL/m02610_a3.cl @@ -10,18 +10,18 @@ #define NEW_SIMD_CODE -#include "include/constants.h" -#include "include/kernel_vendor.h" +#include "inc_hash_constants.h" +#include "inc_vendor.cl" #define DGST_R0 0 #define DGST_R1 3 #define DGST_R2 2 #define DGST_R3 1 -#include "include/kernel_functions.c" -#include "OpenCL/types_ocl.c" -#include "OpenCL/common.c" -#include "OpenCL/simd.c" +#include "inc_hash_functions.cl" +#include "inc_types.cl" +#include "inc_common.cl" +#include "inc_simd.cl" #if VECT_SIZE == 1 #define uint_to_hex_lower8(i) (u32x) (l_bin2asc[(i)]) diff --git a/OpenCL/m02710_a0.cl b/OpenCL/m02710_a0.cl index c3ca3e3..3fbf245 100644 --- a/OpenCL/m02710_a0.cl +++ b/OpenCL/m02710_a0.cl @@ -9,20 +9,20 @@ #define NEW_SIMD_CODE -#include "include/constants.h" -#include "include/kernel_vendor.h" +#include "inc_hash_constants.h" +#include "inc_vendor.cl" #define DGST_R0 0 #define DGST_R1 3 #define DGST_R2 2 #define DGST_R3 1 -#include "include/kernel_functions.c" -#include "OpenCL/types_ocl.c" -#include "OpenCL/common.c" -#include "include/rp_kernel.h" -#include "OpenCL/rp.c" -#include "OpenCL/simd.c" +#include "inc_hash_functions.cl" +#include "inc_types.cl" +#include "inc_common.cl" +#include "inc_rp.h" +#include "inc_rp.cl" +#include "inc_simd.cl" #if VECT_SIZE == 1 #define uint_to_hex_lower8(i) (u32x) (l_bin2asc[(i)]) diff --git a/OpenCL/m02710_a1.cl b/OpenCL/m02710_a1.cl index 8748ac4..37a617b 100644 --- a/OpenCL/m02710_a1.cl +++ b/OpenCL/m02710_a1.cl @@ -7,18 +7,18 @@ #define NEW_SIMD_CODE -#include "include/constants.h" -#include "include/kernel_vendor.h" +#include "inc_hash_constants.h" +#include "inc_vendor.cl" #define DGST_R0 0 #define DGST_R1 3 #define DGST_R2 2 #define DGST_R3 1 -#include "include/kernel_functions.c" -#include "OpenCL/types_ocl.c" -#include "OpenCL/common.c" -#include "OpenCL/simd.c" +#include "inc_hash_functions.cl" +#include "inc_types.cl" +#include "inc_common.cl" +#include "inc_simd.cl" #if VECT_SIZE == 1 #define uint_to_hex_lower8(i) (u32x) (l_bin2asc[(i)]) diff --git a/OpenCL/m02710_a3.cl b/OpenCL/m02710_a3.cl index 23b3a25..dd73e7c 100644 --- a/OpenCL/m02710_a3.cl +++ b/OpenCL/m02710_a3.cl @@ -10,18 +10,18 @@ #define NEW_SIMD_CODE -#include "include/constants.h" -#include "include/kernel_vendor.h" +#include "inc_hash_constants.h" +#include "inc_vendor.cl" #define DGST_R0 0 #define DGST_R1 3 #define DGST_R2 2 #define DGST_R3 1 -#include "include/kernel_functions.c" -#include "OpenCL/types_ocl.c" -#include "OpenCL/common.c" -#include "OpenCL/simd.c" +#include "inc_hash_functions.cl" +#include "inc_types.cl" +#include "inc_common.cl" +#include "inc_simd.cl" #if VECT_SIZE == 1 #define uint_to_hex_lower8(i) (u32x) (l_bin2asc[(i)]) diff --git a/OpenCL/m02810_a0.cl b/OpenCL/m02810_a0.cl index 5cdd1e6..c9458fe 100644 --- a/OpenCL/m02810_a0.cl +++ b/OpenCL/m02810_a0.cl @@ -9,20 +9,20 @@ #define NEW_SIMD_CODE -#include "include/constants.h" -#include "include/kernel_vendor.h" +#include "inc_hash_constants.h" +#include "inc_vendor.cl" #define DGST_R0 0 #define DGST_R1 3 #define DGST_R2 2 #define DGST_R3 1 -#include "include/kernel_functions.c" -#include "OpenCL/types_ocl.c" -#include "OpenCL/common.c" -#include "include/rp_kernel.h" -#include "OpenCL/rp.c" -#include "OpenCL/simd.c" +#include "inc_hash_functions.cl" +#include "inc_types.cl" +#include "inc_common.cl" +#include "inc_rp.h" +#include "inc_rp.cl" +#include "inc_simd.cl" #if VECT_SIZE == 1 #define uint_to_hex_lower8(i) (u32x) (l_bin2asc[(i)]) diff --git a/OpenCL/m02810_a1.cl b/OpenCL/m02810_a1.cl index 768f535..19ea018 100644 --- a/OpenCL/m02810_a1.cl +++ b/OpenCL/m02810_a1.cl @@ -7,18 +7,18 @@ #define NEW_SIMD_CODE -#include "include/constants.h" -#include "include/kernel_vendor.h" +#include "inc_hash_constants.h" +#include "inc_vendor.cl" #define DGST_R0 0 #define DGST_R1 3 #define DGST_R2 2 #define DGST_R3 1 -#include "include/kernel_functions.c" -#include "OpenCL/types_ocl.c" -#include "OpenCL/common.c" -#include "OpenCL/simd.c" +#include "inc_hash_functions.cl" +#include "inc_types.cl" +#include "inc_common.cl" +#include "inc_simd.cl" #if VECT_SIZE == 1 #define uint_to_hex_lower8(i) (u32x) (l_bin2asc[(i)]) diff --git a/OpenCL/m02810_a3.cl b/OpenCL/m02810_a3.cl index 6ec3014..cdcce5e 100644 --- a/OpenCL/m02810_a3.cl +++ b/OpenCL/m02810_a3.cl @@ -10,18 +10,18 @@ #define NEW_SIMD_CODE -#include "include/constants.h" -#include "include/kernel_vendor.h" +#include "inc_hash_constants.h" +#include "inc_vendor.cl" #define DGST_R0 0 #define DGST_R1 3 #define DGST_R2 2 #define DGST_R3 1 -#include "include/kernel_functions.c" -#include "OpenCL/types_ocl.c" -#include "OpenCL/common.c" -#include "OpenCL/simd.c" +#include "inc_hash_functions.cl" +#include "inc_types.cl" +#include "inc_common.cl" +#include "inc_simd.cl" #if VECT_SIZE == 1 #define uint_to_hex_lower8(i) (u32x) (l_bin2asc[(i)]) diff --git a/OpenCL/m03000_a0.cl b/OpenCL/m03000_a0.cl index dc3653d..10ad91a 100644 --- a/OpenCL/m03000_a0.cl +++ b/OpenCL/m03000_a0.cl @@ -10,20 +10,20 @@ #define NEW_SIMD_CODE -#include "include/constants.h" -#include "include/kernel_vendor.h" +#include "inc_hash_constants.h" +#include "inc_vendor.cl" #define DGST_R0 0 #define DGST_R1 1 #define DGST_R2 2 #define DGST_R3 3 -#include "include/kernel_functions.c" -#include "OpenCL/types_ocl.c" -#include "OpenCL/common.c" -#include "include/rp_kernel.h" -#include "OpenCL/rp.c" -#include "OpenCL/simd.c" +#include "inc_hash_functions.cl" +#include "inc_types.cl" +#include "inc_common.cl" +#include "inc_rp.h" +#include "inc_rp.cl" +#include "inc_simd.cl" #define PERM_OP(a,b,tt,n,m) \ { \ diff --git a/OpenCL/m03000_a1.cl b/OpenCL/m03000_a1.cl index 22b6de6..d500e0a 100644 --- a/OpenCL/m03000_a1.cl +++ b/OpenCL/m03000_a1.cl @@ -9,18 +9,18 @@ #define NEW_SIMD_CODE -#include "include/constants.h" -#include "include/kernel_vendor.h" +#include "inc_hash_constants.h" +#include "inc_vendor.cl" #define DGST_R0 0 #define DGST_R1 1 #define DGST_R2 2 #define DGST_R3 3 -#include "include/kernel_functions.c" -#include "OpenCL/types_ocl.c" -#include "OpenCL/common.c" -#include "OpenCL/simd.c" +#include "inc_hash_functions.cl" +#include "inc_types.cl" +#include "inc_common.cl" +#include "inc_simd.cl" #define PERM_OP(a,b,tt,n,m) \ { \ diff --git a/OpenCL/m03000_a3.cl b/OpenCL/m03000_a3.cl index f5d3380..cf501f1 100644 --- a/OpenCL/m03000_a3.cl +++ b/OpenCL/m03000_a3.cl @@ -6,20 +6,20 @@ #define _DES_ -#include "include/constants.h" -#include "include/kernel_vendor.h" +#include "inc_hash_constants.h" +#include "inc_vendor.cl" #define DGST_R0 0 #define DGST_R1 1 #define DGST_R2 2 #define DGST_R3 3 -#include "include/kernel_functions.c" -#include "OpenCL/types_ocl.c" -#include "OpenCL/common.c" +#include "inc_hash_functions.cl" +#include "inc_types.cl" +#include "inc_common.cl" -#define COMPARE_S "OpenCL/check_single_comp4_bs.c" -#define COMPARE_M "OpenCL/check_multi_comp4_bs.c" +#define COMPARE_S "inc_comp_single_bs.cl" +#define COMPARE_M "inc_comp_multi_bs.cl" #ifdef IS_NV #define KXX_DECL diff --git a/OpenCL/m03100_a0.cl b/OpenCL/m03100_a0.cl index 5f98fda..df52606 100644 --- a/OpenCL/m03100_a0.cl +++ b/OpenCL/m03100_a0.cl @@ -11,20 +11,20 @@ //incompatible //#define NEW_SIMD_CODE -#include "include/constants.h" -#include "include/kernel_vendor.h" +#include "inc_hash_constants.h" +#include "inc_vendor.cl" #define DGST_R0 0 #define DGST_R1 1 #define DGST_R2 2 #define DGST_R3 3 -#include "include/kernel_functions.c" -#include "OpenCL/types_ocl.c" -#include "OpenCL/common.c" -#include "include/rp_kernel.h" -#include "OpenCL/rp.c" -#include "OpenCL/simd.c" +#include "inc_hash_functions.cl" +#include "inc_types.cl" +#include "inc_common.cl" +#include "inc_rp.h" +#include "inc_rp.cl" +#include "inc_simd.cl" #define PERM_OP(a,b,tt,n,m) \ { \ diff --git a/OpenCL/m03100_a1.cl b/OpenCL/m03100_a1.cl index b16db6c..18d7741 100644 --- a/OpenCL/m03100_a1.cl +++ b/OpenCL/m03100_a1.cl @@ -10,18 +10,18 @@ //incompatible //#define NEW_SIMD_CODE -#include "include/constants.h" -#include "include/kernel_vendor.h" +#include "inc_hash_constants.h" +#include "inc_vendor.cl" #define DGST_R0 0 #define DGST_R1 1 #define DGST_R2 2 #define DGST_R3 3 -#include "include/kernel_functions.c" -#include "OpenCL/types_ocl.c" -#include "OpenCL/common.c" -#include "OpenCL/simd.c" +#include "inc_hash_functions.cl" +#include "inc_types.cl" +#include "inc_common.cl" +#include "inc_simd.cl" #define PERM_OP(a,b,tt,n,m) \ { \ diff --git a/OpenCL/m03100_a3.cl b/OpenCL/m03100_a3.cl index e1729e3..5c25677 100644 --- a/OpenCL/m03100_a3.cl +++ b/OpenCL/m03100_a3.cl @@ -10,18 +10,18 @@ #define NEW_SIMD_CODE -#include "include/constants.h" -#include "include/kernel_vendor.h" +#include "inc_hash_constants.h" +#include "inc_vendor.cl" #define DGST_R0 0 #define DGST_R1 1 #define DGST_R2 2 #define DGST_R3 3 -#include "include/kernel_functions.c" -#include "OpenCL/types_ocl.c" -#include "OpenCL/common.c" -#include "OpenCL/simd.c" +#include "inc_hash_functions.cl" +#include "inc_types.cl" +#include "inc_common.cl" +#include "inc_simd.cl" #define PERM_OP(a,b,tt,n,m) \ { \ diff --git a/OpenCL/m03200.cl b/OpenCL/m03200.cl index a3789cd..a278122 100644 --- a/OpenCL/m03200.cl +++ b/OpenCL/m03200.cl @@ -5,20 +5,20 @@ #define _BCRYPT_ -#include "include/constants.h" -#include "include/kernel_vendor.h" +#include "inc_hash_constants.h" +#include "inc_vendor.cl" #define DGST_R0 0 #define DGST_R1 1 #define DGST_R2 2 #define DGST_R3 3 -#include "include/kernel_functions.c" -#include "OpenCL/types_ocl.c" -#include "OpenCL/common.c" +#include "inc_hash_functions.cl" +#include "inc_types.cl" +#include "inc_common.cl" -#define COMPARE_S "OpenCL/check_single_comp4.c" -#define COMPARE_M "OpenCL/check_multi_comp4.c" +#define COMPARE_S "inc_comp_single.cl" +#define COMPARE_M "inc_comp_multi.cl" // http://www.schneier.com/code/constants.txt diff --git a/OpenCL/m03710_a0.cl b/OpenCL/m03710_a0.cl index 4ee6320..74aa5e8 100644 --- a/OpenCL/m03710_a0.cl +++ b/OpenCL/m03710_a0.cl @@ -9,20 +9,20 @@ #define NEW_SIMD_CODE -#include "include/constants.h" -#include "include/kernel_vendor.h" +#include "inc_hash_constants.h" +#include "inc_vendor.cl" #define DGST_R0 0 #define DGST_R1 3 #define DGST_R2 2 #define DGST_R3 1 -#include "include/kernel_functions.c" -#include "OpenCL/types_ocl.c" -#include "OpenCL/common.c" -#include "include/rp_kernel.h" -#include "OpenCL/rp.c" -#include "OpenCL/simd.c" +#include "inc_hash_functions.cl" +#include "inc_types.cl" +#include "inc_common.cl" +#include "inc_rp.h" +#include "inc_rp.cl" +#include "inc_simd.cl" #if VECT_SIZE == 1 #define uint_to_hex_lower8(i) (u32x) (l_bin2asc[(i)]) diff --git a/OpenCL/m03710_a1.cl b/OpenCL/m03710_a1.cl index f3f777a..c164fdf 100644 --- a/OpenCL/m03710_a1.cl +++ b/OpenCL/m03710_a1.cl @@ -7,18 +7,18 @@ #define NEW_SIMD_CODE -#include "include/constants.h" -#include "include/kernel_vendor.h" +#include "inc_hash_constants.h" +#include "inc_vendor.cl" #define DGST_R0 0 #define DGST_R1 3 #define DGST_R2 2 #define DGST_R3 1 -#include "include/kernel_functions.c" -#include "OpenCL/types_ocl.c" -#include "OpenCL/common.c" -#include "OpenCL/simd.c" +#include "inc_hash_functions.cl" +#include "inc_types.cl" +#include "inc_common.cl" +#include "inc_simd.cl" #if VECT_SIZE == 1 #define uint_to_hex_lower8(i) (u32x) (l_bin2asc[(i)]) diff --git a/OpenCL/m03710_a3.cl b/OpenCL/m03710_a3.cl index 7d3a1ab..9e5eacd 100644 --- a/OpenCL/m03710_a3.cl +++ b/OpenCL/m03710_a3.cl @@ -10,18 +10,18 @@ #define NEW_SIMD_CODE -#include "include/constants.h" -#include "include/kernel_vendor.h" +#include "inc_hash_constants.h" +#include "inc_vendor.cl" #define DGST_R0 0 #define DGST_R1 3 #define DGST_R2 2 #define DGST_R3 1 -#include "include/kernel_functions.c" -#include "OpenCL/types_ocl.c" -#include "OpenCL/common.c" -#include "OpenCL/simd.c" +#include "inc_hash_functions.cl" +#include "inc_types.cl" +#include "inc_common.cl" +#include "inc_simd.cl" #if VECT_SIZE == 1 #define uint_to_hex_lower8(i) (u32x) (l_bin2asc[(i)]) diff --git a/OpenCL/m03800_a0.cl b/OpenCL/m03800_a0.cl index f4b311e..ee926d8 100644 --- a/OpenCL/m03800_a0.cl +++ b/OpenCL/m03800_a0.cl @@ -7,20 +7,20 @@ #define NEW_SIMD_CODE -#include "include/constants.h" -#include "include/kernel_vendor.h" +#include "inc_hash_constants.h" +#include "inc_vendor.cl" #define DGST_R0 0 #define DGST_R1 3 #define DGST_R2 2 #define DGST_R3 1 -#include "include/kernel_functions.c" -#include "OpenCL/types_ocl.c" -#include "OpenCL/common.c" -#include "include/rp_kernel.h" -#include "OpenCL/rp.c" -#include "OpenCL/simd.c" +#include "inc_hash_functions.cl" +#include "inc_types.cl" +#include "inc_common.cl" +#include "inc_rp.h" +#include "inc_rp.cl" +#include "inc_simd.cl" __kernel void m03800_m04 (__global pw_t *pws, __global kernel_rule_t *rules_buf, __global comb_t *combs_buf, __global bf_t *bfs_buf, __global void *tmps, __global void *hooks, __global u32 *bitmaps_buf_s1_a, __global u32 *bitmaps_buf_s1_b, __global u32 *bitmaps_buf_s1_c, __global u32 *bitmaps_buf_s1_d, __global u32 *bitmaps_buf_s2_a, __global u32 *bitmaps_buf_s2_b, __global u32 *bitmaps_buf_s2_c, __global u32 *bitmaps_buf_s2_d, __global plain_t *plains_buf, __global digest_t *digests_buf, __global u32 *hashes_shown, __global salt_t *salt_bufs, __global void *esalt_bufs, __global u32 *d_return_buf, __global u32 *d_scryptV_buf, const u32 bitmap_mask, const u32 bitmap_shift1, const u32 bitmap_shift2, const u32 salt_pos, const u32 loop_pos, const u32 loop_cnt, const u32 il_cnt, const u32 digests_cnt, const u32 digests_offset, const u32 combs_mode, const u32 gid_max) { diff --git a/OpenCL/m03800_a1.cl b/OpenCL/m03800_a1.cl index e860d07..f727a02 100644 --- a/OpenCL/m03800_a1.cl +++ b/OpenCL/m03800_a1.cl @@ -7,18 +7,18 @@ #define NEW_SIMD_CODE -#include "include/constants.h" -#include "include/kernel_vendor.h" +#include "inc_hash_constants.h" +#include "inc_vendor.cl" #define DGST_R0 0 #define DGST_R1 3 #define DGST_R2 2 #define DGST_R3 1 -#include "include/kernel_functions.c" -#include "OpenCL/types_ocl.c" -#include "OpenCL/common.c" -#include "OpenCL/simd.c" +#include "inc_hash_functions.cl" +#include "inc_types.cl" +#include "inc_common.cl" +#include "inc_simd.cl" __kernel void m03800_m04 (__global pw_t *pws, __global kernel_rule_t *rules_buf, __global comb_t *combs_buf, __global bf_t *bfs_buf, __global void *tmps, __global void *hooks, __global u32 *bitmaps_buf_s1_a, __global u32 *bitmaps_buf_s1_b, __global u32 *bitmaps_buf_s1_c, __global u32 *bitmaps_buf_s1_d, __global u32 *bitmaps_buf_s2_a, __global u32 *bitmaps_buf_s2_b, __global u32 *bitmaps_buf_s2_c, __global u32 *bitmaps_buf_s2_d, __global plain_t *plains_buf, __global digest_t *digests_buf, __global u32 *hashes_shown, __global salt_t *salt_bufs, __global void *esalt_bufs, __global u32 *d_return_buf, __global u32 *d_scryptV_buf, const u32 bitmap_mask, const u32 bitmap_shift1, const u32 bitmap_shift2, const u32 salt_pos, const u32 loop_pos, const u32 loop_cnt, const u32 il_cnt, const u32 digests_cnt, const u32 digests_offset, const u32 combs_mode, const u32 gid_max) { diff --git a/OpenCL/m03800_a3.cl b/OpenCL/m03800_a3.cl index 9b31135..79af82b 100644 --- a/OpenCL/m03800_a3.cl +++ b/OpenCL/m03800_a3.cl @@ -7,18 +7,18 @@ #define NEW_SIMD_CODE -#include "include/constants.h" -#include "include/kernel_vendor.h" +#include "inc_hash_constants.h" +#include "inc_vendor.cl" #define DGST_R0 0 #define DGST_R1 3 #define DGST_R2 2 #define DGST_R3 1 -#include "include/kernel_functions.c" -#include "OpenCL/types_ocl.c" -#include "OpenCL/common.c" -#include "OpenCL/simd.c" +#include "inc_hash_functions.cl" +#include "inc_types.cl" +#include "inc_common.cl" +#include "inc_simd.cl" void m03800m (u32 w0[4], u32 w1[4], u32 w2[4], u32 w3[4], const u32 pw_len, __global pw_t *pws, __global kernel_rule_t *rules_buf, __global comb_t *combs_buf, __global bf_t *bfs_buf, __global void *tmps, __global void *hooks, __global u32 *bitmaps_buf_s1_a, __global u32 *bitmaps_buf_s1_b, __global u32 *bitmaps_buf_s1_c, __global u32 *bitmaps_buf_s1_d, __global u32 *bitmaps_buf_s2_a, __global u32 *bitmaps_buf_s2_b, __global u32 *bitmaps_buf_s2_c, __global u32 *bitmaps_buf_s2_d, __global plain_t *plains_buf, __global digest_t *digests_buf, __global u32 *hashes_shown, __global salt_t *salt_bufs, __global void *esalt_bufs, __global u32 *d_return_buf, __global u32 *d_scryptV_buf, const u32 bitmap_mask, const u32 bitmap_shift1, const u32 bitmap_shift2, const u32 salt_pos, const u32 loop_pos, const u32 loop_cnt, const u32 il_cnt, const u32 digests_cnt, const u32 digests_offset) { diff --git a/OpenCL/m04310_a0.cl b/OpenCL/m04310_a0.cl index 0cfd0cd..038f50d 100644 --- a/OpenCL/m04310_a0.cl +++ b/OpenCL/m04310_a0.cl @@ -9,20 +9,20 @@ #define NEW_SIMD_CODE -#include "include/constants.h" -#include "include/kernel_vendor.h" +#include "inc_hash_constants.h" +#include "inc_vendor.cl" #define DGST_R0 0 #define DGST_R1 3 #define DGST_R2 2 #define DGST_R3 1 -#include "include/kernel_functions.c" -#include "OpenCL/types_ocl.c" -#include "OpenCL/common.c" -#include "include/rp_kernel.h" -#include "OpenCL/rp.c" -#include "OpenCL/simd.c" +#include "inc_hash_functions.cl" +#include "inc_types.cl" +#include "inc_common.cl" +#include "inc_rp.h" +#include "inc_rp.cl" +#include "inc_simd.cl" #if VECT_SIZE == 1 #define uint_to_hex_upper8(i) (u32x) (l_bin2asc[(i)]) diff --git a/OpenCL/m04310_a1.cl b/OpenCL/m04310_a1.cl index f4cb7c1..356fd0e 100644 --- a/OpenCL/m04310_a1.cl +++ b/OpenCL/m04310_a1.cl @@ -7,18 +7,18 @@ #define NEW_SIMD_CODE -#include "include/constants.h" -#include "include/kernel_vendor.h" +#include "inc_hash_constants.h" +#include "inc_vendor.cl" #define DGST_R0 0 #define DGST_R1 3 #define DGST_R2 2 #define DGST_R3 1 -#include "include/kernel_functions.c" -#include "OpenCL/types_ocl.c" -#include "OpenCL/common.c" -#include "OpenCL/simd.c" +#include "inc_hash_functions.cl" +#include "inc_types.cl" +#include "inc_common.cl" +#include "inc_simd.cl" #if VECT_SIZE == 1 #define uint_to_hex_upper8(i) (u32x) (l_bin2asc[(i)]) diff --git a/OpenCL/m04310_a3.cl b/OpenCL/m04310_a3.cl index 5b50455..25c2a75 100644 --- a/OpenCL/m04310_a3.cl +++ b/OpenCL/m04310_a3.cl @@ -10,18 +10,18 @@ #define NEW_SIMD_CODE -#include "include/constants.h" -#include "include/kernel_vendor.h" +#include "inc_hash_constants.h" +#include "inc_vendor.cl" #define DGST_R0 0 #define DGST_R1 3 #define DGST_R2 2 #define DGST_R3 1 -#include "include/kernel_functions.c" -#include "OpenCL/types_ocl.c" -#include "OpenCL/common.c" -#include "OpenCL/simd.c" +#include "inc_hash_functions.cl" +#include "inc_types.cl" +#include "inc_common.cl" +#include "inc_simd.cl" #if VECT_SIZE == 1 #define uint_to_hex_upper8(i) (u32x) (l_bin2asc[(i)]) diff --git a/OpenCL/m04400_a0.cl b/OpenCL/m04400_a0.cl index f2b7f76..e6f65a4 100644 --- a/OpenCL/m04400_a0.cl +++ b/OpenCL/m04400_a0.cl @@ -9,20 +9,20 @@ #define NEW_SIMD_CODE -#include "include/constants.h" -#include "include/kernel_vendor.h" +#include "inc_hash_constants.h" +#include "inc_vendor.cl" #define DGST_R0 0 #define DGST_R1 3 #define DGST_R2 2 #define DGST_R3 1 -#include "include/kernel_functions.c" -#include "OpenCL/types_ocl.c" -#include "OpenCL/common.c" -#include "include/rp_kernel.h" -#include "OpenCL/rp.c" -#include "OpenCL/simd.c" +#include "inc_hash_functions.cl" +#include "inc_types.cl" +#include "inc_common.cl" +#include "inc_rp.h" +#include "inc_rp.cl" +#include "inc_simd.cl" #if VECT_SIZE == 1 #define uint_to_hex_lower8(i) (u32x) (l_bin2asc[(i)]) diff --git a/OpenCL/m04400_a1.cl b/OpenCL/m04400_a1.cl index 435e041..64a727b 100644 --- a/OpenCL/m04400_a1.cl +++ b/OpenCL/m04400_a1.cl @@ -7,18 +7,18 @@ #define NEW_SIMD_CODE -#include "include/constants.h" -#include "include/kernel_vendor.h" +#include "inc_hash_constants.h" +#include "inc_vendor.cl" #define DGST_R0 0 #define DGST_R1 3 #define DGST_R2 2 #define DGST_R3 1 -#include "include/kernel_functions.c" -#include "OpenCL/types_ocl.c" -#include "OpenCL/common.c" -#include "OpenCL/simd.c" +#include "inc_hash_functions.cl" +#include "inc_types.cl" +#include "inc_common.cl" +#include "inc_simd.cl" #if VECT_SIZE == 1 #define uint_to_hex_lower8(i) (u32x) (l_bin2asc[(i)]) diff --git a/OpenCL/m04400_a3.cl b/OpenCL/m04400_a3.cl index 76fb33b..3c587c6 100644 --- a/OpenCL/m04400_a3.cl +++ b/OpenCL/m04400_a3.cl @@ -9,18 +9,18 @@ #define NEW_SIMD_CODE -#include "include/constants.h" -#include "include/kernel_vendor.h" +#include "inc_hash_constants.h" +#include "inc_vendor.cl" #define DGST_R0 0 #define DGST_R1 3 #define DGST_R2 2 #define DGST_R3 1 -#include "include/kernel_functions.c" -#include "OpenCL/types_ocl.c" -#include "OpenCL/common.c" -#include "OpenCL/simd.c" +#include "inc_hash_functions.cl" +#include "inc_types.cl" +#include "inc_common.cl" +#include "inc_simd.cl" #if VECT_SIZE == 1 #define uint_to_hex_lower8(i) (u32x) (l_bin2asc[(i)]) diff --git a/OpenCL/m04500_a0.cl b/OpenCL/m04500_a0.cl index 56076a4..7e71655 100644 --- a/OpenCL/m04500_a0.cl +++ b/OpenCL/m04500_a0.cl @@ -9,20 +9,20 @@ #define NEW_SIMD_CODE -#include "include/constants.h" -#include "include/kernel_vendor.h" +#include "inc_hash_constants.h" +#include "inc_vendor.cl" #define DGST_R0 3 #define DGST_R1 4 #define DGST_R2 2 #define DGST_R3 1 -#include "include/kernel_functions.c" -#include "OpenCL/types_ocl.c" -#include "OpenCL/common.c" -#include "include/rp_kernel.h" -#include "OpenCL/rp.c" -#include "OpenCL/simd.c" +#include "inc_hash_functions.cl" +#include "inc_types.cl" +#include "inc_common.cl" +#include "inc_rp.h" +#include "inc_rp.cl" +#include "inc_simd.cl" #if VECT_SIZE == 1 #define uint_to_hex_lower8_le(i) (u32x) (l_bin2asc[(i)]) diff --git a/OpenCL/m04500_a1.cl b/OpenCL/m04500_a1.cl index 4fe75a1..d58956b 100644 --- a/OpenCL/m04500_a1.cl +++ b/OpenCL/m04500_a1.cl @@ -7,18 +7,18 @@ #define NEW_SIMD_CODE -#include "include/constants.h" -#include "include/kernel_vendor.h" +#include "inc_hash_constants.h" +#include "inc_vendor.cl" #define DGST_R0 3 #define DGST_R1 4 #define DGST_R2 2 #define DGST_R3 1 -#include "include/kernel_functions.c" -#include "OpenCL/types_ocl.c" -#include "OpenCL/common.c" -#include "OpenCL/simd.c" +#include "inc_hash_functions.cl" +#include "inc_types.cl" +#include "inc_common.cl" +#include "inc_simd.cl" #if VECT_SIZE == 1 #define uint_to_hex_lower8_le(i) (u32x) (l_bin2asc[(i)]) diff --git a/OpenCL/m04500_a3.cl b/OpenCL/m04500_a3.cl index 2d5ff62..f2c59f2 100644 --- a/OpenCL/m04500_a3.cl +++ b/OpenCL/m04500_a3.cl @@ -9,18 +9,18 @@ #define NEW_SIMD_CODE -#include "include/constants.h" -#include "include/kernel_vendor.h" +#include "inc_hash_constants.h" +#include "inc_vendor.cl" #define DGST_R0 3 #define DGST_R1 4 #define DGST_R2 2 #define DGST_R3 1 -#include "include/kernel_functions.c" -#include "OpenCL/types_ocl.c" -#include "OpenCL/common.c" -#include "OpenCL/simd.c" +#include "inc_hash_functions.cl" +#include "inc_types.cl" +#include "inc_common.cl" +#include "inc_simd.cl" #if VECT_SIZE == 1 #define uint_to_hex_lower8_le(i) (u32x) (l_bin2asc[(i)]) diff --git a/OpenCL/m04700_a0.cl b/OpenCL/m04700_a0.cl index bc73392..3d06321 100644 --- a/OpenCL/m04700_a0.cl +++ b/OpenCL/m04700_a0.cl @@ -9,20 +9,20 @@ #define NEW_SIMD_CODE -#include "include/constants.h" -#include "include/kernel_vendor.h" +#include "inc_hash_constants.h" +#include "inc_vendor.cl" #define DGST_R0 3 #define DGST_R1 4 #define DGST_R2 2 #define DGST_R3 1 -#include "include/kernel_functions.c" -#include "OpenCL/types_ocl.c" -#include "OpenCL/common.c" -#include "include/rp_kernel.h" -#include "OpenCL/rp.c" -#include "OpenCL/simd.c" +#include "inc_hash_functions.cl" +#include "inc_types.cl" +#include "inc_common.cl" +#include "inc_rp.h" +#include "inc_rp.cl" +#include "inc_simd.cl" #if VECT_SIZE == 1 #define uint_to_hex_lower8_le(i) (u32x) (l_bin2asc[(i)]) diff --git a/OpenCL/m04700_a1.cl b/OpenCL/m04700_a1.cl index b71ef75..3f572d3 100644 --- a/OpenCL/m04700_a1.cl +++ b/OpenCL/m04700_a1.cl @@ -7,18 +7,18 @@ #define NEW_SIMD_CODE -#include "include/constants.h" -#include "include/kernel_vendor.h" +#include "inc_hash_constants.h" +#include "inc_vendor.cl" #define DGST_R0 3 #define DGST_R1 4 #define DGST_R2 2 #define DGST_R3 1 -#include "include/kernel_functions.c" -#include "OpenCL/types_ocl.c" -#include "OpenCL/common.c" -#include "OpenCL/simd.c" +#include "inc_hash_functions.cl" +#include "inc_types.cl" +#include "inc_common.cl" +#include "inc_simd.cl" #if VECT_SIZE == 1 #define uint_to_hex_lower8_le(i) (u32x) (l_bin2asc[(i)]) diff --git a/OpenCL/m04700_a3.cl b/OpenCL/m04700_a3.cl index a1e13ee..a5f28cb 100644 --- a/OpenCL/m04700_a3.cl +++ b/OpenCL/m04700_a3.cl @@ -9,18 +9,18 @@ #define NEW_SIMD_CODE -#include "include/constants.h" -#include "include/kernel_vendor.h" +#include "inc_hash_constants.h" +#include "inc_vendor.cl" #define DGST_R0 3 #define DGST_R1 4 #define DGST_R2 2 #define DGST_R3 1 -#include "include/kernel_functions.c" -#include "OpenCL/types_ocl.c" -#include "OpenCL/common.c" -#include "OpenCL/simd.c" +#include "inc_hash_functions.cl" +#include "inc_types.cl" +#include "inc_common.cl" +#include "inc_simd.cl" #if VECT_SIZE == 1 #define uint_to_hex_lower8_le(i) (u32x) (l_bin2asc[(i)]) diff --git a/OpenCL/m04800_a0.cl b/OpenCL/m04800_a0.cl index 5df1807..72183d0 100644 --- a/OpenCL/m04800_a0.cl +++ b/OpenCL/m04800_a0.cl @@ -7,20 +7,20 @@ #define NEW_SIMD_CODE -#include "include/constants.h" -#include "include/kernel_vendor.h" +#include "inc_hash_constants.h" +#include "inc_vendor.cl" #define DGST_R0 0 #define DGST_R1 3 #define DGST_R2 2 #define DGST_R3 1 -#include "include/kernel_functions.c" -#include "OpenCL/types_ocl.c" -#include "OpenCL/common.c" -#include "include/rp_kernel.h" -#include "OpenCL/rp.c" -#include "OpenCL/simd.c" +#include "inc_hash_functions.cl" +#include "inc_types.cl" +#include "inc_common.cl" +#include "inc_rp.h" +#include "inc_rp.cl" +#include "inc_simd.cl" __kernel void m04800_m04 (__global pw_t *pws, __global kernel_rule_t *rules_buf, __global comb_t *combs_buf, __global bf_t *bfs_buf, __global void *tmps, __global void *hooks, __global u32 *bitmaps_buf_s1_a, __global u32 *bitmaps_buf_s1_b, __global u32 *bitmaps_buf_s1_c, __global u32 *bitmaps_buf_s1_d, __global u32 *bitmaps_buf_s2_a, __global u32 *bitmaps_buf_s2_b, __global u32 *bitmaps_buf_s2_c, __global u32 *bitmaps_buf_s2_d, __global plain_t *plains_buf, __global digest_t *digests_buf, __global u32 *hashes_shown, __global salt_t *salt_bufs, __global void *esalt_bufs, __global u32 *d_return_buf, __global u32 *d_scryptV_buf, const u32 bitmap_mask, const u32 bitmap_shift1, const u32 bitmap_shift2, const u32 salt_pos, const u32 loop_pos, const u32 loop_cnt, const u32 il_cnt, const u32 digests_cnt, const u32 digests_offset, const u32 combs_mode, const u32 gid_max) { diff --git a/OpenCL/m04800_a1.cl b/OpenCL/m04800_a1.cl index 7af41b7..4258491 100644 --- a/OpenCL/m04800_a1.cl +++ b/OpenCL/m04800_a1.cl @@ -7,18 +7,18 @@ #define NEW_SIMD_CODE -#include "include/constants.h" -#include "include/kernel_vendor.h" +#include "inc_hash_constants.h" +#include "inc_vendor.cl" #define DGST_R0 0 #define DGST_R1 3 #define DGST_R2 2 #define DGST_R3 1 -#include "include/kernel_functions.c" -#include "OpenCL/types_ocl.c" -#include "OpenCL/common.c" -#include "OpenCL/simd.c" +#include "inc_hash_functions.cl" +#include "inc_types.cl" +#include "inc_common.cl" +#include "inc_simd.cl" #if VECT_SIZE == 1 #define uint_to_hex_lower8_le(i) (u32x) (l_bin2asc[(i)]) diff --git a/OpenCL/m04800_a3.cl b/OpenCL/m04800_a3.cl index eea003d..52445bc 100644 --- a/OpenCL/m04800_a3.cl +++ b/OpenCL/m04800_a3.cl @@ -7,18 +7,18 @@ #define NEW_SIMD_CODE -#include "include/constants.h" -#include "include/kernel_vendor.h" +#include "inc_hash_constants.h" +#include "inc_vendor.cl" #define DGST_R0 0 #define DGST_R1 3 #define DGST_R2 2 #define DGST_R3 1 -#include "include/kernel_functions.c" -#include "OpenCL/types_ocl.c" -#include "OpenCL/common.c" -#include "OpenCL/simd.c" +#include "inc_hash_functions.cl" +#include "inc_types.cl" +#include "inc_common.cl" +#include "inc_simd.cl" void m04800m (u32 w0[4], u32 w1[4], u32 w2[4], u32 w3[4], const u32 pw_len, __global pw_t *pws, __global kernel_rule_t *rules_buf, __global comb_t *combs_buf, __global bf_t *bfs_buf, __global void *tmps, __global void *hooks, __global u32 *bitmaps_buf_s1_a, __global u32 *bitmaps_buf_s1_b, __global u32 *bitmaps_buf_s1_c, __global u32 *bitmaps_buf_s1_d, __global u32 *bitmaps_buf_s2_a, __global u32 *bitmaps_buf_s2_b, __global u32 *bitmaps_buf_s2_c, __global u32 *bitmaps_buf_s2_d, __global plain_t *plains_buf, __global digest_t *digests_buf, __global u32 *hashes_shown, __global salt_t *salt_bufs, __global void *esalt_bufs, __global u32 *d_return_buf, __global u32 *d_scryptV_buf, const u32 bitmap_mask, const u32 bitmap_shift1, const u32 bitmap_shift2, const u32 salt_pos, const u32 loop_pos, const u32 loop_cnt, const u32 il_cnt, const u32 digests_cnt, const u32 digests_offset) { diff --git a/OpenCL/m04900_a0.cl b/OpenCL/m04900_a0.cl index 15d8ec2..6ad2453 100644 --- a/OpenCL/m04900_a0.cl +++ b/OpenCL/m04900_a0.cl @@ -7,20 +7,20 @@ #define NEW_SIMD_CODE -#include "include/constants.h" -#include "include/kernel_vendor.h" +#include "inc_hash_constants.h" +#include "inc_vendor.cl" #define DGST_R0 3 #define DGST_R1 4 #define DGST_R2 2 #define DGST_R3 1 -#include "include/kernel_functions.c" -#include "OpenCL/types_ocl.c" -#include "OpenCL/common.c" -#include "include/rp_kernel.h" -#include "OpenCL/rp.c" -#include "OpenCL/simd.c" +#include "inc_hash_functions.cl" +#include "inc_types.cl" +#include "inc_common.cl" +#include "inc_rp.h" +#include "inc_rp.cl" +#include "inc_simd.cl" __kernel void m04900_m04 (__global pw_t *pws, __global kernel_rule_t *rules_buf, __global comb_t *combs_buf, __global bf_t *bfs_buf, __global void *tmps, __global void *hooks, __global u32 *bitmaps_buf_s1_a, __global u32 *bitmaps_buf_s1_b, __global u32 *bitmaps_buf_s1_c, __global u32 *bitmaps_buf_s1_d, __global u32 *bitmaps_buf_s2_a, __global u32 *bitmaps_buf_s2_b, __global u32 *bitmaps_buf_s2_c, __global u32 *bitmaps_buf_s2_d, __global plain_t *plains_buf, __global digest_t *digests_buf, __global u32 *hashes_shown, __global salt_t *salt_bufs, __global void *esalt_bufs, __global u32 *d_return_buf, __global u32 *d_scryptV_buf, const u32 bitmap_mask, const u32 bitmap_shift1, const u32 bitmap_shift2, const u32 salt_pos, const u32 loop_pos, const u32 loop_cnt, const u32 il_cnt, const u32 digests_cnt, const u32 digests_offset, const u32 combs_mode, const u32 gid_max) { diff --git a/OpenCL/m04900_a1.cl b/OpenCL/m04900_a1.cl index 31b9ae4..79be593 100644 --- a/OpenCL/m04900_a1.cl +++ b/OpenCL/m04900_a1.cl @@ -7,18 +7,18 @@ #define NEW_SIMD_CODE -#include "include/constants.h" -#include "include/kernel_vendor.h" +#include "inc_hash_constants.h" +#include "inc_vendor.cl" #define DGST_R0 3 #define DGST_R1 4 #define DGST_R2 2 #define DGST_R3 1 -#include "include/kernel_functions.c" -#include "OpenCL/types_ocl.c" -#include "OpenCL/common.c" -#include "OpenCL/simd.c" +#include "inc_hash_functions.cl" +#include "inc_types.cl" +#include "inc_common.cl" +#include "inc_simd.cl" __kernel void m04900_m04 (__global pw_t *pws, __global kernel_rule_t *rules_buf, __global comb_t *combs_buf, __global bf_t *bfs_buf, __global void *tmps, __global void *hooks, __global u32 *bitmaps_buf_s1_a, __global u32 *bitmaps_buf_s1_b, __global u32 *bitmaps_buf_s1_c, __global u32 *bitmaps_buf_s1_d, __global u32 *bitmaps_buf_s2_a, __global u32 *bitmaps_buf_s2_b, __global u32 *bitmaps_buf_s2_c, __global u32 *bitmaps_buf_s2_d, __global plain_t *plains_buf, __global digest_t *digests_buf, __global u32 *hashes_shown, __global salt_t *salt_bufs, __global void *esalt_bufs, __global u32 *d_return_buf, __global u32 *d_scryptV_buf, const u32 bitmap_mask, const u32 bitmap_shift1, const u32 bitmap_shift2, const u32 salt_pos, const u32 loop_pos, const u32 loop_cnt, const u32 il_cnt, const u32 digests_cnt, const u32 digests_offset, const u32 combs_mode, const u32 gid_max) { diff --git a/OpenCL/m04900_a3.cl b/OpenCL/m04900_a3.cl index 9cf2ba0..b7b75b8 100644 --- a/OpenCL/m04900_a3.cl +++ b/OpenCL/m04900_a3.cl @@ -7,18 +7,18 @@ #define NEW_SIMD_CODE -#include "include/constants.h" -#include "include/kernel_vendor.h" +#include "inc_hash_constants.h" +#include "inc_vendor.cl" #define DGST_R0 3 #define DGST_R1 4 #define DGST_R2 2 #define DGST_R3 1 -#include "include/kernel_functions.c" -#include "OpenCL/types_ocl.c" -#include "OpenCL/common.c" -#include "OpenCL/simd.c" +#include "inc_hash_functions.cl" +#include "inc_types.cl" +#include "inc_common.cl" +#include "inc_simd.cl" void m04900m (u32 w0[4], u32 w1[4], u32 w2[4], u32 w3[4], const u32 pw_len, __global pw_t *pws, __global kernel_rule_t *rules_buf, __global comb_t *combs_buf, __global bf_t *bfs_buf, __global void *tmps, __global void *hooks, __global u32 *bitmaps_buf_s1_a, __global u32 *bitmaps_buf_s1_b, __global u32 *bitmaps_buf_s1_c, __global u32 *bitmaps_buf_s1_d, __global u32 *bitmaps_buf_s2_a, __global u32 *bitmaps_buf_s2_b, __global u32 *bitmaps_buf_s2_c, __global u32 *bitmaps_buf_s2_d, __global plain_t *plains_buf, __global digest_t *digests_buf, __global u32 *hashes_shown, __global salt_t *salt_bufs, __global void *esalt_bufs, __global u32 *d_return_buf, __global u32 *d_scryptV_buf, const u32 bitmap_mask, const u32 bitmap_shift1, const u32 bitmap_shift2, const u32 salt_pos, const u32 loop_pos, const u32 loop_cnt, const u32 il_cnt, const u32 digests_cnt, const u32 digests_offset) { diff --git a/OpenCL/m05000_a0.cl b/OpenCL/m05000_a0.cl index 7bada0e..8d53020 100644 --- a/OpenCL/m05000_a0.cl +++ b/OpenCL/m05000_a0.cl @@ -7,20 +7,20 @@ #define NEW_SIMD_CODE -#include "include/constants.h" -#include "include/kernel_vendor.h" +#include "inc_hash_constants.h" +#include "inc_vendor.cl" #define DGST_R0 2 #define DGST_R1 3 #define DGST_R2 4 #define DGST_R3 5 -#include "include/kernel_functions.c" -#include "OpenCL/types_ocl.c" -#include "OpenCL/common.c" -#include "include/rp_kernel.h" -#include "OpenCL/rp.c" -#include "OpenCL/simd.c" +#include "inc_hash_functions.cl" +#include "inc_types.cl" +#include "inc_common.cl" +#include "inc_rp.h" +#include "inc_rp.cl" +#include "inc_simd.cl" __constant u64 keccakf_rndc[24] = { diff --git a/OpenCL/m05000_a1.cl b/OpenCL/m05000_a1.cl index 7d22c13..b6ef979 100644 --- a/OpenCL/m05000_a1.cl +++ b/OpenCL/m05000_a1.cl @@ -7,18 +7,18 @@ #define NEW_SIMD_CODE -#include "include/constants.h" -#include "include/kernel_vendor.h" +#include "inc_hash_constants.h" +#include "inc_vendor.cl" #define DGST_R0 2 #define DGST_R1 3 #define DGST_R2 4 #define DGST_R3 5 -#include "include/kernel_functions.c" -#include "OpenCL/types_ocl.c" -#include "OpenCL/common.c" -#include "OpenCL/simd.c" +#include "inc_hash_functions.cl" +#include "inc_types.cl" +#include "inc_common.cl" +#include "inc_simd.cl" __constant u64 keccakf_rndc[24] = { diff --git a/OpenCL/m05000_a3.cl b/OpenCL/m05000_a3.cl index e057e16..30c4ea1 100644 --- a/OpenCL/m05000_a3.cl +++ b/OpenCL/m05000_a3.cl @@ -7,18 +7,18 @@ #define NEW_SIMD_CODE -#include "include/constants.h" -#include "include/kernel_vendor.h" +#include "inc_hash_constants.h" +#include "inc_vendor.cl" #define DGST_R0 2 #define DGST_R1 3 #define DGST_R2 4 #define DGST_R3 5 -#include "include/kernel_functions.c" -#include "OpenCL/types_ocl.c" -#include "OpenCL/common.c" -#include "OpenCL/simd.c" +#include "inc_hash_functions.cl" +#include "inc_types.cl" +#include "inc_common.cl" +#include "inc_simd.cl" __constant u64 keccakf_rndc[24] = { diff --git a/OpenCL/m05100_a0.cl b/OpenCL/m05100_a0.cl index 5f6593b..e3625a0 100644 --- a/OpenCL/m05100_a0.cl +++ b/OpenCL/m05100_a0.cl @@ -7,20 +7,20 @@ #define NEW_SIMD_CODE -#include "include/constants.h" -#include "include/kernel_vendor.h" +#include "inc_hash_constants.h" +#include "inc_vendor.cl" #define DGST_R0 0 #define DGST_R1 1 #define DGST_R2 2 #define DGST_R3 3 -#include "include/kernel_functions.c" -#include "OpenCL/types_ocl.c" -#include "OpenCL/common.c" -#include "include/rp_kernel.h" -#include "OpenCL/rp.c" -#include "OpenCL/simd.c" +#include "inc_hash_functions.cl" +#include "inc_types.cl" +#include "inc_common.cl" +#include "inc_rp.h" +#include "inc_rp.cl" +#include "inc_simd.cl" __kernel void m05100_m04 (__global pw_t *pws, __global kernel_rule_t *rules_buf, __global comb_t *combs_buf, __global bf_t *bfs_buf, __global void *tmps, __global void *hooks, __global u32 *bitmaps_buf_s1_a, __global u32 *bitmaps_buf_s1_b, __global u32 *bitmaps_buf_s1_c, __global u32 *bitmaps_buf_s1_d, __global u32 *bitmaps_buf_s2_a, __global u32 *bitmaps_buf_s2_b, __global u32 *bitmaps_buf_s2_c, __global u32 *bitmaps_buf_s2_d, __global plain_t *plains_buf, __global digest_t *digests_buf, __global u32 *hashes_shown, __global salt_t *salt_bufs, __global void *esalt_bufs, __global u32 *d_return_buf, __global u32 *d_scryptV_buf, const u32 bitmap_mask, const u32 bitmap_shift1, const u32 bitmap_shift2, const u32 salt_pos, const u32 loop_pos, const u32 loop_cnt, const u32 il_cnt, const u32 digests_cnt, const u32 digests_offset, const u32 combs_mode, const u32 gid_max) { diff --git a/OpenCL/m05100_a1.cl b/OpenCL/m05100_a1.cl index 795f883..7b0f470 100644 --- a/OpenCL/m05100_a1.cl +++ b/OpenCL/m05100_a1.cl @@ -7,18 +7,18 @@ #define NEW_SIMD_CODE -#include "include/constants.h" -#include "include/kernel_vendor.h" +#include "inc_hash_constants.h" +#include "inc_vendor.cl" #define DGST_R0 0 #define DGST_R1 1 #define DGST_R2 2 #define DGST_R3 3 -#include "include/kernel_functions.c" -#include "OpenCL/types_ocl.c" -#include "OpenCL/common.c" -#include "OpenCL/simd.c" +#include "inc_hash_functions.cl" +#include "inc_types.cl" +#include "inc_common.cl" +#include "inc_simd.cl" __kernel void m05100_m04 (__global pw_t *pws, __global kernel_rule_t *rules_buf, __global comb_t *combs_buf, __global bf_t *bfs_buf, __global void *tmps, __global void *hooks, __global u32 *bitmaps_buf_s1_a, __global u32 *bitmaps_buf_s1_b, __global u32 *bitmaps_buf_s1_c, __global u32 *bitmaps_buf_s1_d, __global u32 *bitmaps_buf_s2_a, __global u32 *bitmaps_buf_s2_b, __global u32 *bitmaps_buf_s2_c, __global u32 *bitmaps_buf_s2_d, __global plain_t *plains_buf, __global digest_t *digests_buf, __global u32 *hashes_shown, __global salt_t *salt_bufs, __global void *esalt_bufs, __global u32 *d_return_buf, __global u32 *d_scryptV_buf, const u32 bitmap_mask, const u32 bitmap_shift1, const u32 bitmap_shift2, const u32 salt_pos, const u32 loop_pos, const u32 loop_cnt, const u32 il_cnt, const u32 digests_cnt, const u32 digests_offset, const u32 combs_mode, const u32 gid_max) { diff --git a/OpenCL/m05100_a3.cl b/OpenCL/m05100_a3.cl index 5a41ae2..7aa9226 100644 --- a/OpenCL/m05100_a3.cl +++ b/OpenCL/m05100_a3.cl @@ -7,18 +7,18 @@ #define NEW_SIMD_CODE -#include "include/constants.h" -#include "include/kernel_vendor.h" +#include "inc_hash_constants.h" +#include "inc_vendor.cl" #define DGST_R0 0 #define DGST_R1 1 #define DGST_R2 2 #define DGST_R3 3 -#include "include/kernel_functions.c" -#include "OpenCL/types_ocl.c" -#include "OpenCL/common.c" -#include "OpenCL/simd.c" +#include "inc_hash_functions.cl" +#include "inc_types.cl" +#include "inc_common.cl" +#include "inc_simd.cl" void m05100m (u32 w0[4], u32 w1[4], u32 w2[4], u32 w3[4], const u32 pw_len, __global pw_t *pws, __global kernel_rule_t *rules_buf, __global comb_t *combs_buf, __global bf_t *bfs_buf, __global void *tmps, __global void *hooks, __global u32 *bitmaps_buf_s1_a, __global u32 *bitmaps_buf_s1_b, __global u32 *bitmaps_buf_s1_c, __global u32 *bitmaps_buf_s1_d, __global u32 *bitmaps_buf_s2_a, __global u32 *bitmaps_buf_s2_b, __global u32 *bitmaps_buf_s2_c, __global u32 *bitmaps_buf_s2_d, __global plain_t *plains_buf, __global digest_t *digests_buf, __global u32 *hashes_shown, __global salt_t *salt_bufs, __global void *esalt_bufs, __global u32 *d_return_buf, __global u32 *d_scryptV_buf, const u32 bitmap_mask, const u32 bitmap_shift1, const u32 bitmap_shift2, const u32 salt_pos, const u32 loop_pos, const u32 loop_cnt, const u32 il_cnt, const u32 digests_cnt, const u32 digests_offset) { diff --git a/OpenCL/m05200.cl b/OpenCL/m05200.cl index abd2912..2fb4547 100644 --- a/OpenCL/m05200.cl +++ b/OpenCL/m05200.cl @@ -5,20 +5,20 @@ #define _SHA256_ -#include "include/constants.h" -#include "include/kernel_vendor.h" +#include "inc_hash_constants.h" +#include "inc_vendor.cl" #define DGST_R0 0 #define DGST_R1 1 #define DGST_R2 2 #define DGST_R3 3 -#include "include/kernel_functions.c" -#include "OpenCL/types_ocl.c" -#include "OpenCL/common.c" +#include "inc_hash_functions.cl" +#include "inc_types.cl" +#include "inc_common.cl" -#define COMPARE_S "OpenCL/check_single_comp4.c" -#define COMPARE_M "OpenCL/check_multi_comp4.c" +#define COMPARE_S "inc_comp_single.cl" +#define COMPARE_M "inc_comp_multi.cl" __constant u32 k_sha256[64] = { diff --git a/OpenCL/m05300_a0.cl b/OpenCL/m05300_a0.cl index 943589d..0fc2f1a 100644 --- a/OpenCL/m05300_a0.cl +++ b/OpenCL/m05300_a0.cl @@ -7,20 +7,20 @@ #define NEW_SIMD_CODE -#include "include/constants.h" -#include "include/kernel_vendor.h" +#include "inc_hash_constants.h" +#include "inc_vendor.cl" #define DGST_R0 0 #define DGST_R1 3 #define DGST_R2 2 #define DGST_R3 1 -#include "include/kernel_functions.c" -#include "OpenCL/types_ocl.c" -#include "OpenCL/common.c" -#include "include/rp_kernel.h" -#include "OpenCL/rp.c" -#include "OpenCL/simd.c" +#include "inc_hash_functions.cl" +#include "inc_types.cl" +#include "inc_common.cl" +#include "inc_rp.h" +#include "inc_rp.cl" +#include "inc_simd.cl" void md5_transform (const u32x w0[4], const u32x w1[4], const u32x w2[4], const u32x w3[4], u32x digest[4]) { diff --git a/OpenCL/m05300_a1.cl b/OpenCL/m05300_a1.cl index 9f4e6e9..7c53c3b 100644 --- a/OpenCL/m05300_a1.cl +++ b/OpenCL/m05300_a1.cl @@ -7,18 +7,18 @@ #define NEW_SIMD_CODE -#include "include/constants.h" -#include "include/kernel_vendor.h" +#include "inc_hash_constants.h" +#include "inc_vendor.cl" #define DGST_R0 0 #define DGST_R1 3 #define DGST_R2 2 #define DGST_R3 1 -#include "include/kernel_functions.c" -#include "OpenCL/types_ocl.c" -#include "OpenCL/common.c" -#include "OpenCL/simd.c" +#include "inc_hash_functions.cl" +#include "inc_types.cl" +#include "inc_common.cl" +#include "inc_simd.cl" void md5_transform (const u32x w0[4], const u32x w1[4], const u32x w2[4], const u32x w3[4], u32x digest[4]) { diff --git a/OpenCL/m05300_a3.cl b/OpenCL/m05300_a3.cl index ee2d43c..276c2a3 100644 --- a/OpenCL/m05300_a3.cl +++ b/OpenCL/m05300_a3.cl @@ -9,18 +9,18 @@ #define NEW_SIMD_CODE -#include "include/constants.h" -#include "include/kernel_vendor.h" +#include "inc_hash_constants.h" +#include "inc_vendor.cl" #define DGST_R0 0 #define DGST_R1 3 #define DGST_R2 2 #define DGST_R3 1 -#include "include/kernel_functions.c" -#include "OpenCL/types_ocl.c" -#include "OpenCL/common.c" -#include "OpenCL/simd.c" +#include "inc_hash_functions.cl" +#include "inc_types.cl" +#include "inc_common.cl" +#include "inc_simd.cl" void md5_transform (const u32x w0[4], const u32x w1[4], const u32x w2[4], const u32x w3[4], u32x digest[4]) { diff --git a/OpenCL/m05400_a0.cl b/OpenCL/m05400_a0.cl index d881a58..a722c53 100644 --- a/OpenCL/m05400_a0.cl +++ b/OpenCL/m05400_a0.cl @@ -7,20 +7,20 @@ #define NEW_SIMD_CODE -#include "include/constants.h" -#include "include/kernel_vendor.h" +#include "inc_hash_constants.h" +#include "inc_vendor.cl" #define DGST_R0 3 #define DGST_R1 4 #define DGST_R2 2 #define DGST_R3 1 -#include "include/kernel_functions.c" -#include "OpenCL/types_ocl.c" -#include "OpenCL/common.c" -#include "include/rp_kernel.h" -#include "OpenCL/rp.c" -#include "OpenCL/simd.c" +#include "inc_hash_functions.cl" +#include "inc_types.cl" +#include "inc_common.cl" +#include "inc_rp.h" +#include "inc_rp.cl" +#include "inc_simd.cl" void sha1_transform (const u32x w0[4], const u32x w1[4], const u32x w2[4], const u32x w3[4], u32x digest[5]) { diff --git a/OpenCL/m05400_a1.cl b/OpenCL/m05400_a1.cl index 4958b39..ec2955d 100644 --- a/OpenCL/m05400_a1.cl +++ b/OpenCL/m05400_a1.cl @@ -7,18 +7,18 @@ #define NEW_SIMD_CODE -#include "include/constants.h" -#include "include/kernel_vendor.h" +#include "inc_hash_constants.h" +#include "inc_vendor.cl" #define DGST_R0 3 #define DGST_R1 4 #define DGST_R2 2 #define DGST_R3 1 -#include "include/kernel_functions.c" -#include "OpenCL/types_ocl.c" -#include "OpenCL/common.c" -#include "OpenCL/simd.c" +#include "inc_hash_functions.cl" +#include "inc_types.cl" +#include "inc_common.cl" +#include "inc_simd.cl" void sha1_transform (const u32x w0[4], const u32x w1[4], const u32x w2[4], const u32x w3[4], u32x digest[5]) { diff --git a/OpenCL/m05400_a3.cl b/OpenCL/m05400_a3.cl index d4d91fb..f76af43 100644 --- a/OpenCL/m05400_a3.cl +++ b/OpenCL/m05400_a3.cl @@ -9,18 +9,18 @@ #define NEW_SIMD_CODE -#include "include/constants.h" -#include "include/kernel_vendor.h" +#include "inc_hash_constants.h" +#include "inc_vendor.cl" #define DGST_R0 3 #define DGST_R1 4 #define DGST_R2 2 #define DGST_R3 1 -#include "include/kernel_functions.c" -#include "OpenCL/types_ocl.c" -#include "OpenCL/common.c" -#include "OpenCL/simd.c" +#include "inc_hash_functions.cl" +#include "inc_types.cl" +#include "inc_common.cl" +#include "inc_simd.cl" void sha1_transform (const u32x w0[4], const u32x w1[4], const u32x w2[4], const u32x w3[4], u32x digest[5]) { diff --git a/OpenCL/m05500_a0.cl b/OpenCL/m05500_a0.cl index 82ad293..90b7ad6 100644 --- a/OpenCL/m05500_a0.cl +++ b/OpenCL/m05500_a0.cl @@ -10,20 +10,20 @@ #define NEW_SIMD_CODE -#include "include/constants.h" -#include "include/kernel_vendor.h" +#include "inc_hash_constants.h" +#include "inc_vendor.cl" #define DGST_R0 0 #define DGST_R1 1 #define DGST_R2 2 #define DGST_R3 3 -#include "include/kernel_functions.c" -#include "OpenCL/types_ocl.c" -#include "OpenCL/common.c" -#include "include/rp_kernel.h" -#include "OpenCL/rp.c" -#include "OpenCL/simd.c" +#include "inc_hash_functions.cl" +#include "inc_types.cl" +#include "inc_common.cl" +#include "inc_rp.h" +#include "inc_rp.cl" +#include "inc_simd.cl" #define PERM_OP(a,b,tt,n,m) \ { \ diff --git a/OpenCL/m05500_a1.cl b/OpenCL/m05500_a1.cl index be2994c..12d2d48 100644 --- a/OpenCL/m05500_a1.cl +++ b/OpenCL/m05500_a1.cl @@ -9,18 +9,18 @@ #define NEW_SIMD_CODE -#include "include/constants.h" -#include "include/kernel_vendor.h" +#include "inc_hash_constants.h" +#include "inc_vendor.cl" #define DGST_R0 0 #define DGST_R1 1 #define DGST_R2 2 #define DGST_R3 3 -#include "include/kernel_functions.c" -#include "OpenCL/types_ocl.c" -#include "OpenCL/common.c" -#include "OpenCL/simd.c" +#include "inc_hash_functions.cl" +#include "inc_types.cl" +#include "inc_common.cl" +#include "inc_simd.cl" #define PERM_OP(a,b,tt,n,m) \ { \ diff --git a/OpenCL/m05500_a3.cl b/OpenCL/m05500_a3.cl index a9fc359..d77bb3b 100644 --- a/OpenCL/m05500_a3.cl +++ b/OpenCL/m05500_a3.cl @@ -10,18 +10,18 @@ #define NEW_SIMD_CODE -#include "include/constants.h" -#include "include/kernel_vendor.h" +#include "inc_hash_constants.h" +#include "inc_vendor.cl" #define DGST_R0 0 #define DGST_R1 1 #define DGST_R2 2 #define DGST_R3 3 -#include "include/kernel_functions.c" -#include "OpenCL/types_ocl.c" -#include "OpenCL/common.c" -#include "OpenCL/simd.c" +#include "inc_hash_functions.cl" +#include "inc_types.cl" +#include "inc_common.cl" +#include "inc_simd.cl" #define PERM_OP(a,b,tt,n,m) \ { \ diff --git a/OpenCL/m05600_a0.cl b/OpenCL/m05600_a0.cl index 74920b7..678cca8 100644 --- a/OpenCL/m05600_a0.cl +++ b/OpenCL/m05600_a0.cl @@ -7,20 +7,20 @@ #define NEW_SIMD_CODE -#include "include/constants.h" -#include "include/kernel_vendor.h" +#include "inc_hash_constants.h" +#include "inc_vendor.cl" #define DGST_R0 0 #define DGST_R1 3 #define DGST_R2 2 #define DGST_R3 1 -#include "include/kernel_functions.c" -#include "OpenCL/types_ocl.c" -#include "OpenCL/common.c" -#include "include/rp_kernel.h" -#include "OpenCL/rp.c" -#include "OpenCL/simd.c" +#include "inc_hash_functions.cl" +#include "inc_types.cl" +#include "inc_common.cl" +#include "inc_rp.h" +#include "inc_rp.cl" +#include "inc_simd.cl" void md4_transform (const u32x w0[4], const u32x w1[4], const u32x w2[4], const u32x w3[4], u32x digest[4]) { diff --git a/OpenCL/m05600_a1.cl b/OpenCL/m05600_a1.cl index e0d566b..8ce3e69 100644 --- a/OpenCL/m05600_a1.cl +++ b/OpenCL/m05600_a1.cl @@ -7,18 +7,18 @@ #define NEW_SIMD_CODE -#include "include/constants.h" -#include "include/kernel_vendor.h" +#include "inc_hash_constants.h" +#include "inc_vendor.cl" #define DGST_R0 0 #define DGST_R1 3 #define DGST_R2 2 #define DGST_R3 1 -#include "include/kernel_functions.c" -#include "OpenCL/types_ocl.c" -#include "OpenCL/common.c" -#include "OpenCL/simd.c" +#include "inc_hash_functions.cl" +#include "inc_types.cl" +#include "inc_common.cl" +#include "inc_simd.cl" void md4_transform (const u32x w0[4], const u32x w1[4], const u32x w2[4], const u32x w3[4], u32x digest[4]) { diff --git a/OpenCL/m05600_a3.cl b/OpenCL/m05600_a3.cl index 799dce0..90b28a5 100644 --- a/OpenCL/m05600_a3.cl +++ b/OpenCL/m05600_a3.cl @@ -9,18 +9,18 @@ #define NEW_SIMD_CODE -#include "include/constants.h" -#include "include/kernel_vendor.h" +#include "inc_hash_constants.h" +#include "inc_vendor.cl" #define DGST_R0 0 #define DGST_R1 3 #define DGST_R2 2 #define DGST_R3 1 -#include "include/kernel_functions.c" -#include "OpenCL/types_ocl.c" -#include "OpenCL/common.c" -#include "OpenCL/simd.c" +#include "inc_hash_functions.cl" +#include "inc_types.cl" +#include "inc_common.cl" +#include "inc_simd.cl" void md4_transform (const u32x w0[4], const u32x w1[4], const u32x w2[4], const u32x w3[4], u32x digest[4]) { diff --git a/OpenCL/m05800.cl b/OpenCL/m05800.cl index 1c363b7..fda4748 100644 --- a/OpenCL/m05800.cl +++ b/OpenCL/m05800.cl @@ -5,20 +5,20 @@ #define _SHA1_ -#include "include/constants.h" -#include "include/kernel_vendor.h" +#include "inc_hash_constants.h" +#include "inc_vendor.cl" #define DGST_R0 0 #define DGST_R1 1 #define DGST_R2 2 #define DGST_R3 3 -#include "include/kernel_functions.c" -#include "OpenCL/types_ocl.c" -#include "OpenCL/common.c" +#include "inc_hash_functions.cl" +#include "inc_types.cl" +#include "inc_common.cl" -#define COMPARE_S "OpenCL/check_single_comp4.c" -#define COMPARE_M "OpenCL/check_multi_comp4.c" +#define COMPARE_S "inc_comp_single.cl" +#define COMPARE_M "inc_comp_multi.cl" typedef struct { diff --git a/OpenCL/m06000_a0.cl b/OpenCL/m06000_a0.cl index 5f630f8..a9b4310 100644 --- a/OpenCL/m06000_a0.cl +++ b/OpenCL/m06000_a0.cl @@ -7,20 +7,20 @@ #define NEW_SIMD_CODE -#include "include/constants.h" -#include "include/kernel_vendor.h" +#include "inc_hash_constants.h" +#include "inc_vendor.cl" #define DGST_R0 0 #define DGST_R1 1 #define DGST_R2 2 #define DGST_R3 3 -#include "include/kernel_functions.c" -#include "OpenCL/types_ocl.c" -#include "OpenCL/common.c" -#include "include/rp_kernel.h" -#include "OpenCL/rp.c" -#include "OpenCL/simd.c" +#include "inc_hash_functions.cl" +#include "inc_types.cl" +#include "inc_common.cl" +#include "inc_rp.h" +#include "inc_rp.cl" +#include "inc_simd.cl" void ripemd160_transform (const u32x w[16], u32x dgst[5]) { diff --git a/OpenCL/m06000_a1.cl b/OpenCL/m06000_a1.cl index 29e546c..77d832e 100644 --- a/OpenCL/m06000_a1.cl +++ b/OpenCL/m06000_a1.cl @@ -7,18 +7,18 @@ #define NEW_SIMD_CODE -#include "include/constants.h" -#include "include/kernel_vendor.h" +#include "inc_hash_constants.h" +#include "inc_vendor.cl" #define DGST_R0 0 #define DGST_R1 1 #define DGST_R2 2 #define DGST_R3 3 -#include "include/kernel_functions.c" -#include "OpenCL/types_ocl.c" -#include "OpenCL/common.c" -#include "OpenCL/simd.c" +#include "inc_hash_functions.cl" +#include "inc_types.cl" +#include "inc_common.cl" +#include "inc_simd.cl" void ripemd160_transform (const u32x w[16], u32x dgst[5]) { diff --git a/OpenCL/m06000_a3.cl b/OpenCL/m06000_a3.cl index ac3eab8..c9222cd 100644 --- a/OpenCL/m06000_a3.cl +++ b/OpenCL/m06000_a3.cl @@ -7,18 +7,18 @@ #define NEW_SIMD_CODE -#include "include/constants.h" -#include "include/kernel_vendor.h" +#include "inc_hash_constants.h" +#include "inc_vendor.cl" #define DGST_R0 0 #define DGST_R1 1 #define DGST_R2 2 #define DGST_R3 3 -#include "include/kernel_functions.c" -#include "OpenCL/types_ocl.c" -#include "OpenCL/common.c" -#include "OpenCL/simd.c" +#include "inc_hash_functions.cl" +#include "inc_types.cl" +#include "inc_common.cl" +#include "inc_simd.cl" void ripemd160_transform (const u32x w[16], u32x dgst[5]) { diff --git a/OpenCL/m06100_a0.cl b/OpenCL/m06100_a0.cl index 3b0d23c..085f790 100644 --- a/OpenCL/m06100_a0.cl +++ b/OpenCL/m06100_a0.cl @@ -10,20 +10,20 @@ #define NEW_SIMD_CODE -#include "include/constants.h" -#include "include/kernel_vendor.h" +#include "inc_hash_constants.h" +#include "inc_vendor.cl" #define DGST_R0 0 #define DGST_R1 1 #define DGST_R2 2 #define DGST_R3 3 -#include "include/kernel_functions.c" -#include "OpenCL/types_ocl.c" -#include "OpenCL/common.c" -#include "include/rp_kernel.h" -#include "OpenCL/rp.c" -#include "OpenCL/simd.c" +#include "inc_hash_functions.cl" +#include "inc_types.cl" +#include "inc_common.cl" +#include "inc_rp.h" +#include "inc_rp.cl" +#include "inc_simd.cl" #define R 10 diff --git a/OpenCL/m06100_a1.cl b/OpenCL/m06100_a1.cl index 35005ae..2280f21 100644 --- a/OpenCL/m06100_a1.cl +++ b/OpenCL/m06100_a1.cl @@ -9,18 +9,18 @@ #define NEW_SIMD_CODE -#include "include/constants.h" -#include "include/kernel_vendor.h" +#include "inc_hash_constants.h" +#include "inc_vendor.cl" #define DGST_R0 0 #define DGST_R1 1 #define DGST_R2 2 #define DGST_R3 3 -#include "include/kernel_functions.c" -#include "OpenCL/types_ocl.c" -#include "OpenCL/common.c" -#include "OpenCL/simd.c" +#include "inc_hash_functions.cl" +#include "inc_types.cl" +#include "inc_common.cl" +#include "inc_simd.cl" #define R 10 diff --git a/OpenCL/m06100_a3.cl b/OpenCL/m06100_a3.cl index d613d2e..c26d3fb 100644 --- a/OpenCL/m06100_a3.cl +++ b/OpenCL/m06100_a3.cl @@ -10,18 +10,18 @@ #define NEW_SIMD_CODE -#include "include/constants.h" -#include "include/kernel_vendor.h" +#include "inc_hash_constants.h" +#include "inc_vendor.cl" #define DGST_R0 0 #define DGST_R1 1 #define DGST_R2 2 #define DGST_R3 3 -#include "include/kernel_functions.c" -#include "OpenCL/types_ocl.c" -#include "OpenCL/common.c" -#include "OpenCL/simd.c" +#include "inc_hash_functions.cl" +#include "inc_types.cl" +#include "inc_common.cl" +#include "inc_simd.cl" #define R 10 diff --git a/OpenCL/m06211.cl b/OpenCL/m06211.cl index da07d43..f3895da 100644 --- a/OpenCL/m06211.cl +++ b/OpenCL/m06211.cl @@ -5,21 +5,21 @@ #define _RIPEMD160_ -#include "include/constants.h" -#include "include/kernel_vendor.h" +#include "inc_hash_constants.h" +#include "inc_vendor.cl" #define DGST_R0 0 #define DGST_R1 1 #define DGST_R2 2 #define DGST_R3 3 -#include "include/kernel_functions.c" -#include "OpenCL/types_ocl.c" -#include "OpenCL/common.c" +#include "inc_hash_functions.cl" +#include "inc_types.cl" +#include "inc_common.cl" -#include "OpenCL/kernel_aes256.c" -#include "OpenCL/kernel_twofish256.c" -#include "OpenCL/kernel_serpent256.c" +#include "inc_cipher_aes256.cl" +#include "inc_cipher_twofish256.cl" +#include "inc_cipher_serpent256.cl" void ripemd160_transform (const u32 w[16], u32 dgst[5]) { diff --git a/OpenCL/m06212.cl b/OpenCL/m06212.cl index 7262ac3..d06cfd8 100644 --- a/OpenCL/m06212.cl +++ b/OpenCL/m06212.cl @@ -5,21 +5,21 @@ #define _RIPEMD160_ -#include "include/constants.h" -#include "include/kernel_vendor.h" +#include "inc_hash_constants.h" +#include "inc_vendor.cl" #define DGST_R0 0 #define DGST_R1 1 #define DGST_R2 2 #define DGST_R3 3 -#include "include/kernel_functions.c" -#include "OpenCL/types_ocl.c" -#include "OpenCL/common.c" +#include "inc_hash_functions.cl" +#include "inc_types.cl" +#include "inc_common.cl" -#include "OpenCL/kernel_aes256.c" -#include "OpenCL/kernel_twofish256.c" -#include "OpenCL/kernel_serpent256.c" +#include "inc_cipher_aes256.cl" +#include "inc_cipher_twofish256.cl" +#include "inc_cipher_serpent256.cl" void ripemd160_transform (const u32 w[16], u32 dgst[5]) { diff --git a/OpenCL/m06213.cl b/OpenCL/m06213.cl index 0b49be0..61a85c1 100644 --- a/OpenCL/m06213.cl +++ b/OpenCL/m06213.cl @@ -5,21 +5,21 @@ #define _RIPEMD160_ -#include "include/constants.h" -#include "include/kernel_vendor.h" +#include "inc_hash_constants.h" +#include "inc_vendor.cl" #define DGST_R0 0 #define DGST_R1 1 #define DGST_R2 2 #define DGST_R3 3 -#include "include/kernel_functions.c" -#include "OpenCL/types_ocl.c" -#include "OpenCL/common.c" +#include "inc_hash_functions.cl" +#include "inc_types.cl" +#include "inc_common.cl" -#include "OpenCL/kernel_aes256.c" -#include "OpenCL/kernel_twofish256.c" -#include "OpenCL/kernel_serpent256.c" +#include "inc_cipher_aes256.cl" +#include "inc_cipher_twofish256.cl" +#include "inc_cipher_serpent256.cl" void ripemd160_transform (const u32 w[16], u32 dgst[5]) { diff --git a/OpenCL/m06221.cl b/OpenCL/m06221.cl index 5959263..be8041f 100644 --- a/OpenCL/m06221.cl +++ b/OpenCL/m06221.cl @@ -5,21 +5,21 @@ #define _SHA512_ -#include "include/constants.h" -#include "include/kernel_vendor.h" +#include "inc_hash_constants.h" +#include "inc_vendor.cl" #define DGST_R0 0 #define DGST_R1 1 #define DGST_R2 2 #define DGST_R3 3 -#include "include/kernel_functions.c" -#include "OpenCL/types_ocl.c" -#include "OpenCL/common.c" +#include "inc_hash_functions.cl" +#include "inc_types.cl" +#include "inc_common.cl" -#include "OpenCL/kernel_aes256.c" -#include "OpenCL/kernel_twofish256.c" -#include "OpenCL/kernel_serpent256.c" +#include "inc_cipher_aes256.cl" +#include "inc_cipher_twofish256.cl" +#include "inc_cipher_serpent256.cl" __constant u64 k_sha512[80] = { diff --git a/OpenCL/m06222.cl b/OpenCL/m06222.cl index e416c66..1c09496 100644 --- a/OpenCL/m06222.cl +++ b/OpenCL/m06222.cl @@ -5,21 +5,21 @@ #define _SHA512_ -#include "include/constants.h" -#include "include/kernel_vendor.h" +#include "inc_hash_constants.h" +#include "inc_vendor.cl" #define DGST_R0 0 #define DGST_R1 1 #define DGST_R2 2 #define DGST_R3 3 -#include "include/kernel_functions.c" -#include "OpenCL/types_ocl.c" -#include "OpenCL/common.c" +#include "inc_hash_functions.cl" +#include "inc_types.cl" +#include "inc_common.cl" -#include "OpenCL/kernel_aes256.c" -#include "OpenCL/kernel_twofish256.c" -#include "OpenCL/kernel_serpent256.c" +#include "inc_cipher_aes256.cl" +#include "inc_cipher_twofish256.cl" +#include "inc_cipher_serpent256.cl" __constant u64 k_sha512[80] = { diff --git a/OpenCL/m06223.cl b/OpenCL/m06223.cl index c2007b0..3e7aa8d 100644 --- a/OpenCL/m06223.cl +++ b/OpenCL/m06223.cl @@ -5,21 +5,21 @@ #define _SHA512_ -#include "include/constants.h" -#include "include/kernel_vendor.h" +#include "inc_hash_constants.h" +#include "inc_vendor.cl" #define DGST_R0 0 #define DGST_R1 1 #define DGST_R2 2 #define DGST_R3 3 -#include "include/kernel_functions.c" -#include "OpenCL/types_ocl.c" -#include "OpenCL/common.c" +#include "inc_hash_functions.cl" +#include "inc_types.cl" +#include "inc_common.cl" -#include "OpenCL/kernel_aes256.c" -#include "OpenCL/kernel_twofish256.c" -#include "OpenCL/kernel_serpent256.c" +#include "inc_cipher_aes256.cl" +#include "inc_cipher_twofish256.cl" +#include "inc_cipher_serpent256.cl" __constant u64 k_sha512[80] = { diff --git a/OpenCL/m06231.cl b/OpenCL/m06231.cl index 90f248c..2ead1ea 100644 --- a/OpenCL/m06231.cl +++ b/OpenCL/m06231.cl @@ -7,21 +7,21 @@ #define _WHIRLPOOL_ -#include "include/constants.h" -#include "include/kernel_vendor.h" +#include "inc_hash_constants.h" +#include "inc_vendor.cl" #define DGST_R0 0 #define DGST_R1 1 #define DGST_R2 2 #define DGST_R3 3 -#include "include/kernel_functions.c" -#include "OpenCL/types_ocl.c" -#include "OpenCL/common.c" +#include "inc_hash_functions.cl" +#include "inc_types.cl" +#include "inc_common.cl" -#include "OpenCL/kernel_aes256.c" -#include "OpenCL/kernel_twofish256.c" -#include "OpenCL/kernel_serpent256.c" +#include "inc_cipher_aes256.cl" +#include "inc_cipher_twofish256.cl" +#include "inc_cipher_serpent256.cl" #define R 10 diff --git a/OpenCL/m06232.cl b/OpenCL/m06232.cl index 942de68..b10280e 100644 --- a/OpenCL/m06232.cl +++ b/OpenCL/m06232.cl @@ -7,21 +7,21 @@ #define _WHIRLPOOL_ -#include "include/constants.h" -#include "include/kernel_vendor.h" +#include "inc_hash_constants.h" +#include "inc_vendor.cl" #define DGST_R0 0 #define DGST_R1 1 #define DGST_R2 2 #define DGST_R3 3 -#include "include/kernel_functions.c" -#include "OpenCL/types_ocl.c" -#include "OpenCL/common.c" +#include "inc_hash_functions.cl" +#include "inc_types.cl" +#include "inc_common.cl" -#include "OpenCL/kernel_aes256.c" -#include "OpenCL/kernel_twofish256.c" -#include "OpenCL/kernel_serpent256.c" +#include "inc_cipher_aes256.cl" +#include "inc_cipher_twofish256.cl" +#include "inc_cipher_serpent256.cl" #define R 10 diff --git a/OpenCL/m06233.cl b/OpenCL/m06233.cl index acb6719..0235544 100644 --- a/OpenCL/m06233.cl +++ b/OpenCL/m06233.cl @@ -7,21 +7,21 @@ #define _WHIRLPOOL_ -#include "include/constants.h" -#include "include/kernel_vendor.h" +#include "inc_hash_constants.h" +#include "inc_vendor.cl" #define DGST_R0 0 #define DGST_R1 1 #define DGST_R2 2 #define DGST_R3 3 -#include "include/kernel_functions.c" -#include "OpenCL/types_ocl.c" -#include "OpenCL/common.c" +#include "inc_hash_functions.cl" +#include "inc_types.cl" +#include "inc_common.cl" -#include "OpenCL/kernel_aes256.c" -#include "OpenCL/kernel_twofish256.c" -#include "OpenCL/kernel_serpent256.c" +#include "inc_cipher_aes256.cl" +#include "inc_cipher_twofish256.cl" +#include "inc_cipher_serpent256.cl" #define R 10 diff --git a/OpenCL/m06300.cl b/OpenCL/m06300.cl index f4dcf90..cfdba3b 100644 --- a/OpenCL/m06300.cl +++ b/OpenCL/m06300.cl @@ -5,20 +5,20 @@ #define _MD5_ -#include "include/constants.h" -#include "include/kernel_vendor.h" +#include "inc_hash_constants.h" +#include "inc_vendor.cl" #define DGST_R0 0 #define DGST_R1 1 #define DGST_R2 2 #define DGST_R3 3 -#include "include/kernel_functions.c" -#include "OpenCL/types_ocl.c" -#include "OpenCL/common.c" +#include "inc_hash_functions.cl" +#include "inc_types.cl" +#include "inc_common.cl" -#define COMPARE_S "OpenCL/check_single_comp4.c" -#define COMPARE_M "OpenCL/check_multi_comp4.c" +#define COMPARE_S "inc_comp_single.cl" +#define COMPARE_M "inc_comp_multi.cl" void md5_transform (const u32 w0[4], const u32 w1[4], const u32 w2[4], const u32 w3[4], u32 digest[4]) { diff --git a/OpenCL/m06400.cl b/OpenCL/m06400.cl index 99e0dd8..8c632a5 100644 --- a/OpenCL/m06400.cl +++ b/OpenCL/m06400.cl @@ -5,20 +5,20 @@ #define _SHA256_ -#include "include/constants.h" -#include "include/kernel_vendor.h" +#include "inc_hash_constants.h" +#include "inc_vendor.cl" #define DGST_R0 0 #define DGST_R1 1 #define DGST_R2 2 #define DGST_R3 3 -#include "include/kernel_functions.c" -#include "OpenCL/types_ocl.c" -#include "OpenCL/common.c" +#include "inc_hash_functions.cl" +#include "inc_types.cl" +#include "inc_common.cl" -#define COMPARE_S "OpenCL/check_single_comp4.c" -#define COMPARE_M "OpenCL/check_multi_comp4.c" +#define COMPARE_S "inc_comp_single.cl" +#define COMPARE_M "inc_comp_multi.cl" __constant u32 k_sha256[64] = { diff --git a/OpenCL/m06500.cl b/OpenCL/m06500.cl index b5d77e1..5f23af1 100644 --- a/OpenCL/m06500.cl +++ b/OpenCL/m06500.cl @@ -5,20 +5,20 @@ #define _SHA512_ -#include "include/constants.h" -#include "include/kernel_vendor.h" +#include "inc_hash_constants.h" +#include "inc_vendor.cl" #define DGST_R0 0 #define DGST_R1 1 #define DGST_R2 2 #define DGST_R3 3 -#include "include/kernel_functions.c" -#include "OpenCL/types_ocl.c" -#include "OpenCL/common.c" +#include "inc_hash_functions.cl" +#include "inc_types.cl" +#include "inc_common.cl" -#define COMPARE_S "OpenCL/check_single_comp4.c" -#define COMPARE_M "OpenCL/check_multi_comp4.c" +#define COMPARE_S "inc_comp_single.cl" +#define COMPARE_M "inc_comp_multi.cl" __constant u64 k_sha512[80] = { diff --git a/OpenCL/m06600.cl b/OpenCL/m06600.cl index 6ee0523..ca2f14e 100644 --- a/OpenCL/m06600.cl +++ b/OpenCL/m06600.cl @@ -7,20 +7,20 @@ #define _SHA1_ -#include "include/constants.h" -#include "include/kernel_vendor.h" +#include "inc_hash_constants.h" +#include "inc_vendor.cl" #define DGST_R0 0 #define DGST_R1 1 #define DGST_R2 2 #define DGST_R3 3 -#include "include/kernel_functions.c" -#include "OpenCL/types_ocl.c" -#include "OpenCL/common.c" +#include "inc_hash_functions.cl" +#include "inc_types.cl" +#include "inc_common.cl" -#define COMPARE_S "OpenCL/check_single_comp4.c" -#define COMPARE_M "OpenCL/check_multi_comp4.c" +#define COMPARE_S "inc_comp_single.cl" +#define COMPARE_M "inc_comp_multi.cl" __constant u32 te0[256] = { diff --git a/OpenCL/m06700.cl b/OpenCL/m06700.cl index 3f8aceb..f8b5ff8 100644 --- a/OpenCL/m06700.cl +++ b/OpenCL/m06700.cl @@ -5,20 +5,20 @@ #define _SHA1_ -#include "include/constants.h" -#include "include/kernel_vendor.h" +#include "inc_hash_constants.h" +#include "inc_vendor.cl" #define DGST_R0 0 #define DGST_R1 1 #define DGST_R2 2 #define DGST_R3 3 -#include "include/kernel_functions.c" -#include "OpenCL/types_ocl.c" -#include "OpenCL/common.c" +#include "inc_hash_functions.cl" +#include "inc_types.cl" +#include "inc_common.cl" -#define COMPARE_S "OpenCL/check_single_comp4.c" -#define COMPARE_M "OpenCL/check_multi_comp4.c" +#define COMPARE_S "inc_comp_single.cl" +#define COMPARE_M "inc_comp_multi.cl" void sha1_transform (const u32 w0[4], const u32 w1[4], const u32 w2[4], const u32 w3[4], u32 digest[5]) { diff --git a/OpenCL/m06800.cl b/OpenCL/m06800.cl index d2e6915..6744d6a 100644 --- a/OpenCL/m06800.cl +++ b/OpenCL/m06800.cl @@ -7,20 +7,20 @@ #define _SHA256_ -#include "include/constants.h" -#include "include/kernel_vendor.h" +#include "inc_hash_constants.h" +#include "inc_vendor.cl" #define DGST_R0 0 #define DGST_R1 1 #define DGST_R2 2 #define DGST_R3 3 -#include "include/kernel_functions.c" -#include "OpenCL/types_ocl.c" -#include "OpenCL/common.c" +#include "inc_hash_functions.cl" +#include "inc_types.cl" +#include "inc_common.cl" -#define COMPARE_S "OpenCL/check_single_comp4.c" -#define COMPARE_M "OpenCL/check_multi_comp4.c" +#define COMPARE_S "inc_comp_single.cl" +#define COMPARE_M "inc_comp_multi.cl" __constant u32 te0[256] = { diff --git a/OpenCL/m06900_a0.cl b/OpenCL/m06900_a0.cl index 82833bf..bbefaff 100644 --- a/OpenCL/m06900_a0.cl +++ b/OpenCL/m06900_a0.cl @@ -10,20 +10,20 @@ #define NEW_SIMD_CODE -#include "include/constants.h" -#include "include/kernel_vendor.h" +#include "inc_hash_constants.h" +#include "inc_vendor.cl" #define DGST_R0 0 #define DGST_R1 1 #define DGST_R2 2 #define DGST_R3 3 -#include "include/kernel_functions.c" -#include "OpenCL/types_ocl.c" -#include "OpenCL/common.c" -#include "include/rp_kernel.h" -#include "OpenCL/rp.c" -#include "OpenCL/simd.c" +#include "inc_hash_functions.cl" +#include "inc_types.cl" +#include "inc_common.cl" +#include "inc_rp.h" +#include "inc_rp.cl" +#include "inc_simd.cl" __constant u32 c_tables[4][256] = { diff --git a/OpenCL/m06900_a1.cl b/OpenCL/m06900_a1.cl index f7a0765..fedc7fa 100644 --- a/OpenCL/m06900_a1.cl +++ b/OpenCL/m06900_a1.cl @@ -9,18 +9,18 @@ #define NEW_SIMD_CODE -#include "include/constants.h" -#include "include/kernel_vendor.h" +#include "inc_hash_constants.h" +#include "inc_vendor.cl" #define DGST_R0 0 #define DGST_R1 1 #define DGST_R2 2 #define DGST_R3 3 -#include "include/kernel_functions.c" -#include "OpenCL/types_ocl.c" -#include "OpenCL/common.c" -#include "OpenCL/simd.c" +#include "inc_hash_functions.cl" +#include "inc_types.cl" +#include "inc_common.cl" +#include "inc_simd.cl" __constant u32 c_tables[4][256] = { diff --git a/OpenCL/m06900_a3.cl b/OpenCL/m06900_a3.cl index dc7c705..66f6f82 100644 --- a/OpenCL/m06900_a3.cl +++ b/OpenCL/m06900_a3.cl @@ -10,18 +10,18 @@ #define NEW_SIMD_CODE -#include "include/constants.h" -#include "include/kernel_vendor.h" +#include "inc_hash_constants.h" +#include "inc_vendor.cl" #define DGST_R0 0 #define DGST_R1 1 #define DGST_R2 2 #define DGST_R3 3 -#include "include/kernel_functions.c" -#include "OpenCL/types_ocl.c" -#include "OpenCL/common.c" -#include "OpenCL/simd.c" +#include "inc_hash_functions.cl" +#include "inc_types.cl" +#include "inc_common.cl" +#include "inc_simd.cl" __constant u32 c_tables[4][256] = { diff --git a/OpenCL/m07100.cl b/OpenCL/m07100.cl index 1147122..6f64405 100644 --- a/OpenCL/m07100.cl +++ b/OpenCL/m07100.cl @@ -7,21 +7,21 @@ #define NEW_SIMD_CODE -#include "include/constants.h" -#include "include/kernel_vendor.h" +#include "inc_hash_constants.h" +#include "inc_vendor.cl" #define DGST_R0 0 #define DGST_R1 1 #define DGST_R2 2 #define DGST_R3 3 -#include "include/kernel_functions.c" -#include "OpenCL/types_ocl.c" -#include "OpenCL/common.c" -#include "OpenCL/simd.c" +#include "inc_hash_functions.cl" +#include "inc_types.cl" +#include "inc_common.cl" +#include "inc_simd.cl" -#define COMPARE_S "OpenCL/check_single_comp4.c" -#define COMPARE_M "OpenCL/check_multi_comp4.c" +#define COMPARE_S "inc_comp_single.cl" +#define COMPARE_M "inc_comp_multi.cl" __constant u64 k_sha512[80] = { diff --git a/OpenCL/m07300_a0.cl b/OpenCL/m07300_a0.cl index 9d4dccf..27c7a4f 100644 --- a/OpenCL/m07300_a0.cl +++ b/OpenCL/m07300_a0.cl @@ -7,20 +7,20 @@ #define NEW_SIMD_CODE -#include "include/constants.h" -#include "include/kernel_vendor.h" +#include "inc_hash_constants.h" +#include "inc_vendor.cl" #define DGST_R0 3 #define DGST_R1 4 #define DGST_R2 2 #define DGST_R3 1 -#include "include/kernel_functions.c" -#include "OpenCL/types_ocl.c" -#include "OpenCL/common.c" -#include "include/rp_kernel.h" -#include "OpenCL/rp.c" -#include "OpenCL/simd.c" +#include "inc_hash_functions.cl" +#include "inc_types.cl" +#include "inc_common.cl" +#include "inc_rp.h" +#include "inc_rp.cl" +#include "inc_simd.cl" void sha1_transform (const u32x w0[4], const u32x w1[4], const u32x w2[4], const u32x w3[4], u32x digest[5]) { diff --git a/OpenCL/m07300_a1.cl b/OpenCL/m07300_a1.cl index 2cfa5ca..b78560c 100644 --- a/OpenCL/m07300_a1.cl +++ b/OpenCL/m07300_a1.cl @@ -7,18 +7,18 @@ #define NEW_SIMD_CODE -#include "include/constants.h" -#include "include/kernel_vendor.h" +#include "inc_hash_constants.h" +#include "inc_vendor.cl" #define DGST_R0 3 #define DGST_R1 4 #define DGST_R2 2 #define DGST_R3 1 -#include "include/kernel_functions.c" -#include "OpenCL/types_ocl.c" -#include "OpenCL/common.c" -#include "OpenCL/simd.c" +#include "inc_hash_functions.cl" +#include "inc_types.cl" +#include "inc_common.cl" +#include "inc_simd.cl" void sha1_transform (const u32x w0[4], const u32x w1[4], const u32x w2[4], const u32x w3[4], u32x digest[5]) { diff --git a/OpenCL/m07300_a3.cl b/OpenCL/m07300_a3.cl index 944ec2e..25a0495 100644 --- a/OpenCL/m07300_a3.cl +++ b/OpenCL/m07300_a3.cl @@ -7,18 +7,18 @@ #define NEW_SIMD_CODE -#include "include/constants.h" -#include "include/kernel_vendor.h" +#include "inc_hash_constants.h" +#include "inc_vendor.cl" #define DGST_R0 3 #define DGST_R1 4 #define DGST_R2 2 #define DGST_R3 1 -#include "include/kernel_functions.c" -#include "OpenCL/types_ocl.c" -#include "OpenCL/common.c" -#include "OpenCL/simd.c" +#include "inc_hash_functions.cl" +#include "inc_types.cl" +#include "inc_common.cl" +#include "inc_simd.cl" void sha1_transform (const u32x w0[4], const u32x w1[4], const u32x w2[4], const u32x w3[4], u32x digest[5]) { diff --git a/OpenCL/m07400.cl b/OpenCL/m07400.cl index 0e22a5e..3fc4600 100644 --- a/OpenCL/m07400.cl +++ b/OpenCL/m07400.cl @@ -5,20 +5,20 @@ #define _SHA256_ -#include "include/constants.h" -#include "include/kernel_vendor.h" +#include "inc_hash_constants.h" +#include "inc_vendor.cl" #define DGST_R0 0 #define DGST_R1 1 #define DGST_R2 2 #define DGST_R3 3 -#include "include/kernel_functions.c" -#include "OpenCL/types_ocl.c" -#include "OpenCL/common.c" +#include "inc_hash_functions.cl" +#include "inc_types.cl" +#include "inc_common.cl" -#define COMPARE_S "OpenCL/check_single_comp4.c" -#define COMPARE_M "OpenCL/check_multi_comp4.c" +#define COMPARE_S "inc_comp_single.cl" +#define COMPARE_M "inc_comp_multi.cl" __constant u32 k_sha256[64] = { diff --git a/OpenCL/m07500_a0.cl b/OpenCL/m07500_a0.cl index 0393d8d..ea2e219 100644 --- a/OpenCL/m07500_a0.cl +++ b/OpenCL/m07500_a0.cl @@ -8,20 +8,20 @@ //shared mem too small //#define NEW_SIMD_CODE -#include "include/constants.h" -#include "include/kernel_vendor.h" +#include "inc_hash_constants.h" +#include "inc_vendor.cl" #define DGST_R0 0 #define DGST_R1 1 #define DGST_R2 2 #define DGST_R3 3 -#include "include/kernel_functions.c" -#include "OpenCL/types_ocl.c" -#include "OpenCL/common.c" -#include "include/rp_kernel.h" -#include "OpenCL/rp.c" -#include "OpenCL/simd.c" +#include "inc_hash_functions.cl" +#include "inc_types.cl" +#include "inc_common.cl" +#include "inc_rp.h" +#include "inc_rp.cl" +#include "inc_simd.cl" typedef struct { diff --git a/OpenCL/m07500_a1.cl b/OpenCL/m07500_a1.cl index 6983b16..673df0a 100644 --- a/OpenCL/m07500_a1.cl +++ b/OpenCL/m07500_a1.cl @@ -8,18 +8,18 @@ //shared mem too small //#define NEW_SIMD_CODE -#include "include/constants.h" -#include "include/kernel_vendor.h" +#include "inc_hash_constants.h" +#include "inc_vendor.cl" #define DGST_R0 0 #define DGST_R1 1 #define DGST_R2 2 #define DGST_R3 3 -#include "include/kernel_functions.c" -#include "OpenCL/types_ocl.c" -#include "OpenCL/common.c" -#include "OpenCL/simd.c" +#include "inc_hash_functions.cl" +#include "inc_types.cl" +#include "inc_common.cl" +#include "inc_simd.cl" typedef struct { diff --git a/OpenCL/m07500_a3.cl b/OpenCL/m07500_a3.cl index 1e8eb93..dd57cce 100644 --- a/OpenCL/m07500_a3.cl +++ b/OpenCL/m07500_a3.cl @@ -10,18 +10,18 @@ //shared mem too small //#define NEW_SIMD_CODE -#include "include/constants.h" -#include "include/kernel_vendor.h" +#include "inc_hash_constants.h" +#include "inc_vendor.cl" #define DGST_R0 0 #define DGST_R1 1 #define DGST_R2 2 #define DGST_R3 3 -#include "include/kernel_functions.c" -#include "OpenCL/types_ocl.c" -#include "OpenCL/common.c" -#include "OpenCL/simd.c" +#include "inc_hash_functions.cl" +#include "inc_types.cl" +#include "inc_common.cl" +#include "inc_simd.cl" typedef struct { diff --git a/OpenCL/m07600_a0.cl b/OpenCL/m07600_a0.cl index 86a0012..15d1ed1 100644 --- a/OpenCL/m07600_a0.cl +++ b/OpenCL/m07600_a0.cl @@ -9,20 +9,20 @@ #define NEW_SIMD_CODE -#include "include/constants.h" -#include "include/kernel_vendor.h" +#include "inc_hash_constants.h" +#include "inc_vendor.cl" #define DGST_R0 3 #define DGST_R1 4 #define DGST_R2 2 #define DGST_R3 1 -#include "include/kernel_functions.c" -#include "OpenCL/types_ocl.c" -#include "OpenCL/common.c" -#include "include/rp_kernel.h" -#include "OpenCL/rp.c" -#include "OpenCL/simd.c" +#include "inc_hash_functions.cl" +#include "inc_types.cl" +#include "inc_common.cl" +#include "inc_rp.h" +#include "inc_rp.cl" +#include "inc_simd.cl" #if VECT_SIZE == 1 #define uint_to_hex_lower8(i) (u32x) (l_bin2asc[(i)]) diff --git a/OpenCL/m07600_a1.cl b/OpenCL/m07600_a1.cl index 531d5f3..b904ed4 100644 --- a/OpenCL/m07600_a1.cl +++ b/OpenCL/m07600_a1.cl @@ -7,18 +7,18 @@ #define NEW_SIMD_CODE -#include "include/constants.h" -#include "include/kernel_vendor.h" +#include "inc_hash_constants.h" +#include "inc_vendor.cl" #define DGST_R0 3 #define DGST_R1 4 #define DGST_R2 2 #define DGST_R3 1 -#include "include/kernel_functions.c" -#include "OpenCL/types_ocl.c" -#include "OpenCL/common.c" -#include "OpenCL/simd.c" +#include "inc_hash_functions.cl" +#include "inc_types.cl" +#include "inc_common.cl" +#include "inc_simd.cl" #if VECT_SIZE == 1 #define uint_to_hex_lower8(i) (u32x) (l_bin2asc[(i)]) diff --git a/OpenCL/m07600_a3.cl b/OpenCL/m07600_a3.cl index 2e068e7..717d7de 100644 --- a/OpenCL/m07600_a3.cl +++ b/OpenCL/m07600_a3.cl @@ -10,18 +10,18 @@ #define NEW_SIMD_CODE -#include "include/constants.h" -#include "include/kernel_vendor.h" +#include "inc_hash_constants.h" +#include "inc_vendor.cl" #define DGST_R0 3 #define DGST_R1 4 #define DGST_R2 2 #define DGST_R3 1 -#include "include/kernel_functions.c" -#include "OpenCL/types_ocl.c" -#include "OpenCL/common.c" -#include "OpenCL/simd.c" +#include "inc_hash_functions.cl" +#include "inc_types.cl" +#include "inc_common.cl" +#include "inc_simd.cl" #if VECT_SIZE == 1 #define uint_to_hex_lower8(i) (u32x) (l_bin2asc[(i)]) diff --git a/OpenCL/m07700_a0.cl b/OpenCL/m07700_a0.cl index 2755132..671d02d 100644 --- a/OpenCL/m07700_a0.cl +++ b/OpenCL/m07700_a0.cl @@ -8,20 +8,20 @@ //too much register pressure //#define NEW_SIMD_CODE -#include "include/constants.h" -#include "include/kernel_vendor.h" +#include "inc_hash_constants.h" +#include "inc_vendor.cl" #define DGST_R0 0 #define DGST_R1 1 #define DGST_R2 2 #define DGST_R3 3 -#include "include/kernel_functions.c" -#include "OpenCL/types_ocl.c" -#include "OpenCL/common.c" -#include "include/rp_kernel.h" -#include "OpenCL/rp.c" -#include "OpenCL/simd.c" +#include "inc_hash_functions.cl" +#include "inc_types.cl" +#include "inc_common.cl" +#include "inc_rp.h" +#include "inc_rp.cl" +#include "inc_simd.cl" #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)))) diff --git a/OpenCL/m07700_a1.cl b/OpenCL/m07700_a1.cl index 8eb9054..bf98509 100644 --- a/OpenCL/m07700_a1.cl +++ b/OpenCL/m07700_a1.cl @@ -8,18 +8,18 @@ //too much register pressure //#define NEW_SIMD_CODE -#include "include/constants.h" -#include "include/kernel_vendor.h" +#include "inc_hash_constants.h" +#include "inc_vendor.cl" #define DGST_R0 0 #define DGST_R1 1 #define DGST_R2 2 #define DGST_R3 3 -#include "include/kernel_functions.c" -#include "OpenCL/types_ocl.c" -#include "OpenCL/common.c" -#include "OpenCL/simd.c" +#include "inc_hash_functions.cl" +#include "inc_types.cl" +#include "inc_common.cl" +#include "inc_simd.cl" #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)))) diff --git a/OpenCL/m07700_a3.cl b/OpenCL/m07700_a3.cl index dac0379..293cc49 100644 --- a/OpenCL/m07700_a3.cl +++ b/OpenCL/m07700_a3.cl @@ -8,18 +8,18 @@ //too much register pressure //#define NEW_SIMD_CODE -#include "include/constants.h" -#include "include/kernel_vendor.h" +#include "inc_hash_constants.h" +#include "inc_vendor.cl" #define DGST_R0 0 #define DGST_R1 1 #define DGST_R2 2 #define DGST_R3 3 -#include "include/kernel_functions.c" -#include "OpenCL/types_ocl.c" -#include "OpenCL/common.c" -#include "OpenCL/simd.c" +#include "inc_hash_functions.cl" +#include "inc_types.cl" +#include "inc_common.cl" +#include "inc_simd.cl" #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)))) diff --git a/OpenCL/m07800_a0.cl b/OpenCL/m07800_a0.cl index b4b98db..308b582 100644 --- a/OpenCL/m07800_a0.cl +++ b/OpenCL/m07800_a0.cl @@ -8,20 +8,20 @@ //incompatible data-dependant code //#define NEW_SIMD_CODE -#include "include/constants.h" -#include "include/kernel_vendor.h" +#include "inc_hash_constants.h" +#include "inc_vendor.cl" #define DGST_R0 3 #define DGST_R1 4 #define DGST_R2 2 #define DGST_R3 1 -#include "include/kernel_functions.c" -#include "OpenCL/types_ocl.c" -#include "OpenCL/common.c" -#include "include/rp_kernel.h" -#include "OpenCL/rp.c" -#include "OpenCL/simd.c" +#include "inc_hash_functions.cl" +#include "inc_types.cl" +#include "inc_common.cl" +#include "inc_rp.h" +#include "inc_rp.cl" +#include "inc_simd.cl" #define GETSHIFTEDINT(a,n) amd_bytealign ((a)[((n)/4)+1], (a)[((n)/4)+0], (n)) diff --git a/OpenCL/m07800_a1.cl b/OpenCL/m07800_a1.cl index feb36f1..4fd07eb 100644 --- a/OpenCL/m07800_a1.cl +++ b/OpenCL/m07800_a1.cl @@ -8,18 +8,18 @@ //incompatible data-dependant code //#define NEW_SIMD_CODE -#include "include/constants.h" -#include "include/kernel_vendor.h" +#include "inc_hash_constants.h" +#include "inc_vendor.cl" #define DGST_R0 3 #define DGST_R1 4 #define DGST_R2 2 #define DGST_R3 1 -#include "include/kernel_functions.c" -#include "OpenCL/types_ocl.c" -#include "OpenCL/common.c" -#include "OpenCL/simd.c" +#include "inc_hash_functions.cl" +#include "inc_types.cl" +#include "inc_common.cl" +#include "inc_simd.cl" #define GETSHIFTEDINT(a,n) amd_bytealign ((a)[((n)/4)+1], (a)[((n)/4)+0], (n)) diff --git a/OpenCL/m07800_a3.cl b/OpenCL/m07800_a3.cl index 3b75ace..7d1ce5a 100644 --- a/OpenCL/m07800_a3.cl +++ b/OpenCL/m07800_a3.cl @@ -8,18 +8,18 @@ //incompatible data-dependant code //#define NEW_SIMD_CODE -#include "include/constants.h" -#include "include/kernel_vendor.h" +#include "inc_hash_constants.h" +#include "inc_vendor.cl" #define DGST_R0 3 #define DGST_R1 4 #define DGST_R2 2 #define DGST_R3 1 -#include "include/kernel_functions.c" -#include "OpenCL/types_ocl.c" -#include "OpenCL/common.c" -#include "OpenCL/simd.c" +#include "inc_hash_functions.cl" +#include "inc_types.cl" +#include "inc_common.cl" +#include "inc_simd.cl" #define GETSHIFTEDINT(a,n) amd_bytealign ((a)[((n)/4)+1], (a)[((n)/4)+0], (n)) diff --git a/OpenCL/m07900.cl b/OpenCL/m07900.cl index 7226bec..49389d8 100644 --- a/OpenCL/m07900.cl +++ b/OpenCL/m07900.cl @@ -5,20 +5,20 @@ #define _SHA512_ -#include "include/constants.h" -#include "include/kernel_vendor.h" +#include "inc_hash_constants.h" +#include "inc_vendor.cl" #define DGST_R0 0 #define DGST_R1 1 #define DGST_R2 2 #define DGST_R3 3 -#include "include/kernel_functions.c" -#include "OpenCL/types_ocl.c" -#include "OpenCL/common.c" +#include "inc_hash_functions.cl" +#include "inc_types.cl" +#include "inc_common.cl" -#define COMPARE_S "OpenCL/check_single_comp4.c" -#define COMPARE_M "OpenCL/check_multi_comp4.c" +#define COMPARE_S "inc_comp_single.cl" +#define COMPARE_M "inc_comp_multi.cl" __constant u64 k_sha512[80] = { diff --git a/OpenCL/m08000_a0.cl b/OpenCL/m08000_a0.cl index 33266e0..046b84e 100644 --- a/OpenCL/m08000_a0.cl +++ b/OpenCL/m08000_a0.cl @@ -9,20 +9,20 @@ #define NEW_SIMD_CODE -#include "include/constants.h" -#include "include/kernel_vendor.h" +#include "inc_hash_constants.h" +#include "inc_vendor.cl" #define DGST_R0 3 #define DGST_R1 7 #define DGST_R2 2 #define DGST_R3 6 -#include "include/kernel_functions.c" -#include "OpenCL/types_ocl.c" -#include "OpenCL/common.c" -#include "include/rp_kernel.h" -#include "OpenCL/rp.c" -#include "OpenCL/simd.c" +#include "inc_hash_functions.cl" +#include "inc_types.cl" +#include "inc_common.cl" +#include "inc_rp.h" +#include "inc_rp.cl" +#include "inc_simd.cl" __constant u32 k_sha256[64] = { diff --git a/OpenCL/m08000_a1.cl b/OpenCL/m08000_a1.cl index efbc2bb..9ac3580 100644 --- a/OpenCL/m08000_a1.cl +++ b/OpenCL/m08000_a1.cl @@ -9,18 +9,18 @@ #define NEW_SIMD_CODE -#include "include/constants.h" -#include "include/kernel_vendor.h" +#include "inc_hash_constants.h" +#include "inc_vendor.cl" #define DGST_R0 3 #define DGST_R1 7 #define DGST_R2 2 #define DGST_R3 6 -#include "include/kernel_functions.c" -#include "OpenCL/types_ocl.c" -#include "OpenCL/common.c" -#include "OpenCL/simd.c" +#include "inc_hash_functions.cl" +#include "inc_types.cl" +#include "inc_common.cl" +#include "inc_simd.cl" __constant u32 k_sha256[64] = { diff --git a/OpenCL/m08000_a3.cl b/OpenCL/m08000_a3.cl index b670305..01f66fb 100644 --- a/OpenCL/m08000_a3.cl +++ b/OpenCL/m08000_a3.cl @@ -9,18 +9,18 @@ #define NEW_SIMD_CODE -#include "include/constants.h" -#include "include/kernel_vendor.h" +#include "inc_hash_constants.h" +#include "inc_vendor.cl" #define DGST_R0 3 #define DGST_R1 7 #define DGST_R2 2 #define DGST_R3 6 -#include "include/kernel_functions.c" -#include "OpenCL/types_ocl.c" -#include "OpenCL/common.c" -#include "OpenCL/simd.c" +#include "inc_hash_functions.cl" +#include "inc_types.cl" +#include "inc_common.cl" +#include "inc_simd.cl" __constant u32 k_sha256[64] = { diff --git a/OpenCL/m08100_a0.cl b/OpenCL/m08100_a0.cl index 95b76e2..32c8a61 100644 --- a/OpenCL/m08100_a0.cl +++ b/OpenCL/m08100_a0.cl @@ -7,20 +7,20 @@ #define NEW_SIMD_CODE -#include "include/constants.h" -#include "include/kernel_vendor.h" +#include "inc_hash_constants.h" +#include "inc_vendor.cl" #define DGST_R0 3 #define DGST_R1 4 #define DGST_R2 2 #define DGST_R3 1 -#include "include/kernel_functions.c" -#include "OpenCL/types_ocl.c" -#include "OpenCL/common.c" -#include "include/rp_kernel.h" -#include "OpenCL/rp.c" -#include "OpenCL/simd.c" +#include "inc_hash_functions.cl" +#include "inc_types.cl" +#include "inc_common.cl" +#include "inc_rp.h" +#include "inc_rp.cl" +#include "inc_simd.cl" __kernel void m08100_m04 (__global pw_t *pws, __global kernel_rule_t *rules_buf, __global comb_t *combs_buf, __global bf_t *bfs_buf, __global void *tmps, __global void *hooks, __global u32 *bitmaps_buf_s1_a, __global u32 *bitmaps_buf_s1_b, __global u32 *bitmaps_buf_s1_c, __global u32 *bitmaps_buf_s1_d, __global u32 *bitmaps_buf_s2_a, __global u32 *bitmaps_buf_s2_b, __global u32 *bitmaps_buf_s2_c, __global u32 *bitmaps_buf_s2_d, __global plain_t *plains_buf, __global digest_t *digests_buf, __global u32 *hashes_shown, __global salt_t *salt_bufs, __global void *esalt_bufs, __global u32 *d_return_buf, __global u32 *d_scryptV_buf, const u32 bitmap_mask, const u32 bitmap_shift1, const u32 bitmap_shift2, const u32 salt_pos, const u32 loop_pos, const u32 loop_cnt, const u32 il_cnt, const u32 digests_cnt, const u32 digests_offset, const u32 combs_mode, const u32 gid_max) { diff --git a/OpenCL/m08100_a1.cl b/OpenCL/m08100_a1.cl index 25980ec..a7c2d8d 100644 --- a/OpenCL/m08100_a1.cl +++ b/OpenCL/m08100_a1.cl @@ -7,18 +7,18 @@ #define NEW_SIMD_CODE -#include "include/constants.h" -#include "include/kernel_vendor.h" +#include "inc_hash_constants.h" +#include "inc_vendor.cl" #define DGST_R0 3 #define DGST_R1 4 #define DGST_R2 2 #define DGST_R3 1 -#include "include/kernel_functions.c" -#include "OpenCL/types_ocl.c" -#include "OpenCL/common.c" -#include "OpenCL/simd.c" +#include "inc_hash_functions.cl" +#include "inc_types.cl" +#include "inc_common.cl" +#include "inc_simd.cl" __kernel void m08100_m04 (__global pw_t *pws, __global kernel_rule_t *rules_buf, __global comb_t *combs_buf, __global bf_t *bfs_buf, __global void *tmps, __global void *hooks, __global u32 *bitmaps_buf_s1_a, __global u32 *bitmaps_buf_s1_b, __global u32 *bitmaps_buf_s1_c, __global u32 *bitmaps_buf_s1_d, __global u32 *bitmaps_buf_s2_a, __global u32 *bitmaps_buf_s2_b, __global u32 *bitmaps_buf_s2_c, __global u32 *bitmaps_buf_s2_d, __global plain_t *plains_buf, __global digest_t *digests_buf, __global u32 *hashes_shown, __global salt_t *salt_bufs, __global void *esalt_bufs, __global u32 *d_return_buf, __global u32 *d_scryptV_buf, const u32 bitmap_mask, const u32 bitmap_shift1, const u32 bitmap_shift2, const u32 salt_pos, const u32 loop_pos, const u32 loop_cnt, const u32 il_cnt, const u32 digests_cnt, const u32 digests_offset, const u32 combs_mode, const u32 gid_max) { diff --git a/OpenCL/m08100_a3.cl b/OpenCL/m08100_a3.cl index 4848662..58240d1 100644 --- a/OpenCL/m08100_a3.cl +++ b/OpenCL/m08100_a3.cl @@ -7,18 +7,18 @@ #define NEW_SIMD_CODE -#include "include/constants.h" -#include "include/kernel_vendor.h" +#include "inc_hash_constants.h" +#include "inc_vendor.cl" #define DGST_R0 3 #define DGST_R1 4 #define DGST_R2 2 #define DGST_R3 1 -#include "include/kernel_functions.c" -#include "OpenCL/types_ocl.c" -#include "OpenCL/common.c" -#include "OpenCL/simd.c" +#include "inc_hash_functions.cl" +#include "inc_types.cl" +#include "inc_common.cl" +#include "inc_simd.cl" void m08100m (u32 w0[4], u32 w1[4], u32 w2[4], u32 w3[4], const u32 pw_len, __global pw_t *pws, __global kernel_rule_t *rules_buf, __global comb_t *combs_buf, __global bf_t *bfs_buf, __global void *tmps, __global void *hooks, __global u32 *bitmaps_buf_s1_a, __global u32 *bitmaps_buf_s1_b, __global u32 *bitmaps_buf_s1_c, __global u32 *bitmaps_buf_s1_d, __global u32 *bitmaps_buf_s2_a, __global u32 *bitmaps_buf_s2_b, __global u32 *bitmaps_buf_s2_c, __global u32 *bitmaps_buf_s2_d, __global plain_t *plains_buf, __global digest_t *digests_buf, __global u32 *hashes_shown, __global salt_t *salt_bufs, __global void *esalt_bufs, __global u32 *d_return_buf, __global u32 *d_scryptV_buf, const u32 bitmap_mask, const u32 bitmap_shift1, const u32 bitmap_shift2, const u32 salt_pos, const u32 loop_pos, const u32 loop_cnt, const u32 il_cnt, const u32 digests_cnt, const u32 digests_offset) { diff --git a/OpenCL/m08200.cl b/OpenCL/m08200.cl index dc7b768..ae7e6de 100644 --- a/OpenCL/m08200.cl +++ b/OpenCL/m08200.cl @@ -5,20 +5,20 @@ #define _CLOUDKEY_ -#include "include/constants.h" -#include "include/kernel_vendor.h" +#include "inc_hash_constants.h" +#include "inc_vendor.cl" #define DGST_R0 0 #define DGST_R1 1 #define DGST_R2 2 #define DGST_R3 3 -#include "include/kernel_functions.c" -#include "OpenCL/types_ocl.c" -#include "OpenCL/common.c" +#include "inc_hash_functions.cl" +#include "inc_types.cl" +#include "inc_common.cl" -#define COMPARE_S "OpenCL/check_single_comp4.c" -#define COMPARE_M "OpenCL/check_multi_comp4.c" +#define COMPARE_S "inc_comp_single.cl" +#define COMPARE_M "inc_comp_multi.cl" __constant u32 k_sha256[64] = { diff --git a/OpenCL/m08300_a0.cl b/OpenCL/m08300_a0.cl index 904f680..84dfa7f 100644 --- a/OpenCL/m08300_a0.cl +++ b/OpenCL/m08300_a0.cl @@ -7,20 +7,20 @@ #define NEW_SIMD_CODE -#include "include/constants.h" -#include "include/kernel_vendor.h" +#include "inc_hash_constants.h" +#include "inc_vendor.cl" #define DGST_R0 3 #define DGST_R1 4 #define DGST_R2 2 #define DGST_R3 1 -#include "include/kernel_functions.c" -#include "OpenCL/types_ocl.c" -#include "OpenCL/common.c" -#include "include/rp_kernel.h" -#include "OpenCL/rp.c" -#include "OpenCL/simd.c" +#include "inc_hash_functions.cl" +#include "inc_types.cl" +#include "inc_common.cl" +#include "inc_rp.h" +#include "inc_rp.cl" +#include "inc_simd.cl" void sha1_transform (const u32x w0[4], const u32x w1[4], const u32x w2[4], const u32x w3[4], u32x digest[5]) { diff --git a/OpenCL/m08300_a1.cl b/OpenCL/m08300_a1.cl index e36b357..b22986f 100644 --- a/OpenCL/m08300_a1.cl +++ b/OpenCL/m08300_a1.cl @@ -7,18 +7,18 @@ #define NEW_SIMD_CODE -#include "include/constants.h" -#include "include/kernel_vendor.h" +#include "inc_hash_constants.h" +#include "inc_vendor.cl" #define DGST_R0 3 #define DGST_R1 4 #define DGST_R2 2 #define DGST_R3 1 -#include "include/kernel_functions.c" -#include "OpenCL/types_ocl.c" -#include "OpenCL/common.c" -#include "OpenCL/simd.c" +#include "inc_hash_functions.cl" +#include "inc_types.cl" +#include "inc_common.cl" +#include "inc_simd.cl" void sha1_transform (const u32x w0[4], const u32x w1[4], const u32x w2[4], const u32x w3[4], u32x digest[5]) { diff --git a/OpenCL/m08300_a3.cl b/OpenCL/m08300_a3.cl index 9de6a42..b0e73e1 100644 --- a/OpenCL/m08300_a3.cl +++ b/OpenCL/m08300_a3.cl @@ -7,18 +7,18 @@ #define NEW_SIMD_CODE -#include "include/constants.h" -#include "include/kernel_vendor.h" +#include "inc_hash_constants.h" +#include "inc_vendor.cl" #define DGST_R0 3 #define DGST_R1 4 #define DGST_R2 2 #define DGST_R3 1 -#include "include/kernel_functions.c" -#include "OpenCL/types_ocl.c" -#include "OpenCL/common.c" -#include "OpenCL/simd.c" +#include "inc_hash_functions.cl" +#include "inc_types.cl" +#include "inc_common.cl" +#include "inc_simd.cl" void sha1_transform (const u32x w0[4], const u32x w1[4], const u32x w2[4], const u32x w3[4], u32x digest[5]) { diff --git a/OpenCL/m08400_a0.cl b/OpenCL/m08400_a0.cl index 2fa98bd..06df81f 100644 --- a/OpenCL/m08400_a0.cl +++ b/OpenCL/m08400_a0.cl @@ -9,20 +9,20 @@ #define NEW_SIMD_CODE -#include "include/constants.h" -#include "include/kernel_vendor.h" +#include "inc_hash_constants.h" +#include "inc_vendor.cl" #define DGST_R0 3 #define DGST_R1 4 #define DGST_R2 2 #define DGST_R3 1 -#include "include/kernel_functions.c" -#include "OpenCL/types_ocl.c" -#include "OpenCL/common.c" -#include "include/rp_kernel.h" -#include "OpenCL/rp.c" -#include "OpenCL/simd.c" +#include "inc_hash_functions.cl" +#include "inc_types.cl" +#include "inc_common.cl" +#include "inc_rp.h" +#include "inc_rp.cl" +#include "inc_simd.cl" #if VECT_SIZE == 1 #define uint_to_hex_lower8_le(i) (u32x) (l_bin2asc[(i)]) diff --git a/OpenCL/m08400_a1.cl b/OpenCL/m08400_a1.cl index 5cb4be4..e408c05 100644 --- a/OpenCL/m08400_a1.cl +++ b/OpenCL/m08400_a1.cl @@ -7,18 +7,18 @@ #define NEW_SIMD_CODE -#include "include/constants.h" -#include "include/kernel_vendor.h" +#include "inc_hash_constants.h" +#include "inc_vendor.cl" #define DGST_R0 3 #define DGST_R1 4 #define DGST_R2 2 #define DGST_R3 1 -#include "include/kernel_functions.c" -#include "OpenCL/types_ocl.c" -#include "OpenCL/common.c" -#include "OpenCL/simd.c" +#include "inc_hash_functions.cl" +#include "inc_types.cl" +#include "inc_common.cl" +#include "inc_simd.cl" #if VECT_SIZE == 1 #define uint_to_hex_lower8_le(i) (u32x) (l_bin2asc[(i)]) diff --git a/OpenCL/m08400_a3.cl b/OpenCL/m08400_a3.cl index 7a089ad..ce4c926 100644 --- a/OpenCL/m08400_a3.cl +++ b/OpenCL/m08400_a3.cl @@ -10,18 +10,18 @@ #define NEW_SIMD_CODE -#include "include/constants.h" -#include "include/kernel_vendor.h" +#include "inc_hash_constants.h" +#include "inc_vendor.cl" #define DGST_R0 3 #define DGST_R1 4 #define DGST_R2 2 #define DGST_R3 1 -#include "include/kernel_functions.c" -#include "OpenCL/types_ocl.c" -#include "OpenCL/common.c" -#include "OpenCL/simd.c" +#include "inc_hash_functions.cl" +#include "inc_types.cl" +#include "inc_common.cl" +#include "inc_simd.cl" #if VECT_SIZE == 1 #define uint_to_hex_lower8_le(i) (u32x) (l_bin2asc[(i)]) diff --git a/OpenCL/m08500_a0.cl b/OpenCL/m08500_a0.cl index d21d101..6874a7e 100644 --- a/OpenCL/m08500_a0.cl +++ b/OpenCL/m08500_a0.cl @@ -10,20 +10,20 @@ #define NEW_SIMD_CODE -#include "include/constants.h" -#include "include/kernel_vendor.h" +#include "inc_hash_constants.h" +#include "inc_vendor.cl" #define DGST_R0 0 #define DGST_R1 1 #define DGST_R2 2 #define DGST_R3 3 -#include "include/kernel_functions.c" -#include "OpenCL/types_ocl.c" -#include "OpenCL/common.c" -#include "include/rp_kernel.h" -#include "OpenCL/rp.c" -#include "OpenCL/simd.c" +#include "inc_hash_functions.cl" +#include "inc_types.cl" +#include "inc_common.cl" +#include "inc_rp.h" +#include "inc_rp.cl" +#include "inc_simd.cl" #define PERM_OP(a,b,tt,n,m) \ { \ diff --git a/OpenCL/m08500_a1.cl b/OpenCL/m08500_a1.cl index 20f2599..d007a1c 100644 --- a/OpenCL/m08500_a1.cl +++ b/OpenCL/m08500_a1.cl @@ -9,18 +9,18 @@ #define NEW_SIMD_CODE -#include "include/constants.h" -#include "include/kernel_vendor.h" +#include "inc_hash_constants.h" +#include "inc_vendor.cl" #define DGST_R0 0 #define DGST_R1 1 #define DGST_R2 2 #define DGST_R3 3 -#include "include/kernel_functions.c" -#include "OpenCL/types_ocl.c" -#include "OpenCL/common.c" -#include "OpenCL/simd.c" +#include "inc_hash_functions.cl" +#include "inc_types.cl" +#include "inc_common.cl" +#include "inc_simd.cl" #define PERM_OP(a,b,tt,n,m) \ { \ diff --git a/OpenCL/m08500_a3.cl b/OpenCL/m08500_a3.cl index a97d62d..6e5058a 100644 --- a/OpenCL/m08500_a3.cl +++ b/OpenCL/m08500_a3.cl @@ -10,18 +10,18 @@ #define NEW_SIMD_CODE -#include "include/constants.h" -#include "include/kernel_vendor.h" +#include "inc_hash_constants.h" +#include "inc_vendor.cl" #define DGST_R0 0 #define DGST_R1 1 #define DGST_R2 2 #define DGST_R3 3 -#include "include/kernel_functions.c" -#include "OpenCL/types_ocl.c" -#include "OpenCL/common.c" -#include "OpenCL/simd.c" +#include "inc_hash_functions.cl" +#include "inc_types.cl" +#include "inc_common.cl" +#include "inc_simd.cl" #define PERM_OP(a,b,tt,n,m) \ { \ diff --git a/OpenCL/m08600_a0.cl b/OpenCL/m08600_a0.cl index c4a043c..c6e58ed 100644 --- a/OpenCL/m08600_a0.cl +++ b/OpenCL/m08600_a0.cl @@ -11,20 +11,20 @@ //incompatible //#define NEW_SIMD_CODE -#include "include/constants.h" -#include "include/kernel_vendor.h" +#include "inc_hash_constants.h" +#include "inc_vendor.cl" #define DGST_R0 0 #define DGST_R1 1 #define DGST_R2 2 #define DGST_R3 3 -#include "include/kernel_functions.c" -#include "OpenCL/types_ocl.c" -#include "OpenCL/common.c" -#include "include/rp_kernel.h" -#include "OpenCL/rp.c" -#include "OpenCL/simd.c" +#include "inc_hash_functions.cl" +#include "inc_types.cl" +#include "inc_common.cl" +#include "inc_rp.h" +#include "inc_rp.cl" +#include "inc_simd.cl" __constant u32 lotus_magic_table[256] = { diff --git a/OpenCL/m08600_a1.cl b/OpenCL/m08600_a1.cl index 58be048..517bbe1 100644 --- a/OpenCL/m08600_a1.cl +++ b/OpenCL/m08600_a1.cl @@ -10,18 +10,18 @@ //incompatible //#define NEW_SIMD_CODE -#include "include/constants.h" -#include "include/kernel_vendor.h" +#include "inc_hash_constants.h" +#include "inc_vendor.cl" #define DGST_R0 0 #define DGST_R1 1 #define DGST_R2 2 #define DGST_R3 3 -#include "include/kernel_functions.c" -#include "OpenCL/types_ocl.c" -#include "OpenCL/common.c" -#include "OpenCL/simd.c" +#include "inc_hash_functions.cl" +#include "inc_types.cl" +#include "inc_common.cl" +#include "inc_simd.cl" __constant u32 lotus_magic_table[256] = { diff --git a/OpenCL/m08600_a3.cl b/OpenCL/m08600_a3.cl index 5b7d924..5fe5e44 100644 --- a/OpenCL/m08600_a3.cl +++ b/OpenCL/m08600_a3.cl @@ -10,18 +10,18 @@ #define NEW_SIMD_CODE -#include "include/constants.h" -#include "include/kernel_vendor.h" +#include "inc_hash_constants.h" +#include "inc_vendor.cl" #define DGST_R0 0 #define DGST_R1 1 #define DGST_R2 2 #define DGST_R3 3 -#include "include/kernel_functions.c" -#include "OpenCL/types_ocl.c" -#include "OpenCL/common.c" -#include "OpenCL/simd.c" +#include "inc_hash_functions.cl" +#include "inc_types.cl" +#include "inc_common.cl" +#include "inc_simd.cl" __constant u32 lotus_magic_table[256] = { diff --git a/OpenCL/m08700_a0.cl b/OpenCL/m08700_a0.cl index 1bcb8d6..9506789 100644 --- a/OpenCL/m08700_a0.cl +++ b/OpenCL/m08700_a0.cl @@ -11,20 +11,20 @@ //incompatible //#define NEW_SIMD_CODE -#include "include/constants.h" -#include "include/kernel_vendor.h" +#include "inc_hash_constants.h" +#include "inc_vendor.cl" #define DGST_R0 0 #define DGST_R1 1 #define DGST_R2 2 #define DGST_R3 3 -#include "include/kernel_functions.c" -#include "OpenCL/types_ocl.c" -#include "OpenCL/common.c" -#include "include/rp_kernel.h" -#include "OpenCL/rp.c" -#include "OpenCL/simd.c" +#include "inc_hash_functions.cl" +#include "inc_types.cl" +#include "inc_common.cl" +#include "inc_rp.h" +#include "inc_rp.cl" +#include "inc_simd.cl" __constant u32 lotus_magic_table[256] = { diff --git a/OpenCL/m08700_a1.cl b/OpenCL/m08700_a1.cl index ed6d197..00650f1 100644 --- a/OpenCL/m08700_a1.cl +++ b/OpenCL/m08700_a1.cl @@ -10,18 +10,18 @@ //incompatible //#define NEW_SIMD_CODE -#include "include/constants.h" -#include "include/kernel_vendor.h" +#include "inc_hash_constants.h" +#include "inc_vendor.cl" #define DGST_R0 0 #define DGST_R1 1 #define DGST_R2 2 #define DGST_R3 3 -#include "include/kernel_functions.c" -#include "OpenCL/types_ocl.c" -#include "OpenCL/common.c" -#include "OpenCL/simd.c" +#include "inc_hash_functions.cl" +#include "inc_types.cl" +#include "inc_common.cl" +#include "inc_simd.cl" __constant u32 lotus_magic_table[256] = { diff --git a/OpenCL/m08700_a3.cl b/OpenCL/m08700_a3.cl index b6fd2d3..f3bd318 100644 --- a/OpenCL/m08700_a3.cl +++ b/OpenCL/m08700_a3.cl @@ -10,18 +10,18 @@ #define NEW_SIMD_CODE -#include "include/constants.h" -#include "include/kernel_vendor.h" +#include "inc_hash_constants.h" +#include "inc_vendor.cl" #define DGST_R0 0 #define DGST_R1 1 #define DGST_R2 2 #define DGST_R3 3 -#include "include/kernel_functions.c" -#include "OpenCL/types_ocl.c" -#include "OpenCL/common.c" -#include "OpenCL/simd.c" +#include "inc_hash_functions.cl" +#include "inc_types.cl" +#include "inc_common.cl" +#include "inc_simd.cl" __constant u32 lotus_magic_table[256] = { diff --git a/OpenCL/m08800.cl b/OpenCL/m08800.cl index 38a3033..50c5ca1 100644 --- a/OpenCL/m08800.cl +++ b/OpenCL/m08800.cl @@ -7,17 +7,17 @@ #define _ANDROIDFDE_ -#include "include/constants.h" -#include "include/kernel_vendor.h" +#include "inc_hash_constants.h" +#include "inc_vendor.cl" #define DGST_R0 0 #define DGST_R1 1 #define DGST_R2 2 #define DGST_R3 3 -#include "include/kernel_functions.c" -#include "OpenCL/types_ocl.c" -#include "OpenCL/common.c" +#include "inc_hash_functions.cl" +#include "inc_types.cl" +#include "inc_common.cl" __constant u32 te0[256] = { diff --git a/OpenCL/m08900.cl b/OpenCL/m08900.cl index 85ad68d..c2a718a 100644 --- a/OpenCL/m08900.cl +++ b/OpenCL/m08900.cl @@ -5,20 +5,20 @@ #define _SCRYPT_ -#include "include/constants.h" -#include "include/kernel_vendor.h" +#include "inc_hash_constants.h" +#include "inc_vendor.cl" #define DGST_R0 0 #define DGST_R1 1 #define DGST_R2 2 #define DGST_R3 3 -#include "include/kernel_functions.c" -#include "OpenCL/types_ocl.c" -#include "OpenCL/common.c" +#include "inc_hash_functions.cl" +#include "inc_types.cl" +#include "inc_common.cl" -#define COMPARE_S "OpenCL/check_single_comp4.c" -#define COMPARE_M "OpenCL/check_multi_comp4.c" +#define COMPARE_S "inc_comp_single.cl" +#define COMPARE_M "inc_comp_multi.cl" __constant u32 k_sha256[64] = { diff --git a/OpenCL/m09000.cl b/OpenCL/m09000.cl index 210b620..7b1166b 100644 --- a/OpenCL/m09000.cl +++ b/OpenCL/m09000.cl @@ -5,20 +5,20 @@ #define _PSAFE2_ -#include "include/constants.h" -#include "include/kernel_vendor.h" +#include "inc_hash_constants.h" +#include "inc_vendor.cl" #define DGST_R0 0 #define DGST_R1 1 #define DGST_R2 2 #define DGST_R3 3 -#include "include/kernel_functions.c" -#include "OpenCL/types_ocl.c" -#include "OpenCL/common.c" +#include "inc_hash_functions.cl" +#include "inc_types.cl" +#include "inc_common.cl" -#define COMPARE_S "OpenCL/check_single_comp4.c" -#define COMPARE_M "OpenCL/check_multi_comp4.c" +#define COMPARE_S "inc_comp_single.cl" +#define COMPARE_M "inc_comp_multi.cl" // http://www.schneier.com/code/constants.txt diff --git a/OpenCL/m09100.cl b/OpenCL/m09100.cl index 4efe528..2d694d6 100644 --- a/OpenCL/m09100.cl +++ b/OpenCL/m09100.cl @@ -7,23 +7,23 @@ #define _LOTUS8_ -#include "include/constants.h" -#include "include/kernel_vendor.h" +#include "inc_hash_constants.h" +#include "inc_vendor.cl" #define DGST_R0 0 #define DGST_R1 1 #define DGST_R2 2 #define DGST_R3 3 -#include "include/kernel_functions.c" +#include "inc_hash_functions.cl" #undef _SHA1_ -#include "OpenCL/types_ocl.c" -#include "OpenCL/common.c" +#include "inc_types.cl" +#include "inc_common.cl" -#define COMPARE_S "OpenCL/check_single_comp4.c" -#define COMPARE_M "OpenCL/check_multi_comp4.c" +#define COMPARE_S "inc_comp_single.cl" +#define COMPARE_M "inc_comp_multi.cl" __constant char lotus64_table[] = "0123456789ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz+/"; diff --git a/OpenCL/m09400.cl b/OpenCL/m09400.cl index d9249dc..d28c6b2 100644 --- a/OpenCL/m09400.cl +++ b/OpenCL/m09400.cl @@ -7,20 +7,20 @@ #define _OFFICE2007_ -#include "include/constants.h" -#include "include/kernel_vendor.h" +#include "inc_hash_constants.h" +#include "inc_vendor.cl" #define DGST_R0 0 #define DGST_R1 1 #define DGST_R2 2 #define DGST_R3 3 -#include "include/kernel_functions.c" -#include "OpenCL/types_ocl.c" -#include "OpenCL/common.c" +#include "inc_hash_functions.cl" +#include "inc_types.cl" +#include "inc_common.cl" -#define COMPARE_S "OpenCL/check_single_comp4.c" -#define COMPARE_M "OpenCL/check_multi_comp4.c" +#define COMPARE_S "inc_comp_single.cl" +#define COMPARE_M "inc_comp_multi.cl" __constant u32 te0[256] = { diff --git a/OpenCL/m09500.cl b/OpenCL/m09500.cl index 3445f43..a51d1fc 100644 --- a/OpenCL/m09500.cl +++ b/OpenCL/m09500.cl @@ -7,20 +7,20 @@ #define _OFFICE2010_ -#include "include/constants.h" -#include "include/kernel_vendor.h" +#include "inc_hash_constants.h" +#include "inc_vendor.cl" #define DGST_R0 0 #define DGST_R1 1 #define DGST_R2 2 #define DGST_R3 3 -#include "include/kernel_functions.c" -#include "OpenCL/types_ocl.c" -#include "OpenCL/common.c" +#include "inc_hash_functions.cl" +#include "inc_types.cl" +#include "inc_common.cl" -#define COMPARE_S "OpenCL/check_single_comp4.c" -#define COMPARE_M "OpenCL/check_multi_comp4.c" +#define COMPARE_S "inc_comp_single.cl" +#define COMPARE_M "inc_comp_multi.cl" __constant u32 te0[256] = { diff --git a/OpenCL/m09600.cl b/OpenCL/m09600.cl index eb28f6c..18acd46 100644 --- a/OpenCL/m09600.cl +++ b/OpenCL/m09600.cl @@ -7,20 +7,20 @@ #define _OFFICE2013_ -#include "include/constants.h" -#include "include/kernel_vendor.h" +#include "inc_hash_constants.h" +#include "inc_vendor.cl" #define DGST_R0 0 #define DGST_R1 1 #define DGST_R2 2 #define DGST_R3 3 -#include "include/kernel_functions.c" -#include "OpenCL/types_ocl.c" -#include "OpenCL/common.c" +#include "inc_hash_functions.cl" +#include "inc_types.cl" +#include "inc_common.cl" -#define COMPARE_S "OpenCL/check_single_comp4.c" -#define COMPARE_M "OpenCL/check_multi_comp4.c" +#define COMPARE_S "inc_comp_single.cl" +#define COMPARE_M "inc_comp_multi.cl" __constant u32 te0[256] = { diff --git a/OpenCL/m09700_a0.cl b/OpenCL/m09700_a0.cl index 4fa60b9..0c71129 100644 --- a/OpenCL/m09700_a0.cl +++ b/OpenCL/m09700_a0.cl @@ -8,20 +8,20 @@ //too much register pressure //#define NEW_SIMD_CODE -#include "include/constants.h" -#include "include/kernel_vendor.h" +#include "inc_hash_constants.h" +#include "inc_vendor.cl" #define DGST_R0 0 #define DGST_R1 1 #define DGST_R2 2 #define DGST_R3 3 -#include "include/kernel_functions.c" -#include "OpenCL/types_ocl.c" -#include "OpenCL/common.c" -#include "include/rp_kernel.h" -#include "OpenCL/rp.c" -#include "OpenCL/simd.c" +#include "inc_hash_functions.cl" +#include "inc_types.cl" +#include "inc_common.cl" +#include "inc_rp.h" +#include "inc_rp.cl" +#include "inc_simd.cl" typedef struct { diff --git a/OpenCL/m09700_a1.cl b/OpenCL/m09700_a1.cl index 65162f7..1fcb15e 100644 --- a/OpenCL/m09700_a1.cl +++ b/OpenCL/m09700_a1.cl @@ -8,18 +8,18 @@ //too much register pressure //#define NEW_SIMD_CODE -#include "include/constants.h" -#include "include/kernel_vendor.h" +#include "inc_hash_constants.h" +#include "inc_vendor.cl" #define DGST_R0 0 #define DGST_R1 1 #define DGST_R2 2 #define DGST_R3 3 -#include "include/kernel_functions.c" -#include "OpenCL/types_ocl.c" -#include "OpenCL/common.c" -#include "OpenCL/simd.c" +#include "inc_hash_functions.cl" +#include "inc_types.cl" +#include "inc_common.cl" +#include "inc_simd.cl" typedef struct { diff --git a/OpenCL/m09700_a3.cl b/OpenCL/m09700_a3.cl index 45128af..d9a4cf9 100644 --- a/OpenCL/m09700_a3.cl +++ b/OpenCL/m09700_a3.cl @@ -7,18 +7,18 @@ #define _OLDOFFICE01_ -#include "include/constants.h" -#include "include/kernel_vendor.h" +#include "inc_hash_constants.h" +#include "inc_vendor.cl" #define DGST_R0 0 #define DGST_R1 1 #define DGST_R2 2 #define DGST_R3 3 -#include "include/kernel_functions.c" -#include "OpenCL/types_ocl.c" -#include "OpenCL/common.c" -#include "OpenCL/simd.c" +#include "inc_hash_functions.cl" +#include "inc_types.cl" +#include "inc_common.cl" +#include "inc_simd.cl" typedef struct { diff --git a/OpenCL/m09710_a0.cl b/OpenCL/m09710_a0.cl index b992e8d..040abd5 100644 --- a/OpenCL/m09710_a0.cl +++ b/OpenCL/m09710_a0.cl @@ -8,20 +8,20 @@ //too much register pressure //#define NEW_SIMD_CODE -#include "include/constants.h" -#include "include/kernel_vendor.h" +#include "inc_hash_constants.h" +#include "inc_vendor.cl" #define DGST_R0 0 #define DGST_R1 1 #define DGST_R2 2 #define DGST_R3 3 -#include "include/kernel_functions.c" -#include "OpenCL/types_ocl.c" -#include "OpenCL/common.c" -#include "include/rp_kernel.h" -#include "OpenCL/rp.c" -#include "OpenCL/simd.c" +#include "inc_hash_functions.cl" +#include "inc_types.cl" +#include "inc_common.cl" +#include "inc_rp.h" +#include "inc_rp.cl" +#include "inc_simd.cl" typedef struct { diff --git a/OpenCL/m09710_a1.cl b/OpenCL/m09710_a1.cl index c761e44..74e119e 100644 --- a/OpenCL/m09710_a1.cl +++ b/OpenCL/m09710_a1.cl @@ -8,18 +8,18 @@ //too much register pressure //#define NEW_SIMD_CODE -#include "include/constants.h" -#include "include/kernel_vendor.h" +#include "inc_hash_constants.h" +#include "inc_vendor.cl" #define DGST_R0 0 #define DGST_R1 1 #define DGST_R2 2 #define DGST_R3 3 -#include "include/kernel_functions.c" -#include "OpenCL/types_ocl.c" -#include "OpenCL/common.c" -#include "OpenCL/simd.c" +#include "inc_hash_functions.cl" +#include "inc_types.cl" +#include "inc_common.cl" +#include "inc_simd.cl" typedef struct { diff --git a/OpenCL/m09710_a3.cl b/OpenCL/m09710_a3.cl index 61f23d1..17b4adf 100644 --- a/OpenCL/m09710_a3.cl +++ b/OpenCL/m09710_a3.cl @@ -10,18 +10,18 @@ //too much register pressure //#define NEW_SIMD_CODE -#include "include/constants.h" -#include "include/kernel_vendor.h" +#include "inc_hash_constants.h" +#include "inc_vendor.cl" #define DGST_R0 0 #define DGST_R1 1 #define DGST_R2 2 #define DGST_R3 3 -#include "include/kernel_functions.c" -#include "OpenCL/types_ocl.c" -#include "OpenCL/common.c" -#include "OpenCL/simd.c" +#include "inc_hash_functions.cl" +#include "inc_types.cl" +#include "inc_common.cl" +#include "inc_simd.cl" typedef struct { diff --git a/OpenCL/m09720_a0.cl b/OpenCL/m09720_a0.cl index 6721d00..8aeb1e2 100644 --- a/OpenCL/m09720_a0.cl +++ b/OpenCL/m09720_a0.cl @@ -7,20 +7,20 @@ #define NEW_SIMD_CODE -#include "include/constants.h" -#include "include/kernel_vendor.h" +#include "inc_hash_constants.h" +#include "inc_vendor.cl" #define DGST_R0 0 #define DGST_R1 1 #define DGST_R2 2 #define DGST_R3 3 -#include "include/kernel_functions.c" -#include "OpenCL/types_ocl.c" -#include "OpenCL/common.c" -#include "include/rp_kernel.h" -#include "OpenCL/rp.c" -#include "OpenCL/simd.c" +#include "inc_hash_functions.cl" +#include "inc_types.cl" +#include "inc_common.cl" +#include "inc_rp.h" +#include "inc_rp.cl" +#include "inc_simd.cl" void md5_transform (const u32x w0[4], const u32x w1[4], const u32x w2[4], const u32x w3[4], u32x digest[4]) { diff --git a/OpenCL/m09720_a1.cl b/OpenCL/m09720_a1.cl index 091d041..b0c6bba 100644 --- a/OpenCL/m09720_a1.cl +++ b/OpenCL/m09720_a1.cl @@ -7,18 +7,18 @@ #define NEW_SIMD_CODE -#include "include/constants.h" -#include "include/kernel_vendor.h" +#include "inc_hash_constants.h" +#include "inc_vendor.cl" #define DGST_R0 0 #define DGST_R1 1 #define DGST_R2 2 #define DGST_R3 3 -#include "include/kernel_functions.c" -#include "OpenCL/types_ocl.c" -#include "OpenCL/common.c" -#include "OpenCL/simd.c" +#include "inc_hash_functions.cl" +#include "inc_types.cl" +#include "inc_common.cl" +#include "inc_simd.cl" void md5_transform (const u32x w0[4], const u32x w1[4], const u32x w2[4], const u32x w3[4], u32x digest[4]) { diff --git a/OpenCL/m09720_a3.cl b/OpenCL/m09720_a3.cl index 0b904da..66b5ccd 100644 --- a/OpenCL/m09720_a3.cl +++ b/OpenCL/m09720_a3.cl @@ -7,18 +7,18 @@ #define NEW_SIMD_CODE -#include "include/constants.h" -#include "include/kernel_vendor.h" +#include "inc_hash_constants.h" +#include "inc_vendor.cl" #define DGST_R0 0 #define DGST_R1 1 #define DGST_R2 2 #define DGST_R3 3 -#include "include/kernel_functions.c" -#include "OpenCL/types_ocl.c" -#include "OpenCL/common.c" -#include "OpenCL/simd.c" +#include "inc_hash_functions.cl" +#include "inc_types.cl" +#include "inc_common.cl" +#include "inc_simd.cl" void md5_transform (const u32x w0[4], const u32x w1[4], const u32x w2[4], const u32x w3[4], u32x digest[4]) { diff --git a/OpenCL/m09800_a0.cl b/OpenCL/m09800_a0.cl index 31f6355..2267b1a 100644 --- a/OpenCL/m09800_a0.cl +++ b/OpenCL/m09800_a0.cl @@ -8,20 +8,20 @@ //too much register pressure //#define NEW_SIMD_CODE -#include "include/constants.h" -#include "include/kernel_vendor.h" +#include "inc_hash_constants.h" +#include "inc_vendor.cl" #define DGST_R0 0 #define DGST_R1 1 #define DGST_R2 2 #define DGST_R3 3 -#include "include/kernel_functions.c" -#include "OpenCL/types_ocl.c" -#include "OpenCL/common.c" -#include "include/rp_kernel.h" -#include "OpenCL/rp.c" -#include "OpenCL/simd.c" +#include "inc_hash_functions.cl" +#include "inc_types.cl" +#include "inc_common.cl" +#include "inc_rp.h" +#include "inc_rp.cl" +#include "inc_simd.cl" typedef struct { diff --git a/OpenCL/m09800_a1.cl b/OpenCL/m09800_a1.cl index 1c11f01..48cc909 100644 --- a/OpenCL/m09800_a1.cl +++ b/OpenCL/m09800_a1.cl @@ -8,18 +8,18 @@ //too much register pressure //#define NEW_SIMD_CODE -#include "include/constants.h" -#include "include/kernel_vendor.h" +#include "inc_hash_constants.h" +#include "inc_vendor.cl" #define DGST_R0 0 #define DGST_R1 1 #define DGST_R2 2 #define DGST_R3 3 -#include "include/kernel_functions.c" -#include "OpenCL/types_ocl.c" -#include "OpenCL/common.c" -#include "OpenCL/simd.c" +#include "inc_hash_functions.cl" +#include "inc_types.cl" +#include "inc_common.cl" +#include "inc_simd.cl" typedef struct { diff --git a/OpenCL/m09800_a3.cl b/OpenCL/m09800_a3.cl index 6fc92c0..eaf1fa8 100644 --- a/OpenCL/m09800_a3.cl +++ b/OpenCL/m09800_a3.cl @@ -7,18 +7,18 @@ #define _OLDOFFICE34_ -#include "include/constants.h" -#include "include/kernel_vendor.h" +#include "inc_hash_constants.h" +#include "inc_vendor.cl" #define DGST_R0 0 #define DGST_R1 1 #define DGST_R2 2 #define DGST_R3 3 -#include "include/kernel_functions.c" -#include "OpenCL/types_ocl.c" -#include "OpenCL/common.c" -#include "OpenCL/simd.c" +#include "inc_hash_functions.cl" +#include "inc_types.cl" +#include "inc_common.cl" +#include "inc_simd.cl" typedef struct { diff --git a/OpenCL/m09810_a0.cl b/OpenCL/m09810_a0.cl index 40fb8a0..b27ee74 100644 --- a/OpenCL/m09810_a0.cl +++ b/OpenCL/m09810_a0.cl @@ -8,20 +8,20 @@ //too much register pressure //#define NEW_SIMD_CODE -#include "include/constants.h" -#include "include/kernel_vendor.h" +#include "inc_hash_constants.h" +#include "inc_vendor.cl" #define DGST_R0 0 #define DGST_R1 1 #define DGST_R2 2 #define DGST_R3 3 -#include "include/kernel_functions.c" -#include "OpenCL/types_ocl.c" -#include "OpenCL/common.c" -#include "include/rp_kernel.h" -#include "OpenCL/rp.c" -#include "OpenCL/simd.c" +#include "inc_hash_functions.cl" +#include "inc_types.cl" +#include "inc_common.cl" +#include "inc_rp.h" +#include "inc_rp.cl" +#include "inc_simd.cl" typedef struct { diff --git a/OpenCL/m09810_a1.cl b/OpenCL/m09810_a1.cl index 527b1bd..bf1ae52 100644 --- a/OpenCL/m09810_a1.cl +++ b/OpenCL/m09810_a1.cl @@ -8,18 +8,18 @@ //too much register pressure //#define NEW_SIMD_CODE -#include "include/constants.h" -#include "include/kernel_vendor.h" +#include "inc_hash_constants.h" +#include "inc_vendor.cl" #define DGST_R0 0 #define DGST_R1 1 #define DGST_R2 2 #define DGST_R3 3 -#include "include/kernel_functions.c" -#include "OpenCL/types_ocl.c" -#include "OpenCL/common.c" -#include "OpenCL/simd.c" +#include "inc_hash_functions.cl" +#include "inc_types.cl" +#include "inc_common.cl" +#include "inc_simd.cl" typedef struct { diff --git a/OpenCL/m09810_a3.cl b/OpenCL/m09810_a3.cl index 5bfc896..56cf7c7 100644 --- a/OpenCL/m09810_a3.cl +++ b/OpenCL/m09810_a3.cl @@ -10,18 +10,18 @@ //too much register pressure //#define NEW_SIMD_CODE -#include "include/constants.h" -#include "include/kernel_vendor.h" +#include "inc_hash_constants.h" +#include "inc_vendor.cl" #define DGST_R0 0 #define DGST_R1 1 #define DGST_R2 2 #define DGST_R3 3 -#include "include/kernel_functions.c" -#include "OpenCL/types_ocl.c" -#include "OpenCL/common.c" -#include "OpenCL/simd.c" +#include "inc_hash_functions.cl" +#include "inc_types.cl" +#include "inc_common.cl" +#include "inc_simd.cl" typedef struct { diff --git a/OpenCL/m09820_a0.cl b/OpenCL/m09820_a0.cl index 8e780bc..89dda1a 100644 --- a/OpenCL/m09820_a0.cl +++ b/OpenCL/m09820_a0.cl @@ -7,20 +7,20 @@ #define NEW_SIMD_CODE -#include "include/constants.h" -#include "include/kernel_vendor.h" +#include "inc_hash_constants.h" +#include "inc_vendor.cl" #define DGST_R0 0 #define DGST_R1 1 #define DGST_R2 2 #define DGST_R3 3 -#include "include/kernel_functions.c" -#include "OpenCL/types_ocl.c" -#include "OpenCL/common.c" -#include "include/rp_kernel.h" -#include "OpenCL/rp.c" -#include "OpenCL/simd.c" +#include "inc_hash_functions.cl" +#include "inc_types.cl" +#include "inc_common.cl" +#include "inc_rp.h" +#include "inc_rp.cl" +#include "inc_simd.cl" void sha1_transform (const u32x w0[4], const u32x w1[4], const u32x w2[4], const u32x w3[4], u32x digest[5]) { diff --git a/OpenCL/m09820_a1.cl b/OpenCL/m09820_a1.cl index f8025e5..b8075b3 100644 --- a/OpenCL/m09820_a1.cl +++ b/OpenCL/m09820_a1.cl @@ -7,18 +7,18 @@ #define NEW_SIMD_CODE -#include "include/constants.h" -#include "include/kernel_vendor.h" +#include "inc_hash_constants.h" +#include "inc_vendor.cl" #define DGST_R0 0 #define DGST_R1 1 #define DGST_R2 2 #define DGST_R3 3 -#include "include/kernel_functions.c" -#include "OpenCL/types_ocl.c" -#include "OpenCL/common.c" -#include "OpenCL/simd.c" +#include "inc_hash_functions.cl" +#include "inc_types.cl" +#include "inc_common.cl" +#include "inc_simd.cl" void sha1_transform (const u32x w0[4], const u32x w1[4], const u32x w2[4], const u32x w3[4], u32x digest[5]) { diff --git a/OpenCL/m09820_a3.cl b/OpenCL/m09820_a3.cl index 3f8b332..0b9fc57 100644 --- a/OpenCL/m09820_a3.cl +++ b/OpenCL/m09820_a3.cl @@ -7,18 +7,18 @@ #define NEW_SIMD_CODE -#include "include/constants.h" -#include "include/kernel_vendor.h" +#include "inc_hash_constants.h" +#include "inc_vendor.cl" #define DGST_R0 0 #define DGST_R1 1 #define DGST_R2 2 #define DGST_R3 3 -#include "include/kernel_functions.c" -#include "OpenCL/types_ocl.c" -#include "OpenCL/common.c" -#include "OpenCL/simd.c" +#include "inc_hash_functions.cl" +#include "inc_types.cl" +#include "inc_common.cl" +#include "inc_simd.cl" void sha1_transform (const u32x w0[4], const u32x w1[4], const u32x w2[4], const u32x w3[4], u32x digest[5]) { diff --git a/OpenCL/m09900_a0.cl b/OpenCL/m09900_a0.cl index 91ded72..fddcef8 100644 --- a/OpenCL/m09900_a0.cl +++ b/OpenCL/m09900_a0.cl @@ -7,20 +7,20 @@ #define NEW_SIMD_CODE -#include "include/constants.h" -#include "include/kernel_vendor.h" +#include "inc_hash_constants.h" +#include "inc_vendor.cl" #define DGST_R0 0 #define DGST_R1 3 #define DGST_R2 2 #define DGST_R3 1 -#include "include/kernel_functions.c" -#include "OpenCL/types_ocl.c" -#include "OpenCL/common.c" -#include "include/rp_kernel.h" -#include "OpenCL/rp.c" -#include "OpenCL/simd.c" +#include "inc_hash_functions.cl" +#include "inc_types.cl" +#include "inc_common.cl" +#include "inc_rp.h" +#include "inc_rp.cl" +#include "inc_simd.cl" __kernel void m09900_m04 (__global pw_t *pws, __global kernel_rule_t * rules_buf, __global comb_t *combs_buf, __global bf_t *bfs_buf, __global void *tmps, __global void *hooks, __global u32 *bitmaps_buf_s1_a, __global u32 *bitmaps_buf_s1_b, __global u32 *bitmaps_buf_s1_c, __global u32 *bitmaps_buf_s1_d, __global u32 *bitmaps_buf_s2_a, __global u32 *bitmaps_buf_s2_b, __global u32 *bitmaps_buf_s2_c, __global u32 *bitmaps_buf_s2_d, __global plain_t *plains_buf, __global digest_t *digests_buf, __global u32 *hashes_shown, __global salt_t *salt_bufs, __global void *esalt_bufs, __global u32 *d_return_buf, __global u32 *d_scryptV_buf, const u32 bitmap_mask, const u32 bitmap_shift1, const u32 bitmap_shift2, const u32 salt_pos, const u32 loop_pos, const u32 loop_cnt, const u32 il_cnt, const u32 digests_cnt, const u32 digests_offset, const u32 combs_mode, const u32 gid_max) { diff --git a/OpenCL/m09900_a1.cl b/OpenCL/m09900_a1.cl index e6f051d..0e63e55 100644 --- a/OpenCL/m09900_a1.cl +++ b/OpenCL/m09900_a1.cl @@ -7,18 +7,18 @@ #define NEW_SIMD_CODE -#include "include/constants.h" -#include "include/kernel_vendor.h" +#include "inc_hash_constants.h" +#include "inc_vendor.cl" #define DGST_R0 0 #define DGST_R1 3 #define DGST_R2 2 #define DGST_R3 1 -#include "include/kernel_functions.c" -#include "OpenCL/types_ocl.c" -#include "OpenCL/common.c" -#include "OpenCL/simd.c" +#include "inc_hash_functions.cl" +#include "inc_types.cl" +#include "inc_common.cl" +#include "inc_simd.cl" __kernel void m09900_m04 (__global pw_t *pws, __global kernel_rule_t *rules_buf, __global comb_t *combs_buf, __global bf_t *bfs_buf, __global void *tmps, __global void *hooks, __global u32 *bitmaps_buf_s1_a, __global u32 *bitmaps_buf_s1_b, __global u32 *bitmaps_buf_s1_c, __global u32 *bitmaps_buf_s1_d, __global u32 *bitmaps_buf_s2_a, __global u32 *bitmaps_buf_s2_b, __global u32 *bitmaps_buf_s2_c, __global u32 *bitmaps_buf_s2_d, __global plain_t *plains_buf, __global digest_t *digests_buf, __global u32 *hashes_shown, __global salt_t *salt_bufs, __global void *esalt_bufs, __global u32 *d_return_buf, __global u32 *d_scryptV_buf, const u32 bitmap_mask, const u32 bitmap_shift1, const u32 bitmap_shift2, const u32 salt_pos, const u32 loop_pos, const u32 loop_cnt, const u32 il_cnt, const u32 digests_cnt, const u32 digests_offset, const u32 combs_mode, const u32 gid_max) { diff --git a/OpenCL/m09900_a3.cl b/OpenCL/m09900_a3.cl index a11bf4c..30bae9b 100644 --- a/OpenCL/m09900_a3.cl +++ b/OpenCL/m09900_a3.cl @@ -7,18 +7,18 @@ #define NEW_SIMD_CODE -#include "include/constants.h" -#include "include/kernel_vendor.h" +#include "inc_hash_constants.h" +#include "inc_vendor.cl" #define DGST_R0 0 #define DGST_R1 3 #define DGST_R2 2 #define DGST_R3 1 -#include "include/kernel_functions.c" -#include "OpenCL/types_ocl.c" -#include "OpenCL/common.c" -#include "OpenCL/simd.c" +#include "inc_hash_functions.cl" +#include "inc_types.cl" +#include "inc_common.cl" +#include "inc_simd.cl" void m09900m (u32 w[16], const u32 pw_len, __global pw_t *pws, __global kernel_rule_t *rules_buf, __global comb_t *combs_buf, __constant u32x * words_buf_r, __global void *tmps, __global void *hooks, __global u32 *bitmaps_buf_s1_a, __global u32 *bitmaps_buf_s1_b, __global u32 *bitmaps_buf_s1_c, __global u32 *bitmaps_buf_s1_d, __global u32 *bitmaps_buf_s2_a, __global u32 *bitmaps_buf_s2_b, __global u32 *bitmaps_buf_s2_c, __global u32 *bitmaps_buf_s2_d, __global plain_t *plains_buf, __global digest_t *digests_buf, __global u32 *hashes_shown, __global salt_t *salt_bufs, __global void *esalt_bufs, __global u32 *d_return_buf, __global u32 *d_scryptV_buf, const u32 bitmap_mask, const u32 bitmap_shift1, const u32 bitmap_shift2, const u32 salt_pos, const u32 loop_pos, const u32 loop_cnt, const u32 il_cnt, const u32 digests_cnt, const u32 digests_offset) { diff --git a/OpenCL/m10100_a0.cl b/OpenCL/m10100_a0.cl index 269aff3..ad82fb4 100644 --- a/OpenCL/m10100_a0.cl +++ b/OpenCL/m10100_a0.cl @@ -8,20 +8,20 @@ //incompatible to simd //#define NEW_SIMD_CODE -#include "include/constants.h" -#include "include/kernel_vendor.h" +#include "inc_hash_constants.h" +#include "inc_vendor.cl" #define DGST_R0 0 #define DGST_R1 1 #define DGST_R2 2 #define DGST_R3 3 -#include "include/kernel_functions.c" -#include "OpenCL/types_ocl.c" -#include "OpenCL/common.c" -#include "include/rp_kernel.h" -#include "OpenCL/rp.c" -#include "OpenCL/simd.c" +#include "inc_hash_functions.cl" +#include "inc_types.cl" +#include "inc_common.cl" +#include "inc_rp.h" +#include "inc_rp.cl" +#include "inc_simd.cl" #define SIPROUND(v0,v1,v2,v3) \ (v0) += (v1); \ diff --git a/OpenCL/m10100_a1.cl b/OpenCL/m10100_a1.cl index 345ad16..b797008 100644 --- a/OpenCL/m10100_a1.cl +++ b/OpenCL/m10100_a1.cl @@ -8,18 +8,18 @@ //incompatible to simd //#define NEW_SIMD_CODE -#include "include/constants.h" -#include "include/kernel_vendor.h" +#include "inc_hash_constants.h" +#include "inc_vendor.cl" #define DGST_R0 0 #define DGST_R1 1 #define DGST_R2 2 #define DGST_R3 3 -#include "include/kernel_functions.c" -#include "OpenCL/types_ocl.c" -#include "OpenCL/common.c" -#include "OpenCL/simd.c" +#include "inc_hash_functions.cl" +#include "inc_types.cl" +#include "inc_common.cl" +#include "inc_simd.cl" #define SIPROUND(v0,v1,v2,v3) \ (v0) += (v1); \ diff --git a/OpenCL/m10100_a3.cl b/OpenCL/m10100_a3.cl index 116a7cf..ded29d3 100644 --- a/OpenCL/m10100_a3.cl +++ b/OpenCL/m10100_a3.cl @@ -7,18 +7,18 @@ #define NEW_SIMD_CODE -#include "include/constants.h" -#include "include/kernel_vendor.h" +#include "inc_hash_constants.h" +#include "inc_vendor.cl" #define DGST_R0 0 #define DGST_R1 1 #define DGST_R2 2 #define DGST_R3 3 -#include "include/kernel_functions.c" -#include "OpenCL/types_ocl.c" -#include "OpenCL/common.c" -#include "OpenCL/simd.c" +#include "inc_hash_functions.cl" +#include "inc_types.cl" +#include "inc_common.cl" +#include "inc_simd.cl" #define SIPROUND(v0,v1,v2,v3) \ (v0) += (v1); \ diff --git a/OpenCL/m10300.cl b/OpenCL/m10300.cl index 2493658..2dc8a99 100644 --- a/OpenCL/m10300.cl +++ b/OpenCL/m10300.cl @@ -5,20 +5,20 @@ #define _SHA1_ -#include "include/constants.h" -#include "include/kernel_vendor.h" +#include "inc_hash_constants.h" +#include "inc_vendor.cl" #define DGST_R0 0 #define DGST_R1 1 #define DGST_R2 2 #define DGST_R3 3 -#include "include/kernel_functions.c" -#include "OpenCL/types_ocl.c" -#include "OpenCL/common.c" +#include "inc_hash_functions.cl" +#include "inc_types.cl" +#include "inc_common.cl" -#define COMPARE_S "OpenCL/check_single_comp4.c" -#define COMPARE_M "OpenCL/check_multi_comp4.c" +#define COMPARE_S "inc_comp_single.cl" +#define COMPARE_M "inc_comp_multi.cl" void sha1_transform (const u32 w0[4], const u32 w1[4], const u32 w2[4], const u32 w3[4], u32 digest[5]) { diff --git a/OpenCL/m10400_a0.cl b/OpenCL/m10400_a0.cl index 90cd0bc..9094a96 100644 --- a/OpenCL/m10400_a0.cl +++ b/OpenCL/m10400_a0.cl @@ -10,20 +10,20 @@ //too much register pressure //#define NEW_SIMD_CODE -#include "include/constants.h" -#include "include/kernel_vendor.h" +#include "inc_hash_constants.h" +#include "inc_vendor.cl" #define DGST_R0 0 #define DGST_R1 1 #define DGST_R2 2 #define DGST_R3 3 -#include "include/kernel_functions.c" -#include "OpenCL/types_ocl.c" -#include "OpenCL/common.c" -#include "include/rp_kernel.h" -#include "OpenCL/rp.c" -#include "OpenCL/simd.c" +#include "inc_hash_functions.cl" +#include "inc_types.cl" +#include "inc_common.cl" +#include "inc_rp.h" +#include "inc_rp.cl" +#include "inc_simd.cl" __constant u32 padding[8] = { diff --git a/OpenCL/m10400_a1.cl b/OpenCL/m10400_a1.cl index 093af29..df58488 100644 --- a/OpenCL/m10400_a1.cl +++ b/OpenCL/m10400_a1.cl @@ -10,18 +10,18 @@ //too much register pressure //#define NEW_SIMD_CODE -#include "include/constants.h" -#include "include/kernel_vendor.h" +#include "inc_hash_constants.h" +#include "inc_vendor.cl" #define DGST_R0 0 #define DGST_R1 1 #define DGST_R2 2 #define DGST_R3 3 -#include "include/kernel_functions.c" -#include "OpenCL/types_ocl.c" -#include "OpenCL/common.c" -#include "OpenCL/simd.c" +#include "inc_hash_functions.cl" +#include "inc_types.cl" +#include "inc_common.cl" +#include "inc_simd.cl" __constant u32 padding[8] = { diff --git a/OpenCL/m10400_a3.cl b/OpenCL/m10400_a3.cl index 92ebfe5..b26f455 100644 --- a/OpenCL/m10400_a3.cl +++ b/OpenCL/m10400_a3.cl @@ -10,18 +10,18 @@ //too much register pressure //#define NEW_SIMD_CODE -#include "include/constants.h" -#include "include/kernel_vendor.h" +#include "inc_hash_constants.h" +#include "inc_vendor.cl" #define DGST_R0 0 #define DGST_R1 1 #define DGST_R2 2 #define DGST_R3 3 -#include "include/kernel_functions.c" -#include "OpenCL/types_ocl.c" -#include "OpenCL/common.c" -#include "OpenCL/simd.c" +#include "inc_hash_functions.cl" +#include "inc_types.cl" +#include "inc_common.cl" +#include "inc_simd.cl" __constant u32 padding[8] = { diff --git a/OpenCL/m10410_a0.cl b/OpenCL/m10410_a0.cl index 518b84c..51b1d74 100644 --- a/OpenCL/m10410_a0.cl +++ b/OpenCL/m10410_a0.cl @@ -10,20 +10,20 @@ //too much register pressure //#define NEW_SIMD_CODE -#include "include/constants.h" -#include "include/kernel_vendor.h" +#include "inc_hash_constants.h" +#include "inc_vendor.cl" #define DGST_R0 0 #define DGST_R1 1 #define DGST_R2 2 #define DGST_R3 3 -#include "include/kernel_functions.c" -#include "OpenCL/types_ocl.c" -#include "OpenCL/common.c" -#include "include/rp_kernel.h" -#include "OpenCL/rp.c" -#include "OpenCL/simd.c" +#include "inc_hash_functions.cl" +#include "inc_types.cl" +#include "inc_common.cl" +#include "inc_rp.h" +#include "inc_rp.cl" +#include "inc_simd.cl" __constant u32 padding[8] = { diff --git a/OpenCL/m10410_a1.cl b/OpenCL/m10410_a1.cl index ec226b8..c5933ef 100644 --- a/OpenCL/m10410_a1.cl +++ b/OpenCL/m10410_a1.cl @@ -10,18 +10,18 @@ //too much register pressure //#define NEW_SIMD_CODE -#include "include/constants.h" -#include "include/kernel_vendor.h" +#include "inc_hash_constants.h" +#include "inc_vendor.cl" #define DGST_R0 0 #define DGST_R1 1 #define DGST_R2 2 #define DGST_R3 3 -#include "include/kernel_functions.c" -#include "OpenCL/types_ocl.c" -#include "OpenCL/common.c" -#include "OpenCL/simd.c" +#include "inc_hash_functions.cl" +#include "inc_types.cl" +#include "inc_common.cl" +#include "inc_simd.cl" __constant u32 padding[8] = { diff --git a/OpenCL/m10410_a3.cl b/OpenCL/m10410_a3.cl index d43b657..b56c678 100644 --- a/OpenCL/m10410_a3.cl +++ b/OpenCL/m10410_a3.cl @@ -10,18 +10,18 @@ //too much register pressure //#define NEW_SIMD_CODE -#include "include/constants.h" -#include "include/kernel_vendor.h" +#include "inc_hash_constants.h" +#include "inc_vendor.cl" #define DGST_R0 0 #define DGST_R1 1 #define DGST_R2 2 #define DGST_R3 3 -#include "include/kernel_functions.c" -#include "OpenCL/types_ocl.c" -#include "OpenCL/common.c" -#include "OpenCL/simd.c" +#include "inc_hash_functions.cl" +#include "inc_types.cl" +#include "inc_common.cl" +#include "inc_simd.cl" __constant u32 padding[8] = { diff --git a/OpenCL/m10420_a0.cl b/OpenCL/m10420_a0.cl index 9b69a25..f9d295b 100644 --- a/OpenCL/m10420_a0.cl +++ b/OpenCL/m10420_a0.cl @@ -7,20 +7,20 @@ #define NEW_SIMD_CODE -#include "include/constants.h" -#include "include/kernel_vendor.h" +#include "inc_hash_constants.h" +#include "inc_vendor.cl" #define DGST_R0 0 #define DGST_R1 1 #define DGST_R2 2 #define DGST_R3 3 -#include "include/kernel_functions.c" -#include "OpenCL/types_ocl.c" -#include "OpenCL/common.c" -#include "include/rp_kernel.h" -#include "OpenCL/rp.c" -#include "OpenCL/simd.c" +#include "inc_hash_functions.cl" +#include "inc_types.cl" +#include "inc_common.cl" +#include "inc_rp.h" +#include "inc_rp.cl" +#include "inc_simd.cl" __constant u32 padding[8] = { diff --git a/OpenCL/m10420_a1.cl b/OpenCL/m10420_a1.cl index 42cf320..9126e2c 100644 --- a/OpenCL/m10420_a1.cl +++ b/OpenCL/m10420_a1.cl @@ -7,18 +7,18 @@ #define NEW_SIMD_CODE -#include "include/constants.h" -#include "include/kernel_vendor.h" +#include "inc_hash_constants.h" +#include "inc_vendor.cl" #define DGST_R0 0 #define DGST_R1 1 #define DGST_R2 2 #define DGST_R3 3 -#include "include/kernel_functions.c" -#include "OpenCL/types_ocl.c" -#include "OpenCL/common.c" -#include "OpenCL/simd.c" +#include "inc_hash_functions.cl" +#include "inc_types.cl" +#include "inc_common.cl" +#include "inc_simd.cl" __constant u32 padding[8] = { diff --git a/OpenCL/m10420_a3.cl b/OpenCL/m10420_a3.cl index 93b84c4..a7abb23 100644 --- a/OpenCL/m10420_a3.cl +++ b/OpenCL/m10420_a3.cl @@ -7,18 +7,18 @@ #define NEW_SIMD_CODE -#include "include/constants.h" -#include "include/kernel_vendor.h" +#include "inc_hash_constants.h" +#include "inc_vendor.cl" #define DGST_R0 0 #define DGST_R1 1 #define DGST_R2 2 #define DGST_R3 3 -#include "include/kernel_functions.c" -#include "OpenCL/types_ocl.c" -#include "OpenCL/common.c" -#include "OpenCL/simd.c" +#include "inc_hash_functions.cl" +#include "inc_types.cl" +#include "inc_common.cl" +#include "inc_simd.cl" __constant u32 padding[8] = { diff --git a/OpenCL/m10500.cl b/OpenCL/m10500.cl index a24469f..721bfc5 100644 --- a/OpenCL/m10500.cl +++ b/OpenCL/m10500.cl @@ -5,20 +5,20 @@ #define _MD5_ -#include "include/constants.h" -#include "include/kernel_vendor.h" +#include "inc_hash_constants.h" +#include "inc_vendor.cl" #define DGST_R0 0 #define DGST_R1 1 #define DGST_R2 2 #define DGST_R3 3 -#include "include/kernel_functions.c" -#include "OpenCL/types_ocl.c" -#include "OpenCL/common.c" +#include "inc_hash_functions.cl" +#include "inc_types.cl" +#include "inc_common.cl" -#define COMPARE_S "OpenCL/check_single_comp4.c" -#define COMPARE_M "OpenCL/check_multi_comp4.c" +#define COMPARE_S "inc_comp_single.cl" +#define COMPARE_M "inc_comp_multi.cl" __constant u32 padding[8] = { diff --git a/OpenCL/m10700.cl b/OpenCL/m10700.cl index d606f2d..e0a7389 100644 --- a/OpenCL/m10700.cl +++ b/OpenCL/m10700.cl @@ -7,20 +7,20 @@ #define _PDF17L8_ -#include "include/constants.h" -#include "include/kernel_vendor.h" +#include "inc_hash_constants.h" +#include "inc_vendor.cl" #define DGST_R0 0 #define DGST_R1 1 #define DGST_R2 2 #define DGST_R3 3 -#include "include/kernel_functions.c" -#include "OpenCL/types_ocl.c" -#include "OpenCL/common.c" +#include "inc_hash_functions.cl" +#include "inc_types.cl" +#include "inc_common.cl" -#define COMPARE_S "OpenCL/check_single_comp4.c" -#define COMPARE_M "OpenCL/check_multi_comp4.c" +#define COMPARE_S "inc_comp_single.cl" +#define COMPARE_M "inc_comp_multi.cl" typedef struct { diff --git a/OpenCL/m10800_a0.cl b/OpenCL/m10800_a0.cl index 17f7540..c7de147 100644 --- a/OpenCL/m10800_a0.cl +++ b/OpenCL/m10800_a0.cl @@ -7,20 +7,20 @@ #define NEW_SIMD_CODE -#include "include/constants.h" -#include "include/kernel_vendor.h" +#include "inc_hash_constants.h" +#include "inc_vendor.cl" #define DGST_R0 6 #define DGST_R1 7 #define DGST_R2 4 #define DGST_R3 5 -#include "include/kernel_functions.c" -#include "OpenCL/types_ocl.c" -#include "OpenCL/common.c" -#include "include/rp_kernel.h" -#include "OpenCL/rp.c" -#include "OpenCL/simd.c" +#include "inc_hash_functions.cl" +#include "inc_types.cl" +#include "inc_common.cl" +#include "inc_rp.h" +#include "inc_rp.cl" +#include "inc_simd.cl" __constant u64 k_sha384[80] = { diff --git a/OpenCL/m10800_a1.cl b/OpenCL/m10800_a1.cl index bcb0c58..a3897b7 100644 --- a/OpenCL/m10800_a1.cl +++ b/OpenCL/m10800_a1.cl @@ -7,18 +7,18 @@ #define NEW_SIMD_CODE -#include "include/constants.h" -#include "include/kernel_vendor.h" +#include "inc_hash_constants.h" +#include "inc_vendor.cl" #define DGST_R0 6 #define DGST_R1 7 #define DGST_R2 4 #define DGST_R3 5 -#include "include/kernel_functions.c" -#include "OpenCL/types_ocl.c" -#include "OpenCL/common.c" -#include "OpenCL/simd.c" +#include "inc_hash_functions.cl" +#include "inc_types.cl" +#include "inc_common.cl" +#include "inc_simd.cl" __constant u64 k_sha384[80] = { diff --git a/OpenCL/m10800_a3.cl b/OpenCL/m10800_a3.cl index 7bfc741..fae6a72 100644 --- a/OpenCL/m10800_a3.cl +++ b/OpenCL/m10800_a3.cl @@ -7,18 +7,18 @@ #define NEW_SIMD_CODE -#include "include/constants.h" -#include "include/kernel_vendor.h" +#include "inc_hash_constants.h" +#include "inc_vendor.cl" #define DGST_R0 6 #define DGST_R1 7 #define DGST_R2 4 #define DGST_R3 5 -#include "include/kernel_functions.c" -#include "OpenCL/types_ocl.c" -#include "OpenCL/common.c" -#include "OpenCL/simd.c" +#include "inc_hash_functions.cl" +#include "inc_types.cl" +#include "inc_common.cl" +#include "inc_simd.cl" __constant u64 k_sha384[80] = { diff --git a/OpenCL/m10900.cl b/OpenCL/m10900.cl index 9427fab..275b049 100644 --- a/OpenCL/m10900.cl +++ b/OpenCL/m10900.cl @@ -7,21 +7,21 @@ #define NEW_SIMD_CODE -#include "include/constants.h" -#include "include/kernel_vendor.h" +#include "inc_hash_constants.h" +#include "inc_vendor.cl" #define DGST_R0 0 #define DGST_R1 1 #define DGST_R2 2 #define DGST_R3 3 -#include "include/kernel_functions.c" -#include "OpenCL/types_ocl.c" -#include "OpenCL/common.c" -#include "OpenCL/simd.c" +#include "inc_hash_functions.cl" +#include "inc_types.cl" +#include "inc_common.cl" +#include "inc_simd.cl" -#define COMPARE_S "OpenCL/check_single_comp4.c" -#define COMPARE_M "OpenCL/check_multi_comp4.c" +#define COMPARE_S "inc_comp_single.cl" +#define COMPARE_M "inc_comp_multi.cl" __constant u32 k_sha256[64] = { diff --git a/OpenCL/m11000_a0.cl b/OpenCL/m11000_a0.cl index a209c8a..2b5970d 100644 --- a/OpenCL/m11000_a0.cl +++ b/OpenCL/m11000_a0.cl @@ -7,20 +7,20 @@ #define NEW_SIMD_CODE -#include "include/constants.h" -#include "include/kernel_vendor.h" +#include "inc_hash_constants.h" +#include "inc_vendor.cl" #define DGST_R0 0 #define DGST_R1 3 #define DGST_R2 2 #define DGST_R3 1 -#include "include/kernel_functions.c" -#include "OpenCL/types_ocl.c" -#include "OpenCL/common.c" -#include "include/rp_kernel.h" -#include "OpenCL/rp.c" -#include "OpenCL/simd.c" +#include "inc_hash_functions.cl" +#include "inc_types.cl" +#include "inc_common.cl" +#include "inc_rp.h" +#include "inc_rp.cl" +#include "inc_simd.cl" __kernel void m11000_m04 (__global pw_t *pws, __global kernel_rule_t *rules_buf, __global comb_t *combs_buf, __global bf_t *bfs_buf, __global void *tmps, __global void *hooks, __global u32 *bitmaps_buf_s1_a, __global u32 *bitmaps_buf_s1_b, __global u32 *bitmaps_buf_s1_c, __global u32 *bitmaps_buf_s1_d, __global u32 *bitmaps_buf_s2_a, __global u32 *bitmaps_buf_s2_b, __global u32 *bitmaps_buf_s2_c, __global u32 *bitmaps_buf_s2_d, __global plain_t *plains_buf, __global digest_t *digests_buf, __global u32 *hashes_shown, __global salt_t *salt_bufs, __global void *esalt_bufs, __global u32 *d_return_buf, __global u32 *d_scryptV_buf, const u32 bitmap_mask, const u32 bitmap_shift1, const u32 bitmap_shift2, const u32 salt_pos, const u32 loop_pos, const u32 loop_cnt, const u32 il_cnt, const u32 digests_cnt, const u32 digests_offset, const u32 combs_mode, const u32 gid_max) { diff --git a/OpenCL/m11000_a1.cl b/OpenCL/m11000_a1.cl index f6c8e7a..808914e 100644 --- a/OpenCL/m11000_a1.cl +++ b/OpenCL/m11000_a1.cl @@ -7,18 +7,18 @@ #define NEW_SIMD_CODE -#include "include/constants.h" -#include "include/kernel_vendor.h" +#include "inc_hash_constants.h" +#include "inc_vendor.cl" #define DGST_R0 0 #define DGST_R1 3 #define DGST_R2 2 #define DGST_R3 1 -#include "include/kernel_functions.c" -#include "OpenCL/types_ocl.c" -#include "OpenCL/common.c" -#include "OpenCL/simd.c" +#include "inc_hash_functions.cl" +#include "inc_types.cl" +#include "inc_common.cl" +#include "inc_simd.cl" __kernel void m11000_m04 (__global pw_t *pws, __global kernel_rule_t *rules_buf, __global comb_t *combs_buf, __global bf_t *bfs_buf, __global void *tmps, __global void *hooks, __global u32 *bitmaps_buf_s1_a, __global u32 *bitmaps_buf_s1_b, __global u32 *bitmaps_buf_s1_c, __global u32 *bitmaps_buf_s1_d, __global u32 *bitmaps_buf_s2_a, __global u32 *bitmaps_buf_s2_b, __global u32 *bitmaps_buf_s2_c, __global u32 *bitmaps_buf_s2_d, __global plain_t *plains_buf, __global digest_t *digests_buf, __global u32 *hashes_shown, __global salt_t *salt_bufs, __global void *esalt_bufs, __global u32 *d_return_buf, __global u32 *d_scryptV_buf, const u32 bitmap_mask, const u32 bitmap_shift1, const u32 bitmap_shift2, const u32 salt_pos, const u32 loop_pos, const u32 loop_cnt, const u32 il_cnt, const u32 digests_cnt, const u32 digests_offset, const u32 combs_mode, const u32 gid_max) { diff --git a/OpenCL/m11000_a3.cl b/OpenCL/m11000_a3.cl index 0c42ddf..569d149 100644 --- a/OpenCL/m11000_a3.cl +++ b/OpenCL/m11000_a3.cl @@ -7,18 +7,18 @@ #define NEW_SIMD_CODE -#include "include/constants.h" -#include "include/kernel_vendor.h" +#include "inc_hash_constants.h" +#include "inc_vendor.cl" #define DGST_R0 0 #define DGST_R1 3 #define DGST_R2 2 #define DGST_R3 1 -#include "include/kernel_functions.c" -#include "OpenCL/types_ocl.c" -#include "OpenCL/common.c" -#include "OpenCL/simd.c" +#include "inc_hash_functions.cl" +#include "inc_types.cl" +#include "inc_common.cl" +#include "inc_simd.cl" void m11000m (u32 w0[4], u32 w1[4], u32 w2[4], u32 w3[4], const u32 pw_len, __global pw_t *pws, __global kernel_rule_t *rules_buf, __global comb_t *combs_buf, __global bf_t *bfs_buf, __global void *tmps, __global void *hooks, __global u32 *bitmaps_buf_s1_a, __global u32 *bitmaps_buf_s1_b, __global u32 *bitmaps_buf_s1_c, __global u32 *bitmaps_buf_s1_d, __global u32 *bitmaps_buf_s2_a, __global u32 *bitmaps_buf_s2_b, __global u32 *bitmaps_buf_s2_c, __global u32 *bitmaps_buf_s2_d, __global plain_t *plains_buf, __global digest_t *digests_buf, __global u32 *hashes_shown, __global salt_t *salt_bufs, __global void *esalt_bufs, __global u32 *d_return_buf, __global u32 *d_scryptV_buf, const u32 bitmap_mask, const u32 bitmap_shift1, const u32 bitmap_shift2, const u32 salt_pos, const u32 loop_pos, const u32 loop_cnt, const u32 il_cnt, const u32 digests_cnt, const u32 digests_offset) { diff --git a/OpenCL/m11100_a0.cl b/OpenCL/m11100_a0.cl index 8ab430a..ec1f0fc 100644 --- a/OpenCL/m11100_a0.cl +++ b/OpenCL/m11100_a0.cl @@ -9,20 +9,20 @@ #define NEW_SIMD_CODE -#include "include/constants.h" -#include "include/kernel_vendor.h" +#include "inc_hash_constants.h" +#include "inc_vendor.cl" #define DGST_R0 0 #define DGST_R1 3 #define DGST_R2 2 #define DGST_R3 1 -#include "include/kernel_functions.c" -#include "OpenCL/types_ocl.c" -#include "OpenCL/common.c" -#include "include/rp_kernel.h" -#include "OpenCL/rp.c" -#include "OpenCL/simd.c" +#include "inc_hash_functions.cl" +#include "inc_types.cl" +#include "inc_common.cl" +#include "inc_rp.h" +#include "inc_rp.cl" +#include "inc_simd.cl" #if VECT_SIZE == 1 #define uint_to_hex_lower8(i) (u32x) (l_bin2asc[(i)]) diff --git a/OpenCL/m11100_a1.cl b/OpenCL/m11100_a1.cl index 7ec184a..50ec905 100644 --- a/OpenCL/m11100_a1.cl +++ b/OpenCL/m11100_a1.cl @@ -7,18 +7,18 @@ #define NEW_SIMD_CODE -#include "include/constants.h" -#include "include/kernel_vendor.h" +#include "inc_hash_constants.h" +#include "inc_vendor.cl" #define DGST_R0 0 #define DGST_R1 3 #define DGST_R2 2 #define DGST_R3 1 -#include "include/kernel_functions.c" -#include "OpenCL/types_ocl.c" -#include "OpenCL/common.c" -#include "OpenCL/simd.c" +#include "inc_hash_functions.cl" +#include "inc_types.cl" +#include "inc_common.cl" +#include "inc_simd.cl" #if VECT_SIZE == 1 #define uint_to_hex_lower8(i) (u32x) (l_bin2asc[(i)]) diff --git a/OpenCL/m11100_a3.cl b/OpenCL/m11100_a3.cl index 2d00c49..a5d860c 100644 --- a/OpenCL/m11100_a3.cl +++ b/OpenCL/m11100_a3.cl @@ -10,18 +10,18 @@ #define NEW_SIMD_CODE -#include "include/constants.h" -#include "include/kernel_vendor.h" +#include "inc_hash_constants.h" +#include "inc_vendor.cl" #define DGST_R0 0 #define DGST_R1 3 #define DGST_R2 2 #define DGST_R3 1 -#include "include/kernel_functions.c" -#include "OpenCL/types_ocl.c" -#include "OpenCL/common.c" -#include "OpenCL/simd.c" +#include "inc_hash_functions.cl" +#include "inc_types.cl" +#include "inc_common.cl" +#include "inc_simd.cl" #if VECT_SIZE == 1 #define uint_to_hex_lower8(i) (u32x) (l_bin2asc[(i)]) diff --git a/OpenCL/m11200_a0.cl b/OpenCL/m11200_a0.cl index 1e39af0..f63ec3b 100644 --- a/OpenCL/m11200_a0.cl +++ b/OpenCL/m11200_a0.cl @@ -7,20 +7,20 @@ #define NEW_SIMD_CODE -#include "include/constants.h" -#include "include/kernel_vendor.h" +#include "inc_hash_constants.h" +#include "inc_vendor.cl" #define DGST_R0 3 #define DGST_R1 4 #define DGST_R2 2 #define DGST_R3 1 -#include "include/kernel_functions.c" -#include "OpenCL/types_ocl.c" -#include "OpenCL/common.c" -#include "include/rp_kernel.h" -#include "OpenCL/rp.c" -#include "OpenCL/simd.c" +#include "inc_hash_functions.cl" +#include "inc_types.cl" +#include "inc_common.cl" +#include "inc_rp.h" +#include "inc_rp.cl" +#include "inc_simd.cl" __kernel void m11200_m04 (__global pw_t *pws, __global kernel_rule_t *rules_buf, __global comb_t *combs_buf, __global bf_t *bfs_buf, __global void *tmps, __global void *hooks, __global u32 *bitmaps_buf_s1_a, __global u32 *bitmaps_buf_s1_b, __global u32 *bitmaps_buf_s1_c, __global u32 *bitmaps_buf_s1_d, __global u32 *bitmaps_buf_s2_a, __global u32 *bitmaps_buf_s2_b, __global u32 *bitmaps_buf_s2_c, __global u32 *bitmaps_buf_s2_d, __global plain_t *plains_buf, __global digest_t *digests_buf, __global u32 *hashes_shown, __global salt_t *salt_bufs, __global void *esalt_bufs, __global u32 *d_return_buf, __global u32 *d_scryptV_buf, const u32 bitmap_mask, const u32 bitmap_shift1, const u32 bitmap_shift2, const u32 salt_pos, const u32 loop_pos, const u32 loop_cnt, const u32 il_cnt, const u32 digests_cnt, const u32 digests_offset, const u32 combs_mode, const u32 gid_max) { diff --git a/OpenCL/m11200_a1.cl b/OpenCL/m11200_a1.cl index 062ec3b..0790a46 100644 --- a/OpenCL/m11200_a1.cl +++ b/OpenCL/m11200_a1.cl @@ -7,18 +7,18 @@ #define NEW_SIMD_CODE -#include "include/constants.h" -#include "include/kernel_vendor.h" +#include "inc_hash_constants.h" +#include "inc_vendor.cl" #define DGST_R0 3 #define DGST_R1 4 #define DGST_R2 2 #define DGST_R3 1 -#include "include/kernel_functions.c" -#include "OpenCL/types_ocl.c" -#include "OpenCL/common.c" -#include "OpenCL/simd.c" +#include "inc_hash_functions.cl" +#include "inc_types.cl" +#include "inc_common.cl" +#include "inc_simd.cl" __kernel void m11200_m04 (__global pw_t *pws, __global kernel_rule_t *rules_buf, __global comb_t *combs_buf, __global bf_t *bfs_buf, __global void *tmps, __global void *hooks, __global u32 *bitmaps_buf_s1_a, __global u32 *bitmaps_buf_s1_b, __global u32 *bitmaps_buf_s1_c, __global u32 *bitmaps_buf_s1_d, __global u32 *bitmaps_buf_s2_a, __global u32 *bitmaps_buf_s2_b, __global u32 *bitmaps_buf_s2_c, __global u32 *bitmaps_buf_s2_d, __global plain_t *plains_buf, __global digest_t *digests_buf, __global u32 *hashes_shown, __global salt_t *salt_bufs, __global void *esalt_bufs, __global u32 *d_return_buf, __global u32 *d_scryptV_buf, const u32 bitmap_mask, const u32 bitmap_shift1, const u32 bitmap_shift2, const u32 salt_pos, const u32 loop_pos, const u32 loop_cnt, const u32 il_cnt, const u32 digests_cnt, const u32 digests_offset, const u32 combs_mode, const u32 gid_max) { diff --git a/OpenCL/m11200_a3.cl b/OpenCL/m11200_a3.cl index eec3317..4d1ecfb 100644 --- a/OpenCL/m11200_a3.cl +++ b/OpenCL/m11200_a3.cl @@ -7,18 +7,18 @@ #define NEW_SIMD_CODE -#include "include/constants.h" -#include "include/kernel_vendor.h" +#include "inc_hash_constants.h" +#include "inc_vendor.cl" #define DGST_R0 3 #define DGST_R1 4 #define DGST_R2 2 #define DGST_R3 1 -#include "include/kernel_functions.c" -#include "OpenCL/types_ocl.c" -#include "OpenCL/common.c" -#include "OpenCL/simd.c" +#include "inc_hash_functions.cl" +#include "inc_types.cl" +#include "inc_common.cl" +#include "inc_simd.cl" void m11200m (u32 w0[4], u32 w1[4], u32 w2[4], u32 w3[4], const u32 pw_len, __global pw_t *pws, __global kernel_rule_t *rules_buf, __global comb_t *combs_buf, __global bf_t *bfs_buf, __global void *tmps, __global void *hooks, __global u32 *bitmaps_buf_s1_a, __global u32 *bitmaps_buf_s1_b, __global u32 *bitmaps_buf_s1_c, __global u32 *bitmaps_buf_s1_d, __global u32 *bitmaps_buf_s2_a, __global u32 *bitmaps_buf_s2_b, __global u32 *bitmaps_buf_s2_c, __global u32 *bitmaps_buf_s2_d, __global plain_t *plains_buf, __global digest_t *digests_buf, __global u32 *hashes_shown, __global salt_t *salt_bufs, __global void *esalt_bufs, __global u32 *d_return_buf, __global u32 *d_scryptV_buf, const u32 bitmap_mask, const u32 bitmap_shift1, const u32 bitmap_shift2, const u32 salt_pos, const u32 loop_pos, const u32 loop_cnt, const u32 il_cnt, const u32 digests_cnt, const u32 digests_offset) { diff --git a/OpenCL/m11300.cl b/OpenCL/m11300.cl index 3bfa242..df9fdd5 100644 --- a/OpenCL/m11300.cl +++ b/OpenCL/m11300.cl @@ -7,17 +7,17 @@ #define _SHA512_ -#include "include/constants.h" -#include "include/kernel_vendor.h" +#include "inc_hash_constants.h" +#include "inc_vendor.cl" #define DGST_R0 0 #define DGST_R1 1 #define DGST_R2 2 #define DGST_R3 3 -#include "include/kernel_functions.c" -#include "OpenCL/types_ocl.c" -#include "OpenCL/common.c" +#include "inc_hash_functions.cl" +#include "inc_types.cl" +#include "inc_common.cl" __constant u32 te0[256] = { diff --git a/OpenCL/m11400_a0.cl b/OpenCL/m11400_a0.cl index 5ac6101..2d3981b 100644 --- a/OpenCL/m11400_a0.cl +++ b/OpenCL/m11400_a0.cl @@ -10,20 +10,20 @@ //incompatible because of brances //#define NEW_SIMD_CODE -#include "include/constants.h" -#include "include/kernel_vendor.h" +#include "inc_hash_constants.h" +#include "inc_vendor.cl" #define DGST_R0 0 #define DGST_R1 3 #define DGST_R2 2 #define DGST_R3 1 -#include "include/kernel_functions.c" -#include "OpenCL/types_ocl.c" -#include "OpenCL/common.c" -#include "include/rp_kernel.h" -#include "OpenCL/rp.c" -#include "OpenCL/simd.c" +#include "inc_hash_functions.cl" +#include "inc_types.cl" +#include "inc_common.cl" +#include "inc_rp.h" +#include "inc_rp.cl" +#include "inc_simd.cl" #if VECT_SIZE == 1 #define uint_to_hex_lower8(i) (u32x) (l_bin2asc[(i)]) diff --git a/OpenCL/m11400_a1.cl b/OpenCL/m11400_a1.cl index d16b4ee..c15333d 100644 --- a/OpenCL/m11400_a1.cl +++ b/OpenCL/m11400_a1.cl @@ -8,18 +8,18 @@ //incompatible because of brances //#define NEW_SIMD_CODE -#include "include/constants.h" -#include "include/kernel_vendor.h" +#include "inc_hash_constants.h" +#include "inc_vendor.cl" #define DGST_R0 0 #define DGST_R1 3 #define DGST_R2 2 #define DGST_R3 1 -#include "include/kernel_functions.c" -#include "OpenCL/types_ocl.c" -#include "OpenCL/common.c" -#include "OpenCL/simd.c" +#include "inc_hash_functions.cl" +#include "inc_types.cl" +#include "inc_common.cl" +#include "inc_simd.cl" #if VECT_SIZE == 1 #define uint_to_hex_lower8(i) (u32x) (l_bin2asc[(i)]) diff --git a/OpenCL/m11400_a3.cl b/OpenCL/m11400_a3.cl index 8086990..4caa348 100644 --- a/OpenCL/m11400_a3.cl +++ b/OpenCL/m11400_a3.cl @@ -11,18 +11,18 @@ //incompatible because of brances //#define NEW_SIMD_CODE -#include "include/constants.h" -#include "include/kernel_vendor.h" +#include "inc_hash_constants.h" +#include "inc_vendor.cl" #define DGST_R0 0 #define DGST_R1 3 #define DGST_R2 2 #define DGST_R3 1 -#include "include/kernel_functions.c" -#include "OpenCL/types_ocl.c" -#include "OpenCL/common.c" -#include "OpenCL/simd.c" +#include "inc_hash_functions.cl" +#include "inc_types.cl" +#include "inc_common.cl" +#include "inc_simd.cl" #if VECT_SIZE == 1 #define uint_to_hex_lower8(i) (u32x) (l_bin2asc[(i)]) diff --git a/OpenCL/m11500_a0.cl b/OpenCL/m11500_a0.cl index 3bcc15b..088881e 100644 --- a/OpenCL/m11500_a0.cl +++ b/OpenCL/m11500_a0.cl @@ -10,20 +10,20 @@ //incompatible because of branches //#define NEW_SIMD_CODE -#include "include/constants.h" -#include "include/kernel_vendor.h" +#include "inc_hash_constants.h" +#include "inc_vendor.cl" #define DGST_R0 0 #define DGST_R1 1 #define DGST_R2 2 #define DGST_R3 3 -#include "include/kernel_functions.c" -#include "OpenCL/types_ocl.c" -#include "OpenCL/common.c" -#include "include/rp_kernel.h" -#include "OpenCL/rp.c" -#include "OpenCL/simd.c" +#include "inc_hash_functions.cl" +#include "inc_types.cl" +#include "inc_common.cl" +#include "inc_rp.h" +#include "inc_rp.cl" +#include "inc_simd.cl" __constant u32 crc32tab[0x100] = { diff --git a/OpenCL/m11500_a1.cl b/OpenCL/m11500_a1.cl index 3dd6c46..6d3bb7f 100644 --- a/OpenCL/m11500_a1.cl +++ b/OpenCL/m11500_a1.cl @@ -8,18 +8,18 @@ //incompatible because of branches //#define NEW_SIMD_CODE -#include "include/constants.h" -#include "include/kernel_vendor.h" +#include "inc_hash_constants.h" +#include "inc_vendor.cl" #define DGST_R0 0 #define DGST_R1 1 #define DGST_R2 2 #define DGST_R3 3 -#include "include/kernel_functions.c" -#include "OpenCL/types_ocl.c" -#include "OpenCL/common.c" -#include "OpenCL/simd.c" +#include "inc_hash_functions.cl" +#include "inc_types.cl" +#include "inc_common.cl" +#include "inc_simd.cl" __constant u32 crc32tab[0x100] = { diff --git a/OpenCL/m11500_a3.cl b/OpenCL/m11500_a3.cl index c8e9986..4af75ed 100644 --- a/OpenCL/m11500_a3.cl +++ b/OpenCL/m11500_a3.cl @@ -10,18 +10,18 @@ //incompatible because of branches //#define NEW_SIMD_CODE -#include "include/constants.h" -#include "include/kernel_vendor.h" +#include "inc_hash_constants.h" +#include "inc_vendor.cl" #define DGST_R0 0 #define DGST_R1 1 #define DGST_R2 2 #define DGST_R3 3 -#include "include/kernel_functions.c" -#include "OpenCL/types_ocl.c" -#include "OpenCL/common.c" -#include "OpenCL/simd.c" +#include "inc_hash_functions.cl" +#include "inc_types.cl" +#include "inc_common.cl" +#include "inc_simd.cl" __constant u32 crc32tab[0x100] = { diff --git a/OpenCL/m11600.cl b/OpenCL/m11600.cl index c7af848..00ae013 100644 --- a/OpenCL/m11600.cl +++ b/OpenCL/m11600.cl @@ -7,20 +7,20 @@ #define _SEVEN_ZIP_ -#include "include/constants.h" -#include "include/kernel_vendor.h" +#include "inc_hash_constants.h" +#include "inc_vendor.cl" #define DGST_R0 0 #define DGST_R1 1 #define DGST_R2 2 #define DGST_R3 3 -#include "include/kernel_functions.c" -#include "OpenCL/types_ocl.c" -#include "OpenCL/common.c" +#include "inc_hash_functions.cl" +#include "inc_types.cl" +#include "inc_common.cl" -#define COMPARE_S "OpenCL/check_single_comp4.c" -#define COMPARE_M "OpenCL/check_multi_comp4.c" +#define COMPARE_S "inc_comp_single.cl" +#define COMPARE_M "inc_comp_multi.cl" __constant u32 te0[256] = { diff --git a/OpenCL/m11700_a0.cl b/OpenCL/m11700_a0.cl index 2e93185..db98b14 100644 --- a/OpenCL/m11700_a0.cl +++ b/OpenCL/m11700_a0.cl @@ -11,20 +11,20 @@ //too much register pressure //#define NEW_SIMD_CODE -#include "include/constants.h" -#include "include/kernel_vendor.h" +#include "inc_hash_constants.h" +#include "inc_vendor.cl" #define DGST_R0 0 #define DGST_R1 1 #define DGST_R2 2 #define DGST_R3 3 -#include "include/kernel_functions.c" -#include "OpenCL/types_ocl.c" -#include "OpenCL/common.c" -#include "include/rp_kernel.h" -#include "OpenCL/rp.c" -#include "OpenCL/simd.c" +#include "inc_hash_functions.cl" +#include "inc_types.cl" +#include "inc_common.cl" +#include "inc_rp.h" +#include "inc_rp.cl" +#include "inc_simd.cl" #define INITVAL 0x0101010101010101 diff --git a/OpenCL/m11700_a1.cl b/OpenCL/m11700_a1.cl index 36ce0b9..e0320dd 100644 --- a/OpenCL/m11700_a1.cl +++ b/OpenCL/m11700_a1.cl @@ -10,18 +10,18 @@ //too much register pressure //#define NEW_SIMD_CODE -#include "include/constants.h" -#include "include/kernel_vendor.h" +#include "inc_hash_constants.h" +#include "inc_vendor.cl" #define DGST_R0 0 #define DGST_R1 1 #define DGST_R2 2 #define DGST_R3 3 -#include "include/kernel_functions.c" -#include "OpenCL/types_ocl.c" -#include "OpenCL/common.c" -#include "OpenCL/simd.c" +#include "inc_hash_functions.cl" +#include "inc_types.cl" +#include "inc_common.cl" +#include "inc_simd.cl" #define INITVAL 0x0101010101010101 diff --git a/OpenCL/m11700_a3.cl b/OpenCL/m11700_a3.cl index 1569b1f..0224f23 100644 --- a/OpenCL/m11700_a3.cl +++ b/OpenCL/m11700_a3.cl @@ -11,18 +11,18 @@ //too much register pressure //#define NEW_SIMD_CODE -#include "include/constants.h" -#include "include/kernel_vendor.h" +#include "inc_hash_constants.h" +#include "inc_vendor.cl" #define DGST_R0 0 #define DGST_R1 1 #define DGST_R2 2 #define DGST_R3 3 -#include "include/kernel_functions.c" -#include "OpenCL/types_ocl.c" -#include "OpenCL/common.c" -#include "OpenCL/simd.c" +#include "inc_hash_functions.cl" +#include "inc_types.cl" +#include "inc_common.cl" +#include "inc_simd.cl" #define INITVAL 0x0101010101010101 diff --git a/OpenCL/m11800_a0.cl b/OpenCL/m11800_a0.cl index f282c3e..87e63b5 100644 --- a/OpenCL/m11800_a0.cl +++ b/OpenCL/m11800_a0.cl @@ -11,20 +11,20 @@ //too much register pressure //#define NEW_SIMD_CODE -#include "include/constants.h" -#include "include/kernel_vendor.h" +#include "inc_hash_constants.h" +#include "inc_vendor.cl" #define DGST_R0 0 #define DGST_R1 1 #define DGST_R2 2 #define DGST_R3 3 -#include "include/kernel_functions.c" -#include "OpenCL/types_ocl.c" -#include "OpenCL/common.c" -#include "include/rp_kernel.h" -#include "OpenCL/rp.c" -#include "OpenCL/simd.c" +#include "inc_hash_functions.cl" +#include "inc_types.cl" +#include "inc_common.cl" +#include "inc_rp.h" +#include "inc_rp.cl" +#include "inc_simd.cl" #define INITVAL 0 diff --git a/OpenCL/m11800_a1.cl b/OpenCL/m11800_a1.cl index cf8392c..0cd6cf8 100644 --- a/OpenCL/m11800_a1.cl +++ b/OpenCL/m11800_a1.cl @@ -10,18 +10,18 @@ //too much register pressure //#define NEW_SIMD_CODE -#include "include/constants.h" -#include "include/kernel_vendor.h" +#include "inc_hash_constants.h" +#include "inc_vendor.cl" #define DGST_R0 0 #define DGST_R1 1 #define DGST_R2 2 #define DGST_R3 3 -#include "include/kernel_functions.c" -#include "OpenCL/types_ocl.c" -#include "OpenCL/common.c" -#include "OpenCL/simd.c" +#include "inc_hash_functions.cl" +#include "inc_types.cl" +#include "inc_common.cl" +#include "inc_simd.cl" #define INITVAL 0 diff --git a/OpenCL/m11800_a3.cl b/OpenCL/m11800_a3.cl index 2370800..4ef9bb0 100644 --- a/OpenCL/m11800_a3.cl +++ b/OpenCL/m11800_a3.cl @@ -11,18 +11,18 @@ //too much register pressure //#define NEW_SIMD_CODE -#include "include/constants.h" -#include "include/kernel_vendor.h" +#include "inc_hash_constants.h" +#include "inc_vendor.cl" #define DGST_R0 0 #define DGST_R1 1 #define DGST_R2 2 #define DGST_R3 3 -#include "include/kernel_functions.c" -#include "OpenCL/types_ocl.c" -#include "OpenCL/common.c" -#include "OpenCL/simd.c" +#include "inc_hash_functions.cl" +#include "inc_types.cl" +#include "inc_common.cl" +#include "inc_simd.cl" #define INITVAL 0 diff --git a/OpenCL/m11900.cl b/OpenCL/m11900.cl index 53eec8f..ffa0f6c 100644 --- a/OpenCL/m11900.cl +++ b/OpenCL/m11900.cl @@ -7,21 +7,21 @@ #define NEW_SIMD_CODE -#include "include/constants.h" -#include "include/kernel_vendor.h" +#include "inc_hash_constants.h" +#include "inc_vendor.cl" #define DGST_R0 0 #define DGST_R1 1 #define DGST_R2 2 #define DGST_R3 3 -#include "include/kernel_functions.c" -#include "OpenCL/types_ocl.c" -#include "OpenCL/common.c" -#include "OpenCL/simd.c" +#include "inc_hash_functions.cl" +#include "inc_types.cl" +#include "inc_common.cl" +#include "inc_simd.cl" -#define COMPARE_S "OpenCL/check_single_comp4.c" -#define COMPARE_M "OpenCL/check_multi_comp4.c" +#define COMPARE_S "inc_comp_single.cl" +#define COMPARE_M "inc_comp_multi.cl" void md5_transform_S (const u32 w0[4], const u32 w1[4], const u32 w2[4], const u32 w3[4], u32 digest[4]) { diff --git a/OpenCL/m12000.cl b/OpenCL/m12000.cl index ffbcf86..0619bcd 100644 --- a/OpenCL/m12000.cl +++ b/OpenCL/m12000.cl @@ -7,21 +7,21 @@ #define NEW_SIMD_CODE -#include "include/constants.h" -#include "include/kernel_vendor.h" +#include "inc_hash_constants.h" +#include "inc_vendor.cl" #define DGST_R0 0 #define DGST_R1 1 #define DGST_R2 2 #define DGST_R3 3 -#include "include/kernel_functions.c" -#include "OpenCL/types_ocl.c" -#include "OpenCL/common.c" -#include "OpenCL/simd.c" +#include "inc_hash_functions.cl" +#include "inc_types.cl" +#include "inc_common.cl" +#include "inc_simd.cl" -#define COMPARE_S "OpenCL/check_single_comp4.c" -#define COMPARE_M "OpenCL/check_multi_comp4.c" +#define COMPARE_S "inc_comp_single.cl" +#define COMPARE_M "inc_comp_multi.cl" void sha1_transform_S (const u32 w0[4], const u32 w1[4], const u32 w2[4], const u32 w3[4], u32 digest[5]) { diff --git a/OpenCL/m12200.cl b/OpenCL/m12200.cl index 7b789bc..13af738 100644 --- a/OpenCL/m12200.cl +++ b/OpenCL/m12200.cl @@ -5,20 +5,20 @@ #define _SHA512_ -#include "include/constants.h" -#include "include/kernel_vendor.h" +#include "inc_hash_constants.h" +#include "inc_vendor.cl" #define DGST_R0 0 #define DGST_R1 1 #define DGST_R2 2 #define DGST_R3 3 -#include "include/kernel_functions.c" -#include "OpenCL/types_ocl.c" -#include "OpenCL/common.c" +#include "inc_hash_functions.cl" +#include "inc_types.cl" +#include "inc_common.cl" -#define COMPARE_S "OpenCL/check_single_comp4.c" -#define COMPARE_M "OpenCL/check_multi_comp4.c" +#define COMPARE_S "inc_comp_single.cl" +#define COMPARE_M "inc_comp_multi.cl" __constant u64 k_sha512[80] = { diff --git a/OpenCL/m12300.cl b/OpenCL/m12300.cl index 5430b4f..3a87faa 100644 --- a/OpenCL/m12300.cl +++ b/OpenCL/m12300.cl @@ -5,20 +5,20 @@ #define _PBKDF2_SHA512_ -#include "include/constants.h" -#include "include/kernel_vendor.h" +#include "inc_hash_constants.h" +#include "inc_vendor.cl" #define DGST_R0 0 #define DGST_R1 1 #define DGST_R2 2 #define DGST_R3 3 -#include "include/kernel_functions.c" -#include "OpenCL/types_ocl.c" -#include "OpenCL/common.c" +#include "inc_hash_functions.cl" +#include "inc_types.cl" +#include "inc_common.cl" -#define COMPARE_S "OpenCL/check_single_comp4.c" -#define COMPARE_M "OpenCL/check_multi_comp4.c" +#define COMPARE_S "inc_comp_single.cl" +#define COMPARE_M "inc_comp_multi.cl" __constant u64 k_sha512[80] = { diff --git a/OpenCL/m12400.cl b/OpenCL/m12400.cl index 7902c5d..d32f9b0 100644 --- a/OpenCL/m12400.cl +++ b/OpenCL/m12400.cl @@ -7,20 +7,20 @@ #define _DES_ -#include "include/constants.h" -#include "include/kernel_vendor.h" +#include "inc_hash_constants.h" +#include "inc_vendor.cl" #define DGST_R0 0 #define DGST_R1 1 #define DGST_R2 2 #define DGST_R3 3 -#include "include/kernel_functions.c" -#include "OpenCL/types_ocl.c" -#include "OpenCL/common.c" +#include "inc_hash_functions.cl" +#include "inc_types.cl" +#include "inc_common.cl" -#define COMPARE_S "OpenCL/check_single_comp4.c" -#define COMPARE_M "OpenCL/check_multi_comp4.c" +#define COMPARE_S "inc_comp_single.cl" +#define COMPARE_M "inc_comp_multi.cl" #define PERM_OP(a,b,tt,n,m) \ { \ diff --git a/OpenCL/m12500.cl b/OpenCL/m12500.cl index 3292bc1..8c6b6e3 100644 --- a/OpenCL/m12500.cl +++ b/OpenCL/m12500.cl @@ -7,21 +7,21 @@ #define _RAR3_ -#include "include/constants.h" -#include "include/kernel_vendor.h" +#include "inc_hash_constants.h" +#include "inc_vendor.cl" #define DGST_R0 0 #define DGST_R1 1 #define DGST_R2 2 #define DGST_R3 3 -#include "include/kernel_functions.c" +#include "inc_hash_functions.cl" -#include "OpenCL/types_ocl.c" -#include "OpenCL/common.c" +#include "inc_types.cl" +#include "inc_common.cl" -#define COMPARE_S "OpenCL/check_single_comp4.c" -#define COMPARE_M "OpenCL/check_multi_comp4.c" +#define COMPARE_S "inc_comp_single.cl" +#define COMPARE_M "inc_comp_multi.cl" #define ROUNDS 0x40000 diff --git a/OpenCL/m12600_a0.cl b/OpenCL/m12600_a0.cl index d9fe579..a6368f4 100644 --- a/OpenCL/m12600_a0.cl +++ b/OpenCL/m12600_a0.cl @@ -9,20 +9,20 @@ #define NEW_SIMD_CODE -#include "include/constants.h" -#include "include/kernel_vendor.h" +#include "inc_hash_constants.h" +#include "inc_vendor.cl" #define DGST_R0 3 #define DGST_R1 7 #define DGST_R2 2 #define DGST_R3 6 -#include "include/kernel_functions.c" -#include "OpenCL/types_ocl.c" -#include "OpenCL/common.c" -#include "include/rp_kernel.h" -#include "OpenCL/rp.c" -#include "OpenCL/simd.c" +#include "inc_hash_functions.cl" +#include "inc_types.cl" +#include "inc_common.cl" +#include "inc_rp.h" +#include "inc_rp.cl" +#include "inc_simd.cl" #if VECT_SIZE == 1 #define uint_to_hex_upper8(i) (u32x) (l_bin2asc[(i)]) diff --git a/OpenCL/m12600_a1.cl b/OpenCL/m12600_a1.cl index 9b527c9..14f9018 100644 --- a/OpenCL/m12600_a1.cl +++ b/OpenCL/m12600_a1.cl @@ -7,18 +7,18 @@ #define NEW_SIMD_CODE -#include "include/constants.h" -#include "include/kernel_vendor.h" +#include "inc_hash_constants.h" +#include "inc_vendor.cl" #define DGST_R0 3 #define DGST_R1 7 #define DGST_R2 2 #define DGST_R3 6 -#include "include/kernel_functions.c" -#include "OpenCL/types_ocl.c" -#include "OpenCL/common.c" -#include "OpenCL/simd.c" +#include "inc_hash_functions.cl" +#include "inc_types.cl" +#include "inc_common.cl" +#include "inc_simd.cl" #if VECT_SIZE == 1 #define uint_to_hex_upper8(i) (u32x) (l_bin2asc[(i)]) diff --git a/OpenCL/m12600_a3.cl b/OpenCL/m12600_a3.cl index dc8b835..dd6c899 100644 --- a/OpenCL/m12600_a3.cl +++ b/OpenCL/m12600_a3.cl @@ -10,18 +10,18 @@ #define NEW_SIMD_CODE -#include "include/constants.h" -#include "include/kernel_vendor.h" +#include "inc_hash_constants.h" +#include "inc_vendor.cl" #define DGST_R0 3 #define DGST_R1 7 #define DGST_R2 2 #define DGST_R3 6 -#include "include/kernel_functions.c" -#include "OpenCL/types_ocl.c" -#include "OpenCL/common.c" -#include "OpenCL/simd.c" +#include "inc_hash_functions.cl" +#include "inc_types.cl" +#include "inc_common.cl" +#include "inc_simd.cl" #if VECT_SIZE == 1 #define uint_to_hex_upper8(i) (u32x) (l_bin2asc[(i)]) diff --git a/OpenCL/m12700.cl b/OpenCL/m12700.cl index 1e51e35..4175979 100644 --- a/OpenCL/m12700.cl +++ b/OpenCL/m12700.cl @@ -7,20 +7,20 @@ #define _SHA1_ -#include "include/constants.h" -#include "include/kernel_vendor.h" +#include "inc_hash_constants.h" +#include "inc_vendor.cl" #define DGST_R0 0 #define DGST_R1 1 #define DGST_R2 2 #define DGST_R3 3 -#include "include/kernel_functions.c" -#include "OpenCL/types_ocl.c" -#include "OpenCL/common.c" +#include "inc_hash_functions.cl" +#include "inc_types.cl" +#include "inc_common.cl" -#define COMPARE_S "OpenCL/check_single_comp4.c" -#define COMPARE_M "OpenCL/check_multi_comp4.c" +#define COMPARE_S "inc_comp_single.cl" +#define COMPARE_M "inc_comp_multi.cl" __constant u32 te0[256] = { diff --git a/OpenCL/m12800.cl b/OpenCL/m12800.cl index a9e3f93..d138fc7 100644 --- a/OpenCL/m12800.cl +++ b/OpenCL/m12800.cl @@ -5,21 +5,21 @@ #define _MS_DRSR_ -#include "include/constants.h" -#include "include/kernel_vendor.h" +#include "inc_hash_constants.h" +#include "inc_vendor.cl" #define DGST_R0 0 #define DGST_R1 1 #define DGST_R2 2 #define DGST_R3 3 -#include "include/kernel_functions.c" +#include "inc_hash_functions.cl" -#include "OpenCL/types_ocl.c" -#include "OpenCL/common.c" +#include "inc_types.cl" +#include "inc_common.cl" -#define COMPARE_S "OpenCL/check_single_comp4.c" -#define COMPARE_M "OpenCL/check_multi_comp4.c" +#define COMPARE_S "inc_comp_single.cl" +#define COMPARE_M "inc_comp_multi.cl" #define uint_to_hex_lower8(i) l_bin2asc[(i)] diff --git a/OpenCL/m12900.cl b/OpenCL/m12900.cl index 817a819..589c170 100644 --- a/OpenCL/m12900.cl +++ b/OpenCL/m12900.cl @@ -5,21 +5,21 @@ #define _ANDROIDFDE_SAMSUNG_ -#include "include/constants.h" -#include "include/kernel_vendor.h" +#include "inc_hash_constants.h" +#include "inc_vendor.cl" #define DGST_R0 0 #define DGST_R1 1 #define DGST_R2 2 #define DGST_R3 3 -#include "include/kernel_functions.c" +#include "inc_hash_functions.cl" -#include "OpenCL/types_ocl.c" -#include "OpenCL/common.c" +#include "inc_types.cl" +#include "inc_common.cl" -#define COMPARE_S "OpenCL/check_single_comp4.c" -#define COMPARE_M "OpenCL/check_multi_comp4.c" +#define COMPARE_S "inc_comp_single.cl" +#define COMPARE_M "inc_comp_multi.cl" __constant u32 k_sha256[64] = { diff --git a/OpenCL/m13000.cl b/OpenCL/m13000.cl index 267081c..c07d8da 100644 --- a/OpenCL/m13000.cl +++ b/OpenCL/m13000.cl @@ -5,21 +5,21 @@ #define _RAR5_ -#include "include/constants.h" -#include "include/kernel_vendor.h" +#include "inc_hash_constants.h" +#include "inc_vendor.cl" #define DGST_R0 0 #define DGST_R1 1 #define DGST_R2 2 #define DGST_R3 3 -#include "include/kernel_functions.c" +#include "inc_hash_functions.cl" -#include "OpenCL/types_ocl.c" -#include "OpenCL/common.c" +#include "inc_types.cl" +#include "inc_common.cl" -#define COMPARE_S "OpenCL/check_single_comp4.c" -#define COMPARE_M "OpenCL/check_multi_comp4.c" +#define COMPARE_S "inc_comp_single.cl" +#define COMPARE_M "inc_comp_multi.cl" __constant u32 k_sha256[64] = { diff --git a/OpenCL/m13100_a0.cl b/OpenCL/m13100_a0.cl index bd16342..3544eaa 100644 --- a/OpenCL/m13100_a0.cl +++ b/OpenCL/m13100_a0.cl @@ -11,20 +11,20 @@ //too much register pressure //#define NEW_SIMD_CODE -#include "include/constants.h" -#include "include/kernel_vendor.h" +#include "inc_hash_constants.h" +#include "inc_vendor.cl" #define DGST_R0 0 #define DGST_R1 1 #define DGST_R2 2 #define DGST_R3 3 -#include "include/kernel_functions.c" -#include "OpenCL/types_ocl.c" -#include "OpenCL/common.c" -#include "include/rp_kernel.h" -#include "OpenCL/rp.c" -#include "OpenCL/simd.c" +#include "inc_hash_functions.cl" +#include "inc_types.cl" +#include "inc_common.cl" +#include "inc_rp.h" +#include "inc_rp.cl" +#include "inc_simd.cl" typedef struct { diff --git a/OpenCL/m13100_a1.cl b/OpenCL/m13100_a1.cl index c49f2fd..2aba9d2 100644 --- a/OpenCL/m13100_a1.cl +++ b/OpenCL/m13100_a1.cl @@ -11,18 +11,18 @@ //too much register pressure //#define NEW_SIMD_CODE -#include "include/constants.h" -#include "include/kernel_vendor.h" +#include "inc_hash_constants.h" +#include "inc_vendor.cl" #define DGST_R0 0 #define DGST_R1 1 #define DGST_R2 2 #define DGST_R3 3 -#include "include/kernel_functions.c" -#include "OpenCL/types_ocl.c" -#include "OpenCL/common.c" -#include "OpenCL/simd.c" +#include "inc_hash_functions.cl" +#include "inc_types.cl" +#include "inc_common.cl" +#include "inc_simd.cl" typedef struct { diff --git a/OpenCL/m13100_a3.cl b/OpenCL/m13100_a3.cl index b549673..6113ae1 100644 --- a/OpenCL/m13100_a3.cl +++ b/OpenCL/m13100_a3.cl @@ -11,18 +11,18 @@ //too much register pressure //#define NEW_SIMD_CODE -#include "include/constants.h" -#include "include/kernel_vendor.h" +#include "inc_hash_constants.h" +#include "inc_vendor.cl" #define DGST_R0 0 #define DGST_R1 1 #define DGST_R2 2 #define DGST_R3 3 -#include "include/kernel_functions.c" -#include "OpenCL/types_ocl.c" -#include "OpenCL/common.c" -#include "OpenCL/simd.c" +#include "inc_hash_functions.cl" +#include "inc_types.cl" +#include "inc_common.cl" +#include "inc_simd.cl" typedef struct { diff --git a/OpenCL/m13200.cl b/OpenCL/m13200.cl index 6027cca..a104b16 100644 --- a/OpenCL/m13200.cl +++ b/OpenCL/m13200.cl @@ -7,17 +7,17 @@ #define _SHA1_ -#include "include/constants.h" -#include "include/kernel_vendor.h" +#include "inc_hash_constants.h" +#include "inc_vendor.cl" #define DGST_R0 0 #define DGST_R1 1 #define DGST_R2 2 #define DGST_R3 3 -#include "include/kernel_functions.c" -#include "OpenCL/types_ocl.c" -#include "OpenCL/common.c" +#include "inc_hash_functions.cl" +#include "inc_types.cl" +#include "inc_common.cl" __constant u32 te0[256] = { diff --git a/OpenCL/m13300_a0.cl b/OpenCL/m13300_a0.cl index 5ac204b..bd45d38 100644 --- a/OpenCL/m13300_a0.cl +++ b/OpenCL/m13300_a0.cl @@ -9,20 +9,20 @@ #define NEW_SIMD_CODE -#include "include/constants.h" -#include "include/kernel_vendor.h" +#include "inc_hash_constants.h" +#include "inc_vendor.cl" #define DGST_R0 0 #define DGST_R1 4 #define DGST_R2 3 #define DGST_R3 2 -#include "include/kernel_functions.c" -#include "OpenCL/types_ocl.c" -#include "OpenCL/common.c" -#include "include/rp_kernel.h" -#include "OpenCL/rp.c" -#include "OpenCL/simd.c" +#include "inc_hash_functions.cl" +#include "inc_types.cl" +#include "inc_common.cl" +#include "inc_rp.h" +#include "inc_rp.cl" +#include "inc_simd.cl" __kernel void m13300_m04 (__global pw_t *pws, __global kernel_rule_t *rules_buf, __global comb_t *combs_buf, __global bf_t *bfs_buf, __global void *tmps, __global void *hooks, __global u32 *bitmaps_buf_s1_a, __global u32 *bitmaps_buf_s1_b, __global u32 *bitmaps_buf_s1_c, __global u32 *bitmaps_buf_s1_d, __global u32 *bitmaps_buf_s2_a, __global u32 *bitmaps_buf_s2_b, __global u32 *bitmaps_buf_s2_c, __global u32 *bitmaps_buf_s2_d, __global plain_t *plains_buf, __global digest_t *digests_buf, __global u32 *hashes_shown, __global salt_t *salt_bufs, __global void *esalt_bufs, __global u32 *d_return_buf, __global u32 *d_scryptV_buf, const u32 bitmap_mask, const u32 bitmap_shift1, const u32 bitmap_shift2, const u32 salt_pos, const u32 loop_pos, const u32 loop_cnt, const u32 il_cnt, const u32 digests_cnt, const u32 digests_offset, const u32 combs_mode, const u32 gid_max) { diff --git a/OpenCL/m13300_a1.cl b/OpenCL/m13300_a1.cl index 39421ec..8f1ec30 100644 --- a/OpenCL/m13300_a1.cl +++ b/OpenCL/m13300_a1.cl @@ -9,18 +9,18 @@ #define NEW_SIMD_CODE -#include "include/constants.h" -#include "include/kernel_vendor.h" +#include "inc_hash_constants.h" +#include "inc_vendor.cl" #define DGST_R0 0 #define DGST_R1 4 #define DGST_R2 3 #define DGST_R3 2 -#include "include/kernel_functions.c" -#include "OpenCL/types_ocl.c" -#include "OpenCL/common.c" -#include "OpenCL/simd.c" +#include "inc_hash_functions.cl" +#include "inc_types.cl" +#include "inc_common.cl" +#include "inc_simd.cl" __kernel void m13300_m04 (__global pw_t *pws, __global kernel_rule_t *rules_buf, __global comb_t *combs_buf, __global bf_t *bfs_buf, __global void *tmps, __global void *hooks, __global u32 *bitmaps_buf_s1_a, __global u32 *bitmaps_buf_s1_b, __global u32 *bitmaps_buf_s1_c, __global u32 *bitmaps_buf_s1_d, __global u32 *bitmaps_buf_s2_a, __global u32 *bitmaps_buf_s2_b, __global u32 *bitmaps_buf_s2_c, __global u32 *bitmaps_buf_s2_d, __global plain_t *plains_buf, __global digest_t *digests_buf, __global u32 *hashes_shown, __global salt_t *salt_bufs, __global void *esalt_bufs, __global u32 *d_return_buf, __global u32 *d_scryptV_buf, const u32 bitmap_mask, const u32 bitmap_shift1, const u32 bitmap_shift2, const u32 salt_pos, const u32 loop_pos, const u32 loop_cnt, const u32 il_cnt, const u32 digests_cnt, const u32 digests_offset, const u32 combs_mode, const u32 gid_max) { diff --git a/OpenCL/m13300_a3.cl b/OpenCL/m13300_a3.cl index dfeff7b..7109f7b 100644 --- a/OpenCL/m13300_a3.cl +++ b/OpenCL/m13300_a3.cl @@ -9,18 +9,18 @@ #define NEW_SIMD_CODE -#include "include/constants.h" -#include "include/kernel_vendor.h" +#include "inc_hash_constants.h" +#include "inc_vendor.cl" #define DGST_R0 0 #define DGST_R1 4 #define DGST_R2 3 #define DGST_R3 2 -#include "include/kernel_functions.c" -#include "OpenCL/types_ocl.c" -#include "OpenCL/common.c" -#include "OpenCL/simd.c" +#include "inc_hash_functions.cl" +#include "inc_types.cl" +#include "inc_common.cl" +#include "inc_simd.cl" void m13300m (u32 w[16], const u32 pw_len, __global pw_t *pws, __global kernel_rule_t *rules_buf, __global comb_t *combs_buf, __constant u32x * words_buf_r, __global void *tmps, __global void *hooks, __global u32 *bitmaps_buf_s1_a, __global u32 *bitmaps_buf_s1_b, __global u32 *bitmaps_buf_s1_c, __global u32 *bitmaps_buf_s1_d, __global u32 *bitmaps_buf_s2_a, __global u32 *bitmaps_buf_s2_b, __global u32 *bitmaps_buf_s2_c, __global u32 *bitmaps_buf_s2_d, __global plain_t *plains_buf, __global digest_t *digests_buf, __global u32 *hashes_shown, __global salt_t *salt_bufs, __global void *esalt_bufs, __global u32 *d_return_buf, __global u32 *d_scryptV_buf, const u32 bitmap_mask, const u32 bitmap_shift1, const u32 bitmap_shift2, const u32 salt_pos, const u32 loop_pos, const u32 loop_cnt, const u32 il_cnt, const u32 digests_cnt, const u32 digests_offset) { diff --git a/OpenCL/m13400.cl b/OpenCL/m13400.cl index e0ec6d9..6079f55 100644 --- a/OpenCL/m13400.cl +++ b/OpenCL/m13400.cl @@ -7,19 +7,19 @@ #define _KEEPASS_ -#include "include/constants.h" -#include "include/kernel_vendor.h" +#include "inc_hash_constants.h" +#include "inc_vendor.cl" #define DGST_R0 0 #define DGST_R1 1 #define DGST_R2 2 #define DGST_R3 3 -#include "include/kernel_functions.c" -#include "OpenCL/types_ocl.c" -#include "OpenCL/common.c" +#include "inc_hash_functions.cl" +#include "inc_types.cl" +#include "inc_common.cl" -#include "OpenCL/kernel_twofish256.c" +#include "inc_cipher_twofish256.cl" __constant u32 te0[256] = { diff --git a/OpenCL/m13500_a0.cl b/OpenCL/m13500_a0.cl index 9538b46..9339212 100644 --- a/OpenCL/m13500_a0.cl +++ b/OpenCL/m13500_a0.cl @@ -8,20 +8,20 @@ //too much register pressure //#define NEW_SIMD_CODE -#include "include/constants.h" -#include "include/kernel_vendor.h" +#include "inc_hash_constants.h" +#include "inc_vendor.cl" #define DGST_R0 3 #define DGST_R1 4 #define DGST_R2 2 #define DGST_R3 1 -#include "include/kernel_functions.c" -#include "OpenCL/types_ocl.c" -#include "OpenCL/common.c" -#include "include/rp_kernel.h" -#include "OpenCL/rp.c" -#include "OpenCL/simd.c" +#include "inc_hash_functions.cl" +#include "inc_types.cl" +#include "inc_common.cl" +#include "inc_rp.h" +#include "inc_rp.cl" +#include "inc_simd.cl" void memcat64c_be (u32x block[16], const u32 offset, u32x carry[16]) { diff --git a/OpenCL/m13500_a1.cl b/OpenCL/m13500_a1.cl index c1e3db1..b07279b 100644 --- a/OpenCL/m13500_a1.cl +++ b/OpenCL/m13500_a1.cl @@ -8,18 +8,18 @@ //too much register pressure //#define NEW_SIMD_CODE -#include "include/constants.h" -#include "include/kernel_vendor.h" +#include "inc_hash_constants.h" +#include "inc_vendor.cl" #define DGST_R0 3 #define DGST_R1 4 #define DGST_R2 2 #define DGST_R3 1 -#include "include/kernel_functions.c" -#include "OpenCL/types_ocl.c" -#include "OpenCL/common.c" -#include "OpenCL/simd.c" +#include "inc_hash_functions.cl" +#include "inc_types.cl" +#include "inc_common.cl" +#include "inc_simd.cl" void memcat64c_be (u32x block[16], const u32 offset, u32x carry[16]) { diff --git a/OpenCL/m13500_a3.cl b/OpenCL/m13500_a3.cl index 046db7e..28d7427 100644 --- a/OpenCL/m13500_a3.cl +++ b/OpenCL/m13500_a3.cl @@ -8,18 +8,18 @@ //too much register pressure //#define NEW_SIMD_CODE -#include "include/constants.h" -#include "include/kernel_vendor.h" +#include "inc_hash_constants.h" +#include "inc_vendor.cl" #define DGST_R0 3 #define DGST_R1 4 #define DGST_R2 2 #define DGST_R3 1 -#include "include/kernel_functions.c" -#include "OpenCL/types_ocl.c" -#include "OpenCL/common.c" -#include "OpenCL/simd.c" +#include "inc_hash_functions.cl" +#include "inc_types.cl" +#include "inc_common.cl" +#include "inc_simd.cl" void memcat64c_be (u32x block[16], const u32 offset, u32x carry[16]) { diff --git a/OpenCL/m13600.cl b/OpenCL/m13600.cl index 5499f40..5cd9c6d 100644 --- a/OpenCL/m13600.cl +++ b/OpenCL/m13600.cl @@ -5,21 +5,21 @@ #define _ZIP2_ -#include "include/constants.h" -#include "include/kernel_vendor.h" +#include "inc_hash_constants.h" +#include "inc_vendor.cl" #define DGST_R0 0 #define DGST_R1 1 #define DGST_R2 2 #define DGST_R3 3 -#include "include/kernel_functions.c" +#include "inc_hash_functions.cl" -#include "OpenCL/types_ocl.c" -#include "OpenCL/common.c" +#include "inc_types.cl" +#include "inc_common.cl" -#define COMPARE_S "OpenCL/check_single_comp4.c" -#define COMPARE_M "OpenCL/check_multi_comp4.c" +#define COMPARE_S "inc_comp_single.cl" +#define COMPARE_M "inc_comp_multi.cl" void sha1_transform (const u32 w0[4], const u32 w1[4], const u32 w2[4], const u32 w3[4], u32 digest[5]) { diff --git a/OpenCL/m13751.cl b/OpenCL/m13751.cl index 06e3fab..f375323 100644 --- a/OpenCL/m13751.cl +++ b/OpenCL/m13751.cl @@ -5,21 +5,21 @@ #define _SHA256_ -#include "include/constants.h" -#include "include/kernel_vendor.h" +#include "inc_hash_constants.h" +#include "inc_vendor.cl" #define DGST_R0 0 #define DGST_R1 1 #define DGST_R2 2 #define DGST_R3 3 -#include "include/kernel_functions.c" -#include "OpenCL/types_ocl.c" -#include "OpenCL/common.c" +#include "inc_hash_functions.cl" +#include "inc_types.cl" +#include "inc_common.cl" -#include "OpenCL/kernel_aes256.c" -#include "OpenCL/kernel_twofish256.c" -#include "OpenCL/kernel_serpent256.c" +#include "inc_cipher_aes256.cl" +#include "inc_cipher_twofish256.cl" +#include "inc_cipher_serpent256.cl" __constant u32 k_sha256[64] = { diff --git a/OpenCL/m13752.cl b/OpenCL/m13752.cl index 0613321..2f7a9a5 100644 --- a/OpenCL/m13752.cl +++ b/OpenCL/m13752.cl @@ -5,21 +5,21 @@ #define _SHA256_ -#include "include/constants.h" -#include "include/kernel_vendor.h" +#include "inc_hash_constants.h" +#include "inc_vendor.cl" #define DGST_R0 0 #define DGST_R1 1 #define DGST_R2 2 #define DGST_R3 3 -#include "include/kernel_functions.c" -#include "OpenCL/types_ocl.c" -#include "OpenCL/common.c" +#include "inc_hash_functions.cl" +#include "inc_types.cl" +#include "inc_common.cl" -#include "OpenCL/kernel_aes256.c" -#include "OpenCL/kernel_twofish256.c" -#include "OpenCL/kernel_serpent256.c" +#include "inc_cipher_aes256.cl" +#include "inc_cipher_twofish256.cl" +#include "inc_cipher_serpent256.cl" __constant u32 k_sha256[64] = { diff --git a/OpenCL/m13753.cl b/OpenCL/m13753.cl index be1a9e9..489901c 100644 --- a/OpenCL/m13753.cl +++ b/OpenCL/m13753.cl @@ -5,21 +5,21 @@ #define _SHA256_ -#include "include/constants.h" -#include "include/kernel_vendor.h" +#include "inc_hash_constants.h" +#include "inc_vendor.cl" #define DGST_R0 0 #define DGST_R1 1 #define DGST_R2 2 #define DGST_R3 3 -#include "include/kernel_functions.c" -#include "OpenCL/types_ocl.c" -#include "OpenCL/common.c" +#include "inc_hash_functions.cl" +#include "inc_types.cl" +#include "inc_common.cl" -#include "OpenCL/kernel_aes256.c" -#include "OpenCL/kernel_twofish256.c" -#include "OpenCL/kernel_serpent256.c" +#include "inc_cipher_aes256.cl" +#include "inc_cipher_twofish256.cl" +#include "inc_cipher_serpent256.cl" __constant u32 k_sha256[64] = { diff --git a/OpenCL/markov_be.cl b/OpenCL/markov_be.cl index a429b2e..9d0720f 100644 --- a/OpenCL/markov_be.cl +++ b/OpenCL/markov_be.cl @@ -3,11 +3,11 @@ * License.....: MIT */ -#include "include/kernel_vendor.h" +#include "inc_vendor.cl" #define CHARSIZ 256 -#include "OpenCL/types_ocl.c" +#include "inc_types.cl" inline void generate_pw (u32 pw_buf[16], __global cs_t *root_css_buf, __global 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) { diff --git a/OpenCL/markov_le.cl b/OpenCL/markov_le.cl index dc0001c..2729446 100644 --- a/OpenCL/markov_le.cl +++ b/OpenCL/markov_le.cl @@ -3,11 +3,11 @@ * License.....: MIT */ -#include "include/kernel_vendor.h" +#include "inc_vendor.cl" #define CHARSIZ 256 -#include "OpenCL/types_ocl.c" +#include "inc_types.cl" inline void generate_pw (u32 pw_buf[16], __global cs_t *root_css_buf, __global 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) { diff --git a/include/rp_kernel_on_cpu.h b/include/rp_kernel_on_cpu.h index 5b89f62..a0fda1c 100644 --- a/include/rp_kernel_on_cpu.h +++ b/include/rp_kernel_on_cpu.h @@ -9,7 +9,7 @@ #define swap_workaround(n) __builtin_bswap32(n) #include "common.h" -#include "rp_kernel.h" +#include "inc_rp.h" u32 apply_rule (const u32 name, const u32 p0, const u32 p1, u32 buf0[4], u32 buf1[4], const u32 in_len); u32 apply_rules (u32 *cmds, u32 buf0[4], u32 buf1[4], const u32 len); diff --git a/include/shared.h b/include/shared.h index d5b00ab..5b64b5b 100644 --- a/include/shared.h +++ b/include/shared.h @@ -9,8 +9,8 @@ #ifndef SHARED_H #define SHARED_H -#include -#include +#include "common.h" +#include "inc_hash_constants.h" /** * thread management @@ -108,18 +108,18 @@ static inline int CPU_ISSET (int num, cpu_set_t *cs) { return (cs->count & (1 < #define hc_sleep(x) sleep ((x)); #endif -#include +#include "ext_OpenCL.h" /** * temperature management */ #if _WIN -#include -#include +#include "ext_ADL.h" +#include "ext_nvapi.h" #else -#include -#include +#include "ext_ADL.h" +#include "ext_nvml.h" #endif /** @@ -184,9 +184,9 @@ typedef pthread_t hc_thread_t; typedef pthread_mutex_t hc_thread_mutex_t; #endif -#include +#include "types.h" #include "rp_cpu.h" -#include "rp_kernel.h" +#include "inc_rp.h" /** * valid project specific global stuff diff --git a/src/Makefile b/src/Makefile index 7509900..1515e5a 100644 --- a/src/Makefile +++ b/src/Makefile @@ -87,7 +87,7 @@ VERSION_TAG := $(shell test -d .git && git describe --tags --dirty= ## Compiler flags ## -CFLAGS := -pipe -W -Wall -std=c99 -Iinclude/ -I$(OPENCL_HEADERS_KHRONOS)/ +CFLAGS := -pipe -W -Wall -std=c99 -Iinclude/ -IOpenCL/ -I$(OPENCL_HEADERS_KHRONOS)/ ifndef DEBUG CFLAGS += -O2 diff --git a/src/hashcat.c b/src/hashcat.c index e23aabd..417b60d 100644 --- a/src/hashcat.c +++ b/src/hashcat.c @@ -14556,7 +14556,7 @@ int main (int argc, char **argv) // we don't have sm_* on vendors not NV but it doesn't matter - snprintf (build_opts, sizeof (build_opts) - 1, "-cl-std=CL1.1 -I\"%s/\" -DVENDOR_ID=%u -DCUDA_ARCH=%d -DVECT_SIZE=%u -DDEVICE_TYPE=%u -DKERN_TYPE=%u -D_unroll", shared_dir, device_param->vendor_id, (device_param->sm_major * 100) + device_param->sm_minor, device_param->vector_width, (u32) device_param->device_type, kern_type); + snprintf (build_opts, sizeof (build_opts) - 1, "-cl-std=CL1.1 -I\"%s/OpenCL\" -DVENDOR_ID=%u -DCUDA_ARCH=%d -DVECT_SIZE=%u -DDEVICE_TYPE=%u -DKERN_TYPE=%u -D_unroll", shared_dir, device_param->vendor_id, (device_param->sm_major * 100) + device_param->sm_minor, device_param->vector_width, (u32) device_param->device_type, kern_type); if (device_param->vendor_id == VENDOR_ID_INTEL_SDK) { diff --git a/tools/package_bin.sh b/tools/package_bin.sh index f0220f1..67328a9 100755 --- a/tools/package_bin.sh +++ b/tools/package_bin.sh @@ -12,7 +12,6 @@ rm -rf $OUT rm -rf $OUT.7z mkdir -p $OUT -mkdir -p $OUT/include cp $IN/hashcat??.exe $OUT/ cp $IN/hashcat??.bin $OUT/ @@ -27,11 +26,6 @@ cp -r $IN/extra $OUT/ cp $IN/example.dict $OUT/ cp $IN/example[0123456789]*.hash $OUT/ cp $IN/example[0123456789]*.cmd $OUT/ - -cp -r $IN/include/constants.h $OUT/include -cp -r $IN/include/kernel_functions.c $OUT/include -cp -r $IN/include/kernel_vendor.h $OUT/include -cp -r $IN/include/rp_kernel.h $OUT/include cp -r $IN/OpenCL $OUT/ # since for the binary distribution we still use .bin, we need to rewrite the commands @@ -54,7 +48,6 @@ unix2dos $OUT/rules/*.rule unix2dos $OUT/rules/hybrid/*.rule unix2dos $OUT/docs/* unix2dos $OUT/example*.cmd -unix2dos $OUT/include/* unix2dos $OUT/OpenCL/* unix2dos $OUT/hashcat.hctune @@ -72,7 +65,6 @@ chmod 755 $OUT/example*.sh chmod 755 $OUT/extra chmod 755 $OUT/extra/tab_completion/*.sh chmod 755 $OUT/extra/tab_completion/install -chmod 755 $OUT/include chmod 644 $OUT/include/* chmod 755 $OUT/OpenCL chmod 644 $OUT/OpenCL/* -- 2.25.1