Skip to content
This repository was archived by the owner on Oct 30, 2021. It is now read-only.

Commit 40be01d

Browse files
committed
Update README
1 parent decd863 commit 40be01d

File tree

3 files changed

+87
-158
lines changed

3 files changed

+87
-158
lines changed

.config.old

Lines changed: 10 additions & 84 deletions
Original file line numberDiff line numberDiff line change
@@ -744,25 +744,20 @@ CONFIG_IPV6_NDISC_NODETYPE=y
744744
# CONFIG_IPV6_SEG6_LWTUNNEL is not set
745745
# CONFIG_IPV6_SEG6_HMAC is not set
746746
# CONFIG_NETWORK_SECMARK is not set
747-
CONFIG_NET_PTP_CLASSIFY=y
748-
CONFIG_NETWORK_PHY_TIMESTAMPING=y
747+
# CONFIG_NET_PTP_CLASSIFY is not set
748+
# CONFIG_NETWORK_PHY_TIMESTAMPING is not set
749749
# CONFIG_NETFILTER is not set
750750
# CONFIG_IP_DCCP is not set
751751
# CONFIG_IP_SCTP is not set
752752
# CONFIG_RDS is not set
753753
# CONFIG_TIPC is not set
754754
# CONFIG_ATM is not set
755755
# CONFIG_L2TP is not set
756-
CONFIG_STP=y
757-
CONFIG_GARP=y
758756
# CONFIG_BRIDGE is not set
759757
CONFIG_HAVE_NET_DSA=y
760758
# CONFIG_NET_DSA is not set
761-
CONFIG_VLAN_8021Q=y
762-
CONFIG_VLAN_8021Q_GVRP=y
763-
# CONFIG_VLAN_8021Q_MVRP is not set
759+
# CONFIG_VLAN_8021Q is not set
764760
# CONFIG_DECNET is not set
765-
CONFIG_LLC=y
766761
# CONFIG_LLC2 is not set
767762
# CONFIG_IPX is not set
768763
# CONFIG_ATALK is not set
@@ -800,52 +795,7 @@ CONFIG_NET_FLOW_LIMIT=y
800795
# CONFIG_NET_PKTGEN is not set
801796
# CONFIG_NET_DROP_MONITOR is not set
802797
# CONFIG_HAMRADIO is not set
803-
CONFIG_CAN=y
804-
CONFIG_CAN_RAW=y
805-
CONFIG_CAN_BCM=y
806-
CONFIG_CAN_GW=y
807-
808-
#
809-
# CAN Device Drivers
810-
#
811-
# CONFIG_CAN_VCAN is not set
812-
# CONFIG_CAN_VXCAN is not set
813-
# CONFIG_CAN_SLCAN is not set
814-
CONFIG_CAN_DEV=y
815-
CONFIG_CAN_CALC_BITTIMING=y
816-
# CONFIG_CAN_LEDS is not set
817-
# CONFIG_CAN_FLEXCAN is not set
818-
# CONFIG_CAN_GRCAN is not set
819-
# CONFIG_CAN_TI_HECC is not set
820-
CONFIG_CAN_C_CAN=y
821-
CONFIG_CAN_C_CAN_PLATFORM=y
822-
# CONFIG_CAN_C_CAN_PCI is not set
823-
# CONFIG_CAN_CC770 is not set
824-
# CONFIG_CAN_IFI_CANFD is not set
825-
# CONFIG_CAN_M_CAN is not set
826-
# CONFIG_CAN_PEAK_PCIEFD is not set
827-
# CONFIG_CAN_RCAR is not set
828-
# CONFIG_CAN_RCAR_CANFD is not set
829-
# CONFIG_CAN_SJA1000 is not set
830-
# CONFIG_CAN_SOFTING is not set
831-
832-
#
833-
# CAN SPI interfaces
834-
#
835-
# CONFIG_CAN_HI311X is not set
836-
# CONFIG_CAN_MCP251X is not set
837-
838-
#
839-
# CAN USB interfaces
840-
#
841-
# CONFIG_CAN_EMS_USB is not set
842-
# CONFIG_CAN_ESD_USB2 is not set
843-
# CONFIG_CAN_GS_USB is not set
844-
# CONFIG_CAN_KVASER_USB is not set
845-
# CONFIG_CAN_PEAK_USB is not set
846-
# CONFIG_CAN_8DEV_USB is not set
847-
# CONFIG_CAN_MCBA_USB is not set
848-
CONFIG_CAN_DEBUG_DEVICES=y
798+
# CONFIG_CAN is not set
849799
# CONFIG_BT is not set
850800
# CONFIG_AF_RXRPC is not set
851801
# CONFIG_AF_KCM is not set
@@ -1749,6 +1699,10 @@ CONFIG_SPI_SPIDEV=y
17491699
# PTP clock support
17501700
#
17511701
# CONFIG_PTP_1588_CLOCK is not set
1702+
1703+
#
1704+
# Enable PHYLIB and NETWORK_PHY_TIMESTAMPING to see the additional clocks.
1705+
#
17521706
CONFIG_ARCH_HAVE_CUSTOM_GPIO_H=y
17531707
CONFIG_GPIOLIB=y
17541708
CONFIG_OF_GPIO=y
@@ -2684,36 +2638,8 @@ CONFIG_TMPFS=y
26842638
# CONFIG_TMPFS_XATTR is not set
26852639
# CONFIG_HUGETLB_PAGE is not set
26862640
CONFIG_CONFIGFS_FS=y
2687-
CONFIG_MISC_FILESYSTEMS=y
2688-
# CONFIG_ORANGEFS_FS is not set
2689-
# CONFIG_ADFS_FS is not set
2690-
# CONFIG_AFFS_FS is not set
2691-
# CONFIG_ECRYPT_FS is not set
2692-
# CONFIG_HFS_FS is not set
2693-
# CONFIG_HFSPLUS_FS is not set
2694-
# CONFIG_BEFS_FS is not set
2695-
# CONFIG_BFS_FS is not set
2696-
# CONFIG_EFS_FS is not set
2697-
# CONFIG_CRAMFS is not set
2698-
# CONFIG_SQUASHFS is not set
2699-
# CONFIG_VXFS_FS is not set
2700-
# CONFIG_MINIX_FS is not set
2701-
# CONFIG_OMFS_FS is not set
2702-
# CONFIG_HPFS_FS is not set
2703-
# CONFIG_QNX4FS_FS is not set
2704-
# CONFIG_QNX6FS_FS is not set
2705-
# CONFIG_ROMFS_FS is not set
2706-
# CONFIG_PSTORE is not set
2707-
# CONFIG_SYSV_FS is not set
2708-
# CONFIG_UFS_FS is not set
2709-
CONFIG_NETWORK_FILESYSTEMS=y
2710-
# CONFIG_NFS_FS is not set
2711-
# CONFIG_NFSD is not set
2712-
# CONFIG_CEPH_FS is not set
2713-
# CONFIG_CIFS is not set
2714-
# CONFIG_NCP_FS is not set
2715-
# CONFIG_CODA_FS is not set
2716-
# CONFIG_AFS_FS is not set
2641+
# CONFIG_MISC_FILESYSTEMS is not set
2642+
# CONFIG_NETWORK_FILESYSTEMS is not set
27172643
CONFIG_NLS=y
27182644
CONFIG_NLS_DEFAULT="iso8859-1"
27192645
CONFIG_NLS_CODEPAGE_437=y

README.md

Lines changed: 68 additions & 65 deletions
Original file line numberDiff line numberDiff line change
@@ -204,120 +204,123 @@ sha3.c -> sha3.o
204204
main.o sha3.o -> test
205205
root@de10nano:~/linux-socfpga-sha3-miner/tools/testing/miner# ./test
206206
207-
Poll test
208-
Test 0 65dfa39a0a83fb3d ................................................
209-
Test 1 6c72d7f078940716 ................................................
210-
Test 2 28eb54c3476fbf82 ................................................
211-
Test 3 2a5cef7445664a1b ................................................
212-
Test 4 7cb5be3c59c42fa6 ................................................
213-
Test 5 2c763b2d7ecf7788 ................................................
214-
Test 6 3e042487198ba6d7 ................................................
215-
Test 7 0feb23d55d63b49c ................................................
216-
Test 8 63bd2e361052819c ................................................
217-
Test 9 10e6e17217bdb469 ................................................
207+
Permutation stage test
208+
209+
Test 0 407e0758049d0b43 ................................................
210+
Test 1 582acaed0a5b2461 ................................................
211+
Test 2 783c26f63f572ed8 ................................................
212+
Test 3 6b4d3be558640236 ................................................
213+
Test 4 100e19fc5bb454bc ................................................
214+
Test 5 472bec212ebc9746 ................................................
215+
Test 6 4a4ceb022c632c02 ................................................
216+
Test 7 4769389949d7c4e6 ................................................
217+
Test 8 402ecfda45b559ed ................................................
218+
Test 9 263cc2ad13c68104 ................................................
218219
PASS
219220
220221
Interrupt test
221-
Test 0 5c7fe25e3ca56e20 ................................................
222-
Test 1 260f89a12b716660 ................................................
223-
Test 2 695b5f044b0fa345 ................................................
224-
Test 3 28428d5d5e29bc4c ................................................
225-
Test 4 722f0a916800ce17 ................................................
226-
Test 5 0ae6184d15f17c69 ................................................
227-
Test 6 45ee8c2e1c7f69dc ................................................
228-
Test 7 71f8b36b7bec6558 ................................................
229-
Test 8 1d11692847da8788 ................................................
230-
Test 9 46f93acb58c54cf9 ................................................
222+
223+
Test 0 1c39c47e0a343594 ................................................
224+
Test 1 5774c4a41d654b74 ................................................
225+
Test 2 38cd2c903d4f61a8 ................................................
226+
Test 3 64ba1fdb75250e7d ................................................
227+
Test 4 230a37d027d8fc18 ................................................
228+
Test 5 7fa75b5279c17342 ................................................
229+
Test 6 44141d410d935089 ................................................
230+
Test 7 7f86870c3fe0fa5d ................................................
231+
Test 8 273b032b331bfb8e ................................................
232+
Test 9 56c541f173231eb6 ................................................
231233
PASS
232234
233-
Checking hash rate
234-
Miner clock 75 MHz, pipeline stages 8, expected hash rate 25.00 MH/S
235-
Measured 25.00 MH/S
235+
Hash rate test
236+
237+
Miner clock 93 MHz, pipeline stages 8, expected hash rate 31.00 MH/S
238+
Measured 31.00 MH/S
236239
PASS
237240
238241
Mining test
239242
240243
Search 1
241-
Header: c2a6aa466bbf733ae386ae672bd6c0255168ca348a4ea229ee5a672a626eb17b
242-
Start: 66d7917730b39d2a
243-
Solution: 66d791773a64b9cf (162,602,149 hashes in 6.504 seconds)
244-
Hash: 000000065875bea2d24269231c8859ad3d5872b0954835aee36be917564d4c5c
244+
Header: 8c70c521f02d6c0d2e5bf63c580e19596006ee44a2f78b59639f37221457f31f
245+
Start: 59dc07574dc801a2
246+
Solution: 59dc075750f39248 (53,186,726 hashes)
247+
Hash: 0000000189ffbac8ce8d11e655a700ab78892d379227becac54fdbed98f2fa78
245248
Difficulty: 00000007ffffffffffffffffffffffffffffffffffffffffffffffffffffffff
246249
PASS
247250
248251
Search 2
249-
Header: e466e124e4d1da64fb61ac3ff1d2fa6c33bf0b445c427f5f747d212785ee2551
250-
Start: 0436396543385595
251-
Solution: 043639656194230d (509,332,856 hashes in 20.373 seconds)
252-
Hash: 00000004173a5a11e1e9e50f33e21c7fd19826c8fc1fc9a7021925a27566398f
252+
Header: 10836d3238fe0265629bdc49c237032a06715a29310aab5d4a3d5821a7990a7c
253+
Start: 5ad3f8a135ac2f9a
254+
Solution: 5ad3f8a1841dbcc8 (1,316,064,558 hashes)
255+
Hash: 000000054f0279237c0cc086e2c95afd231514925567f0d9b1df63092870defb
253256
Difficulty: 00000007ffffffffffffffffffffffffffffffffffffffffffffffffffffffff
254257
PASS
255258
256259
Search 3
257-
Header: df10fd3111158136de94655e090b23484f60091da7e9fc4b0d4f1052a6232f76
258-
Start: 57011f1f40718962
259-
Solution: 57011f1f54151599 (329,485,367 hashes in 13.180 seconds)
260-
Hash: 000000028223dc8143e96621b5cbae20ae6eb10e326dacaa916e1b99e38c91cf
260+
Header: d6a1cd543ab6591d6a2d5d465ed979148e7c0874d3b960027da0f201df2aa114
261+
Start: 6cb423f27e56b7ae
262+
Solution: 6cb423f283995212 (88,250,980 hashes)
263+
Hash: 00000003c031045e1117b61c13d9689e5ba4e69d4b70cf33e6b1ced8f1ae585c
261264
Difficulty: 00000007ffffffffffffffffffffffffffffffffffffffffffffffffffffffff
262265
PASS
263266
264267
Search 4
265-
Header: c7d38857e1c5ab1dce48e57aaa5a373f0c9c6c431fb1af2f34a9d968faf6d36d
266-
Start: 2b611f814fb13aac
267-
Solution: 2b611f81590854a1 (156,703,221 hashes in 6.268 seconds)
268-
Hash: 000000057360f8844b506e1a31f06677e186902db10c1b720447914c10cd3c67
268+
Header: aac179487e94790e9ee5c20bd81c7005d7a29267feebb0507b14fc5e3a42ca09
269+
Start: 70a4431238d81bd2
270+
Solution: 70a44312bf88d8c6 (2,259,729,652 hashes)
271+
Hash: 000000068019e27f3aecb15ab5ba7b8d44c5ba8ab913a21502c647358703fb68
269272
Difficulty: 00000007ffffffffffffffffffffffffffffffffffffffffffffffffffffffff
270273
PASS
271274
272275
Search 5
273-
Header: 2494871e66864250900c8c341ff6335e57593d3dc3cb97787b38b33dccd65e64
274-
Start: 49bdba4941e971e0
275-
Solution: 49bdba49587378a6 (378,144,454 hashes in 15.126 seconds)
276-
Hash: 00000003fd544dd7612d8ca58a347bb16ef0c15f25c4339b6d5f56079be64f24
276+
Header: dc43925723c611230a1adb1d3fdf6e21e5fd144d108b354770e9197f303b6d6e
277+
Start: 434024b759ede211
278+
Solution: 434024b76391f6cc (161,748,155 hashes)
279+
Hash: 00000000ea972c480a4386347bdb9765f847c7d3fe0434d875737b4ce616da1f
277280
Difficulty: 00000007ffffffffffffffffffffffffffffffffffffffffffffffffffffffff
278281
PASS
279282
280283
Search 6
281-
Header: 612c972728cbba7bf1866a783fc1fc0531d6dd4341e77315e6aaf9513e25ee15
282-
Start: 0ba30ae728faca05
283-
Solution: 0ba30ae7538aae12 (714,073,101 hashes in 28.563 seconds)
284-
Hash: 00000003fab36541bae54c27d9caee05a0f12400d52a578e7593c9dfee46c69c
284+
Header: ca6a19248dc60d184b9847773498766aec9f872cd914506b0752d76c69407a2e
285+
Start: 7ff13fb9598b75fa
286+
Solution: 7ff13fb95f36fb91 (95,126,935 hashes)
287+
Hash: 00000002e97e6b6c814c85a4bf38dcac30a07c69893ab7e88cada26fc774f853
285288
Difficulty: 00000007ffffffffffffffffffffffffffffffffffffffffffffffffffffffff
286289
PASS
287290
288291
Search 7
289-
Header: a1ae5f56aede2b63e68fa6466ff7445158396322f22b130a8ea8f4008de23c0b
290-
Start: 77e722ec2c55c80f
291-
Solution: 77e722ec594281e5 (753,711,574 hashes in 30.149 seconds)
292-
Hash: 00000001351925e01b94ef3bb9d6444c61dedcf936c20f988702bf7d591b7526
292+
Header: 17f8d02c63016b48780a0568b5dd93383c1edb4d4fad974fb3c94409b732d72c
293+
Start: 5961ef8979e90cc6
294+
Solution: 5961ef898edca07b (351,507,381 hashes)
295+
Hash: 00000006acce4539f97d0610957b7e93d3b8aecbe9d4933a034f89e4b8815926
293296
Difficulty: 00000007ffffffffffffffffffffffffffffffffffffffffffffffffffffffff
294297
PASS
295298
296299
Search 8
297-
Header: 391dee5a10b76e16754e987cc9297a0f2fada274cda7d5398df51108aae55532
298-
Start: 1e347e9951cfafd6
299-
Solution: 1e347e9977cb62c8 (637,252,338 hashes in 25.491 seconds)
300-
Hash: 00000001e1b51d3534aa1d0dfe2030ec63b6a98a233f13a52bf0e9eedad5cc5d
300+
Header: 894eaf656633f430e9d2fa1c93688a03a5126352ced00f6aa4f3bf4a15fc7c51
301+
Start: 587d0bfe0e00185b
302+
Solution: 587d0bfe1c25ecc0 (237,360,229 hashes)
303+
Hash: 000000016283025bc9db671f42549f1ce8d9468a147567446d8634af91a07e73
301304
Difficulty: 00000007ffffffffffffffffffffffffffffffffffffffffffffffffffffffff
302305
PASS
303306
304307
Search 9
305-
Header: 8b573f74faaacb45fe7a8a4d7cdea96c3a6cc84b30516811bdc51d022017c21d
306-
Start: 2756766e0dc0d0a4
307-
Solution: 2756766e20078100 (306,622,556 hashes in 12.265 seconds)
308-
Hash: 000000022d55a0aa9883e738e8d11a699f1c85ec71d30bae45759fca30691cd4
308+
Header: 26de6a2bc876967ce9de0d267176b222fc0e0d67d57e95524a8b020e0461e453
309+
Start: 010fbf3e0df3cb03
310+
Solution: 010fbf3e28c7f27a (450,111,351 hashes)
311+
Hash: 00000007c8f5966cf709f935618e5ee7f1530d721cb287e5bd2233db03306549
309312
Difficulty: 00000007ffffffffffffffffffffffffffffffffffffffffffffffffffffffff
310313
PASS
311314
312315
Search 10
313-
Header: 26e1bc460f25b67d52afec700c71630d7e1cfb4eabe84f13ff9c76170cc5ef4f
314-
Start: 1e8ccb380f5dbfeb
315-
Solution: 1e8ccb38391109ae (699,615,683 hashes in 27.985 seconds)
316-
Hash: 000000025858e7d2bdd0d01e0d63bddc08229b7e0032586bcfe08aefc5704b94
316+
Header: fed66f2d55b7e02d67cc5e5676e174150a957466a3ea3924c68e0c65bd5eb96f
317+
Start: 51111d5a3e6e7e4f
318+
Solution: 51111d5a7ec004d0 (1,079,084,673 hashes)
319+
Hash: 000000007d6548b93febbe7811c7b454e9db4a8ab995e3b76a20a133f202e502
317320
Difficulty: 00000007ffffffffffffffffffffffffffffffffffffffffffffffffffffffff
318321
PASS
319322
320-
root@de10nano:~/linux-socfpga-sha3-miner/tools/testing/miner#
323+
root@de10nano:~/linux-socfpga-sha3-miner/tools/testing/miner#
321324
```
322325

323326
You can also rebuild the kernel (it will take a very long time on the NANO)

tools/testing/miner/main.c

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -143,7 +143,7 @@ static int mine(int stages)
143143
uint32_t block[10];
144144
uint32_t hash[8];
145145

146-
printf("Header: ");
146+
printf("Header: ");
147147
for (int i = 0; i < 8; i++)
148148
{
149149
block[i] = rand();
@@ -154,7 +154,7 @@ static int mine(int stages)
154154

155155
uint64_t start = ((uint64_t)rand() << 32) | rand();
156156
write_reg64_be(MINER_START_REG, start);
157-
printf("Start: %016llx\n", start);
157+
printf("Start: %016llx\n", start);
158158

159159
for (int i = 0; i < 8; i++)
160160
write_reg32(MINER_DIFF_REG + i, 0xffffffff);
@@ -191,7 +191,7 @@ static int mine(int stages)
191191
uint64_t solution = read_reg64_le(MINER_SOLN_REG);
192192
write_reg32(MINER_CTL_REG, 0);
193193

194-
printf("Solution: %016llx (%'llu hashes)\n", solution, solution - start);
194+
printf("Solution: %016llx (%'llu hashes)\n", solution, solution - start);
195195

196196
if (timeout)
197197
{
@@ -203,11 +203,11 @@ static int mine(int stages)
203203
block[9] = swap32(solution);
204204

205205
sha3_HashBuffer(256, SHA3_FLAGS_KECCAK, block, sizeof(block), hash, sizeof(hash));
206-
printf("Hash: ");
206+
printf("Hash: ");
207207
for (int i = 0; i < 8; i++)
208208
printf("%08x", swap32(hash[i]));
209209
printf("\n");
210-
printf("Diff: ");
210+
printf("Difficulty: ");
211211
for (int i = 0; i < 8; i++)
212212
printf("%08x", read_reg32(MINER_DIFF_REG + i));
213213
printf("\n");
@@ -270,7 +270,7 @@ int main()
270270
exit(EXIT_FAILURE);
271271
}
272272

273-
printf("\nPoll test\n");
273+
printf("\nPermutation stage test\n\n");
274274
for (int t = 0; t < 10; t++)
275275
{
276276
uint64_t start = (uint64_t)rand() << 32 | rand();
@@ -286,7 +286,7 @@ int main()
286286
if (!pass)
287287
return -1;
288288

289-
printf("\nInterrupt test\n");
289+
printf("\nInterrupt test\n\n");
290290
for (int t = 0; t < 10; t++)
291291
{
292292
uint64_t start;
@@ -303,7 +303,7 @@ int main()
303303
if (!pass)
304304
return -1;
305305

306-
printf("Checking hash rate\n");
306+
printf("Hash rate test\n\n");
307307
uint32_t h = bitfield(STATUS, MHZ);
308308
uint8_t stages = bitfield(STATUS, STAGES);
309309

@@ -312,7 +312,7 @@ int main()
312312
expected);
313313
double r = rate() / 1.0e6;
314314
int pass = fabs(r - expected) < (expected * .001);
315-
printf("Measured %'.2f MH/S, %s\n", r, pass ? "PASS" : "FAIL");
315+
printf("Measured %'.2f MH/S\n%s\n", r, pass ? "PASS" : "FAIL");
316316
if (!pass)
317317
return -1;
318318

0 commit comments

Comments
 (0)