mirrors/yosys
3
0
Fork 0
mirror of https://github.com/YosysHQ/yosys synced 2025-04-25 18:15:34 +00:00
Code Activity

rtlil: Add {from,to}_hdl_index methods to Wire

Browse source 
In the past we had the occasional bug due to some place not handling all
4 combinations of upto/downto and zero/nonzero start_offset correctly.
This commit is contained in:
Jannis Harder 2025-02-12 15:34:51 +01:00 • committed by Emil J. Tywoniak
parent 28c768e7b8
commit 7cd822b7f5
2 changed files with 106 additions and 1 deletions
Download patch file Download diff file Expand all files Collapse all files

13
kernel/rtlil.h
View file

@ -1673,6 +1673,19 @@ public:
RTLIL::Cell *driverCell() const { log_assert(driverCell_); return driverCell_; };
RTLIL::IdString driverPort() const { log_assert(driverCell_); return driverPort_; };
int from_hdl_index(int hdl_index) {
int zero_index = hdl_index - start_offset;
int rtlil_index = upto ? width - 1 - zero_index : zero_index;
return rtlil_index >= 0 && rtlil_index < width ? rtlil_index : INT_MIN;
}
int to_hdl_index(int rtlil_index) {
if (rtlil_index < 0 || rtlil_index >= width)
return INT_MIN;
int zero_index = upto ? width - 1 - rtlil_index : rtlil_index;
return zero_index + start_offset;
}
#ifdef WITH_PYTHON
static std::map<unsigned int, RTLIL::Wire*> *get_all_wires(void);
#endif

94
tests/unit/kernel/rtlilTest.cc
View file

@ -5,7 +5,22 @@ YOSYS_NAMESPACE_BEGIN
namespace RTLIL {
class KernelRtlilTest : public testing::Test {};
struct SafePrintToStringParamName {
template <class ParamType>
std::string operator()(const testing::TestParamInfo<ParamType>& info) const {
std::string name = testing::PrintToString(info.param);
for (auto &c : name)
if (!('0' <= c && c <= '9') && !('a' <= c && c <= 'z') && !('A' <= c && c <= 'Z') ) c = '_';
return name;
}
};
class KernelRtlilTest : public testing::Test {
protected:
KernelRtlilTest() {
if (log_files.empty()) log_files.emplace_back(stdout);
}
};
TEST_F(KernelRtlilTest, ConstAssignCompare)
{
@ -74,6 +89,83 @@ namespace RTLIL {
}
}
class WireRtlVsHdlIndexConversionTest :
public KernelRtlilTest,
public testing::WithParamInterface<std::tuple<bool, int, int>>
{};
INSTANTIATE_TEST_SUITE_P(
WireRtlVsHdlIndexConversionInstance,
WireRtlVsHdlIndexConversionTest,
testing::Values(
std::make_tuple(false, 0, 10),
std::make_tuple(true, 0, 10),
std::make_tuple(false, 4, 10),
std::make_tuple(true, 4, 10),
std::make_tuple(false, -4, 10),
std::make_tuple(true, -4, 10),
std::make_tuple(false, 0, 1),
std::make_tuple(true, 0, 1),
std::make_tuple(false, 4, 1),
std::make_tuple(true, 4, 1),
std::make_tuple(false, -4, 1),
std::make_tuple(true, -4, 1)
),
SafePrintToStringParamName()
);
TEST_P(WireRtlVsHdlIndexConversionTest, WireRtlVsHdlIndexConversion) {
std::unique_ptr<Module> mod = std::make_unique<Module>();
Wire *wire = mod->addWire(ID(test), 10);
auto [upto, start_offset, width] = GetParam();
wire->upto = upto;
wire->start_offset = start_offset;
wire->width = width;
int smallest = INT_MAX;
int largest = INT_MIN;
for (int i = 0; i < wire->width; i++) {
int j = wire->to_hdl_index(i);
smallest = std::min(smallest, j);
largest = std::max(largest, j);
EXPECT_EQ(
std::make_pair(wire->from_hdl_index(j), j),
std::make_pair(i, wire->to_hdl_index(i))
);
}
EXPECT_EQ(smallest, start_offset);
EXPECT_EQ(largest, start_offset + wire->width - 1);
for (int i = 1; i < wire->width; i++) {
EXPECT_EQ(
wire->to_hdl_index(i) - wire->to_hdl_index(i - 1),
upto ? -1 : 1
);
}
for (int j = smallest; j < largest; j++) {
int i = wire->from_hdl_index(j);
EXPECT_EQ(
std::make_pair(wire->from_hdl_index(j), j),
std::make_pair(i, wire->to_hdl_index(i))
);
}
for (int i = -10; i < 0; i++)
EXPECT_EQ(wire->to_hdl_index(i), INT_MIN);
for (int i = wire->width; i < wire->width + 10; i++)
EXPECT_EQ(wire->to_hdl_index(i), INT_MIN);
for (int j = smallest - 10; j < smallest; j++)
EXPECT_EQ(wire->from_hdl_index(j), INT_MIN);
for (int j = largest + 1; j < largest + 11; j++)
EXPECT_EQ(wire->from_hdl_index(j), INT_MIN);
}
}
YOSYS_NAMESPACE_END