From 26194b307897b6a6f1bcb5c0887edd480498990e Mon Sep 17 00:00:00 2001 From: Megan Wachs Date: Thu, 18 May 2017 12:00:16 -0700 Subject: [PATCH 1/3] bump riscv-tools to pick up latest version of debug tests --- riscv-tools | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/riscv-tools b/riscv-tools index cf736999..1b27f68c 160000 --- a/riscv-tools +++ b/riscv-tools @@ -1 +1 @@ -Subproject commit cf7369999779bc78bcc5a8a6fe6187363b23247a +Subproject commit 1b27f68c899f728dda307f754e5012f35a1e9759 From 304e82486f07848805aa1c51823b2aa48084c3f2 Mon Sep 17 00:00:00 2001 From: Megan Wachs Date: Thu, 18 May 2017 12:26:34 -0700 Subject: [PATCH 2/3] Debug: Update makefile now that OpenOCD is part of riscv-tools --- regression/Makefile | 32 +++++++------------------------- 1 file changed, 7 insertions(+), 25 deletions(-) diff --git a/regression/Makefile b/regression/Makefile index f4134fdb..6abb2794 100644 --- a/regression/Makefile +++ b/regression/Makefile @@ -216,27 +216,9 @@ stamps/%/emulator-torture-$(TORTURE_CONFIG).stamp: stamps/%/emulator-debug.stamp # Targets for JTAG DTM full-chain simulation -#OPENOCD_HEAD ?= riscv -OPENOCD_INSTALL ?= $(abspath $(TOP))/riscv-openocd-install -#OPENOCD_VERSION = $(shell git ls-remote git@github.com/riscv/riscv-openocd.git $(OPENOCD_HEAD) | awk '{print $$1}') -OPENOCD_VERSION = 0e66b07550de9076620e45d1f90e38ac6ef8f9d1 - -OPENOCD_DIR = $(OPENOCD_INSTALL)_$(OPENOCD_VERSION)/ - -$(OPENOCD_DIR)/bin/openocd: - rm -rf riscv-openocd - git clone git@github.com:riscv/riscv-openocd.git - cd riscv-openocd ; \ - git checkout $(OPENOCD_VERSION) ; \ - ./bootstrap ; \ - ./configure --enable-jtag-vpi --prefix=$(OPENOCD_INSTALL)_$(OPENOCD_VERSION) --disable-werror; \ - make ; \ - make install - -install_openocd: $(OPENOCD_DIR)/bin/openocd +OPENOCD_DIR ?= $(RISCV) # If this is defined empty, then all tests would run. -# Running a list of tests is not supported. JTAG_DTM_TEST ?= MemTest64 ifdef DEBUG @@ -249,19 +231,19 @@ else JTAG_STAMP_SUFFIX=-ndebug endif -stamps/%/jtag-dtm-32-$(JTAG_DTM_TEST).stamp: install_openocd stamps/%/vsim$(JTAG_STAMP_SUFFIX).stamp +stamps/%/jtag-dtm-32-$(JTAG_DTM_TEST).stamp: stamps/%/vsim$(JTAG_STAMP_SUFFIX).stamp export RISCV=$(RISCV) && $(abspath $(TOP))/riscv-tools/riscv-tests/debug/gdbserver.py \ - --run "$(abspath $(TOP))/vsim/simv-$(PROJECT)-$*$(JTAG_DEBUG_SUFFIX) +verbose $(JTAG_VCDPLUS_32)" \ - --cmd="$(OPENOCD_DIR)/bin/openocd $(OPENOCD_DEBUG) \ + --sim_cmd "$(abspath $(TOP))/vsim/simv-$(PROJECT)-$*$(JTAG_DEBUG_SUFFIX) +verbose $(JTAG_VCDPLUS_32)" \ + --server_cmd="$(OPENOCD_DIR)/bin/openocd $(OPENOCD_DEBUG) \ --s $(OPENOCD_DIR)/share/openocd/scripts" \ --freedom-e300-sim \ $(JTAG_DTM_TEST) date > $@ -stamps/%/jtag-dtm-64-$(JTAG_DTM_TEST).stamp: install_openocd stamps/%/vsim$(JTAG_STAMP_SUFFIX).stamp +stamps/%/jtag-dtm-64-$(JTAG_DTM_TEST).stamp: stamps/%/vsim$(JTAG_STAMP_SUFFIX).stamp export RISCV=$(RISCV) && $(abspath $(TOP))/riscv-tools/riscv-tests/debug/gdbserver.py \ - --run "$(abspath $(TOP))/vsim/simv-$(PROJECT)-$*$(JTAG_DEBUG_SUFFIX) +verbose $(JTAG_VCDPLUS_64)" \ - --cmd="$(OPENOCD_INSTALL)_$(OPENOCD_VERSION)/bin/openocd $(OPENOCD_DEBUG) \ + --sim_cmd "$(abspath $(TOP))/vsim/simv-$(PROJECT)-$*$(JTAG_DEBUG_SUFFIX) +verbose $(JTAG_VCDPLUS_64)" \ + --server_cmd="$(OPENOCD_INSTALL)_$(OPENOCD_VERSION)/bin/openocd $(OPENOCD_DEBUG) \ --s $(OPENOCD_INSTALL)_$(OPENOCD_VERSION)/share/openocd/scripts" \ --freedom-u500-sim \ $(JTAG_DTM_TEST) From 24a533e77cfd976f3a71eb80f2c40b8f5ed5ead6 Mon Sep 17 00:00:00 2001 From: Megan Wachs Date: Thu, 18 May 2017 13:10:22 -0700 Subject: [PATCH 3/3] debug: Bump riscv-tools to pick up correction in gdbserver --- riscv-tools | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/riscv-tools b/riscv-tools index 1b27f68c..14bbe5a2 160000 --- a/riscv-tools +++ b/riscv-tools @@ -1 +1 @@ -Subproject commit 1b27f68c899f728dda307f754e5012f35a1e9759 +Subproject commit 14bbe5a2e5725cf624874f4c5e35e3333287e728