From 50ef7c0000921e11310b5011c0f70562d1906efb Mon Sep 17 00:00:00 2001 From: "Zdanowicz, Zbigniew" Date: Thu, 29 Mar 2018 17:06:02 +0200 Subject: [PATCH] Adjust default engine type in Linux Change-Id: I2cc7e4078e830f0844d6dc6fe7b4bfcdf92b0095 --- runtime/device/device_caps.cpp | 2 +- runtime/os_interface/linux/hw_info_config.cpp | 1 + unit_tests/gen8/linux/hw_info_config_tests.cpp | 3 +++ unit_tests/gen9/bxt/linux/hw_info_config_tests.cpp | 3 +++ unit_tests/gen9/cfl/linux/hw_info_config_tests.cpp | 3 +++ unit_tests/gen9/glk/linux/hw_info_config_tests.cpp | 3 +++ unit_tests/gen9/kbl/linux/hw_info_config_tests.cpp | 5 +++++ unit_tests/gen9/skl/linux/hw_info_config_tests.cpp | 5 +++++ 8 files changed, 24 insertions(+), 1 deletion(-) diff --git a/runtime/device/device_caps.cpp b/runtime/device/device_caps.cpp index da50d9ef22..3d6219bea3 100644 --- a/runtime/device/device_caps.cpp +++ b/runtime/device/device_caps.cpp @@ -43,7 +43,7 @@ static std::string spirVersions = "1.2 "; static const char *spirvVersion = "SPIR-V_1.0 "; #define QTR(a) #a #define TOSTR(b) QTR(b) -static std::string driverVersion; +static std::string driverVersion = TOSTR(NEO_DRIVER_VERSION); const char *builtInKernels = ""; // the "always available" (extension-independent) builtin kernels diff --git a/runtime/os_interface/linux/hw_info_config.cpp b/runtime/os_interface/linux/hw_info_config.cpp index 7a25db2e52..9cbbab2b00 100644 --- a/runtime/os_interface/linux/hw_info_config.cpp +++ b/runtime/os_interface/linux/hw_info_config.cpp @@ -166,6 +166,7 @@ int HwInfoConfig::configureHwInfo(const HardwareInfo *inHwInfo, HardwareInfo *ou HwHelper &hwHelper = HwHelper::get(pPlatform->eRenderCoreFamily); outHwInfo->capabilityTable.ftrSupportsCoherency = false; + hwHelper.adjustDefaultEngineType(outHwInfo); outHwInfo->capabilityTable.defaultEngineType = DebugManager.flags.NodeOrdinal.get() == -1 ? outHwInfo->capabilityTable.defaultEngineType : static_cast(DebugManager.flags.NodeOrdinal.get()); diff --git a/unit_tests/gen8/linux/hw_info_config_tests.cpp b/unit_tests/gen8/linux/hw_info_config_tests.cpp index 1225b16af5..4304fad617 100644 --- a/unit_tests/gen8/linux/hw_info_config_tests.cpp +++ b/unit_tests/gen8/linux/hw_info_config_tests.cpp @@ -44,6 +44,7 @@ BDWTEST_F(HwInfoConfigTestLinuxBdw, configureHwInfo) { EXPECT_EQ((uint32_t)drm->StoredEUVal, outHwInfo.pSysInfo->EUCount); EXPECT_EQ((uint32_t)drm->StoredSSVal, outHwInfo.pSysInfo->SubSliceCount); EXPECT_EQ(1u, outHwInfo.pSysInfo->SliceCount); + EXPECT_EQ(EngineType::ENGINE_RCS, outHwInfo.capabilityTable.defaultEngineType); EXPECT_EQ(GTTYPE_GT2, outHwInfo.pPlatform->eGTType); EXPECT_EQ(0u, outHwInfo.pSkuTable->ftrGT1); @@ -65,6 +66,7 @@ BDWTEST_F(HwInfoConfigTestLinuxBdw, configureHwInfo) { EXPECT_EQ((unsigned short)drm->StoredDeviceRevID, outHwInfo.pPlatform->usRevId); EXPECT_EQ((uint32_t)drm->StoredEUVal, outHwInfo.pSysInfo->EUCount); EXPECT_EQ((uint32_t)drm->StoredSSVal, outHwInfo.pSysInfo->SubSliceCount); + EXPECT_EQ(EngineType::ENGINE_RCS, outHwInfo.capabilityTable.defaultEngineType); EXPECT_EQ(GTTYPE_GT1, outHwInfo.pPlatform->eGTType); EXPECT_EQ(1u, outHwInfo.pSkuTable->ftrGT1); @@ -88,6 +90,7 @@ BDWTEST_F(HwInfoConfigTestLinuxBdw, configureHwInfo) { EXPECT_EQ((uint32_t)drm->StoredEUVal, outHwInfo.pSysInfo->EUCount); EXPECT_EQ((uint32_t)drm->StoredSSVal, outHwInfo.pSysInfo->SubSliceCount); EXPECT_EQ(2u, outHwInfo.pSysInfo->SliceCount); + EXPECT_EQ(EngineType::ENGINE_RCS, outHwInfo.capabilityTable.defaultEngineType); EXPECT_EQ(GTTYPE_GT3, outHwInfo.pPlatform->eGTType); EXPECT_EQ(0u, outHwInfo.pSkuTable->ftrGT1); diff --git a/unit_tests/gen9/bxt/linux/hw_info_config_tests.cpp b/unit_tests/gen9/bxt/linux/hw_info_config_tests.cpp index 60447ca986..620cbd5df2 100644 --- a/unit_tests/gen9/bxt/linux/hw_info_config_tests.cpp +++ b/unit_tests/gen9/bxt/linux/hw_info_config_tests.cpp @@ -50,6 +50,7 @@ BXTTEST_F(HwInfoConfigTestLinuxBxt, configureHwInfo) { EXPECT_EQ((uint32_t)drm->StoredMinEUinPool, outHwInfo.pSysInfo->EuCountPerPoolMin); EXPECT_EQ((outHwInfo.pSysInfo->EUCount - outHwInfo.pSysInfo->EuCountPerPoolMin), outHwInfo.pSysInfo->EuCountPerPoolMax); EXPECT_EQ(0u, outHwInfo.pSkuTable->ftrGttCacheInvalidation); + EXPECT_EQ(EngineType::ENGINE_RCS, outHwInfo.capabilityTable.defaultEngineType); //constant sysInfo/ftr flags EXPECT_EQ(1u, outHwInfo.pSysInfo->VEBoxInfo.Instances.Bits.VEBox0Enabled); @@ -101,6 +102,7 @@ BXTTEST_F(HwInfoConfigTestLinuxBxt, configureHwInfo) { EXPECT_EQ((uint32_t)drm->StoredMinEUinPool, outHwInfo.pSysInfo->EuCountPerPoolMin); EXPECT_EQ((outHwInfo.pSysInfo->EUCount - outHwInfo.pSysInfo->EuCountPerPoolMin), outHwInfo.pSysInfo->EuCountPerPoolMax); EXPECT_EQ(1u, outHwInfo.pSkuTable->ftrGttCacheInvalidation); + EXPECT_EQ(EngineType::ENGINE_RCS, outHwInfo.capabilityTable.defaultEngineType); EXPECT_EQ(GTTYPE_GTC, outHwInfo.pPlatform->eGTType); EXPECT_EQ(0u, outHwInfo.pSkuTable->ftrGT1); @@ -126,6 +128,7 @@ BXTTEST_F(HwInfoConfigTestLinuxBxt, configureHwInfo) { EXPECT_EQ((unsigned int)drm->StoredHasPooledEU, outHwInfo.pSkuTable->ftrPooledEuEnabled); EXPECT_EQ((uint32_t)drm->StoredMinEUinPool, outHwInfo.pSysInfo->EuCountPerPoolMin); EXPECT_EQ((outHwInfo.pSysInfo->EUCount - outHwInfo.pSysInfo->EuCountPerPoolMin), outHwInfo.pSysInfo->EuCountPerPoolMax); + EXPECT_EQ(EngineType::ENGINE_RCS, outHwInfo.capabilityTable.defaultEngineType); EXPECT_EQ(GTTYPE_GTX, outHwInfo.pPlatform->eGTType); EXPECT_EQ(0u, outHwInfo.pSkuTable->ftrGT1); diff --git a/unit_tests/gen9/cfl/linux/hw_info_config_tests.cpp b/unit_tests/gen9/cfl/linux/hw_info_config_tests.cpp index e85543ad5d..b209a06343 100644 --- a/unit_tests/gen9/cfl/linux/hw_info_config_tests.cpp +++ b/unit_tests/gen9/cfl/linux/hw_info_config_tests.cpp @@ -42,6 +42,7 @@ CFLTEST_F(HwInfoConfigTestLinuxCfl, configureHwInfo) { EXPECT_EQ((unsigned short)drm->StoredDeviceRevID, outHwInfo.pPlatform->usRevId); EXPECT_EQ((uint32_t)drm->StoredEUVal, outHwInfo.pSysInfo->EUCount); EXPECT_EQ((uint32_t)drm->StoredSSVal, outHwInfo.pSysInfo->SubSliceCount); + EXPECT_EQ(EngineType::ENGINE_RCS, outHwInfo.capabilityTable.defaultEngineType); EXPECT_EQ(GTTYPE_GT2, outHwInfo.pPlatform->eGTType); EXPECT_EQ(0u, outHwInfo.pSkuTable->ftrGT1); @@ -88,6 +89,7 @@ CFLTEST_F(HwInfoConfigTestLinuxCfl, configureHwInfo) { EXPECT_EQ((uint32_t)drm->StoredEUVal, outHwInfo.pSysInfo->EUCount); EXPECT_EQ((uint32_t)drm->StoredSSVal, outHwInfo.pSysInfo->SubSliceCount); EXPECT_EQ(1u, outHwInfo.pSysInfo->SliceCount); + EXPECT_EQ(EngineType::ENGINE_RCS, outHwInfo.capabilityTable.defaultEngineType); EXPECT_EQ(GTTYPE_GT1, outHwInfo.pPlatform->eGTType); EXPECT_EQ(1u, outHwInfo.pSkuTable->ftrGT1); @@ -111,6 +113,7 @@ CFLTEST_F(HwInfoConfigTestLinuxCfl, configureHwInfo) { EXPECT_EQ((uint32_t)drm->StoredEUVal, outHwInfo.pSysInfo->EUCount); EXPECT_EQ((uint32_t)drm->StoredSSVal, outHwInfo.pSysInfo->SubSliceCount); EXPECT_EQ(2u, outHwInfo.pSysInfo->SliceCount); + EXPECT_EQ(EngineType::ENGINE_RCS, outHwInfo.capabilityTable.defaultEngineType); EXPECT_EQ(GTTYPE_GT3, outHwInfo.pPlatform->eGTType); EXPECT_EQ(0u, outHwInfo.pSkuTable->ftrGT1); diff --git a/unit_tests/gen9/glk/linux/hw_info_config_tests.cpp b/unit_tests/gen9/glk/linux/hw_info_config_tests.cpp index 2f892c008e..c118a234fd 100644 --- a/unit_tests/gen9/glk/linux/hw_info_config_tests.cpp +++ b/unit_tests/gen9/glk/linux/hw_info_config_tests.cpp @@ -48,6 +48,7 @@ GLKTEST_F(HwInfoConfigTestLinuxGlk, configureHwInfo) { EXPECT_EQ((unsigned short)drm->StoredDeviceRevID, outHwInfo.pPlatform->usRevId); EXPECT_EQ((uint32_t)drm->StoredEUVal, outHwInfo.pSysInfo->EUCount); EXPECT_EQ((uint32_t)drm->StoredSSVal, outHwInfo.pSysInfo->SubSliceCount); + EXPECT_EQ(EngineType::ENGINE_RCS, outHwInfo.capabilityTable.defaultEngineType); EXPECT_EQ(GTTYPE_GTA, outHwInfo.pPlatform->eGTType); EXPECT_EQ(0u, outHwInfo.pSkuTable->ftrGT1); @@ -94,6 +95,7 @@ GLKTEST_F(HwInfoConfigTestLinuxGlk, configureHwInfo) { EXPECT_EQ((unsigned int)drm->StoredHasPooledEU, outHwInfo.pSkuTable->ftrPooledEuEnabled); EXPECT_EQ((uint32_t)drm->StoredMinEUinPool, outHwInfo.pSysInfo->EuCountPerPoolMin); EXPECT_EQ((outHwInfo.pSysInfo->EUCount - outHwInfo.pSysInfo->EuCountPerPoolMin), outHwInfo.pSysInfo->EuCountPerPoolMax); + EXPECT_EQ(EngineType::ENGINE_RCS, outHwInfo.capabilityTable.defaultEngineType); EXPECT_EQ(GTTYPE_GTC, outHwInfo.pPlatform->eGTType); EXPECT_EQ(0u, outHwInfo.pSkuTable->ftrGT1); @@ -119,6 +121,7 @@ GLKTEST_F(HwInfoConfigTestLinuxGlk, configureHwInfo) { EXPECT_EQ((unsigned int)drm->StoredHasPooledEU, outHwInfo.pSkuTable->ftrPooledEuEnabled); EXPECT_EQ((uint32_t)drm->StoredMinEUinPool, outHwInfo.pSysInfo->EuCountPerPoolMin); EXPECT_EQ((outHwInfo.pSysInfo->EUCount - outHwInfo.pSysInfo->EuCountPerPoolMin), outHwInfo.pSysInfo->EuCountPerPoolMax); + EXPECT_EQ(EngineType::ENGINE_RCS, outHwInfo.capabilityTable.defaultEngineType); EXPECT_EQ(GTTYPE_GTX, outHwInfo.pPlatform->eGTType); EXPECT_EQ(0u, outHwInfo.pSkuTable->ftrGT1); diff --git a/unit_tests/gen9/kbl/linux/hw_info_config_tests.cpp b/unit_tests/gen9/kbl/linux/hw_info_config_tests.cpp index 81b09e45de..e9466a86cc 100644 --- a/unit_tests/gen9/kbl/linux/hw_info_config_tests.cpp +++ b/unit_tests/gen9/kbl/linux/hw_info_config_tests.cpp @@ -42,6 +42,7 @@ KBLTEST_F(HwInfoConfigTestLinuxKbl, configureHwInfo) { EXPECT_EQ((unsigned short)drm->StoredDeviceRevID, outHwInfo.pPlatform->usRevId); EXPECT_EQ((uint32_t)drm->StoredEUVal, outHwInfo.pSysInfo->EUCount); EXPECT_EQ((uint32_t)drm->StoredSSVal, outHwInfo.pSysInfo->SubSliceCount); + EXPECT_EQ(EngineType::ENGINE_RCS, outHwInfo.capabilityTable.defaultEngineType); EXPECT_EQ(GTTYPE_GT2, outHwInfo.pPlatform->eGTType); EXPECT_EQ(0u, outHwInfo.pSkuTable->ftrGT1); @@ -88,6 +89,7 @@ KBLTEST_F(HwInfoConfigTestLinuxKbl, configureHwInfo) { EXPECT_EQ((uint32_t)drm->StoredEUVal, outHwInfo.pSysInfo->EUCount); EXPECT_EQ((uint32_t)drm->StoredSSVal, outHwInfo.pSysInfo->SubSliceCount); EXPECT_EQ(1u, outHwInfo.pSysInfo->SliceCount); + EXPECT_EQ(EngineType::ENGINE_RCS, outHwInfo.capabilityTable.defaultEngineType); EXPECT_EQ(GTTYPE_GT1, outHwInfo.pPlatform->eGTType); EXPECT_EQ(1u, outHwInfo.pSkuTable->ftrGT1); @@ -109,6 +111,7 @@ KBLTEST_F(HwInfoConfigTestLinuxKbl, configureHwInfo) { EXPECT_EQ((unsigned short)drm->StoredDeviceRevID, outHwInfo.pPlatform->usRevId); EXPECT_EQ((uint32_t)drm->StoredEUVal, outHwInfo.pSysInfo->EUCount); EXPECT_EQ((uint32_t)drm->StoredSSVal, outHwInfo.pSysInfo->SubSliceCount); + EXPECT_EQ(EngineType::ENGINE_RCS, outHwInfo.capabilityTable.defaultEngineType); EXPECT_EQ(GTTYPE_GT1_5, outHwInfo.pPlatform->eGTType); EXPECT_EQ(0u, outHwInfo.pSkuTable->ftrGT1); @@ -132,6 +135,7 @@ KBLTEST_F(HwInfoConfigTestLinuxKbl, configureHwInfo) { EXPECT_EQ((uint32_t)drm->StoredEUVal, outHwInfo.pSysInfo->EUCount); EXPECT_EQ((uint32_t)drm->StoredSSVal, outHwInfo.pSysInfo->SubSliceCount); EXPECT_EQ(2u, outHwInfo.pSysInfo->SliceCount); + EXPECT_EQ(EngineType::ENGINE_RCS, outHwInfo.capabilityTable.defaultEngineType); EXPECT_EQ(GTTYPE_GT3, outHwInfo.pPlatform->eGTType); EXPECT_EQ(0u, outHwInfo.pSkuTable->ftrGT1); @@ -155,6 +159,7 @@ KBLTEST_F(HwInfoConfigTestLinuxKbl, configureHwInfo) { EXPECT_EQ((uint32_t)drm->StoredEUVal, outHwInfo.pSysInfo->EUCount); EXPECT_EQ((uint32_t)drm->StoredSSVal, outHwInfo.pSysInfo->SubSliceCount); EXPECT_EQ(2u, outHwInfo.pSysInfo->SliceCount); + EXPECT_EQ(EngineType::ENGINE_RCS, outHwInfo.capabilityTable.defaultEngineType); EXPECT_EQ(GTTYPE_GT4, outHwInfo.pPlatform->eGTType); EXPECT_EQ(0u, outHwInfo.pSkuTable->ftrGT1); diff --git a/unit_tests/gen9/skl/linux/hw_info_config_tests.cpp b/unit_tests/gen9/skl/linux/hw_info_config_tests.cpp index e058882923..59f0c9301f 100644 --- a/unit_tests/gen9/skl/linux/hw_info_config_tests.cpp +++ b/unit_tests/gen9/skl/linux/hw_info_config_tests.cpp @@ -42,6 +42,7 @@ SKLTEST_F(HwInfoConfigTestLinuxSkl, configureHwInfo) { EXPECT_EQ((unsigned short)drm->StoredDeviceRevID, outHwInfo.pPlatform->usRevId); EXPECT_EQ((uint32_t)drm->StoredEUVal, outHwInfo.pSysInfo->EUCount); EXPECT_EQ((uint32_t)drm->StoredSSVal, outHwInfo.pSysInfo->SubSliceCount); + EXPECT_EQ(EngineType::ENGINE_RCS, outHwInfo.capabilityTable.defaultEngineType); EXPECT_EQ(GTTYPE_GT2, outHwInfo.pPlatform->eGTType); EXPECT_EQ(0u, outHwInfo.pSkuTable->ftrGT1); @@ -90,6 +91,7 @@ SKLTEST_F(HwInfoConfigTestLinuxSkl, configureHwInfo) { EXPECT_EQ((uint32_t)drm->StoredEUVal, outHwInfo.pSysInfo->EUCount); EXPECT_EQ((uint32_t)drm->StoredSSVal, outHwInfo.pSysInfo->SubSliceCount); EXPECT_EQ(1u, outHwInfo.pSysInfo->SliceCount); + EXPECT_EQ(EngineType::ENGINE_RCS, outHwInfo.capabilityTable.defaultEngineType); EXPECT_EQ(GTTYPE_GT1, outHwInfo.pPlatform->eGTType); EXPECT_EQ(1u, outHwInfo.pSkuTable->ftrGT1); @@ -111,6 +113,7 @@ SKLTEST_F(HwInfoConfigTestLinuxSkl, configureHwInfo) { EXPECT_EQ((unsigned short)drm->StoredDeviceRevID, outHwInfo.pPlatform->usRevId); EXPECT_EQ((uint32_t)drm->StoredEUVal, outHwInfo.pSysInfo->EUCount); EXPECT_EQ((uint32_t)drm->StoredSSVal, outHwInfo.pSysInfo->SubSliceCount); + EXPECT_EQ(EngineType::ENGINE_RCS, outHwInfo.capabilityTable.defaultEngineType); EXPECT_EQ(GTTYPE_GT1_5, outHwInfo.pPlatform->eGTType); EXPECT_EQ(0u, outHwInfo.pSkuTable->ftrGT1); @@ -132,6 +135,7 @@ SKLTEST_F(HwInfoConfigTestLinuxSkl, configureHwInfo) { EXPECT_EQ((unsigned short)drm->StoredDeviceRevID, outHwInfo.pPlatform->usRevId); EXPECT_EQ((uint32_t)drm->StoredEUVal, outHwInfo.pSysInfo->EUCount); EXPECT_EQ((uint32_t)drm->StoredSSVal, outHwInfo.pSysInfo->SubSliceCount); + EXPECT_EQ(EngineType::ENGINE_RCS, outHwInfo.capabilityTable.defaultEngineType); EXPECT_EQ(GTTYPE_GT3, outHwInfo.pPlatform->eGTType); EXPECT_EQ(0u, outHwInfo.pSkuTable->ftrGT1); @@ -155,6 +159,7 @@ SKLTEST_F(HwInfoConfigTestLinuxSkl, configureHwInfo) { EXPECT_EQ((uint32_t)drm->StoredEUVal, outHwInfo.pSysInfo->EUCount); EXPECT_EQ((uint32_t)drm->StoredSSVal, outHwInfo.pSysInfo->SubSliceCount); EXPECT_EQ(2u, outHwInfo.pSysInfo->SliceCount); + EXPECT_EQ(EngineType::ENGINE_RCS, outHwInfo.capabilityTable.defaultEngineType); EXPECT_EQ(GTTYPE_GT4, outHwInfo.pPlatform->eGTType); EXPECT_EQ(0u, outHwInfo.pSkuTable->ftrGT1);