Skip to content
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

Jump to bottom

Support "--pow-threads" command line option of IRI #87

Merged
merged 1 commit into from
Nov 30, 2018
Merged

Support "--pow-threads" command line option of IRI #87

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
5 changes: 3 additions & 2 deletions jni/iri-pearldiver-exlib.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,8 @@ JNIEXPORT jboolean JNICALL
Java_com_iota_iri_hash_PearlDiver_exlib_1search(JNIEnv *env,
jclass clazz,
jbyteArray trits,
jint mwm)
jint mwm,
jint threads)
{
/*********** Get the Byte array from Java byte Array *************/
jbyte *c_trits = (*env)->GetByteArrayElements(env, trits, NULL);
Expand All @@ -27,7 +28,7 @@ Java_com_iota_iri_hash_PearlDiver_exlib_1search(JNIEnv *env,
return JNI_FALSE;
/****************************************************************/

int8_t *result = dcurl_entry(arg_trytes->data, mwm);
int8_t *result = dcurl_entry(arg_trytes->data, mwm, threads);
marktwtn marked this conversation as resolved.
Show resolved Hide resolved

/************ Write result back Java byte array *****************/
Trytes_t *ret_trytes = initTrytes(result, 2673);
Expand Down
2 changes: 1 addition & 1 deletion src/compat-ccurl.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@ char *ccurl_pow(char *trytes, int mwm)
isInitialized = true;
}
pthread_mutex_unlock(&mtx);
return (char *) dcurl_entry((int8_t *) trytes, mwm);
return (char *) dcurl_entry((int8_t *) trytes, mwm, 1);
}

void ccurl_pow_finalize(void)
Expand Down
4 changes: 2 additions & 2 deletions src/dcurl.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -98,7 +98,7 @@ void dcurl_destroy()
}


int8_t *dcurl_entry(int8_t *trytes, int mwm)
int8_t *dcurl_entry(int8_t *trytes, int mwm, int threads)
{
void *pow_ctx = NULL;
int8_t *res = NULL;
Expand All @@ -112,7 +112,7 @@ int8_t *dcurl_entry(int8_t *trytes, int mwm)
list_for_each(p, &IMPL_LIST) {
impl = list_entry(p, ImplContext, list);
if (enterImplContext(impl)) {
pow_ctx = getPoWContext(impl, trytes, mwm);
pow_ctx = getPoWContext(impl, trytes, mwm, threads);
goto pow;
}
}
Expand Down
2 changes: 1 addition & 1 deletion src/dcurl.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,6 @@

bool dcurl_init();
void dcurl_destroy();
int8_t *dcurl_entry(int8_t *trytes, int mwm);
int8_t *dcurl_entry(int8_t *trytes, int mwm, int threads);

#endif
4 changes: 2 additions & 2 deletions src/implcontext.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -45,9 +45,9 @@ void exitImplContext(ImplContext *impl_ctx)
pthread_mutex_unlock(&impl_ctx->lock);
}

void *getPoWContext(ImplContext *impl_ctx, int8_t *trytes, int mwm)
void *getPoWContext(ImplContext *impl_ctx, int8_t *trytes, int mwm, int threads)
{
return impl_ctx->getPoWContext(impl_ctx, trytes, mwm);
return impl_ctx->getPoWContext(impl_ctx, trytes, mwm, threads);
}

bool doThePoW(ImplContext *impl_ctx, void *pow_ctx)
Expand Down
4 changes: 2 additions & 2 deletions src/implcontext.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@ struct _impl_context {
bool (*initialize)(ImplContext *impl_ctx);
void (*destroy)(ImplContext *impl_ctx);
/* Private PoW Context for each thread */
void *(*getPoWContext)(ImplContext *impl_ctx, int8_t *trytes, int mwm);
void *(*getPoWContext)(ImplContext *impl_ctx, int8_t *trytes, int mwm, int threads);
bool (*doThePoW)(void *pow_ctx);
int8_t *(*getPoWResult)(void *pow_ctx);
PoW_Info (*getPoWInfo)(void *pow_ctx);
Expand All @@ -38,7 +38,7 @@ bool initializeImplContext(ImplContext *impl_ctx);
void destroyImplContext(ImplContext *impl_ctx);
bool enterImplContext(ImplContext *impl_ctx);
void exitImplContext(ImplContext *impl_ctx);
void *getPoWContext(ImplContext *impl_ctx, int8_t *trytes, int mwm);
void *getPoWContext(ImplContext *impl_ctx, int8_t *trytes, int mwm, int threads);
bool doThePoW(ImplContext *impl_ctx, void *pow_ctx);
bool freePoWContext(ImplContext *impl_ctx, void *pow_ctx);
int8_t *getPoWResult(ImplContext *impl_ctx, void *pow_ctx);
Expand Down
8 changes: 6 additions & 2 deletions src/pow_avx.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -577,7 +577,7 @@ static bool PoWAVX_Context_Initialize(ImplContext *impl_ctx)
for (int j = 0; j < nproc; j++)
ctx[i].nonce_array[j] = (int8_t *) (nonce_chunk + i * NONCE_TRITS_LENGTH * nproc +
j * NONCE_TRITS_LENGTH);
ctx[i].num_threads = nproc;
ctx[i].num_max_threads = nproc;
impl_ctx->bitmap = impl_ctx->bitmap << 1 | 0x1;
}
impl_ctx->context = ctx;
Expand All @@ -603,7 +603,7 @@ static void PoWAVX_Context_Destroy(ImplContext *impl_ctx)
free(ctx);
}

static void *PoWAVX_getPoWContext(ImplContext *impl_ctx, int8_t *trytes, int mwm)
static void *PoWAVX_getPoWContext(ImplContext *impl_ctx, int8_t *trytes, int mwm, int threads)
{
pthread_mutex_lock(&impl_ctx->lock);
for (int i = 0; i < impl_ctx->num_max_thread; i++) {
Expand All @@ -614,6 +614,10 @@ static void *PoWAVX_getPoWContext(ImplContext *impl_ctx, int8_t *trytes, int mwm
memcpy(ctx->input_trytes, trytes, TRANSACTION_TRYTES_LENGTH);
ctx->mwm = mwm;
ctx->indexOfContext = i;
if (threads > 0 && threads < ctx->num_max_threads)
ctx->num_threads = threads;
else
ctx->num_threads = ctx->num_max_threads;
return ctx;
}
}
Expand Down
1 change: 1 addition & 0 deletions src/pow_avx.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -30,6 +30,7 @@ struct _pow_avx_context {
int8_t **nonce_array;
int stopPoW;
int num_threads;
int num_max_threads;
/* Management of Multi-thread */
int indexOfContext;
/* Arguments of PoW */
Expand Down
8 changes: 6 additions & 2 deletions src/pow_c.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -337,7 +337,7 @@ static bool PoWC_Context_Initialize(ImplContext *impl_ctx)
for (int j = 0; j < nproc; j++)
ctx[i].nonce_array[j] = (int8_t *) (nonce_chunk + i * NONCE_TRITS_LENGTH * nproc +
j * NONCE_TRITS_LENGTH);
ctx[i].num_threads = nproc;
ctx[i].num_max_threads = nproc;
impl_ctx->bitmap = impl_ctx->bitmap << 1 | 0x1;
}
impl_ctx->context = ctx;
Expand All @@ -363,7 +363,7 @@ static void PoWC_Context_Destroy(ImplContext *impl_ctx)
free(ctx);
}

static void *PoWC_getPoWContext(ImplContext *impl_ctx, int8_t *trytes, int mwm)
static void *PoWC_getPoWContext(ImplContext *impl_ctx, int8_t *trytes, int mwm, int threads)
{
pthread_mutex_lock(&impl_ctx->lock);
for (int i = 0; i < impl_ctx->num_max_thread; i++) {
Expand All @@ -374,6 +374,10 @@ static void *PoWC_getPoWContext(ImplContext *impl_ctx, int8_t *trytes, int mwm)
memcpy(ctx->input_trytes, trytes, TRANSACTION_TRYTES_LENGTH);
ctx->mwm = mwm;
ctx->indexOfContext = i;
if (threads > 0 && threads < ctx->num_max_threads)
ctx->num_threads = threads;
marktwtn marked this conversation as resolved.
Show resolved Hide resolved
else
ctx->num_threads = ctx->num_max_threads;
return ctx;
}
}
Expand Down
1 change: 1 addition & 0 deletions src/pow_c.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -31,6 +31,7 @@ struct _pow_c_context {
int8_t **nonce_array;
int stopPoW;
int num_threads;
int num_max_threads;
/* Management of Multi-thread */
int indexOfContext;
/* Arguments of PoW */
Expand Down
2 changes: 1 addition & 1 deletion src/pow_cl.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -270,7 +270,7 @@ static void PoWCL_Context_Destroy(ImplContext *impl_ctx)
free(ctx);
}

static void *PoWCL_getPoWContext(ImplContext *impl_ctx, int8_t *trytes, int mwm)
static void *PoWCL_getPoWContext(ImplContext *impl_ctx, int8_t *trytes, int mwm, int threads)
{
pthread_mutex_lock(&impl_ctx->lock);
for (int i = 0; i < impl_ctx->num_max_thread; i++) {
Expand Down
3 changes: 2 additions & 1 deletion src/pow_fpga_accel.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -199,7 +199,8 @@ static void PoWFPGAAccel_Context_Destroy(ImplContext *impl_ctx)

static void *PoWFPGAAccel_getPoWContext(ImplContext *impl_ctx,
int8_t *trytes,
int mwm)
int mwm,
int threads)
{
PoW_FPGA_Accel_Context *ctx = impl_ctx->context;
memcpy(ctx->input_trytes, trytes, TRANSACTION_TRYTES_LENGTH);
Expand Down
8 changes: 6 additions & 2 deletions src/pow_sse.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -354,7 +354,7 @@ static bool PoWSSE_Context_Initialize(ImplContext *impl_ctx)
for (int j = 0; j < nproc; j++)
ctx[i].nonce_array[j] = (int8_t *) (nonce_chunk + i * NONCE_TRITS_LENGTH * nproc +
j * NONCE_TRITS_LENGTH);
ctx[i].num_threads = nproc;
ctx[i].num_max_threads = nproc;
impl_ctx->bitmap = impl_ctx->bitmap << 1 | 0x1;
}
impl_ctx->context = ctx;
Expand All @@ -380,7 +380,7 @@ static void PoWSSE_Context_Destroy(ImplContext *impl_ctx)
free(ctx);
}

static void *PoWSSE_getPoWContext(ImplContext *impl_ctx, int8_t *trytes, int mwm)
static void *PoWSSE_getPoWContext(ImplContext *impl_ctx, int8_t *trytes, int mwm, int threads)
{
pthread_mutex_lock(&impl_ctx->lock);
for (int i = 0; i < impl_ctx->num_max_thread; i++) {
Expand All @@ -391,6 +391,10 @@ static void *PoWSSE_getPoWContext(ImplContext *impl_ctx, int8_t *trytes, int mwm
memcpy(ctx->input_trytes, trytes, TRANSACTION_TRYTES_LENGTH);
ctx->mwm = mwm;
ctx->indexOfContext = i;
if (threads > 0 && threads < ctx->num_max_threads)
ctx->num_threads = threads;
else
ctx->num_threads = ctx->num_max_threads;
return ctx;
}
}
Expand Down
1 change: 1 addition & 0 deletions src/pow_sse.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -30,6 +30,7 @@ struct _pow_sse_context {
int8_t **nonce_array;
int stopPoW;
int num_threads;
int num_max_threads;
/* Management of Multi-thread */
int indexOfContext;
/* Arguments of PoW */
Expand Down
2 changes: 1 addition & 1 deletion tests/test-dcurl.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -49,7 +49,7 @@ int main()

/* test dcurl Implementation with mwm = 9 */
dcurl_init();
int8_t *ret_trytes = dcurl_entry((int8_t *) trytes, mwm);
int8_t *ret_trytes = dcurl_entry((int8_t *) trytes, mwm, 0);
assert(ret_trytes);
dcurl_destroy();

Expand Down
4 changes: 2 additions & 2 deletions tests/test-multi-pow.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -42,7 +42,7 @@ def validate(trytes, mwm):

def call_dcurl(idx, mwm, lib, trytes_list):
tmp = str(trytes_list[idx]).encode('ascii')
ret = lib.dcurl_entry(tmp, mwm)
ret = lib.dcurl_entry(tmp, mwm, 0)
trytes = TryteString(ret[:2673])

hash_trytes = hash(trytes)
Expand All @@ -56,7 +56,7 @@ def testing():
# Settings of shared library
libdcurl = ctypes.cdll.LoadLibrary(DCURL_PATH)
#libdcurl.dcurl_init.argtypes = [ctypes.c_int, ctypes.c_int]
libdcurl.dcurl_entry.argtypes = [ctypes.c_char_p, ctypes.c_int]
libdcurl.dcurl_entry.argtypes = [ctypes.c_char_p, ctypes.c_int, ctypes.c_int]
libdcurl.dcurl_entry.restype = ctypes.c_char_p

libdcurl.dcurl_init()
Expand Down
2 changes: 1 addition & 1 deletion tests/test-pow.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -139,7 +139,7 @@ int main()

/* test implementation with mwm = 14 */
initializeImplContext(PoW_Context_ptr);
void *pow_ctx = getPoWContext(PoW_Context_ptr, (int8_t *) trytes, mwm);
void *pow_ctx = getPoWContext(PoW_Context_ptr, (int8_t *) trytes, mwm, 0);
assert(pow_ctx);

for (int count = 0; count < pow_total; count++) {
Expand Down