From b87f192702f5a02be473c9b05b8b34f1dc7e4296 Mon Sep 17 00:00:00 2001 From: Siddarth-Suresh <65844402+Siddarth-Suresh@users.noreply.github.com> Date: Sun, 9 Mar 2025 11:39:59 -0400 Subject: Implement dram load --- tests/dram.cc | 190 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 190 insertions(+) (limited to 'tests') diff --git a/tests/dram.cc b/tests/dram.cc index c646135..484b459 100644 --- a/tests/dram.cc +++ b/tests/dram.cc @@ -2,6 +2,7 @@ #include "definitions.h" #include #include +#include TEST_CASE("Construct singleton dram", "[dram]") { @@ -188,6 +189,195 @@ TEST_CASE( delete d; } +TEST_CASE("Construct singleton dram, write a line to an address, read it in zero cycles", "[dram]") +{ + Dram *d = new Dram(1, 0); + std::array expected = {0, 0, 0, 0}; + std::array actual = d->view(0, 1)[0]; + CHECK(expected == actual); + + signed int w = 0x11223311; + int addr = 0x00000000; + for(int i=0; iwrite(MEM, w, addr++); + CHECK(r == OK); + expected.at(i) = w++; + } + + Response r = d->read(MEM, 0x00000000, actual); + CHECK(r == OK); + REQUIRE(expected == actual); + + r = d->read(MEM, 0x00000001, actual); + CHECK(r == OK); + REQUIRE(expected == actual); + + r = d->read(MEM, 0x00000002, actual); + CHECK(r == OK); + REQUIRE(expected == actual); + + r = d->read(MEM, 0x00000003, actual); + CHECK(r == OK); + REQUIRE(expected == actual); + + delete d; +} + +TEST_CASE("Construct singleton dram, write a line to an address in 12 cycles, read it in three cycles", "[dram]") +{ + int delay = 3; + Dram *d = new Dram(1, delay); + std::array expected = {0, 0, 0, 0}; + std::array actual = d->view(0, 1)[0]; + CHECK(expected == actual); + + signed int w = 0x11223311; + int addr = 0x00000000; + int i; + Response r; + for(i=0; iwrite(MEM, w, addr); + d->resolve(); + } + r = d->write(MEM, w, addr++); + d->resolve(); + expected.at(i) = w++; + } + + for (i = 0; i < delay; ++i) { + r = d->read(MEM, 0x00000000, actual); + CHECK(r == WAIT); + REQUIRE(expected != actual); + d->resolve(); + } + + r = d->read(MEM, 0x00000000, actual); + CHECK(r == OK); + d->resolve(); + REQUIRE(expected == actual); + delete d; +} + +TEST_CASE( + "Construct singleton dram, store line in 12 cycles, read line in 3 cycles with no conflict","[dram]") +{ + int delay = 3; + Dram *d = new Dram(1, delay); + std::array expected = {0, 0, 0, 0}; + std::array actual = d->view(0, 1)[0]; + CHECK(expected == actual); + + signed int w = 0x11223311; + int addr = 0x00000000; + int i; + Response r; + for(i=0; iwrite(MEM, w, addr); + d->resolve(); + } + r = d->write(MEM, w, addr++); + d->resolve(); + expected.at(i) = w++; + } + + for (i = 0; i < delay; ++i) { + r = d->read(MEM, 0x00000000, actual); + CHECK(r == WAIT); + REQUIRE(expected != actual); + d->resolve(); + } + + r = d->read(MEM, 0x00000000, actual); + REQUIRE(r == OK); + r = d->read(FETCH, 0x00000003, actual); + CHECK(r == WAIT); + d->resolve(); + REQUIRE(expected == actual); + + actual = {0,0,0,0}; + for (i = 0; i < delay; ++i) { + r = d->read(FETCH, 0x00000000, actual); + CHECK(r == WAIT); + REQUIRE(expected != actual); + d->resolve(); + } + + r = d->read(FETCH, 0x00000000, actual); + REQUIRE(r == OK); + r = d->read(MEM, 0x00000002, actual); + CHECK(r == WAIT); + d->resolve(); + REQUIRE(expected == actual); + + delete d; + +} + +TEST_CASE( + "Construct singleton dram, store line in 12 cycles, read line in 3 cycles with much conflict","[dram]") +{ + int delay = 3; + Dram *d = new Dram(1, delay); + std::array expected = {0, 0, 0, 0}; + std::array actual = d->view(0, 1)[0]; + CHECK(expected == actual); + + signed int w = 0x11223311; + int addr = 0x00000000; + int i; + Response r; + for(i=0; iwrite(MEM, w, addr); + d->resolve(); + } + r = d->write(MEM, w, addr++); + d->resolve(); + expected.at(i) = w++; + } + + for (i = 0; i < delay; ++i) { + r = d->read(MEM, 0x00000000, actual); + CHECK(r == WAIT); + REQUIRE(expected != actual); + r = d->read(FETCH, 0x00000002, actual); + CHECK(r == WAIT); + REQUIRE(expected != actual); + d->resolve(); + } + + r = d->read(MEM, 0x00000000, actual); + REQUIRE(r == OK); + r = d->read(FETCH, 0x00000003, actual); + CHECK(r == WAIT); + d->resolve(); + REQUIRE(expected == actual); + + actual = {0,0,0,0}; + for (i = 0; i < delay; ++i) { + r = d->read(FETCH, 0x00000000, actual); + CHECK(r == WAIT); + REQUIRE(expected != actual); + r = d->read(MEM, 0x00000002, actual); + CHECK(r == WAIT); + REQUIRE(expected != actual); + d->resolve(); + } + + r = d->read(FETCH, 0x00000000, actual); + REQUIRE(r == OK); + r = d->read(MEM, 0x00000002, actual); + CHECK(r == WAIT); + d->resolve(); + REQUIRE(expected == actual); + + delete d; + +} + + TEST_CASE("Sidedoor bypasses delay", "[dram]") { int delay = 3; -- cgit v1.2.3 From 035eba9d7a3b1c68b57bf954d0e3983d6e5f11e5 Mon Sep 17 00:00:00 2001 From: Siddarth-Suresh <65844402+Siddarth-Suresh@users.noreply.github.com> Date: Sun, 9 Mar 2025 12:49:31 -0400 Subject: Code review comments --- inc/dram.h | 5 +---- src/storage/dram.cc | 5 +++++ tests/dram.cc | 1 - 3 files changed, 6 insertions(+), 5 deletions(-) (limited to 'tests') diff --git a/inc/dram.h b/inc/dram.h index ec35e3f..1061d6b 100644 --- a/inc/dram.h +++ b/inc/dram.h @@ -19,10 +19,7 @@ class Dram : public Storage Response read(Accessor accessor, int address, std::array& data) override; private: - void do_read(std::array& data_line, int address){ - int line = address / LINE_SIZE; - data_line = this->data->at(line); - } + void do_read(std::array& data_line, int address); }; #endif /* DRAM_H_INCLUDED */ diff --git a/src/storage/dram.cc b/src/storage/dram.cc index 43c092d..0db4c35 100644 --- a/src/storage/dram.cc +++ b/src/storage/dram.cc @@ -38,6 +38,11 @@ Response Dram::write(Accessor accessor, signed int data, int address) return r; } +void Dram::do_read(std::array& data_line, int address){ + int line = address / LINE_SIZE; + data_line = this->data->at(line); +} + Response Dram::read(Accessor accessor, int address, std::array& data) { Response r = WAIT; if (this->requester == IDLE) diff --git a/tests/dram.cc b/tests/dram.cc index 484b459..95ef90a 100644 --- a/tests/dram.cc +++ b/tests/dram.cc @@ -2,7 +2,6 @@ #include "definitions.h" #include #include -#include TEST_CASE("Construct singleton dram", "[dram]") { -- cgit v1.2.3