mirror of
https://github.com/intel/compute-runtime.git
synced 2025-09-15 13:01:45 +08:00
Remove not used GT type info
Signed-off-by: Bartosz Dunajski <bartosz.dunajski@intel.com>
This commit is contained in:
Bartosz Dunajski
committed by
Compute-Runtime-Automation
Compute-Runtime-Automation
parent
a5067d6b0b
commit
72edadb265
@ -1,5 +1,5 @@
|
||||
/*
|
||||
* Copyright (C) 2018-2021 Intel Corporation
|
||||
* Copyright (C) 2018-2022 Intel Corporation
|
||||
*
|
||||
* SPDX-License-Identifier: MIT
|
||||
*
|
||||
@ -11,14 +11,14 @@ using namespace NEO;
|
||||
|
||||
TEST_F(DeviceIdTests, GivenBxtSupportedDeviceIdThenHardwareInfoIsCorrect) {
|
||||
std::array<DeviceDescriptor, 8> expectedDescriptors = {{
|
||||
{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},
|
||||
{0x9906, &BXT_1x3x6::hwInfo, &BXT_1x3x6::setupHardwareInfo},
|
||||
{0x9907, &BXT_1x3x6::hwInfo, &BXT_1x3x6::setupHardwareInfo},
|
||||
{0x0A84, &BXT_1x3x6::hwInfo, &BXT_1x3x6::setupHardwareInfo},
|
||||
{0x5A84, &BXT_1x3x6::hwInfo, &BXT_1x3x6::setupHardwareInfo},
|
||||
{0x5A85, &BXT_1x2x6::hwInfo, &BXT_1x2x6::setupHardwareInfo},
|
||||
{0x1A85, &BXT_1x2x6::hwInfo, &BXT_1x2x6::setupHardwareInfo},
|
||||
{0x1A84, &BXT_1x3x6::hwInfo, &BXT_1x3x6::setupHardwareInfo},
|
||||
{0x9908, &BXT_1x3x6::hwInfo, &BXT_1x3x6::setupHardwareInfo},
|
||||
}};
|
||||
|
||||
testImpl(expectedDescriptors);
|
||||
|
||||
@ -1,5 +1,5 @@
|
||||
/*
|
||||
* Copyright (C) 2018-2021 Intel Corporation
|
||||
* Copyright (C) 2018-2022 Intel Corporation
|
||||
*
|
||||
* SPDX-License-Identifier: MIT
|
||||
*
|
||||
@ -15,7 +15,7 @@ struct HwInfoConfigTestLinuxBxt : HwInfoConfigTestLinux {
|
||||
void SetUp() override {
|
||||
HwInfoConfigTestLinux::SetUp();
|
||||
drm->storedDeviceID = 0x5A84;
|
||||
drm->setGtType(GTTYPE_GTA);
|
||||
|
||||
drm->storedEUVal = 18;
|
||||
drm->storedHasPooledEU = 1;
|
||||
drm->storedMinEUinPool = 3;
|
||||
@ -41,18 +41,7 @@ BXTTEST_F(HwInfoConfigTestLinuxBxt, WhenConfiguringHwInfoThenConfigIsCorrect) {
|
||||
EXPECT_EQ(1u, outHwInfo.gtSystemInfo.VEBoxInfo.Instances.Bits.VEBox0Enabled);
|
||||
EXPECT_TRUE(outHwInfo.gtSystemInfo.VEBoxInfo.IsValid);
|
||||
|
||||
EXPECT_EQ(GTTYPE_GTA, outHwInfo.platform.eGTType);
|
||||
EXPECT_EQ(0u, outHwInfo.featureTable.flags.ftrGT1);
|
||||
EXPECT_EQ(0u, outHwInfo.featureTable.flags.ftrGT1_5);
|
||||
EXPECT_EQ(0u, outHwInfo.featureTable.flags.ftrGT2);
|
||||
EXPECT_EQ(0u, outHwInfo.featureTable.flags.ftrGT3);
|
||||
EXPECT_EQ(0u, outHwInfo.featureTable.flags.ftrGT4);
|
||||
EXPECT_EQ(1u, outHwInfo.featureTable.flags.ftrGTA);
|
||||
EXPECT_EQ(0u, outHwInfo.featureTable.flags.ftrGTC);
|
||||
EXPECT_EQ(0u, outHwInfo.featureTable.flags.ftrGTX);
|
||||
|
||||
drm->storedDeviceID = 0x5A85;
|
||||
drm->setGtType(GTTYPE_GTC); //0x5A85 is GTA, but for test make it GTC
|
||||
drm->storedMinEUinPool = 6;
|
||||
drm->storedDeviceRevID = 4;
|
||||
ret = hwInfoConfig->configureHwInfoDrm(&pInHwInfo, &outHwInfo, osInterface);
|
||||
@ -66,18 +55,7 @@ BXTTEST_F(HwInfoConfigTestLinuxBxt, WhenConfiguringHwInfoThenConfigIsCorrect) {
|
||||
EXPECT_EQ((outHwInfo.gtSystemInfo.EUCount - outHwInfo.gtSystemInfo.EuCountPerPoolMin), outHwInfo.gtSystemInfo.EuCountPerPoolMax);
|
||||
EXPECT_EQ(aub_stream::ENGINE_RCS, outHwInfo.capabilityTable.defaultEngineType);
|
||||
|
||||
EXPECT_EQ(GTTYPE_GTC, outHwInfo.platform.eGTType);
|
||||
EXPECT_EQ(0u, outHwInfo.featureTable.flags.ftrGT1);
|
||||
EXPECT_EQ(0u, outHwInfo.featureTable.flags.ftrGT1_5);
|
||||
EXPECT_EQ(0u, outHwInfo.featureTable.flags.ftrGT2);
|
||||
EXPECT_EQ(0u, outHwInfo.featureTable.flags.ftrGT3);
|
||||
EXPECT_EQ(0u, outHwInfo.featureTable.flags.ftrGT4);
|
||||
EXPECT_EQ(0u, outHwInfo.featureTable.flags.ftrGTA);
|
||||
EXPECT_EQ(1u, outHwInfo.featureTable.flags.ftrGTC);
|
||||
EXPECT_EQ(0u, outHwInfo.featureTable.flags.ftrGTX);
|
||||
|
||||
drm->storedDeviceID = 0x5A85;
|
||||
drm->setGtType(GTTYPE_GTX); //0x5A85 is GTA, but for test make it GTX
|
||||
drm->storedMinEUinPool = 9;
|
||||
ret = hwInfoConfig->configureHwInfoDrm(&pInHwInfo, &outHwInfo, osInterface);
|
||||
EXPECT_EQ(0, ret);
|
||||
@ -90,16 +68,6 @@ BXTTEST_F(HwInfoConfigTestLinuxBxt, WhenConfiguringHwInfoThenConfigIsCorrect) {
|
||||
EXPECT_EQ((outHwInfo.gtSystemInfo.EUCount - outHwInfo.gtSystemInfo.EuCountPerPoolMin), outHwInfo.gtSystemInfo.EuCountPerPoolMax);
|
||||
EXPECT_EQ(aub_stream::ENGINE_RCS, outHwInfo.capabilityTable.defaultEngineType);
|
||||
|
||||
EXPECT_EQ(GTTYPE_GTX, outHwInfo.platform.eGTType);
|
||||
EXPECT_EQ(0u, outHwInfo.featureTable.flags.ftrGT1);
|
||||
EXPECT_EQ(0u, outHwInfo.featureTable.flags.ftrGT1_5);
|
||||
EXPECT_EQ(0u, outHwInfo.featureTable.flags.ftrGT2);
|
||||
EXPECT_EQ(0u, outHwInfo.featureTable.flags.ftrGT3);
|
||||
EXPECT_EQ(0u, outHwInfo.featureTable.flags.ftrGT4);
|
||||
EXPECT_EQ(0u, outHwInfo.featureTable.flags.ftrGTA);
|
||||
EXPECT_EQ(0u, outHwInfo.featureTable.flags.ftrGTC);
|
||||
EXPECT_EQ(1u, outHwInfo.featureTable.flags.ftrGTX);
|
||||
|
||||
auto &outKmdNotifyProperties = outHwInfo.capabilityTable.kmdNotifyProperties;
|
||||
EXPECT_TRUE(outKmdNotifyProperties.enableKmdNotify);
|
||||
EXPECT_EQ(50000, outKmdNotifyProperties.delayKmdNotifyMicroseconds);
|
||||
@ -222,7 +190,7 @@ TYPED_TEST(BxtHwInfoTests, WhenConfiguringHwInfoThenConfigIsCorrect) {
|
||||
executionEnvironment->rootDeviceEnvironments[0]->setHwInfo(defaultHwInfo.get());
|
||||
DrmMock drm(*executionEnvironment->rootDeviceEnvironments[0]);
|
||||
GT_SYSTEM_INFO >SystemInfo = hwInfo.gtSystemInfo;
|
||||
DeviceDescriptor device = {0, &hwInfo, &TypeParam::setupHardwareInfo, GTTYPE_GT1};
|
||||
DeviceDescriptor device = {0, &hwInfo, &TypeParam::setupHardwareInfo};
|
||||
|
||||
int ret = drm.setupHardwareInfo(&device, false);
|
||||
|
||||
|
||||
@ -1,5 +1,5 @@
|
||||
/*
|
||||
* Copyright (C) 2018-2021 Intel Corporation
|
||||
* Copyright (C) 2018-2022 Intel Corporation
|
||||
*
|
||||
* SPDX-License-Identifier: MIT
|
||||
*
|
||||
@ -11,54 +11,54 @@ using namespace NEO;
|
||||
|
||||
TEST_F(DeviceIdTests, GivenCflSupportedDeviceIdThenHardwareInfoIsCorrect) {
|
||||
std::array<DeviceDescriptor, 42> expectedDescriptors = {{
|
||||
{0x3E90, &CFL_1x2x6::hwInfo, &CFL_1x2x6::setupHardwareInfo, GTTYPE_GT1},
|
||||
{0x3E93, &CFL_1x2x6::hwInfo, &CFL_1x2x6::setupHardwareInfo, GTTYPE_GT1},
|
||||
{0x3EA4, &CFL_1x2x6::hwInfo, &CFL_1x2x6::setupHardwareInfo, GTTYPE_GT1},
|
||||
{0x3E99, &CFL_1x2x6::hwInfo, &CFL_1x2x6::setupHardwareInfo, GTTYPE_GT1},
|
||||
{0x3EA1, &CFL_1x2x6::hwInfo, &CFL_1x2x6::setupHardwareInfo, GTTYPE_GT1},
|
||||
{0x3E90, &CFL_1x2x6::hwInfo, &CFL_1x2x6::setupHardwareInfo},
|
||||
{0x3E93, &CFL_1x2x6::hwInfo, &CFL_1x2x6::setupHardwareInfo},
|
||||
{0x3EA4, &CFL_1x2x6::hwInfo, &CFL_1x2x6::setupHardwareInfo},
|
||||
{0x3E99, &CFL_1x2x6::hwInfo, &CFL_1x2x6::setupHardwareInfo},
|
||||
{0x3EA1, &CFL_1x2x6::hwInfo, &CFL_1x2x6::setupHardwareInfo},
|
||||
|
||||
{0x3E92, &CFL_1x3x8::hwInfo, &CFL_1x3x8::setupHardwareInfo, GTTYPE_GT2},
|
||||
{0x3E9B, &CFL_1x3x8::hwInfo, &CFL_1x3x8::setupHardwareInfo, GTTYPE_GT2},
|
||||
{0x3E94, &CFL_1x3x8::hwInfo, &CFL_1x3x8::setupHardwareInfo, GTTYPE_GT2},
|
||||
{0x3E91, &CFL_1x3x8::hwInfo, &CFL_1x3x8::setupHardwareInfo, GTTYPE_GT2},
|
||||
{0x3E96, &CFL_1x3x8::hwInfo, &CFL_1x3x8::setupHardwareInfo, GTTYPE_GT2},
|
||||
{0x3E9A, &CFL_1x3x8::hwInfo, &CFL_1x3x8::setupHardwareInfo, GTTYPE_GT2},
|
||||
{0x3EA3, &CFL_1x3x8::hwInfo, &CFL_1x3x8::setupHardwareInfo, GTTYPE_GT2},
|
||||
{0x3EA9, &CFL_1x3x8::hwInfo, &CFL_1x3x8::setupHardwareInfo, GTTYPE_GT2},
|
||||
{0x3EA0, &CFL_1x3x8::hwInfo, &CFL_1x3x8::setupHardwareInfo, GTTYPE_GT2},
|
||||
{0x3E98, &CFL_1x3x8::hwInfo, &CFL_1x3x8::setupHardwareInfo, GTTYPE_GT2},
|
||||
{0x3E92, &CFL_1x3x8::hwInfo, &CFL_1x3x8::setupHardwareInfo},
|
||||
{0x3E9B, &CFL_1x3x8::hwInfo, &CFL_1x3x8::setupHardwareInfo},
|
||||
{0x3E94, &CFL_1x3x8::hwInfo, &CFL_1x3x8::setupHardwareInfo},
|
||||
{0x3E91, &CFL_1x3x8::hwInfo, &CFL_1x3x8::setupHardwareInfo},
|
||||
{0x3E96, &CFL_1x3x8::hwInfo, &CFL_1x3x8::setupHardwareInfo},
|
||||
{0x3E9A, &CFL_1x3x8::hwInfo, &CFL_1x3x8::setupHardwareInfo},
|
||||
{0x3EA3, &CFL_1x3x8::hwInfo, &CFL_1x3x8::setupHardwareInfo},
|
||||
{0x3EA9, &CFL_1x3x8::hwInfo, &CFL_1x3x8::setupHardwareInfo},
|
||||
{0x3EA0, &CFL_1x3x8::hwInfo, &CFL_1x3x8::setupHardwareInfo},
|
||||
{0x3E98, &CFL_1x3x8::hwInfo, &CFL_1x3x8::setupHardwareInfo},
|
||||
|
||||
{0x3E95, &CFL_2x3x8::hwInfo, &CFL_2x3x8::setupHardwareInfo, GTTYPE_GT3},
|
||||
{0x3EA6, &CFL_2x3x8::hwInfo, &CFL_2x3x8::setupHardwareInfo, GTTYPE_GT3},
|
||||
{0x3EA7, &CFL_2x3x8::hwInfo, &CFL_2x3x8::setupHardwareInfo, GTTYPE_GT3},
|
||||
{0x3EA8, &CFL_2x3x8::hwInfo, &CFL_2x3x8::setupHardwareInfo, GTTYPE_GT3},
|
||||
{0x3EA5, &CFL_2x3x8::hwInfo, &CFL_2x3x8::setupHardwareInfo, GTTYPE_GT3},
|
||||
{0x3EA2, &CFL_2x3x8::hwInfo, &CFL_2x3x8::setupHardwareInfo, GTTYPE_GT3},
|
||||
{0x3E95, &CFL_2x3x8::hwInfo, &CFL_2x3x8::setupHardwareInfo},
|
||||
{0x3EA6, &CFL_2x3x8::hwInfo, &CFL_2x3x8::setupHardwareInfo},
|
||||
{0x3EA7, &CFL_2x3x8::hwInfo, &CFL_2x3x8::setupHardwareInfo},
|
||||
{0x3EA8, &CFL_2x3x8::hwInfo, &CFL_2x3x8::setupHardwareInfo},
|
||||
{0x3EA5, &CFL_2x3x8::hwInfo, &CFL_2x3x8::setupHardwareInfo},
|
||||
{0x3EA2, &CFL_2x3x8::hwInfo, &CFL_2x3x8::setupHardwareInfo},
|
||||
|
||||
// CML GT1
|
||||
{0x9B21, &CFL_1x2x6::hwInfo, &CFL_1x2x6::setupHardwareInfo, GTTYPE_GT1},
|
||||
{0x9BAA, &CFL_1x2x6::hwInfo, &CFL_1x2x6::setupHardwareInfo, GTTYPE_GT1},
|
||||
{0x9BAB, &CFL_1x2x6::hwInfo, &CFL_1x2x6::setupHardwareInfo, GTTYPE_GT1},
|
||||
{0x9BAC, &CFL_1x2x6::hwInfo, &CFL_1x2x6::setupHardwareInfo, GTTYPE_GT1},
|
||||
{0x9BA0, &CFL_1x2x6::hwInfo, &CFL_1x2x6::setupHardwareInfo, GTTYPE_GT1},
|
||||
{0x9BA5, &CFL_1x2x6::hwInfo, &CFL_1x2x6::setupHardwareInfo, GTTYPE_GT1},
|
||||
{0x9BA8, &CFL_1x2x6::hwInfo, &CFL_1x2x6::setupHardwareInfo, GTTYPE_GT1},
|
||||
{0x9BA4, &CFL_1x2x6::hwInfo, &CFL_1x2x6::setupHardwareInfo, GTTYPE_GT1},
|
||||
{0x9BA2, &CFL_1x2x6::hwInfo, &CFL_1x2x6::setupHardwareInfo, GTTYPE_GT1},
|
||||
{0x9B21, &CFL_1x2x6::hwInfo, &CFL_1x2x6::setupHardwareInfo},
|
||||
{0x9BAA, &CFL_1x2x6::hwInfo, &CFL_1x2x6::setupHardwareInfo},
|
||||
{0x9BAB, &CFL_1x2x6::hwInfo, &CFL_1x2x6::setupHardwareInfo},
|
||||
{0x9BAC, &CFL_1x2x6::hwInfo, &CFL_1x2x6::setupHardwareInfo},
|
||||
{0x9BA0, &CFL_1x2x6::hwInfo, &CFL_1x2x6::setupHardwareInfo},
|
||||
{0x9BA5, &CFL_1x2x6::hwInfo, &CFL_1x2x6::setupHardwareInfo},
|
||||
{0x9BA8, &CFL_1x2x6::hwInfo, &CFL_1x2x6::setupHardwareInfo},
|
||||
{0x9BA4, &CFL_1x2x6::hwInfo, &CFL_1x2x6::setupHardwareInfo},
|
||||
{0x9BA2, &CFL_1x2x6::hwInfo, &CFL_1x2x6::setupHardwareInfo},
|
||||
// CML GT2
|
||||
{0x9B41, &CFL_1x3x8::hwInfo, &CFL_1x3x8::setupHardwareInfo, GTTYPE_GT2},
|
||||
{0x9BCA, &CFL_1x3x8::hwInfo, &CFL_1x3x8::setupHardwareInfo, GTTYPE_GT2},
|
||||
{0x9BCB, &CFL_1x3x8::hwInfo, &CFL_1x3x8::setupHardwareInfo, GTTYPE_GT2},
|
||||
{0x9BCC, &CFL_1x3x8::hwInfo, &CFL_1x3x8::setupHardwareInfo, GTTYPE_GT2},
|
||||
{0x9BC0, &CFL_1x3x8::hwInfo, &CFL_1x3x8::setupHardwareInfo, GTTYPE_GT2},
|
||||
{0x9BC5, &CFL_1x3x8::hwInfo, &CFL_1x3x8::setupHardwareInfo, GTTYPE_GT2},
|
||||
{0x9BC8, &CFL_1x3x8::hwInfo, &CFL_1x3x8::setupHardwareInfo, GTTYPE_GT2},
|
||||
{0x9BC4, &CFL_1x3x8::hwInfo, &CFL_1x3x8::setupHardwareInfo, GTTYPE_GT2},
|
||||
{0x9BC2, &CFL_1x3x8::hwInfo, &CFL_1x3x8::setupHardwareInfo, GTTYPE_GT2},
|
||||
{0x9B41, &CFL_1x3x8::hwInfo, &CFL_1x3x8::setupHardwareInfo},
|
||||
{0x9BCA, &CFL_1x3x8::hwInfo, &CFL_1x3x8::setupHardwareInfo},
|
||||
{0x9BCB, &CFL_1x3x8::hwInfo, &CFL_1x3x8::setupHardwareInfo},
|
||||
{0x9BCC, &CFL_1x3x8::hwInfo, &CFL_1x3x8::setupHardwareInfo},
|
||||
{0x9BC0, &CFL_1x3x8::hwInfo, &CFL_1x3x8::setupHardwareInfo},
|
||||
{0x9BC5, &CFL_1x3x8::hwInfo, &CFL_1x3x8::setupHardwareInfo},
|
||||
{0x9BC8, &CFL_1x3x8::hwInfo, &CFL_1x3x8::setupHardwareInfo},
|
||||
{0x9BC4, &CFL_1x3x8::hwInfo, &CFL_1x3x8::setupHardwareInfo},
|
||||
{0x9BC2, &CFL_1x3x8::hwInfo, &CFL_1x3x8::setupHardwareInfo},
|
||||
// CML WORKSTATION
|
||||
{0x9BC6, &CFL_1x3x8::hwInfo, &CFL_1x3x8::setupHardwareInfo, GTTYPE_GT2},
|
||||
{0x9BE6, &CFL_1x3x8::hwInfo, &CFL_1x3x8::setupHardwareInfo, GTTYPE_GT2},
|
||||
{0x9BF6, &CFL_1x3x8::hwInfo, &CFL_1x3x8::setupHardwareInfo, GTTYPE_GT2},
|
||||
{0x9BC6, &CFL_1x3x8::hwInfo, &CFL_1x3x8::setupHardwareInfo},
|
||||
{0x9BE6, &CFL_1x3x8::hwInfo, &CFL_1x3x8::setupHardwareInfo},
|
||||
{0x9BF6, &CFL_1x3x8::hwInfo, &CFL_1x3x8::setupHardwareInfo},
|
||||
}};
|
||||
|
||||
testImpl(expectedDescriptors);
|
||||
|
||||
@ -1,5 +1,5 @@
|
||||
/*
|
||||
* Copyright (C) 2018-2021 Intel Corporation
|
||||
* Copyright (C) 2018-2022 Intel Corporation
|
||||
*
|
||||
* SPDX-License-Identifier: MIT
|
||||
*
|
||||
@ -16,7 +16,6 @@ struct HwInfoConfigTestLinuxCfl : HwInfoConfigTestLinux {
|
||||
void SetUp() override {
|
||||
HwInfoConfigTestLinux::SetUp();
|
||||
drm->storedDeviceID = 0x3E92;
|
||||
drm->setGtType(GTTYPE_GT2);
|
||||
}
|
||||
};
|
||||
|
||||
@ -30,23 +29,13 @@ CFLTEST_F(HwInfoConfigTestLinuxCfl, WhenConfiguringHwInfoThenInformationIsCorrec
|
||||
EXPECT_EQ((uint32_t)drm->storedSSVal, outHwInfo.gtSystemInfo.SubSliceCount);
|
||||
EXPECT_EQ(aub_stream::ENGINE_RCS, outHwInfo.capabilityTable.defaultEngineType);
|
||||
|
||||
EXPECT_EQ(GTTYPE_GT2, outHwInfo.platform.eGTType);
|
||||
EXPECT_EQ(0u, outHwInfo.featureTable.flags.ftrGT1);
|
||||
EXPECT_EQ(0u, outHwInfo.featureTable.flags.ftrGT1_5);
|
||||
EXPECT_EQ(1u, outHwInfo.featureTable.flags.ftrGT2);
|
||||
EXPECT_EQ(0u, outHwInfo.featureTable.flags.ftrGT3);
|
||||
EXPECT_EQ(0u, outHwInfo.featureTable.flags.ftrGT4);
|
||||
EXPECT_EQ(0u, outHwInfo.featureTable.flags.ftrGTA);
|
||||
EXPECT_EQ(0u, outHwInfo.featureTable.flags.ftrGTC);
|
||||
EXPECT_EQ(0u, outHwInfo.featureTable.flags.ftrGTX);
|
||||
|
||||
//constant sysInfo/ftr flags
|
||||
EXPECT_EQ(1u, outHwInfo.gtSystemInfo.VEBoxInfo.Instances.Bits.VEBox0Enabled);
|
||||
EXPECT_TRUE(outHwInfo.gtSystemInfo.VEBoxInfo.IsValid);
|
||||
|
||||
drm->storedDeviceID = 0x3E90;
|
||||
drm->storedSSVal = 3;
|
||||
drm->setGtType(GTTYPE_GT1);
|
||||
|
||||
ret = hwInfoConfig->configureHwInfoDrm(&pInHwInfo, &outHwInfo, osInterface);
|
||||
EXPECT_EQ(0, ret);
|
||||
EXPECT_EQ((unsigned short)drm->storedDeviceID, outHwInfo.platform.usDeviceID);
|
||||
@ -56,19 +45,9 @@ CFLTEST_F(HwInfoConfigTestLinuxCfl, WhenConfiguringHwInfoThenInformationIsCorrec
|
||||
EXPECT_EQ(1u, outHwInfo.gtSystemInfo.SliceCount);
|
||||
EXPECT_EQ(aub_stream::ENGINE_RCS, outHwInfo.capabilityTable.defaultEngineType);
|
||||
|
||||
EXPECT_EQ(GTTYPE_GT1, outHwInfo.platform.eGTType);
|
||||
EXPECT_EQ(1u, outHwInfo.featureTable.flags.ftrGT1);
|
||||
EXPECT_EQ(0u, outHwInfo.featureTable.flags.ftrGT1_5);
|
||||
EXPECT_EQ(0u, outHwInfo.featureTable.flags.ftrGT2);
|
||||
EXPECT_EQ(0u, outHwInfo.featureTable.flags.ftrGT3);
|
||||
EXPECT_EQ(0u, outHwInfo.featureTable.flags.ftrGT4);
|
||||
EXPECT_EQ(0u, outHwInfo.featureTable.flags.ftrGTA);
|
||||
EXPECT_EQ(0u, outHwInfo.featureTable.flags.ftrGTC);
|
||||
EXPECT_EQ(0u, outHwInfo.featureTable.flags.ftrGTX);
|
||||
|
||||
drm->storedDeviceID = 0x3EA5;
|
||||
drm->storedSSVal = 6;
|
||||
drm->setGtType(GTTYPE_GT3);
|
||||
|
||||
ret = hwInfoConfig->configureHwInfoDrm(&pInHwInfo, &outHwInfo, osInterface);
|
||||
EXPECT_EQ(0, ret);
|
||||
EXPECT_EQ((unsigned short)drm->storedDeviceID, outHwInfo.platform.usDeviceID);
|
||||
@ -78,16 +57,6 @@ CFLTEST_F(HwInfoConfigTestLinuxCfl, WhenConfiguringHwInfoThenInformationIsCorrec
|
||||
EXPECT_EQ(2u, outHwInfo.gtSystemInfo.SliceCount);
|
||||
EXPECT_EQ(aub_stream::ENGINE_RCS, outHwInfo.capabilityTable.defaultEngineType);
|
||||
|
||||
EXPECT_EQ(GTTYPE_GT3, outHwInfo.platform.eGTType);
|
||||
EXPECT_EQ(0u, outHwInfo.featureTable.flags.ftrGT1);
|
||||
EXPECT_EQ(0u, outHwInfo.featureTable.flags.ftrGT1_5);
|
||||
EXPECT_EQ(0u, outHwInfo.featureTable.flags.ftrGT2);
|
||||
EXPECT_EQ(1u, outHwInfo.featureTable.flags.ftrGT3);
|
||||
EXPECT_EQ(0u, outHwInfo.featureTable.flags.ftrGT4);
|
||||
EXPECT_EQ(0u, outHwInfo.featureTable.flags.ftrGTA);
|
||||
EXPECT_EQ(0u, outHwInfo.featureTable.flags.ftrGTC);
|
||||
EXPECT_EQ(0u, outHwInfo.featureTable.flags.ftrGTX);
|
||||
|
||||
auto &outKmdNotifyProperties = outHwInfo.capabilityTable.kmdNotifyProperties;
|
||||
EXPECT_TRUE(outKmdNotifyProperties.enableKmdNotify);
|
||||
EXPECT_EQ(50000, outKmdNotifyProperties.delayKmdNotifyMicroseconds);
|
||||
@ -153,7 +122,7 @@ CFLTEST_F(HwInfoConfigTestLinuxCfl, WhenConfiguringHwInfoThenEdramInformationIsC
|
||||
EXPECT_EQ(0u, outHwInfo.featureTable.flags.ftrEDram);
|
||||
|
||||
drm->storedDeviceID = 0x3EA8;
|
||||
drm->setGtType(GTTYPE_GT3);
|
||||
|
||||
ret = hwInfoConfig->configureHwInfoDrm(&pInHwInfo, &outHwInfo, osInterface);
|
||||
EXPECT_EQ(0, ret);
|
||||
EXPECT_EQ_VAL((64u * 1024u), outHwInfo.gtSystemInfo.EdramSizeInKb);
|
||||
@ -178,7 +147,7 @@ TYPED_TEST(CflHwInfoTests, WhenGtIsSetupThenGtSystemInfoIsCorrect) {
|
||||
executionEnvironment->rootDeviceEnvironments[0]->setHwInfo(defaultHwInfo.get());
|
||||
DrmMock drm(*executionEnvironment->rootDeviceEnvironments[0]);
|
||||
GT_SYSTEM_INFO >SystemInfo = hwInfo.gtSystemInfo;
|
||||
DeviceDescriptor device = {0, &hwInfo, &TypeParam::setupHardwareInfo, GTTYPE_GT1};
|
||||
DeviceDescriptor device = {0, &hwInfo, &TypeParam::setupHardwareInfo};
|
||||
|
||||
int ret = drm.setupHardwareInfo(&device, false);
|
||||
|
||||
|
||||
@ -1,5 +1,5 @@
|
||||
/*
|
||||
* Copyright (C) 2018-2021 Intel Corporation
|
||||
* Copyright (C) 2018-2022 Intel Corporation
|
||||
*
|
||||
* SPDX-License-Identifier: MIT
|
||||
*
|
||||
@ -11,8 +11,8 @@ using namespace NEO;
|
||||
|
||||
TEST_F(DeviceIdTests, GivenGlkSupportedDeviceIdThenHardwareInfoIsCorrect) {
|
||||
std::array<DeviceDescriptor, 2> expectedDescriptors = {{
|
||||
{0x3184, &GLK_1x3x6::hwInfo, &GLK_1x3x6::setupHardwareInfo, GTTYPE_GTA},
|
||||
{0x3185, &GLK_1x2x6::hwInfo, &GLK_1x2x6::setupHardwareInfo, GTTYPE_GTA},
|
||||
{0x3184, &GLK_1x3x6::hwInfo, &GLK_1x3x6::setupHardwareInfo},
|
||||
{0x3185, &GLK_1x2x6::hwInfo, &GLK_1x2x6::setupHardwareInfo},
|
||||
}};
|
||||
|
||||
testImpl(expectedDescriptors);
|
||||
|
||||
@ -1,5 +1,5 @@
|
||||
/*
|
||||
* Copyright (C) 2018-2021 Intel Corporation
|
||||
* Copyright (C) 2018-2022 Intel Corporation
|
||||
*
|
||||
* SPDX-License-Identifier: MIT
|
||||
*
|
||||
@ -15,7 +15,7 @@ struct HwInfoConfigTestLinuxGlk : HwInfoConfigTestLinux {
|
||||
HwInfoConfigTestLinux::SetUp();
|
||||
|
||||
drm->storedDeviceID = 0x3185;
|
||||
drm->setGtType(GTTYPE_GTA);
|
||||
|
||||
drm->storedEUVal = 18;
|
||||
drm->storedHasPooledEU = 1;
|
||||
drm->storedMinEUinPool = 3;
|
||||
@ -33,22 +33,12 @@ GLKTEST_F(HwInfoConfigTestLinuxGlk, WhenConfiguringHwInfoThenInformationIsCorrec
|
||||
EXPECT_EQ((uint32_t)drm->storedSSVal, outHwInfo.gtSystemInfo.SubSliceCount);
|
||||
EXPECT_EQ(aub_stream::ENGINE_RCS, outHwInfo.capabilityTable.defaultEngineType);
|
||||
|
||||
EXPECT_EQ(GTTYPE_GTA, outHwInfo.platform.eGTType);
|
||||
EXPECT_EQ(0u, outHwInfo.featureTable.flags.ftrGT1);
|
||||
EXPECT_EQ(0u, outHwInfo.featureTable.flags.ftrGT1_5);
|
||||
EXPECT_EQ(0u, outHwInfo.featureTable.flags.ftrGT2);
|
||||
EXPECT_EQ(0u, outHwInfo.featureTable.flags.ftrGT3);
|
||||
EXPECT_EQ(0u, outHwInfo.featureTable.flags.ftrGT4);
|
||||
EXPECT_EQ(1u, outHwInfo.featureTable.flags.ftrGTA);
|
||||
EXPECT_EQ(0u, outHwInfo.featureTable.flags.ftrGTC);
|
||||
EXPECT_EQ(0u, outHwInfo.featureTable.flags.ftrGTX);
|
||||
|
||||
//constant sysInfo/ftr flags
|
||||
EXPECT_EQ(1u, outHwInfo.gtSystemInfo.VEBoxInfo.Instances.Bits.VEBox0Enabled);
|
||||
EXPECT_TRUE(outHwInfo.gtSystemInfo.VEBoxInfo.IsValid);
|
||||
|
||||
drm->storedDeviceID = 0x3184;
|
||||
drm->setGtType(GTTYPE_GTC); //0x3184 is GTA, but for test make it GTC
|
||||
|
||||
drm->storedMinEUinPool = 6;
|
||||
ret = hwInfoConfig->configureHwInfoDrm(&pInHwInfo, &outHwInfo, osInterface);
|
||||
EXPECT_EQ(0, ret);
|
||||
@ -61,18 +51,8 @@ GLKTEST_F(HwInfoConfigTestLinuxGlk, WhenConfiguringHwInfoThenInformationIsCorrec
|
||||
EXPECT_EQ((outHwInfo.gtSystemInfo.EUCount - outHwInfo.gtSystemInfo.EuCountPerPoolMin), outHwInfo.gtSystemInfo.EuCountPerPoolMax);
|
||||
EXPECT_EQ(aub_stream::ENGINE_RCS, outHwInfo.capabilityTable.defaultEngineType);
|
||||
|
||||
EXPECT_EQ(GTTYPE_GTC, outHwInfo.platform.eGTType);
|
||||
EXPECT_EQ(0u, outHwInfo.featureTable.flags.ftrGT1);
|
||||
EXPECT_EQ(0u, outHwInfo.featureTable.flags.ftrGT1_5);
|
||||
EXPECT_EQ(0u, outHwInfo.featureTable.flags.ftrGT2);
|
||||
EXPECT_EQ(0u, outHwInfo.featureTable.flags.ftrGT3);
|
||||
EXPECT_EQ(0u, outHwInfo.featureTable.flags.ftrGT4);
|
||||
EXPECT_EQ(0u, outHwInfo.featureTable.flags.ftrGTA);
|
||||
EXPECT_EQ(1u, outHwInfo.featureTable.flags.ftrGTC);
|
||||
EXPECT_EQ(0u, outHwInfo.featureTable.flags.ftrGTX);
|
||||
|
||||
drm->storedDeviceID = 0x3185;
|
||||
drm->setGtType(GTTYPE_GTX); //0x3185 is GTA, but for test make it GTX
|
||||
|
||||
drm->storedMinEUinPool = 9;
|
||||
ret = hwInfoConfig->configureHwInfoDrm(&pInHwInfo, &outHwInfo, osInterface);
|
||||
EXPECT_EQ(0, ret);
|
||||
@ -85,16 +65,6 @@ GLKTEST_F(HwInfoConfigTestLinuxGlk, WhenConfiguringHwInfoThenInformationIsCorrec
|
||||
EXPECT_EQ((outHwInfo.gtSystemInfo.EUCount - outHwInfo.gtSystemInfo.EuCountPerPoolMin), outHwInfo.gtSystemInfo.EuCountPerPoolMax);
|
||||
EXPECT_EQ(aub_stream::ENGINE_RCS, outHwInfo.capabilityTable.defaultEngineType);
|
||||
|
||||
EXPECT_EQ(GTTYPE_GTX, outHwInfo.platform.eGTType);
|
||||
EXPECT_EQ(0u, outHwInfo.featureTable.flags.ftrGT1);
|
||||
EXPECT_EQ(0u, outHwInfo.featureTable.flags.ftrGT1_5);
|
||||
EXPECT_EQ(0u, outHwInfo.featureTable.flags.ftrGT2);
|
||||
EXPECT_EQ(0u, outHwInfo.featureTable.flags.ftrGT3);
|
||||
EXPECT_EQ(0u, outHwInfo.featureTable.flags.ftrGT4);
|
||||
EXPECT_EQ(0u, outHwInfo.featureTable.flags.ftrGTA);
|
||||
EXPECT_EQ(0u, outHwInfo.featureTable.flags.ftrGTC);
|
||||
EXPECT_EQ(1u, outHwInfo.featureTable.flags.ftrGTX);
|
||||
|
||||
auto &outKmdNotifyProperties = outHwInfo.capabilityTable.kmdNotifyProperties;
|
||||
EXPECT_TRUE(outKmdNotifyProperties.enableKmdNotify);
|
||||
EXPECT_EQ(50000, outKmdNotifyProperties.delayKmdNotifyMicroseconds);
|
||||
@ -214,7 +184,7 @@ TYPED_TEST(GlkHwInfoTests, WhenGtIsSetupThenGtSystemInfoIsCorrect) {
|
||||
executionEnvironment->rootDeviceEnvironments[0]->setHwInfo(defaultHwInfo.get());
|
||||
DrmMock drm(*executionEnvironment->rootDeviceEnvironments[0]);
|
||||
GT_SYSTEM_INFO >SystemInfo = hwInfo.gtSystemInfo;
|
||||
DeviceDescriptor device = {0, &hwInfo, &TypeParam::setupHardwareInfo, GTTYPE_GT1};
|
||||
DeviceDescriptor device = {0, &hwInfo, &TypeParam::setupHardwareInfo};
|
||||
|
||||
int ret = drm.setupHardwareInfo(&device, false);
|
||||
|
||||
|
||||
@ -1,5 +1,5 @@
|
||||
/*
|
||||
* Copyright (C) 2018-2021 Intel Corporation
|
||||
* Copyright (C) 2018-2022 Intel Corporation
|
||||
*
|
||||
* SPDX-License-Identifier: MIT
|
||||
*
|
||||
@ -11,36 +11,36 @@ using namespace NEO;
|
||||
|
||||
TEST_F(DeviceIdTests, GivenKblSupportedDeviceIdThenHardwareInfoIsCorrect) {
|
||||
std::array<DeviceDescriptor, 26> expectedDescriptors = {{
|
||||
{0x5902, &KBL_1x2x6::hwInfo, &KBL_1x2x6::setupHardwareInfo, GTTYPE_GT1},
|
||||
{0x590B, &KBL_1x2x6::hwInfo, &KBL_1x2x6::setupHardwareInfo, GTTYPE_GT1},
|
||||
{0x590A, &KBL_1x2x6::hwInfo, &KBL_1x2x6::setupHardwareInfo, GTTYPE_GT1},
|
||||
{0x5906, &KBL_1x2x6::hwInfo, &KBL_1x2x6::setupHardwareInfo, GTTYPE_GT1},
|
||||
{0x590E, &KBL_1x3x6::hwInfo, &KBL_1x3x6::setupHardwareInfo, GTTYPE_GT1},
|
||||
{0x5908, &KBL_1x2x6::hwInfo, &KBL_1x2x6::setupHardwareInfo, GTTYPE_GT1},
|
||||
{0x5902, &KBL_1x2x6::hwInfo, &KBL_1x2x6::setupHardwareInfo},
|
||||
{0x590B, &KBL_1x2x6::hwInfo, &KBL_1x2x6::setupHardwareInfo},
|
||||
{0x590A, &KBL_1x2x6::hwInfo, &KBL_1x2x6::setupHardwareInfo},
|
||||
{0x5906, &KBL_1x2x6::hwInfo, &KBL_1x2x6::setupHardwareInfo},
|
||||
{0x590E, &KBL_1x3x6::hwInfo, &KBL_1x3x6::setupHardwareInfo},
|
||||
{0x5908, &KBL_1x2x6::hwInfo, &KBL_1x2x6::setupHardwareInfo},
|
||||
|
||||
{0x5913, &KBL_1x3x6::hwInfo, &KBL_1x3x6::setupHardwareInfo, GTTYPE_GT1_5},
|
||||
{0x5915, &KBL_1x2x6::hwInfo, &KBL_1x2x6::setupHardwareInfo, GTTYPE_GT1_5},
|
||||
{0x5913, &KBL_1x3x6::hwInfo, &KBL_1x3x6::setupHardwareInfo},
|
||||
{0x5915, &KBL_1x2x6::hwInfo, &KBL_1x2x6::setupHardwareInfo},
|
||||
|
||||
{0x5912, &KBL_1x3x8::hwInfo, &KBL_1x3x8::setupHardwareInfo, GTTYPE_GT2},
|
||||
{0x591B, &KBL_1x3x8::hwInfo, &KBL_1x3x8::setupHardwareInfo, GTTYPE_GT2},
|
||||
{0x5917, &KBL_1x3x8::hwInfo, &KBL_1x3x8::setupHardwareInfo, GTTYPE_GT2},
|
||||
{0x591A, &KBL_1x3x8::hwInfo, &KBL_1x3x8::setupHardwareInfo, GTTYPE_GT2},
|
||||
{0x5916, &KBL_1x3x8::hwInfo, &KBL_1x3x8::setupHardwareInfo, GTTYPE_GT2},
|
||||
{0x591E, &KBL_1x3x8::hwInfo, &KBL_1x3x8::setupHardwareInfo, GTTYPE_GT2},
|
||||
{0x591D, &KBL_1x3x8::hwInfo, &KBL_1x3x8::setupHardwareInfo, GTTYPE_GT2},
|
||||
{0x591C, &KBL_1x3x8::hwInfo, &KBL_1x3x8::setupHardwareInfo, GTTYPE_GT2},
|
||||
{0x5921, &KBL_1x3x8::hwInfo, &KBL_1x3x8::setupHardwareInfo, GTTYPE_GT2},
|
||||
{0x5912, &KBL_1x3x8::hwInfo, &KBL_1x3x8::setupHardwareInfo},
|
||||
{0x591B, &KBL_1x3x8::hwInfo, &KBL_1x3x8::setupHardwareInfo},
|
||||
{0x5917, &KBL_1x3x8::hwInfo, &KBL_1x3x8::setupHardwareInfo},
|
||||
{0x591A, &KBL_1x3x8::hwInfo, &KBL_1x3x8::setupHardwareInfo},
|
||||
{0x5916, &KBL_1x3x8::hwInfo, &KBL_1x3x8::setupHardwareInfo},
|
||||
{0x591E, &KBL_1x3x8::hwInfo, &KBL_1x3x8::setupHardwareInfo},
|
||||
{0x591D, &KBL_1x3x8::hwInfo, &KBL_1x3x8::setupHardwareInfo},
|
||||
{0x591C, &KBL_1x3x8::hwInfo, &KBL_1x3x8::setupHardwareInfo},
|
||||
{0x5921, &KBL_1x3x8::hwInfo, &KBL_1x3x8::setupHardwareInfo},
|
||||
|
||||
{0x5926, &KBL_2x3x8::hwInfo, &KBL_2x3x8::setupHardwareInfo, GTTYPE_GT3},
|
||||
{0x5927, &KBL_2x3x8::hwInfo, &KBL_2x3x8::setupHardwareInfo, GTTYPE_GT3},
|
||||
{0x592B, &KBL_2x3x8::hwInfo, &KBL_2x3x8::setupHardwareInfo, GTTYPE_GT3},
|
||||
{0x592A, &KBL_2x3x8::hwInfo, &KBL_2x3x8::setupHardwareInfo, GTTYPE_GT3},
|
||||
{0x5923, &KBL_2x3x8::hwInfo, &KBL_2x3x8::setupHardwareInfo, GTTYPE_GT3},
|
||||
{0x5926, &KBL_2x3x8::hwInfo, &KBL_2x3x8::setupHardwareInfo},
|
||||
{0x5927, &KBL_2x3x8::hwInfo, &KBL_2x3x8::setupHardwareInfo},
|
||||
{0x592B, &KBL_2x3x8::hwInfo, &KBL_2x3x8::setupHardwareInfo},
|
||||
{0x592A, &KBL_2x3x8::hwInfo, &KBL_2x3x8::setupHardwareInfo},
|
||||
{0x5923, &KBL_2x3x8::hwInfo, &KBL_2x3x8::setupHardwareInfo},
|
||||
|
||||
{0x5932, &KBL_3x3x8::hwInfo, &KBL_3x3x8::setupHardwareInfo, GTTYPE_GT4},
|
||||
{0x593B, &KBL_3x3x8::hwInfo, &KBL_3x3x8::setupHardwareInfo, GTTYPE_GT4},
|
||||
{0x593A, &KBL_3x3x8::hwInfo, &KBL_3x3x8::setupHardwareInfo, GTTYPE_GT4},
|
||||
{0x593D, &KBL_3x3x8::hwInfo, &KBL_3x3x8::setupHardwareInfo, GTTYPE_GT4},
|
||||
{0x5932, &KBL_3x3x8::hwInfo, &KBL_3x3x8::setupHardwareInfo},
|
||||
{0x593B, &KBL_3x3x8::hwInfo, &KBL_3x3x8::setupHardwareInfo},
|
||||
{0x593A, &KBL_3x3x8::hwInfo, &KBL_3x3x8::setupHardwareInfo},
|
||||
{0x593D, &KBL_3x3x8::hwInfo, &KBL_3x3x8::setupHardwareInfo},
|
||||
}};
|
||||
|
||||
testImpl(expectedDescriptors);
|
||||
|
||||
@ -1,5 +1,5 @@
|
||||
/*
|
||||
* Copyright (C) 2018-2021 Intel Corporation
|
||||
* Copyright (C) 2018-2022 Intel Corporation
|
||||
*
|
||||
* SPDX-License-Identifier: MIT
|
||||
*
|
||||
@ -16,7 +16,6 @@ struct HwInfoConfigTestLinuxKbl : HwInfoConfigTestLinux {
|
||||
void SetUp() override {
|
||||
HwInfoConfigTestLinux::SetUp();
|
||||
drm->storedDeviceID = 0x5912;
|
||||
drm->setGtType(GTTYPE_GT2);
|
||||
}
|
||||
};
|
||||
|
||||
@ -30,23 +29,13 @@ KBLTEST_F(HwInfoConfigTestLinuxKbl, WhenConfiguringHwInfoThenInformationIsCorrec
|
||||
EXPECT_EQ((uint32_t)drm->storedSSVal, outHwInfo.gtSystemInfo.SubSliceCount);
|
||||
EXPECT_EQ(aub_stream::ENGINE_RCS, outHwInfo.capabilityTable.defaultEngineType);
|
||||
|
||||
EXPECT_EQ(GTTYPE_GT2, outHwInfo.platform.eGTType);
|
||||
EXPECT_EQ(0u, outHwInfo.featureTable.flags.ftrGT1);
|
||||
EXPECT_EQ(0u, outHwInfo.featureTable.flags.ftrGT1_5);
|
||||
EXPECT_EQ(1u, outHwInfo.featureTable.flags.ftrGT2);
|
||||
EXPECT_EQ(0u, outHwInfo.featureTable.flags.ftrGT3);
|
||||
EXPECT_EQ(0u, outHwInfo.featureTable.flags.ftrGT4);
|
||||
EXPECT_EQ(0u, outHwInfo.featureTable.flags.ftrGTA);
|
||||
EXPECT_EQ(0u, outHwInfo.featureTable.flags.ftrGTC);
|
||||
EXPECT_EQ(0u, outHwInfo.featureTable.flags.ftrGTX);
|
||||
|
||||
//constant sysInfo/ftr flags
|
||||
EXPECT_EQ(1u, outHwInfo.gtSystemInfo.VEBoxInfo.Instances.Bits.VEBox0Enabled);
|
||||
EXPECT_TRUE(outHwInfo.gtSystemInfo.VEBoxInfo.IsValid);
|
||||
|
||||
drm->storedDeviceID = 0x5906;
|
||||
drm->storedSSVal = 3;
|
||||
drm->setGtType(GTTYPE_GT1);
|
||||
|
||||
ret = hwInfoConfig->configureHwInfoDrm(&pInHwInfo, &outHwInfo, osInterface);
|
||||
EXPECT_EQ(0, ret);
|
||||
EXPECT_EQ((unsigned short)drm->storedDeviceID, outHwInfo.platform.usDeviceID);
|
||||
@ -56,18 +45,8 @@ KBLTEST_F(HwInfoConfigTestLinuxKbl, WhenConfiguringHwInfoThenInformationIsCorrec
|
||||
EXPECT_EQ(1u, outHwInfo.gtSystemInfo.SliceCount);
|
||||
EXPECT_EQ(aub_stream::ENGINE_RCS, outHwInfo.capabilityTable.defaultEngineType);
|
||||
|
||||
EXPECT_EQ(GTTYPE_GT1, outHwInfo.platform.eGTType);
|
||||
EXPECT_EQ(1u, outHwInfo.featureTable.flags.ftrGT1);
|
||||
EXPECT_EQ(0u, outHwInfo.featureTable.flags.ftrGT1_5);
|
||||
EXPECT_EQ(0u, outHwInfo.featureTable.flags.ftrGT2);
|
||||
EXPECT_EQ(0u, outHwInfo.featureTable.flags.ftrGT3);
|
||||
EXPECT_EQ(0u, outHwInfo.featureTable.flags.ftrGT4);
|
||||
EXPECT_EQ(0u, outHwInfo.featureTable.flags.ftrGTA);
|
||||
EXPECT_EQ(0u, outHwInfo.featureTable.flags.ftrGTC);
|
||||
EXPECT_EQ(0u, outHwInfo.featureTable.flags.ftrGTX);
|
||||
|
||||
drm->storedDeviceID = 0x5915;
|
||||
drm->setGtType(GTTYPE_GT1_5);
|
||||
|
||||
ret = hwInfoConfig->configureHwInfoDrm(&pInHwInfo, &outHwInfo, osInterface);
|
||||
EXPECT_EQ(0, ret);
|
||||
EXPECT_EQ((unsigned short)drm->storedDeviceID, outHwInfo.platform.usDeviceID);
|
||||
@ -76,19 +55,9 @@ KBLTEST_F(HwInfoConfigTestLinuxKbl, WhenConfiguringHwInfoThenInformationIsCorrec
|
||||
EXPECT_EQ((uint32_t)drm->storedSSVal, outHwInfo.gtSystemInfo.SubSliceCount);
|
||||
EXPECT_EQ(aub_stream::ENGINE_RCS, outHwInfo.capabilityTable.defaultEngineType);
|
||||
|
||||
EXPECT_EQ(GTTYPE_GT1_5, outHwInfo.platform.eGTType);
|
||||
EXPECT_EQ(0u, outHwInfo.featureTable.flags.ftrGT1);
|
||||
EXPECT_EQ(1u, outHwInfo.featureTable.flags.ftrGT1_5);
|
||||
EXPECT_EQ(0u, outHwInfo.featureTable.flags.ftrGT2);
|
||||
EXPECT_EQ(0u, outHwInfo.featureTable.flags.ftrGT3);
|
||||
EXPECT_EQ(0u, outHwInfo.featureTable.flags.ftrGT4);
|
||||
EXPECT_EQ(0u, outHwInfo.featureTable.flags.ftrGTA);
|
||||
EXPECT_EQ(0u, outHwInfo.featureTable.flags.ftrGTC);
|
||||
EXPECT_EQ(0u, outHwInfo.featureTable.flags.ftrGTX);
|
||||
|
||||
drm->storedDeviceID = 0x5923;
|
||||
drm->storedSSVal = 6;
|
||||
drm->setGtType(GTTYPE_GT3);
|
||||
|
||||
ret = hwInfoConfig->configureHwInfoDrm(&pInHwInfo, &outHwInfo, osInterface);
|
||||
EXPECT_EQ(0, ret);
|
||||
EXPECT_EQ((unsigned short)drm->storedDeviceID, outHwInfo.platform.usDeviceID);
|
||||
@ -98,19 +67,9 @@ KBLTEST_F(HwInfoConfigTestLinuxKbl, WhenConfiguringHwInfoThenInformationIsCorrec
|
||||
EXPECT_EQ(2u, outHwInfo.gtSystemInfo.SliceCount);
|
||||
EXPECT_EQ(aub_stream::ENGINE_RCS, outHwInfo.capabilityTable.defaultEngineType);
|
||||
|
||||
EXPECT_EQ(GTTYPE_GT3, outHwInfo.platform.eGTType);
|
||||
EXPECT_EQ(0u, outHwInfo.featureTable.flags.ftrGT1);
|
||||
EXPECT_EQ(0u, outHwInfo.featureTable.flags.ftrGT1_5);
|
||||
EXPECT_EQ(0u, outHwInfo.featureTable.flags.ftrGT2);
|
||||
EXPECT_EQ(1u, outHwInfo.featureTable.flags.ftrGT3);
|
||||
EXPECT_EQ(0u, outHwInfo.featureTable.flags.ftrGT4);
|
||||
EXPECT_EQ(0u, outHwInfo.featureTable.flags.ftrGTA);
|
||||
EXPECT_EQ(0u, outHwInfo.featureTable.flags.ftrGTC);
|
||||
EXPECT_EQ(0u, outHwInfo.featureTable.flags.ftrGTX);
|
||||
|
||||
drm->storedDeviceID = 0x593B;
|
||||
drm->storedSSVal = 6;
|
||||
drm->setGtType(GTTYPE_GT4);
|
||||
|
||||
ret = hwInfoConfig->configureHwInfoDrm(&pInHwInfo, &outHwInfo, osInterface);
|
||||
EXPECT_EQ(0, ret);
|
||||
EXPECT_EQ((unsigned short)drm->storedDeviceID, outHwInfo.platform.usDeviceID);
|
||||
@ -120,16 +79,6 @@ KBLTEST_F(HwInfoConfigTestLinuxKbl, WhenConfiguringHwInfoThenInformationIsCorrec
|
||||
EXPECT_EQ(2u, outHwInfo.gtSystemInfo.SliceCount);
|
||||
EXPECT_EQ(aub_stream::ENGINE_RCS, outHwInfo.capabilityTable.defaultEngineType);
|
||||
|
||||
EXPECT_EQ(GTTYPE_GT4, outHwInfo.platform.eGTType);
|
||||
EXPECT_EQ(0u, outHwInfo.featureTable.flags.ftrGT1);
|
||||
EXPECT_EQ(0u, outHwInfo.featureTable.flags.ftrGT1_5);
|
||||
EXPECT_EQ(0u, outHwInfo.featureTable.flags.ftrGT2);
|
||||
EXPECT_EQ(0u, outHwInfo.featureTable.flags.ftrGT3);
|
||||
EXPECT_EQ(1u, outHwInfo.featureTable.flags.ftrGT4);
|
||||
EXPECT_EQ(0u, outHwInfo.featureTable.flags.ftrGTA);
|
||||
EXPECT_EQ(0u, outHwInfo.featureTable.flags.ftrGTC);
|
||||
EXPECT_EQ(0u, outHwInfo.featureTable.flags.ftrGTX);
|
||||
|
||||
auto &outKmdNotifyProperties = outHwInfo.capabilityTable.kmdNotifyProperties;
|
||||
EXPECT_TRUE(outKmdNotifyProperties.enableKmdNotify);
|
||||
EXPECT_EQ(50000, outKmdNotifyProperties.delayKmdNotifyMicroseconds);
|
||||
@ -208,7 +157,7 @@ KBLTEST_F(HwInfoConfigTestLinuxKbl, WhenConfiguringHwInfoThenEdramInformationIsC
|
||||
EXPECT_EQ(0u, outHwInfo.featureTable.flags.ftrEDram);
|
||||
|
||||
drm->storedDeviceID = 0x5927;
|
||||
drm->setGtType(GTTYPE_GT3);
|
||||
|
||||
ret = hwInfoConfig->configureHwInfoDrm(&pInHwInfo, &outHwInfo, osInterface);
|
||||
EXPECT_EQ(0, ret);
|
||||
EXPECT_EQ_VAL((64u * 1024u), outHwInfo.gtSystemInfo.EdramSizeInKb);
|
||||
@ -233,7 +182,7 @@ TYPED_TEST(KblHwInfoTests, WhenGtIsSetupThenGtSystemInfoIsCorrect) {
|
||||
executionEnvironment->rootDeviceEnvironments[0]->setHwInfo(defaultHwInfo.get());
|
||||
DrmMock drm(*executionEnvironment->rootDeviceEnvironments[0]);
|
||||
GT_SYSTEM_INFO >SystemInfo = hwInfo.gtSystemInfo;
|
||||
DeviceDescriptor device = {0, &hwInfo, &TypeParam::setupHardwareInfo, GTTYPE_GT1};
|
||||
DeviceDescriptor device = {0, &hwInfo, &TypeParam::setupHardwareInfo};
|
||||
|
||||
int ret = drm.setupHardwareInfo(&device, false);
|
||||
|
||||
|
||||
@ -1,5 +1,5 @@
|
||||
/*
|
||||
* Copyright (C) 2018-2021 Intel Corporation
|
||||
* Copyright (C) 2018-2022 Intel Corporation
|
||||
*
|
||||
* SPDX-License-Identifier: MIT
|
||||
*
|
||||
@ -11,36 +11,36 @@ using namespace NEO;
|
||||
|
||||
TEST_F(DeviceIdTests, GivenSklSupportedDeviceIdThenHardwareInfoIsCorrect) {
|
||||
std::array<DeviceDescriptor, 26> expectedDescriptors = {{
|
||||
{0x1902, &SKL_1x2x6::hwInfo, &SKL_1x2x6::setupHardwareInfo, GTTYPE_GT1},
|
||||
{0x190B, &SKL_1x2x6::hwInfo, &SKL_1x2x6::setupHardwareInfo, GTTYPE_GT1},
|
||||
{0x190A, &SKL_1x2x6::hwInfo, &SKL_1x2x6::setupHardwareInfo, GTTYPE_GT1},
|
||||
{0x1906, &SKL_1x2x6::hwInfo, &SKL_1x2x6::setupHardwareInfo, GTTYPE_GT1},
|
||||
{0x190E, &SKL_1x2x6::hwInfo, &SKL_1x2x6::setupHardwareInfo, GTTYPE_GT1},
|
||||
{0x1902, &SKL_1x2x6::hwInfo, &SKL_1x2x6::setupHardwareInfo},
|
||||
{0x190B, &SKL_1x2x6::hwInfo, &SKL_1x2x6::setupHardwareInfo},
|
||||
{0x190A, &SKL_1x2x6::hwInfo, &SKL_1x2x6::setupHardwareInfo},
|
||||
{0x1906, &SKL_1x2x6::hwInfo, &SKL_1x2x6::setupHardwareInfo},
|
||||
{0x190E, &SKL_1x2x6::hwInfo, &SKL_1x2x6::setupHardwareInfo},
|
||||
|
||||
{0x1917, &SKL_1x3x6::hwInfo, &SKL_1x3x6::setupHardwareInfo, GTTYPE_GT1_5},
|
||||
{0x1913, &SKL_1x3x6::hwInfo, &SKL_1x3x6::setupHardwareInfo, GTTYPE_GT1_5},
|
||||
{0x1915, &SKL_1x3x6::hwInfo, &SKL_1x3x6::setupHardwareInfo, GTTYPE_GT1_5},
|
||||
{0x1917, &SKL_1x3x6::hwInfo, &SKL_1x3x6::setupHardwareInfo},
|
||||
{0x1913, &SKL_1x3x6::hwInfo, &SKL_1x3x6::setupHardwareInfo},
|
||||
{0x1915, &SKL_1x3x6::hwInfo, &SKL_1x3x6::setupHardwareInfo},
|
||||
|
||||
{0x1912, &SKL_1x3x8::hwInfo, &SKL_1x3x8::setupHardwareInfo, GTTYPE_GT2},
|
||||
{0x191B, &SKL_1x3x8::hwInfo, &SKL_1x3x8::setupHardwareInfo, GTTYPE_GT2},
|
||||
{0x191A, &SKL_1x3x8::hwInfo, &SKL_1x3x8::setupHardwareInfo, GTTYPE_GT2},
|
||||
{0x1916, &SKL_1x3x8::hwInfo, &SKL_1x3x8::setupHardwareInfo, GTTYPE_GT2},
|
||||
{0x191E, &SKL_1x3x8::hwInfo, &SKL_1x3x8::setupHardwareInfo, GTTYPE_GT2},
|
||||
{0x191D, &SKL_1x3x8::hwInfo, &SKL_1x3x8::setupHardwareInfo, GTTYPE_GT2},
|
||||
{0x1921, &SKL_1x3x8::hwInfo, &SKL_1x3x8::setupHardwareInfo, GTTYPE_GT2},
|
||||
{0x9905, &SKL_1x3x8::hwInfo, &SKL_1x3x8::setupHardwareInfo, GTTYPE_GT2},
|
||||
{0x1912, &SKL_1x3x8::hwInfo, &SKL_1x3x8::setupHardwareInfo},
|
||||
{0x191B, &SKL_1x3x8::hwInfo, &SKL_1x3x8::setupHardwareInfo},
|
||||
{0x191A, &SKL_1x3x8::hwInfo, &SKL_1x3x8::setupHardwareInfo},
|
||||
{0x1916, &SKL_1x3x8::hwInfo, &SKL_1x3x8::setupHardwareInfo},
|
||||
{0x191E, &SKL_1x3x8::hwInfo, &SKL_1x3x8::setupHardwareInfo},
|
||||
{0x191D, &SKL_1x3x8::hwInfo, &SKL_1x3x8::setupHardwareInfo},
|
||||
{0x1921, &SKL_1x3x8::hwInfo, &SKL_1x3x8::setupHardwareInfo},
|
||||
{0x9905, &SKL_1x3x8::hwInfo, &SKL_1x3x8::setupHardwareInfo},
|
||||
|
||||
{0x192B, &SKL_2x3x8::hwInfo, &SKL_2x3x8::setupHardwareInfo, GTTYPE_GT3},
|
||||
{0x192D, &SKL_2x3x8::hwInfo, &SKL_2x3x8::setupHardwareInfo, GTTYPE_GT3},
|
||||
{0x192A, &SKL_2x3x8::hwInfo, &SKL_2x3x8::setupHardwareInfo, GTTYPE_GT3},
|
||||
{0x1923, &SKL_2x3x8::hwInfo, &SKL_2x3x8::setupHardwareInfo, GTTYPE_GT3},
|
||||
{0x1926, &SKL_2x3x8::hwInfo, &SKL_2x3x8::setupHardwareInfo, GTTYPE_GT3},
|
||||
{0x1927, &SKL_2x3x8::hwInfo, &SKL_2x3x8::setupHardwareInfo, GTTYPE_GT3},
|
||||
{0x192B, &SKL_2x3x8::hwInfo, &SKL_2x3x8::setupHardwareInfo},
|
||||
{0x192D, &SKL_2x3x8::hwInfo, &SKL_2x3x8::setupHardwareInfo},
|
||||
{0x192A, &SKL_2x3x8::hwInfo, &SKL_2x3x8::setupHardwareInfo},
|
||||
{0x1923, &SKL_2x3x8::hwInfo, &SKL_2x3x8::setupHardwareInfo},
|
||||
{0x1926, &SKL_2x3x8::hwInfo, &SKL_2x3x8::setupHardwareInfo},
|
||||
{0x1927, &SKL_2x3x8::hwInfo, &SKL_2x3x8::setupHardwareInfo},
|
||||
|
||||
{0x1932, &SKL_3x3x8::hwInfo, &SKL_3x3x8::setupHardwareInfo, GTTYPE_GT4},
|
||||
{0x193B, &SKL_3x3x8::hwInfo, &SKL_3x3x8::setupHardwareInfo, GTTYPE_GT4},
|
||||
{0x193A, &SKL_3x3x8::hwInfo, &SKL_3x3x8::setupHardwareInfo, GTTYPE_GT4},
|
||||
{0x193D, &SKL_3x3x8::hwInfo, &SKL_3x3x8::setupHardwareInfo, GTTYPE_GT4},
|
||||
{0x1932, &SKL_3x3x8::hwInfo, &SKL_3x3x8::setupHardwareInfo},
|
||||
{0x193B, &SKL_3x3x8::hwInfo, &SKL_3x3x8::setupHardwareInfo},
|
||||
{0x193A, &SKL_3x3x8::hwInfo, &SKL_3x3x8::setupHardwareInfo},
|
||||
{0x193D, &SKL_3x3x8::hwInfo, &SKL_3x3x8::setupHardwareInfo},
|
||||
}};
|
||||
|
||||
testImpl(expectedDescriptors);
|
||||
|
||||
@ -1,5 +1,5 @@
|
||||
/*
|
||||
* Copyright (C) 2018-2021 Intel Corporation
|
||||
* Copyright (C) 2018-2022 Intel Corporation
|
||||
*
|
||||
* SPDX-License-Identifier: MIT
|
||||
*
|
||||
@ -14,7 +14,6 @@ struct HwInfoConfigTestLinuxSkl : HwInfoConfigTestLinux {
|
||||
void SetUp() override {
|
||||
HwInfoConfigTestLinux::SetUp();
|
||||
drm->storedDeviceID = 0x0902;
|
||||
drm->setGtType(GTTYPE_GT2);
|
||||
}
|
||||
};
|
||||
|
||||
@ -28,16 +27,6 @@ SKLTEST_F(HwInfoConfigTestLinuxSkl, WhenConfiguringHwInfoThenInformationIsCorrec
|
||||
EXPECT_EQ((uint32_t)drm->storedSSVal, outHwInfo.gtSystemInfo.SubSliceCount);
|
||||
EXPECT_EQ(aub_stream::ENGINE_RCS, outHwInfo.capabilityTable.defaultEngineType);
|
||||
|
||||
EXPECT_EQ(GTTYPE_GT2, outHwInfo.platform.eGTType);
|
||||
EXPECT_EQ(0u, outHwInfo.featureTable.flags.ftrGT1);
|
||||
EXPECT_EQ(0u, outHwInfo.featureTable.flags.ftrGT1_5);
|
||||
EXPECT_EQ(1u, outHwInfo.featureTable.flags.ftrGT2);
|
||||
EXPECT_EQ(0u, outHwInfo.featureTable.flags.ftrGT3);
|
||||
EXPECT_EQ(0u, outHwInfo.featureTable.flags.ftrGT4);
|
||||
EXPECT_EQ(0u, outHwInfo.featureTable.flags.ftrGTA);
|
||||
EXPECT_EQ(0u, outHwInfo.featureTable.flags.ftrGTC);
|
||||
EXPECT_EQ(0u, outHwInfo.featureTable.flags.ftrGTX);
|
||||
|
||||
//constant sysInfo/ftr flags
|
||||
EXPECT_EQ(1u, outHwInfo.gtSystemInfo.VEBoxInfo.Instances.Bits.VEBox0Enabled);
|
||||
EXPECT_EQ(1u, outHwInfo.gtSystemInfo.VDBoxInfo.Instances.Bits.VDBox0Enabled);
|
||||
@ -45,7 +34,7 @@ SKLTEST_F(HwInfoConfigTestLinuxSkl, WhenConfiguringHwInfoThenInformationIsCorrec
|
||||
EXPECT_TRUE(outHwInfo.gtSystemInfo.VDBoxInfo.IsValid);
|
||||
|
||||
drm->storedDeviceID = 0x1902;
|
||||
drm->setGtType(GTTYPE_GT1);
|
||||
|
||||
drm->storedSSVal = 3;
|
||||
ret = hwInfoConfig->configureHwInfoDrm(&pInHwInfo, &outHwInfo, osInterface);
|
||||
EXPECT_EQ(0, ret);
|
||||
@ -56,18 +45,8 @@ SKLTEST_F(HwInfoConfigTestLinuxSkl, WhenConfiguringHwInfoThenInformationIsCorrec
|
||||
EXPECT_EQ(1u, outHwInfo.gtSystemInfo.SliceCount);
|
||||
EXPECT_EQ(aub_stream::ENGINE_RCS, outHwInfo.capabilityTable.defaultEngineType);
|
||||
|
||||
EXPECT_EQ(GTTYPE_GT1, outHwInfo.platform.eGTType);
|
||||
EXPECT_EQ(1u, outHwInfo.featureTable.flags.ftrGT1);
|
||||
EXPECT_EQ(0u, outHwInfo.featureTable.flags.ftrGT1_5);
|
||||
EXPECT_EQ(0u, outHwInfo.featureTable.flags.ftrGT2);
|
||||
EXPECT_EQ(0u, outHwInfo.featureTable.flags.ftrGT3);
|
||||
EXPECT_EQ(0u, outHwInfo.featureTable.flags.ftrGT4);
|
||||
EXPECT_EQ(0u, outHwInfo.featureTable.flags.ftrGTA);
|
||||
EXPECT_EQ(0u, outHwInfo.featureTable.flags.ftrGTC);
|
||||
EXPECT_EQ(0u, outHwInfo.featureTable.flags.ftrGTX);
|
||||
|
||||
drm->storedDeviceID = 0x1917;
|
||||
drm->setGtType(GTTYPE_GT1_5);
|
||||
|
||||
ret = hwInfoConfig->configureHwInfoDrm(&pInHwInfo, &outHwInfo, osInterface);
|
||||
EXPECT_EQ(0, ret);
|
||||
EXPECT_EQ((unsigned short)drm->storedDeviceID, outHwInfo.platform.usDeviceID);
|
||||
@ -76,18 +55,8 @@ SKLTEST_F(HwInfoConfigTestLinuxSkl, WhenConfiguringHwInfoThenInformationIsCorrec
|
||||
EXPECT_EQ((uint32_t)drm->storedSSVal, outHwInfo.gtSystemInfo.SubSliceCount);
|
||||
EXPECT_EQ(aub_stream::ENGINE_RCS, outHwInfo.capabilityTable.defaultEngineType);
|
||||
|
||||
EXPECT_EQ(GTTYPE_GT1_5, outHwInfo.platform.eGTType);
|
||||
EXPECT_EQ(0u, outHwInfo.featureTable.flags.ftrGT1);
|
||||
EXPECT_EQ(1u, outHwInfo.featureTable.flags.ftrGT1_5);
|
||||
EXPECT_EQ(0u, outHwInfo.featureTable.flags.ftrGT2);
|
||||
EXPECT_EQ(0u, outHwInfo.featureTable.flags.ftrGT3);
|
||||
EXPECT_EQ(0u, outHwInfo.featureTable.flags.ftrGT4);
|
||||
EXPECT_EQ(0u, outHwInfo.featureTable.flags.ftrGTA);
|
||||
EXPECT_EQ(0u, outHwInfo.featureTable.flags.ftrGTC);
|
||||
EXPECT_EQ(0u, outHwInfo.featureTable.flags.ftrGTX);
|
||||
|
||||
drm->storedDeviceID = 0x0903;
|
||||
drm->setGtType(GTTYPE_GT3);
|
||||
|
||||
ret = hwInfoConfig->configureHwInfoDrm(&pInHwInfo, &outHwInfo, osInterface);
|
||||
EXPECT_EQ(0, ret);
|
||||
EXPECT_EQ((unsigned short)drm->storedDeviceID, outHwInfo.platform.usDeviceID);
|
||||
@ -96,18 +65,8 @@ SKLTEST_F(HwInfoConfigTestLinuxSkl, WhenConfiguringHwInfoThenInformationIsCorrec
|
||||
EXPECT_EQ((uint32_t)drm->storedSSVal, outHwInfo.gtSystemInfo.SubSliceCount);
|
||||
EXPECT_EQ(aub_stream::ENGINE_RCS, outHwInfo.capabilityTable.defaultEngineType);
|
||||
|
||||
EXPECT_EQ(GTTYPE_GT3, outHwInfo.platform.eGTType);
|
||||
EXPECT_EQ(0u, outHwInfo.featureTable.flags.ftrGT1);
|
||||
EXPECT_EQ(0u, outHwInfo.featureTable.flags.ftrGT1_5);
|
||||
EXPECT_EQ(0u, outHwInfo.featureTable.flags.ftrGT2);
|
||||
EXPECT_EQ(1u, outHwInfo.featureTable.flags.ftrGT3);
|
||||
EXPECT_EQ(0u, outHwInfo.featureTable.flags.ftrGT4);
|
||||
EXPECT_EQ(0u, outHwInfo.featureTable.flags.ftrGTA);
|
||||
EXPECT_EQ(0u, outHwInfo.featureTable.flags.ftrGTC);
|
||||
EXPECT_EQ(0u, outHwInfo.featureTable.flags.ftrGTX);
|
||||
|
||||
drm->storedDeviceID = 0x0904;
|
||||
drm->setGtType(GTTYPE_GT4);
|
||||
|
||||
drm->storedSSVal = 6;
|
||||
ret = hwInfoConfig->configureHwInfoDrm(&pInHwInfo, &outHwInfo, osInterface);
|
||||
EXPECT_EQ(0, ret);
|
||||
@ -118,16 +77,6 @@ SKLTEST_F(HwInfoConfigTestLinuxSkl, WhenConfiguringHwInfoThenInformationIsCorrec
|
||||
EXPECT_EQ(1u, outHwInfo.gtSystemInfo.SliceCount);
|
||||
EXPECT_EQ(aub_stream::ENGINE_RCS, outHwInfo.capabilityTable.defaultEngineType);
|
||||
|
||||
EXPECT_EQ(GTTYPE_GT4, outHwInfo.platform.eGTType);
|
||||
EXPECT_EQ(0u, outHwInfo.featureTable.flags.ftrGT1);
|
||||
EXPECT_EQ(0u, outHwInfo.featureTable.flags.ftrGT1_5);
|
||||
EXPECT_EQ(0u, outHwInfo.featureTable.flags.ftrGT2);
|
||||
EXPECT_EQ(0u, outHwInfo.featureTable.flags.ftrGT3);
|
||||
EXPECT_EQ(1u, outHwInfo.featureTable.flags.ftrGT4);
|
||||
EXPECT_EQ(0u, outHwInfo.featureTable.flags.ftrGTA);
|
||||
EXPECT_EQ(0u, outHwInfo.featureTable.flags.ftrGTC);
|
||||
EXPECT_EQ(0u, outHwInfo.featureTable.flags.ftrGTX);
|
||||
|
||||
auto &outKmdNotifyProperties = outHwInfo.capabilityTable.kmdNotifyProperties;
|
||||
EXPECT_TRUE(outKmdNotifyProperties.enableKmdNotify);
|
||||
EXPECT_EQ(50000, outKmdNotifyProperties.delayKmdNotifyMicroseconds);
|
||||
@ -213,7 +162,7 @@ SKLTEST_F(HwInfoConfigTestLinuxSkl, WhenConfiguringHwInfoThenEdramInformationIsC
|
||||
EXPECT_EQ(0u, outHwInfo.featureTable.flags.ftrEDram);
|
||||
|
||||
drm->storedDeviceID = 0x1926;
|
||||
drm->setGtType(GTTYPE_GT3);
|
||||
|
||||
ret = hwInfoConfig->configureHwInfoDrm(&pInHwInfo, &outHwInfo, osInterface);
|
||||
EXPECT_EQ(0, ret);
|
||||
EXPECT_EQ_VAL((64u * 1024u), outHwInfo.gtSystemInfo.EdramSizeInKb);
|
||||
@ -232,7 +181,7 @@ SKLTEST_F(HwInfoConfigTestLinuxSkl, WhenConfiguringHwInfoThenEdramInformationIsC
|
||||
EXPECT_EQ(1u, outHwInfo.featureTable.flags.ftrEDram);
|
||||
|
||||
drm->storedDeviceID = 0x193B;
|
||||
drm->setGtType(GTTYPE_GT4);
|
||||
|
||||
ret = hwInfoConfig->configureHwInfoDrm(&pInHwInfo, &outHwInfo, osInterface);
|
||||
EXPECT_EQ(0, ret);
|
||||
EXPECT_EQ_VAL((128u * 1024u), outHwInfo.gtSystemInfo.EdramSizeInKb);
|
||||
@ -257,7 +206,7 @@ TYPED_TEST(SklHwInfoTests, WhenGtIsSetupThenGtSystemInfoIsCorrect) {
|
||||
executionEnvironment->rootDeviceEnvironments[0]->setHwInfo(defaultHwInfo.get());
|
||||
DrmMock drm(*executionEnvironment->rootDeviceEnvironments[0]);
|
||||
GT_SYSTEM_INFO >SystemInfo = hwInfo.gtSystemInfo;
|
||||
DeviceDescriptor device = {0, &hwInfo, &TypeParam::setupHardwareInfo, GTTYPE_GT1};
|
||||
DeviceDescriptor device = {0, &hwInfo, &TypeParam::setupHardwareInfo};
|
||||
|
||||
int ret = drm.setupHardwareInfo(&device, false);
|
||||
|
||||
|
||||
@ -1,5 +1,5 @@
|
||||
/*
|
||||
* Copyright (C) 2018-2021 Intel Corporation
|
||||
* Copyright (C) 2018-2022 Intel Corporation
|
||||
*
|
||||
* SPDX-License-Identifier: MIT
|
||||
*
|
||||
@ -95,36 +95,13 @@ SKLTEST_F(SklHwInfo, givenBoolWhenCallSklHardwareInfoSetupThenFeatureTableAndWor
|
||||
pPlatform.usRevId = 1;
|
||||
workaroundTable = {};
|
||||
featureTable = {};
|
||||
featureTable.flags.ftrGT1 = true;
|
||||
featureTable.flags.ftrGT3 = true;
|
||||
|
||||
hardwareInfoSetup[productFamily](&hwInfo, true, config);
|
||||
|
||||
EXPECT_EQ(true, workaroundTable.flags.waCompressedResourceRequiresConstVA21);
|
||||
EXPECT_EQ(true, workaroundTable.flags.waDisablePerCtxtPreemptionGranularityControl);
|
||||
EXPECT_EQ(true, workaroundTable.flags.waModifyVFEStateAfterGPGPUPreemption);
|
||||
EXPECT_EQ(true, workaroundTable.flags.waCSRUncachable);
|
||||
EXPECT_EQ(true, featureTable.flags.ftrSingleVeboxSlice);
|
||||
EXPECT_EQ(true, featureTable.flags.ftrVcs2);
|
||||
|
||||
workaroundTable = {};
|
||||
featureTable = {};
|
||||
featureTable.flags.ftrGT2 = true;
|
||||
featureTable.flags.ftrGT4 = true;
|
||||
hardwareInfoSetup[productFamily](&hwInfo, true, config);
|
||||
|
||||
EXPECT_EQ(true, featureTable.flags.ftrSingleVeboxSlice);
|
||||
EXPECT_EQ(true, featureTable.flags.ftrVcs2);
|
||||
|
||||
workaroundTable = {};
|
||||
featureTable = {};
|
||||
featureTable.flags.ftrGT1 = true;
|
||||
featureTable.flags.ftrGT2 = true;
|
||||
featureTable.flags.ftrGT3 = true;
|
||||
featureTable.flags.ftrGT4 = true;
|
||||
hardwareInfoSetup[productFamily](&hwInfo, true, config);
|
||||
|
||||
EXPECT_EQ(true, featureTable.flags.ftrSingleVeboxSlice);
|
||||
EXPECT_EQ(true, featureTable.flags.ftrVcs2);
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user