Jeffnye gh/fsl submodule (#175)

convert fusion support to sub-module fsl. remove the old fusion dir. Add a cmake var so fsl uses olympia/mavis when it is instantiated as a submodule. --------- Signed-off-by: jeffnye-gh <[email protected]> Co-authored-by: Jeff Nye <jeff@www.condorcomputing.com>
riscv-software-src · Jul 30, 2024 · 3313738 · 3313738
1 parent 56ecf7a
commit 3313738
Show file tree

Hide file tree

Showing 35 changed files with 22 additions and 7,641 deletions.
diff --git a/.gitmodules b/.gitmodules
@@ -3,4 +3,7 @@
 	url = [email protected]:sparcians/mavis
 [submodule "stf_lib"]
 	path = stf_lib
-	url = [email protected]:sparcians/stf_lib
+	url = https://github.com/sparcians/stf_lib.git
+[submodule "fsl"]
+	path = fsl
+	url = https://github.com/Condor-Performance-Modeling/fsl
diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -62,15 +62,19 @@ set(CMAKE_CXX_FLAGS_DEBUG     "-O0 -g")
 
 # Include directories
 include_directories (core mss sim)
-include_directories (SYSTEM fusion)
+include_directories (SYSTEM fsl)
 include_directories (SYSTEM mavis)
 include_directories (SYSTEM stf_lib)
 
 # Mavis, the Core, MSS, the simulator and Fusion
+
 add_subdirectory (mavis)
 add_subdirectory (core)
 add_subdirectory (mss)
-add_subdirectory (fusion)
+
+# Tell FSL to use the top mavis submodule, instead of fsl's submodule
+set(FSL_MAVIS_PATH "${CMAKE_CURRENT_SOURCE_DIR}/mavis")
+add_subdirectory (fsl)
 
 # Add STF library to the build
 add_subdirectory (${STF_LIB_BASE})

diff --git a/core/Decode.cpp b/core/Decode.cpp
@@ -2,7 +2,7 @@
 
 #include "Decode.hpp"
 #include "VectorUopGenerator.hpp"
-#include "fusion/FusionTypes.hpp"
+#include "fsl_api/FusionTypes.h"
 
 #include "sparta/events/StartupEvent.hpp"
 #include "sparta/utils/LogUtils.hpp"

diff --git a/core/Decode.hpp b/core/Decode.hpp
@@ -7,12 +7,12 @@
 #include "InstGroup.hpp"
 #include "MavisUnit.hpp"
 
-#include "fusion/FieldExtractor.hpp"
-#include "fusion/Fusion.hpp"
-#include "fusion/FusionGroup.hpp"
-#include "fusion/FusionTypes.hpp"
-#include "fusion/HCache.hpp"
-#include "fusion/MachineInfo.hpp"
+#include "fsl_api/FieldExtractor.h"
+#include "fsl_api/Fusion.h"
+#include "fsl_api/FusionGroup.h"
+#include "fsl_api/FusionTypes.h"
+#include "fsl_api/HCache.h"
+#include "fsl_api/MachineInfo.h"
 
 #include "sparta/ports/DataPort.hpp"
 #include "sparta/events/UniqueEvent.hpp"

diff --git a/core/FusionDecode.cpp b/core/FusionDecode.cpp
@@ -1,6 +1,7 @@
-// TODO: add Condor header - this is a new file
-// contact jeff at condor
-#include "fusion/FusionTypes.hpp"
+// Support methods for the fusion decoder
+// 2024.07.25 Jeff Nye
+
+#include "fsl_api/FusionTypes.h"
 #include "Decode.hpp"
 
 #include "sparta/events/StartupEvent.hpp"

diff --git a/fsl b/fsl
diff --git a/fusion/CMakeLists.txt b/fusion/CMakeLists.txt