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

Refactoring the use of PVC device ids

Browse Source 
Replacing the old device id implementation
& clearing PVC XT temporary.

Related-To: NEO-6742
Signed-off-by: Daria Hinz <daria.hinz@intel.com>
This commit is contained in:
Daria Hinz
2022-02-22 18:16:19 +00:00
committed by Compute-Runtime-Automation
parent b79d9a8e10
commit 452050ae40
27 changed files with 219 additions and 318 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
level_zero/tools/test/unit_tests/sources/metrics/linux/test_metric_ip_sampling_linux_pvc_prelim.cpp
View File

@@ -16,6 +16,7 @@
#include "level_zero/core/test/unit_tests/fixtures/device_fixture.h"
#include "level_zero/tools/source/metrics/os_metric_ip_sampling.h"
#include "device_ids_configs.h"
#include "hw_cmds.h"
namespace NEO {
@@ -274,7 +275,7 @@ HWTEST2_F(MetricIpSamplingLinuxTestPrelim, GivenSupportedProductFamilyAndUnsuppo
auto hwInfo = neoDevice->getRootDeviceEnvironment().getMutableHardwareInfo();
hwInfo->platform.eProductFamily = productFamily;
hwInfo->platform.usDeviceID = NEO::XE_HPC_CORE::pvcXlDeviceId;
hwInfo->platform.usDeviceID = NEO::PVC_XL_IDS.front();
EXPECT_FALSE(metricIpSamplingOsInterface->isDependencyAvailable());
}
@@ -283,14 +284,7 @@ HWTEST2_F(MetricIpSamplingLinuxTestPrelim, GivenSupportedProductFamilyAndSupport
auto hwInfo = neoDevice->getRootDeviceEnvironment().getMutableHardwareInfo();
hwInfo->platform.eProductFamily = productFamily;
const std::vector<uint32_t> supportedDeviceIds = {
NEO::XE_HPC_CORE::pvcXtDeviceIds[0],
NEO::XE_HPC_CORE::pvcXtDeviceIds[1],
NEO::XE_HPC_CORE::pvcXtDeviceIds[2],
NEO::XE_HPC_CORE::pvcXtDeviceIds[3],
NEO::XE_HPC_CORE::pvcXtDeviceIds[4]};
for (uint32_t deviceId : supportedDeviceIds) {
for (auto deviceId : NEO::PVC_XT_IDS) {
hwInfo->platform.usDeviceID = deviceId;
EXPECT_TRUE(metricIpSamplingOsInterface->isDependencyAvailable());
}
@@ -300,7 +294,7 @@ HWTEST2_F(MetricIpSamplingLinuxTestPrelim, GivenDriverOpenFailsWhenIsDependencyA
auto hwInfo = neoDevice->getRootDeviceEnvironment().getMutableHardwareInfo();
hwInfo->platform.eProductFamily = productFamily;
hwInfo->platform.usDeviceID = NEO::XE_HPC_CORE::pvcXtDeviceIds[0];
hwInfo->platform.usDeviceID = NEO::PVC_XT_IDS.front();
auto drm = static_cast<DrmPrelimMock *>(device->getOsInterface().getDriverModel()->as<NEO::Drm>());
VariableBackup<int> backupCsTimeStampFrequency(&drm->storedCsTimestampFrequency, 0);
@@ -313,7 +307,7 @@ HWTEST2_F(MetricIpSamplingLinuxTestPrelim, GivenIoctlHelperFailsWhenIsDependency
auto hwInfo = neoDevice->getRootDeviceEnvironment().getMutableHardwareInfo();
hwInfo->platform.eProductFamily = productFamily;
hwInfo->platform.usDeviceID = NEO::XE_HPC_CORE::pvcXtDeviceIds[0];
hwInfo->platform.usDeviceID = NEO::PVC_XT_IDS.front();
auto drm = static_cast<DrmPrelimMock *>(device->getOsInterface().getDriverModel()->as<NEO::Drm>());

9
level_zero/tools/test/unit_tests/sources/metrics/linux/test_metric_ip_sampling_linux_pvc_upstream.cpp
View File

@@ -51,14 +51,7 @@ HWTEST2_F(MetricIpSamplingLinuxTestUpstream, GivenSupportedProductFamilyAndSuppo
auto hwInfo = neoDevice->getRootDeviceEnvironment().getMutableHardwareInfo();
hwInfo->platform.eProductFamily = productFamily;
const std::vector<uint32_t> supportedDeviceIds = {
NEO::XE_HPC_CORE::pvcXtDeviceIds[0],
NEO::XE_HPC_CORE::pvcXtDeviceIds[1],
NEO::XE_HPC_CORE::pvcXtDeviceIds[2],
NEO::XE_HPC_CORE::pvcXtDeviceIds[3],
NEO::XE_HPC_CORE::pvcXtDeviceIds[4]};
for (uint32_t deviceId : supportedDeviceIds) {
for (auto deviceId : NEO::PVC_XT_IDS) {
hwInfo->platform.usDeviceID = deviceId;
EXPECT_FALSE(metricIpSamplingOsInterface->isDependencyAvailable());
}