From 1cffe921ba8bc0688125a5de5da6d04d1bce7a62 Mon Sep 17 00:00:00 2001 From: Daniel Chabrowski Date: Wed, 1 Jun 2022 14:46:32 +0000 Subject: [PATCH] Move hw_info_config tests to shared Signed-off-by: Daniel Chabrowski --- .../test/unit_test/gen11/icllp/CMakeLists.txt | 6 ---- .../gen12lp/dg1/excludes_ocl_dg1.cpp | 6 ---- .../linux/hw_info_config_tests_gen12lp.cpp | 2 -- .../gen12lp/rkl/excludes_ocl_rkl.cpp | 2 -- .../gen12lp/tgllp/excludes_ocl_tgllp.cpp | 4 --- .../unit_test/os_interface/CMakeLists.txt | 1 - .../xe_hp_core/excludes_ocl_xe_hp_core.cpp | 7 ----- .../xe_hpc_core/excludes_ocl_xe_hpc_core.cpp | 5 ---- .../xe_hpc_core/pvc/linux/CMakeLists.txt | 7 +---- .../xe_hpg_core/dg2/excludes_ocl_dg2.cpp | 10 ------- .../xe_hpg_core/dg2/linux/CMakeLists.txt | 5 ---- .../xe_hpg_core/excludes_ocl_xe_hpg_core.cpp | 3 -- shared/test/common/helpers/default_hw_info.h | 3 +- .../test/unit_test/gen11/icllp/CMakeLists.txt | 6 ++++ .../gen11/icllp/excludes_gen11_icllp.cpp | 0 .../test/unit_test/gen12lp/dg1/CMakeLists.txt | 1 + .../gen12lp/dg1/excludes_gen12lp_dg1.cpp | 15 ++++++++++ .../test/unit_test/gen12lp/rkl/CMakeLists.txt | 6 ++++ .../gen12lp/rkl/excludes_gen12lp_rkl.cpp | 11 +++++++ .../unit_test/gen12lp/tgllp/CMakeLists.txt | 6 ++++ .../gen12lp/tgllp/excludes_gen12lp_tgllp.cpp | 13 +++++++++ .../unit_test/helpers/test_hw_info_config.cpp | 4 +-- .../unit_test/os_interface/CMakeLists.txt | 1 + .../os_interface/hw_info_config_tests.cpp | 29 ++++++++----------- .../os_interface/hw_info_config_tests.h | 11 +------ .../test/unit_test/xe_hp_core/CMakeLists.txt | 1 + .../xe_hp_core/excludes_xe_hp_core.cpp | 16 ++++++++++ .../xe_hpc_core/excludes_xe_hpc_core.cpp | 5 ++++ .../xe_hpc_core/pvc/linux/CMakeLists.txt | 12 ++++++++ .../pvc/linux/hw_info_config_tests_pvc.cpp | 0 .../test/unit_test/xe_hpg_core/CMakeLists.txt | 1 + .../unit_test/xe_hpg_core/dg2/CMakeLists.txt | 2 +- .../dg2/excludes_xe_hpg_core_dg2.cpp | 19 ++++++++++++ .../xe_hpg_core/dg2/linux/CMakeLists.txt | 12 ++++++++ .../dg2/linux/hw_info_config_tests_dg2.cpp | 0 .../xe_hpg_core/excludes_xe_hpg_core.cpp | 12 ++++++++ 36 files changed, 154 insertions(+), 90 deletions(-) rename opencl/test/unit_test/gen11/icllp/excludes_ocl_icllp.cpp => shared/test/unit_test/gen11/icllp/excludes_gen11_icllp.cpp (100%) create mode 100644 shared/test/unit_test/gen12lp/dg1/excludes_gen12lp_dg1.cpp create mode 100644 shared/test/unit_test/gen12lp/rkl/excludes_gen12lp_rkl.cpp create mode 100644 shared/test/unit_test/gen12lp/tgllp/excludes_gen12lp_tgllp.cpp rename {opencl => shared}/test/unit_test/os_interface/hw_info_config_tests.cpp (98%) create mode 100644 shared/test/unit_test/xe_hp_core/excludes_xe_hp_core.cpp create mode 100644 shared/test/unit_test/xe_hpc_core/pvc/linux/CMakeLists.txt rename {opencl => shared}/test/unit_test/xe_hpc_core/pvc/linux/hw_info_config_tests_pvc.cpp (100%) create mode 100644 shared/test/unit_test/xe_hpg_core/dg2/excludes_xe_hpg_core_dg2.cpp create mode 100644 shared/test/unit_test/xe_hpg_core/dg2/linux/CMakeLists.txt rename {opencl => shared}/test/unit_test/xe_hpg_core/dg2/linux/hw_info_config_tests_dg2.cpp (100%) create mode 100644 shared/test/unit_test/xe_hpg_core/excludes_xe_hpg_core.cpp diff --git a/opencl/test/unit_test/gen11/icllp/CMakeLists.txt b/opencl/test/unit_test/gen11/icllp/CMakeLists.txt index df7c788d9b..71a628182f 100644 --- a/opencl/test/unit_test/gen11/icllp/CMakeLists.txt +++ b/opencl/test/unit_test/gen11/icllp/CMakeLists.txt @@ -5,13 +5,7 @@ # if(TESTS_ICLLP) - set(IGDRCL_SRCS_tests_gen11_icllp_excludes - ${CMAKE_CURRENT_SOURCE_DIR}/excludes_ocl_icllp.cpp - ) - set_property(GLOBAL APPEND PROPERTY IGDRCL_SRCS_tests_excludes ${IGDRCL_SRCS_tests_gen11_icllp_excludes}) - set(IGDRCL_SRCS_tests_gen11_icllp - ${IGDRCL_SRCS_tests_gen11_icllp_excludes} ${CMAKE_CURRENT_SOURCE_DIR}/CMakeLists.txt ${CMAKE_CURRENT_SOURCE_DIR}/test_hw_info_config_icllp.cpp ${CMAKE_CURRENT_SOURCE_DIR}/test_device_caps_icllp.cpp diff --git a/opencl/test/unit_test/gen12lp/dg1/excludes_ocl_dg1.cpp b/opencl/test/unit_test/gen12lp/dg1/excludes_ocl_dg1.cpp index edfdc4528a..1254917188 100644 --- a/opencl/test/unit_test/gen12lp/dg1/excludes_ocl_dg1.cpp +++ b/opencl/test/unit_test/gen12lp/dg1/excludes_ocl_dg1.cpp @@ -9,9 +9,3 @@ HWTEST_EXCLUDE_PRODUCT(BufferSetSurfaceTests, givenBufferSetSurfaceThatMemoryIsUnalignedToCachelineButReadOnlyThenL3CacheShouldBeStillOn, IGFX_DG1) HWTEST_EXCLUDE_PRODUCT(BufferSetSurfaceTests, givenAlignedCacheableReadOnlyBufferThenChoseOclBufferPolicy, IGFX_DG1); -HWTEST_EXCLUDE_PRODUCT(HwInfoConfigTest, givenHwInfoConfigWhenAskedIfPipeControlWAIsRequiredThenFalseIsReturned, IGFX_DG1); -HWTEST_EXCLUDE_PRODUCT(HwInfoConfigTest, givenHwInfoConfigWhenAskedIfImagePitchAlignmentWAIsRequiredThenFalseIsReturned, IGFX_DG1); -HWTEST_EXCLUDE_PRODUCT(HwInfoConfigTest, givenHwInfoConfigWhenAskedIfForceEmuInt32DivRemSPWAIsRequiredThenFalseIsReturned, IGFX_DG1); -HWTEST_EXCLUDE_PRODUCT(HwInfoConfigTest, givenHwInfoConfigWhenAskedIf3DPipelineSelectWAIsRequiredThenFalseIsReturned, IGFX_DG1); -HWTEST_EXCLUDE_PRODUCT(HwInfoConfigTest, givenHwInfoConfigWhenAskedIfStorageInfoAdjustmentIsRequiredThenFalseIsReturned, IGFX_DG1); -HWTEST_EXCLUDE_PRODUCT(HwInfoConfigTest, whenOverrideGfxPartitionLayoutForWslThenReturnFalse, IGFX_DG1); diff --git a/opencl/test/unit_test/gen12lp/linux/hw_info_config_tests_gen12lp.cpp b/opencl/test/unit_test/gen12lp/linux/hw_info_config_tests_gen12lp.cpp index db91e07428..da572b038a 100644 --- a/opencl/test/unit_test/gen12lp/linux/hw_info_config_tests_gen12lp.cpp +++ b/opencl/test/unit_test/gen12lp/linux/hw_info_config_tests_gen12lp.cpp @@ -11,8 +11,6 @@ #include "shared/test/common/helpers/default_hw_info.h" #include "shared/test/unit_test/os_interface/linux/hw_info_config_linux_tests.h" -#include "opencl/extensions/public/cl_ext_private.h" - using namespace NEO; using HwInfoConfigTestLinuxGen12lp = HwInfoConfigTestLinux; diff --git a/opencl/test/unit_test/gen12lp/rkl/excludes_ocl_rkl.cpp b/opencl/test/unit_test/gen12lp/rkl/excludes_ocl_rkl.cpp index 7a71130bc1..add0f09c2e 100644 --- a/opencl/test/unit_test/gen12lp/rkl/excludes_ocl_rkl.cpp +++ b/opencl/test/unit_test/gen12lp/rkl/excludes_ocl_rkl.cpp @@ -10,5 +10,3 @@ HWTEST_EXCLUDE_PRODUCT(DeviceFactoryTest, givenInvalidHwConfigStringWhenPrepareDeviceEnvironmentsForProductFamilyOverrideThenThrowsException, IGFX_ROCKETLAKE); HWTEST_EXCLUDE_PRODUCT(BufferSetSurfaceTests, givenBufferSetSurfaceThatMemoryIsUnalignedToCachelineButReadOnlyThenL3CacheShouldBeStillOn, IGFX_ROCKETLAKE) HWTEST_EXCLUDE_PRODUCT(BufferSetSurfaceTests, givenAlignedCacheableReadOnlyBufferThenChoseOclBufferPolicy, IGFX_ROCKETLAKE); -HWTEST_EXCLUDE_PRODUCT(HwInfoConfigTest, givenHwInfoConfigWhenAskedIfForceEmuInt32DivRemSPWAIsRequiredThenFalseIsReturned, IGFX_ROCKETLAKE); -HWTEST_EXCLUDE_PRODUCT(HwInfoConfigTest, givenHwInfoConfigWhenAskedIf3DPipelineSelectWAIsRequiredThenFalseIsReturned, IGFX_ROCKETLAKE); diff --git a/opencl/test/unit_test/gen12lp/tgllp/excludes_ocl_tgllp.cpp b/opencl/test/unit_test/gen12lp/tgllp/excludes_ocl_tgllp.cpp index f30bde852b..974dd6243e 100644 --- a/opencl/test/unit_test/gen12lp/tgllp/excludes_ocl_tgllp.cpp +++ b/opencl/test/unit_test/gen12lp/tgllp/excludes_ocl_tgllp.cpp @@ -9,7 +9,3 @@ HWTEST_EXCLUDE_PRODUCT(BufferSetSurfaceTests, givenBufferSetSurfaceThatMemoryIsUnalignedToCachelineButReadOnlyThenL3CacheShouldBeStillOn, IGFX_TIGERLAKE_LP) HWTEST_EXCLUDE_PRODUCT(BufferSetSurfaceTests, givenAlignedCacheableReadOnlyBufferThenChoseOclBufferPolicy, IGFX_TIGERLAKE_LP); -HWTEST_EXCLUDE_PRODUCT(HwInfoConfigTest, givenHwInfoConfigWhenAskedIfPipeControlWAIsRequiredThenFalseIsReturned, IGFX_TIGERLAKE_LP); -HWTEST_EXCLUDE_PRODUCT(HwInfoConfigTest, givenHwInfoConfigWhenAskedIfImagePitchAlignmentWAIsRequiredThenFalseIsReturned, IGFX_TIGERLAKE_LP); -HWTEST_EXCLUDE_PRODUCT(HwInfoConfigTest, givenHwInfoConfigWhenAskedIfForceEmuInt32DivRemSPWAIsRequiredThenFalseIsReturned, IGFX_TIGERLAKE_LP); -HWTEST_EXCLUDE_PRODUCT(HwInfoConfigTest, givenHwInfoConfigWhenAskedIf3DPipelineSelectWAIsRequiredThenFalseIsReturned, IGFX_TIGERLAKE_LP); diff --git a/opencl/test/unit_test/os_interface/CMakeLists.txt b/opencl/test/unit_test/os_interface/CMakeLists.txt index b7f8ca21ec..3244eab3d2 100644 --- a/opencl/test/unit_test/os_interface/CMakeLists.txt +++ b/opencl/test/unit_test/os_interface/CMakeLists.txt @@ -7,7 +7,6 @@ set(IGDRCL_SRCS_tests_os_interface_base ${CMAKE_CURRENT_SOURCE_DIR}/CMakeLists.txt ${CMAKE_CURRENT_SOURCE_DIR}/device_factory_tests.cpp - ${CMAKE_CURRENT_SOURCE_DIR}/hw_info_config_tests.cpp ${CMAKE_CURRENT_SOURCE_DIR}/mock_performance_counters.cpp ${CMAKE_CURRENT_SOURCE_DIR}/mock_performance_counters.h ${CMAKE_CURRENT_SOURCE_DIR}/os_context_tests.cpp diff --git a/opencl/test/unit_test/xe_hp_core/excludes_ocl_xe_hp_core.cpp b/opencl/test/unit_test/xe_hp_core/excludes_ocl_xe_hp_core.cpp index 5b4283afea..87f99b1586 100644 --- a/opencl/test/unit_test/xe_hp_core/excludes_ocl_xe_hp_core.cpp +++ b/opencl/test/unit_test/xe_hp_core/excludes_ocl_xe_hp_core.cpp @@ -9,12 +9,5 @@ HWTEST_EXCLUDE_PRODUCT(BufferSetSurfaceTests, givenAlignedCacheableReadOnlyBufferThenChoseOclBufferPolicy, IGFX_XE_HP_CORE); HWTEST_EXCLUDE_PRODUCT(BufferSetSurfaceTests, givenBufferSetSurfaceThatMemoryIsUnalignedToCachelineButReadOnlyThenL3CacheShouldBeStillOn, IGFX_XE_HP_CORE); -HWTEST_EXCLUDE_PRODUCT(HwInfoConfigTest, WhenAllowCompressionIsCalledThenTrueIsReturned, IGFX_XE_HP_CORE); -HWTEST_EXCLUDE_PRODUCT(HwInfoConfigTest, givenHardwareInfoWhenCallingIsMaxThreadsForWorkgroupWARequiredThenFalseIsReturned, IGFX_XE_HP_CORE); -HWTEST_EXCLUDE_PRODUCT(HwInfoConfigTest, whenCallingGetDeviceMemoryNameThenDdrIsReturned, IGFX_XE_HP_CORE); -HWTEST_EXCLUDE_PRODUCT(HwInfoConfigTest, givenHwInfoConfigWhenAskedIfExtraParametersAreInvalidThenFalseIsReturned, IGFX_XE_HP_CORE); -HWTEST_EXCLUDE_PRODUCT(HwInfoConfigTest, givenHwInfoConfigWhenAskedIfTile64With3DSurfaceOnBCSIsSupportedThenTrueIsReturned, IGFX_XE_HP_CORE); -HWTEST_EXCLUDE_PRODUCT(HwInfoConfigTest, givenHwInfoConfigWhenAskedIfBlitterForImagesIsSupportedThenFalseIsReturned, IGFX_XE_HP_CORE); -HWTEST_EXCLUDE_PRODUCT(HwInfoConfigTest, givenHwInfoConfigWhenAskedIfPipeControlPriorToNonPipelinedStateCommandsWARequiredThenFalseIsReturned, IGFX_XE_HP_CORE); HWTEST_EXCLUDE_PRODUCT(HwHelperTest, whenGettingDefaultRevisionIdThenCorrectValueIsReturned, IGFX_XE_HP_CORE); HWTEST_EXCLUDE_PRODUCT(CommandStreamReceiverFlushTaskXeHPAndLaterTests, givenProgramExtendedPipeControlPriorToNonPipelinedStateCommandEnabledAndStateSipWhenItIsRequiredThenThereIsPipeControlPriorToIt, IGFX_XE_HP_CORE); diff --git a/opencl/test/unit_test/xe_hpc_core/excludes_ocl_xe_hpc_core.cpp b/opencl/test/unit_test/xe_hpc_core/excludes_ocl_xe_hpc_core.cpp index a59c8b5921..74e51c0bfb 100644 --- a/opencl/test/unit_test/xe_hpc_core/excludes_ocl_xe_hpc_core.cpp +++ b/opencl/test/unit_test/xe_hpc_core/excludes_ocl_xe_hpc_core.cpp @@ -12,7 +12,6 @@ HWTEST_EXCLUDE_PRODUCT(BufferSetSurfaceTests, givenBufferSetSurfaceThatMemoryIsU HWTEST_EXCLUDE_PRODUCT(HwHelperTestXeHPAndLater, givenVariousCachesRequestProperMOCSIndexesAreBeingReturned, IGFX_XE_HPC_CORE); HWTEST_EXCLUDE_PRODUCT(PipeControlHelperTestsXeHPAndLater, WhenAddingPipeControlWAThenCorrectCommandsAreProgrammed, IGFX_XE_HPC_CORE); HWTEST_EXCLUDE_PRODUCT(QueueFamilyNameTest, givenRcsWhenGettingQueueFamilyNameThenReturnProperValue, IGFX_XE_HPC_CORE); -HWTEST_EXCLUDE_PRODUCT(HwInfoConfigTest, givenVariousValuesWhenConvertingHwRevIdAndSteppingThenConversionIsCorrect, IGFX_XE_HPC_CORE); HWTEST_EXCLUDE_PRODUCT(PipeControlHelperTests, givenHwHelperwhenAskingForDcFlushThenReturnTrue, IGFX_XE_HPC_CORE); HWTEST_EXCLUDE_PRODUCT(EnqueueCopyBufferToImageStatelessTest, givenBigBufferWhenCopyingBufferToImageStatelessThenSuccessIsReturned, IGFX_XE_HPC_CORE); HWTEST_EXCLUDE_PRODUCT(EnqueueCopyImageToBufferHwStatelessTest, givenBigBufferWhenCopyingImageToBufferStatelessThenSuccessIsReturned, IGFX_XE_HPC_CORE); @@ -22,13 +21,9 @@ HWTEST_EXCLUDE_PRODUCT(DrmMemoryManagerTest, givenDrmAllocationWithWithAlignment HWTEST_EXCLUDE_PRODUCT(ClDeviceHelperTests, givenDeviceWithoutClosBasedCacheReservationSupportWhenQueryingNumCacheClosDeviceInfoThenReturnZeroCacheClosRegions, IGFX_XE_HPC_CORE); HWTEST_EXCLUDE_PRODUCT(HwHelperTest, whenGettingNumberOfCacheRegionsThenReturnZero, IGFX_XE_HPC_CORE); HWTEST_EXCLUDE_PRODUCT(LocalWorkSizeTest, givenDispatchInfoWhenWorkSizeInfoIsCreatedThenTestEuFusionFtr, IGFX_XE_HPC_CORE); -HWTEST_EXCLUDE_PRODUCT(HwInfoConfigTest, whenCallingGetDeviceMemoryNameThenDdrIsReturned, IGFX_XE_HPC_CORE); -HWTEST_EXCLUDE_PRODUCT(HwInfoConfigTest, givenHardwareInfoWhenCallingIsMaxThreadsForWorkgroupWARequiredThenFalseIsReturned, IGFX_XE_HPC_CORE); -HWTEST_EXCLUDE_PRODUCT(HwInfoConfigTest, givenHwInfoConfigWhenAskedIfPipeControlPriorToNonPipelinedStateCommandsWARequiredThenFalseIsReturned, IGFX_XE_HPC_CORE); HWTEST_EXCLUDE_PRODUCT(CommandStreamReceiverFlushTaskDg2AndLaterTests, givenProgramExtendedPipeControlPriorToNonPipelinedStateCommandEnabledWhenPerDssBackedBufferThenThereIsPipeControlPriorToIt_MatcherIsRTCapable, IGFX_XE_HPC_CORE); HWTEST_EXCLUDE_PRODUCT(CommandStreamReceiverHwTestDg2AndLater, givenGen12AndLaterWhenRayTracingEnabledThenCommandIsAddedToBatchBuffer_MatcherIsRTCapable, IGFX_XE_HPC_CORE); HWTEST_EXCLUDE_PRODUCT(CommandStreamReceiverHwTestDg2AndLater, givenGen12AndLaterWhenRayTracingEnabledButAlreadySentThenCommandIsNotAddedToBatchBuffer_MatcherIsRTCapable, IGFX_XE_HPC_CORE); -HWTEST_EXCLUDE_PRODUCT(HwInfoConfigTest, givenHwInfoConfigWhenAskedIfTile64With3DSurfaceOnBCSIsSupportedThenTrueIsReturned, IGFX_XE_HPC_CORE); HWTEST_EXCLUDE_PRODUCT(HardwareCommandsTest, GivenVariousValuesWhenAlignSlmSizeIsCalledThenCorrectValueIsReturned, IGFX_XE_HPC_CORE); HWTEST_EXCLUDE_PRODUCT(HardwareCommandsTest, GivenVariousValuesWhenComputeSlmSizeIsCalledThenCorrectValueIsReturned, IGFX_XE_HPC_CORE); HWTEST_EXCLUDE_PRODUCT(XeHPAndLaterDeviceCapsTests, givenHwInfoWhenSlmSizeIsRequiredThenReturnCorrectValue, IGFX_XE_HPC_CORE); diff --git a/opencl/test/unit_test/xe_hpc_core/pvc/linux/CMakeLists.txt b/opencl/test/unit_test/xe_hpc_core/pvc/linux/CMakeLists.txt index 4a2d5b56ab..af734405ec 100644 --- a/opencl/test/unit_test/xe_hpc_core/pvc/linux/CMakeLists.txt +++ b/opencl/test/unit_test/xe_hpc_core/pvc/linux/CMakeLists.txt @@ -1,14 +1,9 @@ # -# Copyright (C) 2021 Intel Corporation +# Copyright (C) 2021-2022 Intel Corporation # # SPDX-License-Identifier: MIT # -set(IGDRCL_SRCS_tests_xe_hp_core_pvc_linux - ${CMAKE_CURRENT_SOURCE_DIR}/CMakeLists.txt - ${CMAKE_CURRENT_SOURCE_DIR}/hw_info_config_tests_pvc.cpp -) if(UNIX) - target_sources(igdrcl_tests PRIVATE ${IGDRCL_SRCS_tests_xe_hp_core_pvc_linux}) add_subdirectories() endif() diff --git a/opencl/test/unit_test/xe_hpg_core/dg2/excludes_ocl_dg2.cpp b/opencl/test/unit_test/xe_hpg_core/dg2/excludes_ocl_dg2.cpp index 47e3a09614..88a51d7cba 100644 --- a/opencl/test/unit_test/xe_hpg_core/dg2/excludes_ocl_dg2.cpp +++ b/opencl/test/unit_test/xe_hpg_core/dg2/excludes_ocl_dg2.cpp @@ -8,17 +8,7 @@ #include "shared/test/common/test_macros/test.h" HWTEST_EXCLUDE_PRODUCT(HwHelperTest, GivenZeroSlmSizeWhenComputeSlmSizeIsCalledThenCorrectValueIsReturned, IGFX_DG2); -HWTEST_EXCLUDE_PRODUCT(HwInfoConfigTest, WhenAllowCompressionIsCalledThenTrueIsReturned, IGFX_DG2); -HWTEST_EXCLUDE_PRODUCT(HwInfoConfigTest, givenHardwareInfoWhenCallingIsAdditionalStateBaseAddressWARequiredThenFalseIsReturned, IGFX_DG2); -HWTEST_EXCLUDE_PRODUCT(HwInfoConfigTest, givenHardwareInfoWhenCallingIsMaxThreadsForWorkgroupWARequiredThenFalseIsReturned, IGFX_DG2); -HWTEST_EXCLUDE_PRODUCT(HwInfoConfigTest, givenHwInfoConfigWhenAskedForDefaultEngineTypeAdjustmentThenFalseIsReturned, IGFX_DG2); -HWTEST_EXCLUDE_PRODUCT(HwInfoConfigTest, givenHwInfoConfigWhenAskedIfAllocationSizeAdjustmentIsRequiredThenFalseIsReturned, IGFX_DG2); -HWTEST_EXCLUDE_PRODUCT(HwInfoConfigTest, givenHwInfoConfigWhenAskedIfPrefetchDisablingIsRequiredThenFalseIsReturned, IGFX_DG2); -HWTEST_EXCLUDE_PRODUCT(HwInfoConfigTest, givenHwInfoConfigWhenAskedIfPipeControlPriorToNonPipelinedStateCommandsWARequiredThenFalseIsReturned, IGFX_DG2); -HWTEST_EXCLUDE_PRODUCT(HwInfoConfigTest, givenHwInfoConfigWhenAskedIfTile64With3DSurfaceOnBCSIsSupportedThenTrueIsReturned, IGFX_DG2); HWTEST_EXCLUDE_PRODUCT(HwInfoConfigTestXeHpAndLater, givenXeHPAndLaterPlatformWhenAskedIfTile64With3DSurfaceOnBCSIsSupportedThenFalseIsReturned, IGFX_DG2); HWTEST_EXCLUDE_PRODUCT(WddmMemoryManagerSimpleTest, givenLinearStreamWhenItIsAllocatedThenItIsInLocalMemoryHasCpuPointerAndHasStandardHeap64kbAsGpuAddress, IGFX_DG2); -HWTEST_EXCLUDE_PRODUCT(HwInfoConfigTest, WhenAllowRenderCompressionIsCalledThenTrueIsReturned, IGFX_DG2); -HWTEST_EXCLUDE_PRODUCT(HwInfoConfigTest, whenConvertingTimestampsToCsDomainThenNothingIsChanged, IGFX_DG2); HWTEST_EXCLUDE_PRODUCT(HwHelperTestXeHPAndLater, GiveCcsNodeThenDefaultEngineTypeIsCcs, IGFX_DG2); HWTEST_EXCLUDE_PRODUCT(XeHPAndLaterDeviceCapsTests, givenHwInfoWhenRequestedComputeUnitsUsedForScratchThenReturnValidValue, IGFX_DG2); diff --git a/opencl/test/unit_test/xe_hpg_core/dg2/linux/CMakeLists.txt b/opencl/test/unit_test/xe_hpg_core/dg2/linux/CMakeLists.txt index c1b75c512e..af734405ec 100644 --- a/opencl/test/unit_test/xe_hpg_core/dg2/linux/CMakeLists.txt +++ b/opencl/test/unit_test/xe_hpg_core/dg2/linux/CMakeLists.txt @@ -4,11 +4,6 @@ # SPDX-License-Identifier: MIT # -set(IGDRCL_SRCS_tests_xe_hpg_core_dg2_linux - ${CMAKE_CURRENT_SOURCE_DIR}/CMakeLists.txt - ${CMAKE_CURRENT_SOURCE_DIR}/hw_info_config_tests_dg2.cpp -) if(UNIX) - target_sources(igdrcl_tests PRIVATE ${IGDRCL_SRCS_tests_xe_hpg_core_dg2_linux}) add_subdirectories() endif() diff --git a/opencl/test/unit_test/xe_hpg_core/excludes_ocl_xe_hpg_core.cpp b/opencl/test/unit_test/xe_hpg_core/excludes_ocl_xe_hpg_core.cpp index 516570865f..3382fe225e 100644 --- a/opencl/test/unit_test/xe_hpg_core/excludes_ocl_xe_hpg_core.cpp +++ b/opencl/test/unit_test/xe_hpg_core/excludes_ocl_xe_hpg_core.cpp @@ -11,6 +11,3 @@ HWTEST_EXCLUDE_PRODUCT(BufferSetSurfaceTests, givenAlignedCacheableReadOnlyBuffe HWTEST_EXCLUDE_PRODUCT(BufferSetSurfaceTests, givenBufferSetSurfaceThatMemoryIsUnalignedToCachelineButReadOnlyThenL3CacheShouldBeStillOn, IGFX_XE_HPG_CORE); HWTEST_EXCLUDE_PRODUCT(XeHPAndLaterImageTests, givenCompressionWhenAppendingImageFromBufferThenTwoIsSetAsCompressionFormat, IGFX_XE_HPG_CORE); HWTEST_EXCLUDE_PRODUCT(XeHPAndLaterImageTests, givenImageFromBufferWhenSettingSurfaceStateThenPickCompressionFormatFromDebugVariable, IGFX_XE_HPG_CORE); -HWTEST_EXCLUDE_PRODUCT(HwInfoConfigTest, givenSamplerStateWhenAdjustSamplerStateThenNothingIsChanged, IGFX_XE_HPG_CORE); -HWTEST_EXCLUDE_PRODUCT(HwInfoConfigTest, givenHwInfoConfigWhenAskedIfBlitterForImagesIsSupportedThenFalseIsReturned, IGFX_XE_HPG_CORE); -HWTEST_EXCLUDE_PRODUCT(HwInfoConfigTest, givenHwInfoConfigWhenAskedIfTile64With3DSurfaceOnBCSIsSupportedThenTrueIsReturned, IGFX_XE_HPG_CORE); diff --git a/shared/test/common/helpers/default_hw_info.h b/shared/test/common/helpers/default_hw_info.h index e0081066e7..8250650ea9 100644 --- a/shared/test/common/helpers/default_hw_info.h +++ b/shared/test/common/helpers/default_hw_info.h @@ -1,12 +1,11 @@ /* - * Copyright (C) 2021 Intel Corporation + * Copyright (C) 2021-2022 Intel Corporation * * SPDX-License-Identifier: MIT * */ #pragma once -#include #include namespace NEO { diff --git a/shared/test/unit_test/gen11/icllp/CMakeLists.txt b/shared/test/unit_test/gen11/icllp/CMakeLists.txt index 3f1908556a..423ab11a0b 100644 --- a/shared/test/unit_test/gen11/icllp/CMakeLists.txt +++ b/shared/test/unit_test/gen11/icllp/CMakeLists.txt @@ -5,5 +5,11 @@ # if(TESTS_ICLLP) + set(NEO_SHARED_tests_gen11_icllp + ${CMAKE_CURRENT_SOURCE_DIR}/excludes_gen11_icllp.cpp + ) + + target_sources(${TARGET_NAME} PRIVATE ${NEO_SHARED_tests_gen11_icllp}) + add_subdirectories() endif() diff --git a/opencl/test/unit_test/gen11/icllp/excludes_ocl_icllp.cpp b/shared/test/unit_test/gen11/icllp/excludes_gen11_icllp.cpp similarity index 100% rename from opencl/test/unit_test/gen11/icllp/excludes_ocl_icllp.cpp rename to shared/test/unit_test/gen11/icllp/excludes_gen11_icllp.cpp diff --git a/shared/test/unit_test/gen12lp/dg1/CMakeLists.txt b/shared/test/unit_test/gen12lp/dg1/CMakeLists.txt index 2dd74d2a4d..4cecc48ee2 100644 --- a/shared/test/unit_test/gen12lp/dg1/CMakeLists.txt +++ b/shared/test/unit_test/gen12lp/dg1/CMakeLists.txt @@ -7,6 +7,7 @@ if(TESTS_DG1) target_sources(neo_shared_tests PRIVATE ${CMAKE_CURRENT_SOURCE_DIR}/CMakeLists.txt + ${CMAKE_CURRENT_SOURCE_DIR}/excludes_gen12lp_dg1.cpp ${CMAKE_CURRENT_SOURCE_DIR}/test_hw_info_config_dg1.cpp ) add_subdirectories() diff --git a/shared/test/unit_test/gen12lp/dg1/excludes_gen12lp_dg1.cpp b/shared/test/unit_test/gen12lp/dg1/excludes_gen12lp_dg1.cpp new file mode 100644 index 0000000000..a52633e494 --- /dev/null +++ b/shared/test/unit_test/gen12lp/dg1/excludes_gen12lp_dg1.cpp @@ -0,0 +1,15 @@ +/* + * Copyright (C) 2022 Intel Corporation + * + * SPDX-License-Identifier: MIT + * + */ + +#include "shared/test/common/test_macros/test.h" + +HWTEST_EXCLUDE_PRODUCT(HwInfoConfigTest, givenHwInfoConfigWhenAskedIfPipeControlWAIsRequiredThenFalseIsReturned, IGFX_DG1); +HWTEST_EXCLUDE_PRODUCT(HwInfoConfigTest, givenHwInfoConfigWhenAskedIfImagePitchAlignmentWAIsRequiredThenFalseIsReturned, IGFX_DG1); +HWTEST_EXCLUDE_PRODUCT(HwInfoConfigTest, givenHwInfoConfigWhenAskedIfForceEmuInt32DivRemSPWAIsRequiredThenFalseIsReturned, IGFX_DG1); +HWTEST_EXCLUDE_PRODUCT(HwInfoConfigTest, givenHwInfoConfigWhenAskedIf3DPipelineSelectWAIsRequiredThenFalseIsReturned, IGFX_DG1); +HWTEST_EXCLUDE_PRODUCT(HwInfoConfigTest, givenHwInfoConfigWhenAskedIfStorageInfoAdjustmentIsRequiredThenFalseIsReturned, IGFX_DG1); +HWTEST_EXCLUDE_PRODUCT(HwInfoConfigTest, whenOverrideGfxPartitionLayoutForWslThenReturnFalse, IGFX_DG1); diff --git a/shared/test/unit_test/gen12lp/rkl/CMakeLists.txt b/shared/test/unit_test/gen12lp/rkl/CMakeLists.txt index d3060b13ac..764364fcb4 100644 --- a/shared/test/unit_test/gen12lp/rkl/CMakeLists.txt +++ b/shared/test/unit_test/gen12lp/rkl/CMakeLists.txt @@ -5,5 +5,11 @@ # if(TESTS_RKL) + set(NEO_SHARED_tests_gen12lp_rkl + ${CMAKE_CURRENT_SOURCE_DIR}/excludes_gen12lp_rkl.cpp + ) + + target_sources(${TARGET_NAME} PRIVATE ${NEO_SHARED_tests_gen12lp_rkl}) + add_subdirectories() endif() diff --git a/shared/test/unit_test/gen12lp/rkl/excludes_gen12lp_rkl.cpp b/shared/test/unit_test/gen12lp/rkl/excludes_gen12lp_rkl.cpp new file mode 100644 index 0000000000..20c9c7f3cf --- /dev/null +++ b/shared/test/unit_test/gen12lp/rkl/excludes_gen12lp_rkl.cpp @@ -0,0 +1,11 @@ +/* + * Copyright (C) 2022 Intel Corporation + * + * SPDX-License-Identifier: MIT + * + */ + +#include "shared/test/common/test_macros/test.h" + +HWTEST_EXCLUDE_PRODUCT(HwInfoConfigTest, givenHwInfoConfigWhenAskedIfForceEmuInt32DivRemSPWAIsRequiredThenFalseIsReturned, IGFX_ROCKETLAKE); +HWTEST_EXCLUDE_PRODUCT(HwInfoConfigTest, givenHwInfoConfigWhenAskedIf3DPipelineSelectWAIsRequiredThenFalseIsReturned, IGFX_ROCKETLAKE); diff --git a/shared/test/unit_test/gen12lp/tgllp/CMakeLists.txt b/shared/test/unit_test/gen12lp/tgllp/CMakeLists.txt index fd05974d79..284c60a4e2 100644 --- a/shared/test/unit_test/gen12lp/tgllp/CMakeLists.txt +++ b/shared/test/unit_test/gen12lp/tgllp/CMakeLists.txt @@ -5,5 +5,11 @@ # if(TESTS_TGLLP) + set(NEO_SHARED_tests_genlp12_tgllp + ${CMAKE_CURRENT_SOURCE_DIR}/excludes_gen12lp_tgllp.cpp + ) + + target_sources(${TARGET_NAME} PRIVATE ${NEO_SHARED_tests_genlp12_tgllp}) + add_subdirectories() endif() diff --git a/shared/test/unit_test/gen12lp/tgllp/excludes_gen12lp_tgllp.cpp b/shared/test/unit_test/gen12lp/tgllp/excludes_gen12lp_tgllp.cpp new file mode 100644 index 0000000000..ddaefc6b34 --- /dev/null +++ b/shared/test/unit_test/gen12lp/tgllp/excludes_gen12lp_tgllp.cpp @@ -0,0 +1,13 @@ +/* + * Copyright (C) 2022 Intel Corporation + * + * SPDX-License-Identifier: MIT + * + */ + +#include "shared/test/common/test_macros/test.h" + +HWTEST_EXCLUDE_PRODUCT(HwInfoConfigTest, givenHwInfoConfigWhenAskedIfPipeControlWAIsRequiredThenFalseIsReturned, IGFX_TIGERLAKE_LP); +HWTEST_EXCLUDE_PRODUCT(HwInfoConfigTest, givenHwInfoConfigWhenAskedIfImagePitchAlignmentWAIsRequiredThenFalseIsReturned, IGFX_TIGERLAKE_LP); +HWTEST_EXCLUDE_PRODUCT(HwInfoConfigTest, givenHwInfoConfigWhenAskedIfForceEmuInt32DivRemSPWAIsRequiredThenFalseIsReturned, IGFX_TIGERLAKE_LP); +HWTEST_EXCLUDE_PRODUCT(HwInfoConfigTest, givenHwInfoConfigWhenAskedIf3DPipelineSelectWAIsRequiredThenFalseIsReturned, IGFX_TIGERLAKE_LP); diff --git a/shared/test/unit_test/helpers/test_hw_info_config.cpp b/shared/test/unit_test/helpers/test_hw_info_config.cpp index 55d240adf8..42efbc676c 100644 --- a/shared/test/unit_test/helpers/test_hw_info_config.cpp +++ b/shared/test/unit_test/helpers/test_hw_info_config.cpp @@ -6,14 +6,12 @@ */ #include "shared/source/os_interface/hw_info_config.h" -#include "shared/test/common/fixtures/device_fixture.h" #include "shared/test/common/helpers/debug_manager_state_restore.h" #include "shared/test/common/test_macros/test.h" +#include "shared/test/unit_test/os_interface/hw_info_config_tests.h" using namespace NEO; -using HwInfoConfigTest = Test; - HWTEST_F(HwInfoConfigTest, givenHwInfoConfigWhenIsAdjustProgrammableIdPreferredSlmSizeRequiredThenFalseIsReturned) { const auto &hwInfoConfig = *HwInfoConfig::get(defaultHwInfo->platform.eProductFamily); EXPECT_FALSE(hwInfoConfig.isAdjustProgrammableIdPreferredSlmSizeRequired(*defaultHwInfo)); diff --git a/shared/test/unit_test/os_interface/CMakeLists.txt b/shared/test/unit_test/os_interface/CMakeLists.txt index 78536a2e1a..1029130c4e 100644 --- a/shared/test/unit_test/os_interface/CMakeLists.txt +++ b/shared/test/unit_test/os_interface/CMakeLists.txt @@ -13,6 +13,7 @@ set(NEO_CORE_OS_INTERFACE_AUB_TESTS set(NEO_CORE_OS_INTERFACE_TESTS ${CMAKE_CURRENT_SOURCE_DIR}/CMakeLists.txt ${CMAKE_CURRENT_SOURCE_DIR}/device_uuid_tests.cpp + ${CMAKE_CURRENT_SOURCE_DIR}/hw_info_config_tests.cpp ) set_property(GLOBAL PROPERTY NEO_CORE_OS_INTERFACE_TESTS ${NEO_CORE_OS_INTERFACE_TESTS}) diff --git a/opencl/test/unit_test/os_interface/hw_info_config_tests.cpp b/shared/test/unit_test/os_interface/hw_info_config_tests.cpp similarity index 98% rename from opencl/test/unit_test/os_interface/hw_info_config_tests.cpp rename to shared/test/unit_test/os_interface/hw_info_config_tests.cpp index 593ff7f1e9..52f47c3f89 100644 --- a/opencl/test/unit_test/os_interface/hw_info_config_tests.cpp +++ b/shared/test/unit_test/os_interface/hw_info_config_tests.cpp @@ -1,5 +1,5 @@ /* - * Copyright (C) 2018-2022 Intel Corporation + * Copyright (C) 2022 Intel Corporation * * SPDX-License-Identifier: MIT * @@ -16,10 +16,6 @@ #include "shared/test/common/mocks/mock_gmm.h" #include "shared/test/common/mocks/mock_graphics_allocation.h" #include "shared/test/unit_test/helpers/gtest_helpers.h" -#include "shared/test/unit_test/utilities/base_object_utils.h" - -#include "opencl/source/sampler/sampler.h" -#include "opencl/test/unit_test/mocks/mock_context.h" #include "gtest/gtest.h" @@ -156,18 +152,6 @@ HWTEST_F(HwInfoConfigTest, whenOverrideGfxPartitionLayoutForWslThenReturnFalse) EXPECT_FALSE(hwInfoConfig->overrideGfxPartitionLayoutForWsl()); } -HWTEST_F(HwInfoConfigTest, givenSamplerStateWhenAdjustSamplerStateThenNothingIsChanged) { - using SAMPLER_STATE = typename FamilyType::SAMPLER_STATE; - auto hwInfoConfig = HwInfoConfig::get(pInHwInfo.platform.eProductFamily); - auto context = clUniquePtr(new MockContext()); - auto sampler = clUniquePtr(new SamplerHw(context.get(), CL_FALSE, CL_ADDRESS_NONE, CL_FILTER_NEAREST)); - auto state = FamilyType::cmdInitSamplerState; - auto initialState = state; - hwInfoConfig->adjustSamplerState(&state, pInHwInfo); - - EXPECT_EQ(0, memcmp(&initialState, &state, sizeof(SAMPLER_STATE))); -} - HWTEST_F(HwInfoConfigTest, givenHardwareInfoWhenCallingIsAdditionalStateBaseAddressWARequiredThenFalseIsReturned) { auto hwInfoConfig = HwInfoConfig::get(pInHwInfo.platform.eProductFamily); bool ret = hwInfoConfig->isAdditionalStateBaseAddressWARequired(pInHwInfo); @@ -467,3 +451,14 @@ HWTEST2_F(HwInfoConfigTest, givenHwInfoConfigWhenGettingIsBlitCopyRequiredForLoc EXPECT_FALSE(hwInfoConfig.isBlitCopyRequiredForLocalMemory(pInHwInfo, graphicsAllocation)); } + +HWTEST_F(HwInfoConfigTest, givenSamplerStateWhenAdjustSamplerStateThenNothingIsChanged) { + using SAMPLER_STATE = typename FamilyType::SAMPLER_STATE; + auto hwInfoConfig = HwInfoConfig::get(pInHwInfo.platform.eProductFamily); + + auto state = FamilyType::cmdInitSamplerState; + auto initialState = state; + hwInfoConfig->adjustSamplerState(&state, pInHwInfo); + + EXPECT_EQ(0, memcmp(&initialState, &state, sizeof(SAMPLER_STATE))); +} diff --git a/shared/test/unit_test/os_interface/hw_info_config_tests.h b/shared/test/unit_test/os_interface/hw_info_config_tests.h index d8f086edae..bf3107c263 100644 --- a/shared/test/unit_test/os_interface/hw_info_config_tests.h +++ b/shared/test/unit_test/os_interface/hw_info_config_tests.h @@ -17,20 +17,11 @@ using namespace NEO; struct HwInfoConfigTest : public ::testing::Test { void SetUp() override { pInHwInfo = *defaultHwInfo; - testPlatform = &pInHwInfo.platform; - testSkuTable = &pInHwInfo.featureTable; - testWaTable = &pInHwInfo.workaroundTable; - testSysInfo = &pInHwInfo.gtSystemInfo; - - outHwInfo = {}; } HardwareInfo pInHwInfo; - HardwareInfo outHwInfo; + HardwareInfo outHwInfo{}; PLATFORM *testPlatform = nullptr; - FeatureTable *testSkuTable = nullptr; - WorkaroundTable *testWaTable = nullptr; - GT_SYSTEM_INFO *testSysInfo = nullptr; }; diff --git a/shared/test/unit_test/xe_hp_core/CMakeLists.txt b/shared/test/unit_test/xe_hp_core/CMakeLists.txt index 316e83f199..8437c6b3ca 100644 --- a/shared/test/unit_test/xe_hp_core/CMakeLists.txt +++ b/shared/test/unit_test/xe_hp_core/CMakeLists.txt @@ -8,6 +8,7 @@ if(TESTS_XE_HP_CORE) set(NEO_SHARED_tests_xe_hp_core ${CMAKE_CURRENT_SOURCE_DIR}/CMakeLists.txt ${CMAKE_CURRENT_SOURCE_DIR}/compute_mode_tests_xe_hp_core.cpp + ${CMAKE_CURRENT_SOURCE_DIR}/excludes_xe_hp_core.cpp ${CMAKE_CURRENT_SOURCE_DIR}/hw_cmds_xe_hp_core_tests.cpp ${CMAKE_CURRENT_SOURCE_DIR}/hw_helper_xe_hp_core_tests.cpp ) diff --git a/shared/test/unit_test/xe_hp_core/excludes_xe_hp_core.cpp b/shared/test/unit_test/xe_hp_core/excludes_xe_hp_core.cpp new file mode 100644 index 0000000000..4b145204cc --- /dev/null +++ b/shared/test/unit_test/xe_hp_core/excludes_xe_hp_core.cpp @@ -0,0 +1,16 @@ +/* + * Copyright (C) 2022 Intel Corporation + * + * SPDX-License-Identifier: MIT + * + */ + +#include "shared/test/common/test_macros/test.h" + +HWTEST_EXCLUDE_PRODUCT(HwInfoConfigTest, WhenAllowCompressionIsCalledThenTrueIsReturned, IGFX_XE_HP_CORE); +HWTEST_EXCLUDE_PRODUCT(HwInfoConfigTest, givenHardwareInfoWhenCallingIsMaxThreadsForWorkgroupWARequiredThenFalseIsReturned, IGFX_XE_HP_CORE); +HWTEST_EXCLUDE_PRODUCT(HwInfoConfigTest, whenCallingGetDeviceMemoryNameThenDdrIsReturned, IGFX_XE_HP_CORE); +HWTEST_EXCLUDE_PRODUCT(HwInfoConfigTest, givenHwInfoConfigWhenAskedIfExtraParametersAreInvalidThenFalseIsReturned, IGFX_XE_HP_CORE); +HWTEST_EXCLUDE_PRODUCT(HwInfoConfigTest, givenHwInfoConfigWhenAskedIfTile64With3DSurfaceOnBCSIsSupportedThenTrueIsReturned, IGFX_XE_HP_CORE); +HWTEST_EXCLUDE_PRODUCT(HwInfoConfigTest, givenHwInfoConfigWhenAskedIfBlitterForImagesIsSupportedThenFalseIsReturned, IGFX_XE_HP_CORE); +HWTEST_EXCLUDE_PRODUCT(HwInfoConfigTest, givenHwInfoConfigWhenAskedIfPipeControlPriorToNonPipelinedStateCommandsWARequiredThenFalseIsReturned, IGFX_XE_HP_CORE); diff --git a/shared/test/unit_test/xe_hpc_core/excludes_xe_hpc_core.cpp b/shared/test/unit_test/xe_hpc_core/excludes_xe_hpc_core.cpp index c110230f1d..ec98ac4de7 100644 --- a/shared/test/unit_test/xe_hpc_core/excludes_xe_hpc_core.cpp +++ b/shared/test/unit_test/xe_hpc_core/excludes_xe_hpc_core.cpp @@ -29,3 +29,8 @@ HWTEST_EXCLUDE_PRODUCT(HwInfoConfigTest, givenHwInfoConfigWhenIsGlobalFenceInCom HWTEST_EXCLUDE_PRODUCT(HwInfoConfigTest, givenHwInfoConfigWhenIsSpecialPipelineSelectModeChangedThenFalseIsReturned, IGFX_XE_HPC_CORE); HWTEST_EXCLUDE_PRODUCT(HwInfoConfigTest, givenHwInfoConfigWhenIsSystolicModeConfigurabledThenFalseIsReturned, IGFX_XE_HPC_CORE); HWTEST_EXCLUDE_PRODUCT(HwInfoConfigTest, givenHwInfoConfigWhenGetThreadEuRatioForScratchThen8IsReturned, IGFX_XE_HPC_CORE); +HWTEST_EXCLUDE_PRODUCT(HwInfoConfigTest, givenVariousValuesWhenConvertingHwRevIdAndSteppingThenConversionIsCorrect, IGFX_XE_HPC_CORE); +HWTEST_EXCLUDE_PRODUCT(HwInfoConfigTest, whenCallingGetDeviceMemoryNameThenDdrIsReturned, IGFX_XE_HPC_CORE); +HWTEST_EXCLUDE_PRODUCT(HwInfoConfigTest, givenHardwareInfoWhenCallingIsMaxThreadsForWorkgroupWARequiredThenFalseIsReturned, IGFX_XE_HPC_CORE); +HWTEST_EXCLUDE_PRODUCT(HwInfoConfigTest, givenHwInfoConfigWhenAskedIfPipeControlPriorToNonPipelinedStateCommandsWARequiredThenFalseIsReturned, IGFX_XE_HPC_CORE); +HWTEST_EXCLUDE_PRODUCT(HwInfoConfigTest, givenHwInfoConfigWhenAskedIfTile64With3DSurfaceOnBCSIsSupportedThenTrueIsReturned, IGFX_XE_HPC_CORE); diff --git a/shared/test/unit_test/xe_hpc_core/pvc/linux/CMakeLists.txt b/shared/test/unit_test/xe_hpc_core/pvc/linux/CMakeLists.txt new file mode 100644 index 0000000000..b5d30df11f --- /dev/null +++ b/shared/test/unit_test/xe_hpc_core/pvc/linux/CMakeLists.txt @@ -0,0 +1,12 @@ +# +# Copyright (C) 2022 Intel Corporation +# +# SPDX-License-Identifier: MIT +# + +if(UNIX) + target_sources(neo_shared_tests PRIVATE + ${CMAKE_CURRENT_SOURCE_DIR}/hw_info_config_tests_pvc.cpp + ) + add_subdirectories() +endif() diff --git a/opencl/test/unit_test/xe_hpc_core/pvc/linux/hw_info_config_tests_pvc.cpp b/shared/test/unit_test/xe_hpc_core/pvc/linux/hw_info_config_tests_pvc.cpp similarity index 100% rename from opencl/test/unit_test/xe_hpc_core/pvc/linux/hw_info_config_tests_pvc.cpp rename to shared/test/unit_test/xe_hpc_core/pvc/linux/hw_info_config_tests_pvc.cpp diff --git a/shared/test/unit_test/xe_hpg_core/CMakeLists.txt b/shared/test/unit_test/xe_hpg_core/CMakeLists.txt index f1595f708a..770cf428f1 100644 --- a/shared/test/unit_test/xe_hpg_core/CMakeLists.txt +++ b/shared/test/unit_test/xe_hpg_core/CMakeLists.txt @@ -8,6 +8,7 @@ if(TESTS_XE_HPG_CORE) set(NEO_SHARED_tests_xe_hpg_core ${CMAKE_CURRENT_SOURCE_DIR}/CMakeLists.txt ${CMAKE_CURRENT_SOURCE_DIR}/compute_mode_tests_xe_hpg_core.cpp + ${CMAKE_CURRENT_SOURCE_DIR}/excludes_xe_hpg_core.cpp ${CMAKE_CURRENT_SOURCE_DIR}/hw_cmds_xe_hpg_core_tests.cpp ${CMAKE_CURRENT_SOURCE_DIR}/hw_helper_tests_xe_hpg_core.cpp ${CMAKE_CURRENT_SOURCE_DIR}/test_encode_dispatch_kernel_xe_hpg_core.cpp diff --git a/shared/test/unit_test/xe_hpg_core/dg2/CMakeLists.txt b/shared/test/unit_test/xe_hpg_core/dg2/CMakeLists.txt index 1985744d91..16a621b6f5 100644 --- a/shared/test/unit_test/xe_hpg_core/dg2/CMakeLists.txt +++ b/shared/test/unit_test/xe_hpg_core/dg2/CMakeLists.txt @@ -10,9 +10,9 @@ if(TESTS_DG2) ${CMAKE_CURRENT_SOURCE_DIR}/compute_mode_tests_dg2.cpp ${CMAKE_CURRENT_SOURCE_DIR}/device_binary_format_ar_tests_dg2.cpp ${CMAKE_CURRENT_SOURCE_DIR}/hw_helper_tests_dg2.cpp + ${CMAKE_CURRENT_SOURCE_DIR}/excludes_xe_hpg_core_dg2.cpp ${CMAKE_CURRENT_SOURCE_DIR}/hw_info_config_tests_dg2.cpp ${CMAKE_CURRENT_SOURCE_DIR}${BRANCH_DIR_SUFFIX}product_config_tests_dg2.cpp ) add_subdirectories() endif() - diff --git a/shared/test/unit_test/xe_hpg_core/dg2/excludes_xe_hpg_core_dg2.cpp b/shared/test/unit_test/xe_hpg_core/dg2/excludes_xe_hpg_core_dg2.cpp new file mode 100644 index 0000000000..39f7ed09a4 --- /dev/null +++ b/shared/test/unit_test/xe_hpg_core/dg2/excludes_xe_hpg_core_dg2.cpp @@ -0,0 +1,19 @@ +/* + * Copyright (C) 2022 Intel Corporation + * + * SPDX-License-Identifier: MIT + * + */ + +#include "shared/test/common/test_macros/test.h" + +HWTEST_EXCLUDE_PRODUCT(HwInfoConfigTest, WhenAllowCompressionIsCalledThenTrueIsReturned, IGFX_DG2); +HWTEST_EXCLUDE_PRODUCT(HwInfoConfigTest, givenHardwareInfoWhenCallingIsAdditionalStateBaseAddressWARequiredThenFalseIsReturned, IGFX_DG2); +HWTEST_EXCLUDE_PRODUCT(HwInfoConfigTest, givenHardwareInfoWhenCallingIsMaxThreadsForWorkgroupWARequiredThenFalseIsReturned, IGFX_DG2); +HWTEST_EXCLUDE_PRODUCT(HwInfoConfigTest, givenHwInfoConfigWhenAskedForDefaultEngineTypeAdjustmentThenFalseIsReturned, IGFX_DG2); +HWTEST_EXCLUDE_PRODUCT(HwInfoConfigTest, givenHwInfoConfigWhenAskedIfAllocationSizeAdjustmentIsRequiredThenFalseIsReturned, IGFX_DG2); +HWTEST_EXCLUDE_PRODUCT(HwInfoConfigTest, givenHwInfoConfigWhenAskedIfPrefetchDisablingIsRequiredThenFalseIsReturned, IGFX_DG2); +HWTEST_EXCLUDE_PRODUCT(HwInfoConfigTest, givenHwInfoConfigWhenAskedIfPipeControlPriorToNonPipelinedStateCommandsWARequiredThenFalseIsReturned, IGFX_DG2); +HWTEST_EXCLUDE_PRODUCT(HwInfoConfigTest, givenHwInfoConfigWhenAskedIfTile64With3DSurfaceOnBCSIsSupportedThenTrueIsReturned, IGFX_DG2); +HWTEST_EXCLUDE_PRODUCT(HwInfoConfigTest, WhenAllowRenderCompressionIsCalledThenTrueIsReturned, IGFX_DG2); +HWTEST_EXCLUDE_PRODUCT(HwInfoConfigTest, whenConvertingTimestampsToCsDomainThenNothingIsChanged, IGFX_DG2); diff --git a/shared/test/unit_test/xe_hpg_core/dg2/linux/CMakeLists.txt b/shared/test/unit_test/xe_hpg_core/dg2/linux/CMakeLists.txt new file mode 100644 index 0000000000..4110b7e25b --- /dev/null +++ b/shared/test/unit_test/xe_hpg_core/dg2/linux/CMakeLists.txt @@ -0,0 +1,12 @@ +# +# Copyright (C) 2022 Intel Corporation +# +# SPDX-License-Identifier: MIT +# + +if(UNIX) + target_sources(neo_shared_tests PRIVATE + ${CMAKE_CURRENT_SOURCE_DIR}/hw_info_config_tests_dg2.cpp + ) + add_subdirectories() +endif() diff --git a/opencl/test/unit_test/xe_hpg_core/dg2/linux/hw_info_config_tests_dg2.cpp b/shared/test/unit_test/xe_hpg_core/dg2/linux/hw_info_config_tests_dg2.cpp similarity index 100% rename from opencl/test/unit_test/xe_hpg_core/dg2/linux/hw_info_config_tests_dg2.cpp rename to shared/test/unit_test/xe_hpg_core/dg2/linux/hw_info_config_tests_dg2.cpp diff --git a/shared/test/unit_test/xe_hpg_core/excludes_xe_hpg_core.cpp b/shared/test/unit_test/xe_hpg_core/excludes_xe_hpg_core.cpp new file mode 100644 index 0000000000..9b33df0210 --- /dev/null +++ b/shared/test/unit_test/xe_hpg_core/excludes_xe_hpg_core.cpp @@ -0,0 +1,12 @@ +/* + * Copyright (C) 2022 Intel Corporation + * + * SPDX-License-Identifier: MIT + * + */ + +#include "shared/test/common/test_macros/test.h" + +HWTEST_EXCLUDE_PRODUCT(HwInfoConfigTest, givenSamplerStateWhenAdjustSamplerStateThenNothingIsChanged, IGFX_XE_HPG_CORE); +HWTEST_EXCLUDE_PRODUCT(HwInfoConfigTest, givenHwInfoConfigWhenAskedIfBlitterForImagesIsSupportedThenFalseIsReturned, IGFX_XE_HPG_CORE); +HWTEST_EXCLUDE_PRODUCT(HwInfoConfigTest, givenHwInfoConfigWhenAskedIfTile64With3DSurfaceOnBCSIsSupportedThenTrueIsReturned, IGFX_XE_HPG_CORE);