minor update

vortexgpgpu · Sep 17, 2024 · 8908f3e · 8908f3e
1 parent f2c1ad7
commit 8908f3e
Show file tree

Hide file tree

Showing 3 changed files with 11 additions and 8 deletions.
diff --git 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
@@ -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
@@ -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;
   }