Skip to content

[FFI] Fix SmallMapInit with duplicated keys #18178

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.

Sign up for GitHub

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

Merged
MasterJH5574 merged 1 commit into from
Jul 31, 2025
Merged

[FFI] Fix SmallMapInit with duplicated keys #18178

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
30 changes: 20 additions & 10 deletions ffi/include/tvm/ffi/container/map.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1264,17 +1264,27 @@ inline ObjectPtr<Object> MapObj::CreateFromRange(IterType first, IterType last)
}
uint64_t cap = static_cast<uint64_t>(_cap);
if (cap < SmallMapObj::kMaxSize) {
return SmallMapObj::CreateFromRange(cap, first, last);
}
uint32_t fib_shift;
uint64_t n_slots;
DenseMapObj::CalcTableSize(cap, &fib_shift, &n_slots);
ObjectPtr<Object> obj = DenseMapObj::Empty(fib_shift, n_slots);
for (; first != last; ++first) {
KVType kv(*first);
DenseMapObj::InsertMaybeReHash(std::move(kv), &obj);
if (cap < 2) {
return SmallMapObj::CreateFromRange(cap, first, last);
}
// need to insert to avoid duplicate keys
ObjectPtr<Object> obj = SmallMapObj::Empty(cap);
for (; first != last; ++first) {
KVType kv(*first);
SmallMapObj::InsertMaybeReHash(std::move(kv), &obj);
}
return obj;
} else {
uint32_t fib_shift;
uint64_t n_slots;
DenseMapObj::CalcTableSize(cap, &fib_shift, &n_slots);
ObjectPtr<Object> obj = DenseMapObj::Empty(fib_shift, n_slots);
for (; first != last; ++first) {
KVType kv(*first);
DenseMapObj::InsertMaybeReHash(std::move(kv), &obj);
}
return obj;
}
return obj;
}

inline void MapObj::InsertMaybeReHash(KVType&& kv, ObjectPtr<Object>* map) {
Expand Down
7 changes: 7 additions & 0 deletions ffi/tests/cpp/test_map.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -356,4 +356,11 @@ TEST(Map, EmptyIter) {
// now m0 is dense map with all empty slots
EXPECT_EQ(m0.begin(), m0.end());
}

TEST(Map, DuplicatedKeysInit) {
std::vector<std::pair<String, int>> data = {{"a", 1}, {"a", 2}, {"a", 3}};
Map<String, int> map(data.begin(), data.end());
EXPECT_EQ(map.size(), 1);
EXPECT_EQ(map["a"], 3);
}
} // namespace
Loading