Optionally hide symbols from export (#5)

Can instruct cmake to include the -fvisibility=hidden flag This is necessary to allow multiple versions of the librandomx.a static library to be linked to different shared libraries on OSX/Macos. It doesn't seem to be necessary on linux, but does not hurt.
ArweaveTeam · Sep 14, 2024 · c6b1d6e · c6b1d6e
1 parent a0562f8
commit c6b1d6e
Show file tree

Hide file tree

Showing 9 changed files with 395 additions and 352 deletions.
diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -30,6 +30,8 @@ cmake_minimum_required(VERSION 3.5)
 
 project(RandomX)
 
+set(CMAKE_VERBOSE_MAKEFILE ON)
+
 set(randomx_sources
 src/aes_hash.cpp
 src/argon2_ref.c
@@ -212,9 +214,14 @@ endif()
 set(RANDOMX_INCLUDE "${CMAKE_CURRENT_SOURCE_DIR}/src" CACHE STRING "RandomX Include path")
 
 # Define variables for custom preprocessor definitions with default values
+option(USE_HIDDEN_VISIBILITY "Include -fvisibility=hidden flag" OFF)
 set(RANDOMX_ARGON_MEMORY "" CACHE STRING "Set the RANDOMX_ARGON_MEMORY value")
 set(RANDOMX_DATASET_BASE_SIZE "" CACHE STRING "Set the RANDOMX_DATASET_BASE_SIZE value")
 
+if(USE_HIDDEN_VISIBILITY)
+  add_compile_options("-fvisibility=hidden")
+endif()
+
 add_library(randomx ${randomx_sources})
 
 # Apply the custom preprocessor definitions only if they are set

diff --git a/doc/design.md b/doc/design.md
diff --git a/doc/specs.md b/doc/specs.md
diff --git a/src/aes_hash.cpp b/src/aes_hash.cpp
@@ -307,4 +307,4 @@ void hashAndFillAes1Rx4(void *scratchpad, size_t scratchpadSize, void *hash, voi
 }
 
 template void hashAndFillAes1Rx4<false>(void *scratchpad, size_t scratchpadSize, void *hash, void* fill_state);
-template void hashAndFillAes1Rx4<true>(void *scratchpad, size_t scratchpadSize, void *hash, void* fill_state);
+template void hashAndFillAes1Rx4<true>(void *scratchpad, size_t scratchpadSize, void *hash, void* fill_state);
diff --git a/src/asm/configuration.asm b/src/asm/configuration.asm
@@ -2,7 +2,6 @@
 RANDOMX_ARGON_MEMORY EQU 262144t
 RANDOMX_ARGON_ITERATIONS EQU 3t
 RANDOMX_ARGON_LANES EQU 1t
-RANDOMX_ARGON_SALT TEXTEQU <"RandomX\x03">
 RANDOMX_CACHE_ACCESSES EQU 8t
 RANDOMX_SUPERSCALAR_LATENCY EQU 170t
 RANDOMX_DATASET_BASE_SIZE EQU 2147483648t

diff --git a/src/configuration.h b/src/configuration.h
@@ -126,4 +126,4 @@ Total sum of frequencies must be 256
 #define RANDOMX_FREQ_NOP            0
 /*                               ------
                                   256
-*/
+*/
diff --git a/src/randomx.cpp b/src/randomx.cpp
@@ -145,7 +145,6 @@ extern "C" {
 	}
 
 	randomx_dataset *randomx_alloc_dataset(randomx_flags flags) {
-
 		//fail on 32-bit systems if DatasetSize is >= 4 GiB
 		if (randomx::DatasetSize > std::numeric_limits<size_t>::max()) {
 			return nullptr;

diff --git a/src/tests/tests.cpp b/src/tests/tests.cpp
@@ -477,7 +477,7 @@ int main() {
 		decoder.executeInstruction(ibc, pc, nullptr, config);
 		assert(reg.r[registerDst] == 1);
 	});
-	
+
 	runTest("IXOR_R (decode)", RANDOMX_FREQ_IXOR_R > 0, [&] {
 		randomx::Instruction instr;
 		instr.opcode = randomx::ceil_IXOR_R - 1;
@@ -1078,15 +1078,15 @@ int main() {
 		randomx_calculate_hash_last(vm, &hash3);
 
 		assert(equalsHex(hash1, "639183aae1bf4c9a35884cb46b09cad9175f04efd7684e7262a0ac1c2f0b4e3f"));
-		assert(equalsHex(hash2, "300a0adb47603dedb42228ccb2b211104f4da45af709cd7547cd049e9489c969"));
+		assert(equalsHex(hash2, "de506caf4c69cb93f70a6aab078ce450a2a942e8ca79ca4e0d49e899b2bcbe8e"));
 		assert(equalsHex(hash3, "c36d4ed4191e617309867ed66a443be4075014e2b061bcdaf9ce7b721d2b77a8"));
 	});
 
 	runTest("Preserve rounding mode", RANDOMX_FREQ_CFROUND > 0, []() {
 		rx_set_rounding_mode(RoundToNearest);
 		char hash[RANDOMX_HASH_SIZE];
 		calcStringHash("test key 000", "Lorem ipsum dolor sit amet", &hash);
-		assert(equalsHex(hash, "300a0adb47603dedb42228ccb2b211104f4da45af709cd7547cd049e9489c969"));
+		assert(equalsHex(hash, "de506caf4c69cb93f70a6aab078ce450a2a942e8ca79ca4e0d49e899b2bcbe8e"));
 		assert(rx_get_rounding_mode() == RoundToNearest);
 	});
 

diff --git a/src/vm_interpreted.cpp b/src/vm_interpreted.cpp
@@ -54,7 +54,6 @@ namespace randomx {
 
 	template<class Allocator, bool softAes>
 	void InterpretedVm<Allocator, softAes>::execute() {
-
 		NativeRegisterFile nreg;
 
 		for(unsigned i = 0; i < RegisterCountFlt; ++i)
@@ -71,7 +70,7 @@ namespace randomx {
 			spAddr0 &= ScratchpadL3Mask64;
 			spAddr1 ^= spMix >> 32;
 			spAddr1 &= ScratchpadL3Mask64;
-			
+
 			for (unsigned i = 0; i < RegistersCount; ++i)
 				nreg.r[i] ^= load64(scratchpad + spAddr0 + 8 * i);
 
@@ -85,6 +84,7 @@ namespace randomx {
 
 			mem.mx ^= nreg.r[config.readReg2] ^ nreg.r[config.readReg3];
 			mem.mx &= CacheLineAlignMask;
+
 			datasetPrefetch(datasetOffset + mem.mx);
 			datasetRead(datasetOffset + mem.ma, nreg.r);
 			std::swap(mem.mx, mem.ma);
-Original file line number
+Diff line change
@@ Expand Up / @@ -126,4 +126,4 @@ Total sum of frequencies must be 256 @@
     #define RANDOMX_FREQ_NOP            0
     /*                               ------
-    */
+    */