From 8908f3e006d260c4a51f5692315b4a34d4a236c2 Mon Sep 17 00:00:00 2001
From: Blaise Tine <tinebp@yahoo.com>
Date: Tue, 17 Sep 2024 10:05:17 -0700
Subject: [PATCH] minor update
---
hw/syn/xilinx/xrt/gen_xo.tcl | 2 +-
runtime/xrt/Makefile | 5 +++++
runtime/xrt/vortex.cpp | 12 +++++-------
3 files changed, 11 insertions(+), 8 deletions(-)
diff --git a/hw/syn/xilinx/xrt/gen_xo.tcl b/hw/syn/xilinx/xrt/gen_xo.tcl
index 7d3342a4..bad41f5c 100644
--- a/hw/syn/xilinx/xrt/gen_xo.tcl
+++ b/hw/syn/xilinx/xrt/gen_xo.tcl
@@ -31,7 +31,7 @@ if {[file exists "${xoname}"]} {
set argv [list ${build_dir}/ip]
set argc 1
-source ${script_path}/gen_ip.tcl
+source ${script_path}/xilinx_ip_gen.tcl
set argv [list ${krnl_name} ${vcs_file} ${tool_dir} ${build_dir}]
set argc 4
diff --git a/runtime/xrt/Makefile b/runtime/xrt/Makefile
index 66d3e481..d4fbc51a 100644
--- a/runtime/xrt/Makefile
+++ b/runtime/xrt/Makefile
@@ -39,6 +39,11 @@ ifdef SCOPE
SRCS += $(COMMON_DIR)/scope.cpp
endif
+# Enable ILA logic analyzer
+ifdef CHIPSCOPE
+ CXXFLAGS += -DCHIPSCOPE
+endif
+
all: $(DESTDIR)/$(PROJECT)
driver: $(DESTDIR)/libxrtsim.so
diff --git a/runtime/xrt/vortex.cpp b/runtime/xrt/vortex.cpp
index b4e6090e..a02a8499 100644
--- a/runtime/xrt/vortex.cpp
+++ b/runtime/xrt/vortex.cpp
@@ -125,13 +125,6 @@ static int get_platform_info(const std::string &device_name,
return -1;
}
-/*
-static void wait_for_enter(const std::string &msg) {
- std::cout << msg << std::endl;
- std::cin.ignore(std::numeric_limits<std::streamsize>::max(), '\n');
-}
-*/
-
///////////////////////////////////////////////////////////////////////////////
class vx_device {
@@ -390,6 +383,11 @@ class vx_device {
}
#endif
+ #ifdef CHIPSCOPE
+ std::cout << "\nPress ENTER to continue after setting up ILA trigger..." << std::endl;
+ std::cin.ignore(std::numeric_limits<std::streamsize>::max(), '\n');
+ #endif
+
return 0;
}