Added symlink creation

Author: Ma-gi-cian

config/pegasus.yaml

@@ -0,0 +1,5 @@
+ilimit : 10000
+params: {top.core0.params.isa: "rv64imafdcbv_zicsr_zifencei_zbkx"}
+pegasus_loggers: []
+db_file: "pegasus-cosim-work.db" 
+snapshot_threshold: 1000

core/edm/CMakeLists.txt

@@ -17,17 +17,17 @@ if(DEFAULT_BACKEND STREQUAL "all" OR DEFAULT_BACKEND STREQUAL "pegasus" OR NOT D
 
     message(STATUS "EDM: Fetching Pegasus into ${CMAKE_SOURCE_DIR}/core/edm/adapters/Pegasus/pegasus")
 
-    set(PEGASUS_USE_PARENT_MAVIS    TRUE CACHE BOOL "" FORCE)
-    set(PEGASUS_USE_PARENT_STF_LIB  TRUE CACHE BOOL "" FORCE)
+    set(PEGASUS_USE_PARENT_MAVIS TRUE CACHE BOOL "" FORCE)
+    set(PEGASUS_USE_PARENT_STF_LIB TRUE CACHE BOOL "" FORCE)
     set(PEGASUS_USE_PARENT_SOFTFLOAT TRUE CACHE BOOL "" FORCE)
     set(FetchContent_Quiet FALSE)
 
     fetchcontent_declare(pegasus
         GIT_REPOSITORY https://github.com/sparcians/pegasus.git
-        GIT_TAG        f6231b7
+        GIT_TAG f6231b7
         USES_TERMINAL_DOWNLOAD TRUE
-        USES_TERMINAL_UPDATE   TRUE
-        SOURCE_DIR  ${CMAKE_SOURCE_DIR}/core/edm/adapters/Pegasus/pegasus
+        USES_TERMINAL_UPDATE TRUE
+        SOURCE_DIR ${CMAKE_SOURCE_DIR}/core/edm/adapters/Pegasus/pegasus
     )
 
     fetchcontent_getproperties(pegasus)
@@ -36,7 +36,6 @@ if(DEFAULT_BACKEND STREQUAL "all" OR DEFAULT_BACKEND STREQUAL "pegasus" OR NOT D
         message(STATUS "EDM: Pegasus source dir: ${pegasus_SOURCE_DIR}")
         include("${pegasus_SOURCE_DIR}/stf_lib/cmake/lto.cmake")
         include_directories(${CMAKE_BINARY_DIR}/_deps/bitset2-src)
-        # Set softfloat defines globally before Pegasus targets are created
         add_compile_definitions(
             SOFTFLOAT_FAST_INT64
             SOFTFLOAT_FAST_DIV32TO16
@@ -45,13 +44,16 @@ if(DEFAULT_BACKEND STREQUAL "all" OR DEFAULT_BACKEND STREQUAL "pegasus" OR NOT D
             SOFTFLOAT_BUILTIN_CLZ=1
             SOFTFLOAT_INTRINSIC_INT128=1
         )
-
         add_subdirectory(${pegasus_SOURCE_DIR} ${pegasus_BINARY_DIR})
     endif()
 
-        add_compile_options(-isystem ${CMAKE_BINARY_DIR}/mavis/softfloat_build-prefix/src/softfloat_build/source/include)
-        add_compile_options(-isystem ${CMAKE_BINARY_DIR}/mavis/softfloat_build-prefix/src/softfloat_build/source/RISCV)
+    add_compile_options(-isystem ${CMAKE_BINARY_DIR}/mavis/softfloat_build-prefix/src/softfloat_build/source/include)
+    add_compile_options(-isystem ${CMAKE_BINARY_DIR}/mavis/softfloat_build-prefix/src/softfloat_build/source/RISCV)
 
+    # Symlink pegasus sim artifacts into the build root
+    file(CREATE_LINK ${CMAKE_BINARY_DIR}/_deps/pegasus-build/sim/mavis_json ${CMAKE_BINARY_DIR}/mavis_json SYMBOLIC)
+    file(CREATE_LINK ${CMAKE_BINARY_DIR}/_deps/pegasus-build/sim/arch ${CMAKE_BINARY_DIR}/arch SYMBOLIC)
+    file(CREATE_LINK ${CMAKE_SOURCE_DIR}/config ${CMAKE_BINARY_DIR}/config SYMBOLIC)
 
     add_dependencies(pegasuslibs softfloat_build)
 
@@ -64,9 +66,9 @@ if(DEFAULT_BACKEND STREQUAL "all" OR DEFAULT_BACKEND STREQUAL "whisper" OR NOT D
 
     fetchcontent_declare(whisper
         GIT_REPOSITORY https://github.com/tenstorrent/whisper.git
-        GIT_TAG        master
-        GIT_SHALLOW    TRUE
-        GIT_PROGRESS  TRUE
+        GIT_TAG master
+        GIT_SHALLOW TRUE
+        GIT_PROGRESS TRUE
     )
     fetchcontent_makeavailable(whisper)
 
@@ -87,11 +89,17 @@ if(DEFAULT_BACKEND STREQUAL "all" OR DEFAULT_BACKEND STREQUAL "pegasus" OR NOT D
         ${PEGASUS_SOURCE_DIR}/include
     )
     target_link_libraries(edm PUBLIC pegasuslibs pegasuscosimlib)
-    target_compile_definitions(edm PUBLIC PEGASUS_AVAILABLE)
+    target_compile_definitions(edm PUBLIC
+        PEGASUS_AVAILABLE
+        DEFAULT_PEGASUS
+    )
 endif()
 
 ## whisper
 if(DEFAULT_BACKEND STREQUAL "all" OR DEFAULT_BACKEND STREQUAL "whisper" OR NOT DEFAULT_BACKEND)
     target_link_libraries(edm PUBLIC whisper)
-    target_compile_definitions(edm PUBLIC WHISPER_AVAILABLE)
+    target_compile_definitions(edm PUBLIC
+        WHISPER_AVAILABLE
+        DEFAULT_WHISPER
+    )
 endif()

core/edm/EDMFactory.cpp

@@ -1,7 +1,10 @@
 #include <sparta/utils/SpartaAssert.hpp>
 
 #include "EDMFactory.hpp"
+
+#ifdef PEGASUS_AVAILABLE
 #include "Pegasus.hpp"
+#endif
 
 namespace olympia::edm
 {

sim/OlympiaSim.cpp

@@ -26,7 +26,7 @@ OlympiaSim::OlympiaSim(sparta::Scheduler & scheduler,
     show_factories_(show_factories)
 {
     // Set up the CPU Resource Factory to be available through ResourceTreeNode
-#ifdef EDM_ENABLED
+#ifdef PEGASUS_AVAILABLE
     sparta::SleeperThread::disableForever();
 #endif
     getResourceSet()->addResourceFactory<olympia::CPUFactory>();