From 02e160c250ba2d305583bd6a8f217570b47e53f2 Mon Sep 17 00:00:00 2001 From: Gabriele Gristina Date: Thu, 4 May 2023 22:09:14 +0200 Subject: [PATCH] Fixed build failed for 4410 with vector width > 1 --- OpenCL/m04410_a0-optimized.cl | 16 ++++++++-------- OpenCL/m04410_a1-optimized.cl | 16 ++++++++-------- OpenCL/m04410_a3-optimized.cl | 16 ++++++++-------- docs/changes.txt | 1 + 4 files changed, 25 insertions(+), 24 deletions(-) diff --git a/OpenCL/m04410_a0-optimized.cl b/OpenCL/m04410_a0-optimized.cl index c7be39b39..191e1eddf 100644 --- a/OpenCL/m04410_a0-optimized.cl +++ b/OpenCL/m04410_a0-optimized.cl @@ -641,10 +641,10 @@ KERNEL_FQ void m04410_m04 (KERN_ATTR_RULES ()) MD5_STEP (MD5_I , c, d, a, b, w2_t, MD5C3e, MD5S32); MD5_STEP (MD5_I , b, c, d, a, w9_t, MD5C3f, MD5S33); - a += digest[0] - MD5M_A; - b += digest[1] - MD5M_B; - c += digest[2] - MD5M_C; - d += digest[3] - MD5M_D; + a += digest[0] - make_u32x (MD5M_A); + b += digest[1] - make_u32x (MD5M_B); + c += digest[2] - make_u32x (MD5M_C); + d += digest[3] - make_u32x (MD5M_D); COMPARE_M_SIMD (a, d, c, b); } @@ -1285,10 +1285,10 @@ KERNEL_FQ void m04410_s04 (KERN_ATTR_RULES ()) MD5_STEP (MD5_I , c, d, a, b, w2_t, MD5C3e, MD5S32); MD5_STEP (MD5_I , b, c, d, a, w9_t, MD5C3f, MD5S33); - a += digest[0] - MD5M_A; - b += digest[1] - MD5M_B; - c += digest[2] - MD5M_C; - d += digest[3] - MD5M_D; + a += digest[0] - make_u32x (MD5M_A); + b += digest[1] - make_u32x (MD5M_B); + c += digest[2] - make_u32x (MD5M_C); + d += digest[3] - make_u32x (MD5M_D); COMPARE_S_SIMD (a, d, c, b); } diff --git a/OpenCL/m04410_a1-optimized.cl b/OpenCL/m04410_a1-optimized.cl index 61a14f34c..813ad365d 100644 --- a/OpenCL/m04410_a1-optimized.cl +++ b/OpenCL/m04410_a1-optimized.cl @@ -697,10 +697,10 @@ KERNEL_FQ void m04410_m04 (KERN_ATTR_BASIC ()) MD5_STEP (MD5_I , c, d, a, b, w2_t, MD5C3e, MD5S32); MD5_STEP (MD5_I , b, c, d, a, w9_t, MD5C3f, MD5S33); - a += digest[0] - MD5M_A; - b += digest[1] - MD5M_B; - c += digest[2] - MD5M_C; - d += digest[3] - MD5M_D; + a += digest[0] - make_u32x (MD5M_A); + b += digest[1] - make_u32x (MD5M_B); + c += digest[2] - make_u32x (MD5M_C); + d += digest[3] - make_u32x (MD5M_D); COMPARE_M_SIMD (a, d, c, b); } @@ -1399,10 +1399,10 @@ KERNEL_FQ void m04410_s04 (KERN_ATTR_BASIC ()) MD5_STEP (MD5_I , c, d, a, b, w2_t, MD5C3e, MD5S32); MD5_STEP (MD5_I , b, c, d, a, w9_t, MD5C3f, MD5S33); - a += digest[0] - MD5M_A; - b += digest[1] - MD5M_B; - c += digest[2] - MD5M_C; - d += digest[3] - MD5M_D; + a += digest[0] - make_u32x (MD5M_A); + b += digest[1] - make_u32x (MD5M_B); + c += digest[2] - make_u32x (MD5M_C); + d += digest[3] - make_u32x (MD5M_D); COMPARE_S_SIMD (a, d, c, b); } diff --git a/OpenCL/m04410_a3-optimized.cl b/OpenCL/m04410_a3-optimized.cl index 231fa0f1e..584999c7e 100644 --- a/OpenCL/m04410_a3-optimized.cl +++ b/OpenCL/m04410_a3-optimized.cl @@ -595,10 +595,10 @@ DECLSPEC void m04410m (PRIVATE_AS u32 *w0, PRIVATE_AS u32 *w1, PRIVATE_AS u32 *w MD5_STEP (MD5_I , c, d, a, b, w2_t, MD5C3e, MD5S32); MD5_STEP (MD5_I , b, c, d, a, w9_t, MD5C3f, MD5S33); - a += digest[0] - MD5M_A; - b += digest[1] - MD5M_B; - c += digest[2] - MD5M_C; - d += digest[3] - MD5M_D; + a += digest[0] - make_u32x (MD5M_A); + b += digest[1] - make_u32x (MD5M_B); + c += digest[2] - make_u32x (MD5M_C); + d += digest[3] - make_u32x (MD5M_D); COMPARE_M_SIMD (a, d, c, b); } @@ -1187,10 +1187,10 @@ DECLSPEC void m04410s (PRIVATE_AS u32 *w0, PRIVATE_AS u32 *w1, PRIVATE_AS u32 *w MD5_STEP (MD5_I , c, d, a, b, w2_t, MD5C3e, MD5S32); MD5_STEP (MD5_I , b, c, d, a, w9_t, MD5C3f, MD5S33); - a += digest[0] - MD5M_A; - b += digest[1] - MD5M_B; - c += digest[2] - MD5M_C; - d += digest[3] - MD5M_D; + a += digest[0] - make_u32x (MD5M_A); + b += digest[1] - make_u32x (MD5M_B); + c += digest[2] - make_u32x (MD5M_C); + d += digest[3] - make_u32x (MD5M_D); COMPARE_S_SIMD (a, d, c, b); } diff --git a/docs/changes.txt b/docs/changes.txt index 47004a43b..2dad2cac5 100644 --- a/docs/changes.txt +++ b/docs/changes.txt @@ -56,6 +56,7 @@ - Fixed bug in 26900 module_hash_encode - Fixed bug in grep out-of-memory workaround on Unit Test - Fixed bug in input_tokenizer when TOKEN_ATTR_FIXED_LENGTH is used and refactor modules +- Fixed build failed for 4410 with vector width > 1 - Fixed build failed for 18400 with Apple Metal - Fixed build failed for 18600 with Apple Metal - Fixed build failed for 31700 with Apple Metal