Media/compute-runtime
1
0
Fork 0
mirror of https://github.com/intel/compute-runtime.git synced 2025-09-10 12:53:42 +08:00
Code Issues Packages Projects Releases Wiki Activity

Add missing devices IDs in master branch

Browse Source 
Change-Id: Ie73cf42f1d7ef6bb414630016d85e27038fab03b
This commit is contained in:
Jobczyk, Lukasz
2018-03-23 10:35:30 +01:00
committed by sys_ocldev
parent 0bac015d30
commit 9700c9bc42
6 changed files with 43 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
runtime/dll/linux/devices/devices_base.m
View File

@ -115,6 +115,7 @@ DEVICE( ICFL_GT3_ULT_DEVICE_F0_ID, CFL_2x3x8, GTTYPE_GT3 )
#ifdef SUPPORT_GLK #ifdef SUPPORT_GLK
DEVICE( IGLK_GT2_ULT_18EU_DEVICE_F0_ID, GLK_1x3x6, GTTYPE_GTA ) DEVICE( IGLK_GT2_ULT_18EU_DEVICE_F0_ID, GLK_1x3x6, GTTYPE_GTA )
DEVICE( IGLK_GT2_ULT_12EU_DEVICE_F0_ID, GLK_1x2x6, GTTYPE_GTA )
#endif #endif
#ifdef SUPPORT_BXT #ifdef SUPPORT_BXT

9
runtime/gen9/hw_cmds_glk.h
View File

@ -46,4 +46,13 @@ class GLK_1x3x6 : public GLK {
private: private:
static GT_SYSTEM_INFO gtSystemInfo; static GT_SYSTEM_INFO gtSystemInfo;
}; };
class GLK_1x2x6 : public GLK {
public:
static void setupGtSystemInfo(GT_SYSTEM_INFO *gtSysInfo);
static const HardwareInfo hwInfo;
private:
static GT_SYSTEM_INFO gtSystemInfo;
};
} // namespace OCLRT } // namespace OCLRT

2
runtime/gen9/hw_info_bxt.cpp
View File

@ -113,7 +113,7 @@ void BXT_1x3x6::setupGtSystemInfo(GT_SYSTEM_INFO *gtSysInfo) {
gtSysInfo->EUCount = 18; gtSysInfo->EUCount = 18;
gtSysInfo->ThreadCount = 18 * BXT::threadsPerEu; gtSysInfo->ThreadCount = 18 * BXT::threadsPerEu;
gtSysInfo->SliceCount = 1; gtSysInfo->SliceCount = 1;
gtSysInfo->SubSliceCount = 6; gtSysInfo->SubSliceCount = 3;
gtSysInfo->L3CacheSizeInKb = 384; gtSysInfo->L3CacheSizeInKb = 384;
gtSysInfo->L3BankCount = 1; gtSysInfo->L3BankCount = 1;
gtSysInfo->MaxFillRate = 8; gtSysInfo->MaxFillRate = 8;

29
runtime/gen9/hw_info_glk.cpp
View File

@ -96,6 +96,35 @@ void GLK_1x3x6::setupGtSystemInfo(GT_SYSTEM_INFO *gtSysInfo) {
gtSysInfo->IsDynamicallyPopulated = false; gtSysInfo->IsDynamicallyPopulated = false;
}; };
const HardwareInfo GLK_1x2x6::hwInfo = {
&GLK::platform,
&emptySkuTable,
&emptyWaTable,
&GLK_1x2x6::gtSystemInfo,
GLK::capabilityTable,
};
GT_SYSTEM_INFO GLK_1x2x6::gtSystemInfo = {0};
void GLK_1x2x6::setupGtSystemInfo(GT_SYSTEM_INFO *gtSysInfo) {
gtSysInfo->EUCount = 12;
gtSysInfo->ThreadCount = 12 * GLK::threadsPerEu;
gtSysInfo->SliceCount = 1;
gtSysInfo->SubSliceCount = 2;
gtSysInfo->L3CacheSizeInKb = 384;
gtSysInfo->L3BankCount = 2;
gtSysInfo->MaxFillRate = 8;
gtSysInfo->TotalVsThreads = 112;
gtSysInfo->TotalHsThreads = 112;
gtSysInfo->TotalDsThreads = 112;
gtSysInfo->TotalGsThreads = 112;
gtSysInfo->TotalPsThreadsWindowerRange = 64;
gtSysInfo->CsrSizeInMb = 8;
gtSysInfo->MaxEuPerSubSlice = GLK::maxEuPerSubslice;
gtSysInfo->MaxSlicesSupported = GLK::maxSlicesSupported;
gtSysInfo->MaxSubSlicesSupported = GLK::maxSubslicesSupported;
gtSysInfo->IsL3HashModeEnabled = false;
gtSysInfo->IsDynamicallyPopulated = false;
};
const HardwareInfo GLK::hwInfo = GLK_1x3x6::hwInfo; const HardwareInfo GLK::hwInfo = GLK_1x3x6::hwInfo;
void (*GLK::setupGtSystemInfo)(GT_SYSTEM_INFO *) = GLK_1x3x6::setupGtSystemInfo; void (*GLK::setupGtSystemInfo)(GT_SYSTEM_INFO *) = GLK_1x3x6::setupGtSystemInfo;
} // namespace OCLRT } // namespace OCLRT

6
unit_tests/gen9/glk/linux/hw_info_config_tests.cpp
View File

@ -26,7 +26,6 @@
using namespace OCLRT; using namespace OCLRT;
using namespace std; using namespace std;
#if defined IGLK_GT2_ULT_12EU_DEVICE_F0_ID
struct HwInfoConfigTestLinuxGlk : HwInfoConfigTestLinux { struct HwInfoConfigTestLinuxGlk : HwInfoConfigTestLinux {
void SetUp() override { void SetUp() override {
HwInfoConfigTestLinux::SetUp(); HwInfoConfigTestLinux::SetUp();
@ -109,7 +108,7 @@ GLKTEST_F(HwInfoConfigTestLinuxGlk, configureHwInfo) {
ReleaseOutHwInfoStructs(); ReleaseOutHwInfoStructs();
drm->StoredDeviceID = IGLK_GT2_ULT_18EU_DEVICE_F0_ID; drm->StoredDeviceID = IGLK_GT2_ULT_12EU_DEVICE_F0_ID;
drm->setGtType(GTTYPE_GTX); //IGLK_GT2_ULT_18EU_DEVICE_F0_ID is GTA, but fot test sake make it GTX drm->setGtType(GTTYPE_GTX); //IGLK_GT2_ULT_18EU_DEVICE_F0_ID is GTA, but fot test sake make it GTX
drm->StoredMinEUinPool = 9; drm->StoredMinEUinPool = 9;
ret = hwInfoConfig->configureHwInfo(pInHwInfo, &outHwInfo, osInterface); ret = hwInfoConfig->configureHwInfo(pInHwInfo, &outHwInfo, osInterface);
@ -255,7 +254,7 @@ GLKTEST_F(HwInfoConfigTestLinuxGlk, configureHwInfoWaFlags) {
template <typename T> template <typename T>
class GlkHwInfoTests : public ::testing::Test { class GlkHwInfoTests : public ::testing::Test {
}; };
typedef ::testing::Types<GLK_1x3x6> glkTestTypes; typedef ::testing::Types<GLK_1x3x6, GLK_1x2x6> glkTestTypes;
TYPED_TEST_CASE(GlkHwInfoTests, glkTestTypes); TYPED_TEST_CASE(GlkHwInfoTests, glkTestTypes);
TYPED_TEST(GlkHwInfoTests, gtSetupIsCorrect) { TYPED_TEST(GlkHwInfoTests, gtSetupIsCorrect) {
GT_SYSTEM_INFO gtSystemInfo; GT_SYSTEM_INFO gtSystemInfo;
@ -269,4 +268,3 @@ TYPED_TEST(GlkHwInfoTests, gtSetupIsCorrect) {
EXPECT_EQ(gtSystemInfo.CsrSizeInMb, 8u); EXPECT_EQ(gtSystemInfo.CsrSizeInMb, 8u);
EXPECT_FALSE(gtSystemInfo.IsDynamicallyPopulated); EXPECT_FALSE(gtSystemInfo.IsDynamicallyPopulated);
} }
#endif

4
unit_tests/gen9/glk/test_device_caps_glk.cpp
View File

@ -57,20 +57,18 @@ GLKTEST_F(Gen9DeviceCaps, GlkIs32BitOsAllocatorAvailable) {
typedef Test<DeviceFixture> GlkUsDeviceIdTest; typedef Test<DeviceFixture> GlkUsDeviceIdTest;
GLKTEST_F(GlkUsDeviceIdTest, isSimulationCap) { GLKTEST_F(GlkUsDeviceIdTest, isSimulationCap) {
#ifdef IGLK_GT2_ULT_18EU_DEVICE_F0_ID
unsigned short glkSimulationIds[3] = { unsigned short glkSimulationIds[3] = {
IGLK_GT2_ULT_18EU_DEVICE_F0_ID, IGLK_GT2_ULT_18EU_DEVICE_F0_ID,
IGLK_GT2_ULT_12EU_DEVICE_F0_ID,
0, // default, non-simulation 0, // default, non-simulation
}; };
OCLRT::MockDevice *mockDevice = nullptr; OCLRT::MockDevice *mockDevice = nullptr;
for (auto id : glkSimulationIds) { for (auto id : glkSimulationIds) {
mockDevice = createWithUsDeviceId(id); mockDevice = createWithUsDeviceId(id);
ASSERT_NE(mockDevice, nullptr); ASSERT_NE(mockDevice, nullptr);
EXPECT_FALSE(mockDevice->isSimulation()); EXPECT_FALSE(mockDevice->isSimulation());
delete mockDevice; delete mockDevice;
} }
#endif
} }
GLKTEST_F(GlkUsDeviceIdTest, GivenGLKWhenCheckftr64KBpagesThenFalse) { GLKTEST_F(GlkUsDeviceIdTest, GivenGLKWhenCheckftr64KBpagesThenFalse) {