add Aeon support #67

psychocrypt · 2017-10-24T19:41:02Z

Add support to mine Aeon and Monero from one miner.

By default the miner is build to support both currencies. It is possible to compile the miner to support Monero or Aeon only.
There is a new command line option --currency and a CMake option XMR-STAK_CURRENCY added.
It was on purpose that the options are named currency and the user can choose between monero and aeon. From the perspective of a non export users there are only different currencies and it could be complicated for to understand that the algorithm behind differ and one is called cryptonight and the other cryptonight-lite.

Review

I have split the changes into logical commits thus each commit can be easily review instead of the hole changes.

Test

Note: I have currently no AMD device available (my test system is dead :-( ) Therefore I tested the OpenCL AMD part only on a NVIDIA card. Could some please test this changes with an AMD device.

fireice-uk · 2017-10-25T19:47:34Z

xmrstak/backend/cpu/minethd.cpp

 	};

-	std::bitset<2> digit;
+	std::bitset<3> digit;


You misundestood the code above. Please refer to the comment, we are essentially counting in binary with true / false flags.

So:

false false (00) = 0 false true (01) = 1 true false (10) = 2 true true (11) = 3

For bitset of 3 you need to have 8 entries in the table, and count up to 8.

I will add some comments to this code part.

Ok I see it now, my bad, this part is ok as-is

There are 8 value in the table if XMR-STAK_CURRENCY=all. Else there are 4 values in the table, and bit 3 is always set to 0.

fireice-uk · 2017-10-25T19:54:55Z

xmrstak/cli/cli-miner.cpp

+		{
+			std::string tmp;
+#if defined(CONF_NO_AEON)
+			tmp = "xmr";


Can you change xmr to proper currency name - Monero?

Yes I can change it to 'monero'. I used 'xmr' to keep it short but you are right monero could be better.

fireice-uk · 2017-10-25T20:02:29Z

I hate when that happens too ^^

psychocrypt · 2017-10-26T19:15:51Z

I changed xmr to monero. The writing of monero is case insensitiv to avoid that we get many support tickets because some are writing monero and other Monero

fireice-uk

This is surely a mistake? You seem to have copied the executor singleton into utility.cpp Can you squash the last two commits to make the review easier?

psychocrypt · 2017-10-27T05:38:06Z

Could you please point to the code- can't find the singleton in utility.hpp or cpp.

fireice-uk · 2017-10-27T12:21:22Z

c791cd9 <- this commit added the executor code (+1000 delta lines)

777935c <- removes the code

Can you squash those two together please?

psychocrypt · 2017-10-27T12:24:34Z

Yes I will do.

fireice-uk · 2017-10-27T14:24:38Z

I have an RX480 test rig set up, so will do the AMD testing after the squash

psychocrypt · 2017-10-27T14:48:26Z

I rebased and squash the PR.

fireice-uk · 2017-10-27T16:57:41Z

xmrstak/cli/cli-miner.cpp

@@ -230,10 +245,30 @@ int main(int argc, char *argv[])
 		;
 		configEditor configTpl{};
 		configTpl.set(std::string(tpl));
+		std::cout<<"Please enter:"<<std::endl;
+		auto& currency = params::inst().currency;
+		if(currency.empty())


This if is never executed in my testing. After rm *.txt; ./xmr-stak the miner goes on to mine aeon without prompting.

Just to make sure checked cmake output -> -- Set miner currency to 'monero' and 'aeon'

well spotted: I inserted two logic bugs during the renaming

fix with the last commit

psychocrypt · 2017-10-27T18:00:27Z

xmrstak/cli/cli-miner.cpp

 			tmp = "aeon";
 #endif
-			while(tmp.compare("xmr") != 0 && tmp.compare("aeon") != 0)
+			while(xmrstak::strcmp_i(tmp, "monero") && xmrstak::strcmp_i(tmp, "aeon"))


This line is wrong must be !condition

psychocrypt · 2017-10-27T18:04:10Z

xmrstak/jconf.cpp

-#ifndef CONF_NO_XMR
-			currency.compare("xmr") != 0
+#ifndef CONF_NO_MONERO
+			xmrstak::strcmp_i(currency, "monero")


wrong must be !condition

- add CMake flag description - announce Monero and Aeon in README.md i add FAQ section

- cli-miner.hpp: - add option `--currency` - add guided start section - config.tpl: add value `currency` - params.hpp: add value to store the selected currency - executor.hpp: add dev pool address

... into a single place

- add compile parameter to support aeon and xmr - update auto suggestion to handle aeon

- add template parameter to kernel to support aeon and xmr - update auto suggestion

- update auto suggestion default and hwloc - extent hash function table to support aeon and xmr within one miner

- rename all `xmr` to `monero` - be insensitive while check for set currency - add function to compate two strings insensitive

- fix that currency selection is not called (in cli-miner.cpp) - fix guard to prevent wrong currency selection if compiled for monero or aeon only

fireice-uk · 2017-10-27T19:36:00Z

Ready to merge on my side.

psychocrypt · 2017-10-27T19:36:47Z

frome my side also

bug was introduced with fireice-uk#67 - increase the L3 sanity check to 2GiB - fix usage of byte instead of KB

add Aeon support

bug was introduced with fireice-uk#67 - increase the L3 sanity check to 2GiB - fix usage of byte instead of KB

psychocrypt added backend amd backend cpu backend nvidia enhancement labels Oct 24, 2017

psychocrypt assigned fireice-uk Oct 24, 2017

psychocrypt requested a review from fireice-uk October 24, 2017 19:41

psychocrypt mentioned this pull request Oct 24, 2017

CryptoNight-Lite support? #49

Closed

fireice-uk requested changes Oct 25, 2017

View reviewed changes

Repository owner deleted a comment from psychocoderHPC Oct 25, 2017

psychocrypt force-pushed the topic-aeon2 branch 3 times, most recently from f3e577f to 777935c Compare October 26, 2017 19:14

fireice-uk requested changes Oct 27, 2017

View reviewed changes

psychocrypt force-pushed the topic-aeon2 branch from 777935c to 8ce8172 Compare October 27, 2017 14:47

fireice-uk approved these changes Oct 27, 2017

View reviewed changes

fireice-uk requested changes Oct 27, 2017

View reviewed changes

psychocrypt commented Oct 27, 2017

View reviewed changes

psychocrypt added 4 commits October 27, 2017 20:12

add CMake option XMR-STAK_CURRENCY

b0bb957

update documentation

77666c7

- add CMake flag description - announce Monero and Aeon in README.md i add FAQ section

general aeon support

b0d5f15

- cli-miner.hpp: - add option `--currency` - add guided start section - config.tpl: add value `currency` - params.hpp: add value to store the selected currency - executor.hpp: add dev pool address

collect XMR and Aeon characteristics

e0f0ad4

... into a single place

psychocrypt added 5 commits October 27, 2017 20:12

add eon support to amd backend

2346c8b

- add compile parameter to support aeon and xmr - update auto suggestion to handle aeon

add aeon support to backend nvidia

89749c3

- add template parameter to kernel to support aeon and xmr - update auto suggestion

add aeon support to backend cpu

41451d9

- update auto suggestion default and hwloc - extent hash function table to support aeon and xmr within one miner

rename xmr to monero

12802f1

- rename all `xmr` to `monero` - be insensitive while check for set currency - add function to compate two strings insensitive

fix bug inserted during xmr/monero renaming

0117ed6

- fix that currency selection is not called (in cli-miner.cpp) - fix guard to prevent wrong currency selection if compiled for monero or aeon only

psychocrypt force-pushed the topic-aeon2 branch from f093258 to 0117ed6 Compare October 27, 2017 18:13

fireice-uk approved these changes Oct 27, 2017

View reviewed changes

fireice-uk merged commit c192b97 into fireice-uk:dev Oct 27, 2017

psychocrypt deleted the topic-aeon2 branch October 27, 2017 19:37

psychocrypt added a commit to psychocrypt/xmr-stak that referenced this pull request Jan 9, 2018

fix usage of bytes instead of KB

054ee94

bug was introduced with fireice-uk#67 - increase the L3 sanity check to 2GiB - fix usage of byte instead of KB

psychocrypt mentioned this pull request Jan 9, 2018

fix autosuggestion CPU #846

Merged

gnagel pushed a commit to gnagel/xmr-stak that referenced this pull request Mar 23, 2019

Merge pull request fireice-uk#67 from psychocrypt/topic-aeon2

624ef99

add Aeon support

gnagel pushed a commit to gnagel/xmr-stak that referenced this pull request Mar 23, 2019

fix usage of bytes instead of KB

5196d19

bug was introduced with fireice-uk#67 - increase the L3 sanity check to 2GiB - fix usage of byte instead of KB

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

add Aeon support #67

add Aeon support #67

psychocrypt commented Oct 24, 2017 •

edited by fireice-uk

fireice-uk Oct 25, 2017 •

edited

psychocrypt Oct 25, 2017

fireice-uk Oct 25, 2017

psychocrypt Oct 25, 2017

fireice-uk Oct 25, 2017

psychocrypt Oct 25, 2017

fireice-uk commented Oct 25, 2017

psychocrypt commented Oct 26, 2017

fireice-uk left a comment •

edited

psychocrypt commented Oct 27, 2017

fireice-uk commented Oct 27, 2017

psychocrypt commented Oct 27, 2017 via email

fireice-uk commented Oct 27, 2017

psychocrypt commented Oct 27, 2017

fireice-uk Oct 27, 2017

fireice-uk Oct 27, 2017

psychocrypt Oct 27, 2017

psychocrypt Oct 27, 2017

psychocrypt Oct 27, 2017

fireice-uk commented Oct 27, 2017

psychocrypt commented Oct 27, 2017

add Aeon support #67

add Aeon support #67

Conversation

psychocrypt commented Oct 24, 2017 • edited by fireice-uk

Review

Test

fireice-uk Oct 25, 2017 • edited

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

fireice-uk commented Oct 25, 2017

psychocrypt commented Oct 26, 2017

fireice-uk left a comment • edited

Choose a reason for hiding this comment

psychocrypt commented Oct 27, 2017

fireice-uk commented Oct 27, 2017

psychocrypt commented Oct 27, 2017 via email

fireice-uk commented Oct 27, 2017

psychocrypt commented Oct 27, 2017

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

fireice-uk commented Oct 27, 2017

psychocrypt commented Oct 27, 2017

psychocrypt commented Oct 24, 2017 •

edited by fireice-uk

fireice-uk Oct 25, 2017 •

edited

fireice-uk left a comment •

edited