From 23ab78f333f5e9d9d4b60feb3ca632857f76e2b6 Mon Sep 17 00:00:00 2001 From: Gabriele Gristina Date: Sat, 7 Jun 2025 02:29:44 +0200 Subject: [PATCH] fix salsa_r() for Apple Metal --- OpenCL/m08900-pure.cl | 6 +++--- OpenCL/m15700-pure.cl | 6 +++--- OpenCL/m22700-pure.cl | 6 +++--- OpenCL/m24000-pure.cl | 6 +++--- OpenCL/m27700-pure.cl | 6 +++--- OpenCL/m28200-pure.cl | 6 +++--- OpenCL/m29800-pure.cl | 6 +++--- 7 files changed, 21 insertions(+), 21 deletions(-) diff --git a/OpenCL/m08900-pure.cl b/OpenCL/m08900-pure.cl index a16e80f9a..884e24359 100644 --- a/OpenCL/m08900-pure.cl +++ b/OpenCL/m08900-pure.cl @@ -221,7 +221,7 @@ DECLSPEC void scrypt_smix_init (PRIVATE_AS uint4 *X, GLOBAL_AS uint4 *V0, GLOBAL { for (u32 z = 0; z < zSIZE; z++) V[CO] = X[z]; - for (u32 i = 0; i < SCRYPT_TMTO; i++) salsa_r ((u32 *) X); + for (u32 i = 0; i < SCRYPT_TMTO; i++) salsa_r ((PRIVATE_AS u32 *) X); } } @@ -259,11 +259,11 @@ DECLSPEC void scrypt_smix_loop (PRIVATE_AS uint4 *X, GLOBAL_AS uint4 *V0, GLOBAL for (u32 z = 0; z < zSIZE; z++) T[z] = V[CO]; - for (u32 i = 0; i < km; i++) salsa_r ((u32 *) T); + for (u32 i = 0; i < km; i++) salsa_r ((PRIVATE_AS u32 *) T); for (u32 z = 0; z < zSIZE; z++) X[z] ^= T[z]; - salsa_r ((u32 *) X); + salsa_r ((PRIVATE_AS u32 *) X); } } diff --git a/OpenCL/m15700-pure.cl b/OpenCL/m15700-pure.cl index 277b3d729..1010a5e8b 100644 --- a/OpenCL/m15700-pure.cl +++ b/OpenCL/m15700-pure.cl @@ -252,7 +252,7 @@ DECLSPEC void scrypt_smix_init (PRIVATE_AS uint4 *X, GLOBAL_AS uint4 *V0, GLOBAL { for (u32 z = 0; z < zSIZE; z++) V[CO] = X[z]; - for (u32 i = 0; i < SCRYPT_TMTO; i++) salsa_r ((u32 *) X); + for (u32 i = 0; i < SCRYPT_TMTO; i++) salsa_r ((PRIVATE_AS u32 *) X); } } @@ -290,11 +290,11 @@ DECLSPEC void scrypt_smix_loop (PRIVATE_AS uint4 *X, GLOBAL_AS uint4 *V0, GLOBAL for (u32 z = 0; z < zSIZE; z++) T[z] = V[CO]; - for (u32 i = 0; i < km; i++) salsa_r ((u32 *) T); + for (u32 i = 0; i < km; i++) salsa_r ((PRIVATE_AS u32 *) T); for (u32 z = 0; z < zSIZE; z++) X[z] ^= T[z]; - salsa_r ((u32 *) X); + salsa_r ((PRIVATE_AS u32 *) X); } } diff --git a/OpenCL/m22700-pure.cl b/OpenCL/m22700-pure.cl index 291e44acc..6cc6817e4 100644 --- a/OpenCL/m22700-pure.cl +++ b/OpenCL/m22700-pure.cl @@ -269,7 +269,7 @@ DECLSPEC void scrypt_smix_init (PRIVATE_AS uint4 *X, GLOBAL_AS uint4 *V0, GLOBAL { for (u32 z = 0; z < zSIZE; z++) V[CO] = X[z]; - for (u32 i = 0; i < SCRYPT_TMTO; i++) salsa_r ((u32 *) X); + for (u32 i = 0; i < SCRYPT_TMTO; i++) salsa_r ((PRIVATE_AS u32 *) X); } } @@ -307,11 +307,11 @@ DECLSPEC void scrypt_smix_loop (PRIVATE_AS uint4 *X, GLOBAL_AS uint4 *V0, GLOBAL for (u32 z = 0; z < zSIZE; z++) T[z] = V[CO]; - for (u32 i = 0; i < km; i++) salsa_r ((u32 *) T); + for (u32 i = 0; i < km; i++) salsa_r ((PRIVATE_AS u32 *) T); for (u32 z = 0; z < zSIZE; z++) X[z] ^= T[z]; - salsa_r ((u32 *) X); + salsa_r ((PRIVATE_AS u32 *) X); } } diff --git a/OpenCL/m24000-pure.cl b/OpenCL/m24000-pure.cl index 77afe5ef5..7d1dce20d 100644 --- a/OpenCL/m24000-pure.cl +++ b/OpenCL/m24000-pure.cl @@ -257,7 +257,7 @@ DECLSPEC void scrypt_smix (PRIVATE_AS uint4 *X, PRIVATE_AS uint4 *T, GLOBAL_AS u { for (u32 z = 0; z < zSIZE; z++) V[CO] = X[z]; - for (u32 i = 0; i < SCRYPT_TMTO; i++) salsa_r ((u32 *) X); + for (u32 i = 0; i < SCRYPT_TMTO; i++) salsa_r ((PRIVATE_AS u32 *) X); } for (u32 i = 0; i < SCRYPT_N; i++) @@ -270,11 +270,11 @@ DECLSPEC void scrypt_smix (PRIVATE_AS uint4 *X, PRIVATE_AS uint4 *T, GLOBAL_AS u for (u32 z = 0; z < zSIZE; z++) T[z] = V[CO]; - for (u32 i = 0; i < km; i++) salsa_r ((u32 *) T); + for (u32 i = 0; i < km; i++) salsa_r ((PRIVATE_AS u32 *) T); for (u32 z = 0; z < zSIZE; z++) X[z] ^= T[z]; - salsa_r ((u32 *) X); + salsa_r ((PRIVATE_AS u32 *) X); } #ifdef _unroll diff --git a/OpenCL/m27700-pure.cl b/OpenCL/m27700-pure.cl index 42ee0974d..c9f0bb42f 100644 --- a/OpenCL/m27700-pure.cl +++ b/OpenCL/m27700-pure.cl @@ -219,7 +219,7 @@ DECLSPEC void scrypt_smix_init (PRIVATE_AS uint4 *X, GLOBAL_AS uint4 *V0, GLOBAL { for (u32 z = 0; z < zSIZE; z++) V[CO] = X[z]; - for (u32 i = 0; i < SCRYPT_TMTO; i++) salsa_r ((u32 *) X); + for (u32 i = 0; i < SCRYPT_TMTO; i++) salsa_r ((PRIVATE_AS u32 *) X); } } @@ -257,11 +257,11 @@ DECLSPEC void scrypt_smix_loop (PRIVATE_AS uint4 *X, GLOBAL_AS uint4 *V0, GLOBAL for (u32 z = 0; z < zSIZE; z++) T[z] = V[CO]; - for (u32 i = 0; i < km; i++) salsa_r ((u32 *) T); + for (u32 i = 0; i < km; i++) salsa_r ((PRIVATE_AS u32 *) T); for (u32 z = 0; z < zSIZE; z++) X[z] ^= T[z]; - salsa_r ((u32 *) X); + salsa_r ((PRIVATE_AS u32 *) X); } } diff --git a/OpenCL/m28200-pure.cl b/OpenCL/m28200-pure.cl index 49774658c..8e307765c 100644 --- a/OpenCL/m28200-pure.cl +++ b/OpenCL/m28200-pure.cl @@ -231,7 +231,7 @@ DECLSPEC void scrypt_smix_init (PRIVATE_AS uint4 *X, GLOBAL_AS uint4 *V0, GLOBAL { for (u32 z = 0; z < zSIZE; z++) V[CO] = X[z]; - for (u32 i = 0; i < SCRYPT_TMTO; i++) salsa_r ((u32 *) X); + for (u32 i = 0; i < SCRYPT_TMTO; i++) salsa_r ((PRIVATE_AS u32 *) X); } } @@ -269,11 +269,11 @@ DECLSPEC void scrypt_smix_loop (PRIVATE_AS uint4 *X, GLOBAL_AS uint4 *V0, GLOBAL for (u32 z = 0; z < zSIZE; z++) T[z] = V[CO]; - for (u32 i = 0; i < km; i++) salsa_r ((u32 *) T); + for (u32 i = 0; i < km; i++) salsa_r ((PRIVATE_AS u32 *) T); for (u32 z = 0; z < zSIZE; z++) X[z] ^= T[z]; - salsa_r ((u32 *) X); + salsa_r ((PRIVATE_AS u32 *) X); } } diff --git a/OpenCL/m29800-pure.cl b/OpenCL/m29800-pure.cl index 114c97a82..98f582673 100644 --- a/OpenCL/m29800-pure.cl +++ b/OpenCL/m29800-pure.cl @@ -219,7 +219,7 @@ DECLSPEC void scrypt_smix_init (PRIVATE_AS uint4 *X, GLOBAL_AS uint4 *V0, GLOBAL { for (u32 z = 0; z < zSIZE; z++) V[CO] = X[z]; - for (u32 i = 0; i < SCRYPT_TMTO; i++) salsa_r ((u32 *) X); + for (u32 i = 0; i < SCRYPT_TMTO; i++) salsa_r ((PRIVATE_AS u32 *) X); } } @@ -257,11 +257,11 @@ DECLSPEC void scrypt_smix_loop (PRIVATE_AS uint4 *X, GLOBAL_AS uint4 *V0, GLOBAL for (u32 z = 0; z < zSIZE; z++) T[z] = V[CO]; - for (u32 i = 0; i < km; i++) salsa_r ((u32 *) T); + for (u32 i = 0; i < km; i++) salsa_r ((PRIVATE_AS u32 *) T); for (u32 z = 0; z < zSIZE; z++) X[z] ^= T[z]; - salsa_r ((u32 *) X); + salsa_r ((PRIVATE_AS u32 *) X); } }