GOSTSec
/
sgminer
mirror of https://github.com/GOSTSec/sgminer
1
0
Fork 0
Code Issues Releases Wiki Activity
Browse Source

applog fixes.

nfactor-troky
ckolivas 14 years ago committed by Con Kolivas
parent
b19ee2f5f5
commit
feb8cfc8fa
2 changed files with 26 additions and 26 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Unified View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 2
      cpu-miner.c
  2. 50
      ocl.c

2
cpu-miner.c
Unescape View File

@ -851,7 +851,7 @@ static void *gpuminer_thread(void *userdata)
work->blk.nonce = 0; work->blk.nonce = 0;
status = queue_kernel_parameters(&work->blk, kernel, clState->outputBuffer); status = queue_kernel_parameters(&work->blk, kernel, clState->outputBuffer);
if (unlikely(status != CL_SUCCESS)) if (unlikely(status != CL_SUCCESS))
{ applog(LOG_ERR, "Error: clSetKernelArg of all params failed."); exit (1); } { applog(LOG_ERR, "Error: clSetKernelArg of all params failed."); goto out; }
work_restart[thr_id].restart = 0; work_restart[thr_id].restart = 0;
need_work = false; need_work = false;

50
ocl.c
Unescape View File

@ -44,7 +44,7 @@ int clDevicesNum() {
status = clGetPlatformIDs(0, NULL, &numPlatforms); status = clGetPlatformIDs(0, NULL, &numPlatforms);
if(status != CL_SUCCESS) if(status != CL_SUCCESS)
{ {
printf("Error: Getting Platforms. (clGetPlatformsIDs)\n"); applog(LOG_ERR, "Error: Getting Platforms. (clGetPlatformsIDs)");
return -1; return -1;
} }
@ -54,7 +54,7 @@ int clDevicesNum() {
status = clGetPlatformIDs(numPlatforms, platforms, NULL); status = clGetPlatformIDs(numPlatforms, platforms, NULL);
if(status != CL_SUCCESS) if(status != CL_SUCCESS)
{ {
printf("Error: Getting Platform Ids. (clGetPlatformsIDs)\n"); applog(LOG_ERR, "Error: Getting Platform Ids. (clGetPlatformsIDs)");
return -1; return -1;
} }
@ -65,7 +65,7 @@ int clDevicesNum() {
status = clGetPlatformInfo( platforms[i], CL_PLATFORM_VENDOR, sizeof(pbuff), pbuff, NULL); status = clGetPlatformInfo( platforms[i], CL_PLATFORM_VENDOR, sizeof(pbuff), pbuff, NULL);
if(status != CL_SUCCESS) if(status != CL_SUCCESS)
{ {
printf("Error: Getting Platform Info. (clGetPlatformInfo)\n"); applog(LOG_ERR, "Error: Getting Platform Info. (clGetPlatformInfo)");
free(platforms); free(platforms);
return -1; return -1;
} }
@ -87,7 +87,7 @@ int clDevicesNum() {
status = clGetDeviceIDs(platform, CL_DEVICE_TYPE_GPU, 0, NULL, &numDevices); status = clGetDeviceIDs(platform, CL_DEVICE_TYPE_GPU, 0, NULL, &numDevices);
if(status != CL_SUCCESS) if(status != CL_SUCCESS)
{ {
printf("Error: Getting Device IDs (num)\n"); applog(LOG_ERR, "Error: Getting Device IDs (num)");
return -1; return -1;
} }
@ -165,7 +165,7 @@ _clState *initCl(unsigned int gpu, char *name, size_t nameSize)
status = clGetPlatformIDs(0, NULL, &numPlatforms); status = clGetPlatformIDs(0, NULL, &numPlatforms);
if(status != CL_SUCCESS) if(status != CL_SUCCESS)
{ {
printf("Error: Getting Platforms. (clGetPlatformsIDs)\n"); applog(LOG_ERR, "Error: Getting Platforms. (clGetPlatformsIDs)");
return NULL; return NULL;
} }
@ -175,7 +175,7 @@ _clState *initCl(unsigned int gpu, char *name, size_t nameSize)
status = clGetPlatformIDs(numPlatforms, platforms, NULL); status = clGetPlatformIDs(numPlatforms, platforms, NULL);
if(status != CL_SUCCESS) if(status != CL_SUCCESS)
{ {
printf("Error: Getting Platform Ids. (clGetPlatformsIDs)\n"); applog(LOG_ERR, "Error: Getting Platform Ids. (clGetPlatformsIDs)");
return NULL; return NULL;
} }
@ -185,7 +185,7 @@ _clState *initCl(unsigned int gpu, char *name, size_t nameSize)
status = clGetPlatformInfo( platforms[i], CL_PLATFORM_VENDOR, sizeof(pbuff), pbuff, NULL); status = clGetPlatformInfo( platforms[i], CL_PLATFORM_VENDOR, sizeof(pbuff), pbuff, NULL);
if(status != CL_SUCCESS) if(status != CL_SUCCESS)
{ {
printf("Error: Getting Platform Info. (clGetPlatformInfo)\n"); applog(LOG_ERR, "Error: Getting Platform Info. (clGetPlatformInfo)");
free(platforms); free(platforms);
return NULL; return NULL;
} }
@ -207,7 +207,7 @@ _clState *initCl(unsigned int gpu, char *name, size_t nameSize)
status = clGetDeviceIDs(platform, CL_DEVICE_TYPE_GPU, 0, NULL, &numDevices); status = clGetDeviceIDs(platform, CL_DEVICE_TYPE_GPU, 0, NULL, &numDevices);
if(status != CL_SUCCESS) if(status != CL_SUCCESS)
{ {
printf("Error: Getting Device IDs (num)\n"); applog(LOG_ERR, "Error: Getting Device IDs (num)");
return NULL; return NULL;
} }
@ -220,7 +220,7 @@ _clState *initCl(unsigned int gpu, char *name, size_t nameSize)
status = clGetDeviceIDs(platform, CL_DEVICE_TYPE_GPU, numDevices, devices, NULL); status = clGetDeviceIDs(platform, CL_DEVICE_TYPE_GPU, numDevices, devices, NULL);
if(status != CL_SUCCESS) if(status != CL_SUCCESS)
{ {
printf("Error: Getting Device IDs (list)\n"); applog(LOG_ERR, "Error: Getting Device IDs (list)");
return NULL; return NULL;
} }
@ -232,7 +232,7 @@ _clState *initCl(unsigned int gpu, char *name, size_t nameSize)
status = clGetDeviceInfo(devices[i], CL_DEVICE_NAME, sizeof(pbuff), pbuff, NULL); status = clGetDeviceInfo(devices[i], CL_DEVICE_NAME, sizeof(pbuff), pbuff, NULL);
if(status != CL_SUCCESS) if(status != CL_SUCCESS)
{ {
printf("Error: Getting Device Info\n"); applog(LOG_ERR, "Error: Getting Device Info");
return NULL; return NULL;
} }
@ -244,14 +244,14 @@ _clState *initCl(unsigned int gpu, char *name, size_t nameSize)
status = clGetDeviceInfo(devices[gpu], CL_DEVICE_NAME, sizeof(pbuff), pbuff, NULL); status = clGetDeviceInfo(devices[gpu], CL_DEVICE_NAME, sizeof(pbuff), pbuff, NULL);
if(status != CL_SUCCESS) if(status != CL_SUCCESS)
{ {
printf("Error: Getting Device Info\n"); applog(LOG_ERR, "Error: Getting Device Info");
return NULL; return NULL;
} }
applog(LOG_INFO, "Selected %i: %s", gpu, pbuff); applog(LOG_INFO, "Selected %i: %s", gpu, pbuff);
strncpy(name, pbuff, nameSize); strncpy(name, pbuff, nameSize);
} else { } else {
printf("Invalid GPU %i\n", gpu); applog(LOG_ERR, "Invalid GPU %i", gpu);
return NULL; return NULL;
} }
@ -262,7 +262,7 @@ _clState *initCl(unsigned int gpu, char *name, size_t nameSize)
clState->context = clCreateContextFromType(cps, CL_DEVICE_TYPE_GPU, NULL, NULL, &status); clState->context = clCreateContextFromType(cps, CL_DEVICE_TYPE_GPU, NULL, NULL, &status);
if(status != CL_SUCCESS) if(status != CL_SUCCESS)
{ {
printf("Error: Creating Context. (clCreateContextFromType)\n"); applog(LOG_ERR, "Error: Creating Context. (clCreateContextFromType)");
return NULL; return NULL;
} }
@ -346,7 +346,7 @@ _clState *initCl(unsigned int gpu, char *name, size_t nameSize)
clState->program = clCreateProgramWithSource(clState->context, 1, (const char **)&source, sourceSize, &status); clState->program = clCreateProgramWithSource(clState->context, 1, (const char **)&source, sourceSize, &status);
if(status != CL_SUCCESS) if(status != CL_SUCCESS)
{ {
printf("Error: Loading Binary into cl_program (clCreateProgramWithSource)\n"); applog(LOG_ERR, "Error: Loading Binary into cl_program (clCreateProgramWithSource)");
return NULL; return NULL;
} }
@ -354,13 +354,13 @@ _clState *initCl(unsigned int gpu, char *name, size_t nameSize)
status = clBuildProgram(clState->program, 1, &devices[gpu], NULL, NULL, NULL); status = clBuildProgram(clState->program, 1, &devices[gpu], NULL, NULL, NULL);
if(status != CL_SUCCESS) if(status != CL_SUCCESS)
{ {
printf("Error: Building Program (clBuildProgram)\n"); applog(LOG_ERR, "Error: Building Program (clBuildProgram)");
size_t logSize; size_t logSize;
status = clGetProgramBuildInfo(clState->program, devices[gpu], CL_PROGRAM_BUILD_LOG, 0, NULL, &logSize); status = clGetProgramBuildInfo(clState->program, devices[gpu], CL_PROGRAM_BUILD_LOG, 0, NULL, &logSize);
char *log = malloc(logSize); char *log = malloc(logSize);
status = clGetProgramBuildInfo(clState->program, devices[gpu], CL_PROGRAM_BUILD_LOG, logSize, log, NULL); status = clGetProgramBuildInfo(clState->program, devices[gpu], CL_PROGRAM_BUILD_LOG, logSize, log, NULL);
printf("%s\n", log); applog(LOG_INFO, "%s", log);
return NULL; return NULL;
} }
@ -380,7 +380,7 @@ _clState *initCl(unsigned int gpu, char *name, size_t nameSize)
binaries = (char **)malloc( sizeof(char *)*nDevices ); binaries = (char **)malloc( sizeof(char *)*nDevices );
for( i = 0; i < nDevices; i++ ) { for( i = 0; i < nDevices; i++ ) {
if (opt_debug) if (opt_debug)
applog(LOG_DEBUG, "binary size %d : %d\n", i, binary_sizes[i]); applog(LOG_DEBUG, "binary size %d : %d", i, binary_sizes[i]);
if( binary_sizes[i] != 0 ) if( binary_sizes[i] != 0 )
binaries[i] = (char *)malloc( sizeof(char)*binary_sizes[i] ); binaries[i] = (char *)malloc( sizeof(char)*binary_sizes[i] );
else else
@ -412,21 +412,21 @@ _clState *initCl(unsigned int gpu, char *name, size_t nameSize)
w--; remaining++; w--; remaining++;
w += start; remaining -= start; w += start; remaining -= start;
if (opt_debug) if (opt_debug)
printf("At %p (%u rem. bytes), to begin patching\n", applog(LOG_DEBUG, "At %p (%u rem. bytes), to begin patching",
w, remaining); w, remaining);
patch_opcodes(w, length); patch_opcodes(w, length);
} }
status = clReleaseProgram(clState->program); status = clReleaseProgram(clState->program);
if(status != CL_SUCCESS) if(status != CL_SUCCESS)
{ {
printf("Error: Releasing program. (clReleaseProgram)\n"); applog(LOG_ERR, "Error: Releasing program. (clReleaseProgram)");
return NULL; return NULL;
} }
clState->program = clCreateProgramWithBinary(clState->context, numDevices, &devices[gpu], binary_sizes, (const unsigned char **)binaries, &status, NULL); clState->program = clCreateProgramWithBinary(clState->context, numDevices, &devices[gpu], binary_sizes, (const unsigned char **)binaries, &status, NULL);
if(status != CL_SUCCESS) if(status != CL_SUCCESS)
{ {
printf("Error: Loading Binary into cl_program (clCreateProgramWithBinary)\n"); applog(LOG_ERR, "Error: Loading Binary into cl_program (clCreateProgramWithBinary)");
return NULL; return NULL;
} }
} }
@ -435,13 +435,13 @@ _clState *initCl(unsigned int gpu, char *name, size_t nameSize)
status = clBuildProgram(clState->program, 1, &devices[gpu], NULL, NULL, NULL); status = clBuildProgram(clState->program, 1, &devices[gpu], NULL, NULL, NULL);
if(status != CL_SUCCESS) if(status != CL_SUCCESS)
{ {
printf("Error: Building Program (clBuildProgram)\n"); applog(LOG_ERR, "Error: Building Program (clBuildProgram)");
size_t logSize; size_t logSize;
status = clGetProgramBuildInfo(clState->program, devices[gpu], CL_PROGRAM_BUILD_LOG, 0, NULL, &logSize); status = clGetProgramBuildInfo(clState->program, devices[gpu], CL_PROGRAM_BUILD_LOG, 0, NULL, &logSize);
char *log = malloc(logSize); char *log = malloc(logSize);
status = clGetProgramBuildInfo(clState->program, devices[gpu], CL_PROGRAM_BUILD_LOG, logSize, log, NULL); status = clGetProgramBuildInfo(clState->program, devices[gpu], CL_PROGRAM_BUILD_LOG, logSize, log, NULL);
printf("%s\n", log); applog(LOG_INFO, "%s", log);
return NULL; return NULL;
} }
@ -449,7 +449,7 @@ _clState *initCl(unsigned int gpu, char *name, size_t nameSize)
clState->kernel = clCreateKernel(clState->program, "search", &status); clState->kernel = clCreateKernel(clState->program, "search", &status);
if(status != CL_SUCCESS) if(status != CL_SUCCESS)
{ {
printf("Error: Creating Kernel from program. (clCreateKernel)\n"); applog(LOG_ERR, "Error: Creating Kernel from program. (clCreateKernel)");
return NULL; return NULL;
} }
@ -459,13 +459,13 @@ _clState *initCl(unsigned int gpu, char *name, size_t nameSize)
clState->commandQueue = clCreateCommandQueue( clState->context, devices[gpu], 0, &status); clState->commandQueue = clCreateCommandQueue( clState->context, devices[gpu], 0, &status);
if(status != CL_SUCCESS) if(status != CL_SUCCESS)
{ {
printf("Creating Command Queue. (clCreateCommandQueue)\n"); applog(LOG_ERR, "Creating Command Queue. (clCreateCommandQueue)");
return NULL; return NULL;
} }
clState->outputBuffer = clCreateBuffer(clState->context, CL_MEM_READ_WRITE, sizeof(uint32_t) * 128, NULL, &status); clState->outputBuffer = clCreateBuffer(clState->context, CL_MEM_READ_WRITE, sizeof(uint32_t) * 128, NULL, &status);
if(status != CL_SUCCESS) { if(status != CL_SUCCESS) {
printf("Error: clCreateBuffer (outputBuffer)\n"); applog(LOG_ERR, "Error: clCreateBuffer (outputBuffer)");
return NULL; return NULL;
} }

Write Preview
Loading…
Cancel
Save