merge main

.github/workflows/main.yml

@@ -310,7 +310,7 @@ jobs:
             source /opt/rh/devtoolset-11/enable  
             cd work && make clean
             run_test=`cat TEST_ON`
-            make release test/batch CPU_CORES=2 $run_test 
+            make release test/batch CPU_CORES=2 $run_test MONACO_EDITOR=0
 
     - name: Regression
       if: matrix.mode == 'regression'
@@ -323,8 +323,8 @@ jobs:
             source /opt/rh/devtoolset-11/enable        
             cd work && make clean
             run_test=`cat TEST_ON`
-            make regression CPU_CORES=2 $run_test 
-            make release CPU_CORES=2 $run_test ADDITIONAL_CMAKE_OPTIONS=-DBUILD_YOSYS_PLUGINS=ON test/batch
+            make regression CPU_CORES=2 $run_test MONACO_EDITOR=0
+            make release CPU_CORES=2 $run_test ADDITIONAL_CMAKE_OPTIONS=-DBUILD_YOSYS_PLUGINS=ON test/batch MONACO_EDITOR=0
                         
 
     - name: Production Build
@@ -345,6 +345,7 @@ jobs:
             d_test=$(echo "$p_device" | cut -d ',' -f 1)
             mkdir /opt/instl_dir
             make install CPU_CORES=2 $run_test PRODUCTION_BUILD=1 PREFIX=/opt/instl_dir PRODUCTION_DEVICES=$p_device STICK_RELEASE_VERSION=$r_d
+            make install MONACO_EDITOR=0 CPU_CORES=2 $run_test PRODUCTION_BUILD=1 PREFIX=/opt/instl_dir PRODUCTION_DEVICES=$p_device STICK_RELEASE_VERSION=$r_d
             #export LM_LICENSE_FILE=/work/.github/bin/.raptor.lic
             ./Raptor_Tools/OpenLM/licensecc/install/bin/lccgen license issue -p projects/Raptor -f Raptor,$d_test,DE -o build/bin/raptor.lic
             cat build/bin/raptor.lic

CMakeLists.txt

@@ -2,7 +2,6 @@
 
 # Copyright 2021-2024 The Rapid Silicon team
 
-
 cmake_minimum_required(VERSION 3.15)
 
 option(ENABLE_VERIFIC "Enable Verific frontend" OFF)
@@ -202,7 +201,7 @@ add_subdirectory(IP_Catalog)
 # Raptor version
 set(VERSION_MAJOR 1)
 set(VERSION_MINOR 0)
-set(VERSION_PATCH 19)
+set(VERSION_PATCH 22)
 
 execute_process(COMMAND git config --global --add safe.directory ${CMAKE_CURRENT_SOURCE_DIR}
   COMMAND git rev-parse --short HEAD
@@ -627,14 +626,23 @@ install(
         ${CMAKE_CURRENT_BINARY_DIR}/FOEDAG_rs/FOEDAG/include/tclPlatDecls.h
   DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}/raptor/include)
 
-install(
+if(MONACO_EDITOR)  
+  install(
+    FILES ${CMAKE_CURRENT_BINARY_DIR}/bin/raptor.exeMonacoEmbed
+    DESTINATION ${CMAKE_INSTALL_BINDIR}
+    PERMISSIONS
+    OWNER_READ OWNER_EXECUTE OWNER_WRITE
+    GROUP_READ GROUP_EXECUTE
+    WORLD_READ WORLD_EXECUTE)
+else()
+  install(
     FILES ${CMAKE_CURRENT_BINARY_DIR}/bin/raptor.exe
     DESTINATION ${CMAKE_INSTALL_BINDIR}
     PERMISSIONS
     OWNER_READ OWNER_EXECUTE OWNER_WRITE
     GROUP_READ GROUP_EXECUTE
     WORLD_READ WORLD_EXECUTE)
-
+endif()
 install(
     DIRECTORY etc/ DESTINATION  ${CMAKE_INSTALL_DATAROOTDIR}/raptor/etc/)
 install(
@@ -884,11 +892,19 @@ else ()
       COMMAND ${CMAKE_COMMAND} -E copy
         ${CMAKE_CURRENT_BINARY_DIR}/Backend/stars/stars
         ${CMAKE_CURRENT_BINARY_DIR}/bin/)
-  add_custom_command(TARGET raptor-bin POST_BUILD
-        COMMAND echo "rename raptor binary as raptor.exe"
-        COMMAND ${CMAKE_COMMAND} -E rename
-          ${CMAKE_CURRENT_BINARY_DIR}/bin/raptor
-          ${CMAKE_CURRENT_BINARY_DIR}/bin/raptor.exe)
+  if(MONACO_EDITOR)      
+    add_custom_command(TARGET raptor-bin POST_BUILD
+          COMMAND echo "rename raptor binary as raptor.exeMonacoEmbed"
+          COMMAND ${CMAKE_COMMAND} -E rename
+            ${CMAKE_CURRENT_BINARY_DIR}/bin/raptor
+            ${CMAKE_CURRENT_BINARY_DIR}/bin/raptor.exeMonacoEmbed)
+  else()
+    add_custom_command(TARGET raptor-bin POST_BUILD
+    COMMAND echo "rename raptor binary as raptor.exe"
+    COMMAND ${CMAKE_COMMAND} -E rename
+      ${CMAKE_CURRENT_BINARY_DIR}/bin/raptor
+      ${CMAKE_CURRENT_BINARY_DIR}/bin/raptor.exe)
+  endif()
   add_custom_command(TARGET raptor-bin POST_BUILD
         COMMAND echo "copy to_be_raptor_lnx as raptor"
         COMMAND ${CMAKE_COMMAND} -E copy

src/to_be_raptor_linx

@@ -12,10 +12,34 @@ RAPTOR_EXE_DEBUG=1
 [ -f $RAPTOR_PATH/../.raptorenv_lin64.sh ] && source $RAPTOR_PATH/../.raptorenv_lin64.sh
 [ -f $RAPTOR_PATH/bin/default_lic_path ] && source $RAPTOR_PATH/bin/default_lic_path
 
+# Function to detect the environment
+detect_environment() {
+    # Check if running inside WSL
+    if grep -q Microsoft /proc/version; then
+        echo "WSL"
+    # Check if running inside Docker
+    elif [ -f "/.dockerenv" ]; then
+        echo "Docker"
+    # Assume native Linux
+    else
+        echo "Native"
+    fi
+}
+
+environment=$(detect_environment)
+if [ "$environment" == "Native" ]; then
+        RAPTOR_EXE=raptor.exeMonacoEmbed
+else
+        RAPTOR_EXE=raptor.exe
+fi
+
+# Uncomment below in case if above condition are not working as expected
+#RAPTOR_EXE=raptor.exe
+
 if [[ "$RAPTOR_EXE_DEBUG" == "1"   ]]; then
-    $RAPTOR_PATH/bin/raptor.exe "$@"
+    $RAPTOR_PATH/bin/$RAPTOR_EXE "$@"
 else
-    $RAPTOR_PATH/bin/raptor.exe "$@" 2> >(grep -vz -f  $RAPTOR_PATH/bin/.ignore_msgs  >&2)
+    $RAPTOR_PATH/bin/$RAPTOR_EXE "$@" 2> >(grep -vz -f  $RAPTOR_PATH/bin/.ignore_msgs  >&2)
 fi