intel/compute-runtime
1
0
Fork 0
mirror of https://github.com/intel/compute-runtime.git synced 2025-12-24 21:18:24 +08:00
Code Issues Packages Projects Releases Wiki Activity

Remove processing extra properties

Browse Source 
Related-To: NEO-6024

Signed-off-by: Szymon Morek <szymon.morek@intel.com>
This commit is contained in:
Szymon Morek
2021-07-01 21:07:56 +00:00
committed by Compute-Runtime-Automation
parent 60df89976a
commit 399dc60bf8
5 changed files with 4 additions and 30 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
opencl/source/api/api.cpp
View File

@@ -5143,8 +5143,7 @@ cl_command_queue CL_API_CALL clCreateCommandQueueWithProperties(cl_context conte
tokenValue != CL_QUEUE_THROTTLE_KHR && tokenValue != CL_QUEUE_THROTTLE_KHR &&
tokenValue != CL_QUEUE_SLICE_COUNT_INTEL && tokenValue != CL_QUEUE_SLICE_COUNT_INTEL &&
tokenValue != CL_QUEUE_FAMILY_INTEL && tokenValue != CL_QUEUE_FAMILY_INTEL &&
tokenValue != CL_QUEUE_INDEX_INTEL && tokenValue != CL_QUEUE_INDEX_INTEL) {
!isExtraToken(propertiesAddress)) {
err.set(CL_INVALID_VALUE); err.set(CL_INVALID_VALUE);
TRACING_EXIT(clCreateCommandQueueWithProperties, &commandQueue); TRACING_EXIT(clCreateCommandQueueWithProperties, &commandQueue);
return commandQueue; return commandQueue;
@@ -5154,12 +5153,6 @@ cl_command_queue CL_API_CALL clCreateCommandQueueWithProperties(cl_context conte
tokenValue = *propertiesAddress; tokenValue = *propertiesAddress;
} }
if (!verifyExtraTokens(pDevice, *pContext, properties)) {
err.set(CL_INVALID_VALUE);
TRACING_EXIT(clCreateCommandQueueWithProperties, &commandQueue);
return commandQueue;
}
auto commandQueueProperties = getCmdQueueProperties<cl_command_queue_properties>(properties); auto commandQueueProperties = getCmdQueueProperties<cl_command_queue_properties>(properties);
uint32_t maxOnDeviceQueueSize = pDevice->getDeviceInfo().queueOnDeviceMaxSize; uint32_t maxOnDeviceQueueSize = pDevice->getDeviceInfo().queueOnDeviceMaxSize;

2
opencl/source/command_queue/command_queue.cpp
View File

@@ -854,7 +854,7 @@ void CommandQueue::processProperties(const cl_queue_properties *properties) {
} }
} }
} }
processPropertiesExtra(properties); requiresCacheFlushAfterWalker = device && (device->getDeviceInfo().parentDevice != nullptr);
} }
void CommandQueue::overrideEngine(aub_stream::EngineType engineType) { void CommandQueue::overrideEngine(aub_stream::EngineType engineType) {

1
opencl/source/command_queue/command_queue.h
View File

@@ -350,7 +350,6 @@ class CommandQueue : public BaseObject<_cl_command_queue> {
MOCKABLE_VIRTUAL void obtainNewTimestampPacketNodes(size_t numberOfNodes, TimestampPacketContainer &previousNodes, bool clearAllDependencies, bool blitEnqueue); MOCKABLE_VIRTUAL void obtainNewTimestampPacketNodes(size_t numberOfNodes, TimestampPacketContainer &previousNodes, bool clearAllDependencies, bool blitEnqueue);
void storeProperties(const cl_queue_properties *properties); void storeProperties(const cl_queue_properties *properties);
void processProperties(const cl_queue_properties *properties); void processProperties(const cl_queue_properties *properties);
void processPropertiesExtra(const cl_queue_properties *properties);
void overrideEngine(aub_stream::EngineType engineType); void overrideEngine(aub_stream::EngineType engineType);
bool bufferCpuCopyAllowed(Buffer *buffer, cl_command_type commandType, cl_bool blocking, size_t size, void *ptr, bool bufferCpuCopyAllowed(Buffer *buffer, cl_command_type commandType, cl_bool blocking, size_t size, void *ptr,
cl_uint numEventsInWaitList, const cl_event *eventWaitList); cl_uint numEventsInWaitList, const cl_event *eventWaitList);

16
opencl/source/helpers/queue_helpers.cpp
View File

@@ -1,5 +1,5 @@
/* /*
* Copyright (C) 2018-2020 Intel Corporation * Copyright (C) 2018-2021 Intel Corporation
* *
* SPDX-License-Identifier: MIT * SPDX-License-Identifier: MIT
* *
@@ -8,20 +8,6 @@
#include "opencl/source/helpers/queue_helpers.h" #include "opencl/source/helpers/queue_helpers.h"
namespace NEO { namespace NEO {
bool isExtraToken(const cl_queue_properties *property) {
return false;
}
bool verifyExtraTokens(ClDevice *&device, Context &context, const cl_queue_properties *properties) {
return true;
}
void CommandQueue::processPropertiesExtra(const cl_queue_properties *properties) {
}
void getIntelQueueInfo(CommandQueue *queue, cl_command_queue_info paramName, GetInfoHelper &getInfoHelper, cl_int &retVal) {
retVal = CL_INVALID_VALUE;
}
bool isCommandWithoutKernel(uint32_t commandType) { bool isCommandWithoutKernel(uint32_t commandType) {
return ((commandType == CL_COMMAND_BARRIER) || return ((commandType == CL_COMMAND_BARRIER) ||
(commandType == CL_COMMAND_MARKER) || (commandType == CL_COMMAND_MARKER) ||

6
opencl/source/helpers/queue_helpers.h
View File

@@ -60,8 +60,6 @@ inline void releaseQueue<CommandQueue>(cl_command_queue commandQueue, cl_int &re
} }
} }
void getIntelQueueInfo(CommandQueue *queue, cl_command_queue_info paramName, GetInfoHelper &getInfoHelper, cl_int &retVal);
inline void getHostQueueInfo(CommandQueue *queue, cl_command_queue_info paramName, GetInfoHelper &getInfoHelper, cl_int &retVal) { inline void getHostQueueInfo(CommandQueue *queue, cl_command_queue_info paramName, GetInfoHelper &getInfoHelper, cl_int &retVal) {
switch (paramName) { switch (paramName) {
case CL_QUEUE_FAMILY_INTEL: case CL_QUEUE_FAMILY_INTEL:
@@ -71,7 +69,7 @@ inline void getHostQueueInfo(CommandQueue *queue, cl_command_queue_info paramNam
retVal = changeGetInfoStatusToCLResultType(getInfoHelper.set<cl_uint>(queue->getQueueIndexWithinFamily())); retVal = changeGetInfoStatusToCLResultType(getInfoHelper.set<cl_uint>(queue->getQueueIndexWithinFamily()));
break; break;
default: default:
getIntelQueueInfo(queue, paramName, getInfoHelper, retVal); retVal = CL_INVALID_VALUE;
break; break;
} }
} }
@@ -169,6 +167,4 @@ returnType getCmdQueueProperties(const cl_queue_properties *properties,
} }
return 0; return 0;
} }
bool isExtraToken(const cl_queue_properties *property);
bool verifyExtraTokens(ClDevice *&device, Context &context, const cl_queue_properties *properties);
} // namespace NEO } // namespace NEO