Skip to content

Commit ebb78bd

Browse files
committed
fix missing ___clear_cache when targetting iOS
1 parent 102f8ac commit ebb78bd

2 files changed

Lines changed: 31 additions & 12 deletions

File tree

CMakeLists.txt

Lines changed: 11 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -56,6 +56,17 @@ src/virtual_machine.cpp
5656
src/vm_compiled_light.cpp
5757
src/blake2/blake2b.c)
5858

59+
if (NOT WIN32)
60+
check_symbol_exists("__builtin___clear_cache" "stdlib.h" HAVE_BUILTIN_CLEAR_CACHE)
61+
if (HAVE_BUILTIN_CLEAR_CACHE)
62+
add_definitions(-DHAVE_BUILTIN_CLEAR_CACHE)
63+
endif()
64+
endif()
65+
66+
if (CMAKE_CXX_COMPILER_ID MATCHES GNU)
67+
add_definitions(-D_GNU_SOURCE -DHAVE_BUILTIN_CLEAR_CACHE)
68+
endif()
69+
5970
if(NOT ARCH_ID)
6071
# allow cross compiling
6172
if(CMAKE_SYSTEM_PROCESSOR STREQUAL "")

src/jit_compiler_a64.cpp

Lines changed: 20 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -98,9 +98,11 @@ JitCompilerA64::JitCompilerA64()
9898
memset(reg_changed_offset, 0, sizeof(reg_changed_offset));
9999
memcpy(code, (void*) randomx_program_aarch64, CodeSize);
100100

101-
#ifdef __GNUC__
102-
__builtin___clear_cache(reinterpret_cast<char*>(code), reinterpret_cast<char*>(code + CodeSize));
103-
#endif
101+
#ifdef HAVE_BUILTIN_CLEAR_CACHE
102+
__builtin___clear_cache(reinterpret_cast<char*>(code), reinterpret_cast<char*>(code + CodeSize));
103+
#else
104+
sys_icache_invalidate(code, code + CodeSize);
105+
#endif
104106
}
105107

106108
JitCompilerA64::~JitCompilerA64()
@@ -169,9 +171,11 @@ void JitCompilerA64::generateProgram(Program& program, ProgramConfiguration& con
169171
codePos = ((uint8_t*)randomx_program_aarch64_update_spMix1) - ((uint8_t*)randomx_program_aarch64);
170172
emit32(ARMV8A::EOR | 10 | (IntRegMap[config.readReg0] << 5) | (IntRegMap[config.readReg1] << 16), code, codePos);
171173

172-
#ifdef __GNUC__
173-
__builtin___clear_cache(reinterpret_cast<char*>(code + MainLoopBegin), reinterpret_cast<char*>(code + codePos));
174-
#endif
174+
#ifdef HAVE_BUILTIN_CLEAR_CACHE
175+
__builtin___clear_cache(reinterpret_cast<char*>(code), reinterpret_cast<char*>(code + CodeSize));
176+
#else
177+
sys_icache_invalidate(code, code + CodeSize);
178+
#endif
175179
}
176180

177181
void JitCompilerA64::generateProgramLight(Program& program, ProgramConfiguration& config, uint32_t datasetOffset)
@@ -226,9 +230,11 @@ void JitCompilerA64::generateProgramLight(Program& program, ProgramConfiguration
226230
emit32(ARMV8A::ADD_IMM_LO | 2 | (2 << 5) | (imm_lo << 10), code, codePos);
227231
emit32(ARMV8A::ADD_IMM_HI | 2 | (2 << 5) | (imm_hi << 10), code, codePos);
228232

229-
#ifdef __GNUC__
230-
__builtin___clear_cache(reinterpret_cast<char*>(code + MainLoopBegin), reinterpret_cast<char*>(code + codePos));
231-
#endif
233+
#ifdef HAVE_BUILTIN_CLEAR_CACHE
234+
__builtin___clear_cache(reinterpret_cast<char*>(code), reinterpret_cast<char*>(code + CodeSize));
235+
#else
236+
sys_icache_invalidate(code, code + CodeSize);
237+
#endif
232238
}
233239

234240
template<size_t N>
@@ -344,9 +350,11 @@ void JitCompilerA64::generateSuperscalarHash(SuperscalarProgram(&programs)[N], s
344350
memcpy(code + codePos, p1, p2 - p1);
345351
codePos += p2 - p1;
346352

347-
#ifdef __GNUC__
348-
__builtin___clear_cache(reinterpret_cast<char*>(code + CodeSize), reinterpret_cast<char*>(code + codePos));
349-
#endif
353+
#ifdef HAVE_BUILTIN_CLEAR_CACHE
354+
__builtin___clear_cache(reinterpret_cast<char*>(code), reinterpret_cast<char*>(code + CodeSize));
355+
#else
356+
sys_icache_invalidate(code, code + CodeSize);
357+
#endif
350358
}
351359

352360
template void JitCompilerA64::generateSuperscalarHash(SuperscalarProgram(&programs)[RANDOMX_CACHE_ACCESSES], std::vector<uint64_t> &reciprocalCache);

0 commit comments

Comments
 (0)