changed build structure

This commit is contained in:
gernhard
2014-03-15 18:31:16 +01:00
parent 8ecd91c040
commit 4dffbf9383
49 changed files with 214 additions and 447 deletions

View File

@@ -36,10 +36,10 @@ public:
TEST_F(CommandBusTest, cleanUpBusWorks)
{
shared_ptr<tlm::tlm_generic_payload> dummy = createDummyPayload();
ScheduledCommand cmd1(*dummy.get(), Command::Read, 2*clk, clk);
ScheduledCommand cmd2(*dummy.get(), Command::Read, 3*clk, clk);
ScheduledCommand cmd3(*dummy.get(), Command::Read, 5*clk, clk);
ScheduledCommand cmd4(*dummy.get(), Command::Read, 7*clk, clk);
ScheduledCommand cmd1(*dummy.get(), Read, 2*clk, clk);
ScheduledCommand cmd2(*dummy.get(), Read, 3*clk, clk);
ScheduledCommand cmd3(*dummy.get(), Read, 5*clk, clk);
ScheduledCommand cmd4(*dummy.get(), Read, 7*clk, clk);
bus.scheduleCommand(cmd1);
bus.scheduleCommand(cmd2);
@@ -57,13 +57,13 @@ TEST_F(CommandBusTest, cleanUpBusWorks)
TEST_F(CommandBusTest, getEarliestStartTimeWorks)
{
shared_ptr<tlm::tlm_generic_payload> dummy = createDummyPayload();
ScheduledCommand cmd1(*dummy.get(), Command::Read, 2*clk, clk);
ScheduledCommand cmd2(*dummy.get(), Command::Read, 3*clk, clk);
ScheduledCommand cmd3(*dummy.get(), Command::Read, 5*clk, clk);
ScheduledCommand cmd4(*dummy.get(), Command::Read, 7*clk, clk);
ScheduledCommand cmd1(*dummy.get(), Read, 2*clk, clk);
ScheduledCommand cmd2(*dummy.get(), Read, 3*clk, clk);
ScheduledCommand cmd3(*dummy.get(), Read, 5*clk, clk);
ScheduledCommand cmd4(*dummy.get(), Read, 7*clk, clk);
ScheduledCommand collision(*dummy.get(), Command::Read, 3*clk, clk);
ScheduledCommand noCollision(*dummy.get(), Command::Read, 6*clk, clk);
ScheduledCommand collision(*dummy.get(), Read, 3*clk, clk);
ScheduledCommand noCollision(*dummy.get(), Read, 6*clk, clk);
bus.scheduleCommand(cmd1);
bus.scheduleCommand(cmd2);
@@ -78,34 +78,34 @@ TEST_F(CommandBusTest, getEarliestStartTimeWorks)
TEST_F(CommandBusTest, getESTDiesWithNotClkAligned)
{
shared_ptr<tlm::tlm_generic_payload> dummy = createDummyPayload();
ScheduledCommand notAligned(*dummy.get(), Command::Read, 2.5*clk, clk);
ScheduledCommand notAligned(*dummy.get(), Read, 2.5*clk, clk);
EXPECT_DEATH(bus.getEarliestStartTime(notAligned), ".*");
}
TEST_F(CommandBusTest, getLastCommandWorks)
{
shared_ptr<tlm::tlm_generic_payload> dummy0 = createDummyPayload(common::Thread(0), common::Bank(0));
shared_ptr<tlm::tlm_generic_payload> dummy2 = createDummyPayload(common::Thread(0), common::Bank(2));
shared_ptr<tlm::tlm_generic_payload> dummy0 = createDummyPayload(Thread(0), Bank(0));
shared_ptr<tlm::tlm_generic_payload> dummy2 = createDummyPayload(Thread(0), Bank(2));
ScheduledCommand read0(*dummy0.get(), Command::Read, 2*clk, clk);
ScheduledCommand read2(*dummy2.get(), Command::Read, 3*clk, clk);
ScheduledCommand read0(*dummy0.get(), Read, 2*clk, clk);
ScheduledCommand read2(*dummy2.get(), Read, 3*clk, clk);
bus.scheduleCommand(read0);
bus.scheduleCommand(read2);
EXPECT_EQ(read0, bus.getLastCommand(Command::Read, read0.getBank()));
EXPECT_EQ(read2, bus.getLastCommand(Command::Read, read2.getBank()));
EXPECT_EQ(read2.getStart(), bus.getLastCommand(Command::Read).getStart());
EXPECT_EQ(read0, bus.getLastCommand(Read, read0.getBank()));
EXPECT_EQ(read2, bus.getLastCommand(Read, read2.getBank()));
EXPECT_EQ(read2.getStart(), bus.getLastCommand(Read).getStart());
}
TEST_F(CommandBusTest, notYetScheduledWorks)
{
shared_ptr<tlm::tlm_generic_payload> dummy = createDummyPayload(common::Thread(0), common::Bank(0));
ScheduledCommand read(*dummy.get(), Command::Read, 2*clk, clk);
shared_ptr<tlm::tlm_generic_payload> dummy = createDummyPayload(Thread(0), Bank(0));
ScheduledCommand read(*dummy.get(), Read, 2*clk, clk);
EXPECT_TRUE(bus.notYetScheduled(Command::Read));
EXPECT_TRUE(bus.notYetScheduled(Read));
bus.scheduleCommand(read);
EXPECT_FALSE(bus.notYetScheduled(Command::Read));
EXPECT_FALSE(bus.notYetScheduled(Read));
}