Fixes for AXI BFM when running on Linux

This commit is contained in:
Simon Southwell 2024-10-15 16:11:27 +01:00
commit e875bfec56
5 changed files with 159 additions and 114 deletions

View file

@ -5,8 +5,7 @@
// Copyright (c) 2024 Simon Southwell.
//
// Implements minimal compliant manager interface at 32-bits wide.
// Also has a 32-bit vectored irq input. Does not (yet) utilise
// VProc's burst capabilities.
// Also has a 32-bit vectored irq input.
//
// This file is part of VProc.
//
@ -32,123 +31,174 @@
`include "vprocdefs.vh"
module axi4bfm
#(parameter ADDRWIDTH = 32, // For future proofing. Do not change
DATAWIDTH = 32, // For future proofing. Do not change
IRQWIDTH = 32, // Valid ranges => 1 to 32
BURST_ADDR_INCR = 1, // Valid values => 1, 2, 4
NODE = 0
#(parameter ADDRWIDTH = 32, // For future proofing. Do not change
DATAWIDTH = 32, // For future proofing. Do not change
IRQWIDTH = 32, // Valid ranges => 1 to 32
BURST_ADDR_INCR = 1, // Valid values => 1, 2, 4
NODE = 0
)
(
input clk,
input clk,
// Write address channel
output [ADDRWIDTH-1:0] awaddr,
output awvalid,
input awready,
output [2:0] awprot,
output [7:0] awlen,
output [ADDRWIDTH-1:0] awaddr,
output awvalid,
input awready,
output [2:0] awprot,
output [7:0] awlen,
// Write Data channel
output [DATAWIDTH-1:0] wdata,
output wvalid,
input wready,
output wlast,
output [3:0] wstrb,
output [DATAWIDTH-1:0] wdata,
output wvalid,
input wready,
output wlast,
output [3:0] wstrb,
// Write response channel
input bvalid,
output bready,
input bvalid,
output bready,
// Read address channel
output [ADDRWIDTH-1:0] araddr,
output arvalid,
input arready,
output [2:0] arprot,
output [7:0] arlen,
output [ADDRWIDTH-1:0] araddr,
output arvalid,
input arready,
output [2:0] arprot,
output [7:0] arlen,
// Read data/response channel
input [DATAWIDTH-1:0] rdata,
input rvalid,
output rready,
input [DATAWIDTH-1:0] rdata,
input rvalid,
output rready,
// Interrupt request (non-AXI side bus)
input [IRQWIDTH-1:0] irq
input [IRQWIDTH-1:0] irq
);
// ---------------------------------------------------------
// Signal and register declarations
// ---------------------------------------------------------
// Internal versions of input signals
wire awready_int;
wire wready_int;
wire arready_int;
wire [DATAWIDTH-1:0] rdata_int;
wire rvalid_int;
wire rready_int;
// Virtual processor memory mapped address port signals
wire [31:0] vpdataout;
wire [31:0] vpaddr;
wire vpwe;
wire vprd;
wire vpwrack;
wire vprdack;
wire [3:0] vpbyteenable;
wire [11:0] vpburst;
wire vpbursteq0;
wire vplast;
reg [11:0] burstcount;
wire [31:0] vpdataout;
wire [31:0] vpaddr;
wire vpwe;
wire vprd;
wire vpwrack;
wire vprdack;
wire [3:0] vpbyteenable;
wire [11:0] vpburst;
wire vpbursteq0;
wire vplast;
reg [11:0] burstcount;
// Delta cycle signals
wire update;
reg updateresponse;
wire update;
reg updateresponse;
// Internal state to flag an AXI channel has been acknowleged,
// but transaction is still pending
reg awacked;
reg wacked;
reg aracked;
reg awacked;
reg wacked;
reg aracked;
// ---------------------------------------------------------
// VERILATOR specific logic
// ---------------------------------------------------------
`ifdef VERILATOR
// When using Verilator, register inputs on negative clock edge
// to ensure correct ready in synchronous logic.
reg awready_reg;
reg wready_reg;
reg arready_reg;
reg [DATAWIDTH-1:0] rdata_reg;
reg rvalid_reg;
assign awready_int = awready_reg;
assign wready_int = wready_reg;
assign arready_int = arready_reg;
assign rdata_int = rdata_reg;
assign rvalid_int = rvalid_reg;
always @(negedge clk)
begin
awready_reg = awready;
wready_reg = wready;
arready_reg = arready;
rdata_reg = rdata;
rvalid_reg = rvalid;
end
`else
// Pass through inputs when not Verilator
assign awready_int = awready;
assign wready_int = wready;
assign bvalid_int = bvalid;
assign arready_int = arready;
assign rdata_int = rdata;
assign rvalid_int = rvalid;
`endif
// ---------------------------------------------------------
// Combinatorial logic
// ---------------------------------------------------------
// Default signalling (no protection, and write response always acknowleged)
assign awprot = 3'b000;
assign arprot = 3'b000;
assign bready = bvalid;
assign awprot = 3'b000;
assign arprot = 3'b000;
assign bready = bvalid;
// The address/write data ports are only valid when their valid signals active,
// else driven X. This ensures external IP does not use invalid held values.
assign awaddr = awvalid ? vpaddr : {ADDRWIDTH{1'bx}};
assign araddr = arvalid ? vpaddr : {ADDRWIDTH{1'bx}};
assign awaddr = awvalid ? vpaddr : {ADDRWIDTH{1'bx}};
assign araddr = arvalid ? vpaddr : {ADDRWIDTH{1'bx}};
// Burst
assign vpbursteq0 = vpburst == 12'h000;
assign awlen = ~vpbursteq0 ? vpburst[7:0] - 1 : 8'h00;
assign arlen = awlen;
assign vpbursteq0 = vpburst == 12'h000;
assign awlen = ~vpbursteq0 ? vpburst[7:0] - 1 : 8'h00;
assign arlen = awlen;
assign wdata = wvalid ? vpdataout : {DATAWIDTH{1'bx}};
assign wdata = wvalid ? vpdataout : {DATAWIDTH{1'bx}};
// The write address and valid signals active when VProc writing,
// but only until they have been acknowledged.
assign awvalid = vpwe & ~awacked;
assign wvalid = vpwe & ~wacked;
assign awvalid = vpwe & ~awacked;
assign wvalid = vpwe & ~wacked;
// VProc write acknowledged only once both address and write channels have
// been acknowledged. This could be if both channels acknowledged together,
// if write address acknowledged first then write data, or write data acknowledged
// first and then write address.
assign vpwrack = (awready & wready) | (awacked & wready) | (awready & wacked);
assign vpwrack = (awready_int & wready_int) | (awacked & wready_int) | (awready_int & wacked);
// Write Last always signalled when data valid as only one word at a time.
assign wlast = wvalid & (vplast | vpbursteq0);
assign wlast = wvalid & (vplast | vpbursteq0);
// Export VProc's byte enables
assign wstrb = vpbyteenable;
assign wstrb = vpbyteenable;
// The read address is valid when VProc RD strobe active until it has
// been acknowledged.
assign arvalid = vprd & ~aracked;
assign arvalid = vprd & ~aracked;
// Read data always accepted.
assign rready = rvalid;
assign rready = rvalid;
assign rready_int = rvalid_int;
// The VProc read acknowlege comes straight from the AXI read data bus valid.
assign vprdack = rvalid;
assign vprdack = rvalid_int;
// ---------------------------------------------------------
// Initialise the internal state.
@ -157,11 +207,11 @@ assign vprdack = rvalid;
initial
begin
`MINDELAY
aracked <= 1'b0;
awacked <= 1'b0;
wacked <= 1'b0;
updateresponse <= 1'b1;
burstcount <= 12'h000;
aracked <= 1'b0;
awacked <= 1'b0;
wacked <= 1'b0;
updateresponse <= 1'b1;
burstcount <= 12'h000;
end
// ---------------------------------------------------------
@ -178,24 +228,24 @@ begin
// is acknowledged back to VProc.
// Read address channel
aracked <= (aracked | (vprd & arready)) & ~(vprdack & burstcount <= 12'h000);
aracked <= (aracked | (vprd & arready_int)) & ~(vprdack & burstcount <= 12'h000);
// Write address channel
awacked <= (awacked | (vpwe & awready)) & ~vpwrack;
awacked <= (awacked | (vpwe & awready_int)) & ~vpwrack;
// Write data channel
wacked <= (wacked | (vpwe & wready)) & ~vpwrack;
wacked <= (wacked | (vpwe & wready_int)) & ~vpwrack;
// If a new burst count, set the counter to the burst length
if (arvalid == 1'b1 && burstcount == 0)
begin
burstcount <= vpburst;
burstcount <= vpburst;
end
// If the counter is not zero, decrement the count when a word is received
if (burstcount > 0 && rvalid == 1'b1 && rready == 1'b1)
if (burstcount > 0 && rvalid == 1'b1 && rready == 1'b1)
begin
burstcount <= burstcount - 1;
burstcount <= burstcount - 1;
end
end
@ -208,39 +258,41 @@ end
always @(update)
begin
updateresponse <= ~updateresponse;
updateresponse <= ~updateresponse;
end
// ---------------------------------------------------------
// Virtual Processor
// ---------------------------------------------------------
VProc #(.INT_WIDTH (IRQWIDTH),
.BURST_ADDR_INCR (BURST_ADDR_INCR)
) vp
(.Clk (clk),
.Addr (vpaddr),
.DataOut (vpdataout),
.WE (vpwe),
.WRAck (vpwrack),
.BE (vpbyteenable),
.DataIn (rdata),
.RD (vprd),
.RDAck (vprdack),
.Burst (vpburst),
.BurstFirst (),
.BurstLast (vplast),
.Interrupt (irq),
.Update (update),
.UpdateResponse (updateresponse),
.Node (NODE[3:0])
);
VProc #(
.INT_WIDTH (IRQWIDTH),
.BURST_ADDR_INCR (BURST_ADDR_INCR)
) vp
(
.Clk (clk),
.Addr (vpaddr),
.DataOut (vpdataout),
.WE (vpwe),
.WRAck (vpwrack),
.BE (vpbyteenable),
.DataIn (rdata_int),
.RD (vprd),
.RDAck (vprdack),
.Burst (vpburst),
.BurstFirst (),
.BurstLast (vplast),
.Interrupt (irq),
.Update (update),
.UpdateResponse (updateresponse),
.Node (NODE[3:0])
);
endmodule

View file

@ -64,6 +64,7 @@ CFLAGS = $(USRFLAGS) \
-I$(MEMMODELDIR)/src \
-DINCL_VLOG_MEM_MODEL \
-DMEM_MODEL_DEFAULT_ENDIAN=1 \
-DMEM_ZERO_NEW_PAGES \
$(HDLFLAG)
# Simulation configuration

View file

@ -35,7 +35,7 @@
#include <pthread.h>
#include <semaphore.h>
#define VERSION_STRING "VProc version 1.11. Copyright (c) 2004-2024 Simon Southwell."
#define VERSION_STRING "VProc version 1.11.1. Copyright (c) 2004-2024 Simon Southwell."
#ifndef VP_MAX_NODES
#define VP_MAX_NODES 64
@ -131,6 +131,6 @@ typedef struct {
} SchedState_t, *pSchedState_t;
// Reference to node state array
extern pSchedState_t ns[VP_MAX_NODES];
extern pSchedState_t ns[];
#endif

View file

@ -237,14 +237,6 @@ int updateArgs (vpiHandle taskHdl, int value[])
return idx;
}
#else
// Questa complains if there is no PLI or VPI start up routine or table,
// so for non-VPI builds define an empty one.
void (*vlog_startup_routines[])() =
{
0
};
#endif
// =========================================================================

View file

@ -59,19 +59,19 @@ VOBJDIR = $(TESTDIR)/obj
SIMULATOR = -DMODELSIM
SIMINCLUDEFLAG = -I$(MODEL_TECH)/../include
SIMFLAGSSO = -L$(MODEL_TECH) -lmtipli
ifeq ("$(HDL)", "VHDL")
HDLLANGUAGE = -DVPROC_VHDL
HDLCMD = vcom -quiet -2008 -work work -f files.tcl
VSIMFLAGS = $(VPROC_TOP)
else
HDLLANGUAGE =
SIMFLAGSSO = -L$(MODEL_TECH) -lmtipli
HDLCMD = vlog +define+VPROC_BURST_IF +define+VPROC_BYTE_INTERFACE +incdir+../ -f test.vc
VSIMFLAGS = -pli $(VPROC_PLI) $(VPROC_TOP)
endif
# Common logic simulator flags
VPROC_TOP = test
VSIMFLAGS = -pli $(VPROC_PLI) $(VPROC_TOP)
#------------------------------------------------------
# MODEL_TECH path