Skip to content

Performance #77

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
kaffeeguru wants to merge 5 commits into
base: master
Choose a base branch
from
Open

Performance #77

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
6502e4e
test commit
the-real-christoph Jan 11, 2018
0f83aab
duplicate commands inline
the-real-christoph Jan 15, 2018
4730b0a
add info message
the-real-christoph Jan 16, 2018
1153a72
print
the-real-christoph Jan 16, 2018
ddcacab
...
the-real-christoph Jan 16, 2018
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion cpu-miner.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -197,7 +197,7 @@ struct option {

static char const usage[] =
"\
Usage: " PROGRAM_NAME " [OPTIONS]\n\
Usage example: " PROGRAM_NAME " [OPTIONS]\n\
Options:\n\
-a, --algo=ALGO specify the algorithm to use\n\
scrypt scrypt(1024, 1, 1) (default)\n\
Expand Down
26 changes: 25 additions & 1 deletion cryptonight.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,7 @@

// Modified for CPUminer by Lucas Jones

#include <stdio.h>
#include "cpuminer-config.h"
#include "miner.h"
#include "crypto/oaes_lib.h"
Expand Down Expand Up @@ -112,6 +113,7 @@ struct cryptonight_ctx {
oaes_ctx* aes_ctx;
};

// https://cryptonote.org/cns/cns008.txt ?
void cryptonight_hash_ctx(void* output, const void* input, size_t len, struct cryptonight_ctx* ctx) {
hash_process(&ctx->state.hs, (const uint8_t*) input, len);
ctx->aes_ctx = (oaes_ctx*) oaes_alloc();
Expand All @@ -134,7 +136,9 @@ void cryptonight_hash_ctx(void* output, const void* input, size_t len, struct cr
xor_blocks_dst(&ctx->state.k[0], &ctx->state.k[32], ctx->a);
xor_blocks_dst(&ctx->state.k[16], &ctx->state.k[48], ctx->b);

for (i = 0; likely(i < ITER / 4); ++i) {
printf("Before ITER\n");

for (i = 0; likely(i < ITER / 8); ++i) {
/* Dependency chain: address -> read value ------+
* written value <-+ hard function (AES or MUL) <+
* next address <-+
Expand All @@ -151,8 +155,28 @@ void cryptonight_hash_ctx(void* output, const void* input, size_t len, struct cr
xor_blocks_dst(ctx->b, ctx->c, &ctx->long_state[j]);
/* Iteration 4 */
mul_sum_xor_dst(ctx->b, ctx->a, &ctx->long_state[e2i(ctx->b)]);

/* Dependency chain: address -> read value ------+
* written value <-+ hard function (AES or MUL) <+
* next address <-+
*/
/* Iteration 1 */
j = e2i(ctx->a);
aesb_single_round(&ctx->long_state[j], ctx->c, ctx->a);
xor_blocks_dst(ctx->c, ctx->b, &ctx->long_state[j]);
/* Iteration 2 */
mul_sum_xor_dst(ctx->c, ctx->a, &ctx->long_state[e2i(ctx->c)]);
/* Iteration 3 */
j = e2i(ctx->a);
aesb_single_round(&ctx->long_state[j], ctx->b, ctx->a);
xor_blocks_dst(ctx->b, ctx->c, &ctx->long_state[j]);
/* Iteration 4 */
mul_sum_xor_dst(ctx->b, ctx->a, &ctx->long_state[e2i(ctx->b)]);

}

printf("After ITER\n");

memcpy(ctx->text, ctx->state.init, INIT_SIZE_BYTE);
oaes_key_import_data(ctx->aes_ctx, &ctx->state.hs.b[32], AES_KEY_SIZE);
for (i = 0; likely(i < MEMORY); i += INIT_SIZE_BYTE) {
Expand Down