Further cleaning up code and adding some comments

Author: loglav03

libs/EXTERNAL/CMakeLists.txt

@@ -10,7 +10,6 @@ add_subdirectory(libsdcparse)
 add_subdirectory(libblifparse)
 add_subdirectory(libtatum)
 add_subdirectory(libcatch2)
-#add_subdirectory(synlig)
 #add_subdirectory(parmys)
 
 #Proc numbers
@@ -88,6 +87,7 @@ if (${WITH_PARMYS})
         set(SLANG_SRC_DIR ${CMAKE_CURRENT_SOURCE_DIR}/yosys-slang)
         set(SLANG_BUILD_DIR ${CMAKE_BINARY_DIR}/yosys-slang)
         set(YOSYS_CONFIG_EXECUTABLE ${CMAKE_BINARY_DIR}/bin/yosys-config CACHE STRING "Path to the yosys-config helper" FORCE)
+        #Initialize yosys-slang submodules
         execute_process(
 	        COMMAND git submodule update --init
 	        WORKING_DIRECTORY ${SLANG_SRC_DIR}
@@ -102,6 +102,7 @@ if (${WITH_PARMYS})
             SOURCE_DIR ${SLANG_SRC_DIR}
             BINARY_DIR ${SLANG_BUILD_DIR}
 
+            #Disabling UndrivenPass in slang_frontend.cc
             PATCH_COMMAND
                 ${CMAKE_COMMAND} -E echo "Patching slang_frontend.cc to disable UndrivenPass" &&
                 ${CMAKE_COMMAND} -DIN=${SLANG_FE} -P ${CMAKE_CURRENT_SOURCE_DIR}/patch_slang.cmake
@@ -116,92 +117,6 @@ if (${WITH_PARMYS})
             INSTALL_COMMAND ${CMAKE_COMMAND} --install ${SLANG_BUILD_DIR}
             DEPENDS yosys
         )
-
-    #     set(SURELOG_SOURCE_DIR ${CMAKE_CURRENT_SOURCE_DIR}/Surelog)
-    #     set(SURELOG_BINARY_DIR ${SURELOG_SOURCE_DIR}/build)
-    #     set(YOSYS_F4PGA_PLUGINS_SOURCE_DIR ${CMAKE_CURRENT_SOURCE_DIR}/yosys-f4pga-plugins)
-
-    #     ExternalProject_Add(surelog
-    #             # root directory for Surelog project
-    #             PREFIX "surelog"
-
-    #             GIT_REPOSITORY https://github.com/chipsalliance/Surelog.git
-    #             GIT_TAG v1.71
-    #             GIT_PROGRESS TRUE
-    #             GIT_SHALLOW TRUE
-
-    #             # setting source, build and install directories
-    #             SOURCE_DIR "${SURELOG_SOURCE_DIR}"
-    #             BUILD_IN_SOURCE FALSE
-    #             INSTALL_DIR "${SURELOG_BINARY_DIR}"
-
-    #             # define Surelog cache values
-    #             CMAKE_CACHE_ARGS
-    #             "-DCMAKE_BUILD_TYPE:STRING=Release"
-    #             "-DCMAKE_INSTALL_PREFIX:PATH=${CMAKE_BINARY_DIR}"
-    #             "-DCMAKE_POSITION_INDEPENDENT_CODE:BOOL=ON"
-    #             "-DCMAKE_WARN_DEPRECATED:BOOL=OFF"
-
-    #             # redirect logs to a logfile
-    #             LOG_BUILD ON
-    #             LOG_UPDATE ON
-    #             LOG_INSTALL ON
-    #             LOG_CONFIGURE OFF
-    #             LOG_OUTPUT_ON_FAILURE ON
-
-    #             # dependency
-    #             DEPENDS  yosys
-    #             )
-
-    #  # Synlig integration (manages Surelog and UHDM internally)                
-
-    #     # Synlig integration (manages Surelog and UHDM internally)
-    #     set(SYNLIG_SOURCE_DIR ${CMAKE_CURRENT_SOURCE_DIR}/synlig)
-
-    #     # Clone Synlig repository and ensure submodules are synced before building
-    #     ExternalProject_Add(synlig
-    #         PREFIX "synlig"
-
-    #         # Clone the Synlig repository
-    #         GIT_REPOSITORY https://github.com/chipsalliance/synlig.git
-    #         GIT_TAG main
-    #         GIT_PROGRESS TRUE
-    #         GIT_SHALLOW TRUE
-
-    #         # Set source and build directories
-    #         SOURCE_DIR "${SYNLIG_SOURCE_DIR}"
-    #         BUILD_IN_SOURCE FALSE
-    #         INSTALL_DIR " "
-            
-    #         # Sync submodules after cloning
-            
-            
-    #         UPDATE_COMMAND git submodule update --init --recursive third_party/surelog
-    #         WORKING_DIRECTORY ${SYNLIG_SOURCE_DIR}
-            
-    #         BUILD_COMMAND ${MAKE_PROGRAM} -C ${SYNLIG_SOURCE_DIR} install DESTDIR=${CMAKE_BINARY_DIR}/bin/synlig_install -j${PROCESSOR_COUNT}
-    #         INSTALL_COMMAND ""
-    #         CONFIGURE_COMMAND ""
-            
-    #         # Pass necessary paths and set environment variables
-    #         CMAKE_CACHE_ARGS
-    #             "-DCMAKE_BUILD_TYPE:STRING=Release"
-    #             "-DSURELOG_PATH=${CMAKE_BINARY_DIR}/surelog"
-    #             "-DYOSYS_PATH=${CMAKE_BINARY_DIR}/yosys"
-    #             "-DUHDM_INSTALL_DIR=${CMAKE_BINARY_DIR}"
-    #             "-DBUILD_DIR=${CMAKE_BINARY_DIR}/synlig-build"
-    #             "-DEXPORT_PATH=${CMAKE_BINARY_DIR}/synlig_install/usr/local/bin:$ENV{PATH}"
-            
-    #         LOG_BUILD ON
-    #         LOG_UPDATE ON
-    #         LOG_INSTALL ON
-    #         LOG_CONFIGURE OFF
-    #         LOG_OUTPUT_ON_FAILURE ON
-
-    #         # Ensure dependencies like Yosys are built first
-    #         DEPENDS yosys  # Ensure submodule sync runs before synlig build
-    #     )
-
     endif ()
 endif ()
 

vtr_flow/misc/yosys/synthesis.tcl

@@ -33,11 +33,6 @@ if {$env(PARSER) == "slang" } {
 
 parmys_arch -a QQQ
 
-#if {$env(PARSER) == "surelog" } {
-#	puts "Using Synlig read_uhdm command"
-#	exec $synlig -p "read_uhdm XXX"
-#}
-
 if {$env(PARSER) == "slang" } {
 	# Create a file list containing the name(s) of file(s) \
 	# to read together with read_slang
@@ -98,14 +93,6 @@ if {$env(PARSER) == "default" || $env(PARSER) == "slang"} {
     # For Verilog, use -nopass for a simpler, faster flow
     parmys -a QQQ -nopass -c CCC YYY
 } 
-#elseif {$env(PARSER) == "slang"} {
-    # For Slang, run additional passes to handle complexity
-#    parmys -a QQQ -c CCC YYY
-#}
-#elseif {$env(PARSER) == "system-verilog" || $env(PARSER) == "surelog"} {
-#    # For Synlig SystemVerilog, run additional passes to handle complexity
-#    parmys -a QQQ -c CCC YYY
-#}
 
 opt -full
 

vtr_flow/scripts/python_libs/vtr/parmys/parmys.py

@@ -233,8 +233,8 @@ def run(
         odin_config_full_path,
     )
 
-    # Set the synlig exe script path in the environment variable
-    # (handle if it is not set or system-verilog OFF)
+    # Set the slang exe script path in the environment variable
+    # (handle if it is not set or yosys-slang OFF)
     try:
         os.environ["yosys_slang_path"] = str(vtr.paths.yosys_slang_path)
     except KeyError: