Skip to content

Commit dbf2d15

Browse files
feature: add new PVC device id
Related-To: NEO-9736 Signed-off-by: Baj, Tomasz <tomasz.baj@intel.com> Source: 87857a6
1 parent ff07a72 commit dbf2d15

File tree

23 files changed

+176
-31
lines changed

23 files changed

+176
-31
lines changed

cmake/setup_platform_flags.cmake

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
#
2-
# Copyright (C) 2020-2023 Intel Corporation
2+
# Copyright (C) 2020-2024 Intel Corporation
33
#
44
# SPDX-License-Identifier: MIT
55
#
@@ -336,7 +336,7 @@ if(SUPPORT_XE_HPC_CORE)
336336

337337
if(SUPPORT_PVC)
338338
set(PVC_XE_HPC_CORE_REVISIONS 3 47)
339-
set(PVC_XE_HPC_CORE_RELEASES "12.60.0" "12.60.1" "12.60.3" "12.60.5" "12.60.6" "12.60.7")
339+
set(PVC_XE_HPC_CORE_RELEASES "12.60.0" "12.60.1" "12.60.3" "12.60.5" "12.60.6" "12.60.7" "12.61.7")
340340
ADD_PRODUCT("SUPPORTED" "PVC" "IGFX_PVC")
341341
ADD_PLATFORM_FOR_CORE_TYPE("SUPPORTED" "XE_HPC_CORE" "PVC")
342342
ADD_PLATFORM_FOR_CORE_TYPE("SUPPORTED_AUX_TRANSLATION" "XE_HPC_CORE" "PVC")

level_zero/core/test/unit_tests/xe_hpc_core/pvc/test_device_pvc.cpp

Lines changed: 16 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/*
2-
* Copyright (C) 2022-2023 Intel Corporation
2+
* Copyright (C) 2022-2024 Intel Corporation
33
*
44
* SPDX-License-Identifier: MIT
55
*
@@ -89,14 +89,27 @@ PVCTEST_F(DeviceTestPvc, givenPvcXtDeviceIdAndRevIdWhenGetDeviceIpVersion) {
8989
ze_device_ip_version_ext_t zeDeviceIpVersion = {ZE_STRUCTURE_TYPE_DEVICE_IP_VERSION_EXT};
9090
zeDeviceIpVersion.ipVersion = std::numeric_limits<uint32_t>::max();
9191
deviceProperties.pNext = &zeDeviceIpVersion;
92-
std::vector<std::pair<uint32_t, AOT::PRODUCT_CONFIG>> pvcValues = {
92+
std::vector<std::pair<uint32_t, AOT::PRODUCT_CONFIG>> pvcXtValues = {
9393
{0x3, AOT::PVC_XT_A0},
9494
{0x5, AOT::PVC_XT_B0},
9595
{0x6, AOT::PVC_XT_B1},
9696
{0x7, AOT::PVC_XT_C0}};
9797

98+
std::vector<std::pair<uint32_t, AOT::PRODUCT_CONFIG>> pvcXtVgValues = {{0x7, AOT::PVC_XT_C0_VG}};
99+
98100
for (const auto &deviceId : pvcXtDeviceIds) {
99-
for (const auto &[revId, config] : pvcValues) {
101+
for (const auto &[revId, config] : pvcXtValues) {
102+
device->getNEODevice()->getRootDeviceEnvironment().getMutableHardwareInfo()->platform.usDeviceID = deviceId;
103+
device->getNEODevice()->getRootDeviceEnvironment().getMutableHardwareInfo()->platform.usRevId = revId;
104+
device->getProperties(&deviceProperties);
105+
106+
EXPECT_NE(std::numeric_limits<uint32_t>::max(), zeDeviceIpVersion.ipVersion);
107+
EXPECT_EQ(config, zeDeviceIpVersion.ipVersion);
108+
}
109+
}
110+
111+
for (const auto &deviceId : pvcXtVgDeviceIds) {
112+
for (const auto &[revId, config] : pvcXtVgValues) {
100113
device->getNEODevice()->getRootDeviceEnvironment().getMutableHardwareInfo()->platform.usDeviceID = deviceId;
101114
device->getNEODevice()->getRootDeviceEnvironment().getMutableHardwareInfo()->platform.usRevId = revId;
102115
device->getProperties(&deviceProperties);

manifests/manifest.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -42,7 +42,7 @@ components:
4242
dest_dir: kernels_bin
4343
type: git
4444
branch: kernels_bin
45-
revision: 2211-1175
45+
revision: 2211-1237
4646
kmdaf:
4747
branch: kmdaf
4848
dest_dir: kmdaf

opencl/test/unit_test/offline_compiler/xe_hpc_core/pvc/offline_compiler_tests_pvc.cpp

Lines changed: 27 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/*
2-
* Copyright (C) 2022-2023 Intel Corporation
2+
* Copyright (C) 2022-2024 Intel Corporation
33
*
44
* SPDX-License-Identifier: MIT
55
*
@@ -61,6 +61,32 @@ PVCTEST_F(PvcOfflineCompilerTests, givenPvcDeviceAndRevisionIdValueWhenInitHwInf
6161
}
6262
}
6363

64+
PVCTEST_F(PvcOfflineCompilerTests, givenPvcXtVgDeviceAndRevisionIdValueWhenInitHwInfoThenCorrectValuesAreSet) {
65+
MockOfflineCompiler mockOfflineCompiler;
66+
67+
std::string deviceStr;
68+
auto deviceID = pvcXtVgDeviceIds.front();
69+
70+
HardwareIpVersion config = AOT::PVC_XT_C0_VG;
71+
int revisionID = 0x2f;
72+
73+
std::stringstream deviceIDStr, expectedOutput;
74+
mockOfflineCompiler.revisionId = revisionID;
75+
76+
deviceIDStr << "0x" << std::hex << deviceID;
77+
deviceStr = mockOfflineCompiler.argHelper->productConfigHelper->getAcronymForProductConfig(config.value);
78+
79+
testing::internal::CaptureStdout();
80+
mockOfflineCompiler.initHardwareInfo(deviceIDStr.str());
81+
std::string output = testing::internal::GetCapturedStdout();
82+
expectedOutput << "Auto-detected target based on " << deviceIDStr.str() << " device id: " << deviceStr << "\n";
83+
84+
EXPECT_STREQ(output.c_str(), expectedOutput.str().c_str());
85+
EXPECT_EQ(mockOfflineCompiler.hwInfo.platform.usDeviceID, deviceID);
86+
EXPECT_EQ(mockOfflineCompiler.hwInfo.platform.usRevId, revisionID);
87+
EXPECT_EQ(mockOfflineCompiler.deviceConfig, config.value);
88+
}
89+
6490
PVCTEST_F(PvcOfflineCompilerTests, givenPvcXtDeviceAndUnknownRevisionIdValueWhenInitHwInfoThenDefaultConfigIsSet) {
6591
MockOfflineCompiler mockOfflineCompiler;
6692
mockOfflineCompiler.argHelper->getPrinterRef().setSuppressMessages(true);

opencl/test/unit_test/xe_hpc_core/pvc/linux/dll/device_id_tests_pvc.cpp

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/*
2-
* Copyright (C) 2021-2023 Intel Corporation
2+
* Copyright (C) 2021-2024 Intel Corporation
33
*
44
* SPDX-License-Identifier: MIT
55
*
@@ -10,7 +10,7 @@
1010
using namespace NEO;
1111

1212
PVCTEST_F(DeviceIdTests, GivenPvcSupportedDeviceIdThenConfigIsCorrect) {
13-
std::array<DeviceDescriptor, 10> expectedDescriptors = {{
13+
std::array<DeviceDescriptor, 11> expectedDescriptors = {{
1414
{0x0BD0, &PvcHwConfig::hwInfo, &PvcHwConfig::setupHardwareInfo},
1515
{0x0BD5, &PvcHwConfig::hwInfo, &PvcHwConfig::setupHardwareInfo},
1616
{0x0BD6, &PvcHwConfig::hwInfo, &PvcHwConfig::setupHardwareInfo},
@@ -21,6 +21,7 @@ PVCTEST_F(DeviceIdTests, GivenPvcSupportedDeviceIdThenConfigIsCorrect) {
2121
{0x0BDB, &PvcHwConfig::hwInfo, &PvcHwConfig::setupHardwareInfo},
2222
{0x0B69, &PvcHwConfig::hwInfo, &PvcHwConfig::setupHardwareInfo},
2323
{0x0B6E, &PvcHwConfig::hwInfo, &PvcHwConfig::setupHardwareInfo},
24+
{0x0BD4, &PvcHwConfig::hwInfo, &PvcHwConfig::setupHardwareInfo},
2425
}};
2526

2627
testImpl(expectedDescriptors);

shared/offline_compiler/source/CMakeLists.txt

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
#
2-
# Copyright (C) 2020-2023 Intel Corporation
2+
# Copyright (C) 2020-2024 Intel Corporation
33
#
44
# SPDX-License-Identifier: MIT
55
#
@@ -73,6 +73,7 @@ set(CLOC_LIB_SRCS_LIB
7373
${NEO_SHARED_DIRECTORY}/release_helper/release_helper_1256.cpp
7474
${NEO_SHARED_DIRECTORY}/release_helper/release_helper_1257.cpp
7575
${NEO_SHARED_DIRECTORY}/release_helper/release_helper_1260.cpp
76+
${NEO_SHARED_DIRECTORY}/release_helper/release_helper_1261.cpp
7677
${NEO_SHARED_DIRECTORY}/release_helper/release_helper_1270.cpp
7778
${NEO_SHARED_DIRECTORY}/release_helper/release_helper_1271.cpp
7879
${NEO_SHARED_DIRECTORY}/release_helper/release_helper_1274.cpp

shared/source/dll/devices/devices_base.inl

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -17,6 +17,7 @@ NAMEDDEVICE(0x0BDA, PvcHwConfig, "Intel(R) Data Center GPU Max 1100")
1717
NAMEDDEVICE(0x0BDB, PvcHwConfig, "Intel(R) Data Center GPU Max 1100")
1818
NAMEDDEVICE(0x0B69, PvcHwConfig, "Intel(R) Data Center GPU Max 1450")
1919
NAMEDDEVICE(0x0B6E, PvcHwConfig, "Intel(R) Data Center GPU Max 1100C")
20+
NAMEDDEVICE(0x0BD4, PvcHwConfig, "Intel(R) Data Center GPU Max 1550VG")
2021
#endif
2122
#endif
2223

shared/source/dll/devices/product_config_base.inl

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/*
2-
* Copyright (C) 2021-2023 Intel Corporation
2+
* Copyright (C) 2021-2024 Intel Corporation
33
*
44
* SPDX-License-Identifier: MIT
55
*
@@ -13,6 +13,7 @@ DEVICE_CONFIG(PVC_XT_A0, PvcHwConfig, pvcXtDeviceIds, XE_FAMILY, XE_HPC_RELEASE)
1313
DEVICE_CONFIG(PVC_XT_B0, PvcHwConfig, pvcXtDeviceIds, XE_FAMILY, XE_HPC_RELEASE)
1414
DEVICE_CONFIG(PVC_XT_B1, PvcHwConfig, pvcXtDeviceIds, XE_FAMILY, XE_HPC_RELEASE)
1515
DEVICE_CONFIG(PVC_XT_C0, PvcHwConfig, pvcXtDeviceIds, XE_FAMILY, XE_HPC_RELEASE)
16+
DEVICE_CONFIG(PVC_XT_C0_VG, PvcHwConfig, pvcXtVgDeviceIds, XE_FAMILY, XE_HPC_RELEASE)
1617

1718
#endif
1819
#endif

shared/source/release_helper/CMakeLists.txt

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
#
2-
# Copyright (C) 2023 Intel Corporation
2+
# Copyright (C) 2023-2024 Intel Corporation
33
#
44
# SPDX-License-Identifier: MIT
55
#
@@ -21,6 +21,7 @@ if(SUPPORT_XE_HPG_CORE OR SUPPORT_XE_HPC_CORE)
2121
${CMAKE_CURRENT_SOURCE_DIR}/release_helper_1256.cpp
2222
${CMAKE_CURRENT_SOURCE_DIR}/release_helper_1257.cpp
2323
${CMAKE_CURRENT_SOURCE_DIR}/release_helper_1260.cpp
24+
${CMAKE_CURRENT_SOURCE_DIR}/release_helper_1261.cpp
2425
${CMAKE_CURRENT_SOURCE_DIR}/release_helper_1270.cpp
2526
${CMAKE_CURRENT_SOURCE_DIR}/release_helper_1271.cpp
2627
${CMAKE_CURRENT_SOURCE_DIR}/release_helper_1274.cpp

shared/source/release_helper/definitions/release_definitions.h

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/*
2-
* Copyright (C) 2023 Intel Corporation
2+
* Copyright (C) 2023-2024 Intel Corporation
33
*
44
* SPDX-License-Identifier: MIT
55
*
@@ -14,6 +14,7 @@ enum class ReleaseType {
1414
release1256,
1515
release1257,
1616
release1260,
17+
release1261,
1718
release1270,
1819
release1271,
1920
release1274,

0 commit comments

Comments
 (0)