Refactor yes(crypt|power) and k12/keccak code locations

MoneroOcean · Sep 23, 2020 · 2b68eb5 · 2b68eb5
1 parent 2c80bc6
commit 2b68eb5
Show file tree

Hide file tree

Showing 32 changed files with 76 additions and 254 deletions.
diff --git a/cmake/randomx.cmake b/cmake/randomx.cmake
@@ -40,12 +40,12 @@ if (WITH_RANDOMX)
         src/crypto/rx/RxDataset.cpp
         src/crypto/rx/RxQueue.cpp
         src/crypto/rx/RxVm.cpp
-        src/crypto/randomx/defyx/KangarooTwelve.c
-        src/crypto/randomx/defyx/KeccakP-1600-reference.c
-        src/crypto/randomx/defyx/KeccakSpongeWidth1600.c
-        src/crypto/randomx/defyx/yescrypt-best.c
-        src/crypto/randomx/panthera/sha256.c
-        src/crypto/randomx/panthera/yespower-opt.c
+        src/crypto/k12/KangarooTwelve.c
+        src/crypto/keccak/KeccakP-1600-reference.c
+        src/crypto/keccak/KeccakSpongeWidth1600.c
+        src/crypto/yes/sha256.c
+        src/crypto/yes/yescrypt-best.c
+        src/crypto/yes/yespower-opt.c
     )
 
     if (CMAKE_C_COMPILER_ID MATCHES MSVC)

diff --git a/src/crypto/randomx/defyx/align.h → src/crypto/align.h b/src/crypto/randomx/defyx/align.h → src/crypto/align.h
diff --git a/src/crypto/randomx/defyx/KangarooTwelve.c → src/crypto/k12/KangarooTwelve.c b/src/crypto/randomx/defyx/KangarooTwelve.c → src/crypto/k12/KangarooTwelve.c
diff --git a/src/crypto/randomx/defyx/KangarooTwelve.h → src/crypto/k12/KangarooTwelve.h b/src/crypto/randomx/defyx/KangarooTwelve.h → src/crypto/k12/KangarooTwelve.h
@@ -15,8 +15,8 @@ and related or neighboring rights to the source code in this file.
 #ifndef KeccakP1600_excluded
 
 #include <stddef.h>
-#include "align.h"
-#include "KeccakSpongeWidth1600.h"
+#include "../align.h"
+#include "../keccak/KeccakSpongeWidth1600.h"
 #include "Phases.h"
 
 typedef KCP_Phases KangarooTwelve_Phases;

diff --git a/src/crypto/randomx/defyx/Phases.h → src/crypto/k12/Phases.h b/src/crypto/randomx/defyx/Phases.h → src/crypto/k12/Phases.h
diff --git a/src/crypto/randomx/defyx/KeccakP-1600-SnP.h → src/crypto/keccak/KeccakP-1600-SnP.h b/src/crypto/randomx/defyx/KeccakP-1600-SnP.h → src/crypto/keccak/KeccakP-1600-SnP.h
diff --git a/...to/randomx/defyx/KeccakP-1600-reference.c → src/crypto/keccak/KeccakP-1600-reference.c b/...to/randomx/defyx/KeccakP-1600-reference.c → src/crypto/keccak/KeccakP-1600-reference.c
diff --git a/...rypto/randomx/defyx/KeccakSponge-common.h → src/crypto/keccak/KeccakSponge-common.h b/...rypto/randomx/defyx/KeccakSponge-common.h → src/crypto/keccak/KeccakSponge-common.h
@@ -15,7 +15,7 @@ and related or neighboring rights to the source code in this file.
 #define _KeccakSpongeCommon_h_
 
 #include <string.h>
-#include "align.h"
+#include "../align.h"
 
 #define KCP_DeclareSpongeStructure(prefix, size, alignment) \
     ALIGN(alignment) typedef struct prefix##_SpongeInstanceStruct { \

diff --git a/src/crypto/randomx/defyx/KeccakSponge.inc → src/crypto/keccak/KeccakSponge.inc b/src/crypto/randomx/defyx/KeccakSponge.inc → src/crypto/keccak/KeccakSponge.inc
diff --git a/...pto/randomx/defyx/KeccakSpongeWidth1600.c → src/crypto/keccak/KeccakSpongeWidth1600.c b/...pto/randomx/defyx/KeccakSpongeWidth1600.c → src/crypto/keccak/KeccakSpongeWidth1600.c
diff --git a/...pto/randomx/defyx/KeccakSpongeWidth1600.h → src/crypto/keccak/KeccakSpongeWidth1600.h b/...pto/randomx/defyx/KeccakSpongeWidth1600.h → src/crypto/keccak/KeccakSpongeWidth1600.h
diff --git a/src/crypto/randomx/defyx/brg_endian.h → src/crypto/keccak/brg_endian.h b/src/crypto/randomx/defyx/brg_endian.h → src/crypto/keccak/brg_endian.h
diff --git a/src/crypto/randomx/panthera/insecure_memzero.h b/src/crypto/randomx/panthera/insecure_memzero.h
diff --git a/src/crypto/randomx/panthera/sha256.h b/src/crypto/randomx/panthera/sha256.h
diff --git a/src/crypto/randomx/panthera/sysendian.h b/src/crypto/randomx/panthera/sysendian.h
diff --git a/src/crypto/randomx/randomx.cpp b/src/crypto/randomx/randomx.cpp
@@ -48,9 +48,9 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 #include <cassert>
 
 extern "C" {
-#include "crypto/randomx/defyx/yescrypt.h"
-#include "crypto/randomx/panthera/yespower.h"
-#include "crypto/randomx/defyx/KangarooTwelve.h"
+#include "crypto/yes/yescrypt.h"
+#include "crypto/yes/yespower.h"
+#include "crypto/k12/KangarooTwelve.h"
 }
 
 #include "base/tools/Profiler.h"
@@ -638,9 +638,9 @@ extern "C" {
 		assert(inputSize == 0 || input != nullptr);
 		assert(output != nullptr);
 		alignas(16) uint64_t tempHash[8];
-                switch (algo) {
+		switch (algo) {
 		    case xmrig::Algorithm::RX_DEFYX: rx_sipesh_k12(tempHash, sizeof(tempHash), input, inputSize); break;
-                    case xmrig::Algorithm::RX_XLA:   rx_yespower_k12(tempHash, sizeof(tempHash), input, inputSize); break;
+		    case xmrig::Algorithm::RX_XLA:   rx_yespower_k12(tempHash, sizeof(tempHash), input, inputSize); break;
 		    default: rx_blake2b_wrapper::run(tempHash, sizeof(tempHash), input, inputSize);
 		}
 		machine->initScratchpad(&tempHash);
@@ -654,9 +654,9 @@ extern "C" {
 	}
 
 	void randomx_calculate_hash_first(randomx_vm* machine, uint64_t (&tempHash)[8], const void* input, size_t inputSize, const xmrig::Algorithm algo) {
-                switch (algo) {
+		switch (algo) {
 		    case xmrig::Algorithm::RX_DEFYX: rx_sipesh_k12(tempHash, sizeof(tempHash), input, inputSize); break;
-                    case xmrig::Algorithm::RX_XLA:   rx_yespower_k12(tempHash, sizeof(tempHash), input, inputSize); break;
+		    case xmrig::Algorithm::RX_XLA:   rx_yespower_k12(tempHash, sizeof(tempHash), input, inputSize); break;
 		    default: rx_blake2b_wrapper::run(tempHash, sizeof(tempHash), input, inputSize);
 		}
 		machine->initScratchpad(tempHash);
@@ -673,9 +673,9 @@ extern "C" {
 		machine->run(&tempHash);
 
 		// Finish current hash and fill the scratchpad for the next hash at the same time
-                switch (algo) {
+		switch (algo) {
 		    case xmrig::Algorithm::RX_DEFYX: rx_sipesh_k12(tempHash, sizeof(tempHash), nextInput, nextInputSize); break;
-                    case xmrig::Algorithm::RX_XLA:   rx_yespower_k12(tempHash, sizeof(tempHash), nextInput, nextInputSize); break;
+		    case xmrig::Algorithm::RX_XLA:   rx_yespower_k12(tempHash, sizeof(tempHash), nextInput, nextInputSize); break;
 		    default: rx_blake2b_wrapper::run(tempHash, sizeof(tempHash), nextInput, nextInputSize);
 		}
 		machine->hashAndFill(output, tempHash);

diff --git a/src/crypto/randomx/defyx/insecure_memzero.h → src/crypto/yes/insecure_memzero.h b/src/crypto/randomx/defyx/insecure_memzero.h → src/crypto/yes/insecure_memzero.h