Skip to content

Commit 4afa8fb

Browse files
kcenceleCompute-Runtime-Automation
kcencele
authored and
Compute-Runtime-Automation
committed
Add missing API_ENTER and DBG_LOG_INPUTS logging in functions:
clCreatePerfCountersCommandQueueINTEL, clSetPerformanceConfigurationINTEL, clCreateCommandQueueWithPropertiesKHR, clCreateAcceleratorINTEL, clRetainAcceleratorINTEL, clGetAcceleratorInfoINTEL, clReleaseAcceleratorINTEL, clCreateProgramWithILKHR, clGetExtensionFunctionAddress, clGetExtensionFunctionAddressForPlatform, clSVMAlloc, clSVMFree, clEnqueueSVMFree, clEnqueueSVMFree, clEnqueueSVMMemcpy, clEnqueueSVMMemFill Change-Id: I40db218af43a9379af173d08cba78c051e169352
1 parent e4f986a commit 4afa8fb

File tree

1 file changed

+64
-24
lines changed

1 file changed

+64
-24
lines changed

‎runtime/api/api.cpp‎

Lines changed: 64 additions & 24 deletions
Original file line numberDiff line numberDiff line change
@@ -3038,6 +3038,11 @@ clCreatePerfCountersCommandQueueINTEL(
30383038
cl_int retVal = CL_SUCCESS;
30393039
API_ENTER(&retVal);
30403040

3041+
DBG_LOG_INPUTS("context", context,
3042+
"device", device,
3043+
"properties", properties,
3044+
"configuration", configuration);
3045+
30413046
cl_command_queue commandQueue = nullptr;
30423047
ErrorCodeHelper err(errcodeRet, CL_SUCCESS);
30433048

@@ -3083,25 +3088,37 @@ clSetPerformanceConfigurationINTEL(
30833088
cl_uint count,
30843089
cl_uint *offsets,
30853090
cl_uint *values) {
3086-
API_ENTER(0);
3087-
30883091
Device *pDevice = nullptr;
30893092

30903093
auto retVal = validateObjects(WithCastToInternal(device, &pDevice));
3094+
3095+
API_ENTER(&retVal);
3096+
DBG_LOG_INPUTS("device", device,
3097+
"count", count,
3098+
"offsets", offsets,
3099+
"values", values);
30913100
if (CL_SUCCESS != retVal) {
30923101
return retVal;
30933102
}
30943103
if (!pDevice->getHardwareInfo().capabilityTable.instrumentationEnabled) {
3095-
return CL_PROFILING_INFO_NOT_AVAILABLE;
3104+
retVal = CL_PROFILING_INFO_NOT_AVAILABLE;
3105+
return retVal;
30963106
}
30973107
auto perfCounters = pDevice->getPerformanceCounters();
3098-
return perfCounters->sendPerfConfiguration(count, offsets, values);
3108+
retVal = perfCounters->sendPerfConfiguration(count, offsets, values);
3109+
return retVal;
30993110
}
31003111

31013112
cl_command_queue CL_API_CALL clCreateCommandQueueWithPropertiesKHR(cl_context context,
31023113
cl_device_id device,
31033114
const cl_queue_properties_khr *properties,
31043115
cl_int *errcodeRet) {
3116+
3117+
API_ENTER(errcodeRet);
3118+
DBG_LOG_INPUTS("context", context,
3119+
"device", device,
3120+
"properties", properties);
3121+
31053122
return clCreateCommandQueueWithProperties(context, device, properties, errcodeRet);
31063123
}
31073124

@@ -3111,9 +3128,12 @@ cl_accelerator_intel CL_API_CALL clCreateAcceleratorINTEL(
31113128
size_t descriptorSize,
31123129
const void *descriptor,
31133130
cl_int *errcodeRet) {
3114-
3115-
API_ENTER(0);
31163131
cl_int retVal = CL_SUCCESS;
3132+
API_ENTER(&retVal);
3133+
DBG_LOG_INPUTS("context", context,
3134+
"acceleratorType", acceleratorType,
3135+
"descriptorSize", descriptorSize,
3136+
"descriptor", DebugManager.infoPointerToString(descriptor, descriptorSize));
31173137
cl_accelerator_intel accelerator = nullptr;
31183138

31193139
do {
@@ -3152,9 +3172,10 @@ cl_accelerator_intel CL_API_CALL clCreateAcceleratorINTEL(
31523172

31533173
cl_int CL_API_CALL clRetainAcceleratorINTEL(
31543174
cl_accelerator_intel accelerator) {
3155-
3156-
API_ENTER(0);
31573175
cl_int retVal = CL_SUCCESS;
3176+
API_ENTER(&retVal);
3177+
DBG_LOG_INPUTS("accelerator", accelerator);
3178+
31583179
IntelAccelerator *pAccelerator = nullptr;
31593180

31603181
do {
@@ -3177,9 +3198,13 @@ cl_int CL_API_CALL clGetAcceleratorInfoINTEL(
31773198
size_t paramValueSize,
31783199
void *paramValue,
31793200
size_t *paramValueSizeRet) {
3180-
3181-
API_ENTER(0);
31823201
cl_int retVal = CL_SUCCESS;
3202+
API_ENTER(&retVal);
3203+
DBG_LOG_INPUTS("accelerator", accelerator,
3204+
"paramName", paramName,
3205+
"paramValueSize", paramValueSize,
3206+
"paramValue", DebugManager.infoPointerToString(paramValue, paramValueSize),
3207+
"paramValueSizeRet", paramValueSizeRet);
31833208
IntelAccelerator *pAccelerator = nullptr;
31843209

31853210
do {
@@ -3200,9 +3225,10 @@ cl_int CL_API_CALL clGetAcceleratorInfoINTEL(
32003225

32013226
cl_int CL_API_CALL clReleaseAcceleratorINTEL(
32023227
cl_accelerator_intel accelerator) {
3203-
3204-
API_ENTER(0);
32053228
cl_int retVal = CL_SUCCESS;
3229+
API_ENTER(&retVal);
3230+
DBG_LOG_INPUTS("accelerator", accelerator);
3231+
32063232
IntelAccelerator *pAccelerator = nullptr;
32073233

32083234
do {
@@ -3225,6 +3251,9 @@ cl_program CL_API_CALL clCreateProgramWithILKHR(cl_context context,
32253251
cl_int *errcodeRet) {
32263252
cl_int retVal = CL_SUCCESS;
32273253
API_ENTER(&retVal);
3254+
DBG_LOG_INPUTS("context", context,
3255+
"il", DebugManager.infoPointerToString(il, length),
3256+
"length", length);
32283257

32293258
cl_program program = nullptr;
32303259
retVal = validateObjects(context, il);
@@ -3250,6 +3279,8 @@ cl_program CL_API_CALL clCreateProgramWithILKHR(cl_context context,
32503279
} \
32513280
}
32523281
void *CL_API_CALL clGetExtensionFunctionAddress(const char *func_name) {
3282+
3283+
DBG_LOG_INPUTS("func_name", func_name);
32533284
// Support an internal call by the ICD
32543285
RETURN_FUNC_PTR_IF_EXIST(clIcdGetPlatformIDsKHR);
32553286

@@ -3276,6 +3307,7 @@ void *CL_API_CALL clGetExtensionFunctionAddress(const char *func_name) {
32763307
// OpenCL 1.2
32773308
void *CL_API_CALL clGetExtensionFunctionAddressForPlatform(cl_platform_id platform,
32783309
const char *funcName) {
3310+
DBG_LOG_INPUTS("platform", platform, "funcName", funcName);
32793311
auto pPlatform = castToObject<Platform>(platform);
32803312

32813313
if (pPlatform == nullptr) {
@@ -3289,6 +3321,10 @@ void *CL_API_CALL clSVMAlloc(cl_context context,
32893321
cl_svm_mem_flags flags,
32903322
size_t size,
32913323
cl_uint alignment) {
3324+
DBG_LOG_INPUTS("context", context,
3325+
"flags", flags,
3326+
"size", size,
3327+
"alignment", alignment);
32923328
void *pAlloc = nullptr;
32933329
auto pPlatform = platform();
32943330
auto pDevice = pPlatform->getDevice(0);
@@ -3344,7 +3380,8 @@ void *CL_API_CALL clSVMAlloc(cl_context context,
33443380

33453381
void CL_API_CALL clSVMFree(cl_context context,
33463382
void *svmPointer) {
3347-
3383+
DBG_LOG_INPUTS("context", context,
3384+
"svmPointer", svmPointer);
33483385
Context *pContext = nullptr;
33493386
if (validateObject(WithCastToInternal(context, &pContext)) == CL_SUCCESS) {
33503387
pContext->getSVMAllocsManager()->freeSVMAlloc(svmPointer);
@@ -3377,16 +3414,17 @@ cl_int CL_API_CALL clEnqueueSVMFree(cl_command_queue commandQueue,
33773414
"pfnFreeFunc", pfnFreeFunc,
33783415
"userData", userData,
33793416
"numEventsInWaitList", numEventsInWaitList,
3380-
"eventWaitList", eventWaitList,
3381-
"event", event);
3417+
"eventWaitList", DebugManager.getEvents(reinterpret_cast<const uintptr_t *>(eventWaitList), numEventsInWaitList),
3418+
"event", DebugManager.getEvents(reinterpret_cast<const uintptr_t *>(event), 1));
33823419

33833420
if (retVal != CL_SUCCESS) {
33843421
return retVal;
33853422
}
33863423

33873424
if (((svmPointers != nullptr) && (numSvmPointers == 0)) ||
33883425
((svmPointers == nullptr) && (numSvmPointers != 0))) {
3389-
return CL_INVALID_VALUE;
3426+
retVal = CL_INVALID_VALUE;
3427+
return retVal;
33903428
}
33913429

33923430
retVal = pCommandQueue->enqueueSVMFree(
@@ -3424,15 +3462,16 @@ cl_int CL_API_CALL clEnqueueSVMMemcpy(cl_command_queue commandQueue,
34243462
"srcPtr", srcPtr,
34253463
"size", size,
34263464
"numEventsInWaitList", numEventsInWaitList,
3427-
"eventWaitList", eventWaitList,
3428-
"event", event);
3465+
"eventWaitList", DebugManager.getEvents(reinterpret_cast<const uintptr_t *>(eventWaitList), numEventsInWaitList),
3466+
"event", DebugManager.getEvents(reinterpret_cast<const uintptr_t *>(event), 1));
34293467

34303468
if (retVal != CL_SUCCESS) {
34313469
return retVal;
34323470
}
34333471

34343472
if ((dstPtr == nullptr) || (srcPtr == nullptr)) {
3435-
return CL_INVALID_VALUE;
3473+
retVal = CL_INVALID_VALUE;
3474+
return retVal;
34363475
}
34373476

34383477
retVal = pCommandQueue->enqueueSVMMemcpy(
@@ -3465,20 +3504,21 @@ cl_int CL_API_CALL clEnqueueSVMMemFill(cl_command_queue commandQueue,
34653504
API_ENTER(&retVal);
34663505

34673506
DBG_LOG_INPUTS("commandQueue", commandQueue,
3468-
"svmPtr", svmPtr,
3469-
"pattern", pattern,
3507+
"svmPtr", DebugManager.infoPointerToString(svmPtr, size),
3508+
"pattern", DebugManager.infoPointerToString(pattern, patternSize),
34703509
"patternSize", patternSize,
34713510
"size", size,
34723511
"numEventsInWaitList", numEventsInWaitList,
3473-
"eventWaitList", eventWaitList,
3474-
"event", event);
3512+
"eventWaitList", DebugManager.getEvents(reinterpret_cast<const uintptr_t *>(eventWaitList), numEventsInWaitList),
3513+
"event", DebugManager.getEvents(reinterpret_cast<const uintptr_t *>(event), 1));
34753514

34763515
if (retVal != CL_SUCCESS) {
34773516
return retVal;
34783517
}
34793518

34803519
if ((svmPtr == nullptr) || (size == 0)) {
3481-
return CL_INVALID_VALUE;
3520+
retVal = CL_INVALID_VALUE;
3521+
return retVal;
34823522
}
34833523

34843524
retVal = pCommandQueue->enqueueSVMMemFill(

0 commit comments

Comments
 (0)