-
Notifications
You must be signed in to change notification settings - Fork 158
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
[onert] Introduce capabilities to find operands which can share memory #14228
Open
mbencer
wants to merge
3
commits into
Samsung:master
Choose a base branch
from
mbencer:mbencer/SharedMemoryOperands
base: master
Could not load branches
Branch not found: {{ refName }}
Loading
Could not load tags
Nothing to show
Loading
Are you sure you want to change the base?
Some commits from the old base branch may be removed from the timeline,
and old review comments may become outdated.
Open
Changes from all commits
Commits
Show all changes
3 commits
Select commit
Hold shift + click to select a range
File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,94 @@ | ||
/* | ||
* Copyright (c) 2024 Samsung Electronics Co., Ltd. All Rights Reserved | ||
* | ||
* Licensed under the Apache License, Version 2.0 (the "License"); | ||
* you may not use this file except in compliance with the License. | ||
* You may obtain a copy of the License at | ||
* | ||
* http://www.apache.org/licenses/LICENSE-2.0 | ||
* | ||
* Unless required by applicable law or agreed to in writing, software | ||
* distributed under the License is distributed on an "AS IS" BASIS, | ||
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. | ||
* See the License for the specific language governing permissions and | ||
* limitations under the License. | ||
*/ | ||
|
||
#include "SharedMemoryOperands.h" | ||
|
||
namespace onert | ||
{ | ||
namespace backend | ||
{ | ||
namespace cpu | ||
{ | ||
|
||
namespace | ||
{ | ||
// To handle cases like Reshape->Reshape->Reshape... chain where the memory is shared. | ||
// In such a case we should re-assign indexes to the first Reshape input. | ||
void reassign_indexes_to_single_sources( | ||
ir::OperandIndexMap<ir::OperandIndex> &shared_memory_operand_map) | ||
{ | ||
for (auto [shared_ind, source_ind] : shared_memory_operand_map) | ||
{ | ||
bool other_source_found = false; | ||
auto it = std::end(shared_memory_operand_map); | ||
while ((it = shared_memory_operand_map.find(source_ind)) != std::end(shared_memory_operand_map)) | ||
{ | ||
source_ind = shared_memory_operand_map[source_ind]; | ||
other_source_found = true; | ||
} | ||
if (other_source_found) | ||
{ | ||
shared_memory_operand_map[shared_ind] = source_ind; | ||
} | ||
} | ||
} | ||
|
||
bool is_memory_sharing_allowed(const ir::IGraph &graph, const ir::IOperation &op) | ||
{ | ||
const std::unordered_set<ir::OpCode> ops_with_possible_memory_sharing = { | ||
ir::OpCode::Reshape, ir::OpCode::ExpandDims, ir::OpCode::Squeeze}; | ||
|
||
if (ops_with_possible_memory_sharing.find(op.opcode()) == | ||
std::end(ops_with_possible_memory_sharing)) | ||
{ | ||
return false; | ||
} | ||
if (graph.operands().at(op.getInputs().at(0)).info().isDynamic()) | ||
{ | ||
return false; | ||
} | ||
if (graph.operands().at(op.getOutputs().at(0)).info().isDynamic()) | ||
{ | ||
return false; | ||
} | ||
const auto op_input_output = {op.getInputs().at(0), op.getOutputs().at(0)}; | ||
const bool is_model_input_output = std::any_of( | ||
std::begin(op_input_output), std::end(op_input_output), [&graph](const ir::OperandIndex &ind) { | ||
return graph.getInputs().contains(ind) || graph.getOutputs().contains(ind); | ||
}); | ||
return !is_model_input_output; | ||
}; | ||
|
||
} // namespace | ||
|
||
ir::OperandIndexMap<ir::OperandIndex> findSharedMemoryOperandIndexes(const ir::IGraph &graph) | ||
{ | ||
ir::OperandIndexMap<ir::OperandIndex> shared_memory_operand_map; | ||
graph.operations().iterate([&](const ir::OperationIndex &, const ir::IOperation &op) { | ||
if (is_memory_sharing_allowed(graph, op)) | ||
{ | ||
assert(op.getInputs().size() == 1 || op.getInputs().size() == 2); | ||
assert(op.getOutputs().size() == 1); | ||
shared_memory_operand_map[op.getOutputs().at(0)] = op.getInputs().at(0); | ||
} | ||
}); | ||
reassign_indexes_to_single_sources(shared_memory_operand_map); | ||
return shared_memory_operand_map; | ||
} | ||
|
||
} // namespace cpu | ||
} // namespace backend | ||
} // namespace onert |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,39 @@ | ||
/* | ||
* Copyright (c) 2024 Samsung Electronics Co., Ltd. All Rights Reserved | ||
* | ||
* Licensed under the Apache License, Version 2.0 (the "License"); | ||
* you may not use this file except in compliance with the License. | ||
* You may obtain a copy of the License at | ||
* | ||
* http://www.apache.org/licenses/LICENSE-2.0 | ||
* | ||
* Unless required by applicable law or agreed to in writing, software | ||
* distributed under the License is distributed on an "AS IS" BASIS, | ||
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. | ||
* See the License for the specific language governing permissions and | ||
* limitations under the License. | ||
*/ | ||
|
||
#ifndef __ONERT_BACKEND_CPU_SHARED_MEMORY_OPERANDS_H__ | ||
#define __ONERT_BACKEND_CPU_SHARED_MEMORY_OPERANDS_H__ | ||
|
||
#include "ir/IGraph.h" | ||
#include "ir/OperandIndexMap.h" | ||
|
||
namespace onert | ||
{ | ||
namespace backend | ||
{ | ||
namespace cpu | ||
{ | ||
/* | ||
* Find indexed of operands assigned to tensors which can share memory (indicate the same buffer). | ||
* Note that it's applicable for operations that do NOT change data but only shape like Reshape. | ||
*/ | ||
ir::OperandIndexMap<ir::OperandIndex> findSharedMemoryOperandIndexes(const ir::IGraph &graph); | ||
|
||
} // namespace cpu | ||
} // namespace backend | ||
} // namespace onert | ||
|
||
#endif // __ONERT_BACKEND_CPU_SHARED_MEMORY_OPERANDS_H__ |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,226 @@ | ||
/* | ||
* Copyright (c) 2024 Samsung Electronics Co., Ltd. All Rights Reserved | ||
* | ||
* Licensed under the Apache License, Version 2.0 (the "License"); | ||
* you may not use this file except in compliance with the License. | ||
* You may obtain a copy of the License at | ||
* | ||
* http://www.apache.org/licenses/LICENSE-2.0 | ||
* | ||
* Unless required by applicable law or agreed to in writing, software | ||
* distributed under the License is distributed on an "AS IS" BASIS, | ||
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. | ||
* See the License for the specific language governing permissions and | ||
* limitations under the License. | ||
*/ | ||
|
||
#include <gtest/gtest.h> | ||
|
||
#include <memory> | ||
|
||
#include "SharedMemoryOperands.h" | ||
|
||
#include "ir/Graph.h" | ||
#include "ir/operation/Permute.h" | ||
#include "ir/operation/Squeeze.h" | ||
#include "ir/operation/Reshape.h" | ||
|
||
using namespace onert::backend::cpu; | ||
using namespace onert::ir; | ||
|
||
// Add node other than Reshape/ExpandDims/Squeeze. | ||
// It is used for cases where Reshape input/output is not input/output on the whole model. | ||
namespace | ||
{ | ||
void addNotOptimizedNode(Graph *graph, const OperandIndex &input, const OperandIndex &output) | ||
{ | ||
graph->addOperation(std::make_unique<operation::Permute>(input, output)); | ||
} | ||
} // namespace | ||
|
||
TEST(SharedMemoryOperands, no_shared_memory_graph) | ||
{ | ||
auto graph = std::make_unique<Graph>(); | ||
TypeInfo data_type{DataType::FLOAT32}; | ||
const auto not_optim_in = graph->addOperand({4}, data_type); | ||
const auto not_optim_out = graph->addOperand({4}, data_type); | ||
addNotOptimizedNode(graph.get(), not_optim_in, not_optim_out); | ||
graph->addInput(not_optim_in); | ||
graph->addOutput(not_optim_out); | ||
graph->verify(); | ||
|
||
const auto indexes_map = findSharedMemoryOperandIndexes(*graph); | ||
|
||
ASSERT_EQ(indexes_map.size(), 0); | ||
} | ||
|
||
TEST(SharedMemoryOperands, single_reshape_graph) | ||
{ | ||
auto graph = std::make_unique<Graph>(); | ||
TypeInfo data_type{DataType::FLOAT32}; | ||
const auto not_optim_in = graph->addOperand({4}, data_type); | ||
const auto reshape_input = graph->addOperand({4}, data_type); | ||
addNotOptimizedNode(graph.get(), not_optim_in, reshape_input); | ||
const auto reshape_output = graph->addOperand({2, 2}, data_type); | ||
operation::Reshape::Param shape; | ||
shape.new_shape = {2, 2}; | ||
TypeInfo shape_type{DataType::INT32}; | ||
const auto reshape_shape = graph->addOperand({2}, shape_type); | ||
graph->addOperation( | ||
std::make_unique<operation::Reshape>(OperandIndexSequence{reshape_input, reshape_shape}, | ||
OperandIndexSequence{reshape_output}, shape)); | ||
const auto not_optim_out_2 = graph->addOperand({2, 2}, data_type); | ||
addNotOptimizedNode(graph.get(), reshape_output, not_optim_out_2); | ||
graph->addInput(not_optim_in); | ||
graph->addOutput(not_optim_out_2); | ||
graph->verify(); | ||
|
||
const auto indexes_map = findSharedMemoryOperandIndexes(*graph); | ||
|
||
ASSERT_EQ(indexes_map.size(), 1); | ||
EXPECT_EQ(indexes_map.begin()->first, 2); | ||
EXPECT_EQ(indexes_map.begin()->second, 1); | ||
} | ||
|
||
TEST(SharedMemoryOperands, double_reshape_graph) | ||
{ | ||
auto graph = std::make_unique<Graph>(); | ||
TypeInfo data_type{DataType::FLOAT32}; | ||
const auto not_optim_in = graph->addOperand({4}, data_type); | ||
const auto reshape1_input = graph->addOperand({4}, data_type); | ||
addNotOptimizedNode(graph.get(), not_optim_in, reshape1_input); | ||
const auto reshape1_output = graph->addOperand({2, 2}, data_type); | ||
operation::Reshape::Param shape; | ||
shape.new_shape = {2, 2}; | ||
TypeInfo shape_type{DataType::INT32}; | ||
const auto reshape_shape = graph->addOperand({2}, shape_type); | ||
graph->addOperation( | ||
std::make_unique<operation::Reshape>(OperandIndexSequence{reshape1_input, reshape_shape}, | ||
OperandIndexSequence{reshape1_output}, shape)); | ||
const auto reshape2_output = graph->addOperand({2, 2}, data_type); | ||
graph->addOperation( | ||
std::make_unique<operation::Reshape>(OperandIndexSequence{reshape1_output, reshape_shape}, | ||
OperandIndexSequence{reshape2_output}, shape)); | ||
const auto not_optim_out_2 = graph->addOperand({2, 2}, data_type); | ||
addNotOptimizedNode(graph.get(), reshape2_output, not_optim_out_2); | ||
graph->addInput(not_optim_in); | ||
graph->addOutput(not_optim_out_2); | ||
graph->verify(); | ||
|
||
const auto indexes_map = findSharedMemoryOperandIndexes(*graph); | ||
|
||
ASSERT_EQ(indexes_map.size(), 2); | ||
auto map_it = indexes_map.begin(); | ||
EXPECT_EQ(map_it->first, 2); | ||
EXPECT_EQ(map_it->second, 1); | ||
++map_it; | ||
EXPECT_EQ(map_it->first, 4); | ||
EXPECT_EQ(map_it->second, 1); | ||
} | ||
|
||
TEST(SharedMemoryOperands, dyn_output_reshape_graph) | ||
{ | ||
auto graph = std::make_unique<Graph>(); | ||
TypeInfo data_type{DataType::FLOAT32}; | ||
const auto not_optim_in = graph->addOperand({4}, data_type); | ||
const auto reshape_input = graph->addOperand({4}, data_type); | ||
addNotOptimizedNode(graph.get(), not_optim_in, reshape_input); | ||
const auto reshape_output = graph->addOperand({}, data_type); | ||
graph->operands().at(reshape_output).info().setDynamic(); | ||
operation::Reshape::Param shape; | ||
TypeInfo shape_type{DataType::INT32}; | ||
const auto reshape_shape = graph->addOperand({2}, shape_type); | ||
graph->addOperation( | ||
std::make_unique<operation::Reshape>(OperandIndexSequence{reshape_input, reshape_shape}, | ||
OperandIndexSequence{reshape_output}, shape)); | ||
const auto not_optim_out_2 = graph->addOperand({}, data_type); | ||
addNotOptimizedNode(graph.get(), reshape_output, not_optim_out_2); | ||
graph->addInput(not_optim_in); | ||
graph->addOutput(not_optim_out_2); | ||
graph->verify(); | ||
|
||
const auto indexes_map = findSharedMemoryOperandIndexes(*graph); | ||
|
||
ASSERT_EQ(indexes_map.size(), 0); | ||
} | ||
|
||
TEST(SharedMemoryOperands, model_input_reshape_graph) | ||
{ | ||
auto graph = std::make_unique<Graph>(); | ||
TypeInfo data_type{DataType::FLOAT32}; | ||
const auto reshape_input = graph->addOperand({4}, data_type); | ||
const auto reshape_output = graph->addOperand({2, 2}, data_type); | ||
operation::Reshape::Param shape; | ||
shape.new_shape = {2, 2}; | ||
TypeInfo shape_type{DataType::INT32}; | ||
const auto reshape_shape = graph->addOperand({2}, shape_type); | ||
graph->addOperation( | ||
std::make_unique<operation::Reshape>(OperandIndexSequence{reshape_input, reshape_shape}, | ||
OperandIndexSequence{reshape_output}, shape)); | ||
const auto not_optim_out = graph->addOperand({2, 2}, data_type); | ||
addNotOptimizedNode(graph.get(), reshape_output, not_optim_out); | ||
graph->addInput(reshape_input); | ||
graph->addOutput(not_optim_out); | ||
graph->verify(); | ||
|
||
const auto indexes_map = findSharedMemoryOperandIndexes(*graph); | ||
|
||
ASSERT_EQ(indexes_map.size(), 0); | ||
} | ||
|
||
TEST(SharedMemoryOperands, single_squeeze_graph) | ||
{ | ||
auto graph = std::make_unique<Graph>(); | ||
TypeInfo data_type{DataType::FLOAT32}; | ||
const auto not_optim_in = graph->addOperand({4, 1}, data_type); | ||
const auto squeeze_input = graph->addOperand({4, 1}, data_type); | ||
addNotOptimizedNode(graph.get(), not_optim_in, squeeze_input); | ||
const auto squeeze_output = graph->addOperand({4}, data_type); | ||
operation::Squeeze::Param axes; | ||
axes.dims[0] = 1; | ||
axes.ndim = 1; | ||
graph->addOperation(std::make_unique<operation::Squeeze>( | ||
OperandIndexSequence{squeeze_input}, OperandIndexSequence{squeeze_output}, axes)); | ||
const auto not_optim_out_2 = graph->addOperand({4}, data_type); | ||
addNotOptimizedNode(graph.get(), squeeze_output, not_optim_out_2); | ||
graph->addInput(not_optim_in); | ||
graph->addOutput(not_optim_out_2); | ||
graph->verify(); | ||
|
||
const auto indexes_map = findSharedMemoryOperandIndexes(*graph); | ||
|
||
ASSERT_EQ(indexes_map.size(), 1); | ||
EXPECT_EQ(indexes_map.begin()->first, 2); | ||
EXPECT_EQ(indexes_map.begin()->second, 1); | ||
} | ||
|
||
TEST(SharedMemoryOperands, multiple_reshape_input_consumers) | ||
{ | ||
auto graph = std::make_unique<Graph>(); | ||
TypeInfo data_type{DataType::FLOAT32}; | ||
const auto not_optim_in = graph->addOperand({4}, data_type); | ||
const auto reshape_input = graph->addOperand({4}, data_type); | ||
addNotOptimizedNode(graph.get(), not_optim_in, reshape_input); | ||
const auto reshape_output = graph->addOperand({2, 2}, data_type); | ||
operation::Reshape::Param shape; | ||
shape.new_shape = {2, 2}; | ||
TypeInfo shape_type{DataType::INT32}; | ||
const auto reshape_shape = graph->addOperand({2}, shape_type); | ||
graph->addOperation( | ||
std::make_unique<operation::Reshape>(OperandIndexSequence{reshape_input, reshape_shape}, | ||
OperandIndexSequence{reshape_output}, shape)); | ||
const auto not_optim_out_2 = graph->addOperand({2, 2}, data_type); | ||
addNotOptimizedNode(graph.get(), reshape_output, not_optim_out_2); | ||
const auto not_optim_out_3 = graph->addOperand({4}, data_type); | ||
addNotOptimizedNode(graph.get(), reshape_input, not_optim_out_3); | ||
graph->addInput(not_optim_in); | ||
graph->addOutput(not_optim_out_2); | ||
graph->addOutput(not_optim_out_3); | ||
graph->verify(); | ||
|
||
const auto indexes_map = findSharedMemoryOperandIndexes(*graph); | ||
|
||
ASSERT_EQ(indexes_map.size(), 1); | ||
EXPECT_EQ(indexes_map.begin()->first, 2); | ||
EXPECT_EQ(indexes_map.begin()->second, 1); | ||
} |
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
If
shared_memory_operand_map = {{1, 2}, {2, 3}, {2, 4}}
is given, is this works well..?There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
As I understand
2
cannot indicate other operand two times. (I've made some experiments about this implementation here - https://godbolt.org/z/11KKr9xqY)There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Oh I see. I misunderstood the details.
Thank you for your implementations :)
My original question was that I it is safe with below graphs :
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
ohh, I see, definitely it makes sense to write such unit test, thank you!
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
I added such a test:
and it seems to work correctly (the memory is sharing)