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

Update tests

This commit is contained in:
Miodrag Milanovic 2025-07-07 16:33:11 +02:00
parent da6837659f
commit c8d2b1697b
3 changed files with 10 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
himbaechel/uarch/gatemate/tests/lut.cc
View File

@ -49,9 +49,9 @@ TEST_F(GateMateTest, remove_lut1_zero)
CellInfo *obuf = create_cell_ptr(id_CC_OBUF, "obuf");
direct_connect(lut1, id_O, obuf, id_A);
lut1->connectPorts(id_O, obuf, id_A);
ASSERT_EQ(ctx->cells.size(), 1LU);
ASSERT_EQ(ctx->cells.size(), 2LU);
ctx->uarch->pack();
ASSERT_EQ(ctx->cells.size(), 1LU);
}
@ -63,7 +63,7 @@ TEST_F(GateMateTest, remove_lut1_one)
CellInfo *obuf = create_cell_ptr(id_CC_OBUF, "obuf");
direct_connect(lut1, id_O, obuf, id_A);
lut1->connectPorts(id_O, obuf, id_A);
ASSERT_EQ(ctx->cells.size(), 2LU);
ctx->uarch->pack();
@ -78,14 +78,14 @@ TEST_F(GateMateTest, remove_lut1_pass)
CellInfo *obuf = create_cell_ptr(id_CC_OBUF, "obuf");
CellInfo *ibuf = create_cell_ptr(id_CC_IBUF, "ibuf");
direct_connect(ibuf, id_Y, lut1, id_I0);
direct_connect(lut1, id_O, obuf, id_A);
ibuf->connectPorts(id_Y, lut1, id_I0);
lut1->connectPorts(id_O, obuf, id_A);
ASSERT_EQ(ctx->cells.size(), 3LU);
ctx->uarch->pack();
// Expect IBUF -> CPE -> OBUF
// LUT removed, but CPE for driving OBUF added
ASSERT_EQ(ctx->cells.size(), 3LU);
ASSERT_EQ(ctx->cells.size(), 4LU);
}
TEST_F(GateMateTest, remove_lut1_inv)
@ -96,14 +96,14 @@ TEST_F(GateMateTest, remove_lut1_inv)
CellInfo *obuf = create_cell_ptr(id_CC_OBUF, "obuf");
CellInfo *ibuf = create_cell_ptr(id_CC_IBUF, "ibuf");
direct_connect(ibuf, id_Y, lut1, id_I0);
direct_connect(lut1, id_O, obuf, id_A);
ibuf->connectPorts(id_Y, lut1, id_I0);
lut1->connectPorts(id_O, obuf, id_A);
ASSERT_EQ(ctx->cells.size(), 3LU);
ctx->uarch->pack();
// Expect IBUF -> CPE -> OBUF
// LUT merged, but CPE for driving OBUF added
ASSERT_EQ(ctx->cells.size(), 3LU);
ASSERT_EQ(ctx->cells.size(), 5LU);
}
TEST_F(GateMateTest, remove_lut1_not_driven)
@ -123,5 +123,5 @@ TEST_F(GateMateTest, remove_lut1_not_driven)
ctx->uarch->pack();
// Expect IBUF -> CPE -> OBUF
// LUT1 removed as not used, but CPE for driving OBUF added
ASSERT_EQ(ctx->cells.size(), 3LU);
ASSERT_EQ(ctx->cells.size(), 4LU);
}

7
himbaechel/uarch/gatemate/tests/testing.cc
View File

@ -201,11 +201,4 @@ CellInfo *GateMateTest::create_cell_ptr(IdString type, std::string name)
return cell;
}
void GateMateTest::direct_connect(CellInfo *o_cell, IdString o_port, CellInfo *i_cell, IdString i_port)
{
NetInfo *net = ctx->createNet(ctx->idf("%s_%s", o_cell->name.c_str(ctx), o_port.c_str(ctx)));
o_cell->connectPort(o_port, net);
i_cell->connectPort(i_port, net);
}
NEXTPNR_NAMESPACE_END

1
himbaechel/uarch/gatemate/tests/testing.h
View File

@ -34,7 +34,6 @@ class GateMateTest : public ::testing::Test
virtual void TearDown() override;
CellInfo *create_cell_ptr(IdString type, std::string name);
void direct_connect(CellInfo *o_cell, IdString o_port, CellInfo *i_cell, IdString i_port);
ArchArgs chipArgs;
Context *ctx;