Reorganized Core Directory (#239)

Added several subdirectories to the `core` directory to created new
libraries for each "unit" to make the repo easier to navigate.

Author: kathlenemagnus

CMakeLists.txt

@@ -66,11 +66,8 @@ include_directories (SYSTEM fsl)
 include_directories (SYSTEM mavis)
 include_directories (SYSTEM stf_lib)
 
-# Mavis, the Core, MSS, the simulator and Fusion
-
+# Mavis
 add_subdirectory (mavis)
-add_subdirectory (core)
-add_subdirectory (mss)
 
 # Tell FSL to use the top mavis submodule, instead of fsl's submodule
 set(FSL_MAVIS_PATH "${CMAKE_CURRENT_SOURCE_DIR}/mavis")
@@ -79,6 +76,10 @@ add_subdirectory (fsl)
 # Add STF library to the build
 add_subdirectory (${STF_LIB_BASE})
 
+# The Core and MSS
+add_subdirectory (core)
+add_subdirectory (mss)
+
 # Add testing, but do not build as part of the 'all' target
 add_subdirectory (test EXCLUDE_FROM_ALL)
 
@@ -87,7 +88,7 @@ add_executable(olympia
   sim/OlympiaSim.cpp
   sim/main.cpp
   )
-target_link_libraries (olympia core mss SPARTA::sparta mavis ${STF_LINK_LIBS})
+target_link_libraries (olympia core mss SPARTA::sparta ${STF_LINK_LIBS})
 if (CMAKE_BUILD_TYPE MATCHES "^[Rr]elease")
   target_compile_options (core    PUBLIC -flto)
   target_compile_options (mss     PUBLIC -flto)

core/CMakeLists.txt

@@ -1,31 +1,32 @@
 project (core)
 add_library(core
-  FusionDecode.cpp
   Core.cpp
-  SimpleBranchPred.cpp
-  ICache.cpp
-  Fetch.cpp
-  Decode.cpp
-  VectorUopGenerator.cpp
-  Rename.cpp
-  Dispatch.cpp
-  Dispatcher.cpp
-  Execute.cpp
-  ExecutePipe.cpp
-  Inst.cpp
-  InstArchInfo.cpp
-  InstGroup.cpp
-  InstGenerator.cpp
-  IssueQueue.cpp
   ROB.cpp
-  LSU.cpp
   MMU.cpp
-  DCache.cpp
-  MavisUnit.cpp
   Preloader.cpp
   CPU.cpp
   CPUFactory.cpp
   CPUTopology.cpp
 )
+
+add_library(instgen
+  Inst.cpp
+  InstArchInfo.cpp
+  InstGroup.cpp
+  InstGenerator.cpp
+)
+
+target_link_libraries(instgen stf zstd mavis)
+
 get_property(SPARTA_INCLUDE_PROP TARGET SPARTA::sparta PROPERTY INTERFACE_INCLUDE_DIRECTORIES)
 target_include_directories(core SYSTEM PRIVATE ${SPARTA_INCLUDE_PROP})
+
+add_subdirectory(fetch)
+add_subdirectory(decode)
+add_subdirectory(rename)
+add_subdirectory(dispatch)
+add_subdirectory(execute)
+add_subdirectory(vector)
+add_subdirectory(lsu)
+
+target_link_libraries(core fetch decode rename dispatch execute vector lsu instgen)

core/CPUFactories.hpp

@@ -5,14 +5,14 @@
 
 #include "sparta/simulation/ResourceFactory.hpp"
 #include "Core.hpp"
-#include "ICache.hpp"
-#include "Fetch.hpp"
-#include "Decode.hpp"
-#include "VectorUopGenerator.hpp"
-#include "Rename.hpp"
-#include "Dispatch.hpp"
-#include "Execute.hpp"
-#include "LSU.hpp"
+#include "fetch/ICache.hpp"
+#include "fetch/Fetch.hpp"
+#include "decode/Decode.hpp"
+#include "vector/VectorUopGenerator.hpp"
+#include "rename/Rename.hpp"
+#include "dispatch/Dispatch.hpp"
+#include "execute/Execute.hpp"
+#include "lsu/LSU.hpp"
 #include "MMU.hpp"
 #include "SimpleTLB.hpp"
 #include "BIU.hpp"
@@ -21,8 +21,8 @@
 #include "ROB.hpp"
 #include "FlushManager.hpp"
 #include "Preloader.hpp"
-#include "MavisUnit.hpp"
-#include "IssueQueue.hpp"
+#include "decode/MavisUnit.hpp"
+#include "execute/IssueQueue.hpp"
 
 namespace olympia{
 

core/Inst.hpp

@@ -15,7 +15,7 @@
 
 #include "InstArchInfo.hpp"
 #include "CoreTypes.hpp"
-#include "VectorConfig.hpp"
+#include "vector/VectorConfig.hpp"
 #include "MiscUtils.hpp"
 
 #include <cstdint>

core/InstGenerator.hpp

@@ -11,7 +11,7 @@
 #include <memory>
 
 #include "Inst.hpp"
-#include "MavisUnit.hpp"
+#include "decode/MavisUnit.hpp"
 #include "sparta/utils/SpartaAssert.hpp"
 
 #include "stf-inc/stf_inst_reader.hpp"

core/MMU.hpp

@@ -79,4 +79,4 @@ namespace olympia {
                 "Number of TLB misses", sparta::Counter::COUNT_NORMAL
         };
     };
-}
+}

core/decode/CMakeLists.txt

@@ -0,0 +1,6 @@
+add_library(decode
+  FusionDecode.cpp
+  Decode.cpp
+  MavisUnit.cpp
+)
+target_link_libraries(decode instgen)

core/Decode.cpp renamed to core/decode/Decode.cpp

@@ -1,7 +1,7 @@
 // <Decode.cpp> -*- C++ -*-
 
-#include "Decode.hpp"
-#include "VectorUopGenerator.hpp"
+#include "decode/Decode.hpp"
+#include "vector/VectorUopGenerator.hpp"
 #include "fsl_api/FusionTypes.h"
 
 #include "sparta/events/StartupEvent.hpp"

core/Decode.hpp renamed to core/decode/Decode.hpp

@@ -5,7 +5,7 @@
 #include "CoreTypes.hpp"
 #include "FlushManager.hpp"
 #include "InstGroup.hpp"
-#include "MavisUnit.hpp"
+#include "decode/MavisUnit.hpp"
 
 #include "fsl_api/FieldExtractor.h"
 #include "fsl_api/Fusion.h"