Skip to content

Commit 3680700

Browse files
JablonskiMateuszCompute-Runtime-Automation
JablonskiMateusz
authored and
Compute-Runtime-Automation
committed
refactor: remove intel_hwconfig_types file from third party
remove not needed querying of vs/hs/ds/ps/gs threads Signed-off-by: Mateusz Jablonski <mateusz.jablonski@intel.com>
1 parent 8360d90 commit 3680700

File tree

25 files changed

+99
-356
lines changed

25 files changed

+99
-356
lines changed

‎level_zero/sysman/source/api/memory/linux/sysman_os_memory_imp_prelim.cpp‎

Lines changed: 4 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,6 @@
2121
#include "level_zero/sysman/source/shared/linux/zes_os_sysman_imp.h"
2222
#include "level_zero/sysman/source/sysman_const.h"
2323

24-
#include "drm/intel_hwconfig_types.h"
2524
#include "igfxfmid.h"
2625

2726
namespace L0 {
@@ -59,14 +58,14 @@ ze_result_t LinuxMemoryImp::getProperties(zes_mem_properties_t *pProperties) {
5958
pProperties->numChannels = memSystemInfo->getMaxMemoryChannels();
6059
auto memType = memSystemInfo->getMemoryType();
6160
switch (memType) {
62-
case INTEL_HWCONFIG_MEMORY_TYPE_HBM2e:
63-
case INTEL_HWCONFIG_MEMORY_TYPE_HBM2:
61+
case NEO::DeviceBlobConstants::MemoryType::hbm2e:
62+
case NEO::DeviceBlobConstants::MemoryType::hbm2:
6463
pProperties->type = ZES_MEM_TYPE_HBM;
6564
break;
66-
case INTEL_HWCONFIG_MEMORY_TYPE_LPDDR4:
65+
case NEO::DeviceBlobConstants::MemoryType::lpddr4:
6766
pProperties->type = ZES_MEM_TYPE_LPDDR4;
6867
break;
69-
case INTEL_HWCONFIG_MEMORY_TYPE_LPDDR5:
68+
case NEO::DeviceBlobConstants::MemoryType::lpddr5:
7069
pProperties->type = ZES_MEM_TYPE_LPDDR5;
7170
break;
7271
default:

‎level_zero/sysman/source/api/ras/linux/sysman_os_ras_imp.cpp‎

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -14,16 +14,14 @@
1414
#include "level_zero/sysman/source/shared/linux/sysman_fs_access_interface.h"
1515
#include "level_zero/sysman/source/shared/linux/zes_os_sysman_imp.h"
1616

17-
#include "drm/intel_hwconfig_types.h"
18-
1917
#include <algorithm>
2018

2119
namespace L0 {
2220
namespace Sysman {
2321

2422
static bool isMemoryTypeHbm(LinuxSysmanImp *pLinuxSysmanImp) {
2523
uint32_t memType = pLinuxSysmanImp->getMemoryType();
26-
if (memType == INTEL_HWCONFIG_MEMORY_TYPE_HBM2e || memType == INTEL_HWCONFIG_MEMORY_TYPE_HBM2) {
24+
if (memType == NEO::DeviceBlobConstants::MemoryType::hbm2e || memType == NEO::DeviceBlobConstants::MemoryType::hbm2) {
2725
return true;
2826
}
2927
return false;

‎level_zero/sysman/test/unit_tests/sources/events/linux/mock_events.h‎

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -22,8 +22,6 @@
2222
#include "level_zero/sysman/source/shared/linux/zes_os_sysman_driver_imp.h"
2323
#include "level_zero/sysman/test/unit_tests/sources/linux/mock_sysman_hw_device_id.h"
2424

25-
#include "drm/intel_hwconfig_types.h"
26-
2725
using namespace NEO;
2826

2927
namespace L0 {
@@ -261,7 +259,7 @@ struct MockEventsFwInterface : public L0::Sysman::FirmwareUtil {
261259

262260
struct MockEventNeoDrm : public Drm {
263261
using Drm::setupIoctlHelper;
264-
uint32_t mockMemoryType = INTEL_HWCONFIG_MEMORY_TYPE_HBM2e;
262+
uint32_t mockMemoryType = NEO::DeviceBlobConstants::MemoryType::hbm2e;
265263
const int mockFd = 33;
266264
std::vector<bool> mockQuerySystemInfoReturnValue{};
267265
bool isRepeated = false;
@@ -286,7 +284,7 @@ struct MockEventNeoDrm : public Drm {
286284
return returnValue;
287285
}
288286

289-
uint32_t hwBlob[] = {INTEL_HWCONFIG_MAX_MEMORY_CHANNELS, 1, 8, INTEL_HWCONFIG_MEMORY_TYPE, 0, mockMemoryType};
287+
uint32_t hwBlob[] = {NEO::DeviceBlobConstants::maxMemoryChannels, 1, 8, NEO::DeviceBlobConstants::memoryType, 0, mockMemoryType};
290288
std::vector<uint32_t> inputBlobData(reinterpret_cast<uint32_t *>(hwBlob), reinterpret_cast<uint32_t *>(ptrOffset(hwBlob, sizeof(hwBlob))));
291289
this->systemInfo.reset(new SystemInfo(inputBlobData));
292290
return returnValue;

‎level_zero/sysman/test/unit_tests/sources/events/linux/test_zes_events.cpp‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -40,7 +40,7 @@ class SysmanEventsFixture : public SysmanDeviceFixture {
4040
pLinuxSysmanImp->pFsAccess = pFsAccess.get();
4141
pDrm = new MockEventNeoDrm(const_cast<NEO::RootDeviceEnvironment &>(pSysmanDeviceImp->getRootDeviceEnvironment()));
4242
pDrm->setupIoctlHelper(pSysmanDeviceImp->getRootDeviceEnvironment().getHardwareInfo()->platform.eProductFamily);
43-
pDrm->setMemoryType(INTEL_HWCONFIG_MEMORY_TYPE_HBM2e);
43+
pDrm->setMemoryType(NEO::DeviceBlobConstants::MemoryType::hbm2e);
4444
auto &osInterface = pSysmanDeviceImp->getRootDeviceEnvironment().osInterface;
4545
osInterface->setDriverModel(std::unique_ptr<MockEventNeoDrm>(pDrm));
4646

‎level_zero/sysman/test/unit_tests/sources/memory/linux/mock_memory_prelim.h‎

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,6 @@
1717
#include "level_zero/sysman/test/unit_tests/sources/linux/mock_sysman_hw_device_id.h"
1818

1919
#include "drm/i915_drm.h"
20-
#include "drm/intel_hwconfig_types.h"
2120

2221
using namespace NEO;
2322

@@ -85,7 +84,7 @@ namespace L0 {
8584
namespace Sysman {
8685
namespace ult {
8786

88-
uint32_t mockMemoryType = INTEL_HWCONFIG_MEMORY_TYPE_HBM2e;
87+
uint32_t mockMemoryType = NEO::DeviceBlobConstants::MemoryType::hbm2e;
8988
std::string mockPhysicalSize = "0x00000040000000";
9089
uint64_t hbmRP0Frequency = 4200; // in MHz
9190
const std::string deviceMemoryHealth("device_memory_health");
@@ -238,7 +237,7 @@ struct MockMemoryNeoDrm : public NEO::Drm {
238237
return returnValue;
239238
}
240239

241-
uint32_t hwBlob[] = {INTEL_HWCONFIG_MAX_MEMORY_CHANNELS, 1, 8, INTEL_HWCONFIG_MEMORY_TYPE, 0, mockMemoryType};
240+
uint32_t hwBlob[] = {NEO::DeviceBlobConstants::maxMemoryChannels, 1, 8, NEO::DeviceBlobConstants::memoryType, 0, mockMemoryType};
242241
std::vector<uint32_t> inputBlobData(reinterpret_cast<uint32_t *>(hwBlob), reinterpret_cast<uint32_t *>(ptrOffset(hwBlob, sizeof(hwBlob))));
243242
this->systemInfo.reset(new SystemInfo(inputBlobData));
244243
return returnValue;

‎level_zero/sysman/test/unit_tests/sources/memory/linux/test_sysman_memory_prelim.cpp‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -69,7 +69,7 @@ class SysmanDeviceMemoryFixture : public SysmanDeviceFixture {
6969
pFsAccess = std::make_unique<MockMemoryFsAccess>();
7070
pFsAccessOriginal = pLinuxSysmanImp->pFsAccess;
7171
pLinuxSysmanImp->pFsAccess = pFsAccess.get();
72-
pDrm->setMemoryType(INTEL_HWCONFIG_MEMORY_TYPE_HBM2e);
72+
pDrm->setMemoryType(NEO::DeviceBlobConstants::MemoryType::hbm2e);
7373
pDrm->ioctlHelper = static_cast<std::unique_ptr<NEO::IoctlHelper>>(std::make_unique<SysmanMemoryMockIoctlHelper>(*pDrm));
7474

7575
pSysmanDeviceImp->pMemoryHandleContext->handleList.clear();
@@ -252,7 +252,7 @@ TEST_F(SysmanDeviceMemoryFixture, GivenValidMemoryHandleWhenCallingZetSysmanMemo
252252
}
253253

254254
TEST_F(SysmanDeviceMemoryFixture, GivenValidMemoryHandleWhenCallingZetSysmanMemoryGetPropertiesWithHBMLocalMemoryThenVerifySysmanMemoryGetPropertiesCallSucceeds) {
255-
pDrm->setMemoryType(INTEL_HWCONFIG_MEMORY_TYPE_HBM2);
255+
pDrm->setMemoryType(NEO::DeviceBlobConstants::MemoryType::hbm2);
256256
setLocalSupportedAndReinit(true);
257257

258258
auto handles = getMemoryHandles(memoryHandleComponentCount);
@@ -275,7 +275,7 @@ TEST_F(SysmanDeviceMemoryFixture, GivenValidMemoryHandleWhenCallingZetSysmanMemo
275275
}
276276

277277
TEST_F(SysmanDeviceMemoryFixture, GivenValidMemoryHandleWhenCallingZetSysmanMemoryGetPropertiesWithLPDDR4LocalMemoryThenVerifySysmanMemoryGetPropertiesCallSucceeds) {
278-
pDrm->setMemoryType(INTEL_HWCONFIG_MEMORY_TYPE_LPDDR4);
278+
pDrm->setMemoryType(NEO::DeviceBlobConstants::MemoryType::lpddr4);
279279
setLocalSupportedAndReinit(true);
280280

281281
auto handles = getMemoryHandles(memoryHandleComponentCount);
@@ -298,7 +298,7 @@ TEST_F(SysmanDeviceMemoryFixture, GivenValidMemoryHandleWhenCallingZetSysmanMemo
298298
}
299299

300300
TEST_F(SysmanDeviceMemoryFixture, GivenValidMemoryHandleWhenCallingZetSysmanMemoryGetPropertiesWithLPDDR5LocalMemoryThenVerifySysmanMemoryGetPropertiesCallSucceeds) {
301-
pDrm->setMemoryType(INTEL_HWCONFIG_MEMORY_TYPE_LPDDR5);
301+
pDrm->setMemoryType(NEO::DeviceBlobConstants::MemoryType::lpddr5);
302302
setLocalSupportedAndReinit(true);
303303

304304
auto handles = getMemoryHandles(memoryHandleComponentCount);
@@ -321,7 +321,7 @@ TEST_F(SysmanDeviceMemoryFixture, GivenValidMemoryHandleWhenCallingZetSysmanMemo
321321
}
322322

323323
TEST_F(SysmanDeviceMemoryFixture, GivenValidMemoryHandleWhenCallingZetSysmanMemoryGetPropertiesWithDDRLocalMemoryThenVerifySysmanMemoryGetPropertiesCallSucceeds) {
324-
pDrm->setMemoryType(INTEL_HWCONFIG_MEMORY_TYPE_GDDR6);
324+
pDrm->setMemoryType(NEO::DeviceBlobConstants::MemoryType::gddr6);
325325
setLocalSupportedAndReinit(true);
326326

327327
auto handles = getMemoryHandles(memoryHandleComponentCount);

‎level_zero/sysman/test/unit_tests/sources/ras/linux/mock_sysman_ras.h‎

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -19,8 +19,6 @@
1919
#include "level_zero/sysman/source/shared/linux/zes_os_sysman_imp.h"
2020
#include "level_zero/sysman/test/unit_tests/sources/linux/mock_sysman_hw_device_id.h"
2121

22-
#include "drm/intel_hwconfig_types.h"
23-
2422
using namespace NEO;
2523

2624
namespace L0 {
@@ -659,7 +657,7 @@ struct MockRasFwInterface : public L0::Sysman::FirmwareUtil {
659657

660658
struct MockRasNeoDrm : public Drm {
661659
using Drm::setupIoctlHelper;
662-
uint32_t mockMemoryType = INTEL_HWCONFIG_MEMORY_TYPE_LPDDR5;
660+
uint32_t mockMemoryType = NEO::DeviceBlobConstants::MemoryType::lpddr5;
663661
const int mockFd = 33;
664662
std::vector<bool> mockQuerySystemInfoReturnValue{};
665663
bool isRepeated = false;
@@ -684,7 +682,7 @@ struct MockRasNeoDrm : public Drm {
684682
return returnValue;
685683
}
686684

687-
uint32_t hwBlob[] = {INTEL_HWCONFIG_MAX_MEMORY_CHANNELS, 1, 8, INTEL_HWCONFIG_MEMORY_TYPE, 0, mockMemoryType};
685+
uint32_t hwBlob[] = {NEO::DeviceBlobConstants::maxMemoryChannels, 1, 8, NEO::DeviceBlobConstants::memoryType, 0, mockMemoryType};
688686
std::vector<uint32_t> inputBlobData(reinterpret_cast<uint32_t *>(hwBlob), reinterpret_cast<uint32_t *>(ptrOffset(hwBlob, sizeof(hwBlob))));
689687
this->systemInfo.reset(new SystemInfo(inputBlobData));
690688
return returnValue;

‎level_zero/sysman/test/unit_tests/sources/ras/linux/test_zes_ras.cpp‎

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -131,7 +131,7 @@ HWTEST2_F(SysmanRasFixture, GivenValidOsSysmanPointerWhenRetrievingSupportedRasE
131131

132132
HWTEST2_F(SysmanRasFixture, GivenValidOsSysmanPointerWhenRetrievingSupportedRasErrorsForHbmAndFwInterfaceIsAbsentThenNoSupportedErrorTypeIsReturned, IsPVC) {
133133
std::set<zes_ras_error_type_t> errorType = {};
134-
pDrm->setMemoryType(INTEL_HWCONFIG_MEMORY_TYPE_HBM2e);
134+
pDrm->setMemoryType(NEO::DeviceBlobConstants::MemoryType::hbm2e);
135135
pLinuxSysmanImp->pFwUtilInterface = nullptr;
136136

137137
L0::Sysman::LinuxRasSourceHbm::getSupportedRasErrorTypes(errorType, pOsSysman, false, 0);
@@ -167,7 +167,7 @@ HWTEST2_F(SysmanRasFixture, GivenValidSysmanHandleWhenRetrievingRasHandlesIfRasE
167167
}
168168

169169
HWTEST2_F(SysmanRasFixture, GivenValidSysmanHandleWhenRetrievingRasHandlesIfHbmAndFwInterfaceArePresentThenSuccessIsReturned, IsPVC) {
170-
pDrm->setMemoryType(INTEL_HWCONFIG_MEMORY_TYPE_HBM2e);
170+
pDrm->setMemoryType(NEO::DeviceBlobConstants::MemoryType::hbm2e);
171171
pRasFwUtilInterface->mockMemorySuccess = true;
172172

173173
uint32_t count = 0;
@@ -177,7 +177,7 @@ HWTEST2_F(SysmanRasFixture, GivenValidSysmanHandleWhenRetrievingRasHandlesIfHbmA
177177
}
178178

179179
HWTEST2_F(SysmanRasFixture, GivenValidSysmanHandleWhenRetrievingRasHandlesIfRasEventsAreAbsentAndQuerySystemInfoSucceedsButMemSysInfoIsNullThenZeroHandlesAreCreated, IsPVC) {
180-
pDrm->setMemoryType(INTEL_HWCONFIG_MEMORY_TYPE_HBM2e);
180+
pDrm->setMemoryType(NEO::DeviceBlobConstants::MemoryType::hbm2e);
181181
pFsAccess->mockReadDirectoryWithoutRasEvents = true;
182182
pDrm->mockQuerySystemInfoReturnValue.push_back(true);
183183

@@ -308,7 +308,7 @@ HWTEST2_F(SysmanRasFixture, GivenValidRasHandleWhenCallingzesRasGetStateForHbmTh
308308

309309
pPmuInterface->mockPmuReadResult = true;
310310
pRasFwUtilInterface->mockMemorySuccess = true;
311-
pDrm->setMemoryType(INTEL_HWCONFIG_MEMORY_TYPE_HBM2e);
311+
pDrm->setMemoryType(NEO::DeviceBlobConstants::MemoryType::hbm2e);
312312

313313
auto handles = getRasHandles(mockHandleCount);
314314
bool correctable = true;
@@ -329,7 +329,7 @@ HWTEST2_F(SysmanRasFixture, GivenValidRasHandleWhenCallingzesRasGetStateForHbmWi
329329

330330
pPmuInterface->mockPmuReadResult = true;
331331
pRasFwUtilInterface->mockMemorySuccess = true;
332-
pDrm->setMemoryType(INTEL_HWCONFIG_MEMORY_TYPE_HBM2e);
332+
pDrm->setMemoryType(NEO::DeviceBlobConstants::MemoryType::hbm2e);
333333

334334
auto handles = getRasHandles(mockHandleCount);
335335
bool correctable = true;
@@ -554,7 +554,7 @@ HWTEST2_F(SysmanRasFixture, GivenValidRasHandleAndRasUtilInterfaceIsNullWhenRequ
554554
}
555555

556556
HWTEST2_F(SysmanRasFixture, GivenValidRasHandleWhenCallingZesGetRasStateAndFirmwareInterfaceIsAbsentOtherInterfacesAreAlsoAbsentThenCallFails, IsPVC) {
557-
pDrm->setMemoryType(INTEL_HWCONFIG_MEMORY_TYPE_HBM2e);
557+
pDrm->setMemoryType(NEO::DeviceBlobConstants::MemoryType::hbm2e);
558558
pFsAccess->mockReadVal = true;
559559
VariableBackup<L0::Sysman::FsAccessInterface *> fsBackup(&pLinuxSysmanImp->pFsAccess);
560560
pLinuxSysmanImp->pFsAccess = pFsAccess.get();
@@ -731,7 +731,7 @@ HWTEST2_F(SysmanRasMultiDeviceFixture, GivenValidRasHandleWhenCallingzesRasGetSt
731731

732732
pPmuInterface->mockPmuReadResult = true;
733733
pRasFwUtilInterface->mockMemorySuccess = true;
734-
pDrm->setMemoryType(INTEL_HWCONFIG_MEMORY_TYPE_HBM2e);
734+
pDrm->setMemoryType(NEO::DeviceBlobConstants::MemoryType::hbm2e);
735735
auto handles = getRasHandles(mockHandleCountForSubDevice);
736736
uint32_t handleIndex = 0u;
737737

‎level_zero/sysman/test/unit_tests/sources/ras/linux/test_zes_ras_exp.cpp‎

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -81,7 +81,7 @@ HWTEST2_F(SysmanRasExpFixture, GivenValidRasHandleWhenCallingZesRasGetStateExpTh
8181
VariableBackup<L0::Sysman::FsAccessInterface *> fsBackup(&pLinuxSysmanImp->pFsAccess);
8282
pLinuxSysmanImp->pFsAccess = pFsAccess.get();
8383

84-
pDrm->setMemoryType(INTEL_HWCONFIG_MEMORY_TYPE_HBM2e);
84+
pDrm->setMemoryType(NEO::DeviceBlobConstants::MemoryType::hbm2e);
8585

8686
pRasFwUtilInterface->mockMemorySuccess = true;
8787
VariableBackup<L0::Sysman::FirmwareUtil *> fwBackup(&pLinuxSysmanImp->pFwUtilInterface);
@@ -210,7 +210,7 @@ HWTEST2_F(SysmanRasExpFixture, GivenValidRasHandleWhenCallingZesRasGetStateExpFo
210210

211211
HWTEST2_F(SysmanRasExpFixture, GivenValidRasHandleWhenCallingZesRasGetStateExpForHbmThenSuccessIsReturned, IsPVC) {
212212

213-
pDrm->setMemoryType(INTEL_HWCONFIG_MEMORY_TYPE_HBM2e);
213+
pDrm->setMemoryType(NEO::DeviceBlobConstants::MemoryType::hbm2e);
214214
pRasFwUtilInterface->mockMemorySuccess = true;
215215
VariableBackup<L0::Sysman::FirmwareUtil *> fwBackup(&pLinuxSysmanImp->pFwUtilInterface);
216216
pLinuxSysmanImp->pFwUtilInterface = pRasFwUtilInterface.get();
@@ -362,7 +362,7 @@ HWTEST2_F(SysmanRasExpFixture, GivenValidRasHandleWhenCallingZesRasGetStateExpFo
362362
}
363363

364364
HWTEST2_F(SysmanRasExpFixture, GivenValidRasHandleWhenCallingZesGetRasStateExpAndFirmwareInterfaceIsAbsentOtherInterfacesAreAlsoAbsentThenCallFails, IsPVC) {
365-
pDrm->setMemoryType(INTEL_HWCONFIG_MEMORY_TYPE_HBM2e);
365+
pDrm->setMemoryType(NEO::DeviceBlobConstants::MemoryType::hbm2e);
366366
pFsAccess->mockReadVal = true;
367367
VariableBackup<L0::Sysman::FsAccessInterface *> fsBackup(&pLinuxSysmanImp->pFsAccess);
368368
pLinuxSysmanImp->pFsAccess = pFsAccess.get();
@@ -529,7 +529,7 @@ HWTEST2_F(SysmanRasExpFixture, GivenValidRasHandleWhenCallingzesRasClearStateExp
529529
}
530530

531531
HWTEST2_F(SysmanRasExpFixture, GivenValidRasHandleWhenCallingzesGetClearStateExpAndFirmwareInterfaceIsAbsentOtherInterfacesAreAlsoAbsentThenCallFails, IsPVC) {
532-
pDrm->setMemoryType(INTEL_HWCONFIG_MEMORY_TYPE_HBM2e);
532+
pDrm->setMemoryType(NEO::DeviceBlobConstants::MemoryType::hbm2e);
533533
pFsAccess->mockReadVal = true;
534534
VariableBackup<L0::Sysman::FsAccessInterface *> fsBackup(&pLinuxSysmanImp->pFsAccess);
535535
pLinuxSysmanImp->pFsAccess = pFsAccess.get();
@@ -548,7 +548,7 @@ HWTEST2_F(SysmanRasExpFixture, GivenValidRasHandleWhenCallingzesGetClearStateExp
548548
}
549549

550550
HWTEST2_F(SysmanRasExpFixture, GivenValidRasHandleWhenCallingzesGetClearStateExpAndGetMemoryErrorFailsAndOtherInterfacesAreAlsoAbsentThenCallFails, IsPVC) {
551-
pDrm->setMemoryType(INTEL_HWCONFIG_MEMORY_TYPE_HBM2e);
551+
pDrm->setMemoryType(NEO::DeviceBlobConstants::MemoryType::hbm2e);
552552
VariableBackup<L0::Sysman::FirmwareUtil *> fwBackup(&pLinuxSysmanImp->pFwUtilInterface);
553553
pLinuxSysmanImp->pFwUtilInterface = pRasFwUtilInterface.get();
554554

@@ -563,7 +563,7 @@ HWTEST2_F(SysmanRasExpFixture, GivenValidRasHandleWhenCallingzesGetClearStateExp
563563
}
564564

565565
HWTEST2_F(SysmanRasExpFixture, GivenValidRasHandleWhenCallingzesGetClearStateExpAndOtherInterfacesAreAbsentThenCallSucceeds, IsPVC) {
566-
pDrm->setMemoryType(INTEL_HWCONFIG_MEMORY_TYPE_HBM2e);
566+
pDrm->setMemoryType(NEO::DeviceBlobConstants::MemoryType::hbm2e);
567567
pRasFwUtilInterface->mockMemorySuccess = true;
568568
VariableBackup<L0::Sysman::FirmwareUtil *> fwBackup(&pLinuxSysmanImp->pFwUtilInterface);
569569
pLinuxSysmanImp->pFwUtilInterface = pRasFwUtilInterface.get();
@@ -700,7 +700,7 @@ HWTEST2_F(SysmanRasExpFixture, GivenValidRasHandleAndRasUtilInterfaceIsNullWhenC
700700
}
701701

702702
HWTEST2_F(SysmanRasExpFixture, GivenValidRasHandleWhenCallingzesRasClearStateExpAndGetStateExpForHbmThenVerifyErrorCountersAreCleared, IsPVC) {
703-
pDrm->setMemoryType(INTEL_HWCONFIG_MEMORY_TYPE_HBM2);
703+
pDrm->setMemoryType(NEO::DeviceBlobConstants::MemoryType::hbm2);
704704
pPmuInterface->mockPmuReadResult = true;
705705
VariableBackup<L0::Sysman::PmuInterface *> pmuBackup(&pLinuxSysmanImp->pPmuInterface);
706706
pLinuxSysmanImp->pPmuInterface = pPmuInterface.get();
@@ -916,7 +916,7 @@ HWTEST2_F(SysmanRasExpMultiDeviceFixture, GivenValidRasHandleWhenCallingZesRasGe
916916

917917
HWTEST2_F(SysmanRasExpMultiDeviceFixture, GivenValidRasHandleWhenCallingZesRasGetStateExpForHbmThenSuccessIsReturned, IsPVC) {
918918

919-
pDrm->setMemoryType(INTEL_HWCONFIG_MEMORY_TYPE_HBM2e);
919+
pDrm->setMemoryType(NEO::DeviceBlobConstants::MemoryType::hbm2e);
920920
pPmuInterface->mockPmuReadResult = true;
921921
VariableBackup<L0::Sysman::PmuInterface *> pmuBackup(&pLinuxSysmanImp->pPmuInterface);
922922
pLinuxSysmanImp->pPmuInterface = pPmuInterface.get();
@@ -1158,7 +1158,7 @@ HWTEST2_F(SysmanRasExpMultiDeviceFixture, GivenValidRasHandleWhenCallingzesRasCl
11581158
}
11591159

11601160
HWTEST2_F(SysmanRasExpMultiDeviceFixture, GivenValidRasHandleWhenCallingzesRasClearStateExpAndGetStateExpForHbmThenVerifyErrorCountersAreCleared, IsPVC) {
1161-
pDrm->setMemoryType(INTEL_HWCONFIG_MEMORY_TYPE_HBM2e);
1161+
pDrm->setMemoryType(NEO::DeviceBlobConstants::MemoryType::hbm2e);
11621162
pPmuInterface->mockPmuReadResult = true;
11631163
VariableBackup<L0::Sysman::PmuInterface *> pmuBackup(&pLinuxSysmanImp->pPmuInterface);
11641164
pLinuxSysmanImp->pPmuInterface = pPmuInterface.get();
@@ -1239,4 +1239,4 @@ HWTEST2_F(SysmanRasExpMultiDeviceFixture, GivenValidRasHandleWhenCallingzesRasCl
12391239

12401240
} // namespace ult
12411241
} // namespace Sysman
1242-
} // namespace L0
1242+
} // namespace L0

‎level_zero/tools/source/sysman/memory/linux/os_memory_imp_prelim.cpp‎

Lines changed: 4 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,6 @@
2222
#include "level_zero/tools/source/sysman/linux/os_sysman_imp.h"
2323
#include "level_zero/tools/source/sysman/sysman_const.h"
2424

25-
#include "drm/intel_hwconfig_types.h"
2625
#include "igfxfmid.h"
2726

2827
namespace L0 {
@@ -63,14 +62,14 @@ ze_result_t LinuxMemoryImp::getProperties(zes_mem_properties_t *pProperties) {
6362
pProperties->numChannels = memSystemInfo->getMaxMemoryChannels();
6463
auto memType = memSystemInfo->getMemoryType();
6564
switch (memType) {
66-
case INTEL_HWCONFIG_MEMORY_TYPE_HBM2e:
67-
case INTEL_HWCONFIG_MEMORY_TYPE_HBM2:
65+
case NEO::DeviceBlobConstants::MemoryType::hbm2e:
66+
case NEO::DeviceBlobConstants::MemoryType::hbm2:
6867
pProperties->type = ZES_MEM_TYPE_HBM;
6968
break;
70-
case INTEL_HWCONFIG_MEMORY_TYPE_LPDDR4:
69+
case NEO::DeviceBlobConstants::MemoryType::lpddr4:
7170
pProperties->type = ZES_MEM_TYPE_LPDDR4;
7271
break;
73-
case INTEL_HWCONFIG_MEMORY_TYPE_LPDDR5:
72+
case NEO::DeviceBlobConstants::MemoryType::lpddr5:
7473
pProperties->type = ZES_MEM_TYPE_LPDDR5;
7574
break;
7675
default:

0 commit comments

Comments
 (0)