Skip to content

Commit 360c8ed

Browse files
tevadortevador
committed
Fixed superscalar test projects
1 parent 0d21ae8 commit 360c8ed

12 files changed

+31
-168
lines changed

‎src/blake2_benerator.cpp renamed to ‎src/blake2_generator.cpp

File renamed without changes.

‎src/tests/superscalar-avalanche.cpp

+8-10
Original file line numberDiff line numberDiff line change
@@ -20,10 +20,8 @@ along with RandomX. If not, see<http://www.gnu.org/licenses/>.
2020
#include <iostream>
2121
#include <cstdint>
2222
#include <vector>
23-
#include "../superscalarGenerator.hpp"
24-
#include "../InterpretedVirtualMachine.hpp"
25-
#include "../intrinPortable.h"
26-
#include "../Blake2Generator.hpp"
23+
#include "../superscalar.hpp"
24+
#include "../intrin_portable.h"
2725

2826
const uint8_t seed[32] = { 191, 182, 222, 175, 249, 89, 134, 104, 241, 68, 191, 62, 162, 166, 61, 64, 123, 191, 227, 193, 118, 60, 188, 53, 223, 133, 175, 24, 123, 230, 55, 74 };
2927

@@ -35,7 +33,7 @@ int main() {
3533
for (int i = 0; i < 10000; ++i) {
3634
uint64_t ra[8] = {
3735
6364136223846793005ULL,
38-
9298410992540426048ULL,
36+
9298410992540426748ULL,
3937
12065312585734608966ULL,
4038
9306329213124610396ULL,
4139
5281919268842080866ULL,
@@ -46,11 +44,11 @@ int main() {
4644
uint64_t rb[8];
4745
memcpy(rb, ra, sizeof rb);
4846
rb[0] ^= (1ULL << bit);
49-
RandomX::SuperscalarProgram p;
50-
RandomX::Blake2Generator gen(seed, i);
51-
RandomX::generateSuperscalar(p, gen);
52-
RandomX::InterpretedVirtualMachine<false>::executeSuperscalar(ra, p, dummy);
53-
RandomX::InterpretedVirtualMachine<false>::executeSuperscalar(rb, p, dummy);
47+
randomx::SuperscalarProgram p;
48+
randomx::Blake2Generator gen(seed, sizeof seed, i);
49+
randomx::generateSuperscalar(p, gen);
50+
randomx::executeSuperscalar(ra, p, nullptr);
51+
randomx::executeSuperscalar(rb, p, nullptr);
5452
uint64_t diff = 0;
5553
for (int j = 0; j < 8; ++j) {
5654
diff += __popcnt64(ra[j] ^ rb[j]);

‎src/tests/superscalar-init.cpp

+3-5
Original file line numberDiff line numberDiff line change
@@ -21,10 +21,8 @@ along with RandomX. If not, see<http://www.gnu.org/licenses/>.
2121
#include <cstdint>
2222
#include <vector>
2323
#include <unordered_set>
24-
#include "../superscalarGenerator.hpp"
25-
#include "../InterpretedVirtualMachine.hpp"
26-
#include "../intrinPortable.h"
27-
#include "../configuration.h"
24+
#include "../superscalar.hpp"
25+
#include "../common.hpp"
2826

2927
const uint8_t seed[32] = { 191, 182, 222, 175, 249, 89, 134, 104, 241, 68, 191, 62, 162, 166, 61, 64, 123, 191, 227, 193, 118, 60, 188, 53, 223, 133, 175, 24, 123, 230, 55, 74 };
3028

@@ -39,7 +37,7 @@ int main() {
3937
constexpr uint64_t superscalarAdd5 = 10536153434571861004ULL;
4038
constexpr uint64_t superscalarAdd6 = 3398623926847679864ULL;
4139
constexpr uint64_t superscalarAdd7 = 9549104520008361294ULL;
42-
constexpr uint32_t totalBlocks = RANDOMX_DATASET_SIZE / RandomX::CacheLineSize;
40+
constexpr uint32_t totalBlocks = RANDOMX_DATASET_SIZE / randomx::CacheLineSize;
4341
std::unordered_set<uint64_t> registerValues;
4442
registerValues.reserve(totalBlocks);
4543
registerValues.rehash(totalBlocks);

‎src/tests/superscalar-stats.cpp

+5-5
Original file line numberDiff line numberDiff line change
@@ -19,8 +19,8 @@ along with RandomX. If not, see<http://www.gnu.org/licenses/>.
1919

2020
#include <iostream>
2121
#include <cstdint>
22-
#include "../superscalarGenerator.hpp"
23-
#include "../Blake2Generator.hpp"
22+
#include "../superscalar.hpp"
23+
#include "../blake2_generator.hpp"
2424

2525
const uint8_t seed[32] = { 191, 182, 222, 175, 249, 89, 134, 104, 241, 68, 191, 62, 162, 166, 61, 64, 123, 191, 227, 193, 118, 60, 188, 53, 223, 133, 175, 24, 123, 230, 55, 74 };
2626

@@ -34,9 +34,9 @@ int main() {
3434
int64_t mulCount = 0;
3535
int64_t size = 0;
3636
for (int i = 0; i < count; ++i) {
37-
RandomX::SuperscalarProgram prog;
38-
RandomX::Blake2Generator gen(seed, i);
39-
RandomX::generateSuperscalar(prog, gen);
37+
randomx::SuperscalarProgram prog;
38+
randomx::Blake2Generator gen(seed, i);
39+
randomx::generateSuperscalar(prog, gen);
4040
asicLatency += prog.asicLatency;
4141
codesize += prog.codeSize;
4242
cpuLatency += prog.cpuLatency;

‎vcxproj/randomx.vcxproj

+1-1
Original file line numberDiff line numberDiff line change
@@ -128,7 +128,7 @@
128128
<ClCompile Include="..\src\argon2_core.c" />
129129
<ClCompile Include="..\src\argon2_ref.c" />
130130
<ClCompile Include="..\src\assembly_generator_x86.cpp" />
131-
<ClCompile Include="..\src\blake2_benerator.cpp" />
131+
<ClCompile Include="..\src\blake2_generator.cpp" />
132132
<ClCompile Include="..\src\blake2\blake2b.c" />
133133
<ClCompile Include="..\src\vm_compiled_light.cpp" />
134134
<ClCompile Include="..\src\vm_compiled.cpp" />

‎vcxproj/randomx.vcxproj.filters

+3-3
Original file line numberDiff line numberDiff line change
@@ -39,9 +39,6 @@
3939
<ClCompile Include="..\src\assembly_generator_x86.cpp">
4040
<Filter>Source Files</Filter>
4141
</ClCompile>
42-
<ClCompile Include="..\src\blake2_benerator.cpp">
43-
<Filter>Source Files</Filter>
44-
</ClCompile>
4542
<ClCompile Include="..\src\vm_compiled_light.cpp">
4643
<Filter>Source Files</Filter>
4744
</ClCompile>
@@ -78,6 +75,9 @@
7875
<ClCompile Include="..\src\virtual_memory.cpp">
7976
<Filter>Source Files</Filter>
8077
</ClCompile>
78+
<ClCompile Include="..\src\blake2_generator.cpp">
79+
<Filter>Source Files</Filter>
80+
</ClCompile>
8181
</ItemGroup>
8282
<ItemGroup>
8383
<ClInclude Include="..\src\argon2.h">

‎vcxproj/superscalar-avalanche.vcxproj

+3-16
Original file line numberDiff line numberDiff line change
@@ -116,25 +116,12 @@
116116
</Link>
117117
</ItemDefinitionGroup>
118118
<ItemGroup>
119-
<ClCompile Include="..\src\argon2_core.c" />
120-
<ClCompile Include="..\src\argon2_ref.c" />
121-
<ClCompile Include="..\src\Blake2Generator.cpp" />
122-
<ClCompile Include="..\src\blake2\blake2b.c" />
123-
<ClCompile Include="..\src\Cache.cpp" />
124-
<ClCompile Include="..\src\dataset.cpp" />
125-
<ClCompile Include="..\src\hashAes1Rx4.cpp" />
126-
<ClCompile Include="..\src\Instruction.cpp" />
127-
<ClCompile Include="..\src\instructionsPortable.cpp" />
128-
<ClCompile Include="..\src\InterpretedVirtualMachine.cpp" />
129-
<ClCompile Include="..\src\reciprocal.c" />
130-
<ClCompile Include="..\src\softAes.cpp" />
131-
<ClCompile Include="..\src\superscalarGenerator.cpp" />
132119
<ClCompile Include="..\src\tests\superscalar-avalanche.cpp" />
133-
<ClCompile Include="..\src\VirtualMachine.cpp" />
134-
<ClCompile Include="..\src\virtualMemory.cpp" />
135120
</ItemGroup>
136121
<ItemGroup>
137-
<MASM Include="..\src\squareHash.asm" />
122+
<ProjectReference Include="randomx.vcxproj">
123+
<Project>{3346a4ad-c438-4324-8b77-47a16452954b}</Project>
124+
</ProjectReference>
138125
</ItemGroup>
139126
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
140127
<ImportGroup Label="ExtensionTargets">

‎vcxproj/superscalar-avalanche.vcxproj.filters

-50
Original file line numberDiff line numberDiff line change
@@ -18,55 +18,5 @@
1818
<ClCompile Include="..\src\tests\superscalar-avalanche.cpp">
1919
<Filter>Source Files</Filter>
2020
</ClCompile>
21-
<ClCompile Include="..\src\InterpretedVirtualMachine.cpp">
22-
<Filter>Source Files</Filter>
23-
</ClCompile>
24-
<ClCompile Include="..\src\instructionsPortable.cpp">
25-
<Filter>Source Files</Filter>
26-
</ClCompile>
27-
<ClCompile Include="..\src\Instruction.cpp">
28-
<Filter>Source Files</Filter>
29-
</ClCompile>
30-
<ClCompile Include="..\src\Cache.cpp">
31-
<Filter>Source Files</Filter>
32-
</ClCompile>
33-
<ClCompile Include="..\src\VirtualMachine.cpp">
34-
<Filter>Source Files</Filter>
35-
</ClCompile>
36-
<ClCompile Include="..\src\argon2_core.c">
37-
<Filter>Source Files</Filter>
38-
</ClCompile>
39-
<ClCompile Include="..\src\argon2_ref.c">
40-
<Filter>Source Files</Filter>
41-
</ClCompile>
42-
<ClCompile Include="..\src\reciprocal.c">
43-
<Filter>Source Files</Filter>
44-
</ClCompile>
45-
<ClCompile Include="..\src\blake2\blake2b.c">
46-
<Filter>Source Files</Filter>
47-
</ClCompile>
48-
<ClCompile Include="..\src\hashAes1Rx4.cpp">
49-
<Filter>Source Files</Filter>
50-
</ClCompile>
51-
<ClCompile Include="..\src\softAes.cpp">
52-
<Filter>Source Files</Filter>
53-
</ClCompile>
54-
<ClCompile Include="..\src\dataset.cpp">
55-
<Filter>Source Files</Filter>
56-
</ClCompile>
57-
<ClCompile Include="..\src\virtualMemory.cpp">
58-
<Filter>Source Files</Filter>
59-
</ClCompile>
60-
<ClCompile Include="..\src\superscalarGenerator.cpp">
61-
<Filter>Source Files</Filter>
62-
</ClCompile>
63-
<ClCompile Include="..\src\Blake2Generator.cpp">
64-
<Filter>Source Files</Filter>
65-
</ClCompile>
66-
</ItemGroup>
67-
<ItemGroup>
68-
<MASM Include="..\src\squareHash.asm">
69-
<Filter>Source Files</Filter>
70-
</MASM>
7121
</ItemGroup>
7222
</Project>

‎vcxproj/superscalar-init.vcxproj

+3-16
Original file line numberDiff line numberDiff line change
@@ -116,25 +116,12 @@
116116
</Link>
117117
</ItemDefinitionGroup>
118118
<ItemGroup>
119-
<ClCompile Include="..\src\argon2_core.c" />
120-
<ClCompile Include="..\src\argon2_ref.c" />
121-
<ClCompile Include="..\src\Blake2Generator.cpp" />
122-
<ClCompile Include="..\src\blake2\blake2b.c" />
123-
<ClCompile Include="..\src\Cache.cpp" />
124-
<ClCompile Include="..\src\dataset.cpp" />
125-
<ClCompile Include="..\src\hashAes1Rx4.cpp" />
126-
<ClCompile Include="..\src\Instruction.cpp" />
127-
<ClCompile Include="..\src\instructionsPortable.cpp" />
128-
<ClCompile Include="..\src\InterpretedVirtualMachine.cpp" />
129-
<ClCompile Include="..\src\reciprocal.c" />
130-
<ClCompile Include="..\src\softAes.cpp" />
131-
<ClCompile Include="..\src\superscalarGenerator.cpp" />
132119
<ClCompile Include="..\src\tests\superscalar-init.cpp" />
133-
<ClCompile Include="..\src\VirtualMachine.cpp" />
134-
<ClCompile Include="..\src\virtualMemory.cpp" />
135120
</ItemGroup>
136121
<ItemGroup>
137-
<MASM Include="..\src\squareHash.asm" />
122+
<ProjectReference Include="randomx.vcxproj">
123+
<Project>{3346a4ad-c438-4324-8b77-47a16452954b}</Project>
124+
</ProjectReference>
138125
</ItemGroup>
139126
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
140127
<ImportGroup Label="ExtensionTargets">

‎vcxproj/superscalar-init.vcxproj.filters

-50
Original file line numberDiff line numberDiff line change
@@ -15,58 +15,8 @@
1515
</Filter>
1616
</ItemGroup>
1717
<ItemGroup>
18-
<ClCompile Include="..\src\argon2_core.c">
19-
<Filter>Source Files</Filter>
20-
</ClCompile>
21-
<ClCompile Include="..\src\argon2_ref.c">
22-
<Filter>Source Files</Filter>
23-
</ClCompile>
24-
<ClCompile Include="..\src\blake2\blake2b.c">
25-
<Filter>Source Files</Filter>
26-
</ClCompile>
27-
<ClCompile Include="..\src\Cache.cpp">
28-
<Filter>Source Files</Filter>
29-
</ClCompile>
30-
<ClCompile Include="..\src\dataset.cpp">
31-
<Filter>Source Files</Filter>
32-
</ClCompile>
33-
<ClCompile Include="..\src\hashAes1Rx4.cpp">
34-
<Filter>Source Files</Filter>
35-
</ClCompile>
36-
<ClCompile Include="..\src\Instruction.cpp">
37-
<Filter>Source Files</Filter>
38-
</ClCompile>
39-
<ClCompile Include="..\src\instructionsPortable.cpp">
40-
<Filter>Source Files</Filter>
41-
</ClCompile>
42-
<ClCompile Include="..\src\InterpretedVirtualMachine.cpp">
43-
<Filter>Source Files</Filter>
44-
</ClCompile>
45-
<ClCompile Include="..\src\reciprocal.c">
46-
<Filter>Source Files</Filter>
47-
</ClCompile>
48-
<ClCompile Include="..\src\softAes.cpp">
49-
<Filter>Source Files</Filter>
50-
</ClCompile>
5118
<ClCompile Include="..\src\tests\superscalar-init.cpp">
5219
<Filter>Source Files</Filter>
5320
</ClCompile>
54-
<ClCompile Include="..\src\VirtualMachine.cpp">
55-
<Filter>Source Files</Filter>
56-
</ClCompile>
57-
<ClCompile Include="..\src\virtualMemory.cpp">
58-
<Filter>Source Files</Filter>
59-
</ClCompile>
60-
<ClCompile Include="..\src\superscalarGenerator.cpp">
61-
<Filter>Source Files</Filter>
62-
</ClCompile>
63-
<ClCompile Include="..\src\Blake2Generator.cpp">
64-
<Filter>Source Files</Filter>
65-
</ClCompile>
66-
</ItemGroup>
67-
<ItemGroup>
68-
<MASM Include="..\src\squareHash.asm">
69-
<Filter>Source Files</Filter>
70-
</MASM>
7121
</ItemGroup>
7222
</Project>

‎vcxproj/superscalar-stats.vcxproj

+5-3
Original file line numberDiff line numberDiff line change
@@ -115,11 +115,13 @@
115115
</Link>
116116
</ItemDefinitionGroup>
117117
<ItemGroup>
118-
<ClCompile Include="..\src\Blake2Generator.cpp" />
119-
<ClCompile Include="..\src\blake2\blake2b.c" />
120-
<ClCompile Include="..\src\superscalarGenerator.cpp" />
121118
<ClCompile Include="..\src\tests\superscalar-stats.cpp" />
122119
</ItemGroup>
120+
<ItemGroup>
121+
<ProjectReference Include="randomx.vcxproj">
122+
<Project>{3346a4ad-c438-4324-8b77-47a16452954b}</Project>
123+
</ProjectReference>
124+
</ItemGroup>
123125
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
124126
<ImportGroup Label="ExtensionTargets">
125127
</ImportGroup>

‎vcxproj/superscalar-stats.vcxproj.filters

-9
Original file line numberDiff line numberDiff line change
@@ -18,14 +18,5 @@
1818
<ClCompile Include="..\src\tests\superscalar-stats.cpp">
1919
<Filter>Source Files</Filter>
2020
</ClCompile>
21-
<ClCompile Include="..\src\Blake2Generator.cpp">
22-
<Filter>Source Files</Filter>
23-
</ClCompile>
24-
<ClCompile Include="..\src\superscalarGenerator.cpp">
25-
<Filter>Source Files</Filter>
26-
</ClCompile>
27-
<ClCompile Include="..\src\blake2\blake2b.c">
28-
<Filter>Source Files</Filter>
29-
</ClCompile>
3021
</ItemGroup>
3122
</Project>

0 commit comments

Comments
 (0)