Skip to content

Commit 50ef7c0

Browse files
zzdanowiczCompute-Runtime-Automation
zzdanowicz
authored and
Compute-Runtime-Automation
committed
Adjust default engine type in Linux
Change-Id: I2cc7e4078e830f0844d6dc6fe7b4bfcdf92b0095
1 parent 961d1e2 commit 50ef7c0

File tree

8 files changed

+24
-1
lines changed

8 files changed

+24
-1
lines changed

‎runtime/device/device_caps.cpp‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -43,7 +43,7 @@ static std::string spirVersions = "1.2 ";
4343
static const char *spirvVersion = "SPIR-V_1.0 ";
4444
#define QTR(a) #a
4545
#define TOSTR(b) QTR(b)
46-
static std::string driverVersion;
46+
static std::string driverVersion = TOSTR(NEO_DRIVER_VERSION);
4747

4848
const char *builtInKernels = ""; // the "always available" (extension-independent) builtin kernels
4949

‎runtime/os_interface/linux/hw_info_config.cpp‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -166,6 +166,7 @@ int HwInfoConfig::configureHwInfo(const HardwareInfo *inHwInfo, HardwareInfo *ou
166166
HwHelper &hwHelper = HwHelper::get(pPlatform->eRenderCoreFamily);
167167
outHwInfo->capabilityTable.ftrSupportsCoherency = false;
168168

169+
hwHelper.adjustDefaultEngineType(outHwInfo);
169170
outHwInfo->capabilityTable.defaultEngineType = DebugManager.flags.NodeOrdinal.get() == -1
170171
? outHwInfo->capabilityTable.defaultEngineType
171172
: static_cast<EngineType>(DebugManager.flags.NodeOrdinal.get());

‎unit_tests/gen8/linux/hw_info_config_tests.cpp‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -44,6 +44,7 @@ BDWTEST_F(HwInfoConfigTestLinuxBdw, configureHwInfo) {
4444
EXPECT_EQ((uint32_t)drm->StoredEUVal, outHwInfo.pSysInfo->EUCount);
4545
EXPECT_EQ((uint32_t)drm->StoredSSVal, outHwInfo.pSysInfo->SubSliceCount);
4646
EXPECT_EQ(1u, outHwInfo.pSysInfo->SliceCount);
47+
EXPECT_EQ(EngineType::ENGINE_RCS, outHwInfo.capabilityTable.defaultEngineType);
4748

4849
EXPECT_EQ(GTTYPE_GT2, outHwInfo.pPlatform->eGTType);
4950
EXPECT_EQ(0u, outHwInfo.pSkuTable->ftrGT1);
@@ -65,6 +66,7 @@ BDWTEST_F(HwInfoConfigTestLinuxBdw, configureHwInfo) {
6566
EXPECT_EQ((unsigned short)drm->StoredDeviceRevID, outHwInfo.pPlatform->usRevId);
6667
EXPECT_EQ((uint32_t)drm->StoredEUVal, outHwInfo.pSysInfo->EUCount);
6768
EXPECT_EQ((uint32_t)drm->StoredSSVal, outHwInfo.pSysInfo->SubSliceCount);
69+
EXPECT_EQ(EngineType::ENGINE_RCS, outHwInfo.capabilityTable.defaultEngineType);
6870

6971
EXPECT_EQ(GTTYPE_GT1, outHwInfo.pPlatform->eGTType);
7072
EXPECT_EQ(1u, outHwInfo.pSkuTable->ftrGT1);
@@ -88,6 +90,7 @@ BDWTEST_F(HwInfoConfigTestLinuxBdw, configureHwInfo) {
8890
EXPECT_EQ((uint32_t)drm->StoredEUVal, outHwInfo.pSysInfo->EUCount);
8991
EXPECT_EQ((uint32_t)drm->StoredSSVal, outHwInfo.pSysInfo->SubSliceCount);
9092
EXPECT_EQ(2u, outHwInfo.pSysInfo->SliceCount);
93+
EXPECT_EQ(EngineType::ENGINE_RCS, outHwInfo.capabilityTable.defaultEngineType);
9194

9295
EXPECT_EQ(GTTYPE_GT3, outHwInfo.pPlatform->eGTType);
9396
EXPECT_EQ(0u, outHwInfo.pSkuTable->ftrGT1);

‎unit_tests/gen9/bxt/linux/hw_info_config_tests.cpp‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -50,6 +50,7 @@ BXTTEST_F(HwInfoConfigTestLinuxBxt, configureHwInfo) {
5050
EXPECT_EQ((uint32_t)drm->StoredMinEUinPool, outHwInfo.pSysInfo->EuCountPerPoolMin);
5151
EXPECT_EQ((outHwInfo.pSysInfo->EUCount - outHwInfo.pSysInfo->EuCountPerPoolMin), outHwInfo.pSysInfo->EuCountPerPoolMax);
5252
EXPECT_EQ(0u, outHwInfo.pSkuTable->ftrGttCacheInvalidation);
53+
EXPECT_EQ(EngineType::ENGINE_RCS, outHwInfo.capabilityTable.defaultEngineType);
5354

5455
//constant sysInfo/ftr flags
5556
EXPECT_EQ(1u, outHwInfo.pSysInfo->VEBoxInfo.Instances.Bits.VEBox0Enabled);
@@ -101,6 +102,7 @@ BXTTEST_F(HwInfoConfigTestLinuxBxt, configureHwInfo) {
101102
EXPECT_EQ((uint32_t)drm->StoredMinEUinPool, outHwInfo.pSysInfo->EuCountPerPoolMin);
102103
EXPECT_EQ((outHwInfo.pSysInfo->EUCount - outHwInfo.pSysInfo->EuCountPerPoolMin), outHwInfo.pSysInfo->EuCountPerPoolMax);
103104
EXPECT_EQ(1u, outHwInfo.pSkuTable->ftrGttCacheInvalidation);
105+
EXPECT_EQ(EngineType::ENGINE_RCS, outHwInfo.capabilityTable.defaultEngineType);
104106

105107
EXPECT_EQ(GTTYPE_GTC, outHwInfo.pPlatform->eGTType);
106108
EXPECT_EQ(0u, outHwInfo.pSkuTable->ftrGT1);
@@ -126,6 +128,7 @@ BXTTEST_F(HwInfoConfigTestLinuxBxt, configureHwInfo) {
126128
EXPECT_EQ((unsigned int)drm->StoredHasPooledEU, outHwInfo.pSkuTable->ftrPooledEuEnabled);
127129
EXPECT_EQ((uint32_t)drm->StoredMinEUinPool, outHwInfo.pSysInfo->EuCountPerPoolMin);
128130
EXPECT_EQ((outHwInfo.pSysInfo->EUCount - outHwInfo.pSysInfo->EuCountPerPoolMin), outHwInfo.pSysInfo->EuCountPerPoolMax);
131+
EXPECT_EQ(EngineType::ENGINE_RCS, outHwInfo.capabilityTable.defaultEngineType);
129132

130133
EXPECT_EQ(GTTYPE_GTX, outHwInfo.pPlatform->eGTType);
131134
EXPECT_EQ(0u, outHwInfo.pSkuTable->ftrGT1);

‎unit_tests/gen9/cfl/linux/hw_info_config_tests.cpp‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -42,6 +42,7 @@ CFLTEST_F(HwInfoConfigTestLinuxCfl, configureHwInfo) {
4242
EXPECT_EQ((unsigned short)drm->StoredDeviceRevID, outHwInfo.pPlatform->usRevId);
4343
EXPECT_EQ((uint32_t)drm->StoredEUVal, outHwInfo.pSysInfo->EUCount);
4444
EXPECT_EQ((uint32_t)drm->StoredSSVal, outHwInfo.pSysInfo->SubSliceCount);
45+
EXPECT_EQ(EngineType::ENGINE_RCS, outHwInfo.capabilityTable.defaultEngineType);
4546

4647
EXPECT_EQ(GTTYPE_GT2, outHwInfo.pPlatform->eGTType);
4748
EXPECT_EQ(0u, outHwInfo.pSkuTable->ftrGT1);
@@ -88,6 +89,7 @@ CFLTEST_F(HwInfoConfigTestLinuxCfl, configureHwInfo) {
8889
EXPECT_EQ((uint32_t)drm->StoredEUVal, outHwInfo.pSysInfo->EUCount);
8990
EXPECT_EQ((uint32_t)drm->StoredSSVal, outHwInfo.pSysInfo->SubSliceCount);
9091
EXPECT_EQ(1u, outHwInfo.pSysInfo->SliceCount);
92+
EXPECT_EQ(EngineType::ENGINE_RCS, outHwInfo.capabilityTable.defaultEngineType);
9193

9294
EXPECT_EQ(GTTYPE_GT1, outHwInfo.pPlatform->eGTType);
9395
EXPECT_EQ(1u, outHwInfo.pSkuTable->ftrGT1);
@@ -111,6 +113,7 @@ CFLTEST_F(HwInfoConfigTestLinuxCfl, configureHwInfo) {
111113
EXPECT_EQ((uint32_t)drm->StoredEUVal, outHwInfo.pSysInfo->EUCount);
112114
EXPECT_EQ((uint32_t)drm->StoredSSVal, outHwInfo.pSysInfo->SubSliceCount);
113115
EXPECT_EQ(2u, outHwInfo.pSysInfo->SliceCount);
116+
EXPECT_EQ(EngineType::ENGINE_RCS, outHwInfo.capabilityTable.defaultEngineType);
114117

115118
EXPECT_EQ(GTTYPE_GT3, outHwInfo.pPlatform->eGTType);
116119
EXPECT_EQ(0u, outHwInfo.pSkuTable->ftrGT1);

‎unit_tests/gen9/glk/linux/hw_info_config_tests.cpp‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -48,6 +48,7 @@ GLKTEST_F(HwInfoConfigTestLinuxGlk, configureHwInfo) {
4848
EXPECT_EQ((unsigned short)drm->StoredDeviceRevID, outHwInfo.pPlatform->usRevId);
4949
EXPECT_EQ((uint32_t)drm->StoredEUVal, outHwInfo.pSysInfo->EUCount);
5050
EXPECT_EQ((uint32_t)drm->StoredSSVal, outHwInfo.pSysInfo->SubSliceCount);
51+
EXPECT_EQ(EngineType::ENGINE_RCS, outHwInfo.capabilityTable.defaultEngineType);
5152

5253
EXPECT_EQ(GTTYPE_GTA, outHwInfo.pPlatform->eGTType);
5354
EXPECT_EQ(0u, outHwInfo.pSkuTable->ftrGT1);
@@ -94,6 +95,7 @@ GLKTEST_F(HwInfoConfigTestLinuxGlk, configureHwInfo) {
9495
EXPECT_EQ((unsigned int)drm->StoredHasPooledEU, outHwInfo.pSkuTable->ftrPooledEuEnabled);
9596
EXPECT_EQ((uint32_t)drm->StoredMinEUinPool, outHwInfo.pSysInfo->EuCountPerPoolMin);
9697
EXPECT_EQ((outHwInfo.pSysInfo->EUCount - outHwInfo.pSysInfo->EuCountPerPoolMin), outHwInfo.pSysInfo->EuCountPerPoolMax);
98+
EXPECT_EQ(EngineType::ENGINE_RCS, outHwInfo.capabilityTable.defaultEngineType);
9799

98100
EXPECT_EQ(GTTYPE_GTC, outHwInfo.pPlatform->eGTType);
99101
EXPECT_EQ(0u, outHwInfo.pSkuTable->ftrGT1);
@@ -119,6 +121,7 @@ GLKTEST_F(HwInfoConfigTestLinuxGlk, configureHwInfo) {
119121
EXPECT_EQ((unsigned int)drm->StoredHasPooledEU, outHwInfo.pSkuTable->ftrPooledEuEnabled);
120122
EXPECT_EQ((uint32_t)drm->StoredMinEUinPool, outHwInfo.pSysInfo->EuCountPerPoolMin);
121123
EXPECT_EQ((outHwInfo.pSysInfo->EUCount - outHwInfo.pSysInfo->EuCountPerPoolMin), outHwInfo.pSysInfo->EuCountPerPoolMax);
124+
EXPECT_EQ(EngineType::ENGINE_RCS, outHwInfo.capabilityTable.defaultEngineType);
122125

123126
EXPECT_EQ(GTTYPE_GTX, outHwInfo.pPlatform->eGTType);
124127
EXPECT_EQ(0u, outHwInfo.pSkuTable->ftrGT1);

‎unit_tests/gen9/kbl/linux/hw_info_config_tests.cpp‎

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -42,6 +42,7 @@ KBLTEST_F(HwInfoConfigTestLinuxKbl, configureHwInfo) {
4242
EXPECT_EQ((unsigned short)drm->StoredDeviceRevID, outHwInfo.pPlatform->usRevId);
4343
EXPECT_EQ((uint32_t)drm->StoredEUVal, outHwInfo.pSysInfo->EUCount);
4444
EXPECT_EQ((uint32_t)drm->StoredSSVal, outHwInfo.pSysInfo->SubSliceCount);
45+
EXPECT_EQ(EngineType::ENGINE_RCS, outHwInfo.capabilityTable.defaultEngineType);
4546

4647
EXPECT_EQ(GTTYPE_GT2, outHwInfo.pPlatform->eGTType);
4748
EXPECT_EQ(0u, outHwInfo.pSkuTable->ftrGT1);
@@ -88,6 +89,7 @@ KBLTEST_F(HwInfoConfigTestLinuxKbl, configureHwInfo) {
8889
EXPECT_EQ((uint32_t)drm->StoredEUVal, outHwInfo.pSysInfo->EUCount);
8990
EXPECT_EQ((uint32_t)drm->StoredSSVal, outHwInfo.pSysInfo->SubSliceCount);
9091
EXPECT_EQ(1u, outHwInfo.pSysInfo->SliceCount);
92+
EXPECT_EQ(EngineType::ENGINE_RCS, outHwInfo.capabilityTable.defaultEngineType);
9193

9294
EXPECT_EQ(GTTYPE_GT1, outHwInfo.pPlatform->eGTType);
9395
EXPECT_EQ(1u, outHwInfo.pSkuTable->ftrGT1);
@@ -109,6 +111,7 @@ KBLTEST_F(HwInfoConfigTestLinuxKbl, configureHwInfo) {
109111
EXPECT_EQ((unsigned short)drm->StoredDeviceRevID, outHwInfo.pPlatform->usRevId);
110112
EXPECT_EQ((uint32_t)drm->StoredEUVal, outHwInfo.pSysInfo->EUCount);
111113
EXPECT_EQ((uint32_t)drm->StoredSSVal, outHwInfo.pSysInfo->SubSliceCount);
114+
EXPECT_EQ(EngineType::ENGINE_RCS, outHwInfo.capabilityTable.defaultEngineType);
112115

113116
EXPECT_EQ(GTTYPE_GT1_5, outHwInfo.pPlatform->eGTType);
114117
EXPECT_EQ(0u, outHwInfo.pSkuTable->ftrGT1);
@@ -132,6 +135,7 @@ KBLTEST_F(HwInfoConfigTestLinuxKbl, configureHwInfo) {
132135
EXPECT_EQ((uint32_t)drm->StoredEUVal, outHwInfo.pSysInfo->EUCount);
133136
EXPECT_EQ((uint32_t)drm->StoredSSVal, outHwInfo.pSysInfo->SubSliceCount);
134137
EXPECT_EQ(2u, outHwInfo.pSysInfo->SliceCount);
138+
EXPECT_EQ(EngineType::ENGINE_RCS, outHwInfo.capabilityTable.defaultEngineType);
135139

136140
EXPECT_EQ(GTTYPE_GT3, outHwInfo.pPlatform->eGTType);
137141
EXPECT_EQ(0u, outHwInfo.pSkuTable->ftrGT1);
@@ -155,6 +159,7 @@ KBLTEST_F(HwInfoConfigTestLinuxKbl, configureHwInfo) {
155159
EXPECT_EQ((uint32_t)drm->StoredEUVal, outHwInfo.pSysInfo->EUCount);
156160
EXPECT_EQ((uint32_t)drm->StoredSSVal, outHwInfo.pSysInfo->SubSliceCount);
157161
EXPECT_EQ(2u, outHwInfo.pSysInfo->SliceCount);
162+
EXPECT_EQ(EngineType::ENGINE_RCS, outHwInfo.capabilityTable.defaultEngineType);
158163

159164
EXPECT_EQ(GTTYPE_GT4, outHwInfo.pPlatform->eGTType);
160165
EXPECT_EQ(0u, outHwInfo.pSkuTable->ftrGT1);

‎unit_tests/gen9/skl/linux/hw_info_config_tests.cpp‎

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -42,6 +42,7 @@ SKLTEST_F(HwInfoConfigTestLinuxSkl, configureHwInfo) {
4242
EXPECT_EQ((unsigned short)drm->StoredDeviceRevID, outHwInfo.pPlatform->usRevId);
4343
EXPECT_EQ((uint32_t)drm->StoredEUVal, outHwInfo.pSysInfo->EUCount);
4444
EXPECT_EQ((uint32_t)drm->StoredSSVal, outHwInfo.pSysInfo->SubSliceCount);
45+
EXPECT_EQ(EngineType::ENGINE_RCS, outHwInfo.capabilityTable.defaultEngineType);
4546

4647
EXPECT_EQ(GTTYPE_GT2, outHwInfo.pPlatform->eGTType);
4748
EXPECT_EQ(0u, outHwInfo.pSkuTable->ftrGT1);
@@ -90,6 +91,7 @@ SKLTEST_F(HwInfoConfigTestLinuxSkl, configureHwInfo) {
9091
EXPECT_EQ((uint32_t)drm->StoredEUVal, outHwInfo.pSysInfo->EUCount);
9192
EXPECT_EQ((uint32_t)drm->StoredSSVal, outHwInfo.pSysInfo->SubSliceCount);
9293
EXPECT_EQ(1u, outHwInfo.pSysInfo->SliceCount);
94+
EXPECT_EQ(EngineType::ENGINE_RCS, outHwInfo.capabilityTable.defaultEngineType);
9395

9496
EXPECT_EQ(GTTYPE_GT1, outHwInfo.pPlatform->eGTType);
9597
EXPECT_EQ(1u, outHwInfo.pSkuTable->ftrGT1);
@@ -111,6 +113,7 @@ SKLTEST_F(HwInfoConfigTestLinuxSkl, configureHwInfo) {
111113
EXPECT_EQ((unsigned short)drm->StoredDeviceRevID, outHwInfo.pPlatform->usRevId);
112114
EXPECT_EQ((uint32_t)drm->StoredEUVal, outHwInfo.pSysInfo->EUCount);
113115
EXPECT_EQ((uint32_t)drm->StoredSSVal, outHwInfo.pSysInfo->SubSliceCount);
116+
EXPECT_EQ(EngineType::ENGINE_RCS, outHwInfo.capabilityTable.defaultEngineType);
114117

115118
EXPECT_EQ(GTTYPE_GT1_5, outHwInfo.pPlatform->eGTType);
116119
EXPECT_EQ(0u, outHwInfo.pSkuTable->ftrGT1);
@@ -132,6 +135,7 @@ SKLTEST_F(HwInfoConfigTestLinuxSkl, configureHwInfo) {
132135
EXPECT_EQ((unsigned short)drm->StoredDeviceRevID, outHwInfo.pPlatform->usRevId);
133136
EXPECT_EQ((uint32_t)drm->StoredEUVal, outHwInfo.pSysInfo->EUCount);
134137
EXPECT_EQ((uint32_t)drm->StoredSSVal, outHwInfo.pSysInfo->SubSliceCount);
138+
EXPECT_EQ(EngineType::ENGINE_RCS, outHwInfo.capabilityTable.defaultEngineType);
135139

136140
EXPECT_EQ(GTTYPE_GT3, outHwInfo.pPlatform->eGTType);
137141
EXPECT_EQ(0u, outHwInfo.pSkuTable->ftrGT1);
@@ -155,6 +159,7 @@ SKLTEST_F(HwInfoConfigTestLinuxSkl, configureHwInfo) {
155159
EXPECT_EQ((uint32_t)drm->StoredEUVal, outHwInfo.pSysInfo->EUCount);
156160
EXPECT_EQ((uint32_t)drm->StoredSSVal, outHwInfo.pSysInfo->SubSliceCount);
157161
EXPECT_EQ(2u, outHwInfo.pSysInfo->SliceCount);
162+
EXPECT_EQ(EngineType::ENGINE_RCS, outHwInfo.capabilityTable.defaultEngineType);
158163

159164
EXPECT_EQ(GTTYPE_GT4, outHwInfo.pPlatform->eGTType);
160165
EXPECT_EQ(0u, outHwInfo.pSkuTable->ftrGT1);

0 commit comments

Comments
 (0)