Simplify block copy command interface

BartoszDunajski · Compute-Runtime-Automation · commit 6dddcbd812ca · 2019-11-28T15:06:35.000+01:00
Change-Id: I9c89fdb05bc7734e29678fd396bb6f5bc58e919a
Signed-off-by: Dunajski, Bartosz &lt;bartosz.dunajski@intel.com&gt;
diff --git a/core/gen11/hw_cmds_generated.inl b/core/gen11/hw_cmds_generated.inl
@@ -4336,18 +4336,18 @@ typedef struct tagXY_SRC_COPY_BLT {
     inline uint32_t getDestinationY1CoordinateTop(void) const {
         return TheStructure.Common.DestinationY1Coordinate_Top;
     }
-    inline void setDestinationX2CoordinateRight(const uint32_t value) {
+    inline void setTransferWidth(const uint32_t value) {
         UNRECOVERABLE_IF(value > 0xffff);
         TheStructure.Common.DestinationX2Coordinate_Right = value;
     }
-    inline uint32_t getDestinationX2CoordinateRight(void) const {
+    inline uint32_t getTransferWidth(void) const {
         return TheStructure.Common.DestinationX2Coordinate_Right;
     }
-    inline void setDestinationY2CoordinateBottom(const uint32_t value) {
+    inline void setTransferHeight(const uint32_t value) {
         UNRECOVERABLE_IF(value > 0xffff0000);
         TheStructure.Common.DestinationY2Coordinate_Bottom = value;
     }
-    inline uint32_t getDestinationY2CoordinateBottom(void) const {
+    inline uint32_t getTransferHeight(void) const {
         return TheStructure.Common.DestinationY2Coordinate_Bottom;
     }
     inline void setDestinationBaseAddress(const uint64_t value) {
diff --git a/core/gen12lp/hw_cmds_generated.inl b/core/gen12lp/hw_cmds_generated.inl
@@ -4027,18 +4027,18 @@ typedef struct tagXY_SRC_COPY_BLT {
     inline uint32_t getDestinationY1CoordinateTop(void) const {
         return TheStructure.Common.DestinationY1Coordinate_Top;
     }
-    inline void setDestinationX2CoordinateRight(const uint32_t value) {
+    inline void setTransferWidth(const uint32_t value) {
         UNRECOVERABLE_IF(value > 0xffff);
         TheStructure.Common.DestinationX2Coordinate_Right = value;
     }
-    inline uint32_t getDestinationX2CoordinateRight(void) const {
+    inline uint32_t getTransferWidth(void) const {
         return TheStructure.Common.DestinationX2Coordinate_Right;
     }
-    inline void setDestinationY2CoordinateBottom(const uint32_t value) {
+    inline void setTransferHeight(const uint32_t value) {
         UNRECOVERABLE_IF(value > 0xffff);
         TheStructure.Common.DestinationY2Coordinate_Bottom = value;
     }
-    inline uint32_t getDestinationY2CoordinateBottom(void) const {
+    inline uint32_t getTransferHeight(void) const {
         return TheStructure.Common.DestinationY2Coordinate_Bottom;
     }
     inline void setDestinationBaseAddress(const uint64_t value) {
diff --git a/core/gen8/hw_cmds_generated.inl b/core/gen8/hw_cmds_generated.inl
@@ -4019,18 +4019,18 @@ typedef struct tagXY_SRC_COPY_BLT {
     inline uint32_t getDestinationY1CoordinateTop(void) const {
         return TheStructure.Common.DestinationY1Coordinate_Top;
     }
-    inline void setDestinationX2CoordinateRight(const uint32_t value) {
+    inline void setTransferWidth(const uint32_t value) {
         UNRECOVERABLE_IF(value > 0xffff);
         TheStructure.Common.DestinationX2Coordinate_Right = value;
     }
-    inline uint32_t getDestinationX2CoordinateRight(void) const {
+    inline uint32_t getTransferWidth(void) const {
         return TheStructure.Common.DestinationX2Coordinate_Right;
     }
-    inline void setDestinationY2CoordinateBottom(const uint32_t value) {
+    inline void setTransferHeight(const uint32_t value) {
         UNRECOVERABLE_IF(value > 0xffff0000);
         TheStructure.Common.DestinationY2Coordinate_Bottom = value;
     }
-    inline uint32_t getDestinationY2CoordinateBottom(void) const {
+    inline uint32_t getTransferHeight(void) const {
         return TheStructure.Common.DestinationY2Coordinate_Bottom;
     }
     inline void setDestinationBaseAddress(const uint64_t value) {
diff --git a/core/gen9/hw_cmds_generated.inl b/core/gen9/hw_cmds_generated.inl
@@ -4212,18 +4212,18 @@ typedef struct tagXY_SRC_COPY_BLT {
     inline uint32_t getDestinationY1CoordinateTop(void) const {
         return TheStructure.Common.DestinationY1Coordinate_Top;
     }
-    inline void setDestinationX2CoordinateRight(const uint32_t value) {
+    inline void setTransferWidth(const uint32_t value) {
         UNRECOVERABLE_IF(value > 0xffff);
         TheStructure.Common.DestinationX2Coordinate_Right = value;
     }
-    inline uint32_t getDestinationX2CoordinateRight(void) const {
+    inline uint32_t getTransferWidth(void) const {
         return TheStructure.Common.DestinationX2Coordinate_Right;
     }
-    inline void setDestinationY2CoordinateBottom(const uint32_t value) {
+    inline void setTransferHeight(const uint32_t value) {
         UNRECOVERABLE_IF(value > 0xffff0000);
         TheStructure.Common.DestinationY2Coordinate_Bottom = value;
     }
-    inline uint32_t getDestinationY2CoordinateBottom(void) const {
+    inline uint32_t getTransferHeight(void) const {
         return TheStructure.Common.DestinationY2Coordinate_Bottom;
     }
     inline void setDestinationBaseAddress(const uint64_t value) {
diff --git a/runtime/helpers/blit_commands_helper_base.inl b/runtime/helpers/blit_commands_helper_base.inl
@@ -68,13 +68,8 @@ void BlitCommandsHelper<GfxFamily>::dispatchBlitCommandsForBuffer(const BlitProp
         auto bltCmd = linearStream.getSpaceForCmd<typename GfxFamily::XY_COPY_BLT>();
         *bltCmd = GfxFamily::cmdInitXyCopyBlt;
 
-        bltCmd->setDestinationX1CoordinateLeft(0);
-        bltCmd->setDestinationY1CoordinateTop(0);
-        bltCmd->setSourceX1CoordinateLeft(0);
-        bltCmd->setSourceY1CoordinateTop(0);
-
-        bltCmd->setDestinationX2CoordinateRight(static_cast<uint32_t>(width));
-        bltCmd->setDestinationY2CoordinateBottom(static_cast<uint32_t>(height));
+        bltCmd->setTransferWidth(static_cast<uint32_t>(width));
+        bltCmd->setTransferHeight(static_cast<uint32_t>(height));
 
         bltCmd->setDestinationPitch(static_cast<uint32_t>(width));
         bltCmd->setSourcePitch(static_cast<uint32_t>(width));
diff --git a/unit_tests/command_stream/command_stream_receiver_hw_tests.cpp b/unit_tests/command_stream/command_stream_receiver_hw_tests.cpp
@@ -436,18 +436,14 @@ HWTEST_F(BcsTests, givenBltSizeWithLeftoverWhenDispatchedThenProgramAllRequiredC
         auto bltCmd = genCmdCast<typename FamilyType::XY_COPY_BLT *>(*(cmdIterator++));
         EXPECT_NE(nullptr, bltCmd);
 
-        EXPECT_EQ(0u, bltCmd->getDestinationX1CoordinateLeft());
-        EXPECT_EQ(0u, bltCmd->getDestinationY1CoordinateTop());
-        EXPECT_EQ(0u, bltCmd->getSourceX1CoordinateLeft());
-        EXPECT_EQ(0u, bltCmd->getSourceY1CoordinateTop());
         uint32_t expectedWidth = static_cast<uint32_t>(BlitterConstants::maxBlitWidth);
         uint32_t expectedHeight = static_cast<uint32_t>(BlitterConstants::maxBlitHeight);
         if (i == (numberOfBlts - 1)) {
             expectedWidth = bltLeftover;
             expectedHeight = 1;
         }
-        EXPECT_EQ(expectedWidth, bltCmd->getDestinationX2CoordinateRight());
-        EXPECT_EQ(expectedHeight, bltCmd->getDestinationY2CoordinateBottom());
+        EXPECT_EQ(expectedWidth, bltCmd->getTransferWidth());
+        EXPECT_EQ(expectedHeight, bltCmd->getTransferHeight());
         EXPECT_EQ(expectedWidth, bltCmd->getDestinationPitch());
         EXPECT_EQ(expectedWidth, bltCmd->getSourcePitch());
     }
@@ -1037,8 +1033,8 @@ HWTEST_F(BcsTests, givenAuxTranslationRequestWhenBlitCalledThenProgramCommandCor
         for (auto &cmd : hwParser.cmdList) {
             if (auto bltCmd = genCmdCast<typename FamilyType::XY_COPY_BLT *>(cmd)) {
                 xyCopyBltCmdFound++;
-                EXPECT_EQ(static_cast<uint32_t>(allocationSize), bltCmd->getDestinationX2CoordinateRight());
-                EXPECT_EQ(1u, bltCmd->getDestinationY2CoordinateBottom());
+                EXPECT_EQ(static_cast<uint32_t>(allocationSize), bltCmd->getTransferWidth());
+                EXPECT_EQ(1u, bltCmd->getTransferHeight());
 
                 EXPECT_EQ(allocationGpuAddress, bltCmd->getDestinationBaseAddress());
                 EXPECT_EQ(allocationGpuAddress, bltCmd->getSourceBaseAddress());

Original file line number	Diff line number	Diff line change
`@@ -4336,18 +4336,18 @@ typedef struct tagXY_SRC_COPY_BLT {`
`4336`	`4336`	`inline uint32_t getDestinationY1CoordinateTop(void) const {`
`4337`	`4337`	`return TheStructure.Common.DestinationY1Coordinate_Top;`
`4338`	`4338`	`}`
`4339`		`- inline void setDestinationX2CoordinateRight(const uint32_t value) {`
	`4339`	`+ inline void setTransferWidth(const uint32_t value) {`
`4340`	`4340`	`UNRECOVERABLE_IF(value > 0xffff);`
`4341`	`4341`	`TheStructure.Common.DestinationX2Coordinate_Right = value;`
`4342`	`4342`	`}`
`4343`		`- inline uint32_t getDestinationX2CoordinateRight(void) const {`
	`4343`	`+ inline uint32_t getTransferWidth(void) const {`
`4344`	`4344`	`return TheStructure.Common.DestinationX2Coordinate_Right;`
`4345`	`4345`	`}`
`4346`		`- inline void setDestinationY2CoordinateBottom(const uint32_t value) {`
	`4346`	`+ inline void setTransferHeight(const uint32_t value) {`
`4347`	`4347`	`UNRECOVERABLE_IF(value > 0xffff0000);`
`4348`	`4348`	`TheStructure.Common.DestinationY2Coordinate_Bottom = value;`
`4349`	`4349`	`}`
`4350`		`- inline uint32_t getDestinationY2CoordinateBottom(void) const {`
	`4350`	`+ inline uint32_t getTransferHeight(void) const {`
`4351`	`4351`	`return TheStructure.Common.DestinationY2Coordinate_Bottom;`
`4352`	`4352`	`}`
`4353`	`4353`	`inline void setDestinationBaseAddress(const uint64_t value) {`
Original file line number	Diff line number	Diff line change
`@@ -4027,18 +4027,18 @@ typedef struct tagXY_SRC_COPY_BLT {`
`4027`	`4027`	`inline uint32_t getDestinationY1CoordinateTop(void) const {`
`4028`	`4028`	`return TheStructure.Common.DestinationY1Coordinate_Top;`
`4029`	`4029`	`}`
`4030`		`- inline void setDestinationX2CoordinateRight(const uint32_t value) {`
	`4030`	`+ inline void setTransferWidth(const uint32_t value) {`
`4031`	`4031`	`UNRECOVERABLE_IF(value > 0xffff);`
`4032`	`4032`	`TheStructure.Common.DestinationX2Coordinate_Right = value;`
`4033`	`4033`	`}`
`4034`		`- inline uint32_t getDestinationX2CoordinateRight(void) const {`
	`4034`	`+ inline uint32_t getTransferWidth(void) const {`
`4035`	`4035`	`return TheStructure.Common.DestinationX2Coordinate_Right;`
`4036`	`4036`	`}`
`4037`		`- inline void setDestinationY2CoordinateBottom(const uint32_t value) {`
	`4037`	`+ inline void setTransferHeight(const uint32_t value) {`
`4038`	`4038`	`UNRECOVERABLE_IF(value > 0xffff);`
`4039`	`4039`	`TheStructure.Common.DestinationY2Coordinate_Bottom = value;`
`4040`	`4040`	`}`
`4041`		`- inline uint32_t getDestinationY2CoordinateBottom(void) const {`
	`4041`	`+ inline uint32_t getTransferHeight(void) const {`
`4042`	`4042`	`return TheStructure.Common.DestinationY2Coordinate_Bottom;`
`4043`	`4043`	`}`
`4044`	`4044`	`inline void setDestinationBaseAddress(const uint64_t value) {`
Original file line number	Diff line number	Diff line change
`@@ -4019,18 +4019,18 @@ typedef struct tagXY_SRC_COPY_BLT {`
`4019`	`4019`	`inline uint32_t getDestinationY1CoordinateTop(void) const {`
`4020`	`4020`	`return TheStructure.Common.DestinationY1Coordinate_Top;`
`4021`	`4021`	`}`
`4022`		`- inline void setDestinationX2CoordinateRight(const uint32_t value) {`
	`4022`	`+ inline void setTransferWidth(const uint32_t value) {`
`4023`	`4023`	`UNRECOVERABLE_IF(value > 0xffff);`
`4024`	`4024`	`TheStructure.Common.DestinationX2Coordinate_Right = value;`
`4025`	`4025`	`}`
`4026`		`- inline uint32_t getDestinationX2CoordinateRight(void) const {`
	`4026`	`+ inline uint32_t getTransferWidth(void) const {`
`4027`	`4027`	`return TheStructure.Common.DestinationX2Coordinate_Right;`
`4028`	`4028`	`}`
`4029`		`- inline void setDestinationY2CoordinateBottom(const uint32_t value) {`
	`4029`	`+ inline void setTransferHeight(const uint32_t value) {`
`4030`	`4030`	`UNRECOVERABLE_IF(value > 0xffff0000);`
`4031`	`4031`	`TheStructure.Common.DestinationY2Coordinate_Bottom = value;`
`4032`	`4032`	`}`
`4033`		`- inline uint32_t getDestinationY2CoordinateBottom(void) const {`
	`4033`	`+ inline uint32_t getTransferHeight(void) const {`
`4034`	`4034`	`return TheStructure.Common.DestinationY2Coordinate_Bottom;`
`4035`	`4035`	`}`
`4036`	`4036`	`inline void setDestinationBaseAddress(const uint64_t value) {`
Original file line number	Diff line number	Diff line change
`@@ -4212,18 +4212,18 @@ typedef struct tagXY_SRC_COPY_BLT {`
`4212`	`4212`	`inline uint32_t getDestinationY1CoordinateTop(void) const {`
`4213`	`4213`	`return TheStructure.Common.DestinationY1Coordinate_Top;`
`4214`	`4214`	`}`
`4215`		`- inline void setDestinationX2CoordinateRight(const uint32_t value) {`
	`4215`	`+ inline void setTransferWidth(const uint32_t value) {`
`4216`	`4216`	`UNRECOVERABLE_IF(value > 0xffff);`
`4217`	`4217`	`TheStructure.Common.DestinationX2Coordinate_Right = value;`
`4218`	`4218`	`}`
`4219`		`- inline uint32_t getDestinationX2CoordinateRight(void) const {`
	`4219`	`+ inline uint32_t getTransferWidth(void) const {`
`4220`	`4220`	`return TheStructure.Common.DestinationX2Coordinate_Right;`
`4221`	`4221`	`}`
`4222`		`- inline void setDestinationY2CoordinateBottom(const uint32_t value) {`
	`4222`	`+ inline void setTransferHeight(const uint32_t value) {`
`4223`	`4223`	`UNRECOVERABLE_IF(value > 0xffff0000);`
`4224`	`4224`	`TheStructure.Common.DestinationY2Coordinate_Bottom = value;`
`4225`	`4225`	`}`
`4226`		`- inline uint32_t getDestinationY2CoordinateBottom(void) const {`
	`4226`	`+ inline uint32_t getTransferHeight(void) const {`
`4227`	`4227`	`return TheStructure.Common.DestinationY2Coordinate_Bottom;`
`4228`	`4228`	`}`
`4229`	`4229`	`inline void setDestinationBaseAddress(const uint64_t value) {`