intel/compute-runtime
1
0
Fork 0
mirror of https://github.com/intel/compute-runtime.git synced 2026-01-08 14:02:58 +08:00
Code Issues Packages Projects Releases Wiki Activity

Use device index from os context when allocating heaps and command buffers

Browse Source 
Related-To: NEO-3691

Change-Id: I64015d606bba289d250920899ad620171e8303b7
Signed-off-by: Mateusz Jablonski <mateusz.jablonski@intel.com>
This commit is contained in:
Mateusz Jablonski
2019-09-23 11:10:48 +02:00
committed by sys_ocldev
parent 1448f6a312
commit 7cb6d665a5
4 changed files with 31 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
runtime/command_stream/command_stream_receiver.cpp
View File

@@ -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(), deviceIndex};
isMultiOsContextCapable(), getDeviceIndexForAllocation()};
allocation = this->getMemoryManager()->allocateGraphicsMemoryWithProperties(commandStreamAllocationProperties);
}
DEBUG_BREAK_IF(allocation == nullptr);
@@ -297,6 +297,10 @@ IndirectHeap &CommandStreamReceiver::getIndirectHeap(IndirectHeap::Type heapType
return *heap;
}
uint32_t CommandStreamReceiver::getDeviceIndexForAllocation() const {
return osContext->getDeviceBitfield().any() ? static_cast<uint32_t>(Math::log2(static_cast<uint32_t>(osContext->getDeviceBitfield().to_ulong()))) : 0u;
}
void CommandStreamReceiver::allocateHeapMemory(IndirectHeap::Type heapType,
size_t minRequiredSize, IndirectHeap *&indirectHeap) {
size_t reservedSize = 0;
@@ -321,7 +325,7 @@ void CommandStreamReceiver::allocateHeapMemory(IndirectHeap::Type heapType,
if (!heapMemory) {
heapMemory = getMemoryManager()->allocateGraphicsMemoryWithProperties({true, finalHeapSize, allocationType,
isMultiOsContextCapable(), deviceIndex});
isMultiOsContextCapable(), getDeviceIndexForAllocation()});
} else {
finalHeapSize = std::max(heapMemory->getUnderlyingBufferSize(), finalHeapSize);
}

1
runtime/command_stream/command_stream_receiver.h
View File

@@ -191,6 +191,7 @@ class CommandStreamReceiver {
protected:
void cleanupResources();
uint32_t getDeviceIndexForAllocation() const;
std::unique_ptr<FlushStampTracker> flushStamp;
std::unique_ptr<SubmissionAggregator> submissionAggregator;

22
unit_tests/command_stream/command_stream_receiver_tests.cpp
View File

@@ -624,3 +624,25 @@ INSTANTIATE_TEST_CASE_P(
CommandStreamReceiverWithAubSubCaptureTest_program,
CommandStreamReceiverWithAubSubCaptureTest,
testing::ValuesIn(aubSubCaptureStatus));
TEST(CommandStreamReceiverDeviceIndexTest, givenCommandStreamReceiverWithDeviceIndexDifferentThanDeviceBitfieldInOsContextWhenGetDeviceIndexForAllocationThenUseHighestBitFromOsContext) {
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);
csr.setupContext(*osContext);
EXPECT_EQ(0u, csr.getDeviceIndexForAllocation());
}
TEST(CommandStreamReceiverDeviceIndexTest, givenCommandStreamReceiverWithOsContextWithoutDeviceBitfieldsWhenGetDeviceIndexForAllocationThenZeroIsReturned) {
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());
}

2
unit_tests/mocks/mock_csr.h
View File

@@ -245,6 +245,8 @@ class MockFlatBatchBufferHelper : public FlatBatchBufferHelperHw<GfxFamily> {
class MockCommandStreamReceiver : public CommandStreamReceiver {
public:
using CommandStreamReceiver::CommandStreamReceiver;
using CommandStreamReceiver::deviceIndex;
using CommandStreamReceiver::getDeviceIndexForAllocation;
using CommandStreamReceiver::internalAllocationStorage;
using CommandStreamReceiver::latestFlushedTaskCount;
using CommandStreamReceiver::latestSentTaskCount;