Remove device index from command stream receiver

JablonskiMateusz · Compute-Runtime-Automation · commit 8410bd6e18a7 · 2019-10-04T13:27:33.000+02:00
Change-Id: Ia84b0cb8e03260ec940ee0b175b12693e528b8aa
Signed-off-by: Mateusz Jablonski &lt;mateusz.jablonski@intel.com&gt;
diff --git a/runtime/command_stream/command_stream_receiver.cpp b/runtime/command_stream/command_stream_receiver.cpp
@@ -126,7 +126,7 @@ void CommandStreamReceiver::ensureCommandBufferAllocation(LinearStream &commandS
     auto allocation = this->getInternalAllocationStorage()->obtainReusableAllocation(allocationSize, allocationType).release();
     if (allocation == nullptr) {
         const AllocationProperties commandStreamAllocationProperties{true, allocationSize, allocationType,
-                                                                     isMultiOsContextCapable(), getDeviceIndexForAllocation()};
+                                                                     isMultiOsContextCapable(), getDeviceIndex()};
         allocation = this->getMemoryManager()->allocateGraphicsMemoryWithProperties(commandStreamAllocationProperties);
     }
     DEBUG_BREAK_IF(allocation == nullptr);
@@ -297,7 +297,7 @@ IndirectHeap &CommandStreamReceiver::getIndirectHeap(IndirectHeap::Type heapType
     return *heap;
 }
 
-uint32_t CommandStreamReceiver::getDeviceIndexForAllocation() const {
+uint32_t CommandStreamReceiver::getDeviceIndex() const {
     return osContext->getDeviceBitfield().any() ? static_cast<uint32_t>(Math::log2(static_cast<uint32_t>(osContext->getDeviceBitfield().to_ulong()))) : 0u;
 }
 
@@ -325,7 +325,7 @@ void CommandStreamReceiver::allocateHeapMemory(IndirectHeap::Type heapType,
 
     if (!heapMemory) {
         heapMemory = getMemoryManager()->allocateGraphicsMemoryWithProperties({true, finalHeapSize, allocationType,
-                                                                               isMultiOsContextCapable(), getDeviceIndexForAllocation()});
+                                                                               isMultiOsContextCapable(), getDeviceIndex()});
     } else {
         finalHeapSize = std::max(heapMemory->getUnderlyingBufferSize(), finalHeapSize);
     }
diff --git a/runtime/command_stream/command_stream_receiver.h b/runtime/command_stream/command_stream_receiver.h
@@ -155,7 +155,6 @@ class CommandStreamReceiver {
 
     size_t defaultSshSize;
 
-    void setDeviceIndex(uint32_t deviceIndex) { this->deviceIndex = deviceIndex; }
     AllocationsList &getTemporaryAllocations();
     AllocationsList &getAllocationsForReuse();
     InternalAllocationStorage *getInternalAllocationStorage() const { return internalAllocationStorage.get(); }
@@ -191,7 +190,7 @@ class CommandStreamReceiver {
 
   protected:
     void cleanupResources();
-    uint32_t getDeviceIndexForAllocation() const;
+    MOCKABLE_VIRTUAL uint32_t getDeviceIndex() const;
 
     std::unique_ptr<FlushStampTracker> flushStamp;
     std::unique_ptr<SubmissionAggregator> submissionAggregator;
@@ -232,7 +231,6 @@ class CommandStreamReceiver {
     PreemptionMode lastPreemptionMode = PreemptionMode::Initial;
     uint64_t totalMemoryUsed = 0u;
 
-    uint32_t deviceIndex = 0u;
     // taskCount - # of tasks submitted
     uint32_t taskCount = 0;
     uint32_t lastSentL3Config = 0;
diff --git a/runtime/command_stream/command_stream_receiver_simulated_common_hw.h b/runtime/command_stream/command_stream_receiver_simulated_common_hw.h
@@ -25,8 +25,8 @@ template <typename GfxFamily>
 class CommandStreamReceiverSimulatedCommonHw : public CommandStreamReceiverHw<GfxFamily> {
   protected:
     using CommandStreamReceiverHw<GfxFamily>::CommandStreamReceiverHw;
-    using CommandStreamReceiverHw<GfxFamily>::deviceIndex;
     using CommandStreamReceiverHw<GfxFamily>::osContext;
+    using CommandStreamReceiverHw<GfxFamily>::getDeviceIndex;
     using AUB = typename AUBFamilyMapper<GfxFamily>::AUB;
     using MiContextDescriptorReg = typename AUB::MiContextDescriptorReg;
 
diff --git a/runtime/command_stream/command_stream_receiver_simulated_common_hw_bdw_plus.inl b/runtime/command_stream/command_stream_receiver_simulated_common_hw_bdw_plus.inl
@@ -29,7 +29,7 @@ void CommandStreamReceiverSimulatedCommonHw<GfxFamily>::getGTTData(void *memory,
 
 template <typename GfxFamily>
 uint32_t CommandStreamReceiverSimulatedCommonHw<GfxFamily>::getMemoryBankForGtt() const {
-    return MemoryBanks::getBank(this->deviceIndex);
+    return MemoryBanks::getBank(getDeviceIndex());
 }
 
 template <typename GfxFamily>
diff --git a/runtime/command_stream/definitions/command_stream_receiver_simulated_hw.h b/runtime/command_stream/definitions/command_stream_receiver_simulated_hw.h
@@ -17,10 +17,11 @@ class CommandStreamReceiverSimulatedHw : public CommandStreamReceiverSimulatedCo
   protected:
     using CommandStreamReceiverSimulatedCommonHw<GfxFamily>::CommandStreamReceiverSimulatedCommonHw;
     using CommandStreamReceiverSimulatedCommonHw<GfxFamily>::osContext;
+    using CommandStreamReceiverSimulatedCommonHw<GfxFamily>::getDeviceIndex;
 
   public:
     uint32_t getMemoryBank(GraphicsAllocation *allocation) const {
-        return MemoryBanks::getBank(this->deviceIndex);
+        return MemoryBanks::getBank(getDeviceIndex());
     }
     int getAddressSpace(int hint) {
         return AubMemDump::AddressSpaceValues::TraceNonlocal;
diff --git a/runtime/execution_environment/execution_environment.cpp b/runtime/execution_environment/execution_environment.cpp
@@ -60,7 +60,6 @@ bool ExecutionEnvironment::initializeCommandStreamReceiver(uint32_t deviceIndex,
     if (HwHelper::get(hwInfo->platform.eRenderCoreFamily).isPageTableManagerSupported(*hwInfo)) {
         commandStreamReceiver->createPageTableManager();
     }
-    commandStreamReceiver->setDeviceIndex(deviceIndex);
     this->commandStreamReceivers[deviceIndex][deviceCsrIndex] = std::move(commandStreamReceiver);
     return true;
 }
diff --git a/runtime/os_interface/linux/drm_command_stream.h b/runtime/os_interface/linux/drm_command_stream.h
@@ -59,5 +59,6 @@ class DrmCommandStreamReceiver : public DeviceCommandStreamReceiver<GfxFamily> {
     std::vector<drm_i915_gem_exec_object2> execObjectsStorage;
     Drm *drm;
     gemCloseWorkerMode gemCloseWorkerOperationMode;
+    uint32_t handleIndex = 0u;
 };
 } // namespace NEO
diff --git a/unit_tests/command_stream/aub_command_stream_receiver_1_tests.cpp b/unit_tests/command_stream/aub_command_stream_receiver_1_tests.cpp
@@ -180,7 +180,6 @@ HWTEST_F(AubCommandStreamReceiverTests, givenAubCsrWhenOsContextIsSetThenCreateH
     pDevice->executionEnvironment->aubCenter = std::unique_ptr<MockAubCenter>(mockAubCenter);
 
     std::unique_ptr<AUBCommandStreamReceiverHw<FamilyType>> aubCsr(static_cast<AUBCommandStreamReceiverHw<FamilyType> *>(AUBCommandStreamReceiver::create(fileName, true, *pDevice->executionEnvironment)));
-    aubCsr->setDeviceIndex(deviceIndex);
     EXPECT_EQ(nullptr, aubCsr->hardwareContextController.get());
 
     aubCsr->setupContext(osContext);
@@ -844,7 +843,7 @@ HWTEST_F(AubCommandStreamReceiverTests, givenAubCommandStreamReceiverWhenGraphic
     std::unique_ptr<MemoryManager> memoryManager(nullptr);
     std::unique_ptr<AUBCommandStreamReceiverHw<FamilyType>> aubCsr(new AUBCommandStreamReceiverHw<FamilyType>("", true, *pDevice->executionEnvironment));
     memoryManager.reset(new OsAgnosticMemoryManager(*pDevice->executionEnvironment));
-
+    aubCsr->setupContext(*pDevice->getDefaultEngine().osContext);
     auto gfxAllocation = memoryManager->allocateGraphicsMemoryWithProperties(MockAllocationProperties{MemoryConstants::pageSize});
 
     aubCsr->setAubWritable(false, *gfxAllocation);
@@ -856,7 +855,7 @@ HWTEST_F(AubCommandStreamReceiverTests, givenAubCommandStreamReceiverWhenGraphic
 HWTEST_F(AubCommandStreamReceiverTests, givenAubCommandStreamReceiverWhenGraphicsAllocationSizeIsZeroThenWriteMemoryIsNotAllowed) {
     std::unique_ptr<AUBCommandStreamReceiverHw<FamilyType>> aubCsr(new AUBCommandStreamReceiverHw<FamilyType>("", true, *pDevice->executionEnvironment));
     MockGraphicsAllocation gfxAllocation((void *)0x1234, 0);
-
+    aubCsr->setupContext(*pDevice->getDefaultEngine().osContext);
     EXPECT_FALSE(aubCsr->writeMemory(gfxAllocation));
 }
 
@@ -874,7 +873,7 @@ HWTEST_F(AubCommandStreamReceiverTests, givenAubCommandStreamReceiverWhenAllocat
 HWTEST_F(AubCommandStreamReceiverTests, givenAubCommandStreamReceiverWhenAllocationSizeInAllocationViewIsZeroThenWriteMemoryIsNotAllowed) {
     auto aubCsr = std::make_unique<AUBCommandStreamReceiverHw<FamilyType>>("", true, *pDevice->executionEnvironment);
     AllocationView allocationView(0x1234, 0);
-
+    aubCsr->setupContext(*pDevice->getDefaultEngine().osContext);
     EXPECT_FALSE(aubCsr->writeMemory(allocationView));
 }
 
diff --git a/unit_tests/command_stream/aub_command_stream_receiver_2_tests.cpp b/unit_tests/command_stream/aub_command_stream_receiver_2_tests.cpp
@@ -491,6 +491,8 @@ HWTEST_F(AubCommandStreamReceiverNoHostPtrTests, givenAubCommandStreamReceiverWh
     executionEnvironment->memoryManager.reset(memoryManager);
 
     std::unique_ptr<AUBCommandStreamReceiverHw<FamilyType>> aubCsr(new AUBCommandStreamReceiverHw<FamilyType>("", true, *executionEnvironment));
+    auto osContext = memoryManager->createAndRegisterOsContext(aubCsr.get(), getChosenEngineType(**platformDevices), 0, PreemptionMode::Disabled, false);
+    aubCsr->setupContext(*osContext);
     auto gfxAllocation = memoryManager->allocateGraphicsMemoryWithProperties(MockAllocationProperties{MemoryConstants::pageSize});
 
     memoryManager->lockResource(gfxAllocation);
@@ -542,6 +544,7 @@ HWTEST_F(AubCommandStreamReceiverTests, whenGetMemoryBankForGttIsCalledThenCorre
     std::unique_ptr<MockAubCsr<FamilyType>> aubCsr(new MockAubCsr<FamilyType>("", true, *pDevice->executionEnvironment));
     aubCsr->localMemoryEnabled = false;
 
+    aubCsr->setupContext(*pDevice->getDefaultEngine().osContext);
     auto bank = aubCsr->getMemoryBankForGtt();
     EXPECT_EQ(MemoryBanks::MainBank, bank);
 }
@@ -648,6 +651,7 @@ HWTEST_F(AubCommandStreamReceiverTests, givenAubCommandStreamReceiverWhenWriteMe
     pDevice->executionEnvironment->aubCenter.reset(new AubCenter());
 
     auto aubCsr = std::make_unique<AUBCommandStreamReceiverHw<FamilyType>>("", false, *pDevice->executionEnvironment);
+    aubCsr->setupContext(*pDevice->getDefaultEngine().osContext);
     std::unique_ptr<MemoryManager> memoryManager(new OsAgnosticMemoryManager(*pDevice->executionEnvironment));
 
     PhysicalAddressAllocator allocator;
diff --git a/unit_tests/command_stream/command_stream_receiver_tests.cpp b/unit_tests/command_stream/command_stream_receiver_tests.cpp
@@ -625,24 +625,22 @@ INSTANTIATE_TEST_CASE_P(
     CommandStreamReceiverWithAubSubCaptureTest,
     testing::ValuesIn(aubSubCaptureStatus));
 
-TEST(CommandStreamReceiverDeviceIndexTest, givenCommandStreamReceiverWithDeviceIndexDifferentThanDeviceBitfieldInOsContextWhenGetDeviceIndexForAllocationThenUseHighestBitFromOsContext) {
+TEST(CommandStreamReceiverDeviceIndexTest, givenCsrWithOsContextWhenGetDeviceIndexThenGetHighestEnabledBitInDeviceBitfield) {
     ExecutionEnvironment executioneEnvironment;
     executioneEnvironment.initializeMemoryManager();
     MockCommandStreamReceiver csr(executioneEnvironment);
-    csr.deviceIndex = 1;
-    auto osContext = executioneEnvironment.memoryManager->createAndRegisterOsContext(&csr, aub_stream::EngineType::ENGINE_RCS, 0b01, PreemptionMode::Disabled, false);
+    auto osContext = executioneEnvironment.memoryManager->createAndRegisterOsContext(&csr, aub_stream::EngineType::ENGINE_RCS, 0b10, PreemptionMode::Disabled, false);
 
     csr.setupContext(*osContext);
-    EXPECT_EQ(0u, csr.getDeviceIndexForAllocation());
+    EXPECT_EQ(1u, csr.getDeviceIndex());
 }
 
-TEST(CommandStreamReceiverDeviceIndexTest, givenCommandStreamReceiverWithOsContextWithoutDeviceBitfieldsWhenGetDeviceIndexForAllocationThenZeroIsReturned) {
+TEST(CommandStreamReceiverDeviceIndexTest, givenOsContextWithNoDeviceBitfieldWhenGettingDeviceIndexThenZeroIsReturned) {
     ExecutionEnvironment executioneEnvironment;
     executioneEnvironment.initializeMemoryManager();
     MockCommandStreamReceiver csr(executioneEnvironment);
-    csr.deviceIndex = 1;
     auto osContext = executioneEnvironment.memoryManager->createAndRegisterOsContext(&csr, aub_stream::EngineType::ENGINE_RCS, 0b00, PreemptionMode::Disabled, false);
 
     csr.setupContext(*osContext);
-    EXPECT_EQ(0u, csr.getDeviceIndexForAllocation());
+    EXPECT_EQ(0u, csr.getDeviceIndex());
 }
diff --git a/unit_tests/libult/ult_command_stream_receiver.h b/unit_tests/libult/ult_command_stream_receiver.h
@@ -25,7 +25,6 @@ class UltCommandStreamReceiver : public CommandStreamReceiverHw<GfxFamily>, publ
     using BaseClass = CommandStreamReceiverHw<GfxFamily>;
 
   public:
-    using BaseClass::deviceIndex;
     using BaseClass::dshState;
     using BaseClass::getScratchPatchAddress;
     using BaseClass::getScratchSpaceController;
diff --git a/unit_tests/mocks/mock_csr.h b/unit_tests/mocks/mock_csr.h
@@ -246,8 +246,7 @@ class MockFlatBatchBufferHelper : public FlatBatchBufferHelperHw<GfxFamily> {
 class MockCommandStreamReceiver : public CommandStreamReceiver {
   public:
     using CommandStreamReceiver::CommandStreamReceiver;
-    using CommandStreamReceiver::deviceIndex;
-    using CommandStreamReceiver::getDeviceIndexForAllocation;
+    using CommandStreamReceiver::getDeviceIndex;
     using CommandStreamReceiver::internalAllocationStorage;
     using CommandStreamReceiver::latestFlushedTaskCount;
     using CommandStreamReceiver::latestSentTaskCount;

Original file line number	Diff line number	Diff line change
`@@ -126,7 +126,7 @@ void CommandStreamReceiver::ensureCommandBufferAllocation(LinearStream &commandS`
`126`	`126`	`auto allocation = this->getInternalAllocationStorage()->obtainReusableAllocation(allocationSize, allocationType).release();`
`127`	`127`	`if (allocation == nullptr) {`
`128`	`128`	`const AllocationProperties commandStreamAllocationProperties{true, allocationSize, allocationType,`
`129`		`- isMultiOsContextCapable(), getDeviceIndexForAllocation()};`
	`129`	`+ isMultiOsContextCapable(), getDeviceIndex()};`
`130`	`130`	`allocation = this->getMemoryManager()->allocateGraphicsMemoryWithProperties(commandStreamAllocationProperties);`
`131`	`131`	`}`
`132`	`132`	`DEBUG_BREAK_IF(allocation == nullptr);`
`@@ -297,7 +297,7 @@ IndirectHeap &CommandStreamReceiver::getIndirectHeap(IndirectHeap::Type heapType`
`297`	`297`	`return *heap;`
`298`	`298`	`}`
`299`	`299`
`300`		`-uint32_t CommandStreamReceiver::getDeviceIndexForAllocation() const {`
	`300`	`+uint32_t CommandStreamReceiver::getDeviceIndex() const {`
`301`	`301`	`return osContext->getDeviceBitfield().any() ? static_cast<uint32_t>(Math::log2(static_cast<uint32_t>(osContext->getDeviceBitfield().to_ulong()))) : 0u;`
`302`	`302`	`}`
`303`	`303`
`@@ -325,7 +325,7 @@ void CommandStreamReceiver::allocateHeapMemory(IndirectHeap::Type heapType,`
`325`	`325`
`326`	`326`	`if (!heapMemory) {`
`327`	`327`	`heapMemory = getMemoryManager()->allocateGraphicsMemoryWithProperties({true, finalHeapSize, allocationType,`
`328`		`- isMultiOsContextCapable(), getDeviceIndexForAllocation()});`
	`328`	`+ isMultiOsContextCapable(), getDeviceIndex()});`
`329`	`329`	`} else {`
`330`	`330`	`finalHeapSize = std::max(heapMemory->getUnderlyingBufferSize(), finalHeapSize);`
`331`	`331`	`}`
Original file line number	Diff line number	Diff line change
`@@ -29,7 +29,7 @@ void CommandStreamReceiverSimulatedCommonHw<GfxFamily>::getGTTData(void *memory,`
`29`	`29`
`30`	`30`	`template <typename GfxFamily>`
`31`	`31`	`uint32_t CommandStreamReceiverSimulatedCommonHw<GfxFamily>::getMemoryBankForGtt() const {`
`32`		`- return MemoryBanks::getBank(this->deviceIndex);`
	`32`	`+ return MemoryBanks::getBank(getDeviceIndex());`
`33`	`33`	`}`
`34`	`34`
`35`	`35`	`template <typename GfxFamily>`
Original file line number	Diff line number	Diff line change
`@@ -60,7 +60,6 @@ bool ExecutionEnvironment::initializeCommandStreamReceiver(uint32_t deviceIndex,`
`60`	`60`	`if (HwHelper::get(hwInfo->platform.eRenderCoreFamily).isPageTableManagerSupported(*hwInfo)) {`
`61`	`61`	`commandStreamReceiver->createPageTableManager();`
`62`	`62`	`}`
`63`		`- commandStreamReceiver->setDeviceIndex(deviceIndex);`
`64`	`63`	`this->commandStreamReceivers[deviceIndex][deviceCsrIndex] = std::move(commandStreamReceiver);`
`65`	`64`	`return true;`
`66`	`65`	`}`