simplified replacing (vlnv kid)

toolflow/vivado/arch/common/arch.tcl

@@ -84,9 +84,9 @@ namespace eval arch {
             set offset [next_valid_address $offset $range]
             ::platform::addressmap::add_processing_element [llength [dict keys $ret]] $offset $range
             if { $usage == "register" } {
-              dict set ret $intf "interface $intf [format "offset 0x%08x range 0x%08x" $offset $range] kind register subintf $i"
+              dict set ret $intf "interface $intf [format "offset 0x%08x range 0x%08x" $offset $range] kind register"
             } else {
-              dict set ret $intf "interface $intf [format "offset 0x%08x range 0x%08x" $offset $range] kind memory subintf $i"
+              dict set ret $intf "interface $intf [format "offset 0x%08x range 0x%08x" $offset $range] kind memory"
             }
             incr offset $range
           }

toolflow/vivado/common/ip.tcl

@@ -540,14 +540,13 @@ namespace eval ::tapasco::ip {
             set kid [dict get [::tapasco::get_composition] $kind id]
             set vlnv [dict get [::tapasco::get_composition] $kind vlnv]
 
-            if {[tapasco::is_feature_enabled "IPEC"]} {
-              set feature [tapasco::get_feature "IPEC"]
-              if {[dict exists $feature $vlnv]} {
-                set subintf [dict get $addr $intf "subintf"]
-                set kid [lindex [dict get $feature $vlnv "kid"] $subintf]
-                set kid [expr int($kid)]
-                set vlnv [lindex [dict get $feature $vlnv "vlnv"] $subintf]
-              }
+            set ipecfeature [tapasco::get_feature "IPEC"]
+			set intfname [lindex [split $intf /] end]
+            if {[dict exists $ipecfeature $vlnv $intfname]} {
+              set kid [dict get $ipecfeature $vlnv $intfname "kid"]
+              set kid [expr int($kid)]
+              set vlnv [dict get $ipecfeature $vlnv $intfname "vlnv"]
+              puts "  replaced vlnv $vlnv kid $kid"
             }
 
             lappend slots [json::write object "Type" [json::write string "Kernel"] "SlotId" $slot_id "Kernel" $kid \