Move special ult helper to shared

Signed-off-by: Mateusz Jablonski <mateusz.jablonski@intel.com>
This commit is contained in:
Mateusz Jablonski
2021-10-19 19:22:18 +00:00
committed by Compute-Runtime-Automation
parent 8a17cf3141
commit 31a8498397
11 changed files with 11 additions and 12 deletions

View File

@ -29,14 +29,13 @@ if(TESTS_GEN12LP)
${CMAKE_CURRENT_SOURCE_DIR}/profiling_tests_gen12lp.inl
${CMAKE_CURRENT_SOURCE_DIR}/sampler_tests_gen12lp.inl
${CMAKE_CURRENT_SOURCE_DIR}/scheduler_source_tests_gen12lp.inl
${CMAKE_CURRENT_SOURCE_DIR}/special_ult_helper_gen12lp.cpp
${CMAKE_CURRENT_SOURCE_DIR}/special_ult_helper_gen12lp.h
${CMAKE_CURRENT_SOURCE_DIR}/tbx_command_stream_receiver_tests_gen12lp.inl
${CMAKE_CURRENT_SOURCE_DIR}/test_device_caps_gen12lp.inl
${CMAKE_CURRENT_SOURCE_DIR}/test_device_queue_hw_gen12lp.inl
${CMAKE_CURRENT_SOURCE_DIR}/test_platform_caps_gen12lp.inl
${CMAKE_CURRENT_SOURCE_DIR}/test_sample_gen12lp.inl
${NEO_SOURCE_DIR}/shared/test/common/gen12lp/unit_test_helper_gen12lp.cpp
${NEO_SOURCE_DIR}/shared/test/common/gen12lp/special_ult_helper_gen12lp.cpp
)
get_property(NEO_CORE_TESTS_GEN12LP GLOBAL PROPERTY NEO_CORE_TESTS_GEN12LP)

View File

@ -9,10 +9,10 @@
#include "shared/source/helpers/hw_helper.h"
#include "shared/source/helpers/ptr_math.h"
#include "shared/test/common/cmd_parse/hw_parse.h"
#include "shared/test/common/gen12lp/special_ult_helper_gen12lp.h"
#include "shared/test/common/helpers/dispatch_flags_helper.h"
#include "shared/test/common/mocks/mock_device.h"
#include "opencl/test/unit_test/gen12lp/special_ult_helper_gen12lp.h"
#include "test.h"
using namespace NEO;

View File

@ -8,12 +8,12 @@
#include "shared/source/command_stream/command_stream_receiver.h"
#include "shared/source/command_stream/linear_stream.h"
#include "shared/test/common/cmd_parse/hw_parse.h"
#include "shared/test/common/gen12lp/special_ult_helper_gen12lp.h"
#include "shared/test/common/mocks/mock_csr.h"
#include "opencl/source/command_queue/command_queue_hw.h"
#include "opencl/test/unit_test/fixtures/cl_device_fixture.h"
#include "opencl/test/unit_test/fixtures/ult_command_stream_receiver_fixture.h"
#include "opencl/test/unit_test/gen12lp/special_ult_helper_gen12lp.h"
#include "opencl/test/unit_test/mocks/mock_command_queue.h"
#include "opencl/test/unit_test/mocks/mock_context.h"
#include "opencl/test/unit_test/mocks/mock_event.h"

View File

@ -6,12 +6,12 @@
*/
#include "shared/source/os_interface/hw_info_config.h"
#include "shared/test/common/gen12lp/special_ult_helper_gen12lp.h"
#include "shared/test/common/helpers/debug_manager_state_restore.h"
#include "shared/test/common/helpers/hw_helper_tests.h"
#include "shared/test/common/mocks/mock_memory_manager.h"
#include "opencl/source/helpers/cl_hw_helper.h"
#include "opencl/test/unit_test/gen12lp/special_ult_helper_gen12lp.h"
#include "opencl/test/unit_test/mocks/mock_cl_hw_helper.h"
#include "opencl/test/unit_test/mocks/mock_context.h"
#include "opencl/test/unit_test/mocks/mock_platform.h"

View File

@ -9,13 +9,13 @@
#include "shared/source/gmm_helper/gmm_helper.h"
#include "shared/source/image/image_surface_state.h"
#include "shared/source/memory_manager/memory_manager.h"
#include "shared/test/common/gen12lp/special_ult_helper_gen12lp.h"
#include "shared/test/common/helpers/variable_backup.h"
#include "shared/test/common/mocks/mock_allocation_properties.h"
#include "shared/test/common/mocks/mock_gmm.h"
#include "opencl/source/platform/platform.h"
#include "opencl/test/unit_test/fixtures/image_fixture.h"
#include "opencl/test/unit_test/gen12lp/special_ult_helper_gen12lp.h"
#include "opencl/test/unit_test/mocks/mock_context.h"
#include "test.h"

View File

@ -1,34 +0,0 @@
/*
* Copyright (C) 2019-2021 Intel Corporation
*
* SPDX-License-Identifier: MIT
*
*/
#include "opencl/test/unit_test/gen12lp/special_ult_helper_gen12lp.h"
#include "test.h"
namespace NEO {
bool SpecialUltHelperGen12lp::additionalCoherencyCheck(PRODUCT_FAMILY productFamily, bool coherency) {
if (productFamily == IGFX_DG1) {
EXPECT_FALSE(coherency);
return true;
}
return false;
}
bool SpecialUltHelperGen12lp::isAdditionalCapabilityCoherencyFlagSettingRequired(PRODUCT_FAMILY productFamily) {
return productFamily == IGFX_TIGERLAKE_LP;
}
bool SpecialUltHelperGen12lp::shouldPerformimagePitchAlignment(PRODUCT_FAMILY productFamily) {
return productFamily == IGFX_TIGERLAKE_LP || productFamily == IGFX_DG1;
}
bool SpecialUltHelperGen12lp::isPipeControlWArequired(PRODUCT_FAMILY productFamily) {
return productFamily == IGFX_TIGERLAKE_LP || productFamily == IGFX_DG1;
}
} // namespace NEO

View File

@ -1,21 +0,0 @@
/*
* Copyright (C) 2019-2021 Intel Corporation
*
* SPDX-License-Identifier: MIT
*
*/
#pragma once
#include "igfxfmid.h"
namespace NEO {
struct SpecialUltHelperGen12lp {
static bool additionalCoherencyCheck(PRODUCT_FAMILY productFamily, bool coherency);
static bool isAdditionalCapabilityCoherencyFlagSettingRequired(PRODUCT_FAMILY productFamily);
static bool shouldPerformimagePitchAlignment(PRODUCT_FAMILY productFamily);
static bool isPipeControlWArequired(PRODUCT_FAMILY productFamily);
};
} // namespace NEO

View File

@ -6,9 +6,9 @@
*/
#include "shared/source/os_interface/os_interface.h"
#include "shared/test/common/gen12lp/special_ult_helper_gen12lp.h"
#include "shared/test/common/helpers/debug_manager_state_restore.h"
#include "opencl/test/unit_test/gen12lp/special_ult_helper_gen12lp.h"
#include "opencl/test/unit_test/os_interface/windows/hw_info_config_win_tests.h"
using namespace NEO;