driver refactoring

sim/common/mem.cpp

@@ -168,11 +168,12 @@ void MemoryUnit::tlbRm(uint64_t va) {
 
 ///////////////////////////////////////////////////////////////////////////////
 
-RAM::RAM(uint32_t num_pages, uint32_t page_size) 
-  : page_bits_(log2ceil(page_size)) {    
-    assert(ispow2(page_size));
-  mem_.resize(num_pages, NULL);
-  size_ = uint64_t(mem_.size()) << page_bits_;
+RAM::RAM(uint32_t page_size) 
+  : size_(0)
+  , page_bits_(log2ceil(page_size))
+  , last_page_(nullptr)
+  , last_page_index_(0) {    
+   assert(ispow2(page_size));
 }
 
 RAM::~RAM() {
@@ -180,31 +181,41 @@ RAM::~RAM() {
 }
 
 void RAM::clear() {
-  for (auto& page : mem_) {
-    delete[] page;
-    page = NULL;
+  for (auto& page : pages_) {
+    delete[] page.second;
   }
 }
 
 uint64_t RAM::size() const {
-  return size_;
+  return uint64_t(pages_.size()) << page_bits_;
 }
 
-uint8_t *RAM::get(uint32_t address) const {
-  uint32_t page_size   = 1 << page_bits_;
-  uint32_t page_index  = address >> page_bits_;
-  uint32_t byte_offset = address & ((1 << page_bits_) - 1);
+uint8_t *RAM::get(uint64_t address) const {
+  uint32_t page_size   = 1 << page_bits_;  
+  uint32_t page_offset = address & (page_size - 1);
+  uint64_t page_index  = address >> page_bits_;
 
-  auto &page = mem_.at(page_index);
-  if (page == NULL) {
-    uint8_t *ptr = new uint8_t[page_size];
-    // set uninitialized data to "baadf00d"
-    for (uint32_t i = 0; i < page_size; ++i) {
-      ptr[i] = (0xbaadf00d >> ((i & 0x3) * 8)) & 0xff;
+  uint8_t* page;
+  if (last_page_ && last_page_index_ == page_index) {
+    page = last_page_;
+  } else {
+    auto it = pages_.find(page_index);
+    if (it != pages_.end()) {
+      page = it->second;
+    } else {
+      uint8_t *ptr = new uint8_t[page_size];
+      // set uninitialized data to "baadf00d"
+      for (uint32_t i = 0; i < page_size; ++i) {
+        ptr[i] = (0xbaadf00d >> ((i & 0x3) * 8)) & 0xff;
+      }
+      pages_.emplace(page_index, ptr);
+      page = ptr;
     }
-    page = ptr;
+    last_page_ = page;
+    last_page_index_ = page_index;
   }
-  return page + byte_offset;
+
+  return page + page_offset;
 }
 
 void RAM::read(void *data, uint64_t addr, uint64_t size) {

sim/common/mem.h

@@ -130,13 +130,13 @@ private:
 class RAM : public MemDevice {
 public:
   
-  RAM(uint32_t num_pages, uint32_t page_size);
-
+  RAM(uint32_t page_size);
   ~RAM();
 
   void clear();
 
   uint64_t size() const override;
+
   void read(void *data, uint64_t addr, uint64_t size) override;  
   void write(const void *data, uint64_t addr, uint64_t size) override;
 
@@ -153,11 +153,13 @@ public:
 
 private:
 
-  uint8_t *get(uint32_t address) const;
+  uint8_t *get(uint64_t address) const;
 
-  mutable std::vector<uint8_t*> mem_;
-  uint32_t page_bits_;
   uint64_t size_;
+  uint32_t page_bits_;  
+  mutable std::unordered_map<uint64_t, uint8_t*> pages_;
+  mutable uint8_t* last_page_;
+  mutable uint64_t last_page_index_;
 };
 
 } // namespace vortex

sim/common/simobject.h

@@ -282,6 +282,10 @@ public:
     return true;
   }
 
+  void flush() {
+    instance().clear();
+  }
+
   void finalize() {
     instance().clear();
   }

sim/common/util.h

@@ -75,11 +75,6 @@ inline uint64_t bit_getw(uint64_t bits, uint32_t start, uint32_t end) {
     return (bits << shift) >> (shift + start);
 }
 
-inline uint64_t aligned_size(uint64_t size, uint32_t alignment) {        
-    assert(0 == (alignment & (alignment - 1)));
-    return (size + alignment - 1) & ~(alignment - 1);
-}
-
 // Apply integer sign extension
 inline uint32_t sext32(uint32_t word, uint32_t width) {
   assert(width > 1);

sim/rtlsim/main.cpp

@@ -7,6 +7,8 @@
 #include <mem.h>
 #include "simulator.h"
 
+#define RAM_PAGE_SIZE 4096
+
 using namespace vortex;
 
 static void show_usage() {
@@ -49,7 +51,7 @@ int main(int argc, char **argv) {
 	for (auto program : programs) {
 		std::cout << "Running " << program << "..." << std::endl;
 
-		vortex::RAM ram((1<<12), (1<<20));
+		vortex::RAM ram(RAM_PAGE_SIZE);
 		vortex::Simulator simulator;
 		simulator.attach_ram(&ram);
 

sim/rtlsim/simulator.cpp

@@ -477,7 +477,7 @@ void Simulator::eval_mem_bus(bool clk) {
         uint8_t* data = (uint8_t*)(vl_obj_->device->mem_req_data);
         if (base_addr >= IO_COUT_ADDR 
          && base_addr <= (IO_COUT_ADDR + IO_COUT_SIZE - 1)) {          
-          for (int i = 0; i < MEM_BLOCK_SIZE; i++) {
+          for (int i = 0; i < IO_COUT_SIZE; i++) {
             if ((byteen >> i) & 0x1) {            
               auto& ss_buf = print_bufs_[i];
               char c = data[i];