Skip to content

Commit 0cde8eb

Browse files
JablonskiMateuszCompute-Runtime-Automation
JablonskiMateusz
authored and
Compute-Runtime-Automation
committed
Change default revision for xe_hp_sdv
Signed-off-by: Mateusz Jablonski <mateusz.jablonski@intel.com>
1 parent 5869948 commit 0cde8eb

20 files changed

+95
-213
lines changed

‎cmake/setup_platform_flags.cmake‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -208,7 +208,7 @@ endif()
208208

209209
if(SUPPORT_XE_HP_CORE)
210210
SET_FLAGS_FOR("XE_HP_CORE")
211-
set(CORE_XE_HP_CORE_REVISIONS 0)
211+
set(CORE_XE_HP_CORE_REVISIONS 4)
212212
if(TESTS_XE_HP_CORE)
213213
if(TESTS_XE_HP_SDV)
214214
ADD_ITEM_FOR_GEN("FAMILY_NAME" "TESTED" "XE_HP_CORE" "XeHpFamily")

‎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: master
2222
dest_dir: infra
23-
revision: a3577a9aeb5fcc4b825ceaa521631aa676931512
23+
revision: 493155e4b2e3df7e81ced35f1d29c5fa9dc29db4
2424
type: git
2525
internal:
2626
branch: master

‎opencl/test/unit_test/context/driver_diagnostics_tests.cpp‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -705,7 +705,7 @@ TEST_F(PerformanceHintTest, givenUncompressedBufferWhenItsCreatedThenProperPerfo
705705
}
706706
snprintf(expectedHint, DriverDiagnostics::maxHintStringSize, DriverDiagnostics::hintFormat[BUFFER_IS_NOT_COMPRESSED], buffer.get());
707707

708-
if (isCompressed) {
708+
if (isCompressed || is32bit) {
709709
Buffer::provideCompressionHint(GraphicsAllocation::AllocationType::BUFFER, context.get(), buffer.get());
710710
}
711711
EXPECT_TRUE(containsHint(expectedHint, userData));

‎opencl/test/unit_test/fixtures/device_info_fixture.h‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@ struct GetDeviceInfoMemCapabilitiesTest : ::testing::Test {
2323
void check(std::vector<TestParams> &params) {
2424
auto device = std::make_unique<MockClDevice>(MockDevice::createWithNewExecutionEnvironment<MockDevice>(nullptr));
2525

26-
for (auto param : params) {
26+
for (auto &param : params) {
2727
cl_unified_shared_memory_capabilities_intel unifiedSharedMemoryCapabilities{};
2828
size_t paramRetSize;
2929

‎opencl/test/unit_test/helpers/hw_helper_tests.cpp‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1221,7 +1221,7 @@ TEST_F(HwHelperTest, whenFtrGpGpuMidThreadLevelPreemptFeatureDisabledThenFalseIs
12211221
EXPECT_FALSE(result);
12221222
}
12231223

1224-
TEST_F(HwHelperTest, whenGettingDefaultRevisionIdThenCorrectValueIsReturned) {
1224+
HWTEST_F(HwHelperTest, whenGettingDefaultRevisionIdThenCorrectValueIsReturned) {
12251225
auto &hwHelper = HwHelper::get(renderCoreFamily);
12261226
auto revisionId = hwHelper.getDefaultRevisionId(*defaultHwInfo);
12271227
if ((defaultHwInfo->platform.eRenderCoreFamily == IGFX_GEN9_CORE) &&

‎opencl/test/unit_test/helpers/hw_helper_tests_xehp_and_later.cpp‎

Lines changed: 20 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -364,19 +364,27 @@ HWCMDTEST_F(IGFX_XE_HP_CORE, HwHelperTestXeHPAndLater, WhenIsPipeControlWArequir
364364

365365
HWCMDTEST_F(IGFX_XE_HP_CORE, HwHelperTestXeHPAndLater, whenGettingPreferenceForSmallKernelsThenCertainThresholdIsTested) {
366366
DebugManagerStateRestore restorer;
367+
auto &hwInfo = pDevice->getHardwareInfo();
367368
auto &helper = HwHelper::get(renderCoreFamily);
368-
EXPECT_TRUE(helper.preferSmallWorkgroupSizeForKernel(512u, this->pClDevice->getHardwareInfo()));
369-
EXPECT_FALSE(helper.preferSmallWorkgroupSizeForKernel(10000u, this->pClDevice->getHardwareInfo()));
370-
EXPECT_TRUE(helper.preferSmallWorkgroupSizeForKernel(2047u, this->pClDevice->getHardwareInfo()));
371-
EXPECT_FALSE(helper.preferSmallWorkgroupSizeForKernel(2048u, this->pClDevice->getHardwareInfo()));
372-
373-
DebugManager.flags.OverrideKernelSizeLimitForSmallDispatch.set(1u);
374-
EXPECT_FALSE(helper.preferSmallWorkgroupSizeForKernel(1u, this->pClDevice->getHardwareInfo()));
375-
EXPECT_TRUE(helper.preferSmallWorkgroupSizeForKernel(0u, this->pClDevice->getHardwareInfo()));
376-
377-
DebugManager.flags.OverrideKernelSizeLimitForSmallDispatch.set(0u);
378-
EXPECT_FALSE(helper.preferSmallWorkgroupSizeForKernel(1u, this->pClDevice->getHardwareInfo()));
379-
EXPECT_FALSE(helper.preferSmallWorkgroupSizeForKernel(0u, this->pClDevice->getHardwareInfo()));
369+
if (HwInfoConfig::get(hwInfo.platform.eProductFamily)->getSteppingFromHwRevId(hwInfo) >= REVISION_B) {
370+
EXPECT_FALSE(helper.preferSmallWorkgroupSizeForKernel(512u, hwInfo));
371+
EXPECT_FALSE(helper.preferSmallWorkgroupSizeForKernel(10000u, hwInfo));
372+
EXPECT_FALSE(helper.preferSmallWorkgroupSizeForKernel(2047u, hwInfo));
373+
EXPECT_FALSE(helper.preferSmallWorkgroupSizeForKernel(2048u, hwInfo));
374+
} else {
375+
EXPECT_TRUE(helper.preferSmallWorkgroupSizeForKernel(512u, hwInfo));
376+
EXPECT_FALSE(helper.preferSmallWorkgroupSizeForKernel(10000u, hwInfo));
377+
EXPECT_TRUE(helper.preferSmallWorkgroupSizeForKernel(2047u, hwInfo));
378+
EXPECT_FALSE(helper.preferSmallWorkgroupSizeForKernel(2048u, hwInfo));
379+
380+
DebugManager.flags.OverrideKernelSizeLimitForSmallDispatch.set(1u);
381+
EXPECT_FALSE(helper.preferSmallWorkgroupSizeForKernel(1u, hwInfo));
382+
EXPECT_TRUE(helper.preferSmallWorkgroupSizeForKernel(0u, hwInfo));
383+
384+
DebugManager.flags.OverrideKernelSizeLimitForSmallDispatch.set(0u);
385+
EXPECT_FALSE(helper.preferSmallWorkgroupSizeForKernel(1u, hwInfo));
386+
EXPECT_FALSE(helper.preferSmallWorkgroupSizeForKernel(0u, hwInfo));
387+
}
380388
}
381389

382390
HWCMDTEST_F(IGFX_XE_HP_CORE, HwHelperTestXeHPAndLater, givenHwHelperWhenGettingBindlessSurfaceExtendedMessageDescriptorValueThenCorrectValueIsReturned) {

‎opencl/test/unit_test/memory_manager/CMakeLists.txt‎

Lines changed: 0 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -33,12 +33,5 @@ if(UNIX)
3333
list(APPEND IGDRCL_SRCS_tests_memory_manager ${NEO_CORE_PAGE_FAULT_MANAGER_LINUX_TESTS})
3434
endif()
3535

36-
if(TESTS_XEHP_AND_LATER)
37-
list(APPEND IGDRCL_SRCS_tests_memory_manager
38-
${CMAKE_CURRENT_SOURCE_DIR}/memory_manager_tests_xehp_and_later.cpp
39-
${CMAKE_CURRENT_SOURCE_DIR}/memory_manager_tests_xehp_and_later.h
40-
)
41-
endif()
42-
4336
target_sources(igdrcl_tests PRIVATE ${IGDRCL_SRCS_tests_memory_manager})
4437
add_subdirectories()

‎opencl/test/unit_test/memory_manager/memory_manager_allocate_in_preferred_pool_tests.cpp‎

Lines changed: 34 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -713,6 +713,40 @@ HWTEST_F(GetAllocationDataTestHw, givenInternalHeapTypeWhenGetAllocationDataIsCa
713713
EXPECT_TRUE(allocData.flags.requiresCpuAccess);
714714
}
715715

716+
HWTEST_F(GetAllocationDataTestHw, givenGpuTimestampDeviceBufferTypeWhenGetAllocationDataIsCalledThenSystemMemoryIsNotRequested) {
717+
AllocationData allocData;
718+
MockMemoryManager mockMemoryManager;
719+
AllocationProperties properties{mockRootDeviceIndex, 1, GraphicsAllocation::AllocationType::GPU_TIMESTAMP_DEVICE_BUFFER, mockDeviceBitfield};
720+
mockMemoryManager.getAllocationData(allocData, properties, nullptr, mockMemoryManager.createStorageInfoFromProperties(properties));
721+
EXPECT_FALSE(allocData.flags.useSystemMemory);
722+
EXPECT_TRUE(allocData.flags.requiresCpuAccess);
723+
}
724+
HWTEST_F(GetAllocationDataTestHw, givenPrintfAllocationWhenGetAllocationDataIsCalledThenDontForceSystemMemoryAndRequireCpuAccess) {
725+
AllocationData allocData;
726+
MockMemoryManager mockMemoryManager;
727+
AllocationProperties properties{mockRootDeviceIndex, 1, GraphicsAllocation::AllocationType::GPU_TIMESTAMP_DEVICE_BUFFER, mockDeviceBitfield};
728+
mockMemoryManager.getAllocationData(allocData, properties, nullptr, mockMemoryManager.createStorageInfoFromProperties(properties));
729+
EXPECT_FALSE(allocData.flags.useSystemMemory);
730+
EXPECT_TRUE(allocData.flags.requiresCpuAccess);
731+
}
732+
733+
HWTEST_F(GetAllocationDataTestHw, givenLinearStreamAllocationWhenGetAllocationDataIsCalledThenDontForceSystemMemoryAndRequireCpuAccess) {
734+
AllocationData allocData;
735+
MockMemoryManager mockMemoryManager;
736+
AllocationProperties properties{mockRootDeviceIndex, 1, GraphicsAllocation::AllocationType::LINEAR_STREAM, mockDeviceBitfield};
737+
mockMemoryManager.getAllocationData(allocData, properties, nullptr, mockMemoryManager.createStorageInfoFromProperties(properties));
738+
EXPECT_FALSE(allocData.flags.useSystemMemory);
739+
EXPECT_TRUE(allocData.flags.requiresCpuAccess);
740+
}
741+
742+
HWTEST_F(GetAllocationDataTestHw, givenConstantSurfaceAllocationWhenGetAllocationDataIsCalledThenDontForceSystemMemoryAndRequireCpuAccess) {
743+
AllocationData allocData;
744+
MockMemoryManager mockMemoryManager;
745+
AllocationProperties properties{mockRootDeviceIndex, 1, GraphicsAllocation::AllocationType::CONSTANT_SURFACE, mockDeviceBitfield};
746+
mockMemoryManager.getAllocationData(allocData, properties, nullptr, mockMemoryManager.createStorageInfoFromProperties(properties));
747+
EXPECT_FALSE(allocData.flags.useSystemMemory);
748+
EXPECT_TRUE(allocData.flags.requiresCpuAccess);
749+
}
716750
HWTEST_F(GetAllocationDataTestHw, givenKernelIsaTypeWhenGetAllocationDataIsCalledThenSystemMemoryIsNotRequested) {
717751
AllocationData allocData;
718752
MockMemoryManager mockMemoryManager;

‎opencl/test/unit_test/memory_manager/memory_manager_tests_xehp_and_later.cpp‎

Lines changed: 0 additions & 116 deletions
This file was deleted.

‎opencl/test/unit_test/memory_manager/memory_manager_tests_xehp_and_later.h‎

Lines changed: 0 additions & 19 deletions
This file was deleted.

0 commit comments

Comments
 (0)