From 2899f53a1570aa14f55fc07fcaabb0476d707679 Mon Sep 17 00:00:00 2001 From: Jens Steube Date: Wed, 25 May 2016 23:04:26 +0200 Subject: [PATCH 01/18] 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 dbc4ad8a5..821c7ce1d 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 553b1f667..d18e37c97 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 370958b2e..f1b1b0432 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 08e59238b..cdc550a4a 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 c89d6f288..a5df4082e 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 09b466579..e4d86bd70 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 d2beb7223..416dc30cd 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 a1424c9fc..e3ffd3608 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 38ef98f62..d923bd330 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 99fc13acd..db3d526bc 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 3e5d995dd..8318aa2e2 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 13d0651c8..d4098f951 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 9309e305e..cd86c4c65 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 329c8c1d5..3ae93f4a4 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 05001ed38..4b2638478 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 f888f5237..9521b8dd5 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 2996c9052..49c604662 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 ee4ef2e98..abb8c3067 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 eb34668d0..9fc1533d0 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 ec578f17a..b269ad0b4 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 1e93f467b..f08226ee9 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 687738c06..e2eeddb72 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 85604b845..635b08198 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 2863aef3e..fc636d203 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 4faa35ee9..7cc5b2b31 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 51be26223..39c2177a4 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 c78f744c5..455b84058 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 e8ce8d92d..09dac89a1 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 af0af263b..c92ed5227 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 b5d3fb0e3..b316a68fc 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 61286b5ce..0123ccc63 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 1c282b99b..a31c629ba 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 98f8c0217..080c4971c 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 c62f1987c..a92db0170 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 d766c06ad..6f216c51b 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 a9689b01c..96fe640f1 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 f92ccb65a..066f9bf7b 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 50cef28e8..36a0f92d0 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 0dd57586a..34394378e 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 68df4b46f..022208aa9 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 22ecebbd1..9a0e150db 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 1e9c5ecac..35d1790cd 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 e5d8bcf92..a3c081381 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 8427e86af..370a7a076 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 c7afc3f76..4bb85c786 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 2929228e6..bc88d6f8c 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 db57ca099..ac608070d 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 15716ed92..61d8ecec5 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 8f58b40e6..febb3506e 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 8ce0b86f0..390d1826c 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 27a10c58b..7605dd826 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 c083b0267..c202bbc79 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 2af68fee4..367751eae 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 b722c7a46..0f1cfce42 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 d8edbcbba..c2209775a 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 6fbc6d38d..462e4ee77 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 376b83efb..2cb123cd1 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 d7d26f513..26b211922 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 5170c0ecd..2bbf306cf 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 70fc825d0..1355f1584 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 d5455aa08..2c0fcf0f1 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 f8de4c911..02dffee0e 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 1cdce453d..e13d20f83 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 ebde5819a..fbaba9b20 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 b1f010ae3..53d62d14b 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 32f694b96..3c26ad6da 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 cc4285af3..392ebf38f 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 2e6b3a425..da178560a 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 2da15b871..1eb855d36 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 751be4283..ef9a0ceff 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 13e9027be..bfbc8ad4e 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 5676003d9..13406c7b2 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 d0a0ace85..0bfed8663 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 a95d0c2c4..4f5599404 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 905beed8a..faa387eae 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 897878f57..d74da2531 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 a2cd4a56d..cca9aa663 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 7e386280b..30b7c8a71 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 8cf53640c..40944ba95 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 69363a2ed..3e945af0a 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 7e12d30ba..4b5a5346c 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 ab683cfe1..207b8e02c 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 67565715f..2f2ac61b7 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 3824c2c09..6f973a316 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 6081ef66b..042753ed1 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 64c0df50e..2ddda1b4c 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 0007970f6..041b35b95 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 135cf9605..7cdc7fbb3 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 2585829aa..2d2e94e64 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 8389ceeb2..1b33d2a29 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 5324cb090..c37ed85a0 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 57adc4ff7..94486f4d1 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 c7df44e7a..55f94f68f 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 e2172f084..7bc0941b7 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 794c00f59..6ea786177 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 794b9b3b1..44309b742 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 52eb80caa..a0650118e 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 0ed79844c..9e721e4e4 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 12c1552fd..b2f5b9de2 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 2dd7473f8..7abf8750f 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 e2a055750..d6c8fe595 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 517822be4..05067761e 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 d6574ce19..98d49fec2 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 c859c4104..cd3c8afb7 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 97a98d3c0..84d0c7203 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 4ba5ea2ab..c72482b38 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 65112a3a5..b35a789eb 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 aff816fec..3de787824 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 8883d47fe..ed2c409b5 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 1d7895f4f..eaa86242f 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 61bb6d709..5bf538020 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 21b168511..4af9eb60a 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 2e2a8d2ed..89e45f838 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 0d8dc34d1..592c3e9fc 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 f434286a6..452ddb7ef 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 243bd9c8c..937bd30db 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 bb1ce3539..c9d37a81c 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 a6b0a593c..4e3974f97 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 d1e0679dc..4aedaefc4 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 78999f69f..9f90c54bc 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 57c7afc5b..ab4eaf153 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 54e90e9af..eac506d4e 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 a7a3c81e1..677d69c24 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 c3ca3e36f..3fbf245e6 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 8748ac41f..37a617b33 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 23b3a25cf..dd73e7c5b 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 5cdd1e6c5..c9458fe63 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 768f535ac..19ea01867 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 6ec301409..cdcce5ee3 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 dc3653dfa..10ad91a68 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 22b6de6f7..d500e0a28 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 f5d338073..cf501f112 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 5f98fdac8..df526068a 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 b16db6ce4..18d774132 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 e1729e383..5c2567785 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 a3789cd0c..a2781220a 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 4ee6320d3..74aa5e806 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 f3f777ab1..c164fdfc9 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 7d3a1ab03..9e5eacd1e 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 f4b311e77..ee926d8e0 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 e860d076e..f727a02e4 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 9b311358b..79af82be7 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 0cfd0cdac..038f50d4c 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 f4cb7c14f..356fd0e6c 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 5b5045589..25c2a7504 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 f2b7f760c..e6f65a426 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 435e041e1..64a727b80 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 76fb33b8a..3c587c664 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 56076a45b..7e7165528 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 4fe75a137..d58956be5 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 2d5ff62b1..f2c59f2e1 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 bc7339297..3d06321ba 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 b71ef7548..3f572d393 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 a1e13ee08..a5f28cb58 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 5df1807b0..72183d098 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 7af41b7eb..425849186 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 eea003d52..52445bcdb 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 15d8ec27d..6ad245354 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 31b9ae442..79be5935c 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 9cf2ba08d..b7b75b879 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 7bada0e31..8d5302085 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 7d22c1327..b6ef97923 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 e057e16f1..30c4ea151 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 5f6593b21..e3625a0f0 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 795f883a3..7b0f47029 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 5a41ae237..7aa9226bb 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 abd291279..2fb45471a 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 943589de5..0fc2f1a91 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 9f4e6e929..7c53c3b2a 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 ee2d43ca3..276c2a395 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 d881a5817..a722c5375 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 4958b39f5..ec2955d5d 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 d4d91fb45..f76af431e 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 82ad29365..90b7ad642 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 be2994c5f..12d2d48da 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 a9fc35911..d77bb3b65 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 74920b7f7..678cca8ce 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 e0d566b1e..8ce3e698c 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 799dce0fb..90b28a5c1 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 1c363b793..fda474856 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 5f630f8ec..a9b431073 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 29e546c9f..77d832e04 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 ac3eab835..c9222cdb3 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 3b0d23cb1..085f7909e 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 35005aef5..2280f210a 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 d613d2e91..c26d3fb08 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 da07d43ef..f3895dab9 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 7262ac3ee..d06cfd8f5 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 0b49be0fc..61a85c13e 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 595926316..be8041f0d 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 e416c661f..1c094964c 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 c2007b075..3e7aa8d8e 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 90f248cf3..2ead1ea9f 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 942de685c..b10280e14 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 acb671945..0235544d1 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 f4dcf9013..cfdba3b87 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 99e0dd882..8c632a5b2 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 b5d77e14d..5f23af121 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 6ee052368..ca2f14e93 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 3f8acebcc..f8b5ff807 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 d2e691572..6744d6a18 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 82833bf4c..bbefaffb8 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 f7a07652f..fedc7fa45 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 dc7c705ef..66f6f8216 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 114712207..6f6440507 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 9d4dccfe4..27c7a4fbb 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 2cfa5caf3..b78560c51 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 944ec2e36..25a0495b1 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 0e22a5ed1..3fc46001c 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 0393d8de3..ea2e219e2 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 6983b1697..673df0a18 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 1e8eb9352..dd57cce32 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 86a001255..15d1ed1c4 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 531d5f37b..b904ed41c 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 2e068e7b1..717d7de1b 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 275513203..671d02d85 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 8eb9054cf..bf9850923 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 dac03795f..293cc496d 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 b4b98db7a..308b582a2 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 feb36f1bf..4fd07eb91 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 3b75ace07..7d1ce5a5a 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 7226bec77..49389d87a 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 33266e0c5..046b84e2f 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 efbc2bb14..9ac3580bf 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 b67030555..01f66fbd2 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 95b76e2b6..32c8a61e6 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 25980ec37..a7c2d8d62 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 484866200..58240d155 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 dc7b76886..ae7e6de73 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 904f68003..84dfa7f9a 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 e36b357f9..b22986fd2 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 9de6a4273..b0e73e1eb 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 2fa98bd74..06df81fac 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 5cb4be4d0..e408c052c 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 7a089ad7c..ce4c9264d 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 d21d101a7..6874a7ef3 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 20f25996d..d007a1caa 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 a97d62df3..6e5058a5e 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 c4a043c87..c6e58edd6 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 58be048ed..517bbe11e 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 5b7d92409..5fe5e448b 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 1bcb8d613..9506789dd 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 ed6d1975e..00650f192 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 b6fd2d321..f3bd318da 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 38a3033cd..50c5ca1ae 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 85ad68d0a..c2a718a16 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 210b62068..7b1166b3e 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 4efe52820..2d694d613 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 d9249dcf1..d28c6b275 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 3445f4354..a51d1fc30 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 eb28f6c15..18acd4651 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 4fa60b9d5..0c71129eb 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 65162f7e3..1fcb15ed1 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 45128af19..d9a4cf9d0 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 b992e8d24..040abd5f9 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 c761e44c8..74e119ebb 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 61f23d1a9..17b4adfb1 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 6721d0016..8aeb1e280 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 091d0414e..b0c6bba06 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 0b904da11..66b5ccd64 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 31f635549..2267b1a30 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 1c11f01a5..48cc9097e 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 6fc92c058..eaf1fa819 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 40fb8a0a1..b27ee74bf 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 527b1bdcd..bf1ae525b 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 5bfc89613..56cf7c728 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 8e780bc42..89dda1a1f 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 f8025e57b..b8075b340 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 3f8b3328b..0b9fc5787 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 91ded724f..fddcef8b9 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 e6f051d63..0e63e5552 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 a11bf4c14..30bae9b5a 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 269aff360..ad82fb400 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 345ad16b2..b797008ad 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 116a7cfab..ded29d3ad 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 2493658db..2dc8a994b 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 90cd0bc25..9094a962a 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 093af291d..df58488e1 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 92ebfe5e2..b26f455fc 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 518b84c73..51b1d7408 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 ec226b862..c5933efd1 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 d43b6577c..b56c6789a 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 9b69a2561..f9d295b8a 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 42cf320a5..9126e2ce9 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 93b84c49f..a7abb23e7 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 a24469f6c..721bfc557 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 d606f2d45..e0a7389e6 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 17f754018..c7de147a4 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 bcb0c58d2..a3897b783 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 7bfc74145..fae6a72b9 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 9427fabff..275b049b1 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 a209c8a8a..2b5970d80 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 f6c8e7a5d..808914e37 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 0c42ddf56..569d14911 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 8ab430a35..ec1f0fc66 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 7ec184acf..50ec905b5 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 2d00c496e..a5d860cce 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 1e39af03f..f63ec3ba3 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 062ec3b1d..0790a4653 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 eec3317c8..4d1ecfbc7 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 3bfa242e1..df9fdd574 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 5ac610191..2d3981be1 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 d16b4ee7d..c15333df5 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 80869907c..4caa348bf 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 3bcc15b75..088881eb5 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 3dd6c4698..6d3bb7f21 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 c8e9986fe..4af75ed5d 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 c7af8486a..00ae01363 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 2e931854a..db98b1498 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 36ce0b924..e0320dd97 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 1569b1ff3..0224f23d3 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 f282c3e51..87e63b5bd 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 cf8392ce1..0cd6cf876 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 2370800db..4ef9bb004 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 53eec8f86..ffa0f6c5c 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 ffbcf867d..0619bcdb9 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 7b789bcea..13af738a9 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 5430b4fe6..3a87faaae 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 7902c5db1..d32f9b08c 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 3292bc196..8c6b6e371 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 d9fe57970..a6368f487 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 9b527c912..14f9018f6 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 dc8b8356f..dd6c899ed 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 1e51e353e..417597961 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 a9e3f9311..d138fc7fe 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 817a819e2..589c170b1 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 267081ca8..c07d8da6c 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 bd16342ee..3544eaaf7 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 c49f2fd8d..2aba9d225 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 b5496733c..6113ae13e 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 6027cca5a..a104b167e 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 5ac204bea..bd45d38cf 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 39421ec63..8f1ec30a2 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 dfeff7b58..7109f7b51 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 e0ec6d9c2..6079f550a 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 9538b46da..933921219 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 c1e3db1f2..b07279b43 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 046db7efe..28d7427b1 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 5499f4027..5cd9c6df9 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 06e3fab47..f375323c5 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 061332179..2f7a9a5b7 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 be1a9e96c..489901c00 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 a429b2e4e..9d0720fce 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 dc0001cc7..27294464d 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 5b89f6210..a0fda1c61 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 d5b00abe8..5b64b5b36 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 750990005..1515e5a4d 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 e23aabdd4..417b60d0a 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 f0220f10b..67328a948 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/* From 6ed35891f615dcc8d7ee3ea5a75fdc91749497bf Mon Sep 17 00:00:00 2001 From: Jens Steube Date: Wed, 25 May 2016 23:15:53 +0200 Subject: [PATCH 02/18] Trying to find a workaround for Issue https://github.com/hashcat/oclHashcat/issues/335 --- src/hashcat.c | 15 ++++++++++++--- 1 file changed, 12 insertions(+), 3 deletions(-) diff --git a/src/hashcat.c b/src/hashcat.c index 417b60d0a..162b649f4 100644 --- a/src/hashcat.c +++ b/src/hashcat.c @@ -14556,14 +14556,23 @@ 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/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 _WIN + snprintf (build_opts, sizeof (build_opts) - 1, "-I \"%s\\OpenCL\\\" -I '%s\\OpenCL\\' -I %s\\OpenCL\\", shared_dir, shared_dir, shared_dir); + #else + snprintf (build_opts, sizeof (build_opts) - 1, "-I \"%s/OpenCL/\" -I '%s/OpenCL/' -I %s/OpenCL/", shared_dir, shared_dir, shared_dir); + #endif + + char build_opts_new[1024] = { 0 }; + + snprintf (build_opts_new, sizeof (build_opts_new) - 1, "%s -DVENDOR_ID=%u -DCUDA_ARCH=%d -DVECT_SIZE=%u -DDEVICE_TYPE=%u -DKERN_TYPE=%u -D_unroll -cl-std=CL1.1", build_opts, device_param->vendor_id, (device_param->sm_major * 100) + device_param->sm_minor, device_param->vector_width, (u32) device_param->device_type, kern_type); + + strncpy (build_opts, build_opts_new, sizeof (build_opts) - 1); + if (device_param->vendor_id == VENDOR_ID_INTEL_SDK) { // we do vectorizing much better than the auto-vectorizer - char build_opts_new[1024] = { 0 }; - snprintf (build_opts_new, sizeof (build_opts_new) - 1, "%s -cl-opt-disable", build_opts); strncpy (build_opts, build_opts_new, sizeof (build_opts) - 1); From d64083e9460fcf648b2096a1b72bb5a4945b0410 Mon Sep 17 00:00:00 2001 From: Jens Steube Date: Wed, 25 May 2016 23:18:20 +0200 Subject: [PATCH 03/18] Fix package script --- tools/package_bin.sh | 1 - 1 file changed, 1 deletion(-) diff --git a/tools/package_bin.sh b/tools/package_bin.sh index 67328a948..2db42a0e9 100755 --- a/tools/package_bin.sh +++ b/tools/package_bin.sh @@ -65,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 644 $OUT/include/* chmod 755 $OUT/OpenCL chmod 644 $OUT/OpenCL/* chmod 644 $OUT/*.exe From 250dbde2a239deef404b74a7cb237bd5ac2567da Mon Sep 17 00:00:00 2001 From: jsteube Date: Wed, 25 May 2016 23:47:02 +0200 Subject: [PATCH 04/18] Add more include-dir variants to also make Intel OpenCL SDK on windows happy --- src/hashcat.c | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/src/hashcat.c b/src/hashcat.c index 162b649f4..216d5de31 100644 --- a/src/hashcat.c +++ b/src/hashcat.c @@ -13647,6 +13647,7 @@ int main (int argc, char **argv) } } + /* turns out pocl still creates segfaults (because of llvm) if (device_type & CL_DEVICE_TYPE_CPU) { if (vendor_id == VENDOR_ID_AMD) @@ -13664,6 +13665,7 @@ int main (int argc, char **argv) } } } + */ /** * kernel accel and loops tuning db adjustment @@ -14557,9 +14559,9 @@ int main (int argc, char **argv) // we don't have sm_* on vendors not NV but it doesn't matter #if _WIN - snprintf (build_opts, sizeof (build_opts) - 1, "-I \"%s\\OpenCL\\\" -I '%s\\OpenCL\\' -I %s\\OpenCL\\", shared_dir, shared_dir, shared_dir); + snprintf (build_opts, sizeof (build_opts) - 1, "-I \"%s\\OpenCL\\\" -I '%s\\OpenCL\\' -I %s\\OpenCL\\ -I\"%s\\OpenCL\\\" -I'%s\\OpenCL\\' -I%s\\OpenCL\\", shared_dir, shared_dir, shared_dir, shared_dir, shared_dir, shared_dir); #else - snprintf (build_opts, sizeof (build_opts) - 1, "-I \"%s/OpenCL/\" -I '%s/OpenCL/' -I %s/OpenCL/", shared_dir, shared_dir, shared_dir); + snprintf (build_opts, sizeof (build_opts) - 1, "-I \"%s/OpenCL/\" -I '%s/OpenCL/' -I %s/OpenCL/ -I\"%s/OpenCL/\" -I'%s/OpenCL/' -I%s/OpenCL/", shared_dir, shared_dir, shared_dir, shared_dir, shared_dir, shared_dir); #endif char build_opts_new[1024] = { 0 }; From 167d76379505eda68095e23304612c4d810e6a4d Mon Sep 17 00:00:00 2001 From: jsteube Date: Thu, 26 May 2016 00:07:08 +0200 Subject: [PATCH 05/18] Workaround some AMD device_maxmem_alloc / device_global_mem problem --- src/hashcat.c | 60 ++++++++++++++++++++++++++------------------------- 1 file changed, 31 insertions(+), 29 deletions(-) diff --git a/src/hashcat.c b/src/hashcat.c index 216d5de31..062a8a833 100644 --- a/src/hashcat.c +++ b/src/hashcat.c @@ -14471,36 +14471,38 @@ int main (int argc, char **argv) int skip = 0; - if (size_pws > device_param->device_maxmem_alloc) skip = 1; - if (size_tmps > device_param->device_maxmem_alloc) skip = 1; - if (size_hooks > device_param->device_maxmem_alloc) skip = 1; + const u64 size_total + = bitmap_size + + bitmap_size + + bitmap_size + + bitmap_size + + bitmap_size + + bitmap_size + + bitmap_size + + bitmap_size + + size_bfs + + size_combs + + size_digests + + size_esalts + + size_hooks + + size_markov_css + + size_plains + + size_pws + + size_pws // not a bug + + size_results + + size_root_css + + size_rules + + size_rules_c + + size_salts + + size_scryptV + + size_shown + + size_tm + + size_tmps; - if (( bitmap_size - + bitmap_size - + bitmap_size - + bitmap_size - + bitmap_size - + bitmap_size - + bitmap_size - + bitmap_size - + size_bfs - + size_combs - + size_digests - + size_esalts - + size_hooks - + size_markov_css - + size_plains - + size_pws - + size_pws // not a bug - + size_results - + size_root_css - + size_rules - + size_rules_c - + size_salts - + size_scryptV - + size_shown - + size_tm - + size_tmps) > device_param->device_global_mem) skip = 1; + // Don't ask me, ask AMD! + + if (size_total > device_param->device_maxmem_alloc) skip = 1; + if (size_total > device_param->device_global_mem) skip = 1; if (skip == 1) { From ca8bb56404db154929c789bfd53aa324152535e5 Mon Sep 17 00:00:00 2001 From: Jens Steube Date: Thu, 26 May 2016 00:51:11 +0200 Subject: [PATCH 06/18] Make it a real balancing loop --- src/hashcat.c | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/src/hashcat.c b/src/hashcat.c index 062a8a833..41c70d0cf 100644 --- a/src/hashcat.c +++ b/src/hashcat.c @@ -2975,6 +2975,8 @@ static void autotune (hc_device_param_t *device_param) exec_ms_pre_final = MIN (exec_ms_pre_final, exec_ms_pre_final_v); } + u32 diff = kernel_loops - kernel_accel; + if ((kernel_loops_min < kernel_loops_max) && (kernel_accel_min < kernel_accel_max)) { for (u32 f = 2; f < 1024; f++) @@ -2985,6 +2987,10 @@ static void autotune (hc_device_param_t *device_param) if (kernel_accel_try > kernel_accel_max) break; if (kernel_loops_try < kernel_loops_min) break; + u32 diff_new = kernel_loops_try - kernel_accel_try; + + if (diff_new > diff) break; + double exec_ms = try_run (device_param, kernel_accel_try, kernel_loops_try); for (int i = 0; i < VERIFIER_CNT; i++) From a496ab7be51f7a33830683aefdebb22cd0bbe861 Mon Sep 17 00:00:00 2001 From: Jens Steube Date: Thu, 26 May 2016 12:07:25 +0200 Subject: [PATCH 07/18] Add clang to .travis.yml --- .travis.yml | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/.travis.yml b/.travis.yml index 706d362d8..aa03eaad8 100644 --- a/.travis.yml +++ b/.travis.yml @@ -6,6 +6,8 @@ install: - mkdir -p deps/OpenCL-Headers - git clone https://github.com/KhronosGroup/OpenCL-Headers deps/OpenCL-Headers/CL compiler: + - clang - gcc script: - - make \ No newline at end of file + - make + From 9f45ceb1288840f188608596c6fc4d4b6b2fee21 Mon Sep 17 00:00:00 2001 From: Jens Steube Date: Thu, 26 May 2016 12:21:08 +0200 Subject: [PATCH 08/18] Fix includes for kernel2cpu_rule_test --- tools/rules_test/Makefile | 2 +- tools/rules_test/cpu_rules.h | 3 ++- tools/rules_test/kernel2cpu_rule_test.c | 12 +++++------- 3 files changed, 8 insertions(+), 9 deletions(-) diff --git a/tools/rules_test/Makefile b/tools/rules_test/Makefile index 8bb90a598..19e25ce3a 100644 --- a/tools/rules_test/Makefile +++ b/tools/rules_test/Makefile @@ -5,7 +5,7 @@ GCC := gcc ROOT := ../.. -CFLAGS := -O2 -s -pipe -W -Wall -std=c99 -I$(ROOT)/include/ +CFLAGS := -O2 -s -pipe -W -Wall -std=c99 -I$(ROOT)/include/ -I$(ROOT)/OpenCL/ LIBS := TARGET := kernel2cpu_rule_test INCLUDE := $(ROOT)/src/rp_kernel_on_cpu.c cpu_rules.c diff --git a/tools/rules_test/cpu_rules.h b/tools/rules_test/cpu_rules.h index fcb36fae7..32e36e270 100644 --- a/tools/rules_test/cpu_rules.h +++ b/tools/rules_test/cpu_rules.h @@ -6,7 +6,8 @@ #ifndef CPU_RULES_H #define CPU_RULES_H -#include +#include "common.h" +#include "inc_rp.h" #include "rp_cpu.h" #define BLOCK_SIZE 64 diff --git a/tools/rules_test/kernel2cpu_rule_test.c b/tools/rules_test/kernel2cpu_rule_test.c index acc1a0ec4..15b6c4db9 100644 --- a/tools/rules_test/kernel2cpu_rule_test.c +++ b/tools/rules_test/kernel2cpu_rule_test.c @@ -3,15 +3,13 @@ * License.....: MIT */ -#include - -#define RULES_PER_PLAIN_MIN 1 +#define RULES_PER_PLAIN_MIN 1 #define RULES_PER_PLAIN_MAX 99 -#define RP_GEN_FUNC_MIN 1 -#define RP_GEN_FUNC_MAX 4 +#define RP_GEN_FUNC_MIN 1 +#define RP_GEN_FUNC_MAX 4 #define PW_MAX 32 #define LINE_SIG_LEN RP_GEN_FUNC_MAX * 2 + 1 -3 + int max_len = 0; #include "cpu_rules.h" @@ -61,7 +59,7 @@ int main (int argc, char **argv) char *rule_buf = (char *) malloc (HCBUFSIZ); - char *line_buf = (char *) mymalloc (HCBUFSIZ); + char *line_buf = (char *) malloc (HCBUFSIZ); int rp_gen_func_min = RP_GEN_FUNC_MIN; int rp_gen_func_max = RP_GEN_FUNC_MAX; From 964a901f2afe933a7c9b4cd43ebd95e885f9628c Mon Sep 17 00:00:00 2001 From: Jens Steube Date: Thu, 26 May 2016 12:40:12 +0200 Subject: [PATCH 09/18] Allow numbers not power of 2 in autotune --- src/hashcat.c | 11 ++++++++--- 1 file changed, 8 insertions(+), 3 deletions(-) diff --git a/src/hashcat.c b/src/hashcat.c index 41c70d0cf..ac5d95fac 100644 --- a/src/hashcat.c +++ b/src/hashcat.c @@ -2979,10 +2979,13 @@ static void autotune (hc_device_param_t *device_param) if ((kernel_loops_min < kernel_loops_max) && (kernel_accel_min < kernel_accel_max)) { - for (u32 f = 2; f < 1024; f++) + u32 kernel_accel_orig = kernel_accel; + u32 kernel_loops_orig = kernel_loops; + + for (u32 f = 1; f < 1024; f++) { - const u32 kernel_accel_try = kernel_accel * f; - const u32 kernel_loops_try = kernel_loops / f; + const u32 kernel_accel_try = (float) kernel_accel_orig * f; + const u32 kernel_loops_try = (float) kernel_loops_orig / f; if (kernel_accel_try > kernel_accel_max) break; if (kernel_loops_try < kernel_loops_min) break; @@ -2991,6 +2994,8 @@ static void autotune (hc_device_param_t *device_param) if (diff_new > diff) break; + diff_new = diff; + double exec_ms = try_run (device_param, kernel_accel_try, kernel_loops_try); for (int i = 0; i < VERIFIER_CNT; i++) From be91174794b8f2b4fc3bca6de38ff5b0c4abf87b Mon Sep 17 00:00:00 2001 From: jsteube Date: Thu, 26 May 2016 14:01:42 +0200 Subject: [PATCH 10/18] Detect if the user has both an Intel and and AMD OpenCL runtime and not filtered any of them then skip the AMD CPU support automatically --- src/hashcat.c | 56 ++++++++++++++++++++++++++++++++++++++++++++------- 1 file changed, 49 insertions(+), 7 deletions(-) diff --git a/src/hashcat.c b/src/hashcat.c index ac5d95fac..45f54967b 100644 --- a/src/hashcat.c +++ b/src/hashcat.c @@ -13188,6 +13188,34 @@ int main (int argc, char **argv) } } + /** + * Detect if the user has both an Intel and and AMD OpenCL runtime and not filtered any of them + * In this case mark it for later use + */ + + int has_intel = 0; + int has_amd = 0; + + for (uint platform_id = 0; platform_id < platforms_cnt; platform_id++) + { + if ((opencl_platforms_filter & (1 << platform_id)) == 0) continue; + + cl_platform_id platform = platforms[platform_id]; + + char platform_vendor[INFOSZ] = { 0 }; + + hc_clGetPlatformInfo (data.ocl, platform, CL_PLATFORM_VENDOR, sizeof (platform_vendor), platform_vendor, NULL); + + if (strcmp (platform_vendor, CL_VENDOR_AMD) == 0) + { + has_intel = 1; + } + else if (strcmp (platform_vendor, CL_VENDOR_INTEL_SDK) == 0) + { + has_amd = 1; + } + } + /** * OpenCL devices: simply push all devices from all platforms into the same device array */ @@ -13393,7 +13421,7 @@ int main (int argc, char **argv) if (device_endian_little == CL_FALSE) { - log_info ("Device #%u: WARNING: not little endian device", device_id + 1); + if (data.quiet == 0) log_info ("Device #%u: WARNING: not little endian device", device_id + 1); device_param->skipped = 1; } @@ -13406,7 +13434,7 @@ int main (int argc, char **argv) if (device_available == CL_FALSE) { - log_info ("Device #%u: WARNING: device not available", device_id + 1); + if (data.quiet == 0) log_info ("Device #%u: WARNING: device not available", device_id + 1); device_param->skipped = 1; } @@ -13419,7 +13447,7 @@ int main (int argc, char **argv) if (device_compiler_available == CL_FALSE) { - log_info ("Device #%u: WARNING: device no compiler available", device_id + 1); + if (data.quiet == 0) log_info ("Device #%u: WARNING: device no compiler available", device_id + 1); device_param->skipped = 1; } @@ -13432,7 +13460,7 @@ int main (int argc, char **argv) if ((device_execution_capabilities & CL_EXEC_KERNEL) == 0) { - log_info ("Device #%u: WARNING: device does not support executing kernels", device_id + 1); + if (data.quiet == 0) log_info ("Device #%u: WARNING: device does not support executing kernels", device_id + 1); device_param->skipped = 1; } @@ -13449,14 +13477,14 @@ int main (int argc, char **argv) if (strstr (device_extensions, "base_atomics") == 0) { - log_info ("Device #%u: WARNING: device does not support base atomics", device_id + 1); + if (data.quiet == 0) log_info ("Device #%u: WARNING: device does not support base atomics", device_id + 1); device_param->skipped = 1; } if (strstr (device_extensions, "byte_addressable_store") == 0) { - log_info ("Device #%u: WARNING: device does not support byte addressable store", device_id + 1); + if (data.quiet == 0) log_info ("Device #%u: WARNING: device does not support byte addressable store", device_id + 1); device_param->skipped = 1; } @@ -13471,11 +13499,25 @@ int main (int argc, char **argv) if (device_local_mem_size < 32768) { - log_info ("Device #%u: WARNING: device local mem size is too small", device_id + 1); + if (data.quiet == 0) log_info ("Device #%u: WARNING: device local mem size is too small", device_id + 1); device_param->skipped = 1; } + // if we have both intel and amd opencl runtime we want they share the same cpu + // so both virtual cpu share the same resources and run at 50% + // however, intel has better control over their own hardware so it makes sense + // to give them full control over their own hardware + + if (device_type & CL_DEVICE_TYPE_CPU) + { + if ((has_intel == 1) && (has_amd == 1) && (vendor_id == VENDOR_ID_AMD)) + { + if (data.quiet == 0) log_info ("Device #%u: WARNING: Not its native platform vendor", device_id + 1); + + device_param->skipped = 1; + } + } // skipped From f5f9073f4519be9c6b6b5378d7a483f5ed05a47e Mon Sep 17 00:00:00 2001 From: jsteube Date: Thu, 26 May 2016 14:28:05 +0200 Subject: [PATCH 11/18] Better distinguish between platform vendor and device vendor --- include/types.h | 4 +- src/hashcat.c | 104 ++++++++++++++++++++---------------------------- src/shared.c | 12 +++--- 3 files changed, 52 insertions(+), 68 deletions(-) diff --git a/include/types.h b/include/types.h index 373bd6c3c..3b4b8e29d 100644 --- a/include/types.h +++ b/include/types.h @@ -995,13 +995,15 @@ struct __hc_device_param // device specific attributes starting char *device_name; + char *device_vendor; char *device_name_chksum; char *device_version; char *driver_version; bool opencl_v12; - cl_uint vendor_id; + cl_uint device_vendor_id; + cl_uint platform_vendor_id; cl_kernel kernel1; cl_kernel kernel12; diff --git a/src/hashcat.c b/src/hashcat.c index 45f54967b..e84991d89 100644 --- a/src/hashcat.c +++ b/src/hashcat.c @@ -1570,11 +1570,11 @@ void status_display () hm_device_val_to_str ((char *) utilization, HM_STR_BUF_SIZE, "%", hm_get_utilization_with_device_id (device_id)); hm_device_val_to_str ((char *) temperature, HM_STR_BUF_SIZE, "c", hm_get_temperature_with_device_id (device_id)); - if (device_param->vendor_id == VENDOR_ID_AMD) + if (device_param->device_vendor_id == VENDOR_ID_AMD) { hm_device_val_to_str ((char *) fanspeed, HM_STR_BUF_SIZE, "%", hm_get_fanspeed_with_device_id (device_id)); } - else if (device_param->vendor_id == VENDOR_ID_NV) + else if (device_param->device_vendor_id == VENDOR_ID_NV) { hm_device_val_to_str ((char *) fanspeed, HM_STR_BUF_SIZE, "%", hm_get_fanspeed_with_device_id (device_id)); } @@ -2613,7 +2613,7 @@ static void run_kernel_bzero (hc_device_param_t *device_param, cl_mem buf, const { int rc = -1; - if (device_param->opencl_v12 && device_param->vendor_id == VENDOR_ID_AMD) + if (device_param->opencl_v12 && device_param->platform_vendor_id == VENDOR_ID_AMD) { // So far tested, amd is the only supporting this OpenCL 1.2 function without segfaulting @@ -13188,34 +13188,6 @@ int main (int argc, char **argv) } } - /** - * Detect if the user has both an Intel and and AMD OpenCL runtime and not filtered any of them - * In this case mark it for later use - */ - - int has_intel = 0; - int has_amd = 0; - - for (uint platform_id = 0; platform_id < platforms_cnt; platform_id++) - { - if ((opencl_platforms_filter & (1 << platform_id)) == 0) continue; - - cl_platform_id platform = platforms[platform_id]; - - char platform_vendor[INFOSZ] = { 0 }; - - hc_clGetPlatformInfo (data.ocl, platform, CL_PLATFORM_VENDOR, sizeof (platform_vendor), platform_vendor, NULL); - - if (strcmp (platform_vendor, CL_VENDOR_AMD) == 0) - { - has_intel = 1; - } - else if (strcmp (platform_vendor, CL_VENDOR_INTEL_SDK) == 0) - { - has_amd = 1; - } - } - /** * OpenCL devices: simply push all devices from all platforms into the same device array */ @@ -13244,39 +13216,39 @@ int main (int argc, char **argv) // this causes trouble with vendor id based macros // we'll assign generic to those without special optimization available - cl_uint vendor_id = 0; + cl_uint platform_vendor_id = 0; if (strcmp (platform_vendor, CL_VENDOR_AMD) == 0) { - vendor_id = VENDOR_ID_AMD; + platform_vendor_id = VENDOR_ID_AMD; } else if (strcmp (platform_vendor, CL_VENDOR_APPLE) == 0) { - vendor_id = VENDOR_ID_APPLE; + platform_vendor_id = VENDOR_ID_APPLE; } else if (strcmp (platform_vendor, CL_VENDOR_INTEL_BEIGNET) == 0) { - vendor_id = VENDOR_ID_INTEL_BEIGNET; + platform_vendor_id = VENDOR_ID_INTEL_BEIGNET; } else if (strcmp (platform_vendor, CL_VENDOR_INTEL_SDK) == 0) { - vendor_id = VENDOR_ID_INTEL_SDK; + platform_vendor_id = VENDOR_ID_INTEL_SDK; } else if (strcmp (platform_vendor, CL_VENDOR_MESA) == 0) { - vendor_id = VENDOR_ID_MESA; + platform_vendor_id = VENDOR_ID_MESA; } else if (strcmp (platform_vendor, CL_VENDOR_NV) == 0) { - vendor_id = VENDOR_ID_NV; + platform_vendor_id = VENDOR_ID_NV; } else if (strcmp (platform_vendor, CL_VENDOR_POCL) == 0) { - vendor_id = VENDOR_ID_POCL; + platform_vendor_id = VENDOR_ID_POCL; } else { - vendor_id = VENDOR_ID_GENERIC; + platform_vendor_id = VENDOR_ID_GENERIC; } for (uint platform_devices_id = 0; platform_devices_id < platform_devices_cnt; platform_devices_id++) @@ -13287,7 +13259,7 @@ int main (int argc, char **argv) hc_device_param_t *device_param = &data.devices_param[device_id]; - device_param->vendor_id = vendor_id; + device_param->platform_vendor_id = platform_vendor_id; device_param->device = platform_devices[platform_devices_id]; @@ -13315,6 +13287,16 @@ int main (int argc, char **argv) device_param->device_name = device_name; + // device_vendor + + hc_clGetDeviceInfo (data.ocl, device_param->device, CL_DEVICE_VENDOR, 0, NULL, ¶m_value_size); + + char *device_vendor = (char *) mymalloc (param_value_size); + + hc_clGetDeviceInfo (data.ocl, device_param->device, CL_DEVICE_VENDOR, param_value_size, device_vendor, NULL); + + device_param->device_vendor = device_vendor; + // tuning db tuning_db_entry_t *tuningdb_entry = tuning_db_search (tuning_db, device_param, attack_mode, hash_mode); @@ -13504,16 +13486,16 @@ int main (int argc, char **argv) device_param->skipped = 1; } - // if we have both intel and amd opencl runtime we want they share the same cpu - // so both virtual cpu share the same resources and run at 50% - // however, intel has better control over their own hardware so it makes sense + // if we have an Intel CPU and an not Intel OpenCL runtime that's a tricky situation + // both platforms will support CPU device types and therefore both will use 50% of the physical resources + // however, intel has better simd control over their own hardware so it makes sense // to give them full control over their own hardware if (device_type & CL_DEVICE_TYPE_CPU) { - if ((has_intel == 1) && (has_amd == 1) && (vendor_id == VENDOR_ID_AMD)) + if ((device_param->device_vendor_id == VENDOR_ID_INTEL_SDK) && (device_param->platform_vendor_id != VENDOR_ID_INTEL_SDK)) { - if (data.quiet == 0) log_info ("Device #%u: WARNING: Not its native platform vendor", device_id + 1); + if (data.quiet == 0) log_info ("Device #%u: WARNING: not native intel opencl platform", device_id + 1); device_param->skipped = 1; } @@ -13539,9 +13521,9 @@ int main (int argc, char **argv) char *device_name_chksum = (char *) mymalloc (INFOSZ); #if __x86_64__ - snprintf (device_name_chksum, INFOSZ - 1, "%u-%u-%u-%s-%s-%s-%u", 64, device_param->vendor_id, device_param->vector_width, device_param->device_name, device_param->device_version, device_param->driver_version, COMPTIME); + snprintf (device_name_chksum, INFOSZ - 1, "%u-%u-%u-%s-%s-%s-%u", 64, device_param->platform_vendor_id, device_param->vector_width, device_param->device_name, device_param->device_version, device_param->driver_version, COMPTIME); #else - snprintf (device_name_chksum, INFOSZ - 1, "%u-%u-%u-%s-%s-%s-%u", 32, device_param->vendor_id, device_param->vector_width, device_param->device_name, device_param->device_version, device_param->driver_version, COMPTIME); + snprintf (device_name_chksum, INFOSZ - 1, "%u-%u-%u-%s-%s-%s-%u", 32, device_param->platform_vendor_id, device_param->vector_width, device_param->device_name, device_param->device_version, device_param->driver_version, COMPTIME); #endif uint device_name_digest[4] = { 0 }; @@ -13563,7 +13545,7 @@ int main (int argc, char **argv) if (device_type & CL_DEVICE_TYPE_GPU) { - if (vendor_id == VENDOR_ID_AMD) + if (platform_vendor_id == VENDOR_ID_AMD) { cl_uint device_processor_cores = 0; @@ -13573,7 +13555,7 @@ int main (int argc, char **argv) device_param->device_processor_cores = device_processor_cores; } - else if (vendor_id == VENDOR_ID_NV) + else if (platform_vendor_id == VENDOR_ID_NV) { cl_uint kernel_exec_timeout = 0; @@ -13642,7 +13624,7 @@ int main (int argc, char **argv) { if (device_type & CL_DEVICE_TYPE_GPU) { - if (vendor_id == VENDOR_ID_AMD) + if (platform_vendor_id == VENDOR_ID_AMD) { int catalyst_check = (force == 1) ? 0 : 1; @@ -13690,7 +13672,7 @@ int main (int argc, char **argv) return (-1); } } - else if (vendor_id == VENDOR_ID_NV) + else if (platform_vendor_id == VENDOR_ID_NV) { if (device_param->kernel_exec_timeout != 0) { @@ -13703,7 +13685,7 @@ int main (int argc, char **argv) /* turns out pocl still creates segfaults (because of llvm) if (device_type & CL_DEVICE_TYPE_CPU) { - if (vendor_id == VENDOR_ID_AMD) + if (platform_vendor_id == VENDOR_ID_AMD) { if (force == 0) { @@ -14083,14 +14065,14 @@ int main (int argc, char **argv) const uint platform_devices_id = device_param->platform_devices_id; #if defined(HAVE_NVML) || defined(HAVE_NVAPI) - if (device_param->vendor_id == VENDOR_ID_NV) + if (device_param->platform_vendor_id == VENDOR_ID_NV) { memcpy (&data.hm_device[device_id], &hm_adapters_nv[platform_devices_id], sizeof (hm_attrs_t)); } #endif #ifdef HAVE_ADL - if (device_param->vendor_id == VENDOR_ID_AMD) + if (device_param->platform_vendor_id == VENDOR_ID_AMD) { memcpy (&data.hm_device[device_id], &hm_adapters_amd[platform_devices_id], sizeof (hm_attrs_t)); } @@ -14278,22 +14260,22 @@ int main (int argc, char **argv) if (hash_mode == 8900) { - if (device_param->vendor_id == VENDOR_ID_AMD) + if (device_param->platform_vendor_id == VENDOR_ID_AMD) { tmto_start = 1; } - else if (device_param->vendor_id == VENDOR_ID_NV) + else if (device_param->platform_vendor_id == VENDOR_ID_NV) { tmto_start = 2; } } else if (hash_mode == 9300) { - if (device_param->vendor_id == VENDOR_ID_AMD) + if (device_param->platform_vendor_id == VENDOR_ID_AMD) { tmto_start = 2; } - else if (device_param->vendor_id == VENDOR_ID_NV) + else if (device_param->platform_vendor_id == VENDOR_ID_NV) { tmto_start = 2; } @@ -14621,12 +14603,12 @@ int main (int argc, char **argv) char build_opts_new[1024] = { 0 }; - snprintf (build_opts_new, sizeof (build_opts_new) - 1, "%s -DVENDOR_ID=%u -DCUDA_ARCH=%d -DVECT_SIZE=%u -DDEVICE_TYPE=%u -DKERN_TYPE=%u -D_unroll -cl-std=CL1.1", build_opts, 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_new, sizeof (build_opts_new) - 1, "%s -DVENDOR_ID=%u -DCUDA_ARCH=%d -DVECT_SIZE=%u -DDEVICE_TYPE=%u -DKERN_TYPE=%u -D_unroll -cl-std=CL1.1", build_opts, device_param->platform_vendor_id, (device_param->sm_major * 100) + device_param->sm_minor, device_param->vector_width, (u32) device_param->device_type, kern_type); strncpy (build_opts, build_opts_new, sizeof (build_opts) - 1); - if (device_param->vendor_id == VENDOR_ID_INTEL_SDK) + if (device_param->platform_vendor_id == VENDOR_ID_INTEL_SDK) { // we do vectorizing much better than the auto-vectorizer diff --git a/src/shared.c b/src/shared.c index f660f8593..9c08856af 100644 --- a/src/shared.c +++ b/src/shared.c @@ -3062,7 +3062,7 @@ int hm_get_temperature_with_device_id (const uint device_id) if ((data.devices_param[device_id].device_type & CL_DEVICE_TYPE_GPU) == 0) return -1; #ifdef HAVE_ADL - if (data.devices_param[device_id].vendor_id == VENDOR_ID_AMD) + if (data.devices_param[device_id].device_vendor_id == VENDOR_ID_AMD) { if (data.hm_amd) { @@ -3089,7 +3089,7 @@ int hm_get_temperature_with_device_id (const uint device_id) #endif #if defined(HAVE_NVML) || defined(HAVE_NVAPI) - if (data.devices_param[device_id].vendor_id == VENDOR_ID_NV) + if (data.devices_param[device_id].device_vendor_id == VENDOR_ID_NV) { #if defined(LINUX) && defined(HAVE_NVML) int temperature = 0; @@ -3125,7 +3125,7 @@ int hm_get_fanspeed_with_device_id (const uint device_id) if (data.hm_device[device_id].fan_supported == 1) { #ifdef HAVE_ADL - if (data.devices_param[device_id].vendor_id == VENDOR_ID_AMD) + if (data.devices_param[device_id].device_vendor_id == VENDOR_ID_AMD) { if (data.hm_amd) { @@ -3158,7 +3158,7 @@ int hm_get_fanspeed_with_device_id (const uint device_id) #endif // HAVE_ADL #if defined(HAVE_NVML) || defined(HAVE_NVAPI) - if (data.devices_param[device_id].vendor_id == VENDOR_ID_NV) + if (data.devices_param[device_id].device_vendor_id == VENDOR_ID_NV) { #if defined(LINUX) && defined(HAVE_NVML) int speed = 0; @@ -3190,7 +3190,7 @@ int hm_get_utilization_with_device_id (const uint device_id) if ((data.devices_param[device_id].device_type & CL_DEVICE_TYPE_GPU) == 0) return -1; #ifdef HAVE_ADL - if (data.devices_param[device_id].vendor_id == VENDOR_ID_AMD) + if (data.devices_param[device_id].device_vendor_id == VENDOR_ID_AMD) { if (data.hm_amd) { @@ -3206,7 +3206,7 @@ int hm_get_utilization_with_device_id (const uint device_id) #endif // HAVE_ADL #if defined(HAVE_NVML) || defined(HAVE_NVAPI) - if (data.devices_param[device_id].vendor_id == VENDOR_ID_NV) + if (data.devices_param[device_id].device_vendor_id == VENDOR_ID_NV) { #if defined(LINUX) && defined(HAVE_NVML) nvmlUtilization_t utilization; From fd7bc2736dfe1d88051b9d49d87ea84742d2427d Mon Sep 17 00:00:00 2001 From: jsteube Date: Thu, 26 May 2016 14:56:42 +0200 Subject: [PATCH 12/18] More vendor related changes --- include/shared.h | 2 ++ src/hashcat.c | 79 ++++++++++++++++++++++++++++++++++++++---------- 2 files changed, 65 insertions(+), 16 deletions(-) diff --git a/include/shared.h b/include/shared.h index 5b64b5b36..c8d6207ac 100644 --- a/include/shared.h +++ b/include/shared.h @@ -133,6 +133,7 @@ static inline int CPU_ISSET (int num, cpu_set_t *cs) { return (cs->count & (1 < #define CL_PLATFORMS_MAX 16 #define CL_VENDOR_AMD "Advanced Micro Devices, Inc." +#define CL_VENDOR_AMD_USE_INTEL "GenuineIntel" #define CL_VENDOR_APPLE "Apple" #define CL_VENDOR_INTEL_BEIGNET "Intel" #define CL_VENDOR_INTEL_SDK "Intel(R) Corporation" @@ -147,6 +148,7 @@ static inline int CPU_ISSET (int num, cpu_set_t *cs) { return (cs->count & (1 < #define VENDOR_ID_MESA (1 << 4) #define VENDOR_ID_NV (1 << 5) #define VENDOR_ID_POCL (1 << 6) +#define VENDOR_ID_AMD_USE_INTEL (1 << 7) #define VENDOR_ID_GENERIC (1 << 31) #define BLOCK_SIZE 64 diff --git a/src/hashcat.c b/src/hashcat.c index e84991d89..7f6778982 100644 --- a/src/hashcat.c +++ b/src/hashcat.c @@ -13222,6 +13222,10 @@ int main (int argc, char **argv) { platform_vendor_id = VENDOR_ID_AMD; } + else if (strcmp (platform_vendor, CL_VENDOR_AMD_USE_INTEL) == 0) + { + platform_vendor_id = VENDOR_ID_AMD_USE_INTEL; + } else if (strcmp (platform_vendor, CL_VENDOR_APPLE) == 0) { platform_vendor_id = VENDOR_ID_APPLE; @@ -13297,6 +13301,47 @@ int main (int argc, char **argv) device_param->device_vendor = device_vendor; + cl_uint device_vendor_id = 0; + + if (strcmp (device_vendor, CL_VENDOR_AMD) == 0) + { + device_vendor_id = VENDOR_ID_AMD; + } + else if (strcmp (device_vendor, CL_VENDOR_AMD_USE_INTEL) == 0) + { + device_vendor_id = VENDOR_ID_AMD_USE_INTEL; + } + else if (strcmp (device_vendor, CL_VENDOR_APPLE) == 0) + { + device_vendor_id = VENDOR_ID_APPLE; + } + else if (strcmp (device_vendor, CL_VENDOR_INTEL_BEIGNET) == 0) + { + device_vendor_id = VENDOR_ID_INTEL_BEIGNET; + } + else if (strcmp (device_vendor, CL_VENDOR_INTEL_SDK) == 0) + { + device_vendor_id = VENDOR_ID_INTEL_SDK; + } + else if (strcmp (device_vendor, CL_VENDOR_MESA) == 0) + { + device_vendor_id = VENDOR_ID_MESA; + } + else if (strcmp (device_vendor, CL_VENDOR_NV) == 0) + { + device_vendor_id = VENDOR_ID_NV; + } + else if (strcmp (device_vendor, CL_VENDOR_POCL) == 0) + { + device_vendor_id = VENDOR_ID_POCL; + } + else + { + device_vendor_id = VENDOR_ID_GENERIC; + } + + device_param->device_vendor_id = device_vendor_id; + // tuning db tuning_db_entry_t *tuningdb_entry = tuning_db_search (tuning_db, device_param, attack_mode, hash_mode); @@ -13486,14 +13531,15 @@ int main (int argc, char **argv) device_param->skipped = 1; } - // if we have an Intel CPU and an not Intel OpenCL runtime that's a tricky situation - // both platforms will support CPU device types and therefore both will use 50% of the physical resources - // however, intel has better simd control over their own hardware so it makes sense - // to give them full control over their own hardware + // If there's both an Intel CPU and an AMD OpenCL runtime it's a tricky situation + // Both platforms support CPU device types and therefore both will try to use 100% of the physical resources + // This results in both utilizing it for 50% + // However, Intel has much better SIMD control over their own hardware + // It makes sense to give them full control over their own hardware if (device_type & CL_DEVICE_TYPE_CPU) { - if ((device_param->device_vendor_id == VENDOR_ID_INTEL_SDK) && (device_param->platform_vendor_id != VENDOR_ID_INTEL_SDK)) + if (device_param->device_vendor_id == VENDOR_ID_AMD_USE_INTEL) { if (data.quiet == 0) log_info ("Device #%u: WARNING: not native intel opencl platform", device_id + 1); @@ -13545,7 +13591,7 @@ int main (int argc, char **argv) if (device_type & CL_DEVICE_TYPE_GPU) { - if (platform_vendor_id == VENDOR_ID_AMD) + if (device_vendor_id == VENDOR_ID_AMD) { cl_uint device_processor_cores = 0; @@ -13555,7 +13601,7 @@ int main (int argc, char **argv) device_param->device_processor_cores = device_processor_cores; } - else if (platform_vendor_id == VENDOR_ID_NV) + else if (device_vendor_id == VENDOR_ID_NV) { cl_uint kernel_exec_timeout = 0; @@ -14065,14 +14111,14 @@ int main (int argc, char **argv) const uint platform_devices_id = device_param->platform_devices_id; #if defined(HAVE_NVML) || defined(HAVE_NVAPI) - if (device_param->platform_vendor_id == VENDOR_ID_NV) + if (device_param->device_vendor_id == VENDOR_ID_NV) { memcpy (&data.hm_device[device_id], &hm_adapters_nv[platform_devices_id], sizeof (hm_attrs_t)); } #endif #ifdef HAVE_ADL - if (device_param->platform_vendor_id == VENDOR_ID_AMD) + if (device_param->device_vendor_id == VENDOR_ID_AMD) { memcpy (&data.hm_device[device_id], &hm_adapters_amd[platform_devices_id], sizeof (hm_attrs_t)); } @@ -14260,22 +14306,22 @@ int main (int argc, char **argv) if (hash_mode == 8900) { - if (device_param->platform_vendor_id == VENDOR_ID_AMD) + if (device_param->device_vendor_id == VENDOR_ID_AMD) { tmto_start = 1; } - else if (device_param->platform_vendor_id == VENDOR_ID_NV) + else if (device_param->device_vendor_id == VENDOR_ID_NV) { tmto_start = 2; } } else if (hash_mode == 9300) { - if (device_param->platform_vendor_id == VENDOR_ID_AMD) + if (device_param->device_vendor_id == VENDOR_ID_AMD) { tmto_start = 2; } - else if (device_param->platform_vendor_id == VENDOR_ID_NV) + else if (device_param->device_vendor_id == VENDOR_ID_NV) { tmto_start = 2; } @@ -14603,12 +14649,12 @@ int main (int argc, char **argv) char build_opts_new[1024] = { 0 }; - snprintf (build_opts_new, sizeof (build_opts_new) - 1, "%s -DVENDOR_ID=%u -DCUDA_ARCH=%d -DVECT_SIZE=%u -DDEVICE_TYPE=%u -DKERN_TYPE=%u -D_unroll -cl-std=CL1.1", build_opts, device_param->platform_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_new, sizeof (build_opts_new) - 1, "%s -DVENDOR_ID=%u -DCUDA_ARCH=%d -DVECT_SIZE=%u -DDEVICE_TYPE=%u -DKERN_TYPE=%u -D_unroll -cl-std=CL1.1", build_opts, device_param->device_vendor_id, (device_param->sm_major * 100) + device_param->sm_minor, device_param->vector_width, (u32) device_param->device_type, kern_type); strncpy (build_opts, build_opts_new, sizeof (build_opts) - 1); - - if (device_param->platform_vendor_id == VENDOR_ID_INTEL_SDK) + /* + if (device_param->device_vendor_id == VENDOR_ID_INTEL_SDK) { // we do vectorizing much better than the auto-vectorizer @@ -14616,6 +14662,7 @@ int main (int argc, char **argv) strncpy (build_opts, build_opts_new, sizeof (build_opts) - 1); } + */ #ifdef DEBUG log_info ("Device #%u: build_opts '%s'\n", device_id + 1, build_opts); From 2dd8156d24d3140d1423abc7a7ca9dc995103e64 Mon Sep 17 00:00:00 2001 From: jsteube Date: Thu, 26 May 2016 16:45:52 +0200 Subject: [PATCH 13/18] Introduce a true memset kernel, currently operates on 16 byte per item --- OpenCL/inc_common.cl | 9 +++ include/types.h | 4 +- src/hashcat.c | 139 ++++++++++++++++++++++++++++++++++++------- 3 files changed, 131 insertions(+), 21 deletions(-) diff --git a/OpenCL/inc_common.cl b/OpenCL/inc_common.cl index ca811e57b..cfd4ba471 100644 --- a/OpenCL/inc_common.cl +++ b/OpenCL/inc_common.cl @@ -9322,3 +9322,12 @@ inline void append_0x80_4x4_VV (u32x w0[4], u32x w1[4], u32x w2[4], u32x w3[4], #endif } + +__kernel void gpu_memset (__global uint4 *buf, const u32 value, const u32 gid_max) +{ + const u32 gid = get_global_id (0); + + if (gid >= gid_max) return; + + buf[gid] = (uint4) (value); +} diff --git a/include/types.h b/include/types.h index 3b4b8e29d..2a2b7c001 100644 --- a/include/types.h +++ b/include/types.h @@ -1016,13 +1016,13 @@ struct __hc_device_param cl_kernel kernel_amp; cl_kernel kernel_tm; cl_kernel kernel_weak; + cl_kernel kernel_memset; cl_context context; cl_program program; cl_program program_mp; cl_program program_amp; - cl_program program_weak; cl_command_queue command_queue; @@ -1064,6 +1064,7 @@ struct __hc_device_param void *kernel_params_mp_l[PARAMCNT]; void *kernel_params_amp[PARAMCNT]; void *kernel_params_tm[PARAMCNT]; + void *kernel_params_memset[PARAMCNT]; u32 kernel_params_buf32[PARAMCNT]; @@ -1077,6 +1078,7 @@ struct __hc_device_param u64 kernel_params_mp_l_buf64[PARAMCNT]; u32 kernel_params_amp_buf32[PARAMCNT]; + u32 kernel_params_memset_buf32[PARAMCNT]; }; typedef struct __hc_device_param hc_device_param_t; diff --git a/src/hashcat.c b/src/hashcat.c index 7f6778982..22f8c130b 100644 --- a/src/hashcat.c +++ b/src/hashcat.c @@ -2609,8 +2609,56 @@ static void run_kernel_amp (hc_device_param_t *device_param, const uint num) hc_clFinish (data.ocl, device_param->command_queue); } +static void run_kernel_memset (hc_device_param_t *device_param, cl_mem buf, const uint value, const uint num) +{ + const u32 num16d = num / 16; + const u32 num16m = num % 16; + + if (num16d) + { + device_param->kernel_params_memset_buf32[1] = value; + device_param->kernel_params_memset_buf32[2] = num16d; + + uint kernel_threads = device_param->kernel_threads; + + uint num_elements = num16d; + + while (num_elements % kernel_threads) num_elements++; + + cl_kernel kernel = device_param->kernel_memset; + + hc_clSetKernelArg (data.ocl, kernel, 0, sizeof (cl_mem), (void *) &buf); + hc_clSetKernelArg (data.ocl, kernel, 1, sizeof (cl_uint), device_param->kernel_params_memset[1]); + hc_clSetKernelArg (data.ocl, kernel, 2, sizeof (cl_uint), device_param->kernel_params_memset[2]); + + const size_t global_work_size[3] = { num_elements, 1, 1 }; + const size_t local_work_size[3] = { kernel_threads, 1, 1 }; + + hc_clEnqueueNDRangeKernel (data.ocl, device_param->command_queue, kernel, 1, NULL, global_work_size, local_work_size, 0, NULL, NULL); + + hc_clFlush (data.ocl, device_param->command_queue); + + hc_clFinish (data.ocl, device_param->command_queue); + } + + if (num16m) + { + u32 tmp[4]; + + tmp[0] = value; + tmp[1] = value; + tmp[2] = value; + tmp[3] = value; + + hc_clEnqueueWriteBuffer (data.ocl, device_param->command_queue, buf, CL_TRUE, num16d * 16, num16m, tmp, 0, NULL, NULL); + } +} + static void run_kernel_bzero (hc_device_param_t *device_param, cl_mem buf, const size_t size) { + run_kernel_memset (device_param, buf, 0, size); + + /* int rc = -1; if (device_param->opencl_v12 && device_param->platform_vendor_id == VENDOR_ID_AMD) @@ -2644,6 +2692,7 @@ static void run_kernel_bzero (hc_device_param_t *device_param, cl_mem buf, const myfree (tmp); } + */ } static void choose_kernel (hc_device_param_t *device_param, const uint attack_exec, const uint attack_mode, const uint opts_type, const salt_t *salt_buf, const uint highest_pw_len, const uint pws_cnt) @@ -2895,6 +2944,14 @@ static void autotune (hc_device_param_t *device_param) const u32 kernel_power_max = device_param->device_processors * device_param->kernel_threads * kernel_accel_max; + run_kernel_memset (device_param, device_param->d_pws_buf, 7, kernel_power_max * sizeof (pw_t)); + + if (data.attack_exec == ATTACK_EXEC_OUTSIDE_KERNEL) + { + run_kernel_memset (device_param, device_param->d_pws_amp_buf, 7, kernel_power_max * sizeof (pw_t)); + } + + /* for (u32 i = 0; i < kernel_power_max; i++) { device_param->pws_buf[i].i[0] = i; @@ -2908,6 +2965,7 @@ static void autotune (hc_device_param_t *device_param) { run_kernel_amp (device_param, kernel_power_max); } + */ #define VERIFIER_CNT 1 @@ -3030,10 +3088,19 @@ static void autotune (hc_device_param_t *device_param) // reset them fake words + /* memset (device_param->pws_buf, 0, kernel_power_max * sizeof (pw_t)); hc_clEnqueueWriteBuffer (data.ocl, device_param->command_queue, device_param->d_pws_buf, CL_TRUE, 0, kernel_power_max * sizeof (pw_t), device_param->pws_buf, 0, NULL, NULL); hc_clEnqueueWriteBuffer (data.ocl, device_param->command_queue, device_param->d_pws_amp_buf, CL_TRUE, 0, kernel_power_max * sizeof (pw_t), device_param->pws_buf, 0, NULL, NULL); + */ + + run_kernel_memset (device_param, device_param->d_pws_buf, 0, kernel_power_max * sizeof (pw_t)); + + if (data.attack_exec == ATTACK_EXEC_OUTSIDE_KERNEL) + { + run_kernel_memset (device_param, device_param->d_pws_amp_buf, 0, kernel_power_max * sizeof (pw_t)); + } // reset timer @@ -15084,13 +15151,6 @@ int main (int argc, char **argv) hc_clEnqueueWriteBuffer (data.ocl, device_param->command_queue, device_param->d_digests_shown, CL_TRUE, 0, size_shown, data.digests_shown, 0, NULL, NULL); hc_clEnqueueWriteBuffer (data.ocl, device_param->command_queue, device_param->d_salt_bufs, CL_TRUE, 0, size_salts, data.salts_buf, 0, NULL, NULL); - run_kernel_bzero (device_param, device_param->d_pws_buf, size_pws); - run_kernel_bzero (device_param, device_param->d_pws_amp_buf, size_pws); - run_kernel_bzero (device_param, device_param->d_tmps, size_tmps); - run_kernel_bzero (device_param, device_param->d_hooks, size_hooks); - run_kernel_bzero (device_param, device_param->d_plain_bufs, size_plains); - run_kernel_bzero (device_param, device_param->d_result, size_results); - /** * special buffers */ @@ -15101,8 +15161,6 @@ int main (int argc, char **argv) device_param->d_rules_c = hc_clCreateBuffer (data.ocl, device_param->context, CL_MEM_READ_ONLY, size_rules_c, NULL); hc_clEnqueueWriteBuffer (data.ocl, device_param->command_queue, device_param->d_rules, CL_TRUE, 0, size_rules, kernel_rules_buf, 0, NULL, NULL); - - run_kernel_bzero (device_param, device_param->d_rules_c, size_rules_c); } else if (attack_kern == ATTACK_KERN_COMBI) { @@ -15110,11 +15168,6 @@ int main (int argc, char **argv) device_param->d_combs_c = hc_clCreateBuffer (data.ocl, device_param->context, CL_MEM_READ_ONLY, size_combs, NULL); device_param->d_root_css_buf = hc_clCreateBuffer (data.ocl, device_param->context, CL_MEM_READ_ONLY, size_root_css, NULL); device_param->d_markov_css_buf = hc_clCreateBuffer (data.ocl, device_param->context, CL_MEM_READ_ONLY, size_markov_css, NULL); - - run_kernel_bzero (device_param, device_param->d_combs, size_combs); - run_kernel_bzero (device_param, device_param->d_combs_c, size_combs); - run_kernel_bzero (device_param, device_param->d_root_css_buf, size_root_css); - run_kernel_bzero (device_param, device_param->d_markov_css_buf, size_markov_css); } else if (attack_kern == ATTACK_KERN_BF) { @@ -15123,12 +15176,6 @@ int main (int argc, char **argv) device_param->d_tm_c = hc_clCreateBuffer (data.ocl, device_param->context, CL_MEM_READ_ONLY, size_tm, NULL); device_param->d_root_css_buf = hc_clCreateBuffer (data.ocl, device_param->context, CL_MEM_READ_ONLY, size_root_css, NULL); device_param->d_markov_css_buf = hc_clCreateBuffer (data.ocl, device_param->context, CL_MEM_READ_ONLY, size_markov_css, NULL); - - run_kernel_bzero (device_param, device_param->d_bfs, size_bfs); - run_kernel_bzero (device_param, device_param->d_bfs_c, size_bfs); - run_kernel_bzero (device_param, device_param->d_tm_c, size_tm); - run_kernel_bzero (device_param, device_param->d_root_css_buf, size_root_css); - run_kernel_bzero (device_param, device_param->d_markov_css_buf, size_markov_css); } if (size_esalts) @@ -15272,6 +15319,13 @@ int main (int argc, char **argv) device_param->kernel_params_tm[0] = &device_param->d_bfs_c; device_param->kernel_params_tm[1] = &device_param->d_tm_c; + device_param->kernel_params_memset_buf32[1] = 0; // value + device_param->kernel_params_memset_buf32[2] = 0; // gid_max + + device_param->kernel_params_memset[0] = NULL; + device_param->kernel_params_memset[1] = &device_param->kernel_params_memset_buf32[1]; + device_param->kernel_params_memset[2] = &device_param->kernel_params_memset_buf32[2]; + /** * kernel name */ @@ -15380,6 +15434,18 @@ int main (int argc, char **argv) if (opts_type & OPTS_TYPE_HOOK23) hc_clSetKernelArg (data.ocl, device_param->kernel23, i, sizeof (cl_uint), device_param->kernel_params[i]); } + // GPU memset + + device_param->kernel_memset = hc_clCreateKernel (data.ocl, device_param->program, "gpu_memset"); + + hc_clGetKernelWorkGroupInfo (data.ocl, device_param->kernel_memset, device_param->device, CL_KERNEL_WORK_GROUP_SIZE, sizeof (size_t), &kernel_wgs_tmp, NULL); kernel_threads = MIN (kernel_threads, kernel_wgs_tmp); + + hc_clSetKernelArg (data.ocl, device_param->kernel_memset, 0, sizeof (cl_mem), device_param->kernel_params_memset[0]); + hc_clSetKernelArg (data.ocl, device_param->kernel_memset, 1, sizeof (cl_uint), device_param->kernel_params_memset[1]); + hc_clSetKernelArg (data.ocl, device_param->kernel_memset, 2, sizeof (cl_uint), device_param->kernel_params_memset[2]); + + // MP start + if (attack_mode == ATTACK_MODE_BF) { device_param->kernel_mp_l = hc_clCreateKernel (data.ocl, device_param->program_mp, "l_markov"); @@ -15440,6 +15506,39 @@ int main (int argc, char **argv) device_param->kernel_threads = kernel_threads; + // zero some data buffers + + run_kernel_bzero (device_param, device_param->d_pws_buf, size_pws); + run_kernel_bzero (device_param, device_param->d_pws_amp_buf, size_pws); + run_kernel_bzero (device_param, device_param->d_tmps, size_tmps); + run_kernel_bzero (device_param, device_param->d_hooks, size_hooks); + run_kernel_bzero (device_param, device_param->d_plain_bufs, size_plains); + run_kernel_bzero (device_param, device_param->d_result, size_results); + + /** + * special buffers + */ + + if (attack_kern == ATTACK_KERN_STRAIGHT) + { + run_kernel_bzero (device_param, device_param->d_rules_c, size_rules_c); + } + else if (attack_kern == ATTACK_KERN_COMBI) + { + run_kernel_bzero (device_param, device_param->d_combs, size_combs); + run_kernel_bzero (device_param, device_param->d_combs_c, size_combs); + run_kernel_bzero (device_param, device_param->d_root_css_buf, size_root_css); + run_kernel_bzero (device_param, device_param->d_markov_css_buf, size_markov_css); + } + else if (attack_kern == ATTACK_KERN_BF) + { + run_kernel_bzero (device_param, device_param->d_bfs, size_bfs); + run_kernel_bzero (device_param, device_param->d_bfs_c, size_bfs); + run_kernel_bzero (device_param, device_param->d_tm_c, size_tm); + run_kernel_bzero (device_param, device_param->d_root_css_buf, size_root_css); + run_kernel_bzero (device_param, device_param->d_markov_css_buf, size_markov_css); + } + /** * Store initial fanspeed if gpu_temp_retain is enabled */ From 9f821aa3d27407040cb35dfcd307d37b4d20e7ad Mon Sep 17 00:00:00 2001 From: jsteube Date: Thu, 26 May 2016 16:55:30 +0200 Subject: [PATCH 14/18] Set maximum password length for SAP CODVN B (BCODE) hashes --- src/hashcat.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/src/hashcat.c b/src/hashcat.c index 22f8c130b..283e32a2e 100644 --- a/src/hashcat.c +++ b/src/hashcat.c @@ -11172,6 +11172,8 @@ int main (int argc, char **argv) break; case 7400: if (pw_max > 16) pw_max = 16; break; + case 7500: if (pw_max > 8) pw_max = 8; + break; case 7900: if (pw_max > 48) pw_max = 48; break; case 8500: if (pw_max > 8) pw_max = 8; From 911c8ae1db4529d6907b01182f2872593f250ac5 Mon Sep 17 00:00:00 2001 From: jsteube Date: Thu, 26 May 2016 17:08:00 +0200 Subject: [PATCH 15/18] Release kernel_memset when finished --- src/hashcat.c | 1 + 1 file changed, 1 insertion(+) diff --git a/src/hashcat.c b/src/hashcat.c index 283e32a2e..9023ce42b 100644 --- a/src/hashcat.c +++ b/src/hashcat.c @@ -17814,6 +17814,7 @@ int main (int argc, char **argv) if (device_param->kernel_mp_r) hc_clReleaseKernel (data.ocl, device_param->kernel_mp_r); if (device_param->kernel_tm) hc_clReleaseKernel (data.ocl, device_param->kernel_tm); if (device_param->kernel_amp) hc_clReleaseKernel (data.ocl, device_param->kernel_amp); + if (device_param->kernel_memset) hc_clReleaseKernel (data.ocl, device_param->kernel_memset); if (device_param->program) hc_clReleaseProgram (data.ocl, device_param->program); if (device_param->program_mp) hc_clReleaseProgram (data.ocl, device_param->program_mp); From dfc9a5ff6163db6268ca8b9c62b1c2ebd5e57638 Mon Sep 17 00:00:00 2001 From: jsteube Date: Thu, 26 May 2016 18:59:36 +0200 Subject: [PATCH 16/18] Improve Lotus Notes/Domino 6 performance --- OpenCL/m08600_a0.cl | 41 +++++++++++++++++++---------- OpenCL/m08600_a1.cl | 41 +++++++++++++++++++---------- OpenCL/m08600_a3.cl | 31 ++++++++++++++++------ OpenCL/m08700_a0.cl | 13 ++++------ OpenCL/m08700_a1.cl | 13 ++++------ OpenCL/m08700_a3.cl | 3 --- OpenCL/m09100.cl | 63 ++++++++++++++++++++++++--------------------- 7 files changed, 123 insertions(+), 82 deletions(-) diff --git a/OpenCL/m08600_a0.cl b/OpenCL/m08600_a0.cl index c6e58edd6..c8da5a799 100644 --- a/OpenCL/m08600_a0.cl +++ b/OpenCL/m08600_a0.cl @@ -82,9 +82,6 @@ void lotus_mix (u32x *in, __local u32 *s_lotus_magic_table) { u32 s = 48; - #ifdef _unroll - #pragma unroll - #endif for (int j = 0; j < 12; j++) { u32x tmp_in = in[j]; @@ -118,20 +115,20 @@ void lotus_transform_password (u32x in[4], u32x out[4], __local u32 *s_lotus_mag } } -void pad (u32x w[4], const u32 len) +void pad (u32 w[4], const u32 len) { const u32 val = 16 - len; - const u32x mask1 = val << 24; + const u32 mask1 = val << 24; - const u32x mask2 = val << 16 + const u32 mask2 = val << 16 | val << 24; - const u32x mask3 = val << 8 + const u32 mask3 = val << 8 | val << 16 | val << 24; - const u32x mask4 = val << 0 + const u32 mask4 = val << 0 | val << 8 | val << 16 | val << 24; @@ -229,7 +226,7 @@ void mdtransform (u32x state[4], u32x checksum[4], u32x block[4], __local u32 *s lotus_transform_password (block, checksum, s_lotus_magic_table); } -void domino_big_md (const u32x saved_key[16], const u32x size, u32x state[4], __local u32 *s_lotus_magic_table) +void domino_big_md (const u32x saved_key[16], const u32 size, u32x state[4], __local u32 *s_lotus_magic_table) { u32x checksum[4]; @@ -240,10 +237,28 @@ void domino_big_md (const u32x saved_key[16], const u32x size, u32x state[4], __ u32x block[4]; - block[0] = saved_key[0]; - block[1] = saved_key[1]; - block[2] = saved_key[2]; - block[3] = saved_key[3]; + block[0] = 0; + block[1] = 0; + block[2] = 0; + block[3] = 0; + + u32 curpos; + u32 idx; + + for (curpos = 0, idx = 0; curpos + 16 < size; curpos += 16, idx += 4) + { + block[0] = saved_key[idx + 0]; + block[1] = saved_key[idx + 1]; + block[2] = saved_key[idx + 2]; + block[3] = saved_key[idx + 3]; + + mdtransform (state, checksum, block, s_lotus_magic_table); + } + + block[0] = saved_key[idx + 0]; + block[1] = saved_key[idx + 1]; + block[2] = saved_key[idx + 2]; + block[3] = saved_key[idx + 3]; mdtransform (state, checksum, block, s_lotus_magic_table); diff --git a/OpenCL/m08600_a1.cl b/OpenCL/m08600_a1.cl index 517bbe11e..bb08ebe61 100644 --- a/OpenCL/m08600_a1.cl +++ b/OpenCL/m08600_a1.cl @@ -79,9 +79,6 @@ void lotus_mix (u32x *in, __local u32 *s_lotus_magic_table) { u32 s = 48; - #ifdef _unroll - #pragma unroll - #endif for (int j = 0; j < 12; j++) { u32x tmp_in = in[j]; @@ -115,20 +112,20 @@ void lotus_transform_password (u32x in[4], u32x out[4], __local u32 *s_lotus_mag } } -void pad (u32x w[4], const u32 len) +void pad (u32 w[4], const u32 len) { const u32 val = 16 - len; - const u32x mask1 = val << 24; + const u32 mask1 = val << 24; - const u32x mask2 = val << 16 + const u32 mask2 = val << 16 | val << 24; - const u32x mask3 = val << 8 + const u32 mask3 = val << 8 | val << 16 | val << 24; - const u32x mask4 = val << 0 + const u32 mask4 = val << 0 | val << 8 | val << 16 | val << 24; @@ -226,7 +223,7 @@ void mdtransform (u32x state[4], u32x checksum[4], u32x block[4], __local u32 *s lotus_transform_password (block, checksum, s_lotus_magic_table); } -void domino_big_md (const u32x saved_key[16], const u32x size, u32x state[4], __local u32 *s_lotus_magic_table) +void domino_big_md (const u32x saved_key[16], const u32 size, u32x state[4], __local u32 *s_lotus_magic_table) { u32x checksum[4]; @@ -237,10 +234,28 @@ void domino_big_md (const u32x saved_key[16], const u32x size, u32x state[4], __ u32x block[4]; - block[0] = saved_key[0]; - block[1] = saved_key[1]; - block[2] = saved_key[2]; - block[3] = saved_key[3]; + block[0] = 0; + block[1] = 0; + block[2] = 0; + block[3] = 0; + + u32 curpos; + u32 idx; + + for (curpos = 0, idx = 0; curpos + 16 < size; curpos += 16, idx += 4) + { + block[0] = saved_key[idx + 0]; + block[1] = saved_key[idx + 1]; + block[2] = saved_key[idx + 2]; + block[3] = saved_key[idx + 3]; + + mdtransform (state, checksum, block, s_lotus_magic_table); + } + + block[0] = saved_key[idx + 0]; + block[1] = saved_key[idx + 1]; + block[2] = saved_key[idx + 2]; + block[3] = saved_key[idx + 3]; mdtransform (state, checksum, block, s_lotus_magic_table); diff --git a/OpenCL/m08600_a3.cl b/OpenCL/m08600_a3.cl index 5fe5e448b..68643492a 100644 --- a/OpenCL/m08600_a3.cl +++ b/OpenCL/m08600_a3.cl @@ -79,9 +79,6 @@ void lotus_mix (u32x *in, __local u32 *s_lotus_magic_table) { u32 s = 48; - #ifdef _unroll - #pragma unroll - #endif for (int j = 0; j < 12; j++) { u32x tmp_in = in[j]; @@ -226,7 +223,7 @@ void mdtransform (u32x state[4], u32x checksum[4], u32x block[4], __local u32 *s lotus_transform_password (block, checksum, s_lotus_magic_table); } -void domino_big_md (const u32x saved_key[16], const u32x size, u32x state[4], __local u32 *s_lotus_magic_table) +void domino_big_md (const u32x saved_key[16], const u32 size, u32x state[4], __local u32 *s_lotus_magic_table) { u32x checksum[4]; @@ -237,10 +234,28 @@ void domino_big_md (const u32x saved_key[16], const u32x size, u32x state[4], __ u32x block[4]; - block[0] = saved_key[0]; - block[1] = saved_key[1]; - block[2] = saved_key[2]; - block[3] = saved_key[3]; + block[0] = 0; + block[1] = 0; + block[2] = 0; + block[3] = 0; + + u32 curpos; + u32 idx; + + for (curpos = 0, idx = 0; curpos + 16 < size; curpos += 16, idx += 4) + { + block[0] = saved_key[idx + 0]; + block[1] = saved_key[idx + 1]; + block[2] = saved_key[idx + 2]; + block[3] = saved_key[idx + 3]; + + mdtransform (state, checksum, block, s_lotus_magic_table); + } + + block[0] = saved_key[idx + 0]; + block[1] = saved_key[idx + 1]; + block[2] = saved_key[idx + 2]; + block[3] = saved_key[idx + 3]; mdtransform (state, checksum, block, s_lotus_magic_table); diff --git a/OpenCL/m08700_a0.cl b/OpenCL/m08700_a0.cl index 9506789dd..973a79774 100644 --- a/OpenCL/m08700_a0.cl +++ b/OpenCL/m08700_a0.cl @@ -94,9 +94,6 @@ void lotus_mix (u32x *in, __local u32 *s_lotus_magic_table) { u32 s = 48; - #ifdef _unroll - #pragma unroll - #endif for (int j = 0; j < 12; j++) { u32x tmp_in = in[j]; @@ -130,20 +127,20 @@ void lotus_transform_password (u32x in[4], u32x out[4], __local u32 *s_lotus_mag } } -void pad (u32x w[4], const u32 len) +void pad (u32 w[4], const u32 len) { const u32 val = 16 - len; - const u32x mask1 = val << 24; + const u32 mask1 = val << 24; - const u32x mask2 = val << 16 + const u32 mask2 = val << 16 | val << 24; - const u32x mask3 = val << 8 + const u32 mask3 = val << 8 | val << 16 | val << 24; - const u32x mask4 = val << 0 + const u32 mask4 = val << 0 | val << 8 | val << 16 | val << 24; diff --git a/OpenCL/m08700_a1.cl b/OpenCL/m08700_a1.cl index 00650f192..c7031bd47 100644 --- a/OpenCL/m08700_a1.cl +++ b/OpenCL/m08700_a1.cl @@ -91,9 +91,6 @@ void lotus_mix (u32x *in, __local u32 *s_lotus_magic_table) { u32 s = 48; - #ifdef _unroll - #pragma unroll - #endif for (int j = 0; j < 12; j++) { u32x tmp_in = in[j]; @@ -127,20 +124,20 @@ void lotus_transform_password (u32x in[4], u32x out[4], __local u32 *s_lotus_mag } } -void pad (u32x w[4], const u32 len) +void pad (u32 w[4], const u32 len) { const u32 val = 16 - len; - const u32x mask1 = val << 24; + const u32 mask1 = val << 24; - const u32x mask2 = val << 16 + const u32 mask2 = val << 16 | val << 24; - const u32x mask3 = val << 8 + const u32 mask3 = val << 8 | val << 16 | val << 24; - const u32x mask4 = val << 0 + const u32 mask4 = val << 0 | val << 8 | val << 16 | val << 24; diff --git a/OpenCL/m08700_a3.cl b/OpenCL/m08700_a3.cl index f3bd318da..9694a84c5 100644 --- a/OpenCL/m08700_a3.cl +++ b/OpenCL/m08700_a3.cl @@ -93,9 +93,6 @@ void lotus_mix (u32x *in, __local u32 *s_lotus_magic_table) { u32 s = 48; - #ifdef _unroll - #pragma unroll - #endif for (int j = 0; j < 12; j++) { u32x tmp_in = in[j]; diff --git a/OpenCL/m09100.cl b/OpenCL/m09100.cl index 2d694d613..0204ecd01 100644 --- a/OpenCL/m09100.cl +++ b/OpenCL/m09100.cl @@ -27,6 +27,8 @@ __constant char lotus64_table[] = "0123456789ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz+/"; +#define uint_to_hex_upper8(i) l_bin2asc[(i)] + __constant u32 lotus_magic_table[256] = { 0xbd, 0x56, 0xea, 0xf2, 0xa2, 0xf1, 0xac, 0x2a, @@ -63,51 +65,56 @@ __constant u32 lotus_magic_table[256] = 0x29, 0x39, 0xb9, 0xe9, 0x4c, 0xff, 0x43, 0xab, }; -#define BOX(S,i) (S)[(i)] +#if VECT_SIZE == 1 +#define BOX1(S,i) (S)[(i)] +#elif VECT_SIZE == 2 +#define BOX1(S,i) (u32x) ((S)[(i).s0], (S)[(i).s1]) +#elif VECT_SIZE == 4 +#define BOX1(S,i) (u32x) ((S)[(i).s0], (S)[(i).s1], (S)[(i).s2], (S)[(i).s3]) +#elif VECT_SIZE == 8 +#define BOX1(S,i) (u32x) ((S)[(i).s0], (S)[(i).s1], (S)[(i).s2], (S)[(i).s3], (S)[(i).s4], (S)[(i).s5], (S)[(i).s6], (S)[(i).s7]) +#elif VECT_SIZE == 16 +#define BOX1(S,i) (u32x) ((S)[(i).s0], (S)[(i).s1], (S)[(i).s2], (S)[(i).s3], (S)[(i).s4], (S)[(i).s5], (S)[(i).s6], (S)[(i).s7], (S)[(i).s8], (S)[(i).s9], (S)[(i).sa], (S)[(i).sb], (S)[(i).sc], (S)[(i).sd], (S)[(i).se], (S)[(i).sf]) +#endif -#define uint_to_hex_upper8(i) l_bin2asc[(i)] - -void lotus_mix (u32 *in, __local u32 *s_lotus_magic_table) +void lotus_mix (u32x *in, __local u32 *s_lotus_magic_table) { - u32 p = 0; + u32x p = 0; for (int i = 0; i < 18; i++) { u32 s = 48; - #ifdef _unroll - #pragma unroll - #endif for (int j = 0; j < 12; j++) { - u32 tmp_in = in[j]; - u32 tmp_out = 0; + u32x tmp_in = in[j]; + u32x tmp_out = 0; - p = (p + s--) & 0xff; p = ((tmp_in >> 0) & 0xff) ^ BOX (s_lotus_magic_table, p); tmp_out |= p << 0; - p = (p + s--) & 0xff; p = ((tmp_in >> 8) & 0xff) ^ BOX (s_lotus_magic_table, p); tmp_out |= p << 8; - p = (p + s--) & 0xff; p = ((tmp_in >> 16) & 0xff) ^ BOX (s_lotus_magic_table, p); tmp_out |= p << 16; - p = (p + s--) & 0xff; p = ((tmp_in >> 24) & 0xff) ^ BOX (s_lotus_magic_table, p); tmp_out |= p << 24; + p = (p + s--) & 0xff; p = ((tmp_in >> 0) & 0xff) ^ BOX1 (s_lotus_magic_table, p); tmp_out |= p << 0; + p = (p + s--) & 0xff; p = ((tmp_in >> 8) & 0xff) ^ BOX1 (s_lotus_magic_table, p); tmp_out |= p << 8; + p = (p + s--) & 0xff; p = ((tmp_in >> 16) & 0xff) ^ BOX1 (s_lotus_magic_table, p); tmp_out |= p << 16; + p = (p + s--) & 0xff; p = ((tmp_in >> 24) & 0xff) ^ BOX1 (s_lotus_magic_table, p); tmp_out |= p << 24; in[j] = tmp_out; } } } -void lotus_transform_password (u32 in[4], u32 out[4], __local u32 *s_lotus_magic_table) +void lotus_transform_password (u32x in[4], u32x out[4], __local u32 *s_lotus_magic_table) { - u32 t = out[3] >> 24; + u32x t = out[3] >> 24; - u32 c; + u32x c; #ifdef _unroll #pragma unroll #endif for (int i = 0; i < 4; i++) { - t ^= (in[i] >> 0) & 0xff; c = BOX (s_lotus_magic_table, t); out[i] ^= c << 0; t = ((out[i] >> 0) & 0xff); - t ^= (in[i] >> 8) & 0xff; c = BOX (s_lotus_magic_table, t); out[i] ^= c << 8; t = ((out[i] >> 8) & 0xff); - t ^= (in[i] >> 16) & 0xff; c = BOX (s_lotus_magic_table, t); out[i] ^= c << 16; t = ((out[i] >> 16) & 0xff); - t ^= (in[i] >> 24) & 0xff; c = BOX (s_lotus_magic_table, t); out[i] ^= c << 24; t = ((out[i] >> 24) & 0xff); + t ^= (in[i] >> 0) & 0xff; c = BOX1 (s_lotus_magic_table, t); out[i] ^= c << 0; t = ((out[i] >> 0) & 0xff); + t ^= (in[i] >> 8) & 0xff; c = BOX1 (s_lotus_magic_table, t); out[i] ^= c << 8; t = ((out[i] >> 8) & 0xff); + t ^= (in[i] >> 16) & 0xff; c = BOX1 (s_lotus_magic_table, t); out[i] ^= c << 16; t = ((out[i] >> 16) & 0xff); + t ^= (in[i] >> 24) & 0xff; c = BOX1 (s_lotus_magic_table, t); out[i] ^= c << 24; t = ((out[i] >> 24) & 0xff); } } @@ -190,9 +197,9 @@ void pad (u32 w[4], const u32 len) } } -void mdtransform_norecalc (u32 state[4], u32 block[4], __local u32 *s_lotus_magic_table) +void mdtransform_norecalc (u32x state[4], u32x block[4], __local u32 *s_lotus_magic_table) { - u32 x[12]; + u32x x[12]; x[ 0] = state[0]; x[ 1] = state[1]; @@ -215,23 +222,23 @@ void mdtransform_norecalc (u32 state[4], u32 block[4], __local u32 *s_lotus_magi state[3] = x[3]; } -void mdtransform (u32 state[4], u32 checksum[4], u32 block[4], __local u32 *s_lotus_magic_table) +void mdtransform (u32x state[4], u32x checksum[4], u32x block[4], __local u32 *s_lotus_magic_table) { mdtransform_norecalc (state, block, s_lotus_magic_table); lotus_transform_password (block, checksum, s_lotus_magic_table); } -void domino_big_md (const u32 saved_key[16], const u32 size, u32 state[4], __local u32 *s_lotus_magic_table) +void domino_big_md (const u32x saved_key[16], const u32 size, u32x state[4], __local u32 *s_lotus_magic_table) { - u32 checksum[4]; + u32x checksum[4]; checksum[0] = 0; checksum[1] = 0; checksum[2] = 0; checksum[3] = 0; - u32 block[4]; + u32x block[4]; block[0] = 0; block[1] = 0; @@ -251,8 +258,6 @@ void domino_big_md (const u32 saved_key[16], const u32 size, u32 state[4], __loc mdtransform (state, checksum, block, s_lotus_magic_table); } - u32 left = size - curpos; - block[0] = saved_key[idx + 0]; block[1] = saved_key[idx + 1]; block[2] = saved_key[idx + 2]; From f843c6a4d05d12519ee7400e66dbbdc49722c50e Mon Sep 17 00:00:00 2001 From: jsteube Date: Thu, 26 May 2016 19:30:09 +0200 Subject: [PATCH 17/18] Improve Lotus Notes/Domino 5 performance --- OpenCL/m08600_a0.cl | 117 +++++----------------------------------- OpenCL/m08600_a1.cl | 127 +++++--------------------------------------- OpenCL/m08600_a3.cl | 119 +++++++---------------------------------- 3 files changed, 44 insertions(+), 319 deletions(-) diff --git a/OpenCL/m08600_a0.cl b/OpenCL/m08600_a0.cl index c8da5a799..0d3a6712b 100644 --- a/OpenCL/m08600_a0.cl +++ b/OpenCL/m08600_a0.cl @@ -122,16 +122,16 @@ void pad (u32 w[4], const u32 len) const u32 mask1 = val << 24; const u32 mask2 = val << 16 - | val << 24; + | val << 24; const u32 mask3 = val << 8 - | val << 16 - | val << 24; + | val << 16 + | val << 24; const u32 mask4 = val << 0 - | val << 8 - | val << 16 - | val << 24; + | val << 8 + | val << 16 + | val << 24; switch (len) { @@ -226,7 +226,7 @@ void mdtransform (u32x state[4], u32x checksum[4], u32x block[4], __local u32 *s lotus_transform_password (block, checksum, s_lotus_magic_table); } -void domino_big_md (const u32x saved_key[16], const u32 size, u32x state[4], __local u32 *s_lotus_magic_table) +void domino_big_md (const u32x saved_key[4], const u32 size, u32x state[4], __local u32 *s_lotus_magic_table) { u32x checksum[4]; @@ -235,32 +235,7 @@ void domino_big_md (const u32x saved_key[16], const u32 size, u32x state[4], __l checksum[2] = 0; checksum[3] = 0; - u32x block[4]; - - block[0] = 0; - block[1] = 0; - block[2] = 0; - block[3] = 0; - - u32 curpos; - u32 idx; - - for (curpos = 0, idx = 0; curpos + 16 < size; curpos += 16, idx += 4) - { - block[0] = saved_key[idx + 0]; - block[1] = saved_key[idx + 1]; - block[2] = saved_key[idx + 2]; - block[3] = saved_key[idx + 3]; - - mdtransform (state, checksum, block, s_lotus_magic_table); - } - - block[0] = saved_key[idx + 0]; - block[1] = saved_key[idx + 1]; - block[2] = saved_key[idx + 2]; - block[3] = saved_key[idx + 3]; - - mdtransform (state, checksum, block, s_lotus_magic_table); + mdtransform (state, checksum, saved_key, s_lotus_magic_table); mdtransform_norecalc (state, checksum, s_lotus_magic_table); } @@ -325,25 +300,6 @@ __kernel void m08600_m04 (__global pw_t *pws, __global kernel_rule_t *rules_buf, * domino */ - u32x w[16]; - - w[ 0] = w0[0]; - w[ 1] = w0[1]; - w[ 2] = w0[2]; - w[ 3] = w0[3]; - w[ 4] = w1[0]; - w[ 5] = w1[1]; - w[ 6] = w1[2]; - w[ 7] = w1[3]; - w[ 8] = 0; - w[ 9] = 0; - w[10] = 0; - w[11] = 0; - w[12] = 0; - w[13] = 0; - w[14] = 0; - w[15] = 0; - u32x state[4]; state[0] = 0; @@ -355,24 +311,9 @@ __kernel void m08600_m04 (__global pw_t *pws, __global kernel_rule_t *rules_buf, * padding */ - if (out_len < 16) - { - pad (&w[ 0], out_len & 0xf); - } - else if (out_len < 32) - { - pad (&w[ 4], out_len & 0xf); - } - else if (out_len < 48) - { - pad (&w[ 8], out_len & 0xf); - } - else if (out_len < 64) - { - pad (&w[12], out_len & 0xf); - } + pad (w0, out_len); - domino_big_md (w, out_len, state, s_lotus_magic_table); + domino_big_md (w0, out_len, state, s_lotus_magic_table); COMPARE_M_SIMD (state[0], state[1], state[2], state[3]); } @@ -458,25 +399,6 @@ __kernel void m08600_s04 (__global pw_t *pws, __global kernel_rule_t *rules_buf, * domino */ - u32x w[16]; - - w[ 0] = w0[0]; - w[ 1] = w0[1]; - w[ 2] = w0[2]; - w[ 3] = w0[3]; - w[ 4] = w1[0]; - w[ 5] = w1[1]; - w[ 6] = w1[2]; - w[ 7] = w1[3]; - w[ 8] = 0; - w[ 9] = 0; - w[10] = 0; - w[11] = 0; - w[12] = 0; - w[13] = 0; - w[14] = 0; - w[15] = 0; - u32x state[4]; state[0] = 0; @@ -488,24 +410,9 @@ __kernel void m08600_s04 (__global pw_t *pws, __global kernel_rule_t *rules_buf, * padding */ - if (out_len < 16) - { - pad (&w[ 0], out_len & 0xf); - } - else if (out_len < 32) - { - pad (&w[ 4], out_len & 0xf); - } - else if (out_len < 48) - { - pad (&w[ 8], out_len & 0xf); - } - else if (out_len < 64) - { - pad (&w[12], out_len & 0xf); - } + pad (w0, out_len); - domino_big_md (w, out_len, state, s_lotus_magic_table); + domino_big_md (w0, out_len, state, s_lotus_magic_table); COMPARE_S_SIMD (state[0], state[1], state[2], state[3]); } diff --git a/OpenCL/m08600_a1.cl b/OpenCL/m08600_a1.cl index bb08ebe61..91546bba3 100644 --- a/OpenCL/m08600_a1.cl +++ b/OpenCL/m08600_a1.cl @@ -119,16 +119,16 @@ void pad (u32 w[4], const u32 len) const u32 mask1 = val << 24; const u32 mask2 = val << 16 - | val << 24; + | val << 24; const u32 mask3 = val << 8 - | val << 16 - | val << 24; + | val << 16 + | val << 24; const u32 mask4 = val << 0 - | val << 8 - | val << 16 - | val << 24; + | val << 8 + | val << 16 + | val << 24; switch (len) { @@ -223,7 +223,7 @@ void mdtransform (u32x state[4], u32x checksum[4], u32x block[4], __local u32 *s lotus_transform_password (block, checksum, s_lotus_magic_table); } -void domino_big_md (const u32x saved_key[16], const u32 size, u32x state[4], __local u32 *s_lotus_magic_table) +void domino_big_md (const u32x saved_key[4], const u32 size, u32x state[4], __local u32 *s_lotus_magic_table) { u32x checksum[4]; @@ -232,32 +232,7 @@ void domino_big_md (const u32x saved_key[16], const u32 size, u32x state[4], __l checksum[2] = 0; checksum[3] = 0; - u32x block[4]; - - block[0] = 0; - block[1] = 0; - block[2] = 0; - block[3] = 0; - - u32 curpos; - u32 idx; - - for (curpos = 0, idx = 0; curpos + 16 < size; curpos += 16, idx += 4) - { - block[0] = saved_key[idx + 0]; - block[1] = saved_key[idx + 1]; - block[2] = saved_key[idx + 2]; - block[3] = saved_key[idx + 3]; - - mdtransform (state, checksum, block, s_lotus_magic_table); - } - - block[0] = saved_key[idx + 0]; - block[1] = saved_key[idx + 1]; - block[2] = saved_key[idx + 2]; - block[3] = saved_key[idx + 3]; - - mdtransform (state, checksum, block, s_lotus_magic_table); + mdtransform (state, checksum, saved_key, s_lotus_magic_table); mdtransform_norecalc (state, checksum, s_lotus_magic_table); } @@ -357,40 +332,16 @@ __kernel void m08600_m04 (__global pw_t *pws, __global kernel_rule_t *rules_buf, } u32x w0[4]; - u32x w1[4]; w0[0] = wordl0[0] | wordr0[0]; w0[1] = wordl0[1] | wordr0[1]; w0[2] = wordl0[2] | wordr0[2]; w0[3] = wordl0[3] | wordr0[3]; - w1[0] = wordl1[0] | wordr1[0]; - w1[1] = wordl1[1] | wordr1[1]; - w1[2] = wordl1[2] | wordr1[2]; - w1[3] = wordl1[3] | wordr1[3]; /** * domino */ - u32x w[16]; - - w[ 0] = w0[0]; - w[ 1] = w0[1]; - w[ 2] = w0[2]; - w[ 3] = w0[3]; - w[ 4] = w1[0]; - w[ 5] = w1[1]; - w[ 6] = w1[2]; - w[ 7] = w1[3]; - w[ 8] = 0; - w[ 9] = 0; - w[10] = 0; - w[11] = 0; - w[12] = 0; - w[13] = 0; - w[14] = 0; - w[15] = 0; - u32x state[4]; state[0] = 0; @@ -402,24 +353,9 @@ __kernel void m08600_m04 (__global pw_t *pws, __global kernel_rule_t *rules_buf, * padding */ - if (pw_len < 16) - { - pad (&w[ 0], pw_len & 0xf); - } - else if (pw_len < 32) - { - pad (&w[ 4], pw_len & 0xf); - } - else if (pw_len < 48) - { - pad (&w[ 8], pw_len & 0xf); - } - else if (pw_len < 64) - { - pad (&w[12], pw_len & 0xf); - } + pad (w0, pw_len); - domino_big_md (w, pw_len, state, s_lotus_magic_table); + domino_big_md (w0, pw_len, state, s_lotus_magic_table); COMPARE_M_SIMD (state[0], state[1], state[2], state[3]); } @@ -540,40 +476,16 @@ __kernel void m08600_s04 (__global pw_t *pws, __global kernel_rule_t *rules_buf, } u32x w0[4]; - u32x w1[4]; w0[0] = wordl0[0] | wordr0[0]; w0[1] = wordl0[1] | wordr0[1]; w0[2] = wordl0[2] | wordr0[2]; w0[3] = wordl0[3] | wordr0[3]; - w1[0] = wordl1[0] | wordr1[0]; - w1[1] = wordl1[1] | wordr1[1]; - w1[2] = wordl1[2] | wordr1[2]; - w1[3] = wordl1[3] | wordr1[3]; /** * domino */ - u32x w[16]; - - w[ 0] = w0[0]; - w[ 1] = w0[1]; - w[ 2] = w0[2]; - w[ 3] = w0[3]; - w[ 4] = w1[0]; - w[ 5] = w1[1]; - w[ 6] = w1[2]; - w[ 7] = w1[3]; - w[ 8] = 0; - w[ 9] = 0; - w[10] = 0; - w[11] = 0; - w[12] = 0; - w[13] = 0; - w[14] = 0; - w[15] = 0; - u32x state[4]; state[0] = 0; @@ -585,24 +497,9 @@ __kernel void m08600_s04 (__global pw_t *pws, __global kernel_rule_t *rules_buf, * padding */ - if (pw_len < 16) - { - pad (&w[ 0], pw_len & 0xf); - } - else if (pw_len < 32) - { - pad (&w[ 4], pw_len & 0xf); - } - else if (pw_len < 48) - { - pad (&w[ 8], pw_len & 0xf); - } - else if (pw_len < 64) - { - pad (&w[12], pw_len & 0xf); - } + pad (w0, pw_len); - domino_big_md (w, pw_len, state, s_lotus_magic_table); + domino_big_md (w0, pw_len, state, s_lotus_magic_table); COMPARE_S_SIMD (state[0], state[1], state[2], state[3]); } diff --git a/OpenCL/m08600_a3.cl b/OpenCL/m08600_a3.cl index 68643492a..c77019c91 100644 --- a/OpenCL/m08600_a3.cl +++ b/OpenCL/m08600_a3.cl @@ -119,16 +119,16 @@ void pad (u32 w[4], const u32 len) const u32 mask1 = val << 24; const u32 mask2 = val << 16 - | val << 24; + | val << 24; const u32 mask3 = val << 8 - | val << 16 - | val << 24; + | val << 16 + | val << 24; const u32 mask4 = val << 0 - | val << 8 - | val << 16 - | val << 24; + | val << 8 + | val << 16 + | val << 24; switch (len) { @@ -223,7 +223,7 @@ void mdtransform (u32x state[4], u32x checksum[4], u32x block[4], __local u32 *s lotus_transform_password (block, checksum, s_lotus_magic_table); } -void domino_big_md (const u32x saved_key[16], const u32 size, u32x state[4], __local u32 *s_lotus_magic_table) +void domino_big_md (const u32x saved_key[4], const u32 size, u32x state[4], __local u32 *s_lotus_magic_table) { u32x checksum[4]; @@ -232,32 +232,7 @@ void domino_big_md (const u32x saved_key[16], const u32 size, u32x state[4], __l checksum[2] = 0; checksum[3] = 0; - u32x block[4]; - - block[0] = 0; - block[1] = 0; - block[2] = 0; - block[3] = 0; - - u32 curpos; - u32 idx; - - for (curpos = 0, idx = 0; curpos + 16 < size; curpos += 16, idx += 4) - { - block[0] = saved_key[idx + 0]; - block[1] = saved_key[idx + 1]; - block[2] = saved_key[idx + 2]; - block[3] = saved_key[idx + 3]; - - mdtransform (state, checksum, block, s_lotus_magic_table); - } - - block[0] = saved_key[idx + 0]; - block[1] = saved_key[idx + 1]; - block[2] = saved_key[idx + 2]; - block[3] = saved_key[idx + 3]; - - mdtransform (state, checksum, block, s_lotus_magic_table); + mdtransform (state, checksum, saved_key, s_lotus_magic_table); mdtransform_norecalc (state, checksum, s_lotus_magic_table); } @@ -275,22 +250,7 @@ void m08600m (__local u32 *s_lotus_magic_table, u32 w[16], const u32 pw_len, __g * base */ - if (pw_len < 16) - { - pad (&w[ 0], pw_len & 0xf); - } - else if (pw_len < 32) - { - pad (&w[ 4], pw_len & 0xf); - } - else if (pw_len < 48) - { - pad (&w[ 8], pw_len & 0xf); - } - else if (pw_len < 64) - { - pad (&w[12], pw_len & 0xf); - } + pad (&w[ 0], pw_len); /** * loop @@ -304,24 +264,12 @@ void m08600m (__local u32 *s_lotus_magic_table, u32 w[16], const u32 pw_len, __g const u32x w0lr = w0l | w0r; - u32x w_t[16]; + u32x w_t[4]; - w_t[ 0] = w0lr; - w_t[ 1] = w[ 1]; - w_t[ 2] = w[ 2]; - w_t[ 3] = w[ 3]; - w_t[ 4] = w[ 4]; - w_t[ 5] = w[ 5]; - w_t[ 6] = w[ 6]; - w_t[ 7] = w[ 7]; - w_t[ 8] = w[ 8]; - w_t[ 9] = w[ 9]; - w_t[10] = w[10]; - w_t[11] = w[11]; - w_t[12] = w[12]; - w_t[13] = w[13]; - w_t[14] = w[14]; - w_t[15] = w[15]; + w_t[0] = w0lr; + w_t[1] = w[ 1]; + w_t[2] = w[ 2]; + w_t[3] = w[ 3]; u32x state[4]; @@ -349,22 +297,7 @@ void m08600s (__local u32 *s_lotus_magic_table, u32 w[16], const u32 pw_len, __g * base */ - if (pw_len < 16) - { - pad (&w[ 0], pw_len & 0xf); - } - else if (pw_len < 32) - { - pad (&w[ 4], pw_len & 0xf); - } - else if (pw_len < 48) - { - pad (&w[ 8], pw_len & 0xf); - } - else if (pw_len < 64) - { - pad (&w[12], pw_len & 0xf); - } + pad (&w[0], pw_len); /** * digest @@ -390,24 +323,12 @@ void m08600s (__local u32 *s_lotus_magic_table, u32 w[16], const u32 pw_len, __g const u32x w0lr = w0l | w0r; - u32x w_t[16]; + u32x w_t[4]; - w_t[ 0] = w0lr; - w_t[ 1] = w[ 1]; - w_t[ 2] = w[ 2]; - w_t[ 3] = w[ 3]; - w_t[ 4] = w[ 4]; - w_t[ 5] = w[ 5]; - w_t[ 6] = w[ 6]; - w_t[ 7] = w[ 7]; - w_t[ 8] = w[ 8]; - w_t[ 9] = w[ 9]; - w_t[10] = w[10]; - w_t[11] = w[11]; - w_t[12] = w[12]; - w_t[13] = w[13]; - w_t[14] = w[14]; - w_t[15] = w[15]; + w_t[0] = w0lr; + w_t[1] = w[ 1]; + w_t[2] = w[ 2]; + w_t[3] = w[ 3]; u32x state[4]; From e279e0c2b3b30cd1cd66f40f85644c6c23ecf230 Mon Sep 17 00:00:00 2001 From: jsteube Date: Thu, 26 May 2016 19:47:01 +0200 Subject: [PATCH 18/18] Improve GOST R 34.11-2012 (Streebog) speed --- OpenCL/m11700_a3.cl | 15 +++------------ OpenCL/m11800_a3.cl | 15 +++------------ 2 files changed, 6 insertions(+), 24 deletions(-) diff --git a/OpenCL/m11700_a3.cl b/OpenCL/m11700_a3.cl index 0224f23d3..a62ad73ae 100644 --- a/OpenCL/m11700_a3.cl +++ b/OpenCL/m11700_a3.cl @@ -2248,22 +2248,19 @@ void streebog_g (u64x h[8], const u64x m[8], __local u64 (*s_sbob_sl64)[256]) u64x s[8]; u64x t[8]; - #ifdef _unroll - #pragma unroll - #endif for (int i = 0; i < 8; i++) { t[i] = h[i]; } + #ifdef _unroll + #pragma unroll + #endif for (int i = 0; i < 8; i++) { k[i] = SBOG_LPSti64; } - #ifdef _unroll - #pragma unroll - #endif for (int i = 0; i < 8; i++) { s[i] = m[i]; @@ -2271,9 +2268,6 @@ void streebog_g (u64x h[8], const u64x m[8], __local u64 (*s_sbob_sl64)[256]) for (int r = 0; r < 12; r++) { - #ifdef _unroll - #pragma unroll - #endif for (int i = 0; i < 8; i++) { t[i] = s[i] ^ k[i]; @@ -2301,9 +2295,6 @@ void streebog_g (u64x h[8], const u64x m[8], __local u64 (*s_sbob_sl64)[256]) } } - #ifdef _unroll - #pragma unroll - #endif for (int i = 0; i < 8; i++) { h[i] ^= s[i] ^ k[i] ^ m[i]; diff --git a/OpenCL/m11800_a3.cl b/OpenCL/m11800_a3.cl index 4ef9bb004..5dd6c991e 100644 --- a/OpenCL/m11800_a3.cl +++ b/OpenCL/m11800_a3.cl @@ -2248,22 +2248,19 @@ void streebog_g (u64x h[8], const u64x m[8], __local u64 (*s_sbob_sl64)[256]) u64x s[8]; u64x t[8]; - #ifdef _unroll - #pragma unroll - #endif for (int i = 0; i < 8; i++) { t[i] = h[i]; } + #ifdef _unroll + #pragma unroll + #endif for (int i = 0; i < 8; i++) { k[i] = SBOG_LPSti64; } - #ifdef _unroll - #pragma unroll - #endif for (int i = 0; i < 8; i++) { s[i] = m[i]; @@ -2271,9 +2268,6 @@ void streebog_g (u64x h[8], const u64x m[8], __local u64 (*s_sbob_sl64)[256]) for (int r = 0; r < 12; r++) { - #ifdef _unroll - #pragma unroll - #endif for (int i = 0; i < 8; i++) { t[i] = s[i] ^ k[i]; @@ -2301,9 +2295,6 @@ void streebog_g (u64x h[8], const u64x m[8], __local u64 (*s_sbob_sl64)[256]) } } - #ifdef _unroll - #pragma unroll - #endif for (int i = 0; i < 8; i++) { h[i] ^= s[i] ^ k[i] ^ m[i];