IntenseWebs/openvino
3
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

[VPU] WA for statis shape allocation (#1107)

Browse Source
This commit is contained in:
Andrew Bakalin 2020-06-25 10:38:25 +03:00 committed by GitHub
parent 5746e27111
commit 0f1c8a0763
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
5 changed files with 28 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
inference-engine/src/vpu/graph_transformer/include/vpu/model/model.hpp
View File

@ -388,8 +388,17 @@ inline Stage ModelObj::addNewStage(
// runAllocator
//
VPU_DECLARE_ENUM(EnableShapeAllocation,
YES,
NO)
VPU_DECLARE_ENUM(CheckOnlyCMX,
YES,
NO)
AllocationResult runAllocator(
const Model& model,
bool onlyCheckCMX = false);
EnableShapeAllocation = EnableShapeAllocation::NO,
CheckOnlyCMX = CheckOnlyCMX::NO);
} // namespace vpu

2
inference-engine/src/vpu/graph_transformer/src/middleend/passes/adjust_data_location.cpp
View File

@ -458,7 +458,7 @@ void PassImpl::packDataInCmx(const Model& model) {
return DataLoopStatus::NextChild;
});
auto allocRes = runAllocator(model, true);
auto allocRes = runAllocator(model, EnableShapeAllocation::NO, CheckOnlyCMX::YES);
env.log->trace("Allocation result : %v", allocRes.status);
if (allocRes.status != AllocationStatus::OK) {

28
inference-engine/src/vpu/graph_transformer/src/middleend/passes/allocate_resources.cpp
View File

@ -25,7 +25,7 @@ namespace vpu {
// runAllocator
//
AllocationResult runAllocator(const Model& model, bool onlyCheckCMX) {
AllocationResult runAllocator(const Model& model, EnableShapeAllocation enableShapeAllocation, CheckOnlyCMX checkOnlyCmx) {
VPU_PROFILE(runAllocator);
auto& allocator = model->getAllocator();
@ -40,7 +40,7 @@ AllocationResult runAllocator(const Model& model, bool onlyCheckCMX) {
// Allocate Const/Input/Output datas.
//
if (!onlyCheckCMX) {
if (checkOnlyCmx == CheckOnlyCMX::NO) {
auto result = allocator.preprocess(model);
if (result.status != vpu::AllocationStatus::OK) {
return result;
@ -86,14 +86,14 @@ AllocationResult runAllocator(const Model& model, bool onlyCheckCMX) {
// Allocate stage outputs.
//
const auto allocateStageOutputs = [onlyCheckCMX, &allocator](const Stage& stage) -> AllocationResult {
const auto allocateStageOutputs = [checkOnlyCmx, &allocator](const Stage& stage) -> AllocationResult {
for (const auto& output : stage->outputs()) {
if (onlyCheckCMX && output->memReqs() != MemoryType::CMX) {
if (checkOnlyCmx == CheckOnlyCMX::YES && output->memReqs() != MemoryType::CMX) {
continue;
}
if (!allocator.allocateData(output)) {
if (output->memReqs() == MemoryType::CMX && !onlyCheckCMX) {
if (output->memReqs() == MemoryType::CMX && checkOnlyCmx == CheckOnlyCMX::NO) {
if (allocator.removeCMXCandidates(output)) {
if (allocator.allocateData(output)) {
continue;
@ -123,7 +123,7 @@ AllocationResult runAllocator(const Model& model, bool onlyCheckCMX) {
// Allocate stage temporary buffers.
//
if (!onlyCheckCMX) {
if (checkOnlyCmx == CheckOnlyCMX::NO) {
for (const auto& tempBufferEdge : stage->tempBufferEdges()) {
if (!allocator.allocateData(tempBufferEdge->tempBuffer())) {
allocator.setNeedToAllocNonIntermData();
@ -157,7 +157,7 @@ AllocationResult runAllocator(const Model& model, bool onlyCheckCMX) {
//
for (const auto& input : stage->inputs()) {
if (onlyCheckCMX && input->memReqs() != MemoryType::CMX) {
if (checkOnlyCmx == CheckOnlyCMX::YES && input->memReqs() != MemoryType::CMX) {
continue;
}
@ -168,7 +168,7 @@ AllocationResult runAllocator(const Model& model, bool onlyCheckCMX) {
// Release stage temporary buffers.
//
if (!onlyCheckCMX) {
if (checkOnlyCmx == CheckOnlyCMX::NO) {
for (const auto& tempBufferEdge : stage->tempBufferEdges()) {
allocator.freeData(tempBufferEdge->tempBuffer());
}
@ -195,7 +195,7 @@ AllocationResult runAllocator(const Model& model, bool onlyCheckCMX) {
if (const auto& parentEdge = data->parentDataToShapeEdge()) {
const auto& parent = parentEdge->parent();
if (parent->usage() == DataUsage::Intermediate && (!onlyCheckCMX || parent->memReqs() == MemoryType::CMX)) {
if (parent->usage() == DataUsage::Intermediate && (checkOnlyCmx == CheckOnlyCMX::NO || parent->memReqs() == MemoryType::CMX)) {
allocator.freeData(parent);
}
}
@ -205,9 +205,11 @@ AllocationResult runAllocator(const Model& model, bool onlyCheckCMX) {
// Allocate shape for all datas
//
for (auto data : model->datas()) {
const auto shapeLocation = allocator.allocateShape(data);
data->setShapeAllocationInfo(shapeLocation);
if (enableShapeAllocation == EnableShapeAllocation::YES) {
for (auto data : model->datas()) {
const auto shapeLocation = allocator.allocateShape(data);
data->setShapeAllocationInfo(shapeLocation);
}
}
return AllocationResult();
@ -233,7 +235,7 @@ void PassImpl::run(const Model& model) {
// Allocate all resources
//
auto allocRes = runAllocator(model);
auto allocRes = runAllocator(model, EnableShapeAllocation::YES);
IE_ASSERT(allocRes.status == AllocationStatus::OK);
//

2
inference-engine/src/vpu/graph_transformer/src/middleend/passes/eliminate_copy.cpp
View File

@ -160,7 +160,7 @@ void PassImpl::run(const Model& model) {
model->replaceStageInput(consumerEdge, copyOutput);
}
auto allocRes = runAllocator(model, true);
auto allocRes = runAllocator(model, EnableShapeAllocation::NO, CheckOnlyCMX::YES);
if (allocRes.status != AllocationStatus::OK) {
model->replaceStageOutput(copyProducer->outputEdge(0), copyInput);

2
inference-engine/src/vpu/graph_transformer/src/middleend/passes/inject_sw.cpp
View File

@ -171,7 +171,7 @@ void PassImpl::run(const Model& model) {
.childSW(swStage)
.done();
auto allocRes = runAllocator(model, true);
auto allocRes = runAllocator(model, EnableShapeAllocation::NO, CheckOnlyCMX::YES);
if (allocRes.status == AllocationStatus::OK) {
// TODO: try to merge more than one SW stage?
break;