From 7a55a2a22a69f9b0174d8323e093147585c1c594 Mon Sep 17 00:00:00 2001
From: Larry Ruckman <ruckman@slac.stanford.edu>
Date: Thu, 19 Sep 2024 16:16:02 -0700
Subject: [PATCH] more Vivado 2024.1 + ILA fixes

---
 vivado/proc/debug_probes.tcl | 12 ++++++++++--
 1 file changed, 10 insertions(+), 2 deletions(-)

diff --git a/vivado/proc/debug_probes.tcl b/vivado/proc/debug_probes.tcl
index 8176f67..75feeec 100644
--- a/vivado/proc/debug_probes.tcl
+++ b/vivado/proc/debug_probes.tcl
@@ -42,7 +42,9 @@ proc CreateDebugCore {ilaName} {
    set_property C_INPUT_PIPE_STAGES 2   [get_debug_cores ${ilaName}]
 
    # Force a reset of the implementation
-   reset_run impl_1
+   if { [VersionCompare 2024.1] < 0} {
+      reset_run impl_1
+   }
 }
 
 ## Sets the clock on the debug core
@@ -89,10 +91,16 @@ proc WriteDebugProbes {ilaName {filePath ""}} {
    # Delete the last unused port
    delete_debug_port [get_debug_ports [GetCurrentProbe ${ilaName}]]
 
+   # Check if Vivado 2024.1 or later
+   if { [VersionCompare 2024.1] >= 0} {
+      # Implement debug core
+      implement_debug_core
+
    # Check if write_debug_probes is support
-   if { [VersionCompare 2017.2] <= 0 } {
+   } elseif { [VersionCompare 2017.2] <= 0 } {
       # Write the port map file
       write_debug_probes -force ${filePath}
+
    } else {
       # Check if not empty string
       if { ${filePath} != "" } {