Prepare for JIT compiler support for other platforms

This commit is contained in:
tevador 2019-05-12 22:31:48 +02:00
parent a560cec3e7
commit 3dd21ea93d
12 changed files with 189 additions and 54 deletions

View File

@ -12,13 +12,13 @@ OBJDIR=obj
LDFLAGS=-lpthread LDFLAGS=-lpthread
RXA=$(BINDIR)/randomx.a RXA=$(BINDIR)/randomx.a
BINARIES=$(RXA) $(BINDIR)/benchmark $(BINDIR)/code-generator BINARIES=$(RXA) $(BINDIR)/benchmark $(BINDIR)/code-generator
RXOBJS=$(addprefix $(OBJDIR)/,aes_hash.o argon2_ref.o dataset.o jit_compiler_x86.o soft_aes.o virtual_memory.o vm_interpreted.o allocator.o assembly_generator_x86.o instruction.o randomx.o superscalar.o vm_compiled.o vm_interpreted_light.o argon2_core.o blake2_generator.o instructions_portable.o reciprocal.o virtual_machine.o vm_compiled_light.o blake2b.o) RXOBJS=$(addprefix $(OBJDIR)/,aes_hash.o argon2_ref.o dataset.o soft_aes.o virtual_memory.o vm_interpreted.o allocator.o assembly_generator_x86.o instruction.o randomx.o superscalar.o vm_compiled.o vm_interpreted_light.o argon2_core.o blake2_generator.o instructions_portable.o reciprocal.o virtual_machine.o vm_compiled_light.o blake2b.o)
ifeq ($(PLATFORM),amd64) ifeq ($(PLATFORM),amd64)
RXOBJS += $(OBJDIR)/jit_compiler_x86_static.o RXOBJS += $(addprefix $(OBJDIR)/,jit_compiler_x86_static.o jit_compiler_x86.o)
CXXFLAGS += -maes CXXFLAGS += -maes
endif endif
ifeq ($(PLATFORM),x86_64) ifeq ($(PLATFORM),x86_64)
RXOBJS += $(OBJDIR)/jit_compiler_x86_static.o RXOBJS += $(addprefix $(OBJDIR)/,jit_compiler_x86_static.o jit_compiler_x86.o)
CXXFLAGS += -maes CXXFLAGS += -maes
endif endif

View File

@ -83,6 +83,17 @@ namespace randomx {
#endif #endif
#endif #endif
#if defined(_M_X64) || defined(__x86_64__)
class JitCompilerX86;
using JitCompiler = JitCompilerX86;
#elif defined(__aarch64__)
class JitCompilerA64;
using JitCompiler = JitCompilerA64;
#else
class JitCompilerFallback;
using JitCompiler = JitCompilerFallback;
#endif
using addr_t = uint32_t; using addr_t = uint32_t;
using int_reg_t = uint64_t; using int_reg_t = uint64_t;

View File

@ -39,7 +39,7 @@ along with RandomX. If not, see<http://www.gnu.org/licenses/>.
#include "blake2/endian.h" #include "blake2/endian.h"
#include "argon2.h" #include "argon2.h"
#include "argon2_core.h" #include "argon2_core.h"
#include "jit_compiler_x86.hpp" #include "jit_compiler.hpp"
#include "intrin_portable.h" #include "intrin_portable.h"
static_assert(RANDOMX_ARGON_MEMORY % (RANDOMX_ARGON_LANES * ARGON2_SYNC_POINTS) == 0, "RANDOMX_ARGON_MEMORY - invalid value"); static_assert(RANDOMX_ARGON_MEMORY % (RANDOMX_ARGON_LANES * ARGON2_SYNC_POINTS) == 0, "RANDOMX_ARGON_MEMORY - invalid value");

View File

@ -32,15 +32,11 @@ struct randomx_dataset {
randomx::DatasetDeallocFunc* dealloc; randomx::DatasetDeallocFunc* dealloc;
}; };
namespace randomx {
class JitCompilerX86;
}
/* Global scope for C binding */ /* Global scope for C binding */
struct randomx_cache { struct randomx_cache {
uint8_t* memory = nullptr; uint8_t* memory = nullptr;
randomx::CacheDeallocFunc* dealloc; randomx::CacheDeallocFunc* dealloc;
randomx::JitCompilerX86* jit; randomx::JitCompiler* jit;
randomx::CacheInitializeFunc* initialize; randomx::CacheInitializeFunc* initialize;
randomx::DatasetInitFunc* datasetInit; randomx::DatasetInitFunc* datasetInit;
randomx::SuperscalarProgram programs[RANDOMX_CACHE_ACCESSES]; randomx::SuperscalarProgram programs[RANDOMX_CACHE_ACCESSES];

28
src/jit_compiler.hpp Normal file
View File

@ -0,0 +1,28 @@
/*
Copyright (c) 2019 tevador
This file is part of RandomX.
RandomX is free software: you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
the Free Software Foundation, either version 3 of the License, or
(at your option) any later version.
RandomX is distributed in the hope that it will be useful,
but WITHOUT ANY WARRANTY; without even the implied warranty of
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
GNU General Public License for more details.
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
#if defined(_M_X64) || defined(__x86_64__)
#include "jit_compiler_x86.hpp"
#elif defined(__aarch64__)
#include "jit_compiler_a64.hpp"
#else
#include "jit_compiler_fallback.hpp"
#endif

64
src/jit_compiler_a64.hpp Normal file
View File

@ -0,0 +1,64 @@
/*
Copyright (c) 2019 tevador
This file is part of RandomX.
RandomX is free software: you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
the Free Software Foundation, either version 3 of the License, or
(at your option) any later version.
RandomX is distributed in the hope that it will be useful,
but WITHOUT ANY WARRANTY; without even the implied warranty of
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
GNU General Public License for more details.
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 <cstdint>
#include <vector>
#include <stdexcept>
#include "common.hpp"
namespace randomx {
class Program;
class ProgramConfiguration;
class SuperscalarProgram;
class JitCompilerA64 {
public:
JitCompilerA64() {
throw std::runtime_error("ARM64 JIT compiler is not implemented yet.");
}
void generateProgram(Program&, ProgramConfiguration&) {
}
void generateProgramLight(Program&, ProgramConfiguration&, uint32_t) {
}
template<size_t N>
void generateSuperscalarHash(SuperscalarProgram(&programs)[N], std::vector<uint64_t> &) {
}
void generateDatasetInitCode() {
}
ProgramFunc* getProgramFunc() {
return nullptr;
}
DatasetInitFunc* getDatasetInitFunc() {
return nullptr;
}
uint8_t* getCode() {
return nullptr;
}
size_t getCodeSize() {
return 0;
}
};
}

View File

@ -0,0 +1,64 @@
/*
Copyright (c) 2019 tevador
This file is part of RandomX.
RandomX is free software: you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
the Free Software Foundation, either version 3 of the License, or
(at your option) any later version.
RandomX is distributed in the hope that it will be useful,
but WITHOUT ANY WARRANTY; without even the implied warranty of
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
GNU General Public License for more details.
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 <cstdint>
#include <vector>
#include <stdexcept>
#include "common.hpp"
namespace randomx {
class Program;
class ProgramConfiguration;
class SuperscalarProgram;
class JitCompilerFallback {
public:
JitCompilerFallback() {
throw std::runtime_error("JIT compilation is not supported on this platform");
}
void generateProgram(Program&, ProgramConfiguration&) {
}
void generateProgramLight(Program&, ProgramConfiguration&, uint32_t) {
}
template<size_t N>
void generateSuperscalarHash(SuperscalarProgram(&programs)[N], std::vector<uint64_t> &) {
}
void generateDatasetInitCode() {
}
ProgramFunc* getProgramFunc() {
return nullptr;
}
DatasetInitFunc* getDatasetInitFunc() {
return nullptr;
}
uint8_t* getCode() {
return nullptr;
}
size_t getCodeSize() {
return 0;
}
};
}

View File

@ -18,48 +18,9 @@ along with RandomX. If not, see<http://www.gnu.org/licenses/>.
*/ */
#include <stdexcept> #include <stdexcept>
#include "jit_compiler_x86.hpp"
#if !defined(_M_X64) && !defined(__x86_64__)
namespace randomx {
JitCompilerX86::JitCompilerX86() {
throw std::runtime_error("JIT compiler only supports x86-64 CPUs");
}
JitCompilerX86::~JitCompilerX86() {
}
void JitCompilerX86::generateProgram(Program& p, ProgramConfiguration& pcfg) {
}
void JitCompilerX86::generateProgramLight(Program& p, ProgramConfiguration& pcfg, uint32_t datasetOffset) {
}
template<size_t N>
void JitCompilerX86::generateSuperscalarHash(SuperscalarProgram(&programs)[N], std::vector<uint64_t> &reciprocalCache) {
}
template
void JitCompilerX86::generateSuperscalarHash(SuperscalarProgram(&programs)[RANDOMX_CACHE_ACCESSES], std::vector<uint64_t> &reciprocalCache);
void JitCompilerX86::generateDatasetInitCode() {
}
size_t JitCompilerX86::getCodeSize() {
return 0;
}
}
#else
#include <cstring> #include <cstring>
#include <climits> #include <climits>
#include "jit_compiler_x86.hpp"
#include "jit_compiler_x86_static.hpp" #include "jit_compiler_x86_static.hpp"
#include "superscalar.hpp" #include "superscalar.hpp"
#include "program.hpp" #include "program.hpp"
@ -838,4 +799,3 @@ namespace randomx {
}; };
} }
#endif

View File

@ -42,7 +42,7 @@ extern "C" {
case RANDOMX_FLAG_JIT: case RANDOMX_FLAG_JIT:
cache->dealloc = &randomx::deallocCache<randomx::DefaultAllocator>; cache->dealloc = &randomx::deallocCache<randomx::DefaultAllocator>;
cache->jit = new randomx::JitCompilerX86(); cache->jit = new randomx::JitCompiler();
cache->initialize = &randomx::initCacheCompile; cache->initialize = &randomx::initCacheCompile;
cache->datasetInit = cache->jit->getDatasetInitFunc(); cache->datasetInit = cache->jit->getDatasetInitFunc();
cache->memory = (uint8_t*)randomx::DefaultAllocator::allocMemory(randomx::CacheSize); cache->memory = (uint8_t*)randomx::DefaultAllocator::allocMemory(randomx::CacheSize);
@ -58,7 +58,7 @@ extern "C" {
case RANDOMX_FLAG_JIT | RANDOMX_FLAG_LARGE_PAGES: case RANDOMX_FLAG_JIT | RANDOMX_FLAG_LARGE_PAGES:
cache->dealloc = &randomx::deallocCache<randomx::LargePageAllocator>; cache->dealloc = &randomx::deallocCache<randomx::LargePageAllocator>;
cache->jit = new randomx::JitCompilerX86(); cache->jit = new randomx::JitCompiler();
cache->initialize = &randomx::initCacheCompile; cache->initialize = &randomx::initCacheCompile;
cache->datasetInit = cache->jit->getDatasetInitFunc(); cache->datasetInit = cache->jit->getDatasetInitFunc();
cache->memory = (uint8_t*)randomx::LargePageAllocator::allocMemory(randomx::CacheSize); cache->memory = (uint8_t*)randomx::LargePageAllocator::allocMemory(randomx::CacheSize);

View File

@ -22,7 +22,7 @@ along with RandomX. If not, see<http://www.gnu.org/licenses/>.
#include <new> #include <new>
#include <cstdint> #include <cstdint>
#include "virtual_machine.hpp" #include "virtual_machine.hpp"
#include "jit_compiler_x86.hpp" #include "jit_compiler.hpp"
#include "allocator.hpp" #include "allocator.hpp"
#include "dataset.hpp" #include "dataset.hpp"
@ -53,7 +53,7 @@ namespace randomx {
protected: protected:
void execute(); void execute();
JitCompilerX86 compiler; JitCompiler compiler;
}; };
using CompiledVmDefault = CompiledVm<AlignedAllocator<CacheLineSize>, true>; using CompiledVmDefault = CompiledVm<AlignedAllocator<CacheLineSize>, true>;

View File

@ -160,6 +160,9 @@ SET ERRORLEVEL = 0</Command>
<ClInclude Include="..\src\assembly_generator_x86.hpp" /> <ClInclude Include="..\src\assembly_generator_x86.hpp" />
<ClInclude Include="..\src\blake2_generator.hpp" /> <ClInclude Include="..\src\blake2_generator.hpp" />
<ClInclude Include="..\src\common.hpp" /> <ClInclude Include="..\src\common.hpp" />
<ClInclude Include="..\src\jit_compiler.hpp" />
<ClInclude Include="..\src\jit_compiler_a64.hpp" />
<ClInclude Include="..\src\jit_compiler_fallback.hpp" />
<ClInclude Include="..\src\vm_compiled_light.hpp" /> <ClInclude Include="..\src\vm_compiled_light.hpp" />
<ClInclude Include="..\src\vm_compiled.hpp" /> <ClInclude Include="..\src\vm_compiled.hpp" />
<ClInclude Include="..\src\configuration.h" /> <ClInclude Include="..\src\configuration.h" />

View File

@ -158,6 +158,15 @@
<ClInclude Include="..\src\superscalar.hpp"> <ClInclude Include="..\src\superscalar.hpp">
<Filter>Header Files</Filter> <Filter>Header Files</Filter>
</ClInclude> </ClInclude>
<ClInclude Include="..\src\jit_compiler_a64.hpp">
<Filter>Header Files</Filter>
</ClInclude>
<ClInclude Include="..\src\jit_compiler_fallback.hpp">
<Filter>Header Files</Filter>
</ClInclude>
<ClInclude Include="..\src\jit_compiler.hpp">
<Filter>Header Files</Filter>
</ClInclude>
</ItemGroup> </ItemGroup>
<ItemGroup> <ItemGroup>
<MASM Include="..\src\jit_compiler_x86_static.asm"> <MASM Include="..\src\jit_compiler_x86_static.asm">