Improve memoryPrefetch method

BartoszDunajski · Compute-Runtime-Automation · commit f9197d4e0d3f · 2021-03-24T15:12:05.000+01:00
Signed-off-by: Bartosz Dunajski &lt;bartosz.dunajski@intel.com&gt;
diff --git a/level_zero/core/source/cmdlist/cmdlist_hw.inl b/level_zero/core/source/cmdlist/cmdlist_hw.inl
@@ -1165,7 +1165,7 @@ ze_result_t CommandListCoreFamily<gfxCoreFamily>::appendMemoryPrefetch(const voi
     if (allocData) {
         return ZE_RESULT_SUCCESS;
     }
-    return ZE_RESULT_ERROR_UNKNOWN;
+    return ZE_RESULT_ERROR_INVALID_ARGUMENT;
 }
 
 template <GFXCORE_FAMILY gfxCoreFamily>
diff --git a/level_zero/core/test/unit_tests/sources/cmdlist/test_cmdlist_1.cpp b/level_zero/core/test/unit_tests/sources/cmdlist/test_cmdlist_1.cpp
@@ -123,7 +123,7 @@ TEST_F(CommandListCreate, givenNonExistingPtrThenAppendMemoryPrefetchReturnsErro
     ASSERT_NE(nullptr, commandList);
 
     auto res = commandList->appendMemoryPrefetch(nullptr, 0);
-    EXPECT_EQ(ZE_RESULT_ERROR_UNKNOWN, res);
+    EXPECT_EQ(ZE_RESULT_ERROR_INVALID_ARGUMENT, res);
 }
 
 TEST_F(CommandListCreate, givenValidPtrThenAppendMemAdviseReturnsSuccess) {
diff --git a/shared/source/command_container/command_encoder.h b/shared/source/command_container/command_encoder.h
@@ -347,8 +347,8 @@ struct EncodeMiFlushDW {
 
 template <typename GfxFamily>
 struct EncodeMemoryPrefetch {
-    static void programMemoryPrefetch(LinearStream &commandStream, const GraphicsAllocation &graphicsAllocation, uint32_t size, const HardwareInfo &hwInfo);
-    static size_t getSizeForMemoryPrefetch();
+    static void programMemoryPrefetch(LinearStream &commandStream, const GraphicsAllocation &graphicsAllocation, uint32_t size, size_t offset, const HardwareInfo &hwInfo);
+    static size_t getSizeForMemoryPrefetch(uint32_t size);
 };
 
 template <typename GfxFamily>
diff --git a/shared/source/command_container/command_encoder.inl b/shared/source/command_container/command_encoder.inl
@@ -641,10 +641,10 @@ size_t EncodeMiFlushDW<GfxFamily>::getMiFlushDwCmdSizeForDataWrite() {
 }
 
 template <typename GfxFamily>
-void EncodeMemoryPrefetch<GfxFamily>::programMemoryPrefetch(LinearStream &commandStream, const GraphicsAllocation &graphicsAllocation, uint32_t size, const HardwareInfo &hwInfo) {}
+void EncodeMemoryPrefetch<GfxFamily>::programMemoryPrefetch(LinearStream &commandStream, const GraphicsAllocation &graphicsAllocation, uint32_t size, size_t offset, const HardwareInfo &hwInfo) {}
 
 template <typename GfxFamily>
-size_t EncodeMemoryPrefetch<GfxFamily>::getSizeForMemoryPrefetch() { return 0; }
+size_t EncodeMemoryPrefetch<GfxFamily>::getSizeForMemoryPrefetch(uint32_t size) { return 0; }
 
 template <typename Family>
 void EncodeMiArbCheck<Family>::program(LinearStream &commandStream) {
diff --git a/shared/test/unit_test/command_container/command_encoder_tests.cpp b/shared/test/unit_test/command_container/command_encoder_tests.cpp
@@ -49,10 +49,10 @@ HWTEST_F(CommandEncoderTests, whenEncodeMemoryPrefetchCalledThenDoNothing) {
 
     GraphicsAllocation allocation(0, GraphicsAllocation::AllocationType::UNKNOWN, nullptr, 123, 456, 789, MemoryPool::LocalMemory);
 
-    EncodeMemoryPrefetch<FamilyType>::programMemoryPrefetch(linearStream, allocation, 2, *defaultHwInfo);
+    EncodeMemoryPrefetch<FamilyType>::programMemoryPrefetch(linearStream, allocation, 2, 0, *defaultHwInfo);
 
     EXPECT_EQ(0u, linearStream.getUsed());
-    EXPECT_EQ(0u, EncodeMemoryPrefetch<FamilyType>::getSizeForMemoryPrefetch());
+    EXPECT_EQ(0u, EncodeMemoryPrefetch<FamilyType>::getSizeForMemoryPrefetch(2));
 }
 
 HWCMDTEST_F(IGFX_GEN8_CORE, CommandEncoderTests, WhenAnyParameterIsProvidedThenRuntimeGenerationLocalIdsIsRequired) {

Original file line number	Diff line number	Diff line change
`@@ -1165,7 +1165,7 @@ ze_result_t CommandListCoreFamily<gfxCoreFamily>::appendMemoryPrefetch(const voi`
`1165`	`1165`	`if (allocData) {`
`1166`	`1166`	`return ZE_RESULT_SUCCESS;`
`1167`	`1167`	`}`
`1168`		`- return ZE_RESULT_ERROR_UNKNOWN;`
	`1168`	`+ return ZE_RESULT_ERROR_INVALID_ARGUMENT;`
`1169`	`1169`	`}`
`1170`	`1170`
`1171`	`1171`	`template <GFXCORE_FAMILY gfxCoreFamily>`
Original file line number	Diff line number	Diff line change
`@@ -123,7 +123,7 @@ TEST_F(CommandListCreate, givenNonExistingPtrThenAppendMemoryPrefetchReturnsErro`
`123`	`123`	`ASSERT_NE(nullptr, commandList);`
`124`	`124`
`125`	`125`	`auto res = commandList->appendMemoryPrefetch(nullptr, 0);`
`126`		`- EXPECT_EQ(ZE_RESULT_ERROR_UNKNOWN, res);`
	`126`	`+ EXPECT_EQ(ZE_RESULT_ERROR_INVALID_ARGUMENT, res);`
`127`	`127`	`}`
`128`	`128`
`129`	`129`	`TEST_F(CommandListCreate, givenValidPtrThenAppendMemAdviseReturnsSuccess) {`
Original file line number	Diff line number	Diff line change
`@@ -49,10 +49,10 @@ HWTEST_F(CommandEncoderTests, whenEncodeMemoryPrefetchCalledThenDoNothing) {`
`49`	`49`
`50`	`50`	`GraphicsAllocation allocation(0, GraphicsAllocation::AllocationType::UNKNOWN, nullptr, 123, 456, 789, MemoryPool::LocalMemory);`
`51`	`51`
`52`		`- EncodeMemoryPrefetch<FamilyType>::programMemoryPrefetch(linearStream, allocation, 2, *defaultHwInfo);`
	`52`	`+ EncodeMemoryPrefetch<FamilyType>::programMemoryPrefetch(linearStream, allocation, 2, 0, *defaultHwInfo);`
`53`	`53`
`54`	`54`	`EXPECT_EQ(0u, linearStream.getUsed());`
`55`		`- EXPECT_EQ(0u, EncodeMemoryPrefetch<FamilyType>::getSizeForMemoryPrefetch());`
	`55`	`+ EXPECT_EQ(0u, EncodeMemoryPrefetch<FamilyType>::getSizeForMemoryPrefetch(2));`
`56`	`56`	`}`
`57`	`57`
`58`	`58`	`HWCMDTEST_F(IGFX_GEN8_CORE, CommandEncoderTests, WhenAnyParameterIsProvidedThenRuntimeGenerationLocalIdsIsRequired) {`