From c1d5d2ff45d452eac5815cfdb834cbe8bfd17b03 Mon Sep 17 00:00:00 2001 From: jsteube Date: Fri, 22 Mar 2019 12:58:56 +0100 Subject: [PATCH] Improve grouping of include calls as a preparation --- OpenCL/m06211-pure.cl | 1 - OpenCL/m06212-pure.cl | 1 - OpenCL/m06213-pure.cl | 1 - OpenCL/m06221-pure.cl | 1 - OpenCL/m06222-pure.cl | 1 - OpenCL/m06223-pure.cl | 1 - OpenCL/m06231-pure.cl | 1 - OpenCL/m06232-pure.cl | 1 - OpenCL/m06233-pure.cl | 1 - OpenCL/m13711-pure.cl | 1 - OpenCL/m13712-pure.cl | 1 - OpenCL/m13713-pure.cl | 1 - OpenCL/m13721-pure.cl | 1 - OpenCL/m13722-pure.cl | 1 - OpenCL/m13723-pure.cl | 1 - OpenCL/m13731-pure.cl | 1 - OpenCL/m13732-pure.cl | 1 - OpenCL/m13733-pure.cl | 1 - OpenCL/m13751-pure.cl | 1 - OpenCL/m13752-pure.cl | 1 - OpenCL/m13753-pure.cl | 1 - OpenCL/m13771-pure.cl | 1 - OpenCL/m13772-pure.cl | 1 - OpenCL/m13773-pure.cl | 1 - OpenCL/m14611-pure.cl | 1 - OpenCL/m14612-pure.cl | 1 - OpenCL/m14613-pure.cl | 1 - OpenCL/m14621-pure.cl | 1 - OpenCL/m14622-pure.cl | 1 - OpenCL/m14623-pure.cl | 1 - OpenCL/m14631-pure.cl | 1 - OpenCL/m14632-pure.cl | 1 - OpenCL/m14633-pure.cl | 1 - OpenCL/m14641-pure.cl | 1 - OpenCL/m14642-pure.cl | 1 - OpenCL/m14643-pure.cl | 1 - OpenCL/markov_be.cl | 3 +-- OpenCL/markov_le.cl | 3 +-- 38 files changed, 2 insertions(+), 40 deletions(-) diff --git a/OpenCL/m06211-pure.cl b/OpenCL/m06211-pure.cl index 8e32a55f6..82c7f0016 100644 --- a/OpenCL/m06211-pure.cl +++ b/OpenCL/m06211-pure.cl @@ -10,7 +10,6 @@ #include "inc_common.cl" #include "inc_simd.cl" #include "inc_hash_ripemd160.cl" - #include "inc_cipher_aes.cl" #include "inc_cipher_twofish.cl" #include "inc_cipher_serpent.cl" diff --git a/OpenCL/m06212-pure.cl b/OpenCL/m06212-pure.cl index f3f28f6cb..bccf601d3 100644 --- a/OpenCL/m06212-pure.cl +++ b/OpenCL/m06212-pure.cl @@ -10,7 +10,6 @@ #include "inc_common.cl" #include "inc_simd.cl" #include "inc_hash_ripemd160.cl" - #include "inc_cipher_aes.cl" #include "inc_cipher_twofish.cl" #include "inc_cipher_serpent.cl" diff --git a/OpenCL/m06213-pure.cl b/OpenCL/m06213-pure.cl index 3e64a1fd7..2e24921e4 100644 --- a/OpenCL/m06213-pure.cl +++ b/OpenCL/m06213-pure.cl @@ -10,7 +10,6 @@ #include "inc_common.cl" #include "inc_simd.cl" #include "inc_hash_ripemd160.cl" - #include "inc_cipher_aes.cl" #include "inc_cipher_twofish.cl" #include "inc_cipher_serpent.cl" diff --git a/OpenCL/m06221-pure.cl b/OpenCL/m06221-pure.cl index 061be6518..081029f95 100644 --- a/OpenCL/m06221-pure.cl +++ b/OpenCL/m06221-pure.cl @@ -10,7 +10,6 @@ #include "inc_common.cl" #include "inc_simd.cl" #include "inc_hash_sha512.cl" - #include "inc_cipher_aes.cl" #include "inc_cipher_twofish.cl" #include "inc_cipher_serpent.cl" diff --git a/OpenCL/m06222-pure.cl b/OpenCL/m06222-pure.cl index ddc939aa4..c42611643 100644 --- a/OpenCL/m06222-pure.cl +++ b/OpenCL/m06222-pure.cl @@ -10,7 +10,6 @@ #include "inc_common.cl" #include "inc_simd.cl" #include "inc_hash_sha512.cl" - #include "inc_cipher_aes.cl" #include "inc_cipher_twofish.cl" #include "inc_cipher_serpent.cl" diff --git a/OpenCL/m06223-pure.cl b/OpenCL/m06223-pure.cl index c277f70c4..9b3bc8fcc 100644 --- a/OpenCL/m06223-pure.cl +++ b/OpenCL/m06223-pure.cl @@ -10,7 +10,6 @@ #include "inc_common.cl" #include "inc_simd.cl" #include "inc_hash_sha512.cl" - #include "inc_cipher_aes.cl" #include "inc_cipher_twofish.cl" #include "inc_cipher_serpent.cl" diff --git a/OpenCL/m06231-pure.cl b/OpenCL/m06231-pure.cl index 21db47453..c680d6712 100644 --- a/OpenCL/m06231-pure.cl +++ b/OpenCL/m06231-pure.cl @@ -10,7 +10,6 @@ #include "inc_common.cl" #include "inc_simd.cl" #include "inc_hash_whirlpool.cl" - #include "inc_cipher_aes.cl" #include "inc_cipher_twofish.cl" #include "inc_cipher_serpent.cl" diff --git a/OpenCL/m06232-pure.cl b/OpenCL/m06232-pure.cl index e0767c370..fc3a75884 100644 --- a/OpenCL/m06232-pure.cl +++ b/OpenCL/m06232-pure.cl @@ -10,7 +10,6 @@ #include "inc_common.cl" #include "inc_simd.cl" #include "inc_hash_whirlpool.cl" - #include "inc_cipher_aes.cl" #include "inc_cipher_twofish.cl" #include "inc_cipher_serpent.cl" diff --git a/OpenCL/m06233-pure.cl b/OpenCL/m06233-pure.cl index ab9f5dbcf..7f4c51d6b 100644 --- a/OpenCL/m06233-pure.cl +++ b/OpenCL/m06233-pure.cl @@ -10,7 +10,6 @@ #include "inc_common.cl" #include "inc_simd.cl" #include "inc_hash_whirlpool.cl" - #include "inc_cipher_aes.cl" #include "inc_cipher_twofish.cl" #include "inc_cipher_serpent.cl" diff --git a/OpenCL/m13711-pure.cl b/OpenCL/m13711-pure.cl index 447c1b74d..20aa31b36 100644 --- a/OpenCL/m13711-pure.cl +++ b/OpenCL/m13711-pure.cl @@ -13,7 +13,6 @@ #include "inc_common.cl" #include "inc_simd.cl" #include "inc_hash_ripemd160.cl" - #include "inc_cipher_aes.cl" #include "inc_cipher_twofish.cl" #include "inc_cipher_serpent.cl" diff --git a/OpenCL/m13712-pure.cl b/OpenCL/m13712-pure.cl index b085aebbc..82cd300cb 100644 --- a/OpenCL/m13712-pure.cl +++ b/OpenCL/m13712-pure.cl @@ -13,7 +13,6 @@ #include "inc_common.cl" #include "inc_simd.cl" #include "inc_hash_ripemd160.cl" - #include "inc_cipher_aes.cl" #include "inc_cipher_twofish.cl" #include "inc_cipher_serpent.cl" diff --git a/OpenCL/m13713-pure.cl b/OpenCL/m13713-pure.cl index 470b93d50..c2aab8f1c 100644 --- a/OpenCL/m13713-pure.cl +++ b/OpenCL/m13713-pure.cl @@ -13,7 +13,6 @@ #include "inc_common.cl" #include "inc_simd.cl" #include "inc_hash_ripemd160.cl" - #include "inc_cipher_aes.cl" #include "inc_cipher_twofish.cl" #include "inc_cipher_serpent.cl" diff --git a/OpenCL/m13721-pure.cl b/OpenCL/m13721-pure.cl index bdb9cc543..642c38c3d 100644 --- a/OpenCL/m13721-pure.cl +++ b/OpenCL/m13721-pure.cl @@ -13,7 +13,6 @@ #include "inc_common.cl" #include "inc_simd.cl" #include "inc_hash_sha512.cl" - #include "inc_cipher_aes.cl" #include "inc_cipher_twofish.cl" #include "inc_cipher_serpent.cl" diff --git a/OpenCL/m13722-pure.cl b/OpenCL/m13722-pure.cl index e60ee7d9e..e76fa4071 100644 --- a/OpenCL/m13722-pure.cl +++ b/OpenCL/m13722-pure.cl @@ -13,7 +13,6 @@ #include "inc_common.cl" #include "inc_simd.cl" #include "inc_hash_sha512.cl" - #include "inc_cipher_aes.cl" #include "inc_cipher_twofish.cl" #include "inc_cipher_serpent.cl" diff --git a/OpenCL/m13723-pure.cl b/OpenCL/m13723-pure.cl index a02e960ce..805e39e2c 100644 --- a/OpenCL/m13723-pure.cl +++ b/OpenCL/m13723-pure.cl @@ -13,7 +13,6 @@ #include "inc_common.cl" #include "inc_simd.cl" #include "inc_hash_sha512.cl" - #include "inc_cipher_aes.cl" #include "inc_cipher_twofish.cl" #include "inc_cipher_serpent.cl" diff --git a/OpenCL/m13731-pure.cl b/OpenCL/m13731-pure.cl index 300d32bdb..be2babb8b 100644 --- a/OpenCL/m13731-pure.cl +++ b/OpenCL/m13731-pure.cl @@ -13,7 +13,6 @@ #include "inc_common.cl" #include "inc_simd.cl" #include "inc_hash_whirlpool.cl" - #include "inc_cipher_aes.cl" #include "inc_cipher_twofish.cl" #include "inc_cipher_serpent.cl" diff --git a/OpenCL/m13732-pure.cl b/OpenCL/m13732-pure.cl index b36847b9d..8b4b379aa 100644 --- a/OpenCL/m13732-pure.cl +++ b/OpenCL/m13732-pure.cl @@ -13,7 +13,6 @@ #include "inc_common.cl" #include "inc_simd.cl" #include "inc_hash_whirlpool.cl" - #include "inc_cipher_aes.cl" #include "inc_cipher_twofish.cl" #include "inc_cipher_serpent.cl" diff --git a/OpenCL/m13733-pure.cl b/OpenCL/m13733-pure.cl index e3d39581c..e882d13f8 100644 --- a/OpenCL/m13733-pure.cl +++ b/OpenCL/m13733-pure.cl @@ -13,7 +13,6 @@ #include "inc_common.cl" #include "inc_simd.cl" #include "inc_hash_whirlpool.cl" - #include "inc_cipher_aes.cl" #include "inc_cipher_twofish.cl" #include "inc_cipher_serpent.cl" diff --git a/OpenCL/m13751-pure.cl b/OpenCL/m13751-pure.cl index 59d09cae5..a255d94a5 100644 --- a/OpenCL/m13751-pure.cl +++ b/OpenCL/m13751-pure.cl @@ -13,7 +13,6 @@ #include "inc_common.cl" #include "inc_simd.cl" #include "inc_hash_sha256.cl" - #include "inc_cipher_aes.cl" #include "inc_cipher_twofish.cl" #include "inc_cipher_serpent.cl" diff --git a/OpenCL/m13752-pure.cl b/OpenCL/m13752-pure.cl index 41f2fe763..ec0ae2c85 100644 --- a/OpenCL/m13752-pure.cl +++ b/OpenCL/m13752-pure.cl @@ -13,7 +13,6 @@ #include "inc_common.cl" #include "inc_simd.cl" #include "inc_hash_sha256.cl" - #include "inc_cipher_aes.cl" #include "inc_cipher_twofish.cl" #include "inc_cipher_serpent.cl" diff --git a/OpenCL/m13753-pure.cl b/OpenCL/m13753-pure.cl index ec3207221..468a26625 100644 --- a/OpenCL/m13753-pure.cl +++ b/OpenCL/m13753-pure.cl @@ -13,7 +13,6 @@ #include "inc_common.cl" #include "inc_simd.cl" #include "inc_hash_sha256.cl" - #include "inc_cipher_aes.cl" #include "inc_cipher_twofish.cl" #include "inc_cipher_serpent.cl" diff --git a/OpenCL/m13771-pure.cl b/OpenCL/m13771-pure.cl index a530de435..27228fa20 100644 --- a/OpenCL/m13771-pure.cl +++ b/OpenCL/m13771-pure.cl @@ -13,7 +13,6 @@ #include "inc_common.cl" #include "inc_simd.cl" #include "inc_hash_streebog512.cl" - #include "inc_cipher_aes.cl" #include "inc_cipher_twofish.cl" #include "inc_cipher_serpent.cl" diff --git a/OpenCL/m13772-pure.cl b/OpenCL/m13772-pure.cl index 059228038..8cba6c2fc 100644 --- a/OpenCL/m13772-pure.cl +++ b/OpenCL/m13772-pure.cl @@ -13,7 +13,6 @@ #include "inc_common.cl" #include "inc_simd.cl" #include "inc_hash_streebog512.cl" - #include "inc_cipher_aes.cl" #include "inc_cipher_twofish.cl" #include "inc_cipher_serpent.cl" diff --git a/OpenCL/m13773-pure.cl b/OpenCL/m13773-pure.cl index a2be6b78b..46afa39db 100644 --- a/OpenCL/m13773-pure.cl +++ b/OpenCL/m13773-pure.cl @@ -13,7 +13,6 @@ #include "inc_common.cl" #include "inc_simd.cl" #include "inc_hash_streebog512.cl" - #include "inc_cipher_aes.cl" #include "inc_cipher_twofish.cl" #include "inc_cipher_serpent.cl" diff --git a/OpenCL/m14611-pure.cl b/OpenCL/m14611-pure.cl index 0a5a647ae..43dabdd73 100644 --- a/OpenCL/m14611-pure.cl +++ b/OpenCL/m14611-pure.cl @@ -83,7 +83,6 @@ typedef struct luks_tmp #include "inc_luks_af.cl" #include "inc_luks_essiv.cl" #include "inc_luks_xts.cl" - #include "inc_luks_aes.cl" #define COMPARE_S "inc_comp_single.cl" diff --git a/OpenCL/m14612-pure.cl b/OpenCL/m14612-pure.cl index cd57a4fce..ffd76e86c 100644 --- a/OpenCL/m14612-pure.cl +++ b/OpenCL/m14612-pure.cl @@ -83,7 +83,6 @@ typedef struct luks_tmp #include "inc_luks_af.cl" #include "inc_luks_essiv.cl" #include "inc_luks_xts.cl" - #include "inc_luks_serpent.cl" #define COMPARE_S "inc_comp_single.cl" diff --git a/OpenCL/m14613-pure.cl b/OpenCL/m14613-pure.cl index 23e5aff50..3e2f9ead0 100644 --- a/OpenCL/m14613-pure.cl +++ b/OpenCL/m14613-pure.cl @@ -83,7 +83,6 @@ typedef struct luks_tmp #include "inc_luks_af.cl" #include "inc_luks_essiv.cl" #include "inc_luks_xts.cl" - #include "inc_luks_twofish.cl" #define COMPARE_S "inc_comp_single.cl" diff --git a/OpenCL/m14621-pure.cl b/OpenCL/m14621-pure.cl index 8f4909a71..6ad7741d8 100644 --- a/OpenCL/m14621-pure.cl +++ b/OpenCL/m14621-pure.cl @@ -82,7 +82,6 @@ typedef struct luks_tmp #include "inc_luks_af.cl" #include "inc_luks_essiv.cl" #include "inc_luks_xts.cl" - #include "inc_luks_aes.cl" #define COMPARE_S "inc_comp_single.cl" diff --git a/OpenCL/m14622-pure.cl b/OpenCL/m14622-pure.cl index de363e06a..43ad60fe0 100644 --- a/OpenCL/m14622-pure.cl +++ b/OpenCL/m14622-pure.cl @@ -82,7 +82,6 @@ typedef struct luks_tmp #include "inc_luks_af.cl" #include "inc_luks_essiv.cl" #include "inc_luks_xts.cl" - #include "inc_luks_serpent.cl" #define COMPARE_S "inc_comp_single.cl" diff --git a/OpenCL/m14623-pure.cl b/OpenCL/m14623-pure.cl index d98c717af..768396085 100644 --- a/OpenCL/m14623-pure.cl +++ b/OpenCL/m14623-pure.cl @@ -82,7 +82,6 @@ typedef struct luks_tmp #include "inc_luks_af.cl" #include "inc_luks_essiv.cl" #include "inc_luks_xts.cl" - #include "inc_luks_twofish.cl" #define COMPARE_S "inc_comp_single.cl" diff --git a/OpenCL/m14631-pure.cl b/OpenCL/m14631-pure.cl index 3fd6b7765..3c9bb4de7 100644 --- a/OpenCL/m14631-pure.cl +++ b/OpenCL/m14631-pure.cl @@ -82,7 +82,6 @@ typedef struct luks_tmp #include "inc_luks_af.cl" #include "inc_luks_essiv.cl" #include "inc_luks_xts.cl" - #include "inc_luks_aes.cl" #define COMPARE_S "inc_comp_single.cl" diff --git a/OpenCL/m14632-pure.cl b/OpenCL/m14632-pure.cl index aff097e6b..05e9e4216 100644 --- a/OpenCL/m14632-pure.cl +++ b/OpenCL/m14632-pure.cl @@ -82,7 +82,6 @@ typedef struct luks_tmp #include "inc_luks_af.cl" #include "inc_luks_essiv.cl" #include "inc_luks_xts.cl" - #include "inc_luks_serpent.cl" #define COMPARE_S "inc_comp_single.cl" diff --git a/OpenCL/m14633-pure.cl b/OpenCL/m14633-pure.cl index 40b872c6c..85cf8a667 100644 --- a/OpenCL/m14633-pure.cl +++ b/OpenCL/m14633-pure.cl @@ -82,7 +82,6 @@ typedef struct luks_tmp #include "inc_luks_af.cl" #include "inc_luks_essiv.cl" #include "inc_luks_xts.cl" - #include "inc_luks_twofish.cl" #define COMPARE_S "inc_comp_single.cl" diff --git a/OpenCL/m14641-pure.cl b/OpenCL/m14641-pure.cl index 3f464caac..851aebff0 100644 --- a/OpenCL/m14641-pure.cl +++ b/OpenCL/m14641-pure.cl @@ -82,7 +82,6 @@ typedef struct luks_tmp #include "inc_luks_af.cl" #include "inc_luks_essiv.cl" #include "inc_luks_xts.cl" - #include "inc_luks_aes.cl" #define COMPARE_S "inc_comp_single.cl" diff --git a/OpenCL/m14642-pure.cl b/OpenCL/m14642-pure.cl index c2d5d9d28..be731fc7b 100644 --- a/OpenCL/m14642-pure.cl +++ b/OpenCL/m14642-pure.cl @@ -82,7 +82,6 @@ typedef struct luks_tmp #include "inc_luks_af.cl" #include "inc_luks_essiv.cl" #include "inc_luks_xts.cl" - #include "inc_luks_serpent.cl" #define COMPARE_S "inc_comp_single.cl" diff --git a/OpenCL/m14643-pure.cl b/OpenCL/m14643-pure.cl index 98e93c29e..a18d9a6c7 100644 --- a/OpenCL/m14643-pure.cl +++ b/OpenCL/m14643-pure.cl @@ -82,7 +82,6 @@ typedef struct luks_tmp #include "inc_luks_af.cl" #include "inc_luks_essiv.cl" #include "inc_luks_xts.cl" - #include "inc_luks_twofish.cl" #define COMPARE_S "inc_comp_single.cl" diff --git a/OpenCL/markov_be.cl b/OpenCL/markov_be.cl index e959451ce..d77355971 100644 --- a/OpenCL/markov_be.cl +++ b/OpenCL/markov_be.cl @@ -4,11 +4,10 @@ */ #include "inc_vendor.h" +#include "inc_types.h" #define CHARSIZ 256 -#include "inc_types.h" - DECLSPEC void generate_pw (u32 *pw_buf, __global const cs_t *root_css_buf, __global const cs_t *markov_css_buf, const u32 pw_l_len, const u32 pw_r_len, const u32 mask80, const u32 bits14, const u32 bits15, u64 val) { __global const cs_t *cs = &root_css_buf[pw_r_len]; diff --git a/OpenCL/markov_le.cl b/OpenCL/markov_le.cl index 5db422cc8..6d84e45f0 100644 --- a/OpenCL/markov_le.cl +++ b/OpenCL/markov_le.cl @@ -4,11 +4,10 @@ */ #include "inc_vendor.h" +#include "inc_types.h" #define CHARSIZ 256 -#include "inc_types.h" - DECLSPEC void generate_pw (u32 *pw_buf, __global const cs_t *root_css_buf, __global const cs_t *markov_css_buf, const u32 pw_l_len, const u32 pw_r_len, const u32 mask80, const u32 bits14, const u32 bits15, u64 val) { __global const cs_t *cs = &root_css_buf[pw_r_len];