echuraev commented on code in PR #13253:
URL: https://github.com/apache/tvm/pull/13253#discussion_r1015421762
##########
src/relay/backend/graph_plan_memory.cc:
##########
@@ -513,30 +515,51 @@ class StorageAllocator : public StorageAllocaBaseVisitor {
if (cached.token_->ttype->dtype != prototype->ttype->dtype) {
continue;
}
- int64_t cached_size = cached.x_ * cached.y_;
- new_mem.x_ = std::max(cached.x_, shape.width);
- new_mem.y_ = std::max(cached.y_, shape.height);
- int64_t expanded_size = new_mem.x_ * new_mem.y_;
- int64_t added_size = expanded_size - cached_size;
- int64_t wasted_size = expanded_size - requested_size;
+ // Can only reuse texture 2d blocks of the same scope
+ if (cached.token_->virtual_device->memory_scope !=
prototype->virtual_device->memory_scope) {
+ continue;
+ }
+ // avoid reusing too small and too big textures
+ if (shape.width / cached.x_ > max_ratio || cached.x_ / shape.width >
max_ratio ||
+ shape.height / cached.y_ > max_ratio || cached.y_ / shape.height >
max_ratio) {
+ continue;
+ }
+ int64_t new_width = std::max(cached.x_, shape.width);
+ int64_t new_height = std::max(cached.y_, shape.height);
+ int64_t added_size_x = new_width - cached.x_;
+ int64_t added_size_y = new_height - cached.y_;
+ int64_t wasted_size_x = new_width - shape.width;
+ int64_t wasted_size_y = new_height - shape.height;
// Prioritize minimization of added size first, then minimize
// wasted size among blocks which would not require expansion
- if ((min_added_size > 0 && added_size < min_added_size) ||
- (min_added_size == 0 && wasted_size < min_wasted_size)) {
- min_added_size = added_size;
- min_wasted_size = wasted_size;
+ if ((min_added_size_x > 0 && added_size_x < min_added_size_x) ||
+ (min_added_size_y > 0 && added_size_y < min_added_size_y) ||
+ (min_added_size_x == added_size_x && wasted_size_x <
min_wasted_size_x) ||
+ (min_added_size_y == added_size_y && wasted_size_y <
min_wasted_size_y)) {
+ min_added_size_x = added_size_x;
+ min_added_size_y = added_size_y;
+ min_wasted_size_x = wasted_size_x;
+ min_wasted_size_y = wasted_size_y;
best_storage_id = free_id;
- best_mem = new_mem;
+ best_mem = cached;
Review Comment:
Done
--
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
To unsubscribe, e-mail: [email protected]
For queries about this service, please contact Infrastructure at:
[email protected]
