Also support progbuf in abstractauto.
This commit is contained in:
Luke Wren
parent
46f95f859d
commit
ab0b4a04f0
|
|
@ -284,14 +284,19 @@ always @ (posedge clk or negedge rst_n) begin
|
|||
end
|
||||
|
||||
// We only support abstractauto on data0 update (use case is bulk memory read/write)
|
||||
reg abstractauto_autoexecdata;
|
||||
reg abstractauto_autoexecdata;
|
||||
reg [1:0] abstractauto_autoexecprogbuf;
|
||||
|
||||
always @ (posedge clk or negedge rst_n) begin
|
||||
if (!rst_n) begin
|
||||
abstractauto_autoexecdata <= 1'b0;
|
||||
abstractauto_autoexecprogbuf <= 2'b00;
|
||||
end else if (!dmactive) begin
|
||||
abstractauto_autoexecdata <= 1'b0;
|
||||
abstractauto_autoexecprogbuf <= 2'b00;
|
||||
end else if (dmi_write && dmi_paddr == ADDR_ABSTRACTAUTO) begin
|
||||
abstractauto_autoexecdata <= dmi_pwdata[0];
|
||||
abstractauto_autoexecprogbuf <= dmi_pwdata[17:16];
|
||||
end
|
||||
end
|
||||
|
||||
|
|
@ -324,7 +329,9 @@ assign abstractcs_busy = acmd_state != S_IDLE;
|
|||
|
||||
wire start_abstract_cmd = abstractcs_cmderr == CMDERR_OK && !abstractcs_busy && (
|
||||
(dmi_write && dmi_paddr == ADDR_COMMAND) ||
|
||||
((dmi_write || dmi_read) && abstractauto_autoexecdata && dmi_paddr == ADDR_DATA0)
|
||||
((dmi_write || dmi_read) && abstractauto_autoexecdata && dmi_paddr == ADDR_DATA0) ||
|
||||
((dmi_write || dmi_read) && abstractauto_autoexecprogbuf[0] && dmi_paddr == ADDR_PROGBUF0) ||
|
||||
((dmi_write || dmi_read) && abstractauto_autoexecprogbuf[1] && dmi_paddr == ADDR_PROGBUF1)
|
||||
);
|
||||
|
||||
wire dmi_access_illegal_when_busy =
|
||||
|
|
@ -547,8 +554,10 @@ always @ (*) begin
|
|||
4'd1 // datacount = 1
|
||||
};
|
||||
ADDR_ABSTRACTAUTO: dmi_prdata = {
|
||||
31'h0,
|
||||
abstractauto_autoexecdata // only data0 supported
|
||||
14'h0,
|
||||
abstractauto_autoexecprogbuf, // only progbuf0,1 present
|
||||
15'h0,
|
||||
abstractauto_autoexecdata // only data0 present
|
||||
};
|
||||
ADDR_CONFSTRPTR0: dmi_prdata = 32'h4c296328;
|
||||
ADDR_CONFSTRPTR1: dmi_prdata = 32'h20656b75;
|
||||
|
|
|
|||
|
|
@ -1,38 +0,0 @@
|
|||
TOP := hazard3_cpu_2port
|
||||
CDEFINES := DUAL_PORT
|
||||
|
||||
CPU_RESET_VECTOR := 32'hc0
|
||||
EXTENSION_C := 1
|
||||
EXTENSION_M := 1
|
||||
DEBUG_SUPPORT := 1
|
||||
MULDIV_UNROLL := 2
|
||||
MUL_FAST := 1
|
||||
REDUCED_BYPASS := 0
|
||||
|
||||
.PHONY: clean tb all run
|
||||
|
||||
all: run
|
||||
|
||||
run: tb
|
||||
./tb zero.bin waves.vcd
|
||||
|
||||
SYNTH_CMD += read_verilog -I ../../../hdl $(shell listfiles ../../../hdl/hazard3.f);
|
||||
SYNTH_CMD += chparam -set EXTENSION_C $(EXTENSION_C) $(TOP);
|
||||
SYNTH_CMD += chparam -set EXTENSION_M $(EXTENSION_M) $(TOP);
|
||||
SYNTH_CMD += chparam -set DEBUG_SUPPORT $(DEBUG_SUPPORT) $(TOP);
|
||||
SYNTH_CMD += chparam -set CSR_COUNTER 1 $(TOP);
|
||||
SYNTH_CMD += chparam -set RESET_VECTOR $(CPU_RESET_VECTOR) $(TOP);
|
||||
SYNTH_CMD += chparam -set REDUCED_BYPASS $(REDUCED_BYPASS) $(TOP);
|
||||
SYNTH_CMD += chparam -set MULDIV_UNROLL $(MULDIV_UNROLL) $(TOP);
|
||||
SYNTH_CMD += chparam -set MUL_FAST $(MUL_FAST) $(TOP);
|
||||
SYNTH_CMD += prep -flatten -top $(TOP); async2sync;
|
||||
SYNTH_CMD += write_cxxrtl dut.cpp
|
||||
|
||||
dut.cpp:
|
||||
yosys -p "$(SYNTH_CMD)" 2>&1 > cxxrtl.log
|
||||
|
||||
clean::
|
||||
rm -f dut.cpp cxxrtl.log tb
|
||||
|
||||
tb: dut.cpp
|
||||
clang++ -O3 -std=c++14 $(addprefix -D,$(CDEFINES)) -I $(shell yosys-config --datdir)/include tb.cpp -o tb
|
||||
|
|
@ -1,349 +0,0 @@
|
|||
#include <iostream>
|
||||
#include <fstream>
|
||||
#include <cstdint>
|
||||
#include <string>
|
||||
#include <algorithm>
|
||||
// jesus fuck i forgot how bad iostream formatting was, give me printf or give me death
|
||||
#include <stdio.h>
|
||||
|
||||
// Device-under-test model generated by CXXRTL:
|
||||
#include "dut.cpp"
|
||||
#include <backends/cxxrtl/cxxrtl_vcd.h>
|
||||
|
||||
static const unsigned int MEM_SIZE = 16 * 1024 * 1024;
|
||||
uint8_t mem[MEM_SIZE];
|
||||
|
||||
static const unsigned int IO_BASE = 0x80000000;
|
||||
enum {
|
||||
IO_PRINT_CHAR = 0,
|
||||
IO_PRINT_U32 = 4,
|
||||
IO_EXIT = 8
|
||||
};
|
||||
|
||||
const char *help_str =
|
||||
"Usage: tb binfile [vcdfile] [--dump start end] [--cycles n]\n"
|
||||
" binfile : Binary to load into start of memory\n"
|
||||
" vcdfile : Path to dump waveforms to\n"
|
||||
" --dump start end : Print out memory contents between start and end (exclusive)\n"
|
||||
" after execution finishes. Can be passed multiple times.\n"
|
||||
" --cycles n : Maximum number of cycles to run before exiting.\n"
|
||||
;
|
||||
|
||||
void exit_help(std::string errtext = "") {
|
||||
std::cerr << errtext << help_str;
|
||||
exit(-1);
|
||||
}
|
||||
|
||||
struct debug_test_proc {
|
||||
int step;
|
||||
debug_test_proc() : step(0) {}
|
||||
bool operator()(cxxrtl_design::p_hazard3__cpu__2port &top) {
|
||||
switch (step) {
|
||||
// Request and wait for halt
|
||||
case 0:
|
||||
top.p_dbg__req__halt.set<bool>(true);
|
||||
++step;
|
||||
break;
|
||||
case 1:
|
||||
if (top.p_dbg__halted.get<bool>()) {
|
||||
printf("Processor halted\n");
|
||||
top.p_dbg__req__halt.set<bool>(false);
|
||||
++step;
|
||||
}
|
||||
break;
|
||||
// Load 123 into data0
|
||||
case 2:
|
||||
top.p_dbg__data0__wdata.set<uint32_t>(123);
|
||||
top.p_dbg__data0__wen.set<bool>(true);
|
||||
++step;
|
||||
break;
|
||||
case 3:
|
||||
top.p_dbg__data0__wen.set<bool>(false);
|
||||
printf("Read DATA0 CSR: %u\n", top.p_dbg__data0__rdata.get<uint32_t>());
|
||||
++step;
|
||||
break;
|
||||
// Inject csrr a0, data0
|
||||
case 4:
|
||||
top.p_dbg__instr__data__vld.set<bool>(true);
|
||||
top.p_dbg__instr__data.set<uint32_t>(0x7b202573u);
|
||||
printf(">inject: csrr a0, data0\n");
|
||||
++step;
|
||||
break;
|
||||
// Inject addi a0, a0, 456
|
||||
case 5:
|
||||
if (top.p_dbg__instr__data__rdy.get<bool>()) {
|
||||
printf(">inject: addi a0, a0, 456\n");
|
||||
top.p_dbg__instr__data.set<uint32_t>(0x1c850513u);
|
||||
++step;
|
||||
}
|
||||
break;
|
||||
// Inject csrw data0, a0
|
||||
case 6:
|
||||
if (top.p_dbg__instr__data__rdy.get<bool>()) {
|
||||
printf(">inject: csrw data0, a0\n");
|
||||
top.p_dbg__instr__data.set<uint32_t>(0x7b251073u);
|
||||
++step;
|
||||
}
|
||||
break;
|
||||
// Inject illegal instruction (just want to see the wire pulse)
|
||||
case 7:
|
||||
if (top.p_dbg__instr__data__rdy.get<bool>()) {
|
||||
printf(">inject: 2x illegal 0000\n");
|
||||
top.p_dbg__instr__data.set<uint32_t>(0);
|
||||
++step;
|
||||
}
|
||||
break;
|
||||
case 8:
|
||||
if (top.p_dbg__instr__data__rdy.get<bool>()) {
|
||||
top.p_dbg__instr__data__vld.set<bool>(false);
|
||||
++step;
|
||||
}
|
||||
break;
|
||||
case 9:
|
||||
if (top.p_dbg__instr__caught__exception.get<bool>()) {
|
||||
printf("Core reported exception during debug execution\n");
|
||||
++step;
|
||||
}
|
||||
break;
|
||||
|
||||
// Inject ebreak (just want to see the wire pulse)
|
||||
case 10:
|
||||
printf(">inject: ebreak\n");
|
||||
top.p_dbg__instr__data__vld.set<bool>(true);
|
||||
top.p_dbg__instr__data.set<uint32_t>(0x00100073u);
|
||||
++step;
|
||||
break;
|
||||
case 11:
|
||||
if (top.p_dbg__instr__data__rdy.get<bool>()) {
|
||||
top.p_dbg__instr__data__vld.set<bool>(false);
|
||||
++step;
|
||||
}
|
||||
break;
|
||||
case 12:
|
||||
if (top.p_dbg__instr__caught__ebreak.get<bool>()) {
|
||||
printf("Core reported ebreak during debug execution\n");
|
||||
++step;
|
||||
}
|
||||
break;
|
||||
|
||||
// Print new data0 value (should be 123 + 456 == 579)
|
||||
case 13:
|
||||
if (top.p_dbg__instr__data__rdy.get<bool>()) {
|
||||
top.p_dbg__instr__data__vld.set<bool>(false);
|
||||
printf("Read DATA0 CSR: %u\n", top.p_dbg__data0__rdata.get<uint32_t>());
|
||||
++step;
|
||||
}
|
||||
break;
|
||||
// Assert resume request
|
||||
case 14:
|
||||
top.p_dbg__req__resume.set<bool>(true);
|
||||
++step;
|
||||
break;
|
||||
case 15:
|
||||
top.p_dbg__req__resume.set<bool>(false);
|
||||
++step;
|
||||
break;
|
||||
|
||||
// Exit once request is acknowledged
|
||||
case 16:
|
||||
if (top.p_dbg__running.get<bool>()) {
|
||||
printf("Processor resumed\n");
|
||||
return true;
|
||||
}
|
||||
break;
|
||||
default:
|
||||
break;
|
||||
}
|
||||
return false;
|
||||
}
|
||||
};
|
||||
|
||||
int main(int argc, char **argv) {
|
||||
|
||||
if (argc < 2)
|
||||
exit_help();
|
||||
|
||||
bool dump_waves = false;
|
||||
std::string waves_path;
|
||||
std::vector<std::pair<uint32_t, uint32_t>> dump_ranges;
|
||||
int64_t max_cycles = 100000;
|
||||
|
||||
for (int i = 2; i < argc; ++i) {
|
||||
std::string s(argv[i]);
|
||||
if (i == 2 && s.rfind("--", 0) != 0) {
|
||||
// Optional positional argument: vcdfile
|
||||
dump_waves = true;
|
||||
waves_path = s;
|
||||
}
|
||||
else if (s == "--dump") {
|
||||
if (argc - i < 3)
|
||||
exit_help("Option --dump requires 2 arguments\n");
|
||||
dump_ranges.push_back(std::pair<uint32_t, uint32_t>(
|
||||
std::stoul(argv[i + 1], 0, 0),
|
||||
std::stoul(argv[i + 2], 0, 0)
|
||||
));;
|
||||
i += 2;
|
||||
}
|
||||
else if (s == "--cycles") {
|
||||
if (argc - i < 2)
|
||||
exit_help("Option --cycles requires an argument\n");
|
||||
max_cycles = std::stol(argv[i + 1], 0, 0);
|
||||
i += 1;
|
||||
}
|
||||
else {
|
||||
std::cerr << "Unrecognised argument " << s << "\n";
|
||||
exit_help("");
|
||||
}
|
||||
}
|
||||
|
||||
#ifdef DUAL_PORT
|
||||
cxxrtl_design::p_hazard3__cpu__2port top;
|
||||
#else
|
||||
cxxrtl_design::p_hazard3__cpu__1port top;
|
||||
#endif
|
||||
|
||||
debug_test_proc test_step;
|
||||
|
||||
std::fill(std::begin(mem), std::end(mem), 0);
|
||||
|
||||
std::ifstream fd(argv[1], std::ios::binary | std::ios::ate);
|
||||
std::streamsize bin_size = fd.tellg();
|
||||
if (bin_size > MEM_SIZE) {
|
||||
std::cerr << "Binary file (" << bin_size << " bytes) is larger than memory (" << MEM_SIZE << " bytes)\n";
|
||||
return -1;
|
||||
}
|
||||
fd.seekg(0, std::ios::beg);
|
||||
fd.read((char*)mem, bin_size);
|
||||
|
||||
std::ofstream waves_fd;
|
||||
cxxrtl::vcd_writer vcd;
|
||||
if (dump_waves) {
|
||||
waves_fd.open(waves_path);
|
||||
cxxrtl::debug_items all_debug_items;
|
||||
top.debug_info(all_debug_items);
|
||||
vcd.timescale(1, "us");
|
||||
vcd.add(all_debug_items);
|
||||
}
|
||||
|
||||
bool bus_trans = false;
|
||||
bool bus_write = false;
|
||||
#ifdef DUAL_PORT
|
||||
bool bus_trans_i = false;
|
||||
uint32_t bus_addr_i = 0;
|
||||
#endif
|
||||
uint32_t bus_addr = 0;
|
||||
uint8_t bus_size = 0;
|
||||
// Never generate bus stalls
|
||||
#ifdef DUAL_PORT
|
||||
top.p_i__hready.set<bool>(true);
|
||||
top.p_d__hready.set<bool>(true);
|
||||
#else
|
||||
top.p_ahblm__hready.set<bool>(true);
|
||||
#endif
|
||||
|
||||
// Reset + initial clock pulse
|
||||
top.step();
|
||||
top.p_clk.set<bool>(true);
|
||||
top.step();
|
||||
top.p_clk.set<bool>(false);
|
||||
top.p_rst__n.set<bool>(true);
|
||||
top.step();
|
||||
|
||||
for (int64_t cycle = 0; cycle < max_cycles; ++cycle) {
|
||||
top.p_clk.set<bool>(false);
|
||||
top.step();
|
||||
if (dump_waves)
|
||||
vcd.sample(cycle * 2);
|
||||
top.p_clk.set<bool>(true);
|
||||
top.step();
|
||||
// Handle current data phase, then move current address phase to data phase
|
||||
uint32_t rdata = 0;
|
||||
if (bus_trans && bus_write) {
|
||||
#ifdef DUAL_PORT
|
||||
uint32_t wdata = top.p_d__hwdata.get<uint32_t>();
|
||||
#else
|
||||
uint32_t wdata = top.p_ahblm__hwdata.get<uint32_t>();
|
||||
#endif
|
||||
if (bus_addr <= MEM_SIZE) {
|
||||
unsigned int n_bytes = 1u << bus_size;
|
||||
// Note we are relying on hazard3's byte lane replication
|
||||
for (unsigned int i = 0; i < n_bytes; ++i) {
|
||||
mem[bus_addr + i] = wdata >> (8 * i) & 0xffu;
|
||||
}
|
||||
}
|
||||
else if (bus_addr == IO_BASE + IO_PRINT_CHAR) {
|
||||
putchar(wdata);
|
||||
}
|
||||
else if (bus_addr == IO_BASE + IO_PRINT_U32) {
|
||||
printf("%08x\n", wdata);
|
||||
}
|
||||
else if (bus_addr == IO_BASE + IO_EXIT) {
|
||||
printf("CPU requested halt. Exit code %d\n", wdata);
|
||||
printf("Ran for %ld cycles\n", cycle + 1);
|
||||
break;
|
||||
}
|
||||
}
|
||||
else if (bus_trans && !bus_write) {
|
||||
if (bus_addr <= MEM_SIZE) {
|
||||
bus_addr &= ~0x3u;
|
||||
rdata =
|
||||
(uint32_t)mem[bus_addr] |
|
||||
mem[bus_addr + 1] << 8 |
|
||||
mem[bus_addr + 2] << 16 |
|
||||
mem[bus_addr + 3] << 24;
|
||||
}
|
||||
}
|
||||
#ifdef DUAL_PORT
|
||||
top.p_d__hrdata.set<uint32_t>(rdata);
|
||||
if (bus_trans_i) {
|
||||
bus_addr_i &= ~0x3u;
|
||||
top.p_i__hrdata.set<uint32_t>(
|
||||
(uint32_t)mem[bus_addr_i] |
|
||||
mem[bus_addr_i + 1] << 8 |
|
||||
mem[bus_addr_i + 2] << 16 |
|
||||
mem[bus_addr_i + 3] << 24
|
||||
);
|
||||
}
|
||||
#else
|
||||
top.p_ahblm__hrdata.set<uint32_t>(rdata);
|
||||
#endif
|
||||
|
||||
#ifdef DUAL_PORT
|
||||
bus_trans = top.p_d__htrans.get<uint8_t>() >> 1;
|
||||
bus_write = top.p_d__hwrite.get<bool>();
|
||||
bus_size = top.p_d__hsize.get<uint8_t>();
|
||||
bus_addr = top.p_d__haddr.get<uint32_t>();
|
||||
bus_trans_i = top.p_i__htrans.get<uint8_t>() >> 1;
|
||||
bus_addr_i = top.p_i__haddr.get<uint32_t>();
|
||||
#else
|
||||
bus_trans = top.p_ahblm__htrans.get<uint8_t>() >> 1;
|
||||
bus_write = top.p_ahblm__hwrite.get<bool>();
|
||||
bus_size = top.p_ahblm__hsize.get<uint8_t>();
|
||||
bus_addr = top.p_ahblm__haddr.get<uint32_t>();
|
||||
#endif
|
||||
|
||||
// Goto next in debugger sequence
|
||||
bool test_done = test_step(top);
|
||||
|
||||
if (dump_waves) {
|
||||
// The extra step() is just here to get the bus responses to line up nicely
|
||||
// in the VCD (hopefully is a quick update)
|
||||
top.step();
|
||||
vcd.sample(cycle * 2 + 1);
|
||||
waves_fd << vcd.buffer;
|
||||
vcd.buffer.clear();
|
||||
}
|
||||
|
||||
if (test_done)
|
||||
break;
|
||||
}
|
||||
|
||||
for (auto r : dump_ranges) {
|
||||
printf("Dumping memory from %08x to %08x:\n", r.first, r.second);
|
||||
for (int i = 0; i < r.second - r.first; ++i)
|
||||
printf("%02x%c", mem[r.first + i], i % 16 == 15 ? '\n' : ' ');
|
||||
printf("\n");
|
||||
}
|
||||
|
||||
return 0;
|
||||
}
|
||||
|
|
@ -1,57 +0,0 @@
|
|||
[*]
|
||||
[*] GTKWave Analyzer v3.3.103 (w)1999-2019 BSI
|
||||
[*] Sat Jul 10 19:30:00 2021
|
||||
[*]
|
||||
[dumpfile] "/home/luke/proj/hazard3/test/sim/core_debug/waves.vcd"
|
||||
[dumpfile_mtime] "Sat Jul 10 19:27:20 2021"
|
||||
[dumpfile_size] 23617
|
||||
[savefile] "/home/luke/proj/hazard3/test/sim/core_debug/test.gtkw"
|
||||
[timestart] 0
|
||||
[size] 1920 1043
|
||||
[pos] -1 -1
|
||||
*-2.330973 12 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1
|
||||
[treeopen] core.
|
||||
[sst_width] 233
|
||||
[signals_width] 310
|
||||
[sst_expanded] 1
|
||||
[sst_vpaned_height] 298
|
||||
@28
|
||||
dbg_req_halt
|
||||
dbg_req_resume
|
||||
dbg_halted
|
||||
dbg_running
|
||||
@200
|
||||
-
|
||||
@28
|
||||
dbg_data0_wen
|
||||
@22
|
||||
dbg_data0_wdata[31:0]
|
||||
dbg_data0_rdata[31:0]
|
||||
@200
|
||||
-
|
||||
@22
|
||||
dbg_instr_data[31:0]
|
||||
@28
|
||||
dbg_instr_data_vld
|
||||
dbg_instr_data_rdy
|
||||
dbg_instr_caught_ebreak
|
||||
dbg_instr_caught_exception
|
||||
@200
|
||||
-
|
||||
@22
|
||||
core.frontend.cir[31:0]
|
||||
@28
|
||||
core.frontend.cir_vld[1:0]
|
||||
core.df_cir_use[1:0]
|
||||
@200
|
||||
-
|
||||
@28
|
||||
core.frontend.mem_addr_rdy
|
||||
core.frontend.mem_addr_vld
|
||||
core.frontend.mem_data_vld
|
||||
@29
|
||||
core.frontend.fetch_data_vld
|
||||
@28
|
||||
core.frontend.buf_level_next[1:0]
|
||||
[pattern_trace] 1
|
||||
[pattern_trace] 0
|
||||
Binary file not shown.
|
|
@ -1,2 +0,0 @@
|
|||
tb
|
||||
dut.cpp
|
||||
|
|
@ -0,0 +1,18 @@
|
|||
adapter driver remote_bitbang
|
||||
remote_bitbang_host localhost
|
||||
remote_bitbang_port 9824
|
||||
transport select jtag
|
||||
|
||||
set _CHIPNAME hazard3
|
||||
jtag newtap $_CHIPNAME cpu -irlen 5
|
||||
set _TARGETNAME $_CHIPNAME.cpu
|
||||
target create $_TARGETNAME riscv -chain-position $_TARGETNAME
|
||||
|
||||
$_TARGETNAME configure -rtos hwthread
|
||||
|
||||
gdb_report_data_abort enable
|
||||
init
|
||||
halt
|
||||
|
||||
|
||||
riscv test_compliance
|
||||
Loading…
Reference in New Issue