From ba5a6af05c545045f3431434d2347cf95e97ca0b Mon Sep 17 00:00:00 2001
From: Howard Mao <zhehao.mao@gmail.com>
Date: Mon, 2 Nov 2015 22:46:52 -0800
Subject: [PATCH] correctly stripe data across memory channels in simulation

---
 csrc/emulator.cc  | 11 +++++++----
 csrc/mm.cc        | 17 ++++++++++++-----
 csrc/mm.h         |  2 +-
 csrc/vcs_main.cc  | 10 +++++++---
 emulator/Makefile |  1 +
 junctions         |  2 +-
 6 files changed, 29 insertions(+), 14 deletions(-)

diff --git a/csrc/emulator.cc b/csrc/emulator.cc
index 97cc50dd..9efac16e 100644
--- a/csrc/emulator.cc
+++ b/csrc/emulator.cc
@@ -80,7 +80,7 @@ int main(int argc, char** argv)
   for (int i = 0; i < N_MEM_CHANNELS; i++) {
     mm[i] = dramsim2 ? (mm_t*)(new mm_dramsim2_t) : (mm_t*)(new mm_magic_t);
     try {
-      mm[i]->init(memsz_mb*1024*1024, mem_width, LINE_SIZE);
+      mm[i]->init(memsz_mb*1024*1024 / N_MEM_CHANNELS, mem_width, LINE_SIZE);
     } catch (const std::bad_alloc& e) {
       fprintf(stderr,
           "Failed to allocate %ld bytes (%ld MiB) of memory\n"
@@ -88,11 +88,14 @@ int main(int argc, char** argv)
               memsz_mb*1024*1024, memsz_mb);
       exit(-1);
     }
-
-    if (loadmem)
-      load_mem(mm[i]->get_data(), loadmem);
   }
 
+  if (loadmem) {
+    void *mems[N_MEM_CHANNELS];
+    for (int i = 0; i < N_MEM_CHANNELS; i++)
+      mems[i] = mm[i]->get_data();
+    load_mem(mems, loadmem, N_MEM_CHANNELS);
+  }
 
   // Instantiate HTIF
   htif = new htif_emulator_t(memsz_mb,
diff --git a/csrc/mm.cc b/csrc/mm.cc
index ab1117df..e5a61ffb 100644
--- a/csrc/mm.cc
+++ b/csrc/mm.cc
@@ -117,9 +117,10 @@ void mm_magic_t::tick(
   cycle++;
 }
 
-void load_mem(void* mem, const char* fn)
+void load_mem(void** mems, const char* fn, int nchannels)
 {
-  char* m = (char*)mem;
+  char* m;
+  ssize_t start = 0;
   std::ifstream in(fn);
   if (!in)
   {
@@ -131,8 +132,14 @@ void load_mem(void* mem, const char* fn)
   while (std::getline(in, line))
   {
     #define parse_nibble(c) ((c) >= 'a' ? (c)-'a'+10 : (c)-'0')
-    for (ssize_t i = line.length()-2, j = 0; i >= 0; i -= 2, j++)
-      m[j] = (parse_nibble(line[i]) << 4) | parse_nibble(line[i+1]);
-    m += line.length()/2;
+    for (ssize_t i = line.length()-2, j = 0; i >= 0; i -= 2, j++) {
+      char data = (parse_nibble(line[i]) << 4) | parse_nibble(line[i+1]);
+      ssize_t addr = start + j;
+      int channel = (addr / LINE_SIZE) % nchannels;
+      m = (char *) mems[channel];
+      addr = (addr / LINE_SIZE / nchannels) * LINE_SIZE + (addr % LINE_SIZE);
+      m[addr] = data;
+    }
+    start += line.length()/2;
   }
 }
diff --git a/csrc/mm.h b/csrc/mm.h
index 5e647c99..d7b080e6 100644
--- a/csrc/mm.h
+++ b/csrc/mm.h
@@ -148,5 +148,5 @@ class mm_magic_t : public mm_t
   uint64_t cycle;
 };
 
-void load_mem(void* mem, const char* fn);
+void load_mem(void** mems, const char* fn, int channel);
 #endif
diff --git a/csrc/vcs_main.cc b/csrc/vcs_main.cc
index 32fdd1b9..3f8ce355 100644
--- a/csrc/vcs_main.cc
+++ b/csrc/vcs_main.cc
@@ -159,10 +159,14 @@ void htif_init(
 
   for (int i=0; i<mem_channels; i++) {
     mm[i] = dramsim ? (mm_t*)(new mm_dramsim2_t) : (mm_t*)(new mm_magic_t);
-    mm[i]->init(MEM_SIZE, mw/8, LINE_SIZE);
+    mm[i]->init(MEM_SIZE / mem_channels, mw/8, LINE_SIZE);
+  }
 
-    if (loadmem)
-      load_mem(mm[i]->get_data(), loadmem);
+  if (loadmem) {
+    void *mems[mem_channels];
+    for (int i = 0; i < mem_channels; i++)
+      mems[i] = mm[i]->get_data();
+    load_mem(mems, loadmem, mem_channels);
   }
 
   vec32* w = vc_4stVectorRef(htif_width);
diff --git a/emulator/Makefile b/emulator/Makefile
index c5601575..8007087d 100644
--- a/emulator/Makefile
+++ b/emulator/Makefile
@@ -55,6 +55,7 @@ $(generated_dir_debug)/consts.$(CONFIG).h: $(generated_dir_debug)/$(MODEL).$(CON
 	echo "#ifndef __CONST_H__" > $@
 	echo "#define __CONST_H__" >> $@
 	sed -r 's/\(([A-Za-z0-9_]+),([A-Za-z0-9_]+)\)/#define \1 \2/' $(patsubst %.h,%.prm,$<) >> $@
+	echo "#define TBFRAG \"$(MODEL).$(CONFIG).tb.cpp\"" >> $@
 	echo "#endif // __CONST_H__" >> $@
 
 emu = emulator-$(MODEL)-$(CONFIG)
diff --git a/junctions b/junctions
index ec5036a6..f9cc0a33 160000
--- a/junctions
+++ b/junctions
@@ -1 +1 @@
-Subproject commit ec5036a6caa9a53c0fcee17dd3b001ba054ac549
+Subproject commit f9cc0a33cedb65e772c397473f792c513d8cc81d