intel/compute-runtime
1
0
Fork 0
mirror of https://github.com/intel/compute-runtime.git synced 2026-01-08 05:56:36 +08:00
Code Issues Packages Projects Releases Wiki Activity

Remove getSupportedClVersion function from Device

Browse Source 
Related-To: NEO-3938

Change-Id: Ida4e0d8b3a758376ea433960c8a329c061b15666
Signed-off-by: Filip Hazubski <filip.hazubski@intel.com>
This commit is contained in:
Filip Hazubski
2020-03-20 12:40:02 +01:00
committed by sys_ocldev
parent 307a5cb822
commit 5be85293d6
14 changed files with 33 additions and 37 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
opencl/source/device/cl_device.cpp
View File

@@ -77,7 +77,9 @@ void ClDevice::allocateSyncBufferHandler() {
} }
} }
unsigned int ClDevice::getSupportedClVersion() const { return device.getSupportedClVersion(); } unsigned int ClDevice::getSupportedClVersion() const {
return device.getHardwareInfo().capabilityTable.clVersionSupport;
}
void ClDevice::retainApi() { void ClDevice::retainApi() {
auto parentDeviceId = deviceInfo.parentDevice; auto parentDeviceId = deviceInfo.parentDevice;

4
opencl/test/unit_test/built_ins/built_in_tests.cpp
View File

@@ -912,7 +912,7 @@ TEST_F(BuiltInTests, BuiltinDispatchInfoBuilderGetBuilderForUnknownBuiltInOp) {
} }
HWCMDTEST_F(IGFX_GEN8_CORE, BuiltInTests, getSchedulerKernel) { HWCMDTEST_F(IGFX_GEN8_CORE, BuiltInTests, getSchedulerKernel) {
if (pDevice->getSupportedClVersion() >= 20) { if (pClDevice->getSupportedClVersion() >= 20) {
SchedulerKernel &schedulerKernel = pContext->getSchedulerKernel(); SchedulerKernel &schedulerKernel = pContext->getSchedulerKernel();
std::string name = SchedulerKernel::schedulerName; std::string name = SchedulerKernel::schedulerName;
EXPECT_EQ(name, schedulerKernel.getKernelInfo().name); EXPECT_EQ(name, schedulerKernel.getKernelInfo().name);
@@ -920,7 +920,7 @@ HWCMDTEST_F(IGFX_GEN8_CORE, BuiltInTests, getSchedulerKernel) {
} }
HWCMDTEST_F(IGFX_GEN8_CORE, BuiltInTests, getSchedulerKernelForSecondTimeDoesNotCreateNewKernel) { HWCMDTEST_F(IGFX_GEN8_CORE, BuiltInTests, getSchedulerKernelForSecondTimeDoesNotCreateNewKernel) {
if (pDevice->getSupportedClVersion() >= 20) { if (pClDevice->getSupportedClVersion() >= 20) {
SchedulerKernel &schedulerKernel = pContext->getSchedulerKernel(); SchedulerKernel &schedulerKernel = pContext->getSchedulerKernel();
Program *program = schedulerKernel.getProgram(); Program *program = schedulerKernel.getProgram();

4
opencl/test/unit_test/command_queue/enqueue_kernel_2_tests.cpp
View File

@@ -904,7 +904,7 @@ HWCMDTEST_F(IGFX_GEN8_CORE, EnqueueKernelTest, givenCacheFlushAfterWalkerEnabled
} }
HWCMDTEST_F(IGFX_GEN8_CORE, EnqueueAuxKernelTests, givenParentKernelWhenAuxTranslationIsRequiredThenMakeEnqueueBlocking) { HWCMDTEST_F(IGFX_GEN8_CORE, EnqueueAuxKernelTests, givenParentKernelWhenAuxTranslationIsRequiredThenMakeEnqueueBlocking) {
if (pDevice->getSupportedClVersion() >= 20) { if (pClDevice->getSupportedClVersion() >= 20) {
MyCmdQ<FamilyType> cmdQ(context, pClDevice); MyCmdQ<FamilyType> cmdQ(context, pClDevice);
size_t gws[3] = {1, 0, 0}; size_t gws[3] = {1, 0, 0};
@@ -926,7 +926,7 @@ HWCMDTEST_F(IGFX_GEN8_CORE, EnqueueAuxKernelTests, givenParentKernelWhenAuxTrans
} }
HWCMDTEST_F(IGFX_GEN8_CORE, EnqueueAuxKernelTests, givenParentKernelButNoDeviceQueueWhenEnqueueIsCalledItReturnsInvalidOperation) { HWCMDTEST_F(IGFX_GEN8_CORE, EnqueueAuxKernelTests, givenParentKernelButNoDeviceQueueWhenEnqueueIsCalledItReturnsInvalidOperation) {
if (pDevice->getSupportedClVersion() >= 20) { if (pClDevice->getSupportedClVersion() >= 20) {
MyCmdQ<FamilyType> cmdQ(context, pClDevice); MyCmdQ<FamilyType> cmdQ(context, pClDevice);
size_t gws[3] = {1, 0, 0}; size_t gws[3] = {1, 0, 0};

2
opencl/test/unit_test/device/device_tests.cpp
View File

@@ -39,7 +39,7 @@ TEST_F(DeviceTest, WhenDeviceIsCreatedThenCommandStreamReceiverIsNotNull) {
} }
TEST_F(DeviceTest, WhenDeviceIsCreatedThenSupportedClVersionMatchesHardwareInfo) { TEST_F(DeviceTest, WhenDeviceIsCreatedThenSupportedClVersionMatchesHardwareInfo) {
auto version = pDevice->getSupportedClVersion(); auto version = pClDevice->getSupportedClVersion();
auto version2 = pDevice->getHardwareInfo().capabilityTable.clVersionSupport; auto version2 = pDevice->getHardwareInfo().capabilityTable.clVersionSupport;
EXPECT_EQ(version, version2); EXPECT_EQ(version, version2);

26
opencl/test/unit_test/execution_model/enqueue_execution_model_kernel_tests.cpp
View File

@@ -124,7 +124,7 @@ HWCMDTEST_P(IGFX_GEN8_CORE, ParentKernelEnqueueTest, givenParentKernelWhenEnqueu
} }
HWCMDTEST_P(IGFX_GEN8_CORE, ParentKernelEnqueueTest, GivenBlockKernelWithPrivateSurfaceWhenParentKernelIsEnqueuedThenPrivateSurfaceIsMadeResident) { HWCMDTEST_P(IGFX_GEN8_CORE, ParentKernelEnqueueTest, GivenBlockKernelWithPrivateSurfaceWhenParentKernelIsEnqueuedThenPrivateSurfaceIsMadeResident) {
if (pDevice->getSupportedClVersion() >= 20) { if (pClDevice->getSupportedClVersion() >= 20) {
size_t offset[3] = {0, 0, 0}; size_t offset[3] = {0, 0, 0};
size_t gws[3] = {1, 1, 1}; size_t gws[3] = {1, 1, 1};
int32_t executionStamp = 0; int32_t executionStamp = 0;
@@ -155,7 +155,7 @@ HWCMDTEST_P(IGFX_GEN8_CORE, ParentKernelEnqueueTest, GivenBlockKernelWithPrivate
} }
HWCMDTEST_P(IGFX_GEN8_CORE, ParentKernelEnqueueTest, GivenBlocksWithPrivateMemoryWhenEnqueueKernelThatIsBlockedByUserEventIsCalledThenPrivateAllocationIsMadeResidentWhenEventUnblocks) { HWCMDTEST_P(IGFX_GEN8_CORE, ParentKernelEnqueueTest, GivenBlocksWithPrivateMemoryWhenEnqueueKernelThatIsBlockedByUserEventIsCalledThenPrivateAllocationIsMadeResidentWhenEventUnblocks) {
if (pDevice->getSupportedClVersion() >= 20) { if (pClDevice->getSupportedClVersion() >= 20) {
size_t offset[3] = {0, 0, 0}; size_t offset[3] = {0, 0, 0};
size_t gws[3] = {1, 1, 1}; size_t gws[3] = {1, 1, 1};
@@ -192,7 +192,7 @@ HWCMDTEST_P(IGFX_GEN8_CORE, ParentKernelEnqueueTest, GivenBlocksWithPrivateMemor
} }
HWCMDTEST_P(IGFX_GEN8_CORE, ParentKernelEnqueueTest, GivenParentKernelWithBlocksWhenEnqueueKernelIsCalledThenBlockKernelIsaAllocationIsMadeResident) { HWCMDTEST_P(IGFX_GEN8_CORE, ParentKernelEnqueueTest, GivenParentKernelWithBlocksWhenEnqueueKernelIsCalledThenBlockKernelIsaAllocationIsMadeResident) {
if (pDevice->getSupportedClVersion() >= 20) { if (pClDevice->getSupportedClVersion() >= 20) {
size_t offset[3] = {0, 0, 0}; size_t offset[3] = {0, 0, 0};
size_t gws[3] = {1, 1, 1}; size_t gws[3] = {1, 1, 1};
@@ -210,7 +210,7 @@ HWCMDTEST_P(IGFX_GEN8_CORE, ParentKernelEnqueueTest, GivenParentKernelWithBlocks
} }
HWCMDTEST_P(IGFX_GEN8_CORE, ParentKernelEnqueueTest, GivenBlockKernelManagerFilledWithBlocksWhenMakeInternalAllocationsResidentIsCalledThenAllSurfacesAreMadeResident) { HWCMDTEST_P(IGFX_GEN8_CORE, ParentKernelEnqueueTest, GivenBlockKernelManagerFilledWithBlocksWhenMakeInternalAllocationsResidentIsCalledThenAllSurfacesAreMadeResident) {
if (pDevice->getSupportedClVersion() >= 20) { if (pClDevice->getSupportedClVersion() >= 20) {
auto blockKernelManager = pKernel->getProgram()->getBlockKernelManager(); auto blockKernelManager = pKernel->getProgram()->getBlockKernelManager();
auto &csr = pDevice->getUltCommandStreamReceiver<FamilyType>(); auto &csr = pDevice->getUltCommandStreamReceiver<FamilyType>();
csr.storeMakeResidentAllocations = true; csr.storeMakeResidentAllocations = true;
@@ -225,7 +225,7 @@ HWCMDTEST_P(IGFX_GEN8_CORE, ParentKernelEnqueueTest, GivenBlockKernelManagerFill
} }
HWCMDTEST_P(IGFX_GEN8_CORE, ParentKernelEnqueueTest, GivenParentKernelWithBlocksWhenEnqueueKernelThatIsBlockedByUserEventIsCalledThenBlockKernelIsaAllocationIsMadeResidentWhenEventUnblocks) { HWCMDTEST_P(IGFX_GEN8_CORE, ParentKernelEnqueueTest, GivenParentKernelWithBlocksWhenEnqueueKernelThatIsBlockedByUserEventIsCalledThenBlockKernelIsaAllocationIsMadeResidentWhenEventUnblocks) {
if (pDevice->getSupportedClVersion() >= 20) { if (pClDevice->getSupportedClVersion() >= 20) {
size_t offset[3] = {0, 0, 0}; size_t offset[3] = {0, 0, 0};
size_t gws[3] = {1, 1, 1}; size_t gws[3] = {1, 1, 1};
@@ -455,7 +455,7 @@ class ParentKernelEnqueueFixture : public ExecutionModelSchedulerTest,
HWCMDTEST_F(IGFX_GEN8_CORE, ParentKernelEnqueueFixture, GivenParentKernelWhenEnqueuedTheDefaultDeviceQueueAndEventPoolIsPatched) { HWCMDTEST_F(IGFX_GEN8_CORE, ParentKernelEnqueueFixture, GivenParentKernelWhenEnqueuedTheDefaultDeviceQueueAndEventPoolIsPatched) {
if (pDevice->getSupportedClVersion() >= 20) { if (pClDevice->getSupportedClVersion() >= 20) {
size_t offset[3] = {0, 0, 0}; size_t offset[3] = {0, 0, 0};
size_t gws[3] = {1, 1, 1}; size_t gws[3] = {1, 1, 1};
@@ -481,7 +481,7 @@ HWCMDTEST_F(IGFX_GEN8_CORE, ParentKernelEnqueueFixture, GivenParentKernelWhenEnq
HWCMDTEST_F(IGFX_GEN8_CORE, ParentKernelEnqueueFixture, GivenParentKernelWhenEnqueuedThenBlocksDSHOnReflectionSurfaceArePatchedWithDeviceQueueAndEventPoolAddresses) { HWCMDTEST_F(IGFX_GEN8_CORE, ParentKernelEnqueueFixture, GivenParentKernelWhenEnqueuedThenBlocksDSHOnReflectionSurfaceArePatchedWithDeviceQueueAndEventPoolAddresses) {
if (pDevice->getSupportedClVersion() >= 20) { if (pClDevice->getSupportedClVersion() >= 20) {
size_t offset[3] = {0, 0, 0}; size_t offset[3] = {0, 0, 0};
size_t gws[3] = {1, 1, 1}; size_t gws[3] = {1, 1, 1};
DeviceQueueHw<FamilyType> *pDevQueueHw = castToObject<DeviceQueueHw<FamilyType>>(pDevQueue); DeviceQueueHw<FamilyType> *pDevQueueHw = castToObject<DeviceQueueHw<FamilyType>>(pDevQueue);
@@ -521,7 +521,7 @@ HWCMDTEST_F(IGFX_GEN8_CORE, ParentKernelEnqueueFixture, GivenParentKernelWhenEnq
HWCMDTEST_F(IGFX_GEN8_CORE, ParentKernelEnqueueFixture, GivenParentKernelWhenEnqueuedToNonBlockedQueueThenDeviceQueueCriticalSetionIsAcquired) { HWCMDTEST_F(IGFX_GEN8_CORE, ParentKernelEnqueueFixture, GivenParentKernelWhenEnqueuedToNonBlockedQueueThenDeviceQueueCriticalSetionIsAcquired) {
if (pDevice->getSupportedClVersion() >= 20) { if (pClDevice->getSupportedClVersion() >= 20) {
size_t offset[3] = {0, 0, 0}; size_t offset[3] = {0, 0, 0};
size_t gws[3] = {1, 1, 1}; size_t gws[3] = {1, 1, 1};
DeviceQueueHw<FamilyType> *pDevQueueHw = castToObject<DeviceQueueHw<FamilyType>>(pDevQueue); DeviceQueueHw<FamilyType> *pDevQueueHw = castToObject<DeviceQueueHw<FamilyType>>(pDevQueue);
@@ -536,7 +536,7 @@ HWCMDTEST_F(IGFX_GEN8_CORE, ParentKernelEnqueueFixture, GivenParentKernelWhenEnq
HWCMDTEST_F(IGFX_GEN8_CORE, ParentKernelEnqueueFixture, GivenParentKernelWhenEnqueuedToBlockedQueueThenDeviceQueueCriticalSetionIsNotAcquired) { HWCMDTEST_F(IGFX_GEN8_CORE, ParentKernelEnqueueFixture, GivenParentKernelWhenEnqueuedToBlockedQueueThenDeviceQueueCriticalSetionIsNotAcquired) {
if (pDevice->getSupportedClVersion() >= 20) { if (pClDevice->getSupportedClVersion() >= 20) {
size_t offset[3] = {0, 0, 0}; size_t offset[3] = {0, 0, 0};
size_t gws[3] = {1, 1, 1}; size_t gws[3] = {1, 1, 1};
DeviceQueueHw<FamilyType> *pDevQueueHw = castToObject<DeviceQueueHw<FamilyType>>(pDevQueue); DeviceQueueHw<FamilyType> *pDevQueueHw = castToObject<DeviceQueueHw<FamilyType>>(pDevQueue);
@@ -555,7 +555,7 @@ HWCMDTEST_F(IGFX_GEN8_CORE, ParentKernelEnqueueFixture, GivenParentKernelWhenEnq
HWCMDTEST_F(IGFX_GEN8_CORE, ParentKernelEnqueueFixture, ParentKernelEnqueuedToNonBlockedQueueFlushesCSRWithSLM) { HWCMDTEST_F(IGFX_GEN8_CORE, ParentKernelEnqueueFixture, ParentKernelEnqueuedToNonBlockedQueueFlushesCSRWithSLM) {
if (pDevice->getSupportedClVersion() >= 20) { if (pClDevice->getSupportedClVersion() >= 20) {
size_t offset[3] = {0, 0, 0}; size_t offset[3] = {0, 0, 0};
size_t gws[3] = {1, 1, 1}; size_t gws[3] = {1, 1, 1};
int32_t execStamp; int32_t execStamp;
@@ -570,7 +570,7 @@ HWCMDTEST_F(IGFX_GEN8_CORE, ParentKernelEnqueueFixture, ParentKernelEnqueuedToNo
HWCMDTEST_F(IGFX_GEN8_CORE, ParentKernelEnqueueFixture, ParentKernelEnqueuedWithSchedulerReturnInstanceRunsSimulation) { HWCMDTEST_F(IGFX_GEN8_CORE, ParentKernelEnqueueFixture, ParentKernelEnqueuedWithSchedulerReturnInstanceRunsSimulation) {
if (pDevice->getSupportedClVersion() >= 20) { if (pClDevice->getSupportedClVersion() >= 20) {
DebugManagerStateRestore dbgRestorer; DebugManagerStateRestore dbgRestorer;
DebugManager.flags.SchedulerSimulationReturnInstance.set(1); DebugManager.flags.SchedulerSimulationReturnInstance.set(1);
@@ -599,7 +599,7 @@ HWCMDTEST_F(IGFX_GEN8_CORE, ParentKernelEnqueueFixture, ParentKernelEnqueuedWith
} }
HWCMDTEST_F(IGFX_GEN8_CORE, ParentKernelEnqueueFixture, givenCsrInBatchingModeWhenExecutionModelKernelIsSubmittedThenItIsFlushed) { HWCMDTEST_F(IGFX_GEN8_CORE, ParentKernelEnqueueFixture, givenCsrInBatchingModeWhenExecutionModelKernelIsSubmittedThenItIsFlushed) {
if (pDevice->getSupportedClVersion() >= 20) { if (pClDevice->getSupportedClVersion() >= 20) {
auto mockCsr = new MockCsrHw2<FamilyType>(*pDevice->executionEnvironment, pDevice->getRootDeviceIndex()); auto mockCsr = new MockCsrHw2<FamilyType>(*pDevice->executionEnvironment, pDevice->getRootDeviceIndex());
mockCsr->overrideDispatchPolicy(DispatchMode::BatchedDispatch); mockCsr->overrideDispatchPolicy(DispatchMode::BatchedDispatch);
pDevice->resetCommandStreamReceiver(mockCsr); pDevice->resetCommandStreamReceiver(mockCsr);
@@ -622,7 +622,7 @@ HWCMDTEST_F(IGFX_GEN8_CORE, ParentKernelEnqueueFixture, givenCsrInBatchingModeWh
HWCMDTEST_F(IGFX_GEN8_CORE, ParentKernelEnqueueFixture, ParentKernelEnqueueMarksCSRMediaVFEStateDirty) { HWCMDTEST_F(IGFX_GEN8_CORE, ParentKernelEnqueueFixture, ParentKernelEnqueueMarksCSRMediaVFEStateDirty) {
if (pDevice->getSupportedClVersion() >= 20) { if (pClDevice->getSupportedClVersion() >= 20) {
size_t offset[3] = {0, 0, 0}; size_t offset[3] = {0, 0, 0};
size_t gws[3] = {1, 1, 1}; size_t gws[3] = {1, 1, 1};
int32_t execStamp; int32_t execStamp;

8
opencl/test/unit_test/execution_model/parent_kernel_dispatch_tests.cpp
View File

@@ -261,7 +261,7 @@ class MockParentKernelDispatch : public ExecutionModelSchedulerTest,
HWCMDTEST_F(IGFX_GEN8_CORE, MockParentKernelDispatch, GivenBlockedQueueWhenParentKernelIsDispatchedThenDshHeapForIndirectObjectHeapIsUsed) { HWCMDTEST_F(IGFX_GEN8_CORE, MockParentKernelDispatch, GivenBlockedQueueWhenParentKernelIsDispatchedThenDshHeapForIndirectObjectHeapIsUsed) {
if (pDevice->getSupportedClVersion() >= 20) { if (pClDevice->getSupportedClVersion() >= 20) {
MockParentKernel *mockParentKernel = MockParentKernel::create(*context); MockParentKernel *mockParentKernel = MockParentKernel::create(*context);
auto blockedCommandsData = createBlockedCommandsData(*pCmdQ); auto blockedCommandsData = createBlockedCommandsData(*pCmdQ);
@@ -293,7 +293,7 @@ HWCMDTEST_F(IGFX_GEN8_CORE, MockParentKernelDispatch, GivenParentKernelWhenDispa
typedef typename FamilyType::MEDIA_INTERFACE_DESCRIPTOR_LOAD MEDIA_INTERFACE_DESCRIPTOR_LOAD; typedef typename FamilyType::MEDIA_INTERFACE_DESCRIPTOR_LOAD MEDIA_INTERFACE_DESCRIPTOR_LOAD;
typedef typename FamilyType::INTERFACE_DESCRIPTOR_DATA INTERFACE_DESCRIPTOR_DATA; typedef typename FamilyType::INTERFACE_DESCRIPTOR_DATA INTERFACE_DESCRIPTOR_DATA;
if (pDevice->getSupportedClVersion() >= 20) { if (pClDevice->getSupportedClVersion() >= 20) {
MockParentKernel *mockParentKernel = MockParentKernel::create(*context); MockParentKernel *mockParentKernel = MockParentKernel::create(*context);
KernelOperation *blockedCommandsData = nullptr; KernelOperation *blockedCommandsData = nullptr;
@@ -338,7 +338,7 @@ HWCMDTEST_F(IGFX_GEN8_CORE, MockParentKernelDispatch, GivenParentKernelWhenDispa
HWCMDTEST_F(IGFX_GEN8_CORE, MockParentKernelDispatch, GivenUsedSSHHeapWhenParentKernelIsDispatchedThenNewSSHIsAllocated) { HWCMDTEST_F(IGFX_GEN8_CORE, MockParentKernelDispatch, GivenUsedSSHHeapWhenParentKernelIsDispatchedThenNewSSHIsAllocated) {
if (pDevice->getSupportedClVersion() >= 20) { if (pClDevice->getSupportedClVersion() >= 20) {
MockParentKernel *mockParentKernel = MockParentKernel::create(*context); MockParentKernel *mockParentKernel = MockParentKernel::create(*context);
KernelOperation *blockedCommandsData = nullptr; KernelOperation *blockedCommandsData = nullptr;
@@ -379,7 +379,7 @@ HWCMDTEST_F(IGFX_GEN8_CORE, MockParentKernelDispatch, GivenUsedSSHHeapWhenParent
HWCMDTEST_F(IGFX_GEN8_CORE, MockParentKernelDispatch, GivenNotUsedSSHHeapWhenParentKernelIsDispatchedThenExistingSSHIsUsed) { HWCMDTEST_F(IGFX_GEN8_CORE, MockParentKernelDispatch, GivenNotUsedSSHHeapWhenParentKernelIsDispatchedThenExistingSSHIsUsed) {
if (pDevice->getSupportedClVersion() >= 20) { if (pClDevice->getSupportedClVersion() >= 20) {
MockParentKernel *mockParentKernel = MockParentKernel::create(*context); MockParentKernel *mockParentKernel = MockParentKernel::create(*context);
KernelOperation *blockedCommandsData = nullptr; KernelOperation *blockedCommandsData = nullptr;

6
opencl/test/unit_test/execution_model/scheduler_dispatch_tests.cpp
View File

@@ -43,7 +43,7 @@ HWCMDTEST_F(IGFX_GEN8_CORE, ExecutionModelSchedulerFixture, dispatchScheduler) {
using PIPE_CONTROL = typename FamilyType::PIPE_CONTROL; using PIPE_CONTROL = typename FamilyType::PIPE_CONTROL;
using MI_BATCH_BUFFER_START = typename FamilyType::MI_BATCH_BUFFER_START; using MI_BATCH_BUFFER_START = typename FamilyType::MI_BATCH_BUFFER_START;
if (pDevice->getSupportedClVersion() >= 20) { if (pClDevice->getSupportedClVersion() >= 20) {
DeviceQueueHw<FamilyType> *pDevQueueHw = castToObject<DeviceQueueHw<FamilyType>>(pDevQueue); DeviceQueueHw<FamilyType> *pDevQueueHw = castToObject<DeviceQueueHw<FamilyType>>(pDevQueue);
SchedulerKernel &scheduler = context->getSchedulerKernel(); SchedulerKernel &scheduler = context->getSchedulerKernel();
@@ -172,7 +172,7 @@ HWCMDTEST_F(IGFX_GEN8_CORE, ExecutionModelSchedulerFixture, dispatchSchedulerDoe
using MEDIA_VFE_STATE = typename FamilyType::MEDIA_VFE_STATE; using MEDIA_VFE_STATE = typename FamilyType::MEDIA_VFE_STATE;
using PIPE_CONTROL = typename FamilyType::PIPE_CONTROL; using PIPE_CONTROL = typename FamilyType::PIPE_CONTROL;
if (pDevice->getSupportedClVersion() >= 20) { if (pClDevice->getSupportedClVersion() >= 20) {
DeviceQueueHw<FamilyType> *pDevQueueHw = castToObject<DeviceQueueHw<FamilyType>>(pDevQueue); DeviceQueueHw<FamilyType> *pDevQueueHw = castToObject<DeviceQueueHw<FamilyType>>(pDevQueue);
SchedulerKernel &scheduler = context->getSchedulerKernel(); SchedulerKernel &scheduler = context->getSchedulerKernel();
@@ -241,7 +241,7 @@ HWCMDTEST_F(IGFX_GEN8_CORE, ParentKernelCommandQueueFixture, dispatchSchedulerWi
HWCMDTEST_F(IGFX_GEN8_CORE, ExecutionModelSchedulerFixture, ForceDispatchSchedulerEnqueuesSchedulerKernel) { HWCMDTEST_F(IGFX_GEN8_CORE, ExecutionModelSchedulerFixture, ForceDispatchSchedulerEnqueuesSchedulerKernel) {
if (pDevice->getSupportedClVersion() >= 20) { if (pClDevice->getSupportedClVersion() >= 20) {
DebugManagerStateRestore dbgRestorer; DebugManagerStateRestore dbgRestorer;
DebugManager.flags.ForceDispatchScheduler.set(true); DebugManager.flags.ForceDispatchScheduler.set(true);

2
opencl/test/unit_test/gen8/bdw/device_tests_bdw.cpp
View File

@@ -23,6 +23,6 @@ struct BdwDeviceTest : public DeviceFixture,
}; };
BDWTEST_F(BdwDeviceTest, givenBdwDeviceWhenAskedForClVersionThenReport21) { BDWTEST_F(BdwDeviceTest, givenBdwDeviceWhenAskedForClVersionThenReport21) {
auto version = pDevice->getSupportedClVersion(); auto version = pClDevice->getSupportedClVersion();
EXPECT_EQ(21u, version); EXPECT_EQ(21u, version);
} }

2
opencl/test/unit_test/gen8/scheduler_dispatch_tests_gen8.cpp
View File

@@ -27,7 +27,7 @@ BDWTEST_F(BdwSchedulerTest, givenCallToDispatchSchedulerWhenPipeControlWithCSSta
using PIPE_CONTROL = typename FamilyType::PIPE_CONTROL; using PIPE_CONTROL = typename FamilyType::PIPE_CONTROL;
if (pDevice->getSupportedClVersion() >= 20) { if (pClDevice->getSupportedClVersion() >= 20) {
DeviceQueueHw<FamilyType> *pDevQueueHw = castToObject<DeviceQueueHw<FamilyType>>(pDevQueue); DeviceQueueHw<FamilyType> *pDevQueueHw = castToObject<DeviceQueueHw<FamilyType>>(pDevQueue);
SchedulerKernel &scheduler = context->getSchedulerKernel(); SchedulerKernel &scheduler = context->getSchedulerKernel();

2
opencl/test/unit_test/gen9/bxt/device_tests_bxt.cpp
View File

@@ -13,7 +13,7 @@ using namespace NEO;
typedef Test<DeviceFixture> DeviceTest; typedef Test<DeviceFixture> DeviceTest;
BXTTEST_F(DeviceTest, getSupportedClVersion12Device) { BXTTEST_F(DeviceTest, getSupportedClVersion12Device) {
auto version = pDevice->getSupportedClVersion(); auto version = pClDevice->getSupportedClVersion();
EXPECT_EQ(12u, version); EXPECT_EQ(12u, version);
} }

2
opencl/test/unit_test/gen9/skl/device_tests_skl.cpp
View File

@@ -13,7 +13,7 @@ using namespace NEO;
typedef Test<DeviceFixture> DeviceTest; typedef Test<DeviceFixture> DeviceTest;
SKLTEST_F(DeviceTest, getSupportedClVersion21Device) { SKLTEST_F(DeviceTest, getSupportedClVersion21Device) {
auto version = pDevice->getSupportedClVersion(); auto version = pClDevice->getSupportedClVersion();
EXPECT_EQ(21u, version); EXPECT_EQ(21u, version);
} }

2
opencl/test/unit_test/kernel/kernel_tests.cpp
View File

@@ -1362,7 +1362,7 @@ HWCMDTEST_F(IGFX_GEN8_CORE, KernelEventPoolSurfaceTest, givenStatelessKernelWhen
pKernelInfo->requiresSshForBuffers = false; pKernelInfo->requiresSshForBuffers = false;
ASSERT_EQ(CL_SUCCESS, pKernel->initialize()); ASSERT_EQ(CL_SUCCESS, pKernel->initialize());
if (pDevice->getSupportedClVersion() < 20) { if (pClDevice->getSupportedClVersion() < 20) {
EXPECT_EQ(0u, pKernel->getSurfaceStateHeapSize()); EXPECT_EQ(0u, pKernel->getSurfaceStateHeapSize());
} else { } else {
} }

4
shared/source/device/device.cpp
View File

@@ -167,10 +167,6 @@ double Device::getProfilingTimerResolution() {
return osTime->getDynamicDeviceTimerResolution(getHardwareInfo()); return osTime->getDynamicDeviceTimerResolution(getHardwareInfo());
} }
unsigned int Device::getSupportedClVersion() const {
return getHardwareInfo().capabilityTable.clVersionSupport;
}
bool Device::isSimulation() const { bool Device::isSimulation() const {
auto &hwInfo = getHardwareInfo(); auto &hwInfo = getHardwareInfo();

2
shared/source/device/device.h
View File

@@ -24,8 +24,6 @@ class Device : public ReferenceTrackedObject<Device> {
Device(const Device &) = delete; Device(const Device &) = delete;
~Device() override; ~Device() override;
unsigned int getSupportedClVersion() const;
template <typename DeviceT, typename... ArgsT> template <typename DeviceT, typename... ArgsT>
static DeviceT *create(ArgsT &&... args) { static DeviceT *create(ArgsT &&... args) {
DeviceT *device = new DeviceT(std::forward<ArgsT>(args)...); DeviceT *device = new DeviceT(std::forward<ArgsT>(args)...);