Skip to content

Commit 73f8d9e

Browse files
kcenceleCompute-Runtime-Automation
kcencele
authored and
Compute-Runtime-Automation
committed
Remove device enqueue part 14
- rename not proper structs Related-To: NEO-6559 Signed-off-by: Katarzyna Cencelewska <katarzyna.cencelewska@intel.com>
1 parent f45fadf commit 73f8d9e

File tree

9 files changed

+28
-107
lines changed

9 files changed

+28
-107
lines changed

‎level_zero/core/test/unit_tests/gen12lp/test_device_gen12lp.cpp‎

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -28,9 +28,9 @@ HWTEST2_F(DeviceFixtureGen12LP, GivenTargetGen12LPaWhenGettingMemoryPropertiesTh
2828
EXPECT_EQ(0u, memProperties.maxClockRate);
2929
}
3030

31-
using DeviceQueueGroupTest = Test<DeviceFixture>;
31+
using CommandQueueGroupTest = Test<DeviceFixture>;
3232

33-
HWTEST2_F(DeviceQueueGroupTest,
33+
HWTEST2_F(CommandQueueGroupTest,
3434
givenNoBlitterSupportAndNoCCSThenOneQueueGroupIsReturned, IsGen12LP) {
3535
const uint32_t rootDeviceIndex = 0u;
3636
NEO::HardwareInfo hwInfo = *NEO::defaultHwInfo.get();
@@ -47,7 +47,7 @@ HWTEST2_F(DeviceQueueGroupTest,
4747
EXPECT_EQ(count, 1u);
4848
}
4949

50-
HWTEST2_F(DeviceQueueGroupTest,
50+
HWTEST2_F(CommandQueueGroupTest,
5151
givenBlitterSupportAndNoCCSThenTwoQueueGroupsAreReturned, IsGen12LP) {
5252
const uint32_t rootDeviceIndex = 0u;
5353
NEO::HardwareInfo hwInfo = *NEO::defaultHwInfo.get();
@@ -103,7 +103,7 @@ HWTEST2_F(DeviceCopyQueueGroupTest,
103103
}
104104
}
105105

106-
HWTEST2_F(DeviceQueueGroupTest,
106+
HWTEST2_F(CommandQueueGroupTest,
107107
givenBlitterSupportAndCCSDefaultEngineThenThreeQueueGroupsAreReturned, IsGen12LP) {
108108
const uint32_t rootDeviceIndex = 0u;
109109
NEO::HardwareInfo hwInfo = *NEO::defaultHwInfo.get();
@@ -147,7 +147,7 @@ HWTEST2_F(DeviceQueueGroupTest,
147147
}
148148
}
149149

150-
HWTEST2_F(DeviceQueueGroupTest,
150+
HWTEST2_F(CommandQueueGroupTest,
151151
givenBlitterSupportAndCCSDefaultEngineAndOnlyTwoQueueGroupsRequestedThenTwoQueueGroupsAreReturned, IsGen12LP) {
152152
const uint32_t rootDeviceIndex = 0u;
153153
NEO::HardwareInfo hwInfo = *NEO::defaultHwInfo.get();
@@ -193,7 +193,7 @@ HWTEST2_F(DeviceQueueGroupTest,
193193
}
194194
}
195195

196-
HWTEST2_F(DeviceQueueGroupTest,
196+
HWTEST2_F(CommandQueueGroupTest,
197197
givenBlitterSupportAndNoCCSThenTwoQueueGroupsPropertiesAreReturned, IsGen12LP) {
198198
const uint32_t rootDeviceIndex = 0u;
199199
NEO::HardwareInfo hwInfo = *NEO::defaultHwInfo.get();
@@ -230,7 +230,7 @@ HWTEST2_F(DeviceQueueGroupTest,
230230
}
231231
}
232232

233-
HWTEST2_F(DeviceQueueGroupTest,
233+
HWTEST2_F(CommandQueueGroupTest,
234234
givenQueueGroupsReturnedThenCommandListsAreCreatedCorrectly, IsGen12LP) {
235235
const uint32_t rootDeviceIndex = 0u;
236236
NEO::HardwareInfo hwInfo = *NEO::defaultHwInfo.get();

‎level_zero/core/test/unit_tests/gen9/test_device_gen9.cpp‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -28,9 +28,9 @@ HWTEST2_F(DevicePropertyTest, givenReturnedDevicePropertiesThenExpectedPropertie
2828
EXPECT_EQ(ZE_DEVICE_PROPERTY_FLAG_INTEGRATED, deviceProps.flags & ZE_DEVICE_PROPERTY_FLAG_INTEGRATED);
2929
}
3030

31-
using DeviceQueueGroupTest = Test<DeviceFixture>;
31+
using CommandQueueGroupTest = Test<DeviceFixture>;
3232

33-
HWTEST2_F(DeviceQueueGroupTest, givenCommandQueuePropertiesCallThenCorrectNumberOfGroupsIsReturned, IsGen9) {
33+
HWTEST2_F(CommandQueueGroupTest, givenCommandQueuePropertiesCallThenCorrectNumberOfGroupsIsReturned, IsGen9) {
3434
uint32_t count = 0;
3535
ze_result_t res = device->getCommandQueueGroupProperties(&count, nullptr);
3636
EXPECT_EQ(ZE_RESULT_SUCCESS, res);
@@ -48,7 +48,7 @@ HWTEST2_F(DeviceQueueGroupTest, givenCommandQueuePropertiesCallThenCorrectNumber
4848
EXPECT_EQ(properties.maxMemoryFillPatternSize, std::numeric_limits<size_t>::max());
4949
}
5050

51-
HWTEST2_F(DeviceQueueGroupTest, givenQueueGroupsReturnedThenCommandListIsCreatedCorrectly, IsGen9) {
51+
HWTEST2_F(CommandQueueGroupTest, givenQueueGroupsReturnedThenCommandListIsCreatedCorrectly, IsGen9) {
5252
uint32_t count = 0;
5353
ze_result_t res = device->getCommandQueueGroupProperties(&count, nullptr);
5454
EXPECT_EQ(ZE_RESULT_SUCCESS, res);

‎level_zero/core/test/unit_tests/xe_hp_core/test_device_xe_hp_core.cpp‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/*
2-
* Copyright (C) 2021 Intel Corporation
2+
* Copyright (C) 2021-2022 Intel Corporation
33
*
44
* SPDX-License-Identifier: MIT
55
*
@@ -32,9 +32,9 @@ HWTEST2_F(DeviceFixtureXeHpCore, givenReturnedDevicePropertiesThenExpectedProper
3232
EXPECT_EQ(0u, deviceProps.flags & ZE_DEVICE_PROPERTY_FLAG_INTEGRATED);
3333
}
3434

35-
using DeviceQueueGroupTest = Test<DeviceFixture>;
35+
using CommandQueueGroupTest = Test<DeviceFixture>;
3636

37-
HWTEST2_F(DeviceQueueGroupTest, givenNoBlitterSupportAndNoCCSThenOneQueueGroupIsReturned, IsXeHpCore) {
37+
HWTEST2_F(CommandQueueGroupTest, givenNoBlitterSupportAndNoCCSThenOneQueueGroupIsReturned, IsXeHpCore) {
3838
const uint32_t rootDeviceIndex = 0u;
3939
NEO::HardwareInfo hwInfo = *NEO::defaultHwInfo.get();
4040
hwInfo.featureTable.flags.ftrCCSNode = false;
@@ -48,7 +48,7 @@ HWTEST2_F(DeviceQueueGroupTest, givenNoBlitterSupportAndNoCCSThenOneQueueGroupIs
4848
EXPECT_GE(count, 1u);
4949
}
5050

51-
HWTEST2_F(DeviceQueueGroupTest, givenNoBlitterSupportAndCCSThenTwoQueueGroupsAreReturned, IsXeHpCore) {
51+
HWTEST2_F(CommandQueueGroupTest, givenNoBlitterSupportAndCCSThenTwoQueueGroupsAreReturned, IsXeHpCore) {
5252
const uint32_t rootDeviceIndex = 0u;
5353
NEO::HardwareInfo hwInfo = *NEO::defaultHwInfo.get();
5454
hwInfo.featureTable.flags.ftrCCSNode = true;
@@ -62,7 +62,7 @@ HWTEST2_F(DeviceQueueGroupTest, givenNoBlitterSupportAndCCSThenTwoQueueGroupsAre
6262
EXPECT_GE(count, 2u);
6363
}
6464

65-
HWTEST2_F(DeviceQueueGroupTest, givenBlitterSupportAndCCSThenThreeQueueGroupsAreReturned, IsXeHpCore) {
65+
HWTEST2_F(CommandQueueGroupTest, givenBlitterSupportAndCCSThenThreeQueueGroupsAreReturned, IsXeHpCore) {
6666
const uint32_t rootDeviceIndex = 0u;
6767
NEO::HardwareInfo hwInfo = *NEO::defaultHwInfo.get();
6868
hwInfo.featureTable.flags.ftrCCSNode = true;

‎level_zero/core/test/unit_tests/xe_hpc_core/test_device_xe_hpc_core.cpp‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -116,9 +116,9 @@ HWTEST2_F(DeviceTestPVC, givenPvcBStepWhenCreatingMultiTileDeviceThenExpectImpli
116116
delete device;
117117
}
118118

119-
using DeviceQueueGroupTest = Test<DeviceFixture>;
119+
using CommandQueueGroupTest = Test<DeviceFixture>;
120120

121-
HWTEST2_F(DeviceQueueGroupTest, givenNoBlitterSupportAndNoCCSThenOneQueueGroupIsReturned, IsXeHpcCore) {
121+
HWTEST2_F(CommandQueueGroupTest, givenNoBlitterSupportAndNoCCSThenOneQueueGroupIsReturned, IsXeHpcCore) {
122122
const uint32_t rootDeviceIndex = 0u;
123123
NEO::HardwareInfo hwInfo = *NEO::defaultHwInfo.get();
124124
hwInfo.featureTable.flags.ftrCCSNode = false;
@@ -132,7 +132,7 @@ HWTEST2_F(DeviceQueueGroupTest, givenNoBlitterSupportAndNoCCSThenOneQueueGroupIs
132132
EXPECT_GE(count, 1u);
133133
}
134134

135-
HWTEST2_F(DeviceQueueGroupTest, givenNoBlitterSupportAndCCSThenTwoQueueGroupsAreReturned, IsXeHpcCore) {
135+
HWTEST2_F(CommandQueueGroupTest, givenNoBlitterSupportAndCCSThenTwoQueueGroupsAreReturned, IsXeHpcCore) {
136136
const uint32_t rootDeviceIndex = 0u;
137137
NEO::HardwareInfo hwInfo = *NEO::defaultHwInfo.get();
138138
hwInfo.featureTable.flags.ftrCCSNode = true;
@@ -146,7 +146,7 @@ HWTEST2_F(DeviceQueueGroupTest, givenNoBlitterSupportAndCCSThenTwoQueueGroupsAre
146146
EXPECT_GE(count, 2u);
147147
}
148148

149-
HWTEST2_F(DeviceQueueGroupTest, givenBlitterDisabledAndAllBcsSetThenTwoQueueGroupsAreReturned, IsXeHpcCore) {
149+
HWTEST2_F(CommandQueueGroupTest, givenBlitterDisabledAndAllBcsSetThenTwoQueueGroupsAreReturned, IsXeHpcCore) {
150150
DebugManagerStateRestore dbgRestorer;
151151
DebugManager.flags.EnableBlitterOperationsSupport.set(0);
152152
const uint32_t rootDeviceIndex = 0u;

‎level_zero/core/test/unit_tests/xe_hpg_core/test_device_xe_hpg_core.cpp‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/*
2-
* Copyright (C) 2021 Intel Corporation
2+
* Copyright (C) 2021-2022 Intel Corporation
33
*
44
* SPDX-License-Identifier: MIT
55
*
@@ -12,9 +12,9 @@
1212
namespace L0 {
1313
namespace ult {
1414

15-
using DeviceQueueGroupTest = Test<DeviceFixture>;
15+
using CommandQueueGroupTest = Test<DeviceFixture>;
1616

17-
HWTEST2_F(DeviceQueueGroupTest, givenNoBlitterSupportAndNoCCSThenOneQueueGroupIsReturned, IsXeHpgCore) {
17+
HWTEST2_F(CommandQueueGroupTest, givenNoBlitterSupportAndNoCCSThenOneQueueGroupIsReturned, IsXeHpgCore) {
1818
const uint32_t rootDeviceIndex = 0u;
1919
NEO::HardwareInfo hwInfo = *NEO::defaultHwInfo.get();
2020
hwInfo.featureTable.flags.ftrCCSNode = false;
@@ -28,7 +28,7 @@ HWTEST2_F(DeviceQueueGroupTest, givenNoBlitterSupportAndNoCCSThenOneQueueGroupIs
2828
EXPECT_GE(count, 1u);
2929
}
3030

31-
HWTEST2_F(DeviceQueueGroupTest, givenNoBlitterSupportAndCCSThenTwoQueueGroupsAreReturned, IsXeHpgCore) {
31+
HWTEST2_F(CommandQueueGroupTest, givenNoBlitterSupportAndCCSThenTwoQueueGroupsAreReturned, IsXeHpgCore) {
3232
const uint32_t rootDeviceIndex = 0u;
3333
NEO::HardwareInfo hwInfo = *NEO::defaultHwInfo.get();
3434
hwInfo.featureTable.flags.ftrCCSNode = true;
@@ -42,7 +42,7 @@ HWTEST2_F(DeviceQueueGroupTest, givenNoBlitterSupportAndCCSThenTwoQueueGroupsAre
4242
EXPECT_GE(count, 2u);
4343
}
4444

45-
HWTEST2_F(DeviceQueueGroupTest, givenBlitterSupportAndCCSThenThreeQueueGroupsAreReturned, IsXeHpgCore) {
45+
HWTEST2_F(CommandQueueGroupTest, givenBlitterSupportAndCCSThenThreeQueueGroupsAreReturned, IsXeHpgCore) {
4646
const uint32_t rootDeviceIndex = 0u;
4747
NEO::HardwareInfo hwInfo = *NEO::defaultHwInfo.get();
4848
hwInfo.featureTable.flags.ftrCCSNode = true;

‎opencl/source/cl_device/cl_device.h‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -118,7 +118,6 @@ class ClDevice : public BaseObject<_cl_device_id> {
118118
const std::string &peekCompilerExtensions() const;
119119
const std::string &peekCompilerExtensionsWithFeatures() const;
120120
DeviceBitfield getDeviceBitfield() const;
121-
bool isDeviceEnqueueSupported() const;
122121
bool arePipesSupported() const;
123122
bool isPciBusInfoValid() const;
124123

‎opencl/test/unit_test/CMakeLists.txt‎

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -401,7 +401,6 @@ set(TEST_KERNEL_2_0_options
401401
)
402402

403403
set(TEST_KERNEL_2_0
404-
test_files/simple_block_kernel.cl
405404
test_files/simple_nonuniform.cl
406405
)
407406

@@ -454,7 +453,6 @@ set(TEST_KERNEL_PRINTF_internal_options_gen9lp
454453
file(GLOB_RECURSE TEST_KERNELS test_files/*.cl)
455454
list(REMOVE_ITEM TEST_KERNELS "${CMAKE_CURRENT_SOURCE_DIR}/test_files/shouldfail.cl")
456455
list(REMOVE_ITEM TEST_KERNELS "${CMAKE_CURRENT_SOURCE_DIR}/test_files/valid_kernel.cl")
457-
list(REMOVE_ITEM TEST_KERNELS "${CMAKE_CURRENT_SOURCE_DIR}/test_files/simple_block_kernel.cl")
458456
list(REMOVE_ITEM TEST_KERNELS "${CMAKE_CURRENT_SOURCE_DIR}/test_files/simple_nonuniform.cl")
459457
list(REMOVE_ITEM TEST_KERNELS "${CMAKE_CURRENT_SOURCE_DIR}/test_files/stateless_kernel.cl")
460458
list(REMOVE_ITEM TEST_KERNELS ${TEST_KERNEL_VME})

‎opencl/test/unit_test/device/device_tests.cpp‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -717,9 +717,9 @@ TEST(DeviceGetEngineTest, givenNonHwCsrModeWhenGetEngineThenDefaultEngineIsRetur
717717
EXPECT_EQ(defaultEngine.commandStreamReceiver, internalEngine.commandStreamReceiver);
718718
}
719719

720-
using DeviceQueueFamiliesTests = ::testing::Test;
720+
using QueueFamiliesTests = ::testing::Test;
721721

722-
HWTEST_F(DeviceQueueFamiliesTests, whenGettingQueueFamilyCapabilitiesAllThenReturnCorrectValue) {
722+
HWTEST_F(QueueFamiliesTests, whenGettingQueueFamilyCapabilitiesAllThenReturnCorrectValue) {
723723
const cl_command_queue_capabilities_intel expectedProperties = CL_QUEUE_CAPABILITY_CREATE_SINGLE_QUEUE_EVENTS_INTEL |
724724
CL_QUEUE_CAPABILITY_CREATE_CROSS_QUEUE_EVENTS_INTEL |
725725
CL_QUEUE_CAPABILITY_SINGLE_QUEUE_EVENT_WAIT_LIST_INTEL |
@@ -739,13 +739,13 @@ HWTEST_F(DeviceQueueFamiliesTests, whenGettingQueueFamilyCapabilitiesAllThenRetu
739739
EXPECT_EQ(expectedProperties, MockClDevice::getQueueFamilyCapabilitiesAll());
740740
}
741741

742-
HWTEST_F(DeviceQueueFamiliesTests, givenComputeQueueWhenGettingQueueFamilyCapabilitiesThenReturnDefaultCapabilities) {
742+
HWTEST_F(QueueFamiliesTests, givenComputeQueueWhenGettingQueueFamilyCapabilitiesThenReturnDefaultCapabilities) {
743743
auto device = std::make_unique<MockClDevice>(MockDevice::createWithNewExecutionEnvironment<MockDevice>(defaultHwInfo.get()));
744744
EXPECT_EQ(CL_QUEUE_DEFAULT_CAPABILITIES_INTEL, device->getQueueFamilyCapabilities(NEO::EngineGroupType::Compute));
745745
EXPECT_EQ(CL_QUEUE_DEFAULT_CAPABILITIES_INTEL, device->getQueueFamilyCapabilities(NEO::EngineGroupType::RenderCompute));
746746
}
747747

748-
HWCMDTEST_F(IGFX_GEN8_CORE, DeviceQueueFamiliesTests, givenCopyQueueWhenGettingQueueFamilyCapabilitiesThenDoNotReturnUnsupportedOperations) {
748+
HWCMDTEST_F(IGFX_GEN8_CORE, QueueFamiliesTests, givenCopyQueueWhenGettingQueueFamilyCapabilitiesThenDoNotReturnUnsupportedOperations) {
749749
const cl_command_queue_capabilities_intel capabilitiesNotSupportedOnBlitter = CL_QUEUE_CAPABILITY_KERNEL_INTEL |
750750
CL_QUEUE_CAPABILITY_FILL_BUFFER_INTEL |
751751
CL_QUEUE_CAPABILITY_TRANSFER_IMAGE_INTEL |

‎opencl/test/unit_test/test_files/simple_block_kernel.cl‎

Lines changed: 0 additions & 76 deletions
This file was deleted.

0 commit comments

Comments
 (0)