Skip to content

Commit 7525d90

Browse files
Bhaskar VishnuVardhan Chebroluheeran-xilinx
authored andcommitted
Updated the rtl_streaming_k2k_mm tcl files to support latest aws platforms (#404)
1 parent 29cca74 commit 7525d90

File tree

2 files changed

+25
-34
lines changed

2 files changed

+25
-34
lines changed

rtl_kernels/rtl_streaming_k2k_mm/src/gen_xo_myadder1.tcl

Lines changed: 13 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -44,7 +44,19 @@ set xpfm_path [lindex $::argv 3]
4444
set device [lindex $::argv 4]
4545

4646
set pinfo [file join [pwd] "pinfo.json"]
47-
exec $::env(XILINX_VITIS)/bin/platforminfo -j $pinfo -p ${xpfm_path}
47+
[exec $::env(XILINX_VITIS)/bin/platforminfo -p ${xpfm_path} --json=hardwarePlatform.devices[0].fpgaPart >> $pinfo]
48+
49+
set fid [open $pinfo r]
50+
gets $fid line
51+
regsub -all ":" $line - line
52+
set fields [split $line "-"]
53+
append l1 [lindex $fields 1] -
54+
append l1 [lindex $fields 2] -
55+
append l1 [lindex $fields 3]
56+
append l1 [lindex $fields 4] -
57+
append l1 [lindex $fields 5]
58+
set partname $l1
59+
puts "partname = $l1\n"
4860

4961
if {[file exists "myadder1_ex"]} {
5062
file delete -force "myadder1_ex"
@@ -53,22 +65,6 @@ if {[file exists "project_1"]} {
5365
file delete -force "project_1"
5466
}
5567

56-
set fid [open $pinfo r]
57-
set bpart "part"
58-
while { ! [eof $fid] } {
59-
gets $fid line
60-
if { [regexp {([^:[:space:]]+): (.*),$} $line match left right] } {
61-
regsub -all {\"} $left {} left
62-
regsub -all {\"} $right {} right
63-
if { $left eq $bpart } {
64-
set partname $right
65-
puts "partname = $partname\n"
66-
break
67-
}
68-
}
69-
}
70-
close $fid
71-
7268
create_project project_1 project_1 -part $partname
7369
create_ip -name rtl_kernel_wizard -vendor xilinx.com -library ip -version 1.0 -module_name myadder1
7470

rtl_kernels/rtl_streaming_k2k_mm/src/gen_xo_myadder2.tcl

Lines changed: 12 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -44,8 +44,19 @@ set xpfm_path [lindex $::argv 3]
4444
set device [lindex $::argv 4]
4545

4646
set pinfo [file join [pwd] "pinfo.json"]
47-
exec $::env(XILINX_VITIS)/bin/platforminfo -j $pinfo -p ${xpfm_path} -f
47+
[exec $::env(XILINX_VITIS)/bin/platforminfo -p ${xpfm_path} --json=hardwarePlatform.devices[0].fpgaPart >> $pinfo]
4848

49+
set fid [open $pinfo r]
50+
gets $fid line
51+
regsub -all ":" $line - line
52+
set fields [split $line "-"]
53+
append l1 [lindex $fields 1] -
54+
append l1 [lindex $fields 2] -
55+
append l1 [lindex $fields 3]
56+
append l1 [lindex $fields 4] -
57+
append l1 [lindex $fields 5]
58+
set partname $l1
59+
puts "partname = $l1\n"
4960

5061
if {[file exists "myadder2_ex"]} {
5162
file delete -force "myadder2_ex"
@@ -54,22 +65,6 @@ if {[file exists "project_2"]} {
5465
file delete -force "project_2"
5566
}
5667

57-
set fid [open $pinfo r]
58-
set bpart "part"
59-
while { ! [eof $fid] } {
60-
gets $fid line
61-
if { [regexp {([^:[:space:]]+): (.*),$} $line match left right] } {
62-
regsub -all {\"} $left {} left
63-
regsub -all {\"} $right {} right
64-
if { $left eq $bpart } {
65-
set partname $right
66-
puts "partname = $partname\n"
67-
break
68-
}
69-
}
70-
}
71-
close $fid
72-
7368
create_project project_2 project_2 -part $partname
7469
create_ip -name rtl_kernel_wizard -vendor xilinx.com -library ip -version 1.0 -module_name myadder2
7570

0 commit comments

Comments
 (0)