Skip to content

Commit cf4972d

Browse files
BartoszDunajskiCompute-Runtime-Automation
BartoszDunajski
authored and
Compute-Runtime-Automation
committed
Update abbreviation string.
Signed-off-by: Bartosz Dunajski <[email protected]>
1 parent a18fb40 commit cf4972d

File tree

20 files changed

+54
-54
lines changed

20 files changed

+54
-54
lines changed

‎cmake/setup_platform_flags.cmake‎

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -195,15 +195,15 @@ if(SUPPORT_XE_HP_CORE)
195195
if(TESTS_XE_HP_CORE)
196196
ADD_ITEM_FOR_GEN("FAMILY_NAME" "TESTED" "XE_HP_CORE" "XeHpFamily")
197197
endif()
198-
if(SUPPORT_XEHP)
199-
ADD_PRODUCT("SUPPORTED" "XEHP" "IGFX_XE_HP_SDV")
200-
ADD_PLATFORM_FOR_GEN("SUPPORTED" "XE_HP_CORE" "XEHP" "CORE")
201-
ADD_PLATFORM_FOR_GEN("SUPPORTED_IMAGES" "XE_HP_CORE" "XEHP" "CORE")
202-
set(PREFERRED_PLATFORM "XEHP")
203-
if(TESTS_XEHP)
198+
if(SUPPORT_XE_HP_SDV)
199+
ADD_PRODUCT("SUPPORTED" "XE_HP_SDV" "IGFX_XE_HP_SDV")
200+
ADD_PLATFORM_FOR_GEN("SUPPORTED" "XE_HP_CORE" "XE_HP_SDV" "CORE")
201+
ADD_PLATFORM_FOR_GEN("SUPPORTED_IMAGES" "XE_HP_CORE" "XE_HP_SDV" "CORE")
202+
set(PREFERRED_PLATFORM "XE_HP_SDV")
203+
if(TESTS_XE_HP_SDV)
204204
set(PREFERRED_FAMILY_NAME "XeHpFamily")
205-
ADD_ITEM_FOR_GEN("PLATFORMS" "TESTED" "XE_HP_CORE" "XEHP")
206-
ADD_PRODUCT("TESTED" "XEHP" "IGFX_XE_HP_SDV")
205+
ADD_ITEM_FOR_GEN("PLATFORMS" "TESTED" "XE_HP_CORE" "XE_HP_SDV")
206+
ADD_PRODUCT("TESTED" "XE_HP_SDV" "IGFX_XE_HP_SDV")
207207
endif()
208208
endif()
209209
endif()

‎level_zero/core/source/xe_hp_core/xehp/CMakeLists.txt‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
# SPDX-License-Identifier: MIT
55
#
66

7-
if(SUPPORT_XEHP)
7+
if(SUPPORT_XE_HP_SDV)
88
set(HW_SOURCES_XE_HP_CORE
99
${HW_SOURCES_XE_HP_CORE}
1010
${CMAKE_CURRENT_SOURCE_DIR}/CMakeLists.txt

‎manifests/manifest.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@ components:
2020
infra:
2121
branch: infra
2222
dest_dir: infra
23-
revision: be6a7e0f7eef3267e51ffa960d9976b0fa70cc04
23+
revision: 180b0b5df7178c5bf9944b1b8293c684c65ddf17
2424
type: git
2525
internal:
2626
branch: master

‎opencl/source/dll/get_devices.cpp‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,7 @@ bool prepareDeviceEnvironments(ExecutionEnvironment &executionEnvironment) {
3232
}
3333

3434
if (is32bit) {
35-
#ifdef SUPPORT_XEHP
35+
#ifdef SUPPORT_XE_HP_SDV
3636
if (executionEnvironment.rootDeviceEnvironments[i]->getHardwareInfo()->platform.eProductFamily == IGFX_XE_HP_SDV) {
3737
unsupportedDeviceDetected = true;
3838
}

‎opencl/source/xe_hp_core/definitions/hw_info_config_xehp.inl‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -5,16 +5,16 @@
55
*
66
*/
77

8-
const HardwareInfo XEHP::hwInfo = XEHP_CONFIG::hwInfo;
9-
const uint64_t XEHP::defaultHardwareInfoConfig = 0;
8+
const HardwareInfo XE_HP_SDV::hwInfo = XE_HP_SDV_CONFIG::hwInfo;
9+
const uint64_t XE_HP_SDV::defaultHardwareInfoConfig = 0;
1010

1111
void setupXEHPHardwareInfoImpl(HardwareInfo *hwInfo, bool setupFeatureTableAndWorkaroundTable, uint64_t hwInfoConfig) {
1212
if (hwInfoConfig == 0x0) {
1313
// Default config
14-
XEHP_CONFIG::setupHardwareInfo(hwInfo, setupFeatureTableAndWorkaroundTable);
14+
XE_HP_SDV_CONFIG::setupHardwareInfo(hwInfo, setupFeatureTableAndWorkaroundTable);
1515
} else {
1616
UNRECOVERABLE_IF(true);
1717
}
1818
}
1919

20-
void (*XEHP::setupHardwareInfo)(HardwareInfo *, bool, const uint64_t) = setupXEHPHardwareInfoImpl;
20+
void (*XE_HP_SDV::setupHardwareInfo)(HardwareInfo *, bool, const uint64_t) = setupXEHPHardwareInfoImpl;

‎opencl/source/xe_hp_core/hw_info_xe_hp_core.cpp‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
*
66
*/
77

8-
#ifdef SUPPORT_XEHP
8+
#ifdef SUPPORT_XE_HP_SDV
99
#include "hw_info_xehp.inl"
1010
#endif
1111

‎opencl/source/xe_hp_core/hw_info_xehp.inl‎

Lines changed: 18 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -15,13 +15,13 @@
1515

1616
namespace NEO {
1717

18-
const char *HwMapper<IGFX_XE_HP_SDV>::abbreviation = "xehp";
18+
const char *HwMapper<IGFX_XE_HP_SDV>::abbreviation = "xe_hp_sdv";
1919

2020
bool isSimulationXEHP(unsigned short deviceId) {
2121
return false;
2222
};
2323

24-
const PLATFORM XEHP::platform = {
24+
const PLATFORM XE_HP_SDV::platform = {
2525
IGFX_XE_HP_SDV,
2626
PCH_UNKNOWN,
2727
IGFX_XE_HP_CORE,
@@ -33,7 +33,7 @@ const PLATFORM XEHP::platform = {
3333
0, // usRevId_PCH
3434
GTTYPE_UNDEFINED};
3535

36-
const RuntimeCapabilityTable XEHP::capabilityTable{
36+
const RuntimeCapabilityTable XE_HP_SDV::capabilityTable{
3737
EngineDirectSubmissionInitVec{
3838
{aub_stream::ENGINE_RCS, {true, true, false, true}},
3939
{aub_stream::ENGINE_CCS, {true, true, false, true}}}, // directSubmissionEngines
@@ -49,7 +49,7 @@ const RuntimeCapabilityTable XEHP::capabilityTable{
4949
CmdServicesMemTraceVersion::DeviceValues::XeHP_SDV, // aubDeviceId
5050
0, // extraQuantityThreadsPerEU
5151
64, // slmSize
52-
sizeof(XEHP::GRF), // grfSize
52+
sizeof(XE_HP_SDV::GRF), // grfSize
5353
36u, // timestampValidBits
5454
32u, // kernelTimestampValidBits
5555
false, // blitterOperationsSupported
@@ -83,10 +83,10 @@ const RuntimeCapabilityTable XEHP::capabilityTable{
8383
true // fusedEuEnabled
8484
};
8585

86-
WorkaroundTable XEHP::workaroundTable = {};
87-
FeatureTable XEHP::featureTable = {};
86+
WorkaroundTable XE_HP_SDV::workaroundTable = {};
87+
FeatureTable XE_HP_SDV::featureTable = {};
8888

89-
void XEHP::setupFeatureAndWorkaroundTable(HardwareInfo *hwInfo) {
89+
void XE_HP_SDV::setupFeatureAndWorkaroundTable(HardwareInfo *hwInfo) {
9090
FeatureTable *featureTable = &hwInfo->featureTable;
9191
WorkaroundTable *workaroundTable = &hwInfo->workaroundTable;
9292

@@ -124,19 +124,19 @@ void XEHP::setupFeatureAndWorkaroundTable(HardwareInfo *hwInfo) {
124124
workaroundTable->waEnablePreemptionGranularityControlByUMD = true;
125125
};
126126

127-
const HardwareInfo XEHP_CONFIG::hwInfo = {
128-
&XEHP::platform,
129-
&XEHP::featureTable,
130-
&XEHP::workaroundTable,
131-
&XEHP_CONFIG::gtSystemInfo,
132-
XEHP::capabilityTable,
127+
const HardwareInfo XE_HP_SDV_CONFIG::hwInfo = {
128+
&XE_HP_SDV::platform,
129+
&XE_HP_SDV::featureTable,
130+
&XE_HP_SDV::workaroundTable,
131+
&XE_HP_SDV_CONFIG::gtSystemInfo,
132+
XE_HP_SDV::capabilityTable,
133133
};
134-
GT_SYSTEM_INFO XEHP_CONFIG::gtSystemInfo = {0};
135-
void XEHP_CONFIG::setupHardwareInfo(HardwareInfo *hwInfo, bool setupFeatureTableAndWorkaroundTable) {
136-
XEHP_CONFIG::setupHardwareInfoMultiTile(hwInfo, setupFeatureTableAndWorkaroundTable, false);
134+
GT_SYSTEM_INFO XE_HP_SDV_CONFIG::gtSystemInfo = {0};
135+
void XE_HP_SDV_CONFIG::setupHardwareInfo(HardwareInfo *hwInfo, bool setupFeatureTableAndWorkaroundTable) {
136+
XE_HP_SDV_CONFIG::setupHardwareInfoMultiTile(hwInfo, setupFeatureTableAndWorkaroundTable, false);
137137
}
138138

139-
void XEHP_CONFIG::setupHardwareInfoMultiTile(HardwareInfo *hwInfo, bool setupFeatureTableAndWorkaroundTable, bool setupMultiTile) {
139+
void XE_HP_SDV_CONFIG::setupHardwareInfoMultiTile(HardwareInfo *hwInfo, bool setupFeatureTableAndWorkaroundTable, bool setupMultiTile) {
140140
GT_SYSTEM_INFO *gtSysInfo = &hwInfo->gtSystemInfo;
141141
gtSysInfo->CsrSizeInMb = 8;
142142
gtSysInfo->IsL3HashModeEnabled = false;
@@ -153,7 +153,7 @@ void XEHP_CONFIG::setupHardwareInfoMultiTile(HardwareInfo *hwInfo, bool setupFea
153153
}
154154

155155
if (setupFeatureTableAndWorkaroundTable) {
156-
XEHP::setupFeatureAndWorkaroundTable(hwInfo);
156+
XE_HP_SDV::setupFeatureAndWorkaroundTable(hwInfo);
157157
}
158158
};
159159
#include "hw_info_config_xehp.inl"

‎opencl/test/unit_test/windows/get_devices_tests.cpp‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -53,7 +53,7 @@ HWTEST_F(PrepareDeviceEnvironmentsTests, Given32bitApplicationWhenPrepareDeviceE
5353

5454
switch (::productFamily) {
5555
case IGFX_UNKNOWN:
56-
#ifdef SUPPORT_XEHP
56+
#ifdef SUPPORT_XE_HP_SDV
5757
case IGFX_XE_HP_SDV:
5858
#endif
5959
EXPECT_FALSE(returnValue);

‎opencl/test/unit_test/xe_hp_core/xehp/CMakeLists.txt‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
# SPDX-License-Identifier: MIT
55
#
66

7-
if(TESTS_XEHP)
7+
if(TESTS_XE_HP_SDV)
88
set(IGDRCL_SRCS_tests_xe_hp_core_xehp
99
${CMAKE_CURRENT_SOURCE_DIR}/CMakeLists.txt
1010
${CMAKE_CURRENT_SOURCE_DIR}/cache_flush_tests_xehp.inl
@@ -26,6 +26,6 @@ if(TESTS_XEHP)
2626

2727
target_sources(igdrcl_tests PRIVATE ${IGDRCL_SRCS_tests_xe_hp_core_xehp})
2828
add_subdirectories()
29-
neo_copy_test_files_with_revision(copy_test_files_xehp_0 xehp 0)
30-
add_dependencies(copy_test_files_per_product copy_test_files_xehp_0)
29+
neo_copy_test_files_with_revision(copy_test_files_xe_hp_sdv_0 xe_hp_sdv 0)
30+
add_dependencies(copy_test_files_per_product copy_test_files_xe_hp_sdv_0)
3131
endif()

‎opencl/test/unit_test/xe_hp_core/xehp/hw_info_tests_xehp.inl‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,7 @@ XEHPTEST_F(XeHPHwInfoTest, whenSetupHardwareInfoWithSetupFeatureTableFlagTrueOrF
3535
EXPECT_FALSE(gtSystemInfo.IsDynamicallyPopulated);
3636
EXPECT_EQ(8u, gtSystemInfo.CsrSizeInMb);
3737

38-
XEHP_CONFIG::setupHardwareInfo(&hwInfo, false);
38+
XE_HP_SDV_CONFIG::setupHardwareInfo(&hwInfo, false);
3939
EXPECT_FALSE(featureTable.ftrLocalMemory);
4040
EXPECT_FALSE(featureTable.ftrFlatPhysCCS);
4141
EXPECT_FALSE(featureTable.ftrLinearCCS);
@@ -50,7 +50,7 @@ XEHPTEST_F(XeHPHwInfoTest, whenSetupHardwareInfoWithSetupFeatureTableFlagTrueOrF
5050
EXPECT_FALSE(gtSystemInfo.IsDynamicallyPopulated);
5151
EXPECT_EQ(8u, gtSystemInfo.CsrSizeInMb);
5252

53-
XEHP_CONFIG::setupHardwareInfo(&hwInfo, true);
53+
XE_HP_SDV_CONFIG::setupHardwareInfo(&hwInfo, true);
5454
EXPECT_TRUE(featureTable.ftrLocalMemory);
5555
EXPECT_TRUE(featureTable.ftrFlatPhysCCS);
5656
EXPECT_TRUE(featureTable.ftrLinearCCS);
@@ -71,13 +71,13 @@ XEHPTEST_F(XeHPHwInfoTest, givenAlreadyInitializedHwInfoWhenSetupCalledThenDontO
7171

7272
hwInfo.gtSystemInfo.SliceCount = 0;
7373

74-
XEHP_CONFIG::setupHardwareInfo(&hwInfo, false);
74+
XE_HP_SDV_CONFIG::setupHardwareInfo(&hwInfo, false);
7575

7676
EXPECT_NE(0u, hwInfo.gtSystemInfo.SliceCount);
7777

7878
auto expectedValue = ++hwInfo.gtSystemInfo.SliceCount;
7979

80-
XEHP_CONFIG::setupHardwareInfo(&hwInfo, false);
80+
XE_HP_SDV_CONFIG::setupHardwareInfo(&hwInfo, false);
8181

8282
EXPECT_EQ(expectedValue, hwInfo.gtSystemInfo.SliceCount);
8383
}

0 commit comments

Comments
 (0)