From 20fe698a4074df4abe02f14a1a14481770e90abc Mon Sep 17 00:00:00 2001 From: bd Date: Thu, 6 Mar 2025 00:03:00 -0500 Subject: Storage.view method, some initial tests --- inc/dram.h | 1 - 1 file changed, 1 deletion(-) (limited to 'inc/dram.h') diff --git a/inc/dram.h b/inc/dram.h index 41dd7de..6d33534 100644 --- a/inc/dram.h +++ b/inc/dram.h @@ -17,7 +17,6 @@ class Dram : public Storage Response *write(Accessor accessor, signed int data, int address) override; Response *read(Accessor accessor, int address) override; - int **view(int base, int lines) override; }; #endif /* DRAM_H_INCLUDED */ -- cgit v1.2.3 From 3322aa0845f7fe9cc98aa4e429bd5ecf72a5c27e Mon Sep 17 00:00:00 2001 From: bd Date: Thu, 6 Mar 2025 00:34:35 -0500 Subject: dram write (no delay, no accessor tracking --- inc/cache.h | 2 +- inc/definitions.h | 10 ++++++++++ inc/dram.h | 2 +- inc/storage.h | 5 +++-- src/storage/cache.cc | 3 ++- src/storage/dram.cc | 12 ++++++++++-- src/storage/storage.cc | 8 +++++--- tests/cache.cc | 11 ++++++----- tests/dram.cc | 30 ++++++++++++++++++++++++++---- 9 files changed, 64 insertions(+), 19 deletions(-) create mode 100644 inc/definitions.h (limited to 'inc/dram.h') diff --git a/inc/cache.h b/inc/cache.h index 4d143aa..312f3d1 100644 --- a/inc/cache.h +++ b/inc/cache.h @@ -8,7 +8,7 @@ class Cache : public Storage /** * Constructor. * @param The number of `lines` contained in memory. The total number of - * words is this number multiplied by 4. + * words is this number multiplied by LINE_SIZE. * @param The next lowest level in storage. Methods from this object are * called in case of a cache miss. * @param The number of clock cycles each access takes. diff --git a/inc/definitions.h b/inc/definitions.h new file mode 100644 index 0000000..1593162 --- /dev/null +++ b/inc/definitions.h @@ -0,0 +1,10 @@ +#ifndef DEFINITIONS_H +#define DEFINITIONS_H + +/** + * Defines common macros. + */ + +#define LINE_SIZE 4 + +#endif /* DEFINITIONS_H_INCLUDED */ diff --git a/inc/dram.h b/inc/dram.h index 6d33534..c1e86b9 100644 --- a/inc/dram.h +++ b/inc/dram.h @@ -8,7 +8,7 @@ class Dram : public Storage /** * Constructor. * @param The number of `lines` contained in memory. The total number of - * words is this number multiplied by 4. + * words is this number multiplied by LINE_SIZE. * @param The number of clock cycles each access takes. * @return A new memory object. */ diff --git a/inc/storage.h b/inc/storage.h index 5ad4f99..c0f09a3 100644 --- a/inc/storage.h +++ b/inc/storage.h @@ -1,5 +1,6 @@ #ifndef STORAGE_H #define STORAGE_H +#include "definitions.h" #include "response.h" #include #include @@ -37,13 +38,13 @@ class Storage * @return A matrix of data values, where each row is a line and each column * is a word. */ - std::vector> view(int base, int lines); + std::vector> view(int base, int lines); protected: /** * The data currently stored in this level of storage. */ - std::vector> *data; + std::vector> *data; /** * A pointer to the next lowest level of storage. * Used in case of cache misses. diff --git a/src/storage/cache.cc b/src/storage/cache.cc index a4df820..f4f60ba 100644 --- a/src/storage/cache.cc +++ b/src/storage/cache.cc @@ -1,10 +1,11 @@ #include "cache.h" +#include "definitions.h" #include "response.h" #include Cache::Cache(int lines, Storage *lower, int delay) { - this->data = new std::vector>; + this->data = new std::vector>; this->data->resize(lines); this->lower = lower; this->delay = delay; diff --git a/src/storage/dram.cc b/src/storage/dram.cc index 89c7316..845db21 100644 --- a/src/storage/dram.cc +++ b/src/storage/dram.cc @@ -1,10 +1,11 @@ #include "dram.h" +#include "definitions.h" #include "response.h" #include Dram::Dram(int lines, int delay) { - this->data = new std::vector>; + this->data = new std::vector>; this->data->resize(lines); this->delay = delay; this->lower = nullptr; @@ -14,7 +15,14 @@ Dram::~Dram() { delete this->data; } Response *Dram::write(Accessor accessor, signed int data, int address) { - return new Response(); + struct Response *r = new Response(); + int line = address / LINE_SIZE; + int word = address % LINE_SIZE; + + this->data->at(line).at(word) = data; + + r->status = OK; + return r; } Response *Dram::read(Accessor accessor, int address) { return nullptr; } diff --git a/src/storage/storage.cc b/src/storage/storage.cc index 49d8e7e..a9a883a 100644 --- a/src/storage/storage.cc +++ b/src/storage/storage.cc @@ -1,10 +1,12 @@ #include "storage.h" +#include "definitions.h" #include -std::vector> Storage::view(int base, int lines) +std::vector> +Storage::view(int base, int lines) { - base = (base / 4) * 4; - std::vector> ret(lines + 1); + base = (base / LINE_SIZE) * LINE_SIZE; + std::vector> ret(lines + 1); std::copy( this->data->begin() + base, this->data->begin() + base + lines, ret.begin()); diff --git a/tests/cache.cc b/tests/cache.cc index 3b3787d..3c1fba6 100644 --- a/tests/cache.cc +++ b/tests/cache.cc @@ -1,11 +1,12 @@ #include "cache.h" +#include "definitions.h" #include -TEST_CASE("Constructor initialize test 1", "[cache]") +TEST_CASE("Constructor singleton dram", "[cache]") { - Cache *c = new Cache(1, nullptr, 4); - std::array expected = {0, 0, 0, 0}; - std::array actual = c->view(0, 1)[0]; - CHECK(expected == actual); + Cache *c = new Cache(1, nullptr, LINE_SIZE); + std::array expected = {0, 0, 0, 0}; + std::array actual = c->view(0, 1)[0]; + REQUIRE(expected == actual); delete c; } diff --git a/tests/dram.cc b/tests/dram.cc index 8d5d03b..15e2990 100644 --- a/tests/dram.cc +++ b/tests/dram.cc @@ -1,12 +1,34 @@ #include "dram.h" +#include "definitions.h" #include #include -TEST_CASE("Constructor initialize test 1", "[dram]") +TEST_CASE("Construct singleton dram", "[dram]") { - Dram *d = new Dram(1, 4); - std::array expected = {0, 0, 0, 0}; - std::array actual = d->view(0, 1)[0]; + Dram *d = new Dram(1, 1); + std::array expected = {0, 0, 0, 0}; + std::array actual = d->view(0, 1)[0]; + REQUIRE(expected == actual); + delete d; +} + +TEST_CASE("Construct ingleton dram, store 0th element 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 = 0x11223344; + + Response *r = d->write(MEMORY, w, 0x00000000); + REQUIRE(r->status == OK); + + + expected.at(0) = w; + actual = d->view(0, 1)[0]; + REQUIRE(expected == actual); + + delete r; delete d; } -- cgit v1.2.3 From c5f26a0bfdaafc8d49c88d2016df1724b64e5271 Mon Sep 17 00:00:00 2001 From: bd Date: Sat, 8 Mar 2025 11:36:17 -0500 Subject: Refactor function return scheme --- inc/cache.h | 4 +- inc/dram.h | 4 +- inc/response.h | 8 +--- inc/storage.h | 7 ++-- src/storage/cache.cc | 6 +-- src/storage/dram.cc | 11 +++-- tests/dram.cc | 112 +++++++++++++++++++-------------------------------- 7 files changed, 58 insertions(+), 94 deletions(-) (limited to 'inc/dram.h') diff --git a/inc/cache.h b/inc/cache.h index 312f3d1..f1fb942 100644 --- a/inc/cache.h +++ b/inc/cache.h @@ -17,8 +17,8 @@ class Cache : public Storage Cache(int lines, Storage *lower, int delay); ~Cache(); - Response *write(Accessor accessor, signed int data, int address) override; - Response *read(Accessor accessor, int address) override; + Response write(Accessor accessor, signed int data, int address) override; + Response read(Accessor accessor, int address) override; }; #endif /* CACHE_H_INCLUDED */ diff --git a/inc/dram.h b/inc/dram.h index c1e86b9..cfac799 100644 --- a/inc/dram.h +++ b/inc/dram.h @@ -15,8 +15,8 @@ class Dram : public Storage Dram(int lines, int delay); ~Dram(); - Response *write(Accessor accessor, signed int data, int address) override; - Response *read(Accessor accessor, int address) override; + Response write(Accessor accessor, signed int data, int address) override; + Response read(Accessor accessor, int address) override; }; #endif /* DRAM_H_INCLUDED */ diff --git a/inc/response.h b/inc/response.h index c8141fd..d945e0f 100644 --- a/inc/response.h +++ b/inc/response.h @@ -1,16 +1,10 @@ #ifndef RESPONSE_H #define RESPONSE_H -enum Status { +enum Response { OK, WAIT, BLOCKED, }; -struct Response { - Status status; - int *line; - int val; -}; - #endif /* RESPONSE_H_INCLUDED */ diff --git a/inc/storage.h b/inc/storage.h index 841c531..a38f17d 100644 --- a/inc/storage.h +++ b/inc/storage.h @@ -7,7 +7,7 @@ #include enum Accessor { - MEMORY, + MEM, FETCH, L1CACHE, IDLE, @@ -24,8 +24,7 @@ class Storage * @param the address to write to. * @return a status code reflecting the state of the request. */ - virtual Response * - write(Accessor accessor, signed int data, int address) = 0; + virtual Response write(Accessor accessor, signed int data, int address) = 0; /** * Get the data at `address`. * @param the source making the request. @@ -33,7 +32,7 @@ class Storage * @return a status code reflecting the state of the request, and the * data being returned. */ - virtual Response *read(Accessor accessor, int address) = 0; + virtual Response read(Accessor accessor, int address) = 0; /** * Sidedoor view of `lines` of memory starting at `base`. * @param The base line to start getting memory from. diff --git a/src/storage/cache.cc b/src/storage/cache.cc index f4f60ba..bbefb2a 100644 --- a/src/storage/cache.cc +++ b/src/storage/cache.cc @@ -14,9 +14,9 @@ Cache::Cache(int lines, Storage *lower, int delay) Cache::~Cache() { delete this->data; } -Response *Cache::write(Accessor accessor, signed int data, int address) +Response Cache::write(Accessor accessor, signed int data, int address) { - return new Response(); + return WAIT; } -Response *Cache::read(Accessor accessor, int address) { return nullptr; } +Response Cache::read(Accessor accessor, int address) { return WAIT; } diff --git a/src/storage/dram.cc b/src/storage/dram.cc index 3eb0748..4c4ca84 100644 --- a/src/storage/dram.cc +++ b/src/storage/dram.cc @@ -14,14 +14,13 @@ Dram::Dram(int lines, int delay) Dram::~Dram() { delete this->data; } -Response *Dram::write(Accessor accessor, signed int data, int address) +Response Dram::write(Accessor accessor, signed int data, int address) { - struct Response *r = new Response(); - r->status = WAIT; + Response r = WAIT; if (accessor == SIDE) { this->do_write(data, address); - r->status = OK; + r = OK; } else { /* Do this first--then process the first cycle immediately. */ if (this->servicing == IDLE) { @@ -32,7 +31,7 @@ Response *Dram::write(Accessor accessor, signed int data, int address) if (this->servicing == accessor) { if (this->wait_time == 0) { this->do_write(data, address); - r->status = OK; + r = OK; } else { --this->wait_time; } @@ -42,4 +41,4 @@ Response *Dram::write(Accessor accessor, signed int data, int address) return r; } -Response *Dram::read(Accessor accessor, int address) { return nullptr; } +Response Dram::read(Accessor accessor, int address) { return WAIT; } diff --git a/tests/dram.cc b/tests/dram.cc index e98abc1..ba81508 100644 --- a/tests/dram.cc +++ b/tests/dram.cc @@ -22,14 +22,13 @@ TEST_CASE( signed int w = 0x11223344; - Response *r = d->write(MEMORY, w, 0x00000000); - REQUIRE(r->status == OK); + Response r = d->write(MEM, w, 0x00000000); + REQUIRE(r == OK); expected.at(0) = w; actual = d->view(0, 1)[0]; REQUIRE(expected == actual); - delete r; delete d; } @@ -44,30 +43,26 @@ TEST_CASE( signed int w = 0x11223344; // MEMORY CYCLE 1 - Response *r = d->write(MEMORY, w, 0x00000000); + Response r = d->write(MEM, w, 0x00000000); actual = d->view(0, 1)[0]; REQUIRE(expected == actual); - REQUIRE(r->status == WAIT); - delete r; + REQUIRE(r == WAIT); // MEMORY CYCLE 2 - r = d->write(MEMORY, w, 0x00000000); + r = d->write(MEM, w, 0x00000000); actual = d->view(0, 1)[0]; REQUIRE(expected == actual); - REQUIRE(r->status == WAIT); - delete r; + REQUIRE(r == WAIT); // MEMORY CYCLE 3 - r = d->write(MEMORY, w, 0x00000000); + r = d->write(MEM, w, 0x00000000); actual = d->view(0, 1)[0]; REQUIRE(expected == actual); - REQUIRE(r->status == WAIT); - delete r; + REQUIRE(r == WAIT); // MEMORY CYCLE 4 - r = d->write(MEMORY, w, 0x00000000); - REQUIRE(r->status == OK); - delete r; + r = d->write(MEM, w, 0x00000000); + REQUIRE(r == OK); expected.at(0) = w; actual = d->view(0, 1)[0]; @@ -90,37 +85,32 @@ TEST_CASE( signed int w2 = 0x55667788; // MEMORY CYCLE 1 - Response *r = d->write(MEMORY, w1, 0x00000000); + Response r = d->write(MEM, w1, 0x00000000); actual = d->view(0, 1)[0]; REQUIRE(expected == actual); - REQUIRE(r->status == WAIT); - delete r; + REQUIRE(r == WAIT); // MEMORY CYCLE 2 actual = d->view(0, 1)[0]; - r = d->write(MEMORY, w1, 0x00000000); + r = d->write(MEM, w1, 0x00000000); actual = d->view(0, 1)[0]; REQUIRE(expected == actual); - REQUIRE(r->status == WAIT); - delete r; + REQUIRE(r == WAIT); // MEMORY CYCLE 3 - r = d->write(MEMORY, w1, 0x00000000); + r = d->write(MEM, w1, 0x00000000); actual = d->view(0, 1)[0]; REQUIRE(expected == actual); - REQUIRE(r->status == WAIT); - delete r; + REQUIRE(r == WAIT); // MEMORY CYCLE 4 - r = d->write(MEMORY, w1, 0x00000000); - REQUIRE(r->status == OK); - delete r; + r = d->write(MEM, w1, 0x00000000); + REQUIRE(r == OK); // NOTE: servicing on the same clock cycle should probably not be allowed // FETCH CYCLE 1 r = d->write(FETCH, w2, 0x00000001); actual = d->view(0, 1)[0]; - REQUIRE(r->status == WAIT); - delete r; + REQUIRE(r == WAIT); expected.at(0) = w1; actual = d->view(0, 1)[0]; @@ -130,21 +120,18 @@ TEST_CASE( r = d->write(FETCH, w2, 0x00000001); actual = d->view(0, 1)[0]; REQUIRE(expected == actual); - REQUIRE(r->status == WAIT); - delete r; + REQUIRE(r == WAIT); // FETCH CYCLE 3 r = d->write(FETCH, w2, 0x00000001); actual = d->view(0, 1)[0]; REQUIRE(expected == actual); - REQUIRE(r->status == WAIT); - delete r; + REQUIRE(r == WAIT); // FETCH CYCLE 4 r = d->write(FETCH, w2, 0x00000001); actual = d->view(0, 1)[0]; - REQUIRE(r->status == OK); - delete r; + REQUIRE(r == OK); expected.at(1) = w2; actual = d->view(0, 1)[0]; @@ -167,45 +154,38 @@ TEST_CASE( signed int w2 = 0x55667788; // MEMORY CYCLE 1 - Response *r = d->write(MEMORY, w1, 0x00000000); + Response r = d->write(MEM, w1, 0x00000000); actual = d->view(0, 1)[0]; REQUIRE(expected == actual); - REQUIRE(r->status == WAIT); - delete r; + REQUIRE(r == WAIT); // MEMORY CYCLE 2 actual = d->view(0, 1)[0]; - r = d->write(MEMORY, w1, 0x00000000); + r = d->write(MEM, w1, 0x00000000); actual = d->view(0, 1)[0]; REQUIRE(expected == actual); - REQUIRE(r->status == WAIT); - delete r; + REQUIRE(r == WAIT); // FETCH CYCLE 1 r = d->write(FETCH, w2, 0x00000001); actual = d->view(0, 1)[0]; - REQUIRE(r->status == WAIT); - delete r; + REQUIRE(r == WAIT); - r = d->write(MEMORY, w1, 0x00000000); + r = d->write(MEM, w1, 0x00000000); actual = d->view(0, 1)[0]; REQUIRE(expected == actual); - REQUIRE(r->status == WAIT); - delete r; + REQUIRE(r == WAIT); // FETCH CYCLE 1 r = d->write(FETCH, w2, 0x00000001); actual = d->view(0, 1)[0]; - REQUIRE(r->status == WAIT); - delete r; + REQUIRE(r == WAIT); - r = d->write(MEMORY, w1, 0x00000000); - REQUIRE(r->status == OK); - delete r; + r = d->write(MEM, w1, 0x00000000); + REQUIRE(r == OK); // NOTE: servicing on the same clock cycle should probably not be allowed // FETCH CYCLE 1 r = d->write(FETCH, w2, 0x00000001); actual = d->view(0, 1)[0]; - REQUIRE(r->status == WAIT); - delete r; + REQUIRE(r == WAIT); expected.at(0) = w1; actual = d->view(0, 1)[0]; @@ -214,19 +194,16 @@ TEST_CASE( r = d->write(FETCH, w2, 0x00000001); actual = d->view(0, 1)[0]; REQUIRE(expected == actual); - REQUIRE(r->status == WAIT); - delete r; + REQUIRE(r == WAIT); r = d->write(FETCH, w2, 0x00000001); actual = d->view(0, 1)[0]; REQUIRE(expected == actual); - REQUIRE(r->status == WAIT); - delete r; + REQUIRE(r == WAIT); r = d->write(FETCH, w2, 0x00000001); actual = d->view(0, 1)[0]; - REQUIRE(r->status == OK); - delete r; + REQUIRE(r == OK); expected.at(1) = w2; actual = d->view(0, 1)[0]; @@ -235,9 +212,7 @@ TEST_CASE( delete d; } -TEST_CASE( - "Sidedoor bypasses delay", - "[dram]") +TEST_CASE("Sidedoor bypasses delay", "[dram]") { Dram *d = new Dram(1, 3); std::array expected = {0, 0, 0, 0}; @@ -248,24 +223,21 @@ TEST_CASE( signed int w2 = 0x55667788; // MEMORY CYCLE 1 - Response *r = d->write(MEMORY, w1, 0x00000000); + Response r = d->write(MEM, w1, 0x00000000); actual = d->view(0, 1)[0]; REQUIRE(expected == actual); - REQUIRE(r->status == WAIT); - delete r; + REQUIRE(r == WAIT); // MEMORY CYCLE 2 actual = d->view(0, 1)[0]; - r = d->write(MEMORY, w1, 0x00000000); + r = d->write(MEM, w1, 0x00000000); actual = d->view(0, 1)[0]; REQUIRE(expected == actual); - REQUIRE(r->status == WAIT); - delete r; + REQUIRE(r == WAIT); // SIDE CYCLE 1 r = d->write(SIDE, w2, 0x00000001); actual = d->view(0, 1)[0]; - REQUIRE(r->status == OK); - delete r; + REQUIRE(r == OK); expected.at(1) = w2; actual = d->view(0, 1)[0]; -- cgit v1.2.3