From ac39f424cef2b6da705aa4f718f67d81cab39c11 Mon Sep 17 00:00:00 2001 From: Mateusz Jablonski Date: Wed, 19 Jan 2022 17:03:53 +0000 Subject: [PATCH] Correct expectations of horizontal alignment programmed value change value in mock to verify non-default value programming Signed-off-by: Mateusz Jablonski --- .../command_queue/enqueue_copy_buffer_to_image_tests.cpp | 3 ++- .../unit_test/command_queue/enqueue_copy_image_tests.cpp | 3 ++- .../command_queue/enqueue_copy_image_to_buffer_tests.cpp | 3 ++- .../unit_test/command_queue/enqueue_fill_image_tests.cpp | 3 ++- .../unit_test/command_queue/enqueue_read_image_tests.cpp | 3 ++- .../unit_test/command_queue/enqueue_write_image_tests.cpp | 3 ++- opencl/test/unit_test/mem_obj/image_set_arg_tests.cpp | 2 +- shared/test/common/mocks/mock_gmm_resource_info.h | 5 +++-- 8 files changed, 16 insertions(+), 9 deletions(-) diff --git a/opencl/test/unit_test/command_queue/enqueue_copy_buffer_to_image_tests.cpp b/opencl/test/unit_test/command_queue/enqueue_copy_buffer_to_image_tests.cpp index e0e606de39..6924271c48 100644 --- a/opencl/test/unit_test/command_queue/enqueue_copy_buffer_to_image_tests.cpp +++ b/opencl/test/unit_test/command_queue/enqueue_copy_buffer_to_image_tests.cpp @@ -8,6 +8,7 @@ #include "shared/test/common/helpers/unit_test_helper.h" #include "shared/test/common/libult/ult_command_stream_receiver.h" #include "shared/test/common/mocks/mock_builtins.h" +#include "shared/test/common/mocks/mock_gmm_resource_info.h" #include "shared/test/common/test_macros/test.h" #include "shared/test/common/test_macros/test_checks_shared.h" @@ -188,7 +189,7 @@ HWTEST_F(EnqueueCopyBufferToImageTest, WhenCopyingBufferToImageThenSurfaceStateI surfaceFormat == RENDER_SURFACE_STATE::SURFACE_FORMAT_R16_UINT || surfaceFormat == RENDER_SURFACE_STATE::SURFACE_FORMAT_R8_UINT; EXPECT_TRUE(isRedescribedFormat); - EXPECT_EQ(RENDER_SURFACE_STATE::SURFACE_HORIZONTAL_ALIGNMENT_HALIGN_DEFAULT, surfaceState.getSurfaceHorizontalAlignment()); + EXPECT_EQ(MockGmmResourceInfo::getHAlignSurfaceStateResult, surfaceState.getSurfaceHorizontalAlignment()); EXPECT_EQ(RENDER_SURFACE_STATE::SURFACE_VERTICAL_ALIGNMENT_VALIGN_4, surfaceState.getSurfaceVerticalAlignment()); EXPECT_EQ(dstImage->getGraphicsAllocation(pClDevice->getRootDeviceIndex())->getGpuAddress(), surfaceState.getSurfaceBaseAddress()); } diff --git a/opencl/test/unit_test/command_queue/enqueue_copy_image_tests.cpp b/opencl/test/unit_test/command_queue/enqueue_copy_image_tests.cpp index 1cebf6412f..80ef1c31f5 100644 --- a/opencl/test/unit_test/command_queue/enqueue_copy_image_tests.cpp +++ b/opencl/test/unit_test/command_queue/enqueue_copy_image_tests.cpp @@ -9,6 +9,7 @@ #include "shared/test/common/helpers/unit_test_helper.h" #include "shared/test/common/libult/ult_command_stream_receiver.h" #include "shared/test/common/mocks/mock_builtins.h" +#include "shared/test/common/mocks/mock_gmm_resource_info.h" #include "shared/test/common/test_macros/test.h" #include "opencl/source/built_ins/builtins_dispatch_builder.h" @@ -190,7 +191,7 @@ HWTEST_F(EnqueueCopyImageTest, WhenCopyingImageThenSurfaceStateIsCorrect) { surfaceFormat == RENDER_SURFACE_STATE::SURFACE_FORMAT_R16_UINT || surfaceFormat == RENDER_SURFACE_STATE::SURFACE_FORMAT_R8_UINT; EXPECT_TRUE(isRedescribedFormat); - EXPECT_EQ(RENDER_SURFACE_STATE::SURFACE_HORIZONTAL_ALIGNMENT_HALIGN_DEFAULT, surfaceState.getSurfaceHorizontalAlignment()); + EXPECT_EQ(MockGmmResourceInfo::getHAlignSurfaceStateResult, surfaceState.getSurfaceHorizontalAlignment()); EXPECT_EQ(RENDER_SURFACE_STATE::SURFACE_VERTICAL_ALIGNMENT_VALIGN_4, surfaceState.getSurfaceVerticalAlignment()); } diff --git a/opencl/test/unit_test/command_queue/enqueue_copy_image_to_buffer_tests.cpp b/opencl/test/unit_test/command_queue/enqueue_copy_image_to_buffer_tests.cpp index 5c7bdf1224..bc7fe644b3 100644 --- a/opencl/test/unit_test/command_queue/enqueue_copy_image_to_buffer_tests.cpp +++ b/opencl/test/unit_test/command_queue/enqueue_copy_image_to_buffer_tests.cpp @@ -8,6 +8,7 @@ #include "shared/test/common/helpers/unit_test_helper.h" #include "shared/test/common/libult/ult_command_stream_receiver.h" #include "shared/test/common/mocks/mock_builtins.h" +#include "shared/test/common/mocks/mock_gmm_resource_info.h" #include "shared/test/common/test_macros/test.h" #include "opencl/source/built_ins/builtins_dispatch_builder.h" @@ -181,7 +182,7 @@ HWTEST_F(EnqueueCopyImageToBufferTest, WhenCopyingImageToBufferThenSurfaceStateI surfaceFormat == RENDER_SURFACE_STATE::SURFACE_FORMAT_R16_UINT || surfaceFormat == RENDER_SURFACE_STATE::SURFACE_FORMAT_R8_UINT; EXPECT_TRUE(isRedescribedFormat); - EXPECT_EQ(RENDER_SURFACE_STATE::SURFACE_HORIZONTAL_ALIGNMENT_HALIGN_DEFAULT, surfaceState.getSurfaceHorizontalAlignment()); + EXPECT_EQ(MockGmmResourceInfo::getHAlignSurfaceStateResult, surfaceState.getSurfaceHorizontalAlignment()); EXPECT_EQ(RENDER_SURFACE_STATE::SURFACE_VERTICAL_ALIGNMENT_VALIGN_4, surfaceState.getSurfaceVerticalAlignment()); EXPECT_EQ(srcImage->getGraphicsAllocation(pClDevice->getRootDeviceIndex())->getGpuAddress(), surfaceState.getSurfaceBaseAddress()); } diff --git a/opencl/test/unit_test/command_queue/enqueue_fill_image_tests.cpp b/opencl/test/unit_test/command_queue/enqueue_fill_image_tests.cpp index 537ce3742d..694ab5046d 100644 --- a/opencl/test/unit_test/command_queue/enqueue_fill_image_tests.cpp +++ b/opencl/test/unit_test/command_queue/enqueue_fill_image_tests.cpp @@ -7,6 +7,7 @@ #include "shared/test/common/helpers/unit_test_helper.h" #include "shared/test/common/libult/ult_command_stream_receiver.h" +#include "shared/test/common/mocks/mock_gmm_resource_info.h" #include "shared/test/common/test_macros/test.h" #include "opencl/source/helpers/convert_color.h" @@ -186,7 +187,7 @@ HWTEST_F(EnqueueFillImageTest, WhenFillingImageThenSurfaceStateIsCorrect) { EXPECT_EQ(imageDesc.image_height, surfaceState.getHeight()); EXPECT_NE(0u, surfaceState.getSurfacePitch()); EXPECT_NE(0u, surfaceState.getSurfaceType()); - EXPECT_EQ(RENDER_SURFACE_STATE::SURFACE_HORIZONTAL_ALIGNMENT_HALIGN_DEFAULT, surfaceState.getSurfaceHorizontalAlignment()); + EXPECT_EQ(MockGmmResourceInfo::getHAlignSurfaceStateResult, surfaceState.getSurfaceHorizontalAlignment()); EXPECT_EQ(RENDER_SURFACE_STATE::SURFACE_VERTICAL_ALIGNMENT_VALIGN_4, surfaceState.getSurfaceVerticalAlignment()); EXPECT_EQ(image->getGraphicsAllocation(pClDevice->getRootDeviceIndex())->getGpuAddress(), surfaceState.getSurfaceBaseAddress()); } diff --git a/opencl/test/unit_test/command_queue/enqueue_read_image_tests.cpp b/opencl/test/unit_test/command_queue/enqueue_read_image_tests.cpp index 12e86cb828..38d5655e9b 100644 --- a/opencl/test/unit_test/command_queue/enqueue_read_image_tests.cpp +++ b/opencl/test/unit_test/command_queue/enqueue_read_image_tests.cpp @@ -10,6 +10,7 @@ #include "shared/test/common/helpers/debug_manager_state_restore.h" #include "shared/test/common/helpers/unit_test_helper.h" #include "shared/test/common/mocks/mock_builtins.h" +#include "shared/test/common/mocks/mock_gmm_resource_info.h" #include "shared/test/common/test_macros/test.h" #include "opencl/source/built_ins/builtins_dispatch_builder.h" @@ -624,7 +625,7 @@ HWTEST_F(EnqueueReadImageTest, WhenReadingImageThenSurfaceStateIsCorrect) { EXPECT_NE(0u, surfaceState.getSurfacePitch()); EXPECT_NE(0u, surfaceState.getSurfaceType()); EXPECT_EQ(RENDER_SURFACE_STATE::SURFACE_FORMAT_R32_UINT, surfaceState.getSurfaceFormat()); - EXPECT_EQ(RENDER_SURFACE_STATE::SURFACE_HORIZONTAL_ALIGNMENT_HALIGN_DEFAULT, surfaceState.getSurfaceHorizontalAlignment()); + EXPECT_EQ(MockGmmResourceInfo::getHAlignSurfaceStateResult, surfaceState.getSurfaceHorizontalAlignment()); EXPECT_EQ(RENDER_SURFACE_STATE::SURFACE_VERTICAL_ALIGNMENT_VALIGN_4, surfaceState.getSurfaceVerticalAlignment()); EXPECT_EQ(srcAllocation->getGpuAddress(), surfaceState.getSurfaceBaseAddress()); } diff --git a/opencl/test/unit_test/command_queue/enqueue_write_image_tests.cpp b/opencl/test/unit_test/command_queue/enqueue_write_image_tests.cpp index 64caf8fee6..75560edf36 100644 --- a/opencl/test/unit_test/command_queue/enqueue_write_image_tests.cpp +++ b/opencl/test/unit_test/command_queue/enqueue_write_image_tests.cpp @@ -12,6 +12,7 @@ #include "shared/test/common/helpers/unit_test_helper.h" #include "shared/test/common/libult/ult_command_stream_receiver.h" #include "shared/test/common/mocks/mock_builtins.h" +#include "shared/test/common/mocks/mock_gmm_resource_info.h" #include "shared/test/common/test_macros/test.h" #include "opencl/source/built_ins/builtins_dispatch_builder.h" @@ -192,7 +193,7 @@ HWTEST_F(EnqueueWriteImageTest, WhenWritingImageThenSurfaceStateIsProgrammedCorr EXPECT_NE(0u, surfaceState.getSurfacePitch()); EXPECT_NE(0u, surfaceState.getSurfaceType()); EXPECT_EQ(RENDER_SURFACE_STATE::SURFACE_FORMAT_R32_UINT, surfaceState.getSurfaceFormat()); - EXPECT_EQ(RENDER_SURFACE_STATE::SURFACE_HORIZONTAL_ALIGNMENT_HALIGN_DEFAULT, surfaceState.getSurfaceHorizontalAlignment()); + EXPECT_EQ(MockGmmResourceInfo::getHAlignSurfaceStateResult, surfaceState.getSurfaceHorizontalAlignment()); EXPECT_EQ(RENDER_SURFACE_STATE::SURFACE_VERTICAL_ALIGNMENT_VALIGN_4, surfaceState.getSurfaceVerticalAlignment()); EXPECT_EQ(dstAllocation->getGpuAddress(), surfaceState.getSurfaceBaseAddress()); } diff --git a/opencl/test/unit_test/mem_obj/image_set_arg_tests.cpp b/opencl/test/unit_test/mem_obj/image_set_arg_tests.cpp index 1b715dbfd1..2bf25cd7ec 100644 --- a/opencl/test/unit_test/mem_obj/image_set_arg_tests.cpp +++ b/opencl/test/unit_test/mem_obj/image_set_arg_tests.cpp @@ -310,7 +310,7 @@ HWTEST_F(ImageSetArgTest, givenNonCubeMapIndexWhenSetKernelArgImageIsCalledThenD auto hAlign = static_cast(surfaceState->getSurfaceHorizontalAlignment()); auto vAlign = static_cast(surfaceState->getSurfaceVerticalAlignment()); - auto expectedHAlign = static_cast(RENDER_SURFACE_STATE::SURFACE_HORIZONTAL_ALIGNMENT_HALIGN_DEFAULT); + auto expectedHAlign = static_cast(MockGmmResourceInfo::getHAlignSurfaceStateResult); auto expectedVAlign = static_cast(RENDER_SURFACE_STATE::SURFACE_VERTICAL_ALIGNMENT_VALIGN_4); // 3D image diff --git a/shared/test/common/mocks/mock_gmm_resource_info.h b/shared/test/common/mocks/mock_gmm_resource_info.h index f5dcbebae3..417f146856 100644 --- a/shared/test/common/mocks/mock_gmm_resource_info.h +++ b/shared/test/common/mocks/mock_gmm_resource_info.h @@ -1,5 +1,5 @@ /* - * Copyright (C) 2018-2021 Intel Corporation + * Copyright (C) 2018-2022 Intel Corporation * * SPDX-License-Identifier: MIT * @@ -43,7 +43,7 @@ class MockGmmResourceInfo : public GmmResourceInfo { uint32_t getHAlign() override { return 4u; } - uint32_t getHAlignSurfaceState() override { return 1u; } + uint32_t getHAlignSurfaceState() override { return getHAlignSurfaceStateResult; } uint32_t getVAlignSurfaceState() override { return 1u; } @@ -111,6 +111,7 @@ class MockGmmResourceInfo : public GmmResourceInfo { GMM_RES_COPY_BLT requestedResCopyBlt = {}; uint32_t cpuBltCalled = 0u; uint8_t cpuBltResult = 1u; + static constexpr uint32_t getHAlignSurfaceStateResult = 2u; protected: MockGmmResourceInfo();