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

Author: Spudz76

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)

src/crypto/randomx/defyx/align.h src/crypto/align.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;

src/crypto/randomx/defyx/KangarooTwelve.c src/crypto/k12/KangarooTwelve.c

@@ -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 { \

src/crypto/randomx/defyx/KangarooTwelve.h src/crypto/k12/KangarooTwelve.h

@@ -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"
 }
 
 RandomX_ConfigurationWownero::RandomX_ConfigurationWownero()
@@ -589,9 +589,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(tempHash, sizeof(tempHash), input, inputSize, nullptr, 0);
 		}
 		machine->initScratchpad(&tempHash);
@@ -605,9 +605,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(tempHash, sizeof(tempHash), input, inputSize, nullptr, 0);
 		}
 		machine->initScratchpad(tempHash);
@@ -622,9 +622,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(tempHash, sizeof(tempHash), nextInput, nextInputSize, nullptr, 0);
 		}
 		machine->hashAndFill(output, RANDOMX_HASH_SIZE, tempHash);