luke
/
verilator
mirror of https://github.com/verilator/verilator.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Fix unique..with method on queues of class objects (#4328)

This commit is contained in:
Ryszard Rozak 2023-06-30 17:04:09 +02:00 committed by GitHub
parent 24a9f7c650
commit 3d30527860
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 27 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
include/verilated_types.h
View File

@ -487,7 +487,7 @@ public:
template <typename Func> template <typename Func>
VlQueue unique(Func with_func) const { VlQueue unique(Func with_func) const {
VlQueue out; VlQueue out;
std::set<T_Value> saw; std::set<decltype(with_func(0, m_deque[0]))> saw;
for (const auto& i : m_deque) { for (const auto& i : m_deque) {
const auto i_mapped = with_func(0, i); const auto i_mapped = with_func(0, i);
const auto it = saw.find(i_mapped); const auto it = saw.find(i_mapped);
@ -516,7 +516,7 @@ public:
VlQueue<IData> unique_index(Func with_func) const { VlQueue<IData> unique_index(Func with_func) const {
VlQueue<IData> out; VlQueue<IData> out;
IData index = 0; IData index = 0;
std::unordered_set<T_Value> saw; std::set<decltype(with_func(0, m_deque[0]))> saw;
for (const auto& i : m_deque) { for (const auto& i : m_deque) {
const auto i_mapped = with_func(index, i); const auto i_mapped = with_func(index, i);
auto it = saw.find(i_mapped); auto it = saw.find(i_mapped);

25
test_regress/t/t_queue_method.v
View File

@ -10,6 +10,13 @@
`define checkg(gotv,expv) do if ((gotv) !== (expv)) begin $write("%%Error: %s:%0d: got='%g' exp='%g'\n", `__FILE__,`__LINE__, (gotv), (expv)); `stop; end while(0); `define checkg(gotv,expv) do if ((gotv) !== (expv)) begin $write("%%Error: %s:%0d: got='%g' exp='%g'\n", `__FILE__,`__LINE__, (gotv), (expv)); `stop; end while(0);
class Cls;
int x;
function new(int a);
x = a;
endfunction
endclass
module t (/*AUTOARG*/); module t (/*AUTOARG*/);
typedef struct packed { int x, y; } point; typedef struct packed { int x, y; } point;
typedef struct packed { point p; int z; } point_3d; typedef struct packed { point p; int z; } point_3d;
@ -25,11 +32,22 @@ module t (/*AUTOARG*/);
string string_qv[$]; string string_qv[$];
point_3d points_q[$]; // Same as q and qv, but complex value type point_3d points_q[$]; // Same as q and qv, but complex value type
point_3d points_qv[$]; point_3d points_qv[$];
Cls cls;
Cls cls_q[$];
Cls cls_qv[$];
points_q.push_back(point_3d'{point'{1, 2}, 3}); points_q.push_back(point_3d'{point'{1, 2}, 3});
points_q.push_back(point_3d'{point'{2, 3}, 5}); points_q.push_back(point_3d'{point'{2, 3}, 5});
points_q.push_back(point_3d'{point'{1, 4}, 5}); points_q.push_back(point_3d'{point'{1, 4}, 5});
cls = new(1);
cls_q.push_back(cls);
cls = new(2);
cls_q.push_back(cls);
cls = new(1);
cls_q.push_back(cls);
string_q.push_back("a"); string_q.push_back("a");
string_q.push_back("A"); string_q.push_back("A");
string_q.push_back("b"); string_q.push_back("b");
@ -71,6 +89,13 @@ module t (/*AUTOARG*/);
`checkh(qi.size(), 0); `checkh(qi.size(), 0);
qi = q.unique_index(x) with (x % 3); qv.sort; qi = q.unique_index(x) with (x % 3); qv.sort;
`checkh(qi.size(), 3); `checkh(qi.size(), 3);
cls_qv = cls_q.unique with (item.x);
`checkh(cls_qv.size(), 2);
cls_qv = cls_q.unique with (item.x < 10);
`checkh(cls_qv.size(), 1);
qi = cls_q.unique_index with (item.x % 2);
qi.sort;
v = $sformatf("%p", qi); `checks(v, "'{'h0, 'h1} ");
q.reverse; q.reverse;
v = $sformatf("%p", q); `checks(v, "'{'h3, 'h1, 'h4, 'h2, 'h2} "); v = $sformatf("%p", q); `checks(v, "'{'h3, 'h1, 'h4, 'h2, 'h2} ");