Refactor blit buffer call

Resolves: NEO-3241

Change-Id: I726135ae55d1e0fcbacd80620e827ee5c7c0c8dc
Signed-off-by: Filip Hazubski <filip.hazubski@intel.com>

Author: fhazubski-Intel

common/helpers/bit_helpers.h

@@ -17,6 +17,10 @@ constexpr bool isBitSet(uint64_t field, uint64_t bitPosition) {
     return (field & (1ull << bitPosition));
 }
 
+constexpr bool isAnyBitSet(uint64_t field, uint64_t checkedBits) {
+    return ((field & checkedBits) != 0);
+}
+
 constexpr bool isValueSet(uint64_t field, uint64_t value) {
     assert(value != 0);
     return ((field & value) == value);
@@ -26,4 +30,11 @@ constexpr bool isFieldValid(uint64_t field, uint64_t acceptedBits) {
     return ((field & (~acceptedBits)) == 0);
 }
 
+constexpr uint64_t setBits(uint64_t field, bool newValue, uint64_t bitsToModify) {
+    if (newValue) {
+        return (field | bitsToModify);
+    }
+    return (field & (~bitsToModify));
+}
+
 } // namespace NEO

runtime/command_queue/cpu_data_transfer_handler.cpp

@@ -124,8 +124,8 @@ void *CommandQueue::cpuDataTransferHandler(TransferProperties &transferPropertie
             }
             if (!unmapInfo.readOnly) {
                 auto graphicsAllocation = transferProperties.memObj->getGraphicsAllocation();
-                graphicsAllocation->setAubWritable(true);
-                graphicsAllocation->setTbxWritable(true);
+                graphicsAllocation->setAubWritable(true, GraphicsAllocation::defaultBank);
+                graphicsAllocation->setTbxWritable(true, GraphicsAllocation::defaultBank);
             }
             break;
         case CL_COMMAND_READ_BUFFER:

runtime/command_stream/aub_command_stream_receiver_hw_base.inl

@@ -624,7 +624,7 @@ void AUBCommandStreamReceiverHw<GfxFamily>::writeMemory(uint64_t gpuAddress, voi
 
 template <typename GfxFamily>
 bool AUBCommandStreamReceiverHw<GfxFamily>::writeMemory(GraphicsAllocation &gfxAllocation) {
-    if (!gfxAllocation.isAubWritable()) {
+    if (!this->isAubWritable(gfxAllocation)) {
         return false;
     }
 
@@ -651,7 +651,7 @@ bool AUBCommandStreamReceiverHw<GfxFamily>::writeMemory(GraphicsAllocation &gfxA
     }
 
     if (AubHelper::isOneTimeAubWritableAllocationType(gfxAllocation.getAllocationType())) {
-        gfxAllocation.setAubWritable(false);
+        this->setAubWritable(false, gfxAllocation);
     }
 
     return true;
@@ -714,10 +714,11 @@ void AUBCommandStreamReceiverHw<GfxFamily>::processResidency(ResidencyContainer
 
     for (auto &gfxAllocation : allocationsForResidency) {
         if (dumpAubNonWritable) {
-            gfxAllocation->setAubWritable(true);
+            this->setAubWritable(true, *gfxAllocation);
         }
         if (!writeMemory(*gfxAllocation)) {
-            DEBUG_BREAK_IF(!((gfxAllocation->getUnderlyingBufferSize() == 0) || !gfxAllocation->isAubWritable()));
+            DEBUG_BREAK_IF(!((gfxAllocation->getUnderlyingBufferSize() == 0) ||
+                             !this->isAubWritable(*gfxAllocation)));
         }
         gfxAllocation->updateResidencyTaskCount(this->taskCount + 1, this->osContext->getContextId());
     }

runtime/command_stream/command_stream_receiver_simulated_common_hw.h

@@ -54,6 +54,11 @@ class CommandStreamReceiverSimulatedCommonHw : public CommandStreamReceiverHw<Gf
     virtual void writeMemory(uint64_t gpuAddress, void *cpuAddress, size_t size, uint32_t memoryBank, uint64_t entryBits) = 0;
     virtual void writeMemoryWithAubManager(GraphicsAllocation &graphicsAllocation) = 0;
 
+    virtual void setAubWritable(bool writable, GraphicsAllocation &graphicsAllocation) = 0;
+    virtual bool isAubWritable(GraphicsAllocation &graphicsAllocation) const = 0;
+    virtual void setTbxWritable(bool writable, GraphicsAllocation &graphicsAllocation) = 0;
+    virtual bool isTbxWritable(GraphicsAllocation &graphicsAllocation) const = 0;
+
     size_t getPreferredTagPoolSize() const override { return 1; }
 
     aub_stream::AubManager *aubManager = nullptr;

runtime/command_stream/command_stream_receiver_with_aub_dump.inl

@@ -12,7 +12,7 @@
 
 namespace NEO {
 
-extern CommandStreamReceiverCreateFunc commandStreamReceiverFactory[2 * IGFX_MAX_CORE];
+extern CommandStreamReceiverCreateFunc commandStreamReceiverFactory[IGFX_MAX_CORE];
 
 template <typename BaseCSR>
 CommandStreamReceiverWithAUBDump<BaseCSR>::CommandStreamReceiverWithAUBDump(const std::string &baseName, ExecutionEnvironment &executionEnvironment)

runtime/command_stream/create_command_stream_impl.cpp

@@ -15,7 +15,7 @@
 
 namespace NEO {
 
-extern CommandStreamReceiverCreateFunc commandStreamReceiverFactory[2 * IGFX_MAX_CORE];
+extern CommandStreamReceiverCreateFunc commandStreamReceiverFactory[IGFX_MAX_CORE];
 
 CommandStreamReceiver *createCommandStreamImpl(ExecutionEnvironment &executionEnvironment) {
     auto funcCreate = commandStreamReceiverFactory[executionEnvironment.getHardwareInfo()->platform.eRenderCoreFamily];

runtime/command_stream/definitions/command_stream_receiver_simulated_hw.h

@@ -29,5 +29,18 @@ class CommandStreamReceiverSimulatedHw : public CommandStreamReceiverSimulatedCo
         return new PhysicalAddressAllocator();
     }
     void writeMemoryWithAubManager(GraphicsAllocation &graphicsAllocation) override{};
+
+    void setAubWritable(bool writable, GraphicsAllocation &graphicsAllocation) override {
+        graphicsAllocation.setAubWritable(writable, getMemoryBank(&graphicsAllocation));
+    }
+    bool isAubWritable(GraphicsAllocation &graphicsAllocation) const override {
+        return graphicsAllocation.isAubWritable(getMemoryBank(&graphicsAllocation));
+    }
+    void setTbxWritable(bool writable, GraphicsAllocation &graphicsAllocation) override {
+        graphicsAllocation.setTbxWritable(writable, getMemoryBank(&graphicsAllocation));
+    }
+    bool isTbxWritable(GraphicsAllocation &graphicsAllocation) const override {
+        return graphicsAllocation.isTbxWritable(getMemoryBank(&graphicsAllocation));
+    }
 };
 } // namespace NEO

runtime/command_stream/tbx_command_stream_receiver_hw.inl

@@ -363,7 +363,7 @@ void TbxCommandStreamReceiverHw<GfxFamily>::writeMemory(uint64_t gpuAddress, voi
 
 template <typename GfxFamily>
 bool TbxCommandStreamReceiverHw<GfxFamily>::writeMemory(GraphicsAllocation &gfxAllocation) {
-    if (!gfxAllocation.isTbxWritable()) {
+    if (!this->isTbxWritable(gfxAllocation)) {
         return false;
     }
 
@@ -381,7 +381,7 @@ bool TbxCommandStreamReceiverHw<GfxFamily>::writeMemory(GraphicsAllocation &gfxA
     }
 
     if (AubHelper::isOneTimeAubWritableAllocationType(gfxAllocation.getAllocationType())) {
-        gfxAllocation.setTbxWritable(false);
+        this->setTbxWritable(false, gfxAllocation);
     }
 
     return true;
@@ -413,7 +413,8 @@ template <typename GfxFamily>
 void TbxCommandStreamReceiverHw<GfxFamily>::processResidency(ResidencyContainer &allocationsForResidency) {
     for (auto &gfxAllocation : allocationsForResidency) {
         if (!writeMemory(*gfxAllocation)) {
-            DEBUG_BREAK_IF(!((gfxAllocation->getUnderlyingBufferSize() == 0) || !gfxAllocation->isTbxWritable()));
+            DEBUG_BREAK_IF(!((gfxAllocation->getUnderlyingBufferSize() == 0) ||
+                             !this->isTbxWritable(*gfxAllocation)));
         }
         gfxAllocation->updateResidencyTaskCount(this->taskCount + 1, this->osContext->getContextId());
     }

runtime/context/context.h

@@ -25,6 +25,12 @@ class MemoryManager;
 class SharingFunctions;
 class SVMAllocsManager;
 
+enum class BlitOperationResult {
+    Unsupported,
+    Fail,
+    Success
+};
+
 template <>
 struct OpenCLObjectMapper<_cl_context> {
     typedef class Context DerivedType;
@@ -127,6 +133,7 @@ class Context : public BaseObject<_cl_context> {
     ContextType peekContextType() { return this->contextType; }
 
     MOCKABLE_VIRTUAL CommandStreamReceiver *getCommandStreamReceiverForBlitOperation(MemObj &memObj) const;
+    MOCKABLE_VIRTUAL BlitOperationResult blitMemoryToAllocation(MemObj &memObj, GraphicsAllocation *memory, void *hostPtr, size_t size) const;
 
   protected:
     Context(void(CL_CALLBACK *pfnNotify)(const char *, const void *, size_t, void *) = nullptr,

runtime/context/context_extra.cpp

@@ -18,4 +18,8 @@ cl_int Context::processExtraProperties(cl_context_properties propertyType, cl_co
 CommandStreamReceiver *Context::getCommandStreamReceiverForBlitOperation(MemObj &memObj) const {
     return nullptr;
 }
+
+BlitOperationResult Context::blitMemoryToAllocation(MemObj &memObj, GraphicsAllocation *memory, void *hostPtr, size_t size) const {
+    return BlitOperationResult::Unsupported;
+}
 } // namespace NEO