Cleaned up legacy code

Author: tevador

Diff for: src/allocator.cpp

@@ -17,8 +17,6 @@ You should have received a copy of the GNU General Public License
 along with RandomX.  If not, see<http://www.gnu.org/licenses/>.
 */
 
-#pragma once
-
 #include "allocator.hpp"
 #include "intrin_portable.h"
 #include "virtual_memory.hpp"
@@ -36,10 +34,8 @@ namespace randomx {
 		_mm_free(ptr);
 	}
 
-	template void* AlignedAllocator<CacheLineSize>::allocMemory(size_t count);
-	template void AlignedAllocator<CacheLineSize>::freeMemory(void* ptr, size_t count);
-	template void* AlignedAllocator<sizeof(__m128i)>::allocMemory(size_t count);
-	template void AlignedAllocator<sizeof(__m128i)>::freeMemory(void* ptr, size_t count);
+	template class AlignedAllocator<CacheLineSize>;
+	template class AlignedAllocator<sizeof(__m128i)>;;
 
 	void* LargePageAllocator::allocMemory(size_t count) {
 		return allocLargePagesMemory(count);

Diff for: src/asm/initBlock.inc

@@ -30,8 +30,6 @@ namespace randomx {
 	static_assert((RANDOMX_ARGON_MEMORY & (RANDOMX_ARGON_MEMORY - 1)) == 0, "RANDOMX_ARGON_MEMORY must be a power of 2.");
 	static_assert((RANDOMX_DATASET_SIZE & (RANDOMX_DATASET_SIZE - 1)) == 0, "RANDOMX_DATASET_SIZE must be a power of 2.");
 	static_assert(RANDOMX_DATASET_SIZE <= 4294967296ULL, "RANDOMX_DATASET_SIZE must not exceed 4294967296.");
-	static_assert(RANDOMX_DS_GROWTH % 64 == 0, "RANDOMX_DS_GROWTH must be divisible by 64.");
-	static_assert(RANDOMX_ARGON_GROWTH >= 0, "RANDOMX_ARGON_GROWTH must be greater than or equal to 0.");
 	static_assert(RANDOMX_PROGRAM_SIZE > 0, "RANDOMX_PROGRAM_SIZE must be greater than 0");
 	static_assert(RANDOMX_PROGRAM_ITERATIONS > 0, "RANDOMX_PROGRAM_ITERATIONS must be greater than 0");
 	static_assert(RANDOMX_PROGRAM_COUNT > 0, "RANDOMX_PROGRAM_COUNT must be greater than 0");
@@ -54,15 +52,14 @@ namespace randomx {
 
 	using addr_t = uint32_t;
 
-	constexpr int SeedSize = 32;
-	constexpr int ResultSize = 64;
 	constexpr int ArgonBlockSize = 1024;
 	constexpr int ArgonSaltSize = sizeof(RANDOMX_ARGON_SALT) - 1;
 	constexpr int CacheLineSize = 64;
 	constexpr int ScratchpadSize = RANDOMX_SCRATCHPAD_L3;
 	constexpr uint32_t CacheLineAlignMask = (RANDOMX_DATASET_SIZE - 1) & ~(CacheLineSize - 1);
 	constexpr uint32_t CacheSize = RANDOMX_ARGON_MEMORY * 1024;
-	constexpr int CacheBlockCount = CacheSize / CacheLineSize;
+
+	static_assert(RANDOMX_DATASET_BLOCKS == RANDOMX_DATASET_SIZE / CacheLineSize, "Invalid value of RANDOMX_DATASET_BLOCKS");
 
 #ifdef TRACE
 	constexpr bool trace = true;

Diff for: src/asm/program_prologue_load.inc

@@ -22,9 +22,6 @@ along with RandomX.  If not, see<http://www.gnu.org/licenses/>.
 //Cache size in KiB. Must be a power of 2.
 #define RANDOMX_ARGON_MEMORY       (256 * 1024)
 
-//Cache growth per epoch in KiB.
-#define RANDOMX_ARGON_GROWTH       0
-
 //Number of Argon2d iterations for Cache initialization
 #define RANDOMX_ARGON_ITERATIONS   3
 
@@ -43,9 +40,6 @@ along with RandomX.  If not, see<http://www.gnu.org/licenses/>.
 //Dataset size in bytes. Must be a power of 2.
 #define RANDOMX_DATASET_SIZE       (2ULL * 1024 * 1024 * 1024)
 
-//Dataset growth per epoch in bytes. Must be divisible by 64.
-#define RANDOMX_DS_GROWTH          0
-
 //Number of blocks per epoch
 #define RANDOMX_EPOCH_BLOCKS       2048
 

Diff for: src/asm/program_read_dataset_light_sub.inc

@@ -211,23 +211,4 @@ namespace randomx {
 		for (uint32_t blockNumber = startBlock; blockNumber < endBlock; ++blockNumber, dataset += CacheLineSize)
 			initDatasetBlock(cache, dataset, blockNumber);
 	}
-	
-	/*void datasetAlloc(dataset_t& ds, bool largePages) {
-		if (std::numeric_limits<size_t>::max() < RANDOMX_DATASET_SIZE)
-			throw std::runtime_error("Platform doesn't support enough memory for the dataset");
-		if (largePages) {
-			ds.dataset.memory = (uint8_t*)allocLargePagesMemory(ds.dataset.size);
-		}
-		else {
-			ds.dataset.memory = (uint8_t*)_mm_malloc(ds.dataset.size, 64);
-			if (ds.dataset.memory == nullptr) {
-				throw std::runtime_error("Dataset memory allocation failed. >4 GiB of free virtual memory is needed.");
-			}
-		}
-	}
-
-	void datasetInitCache(const void* seed, dataset_t& ds, bool largePages) {
-		ds.cache.memory = allocCache(ds.cache.size, largePages);
-		argonFill(ds.cache, seed, SeedSize);
-	}*/
 }

Diff for: src/asm/squareHash.inc

@@ -105,7 +105,6 @@ namespace randomx {
 	const uint8_t* codeDatasetInit = (uint8_t*)&randomx_dataset_init;
 	const uint8_t* codeLoopStore = (uint8_t*)&randomx_program_loop_store;
 	const uint8_t* codeLoopEnd = (uint8_t*)&randomx_program_loop_end;
-	const uint8_t* codeReadDatasetLightSub = (uint8_t*)&randomx_program_read_dataset_light_sub;
 	const uint8_t* codeEpilogue = (uint8_t*)&randomx_program_epilogue;
 	const uint8_t* codeProgramEnd = (uint8_t*)&randomx_program_end;
 	const uint8_t* codeShhLoad = (uint8_t*)&randomx_sshash_load;
@@ -120,15 +119,13 @@ namespace randomx {
 	const int32_t readDatasetLightInitSize = codeReadDatasetLightSshFin - codeReadDatasetLightSshInit;
 	const int32_t readDatasetLightFinSize = codeLoopStore - codeReadDatasetLightSshFin;
 	const int32_t loopStoreSize = codeLoopEnd - codeLoopStore;
-	const int32_t readDatasetLightSubSize = codeDatasetInit - codeReadDatasetLightSub;
 	const int32_t datasetInitSize = codeEpilogue - codeDatasetInit;
 	const int32_t epilogueSize = codeShhLoad - codeEpilogue;
 	const int32_t codeSshLoadSize = codeShhPrefetch - codeShhLoad;
 	const int32_t codeSshPrefetchSize = codeShhEnd - codeShhPrefetch;
 	const int32_t codeSshInitSize = codeProgramEnd - codeShhInit;
 
 	const int32_t epilogueOffset = CodeSize - epilogueSize;
-	const int32_t readDatasetLightSubOffset = epilogueOffset - readDatasetLightSubSize;
 	constexpr int32_t superScalarHashOffset = 32768;
 
 	static const uint8_t REX_ADD_RR[] = { 0x4d, 0x03 };
@@ -226,7 +223,6 @@ namespace randomx {
 		code = (uint8_t*)allocExecutableMemory(CodeSize);
 		memcpy(code, codePrologue, prologueSize);
 		memcpy(code + epilogueOffset, codeEpilogue, epilogueSize);
-		memcpy(code + readDatasetLightSubOffset, codeReadDatasetLightSub, readDatasetLightSubSize);
 	}
 
 	JitCompilerX86::~JitCompilerX86() {
@@ -241,10 +237,6 @@ namespace randomx {
 	}
 
 	void JitCompilerX86::generateProgramLight(Program& prog, ProgramConfiguration& pcfg) {
-		if (RANDOMX_CACHE_ACCESSES != 8)
-			throw std::runtime_error("JIT compiler: Unsupported value of RANDOMX_CACHE_ACCESSES");
-		if (RANDOMX_ARGON_GROWTH != 0)
-			throw std::runtime_error("JIT compiler: Unsupported value of RANDOMX_ARGON_GROWTH");
 		generateProgramPrologue(prog, pcfg);
 		//if (superscalar) {
 			emit(codeReadDatasetLightSshInit, readDatasetLightInitSize);

Diff for: src/common.hpp

@@ -34,11 +34,9 @@
 .global DECL(randomx_program_read_dataset_light)
 .global DECL(randomx_program_read_dataset_sshash_init)
 .global DECL(randomx_program_read_dataset_sshash_fin)
-.global DECL(randomx_program_read_dataset_light_sub)
-.global DECL(randomx_dataset_init)
 .global DECL(randomx_program_loop_store)
 .global DECL(randomx_program_loop_end)
-.global DECL(randomx_program_read_dataset_light_sub)
+.global DECL(randomx_dataset_init)
 .global DECL(randomx_program_epilogue)
 .global DECL(randomx_sshash_load)
 .global DECL(randomx_sshash_prefetch)
@@ -83,12 +81,6 @@ DECL(randomx_program_loop_store):
 DECL(randomx_program_loop_end):
 	nop
 
-.balign 64
-DECL(randomx_program_read_dataset_light_sub):
-	#include "asm/program_read_dataset_light_sub.inc"
-squareHashSub:
-	#include "asm/squareHash.inc"
-
 .balign 64
 DECL(randomx_dataset_init):
 	push rbx

Diff for: src/configuration.h

@@ -27,7 +27,6 @@ PUBLIC randomx_program_read_dataset
 PUBLIC randomx_program_read_dataset_light
 PUBLIC randomx_program_read_dataset_sshash_init
 PUBLIC randomx_program_read_dataset_sshash_fin
-PUBLIC randomx_program_read_dataset_light_sub
 PUBLIC randomx_dataset_init
 PUBLIC randomx_program_loop_store
 PUBLIC randomx_program_loop_end
@@ -83,13 +82,6 @@ randomx_program_loop_end PROC
 	nop
 randomx_program_loop_end ENDP
 
-ALIGN 64
-randomx_program_read_dataset_light_sub PROC
-	include asm/program_read_dataset_light_sub.inc
-	squareHashSub:
-		include asm/squareHash.inc
-randomx_program_read_dataset_light_sub ENDP
-
 ALIGN 64
 randomx_dataset_init PROC
 	push rbx

Diff for: src/dataset.cpp

@@ -30,7 +30,6 @@ extern "C" {
 	void randomx_program_read_dataset_sshash_fin();
 	void randomx_program_loop_store();
 	void randomx_program_loop_end();
-	void randomx_program_read_dataset_light_sub();
 	void randomx_dataset_init();
 	void randomx_program_epilogue();
 	void randomx_sshash_load();

Diff for: src/jit_compiler_x86.cpp

@@ -18,7 +18,7 @@ along with RandomX.  If not, see<http://www.gnu.org/licenses/>.
 */
 
 #include "configuration.h"
-#include "Program.hpp"
+#include "program.hpp"
 #include "blake2/endian.h"
 #include <iostream>
 #include <vector>