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

Remove lowPriorityEngineType member

Browse Source 
Change-Id: I39908addf1c3a12f7807479132d0a6d5a4398d7b
Signed-off-by: Bartosz Dunajski <bartosz.dunajski@intel.com>
This commit is contained in:
Bartosz Dunajski
2020-09-28 13:33:46 +02:00
committed by sys_ocldev
parent 1b0983d7db
commit 28acc2c8f6
9 changed files with 7 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
opencl/source/command_queue/command_queue_hw.h
View File

@@ -42,7 +42,7 @@ class CommandQueueHw : public CommandQueue {
if (clPriority & static_cast<cl_queue_priority_khr>(CL_QUEUE_PRIORITY_LOW_KHR)) {
priority = QueuePriority::LOW;
this->gpgpuEngine = &device->getDeviceById(0)->getEngine(HwHelperHw<GfxFamily>::lowPriorityEngineType, true, false);
this->gpgpuEngine = &device->getDeviceById(0)->getEngine(getChosenEngineType(device->getHardwareInfo()), true, false);
} else if (clPriority & static_cast<cl_queue_priority_khr>(CL_QUEUE_PRIORITY_MED_KHR)) {
priority = QueuePriority::MEDIUM;
} else if (clPriority & static_cast<cl_queue_priority_khr>(CL_QUEUE_PRIORITY_HIGH_KHR)) {

4
opencl/test/unit_test/api/cl_create_command_queue_with_properties_tests.cpp
View File

@@ -409,7 +409,7 @@ HWTEST_F(clCreateCommandQueueWithPropertiesApi, GivenLowPriorityWhenCreatingComm
auto commandQueueObj = castToObject<CommandQueue>(cmdQ);
auto &osContext = commandQueueObj->getGpgpuCommandStreamReceiver().getOsContext();
EXPECT_EQ(HwHelperHw<FamilyType>::lowPriorityEngineType, osContext.getEngineType());
EXPECT_EQ(getChosenEngineType(pDevice->getHardwareInfo()), osContext.getEngineType());
EXPECT_TRUE(osContext.isLowPriority());
clReleaseCommandQueue(cmdQ);
@@ -494,7 +494,7 @@ HWTEST_F(LowPriorityCommandQueueTest, GivenDeviceWithSubdevicesWhenCreatingLowPr
auto commandQueueObj = castToObject<CommandQueue>(cmdQ);
auto subDevice = context.getDevice(0)->getDeviceById(0);
auto engine = subDevice->getEngine(HwHelperHw<FamilyType>::lowPriorityEngineType, true, false);
auto engine = subDevice->getEngine(getChosenEngineType(subDevice->getHardwareInfo()), true, false);
EXPECT_EQ(engine.commandStreamReceiver, &commandQueueObj->getGpgpuCommandStreamReceiver());
EXPECT_EQ(engine.osContext, &commandQueueObj->getGpgpuCommandStreamReceiver().getOsContext());

2
opencl/test/unit_test/command_queue/blit_enqueue_tests.cpp
View File

@@ -82,7 +82,7 @@ struct BlitEnqueueTests : public ::testing::Test {
capabilityTable.blitterOperationsSupported = true;
if (createBcsEngine) {
auto &engine = device->getEngine(HwHelperHw<FamilyType>::lowPriorityEngineType, true, false);
auto &engine = device->getEngine(getChosenEngineType(device->getHardwareInfo()), true, false);
bcsOsContext.reset(OsContext::create(nullptr, 1, device->getDeviceBitfield(), aub_stream::ENGINE_BCS, PreemptionMode::Disabled,
false, false, false));
engine.osContext = bcsOsContext.get();

2
opencl/test/unit_test/command_queue/command_queue_tests.cpp
View File

@@ -241,7 +241,7 @@ HWTEST_P(CommandQueueWithBlitOperationsTests, givenDeviceWithSubDevicesSupportin
auto subDevice = device->getDeviceById(0);
if (createBcsEngine) {
auto &engine = subDevice->getEngine(HwHelperHw<FamilyType>::lowPriorityEngineType, true, false);
auto &engine = subDevice->getEngine(getChosenEngineType(subDevice->getHardwareInfo()), true, false);
bcsOsContext.reset(OsContext::create(nullptr, 1, 0, aub_stream::ENGINE_BCS, PreemptionMode::Disabled,
false, false, false));
engine.osContext = bcsOsContext.get();

5
opencl/test/unit_test/helpers/hw_helper_default_tests.cpp
View File

@@ -24,11 +24,6 @@ HWCMDTEST_F(IGFX_GEN8_CORE, HwHelperTest, givenHwHelperWhenAskedForHvAlign4Requi
EXPECT_TRUE(hwHelper.hvAlign4Required());
}
HWCMDTEST_F(IGFX_GEN8_CORE, HwHelperTest, givenHwHelperWhenAskedForLowPriorityEngineTypeThenReturnRcs) {
auto hwHelperEngineType = HwHelperHw<FamilyType>::lowPriorityEngineType;
EXPECT_EQ(aub_stream::EngineType::ENGINE_RCS, hwHelperEngineType);
}
HWCMDTEST_F(IGFX_GEN8_CORE, HwHelperTest, givenHwHelperWhenGettingBindlessSurfaceExtendedMessageDescriptorValueThenCorrectValueIsReturned) {
auto &hwHelper = HwHelper::get(pDevice->getHardwareInfo().platform.eRenderCoreFamily);
auto value = hwHelper.getBindlessSurfaceExtendedMessageDescriptorValue(0x200);

2
opencl/test/unit_test/helpers/timestamp_packet_tests.cpp
View File

@@ -1639,7 +1639,7 @@ HWTEST_F(TimestampPacketTests, givenBlockedEnqueueWithoutKernelWhenSubmittingThe
auto cmdQ0 = clUniquePtr(new MockCommandQueueHw<FamilyType>(context, device.get(), nullptr));
auto &secondEngine = device->getEngine(HwHelperHw<FamilyType>::lowPriorityEngineType, true, false);
auto &secondEngine = device->getEngine(getChosenEngineType(device->getHardwareInfo()), true, false);
static_cast<UltCommandStreamReceiver<FamilyType> *>(secondEngine.commandStreamReceiver)->timestampPacketWriteEnabled = true;
auto cmdQ1 = clUniquePtr(new MockCommandQueueHw<FamilyType>(context, device.get(), nullptr));

2
opencl/test/unit_test/mem_obj/buffer_bcs_tests.cpp
View File

@@ -99,7 +99,7 @@ struct BcsBufferTests : public ::testing::Test {
capabilityTable.blitterOperationsSupported = true;
if (createBcsEngine) {
auto &engine = device->getEngine(HwHelperHw<FamilyType>::lowPriorityEngineType, true, false);
auto &engine = device->getEngine(getChosenEngineType(device->getHardwareInfo()), true, false);
bcsOsContext.reset(OsContext::create(nullptr, 1, device->getDeviceBitfield(), aub_stream::ENGINE_BCS, PreemptionMode::Disabled,
false, false, false));
engine.osContext = bcsOsContext.get();

2
shared/source/helpers/hw_helper.h
View File

@@ -145,8 +145,6 @@ class HwHelperHw : public HwHelper {
return hwHelper;
}
static const aub_stream::EngineType lowPriorityEngineType;
uint32_t getBindingTableStateSurfaceStatePointer(const void *pBindingTable, uint32_t index) override {
using BINDING_TABLE_STATE = typename GfxFamily::BINDING_TABLE_STATE;

3
shared/source/helpers/hw_helper_base.inl
View File

@@ -26,9 +26,6 @@
namespace NEO {
template <typename Family>
const aub_stream::EngineType HwHelperHw<Family>::lowPriorityEngineType = aub_stream::EngineType::ENGINE_RCS;
template <typename Family>
const AuxTranslationMode HwHelperHw<Family>::defaultAuxTranslationMode = AuxTranslationMode::Builtin;