Skip to content

DEScrypt-opencl: Drop support for parallel kernel build #5902

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

Closed
wants to merge 1 commit into from
+8 −36
Closed

DEScrypt-opencl: Drop support for parallel kernel build #5902

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
1 change: 0 additions & 1 deletion run/opencl/opencl_DES_hst_dev_shared.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,6 @@
#define OVERRIDE_AUTO_CONFIG 0
#define HARDCODE_SALT 0
#define FULL_UNROLL 0
#define PARALLEL_BUILD 0

#define WORD int
#define DES_bs_vector WORD
Expand Down
15 changes: 2 additions & 13 deletions src/opencl_DES_bs_f_plug.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,10 +10,6 @@
#include <string.h>
#include <sys/time.h>

#if _OPENMP
#include <omp.h>
#endif

#include "options.h"
#include "opencl_DES_bs.h"
#include "../run/opencl/opencl_DES_hst_dev_shared.h"
Expand Down Expand Up @@ -701,18 +697,11 @@ static void reset(struct db_main *db)
if (num_salts > 10 && !ocl_any_test_running && john_main_process)
fprintf(stderr, "Building %d per-salt kernels, one dot per three salts done: ", num_salts);

#if _OPENMP && PARALLEL_BUILD
#pragma omp parallel for
#endif
for (i = 0; i < num_salts; i++) {
init_kernel(salt_list[i], gpu_id, 1, 0, forced_global_keys ? 0 :local_work_size);

#if _OPENMP && PARALLEL_BUILD
if (omp_get_thread_num() == 0)
#endif
{
opencl_process_event();
}
opencl_process_event();

if (num_salts > 10 && (i % 3) == 2 && !ocl_any_test_running && john_main_process)
fprintf(stderr, ".");
}
Expand Down
20 changes: 2 additions & 18 deletions src/opencl_DES_bs_h_plug.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,10 +10,6 @@
#include <string.h>
#include <sys/time.h>

#if _OPENMP
#include <omp.h>
#endif

#include "options.h"
#include "opencl_DES_bs.h"
#include "../run/opencl/opencl_DES_hst_dev_shared.h"
Expand Down Expand Up @@ -253,12 +249,7 @@ static void init_kernel(WORD salt_val, int id_gpu, int save_binary, int force_bu

kernels[id_gpu][salt_val] = clCreateKernel(program, "DES_bs_25", &err_code);
HANDLE_CLERROR(err_code, "Create Kernel DES_bs_25 failed.\n");
#if _OPENMP
#pragma omp critical
#endif
{
HANDLE_CLERROR(clSetKernelArg(kernels[id_gpu][salt_val], 0, sizeof(cl_mem), &buffer_map), "Failed setting kernel argument buffer_map, kernel DES_bs_25.\n");
}
marked_salts[salt_val] = salt_val;

HANDLE_CLERROR(clReleaseProgram(program), "Error releasing Program");
Expand Down Expand Up @@ -715,18 +706,11 @@ static void reset(struct db_main *db)
if (num_salts > 10 && !ocl_any_test_running && john_main_process)
fprintf(stderr, "Building %d per-salt kernels, one dot per three salts done: ", num_salts);

#if _OPENMP && PARALLEL_BUILD
#pragma omp parallel for
#endif
for (i = 0; i < num_salts; i++) {
init_kernel(salt_list[i], gpu_id, 1, 0, forced_global_keys ? 0 :local_work_size);

#if _OPENMP && PARALLEL_BUILD
if (omp_get_thread_num() == 0)
#endif
{
opencl_process_event();
}
opencl_process_event();

if (num_salts > 10 && (i % 3) == 2 && !ocl_any_test_running && john_main_process)
fprintf(stderr, ".");
}
Expand Down
8 changes: 4 additions & 4 deletions src/opencl_common.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1268,10 +1268,10 @@ void opencl_build(int sequential_id, const char *opts, int save, const char *fil
* pathnames differently than the OpenCL backend would for the includes).
*
* Saving and restoring of the current directory here is incompatible with
* concurrent kernel builds by multiple threads, like we'd do with the
* PARALLEL_BUILD setting in descrypt-opencl (currently disabled and considered
* unsupported). We'd probably need to save and restore the directory
* before/after all kernel builds, not before/after each.
* concurrent kernel builds by multiple threads, like we did for a while with
* the PARALLEL_BUILD setting in descrypt-opencl (which was first disabled and
* later removed altogether). We'd probably need to save and restore the
* directory before/after all kernel builds, not before/after each.
*
* We primarily use open()/fchdir(), falling back to getcwd()/chdir() when
* open() or/and fchdir() fails.
Expand Down