Media/compute-runtime
1
0
Fork 0
mirror of https://github.com/intel/compute-runtime.git synced 2025-09-15 13:01:45 +08:00
Code Issues Packages Projects Releases Wiki Activity

Device ID Cleanup

Browse Source 
Resolves: NEO-5250

Signed-off-by: Adam Cetnerowski <adam.cetnerowski@intel.com>
This commit is contained in:
Adam Cetnerowski
2020-11-05 15:01:58 +00:00
committed by Compute-Runtime-Automation
parent 152f89f2f2
commit 8c0a97a618
16 changed files with 70 additions and 70 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
opencl/test/unit_test/gen9/bxt/linux/dll/device_id_tests.cpp
View File

@ -15,14 +15,14 @@ using namespace NEO;
TEST(BxtDeviceIdTest, supportedDeviceId) {
std::array<DeviceDescriptor, 8> expectedDescriptors = {{
{IBXT_A_DEVICE_F0_ID, &BXT_1x3x6::hwInfo, &BXT_1x3x6::setupHardwareInfo, GTTYPE_GTA},
{IBXT_C_DEVICE_F0_ID, &BXT_1x3x6::hwInfo, &BXT_1x3x6::setupHardwareInfo, GTTYPE_GTA},
{IBXT_GT_3x6_DEVICE_ID, &BXT_1x3x6::hwInfo, &BXT_1x3x6::setupHardwareInfo, GTTYPE_GTA},
{IBXT_P_3x6_DEVICE_ID, &BXT_1x3x6::hwInfo, &BXT_1x3x6::setupHardwareInfo, GTTYPE_GTA},
{IBXT_P_12EU_3x6_DEVICE_ID, &BXT_1x2x6::hwInfo, &BXT_1x2x6::setupHardwareInfo, GTTYPE_GTA},
{IBXT_PRO_12EU_3x6_DEVICE_ID, &BXT_1x2x6::hwInfo, &BXT_1x2x6::setupHardwareInfo, GTTYPE_GTA},
{IBXT_PRO_3x6_DEVICE_ID, &BXT_1x3x6::hwInfo, &BXT_1x3x6::setupHardwareInfo, GTTYPE_GTA},
{IBXT_X_DEVICE_F0_ID, &BXT_1x3x6::hwInfo, &BXT_1x3x6::setupHardwareInfo, GTTYPE_GTA},
{0x9906, &BXT_1x3x6::hwInfo, &BXT_1x3x6::setupHardwareInfo, GTTYPE_GTA},
{0x9907, &BXT_1x3x6::hwInfo, &BXT_1x3x6::setupHardwareInfo, GTTYPE_GTA},
{0x0A84, &BXT_1x3x6::hwInfo, &BXT_1x3x6::setupHardwareInfo, GTTYPE_GTA},
{0x5A84, &BXT_1x3x6::hwInfo, &BXT_1x3x6::setupHardwareInfo, GTTYPE_GTA},
{0x5A85, &BXT_1x2x6::hwInfo, &BXT_1x2x6::setupHardwareInfo, GTTYPE_GTA},
{0x1A85, &BXT_1x2x6::hwInfo, &BXT_1x2x6::setupHardwareInfo, GTTYPE_GTA},
{0x1A84, &BXT_1x3x6::hwInfo, &BXT_1x3x6::setupHardwareInfo, GTTYPE_GTA},
{0x9908, &BXT_1x3x6::hwInfo, &BXT_1x3x6::setupHardwareInfo, GTTYPE_GTA},
}};
auto compareStructs = [](const DeviceDescriptor *first, const DeviceDescriptor *second) {

10
opencl/test/unit_test/gen9/bxt/linux/hw_info_config_tests.cpp
View File

@ -13,7 +13,7 @@ using namespace NEO;
struct HwInfoConfigTestLinuxBxt : HwInfoConfigTestLinux {
void SetUp() override {
HwInfoConfigTestLinux::SetUp();
drm->StoredDeviceID = IBXT_P_3x6_DEVICE_ID;
drm->StoredDeviceID = 0x5A84;
drm->setGtType(GTTYPE_GTA);
drm->StoredEUVal = 18;
drm->StoredHasPooledEU = 1;
@ -50,8 +50,8 @@ BXTTEST_F(HwInfoConfigTestLinuxBxt, configureHwInfo) {
EXPECT_EQ(0u, outHwInfo.featureTable.ftrGTC);
EXPECT_EQ(0u, outHwInfo.featureTable.ftrGTX);
drm->StoredDeviceID = IBXT_P_12EU_3x6_DEVICE_ID;
drm->setGtType(GTTYPE_GTC); //IBXT_P_12EU_3x6_DEVICE_ID is GTA, but fot test sake make it GTC
drm->StoredDeviceID = 0x5A85;
drm->setGtType(GTTYPE_GTC); //0x5A85 is GTA, but for test make it GTC
drm->StoredMinEUinPool = 6;
drm->StoredDeviceRevID = 4;
ret = hwInfoConfig->configureHwInfo(&pInHwInfo, &outHwInfo, osInterface);
@ -75,8 +75,8 @@ BXTTEST_F(HwInfoConfigTestLinuxBxt, configureHwInfo) {
EXPECT_EQ(1u, outHwInfo.featureTable.ftrGTC);
EXPECT_EQ(0u, outHwInfo.featureTable.ftrGTX);
drm->StoredDeviceID = IBXT_P_12EU_3x6_DEVICE_ID;
drm->setGtType(GTTYPE_GTX); //IBXT_P_12EU_3x6_DEVICE_ID is GTA, but fot test sake make it GTX
drm->StoredDeviceID = 0x5A85;
drm->setGtType(GTTYPE_GTX); //0x5A85 is GTA, but for test make it GTX
drm->StoredMinEUinPool = 9;
ret = hwInfoConfig->configureHwInfo(&pInHwInfo, &outHwInfo, osInterface);
EXPECT_EQ(0, ret);

4
opencl/test/unit_test/gen9/bxt/test_device_caps_bxt.cpp
View File

@ -46,8 +46,8 @@ typedef Test<ClDeviceFixture> BxtUsDeviceIdTest;
BXTTEST_F(BxtUsDeviceIdTest, WhenCheckingIsSimulationThenTrueReturnedOnlyForSimulationId) {
unsigned short bxtSimulationIds[3] = {
IBXT_A_DEVICE_F0_ID,
IBXT_C_DEVICE_F0_ID,
0x9906,
0x9907,
0, // default, non-simulation
};
NEO::MockDevice *mockDevice = nullptr;