mirror of
				https://git.wownero.com/wownero/RandomWOW.git
				synced 2024-08-15 00:23:14 +00:00 
			
		
		
		
	Preserve floating point state when calling randomx_calculate_hash
This commit is contained in:
		
							parent
							
								
									ac574e3743
								
							
						
					
					
						commit
						6a764e90d0
					
				
					 3 changed files with 18 additions and 0 deletions
				
			
		|  | @ -36,6 +36,7 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. | ||||||
| #include "cpu.hpp" | #include "cpu.hpp" | ||||||
| #include <cassert> | #include <cassert> | ||||||
| #include <limits> | #include <limits> | ||||||
|  | #include <cfenv> | ||||||
| 
 | 
 | ||||||
| extern "C" { | extern "C" { | ||||||
| 
 | 
 | ||||||
|  | @ -349,6 +350,8 @@ extern "C" { | ||||||
| 		assert(machine != nullptr); | 		assert(machine != nullptr); | ||||||
| 		assert(inputSize == 0 || input != nullptr); | 		assert(inputSize == 0 || input != nullptr); | ||||||
| 		assert(output != nullptr); | 		assert(output != nullptr); | ||||||
|  | 		fenv_t fpstate; | ||||||
|  | 		fegetenv(&fpstate); | ||||||
| 		alignas(16) uint64_t tempHash[8]; | 		alignas(16) uint64_t tempHash[8]; | ||||||
| 		int blakeResult = blake2b(tempHash, sizeof(tempHash), input, inputSize, nullptr, 0); | 		int blakeResult = blake2b(tempHash, sizeof(tempHash), input, inputSize, nullptr, 0); | ||||||
| 		assert(blakeResult == 0); | 		assert(blakeResult == 0); | ||||||
|  | @ -361,6 +364,7 @@ extern "C" { | ||||||
| 		} | 		} | ||||||
| 		machine->run(&tempHash); | 		machine->run(&tempHash); | ||||||
| 		machine->getFinalResult(output, RANDOMX_HASH_SIZE); | 		machine->getFinalResult(output, RANDOMX_HASH_SIZE); | ||||||
|  | 		fesetenv(&fpstate); | ||||||
| 	} | 	} | ||||||
| 
 | 
 | ||||||
| 	void randomx_calculate_hash_first(randomx_vm* machine, const void* input, size_t inputSize) { | 	void randomx_calculate_hash_first(randomx_vm* machine, const void* input, size_t inputSize) { | ||||||
|  |  | ||||||
|  | @ -246,6 +246,8 @@ RANDOMX_EXPORT void randomx_calculate_hash(randomx_vm *machine, const void *inpu | ||||||
|  *                              and begin the calculation of the next hash. |  *                              and begin the calculation of the next hash. | ||||||
|  * randomx_calculate_hash_last  will output the hash value of the previous input. |  * randomx_calculate_hash_last  will output the hash value of the previous input. | ||||||
|  * |  * | ||||||
|  |  * WARNING: These functions may alter the floating point rounding mode of the calling thread. | ||||||
|  |  * | ||||||
|  * @param machine is a pointer to a randomx_vm structure. Must not be NULL. |  * @param machine is a pointer to a randomx_vm structure. Must not be NULL. | ||||||
|  * @param input is a pointer to memory to be hashed. Must not be NULL. |  * @param input is a pointer to memory to be hashed. Must not be NULL. | ||||||
|  * @param inputSize is the number of bytes to be hashed. |  * @param inputSize is the number of bytes to be hashed. | ||||||
|  |  | ||||||
|  | @ -4,6 +4,7 @@ | ||||||
| 
 | 
 | ||||||
| #include <cassert> | #include <cassert> | ||||||
| #include <iomanip> | #include <iomanip> | ||||||
|  | #include <cfenv> | ||||||
| #include "utility.hpp" | #include "utility.hpp" | ||||||
| #include "../bytecode_machine.hpp" | #include "../bytecode_machine.hpp" | ||||||
| #include "../dataset.hpp" | #include "../dataset.hpp" | ||||||
|  | @ -1051,6 +1052,10 @@ int main() { | ||||||
| 		assert(cacheMemory[33554431] == 0x1f47f056d05cd99b); | 		assert(cacheMemory[33554431] == 0x1f47f056d05cd99b); | ||||||
| 	}); | 	}); | ||||||
| 
 | 
 | ||||||
|  | 	if (cache != nullptr) | ||||||
|  | 		randomx_release_cache(cache); | ||||||
|  | 	cache = randomx_alloc_cache(RANDOMX_FLAG_DEFAULT); | ||||||
|  | 
 | ||||||
| 	runTest("Hash batch test", RANDOMX_HAVE_COMPILER && stringsEqual(RANDOMX_ARGON_SALT, "RandomX\x03"), []() { | 	runTest("Hash batch test", RANDOMX_HAVE_COMPILER && stringsEqual(RANDOMX_ARGON_SALT, "RandomX\x03"), []() { | ||||||
| 		char hash1[RANDOMX_HASH_SIZE]; | 		char hash1[RANDOMX_HASH_SIZE]; | ||||||
| 		char hash2[RANDOMX_HASH_SIZE]; | 		char hash2[RANDOMX_HASH_SIZE]; | ||||||
|  | @ -1070,6 +1075,13 @@ int main() { | ||||||
| 		assert(equalsHex(hash3, "c36d4ed4191e617309867ed66a443be4075014e2b061bcdaf9ce7b721d2b77a8")); | 		assert(equalsHex(hash3, "c36d4ed4191e617309867ed66a443be4075014e2b061bcdaf9ce7b721d2b77a8")); | ||||||
| 	}); | 	}); | ||||||
| 
 | 
 | ||||||
|  | 	runTest("Preserve rounding mode", RANDOMX_FREQ_CFROUND > 0, []() { | ||||||
|  | 		fesetround(FE_TONEAREST); | ||||||
|  | 		char hash[RANDOMX_HASH_SIZE]; | ||||||
|  | 		calcStringHash("test key 000", "Lorem ipsum dolor sit amet", &hash); | ||||||
|  | 		assert(fegetround() == FE_TONEAREST); | ||||||
|  | 	}); | ||||||
|  | 
 | ||||||
| 	randomx_destroy_vm(vm); | 	randomx_destroy_vm(vm); | ||||||
| 	vm = nullptr; | 	vm = nullptr; | ||||||
| 
 | 
 | ||||||
|  |  | ||||||
		Loading…
	
	Add table
		Add a link
		
	
		Reference in a new issue