Fixed incorrect path returned by getHLSPaths function. (#62)

* Fixed incorrect path returned by getHLSPaths function.

The base_path was being set incorrectly when the shls_path variable was
already set by using the 'which' command.

* Added fix for getting the base_path when using a release version of SHLS (#63)

This fix doesn't work if the "shls" env var isn't in the path (line 21). The change to
risc-v-demo/sev-kit-reference-design/script_support/additional_configurations/smarthls/sd_add_axis_converters.tcl
means that "base_path" needs to be one level up from bin. So then that means "base_path" should be Libero_SoC_v2024.1/SmartHLS-2024.1/SmartHLS or C:\Microchip\Libero_SoC_v2024.1\SmartHLS-2024.1\SmartHLS.

---------

Co-authored-by: jennifermah76 <132939922+jennifermah76@users.noreply.github.com>

Author: ManuelSaldana

risc-v-demo/sev-kit-reference-design/script_support/additional_configurations/functions.tcl

@@ -17,20 +17,20 @@ proc getHlsPaths { } {
     if {![info exists shls_path]} {catch {set shls_path [exec which shls]}}
 
     if {[info exists shls_path]} {
-        set base_path [string trimright $shls_path SmartHLS/bin/shls]
+        set base_path [string trimright $shls_path bin/shls]
     } else {
         global shls_path
         if { $OS == "Linux" } {
-            set base_path [string cat [string trimright $install_loc Libero]/SmartHLS-$liberoRelease {/}]
-            set ::env(PATH) [string cat $::env(PATH) ":" $base_path {SmartHLS/bin}]
-            set shls_path [string cat $base_path {SmartHLS/bin/shls}]
+            set base_path [string cat [string trimright $install_loc Libero]/SmartHLS-$liberoRelease {/SmartHLS}]
+            set ::env(PATH) [string cat $::env(PATH) ":" $base_path {/bin}]
+            set shls_path [string cat $base_path {/bin/shls}]
         } else {
-            set base_path [string cat [string trimright $install_loc Designer]SmartHLS-$liberoRelease {/}]
+            set base_path [string cat [string trimright $install_loc Designer]SmartHLS-$liberoRelease {/SmartHLS}]
             set base_path [file normalize $base_path]
             set drive [string range $install_loc 0 0]
-            set shls_path "$base_path/SmartHLS/bin/shls.bat"
+            set shls_path "$base_path/bin/shls.bat"
             set shls_path [file normalize $shls_path]
-            set ::env(PATH) [string cat $::env(PATH) ";" $base_path {SmartHLS/bin}]
+            set ::env(PATH) [string cat $::env(PATH) ";" $base_path {bin}]
         }
     }
     puts "base_path: $base_path"
@@ -44,8 +44,6 @@ proc getHlsPaths { } {
     }
 
     #return the list of paths
-    puts "SHLS PATH $shls_path"
-    puts "BASE PATH $base_path"
     set pathList [list $base_path $shls_path]
 }
 

risc-v-demo/sev-kit-reference-design/script_support/additional_configurations/smarthls/sd_add_axis_converters.tcl

@@ -1,10 +1,11 @@
+puts "TCL_BEGIN: [info script]"
+
 #
 # NOTES:
 #   - Ideally this should go into their own create_hdl_plus_*.tcl files
 #
 set pathList [getHlsPaths]
 set base_path [lindex $pathList 0]
-set base_path "$base_path/SmartHLS"
 puts "base_path: $base_path"
 
 open_smartdesign -sd_name {Video_Pipeline} 
@@ -126,3 +127,5 @@ sd_invert_pins -sd_name {Video_Pipeline} -pin_names {"AXIS_Video_Converter_0:i_v
 sd_invert_pins -sd_name {Video_Pipeline} -pin_names {"AXIS_Video_Converter_0:i_axis_reset"}
 
 save_smartdesign -sd_name {Video_Pipeline} 
+
+puts "TCL_END: [info script]"