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

Remove platformDevices [3/n]

Browse Source 
Replace platformDevices[0]-> with defaultHwInfo->

Related-To: NEO-4499
Change-Id: I9a2607abe866512eef518ea6e34efb1d1d2069cf
Signed-off-by: Mateusz Jablonski <mateusz.jablonski@intel.com>
This commit is contained in:
Mateusz Jablonski
2020-03-24 16:03:47 +01:00
committed by sys_ocldev
parent a651625473
commit 47e3e7c8eb
43 changed files with 123 additions and 123 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
opencl/test/unit_test/api/cl_set_kernel_arg_svm_pointer_tests.inl
View File

@@ -25,7 +25,7 @@ class KernelArgSvmFixture : public ApiFixture<>, public DeviceFixture {
void SetUp() override {
ApiFixture::SetUp();
DeviceFixture::SetUp();
if (platformDevices[0]->capabilityTable.ftrSvm == false) {
if (defaultHwInfo->capabilityTable.ftrSvm == false) {
GTEST_SKIP();
}

2
opencl/test/unit_test/api/cl_set_kernel_exec_info_tests.inl
View File

@@ -17,7 +17,7 @@ class KernelExecInfoFixture : public ApiFixture<> {
protected:
void SetUp() override {
ApiFixture::SetUp();
if (platformDevices[0]->capabilityTable.ftrSvm == false) {
if (defaultHwInfo->capabilityTable.ftrSvm == false) {
GTEST_SKIP();
}

4
opencl/test/unit_test/aub/aub_center_tests.cpp
View File

@@ -31,11 +31,11 @@ TEST(AubCenter, GivenUseAubStreamDebugVariableSetWhenAubCenterIsCreatedThenCreat
DebugManagerStateRestore restorer;
DebugManager.flags.UseAubStream.set(false);
MockAubManager *mockAubManager = new MockAubManager(platformDevices[0]->platform.eProductFamily, 4, 8 * MB, true, aub_stream::mode::aubFile, platformDevices[0]->capabilityTable.gpuAddressSpace);
MockAubManager *mockAubManager = new MockAubManager(defaultHwInfo->platform.eProductFamily, 4, 8 * MB, true, aub_stream::mode::aubFile, defaultHwInfo->capabilityTable.gpuAddressSpace);
MockAubCenter mockAubCenter(platformDevices[0], false, "", CommandStreamReceiverType::CSR_AUB);
mockAubCenter.aubManager = std::unique_ptr<MockAubManager>(mockAubManager);
EXPECT_EQ(platformDevices[0]->platform.eProductFamily, mockAubManager->mockAubManagerParams.productFamily);
EXPECT_EQ(defaultHwInfo->platform.eProductFamily, mockAubManager->mockAubManagerParams.productFamily);
EXPECT_EQ(4, mockAubManager->mockAubManagerParams.devicesCount);
EXPECT_EQ(8 * MB, mockAubManager->mockAubManagerParams.memoryBankSize);
EXPECT_EQ(true, mockAubManager->mockAubManagerParams.localMemorySupported);

2
opencl/test/unit_test/aub_tests/command_queue/enqueue_copy_image_aub_tests.cpp
View File

@@ -27,7 +27,7 @@ struct AUBCopyImage
typedef AUBCommandStreamFixture CommandStreamFixture;
void SetUp() override {
if (!platformDevices[0]->capabilityTable.supportsImages) {
if (!defaultHwInfo->capabilityTable.supportsImages) {
GTEST_SKIP();
}
CommandDeviceFixture::SetUp(cl_command_queue_properties(0));

2
opencl/test/unit_test/aub_tests/command_queue/enqueue_fill_image_aub_tests.cpp
View File

@@ -86,7 +86,7 @@ struct AubFillImage
typedef AUBCommandStreamFixture CommandStreamFixture;
void SetUp() override {
if (!(platformDevices[0]->capabilityTable.supportsImages)) {
if (!(defaultHwInfo->capabilityTable.supportsImages)) {
GTEST_SKIP();
}
auto dataType = std::get<0>(GetParam()).type;

8
opencl/test/unit_test/aub_tests/command_queue/enqueue_kernel_aub_tests.cpp
View File

@@ -123,7 +123,7 @@ struct AUBHelloWorldIntegrateTest : public HelloWorldFixture<AUBHelloWorldFixtur
void SetUp() override {
std::tie(KernelFixture::simd, param) = GetParam();
if (KernelFixture::simd < HwHelper::get(NEO::platformDevices[0]->platform.eRenderCoreFamily).getMinimalSIMDSize()) {
if (KernelFixture::simd < HwHelper::get(NEO::defaultHwInfo->platform.eRenderCoreFamily).getMinimalSIMDSize()) {
GTEST_SKIP();
}
ParentClass::SetUp();
@@ -310,7 +310,7 @@ struct AUBSimpleArgIntegrateTest : public SimpleArgFixture<AUBSimpleArgFixtureFa
void SetUp() override {
std::tie(simd, param) = GetParam();
if (simd < HwHelper::get(NEO::platformDevices[0]->platform.eRenderCoreFamily).getMinimalSIMDSize()) {
if (simd < HwHelper::get(NEO::defaultHwInfo->platform.eRenderCoreFamily).getMinimalSIMDSize()) {
GTEST_SKIP();
}
ParentClass::SetUp();
@@ -370,7 +370,7 @@ INSTANTIATE_TEST_CASE_P(
struct AUBSimpleArgNonUniformFixture : public KernelAUBFixture<SimpleArgNonUniformKernelFixture> {
void SetUp() override {
if (NEO::platformDevices[0]->capabilityTable.clVersionSupport < 20) {
if (NEO::defaultHwInfo->capabilityTable.clVersionSupport < 20) {
GTEST_SKIP();
}
KernelAUBFixture<SimpleArgNonUniformKernelFixture>::SetUp();
@@ -430,7 +430,7 @@ struct AUBSimpleArgNonUniformFixture : public KernelAUBFixture<SimpleArgNonUnifo
}
void TearDown() override {
if (NEO::platformDevices[0]->capabilityTable.clVersionSupport < 20) {
if (NEO::defaultHwInfo->capabilityTable.clVersionSupport < 20) {
return;
}
if (destMemory) {

2
opencl/test/unit_test/aub_tests/command_queue/enqueue_map_image_aub_tests.cpp
View File

@@ -39,7 +39,7 @@ struct AUBMapImage
using AUBCommandStreamFixture::SetUp;
void SetUp() override {
if (!(platformDevices[0]->capabilityTable.supportsImages)) {
if (!(defaultHwInfo->capabilityTable.supportsImages)) {
GTEST_SKIP();
}
CommandDeviceFixture::SetUp(cl_command_queue_properties(0));

2
opencl/test/unit_test/aub_tests/command_queue/enqueue_read_image_aub_tests.cpp
View File

@@ -42,7 +42,7 @@ struct AUBReadImage
using AUBCommandStreamFixture::SetUp;
void SetUp() override {
if (!(platformDevices[0]->capabilityTable.supportsImages)) {
if (!(defaultHwInfo->capabilityTable.supportsImages)) {
GTEST_SKIP();
}
CommandDeviceFixture::SetUp(cl_command_queue_properties(0));

2
opencl/test/unit_test/aub_tests/command_queue/enqueue_read_write_image_aub_fixture.h
View File

@@ -21,7 +21,7 @@ struct AUBImageUnaligned
public ::testing::Test {
void SetUp() override {
if (!(platformDevices[0]->capabilityTable.supportsImages)) {
if (!(defaultHwInfo->capabilityTable.supportsImages)) {
GTEST_SKIP();
}
CommandEnqueueAUBFixture::SetUp();

2
opencl/test/unit_test/aub_tests/command_queue/enqueue_write_image_aub_tests.cpp
View File

@@ -40,7 +40,7 @@ struct AUBWriteImage
using AUBCommandStreamFixture::SetUp;
void SetUp() override {
if (!(platformDevices[0]->capabilityTable.supportsImages)) {
if (!(defaultHwInfo->capabilityTable.supportsImages)) {
GTEST_SKIP();
}
CommandDeviceFixture::SetUp(cl_command_queue_properties(0));

6
opencl/test/unit_test/aub_tests/mem_obj/create_image_aub_tests.cpp
View File

@@ -36,7 +36,7 @@ struct AUBCreateImage
using AUBCommandStreamFixture::SetUp;
void SetUp() override {
if (!(platformDevices[0]->capabilityTable.supportsImages)) {
if (!(defaultHwInfo->capabilityTable.supportsImages)) {
GTEST_SKIP();
}
CommandDeviceFixture::SetUp(cl_command_queue_properties(0));
@@ -73,7 +73,7 @@ struct AUBCreateImage
struct AUBCreateImageArray : public AUBCreateImage,
public ::testing::WithParamInterface<uint32_t /*cl_mem_object_type*/> {
void SetUp() override {
if (!(platformDevices[0]->capabilityTable.supportsImages)) {
if (!(defaultHwInfo->capabilityTable.supportsImages)) {
GTEST_SKIP();
}
AUBCreateImage::SetUp();
@@ -176,7 +176,7 @@ HWTEST_P(AUBCreateImageArray, CheckArrayImages) {
struct AUBCreateImageHostPtr : public AUBCreateImage,
public ::testing::WithParamInterface<uint64_t /*cl_mem_object_type*/> {
void SetUp() override {
if (!(platformDevices[0]->capabilityTable.supportsImages)) {
if (!(defaultHwInfo->capabilityTable.supportsImages)) {
GTEST_SKIP();
}
flags = GetParam();

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

@@ -52,7 +52,7 @@ struct BlitAuxTranslationTests : public ::testing::Test {
template <typename FamilyType>
void SetUpT() {
auto &hwHelper = HwHelper::get(platformDevices[0]->platform.eRenderCoreFamily);
auto &hwHelper = HwHelper::get(defaultHwInfo->platform.eRenderCoreFamily);
if (is32bit || !hwHelper.requiresAuxResolves()) {
GTEST_SKIP();
}

10
opencl/test/unit_test/command_queue/enqueue_svm_tests.cpp
View File

@@ -39,7 +39,7 @@ struct EnqueueSvmTest : public DeviceFixture,
}
void SetUp() override {
if (platformDevices[0]->capabilityTable.ftrSvm == false) {
if (defaultHwInfo->capabilityTable.ftrSvm == false) {
GTEST_SKIP();
}
DeviceFixture::SetUp();
@@ -48,7 +48,7 @@ struct EnqueueSvmTest : public DeviceFixture,
}
void TearDown() override {
if (platformDevices[0]->capabilityTable.ftrSvm == false) {
if (defaultHwInfo->capabilityTable.ftrSvm == false) {
return;
}
context->getSVMAllocsManager()->freeSVMAlloc(ptrSVM);
@@ -866,7 +866,7 @@ TEST_F(EnqueueSvmTest, GivenValidParamsWhenMigratingMemoryThenSuccessIsReturned)
}
TEST(CreateSvmAllocTests, givenVariousSvmAllocationPropertiesWhenAllocatingSvmThenSvmIsCorrectlyAllocated) {
if (!platformDevices[0]->capabilityTable.ftrSvm) {
if (!defaultHwInfo->capabilityTable.ftrSvm) {
return;
}
@@ -894,7 +894,7 @@ TEST(CreateSvmAllocTests, givenVariousSvmAllocationPropertiesWhenAllocatingSvmTh
struct EnqueueSvmTestLocalMemory : public DeviceFixture,
public ::testing::Test {
void SetUp() override {
if (platformDevices[0]->capabilityTable.ftrSvm == false) {
if (defaultHwInfo->capabilityTable.ftrSvm == false) {
GTEST_SKIP();
}
dbgRestore = std::make_unique<DebugManagerStateRestore>();
@@ -909,7 +909,7 @@ struct EnqueueSvmTestLocalMemory : public DeviceFixture,
}
void TearDown() override {
if (platformDevices[0]->capabilityTable.ftrSvm == false) {
if (defaultHwInfo->capabilityTable.ftrSvm == false) {
return;
}
context->getSVMAllocsManager()->freeSVMAlloc(svmPtr);

56
opencl/test/unit_test/command_queue/local_work_size_tests.cpp
View File

@@ -18,7 +18,7 @@ using namespace NEO;
TEST(localWorkSizeTest, given1DimWorkGroupAndSimdEqual8WhenComputeCalledThenLocalGroupComputed) {
//wsInfo maxWorkGroupSize, hasBariers, simdSize, slmTotalSize, coreFamily, numThreadsPerSubSlice, localMemorySize, imgUsed, yTiledSurface
WorkSizeInfo wsInfo(256, 0u, 8, 0u, platformDevices[0]->platform.eRenderCoreFamily, 32u, 0u, false, false);
WorkSizeInfo wsInfo(256, 0u, 8, 0u, defaultHwInfo->platform.eRenderCoreFamily, 32u, 0u, false, false);
uint32_t workDim = 1;
size_t workGroup[3] = {6144, 1, 1};
size_t workGroupSize[3];
@@ -48,7 +48,7 @@ TEST(localWorkSizeTest, given1DimWorkGroupAndSimdEqual8WhenComputeCalledThenLoca
}
TEST(localWorkSizeTest, given1DimWorkGroupAndSimdEqual32WhenComputeCalledThenLocalGroupComputed) {
WorkSizeInfo wsInfo(256, 0u, 32, 0u, platformDevices[0]->platform.eRenderCoreFamily, 32u, 0u, false, false);
WorkSizeInfo wsInfo(256, 0u, 32, 0u, defaultHwInfo->platform.eRenderCoreFamily, 32u, 0u, false, false);
uint32_t workDim = 1;
size_t workGroup[3] = {6144, 1, 1};
size_t workGroupSize[3];
@@ -72,7 +72,7 @@ TEST(localWorkSizeTest, given1DimWorkGroupAndSimdEqual32WhenComputeCalledThenLoc
}
TEST(localWorkSizeTest, given2DimWorkGroupAndSimdEqual8WhenComputeCalledThenLocalGroupComputed) {
WorkSizeInfo wsInfo(256, 0u, 8, 0u, platformDevices[0]->platform.eRenderCoreFamily, 56u, 0u, false, false);
WorkSizeInfo wsInfo(256, 0u, 8, 0u, defaultHwInfo->platform.eRenderCoreFamily, 56u, 0u, false, false);
uint32_t workDim = 2;
size_t workGroup[3] = {384, 96, 1};
size_t workGroupSize[3];
@@ -100,7 +100,7 @@ TEST(localWorkSizeTest, given2DimWorkGroupAndSimdEqual8WhenComputeCalledThenLoca
TEST(localWorkSizeTest, given2DimWorkGroupAndSimdEqual32WhenComputeCalledThenLocalGroupComputed) {
DebugManagerStateRestore dbgRestore;
DebugManager.flags.EnableComputeWorkSizeSquared.set(false);
WorkSizeInfo wsInfo(256, 0u, 32, 0u, platformDevices[0]->platform.eRenderCoreFamily, 32u, 0u, false, false);
WorkSizeInfo wsInfo(256, 0u, 32, 0u, defaultHwInfo->platform.eRenderCoreFamily, 32u, 0u, false, false);
uint32_t workDim = 2;
size_t workGroup[3] = {384, 96, 1};
size_t workGroupSize[3];
@@ -132,7 +132,7 @@ TEST(localWorkSizeTest, given2DimWorkGroupAndSimdEqual32WhenComputeCalledThenLoc
}
TEST(localWorkSizeTest, given3DimWorkGroupAndSimdEqual8WhenComputeCalledThenLocalGroupComputed) {
WorkSizeInfo wsInfo(256, 0u, 8, 0u, platformDevices[0]->platform.eRenderCoreFamily, 56u, 0u, false, false);
WorkSizeInfo wsInfo(256, 0u, 8, 0u, defaultHwInfo->platform.eRenderCoreFamily, 56u, 0u, false, false);
uint32_t workDim = 3;
size_t workGroup[3] = {384, 384, 384};
size_t workGroupSize[3];
@@ -168,7 +168,7 @@ TEST(localWorkSizeTest, given3DimWorkGroupAndSimdEqual8WhenComputeCalledThenLoca
}
TEST(localWorkSizeTest, given3DimWorkGroupAndSimdEqual32WhenComputeCalledThenLocalGroupComputed) {
NEO::WorkSizeInfo wsInfo(256, 0u, 32, 0u, platformDevices[0]->platform.eRenderCoreFamily, 32u, 0u, false, false);
NEO::WorkSizeInfo wsInfo(256, 0u, 32, 0u, defaultHwInfo->platform.eRenderCoreFamily, 32u, 0u, false, false);
uint32_t workDim = 3;
size_t workGroup[3] = {384, 384, 384};
size_t workGroupSize[3];
@@ -214,7 +214,7 @@ TEST(localWorkSizeTest, given2DimWorkGroupAndSquaredAlgorithmWhenComputeCalledTh
DebugManagerStateRestore dbgRestore;
DebugManager.flags.EnableComputeWorkSizeSquared.set(true);
WorkSizeInfo wsInfo(256, 0u, 32, 0u, platformDevices[0]->platform.eRenderCoreFamily, 32u, 0u, false, false);
WorkSizeInfo wsInfo(256, 0u, 32, 0u, defaultHwInfo->platform.eRenderCoreFamily, 32u, 0u, false, false);
uint32_t workDim = 2;
size_t workGroup[3] = {384, 96, 1};
size_t workGroupSize[3];
@@ -229,7 +229,7 @@ TEST(localWorkSizeTest, given1DimWorkGroupAndSquaredAlgorithmOnWhenComputeCalled
DebugManagerStateRestore dbgRestore;
DebugManager.flags.EnableComputeWorkSizeSquared.set(true);
WorkSizeInfo wsInfo(256, 0u, 32, 0u, platformDevices[0]->platform.eRenderCoreFamily, 32u, 0u, false, false);
WorkSizeInfo wsInfo(256, 0u, 32, 0u, defaultHwInfo->platform.eRenderCoreFamily, 32u, 0u, false, false);
uint32_t workDim = 1;
size_t workGroup[3] = {1024, 1, 1};
size_t workGroupSize[3];
@@ -244,7 +244,7 @@ TEST(localWorkSizeTest, given2DdispatchWithImagesAndSquaredAlgorithmOnWhenLwsIsC
DebugManagerStateRestore dbgRestore;
DebugManager.flags.EnableComputeWorkSizeSquared.set(true);
WorkSizeInfo wsInfo(256, 0u, 32, 0u, platformDevices[0]->platform.eRenderCoreFamily, 32u, 0u, true, false);
WorkSizeInfo wsInfo(256, 0u, 32, 0u, defaultHwInfo->platform.eRenderCoreFamily, 32u, 0u, true, false);
uint32_t workDim = 2;
size_t workGroup[3] = {256, 96, 1};
size_t workGroupSize[3];
@@ -256,7 +256,7 @@ TEST(localWorkSizeTest, given2DdispatchWithImagesAndSquaredAlgorithmOnWhenLwsIsC
}
TEST(localWorkSizeTest, givenKernelWithTileYImagesAndBarrierWhenWorkgroupSizeIsComputedThenItMimicsTilingPattern) {
WorkSizeInfo wsInfo(256, true, 32, 0u, platformDevices[0]->platform.eRenderCoreFamily, 32u, 0u, true, true);
WorkSizeInfo wsInfo(256, true, 32, 0u, defaultHwInfo->platform.eRenderCoreFamily, 32u, 0u, true, true);
uint32_t workDim = 2;
size_t workGroup[3] = {1, 1, 1};
size_t workGroupSize[3];
@@ -277,7 +277,7 @@ TEST(localWorkSizeTest, givenKernelWithTileYImagesAndBarrierWhenWorkgroupSizeIsC
}
TEST(localWorkSizeTest, givenKernelWithTileYImagesAndNoBarriersWhenWorkgroupSizeIsComputedThenItMimicsTilingPattern) {
WorkSizeInfo wsInfo(256, false, 32, 0u, platformDevices[0]->platform.eRenderCoreFamily, 32u, 0u, true, true);
WorkSizeInfo wsInfo(256, false, 32, 0u, defaultHwInfo->platform.eRenderCoreFamily, 32u, 0u, true, true);
uint32_t workDim = 2;
size_t workGroup[3] = {1, 1, 1};
size_t workGroupSize[3];
@@ -298,7 +298,7 @@ TEST(localWorkSizeTest, givenKernelWithTileYImagesAndNoBarriersWhenWorkgroupSize
}
TEST(localWorkSizeTest, givenSimd16KernelWithTileYImagesAndNoBarriersWhenWorkgroupSizeIsComputedThenItMimicsTilingPattern) {
WorkSizeInfo wsInfo(256, false, 16, 0u, platformDevices[0]->platform.eRenderCoreFamily, 32u, 0u, true, true);
WorkSizeInfo wsInfo(256, false, 16, 0u, defaultHwInfo->platform.eRenderCoreFamily, 32u, 0u, true, true);
uint32_t workDim = 2;
size_t workGroup[3] = {1, 1, 1};
size_t workGroupSize[3];
@@ -319,7 +319,7 @@ TEST(localWorkSizeTest, givenSimd16KernelWithTileYImagesAndNoBarriersWhenWorkgro
}
TEST(localWorkSizeTest, givenKernelWithTwoDimensionalGlobalSizesWhenLwsIsComputedThenItHasMaxWorkgroupSize) {
WorkSizeInfo wsInfo(256, 0u, 32, 0u, platformDevices[0]->platform.eRenderCoreFamily, 32u, 0u, false, false);
WorkSizeInfo wsInfo(256, 0u, 32, 0u, defaultHwInfo->platform.eRenderCoreFamily, 32u, 0u, false, false);
uint32_t workDim = 2;
size_t workGroup[3] = {1, 1, 1};
size_t workGroupSize[3];
@@ -333,7 +333,7 @@ TEST(localWorkSizeTest, givenKernelWithTwoDimensionalGlobalSizesWhenLwsIsCompute
}
TEST(localWorkSizeTest, givenKernelWithBarriersAndTiledImagesWithYdimensionHigherThenXDimensionWhenLwsIsComputedThenItMimicsTiling) {
WorkSizeInfo wsInfo(256, 0u, 32, 0u, platformDevices[0]->platform.eRenderCoreFamily, 32u, 0u, true, true);
WorkSizeInfo wsInfo(256, 0u, 32, 0u, defaultHwInfo->platform.eRenderCoreFamily, 32u, 0u, true, true);
uint32_t workDim = 2;
size_t workGroup[3] = {1, 1, 1};
size_t workGroupSize[3];
@@ -368,7 +368,7 @@ TEST(localWorkSizeTest, givenKernelWithBarriersAndTiledImagesWithYdimensionHighe
}
TEST(localWorkSizeTest, givenHighOneDimensionalGwsWhenLwsIsComputedThenMaxWorkgoupSizeIsUsed) {
WorkSizeInfo wsInfo(256, 0u, 32, 0u, platformDevices[0]->platform.eRenderCoreFamily, 32u, 0u, false, false);
WorkSizeInfo wsInfo(256, 0u, 32, 0u, defaultHwInfo->platform.eRenderCoreFamily, 32u, 0u, false, false);
uint32_t workDim = 2;
size_t workGroup[3] = {1, 1, 1};
size_t workGroupSize[3];
@@ -389,7 +389,7 @@ TEST(localWorkSizeTest, givenHighOneDimensionalGwsWhenLwsIsComputedThenMaxWorkgo
}
TEST(localWorkSizeTest, givenVeriousGwsSizesWithImagesWhenLwsIsComputedThenProperSizesAreReturned) {
WorkSizeInfo wsInfo(256, 0u, 32, 0u, platformDevices[0]->platform.eRenderCoreFamily, 32u, 0u, true, true);
WorkSizeInfo wsInfo(256, 0u, 32, 0u, defaultHwInfo->platform.eRenderCoreFamily, 32u, 0u, true, true);
uint32_t workDim = 2;
size_t workGroup[3] = {1, 1, 1};
size_t workGroupSize[3];
@@ -433,7 +433,7 @@ TEST(localWorkSizeTest, givenVeriousGwsSizesWithImagesWhenLwsIsComputedThenPrope
}
TEST(localWorkSizeTest, givenHigh1DGwsAndSimdSize16WhenLwsIsComputedThenMaxWorkgroupSizeIsChoosen) {
WorkSizeInfo wsInfo(256u, 0u, 16, 0u, platformDevices[0]->platform.eRenderCoreFamily, 56u, 0, false, false);
WorkSizeInfo wsInfo(256u, 0u, 16, 0u, defaultHwInfo->platform.eRenderCoreFamily, 56u, 0, false, false);
size_t workGroup[3] = {1, 1, 1};
size_t workGroupSize[3];
@@ -446,7 +446,7 @@ TEST(localWorkSizeTest, givenHigh1DGwsAndSimdSize16WhenLwsIsComputedThenMaxWorkg
}
TEST(localWorkSizeTest, givenHigh1DGwsAndSimdSize8WhenLwsIsComputedThenMaxWorkgroupSizeIsChoosen) {
WorkSizeInfo wsInfo(256u, 0u, 8, 0u, platformDevices[0]->platform.eRenderCoreFamily, 32u, 0, false, false);
WorkSizeInfo wsInfo(256u, 0u, 8, 0u, defaultHwInfo->platform.eRenderCoreFamily, 32u, 0, false, false);
size_t workGroup[3] = {1, 1, 1};
size_t workGroupSize[3];
@@ -459,7 +459,7 @@ TEST(localWorkSizeTest, givenHigh1DGwsAndSimdSize8WhenLwsIsComputedThenMaxWorkgr
}
TEST(localWorkSizeTest, givenKernelUtilizingImagesAndSlmWhenLwsIsBeingComputedThenItMimicsGlobalWorkgroupSizes) {
WorkSizeInfo wsInfo(256u, 1u, 32, 4096u, platformDevices[0]->platform.eRenderCoreFamily, 56u, 65536u, true, true);
WorkSizeInfo wsInfo(256u, 1u, 32, 4096u, defaultHwInfo->platform.eRenderCoreFamily, 56u, 65536u, true, true);
uint32_t workDim = 2;
size_t workGroup[3] = {1, 1, 1};
size_t workGroupSize[3];
@@ -480,7 +480,7 @@ TEST(localWorkSizeTest, givenKernelUtilizingImagesAndSlmWhenLwsIsBeingComputedTh
}
TEST(localWorkSizeTest, GivenUseStrictRatioWhenLwsIsBeingComputedThenWgsIsCalculatedCorrectly) {
WorkSizeInfo wsInfo(256u, 0u, 32u, 0u, platformDevices[0]->platform.eRenderCoreFamily, 0u, 0u, true, true);
WorkSizeInfo wsInfo(256u, 0u, 32u, 0u, defaultHwInfo->platform.eRenderCoreFamily, 0u, 0u, true, true);
uint32_t workDim = 2;
size_t workGroup[3] = {194, 234, 1};
size_t workGroupSize[3];
@@ -508,7 +508,7 @@ TEST(localWorkSizeTest, GivenUseStrictRatioWhenLwsIsBeingComputedThenWgsIsCalcul
}
TEST(localWorkSizeTest, GivenUseBarriersWhenLwsIsBeingComputedThenWgsIsCalculatedCorrectly) {
WorkSizeInfo wsInfo(256u, 1u, 32u, 0u, platformDevices[0]->platform.eRenderCoreFamily, 56u, 0u, true, true);
WorkSizeInfo wsInfo(256u, 1u, 32u, 0u, defaultHwInfo->platform.eRenderCoreFamily, 56u, 0u, true, true);
uint32_t workDim = 2;
size_t workGroup[3] = {194, 234, 1};
size_t workGroupSize[3];
@@ -534,7 +534,7 @@ TEST(localWorkSizeTest, GivenUseBarriersWhenLwsIsBeingComputedThenWgsIsCalculate
}
TEST(localWorkSizeTest, given2DimWorkWhenComputeSquaredCalledThenLocalGroupComputed) {
WorkSizeInfo wsInfo(256, 0u, 16, 0u, platformDevices[0]->platform.eRenderCoreFamily, 6u, 0u, false, false);
WorkSizeInfo wsInfo(256, 0u, 16, 0u, defaultHwInfo->platform.eRenderCoreFamily, 6u, 0u, false, false);
uint32_t workDim = 2;
size_t workGroup[3] = {2048, 272, 1};
size_t workGroupSize[3];
@@ -583,7 +583,7 @@ TEST(localWorkSizeTest, given2DimWorkWhenComputeSquaredCalledThenLocalGroupCompu
TEST(localWorkSizeTest, givenDeviceSupportingLws1024AndKernelCompiledInSimd8WhenGwsIs1024ThenLwsIsComputedAsMaxOptimalMultipliedBySimd) {
DebugManagerStateRestore dbgRestore;
DebugManager.flags.EnableComputeWorkSizeSquared.set(false);
WorkSizeInfo wsInfo(1024, 0u, 8, 0u, platformDevices[0]->platform.eRenderCoreFamily, 56u, 0u, false, false);
WorkSizeInfo wsInfo(1024, 0u, 8, 0u, defaultHwInfo->platform.eRenderCoreFamily, 56u, 0u, false, false);
uint32_t workDim = 2;
size_t workGroup[3] = {32, 32, 1};
@@ -598,7 +598,7 @@ TEST(localWorkSizeTest, givenDeviceSupportingLws1024AndKernelCompiledInSimd8When
TEST(localWorkSizeTest, givenDeviceWith36ThreadsPerSubsliceWhenSimd16KernelIsBeingSubmittedThenWorkgroupContainsOf8HwThreads) {
DebugManagerStateRestore dbgRestore;
DebugManager.flags.EnableComputeWorkSizeSquared.set(false);
WorkSizeInfo wsInfo(256, 0u, 16, 0u, platformDevices[0]->platform.eRenderCoreFamily, 36u, 0u, false, false);
WorkSizeInfo wsInfo(256, 0u, 16, 0u, defaultHwInfo->platform.eRenderCoreFamily, 36u, 0u, false, false);
uint32_t workDim = 2;
size_t workGroup[3] = {1024, 1024, 1};
@@ -613,7 +613,7 @@ TEST(localWorkSizeTest, givenDeviceWith36ThreadsPerSubsliceWhenSimd16KernelIsBei
TEST(localWorkSizeTest, givenDeviceWith56ThreadsPerSubsliceWhenSimd16KernelIsBeingSubmittedThenWorkgroupContainsOf16HwThreads) {
DebugManagerStateRestore dbgRestore;
DebugManager.flags.EnableComputeWorkSizeSquared.set(false);
WorkSizeInfo wsInfo(256, 0u, 16, 0u, platformDevices[0]->platform.eRenderCoreFamily, 56u, 0u, false, false);
WorkSizeInfo wsInfo(256, 0u, 16, 0u, defaultHwInfo->platform.eRenderCoreFamily, 56u, 0u, false, false);
uint32_t workDim = 2;
size_t workGroup[3] = {1024, 1024, 1};
@@ -631,8 +631,8 @@ TEST(localWorkSizeTest, givenDispatchInfoWhenWorkSizeInfoIsCreatedThenItHasCorre
DispatchInfo dispatchInfo;
dispatchInfo.setKernel(kernel.mockKernel);
auto threadsPerEu = platformDevices[0]->gtSystemInfo.ThreadCount / platformDevices[0]->gtSystemInfo.EUCount;
auto euPerSubSlice = platformDevices[0]->gtSystemInfo.ThreadCount / platformDevices[0]->gtSystemInfo.MaxEuPerSubSlice;
auto threadsPerEu = defaultHwInfo->gtSystemInfo.ThreadCount / defaultHwInfo->gtSystemInfo.EUCount;
auto euPerSubSlice = defaultHwInfo->gtSystemInfo.ThreadCount / defaultHwInfo->gtSystemInfo.MaxEuPerSubSlice;
auto &deviceInfo = device.sharedDeviceInfo;
deviceInfo.maxNumEUsPerSubSlice = euPerSubSlice;
@@ -660,7 +660,7 @@ TEST(localWorkSizeTest, givenDispatchInfoWhenWorkSizeInfoIsCreatedThenHasBarrier
}
TEST(localWorkSizeTest, givenMaxWorkgroupSizeEqualToSimdSizeWhenLwsIsCalculatedThenItIsDownsizedToMaxWorkgroupSize) {
WorkSizeInfo wsInfo(32, 0u, 32, 0u, platformDevices[0]->platform.eRenderCoreFamily, 32u, 0u, false, false);
WorkSizeInfo wsInfo(32, 0u, 32, 0u, defaultHwInfo->platform.eRenderCoreFamily, 32u, 0u, false, false);
uint32_t workDim = 2;
size_t workGroup[3] = {32, 32, 1};
size_t workGroupSize[3];

12
opencl/test/unit_test/device/device_caps_tests.cpp
View File

@@ -47,8 +47,8 @@ TEST_F(DeviceGetCapsTest, WhenCreatingDeviceThenCapsArePopulatedCorrectly) {
auto device = std::make_unique<MockClDevice>(MockDevice::createWithNewExecutionEnvironment<MockDevice>(platformDevices[0]));
const auto &caps = device->getDeviceInfo();
const auto &sharedCaps = device->getSharedDeviceInfo();
const auto &sysInfo = platformDevices[0]->gtSystemInfo;
auto &hwHelper = HwHelper::get(platformDevices[0]->platform.eRenderCoreFamily);
const auto &sysInfo = defaultHwInfo->gtSystemInfo;
auto &hwHelper = HwHelper::get(defaultHwInfo->platform.eRenderCoreFamily);
EXPECT_NE(nullptr, caps.builtInKernels);
@@ -210,7 +210,7 @@ TEST_F(DeviceGetCapsTest, givenForcePreemptionModeDebugVariableWhenCreateDeviceT
DebugManagerStateRestore dbgRestorer;
{
PreemptionMode forceMode = PreemptionMode::MidThread;
if (platformDevices[0]->capabilityTable.defaultPreemptionMode == forceMode) {
if (defaultHwInfo->capabilityTable.defaultPreemptionMode == forceMode) {
// force non-default mode
forceMode = PreemptionMode::ThreadGroup;
}
@@ -361,7 +361,7 @@ TEST_F(DeviceGetCapsTest, givenGlobalMemSizeWhenCalculatingMaxAllocSizeThenAdjus
const auto &caps = device->getDeviceInfo();
HardwareCapabilities hwCaps = {0};
auto &hwHelper = HwHelper::get(platformDevices[0]->platform.eRenderCoreFamily);
auto &hwHelper = HwHelper::get(defaultHwInfo->platform.eRenderCoreFamily);
hwHelper.setupHardwareCapabilities(&hwCaps, *defaultHwInfo);
uint64_t expectedSize = std::max((caps.globalMemSize / 2), static_cast<uint64_t>(128ULL * MemoryConstants::megaByte));
@@ -835,7 +835,7 @@ TEST_F(DeviceGetCapsTest, givenDeviceWhenGettingHostUnifiedMemoryCapThenItDepend
auto device = std::make_unique<MockClDevice>(MockDevice::createWithNewExecutionEnvironment<MockDevice>(platformDevices[0]));
const auto &caps = device->getDeviceInfo();
auto &hwHelper = HwHelper::get(platformDevices[0]->platform.eRenderCoreFamily);
auto &hwHelper = HwHelper::get(defaultHwInfo->platform.eRenderCoreFamily);
auto localMemoryEnabled = hwHelper.isLocalMemoryEnabled(*defaultHwInfo);
EXPECT_EQ((localMemoryEnabled == false), caps.hostUnifiedMemory);
@@ -1014,7 +1014,7 @@ TEST_F(DeviceGetCapsTest, givenSystemWithNoDriverInfoWhenGettingNameAndVersionTh
const auto &caps = device->getDeviceInfo();
std::string tempName = "Intel(R) ";
tempName += familyName[platformDevices[0]->platform.eRenderCoreFamily];
tempName += familyName[defaultHwInfo->platform.eRenderCoreFamily];
tempName += " HD Graphics NEO";
#define QTR(a) #a

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

@@ -55,7 +55,7 @@ TEST_F(DeviceTest, givenDeviceWhenEngineIsCreatedThenSetInitialValueForTag) {
}
TEST_F(DeviceTest, givenDeviceWhenAskedForSpecificEngineThenRetrunIt) {
auto &engines = HwHelper::get(platformDevices[0]->platform.eRenderCoreFamily).getGpgpuEngineInstances(*defaultHwInfo);
auto &engines = HwHelper::get(defaultHwInfo->platform.eRenderCoreFamily).getGpgpuEngineInstances(*defaultHwInfo);
for (uint32_t i = 0; i < engines.size(); i++) {
bool lowPriority = (HwHelper::lowPriorityGpgpuEngineIndex == i);
auto &deviceEngine = pDevice->getEngine(engines[i], lowPriority);
@@ -69,7 +69,7 @@ TEST_F(DeviceTest, givenDeviceWhenAskedForSpecificEngineThenRetrunIt) {
TEST_F(DeviceTest, givenDebugVariableToAlwaysChooseEngineZeroWhenNotExistingEngineSelectedThenIndexZeroEngineIsReturned) {
DebugManagerStateRestore restore;
DebugManager.flags.OverrideInvalidEngineWithDefault.set(true);
auto &engines = HwHelper::get(platformDevices[0]->platform.eRenderCoreFamily).getGpgpuEngineInstances(*defaultHwInfo);
auto &engines = HwHelper::get(defaultHwInfo->platform.eRenderCoreFamily).getGpgpuEngineInstances(*defaultHwInfo);
auto &deviceEngine = pDevice->getEngine(engines[0], false);
auto &notExistingEngine = pDevice->getEngine(aub_stream::ENGINE_VCS, false);
EXPECT_EQ(&notExistingEngine, &deviceEngine);

2
opencl/test/unit_test/helpers/hw_parse.h
View File

@@ -164,7 +164,7 @@ struct HardwareParse {
}
itorCmd = find<PIPELINE_SELECT *>(++itorCmd, cmdList.end());
}
auto &hwHelper = HwHelper::get(platformDevices[0]->platform.eRenderCoreFamily);
auto &hwHelper = HwHelper::get(defaultHwInfo->platform.eRenderCoreFamily);
if (hwHelper.is3DPipelineSelectWARequired(*platformDevices[0])) {
auto maximalNumberOf3dSelectsRequired = 2;
EXPECT_LE(numberOf3dSelects, maximalNumberOf3dSelectsRequired);

2
opencl/test/unit_test/helpers/linux/kmd_notify_linux_tests.cpp
View File

@@ -20,7 +20,7 @@ class MockKmdNotifyHelper : public KmdNotifyHelper {
};
TEST(KmdNotifyLinuxTests, givenTaskCountDiffGreaterThanOneWhenBaseTimeoutRequestedThenMultiply) {
auto localProperties = (platformDevices[0]->capabilityTable.kmdNotifyProperties);
auto localProperties = (defaultHwInfo->capabilityTable.kmdNotifyProperties);
localProperties.delayKmdNotifyMicroseconds = 10;
const int64_t multiplier = 10;

6
opencl/test/unit_test/helpers/windows/kmd_notify_windows_tests.cpp
View File

@@ -29,7 +29,7 @@ class MockKmdNotifyHelper : public KmdNotifyHelper {
};
TEST(KmdNotifyWindowsTests, whenGetSystemPowerStatusReturnSuccessThenUpdateAcLineStatus) {
auto properties = &(platformDevices[0]->capabilityTable.kmdNotifyProperties);
auto properties = &(defaultHwInfo->capabilityTable.kmdNotifyProperties);
MockKmdNotifyHelper helper(properties);
EXPECT_TRUE(helper.acLineConnected);
@@ -48,7 +48,7 @@ TEST(KmdNotifyWindowsTests, whenGetSystemPowerStatusReturnSuccessThenUpdateAcLin
}
TEST(KmdNotifyWindowsTests, whenGetSystemPowerStatusReturnErrorThenDontUpdateAcLineStatus) {
auto properties = &(platformDevices[0]->capabilityTable.kmdNotifyProperties);
auto properties = &(defaultHwInfo->capabilityTable.kmdNotifyProperties);
MockKmdNotifyHelper helper(properties);
EXPECT_TRUE(helper.acLineConnected);
@@ -62,7 +62,7 @@ TEST(KmdNotifyWindowsTests, whenGetSystemPowerStatusReturnErrorThenDontUpdateAcL
}
TEST(KmdNotifyWindowsTests, givenTaskCountDiffGreaterThanOneWhenBaseTimeoutRequestedThenDontMultiply) {
auto localProperties = (platformDevices[0]->capabilityTable.kmdNotifyProperties);
auto localProperties = (defaultHwInfo->capabilityTable.kmdNotifyProperties);
localProperties.delayKmdNotifyMicroseconds = 10;
const int64_t multiplier = 10;

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

@@ -29,7 +29,7 @@ class CreateImageFormatTest : public testing::TestWithParam<size_t> {
indexImageFormat = GetParam();
ArrayRef<const ClSurfaceFormatInfo>
surfaceFormatTable = SurfaceFormats::surfaceFormats(flags, platformDevices[0]->capabilityTable.clVersionSupport);
surfaceFormatTable = SurfaceFormats::surfaceFormats(flags, defaultHwInfo->capabilityTable.clVersionSupport);
ASSERT_GT(surfaceFormatTable.size(), indexImageFormat);
surfaceFormat = &surfaceFormatTable[indexImageFormat];

12
opencl/test/unit_test/mem_obj/image_validate_tests.cpp
View File

@@ -111,12 +111,12 @@ TEST(ImageDepthFormatTest, returnSurfaceFormatForDepthFormats) {
imgFormat.image_channel_order = CL_DEPTH;
imgFormat.image_channel_data_type = CL_FLOAT;
auto surfaceFormatInfo = Image::getSurfaceFormatFromTable(CL_MEM_READ_WRITE, &imgFormat, platformDevices[0]->capabilityTable.clVersionSupport);
auto surfaceFormatInfo = Image::getSurfaceFormatFromTable(CL_MEM_READ_WRITE, &imgFormat, defaultHwInfo->capabilityTable.clVersionSupport);
ASSERT_NE(surfaceFormatInfo, nullptr);
EXPECT_TRUE(surfaceFormatInfo->surfaceFormat.GMMSurfaceFormat == GMM_FORMAT_R32_FLOAT_TYPE);
imgFormat.image_channel_data_type = CL_UNORM_INT16;
surfaceFormatInfo = Image::getSurfaceFormatFromTable(CL_MEM_READ_WRITE, &imgFormat, platformDevices[0]->capabilityTable.clVersionSupport);
surfaceFormatInfo = Image::getSurfaceFormatFromTable(CL_MEM_READ_WRITE, &imgFormat, defaultHwInfo->capabilityTable.clVersionSupport);
ASSERT_NE(surfaceFormatInfo, nullptr);
EXPECT_TRUE(surfaceFormatInfo->surfaceFormat.GMMSurfaceFormat == GMM_FORMAT_R16_UNORM_TYPE);
}
@@ -126,12 +126,12 @@ TEST(ImageDepthFormatTest, returnSurfaceFormatForWriteOnlyDepthFormats) {
imgFormat.image_channel_order = CL_DEPTH;
imgFormat.image_channel_data_type = CL_FLOAT;
auto surfaceFormatInfo = Image::getSurfaceFormatFromTable(CL_MEM_WRITE_ONLY, &imgFormat, platformDevices[0]->capabilityTable.clVersionSupport);
auto surfaceFormatInfo = Image::getSurfaceFormatFromTable(CL_MEM_WRITE_ONLY, &imgFormat, defaultHwInfo->capabilityTable.clVersionSupport);
ASSERT_NE(surfaceFormatInfo, nullptr);
EXPECT_TRUE(surfaceFormatInfo->surfaceFormat.GMMSurfaceFormat == GMM_FORMAT_R32_FLOAT_TYPE);
imgFormat.image_channel_data_type = CL_UNORM_INT16;
surfaceFormatInfo = Image::getSurfaceFormatFromTable(CL_MEM_WRITE_ONLY, &imgFormat, platformDevices[0]->capabilityTable.clVersionSupport);
surfaceFormatInfo = Image::getSurfaceFormatFromTable(CL_MEM_WRITE_ONLY, &imgFormat, defaultHwInfo->capabilityTable.clVersionSupport);
ASSERT_NE(surfaceFormatInfo, nullptr);
EXPECT_TRUE(surfaceFormatInfo->surfaceFormat.GMMSurfaceFormat == GMM_FORMAT_R16_UNORM_TYPE);
}
@@ -141,13 +141,13 @@ TEST(ImageDepthFormatTest, returnSurfaceFormatForDepthStencilFormats) {
imgFormat.image_channel_order = CL_DEPTH_STENCIL;
imgFormat.image_channel_data_type = CL_UNORM_INT24;
auto surfaceFormatInfo = Image::getSurfaceFormatFromTable(CL_MEM_READ_ONLY, &imgFormat, platformDevices[0]->capabilityTable.clVersionSupport);
auto surfaceFormatInfo = Image::getSurfaceFormatFromTable(CL_MEM_READ_ONLY, &imgFormat, defaultHwInfo->capabilityTable.clVersionSupport);
ASSERT_NE(surfaceFormatInfo, nullptr);
EXPECT_TRUE(surfaceFormatInfo->surfaceFormat.GMMSurfaceFormat == GMM_FORMAT_GENERIC_32BIT);
imgFormat.image_channel_order = CL_DEPTH_STENCIL;
imgFormat.image_channel_data_type = CL_FLOAT;
surfaceFormatInfo = Image::getSurfaceFormatFromTable(CL_MEM_READ_ONLY, &imgFormat, platformDevices[0]->capabilityTable.clVersionSupport);
surfaceFormatInfo = Image::getSurfaceFormatFromTable(CL_MEM_READ_ONLY, &imgFormat, defaultHwInfo->capabilityTable.clVersionSupport);
ASSERT_NE(surfaceFormatInfo, nullptr);
EXPECT_TRUE(surfaceFormatInfo->surfaceFormat.GMMSurfaceFormat == GMM_FORMAT_R32G32_FLOAT_TYPE);
}

2
opencl/test/unit_test/memory_manager/memory_manager_allocate_in_device_pool_tests.cpp
View File

@@ -63,7 +63,7 @@ TEST(MemoryManagerTest, givenSvmGpuAllocationTypeWhenAllocationSystemMemoryFails
}
TEST(MemoryManagerTest, givenSvmGpuAllocationTypeWhenAllocationSucceedThenReturnGpuAddressAsHostPtr) {
if (platformDevices[0]->capabilityTable.gpuAddressSpace != maxNBitValue(48) && platformDevices[0]->capabilityTable.gpuAddressSpace != maxNBitValue(47)) {
if (defaultHwInfo->capabilityTable.gpuAddressSpace != maxNBitValue(48) && defaultHwInfo->capabilityTable.gpuAddressSpace != maxNBitValue(47)) {
return;
}

40
opencl/test/unit_test/memory_manager/memory_manager_tests.cpp
View File

@@ -201,7 +201,7 @@ TEST_F(MemoryAllocatorTest, allocateGraphics) {
unsigned int alignment = 4096;
memoryManager->createAndRegisterOsContext(csr,
HwHelper::get(platformDevices[0]->platform.eRenderCoreFamily).getGpgpuEngineInstances(*defaultHwInfo)[0],
HwHelper::get(defaultHwInfo->platform.eRenderCoreFamily).getGpgpuEngineInstances(*defaultHwInfo)[0],
1, PreemptionHelper::getDefaultPreemptionMode(*defaultHwInfo),
false, false, false);
auto allocation = memoryManager->allocateGraphicsMemoryWithProperties(MockAllocationProperties{MemoryConstants::pageSize});
@@ -214,7 +214,7 @@ TEST_F(MemoryAllocatorTest, allocateGraphics) {
EXPECT_EQ(Sharing::nonSharedResource, allocation->peekSharedHandle());
// Gpu address equal to cpu address
if (platformDevices[0]->capabilityTable.gpuAddressSpace == MemoryConstants::max48BitAddress) {
if (defaultHwInfo->capabilityTable.gpuAddressSpace == MemoryConstants::max48BitAddress) {
EXPECT_EQ(reinterpret_cast<uint64_t>(allocation->getUnderlyingBuffer()), allocation->getGpuAddress());
}
@@ -706,7 +706,7 @@ TEST(OsAgnosticMemoryManager, givenHostPointerNotRequiringCopyWhenAllocateGraphi
imageFormat.image_channel_order = CL_RGBA;
cl_mem_flags flags = CL_MEM_READ_WRITE | CL_MEM_USE_HOST_PTR;
auto surfaceFormat = Image::getSurfaceFormatFromTable(flags, &imageFormat, platformDevices[0]->capabilityTable.clVersionSupport);
auto surfaceFormat = Image::getSurfaceFormatFromTable(flags, &imageFormat, defaultHwInfo->capabilityTable.clVersionSupport);
auto imgInfo = MockGmm::initImgInfo(imgDesc, 0, surfaceFormat);
imgInfo.rowPitch = imgDesc.image_width * 4;
@@ -746,7 +746,7 @@ TEST(OsAgnosticMemoryManager, givenHostPointerRequiringCopyWhenAllocateGraphicsM
imageFormat.image_channel_order = CL_RGBA;
cl_mem_flags flags = CL_MEM_READ_WRITE | CL_MEM_USE_HOST_PTR;
auto surfaceFormat = Image::getSurfaceFormatFromTable(flags, &imageFormat, platformDevices[0]->capabilityTable.clVersionSupport);
auto surfaceFormat = Image::getSurfaceFormatFromTable(flags, &imageFormat, defaultHwInfo->capabilityTable.clVersionSupport);
auto imgInfo = MockGmm::initImgInfo(imgDesc, 0, surfaceFormat);
imgInfo.rowPitch = imgDesc.image_width * 4;
@@ -1189,7 +1189,7 @@ TEST_P(OsAgnosticMemoryManagerWithParams, givenFullGpuAddressSpaceWhenAllocateGr
bool requiresL3Flush = GetParam();
MockExecutionEnvironment executionEnvironment(*platformDevices);
executionEnvironment.rootDeviceEnvironments[0]->setHwInfo(platformDevices[0]);
if ((!executionEnvironment.rootDeviceEnvironments[0]->isFullRangeSvm() && !is32bit) || !platformDevices[0]->capabilityTable.hostPtrTrackingEnabled) {
if ((!executionEnvironment.rootDeviceEnvironments[0]->isFullRangeSvm() && !is32bit) || !defaultHwInfo->capabilityTable.hostPtrTrackingEnabled) {
GTEST_SKIP();
}
OsAgnosticMemoryManager memoryManager(executionEnvironment);
@@ -1412,7 +1412,7 @@ TEST_F(MemoryManagerWithCsrTest, givenAllocationThatWasUsedAndIsCompletedWhenche
TEST_F(MemoryManagerWithCsrTest, givenAllocationThatWasUsedAndIsNotCompletedWhencheckGpuUsageAndDestroyGraphicsAllocationsIsCalledThenItIsAddedToTemporaryAllocationList) {
memoryManager->createAndRegisterOsContext(csr.get(),
HwHelper::get(platformDevices[0]->platform.eRenderCoreFamily).getGpgpuEngineInstances(*defaultHwInfo)[0],
HwHelper::get(defaultHwInfo->platform.eRenderCoreFamily).getGpgpuEngineInstances(*defaultHwInfo)[0],
1, PreemptionHelper::getDefaultPreemptionMode(*defaultHwInfo),
false, false, false);
auto usedAllocationAndNotGpuCompleted = memoryManager->allocateGraphicsMemoryWithProperties(MockAllocationProperties{MemoryConstants::pageSize});
@@ -1664,7 +1664,7 @@ TEST(ResidencyDataTest, givenOsContextWhenItIsRegisteredToMemoryManagerThenRefCo
executionEnvironment.memoryManager.reset(memoryManager);
std::unique_ptr<CommandStreamReceiver> csr(createCommandStream(executionEnvironment, 0u));
memoryManager->createAndRegisterOsContext(csr.get(),
HwHelper::get(platformDevices[0]->platform.eRenderCoreFamily).getGpgpuEngineInstances(*defaultHwInfo)[0],
HwHelper::get(defaultHwInfo->platform.eRenderCoreFamily).getGpgpuEngineInstances(*defaultHwInfo)[0],
1, PreemptionHelper::getDefaultPreemptionMode(*defaultHwInfo),
false, false, false);
EXPECT_EQ(1u, memoryManager->getRegisteredEnginesCount());
@@ -1693,7 +1693,7 @@ TEST(ResidencyDataTest, givenDeviceBitfieldWhenCreatingOsContextThenSetValidValu
DeviceBitfield deviceBitfield = 0b11;
PreemptionMode preemptionMode = PreemptionMode::MidThread;
memoryManager->createAndRegisterOsContext(csr.get(),
HwHelper::get(platformDevices[0]->platform.eRenderCoreFamily).getGpgpuEngineInstances(*defaultHwInfo)[0],
HwHelper::get(defaultHwInfo->platform.eRenderCoreFamily).getGpgpuEngineInstances(*defaultHwInfo)[0],
deviceBitfield, preemptionMode,
false, false, false);
EXPECT_EQ(2u, memoryManager->registeredEngines[0].osContext->getNumSupportedDevices());
@@ -1708,11 +1708,11 @@ TEST(ResidencyDataTest, givenTwoOsContextsWhenTheyAreRegisteredFromHigherToLower
std::unique_ptr<CommandStreamReceiver> csr(createCommandStream(executionEnvironment, 0u));
std::unique_ptr<CommandStreamReceiver> csr1(createCommandStream(executionEnvironment, 1u));
memoryManager->createAndRegisterOsContext(csr.get(),
HwHelper::get(platformDevices[0]->platform.eRenderCoreFamily).getGpgpuEngineInstances(*defaultHwInfo)[0],
HwHelper::get(defaultHwInfo->platform.eRenderCoreFamily).getGpgpuEngineInstances(*defaultHwInfo)[0],
1, PreemptionHelper::getDefaultPreemptionMode(*defaultHwInfo),
false, false, false);
memoryManager->createAndRegisterOsContext(csr1.get(),
HwHelper::get(platformDevices[0]->platform.eRenderCoreFamily).getGpgpuEngineInstances(*defaultHwInfo)[1],
HwHelper::get(defaultHwInfo->platform.eRenderCoreFamily).getGpgpuEngineInstances(*defaultHwInfo)[1],
1, PreemptionHelper::getDefaultPreemptionMode(*defaultHwInfo),
false, false, false);
EXPECT_EQ(2u, memoryManager->getRegisteredEnginesCount());
@@ -1721,7 +1721,7 @@ TEST(ResidencyDataTest, givenTwoOsContextsWhenTheyAreRegisteredFromHigherToLower
}
TEST(ResidencyDataTest, givenGpgpuEnginesWhenAskedForMaxOsContextCountThenValueIsGreaterOrEqual) {
auto &engines = HwHelper::get(platformDevices[0]->platform.eRenderCoreFamily).getGpgpuEngineInstances(*defaultHwInfo);
auto &engines = HwHelper::get(defaultHwInfo->platform.eRenderCoreFamily).getGpgpuEngineInstances(*defaultHwInfo);
EXPECT_TRUE(MemoryManager::maxOsContextCount >= engines.size());
}
@@ -1733,10 +1733,10 @@ TEST(ResidencyDataTest, givenResidencyDataWhenUpdateCompletionDataIsCalledThenIt
MockResidencyData residency;
MockOsContext osContext(0u, 1,
HwHelper::get(platformDevices[0]->platform.eRenderCoreFamily).getGpgpuEngineInstances(*defaultHwInfo)[0],
HwHelper::get(defaultHwInfo->platform.eRenderCoreFamily).getGpgpuEngineInstances(*defaultHwInfo)[0],
PreemptionHelper::getDefaultPreemptionMode(*defaultHwInfo), false, false, false);
MockOsContext osContext2(1u, 1,
HwHelper::get(platformDevices[0]->platform.eRenderCoreFamily).getGpgpuEngineInstances(*defaultHwInfo)[1],
HwHelper::get(defaultHwInfo->platform.eRenderCoreFamily).getGpgpuEngineInstances(*defaultHwInfo)[1],
PreemptionHelper::getDefaultPreemptionMode(*defaultHwInfo), false, false, false);
auto lastFenceValue = 45llu;
@@ -1857,7 +1857,7 @@ TEST(MemoryManagerTest, givenAllowedTilingWhenIsCopyRequiredIsCalledThenTrueIsRe
imageFormat.image_channel_order = CL_R;
cl_mem_flags flags = CL_MEM_READ_WRITE | CL_MEM_USE_HOST_PTR;
auto surfaceFormat = Image::getSurfaceFormatFromTable(flags, &imageFormat, platformDevices[0]->capabilityTable.clVersionSupport);
auto surfaceFormat = Image::getSurfaceFormatFromTable(flags, &imageFormat, defaultHwInfo->capabilityTable.clVersionSupport);
imgInfo.imgDesc = Image::convertDescriptor(imageDesc);
imgInfo.surfaceFormat = &surfaceFormat->surfaceFormat;
@@ -1883,7 +1883,7 @@ TEST(MemoryManagerTest, givenDifferentRowPitchWhenIsCopyRequiredIsCalledThenTrue
imageFormat.image_channel_order = CL_R;
cl_mem_flags flags = CL_MEM_READ_WRITE | CL_MEM_USE_HOST_PTR;
auto surfaceFormat = Image::getSurfaceFormatFromTable(flags, &imageFormat, platformDevices[0]->capabilityTable.clVersionSupport);
auto surfaceFormat = Image::getSurfaceFormatFromTable(flags, &imageFormat, defaultHwInfo->capabilityTable.clVersionSupport);
imgInfo.imgDesc = Image::convertDescriptor(imageDesc);
imgInfo.surfaceFormat = &surfaceFormat->surfaceFormat;
@@ -1904,7 +1904,7 @@ TEST(MemoryManagerTest, givenDifferentSlicePitchAndTilingNotAllowedWhenIsCopyReq
imageFormat.image_channel_order = CL_R;
cl_mem_flags flags = CL_MEM_READ_WRITE | CL_MEM_USE_HOST_PTR;
auto surfaceFormat = Image::getSurfaceFormatFromTable(flags, &imageFormat, platformDevices[0]->capabilityTable.clVersionSupport);
auto surfaceFormat = Image::getSurfaceFormatFromTable(flags, &imageFormat, defaultHwInfo->capabilityTable.clVersionSupport);
cl_image_desc imageDesc{};
imageDesc.image_type = CL_MEM_OBJECT_IMAGE1D;
@@ -1930,7 +1930,7 @@ TEST(MemoryManagerTest, givenNotCachelinAlignedPointerWhenIsCopyRequiredIsCalled
imageFormat.image_channel_order = CL_R;
cl_mem_flags flags = CL_MEM_READ_WRITE | CL_MEM_USE_HOST_PTR;
auto surfaceFormat = Image::getSurfaceFormatFromTable(flags, &imageFormat, platformDevices[0]->capabilityTable.clVersionSupport);
auto surfaceFormat = Image::getSurfaceFormatFromTable(flags, &imageFormat, defaultHwInfo->capabilityTable.clVersionSupport);
cl_image_desc imageDesc{};
imageDesc.image_type = CL_MEM_OBJECT_IMAGE1D;
@@ -1955,7 +1955,7 @@ TEST(MemoryManagerTest, givenCachelineAlignedPointerAndProperDescriptorValuesWhe
imageFormat.image_channel_order = CL_R;
cl_mem_flags flags = CL_MEM_READ_WRITE | CL_MEM_USE_HOST_PTR;
auto surfaceFormat = Image::getSurfaceFormatFromTable(flags, &imageFormat, platformDevices[0]->capabilityTable.clVersionSupport);
auto surfaceFormat = Image::getSurfaceFormatFromTable(flags, &imageFormat, defaultHwInfo->capabilityTable.clVersionSupport);
cl_image_desc imageDesc{};
imageDesc.image_type = CL_MEM_OBJECT_IMAGE1D;
@@ -1978,7 +1978,7 @@ TEST(MemoryManagerTest, givenCachelineAlignedPointerAndProperDescriptorValuesWhe
TEST(MemoryManagerTest, givenForcedLinearImages3DImageAndProperDescriptorValuesWhenIsCopyRequiredIsCalledThenFalseIsReturned) {
DebugManagerStateRestore dbgRestorer;
DebugManager.flags.ForceLinearImages.set(true);
auto &hwHelper = HwHelper::get(platformDevices[0]->platform.eRenderCoreFamily);
auto &hwHelper = HwHelper::get(defaultHwInfo->platform.eRenderCoreFamily);
ImageInfo imgInfo{};
@@ -1987,7 +1987,7 @@ TEST(MemoryManagerTest, givenForcedLinearImages3DImageAndProperDescriptorValuesW
imageFormat.image_channel_order = CL_R;
cl_mem_flags flags = CL_MEM_READ_WRITE | CL_MEM_USE_HOST_PTR;
auto surfaceFormat = Image::getSurfaceFormatFromTable(flags, &imageFormat, platformDevices[0]->capabilityTable.clVersionSupport);
auto surfaceFormat = Image::getSurfaceFormatFromTable(flags, &imageFormat, defaultHwInfo->capabilityTable.clVersionSupport);
cl_image_desc imageDesc{};
imageDesc.image_type = CL_MEM_OBJECT_IMAGE3D;

2
opencl/test/unit_test/os_interface/linux/device_command_stream_fixture.h
View File

@@ -337,7 +337,7 @@ class DrmMockCustom : public Drm {
DrmMockCustom() : Drm(std::make_unique<HwDeviceId>(mockFd), *constructPlatform()->peekExecutionEnvironment()->rootDeviceEnvironments[0]) {
reset();
ioctl_expected.contextCreate = static_cast<int>(NEO::HwHelper::get(NEO::platformDevices[0]->platform.eRenderCoreFamily).getGpgpuEngineInstances(*NEO::platformDevices[0]).size());
ioctl_expected.contextCreate = static_cast<int>(NEO::HwHelper::get(NEO::defaultHwInfo->platform.eRenderCoreFamily).getGpgpuEngineInstances(*NEO::platformDevices[0]).size());
ioctl_expected.contextDestroy = ioctl_expected.contextCreate.load();
}
int getErrno() override {

2
opencl/test/unit_test/os_interface/linux/drm_command_stream_tests.cpp
View File

@@ -213,7 +213,7 @@ HWTEST_TEMPLATED_F(DrmCommandStreamTest, givenDrmContextIdWhenFlushingThenSetIdT
.RetiresOnSaturation();
osContext = std::make_unique<OsContextLinux>(*mock, 1, 1,
HwHelper::get(platformDevices[0]->platform.eRenderCoreFamily).getGpgpuEngineInstances(*defaultHwInfo)[0],
HwHelper::get(defaultHwInfo->platform.eRenderCoreFamily).getGpgpuEngineInstances(*defaultHwInfo)[0],
PreemptionHelper::getDefaultPreemptionMode(*defaultHwInfo),
false, false, false);
csr->setupContext(*osContext);

2
opencl/test/unit_test/os_interface/linux/drm_memory_manager_tests.cpp
View File

@@ -3243,7 +3243,7 @@ TEST_F(DrmMemoryManagerBasic, ifLimitedRangeAllocatorAvailableWhenAskedForAlloca
auto ptr = memoryManager->getGfxPartition(0)->heapAllocate(HeapIndex::HEAP_STANDARD, size);
auto address64bit = ptrDiff(ptr, memoryManager->getGfxPartition(0)->getHeapBase(HeapIndex::HEAP_STANDARD));
EXPECT_LT(address64bit, platformDevices[0]->capabilityTable.gpuAddressSpace);
EXPECT_LT(address64bit, defaultHwInfo->capabilityTable.gpuAddressSpace);
EXPECT_LT(0u, address64bit);

2
opencl/test/unit_test/os_interface/linux/hw_info_config_linux_tests.cpp
View File

@@ -124,7 +124,7 @@ struct HwInfoConfigTestLinuxDummy : HwInfoConfigTestLinux {
drm->StoredDeviceID = 1;
drm->setGtType(GTTYPE_GT0);
testPlatform->eRenderCoreFamily = platformDevices[0]->platform.eRenderCoreFamily;
testPlatform->eRenderCoreFamily = defaultHwInfo->platform.eRenderCoreFamily;
}
void TearDown() override {

4
opencl/test/unit_test/os_interface/linux/os_time_test.cpp
View File

@@ -183,7 +183,7 @@ TEST_F(DrmTimeTest, detect) {
}
TEST_F(DrmTimeTest, givenGpuTimestampResolutionQueryWhenIoctlFailsThenDefaultResolutionIsReturned) {
auto defaultResolution = platformDevices[0]->capabilityTable.defaultProfilingTimerResolution;
auto defaultResolution = defaultHwInfo->capabilityTable.defaultProfilingTimerResolution;
auto drm = new DrmMockCustom();
osTime->updateDrm(drm);
@@ -198,7 +198,7 @@ TEST_F(DrmTimeTest, givenGpuTimestampResolutionQueryWhenIoctlFailsThenDefaultRes
TEST_F(DrmTimeTest, givenGpuTimestampResolutionQueryWhenNoDrmThenDefaultResolutionIsReturned) {
osTime->updateDrm(nullptr);
auto defaultResolution = platformDevices[0]->capabilityTable.defaultProfilingTimerResolution;
auto defaultResolution = defaultHwInfo->capabilityTable.defaultProfilingTimerResolution;
auto result = osTime->getDynamicDeviceTimerResolution(*defaultHwInfo);
EXPECT_DOUBLE_EQ(result, defaultResolution);

2
opencl/test/unit_test/os_interface/windows/device_command_stream_tests.cpp
View File

@@ -870,7 +870,7 @@ HWTEST_F(WddmDefaultTest, givenFtrWddmHwQueuesFlagWhenCreatingCsrThenPickWddmVer
struct WddmCsrCompressionTests : ::testing::Test {
void setCompressionEnabled(bool enableForBuffer, bool enableForImages) {
RuntimeCapabilityTable capabilityTable = platformDevices[0]->capabilityTable;
RuntimeCapabilityTable capabilityTable = defaultHwInfo->capabilityTable;
capabilityTable.ftrRenderCompressedBuffers = enableForBuffer;
capabilityTable.ftrRenderCompressedImages = enableForImages;
hwInfo->capabilityTable = capabilityTable;

4
opencl/test/unit_test/os_interface/windows/gl/gl_os_sharing_tests.cpp
View File

@@ -337,7 +337,7 @@ TEST_F(GlArbSyncEventOsTest, GivenCallToSignalArbSyncObjectWhenSignalSynchroniza
auto preemptionMode = PreemptionHelper::getDefaultPreemptionMode(*defaultHwInfo);
wddm->init();
OsContextWin osContext(*osInterface.get()->getWddm(), 0u, 1,
HwHelper::get(platformDevices[0]->platform.eRenderCoreFamily).getGpgpuEngineInstances(*defaultHwInfo)[0],
HwHelper::get(defaultHwInfo->platform.eRenderCoreFamily).getGpgpuEngineInstances(*defaultHwInfo)[0],
preemptionMode, false, false, false);
CL_GL_SYNC_INFO syncInfo = {};
@@ -398,7 +398,7 @@ TEST_F(GlArbSyncEventOsTest, GivenCallToSignalArbSyncObjectWhenSignalSynchroniza
auto preemptionMode = PreemptionHelper::getDefaultPreemptionMode(*defaultHwInfo);
wddm->init();
OsContextWin osContext(*osInterface.get()->getWddm(), 0u, 1,
HwHelper::get(platformDevices[0]->platform.eRenderCoreFamily).getGpgpuEngineInstances(*defaultHwInfo)[0],
HwHelper::get(defaultHwInfo->platform.eRenderCoreFamily).getGpgpuEngineInstances(*defaultHwInfo)[0],
preemptionMode, false, false, false);
CL_GL_SYNC_INFO syncInfo = {};

2
opencl/test/unit_test/os_interface/windows/os_context_win_tests.cpp
View File

@@ -16,7 +16,7 @@ struct OsContextWinTest : public WddmTestWithMockGdiDll {
void SetUp() override {
WddmTestWithMockGdiDll::SetUp();
preemptionMode = PreemptionHelper::getDefaultPreemptionMode(*defaultHwInfo);
engineType = HwHelper::get(platformDevices[0]->platform.eRenderCoreFamily).getGpgpuEngineInstances(*defaultHwInfo)[0];
engineType = HwHelper::get(defaultHwInfo->platform.eRenderCoreFamily).getGpgpuEngineInstances(*defaultHwInfo)[0];
init();
}

2
opencl/test/unit_test/os_interface/windows/os_interface_win_tests.cpp
View File

@@ -34,7 +34,7 @@ TEST(OsContextTest, givenWddmWhenCreateOsContextAfterInitWddmThenOsContextIsInit
wddm->init();
EXPECT_EQ(0u, wddm->registerTrimCallbackResult.called);
auto osContext = std::make_unique<OsContextWin>(*wddm, 0u, 1,
HwHelper::get(platformDevices[0]->platform.eRenderCoreFamily).getGpgpuEngineInstances(*defaultHwInfo)[0],
HwHelper::get(defaultHwInfo->platform.eRenderCoreFamily).getGpgpuEngineInstances(*defaultHwInfo)[0],
preemptionMode, false, false, false);
EXPECT_TRUE(osContext->isInitialized());
EXPECT_EQ(osContext->getWddm(), wddm);

4
opencl/test/unit_test/os_interface/windows/wddm20_tests.cpp
View File

@@ -598,7 +598,7 @@ TEST_F(Wddm20WithMockGdiDllTestsWithoutWddmInit, givenUseNoRingFlushesKmdModeDeb
TEST_F(Wddm20WithMockGdiDllTestsWithoutWddmInit, givenEngineTypeWhenCreatingContextThenPassCorrectNodeOrdinal) {
init();
auto createContextParams = this->getCreateContextDataFcn();
UINT expected = WddmEngineMapper::engineNodeMap(HwHelper::get(platformDevices[0]->platform.eRenderCoreFamily).getGpgpuEngineInstances(*defaultHwInfo)[0]);
UINT expected = WddmEngineMapper::engineNodeMap(HwHelper::get(defaultHwInfo->platform.eRenderCoreFamily).getGpgpuEngineInstances(*defaultHwInfo)[0]);
EXPECT_EQ(expected, createContextParams->NodeOrdinal);
}
@@ -1188,7 +1188,7 @@ TEST_F(Wddm20WithMockGdiDllTests, whenSetDeviceInfoFailsThenDeviceIsNotConfigure
}
HWTEST_F(Wddm20WithMockGdiDllTests, givenNonGen12LPPlatformWhenConfigureDeviceAddressSpaceThenDontObtainMinAddress) {
if (platformDevices[0]->platform.eRenderCoreFamily == IGFX_GEN12LP_CORE) {
if (defaultHwInfo->platform.eRenderCoreFamily == IGFX_GEN12LP_CORE) {
GTEST_SKIP();
}
auto gmmMemory = new ::testing::NiceMock<GmockGmmMemory>(rootDeviceEnvironment->getGmmClientContext());

4
opencl/test/unit_test/os_interface/windows/wddm23_tests.cpp
View File

@@ -44,7 +44,7 @@ struct Wddm23TestsWithoutWddmInit : public ::testing::Test, GdiDllFixture {
wddm->init();
wddm->wddmInterface.reset(wddmMockInterface);
osContext = std::make_unique<OsContextWin>(*wddm, 0u, 1,
HwHelper::get(platformDevices[0]->platform.eRenderCoreFamily).getGpgpuEngineInstances(*defaultHwInfo)[0],
HwHelper::get(defaultHwInfo->platform.eRenderCoreFamily).getGpgpuEngineInstances(*defaultHwInfo)[0],
preemptionMode, false, false, false);
}
@@ -77,7 +77,7 @@ TEST_F(Wddm23Tests, whenCreateContextIsCalledThenEnableHwQueues) {
}
TEST_F(Wddm23Tests, givenPreemptionModeWhenCreateHwQueueCalledThenSetGpuTimeoutIfEnabled) {
auto defaultEngine = HwHelper::get(platformDevices[0]->platform.eRenderCoreFamily).getGpgpuEngineInstances(*defaultHwInfo)[0];
auto defaultEngine = HwHelper::get(defaultHwInfo->platform.eRenderCoreFamily).getGpgpuEngineInstances(*defaultHwInfo)[0];
OsContextWin osContextWithoutPreemption(*osInterface->get()->getWddm(), 0u, 1, defaultEngine, PreemptionMode::Disabled,
false, false, false);
OsContextWin osContextWithPreemption(*osInterface->get()->getWddm(), 0u, 1, defaultEngine, PreemptionMode::MidBatch,

4
opencl/test/unit_test/os_interface/windows/wddm_fixture.h
View File

@@ -46,7 +46,7 @@ struct WddmFixture : ::testing::Test {
auto preemptionMode = PreemptionHelper::getDefaultPreemptionMode(*defaultHwInfo);
wddm->init();
auto hwInfo = rootDeviceEnvironemnt->getHardwareInfo();
auto engine = HwHelper::get(platformDevices[0]->platform.eRenderCoreFamily).getGpgpuEngineInstances(*hwInfo)[0];
auto engine = HwHelper::get(defaultHwInfo->platform.eRenderCoreFamily).getGpgpuEngineInstances(*hwInfo)[0];
osContext = std::make_unique<OsContextWin>(*osInterface->get()->getWddm(), 0u, 1u, engine, preemptionMode,
false, false, false);
mockTemporaryResources = static_cast<MockWddmResidentAllocationsContainer *>(wddm->temporaryResources.get());
@@ -83,7 +83,7 @@ struct WddmFixtureWithMockGdiDll : public GdiDllFixture {
wddm->wddmInterface.reset(wddmMockInterface);
auto hwInfo = rootDeviceEnvironment->getHardwareInfo();
auto engine = HwHelper::get(platformDevices[0]->platform.eRenderCoreFamily).getGpgpuEngineInstances(*hwInfo)[0];
auto engine = HwHelper::get(defaultHwInfo->platform.eRenderCoreFamily).getGpgpuEngineInstances(*hwInfo)[0];
osContext = std::make_unique<OsContextWin>(*osInterface->get()->getWddm(), 0u, 1, engine, preemptionMode,
false, false, false);
}

2
opencl/test/unit_test/os_interface/windows/wddm_memory_manager_tests.cpp
View File

@@ -44,7 +44,7 @@ void WddmMemoryManagerFixture::SetUp() {
executionEnvironment = platform()->peekExecutionEnvironment();
rootDeviceEnvironment = executionEnvironment->rootDeviceEnvironments[0].get();
wddm = static_cast<WddmMock *>(Wddm::createWddm(nullptr, *executionEnvironment->rootDeviceEnvironments[0].get()));
if (platformDevices[0]->capabilityTable.ftrRenderCompressedBuffers || platformDevices[0]->capabilityTable.ftrRenderCompressedImages) {
if (defaultHwInfo->capabilityTable.ftrRenderCompressedBuffers || defaultHwInfo->capabilityTable.ftrRenderCompressedImages) {
GMM_TRANSLATIONTABLE_CALLBACKS dummyTTCallbacks = {};
executionEnvironment->rootDeviceEnvironments[0]->pageTableManager.reset(GmmPageTableMngr::create(nullptr, 0, &dummyTTCallbacks));
}

2
opencl/test/unit_test/program/program_data_tests.cpp
View File

@@ -134,7 +134,7 @@ void ProgramDataTestBase::buildAndDecodeProgramPatchList() {
cl_int error = CL_SUCCESS;
programBinaryHeader.Magic = 0x494E5443;
programBinaryHeader.Version = CURRENT_ICBE_VERSION;
programBinaryHeader.Device = platformDevices[0]->platform.eRenderCoreFamily;
programBinaryHeader.Device = defaultHwInfo->platform.eRenderCoreFamily;
programBinaryHeader.GPUPointerSizeInBytes = 8;
programBinaryHeader.NumberOfKernels = 0;
programBinaryHeader.PatchListSize = programPatchListSize;

4
opencl/test/unit_test/program/program_tests.cpp
View File

@@ -1472,7 +1472,7 @@ TEST(ProgramFromBinaryTests, givenBinaryWithInvalidICBEThenErrorIsReturned) {
memset(&binHeader, 0, sizeof(binHeader));
binHeader.Magic = iOpenCL::MAGIC_CL;
binHeader.Version = iOpenCL::CURRENT_ICBE_VERSION - 3;
binHeader.Device = platformDevices[0]->platform.eRenderCoreFamily;
binHeader.Device = defaultHwInfo->platform.eRenderCoreFamily;
binHeader.GPUPointerSizeInBytes = 8;
binHeader.NumberOfKernels = 0;
binHeader.SteppingId = 0;
@@ -1507,7 +1507,7 @@ TEST(ProgramFromBinaryTests, givenEmptyProgramThenErrorIsReturned) {
memset(&binHeader, 0, sizeof(binHeader));
binHeader.Magic = iOpenCL::MAGIC_CL;
binHeader.Version = iOpenCL::CURRENT_ICBE_VERSION;
binHeader.Device = platformDevices[0]->platform.eRenderCoreFamily;
binHeader.Device = defaultHwInfo->platform.eRenderCoreFamily;
binHeader.GPUPointerSizeInBytes = 8;
binHeader.NumberOfKernels = 0;
binHeader.SteppingId = 0;

2
opencl/test/unit_test/scheduler/scheduler_kernel_tests.cpp
View File

@@ -77,7 +77,7 @@ TEST(SchedulerKernelTest, getGws) {
const size_t hwThreads = 3;
const size_t simdSize = 8;
size_t maxGws = platformDevices[0]->gtSystemInfo.EUCount * hwThreads * simdSize;
size_t maxGws = defaultHwInfo->gtSystemInfo.EUCount * hwThreads * simdSize;
size_t gws = kernel.getGws();
EXPECT_GE(maxGws, gws);

2
opencl/test/unit_test/sharings/gl/windows/gl_texture_tests.cpp
View File

@@ -209,7 +209,7 @@ TEST_F(GlSharingTextureTests, givenDifferentHwFormatWhenSurfaceFormatInfoIsSetTh
cl_int retVal = CL_INVALID_VALUE;
cl_image_format imageFormat = {};
GlTexture::setClImageFormat(GL_DEPTH32F_STENCIL8, imageFormat);
auto format = Image::getSurfaceFormatFromTable(CL_MEM_READ_ONLY, &imageFormat, platformDevices[0]->capabilityTable.clVersionSupport);
auto format = Image::getSurfaceFormatFromTable(CL_MEM_READ_ONLY, &imageFormat, defaultHwInfo->capabilityTable.clVersionSupport);
ASSERT_NE(format, nullptr);
auto newHwFormat = 217u;

2
opencl/test/unit_test/source_level_debugger/source_level_debugger_csr_tests.cpp
View File

@@ -29,7 +29,7 @@ class CommandStreamReceiverWithActiveDebuggerTest : public ::testing::Test {
EnvironmentWithCsrWrapper environment;
environment.setCsrType<MockCsrHw2<FamilyType>>();
executionEnvironment = getExecutionEnvironmentImpl(hwInfo, 1);
hwInfo->capabilityTable = platformDevices[0]->capabilityTable;
hwInfo->capabilityTable = defaultHwInfo->capabilityTable;
hwInfo->capabilityTable.debuggerSupported = true;
auto mockMemoryManager = new MockMemoryManager(*executionEnvironment);

12
opencl/test/unit_test/source_level_debugger/source_level_debugger_tests.cpp
View File

@@ -46,7 +46,7 @@ class DebuggerLibraryRestorer {
TEST(SourceLevelDebugger, givenPlatformWhenItIsCreatedThenSourceLevelDebuggerIsCreatedInExecutionEnvironment) {
DebuggerLibraryRestorer restorer;
if (platformDevices[0]->capabilityTable.debuggerSupported) {
if (defaultHwInfo->capabilityTable.debuggerSupported) {
DebuggerLibrary::setLibraryAvailable(true);
DebuggerLibrary::setDebuggerActive(true);
auto executionEnvironment = new ExecutionEnvironment();
@@ -454,7 +454,7 @@ TEST(SourceLevelDebugger, givenKernelDebuggerLibraryNotActiveWhenInitializeIsCal
TEST(SourceLevelDebugger, givenKernelDebuggerLibraryActiveWhenDeviceIsConstructedThenDebuggerIsInitialized) {
DebuggerLibraryRestorer restorer;
if (platformDevices[0]->capabilityTable.debuggerSupported) {
if (defaultHwInfo->capabilityTable.debuggerSupported) {
DebuggerLibraryInterceptor interceptor;
DebuggerLibrary::setLibraryAvailable(true);
DebuggerLibrary::setDebuggerActive(true);
@@ -468,7 +468,7 @@ TEST(SourceLevelDebugger, givenKernelDebuggerLibraryActiveWhenDeviceIsConstructe
TEST(SourceLevelDebugger, givenKernelDebuggerLibraryActiveWhenDeviceImplIsCreatedThenDebuggerIsNotified) {
DebuggerLibraryRestorer restorer;
if (platformDevices[0]->capabilityTable.debuggerSupported) {
if (defaultHwInfo->capabilityTable.debuggerSupported) {
DebuggerLibraryInterceptor interceptor;
DebuggerLibrary::setLibraryAvailable(true);
DebuggerLibrary::setDebuggerActive(true);
@@ -487,7 +487,7 @@ TEST(SourceLevelDebugger, givenKernelDebuggerLibraryActiveWhenDeviceImplIsCreate
TEST(SourceLevelDebugger, givenKernelDebuggerLibraryActiveWhenDeviceImplIsCreatedWithOsCsrThenDebuggerIsNotifiedWithCorrectDeviceHandle) {
DebuggerLibraryRestorer restorer;
if (platformDevices[0]->capabilityTable.debuggerSupported) {
if (defaultHwInfo->capabilityTable.debuggerSupported) {
DebuggerLibraryInterceptor interceptor;
DebuggerLibrary::setLibraryAvailable(true);
DebuggerLibrary::setDebuggerActive(true);
@@ -530,7 +530,7 @@ TEST(SourceLevelDebugger, givenKernelDebuggerLibraryNotActiveWhenDeviceIsCreated
TEST(SourceLevelDebugger, givenTwoRootDevicesWhenSecondIsCreatedThenCreatingNewSourceLevelDebugger) {
DebuggerLibraryRestorer restorer;
if (platformDevices[0]->capabilityTable.debuggerSupported) {
if (defaultHwInfo->capabilityTable.debuggerSupported) {
DebuggerLibraryInterceptor interceptor;
DebuggerLibrary::setLibraryAvailable(true);
DebuggerLibrary::setDebuggerActive(true);
@@ -555,7 +555,7 @@ TEST(SourceLevelDebugger, givenTwoRootDevicesWhenSecondIsCreatedThenCreatingNewS
TEST(SourceLevelDebugger, givenMultipleRootDevicesWhenTheyAreCreatedTheyUseDedicatedSourceLevelDebugger) {
DebuggerLibraryRestorer restorer;
if (platformDevices[0]->capabilityTable.debuggerSupported) {
if (defaultHwInfo->capabilityTable.debuggerSupported) {
DebuggerLibrary::setLibraryAvailable(true);
DebuggerLibrary::setDebuggerActive(true);

2
shared/test/unit_test/os_interface/windows/wddm_preemption_tests.cpp
View File

@@ -42,7 +42,7 @@ class WddmPreemptionTests : public Test<WddmFixtureWithMockGdiDll> {
auto preemptionMode = PreemptionHelper::getDefaultPreemptionMode(hwInfoTest);
wddm->init();
auto hwInfo = executionEnvironment->rootDeviceEnvironments[0]->getHardwareInfo();
auto engine = HwHelper::get(platformDevices[0]->platform.eRenderCoreFamily).getGpgpuEngineInstances(*hwInfo)[0];
auto engine = HwHelper::get(defaultHwInfo->platform.eRenderCoreFamily).getGpgpuEngineInstances(*hwInfo)[0];
osContext = std::make_unique<OsContextWin>(*wddm, 0u, 1, engine, preemptionMode, false, false, false);
}