intel/compute-runtime
1
0
Fork 0
mirror of https://github.com/intel/compute-runtime.git synced 2025-12-19 16:24:18 +08:00
Code Issues Packages Projects Releases Wiki Activity

Correct MOCS index calculation

Browse Source 
Signed-off-by: Rafal Maziejuk <rafal.maziejuk@intel.com>
Related-To: NEO-4541
This commit is contained in:
Rafal Maziejuk
2021-09-16 12:28:04 +00:00
committed by Compute-Runtime-Automation
parent d61741dd9f
commit 0b0edcf1f2
11 changed files with 13 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
level_zero/cmake/l0_tests.cmake
View File

@@ -31,7 +31,7 @@ add_library(compute_runtime_mockable_extra
${CMAKE_CURRENT_LIST_DIR}/l0_tests.cmake ${CMAKE_CURRENT_LIST_DIR}/l0_tests.cmake
${NEO_SHARED_TEST_DIRECTORY}/common/aub_stream_mocks/aub_stream_interface_mock.cpp ${NEO_SHARED_TEST_DIRECTORY}/common/aub_stream_mocks/aub_stream_interface_mock.cpp
${NEO_SHARED_TEST_DIRECTORY}/common/libult/os_interface.cpp ${NEO_SHARED_TEST_DIRECTORY}/common/libult/os_interface.cpp
${NEO_SHARED_TEST_DIRECTORY}/common/mocks${BRANCH_SUFIX_DIR}/mock_gmm_client_context.cpp ${NEO_SHARED_TEST_DIRECTORY}/common/mocks/mock_gmm_client_context.cpp
${NEO_SHARED_TEST_DIRECTORY}/common/mocks/mock_cif.cpp ${NEO_SHARED_TEST_DIRECTORY}/common/mocks/mock_cif.cpp
${NEO_SHARED_TEST_DIRECTORY}/common/mocks/mock_command_stream_receiver.cpp ${NEO_SHARED_TEST_DIRECTORY}/common/mocks/mock_command_stream_receiver.cpp
${NEO_SHARED_TEST_DIRECTORY}/common/mocks/mock_compiler_interface_spirv.cpp ${NEO_SHARED_TEST_DIRECTORY}/common/mocks/mock_compiler_interface_spirv.cpp

2
level_zero/core/test/aub_tests/CMakeLists.txt
View File

@@ -53,7 +53,7 @@ target_sources(${TARGET_NAME} PRIVATE
${NEO_SHARED_TEST_DIRECTORY}/common/libult/os_interface.cpp ${NEO_SHARED_TEST_DIRECTORY}/common/libult/os_interface.cpp
${NEO_SHARED_TEST_DIRECTORY}/common/mocks/ult_device_factory.cpp ${NEO_SHARED_TEST_DIRECTORY}/common/mocks/ult_device_factory.cpp
${NEO_SHARED_TEST_DIRECTORY}/common/mocks/ult_device_factory.h ${NEO_SHARED_TEST_DIRECTORY}/common/mocks/ult_device_factory.h
${NEO_SHARED_TEST_DIRECTORY}/common/mocks${BRANCH_SUFIX_DIR}/mock_gmm_client_context.cpp ${NEO_SHARED_TEST_DIRECTORY}/common/mocks/mock_gmm_client_context.cpp
${NEO_SHARED_TEST_DIRECTORY}/common/mocks/mock_cif.cpp ${NEO_SHARED_TEST_DIRECTORY}/common/mocks/mock_cif.cpp
${NEO_SHARED_TEST_DIRECTORY}/common/mocks/mock_command_stream_receiver.cpp ${NEO_SHARED_TEST_DIRECTORY}/common/mocks/mock_command_stream_receiver.cpp
${NEO_SHARED_TEST_DIRECTORY}/common/mocks/mock_compiler_interface_spirv.cpp ${NEO_SHARED_TEST_DIRECTORY}/common/mocks/mock_compiler_interface_spirv.cpp

1
opencl/test/unit_test/CMakeLists.txt
View File

@@ -120,7 +120,6 @@ target_link_libraries(igdrcl_tests igdrcl_mocks)
target_include_directories(igdrcl_tests PRIVATE target_include_directories(igdrcl_tests PRIVATE
${NEO_SOURCE_DIR}/opencl/test/unit_test/mocks${BRANCH_DIR_SUFFIX} ${NEO_SOURCE_DIR}/opencl/test/unit_test/mocks${BRANCH_DIR_SUFFIX}
${NEO_SHARED_TEST_DIRECTORY}/common/mocks${BRANCH_DIR_SUFFIX}
${ENGINE_NODE_DIR} ${ENGINE_NODE_DIR}
${KHRONOS_GL_HEADERS_DIR} ${KHRONOS_GL_HEADERS_DIR}
${CMAKE_CURRENT_SOURCE_DIR}/config ${CMAKE_CURRENT_SOURCE_DIR}/config

5
opencl/test/unit_test/fixtures/ult_command_stream_receiver_fixture.h
View File

@@ -11,6 +11,7 @@
#include "shared/source/command_stream/preemption.h" #include "shared/source/command_stream/preemption.h"
#include "shared/source/gmm_helper/gmm_helper.h" #include "shared/source/gmm_helper/gmm_helper.h"
#include "shared/source/helpers/cache_policy.h" #include "shared/source/helpers/cache_policy.h"
#include "shared/source/helpers/hw_helper.h"
#include "shared/source/memory_manager/graphics_allocation.h" #include "shared/source/memory_manager/graphics_allocation.h"
#include "shared/test/common/cmd_parse/hw_parse.h" #include "shared/test/common/cmd_parse/hw_parse.h"
#include "shared/test/common/helpers/unit_test_helper.h" #include "shared/test/common/helpers/unit_test_helper.h"
@@ -130,9 +131,9 @@ struct UltCommandStreamReceiverTest
commandStreamReceiver.lastPreemptionMode = pDevice->getPreemptionMode(); commandStreamReceiver.lastPreemptionMode = pDevice->getPreemptionMode();
commandStreamReceiver.setMediaVFEStateDirty(false); commandStreamReceiver.setMediaVFEStateDirty(false);
auto gmmHelper = pDevice->getGmmHelper(); auto gmmHelper = pDevice->getGmmHelper();
auto mocsIndex = isL1CacheEnabled ? gmmHelper->getMOCS(GMM_RESOURCE_USAGE_OCL_BUFFER_CONST) : gmmHelper->getMOCS(GMM_RESOURCE_USAGE_OCL_BUFFER); auto mocsIndex = HwHelper::get(defaultHwInfo->platform.eDisplayCoreFamily).getMocsIndex(*gmmHelper, true, isL1CacheEnabled);
commandStreamReceiver.latestSentStatelessMocsConfig = mocsIndex >> 1; commandStreamReceiver.latestSentStatelessMocsConfig = mocsIndex;
commandStreamReceiver.lastSentL3Config = L3Config; commandStreamReceiver.lastSentL3Config = L3Config;
configureCSRHeapStatesToNonDirty<GfxFamily>(); configureCSRHeapStatesToNonDirty<GfxFamily>();
commandStreamReceiver.taskLevel = taskLevel; commandStreamReceiver.taskLevel = taskLevel;

2
opencl/test/unit_test/gmm_helper/gmm_helper_tests.cpp
View File

@@ -20,6 +20,7 @@
#include "shared/test/common/helpers/variable_backup.h" #include "shared/test/common/helpers/variable_backup.h"
#include "shared/test/common/mocks/mock_device.h" #include "shared/test/common/mocks/mock_device.h"
#include "shared/test/common/mocks/mock_execution_environment.h" #include "shared/test/common/mocks/mock_execution_environment.h"
#include "shared/test/common/mocks/mock_gmm_client_context.h"
#include "shared/test/common/mocks/mock_graphics_allocation.h" #include "shared/test/common/mocks/mock_graphics_allocation.h"
#include "opencl/source/helpers/gmm_types_converter.h" #include "opencl/source/helpers/gmm_types_converter.h"
@@ -31,7 +32,6 @@
#include "GL/gl.h" #include "GL/gl.h"
#include "GL/glext.h" #include "GL/glext.h"
#include "igfxfmid.h" #include "igfxfmid.h"
#include "mock_gmm_client_context.h"
using MockExecutionEnvironmentGmmFixtureTest = Test<NEO::MockExecutionEnvironmentGmmFixture>; using MockExecutionEnvironmentGmmFixtureTest = Test<NEO::MockExecutionEnvironmentGmmFixture>;

1
opencl/test/unit_test/libult/CMakeLists.txt
View File

@@ -102,7 +102,6 @@ endif()
target_include_directories(igdrcl_libult_env PRIVATE target_include_directories(igdrcl_libult_env PRIVATE
$<TARGET_PROPERTY:gmock-gtest,INTERFACE_INCLUDE_DIRECTORIES> $<TARGET_PROPERTY:gmock-gtest,INTERFACE_INCLUDE_DIRECTORIES>
${NEO_SHARED_TEST_DIRECTORY}/common/mocks${BRANCH_DIR_SUFFIX}
) )
set_property(GLOBAL PROPERTY IGDRCL_SRCS_ENABLE_TESTED_HW ${IGDRCL_SRCS_ENABLE_TESTED_HW}) set_property(GLOBAL PROPERTY IGDRCL_SRCS_ENABLE_TESTED_HW ${IGDRCL_SRCS_ENABLE_TESTED_HW})

2
opencl/test/unit_test/main.cpp
View File

@@ -17,6 +17,7 @@
#include "shared/test/common/helpers/test_files.h" #include "shared/test/common/helpers/test_files.h"
#include "shared/test/common/helpers/ult_hw_config.inl" #include "shared/test/common/helpers/ult_hw_config.inl"
#include "shared/test/common/libult/global_environment.h" #include "shared/test/common/libult/global_environment.h"
#include "shared/test/common/mocks/mock_gmm_client_context.h"
#include "shared/test/common/mocks/mock_sip.h" #include "shared/test/common/mocks/mock_sip.h"
#include "shared/test/common/test_macros/test_checks_shared.h" #include "shared/test/common/test_macros/test_checks_shared.h"
#include "shared/test/unit_test/tests_configuration.h" #include "shared/test/unit_test/tests_configuration.h"
@@ -29,7 +30,6 @@
#include "opencl/test/unit_test/ult_config_listener.h" #include "opencl/test/unit_test/ult_config_listener.h"
#include "gmock/gmock.h" #include "gmock/gmock.h"
#include "mock_gmm_client_context.h"
#include <algorithm> #include <algorithm>
#include <fstream> #include <fstream>

2
opencl/test/unit_test/mem_obj/image_tests_xehp_and_later.cpp
View File

@@ -12,6 +12,7 @@
#include "shared/test/common/helpers/debug_manager_state_restore.h" #include "shared/test/common/helpers/debug_manager_state_restore.h"
#include "shared/test/common/helpers/unit_test_helper.h" #include "shared/test/common/helpers/unit_test_helper.h"
#include "shared/test/common/helpers/variable_backup.h" #include "shared/test/common/helpers/variable_backup.h"
#include "shared/test/common/mocks/mock_gmm_client_context.h"
#include "opencl/test/unit_test/fixtures/image_fixture.h" #include "opencl/test/unit_test/fixtures/image_fixture.h"
#include "opencl/test/unit_test/mocks/mock_allocation_properties.h" #include "opencl/test/unit_test/mocks/mock_allocation_properties.h"
@@ -20,7 +21,6 @@
#include "opencl/test/unit_test/mocks/mock_platform.h" #include "opencl/test/unit_test/mocks/mock_platform.h"
#include "test.h" #include "test.h"
#include "mock_gmm_client_context.h"
#include "test_traits_common.h" #include "test_traits_common.h"
#include <functional> #include <functional>

4
opencl/test/unit_test/mocks/CMakeLists.txt
View File

@@ -56,8 +56,8 @@ set(IGDRCL_SRCS_tests_mocks
${CMAKE_CURRENT_SOURCE_DIR}/ult_cl_device_factory.cpp ${CMAKE_CURRENT_SOURCE_DIR}/ult_cl_device_factory.cpp
${CMAKE_CURRENT_SOURCE_DIR}/ult_cl_device_factory.h ${CMAKE_CURRENT_SOURCE_DIR}/ult_cl_device_factory.h
${NEO_SHARED_DIRECTORY}/gmm_helper/page_table_mngr_impl.cpp ${NEO_SHARED_DIRECTORY}/gmm_helper/page_table_mngr_impl.cpp
${NEO_SHARED_TEST_DIRECTORY}/common/mocks${BRANCH_DIR_SUFFIX}mock_gmm_client_context.cpp ${NEO_SHARED_TEST_DIRECTORY}/common/mocks/mock_gmm_client_context.cpp
${NEO_SHARED_TEST_DIRECTORY}/common/mocks${BRANCH_DIR_SUFFIX}mock_gmm_client_context.h ${NEO_SHARED_TEST_DIRECTORY}/common/mocks/mock_gmm_client_context.h
${NEO_SHARED_TEST_DIRECTORY}/common/mocks/mock_experimental_command_buffer.h ${NEO_SHARED_TEST_DIRECTORY}/common/mocks/mock_experimental_command_buffer.h
${NEO_CORE_tests_compiler_mocks} ${NEO_CORE_tests_compiler_mocks}
) )

3
opencl/test/unit_test/os_interface/windows/wddm_memory_manager_tests.cpp
View File

@@ -22,6 +22,7 @@
#include "shared/test/common/helpers/unit_test_helper.h" #include "shared/test/common/helpers/unit_test_helper.h"
#include "shared/test/common/mocks/mock_deferred_deleter.h" #include "shared/test/common/mocks/mock_deferred_deleter.h"
#include "shared/test/common/mocks/mock_device.h" #include "shared/test/common/mocks/mock_device.h"
#include "shared/test/common/mocks/mock_gmm_client_context.h"
#include "shared/test/common/mocks/ult_device_factory.h" #include "shared/test/common/mocks/ult_device_factory.h"
#include "shared/test/unit_test/utilities/base_object_utils.h" #include "shared/test/unit_test/utilities/base_object_utils.h"
@@ -37,8 +38,6 @@
#include "opencl/test/unit_test/mocks/mock_platform.h" #include "opencl/test/unit_test/mocks/mock_platform.h"
#include "opencl/test/unit_test/os_interface/windows/mock_wddm_allocation.h" #include "opencl/test/unit_test/os_interface/windows/mock_wddm_allocation.h"
#include "mock_gmm_client_context.h"
using namespace NEO; using namespace NEO;
using namespace ::testing; using namespace ::testing;

4
shared/test/common/mocks/CMakeLists.txt
View File

@@ -59,8 +59,8 @@ set(NEO_CORE_tests_mocks
${CMAKE_CURRENT_SOURCE_DIR}/mock_tbx_stream.h ${CMAKE_CURRENT_SOURCE_DIR}/mock_tbx_stream.h
${CMAKE_CURRENT_SOURCE_DIR}/ult_device_factory.cpp ${CMAKE_CURRENT_SOURCE_DIR}/ult_device_factory.cpp
${CMAKE_CURRENT_SOURCE_DIR}/ult_device_factory.h ${CMAKE_CURRENT_SOURCE_DIR}/ult_device_factory.h
${CMAKE_CURRENT_SOURCE_DIR}${BRANCH_DIR_SUFFIX}mock_gmm_client_context.cpp ${CMAKE_CURRENT_SOURCE_DIR}/mock_gmm_client_context.cpp
${CMAKE_CURRENT_SOURCE_DIR}${BRANCH_DIR_SUFFIX}mock_gmm_client_context.h ${CMAKE_CURRENT_SOURCE_DIR}/mock_gmm_client_context.h
) )
if(WIN32) if(WIN32)