Skip to content

Fixed incorrect path returned by getHLSPaths function. #62

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 2 commits into from
Mar 28, 2024
Merged

Fixed incorrect path returned by getHLSPaths function. #62

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
2148720
Fixed incorrect path returned by getHLSPaths function.
ManuelSaldana Mar 28, 2024
4d5dd47
Added fix for getting the base_path when using a release version of S…
jennifermah76 Mar 28, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
16 changes: 7 additions & 9 deletions risc-v-demo/sev-kit-reference-design/script_support/additional_configurations/functions.tcl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand All @@ -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]
}

Expand Down
5 changes: 4 additions & 1 deletion ...rence-design/script_support/additional_configurations/smarthls/sd_add_axis_converters.tcl
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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}
Expand Down Expand Up @@ -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]"