Moved more files into Simple

Pitt-JonesLab · Jan 28, 2024 · 03e97a9 · 03e97a9
1 parent c5bc28f
commit 03e97a9
Show file tree

Hide file tree

Showing 22 changed files with 25 additions and 49 deletions.
diff --git a/src/Event/EventQueue.h b/src/Event/EventQueue.h
diff --git a/src/Memory/Event/CommandEventQueue.h b/src/Memory/Event/CommandEventQueue.h
@@ -1,14 +1,11 @@
 #pragma once
 
-#include "Event/EventQueue.h"
-
-#include <queue>
 #include <functional>
+#include <queue>
 
 namespace NVM::Memory {
 
-template <typename Receiver>
-class CommandEventQueue : public NVM::Event::EventQueue {
+template<typename Receiver> class CommandEventQueue {
     public:
     using Cmd = std::function<bool(Receiver&)>;
 
@@ -24,9 +21,7 @@ class CommandEventQueue : public NVM::Event::EventQueue {
         return false;
     }
 
-    void enqueue(Cmd cmd) {
-        commands.push(cmd);
-    }
+    void enqueue(Cmd cmd) { commands.push(cmd); }
 
     bool isEmpty() const { return commands.empty(); }
 
@@ -35,4 +30,4 @@ class CommandEventQueue : public NVM::Event::EventQueue {
     std::queue<Cmd> commands;
 };
 
-}
+} // namespace NVM::Memory
diff --git a/src/Memory/MemoryFactory.cpp b/src/Memory/MemoryFactory.cpp
@@ -1,13 +1,13 @@
 #include "Memory/MemoryFactory.h"
 
-#include "Memory/ConfigParser.h"
 #include "MemoryTypes/Simple/Bank/SimpleBank.h"
 #include "MemoryTypes/Simple/Interconnect/SimpleInterconnect.h"
 #include "MemoryTypes/Simple/MemoryController/SimpleController.h"
 #include "MemoryTypes/Simple/MemorySystem/SimpleSystem.h"
 #include "MemoryTypes/Simple/Rank/SimpleRank.h"
 #include "MemoryTypes/Simple/SubArray/SimpleSubArray.h"
 #include "MemoryTypes/Simple/Timing/Timer/ConfigurableTimer.h"
+#include "Utils/ConfigParser.h"
 
 using namespace NVM::Memory;
 

diff --git a/src/MemoryTypes/CMakeLists.txt b/src/MemoryTypes/CMakeLists.txt
@@ -1,11 +1 @@
-set(MEMORY_SOURCES
-    MemoryController.cpp
-    Interconnect.cpp
-    Rank.cpp 
-    Bank.cpp )
-
-add_subdirectory(Simple)
-
-add_library(RTSim_MemoryType ${MEMORY_SOURCES})
-target_include_directories(RTSim_MemoryType PUBLIC ${RTSIM_DIR}/include PRIVATE ${RTSIM_DIR}/src)
-target_link_libraries(RTSim_MemoryType PUBLIC RTSim_MemoryType_Simple RTSim_Logging RTSim_Modeling RTSim_Scheduling RTSim_Parsing RTSim_Timing RTSim_Stats)
+add_subdirectory(Simple)
diff --git a/src/MemoryTypes/Bank.cpp → src/MemoryTypes/Simple/Bank.cpp b/src/MemoryTypes/Bank.cpp → src/MemoryTypes/Simple/Bank.cpp
@@ -1,4 +1,4 @@
-#include "MemoryTypes/Bank.h"
+#include "MemoryTypes/Simple/Bank.h"
 
 using namespace NVM::Memory;
 

diff --git a/include/MemoryTypes/Bank.h → src/MemoryTypes/Simple/Bank.h b/include/MemoryTypes/Bank.h → src/MemoryTypes/Simple/Bank.h
@@ -1,7 +1,7 @@
 #pragma once
 
 #include "Command.h"
-#include "MemoryTypes/SubArray.h"
+#include "MemoryTypes/Simple/SubArray.h"
 
 #include <memory>
 

diff --git a/src/MemoryTypes/Simple/Bank/SimpleBank.h b/src/MemoryTypes/Simple/Bank/SimpleBank.h
@@ -1,6 +1,6 @@
 #pragma once
 
-#include "MemoryTypes/Bank.h"
+#include "MemoryTypes/Simple/Bank.h"
 
 namespace NVM::Memory {
 

diff --git a/src/MemoryTypes/Simple/CMakeLists.txt b/src/MemoryTypes/Simple/CMakeLists.txt
@@ -4,6 +4,10 @@ add_subdirectory(Scheduling)
 add_subdirectory(Timing)
 
 set(MEMORY_SOURCES
+    MemoryController.cpp
+    Interconnect.cpp
+    Rank.cpp 
+    Bank.cpp 
     FaultModel.cpp
     Bank/SimpleBank.cpp
     Interconnect/SimpleInterconnect.cpp
@@ -14,4 +18,4 @@ set(MEMORY_SOURCES
 
 add_library(RTSim_MemoryType_Simple ${MEMORY_SOURCES})
 target_include_directories(RTSim_MemoryType_Simple PUBLIC ${RTSIM_DIR}/include PRIVATE ${RTSIM_DIR}/src)
-target_link_libraries(RTSim_MemoryType_Simple PUBLIC RTSim_MemoryType RTSim_Logging RTSim_Modeling RTSim_Scheduling RTSim_Parsing RTSim_Timing RTSim_Stats)
+target_link_libraries(RTSim_MemoryType_Simple PUBLIC RTSim_Logging RTSim_Modeling RTSim_Scheduling RTSim_Parsing RTSim_Timing RTSim_Stats)
diff --git a/include/MemoryTypes/Simple/FaultModel.h → src/MemoryTypes/Simple/FaultModel.h b/include/MemoryTypes/Simple/FaultModel.h → src/MemoryTypes/Simple/FaultModel.h
diff --git a/src/MemoryTypes/Interconnect.cpp → src/MemoryTypes/Simple/Interconnect.cpp b/src/MemoryTypes/Interconnect.cpp → src/MemoryTypes/Simple/Interconnect.cpp
@@ -1,4 +1,4 @@
-#include "MemoryTypes/Interconnect.h"
+#include "MemoryTypes/Simple/Interconnect.h"
 
 using namespace NVM::Memory;
 

diff --git a/include/MemoryTypes/Interconnect.h → src/MemoryTypes/Simple/Interconnect.h b/include/MemoryTypes/Interconnect.h → src/MemoryTypes/Simple/Interconnect.h
@@ -1,6 +1,6 @@
 #pragma once
 
-#include "MemoryTypes/Rank.h"
+#include "MemoryTypes/Simple/Rank.h"
 
 #include <memory>
 

diff --git a/src/MemoryTypes/Simple/Interconnect/SimpleInterconnect.h b/src/MemoryTypes/Simple/Interconnect/SimpleInterconnect.h
@@ -1,6 +1,6 @@
 #pragma once
 
-#include "MemoryTypes/Interconnect.h"
+#include "MemoryTypes/Simple/Interconnect.h"
 
 namespace NVM::Memory {
 

diff --git a/src/MemoryTypes/MemoryController.cpp → src/MemoryTypes/Simple/MemoryController.cpp b/src/MemoryTypes/MemoryController.cpp → src/MemoryTypes/Simple/MemoryController.cpp
@@ -1,4 +1,4 @@
-#include "MemoryTypes/MemoryController.h"
+#include "MemoryTypes/Simple/MemoryController.h"
 
 using namespace NVM::Memory;
 

diff --git a/include/MemoryTypes/MemoryController.h → src/MemoryTypes/Simple/MemoryController.h b/include/MemoryTypes/MemoryController.h → src/MemoryTypes/Simple/MemoryController.h
@@ -1,6 +1,6 @@
 #pragma once
 
-#include "MemoryTypes/Interconnect.h"
+#include "MemoryTypes/Simple/Interconnect.h"
 
 #include <memory>
 

diff --git a/src/MemoryTypes/Simple/MemoryController/SimpleController.h b/src/MemoryTypes/Simple/MemoryController/SimpleController.h
@@ -1,6 +1,6 @@
 #pragma once
 
-#include "MemoryTypes/MemoryController.h"
+#include "MemoryTypes/Simple/MemoryController.h"
 #include "MemoryTypes/Simple/Modeling/System/SimpleSystem.h"
 #include "MemoryTypes/Simple/Parsing/Parser/SimpleParser.h"
 #include "MemoryTypes/Simple/Scheduling/Scheduler/RBScheduler.h"

diff --git a/src/MemoryTypes/Simple/MemorySystem/SimpleSystem.h b/src/MemoryTypes/Simple/MemorySystem/SimpleSystem.h
@@ -1,7 +1,7 @@
 #pragma once
 
 #include "Memory/MemorySystem.h"
-#include "MemoryTypes/MemoryController.h"
+#include "MemoryTypes/Simple/MemoryController.h"
 
 #include <memory>
 #include <vector>

diff --git a/src/MemoryTypes/Rank.cpp → src/MemoryTypes/Simple/Rank.cpp b/src/MemoryTypes/Rank.cpp → src/MemoryTypes/Simple/Rank.cpp
@@ -1,4 +1,4 @@
-#include "MemoryTypes/Rank.h"
+#include "MemoryTypes/Simple/Rank.h"
 
 using namespace NVM::Memory;
 

diff --git a/include/MemoryTypes/Rank.h → src/MemoryTypes/Simple/Rank.h b/include/MemoryTypes/Rank.h → src/MemoryTypes/Simple/Rank.h
@@ -1,7 +1,7 @@
 #pragma once
 
 #include "Command.h"
-#include "MemoryTypes/Bank.h"
+#include "MemoryTypes/Simple/Bank.h"
 
 #include <memory>
 

diff --git a/src/MemoryTypes/Simple/Rank/SimpleRank.h b/src/MemoryTypes/Simple/Rank/SimpleRank.h
@@ -1,6 +1,6 @@
 #pragma once
 
-#include "MemoryTypes/Rank.h"
+#include "MemoryTypes/Simple/Rank.h"
 
 namespace NVM::Memory {
 

diff --git a/include/MemoryTypes/SubArray.h → src/MemoryTypes/Simple/SubArray.h b/include/MemoryTypes/SubArray.h → src/MemoryTypes/Simple/SubArray.h
diff --git a/src/MemoryTypes/Simple/SubArray/SimpleSubArray.h b/src/MemoryTypes/Simple/SubArray/SimpleSubArray.h
@@ -2,7 +2,7 @@
 
 #include "Memory/Timing/CommandTimer.h"
 #include "MemoryTypes/Simple/FaultModel.h"
-#include "MemoryTypes/SubArray.h"
+#include "MemoryTypes/Simple/SubArray.h"
 
 #include <memory>
 

diff --git a/src/Memory/ConfigParser.h → src/Utils/ConfigParser.h b/src/Memory/ConfigParser.h → src/Utils/ConfigParser.h